8208 files changed, 72760 insertions, 74408 deletions

diff --git a/Makefile.in b/Makefile.in
index aaec3ca00de9..8b28749113eb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,24 +1,25 @@
-# just dumb wrapper; make install comes later
+# @configure_input@
+# FIXME: create 'install' and 'check' target
 
 SHELL=/bin/sh
 
 all:
 	@. ./*[Ee]nv.[Ss]et.sh && \
-	./fetch_tarballs.sh ooo.lst && \
-	./bootstrap && \
-		cd instsetoo_native && ../solenv/bin/build.pl -P@BUILD_NCPUS@ --all -P@BUILD_MAX_JOBS@
+        ./bootstrap && \
+        cd instsetoo_native && \
+        ../solenv/bin/build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
 
 distclean:
 	@. ./*[Ee]nv.[Ss]et.sh && \
-	dmake distclean
+        dmake distclean
 
 clean:
 	@. ./*[Ee]nv.[Ss]et.sh && \
-	dmake clean
+        dmake clean
 
 dev-install:
 	@. ./*[Ee]nv.[Ss]et.sh && \
-		ooinstall -l $$SRC_ROOT/install && \
-		echo && \
-		echo "Developer installation finished, you can find it here:" && \
-		echo "$$SRC_ROOT/install"
+        ooinstall -l @abs_builddir@/install && \
+        echo "" && \
+        echo "Developer installation finished, you can now execute:" && \
+        echo "@abs_builddir@/install/program/soffice"
diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx
index f26250bed987..1240bb240671 100644
--- a/UnoControls/source/base/basecontrol.cxx
+++ b/UnoControls/source/base/basecontrol.cxx
@@ -368,7 +368,7 @@ void SAL_CALL BaseControl::createPeer(  const   Reference< XToolkit >&      xToo
         if ( xLocalToolkit.is() == sal_False )
         {
             // but first create wellknown toolkit, if it not exist
-            xLocalToolkit = Reference< XToolkit > ( m_xFactory->createInstance( OUString::createFromAscii( SERVICE_VCLTOOLKIT ) ), UNO_QUERY );
+            xLocalToolkit = Reference< XToolkit > ( m_xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( SERVICE_VCLTOOLKIT )) ), UNO_QUERY );
         }
         m_xPeer         = xLocalToolkit->createWindow( *pDescriptor );
         m_xPeerWindow   = Reference< XWindow >( m_xPeer, UNO_QUERY );
@@ -934,7 +934,7 @@ WindowDescriptor* BaseControl::impl_getWindowDescriptor( const Reference< XWindo
     WindowDescriptor* pDescriptor = new WindowDescriptor ;
 
     pDescriptor->Type               = WindowClass_SIMPLE                    ;
-    pDescriptor->WindowServiceName  = OUString::createFromAscii( "window" ) ;
+    pDescriptor->WindowServiceName  = OUString(RTL_CONSTASCII_USTRINGPARAM("window"))   ;
     pDescriptor->ParentIndex        = -1                                    ;
     pDescriptor->Parent             = xParentPeer                           ;
     pDescriptor->Bounds             = getPosSize ()                         ;
diff --git a/UnoControls/source/base/registercontrols.cxx b/UnoControls/source/base/registercontrols.cxx
index e8f58b8fa7f2..62e2e23ccc16 100644
--- a/UnoControls/source/base/registercontrols.cxx
+++ b/UnoControls/source/base/registercontrols.cxx
@@ -107,9 +107,9 @@ using namespace ::com::sun::star::registry                      ;
         {                                                                                                               \
             AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txkey is valid ...\n" )                                                 \
             /* Build new keyname */                                                                                     \
-            sKeyName     =  OUString::createFromAscii( "/" )            ;                                               \
+            sKeyName     =  OUString(RTL_CONSTASCII_USTRINGPARAM("/"))          ;                                               \
             sKeyName    +=  CLASS::impl_getStaticImplementationName()   ;                                               \
-            sKeyName    +=  OUString::createFromAscii( "/UNO/SERVICES" );                                               \
+            sKeyName    +=  OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));                                             \
                                                                                                                         \
             /* Create new key with new name. */                                                                         \
             xNewKey = xKey->createKey( sKeyName );                                                                      \
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx
index 9987478b7b56..44e0823cda71 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -311,7 +311,7 @@ const Sequence< OUString > FrameControl::impl_getStaticSupportedServiceNames()
 {
     MutexGuard aGuard( Mutex::getGlobalMutex() );
     Sequence< OUString > seqServiceNames( 1 );
-    seqServiceNames.getArray() [0] = OUString::createFromAscii( SERVICENAME_FRAMECONTROL );
+    seqServiceNames.getArray() [0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_FRAMECONTROL ));
     return seqServiceNames ;
 }
 
@@ -321,7 +321,7 @@ const Sequence< OUString > FrameControl::impl_getStaticSupportedServiceNames()
 
 const OUString FrameControl::impl_getStaticImplementationName()
 {
-    return OUString::createFromAscii( IMPLEMENTATIONNAME_FRAMECONTROL );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATIONNAME_FRAMECONTROL ));
 }
 
 //____________________________________________________________________________________________________________
@@ -509,7 +509,7 @@ void FrameControl::impl_createFrame(    const   Reference< XWindowPeer >&   xPee
         xOldFrame = m_xFrame ;
     }
 
-    xNewFrame = Reference< XFrame >  ( impl_getMultiServiceFactory()->createInstance ( OUString::createFromAscii( "com.sun.star.frame.Frame" ) ), UNO_QUERY ) ;
+    xNewFrame = Reference< XFrame >  ( impl_getMultiServiceFactory()->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame")) ), UNO_QUERY ) ;
     Reference< XDispatchProvider >  xDSP ( xNewFrame, UNO_QUERY ) ;
 
     if (xDSP.is())
@@ -520,7 +520,7 @@ void FrameControl::impl_createFrame(    const   Reference< XWindowPeer >&   xPee
         //  option
         //xFrame->setName( "WhatYouWant" );
 
-        Reference< XURLTransformer >  xTrans ( impl_getMultiServiceFactory()->createInstance ( OUString::createFromAscii( "com.sun.star.util.URLTransformer" ) ), UNO_QUERY ) ;
+        Reference< XURLTransformer >  xTrans ( impl_getMultiServiceFactory()->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer")) ), UNO_QUERY ) ;
         if(xTrans.is())
         {
             // load file
@@ -592,9 +592,9 @@ const Sequence< Property > FrameControl::impl_getStaticPropertyDescriptor()
     // All Properties of this implementation. The array must be sorted!
     static const Property pPropertys[PROPERTY_COUNT] =
     {
-        Property( OUString::createFromAscii( PROPERTYNAME_COMPONENTURL      ), PROPERTYHANDLE_COMPONENTURL      , ::getCppuType((const OUString*)0)                 , PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED ),
-        Property( OUString::createFromAscii( PROPERTYNAME_FRAME             ), PROPERTYHANDLE_FRAME             , ::getCppuType((const Reference< XFrame >*)0)      , PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT   ),
-        Property( OUString::createFromAscii( PROPERTYNAME_LOADERARGUMENTS   ), PROPERTYHANDLE_LOADERARGUMENTS   , ::getCppuType((const Sequence< PropertyValue >*)0), PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED )
+        Property( OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_COMPONENTURL       )), PROPERTYHANDLE_COMPONENTURL     , ::getCppuType((const OUString*)0)                 , PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED ),
+        Property( OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_FRAME              )), PROPERTYHANDLE_FRAME                , ::getCppuType((const Reference< XFrame >*)0)      , PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT   ),
+        Property( OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_LOADERARGUMENTS    )), PROPERTYHANDLE_LOADERARGUMENTS  , ::getCppuType((const Sequence< PropertyValue >*)0), PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED )
     };
 
     static const Sequence< Property > seqPropertys( pPropertys, PROPERTY_COUNT );
diff --git a/UnoControls/source/controls/progressbar.cxx b/UnoControls/source/controls/progressbar.cxx
index 7d05435e48b2..f1054089040d 100644
--- a/UnoControls/source/controls/progressbar.cxx
+++ b/UnoControls/source/controls/progressbar.cxx
@@ -364,7 +364,7 @@ const Sequence< OUString > ProgressBar::impl_getStaticSupportedServiceNames()
 {
     MutexGuard aGuard( Mutex::getGlobalMutex() );
     Sequence< OUString > seqServiceNames( 1 );
-    seqServiceNames.getArray() [0] = OUString::createFromAscii( SERVICENAME_PROGRESSBAR );
+    seqServiceNames.getArray() [0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_PROGRESSBAR ));
     return seqServiceNames ;
 }
 
@@ -374,7 +374,7 @@ const Sequence< OUString > ProgressBar::impl_getStaticSupportedServiceNames()
 
 const OUString ProgressBar::impl_getStaticImplementationName()
 {
-    return OUString::createFromAscii( IMPLEMENTATIONNAME_PROGRESSBAR );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATIONNAME_PROGRESSBAR ));
 }
 
 //____________________________________________________________________________________________________________
diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx
index bf6dc153a933..3d9e058e9c85 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -74,12 +74,12 @@ ProgressMonitor::ProgressMonitor( const Reference< XMultiServiceFactory >& xFact
     ++m_refCount ;
 
     // Create instances for fixedtext, button and progress ...
-    m_xTopic_Top    = Reference< XFixedText >   ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_SERVICENAME   ) ), UNO_QUERY ) ;
-    m_xText_Top     = Reference< XFixedText >   ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_SERVICENAME   ) ), UNO_QUERY ) ;
-    m_xTopic_Bottom = Reference< XFixedText >   ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_SERVICENAME   ) ), UNO_QUERY ) ;
-    m_xText_Bottom  = Reference< XFixedText >   ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_SERVICENAME   ) ), UNO_QUERY ) ;
-    m_xButton       = Reference< XButton >      ( xFactory->createInstance ( OUString::createFromAscii( BUTTON_SERVICENAME      ) ), UNO_QUERY ) ;
-    m_xProgressBar  = Reference< XProgressBar > ( xFactory->createInstance ( OUString::createFromAscii( SERVICENAME_PROGRESSBAR ) ), UNO_QUERY ) ;
+    m_xTopic_Top    = Reference< XFixedText >   ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_SERVICENAME    )) ), UNO_QUERY ) ;
+    m_xText_Top     = Reference< XFixedText >   ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_SERVICENAME    )) ), UNO_QUERY ) ;
+    m_xTopic_Bottom = Reference< XFixedText >   ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_SERVICENAME    )) ), UNO_QUERY ) ;
+    m_xText_Bottom  = Reference< XFixedText >   ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_SERVICENAME    )) ), UNO_QUERY ) ;
+    m_xButton       = Reference< XButton >      ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( BUTTON_SERVICENAME       )) ), UNO_QUERY ) ;
+    m_xProgressBar  = Reference< XProgressBar > ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_PROGRESSBAR  )) ), UNO_QUERY ) ;
 
     // ... cast controls to Reference< XControl >  (for "setModel"!) ...
     Reference< XControl >   xRef_Topic_Top      ( m_xTopic_Top    , UNO_QUERY ) ;
@@ -90,20 +90,20 @@ ProgressMonitor::ProgressMonitor( const Reference< XMultiServiceFactory >& xFact
     Reference< XControl >   xRef_ProgressBar    ( m_xProgressBar  , UNO_QUERY ) ;
 
     // ... set models ...
-    xRef_Topic_Top->setModel    ( Reference< XControlModel > ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_MODELNAME ) ), UNO_QUERY ) ) ;
-    xRef_Text_Top->setModel     ( Reference< XControlModel > ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_MODELNAME ) ), UNO_QUERY ) ) ;
-    xRef_Topic_Bottom->setModel ( Reference< XControlModel > ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_MODELNAME ) ), UNO_QUERY ) ) ;
-    xRef_Text_Bottom->setModel  ( Reference< XControlModel > ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_MODELNAME ) ), UNO_QUERY ) ) ;
-    xRef_Button->setModel       ( Reference< XControlModel > ( xFactory->createInstance ( OUString::createFromAscii( BUTTON_MODELNAME    ) ), UNO_QUERY ) ) ;
+    xRef_Topic_Top->setModel    ( Reference< XControlModel > ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_MODELNAME )) ), UNO_QUERY ) ) ;
+    xRef_Text_Top->setModel     ( Reference< XControlModel > ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_MODELNAME )) ), UNO_QUERY ) ) ;
+    xRef_Topic_Bottom->setModel ( Reference< XControlModel > ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_MODELNAME )) ), UNO_QUERY ) ) ;
+    xRef_Text_Bottom->setModel  ( Reference< XControlModel > ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_MODELNAME )) ), UNO_QUERY ) ) ;
+    xRef_Button->setModel       ( Reference< XControlModel > ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( BUTTON_MODELNAME    )) ), UNO_QUERY ) ) ;
     // ProgressBar has no model !!!
 
     // ... and add controls to basecontainercontrol!
-    addControl ( OUString::createFromAscii( CONTROLNAME_TEXT        ) , xRef_Topic_Top      ) ;
-    addControl ( OUString::createFromAscii( CONTROLNAME_TEXT        ) , xRef_Text_Top       ) ;
-    addControl ( OUString::createFromAscii( CONTROLNAME_TEXT        ) , xRef_Topic_Bottom   ) ;
-    addControl ( OUString::createFromAscii( CONTROLNAME_TEXT        ) , xRef_Text_Bottom    ) ;
-    addControl ( OUString::createFromAscii( CONTROLNAME_BUTTON      ) , xRef_Button         ) ;
-    addControl ( OUString::createFromAscii( CONTROLNAME_PROGRESSBAR ) , xRef_ProgressBar    ) ;
+    addControl ( OUString(RTL_CONSTASCII_USTRINGPARAM( CONTROLNAME_TEXT     )) , xRef_Topic_Top     ) ;
+    addControl ( OUString(RTL_CONSTASCII_USTRINGPARAM( CONTROLNAME_TEXT     )) , xRef_Text_Top      ) ;
+    addControl ( OUString(RTL_CONSTASCII_USTRINGPARAM( CONTROLNAME_TEXT     )) , xRef_Topic_Bottom  ) ;
+    addControl ( OUString(RTL_CONSTASCII_USTRINGPARAM( CONTROLNAME_TEXT     )) , xRef_Text_Bottom   ) ;
+    addControl ( OUString(RTL_CONSTASCII_USTRINGPARAM( CONTROLNAME_BUTTON       )) , xRef_Button            ) ;
+    addControl ( OUString(RTL_CONSTASCII_USTRINGPARAM( CONTROLNAME_PROGRESSBAR  )) , xRef_ProgressBar   ) ;
 
     // FixedText make it automaticly visible by himself ... but not the progressbar !!!
     // it must be set explicitly
@@ -112,11 +112,11 @@ ProgressMonitor::ProgressMonitor( const Reference< XMultiServiceFactory >& xFact
 
     // Reset to defaults !!!
     // (progressbar take automaticly its own defaults)
-    m_xButton->setLabel      ( OUString::createFromAscii( DEFAULT_BUTTONLABEL           ) ) ;
-    m_xTopic_Top->setText    ( OUString::createFromAscii( PROGRESSMONITOR_DEFAULT_TOPIC ) ) ;
-    m_xText_Top->setText     ( OUString::createFromAscii( PROGRESSMONITOR_DEFAULT_TEXT  ) ) ;
-    m_xTopic_Bottom->setText ( OUString::createFromAscii( PROGRESSMONITOR_DEFAULT_TOPIC ) ) ;
-    m_xText_Bottom->setText  ( OUString::createFromAscii( PROGRESSMONITOR_DEFAULT_TEXT  ) ) ;
+    m_xButton->setLabel      ( OUString(RTL_CONSTASCII_USTRINGPARAM( DEFAULT_BUTTONLABEL           )) ) ;
+    m_xTopic_Top->setText    ( OUString(RTL_CONSTASCII_USTRINGPARAM( PROGRESSMONITOR_DEFAULT_TOPIC )) ) ;
+    m_xText_Top->setText     ( OUString(RTL_CONSTASCII_USTRINGPARAM( PROGRESSMONITOR_DEFAULT_TEXT  )) ) ;
+    m_xTopic_Bottom->setText ( OUString(RTL_CONSTASCII_USTRINGPARAM( PROGRESSMONITOR_DEFAULT_TOPIC )) ) ;
+    m_xText_Bottom->setText  ( OUString(RTL_CONSTASCII_USTRINGPARAM( PROGRESSMONITOR_DEFAULT_TEXT  )) ) ;
 
     --m_refCount ;
 
@@ -669,7 +669,7 @@ const Sequence< OUString > ProgressMonitor::impl_getStaticSupportedServiceNames(
 {
     MutexGuard aGuard( Mutex::getGlobalMutex() );
     Sequence< OUString > seqServiceNames( 1 );
-    seqServiceNames.getArray() [0] = OUString::createFromAscii( SERVICENAME_PROGRESSMONITOR );
+    seqServiceNames.getArray() [0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_PROGRESSMONITOR ));
     return seqServiceNames ;
 }
 
@@ -679,7 +679,7 @@ const Sequence< OUString > ProgressMonitor::impl_getStaticSupportedServiceNames(
 
 const OUString ProgressMonitor::impl_getStaticImplementationName()
 {
-    return OUString::createFromAscii( IMPLEMENTATIONNAME_PROGRESSMONITOR );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATIONNAME_PROGRESSMONITOR ));
 }
 
 //____________________________________________________________________________________________________________
@@ -897,9 +897,9 @@ void ProgressMonitor::impl_rebuildFixedText ()
         {
             IMPL_TextlistItem* pSearchItem = m_pTextlist_Top->GetObject (n) ;
             aCollectString  +=  pSearchItem->sTopic ;
-            aCollectString  +=  OUString::createFromAscii("\n")             ;
+            aCollectString  +=  OUString(RTL_CONSTASCII_USTRINGPARAM("\n"))             ;
         }
-        aCollectString  +=  OUString::createFromAscii("\0") ;   // It's better :-)
+        aCollectString  +=  OUString(RTL_CONSTASCII_USTRINGPARAM("\0")) ;   // It's better :-)
 
         m_xTopic_Top->setText ( aCollectString ) ;
     }
@@ -915,9 +915,9 @@ void ProgressMonitor::impl_rebuildFixedText ()
         {
             IMPL_TextlistItem* pSearchItem = m_pTextlist_Top->GetObject (n) ;
             aCollectString  +=  pSearchItem->sText ;
-            aCollectString  +=  OUString::createFromAscii("\n")            ;
+            aCollectString  +=  OUString(RTL_CONSTASCII_USTRINGPARAM("\n"))            ;
         }
-        aCollectString  +=  OUString::createFromAscii("\0") ;   // It's better :-)
+        aCollectString  +=  OUString(RTL_CONSTASCII_USTRINGPARAM("\0")) ;   // It's better :-)
 
         m_xText_Top->setText ( aCollectString ) ;
     }
@@ -935,9 +935,9 @@ void ProgressMonitor::impl_rebuildFixedText ()
         {
             IMPL_TextlistItem* pSearchItem = m_pTextlist_Bottom->GetObject (n) ;
             aCollectString  +=  pSearchItem->sTopic ;
-            aCollectString  +=  OUString::createFromAscii("\n")             ;
+            aCollectString  +=  OUString(RTL_CONSTASCII_USTRINGPARAM("\n"))             ;
         }
-        aCollectString  +=  OUString::createFromAscii("\0") ;   // It's better :-)
+        aCollectString  +=  OUString(RTL_CONSTASCII_USTRINGPARAM("\0")) ;   // It's better :-)
 
         m_xTopic_Bottom->setText ( aCollectString ) ;
     }
@@ -953,9 +953,9 @@ void ProgressMonitor::impl_rebuildFixedText ()
         {
             IMPL_TextlistItem* pSearchItem = m_pTextlist_Bottom->GetObject (n) ;
             aCollectString  +=  pSearchItem->sText ;
-            aCollectString  +=  OUString::createFromAscii("\n")            ;
+            aCollectString  +=  OUString(RTL_CONSTASCII_USTRINGPARAM("\n"))            ;
         }
-        aCollectString  +=  OUString::createFromAscii("\0") ;   // It's better :-)
+        aCollectString  +=  OUString(RTL_CONSTASCII_USTRINGPARAM("\0")) ;   // It's better :-)
 
         m_xText_Bottom->setText ( aCollectString ) ;
     }
diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx
index 70b195931c18..1c5aed70a28c 100644
--- a/UnoControls/source/controls/statusindicator.cxx
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -71,23 +71,23 @@ StatusIndicator::StatusIndicator( const Reference< XMultiServiceFactory >& xFact
     ++m_refCount ;
 
     // Create instances for fixedtext and progress ...
-    m_xText         = Reference< XFixedText >   ( xFactory->createInstance( OUString::createFromAscii( FIXEDTEXT_SERVICENAME    ) ), UNO_QUERY );
-    m_xProgressBar  = Reference< XProgressBar > ( xFactory->createInstance( OUString::createFromAscii( SERVICENAME_PROGRESSBAR  ) ), UNO_QUERY );
+    m_xText         = Reference< XFixedText >   ( xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_SERVICENAME )) ), UNO_QUERY );
+    m_xProgressBar  = Reference< XProgressBar > ( xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_PROGRESSBAR   )) ), UNO_QUERY );
     // ... cast controls to Reference< XControl > and set model ...
     // ( ProgressBar has no model !!! )
     Reference< XControl > xTextControl      ( m_xText       , UNO_QUERY );
     Reference< XControl > xProgressControl  ( m_xProgressBar, UNO_QUERY );
-    xTextControl->setModel( Reference< XControlModel >( xFactory->createInstance( OUString::createFromAscii( FIXEDTEXT_MODELNAME ) ), UNO_QUERY ) );
+    xTextControl->setModel( Reference< XControlModel >( xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_MODELNAME )) ), UNO_QUERY ) );
     // ... and add controls to basecontainercontrol!
-    addControl( OUString::createFromAscii( CONTROLNAME_TEXT         ), xTextControl     );
-    addControl( OUString::createFromAscii( CONTROLNAME_PROGRESSBAR  ), xProgressControl );
+    addControl( OUString(RTL_CONSTASCII_USTRINGPARAM( CONTROLNAME_TEXT          )), xTextControl    );
+    addControl( OUString(RTL_CONSTASCII_USTRINGPARAM( CONTROLNAME_PROGRESSBAR   )), xProgressControl    );
     // FixedText make it automaticly visible by himself ... but not the progressbar !!!
     // it must be set explicitly
     Reference< XWindow > xProgressWindow( m_xProgressBar, UNO_QUERY );
     xProgressWindow->setVisible( sal_True );
     // Reset to defaults !!!
     // (progressbar take automaticly its own defaults)
-    m_xText->setText( OUString::createFromAscii( STATUSINDICATOR_DEFAULT_TEXT ) );
+    m_xText->setText( OUString(RTL_CONSTASCII_USTRINGPARAM( STATUSINDICATOR_DEFAULT_TEXT )) );
 
     --m_refCount ;
 }
@@ -433,7 +433,7 @@ const Sequence< OUString > StatusIndicator::impl_getStaticSupportedServiceNames(
 {
     MutexGuard aGuard( Mutex::getGlobalMutex() );
     Sequence< OUString > seqServiceNames( 1 );
-    seqServiceNames.getArray() [0] = OUString::createFromAscii( SERVICENAME_STATUSINDICATOR );
+    seqServiceNames.getArray() [0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_STATUSINDICATOR ));
     return seqServiceNames ;
 }
 
@@ -443,7 +443,7 @@ const Sequence< OUString > StatusIndicator::impl_getStaticSupportedServiceNames(
 
 const OUString StatusIndicator::impl_getStaticImplementationName()
 {
-    return OUString::createFromAscii( IMPLEMENTATIONNAME_STATUSINDICATOR );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATIONNAME_STATUSINDICATOR ));
 }
 
 //____________________________________________________________________________________________________________
@@ -459,7 +459,7 @@ WindowDescriptor* StatusIndicator::impl_getWindowDescriptor( const Reference< XW
     WindowDescriptor* pDescriptor = new WindowDescriptor ;
 
     pDescriptor->Type               =   WindowClass_SIMPLE                              ;
-    pDescriptor->WindowServiceName  =   OUString::createFromAscii( "floatingwindow" )   ;
+    pDescriptor->WindowServiceName  =   OUString(RTL_CONSTASCII_USTRINGPARAM("floatingwindow")) ;
     pDescriptor->ParentIndex        =   -1                                              ;
     pDescriptor->Parent             =   xParentPeer                                     ;
     pDescriptor->Bounds             =   getPosSize ()                                   ;
diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx
index 88a04c5584bc..db46d1862b9d 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -208,7 +208,7 @@ namespace accessibility
 
     ::rtl::OUString AccessibleTabBar::getImplementationName() throw (RuntimeException)
     {
-        return ::rtl::OUString::createFromAscii( "com.sun.star.comp.svtools.AccessibleTabBar" );
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.AccessibleTabBar" ));
     }
 
     // -----------------------------------------------------------------------------
@@ -229,7 +229,7 @@ namespace accessibility
     Sequence< ::rtl::OUString > AccessibleTabBar::getSupportedServiceNames() throw (RuntimeException)
     {
         Sequence< ::rtl::OUString > aNames(1);
-        aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleTabBar" );
+        aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.AccessibleTabBar" ));
         return aNames;
     }
 
diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx
index 898d2435b10a..201187701bbb 100644
--- a/accessibility/source/extended/accessibletabbarpage.cxx
+++ b/accessibility/source/extended/accessibletabbarpage.cxx
@@ -260,7 +260,7 @@ namespace accessibility
 
     ::rtl::OUString AccessibleTabBarPage::getImplementationName() throw (RuntimeException)
     {
-        return ::rtl::OUString::createFromAscii( "com.sun.star.comp.svtools.AccessibleTabBarPage" );
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.AccessibleTabBarPage" ));
     }
 
     // -----------------------------------------------------------------------------
@@ -281,7 +281,7 @@ namespace accessibility
     Sequence< ::rtl::OUString > AccessibleTabBarPage::getSupportedServiceNames() throw (RuntimeException)
     {
         Sequence< ::rtl::OUString > aNames(1);
-        aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleTabBarPage" );
+        aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.AccessibleTabBarPage" ));
         return aNames;
     }
 
diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx
index 60589218ae47..ebbf07949e26 100644
--- a/accessibility/source/extended/accessibletabbarpagelist.cxx
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -428,7 +428,7 @@ namespace accessibility
 
     ::rtl::OUString AccessibleTabBarPageList::getImplementationName() throw (RuntimeException)
     {
-        return ::rtl::OUString::createFromAscii( "com.sun.star.comp.svtools.AccessibleTabBarPageList" );
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.AccessibleTabBarPageList" ));
     }
 
     // -----------------------------------------------------------------------------
@@ -449,7 +449,7 @@ namespace accessibility
     Sequence< ::rtl::OUString > AccessibleTabBarPageList::getSupportedServiceNames() throw (RuntimeException)
     {
         Sequence< ::rtl::OUString > aNames(1);
-        aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleTabBarPageList" );
+        aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.AccessibleTabBarPageList" ));
         return aNames;
     }
 
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx
index 3cd3c333148a..746963c9fe7a 100644
--- a/accessibility/source/extended/accessibletablistboxtable.cxx
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -283,7 +283,7 @@ namespace accessibility
     // -----------------------------------------------------------------------------
     ::rtl::OUString AccessibleTabListBoxTable::getImplementationName (void) throw (RuntimeException)
     {
-        return ::rtl::OUString::createFromAscii("com.sun.star.comp.svtools.AccessibleTabListBoxTable");
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.AccessibleTabListBoxTable" ));
     }
     // -----------------------------------------------------------------------------
     // XAccessibleSelection
diff --git a/accessibility/source/helper/characterattributeshelper.cxx b/accessibility/source/helper/characterattributeshelper.cxx
index fe06e78dc7a3..27ba50ea85ad 100644
--- a/accessibility/source/helper/characterattributeshelper.cxx
+++ b/accessibility/source/helper/characterattributeshelper.cxx
@@ -34,34 +34,28 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 
 
-// -----------------------------------------------------------------------------
-// CharacterAttributesHelper
-// -----------------------------------------------------------------------------
-
 CharacterAttributesHelper::CharacterAttributesHelper( const Font& rFont, sal_Int32 nBackColor, sal_Int32 nColor )
 {
-    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString::createFromAscii( "CharBackColor" ), makeAny( (sal_Int32) nBackColor ) ) );
-    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString::createFromAscii( "CharColor" ), makeAny( (sal_Int32) nColor ) ) );
-    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString::createFromAscii( "CharFontCharSet" ), makeAny( (sal_Int16) rFont.GetCharSet() ) ) );
-    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString::createFromAscii( "CharFontFamily" ), makeAny( (sal_Int16) rFont.GetFamily() ) ) );
-    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString::createFromAscii( "CharFontName" ), makeAny( (::rtl::OUString) rFont.GetName() ) ) );
-    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString::createFromAscii( "CharFontPitch" ), makeAny( (sal_Int16) rFont.GetPitch() ) ) );
-    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString::createFromAscii( "CharFontStyleName" ), makeAny( (::rtl::OUString) rFont.GetStyleName() ) ) );
-    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString::createFromAscii( "CharHeight" ), makeAny( (sal_Int16) rFont.GetSize().Height() ) ) );
-    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString::createFromAscii( "CharScaleWidth" ), makeAny( (sal_Int16) rFont.GetSize().Width() ) ) );
-    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString::createFromAscii( "CharStrikeout" ), makeAny( (sal_Int16) rFont.GetStrikeout() ) ) );
-    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString::createFromAscii( "CharUnderline" ), makeAny( (sal_Int16) rFont.GetUnderline() ) ) );
-    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString::createFromAscii( "CharWeight" ), makeAny( (float) rFont.GetWeight() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharBackColor" )),     makeAny( (sal_Int32) nBackColor ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharColor" )),         makeAny( (sal_Int32) nColor ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharFontCharSet" )),   makeAny( (sal_Int16) rFont.GetCharSet() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharFontFamily" )),    makeAny( (sal_Int16) rFont.GetFamily() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharFontName" )),      makeAny( (::rtl::OUString) rFont.GetName() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharFontPitch" )),     makeAny( (sal_Int16) rFont.GetPitch() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharFontStyleName" )), makeAny( (::rtl::OUString) rFont.GetStyleName() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharHeight" )),        makeAny( (sal_Int16) rFont.GetSize().Height() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharScaleWidth" )),    makeAny( (sal_Int16) rFont.GetSize().Width() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharStrikeout" )),     makeAny( (sal_Int16) rFont.GetStrikeout() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharUnderline" )),     makeAny( (sal_Int16) rFont.GetUnderline() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharWeight" )),        makeAny( (float) rFont.GetWeight() ) ) );
 }
 
-// -----------------------------------------------------------------------------
 
 CharacterAttributesHelper::~CharacterAttributesHelper()
 {
     m_aAttributeMap.clear();
 }
 
-// -----------------------------------------------------------------------------
 
 Sequence< PropertyValue > CharacterAttributesHelper::GetCharacterAttributes()
 {
@@ -79,7 +73,6 @@ Sequence< PropertyValue > CharacterAttributesHelper::GetCharacterAttributes()
     return aValues;
 }
 
-// -----------------------------------------------------------------------------
 
 Sequence< PropertyValue > CharacterAttributesHelper::GetCharacterAttributes( const Sequence< ::rtl::OUString >& aRequestedAttributes )
 {
@@ -117,6 +110,5 @@ Sequence< PropertyValue > CharacterAttributesHelper::GetCharacterAttributes( con
     return aValues;
 }
 
-// -----------------------------------------------------------------------------
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx
index de220dea6f08..f30a690c89d9 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -129,7 +129,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleButton, VCLXAccessibleTextCompon
 
 ::rtl::OUString VCLXAccessibleButton::getImplementationName() throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleButton" );
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.toolkit.AccessibleButton") );
 }
 
 // -----------------------------------------------------------------------------
@@ -137,7 +137,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleButton, VCLXAccessibleTextCompon
 Sequence< ::rtl::OUString > VCLXAccessibleButton::getSupportedServiceNames() throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleButton" );
+    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleButton") );
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
index 98698adb7285..d578077e727a 100644
--- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
@@ -179,7 +179,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleCheckBox, VCLXAccessibleTextComp
 
 ::rtl::OUString VCLXAccessibleCheckBox::getImplementationName() throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleCheckBox" );
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.toolkit.AccessibleCheckBox") );
 }
 
 // -----------------------------------------------------------------------------
@@ -187,7 +187,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleCheckBox, VCLXAccessibleTextComp
 Sequence< ::rtl::OUString > VCLXAccessibleCheckBox::getSupportedServiceNames() throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleCheckBox" );
+    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleCheckBox") );
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblecombobox.cxx b/accessibility/source/standard/vclxaccessiblecombobox.cxx
index 3da67a703e22..df3f9ed7ed32 100644
--- a/accessibility/source/standard/vclxaccessiblecombobox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecombobox.cxx
@@ -79,7 +79,7 @@ void VCLXAccessibleComboBox::ProcessWindowEvent (const VclWindowEvent& rVclWindo
 ::rtl::OUString VCLXAccessibleComboBox::getImplementationName (void)
     throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii ("com.sun.star.comp.toolkit.AccessibleComboBox");
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.toolkit.AccessibleComboBox" ));
 }
 
 
@@ -91,8 +91,7 @@ Sequence< ::rtl::OUString > VCLXAccessibleComboBox::getSupportedServiceNames (vo
     Sequence< ::rtl::OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames();
     sal_Int32 nLength = aNames.getLength();
     aNames.realloc( nLength + 1 );
-    aNames[nLength] = ::rtl::OUString::createFromAscii(
-        "com.sun.star.accessibility.AccessibleComboBox" );
+    aNames[nLength] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleComboBox" ));
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
index 370bf2fe70ea..3078fac6b2fe 100644
--- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
@@ -87,28 +87,6 @@ void VCLXAccessibleDropDownComboBox::ProcessWindowEvent (const VclWindowEvent& r
         case VCLEVENT_DROPDOWN_OPEN:
         case VCLEVENT_DROPDOWN_CLOSE:
         {
-            /*          // child count changed
-            Any aOldValue, aNewValue;
-            // get the listbox child
-            Reference< XAccessible > xChild;
-            if ( !xChild.is() )
-            {
-                try
-                {
-                    // the listbox is the second child
-                    xChild = getAccessibleChild(1);
-                }
-                catch ( IndexOutOfBoundsException& ) {}
-                catch ( RuntimeException& ) {}
-            }
-            if ( rVclWindowEvent.GetId() == VCLEVENT_DROPDOWN_OPEN )
-                aNewValue <<= xChild;
-            else
-                aOldValue <<= xChild;
-            NotifyAccessibleEvent(
-            AccessibleEventId::CHILD, aOldValue, aNewValue
-            );
-            */
             break;
         }
 
@@ -125,7 +103,7 @@ void VCLXAccessibleDropDownComboBox::ProcessWindowEvent (const VclWindowEvent& r
 ::rtl::OUString VCLXAccessibleDropDownComboBox::getImplementationName()
     throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.toolkit.AccessibleDropDownComboBox");
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.toolkit.AccessibleDropDownComboBox" ));
 }
 
 
@@ -137,8 +115,7 @@ Sequence< ::rtl::OUString > VCLXAccessibleDropDownComboBox::getSupportedServiceN
     Sequence< ::rtl::OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames();
     sal_Int32 nLength = aNames.getLength();
     aNames.realloc( nLength + 1 );
-    aNames[nLength] = ::rtl::OUString::createFromAscii(
-        "com.sun.star.accessibility.AccessibleDropDownComboBox" );
+    aNames[nLength] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleDropDownComboBox" ));
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
index 340567eb967a..04fc5c46cff6 100644
--- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
@@ -93,7 +93,7 @@ void VCLXAccessibleDropDownListBox::ProcessWindowEvent( const VclWindowEvent& rV
 ::rtl::OUString VCLXAccessibleDropDownListBox::getImplementationName()
     throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.toolkit.AccessibleDropDownListBox");
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.toolkit.AccessibleDropDownListBox" ));
 }
 
 
@@ -105,8 +105,7 @@ Sequence< ::rtl::OUString > VCLXAccessibleDropDownListBox::getSupportedServiceNa
     Sequence< ::rtl::OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames();
     sal_Int32 nLength = aNames.getLength();
     aNames.realloc( nLength + 1 );
-    aNames[nLength] = ::rtl::OUString::createFromAscii(
-        "com.sun.star.accessibility.AccessibleDropDownListBox" );
+    aNames[nLength] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleDropDownListBox" ));
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
index e522ce081435..b8f05dbc66c8 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -197,7 +197,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleEdit, VCLXAccessibleTextComponen
 
 ::rtl::OUString VCLXAccessibleEdit::getImplementationName() throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleEdit" );
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.toolkit.AccessibleEdit") );
 }
 
 // -----------------------------------------------------------------------------
@@ -205,7 +205,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleEdit, VCLXAccessibleTextComponen
 Sequence< ::rtl::OUString > VCLXAccessibleEdit::getSupportedServiceNames() throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleEdit" );
+    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleEdit") );
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx
index d23d92065807..0e486bf5e53f 100644
--- a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx
+++ b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx
@@ -70,7 +70,7 @@ void VCLXAccessibleFixedHyperlink::implGetLineBoundary( i18n::Boundary& rBoundar
 
 ::rtl::OUString VCLXAccessibleFixedHyperlink::getImplementationName() throw (uno::RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleFixedHyperlink" );
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.toolkit.AccessibleFixedHyperlink") );
 }
 
 // -----------------------------------------------------------------------------
@@ -78,7 +78,7 @@ void VCLXAccessibleFixedHyperlink::implGetLineBoundary( i18n::Boundary& rBoundar
 uno::Sequence< ::rtl::OUString > VCLXAccessibleFixedHyperlink::getSupportedServiceNames() throw (uno::RuntimeException)
 {
     uno::Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleFixedHyperlink" );
+    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleFixedHyperlink") );
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblefixedtext.cxx b/accessibility/source/standard/vclxaccessiblefixedtext.cxx
index 6077efa65e87..69b4f1f9dd1d 100644
--- a/accessibility/source/standard/vclxaccessiblefixedtext.cxx
+++ b/accessibility/source/standard/vclxaccessiblefixedtext.cxx
@@ -82,7 +82,7 @@ void VCLXAccessibleFixedText::implGetLineBoundary( i18n::Boundary& rBoundary, sa
 
 ::rtl::OUString VCLXAccessibleFixedText::getImplementationName() throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleFixedText" );
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.toolkit.AccessibleFixedText") );
 }
 
 // -----------------------------------------------------------------------------
@@ -90,7 +90,7 @@ void VCLXAccessibleFixedText::implGetLineBoundary( i18n::Boundary& rBoundary, sa
 Sequence< ::rtl::OUString > VCLXAccessibleFixedText::getSupportedServiceNames() throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleFixedText" );
+    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleFixedText") );
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblelistbox.cxx b/accessibility/source/standard/vclxaccessiblelistbox.cxx
index 07aa685aac27..d167f6bd405c 100644
--- a/accessibility/source/standard/vclxaccessiblelistbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistbox.cxx
@@ -91,7 +91,7 @@ void VCLXAccessibleListBox::ProcessWindowEvent (const VclWindowEvent& rVclWindow
 ::rtl::OUString VCLXAccessibleListBox::getImplementationName (void)
     throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.toolkit.AccessibleListBox");
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.toolkit.AccessibleListBox" ));
 }
 
 
@@ -103,8 +103,7 @@ Sequence< ::rtl::OUString > VCLXAccessibleListBox::getSupportedServiceNames (voi
     Sequence< ::rtl::OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames();
     sal_Int32 nLength = aNames.getLength();
     aNames.realloc( nLength + 1 );
-    aNames[nLength] = ::rtl::OUString::createFromAscii(
-        "com.sun.star.accessibility.AccessibleListBox" );
+    aNames[nLength] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleListBox" ));
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index f84188ba8155..31332bd14a21 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -230,7 +230,7 @@ void SAL_CALL VCLXAccessibleListItem::disposing()
 // -----------------------------------------------------------------------------
 ::rtl::OUString VCLXAccessibleListItem::getImplementationName() throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleListItem" );
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.toolkit.AccessibleListItem" ));
 }
 // -----------------------------------------------------------------------------
 sal_Bool VCLXAccessibleListItem::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException)
@@ -247,9 +247,9 @@ sal_Bool VCLXAccessibleListItem::supportsService( const ::rtl::OUString& rServic
 Sequence< ::rtl::OUString > VCLXAccessibleListItem::getSupportedServiceNames() throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(3);
-    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.accessibility.AccessibleContext" );
-    aNames[1] = ::rtl::OUString::createFromAscii( "com.sun.star.accessibility.AccessibleComponent" );
-    aNames[2] = ::rtl::OUString::createFromAscii( "com.sun.star.accessibility.AccessibleListItem" );
+    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleContext" ));
+    aNames[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleComponent" ));
+    aNames[2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleListItem" ));
     return aNames;
 }
 // -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessiblemenu.cxx b/accessibility/source/standard/vclxaccessiblemenu.cxx
index 2d66d98c9563..49e236bd94be 100644
--- a/accessibility/source/standard/vclxaccessiblemenu.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenu.cxx
@@ -104,7 +104,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleMenu, VCLXAccessibleMenuItem, VC
 
 ::rtl::OUString VCLXAccessibleMenu::getImplementationName() throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleMenu" );
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.toolkit.AccessibleMenu") );
 }
 
 // -----------------------------------------------------------------------------
@@ -112,7 +112,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleMenu, VCLXAccessibleMenuItem, VC
 Sequence< ::rtl::OUString > VCLXAccessibleMenu::getSupportedServiceNames() throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleMenu" );
+    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleMenu") );
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx
index 64eee8741f09..557c7756b027 100644
--- a/accessibility/source/standard/vclxaccessiblemenubar.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx
@@ -143,7 +143,7 @@ void VCLXAccessibleMenuBar::disposing()
 
 ::rtl::OUString VCLXAccessibleMenuBar::getImplementationName() throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleMenuBar" );
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.toolkit.AccessibleMenuBar") );
 }
 
 // -----------------------------------------------------------------------------
@@ -151,7 +151,7 @@ void VCLXAccessibleMenuBar::disposing()
 Sequence< ::rtl::OUString > VCLXAccessibleMenuBar::getSupportedServiceNames() throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleMenuBar" );
+    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleMenuBar") );
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index a8b48a8baedc..b4f6c7e08bc4 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -177,7 +177,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleMenuItem, OAccessibleMenuItemCom
 
 ::rtl::OUString VCLXAccessibleMenuItem::getImplementationName() throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleMenuItem" );
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.toolkit.AccessibleMenuItem") );
 }
 
 // -----------------------------------------------------------------------------
@@ -185,7 +185,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleMenuItem, OAccessibleMenuItemCom
 Sequence< ::rtl::OUString > VCLXAccessibleMenuItem::getSupportedServiceNames() throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleMenuItem" );
+    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleMenuItem") );
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx
index 70130243e54e..9e2235aec32d 100644
--- a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx
@@ -60,7 +60,7 @@ VCLXAccessibleMenuSeparator::~VCLXAccessibleMenuSeparator()
 
 ::rtl::OUString VCLXAccessibleMenuSeparator::getImplementationName() throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleMenuSeparator" );
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.toolkit.AccessibleMenuSeparator") );
 }
 
 // -----------------------------------------------------------------------------
@@ -68,7 +68,7 @@ VCLXAccessibleMenuSeparator::~VCLXAccessibleMenuSeparator()
 Sequence< ::rtl::OUString > VCLXAccessibleMenuSeparator::getSupportedServiceNames() throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleMenuSeparator" );
+    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleMenuSeparator") );
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
index 073ebd80f844..75cb93ee4314 100644
--- a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
+++ b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
@@ -66,7 +66,7 @@ sal_Bool VCLXAccessiblePopupMenu::IsFocused()
 
 ::rtl::OUString VCLXAccessiblePopupMenu::getImplementationName() throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessiblePopupMenu" );
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.toolkit.AccessiblePopupMenu") );
 }
 
 // -----------------------------------------------------------------------------
@@ -74,7 +74,7 @@ sal_Bool VCLXAccessiblePopupMenu::IsFocused()
 Sequence< ::rtl::OUString > VCLXAccessiblePopupMenu::getSupportedServiceNames() throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessiblePopupMenu" );
+    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessiblePopupMenu") );
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
index 5ad9053e9ea5..b572ad94c73c 100644
--- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx
+++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
@@ -155,7 +155,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleRadioButton, VCLXAccessibleTextC
 
 ::rtl::OUString VCLXAccessibleRadioButton::getImplementationName() throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleRadioButton" );
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.toolkit.AccessibleRadioButton") );
 }
 
 // -----------------------------------------------------------------------------
@@ -163,7 +163,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleRadioButton, VCLXAccessibleTextC
 Sequence< ::rtl::OUString > VCLXAccessibleRadioButton::getSupportedServiceNames() throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleRadioButton" );
+    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleRadioButton") );
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
index 2d9a6dd6bebc..3c29bd660d20 100644
--- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
@@ -52,7 +52,6 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::accessibility;
 using namespace ::comphelper;
 
-
 // -----------------------------------------------------------------------------
 // VCLXAccessibleScrollBar
 // -----------------------------------------------------------------------------
@@ -119,7 +118,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleScrollBar, VCLXAccessibleCompone
 
 ::rtl::OUString VCLXAccessibleScrollBar::getImplementationName() throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleScrollBar" );
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.toolkit.AccessibleScrollBar") );
 }
 
 // -----------------------------------------------------------------------------
@@ -127,7 +126,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleScrollBar, VCLXAccessibleCompone
 Sequence< ::rtl::OUString > VCLXAccessibleScrollBar::getSupportedServiceNames() throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleScrollBar" );
+    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleScrollBar") );
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
index 9a3fb29b7b31..fd8be1a820b6 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
@@ -295,7 +295,7 @@ void VCLXAccessibleStatusBar::disposing()
 
 ::rtl::OUString VCLXAccessibleStatusBar::getImplementationName() throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleStatusBar" );
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.toolkit.AccessibleStatusBar") );
 }
 
 // -----------------------------------------------------------------------------
@@ -303,7 +303,7 @@ void VCLXAccessibleStatusBar::disposing()
 Sequence< ::rtl::OUString > VCLXAccessibleStatusBar::getSupportedServiceNames() throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleStatusBar" );
+    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleStatusBar") );
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
index 5f6cca43ca9a..83ef48cc0ad9 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
@@ -244,7 +244,7 @@ void VCLXAccessibleStatusBarItem::disposing()
 
 ::rtl::OUString VCLXAccessibleStatusBarItem::getImplementationName() throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleStatusBarItem" );
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.toolkit.AccessibleStatusBarItem" ));
 }
 
 // -----------------------------------------------------------------------------
@@ -265,7 +265,7 @@ sal_Bool VCLXAccessibleStatusBarItem::supportsService( const ::rtl::OUString& rS
 Sequence< ::rtl::OUString > VCLXAccessibleStatusBarItem::getSupportedServiceNames() throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleStatusBarItem" );
+    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.AccessibleStatusBarItem" ));
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index 417fcf03daf8..cb4339aab4f7 100644
--- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -355,7 +355,7 @@ void VCLXAccessibleTabControl::disposing()
 
 ::rtl::OUString VCLXAccessibleTabControl::getImplementationName() throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleTabControl" );
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.toolkit.AccessibleTabControl") );
 }
 
 // -----------------------------------------------------------------------------
@@ -363,7 +363,7 @@ void VCLXAccessibleTabControl::disposing()
 Sequence< ::rtl::OUString > VCLXAccessibleTabControl::getSupportedServiceNames() throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleTabControl" );
+    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleTabControl") );
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx
index 5bb372884591..0691d247db06 100644
--- a/accessibility/source/standard/vclxaccessibletabpage.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpage.cxx
@@ -276,7 +276,7 @@ void VCLXAccessibleTabPage::disposing()
 
 ::rtl::OUString VCLXAccessibleTabPage::getImplementationName() throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleTabPage" );
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.toolkit.AccessibleTabPage" ));
 }
 
 // -----------------------------------------------------------------------------
@@ -297,7 +297,7 @@ sal_Bool VCLXAccessibleTabPage::supportsService( const ::rtl::OUString& rService
 Sequence< ::rtl::OUString > VCLXAccessibleTabPage::getSupportedServiceNames() throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleTabPage" );
+    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.AccessibleTabPage" ));
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessibletextfield.cxx b/accessibility/source/standard/vclxaccessibletextfield.cxx
index afc28d3e9e43..ba7c58f5f421 100644
--- a/accessibility/source/standard/vclxaccessibletextfield.cxx
+++ b/accessibility/source/standard/vclxaccessibletextfield.cxx
@@ -137,7 +137,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleTextField::getAccessibleParent(
 ::rtl::OUString VCLXAccessibleTextField::getImplementationName (void)
     throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii ("com.sun.star.comp.toolkit.AccessibleTextField");
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.toolkit.AccessibleTextField" ));
 }
 
 
@@ -149,8 +149,7 @@ Sequence< ::rtl::OUString > VCLXAccessibleTextField::getSupportedServiceNames (v
     Sequence< ::rtl::OUString > aNames = VCLXAccessibleTextComponent::getSupportedServiceNames();
     sal_Int32 nLength = aNames.getLength();
     aNames.realloc( nLength + 1 );
-    aNames[nLength] = ::rtl::OUString::createFromAscii(
-        "com.sun.star.accessibility.AccessibleTextField");
+    aNames[nLength] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleTextField" ));
     return aNames;
 }
 
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index 1b22fddc95fa..263e2a75a46d 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -686,7 +686,7 @@ void SAL_CALL VCLXAccessibleToolBox::disposing()
 // -----------------------------------------------------------------------------
 ::rtl::OUString VCLXAccessibleToolBox::getImplementationName() throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleToolBox" );
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.toolkit.AccessibleToolBox" ));
 }
 // -----------------------------------------------------------------------------
 Sequence< ::rtl::OUString > VCLXAccessibleToolBox::getSupportedServiceNames() throw (RuntimeException)
@@ -694,7 +694,7 @@ Sequence< ::rtl::OUString > VCLXAccessibleToolBox::getSupportedServiceNames() th
     Sequence< ::rtl::OUString > aNames = VCLXAccessibleComponent::getSupportedServiceNames();
     sal_Int32 nLength = aNames.getLength();
     aNames.realloc( nLength + 1 );
-    aNames[nLength] = ::rtl::OUString::createFromAscii( "com.sun.star.accessibility.AccessibleToolBox" );
+    aNames[nLength] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleToolBox" ));
     return aNames;
 }
 // -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index 05807cc4317d..d1a61c726711 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -287,7 +287,7 @@ void SAL_CALL VCLXAccessibleToolBoxItem::disposing()
 // -----------------------------------------------------------------------------
 ::rtl::OUString VCLXAccessibleToolBoxItem::getImplementationName() throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleToolBoxItem" );
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.toolkit.AccessibleToolBoxItem" ));
 }
 // -----------------------------------------------------------------------------
 sal_Bool VCLXAccessibleToolBoxItem::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException)
@@ -304,10 +304,10 @@ sal_Bool VCLXAccessibleToolBoxItem::supportsService( const ::rtl::OUString& rSer
 Sequence< ::rtl::OUString > VCLXAccessibleToolBoxItem::getSupportedServiceNames() throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(4);
-    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.accessibility.AccessibleContext" );
-    aNames[1] = ::rtl::OUString::createFromAscii( "com.sun.star.accessibility.AccessibleComponent" );
-    aNames[2] = ::rtl::OUString::createFromAscii( "com.sun.star.accessibility.AccessibleExtendedComponent" );
-    aNames[3] = ::rtl::OUString::createFromAscii( "com.sun.star.accessibility.AccessibleToolBoxItem" );
+    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleContext" ));
+    aNames[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleComponent" ));
+    aNames[2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleExtendedComponent" ));
+    aNames[3] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleToolBoxItem" ));
     return aNames;
 }
 // -----------------------------------------------------------------------------
diff --git a/autodoc/source/parser_i/idl/unoidl.cxx b/autodoc/source/parser_i/idl/unoidl.cxx
index 5206a364d78e..740a4ecab1ad 100644
--- a/autodoc/source/parser_i/idl/unoidl.cxx
+++ b/autodoc/source/parser_i/idl/unoidl.cxx
@@ -64,8 +64,6 @@ class FileParsePerformers
     void                ParseFile(
                             const char *        i_sFullPath );
 
-    void                ConnectLinks();
-
   private:
     CharacterSource     aFileLoader;
     Dyn<csi::uidl::TokenParser_Uidl>
@@ -126,8 +124,6 @@ IdlParser::Run( const autodoc::FileCollector_Ifc & i_rFiles )
 //          pFileParsePerformers = new FileParsePerformers( *pRepository );
         }
     }
-
-    pFileParsePerformers->ConnectLinks();
 }
 
 FileParsePerformers::FileParsePerformers( ary::Repository & io_rRepository,
@@ -167,13 +163,6 @@ FileParsePerformers::ParseFile( const char * i_sFullPath )
     } while ( NOT aFileLoader.IsFinished() );
 }
 
-void
-FileParsePerformers::ConnectLinks()
-{
-    // KORR_FUTURE ?
-//  rRepository.RwGate_Idl().ConnectAdditionalLinks();
-}
-
 }   // namespace autodoc
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/tools/tkpchars.cxx b/autodoc/source/tools/tkpchars.cxx
index 25210acfa6f7..ad5d3f0b3727 100644
--- a/autodoc/source/tools/tkpchars.cxx
+++ b/autodoc/source/tools/tkpchars.cxx
@@ -77,7 +77,7 @@ CharacterSource::LoadText(csv::bstream & io_rSource)
 void
 CharacterSource::InsertTextAtCurPos( const char * i_sText2Insert )
 {
-    if ( i_sText2Insert == 0 ? true : strlen(i_sText2Insert) == 0 )
+    if ( !i_sText2Insert || !i_sText2Insert[0] )
         return;
 
     aSourcesStack.push( S_SourceState(
diff --git a/automation/source/communi/makefile.mk b/automation/source/communi/makefile.mk
index 1d01badab455..b4ca9c67e508 100644
--- a/automation/source/communi/makefile.mk
+++ b/automation/source/communi/makefile.mk
@@ -36,7 +36,9 @@ TARGET=communi
 
 # --- Files --------------------------------------------------------
 
-SLOFILES=   \
+SLOFILES=   $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES=   \
     $(SLO)$/communi.obj
 
 # --- Targets ------------------------------------------------------
diff --git a/automation/source/miniapp/makefile.mk b/automation/source/miniapp/makefile.mk
index 14a6d1ff0e1d..10c16d8ab7f6 100644
--- a/automation/source/miniapp/makefile.mk
+++ b/automation/source/miniapp/makefile.mk
@@ -37,12 +37,12 @@ TARGET=miniapp
 # --- Allgemein ------------------------------------------------------------
 
 OBJFILES = \
-        $(OBJ)$/testapp.obj          \
-        $(OBJ)$/editwin.obj          \
-        $(OBJ)$/servres.obj
+        $(EXCEPTIONSFILES)
 
 
 EXCEPTIONSFILES= \
+        $(OBJ)$/editwin.obj          \
+        $(OBJ)$/servres.obj          \
         $(OBJ)$/testapp.obj
 
 SRS1NAME=$(TARGET)
diff --git a/automation/source/miniapp/testapp.cxx b/automation/source/miniapp/testapp.cxx
index 539f4851b8e3..fec900c8578e 100644
--- a/automation/source/miniapp/testapp.cxx
+++ b/automation/source/miniapp/testapp.cxx
@@ -105,10 +105,7 @@ BOOL MainWindow::Close()
 
 void MainWindow::FileExit()
 {
-/*  WriteSTBProfile();*/
-
-//  if (pApp->CloseAll())
-        pApp->Quit();
+    pApp->Quit();
 }
 
 
@@ -151,26 +148,6 @@ void MainWindow::SysDlg()
               break;
       }
 
-/*
-
-#define WB_OK                   ((WinBits)0x0010)
-#define WB_OK_CANCEL            ((WinBits)0x0020)
-#define WB_YES_NO               ((WinBits)0x0040)
-#define WB_YES_NO_CANCEL        ((WinBits)0x0080)
-#define WB_RETRY_CANCEL         ((WinBits)0x0100)
-
-#define WB_DEF_OK               ((WinBits)0x0200)
-#define WB_DEF_CANCEL           ((WinBits)0x0400)
-#define WB_DEF_RETRY            ((WinBits)0x0800)
-#define WB_DEF_YES              ((WinBits)0x1000)
-#define WB_DEF_NO               ((WinBits)0x2000)
-
-#define RET_OK               TRUE
-#define RET_CANCEL           FALSE
-#define RET_YES              2
-#define RET_NO               3
-#define RET_RETRY            4
-*/
 }
 
 MyApp aApp;
@@ -188,19 +165,6 @@ void MyApp::Property( ApplicationProperty& rProp )
         pTTProperties->nPropertyVersion = TT_PROPERTIES_VERSION;
         switch ( pTTProperties->nActualPR )
         {
-/*          case TT_PR_SLOTS:
-            {
-                pTTProperties->nSidOpenUrl = SID_OPENURL;
-                pTTProperties->nSidFileName = SID_FILE_NAME;
-                pTTProperties->nSidNewDocDirect = SID_NEWDOCDIRECT;
-                pTTProperties->nSidCopy = SID_COPY;
-                pTTProperties->nSidPaste = SID_PASTE;
-                pTTProperties->nSidSourceView = SID_SOURCEVIEW;
-                pTTProperties->nSidSelectAll = SID_SELECTALL;
-                pTTProperties->nSidReferer = SID_REFERER;
-                pTTProperties->nActualPR = 0;
-            }
-            break;*/
             case TT_PR_DISPATCHER:
             {
                 PlugInDispatcher* pDispatcher = GetDispatcher();
@@ -218,16 +182,6 @@ void MyApp::Property( ApplicationProperty& rProp )
                 }
             }
             break;
-/*          case TT_PR_IMG:
-            {
-                SvDataMemberObjectRef aDataObject = new SvDataMemberObject();
-                SvData* pDataBmp = new SvData( FORMAT_BITMAP );
-                pDataBmp->SetData( pTTProperties->mpBmp );
-                aDataObject->Append( pDataBmp );
-                aDataObject->CopyClipboard();
-                pTTProperties->nActualPR = 0;
-            }
-            break;*/
             default:
             {
                 pTTProperties->nPropertyVersion = 0;
@@ -240,8 +194,8 @@ void MyApp::Property( ApplicationProperty& rProp )
 
 USHORT MyDispatcher::ExecuteFunction( USHORT nSID, SfxPoolItem** ppArgs, USHORT nMode)
 {
-    (void) ppArgs; /* avoid warning about unused parameter */
-    (void) nMode; /* avoid warning about unused parameter */
+    (void) ppArgs; // avoid warning about unused parameter
+    (void) nMode;  // avoid warning about unused parameter
 
     switch (nSID)
     {
@@ -310,8 +264,8 @@ Reference< XContentProviderManager > InitializeUCB( void )
         ucbhelper::ContentBroker::get()->getContentProviderManagerInterface();
 
     Reference< XContentProvider > xFileProvider
-        ( xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.ucb.FileContentProvider" ) ), UNO_QUERY );
-    xUcb->registerContentProvider( xFileProvider, OUString::createFromAscii( "file" ), sal_True );
+        ( xSMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.FileContentProvider" )) ), UNO_QUERY );
+    xUcb->registerContentProvider( xFileProvider, OUString( RTL_CONSTASCII_USTRINGPARAM( "file" )), sal_True );
 
     return xUcb;
 }
@@ -347,4 +301,4 @@ void MyApp::Main()
     Execute();
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/automation/source/server/makefile.mk b/automation/source/server/makefile.mk
index bced075be72a..a6e1ec711b4c 100644
--- a/automation/source/server/makefile.mk
+++ b/automation/source/server/makefile.mk
@@ -36,17 +36,12 @@ TARGET=server
 # --- Files --------------------------------------------------------
 
 SLOFILES = \
-    $(SLO)$/XMLParser.obj \
-    $(SLO)$/recorder.obj \
-    $(SLO)$/svcommstream.obj \
+    $(EXCEPTIONSFILES) \
     $(SLO)$/cmdbasestream.obj \
-    $(SLO)$/scmdstrm.obj \
-    $(SLO)$/statemnt.obj \
-    $(SLO)$/sta_list.obj \
     $(SLO)$/editwin.obj \
-    $(SLO)$/server.obj \
     $(SLO)$/retstrm.obj \
-    $(SLO)$/profiler.obj
+    $(SLO)$/scmdstrm.obj \
+    $(SLO)$/svcommstream.obj
 
 
 OBJFILES = \
@@ -54,9 +49,12 @@ OBJFILES = \
     $(OBJ)$/svcommstream.obj
 
 EXCEPTIONSFILES = \
-    $(SLO)$/statemnt.obj \
+    $(SLO)$/XMLParser.obj \
+    $(SLO)$/profiler.obj \
+    $(SLO)$/recorder.obj \
     $(SLO)$/server.obj \
-    $(SLO)$/XMLParser.obj
+    $(SLO)$/sta_list.obj \
+    $(SLO)$/statemnt.obj
 
 NOOPTFILES = $(SLO)$/statemnt.obj
 
diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx
index 66f6f95ae783..dd2e4cbd0129 100644
--- a/automation/source/server/server.cxx
+++ b/automation/source/server/server.cxx
@@ -817,18 +817,14 @@ BOOL ImplRemoteControl::QueCommands( ULONG nServiceId, SvStream *pIn )
 #endif
     if ( !m_bInsideExecutionLoop )
     {
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
         m_pDbgWin->AddText( "Posting Event for CommandHdl.\n" );
 #endif
 
         GetpApp()->PostUserEvent( LINK( this, ImplRemoteControl, CommandHdl ) );
     }
-#ifdef DEBUG
-    else
-        m_bInsideExecutionLoop = TRUE;
-#endif
     return TRUE;
-} // BOOL ImplRemoteControl::QueCommands( ULONG nServiceId, SvStream *pIn )
+}
 
 
 SvStream* ImplRemoteControl::GetReturnStream()
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx
index 893dbd6710e3..2497ee2d3eb1 100644
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@ -88,8 +88,9 @@
 #include "retstrm.hxx"
 
 #if OSL_DEBUG_LEVEL > 1
-#include "editwin.hxx"
+#  include "editwin.hxx"
 #endif
+
 #include "rcontrol.hxx"
 #include <automation/communi.hxx>
 #include "testtool.hxx"
@@ -106,10 +107,8 @@
 
 using namespace com::sun::star::frame;
 using namespace com::sun::star::uno;
-//using namespace com::sun::star::util; geht wegen Color nicht
 using namespace com::sun::star::beans;
 using namespace svt;
-//using namespace svt::table;
 
 
 #ifndef SBX_VALUE_DECL_DEFINED
@@ -139,7 +138,6 @@ pfunc_osl_printDebugMessage StatementCommand::pOriginal_osl_DebugMessageFunc = N
     pWin->SetSmartHelpId( SmartId(4321) ); \
     pWin->SetSmartUniqueId( SmartId(1234) );
 
-// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 StatementFlow::StatementFlow( StatementList *pAfterThis, USHORT nArtP )
 : nArt(nArtP)
@@ -166,10 +164,10 @@ StatementFlow::StatementFlow( ULONG nServiceId, SCmdStream *pCmdIn, ImplRemoteCo
     pCmdIn->Read( nArt );
     pCmdIn->Read( nParams );
 
-    if( nParams & PARAM_USHORT_1 )  pCmdIn->Read( nSNr1 );
-    if( nParams & PARAM_ULONG_1 )   pCmdIn->Read( nLNr1 );
-    if( nParams & PARAM_STR_1 )     pCmdIn->Read( aString1 );
-    if( nParams & PARAM_BOOL_1 )    pCmdIn->Read( bBool1 ); // sollte nie auftreten!!
+    if( nParams & PARAM_USHORT_1 ) pCmdIn->Read( nSNr1 );
+    if( nParams & PARAM_ULONG_1 )  pCmdIn->Read( nLNr1 );
+    if( nParams & PARAM_STR_1 )    pCmdIn->Read( aString1 );
+    if( nParams & PARAM_BOOL_1 )   pCmdIn->Read( bBool1 );// Should NEVER happen
 
 #if OSL_DEBUG_LEVEL > 1
     m_pDbgWin->AddText( "Reading FlowControl: " );
@@ -265,7 +263,6 @@ BOOL StatementFlow::Execute()
         #endif
 
         break;
-//  case RET_:
     default:
         DBG_ERROR( "Unknown Flowcontrol" );
         break;
@@ -275,7 +272,6 @@ BOOL StatementFlow::Execute()
     return TRUE;
 }
 
-// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 // neue Hilfsfunktion, die stetig erweitert werden muss
 static short ImpGetRType( Window *pWin, SmartId aUId )
@@ -287,7 +283,6 @@ static short ImpGetRType( Window *pWin, SmartId aUId )
     if( (nUId & 0xE0000000) == 0 ) // keine auto ID
         nRT = C_NoType;
     else {
-//      if( (nUId & 0x1F) == 0 ) // globale Resource
         if( (nUId & 0x1FF) == 0 ) // globale Resource GH: soweit ich das verstanden habe 1FF
             nRT = (short)(C_TabPage - 1 + (nUId >> 29));
         else
@@ -349,19 +344,10 @@ static short ImpGetRType( Window *pWin, SmartId aUId )
         case WINDOW_WARNINGBOX:         nRT = C_WarningBox;     break;
         case WINDOW_ERRORBOX:           nRT = C_ErrorBox;       break;
         case WINDOW_QUERYBOX:           nRT = C_QueryBox;       break;
-#if 0 //ifndef VCL
-        case WINDOW_FILEDIALOG:         nRT = C_FileDlg;        break;
-        case WINDOW_PATHDIALOG:         nRT = C_PathDlg;        break;
-        case WINDOW_PRINTDIALOG:        nRT = C_PrintDlg;       break;
-        case WINDOW_PRINTERSETUPDIALOG: nRT = C_PrinterSetupDlg;break;
-        case WINDOW_COLORDIALOG:        nRT = C_ColorDlg;       break;
-#endif
         case WINDOW_TABDIALOG:          nRT = C_TabDlg;         break;
-//      case WINDOW_TABDIALOG:          nRT = C_SingleTabDlg;   break;
 
         case WINDOW_PATTERNBOX:         nRT = C_PatternBox;     break;
         case WINDOW_TOOLBOX:            nRT = C_ToolBox;        break;
-// Gibts nicht       case WINDOW_VALUESET:          nRT = C_ValueSet;       break;
         case WINDOW_CONTROL:            nRT = C_Control;        break;
         case WINDOW_OKBUTTON:           nRT = C_OkButton;       break;
         case WINDOW_CANCELBUTTON:       nRT = C_CancelButton;   break;
@@ -382,7 +368,6 @@ static short ImpGetRType( Window *pWin, SmartId aUId )
     return nRT;
 }
 
-// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 StatementSlot::StatementSlot( SCmdStream *pCmdIn )
 : pItemArr(NULL)
@@ -479,13 +464,13 @@ void StatementSlot::AddReferer()
     nAnzahl++;
     aArgs.realloc(nAnzahl);
     pArg = aArgs.getArray();
-    pArg[nAnzahl-1].Name = rtl::OUString::createFromAscii("Referer");
-    pArg[nAnzahl-1].Value <<= ::rtl::OUString::createFromAscii("private:user");
+    pArg[nAnzahl-1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" ));
+    pArg[nAnzahl-1].Value <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:user" ));
 
     nAnzahl++;
     aArgs.realloc(nAnzahl);
     pArg = aArgs.getArray();
-    pArg[nAnzahl-1].Name = rtl::OUString::createFromAscii("SynchronMode");
+    pArg[nAnzahl-1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SynchronMode" ));
     pArg[nAnzahl-1].Value <<= sal_Bool( TRUE );
 }
 
@@ -503,16 +488,6 @@ public:
     BOOL bDisposed;
     BOOL bEnabled;
 };
-/*
-struct FeatureStateEvent : public ::com::sun::star::lang::EventObject
-    ::com::sun::star::util::URL FeatureURL;
-    ::rtl::OUString FeatureDescriptor;
-    sal_Bool IsEnabled;
-    sal_Bool Requery;
-    ::com::sun::star::uno::Any State;
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > Source;
-*/
 
 SlotStatusListener::SlotStatusListener()
 : bDisposed( FALSE )
@@ -522,11 +497,7 @@ SlotStatusListener::SlotStatusListener()
 // XStatusListener
 void SAL_CALL SlotStatusListener::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
 {
-//    DBG_ERROR1("FeatureURL: %s", ByteString( String( Event.FeatureURL.Complete ), RTL_TEXTENCODING_UTF8 ).GetBuffer() );
-//    DBG_ERROR1("FeatureDescriptor: %s", ByteString( String( Event.FeatureDescriptor ), RTL_TEXTENCODING_UTF8 ).GetBuffer() );
     bEnabled = Event.IsEnabled;
-//    DBG_ASSERT( Event.IsEnabled, "Not enabled" );
-//    DBG_ASSERT( !Event.Requery, "Requery" );
 }
 
 // XEventListener
@@ -715,7 +686,6 @@ BOOL StatementSlot::Execute()
     return TRUE;
 }
 
-// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 StatementUnoSlot::StatementUnoSlot(SCmdStream *pIn)
 {
@@ -731,7 +701,6 @@ StatementUnoSlot::StatementUnoSlot(SCmdStream *pIn)
 
 }
 
-// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 StatementCommand::StatementCommand( StatementList *pAfterThis, USHORT MethodId, USHORT Params, USHORT Nr1 )
 : nMethodId( MethodId )
@@ -966,8 +935,6 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst
                 for ( i = 0; i < pTB->GetItemCount() ; i++ )
                 {
                     aName = String();
-//                  if ( aName.Len() == 0 )
-//                      aName = pTB->GetQuickHelpText();
                     if ( aName.Len() == 0 )
                         aName = pTB->GetHelpText( pTB->GetItemId( i ) );
                     if ( aName.Len() == 0 )
@@ -1180,8 +1147,7 @@ void SysWinContainer::Resize()
 {
     Size aSize( GetOutputSizePixel() );
     Resizing( aSize );
-//  aSize = pClientWin->GetSizePixel();
-//  aSize = pClientWin->CalcWindowSizePixel();
+
     if ( aSize != GetSizePixel() )
     {
         SetOutputSizePixel( aSize );
@@ -1262,7 +1228,6 @@ public:
     void ConfigSent() { bConfigChanged = FALSE; }
 
     BOOL IsSendData() { return GetItemState( TT_SEND_DATA ) == STATE_CHECK; }
-//  BOOL IsAllWin() { return GetItemState( TT_ALLWIN ) == STATE_CHECK; }
 
     BOOL IsDraging() { return bIsDraging; }
 
@@ -1326,8 +1291,6 @@ void DisplayHidWin::EnableButtons( ULONG nConf )
 
 void DisplayHidWin::Tracking( const TrackingEvent& rTEvt )
 {
-//  if ( nLastItemID == TT_SHOW && GetItemState( TT_SHOW ) == STATE_NOCHECK && ( rTEvt.IsTrackingEnded() || rTEvt.IsTrackingCanceled() ) )
-//      SetDraging( FALSE );
     if ( nLastItemID == TT_SHOW && GetItemState( TT_SHOW ) == STATE_NOCHECK )
         EndTracking( ENDTRACK_CANCEL );
     ToolBox::Tracking( rTEvt);
@@ -1527,7 +1490,6 @@ BOOL StatementCommand::DisplayHID()
 
 
             GetTTSettings()->Old = GetTTSettings()->Act;
-//          GetTTSettings()->Act = GetMouseWin();
             GetTTSettings()->Act = GetTTSettings()->pDisplayHidWin->LastMouseMoveWin();
 
             if ( !StatementList::WinPtrValid ( GetTTSettings()->Old ) )
@@ -1559,19 +1521,14 @@ BOOL StatementCommand::DisplayHID()
             }
             else if ( GetTTSettings()->Act )
             {
-//              SET_WIN(GetTTSettings()->Act);
                 if ( GetTTSettings()->pDisplayHidWin->IsDisplayTextModified() && GetTTSettings()->pDisplayHidWin->GetDisplayText().Len() > 0 )
                 {
                     GetTTSettings()->Act->SetSmartUniqueId( SmartId( GetTTSettings()->pDisplayHidWin->GetDisplayText().ToInt32() ) );
                     GetTTSettings()->pDisplayHidWin->ClearDisplayTextModified();
                 }
             }
-/*          if ( Application::GetLastInputInterval() > 5000 )   // 5 Sekunden lang nix geschehen
-            {
-                GetTTSettings()->pDisplayHidWin->ToTop( TOTOP_NOGRABFOCUS );
-            }
-*/
-            if ( GetTTSettings()->pDisplayHidWin->IsSendData() /*&& bBool2*/ && GetTTSettings()->Act )
+
+            if ( GetTTSettings()->pDisplayHidWin->IsSendData() && GetTTSettings()->Act )
             {
                 if ( !StatementFlow::bSending )
                 {   // Normalerweise syncronisierung über Protokoll. Hier ist das aber asyncron!!!
@@ -1579,7 +1536,7 @@ BOOL StatementCommand::DisplayHID()
                     new StatementFlow( this, F_EndCommandBlock );   // Kommando zum Senden erzeugen und in que eintragen
                 }
             }
-        }   //if ( GetTTSettings()->pDisplayHidWin->IsDraging() )
+        }
         else
         {
             if ( GetTTSettings()->Act )
@@ -1595,12 +1552,6 @@ BOOL StatementCommand::DisplayHID()
                 Advance();
                 QueStatement( NULL );
             }
-//          {                   // Ersten und 2. austauschen.
-//              pFirst = pNext;
-//              pNext = pNext->pNext;
-//              pFirst->pNext = this;
-//          }
-
     }
     else
     {
@@ -1624,9 +1575,6 @@ private:
 
     Timer InplaceTimer;
 
-//  virtual void MouseButtonUp( const MouseEvent& rMEvt );
-//  virtual void MouseMove( const MouseEvent& rMEvt );
-
     PushButton PushButtonTT_PB_NEXT;
     GroupBox GroupBoxTT_GB_TRANSLATION;
     Edit EditTT_E_NEW;
@@ -1752,7 +1700,6 @@ IMPL_LINK( TranslateWin, DoSelect, PushButton*, EMPTYARG )
 {
     if ( bSelecting )
     {
-//      ReleaseMouse();
         bSelecting = FALSE;
     }
     else
@@ -1760,7 +1707,6 @@ IMPL_LINK( TranslateWin, DoSelect, PushButton*, EMPTYARG )
         if ( TestChangedDataSaved() )
         {
             PushButtonTT_PB_RESTORE.Disable();
-//          CaptureMouse();
             bSelecting = TRUE;
         }
     }
@@ -1867,14 +1813,8 @@ long TranslateWin::VCLEventHook( NotifyEvent& rEvt )
             }
             else if ( Act )
             {
-    //          SET_WIN(Act);
             }
-    /*      if ( Application::GetLastInputInterval() > 5000 )   // 5 Sekunden lang nix geschehen
-            {
-                ToTop();
-            }
-    */
-        }   //if ( bSelecting )
+        }
         else
         {
             if ( Act )
@@ -1908,7 +1848,6 @@ long TranslateWin::VCLEventHook( NotifyEvent& rEvt )
                 EditTT_E_COMMENT.Enable();
                 PushButtonTT_PB_ACCEPT.Enable();
             }
-    //      ReleaseMouse();
             bSelecting = FALSE;
         }
     }
@@ -2124,7 +2063,6 @@ void StatementCommand::Translate()
         GetTTSettings()->bToTop = FALSE;
     }
 
-//  GetTTSettings()->pTranslateWin->GetWindow( WINDOW_OVERLAP )->Enable( TRUE, TRUE );
     GetTTSettings()->pTranslateWin->GetWindow( WINDOW_OVERLAP )->EnableInput( TRUE, TRUE );
 
     if ( GetTTSettings()->pTranslateWin->IsTranslationAvailable() )
@@ -2269,7 +2207,6 @@ Window* StatementCommand::GetNextRecoverWin()
             {
                 Window* pTB = pControl->GetChild( 0 );
                 if ( pControl->GetChildCount() == 1 && pTB->GetType() == WINDOW_TOOLBOX )
-//                  return pTB;
                     ;   // do not act on floating toolboxes #i38796
                 else
                     return pControl;
@@ -2456,7 +2393,7 @@ BOOL StatementCommand::Execute()
                                             }
                                             nNr1++;
                                             break;
-                                        case 2:     // BUG 48239
+                                        case 2:
                                         case 1:
                                             if ( pBD->GetPushButton( BUTTONID_NO ) )
                                             {
@@ -2515,48 +2452,45 @@ BOOL StatementCommand::Execute()
                                     ||  (pControl->GetType() == WINDOW_WORKWINDOW)
                                     ||  (pControl->GetType() == WINDOW_BORDERWINDOW) ) )
                         {
-    //                      if ( pControl->GetStyle() & WB_CLOSEABLE )
-                            {
 #ifdef RESET_APPLICATION_TO_BACKING_WINDOW
-                                // Special handling for last Document; do not close the Frame, only the Document
-                                if ( GetDocWinCount() == 1 && IsDocFrame( pControl ) )
+                            // Special handling for last Document; do not close the Frame, only the Document
+                            if ( GetDocWinCount() == 1 && IsDocFrame( pControl ) )
+                            {
+                                if ( IsDocWin( pControl ) )
                                 {
-                                    if ( IsDocWin( pControl ) )
+                                    if ( GetDocFrameMenuBar( pControl ) )
                                     {
-                                        if ( GetDocFrameMenuBar( pControl ) )
+                                        MenuBar* pMenu = GetDocFrameMenuBar( pControl );
+                                        if ( pMenu->HasCloser() )
                                         {
-                                            MenuBar* pMenu = GetDocFrameMenuBar( pControl );
-                                            if ( pMenu->HasCloser() )
-                                            {
-                                                REPORT_WIN_CLOSED( pControl, TypeString(pControl->GetType()));
-                                                SET_WINP_CLOSING(pControl);
+                                            REPORT_WIN_CLOSED( pControl, TypeString(pControl->GetType()));
+                                            SET_WINP_CLOSING(pControl);
 
-                                                pMenu->GetCloserHdl().Call( pMenu );
+                                            pMenu->GetCloserHdl().Call( pMenu );
 
-                                                // nur bei TaskWindows!
-                                                if ( (Window*)nLNr1 != pControl )
-                                                    nNr1 = 1;       // Zum durchprobieren der Buttons beim Schließen
-                                                nLNr1 = (ULONG)pControl;
+                                            // nur bei TaskWindows!
+                                            if ( (Window*)nLNr1 != pControl )
+                                                nNr1 = 1;       // Zum durchprobieren der Buttons beim Schließen
+                                            nLNr1 = (ULONG)pControl;
 
-                                                return FALSE;
-                                            }
+                                            return FALSE;
                                         }
                                     }
                                 }
-                                else
+                            }
+                            else
 #endif // def RESET_APPLICATION_TO_BACKING_WINDOW
-                                {
-                                    REPORT_WIN_CLOSED( pControl, TypeString(pControl->GetType()));
-                                    SET_WINP_CLOSING(pControl);
-                                    ((SystemWindow*)pControl)->Close();
+                            {
+                                REPORT_WIN_CLOSED( pControl, TypeString(pControl->GetType()));
+                                SET_WINP_CLOSING(pControl);
+                                ((SystemWindow*)pControl)->Close();
 
-                                    // Eigentlich nur bei TaskWindows!
-                                    if ( (Window*)nLNr1 != pControl )
-                                        nNr1 = 1;       // Zum durchprobieren der Buttons beim Schließen
-                                    nLNr1 = (ULONG)pControl;
+                                // Eigentlich nur bei TaskWindows!
+                                if ( (Window*)nLNr1 != pControl )
+                                    nNr1 = 1;       // Zum durchprobieren der Buttons beim Schließen
+                                nLNr1 = (ULONG)pControl;
 
-                                    return FALSE;
-                                }
+                                return FALSE;
                             }
                         }
                     }
@@ -2640,8 +2574,6 @@ BOOL StatementCommand::Execute()
         {
             BOOL bWait = FALSE;
             ReportError( GEN_RES_STR0( S_NO_ACTIVE_WINDOW ) );
-//          if ( Application::GetAppWindow() )
-//              bWait = Application::GetAppWindow()->IsWait();
             pRet->GenReturn ( RET_Value, aSmartMethodId, bWait );
             break;
         }
@@ -3011,8 +2943,6 @@ BOOL StatementCommand::Execute()
                             nErrorcode = aDir.GetError();
                             if ( !nErrorcode && !aDir.MakeDir() )
                                 nErrorcode = FSYS_ERR_UNKNOWN;
-//  Workaround für Bug 60693
-//                              nErrorcode = aDir.GetError();
                         }
                         break;
                     case RC_FileCopy:
@@ -3096,7 +3026,7 @@ BOOL StatementCommand::Execute()
                                         break;
                                     }
                                     DirEntry aNextEntry=(*(pDir))[nDirPos++];
-                                    aPath = aNextEntry.GetName(); //Full();
+                                    aPath = aNextEntry.GetName();
                     #ifdef WIN
                                     aNextEntry.ToAbs();
                                     String sFull(aNextEntry.GetFull());
@@ -3129,60 +3059,6 @@ BOOL StatementCommand::Execute()
                                 pRet->GenReturn ( RET_Value, aSmartMethodId, aPath );
                             }
 
-
-
-/* keep old Implementation for now
-                            // neues Verzeichnis einlesen
-                            if ( (nParams & PARAM_STR_1) )
-                            {
-                                if ( pDir )
-                                {
-                                    delete pDir;
-                                    pDir = NULL;
-                                }
-                                DirEntryKind aDirEntryKind = FSYS_KIND_FILE | FSYS_KIND_DIR;
-                                if ( (nParams & PARAM_USHORT_1) && nNr1 )
-                                {
-                                    if ( nNr1 & 16 )
-                                        aDirEntryKind = FSYS_KIND_DIR;
-                                    else
-                                        ReportError( GEN_RES_STR0( S_SELECTION_BY_ATTRIBUTE_ONLY_DIRECTORIES ) );
-                                }
-
-                                DirEntry aEntry( aString1 );
-                                nErrorcode = aEntry.GetError();
-                                if ( !nErrorcode )
-                                {
-                                    nDirPos = 0;
-                                    FileStat aFS( aEntry );
-                                    if ( !aFS.IsKind( FSYS_KIND_WILD ) && !aFS.IsKind( FSYS_KIND_DIR ) && aEntry.Exists() )
-                                    {   // Sonderbehandlung für genau einen Eintrag
-                                        if ( !aFS.IsKind( FSYS_KIND_DIR ) && ( aDirEntryKind == FSYS_KIND_DIR ) )
-                                            pRet->GenReturn ( RET_Value, aSmartMethodId, String() );
-                                        else
-                                            pRet->GenReturn ( RET_Value, aSmartMethodId, (String)(aEntry.GetName()) );
-
-                                        break;
-                                    }
-                                    else
-                                    {
-                                        pDir = new Dir( aEntry, aDirEntryKind );
-                                        nErrorcode = pDir->GetError();
-                                    }
-                                }
-                            }
-
-                            if ( !pDir )
-                                pDir = new Dir;
-
-                            if ( !nErrorcode && ValueOK( aSmartMethodId, GEN_RES_STR0( S_NO_MORE_FILES ), nDirPos+1, pDir->Count()+1 ) )
-                            {
-                                if ( nDirPos == pDir->Count() )
-                                    pRet->GenReturn ( RET_Value, aSmartMethodId, String() );
-                                else
-                                    pRet->GenReturn ( RET_Value, aSmartMethodId, (String)((*pDir)[ nDirPos ].GetName()) );
-                                nDirPos++;
-                            }*/
                         }
                         break;
                     case RC_FileLen:
@@ -3322,18 +3198,13 @@ BOOL StatementCommand::Execute()
         case RC_GetMouseStyle:
             {
                 Pointer aPointer;
-//              if ( DragManager::GetDragManager() )
-//                  aPointer = DragManager::GetDragManager()->GetDragPointer();
-//              else
+                Window *pActualWin = GetMouseWin();
+                if ( pActualWin )
+                    aPointer = pActualWin->GetPointer();
+                else
                 {
-                    Window *pActualWin = GetMouseWin();
-                    if ( pActualWin )
-                        aPointer = pActualWin->GetPointer();
-                    else
-                    {
-                        ReportError( GEN_RES_STR1( S_POINTER_OUTSIDE_APPWIN, RcString( nMethodId ) ) );
-                        aPointer = Pointer( POINTER_NULL );
-                    }
+                    ReportError( GEN_RES_STR1( S_POINTER_OUTSIDE_APPWIN, RcString( nMethodId ) ) );
+                    aPointer = Pointer( POINTER_NULL );
                 }
                 pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)aPointer.GetStyle() );
             }
@@ -3551,8 +3422,6 @@ BOOL StatementCommand::UnpackStorage( SotStorageRef xStorage, DirEntry &aBaseDir
 }
 
 
-// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
 StatementControl::StatementControl( SCmdStream *pCmdIn, USHORT nControlIdType )
 : StatementList()
 , nNr1( 0 )
@@ -3609,8 +3478,6 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, USHORT nControlIdType )
     if( nParams & PARAM_ULONG_1 )   {m_pDbgWin->AddText( " nl1:" );m_pDbgWin->AddText( String::CreateFromInt64( nLNr1 ) );}
     if( nParams & PARAM_STR_1 )     {m_pDbgWin->AddText( " s1:" );m_pDbgWin->AddText( aString1 );}
     if( nParams & PARAM_STR_2 )     {m_pDbgWin->AddText( " s2:" );m_pDbgWin->AddText( aString2 );}
-/*    if( nParams & PARAM_BOOL_1 )    pCmdIn->Read( bBool1 );
-    if( nParams & PARAM_BOOL_2 )    pCmdIn->Read( bBool2 );*/
     m_pDbgWin->AddText( "\n" );
 #endif
 }
@@ -3649,10 +3516,8 @@ BOOL IsDialog(Window *pWin)
 
 
             return TRUE;
-//          break;
         default:
             return FALSE;
-//          break;
     }
 }
 
@@ -4177,11 +4042,9 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
                 Size aS = pControl->GetOutputSizePixel();
                 Point aPos = Point(aS.Width() * nNr1 / 100,aS.Height() * nNr2 / 100);
                 Window *pActualWin = pControl->FindWindow( aPos );
-//                  AnimateMouse( pControl, aPos );
 
                 if ( pActualWin )
                     aPos = pActualWin->AbsoluteScreenToOutputPixel( pControl->OutputToAbsoluteScreenPixel ( aPos ) );
-//                  aPos = pActualWin->ScreenToOutputPixel( pControl->OutputToScreenPixel ( aPos ) );
                 else
                     pActualWin = pControl;
 
@@ -4200,12 +4063,10 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
 
                 if ( pActualWin )
                     aPos = pActualWin->AbsoluteScreenToOutputPixel( pControl->OutputToAbsoluteScreenPixel ( aPos ) );
-//                  aPos = pActualWin->ScreenToOutputPixel( pControl->OutputToScreenPixel ( aPos ) );
                 else
                     pActualWin = pControl;
 
                 AnimateMouse( pActualWin, aPos );
-//                  pActualWin->GrabFocus();
                 MouseEvent aMEvt( aPos, 1, MOUSE_SIMPLECLICK|MOUSE_SELECT, nButton );
                 ImplMouseButtonUp( pActualWin, aMEvt );
             }
@@ -4220,13 +4081,11 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
                 if ( pActualWin )
                 {
                     aPos = pActualWin->AbsoluteScreenToOutputPixel( pControl->OutputToAbsoluteScreenPixel ( aPos ) );
-//                  aPos = pActualWin->ScreenToOutputPixel( pControl->OutputToScreenPixel ( aPos ) );
                 }
                 else
                     pActualWin = pControl;
 
                 AnimateMouse( pActualWin, aPos );
-//                  pActualWin->GrabFocus();
                 MouseEvent aMEvt( aPos, 0, MOUSE_SIMPLEMOVE|MOUSE_DRAGMOVE, nButton );
                 ImplMouseMove( pActualWin, aMEvt );
             }
@@ -4241,7 +4100,6 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
                 if ( pActualWin )
                 {
                     aPos = pActualWin->AbsoluteScreenToOutputPixel( pControl->OutputToAbsoluteScreenPixel ( aPos ) );
-//                  aPos = pActualWin->ScreenToOutputPixel( pControl->OutputToScreenPixel ( aPos ) );
                 }
                 else
                     pActualWin = pControl;
@@ -4314,7 +4172,6 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
                         if ( pActualWin )
                         {
                             aPos = pActualWin->AbsoluteScreenToOutputPixel( pControl->OutputToAbsoluteScreenPixel ( aPos ) );
-    //                      aPos = pActualWin->ScreenToOutputPixel( pControl->OutputToScreenPixel ( aPos ) );
                             pControl = pActualWin;
                         }
                     }
@@ -4383,10 +4240,6 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
                 pControl = pTemp;   // So daß wir unten ohne Fehler durchkommen
                 SplitWindow *pSW = (SplitWindow*) pTemp;
 
-//  Rectangle           GetAutoHideRect() const;
-//  Rectangle           GetFadeInRect() const;
-//  Rectangle           GetFadeOutRect() const;
-
                 switch( nMethodId )
                 {
                     case M_FadeIn:
@@ -4407,7 +4260,6 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
                             ImplMouseButtonDown( pControl, aMEvnt, FORCE_DIRECT_CALL );
                             ImplMouseButtonUp  ( pControl, aMEvnt, FORCE_DIRECT_CALL );
                         }
-//                              pSW->AutoHide();
                         break;
                     case M_IsFadeIn:
                         pRet->GenReturn ( RET_Value, aUId, pSW->IsFadeOutButtonVisible() );
@@ -4629,7 +4481,7 @@ BOOL StatementControl::Execute()
             if ( aSeconds < nNr2 )          // Falls die Stunde umgesprungen ist
                 aSeconds += 60*60;
 
-            if ( /* !IsAccessable(pControl)#87019# */ !pControl || !pControl->IsVisible() )
+            if ( !pControl || !pControl->IsVisible() )
                 pControl = NULL;
             if ( ((nMethodId == M_Exists) && pControl) ||
                  ((nMethodId == M_NotExists) && !pControl) )
@@ -4645,7 +4497,6 @@ BOOL StatementControl::Execute()
             Advance();
             delete this;
             return TRUE;
-//          break;
     }
 
 
@@ -4663,8 +4514,6 @@ BOOL StatementControl::Execute()
 
     if (   nRT == C_Window &&       // Search for WorkWindow to satisfy these commands
          ( nMethodId == M_Close
-//      || nMethodId == M_Size
-//      || nMethodId == M_Move
         || nMethodId == M_IsMax
         || nMethodId == M_IsMin
         || nMethodId == M_IsRestore
@@ -4706,8 +4555,7 @@ BOOL StatementControl::Execute()
             && nMethodId != M_TypeKeys          // TypeKeys macht das selbst, falls eigenes Focushandling gewünscht
             && nMethodId != M_MouseDown
             && nMethodId != M_MouseUp
-            && nMethodId != M_MouseMove
-            /*&& nMethodId != M_MouseDoubleClick*/ )
+            && nMethodId != M_MouseMove )
         {
             if ( !pControl->HasFocus() )
             {
@@ -4748,19 +4596,9 @@ BOOL StatementControl::Execute()
             && nMethodId != M_TypeKeys          // TypeKeys macht das selbst, falls eigenes Focushandling gewünscht
             && nMethodId != M_MouseDown
             && nMethodId != M_MouseUp
-            && nMethodId != M_MouseMove
-            /*&& nMethodId != M_MouseDoubleClick*/ )
+            && nMethodId != M_MouseMove )
             pControl->GrabFocus();
 
-/*  leads to problems because settext sets the text whereas typekeys adds to the text.
-        if ( bDoTypeKeysDelay && nMethodId == M_SetText && ( nParams & PARAM_STR_1 ) )
-        {   // Hier wird das Statement auf ein TypeKeys umgebogen
-            nMethodId = M_TypeKeys;
-            nParams = PARAM_BOOL_1 | PARAM_STR_1;
-            bBool1 = TRUE;
-            pControl->GrabFocus();
-        }
-*/
         if ( !HandleCommonMethods( pControl ) )
         {
             switch( nRT )
@@ -5370,9 +5208,6 @@ BOOL StatementControl::Execute()
                                         if ( aRect.IsEmpty() )
                                         {
                                             pTB->ExecuteCustomMenu();
-/*                                          aRect = pTB->GetMenubuttonRect();
-                                            MouseEvent aMEvnt(aRect.Center(),1,MOUSE_SIMPLECLICK,MOUSE_LEFT);
-                                            ImplMouseButtonDown( pTB, aMEvnt );*/
 
                                             aSubMenuId1 = SmartId();
                                             aSubMenuId2 = SmartId();
@@ -5586,16 +5421,7 @@ BOOL StatementControl::Execute()
                                 bBool1 = TRUE;
                             if( nParams & PARAM_STR_1 )
                             {
-/*                                  ListBox *pLB = ((ListBox*)pControl);
-                                if ( pLB->GetEntryPos( aString1 ) == LISTBOX_ENTRY_NOTFOUND )
-                                    ReportError( aUId, GEN_RES_STR2( S_ENTRY_NOT_FOUND, MethodString( nMethodId ), aString1 ) );
-                                else
-                                {
-                                    pLB->SelectEntry( aString1, bBool1 );
-                                    if ( pLB->IsEntrySelected( aString1 ) ? !bBool1 : bBool1 )  // XOR rein mit BOOL
-                                        ReportError( aUId, GEN_RES_STR2( S_METHOD_FAILED, MethodString( nMethodId ), aString1 ) );
-                                }
-*/                                  ReportError( aUId, GEN_RES_STR1( S_SELECT_DESELECT_VIA_STRING_NOT_IMPLEMENTED, MethodString( nMethodId ) ) );
+                                ReportError( aUId, GEN_RES_STR1( S_SELECT_DESELECT_VIA_STRING_NOT_IMPLEMENTED, MethodString( nMethodId ) ) );
                             }
                             else
                             {
@@ -5822,64 +5648,6 @@ BOOL StatementControl::Execute()
                                         EditBrowseBox* pEBBox = dynamic_cast< EditBrowseBox* >(pControl);
                                         switch( nMethodId )
                                         {
-
-
-    /*
-
-
-    BOOL            MakeFieldVisible( long nRow, USHORT nColId, BOOL bComplete = FALSE );
-    // access to dynamic values of cursor row
-    String          GetColumnTitle( USHORT nColumnId ) const;
-    USHORT          GetColumnId( USHORT nPos ) const;
-    USHORT          GetColumnPos( USHORT nColumnId ) const;
-    // access and movement of cursor
-    long            GetCurRow() const { return nCurRow; }
-    USHORT          GetCurColumnId() const { return nCurColId; }
-    BOOL            GoToRow( long nRow );
-    BOOL            GoToRowAndDoNotModifySelection( long nRow );
-    BOOL            GoToColumnId( USHORT nColId );
-    BOOL            GoToRowColumnId( long nRow, USHORT nColId );
-    // selections
-    void            SetNoSelection();
-    void            SelectAll();
-    void            SelectRow( long nRow, BOOL bSelect = TRUE, BOOL bExpand = TRUE );
-    void            SelectColumnPos( USHORT nCol, BOOL bSelect = TRUE )
-                        { SelectColumnPos( nCol, bSelect, TRUE); }
-    void            SelectColumnId( USHORT nColId, BOOL bSelect = TRUE )
-                        { SelectColumnPos( GetColumnPos(nColId), bSelect, TRUE); }
-    long            GetSelectRowCount() const;
-    USHORT          GetSelectColumnCount() const;
-    BOOL            IsRowSelected( long nRow ) const;
-    BOOL            IsColumnSelected( USHORT nColumnId ) const;
-    long            FirstSelectedRow( BOOL bInverse = FALSE );
-    long            LastSelectedRow( BOOL bInverse = FALSE );
-    long            PrevSelectedRow();
-    long            NextSelectedRow();
-    const MultiSelection* GetSelection() const
-                    { return bMultiSelection ? uRow.pSel : 0; }
-    void            SetSelection( const MultiSelection &rSelection );
-
-    virtual String  GetCellText(long _nRow, USHORT _nColId) const;
-    USHORT GetColumnCount() const { return ColCount(); }
-protected:
-    virtual long    GetRowCount() const;
-
-
-    EditBrowseBox
-
-            sal_Bool IsEditing() const {return aController.Is();}
-            void InvalidateStatusCell(long nRow) {RowModified(nRow, 0);}
-            void InvalidateHandleColumn();
-
-            CellControllerRef Controller() const { return aController; }
-            sal_Int32   GetBrowserFlags() const { return m_nBrowserFlags; }
-
-            virtual void ActivateCell(long nRow, sal_uInt16 nCol, sal_Bool bSetCellFocus = sal_True);
-            virtual void DeactivateCell(sal_Bool bUpdate = sal_True);
-
-
-
-    */
                                             case M_GetSelText :
                                                 {
                                                     pRet->GenReturn ( RET_Value, aUId, pEBBox->GetCellText( pEBBox->GetCurrRow(), pEBBox->GetColumnId( pEBBox->GetCurrColumn() )));
@@ -5928,69 +5696,6 @@ protected:
                                                 }
                                                 break;
 
-
-
-                                                /*
-                                            case M_GetSelCount :
-                                                pRet->GenReturn ( RET_Value, aUId, comm_ULONG(((SvLBox*)pControl)->GetSelectionCount()));
-                                                break;
-                                            case M_GetSelIndex :
-                                                if ( ! (nParams & PARAM_USHORT_1) )
-                                                    nNr1 = 1;
-                                                if ( ValueOK(aUId, CUniString("GetSelIndex"),nNr1,((SvLBox*)pControl)->GetSelectionCount()) )
-                                                {
-                                                    nNr1--;
-                                                    COUNT_LBOX( FirstSelected, NextSelected, nNr1);
-                                                    pRet->GenReturn ( RET_Value, aUId, comm_ULONG( ((SvTreeListBox*)pControl)->GetVisiblePos( pThisEntry )) +1 );
-                                                }
-                                                break;
-                                            case M_GetSelText :
-                                                if ( ! (nParams & PARAM_USHORT_1) )
-                                                    nNr1 = 1;
-                                                if ( ValueOK(aUId, CUniString("GetSelText"),nNr1,((SvLBox*)pControl)->GetSelectionCount()) )
-                                                {
-                                                    nNr1--;
-                                                    COUNT_LBOX( FirstSelected, NextSelected, nNr1);
-                                                    GetFirstValidTextItem( pThisEntry );
-                                                    pRet->GenReturn ( RET_Value, aUId, pItem->GetText() );
-                                                }
-                                                break;
-                                            case M_GetItemCount :
-                                                pRet->GenReturn ( RET_Value, aUId, comm_ULONG(((SvLBox*)pControl)->GetVisibleCount()) );
-                                                break;
-                                            case M_GetItemText :
-                                                if ( ValueOK(aUId, MethodString( nMethodId ),nNr1,((SvLBox*)pControl)->GetVisibleCount()) )
-                                                {
-                                                    SvLBoxEntry *pEntry = (SvLBoxEntry*)((SvTreeListBox*)pControl)->GetEntryAtVisPos( nNr1-1 );
-                                                    GetFirstValidTextItem( pEntry );
-                                                    pRet->GenReturn ( RET_Value, aUId, pItem->GetText() );
-                                                }
-                                                break;
-                                            case M_Select :
-                                                if ( ! (nParams & PARAM_BOOL_1) )
-                                                    bBool1 = TRUE;
-                                                if( nParams & PARAM_STR_1 )
-                                                {
-                / *                                 ListBox *pLB = ((ListBox*)pControl);
-                                                    if ( pLB->GetEntryPos( aString1 ) == LISTBOX_ENTRY_NOTFOUND )
-                                                        ReportError( aUId, GEN_RES_STR2( S_ENTRY_NOT_FOUND, MethodString( nMethodId ), aString1 ) );
-                                                    else
-                                                    {
-                                                        pLB->SelectEntry( aString1, bBool1 );
-                                                        if ( pLB->IsEntrySelected( aString1 ) ? !bBool1 : bBool1 )  // XOR rein mit BOOL
-                                                            ReportError( aUId, GEN_RES_STR2( S_METHOD_FAILED, MethodString( nMethodId ), aString1 ) );
-                                                    }
-                * /                                 ReportError( aUId, GEN_RES_STR1( S_SELECT_DESELECT_VIA_STRING_NOT_IMPLEMENTED, MethodString( nMethodId ) ) );
-                                                }
-                                                else
-                                                {
-                                                    if ( ValueOK(aUId, MethodString( nMethodId ),nNr1,((SvLBox*)pControl)->GetVisibleCount()) )
-                                                    {
-                                                        SvLBoxEntry *pEntry = (SvLBoxEntry*)((SvTreeListBox*)pControl)->GetEntryAtVisPos( nNr1-1 );
-                                                        ((SvTreeListBox*)pControl)->Select ( pEntry, bBool1 );
-                                                    }
-                                                }
-                                                break;*/
                                             default:
                                                 ReportError( aUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "EditBrowseBox" ) );
                                                 break;
@@ -6203,9 +5908,6 @@ protected:
                                                                     pRet->GenReturn ( RET_Value, aUId, aContent );
                                                                 }
                                                                 break;
-                                                            //case TypeClass_FLOAT:         break;
-                                                            //case TypeClass_DOUBLE:        break;
-                                                            //case TypeClass_OCTET:         break;
                                                             case TypeClass_BYTE:
                                                             case TypeClass_SHORT:
                                                             case TypeClass_LONG:
@@ -6218,7 +5920,6 @@ protected:
                                                                     pRet->GenReturn ( RET_Value, aUId, val );
                                                                 }
                                                                 break;
-                                                            //case TypeClass_UNSIGNED_OCTET:break;
                                                             case TypeClass_UNSIGNED_SHORT:
                                                                 {
                                                                     comm_USHORT val = 0;
@@ -6250,7 +5951,6 @@ protected:
                                                         if ( pTC->GoToRow( ::svt::table::RowPos( nNr1-1 ) ) )
                                                         {
                                                             Size aSize( pTC->GetSizePixel() );
-//                                                            DirectLog( S_QAError, UniString::CreateFromInt32( aSize.Width() ).Append( UniString::CreateFromInt32( aSize.Height() ) ) );
                                                             Point aPos( aSize.Width() / 2, aSize.Height() / 2 );
                                                             long nStep = aSize.Height() / 4;
                                                             ::svt::table::RowPos nLastPos;
@@ -6351,7 +6051,6 @@ protected:
                             pRet->GenReturn ( RET_Value, aUId, (comm_BOOL) !((DockingWindow*)pControl)->IsFloatingMode());
                             break;
                         case M_Close:
-                                //aWindowWaitUId = aUId;
                             DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId");
                             SET_WINP_CLOSING(pControl);
                             ((DockingWindow*)pControl)->Close();
@@ -6515,7 +6214,6 @@ protected:
                         case M_Size:
                         case M_Move:
                             goto FloatWin;
-//                          break;
                         case M_IsMax :
                             pRet->GenReturn ( RET_Value, aUId, ((WorkWindow*)pControl)->IsMaximized() );
                             break;
diff --git a/automation/source/testtool/makefile.mk b/automation/source/testtool/makefile.mk
index db8464130c1b..ee885e1429f1 100644
--- a/automation/source/testtool/makefile.mk
+++ b/automation/source/testtool/makefile.mk
@@ -37,18 +37,16 @@ TARGET=testtool
 # --- Allgemein ------------------------------------------------------------
 
 OBJFILES = \
-    $(OBJ)$/cmdstrm.obj              \
+    $(EXCEPTIONSFILES)               \
     $(OBJ)$/cretstrm.obj             \
-    $(OBJ)$/objtest.obj              \
-    $(OBJ)$/tcommuni.obj             \
-    $(OBJ)$/comm_bas.obj             \
     $(OBJ)$/httprequest.obj          \
     
 
 EXCEPTIONSFILES= \
-    $(OBJ)$/tcommuni.obj             \
     $(OBJ)$/cmdstrm.obj              \
-    $(OBJ)$/objtest.obj
+    $(OBJ)$/comm_bas.obj             \
+    $(OBJ)$/objtest.obj              \
+    $(OBJ)$/tcommuni.obj
 
 HXXFILES = $(INCCOM)$/keycodes.hxx			\
     $(INCCOM)$/classes.hxx			\
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 8143700f7cd8..6fc4d9e4a18d 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -44,9 +44,7 @@
 #include <vcl/svapp.hxx>
 #include <svtools/stringtransfer.hxx>
 #include <svl/brdcst.hxx>
-//#ifndef _SBXCLASS_HXX //autogen
 #include <basic/sbx.hxx>
-//#endif
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/frame/XDesktop.hpp>
 #include <comphelper/processfactory.hxx>
@@ -354,7 +352,6 @@ TestToolObj::TestToolObj( String aName, String aFilePath )              // Inter
     pImpl = new ImplTestToolObj;
     pImpl->ProgParam = String();
     pImpl->aFileBase = DirEntry(aFilePath);
-//  pImpl->aLogFileBase = DirEntry();
     pImpl->aHIDDir = DirEntry(aFilePath);
     pImpl->bIsStart = FALSE;
     pImpl->pMyBasic = NULL;
@@ -597,10 +594,6 @@ void TestToolObj::InitTestToolObj()
     MAKE_TT_KEYWORD( "Kontext", SbxCLASS_METHOD, SbxNULL, ID_Kontext );
     MAKE_TT_KEYWORD( "GetNextError", SbxCLASS_VARIABLE, SbxVARIANT, ID_GetError );
     MAKE_TT_KEYWORD( "Start", SbxCLASS_METHOD, SbxSTRING, ID_Start );
-//      pMeth = Make( "Kill", SbxCLASS_METHOD, SbxNULL );
-//      pMeth->SetUserData( ID_Kill );
-    /*      pMeth = Make( "TestReset", SbxCLASS_METHOD, SbxNULL );
-        pMeth->SetUserData( ID_Reset );*/
     MAKE_TT_KEYWORD( "Use", SbxCLASS_METHOD, SbxNULL, ID_Use );
     MAKE_TT_KEYWORD( "StartUse", SbxCLASS_METHOD, SbxNULL, ID_StartUse );
     MAKE_TT_KEYWORD( "FinishUse", SbxCLASS_METHOD, SbxNULL, ID_FinishUse );
@@ -722,17 +715,10 @@ void TestToolObj::InitTestToolObj()
 
     for ( i=0;i<VAR_POOL_SIZE;i++)
     {
-/*              pMyVar = new SbxObject( "Dummy" );
-        pMyVar->SetType( SbxVARIANT );*/
-
-//           pMyVar = new SbxMethod( "Dummy", SbxVARIANT );
-
         pImpl->pMyVars[i] = new SbxTransportMethod( SbxVARIANT );
         pImpl->pMyVars[i]->SetName( CUniString("VarDummy").Append(String::CreateFromInt32(i) ) );
 
         Insert( pImpl->pMyVars[i] );
-//              StartListening( pMyVars[i]->GetBroadcaster(), TRUE );
-
     }
 
     m_pControls = new CNames();
@@ -742,46 +728,9 @@ void TestToolObj::InitTestToolObj()
     nMyVar = 0;
 
     pImpl->pMyBasic->AddFactory( &aComManFac );
-
-
-// Das ist zum testen des IPC
-
-/*      int sent = 0;
-
-    ModelessDialog *pDlg = new ModelessDialog(NULL);
-    pDlg->SetOutputSizePixel(Size(100,30));
-
-    Edit *pMyEd = new Edit(pDlg,WB_CENTER | WB_BORDER);
-    pMyEd->SetSizePixel(Size(100,30));
-    pDlg->Show();
-    pMyEd->Show();
-    Time aTime;
-
-    String VollePackung;
-    VollePackung.Fill(32760,'*');
-
-    BeginBlock();   // zum warm werden
-    EndBlock();
-    ResetError();
-
-    while ( pDlg->IsVisible() && !IsError() )
-    {
-        BeginBlock();
-        In->GenCmdFlow (124,VollePackung);
-        EndBlock();
-        pMyEd->SetText(String("Test Nr. ") + String(++sent));
-        while ( aTime.Get100Sec() / 10 == Time().Get100Sec() / 10 );
-        aTime = Time();
-    }
-
-    delete pMyEd;
-    delete pDlg;
-*/
-// Test ende
-
-
 }
 
+
 TestToolObj::~TestToolObj()
 {
     pImpl->pMyBasic->RemoveFactory( &aComManFac );
@@ -1182,13 +1131,6 @@ void TestToolObj::ReadFlat( String Filename, CNames *&pNames, BOOL bSortByName )
     }
 
     Stream.Close();
-#ifdef DBG_UTIL
-//      int i;
-//      for ( i = 0 ; i < pNames->Count() ; i++ )
-//      {
-//              DBG_ERROR( pNames->GetObject(i)->pData->Kurzname );
-//      }
-#endif
 }
 
 void ReadFlatArray( const ControlDefLoad arWas [], CNames *&pNames )
@@ -1253,7 +1195,6 @@ void TestToolObj::WaitForAnswer ()
 
         while ( !bReturnOK && Ende > Time() )
         {
-//          pTemp = PlugInApplication::GetPlugInApp()->GetReturnFromExecute();
             if ( pTemp )
             {
                 ReturnResults( pTemp );
@@ -1398,7 +1339,6 @@ void TestToolObj::EndBlock()
             SendViaSocket();
         else
         {
-//          PlugInApplication::GetPlugInApp()->ExecuteRemoteStatements( In->GetStream() );
             bReturnOK = FALSE;
             if ( aDialogHandlerName.Len() > 0 )
                 GetpApp()->InsertIdleHdl( LINK( this, TestToolObj, IdleHdl ), 1 );
@@ -1741,13 +1681,11 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
                         WaitForAnswer();
                         if ( IS_ERROR() )
                         {
-//                                                      pVar->PutULong( GET_ERROR()->nError );
                             pVar->PutString( GET_ERROR()->aText );
                             POP_ERROR();
                         }
                         else
                         {
-//                                                      pVar->PutULong( 0 );
                             pVar->PutString( String() );
                         }
                     }
@@ -1770,11 +1708,9 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
                         while ( pCommunicationManager->IsCommunicationRunning() )
                             Application::Reschedule();
 
-                        SingleCommandBlock = TRUE;      // Bug 57188
+                        SingleCommandBlock = TRUE;
                         IsBlock = FALSE;
 
-//                      pCommunicationManager->StartCommunication();
-
                         for (USHORT i=0;i<VAR_POOL_SIZE;i++)
                         {
                             pImpl->pMyVars[i]->SetName( CUniString("VarDummy").Append(UniString::CreateFromInt32(i)) );
@@ -2108,62 +2044,6 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
                     if ( !rPar )  // rPar = NULL  <=>  Kein Parameter
                     {
                         SetError( SbxERR_NOTIMP );
-                        break;
-
-//                                              Das ist total rotten und mu� wohl komplett neu!!
-
-
-/*                      BOOL bWasBlock = IsBlock;
-                        if ( !IsBlock )                 // Impliziter call bei Aufruf mit Methode
-                            if ( SingleCommandBlock )
-                                BeginBlock();
-//                                              if ( !IsError() )
-//                                                      In->GenCmdSlot (128,rPar);
-//                                              ((Controls*)pVar)->pMethodVar->nValue = 128;
-
-                        ULONG nOldValue = ((Controls*)pVar)->GetULong();
-                        // Setzen, so da� beim Return der Wert stimmt
-                        ((Controls*)pVar)->PutULong( 128 );
-                        pImpl->pNextReturn = ((Controls*)pVar)->pMethodVar;
-                        if ( SingleCommandBlock )
-                            EndBlock();
-                        WaitForAnswer();
-                        if ( bWasBlock )
-                            if ( SingleCommandBlock )
-                                BeginBlock();
-                        ((Controls*)pVar)->PutULong( nOldValue );
-
-                        // R�cksetzen, so da� beim n�chsten Aufruf alles klappt
-//                                              ((Controls*)pVar)->SetUserData( 128 );
-
-
-//                                              ((Controls*)pVar)->SetName("xxx");
-                        // Setzen und r�cksetzen der ID, so dass der Notify ohne Wirkung bleibt.
-                        ((Controls*)pVar)->pMethodVar->SetUserData(ID_ErrorDummy);
-                        ((Controls*)pVar)->PutULong( ((Controls*)pVar)->pMethodVar->GetULong() );
-                        ((Controls*)pVar)->pMethodVar->SetUserData(ID_Control);
-
-                        pShortNames->Insert( CUniString("xxx"), SmartId( ((Controls*)pVar)->pMethodVar->nValue ), nSequence );
-
-                        nOldValue = ((Controls*)pVar)->GetULong();
-
-                        SbxVariable *pMember;
-                        if ( ! (pMember = ((Controls*)pVar)->Find(CUniString("ID"),SbxCLASS_DONTCARE)) )
-                        {
-                            pMember = new SbxProperty(CUniString("ID"),SbxVARIANT);
-                            ((Controls*)pVar)->Insert(pMember);
-                        }
-                        pMember->PutULong(((Controls*)pVar)->pMethodVar->nValue);
-
-                        if ( ! (pMember = ((Controls*)pVar)->Find(CUniString("name"),SbxCLASS_DONTCARE)) )
-                        {
-                            pMember = NULL;
-                        }
-                        else
-                            pMember->PutString(CUniString("xxx"));
-
-                                               */
-
                     }
                     else
                         SetError( SbxERR_WRONG_ARGS );
@@ -2194,7 +2074,6 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
                         switch ( ((SbxTransportMethod*)pVar)->nValue )
                         {
                             case RC_WinTree:
-//                              ::svt::OStringTransfer::CopyString(pVar->GetString(), pSomeWindowIDontHave );
                                 break;
                         }
 
@@ -2304,13 +2183,6 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
                         try
                         {
                             Reference< XMultiServiceFactory > xSMgr = comphelper::getProcessServiceFactory();
-// is allways there
-/*                          if ( ! xSMgr.is() )
-                            {
-                                xSMgr = ::cppu::createRegistryServiceFactory(OUString(RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")), sal_True );
-                                if ( xSMgr.is() )
-                                    comphelper::setProcessServiceFactory( xSMgr );
-                            }*/
 
                             OUString aURL( aString );
                             Reference< XConnector > xConnector( xSMgr->createInstance(
@@ -2323,13 +2195,8 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
                                 OUString(), OUString( RTL_CONSTASCII_USTRINGPARAM("urp") ),
                                 xConnection, Reference< XInstanceProvider >() ) );
 
-    //                      Reference< XInterface > xRet( xBridge->getInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ) );
                             Reference< XInterface > xRet( xBridge->getInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice.ServiceManager")) ) );
 
-    //                      Reference< XNamingService > xNamingService(xRet, UNO_QUERY);
-
-    //                      Reference< XInterface > smgr = xNamingService->getRegisteredObject( OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice.ServiceManager" ) ) );
-
                             smgr_xMultiserviceFactory = Reference< XMultiServiceFactory >(xRet, UNO_QUERY);
     //MBA fragen!!
                         }
@@ -2345,7 +2212,6 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
                         if( smgr_xMultiserviceFactory.is() )
                         {
                             Any aAny;
-//                          aAny <<= xBridge;
                             aAny <<= smgr_xMultiserviceFactory;
 
                             SbxObjectRef xMySbxObj = GetSbUnoObject( CUniString("RemoteUnoAppFuerTesttool"), aAny );
@@ -2359,15 +2225,10 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
                         // Hier wird der Remote UNO Kram gestartet
 
                         String aString;
-//                      aString += GetHostConfig();
-//                      aString.AppendAscii( ":" );
-//                      aString += String::CreateFromInt32( GetUnoPortConfig() );
 
-                        Reference< XMultiServiceFactory > xSMgr /* = comphelper::getProcessServiceFactory()*/;
-//                      if ( ! xSMgr.is() )
+                        Reference< XMultiServiceFactory > xSMgr;
                         {
                             xSMgr = ::cppu::createRegistryServiceFactory(OUString(RTL_CONSTASCII_USTRINGPARAM("g:\\iserverproxy.rdb")), sal_True);
-//                          comphelper::setProcessServiceFactory( xSMgr );
                         }
 
                         OUString aURL( aString );
@@ -2384,21 +2245,6 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
                         Reference< XInterface > xRet( xBridge->getInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("XIServerProxy")) ) );
 
 
-/*                      Reference< XIServerProxy > xIS( xRet, UNO_QUERY );
-                        if ( xIS.is() )
-                        {
-                            String aHost( xIS->getIServerHost() );
-
-//                          Reference < XInformationClient > xIC = xIS->createIServerClient( "XInformationClient" );
-                            Reference < XInformationClient > xIC = xIS->createInformationClient();
-                            xIC->getTree(OUString::createFromAscii("r:\\b_server\\config\\stand.lst"), OUString() );
-
-
-                            Reference< XTypeProvider > xTP( xRet, UNO_QUERY );
-                            Sequence < com::sun::star::uno::Type > s = xTP->getTypes();
-                        }
-  */
-
                         if( xRet.is() )
                         {
                             Any aAny;
@@ -3316,11 +3162,6 @@ void TestToolObj::SortControlsByNumber( BOOL bIncludeActive )
                 m_pReverseControls->DeleteAndDestroy( nNr );
 // um VorlagenLaden/UntergeordneteIniDatei/SpeichernDlg/OrdnerDlg/OeffnenDlg/MessageBox/LetzteVersion/GrafikEinfuegenDlg/FarbeDlg/ExportierenDlg/DruckerEinrichten/DruckenDlg/DateiEinfuegenDlg/Active zu verhindern
             }
-/*          if ( m_pReverseControlsSon->Seek_Entry( pZeroItem, &nNr ) )
-            {
-                m_pReverseControlsSon->DeleteAndDestroy( nNr );
-// um VorlagenLaden/UntergeordneteIniDatei/SpeichernDlg/OrdnerDlg/OeffnenDlg/MessageBox/LetzteVersion/GrafikEinfuegenDlg/FarbeDlg/ExportierenDlg/DruckerEinrichten/DruckenDlg/DateiEinfuegenDlg/Active zu verhindern
-            }*/
             delete pZeroItem;
         }
     }
@@ -3401,9 +3242,6 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
                 case RET_Value:
                     if ( pImpl->pNextReturn )
                     {
-//                                              ULONG nHintUserData = pImpl->pNextReturn->GetParent()->GetUserData();
-//                                              pImpl->pNextReturn->GetParent()->SetUserData(0);
-//                                              if ( nUId == pImpl->pNextReturn->GetParent()->GetULong() )
                         if ( aNextReturnId.Matches( aUId ) )
                         {
                             if( nParams & PARAM_ULONG_1 )
@@ -3427,7 +3265,6 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
                         {
                             ADD_ERROR(SbxERR_BAD_ACTION, GEN_RES_STR0(S_RETURNED_VALUE_ID_MISSMATCH) )
                         }
-//                                              pImpl->pNextReturn->GetParent()->SetUserData(nHintUserData);
                         pImpl->pNextReturn = NULL;
                     }
                     else
@@ -3493,7 +3330,6 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
                             ControlItem *pNewItem = new ControlItemUId( String(), aUId );
                             if ( pReverseControlsKontext->Seek_Entry(pNewItem,&nNr) )
                             {
-//                                SmartId aID = pReverseControlsKontext->GetObject(nNr)->pData->aUId;
                                 pWinInfo->aKurzname += pReverseControlsKontext->GetObject(nNr)->pData->Kurzname;
                             }
                             delete pNewItem;
@@ -3671,8 +3507,6 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
                         case S_AssertError:
                             {
                                 ADD_ASSERTION_LOG( aString1 );
-//                              ADD_ERROR_LOG( aString1, aRun.GetModuleName(SbxNAME_SHORT_TYPES),
-//                                  aRun.GetLine(), aRun.GetCol1(), aRun.GetCol2() );
                             }
                             break;
                         case S_QAError:
@@ -4188,7 +4022,6 @@ Controls::Controls( String aCName )
     pMethodVar = new SbxTransportMethod( SbxVARIANT );
     pMethodVar->SetName( CUniString("Dummy") );
     Insert( pMethodVar );
-//      pMethodVar = Make( CUniString("Dummy"), SbxCLASS_PROPERTY, SbxULONG );
 }
 
 
diff --git a/avmedia/source/framework/mediacontrol.hrc b/avmedia/source/framework/mediacontrol.hrc
index 081958ccd42c..f69ab937f5f5 100644
--- a/avmedia/source/framework/mediacontrol.hrc
+++ b/avmedia/source/framework/mediacontrol.hrc
@@ -48,6 +48,4 @@
 #define AVMEDIA_IMG_MUTE        2054
 
 #define AVMEDIA_IMGLST          3072
-#define AVMEDIA_IMGLST_HC       3073
 #define AVMEDIA_IMGLST_L        3074
-#define AVMEDIA_IMGLST_L_HC     3075
diff --git a/avmedia/source/framework/mediacontrol.src b/avmedia/source/framework/mediacontrol.src
index 2ad203e2c34f..22ddc29b3550 100644
--- a/avmedia/source/framework/mediacontrol.src
+++ b/avmedia/source/framework/mediacontrol.src
@@ -32,92 +32,66 @@ String AVMEDIA_STR_OPEN
     Text[en-US] = "Open";
 };
 
-// ------------------------------------------------------------------------------
-
 String AVMEDIA_STR_INSERT
 {
     Text [ en-US ] = "Apply" ;
 };
 
-// ------------------------------------------------------------------------------
-
 String AVMEDIA_STR_PLAY
 {
     Text[en-US] = "Play";
 };
 
-// ------------------------------------------------------------------------------
-
 String AVMEDIA_STR_PAUSE
 {
     Text[en-US] = "Pause";
 };
 
-// ------------------------------------------------------------------------------
-
 String AVMEDIA_STR_STOP
 {
     Text[en-US] = "Stop";
 };
 
-// ------------------------------------------------------------------------------
-
 String AVMEDIA_STR_ENDLESS
 {
     Text[en-US] = "Repeat";
 };
 
-// ------------------------------------------------------------------------------
-
 String AVMEDIA_STR_MUTE
 {
     Text[en-US] = "Mute";
 };
 
-// ------------------------------------------------------------------------------
-
 String AVMEDIA_STR_ZOOM
 {
     Text[en-US] = "View";
 };
 
-// ------------------------------------------------------------------------------
-
 String AVMEDIA_STR_ZOOM_50
 {
     Text[en-US] = "50%";
 };
 
-// ------------------------------------------------------------------------------
-
 String AVMEDIA_STR_ZOOM_100
 {
     Text[en-US] = "100%";
 };
 
-// ------------------------------------------------------------------------------
-
 String AVMEDIA_STR_ZOOM_200
 {
     Text[en-US] = "200%";
 };
 
-// ------------------------------------------------------------------------------
-
 String AVMEDIA_STR_ZOOM_FIT
 {
     Text[en-US] = "Scaled";
 };
 
-// ------------------------------------------------------------------------------
-
 String AVMEDIA_STR_MEDIAPLAYER
 {
     Text[en-US] = "Media Player";
 };
 
-// ------------------------------------------------------------------------------
-
 ImageList AVMEDIA_IMGLST
 {
     Prefix = "av";
@@ -135,8 +109,6 @@ ImageList AVMEDIA_IMGLST
     IdCount = 7;
 };
 
-// ------------------------------------------------------------------------------
-
 ImageList AVMEDIA_IMGLST_L
 {
     Prefix = "avl";
@@ -153,41 +125,3 @@ ImageList AVMEDIA_IMGLST_L
     };
     IdCount = 7;
 };
-
-// ------------------------------------------------------------------------------
-
-ImageList AVMEDIA_IMGLST_HC
-{
-    Prefix = "avh";
-    MaskColor = Color{ Red = 0xff00; Green = 0x0000; Blue = 0xff00; };
-    IdList =
-    {
-        AVMEDIA_IMG_OPEN;
-        AVMEDIA_IMG_PLAY;
-        AVMEDIA_IMG_PAUSE;
-        AVMEDIA_IMG_STOP;
-        AVMEDIA_IMG_ENDLESS;
-        AVMEDIA_IMG_INSERT;
-        AVMEDIA_IMG_MUTE;
-    };
-    IdCount = 7;
-};
-
-// ------------------------------------------------------------------------------
-
-ImageList AVMEDIA_IMGLST_L_HC
-{
-    Prefix = "avlh";
-    MaskColor = Color{ Red = 0xff00; Green = 0x0000; Blue = 0xff00; };
-    IdList =
-    {
-        AVMEDIA_IMG_OPEN;
-        AVMEDIA_IMG_PLAY;
-        AVMEDIA_IMG_PAUSE;
-        AVMEDIA_IMG_STOP;
-        AVMEDIA_IMG_ENDLESS;
-        AVMEDIA_IMG_INSERT;
-        AVMEDIA_IMG_MUTE;
-    };
-    IdCount = 7;
-};
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index d292bd723647..aba551d8f928 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -424,7 +424,7 @@ void SAL_CALL SoundHandler::dispatch( const css::util::URL&
         // I think we can the following ones:
         //  a) look for given extension of url to map our type decision HARD CODED!!!
         //  b) return preferred type every time... it's easy :-)
-        sTypeName = ::rtl::OUString::createFromAscii("wav_Wave_Audio_File");
+        sTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wav_Wave_Audio_File"));
         aDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()] <<= sTypeName;
         aDescriptor >> lDescriptor;
     }
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 7a5defdb7dd1..23e2510eee11 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -73,7 +73,8 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
 {
     // Initialize GStreamer library
     int argc = 1;
-    char *arguments[] = { "libreoffice.org" };
+    char name[] = "libreoffice";
+    char *arguments[] = { name };
     char** argv = arguments;
     GError* pError = NULL;
 
diff --git a/avmedia/source/gstreamer/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx
index 1a0fcc52240a..36ac2182fa00 100644
--- a/avmedia/source/gstreamer/gstuno.cxx
+++ b/avmedia/source/gstreamer/gstuno.cxx
@@ -62,7 +62,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, voi
         {
             uno::Reference< registry::XRegistryKey > xNewKey1(
                 static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey(
-                ::rtl::OUString::createFromAscii( "/com.sun.star.comp.media.Manager_GStreamer/UNO/SERVICES/com.sun.star.media.Manager_GStreamer" ) ) );
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/com.sun.star.comp.media.Manager_GStreamer/UNO/SERVICES/com.sun.star.media.Manager_GStreamer" )) ) );
 
             bRet = sal_True;
         }
@@ -86,11 +86,11 @@ extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void*
 
     if( rtl_str_compare( pImplName, "com.sun.star.comp.media.Manager_GStreamer" ) == 0 )
     {
-        const ::rtl::OUString aServiceName( ::rtl::OUString::createFromAscii( "com.sun.star.media.Manager_GStreamer" ) );
+        const ::rtl::OUString aServiceName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.media.Manager_GStreamer" )) );
 
         xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
                         reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
-                        ::rtl::OUString::createFromAscii( "com.sun.star.comp.media.Manager_GStreamer" ),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.media.Manager_GStreamer" )),
                         create_MediaPlayer, uno::Sequence< ::rtl::OUString >( &aServiceName, 1 ) ) );
     }
 
diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx
index 5385d4047742..4e0f6f3c3dfb 100644
--- a/avmedia/source/gstreamer/gstwindow.cxx
+++ b/avmedia/source/gstreamer/gstwindow.cxx
@@ -133,7 +133,7 @@ void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
 // XWindow
 // ------------------------------------------------------------------------------
 
-void SAL_CALL Window::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags )
+void SAL_CALL Window::setPosSize( sal_Int32 /*X*/, sal_Int32 /*Y*/, sal_Int32 /*Width*/, sal_Int32 /*Height*/, sal_Int16 /*Flags*/ )
     throw (uno::RuntimeException)
 {
 //     if( mnFrameWnd )
@@ -173,7 +173,7 @@ awt::Rectangle SAL_CALL Window::getPosSize()
 
 // ------------------------------------------------------------------------------
 
-void SAL_CALL Window::setVisible( sal_Bool bVisible )
+void SAL_CALL Window::setVisible( sal_Bool /*bVisible*/ )
     throw (uno::RuntimeException)
 {
 //     if( mnFrameWnd )
@@ -189,7 +189,7 @@ void SAL_CALL Window::setVisible( sal_Bool bVisible )
 
 // ------------------------------------------------------------------------------
 
-void SAL_CALL Window::setEnable( sal_Bool bEnable )
+void SAL_CALL Window::setEnable( sal_Bool /*bEnable*/ )
     throw (uno::RuntimeException)
 {
 //     if( mnFrameWnd )
diff --git a/avmedia/source/quicktime/quicktimeuno.cxx b/avmedia/source/quicktime/quicktimeuno.cxx
index 2f4e646483e7..6301fd655ed3 100644
--- a/avmedia/source/quicktime/quicktimeuno.cxx
+++ b/avmedia/source/quicktime/quicktimeuno.cxx
@@ -63,9 +63,9 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void* /* pServiceManager */, v
         {
             uno::Reference< registry::XRegistryKey > xNewKey1(
                 static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey(
-                ::rtl::OUString::createFromAscii(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                     "/" AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME "/UNO/SERVICES/"
-                    AVMEDIA_QUICKTIME_MANAGER_SERVICENAME ) ) );
+                    AVMEDIA_QUICKTIME_MANAGER_SERVICENAME )) ) );
 
             bRet = sal_True;
         }
@@ -89,11 +89,11 @@ extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void*
 
     if( rtl_str_compare( pImplName, AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME ) == 0 )
     {
-        const ::rtl::OUString aServiceName( ::rtl::OUString::createFromAscii( AVMEDIA_QUICKTIME_MANAGER_SERVICENAME ) );
+        const ::rtl::OUString aServiceName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_QUICKTIME_MANAGER_SERVICENAME )) );
 
         xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
                         reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
-                        ::rtl::OUString::createFromAscii( AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME ),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME )),
                         create_MediaPlayer, uno::Sequence< ::rtl::OUString >( &aServiceName, 1 ) ) );
     }
 
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index bb903da70593..3b6c28ef93dd 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -382,8 +382,8 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
     for( i = 0; i < ( sizeof( pFilters ) / sizeof( char* ) ); i += 2 )
     {
         rFilterNameVector.push_back( ::std::make_pair< ::rtl::OUString, ::rtl::OUString >(
-                                        ::rtl::OUString::createFromAscii( pFilters[ i ] ),
-                                        ::rtl::OUString::createFromAscii( pFilters[ i + 1 ] ) ) );
+                                        ::rtl::OUString::createFromAscii(pFilters[i]),
+                                        ::rtl::OUString::createFromAscii(pFilters[i+1]) ) );
     }
 }
 
@@ -475,7 +475,7 @@ bool MediaWindow::isMediaURL( const ::rtl::OUString& rURL, bool bDeep, Size* pPr
                     fprintf(stderr, "-->%s uno reference \n\n",AVMEDIA_MANAGER_SERVICE_NAME);
 
                     uno::Reference< ::com::sun::star::media::XManager > xManager(
-                        xFactory->createInstance( ::rtl::OUString::createFromAscii( AVMEDIA_MANAGER_SERVICE_NAME ) ),
+                        xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_MANAGER_SERVICE_NAME )) ),
                         uno::UNO_QUERY );
 
                     if( xManager.is() )
diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx
index 9374e1cfb690..959b89e47cb8 100644
--- a/avmedia/source/viewer/mediawindowbase_impl.cxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.cxx
@@ -71,7 +71,7 @@ uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl:
         {
 
             uno::Reference< ::com::sun::star::media::XManager > xManager(
-                xFactory->createInstance( ::rtl::OUString::createFromAscii( AVMEDIA_MANAGER_SERVICE_NAME ) ),
+                xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_MANAGER_SERVICE_NAME )) ),
                 uno::UNO_QUERY );
 
             if( xManager.is() )
diff --git a/avmedia/source/win/winuno.cxx b/avmedia/source/win/winuno.cxx
index 3a63f757fbd3..85a3795c4d6e 100644
--- a/avmedia/source/win/winuno.cxx
+++ b/avmedia/source/win/winuno.cxx
@@ -63,7 +63,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void*, void* pRegistryKey )
         {
             uno::Reference< registry::XRegistryKey > xNewKey1(
                 static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey(
-                ::rtl::OUString::createFromAscii( "/com.sun.star.comp.media.Manager_DirectX/UNO/SERVICES/com.sun.star.media.Manager_DirectX" ) ) );
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/com.sun.star.comp.media.Manager_DirectX/UNO/SERVICES/com.sun.star.media.Manager_DirectX" )) ) );
 
             bRet = sal_True;
         }
@@ -87,11 +87,11 @@ extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void*
 
     if( rtl_str_compare( pImplName, "com.sun.star.comp.media.Manager_DirectX" ) == 0 )
     {
-        const ::rtl::OUString aServiceName( ::rtl::OUString::createFromAscii( "com.sun.star.media.Manager_DirectX" ) );
+        const ::rtl::OUString aServiceName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.media.Manager_DirectX" )) );
 
         xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
                         reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
-                        ::rtl::OUString::createFromAscii( "com.sun.star.comp.media.Manager_DirectX" ),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.media.Manager_DirectX" )),
                         create_MediaPlayer, uno::Sequence< ::rtl::OUString >( &aServiceName, 1 ) ) );
     }
 
diff --git a/avmedia/source/xine/xineuno.cxx b/avmedia/source/xine/xineuno.cxx
index 59c325d32562..ed8e6b5334a4 100644
--- a/avmedia/source/xine/xineuno.cxx
+++ b/avmedia/source/xine/xineuno.cxx
@@ -63,9 +63,9 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void* /* pServiceManager */, v
         {
             uno::Reference< registry::XRegistryKey > xNewKey1(
                 static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey(
-                ::rtl::OUString::createFromAscii(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                     "/" AVMEDIA_XINE_MANAGER_IMPLEMENTATIONNAME "/UNO/SERVICES/"
-                    AVMEDIA_XINE_MANAGER_SERVICENAME ) ) );
+                    AVMEDIA_XINE_MANAGER_SERVICENAME )) ) );
 
             bRet = sal_True;
         }
@@ -89,11 +89,11 @@ extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void*
 
     if( rtl_str_compare( pImplName, AVMEDIA_XINE_MANAGER_IMPLEMENTATIONNAME ) == 0 )
     {
-        const ::rtl::OUString aServiceName( ::rtl::OUString::createFromAscii( AVMEDIA_XINE_MANAGER_SERVICENAME ) );
+        const ::rtl::OUString aServiceName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_XINE_MANAGER_SERVICENAME )) );
 
         xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
                         reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
-                        ::rtl::OUString::createFromAscii( AVMEDIA_XINE_MANAGER_IMPLEMENTATIONNAME ),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_XINE_MANAGER_IMPLEMENTATIONNAME )),
                         create_MediaPlayer, uno::Sequence< ::rtl::OUString >( &aServiceName, 1 ) ) );
     }
 
diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index 8bf7d3316cd0..83702dd31d98 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -57,29 +57,17 @@
 #define RID_POPUP_DLGED                 ( RID_BASICIDE_START + 62 )
 #define RID_PRINTDLG_STRLIST            ( RID_BASICIDE_START + 78 )
 
-#define RID_IMG_LOCKED_HC               ( RID_BASICIDE_START +  6 )
 #define RID_IMGBTN_REMOVEWATCH          ( RID_BASICIDE_START +  8 )
 #define RID_IMGBTN_GOTOCALL             ( RID_BASICIDE_START +  9 )
-#define RID_IMGLST_LAYOUT_HC            ( RID_BASICIDE_START + 14 )
-#define RID_IMG_REMOVEWATCH_HC          ( RID_BASICIDE_START + 15 )
 #define RID_IMG_INSTALLATION            ( RID_BASICIDE_START + 20 )
-#define RID_IMG_INSTALLATION_HC         ( RID_BASICIDE_START + 21 )
 #define RID_IMG_DOCUMENT                ( RID_BASICIDE_START + 22 )
-#define RID_IMG_DOCUMENT_HC             ( RID_BASICIDE_START + 23 )
 #define RID_IMG_MODLIB                  ( RID_BASICIDE_START + 24 )
-#define RID_IMG_MODLIB_HC               ( RID_BASICIDE_START + 25 )
 #define RID_IMG_MODLIBNOTLOADED         ( RID_BASICIDE_START + 26 )
-#define RID_IMG_MODLIBNOTLOADED_HC      ( RID_BASICIDE_START + 27 )
 #define RID_IMG_MODULE                  ( RID_BASICIDE_START + 28 )
-#define RID_IMG_MODULE_HC               ( RID_BASICIDE_START + 29 )
 #define RID_IMG_MACRO                   ( RID_BASICIDE_START + 30 )
-#define RID_IMG_MACRO_HC                ( RID_BASICIDE_START + 31 )
 #define RID_IMG_DLGLIB                  ( RID_BASICIDE_START + 32 )
-#define RID_IMG_DLGLIB_HC               ( RID_BASICIDE_START + 33 )
 #define RID_IMG_DLGLIBNOTLOADED         ( RID_BASICIDE_START + 34 )
-#define RID_IMG_DLGLIBNOTLOADED_HC      ( RID_BASICIDE_START + 35 )
 #define RID_IMG_DIALOG                  ( RID_BASICIDE_START + 36 )
-#define RID_IMG_DIALOG_HC               ( RID_BASICIDE_START + 37 )
 #define RID_IMG_LOCKED                  ( RID_BASICIDE_START + 41 )
 #define RID_IMGLST_LAYOUT               ( RID_BASICIDE_START + 49 )
 
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index b2b20e105b4e..416762f04b61 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -329,7 +329,7 @@ void AccessibleDialogControlShape::propertyChange( const beans::PropertyChangeEv
 
 ::rtl::OUString AccessibleDialogControlShape::getImplementationName() throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.basctl.AccessibleShape" );
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.basctl.AccessibleShape" ));
 }
 
 // -----------------------------------------------------------------------------
@@ -350,7 +350,7 @@ sal_Bool AccessibleDialogControlShape::supportsService( const ::rtl::OUString& r
 Sequence< ::rtl::OUString > AccessibleDialogControlShape::getSupportedServiceNames() throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.drawing.AccessibleShape" );
+    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.AccessibleShape" ));
     return aNames;
 }
 
@@ -444,7 +444,7 @@ sal_Int16 AccessibleDialogControlShape::getAccessibleRole(  ) throw (RuntimeExce
 
 // -----------------------------------------------------------------------------
 
-::rtl::OUString AccessibleDialogControlShape::getAccessibleDescription( ) throw (RuntimeException)
+::rtl::OUString AccessibleDialogControlShape::getAccessibleDescription(  ) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index b8c43e4daa37..ce914b2cb520 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -60,7 +60,7 @@ DBG_NAME( AccessibleDialogWindow )
 
 
 // -----------------------------------------------------------------------------
-//  class ChildDescriptor
+// class ChildDescriptor
 // -----------------------------------------------------------------------------
 
 AccessibleDialogWindow::ChildDescriptor::ChildDescriptor( DlgEdObj* _pDlgEdObj )
@@ -116,7 +116,7 @@ bool AccessibleDialogWindow::ChildDescriptor::operator<( const ChildDescriptor&
 }
 
 // -----------------------------------------------------------------------------
-//  class AccessibleDialogWindow
+// class AccessibleDialogWindow
 // -----------------------------------------------------------------------------
 
 AccessibleDialogWindow::AccessibleDialogWindow( DialogWindow* pDialogWindow )
@@ -648,7 +648,7 @@ void AccessibleDialogWindow::disposing()
 
 ::rtl::OUString AccessibleDialogWindow::getImplementationName() throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.basctl.AccessibleWindow" );
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.basctl.AccessibleWindow" ));
 }
 
 // -----------------------------------------------------------------------------
@@ -669,7 +669,7 @@ sal_Bool AccessibleDialogWindow::supportsService( const ::rtl::OUString& rServic
 Sequence< ::rtl::OUString > AccessibleDialogWindow::getSupportedServiceNames() throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleWindow" );
+    aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.AccessibleWindow" ));
     return aNames;
 }
 
@@ -778,7 +778,7 @@ sal_Int16 AccessibleDialogWindow::getAccessibleRole(  ) throw (RuntimeException)
 
 // -----------------------------------------------------------------------------
 
-::rtl::OUString AccessibleDialogWindow::getAccessibleDescription(   ) throw (RuntimeException)
+::rtl::OUString AccessibleDialogWindow::getAccessibleDescription(  ) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index ef1289736106..d2688fb696ba 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1461,8 +1461,7 @@ ModulWindowLayout::ModulWindowLayout( Window* pParent ) :
     bVSplitted(FALSE),
     bHSplitted(FALSE),
     m_pModulWindow(0),
-    m_aImagesNormal(IDEResId(RID_IMGLST_LAYOUT)),
-    m_aImagesHighContrast(IDEResId(RID_IMGLST_LAYOUT_HC))
+    m_aImagesNormal(IDEResId(RID_IMGLST_LAYOUT))
 {
     SetBackground(GetSettings().GetStyleSettings().GetWindowColor());
 
@@ -1750,10 +1749,9 @@ void ModulWindowLayout::updateSyntaxHighlighting()
     }
 }
 
-Image ModulWindowLayout::getImage(USHORT nId, bool bHighContrastMode) const
+Image ModulWindowLayout::getImage(USHORT nId) const
 {
-    return (bHighContrastMode ? m_aImagesHighContrast : m_aImagesNormal).
-        GetImage(nId);
+    return m_aImagesNormal.GetImage(nId);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 12ae6a23fb6f..9d22f36a47f0 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -192,7 +192,6 @@ private:
     BreakPointList  aBreakPointList;
     ModulWindow*    pModulWindow;
     BOOL            bErrorMarker;
-    bool m_bHighContrastMode;
 
     virtual void DataChanged(DataChangedEvent const & rDCEvt);
 
@@ -467,7 +466,6 @@ private:
     svtools::ColorConfig m_aColorConfig;
 
     ImageList m_aImagesNormal;
-    ImageList m_aImagesHighContrast;
 
     virtual void DataChanged(DataChangedEvent const & rDCEvt);
 
@@ -496,7 +494,7 @@ public:
     WatchWindow&    GetWatchWindow()    { return aWatchWindow; }
     StackWindow&    GetStackWindow()    { return aStackWindow; }
 
-    Image getImage(USHORT nId, bool bHighContrastMode) const;
+    Image getImage(USHORT nId) const;
 
     inline Color const & getSyntaxColor(TokenTypes eType) const
     { return m_aSyntaxColors[eType]; }
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 2fa67b22fb48..63fcf84d6290 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -67,12 +67,11 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
 
-long nVirtToolBoxHeight;    // wird im WatchWindow init., im Stackwindow verw.
+long nVirtToolBoxHeight;    // inited in WatchWindow, used in Stackwindow
 long nHeaderBarHeight;
 
 #define SCROLL_LINE     12
 #define SCROLL_PAGE     60
-
 #define DWBORDER        3
 
 static const char cSuffixes[] = "%&!#@$";
@@ -80,9 +79,12 @@ static const char cSuffixes[] = "%&!#@$";
 MapUnit eEditMapUnit = MAP_100TH_MM;
 
 
-// #108672 Helper functions to get/set text in TextEngine
-// using the stream interface (get/setText() only supports
-// tools Strings limited to 64K).
+/**
+ * Helper functions to get/set text in TextEngine using
+ * the stream interface.
+ *
+ * get/setText() only supports tools Strings limited to 64K).
+ */
 ::rtl::OUString getTextEngineText( ExtTextEngine* pEngine )
 {
     SvMemoryStream aMemStream;
@@ -108,20 +110,19 @@ void setTextEngineText( ExtTextEngine* pEngine, const ::rtl::OUString aStr )
 
 void lcl_DrawIDEWindowFrame( DockingWindow* pWin )
 {
-    // The result of using explicit colors here appears to be harmless when
-    // switching to high contrast mode:
-    if ( !pWin->IsFloatingMode() )
-    {
-        Size aSz = pWin->GetOutputSizePixel();
-        const Color aOldLineColor( pWin->GetLineColor() );
-        pWin->SetLineColor( Color( COL_WHITE ) );
-        // oben eine weisse..
-        pWin->DrawLine( Point( 0, 0 ), Point( aSz.Width(), 0 ) );
-        // unten eine schwarze...
-        pWin->SetLineColor( Color( COL_BLACK ) );
-        pWin->DrawLine( Point( 0, aSz.Height() - 1 ), Point( aSz.Width(), aSz.Height() - 1 ) );
-        pWin->SetLineColor( aOldLineColor );
-    }
+    if ( pWin->IsFloatingMode() )
+        return;
+
+    Size aSz = pWin->GetOutputSizePixel();
+    const Color aOldLineColor( pWin->GetLineColor() );
+    pWin->SetLineColor( Color( COL_WHITE ) );
+    // White line on top
+    pWin->DrawLine( Point( 0, 0 ), Point( aSz.Width(), 0 ) );
+    // Black line at bottom
+    pWin->SetLineColor( Color( COL_BLACK ) );
+    pWin->DrawLine( Point( 0, aSz.Height() - 1 ),
+                    Point( aSz.Width(), aSz.Height() - 1 ) );
+    pWin->SetLineColor( aOldLineColor );
 }
 
 void lcl_SeparateNameAndIndex( const String& rVName, String& rVar, String& rIndex )
@@ -190,7 +191,6 @@ __EXPORT EditorWindow::~EditorWindow()
     {
         EndListening( *pEditEngine );
         pEditEngine->RemoveView( pEditView );
-//      pEditEngine->SetViewWin( 0 );
         delete pEditView;
         delete pEditEngine;
     }
@@ -230,12 +230,12 @@ String EditorWindow::GetWordAtCursor()
                 nEnd = nLength;
             }
 
-            // Nicht den Selektierten Bereich, sondern an der CursorPosition,
-            // falls Teil eines Worts markiert.
+            // Not the selected range, but at the CursorPosition,
+            // if a word is partially selected.
             if ( !aWord.Len() )
                 aWord = pTextEngine->GetWord( rSelEnd );
 
-            // Kann leer sein, wenn komplettes Word markiert, da Cursor dahinter.
+            // Can be empty when full word selected, as Cursor behing it
             if ( !aWord.Len() && pEditView->HasSelection() )
                 aWord = pTextEngine->GetWord( rSelStart );
         }
@@ -248,7 +248,7 @@ void __EXPORT EditorWindow::RequestHelp( const HelpEvent& rHEvt )
 {
     BOOL bDone = FALSE;
 
-    // Sollte eigentlich mal aktiviert werden...
+    // Should have been activated at some point
     if ( pEditEngine )
     {
         if ( rHEvt.GetMode() & HELPMODE_CONTEXT )
@@ -316,11 +316,11 @@ void __EXPORT EditorWindow::RequestHelp( const HelpEvent& rHEvt )
 
 void __EXPORT EditorWindow::Resize()
 {
-    // ScrollBars, etc. passiert in Adjust...
+    // ScrollBars, etc. happens in Adjust...
     if ( pEditView )
     {
         long nVisY = pEditView->GetStartDocPos().Y();
-//      pEditView->SetOutputArea( Rectangle( Point( 0, 0 ), GetOutputSize() ) );
+
         pEditView->ShowCursor();
         Size aOutSz( GetOutputSizePixel() );
         long nMaxVisAreaStart = pEditView->GetTextEngine()->GetTextHeight() - aOutSz.Height();
@@ -341,7 +341,6 @@ void __EXPORT EditorWindow::Resize()
 }
 
 
-
 void __EXPORT EditorWindow::MouseMove( const MouseEvent &rEvt )
 {
     if ( pEditView )
@@ -349,7 +348,6 @@ void __EXPORT EditorWindow::MouseMove( const MouseEvent &rEvt )
 }
 
 
-
 void __EXPORT EditorWindow::MouseButtonUp( const MouseEvent &rEvt )
 {
     if ( pEditView )
@@ -389,10 +387,8 @@ BOOL EditorWindow::ImpCanModify()
     BOOL bCanModify = TRUE;
     if ( StarBASIC::IsRunning() )
     {
-        // Wenn im Trace-Mode, entweder Trace abbrechen oder
-        // Eingabe verweigern
-        // Im Notify bei Basic::Stoped die Markierungen in den Modulen
-        // entfernen!
+        // If in Trace-mode, abort the trace or refuse input
+        // Remove markers in the modules in Notify at Basic::Stoped
         if ( QueryBox( 0, WB_OK_CANCEL, String( IDEResId( RID_STR_WILLSTOPPRG ) ) ).Execute() == RET_OK )
         {
             pModulWindow->GetBasicStatus().bIsRunning = FALSE;
@@ -406,7 +402,7 @@ BOOL EditorWindow::ImpCanModify()
 
 void __EXPORT EditorWindow::KeyInput( const KeyEvent& rKEvt )
 {
-    if ( !pEditView )   // Passiert unter W95 bei letzte Version, Ctrl-Tab
+    if ( !pEditView )   // Happens in Win95
         return;
 
 #if OSL_DEBUG_LEVEL > 1
@@ -471,7 +467,7 @@ void __EXPORT EditorWindow::KeyInput( const KeyEvent& rKEvt )
 
 void __EXPORT EditorWindow::Paint( const Rectangle& rRect )
 {
-    if ( !pEditEngine )     // spaetestens jetzt brauche ich sie...
+    if ( !pEditEngine )     // We need it now at latest
         CreateEditEngine();
 
     pEditView->Paint( rRect );
@@ -489,10 +485,10 @@ BOOL EditorWindow::SetSourceInBasic( BOOL bQuiet )
 
     BOOL bChanged = FALSE;
     if ( pEditEngine && pEditEngine->IsModified()
-        && !GetEditView()->IsReadOnly() )   // Added because of #i60626, otherwise
+        && !GetEditView()->IsReadOnly() )   // Added for #i60626, otherwise
             // any read only bug in the text engine could lead to a crash later
     {
-        if ( !StarBASIC::IsRunning() ) // Nicht zur Laufzeit!
+        if ( !StarBASIC::IsRunning() ) // Not at runtime!
         {
             ::rtl::OUString aModule = getTextEngineText( pEditEngine );
 
@@ -937,7 +933,6 @@ BreakPointWindow::BreakPointWindow( Window* pParent ) :
     pModulWindow = 0;
     nCurYOffset = 0;
     setBackgroundColor(GetSettings().GetStyleSettings().GetFieldColor());
-    m_bHighContrastMode = GetSettings().GetStyleSettings().GetHighContrastMode();
     nMarkerPos = MARKER_NOMARKER;
 
     // nCurYOffset merken und nicht von EditEngine holen.
@@ -971,9 +966,9 @@ void __EXPORT BreakPointWindow::Paint( const Rectangle& )
     long nLineHeight = GetTextHeight();
 
     Image aBrk1(((ModulWindowLayout *) pModulWindow->GetLayoutWindow())->
-                getImage(IMGID_BRKENABLED, m_bHighContrastMode));
+                getImage(IMGID_BRKENABLED));
     Image aBrk0(((ModulWindowLayout *) pModulWindow->GetLayoutWindow())->
-                getImage(IMGID_BRKDISABLED, m_bHighContrastMode));
+                getImage(IMGID_BRKDISABLED));
     Size aBmpSz( aBrk1.GetSizePixel() );
     aBmpSz = PixelToLogic( aBmpSz );
     Point aBmpOff( 0, 0 );
@@ -1022,8 +1017,7 @@ void BreakPointWindow::ShowMarker( BOOL bShow )
 
     Image aMarker(((ModulWindowLayout*)pModulWindow->GetLayoutWindow())->
                   getImage(bErrorMarker
-                           ? IMGID_ERRORMARKER : IMGID_STEPMARKER,
-                           m_bHighContrastMode));
+                           ? IMGID_ERRORMARKER : IMGID_STEPMARKER));
 
     Size aMarkerSz( aMarker.GetSizePixel() );
     aMarkerSz = PixelToLogic( aMarkerSz );
@@ -1155,7 +1149,6 @@ void BreakPointWindow::DataChanged(DataChangedEvent const & rDCEvt)
             != rDCEvt.GetOldSettings()->GetStyleSettings().GetFieldColor())
         {
             setBackgroundColor(aColor);
-            m_bHighContrastMode = GetSettings().GetStyleSettings().GetHighContrastMode();
             Invalidate();
         }
     }
@@ -1223,8 +1216,6 @@ WatchWindow::WatchWindow( Window* pParent ) :
     aXEdit.GetAccelerator().InsertItem( 2, KeyCode( KEY_ESCAPE ) );
     aXEdit.Show();
 
-    aRemoveWatchButton.SetModeImage(Image(IDEResId(RID_IMG_REMOVEWATCH_HC)),
-                                    BMP_COLOR_HIGHCONTRAST);
     aRemoveWatchButton.SetClickHdl( LINK( this, WatchWindow, ButtonHdl ) );
     aRemoveWatchButton.SetPosPixel( Point( nTextLen + aXEdit.GetSizePixel().Width() + 4, 2 ) );
     Size aSz( aRemoveWatchButton.GetModeImage().GetSizePixel() );
@@ -1535,7 +1526,6 @@ StackWindow::StackWindow( Window* pParent ) :
     aSz.Width() += 6;
     aSz.Height() += 6;
     aGotoCallButton.SetSizePixel( aSz );
-//  aGotoCallButton.Show(); // wird vom Basic noch nicht unterstuetzt!
     aGotoCallButton.Hide();
 
     // make stack window keyboard accessible
@@ -1697,11 +1687,6 @@ void __EXPORT ComplexEditorWindow::Resize()
     aEdtWindow.SetPosSizePixel( Point( DWBORDER+aBrkSz.Width()-1, DWBORDER ), aEWSz );
 
     aEWVScrollBar.SetPosSizePixel( Point( aOutSz.Width()-DWBORDER-nSBWidth, DWBORDER ), Size( nSBWidth, aSz.Height() ) );
-
-    // Macht das EditorWindow, ausserdem hier falsch, da Pixel
-//  aEWVScrollBar.SetPageSize( aEWSz.Height() * 8 / 10 );
-//  aEWVScrollBar.SetVisibleSize( aSz.Height() );
-//  Invalidate();
 }
 
 IMPL_LINK( ComplexEditorWindow, ScrollHdl, ScrollBar *, pCurScrollBar )
@@ -1719,7 +1704,6 @@ IMPL_LINK( ComplexEditorWindow, ScrollHdl, ScrollBar *, pCurScrollBar )
     return 0;
 }
 
-// virtual
 void ComplexEditorWindow::DataChanged(DataChangedEvent const & rDCEvt)
 {
     Window::DataChanged(rDCEvt);
@@ -1736,7 +1720,6 @@ void ComplexEditorWindow::DataChanged(DataChangedEvent const & rDCEvt)
     }
 }
 
-// virtual
 uno::Reference< awt::XWindowPeer >
 EditorWindow::GetComponentInterface(BOOL bCreate)
 {
@@ -1760,7 +1743,7 @@ WatchTreeListBox::WatchTreeListBox( Window* pParent, WinBits nWinBits )
 
 WatchTreeListBox::~WatchTreeListBox()
 {
-    // User-Daten zerstoeren...
+    // Destroy user data
     SvLBoxEntry* pEntry = First();
     while ( pEntry )
     {
@@ -1845,7 +1828,6 @@ void WatchTreeListBox::RequestingChilds( SvLBoxEntry * pParent )
             pChildItem->maName = aBaseName;
 
             String aIndexStr = String( RTL_CONSTASCII_USTRINGPARAM( "(" ) );
-            // pChildItem->mpArray = pItem->mpArray;
             pChildItem->mpArrayParentItem = pItem;
             pChildItem->nDimLevel = nThisLevel;
             pChildItem->nDimCount = pItem->nDimCount;
@@ -1911,14 +1893,10 @@ SbxBase* WatchTreeListBox::ImplGetSBXForEntry( SvLBoxEntry* pEntry, bool& rbArra
         }
         // Array?
         else if( (pArray = pItem->GetRootArray()) != NULL )
-        // else if( (pArray = pItem->mpArray) != NULL )
         {
             rbArrayElement = true;
             if( pParentItem->nDimLevel + 1 == pParentItem->nDimCount )
-            // if( pItem->nDimLevel == pItem->nDimCount )
                 pSBX = pArray->Get( pItem->pIndices );
-            // else
-                // pSBX = pArray;
         }
     }
     else
@@ -2042,8 +2020,8 @@ BOOL WatchTreeListBox::ImplBasicEntryEdited( SvLBoxEntry* pEntry, const String&
 
     UpdateWatches();
 
-    // Der Text soll niemals 1-zu-1 uebernommen werden, weil dann das
-    // UpdateWatches verlorengeht.
+    // The text should never be taken/copied 1:1,
+    // as the UpdateWatches will be lost
     return FALSE;
 }
 
@@ -2096,7 +2074,6 @@ static String implCreateTypeStringForDimArray( WatchItem* pItem, SbxDataType eTy
 
 
 void implEnableChildren( SvLBoxEntry* pEntry, bool bEnable )
-// inline void implEnableChildren( SvLBoxEntry* pEntry, bool bEnable )
 {
     if( bEnable )
     {
@@ -2124,7 +2101,7 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped )
     {
         WatchItem* pItem = (WatchItem*)pEntry->GetUserData();
         String aVName( pItem->maName );
-        DBG_ASSERT( aVName.Len(), "Var? - Darf nicht leer sein!" );
+        DBG_ASSERT( aVName.Len(), "Var? - Must not be empty!" );
         String aWatchStr;
         String aTypeStr;
         if ( pCurMethod )
@@ -2137,7 +2114,6 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped )
             {
                 SbxDimArray* pRootArray = pItem->GetRootArray();
                 SbxDataType eType = pRootArray->GetType();
-                // SbxDataType eType = pItem->mpArray->GetType();
                 aTypeStr = implCreateTypeStringForDimArray( pItem, eType );
                 implEnableChildren( pEntry, true );
             }
@@ -2146,7 +2122,7 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped )
             if ( pSBX && pSBX->ISA( SbxVariable ) && !pSBX->ISA( SbxMethod ) )
             {
                 SbxVariable* pVar = (SbxVariable*)pSBX;
-                // Sonderbehandlung fuer Arrays:
+                // extra treatment of arrays
                 SbxDataType eType = pVar->GetType();
                 if ( eType & SbxARRAY )
                 {
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 244440823169..6b1ec9cfea16 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -234,9 +234,9 @@ void DialogWindow::KeyInput( const KeyEvent& rKEvt )
 
 void DialogWindow::Command( const CommandEvent& rCEvt )
 {
-    if ( ( rCEvt.GetCommand() == COMMAND_WHEEL ) ||
-            ( rCEvt.GetCommand() == COMMAND_STARTAUTOSCROLL ) ||
-            ( rCEvt.GetCommand() == COMMAND_AUTOSCROLL ) )
+    if ( ( rCEvt.GetCommand() == COMMAND_WHEEL           ) ||
+         ( rCEvt.GetCommand() == COMMAND_STARTAUTOSCROLL ) ||
+         ( rCEvt.GetCommand() == COMMAND_AUTOSCROLL      ) )
     {
         HandleScrollCommand( rCEvt, GetHScrollBar(), GetVScrollBar() );
     }
@@ -273,17 +273,6 @@ IMPL_LINK( DialogWindow, NotifyUndoActionHdl, SfxUndoAction *, pUndoAction )
 {
     (void)pUndoAction;
 
-    // not working yet for unocontrols
-    /*
-    if (pUndoAction)
-    {
-        pUndoMgr->AddUndoAction( pUndoAction );
-        SfxBindings* pBindings = BasicIDE::GetBindingsPtr();
-        if ( pBindings )
-            pBindings->Invalidate( SID_UNDO );
-    }
-    */
-
     return 0;
 }
 
@@ -682,8 +671,7 @@ void DialogWindow::UpdateBrowser()
         ((PropBrw*)(pChildWin->GetWindow()))->Update( pIDEShell );
 }
 
-static ::rtl::OUString aResourceResolverPropName =
-    ::rtl::OUString::createFromAscii( "ResourceResolver" );
+static ::rtl::OUString aResourceResolverPropName( RTL_CONSTASCII_USTRINGPARAM( "ResourceResolver" ));
 
 BOOL DialogWindow::SaveDialog()
 {
@@ -732,7 +720,7 @@ BOOL DialogWindow::SaveDialog()
         Reference< XInputStream > xInput( xISP->createInputStream() );
 
         Reference< XSimpleFileAccess > xSFI( xMSF->createInstance
-            ( ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), UNO_QUERY );
+            ( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" )) ), UNO_QUERY );
 
         Reference< XOutputStream > xOutput;
         try
@@ -790,9 +778,9 @@ BOOL DialogWindow::SaveDialog()
                 aURLObj.removeSegment();
                 ::rtl::OUString aURL( aURLObj.GetMainURL( INetURLObject::NO_DECODE ) );
                 sal_Bool bReadOnly = sal_False;
-                ::rtl::OUString aComment( ::rtl::OUString::createFromAscii( "# " ) );
+                ::rtl::OUString aComment( RTL_CONSTASCII_USTRINGPARAM( "# " ));
                 aComment += aDialogName;
-                aComment += ::rtl::OUString::createFromAscii( " strings" );
+                aComment += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " strings" ));
                 Reference< task::XInteractionHandler > xDummyHandler;
 
                 // Remove old properties files in case of overwriting Dialog files
@@ -801,7 +789,7 @@ BOOL DialogWindow::SaveDialog()
                     Sequence< ::rtl::OUString > aContentSeq = xSFI->getFolderContents( aURL, false );
 
                     ::rtl::OUString aDialogName_( aDialogName );
-                    aDialogName_ += ::rtl::OUString::createFromAscii( "_" );
+                    aDialogName_ += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_" ));
                     sal_Int32 nCount = aContentSeq.getLength();
                     const ::rtl::OUString* pFiles = aContentSeq.getConstArray();
                     for( int i = 0 ; i < nCount ; i++ )
@@ -922,8 +910,7 @@ NameClashQueryBox::NameClashQueryBox( Window* pParent,
     AddButton( String( IDEResId( RID_STR_DLGIMP_CLASH_REPLACE ) ), RET_NO, 0 );
     AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
 
-    SetImage( GetSettings().GetStyleSettings().GetHighContrastMode() ?
-        QueryBox::GetStandardImageHC() : QueryBox::GetStandardImage() );
+    SetImage( QueryBox::GetStandardImage() );
 }
 
 
@@ -948,8 +935,7 @@ LanguageMismatchQueryBox::LanguageMismatchQueryBox( Window* pParent,
     AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
     AddButton( BUTTON_HELP, BUTTONID_HELP, BUTTONDIALOG_HELPBUTTON, 4 );
 
-    SetImage( GetSettings().GetStyleSettings().GetHighContrastMode() ?
-        QueryBox::GetStandardImageHC() : QueryBox::GetStandardImage() );
+    SetImage( QueryBox::GetStandardImage() );
 }
 
 BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocument& rDocument, const String& aLibName )
@@ -1000,7 +986,7 @@ BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocumen
                 ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ), UNO_QUERY_THROW );
 
             Reference< XSimpleFileAccess > xSFI( xMSF->createInstance
-                ( ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), UNO_QUERY_THROW );
+                ( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" )) ), UNO_QUERY_THROW );
 
             Reference< XInputStream > xInput;
             if( xSFI->exists( aCurPath ) )
@@ -1044,7 +1030,7 @@ BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocumen
             if( bDialogAlreadyExists )
             {
                 String aQueryBoxTitle( IDEResId( RID_STR_DLGIMP_CLASH_TITLE ) );
-                String aQueryBoxText( IDEResId( RID_STR_DLGIMP_CLASH_TEXT ) );
+                String aQueryBoxText(  IDEResId( RID_STR_DLGIMP_CLASH_TEXT  ) );
                 aQueryBoxText.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "$(ARG1)" ) ), aXmlDlgName );
 
                 NameClashQueryBox aQueryBox( pWin, aQueryBoxTitle, aQueryBoxText );
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 80928ca87ec5..0ad75f2fd725 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -1160,13 +1160,10 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, BOOL bUpdateTabBar, BO
 
 void BasicIDEShell::ManageToolbars()
 {
-    static ::rtl::OUString aLayoutManagerName = ::rtl::OUString::createFromAscii( "LayoutManager" );
-    static ::rtl::OUString aMacroBarResName =
-        ::rtl::OUString::createFromAscii( "private:resource/toolbar/macrobar" );
-    static ::rtl::OUString aDialogBarResName =
-        ::rtl::OUString::createFromAscii( "private:resource/toolbar/dialogbar" );
-    static ::rtl::OUString aInsertControlsBarResName =
-        ::rtl::OUString::createFromAscii( "private:resource/toolbar/insertcontrolsbar" );
+    static ::rtl::OUString aLayoutManagerName( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ));
+    static ::rtl::OUString aMacroBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/macrobar" ));
+    static ::rtl::OUString aDialogBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/dialogbar" ));
+    static ::rtl::OUString aInsertControlsBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertcontrolsbar" ));
     (void)aInsertControlsBarResName;
 
     if( !pCurWin )
@@ -1257,10 +1254,7 @@ long BasicIDEShell::CallBasicBreakHdl( StarBASIC* pBasic )
         {
             if ( bAppWindowDisabled )
                 Application::GetDefDialogParent()->Enable( FALSE );
-        /*
-            if ( bDispatcherLocked )
-                SFX_APP()->LockDispatcher( TRUE );
-        */
+
             if ( nWaitCount )
             {
                 BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
@@ -1316,7 +1310,6 @@ void __EXPORT BasicIDEShell::AdjustPosSizePixel( const Point &rPos, const Size &
         return;
 
     Size aSz( rSize );
-//  long nScrollbarWidthPixel = aVScrollBar.GetSizePixel().Width();
     Size aScrollBarBoxSz( aScrollBarBox.GetSizePixel() );
     aSz.Height() -= aScrollBarBoxSz.Height();
 
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 9b5d01636047..5300784fa9aa 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -88,7 +88,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
 using ::rtl::OUString;
 
-static const rtl::OUString sStandardLibName(  rtl::OUString::createFromAscii("Standard") );
+static const rtl::OUString sStandardLibName( RTL_CONSTASCII_USTRINGPARAM("Standard"));
 
 typedef ::cppu::WeakImplHelper1< container::XContainerListener > ContainerListenerBASE;
 
@@ -162,8 +162,6 @@ SFX_IMPL_NAMED_VIEWFACTORY( BasicIDEShell, "Default" )
 }
 
 
-// MI: Prinzipiel IDL, aber ich lieber doch nicht?
-// SFX_IMPL_ /*IDL_*/ INTERFACE( BasicIDEShell, SfxViewShell, IDEResId( RID_STR_IDENAME ) )
 SFX_IMPL_INTERFACE( BasicIDEShell, SfxViewShell, IDEResId( RID_STR_IDENAME ) )
 {
     SFX_CHILDWINDOW_REGISTRATION( SID_SEARCH_DLG );
@@ -176,7 +174,6 @@ SFX_IMPL_INTERFACE( BasicIDEShell, SfxViewShell, IDEResId( RID_STR_IDENAME ) )
 #define IDE_VIEWSHELL_FLAGS     SFX_VIEW_CAN_PRINT|SFX_VIEW_NO_NEWWINDOW
 
 
-// Hack for #101048
 static sal_Int32 GnBasicIDEShellCount;
 sal_Int32 getBasicIDEShellCount( void )
     { return GnBasicIDEShellCount; }
@@ -288,10 +285,6 @@ __EXPORT BasicIDEShell::~BasicIDEShell()
         if ( pListener )
             pListener->removeContainerListener( m_aCurDocument, m_aCurLibName );
 
-    // MI: Das gab einen GPF im SDT beim Schliessen da dann der ViewFrame die
-    // ObjSh loslaesst. Es wusste auch keiner mehr wozu das gut war.
-    // GetViewFrame()->GetObjectShell()->Broadcast( SfxSimpleHint( SFX_HINT_DYING ) );
-
     SFX_APP()->LeaveBasicCall();
     IDE_DLL()->GetExtraData()->ShellInCriticalSection() = FALSE;
 
@@ -433,14 +426,11 @@ USHORT __EXPORT BasicIDEShell::PrepareClose( BOOL bUI, BOOL bForBrowsing )
     }
     else
     {
-        // Hier unguenstig, wird zweimal gerufen...
-//      StoreAllWindowData();
-
         BOOL bCanClose = TRUE;
         for ( ULONG nWin = 0; bCanClose && ( nWin < aIDEWindowTable.Count() ); nWin++ )
         {
             IDEBaseWindow* pWin = aIDEWindowTable.GetObject( nWin );
-            if ( /* !pWin->IsSuspended() && */ !pWin->CanClose() )
+            if ( !pWin->CanClose() )
             {
                 if ( m_aCurLibName.Len() && ( pWin->IsDocument( m_aCurDocument ) || pWin->GetLibName() != m_aCurLibName ) )
                     SetCurLib( ScriptDocument::getApplicationScriptDocument(), String(), false );
@@ -1061,5 +1051,4 @@ void BasicIDEShell::ImplStartListening( StarBASIC* pBasic )
     StartListening( pBasic->GetBroadcaster(), TRUE /* Nur einmal anmelden */ );
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src
index 556211f690af..30d0b9b8fff8 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -343,49 +343,53 @@ ImageButton RID_IMGBTN_REMOVEWATCH
     };
     QuickHelpText [ en-US ] = "Remove Watch" ;
 };
-Image RID_IMG_REMOVEWATCH_HC
-{
-    ImageBitmap = Bitmap { File = "baswatr_h.bmp" ; };
-    MASKCOLOR
-};
 ImageButton RID_IMGBTN_GOTOCALL
 {
     HelpId = HID_BASICIDE_GOTOALL ;
     SmallStyle = TRUE ;
     ButtonImage = Image { ImageBitmap = Bitmap { File = "basgocl.bmp" ; }; } ;
 };
+
 String RID_STR_REMOVEWATCH
 {
     Text [ en-US ] = "Watch:" ;
 };
+
 String RID_STR_STACK
 {
     Text [ en-US ] = "Calls: " ;
 };
+
 String RID_STR_USERMACROS
 {
     Text [ en-US ] = "My Macros" ;
 };
+
 String RID_STR_USERDIALOGS
 {
     Text [ en-US ] = "My Dialogs" ;
 };
+
 String RID_STR_USERMACROSDIALOGS
 {
     Text [ en-US ] = "My Macros & Dialogs" ;
 };
+
 String RID_STR_SHAREMACROS
 {
     Text [ en-US ] = "%PRODUCTNAME Macros" ;
 };
+
 String RID_STR_SHAREDIALOGS
 {
     Text [ en-US ] = "%PRODUCTNAME Dialogs" ;
 };
+
 String RID_STR_SHAREMACROSDIALOGS
 {
     Text [ en-US ] = "%PRODUCTNAME Macros & Dialogs" ;
 };
+
 Menu RID_POPUP_BRKPROPS
 {
     Text [ en-US ] = "Properties" ;
@@ -411,6 +415,7 @@ Menu RID_POPUP_BRKPROPS
         };
     };
 };
+
 Menu RID_POPUP_BRKDLG
 {
     Text [ en-US ] = "Manage Breakpoints" ;
@@ -425,6 +430,7 @@ Menu RID_POPUP_BRKDLG
         };
     };
 };
+
 Menu RID_POPUP_TABBAR
 {
     DefaultItemId = SID_BASICIDE_HIDECURPAGE ;
@@ -487,6 +493,7 @@ Menu RID_POPUP_TABBAR
         };
     };
 };
+
 Menu RID_POPUP_DLGED
 {
     DefaultItemId = SID_SHOW_PROPERTYBROWSER ;
@@ -500,6 +507,7 @@ Menu RID_POPUP_DLGED
         };
     };
 };
+
 ImageList RID_IMGLST_LAYOUT
 {
     Prefix = "im";
@@ -512,148 +520,92 @@ ImageList RID_IMGLST_LAYOUT
         IMGID_ERRORMARKER ;
     };
 };
-ImageList RID_IMGLST_LAYOUT_HC
-{
-    Prefix = "imh";
-    MASKCOLOR
-    IdList =
-    {
-        IMGID_BRKENABLED ;
-        IMGID_BRKDISABLED ;
-        IMGID_STEPMARKER ;
-        IMGID_ERRORMARKER ;
-    };
-};
 Image RID_IMG_LOCKED
 {
     ImageBitmap = Bitmap { File = "locked.bmp" ; };
     MASKCOLOR
 };
-Image RID_IMG_LOCKED_HC
-{
-    ImageBitmap = Bitmap { File = "locked_h.bmp" ; };
-    MASKCOLOR
-};
+
 Image RID_IMG_INSTALLATION
 {
     ImageBitmap = Bitmap { File = "harddisk_16.png"; };
     MASKCOLOR
 };
-Image RID_IMG_INSTALLATION_HC
-{
-    ImageBitmap = Bitmap { File = "harddisk_16_h.png"; };
-    MASKCOLOR
-};
 Image RID_IMG_DOCUMENT
 {
     ImageBitmap = Bitmap { File = "im30826.png"; };
     MASKCOLOR
 };
-Image RID_IMG_DOCUMENT_HC
-{
-    ImageBitmap = Bitmap { File = "imh30826.png"; };
-    MASKCOLOR
-};
 Image RID_IMG_MODLIB
 {
     ImageBitmap = Bitmap { File = "im30820.png"; };
     MASKCOLOR
 };
-Image RID_IMG_MODLIB_HC
-{
-    ImageBitmap = Bitmap { File = "imh30820.png"; };
-    MASKCOLOR
-};
 Image RID_IMG_MODLIBNOTLOADED
 {
     ImageBitmap = Bitmap { File = "im30827.png"; };
     MASKCOLOR
 };
-Image RID_IMG_MODLIBNOTLOADED_HC
-{
-    ImageBitmap = Bitmap { File = "imh30827.png"; };
-    MASKCOLOR
-};
 Image RID_IMG_MODULE
 {
     ImageBitmap = Bitmap { File = "im30821.png"; };
     MASKCOLOR
 };
-Image RID_IMG_MODULE_HC
-{
-    ImageBitmap = Bitmap { File = "imh30821.png"; };
-    MASKCOLOR
-};
 Image RID_IMG_MACRO
 {
     ImageBitmap = Bitmap { File = "im30822.png"; };
     MASKCOLOR
 };
-Image RID_IMG_MACRO_HC
-{
-    ImageBitmap = Bitmap { File = "imh30822.png"; };
-    MASKCOLOR
-};
 Image RID_IMG_DLGLIB
 {
     ImageBitmap = Bitmap { File = "dialogfolder_16.png"; };
     MASKCOLOR
 };
-Image RID_IMG_DLGLIB_HC
-{
-    ImageBitmap = Bitmap { File = "dialogfolder_16_h.png"; };
-    MASKCOLOR
-};
 Image RID_IMG_DLGLIBNOTLOADED
 {
     ImageBitmap = Bitmap { File = "dialogfoldernot_16.png"; };
     MASKCOLOR
 };
-Image RID_IMG_DLGLIBNOTLOADED_HC
-{
-    ImageBitmap = Bitmap { File = "dialogfoldernot_16_h.png"; };
-    MASKCOLOR
-};
 Image RID_IMG_DIALOG
 {
     ImageBitmap = Bitmap { File = "im30823.png"; };
     MASKCOLOR
 };
-Image RID_IMG_DIALOG_HC
-{
-    ImageBitmap = Bitmap { File = "imh30823.png"; };
-    MASKCOLOR
-};
 String RID_STR_QUERYREPLACEMACRO
 {
     Text [ en-US ] = "Do you want to overwrite the XX macro?" ;
 };
+
 String RID_STR_TRANSLATION_NOTLOCALIZED
 {
     Text [ en-US ] = "<Not localized>" ;
 };
+
 String RID_STR_TRANSLATION_DEFAULT
 {
     Text [ en-US ] = "[Default Language]" ;
 };
+
 String RID_STR_DOCUMENT_OBJECTS
 {
     Text [ en-US ] = "Document Objects" ;
 };
+
 String RID_STR_USERFORMS
 {
     Text [ en-US ] = "Forms" ;
 };
+
 String RID_STR_NORMAL_MODULES
 {
     Text [ en-US ] = "Modules" ;
 };
+
 String RID_STR_CLASS_MODULES
 {
     Text [ en-US ] = "Class Modules" ;
 };
 
-
 String RID_STR_DLGIMP_CLASH_RENAME
 {
     Text [ en-US ] = "Rename" ;
@@ -709,39 +661,9 @@ String RID_STR_DLGIMP_MISMATCH_TEXT
 #define MN_PLHELP       31
 #define MN_PLTEMPLATES  11
 
-
 /*
 
 The application menu bar resource has become obsolete. You can now find the menu bar definition at:
 <project>/basicide/menubar/menubar.xml.
 
 */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 4fb2679cbc9f..d8224f586aa3 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -71,7 +71,7 @@ void ModuleInfoHelper::getObjectName( const uno::Reference< container::XNameCont
             script::ModuleInfo aModuleInfo = xVBAModuleInfo->getModuleInfo( rModName );
             uno::Any aObject( aModuleInfo.ModuleObject );
             uno::Reference< lang::XServiceInfo > xServiceInfo( aObject, uno::UNO_QUERY );
-            if( xServiceInfo.is() && xServiceInfo->supportsService( rtl::OUString::createFromAscii( "ooo.vba.excel.Worksheet" ) ) )
+            if( xServiceInfo.is() && xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.Worksheet" )) ) )
             {
                 uno::Reference< container::XNamed > xNamed( aObject, uno::UNO_QUERY );
                 if( xNamed.is() )
@@ -234,12 +234,10 @@ void BasicTreeListBox::ScanEntry( const ScriptDocument& rDocument, LibraryLocati
     {
         String aRootName( GetRootEntryName( rDocument, eLocation ) );
         Image aImage;
-        Image aImageHC;
-        GetRootEntryBitmaps( rDocument, aImage, aImageHC );
+        GetRootEntryBitmaps( rDocument, aImage );
         pDocumentRootEntry = AddEntry(
             aRootName,
             aImage,
-            aImageHC,
             0, true,
             std::auto_ptr< BasicEntry >( new BasicDocumentEntry( rDocument, eLocation ) ) );
     }
@@ -286,21 +284,15 @@ void BasicTreeListBox::ImpCreateLibEntries( SvLBoxEntry* pDocumentRootEntry, con
             }
 
             // create tree list box entry
-            USHORT nId, nIdHC;
+            USHORT nId;
             if ( ( nMode & BROWSEMODE_DIALOGS ) && !( nMode & BROWSEMODE_MODULES ) )
-            {
                 nId = bLoaded ? RID_IMG_DLGLIB : RID_IMG_DLGLIBNOTLOADED;
-                nIdHC = bLoaded ? RID_IMG_DLGLIB_HC : RID_IMG_DLGLIBNOTLOADED_HC;
-            }
             else
-            {
                 nId = bLoaded ? RID_IMG_MODLIB : RID_IMG_MODLIBNOTLOADED;
-                nIdHC = bLoaded ? RID_IMG_MODLIB_HC : RID_IMG_MODLIBNOTLOADED_HC;
-            }
             SvLBoxEntry* pLibRootEntry = FindEntry( pDocumentRootEntry, aLibName, OBJ_TYPE_LIBRARY );
             if ( pLibRootEntry )
             {
-                SetEntryBitmaps( pLibRootEntry, Image( IDEResId( nId ) ), Image( IDEResId( nIdHC ) ) );
+                SetEntryBitmaps( pLibRootEntry, Image( IDEResId( nId ) ) );
                 if ( IsExpanded( pLibRootEntry ) )
                     ImpCreateLibSubEntries( pLibRootEntry, rDocument, aLibName );
             }
@@ -309,7 +301,6 @@ void BasicTreeListBox::ImpCreateLibEntries( SvLBoxEntry* pDocumentRootEntry, con
                 pLibRootEntry = AddEntry(
                     aLibName,
                     Image( IDEResId( nId ) ),
-                    Image( IDEResId( nIdHC ) ),
                     pDocumentRootEntry, true,
                     std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_LIBRARY ) ) );
             }
@@ -347,7 +338,6 @@ void BasicTreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const
                             pModuleEntry = AddEntry(
                                 aModName,
                                 Image( IDEResId( RID_IMG_MODULE ) ),
-                                Image( IDEResId( RID_IMG_MODULE_HC ) ),
                                 pLibRootEntry, false,
                                 std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_MODULE ) ) );
 
@@ -366,7 +356,6 @@ void BasicTreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const
                                     pEntry = AddEntry(
                                         aName,
                                         Image( IDEResId( RID_IMG_MACRO ) ),
-                                        Image( IDEResId( RID_IMG_MACRO_HC ) ),
                                         pModuleEntry, false,
                                         std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_METHOD ) ) );
                             }
@@ -403,7 +392,6 @@ void BasicTreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const
                         pDialogEntry = AddEntry(
                             aDlgName,
                             Image( IDEResId( RID_IMG_DIALOG ) ),
-                            Image( IDEResId( RID_IMG_DIALOG_HC ) ),
                             pLibRootEntry, false,
                             std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_DIALOG ) ) );
                 }
@@ -433,7 +421,7 @@ void BasicTreeListBox::ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEnt
         SvLBoxEntry* pLibSubRootEntry = FindEntry( pLibRootEntry, aEntryName, eType );
         if( pLibSubRootEntry )
         {
-            SetEntryBitmaps( pLibSubRootEntry, Image( IDEResId( RID_IMG_MODLIB ) ), Image( IDEResId( RID_IMG_MODLIB_HC ) ) );
+            SetEntryBitmaps( pLibSubRootEntry, Image( IDEResId( RID_IMG_MODLIB ) ) );
             if ( IsExpanded( pLibSubRootEntry ) )
                 ImpCreateLibSubSubEntriesInVBAMode( pLibSubRootEntry, rDocument, rLibName );
         }
@@ -442,7 +430,6 @@ void BasicTreeListBox::ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEnt
             pLibSubRootEntry = AddEntry(
                 aEntryName,
                 Image( IDEResId( RID_IMG_MODLIB ) ),
-                Image( IDEResId( RID_IMG_MODLIB_HC ) ),
                 pLibRootEntry, true,
                 std::auto_ptr< BasicEntry >( new BasicEntry( eType ) ) );
         }
@@ -504,7 +491,6 @@ void BasicTreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubR
                 pModuleEntry = AddEntry(
                     aEntryName,
                     Image( IDEResId( RID_IMG_MODULE ) ),
-                    Image( IDEResId( RID_IMG_MODULE_HC ) ),
                     pLibSubRootEntry, false,
                     std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_MODULE ) ) );
 
@@ -523,7 +509,6 @@ void BasicTreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubR
                         pEntry = AddEntry(
                             aName,
                             Image( IDEResId( RID_IMG_MACRO ) ),
-                            Image( IDEResId( RID_IMG_MACRO_HC ) ),
                             pModuleEntry, false,
                             std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_METHOD ) ) );
                 }
@@ -712,23 +697,23 @@ BOOL BasicTreeListBox::IsEntryProtected( SvLBoxEntry* pEntry )
 }
 
 SvLBoxEntry* BasicTreeListBox::AddEntry(
-    const String& rText, const Image& rImage, const Image& rImageHC,
-    SvLBoxEntry* pParent, bool bChildrenOnDemand, std::auto_ptr< BasicEntry > aUserData )
+    const String& rText,
+    const Image& rImage,
+    SvLBoxEntry* pParent,
+    bool bChildrenOnDemand,
+    std::auto_ptr< BasicEntry > aUserData
+)
 {
     SvLBoxEntry* p = InsertEntry(
         rText, rImage, rImage, pParent, bChildrenOnDemand, LIST_APPEND,
         aUserData.release() ); // XXX possible leak
-    SetExpandedEntryBmp( p, rImageHC, BMP_COLOR_HIGHCONTRAST );
-    SetCollapsedEntryBmp( p, rImageHC, BMP_COLOR_HIGHCONTRAST );
     return p;
 }
 
-void BasicTreeListBox::SetEntryBitmaps( SvLBoxEntry * pEntry, const Image& rImage, const Image& rImageHC )
+void BasicTreeListBox::SetEntryBitmaps( SvLBoxEntry * pEntry, const Image& rImage )
 {
-    SetExpandedEntryBmp( pEntry, rImage, BMP_COLOR_NORMAL );
-    SetCollapsedEntryBmp( pEntry, rImage, BMP_COLOR_NORMAL );
-    SetExpandedEntryBmp( pEntry, rImageHC, BMP_COLOR_HIGHCONTRAST );
-    SetCollapsedEntryBmp( pEntry, rImageHC, BMP_COLOR_HIGHCONTRAST );
+    SetExpandedEntryBmp(  pEntry, rImage );
+    SetCollapsedEntryBmp( pEntry, rImage );
 }
 
 LibraryType BasicTreeListBox::GetLibraryType() const
@@ -746,7 +731,7 @@ String BasicTreeListBox::GetRootEntryName( const ScriptDocument& rDocument, Libr
     return rDocument.getTitle( eLocation, GetLibraryType() );
 }
 
-void BasicTreeListBox::GetRootEntryBitmaps( const ScriptDocument& rDocument, Image& rImage, Image& rImageHC )
+void BasicTreeListBox::GetRootEntryBitmaps( const ScriptDocument& rDocument, Image& rImage )
 {
     OSL_ENSURE( rDocument.isValid(), "BasicTreeListBox::GetRootEntryBitmaps: illegal document!" );
     if ( !rDocument.isValid() )
@@ -788,25 +773,17 @@ void BasicTreeListBox::GetRootEntryBitmaps( const ScriptDocument& rDocument, Ima
 
         if ( sFactoryURL.getLength() )
         {
-            rImage = SvFileInformationManager::GetFileImage( INetURLObject( sFactoryURL ),
-                FALSE /* small */,
-                FALSE /* normal */ );
-
-            rImageHC = SvFileInformationManager::GetFileImage( INetURLObject( sFactoryURL ),
-                FALSE /* small */,
-                TRUE /* high contrast */ );
+            rImage = SvFileInformationManager::GetFileImage( INetURLObject( sFactoryURL ), FALSE );
         }
         else
         {
             // default icon
             rImage = Image( IDEResId( RID_IMG_DOCUMENT ) );
-            rImageHC = Image( IDEResId( RID_IMG_DOCUMENT_HC ) );
         }
     }
     else
     {
         rImage = Image( IDEResId( RID_IMG_INSTALLATION ) );
-        rImageHC = Image( IDEResId( RID_IMG_INSTALLATION_HC ) );
     }
 }
 
diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx
index 08fb03d1c689..492e48da27bd 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -156,7 +156,7 @@ private:
     USHORT                          nMode;
     ::basctl::DocumentEventNotifier m_aNotifier;
 
-    void            SetEntryBitmaps( SvLBoxEntry * pEntry, const Image& rImage, const Image& rImageHC );
+    void            SetEntryBitmaps( SvLBoxEntry * pEntry, const Image& rImage );
 
 protected:
     virtual void            RequestingChilds( SvLBoxEntry* pParent );
@@ -204,12 +204,12 @@ public:
     USHORT          ConvertType( BasicEntryType eType );
     bool            IsValidEntry( SvLBoxEntry* pEntry );
 
-    SvLBoxEntry*    AddEntry( const String& rText, const Image& rImage, const Image& rImageHC,
+    SvLBoxEntry*    AddEntry( const String& rText, const Image& rImage,
                               SvLBoxEntry* pParent, bool bChildrenOnDemand,
                               std::auto_ptr< BasicEntry > aUserData );
 
     String          GetRootEntryName( const ScriptDocument& rDocument, LibraryLocation eLocation ) const;
-    void            GetRootEntryBitmaps( const ScriptDocument& rDocument, Image& rImage, Image& rImageHC );
+    void            GetRootEntryBitmaps( const ScriptDocument& rDocument, Image& rImage );
 
     void            SetCurrentEntry( BasicEntryDescriptor& rDesc );
 
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index 3f114b190587..9b1a18614f1e 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -123,8 +123,7 @@ void __EXPORT BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
                 // exchange image
                 bool bDlgMode = ( nMode & BROWSEMODE_DIALOGS ) && !( nMode & BROWSEMODE_MODULES );
                 Image aImage( IDEResId( bDlgMode ? RID_IMG_DLGLIB : RID_IMG_MODLIB ) );
-                Image aImageHC( IDEResId( bDlgMode ? RID_IMG_DLGLIB_HC : RID_IMG_MODLIB_HC ) );
-                SetEntryBitmaps( pEntry, aImage, aImageHC );
+                SetEntryBitmaps( pEntry, aImage );
             }
             else
             {
diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx
index bd0259fe0637..4ff1d6406b32 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -45,9 +45,9 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::resource;
 
-static ::rtl::OUString aDot  = ::rtl::OUString::createFromAscii( "." );
-static ::rtl::OUString aEsc  = ::rtl::OUString::createFromAscii( "&" );
-static ::rtl::OUString aSemi = ::rtl::OUString::createFromAscii( ";" );
+static ::rtl::OUString aDot( RTL_CONSTASCII_USTRINGPARAM( "." ));
+static ::rtl::OUString aEsc( RTL_CONSTASCII_USTRINGPARAM( "&" ));
+static ::rtl::OUString aSemi( RTL_CONSTASCII_USTRINGPARAM( ";" ));
 
 
 LocalizationMgr::LocalizationMgr( BasicIDEShell* pIDEShell,
@@ -73,9 +73,8 @@ bool LocalizationMgr::isLibraryLocalized( void )
 
 void LocalizationMgr::handleTranslationbar( void )
 {
-    static ::rtl::OUString aLayoutManagerName = ::rtl::OUString::createFromAscii( "LayoutManager" );
-    static ::rtl::OUString aToolBarResName =
-        ::rtl::OUString::createFromAscii( "private:resource/toolbar/translationbar" );
+    static ::rtl::OUString aLayoutManagerName( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ));
+    static ::rtl::OUString aToolBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/translationbar" ));
 
     Reference< beans::XPropertySet > xFrameProps
         ( m_pIDEShell->GetViewFrame()->GetFrame().GetFrameInterface(), uno::UNO_QUERY );
@@ -100,7 +99,6 @@ void LocalizationMgr::handleTranslationbar( void )
 }
 
 
-//============================================
 // TODO: -> export from toolkit
 
 struct LanguageDependentProp
@@ -136,7 +134,7 @@ bool isLanguageDependentProperty( ::rtl::OUString aName )
     }
     return bRet;
 }
-//============================================
+
 
 void LocalizationMgr::implEnableDisableResourceForAllLibraryDialogs( HandleResourceMode eMode )
 {
@@ -266,7 +264,6 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties
                         ::rtl::OUString aPropIdStr = aEsc;
                         aPropIdStr += aPureIdStr;
                         // TODO?: Change here and in toolkit
-                        //aPropIdStr += aSemi;
                         (void)aSemi;
                         aPropAny <<= aPropIdStr;
                         xPropertySet->setPropertyValue( aPropName, aPropAny );
@@ -339,7 +336,6 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties
                         ::rtl::OUString aPropIdStr = aEsc;
                         aPropIdStr += aPureIdStr;
                         // TODO?: Change here and in toolkit
-                        //aPropIdStr += aSemi;
                         (void)aSemi;
                         aPropAny <<= aPropIdStr;
                         xPropertySet->setPropertyValue( aPropName, aPropAny );
@@ -377,7 +373,6 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties
                         ::rtl::OUString aPropIdStr = aEsc;
                         aPropIdStr += aPureIdStr;
                         // TODO?: Change here and in toolkit
-                        //aPropIdStr += aSemi;
                         (void)aSemi;
                         aPropAny <<= aPropIdStr;
                         xPropertySet->setPropertyValue( aPropName, aPropAny );
@@ -661,50 +656,6 @@ sal_Int32 LocalizationMgr::implHandleControlResourceProperties
     return nChangedCount;
 }
 
-/*
-void TEST_simulateDialogAddRemoveLocale( bool bAdd )
-{
-    Sequence< Locale > aLocaleSeq( 1 );
-    Locale* pLocales = aLocaleSeq.getArray();
-
-    ::com::sun::star::lang::Locale aLocale_en;
-    aLocale_en.Language = ::rtl::OUString::createFromAscii( "en" );
-    aLocale_en.Country = ::rtl::OUString::createFromAscii( "US" );
-
-    ::com::sun::star::lang::Locale aLocale_de;
-    aLocale_de.Language = ::rtl::OUString::createFromAscii( "de" );
-    aLocale_de.Country = ::rtl::OUString::createFromAscii( "DE" );
-
-    ::com::sun::star::lang::Locale aLocale_fr;
-    aLocale_fr.Language = ::rtl::OUString::createFromAscii( "fr" );
-    aLocale_fr.Country = ::rtl::OUString::createFromAscii( "FR" );
-
-    int n = 0;
-    if( n == 0 )
-        pLocales[0] = aLocale_en;
-    else if( n == 1 )
-        pLocales[0] = aLocale_de;
-    else if( n == 2 )
-        pLocales[0] = aLocale_fr;
-
-    BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
-    LocalizationMgr* pMgr = pIDEShell->GetCurLocalizationMgr();
-    if( bAdd )
-        pMgr->handleAddLocales( aLocaleSeq );
-    else
-        pMgr->handleRemoveLocales( aLocaleSeq );
-}
-
-void TEST_simulateDialogAddLocale( void )
-{
-    TEST_simulateDialogAddRemoveLocale( true );
-}
-
-void TEST_simulateDialogRemoveLocale( void )
-{
-    TEST_simulateDialogAddRemoveLocale( false );
-}
-*/
 
 void LocalizationMgr::handleAddLocales( Sequence< Locale > aLocaleSeq )
 {
@@ -979,7 +930,7 @@ void LocalizationMgr::deleteControlResourceIDsForDeletedEditorObject( DlgEditor*
 void LocalizationMgr::setStringResourceAtDialog( const ScriptDocument& rDocument, const String& aLibName,
     const String& aDlgName, Reference< container::XNameContainer > xDialogModel )
 {
-    static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAscii( "ResourceResolver" );
+    static ::rtl::OUString aResourceResolverPropName( RTL_CONSTASCII_USTRINGPARAM( "ResourceResolver" ));
 
     // Get library
     Reference< container::XNameContainer > xDialogLib( rDocument.getLibrary( E_DIALOGS, aLibName, TRUE ) );
diff --git a/basctl/source/basicide/makefile.mk b/basctl/source/basicide/makefile.mk
index b225b987b24b..8d929adb74ad 100644
--- a/basctl/source/basicide/makefile.mk
+++ b/basctl/source/basicide/makefile.mk
@@ -47,38 +47,39 @@ CDEFS+=-DBASICDEBUG
 
 # --- Allgemein ----------------------------------------------------------
 
-EXCEPTIONSFILES=$(SLO)$/basicrenderable.obj  \
-                $(SLO)$/scriptdocument.obj  \
-                $(SLO)$/basicbox.obj	\
-                $(SLO)$/basidesh.obj	\
-                $(SLO)$/basides1.obj	\
-                $(SLO)$/basides2.obj	\
-                $(SLO)$/basides3.obj	\
+EXCEPTIONSFILES= \
+                $(SLO)$/basdoc.obj		\
+                $(SLO)$/basicbox.obj		\
+                $(SLO)$/basicrenderable.obj	\
                 $(SLO)$/baside2.obj		\
+                $(SLO)$/baside2b.obj		\
                 $(SLO)$/baside3.obj		\
+                $(SLO)$/basidectrlr.obj		\
+                $(SLO)$/basides1.obj		\
+                $(SLO)$/basides2.obj		\
+                $(SLO)$/basides3.obj		\
+                $(SLO)$/basidesh.obj		\
                 $(SLO)$/basobj2.obj		\
                 $(SLO)$/basobj3.obj		\
-                $(SLO)$/bastypes.obj	\
-                $(SLO)$/bastype2.obj	\
-                $(SLO)$/bastype3.obj	\
+                $(SLO)$/bastype2.obj		\
+                $(SLO)$/bastype3.obj		\
+                $(SLO)$/bastypes.obj		\
+                $(SLO)$/brkdlg.obj		\
+                $(SLO)$/doceventnotifier.obj	\
+                $(SLO)$/docsignature.obj	\
+                $(SLO)$/documentenumeration.obj	\
                 $(SLO)$/iderdll.obj		\
-                $(SLO)$/macrodlg.obj	\
-                $(SLO)$/moduldlg.obj	\
-                $(SLO)$/moduldl2.obj	\
-                $(SLO)$/unomodel.obj	\
-                $(SLO)$/register.obj	\
-                $(SLO)$/basdoc.obj	    \
+                $(SLO)$/localizationmgr.obj	\
+                $(SLO)$/macrodlg.obj		\
+                $(SLO)$/moduldl2.obj		\
+                $(SLO)$/moduldlg.obj		\
+                $(SLO)$/objdlg.obj		\
+                $(SLO)$/register.obj		\
+                $(SLO)$/scriptdocument.obj	\
                 $(SLO)$/tbxctl.obj		\
-                $(SLO)$/basidectrlr.obj	\
-                $(SLO)$/localizationmgr.obj \
-                $(SLO)$/doceventnotifier.obj \
-                $(SLO)$/docsignature.obj \
-                $(SLO)$/documentenumeration.obj
-
-SLOFILES =  $(EXCEPTIONSFILES) \
-            $(SLO)$/baside2b.obj	\
-            $(SLO)$/brkdlg.obj	\
-            $(SLO)$/objdlg.obj	\
+                $(SLO)$/unomodel.obj
+
+SLOFILES =  $(EXCEPTIONSFILES)
 
 SRS1NAME=$(TARGET)
 SRC1FILES=	basidesh.src macrodlg.src moptions.src moduldlg.src objdlg.src brkdlg.src tbxctl.src basicprint.src
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index b66d6b3510d9..908aca7e0abd 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -1582,13 +1582,8 @@ SvLBoxEntry* LibPage::ImpInsertLibEntry( const String& rLibName, ULONG nPos )
     if (bProtected)
     {
         Image aImage(IDEResId(RID_IMG_LOCKED));
-        aLibBox.SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
-        aLibBox.SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
-        aImage = Image(IDEResId(RID_IMG_LOCKED_HC));
-        aLibBox.SetExpandedEntryBmp(pNewEntry, aImage,
-                                    BMP_COLOR_HIGHCONTRAST);
-        aLibBox.SetCollapsedEntryBmp(pNewEntry, aImage,
-                                     BMP_COLOR_HIGHCONTRAST);
+        aLibBox.SetExpandedEntryBmp(pNewEntry, aImage);
+        aLibBox.SetCollapsedEntryBmp(pNewEntry, aImage);
     }
 
     // check, if library is link
@@ -1692,11 +1687,9 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
                     USHORT nMode = pBasicBox->GetMode();
                     bool bDlgMode = ( nMode & BROWSEMODE_DIALOGS ) && !( nMode & BROWSEMODE_MODULES );
                     USHORT nId = bDlgMode ? RID_IMG_DLGLIB : RID_IMG_MODLIB;
-                    USHORT nIdHC = bDlgMode ? RID_IMG_DLGLIB_HC : RID_IMG_MODLIB_HC;
                     SvLBoxEntry* pNewLibEntry = pBasicBox->AddEntry(
                         aLibName,
                         Image( IDEResId( nId ) ),
-                        Image( IDEResId( nIdHC ) ),
                         pRootEntry, false,
                         std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_LIBRARY ) ) );
                     DBG_ASSERT( pNewLibEntry, "InsertEntry fehlgeschlagen!" );
@@ -1706,7 +1699,6 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
                         SvLBoxEntry* pEntry_ = pBasicBox->AddEntry(
                             aModName,
                             Image( IDEResId( RID_IMG_MODULE ) ),
-                            Image( IDEResId( RID_IMG_MODULE_HC ) ),
                             pNewLibEntry, false,
                             std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_MODULE ) ) );
                         DBG_ASSERT( pEntry_, "InsertEntry fehlgeschlagen!" );
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index fcc2858670d1..0b5df85985e6 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -865,7 +865,6 @@ void ObjectPage::NewDialog()
                             pEntry = aBasicBox.AddEntry(
                                 aDlgName,
                                 Image( IDEResId( RID_IMG_DIALOG ) ),
-                                Image( IDEResId( RID_IMG_DIALOG_HC ) ),
                                 pLibEntry, false,
                                 std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_DIALOG ) ) );
                             DBG_ASSERT( pEntry, "InsertEntry fehlgeschlagen!" );
@@ -1039,7 +1038,6 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument,
                         pEntry = rBasicBox.AddEntry(
                             aModName,
                             Image( IDEResId( RID_IMG_MODULE ) ),
-                            Image( IDEResId( RID_IMG_MODULE_HC ) ),
                             pSubRootEntry, false,
                             std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_MODULE ) ) );
                         DBG_ASSERT( pEntry, "InsertEntry fehlgeschlagen!" );
diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx
index f3998287a2b8..7b4169dcb138 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -88,7 +88,7 @@ void ObjectTreeListBox::MouseButtonDown( const MouseEvent& rMEvt )
 ObjectCatalog::ObjectCatalog( Window * pParent )
     :FloatingWindow( pParent, IDEResId( RID_BASICIDE_OBJCAT ) )
     ,aMacroTreeList( this, IDEResId( RID_TLB_MACROS ) )
-    ,aToolBox(this, IDEResId(RID_TB_TOOLBOX), IDEResId(RID_IMGLST_TB_HC))
+    ,aToolBox(this, IDEResId(RID_TB_TOOLBOX))
     ,aMacroDescr( this, IDEResId( RID_FT_MACRODESCR ) )
 {
     FreeResource();
@@ -270,12 +270,9 @@ void ObjectCatalog::SetCurrentEntry( BasicEntryDescriptor& rDesc )
 }
 
 ObjectCatalogToolBox_Impl::ObjectCatalogToolBox_Impl(
-    Window * pParent, ResId const & rResId,
-    ResId const & rImagesHighContrastId):
-    ToolBox(pParent, rResId),
-    m_aImagesNormal(GetImageList()),
-    m_aImagesHighContrast(rImagesHighContrastId),
-    m_bHighContrast(false)
+    Window * pParent, ResId const & rResId)
+    : ToolBox(pParent, rResId)
+    , m_aImagesNormal(GetImageList())
 {
     setImages();
 }
@@ -292,12 +289,7 @@ void ObjectCatalogToolBox_Impl::DataChanged(DataChangedEvent const & rDCEvt)
 
 void ObjectCatalogToolBox_Impl::setImages()
 {
-    bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
-    if (bHC != m_bHighContrast)
-    {
-        SetImageList(bHC ? m_aImagesHighContrast : m_aImagesNormal);
-        m_bHighContrast = bHC;
-    }
+    SetImageList(m_aImagesNormal);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/objdlg.hrc b/basctl/source/basicide/objdlg.hrc
index 930ab31a4ae8..0a3d59ae7176 100644
--- a/basctl/source/basicide/objdlg.hrc
+++ b/basctl/source/basicide/objdlg.hrc
@@ -31,7 +31,6 @@
 
 #define RID_BASICIDE_OBJCAT     ( RID_BASICIDE_START + 70 )
 #define RID_FT_MACRODESCR   8
-#define RID_IMGLST_TB_HC 9
 #define RID_TLB_MACROS     10
 #define RID_TB_TOOLBOX     11
 
diff --git a/basctl/source/basicide/objdlg.hxx b/basctl/source/basicide/objdlg.hxx
index cd48a135a882..e6e5c20e77da 100644
--- a/basctl/source/basicide/objdlg.hxx
+++ b/basctl/source/basicide/objdlg.hxx
@@ -54,8 +54,7 @@ public:
 class ObjectCatalogToolBox_Impl: public ToolBox
 {
 public:
-    ObjectCatalogToolBox_Impl(Window * pParent, ResId const & rResId,
-                              ResId const & rImagesHighContrastId);
+    ObjectCatalogToolBox_Impl(Window * pParent, ResId const & rResId);
 
 private:
     virtual void DataChanged(DataChangedEvent const & rDCEvt);
@@ -63,8 +62,6 @@ private:
     void setImages();
 
     ImageList m_aImagesNormal;
-    ImageList m_aImagesHighContrast;
-    bool m_bHighContrast;
 };
 
 class ObjectCatalog : public FloatingWindow
diff --git a/basctl/source/basicide/objdlg.src b/basctl/source/basicide/objdlg.src
index c8de023dec53..8d07733b9319 100644
--- a/basctl/source/basicide/objdlg.src
+++ b/basctl/source/basicide/objdlg.src
@@ -75,15 +75,6 @@ FloatingWindow RID_BASICIDE_OBJCAT
             };
         };
     };
-    ImageList RID_IMGLST_TB_HC
-    {
-        Prefix = "imh";
-        MASKCOLOR
-        IdList =
-        {
-            TBITEM_SHOW ;
-        };
-    };
     FixedText RID_FT_MACRODESCR
     {
         WordBreak = TRUE ;
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index bc21f4b3f556..069fb87d9b82 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -95,12 +95,9 @@
 #include <functional>
 #include <set>
 
-//........................................................................
+
 namespace basctl
 {
-//........................................................................
-
-    /** === begin UNO using === **/
     using ::com::sun::star::uno::Sequence;
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::frame::XModel;
@@ -154,13 +151,11 @@ namespace basctl
     //====================================================================
     namespace
     {
-        //................................................................
         static bool StringCompareLessThan( const String& lhs, const String& rhs )
         {
             return ( lhs.CompareIgnoreCaseToAscii( rhs ) == COMPARE_LESS );
         }
 
-        //................................................................
         class FilterDocuments : public docs::IDocumentDescriptorFilter
         {
         public:
@@ -175,7 +170,6 @@ namespace basctl
             bool    m_bFilterInvisible;
         };
 
-        //................................................................
         bool FilterDocuments::impl_isDocumentVisible_nothrow( const docs::DocumentDescriptor& _rDocument ) const
         {
             try
@@ -198,7 +192,6 @@ namespace basctl
             return false;
         }
 
-        //................................................................
         bool FilterDocuments::includeDocument( const docs::DocumentDescriptor& _rDocument ) const
         {
             Reference< XEmbeddedScripts > xScripts( _rDocument.xModel, UNO_QUERY );
@@ -209,7 +202,6 @@ namespace basctl
             return false;
         }
 
-        //................................................................
         void lcl_getAllModels_throw( docs::Documents& _out_rModels, bool _bVisibleOnly )
         {
             _out_rModels.clear();
@@ -222,9 +214,6 @@ namespace basctl
         }
     }
 
-    //====================================================================
-    //= ScriptDocument_Impl - declaration
-    //====================================================================
     class ScriptDocument_Impl : public DocumentEventListener
     {
     private:
@@ -331,7 +320,6 @@ namespace basctl
     //====================================================================
     //= ScriptDocument_Impl - implementation
     //====================================================================
-    //--------------------------------------------------------------------
     ScriptDocument_Impl::ScriptDocument_Impl()
         :m_bIsApplication( true )
         ,m_bValid( true )
@@ -339,7 +327,6 @@ namespace basctl
     {
     }
 
-    //--------------------------------------------------------------------
     ScriptDocument_Impl::ScriptDocument_Impl( const Reference< XModel >& _rxDocument )
         :m_bIsApplication( false )
         ,m_bValid( false )
@@ -353,13 +340,11 @@ namespace basctl
         }
     }
 
-    //--------------------------------------------------------------------
     ScriptDocument_Impl::~ScriptDocument_Impl()
     {
         invalidate();
     }
 
-    //--------------------------------------------------------------------
     void ScriptDocument_Impl::invalidate()
     {
         m_bIsApplication = false;
@@ -374,7 +359,6 @@ namespace basctl
             m_pDocListener->dispose();
     }
 
-    //--------------------------------------------------------------------
     bool ScriptDocument_Impl::impl_initDocument_nothrow( const Reference< XModel >& _rxModel )
     {
         try
@@ -401,7 +385,7 @@ namespace basctl
 
         return m_bValid;
     }
-    //--------------------------------------------------------------------
+
     Reference< XLibraryContainer > ScriptDocument_Impl::getLibraryContainer( LibraryContainerType _eType ) const
     {
         OSL_ENSURE( isValid(), "ScriptDocument_Impl::getLibraryContainer: invalid!" );
@@ -428,7 +412,6 @@ namespace basctl
         return xContainer;
     }
 
-    //--------------------------------------------------------------------
     bool ScriptDocument_Impl::isReadOnly() const
     {
         OSL_ENSURE( isValid(), "ScriptDocument_Impl::isReadOnly: invalid state!" );
@@ -463,7 +446,7 @@ namespace basctl
         return bResult;
     }
 
-    //--------------------------------------------------------------------
+
     BasicManager* ScriptDocument_Impl::getBasicManager() const
     {
         OSL_ENSURE( isValid(), "ScriptDocument_Impl::getBasicManager: invalid state!" );
@@ -476,7 +459,7 @@ namespace basctl
         return ::basic::BasicManagerRepository::getDocumentBasicManager( m_xDocument );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XModel > ScriptDocument_Impl::getDocument() const
     {
         OSL_ENSURE( isValid(), "ScriptDocument_Impl::getDocument: invalid state!" );
@@ -487,7 +470,7 @@ namespace basctl
         return m_xDocument;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XNameContainer > ScriptDocument_Impl::getLibrary( LibraryContainerType _eType, const ::rtl::OUString& _rLibName, bool _bLoadLibrary ) const
         SAL_THROW((NoSuchElementException))
     {
@@ -522,7 +505,7 @@ namespace basctl
         return xContainer;
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument_Impl::hasLibrary( LibraryContainerType _eType, const ::rtl::OUString& _rLibName ) const
     {
         bool bHas = false;
@@ -538,7 +521,7 @@ namespace basctl
         return bHas;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XNameContainer > ScriptDocument_Impl::getOrCreateLibrary( LibraryContainerType _eType, const ::rtl::OUString& _rLibName ) const
     {
         Reference< XNameContainer > xLibrary;
@@ -560,7 +543,7 @@ namespace basctl
         return xLibrary;
     }
 
-    //--------------------------------------------------------------------
+
     void ScriptDocument_Impl::loadLibraryIfExists( LibraryContainerType _eType, const ::rtl::OUString& _rLibrary )
     {
         try
@@ -575,7 +558,7 @@ namespace basctl
         }
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument_Impl::removeModuleOrDialog( LibraryContainerType _eType, const ::rtl::OUString& _rLibName, const ::rtl::OUString& _rModuleName )
     {
         OSL_ENSURE( isValid(), "ScriptDocument_Impl::removeModuleOrDialog: invalid!" );
@@ -598,7 +581,7 @@ namespace basctl
         return false;
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument_Impl::hasModuleOrDialog( LibraryContainerType _eType, const ::rtl::OUString& _rLibName, const ::rtl::OUString& _rModName ) const
     {
         OSL_ENSURE( isValid(), "ScriptDocument_Impl::hasModuleOrDialog: invalid!" );
@@ -618,7 +601,7 @@ namespace basctl
         return false;
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument_Impl::getModuleOrDialog( LibraryContainerType _eType, const ::rtl::OUString& _rLibName, const ::rtl::OUString& _rObjectName, Any& _out_rModuleOrDialog )
     {
         OSL_ENSURE( isValid(), "ScriptDocument_Impl::getModuleOrDialog: invalid!" );
@@ -642,7 +625,7 @@ namespace basctl
         return false;
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument_Impl::renameModuleOrDialog( LibraryContainerType _eType, const ::rtl::OUString& _rLibName,
         const ::rtl::OUString& _rOldName, const ::rtl::OUString& _rNewName, const Reference< XNameContainer >& _rxExistingDialogModel )
     {
@@ -710,7 +693,7 @@ namespace basctl
         return false;
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument_Impl::createModule( const ::rtl::OUString& _rLibName, const ::rtl::OUString& _rModName, bool _bCreateMain, ::rtl::OUString& _out_rNewModuleCode ) const
     {
         _out_rNewModuleCode = ::rtl::OUString();
@@ -737,7 +720,7 @@ namespace basctl
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument_Impl::insertModuleOrDialog( LibraryContainerType _eType, const ::rtl::OUString& _rLibName, const ::rtl::OUString& _rObjectName, const Any& _rElement ) const
     {
         try
@@ -756,7 +739,7 @@ namespace basctl
         return false;
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument_Impl::updateModule( const ::rtl::OUString& _rLibName, const ::rtl::OUString& _rModName, const ::rtl::OUString& _rModuleCode ) const
     {
         try
@@ -774,7 +757,7 @@ namespace basctl
         return false;
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument_Impl::createDialog( const ::rtl::OUString& _rLibName, const ::rtl::OUString& _rDialogName, Reference< XInputStreamProvider >& _out_rDialogProvider ) const
     {
         try
@@ -810,7 +793,7 @@ namespace basctl
         return _out_rDialogProvider.is();
     }
 
-    //--------------------------------------------------------------------
+
     void ScriptDocument_Impl::setDocumentModified() const
     {
         OSL_ENSURE( isValid() && isDocument(), "ScriptDocument_Impl::setDocumentModified: only to be called for real documents!" );
@@ -827,7 +810,7 @@ namespace basctl
         }
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument_Impl::isDocumentModified() const
     {
         OSL_ENSURE( isValid() && isDocument(), "ScriptDocument_Impl::isDocumentModified: only to be called for real documents!" );
@@ -846,7 +829,7 @@ namespace basctl
         return bIsModified;
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument_Impl::saveDocument( const Reference< XStatusIndicator >& _rxStatusIndicator ) const
     {
         Reference< XFrame > xFrame;
@@ -885,7 +868,7 @@ namespace basctl
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     ::rtl::OUString ScriptDocument_Impl::getTitle() const
     {
         OSL_PRECOND( isValid() && isDocument(), "ScriptDocument_Impl::getTitle: for documents only!" );
@@ -898,7 +881,7 @@ namespace basctl
         return sTitle;
     }
 
-    //--------------------------------------------------------------------
+
     ::rtl::OUString ScriptDocument_Impl::getURL() const
     {
         OSL_PRECOND( isValid() && isDocument(), "ScriptDocument_Impl::getURL: for documents only!" );
@@ -918,7 +901,7 @@ namespace basctl
         return sURL;
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument_Impl::allowMacros() const
     {
         OSL_ENSURE( isValid() && isDocument(), "ScriptDocument_Impl::allowMacros: for documents only!" );
@@ -937,7 +920,7 @@ namespace basctl
         return bAllow;
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument_Impl::getCurrentFrame( Reference< XFrame >& _out_rxFrame ) const
     {
         _out_rxFrame.clear();
@@ -959,7 +942,7 @@ namespace basctl
         return _out_rxFrame.is();
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument_Impl::isLibraryShared( const ::rtl::OUString& _rLibName, LibraryContainerType _eType )
     {
         bool bIsShared = false;
@@ -996,10 +979,10 @@ namespace basctl
                     aDecodedURL = ::rtl::Uri::decode( aDecodedURL, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 );
                     Reference< XComponentContext > xContext;
                     Reference< XPropertySet > xProps( xMSF, UNO_QUERY_THROW );
-                    xContext.set( xProps->getPropertyValue( ::rtl::OUString::createFromAscii( "DefaultContext" ) ), UNO_QUERY_THROW );
+                    xContext.set( xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" )) ), UNO_QUERY_THROW );
                     Reference< XMacroExpander > xMacroExpander(
                         xContext->getValueByName(
-                        ::rtl::OUString::createFromAscii( "/singletons/com.sun.star.util.theMacroExpander" ) ),
+                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theMacroExpander" )) ),
                         UNO_QUERY_THROW );
                     aFileURL = xMacroExpander->expandMacros( aDecodedURL );
                 }
@@ -1030,43 +1013,37 @@ namespace basctl
         return bIsShared;
     }
 
-    //--------------------------------------------------------------------
+
     void ScriptDocument_Impl::onDocumentCreated( const ScriptDocument& /*_rDocument*/ )
     {
         // not interested in
     }
 
-    //--------------------------------------------------------------------
     void ScriptDocument_Impl::onDocumentOpened( const ScriptDocument& /*_rDocument*/ )
     {
         // not interested in
     }
 
-    //--------------------------------------------------------------------
     void ScriptDocument_Impl::onDocumentSave( const ScriptDocument& /*_rDocument*/ )
     {
         // not interested in
     }
 
-    //--------------------------------------------------------------------
     void ScriptDocument_Impl::onDocumentSaveDone( const ScriptDocument& /*_rDocument*/ )
     {
         // not interested in
     }
 
-    //--------------------------------------------------------------------
     void ScriptDocument_Impl::onDocumentSaveAs( const ScriptDocument& /*_rDocument*/ )
     {
         // not interested in
     }
 
-    //--------------------------------------------------------------------
     void ScriptDocument_Impl::onDocumentSaveAsDone( const ScriptDocument& /*_rDocument*/ )
     {
         // not interested in
     }
 
-    //--------------------------------------------------------------------
     void ScriptDocument_Impl::onDocumentClosed( const ScriptDocument& _rDocument )
     {
         DBG_TESTSOLARMUTEX();
@@ -1080,13 +1057,12 @@ namespace basctl
         }
     }
 
-    //--------------------------------------------------------------------
+
     void ScriptDocument_Impl::onDocumentTitleChanged( const ScriptDocument& /*_rDocument*/ )
     {
         // not interested in
     }
 
-    //--------------------------------------------------------------------
     void ScriptDocument_Impl::onDocumentModeChanged( const ScriptDocument& /*_rDocument*/ )
     {
         // not interested in
@@ -1095,13 +1071,12 @@ namespace basctl
     //====================================================================
     //= ScriptDocument
     //====================================================================
-    //--------------------------------------------------------------------
     ScriptDocument::ScriptDocument()
         :m_pImpl( new ScriptDocument_Impl() )
     {
     }
 
-    //--------------------------------------------------------------------
+
     ScriptDocument::ScriptDocument( ScriptDocument::SpecialDocument _eType )
         :m_pImpl( new ScriptDocument_Impl( Reference< XModel >() ) )
     {
@@ -1109,7 +1084,7 @@ namespace basctl
         (void)_eType;
     }
 
-    //--------------------------------------------------------------------
+
     ScriptDocument::ScriptDocument( const Reference< XModel >& _rxDocument )
         :m_pImpl( new ScriptDocument_Impl( _rxDocument ) )
     {
@@ -1118,25 +1093,25 @@ namespace basctl
             // purpose, there is a dedicated constructor
     }
 
-    //--------------------------------------------------------------------
+
     ScriptDocument::ScriptDocument( const ScriptDocument& _rSource )
         :m_pImpl( _rSource.m_pImpl )
     {
     }
 
-    //--------------------------------------------------------------------
+
     ScriptDocument::~ScriptDocument()
     {
     }
 
-    //--------------------------------------------------------------------
+
     const ScriptDocument& ScriptDocument::getApplicationScriptDocument()
     {
         static ScriptDocument s_aApplicationScripts;
         return s_aApplicationScripts;
     }
 
-    //--------------------------------------------------------------------
+
     ScriptDocument ScriptDocument::getDocumentForBasicManager( const BasicManager* _pManager )
     {
         if ( _pManager == SFX_APP()->GetBasicManager() )
@@ -1163,7 +1138,7 @@ namespace basctl
         return ScriptDocument( NoDocument );
     }
 
-    //--------------------------------------------------------------------
+
     ScriptDocument ScriptDocument::getDocumentWithURLOrCaption( const ::rtl::OUString& _rUrlOrCaption )
     {
         ScriptDocument aDocument( getApplicationScriptDocument() );
@@ -1191,7 +1166,7 @@ namespace basctl
         return aDocument;
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         struct DocumentTitleLess : public ::std::binary_function< ScriptDocument, ScriptDocument, bool >
@@ -1210,7 +1185,7 @@ namespace basctl
         };
     }
 
-    //--------------------------------------------------------------------
+
     ScriptDocuments ScriptDocument::getAllScriptDocuments( ScriptDocument::ScriptDocumentList _eListType )
     {
         ScriptDocuments aScriptDocs;
@@ -1254,62 +1229,62 @@ namespace basctl
         return aScriptDocs;
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument::operator==( const ScriptDocument& _rhs ) const
     {
         return m_pImpl->getDocumentRef() == _rhs.m_pImpl->getDocumentRef();
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 ScriptDocument::hashCode() const
     {
         return sal::static_int_cast<sal_Int32>(reinterpret_cast< sal_IntPtr >( m_pImpl->getDocumentRef().get() ));
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument::isValid() const
     {
         return m_pImpl->isValid();
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument::isAlive() const
     {
         return m_pImpl->isAlive();
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XLibraryContainer > ScriptDocument::getLibraryContainer( LibraryContainerType _eType ) const
     {
         return m_pImpl->getLibraryContainer( _eType );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XNameContainer > ScriptDocument::getLibrary( LibraryContainerType _eType, const ::rtl::OUString& _rLibName, bool _bLoadLibrary ) const
         SAL_THROW((NoSuchElementException))
     {
         return m_pImpl->getLibrary( _eType, _rLibName, _bLoadLibrary );
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument::hasLibrary( LibraryContainerType _eType, const ::rtl::OUString& _rLibName ) const
     {
         return m_pImpl->hasLibrary( _eType, _rLibName );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XNameContainer > ScriptDocument::getOrCreateLibrary( LibraryContainerType _eType, const ::rtl::OUString& _rLibName ) const
     {
         return m_pImpl->getOrCreateLibrary( _eType, _rLibName );
     }
 
-    //--------------------------------------------------------------------
+
     void ScriptDocument::loadLibraryIfExists( LibraryContainerType _eType, const ::rtl::OUString& _rLibrary )
     {
         m_pImpl->loadLibraryIfExists( _eType, _rLibrary );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< ::rtl::OUString > ScriptDocument::getObjectNames( LibraryContainerType _eType, const ::rtl::OUString& _rLibName ) const
     {
         Sequence< ::rtl::OUString > aModuleNames;
@@ -1334,7 +1309,7 @@ namespace basctl
         return aModuleNames;
     }
 
-    //--------------------------------------------------------------------
+
     ::rtl::OUString ScriptDocument::createObjectName( LibraryContainerType _eType, const ::rtl::OUString& _rLibName ) const
     {
         ::rtl::OUString aObjectName;
@@ -1364,19 +1339,19 @@ namespace basctl
         return aObjectName;
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< ::rtl::OUString > ScriptDocument::getLibraryNames() const
     {
         return BasicIDE::GetMergedLibraryNames( getLibraryContainer( E_SCRIPTS ), getLibraryContainer( E_DIALOGS ) );
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument::isReadOnly() const
     {
         return m_pImpl->isReadOnly();
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument::isApplication() const
     {
         return m_pImpl->isApplication();
@@ -1387,19 +1362,19 @@ namespace basctl
         return m_pImpl->isInVBAMode();
     }
 
-    //--------------------------------------------------------------------
+
     BasicManager* ScriptDocument::getBasicManager() const
     {
         return m_pImpl->getBasicManager();
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XModel > ScriptDocument::getDocument() const
     {
         return m_pImpl->getDocument();
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XModel > ScriptDocument::getDocumentOrNull() const
     {
         if ( isDocument() )
@@ -1407,19 +1382,19 @@ namespace basctl
         return NULL;
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument::removeModule( const ::rtl::OUString& _rLibName, const ::rtl::OUString& _rModuleName ) const
     {
         return m_pImpl->removeModuleOrDialog( E_SCRIPTS, _rLibName, _rModuleName );
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument::hasModule( const ::rtl::OUString& _rLibName, const ::rtl::OUString& _rModuleName ) const
     {
         return m_pImpl->hasModuleOrDialog( E_SCRIPTS, _rLibName, _rModuleName );
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument::getModule( const ::rtl::OUString& _rLibName, const ::rtl::OUString& _rModName, ::rtl::OUString& _out_rModuleSource ) const
     {
         Any aCode;
@@ -1429,13 +1404,13 @@ namespace basctl
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument::renameModule( const ::rtl::OUString& _rLibName, const ::rtl::OUString& _rOldName, const ::rtl::OUString& _rNewName ) const
     {
         return m_pImpl->renameModuleOrDialog( E_SCRIPTS, _rLibName, _rOldName, _rNewName, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument::createModule( const ::rtl::OUString& _rLibName, const ::rtl::OUString& _rModName, bool _bCreateMain, ::rtl::OUString& _out_rNewModuleCode ) const
     {
         if ( !m_pImpl->createModule( _rLibName, _rModName, _bCreateMain, _out_rNewModuleCode ) )
@@ -1446,31 +1421,31 @@ namespace basctl
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument::insertModule( const ::rtl::OUString& _rLibName, const ::rtl::OUString& _rModName, const ::rtl::OUString& _rModuleCode ) const
     {
         return m_pImpl->insertModuleOrDialog( E_SCRIPTS, _rLibName, _rModName, makeAny( _rModuleCode ) );
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument::updateModule( const ::rtl::OUString& _rLibName, const ::rtl::OUString& _rModName, const ::rtl::OUString& _rModuleCode ) const
     {
         return m_pImpl->updateModule( _rLibName, _rModName, _rModuleCode );
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument::removeDialog( const ::rtl::OUString& _rLibName, const ::rtl::OUString& _rDialogName ) const
     {
         return m_pImpl->removeModuleOrDialog( E_DIALOGS, _rLibName, _rDialogName );
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument::hasDialog( const ::rtl::OUString& _rLibName, const ::rtl::OUString& _rDialogName ) const
     {
         return m_pImpl->hasModuleOrDialog( E_DIALOGS, _rLibName, _rDialogName );
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument::getDialog( const ::rtl::OUString& _rLibName, const ::rtl::OUString& _rDialogName, Reference< XInputStreamProvider >& _out_rDialogProvider ) const
     {
         Any aCode;
@@ -1480,13 +1455,13 @@ namespace basctl
         return _out_rDialogProvider.is();
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument::renameDialog( const ::rtl::OUString& _rLibName, const ::rtl::OUString& _rOldName, const ::rtl::OUString& _rNewName, const Reference< XNameContainer >& _rxExistingDialogModel ) const
     {
         return m_pImpl->renameModuleOrDialog( E_DIALOGS, _rLibName, _rOldName, _rNewName, _rxExistingDialogModel );
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument::createDialog( const ::rtl::OUString& _rLibName, const ::rtl::OUString& _rDialogName, Reference< XInputStreamProvider >& _out_rDialogProvider ) const
     {
         if ( !m_pImpl->createDialog( _rLibName, _rDialogName, _out_rDialogProvider ) )
@@ -1496,31 +1471,31 @@ namespace basctl
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument::insertDialog( const ::rtl::OUString& _rLibName, const ::rtl::OUString& _rDialogName, const Reference< XInputStreamProvider >& _rxDialogProvider ) const
     {
         return m_pImpl->insertModuleOrDialog( E_DIALOGS, _rLibName, _rDialogName, makeAny( _rxDialogProvider ) );
     }
 
-    //--------------------------------------------------------------------
+
     void ScriptDocument::setDocumentModified() const
     {
         m_pImpl->setDocumentModified();
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument::isDocumentModified() const
     {
         return m_pImpl->isDocumentModified();
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument::saveDocument( const Reference< XStatusIndicator >& _rxStatusIndicator ) const
     {
         return m_pImpl->saveDocument( _rxStatusIndicator );
     }
 
-    //--------------------------------------------------------------------
+
     LibraryLocation ScriptDocument::getLibraryLocation( const ::rtl::OUString& _rLibName ) const
     {
         LibraryLocation eLocation = LIBRARY_LOCATION_UNKNOWN;
@@ -1548,7 +1523,7 @@ namespace basctl
         return eLocation;
     }
 
-    //--------------------------------------------------------------------
+
     ::rtl::OUString ScriptDocument::getTitle( LibraryLocation _eLocation, LibraryType _eType ) const
     {
         ::rtl::OUString aTitle;
@@ -1589,19 +1564,19 @@ namespace basctl
         return aTitle;
     }
 
-    //--------------------------------------------------------------------
+
     ::rtl::OUString ScriptDocument::getTitle() const
     {
         return m_pImpl->getTitle();
     }
 
-    //--------------------------------------------------------------------
+
     ::rtl::OUString ScriptDocument::getURL() const
     {
         return m_pImpl->getURL();
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument::isActive() const
     {
         bool bIsActive( false );
@@ -1618,14 +1593,12 @@ namespace basctl
         return bIsActive;
     }
 
-    //--------------------------------------------------------------------
+
     bool ScriptDocument::allowMacros() const
     {
         return m_pImpl->allowMacros();
     }
 
-//........................................................................
-} // namespace basctl
-//........................................................................
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/tbxctl.cxx b/basctl/source/basicide/tbxctl.cxx
index 3f3968524245..14ad71b2b93a 100644
--- a/basctl/source/basicide/tbxctl.cxx
+++ b/basctl/source/basicide/tbxctl.cxx
@@ -183,8 +183,8 @@ void TbxControls::StateChanged( USHORT nSID, SfxItemState eState,
                 aSlotURL += rtl::OUString::valueOf( sal_Int32( nTemp ));
                 Image aImage = GetImage( m_xFrame,
                                          aSlotURL,
-                                         hasBigImages(),
-                                         GetToolBox().GetSettings().GetStyleSettings().GetHighContrastMode() );
+                                         hasBigImages()
+                                       );
                 ToolBox& rBox = GetToolBox();
                 rBox.SetItemImage(GetId(), aImage);
                 nLastSlot = nLastEnum;
diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx
index ab61423b9314..76b3057b6409 100644
--- a/basctl/source/basicide/unomodel.cxx
+++ b/basctl/source/basicide/unomodel.cxx
@@ -97,12 +97,12 @@ OUString SIDEModel::getImplementationName(void) throw( uno::RuntimeException )
 
 ::rtl::OUString SIDEModel::getImplementationName_Static()
 {
-    return rtl::OUString::createFromAscii("com.sun.star.comp.basic.BasicIDE");
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.basic.BasicIDE" ));
 }
 
 sal_Bool SIDEModel::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
 {
-    return rServiceName == ::rtl::OUString::createFromAscii("com.sun.star.script.BasicIDE");
+    return rServiceName == ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.BasicIDE" ));
 }
 uno::Sequence< OUString > SIDEModel::getSupportedServiceNames(void) throw( uno::RuntimeException )
 {
@@ -113,7 +113,7 @@ uno::Sequence< OUString > SIDEModel::getSupportedServiceNames_Static(void)
 {
     uno::Sequence< OUString > aRet(1);
     OUString* pArray = aRet.getArray();
-    pArray[0] = ::rtl::OUString::createFromAscii("com.sun.star.script.BasicIDE");
+    pArray[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.BasicIDE" ));
     return aRet;
 }
 
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 324d7d829153..f4519a7496c4 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -72,12 +72,9 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::io;
 using ::rtl::OUString;
 
-static ::rtl::OUString aResourceResolverPropName =
-    ::rtl::OUString::createFromAscii( "ResourceResolver" );
-static ::rtl::OUString aDecorationPropName =
-    ::rtl::OUString::createFromAscii( "Decoration" );
-static ::rtl::OUString aTitlePropName =
-    ::rtl::OUString::createFromAscii( "Title" );
+static ::rtl::OUString aResourceResolverPropName( RTL_CONSTASCII_USTRINGPARAM( "ResourceResolver" ));
+static ::rtl::OUString aDecorationPropName( RTL_CONSTASCII_USTRINGPARAM( "Decoration" ));
+static ::rtl::OUString aTitlePropName( RTL_CONSTASCII_USTRINGPARAM( "Title" ));
 
 
 //============================================================================
@@ -86,14 +83,11 @@ static ::rtl::OUString aTitlePropName =
 
 TYPEINIT1( DlgEdHint, SfxHint );
 
-//----------------------------------------------------------------------------
-
 DlgEdHint::DlgEdHint( DlgEdHintKind eHint )
     :eHintKind( eHint )
 {
 }
 
-//----------------------------------------------------------------------------
 
 DlgEdHint::DlgEdHint( DlgEdHintKind eHint, DlgEdObj* pObj )
     :eHintKind( eHint )
@@ -101,7 +95,6 @@ DlgEdHint::DlgEdHint( DlgEdHintKind eHint, DlgEdObj* pObj )
 {
 }
 
-//----------------------------------------------------------------------------
 
 DlgEdHint::~DlgEdHint()
 {
@@ -172,7 +165,6 @@ void DlgEditor::ShowDialog()
         xComponent->dispose();
 }
 
-//----------------------------------------------------------------------------
 
 BOOL DlgEditor::UnmarkDialog()
 {
@@ -187,7 +179,6 @@ BOOL DlgEditor::UnmarkDialog()
     return bWasMarked;
 }
 
-//----------------------------------------------------------------------------
 
 BOOL DlgEditor::RemarkDialog()
 {
@@ -202,7 +193,6 @@ BOOL DlgEditor::RemarkDialog()
     return bWasMarked;
 }
 
-//----------------------------------------------------------------------------
 
 DlgEditor::DlgEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel )
     :pHScroll(NULL)
@@ -244,14 +234,14 @@ DlgEditor::DlgEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::
     pFunc = new DlgEdFuncSelect( this );
 
     // set clipboard data flavors
-    m_ClipboardDataFlavors[0].MimeType =                ::rtl::OUString::createFromAscii("application/vnd.sun.xml.dialog");
-    m_ClipboardDataFlavors[0].HumanPresentableName =    ::rtl::OUString::createFromAscii("Dialog 6.0");
-    m_ClipboardDataFlavors[0].DataType =                ::getCppuType( (const Sequence< sal_Int8 >*) 0 );
+    m_ClipboardDataFlavors[0].MimeType =             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.sun.xml.dialog" ));
+    m_ClipboardDataFlavors[0].HumanPresentableName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Dialog 6.0" ));
+    m_ClipboardDataFlavors[0].DataType =             ::getCppuType( (const Sequence< sal_Int8 >*) 0 );
 
-    m_ClipboardDataFlavorsResource[0] =                         m_ClipboardDataFlavors[0];
-    m_ClipboardDataFlavorsResource[1].MimeType =                ::rtl::OUString::createFromAscii("application/vnd.sun.xml.dialogwithresource");
-    m_ClipboardDataFlavorsResource[1].HumanPresentableName =    ::rtl::OUString::createFromAscii("Dialog 8.0");
-    m_ClipboardDataFlavorsResource[1].DataType =                ::getCppuType( (const Sequence< sal_Int8 >*) 0 );
+    m_ClipboardDataFlavorsResource[0] =                      m_ClipboardDataFlavors[0];
+    m_ClipboardDataFlavorsResource[1].MimeType =             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.sun.xml.dialogwithresource" ));
+    m_ClipboardDataFlavorsResource[1].HumanPresentableName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Dialog 8.0" ));
+    m_ClipboardDataFlavorsResource[1].DataType =             ::getCppuType( (const Sequence< sal_Int8 >*) 0 );
 
     aPaintTimer.SetTimeout( 1 );
     aPaintTimer.SetTimeoutHdl( LINK( this, DlgEditor, PaintTimeout ) );
@@ -260,7 +250,6 @@ DlgEditor::DlgEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::
     aMarkTimer.SetTimeoutHdl( LINK( this, DlgEditor, MarkTimeout ) );
 }
 
-//----------------------------------------------------------------------------
 
 DlgEditor::~DlgEditor()
 {
@@ -275,7 +264,6 @@ DlgEditor::~DlgEditor()
     delete pDlgEdModel;
 }
 
-//----------------------------------------------------------------------------
 
 Reference< awt::XControlContainer > DlgEditor::GetWindowControlContainer()
 {
@@ -284,7 +272,6 @@ Reference< awt::XControlContainer > DlgEditor::GetWindowControlContainer()
     return m_xControlContainer;
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::SetWindow( Window* pWindow_ )
 {
@@ -309,7 +296,6 @@ void DlgEditor::SetWindow( Window* pWindow_ )
     ::comphelper::disposeComponent( m_xControlContainer );
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::SetScrollBars( ScrollBar* pHS, ScrollBar* pVS )
 {
@@ -319,7 +305,6 @@ void DlgEditor::SetScrollBars( ScrollBar* pHS, ScrollBar* pVS )
     InitScrollBars();
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::InitScrollBars()
 {
@@ -345,7 +330,6 @@ void DlgEditor::InitScrollBars()
     DoScroll( pVScroll );
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::DoScroll( ScrollBar* )
 {
@@ -375,18 +359,15 @@ void DlgEditor::DoScroll( ScrollBar* )
     //  pWindow->SetBackground();
 
     // #i74769# children should be scrolled
-    pWindow->Scroll( -nX, -nY, SCROLL_CHILDREN); // SCROLL_NOCHILDREN );
+    pWindow->Scroll( -nX, -nY, SCROLL_CHILDREN);
     aMap.SetOrigin( Point( -aScrollPos.Width(), -aScrollPos.Height() ) );
     pWindow->SetMapMode( aMap );
     pWindow->Update();
 
-    // pWindow->SetBackground( aOldBackground );
-
     DlgEdHint aHint( DLGED_HINT_WINDOWSCROLLED );
     Broadcast( aHint );
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::UpdateScrollBars()
 {
@@ -400,7 +381,6 @@ void DlgEditor::UpdateScrollBars()
         pVScroll->SetThumbPos( -aOrg.Y() );
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::SetDialog( uno::Reference< container::XNameContainer > xUnoControlDialogModel )
 {
@@ -484,8 +464,6 @@ void DlgEditor::ResetDialog( void )
 }
 
 
-//----------------------------------------------------------------------------
-
 Reference< util::XNumberFormatsSupplier > const & DlgEditor::GetNumberFormatsSupplier()
 {
     if ( !m_xSupplier.is() )
@@ -503,7 +481,6 @@ Reference< util::XNumberFormatsSupplier > const & DlgEditor::GetNumberFormatsSup
     return m_xSupplier;
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -512,7 +489,6 @@ void DlgEditor::MouseButtonDown( const MouseEvent& rMEvt )
     pFunc->MouseButtonDown( rMEvt );
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::MouseButtonUp( const MouseEvent& rMEvt )
 {
@@ -522,21 +498,18 @@ void DlgEditor::MouseButtonUp( const MouseEvent& rMEvt )
         bCreateOK = bRet;
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::MouseMove( const MouseEvent& rMEvt )
 {
     pFunc->MouseMove( rMEvt );
 }
 
-//----------------------------------------------------------------------------
 
 BOOL DlgEditor::KeyInput( const KeyEvent& rKEvt )
 {
     return pFunc->KeyInput( rKEvt );
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::Paint( const Rectangle& rRect )
 {
@@ -544,7 +517,6 @@ void DlgEditor::Paint( const Rectangle& rRect )
     PaintTimeout( &aPaintTimer );
 }
 
-//----------------------------------------------------------------------------
 
 IMPL_LINK( DlgEditor, PaintTimeout, Timer *, EMPTYARG )
 {
@@ -656,7 +628,6 @@ IMPL_LINK( DlgEditor, PaintTimeout, Timer *, EMPTYARG )
     return 0;
 }
 
-//----------------------------------------------------------------------------
 
 IMPL_LINK( DlgEditor, MarkTimeout, Timer *, EMPTYARG )
 {
@@ -672,7 +643,6 @@ IMPL_LINK( DlgEditor, MarkTimeout, Timer *, EMPTYARG )
     return 1;
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::SetMode( DlgEdMode eNewMode )
 {
@@ -697,7 +667,6 @@ void DlgEditor::SetMode( DlgEdMode eNewMode )
     eMode = eNewMode;
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::SetInsertObj( USHORT eObj )
 {
@@ -707,14 +676,12 @@ void DlgEditor::SetInsertObj( USHORT eObj )
         pDlgEdView->SetCurrentObj( eActObj, DlgInventor );
 }
 
-//----------------------------------------------------------------------------
 
 USHORT DlgEditor::GetInsertObj() const
 {
     return eActObj;
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::CreateDefaultObject()
 {
@@ -743,7 +710,6 @@ void DlgEditor::CreateDefaultObject()
     }
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::Cut()
 {
@@ -751,7 +717,6 @@ void DlgEditor::Cut()
     Delete();
 }
 
-//----------------------------------------------------------------------------
 
 void implCopyStreamToByteSequence( Reference< XInputStream > xStream,
     Sequence< sal_Int8 >& bytes )
@@ -925,7 +890,6 @@ void DlgEditor::Copy()
     }
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::Paste()
 {
@@ -1030,7 +994,7 @@ void DlgEditor::Paste()
                     {
                         Reference< lang::XMultiServiceFactory > xSMgr = getProcessServiceFactory();
                         xStringResourcePersistence = Reference< resource::XStringResourcePersistence >( xSMgr->createInstance
-                            ( ::rtl::OUString::createFromAscii( "com.sun.star.resource.StringResource" ) ), UNO_QUERY );
+                            ( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.resource.StringResource" )) ), UNO_QUERY );
                         if( xStringResourcePersistence.is() )
                             xStringResourcePersistence->importBinary( aResData );
                     }
@@ -1090,7 +1054,7 @@ void DlgEditor::Paste()
                         pDlgEdModel->GetPage(0)->InsertObject( pCtrlObj );
                         pCtrlObj->SetRectFromProps();
                         pCtrlObj->UpdateStep();
-                        pDlgEdForm->UpdateTabOrderAndGroups();              // #110559#
+                        pDlgEdForm->UpdateTabOrderAndGroups();
                         pCtrlObj->StartListening();                         // start listening
 
                         // mark object
@@ -1114,7 +1078,6 @@ void DlgEditor::Paste()
     }
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::Delete()
 {
@@ -1171,7 +1134,6 @@ void DlgEditor::Delete()
         RemarkDialog();
 }
 
-//----------------------------------------------------------------------------
 
 BOOL DlgEditor::IsPasteAllowed()
 {
@@ -1197,7 +1159,6 @@ BOOL DlgEditor::IsPasteAllowed()
     return bPaste;
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::ShowProperties()
 {
@@ -1207,21 +1168,18 @@ void DlgEditor::ShowProperties()
         pViewFrame->ToggleChildWindow( SID_SHOW_PROPERTYBROWSER );
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::UpdatePropertyBrowserDelayed()
 {
     aMarkTimer.Start();
 }
 
-//----------------------------------------------------------------------------
 
 BOOL DlgEditor::IsModified() const
 {
     return pDlgEdModel->IsChanged() || bDialogModelChanged;
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::ClearModifyFlag()
 {
@@ -1229,7 +1187,6 @@ void DlgEditor::ClearModifyFlag()
     bDialogModelChanged = FALSE;
 }
 
-//----------------------------------------------------------------------------
 
 #define LMARGPRN        1700
 #define RMARGPRN         900
@@ -1237,7 +1194,6 @@ void DlgEditor::ClearModifyFlag()
 #define BMARGPRN        1000
 #define BORDERPRN       300
 
-//----------------------------------------------------------------------------
 
 void lcl_PrintHeader( Printer* pPrinter, const String& rTitle ) // not working yet
 {
@@ -1278,7 +1234,6 @@ void lcl_PrintHeader( Printer* pPrinter, const String& rTitle ) // not working y
     pPrinter->Pop();
 }
 
-//----------------------------------------------------------------------------
 
 sal_Int32 DlgEditor::countPages( Printer* )
 {
@@ -1291,7 +1246,6 @@ void DlgEditor::printPage( sal_Int32 nPage, Printer* pPrinter, const String& rTi
         Print( pPrinter, rTitle );
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::Print( Printer* pPrinter, const String& rTitle )    // not working yet
 {
@@ -1303,9 +1257,6 @@ void DlgEditor::Print( Printer* pPrinter, const String& rTitle )    // not worki
         MapMode aMap( MAP_100TH_MM );
         pPrinter->SetMapMode( aMap );
         Font aFont;
-#ifdef OS2
-        //aFont.SetName( System::GetStandardFont( STDFONT_SWISS ).GetName() );
-#endif
         aFont.SetAlign( ALIGN_BOTTOM );
         aFont.SetSize( Size( 0, 360 ));
         pPrinter->SetFont( aFont );
@@ -1319,15 +1270,12 @@ void DlgEditor::Print( Printer* pPrinter, const String& rTitle )    // not worki
         Bitmap aDlg;
 #ifdef OS2
         Bitmap* pDlg = new Bitmap;
-        //pSbxForm->SnapShot( *pDlg );
         SvMemoryStream* pStrm = new SvMemoryStream;
         *pStrm << *pDlg;
         delete pDlg;
         pStrm->Seek(0);
         *pStrm >> aDlg;
         delete pStrm;
-#else
-        //pSbxForm->SnapShot( aDlg );
 #endif
         Size aBmpSz( pPrinter->PixelToLogic( aDlg.GetSizePixel() ) );
         double nPaperSzWidth = aPaperSz.Width();
@@ -1363,7 +1311,6 @@ void DlgEditor::Print( Printer* pPrinter, const String& rTitle )    // not worki
     }
 }
 
-//----------------------------------------------------------------------------
 
 bool DlgEditor::AdjustPageSize()
 {
@@ -1420,6 +1367,4 @@ bool DlgEditor::AdjustPageSize()
     return bAdjustedPageSize;
 }
 
-//----------------------------------------------------------------------------
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx
index 27bae6fbb8c7..9659dda143ed 100644
--- a/basctl/source/dlged/dlgedfac.cxx
+++ b/basctl/source/dlged/dlgedfac.cxx
@@ -40,21 +40,18 @@
 
 using namespace ::com::sun::star;
 
-//----------------------------------------------------------------------------
 
 DlgEdFactory::DlgEdFactory()
 {
     SdrObjFactory::InsertMakeObjectHdl( LINK(this, DlgEdFactory, MakeObject) );
 }
 
-//----------------------------------------------------------------------------
 
 DlgEdFactory::~DlgEdFactory()
 {
     SdrObjFactory::RemoveMakeObjectHdl( LINK(this, DlgEdFactory, MakeObject) );
 }
 
-//----------------------------------------------------------------------------
 
 IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
 {
@@ -80,20 +77,20 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
         switch( pObjFactory->nIdentifier )
         {
             case OBJ_DLG_PUSHBUTTON:
-                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlButtonModel") , xDialogSFact );
+                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlButtonModel" )) , xDialogSFact );
                   break;
             case OBJ_DLG_RADIOBUTTON:
-                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlRadioButtonModel") , xDialogSFact );
+                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlRadioButtonModel" )) , xDialogSFact );
                  break;
             case OBJ_DLG_CHECKBOX:
-                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlCheckBoxModel") , xDialogSFact );
+                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlCheckBoxModel" )) , xDialogSFact );
                  break;
             case OBJ_DLG_LISTBOX:
-                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlListBoxModel") , xDialogSFact );
+                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlListBoxModel" )) , xDialogSFact );
                  break;
             case OBJ_DLG_COMBOBOX:
             {
-                 DlgEdObj* pNew = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlComboBoxModel") , xDialogSFact );
+                 DlgEdObj* pNew = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlComboBoxModel" )) , xDialogSFact );
                  pObjFactory->pNewObj = pNew;
                  try
                  {
@@ -109,26 +106,26 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
                  }
             }    break;
             case OBJ_DLG_GROUPBOX:
-                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlGroupBoxModel") , xDialogSFact );
+                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlGroupBoxModel" )) , xDialogSFact );
                  break;
             case OBJ_DLG_EDIT:
-                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlEditModel") , xDialogSFact );
+                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlEditModel" )) , xDialogSFact );
                  break;
             case OBJ_DLG_FIXEDTEXT:
-                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFixedTextModel") , xDialogSFact );
+                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlFixedTextModel" )) , xDialogSFact );
                  break;
             case OBJ_DLG_IMAGECONTROL:
-                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlImageControlModel") , xDialogSFact );
+                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlImageControlModel" )) , xDialogSFact );
                  break;
             case OBJ_DLG_PROGRESSBAR:
-                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlProgressBarModel") , xDialogSFact );
+                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlProgressBarModel" )) , xDialogSFact );
                  break;
             case OBJ_DLG_HSCROLLBAR:
-                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlScrollBarModel") , xDialogSFact );
+                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlScrollBarModel" )) , xDialogSFact );
                  break;
             case OBJ_DLG_VSCROLLBAR:
             {
-                 DlgEdObj* pNew = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlScrollBarModel") , xDialogSFact );
+                 DlgEdObj* pNew = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlScrollBarModel" )) , xDialogSFact );
                  pObjFactory->pNewObj = pNew;
                  // set vertical orientation
                  try
@@ -146,11 +143,11 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
                  }
             }    break;
             case OBJ_DLG_HFIXEDLINE:
-                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFixedLineModel") , xDialogSFact );
+                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlFixedLineModel" )) , xDialogSFact );
                  break;
             case OBJ_DLG_VFIXEDLINE:
             {
-                 DlgEdObj* pNew = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFixedLineModel") , xDialogSFact );
+                 DlgEdObj* pNew = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlFixedLineModel" )) , xDialogSFact );
                  pObjFactory->pNewObj = pNew;
                  // set vertical orientation
                  try
@@ -168,96 +165,29 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
                  }
             }    break;
             case OBJ_DLG_DATEFIELD:
-                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlDateFieldModel") , xDialogSFact );
+                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDateFieldModel" )) , xDialogSFact );
                  break;
             case OBJ_DLG_TIMEFIELD:
-                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlTimeFieldModel") , xDialogSFact );
+                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlTimeFieldModel" )) , xDialogSFact );
                  break;
             case OBJ_DLG_NUMERICFIELD:
-                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlNumericFieldModel") , xDialogSFact );
+                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlNumericFieldModel" )) , xDialogSFact );
                  break;
             case OBJ_DLG_CURRENCYFIELD:
-                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlCurrencyFieldModel") , xDialogSFact );
+                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlCurrencyFieldModel" )) , xDialogSFact );
                  break;
             case OBJ_DLG_FORMATTEDFIELD:
-                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFormattedFieldModel") , xDialogSFact );
+                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlFormattedFieldModel" )) , xDialogSFact );
                  break;
             case OBJ_DLG_PATTERNFIELD:
-                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlPatternFieldModel") , xDialogSFact );
+                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlPatternFieldModel" )) , xDialogSFact );
                  break;
             case OBJ_DLG_FILECONTROL:
-                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFileControlModel") , xDialogSFact );
+                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlFileControlModel" )) , xDialogSFact );
                  break;
             case OBJ_DLG_TREECONTROL:
-                 DlgEdObj* pNew = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.tree.TreeControlModel") , xDialogSFact );
+                 DlgEdObj* pNew = new DlgEdObj( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.tree.TreeControlModel" )) , xDialogSFact );
                  pObjFactory->pNewObj = pNew;
-                 /*
-                 try
-                 {
-                    uno::Reference< beans::XPropertySet >  xPSet(pNew->GetUnoControlModel(), uno::UNO_QUERY);
-                    if (xPSet.is())
-                    {
-                        // first create a data model for our tree control
-                        Reference< XComponentContext > xComponentContext;
-
-                        Reference< XPropertySet > xPropSet( xInterface, UNO_QUERY );
-                        xPropSet->getPropertyValue( OUString::createFromAscii("DefaultContext") ) >>= xComponentContext;
-
-                        // gets the service manager from the office
-                        Reference< XMultiComponentFactory > xMultiComponentFactoryServer( xComponentContext->getServiceManager() );
-
-
-                        // gets the TreeDataModel
-                        Reference< XMutableTreeDataModel > xTreeDataModel;
-
-                        xTreeDataModel = Reference< XMutableTreeDataModel >(
-                         xMultiComponentFactoryServer->createInstanceWithContext(
-                        OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.tree.MutableTreeDataModel" ) ), xComponentContext ), UNO_QUERY_THROW );
-
-                        // now fill it with some sample data
-                        const OUString sRoot( RTL_CONSTASCII_USTRINGPARAM( "Root" ) );
-
-                        Reference< XMutableTreeNode > xNode( mxTreeDataModel->createNode( sRoot, false ), UNO_QUERY_THROW );
-                        xNode->setDataValue( sRoot );
-                        xNode->setExpandedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_down.png" ) ) );
-                        xNode->setCollapsedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_right.png" ) ) );
-
-                        const OUString sNode_1( RTL_CONSTASCII_USTRINGPARAM( "Node_1" ) );
-
-                        Reference< XMutableTreeNode > xChildNode_1( mxTreeDataModel->createNode( sNode_1, true ), UNO_QUERY_THROW );
-                        xChildNode_1->setDataValue( sNode_1 );
-                        xChildNode_1->setExpandedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_down.png" ) ) );
-                        xChildNode_1->setCollapsedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_right.png" ) ) );
-
-                        xNode->appendChild( xChildNode_1 );
-
-                        const OUString sNode_1_1( RTL_CONSTASCII_USTRINGPARAM( "Node_1_1" ) );
-
-                        Reference< XMutableTreeNode > xChildNode_1_1( mxTreeDataModel->createNode( sNode_1_1, false ), UNO_QUERY_THROW );
-                        xChildNode_1_1->setDataValue( sNode_1_1 );
-                        xChildNode_1_1->setExpandedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_down.png" ) ) );
-                        xChildNode_1_1->setCollapsedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_right.png" ) ) );
-
-                        xChildNode_1->appendChild( xChildNode_1_1 );
-
-                        const OUString sNode_1_1( RTL_CONSTASCII_USTRINGPARAM( "Node_2" ) );
-
-                        Reference< XMutableTreeNode > xChildNode_2( mxTreeDataModel->createNode( sNode_2, false ), UNO_QUERY_THROW );
-                        xChildNode_2->setDataValue( sNode_2 );
-                        xChildNode_2->setNodeGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM("private:graphicrepository/sw/imglst/nc20010.png") ) );
-                        xNode->appendChild( xChildNode_2 );
-
-                        xTreeDataModel->setRoot( xNode );
-
-
-                        const OUString sDataModel( RTL_CONSTASCII_USTRINGPARAM( "DataModel" ) );
-
-                        xPSet->setPropertyValue( sDataModel, xTreeDataModel );
-                    }
-                 }
-                 catch(...)
-                 {
-                 }*/
                  break;
         }
     }
@@ -265,6 +195,4 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
     return 0;
 }
 
-//----------------------------------------------------------------------------
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/makefile.mk b/basctl/source/dlged/makefile.mk
index 1b765ad91ae4..68a21a22a5bf 100644
--- a/basctl/source/dlged/makefile.mk
+++ b/basctl/source/dlged/makefile.mk
@@ -39,19 +39,20 @@ VISIBILITY_HIDDEN=TRUE
 
 # --- Files --------------------------------------------------------
 
-EXCEPTIONSFILES=$(SLO)$/dlged.obj	\
-                $(SLO)$/dlgedobj.obj \
+EXCEPTIONSFILES= \
+                $(SLO)$/dlged.obj	\
+                $(SLO)$/dlgedclip.obj	\
                 $(SLO)$/dlgedfac.obj	\
+                $(SLO)$/dlgedfunc.obj	\
                 $(SLO)$/dlgedlist.obj	\
-                $(SLO)$/dlgedclip.obj	\
+                $(SLO)$/dlgedmod.obj	\
+                $(SLO)$/dlgedobj.obj	\
+                $(SLO)$/dlgedpage.obj	\
+                $(SLO)$/dlgedview.obj	\
+                $(SLO)$/managelang.obj	\
                 $(SLO)$/propbrw.obj
 
-SLOFILES=   $(EXCEPTIONSFILES)      \
-            $(SLO)$/dlgedfunc.obj	\
-            $(SLO)$/dlgedmod.obj	\
-            $(SLO)$/dlgedpage.obj	\
-            $(SLO)$/dlgedview.obj	\
-            $(SLO)$/managelang.obj
+SLOFILES=       $(EXCEPTIONSFILES)
 
 SRS1NAME=$(TARGET)
 SRC1FILES=	dlgresid.src \
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index d210482a8ef5..080fca450279 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -75,13 +75,9 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace ::comphelper;
 
-//============================================================================
-// PropBrwMgr
-//============================================================================
 
 SFX_IMPL_FLOATINGWINDOW(PropBrwMgr, SID_SHOW_PROPERTYBROWSER)
 
-//----------------------------------------------------------------------------
 
 PropBrwMgr::PropBrwMgr( Window* _pParent, sal_uInt16 nId,
                         SfxBindings *pBindings, SfxChildWinInfo* pInfo)
@@ -103,7 +99,7 @@ PropBrwMgr::PropBrwMgr( Window* _pParent, sal_uInt16 nId,
     ((PropBrw*)pWindow)->Update( pShell );
 }
 
-//----------------------------------------------------------------------------
+
 void PropBrw::Update( const SfxViewShell* _pShell )
 {
     const BasicIDEShell* pBasicIDEShell = dynamic_cast< const BasicIDEShell* >( _pShell );
@@ -122,7 +118,6 @@ void PropBrw::Update( const SfxViewShell* _pShell )
     }
 }
 
-//----------------------------------------------------------------------------
 
 const long STD_WIN_SIZE_X = 300;
 const long STD_WIN_SIZE_Y = 350;
@@ -136,15 +131,9 @@ const long WIN_BORDER = 2;
 const long MIN_WIN_SIZE_X = 50;
 const long MIN_WIN_SIZE_Y = 50;
 
-//----------------------------------------------------------------------------
-
-//============================================================================
-// PropBrw
-//============================================================================
 
 DBG_NAME(PropBrw)
 
-//----------------------------------------------------------------------------
 
 PropBrw::PropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBindings* _pBindings, PropBrwMgr* _pMgr, Window* _pParent,
             const Reference< XModel >& _rxContextDocument )
@@ -163,11 +152,11 @@ PropBrw::PropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBindings* _
     try
     {
         // create a frame wrapper for myself
-        m_xMeAsFrame = Reference< XFrame >(m_xORB->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.Frame")), UNO_QUERY);
+        m_xMeAsFrame = Reference< XFrame >(m_xORB->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Frame" ))), UNO_QUERY);
         if (m_xMeAsFrame.is())
         {
             m_xMeAsFrame->initialize( VCLUnoHelper::GetInterface ( this ) );
-            m_xMeAsFrame->setName(::rtl::OUString::createFromAscii("form property browser"));  // change name!
+            m_xMeAsFrame->setName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "form property browser" )));  // change name!
         }
     }
     catch (Exception&)
@@ -179,7 +168,6 @@ PropBrw::PropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBindings* _
     ImplReCreateController();
 }
 
-//----------------------------------------------------------------------------
 
 void PropBrw::ImplReCreateController()
 {
@@ -208,7 +196,7 @@ void PropBrw::ImplReCreateController()
 
         // create a property browser controller
         Reference< XMultiComponentFactory > xFactory( xInspectorContext->getServiceManager(), UNO_QUERY_THROW );
-        static const ::rtl::OUString s_sControllerServiceName = ::rtl::OUString::createFromAscii("com.sun.star.awt.PropertyBrowserController");
+        static const ::rtl::OUString s_sControllerServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.PropertyBrowserController" ));
         m_xBrowserController = Reference< XPropertySet >(
             xFactory->createInstanceWithContext( s_sControllerServiceName, xInspectorContext ), UNO_QUERY
         );
@@ -265,7 +253,6 @@ void PropBrw::ImplReCreateController()
     Resize();
 }
 
-//----------------------------------------------------------------------------
 
 PropBrw::~PropBrw()
 {
@@ -275,7 +262,6 @@ PropBrw::~PropBrw()
     DBG_DTOR(PropBrw,NULL);
 }
 
-//----------------------------------------------------------------------------
 
 void PropBrw::ImplDestroyController()
 {
@@ -300,7 +286,6 @@ void PropBrw::ImplDestroyController()
     m_xBrowserController.clear();
 }
 
-//----------------------------------------------------------------------------
 
 sal_Bool PropBrw::Close()
 {
@@ -314,7 +299,7 @@ sal_Bool PropBrw::Close()
     return bClose;
 }
 
-//----------------------------------------------------------------------------
+
 Sequence< Reference< XInterface > >
     PropBrw::CreateMultiSelectionSequence( const SdrMarkList& _rMarkList )
 {
@@ -359,7 +344,7 @@ Sequence< Reference< XInterface > >
     return aSeq;
 }
 
-//----------------------------------------------------------------------------
+
 void PropBrw::implSetNewObjectSequence
     ( const Sequence< Reference< XInterface > >& _rObjectSeq )
 {
@@ -374,14 +359,13 @@ void PropBrw::implSetNewObjectSequence
     }
 }
 
-//----------------------------------------------------------------------------
 
 void PropBrw::implSetNewObject( const Reference< XPropertySet >& _rxObject )
 {
     if ( m_xBrowserController.is() )
     {
         m_xBrowserController->setPropertyValue(
-            ::rtl::OUString::createFromAscii( "IntrospectedObject" ),
+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IntrospectedObject" )),
             makeAny( _rxObject )
         );
 
@@ -390,7 +374,6 @@ void PropBrw::implSetNewObject( const Reference< XPropertySet >& _rxObject )
     }
 }
 
-//----------------------------------------------------------------------------
 
 ::rtl::OUString PropBrw::GetHeadlineName( const Reference< XPropertySet >& _rxObject )
 {
@@ -510,14 +493,12 @@ void PropBrw::implSetNewObject( const Reference< XPropertySet >& _rxObject )
     return aName;
 }
 
-//----------------------------------------------------------------------------
 
 void PropBrw::FillInfo( SfxChildWinInfo& rInfo ) const
 {
     rInfo.bVisible = sal_False;
 }
 
-//----------------------------------------------------------------------------
 
 void PropBrw::Resize()
 {
@@ -536,7 +517,6 @@ void PropBrw::Resize()
     }
 }
 
-//----------------------------------------------------------------------------
 
 void PropBrw::ImplUpdate( const Reference< XModel >& _rxContextDocument, SdrView* pNewView )
 {
@@ -619,6 +599,4 @@ void PropBrw::ImplUpdate( const Reference< XModel >& _rxContextDocument, SdrView
     }
 }
 
-//----------------------------------------------------------------------------
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml b/basctl/uiconfig/basicide/menubar/menubar.xml
index 1c2421688329..4b3ff19c937b 100644
--- a/basctl/uiconfig/basicide/menubar/menubar.xml
+++ b/basctl/uiconfig/basicide/menubar/menubar.xml
@@ -83,6 +83,7 @@
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:ShowLicense"/>
             <menu:menuseparator/>
+            <menu:menuitem menu:id=".uno:ShowCredits"/>
             <menu:menuitem menu:id=".uno:About"/>
         </menu:menupopup>
     </menu:menu>
diff --git a/basebmp/source/intconversion.hxx b/basebmp/source/intconversion.hxx
index d18a88cfe912..407948e80c28 100644
--- a/basebmp/source/intconversion.hxx
+++ b/basebmp/source/intconversion.hxx
@@ -57,11 +57,18 @@ namespace basebmp
         }
     };
 
+    //Current c++0x draft (apparently) has std::identity, but not operator()
+    template<typename T> struct SGI_identity : public std::unary_function<T,T>
+    {
+        T& operator()(T& x) const { return x; }
+        const T& operator()(const T& x) const { return x; }
+    };
+
     /// Get converter from given data type to sal_uInt32
     template< typename DataType > struct uInt32Converter
     {
-        typedef std::identity<DataType> to;
-        typedef std::identity<DataType> from;
+        typedef SGI_identity<DataType> to;
+        typedef SGI_identity<DataType> from;
     };
     template< unsigned int RedIndex,
               unsigned int GreenIndex,
diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx
index 5b88c4a3bf40..70218b085059 100644
--- a/basebmp/test/basictest.cxx
+++ b/basebmp/test/basictest.cxx
@@ -41,21 +41,12 @@
 #include <basebmp/color.hxx>
 #include <basebmp/scanlineformats.hxx>
 #include <basebmp/bitmapdevice.hxx>
-#include <basebmp/debug.hxx>
 #include "tools.hxx"
 
-#include <iostream>
-#include <fstream>
-
 using namespace ::basebmp;
 
 namespace
 {
-/*
-  std::ofstream output("32bpp_test.dump");
-  debugDump( mpDevice32bpp, output );
-*/
-
 class BasicTest : public CppUnit::TestFixture
 {
 public:
@@ -296,7 +287,6 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-// -----------------------------------------------------------------------------
 CPPUNIT_TEST_SUITE_REGISTRATION(BasicTest);
 }
 
diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx
index 043d165c14d6..ab260655d968 100644
--- a/basebmp/test/bmpdemo.cxx
+++ b/basebmp/test/bmpdemo.cxx
@@ -74,8 +74,6 @@
 
 #include <boost/static_assert.hpp>
 #include <algorithm>
-#include <iostream>
-#include <fstream>
 
 using namespace ::com::sun::star;
 
@@ -975,7 +973,7 @@ class TestWindow : public Dialog
     public:
         TestWindow() : Dialog( (Window *) NULL )
         {
-            SetText( rtl::OUString::createFromAscii( "VIGRA test" ) );
+            SetText( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VIGRA test" )) );
             SetSizePixel( Size( 1024, 1024 ) );
             EnablePaint( true );
             Show();
@@ -1079,11 +1077,9 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ )
         basegfx::B2DPolyPolygon aPoly;
 
         basegfx::tools::importFromSvgD( aPoly,
-                                        ::rtl::OUString::createFromAscii(
-                                            "m0 0 h7 v7 h-7 z" ) );
+                                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "m0 0 h7 v7 h-7 z" )) );
         basegfx::tools::importFromSvgD( aPoly,
-                                        ::rtl::OUString::createFromAscii(
-                                            "m2 2 h3 v3 h-3 z" ) );
+                                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "m2 2 h3 v3 h-3 z" )) );
 
         pDevice->fillPolyPolygon(
             aPoly,
@@ -1102,8 +1098,7 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ )
         pMask->drawLine( aPt111, aPt222, aCol333, basebmp::DrawMode_PAINT );
 
 
-        ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii(
-            "m 0 0 h5 l5 5 v5 h-5 l-5-5 z" );
+        ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "m 0 0 h5 l5 5 v5 h-5 l-5-5 z" ));
         basegfx::B2DPolyPolygon aPoly;
         basegfx::tools::importFromSvgD( aPoly, aSvg );
         pMask->clear(basebmp::Color(0xFFFFFFFF));
@@ -1242,8 +1237,8 @@ void TestApp::Main()
 
     // Create UCB.
     uno::Sequence< uno::Any > aArgs( 2 );
-    aArgs[ 0 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );
-    aArgs[ 1 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );
+    aArgs[ 0 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL ));
+    aArgs[ 1 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE ));
     ::ucbhelper::ContentBroker::initialize( xFactory, aArgs );
 
     TestWindow pWindow;
diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx
index 0d4fa01b3301..79e9b8fd3909 100644
--- a/basebmp/test/bmpmasktest.cxx
+++ b/basebmp/test/bmpmasktest.cxx
@@ -45,23 +45,12 @@
 #include <basebmp/color.hxx>
 #include <basebmp/scanlineformats.hxx>
 #include <basebmp/bitmapdevice.hxx>
-#include <basebmp/debug.hxx>
 #include "tools.hxx"
 
-#include <iostream>
-#include <fstream>
-
 using namespace ::basebmp;
 
 namespace
 {
-/*
-        std::ofstream output("32bpp_test.dump");
-        debugDump( rDevice, output );
-        std::ofstream output2("32bpp_bmp.dump");
-        debugDump( rBmp, output2 );
-*/
-
 class BmpMaskTest : public CppUnit::TestFixture
 {
 private:
@@ -131,8 +120,7 @@ public:
                                          true,
                                          Format::THIRTYTWO_BIT_TC_MASK );
 
-        ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii(
-            "m 0 0h5v10h5v-5h-10z" );
+        ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "m 0 0h5v10h5v-5h-10z" ));
 
         basegfx::B2DPolyPolygon aPoly;
         basegfx::tools::importFromSvgD( aPoly, aSvg );
@@ -147,8 +135,8 @@ public:
             aColWhite,
             DrawMode_PAINT );
 
-        aSvg = ::rtl::OUString::createFromAscii(
-            "m 0 0 h6 v10 h-6z" );
+        aSvg = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "m 0 0 h6 v10 h-6z" ));
 
         aPoly.clear();
         basegfx::tools::importFromSvgD( aPoly, aSvg );
@@ -181,15 +169,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-// -----------------------------------------------------------------------------
 CPPUNIT_TEST_SUITE_REGISTRATION(BmpMaskTest);
 }
 
-
-// -----------------------------------------------------------------------------
-
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-//NOADDITIONAL;
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx
index f52a0567f271..5732e4527562 100644
--- a/basebmp/test/bmptest.cxx
+++ b/basebmp/test/bmptest.cxx
@@ -45,23 +45,12 @@
 #include <basebmp/color.hxx>
 #include <basebmp/scanlineformats.hxx>
 #include <basebmp/bitmapdevice.hxx>
-#include <basebmp/debug.hxx>
 #include "tools.hxx"
 
-#include <iostream>
-#include <fstream>
-
 using namespace ::basebmp;
 
 namespace
 {
-/*
-        std::ofstream output("32bpp_test.dump");
-        debugDump( rDevice, output );
-        std::ofstream output2("32bpp_bmp.dump");
-        debugDump( rBmp, output2 );
-*/
-
 class BmpTest : public CppUnit::TestFixture
 {
 private:
@@ -170,8 +159,7 @@ public:
                                          true,
                                          Format::THIRTYTWO_BIT_TC_MASK );
 
-        ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii(
-            "m 0 0h5v10h5v-5h-10z" );
+        ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "m 0 0h5v10h5v-5h-10z" ));
 
         basegfx::B2DPolyPolygon aPoly;
         basegfx::tools::importFromSvgD( aPoly, aSvg );
@@ -208,15 +196,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-// -----------------------------------------------------------------------------
 CPPUNIT_TEST_SUITE_REGISTRATION(BmpTest);
 }
 
-
-// -----------------------------------------------------------------------------
-
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-//NOADDITIONAL;
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx
index 31af87140682..3071cde74d57 100644
--- a/basebmp/test/cliptest.cxx
+++ b/basebmp/test/cliptest.cxx
@@ -46,21 +46,12 @@
 #include <basebmp/color.hxx>
 #include <basebmp/scanlineformats.hxx>
 #include <basebmp/bitmapdevice.hxx>
-#include <basebmp/debug.hxx>
 #include "tools.hxx"
 
-#include <iostream>
-#include <fstream>
-
 using namespace ::basebmp;
 
 namespace
 {
-/*
-  std::ofstream output("32bpp_test.dump");
-  debugDump( mpDevice32bpp, output );
-*/
-
 class ClipTest : public CppUnit::TestFixture
 {
 private:
@@ -180,8 +171,7 @@ private:
                                                         true,
                                                         Format::EIGHT_BIT_GREY ));
 
-        ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii(
-            "m 0 0h5v10h5v-5h-10z" );
+        ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "m 0 0h5v10h5v-5h-10z" ));
 
         basegfx::B2DPolyPolygon aPoly;
         basegfx::tools::importFromSvgD( aPoly, aSvg );
@@ -221,8 +211,7 @@ public:
                                            true,
                                            Format::THIRTYTWO_BIT_TC_MASK );
 
-        ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii(
-            "m 0 0 h5 l5 5 v5 h-5 l-5-5 z" );
+        ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "m 0 0 h5 l5 5 v5 h-5 l-5-5 z" ));
         basegfx::B2DPolyPolygon aPoly;
         basegfx::tools::importFromSvgD( aPoly, aSvg );
         mpClipMask->clear(Color(0));
@@ -275,15 +264,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-// -----------------------------------------------------------------------------
 CPPUNIT_TEST_SUITE_REGISTRATION(ClipTest);
 }
 
-
-// -----------------------------------------------------------------------------
-
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-//NOADDITIONAL;
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx
index 469b984b6ca6..f36d95e6be72 100644
--- a/basebmp/test/filltest.cxx
+++ b/basebmp/test/filltest.cxx
@@ -45,21 +45,12 @@
 #include <basebmp/color.hxx>
 #include <basebmp/scanlineformats.hxx>
 #include <basebmp/bitmapdevice.hxx>
-#include <basebmp/debug.hxx>
 #include "tools.hxx"
 
-#include <iostream>
-#include <fstream>
-
 using namespace ::basebmp;
 
 namespace
 {
-/*
-  std::ofstream output("32bpp_test.dump");
-  debugDump( mpDevice32bpp, output );
-*/
-
 class FillTest : public CppUnit::TestFixture
 {
 private:
@@ -168,8 +159,7 @@ private:
         CPPUNIT_ASSERT_MESSAGE("bottom-middle pixel set",
                                rDevice->getPixel(aPt4) == aCol);
 
-        ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii(
-            "m 0 0l7 7h-1z" );
+        ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "m 0 0l7 7h-1z" ));
 
         basegfx::B2DPolyPolygon aPoly;
         basegfx::tools::importFromSvgD( aPoly, aSvg );
@@ -269,15 +259,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-// -----------------------------------------------------------------------------
 CPPUNIT_TEST_SUITE_REGISTRATION(FillTest);
 }
 
-
-// -----------------------------------------------------------------------------
-
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-//NOADDITIONAL;
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx
index 68633e8935d0..f7894357c6cf 100644
--- a/basebmp/test/linetest.cxx
+++ b/basebmp/test/linetest.cxx
@@ -40,21 +40,12 @@
 #include <basebmp/color.hxx>
 #include <basebmp/scanlineformats.hxx>
 #include <basebmp/bitmapdevice.hxx>
-#include <basebmp/debug.hxx>
 #include "tools.hxx"
 
-#include <iostream>
-#include <fstream>
-
 using namespace ::basebmp;
 
 namespace
 {
-/*
-  std::ofstream output("32bpp_test.dump");
-  debugDump( mpDevice32bpp, output );
-*/
-
 class LineTest : public CppUnit::TestFixture
 {
 private:
@@ -217,15 +208,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-// -----------------------------------------------------------------------------
 CPPUNIT_TEST_SUITE_REGISTRATION(LineTest);
 }
 
-
-// -----------------------------------------------------------------------------
-
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-//NOADDITIONAL;
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx
index b7097518f64a..e39f118753ba 100644
--- a/basebmp/test/masktest.cxx
+++ b/basebmp/test/masktest.cxx
@@ -45,23 +45,12 @@
 #include <basebmp/color.hxx>
 #include <basebmp/scanlineformats.hxx>
 #include <basebmp/bitmapdevice.hxx>
-#include <basebmp/debug.hxx>
 #include "tools.hxx"
 
-#include <iostream>
-#include <fstream>
-
 using namespace ::basebmp;
 
 namespace
 {
-/*
-        std::ofstream output("32bpp_test.dump");
-        debugDump( rDevice, output );
-        std::ofstream output2("32bpp_bmp.dump");
-        debugDump( rBmp, output2 );
-*/
-
 class MaskTest : public CppUnit::TestFixture
 {
 private:
@@ -137,8 +126,7 @@ public:
                                      true,
                                      Format::EIGHT_BIT_GREY );
 
-        ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii(
-            "m 0 0h5v10h5v-5h-10z" );
+        ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "m 0 0h5v10h5v-5h-10z" ));
 
         basegfx::B2DPolyPolygon aPoly;
         basegfx::tools::importFromSvgD( aPoly, aSvg );
@@ -169,15 +157,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-// -----------------------------------------------------------------------------
 CPPUNIT_TEST_SUITE_REGISTRATION(MaskTest);
 }
 
-
-// -----------------------------------------------------------------------------
-
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-//NOADDITIONAL;
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx
index 0f0faab77552..4fe18ee1101a 100644
--- a/basebmp/test/polytest.cxx
+++ b/basebmp/test/polytest.cxx
@@ -46,21 +46,12 @@
 #include <basebmp/color.hxx>
 #include <basebmp/scanlineformats.hxx>
 #include <basebmp/bitmapdevice.hxx>
-#include <basebmp/debug.hxx>
 #include "tools.hxx"
 
-#include <iostream>
-#include <fstream>
-
 using namespace ::basebmp;
 
 namespace
 {
-/*
-        std::ofstream output("32bpp_test.dump");
-        debugDump( rDevice, output );
-*/
-
 class PolyTest : public CppUnit::TestFixture
 {
 private:
@@ -77,8 +68,8 @@ private:
 
         basegfx::tools::importFromSvgD(
             aPoly,
-            rtl::OUString::createFromAscii(
-                "M2 2 l7 7 z" ) );
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "M2 2 l7 7 z" )) );
         rDevice->fillPolyPolygon(
             aPoly,
             aCol,
@@ -92,8 +83,8 @@ private:
         aPoly.clear();
         basegfx::tools::importFromSvgD(
             aPoly,
-            rtl::OUString::createFromAscii(
-            "M7 2 l-6 6 z" ) );
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "M7 2 l-6 6 z" )) );
         rDevice->fillPolyPolygon(
             aPoly,
             aCol,
@@ -112,8 +103,8 @@ private:
 
         basegfx::tools::importFromSvgD(
             aPoly,
-            rtl::OUString::createFromAscii(
-                "M2 2 h1 l7 7 h-1 z" ) );
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "M2 2 h1 l7 7 h-1 z" )) );
         rDevice->fillPolyPolygon(
             aPoly,
             aCol,
@@ -127,8 +118,8 @@ private:
         aPoly.clear();
         basegfx::tools::importFromSvgD(
             aPoly,
-            rtl::OUString::createFromAscii(
-            "M7 2 h-1 l-6 6 h1 z" ) );
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "M7 2 h-1 l-6 6 h1 z" )) );
         rDevice->fillPolyPolygon(
             aPoly,
             aCol,
@@ -142,8 +133,8 @@ private:
         aPoly.clear();
         basegfx::tools::importFromSvgD(
             aPoly,
-            rtl::OUString::createFromAscii(
-            "M0 0 l7 7 h-1 l-5-7 z" ) );
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "M0 0 l7 7 h-1 l-5-7 z" )) );
         rDevice->fillPolyPolygon(
             aPoly,
             aCol,
@@ -161,8 +152,8 @@ private:
         ::rtl::OUString aSvg;
 
         basegfx::tools::importFromSvgD( aPoly,
-                                        ::rtl::OUString::createFromAscii(
-                                            "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z" ) );
+                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                            "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z" )) );
 
         rDevice->fillPolyPolygon(
             aPoly,
@@ -181,8 +172,8 @@ private:
         ::rtl::OUString aSvg;
 
         basegfx::tools::importFromSvgD( aPoly,
-                                        ::rtl::OUString::createFromAscii(
-                                            "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z" ) );
+                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                            "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z" )) );
         basegfx::B2DHomMatrix aMat;
         aMat.translate(-3,-3);
         aMat.rotate( 1.7 );
@@ -219,12 +210,12 @@ private:
         ::rtl::OUString aSvg;
 
         basegfx::tools::importFromSvgD( aPoly,
-                                        ::rtl::OUString::createFromAscii(
+                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                             "M0 0 v2 l10 2 v-2 z"
                                             "M10 6 v-2 l-10 2 v2 z"
                                             "M1 0 h1 v10 h-1 z"
                                             "M4 0 h1 v10 h-1 z"
-                                            "M8 0 h1 v10 h-1 z" ) );
+                                            "M8 0 h1 v10 h-1 z" )) );
         rDevice->fillPolyPolygon(
             aPoly,
             aCol,
@@ -289,15 +280,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-// -----------------------------------------------------------------------------
 CPPUNIT_TEST_SUITE_REGISTRATION(PolyTest);
 }
 
-
-// -----------------------------------------------------------------------------
-
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-//NOADDITIONAL;
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx b/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx
index 421ec9c43078..d6e1dee3fe6c 100644
--- a/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx
+++ b/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx
@@ -350,12 +350,12 @@ namespace basegfx
                 return 0.0f;
             }
 
-            bool isEnded()
+            bool isEnded() const
             {
                 return mnYCounter<=0;
             }
 
-            bool isDownwards()
+            bool isDownwards() const
             {
                 return mbDownwards;
             }
diff --git a/basegfx/source/polygon/b2dtrapezoid.cxx b/basegfx/source/polygon/b2dtrapezoid.cxx
index 261f045b4a7f..f095a6658119 100644
--- a/basegfx/source/polygon/b2dtrapezoid.cxx
+++ b/basegfx/source/polygon/b2dtrapezoid.cxx
@@ -799,6 +799,7 @@ namespace basegfx
                                         if(splitEdgeAtGivenPoint(aLeft, *pNewLeft, aCurrent))
                                         {
                                             maNewPoints.push_back(pNewLeft);
+                                            bDone = true;
                                         }
                                         else
                                         {
@@ -810,13 +811,12 @@ namespace basegfx
                                         if(splitEdgeAtGivenPoint(aRight, *pNewRight, aCurrent))
                                         {
                                             maNewPoints.push_back(pNewRight);
+                                            bDone = true;
                                         }
                                         else
                                         {
                                             delete pNewRight;
                                         }
-
-                                        bDone = true;
                                     }
                                 }
 
diff --git a/basegfx/source/tools/canvastools.cxx b/basegfx/source/tools/canvastools.cxx
index 907ff2c7a1ed..d29d5796389b 100644
--- a/basegfx/source/tools/canvastools.cxx
+++ b/basegfx/source/tools/canvastools.cxx
@@ -331,9 +331,9 @@ namespace basegfx
                     if( !xLinePoly.is() )
                     {
                         throw lang::IllegalArgumentException(
-                            ::rtl::OUString::createFromAscii(
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                     "basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(): Invalid input"
-                                    "poly-polygon, cannot retrieve vertex data"),
+                                    "poly-polygon, cannot retrieve vertex data")),
                             uno::Reference< uno::XInterface >(),
                             0 );
                     }
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index c06843c04115..2f10a638141c 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.cxx
@@ -74,17 +74,17 @@ public:
     void setUp()
     {
         // simple rectangle
-        aPath0 = ::rtl::OUString::createFromAscii(
-            "M 10 10-10 10-10-10 10-10Z" );
+        aPath0 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "M 10 10-10 10-10-10 10-10Z" ));
 
         // simple bezier polygon
-        aPath1 = ::rtl::OUString::createFromAscii(
+        aPath1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "m11430 0c-8890 3810 5715 6985 5715 6985 "
             "0 0-17145-1905-17145-1905 0 0 22860-10160 "
-            "16510 6350-6350 16510-3810-11430-3810-11430z" );
+            "16510 6350-6350 16510-3810-11430-3810-11430z" ));
 
         // '@' as a bezier polygon
-        aPath2 = ::rtl::OUString::createFromAscii(
+        aPath2 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "m1917 1114c-89-189-233-284-430-284-167 "
             "0-306 91-419 273-113 182-170 370-170 564 "
             "0 145 33 259 98 342 65 84 150 126 257 126 "
@@ -107,10 +107,10 @@ public:
             "-215-201-487-301-816-301-395 0-715 124-960 "
             "373-245 249-368 569-368 958 0 385 119 685 "
             "357 900 237 216 557 324 958 325 189-1 389-27 "
-            "600-77 211-52 378-110 503-174 27 70 54 140 81 210z" );
+            "600-77 211-52 378-110 503-174 27 70 54 140 81 210z" ));
 
         // first part of 'Hello World' as a line polygon
-        aPath3 = ::rtl::OUString::createFromAscii(
+        aPath3 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "m1598 125h306v2334h-306v-1105h-1293v1105h-305v"
             "-2334h305v973h1293zm2159 1015 78-44 85 235-91 "
             "47-91 40-90 34-90 29-89 21-88 16-88 10-88 3-102"
@@ -142,7 +142,7 @@ public:
             "-26-29-28-28-30-26-32-25-32-23-35-21-35-38-74-30-80"
             "-24-85-17-89-11-95-3-100 3-101 11-95 17-90 24-85 30"
             "-79 38-75 21-35 23-35 25-32 26-32 28-30 29-28 30-26 "
-            "31-24 33-22 34-20 35-18 36-16 37-15 39-12 40-11z" );
+            "31-24 33-22 34-20 35-18 36-16 37-15 39-12 40-11z" ));
     }
 
     void tearDown()
diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx
index 8f6f21aa3240..edc9c2d4670e 100644
--- a/basic/source/app/app.cxx
+++ b/basic/source/app/app.cxx
@@ -202,38 +202,18 @@ uno::Reference< XContentProviderManager > InitializeUCB( void )
     }
 
 
-    //////////////////////////////////////////////////////////////////////
     // set global factory
     setProcessServiceFactory( xSMgr );
 
-/*  // Create simple ConfigManager
-    Sequence< Any > aConfArgs(3);
-    aConfArgs[0] <<= PropertyValue( OUString::createFromAscii("servertype"), 0, makeAny( OUString::createFromAscii("local") ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE );
-    aConfArgs[1] <<= PropertyValue( OUString::createFromAscii("sourcepath"), 0, makeAny( OUString::createFromAscii("g:\\") ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE );
-    aConfArgs[2] <<= PropertyValue( OUString::createFromAscii("updatepath"), 0, makeAny( OUString::createFromAscii("g:\\") ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE );
-
-    uno::Reference< XContentProvider > xConfProvider
-        ( xSMgr->createInstanceWithArguments( OUString::createFromAscii( "com.sun.star.configuration.ConfigurationProvider" ), aConfArgs), UNO_QUERY );
-*/
-
-
 //  Create unconfigured Ucb:
-/*  Sequence< Any > aArgs(1);
-    aArgs[1] = makeAny ( xConfProvider );*/
     Sequence< Any > aArgs;
     ::ucbhelper::ContentBroker::initialize( xSMgr, aArgs );
     uno::Reference< XContentProviderManager > xUcb =
         ::ucbhelper::ContentBroker::get()->getContentProviderManagerInterface();
 
     uno::Reference< XContentProvider > xFileProvider
-        ( xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.ucb.FileContentProvider" ) ), UNO_QUERY );
-    xUcb->registerContentProvider( xFileProvider, OUString::createFromAscii( "file" ), sal_True );
-
-
-/*  uno::Reference< XContentProvider > xPackageProvider
-        ( xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.ucb.PackageContentProvider" ) ), UNO_QUERY );
-    xUcb->registerContentProvider( xPackageProvider, OUString::createFromAscii( "vnd.sun.star.pkg" ), sal_True );
-    */
+        ( xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.FileContentProvider" )) ), UNO_QUERY );
+    xUcb->registerContentProvider( xFileProvider, OUString(RTL_CONSTASCII_USTRINGPARAM( "file" )), sal_True );
 
     return xUcb;
 }
@@ -245,13 +225,6 @@ static void ReplaceStringHookProc( UniString& rStr )
     if ( rStr.SearchAscii( "%PRODUCT" ) != STRING_NOTFOUND )
     {
         rStr.SearchAndReplaceAllAscii( "%PRODUCTNAME", aTestToolName );
-        /*
-        rStr.SearchAndReplaceAllAscii( "%PRODUCTVERSION", rVersion );
-        rStr.SearchAndReplaceAllAscii( "%ABOUTBOXPRODUCTVERSION", rAboutBoxVersion );
-        rStr.SearchAndReplaceAllAscii( "%PRODUCTEXTENSION", rExtension );
-        rStr.SearchAndReplaceAllAscii( "%PRODUCTXMLFILEFORMATNAME", rXMLFileFormatName );
-        rStr.SearchAndReplaceAllAscii( "%PRODUCTXMLFILEFORMATVERSION", rXMLFileFormatVersion );
-        */
     }
 }
 
@@ -282,8 +255,8 @@ void BasicApp::Main( )
             DirEntry aAppFileName( GetAppFileName() );
             String aAppDir ( aAppFileName.GetPath().GetFull() );
 
-//            DirEntry aDefIniPath( Config::GetConfigName( aAppDir, CUniString("testtool") ) );
-//            Do not use Config::GetConfigName here because is uses a hidden file for UNIX
+            // Do not use Config::GetConfigName here because is uses a hidden
+            // file for UNIX
 
             DirEntry aDefIniPath( aAppDir );
             ByteString aFileName;
@@ -315,31 +288,12 @@ void BasicApp::Main( )
         AllSettings aSettings = GetSettings();
         aSettings.SetUILanguage( aRequestedLanguage );
         aSettings.SetLanguage( aRequestedLanguage );
-//      International aInternational;
-//      aInternational = GetSettings().GetInternational();
-//      aInternational = International( aRequestedLanguage );
-//      aSettings.SetInternational( aInternational );
         SetSettings( aSettings );
-//      aInternational = GetSettings().GetInternational();
     }
 
-//  ResMgr::CreateResMgr( CREATEVERSIONRESMGR( stt ),  )
-//const char* ResMgr::GetLang( LanguageType& nType, USHORT nPrio )
-
-//  ResMgr::CreateResMgr( CREATEVERSIONRESMGR( stt )
-//  ResMgr *pRes = new ResMgr( "testtool.res" );
-//  Resource::SetResManager( pRes );
-
     BasicDLL aBasicDLL;
     nWait = 0;
 
-    // Hilfe:
-//  pHelp = new Help;
-//  SetHelp( pHelp );
-//  Help::EnableContextHelp();
-//  Help::EnableExtHelp();
-//  DeactivateExtHelp();
-
     // Acceleratoren
     Accelerator aAccel( SttResId( MAIN_ACCEL ) );
     InsertAccel( &aAccel );
@@ -363,7 +317,6 @@ void BasicApp::Main( )
     PostUserEvent( LINK( this, BasicApp, LateInit ) );
     Execute();
 
-//  delete pHelp;
     delete pFrame;
 
     RemoveAccel( pMainAccel );
@@ -540,12 +493,10 @@ BasicFrame::BasicFrame() : WorkWindow( NULL,
 
     if ( pBasic->pTestObject )  // Are we the testtool?
     {
-//      aAppIcon = Icon( ResId( RID_APPICON2 ) );
         aAppName = String( SttResId( IDS_APPNAME2 ) );
     }
     else
     {
-//      aAppIcon = Icon( ResId( RID_APPICON ) );
         aAppName = String( SttResId( IDS_APPNAME ) );
     }
 
@@ -618,7 +569,6 @@ BasicFrame::BasicFrame() : WorkWindow( NULL,
     LoadIniFile();
 
     UpdateTitle();
-//  SetIcon( aAppIcon );
 
     // Size: half width, 0.75 * height - 2 * IconSize
     {
@@ -627,15 +577,10 @@ BasicFrame::BasicFrame() : WorkWindow( NULL,
         SetWindowState( aConf.ReadKey("WinParams", "") );
     }
 
-//  pWork = new AppEdit( this, NULL );
-//  pWork->Show();
-//  pWork->Close();
-
     aLineNum.SetTimeoutHdl( LINK( this, BasicFrame, ShowLineNr ) );
     aLineNum.SetTimeout(200);
     aLineNum.Start();
 
-
     aCheckFiles.SetTimeout( 10000 );
     aCheckFiles.SetTimeoutHdl( LINK( this, BasicFrame, CheckAllFiles ) );
     aCheckFiles.Start();
@@ -700,8 +645,6 @@ BasicFrame::~BasicFrame()
     delete pStatus;
     delete pPrn;
     delete pList;
-//  delete pExecutionStatus;
-//  delete pBasic;
     pBasic.Clear();
 }
 
@@ -803,19 +746,10 @@ void BasicFrame::Notify( SfxBroadcaster&, const SfxHint& rHint )
                     aTotalStatus.AppendAscii( " " );
                     aTotalStatus.Append( pStatusHint->GetAdditionalExecutionStatus() );
                     pStatus->Message( aTotalStatus );
-/*                  if ( !pExecutionStatus )
-                        pExecutionStatus = new FloatingExecutionStatus( this );
-                    pExecutionStatus->SetStatus( pStatusHint->GetExecutionStatus() );
-                    pExecutionStatus->SetAdditionalInfo( pStatusHint->GetAdditionalExecutionStatus() );*/
                 }
                 break;
             case TT_EXECUTION_HIDE_ACTION:
                 {
-/*                  if ( pExecutionStatus )
-                    {
-                        delete pExecutionStatus;
-                        pExecutionStatus = NULL;
-                    }*/
                 }
                 break;
         }
@@ -928,7 +862,6 @@ void BasicFrame::WinMax_Restore()
 
 void BasicFrame::RemoveWindow( AppWin *pWin )
 {
-//  delete pIcon;
     pList->Remove( pWin );
     pWork = pList->Last();
 
@@ -1152,10 +1085,8 @@ IMPL_LINK( BasicFrame, InitMenu, Menu *, pMenu )
     BOOL bNormal = BOOL( !bInBreak );
     pMenu->EnableItem( RID_RUNCOMPILE, bNormal );
 
-    BOOL bHasEdit = BOOL( /*bNormal &&*/ pWork != NULL );
+    BOOL bHasEdit = BOOL( pWork != NULL );
 
-//  pMenu->EnableItem( RID_FILENEW,     bNormal );  // always possible
-//  pMenu->EnableItem( RID_FILEOPEN,    bNormal );
     pMenu->EnableItem( RID_FILECLOSE,   bHasEdit );
     pMenu->EnableItem( RID_FILESAVE,    bHasEdit );
     pMenu->EnableItem( RID_FILESAVEAS,  bHasEdit );
@@ -1187,20 +1118,7 @@ IMPL_LINK( BasicFrame, InitMenu, Menu *, pMenu )
 IMPL_LINK_INLINE_START( BasicFrame, DeInitMenu, Menu *, pMenu )
 {
     (void) pMenu; /* avoid warning about unused parameter */
-/*  pMenu->EnableItem( RID_RUNCOMPILE );
-
-    pMenu->EnableItem( RID_FILECLOSE );
-    pMenu->EnableItem( RID_FILESAVE );
-    pMenu->EnableItem( RID_FILESAVEAS );
-    pMenu->EnableItem( RID_FILEPRINT );
-    pMenu->EnableItem( RID_FILESETUP );
-    pMenu->EnableItem( RID_FILELOADLIB );
-    pMenu->EnableItem( RID_FILESAVELIB );
-
-    pMenu->EnableItem( RID_RUNNEXTERR );
-    pMenu->EnableItem( RID_RUNPREVERR );
-    if( pWork ) pWork->DeInitMenu( pMenu );
-*/
+
     SetAutoRun( FALSE );
     String aString;
     pStatus->Message( aString );
@@ -1334,7 +1252,6 @@ long BasicFrame::Command( short nID, BOOL bChecked )
             AppBasEd* p = new AppBasEd( this, NULL );
             p->Show();
             p->GrabFocus();
-    //      InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN ));
             } break;
         case RID_FILEOPEN:
             {
@@ -1342,7 +1259,6 @@ long BasicFrame::Command( short nID, BOOL bChecked )
                 if( QueryFileName( s, FT_BASIC_SOURCE | FT_RESULT_FILE, FALSE ) ) {
                     AddToLRU( s );
                     LoadFile( s );
-//                  InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN ));
                 }
             } break;
         case RID_FILELOADLIB:
@@ -1353,7 +1269,6 @@ long BasicFrame::Command( short nID, BOOL bChecked )
             break;
         case RID_FILECLOSE:
             if( pWork && pWork->Close() ){};
-//          InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN ));
             break;
         case RID_FILEPRINT:
             if( pWork )
@@ -1398,7 +1313,6 @@ long BasicFrame::Command( short nID, BOOL bChecked )
             nFlags = SbDEBUG_BREAK;
             goto start;
         start: {
-//          InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN ));
             if ( !Basic().IsRunning() || bInBreak )
             {
                 AppBasEd* p = NULL;
@@ -1437,11 +1351,9 @@ long BasicFrame::Command( short nID, BOOL bChecked )
                         p->Run();
                         BasicDLL::SetDebugMode( FALSE );
                         // If cancelled during Interactive=FALSE
-//                      BasicDLL::EnableBreak( TRUE );
                     }
                 }}
             }
-//          InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN )); // after run
             break;
         case RID_RUNCOMPILE:
             if( pWork && pWork->ISA(AppBasEd) && SaveAll() )
@@ -1457,7 +1369,6 @@ long BasicFrame::Command( short nID, BOOL bChecked )
         case RID_RUNBREAK:
             if ( Basic().IsRunning() && !bInBreak )
             {
-//              pINST->CalcBreakCallLevel(SbDEBUG_STEPINTO);
                 pINST->nBreakCallLvl = pINST->nCallLvl;
             }
             break;
@@ -1533,10 +1444,6 @@ long BasicFrame::Command( short nID, BOOL bChecked )
             }
             break;
         case RID_WINTILEVERT:
-//#define WINDOWARRANGE_TILE        1
-//#define WINDOWARRANGE_HORZ        2
-//#define WINDOWARRANGE_VERT        3
-//#define WINDOWARRANGE_CASCADE 4
             {
                 WindowArrange aArange;
                 for ( ULONG i = 0 ; i < pList->Count() ; i++ )
@@ -1569,19 +1476,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
             }
             break;
 
-/*      case RID_HELPTOPIC:
-            if( pWork ) pWork->Help();
-            break;
-        case RID_HELPKEYS:
-            aBasicApp.pHelp->Start( CUniString( "Keyboard" ) );
-            break;
-        case RID_HELPINDEX:
-            aBasicApp.pHelp->Start( OOO_HELP_INDEX );
-            break;
-        case RID_HELPINTRO:
-            aBasicApp.pHelp->Start( OOO_HELP_HELPONHELP );
-            break;
-*/      case RID_HELPABOUT:
+        case RID_HELPABOUT:
             {
                 SttResId aResId( IDD_ABOUT_DIALOG );
                 if ( Basic().pTestObject )    // Are we TestTool?
@@ -1614,14 +1509,11 @@ long BasicFrame::Command( short nID, BOOL bChecked )
 
                 AddToLRU( s );
                 LoadFile( s );
-//              InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN ));
             }
             else
             {
-//              InitMenu(GetMenuBar()->GetPopupMenu( RID_APPEDIT ));    // So daß Delete richtig ist
                 if( pWork )
                     pWork->Command( CommandEvent( Point(), nID ) );
-//              InitMenu(GetMenuBar()->GetPopupMenu( RID_APPEDIT ));    // So daß Delete richtig ist
             }
     }
     return TRUE;
@@ -1746,8 +1638,6 @@ void NewFileDialog::FilterSelect()
     aConf.SetGroup( aCurrentProfile );
     aLastPath = UniString( aConf.ReadKey( aFilterType, aConf.ReadKey( "BaseDir" ) ), RTL_TEXTENCODING_UTF8 );
     SetPath( aLastPath );
-//  if ( IsInExecute() )
-//      SetPath( "" );
 }
 
 short NewFileDialog::Execute()
@@ -1806,19 +1696,12 @@ BOOL BasicFrame::QueryFileName
         aDlg.SetCurFilter( String( SttResId( IDS_BASFILTER ) ) );
 
     aDlg.FilterSelect(); // Selects the last used path
-//  if ( bSave )
     if ( rName.Len() > 0 )
         aDlg.SetPath( rName );
 
     if( aDlg.Execute() )
     {
         rName = aDlg.GetPath();
-/*      rExtension = aDlg.GetCurrentFilter();
-        var i:integer;
-        for ( i = 0 ; i < aDlg.GetFilterCount() ; i++ )
-            if ( rExtension == aDlg.GetFilterName( i ) )
-                rExtension = aDlg.GetFilterType( i );
-*/
         return TRUE;
     } else return FALSE;
 }
@@ -1826,15 +1709,14 @@ BOOL BasicFrame::QueryFileName
 USHORT BasicFrame::BreakHandler()
 {
     bInBreak = TRUE;
-//  InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN ));
-//  MenuBar aBar( ResId( RID_APPMENUBAR ) );
-//  aBar.EnableItem( RID_APPEDIT, FALSE );
     SetAppMode( String( SttResId ( IDS_APPMODE_BREAK ) ) );
-    while( bInBreak )
+
+    while( bInBreak ) {
         GetpApp()->Yield();
+    }
+
     SetAppMode( String( SttResId ( IDS_APPMODE_RUN ) ) );
-//  aBar.EnableItem( RID_APPEDIT, TRUE );
-//  InitMenu(GetMenuBar()->GetPopupMenu( RID_APPRUN ));
+
     return nFlags;
 }
 
@@ -1903,13 +1785,8 @@ String BasicFrame::GenRealString( const String &aResString )
                 nEnd = nEnd + aString.Len();
                 aString.Erase();
             }
-//          if ( Resource::GetResManager()->IsAvailable( ResId( aValue ) ) )
-                aString = String( SttResId( (USHORT)(aValue.ToInt32()) ) );
-//          else
-            {
-//              DBG_ERROR( "Could not load resource!" );
-//              return aResString;
-            }
+
+            aString = String( SttResId( (USHORT)(aValue.ToInt32()) ) );
             nInsertPos = nStart;
             nStartPos = nStart;
             aResult.Erase( nStart, nEnd-nStart+1 );
diff --git a/basic/source/app/process.cxx b/basic/source/app/process.cxx
index 7d6d9a0d8eca..d370b3947ca3 100644
--- a/basic/source/app/process.cxx
+++ b/basic/source/app/process.cxx
@@ -159,7 +159,7 @@ void Process::SetImage( const String &aAppPath, const String &aAppParams, const
             while ( aIter != pEnv->end() )
             {
                 ::rtl::OUString aTemp = ::rtl::OUString( (*aIter).first );
-                aTemp += ::rtl::OUString::createFromAscii( "=" );
+                aTemp += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "=" ));
                 aTemp += ::rtl::OUString( (*aIter).second );
                 m_pEnvList[m_nEnvCount] = NULL;
                 rtl_uString_assign( &(m_pEnvList[m_nEnvCount]), aTemp.pData );
diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx
index 5d1538eba062..44f55aa65f7a 100644
--- a/basic/source/classes/errobject.cxx
+++ b/basic/source/classes/errobject.cxx
@@ -175,7 +175,7 @@ void ErrObject::setData( const uno::Any& Number, const uno::Any& Source, const u
     throw (uno::RuntimeException)
 {
     if ( !Number.hasValue() )
-        throw uno::RuntimeException( rtl::OUString::createFromAscii("Missing Required Paramater"), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Missing Required Paramater")), uno::Reference< uno::XInterface >() );
     Number >>= m_nNumber;
     Description >>= m_sDescription;
     Source >>= m_sSource;
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 876513216205..3a2a0dac6b78 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -2490,7 +2490,7 @@ void SbUnoObject::doIntrospection( void )
         Reference< XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory() );
         if ( xFactory.is() )
         {
-            Reference< XInterface > xI = xFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.beans.Introspection") );
+            Reference< XInterface > xI = xFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.Introspection")) );
             if (xI.is())
                 xIntrospection = Reference< XIntrospection >::query( xI );
                 //xI->queryInterface( ::getCppuType( (const Reference< XIntrospection > *)0 ), xIntrospection );
@@ -4168,7 +4168,7 @@ void SbRtl_CreateUnoListener( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
 
     // From 1999-11-30: get the InvocationAdapterFactory
     Reference< XInvocationAdapterFactory > xInvocationAdapterFactory = Reference< XInvocationAdapterFactory >(
-        xFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.script.InvocationAdapterFactory") ), UNO_QUERY );
+        xFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.InvocationAdapterFactory")) ), UNO_QUERY );
 
     BasicAllListener_Impl * p;
     Reference< XAllListener > xAllLst = p = new BasicAllListener_Impl( aPrefixName );
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 089a963cf05c..e91346b784a4 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -505,7 +505,7 @@ bool UnlockControllerHack( StarBASIC* pBasic )
     if ( pBasic && pBasic->IsDocBasic() )
     {
         uno::Any aUnoVar;
-        ::rtl::OUString sVarName( ::rtl::OUString::createFromAscii( "ThisComponent" ) );
+        ::rtl::OUString sVarName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ThisComponent" )) );
         SbUnoObject* pGlobs = dynamic_cast<SbUnoObject*>( pBasic->Find( sVarName, SbxCLASS_DONTCARE ) );
         if ( pGlobs )
             aUnoVar = pGlobs->getUnoAny();
@@ -2075,7 +2075,7 @@ SbObjModule::SbObjModule( const String& rName, const com::sun::star::script::Mod
     SetModuleType( mInfo.ModuleType );
     if ( mInfo.ModuleType == script::ModuleType::FORM )
     {
-        SetClassName( rtl::OUString::createFromAscii( "Form" ) );
+        SetClassName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Form" )) );
     }
     else if ( mInfo.ModuleObject.is() )
         SetUnoObject( uno::makeAny( mInfo.ModuleObject ) );
@@ -2089,13 +2089,13 @@ SbObjModule::SetUnoObject( const uno::Any& aObj ) throw ( uno::RuntimeException
     pDocObject = new SbUnoObject( GetName(), uno::makeAny( aObj ) );
 
     com::sun::star::uno::Reference< com::sun::star::lang::XServiceInfo > xServiceInfo( aObj, com::sun::star::uno::UNO_QUERY_THROW );
-    if( xServiceInfo->supportsService( rtl::OUString::createFromAscii( "ooo.vba.excel.Worksheet" ) ) )
+    if( xServiceInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.Worksheet" )) ) )
     {
-        SetClassName( rtl::OUString::createFromAscii( "Worksheet" ) );
+        SetClassName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Worksheet" )) );
     }
-    else if( xServiceInfo->supportsService( rtl::OUString::createFromAscii( "ooo.vba.excel.Workbook" ) ) )
+    else if( xServiceInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.Workbook" )) ) )
     {
-        SetClassName( rtl::OUString::createFromAscii( "Workbook" ) );
+        SetClassName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Workbook" )) );
     }
 }
 
@@ -2505,8 +2505,15 @@ void SbUserFormModule::InitObject()
             aArgs[ 0 ] <<= m_xModel;
             rtl::OUString sDialogUrl( RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.script:" ) );
             rtl::OUString sProjectName( RTL_CONSTASCII_USTRINGPARAM("Standard") );
-            if ( this->GetParent()->GetName().Len() )
-                sProjectName = this->GetParent()->GetName();
+
+            try
+            {
+                Reference< beans::XPropertySet > xProps( m_xModel, UNO_QUERY_THROW );
+                uno::Reference< script::vba::XVBACompatibility > xVBAMode( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BasicLibraries") ) ), uno::UNO_QUERY_THROW );
+                sProjectName = xVBAMode->getProjectName();
+            }
+            catch( Exception& /*e*/) {}
+
             sDialogUrl = sDialogUrl.concat( sProjectName ).concat( rtl::OUString( '.') ).concat( GetName() ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("?location=document") ) );
 
             uno::Reference< awt::XDialogProvider > xProvider( xFactory->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.DialogProvider")), aArgs  ), uno::UNO_QUERY_THROW );
diff --git a/basic/source/comp/buffer.cxx b/basic/source/comp/buffer.cxx
index 5a6aa36970ef..c248d4100675 100644
--- a/basic/source/comp/buffer.cxx
+++ b/basic/source/comp/buffer.cxx
@@ -35,9 +35,9 @@
 
 const static UINT32 UP_LIMIT=0xFFFFFF00L;
 
-// Der SbiBuffer wird in Inkrements von mindestens 16 Bytes erweitert.
-// Dies ist notwendig, da viele Klassen von einer Pufferlaenge
-// von x*16 Bytes ausgehen.
+// The SbiBuffer will be expanded in increments of at least 16 Bytes.
+// This is necessary, because many classes emanate from a buffer length
+// of x*16 Bytes.
 
 SbiBuffer::SbiBuffer( SbiParser* p, short n )
 {
@@ -56,8 +56,8 @@ SbiBuffer::~SbiBuffer()
     delete[] pBuf;
 }
 
-// Rausreichen des Puffers
-// Dies fuehrt zur Loeschung des Puffers!
+// Reach out the buffer
+// This lead to the deletion of the buffer!
 
 char* SbiBuffer::GetBuffer()
 {
@@ -67,8 +67,8 @@ char* SbiBuffer::GetBuffer()
     return p;
 }
 
-// Test, ob der Puffer n Bytes aufnehmen kann.
-// Im Zweifelsfall wird er vergroessert
+// Test, if the buffer can contain n Bytes.
+// In case of doubt it will be enlarged
 
 BOOL SbiBuffer::Check( USHORT n )
 {
@@ -101,7 +101,7 @@ BOOL SbiBuffer::Check( USHORT n )
     return TRUE;
 }
 
-// Angleich des Puffers auf die uebergebene Byte-Grenze
+// Conditioning of the buffer onto the passed Byte limit
 
 void SbiBuffer::Align( INT32 n )
 {
@@ -120,7 +120,7 @@ void SbiBuffer::Align( INT32 n )
     }
 }
 
-// Patch einer Location
+// Patch of a Location
 
 void SbiBuffer::Patch( UINT32 off, UINT32 val )
 {
@@ -136,9 +136,9 @@ void SbiBuffer::Patch( UINT32 off, UINT32 val )
     }
 }
 
-// Forward References auf Labels und Prozeduren
-// bauen eine Kette auf. Der Anfang der Kette ist beim uebergebenen
-// Parameter, das Ende der Kette ist 0.
+// Forward References upon label und procedures
+// establish a linkage. The beginning of the linkage is at the passed parameter,
+// the end of the linkage is 0.
 
 void SbiBuffer::Chain( UINT32 off )
 {
diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx
index da8d6d96e8af..8f67efd3ff7c 100644
--- a/basic/source/comp/codegen.cxx
+++ b/basic/source/comp/codegen.cxx
@@ -35,7 +35,7 @@
 #include <limits>
 #include <com/sun/star/script/ModuleType.hpp>
 
-// nInc ist die Inkrementgroesse der Puffer
+// nInc is the increment size of the buffers
 
 SbiCodeGen::SbiCodeGen( SbModule& r, SbiParser* p, short nInc )
          : rMod( r ), aCode( p, nInc )
@@ -52,7 +52,7 @@ UINT32 SbiCodeGen::GetPC()
     return aCode.GetSize();
 }
 
-// Statement merken
+// memorize the statement
 
 void SbiCodeGen::Statement()
 {
@@ -61,12 +61,12 @@ void SbiCodeGen::Statement()
     nLine = pParser->GetLine();
     nCol  = pParser->GetCol1();
 
-    // #29955 Information der for-Schleifen-Ebene
-    // in oberen Byte der Spalte speichern
+    // #29955 Store the information of the for-loop-layer
+    // in the uppper Byte of the column
     nCol = (nCol & 0xff) + 0x100 * nForLevel;
 }
 
-// Anfang eines Statements markieren
+// Mark the beginning of a statement
 
 void SbiCodeGen::GenStmnt()
 {
@@ -77,8 +77,8 @@ void SbiCodeGen::GenStmnt()
     }
 }
 
-// Die Gen-Routinen returnen den Offset des 1. Operanden,
-// damit Jumps dort ihr Backchain versenken koennen
+// The Gen-Routines return the offset of the 1. operand,
+// so that jumps can sink their backchain there.
 
 UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode )
 {
@@ -118,15 +118,15 @@ UINT32 SbiCodeGen::Gen( SbiOpcode eOpcode, UINT32 nOpnd1, UINT32 nOpnd2 )
     return n;
 }
 
-// Abspeichern des erzeugten Images im Modul
+// Storing of the created image in the module
 
 void SbiCodeGen::Save()
 {
     SbiImage* p = new SbiImage;
     rMod.StartDefinitions();
-    // OPTION BASE-Wert:
+    // OPTION BASE-Value:
     p->nDimBase = pParser->nBase;
-    // OPTION EXPLICIT-Flag uebernehmen
+    // OPTION take over the EXPLICIT-Flag
     if( pParser->bExplicit )
         p->SetFlag( SBIMG_EXPLICIT );
 
@@ -267,22 +267,22 @@ void SbiCodeGen::Save()
                     pMeth->nStart = pProc->GetAddr();
                     pMeth->nLine1 = pProc->GetLine1();
                     pMeth->nLine2 = pProc->GetLine2();
-                    // Die Parameter:
+                    // The parameter:
                     SbxInfo* pInfo = pMeth->GetInfo();
                     String aHelpFile, aComment;
                     ULONG nHelpId = 0;
                     if( pInfo )
                     {
-                        // Die Zusatzdaten retten
+                        // Rescue the additional data
                         aHelpFile = pInfo->GetHelpFile();
                         aComment  = pInfo->GetComment();
                         nHelpId   = pInfo->GetHelpId();
                     }
-                    // Und die Parameterliste neu aufbauen
+                    // And reestablish the parameter list
                     pInfo = new SbxInfo( aHelpFile, nHelpId );
                     pInfo->SetComment( aComment );
                     SbiSymPool* pPool = &pProc->GetParams();
-                    // Das erste Element ist immer der Funktionswert!
+                    // The first element is always the value of the function!
                     for( USHORT i = 1; i < pPool->GetSize(); i++ )
                     {
                         SbiSymDef* pPar = pPool->Get( i );
@@ -291,7 +291,7 @@ void SbiCodeGen::Save()
                             t = (SbxDataType) ( t | SbxBYREF );
                         if( pPar->GetDims() )
                             t = (SbxDataType) ( t | SbxARRAY );
-                        // #33677 Optional-Info durchreichen
+                        // #33677 hand-over an Optional-Info
                         USHORT nFlags = SBX_READ;
                         if( pPar->IsOptional() )
                             nFlags |= SBX_OPTIONAL;
@@ -316,10 +316,10 @@ void SbiCodeGen::Save()
             }   // for( iPass...
         }
     }
-    // Der Code
+    // The code
     p->AddCode( aCode.GetBuffer(), aCode.GetSize() );
 
-    // Der globale StringPool. 0 ist nicht belegt.
+    // The global StringPool. 0 is not occupied.
     SbiStringPool* pPool = &pParser->aGblStrings;
     USHORT nSize = pPool->GetSize();
     p->MakeStrings( nSize );
@@ -327,7 +327,7 @@ void SbiCodeGen::Save()
     for( i = 1; i <= nSize; i++ )
         p->AddString( pPool->Find( i ) );
 
-    // Typen einfuegen
+    // Insert types
     USHORT nCount = pParser->rTypeArray->Count();
     for (i = 0; i < nCount; i++)
          p->AddType((SbxObject *)pParser->rTypeArray->Get(i));
diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index ce76fc065af4..92f25a1fcd87 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -35,10 +35,10 @@
 
 SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj );
 
-// Deklaration einer Variablen
-// Bei Fehlern wird bis zum Komma oder Newline geparst.
-// Returnwert: eine neue Instanz, die eingefuegt und dann geloescht wird.
-// Array-Indexe werden als SbiDimList zurueckgegeben
+// Declaration of a variable
+// If there are errors it will be parsed up to the comma or the newline.
+// Return-value: a new instance, which were inserted and then deleted.
+// Array-Indexex were returned as SbiDimList
 
 SbiSymDef* SbiParser::VarDecl( SbiDimList** ppDim, BOOL bStatic, BOOL bConst )
 {
@@ -52,7 +52,7 @@ SbiSymDef* SbiParser::VarDecl( SbiDimList** ppDim, BOOL bStatic, BOOL bConst )
     SbxDataType t = eScanType;
     SbiSymDef* pDef = bConst ? new SbiConstDef( aSym ) : new SbiSymDef( aSym );
     SbiDimList* pDim = NULL;
-    // Klammern?
+    // Brackets?
     if( Peek() == LPAREN )
         pDim = new SbiDimList( this );
     pDef->SetType( t );
@@ -72,8 +72,8 @@ SbiSymDef* SbiParser::VarDecl( SbiDimList** ppDim, BOOL bStatic, BOOL bConst )
     return pDef;
 }
 
-// Aufloesen einer AS-Typdeklaration
-// Der Datentyp wird in die uebergebene Variable eingetragen
+// Resolving of a AS-Type-Declaration
+// The data type were inserted into the handed over variable
 
 void SbiParser::TypeDecl( SbiSymDef& rDef, BOOL bAsNewAlreadyParsed )
 {
@@ -127,14 +127,14 @@ void SbiParser::TypeDecl( SbiSymDef& rDef, BOOL bAsNewAlreadyParsed )
                     }
                 }
                 break;
-            case SYMBOL: // kann nur ein TYPE oder eine Objektklasse sein!
+            case SYMBOL: // can only be a TYPE or a object class!
                 if( eScanType != SbxVARIANT )
                     Error( SbERR_SYNTAX );
                 else
                 {
                     String aCompleteName = aSym;
 
-                    // #52709 DIM AS NEW fuer Uno mit voll-qualifizierten Namen
+                    // #52709 DIM AS NEW for Uno with full-qualified name
                     if( Peek() == DOT )
                     {
                         String aDotStr( '.' );
@@ -162,7 +162,7 @@ void SbiParser::TypeDecl( SbiSymDef& rDef, BOOL bAsNewAlreadyParsed )
                         break;
                     }
 
-                    // In den String-Pool uebernehmen
+                    // Take over in the String pool
                     rDef.SetTypeId( aGblStrings.Add( aCompleteName ) );
 
                     if( rDef.IsNew() && pProc == NULL )
@@ -178,7 +178,7 @@ void SbiParser::TypeDecl( SbiSymDef& rDef, BOOL bAsNewAlreadyParsed )
                 Error( SbERR_UNEXPECTED, eTok );
                 Next();
         }
-        // Die Variable koennte mit Suffix deklariert sein
+        // The variable could have been declared with a suffix
         if( rDef.GetType() != SbxVARIANT )
         {
             if( rDef.GetType() != eType )
@@ -191,7 +191,7 @@ void SbiParser::TypeDecl( SbiSymDef& rDef, BOOL bAsNewAlreadyParsed )
     }
 }
 
-// Hier werden Variable, Arrays und Strukturen definiert.
+// Here variables, arrays and structures were definied.
 // DIM/PRIVATE/PUBLIC/GLOBAL
 
 void SbiParser::Dim()
@@ -209,7 +209,7 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
         Error( SbERR_NOT_IN_SUBR, eCurTok );
     if( eCurTok == PUBLIC || eCurTok == GLOBAL )
     {
-        bSwitchPool = TRUE;     // im richtigen Moment auf globalen Pool schalten
+        bSwitchPool = TRUE;     // at the right moment switch to the global pool
         if( eCurTok == GLOBAL )
             bPersistantGlobal = TRUE;
     }
@@ -217,7 +217,7 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
     // tied to the document. e.g. a module scope variable is global
        if(  GetBasic()->IsDocBasic() && bVBASupportOn && !pProc )
         bPersistantGlobal = TRUE;
-    // PRIVATE ist Synonym fuer DIM
+    // PRIVATE is a synonymous for DIM
     // _CONST_?
     BOOL bConst = FALSE;
     if( eCurTok == _CONST_ )
@@ -275,13 +275,13 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
 #define tmpSHARED
 #undef SHARED
 #endif
-    // SHARED wird ignoriert
+    // SHARED were ignored
     if( Peek() == SHARED ) Next();
 #ifdef tmpSHARED
 #define SHARED
 #undef tmpSHARED
 #endif
-    // PRESERVE nur bei REDIM
+    // PRESERVE only at REDIM
     if( Peek() == PRESERVE )
     {
         Next();
@@ -293,23 +293,23 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
     SbiSymDef* pDef;
     SbiDimList* pDim;
 
-    // AB 9.7.97, #40689, Statics -> Modul-Initialisierung, in Sub ueberspringen
+    // From 1997-07-09, #40689, Statics -> Modul-Initialising, skip in Sub
     UINT32 nEndOfStaticLbl = 0;
     if( !bVBASupportOn && bStatic )
     {
         nEndOfStaticLbl = aGen.Gen( _JUMP, 0 );
-        aGen.Statement();   // bei static hier nachholen
+        aGen.Statement();   // catch up on static here
     }
 
     BOOL bDefined = FALSE;
     while( ( pDef = VarDecl( &pDim, bStatic, bConst ) ) != NULL )
     {
         EnableErrors();
-        // Variable suchen:
+        // search variable:
         if( bSwitchPool )
             pPool = &aGlobals;
         SbiSymDef* pOld = pPool->Find( pDef->GetName() );
-        // AB 31.3.1996, #25651#, auch in Runtime-Library suchen
+        // From 1996-03-31, #25651#, search also in the Runtime-Library
         BOOL bRtlSym = FALSE;
         if( !pOld )
         {
@@ -325,10 +325,10 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
         if( pOld )
         {
             bDefined = TRUE;
-            // Bei RTL-Symbol immer Fehler
+            // always an error at a RTL-S
             if( !bRtlSym && (eOp == _REDIM || eOp == _REDIMP) )
             {
-                // Bei REDIM die Attribute vergleichen
+                // compare the attributes at a REDIM
                 SbxDataType eDefType;
                 bool bError_ = false;
                 if( pOld->IsStatic() )
@@ -350,19 +350,19 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
         else
             pPool->Add( pDef );
 
-        // #36374: Variable vor Unterscheidung IsNew() anlegen
-        // Sonst Error bei Dim Identifier As New Type und option explicit
+        // #36374: Create the variable in front of the distinction IsNew()
+        // Otherwise error at Dim Identifier As New Type and option explicit
         if( !bDefined && !(eOp == _REDIM || eOp == _REDIMP)
                       && ( !bConst || pDef->GetScope() == SbGLOBAL ) )
         {
-            // Variable oder globale Konstante deklarieren
+            // Declare variable or global constant
             SbiOpcode eOp2;
             switch ( pDef->GetScope() )
             {
                 case SbGLOBAL:  eOp2 = bPersistantGlobal ? _GLOBAL_P : _GLOBAL;
                                 goto global;
                 case SbPUBLIC:  eOp2 = bPersistantGlobal ? _PUBLIC_P : _PUBLIC;
-                                // AB 9.7.97, #40689, kein eigener Opcode mehr
+                                // From 1997-07-09, #40689, no own Opcode anymore
                                 if( bVBASupportOn && bStatic )
                                 {
                                     eOp2 = _STATIC;
@@ -385,8 +385,8 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
             aGen.Gen( eOp2, pDef->GetId(), nOpnd2 );
         }
 
-        // Initialisierung fuer selbstdefinierte Datentypen
-        // und per NEW angelegte Variable
+        // Initialising for self-defined daty types
+        // and per NEW created variable
         if( pDef->GetType() == SbxOBJECT
          && pDef->GetTypeId() )
         {
@@ -439,7 +439,7 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
         {
             if( bConst )
             {
-                // Konstanten-Definition
+                // Definition of the constants
                 if( pDim )
                 {
                     Error( SbERR_SYNTAX );
@@ -447,13 +447,13 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
                 }
                 SbiExpression aVar( this, *pDef );
                 if( !TestToken( EQ ) )
-                    goto MyBreak;   // AB 24.6.1996 (s.u.)
+                    goto MyBreak;   // From 1996-06-24 (see below)
                 SbiConstExpression aExpr( this );
                 if( !bDefined && aExpr.IsValid() )
                 {
                     if( pDef->GetScope() == SbGLOBAL )
                     {
-                        // Nur Code fuer globale Konstante erzeugen!
+                        // Create code only for the global constant!
                         aVar.Gen();
                         aExpr.Gen();
                         aGen.Gen( _PUTC );
@@ -467,8 +467,8 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
             }
             else if( pDim )
             {
-                // Die Variable dimensionieren
-                // Bei REDIM die Var vorher loeschen
+                // Dimension the variable
+                // Delete the var at REDIM beforehand
                 if( eOp == _REDIM )
                 {
                     SbiExpression aExpr( this, *pDef, NULL );
@@ -498,36 +498,36 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
             }
         }
         if( !TestComma() )
-            goto MyBreak;   // AB 24.6.1996 (s.u.)
-
-        // #27963# AB, 24.6.1996
-        // Einfuehrung bSwitchPool (s.o.): pPool darf beim VarDecl-Aufruf
-        // noch nicht auf &aGlobals gesetzt sein.
-        // Ansonsten soll das Verhalten aber absolut identisch bleiben,
-        // d.h. pPool muss immer am Schleifen-Ende zurueckgesetzt werden.
-        // auch bei break
+            goto MyBreak;   // From 1996-06-24 (see below)
+
+        // #27963# From 1996-06-24
+        // Implementation of bSwitchPool (see above): pPool must not be set to &aGlobals
+        // at the VarDecl-Call.
+        // Apart from that the behavior should be absolutely identical,
+        // i.e., pPool had to be reset always at the end of the loop.
+        // also at a break
         pPool = pOldPool;
-        continue;       // MyBreak überspingen
+        continue;       // Skip MyBreak
     MyBreak:
         pPool = pOldPool;
         break;
     }
 
-    // AB 9.7.97, #40689, Sprung ueber Statics-Deklaration abschliessen
+    // From 1997-07-09, #40689, finalize the jump over statics declarations
     if( !bVBASupportOn && bStatic )
     {
-        // globalen Chain pflegen
+        // maintain the global chain
         nGblChain = aGen.Gen( _JUMP, 0 );
         bGblDefs = bNewGblDefs = TRUE;
 
-        // fuer Sub Sprung auf Ende der statics eintragen
+        // Register for Sub a jump to the end of statics
         aGen.BackChain( nEndOfStaticLbl );
     }
 
     //pPool = pOldPool;
 }
 
-// Hier werden Arrays redimensioniert.
+// Here were Arrays redimensioned.
 
 void SbiParser::ReDim()
 {
@@ -547,7 +547,7 @@ void SbiParser::Erase()
     }
 }
 
-// Deklaration eines Datentyps
+// Declaration of a data type
 
 void SbiParser::Type()
 {
@@ -559,7 +559,7 @@ void SbiParser::DefType( BOOL bPrivate )
     // TODO: Use bPrivate
     (void)bPrivate;
 
-    // Neues Token lesen, es muss ein Symbol sein
+    // Read the new Token lesen. It had to be a symbol
     if (!TestSymbol())
         return;
 
@@ -681,7 +681,7 @@ void SbiParser::Enum()
 
 void SbiParser::DefEnum( BOOL bPrivate )
 {
-    // Neues Token lesen, es muss ein Symbol sein
+    // Read a the new Token. It had to be a symbol
     if (!TestSymbol())
         return;
 
@@ -808,8 +808,8 @@ void SbiParser::DefEnum( BOOL bPrivate )
 }
 
 
-// Prozedur-Deklaration
-// das erste Token ist bereits eingelesen (SUB/FUNCTION)
+// Procedure-Declaration
+// the first Token is already read in (SUB/FUNCTION)
 // xxx Name [LIB "name"[ALIAS "name"]][(Parameter)][AS TYPE]
 
 SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
@@ -843,7 +843,7 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
     }
     if( !bDecl )
     {
-        // CDECL, LIB und ALIAS sind unzulaessig
+        // CDECL, LIB and ALIAS are invalid
         if( pDef->GetLib().Len() )
             Error( SbERR_UNEXPECTED, LIB );
         if( pDef->GetAlias().Len() )
@@ -856,7 +856,7 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
     }
     else if( !pDef->GetLib().Len() )
     {
-        // ALIAS und CDECL nur zusammen mit LIB
+        // ALIAS and CDECL only together with LIB
         if( pDef->GetAlias().Len() )
             Error( SbERR_UNEXPECTED, ALIAS );
         if( pDef->IsCdecl() )
@@ -864,7 +864,7 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl )
         pDef->SetCdecl( FALSE );
         pDef->GetAlias().Erase();
     }
-    // Klammern?
+    // Brackets?
     if( Peek() == LPAREN )
     {
         Next();
@@ -962,14 +962,14 @@ void SbiParser::DefDeclare( BOOL bPrivate )
         {
             if( !pDef->GetLib().Len() )
                 Error( SbERR_EXPECTED, LIB );
-            // gibts den schon?
+            // Is it already there?
             SbiSymDef* pOld = aPublics.Find( pDef->GetName() );
             if( pOld )
             {
                 SbiProcDef* p = pOld->GetProcDef();
                 if( !p )
                 {
-                    // Als Variable deklariert
+                    // Declared as a variable
                     Error( SbERR_BAD_DECLARATION, pDef->GetName() );
                     delete pDef;
                     pDef = NULL;
@@ -1066,7 +1066,7 @@ void SbiParser::Attribute()
     // Don't generate any code - just discard it.
 }
 
-// Aufruf einer SUB oder FUNCTION
+// Call of a SUB or a FUNCTION
 
 void SbiParser::Call()
 {
@@ -1082,7 +1082,7 @@ void SbiParser::SubFunc()
     DefProc( FALSE, FALSE );
 }
 
-// Einlesen einer Prozedur
+// Read in of a procedure
 
 BOOL runsInSetup( void );
 
@@ -1111,7 +1111,7 @@ void SbiParser::DefProc( BOOL bStatic, BOOL bPrivate )
         return;
     pDef->setPropertyMode( ePropertyMode );
 
-    // Ist die Proc bereits deklariert?
+    // Is the Proc already declared?
     SbiSymDef* pOld = aPublics.Find( pDef->GetName() );
     if( pOld )
     {
@@ -1120,7 +1120,7 @@ void SbiParser::DefProc( BOOL bStatic, BOOL bPrivate )
         pProc = pOld->GetProcDef();
         if( !pProc )
         {
-            // Als Variable deklariert
+            // Declared as a variable
             Error( SbERR_BAD_DECLARATION, pDef->GetName() );
             delete pDef;
             pProc = NULL;
@@ -1153,8 +1153,8 @@ void SbiParser::DefProc( BOOL bStatic, BOOL bPrivate )
         return;
     pProc->SetPublic( !bPrivate );
 
-    // Nun setzen wir die Suchhierarchie fuer Symbole sowie die aktuelle
-    // Prozedur.
+    // Now we set the search hierarchy for symbols as well as the
+    // current procedure.
     aPublics.SetProcId( pProc->GetId() );
     pProc->GetParams().SetParent( &aPublics );
     if( bStatic )
@@ -1168,7 +1168,7 @@ void SbiParser::DefProc( BOOL bStatic, BOOL bPrivate )
     {
         pProc->SetStatic( FALSE );
         }
-    // Normalfall: Lokale Variable->Parameter->Globale Variable
+    // Normal case: Local variable->parameter->global variable
     pProc->GetLocals().SetParent( &pProc->GetParams() );
     pPool = &pProc->GetLocals();
 
@@ -1180,7 +1180,7 @@ void SbiParser::DefProc( BOOL bStatic, BOOL bPrivate )
     pProc->SetLine2( l2 );
     pPool = &aPublics;
     aPublics.SetProcId( 0 );
-    // Offene Labels?
+    // Open labels?
     pProc->GetLabels().CheckRefs();
     CloseBlock();
     aGen.Gen( _LEAVE );
@@ -1214,8 +1214,8 @@ void SbiParser::DefStatic( BOOL bPrivate )
         default: {
             if( !pProc )
                 Error( SbERR_NOT_IN_SUBR );
-            // Pool umsetzen, damit STATIC-Deklarationen im globalen
-            // Pool landen
+            // Reset the Pool, so that STATIC-Declarations go into the
+            // global Pool
             SbiSymPool* p = pPool; pPool = &aPublics;
             DefVar( _STATIC, TRUE );
             pPool = p;
diff --git a/basic/source/comp/exprgen.cxx b/basic/source/comp/exprgen.cxx
index eb6c27360959..5975314e8870 100644
--- a/basic/source/comp/exprgen.cxx
+++ b/basic/source/comp/exprgen.cxx
@@ -32,7 +32,7 @@
 #include "sbcomp.hxx"
 #include "expr.hxx"
 
-// Umsetztabelle fuer Token-Operatoren und Opcodes
+// Transform table for token operators and opcodes
 
 typedef struct {
         SbiToken  eTok;                 // Token
@@ -65,7 +65,7 @@ static OpTable aOpTable [] = {
     { IS,   _IS },
     { NIL,  _NOP }};
 
-// Ausgabe eines Elements
+// Output of an element
 void SbiExprNode::Gen( RecursiveMode eRecMode )
 {
     if( IsConstant() )
@@ -109,10 +109,10 @@ void SbiExprNode::Gen( RecursiveMode eRecMode )
                     eOp = aVar.pDef->IsGlobal() ? _FIND_G : _FIND;
             }
         }
-        // AB: 17.12.1995, Spezialbehandlung fuer WITH
+        // From 1995-12-17, special treatment for WITH
         else if( (pWithParent_ = GetWithParent()) != NULL )
         {
-            eOp = _ELEM;            // .-Ausdruck in WITH
+            eOp = _ELEM;            // .-Term in in WITH
         }
         else
         {
@@ -163,7 +163,7 @@ void SbiExprNode::Gen( RecursiveMode eRecMode )
     }
 }
 
-// Ausgabe eines Operanden-Elements
+// Output of an operand element
 
 void SbiExprNode::GenElement( SbiOpcode eOp )
 {
@@ -172,11 +172,11 @@ void SbiExprNode::GenElement( SbiOpcode eOp )
         pGen->GetParser()->Error( SbERR_INTERNAL_ERROR, "Opcode" );
 #endif
     SbiSymDef* pDef = aVar.pDef;
-    // Das ID ist entweder die Position oder das String-ID
-    // Falls das Bit 0x8000 gesetzt ist, hat die Variable
-    // eine Parameterliste.
+    // The ID is either the position or the String-ID
+    // If the bit Bit 0x8000 is set, the variable have
+    // a parameter list.
     USHORT nId = ( eOp == _PARAM ) ? pDef->GetPos() : pDef->GetId();
-    // Parameterliste aufbauen
+    // Build a parameter list
     if( aVar.pPar && aVar.pPar->GetSize() )
     {
         nId |= 0x8000;
@@ -198,16 +198,16 @@ void SbiExprNode::GenElement( SbiOpcode eOp )
     }
 }
 
-// Erzeugen einer Argv-Tabelle
-// Das erste Element bleibt immer frei fuer Returnwerte etc.
-// Siehe auch SbiProcDef::SbiProcDef() in symtbl.cxx
+// Create an Argv-Table
+// The first element remain available for return value etc.
+// See as well SbiProcDef::SbiProcDef() in symtbl.cxx
 
 void SbiExprList::Gen()
 {
     if( pFirst )
     {
         pParser->aGen.Gen( _ARGC );
-        // AB 10.1.96: Typ-Anpassung bei DECLARE
+        // From 1996-01-10: Type adjustment at DECLARE
         USHORT nCount = 1 /*, nParAnz = 0*/;
 //      SbiSymPool* pPool = NULL;
         for( SbiExpression* pExpr = pFirst; pExpr; pExpr = pExpr->pNext,nCount++ )
@@ -220,13 +220,13 @@ void SbiExprList::Gen()
                 pParser->aGen.Gen( _ARGN, nSid );
 
                 /* TODO: Check after Declare concept change
-                // AB 10.1.96: Typanpassung bei named -> passenden Parameter suchen
+                // From 1996-01-10: Type adjustment at named -> search suitable parameter
                 if( pProc )
                 {
-                    // Vorerst: Error ausloesen
+                    // For the present: trigger an error
                     pParser->Error( SbERR_NO_NAMED_ARGS );
 
-                    // Spaeter, wenn Named Args bei DECLARE moeglich
+                    // Later, if Named Args at DECLARE is posible
                     //for( USHORT i = 1 ; i < nParAnz ; i++ )
                     //{
                     //  SbiSymDef* pDef = pPool->Get( i );
@@ -254,8 +254,8 @@ void SbiExprList::Gen()
 
 void SbiExpression::Gen( RecursiveMode eRecMode )
 {
-    // AB: 17.12.1995, Spezialbehandlung fuer WITH
-    // Wenn pExpr == .-Ausdruck in With, zunaechst Gen fuer Basis-Objekt
+    // From 1995-12-17, special treatment for WITH
+    // If pExpr == .-term in With, approximately Gen for Basis-Object
     pExpr->Gen( eRecMode );
     if( bByVal )
         pParser->aGen.Gen( _BYVAL );
diff --git a/basic/source/comp/exprnode.cxx b/basic/source/comp/exprnode.cxx
index bfd0aea3271b..7a3dc862cb16 100644
--- a/basic/source/comp/exprnode.cxx
+++ b/basic/source/comp/exprnode.cxx
@@ -52,7 +52,7 @@ SbiExprNode::SbiExprNode( SbiParser* p, SbiExprNode* l, SbiToken t, SbiExprNode*
     pRight    = r;
     eTok      = t;
     nVal      = 0;
-    eType     = SbxVARIANT;     // Nodes sind immer Variant
+    eType     = SbxVARIANT;     // Nodes are always Variant
     eNodeType = SbxNODE;
     bComposite= TRUE;
 }
@@ -86,7 +86,7 @@ SbiExprNode::SbiExprNode( SbiParser* p, const SbiSymDef& r, SbxDataType t, SbiEx
     aVar.pvMorePar = NULL;
     aVar.pNext= NULL;
 
-    // Funktionsergebnisse sind nie starr
+    // Results of functions are at no time fixed
     bComposite= BOOL( aVar.pDef->GetProcDef() != NULL );
 }
 
@@ -111,7 +111,7 @@ SbiExprNode::SbiExprNode( SbiParser* p, USHORT nId )
     nTypeStrId = nId;
 }
 
-// AB: 17.12.95, Hilfsfunktion fuer Ctor fuer einheitliche Initialisierung
+// From 1995-12-17, auxiliary function for Ctor for the uniform initialisation
 void SbiExprNode::BaseInit( SbiParser* p )
 {
     pGen = &p->aGen;
@@ -159,7 +159,7 @@ SbiSymDef* SbiExprNode::GetRealVar()
         return NULL;
 }
 
-// AB: 18.12.95
+// From 1995-12-18
 SbiExprNode* SbiExprNode::GetRealNode()
 {
     if( eNodeType == SbxVARVAL )
@@ -173,7 +173,7 @@ SbiExprNode* SbiExprNode::GetRealNode()
         return NULL;
 }
 
-// Diese Methode setzt den Typ um, falls er in den Integer-Bereich hineinpasst
+// This method transform the type, if it fits into the Integer range
 
 BOOL SbiExprNode::IsIntConst()
 {
@@ -213,7 +213,7 @@ BOOL SbiExprNode::IsLvalue()
     return IsVariable();
 }
 
-// Ermitteln der Tiefe eines Baumes
+// Identify of the depth of a tree
 
 short SbiExprNode::GetDepth()
 {
@@ -227,11 +227,11 @@ short SbiExprNode::GetDepth()
 }
 
 
-// Abgleich eines Baumes:
+// Adjustment of a tree:
 // 1. Constant Folding
-// 2. Typabgleich
-// 3. Umwandlung der Operanden in Strings
-// 4. Hochziehen der Composite- und Error-Bits
+// 2. Type-Adjustment
+// 3. Conversion of the operans into Strings
+// 4. Lifting of the composite- and error-bits
 
 void SbiExprNode::Optimize()
 {
@@ -239,7 +239,7 @@ void SbiExprNode::Optimize()
     CollectBits();
 }
 
-// Hochziehen der Composite- und Fehlerbits
+// Lifting of the composite- and error-bits
 
 void SbiExprNode::CollectBits()
 {
@@ -257,8 +257,8 @@ void SbiExprNode::CollectBits()
     }
 }
 
-// Kann ein Zweig umgeformt werden, wird TRUE zurueckgeliefert. In diesem
-// Fall ist das Ergebnis im linken Zweig.
+// If a twig can be converted, True will be returned. In this case
+// the result is in the left twig.
 
 void SbiExprNode::FoldConstants()
 {
@@ -273,10 +273,10 @@ void SbiExprNode::FoldConstants()
         {
             CollectBits();
             if( eTok == CAT )
-                // CAT verbindet auch zwei Zahlen miteinander!
+                // CAT affiliate also two numbers!
                 eType = SbxSTRING;
             if( pLeft->eType == SbxSTRING )
-                // Kein Type Mismatch!
+                // No Type Mismatch!
                 eType = SbxSTRING;
             if( eType == SbxSTRING )
             {
@@ -288,7 +288,7 @@ void SbiExprNode::FoldConstants()
                 if( eTok == PLUS || eTok == CAT )
                 {
                     eTok = CAT;
-                    // Verkettung:
+                    // Linking:
                     aStrVal = rl;
                     aStrVal += rr;
                     eType = SbxSTRING;
@@ -334,7 +334,7 @@ void SbiExprNode::FoldConstants()
                 if( ( eTok >= AND && eTok <= IMP )
                    || eTok == IDIV || eTok == MOD )
                 {
-                    // Integer-Operationen
+                    // Integer operations
                     BOOL err = FALSE;
                     if( nl > SbxMAXLNG ) err = TRUE, nl = SbxMAXLNG;
                     else
@@ -428,12 +428,11 @@ void SbiExprNode::FoldConstants()
                 if( !::rtl::math::isFinite( nVal ) )
                     pGen->GetParser()->Error( SbERR_MATH_OVERFLOW );
 
-                // Den Datentyp wiederherstellen, um Rundungsfehler
-                // zu killen
+                // Recover the data type to kill rounding error
                 if( bCheckType && bBothInt
                  && nVal >= SbxMINLNG && nVal <= SbxMAXLNG )
                 {
-                    // NK-Stellen weg
+                    // Decimal place away
                     long n = (long) nVal;
                     nVal = n;
                     eType = ( n >= SbxMININT && n <= SbxMAXINT )
@@ -455,7 +454,7 @@ void SbiExprNode::FoldConstants()
             case NEG:
                 nVal = -nVal; break;
             case NOT: {
-                // Integer-Operation!
+                // Integer operation!
                 BOOL err = FALSE;
                 if( nVal > SbxMAXLNG ) err = TRUE, nVal = SbxMAXLNG;
                 else
@@ -473,7 +472,7 @@ void SbiExprNode::FoldConstants()
     }
     if( eNodeType == SbxNUMVAL )
     {
-        // Evtl auf INTEGER falten (wg. besserem Opcode)?
+        // Potentially convolve in INTEGER (because of better opcode)?
         if( eType == SbxSINGLE || eType == SbxDOUBLE )
         {
             double x;
diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index 5622f3663ab8..6cf3f36a5646 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -583,13 +583,19 @@ SbiExprNode* SbiExpression::Unary()
     {
         case MINUS:
             eTok = NEG;
-        case NOT:
             pParser->Next();
-            // process something like "Do While Not "foo"="" "
+            pNd = new SbiExprNode( pParser, Unary(), eTok, NULL );
+            break;
+        case NOT:
             if( pParser->IsVBASupportOn() )
-                pNd = new SbiExprNode( pParser, Like(), eTok, NULL );
+            {
+                pNd = Operand();
+            }
             else
+            {
+                pParser->Next();
                 pNd = new SbiExprNode( pParser, Unary(), eTok, NULL );
+            }
             break;
         case PLUS:
             pParser->Next();
@@ -734,9 +740,114 @@ SbiExprNode* SbiExpression::Comp()
     return pNd;
 }
 
+
+SbiExprNode* SbiExpression::VBA_Not()
+{
+    SbiExprNode* pNd = NULL;
+
+    SbiToken eTok = pParser->Peek();
+    if( eTok == NOT )
+    {
+        pParser->Next();
+        pNd = new SbiExprNode( pParser, VBA_Not(), eTok, NULL );
+    }
+    else
+    {
+        pNd = Comp();
+    }
+    return pNd;
+}
+
+SbiExprNode* SbiExpression::VBA_And()
+{
+    SbiExprNode* pNd = VBA_Not();
+    if( m_eMode != EXPRMODE_EMPTY_PAREN )
+    {
+        for( ;; )
+        {
+            SbiToken eTok = pParser->Peek();
+            if( eTok != AND )
+                break;
+            eTok = pParser->Next();
+            pNd = new SbiExprNode( pParser, pNd, eTok, VBA_Not() );
+        }
+    }
+    return pNd;
+}
+
+SbiExprNode* SbiExpression::VBA_Or()
+{
+    SbiExprNode* pNd = VBA_And();
+    if( m_eMode != EXPRMODE_EMPTY_PAREN )
+    {
+        for( ;; )
+        {
+            SbiToken eTok = pParser->Peek();
+            if( eTok != OR )
+                break;
+            eTok = pParser->Next();
+            pNd = new SbiExprNode( pParser, pNd, eTok, VBA_And() );
+        }
+    }
+    return pNd;
+}
+
+SbiExprNode* SbiExpression::VBA_Xor()
+{
+    SbiExprNode* pNd = VBA_Or();
+    if( m_eMode != EXPRMODE_EMPTY_PAREN )
+    {
+        for( ;; )
+        {
+            SbiToken eTok = pParser->Peek();
+            if( eTok != XOR )
+                break;
+            eTok = pParser->Next();
+            pNd = new SbiExprNode( pParser, pNd, eTok, VBA_Or() );
+        }
+    }
+    return pNd;
+
+}
+
+SbiExprNode* SbiExpression::VBA_Eqv()
+{
+    SbiExprNode* pNd = VBA_Xor();
+    if( m_eMode != EXPRMODE_EMPTY_PAREN )
+    {
+        for( ;; )
+        {
+            SbiToken eTok = pParser->Peek();
+            if( eTok != EQV )
+                break;
+            eTok = pParser->Next();
+            pNd = new SbiExprNode( pParser, pNd, eTok, VBA_Xor() );
+        }
+    }
+    return pNd;
+}
+
+SbiExprNode* SbiExpression::VBA_Imp()
+{
+    SbiExprNode* pNd = VBA_Eqv();
+    if( m_eMode != EXPRMODE_EMPTY_PAREN )
+    {
+        for( ;; )
+        {
+            SbiToken eTok = pParser->Peek();
+            if( eTok != IMP )
+                break;
+            eTok = pParser->Next();
+            pNd = new SbiExprNode( pParser, pNd, eTok, VBA_Eqv() );
+        }
+    }
+    return pNd;
+
+}
+
 SbiExprNode* SbiExpression::Like()
 {
-    SbiExprNode* pNd = Comp();
+    SbiExprNode* pNd = pParser->IsVBASupportOn() ? VBA_Imp() : Comp();
     if( m_eMode != EXPRMODE_EMPTY_PAREN )
     {
         short nCount = 0;
diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx
index 5c0a31fc47a6..e7bf0393d296 100644
--- a/basic/source/comp/sbcomp.cxx
+++ b/basic/source/comp/sbcomp.cxx
@@ -365,7 +365,7 @@ void dbg_SaveDisassembly( SbModule* pModule )
         if( xSMgr.is() )
         {
             Reference< XSimpleFileAccess3 > xSFI = Reference< XSimpleFileAccess3 >( xSMgr->createInstance
-                ( OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), UNO_QUERY );
+                ( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" )) ), UNO_QUERY );
             if( xSFI.is() )
             {
                 String aFile( RTL_CONSTASCII_USTRINGPARAM("file:///d:/zBasic.Asm/Asm_") );
@@ -382,7 +382,7 @@ void dbg_SaveDisassembly( SbModule* pModule )
                 if( xSFI->exists( aFile ) )
                     xSFI->kill( aFile );
                 xOut = xSFI->openFileWrite( aFile );
-                Reference< XInterface > x = xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.io.TextOutputStream" ) );
+                Reference< XInterface > x = xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.TextOutputStream" )) );
                 Reference< XActiveDataSource > xADS( x, UNO_QUERY );
                 xADS->setOutputStream( xOut );
                 xTextOut = Reference< XTextOutputStream >( x, UNO_QUERY );
diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx
index 852978b5740f..1819877f5c43 100644
--- a/basic/source/inc/expr.hxx
+++ b/basic/source/inc/expr.hxx
@@ -189,6 +189,12 @@ protected:
     SbiExprNode* AddSub();
     SbiExprNode* Cat();
     SbiExprNode* Like();
+    SbiExprNode* VBA_Not();
+    SbiExprNode* VBA_And();
+    SbiExprNode* VBA_Or();
+    SbiExprNode* VBA_Xor();
+    SbiExprNode* VBA_Eqv();
+    SbiExprNode* VBA_Imp();
     SbiExprNode* Comp();
     SbiExprNode* Boolean();
 public:
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 2b3b65f74eca..3b253952fb67 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -225,6 +225,7 @@ class SfxLibraryContainer   :public LibraryContainerHelper
                             ,public ::utl::OEventListenerAdapter
 {
     sal_Bool mbVBACompat;
+    rtl::OUString msProjectName;
 protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >   mxMSF;
     ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess >       mxSFI;
@@ -514,6 +515,8 @@ public:
     // Methods XVBACompatibility
     virtual ::sal_Bool SAL_CALL getVBACompatibilityMode() throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setVBACompatibilityMode( ::sal_Bool _vbacompatmodeon ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getProjectName() throw (::com::sun::star::uno::RuntimeException) { return msProjectName; }
+    virtual void SAL_CALL setProjectName( const ::rtl::OUString& _projectname ) throw (::com::sun::star::uno::RuntimeException);
 };
 
 class LibraryContainerMethodGuard
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 40cf7f2f3ece..2b2bbe41133c 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -250,7 +250,7 @@ BOOL needSecurityRestrictions( void )
         if( !xSMgr.is() )
             return TRUE;
         Reference< XBridgeFactory > xBridgeFac( xSMgr->createInstance
-            ( ::rtl::OUString::createFromAscii( "com.sun.star.bridge.BridgeFactory" ) ), UNO_QUERY );
+            ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.bridge.BridgeFactory" )) ), UNO_QUERY );
 
         Sequence< Reference< XBridge > > aBridgeSeq;
         sal_Int32 nBridgeCount = 0;
@@ -321,10 +321,10 @@ BOOL hasUno( void )
         }
         else
         {
-            Reference< XContentProviderManager > xManager( xSMgr->createInstance( ::rtl::OUString::createFromAscii
-                    ( "com.sun.star.ucb.UniversalContentBroker" ) ), UNO_QUERY );
+            Reference< XContentProviderManager > xManager( xSMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
+                    ( "com.sun.star.ucb.UniversalContentBroker" )) ), UNO_QUERY );
 
-            if ( !( xManager.is() && xManager->queryContentProvider( ::rtl::OUString::createFromAscii( "file:///" ) ).is() ) )
+            if ( !( xManager.is() && xManager->queryContentProvider( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "file:///" )) ).is() ) )
             {
                 // No UCB
                 bRetVal = FALSE;
@@ -660,7 +660,7 @@ SbError SbiStream::Open
         if( xSMgr.is() )
         {
             Reference< XSimpleFileAccess >
-                xSFI( xSMgr->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), UNO_QUERY );
+                xSFI( xSMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" )) ), UNO_QUERY );
             if( xSFI.is() )
             {
                 try
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 1e06e74d48ff..da0fffab95c2 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -223,7 +223,7 @@ static com::sun::star::uno::Reference< XSimpleFileAccess3 > getFileAccess( void
         if( xSMgr.is() )
         {
             xSFI = com::sun::star::uno::Reference< XSimpleFileAccess3 >( xSMgr->createInstance
-                ( ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), UNO_QUERY );
+                ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" )) ), UNO_QUERY );
         }
     }
     return xSFI;
@@ -2799,11 +2799,11 @@ RTLFUNC(Dir)
                         {
                             if( pRTLData->nCurDirPos == -2 )
                             {
-                                aPath = ::rtl::OUString::createFromAscii( "." );
+                                aPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "." ));
                             }
                             else if( pRTLData->nCurDirPos == -1 )
                             {
-                                aPath = ::rtl::OUString::createFromAscii( ".." );
+                                aPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".." ));
                             }
                             pRTLData->nCurDirPos++;
                         }
@@ -2989,11 +2989,11 @@ RTLFUNC(Dir)
                     {
                         if( pRTLData->nCurDirPos == -2 )
                         {
-                            aPath = ::rtl::OUString::createFromAscii( "." );
+                            aPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "." ));
                         }
                         else if( pRTLData->nCurDirPos == -1 )
                         {
-                            aPath = ::rtl::OUString::createFromAscii( ".." );
+                            aPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".." ));
                         }
                         pRTLData->nCurDirPos++;
                     }
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 73c40c0cbeb6..b922b556bd2c 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -96,7 +96,7 @@ static Reference< XCalendar > getLocaleCalendar( void )
         if( xSMgr.is() )
         {
             xCalendar = Reference< XCalendar >( xSMgr->createInstance
-                ( ::rtl::OUString::createFromAscii( "com.sun.star.i18n.LocaleCalendar" ) ), UNO_QUERY );
+                ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.LocaleCalendar" )) ), UNO_QUERY );
         }
     }
 
@@ -2530,7 +2530,7 @@ void CallFunctionAccessFunction( const Sequence< Any >& aArgs, const rtl::OUStri
             Reference< XMultiServiceFactory > xFactory( getProcessServiceFactory() );
             if( xFactory.is() )
             {
-                xFunc.set( xFactory->createInstance(::rtl::OUString::createFromAscii( "com.sun.star.sheet.FunctionAccess")), UNO_QUERY_THROW);
+                xFunc.set( xFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.FunctionAccess"))), UNO_QUERY_THROW);
             }
         }
         Any aRet = xFunc->callFunction( sFuncName, aArgs );
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index d4681cd3574e..b7ab4479f104 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -79,11 +79,11 @@ SbxObject& SbxObject::operator=( const SbxObject& r )
         pMethods   = new SbxArray;
         pProps     = new SbxArray;
         pObjs      = new SbxArray( SbxOBJECT );
-        // Die Arrays werden kopiert, die Inhalte uebernommen
+        // The arrays were copied, the content taken over
         *pMethods  = *r.pMethods;
         *pProps    = *r.pProps;
         *pObjs     = *r.pObjs;
-        // Da die Variablen uebernommen wurden, ist dies OK
+        // Because the variables were taken over, this is OK
         pDfltProp  = r.pDfltProp;
         SetName( r.GetName() );
         SetFlags( r.GetFlags() );
@@ -99,7 +99,7 @@ static void CheckParentsOnDelete( SbxObject* pObj, SbxArray* p )
         SbxVariableRef& rRef = p->GetRef( i );
         if( rRef->IsBroadcaster() )
             pObj->EndListening( rRef->GetBroadcaster(), TRUE );
-        // Hat das Element mehr als eine Referenz und noch einen Listener?
+        // Did the element have more then one reference and still a Listener?
         if( rRef->GetRefCount() > 1 )
         {
             rRef->SetParent( NULL );
@@ -189,16 +189,16 @@ SbxVariable* SbxObject::FindUserData( UINT32 nData )
         pRes = pProps->FindUserData( nData );
     if( !pRes )
         pRes = pObjs->FindUserData( nData );
-    // Search in den Parents?
+    // Search in the parents?
     if( !pRes && IsSet( SBX_GBLSEARCH ) )
     {
         SbxObject* pCur = this;
         while( !pRes && pCur->pParent )
         {
-            // Ich selbst bin schon durchsucht worden!
+            // I myself was already searched through!
             USHORT nOwn = pCur->GetFlags();
             pCur->ResetFlag( SBX_EXTSEARCH );
-            // Ich suche bereits global!
+            // I search already global!
             USHORT nPar = pCur->pParent->GetFlags();
             pCur->pParent->ResetFlag( SBX_GBLSEARCH );
             pRes = pCur->pParent->FindUserData( nData );
@@ -251,21 +251,21 @@ SbxVariable* SbxObject::Find( const XubString& rName, SbxClassType t )
         if( pArray )
             pRes = pArray->Find( rName, t );
     }
-    // Extended Search im Objekt-Array?
-    // Fuer Objekte und DontCare ist das Objektarray bereits
-    // durchsucht worden
+    // ExtendedsSearch in the Object-Array?
+    // For objects and DontCare is the Objektarray already
+    // searched through
     if( !pRes && ( t == SbxCLASS_METHOD || t == SbxCLASS_PROPERTY ) )
         pRes = pObjs->Find( rName, t );
-    // Search in den Parents?
+    // Search in the parents?
     if( !pRes && IsSet( SBX_GBLSEARCH ) )
     {
         SbxObject* pCur = this;
         while( !pRes && pCur->pParent )
         {
-            // Ich selbst bin schon durchsucht worden!
+            // I myself was already searched through!
             USHORT nOwn = pCur->GetFlags();
             pCur->ResetFlag( SBX_EXTSEARCH );
-            // Ich suche bereits global!
+            // I search already global!
             USHORT nPar = pCur->pParent->GetFlags();
             pCur->pParent->ResetFlag( SBX_GBLSEARCH );
             pRes = pCur->pParent->Find( rName, t );
@@ -287,16 +287,16 @@ SbxVariable* SbxObject::Find( const XubString& rName, SbxClassType t )
     return pRes;
 }
 
-// Kurzform: Die Parent-Kette wird durchsucht
-// Das ganze rekursiv, da Call() ueberladen sein kann
-// Qualified Names sind zugelassen
+// Abbreviated version: The parent-string will be searched through
+// The whole thing recursive, because Call() might be overloaded
+// Qualified names are allowed
 
 BOOL SbxObject::Call( const XubString& rName, SbxArray* pParam )
 {
     SbxVariable* pMeth = FindQualified( rName, SbxCLASS_DONTCARE);
     if( pMeth && pMeth->ISA(SbxMethod) )
     {
-        // FindQualified() koennte schon zugeschlagen haben!
+        // FindQualified() might have been stroked!
         if( pParam )
             pMeth->SetParameters( pParam );
         pMeth->Broadcast( SBX_HINT_DATAWANTED );
@@ -340,9 +340,9 @@ void SbxObject::SetDfltProperty( SbxProperty* p )
     SetModified( TRUE );
 }
 
-// Suchen einer bereits vorhandenen Variablen. Falls sie gefunden wurde,
-// wird der Index gesetzt, sonst wird der Count des Arrays geliefert.
-// In jedem Fall wird das korrekte Array geliefert.
+// Search of a already available variable. If she was located,
+// the index will be set, elsewise will be delivered the Count of the Array.
+// In any case it will be delivered the correct Array.
 
 SbxArray* SbxObject::FindVar( SbxVariable* pVar, USHORT& nArrayIdx )
 {
@@ -359,7 +359,7 @@ SbxArray* SbxObject::FindVar( SbxVariable* pVar, USHORT& nArrayIdx )
     if( pArray )
     {
         nArrayIdx = pArray->Count();
-        // ist die Variable per Name vorhanden?
+        // Is the variable per name available?
         pArray->ResetFlag( SBX_EXTSEARCH );
         SbxVariable* pOld = pArray->Find( pVar->GetName(), pVar->GetClass() );
         if( pOld )
@@ -375,12 +375,12 @@ SbxArray* SbxObject::FindVar( SbxVariable* pVar, USHORT& nArrayIdx )
     return pArray;
 }
 
-// Falls ein neues Objekt eingerichtet wird, wird es, falls es bereits
-// eines mit diesem Namen gibt, indiziert.
+// If a new object will be established, this object will be indexed,
+// if an object of this name exists already.
 
 SbxVariable* SbxObject::Make( const XubString& rName, SbxClassType ct, SbxDataType dt )
 {
-    // Ist das Objekt bereits vorhanden?
+    // Is the object already available?
     SbxArray* pArray = NULL;
     switch( ct )
     {
@@ -393,13 +393,13 @@ SbxVariable* SbxObject::Make( const XubString& rName, SbxClassType ct, SbxDataTy
     }
     if( !pArray )
         return NULL;
-    // Collections duerfen gleichnamige Objekte enthalten
+    // Collections may contain objects of the same name
     if( !( ct == SbxCLASS_OBJECT && ISA(SbxCollection) ) )
     {
         SbxVariable* pRes = pArray->Find( rName, ct );
         if( pRes )
         {
-/* Wegen haeufiger Probleme (z.B. #67000) erstmal ganz raus
+/* Due to often problems (e.g. #67000) first of all completly out
 #ifdef DBG_UTIL
             if( pRes->GetHashCode() != nNameHash
              && pRes->GetHashCode() != nParentHash )
@@ -434,7 +434,7 @@ SbxVariable* SbxObject::Make( const XubString& rName, SbxClassType ct, SbxDataTy
     pVar->SetParent( this );
     pArray->Put( pVar, pArray->Count() );
     SetModified( TRUE );
-    // Das Objekt lauscht immer
+    // The object listen always
     StartListening( pVar->GetBroadcaster(), TRUE );
     Broadcast( SBX_HINT_OBJECTCHANGED );
     return pVar;
@@ -442,13 +442,13 @@ SbxVariable* SbxObject::Make( const XubString& rName, SbxClassType ct, SbxDataTy
 
 SbxObject* SbxObject::MakeObject( const XubString& rName, const XubString& rClass )
 {
-    // Ist das Objekt bereits vorhanden?
+    // Is the object already available?
     if( !ISA(SbxCollection) )
     {
         SbxVariable* pRes = pObjs->Find( rName, SbxCLASS_OBJECT );
         if( pRes )
         {
-/* Wegen haeufiger Probleme (z.B. #67000) erstmal ganz raus
+/* Due to often problems (e.g. #67000) first of all completly out
 #ifdef DBG_UTIL
             if( pRes->GetHashCode() != nNameHash
              && pRes->GetHashCode() != nParentHash )
@@ -472,7 +472,7 @@ SbxObject* SbxObject::MakeObject( const XubString& rName, const XubString& rClas
         pVar->SetParent( this );
         pObjs->Put( pVar, pObjs->Count() );
         SetModified( TRUE );
-        // Das Objekt lauscht immer
+        // The object listen always
         StartListening( pVar->GetBroadcaster(), TRUE );
         Broadcast( SBX_HINT_OBJECTCHANGED );
     }
@@ -485,21 +485,21 @@ void SbxObject::Insert( SbxVariable* pVar )
     SbxArray* pArray = FindVar( pVar, nIdx );
     if( pArray )
     {
-        // Hinein damit. Man sollte allerdings auf die Pointer aufpassen!
+        // Into with it. But you should pay attention at the Pointer!
         if( nIdx < pArray->Count() )
         {
-            // dann gibt es dieses Element bereits
-            // Bei Collections duerfen gleichnamige Objekte hinein
+            // Then this element exists already
+            // There are objects of the same name allowed at collections
             if( pArray == pObjs && ISA(SbxCollection) )
                 nIdx = pArray->Count();
             else
             {
                 SbxVariable* pOld = pArray->Get( nIdx );
-                // schon drin: ueberschreiben
+                // already inside: overwrite
                 if( pOld == pVar )
                     return;
 
-/* Wegen haeufiger Probleme (z.B. #67000) erstmal ganz raus
+/* Due to often problems (e.g. #67000) first of all completly out
 #ifdef DBG_UTIL
                 if( pOld->GetHashCode() != nNameHash
                  && pOld->GetHashCode() != nParentHash )
@@ -543,8 +543,8 @@ void SbxObject::Insert( SbxVariable* pVar )
     }
 }
 
-// AB 23.4.1997, Optimierung, Einfuegen ohne Ueberpruefung auf doppelte
-// Eintraege und ohne Broadcasts, wird nur in SO2/auto.cxx genutzt
+// From 1997-04-23, Optimisation, Insertion without checking about
+// double entry and without broadcasts, will only be used in SO2/auto.cxx
 void SbxObject::QuickInsert( SbxVariable* pVar )
 {
     SbxArray* pArray = NULL;
@@ -583,7 +583,7 @@ void SbxObject::QuickInsert( SbxVariable* pVar )
     }
 }
 
-// AB 23.3.1997, Spezial-Methode, gleichnamige Controls zulassen
+// From 1997-03-23, special method, allow controls of the same name
 void SbxObject::VCPtrInsert( SbxVariable* pVar )
 {
     SbxArray* pArray = NULL;
@@ -641,11 +641,11 @@ void SbxObject::Remove( SbxVariable* pVar )
     }
 }
 
-// AB 23.3.1997, Loeschen per Pointer fuer Controls (doppelte Namen!)
+// From 1997-03-23, cleanup per Pointer for Controls (double names!)
 void SbxObject::VCPtrRemove( SbxVariable* pVar )
 {
     USHORT nIdx;
-    // Neu FindVar-Methode, sonst identisch mit normaler Methode
+    // New FindVar-Method, otherwise identical with the normal method
     SbxArray* pArray = VCPtrFindVar( pVar, nIdx );
     if( pArray && nIdx < pArray->Count() )
     {
@@ -662,7 +662,7 @@ void SbxObject::VCPtrRemove( SbxVariable* pVar )
     }
 }
 
-// AB 23.3.1997, Zugehoerige Spezial-Methode, nur ueber Pointer suchen
+// From 1997-03-23, associated special method, search only by Pointer
 SbxArray* SbxObject::VCPtrFindVar( SbxVariable* pVar, USHORT& nArrayIdx )
 {
     SbxArray* pArray = NULL;
@@ -730,19 +730,19 @@ static BOOL LoadArray( SvStream& rStrm, SbxObject* pThis, SbxArray* pArray )
     return TRUE;
 }
 
-// Der Load eines Objekts ist additiv!
+// The load of an object is additive!
 
 BOOL SbxObject::LoadData( SvStream& rStrm, USHORT nVer )
 {
-    // Hilfe fuer das Einlesen alter Objekte: einfach TRUE zurueck,
-    // LoadPrivateData() muss Default-Zustand herstellen
+    // Help for the read in of old objects: just TRUE back,
+    // LoadPrivateData() had to set the default status up
     if( !nVer )
         return TRUE;
 
     pDfltProp = NULL;
     if( !SbxVariable::LoadData( rStrm, nVer ) )
         return FALSE;
-    // Wenn kein fremdes Objekt enthalten ist, uns selbst eintragen
+    // If  it contains no alien object, insert ourselves
     if( aData.eType == SbxOBJECT && !aData.pObj )
         aData.pObj = this;
     sal_uInt32 nSize;
@@ -762,7 +762,7 @@ BOOL SbxObject::LoadData( SvStream& rStrm, USHORT nVer )
      || !LoadArray( rStrm, this, pProps )
      || !LoadArray( rStrm, this, pObjs ) )
         return FALSE;
-    // Properties setzen
+    // Set properties
     if( aDfltProp.Len() )
         pDfltProp = (SbxProperty*) pProps->Find( aDfltProp, SbxCLASS_PROPERTY );
     SetModified( FALSE );
@@ -799,7 +799,7 @@ BOOL SbxObject::StoreData( SvStream& rStrm ) const
 XubString SbxObject::GenerateSource( const XubString &rLinePrefix,
                                   const SbxObject* )
 {
-    // Properties in einem String einsammeln
+    // Collect the properties in a String
     XubString aSource;
     SbxArrayRef xProps( GetProperties() );
     bool bLineFeed = false;
@@ -811,7 +811,7 @@ XubString SbxObject::GenerateSource( const XubString &rLinePrefix,
          && !( xProp->GetHashCode() == nNameHash
             && aPropName.EqualsIgnoreCaseAscii( pNameProp ) ) )
         {
-            // ausser vor dem ersten Property immer einen Umbruch einfuegen
+            // Insert a break except in front of the first property
             if ( bLineFeed )
                 aSource.AppendAscii( "\n" );
             else
@@ -822,17 +822,17 @@ XubString SbxObject::GenerateSource( const XubString &rLinePrefix,
             aSource += aPropName;
             aSource.AppendAscii( " = " );
 
-            // den Property-Wert textuell darstellen
+            // Display the property value textual
             switch ( xProp->GetType() )
             {
                 case SbxEMPTY:
                 case SbxNULL:
-                    // kein Wert
+                    // no value
                     break;
 
                 case SbxSTRING:
                 {
-                    // Strings in Anf"uhrungszeichen
+                    // Strings in quotation mark
                     aSource.AppendAscii( "\"" );
                     aSource += xProp->GetString();
                     aSource.AppendAscii( "\"" );
@@ -841,7 +841,7 @@ XubString SbxObject::GenerateSource( const XubString &rLinePrefix,
 
                 default:
                 {
-                    // sonstiges wie z.B. Zahlen direkt
+                    // miscellaneous, such as e.g.numerary directly
                     aSource += xProp->GetString();
                     break;
                 }
@@ -890,7 +890,7 @@ static BOOL CollectAttrs( const SbxBase* p, XubString& rRes )
 
 void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
 {
-    // Einr"uckung
+    // Shifting
     static USHORT nLevel = 0;
     if ( nLevel > 10 )
     {
@@ -902,11 +902,11 @@ void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
     for ( USHORT n = 1; n < nLevel; ++n )
         aIndent.AppendAscii( "    " );
 
-    // ggf. Objekt vervollst"andigen
+    // if necessary complete the object
     if ( bFill )
         GetAll( SbxCLASS_DONTCARE );
 
-    // Daten des Objekts selbst ausgeben
+    // Output the data of the object itself
     ByteString aNameStr( (const UniString&)GetName(), RTL_TEXTENCODING_ASCII_US );
     ByteString aClassNameStr( (const UniString&)aClassName, RTL_TEXTENCODING_ASCII_US );
     rStrm << "Object( "
@@ -955,7 +955,7 @@ void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
                 aLine.AppendAscii( "  !! Not a Method !!" );
             rStrm.WriteByteString( aLine, RTL_TEXTENCODING_ASCII_US );
 
-            // bei Object-Methods auch das Object ausgeben
+            // Output also the object at object-methods
             if ( pVar->GetValues_Impl().eType == SbxOBJECT &&
                     pVar->GetValues_Impl().pObj &&
                     pVar->GetValues_Impl().pObj != this &&
@@ -988,7 +988,7 @@ void SbxObject::Dump( SvStream& rStrm, BOOL bFill )
                     aLine.AppendAscii( "  !! Not a Property !!" );
                 rStrm.WriteByteString( aLine, RTL_TEXTENCODING_ASCII_US );
 
-                // bei Object-Properties auch das Object ausgeben
+                // output also the object at object properties
                 if ( pVar->GetValues_Impl().eType == SbxOBJECT &&
                         pVar->GetValues_Impl().pObj &&
                         pVar->GetValues_Impl().pObj != this &&
@@ -1051,14 +1051,13 @@ SbxClassType SbxProperty::GetClass() const
 
 void SbxObject::GarbageCollection( ULONG /*nObjects*/ )
 
-/*  [Beschreibung]
+/*  [Description]
 
-    Diese statische Methode durchsucht die n"achsten 'nObjects' der zur Zeit
-    existierenden <SbxObject>-Instanzen nach zyklischen Referenzen, die sich
-    nur noch selbst am Leben erhalten. Ist 'nObjects==0', dann werden
-    alle existierenden durchsucht.
+    This statistic method browse the next 'nObjects' of the currently existing
+    <SbxObject>-Instances for cyclic references, which keep only themselfes alive
+    If there is 'nObjects==0', then all existing will be browsed.
 
-    zur Zeit nur implementiert: Object -> Parent-Property -> Parent -> Object
+    currently only implemented: Object -> Parent-Property -> Parent -> Object
 */
 
 {
diff --git a/basic/source/sbx/sbxstr.cxx b/basic/source/sbx/sbxstr.cxx
index b4b73f79cc58..d4d144e0f2bc 100644
--- a/basic/source/sbx/sbxstr.cxx
+++ b/basic/source/sbx/sbxstr.cxx
@@ -35,8 +35,8 @@
 #include "runtime.hxx"
 #include <rtl/ustrbuf.hxx>
 
-// Die Konversion eines Items auf String wird ueber die Put-Methoden
-// der einzelnen Datentypen abgewickelt, um doppelten Code zu vermeiden.
+// The conversion of an item onto String was handled via the Put-Methods
+// of the several data types to avoid double code.
 
 ::rtl::OUString ImpGetString( const SbxValues* p )
 {
@@ -101,7 +101,7 @@
             break;
         }
         case SbxERROR:
-            // Hier wird der String "Error n" erzeugt
+            // Here will be created the String "Error n"
             aRes = SbxRes( STRING_ERRORMSG );
             aRes += ::rtl::OUString( p->nUShort ); break;
         case SbxDATE:
@@ -138,10 +138,10 @@
     return aRes;
 }
 
-// AB 10.4.97, neue Funktion fuer SbxValue::GetCoreString()
+// From 1997-04-10, new function for SbxValue::GetCoreString()
 ::rtl::OUString ImpGetCoreString( const SbxValues* p )
 {
-    // Vorerst nur fuer double
+    // For now only for double
     if( ( p->eType & (~SbxBYREF) ) == SbxDOUBLE )
     {
         SbxValues aTmp;
@@ -162,7 +162,7 @@ void ImpPutString( SbxValues* p, const ::rtl::OUString* n )
     SbxValues aTmp;
     aTmp.eType = SbxSTRING;
     ::rtl::OUString* pTmp = NULL;
-    // Sicherheitshalber, falls ein NULL-Ptr kommt
+    // as a precaution, if a NULL-Ptr appears
     if( !n )
         n = pTmp = new ::rtl::OUString;
     aTmp.pOUString = (::rtl::OUString*)n;
diff --git a/basic/source/sbx/sbxuint.cxx b/basic/source/sbx/sbxuint.cxx
index a0d11deac1be..e20abbb3c0c0 100644
--- a/basic/source/sbx/sbxuint.cxx
+++ b/basic/source/sbx/sbxuint.cxx
@@ -190,7 +190,7 @@ start:
         case SbxBYREF | SbxUSHORT:
             nRes = *p->pUShort; break;
 
-        // ab hier wird getestet
+        // from here on will be tested
         case SbxBYREF | SbxCHAR:
             aTmp.nChar = *p->pChar; goto ref;
         case SbxBYREF | SbxINTEGER:
@@ -258,7 +258,7 @@ start:
             ImpCreateDecimal( p )->setUInt( n );
             break;
 
-        // Tests ab hier
+        // from here on tests
         case SbxCHAR:
             aTmp.pChar = &p->nChar; goto direct;
         case SbxBYTE:
diff --git a/basic/source/sbx/sbxulng.cxx b/basic/source/sbx/sbxulng.cxx
index 81e3e9978a5a..cfaeee07d4b0 100644
--- a/basic/source/sbx/sbxulng.cxx
+++ b/basic/source/sbx/sbxulng.cxx
@@ -168,7 +168,7 @@ start:
         case SbxBYREF | SbxULONG:
             nRes = *p->pULong; break;
 
-        // Tests ab hier
+        // from here on tests
         case SbxBYREF | SbxCHAR:
             aTmp.nChar = *p->pChar; goto ref;
         case SbxBYREF | SbxINTEGER:
@@ -222,7 +222,7 @@ start:
             ImpCreateDecimal( p )->setULong( n );
             break;
 
-        // Tests ab hier
+        // from here on tests
         case SbxCHAR:
             aTmp.pChar = &p->nChar; goto direct;
         case SbxUINT:
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index 449a0ee86584..0f6e577794c6 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -41,6 +41,7 @@
 #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
 #include "com/sun/star/resource/XStringResourceWithStorage.hpp"
 #include "com/sun/star/resource/XStringResourceWithLocation.hpp"
+#include "com/sun/star/document/XGraphicObjectResolver.hpp"
 #include "dlgcont.hxx"
 #include "sbmodule.hxx"
 #include <comphelper/processfactory.hxx>
@@ -74,6 +75,8 @@ using namespace osl;
 
 using com::sun::star::uno::Reference;
 
+#define GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:"
+
 //============================================================================
 // Implementation class SfxDialogLibraryContainer
 
@@ -225,6 +228,35 @@ void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement
     xInput->closeInput();
 }
 
+void lcl_deepInspectForEmbeddedImages( const Reference< XInterface >& xIf,  std::vector< rtl::OUString >& rvEmbedImgUrls )
+{
+    static rtl::OUString sImageURL= OUString(RTL_CONSTASCII_USTRINGPARAM( "ImageURL" ) );
+    Reference< beans::XPropertySet > xProps( xIf, UNO_QUERY );
+    if ( xProps.is() )
+    {
+
+        if ( xProps->getPropertySetInfo()->hasPropertyByName( sImageURL ) )
+        {
+            rtl::OUString sURL;
+            xProps->getPropertyValue( sImageURL ) >>= sURL;
+            if ( sURL.getLength() && sURL.compareToAscii( GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( GRAPHOBJ_URLPREFIX ) ) == 0 )
+                rvEmbedImgUrls.push_back( sURL );
+        }
+    }
+    Reference< XNameContainer > xContainer( xIf, UNO_QUERY );
+    if ( xContainer.is() )
+    {
+        Sequence< rtl::OUString > sNames = xContainer->getElementNames();
+        sal_Int32 nContainees = sNames.getLength();
+        for ( sal_Int32 index = 0; index < nContainees; ++index )
+        {
+            Reference< XInterface > xCtrl;
+            xContainer->getByName( sNames[ index ] ) >>= xCtrl;
+            lcl_deepInspectForEmbeddedImages( xCtrl, rvEmbedImgUrls );
+        }
+    }
+}
+
 void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< embed::XStorage >& xStorage ) throw ( RuntimeException )
 {
     LibraryContainerMethodGuard aGuard( *this );
@@ -253,6 +285,54 @@ void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< e
 
     SfxLibraryContainer::storeLibrariesToStorage( xStorage );
 
+    // we need to export out any embedded image object(s)
+    // associated with any Dialogs. First, we need to actually gather any such urls
+    // for each dialog in this container
+    Sequence< OUString > sLibraries = getElementNames();
+    for ( sal_Int32 i=0; i < sLibraries.getLength(); ++i )
+    {
+        // libraries will already be loaded from above
+        Reference< XNameContainer > xLib;
+        getByName( sLibraries[ i ] ) >>= xLib;
+        if ( xLib.is() )
+        {
+            Sequence< OUString > sDialogs = xLib->getElementNames();
+            sal_Int32 nDialogs( sDialogs.getLength() );
+            for ( sal_Int32 j=0; j < nDialogs; ++j )
+            {
+                // Each Dialog has an associated xISP
+                Reference< io::XInputStreamProvider > xISP;
+                xLib->getByName( sDialogs[ j ] ) >>= xISP;
+                if ( xISP.is() )
+                {
+                    Reference< io::XInputStream > xInput( xISP->createInputStream() );
+                    Reference< XNameContainer > xDialogModel( mxMSF->createInstance
+                        ( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ), UNO_QUERY );
+                    Reference< XComponentContext > xContext;
+                    Reference< beans::XPropertySet > xProps( mxMSF, UNO_QUERY );
+                    OSL_ASSERT( xProps.is() );
+                    OSL_VERIFY( xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
+                    ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, mxOwnerDocument );
+                    std::vector< rtl::OUString > vEmbeddedImageURLs;
+                    lcl_deepInspectForEmbeddedImages( Reference< XInterface >( xDialogModel, UNO_QUERY ),  vEmbeddedImageURLs );
+                    if ( vEmbeddedImageURLs.size() )
+                    {
+                        // Export the images to the storage
+                        Sequence< Any > aArgs( 1 );
+                        aArgs[ 0 ] <<= xStorage;
+                        Reference< document::XGraphicObjectResolver > xGraphicResolver( mxMSF->createInstanceWithArguments(  OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Svx.GraphicExportHelper" ) ), aArgs ), UNO_QUERY );
+                        std::vector< rtl::OUString >::iterator it = vEmbeddedImageURLs.begin();
+                        std::vector< rtl::OUString >::iterator it_end = vEmbeddedImageURLs.end();
+                        if ( xGraphicResolver.is() )
+                        {
+                            for ( sal_Int32 count = 0; it != it_end; ++it, ++count )
+                                xGraphicResolver->resolveGraphicObjectURL( *it );
+                        }
+                    }
+                }
+            }
+        }
+    }
     mbOasis2OOoFormat = sal_False;
 }
 
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 06461e1ed756..3d5d71509762 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -2824,6 +2824,18 @@ void SAL_CALL SfxLibraryContainer::setVBACompatibilityMode( ::sal_Bool _vbacompa
         mbVBACompat = _vbacompatmodeon;
 }
 
+void SAL_CALL SfxLibraryContainer::setProjectName( const ::rtl::OUString& _projectname ) throw (RuntimeException)
+{
+    msProjectName = _projectname;
+    BasicManager* pBasMgr = getBasicManager();
+    // Temporary HACK
+    // Some parts of the VBA handling ( e.g. in core basic )
+    // code expect the name of the VBA project to be set as the name of
+    // the basic manager. Provide fail back here.
+    if( pBasMgr )
+        pBasMgr->SetName( msProjectName );
+}
+
 // Methods XServiceInfo
 ::sal_Bool SAL_CALL SfxLibraryContainer::supportsService( const ::rtl::OUString& _rServiceName )
     throw (RuntimeException)
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index 7c4ac1fae2c9..ece4fdccb9d4 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -1195,9 +1195,9 @@ Sequence< ::rtl::OUString > SAL_CALL SfxScriptLibraryContainer::getSupportedServ
 Sequence< OUString > SfxScriptLibraryContainer::getSupportedServiceNames_static()
 {
     Sequence< OUString > aServiceNames( 2 );
-    aServiceNames[0] = OUString::createFromAscii( "com.sun.star.script.DocumentScriptLibraryContainer" );
+    aServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.DocumentScriptLibraryContainer" ));
     // plus, for compatibility:
-    aServiceNames[1] = OUString::createFromAscii( "com.sun.star.script.ScriptLibraryContainer" );
+    aServiceNames[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.ScriptLibraryContainer" ));
     return aServiceNames;
 }
 
@@ -1209,7 +1209,7 @@ OUString SfxScriptLibraryContainer::getImplementationName_static()
     MutexGuard aGuard( Mutex::getGlobalMutex() );
     if( bNeedsInit )
     {
-        aImplName = OUString::createFromAscii( "com.sun.star.comp.sfx2.ScriptLibraryContainer" );
+        aImplName = OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sfx2.ScriptLibraryContainer" ));
         bNeedsInit = sal_False;
     }
     return aImplName;
diff --git a/boost/boost.4713.warnings.patch b/boost/boost.4713.warnings.patch
index 32554c818a14..5587b4b804fd 100644
--- a/boost/boost.4713.warnings.patch
+++ b/boost/boost.4713.warnings.patch
@@ -106,3 +106,37 @@
                  m_min,
                  m_max);
         }
+--- misc/build/boost_1_39_0/boost/spirit/home/classic/symbols/symbols.hpp
++++ misc/build/boost_1_39_0/boost/spirit/home/classic/symbols/symbols.hpp
+@@ -102,13 +102,13 @@
+     {
+         typedef typename ScannerT::iterator_t iterator_t;
+         iterator_t first = scan.first;
+-        typename SetT::search_info result = SetT::find(scan);
++        typename SetT::search_info result_ = SetT::find(scan);
+ 
+-        if (result.data)
++        if (result_.data)
+             return scan.
+                 create_match(
+-                    result.length,
+-                    symbol_ref_t(*result.data),
++                    result_.length,
++                    symbol_ref_t(*result_.data),
+                     first,
+                     scan.first);
+         else
+
+--- misc/build/boost_1_39_0/boost/date_time/posix_time/posix_time_config.hpp
++++ misc/build/boost_1_39_0/boost/date_time/posix_time/posix_time_config.hpp
+@@ -82,8 +82,8 @@
+     //Give duration access to ticks constructor -- hide from users
+     friend class date_time::time_duration<time_duration, time_res_traits>;
+   private:
+-    explicit time_duration(impl_type ticks) :
+-      date_time::time_duration<time_duration, time_res_traits>(ticks)
++    explicit time_duration(impl_type _ticks) :
++      date_time::time_duration<time_duration, time_res_traits>(_ticks)
+     {}
+   };
+ 
diff --git a/boost/prj/build.lst b/boost/prj/build.lst
index 421265b927f7..528d18527208 100644
--- a/boost/prj/build.lst
+++ b/boost/prj/build.lst
@@ -1,3 +1,3 @@
-bo      boost : SO:so_prereq solenv NULL
+bo      boost : solenv NULL
 bo      boost           usr1    -       all     bo_mkout NULL
 bo      boost           nmake   -       all     bo_boost NULL
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx
index 0737475c995a..9d94992ff7c4 100644
--- a/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx
@@ -251,7 +251,7 @@ extern "C" void cpp_vtable_call(
                  "### illegal vtable index!" );
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
-        throw RuntimeException( rtl::OUString::createFromAscii("illegal vtable index!"), (XInterface *)pThis );
+        throw RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )), (XInterface *)pThis );
     }
 
     // determine called method
@@ -340,7 +340,7 @@ extern "C" void cpp_vtable_call(
     }
     default:
     {
-        throw RuntimeException( rtl::OUString::createFromAscii("no member description found!"), (XInterface *)pThis );
+        throw RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )), (XInterface *)pThis );
     }
     }
 }
diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/cc50_solaris_sparc/cpp2uno.cxx
index bfe55d726b3c..80bb54ea752b 100644
--- a/bridges/source/cpp_uno/cc50_solaris_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_sparc/cpp2uno.cxx
@@ -260,13 +260,6 @@ static typelib_TypeClass cpp_mediate(
 
       OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex,
                 "### illegal vtable index!" );
-//      if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-//      {
-//          RuntimeException aExc;
-//          aExc.Message = OUString::createFromAscii("illegal vtable index!");
-//          aExc.Context = (XInterface *)pThis;
-//          throw aExc;
-//      }
 
     // determine called method
     sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
@@ -356,15 +349,6 @@ static typelib_TypeClass cpp_mediate(
         }
         break;
     }
-//      default:
-//      {
-//          RuntimeException aExc;
-//          aExc.Message = OUString::createFromAscii("no member description found!");
-//          aExc.Context = (XInterface *)pThis;
-//          throw aExc;
-//          // is here for dummy
-//          eRet = typelib_TypeClass_VOID;
-//      }
     }
 
     return eRet;
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx
index e77c7329d0fc..f5eee3d497d1 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx
@@ -353,7 +353,7 @@ static typelib_TypeClass cpp_mediate(
         if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
         {
                 throw RuntimeException(
-            rtl::OUString::createFromAscii("illegal vtable index!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
             (XInterface *)pThis );
         }
 
@@ -445,7 +445,7 @@ static typelib_TypeClass cpp_mediate(
         default:
         {
                 throw RuntimeException(
-            rtl::OUString::createFromAscii("no member description found!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
             (XInterface *)pThis );
                 // is here for dummy
                 eRet = typelib_TypeClass_VOID;
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
index 3ee825511d66..23ae2fdd46ee 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
@@ -396,7 +396,7 @@ static typelib_TypeClass cpp_mediate(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("illegal vtable index!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
             (XInterface *)pCppI );
     }
 
@@ -490,7 +490,7 @@ static typelib_TypeClass cpp_mediate(
     default:
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("no member description found!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
             (XInterface *)pCppI );
         // is here for dummy
         eRet = typelib_TypeClass_VOID;
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
index da4f0e34ce3c..33de6e86a6dd 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
@@ -289,7 +289,7 @@ namespace
         if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
         {
             throw RuntimeException(
-                OUString::createFromAscii("illegal vtable index!"),
+                OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
                 (XInterface *)pCppI );
         }
 
@@ -388,7 +388,7 @@ namespace
         default:
         {
             throw RuntimeException(
-                OUString::createFromAscii("no member description found!"),
+                OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
                 (XInterface *)pCppI );
             // is here for dummy
             eRet = typelib_TypeClass_VOID;
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
index ebe07d4119b2..4c0767325224 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx
@@ -432,7 +432,7 @@ namespace
         if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
         {
             throw RuntimeException(
-                OUString::createFromAscii("illegal vtable index!"),
+                OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
                 (XInterface *)pCppI );
         }
 
@@ -531,7 +531,7 @@ namespace
         default:
         {
             throw RuntimeException(
-                OUString::createFromAscii("no member description found!"),
+                OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
                 (XInterface *)pCppI );
             // is here for dummy
             eRet = typelib_TypeClass_VOID;
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
index 5a25c25c1ed8..e22647945e56 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
@@ -372,7 +372,7 @@ static typelib_TypeClass cpp_mediate(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("illegal vtable index!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
             (XInterface *)pThis );
     }
 
@@ -473,7 +473,7 @@ static typelib_TypeClass cpp_mediate(
 #endif
 
         throw RuntimeException(
-            rtl::OUString::createFromAscii("no member description found!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
             (XInterface *)pThis );
         // is here for dummy
         eRet = typelib_TypeClass_VOID;
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
index ca40321149b2..ac1cfb82c2be 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
@@ -253,7 +253,7 @@ extern "C" void cpp_vtable_call(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("illegal vtable index!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
             (XInterface *)pThis );
     }
 
@@ -342,7 +342,7 @@ extern "C" void cpp_vtable_call(
     default:
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("no member description found!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
             (XInterface *)pThis );
     }
     }
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
index 53542e23f97d..dd8ee4cb58a7 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx
@@ -300,7 +300,7 @@ namespace
         if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
         {
             throw RuntimeException(
-                OUString::createFromAscii("illegal vtable index!"),
+                OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
                 (XInterface *)pCppI );
         }
 
@@ -399,7 +399,7 @@ namespace
         default:
         {
             throw RuntimeException(
-                OUString::createFromAscii("no member description found!"),
+                OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
                 (XInterface *)pCppI );
             // is here for dummy
             eRet = typelib_TypeClass_VOID;
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
index b6fd1d461cfd..d465fc1f45e7 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
@@ -427,7 +427,7 @@ namespace
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
       throw RuntimeException(
-          rtl::OUString::createFromAscii("illegal vtable index!"),
+          rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
           (XInterface *)pThis );
     }
 
@@ -540,7 +540,7 @@ namespace
     fprintf(stderr,"cpp_mediate6\n");
 #endif
           throw RuntimeException(
-              rtl::OUString::createFromAscii("no member description found!"),
+              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
               (XInterface *)pThis );
           // is here for dummy
           eRet = typelib_TypeClass_VOID;
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
index 24354bfa45f8..c6ec833f282e 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
@@ -395,7 +395,7 @@ static typelib_TypeClass cpp_mediate(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("illegal vtable index!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
             (XInterface *)pThis );
     }
 
@@ -488,7 +488,7 @@ static typelib_TypeClass cpp_mediate(
     default:
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("no member description found!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
             (XInterface *)pThis );
         // is here for dummy
         eRet = typelib_TypeClass_VOID;
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
index f8e1fb9cd98a..5f4afc68d0a6 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
@@ -392,7 +392,7 @@ static typelib_TypeClass cpp_mediate(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("illegal vtable index!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
             (XInterface *)pThis );
     }
 
@@ -493,7 +493,7 @@ static typelib_TypeClass cpp_mediate(
 #endif
 
         throw RuntimeException(
-            rtl::OUString::createFromAscii("no member description found!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
             (XInterface *)pThis );
         // is here for dummy
         eRet = typelib_TypeClass_VOID;
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
index 04ceddab4c5f..af8f37c0aa71 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
@@ -480,9 +480,8 @@ void unoInterfaceProxyDispatch(
     void * pReturn, void * pArgs[], uno_Any ** ppException )
 {
     // is my surrogate
-        bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
-            = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy *> (pUnoI);
-    typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
+    bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
+        = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy *> (pUnoI);
 
     switch (pMemberDescr->eTypeClass)
     {
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
index f259387a98bf..32e32de75b19 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
@@ -360,7 +360,7 @@ static typelib_TypeClass cpp_mediate(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("illegal vtable index!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
             (XInterface *)pCppI );
     }
 
@@ -454,7 +454,7 @@ static typelib_TypeClass cpp_mediate(
     default:
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("no member description found!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
             (XInterface *)pCppI );
         // is here for dummy
         eRet = typelib_TypeClass_VOID;
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
index b491f661bff9..8205eb47447f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
@@ -381,7 +381,7 @@ static typelib_TypeClass cpp_mediate(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("illegal vtable index!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
             (XInterface *)pCppI );
     }
 
@@ -475,7 +475,7 @@ static typelib_TypeClass cpp_mediate(
     default:
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("no member description found!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
             (XInterface *)pCppI );
         // is here for dummy
         eRet = typelib_TypeClass_VOID;
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
index 1546432e5980..97ac1558e0bf 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
@@ -257,7 +257,7 @@ static typelib_TypeClass cpp_mediate(
                  "### illegal vtable index!" );
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
-        throw RuntimeException( rtl::OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
+        throw RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )), (XInterface *)pCppI );
     }
 
     // determine called method
@@ -352,7 +352,7 @@ static typelib_TypeClass cpp_mediate(
     }
     default:
     {
-        throw RuntimeException(rtl::OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
+        throw RuntimeException(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )), (XInterface *)pCppI );
         // is here for dummy
         eRet = typelib_TypeClass_VOID;
     }
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx
index 11c1d0f10db2..f67b2f212ad7 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx
@@ -263,7 +263,7 @@ extern "C" void cpp_vtable_call(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("illegal vtable index!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
             (XInterface *)pThis );
     }
 
@@ -354,7 +354,7 @@ extern "C" void cpp_vtable_call(
     default:
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("no member description found!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
             (XInterface *)pThis );
     }
     }
diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx
index f3515a86ea08..a70a1e3b5f88 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx
@@ -344,7 +344,7 @@ static typelib_TypeClass cpp_mediate(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("illegal vtable index!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
             (XInterface *)pThis );
     }
 
@@ -436,7 +436,7 @@ static typelib_TypeClass cpp_mediate(
     default:
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("no member description found!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
             (XInterface *)pThis );
         // is here for dummy
         eRet = typelib_TypeClass_VOID;
diff --git a/bridges/source/cpp_uno/gcc3_os2_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_os2_intel/cpp2uno.cxx
index 8b19ff92760c..1cf37161fddb 100644
--- a/bridges/source/cpp_uno/gcc3_os2_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_os2_intel/cpp2uno.cxx
@@ -262,7 +262,7 @@ static typelib_TypeClass cpp_mediate(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("illegal vtable index!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
             (XInterface *)pThis );
     }
 
@@ -355,7 +355,7 @@ static typelib_TypeClass cpp_mediate(
     default:
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("no member description found!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
             (XInterface *)pThis );
         // is here for dummy
         eRet = typelib_TypeClass_VOID;
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
index 1c16f6550120..94dc4d5ca695 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
@@ -260,7 +260,7 @@ static typelib_TypeClass cpp_mediate(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("illegal vtable index!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
             (XInterface *)pThis );
     }
 
@@ -353,7 +353,7 @@ static typelib_TypeClass cpp_mediate(
     default:
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("no member description found!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
             (XInterface *)pThis );
         // is here for dummy
         eRet = typelib_TypeClass_VOID;
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
index e6b0273b97a9..786f4c20d02c 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
@@ -256,7 +256,7 @@ static typelib_TypeClass cpp_mediate(
                  "### illegal vtable index!" );
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
-        throw RuntimeException( rtl::OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI );
+        throw RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )), (XInterface *)pCppI );
     }
 
     // determine called method
@@ -351,7 +351,7 @@ static typelib_TypeClass cpp_mediate(
     }
     default:
     {
-        throw RuntimeException(rtl::OUString::createFromAscii("no member description found!"), (XInterface *)pCppI );
+        throw RuntimeException(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )), (XInterface *)pCppI );
         // is here for dummy
         eRet = typelib_TypeClass_VOID;
     }
diff --git a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
index cd74da7462df..686d83b3386d 100644
--- a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
@@ -261,7 +261,7 @@ extern "C" void cpp_vtable_call(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("illegal vtable index!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal vtable index!" )),
             (XInterface *)pThis );
     }
 
@@ -350,7 +350,7 @@ extern "C" void cpp_vtable_call(
     default:
     {
         throw RuntimeException(
-            rtl::OUString::createFromAscii("no member description found!"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no member description found!" )),
             (XInterface *)pThis );
     }
     }
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index 02247de10bf3..1880b07c816e 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -263,9 +263,9 @@ bool VtableFactory::createBlock(Block &block, sal_Int32 slotCount) const
     for (int i = strDirectory.getLength() == 0 ? 1 : 0; i < 2; ++i)
     {
         if (!strDirectory.getLength())
-            strDirectory = rtl::OUString::createFromAscii("/tmp");
+            strDirectory = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/tmp" ));
 
-        strDirectory += rtl::OUString::createFromAscii("/.execoooXXXXXX");
+        strDirectory += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/.execoooXXXXXX" ));
         rtl::OString aTmpName = rtl::OUStringToOString(strDirectory, osl_getThreadTextEncoding());
         char *tmpfname = new char[aTmpName.getLength()+1];
         strncpy(tmpfname, aTmpName.getStr(), aTmpName.getLength()+1);
diff --git a/bridges/source/remote/urp/urp_job.hxx b/bridges/source/remote/urp/urp_job.hxx
index ed31e33c387b..02ef755ecfae 100644
--- a/bridges/source/remote/urp/urp_job.hxx
+++ b/bridges/source/remote/urp/urp_job.hxx
@@ -117,13 +117,13 @@ public:
 
     inline void setBridgePropertyCall()
         { m_bBridgePropertyCall = sal_True; }
-    inline sal_Bool isBridgePropertyCall()
+    inline sal_Bool isBridgePropertyCall() const
         { return m_bBridgePropertyCall; }
-    inline sal_Bool isOneway()
+    inline sal_Bool isOneway() const
         { return m_bOneway; }
 
-        inline void setUnmarshal( Unmarshal *p )
-                { m_pUnmarshal = p; }
+    inline void setUnmarshal( Unmarshal *p )
+        { m_pUnmarshal = p; }
 public:
     typelib_InterfaceMethodTypeDescription    *m_pMethodType;
     typelib_InterfaceAttributeTypeDescription *m_pAttributeType;
@@ -248,7 +248,7 @@ public:
             m_aEntries[m_nCalls].m_bIgnoreCache = bIgnoreCache;
         }
 
-    inline sal_Bool isFull()
+    inline sal_Bool isFull() const
         { return m_nCalls >= m_nMaxMessages; }
 
     inline sal_Int8 *getHeap( sal_Int32 nSizeToAlloc )
diff --git a/bridges/source/remote/urp/urp_marshal.hxx b/bridges/source/remote/urp/urp_marshal.hxx
index f66528d74703..60292cd23612 100644
--- a/bridges/source/remote/urp/urp_marshal.hxx
+++ b/bridges/source/remote/urp/urp_marshal.hxx
@@ -69,7 +69,7 @@ namespace bridges_urp
         return ( m_pos - m_base ) == 2*sizeof( sal_Int32 );
     }
 
-    inline sal_Int32 Marshal::getSize()
+    inline sal_Int32 Marshal::getSize() const
     {
         return ((sal_Int32) (m_pos - m_base));
     }
diff --git a/bridges/source/remote/urp/urp_marshal_decl.hxx b/bridges/source/remote/urp/urp_marshal_decl.hxx
index a07f6ea48f5a..639d08e47e5c 100644
--- a/bridges/source/remote/urp/urp_marshal_decl.hxx
+++ b/bridges/source/remote/urp/urp_marshal_decl.hxx
@@ -87,12 +87,12 @@ namespace bridges_urp
 
         // is only valid, after finish has been called.
         // valid until destructed.
-        inline sal_Int32 getSize();
+        inline sal_Int32 getSize() const;
 
-        inline sal_Int32 getPos()
+        inline sal_Int32 getPos() const
             { return m_pos - m_base; }
 
-        inline sal_Bool isSystemLittleEndian()
+        inline sal_Bool isSystemLittleEndian() const
             { return g_bMarshalSystemIsLittleEndian; }
 
     private:
diff --git a/bridges/source/remote/urp/urp_unmarshal.hxx b/bridges/source/remote/urp/urp_unmarshal.hxx
index 04881d456cce..ca963c3eac46 100644
--- a/bridges/source/remote/urp/urp_unmarshal.hxx
+++ b/bridges/source/remote/urp/urp_unmarshal.hxx
@@ -76,9 +76,9 @@ public:
         remote_createStubFunc callback );
     ~Unmarshal();
 
-    inline sal_Bool finished()
+    inline sal_Bool finished() const
         { return m_base + m_nLength == m_pos; }
-    inline sal_uInt32 getPos()
+    inline sal_uInt32 getPos() const
         { return (sal_uInt32 ) (m_pos - m_base); }
 
     inline sal_Bool setSize( sal_Int32 nSize );
@@ -97,7 +97,7 @@ public:
 
     sal_Int8 *getBuffer()
         { return m_base; }
-    inline sal_Bool isSystemLittleEndian()
+    inline sal_Bool isSystemLittleEndian() const
         { return g_bSystemIsLittleEndian; }
 
 private:
diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx
index 95a4a0241d20..2852437672cc 100644
--- a/bridges/test/java_uno/acquire/testacquire.cxx
+++ b/bridges/test/java_uno/acquire/testacquire.cxx
@@ -494,14 +494,12 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments)
 }
 
 rtl::OUString Service::getImplementationName_static() {
-    return rtl::OUString::createFromAscii(
-        "com.sun.star.test.bridges.testacquire.impl");
+    return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.test.bridges.testacquire.impl" ));
 }
 
 css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames_static() {
     css::uno::Sequence< rtl::OUString > names(1);
-    names[0] = rtl::OUString::createFromAscii(
-        "com.sun.star.test.bridges.testacquire");
+    names[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.test.bridges.testacquire" ));
     return names;
 }
 
@@ -543,9 +541,9 @@ namespace {
 
 bool writeInfo(void * registryKey, rtl::OUString const & implementationName,
                css::uno::Sequence< rtl::OUString > const & serviceNames) {
-    rtl::OUString keyName(rtl::OUString::createFromAscii("/"));
+    rtl::OUString keyName( RTL_CONSTASCII_USTRINGPARAM( "/" ));
     keyName += implementationName;
-    keyName += rtl::OUString::createFromAscii("/UNO/SERVICES");
+    keyName += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
     css::uno::Reference< css::registry::XRegistryKey > key;
     try {
         key = static_cast< css::registry::XRegistryKey * >(registryKey)->
diff --git a/bridges/test/java_uno/equals/testequals.cxx b/bridges/test/java_uno/equals/testequals.cxx
index ff38371bc6ca..0abaeb3db4f2 100644
--- a/bridges/test/java_uno/equals/testequals.cxx
+++ b/bridges/test/java_uno/equals/testequals.cxx
@@ -123,7 +123,7 @@ void Service::connect(rtl::OUString const & rConnection,
         css::connection::Connector::create(m_xContext)->connect(rConnection));
     css::uno::Reference< css::bridge::XBridgeFactory > xBridgeFactory(
         m_xContext->getServiceManager()->createInstanceWithContext(
-            rtl::OUString::createFromAscii("com.sun.star.bridge.BridgeFactory"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.bridge.BridgeFactory" )),
             m_xContext),
         css::uno::UNO_QUERY);
     m_xBridge = xBridgeFactory->createBridge(rtl::OUString(), rProtocol,
@@ -139,8 +139,7 @@ Service::get(rtl::OUString const & rName) throw (css::uno::RuntimeException)
 css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames_static()
 {
     css::uno::Sequence< rtl::OUString > aNames(1);
-    aNames[0] = rtl::OUString::createFromAscii(
-        "com.sun.star.test.bridges.testequals");
+    aNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.test.bridges.testequals" ));
     return aNames;
 }
 
@@ -197,9 +196,9 @@ namespace {
 bool writeInfo(void * pRegistryKey, sal_Char const * pImplementationName,
                css::uno::Sequence< rtl::OUString > const & rServiceNames)
 {
-    rtl::OUString aKeyName(rtl::OUString::createFromAscii("/"));
+    rtl::OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" ));
     aKeyName += rtl::OUString::createFromAscii(pImplementationName);
-    aKeyName += rtl::OUString::createFromAscii("/UNO/SERVICES");
+    aKeyName += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
     css::uno::Reference< css::registry::XRegistryKey > xKey;
     try
     {
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
index 425b93a271e4..039d903b4c71 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
@@ -88,30 +88,27 @@ sal_Int32 Client::run(css::uno::Sequence< rtl::OUString > const &)
         context->getServiceManager());
     if (!factory.is()) {
         throw new css::uno::RuntimeException(
-            rtl::OUString::createFromAscii(
-                "no component context service manager"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no component context service manager" )),
             static_cast< cppu::OWeakObject * >(this));
     }
     css::uno::Reference< test::javauno::nativethreadpool::XRelay > relay;
     try {
         relay = css::uno::Reference< test::javauno::nativethreadpool::XRelay >(
             factory->createInstanceWithContext(
-                rtl::OUString::createFromAscii(
-                    "test.javauno.nativethreadpool.Relay"),
+                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "test.javauno.nativethreadpool.Relay" )),
                 context),
             css::uno::UNO_QUERY_THROW);
     } catch (css::uno::RuntimeException &) {
         throw;
     } catch (css::uno::Exception & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString::createFromAscii(
-                "creating test.javauno.nativethreadpool.Relay service"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "creating test.javauno.nativethreadpool.Relay service" )),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     }
     relay->start(this);
     if (!data.setData(reinterpret_cast< void * >(12345))) {
         throw new css::uno::RuntimeException(
-            rtl::OUString::createFromAscii("osl::ThreadData::setData failed"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "osl::ThreadData::setData failed" )),
             static_cast< cppu::OWeakObject * >(this));
     }
     css::uno::Reference< test::javauno::nativethreadpool::XSource > source;
@@ -119,23 +116,19 @@ sal_Int32 Client::run(css::uno::Sequence< rtl::OUString > const &)
         source
             = css::uno::Reference< test::javauno::nativethreadpool::XSource >(
                 css::bridge::UnoUrlResolver::create(context)->resolve(
-                    rtl::OUString::createFromAscii(
-                        "uno:socket,host=localhost,port=3830;urp;test")),
+                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "uno:socket,host=localhost,port=3830;urp;test" ))),
                 css::uno::UNO_QUERY_THROW);
     } catch (css::connection::NoConnectException & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString::createFromAscii(
-                "com.sun.star.uno.UnoUrlResolver.resolve"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     } catch (css::connection::ConnectionSetupException & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString::createFromAscii(
-                "com.sun.star.uno.UnoUrlResolver.resolve"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     } catch (css::lang::IllegalArgumentException & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString::createFromAscii(
-                "com.sun.star.uno.UnoUrlResolver.resolve"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     }
     bool success = source->get() == 12345;
@@ -155,8 +148,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create(
 }
 
 rtl::OUString SAL_CALL getImplementationName() {
-    return rtl::OUString::createFromAscii(
-        "test.javauno.nativethreadpool.client");
+    return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "test.javauno.nativethreadpool.client" ));
 }
 
 css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() {
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
index c055faa1aa29..dbd2c4dc5a11 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
@@ -77,8 +77,7 @@ sal_Int32 Server::get() throw (css::uno::RuntimeException) {
         context->getServiceManager());
     if (!factory.is()) {
         throw new css::uno::RuntimeException(
-            rtl::OUString::createFromAscii(
-                "no component context service manager"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no component context service manager" )),
             static_cast< cppu::OWeakObject * >(this));
     }
     css::uno::Reference< test::javauno::nativethreadpool::XSource > source;
@@ -87,23 +86,19 @@ sal_Int32 Server::get() throw (css::uno::RuntimeException) {
         source
             = css::uno::Reference< test::javauno::nativethreadpool::XSource >(
                 css::bridge::UnoUrlResolver::create(context)->resolve(
-                    rtl::OUString::createFromAscii(
-                        "uno:socket,host=127.0.0.1,port=3831;urp;test")),
+                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "uno:socket,host=127.0.0.1,port=3831;urp;test" ))),
                 css::uno::UNO_QUERY_THROW);
     } catch (css::connection::NoConnectException & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString::createFromAscii(
-                "com.sun.star.uno.UnoUrlResolver.resolve"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     } catch (css::connection::ConnectionSetupException & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString::createFromAscii(
-                "com.sun.star.uno.UnoUrlResolver.resolve"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     } catch (css::lang::IllegalArgumentException & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString::createFromAscii(
-                "com.sun.star.uno.UnoUrlResolver.resolve"),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.UnoUrlResolver.resolve" )),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     }
     return source->get();
@@ -117,8 +112,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create(
 }
 
 rtl::OUString SAL_CALL getImplementationName() {
-    return rtl::OUString::createFromAscii(
-        "test.javauno.nativethreadpool.server");
+    return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "test.javauno.nativethreadpool.server" ));
 }
 
 css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() {
diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx
index 8ec0fc251491..864279827a6b 100644
--- a/bridges/test/testcomp.cxx
+++ b/bridges/test/testcomp.cxx
@@ -685,7 +685,7 @@ void testRemote( const Reference< XInterface > &rRemote )
       //--------------------
       // Test attributes
       //----------------------
-       OUString ow = OUString::createFromAscii( "dum didel dum dideldei" );
+       OUString ow( RTL_CONSTASCII_USTRINGPARAM( "dum didel dum dideldei" ));
        rLCallMe->setsAttribute( ow );
        OSL_ASSERT( rLCallMe->getsAttribute() == ow );
 
@@ -774,7 +774,7 @@ Reference <XInterface > createComponent( const ::rtl::OUString &sService ,
         // erst registrieren
         Reference < XImplementationRegistration > rReg (
             rSMgr->createInstance(
-                OUString::createFromAscii( "com.sun.star.registry.ImplementationRegistration" )),
+                OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.ImplementationRegistration" ))),
             UNO_QUERY );
 
         OSL_ASSERT( rReg.is() );
@@ -783,7 +783,7 @@ Reference <XInterface > createComponent( const ::rtl::OUString &sService ,
         try
         {
             rReg->registerImplementation(
-                OUString::createFromAscii( "com.sun.star.loader.SharedLibrary" ),
+                OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.loader.SharedLibrary" )),
                 aDllName,
                 Reference< XSimpleRegistry > () );
             rInterface = rSMgr->createInstance( sService );
diff --git a/bridges/test/testoffice.cxx b/bridges/test/testoffice.cxx
index 0d87089b6921..9e90702e036c 100644
--- a/bridges/test/testoffice.cxx
+++ b/bridges/test/testoffice.cxx
@@ -87,7 +87,7 @@ void mygetchar()
 void testPipe( const Reference < XMultiServiceFactory > & rSmgr )
 {
     Reference < XOutputStream > rOut(
-        rSmgr->createInstance( OUString::createFromAscii( "com.sun.star.io.Pipe" ) ),
+        rSmgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.Pipe" )) ),
         UNO_QUERY );
 
     OSL_ASSERT( rOut.is() );
@@ -195,7 +195,7 @@ void doSomething( const  Reference < XInterface > &r )
     {
         printf( "got the remote naming service !\n" );
         Reference < XInterface > rXsmgr = rName->getRegisteredObject(
-            OUString::createFromAscii( "StarOffice.ServiceManager" ) );
+            OUString( RTL_CONSTASCII_USTRINGPARAM( "StarOffice.ServiceManager" )) );
 
         Reference < XMultiServiceFactory > rSmgr( rXsmgr , UNO_QUERY );
         if( rSmgr.is() )
diff --git a/bridges/test/testserver.cxx b/bridges/test/testserver.cxx
index 1e9b70cf13d3..fe85514872dd 100644
--- a/bridges/test/testserver.cxx
+++ b/bridges/test/testserver.cxx
@@ -160,7 +160,7 @@ void MyThread::run()
                             OUString( RTL_CONSTASCII_USTRINGPARAM("my test string")) , 2 );
                     }
                     printf( "all oneway are send\n" );
-                    rCallMe->call( OUString::createFromAscii( "reverse call me test finished" ) , 0 );
+                    rCallMe->call( OUString( RTL_CONSTASCII_USTRINGPARAM( "reverse call me test finished" )) , 0 );
                 printf( "revers callme test finished\n" );
                 }
             }
diff --git a/canvas/inc/canvas/verifyinput.hxx b/canvas/inc/canvas/verifyinput.hxx
index 1e8549792bdb..78329644e70d 100644
--- a/canvas/inc/canvas/verifyinput.hxx
+++ b/canvas/inc/canvas/verifyinput.hxx
@@ -451,7 +451,7 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw ::com::sun::star::lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": reference is NULL"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": reference is NULL" )),
                     xIf,
                     nArgPos );
 #else
diff --git a/canvas/source/tools/parametricpolypolygon.cxx b/canvas/source/tools/parametricpolypolygon.cxx
index 7e666b5fcd52..40fbdf9922f1 100644
--- a/canvas/source/tools/parametricpolypolygon.cxx
+++ b/canvas/source/tools/parametricpolypolygon.cxx
@@ -54,9 +54,9 @@ namespace canvas
     uno::Sequence<rtl::OUString> ParametricPolyPolygon::getAvailableServiceNames()
     {
         uno::Sequence<rtl::OUString> aRet(3);
-        aRet[0] = rtl::OUString::createFromAscii("LinearGradient");
-        aRet[1] = rtl::OUString::createFromAscii("EllipticalGradient");
-        aRet[2] = rtl::OUString::createFromAscii("RectangularGradient");
+        aRet[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LinearGradient" ));
+        aRet[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EllipticalGradient" ));
+        aRet[2] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RectangularGradient" ));
 
         return aRet;
     }
diff --git a/canvas/source/tools/propertysethelper.cxx b/canvas/source/tools/propertysethelper.cxx
index 85375ea0cedf..127048261ae9 100644
--- a/canvas/source/tools/propertysethelper.cxx
+++ b/canvas/source/tools/propertysethelper.cxx
@@ -40,9 +40,9 @@ namespace canvas
         void throwUnknown( const ::rtl::OUString& aPropertyName )
         {
             throw beans::UnknownPropertyException(
-                ::rtl::OUString::createFromAscii("PropertySetHelper: property ") +
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PropertySetHelper: property " )) +
                 aPropertyName +
-                ::rtl::OUString::createFromAscii(" not found."),
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " not found." )),
                 uno::Reference< uno::XInterface >()
                 );
         }
@@ -50,9 +50,9 @@ namespace canvas
         void throwVeto( const ::rtl::OUString& aPropertyName )
         {
             throw beans::PropertyVetoException(
-                ::rtl::OUString::createFromAscii("PropertySetHelper: property ") +
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PropertySetHelper: property " )) +
                 aPropertyName +
-                ::rtl::OUString::createFromAscii(" access was vetoed."),
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " access was vetoed." )),
                 uno::Reference< uno::XInterface >() );
         }
 
diff --git a/canvas/source/tools/verifyinput.cxx b/canvas/source/tools/verifyinput.cxx
index 2603bbe497b4..e8469ba47aa0 100644
--- a/canvas/source/tools/verifyinput.cxx
+++ b/canvas/source/tools/verifyinput.cxx
@@ -81,7 +81,7 @@ namespace canvas
             {
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): point X value contains infinite or NAN"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): point X value contains infinite or NAN" )),
                     xIf,
                     nArgPos );
             }
@@ -90,7 +90,7 @@ namespace canvas
             {
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): point X value contains infinite or NAN"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): point X value contains infinite or NAN" )),
                     xIf,
                     nArgPos );
             }
@@ -115,7 +115,7 @@ namespace canvas
             {
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): size.Width value contains infinite or NAN"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): size.Width value contains infinite or NAN" )),
                     xIf,
                     nArgPos );
             }
@@ -124,7 +124,7 @@ namespace canvas
             {
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): size.Height value contains infinite or NAN"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): size.Height value contains infinite or NAN" )),
                     xIf,
                     nArgPos );
             }
@@ -149,7 +149,7 @@ namespace canvas
             {
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): bezier segment's Px value contains infinite or NAN"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bezier segment's Px value contains infinite or NAN" )),
                     xIf,
                     nArgPos );
             }
@@ -158,7 +158,7 @@ namespace canvas
             {
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): bezier segment's Py value contains infinite or NAN"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bezier segment's Py value contains infinite or NAN" )),
                     xIf,
                     nArgPos );
             }
@@ -167,7 +167,7 @@ namespace canvas
             {
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): bezier segment's C1x value contains infinite or NAN"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bezier segment's C1x value contains infinite or NAN" )),
                     xIf,
                     nArgPos );
             }
@@ -176,7 +176,7 @@ namespace canvas
             {
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): bezier segment's C1y value contains infinite or NAN"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bezier segment's C1y value contains infinite or NAN" )),
                     xIf,
                     nArgPos );
             }
@@ -185,7 +185,7 @@ namespace canvas
             {
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): bezier segment's C2x value contains infinite or NAN"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bezier segment's C2x value contains infinite or NAN" )),
                     xIf,
                     nArgPos );
             }
@@ -194,7 +194,7 @@ namespace canvas
             {
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): bezier segment's C2y value contains infinite or NAN"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bezier segment's C2y value contains infinite or NAN" )),
                     xIf,
                     nArgPos );
             }
@@ -223,7 +223,7 @@ namespace canvas
             {
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): rectangle point X1 contains infinite or NAN"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): rectangle point X1 contains infinite or NAN" )),
                     xIf,
                     nArgPos );
             }
@@ -232,7 +232,7 @@ namespace canvas
             {
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): rectangle point Y1 contains infinite or NAN"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): rectangle point Y1 contains infinite or NAN" )),
                     xIf,
                     nArgPos );
             }
@@ -241,7 +241,7 @@ namespace canvas
             {
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): rectangle point X2 contains infinite or NAN"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): rectangle point X2 contains infinite or NAN" )),
                     xIf,
                     nArgPos );
             }
@@ -250,7 +250,7 @@ namespace canvas
             {
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): rectangle point Y2 contains infinite or NAN"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): rectangle point Y2 contains infinite or NAN" )),
                     xIf,
                     nArgPos );
             }
@@ -285,7 +285,7 @@ namespace canvas
             {
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): AffineMatrix2D contains infinite or NAN value(s) at the following positions (m00-m12): ") +
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): AffineMatrix2D contains infinite or NAN value(s) at the following positions (m00-m12): " )) +
                     ::rtl::OUString::valueOf(nBinaryState),
                     xIf,
                     nArgPos );
@@ -321,7 +321,7 @@ namespace canvas
             {
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): Matrix2D contains infinite or NAN value(s) at the following positions (m00-m11): ") +
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): Matrix2D contains infinite or NAN value(s) at the following positions (m00-m11): " )) +
                     ::rtl::OUString::valueOf(nBinaryState),
                     xIf,
                     nArgPos );
@@ -360,11 +360,11 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): render state's device color has too few components (") +
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): render state's device color has too few components (" )) +
                     ::rtl::OUString::valueOf(nMinColorComponents) +
-                    ::rtl::OUString::createFromAscii(" expected, ") +
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " expected, " )) +
                     ::rtl::OUString::valueOf(renderState.DeviceColor.getLength()) +
-                    ::rtl::OUString::createFromAscii(" provided)"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " provided)" )),
                     xIf,
                     nArgPos );
 #else
@@ -378,9 +378,9 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): render state's CompositeOperation value out of range (") +
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): render state's CompositeOperation value out of range (" )) +
                     ::rtl::OUString::valueOf(sal::static_int_cast<sal_Int32>(renderState.CompositeOperation)) +
-                    ::rtl::OUString::createFromAscii(" not known)"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " not known)" )),
                     xIf,
                     nArgPos );
 #else
@@ -404,9 +404,9 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): textures' alpha value out of range (is ") +
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): textures' alpha value out of range (is " )) +
                     ::rtl::OUString::valueOf(texture.Alpha) +
-                    ::rtl::OUString::createFromAscii(")"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" )),
                     xIf,
                     nArgPos );
 #else
@@ -419,7 +419,7 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): textures' NumberOfHatchPolygons is negative"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): textures' NumberOfHatchPolygons is negative" )),
                     xIf,
                     nArgPos );
 #else
@@ -433,9 +433,9 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): textures' RepeatModeX value is out of range (") +
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): textures' RepeatModeX value is out of range (" )) +
                     ::rtl::OUString::valueOf(sal::static_int_cast<sal_Int32>(texture.RepeatModeX)) +
-                    ::rtl::OUString::createFromAscii(" not known)"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " not known)" )),
                     xIf,
                     nArgPos );
 #else
@@ -449,9 +449,9 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): textures' RepeatModeY value is out of range (") +
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): textures' RepeatModeY value is out of range (" )) +
                     ::rtl::OUString::valueOf(sal::static_int_cast<sal_Int32>(texture.RepeatModeY)) +
-                    ::rtl::OUString::createFromAscii(" not known)"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " not known)" )),
                     xIf,
                     nArgPos );
 #else
@@ -480,9 +480,9 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                         throw lang::IllegalArgumentException(
                             ::rtl::OUString::createFromAscii(mpStr) +
-                            ::rtl::OUString::createFromAscii(": verifyInput(): one of stroke attributes' DashArray value out of range (is ") +
+                            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): one of stroke attributes' DashArray value out of range (is " )) +
                             ::rtl::OUString::valueOf(rVal) +
-                            ::rtl::OUString::createFromAscii(")"),
+                            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" )),
                             mrIf,
                             mnArgPos );
 #else
@@ -508,9 +508,9 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): stroke attributes' StrokeWidth value out of range (is ") +
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): stroke attributes' StrokeWidth value out of range (is " )) +
                     ::rtl::OUString::valueOf(strokeAttributes.StrokeWidth) +
-                    ::rtl::OUString::createFromAscii(")"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" )),
                     xIf,
                     nArgPos );
 #else
@@ -524,9 +524,9 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): stroke attributes' MiterLimit value out of range (is ") +
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): stroke attributes' MiterLimit value out of range (is " )) +
                     ::rtl::OUString::valueOf(strokeAttributes.MiterLimit) +
-                    ::rtl::OUString::createFromAscii(")"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" )),
                     xIf,
                     nArgPos );
 #else
@@ -548,9 +548,9 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): stroke attributes' StartCapType value is out of range (") +
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): stroke attributes' StartCapType value is out of range (" )) +
                     ::rtl::OUString::valueOf(sal::static_int_cast<sal_Int32>(strokeAttributes.StartCapType)) +
-                    ::rtl::OUString::createFromAscii(" not known)"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " not known)" )),
                     xIf,
                     nArgPos );
 #else
@@ -564,9 +564,9 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): stroke attributes' StartCapType value is out of range (") +
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): stroke attributes' StartCapType value is out of range (" )) +
                     ::rtl::OUString::valueOf(sal::static_int_cast<sal_Int32>(strokeAttributes.EndCapType)) +
-                    ::rtl::OUString::createFromAscii(" not known)"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " not known)" )),
                     xIf,
                     nArgPos );
 #else
@@ -580,9 +580,9 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): stroke attributes' JoinType value is out of range (") +
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): stroke attributes' JoinType value is out of range (" )) +
                     ::rtl::OUString::valueOf(sal::static_int_cast<sal_Int32>(strokeAttributes.JoinType)) +
-                    ::rtl::OUString::createFromAscii(" not known)"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " not known)" )),
                     xIf,
                     nArgPos );
 #else
@@ -603,7 +603,7 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): bitmap layout's ScanLines is negative"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bitmap layout's ScanLines is negative" )),
                     xIf,
                     nArgPos );
 #else
@@ -616,7 +616,7 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): bitmap layout's ScanLineBytes is negative"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bitmap layout's ScanLineBytes is negative" )),
                     xIf,
                     nArgPos );
 #else
@@ -629,7 +629,7 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): bitmap layout's ColorSpace is invalid"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bitmap layout's ColorSpace is invalid" )),
                     xIf,
                     nArgPos );
 #else
@@ -643,7 +643,7 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                     throw lang::IllegalArgumentException(
                         ::rtl::OUString::createFromAscii(pStr) +
-                        ::rtl::OUString::createFromAscii(": verifyInput(): bitmap layout's ColorSpace getBitsPerPixel() is negative"),
+                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bitmap layout's ColorSpace getBitsPerPixel() is negative" )),
                         xIf,
                         nArgPos );
 #else
@@ -657,9 +657,9 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                     throw lang::IllegalArgumentException(
                         ::rtl::OUString::createFromAscii(pStr) +
-                        ::rtl::OUString::createFromAscii(": verifyInput(): bitmap layout's ColorSpace getEndianness() value is out of range (") +
+                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bitmap layout's ColorSpace getEndianness() value is out of range (" )) +
                         ::rtl::OUString::valueOf(sal::static_int_cast<sal_Int32>(bitmapLayout.ColorSpace->getEndianness())) +
-                        ::rtl::OUString::createFromAscii(" not known)"),
+                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " not known)" )),
                         xIf,
                         nArgPos );
 #else
@@ -681,7 +681,7 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): bitmap layout's ScanLines is negative"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bitmap layout's ScanLines is negative" )),
                     xIf,
                     nArgPos );
 #else
@@ -694,7 +694,7 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): bitmap layout's ScanLineBytes is negative"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bitmap layout's ScanLineBytes is negative" )),
                     xIf,
                     nArgPos );
 #else
@@ -707,7 +707,7 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): bitmap layout's ColorSpace is invalid"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bitmap layout's ColorSpace is invalid" )),
                     xIf,
                     nArgPos );
 #else
@@ -720,7 +720,7 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): bitmap layout's NumComponents is negative"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bitmap layout's NumComponents is negative" )),
                     xIf,
                     nArgPos );
 #else
@@ -734,9 +734,9 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): bitmap layout's Endianness value is out of range (") +
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bitmap layout's Endianness value is out of range (" )) +
                     ::rtl::OUString::valueOf(sal::static_int_cast<sal_Int32>(bitmapLayout.Endianness)) +
-                    ::rtl::OUString::createFromAscii(" not known)"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " not known)" )),
                     xIf,
                     nArgPos );
 #else
@@ -750,9 +750,9 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): bitmap layout's Format value is out of range (") +
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): bitmap layout's Format value is out of range (" )) +
                     ::rtl::OUString::valueOf(sal::static_int_cast<sal_Int32>(bitmapLayout.Format)) +
-                    ::rtl::OUString::createFromAscii(" not known)"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " not known)" )),
                     xIf,
                     nArgPos );
 #else
@@ -783,7 +783,7 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): font request's CellSize value contains infinite or NAN"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): font request's CellSize value contains infinite or NAN" )),
                     xIf,
                     nArgPos );
 #else
@@ -796,7 +796,7 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): font request's ReferenceAdvancement value contains infinite or NAN"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): font request's ReferenceAdvancement value contains infinite or NAN" )),
                     xIf,
                     nArgPos );
 #else
@@ -810,7 +810,7 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyInput(): font request's CellSize and ReferenceAdvancement are mutually exclusive, one of them must be 0.0"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyInput(): font request's CellSize and ReferenceAdvancement are mutually exclusive, one of them must be 0.0" )),
                     xIf,
                     nArgPos );
 #else
@@ -858,9 +858,9 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyBitmapSize(): size has 0 or negative width (value: ") +
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyBitmapSize(): size has 0 or negative width (value: " )) +
                     ::rtl::OUString::valueOf(size.Width) +
-                    ::rtl::OUString::createFromAscii(")"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" )),
                     xIf,
                     0 );
 #else
@@ -873,9 +873,9 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifyBitmapSize(): size has 0 or negative height (value: ") +
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifyBitmapSize(): size has 0 or negative height (value: " )) +
                     ::rtl::OUString::valueOf(size.Height) +
-                    ::rtl::OUString::createFromAscii(")"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" )),
                     xIf,
                     0 );
 #else
@@ -895,9 +895,9 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifySpriteSize(): size has 0 or negative width (value: ") +
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifySpriteSize(): size has 0 or negative width (value: " )) +
                     ::rtl::OUString::valueOf(size.Width) +
-                    ::rtl::OUString::createFromAscii(")"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" )),
                     xIf,
                     0 );
 #else
@@ -910,9 +910,9 @@ namespace canvas
 #if OSL_DEBUG_LEVEL > 0
                 throw lang::IllegalArgumentException(
                     ::rtl::OUString::createFromAscii(pStr) +
-                    ::rtl::OUString::createFromAscii(": verifySpriteSize(): size has 0 or negative height (value: ") +
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": verifySpriteSize(): size has 0 or negative height (value: " )) +
                     ::rtl::OUString::valueOf(size.Height) +
-                    ::rtl::OUString::createFromAscii(")"),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" )),
                     xIf,
                     0 );
 #else
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index 1f3df5ca88c6..57744ba15807 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -93,7 +93,7 @@ class TestWindow : public Dialog
     public:
         TestWindow() : Dialog( (Window *) NULL )
         {
-            SetText( rtl::OUString::createFromAscii( "Canvas test" ) );
+            SetText( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Canvas test" )) );
             SetSizePixel( Size( 600, 450 ) );
             EnablePaint( true );
             Show();
@@ -153,8 +153,8 @@ class DemoRenderer
 
             lang::Locale aLocale;
             rendering::FontInfo aFontInfo;
-            aFontInfo.FamilyName = ::rtl::OUString::createFromAscii( "Swiss" );
-            aFontInfo.StyleName = ::rtl::OUString::createFromAscii( "SansSerif" );
+            aFontInfo.FamilyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Swiss" ));
+            aFontInfo.StyleName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SansSerif" ));
             geometry::Matrix2D aFontMatrix( 1, 0,
                                             0, 1 );
             rendering::FontRequest aFontRequest( aFontInfo, 12.0, 0.0, aLocale );
@@ -692,8 +692,8 @@ void DemoApp::Main()
 
     // Create UCB.
     uno::Sequence< uno::Any > aArgs( 2 );
-    aArgs[ 0 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );
-    aArgs[ 1 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );
+    aArgs[ 0 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL ));
+    aArgs[ 1 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE ));
     ::ucbhelper::ContentBroker::initialize( xFactory, aArgs );
 
     InitVCL( xFactory );
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 2e70b49375ac..386856d1f938 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -779,7 +779,6 @@ awt::Rectangle SAL_CALL AccessibleBase::getBounds()
             if( xParent.is() )
                 aParentLocOnScreen = xParent->getLocationOnScreen();
 
-            // aOffset = aParentLocOnScreen - GetUpperLeftOnScreen()
             awt::Point aULOnScreen = GetUpperLeftOnScreen();
             awt::Point aOffset( aParentLocOnScreen.X - aULOnScreen.X,
                                 aParentLocOnScreen.Y - aULOnScreen.Y );
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
index 9cd456ea6a05..d720e30fcb15 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
@@ -130,30 +130,6 @@ void AccessibleChartElement::InitTextEdit()
             ASSERT_EXCEPTION( ex );
         }
 }
-//     OSL_ASSERT( m_pTextHelper == 0 );
-
-//     // /-- solar
-//     SolarMutexGuard aSolarGuard;
-//     Window* pWindow( VCLUnoHelper::GetWindow( GetInfo().m_xWindow ));
-//     if( pWindow )
-//     {
-//         // we need ChartController::m_pDrawViewWrapper here
-//         SdrView * pView = 0;
-//         if( pView )
-//         {
-//             SdrObject * pTextObj = m_pDrawViewWrapper->getTextEditObject();
-//             if( pTextObj )
-//             {
-//                 SvxEditSource * pEditSource = new SvxEditSource( pTextObj, pView, pWindow );
-//                 m_pTextHelper = new ::accessibility::AccessibleTextHelper(
-//                     ::std::auto_ptr< SvxEditSource >( pEditSource ));
-//                 if( m_pTextHelper )
-//                     m_pTextHelper->SetEventSource( this );
-//             }
-//         }
-//     }
-//     // \-- solar
-// }
 
 // ____________________________________
 // ____________________________________
@@ -169,14 +145,7 @@ Reference< XAccessible > AccessibleChartElement::ImplGetAccessibleChildById( sal
     Reference< XAccessible > xResult;
 
     if( m_bHasText )
-    {
         xResult.set( m_xTextHelper->getAccessibleChild( i ));
-        // /-- solar
-//         SolarMutexGuard aSolarGuard;
-//         if( m_pTextHelper )
-//             xResult.set( m_pTextHelper->GetChild( i ) );
-        // \-- solar
-    }
     else
         xResult.set( AccessibleBase::ImplGetAccessibleChildById( i ));
 
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx
index 40f3c0457048..05ad9ed2b3ad 100644
--- a/chart2/source/controller/accessibility/AccessibleChartView.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx
@@ -93,9 +93,6 @@ awt::Rectangle AccessibleChartView::GetWindowPosSize() const
     if( ! xWindow.is())
         return awt::Rectangle();
 
-    // this should do, but it doesn't => HACK
-//     return xWindow->getPosSize();
-
     awt::Rectangle aBBox( xWindow->getPosSize() );
 
     Window* pWindow( VCLUnoHelper::GetWindow( GetInfo().m_xWindow ));
diff --git a/chart2/source/controller/accessibility/ChartElementFactory.cxx b/chart2/source/controller/accessibility/ChartElementFactory.cxx
index 8c53795c12bd..71f5ce8c910d 100644
--- a/chart2/source/controller/accessibility/ChartElementFactory.cxx
+++ b/chart2/source/controller/accessibility/ChartElementFactory.cxx
@@ -77,70 +77,6 @@ AccessibleBase* ChartElementFactory::CreateChartElement( const AccessibleElement
     }
 
     return 0;
-
-    /*
-    sal_uInt16 nObjId = rId.GetObjectId();
-    switch( nObjId )
-    {
-        case CHOBJID_LEGEND:
-            return new AccLegend( pParent );
-        case AccLegendEntry::ObjectId:
-            return new AccLegendEntry( pParent, rId.GetIndex1() );
-
-        case CHOBJID_TITLE_MAIN:
-            return new AccTitle( pParent, Title::MAIN );
-        case CHOBJID_TITLE_SUB:
-            return new AccTitle( pParent, Title::SUB );
-        case CHOBJID_DIAGRAM_TITLE_X_AXIS:
-            return new AccTitle( pParent, Title::X_AXIS );
-        case CHOBJID_DIAGRAM_TITLE_Y_AXIS:
-            return new AccTitle( pParent, Title::Y_AXIS );
-        case CHOBJID_DIAGRAM_TITLE_Z_AXIS:
-            return new AccTitle( pParent, Title::Z_AXIS );
-
-        case CHOBJID_DIAGRAM:
-            return new AccDiagram( pParent );
-
-        // series
-        case CHOBJID_DIAGRAM_ROWGROUP:
-            return new AccDataSeries( pParent, rId.GetIndex1() );
-
-        // data points
-        case CHOBJID_DIAGRAM_DATA:
-            return new AccDataPoint( pParent, rId.GetIndex1(), rId.GetIndex2() );
-
-        case Axis::X_AXIS:
-        case Axis::Y_AXIS:
-        case Axis::Z_AXIS:
-        case Axis::SEC_X_AXIS:
-        case Axis::SEC_Y_AXIS:
-            return new AccAxis( pParent, static_cast< Axis::AxisType >( nObjId ) );
-
-        case Grid::X_MAJOR:
-        case Grid::Y_MAJOR:
-        case Grid::Z_MAJOR:
-        case Grid::X_MINOR:
-        case Grid::Y_MINOR:
-        case Grid::Z_MINOR:
-            return new AccGrid( pParent, static_cast< AccGrid::GridType >( nObjId ) );
-
-        case AccStatisticsObject::MEAN_VAL_LINE:
-        case AccStatisticsObject::ERROR_BARS:
-        case AccStatisticsObject::REGRESSION:
-            return new AccStatisticsObject( pParent,
-                                         static_cast< AccStatisticsObject::StatisticsObjectType >( nObjId ),
-                                         rId.GetIndex1() );
-
-        case CHOBJID_DIAGRAM_WALL:
-            return new AccWall( pParent );
-
-        case CHOBJID_DIAGRAM_FLOOR:
-            return new AccFloor( pParent );
-
-        case CHOBJID_DIAGRAM_AREA:
-            return new AccArea( pParent );
-    }
-    */
 }
 
 } // namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
index 853fc6e0a5d0..2d96f4e9af22 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
@@ -70,7 +70,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
         ::chart::FillProperties::AddPropertiesToVector( aProperties );
-//         ::chart::NamedProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
 
         // and sort them for access via bsearch
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index 091287a70e91..f20e1d474fd6 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -337,7 +337,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
         lcl_AddPropertiesToVector( aProperties );
         ::chart::CharacterProperties::AddPropertiesToVector( aProperties );
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
-//         ::chart::NamedLineProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
         ::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties );
 
@@ -584,8 +583,6 @@ Sequence< OUString > AxisWrapper::getSupportedServiceNames_Static()
     aServices[ 0 ] = C2U( "com.sun.star.chart.ChartAxis" );
     aServices[ 1 ] = C2U( "com.sun.star.xml.UserDefinedAttributeSupplier" );
     aServices[ 2 ] = C2U( "com.sun.star.style.CharacterProperties" );
-//     aServices[ 3 ] = C2U( "com.sun.star.beans.PropertySet" );
-//     aServices[ 4 ] = C2U( "com.sun.star.drawing.LineProperties" );
 
     return aServices;
 }
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 828cca5cdec8..e20c4261dd6b 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -1498,19 +1498,6 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ChartDocumentWrapper::getAvailableServ
 
     return aResult;
 
-//         // shapes
-// //         uno::Sequence< OUString > aDrawServices( SvxUnoDrawMSFactory::getAvailableServiceNames() );
-// //         const OUString * pArr = aDrawServices.getConstArray();
-// //         aServices.insert( aServices.end(), pArr, pArr + aDrawServices.getLength() );
-//     }
-
-
-    // add-ins
- //    uno::Sequence< OUString > aAddIns( GetAddInCollection().GetAddInNames() );
-//     pArr = aAddIns.getConstArray();
-//     aServices.insert( aServices.end(), pArr, pArr + aAddIns.getLength() );
-
-//     return ContainerToSequence( aServices );
 }
 
 // ____ XAggregation ____
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index 6c4841489947..432e93993977 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -730,13 +730,7 @@ const std::vector< WrappedProperty* > DataSeriesPointWrapper::createWrappedPrope
     WrappedDataCaptionProperties::addWrappedPropertiesForSeries( aWrappedProperties, m_spChart2ModelContact );
     WrappedScaleTextProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
 
-    //add unnamed fill properties (different inner names here)
-//     aWrappedProperties.push_back( new  WrappedUnnamedProperty( C2U( "FillGradient" ), C2U( "GradientName" ) ) );
-//     aWrappedProperties.push_back( new  WrappedUnnamedProperty( C2U( "FillHatch" ), C2U( "HatchName" ) ) );
-//     aWrappedProperties.push_back( new  WrappedUnnamedProperty( C2U( "FillTransparenceGradient" ), C2U( "TransparencyGradientName" ) ) );
-
     //add unnamed line properties (different inner names here)
-//     aWrappedProperties.push_back( new WrappedUnnamedProperty( C2U( "LineDash" ), C2U( "LineDashName" ) ) );
 
     aWrappedProperties.push_back( new WrappedProperty( C2U( "FillColor" ), C2U( "Color" ) ) );
     aWrappedProperties.push_back( new WrappedLineStyleProperty( this ) );
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 4aad2d46f186..cf1be90f3079 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -1203,12 +1203,6 @@ void SAL_CALL DiagramWrapper::removeEventListener(
     m_aEventListenerContainer.removeInterface( aListener );
 }
 
-// ____ XEventListener ____
-// void SAL_CALL DiagramWrapper::disposing( const lang::EventObject& Source )
-//     throw (uno::RuntimeException)
-// {
-// }
-
 //-----------------------------------------------------------------------------------------------------------------
 //-----------------------------------------------------------------------------------------------------------------
 //-----------------------------------------------------------------------------------------------------------------
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
index 25f0bb2f0733..a3f755a8cf5b 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
@@ -208,12 +208,7 @@ public:
     virtual void SAL_CALL setDefaultRotation() throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setDefaultIllumination() throw (::com::sun::star::uno::RuntimeException);
 
-//     // ____ XEventListener ____
-//     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
-//         throw (::com::sun::star::uno::RuntimeException);
-
     // ____ XDiagramPositioning ____
-
     virtual void SAL_CALL setAutomaticDiagramPositioning(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::sal_Bool SAL_CALL isAutomaticDiagramPositioning(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setDiagramPositionExcludingAxes( const ::com::sun::star::awt::Rectangle& PositionRect ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index a3dd61f3670b..4b0674f6b344 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -71,7 +71,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
         // get properties
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
-//         ::chart::NamedLineProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
 
         // and sort them for access via bsearch
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index e78b23a4bb0f..269f9bcfd043 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -261,7 +261,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
         ::chart::CharacterProperties::AddPropertiesToVector( aProperties );
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
         ::chart::FillProperties::AddPropertiesToVector( aProperties );
-//         ::chart::NamedProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
         ::chart::wrapper::WrappedAutomaticPositionProperties::addProperties( aProperties );
         ::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties );
@@ -446,9 +445,6 @@ Sequence< ::rtl::OUString > LegendWrapper::getSupportedServiceNames_Static()
     aServices[ 1 ] = C2U( "com.sun.star.drawing.Shape" );
     aServices[ 2 ] = C2U( "com.sun.star.xml.UserDefinedAttributeSupplier" );
     aServices[ 3 ] = C2U( "com.sun.star.style.CharacterProperties" );
-//     aServices[ 4 ] = C2U( "com.sun.star.beans.PropertySet" );
-//     aServices[ 5 ] = C2U( "com.sun.star.drawing.FillProperties" );
-//     aServices[ 6 ] = C2U( "com.sun.star.drawing.LineProperties" );
 
     return aServices;
 }
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index e468160edc8a..db6817b749cb 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -69,7 +69,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
 
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
-//         ::chart::NamedLineProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
 
         // and sort them for access via bsearch
@@ -282,8 +281,6 @@ void SAL_CALL MinMaxLineWrapper::setPropertyValues( const uno::Sequence< ::rtl::
         }
     }
     //todo: store unknown properties elsewhere
-//    if( bUnknownProperty )
-//        throw beans::UnknownPropertyException();
 }
 uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyValues( const uno::Sequence< ::rtl::OUString >& rNameSeq )
                     throw (uno::RuntimeException)
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
index 68298e035285..6ecc276382c0 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
@@ -64,9 +64,6 @@ class MinMaxLineWrapper : public MutexContainer
                         , ::com::sun::star::beans::XMultiPropertySet
                         , ::com::sun::star::beans::XPropertyState
                         , ::com::sun::star::beans::XMultiPropertyStates
-                        //  , ::com::sun::star::uno::XWeak          // implemented by WeakImplHelper(optional interface)
-                        //  , ::com::sun::star::uno::XInterface     // implemented by WeakImplHelper
-                        //  , ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper
                         >
 {
 public:
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index 654cadbf5c97..a98eb329c3d6 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -197,7 +197,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
         ::chart::CharacterProperties::AddPropertiesToVector( aProperties );
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
         ::chart::FillProperties::AddPropertiesToVector( aProperties );
-//         ::chart::NamedProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
         ::chart::wrapper::WrappedAutomaticPositionProperties::addProperties( aProperties );
         ::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties );
@@ -553,9 +552,6 @@ Sequence< OUString > TitleWrapper::getSupportedServiceNames_Static()
     aServices[ 1 ] = C2U( "com.sun.star.drawing.Shape" );
     aServices[ 2 ] = C2U( "com.sun.star.xml.UserDefinedAttributeSupplier" );
     aServices[ 3 ] = C2U( "com.sun.star.style.CharacterProperties" );
-//     aServices[ 4 ] = C2U( "com.sun.star.beans.PropertySet" );
-//     aServices[ 5 ] = C2U( "com.sun.star.drawing.FillProperties" );
-//     aServices[ 6 ] = C2U( "com.sun.star.drawing.LineProperties" );
 
     return aServices;
 }
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index 48f26fef00d3..448d594accb9 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -70,7 +70,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
 
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
         ::chart::FillProperties::AddPropertiesToVector( aProperties );
-//         ::chart::NamedProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
 
         // and sort them for access via bsearch
@@ -254,8 +253,6 @@ void SAL_CALL UpDownBarWrapper::setPropertyValues( const uno::Sequence< ::rtl::O
         }
     }
     //todo: store unknown properties elsewhere
-//    if( bUnknownProperty )
-//        throw beans::UnknownPropertyException();
 }
 uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyValues( const uno::Sequence< ::rtl::OUString >& rNameSeq )
                     throw (uno::RuntimeException)
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
index 57c18193d028..0ccef58f2583 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
@@ -63,9 +63,6 @@ class UpDownBarWrapper : public MutexContainer
                         , ::com::sun::star::beans::XMultiPropertySet
                         , ::com::sun::star::beans::XPropertyState
                         , ::com::sun::star::beans::XMultiPropertyStates
-                        //  , ::com::sun::star::uno::XWeak          // implemented by WeakImplHelper(optional interface)
-                        //  , ::com::sun::star::uno::XInterface     // implemented by WeakImplHelper
-                        //  , ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper
                         >
 {
 public:
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
index 3636ced033f8..e9d266396489 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
@@ -72,7 +72,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
         ::std::vector< ::com::sun::star::beans::Property > aProperties;
         ::chart::FillProperties::AddPropertiesToVector( aProperties );
         ::chart::LineProperties::AddPropertiesToVector( aProperties );
-//         ::chart::NamedProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
 
         // and sort them for access via bsearch
diff --git a/chart2/source/controller/dialogs/Bitmaps.src b/chart2/source/controller/dialogs/Bitmaps.src
index 3945090217e0..cf7b30410210 100644
--- a/chart2/source/controller/dialogs/Bitmaps.src
+++ b/chart2/source/controller/dialogs/Bitmaps.src
@@ -33,7 +33,7 @@ Image IMG_TYPE_COLUMN
 };
 Image IMG_TYPE_BAR
 {
-    ImageBitmap = Bitmap { File = "typebar_16.png " ; };
+    ImageBitmap = Bitmap { File = "typebar_16.png" ; };
     MaskColor = STD_MASKCOLOR;
 };
 Image IMG_TYPE_PIE
@@ -501,35 +501,35 @@ Image BMP_REGRESSION_NONE
 {
     ImageBitmap = Bitmap
     {
-        File = "regno.bmp" ;
+        File = "regno.png" ;
     };
 };
 Image BMP_REGRESSION_LINEAR
 {
     ImageBitmap = Bitmap
     {
-        File = "reglin.bmp" ;
+        File = "reglin.png" ;
     };
 };
 Image BMP_REGRESSION_LOG
 {
     ImageBitmap = Bitmap
     {
-        File = "reglog.bmp" ;
+        File = "reglog.png" ;
     };
 };
 Image BMP_REGRESSION_EXP
 {
     ImageBitmap = Bitmap
     {
-        File = "regexp.bmp" ;
+        File = "regexp.png" ;
     };
 };
 Image BMP_REGRESSION_POWER
 {
     ImageBitmap = Bitmap
     {
-        File = "regpow.bmp" ;
+        File = "regpow.png" ;
     };
 };
 //---------------------
diff --git a/chart2/source/controller/dialogs/Bitmaps_HC.hrc b/chart2/source/controller/dialogs/Bitmaps_HC.hrc
deleted file mode 100644
index 16bffd0cf86d..000000000000
--- a/chart2/source/controller/dialogs/Bitmaps_HC.hrc
+++ /dev/null
@@ -1,213 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SOLAR_HRC
-#include <svl/solar.hrc>
-#endif
-
-// RID_SCH_START is 30512 (see svl/solar.hrc)
-
-// next free: 100
-
-#ifndef SC_HC_MASKCOLOR
-#define SC_HC_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }
-#endif
-
-//-----------------------------------------------------------------------------
-// chart types
-// Images:
-
-#define IMG_TYPE_COLUMN_HC (RID_SCH_START + 1)
-#define IMG_TYPE_BAR_HC    (RID_SCH_START + 2)
-#define IMG_TYPE_PIE_HC    (RID_SCH_START + 3)
-#define IMG_TYPE_AREA_HC   (RID_SCH_START + 4)
-#define IMG_TYPE_LINE_HC   (RID_SCH_START + 5)
-#define IMG_TYPE_XY_HC     (RID_SCH_START + 6)
-#define IMG_TYPE_BUBBLE_HC (RID_SCH_START + 7)
-#define IMG_TYPE_NET_HC    (RID_SCH_START + 8)
-#define IMG_TYPE_STOCK_HC  (RID_SCH_START + 9)
-#define IMG_TYPE_COLUMN_LINE_HC  (RID_SCH_START + 10)
-
-//-----------------------------------------------------------------------------
-//Chart Subtypes
-// Bitmaps:
-
-//----------------------
-// Column Chart Subtypes
-#define BMP_COLUMNS_2D_1_HC (RID_SCH_START + 1)
-#define BMP_COLUMNS_2D_2_HC (RID_SCH_START + 2)
-#define BMP_COLUMNS_2D_3_HC (RID_SCH_START + 3)
-
-#define BMP_COLUMNS_3D_HC (RID_SCH_START + 4)
-#define BMP_COLUMNS_3D_1_HC (RID_SCH_START + 5)
-#define BMP_COLUMNS_3D_2_HC (RID_SCH_START + 6)
-#define BMP_COLUMNS_3D_3_HC (RID_SCH_START + 7)
-
-#define BMP_SAEULE_3D_1_HC (RID_SCH_START + 8)
-#define BMP_SAEULE_3D_2_HC (RID_SCH_START + 9)
-#define BMP_SAEULE_3D_3_HC (RID_SCH_START + 10)
-#define BMP_SAEULE_3D_4_HC (RID_SCH_START + 11)
-
-#define BMP_KEGEL_3D_1_HC (RID_SCH_START + 12)
-#define BMP_KEGEL_3D_2_HC (RID_SCH_START + 13)
-#define BMP_KEGEL_3D_3_HC (RID_SCH_START + 14)
-#define BMP_KEGEL_3D_4_HC (RID_SCH_START + 15)
-
-#define BMP_PYRAMID_3D_1_HC (RID_SCH_START + 16)
-#define BMP_PYRAMID_3D_2_HC (RID_SCH_START + 17)
-#define BMP_PYRAMID_3D_3_HC (RID_SCH_START + 18)
-#define BMP_PYRAMID_3D_4_HC (RID_SCH_START + 19)
-
-//----------------------
-// Bar Chart Subtypes
-
-#define BMP_BARS_2D_1_HC (RID_SCH_START + 20)
-#define BMP_BARS_2D_2_HC (RID_SCH_START + 21)
-#define BMP_BARS_2D_3_HC (RID_SCH_START + 22)
-
-#define BMP_BARS_3D_HC (RID_SCH_START + 23)
-#define BMP_BARS_3D_1_HC (RID_SCH_START + 24)
-#define BMP_BARS_3D_2_HC (RID_SCH_START + 25)
-#define BMP_BARS_3D_3_HC (RID_SCH_START + 26)
-
-#define BMP_ROEHRE_3D_1_HC (RID_SCH_START + 27)
-#define BMP_ROEHRE_3D_2_HC (RID_SCH_START + 28)
-#define BMP_ROEHRE_3D_3_HC (RID_SCH_START + 29)
-#define BMP_ROEHRE_3D_4_HC (RID_SCH_START + 30)
-
-#define BMP_KEGELQ_3D_1_HC (RID_SCH_START + 31)
-#define BMP_KEGELQ_3D_2_HC (RID_SCH_START + 32)
-#define BMP_KEGELQ_3D_3_HC (RID_SCH_START + 33)
-#define BMP_KEGELQ_3D_4_HC (RID_SCH_START + 34)
-
-#define BMP_PYRAMIDQ_3D_1_HC (RID_SCH_START + 35)
-#define BMP_PYRAMIDQ_3D_2_HC (RID_SCH_START + 36)
-#define BMP_PYRAMIDQ_3D_3_HC (RID_SCH_START + 37)
-#define BMP_PYRAMIDQ_3D_4_HC (RID_SCH_START + 38)
-
-//----------------------
-// Pie and Donut Chart Subtypes
-
-#define BMP_CIRCLES_2D_HC (RID_SCH_START + 39)
-#define BMP_CIRCLES_2D_EXPLODED_HC (RID_SCH_START + 40)
-#define BMP_CIRCLES_3D_HC (RID_SCH_START + 41)
-#define BMP_CIRCLES_3D_EXPLODED_HC (RID_SCH_START + 42)
-#define BMP_DONUT_2D_HC (RID_SCH_START + 43)
-#define BMP_DONUT_2D_EXPLODED_HC (RID_SCH_START + 44)
-#define BMP_DONUT_3D_HC (RID_SCH_START + 45)
-#define BMP_DONUT_3D_EXPLODED_HC (RID_SCH_START + 46)
-
-//----------------------
-// Points and Lines Chart Subtypes
-
-#define BMP_POINTS_XVALUES_HC (RID_SCH_START + 47)
-#define BMP_POINTS_XCATEGORY_HC (RID_SCH_START + 48)
-#define BMP_POINTS_STACKED_HC (RID_SCH_START + 49)
-
-#define BMP_LINE_P_XVALUES_HC (RID_SCH_START + 50)
-#define BMP_LINE_O_XVALUES_HC (RID_SCH_START + 51)
-#define BMP_LINE3D_XVALUES_HC (RID_SCH_START + 52)
-
-#define BMP_LINE_P_XCATEGORY_HC (RID_SCH_START + 53)
-#define BMP_LINE_O_XCATEGORY_HC (RID_SCH_START + 54)
-#define BMP_LINE3D_XCATEGORY_HC (RID_SCH_START + 55)
-
-#define BMP_LINE_P_STACKED_HC (RID_SCH_START + 56)
-#define BMP_LINE_O_STACKED_HC (RID_SCH_START + 57)
-#define BMP_LINE3D_STACKED_HC (RID_SCH_START + 58)
-
-#define BMP_LINE_P_XVALUES_SMOOTH_HC (RID_SCH_START + 59)
-#define BMP_LINE_O_XVALUES_SMOOTH_HC (RID_SCH_START + 60)
-#define BMP_LINE3D_XVALUES_SMOOTH_HC (RID_SCH_START + 61)
-
-#define BMP_LINE_P_XCATEGORY_SMOOTH_HC (RID_SCH_START + 62)
-#define BMP_LINE_O_XCATEGORY_SMOOTH_HC (RID_SCH_START + 63)
-#define BMP_LINE3D_XCATEGORY_SMOOTH_HC (RID_SCH_START + 64)
-
-#define BMP_LINE_P_STACKED_SMOOTH_HC (RID_SCH_START + 65)
-#define BMP_LINE_O_STACKED_SMOOTH_HC (RID_SCH_START + 66)
-#define BMP_LINE3D_STACKED_SMOOTH_HC (RID_SCH_START + 67)
-
-//----------------------
-// Area Chart Subtypes
-
-#define BMP_AREAS_2D_HC (RID_SCH_START + 68)
-#define BMP_AREAS_2D_1_HC (RID_SCH_START + 69)
-#define BMP_AREAS_2D_3_HC (RID_SCH_START + 70)
-#define BMP_AREAS_3D_HC (RID_SCH_START + 71)
-#define BMP_AREAS_3D_1_HC (RID_SCH_START + 72)
-#define BMP_AREAS_3D_2_HC (RID_SCH_START + 73)
-
-//----------------------
-// Net Chart Subtypes
-
-#define BMP_NET_HC (RID_SCH_START + 74)
-#define BMP_NET_STACK_HC (RID_SCH_START + 75)
-#define BMP_NET_SYMB_HC (RID_SCH_START + 76)
-#define BMP_NET_SYMB_STACK_HC (RID_SCH_START + 77)
-#define BMP_NET_LINESYMB_HC (RID_SCH_START + 78)
-#define BMP_NET_LINESYMB_STACK_HC (RID_SCH_START + 79)
-#define BMP_NET_FILL_HC (RID_SCH_START + 80)
-#define BMP_NET_FILL_STACK_HC (RID_SCH_START + 81)
-
-//----------------------
-// Stock Chart Subtypes
-
-#define BMP_STOCK_1_HC (RID_SCH_START + 82)
-#define BMP_STOCK_2_HC (RID_SCH_START + 83)
-#define BMP_STOCK_3_HC (RID_SCH_START + 84)
-#define BMP_STOCK_4_HC (RID_SCH_START + 85)
-
-//----------------------
-// Column + Line Chart Subtypes
-
-#define BMP_COLUMN_LINE_HC (RID_SCH_START + 86)
-#define BMP_COLUMN_LINE_STACKED_HC (RID_SCH_START + 87)
-
-//----------------------
-// Bubble Chart Subtypes
-#define BMP_BUBBLE_1_HC (RID_SCH_START + 88)
-
-//-----------------------------------------------------------------------------
-//further Images:
-
-//SchStatisticTabPage and SchDataStatisticsDlg part 1
-#define BMP_INDICATE_BOTH_VERTI_HC (RID_SCH_START + 89)
-#define BMP_INDICATE_UP_HC (RID_SCH_START + 90)
-#define BMP_INDICATE_DOWN_HC (RID_SCH_START + 91)
-#define BMP_INDICATE_BOTH_HORI_HC (RID_SCH_START + 97)
-#define BMP_INDICATE_RIGHT_HC (RID_SCH_START + 98)
-#define BMP_INDICATE_LEFT_HC (RID_SCH_START + 99)
-
-//SchStatisticTabPage and SchDataStatisticsDlg part 2
-#define BMP_REGRESSION_NONE_HC (RID_SCH_START + 92)
-#define BMP_REGRESSION_LINEAR_HC (RID_SCH_START + 93)
-#define BMP_REGRESSION_LOG_HC (RID_SCH_START + 94)
-#define BMP_REGRESSION_EXP_HC (RID_SCH_START + 95)
-#define BMP_REGRESSION_POWER_HC (RID_SCH_START + 96)
-
-// hide-button for range-choosing
-#define IMG_SELECTRANGE_HC (RID_SCH_START + 100)
diff --git a/chart2/source/controller/dialogs/Bitmaps_HC.src b/chart2/source/controller/dialogs/Bitmaps_HC.src
deleted file mode 100644
index 738c133483e1..000000000000
--- a/chart2/source/controller/dialogs/Bitmaps_HC.src
+++ /dev/null
@@ -1,543 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#include "Bitmaps_HC.hrc"
-
-Image IMG_TYPE_COLUMN_HC
-{
-    ImageBitmap = Bitmap { File = "typecolumn_16.png" ; };
-    MaskColor = SC_HC_MASKCOLOR;
-};
-Image IMG_TYPE_BAR_HC
-{
-    ImageBitmap = Bitmap { File = "typebar_16.png " ; };
-    MaskColor = SC_HC_MASKCOLOR;
-};
-Image IMG_TYPE_PIE_HC
-{
-    ImageBitmap = Bitmap { File = "typepie_16.png" ; };
-    MaskColor = SC_HC_MASKCOLOR;
-};
-Image IMG_TYPE_LINE_HC
-{
-    ImageBitmap = Bitmap { File = "typepointline_16.png" ; };
-    MaskColor = SC_HC_MASKCOLOR;
-};
-Image IMG_TYPE_XY_HC
-{
-    ImageBitmap = Bitmap { File = "typexy_16.png" ; };
-    MaskColor = SC_HC_MASKCOLOR;
-};
-Image IMG_TYPE_AREA_HC
-{
-    ImageBitmap = Bitmap { File = "typearea_16.png" ; };
-    MaskColor = SC_HC_MASKCOLOR;
-};
-Image IMG_TYPE_NET_HC
-{
-    ImageBitmap = Bitmap { File = "typenet_16.png" ; };
-    MaskColor = SC_HC_MASKCOLOR;
-};
-Image IMG_TYPE_STOCK_HC
-{
-    ImageBitmap = Bitmap { File = "typestock_16.png" ; };
-    MaskColor = SC_HC_MASKCOLOR;
-};
-Image IMG_TYPE_COLUMN_LINE_HC
-{
-    ImageBitmap = Bitmap { File = "typecolumnline_16.png" ; };
-    MaskColor = SC_HC_MASKCOLOR;
-};
-Image IMG_TYPE_BUBBLE_HC
-{
-    ImageBitmap = Bitmap { File = "typebubble_16.png" ; };
-    MaskColor = SC_HC_MASKCOLOR;
-};
-Bitmap BMP_BUBBLE_1_HC
-{
-    File = "bubble_52x60_h.png" ;
-};
-Bitmap BMP_AREAS_2D_HC
-{
-    File = "areas_52x60_h.png" ;
-};
-Bitmap BMP_AREAS_2D_1_HC
-{
-    File = "areaspiled_52x60_h.png" ;
-};
-Bitmap BMP_AREAS_2D_3_HC
-{
-    File = "areasfull_52x60_h.png" ;
-};
-Bitmap BMP_AREAS_3D_HC
-{
-    File = "areaspiled3d_52x60_h.png" ;
-};
-Bitmap BMP_AREAS_3D_1_HC
-{
-    File = "areas3d_52x60_h.png" ;
-};
-Bitmap BMP_AREAS_3D_2_HC
-{
-    File = "areasfull3d_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_BARS_2D_1_HC
-{
-    File = "bar_52x60_h.png" ;
-};
-Bitmap BMP_BARS_2D_2_HC
-{
-    File = "barstack_52x60_h.png" ;
-};
-Bitmap BMP_BARS_2D_3_HC
-{
-    File = "barpercent_52x60_h.png" ;
-};
-Bitmap BMP_BARS_3D_HC
-{
-    File = "bar3ddeep_52x60_h.png" ;
-};
-Bitmap BMP_BARS_3D_1_HC
-{
-    File = "bar3d_52x60_h.png" ;
-};
-Bitmap BMP_BARS_3D_2_HC
-{
-    File = "barstack3d_52x60_h.png" ;
-};
-Bitmap BMP_BARS_3D_3_HC
-{
-    File = "barpercent3d_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_CIRCLES_2D_HC
-{
-    File = "pie_52x60_h.png" ;
-};
-Bitmap BMP_CIRCLES_2D_EXPLODED_HC
-{
-    File = "pieexploded_52x60_h.png" ;
-};
-Bitmap BMP_CIRCLES_3D_HC
-{
-    File = "pie3d_52x60_h.png" ;
-};
-Bitmap BMP_CIRCLES_3D_EXPLODED_HC
-{
-    File = "pie3dexploded_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_DONUT_2D_HC
-{
-    File = "donut_52x60_h.png" ;
-};
-Bitmap BMP_DONUT_2D_EXPLODED_HC
-{
-    File = "donutexploded_52x60_h.png" ;
-};
-Bitmap BMP_DONUT_3D_HC
-{
-    File = "donut3d_52x60_h.png" ;
-};
-Bitmap BMP_DONUT_3D_EXPLODED_HC
-{
-    File = "donut3dexploded_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_COLUMNS_2D_1_HC
-{
-    File = "columns_52x60_h.png" ;
-};
-Bitmap BMP_COLUMNS_2D_2_HC
-{
-    File = "columnstack_52x60_h.png" ;
-};
-Bitmap BMP_COLUMNS_2D_3_HC
-{
-    File = "columnpercent_52x60_h.png" ;
-};
-Bitmap BMP_COLUMN_LINE_HC
-{
-    File = "columnline_52x60_h.png" ;
-};
-Bitmap BMP_COLUMN_LINE_STACKED_HC
-{
-    File = "columnstackline_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_COLUMNS_3D_HC
-{
-    File = "columns3ddeep_52x60_h.png" ;
-};
-Bitmap BMP_COLUMNS_3D_1_HC
-{
-    File = "columns3d_52x60_h.png" ;
-};
-Bitmap BMP_COLUMNS_3D_2_HC
-{
-    File = "columnstack3d_52x60_h.png" ;
-};
-Bitmap BMP_COLUMNS_3D_3_HC
-{
-    File = "columnpercent3d_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_KEGELQ_3D_1_HC
-{
-    File = "conehori_52x60_h.png" ;
-};
-Bitmap BMP_KEGELQ_3D_2_HC
-{
-    File = "conehoristack_52x60_h.png" ;
-};
-Bitmap BMP_KEGELQ_3D_3_HC
-{
-    File = "conehoripercent_52x60_h.png" ;
-};
-Bitmap BMP_KEGELQ_3D_4_HC
-{
-    File = "conehorideep_52x60_h.png" ;
-};
-Bitmap BMP_KEGEL_3D_1_HC
-{
-    File = "cone_52x60_h.png" ;
-};
-Bitmap BMP_KEGEL_3D_2_HC
-{
-    File = "conestack_52x60_h.png" ;
-};
-Bitmap BMP_KEGEL_3D_3_HC
-{
-    File = "conepercent_52x60_h.png" ;
-};
-Bitmap BMP_KEGEL_3D_4_HC
-{
-    File = "conedeep_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_POINTS_XVALUES_HC
-{
-    File = "valueaxisdirectpoints_52x60_h.png" ;
-};
-Bitmap BMP_POINTS_XCATEGORY_HC
-{
-    File = "nostackdirectpoints_52x60_h.png" ;
-};
-Bitmap BMP_POINTS_STACKED_HC
-{
-    File = "stackdirectpoints_52x60_h.png" ;
-};
-//---------------------
-
-Bitmap BMP_LINE_P_XVALUES_HC
-{
-    File = "valueaxisdirectboth_52x60_h.png" ;
-};
-Bitmap BMP_LINE_O_XVALUES_HC
-{
-    File = "valueaxisdirectlines_52x60_h.png" ;
-};
-Bitmap BMP_LINE3D_XVALUES_HC
-{
-    File = "valueaxisdirect3d_52x60_h.png" ;
-};
-
-
-Bitmap BMP_LINE_P_XCATEGORY_HC
-{
-    File = "nostackdirectboth_52x60_h.png" ;
-};
-Bitmap BMP_LINE_O_XCATEGORY_HC
-{
-    File = "nostackdirectlines_52x60_h.png" ;
-};
-Bitmap BMP_LINE3D_XCATEGORY_HC
-{
-    File = "nostackdirect3d_52x60_h.png" ;
-};
-
-
-Bitmap BMP_LINE_P_STACKED_HC
-{
-    File = "stackdirectboth_52x60_h.png" ;
-};
-Bitmap BMP_LINE_O_STACKED_HC
-{
-    File = "stackdirectlines_52x60_h.png" ;
-};
-Bitmap BMP_LINE3D_STACKED_HC
-{
-    File = "stackdirect3d_52x60_h.png" ;
-};
-
-//---------------------
-Bitmap BMP_LINE_P_XVALUES_SMOOTH_HC
-{
-    File = "valueaxissmoothboth_52x60_h.png" ;
-};
-Bitmap BMP_LINE_O_XVALUES_SMOOTH_HC
-{
-    File = "valueaxissmoothlines_52x60_h.png" ;
-};
-Bitmap BMP_LINE3D_XVALUES_SMOOTH_HC
-{
-    File = "valueaxissmooth3d_52x60_h.png" ;
-};
-Bitmap BMP_LINE_P_XCATEGORY_SMOOTH_HC
-{
-    File = "nostacksmoothboth_52x60_h.png" ;
-};
-Bitmap BMP_LINE_O_XCATEGORY_SMOOTH_HC
-{
-    File = "nostacksmoothlines_52x60_h.png" ;
-};
-Bitmap BMP_LINE3D_XCATEGORY_SMOOTH_HC
-{
-    File = "nostacksmooth3d_52x60_h.png" ;
-};
-Bitmap BMP_LINE_P_STACKED_SMOOTH_HC
-{
-    File = "stacksmoothboth_52x60_h.png" ;
-};
-Bitmap BMP_LINE_O_STACKED_SMOOTH_HC
-{
-    File = "stacksmoothlines_52x60_h.png" ;
-};
-Bitmap BMP_LINE3D_STACKED_SMOOTH_HC
-{
-    File = "stacksmooth3d_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_NET_HC
-{
-    File = "net_52x60_h.png" ;
-};
-Bitmap BMP_NET_STACK_HC
-{
-    File = "netstack_52x60_h.png" ;
-};
-Bitmap BMP_NET_SYMB_HC
-{
-    File = "netpoint_52x60_h.png" ;
-};
-Bitmap BMP_NET_SYMB_STACK_HC
-{
-    File = "netpointstack_52x60_h.png" ;
-};
-Bitmap BMP_NET_LINESYMB_HC
-{
-    File = "netlinepoint_52x60_h.png" ;
-};
-Bitmap BMP_NET_LINESYMB_STACK_HC
-{
-    File = "netlinepointstack_52x60_h.png" ;
-};
-Bitmap BMP_NET_FILL_HC
-{
-    File = "netfill_52x60_h.png" ;
-};
-Bitmap BMP_NET_FILL_STACK_HC
-{
-    File = "netstackfill_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_PYRAMIDQ_3D_1_HC
-{
-    File = "pyramindhori_52x60_h.png" ;
-};
-Bitmap BMP_PYRAMIDQ_3D_2_HC
-{
-    File = "pyramindhoristack_52x60_h.png" ;
-};
-Bitmap BMP_PYRAMIDQ_3D_3_HC
-{
-    File = "pyramindhoripercent_52x60_h.png" ;
-};
-Bitmap BMP_PYRAMIDQ_3D_4_HC
-{
-    File = "pyramindhorideep_52x60_h.png" ;
-};
-Bitmap BMP_PYRAMID_3D_1_HC
-{
-    File = "pyramind_52x60_h.png" ;
-};
-Bitmap BMP_PYRAMID_3D_2_HC
-{
-    File = "pyramindstack_52x60_h.png" ;
-};
-Bitmap BMP_PYRAMID_3D_3_HC
-{
-    File = "pyramindpercent_52x60_h.png" ;
-};
-Bitmap BMP_PYRAMID_3D_4_HC
-{
-    File = "pyraminddeep_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_ROEHRE_3D_1_HC
-{
-    File = "cylinderhori_52x60_h.png" ;
-};
-Bitmap BMP_ROEHRE_3D_2_HC
-{
-    File = "cylinderhoristack_52x60_h.png" ;
-};
-Bitmap BMP_ROEHRE_3D_3_HC
-{
-    File = "cylinderhoriprocent_52x60_h.png" ;
-};
-Bitmap BMP_ROEHRE_3D_4_HC
-{
-    File = "cylinderhorideep_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_SAEULE_3D_1_HC
-{
-    File = "cylinder_52x60_h.png" ;
-};
-Bitmap BMP_SAEULE_3D_2_HC
-{
-    File = "cylinderstack_52x60_h.png" ;
-};
-Bitmap BMP_SAEULE_3D_3_HC
-{
-    File = "cylinderpercent_52x60_h.png" ;
-};
-Bitmap BMP_SAEULE_3D_4_HC
-{
-    File = "cylinderdeep_52x60_h.png" ;
-};
-//---------------------
-Bitmap BMP_STOCK_1_HC
-{
-    File = "stock_52x60_h.png" ;
-};
-Bitmap BMP_STOCK_2_HC
-{
-    File = "stockblock_52x60_h.png" ;
-};
-Bitmap BMP_STOCK_3_HC
-{
-    File = "stockcolumns_52x60_h.png" ;
-};
-Bitmap BMP_STOCK_4_HC
-{
-    File = "stockcolumnsattach_52x60_h.png" ;
-};
-//---------------------
-//---------------------
-//---------------------
-//error indicator
-Image BMP_INDICATE_BOTH_VERTI_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "errorbothverti_30_h.png" ;
-    };
-};
-Image BMP_INDICATE_DOWN_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "errordown_30_h.png" ;
-    };
-};
-Image BMP_INDICATE_UP_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "errorup_30_h.png" ;
-    };
-};
-Image BMP_INDICATE_BOTH_HORI_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "errorbothhori_30_h.png" ;
-    };
-};
-Image BMP_INDICATE_RIGHT_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "errorright_30_h.png" ;
-    };
-};
-Image BMP_INDICATE_LEFT_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "errorleft_30_h.png" ;
-    };
-};
-
-//---------------------
-//regression curves
-Image BMP_REGRESSION_NONE_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "regno_h.bmp" ;
-    };
-};
-Image BMP_REGRESSION_LINEAR_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "reglin_h.bmp" ;
-    };
-};
-Image BMP_REGRESSION_LOG_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "reglog_h.bmp" ;
-    };
-};
-Image BMP_REGRESSION_EXP_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "regexp_h.bmp" ;
-    };
-};
-Image BMP_REGRESSION_POWER_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "regpow_h.bmp" ;
-    };
-};
-//---------------------
-Image IMG_SELECTRANGE_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "selectrange.png";
-    };
-    MaskColor = SC_HC_MASKCOLOR;
-};
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 60c2d87ec784..0c7a1f10fb06 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -34,7 +34,6 @@
 #include "HelpIds.hrc"
 #include "Strings.hrc"
 #include "Bitmaps.hrc"
-#include "Bitmaps_HC.hrc"
 #include "macros.hxx"
 #include "ChartModelHelper.hxx"
 #include "DiagramHelper.hxx"
@@ -61,16 +60,6 @@ namespace chart
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 
-// macro for selecting a normal or high contrast bitmap the stack variable
-// bIsHighContrast must exist and reflect the correct state
-#define SELECT_BITMAP(name) Bitmap( SchResId( bIsHighContrast ? name ## _HC : name ))
-#define SELECT_IMAGE(name) Image( SchResId( bIsHighContrast ? name ## _HC : name ))
-
-/*
-        ( C2U( "com.sun.star.chart2.template.Surface" ),                        CHSTYLE_3D_SURFACE)
-        ( C2U( "com.sun.star.chart2.template.Addin" ),                          CHSTYLE_ADDIN)
-*/
-
 ChartTypeParameter::ChartTypeParameter()
                     : nSubTypeIndex( 1 )
                     , bXAxisWithValues( false )
@@ -146,7 +135,7 @@ ChartTypeDialogController::ChartTypeDialogController()
 ChartTypeDialogController::~ChartTypeDialogController()
 {
 }
-Image ChartTypeDialogController::getImage( bool /*bIsHighContrast*/ )
+Image ChartTypeDialogController::getImage()
 {
     return Image();
 }
@@ -372,7 +361,7 @@ bool ChartTypeDialogController::commitToModel( const ChartTypeParameter& rParame
     }
     return false;
 }
-void ChartTypeDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool /*bIsHighContrast*/, const ChartTypeParameter& /*rParameter*/ )
+void ChartTypeDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ )
 {
     rSubTypeList.Clear();
 }
@@ -454,9 +443,9 @@ String ColumnChartDialogController::getName()
 {
     return String( SchResId( STR_TYPE_COLUMN ));
 }
-Image ColumnChartDialogController::getImage( bool bIsHighContrast )
+Image ColumnChartDialogController::getImage()
 {
-    return SELECT_IMAGE( IMG_TYPE_COLUMN );
+    return Image( SchResId( IMG_TYPE_COLUMN ));
 }
 const tTemplateServiceChartTypeParameterMap& ColumnChartDialogController::getTemplateMap() const
 {
@@ -472,7 +461,7 @@ const tTemplateServiceChartTypeParameterMap& ColumnChartDialogController::getTem
         ;
     return m_aTemplateMap;
 }
-void ColumnChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter )
+void ColumnChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
 {
     rSubTypeList.Clear();
 
@@ -481,36 +470,36 @@ void ColumnChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool
         switch(rParameter.nGeometry3D)
         {
             case DataPointGeometry3D::CYLINDER:
-                rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_SAEULE_3D_1 ) );
-                rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_SAEULE_3D_2 ) );
-                rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_SAEULE_3D_3 ) );
-                rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_SAEULE_3D_4 ) );
+                rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_SAEULE_3D_1 )));
+                rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_SAEULE_3D_2 )));
+                rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_SAEULE_3D_3 )));
+                rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_SAEULE_3D_4 )));
             break;
             case DataPointGeometry3D::CONE:
-                rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_KEGEL_3D_1 ) );
-                rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_KEGEL_3D_2 ) );
-                rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_KEGEL_3D_3 ) );
-                rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_KEGEL_3D_4 ) );
+                rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_KEGEL_3D_1 )));
+                rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_KEGEL_3D_2 )));
+                rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_KEGEL_3D_3 )));
+                rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_KEGEL_3D_4 )));
             break;
             case DataPointGeometry3D::PYRAMID:
-                rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_PYRAMID_3D_1 ) );
-                rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_PYRAMID_3D_2 ) );
-                rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_PYRAMID_3D_3 ) );
-                rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_PYRAMID_3D_4 ) );
+                rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_PYRAMID_3D_1 )));
+                rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_PYRAMID_3D_2 )));
+                rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_PYRAMID_3D_3 )));
+                rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_PYRAMID_3D_4 )));
             break;
             default: //DataPointGeometry3D::CUBOID:
-                rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_COLUMNS_3D_1 ) );
-                rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_COLUMNS_3D_2 ) );
-                rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_COLUMNS_3D_3 ) );
-                rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_COLUMNS_3D ) );
+                rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_COLUMNS_3D_1 )));
+                rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_COLUMNS_3D_2 )));
+                rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_COLUMNS_3D_3 )));
+                rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_COLUMNS_3D )));
             break;
         }
     }
     else
     {
-        rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_COLUMNS_2D_1 ) );
-        rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_COLUMNS_2D_2 ) );
-        rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_COLUMNS_2D_3 ) );
+        rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_COLUMNS_2D_1 )));
+        rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_COLUMNS_2D_2 )));
+        rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_COLUMNS_2D_3 )));
     }
 
     rSubTypeList.SetItemText( 1, String( SchResId( STR_NORMAL )) );
@@ -531,9 +520,9 @@ String BarChartDialogController::getName()
 {
     return String( SchResId( STR_TYPE_BAR ));
 }
-Image BarChartDialogController::getImage( bool bIsHighContrast )
+Image BarChartDialogController::getImage()
 {
-    return SELECT_IMAGE( IMG_TYPE_BAR );
+    return Image( SchResId( IMG_TYPE_BAR ));
 }
 const tTemplateServiceChartTypeParameterMap& BarChartDialogController::getTemplateMap() const
 {
@@ -549,7 +538,7 @@ const tTemplateServiceChartTypeParameterMap& BarChartDialogController::getTempla
         ;
     return m_aTemplateMap;
 }
-void BarChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter )
+void BarChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
 {
     rSubTypeList.Clear();
 
@@ -558,36 +547,36 @@ void BarChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIs
         switch(rParameter.nGeometry3D)
         {
             case DataPointGeometry3D::CYLINDER:
-                rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_ROEHRE_3D_1 ) );
-                rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_ROEHRE_3D_2 ) );
-                rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_ROEHRE_3D_3 ) );
-                rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_ROEHRE_3D_4 ) );
+                rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_ROEHRE_3D_1 )));
+                rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_ROEHRE_3D_2 )));
+                rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_ROEHRE_3D_3 )));
+                rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_ROEHRE_3D_4 )));
             break;
             case DataPointGeometry3D::CONE:
-                rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_KEGELQ_3D_1 ) );
-                rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_KEGELQ_3D_2 ) );
-                rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_KEGELQ_3D_3 ) );
-                rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_KEGELQ_3D_4 ) );
+                rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_KEGELQ_3D_1 )));
+                rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_KEGELQ_3D_2 )));
+                rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_KEGELQ_3D_3 )));
+                rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_KEGELQ_3D_4 )));
             break;
             case DataPointGeometry3D::PYRAMID:
-                rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_PYRAMIDQ_3D_1 ) );
-                rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_PYRAMIDQ_3D_2 ) );
-                rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_PYRAMIDQ_3D_3 ) );
-                rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_PYRAMIDQ_3D_4 ) );
+                rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_PYRAMIDQ_3D_1 )));
+                rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_PYRAMIDQ_3D_2 )));
+                rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_PYRAMIDQ_3D_3 )));
+                rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_PYRAMIDQ_3D_4 )));
             break;
             default: //DataPointGeometry3D::CUBOID:
-                rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_BARS_3D_1 ) );
-                rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_BARS_3D_2 ) );
-                rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_BARS_3D_3 ) );
-                rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_BARS_3D ) );
+                rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_BARS_3D_1 )));
+                rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_BARS_3D_2 )));
+                rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_BARS_3D_3 )));
+                rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_BARS_3D )));
             break;
         }
     }
     else
     {
-        rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_BARS_2D_1 ) );
-        rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_BARS_2D_2 ) );
-        rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_BARS_2D_3 ) );
+        rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_BARS_2D_1 )));
+        rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_BARS_2D_2 )));
+        rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_BARS_2D_3 )));
     }
     rSubTypeList.SetItemText( 1, String( SchResId( STR_NORMAL )) );
     rSubTypeList.SetItemText( 2, String( SchResId( STR_STACKED )) );
@@ -607,9 +596,9 @@ String PieChartDialogController::getName()
 {
     return String( SchResId( STR_TYPE_PIE ));
 }
-Image PieChartDialogController::getImage( bool bIsHighContrast )
+Image PieChartDialogController::getImage()
 {
-    return SELECT_IMAGE( IMG_TYPE_PIE );
+    return Image( SchResId( IMG_TYPE_PIE ));
 }
 const tTemplateServiceChartTypeParameterMap& PieChartDialogController::getTemplateMap() const
 {
@@ -626,29 +615,30 @@ const tTemplateServiceChartTypeParameterMap& PieChartDialogController::getTempla
     ;
     return m_aTemplateMap;
 }
-void PieChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter )
+void PieChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
 {
     rSubTypeList.Clear();
 
     if( rParameter.b3DLook )
     {
-        rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_CIRCLES_3D ) );
-        rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_CIRCLES_3D_EXPLODED ) );
-        rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_DONUT_3D ) );
-        rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_DONUT_3D_EXPLODED ) );
+        rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_CIRCLES_3D )));
+        rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_CIRCLES_3D_EXPLODED )));
+        rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_DONUT_3D )));
+        rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_DONUT_3D_EXPLODED )));
     }
     else
     {
-        rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_CIRCLES_2D ) );
-        rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_CIRCLES_2D_EXPLODED ) );
-        rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_DONUT_2D ) );
-        rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_DONUT_2D_EXPLODED ) );
+        rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_CIRCLES_2D )));
+        rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_CIRCLES_2D_EXPLODED )));
+        rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_DONUT_2D )));
+        rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_DONUT_2D_EXPLODED )));
     }
-    rSubTypeList.SetItemText( 1, String( SchResId( STR_NORMAL )) );
-    rSubTypeList.SetItemText( 2, String( SchResId( STR_PIE_EXPLODED )) );
-    rSubTypeList.SetItemText( 3, String( SchResId( STR_DONUT )) );
-    rSubTypeList.SetItemText( 4, String( SchResId( STR_DONUT_EXPLODED )) );
+    rSubTypeList.SetItemText( 1, String( SchResId( STR_NORMAL         ) ) );
+    rSubTypeList.SetItemText( 2, String( SchResId( STR_PIE_EXPLODED   ) ) );
+    rSubTypeList.SetItemText( 3, String( SchResId( STR_DONUT          ) ) );
+    rSubTypeList.SetItemText( 4, String( SchResId( STR_DONUT_EXPLODED ) ) );
 }
+
 bool PieChartDialogController::shouldShow_3DLookControl() const
 {
     return true;
@@ -669,9 +659,9 @@ String LineChartDialogController::getName()
 {
     return String( SchResId( STR_TYPE_LINE ));
 }
-Image LineChartDialogController::getImage( bool bIsHighContrast )
+Image LineChartDialogController::getImage()
 {
-    return SELECT_IMAGE( IMG_TYPE_LINE );
+    return Image( SchResId( IMG_TYPE_LINE ));
 }
 const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTemplateMap() const
 {
@@ -688,7 +678,6 @@ const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTempl
     ( C2U( "com.sun.star.chart2.template.StackedLine" ),                ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y,false,true) )
     ( C2U( "com.sun.star.chart2.template.PercentStackedLine" ),         ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT,false,true) )
     //-------------------------------------------------------
-    //( C2U( "com.sun.star.chart2.template.ThreeDLine" ),                 ChartTypeParameter(4,false,true,GlobalStackMode_NONE,false,true) )
     ( C2U( "com.sun.star.chart2.template.StackedThreeDLine" ),          ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Y,false,true) )
     ( C2U( "com.sun.star.chart2.template.PercentStackedThreeDLine" ),   ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Y_PERCENT,false,true) )
     ( C2U( "com.sun.star.chart2.template.ThreeDLineDeep" ),             ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z,false,true) )
@@ -696,7 +685,7 @@ const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTempl
     ;
     return m_aTemplateMap;
 }
-void LineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter )
+void LineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
 {
     rSubTypeList.Clear();
 
@@ -705,34 +694,34 @@ void LineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bI
         //direct lines
         if( GlobalStackMode_NONE == rParameter.eStackMode || GlobalStackMode_STACK_Z == rParameter.eStackMode )
         {
-            rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_POINTS_XCATEGORY ) );
-            rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_LINE_P_XCATEGORY ) );
-            rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_LINE_O_XCATEGORY ) );
-            rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_LINE3D_XCATEGORY ) );
+            rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_XCATEGORY )));
+            rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_XCATEGORY )));
+            rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_XCATEGORY )));
+            rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_XCATEGORY )));
         }
         else
         {
-            rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_POINTS_STACKED ) );
-            rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_LINE_P_STACKED ) );
-            rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_LINE_O_STACKED ) );
-            rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_LINE3D_STACKED ) );
+            rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_STACKED )));
+            rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_STACKED )));
+            rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_STACKED )));
+            rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_STACKED )));
         }
     }
     else //CurveStyle_LINES
     {
         if( GlobalStackMode_NONE == rParameter.eStackMode || GlobalStackMode_STACK_Z == rParameter.eStackMode )
         {
-            rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_POINTS_XCATEGORY ) );
-            rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_LINE_P_XCATEGORY_SMOOTH ) );
-            rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_LINE_O_XCATEGORY_SMOOTH ) );
-            rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_LINE3D_XCATEGORY_SMOOTH ) );
+            rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_XCATEGORY )));
+            rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_XCATEGORY_SMOOTH )));
+            rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_XCATEGORY_SMOOTH )));
+            rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_XCATEGORY_SMOOTH )));
         }
         else
         {
-            rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_POINTS_STACKED ) );
-            rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_LINE_P_STACKED_SMOOTH ) );
-            rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_LINE_O_STACKED_SMOOTH ) );
-            rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_LINE3D_STACKED_SMOOTH ) );
+            rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_STACKED )));
+            rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_STACKED_SMOOTH )));
+            rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_STACKED_SMOOTH )));
+            rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_STACKED_SMOOTH )));
         }
     }
 
@@ -802,9 +791,9 @@ String XYChartDialogController::getName()
 {
     return String( SchResId( STR_TYPE_XY ));
 }
-Image XYChartDialogController::getImage( bool bIsHighContrast )
+Image XYChartDialogController::getImage()
 {
-    return SELECT_IMAGE( IMG_TYPE_XY );
+    return Image( SchResId( IMG_TYPE_XY ));
 }
 const tTemplateServiceChartTypeParameterMap& XYChartDialogController::getTemplateMap() const
 {
@@ -818,24 +807,24 @@ const tTemplateServiceChartTypeParameterMap& XYChartDialogController::getTemplat
     ;
     return m_aTemplateMap;
 }
-void XYChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter )
+void XYChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
 {
     rSubTypeList.Clear();
 
     if( CurveStyle_LINES==rParameter.eCurveStyle )
     {
-        rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_POINTS_XVALUES ) );
-        rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_LINE_P_XVALUES ) );
-        rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_LINE_O_XVALUES ) );
-        rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_LINE3D_XVALUES ) );
+        rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_XVALUES )));
+        rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_XVALUES )));
+        rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_XVALUES )));
+        rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_XVALUES )));
     }
     else //CurveStyle_LINES
     {
         //smooth lines
-        rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_POINTS_XVALUES ) );
-        rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_LINE_P_XVALUES_SMOOTH ) );
-        rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_LINE_O_XVALUES_SMOOTH ) );
-        rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_LINE3D_XVALUES_SMOOTH ) );
+        rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_POINTS_XVALUES )));
+        rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_LINE_P_XVALUES_SMOOTH )));
+        rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_LINE_O_XVALUES_SMOOTH )));
+        rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_LINE3D_XVALUES_SMOOTH )));
     }
 
     rSubTypeList.SetItemText( 1, String( SchResId( STR_POINTS_ONLY )) );
@@ -889,9 +878,9 @@ String AreaChartDialogController::getName()
 {
     return String( SchResId( STR_TYPE_AREA ));
 }
-Image AreaChartDialogController::getImage( bool bIsHighContrast )
+Image AreaChartDialogController::getImage()
 {
-    return SELECT_IMAGE( IMG_TYPE_AREA );
+    return Image( SchResId( IMG_TYPE_AREA ));
 }
 bool AreaChartDialogController::shouldShow_3DLookControl() const
 {
@@ -910,21 +899,21 @@ const tTemplateServiceChartTypeParameterMap& AreaChartDialogController::getTempl
     ;
     return m_aTemplateMap;
 }
-void AreaChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter )
+void AreaChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
 {
     rSubTypeList.Clear();
 
     if( rParameter.b3DLook )
     {
-        rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_AREAS_3D ) );
-        rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_AREAS_3D_1 ) );
-        rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_AREAS_3D_2 ) );
+        rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_AREAS_3D )));
+        rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_AREAS_3D_1 )));
+        rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_AREAS_3D_2 )));
     }
     else
     {
-        rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_AREAS_2D_1 ) );
-        rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_AREAS_2D ) );
-        rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_AREAS_2D_3 ) );
+        rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_AREAS_2D_1 )));
+        rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_AREAS_2D )));
+        rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_AREAS_2D_3 )));
     }
 
     rSubTypeList.SetItemText( 1, String( SchResId( rParameter.b3DLook ? STR_DEEP : STR_NORMAL )) );
@@ -972,9 +961,9 @@ String NetChartDialogController::getName()
 {
     return String( SchResId( STR_TYPE_NET ));
 }
-Image NetChartDialogController::getImage( bool bIsHighContrast )
+Image NetChartDialogController::getImage()
 {
-    return SELECT_IMAGE( IMG_TYPE_NET );
+    return Image( SchResId( IMG_TYPE_NET ));
 }
 bool NetChartDialogController::shouldShow_StackingControl() const
 {
@@ -1003,23 +992,23 @@ const tTemplateServiceChartTypeParameterMap& NetChartDialogController::getTempla
     ;
     return m_aTemplateMap;
 }
-void NetChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter )
+void NetChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
 {
     rSubTypeList.Clear();
 
     if( GlobalStackMode_NONE == rParameter.eStackMode )
     {
-        rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_NET_SYMB ) );
-        rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_NET_LINESYMB ) );
-        rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_NET ) );
-        rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_NET_FILL ) );
+        rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_NET_SYMB )));
+        rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_NET_LINESYMB )));
+        rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_NET )));
+        rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_NET_FILL )));
     }
     else
     {
-        rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_NET_SYMB_STACK ) );
-        rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_NET_LINESYMB_STACK ) );
-        rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_NET_STACK ) );
-        rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_NET_FILL_STACK ) );
+        rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_NET_SYMB_STACK )));
+        rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_NET_LINESYMB_STACK )));
+        rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_NET_STACK )));
+        rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_NET_FILL_STACK )));
     }
 
     rSubTypeList.SetItemText( 1, String( SchResId( STR_POINTS_ONLY )) );
@@ -1058,17 +1047,20 @@ StockChartDialogController::StockChartDialogController()
 {
     bSupports3D = false;
 }
+
 StockChartDialogController::~StockChartDialogController()
 {
 }
+
 String StockChartDialogController::getName()
 {
     return String( SchResId( STR_TYPE_STOCK ));
 }
-Image StockChartDialogController::getImage( bool bIsHighContrast )
+Image StockChartDialogController::getImage()
 {
-    return SELECT_IMAGE( IMG_TYPE_STOCK );
+    return Image( SchResId( IMG_TYPE_STOCK ));
 }
+
 const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemplateMap() const
 {
     static tTemplateServiceChartTypeParameterMap m_aTemplateMap =
@@ -1080,13 +1072,13 @@ const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemp
     ;
     return m_aTemplateMap;
 }
-void StockChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& /*rParameter*/ )
+void StockChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ )
 {
     rSubTypeList.Clear();
-    rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_STOCK_1 ) );
-    rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_STOCK_2 ) );
-    rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_STOCK_3 ) );
-    rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_STOCK_4 ) );
+    rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_STOCK_1 )));
+    rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_STOCK_2 )));
+    rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_STOCK_3 )));
+    rSubTypeList.InsertItem( 4, Bitmap( SchResId( BMP_STOCK_4 )));
 
     rSubTypeList.SetItemText( 1, String( SchResId( STR_STOCK_1 )) );
     rSubTypeList.SetItemText( 2, String( SchResId( STR_STOCK_2 )) );
@@ -1105,6 +1097,7 @@ CombiColumnLineChartDialogController::CombiColumnLineChartDialogController()
 {
     bSupports3D = false;
 }
+
 CombiColumnLineChartDialogController::~CombiColumnLineChartDialogController()
 {
     if(m_pFT_NumberOfLines)
@@ -1112,14 +1105,17 @@ CombiColumnLineChartDialogController::~CombiColumnLineChartDialogController()
     if(m_pMF_NumberOfLines)
         delete m_pMF_NumberOfLines;
 }
+
 String CombiColumnLineChartDialogController::getName()
 {
     return String( SchResId( STR_TYPE_COMBI_COLUMN_LINE ));
 }
-Image CombiColumnLineChartDialogController::getImage( bool bIsHighContrast )
+
+Image CombiColumnLineChartDialogController::getImage( )
 {
-    return SELECT_IMAGE( IMG_TYPE_COLUMN_LINE );
+    return Image( SchResId( IMG_TYPE_COLUMN_LINE ) );
 }
+
 const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogController::getTemplateMap() const
 {
     static tTemplateServiceChartTypeParameterMap m_aTemplateMap =
@@ -1129,11 +1125,11 @@ const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogControlle
     ;
     return m_aTemplateMap;
 }
-void CombiColumnLineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& /*rParameter*/ )
+void CombiColumnLineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ )
 {
     rSubTypeList.Clear();
-    rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_COLUMN_LINE ) );
-    rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_COLUMN_LINE_STACKED ) );
+    rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_COLUMN_LINE )));
+    rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_COLUMN_LINE_STACKED )));
 
     rSubTypeList.SetItemText( 1, String( SchResId( STR_LINE_COLUMN )) );
     rSubTypeList.SetItemText( 2, String( SchResId( STR_LINE_STACKEDCOLUMN )) );
@@ -1256,9 +1252,9 @@ String BubbleChartDialogController::getName()
 {
     return String( SchResId( STR_TYPE_BUBBLE ));
 }
-Image BubbleChartDialogController::getImage( bool bIsHighContrast )
+Image BubbleChartDialogController::getImage()
 {
-    return SELECT_IMAGE( IMG_TYPE_BUBBLE );
+    return Image( SchResId( IMG_TYPE_BUBBLE ));
 }
 const tTemplateServiceChartTypeParameterMap& BubbleChartDialogController::getTemplateMap() const
 {
@@ -1267,10 +1263,10 @@ const tTemplateServiceChartTypeParameterMap& BubbleChartDialogController::getTem
         ( C2U( "com.sun.star.chart2.template.Bubble" ),          ChartTypeParameter(1,true) ) ;
     return m_aTemplateMap;
 }
-void BubbleChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& /*rParameter*/ )
+void BubbleChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ )
 {
     rSubTypeList.Clear();
-    rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_BUBBLE_1 ) );
+    rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_BUBBLE_1 )));
 
     rSubTypeList.SetItemText( 1, String( SchResId( STR_BUBBLE_1 )) );
 }
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
index fea77c753291..787189149fb7 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
@@ -103,9 +103,9 @@ public:
     virtual ~ChartTypeDialogController();
 
     virtual String  getName()=0;
-    virtual Image   getImage( bool bIsHighContrast );
+    virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const = 0;
-    virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+    virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
 
     virtual bool    shouldShow_XAxisTypeControl() const;
     virtual bool    shouldShow_3DLookControl() const;
@@ -159,9 +159,9 @@ public:
     virtual ~ColumnChartDialogController();
 
     virtual String  getName();
-    virtual Image   getImage( bool bIsHighContrast );
+    virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
-    virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+    virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
 };
 
 class BarChartDialogController : public ColumnOrBarChartDialogController_Base
@@ -171,9 +171,9 @@ public:
     virtual ~BarChartDialogController();
 
     virtual String  getName();
-    virtual Image   getImage( bool bIsHighContrast );
+    virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
-    virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+    virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
 };
 
 class PieChartDialogController : public ChartTypeDialogController
@@ -183,9 +183,9 @@ public:
     virtual ~PieChartDialogController();
 
     virtual String  getName();
-    virtual Image   getImage( bool bIsHighContrast );
+    virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
-    virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+    virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
     virtual void adjustParameterToSubType( ChartTypeParameter& rParameter );
 
     virtual bool    shouldShow_3DLookControl() const;
@@ -198,9 +198,9 @@ public:
     virtual ~LineChartDialogController();
 
     virtual String  getName();
-    virtual Image   getImage( bool bIsHighContrast );
+    virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
-    virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+    virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
     virtual void adjustParameterToSubType( ChartTypeParameter& rParameter );
     virtual void adjustParameterToMainType( ChartTypeParameter& rParameter );
 
@@ -216,9 +216,9 @@ public:
     virtual ~XYChartDialogController();
 
     virtual String  getName();
-    virtual Image   getImage( bool bIsHighContrast );
+    virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
-    virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+    virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
     virtual void adjustParameterToSubType( ChartTypeParameter& rParameter );
 
     virtual bool    shouldShow_SplineControl() const;
@@ -232,9 +232,9 @@ public:
     virtual ~AreaChartDialogController();
 
     virtual String  getName();
-    virtual Image   getImage( bool bIsHighContrast );
+    virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
-    virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+    virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
     virtual void adjustParameterToSubType( ChartTypeParameter& rParameter );
     virtual void adjustParameterToMainType( ChartTypeParameter& rParameter );
 
@@ -248,9 +248,9 @@ public:
     virtual ~NetChartDialogController();
 
     virtual String  getName();
-    virtual Image   getImage( bool bIsHighContrast );
+    virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
-    virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+    virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
     virtual void adjustParameterToSubType( ChartTypeParameter& rParameter );
 
     virtual bool    shouldShow_StackingControl() const;
@@ -263,9 +263,9 @@ public:
     virtual ~StockChartDialogController();
 
     virtual String  getName();
-    virtual Image   getImage( bool bIsHighContrast );
+    virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
-    virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+    virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
     virtual void adjustParameterToSubType( ChartTypeParameter& rParameter );
 };
 
@@ -276,9 +276,9 @@ public:
     virtual ~CombiColumnLineChartDialogController();
 
     virtual String  getName();
-    virtual Image   getImage( bool bIsHighContrast );
+    virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
-    virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+    virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
     virtual void adjustParameterToSubType( ChartTypeParameter& rParameter );
 
     virtual void    showExtraControls( Window* pParent, const Point& rPosition, const Size& rSize );
@@ -304,9 +304,9 @@ public:
     virtual ~BubbleChartDialogController();
 
     virtual String  getName();
-    virtual Image   getImage( bool bIsHighContrast );
+    virtual Image   getImage();
     virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
-    virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+    virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
     virtual void adjustParameterToSubType( ChartTypeParameter& rParameter );
 };
 
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 4c098c9e759e..0e333b0e7627 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -52,7 +52,6 @@
 #include "servicenames_charttypes.hxx"
 #include "ResId.hxx"
 #include "Bitmaps.hrc"
-#include "Bitmaps_HC.hrc"
 #include "HelpIds.hrc"
 
 #include <vcl/fixed.hxx>
@@ -69,8 +68,6 @@
 #include <algorithm>
 #include <functional>
 
-#define SELECT_IMAGE(name,hc) Image( SchResId( hc ? name ## _HC : name ))
-
 /*  BROWSER_COLUMNSELECTION :  single cells may be selected rather than only
                                entire rows
     BROWSER_(H|V)LINES :       show horizontal or vertical grid-lines
@@ -91,7 +88,6 @@
 // with shift up/down, and entering non-editable cells would be problematic,
 // e.g.  the first cell, or when being in read-only mode
 
-
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
@@ -143,6 +139,7 @@ SeriesHeaderEdit::SeriesHeaderEdit( Window * pParent ) :
         m_nStartColumn( 0 ),
         m_bShowWarningBox( false )
 {}
+
 SeriesHeaderEdit::~SeriesHeaderEdit()
 {}
 
@@ -179,8 +176,7 @@ public:
     void SetPos( const Point & rPos );
     void SetWidth( sal_Int32 nWidth );
     void SetChartType( const Reference< chart2::XChartType > & xChartType,
-                       bool bSwapXAndYAxis,
-                       bool bIsHighContrast );
+                       bool bSwapXAndYAxis );
     void SetSeriesName( const String & rName );
     void SetRange( sal_Int32 nStartCol, sal_Int32 nEndCol );
 
@@ -216,11 +212,10 @@ private:
     DECL_LINK( SeriesNameChanged, void * );
     DECL_LINK( SeriesNameEdited, void * );
 
-    /// @param bHC </TRUE> for hight-contrast image
     static Image GetChartTypeImage(
         const Reference< chart2::XChartType > & xChartType,
-        bool bSwapXAndYAxis,
-        bool bHC );
+        bool bSwapXAndYAxis
+        );
 
     sal_Int32 m_nStartCol, m_nEndCol;
     sal_Int32 m_nWidth;
@@ -311,7 +306,6 @@ void SeriesHeader::SetWidth( sal_Int32 nWidth )
     SetPos( m_aPos );
 }
 
-
 void SeriesHeader::SetPixelPosX( sal_Int32 nPos )
 {
     Point aPos( m_pDevice->LogicToPixel( m_aPos, MAP_APPFONT ));
@@ -326,10 +320,10 @@ void SeriesHeader::SetPixelWidth( sal_Int32 nWidth )
 
 void SeriesHeader::SetChartType(
     const Reference< chart2::XChartType > & xChartType,
-    bool bSwapXAndYAxis,
-    bool bIsHighContrast )
+    bool bSwapXAndYAxis
+)
 {
-    m_spSymbol->SetImage( GetChartTypeImage( xChartType, bSwapXAndYAxis, bIsHighContrast ));
+    m_spSymbol->SetImage( GetChartTypeImage( xChartType, bSwapXAndYAxis ) );
 }
 
 void SeriesHeader::SetSeriesName( const String & rName )
@@ -388,11 +382,10 @@ bool SeriesHeader::HasFocus() const
     return m_spSeriesName->HasFocus();
 }
 
-// static
 Image SeriesHeader::GetChartTypeImage(
     const Reference< chart2::XChartType > & xChartType,
-    bool bSwapXAndYAxis,
-    bool bHC )
+    bool bSwapXAndYAxis
+)
 {
     Image aResult;
     if( !xChartType.is())
@@ -401,40 +394,40 @@ Image SeriesHeader::GetChartTypeImage(
 
     if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_AREA ))
     {
-        aResult = SELECT_IMAGE( IMG_TYPE_AREA, bHC );
+        aResult = Image( SchResId( IMG_TYPE_AREA ) );
     }
     else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_COLUMN ))
     {
         if( bSwapXAndYAxis )
-            aResult = SELECT_IMAGE( IMG_TYPE_BAR, bHC );
+            aResult = Image( SchResId( IMG_TYPE_BAR ) );
         else
-            aResult = SELECT_IMAGE( IMG_TYPE_COLUMN, bHC );
+            aResult = Image( SchResId( IMG_TYPE_COLUMN ) );
     }
     else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_LINE ))
     {
-        aResult = SELECT_IMAGE( IMG_TYPE_LINE, bHC );
+        aResult = Image( SchResId( IMG_TYPE_LINE ) );
     }
     else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_SCATTER ))
     {
-        aResult = SELECT_IMAGE( IMG_TYPE_XY, bHC );
+        aResult = Image( SchResId( IMG_TYPE_XY ) );
     }
     else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_PIE ))
     {
-        aResult = SELECT_IMAGE( IMG_TYPE_PIE, bHC );
+        aResult = Image( SchResId( IMG_TYPE_PIE ) );
     }
     else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_NET )
           || aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET ) )
     {
-        aResult = SELECT_IMAGE( IMG_TYPE_NET, bHC );
+        aResult = Image( SchResId( IMG_TYPE_NET ) );
     }
     else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK ))
     {
         // @todo: correct image for candle-stick type
-        aResult = SELECT_IMAGE( IMG_TYPE_STOCK, bHC );
+        aResult = Image( SchResId( IMG_TYPE_STOCK ) );
     }
     else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE ))
     {
-        aResult = SELECT_IMAGE( IMG_TYPE_BUBBLE, bHC );
+        aResult = Image( SchResId( IMG_TYPE_BUBBLE ) );
     }
 
     return aResult;
@@ -627,7 +620,6 @@ void DataBrowser::RenewTable()
     const DataBrowserModel::tDataHeaderVector& aHeaders( m_apDataBrowserModel->getDataHeaders());
     Link aFocusLink( LINK( this, DataBrowser, SeriesHeaderGotFocus ));
     Link aSeriesHeaderChangedLink( LINK( this, DataBrowser, SeriesHeaderChanged ));
-    bool bIsHighContrast = pWin ? (pWin->GetSettings().GetStyleSettings().GetHighContrastMode()) : false;
 
     for( DataBrowserModel::tDataHeaderVector::const_iterator aIt( aHeaders.begin());
          aIt != aHeaders.end(); ++aIt )
@@ -639,7 +631,7 @@ void DataBrowser::RenewTable()
         if( xSeriesProp.is() &&
             ( xSeriesProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Color"))) >>= nColor ))
             spHeader->SetColor( Color( nColor ));
-        spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis, bIsHighContrast );
+        spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis );
         spHeader->SetSeriesName(
             String( DataSeriesHelper::getDataSeriesLabel(
                         aIt->m_xDataSeries,
@@ -1020,19 +1012,6 @@ void DataBrowser::PaintCell(
     if( ! bEnabled )
         rDev.SetTextColor( GetSettings().GetStyleSettings().GetDisableColor() );
 
-    // TEST
-//     if( nColumnId == 1 )
-//         // categories
-//         rDev.SetFillColor( Color( 0xff, 0xff, 0xff ));
-//     else if( nColumnId == 2 )
-//         // x-values
-//         rDev.SetFillColor( Color( 0xf0, 0xf0, 0xff ));
-//     else
-//         // y-values
-//         rDev.SetFillColor( Color( 0xff, 0xff, 0xf0 ));
-
-//     rDev.DrawRect( rRect );
-
     // draw the text
     rDev.DrawText( aPos, aText );
 
@@ -1245,7 +1224,6 @@ void DataBrowser::RenewSeriesHeaders()
     DataBrowserModel::tDataHeaderVector aHeaders( m_apDataBrowserModel->getDataHeaders());
     Link aFocusLink( LINK( this, DataBrowser, SeriesHeaderGotFocus ));
     Link aSeriesHeaderChangedLink( LINK( this, DataBrowser, SeriesHeaderChanged ));
-    bool bIsHighContrast = pWin ? (pWin->GetSettings().GetStyleSettings().GetHighContrastMode()) : false;
 
     for( DataBrowserModel::tDataHeaderVector::const_iterator aIt( aHeaders.begin());
          aIt != aHeaders.end(); ++aIt )
@@ -1256,7 +1234,7 @@ void DataBrowser::RenewSeriesHeaders()
         if( xSeriesProp.is() &&
             ( xSeriesProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Color"))) >>= nColor ))
             spHeader->SetColor( Color( nColor ));
-        spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis, bIsHighContrast );
+        spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis );
         spHeader->SetSeriesName(
             String( DataSeriesHelper::getDataSeriesLabel(
                         aIt->m_xDataSeries,
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 1a84ec0be18a..a5d56b81e4f6 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -317,7 +317,6 @@ rtl::OUString ObjectNameProvider::getName( ObjectType eObjectType, bool bPlural
             }
                 break;
         case OBJECTTYPE_DATA_STOCK_RANGE:
-                //aRet=String(SchResId());
                 break;
         case OBJECTTYPE_DATA_STOCK_LOSS:
                 aRet=String(SchResId(STR_OBJECT_STOCK_LOSS));
@@ -659,11 +658,6 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID,
                         RegressionCurveHelper::initializeCurveCalculator( xCalculator, xSeries, xChartModel );
 
                         sal_Unicode aDecimalSep( '.' );
-                        // replace average value
-//                             SvtSysLocale aSysLocale;
-//                             OUString aSep( aSysLocale.GetLocaleData().getNumDecimalSep());
-//                             if( aSep.getLength() == 1 )
-//                                 aDecimalSep = aSep.toChar();
 
                         sal_Int32 nIndex = -1;
                         OUString aWildcard( C2U("%AVERAGE_VALUE") );
@@ -783,7 +777,6 @@ rtl::OUString ObjectNameProvider::getNameForCID(
             return getGridName( rObjectCID, xModel );
         case OBJECTTYPE_DATA_SERIES:
             return lcl_getFullSeriesName( rObjectCID, xModel );
-        //case OBJECTTYPE_LEGEND_ENTRY:
         case OBJECTTYPE_DATA_POINT:
         case OBJECTTYPE_DATA_LABELS:
         case OBJECTTYPE_DATA_LABEL:
diff --git a/chart2/source/controller/dialogs/RangeSelectionButton.cxx b/chart2/source/controller/dialogs/RangeSelectionButton.cxx
index 30b1a0a33fb5..cea3192bacab 100644
--- a/chart2/source/controller/dialogs/RangeSelectionButton.cxx
+++ b/chart2/source/controller/dialogs/RangeSelectionButton.cxx
@@ -31,7 +31,6 @@
 
 #include "RangeSelectionButton.hxx"
 #include "Bitmaps.hrc"
-#include "Bitmaps_HC.hrc"
 #include "Strings.hrc"
 #include "ResId.hxx"
 
@@ -43,8 +42,7 @@ namespace chart
 RangeSelectionButton::RangeSelectionButton( Window *pParent, const ResId& rResId ) :
     ImageButton( pParent, rResId )
 {
-    SetModeImage( Image( SchResId(IMG_SELECTRANGE)    ), BMP_COLOR_NORMAL );
-    SetModeImage( Image( SchResId(IMG_SELECTRANGE_HC) ), BMP_COLOR_HIGHCONTRAST );
+    SetModeImage( Image( SchResId( IMG_SELECTRANGE) ) );
     this->SetQuickHelpText(SchResId(STR_TIP_SELECT_RANGE));
 }
 
diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc b/chart2/source/controller/dialogs/ResourceIds.hrc
index 2ab544c77ab1..b2f79fc09148 100644
--- a/chart2/source/controller/dialogs/ResourceIds.hrc
+++ b/chart2/source/controller/dialogs/ResourceIds.hrc
@@ -30,10 +30,7 @@
 
 //-----------------------------------------------------------------------------
 //for strings see Strings.hrc
-
-//-----------------------------------------------------------------------------
-//for Bimaps see Bimaps.hrc and Bimaps_HC.hrc
-
+//for Bimaps see Bimaps.hrc
 //-----------------------------------------------------------------------------
 //Dialog Ids:
 #define DLG_DIAGRAM_TYPE    743
@@ -56,7 +53,6 @@
 #define TP_LEGEND_POS   900
 #define TP_DATA_DESCR   901
 #define TP_ALIGNMENT    902
-//#define TP_SYMBOL     906
 #define TP_LAYOUT       907
 #define TP_OPTIONS      908
 #define TP_POLAROPTIONS 909
diff --git a/chart2/source/controller/dialogs/Strings.src b/chart2/source/controller/dialogs/Strings.src
index 4b4cec65426e..cf189b1b82bf 100644
--- a/chart2/source/controller/dialogs/Strings.src
+++ b/chart2/source/controller/dialogs/Strings.src
@@ -121,11 +121,6 @@ String STR_PAGE_POSITIONING
     Text [ en-US ] = "Positioning" ;
 };
 
-// String STR_PAGE_STATISTICS
-// {
-//  Text [ en-US ] = "Statistics" ;
-// };
-
 String STR_PAGE_TRENDLINE_TYPE
 {
     Text[ en-US ] = "Type";
diff --git a/chart2/source/controller/dialogs/TabPages.hrc b/chart2/source/controller/dialogs/TabPages.hrc
index 1f445083738f..697f700d4de9 100644
--- a/chart2/source/controller/dialogs/TabPages.hrc
+++ b/chart2/source/controller/dialogs/TabPages.hrc
@@ -31,21 +31,11 @@
 
 //see attrib.hrc in old chart
 
-//#define TP_LEGEND_POS 900
 #define GRP_LEGEND                  1
 #define FL_LEGEND_TEXTORIENT        2
 #define FT_LEGEND_TEXTDIR           3
 #define LB_LEGEND_TEXTDIR           4
 
-//#define TP_DATA_DESCR 901
-
-//#define TP_ALIGNMENT 902
-////#define FL_ORDER 2
-////#define RBT_SIDEBYSIDE 1
-////#define RBT_UPDOWN 2
-////#define RBT_DOWNUP 3
-////#define RBT_AUTOORDER 4
-
 #define FL_TEXTBREAK                3
 #define CBX_TEXTBREAK               2
 #define CBX_TEXTOVERLAP             4
@@ -62,32 +52,10 @@
 #define FT_TEXTDIR              6038
 #define LB_TEXTDIR              6039
 
-/*
-//Symbol-Tabpage (zum Teil sehr Aehnlich der SVX_AREA_TABPAGE) (obsolete)
-//#define TP_SYMBOL                 906
-#define RBT_COLOR                   1
-#define RBT_GRADIENT                2
-#define RBT_HATCHING                3
-#define RBT_BITMAP                  4
-#define RBT_INVISIBLE               5
-#define LB_COLOR                    1
-#define LB_GRADIENT                 2
-#define LB_HATCHING                 3
-#define LB_BITMAP                   4
-
-#define GRP_FILL                    1
-#define CTL_BITMAP_PREVIEW          6
-*/
-
 //------------
 //from old chart tplabel.hrc
 
-//#define TP_AXIS_LABEL                 920
-
 #define CB_AXIS_LABEL_SCHOW_DESCR       1
-
-//#define FL_AXIS_LABEL_FORMATTING      2
-
 #define FL_AXIS_LABEL_ORIENTATION       3
 #define CT_AXIS_LABEL_DIAL              4
 #define PB_AXIS_LABEL_TEXTSTACKED       5
@@ -107,12 +75,8 @@
 #define RB_AXIS_LABEL_AUTOORDER         17
 
 #define FL_SEPARATOR                    18
-
 #define FT_AXIS_TEXTDIR                 19
 #define LB_AXIS_TEXTDIR                 20
-
-//#define TP_SCALE        903
-
 #define FL_SCALE            1
 
 #define TXT_MIN             1
@@ -135,9 +99,6 @@
 #define EDT_ORIGIN          4
 
 #define MT_STEPHELP         10
-
-//#define TP_AXIS_POSITIONS   904
-
 #define FL_AXIS_LINE        1
 #define FL_LABELS           2
 #define FL_TICKS            3
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index 8225feba7a16..f2073c4e52e8 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -69,8 +69,7 @@ DataEditor::DataEditor(
         m_aTbxData( this, SchResId( TBX_DATA )),
         m_xChartDoc( xChartDoc ),
         m_xContext( xContext ),
-        m_aToolboxImageList( SchResId( IL_DIAGRAM_DATA )),
-        m_aToolboxImageListHighContrast( SchResId( IL_HC_DIAGRAM_DATA ))
+        m_aToolboxImageList( SchResId( IL_DIAGRAM_DATA ))
 {
     FreeResource();
 
@@ -116,8 +115,6 @@ DataEditor::DataEditor(
     SetOutputSizePixel( aWinSize );
     AdaptBrowseBoxSize();
 
-//     ImplAdjustHeaderControls( false /* bRefreshFromModel */ );
-
     // allow travelling to toolbar with F6
     notifySystemWindow( this, & m_aTbxData, ::comphelper::mem_fun( & TaskPaneList::AddWindow ));
 }
@@ -216,83 +213,11 @@ IMPL_LINK( DataEditor, CellModified, void*, EMPTYARG )
     return 0;
 }
 
-// IMPL_LINK( DataEditor, BrowserColumnResized, void*, EMPTYARG )
-// {
-//     ImplAdjustHeaderControls( false /* bRefreshFromModel */ );
-//     return 0;
-// }
-
-// IMPL_LINK( DataEditor, BrowserContentScrolled, void*, EMPTYARG )
-// {
-//     ImplAdjustHeaderControls( false /* bRefreshFromModel */ );
-//     return 0;
-// }
-
 void DataEditor::UpdateData()
 {
     m_apBrwData->SetDataFromModel( m_xChartDoc, m_xContext );
 }
 
-// react on the change of the underlying document by displaying the new data
-// void DataEditor::SFX_NOTIFY(
-//     SfxBroadcaster& rBC,
-//     const TypeId& rBCType,
-//     const SfxHint& rHint,
-//     const TypeId& rHintType )
-// {
-//     if( rHint.Type() == TYPE(SfxSimpleHint) )
-//     {
-//         // note: if dynamic_cast works this should be changed
-//         switch( static_cast< const SfxSimpleHint & >( rHint ).GetId())
-//         {
-//             case SFX_HINT_DOCCHANGED:
-//                 UpdateData();
-//                 break;
-
-//             case SFX_HINT_DYING:
-//                 break;
-//         }
-//     }
-// }
-
-// {
-//     BOOL bRet = TRUE;
-
-//     // confirm changes currently made and not saved
-//     m_apBrwData->EndEditing();
-
-//     if( m_apBrwData->IsDirty() )
-//     {
-//         QueryBox aSafetyQuery( this, WB_YES_NO_CANCEL | WB_DEF_YES,
-//                                String( SchResId( STR_DIAGRAM_DATA_SAFETY_QUERY )));
-//         long nQueryResult = aSafetyQuery.Execute();
-
-//         bRet = ( nQueryResult != RET_CANCEL );
-
-//         if( nQueryResult == RET_YES )
-//         {
-//             // save changes
-//             ApplyChangesToModel();
-//         }
-//     }
-
-//     if( bRet )
-//     {
-//         // close child window
-//         SfxBoolItem aItem( SID_DIAGRAM_DATA, FALSE );
-//         if( m_pBindings )
-//         {
-//             SfxDispatcher* pDisp = m_pBindings->GetDispatcher();
-//             if( pDisp )
-//                 pDisp->Execute( SID_DIAGRAM_DATA, SFX_CALLMODE_ASYNCHRON, &aItem, 0L);
-//             else
-//                 DBG_ERROR( "Couldn't dispatch command" );
-//         }
-//     }
-
-//     return ( bRet? SfxFloatingWindow::Close(): FALSE );
-// }
-
 void DataEditor::AdaptBrowseBoxSize()
 {
     Size aSize( PixelToLogic( GetResizeOutputSizePixel(), MAP_APPFONT ));
@@ -308,7 +233,6 @@ void DataEditor::Resize()
 {
     Dialog::Resize();
     AdaptBrowseBoxSize();
-//     ImplAdjustHeaderControls( false /* bRefreshFromModel */ );
 }
 
 BOOL DataEditor::Close()
@@ -327,13 +251,7 @@ bool DataEditor::ApplyChangesToModel()
 // sets the correct toolbar icons depending on the current mode (e.g. high contrast)
 void DataEditor::ApplyImageList()
 {
-    bool bIsHighContrast = ( true && GetSettings().GetStyleSettings().GetHighContrastMode() );
-
-    ImageList& rImgLst = bIsHighContrast
-        ? m_aToolboxImageListHighContrast
-        : m_aToolboxImageList;
-
-    m_aTbxData.SetImageList( rImgLst );
+    m_aTbxData.SetImageList( m_aToolboxImageList );
 }
 
 // add/remove a window (the toolbar) to/from the global list, so that F6
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.hrc b/chart2/source/controller/dialogs/dlg_DataEditor.hrc
index d2675c5bb29e..340fc814a439 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.hrc
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.hrc
@@ -42,6 +42,5 @@
 #define TBI_DATA_SWAP_ROW 6
 #define TBI_DATA_INSERT_TEXT_COL 7
 
-// image lists (normal and high-contrast) for toolbox
+// image lists for toolbox
 #define IL_DIAGRAM_DATA     1
-#define IL_HC_DIAGRAM_DATA  2
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.src b/chart2/source/controller/dialogs/dlg_DataEditor.src
index dadd1ac3098d..4f4d33ebb832 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.src
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.src
@@ -31,8 +31,6 @@
 
 // Mask Color for standard images
 #define IMAGE_BUTTON_STD_MASK_COLOR Color { Red = 0xff00; Green = 0x0000; Blue = 0xff00; }
-// Mask Color for high-contrast images
-#define IMAGE_BUTTON_HC_MASK_COLOR  IMAGE_BUTTON_STD_MASK_COLOR
 
 #define ADDITIONAL_SPACE_ABOVE_TABLE 17
 
@@ -138,11 +136,4 @@ ModalDialog DLG_DIAGRAM_DATA
         MaskColor = IMAGE_BUTTON_STD_MASK_COLOR;
         IMAGE_ID_LIST;
     };
-
-    ImageList IL_HC_DIAGRAM_DATA
-    {
-        Prefix = "dataeditor_icon_h";
-        MaskColor = IMAGE_BUTTON_HC_MASK_COLOR;
-        IMAGE_ID_LIST;
-    };
 };
diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index cef864201c49..0ca0a2abc497 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -113,7 +113,6 @@ SchAxisDlg::SchAxisDlg( Window* pWindow
             aCbSecondaryZ.Hide();
 
             Size aSize( GetSizePixel() );
-            //aSize.Height() -= aCbSecondaryZ.GetSizePixel().Height();
             aSize.Height() -= ( aCbSecondaryZ.GetPosPixel().Y() - aCbSecondaryY.GetPosPixel().Y() );
             SetSizePixel(aSize);
         }
diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src
index 11eec47d0996..91d995b5231c 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src
@@ -36,7 +36,6 @@ ModalDialog DLG_AXIS_OR_GRID
     HelpID = SID_INSERT_AXIS ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
-    //Size = MAP_APPFONT ( 160 , 99 ) ;
     Size = MAP_APPFONT ( 160 , 113 ) ;
     Moveable = TRUE ;
 
diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.src b/chart2/source/controller/dialogs/dlg_InsertErrorBars.src
index 08230207b007..f7a61cf1e283 100644
--- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.src
+++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.src
@@ -33,7 +33,6 @@
 
 ModalDialog DLG_DATA_YERRORBAR
 {
-//  HelpID = SID_INSERT_STATISTICS ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 300 , 156 ) ;
diff --git a/chart2/source/controller/dialogs/dlg_InsertTrendline.src b/chart2/source/controller/dialogs/dlg_InsertTrendline.src
index 54c490d4a2d1..24704f0d0c7c 100644
--- a/chart2/source/controller/dialogs/dlg_InsertTrendline.src
+++ b/chart2/source/controller/dialogs/dlg_InsertTrendline.src
@@ -45,4 +45,3 @@ ModalDialog DLG_DATA_TRENDLINE
     BUTTONS_OK_CANCEL_HELP_STACKED( DLG_DATA_TRENDLINE_RES_WIDTH + DLG_DATA_TRENDLINE_ADD_TO_RES )
     RESOURCE_TRENDLINE( DLG_DATA_TRENDLINE_RES_WIDTH, 22 )
 };
-
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 88f8b43401ce..a7f30165c0c2 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -324,7 +324,6 @@ uno::Reference< chart2::XChartDocument > ObjectPropertiesDialogParameter::getDoc
     return m_xChartDocument;
 }
 
-//const USHORT nNoArrowDlg          = 1100;
 const USHORT nNoArrowNoShadowDlg    = 1101;
 
 //-------------------------------------------------------------------
@@ -529,7 +528,6 @@ void SchAttribTabDlg::PageCreated(USHORT nId, SfxTabPage &rPage)
                     aSet.Put(SvxGraphicItem(SID_GRAPHIC,*m_pAutoSymbolGraphic));
             }
             rPage.PageCreated(aSet);
-            //rPage.ActivatePage(*GetInputSetImpl()); //what for?
             break;
 
         case RID_SVXPAGE_AREA:
@@ -540,7 +538,6 @@ void SchAttribTabDlg::PageCreated(USHORT nId, SfxTabPage &rPage)
             aSet.Put(SfxUInt16Item(SID_PAGE_TYPE,nPageType));
             aSet.Put(SfxUInt16Item(SID_DLG_TYPE,nDlgType));
             rPage.PageCreated(aSet);
-            //rPage.ActivatePage(*GetInputSetImpl()); //what for?
             break;
 
         case RID_SVXPAGE_TRANSPARENCE:
diff --git a/chart2/source/controller/dialogs/dlg_View3D.src b/chart2/source/controller/dialogs/dlg_View3D.src
index 5b1802ecfb3d..0f1fb639d326 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.src
+++ b/chart2/source/controller/dialogs/dlg_View3D.src
@@ -45,4 +45,3 @@ TabDialog DLG_3D_VIEW
     };
     BUTTONS_OK_CANCEL_HELP_STACKED(VIEW3D_PAGE_HEIGHT+3)
 };
-
diff --git a/chart2/source/controller/dialogs/makefile.mk b/chart2/source/controller/dialogs/makefile.mk
index d22f5c83b081..cc6927476e64 100644
--- a/chart2/source/controller/dialogs/makefile.mk
+++ b/chart2/source/controller/dialogs/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@ GEN_HID_OTHER=TRUE
 
 # i26518 the gcc-3.0.4 requires to enhance the template-depth
 # this seems to be a compiler issue, so we recommend not to use 3.0.x anymore
-.IF "$(COM)"=="GCC" 
+.IF "$(COM)"=="GCC"
     CFLAGS+=-ftemplate-depth-128
 .ENDIF
 
@@ -108,10 +108,6 @@ SLOFILES=   	\
 
 # --- Resources ---------------------------------------------------------------
 
-#               Bitmaps.src
-#               Bitmaps_HC.src
-
-
 SRC1FILES=		\
                 res_TextSeparator.src \
                 res_BarGeometry.src \
@@ -141,7 +137,6 @@ SRC1FILES=		\
                 Strings_AdditionalControls.src \
                 Strings.src \
                 Bitmaps.src \
-                Bitmaps_HC.src \
                 dlg_DataEditor.src \
                 dlg_DataSource.src \
                 dlg_View3D.src \
@@ -159,7 +154,7 @@ SRC1FILES=		\
 SRS1NAME=$(TARGET)
 
 # --- Targets -----------------------------------------------------------------
-LOCALIZE_ME=res_DataLabel_tmpl.hrc res_LegendPosition_tmpl.hrc res_Trendline_tmpl.hrc res_ErrorBar_tmpl.hrc res_Titlesx_tmpl.hrc res_SecondaryAxisCheckBoxes_tmpl.hrc 
+LOCALIZE_ME=res_DataLabel_tmpl.hrc res_LegendPosition_tmpl.hrc res_Trendline_tmpl.hrc res_ErrorBar_tmpl.hrc res_Titlesx_tmpl.hrc res_SecondaryAxisCheckBoxes_tmpl.hrc
 .INCLUDE: target.mk
 $(SRS)$/chcdialogs.srs: $(INCCOM)$/res_DataLabel.hrc
 $(SRS)$/chcdialogs.srs: $(INCCOM)$/res_LegendPosition.hrc
@@ -172,7 +167,6 @@ $(SRS)$/chcdialogs.srs: $(INCCOM)$/res_SecondaryAxisCheckBoxes.hrc
 
 $(SRS)$/chcdialogs.srs: \
         Bitmaps.hrc \
-        Bitmaps_HC.hrc \
         CommonResources.hrc \
         ResourceIds.hrc \
         ..$/..$/inc$/Strings.hrc \
@@ -197,9 +191,5 @@ $(SRS)$/chcdialogs.srs: \
         tp_RangeChooser.hrc \
         tp_Wizard_TitlesAndObjects.hrc
 
-#        res_DataLabel.hrc \
-#        res_LegendPosition.hrc \
-#        res_Statistic.hrc \
-
 #$(SRS)$/chcdialogs.srs: $(SOLARINCDIR)$/svx$/globlmn.hrc
 
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 9a24eb06aa44..6f3531818ef4 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -34,7 +34,6 @@
 #include "ResId.hxx"
 #include "Strings.hrc"
 #include "Bitmaps.hrc"
-#include "Bitmaps_HC.hrc"
 #include "RangeSelectionHelper.hxx"
 // for RANGE_SELECTION_INVALID_RANGE_BACKGROUND_COLOR
 #include "TabPageNotifiable.hxx"
@@ -92,10 +91,6 @@ namespace chart
 {
 //.............................................................................
 
-// macro for selecting a normal or high contrast bitmap the stack variable
-// bIsHighContrast must exist and reflect the correct state
-#define SELECT_IMAGE(name) Image( SchResId( bIsHighContrast ? name ## _HC : name ))
-
 enum StatIndicator
 {
     INDICATE_BOTH,
@@ -697,24 +692,17 @@ BOOL ErrorBarResources::FillItemSet(SfxItemSet& rOutAttrs) const
 
 void ErrorBarResources::FillValueSets()
 {
-    bool bIsHighContrast = ( true && m_aRbConst.GetSettings().GetStyleSettings().GetHighContrastMode() );
-
-    // do not scale images, show then centered
-//     m_aFiPositive.SetStyle( (m_aFiPositive.GetStyle() & (~WB_SCALE)) | WB_CENTER );
-//     m_aFiNegative.SetStyle( (m_aFiNegative.GetStyle() & (~WB_SCALE)) | WB_CENTER );
-//     m_aFiBoth.SetStyle( (m_aFiBoth.GetStyle() & (~WB_SCALE)) | WB_CENTER );
-
     if( m_eErrorBarType == ERROR_BAR_Y )
     {
-        m_aFiNegative.SetImage( SELECT_IMAGE( BMP_INDICATE_DOWN ));
-        m_aFiPositive.SetImage( SELECT_IMAGE( BMP_INDICATE_UP ));
-        m_aFiBoth.SetImage( SELECT_IMAGE( BMP_INDICATE_BOTH_VERTI ));
+        m_aFiNegative.SetImage( Image( SchResId( BMP_INDICATE_DOWN       ) ) );
+        m_aFiPositive.SetImage( Image( SchResId( BMP_INDICATE_UP         ) ) );
+        m_aFiBoth.SetImage(     Image( SchResId( BMP_INDICATE_BOTH_VERTI ) ) );
     }
     else if( m_eErrorBarType == ERROR_BAR_X )
     {
-        m_aFiNegative.SetImage( SELECT_IMAGE( BMP_INDICATE_LEFT ));
-        m_aFiPositive.SetImage( SELECT_IMAGE( BMP_INDICATE_RIGHT ));
-        m_aFiBoth.SetImage( SELECT_IMAGE( BMP_INDICATE_BOTH_HORI ));
+        m_aFiNegative.SetImage( Image( SchResId( BMP_INDICATE_LEFT      ) ) );
+        m_aFiPositive.SetImage( Image( SchResId( BMP_INDICATE_RIGHT     ) ) );
+        m_aFiBoth.SetImage(     Image( SchResId( BMP_INDICATE_BOTH_HORI ) ) );
     }
 }
 
@@ -728,8 +716,6 @@ void ErrorBarResources::listeningFinished(
     // rNewRange becomes invalid after removing the listener
     ::rtl::OUString aRange( rNewRange );
 
-//     m_rDialogModel.startControllerLockTimer();
-
     // stop listening
     m_apRangeSelectionHelper->stopRangeListening();
 
diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx
index 46435152be8c..dadfd998940a 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -35,16 +35,11 @@
 #include "ResId.hxx"
 #include "Strings.hrc"
 #include "Bitmaps.hrc"
-#include "Bitmaps_HC.hrc"
 #include "chartview/ChartSfxItemIds.hxx"
 
 #include <vector>
 #include <algorithm>
 
-// macro for selecting a normal or high contrast bitmap the stack variable
-// bIsHighContrast must exist and reflect the correct state
-#define SELECT_IMAGE(name) Image( SchResId( bIsHighContrast ? name ## _HC : name ))
-
 namespace
 {
 template< class T >
@@ -86,21 +81,22 @@ enum StatTrendLine
 TrendlineResources::TrendlineResources( Window * pParent, const SfxItemSet& rInAttrs, bool bNoneAvailable ) :
         m_aFLType( pParent, SchResId( FL_TYPE )),
 
-        m_aRBNone( pParent, SchResId( RB_NONE )),
-        m_aRBLinear( pParent, SchResId( RB_LINEAR )),
+        m_aRBNone(        pParent, SchResId( RB_NONE        )),
+        m_aRBLinear(      pParent, SchResId( RB_LINEAR      )),
         m_aRBLogarithmic( pParent, SchResId( RB_LOGARITHMIC )),
         m_aRBExponential( pParent, SchResId( RB_EXPONENTIAL )),
-        m_aRBPower( pParent, SchResId( RB_POWER )),
+        m_aRBPower(       pParent, SchResId( RB_POWER       )),
 
-        m_aFINone( pParent, SchResId( FI_NONE )),
-        m_aFILinear( pParent, SchResId( FI_LINEAR )),
+        m_aFINone(        pParent, SchResId( FI_NONE        )),
+        m_aFILinear(      pParent, SchResId( FI_LINEAR      )),
         m_aFILogarithmic( pParent, SchResId( FI_LOGARITHMIC )),
         m_aFIExponential( pParent, SchResId( FI_EXPONENTIAL )),
-        m_aFIPower( pParent, SchResId( FI_POWER )),
+        m_aFIPower(       pParent, SchResId( FI_POWER       )),
 
-        m_aFLEquation( pParent, SchResId( FL_EQUATION )),
-        m_aCBShowEquation( pParent, SchResId( CB_SHOW_EQUATION )),
+        m_aFLEquation(             pParent, SchResId( FL_EQUATION               )),
+        m_aCBShowEquation(         pParent, SchResId( CB_SHOW_EQUATION          )),
         m_aCBShowCorrelationCoeff( pParent, SchResId( CB_SHOW_CORRELATION_COEFF )),
+
         m_eTrendLineType( CHREGRESS_NONE ),
         m_bNoneAvailable( bNoneAvailable ),
         m_bTrendLineUnique( true )
@@ -260,14 +256,12 @@ BOOL TrendlineResources::FillItemSet(SfxItemSet& rOutAttrs) const
 
 void TrendlineResources::FillValueSets()
 {
-    bool bIsHighContrast = ( true && m_aFLType.GetSettings().GetStyleSettings().GetHighContrastMode() );
-
     if( m_bNoneAvailable )
-        m_aFINone.SetImage( SELECT_IMAGE( BMP_REGRESSION_NONE ));
-    m_aFILinear.SetImage( SELECT_IMAGE( BMP_REGRESSION_LINEAR ));
-    m_aFILogarithmic.SetImage( SELECT_IMAGE( BMP_REGRESSION_LOG ));
-    m_aFIExponential.SetImage( SELECT_IMAGE( BMP_REGRESSION_EXP ));
-    m_aFIPower.SetImage( SELECT_IMAGE( BMP_REGRESSION_POWER ));
+        m_aFINone.SetImage(    Image( SchResId( BMP_REGRESSION_NONE   ) ) );
+    m_aFILinear.SetImage(      Image( SchResId( BMP_REGRESSION_LINEAR ) ) );
+    m_aFILogarithmic.SetImage( Image( SchResId( BMP_REGRESSION_LOG    ) ) );
+    m_aFIExponential.SetImage( Image( SchResId( BMP_REGRESSION_EXP    ) ) );
+    m_aFIPower.SetImage(       Image( SchResId( BMP_REGRESSION_POWER  ) ) );
 }
 
 void TrendlineResources::UpdateControlStates()
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src
index df202410109d..e9b4887da21a 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src
@@ -95,4 +95,3 @@ TabPage TP_3D_SCENEAPPEARANCE
         Text [ en-US ] = "~Rounded edges" ;
     };
 };
-
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index 35ae7ee8a1b3..b280f0476357 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -48,7 +48,6 @@ namespace chart
 //.............................................................................
 
 using namespace ::com::sun::star;
-//using namespace ::com::sun::star::chart2;
 
 namespace
 {
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src
index 329eb25e0e51..85b306523960 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src
@@ -144,4 +144,3 @@ TabPage TP_3D_SCENEGEOMETRY
         CustomUnitText = "%" ;
     };
 };
-
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 3ccbe844bc97..dcf70f841db7 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -34,7 +34,6 @@
 #include "ResId.hxx"
 #include "Strings.hrc"
 #include "Bitmaps.hrc"
-#include "Bitmaps_HC.hrc"
 #include "CommonConverters.hxx"
 #include "NoWarningThisInCTOR.hxx"
 
@@ -64,8 +63,7 @@ LightButton::LightButton( Window* pParent, const ResId& rResId, sal_Int32 nLight
             : ImageButton( pParent, rResId )
             , m_bLightOn(false)
 {
-    SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF)   ), BMP_COLOR_NORMAL );
-    SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF_H) ), BMP_COLOR_HIGHCONTRAST );
+    SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF)   ) );
 
     String aTipHelpStr( SchResId(STR_TIP_LIGHTSOURCE_X) );
     rtl::OUString aTipHelp( aTipHelpStr  );
@@ -78,9 +76,11 @@ LightButton::LightButton( Window* pParent, const ResId& rResId, sal_Int32 nLight
     }
     this->SetQuickHelpText( String( aTipHelp ) );
 }
+
 LightButton::~LightButton()
 {
 }
+
 void LightButton::switchLightOn(bool bOn)
 {
     if( m_bLightOn==bOn )
@@ -88,15 +88,14 @@ void LightButton::switchLightOn(bool bOn)
     m_bLightOn = bOn;
     if(m_bLightOn)
     {
-        SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_ON)   ), BMP_COLOR_NORMAL );
-        SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_ON_H) ), BMP_COLOR_HIGHCONTRAST );
+        SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_ON) ) );
     }
     else
     {
-        SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF)   ), BMP_COLOR_NORMAL );
-        SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF_H) ), BMP_COLOR_HIGHCONTRAST );
+        SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF) ) );
     }
 }
+
 bool LightButton::isLightOn() const
 {
     return m_bLightOn;
@@ -107,11 +106,10 @@ bool LightButton::isLightOn() const
 ColorButton::ColorButton( Window* pParent, const ResId& rResId )
             : ImageButton( pParent, rResId )
 {
-    SetModeImage( Image( SVX_RES(RID_SVXIMAGE_COLORDLG)   ), BMP_COLOR_NORMAL );
-    SetModeImage( Image( SVX_RES(RID_SVXIMAGE_COLORDLG_H) ), BMP_COLOR_HIGHCONTRAST );
-
+    SetModeImage( Image( SVX_RES(RID_SVXIMAGE_COLORDLG) ) );
     this->SetQuickHelpText( String( SchResId(STR_TIP_CHOOSECOLOR) ) );
 }
+
 ColorButton::~ColorButton()
 {
 }
@@ -148,12 +146,14 @@ LightSourceInfo::LightSourceInfo()
     aLightSource.aDirection = drawing::Direction3D(1,1,1);
     aLightSource.bIsEnabled = sal_False;
 }
+
 void LightSourceInfo::initButtonFromSource()
 {
     if(!pButton)
         return;
-    pButton->SetModeImage( Image( SVX_RES( aLightSource.bIsEnabled ? RID_SVXIMAGE_LIGHT_ON : RID_SVXIMAGE_LIGHT_OFF )   ), BMP_COLOR_NORMAL );
-    pButton->SetModeImage( Image( SVX_RES( aLightSource.bIsEnabled ? RID_SVXIMAGE_LIGHT_ON_H : RID_SVXIMAGE_LIGHT_OFF_H ) ), BMP_COLOR_HIGHCONTRAST );
+    pButton->SetModeImage( Image( SVX_RES(
+        aLightSource.bIsEnabled ? RID_SVXIMAGE_LIGHT_ON : RID_SVXIMAGE_LIGHT_OFF
+    ) ) );
 }
 
 //-----------------------------------------------------------------------------
@@ -353,8 +353,6 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( Window* pWin
 
     ClickLightSourceButtonHdl(&m_aBtn_Light2);
 
-    //m_aDelyedModelChangeTimer.SetTimeout( 4*EDIT_UPDATEDATA_TIMEOUT );
-
     m_aModelChangeListener.startListening( uno::Reference< util::XModifyBroadcaster >(m_xSceneProperties, uno::UNO_QUERY) );
 }
 
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
index 987812bea7c2..61fb13ecedd3 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
@@ -35,7 +35,6 @@
 #include <vcl/button.hxx>
 #include <vcl/field.hxx>
 #include <vcl/lstbox.hxx>
-//class SvNumberFormatter;
 
 //.............................................................................
 namespace chart
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index d82879a93080..728e7e6cf443 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -56,15 +56,6 @@ namespace chart
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 
-// macro for selecting a normal or high contrast bitmap the stack variable
-// bIsHighContrast must exist and reflect the correct state
-#define SELECT_BITMAP(name) Bitmap( SchResId( bIsHighContrast ? name ## _HC : name ))
-#define SELECT_IMAGE(name) Image( SchResId( bIsHighContrast ? name ## _HC : name ))
-
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
-
 namespace
 {
     long lcl_getDistance()
@@ -850,8 +841,6 @@ ChartTypeTabPage::ChartTypeTabPage( Window* pParent
     m_aSubTypeList.SetColCount(4);
     m_aSubTypeList.SetLineCount(1);
 
-    bool bIsHighContrast = ( true && GetSettings().GetStyleSettings().GetHighContrastMode() );
-
     bool bDisableComplexChartTypes = false;
     uno::Reference< beans::XPropertySet > xProps( m_xChartModel, uno::UNO_QUERY );
     if ( xProps.is() )
@@ -887,7 +876,7 @@ ChartTypeTabPage::ChartTypeTabPage( Window* pParent
     const ::std::vector< ChartTypeDialogController* >::const_iterator aEnd  = m_aChartTypeDialogControllerList.end();
     for( ; aIter != aEnd; aIter++ )
     {
-        m_aMainTypeList.InsertEntry( (*aIter)->getName(), (*aIter)->getImage( bIsHighContrast ) );
+        m_aMainTypeList.InsertEntry( (*aIter)->getName(), (*aIter)->getImage() );
         (*aIter)->setChangeListener( this );
     }
 
@@ -1085,10 +1074,7 @@ void ChartTypeTabPage::fillAllControls( const ChartTypeParameter& rParameter, bo
 {
     m_nChangingCalls++;
     if( m_pCurrentMainType && bAlsoResetSubTypeList )
-    {
-        bool bIsHighContrast = ( true && GetSettings().GetStyleSettings().GetHighContrastMode() );
-        m_pCurrentMainType->fillSubTypeList( m_aSubTypeList, bIsHighContrast, rParameter );
-    }
+        m_pCurrentMainType->fillSubTypeList( m_aSubTypeList, rParameter );
     m_aSubTypeList.SelectItem( static_cast<USHORT>( rParameter.nSubTypeIndex) );
     m_pAxisTypeResourceGroup->fillControls( rParameter );
     m_pDim3DLookResourceGroup->fillControls( rParameter );
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.src b/chart2/source/controller/dialogs/tp_ErrorBars.src
index 03748914255f..aede04751907 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.src
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.src
@@ -31,7 +31,6 @@
 TabPage TP_YERRORBAR
 {
     Hide = TRUE ;
-//  HelpID = HID_SCH_STAT ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
     RESOURCE_ERRORBARS( 260 - 12, 0 )
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.src b/chart2/source/controller/dialogs/tp_LegendPosition.src
index d910a5143293..54b1065259df 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.src
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.src
@@ -34,12 +34,14 @@ TabPage TP_LEGEND_POS
     HelpID = HID_SCH_LEGEND_POS ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
+
     FixedLine GRP_LEGEND
     {
         Pos = MAP_APPFONT ( 6 , 3  ) ;
         Size = MAP_APPFONT ( 248 , 8 ) ;
         Text [ en-US ] = "Position" ;
     };
+
     RESOURCE_LEGENDPOSITION( 12, 14 )
 
     FixedLine FL_LEGEND_TEXTORIENT
@@ -48,12 +50,14 @@ TabPage TP_LEGEND_POS
         Size = MAP_APPFONT ( 248 , 8 ) ;
         Text [ en-US ] = "Text orientation" ;
     };
+
     FixedText FT_LEGEND_TEXTDIR
     {
         Pos = MAP_APPFONT ( 12 , 14 + RESOURCE_LEGENDPOSITION_HEIGHT + 19 ) ;
         Size = MAP_APPFONT ( 64 , 8 ) ;
         Text [ en-US ] = "Te~xt direction" ;
     };
+
     ListBox LB_LEGEND_TEXTDIR
     {
         Pos = MAP_APPFONT ( 78 , 14 + RESOURCE_LEGENDPOSITION_HEIGHT + 17 ) ;
diff --git a/chart2/source/controller/dialogs/tp_Location.src b/chart2/source/controller/dialogs/tp_Location.src
index 6a921103f2e4..6b8c75a25b29 100644
--- a/chart2/source/controller/dialogs/tp_Location.src
+++ b/chart2/source/controller/dialogs/tp_Location.src
@@ -53,16 +53,16 @@ TabPage TP_LOCATION
     {
         Pos = MAP_APPFONT ( WIZ_POSX1 , WIZ_POSY1 ) ;
         Size = MAP_APPFONT ( WIZ_FIXEDLINE_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT ) ;
-
         Text [ en-US ] = "Place chart" ;
     };
+
     FixedText FT_TABLE
     {
         Pos = MAP_APPFONT ( WIZ_POSX2 , WIZ_POSY2 ) ;
         Size = MAP_APPFONT ( TEXT_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT ) ;
-
         Text [ en-US ] = "~Insert in sheet" ;
     };
+
     ListBox LB_TABLE
     {
         Border = TRUE ;
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.src b/chart2/source/controller/dialogs/tp_PointGeometry.src
index 54c591c0865d..39e1e1e9e21d 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.src
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.src
@@ -30,7 +30,6 @@
 TabPage TP_LAYOUT
 {
     Hide = TRUE ;
-//    HelpID = HID_LAYOUT ;
     SVLook = TRUE ;
     Size   = MAP_APPFONT ( 260 , 185 ) ;
 };
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 4235a7bfcdc4..083dd668a1ff 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -186,9 +186,7 @@ void RangeChooserTabPage::initControlsFromModel()
     m_nChangingControlCalls++;
 
     if(m_pTemplateProvider)
-    {
         m_xCurrentChartTypeTemplate = m_pTemplateProvider->getCurrentTemplate();
-    }
 
     bool bUseColumns = ! m_aRB_Rows.IsChecked();
     bool bFirstCellAsLabel = bUseColumns ? m_aCB_FirstRowAsLabel.IsChecked() : m_aCB_FirstColumnAsLabel.IsChecked();
diff --git a/chart2/source/controller/dialogs/tp_Scale.src b/chart2/source/controller/dialogs/tp_Scale.src
index b53adeaa512f..e0705fc32083 100644
--- a/chart2/source/controller/dialogs/tp_Scale.src
+++ b/chart2/source/controller/dialogs/tp_Scale.src
@@ -56,12 +56,14 @@ TabPage TP_SCALE
         Size = MAP_APPFONT ( 248 , 8 ) ;
         Text [ en-US ] = "Scale" ;
     };
+
     FixedText TXT_MIN
     {
         Pos = MAP_APPFONT ( X2 , Y1  ) ;
         Size = MAP_APPFONT ( LABELWIDTH , 8 ) ;
         Text [ en-US ] = "~Minimum:" ;
     };
+
     SpinField EDT_MIN
     {
         Border = TRUE ;
@@ -70,6 +72,7 @@ TabPage TP_SCALE
         Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
         TabStop = TRUE ;
     };
+
     CheckBox CBX_AUTO_MIN
     {
         Pos = MAP_APPFONT ( X4 , Y1-1  ) ;
@@ -84,6 +87,7 @@ TabPage TP_SCALE
         Size = MAP_APPFONT ( LABELWIDTH , 8 ) ;
         Text [ en-US ] = "Ma~ximum:" ;
     };
+
     SpinField EDT_MAX
     {
         Border = TRUE ;
@@ -92,6 +96,7 @@ TabPage TP_SCALE
         Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
         TabStop = TRUE ;
     };
+
     CheckBox CBX_AUTO_MAX
     {
         Pos = MAP_APPFONT ( X4 , Y2-1  ) ;
@@ -99,12 +104,14 @@ TabPage TP_SCALE
         TabStop = TRUE ;
         Text [ en-US ] = "A~utomatic" ;
     };
+
     FixedText TXT_STEP_MAIN
     {
         Pos = MAP_APPFONT ( X2 , Y3  ) ;
         Size = MAP_APPFONT ( LABELWIDTH , 8 ) ;
         Text [ en-US ] = "Ma~jor interval:" ;
     };
+
     SpinField EDT_STEP_MAIN
     {
         Border = TRUE ;
@@ -112,6 +119,7 @@ TabPage TP_SCALE
         Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
         TabStop = TRUE ;
     };
+
     CheckBox CBX_AUTO_STEP_MAIN
     {
         Pos = MAP_APPFONT ( X4 , Y3-1  ) ;
@@ -119,12 +127,14 @@ TabPage TP_SCALE
         TabStop = TRUE ;
         Text [ en-US ] = "Au~tomatic" ;
     };
+
     FixedText TXT_STEP_HELP
     {
         Pos = MAP_APPFONT ( X2 , Y4  ) ;
         Size = MAP_APPFONT ( LABELWIDTH , 8 ) ;
         Text [ en-US ] = "Minor interval ~count:" ;
     };
+
     MetricField MT_STEPHELP
     {
         Border = TRUE ;
@@ -141,6 +151,7 @@ TabPage TP_SCALE
         Last = 100 ;
         SpinSize = 1 ;
     };
+
     CheckBox CBX_AUTO_STEP_HELP
     {
         Pos = MAP_APPFONT ( X4 , Y4-1  ) ;
@@ -155,6 +166,7 @@ TabPage TP_SCALE
         Size = MAP_APPFONT ( LABELWIDTH , 8 ) ;
         Text [ en-US ] = "Reference ~value:" ;
     };
+
     SpinField EDT_ORIGIN
     {
         Border = TRUE ;
@@ -186,5 +198,4 @@ TabPage TP_SCALE
         TabStop = TRUE ;
         Text [ en-US ] = "~Reverse direction" ;
     };
-
 };
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.src b/chart2/source/controller/dialogs/tp_SeriesToAxis.src
index 7dab3449cb32..0d67feb22cee 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.src
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.src
@@ -30,15 +30,16 @@
 TabPage TP_OPTIONS
 {
     Hide = TRUE ;
-//    HelpID = HID_LAYOUT ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
+
     FixedLine 1
     {
         Pos = MAP_APPFONT ( 6 , 6  ) ;
         Size = MAP_APPFONT ( 248 , 8 ) ;
         Text [ en-US ] = "Align data series to";
     };
+
     RadioButton RBT_OPT_AXIS_1
     {
         Pos = MAP_APPFONT ( 12 , 20  ) ;
@@ -46,6 +47,7 @@ TabPage TP_OPTIONS
         TabStop = TRUE ;
         Text [ en-US ] = "Primary Y axis";
     };
+
     RadioButton RBT_OPT_AXIS_2
     {
         Pos = MAP_APPFONT ( 12 , 34  ) ;
@@ -60,6 +62,7 @@ TabPage TP_OPTIONS
         Size = MAP_APPFONT ( 248 , 8 ) ;
         Text [ en-US ] = "Settings";
     };
+
     FixedText FT_OVERLAP
     {
         Pos = MAP_APPFONT ( 12 , 80 ) ;
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.src b/chart2/source/controller/dialogs/tp_TitleRotation.src
index 2ac0355d39af..c77d915fa583 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.src
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.src
@@ -24,6 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
 #include "HelpIds.hrc"
 #include "TabPages.hrc"
 
@@ -90,4 +91,3 @@ TabPage TP_ALIGNMENT
         DropDown = TRUE;
     };
 };
-
diff --git a/chart2/source/controller/dialogs/tp_Trendline.src b/chart2/source/controller/dialogs/tp_Trendline.src
index efa11d3e2d67..f7a3fa33a6d8 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.src
+++ b/chart2/source/controller/dialogs/tp_Trendline.src
@@ -31,7 +31,6 @@
 TabPage TP_TRENDLINE
 {
     Hide = TRUE ;
-//  HelpID = HID_SCH_STAT ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
     RESOURCE_TRENDLINE( 260 - 12, 0 )
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc
index 44c340139782..c7802d403aef 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc
@@ -27,19 +27,6 @@
 
 #include "ResourceIds.hrc"
 
-/*
-#define ED_MAINTITLE    1
-#define ED_SUBTITLE     2
-#define ED_X_AXIS       3
-#define ED_Y_AXIS       4
-#define ED_Z_AXIS       5
-#define FT_MAINTITLE    1
-#define FT_SUBTITLE     2
-#define FT_TITLE_X_AXIS 3
-#define FT_TITLE_Y_AXIS 4
-#define FT_TITLE_Z_AXIS 5
-*/
-
 #define FT_TITLEDESCRIPTION 30
 
 #define FL_VERTICAL 3
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index bd8f44568b01..b377a4df6ea0 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -118,41 +118,6 @@ OutputDevice * lcl_GetParentRefDevice( const uno::Reference< frame::XModel > & x
 
 }
 
-    /*
-void lcl_initOutliner( SdrOutliner* pTargetOutliner, SdrOutliner* pSourceOutliner )
-{
-    //just an unsuccessful try to initialize the text edit outliner correctly
-    //if( bInit )
-    {
-        pTargetOutliner->EraseVirtualDevice();
-        pTargetOutliner->SetUpdateMode(FALSE);
-        pTargetOutliner->SetEditTextObjectPool( pSourceOutliner->GetEditTextObjectPool() );
-        pTargetOutliner->SetDefTab( pSourceOutliner->GetDefTab() );
-    }
-
-    pTargetOutliner->SetRefDevice( pSourceOutliner->GetRefDevice() );
-    pTargetOutliner->SetForbiddenCharsTable( pSourceOutliner->GetForbiddenCharsTable() );
-    pTargetOutliner->SetAsianCompressionMode( pSourceOutliner->GetAsianCompressionMode() );
-    pTargetOutliner->SetKernAsianPunctuation( pSourceOutliner->IsKernAsianPunctuation() );
-    pTargetOutliner->SetStyleSheetPool( pSourceOutliner->GetStyleSheetPool() );
-    pTargetOutliner->SetRefMapMode( pSourceOutliner->GetRefMapMode() );
-    pTargetOutliner->SetDefaultLanguage( pSourceOutliner->GetDefaultLanguage() );
-    pTargetOutliner->SetHyphenator( pSourceOutliner->GetHyphenator() );
-
-    USHORT nX, nY;
-    pSourceOutliner->GetGlobalCharStretching( nX, nY );
-    pTargetOutliner->SetGlobalCharStretching( nX, nY );
-
-    *//*
-    if ( !GetRefDevice() )
-    {
-        MapMode aMapMode(eObjUnit, Point(0,0), aObjUnit, aObjUnit);
-        pTargetOutliner->SetRefMapMode(aMapMode);
-    }
-    *//*
-}
-*/
-
 DrawViewWrapper::DrawViewWrapper( SdrModel* pSdrModel, OutputDevice* pOut, bool bPaintPageForEditMode)
             : E3dView(pSdrModel, pOut)
             , m_pMarkHandleProvider(NULL)
@@ -200,7 +165,6 @@ void DrawViewWrapper::ReInit()
     bHlplVisible = false;
 
     this->SetNoDragXorPolys(true);//for interactive 3D resize-dragging: paint only a single rectangle (not a simulated 3D object)
-    //this->SetResizeAtCenter(true);//for interactive resize-dragging: keep the object center fix
 
     //a correct work area is at least necessary for correct values in the position and  size dialog
     Rectangle aRect(Point(0,0), aOutputSize);
@@ -233,7 +197,6 @@ void DrawViewWrapper::SetMarkHandles()
 SdrObject* DrawViewWrapper::getHitObject( const Point& rPnt ) const
 {
     SdrObject* pRet = NULL;
-    //ULONG nOptions =SDRSEARCH_DEEP|SDRSEARCH_PASS2BOUND|SDRSEARCH_PASS3NEAREST;
     ULONG nOptions = SDRSEARCH_DEEP | SDRSEARCH_TESTMARKABLE;
 
     SdrPageView* pSdrPageView = this->GetPageView();
@@ -333,7 +296,6 @@ void DrawViewWrapper::attachParentReferenceDevice( const uno::Reference< frame::
 
 SdrOutliner* DrawViewWrapper::getOutliner() const
 {
-//    lcl_initOutliner( m_apOutliner.get(), &GetModel()->GetDrawOutliner() );
     return m_apOutliner.get();
 }
 
diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
index 3a613fbc79d0..927d9ccdb0e4 100644
--- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
+++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
@@ -229,47 +229,6 @@ FontList* ViewElementListProvider::getFontList() const
     }
     return m_pFontList;
 }
-
-/*
-SfxPrinter* ObjectPropertiesDialogParameter::getPrinter()
-{
-    //was old chart:
-    //SfxPrinter* SchChartDocShell::GetPrinter()
-
-    // OLE-Objekt: kein Printer anlegen ??? see old chart: :UpdateTablePointers
-    //@todo get printer from calc or other container
-    //return NULL;
-
-    SfxPrinter* pPrinter = NULL;
-    bool bOwnPrinter = true;
-    if (!pPrinter)
-    {
-        SfxBoolItem aItem(SID_PRINTER_NOTFOUND_WARN, TRUE);
-        // ItemSet mit speziellem Poolbereich anlegen
-        SfxItemSet* pSet = new SfxItemSet(GetPool(),
-                                          SID_PRINTER_NOTFOUND_WARN,
-                                          SID_PRINTER_NOTFOUND_WARN, 0);
-        pSet->Put(aItem);
-        pPrinter = new SfxPrinter(pSet); //@todo ->need to remember and delete
-        bOwnPrinter = TRUE;
-
-        MapMode aMapMode = pPrinter->GetMapMode();
-        aMapMode.SetMapUnit(MAP_100TH_MM);
-        pPrinter->SetMapMode(aMapMode);
-
-        if (pChDoc)
-        {
-            if (pPrinter != pChDoc->GetRefDevice())
-                pChDoc->SetRefDevice(pPrinter);
-
-            if (pPrinter != pChDoc->GetOutliner()->GetRefDevice())
-                pChDoc->GetOutliner()->SetRefDevice(pPrinter);
-        }
-    }
-    return pPrinter;
-}
-*/
-
 //.............................................................................
 } //namespace chart
 //.............................................................................
diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc
index 1052b7ea962f..3515497b240f 100644
--- a/chart2/source/controller/inc/HelpIds.hrc
+++ b/chart2/source/controller/inc/HelpIds.hrc
@@ -33,12 +33,6 @@
 
 //see old chart: schhids.h
 
-/*
-#define HID_SCH_DATA_ROW            (HID_SCH_START + 0)
-#define HID_SCH_DATA_LINE           (HID_SCH_START + 1)
-#define HID_SCH_DATA_POINT          (HID_SCH_START + 2)
-#define HID_SCH_DIAGRAM_X_AXIS      (HID_SCH_START + 3)
-*/
 #define HID_SCH_ALIGNMENT           (HID_SCH_START + 4)
 #define HID_SCH_LEGEND_POS          (HID_SCH_START + 5)
 #define HID_SCH_DATA_DESCR          (HID_SCH_START + 6)
@@ -48,7 +42,6 @@
 #define HID_SCH_CTL_DATA            (HID_SCH_START + 10)
 
 #define HID_SCH_CT_INDICATE         (HID_SCH_START + 11)
-// #define HID_SCH_CT_REGRESS          (HID_SCH_START + 12)
 
 //for chart type dialog:
 #define HID_SCH_CTL_TYPE            (HID_SCH_START + 13)
@@ -56,11 +49,6 @@
 #define HID_SCH_NUM_OF_LINES        (HID_SCH_START + 43)
 #define HID_SCH_SERIES_LIST         (HID_SCH_START + 15)
 #define HID_SCH_DATA_RANGES_LIST    (HID_SCH_START + 16)
-//
-
-//#define HID_SCH_CTL_LIGHT           (HID_SCH_START + 17)
-//#define HID_SCH_CT_INDICATE2        (HID_SCH_START + 18)
-//#define HID_SCH_CT_REGRESS2         (HID_SCH_START + 19)
 
 #define HID_SCH_TBI_DATA_INSERT_ROW (HID_SCH_START + 23)
 #define HID_SCH_TBI_DATA_INSERT_COL (HID_SCH_START + 24)
@@ -74,14 +62,6 @@
 #define HID_SCH_ALIGNMENT_CTR_DIAL  (HID_SCH_START + 35)
 #define HID_SCH_ALIGNMENT_STACKED   (HID_SCH_START + 36)
 #define HID_SCH_ALIGNMENT_DEGREES   (HID_SCH_START + 37)
-/*
-#define HID_SCH_LAYOUT              (HID_SCH_START + 38)
-
-#define HID_SCH_TBX_EDIT_FIELD      (HID_SCH_START + 39)
-#define HID_SCH_DIAGRAM_Y_AXIS      (HID_SCH_START + 40)//war mal 3
-
-#define HID_SCH_DEF_COLOR           (HID_SCH_START + 41)
-*/
 #define HID_SCH_TP_AXIS_LABEL       (HID_SCH_START + 42)
 
 #define HID_SCH_CHART_AUTO_FORMAT   (HID_SCH_START + 44)
@@ -174,9 +154,4 @@
 
 // HID_SCH_START should be 63280 (checked 25.Nov 2002)
 
-// 453 == SCH_IF_CHARTVIEWSHELL, da SFX_INTERFACE_LIB kein
-// Define sondern neuerdings ein Enum ist
-//#define HID_SCH_VIEWSHELL_DOCUMENT    (453)
-
-
 #endif
diff --git a/chart2/source/controller/inc/MenuResIds.hrc b/chart2/source/controller/inc/MenuResIds.hrc
index 38a09ad35ded..5910606d1cb1 100644
--- a/chart2/source/controller/inc/MenuResIds.hrc
+++ b/chart2/source/controller/inc/MenuResIds.hrc
@@ -37,5 +37,4 @@
 #define RID_CONTEXTMENU_SHAPE       (RID_APP_START + 1)
 #define RID_CONTEXTMENU_SHAPEEDIT   (RID_APP_START + 2)
 
-// CHART_MENURESIDS_HRC
 #endif
diff --git a/chart2/source/controller/inc/ShapeController.hrc b/chart2/source/controller/inc/ShapeController.hrc
index 6c7b43526d22..d230c32058da 100644
--- a/chart2/source/controller/inc/ShapeController.hrc
+++ b/chart2/source/controller/inc/ShapeController.hrc
@@ -46,5 +46,4 @@
 #define COMMAND_ID_FONT_DIALOG                 15
 #define COMMAND_ID_PARAGRAPH_DIALOG            16
 
-// CHART_SHAPECONTROLLER_HRC
 #endif
diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx
index 597b20d4abe8..1ea3fe942b1b 100644
--- a/chart2/source/controller/inc/dlg_DataEditor.hxx
+++ b/chart2/source/controller/inc/dlg_DataEditor.hxx
@@ -77,7 +77,6 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
         m_xContext;
     ImageList       m_aToolboxImageList;
-    ImageList       m_aToolboxImageListHighContrast;
 
     /// handles actions of the toolbox
     DECL_LINK( ToolboxHdl, void* );
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index e6b75214f601..0f1ce591ad4f 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -368,7 +368,6 @@ void AxisItemConverter::FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemS
         break;
 
         case SID_ATTR_NUMBERFORMAT_VALUE:
-//         case SCHATTR_AXIS_NUMFMT:
         {
             if( m_pExplicitScale )
             {
@@ -758,7 +757,6 @@ bool AxisItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rI
         break;
 
         case SID_ATTR_NUMBERFORMAT_VALUE:
-//         case SCHATTR_AXIS_NUMFMT:
         {
             if( m_pExplicitScale )
             {
diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
index 177764d6787f..3993a98a90ae 100644
--- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
@@ -58,9 +58,6 @@ namespace
         IPM_MAP_ENTRY( EE_CHAR_LANGUAGE, "CharLocale", MID_LANG_LOCALE )
         IPM_MAP_ENTRY( EE_CHAR_LANGUAGE_CJK, "CharLocaleAsian", MID_LANG_LOCALE )
         IPM_MAP_ENTRY( EE_CHAR_LANGUAGE_CTL, "CharLocaleComplex", MID_LANG_LOCALE )
-//         IPM_MAP_ENTRY( EE_CHAR_FONTHEIGHT, "CharHeight", 0 )
-//         IPM_MAP_ENTRY( EE_CHAR_ITALIC, "CharPosture", 0 )
-//         IPM_MAP_ENTRY( EE_CHAR_WEIGHT, "CharWeight", 0 )
 
         IPM_MAP_ENTRY( EE_CHAR_STRIKEOUT, "CharStrikeout", MID_CROSS_OUT )
         IPM_MAP_ENTRY( EE_CHAR_WLM, "CharWordMode", 0 )
@@ -71,12 +68,6 @@ namespace
 
         IPM_MAP_ENTRY( EE_PARA_WRITINGDIR, "WritingMode", 0 )
 
-//         IPM_MAP_ENTRY( EE_CHAR_FONTHEIGHT_CJK, "CharHeightAsian", 0 )
-//         IPM_MAP_ENTRY( EE_CHAR_FONTHEIGHT_CTL, "CharHeightComplex", 0 )
-//         IPM_MAP_ENTRY( EE_CHAR_WEIGHT_CJK, "CharWeightAsian", 0 )
-//         IPM_MAP_ENTRY( EE_CHAR_WEIGHT_CTL, "CharWeightComplex", 0 )
-//         IPM_MAP_ENTRY( EE_CHAR_ITALIC_CJK, "CharPostureAsian", 0 )
-//         IPM_MAP_ENTRY( EE_CHAR_ITALIC_CTL, "CharPostureComplex", 0 )
         IPM_MAP_ENTRY( EE_PARA_ASIANCJKSPACING, "ParaIsCharacterDistance", 0 )
         );
 
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 51df4136ad2d..4359efa95909 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -75,7 +75,6 @@ namespace
 {
     static ::comphelper::ItemPropertyMapType aDataPointPropertyMap(
         ::comphelper::MakeItemPropertyMap
-//        IPM_MAP_ENTRY( CHATTR_PIE_SEGMENT_OFFSET, "Offset", 0 )
         IPM_MAP_ENTRY( SCHATTR_STYLE_SHAPE, "Geometry3D", 0 )
         );
 
diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index c5a6491cc3d7..70490a025fad 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -66,14 +66,9 @@ namespace
         ::comphelper::MakeItemPropertyMap
         IPM_MAP_ENTRY( XATTR_FILLSTYLE, "FillStyle", 0 )
         IPM_MAP_ENTRY( XATTR_FILLCOLOR, "Color", 0 )
-//         IPM_MAP_ENTRY( XATTR_FILLTRANSPARENCE, "Transparency", 0 )
-//         IPM_MAP_ENTRY( XATTR_FILLGRADIENT, "Gradient", 0 )
-//         IPM_MAP_ENTRY( XATTR_FILLHATCH, "Hatch", 0 )
         IPM_MAP_ENTRY( XATTR_LINECOLOR, "BorderColor", 0 )
         IPM_MAP_ENTRY( XATTR_LINESTYLE, "BorderStyle", 0 )
         IPM_MAP_ENTRY( XATTR_LINEWIDTH, "BorderWidth", 0 )
-//         IPM_MAP_ENTRY( XATTR_LINEDASH, "BorderDash", 0 )
-//         IPM_MAP_ENTRY( XATTR_LINETRANSPARENCE, "BorderTransparency", 0 )
         IPM_MAP_ENTRY( XATTR_FILLBACKGROUND, "FillBackground", 0 )
         IPM_MAP_ENTRY( XATTR_FILLBMP_POS, "FillBitmapRectanglePoint", 0 )
         IPM_MAP_ENTRY( XATTR_FILLBMP_SIZEX, "FillBitmapSizeX", 0 )
@@ -92,10 +87,8 @@ namespace
     static ::comphelper::ItemPropertyMapType aDataPointPropertyLineMap(
         ::comphelper::MakeItemPropertyMap
         IPM_MAP_ENTRY( XATTR_LINECOLOR, "Color", 0 )
-//         IPM_MAP_ENTRY( XATTR_LINETRANSPARENCE, "Transparency", 0 )
         IPM_MAP_ENTRY( XATTR_LINESTYLE, "LineStyle", 0 )
         IPM_MAP_ENTRY( XATTR_LINEWIDTH, "LineWidth", 0 )
-//         IPM_MAP_ENTRY( XATTR_LINEDASH, "LineDash", 0 )
         );
 
     return aDataPointPropertyLineMap;
@@ -106,9 +99,7 @@ namespace
         ::comphelper::MakeItemPropertyMap
         IPM_MAP_ENTRY( XATTR_LINESTYLE, "LineStyle", 0 )
         IPM_MAP_ENTRY( XATTR_LINEWIDTH, "LineWidth", 0 )
-//         IPM_MAP_ENTRY( XATTR_LINEDASH, "LineDash", 0 )
         IPM_MAP_ENTRY( XATTR_LINECOLOR, "LineColor", 0 )
-//         IPM_MAP_ENTRY( XATTR_LINETRANSPARENCE, "LineTransparence", 0 )
         IPM_MAP_ENTRY( XATTR_LINEJOINT, "LineJoint", 0 )
         );
 
@@ -120,10 +111,6 @@ namespace
         ::comphelper::MakeItemPropertyMap
         IPM_MAP_ENTRY( XATTR_FILLSTYLE, "FillStyle", 0 )
         IPM_MAP_ENTRY( XATTR_FILLCOLOR, "FillColor", 0 )
-//         IPM_MAP_ENTRY( XATTR_FILLTRANSPARENCE, "FillTransparence", 0 )
-//         IPM_MAP_ENTRY( XATTR_FILLBITMAP, "FillBitmapName", MID_NAME )
-//         IPM_MAP_ENTRY( XATTR_FILLGRADIENT, "FillGradient", 0 )
-//         IPM_MAP_ENTRY( XATTR_FILLHATCH, "FillHatch", 0 )
         IPM_MAP_ENTRY( XATTR_FILLBACKGROUND, "FillBackground", 0 )
         IPM_MAP_ENTRY( XATTR_FILLBMP_POS, "FillBitmapRectanglePoint", 0 )
         IPM_MAP_ENTRY( XATTR_FILLBMP_SIZEX, "FillBitmapSizeX", 0 )
@@ -267,10 +254,6 @@ void GraphicPropertyItemConverter::FillSpecialItem(
     USHORT nWhichId, SfxItemSet & rOutItemSet ) const
     throw( uno::Exception )
 {
-//     if( m_eGraphicObjectType == LINE_DATA_POINT ||
-//         m_eGraphicObjectType == LINE_PROPERTIES )
-//         return;
-
     switch( nWhichId )
     {
         // bitmap property
diff --git a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
index a918b428b988..e4e95884461c 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
@@ -77,18 +77,6 @@ RegressionEquationItemConverter::RegressionEquationItemConverter(
     m_aConverters.push_back( new CharacterPropertyItemConverter(
                                  rPropertySet, rItemPool, pRefSize, C2U("ReferencePageSize")));
 
-//     // CharacterProperties are not at the title but at its contained XFormattedString objects
-//     // take the first formatted string in the sequence
-//     uno::Reference< chart2::XTitle > xTitle( rPropertySet, uno::UNO_QUERY );
-//     if( xTitle.is())
-//     {
-//         uno::Sequence< uno::Reference< chart2::XFormattedString > > aStringSeq( xTitle->getText());
-//         if( aStringSeq.getLength() > 0 )
-//         {
-//             m_aConverters.push_back(
-//                 new FormattedStringsConverter( aStringSeq, rItemPool, pRefSize, rPropertySet ));
-//         }
-//     }
 }
 
 RegressionEquationItemConverter::~RegressionEquationItemConverter()
@@ -145,12 +133,6 @@ bool RegressionEquationItemConverter::ApplySpecialItem(
     {
         case SID_ATTR_NUMBERFORMAT_VALUE:
         {
-//             bool bUseSourceFormat =
-//                 (static_cast< const SfxBoolItem & >(
-//                     rItemSet.Get( SID_ATTR_NUMBERFORMAT_SOURCE )).GetValue() );
-
-//             if( ! bUseSourceFormat )
-//             {
             uno::Any aValue( static_cast< sal_Int32 >(
                 static_cast< const SfxUInt32Item & >(
                     rItemSet.Get( nWhichId )).GetValue()));
diff --git a/chart2/source/controller/main/DrawCommandDispatch.hrc b/chart2/source/controller/main/DrawCommandDispatch.hrc
index 4e31fafaaf63..2995d6ca70c7 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.hrc
+++ b/chart2/source/controller/main/DrawCommandDispatch.hrc
@@ -46,5 +46,4 @@
 #define COMMAND_ID_DRAWTBX_CS_CALLOUT          15
 #define COMMAND_ID_DRAWTBX_CS_STAR             16
 
-// CHART_DRAWCOMMANDDISPATCH_HRC
 #endif
diff --git a/chart2/source/controller/main/SelectionHelper.hxx b/chart2/source/controller/main/SelectionHelper.hxx
index 6b36921abd5e..6317fb4b4109 100644
--- a/chart2/source/controller/main/SelectionHelper.hxx
+++ b/chart2/source/controller/main/SelectionHelper.hxx
@@ -44,8 +44,7 @@ namespace chart
 class ObjectIdentifier;
 
 //-----------------------------------------------------------------------------
-/**
-*/
+
 class Selection
 {
 public: //methods
diff --git a/chart2/source/inc/Strings.hrc b/chart2/source/inc/Strings.hrc
index 47ed75e80a9a..358bf3cf82cc 100644
--- a/chart2/source/inc/Strings.hrc
+++ b/chart2/source/inc/Strings.hrc
@@ -33,62 +33,6 @@
 //next free is 291
 //single free is: 134
 
-//#define RID_APP_START 30000
-////#define STR_NULL                            (RID_APP_START +  1)
-////#define STR_BASIC_IDE                       (RID_APP_START +  2)
-//#define STR_LINES                           (RID_APP_START +  3)
-//#define STR_COLUMNS                       (RID_APP_START +  4)
-//#define STR_BARS                            (RID_APP_START +  5)
-//#define STR_AREAS                           (RID_APP_START +  6)
-//#define STR_CIRCLES                       (RID_APP_START +  7)
-//#define STR_DONUT2                        (RID_APP_START +  9)
-//#define STR_OFS                             (RID_APP_START + 14)
-//#define STR_XY                            (RID_APP_START + 16)
-//#define STR_XYZ                           (RID_APP_START + 17)
-//#define STR_ONLY_SYMBOLS                    (RID_APP_START + 115)
-//#define STR_LINESYMB                      (RID_APP_START + 15)
-//#define STR_LINE_SYMBOLS                    (RID_APP_START + 117)
-//#define STR_SYMBOL                          (RID_APP_START + 53)
-//#define STR_SYMBOL_STACK                    (RID_APP_START + 54)
-//#define STR_SYMBOL_PERCENT                  (RID_APP_START + 55)
-//#define STR_SPLINE_CUBIC                    (RID_APP_START + 56)
-//#define STR_SPLINE_CUBIC_SYMBOL             (RID_APP_START + 57)
-//#define STR_SPLINE_B                        (RID_APP_START + 58)
-//#define STR_SPLINE_B_SYMBOL                 (RID_APP_START + 59)
-//#define STR_STOCKCHART                    (RID_APP_START + 142)
-//#define STR_SAEULE_3D_1                       (RID_APP_START + 149)
-//#define STR_SAEULE_3D_2                       (RID_APP_START + 150)
-//#define STR_SAEULE_3D_3                       (RID_APP_START + 151)
-//#define STR_SAEULE_3D_4                       (RID_APP_START + 152)
-//#define STR_ROEHRE_3D_1                       (RID_APP_START + 153)
-//#define STR_ROEHRE_3D_2                       (RID_APP_START + 154)
-//#define STR_ROEHRE_3D_3                       (RID_APP_START + 155)
-//#define STR_ROEHRE_3D_4                       (RID_APP_START + 156)
-//#define STR_PYRAMID_3D_1                  (RID_APP_START + 157)
-//#define STR_PYRAMID_3D_2                  (RID_APP_START + 158)
-//#define STR_PYRAMID_3D_3                  (RID_APP_START + 159)
-//#define STR_PYRAMID_3D_4                  (RID_APP_START + 160)
-//#define STR_PYRAMIDQ_3D_1                 (RID_APP_START + 161)
-//#define STR_PYRAMIDQ_3D_2                 (RID_APP_START + 162)
-//#define STR_PYRAMIDQ_3D_3                 (RID_APP_START + 163)
-//#define STR_PYRAMIDQ_3D_4                 (RID_APP_START + 164)
-//#define STR_KEGEL_3D_1                        (RID_APP_START + 165)
-//#define STR_KEGEL_3D_2                        (RID_APP_START + 166)
-//#define STR_KEGEL_3D_3                        (RID_APP_START + 167)
-//#define STR_KEGEL_3D_4                        (RID_APP_START + 168)
-//#define STR_KEGELQ_3D_1                   (RID_APP_START + 169)
-//#define STR_KEGELQ_3D_2                   (RID_APP_START + 170)
-//#define STR_KEGELQ_3D_3                       (RID_APP_START + 171)
-//#define STR_KEGELQ_3D_4                       (RID_APP_START + 172)
-////#define STR_NORMAL_LINES                    (RID_APP_START + 18)
-////#define STR_SURFACE                         (RID_APP_START + 19)
-// #define STR_STEPMAIN_LT_MAXVALUE            (RID_APP_START + 103)
-// #define STR_STEPHELP_LT_STEPMAIN            (RID_APP_START + 104)
-// #define STR_WRONG_ORIGIN                    (RID_APP_START + 112)
-////#define STR_AREA                        (RID_APP_START + 122)
-////#define STR_LINE                        (RID_APP_START + 123)
-////#define STR_OBJECT_SOURCE_DATA              (RID_APP_START + 129)
-
 //-----------------------------------------------------------------------------
 //chart types
 //see Strings_ChartTypes.src
@@ -342,65 +286,6 @@
 #define STR_TEXT_DIRECTION_SUPER            (RID_APP_START + 280)
 
 //-----------------------------------------------------------------------------
-/*
-////#define STR_DIAGRAM_X_AXIS                  (RID_APP_START + 34)
-////#define STR_DIAGRAM_Y_AXIS                  (RID_APP_START + 35)
-////#define STR_DIAGRAM_Z_AXIS                  (RID_APP_START + 36)
-////#define STR_ACTION_DIAGRAM_DATA              (RID_APP_START + 63)
-////#define STR_UNDO_AUTOFORMAT                 (RID_APP_START + 79)
-////#define STR_DIAGRAM_DESCR_ROW               (RID_APP_START + 46)
-////#define STR_DIAGRAM_DESCR_COL               (RID_APP_START + 47)
-////#define STR_LEGEND_SYMBOL_COL               (RID_APP_START + 50)
-////#define STR_BAD_PASSWORD_OR_FILE_CORRUPTED  (RID_APP_START + 110)
-////#define STR_QUERY_SORT                      (RID_APP_START + 113)
-////#define STR_CFG_DEFAULT_COLORS              (RID_APP_START + 177)
-////#define STR_DIAGRAM_DATA_SAFETY_QUERY       (RID_APP_START + 181)
-////#define STR_UNDO_CUT                        (RID_APP_START + 60)
-////#define STR_UNDO_DELETE                     (RID_APP_START + 61)
-////#define STR_UNDO_DRAGDROP                   (RID_APP_START + 62)
-////#define STR_UNDO_INSERT_TITLE               (RID_APP_START + 65)
-////#define STR_UNDO_INSERT_LEGEND              (RID_APP_START + 66)
-////#define STR_UNDO_INSERT_DESCR               (RID_APP_START + 67)
-////#define STR_UNDO_INSERT_AXIS                (RID_APP_START + 68)
-////#define STR_UNDO_DATA_ROW                   (RID_APP_START + 69)
-////#define STR_UNDO_DATA_POINT                 (RID_APP_START + 70)
-////#define STR_UNDO_TITLE                      (RID_APP_START + 71)
-////#define STR_UNDO_LEGEND                     (RID_APP_START + 72)
-////#define STR_UNDO_DIAGRAM_AXIS               (RID_APP_START + 73)
-////#define STR_UNDO_DIAGRAM_GRID               (RID_APP_START + 74)
-////#define STR_UNDO_DIAGRAM_WALL               (RID_APP_START + 75)
-////#define STR_UNDO_DIAGRAM_FLOOR              (RID_APP_START + 76)
-////#define STR_UNDO_DIAGRAM_AREA               (RID_APP_START + 77)
-////#define STR_UNDO_LIGHTING                   (RID_APP_START + 81)
-////#define STR_UNDO_TOGGLE_TITLE               (RID_APP_START + 82)
-////#define STR_UNDO_TOGGLE_AXIS_TITLE          (RID_APP_START + 84)
-////#define STR_UNDO_TOGGLE_AXIS_DESCR          (RID_APP_START + 85)
-////#define STR_DEFAULTVIEW                     (RID_APP_START + 90)
-////#define STR_UNDO_STATISTICS                 (RID_APP_START + 91)
-////#define STR_UNDO_DIAGRAM_LINE               (RID_APP_START + 92)
-////#define STR_UNDO_REMOVEPOINTATTRS           (RID_APP_START + 94)
-////#define STR_UNDO_MOREFRONT                  (RID_APP_START + 95)
-////#define STR_UNDO_MOREBACK                   (RID_APP_START + 96)
-////#define STR_UNDO_INSERT_SPECCHAR            (RID_APP_START + 173)
-////#define STR_UNDO_INSERT_GRID                (RID_APP_START + 178)
-////#define STR_UNDO_TRANSFORM                  (RID_APP_START + 183)
-////#define STR_UNDO_MOVE                       (RID_APP_START + 184)
-////#define STR_UNDO_RESIZE                     (RID_APP_START + 185)
-////#define STR_UNDO_ROTATE                     (RID_APP_START + 186)
-////#define STR_UNDO_DIAGRAM_STOCK_LOSS         (RID_APP_START + 147)
-////#define STR_UNDO_DIAGRAM_STOCK_PLUS         (RID_APP_START + 148)
-////#define STR_OPEN_DOCUMENT                   (RID_APP_START + 105) use SID_DOC_LOADING instead
-////#define STR_SAVE_DOCUMENT                   (RID_APP_START + 106) use SID_SAVEDOC instead
-////#define STR_GRAPHIC                         (RID_APP_START + 108)
-////#define STR_CHART_DOCUMENT                  (RID_APP_START + 109)
-////#define STR_CHART_DOCUMENT_FULLTYPE_40      (RID_APP_START + 114)
-////#define STR_CHART_DOCUMENT_FULLTYPE_31      (RID_APP_START + 118)
-////#define STR_CHART_DOCUMENT_FULLTYPE_50      (RID_APP_START + 119)
-////#define STR_CHART_DOCUMENT_FULLTYPE_60      (RID_APP_START + 182)
-////#define STR_INVISIBLE                       (RID_APP_START + 120)
-////#define STR_SOLID                           (RID_APP_START + 121)
-////#define STR_APPNAME                         (RID_APP_START + 139)
-*/
 
 // ids must not exceed RID_APP_START + 499
 // ids >= RID_APP_START + 500 are defined in glob.hrc
diff --git a/chart2/source/inc/chartview/servicenames_charttypes.hxx b/chart2/source/inc/chartview/servicenames_charttypes.hxx
index a3a51735a603..9ed1cb284662 100644
--- a/chart2/source/inc/chartview/servicenames_charttypes.hxx
+++ b/chart2/source/inc/chartview/servicenames_charttypes.hxx
@@ -33,14 +33,14 @@ namespace chart
 {
 //.............................................................................
 
-#define CHART2_VIEW_BARCHART_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.view.BarChart_Impl")
-#define CHART2_VIEW_BARCHART_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.view.BarChart")
+#define CHART2_VIEW_BARCHART_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.view.BarChart_Impl" ))
+#define CHART2_VIEW_BARCHART_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.view.BarChart" ))
 
-#define CHART2_VIEW_PIECHART_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.view.PieChart_Impl")
-#define CHART2_VIEW_PIECHART_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.view.PieChart")
+#define CHART2_VIEW_PIECHART_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.view.PieChart_Impl" ))
+#define CHART2_VIEW_PIECHART_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.view.PieChart" ))
 
-#define CHART2_VIEW_AREACHART_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.view.AreaChart_Impl")
-#define CHART2_VIEW_AREACHART_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.view.AreaChart")
+#define CHART2_VIEW_AREACHART_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.view.AreaChart_Impl" ))
+#define CHART2_VIEW_AREACHART_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.view.AreaChart" ))
 
 //.............................................................................
 } //namespace chart
diff --git a/chart2/source/inc/servicenames.hxx b/chart2/source/inc/servicenames.hxx
index 1fcd7aa51f3d..f0c90936df31 100644
--- a/chart2/source/inc/servicenames.hxx
+++ b/chart2/source/inc/servicenames.hxx
@@ -33,37 +33,37 @@ namespace chart
 {
 //.............................................................................
 
-#define CHART_MODEL_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.ChartModel")
-#define CHART_MODEL_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.ChartDocument")
+#define CHART_MODEL_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartModel" ))
+#define CHART_MODEL_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ChartDocument" ))
 //@todo create your own service containing the service com.sun.star.document.OfficeDocument
 
-#define CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.ChartController")
-#define CHART_CONTROLLER_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.ChartController")
+#define CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartController" ))
+#define CHART_CONTROLLER_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ChartController" ))
 //@todo create your own service containing the service com.sun.star.frame.Controller
 
-#define CHART_VIEW_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.ChartView")
-#define CHART_VIEW_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.ChartView")
+#define CHART_VIEW_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartView" ))
+#define CHART_VIEW_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ChartView" ))
 
-#define CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.ChartFrameLoader")
-#define CHART_FRAMELOADER_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.frame.SynchronousFrameLoader")
+#define CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartFrameLoader" ))
+#define CHART_FRAMELOADER_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.SynchronousFrameLoader" ))
 
-#define CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.WizardDialog")
-#define CHART_WIZARD_DIALOG_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.WizardDialog")
+#define CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.WizardDialog" ))
+#define CHART_WIZARD_DIALOG_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.WizardDialog" ))
 
-#define CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.ChartTypeDialog")
-#define CHART_TYPE_DIALOG_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.ChartTypeDialog")
+#define CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartTypeDialog" ))
+#define CHART_TYPE_DIALOG_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ChartTypeDialog" ))
 
 // wrapper for old UNO API (com.sun.star.chart)
-#define CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.ChartDocumentWrapper")
-#define CHART_CHARTAPIWRAPPER_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.ChartDocumentWrapper")
+#define CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartDocumentWrapper" ))
+#define CHART_CHARTAPIWRAPPER_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ChartDocumentWrapper" ))
 
 // accessibility
-#define CHART_ACCESSIBLE_TEXT_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.AccessibleTextComponent")
-#define CHART_ACCESSIBLE_TEXT_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.accessibility.AccessibleTextComponent")
+#define CHART_ACCESSIBLE_TEXT_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.AccessibleTextComponent" ))
+#define CHART_ACCESSIBLE_TEXT_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleTextComponent" ))
 
-#define CHART_RENDERER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.chart2.ChartRenderer")
+#define CHART_RENDERER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.ChartRenderer" ))
 
-#define CHART_UNDOMANAGER_SERVICE_NAME ::rtl::OUString::createFromAscii( "com.sun.star.chart2.UndoManager" )
+#define CHART_UNDOMANAGER_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.UndoManager" ))
 
 //.............................................................................
 } //namespace chart
diff --git a/chart2/source/inc/servicenames_charttypes.hxx b/chart2/source/inc/servicenames_charttypes.hxx
index a849768b0c17..9984af30973c 100644
--- a/chart2/source/inc/servicenames_charttypes.hxx
+++ b/chart2/source/inc/servicenames_charttypes.hxx
@@ -33,16 +33,16 @@ namespace chart
 {
 //.............................................................................
 
-#define CHART2_SERVICE_NAME_CHARTTYPE_AREA ::rtl::OUString::createFromAscii("com.sun.star.chart2.AreaChartType")
-#define CHART2_SERVICE_NAME_CHARTTYPE_BAR ::rtl::OUString::createFromAscii("com.sun.star.chart2.BarChartType")
-#define CHART2_SERVICE_NAME_CHARTTYPE_COLUMN ::rtl::OUString::createFromAscii("com.sun.star.chart2.ColumnChartType")
-#define CHART2_SERVICE_NAME_CHARTTYPE_LINE ::rtl::OUString::createFromAscii("com.sun.star.chart2.LineChartType")
-#define CHART2_SERVICE_NAME_CHARTTYPE_SCATTER ::rtl::OUString::createFromAscii("com.sun.star.chart2.ScatterChartType")
-#define CHART2_SERVICE_NAME_CHARTTYPE_PIE ::rtl::OUString::createFromAscii("com.sun.star.chart2.PieChartType")
-#define CHART2_SERVICE_NAME_CHARTTYPE_NET ::rtl::OUString::createFromAscii("com.sun.star.chart2.NetChartType")
-#define CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET ::rtl::OUString::createFromAscii("com.sun.star.chart2.FilledNetChartType")
-#define CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK ::rtl::OUString::createFromAscii("com.sun.star.chart2.CandleStickChartType")
-#define CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE ::rtl::OUString::createFromAscii("com.sun.star.chart2.BubbleChartType")
+#define CHART2_SERVICE_NAME_CHARTTYPE_AREA ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.AreaChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_BAR ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.BarChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_COLUMN ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ColumnChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_LINE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.LineChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_SCATTER ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ScatterChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_PIE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.PieChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_NET ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.NetChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.FilledNetChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CandleStickChartType" ))
+#define CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.BubbleChartType" ))
 
 //.............................................................................
 } //namespace chart
diff --git a/chart2/source/inc/servicenames_coosystems.hxx b/chart2/source/inc/servicenames_coosystems.hxx
index 0d026810e950..1a8de66e27be 100644
--- a/chart2/source/inc/servicenames_coosystems.hxx
+++ b/chart2/source/inc/servicenames_coosystems.hxx
@@ -33,10 +33,10 @@ namespace chart
 {
 //.............................................................................
 
-#define CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.CoordinateSystems.Cartesian")
-#define CHART2_COOSYSTEM_CARTESIAN_VIEW_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.CoordinateSystems.CartesianView")
-#define CHART2_COOSYSTEM_POLAR_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.CoordinateSystems.Polar")
-#define CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.CoordinateSystems.PolarView")
+#define CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CoordinateSystems.Cartesian" ))
+#define CHART2_COOSYSTEM_CARTESIAN_VIEW_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CoordinateSystems.CartesianView" ))
+#define CHART2_COOSYSTEM_POLAR_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CoordinateSystems.Polar" ))
+#define CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CoordinateSystems.PolarView" ))
 
 //.............................................................................
 } //namespace chart
diff --git a/chart2/source/inc/servicenames_dlwrapper.hxx b/chart2/source/inc/servicenames_dlwrapper.hxx
index a342bcf84531..ba082328b43b 100644
--- a/chart2/source/inc/servicenames_dlwrapper.hxx
+++ b/chart2/source/inc/servicenames_dlwrapper.hxx
@@ -33,8 +33,8 @@ namespace chart
 {
 //.............................................................................
 
-#define CHART2_VIEW_DLWRAPPER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.DrawModelWrapper")
-#define CHART2_VIEW_DLWRAPPER_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.chart2.DrawModelWrapper")
+#define CHART2_VIEW_DLWRAPPER_SERVICE_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.DrawModelWrapper" ))
+#define CHART2_VIEW_DLWRAPPER_SERVICE_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.DrawModelWrapper" ))
 
 //.............................................................................
 } //namespace chart
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 3628b35d2490..4f315240d678 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -738,16 +738,16 @@ Reference< chart2::data::XDataSource > ChartModel::impl_createDefaultData()
             //create data
             uno::Sequence< beans::PropertyValue > aArgs( 4 );
             aArgs[0] = beans::PropertyValue(
-                ::rtl::OUString::createFromAscii("CellRangeRepresentation"), -1,
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CellRangeRepresentation" )), -1,
                 uno::makeAny( C2U("all") ), beans::PropertyState_DIRECT_VALUE );
             aArgs[1] = beans::PropertyValue(
-                ::rtl::OUString::createFromAscii("HasCategories"), -1,
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasCategories" )), -1,
                 uno::makeAny( true ), beans::PropertyState_DIRECT_VALUE );
             aArgs[2] = beans::PropertyValue(
-                ::rtl::OUString::createFromAscii("FirstCellAsLabel"), -1,
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FirstCellAsLabel" )), -1,
                 uno::makeAny( true ), beans::PropertyState_DIRECT_VALUE );
             aArgs[3] = beans::PropertyValue(
-                ::rtl::OUString::createFromAscii("DataRowSource"), -1,
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DataRowSource" )), -1,
                 uno::makeAny( ::com::sun::star::chart::ChartDataRowSource_COLUMNS ), beans::PropertyState_DIRECT_VALUE );
             xDataSource = m_xInternalDataProvider->createDataSource( aArgs );
         }
@@ -1170,9 +1170,6 @@ Sequence< datatransfer::DataFlavor > SAL_CALL ChartModel::getTransferDataFlavors
 {
     uno::Sequence< datatransfer::DataFlavor > aRet(1);
 
-//     aRet[0] = datatransfer::DataFlavor( lcl_aGDIMetaFileMIMEType,
-//         C2U( "GDIMetaFile" ),
-//      ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) );
     aRet[0] = datatransfer::DataFlavor( lcl_aGDIMetaFileMIMETypeHighContrast,
         C2U( "GDIMetaFile" ),
         ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) );
@@ -1183,8 +1180,6 @@ Sequence< datatransfer::DataFlavor > SAL_CALL ChartModel::getTransferDataFlavors
 ::sal_Bool SAL_CALL ChartModel::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor )
     throw (uno::RuntimeException)
 {
-//     return ( aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMEType) ||
-//              aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast) );
     return aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast);
 }
 
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index 93ebc8aa88eb..a7943bc76cd4 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -160,7 +160,7 @@ Reference< document::XFilter > ChartModel::impl_createFilter(
 
     // find FilterName in MediaDescriptor
     OUString aFilterName(
-        lcl_getProperty< OUString >( rMediaDescriptor, OUString::createFromAscii("FilterName")));
+        lcl_getProperty< OUString >( rMediaDescriptor, OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ))));
 
     // if FilterName was found, get Filter from factory
     if( aFilterName.getLength() > 0 )
@@ -178,7 +178,7 @@ Reference< document::XFilter > ChartModel::impl_createFilter(
                 (aFilterProps >>= aProps))
             {
                 OUString aFilterServiceName(
-                    lcl_getProperty< OUString >( aProps, OUString::createFromAscii("FilterService")));
+                    lcl_getProperty< OUString >( aProps, OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterService" ))));
 
                 if( aFilterServiceName.getLength())
                 {
@@ -389,7 +389,7 @@ void ChartModel::impl_store(
         apphelper::MediaDescriptorHelper aMDHelper(rMediaDescriptor);
         try
         {
-            xPropSet->setPropertyValue( OUString::createFromAscii("SavedObject"),
+            xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "SavedObject" )),
                 uno::makeAny( aMDHelper.HierarchicalDocumentName ) );
         }
         catch ( uno::Exception& )
diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx
index 4630ebd9b766..842086b0435e 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -739,7 +739,7 @@ bool hasUnhiddenData( const uno::Reference< chart2::XDataSeries >& xSeries )
 
 struct lcl_LessIndex
 {
-    inline bool operator() ( const sal_Int32& first, const sal_Int32& second )
+    inline bool operator() ( const sal_Int32& first, const sal_Int32& second ) const
     {
         return ( first < second );
     }
diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx
index fc5e3757e5aa..327434ebaa79 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -453,28 +453,6 @@ void AxisLabelProperties::init( const uno::Reference< XAxis >& xAxisModel )
     }
 }
 
-/*
-sal_Int16 getSwappedWritingMode( sal_Int16 nWritingMode )
-{
-    //LR_TB == LT
-    //RL_TB == RT (Arabic, Hebrew)
-    //TB_RL == TR (Japanese, Chinese, Korean)
-    // ?? TL (Mongolian) see also text::WritingMode2
-
-    switch(nWritingMode)
-    {
-        case text::WritingMode2::RL_TB:
-            return  text::WritingMode2::TB_RL;
-        case text::WritingMode2::TB_RL:
-            return  text::WritingMode2::RL_TB;
-        case text::WritingMode2::LR_TB:
-            return  text::WritingMode2::TB_LR;
-        default:
-            return  text::WritingMode2::LR_TB;
-    }
-}
-*/
-
 sal_Bool AxisLabelProperties::getIsStaggered() const
 {
     if( STAGGER_ODD == eStaggering || STAGGER_EVEN == eStaggering )
diff --git a/chart2/source/view/inc/PlotterBase.hxx b/chart2/source/view/inc/PlotterBase.hxx
index 06db66a45547..605c9254a3a2 100644
--- a/chart2/source/view/inc/PlotterBase.hxx
+++ b/chart2/source/view/inc/PlotterBase.hxx
@@ -34,9 +34,6 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/drawing/Position3D.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-/*
-#include <com/sun/star/lang/XComponent.hpp>
-*/
 
 //----
 #include <vector>
@@ -44,9 +41,6 @@
 //---- chart2
 #include <com/sun/star/chart2/ExplicitScaleData.hpp>
 #include <com/sun/star/chart2/XTransformation.hpp>
-/*
-#include <com/sun/star/chart2/XPlotter.hpp>
-*/
 
 //----
 #include <cppuhelper/implbase1.hxx>
@@ -87,14 +81,7 @@ public:
     virtual void SAL_CALL createShapes() = 0;
 
     static bool isValidPosition( const ::com::sun::star::drawing::Position3D& rPos );
-    /*
-    virtual ::rtl::OUString SAL_CALL getCoordinateSystemTypeID(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException);
-    */
-
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
-    //-------------------------------------------------------------------------
+
 private: //methods
     //no default constructor
     PlotterBase();
@@ -113,8 +100,6 @@ protected: //member
     ::com::sun::star::uno::Reference<
                     ::com::sun::star::lang::XMultiServiceFactory>       m_xShapeFactory;
     ShapeFactory*                                                       m_pShapeFactory;
-    //::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>          m_xCC;
-
     rtl::OUString   m_aCID;
 
     sal_Int32                                           m_nDimension;
diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx
index 65f62069b485..ff2368a10da9 100644
--- a/chart2/source/view/inc/PlottingPositionHelper.hxx
+++ b/chart2/source/view/inc/PlottingPositionHelper.hxx
@@ -151,10 +151,6 @@ enum NormalAxis
 };
 
 class PolarPlottingPositionHelper : public PlottingPositionHelper
-    /*
-                                  , public ::cppu::WeakImplHelper1<
-                                ::com::sun::star::chart2::XTransformation >
-                                */
 {
 public:
     PolarPlottingPositionHelper( NormalAxis eNormalAxis=NormalAxis_Z );
@@ -198,21 +194,6 @@ public:
 
     inline bool isMathematicalOrientationAngle() const;
     inline bool isMathematicalOrientationRadius() const;
-
-    /*
-    // ____ XTransformation ____
-    /// @see ::com::sun::star::chart2::XTransformation
-    virtual ::com::sun::star::uno::Sequence< double > SAL_CALL transform(
-        const ::com::sun::star::uno::Sequence< double >& rSourceValues )
-        throw (::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::uno::RuntimeException);
-    /// @see ::com::sun::star::chart2::XTransformation
-    virtual sal_Int32 SAL_CALL getSourceDimension()
-        throw (::com::sun::star::uno::RuntimeException);
-    /// @see ::com::sun::star::chart2::XTransformation
-    virtual sal_Int32 SAL_CALL getTargetDimension()
-        throw (::com::sun::star::uno::RuntimeException);
-        */
 public:
     //Offset for radius axis in absolute logic scaled values (1.0 == 1 category)
     double      m_fRadiusOffset;
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index cac71a27ef53..511635451ccf 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -694,7 +694,8 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
             m_aSeriesPlotterList.push_back( pPlotter );
             pPlotter->setNumberFormatsSupplier( xNumberFormatsSupplier );
             pPlotter->setColorScheme( xColorScheme );
-            pPlotter->setExplicitCategoriesProvider( pVCooSys->getExplicitCategoriesProvider() );
+            if(pVCooSys)
+                pPlotter->setExplicitCategoriesProvider( pVCooSys->getExplicitCategoriesProvider() );
             sal_Int32 nMissingValueTreatment = DiagramHelper::getCorrectedMissingValueTreatment( xDiagram, xChartType );
 
             if(pVCooSys)
diff --git a/chart2/source/view/main/NumberFormatterWrapper.cxx b/chart2/source/view/main/NumberFormatterWrapper.cxx
index 2e5a85f3c5ab..57801472c099 100644
--- a/chart2/source/view/main/NumberFormatterWrapper.cxx
+++ b/chart2/source/view/main/NumberFormatterWrapper.cxx
@@ -58,15 +58,6 @@ FixedNumberFormatter::~FixedNumberFormatter()
 {
 }
 
-/*
-sal_Int32 FixedNumberFormatter::getTextAndColor( double fUnscaledValueForText, rtl::OUString& rLabel ) const
-{
-    sal_Int32 nLabelColor = Color(COL_BLUE).GetColor(); //@todo get this from somewheres
-    rLabel = getFormattedString( fUnscaledValueForText, nLabelColor );
-    return nLabelColor;
-}
-*/
-
 rtl::OUString FixedNumberFormatter::getFormattedString( double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const
 {
     return m_aNumberFormatterWrapper.getFormattedString(
@@ -145,26 +136,6 @@ rtl::OUString NumberFormatterWrapper::getFormattedString(
     return aRet;
 }
 
-// to get the language type use MsLangId::convertLocaleToLanguage( rNumberFormat.aLocale )
-
-/*
-    uno::Reference< i18n::XNumberFormatCode > xNumberFormatCode(
-        m_xCC->getServiceManager()->createInstanceWithContext( C2U(
-        "com.sun.star.i18n.NumberFormatMapper" ), m_xCC ), uno::UNO_QUERY );
-
-    i18n::NumberFormatCode aNumberFormatCode = xNumberFormatCode->getDefault (
-        i18n::KNumberFormatType::MEDIUM,
-        i18n::KNumberFormatUsage::SCIENTIFIC_NUMBER,
-        aLocale );
-
-    uno::Sequence< i18n::NumberFormatCode > aListOfNumberFormatCode = xNumberFormatCode->getAllFormatCode(
-        i18n::KNumberFormatUsage::SCIENTIFIC_NUMBER,
-        aLocale );
-
-    i18n::NumberFormatCode aNumberFormatCode0 = aListOfNumberFormatCode[0];
-    i18n::NumberFormatCode aNumberFormatCode1 = aListOfNumberFormatCode[1];
-*/
-
 //.............................................................................
 } //namespace chart
 //.............................................................................
diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx
index 65ae1fa6c000..2517879bb3a3 100644
--- a/chart2/source/view/main/PlottingPositionHelper.cxx
+++ b/chart2/source/view/main/PlottingPositionHelper.cxx
@@ -642,27 +642,6 @@ double PlottingPositionHelper::getBaseValueY() const
     return m_aScales[1].Origin;
 }
 
-/*
-// ____ XTransformation ____
-uno::Sequence< double > SAL_CALL PolarPlottingPositionHelper::transform(
-                        const uno::Sequence< double >& rSourceValues )
-            throw (uno::RuntimeException, lang::IllegalArgumentException)
-{
-    uno::Sequence< double > aSourceValues(3);
-    return aSourceValues;
-}
-
-sal_Int32 SAL_CALL PolarPlottingPositionHelper::getSourceDimension() throw (uno::RuntimeException)
-{
-    return 3;
-}
-
-sal_Int32 SAL_CALL PolarPlottingPositionHelper::getTargetDimension() throw (uno::RuntimeException)
-{
-    return 3;
-}
-*/
-
 //.............................................................................
 } //namespace chart
 //.............................................................................
diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx
index 6ffdef371db8..2efde92993a7 100644
--- a/chart2/source/view/main/PropertyMapper.cxx
+++ b/chart2/source/view/main/PropertyMapper.cxx
@@ -174,26 +174,6 @@ uno::Any* PropertyMapper::getValuePointerForLimitedSpace( tAnySequence& rPropVal
         , bLimitedHeight ? C2U("TextMaximumFrameHeight") : C2U("TextMaximumFrameWidth") );
 }
 
-/*
-//set some properties from service style::CharacterProperties:
-//-------- tabpage: Characters -----------
-//FontType eg. Albany               UNO_NAME_EDIT_CHAR_FONTNAME == UNO_NAME_EDIT_CHAR_FONTSTYLENAME    //UNO_NAME_CHAR_FONT
-//FontStyle eg. italic              UNO_NAME_EDIT_CHAR_POSTURE    UNO_NAME_CHAR_POSTURE awt::FontSlant NONE OBLIQUE ITALIC DONTKNOW REVERSE_OBLIQUE REVERSE_ITALIC
-//Fontsize (Pointsize eg. 12)       UNO_NAME_EDIT_CHAR_HEIGHT == UNO_NAME_CHAR_HEIGHT
-        //? UNO_NAME_EDIT_CHAR_WEIGHT == UNO_NAME_CHAR_WEIGHT
-//Language                          UNO_NAME_EDIT_CHAR_LOCALE lang::Locale
-
-//-------- tabpage: Font Effect -----------
-//Underline                         UNO_NAME_CHAR_UNDERLINE sal_Int16 awt::FontUnderline_NONE _SINGLE _DOUBLE _DOTTED _DONTKNOW _DASH ...
-//Underline-color                   ??? 'CharUnderlineColor' + CharUnderlineHasColor
-//Strikeout eg. double              "CharStrikeout" sal_Int16 awt::FontStrikeout_NONE _SINGLE _DOUBLE ...
-//Strikeout by word yes/no          "CharWordMode" bool
-//Fontcolor                         UNO_NAME_EDIT_CHAR_COLOR sal_Int32      UNO_NAME_CHAR_COLOR
-//ReliefType without/graved/emboss  "CharRelief" sal_Int16 text::FontRelief_NONE FontRelief_EMBOSSED FontRelief_ENGRAVED
-//Outline                           "CharContoured" bool
-//Shadows                           UNO_NAME_CHAR_SHADOWED bool
-*/
-
 //static
 const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForCharacterProperties()
 {
@@ -342,18 +322,7 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForTextShapeProper
         tMakePropertyNameMap
         ( PropertyMapper::getPropertyNameMapForCharacterProperties() )
         ( PropertyMapper::getPropertyNameMapForFillProperties() )
-        ( PropertyMapper::getPropertyNameMapForLineProperties() )
-//         ( PropertyMapper::getPropertyNameMapForParagraphProperties() )
-        // some text properties
-//         ( C2U( "TextHorizontalAdjust" ),   C2U( "TextHorizontalAdjust" ) )
-//         ( C2U( "TextVerticalAdjust" ),     C2U( "TextVerticalAdjust" ) )
-//         ( C2U( "TextAutoGrowHeight" ),     C2U( "TextAutoGrowHeight" ) )
-//         ( C2U( "TextAutoGrowWidth" ),      C2U( "TextAutoGrowWidth" ) )
-//         ( C2U( "TextLeftDistance" ),       C2U( "TextLeftDistance" ) )
-//         ( C2U( "TextRightDistance" ),      C2U( "TextRightDistance" ) )
-//         ( C2U( "TextUpperDistance" ),      C2U( "TextUpperDistance" ) )
-//         ( C2U( "TextLowerDistance" ),      C2U( "TextLowerDistance" ) )
-        ;
+        ( PropertyMapper::getPropertyNameMapForLineProperties() );
 
     return m_aShapePropertyMapForTextShapeProperties;
 }
@@ -366,7 +335,6 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForLineSeriesPrope
         tMakePropertyNameMap
         ( C2U( "LineColor" ),           C2U("Color") )
         ( C2U( "LineDashName" ),        C2U("LineDashName") )
-//      ( C2U( "LineJoint" ),           C2U("LineJoint") )
         ( C2U( "LineStyle" ),           C2U("LineStyle") )
         ( C2U( "LineTransparence" ),    C2U("Transparency") )
         ( C2U( "LineWidth" ),           C2U("LineWidth") )
diff --git a/chart2/uiconfig/menubar/menubar.xml b/chart2/uiconfig/menubar/menubar.xml
index 469d76cbc2f7..3c50167ef845 100644
--- a/chart2/uiconfig/menubar/menubar.xml
+++ b/chart2/uiconfig/menubar/menubar.xml
@@ -149,6 +149,7 @@
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:ShowLicense"/>
             <menu:menuseparator/>
+            <menu:menuitem menu:id=".uno:ShowCredits"/>
             <menu:menuitem menu:id=".uno:About"/>
         </menu:menupopup>
     </menu:menu>
diff --git a/chart2/workbench/addin/sampleaddin.cxx b/chart2/workbench/addin/sampleaddin.cxx
index 7b5b672d1be6..9491ae20d236 100644
--- a/chart2/workbench/addin/sampleaddin.cxx
+++ b/chart2/workbench/addin/sampleaddin.cxx
@@ -56,9 +56,9 @@ sal_Bool SAL_CALL component_writeInfo(
     {
         try
         {
-            OUString aImpl = OUString::createFromAscii( "/" );
+            OUString aImpl( RTL_CONSTASCII_USTRINGPARAM( "/" ));
             aImpl += SampleAddIn::getImplementationName_Static();
-            aImpl += OUString::createFromAscii( "/UNO/SERVICES" );
+            aImpl += OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
 
             uno::Reference< registry::XRegistryKey> xNewKey(
                 reinterpret_cast<registry::XRegistryKey*>( pRegistryKey )->createKey( aImpl ) );
@@ -137,9 +137,9 @@ sal_Bool SampleAddIn::getLogicalPosition( uno::Reference< drawing::XShape >& xAx
             try
             {
                 double fMin(0.0), fMax(0.0);
-                uno::Any aAny = xProp->getPropertyValue( OUString::createFromAscii( "Min" ));
+                uno::Any aAny = xProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Min" )));
                 aAny >>= fMin;
-                aAny = xProp->getPropertyValue( OUString::createFromAscii( "Max" ));
+                aAny = xProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Max" )));
                 aAny >>= fMax;
 
                 double fRange = fMax - fMin;
@@ -174,17 +174,17 @@ sal_Bool SampleAddIn::getLogicalPosition( uno::Reference< drawing::XShape >& xAx
 
 OUString SampleAddIn::getImplementationName_Static()
 {
-    return OUString::createFromAscii( "SampleAddIn" );
+    return OUString( RTL_CONSTASCII_USTRINGPARAM( "SampleAddIn" ));
 }
 
 uno::Sequence< ::rtl::OUString > SampleAddIn::getSupportedServiceNames_Static()
 {
     uno::Sequence< OUString > aSeq( 4 );
 
-    aSeq[ 0 ] = OUString::createFromAscii( "com.sun.star.chart.ChartAxisXSupplier" );
-    aSeq[ 1 ] = OUString::createFromAscii( "com.sun.star.chart.ChartAxisYSupplier" );
-    aSeq[ 2 ] = OUString::createFromAscii( "com.sun.star.chart.Diagram" );
-    aSeq[ 3 ] = OUString::createFromAscii( "com.sun.star.chart.SampleAddIn" );
+    aSeq[ 0 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartAxisXSupplier" ));
+    aSeq[ 1 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartAxisYSupplier" ));
+    aSeq[ 2 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.Diagram" ));
+    aSeq[ 3 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.SampleAddIn" ));
 
     return aSeq;
 }
@@ -219,7 +219,7 @@ void SAL_CALL SampleAddIn::initialize( const uno::Sequence< uno::Any >& aArgumen
             aBaseType <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.XYDiagram" ));
             try
             {
-                xDocProp->setPropertyValue( rtl::OUString::createFromAscii( "BaseDiagram" ), aBaseType );
+                xDocProp->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseDiagram" )), aBaseType );
             }
             catch( ... )
             {}
@@ -236,8 +236,8 @@ void SAL_CALL SampleAddIn::initialize( const uno::Sequence< uno::Any >& aArgumen
             {
                 uno::Any aAny;
                 aAny <<= (sal_Int32)( 0xe0e0f0 );
-                xDiaProp->setPropertyValue( OUString::createFromAscii( "FillColor" ), aAny );
-                xLegendProp->setPropertyValue( OUString::createFromAscii( "FillColor" ), aAny );
+                xDiaProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "FillColor" )), aAny );
+                xLegendProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "FillColor" )), aAny );
             }
         }
     }
@@ -285,7 +285,7 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
                 if( ! mxMyRedLine.is())
                 {
                     mxMyRedLine = uno::Reference< drawing::XShape >(
-                        xFactory->createInstance( OUString::createFromAscii( "com.sun.star.drawing.LineShape" )),
+                        xFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.LineShape" ))),
                         uno::UNO_QUERY );
                     xPage->add( mxMyRedLine );
 
@@ -298,8 +298,8 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
                         aWidth <<= (sal_Int32)(50);         // 0.5 mm
                         try
                         {
-                            xShapeProp->setPropertyValue( OUString::createFromAscii( "LineColor" ), aColor );
-                            xShapeProp->setPropertyValue( OUString::createFromAscii( "LineWidth" ), aWidth );
+                            xShapeProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "LineColor" )), aColor );
+                            xShapeProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "LineWidth" )), aWidth );
                         }
                         catch( ... )
                         {}
@@ -309,17 +309,12 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
                 if( ! mxMyText.is())
                 {
                     mxMyText = uno::Reference< drawing::XShape >(
-                        xFactory->createInstance( OUString::createFromAscii( "com.sun.star.drawing.TextShape" )),
+                        xFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.TextShape" ))),
                         uno::UNO_QUERY );
                     xPage->add( mxMyText );
 
                     // change text
-                    OUString aText;
-//                  if( maLocale.Language.equalsIgnoreCase( OUString::createFromAscii("DE")))
-//                      aText = OUString::createFromAscii( "Kleines Beispiel" );
-//                  else
-                        aText = OUString::createFromAscii( "Little Example" );
-
+                    OUString aText(RTL_CONSTASCII_USTRINGPARAM( "Little Example" ));
                     uno::Reference< beans::XPropertySet > xTextProp( mxMyText, uno::UNO_QUERY );
                     if( xTextProp.is())
                     {
@@ -327,7 +322,7 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
                         aTrueAny <<= (sal_Bool)(sal_True);
                         try
                         {
-                            xTextProp->setPropertyValue( rtl::OUString::createFromAscii( "TextAutoGrowWidth" ), aTrueAny );
+                            xTextProp->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextAutoGrowWidth" )), aTrueAny );
                         }
                         catch( ... )
                         {}
@@ -379,7 +374,7 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
                     {
                         uno::Any aAny;
                         aAny <<= aPtSeq;
-                        xShapeProp->setPropertyValue( rtl::OUString::createFromAscii( "PolyPolygon" ), aAny );
+                        xShapeProp->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PolyPolygon" )), aAny );
                     }
                 }
                 if( mxMyText.is())
@@ -400,10 +395,10 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
 //      {
 //          uno::Any aAny;
 //          aAny <<= (sal_Bool)(sal_False);
-//          xXAxis->setPropertyValue( rtl::OUString::createFromAscii( "AutoStepMain" ),
+//          xXAxis->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AutoStepMain" )),
 //                                    aAny );
 //          aAny <<= (double)(200.0);
-//          xXAxis->setPropertyValue( rtl::OUString::createFromAscii( "StepMain" ),
+//          xXAxis->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StepMain" )),
 //                                    aAny );
 //      }
 
@@ -413,9 +408,9 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
 //      {
 //          uno::Any aAny;
 //          aAny <<= (sal_Int32)(-1);
-//          xProp->setPropertyValue( OUString::createFromAscii( "SymbolType" ), aAny );
-//          aAny <<= rtl::OUString::createFromAscii( "http://mib-1168/www/images/go.gif" );
-//          xProp->setPropertyValue( OUString::createFromAscii( "SymbolBitmapURL" ), aAny );
+//          xProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "SymbolType" )), aAny );
+//          aAny <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "http://mib-1168/www/images/go.gif" ));
+//          xProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "SymbolBitmapURL" )), aAny );
 //      }
 }
 
@@ -436,7 +431,7 @@ void SAL_CALL SampleAddIn::removeRefreshListener( const uno::Reference< util::XR
 // XDiagram
 OUString SAL_CALL SampleAddIn::getDiagramType() throw( uno::RuntimeException )
 {
-    return OUString::createFromAscii( "com.sun.star.chart.SampleDiagram" );
+    return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.SampleDiagram" ));
 }
 
 // the following methods just delegate to the "parent diagram" (which in the future might no longer exist)
@@ -521,7 +516,7 @@ void SAL_CALL SampleAddIn::setPosition( const awt::Point& aPos )
 // XShapeDescriptor ( ::XShape ::XDiagram )
 rtl::OUString SAL_CALL SampleAddIn::getShapeType() throw( com::sun::star::uno::RuntimeException )
 {
-    return OUString::createFromAscii( "com.sun.star.chart.SampleAddinShape" );
+    return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.SampleAddinShape" ));
 }
 
 // XAxisXSupplier
@@ -673,7 +668,7 @@ uno::Reference< beans::XPropertySet > SAL_CALL SampleAddIn::getMinMaxLine()
 // XServiceName
 OUString SAL_CALL SampleAddIn::getServiceName() throw( uno::RuntimeException )
 {
-    return OUString::createFromAscii( "com.sun.star.chart.SampleAddIn" );
+    return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.SampleAddIn" ));
 }
 
 // XServiceInfo
diff --git a/codemaker/source/cunomaker/cunotype.hxx b/codemaker/source/cunomaker/cunotype.hxx
index 89e1347715f3..8df7a066a0a4 100644
--- a/codemaker/source/cunomaker/cunotype.hxx
+++ b/codemaker/source/cunomaker/cunotype.hxx
@@ -124,7 +124,7 @@ protected:
     ::rtl::OString  checkRealBaseType(const ::rtl::OString& type, sal_Bool bResolveTypeOnly = sal_False);
     void    dumpCppuGetTypeMemberDecl(FileStream& o, CunoTypeDecl eDeclFlag);
 
-     sal_Bool isNestedType()
+     sal_Bool isNestedType() const
         { return m_bIsNestedType; };
 
      RegistryKeyNames& getNestedTypeNames()
diff --git a/comphelper/inc/comphelper/locale.hxx b/comphelper/inc/comphelper/locale.hxx
index 317d74ae740f..85821dd28a89 100644
--- a/comphelper/inc/comphelper/locale.hxx
+++ b/comphelper/inc/comphelper/locale.hxx
@@ -70,40 +70,8 @@ class COMPHELPER_DLLPUBLIC Locale
 
         /** @short some predefined Locale objects. */
         static const Locale EN_US();
-        static const Locale EN();
-        static const Locale DE_DE();
-        static const Locale DE_CH();
-        static const Locale DE_AT();
-        static const Locale AR();
-        static const Locale CA();
-        static const Locale CS();
-        static const Locale DA();
-        static const Locale EL();
-        static const Locale ES();
-        static const Locale FI();
-        static const Locale FR();
-        static const Locale HE();
-        static const Locale HI_IN();
-        static const Locale HU();
-        static const Locale IT();
-        static const Locale JA();
-        static const Locale KO();
-        static const Locale NL();
-        static const Locale PL();
-        static const Locale PT();
-        static const Locale PT_BR();
-        static const Locale RU();
-        static const Locale SK();
-        static const Locale SL();
-        static const Locale SV();
-        static const Locale TH();
-        static const Locale TR();
         static const Locale X_DEFAULT();
-        static const Locale X_COMMENT();
-        static const Locale X_TRANSLATE();
         static const Locale X_NOTRANSLATE();
-        static const Locale ZH_CN();
-        static const Locale ZH_TW();
 
     //-------------------------------------------
     // types
@@ -381,29 +349,6 @@ class COMPHELPER_DLLPUBLIC Locale
             throw(MalFormedLocaleException);
 
         //---------------------------------------
-        /** @short      search for the next possible fallback locale.
-
-            @descr      Instead of getFallback(vector<>, string) this method
-                        uses the given locale and decide by using an algorithm
-                        which locale can be the next possible one.
-
-                        Algorithm:
-                        - if locale has country return language only
-                        - if locale different "en-US" return "en-US"
-                        - if locale "en-US" return "en"
-
-            @param      aLocale [in/out]!
-                        the incoming value will be used to start
-                        search for a possible fallback ...
-                        and in case such fallback was found this parameter
-                        will be used for return too.
-
-            @return     TRUE if the parameter aLocale contains a new fallback value;
-                        FALSE otherwise.
-         */
-        static sal_Bool getFallback(Locale& aLocale);
-
-        //---------------------------------------
         /** @short      assign elements of another locale
                         to this instance.
 
diff --git a/comphelper/inc/comphelper/propertycontainerhelper.hxx b/comphelper/inc/comphelper/propertycontainerhelper.hxx
index 42bfe1f2de8e..e6439ea34e96 100644
--- a/comphelper/inc/comphelper/propertycontainerhelper.hxx
+++ b/comphelper/inc/comphelper/propertycontainerhelper.hxx
@@ -32,9 +32,7 @@
 #include <cppuhelper/propshlp.hxx>
 #include <com/sun/star/uno/Type.hxx>
 #include <com/sun/star/beans/Property.hpp>
-#ifndef __SGI_STL_VECTOR
 #include <vector>
-#endif
 #include "comphelper/comphelperdllapi.h"
 
 //.........................................................................
diff --git a/comphelper/inc/comphelper/sequenceasvector.hxx b/comphelper/inc/comphelper/sequenceasvector.hxx
index 6fb303f0d36f..a68fa2093116 100644
--- a/comphelper/inc/comphelper/sequenceasvector.hxx
+++ b/comphelper/inc/comphelper/sequenceasvector.hxx
@@ -68,6 +68,11 @@ class SequenceAsVector : public ::std::vector< TElementType >
                     types from the base! */
         typedef typename ::std::vector< TElementType >::const_iterator const_iterator;
 
+        //---------------------------------------
+        /** @short  When inheriting from a template using typename is generally required when using
+                    types from the base! */
+        typedef typename ::std::vector< TElementType >::iterator iterator;
+
     //-------------------------------------------
     // interface
     public:
diff --git a/comphelper/inc/comphelper/stl_types.hxx b/comphelper/inc/comphelper/stl_types.hxx
index 89f0e023f0c1..4f6583192716 100644
--- a/comphelper/inc/comphelper/stl_types.hxx
+++ b/comphelper/inc/comphelper/stl_types.hxx
@@ -28,8 +28,6 @@
 #ifndef _COMPHELPER_STLTYPES_HXX_
 #define _COMPHELPER_STLTYPES_HXX_
 
-#if !defined(__SGI_STL_VECTOR_H) || !defined(__SGI_STL_MAP_H) || !defined(__SGI_STL_MULTIMAP_H)
-
 #include <vector>
 #include <map>
 
@@ -277,8 +275,6 @@ OutputIter intersperse(
     typedef ::std::set< valuetype, comparefct > classname;  \
     DECLARE_STL_ITERATORS(classname)                        \
 
-#endif
-
 #endif  // _COMPHELPER_STLTYPES_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/source/compare/AnyCompareFactory.cxx b/comphelper/source/compare/AnyCompareFactory.cxx
index 04152c8156cf..787c68d97a18 100644
--- a/comphelper/source/compare/AnyCompareFactory.cxx
+++ b/comphelper/source/compare/AnyCompareFactory.cxx
@@ -65,7 +65,7 @@ public:
         if ( xFactory.is() )
     {
         m_rCollator = Reference< XCollator >(
-                xFactory->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.i18n.Collator" ), xContext ),
+                xFactory->createInstanceWithContext( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.Collator" )), xContext ),
                         UNO_QUERY );
         m_rCollator->loadDefaultCollator( rLocale,
                                           0 ); //???
@@ -133,7 +133,7 @@ Reference< XAnyCompare > SAL_CALL AnyCompareFactory::createAnyCompareByName( con
     // for now only OUString properties compare is implemented
     // so no check for the property name is done
 
-    if( aPropertyName.equals( OUString::createFromAscii( "Title" ) ) )
+    if( aPropertyName.equals( OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" )) ) )
         return m_rAnyCompare;
 
     return Reference< XAnyCompare >();
diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
index d5a7129911b0..4608f9115bcb 100644
--- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
@@ -39,9 +39,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 
-#ifndef __SGI_STL_VECTOR
 #include <vector>
-#endif
 
 using namespace com::sun::star;
 
@@ -123,8 +121,8 @@ void SAL_CALL IndexedPropertyValuesContainer::insertByIndex( sal_Int32 nIndex, c
                 sal_Int32 i(0);
                 while(i < nIndex)
                 {
-                    i++;
-                    aItr++;
+                    ++i;
+                    ++aItr;
                 }
             }
             else
@@ -133,8 +131,8 @@ void SAL_CALL IndexedPropertyValuesContainer::insertByIndex( sal_Int32 nIndex, c
                 sal_Int32 i(nSize - 1);
                 while(i > nIndex)
                 {
-                    i--;
-                    aItr--;
+                    --i;
+                    --aItr;
                 }
             }
             maProperties.insert(aItr, aProps);
@@ -158,8 +156,8 @@ void SAL_CALL IndexedPropertyValuesContainer::removeByIndex( sal_Int32 nIndex )
             sal_Int32 i(0);
             while(i < nIndex)
             {
-                i++;
-                aItr++;
+                ++i;
+                ++aItr;
             }
         }
         else
@@ -168,8 +166,8 @@ void SAL_CALL IndexedPropertyValuesContainer::removeByIndex( sal_Int32 nIndex )
             sal_Int32 i(nSize - 1);
             while(i > nIndex)
             {
-                i--;
-                aItr--;
+                --i;
+                --aItr;
             }
         }
         maProperties.erase(aItr);
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index 0e37c7a02e5e..744a6436bda6 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx
@@ -381,7 +381,7 @@ Reference< XEventAttacherManager > createEventAttacherManager( const Reference<
 {
     if ( rSMgr.is() )
     {
-        Reference< XInterface > xIFace( rSMgr->createInstance( OUString::createFromAscii("com.sun.star.beans.Introspection") ) );
+        Reference< XInterface > xIFace( rSMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.beans.Introspection" )) ) );
         if ( xIFace.is() )
         {
             Reference< XIntrospection > xIntrospection( xIFace, UNO_QUERY);
@@ -401,12 +401,12 @@ ImplEventAttacherManager::ImplEventAttacherManager( const Reference< XIntrospect
 {
     if ( rSMgr.is() )
     {
-        Reference< XInterface > xIFace( rSMgr->createInstance( OUString::createFromAscii("com.sun.star.script.EventAttacher") ) );
+        Reference< XInterface > xIFace( rSMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.EventAttacher" )) ) );
         if ( xIFace.is() )
         {
             xAttacher = Reference< XEventAttacher >::query( xIFace );
         }
-        xIFace = rSMgr->createInstance( OUString::createFromAscii("com.sun.star.script.Converter") );
+        xIFace = rSMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.Converter" )) );
         if ( xIFace.is() )
         {
             xConverter = Reference< XTypeConverter >::query( xIFace );
@@ -433,7 +433,7 @@ Reference< XIdlReflection > ImplEventAttacherManager::getReflection() throw( Exc
     // Haben wir den Service schon? Sonst anlegen
     if( !mxCoreReflection.is() )
     {
-        Reference< XInterface > xIFace( mxSMgr->createInstance( OUString::createFromAscii("com.sun.star.reflection.CoreReflection") ) );
+        Reference< XInterface > xIFace( mxSMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.reflection.CoreReflection" )) ) );
         mxCoreReflection = Reference< XIdlReflection >( xIFace, UNO_QUERY);
     }
     return mxCoreReflection;
diff --git a/comphelper/source/misc/locale.cxx b/comphelper/source/misc/locale.cxx
index d6fa3873110d..0a791c41582c 100644
--- a/comphelper/source/misc/locale.cxx
+++ b/comphelper/source/misc/locale.cxx
@@ -54,15 +54,6 @@ const Locale Locale::X_DEFAULT()
 }
 
 //-----------------------------------------------
-const Locale Locale::EN()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")),
-                    ::rtl::OUString());
-    return aLocale;
-}
-
-//-----------------------------------------------
 const Locale Locale::EN_US()
 {
     static Locale aLocale(
@@ -72,267 +63,6 @@ const Locale Locale::EN_US()
 }
 
 //-----------------------------------------------
-const Locale Locale::DE_DE()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de")),
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE")));
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::DE_CH()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de")),
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CH")));
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::DE_AT()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de")),
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AT")));
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::AR()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ar")),
-                    ::rtl::OUString());
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::CA()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ca")),
-                    ::rtl::OUString());
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::CS()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cs")),
-                    ::rtl::OUString());
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::DA()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("da")),
-                    ::rtl::OUString());
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::EL()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("el")),
-                    ::rtl::OUString());
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::ES()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("es")),
-                    ::rtl::OUString());
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::FI()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fi")),
-                    ::rtl::OUString());
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::FR()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fr")),
-                    ::rtl::OUString());
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::HE()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("he")),
-                    ::rtl::OUString());
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::HI_IN()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hi")),
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IN")));
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::HU()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hu")),
-                    ::rtl::OUString());
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::IT()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("it")),
-                    ::rtl::OUString());
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::JA()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ja")),
-                    ::rtl::OUString());
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::KO()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ko")),
-                    ::rtl::OUString());
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::NL()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nl")),
-                    ::rtl::OUString());
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::PL()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pl")),
-                    ::rtl::OUString());
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::PT()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pt")),
-                    ::rtl::OUString());
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::PT_BR()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pt")),
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BR")));
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::RU()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ru")),
-                    ::rtl::OUString());
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::SK()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sk")),
-                    ::rtl::OUString());
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::SL()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sl")),
-                    ::rtl::OUString());
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::SV()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sv")),
-                    ::rtl::OUString());
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::TH()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("th")),
-                    ::rtl::OUString());
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::TR()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tr")),
-                    ::rtl::OUString());
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::X_COMMENT()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x")),
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("comment")));
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::X_TRANSLATE()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x")),
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("translate")));
-    return aLocale;
-}
-
-//-----------------------------------------------
 const Locale Locale::X_NOTRANSLATE()
 {
     static Locale aLocale(
@@ -342,24 +72,6 @@ const Locale Locale::X_NOTRANSLATE()
 }
 
 //-----------------------------------------------
-const Locale Locale::ZH_CN()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("zh")),
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CN")));
-    return aLocale;
-}
-
-//-----------------------------------------------
-const Locale Locale::ZH_TW()
-{
-    static Locale aLocale(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("zh")),
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TW")));
-    return aLocale;
-}
-
-//-----------------------------------------------
 Locale::Locale(const ::rtl::OUString& sISO)
     throw(Locale::MalFormedLocaleException)
 {
@@ -612,52 +324,6 @@ sal_Bool Locale::similar(const Locale& aComparable) const
 }
 
 //-----------------------------------------------
-sal_Bool Locale::getFallback(Locale& aLocale)
-{
-    // a)
-    // this was our last fallback!
-    // break any further calls to this method ...
-    if (aLocale.equals(X_NOTRANSLATE()))
-        return sal_False;
-
-    // b)
-    // switch from X_DEFAULT to X_NOTRANSLATE
-    // next time we will go to a)
-    if (aLocale.equals(X_DEFAULT()))
-    {
-        aLocale = X_NOTRANSLATE();
-        return sal_True;
-    }
-
-    // c)
-    // switch from EN to X_DEFAULT
-    // next time we will go to b)
-    if (aLocale.equals(EN()))
-    {
-        aLocale = X_DEFAULT();
-        return sal_True;
-    }
-
-    // d) remove country from incoming locale
-    //    e.g. "de-DE" => "de" or "en-US" => "en"!
-    if (aLocale.getCountry().getLength())
-    {
-        aLocale.setCountry(::rtl::OUString());
-        return sal_True;
-    }
-
-    // e) "en-US" possible?
-    if (!aLocale.equals(EN_US()))
-    {
-        aLocale = EN_US();
-        return sal_True;
-    }
-
-    // f) no more fallbacks
-    return sal_False;
-}
-
-//-----------------------------------------------
 void  Locale::operator=(const Locale& rCopy)
 {
     // Take over these values without checking ...
diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx
index 83f54ff027ea..a9be31ae2d1b 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -419,8 +419,8 @@ MediaDescriptor::MediaDescriptor(const css::uno::Sequence< css::beans::NamedValu
 -----------------------------------------------*/
 sal_Bool MediaDescriptor::isStreamReadOnly() const
 {
-    static ::rtl::OUString CONTENTSCHEME_FILE     = ::rtl::OUString::createFromAscii("file");
-    static ::rtl::OUString CONTENTPROP_ISREADONLY = ::rtl::OUString::createFromAscii("IsReadOnly");
+    static ::rtl::OUString CONTENTSCHEME_FILE(     RTL_CONSTASCII_USTRINGPARAM( "file" ));
+    static ::rtl::OUString CONTENTPROP_ISREADONLY( RTL_CONSTASCII_USTRINGPARAM( "IsReadOnly" ));
     static sal_Bool        READONLY_FALLBACK      = sal_False;
 
     sal_Bool bReadOnly = READONLY_FALLBACK;
@@ -591,7 +591,7 @@ sal_Bool MediaDescriptor::impl_addInputStream( sal_Bool bLockFile )
         ::rtl::OUString sURL = getUnpackedValueOrDefault(MediaDescriptor::PROP_URL(), ::rtl::OUString());
         if (!sURL.getLength())
             throw css::uno::Exception(
-                    ::rtl::OUString::createFromAscii("Found no URL."),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Found no URL." )),
                     css::uno::Reference< css::uno::XInterface >());
 
         // Parse URL! Only the main part has to be used further. E.g. a jumpmark can make trouble
@@ -622,7 +622,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference
 {
     if ( !_rxPostData.is() )
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii("Found invalid PostData."),
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Found invalid PostData." )),
                 css::uno::Reference< css::uno::XInterface >(), 1);
 
     // PostData can't be used in read/write mode!
@@ -640,7 +640,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference
     ::rtl::OUString sMediaType = getUnpackedValueOrDefault(MediaDescriptor::PROP_MEDIATYPE(), ::rtl::OUString());
     if (!sMediaType.getLength())
     {
-        sMediaType = ::rtl::OUString::createFromAscii("application/x-www-form-urlencoded");
+        sMediaType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/x-www-form-urlencoded" ));
         (*this)[MediaDescriptor::PROP_MEDIATYPE()] <<= sMediaType;
     }
 
@@ -842,7 +842,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const ::rtl::OUString& sURL, s
        it parses the URL in another way. It's main part isnt enough
        and it's complete part contains the jumpmark (fragment) parameter ...
     */
-    static ::rtl::OUString SERVICENAME_URIREFERENCEFACTORY = ::rtl::OUString::createFromAscii("com.sun.star.uri.UriReferenceFactory");
+    static ::rtl::OUString SERVICENAME_URIREFERENCEFACTORY( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uri.UriReferenceFactory" ));
 
     try
     {
diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx
index a61e8a36a27c..fc3093f24525 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -59,7 +59,7 @@ MimeConfigurationHelper::MimeConfigurationHelper( const uno::Reference< lang::XM
         for ( sal_Int32 nInd = 0; nInd < aClassID.getLength(); nInd++ )
         {
             if ( nInd == 4 || nInd == 6 || nInd == 8 || nInd == 10 )
-                aResult += ::rtl::OUString::createFromAscii( "-" );
+                aResult += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "-" ));
 
             sal_Int32 nDigit1 = (sal_Int32)( (sal_uInt8)aClassID[nInd] / 16 );
             sal_Int32 nDigit2 = (sal_uInt8)aClassID[nInd] % 16;
@@ -132,18 +132,18 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetConfigurati
         if ( !m_xConfigProvider.is() )
             m_xConfigProvider = uno::Reference< lang::XMultiServiceFactory >(
                 m_xFactory->createInstance(
-                    ::rtl::OUString::createFromAscii( "com.sun.star.configuration.ConfigurationProvider" ) ),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" )) ),
                 uno::UNO_QUERY_THROW );
 
         uno::Sequence< uno::Any > aArgs( 1 );
         beans::PropertyValue aPathProp;
-        aPathProp.Name = ::rtl::OUString::createFromAscii( "nodepath" );
+        aPathProp.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ));
         aPathProp.Value <<= aPath;
         aArgs[0] <<= aPathProp;
 
         xConfig = uno::Reference< container::XNameAccess >(
                             m_xConfigProvider->createInstanceWithArguments(
-                                ::rtl::OUString::createFromAscii( "com.sun.star.configuration.ConfigurationAccess" ),
+                                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" )),
                                 aArgs ),
                             uno::UNO_QUERY );
     }
@@ -160,7 +160,7 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetObjConfigur
 
     if ( !m_xObjectConfig.is() )
         m_xObjectConfig = GetConfigurationByPath(
-                                        ::rtl::OUString::createFromAscii( "/org.openoffice.Office.Embedding/Objects" ) );
+                                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Embedding/Objects" )) );
 
     return m_xObjectConfig;
 }
@@ -172,7 +172,7 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetVerbsConfig
 
     if ( !m_xVerbsConfig.is() )
         m_xVerbsConfig = GetConfigurationByPath(
-                                        ::rtl::OUString::createFromAscii( "/org.openoffice.Office.Embedding/Verbs" ) );
+                                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Embedding/Verbs" )) );
 
     return m_xVerbsConfig;
 }
@@ -184,7 +184,7 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetMediaTypeCo
 
     if ( !m_xMediaTypeConfig.is() )
         m_xMediaTypeConfig = GetConfigurationByPath(
-                    ::rtl::OUString::createFromAscii( "/org.openoffice.Office.Embedding/MimeTypeClassIDRelations" ) );
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Embedding/MimeTypeClassIDRelations" )) );
 
     return m_xMediaTypeConfig;
 }
@@ -196,7 +196,7 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetMediaTypeCo
     try
     {
         uno::Reference< container::XNameAccess > xFilterFactory(
-            m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ),
+            m_xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" )) ),
             uno::UNO_QUERY_THROW );
 
         uno::Any aFilterAnyData = xFilterFactory->getByName( aFilterName );
@@ -219,7 +219,7 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetMediaTypeCo
 {
     uno::Reference< container::XContainerQuery > xTypeCFG(
             m_xFactory->createInstance(
-                ::rtl::OUString::createFromAscii( "com.sun.star.document.TypeDetection" ) ),
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" )) ),
             uno::UNO_QUERY );
 
     if ( xTypeCFG.is() )
@@ -228,7 +228,7 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetMediaTypeCo
         {
             // make query for all types matching the properties
             uno::Sequence < beans::NamedValue > aSeq( 1 );
-            aSeq[0].Name = ::rtl::OUString::createFromAscii( "MediaType" );
+            aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ));
             aSeq[0].Value <<= aMediaType;
 
             uno::Reference < container::XEnumeration > xEnum = xTypeCFG->createSubSetEnumerationByProperties( aSeq );
@@ -271,10 +271,10 @@ sal_Bool MimeConfigurationHelper::GetVerbByShortcut( const ::rtl::OUString& aVer
         if ( xVerbsConfig.is() && ( xVerbsConfig->getByName( aVerbShortcut ) >>= xVerbsProps ) && xVerbsProps.is() )
         {
             embed::VerbDescriptor aTempDescr;
-            if ( ( xVerbsProps->getByName( ::rtl::OUString::createFromAscii( "VerbID" ) ) >>= aTempDescr.VerbID )
-              && ( xVerbsProps->getByName( ::rtl::OUString::createFromAscii( "VerbUIName" ) ) >>= aTempDescr.VerbName )
-              && ( xVerbsProps->getByName( ::rtl::OUString::createFromAscii( "VerbFlags" ) ) >>= aTempDescr.VerbFlags )
-              && ( xVerbsProps->getByName( ::rtl::OUString::createFromAscii( "VerbAttributes" ) ) >>= aTempDescr.VerbAttributes ) )
+            if ( ( xVerbsProps->getByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VerbID" )) ) >>= aTempDescr.VerbID )
+              && ( xVerbsProps->getByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VerbUIName" )) ) >>= aTempDescr.VerbName )
+              && ( xVerbsProps->getByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VerbFlags" )) ) >>= aTempDescr.VerbFlags )
+              && ( xVerbsProps->getByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VerbAttributes" )) ) >>= aTempDescr.VerbAttributes ) )
             {
                   aDescriptor = aTempDescr;
                 bResult = sal_True;
@@ -302,7 +302,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjPropsFromConfi
             uno::Sequence< ::rtl::OUString > aObjPropNames = xObjectProps->getElementNames();
 
             aResult.realloc( aObjPropNames.getLength() + 1 );
-            aResult[0].Name = ::rtl::OUString::createFromAscii( "ClassID" );
+            aResult[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ClassID" ));
             aResult[0].Value <<= aClassID;
 
             for ( sal_Int32 nInd = 0; nInd < aObjPropNames.getLength(); nInd++ )
@@ -366,9 +366,9 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByStri
     if ( ClassIDsEqual( aClassID, GetSequenceClassID( SO3_DUMMY_CLASSID ) ) )
     {
         aObjProps.realloc(2);
-        aObjProps[0].Name = ::rtl::OUString::createFromAscii("ObjectFactory");
-        aObjProps[0].Value <<= ::rtl::OUString::createFromAscii("com.sun.star.embed.OOoSpecialEmbeddedObjectFactory");
-        aObjProps[1].Name = ::rtl::OUString::createFromAscii("ClassID");
+        aObjProps[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ObjectFactory" ));
+        aObjProps[0].Value <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OOoSpecialEmbeddedObjectFactory" ));
+        aObjProps[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ClassID" ));
         aObjProps[1].Value <<= aClassID;
         return aObjProps;
     }
@@ -399,9 +399,9 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByClas
     if ( ClassIDsEqual( aClassID, GetSequenceClassID( SO3_DUMMY_CLASSID ) ) )
     {
         aObjProps.realloc(2);
-        aObjProps[0].Name = ::rtl::OUString::createFromAscii("ObjectFactory");
-        aObjProps[0].Value <<= ::rtl::OUString::createFromAscii("com.sun.star.embed.OOoSpecialEmbeddedObjectFactory");
-        aObjProps[1].Name = ::rtl::OUString::createFromAscii("ClassID");
+        aObjProps[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ObjectFactory" ));
+        aObjProps[0].Value <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OOoSpecialEmbeddedObjectFactory" ));
+        aObjProps[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ClassID" ));
         aObjProps[1].Value <<= aClassID;
     }
 
@@ -466,7 +466,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu
 
                     if ( ( xObjConfig->getByName( aClassIDs[nInd] ) >>= xObjectProps ) && xObjectProps.is()
                       && ( xObjectProps->getByName(
-                                  ::rtl::OUString::createFromAscii( "ObjectDocumentServiceName" ) ) >>= aEntryDocName )
+                                  ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ObjectDocumentServiceName" )) ) >>= aEntryDocName )
                       && aEntryDocName.equals( aDocName ) )
                     {
                         return GetObjPropsFromConfigEntry( GetSequenceClassIDRepresentation( aClassIDs[nInd] ),
@@ -500,13 +500,13 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu
         try
         {
             if ( xObjConfig.is() && ( xObjConfig->getByName( aStringClassID.toAsciiUpperCase() ) >>= xObjectProps ) && xObjectProps.is() )
-                xObjectProps->getByName( ::rtl::OUString::createFromAscii( "ObjectFactory" ) ) >>= aResult;
+                xObjectProps->getByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ObjectFactory" )) ) >>= aResult;
         }
         catch( uno::Exception& )
         {
             uno::Sequence< sal_Int8 > aClassID = GetSequenceClassIDRepresentation( aStringClassID );
             if ( ClassIDsEqual( aClassID, GetSequenceClassID( SO3_DUMMY_CLASSID ) ) )
-                return ::rtl::OUString::createFromAscii("com.sun.star.embed.OOoSpecialEmbeddedObjectFactory");
+                return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OOoSpecialEmbeddedObjectFactory" ));
         }
     }
 
@@ -533,10 +533,10 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu
 
                     if ( ( xObjConfig->getByName( aClassIDs[nInd] ) >>= xObjectProps ) && xObjectProps.is()
                       && ( xObjectProps->getByName(
-                                  ::rtl::OUString::createFromAscii( "ObjectDocumentServiceName" ) ) >>= aEntryDocName )
+                                  ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ObjectDocumentServiceName" )) ) >>= aEntryDocName )
                       && aEntryDocName.equals( aDocName ) )
                     {
-                        xObjectProps->getByName( ::rtl::OUString::createFromAscii( "ObjectFactory" ) ) >>= aResult;
+                        xObjectProps->getByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ObjectFactory" )) ) >>= aResult;
                         break;
                     }
                 }
@@ -581,7 +581,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu
         // filter name is not specified, so type detection should be done
 
         uno::Reference< document::XTypeDetection > xTypeDetection(
-                m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.TypeDetection" ) ),
+                m_xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" )) ),
                 uno::UNO_QUERY );
 
         if ( !xTypeDetection.is() )
@@ -602,7 +602,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu
         {
             sal_Int32 nOldLen = aMediaDescr.getLength();
             aMediaDescr.realloc( nOldLen + 1 );
-            aMediaDescr[nOldLen].Name = ::rtl::OUString::createFromAscii( "FilterName" );
+            aMediaDescr[nOldLen].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
             aMediaDescr[ nOldLen ].Value <<= aFilterName;
 
         }
@@ -619,7 +619,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu
                     {
                         sal_Int32 nOldLen = aMediaDescr.getLength();
                         aMediaDescr.realloc( nOldLen + 1 );
-                        aMediaDescr[nOldLen].Name = ::rtl::OUString::createFromAscii( "FilterName" );
+                        aMediaDescr[nOldLen].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
                         aMediaDescr[ nOldLen ].Value = aTypes[nInd].Value;
                         break;
                     }
@@ -659,7 +659,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu
     {
         sal_Int32 nOldLen = aMediaDescr.getLength();
         aMediaDescr.realloc( nOldLen + 1 );
-        aMediaDescr[nOldLen].Name = ::rtl::OUString::createFromAscii( "DocumentService" );
+        aMediaDescr[nOldLen].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentService" ));
         aMediaDescr[nOldLen].Value <<= aDocName;
     }
 
@@ -675,7 +675,7 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
         try
         {
             uno::Reference< container::XNameAccess > xFilterFactory(
-                m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ),
+                m_xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" )) ),
                 uno::UNO_QUERY_THROW );
 
             uno::Any aFilterAnyData = xFilterFactory->getByName( aFilterName );
@@ -710,13 +710,13 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
         try
         {
             uno::Reference< container::XContainerQuery > xFilterQuery(
-                m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ),
+                m_xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" )) ),
                 uno::UNO_QUERY_THROW );
 
             uno::Sequence< beans::NamedValue > aSearchRequest( 2 );
-            aSearchRequest[0].Name = ::rtl::OUString::createFromAscii( "DocumentService" );
+            aSearchRequest[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentService" ));
             aSearchRequest[0].Value <<= aServiceName;
-            aSearchRequest[1].Name = ::rtl::OUString::createFromAscii( "FileFormatVersion" );
+            aSearchRequest[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FileFormatVersion" ));
             aSearchRequest[1].Value <<= nVersion;
 
             uno::Sequence< beans::PropertyValue > aFilterProps;
@@ -731,7 +731,7 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
                     if ( xFilterEnum->nextElement() >>= aProps )
                     {
                         SequenceAsHashMap aPropsHM( aProps );
-                        sal_Int32 nFlags = aPropsHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Flags" ),
+                        sal_Int32 nFlags = aPropsHM.getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Flags" )),
                                                                                 (sal_Int32)0 );
 
                         // that should be import, export, own filter and not a template filter ( TemplatePath flag )
@@ -740,7 +740,7 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
                             // if there are more than one filter the preffered one should be used
                             // if there is no preffered filter the first one will be used
                             if ( !aResult.getLength() || ( nFlags & 0x10000000L ) )
-                                aResult = aPropsHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Name" ),
+                                aResult = aPropsHM.getUnpackedValueOrDefault( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" )),
                                                                                 ::rtl::OUString() );
                             if ( nFlags & 0x10000000L )
                                 break; // the preffered filter was found
diff --git a/comphelper/source/misc/numbers.cxx b/comphelper/source/misc/numbers.cxx
index a011964b91fa..d86bef05f21a 100644
--- a/comphelper/source/misc/numbers.cxx
+++ b/comphelper/source/misc/numbers.cxx
@@ -53,7 +53,7 @@ sal_Int16 getNumberFormatType(const staruno::Reference<starutil::XNumberFormats>
         {
             staruno::Reference<starbeans::XPropertySet> xFormat(xFormats->getByKey(nKey));
             if (xFormat.is())
-                xFormat->getPropertyValue(rtl::OUString::createFromAscii("Type")) >>= nReturn;
+                xFormat->getPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Type" ))) >>= nReturn;
         }
         catch(...)
         {
@@ -83,7 +83,7 @@ staruno::Any getNumberFormatDecimals(const staruno::Reference<starutil::XNumberF
             staruno::Reference<starbeans::XPropertySet> xFormat( xFormats->getByKey(nKey));
             if (xFormat.is())
             {
-                static ::rtl::OUString PROPERTY_DECIMALS = ::rtl::OUString::createFromAscii("Decimals");
+                static ::rtl::OUString PROPERTY_DECIMALS( RTL_CONSTASCII_USTRINGPARAM( "Decimals" ));
                 return xFormat->getPropertyValue(PROPERTY_DECIMALS);
             }
         }
diff --git a/comphelper/source/misc/officerestartmanager.cxx b/comphelper/source/misc/officerestartmanager.cxx
index 6c1f38b15ff9..20af7275ca4d 100644
--- a/comphelper/source/misc/officerestartmanager.cxx
+++ b/comphelper/source/misc/officerestartmanager.cxx
@@ -104,7 +104,7 @@ void SAL_CALL OOfficeRestartManager::requestRestart( const uno::Reference< task:
 
         uno::Reference< awt::XRequestCallback > xRequestCallback(
             xFactory->createInstanceWithContext(
-                 ::rtl::OUString::createFromAscii("com.sun.star.awt.AsyncCallback"),
+                 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.AsyncCallback" )),
                  m_xContext ),
              uno::UNO_QUERY_THROW );
 
diff --git a/comphelper/source/misc/regpathhelper.cxx b/comphelper/source/misc/regpathhelper.cxx
index 898d1224b091..5c39ef684dc7 100644
--- a/comphelper/source/misc/regpathhelper.cxx
+++ b/comphelper/source/misc/regpathhelper.cxx
@@ -72,7 +72,7 @@ static sal_Bool retrievePortalUserDir( OUString *pDirectory )
     {
         if ( !osl_getCommandArg(--nArgs, &sArg.pData) )
         {
-            if ( sArg.indexOf(OUString::createFromAscii("-userid")) == 0 )
+            if ( sArg.indexOf(OUString( RTL_CONSTASCII_USTRINGPARAM( "-userid" ))) == 0 )
             {
 
                 bIsPortalUser = sal_True;
diff --git a/comphelper/source/misc/sequenceashashmap.cxx b/comphelper/source/misc/sequenceashashmap.cxx
index c1b9cd9463b4..d119f10a3a0d 100644
--- a/comphelper/source/misc/sequenceashashmap.cxx
+++ b/comphelper/source/misc/sequenceashashmap.cxx
@@ -115,7 +115,7 @@ void SequenceAsHashMap::operator<<(const css::uno::Any& aSource)
     }
 
     throw css::beans::IllegalTypeException(
-            ::rtl::OUString::createFromAscii("Any contains wrong type."),
+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Any contains wrong type." )),
             css::uno::Reference< css::uno::XInterface >());
 }
 
@@ -135,7 +135,7 @@ void SequenceAsHashMap::operator<<(const css::uno::Sequence< css::uno::Any >& lS
                 (!lP.Value.hasValue())
                )
                 throw css::beans::IllegalTypeException(
-                        ::rtl::OUString::createFromAscii("PropertyValue struct contains no usefull informations."),
+                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PropertyValue struct contains no usefull informations." )),
                         css::uno::Reference< css::uno::XInterface >());
             (*this)[lP.Name] = lP.Value;
             continue;
@@ -149,7 +149,7 @@ void SequenceAsHashMap::operator<<(const css::uno::Sequence< css::uno::Any >& lS
                 (!lN.Value.hasValue())
                )
                 throw css::beans::IllegalTypeException(
-                        ::rtl::OUString::createFromAscii("NamedValue struct contains no usefull informations."),
+                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NamedValue struct contains no usefull informations." )),
                         css::uno::Reference< css::uno::XInterface >());
             (*this)[lN.Name] = lN.Value;
             continue;
@@ -158,7 +158,7 @@ void SequenceAsHashMap::operator<<(const css::uno::Sequence< css::uno::Any >& lS
         // ignore VOID Any ... but reject wrong filled ones!
         if (lSource[i].hasValue())
             throw css::beans::IllegalTypeException(
-                    ::rtl::OUString::createFromAscii("Any contains wrong type."),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Any contains wrong type." )),
                     css::uno::Reference< css::uno::XInterface >());
     }
 }
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx
index 1503e08bf6b0..4d14069be369 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -58,7 +58,7 @@ uno::Reference< lang::XSingleServiceFactory > OStorageHelper::GetStorageFactory(
         throw uno::RuntimeException();
 
     uno::Reference < lang::XSingleServiceFactory > xStorageFactory(
-                    xFactory->createInstance ( ::rtl::OUString::createFromAscii( "com.sun.star.embed.StorageFactory" ) ),
+                    xFactory->createInstance ( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.StorageFactory" )) ),
                     uno::UNO_QUERY );
 
     if ( !xStorageFactory.is() )
@@ -77,7 +77,7 @@ uno::Reference< lang::XSingleServiceFactory > OStorageHelper::GetFileSystemStora
         throw uno::RuntimeException();
 
     uno::Reference < lang::XSingleServiceFactory > xStorageFactory(
-                    xFactory->createInstance ( ::rtl::OUString::createFromAscii( "com.sun.star.embed.FileSystemStorageFactory" ) ),
+                    xFactory->createInstance ( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.FileSystemStorageFactory" )) ),
                     uno::UNO_QUERY );
 
     if ( !xStorageFactory.is() )
@@ -223,7 +223,7 @@ uno::Reference< io::XInputStream > OStorageHelper::GetInputStreamFromURL(
         throw uno::RuntimeException();
 
     uno::Reference < ::com::sun::star::ucb::XSimpleFileAccess > xTempAccess(
-            xFactory->createInstance ( ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ),
+            xFactory->createInstance ( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" )) ),
             uno::UNO_QUERY );
 
     if ( !xTempAccess.is() )
@@ -257,7 +257,7 @@ sal_Int32 OStorageHelper::GetXStorageFormat(
     uno::Reference< beans::XPropertySet > xStorProps( xStorage, uno::UNO_QUERY_THROW );
 
     ::rtl::OUString aMediaType;
-    xStorProps->getPropertyValue( ::rtl::OUString::createFromAscii( "MediaType" ) ) >>= aMediaType;
+    xStorProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" )) ) >>= aMediaType;
 
     sal_Int32 nResult = 0;
 
diff --git a/comphelper/source/misc/string.cxx b/comphelper/source/misc/string.cxx
index 61e0eff9e0d7..66cb8f984182 100644
--- a/comphelper/source/misc/string.cxx
+++ b/comphelper/source/misc/string.cxx
@@ -101,7 +101,7 @@ rtl::OUString searchAndReplaceAsciiL(
     ::comphelper::intersperse(
         ::comphelper::stl_begin(i_rSeq), ::comphelper::stl_end(i_rSeq),
         ::comphelper::OUStringBufferAppender(buf),
-        ::rtl::OUString::createFromAscii(", "));
+        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ", " )));
     return buf.makeStringAndClear();
 }
 
diff --git a/comphelper/source/misc/uieventslogger.cxx b/comphelper/source/misc/uieventslogger.cxx
index 1ddf413fc009..ff7fc5210448 100644
--- a/comphelper/source/misc/uieventslogger.cxx
+++ b/comphelper/source/misc/uieventslogger.cxx
@@ -29,7 +29,6 @@
 #include "precompiled_comphelper.hxx"
 
 #include <comphelper/uieventslogger.hxx>
-#include <boost/shared_ptr.hpp>
 #include <com/sun/star/frame/XDesktop.hpp>
 #include <com/sun/star/frame/XTerminateListener.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx
index 123e9ef2f784..886530276abf 100644
--- a/comphelper/source/property/genericpropertyset.cxx
+++ b/comphelper/source/property/genericpropertyset.cxx
@@ -39,9 +39,6 @@
 #include <comphelper/stl_types.hxx>
 #include <osl/mutex.hxx>
 #include <rtl/uuid.h>
-#include <boost/mem_fn.hpp>
-#include <boost/bind.hpp>
-#include <boost/utility.hpp>
 
 ///////////////////////////////////////////////////////////////////////
 
diff --git a/comphelper/source/property/propertystatecontainer.cxx b/comphelper/source/property/propertystatecontainer.cxx
index 833cf0f3da34..7722e4302aa6 100644
--- a/comphelper/source/property/propertystatecontainer.cxx
+++ b/comphelper/source/property/propertystatecontainer.cxx
@@ -248,7 +248,7 @@ namespace comphelper
         :OPropertyStateContainer( GetBroadcastHelper() )
     {
         registerProperty(
-            ::rtl::OUString::createFromAscii( "StringProperty" ),
+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StringProperty" )),
             1,
             PropertyAttribute::BOUND,
             &m_sStringProperty,
@@ -256,7 +256,7 @@ namespace comphelper
         );
 
         registerProperty(
-            ::rtl::OUString::createFromAscii( "InterfaceProperty" ),
+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InterfaceProperty" )),
             2,
             PropertyAttribute::BOUND,
             &m_xInterfaceProperty,
@@ -264,7 +264,7 @@ namespace comphelper
         );
 
         registerMayBeVoidProperty(
-            ::rtl::OUString::createFromAscii( "IntProperty" ),
+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IntProperty" )),
             3,
             PropertyAttribute::BOUND,
             &m_aMayBeVoidProperty,
@@ -272,7 +272,7 @@ namespace comphelper
         );
 
         registerPropertyNoMember(
-            ::rtl::OUString::createFromAscii( "OtherInterfaceProperty" ),
+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OtherInterfaceProperty" )),
             4,
             PropertyAttribute::BOUND | PropertyAttribute::MAYBEVOID,
             ::getCppuType( static_cast< Reference< XInterface >* >( NULL ) ),
diff --git a/comphelper/test/uno_iterators/uno_iterators.cxx b/comphelper/test/uno_iterators/uno_iterators.cxx
index c2106068ff46..b1021fe8493a 100644
--- a/comphelper/test/uno_iterators/uno_iterators.cxx
+++ b/comphelper/test/uno_iterators/uno_iterators.cxx
@@ -135,7 +135,7 @@ void stl_conversions()
     // convert to stl::vector, modify in vector, copy back, print
     cout << "vector conversion" << endl;
     vector<OUString> vec(stl_s.begin(), stl_s.end());
-    vec[2] = OUString::createFromAscii("changed in vector");
+    vec[2] = OUString( RTL_CONSTASCII_USTRINGPARAM( "changed in vector" ));
     copy(vec.begin(), vec.end(), stl_s.begin());
     print_sequence(s);
 
@@ -143,7 +143,7 @@ void stl_conversions()
     cout << "list conversion" << endl;
     list<OUString> l(stl_s.begin(), stl_s.end());
     l.pop_back();
-    l.push_back(OUString::createFromAscii("changed in list"));
+    l.push_back(OUString( RTL_CONSTASCII_USTRINGPARAM( "changed in list" )));
     copy(l.begin(), l.end(), stl_s.begin());
     print_sequence(s);
 }
@@ -174,7 +174,7 @@ void stl_compare()
     StlUnoSequence<OUString> stl_s2 = StlUnoSequence<OUString>::createInstance(s2);
     if (stl_s1 == stl_s2)
         cout << "sequences are equal." << endl;
-    s2[9] = OUString::createFromAscii("ZZZZZ");
+    s2[9] = OUString( RTL_CONSTASCII_USTRINGPARAM( "ZZZZZ" ));
     if(stl_s1 < stl_s2)
         cout << "first sequence is smaller." << endl;
 }
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index fda967a28463..0382054533da 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -166,7 +166,9 @@ void Access::initBroadcaster(
 
 Access::Access(Components & components):
     components_(components), disposed_(false)
-{}
+{
+    lock_ = lock();
+}
 
 Access::~Access() {}
 
@@ -851,7 +853,7 @@ css::uno::Sequence< css::uno::Type > Access::getTypes()
     throw (css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_ANY));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     comphelper::SequenceAsVector< css::uno::Type > types;
     types.push_back(cppu::UnoType< css::uno::XInterface >::get());
@@ -900,7 +902,7 @@ css::uno::Sequence< sal_Int8 > Access::getImplementationId()
     throw (css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_ANY));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     return css::uno::Sequence< sal_Int8 >();
 }
@@ -908,7 +910,7 @@ css::uno::Sequence< sal_Int8 > Access::getImplementationId()
 rtl::OUString Access::getImplementationName() throw (css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_ANY));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     throw css::uno::RuntimeException(
         rtl::OUString(
@@ -921,7 +923,7 @@ sal_Bool Access::supportsService(rtl::OUString const & ServiceName)
     throw (css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_ANY));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     css::uno::Sequence< rtl::OUString > names(getSupportedServiceNames());
     for (sal_Int32 i = 0; i < names.getLength(); ++i) {
@@ -936,7 +938,7 @@ css::uno::Sequence< rtl::OUString > Access::getSupportedServiceNames()
     throw (css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_ANY));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     comphelper::SequenceAsVector< rtl::OUString > services;
     services.push_back(
@@ -1000,7 +1002,7 @@ void Access::dispose() throw (css::uno::RuntimeException) {
     OSL_ASSERT(thisIs(IS_ANY));
     Broadcaster bc;
     {
-        osl::MutexGuard g(lock);
+        osl::MutexGuard g(*lock_);
         checkLocalizedPropertyAccess();
         if (getParentAccess().is()) {
             throw css::uno::RuntimeException(
@@ -1025,7 +1027,7 @@ void Access::addEventListener(
 {
     OSL_ASSERT(thisIs(IS_ANY));
     {
-        osl::MutexGuard g(lock);
+        osl::MutexGuard g(*lock_);
         checkLocalizedPropertyAccess();
         if (!xListener.is()) {
             throw css::uno::RuntimeException(
@@ -1048,7 +1050,7 @@ void Access::removeEventListener(
     throw (css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_ANY));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     DisposeListeners::iterator i(disposeListeners_.find(aListener));
     if (i != disposeListeners_.end()) {
@@ -1058,7 +1060,7 @@ void Access::removeEventListener(
 
 css::uno::Type Access::getElementType() throw (css::uno::RuntimeException) {
     OSL_ASSERT(thisIs(IS_ANY));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     rtl::Reference< Node > p(getNode());
     switch (p->kind()) {
@@ -1082,7 +1084,7 @@ css::uno::Type Access::getElementType() throw (css::uno::RuntimeException) {
 
 sal_Bool Access::hasElements() throw (css::uno::RuntimeException) {
     OSL_ASSERT(thisIs(IS_ANY));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     return !getAllChildren().empty(); //TODO: optimize
 }
@@ -1093,7 +1095,7 @@ css::uno::Any Access::getByName(rtl::OUString const & aName)
         css::lang::WrappedTargetException, css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_ANY));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     rtl::Reference< ChildAccess > child(getChild(aName));
     if (!child.is()) {
@@ -1107,7 +1109,7 @@ css::uno::Sequence< rtl::OUString > Access::getElementNames()
     throw (css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_ANY));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     std::vector< rtl::Reference< ChildAccess > > children(getAllChildren());
     comphelper::SequenceAsVector< rtl::OUString > names;
@@ -1124,7 +1126,7 @@ sal_Bool Access::hasByName(rtl::OUString const & aName)
     throw (css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_ANY));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     return getChild(aName).is();
 }
@@ -1133,7 +1135,7 @@ css::uno::Any Access::getByHierarchicalName(rtl::OUString const & aName)
     throw (css::container::NoSuchElementException, css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_ANY));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     rtl::Reference< ChildAccess > child(getSubChild(aName));
     if (!child.is()) {
@@ -1147,7 +1149,7 @@ sal_Bool Access::hasByHierarchicalName(rtl::OUString const & aName)
     throw (css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_ANY));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     return getSubChild(aName).is();
 }
@@ -1158,7 +1160,7 @@ void Access::addContainerListener(
 {
     OSL_ASSERT(thisIs(IS_ANY));
     {
-        osl::MutexGuard g(lock);
+        osl::MutexGuard g(*lock_);
         checkLocalizedPropertyAccess();
         if (!xListener.is()) {
             throw css::uno::RuntimeException(
@@ -1181,7 +1183,7 @@ void Access::removeContainerListener(
     throw (css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_ANY));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     ContainerListeners::iterator i(containerListeners_.find(xListener));
     if (i != containerListeners_.end()) {
@@ -1193,7 +1195,7 @@ rtl::OUString Access::getExactName(rtl::OUString const & aApproximateName)
     throw (css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_ANY));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     return aApproximateName;
 }
@@ -1202,7 +1204,7 @@ css::uno::Sequence< css::beans::Property > Access::getProperties()
     throw (css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_GROUP));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     std::vector< rtl::Reference< ChildAccess > > children(getAllChildren());
     comphelper::SequenceAsVector< css::beans::Property > properties;
     for (std::vector< rtl::Reference< ChildAccess > >::iterator i(
@@ -1218,7 +1220,7 @@ css::beans::Property Access::getPropertyByName(rtl::OUString const & aName)
     throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_GROUP));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     rtl::Reference< ChildAccess > child(getChild(aName));
     if (!child.is()) {
         throw css::beans::UnknownPropertyException(
@@ -1231,13 +1233,13 @@ sal_Bool Access::hasPropertyByName(rtl::OUString const & Name)
     throw (css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_GROUP));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     return getChild(Name).is();
 }
 
 rtl::OUString Access::getHierarchicalName() throw (css::uno::RuntimeException) {
     OSL_ASSERT(thisIs(IS_ANY));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     // For backwards compatibility, return an absolute path representation where
     // available:
@@ -1261,7 +1263,7 @@ rtl::OUString Access::composeHierarchicalName(
         css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_ANY));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     if (aRelativeName.getLength() == 0 || aRelativeName[0] == '/') {
         throw css::lang::IllegalArgumentException(
@@ -1281,7 +1283,7 @@ rtl::OUString Access::composeHierarchicalName(
 
 rtl::OUString Access::getName() throw (css::uno::RuntimeException) {
     OSL_ASSERT(thisIs(IS_ANY));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     return getNameInternal();
 }
@@ -1292,7 +1294,7 @@ void Access::setName(rtl::OUString const & aName)
     OSL_ASSERT(thisIs(IS_ANY));
     Broadcaster bc;
     {
-        osl::MutexGuard g(lock);
+        osl::MutexGuard g(*lock_);
         checkLocalizedPropertyAccess();
         checkFinalized();
         Modifications localMods;
@@ -1356,7 +1358,7 @@ void Access::setName(rtl::OUString const & aName)
 css::beans::Property Access::getAsProperty() throw (css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_ANY));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     return asProperty();
 }
@@ -1378,7 +1380,7 @@ void Access::setPropertyValue(
     OSL_ASSERT(thisIs(IS_GROUP));
     Broadcaster bc;
     {
-        osl::MutexGuard g(lock);
+        osl::MutexGuard g(*lock_);
         if (!getRootAccess()->isUpdate()) {
             throw css::uno::RuntimeException(
                 rtl::OUString(
@@ -1402,7 +1404,7 @@ css::uno::Any Access::getPropertyValue(rtl::OUString const & PropertyName)
         css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_GROUP));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     rtl::Reference< ChildAccess > child(getChild(PropertyName));
     if (!child.is()) {
         throw css::beans::UnknownPropertyException(
@@ -1421,7 +1423,7 @@ void Access::addPropertyChangeListener(
 {
     OSL_ASSERT(thisIs(IS_GROUP));
     {
-        osl::MutexGuard g(lock);
+        osl::MutexGuard g(*lock_);
         if (!xListener.is()) {
             throw css::uno::RuntimeException(
                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("null listener")),
@@ -1448,7 +1450,7 @@ void Access::removePropertyChangeListener(
         css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_GROUP));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkKnownProperty(aPropertyName);
     PropertyChangeListeners::iterator i(
         propertyChangeListeners_.find(aPropertyName));
@@ -1473,7 +1475,7 @@ void Access::addVetoableChangeListener(
 {
     OSL_ASSERT(thisIs(IS_GROUP));
     {
-        osl::MutexGuard g(lock);
+        osl::MutexGuard g(*lock_);
         if (!aListener.is()) {
             throw css::uno::RuntimeException(
                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("null listener")),
@@ -1501,7 +1503,7 @@ void Access::removeVetoableChangeListener(
         css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_GROUP));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkKnownProperty(PropertyName);
     VetoableChangeListeners::iterator i(
         vetoableChangeListeners_.find(PropertyName));
@@ -1526,7 +1528,7 @@ void Access::setPropertyValues(
     OSL_ASSERT(thisIs(IS_GROUP));
     Broadcaster bc;
     {
-        osl::MutexGuard g(lock);
+        osl::MutexGuard g(*lock_);
         if (!getRootAccess()->isUpdate()) {
             throw css::uno::RuntimeException(
                 rtl::OUString(
@@ -1563,7 +1565,7 @@ css::uno::Sequence< css::uno::Any > Access::getPropertyValues(
     throw (css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_GROUP));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     css::uno::Sequence< css::uno::Any > vals(aPropertyNames.getLength());
     for (sal_Int32 i = 0; i < aPropertyNames.getLength(); ++i) {
         rtl::Reference< ChildAccess > child(getChild(aPropertyNames[i]));
@@ -1588,7 +1590,7 @@ void Access::addPropertiesChangeListener(
 {
     OSL_ASSERT(thisIs(IS_GROUP));
     {
-        osl::MutexGuard g(lock);
+        osl::MutexGuard g(*lock_);
         if (!xListener.is()) {
             throw css::uno::RuntimeException(
                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("null listener")),
@@ -1611,7 +1613,7 @@ void Access::removePropertiesChangeListener(
     throw (css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_GROUP));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     PropertiesChangeListeners::iterator i(
         propertiesChangeListeners_.find(xListener));
     if (i != propertiesChangeListeners_.end()) {
@@ -1654,7 +1656,7 @@ void Access::setHierarchicalPropertyValue(
     OSL_ASSERT(thisIs(IS_GROUP));
     Broadcaster bc;
     {
-        osl::MutexGuard g(lock);
+        osl::MutexGuard g(*lock_);
         if (!getRootAccess()->isUpdate()) {
             throw css::uno::RuntimeException(
                 rtl::OUString(
@@ -1686,7 +1688,7 @@ css::uno::Any Access::getHierarchicalPropertyValue(
         css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_GROUP));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     rtl::Reference< ChildAccess > child(getSubChild(aHierarchicalPropertyName));
     if (!child.is()) {
         throw css::beans::UnknownPropertyException(
@@ -1706,7 +1708,7 @@ void Access::setHierarchicalPropertyValues(
     OSL_ASSERT(thisIs(IS_GROUP));
     Broadcaster bc;
     {
-        osl::MutexGuard g(lock);
+        osl::MutexGuard g(*lock_);
         if (!getRootAccess()->isUpdate()) {
             throw css::uno::RuntimeException(
                 rtl::OUString(
@@ -1750,7 +1752,7 @@ css::uno::Sequence< css::uno::Any > Access::getHierarchicalPropertyValues(
         css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_GROUP));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     css::uno::Sequence< css::uno::Any > vals(
         aHierarchicalPropertyNames.getLength());
     for (sal_Int32 i = 0; i < aHierarchicalPropertyNames.getLength(); ++i) {
@@ -1774,7 +1776,7 @@ css::beans::Property Access::getPropertyByHierarchicalName(
     throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_GROUP));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     rtl::Reference< ChildAccess > child(getSubChild(aHierarchicalName));
     if (!child.is()) {
         throw css::beans::UnknownPropertyException(
@@ -1788,7 +1790,7 @@ sal_Bool Access::hasPropertyByHierarchicalName(
     throw (css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_GROUP));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     return getSubChild(aHierarchicalName).is();
 }
 
@@ -1802,7 +1804,7 @@ void Access::replaceByName(
     OSL_ASSERT(thisIs(IS_UPDATE));
     Broadcaster bc;
     {
-        osl::MutexGuard g(lock);
+        osl::MutexGuard g(*lock_);
         checkLocalizedPropertyAccess();
         rtl::Reference< ChildAccess > child(getChild(aName));
         if (!child.is()) {
@@ -1846,7 +1848,7 @@ void Access::insertByName(
     OSL_ASSERT(thisIs(IS_EXTENSIBLE|IS_UPDATE));
     Broadcaster bc;
     {
-        osl::MutexGuard g(lock);
+        osl::MutexGuard g(*lock_);
         checkLocalizedPropertyAccess();
         checkFinalized();
         if (getChild(aName).is()) {
@@ -1896,7 +1898,7 @@ void Access::removeByName(rtl::OUString const & aName)
     OSL_ASSERT(thisIs(IS_EXTENSIBLE|IS_UPDATE));
     Broadcaster bc;
     {
-        osl::MutexGuard g(lock);
+        osl::MutexGuard g(*lock_);
         checkLocalizedPropertyAccess();
         rtl::Reference< ChildAccess > child(getChild(aName));
         if (!child.is() || child->isFinalized() ||
@@ -2189,7 +2191,7 @@ rtl::Reference< Access > Access::getNotificationRoot() {
 
 #if OSL_DEBUG_LEVEL > 0
 bool Access::thisIs(int what) {
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     rtl::Reference< Node > p(getNode());
     Node::Kind k(p->kind());
     return k != Node::KIND_PROPERTY && k != Node::KIND_LOCALIZED_VALUE &&
diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx
index 32c0ea9e8a5c..8a05329683be 100644
--- a/configmgr/source/access.hxx
+++ b/configmgr/source/access.hxx
@@ -36,6 +36,7 @@
 #include <vector>
 
 #include "boost/noncopyable.hpp"
+#include "boost/shared_ptr.hpp"
 #include "com/sun/star/beans/PropertyVetoException.hpp"
 #include "com/sun/star/beans/UnknownPropertyException.hpp"
 #include "com/sun/star/beans/XExactName.hpp"
@@ -569,6 +570,8 @@ private:
     PropertiesChangeListeners propertiesChangeListeners_;
     bool disposed_;
 
+    boost::shared_ptr<osl::Mutex> lock_;
+
 #if OSL_DEBUG_LEVEL > 0
 protected:
     enum {
diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx
index 81e0febe1123..3d9c40bc072b 100644
--- a/configmgr/source/childaccess.cxx
+++ b/configmgr/source/childaccess.cxx
@@ -95,6 +95,7 @@ ChildAccess::ChildAccess(
     Access(components), root_(root), parent_(parent), name_(name), node_(node),
     inTransaction_(false)
 {
+    lock_ = lock();
     OSL_ASSERT(root.is() && parent.is() && node.is());
 }
 
@@ -103,6 +104,7 @@ ChildAccess::ChildAccess(
     rtl::Reference< Node > const & node):
     Access(components), root_(root), node_(node), inTransaction_(false)
 {
+    lock_ = lock();
     OSL_ASSERT(root.is() && node.is());
 }
 
@@ -169,7 +171,7 @@ css::uno::Reference< css::uno::XInterface > ChildAccess::getParent()
     throw (css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_ANY));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     return static_cast< cppu::OWeakObject * >(parent_.get());
 }
@@ -178,7 +180,7 @@ void ChildAccess::setParent(css::uno::Reference< css::uno::XInterface > const &)
     throw (css::lang::NoSupportException, css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_ANY));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     throw css::lang::NoSupportException(
         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setParent")),
@@ -190,7 +192,7 @@ sal_Int64 ChildAccess::getSomething(
     throw (css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_ANY));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     return aIdentifier == getTunnelId()
         ? reinterpret_cast< sal_Int64 >(this) : 0;
@@ -283,9 +285,10 @@ css::uno::Any ChildAccess::asValue() {
             if (!Components::allLocales(locale)) {
                 // Find best match using an adaption of RFC 4647 lookup matching
                 // rules, removing "-" or "_" delimited segments from the end;
-                // defaults are the empty string locale, the "en-US" locale, the
-                // first child (if any), or a nil value (even though it may be
-                // illegal for the given property), in that order:
+                // defaults are the "en-US" locale, the "en" locale, the empty
+                // string locale, the first child (if any), or a nil value (even
+                // though it may be illegal for the given property), in that
+                // order:
                 rtl::Reference< ChildAccess > child;
                 for (;;) {
                     child = getChild(locale);
@@ -296,16 +299,26 @@ css::uno::Any ChildAccess::asValue() {
                     while (i > 0 && locale[i] != '-' && locale[i] != '_') {
                         --i;
                     }
+                    if (i == 0) {
+                        break;
+                    }
                     locale = locale.copy(0, i);
                 }
                 if (!child.is()) {
                     child = getChild(
                         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en-US")));
                     if (!child.is()) {
-                        std::vector< rtl::Reference< ChildAccess > > all(
-                            getAllChildren());
-                        if (!all.empty()) {
-                            child = all.front();
+                        child = getChild(
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")));
+                        if (!child.is()) {
+                            child = getChild(rtl::OUString());
+                            if (!child.is()) {
+                                std::vector< rtl::Reference< ChildAccess > >
+                                    all(getAllChildren());
+                                if (!all.empty()) {
+                                    child = all.front();
+                                }
+                            }
                         }
                     }
                 }
@@ -349,7 +362,7 @@ void ChildAccess::commitChanges(bool valid, Modifications * globalModifications)
 }
 
 ChildAccess::~ChildAccess() {
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     if (parent_.is()) {
         parent_->releaseChild(name_);
     }
@@ -379,7 +392,7 @@ css::uno::Any ChildAccess::queryInterface(css::uno::Type const & aType)
     throw (css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_ANY));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     css::uno::Any res(Access::queryInterface(aType));
     return res.hasValue()
diff --git a/configmgr/source/childaccess.hxx b/configmgr/source/childaccess.hxx
index 3d9b2fc6b3b7..977d97e307dc 100644
--- a/configmgr/source/childaccess.hxx
+++ b/configmgr/source/childaccess.hxx
@@ -40,6 +40,7 @@
 #include "com/sun/star/uno/Reference.hxx"
 #include "com/sun/star/uno/RuntimeException.hpp"
 #include "com/sun/star/uno/Sequence.hxx"
+#include "boost/shared_ptr.hpp"
 #include "rtl/ref.hxx"
 #include "sal/types.h"
 
@@ -151,6 +152,7 @@ private:
     std::auto_ptr< com::sun::star::uno::Any > changedValue_;
     bool inTransaction_;
         // to determine if a free node can be inserted underneath some root
+    boost::shared_ptr<osl::Mutex> lock_;
 };
 
 }
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 2e073207250e..e6cfb1031439 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -183,6 +183,7 @@ private:
     rtl::OUString url_;
     Data const & data_;
     osl::Condition delay_;
+    boost::shared_ptr<osl::Mutex> lock_;
 };
 
 Components::WriteThread::WriteThread(
@@ -190,6 +191,7 @@ Components::WriteThread::WriteThread(
     rtl::OUString const & url, Data const & data):
     reference_(reference), components_(components), url_(url), data_(data)
 {
+    lock_ = lock();
     OSL_ASSERT(reference != 0);
     acquire();
 }
@@ -197,7 +199,7 @@ Components::WriteThread::WriteThread(
 void Components::WriteThread::run() {
     TimeValue t = { 1, 0 }; // 1 sec
     delay_.wait(&t); // must not throw; result_error is harmless and ignored
-    osl::MutexGuard g(lock); // must not throw
+    osl::MutexGuard g(*lock_); // must not throw
     try {
         try {
             writeModFile(components_, url_, data_);
@@ -304,7 +306,17 @@ void Components::addModification(Path const & path) {
     data_.modifications.add(path);
 }
 
+bool Components::hasModifications() const
+{
+    return data_.modifications.getRoot().children.begin() !=
+        data_.modifications.getRoot().children.end();
+}
+
 void Components::writeModifications() {
+
+    if (!hasModifications())
+        return;
+
     if (!writeThread_.is()) {
         writeThread_ = new WriteThread(
             &writeThread_, *this, getModificationFileUrl(), data_);
@@ -315,7 +327,7 @@ void Components::writeModifications() {
 void Components::flushModifications() {
     rtl::Reference< WriteThread > thread;
     {
-        osl::MutexGuard g(lock);
+        osl::MutexGuard g(*lock_);
         thread = writeThread_;
     }
     if (thread.is()) {
@@ -506,6 +518,8 @@ Components::Components(
     css::uno::Reference< css::uno::XComponentContext > const & context):
     context_(context)
 {
+    lock_ = lock();
+
     OSL_ASSERT(context.is());
     RTL_LOGFILE_TRACE_AUTHOR("configmgr", "sb", "begin parsing");
     parseXcsXcuLayer(
diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx
index 2d0843b20870..e810c6aee2db 100644
--- a/configmgr/source/components.hxx
+++ b/configmgr/source/components.hxx
@@ -35,6 +35,7 @@
 #include <set>
 
 #include "boost/noncopyable.hpp"
+#include "boost/shared_ptr.hpp"
 #include "com/sun/star/beans/Optional.hpp"
 #include "com/sun/star/uno/Reference.hxx"
 #include "rtl/ref.hxx"
@@ -95,6 +96,8 @@ public:
 
     void writeModifications();
 
+    bool hasModifications() const;
+
     void flushModifications();
         // must be called with configmgr::lock unaquired; must be called before
         // shutdown if writeModifications has ever been called (probably
@@ -174,6 +177,7 @@ private:
     WeakRootSet roots_;
     ExternalServices externalServices_;
     rtl::Reference< WriteThread > writeThread_;
+    boost::shared_ptr<osl::Mutex> lock_;
 };
 
 }
diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx
index ed50642994d9..cccb74658c11 100644
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -109,6 +109,7 @@ public:
         ServiceBase(*static_cast< osl::Mutex * >(this)), context_(context),
         locale_(locale)
     {
+        lock_ = lock();
         OSL_ASSERT(context.is());
     }
 
@@ -173,6 +174,7 @@ private:
 
     css::uno::Reference< css::uno::XComponentContext > context_;
     rtl::OUString locale_;
+    boost::shared_ptr<osl::Mutex> lock_;
 };
 
 css::uno::Reference< css::uno::XInterface > Service::createInstance(
@@ -276,7 +278,7 @@ Service::createInstanceWithArguments(
              ServiceSpecifier),
             static_cast< cppu::OWeakObject * >(this));
     }
-    osl::MutexGuard guard(lock);
+    osl::MutexGuard guard(*lock_);
     Components::initSingleton(context_);
     Components & components = Components::getSingleton();
     rtl::Reference< RootAccess > root(
@@ -358,13 +360,13 @@ void Service::removeFlushListener(
 void Service::setLocale(css::lang::Locale const & eLocale)
     throw (css::uno::RuntimeException)
 {
-    osl::MutexGuard guard(lock);
+    osl::MutexGuard guard(*lock_);
     locale_ = comphelper::Locale(
         eLocale.Language, eLocale.Country, eLocale.Variant).toISO();
 }
 
 css::lang::Locale Service::getLocale() throw (css::uno::RuntimeException) {
-    osl::MutexGuard guard(lock);
+    osl::MutexGuard guard(*lock_);
     css::lang::Locale loc;
     if (locale_.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("*"))) {
         loc.Language = locale_;
@@ -388,7 +390,7 @@ css::lang::Locale Service::getLocale() throw (css::uno::RuntimeException) {
 void Service::flushModifications() const {
     Components * components;
     {
-        osl::MutexGuard guard(lock);
+        osl::MutexGuard guard(*lock_);
         Components::initSingleton(context_);
         components = &Components::getSingleton();
     }
diff --git a/configmgr/source/defaultprovider.cxx b/configmgr/source/defaultprovider.cxx
index aa928d7261fd..16cf66df0d55 100644
--- a/configmgr/source/defaultprovider.cxx
+++ b/configmgr/source/defaultprovider.cxx
@@ -30,6 +30,7 @@
 #include "sal/config.h"
 
 #include "boost/noncopyable.hpp"
+#include "boost/shared_ptr.hpp"
 #include "com/sun/star/lang/XSingleComponentFactory.hpp"
 #include "com/sun/star/uno/Any.hxx"
 #include "com/sun/star/uno/Exception.hpp"
@@ -60,7 +61,10 @@ class Factory:
     private boost::noncopyable
 {
 public:
-    Factory() {}
+    Factory()
+    {
+        lock_ = lock();
+    }
 
 private:
     virtual ~Factory() {}
@@ -75,6 +79,8 @@ private:
         css::uno::Sequence< css::uno::Any > const & Arguments,
         css::uno::Reference< css::uno::XComponentContext > const & Context)
         throw (css::uno::Exception, css::uno::RuntimeException);
+
+    boost::shared_ptr<osl::Mutex> lock_;
 };
 
 css::uno::Reference< css::uno::XInterface > Factory::createInstanceWithContext(
@@ -99,7 +105,7 @@ Factory::createInstanceWithArgumentsAndContext(
                     " instantiated without arguments")),
             static_cast< cppu::OWeakObject * >(this));
     }
-    osl::MutexGuard guard(lock);
+    osl::MutexGuard guard(*lock_);
     static css::uno::Reference< css::uno::XInterface > singleton(
         configuration_provider::createDefault(Context));
     return singleton;
diff --git a/configmgr/source/lock.cxx b/configmgr/source/lock.cxx
index 4894ab260a26..3950a2d5e3e0 100644
--- a/configmgr/source/lock.cxx
+++ b/configmgr/source/lock.cxx
@@ -35,7 +35,13 @@
 
 namespace configmgr {
 
-osl::Mutex lock;
+boost::shared_ptr<osl::Mutex> lock()
+{
+    static boost::shared_ptr<osl::Mutex> theLock;
+    if (!theLock.get())
+        theLock.reset(new osl::Mutex);
+    return theLock;
+}
 
 }
 
diff --git a/configmgr/source/lock.hxx b/configmgr/source/lock.hxx
index 8b3c7b487cad..b37e83a44ee2 100644
--- a/configmgr/source/lock.hxx
+++ b/configmgr/source/lock.hxx
@@ -30,12 +30,12 @@
 #define INCLUDED_CONFIGMGR_SOURCE_LOCK_HXX
 
 #include "sal/config.h"
-
 #include "osl/mutex.hxx"
+#include "boost/shared_ptr.hpp"
 
 namespace configmgr {
 
-extern osl::Mutex lock;
+boost::shared_ptr<osl::Mutex> lock();
 
 }
 
diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx
index 72716aac35d4..27f3884f2fb0 100644
--- a/configmgr/source/rootaccess.cxx
+++ b/configmgr/source/rootaccess.cxx
@@ -78,7 +78,9 @@ RootAccess::RootAccess(
     rtl::OUString const & locale, bool update):
     Access(components), pathRepresentation_(pathRepresentation),
     locale_(locale), update_(update)
-{}
+{
+    lock_ = lock();
+}
 
 Path RootAccess::getAbsolutePath() {
     getNode();
@@ -129,7 +131,7 @@ bool RootAccess::isUpdate() const {
 }
 
 RootAccess::~RootAccess() {
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     getComponents().removeRootAccess(this);
 }
 
@@ -227,7 +229,7 @@ css::uno::Any RootAccess::queryInterface(css::uno::Type const & aType)
     throw (css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_ANY));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     css::uno::Any res(Access::queryInterface(aType));
     if (res.hasValue()) {
@@ -251,7 +253,7 @@ void RootAccess::addChangesListener(
 {
     OSL_ASSERT(thisIs(IS_ANY));
     {
-        osl::MutexGuard g(lock);
+        osl::MutexGuard g(*lock_);
         checkLocalizedPropertyAccess();
         if (!aListener.is()) {
             throw css::uno::RuntimeException(
@@ -274,7 +276,7 @@ void RootAccess::removeChangesListener(
     throw (css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_ANY));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     ChangesListeners::iterator i(changesListeners_.find(aListener));
     if (i != changesListeners_.end()) {
@@ -288,7 +290,7 @@ void RootAccess::commitChanges()
     OSL_ASSERT(thisIs(IS_UPDATE));
     Broadcaster bc;
     {
-        osl::MutexGuard g(lock);
+        osl::MutexGuard g(*lock_);
         checkLocalizedPropertyAccess();
         int finalizedLayer;
         Modifications globalMods;
@@ -306,7 +308,7 @@ void RootAccess::commitChanges()
 
 sal_Bool RootAccess::hasPendingChanges() throw (css::uno::RuntimeException) {
     OSL_ASSERT(thisIs(IS_UPDATE));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     //TODO: Optimize:
     std::vector< css::util::ElementChange > changes;
@@ -318,7 +320,7 @@ css::util::ChangesSet RootAccess::getPendingChanges()
     throw (css::uno::RuntimeException)
 {
     OSL_ASSERT(thisIs(IS_UPDATE));
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
     comphelper::SequenceAsVector< css::util::ElementChange > changes;
     reportChildChanges(&changes);
diff --git a/configmgr/source/rootaccess.hxx b/configmgr/source/rootaccess.hxx
index c7300c4620d6..4d74167c8505 100644
--- a/configmgr/source/rootaccess.hxx
+++ b/configmgr/source/rootaccess.hxx
@@ -39,6 +39,7 @@
 #include "com/sun/star/util/ChangesSet.hpp"
 #include "com/sun/star/util/XChangesBatch.hpp"
 #include "com/sun/star/util/XChangesNotifier.hpp"
+#include "boost/shared_ptr.hpp"
 #include "rtl/ref.hxx"
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
@@ -151,6 +152,8 @@ private:
     rtl::OUString name_;
     bool finalized_;
     ChangesListeners changesListeners_;
+
+    boost::shared_ptr<osl::Mutex> lock_;
 };
 
 }
diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx
index 53eff2c2398e..7208eb3f8c69 100644
--- a/configmgr/source/update.cxx
+++ b/configmgr/source/update.cxx
@@ -32,6 +32,7 @@
 #include <set>
 
 #include "boost/noncopyable.hpp"
+#include "boost/shared_ptr.hpp"
 #include "com/sun/star/configuration/XUpdate.hpp"
 #include "com/sun/star/lang/XSingleComponentFactory.hpp"
 #include "com/sun/star/uno/Any.hxx"
@@ -77,7 +78,10 @@ class Service:
     private boost::noncopyable
 {
 public:
-    Service() {}
+    Service()
+    {
+        lock_ = lock();
+    }
 
 private:
     virtual ~Service() {}
@@ -98,13 +102,15 @@ private:
         css::uno::Sequence< rtl::OUString > const & includedPaths,
         css::uno::Sequence< rtl::OUString > const & excludedPaths)
         throw (css::uno::RuntimeException);
+
+    boost::shared_ptr<osl::Mutex> lock_;
 };
 
 void Service::insertExtensionXcsFile(
     sal_Bool shared, rtl::OUString const & fileUri)
     throw (css::uno::RuntimeException)
 {
-    osl::MutexGuard g(lock);
+    osl::MutexGuard g(*lock_);
     Components::getSingleton().insertExtensionXcsFile(shared, fileUri);
 }
 
@@ -114,7 +120,7 @@ void Service::insertExtensionXcuFile(
 {
     Broadcaster bc;
     {
-        osl::MutexGuard g(lock);
+        osl::MutexGuard g(*lock_);
         Modifications mods;
         Components::getSingleton().insertExtensionXcuFile(
             shared, fileUri, &mods);
@@ -129,7 +135,7 @@ void Service::removeExtensionXcuFile(rtl::OUString const & fileUri)
 {
     Broadcaster bc;
     {
-        osl::MutexGuard g(lock);
+        osl::MutexGuard g(*lock_);
         Modifications mods;
         Components::getSingleton().removeExtensionXcuFile(fileUri, &mods);
         Components::getSingleton().initGlobalBroadcaster(
@@ -146,7 +152,7 @@ void Service::insertModificationXcuFile(
 {
     Broadcaster bc;
     {
-        osl::MutexGuard g(lock);
+        osl::MutexGuard g(*lock_);
         Modifications mods;
         Components::getSingleton().insertModificationXcuFile(
             fileUri, seqToSet(includedPaths), seqToSet(excludedPaths), &mods);
diff --git a/configure.in b/configure.in
index ec349b6371bb..069b53a79675 100644
--- a/configure.in
+++ b/configure.in
@@ -1,1178 +1,1496 @@
-dnl /******************************************************************
-dnl *     vi:set sw=3 ts=3 et:
-dnl *
-dnl * Name: configure.in
-dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland
-dnl * Date: $Date: 2008-09-08 07:38:40 $
-dnl *
-dnl * Desc: This file serves as input for the GNU autoconf package
-dnl *       in order to create a configure script.
-dnl *       In this stage configure just checks the pre-requisites
-dnl *       necessary to build LibreOffice
-dnl *
-dnl *
-dnl ******************************************************************/
-AC_REVISION( $Revision: 1.290 $ )
+dnl configure.in serves as input for the GNU autoconf package
+dnl in order to create a configure script.
+
+AC_INIT([LibreOffice], [3.3],,, [http://documentfoundation.org/])
 AC_PREREQ(2.50)
-AC_INIT()
 echo "$@" >config.parms
 
 dnl ===================================================================
 dnl Optional Features (--enable/disable-)
 dnl ===================================================================
+
+dnl ---------- Extensions ----------
+
+AC_ARG_ENABLE(ext-barcode,
+    AS_HELP_STRING([--enable-ext-barcode],
+        [Enables the Barcode extension.]),
+,)
+
+AC_ARG_ENABLE(ext-diagram,
+    AS_HELP_STRING([--enable-ext-diagram],
+        [Enables the Diagram extension.]),
+,)
+
+AC_ARG_ENABLE(ext-google-docs,
+    AS_HELP_STRING([--enable-ext-google-docs],
+        [Download and enables the Google Documents extension.]),
+,)
+
+AC_ARG_ENABLE(ext-hunart,
+    AS_HELP_STRING([--enable-ext-hunart],
+        [Enables the Hungarian Cross-reference Toolbar extension.]),
+,)
+
+AC_ARG_ENABLE(ext-lightproof,
+    AS_HELP_STRING([--enable-ext-lightproof],
+        [Enables the Lightproof extension.]),
+,)
+
+AC_ARG_ENABLE(ext-mysql-connector,
+    AS_HELP_STRING([--enable-ext-mysql-connector],
+        [Enables the build of the MySQL Connector/LibO extension. This requires
+         access to the MySQL Connector/C (aka libmysql) to be given, too, with
+         either the --with-system-mysql or --with-libmysql-path option.]),
+,)
+
+AC_ARG_ENABLE(ext-nlpsolver,
+    AS_HELP_STRING([--enable-ext-nlpsolver],
+        [Download and enables the NLPSolver extension.]),
+,)
+
+AC_ARG_ENABLE(ext-numbertext,
+    AS_HELP_STRING([--enable-ext-numbertext],
+        [Enables the Numbertext extension.]),
+,)
+
+AC_ARG_ENABLE(ext-oooblogger,
+    AS_HELP_STRING([--enable-ext-oooblogger],
+        [Download and enables the OOo Blogger extension.]),
+,)
+
+AC_ARG_ENABLE(ext-pdfimport,
+    AS_HELP_STRING([--enable-ext-pdfimport],
+        [Enables the PDF Import extension and xpdf.]),
+,)
+
+AC_ARG_ENABLE(ext-presenter-console,
+    AS_HELP_STRING([--enable-ext-presenter-console],
+        [Enables the Presenter Console extension.]),
+,)
+
+AC_ARG_ENABLE(ext-presenter-minimizer,
+    AS_HELP_STRING([--enable-ext-presenter-minimizer],
+        [Enables the Presentation Minimizer extension.]),
+,)
+
+AC_ARG_ENABLE(ext-presenter-ui,
+    AS_HELP_STRING([--enable-ext-presenter-ui],
+        [Enables extra functionality during slideshows, e.g. selecting pen color.]),
+,)
+
+AC_ARG_ENABLE(ext-report-builder,
+    AS_HELP_STRING([--enable-ext-report-builder],
+        [Enables the build of the Report Builder extension.]),
+,)
+
+AC_ARG_ENABLE(ext-typo,
+    AS_HELP_STRING([--enable-ext-typo],
+        [Enables the Typography Toolbar extension.]),
+,)
+
+AC_ARG_ENABLE(ext-validator,
+    AS_HELP_STRING([--enable-ext-validator],
+        [Enables the Validator extension.]),
+,)
+
+AC_ARG_ENABLE(ext-watch-window,
+    AS_HELP_STRING([--enable-ext-watch-window],
+        [Enables the Watch Window extension to Calc.]),
+,)
+
+AC_ARG_ENABLE(ext-wiki-publisher,
+    AS_HELP_STRING([--enable-ext-wiki-publisher],
+        [Enables the Wiki Publisher extension.]),
+,)
+
+dnl ---------- *** ----------
+
 AC_ARG_ENABLE(graphite,
-[  --enable-graphite       Enables the compilation of Graphite smart font rendering
-],,)
+    AS_HELP_STRING([--enable-graphite],
+        [Enables the compilation of Graphite smart font rendering.]),
+,)
 
 AC_ARG_ENABLE(ldap,
-[  --disable-ldap          Disables the use of LDAP backend via Netscape/Mozilla
-                          or OpenLDAP LDAP SDK
-],,)
+    AS_HELP_STRING([--disable-ldap],
+        [Disables the use of LDAP backend via Netscape/Mozilla or OpenLDAP LDAP SDK]),
+,)
 
 AC_ARG_ENABLE(fetch-external,
-[  --disable-fetch-external Disables fetching external tarballs from web sources.
-],,)
+    AS_HELP_STRING([--disable-fetch-external],
+        [Disables fetching external tarballs from web sources.]),
+,)
 
 AC_ARG_ENABLE(lockdown,
-[  --enable-lockdown       Enables the gconf integration work in OOo
-],,)
+    AS_HELP_STRING([--enable-lockdown],
+        [Enables the gconf integration work in LibO.]),
+,)
 
 AC_ARG_ENABLE(vba,
-[  --disable-vba           disables the vba compatibility feature
-],,)
+    AS_HELP_STRING([--disable-vba],
+        [Disables the vba compatibility feature.]),
+,)
 
 AC_ARG_ENABLE(pch,
-[  --enable-pch            EXPERIMENTAL: Enables precompiled header support for C++.
-],,)
+    AS_HELP_STRING([--enable-pch],
+        [EXPERIMENTAL: Enables precompiled header support for C++.]),
+,)
 
 AC_ARG_ENABLE(hids,
-[  --enable-hids            Enables generation of HelpId lists.
-],,)
+    AS_HELP_STRING([--enable-hids],
+        [Enables generation of HelpId lists.]),
+,)
 
 AC_ARG_ENABLE(mozilla,
-[  --disable-mozilla       OO.o usually includes a strangely hacked up mozilla
-                          binary for your platform, to build without this
-                          version, use this option.
-],,enable_mozilla="yes")
+    AS_HELP_STRING([--disable-mozilla],
+        [LibO usually includes a strangely hacked up mozilla binary for your
+         platform, to build without this version, use this option.]),
+,enable_mozilla=yes)
 
 AC_ARG_ENABLE(epm,
-[  --disable-epm           OO.o includes self-packaging code, that requires
-                          epm, however epm is useless for large scale
-                          package building.
-],,enable_epm="yes")
+    AS_HELP_STRING([--disable-epm],
+        [LibO includes self-packaging code, that requires epm, however epm is
+         useless for large scale package building.]),
+,enable_epm=yes)
 
 AC_ARG_ENABLE(activex_component,
-[  --disable-activex-component Remove support for ActiveX embedding of OOo
-],,enable_activex_component=yes)
+    AS_HELP_STRING([--disable-activex-component],
+        [Remove support for ActiveX embedding of LibO.]),
+,enable_activex_component=yes)
 
 AC_ARG_ENABLE(odk,
-[  --disable-odk           OO.o includes an ODK, office development kit
-                          which some packagers may with to build without
-],,enable_odk="yes")
+    AS_HELP_STRING([--disable-odk],
+        [LibO includes an ODK, office development kit which some packagers may
+         with to build without.]),
+,enable_odk=yes)
 
 AC_ARG_ENABLE(mathmldtd,
-[  --disable-mathmldtd     disable mathmldtd
-                          (useful for distributions that want to avoid packaging
-                          it)
-],,enable_mathmldtd="yes")
+    AS_HELP_STRING([--disable-mathmldtd],
+        [Disable mathmldtd (useful for distributions that want to avoid
+         packaging it).]),
+,enable_mathmldtd=yes)
 
 AC_ARG_ENABLE(evolution2,
-[  --enable-evolution2     Allows the built-in evolution 2 addressbook
-                          connectivity build to be enabled.
-],,)
+    AS_HELP_STRING([--enable-evolution2],
+        [Allows the built-in evolution 2 addressbook connectivity build to be
+         enabled.]),
+,)
 
 AC_ARG_ENABLE(cups,
-[  --disable-cups          disable cups support in the psprint project
-],,enable_cups=yes)
+    AS_HELP_STRING([--disable-cups],
+        [Disable cups support in the psprint project.]),
+,enable_cups=yes)
 
 AC_ARG_ENABLE(fontconfig,
-[  --disable-fontconfig    disable support for the fontconfig library
-],,enable_fontconfig=yes)
+    AS_HELP_STRING([--disable-fontconfig],
+        [Disable support for the fontconfig library.]),
+,enable_fontconfig=yes)
 
 AC_ARG_ENABLE(directx,
-[  --disable-directx       Remove DirectX implementation for the new XCanvas
-                          interface. The DirectX support requires more stuff
-                          installed on Windows to compile.
-                          (DirectX SDK, GDI+ libs)
-],,enable_directx=yes)
+    AS_HELP_STRING([--disable-directx],
+        [Remove DirectX implementation for the new XCanvas interface.
+         The DirectX support requires more stuff installed on Windows to
+         compile. (DirectX SDK, GDI+ libs)]),
+,enable_directx=yes)
 
 AC_ARG_ENABLE(activex,
-[  --disable-activex       Disable the use of ActiveX for windows build.
-                          This switch is mandatory when using VC++ 2005/2008 Express.
-],,)
+    AS_HELP_STRING([--disable-activex],
+        [Disable the use of ActiveX for windows build.])
+    [
+                          This switch is mandatory when using VC++ 2008 Express.
+    ],
+,)
 
 AC_ARG_ENABLE(atl,
-[  --disable-atl          Disable the use of ATL for windows build.
-                          This switch is mandatory when using VC++ 2005/2008 Express.
-],,)
+    AS_HELP_STRING([--disable-atl],
+        [Disable the use of ATL for windows build.])
+    [
+                          This switch is mandatory when using VC++ 2008 Express.
+    ],
+,)
 
 AC_ARG_ENABLE(symbols,
-[  --enable-symbols        Include debugging symbols in output.
-                          WARNING - a complete build needs 8 Gb of space and
-                          takes much longer. (enables -g compiler flag)
-
-                          --enable-symbols=SMALL sets the gcc -g1 setting
-                          which is smaller.
+    AS_HELP_STRING([--enable-symbols],
+        [Include debugging symbols in output. WARNING - a complete build needs
+         8 Gb of space and takes much longer (enables -g compiler flag).])
+    [
+                          --enable-symbols=SMALL
+                                     sets the gcc -g1 setting which is smaller.
 
                           Enabling symbols disables the stripping of the solver
                           (--disable-strip-solver).
-],,)
+    ],
+,)
 
 AC_ARG_ENABLE(strip-solver,
-[  --disable-strip-solver  Disable the stripping of the solver.
-                          By default the solver is stripped unless a build with
-                          debugging symbols (--enable-symbols) is requested.
-
+    AS_HELP_STRING([--disable-strip-solver],
+        [Disable the stripping of the solver. By default the solver is stripped
+         unless a build with debugging symbols (--enable-symbols) is requested.])
+    [
                           This switch allows to override this setting.
-],,)
+    ],
+,)
 
 AC_ARG_ENABLE(werror,
-[  --enable-werror         Turn warnings to errors. (Has no effect in modules
-                          where the treating of warnings as errors is disabled
-                          explicitely)
-],,)
+    AS_HELP_STRING([--enable-werror],
+        [Turn warnings to errors. (Has no effect in modules where the treating
+         of warnings as errors is disabled explicitely.)]),
+,)
 
 AC_ARG_ENABLE(debug,
-[  --enable-debug          Include debugging symbols from --enable-symbols
-                          plus extra debugging code.  Extra large build!
-                          (enables -g compiler flag and dmake debug=true)
-],,)
+    AS_HELP_STRING([--enable-debug],
+        [Include debugging symbols from --enable-symbols plus extra debugging
+         code. Extra large build! (enables -g compiler flag and dmake debug=true)]),
+,)
 
 AC_ARG_ENABLE(dbgutil,
-[  --enable-dbgutil        Include additional debugging utilities, such as
-                          assertions, object counting, etc. Larger build.
-                          Independent from --enable-debug
-],,)
+    AS_HELP_STRING([--enable-dbgutil],
+        [Include additional debugging utilities, such as assertions, object
+         counting, etc. Larger build. Independent from --enable-debug]),
+,)
 
 AC_ARG_ENABLE(crashdump,
-[  --enable-crashdump      Enable the crashdump feature code.
-],,)
-
-AC_ARG_ENABLE(cl-standard,
-[  --enable-cl-standard    For Microsoft C/C++ compiler users, use non-optimizing
-                          standard compiler. ( This just disavles optimization
-                          options and therefore removes a lot of warnings when
-                          using the cheaper standard compiler. )
-],,)
+    AS_HELP_STRING([--enable-crashdump],
+        [Enable the crashdump feature code.]),
+,)
 
 AC_ARG_ENABLE(gtk,
-[  --disable-gtk           Determines whether to use Gtk+ vclplug on platforms
-                          where Gtk+ is available.
-],,enable_gtk=yes)
+    AS_HELP_STRING([--disable-gtk],
+        [Determines whether to use Gtk+ vclplug on platforms where Gtk+ is available.]),
+,enable_gtk=yes)
 
 AC_ARG_ENABLE(systray,
-[  --disable-systray       Determines whether to build the systray quickstarter.
-],,enable_systray=yes)
+    AS_HELP_STRING([--disable-systray],
+        [Determines whether to build the systray quickstarter.]),
+,enable_systray=yes)
 
 AC_ARG_ENABLE(unix-qstart,
-[  --disable-unix-qstart    On UNIX systems, we can enable a faster splash app
-                          that accelerates startup, if we can link to the system
-                          libpng, use this if you are a Linux Distro packager.
-],,enable_unix_quickstarter="yes")
+    AS_HELP_STRING([--disable-unix-qstart],
+        [On UNIX systems, we can enable a faster splash app that accelerates
+         startup, if we can link to the system libpng, use this if you are
+         a Linux Distro packager.]),
+,enable_unix_quickstarter=yes)
 
 AC_ARG_ENABLE(broffice,
-[  --enable-broffice       When enabled, this will include broffice branded
-                          artwork into packages, that will only be seen in the
-                          pt_BR locale.
-],,)
+    AS_HELP_STRING([--enable-broffice],
+        [When enabled, this will include broffice branded artwork into packages,
+         that will only be seen in the pt_BR locale.]),
+,)
 
 AC_ARG_ENABLE(cairo,
-[  --enable-cairo          Determines whether to use Cairo library on
-                          platforms where Cairo is available.
-],,enable_cairo=no)
+    AS_HELP_STRING([--enable-cairo],
+        [Determines whether to use Cairo library on platforms where Cairo is
+         available.]),
+,enable_cairo=no)
 
 AC_ARG_ENABLE(opengl,
-[  --enable-opengl         Determines whether to build the OpenGL 3D slide
-                          transitions component
-],,enable_opengl=no)
+    AS_HELP_STRING([--enable-opengl],
+        [Determines whether to build the OpenGL 3D slide transitions component.]),
+,enable_opengl=no)
 
 AC_ARG_ENABLE(dbus,
-[  --enable-dbus           Determines whether to enable presentation mode
-                          screensaver control under GNOME via DBUS
-],,enable_dbus=no)
+    AS_HELP_STRING([--enable-dbus],
+        [Determines whether to enable presentation mode screensaver control
+         under GNOME via DBUS.]),
+,enable_dbus=no)
 
 AC_ARG_ENABLE(gconf,
-[  --disable-gconf         Determines whether to use the GConf support
-],,enable_gconf=yes)
+    AS_HELP_STRING([--disable-gconf],
+        [Determines whether to use the GConf support.]),
+,enable_gconf=yes)
 
 AC_ARG_ENABLE(gnome-vfs,
-[  --disable-gnome-vfs     Determines whether to use the Gnome Virtual Filing
-                          System on platforms where that VFS is available
-],,enable_gnome_vfs=yes)
+    AS_HELP_STRING([--disable-gnome-vfs],
+        [Determines whether to use the Gnome Virtual Filing System on platforms
+         where that VFS is available.]),
+,enable_gnome_vfs=yes)
 
 AC_ARG_ENABLE(gio,
-[  --enable-gio            Determines whether to use the GIO support
-],,enable_gio=no)
+    AS_HELP_STRING([--enable-gio],
+        [Determines whether to use the GIO support.]),
+,enable_gio=no)
 
 AC_ARG_ENABLE(static-gtk,
-[  --enable-static-gtk     Modules that are linked against gtk libraries use
-                          the static libraries instead of the dynamic ones.
-                          (enables -Bstatic linker flag for gtk libraries)
-],,)
+    AS_HELP_STRING([--enable-static-gtk],
+        [Modules that are linked against gtk libraries use the static libraries
+         instead of the dynamic ones. (Enables -Bstatic linker flag for gtk libraries.)]),
+,)
 
 AC_ARG_ENABLE(layout,
-[  --enable-layout         Enable the compilation and use of layout dialogs
-],,)
+    AS_HELP_STRING([--enable-layout],
+        [Enable the compilation and use of layout dialogs.]),
+,)
 
 AC_ARG_ENABLE(build-mozilla,
-[  --disable-build-mozilla Use this option if you do not want to build the
-                          mozilla components from the mozilla source code but
-                          take precompiled zips
-],,)
+    AS_HELP_STRING([--disable-build-mozilla],
+        [Use this option if you do not want to build the mozilla components from
+         the mozilla source code but take precompiled zips.]),
+,)
 
 AC_ARG_ENABLE(nss_module,
-[  --disable-nss-module    Whether to use provided NSS module
-],,enable_nss_module=yes)
+    AS_HELP_STRING([--disable-nss-module],
+        [Whether to use provided NSS module.]),
+,enable_nss_module=yes)
 
 AC_ARG_ENABLE(kde,
-[  --enable-kde            Determines whether to use Qt3/KDE3 vclplug on platforms
-                          where Qt3 and KDE3 are available.
-],,)
+    AS_HELP_STRING([--enable-kde],
+        [Determines whether to use Qt3/KDE3 vclplug on platforms where Qt3 and
+         KDE3 are available.]),
+,)
 
 AC_ARG_ENABLE(kdeab,
-[  --disable-kdeab         Disable the KDE3 address book support
-],,if test "$enable_kde" = "yes"; then enable_kdeab=yes; fi)
+    AS_HELP_STRING([--disable-kdeab],
+        [Disable the KDE3 address book support.]),
+,
+    if test "$enable_kde" = "yes"; then
+        enable_kdeab=yes;
+    fi
+)
 
 AC_ARG_ENABLE(kde4,
-[  --enable-kde4            Determines whether to use Qt4/KDE4 vclplug on platforms
-                          where Qt4 and KDE4 are available. May be used with --enable-kde
-                          if you want to support both KDE3 and KDE4.
-],,)
+    AS_HELP_STRING([--enable-kde4],
+        [Determines whether to use Qt4/KDE4 vclplug on platforms where Qt4 and
+         KDE4 are available. May be used with --enable-kde if you want to support
+         both KDE3 and KDE4.]),
+,)
 
 AC_ARG_ENABLE(binfilter,
-[  --disable-binfilter     Disable legacy binary file formats filters
-],,if ! test -d ./binfilter; then enable_binfilter=no; fi)
+    AS_HELP_STRING([--disable-binfilter],
+        [Disable legacy binary file formats filters.]),
+,
+    if ! test -d ./binfilter; then
+        enable_binfilter=no;
+    fi
+)
 
 AC_ARG_ENABLE(rpath,
-[  --disable-rpath         Disable the use of relative paths in shared libraries
-],,)
+    AS_HELP_STRING([--disable-rpath],
+        [Disable the use of relative paths in shared libraries.]),
+,)
 
 AC_ARG_ENABLE(pam,
-[  --disable-pam           Disable pam support.
-],,)
+    AS_HELP_STRING([--disable-pam],
+        [Disable pam support.]),
+,)
 
 AC_ARG_ENABLE(pam-link,
-[  --enable-pam-link       link with libpam instead of dynamically open it
-],,)
+    AS_HELP_STRING([--enable-pam-link],
+        [Link with libpam instead of dynamically open it.]),
+,)
 
 AC_ARG_ENABLE(crypt-link,
-[  --disable-crypt-link    disable linking with libcrypt instead of dynamically
-                          open it (needed for ancient GNU/Linux distributions
-                          without crypt()/libcrypt)
-],,enable_crypt_link=yes)
+    AS_HELP_STRING([--disable-crypt-link],
+        [Disable linking with libcrypt instead of dynamically open it (needed for
+         ancient GNU/Linux distributions without crypt()/libcrypt).]),
+,enable_crypt_link=yes)
 
 AC_ARG_ENABLE(xrender-link,
-[  --enable-xrender-link   link with libXrender instead of dynamically open it
-],,)
+    AS_HELP_STRING([--enable-xrender-link],
+        [Link with libXrender instead of dynamically open it.]),
+,)
 
 AC_ARG_ENABLE(randr,
-[  --disable-randr         disable RandR support in the vcl project
-],,enable_randr=yes)
+    AS_HELP_STRING([--disable-randr],
+        [Disable RandR support in the vcl project.]),
+,enable_randr=yes)
 
 AC_ARG_ENABLE(randr-link,
-[  --disable-randr-link    disable linking with libXrandr, instead dynamically
-                           open it at runtime
-],,enable_randr_link=yes)
+    AS_HELP_STRING([--disable-randr-link],
+        [Disable linking with libXrandr, instead dynamically open it at runtime.]),
+,enable_randr_link=yes)
 
 AC_ARG_ENABLE(gstreamer,
-[  --disable-gstreamer     disable building the gstreamer avmedia backend
-],,enable_gstreamer=yes)
-
-AC_ARG_ENABLE(mysql-connector,
-[  --enable-mysql-connector     enables the build of the MySQL Connector/OOo extension.
-                                This requires access to the MySQL Connector/C (aka libmysql) to be given, too, with
-                                either the --with-system-mysql or --with-libmysql-path option.
-],,)
-
-AC_ARG_ENABLE(presenter-extra-ui,
-[  --enable-presenter-extra-ui   enables extra functionality during slideshow,
-                                 e.g. selecting pen color, erasing drawings etc.
-],,enable_presenter_extra_ui=no)
-
-AC_ARG_ENABLE(minimizer,
-[  --enable-minimizer          enables the build of the Presentation Minimizer extension
-],,)
-
-AC_ARG_ENABLE(presenter-console,
-[  --enable-presenter-console          enables the build of the Presenter Console extension
-],,)
-
-AC_ARG_ENABLE(pdfimport,
-[  --enable-pdfimport          enables the build of the PDF Import extension and xpdf
-],,)
-
-AC_ARG_ENABLE(wiki-publisher,
-[  --enable-wiki-publisher      enables the build of the Wiki Publisher extension
-],,)
-
-AC_ARG_ENABLE(report-builder,
-[  --enable-report-builder  enables the build of the Report Builder extension
-],,)
+    AS_HELP_STRING([--disable-gstreamer],
+        [Disable building the gstreamer avmedia backend.]),
+,enable_gstreamer=yes)
 
 AC_ARG_ENABLE(neon,
-[  --disable-neon          Disable neon and the compilation of webdav binding
-],,)
+    AS_HELP_STRING([--disable-neon],
+        [Disable neon and the compilation of webdav binding.]),
+,)
 
 AC_ARG_ENABLE(Xaw,
-[  --disable-Xaw           Disables the use of Xaw for the Netscape/Mozilla
-                           plugin
-],,)
+    AS_HELP_STRING([--disable-Xaw],
+        [Disables the use of Xaw for the Netscape/Mozilla plugin.]),
+,)
 
 AC_ARG_ENABLE(gcjaot,
-[  --enable-gcjaot         Build with[[out]] using Ahead of Time java compilation
-                          support to speed up buildsi by compiling the jars also
-                          to native code..
-                          --enable-gcjaot is only known to work with bytecode
-                          created with gcj or ecj
-],,)
+    AS_HELP_STRING([--enable-gcjaot],
+        [Build with[[out]] using Ahead of Time java compilation support to speed
+         up buildsi by compiling the jars also to native code.. --enable-gcjaot
+         is only known to work with bytecode created with gcj or ecj.]),
+,)
 
 AC_ARG_ENABLE(check-only,
-[  --enable-check-only     Use this option option if you just want to check your
-                          environment.  This option stops the generation of an
-                          ????env.set
-
-                          Usage: --enable-check-only=yes
-],,)
+    AS_HELP_STRING([--enable-check-only],
+        [Use this option option if you just want to check your environment.
+         This option stops the generation of an ????env.set.])
+    [
+                          Usage:     --enable-check-only=yes
+    ],
+,)
 
 AC_ARG_ENABLE(ccache-skip,
-[[  --enable-ccache-skip    [default=auto] allow the use of --ccache-skip to
-                          escape compiler flags that would otherwise prevent
-                          caching of the result (currently used on Mac only)
-                          NOTE: requires patched version because of a bug in
-                          ccache (see issue 104567 for details and patch)
-                          explicitly enable if your version of ccache doesn't
-                          identify as version 2.4_OOo
-]],,enable_ccache_skip=auto)
+    AS_HELP_STRING([--enable-ccache-skip],
+        [Allow the use of --ccache-skip to escape compiler flags that would
+         otherwise prevent caching of the result (currently used on Mac only)
+         NOTE: requires patched version because of a bug in ccache (see issue
+         104567 for details and patch) explicitly enable if your version of
+         ccache doesn't identify as version 2.4_OOo. (default=auto)]),
+,enable_ccache_skip=auto)
 
 AC_ARG_ENABLE(build-unowinreg,
-[  --enable-build-unowinreg Do not use the prebuilt unowinreg.dll. Build it instead.
-                          The MinGW C++ compiler is needed on Linux.
-
-                          Usage: --enable-build-unowinreg
-],,)
+    AS_HELP_STRING([--enable-build-unowinreg],
+        [Do not use the prebuilt unowinreg.dll. Build it instead. The MinGW C++
+         compiler is needed on Linux.])
+    [
+                          Usage:     --enable-build-unowinreg
+    ],
+,)
 
 AC_ARG_ENABLE(verbose,
-[  --enable-verbose        Increase build verbosity.
-  --disable-verbose       Decrease build verbosity.
-],,)
+    AS_HELP_STRING([--enable-verbose],
+        [Increase build verbosity.])[
+  --disable-verbose       Decrease build verbosity.],
+,)
 
 AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  Disables generation of dependency information.
-],,)
+    AS_HELP_STRING([--enable-dependency-tracking],
+        [Do not reject slow dependency extractors.])[
+  --disable-dependency-tracking
+                          Disables generation of dependency information.
+                          Speed up one-time builds.],
+,)
 
 AC_ARG_ENABLE(icecream,
-[  --enable-icecream       Use the 'icecream' distributed compiling tool to
-                          speedup the compilation.  It defaults to
-                          /opt/icecream for the location of the icecream
-                          gcc/g++ wrappers, you can override that using
-                          --with-gcc-home=/the/path switch.
-],,)
+    AS_HELP_STRING([--enable-icecream],
+        [Use the 'icecream' distributed compiling tool to speedup the compilation.
+         It defaults to /opt/icecream for the location of the icecream gcc/g++
+         wrappers, you can override that using --with-gcc-home=/the/path switch.]),
+,)
 
 AC_ARG_ENABLE(zenity,
-[  --enable-zenity         Display a icon in the notification area during
-                          build.
-],,)
+    AS_HELP_STRING([--enable-zenity],
+        [Display a icon in the notification area during build.]),
+,)
+
+AC_ARG_ENABLE(cl-x64,
+    AS_HELP_STRING([--enable-cl-x64],
+        [Use the Microsoft C/C++ x64 compiler instead of the default x86 one.]),
+,)
+
+AC_ARG_ENABLE(extra-gallery,
+    AS_HELP_STRING([--enable-extra-gallery],
+	[Add extra gallery content.]),
+,)
+
+AC_ARG_ENABLE(extra-template,
+    AS_HELP_STRING([--enable-extra-template],
+	[Add extra temaplte content.]),
+,)
+
+AC_ARG_ENABLE(extra-sample,
+    AS_HELP_STRING([--enable-extra-sample],
+	[Add extra sample content.]),
+,)
+
+AC_ARG_ENABLE(extra-font,
+    AS_HELP_STRING([--enable-extra-font],
+	[Add extra font content.]),
+,)
+
+dnl ---------- Deprecated since 2010-11-05 ----------
+
+AC_ARG_ENABLE(mysql-connector,
+    AS_HELP_STRING([--enable-mysql-connector],
+        [Deprecated: use --enable-ext-mysql-connector instead.]),
+    if test -z "$enable_ext_mysql_connector"; then
+        enable_ext_mysql_connector=$enable_mysql_connector;
+    fi ,
+)
+
+AC_ARG_ENABLE(presenter-extra-ui,
+    AS_HELP_STRING([--enable-presenter-extra-ui],
+        [Deprecated: use --enable-ext-presenter-ui instead.]),
+    if test -z "$enable_ext_presenter_ui"; then
+        enable_ext_presenter_ui=$enable_presenter_extra_ui;
+    fi ,
+)
+
+AC_ARG_ENABLE(minimizer,
+    AS_HELP_STRING([--enable-minimizer],
+        [Deprecated: use --enable-ext-presenter-minimizer instead.]),
+    if test -z "$enable_ext_presenter_minimizer"; then
+        enable_ext_presenter_minimizer=$enable_minimizer;
+    fi ,
+)
+
+AC_ARG_ENABLE(presenter-console,
+    AS_HELP_STRING([--enable-presenter-console],
+        [Deprecated: use --enable-ext-presenter-console instead.]),
+    if test -z "$enable_ext_presenter_console"; then
+        enable_ext_presenter_console=$enable_presenter_console;
+    fi ,
+)
+
+AC_ARG_ENABLE(pdfimport,
+    AS_HELP_STRING([--enable-pdfimport],
+        [Deprecated: use --enable-ext-pdfimport instead.]),
+    if test -z "$enable_ext_pdfimport"; then
+        enable_ext_pdfimport=$enable_pdfimport;
+    fi ,
+)
+
+AC_ARG_ENABLE(wiki-publisher,
+    AS_HELP_STRING([--enable-wiki-publisher],
+        [Deprecated: use --enable-ext-wiki-publisher instead.]),
+    if test -z "$enable_ext_wiki_publisher"; then
+        enable_ext_wiki_publisher=$enable_wiki_publisher;
+    fi ,
+)
+
+AC_ARG_ENABLE(report-builder,
+    AS_HELP_STRING([--enable-report-builder],
+        [Deprecated: use --enable-ext-report-builder instead.]),
+    if test -z "$enable_ext_report_builder"; then
+        enable_ext_report_builder=$enable_report_builder;
+    fi ,
+)
 
 dnl ===================================================================
 dnl Optional Packages (--with/without-)
 dnl ===================================================================
 AC_ARG_WITH(gnu-patch,
-[  --with-gnu-patch        Specify location of GNU patch on Solaris or FreeBSD
-],,)
+    AS_HELP_STRING([--with-gnu-patch],
+        [Specify location of GNU patch on Solaris or FreeBSD.]),
+,)
 
 AC_ARG_WITH(gnu-cp,
-[  --with-gnu-cp           Specify location of GNU cp on Solaris or FreeBSD
-],,)
+    AS_HELP_STRING([--with-gnu-cp],
+        [Specify location of GNU cp on Solaris or FreeBSD.]),
+,)
 
 AC_ARG_WITH(system-graphite,
-[  --with-system-graphite    use graphite library already installed on system
-],,)
+    AS_HELP_STRING([--with-system-graphite],
+        [Use graphite library already installed on system.]),
+,)
 
 AC_ARG_WITH(external-tar,
-[  --with-external-tar=<TARFILE PATH>   Specify path to tarfiles manually ],
-[ TARFILE_LOCATION="$withval"
-])
+    AS_HELP_STRING([--with-external-tar=<TARFILE PATH>],
+        [Specify path to tarfiles manually.]),
+    TARFILE_LOCATION=$withval ,
+)
 
 AC_ARG_WITH(openldap,
-[  --with-openldap         Enables the use of the OpenLDAP LDAP SDK instead
-                          of the Netscape/Mozilla one
-],,)
+    AS_HELP_STRING([--with-openldap],
+        [Enables the use of the OpenLDAP LDAP SDK instead of the Netscape/Mozilla one.]),
+,)
 
 AC_ARG_WITH(vba-package-format,
-[  --with-vba-package-format   specify package format for vba compatibility api.
-                          Specifying  "builtin" means the api component and
-                          associated type library are  part of the installation set.
-                          Specifying "extn" creates an uno extension that is
-                          part of the installation set ( located in the program
-                          directory ) that MUST be optionly registered using
-                          either the unopkg executeable or the extension manager
-                          gui.
-
+    AS_HELP_STRING([--with-vba-package-format],
+        [Specify package format for vba compatibility api. Specifying  "builtin"
+         means the api component and associated type library are  part of the
+         installation set. Specifying "extn" creates an uno extension that is
+         part of the installation set (located in the program directory) that
+         MUST be optionly registered using either the unopkg executeable or the
+         extension manager gui.])
+    [
                           Note: "builtin" is the default, "extn" can cause
                           problems.
-                          Usage: --with-vba-package-format="builtin" or
-                                 --with-vba-package-format="extn"
-],,)
+
+                          Usage:     --with-vba-package-format="builtin" or
+                                     --with-vba-package-format="extn"
+    ],
+,)
 
 AC_ARG_WITH(extension-integration,
-[
-  --with-extension-integration      It will integrate the builded extensions
-              to the installer of the product.],
+    AS_HELP_STRING([--with-extension-integration],
+        [It will integrate the builded extensions to the installer of the product.]),
 ,)
 
 AC_ARG_WITH(fonts,
-[  --without-fonts         OOo includes some third-party fonts to provide a reliable
-                          basis for help content, templates, samples, etc.
-                          When these fonts are already known to be available on the
-                          system then you should use this option.
-],,)
+    AS_HELP_STRING([--without-fonts],
+        [LibO includes some third-party fonts to provide a reliable basis for
+         help content, templates, samples, etc. When these fonts are already
+         known to be available on the system then you should use this option.]),
+,)
 
 AC_ARG_WITH(ppds,
-[  --without-ppds          Removes Postscript Printer definition files from
-                          openoffice.org installation set, for people building
-                          for specific distributions where PPDs are known to be
-                          already available (every recent distro with CUPS
-                          backend)
-],,)
+    AS_HELP_STRING([--without-ppds],
+        [Removes Postscript Printer definition files from LibreOffice
+         installation set, for people building for specific distributions where
+         PPDs are known to be already available (every recent distro with CUPS backend).]),
+,)
 
 AC_ARG_WITH(afms,
-[  --without-afms          Removes bitmap font files from openoffice.org
-                          installation set, for people building for specific
-                          distributions where AFM files or TrueType Fonts
-                          are known to be available.
-],,)
+    AS_HELP_STRING([--without-afms],
+        [Removes bitmap font files from LibreOffice installation set, for people
+         building for specific distributions where AFM files or TrueType Fonts
+         are known to be available.]),
+,)
 
 AC_ARG_WITH(epm,
-[  --with-epm          Decides which epm to use. Default is to use
-              the one from the system if one is built. When
-              either this is not there or you say =internal
-              epm will be built.
-],,)
+    AS_HELP_STRING([--with-epm],
+        [Decides which epm to use. Default is to use the one from the system if
+         one is built. When either this is not there or you say =internal epm
+         will be built.]),
+,)
 
 AC_ARG_WITH(package-format,
-[  --with-package-format   specify package format(s) for OOo installsets.
-                          Default is "normal" one of the OS/Distribution.
-
-                          Usage: --with-package-format="foo bar"
-],,)
+    AS_HELP_STRING([--with-package-format],
+        [Specify package format(s) for LibO installsets. Default is the
+         "normal" one of the OS/Distribution. Possible values: aix, bsd, deb,
+         inst, tardist, osx, pkg, rpm, setld, native, portable, archive, dmg,
+          installed, msi. Example: --with-package-format="deb dmg"]),
+,)
 
 AC_ARG_WITH(system-stdlibs,
-[  --with-system-stdlibs   use libstdc++/libgcc_s already on system
-],,)
+    AS_HELP_STRING([--with-system-stdlibs],
+        [Use libstdc++/libgcc_s already on system.]),
+,)
 
 AC_ARG_WITH(system-cairo,
-[  --with-system-cairo      Use Cairo libraries already on system
-],,)
+    AS_HELP_STRING([--with-system-cairo],
+        [Use Cairo libraries already on system.]),
+,)
 
 AC_ARG_WITH(mozilla-version,
-[  --with-mozilla-version  Choose which version of mozilla to use while building
-                          mozilla. Default: 1.7.5.
-                          Note that not all versions are supported.
-],,)
+    AS_HELP_STRING([--with-mozilla-version],
+        [Choose which version of mozilla to use while building mozilla.
+         (default=1.7.5) Note that not all versions are supported.]),
+,)
 
 AC_ARG_WITH(mozilla-toolkit,
-[  --with-mozilla-toolkit  Choose which GUI toolkit to use while building mozilla
-                          components. Default: gtk2
-],,)
+    AS_HELP_STRING([--with-mozilla-toolkit],
+        [Choose which GUI toolkit to use while building mozilla components. (default=gtk2)]),
+,)
 
 AC_ARG_WITH(myspell-dicts,
-[  --without-myspell-dicts Removes myspell dictionaries from openoffice.org
-                          installation set, for people building for specific
-                          distributions where the myspell dictionaries are
-                          installed from other sources
-],,)
+    AS_HELP_STRING([--without-myspell-dicts],
+        [Removes myspell dictionaries from LibreOffice installation set, for
+         people building for specific distributions where the myspell dictionaries
+         are installed from other sources.]),
+,)
 
 AC_ARG_WITH(system-dicts,
-[  --with-system-dicts    Use dictionaries from system paths- Specify
-                         them via --with-{dict,hyph,thes}-path=/path
-             if you want to override the default ones
-],,)
+    AS_HELP_STRING([--with-system-dicts],
+        [Use dictionaries from system paths- Specify them via
+         --with-{dict,hyph,thes}-path=/path if you want to override the default ones.]),
+,)
 
 AC_ARG_WITH(external-dict-dir,
-[  --with-external-dict-dir Specify external dictionary dir
-],,)
+    AS_HELP_STRING([--with-external-dict-dir],
+        [Specify external dictionary dir.]),
+,)
 
 AC_ARG_WITH(external-hyph-dir,
-[  --with-external-hyph-dir Specify external hyphenation pattern dir
-],,)
+    AS_HELP_STRING([--with-external-hyph-dir],
+        [Specify external hyphenation pattern dir.]),
+,)
 
 AC_ARG_WITH(external-thes-dir,
-[  --with-external-thes-dir Specify external thesaurus dir
-],,)
+    AS_HELP_STRING([--with-external-thes-dir],
+        [Specify external thesaurus dir.]),
+,)
 
 AC_ARG_WITH(system-libs,
-[  --with-system-libs      Use libs already on system -- enables all
-                          --with-system-* flags except mozilla and
-                          odbc/sane/xrender-header(s)
-],,)
+    AS_HELP_STRING([--with-system-libs],
+        [Use libs already on system -- enables all --with-system-* flags except
+         mozilla and odbc/sane/xrender-header(s).]),
+,)
 
 AC_ARG_WITH(system-headers,
-[  --with-system-headers   Use headers already on system -- enables all
-                          --with-system-* flags for external packages
-                          whose headers are the only entities used i.e.
-                          boost/vigra/odbc/sane/xrender-header(s)
-],,)
+    AS_HELP_STRING([--with-system-headers],
+        [Use headers already on system -- enables all --with-system-* flags for
+         external packages whose headers are the only entities used i.e.
+         boost/vigra/odbc/sane/xrender-header(s).]),
+,)
 
 AC_ARG_WITH(system-jars,
-[  --without-system-jars   When building with --with-system-libs, also the
-                          needed jars are expected on the system. Use this to
-                          disable that.
-                          (except for the db case where --with-system-db
-                          *has to* imply using the db.jar from there, too)
-],,)
+    AS_HELP_STRING([--without-system-jars],
+        [When building with --with-system-libs, also the needed jars are expected
+         on the system. Use this to disable that (except for the db case where
+         --with-system-db *has to* imply using the db.jar from there, too).]),
+,)
 
 AC_ARG_WITH(system-zlib,
-[  --with-system-zlib      Use zlib already on system
-],,)
+    AS_HELP_STRING([--with-system-zlib],
+        [Use zlib already on system.]),
+,)
 
 AC_ARG_WITH(system-openssl,
-[  --with-system-openssl   Use OpenSSL already on system
-],,)
+    AS_HELP_STRING([--with-system-openssl],
+        [Use OpenSSL already on system.]),
+,)
 
 AC_ARG_WITH(system-jpeg,
-[  --with-system-jpeg      Use jpeg already on system
-],,)
+    AS_HELP_STRING([--with-system-jpeg],
+        [Use jpeg already on system.]),
+,)
 
 AC_ARG_WITH(system-expat,
-[  --with-system-expat     Use expat already on system
-],,)
+    AS_HELP_STRING([--with-system-expat],
+        [Use expat already on system.]),
+,)
 
 AC_ARG_WITH(system-libwpd,
-[  --with-system-libwpd    Use libwpd already on system
-],,)
+    AS_HELP_STRING([--with-system-libwpd],
+        [Use libwpd already on system.]),
+,)
 
 AC_ARG_WITH(system-libwps,
-[  --with-system-libwps    Use libwps already on system
-],,)
+    AS_HELP_STRING([--with-system-libwps],
+        [Use libwps already on system.]),
+,)
 
 AC_ARG_WITH(system-libwpg,
-[  --with-system-libwpg    Use libwpg already on system
-],,)
+    AS_HELP_STRING([--with-system-libwpg],
+        [Use libwpg already on system.]),
+,)
 
 AC_ARG_WITH(system-libxml,
-[  --with-system-libxml    Use libxml already on system
-],,)
+    AS_HELP_STRING([--with-system-libxml],
+        [Use libxml already on system.]),
+,)
 
 AC_ARG_WITH(system-python,
-[  --with-system-python    Use python already on system
-],,)
+    AS_HELP_STRING([--with-system-python],
+        [Use python already on system.]),
+,)
 
 AC_ARG_WITH(system-icu,
-[  --with-system-icu       Use icu already on system
-],,)
+    AS_HELP_STRING([--with-system-icu],
+        [Use icu already on system.]),
+,)
 
 AC_ARG_WITH(system-poppler,
-[  --with-system-poppler   Use poppler already on system
-],,)
+    AS_HELP_STRING([--with-system-poppler],
+        [Use system poppler. (only needed for pdfimport extension)]),
+,)
 
 AC_ARG_WITH(system-db,
-[  --with-system-db        Use berkeley db already on system
-],,)
+    AS_HELP_STRING([--with-system-db],
+        [Use berkeley db already on system.]),
+,)
 
 AC_ARG_WITH(system-lucene,
-[  --with-system-lucene    Use lucene already on system
-],,)
+    AS_HELP_STRING([--with-system-lucene],
+        [Use lucene already on system.]),
+,)
 
 AC_ARG_WITH(system-apache-commons,
-[  --with-system-apache-commons  Use apache commons libraries already on system
-],,)
+    AS_HELP_STRING([--with-system-apache-commons],
+        [Use apache commons libraries already on system.]),
+,)
 
 AC_ARG_WITH(lucene-core-jar,
-[  --with-lucene-core-jar=JARFILE   Specify path to jarfile manually ],
-[ LUCENE_CORE_JAR="$withval"
-])
+    AS_HELP_STRING([--with-lucene-core-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    LUCENE_CORE_JAR=$withval ,
+)
 
 AC_ARG_WITH(lucene-analyzers-jar,
-[  --with-lucene-analyzers-jar=JARFILE   Specify path to jarfile manually ],
-[ LUCENE_ANALYZERS_JAR="$withval"
-])
+    AS_HELP_STRING([--with-lucene-analyzers-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    LUCENE_ANALYZERS_JAR=$withval ,
+)
 
 AC_ARG_WITH(system-mysql,
-[  --with-system-mysql          Use MySQL libraries already on system, for building the MySQL Connector/OOo extension.
-                                Requires MYSQLCONFIG to point to the mysql_config executable.
-],,)
+    AS_HELP_STRING([--with-system-mysql],
+        [Use MySQL libraries already on system, for building the MySQL Connector/LibO
+         extension. Requires MYSQLCONFIG to point to the mysql_config executable.]),
+,)
 
 AC_ARG_WITH(libmysql-path,
-[  --with-libmysql-path         Use Connector/C (libmysql) installation for building the MySQL Connector/OOo extension.
-
-                                Usage: --with-libmysql-path=<absolute path to your Connector/C installation>
-],,)
+    AS_HELP_STRING([--with-libmysql-path],
+        [Use Connector/C (libmysql) installation for building the MySQL
+         Connector/LibO extension.])
+    [
+                          Usage:     --with-libmysql-path=<absolute path to
+                                                  your Connector/C installation>
+    ],
+,)
 
 AC_ARG_WITH(system-mysql-cppconn,
-[  --with-system-mysql-cppconn  Use MySQL C++ Connector libraries already on system
-],,)
+    AS_HELP_STRING([--with-system-mysql-cppconn],
+        [Use MySQL C++ Connector libraries already on system.]),
+,)
 
 AC_ARG_WITH(system-hsqldb,
-[  --with-system-hsqldb    Use hsqldb already on system
-],,)
+    AS_HELP_STRING([--with-system-hsqldb],
+        [Use hsqldb already on system.]),
+,)
 
 AC_ARG_WITH(hsqldb-jar,
-[  --with-hsqldb-jar=JARFILE   Specify path to jarfile manually ],
-[ HSQLDB_JAR="$withval"
-])
+    AS_HELP_STRING([--with-hsqldb-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    HSQLDB_JAR=$withval ,
+)
 
 AC_ARG_WITH(system-beanshell,
-[  --with-system-beanshell Use beanshell already on system
-],,)
+    AS_HELP_STRING([--with-system-beanshell],
+        [Use beanshell already on system.]),
+,)
 
 AC_ARG_WITH(beanshell-jar,
-[  --with-beanshell-jar=JARFILE   Specify path to jarfile manually ],
-[ BSH_JAR="$withval"
-])
+    AS_HELP_STRING([--with-beanshell-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    BSH_JAR=$withval ,
+)
 
 AC_ARG_WITH(commons-codec-jar,
-[  --with-commons-codec-jar=JARFILE   Specify path to jarfile manually ],
-[ COMMONS_CODEC_JAR="$withval"
-])
+    AS_HELP_STRING([--with-commons-codec-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    COMMONS_CODEC_JAR=$withval ,
+)
 
 AC_ARG_WITH(commons-lang-jar,
-[  --with-commons-lang-jar=JARFILE   Specify path to jarfile manually ],
-[ COMMONS_LANG_JAR="$withval"
-])
+    AS_HELP_STRING([--with-commons-lang-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    COMMONS_LANG_JAR=$withval ,
+)
 
 AC_ARG_WITH(commons-httpclient-jar,
-[  --with-commons-httpclient-jar=JARFILE   Specify path to jarfile manually ],
-[ COMMONS_HTTPCLIENT_JAR="$withval"
-])
+    AS_HELP_STRING([--with-commons-httpclient-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    COMMONS_HTTPCLIENT_JAR=$withval ,
+)
 
 AC_ARG_WITH(commons-logging-jar,
-[  --with-commons-logging-jar=JARFILE   Specify path to jarfile manually ],
-[ COMMONS_LOGGING_JAR="$withval"
-])
+    AS_HELP_STRING([--with-commons-logging-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    COMMONS_LOGGING_JAR=$withval ,
+)
 
 AC_ARG_WITH(servlet-api-jar,
-[  --with-servlet-api-jar=JARFILE   Specify path to jarfile manually ],
-[ SERVLETAPI_JAR="$withval"
-])
+    AS_HELP_STRING([--with-servlet-api-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    SERVLETAPI_JAR=$withval ,
+)
 
 AC_ARG_WITH(system-jfreereport,
-[  --with-system-jfreereport      Use JFreeReport already on system
-],,)
+    AS_HELP_STRING([--with-system-jfreereport],
+        [Use JFreeReport already on system.]),
+,)
 
 AC_ARG_WITH(sac-jar,
-[  --with-sac-jar=JARFILE   Specify path to jarfile manually ],
-[ SAC_JAR="$withval"
-])
+    AS_HELP_STRING([--with-sac-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    SAC_JAR=$withval ,
+)
 
 AC_ARG_WITH(libxml-jar,
-[  --with-libxml-jar=JARFILE   Specify path to jarfile manually ],
-[ LIBXML_JAR="$withval"
-])
+    AS_HELP_STRING([--with-libxml-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    LIBXML_JAR=$withval ,
+)
 
 AC_ARG_WITH(flute-jar,
-[  --with-flute-jar=JARFILE   Specify path to jarfile manually ],
-[ FLUTE_JAR="$withval"
-])
+    AS_HELP_STRING([--with-flute-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    FLUTE_JAR=$withval ,
+)
 
 AC_ARG_WITH(jfreereport-jar,
-[  --with-jfreereport-jar=JARFILE   Specify path to jarfile manually ],
-[ JFREEREPORT_JAR="$withval"
-])
+    AS_HELP_STRING([--with-jfreereport-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    JFREEREPORT_JAR=$withval ,
+)
 
 AC_ARG_WITH(liblayout-jar,
-[  --with-liblayout-jar=JARFILE   Specify path to jarfile manually ],
-[ LIBLAYOUT_JAR="$withval"
-])
+    AS_HELP_STRING([--with-liblayout-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    LIBLAYOUT_JAR=$withval ,
+)
 
 AC_ARG_WITH(libloader-jar,
-[  --with-libloader-jar=JARFILE   Specify path to jarfile manually ],
-[ LIBLOADER_JAR="$withval"
-])
+    AS_HELP_STRING([--with-libloader-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    LIBLOADER_JAR=$withval ,
+)
 
 AC_ARG_WITH(libloader-jar,
-[  --with-libloader-jar=JARFILE   Specify path to jarfile manually ],
-[ LIBLOADER_JAR="$withval"
-])
+    AS_HELP_STRING([--with-libloader-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    LIBLOADER_JAR=$withval ,
+)
 
 AC_ARG_WITH(libformula-jar,
-[  --with-libformula-jar=JARFILE   Specify path to jarfile manually ],
-[ LIBFORMULA_JAR="$withval"
-])
+    AS_HELP_STRING([--with-libformula-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    LIBFORMULA_JAR=$withval ,
+)
 
 AC_ARG_WITH(librepository-jar,
-[  --with-librepository-jar=JARFILE   Specify path to jarfile manually ],
-[ LIBREPOSITORY_JAR="$withval"
-])
+    AS_HELP_STRING([--with-librepository-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    LIBREPOSITORY_JAR=$withval ,
+)
 
 AC_ARG_WITH(libfonts-jar,
-[  --with-libfonts-jar=JARFILE   Specify path to jarfile manually ],
-[ LIBFONTS_JAR="$withval"
-])
+    AS_HELP_STRING([--with-libfonts-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    LIBFONTS_JAR=$withval ,
+)
 
 AC_ARG_WITH(libserializer-jar,
-[  --with-libserializer-jar=JARFILE   Specify path to jarfile manually ],
-[ LIBSERIALIZER_JAR="$withval"
-])
+    AS_HELP_STRING([--with-libserializer-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    LIBSERIALIZER_JAR=$withval ,
+)
 
 AC_ARG_WITH(libbase-jar,
-[  --with-libbase-jar=JARFILE   Specify path to jarfile manually ],
-[ LIBBASE_JAR="$withval"
-])
+    AS_HELP_STRING([--with-libbase-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    LIBBASE_JAR=$withval ,
+)
 
 AC_ARG_WITH(system-saxon,
-[  --with-system-saxon     Use saxon already on system
-],,)
+    AS_HELP_STRING([--with-system-saxon],
+        [Use saxon already on system.]),
+,)
 
 AC_ARG_WITH(saxon-jar,
-[  --with-saxon-jar=JARFILE   Specify path to jarfile manually ],
-[ SAXON_JAR="$withval"
-])
+    AS_HELP_STRING([--with-saxon-jar=JARFILE],
+        [Specify path to jarfile manually.]),
+    SAXON_JAR=$withval ,
+)
 
 AC_ARG_WITH(system-libxslt,
-[  --with-system-libxslt   Use libxslt already on system
-],,)
+    AS_HELP_STRING([--with-system-libxslt],
+        [Use libxslt already on system.]),
+,)
 
 AC_ARG_WITH(system-odbc,
-[  --with-system-odbc-headers     Use the odbc headers already on system
-],,)
+    AS_HELP_STRING([--with-system-odbc-headers],
+        [Use the odbc headers already on system.]),
+,)
 
 AC_ARG_WITH(system-sane,
-[  --with-system-sane-header      Use sane.h already on system
-],,)
+    AS_HELP_STRING([--with-system-sane-header],
+        [Use sane.h already on system.]),
+,)
 
 AC_ARG_WITH(system-xrender,
-[  --with-system-xrender-headers  Use XRender headers already on system
-],,)
+    AS_HELP_STRING([--with-system-xrender-headers],
+        [Use XRender headers already on system.]),
+,)
 
 AC_ARG_WITH(system-mesa-headers,
-[  --with-system-mesa-headers     Use Mesa headers already on system
-],,)
+    AS_HELP_STRING([--with-system-mesa-headers],
+        [Use Mesa headers already on system.]),
+,)
 
 AC_ARG_WITH(system-curl,
-[  --with-system-curl      Use curl already on system
-],,)
+    AS_HELP_STRING([--with-system-curl],
+        [Use curl already on system.]),
+,)
 
 AC_ARG_WITH(system-boost,
-[  --with-system-boost     Use boost already on system
-],,)
+    AS_HELP_STRING([--with-system-boost],
+        [Use boost already on system.]),
+,)
 
 AC_ARG_WITH(system-mdds,
-[  --with-system-mdds      Use mdds already on system
-],,)
+    AS_HELP_STRING([--with-system-mdds],
+        [Use mdds already on system.]),
+,)
 
 AC_ARG_WITH(system-vigra,
-[  --with-system-vigra     Use vigra already on system
-],,)
+    AS_HELP_STRING([--with-system-vigra],
+        [Use vigra already on system.]),
+,)
 
 AC_ARG_WITH(system-neon,
-[  --with-system-neon      Use neon already on system
-],,)
+    AS_HELP_STRING([--with-system-neon],
+        [Use neon already on system.]),
+,)
 
 AC_ARG_WITH(system-hunspell,
-[  --with-system-hunspell   Use libhunspell already on system
-],,)
+    AS_HELP_STRING([--with-system-hunspell],
+        [Use libhunspell already on system.]),
+,)
 
 AC_ARG_WITH(system-mythes,
-[  --with-system-mythes    Use mythes already on system
-],,)
+    AS_HELP_STRING([--with-system-mythes],
+        [Use mythes already on system.]),
+,)
 
 AC_ARG_WITH(system-altlinuxhyph,
-[  --with-system-altlinuxhyph    Use ALTLinuxhyph already on system
-],,)
+    AS_HELP_STRING([--with-system-altlinuxhyph],
+        [Use ALTLinuxhyph already on system.]),
+,)
 
 AC_ARG_WITH(system-lpsolve,
-[  --with-system-lpsolve         Use lpsolve already on system
-],,)
+    AS_HELP_STRING([--with-system-lpsolve],
+        [Use lpsolve already on system.]),
+,)
 
 AC_ARG_WITH(system-libtextcat,
-[  --with-system-libtextcat      Use libtextcat already on system
-],,)
+    AS_HELP_STRING([--with-system-libtextcat],
+        [Use libtextcat already on system.]),
+,)
 
 AC_ARG_WITH(external-libtextcat-data,
-[  --with-external-libtextcat-data Use libtextcat data already on system
-],,)
+    AS_HELP_STRING([--with-external-libtextcat-data],
+        [Use libtextcat data already on system.]),
+,)
 
 AC_ARG_WITH(system-cppunit,
-[  --with-system-cppunit         Use cppunit already on system
-],,)
+    AS_HELP_STRING([--with-system-cppunit],
+        [Use cppunit already on system.]),
+,)
 
 AC_ARG_WITH(system-redland,
-[  --with-system-redland   Use redland library already on system
-],,)
+    AS_HELP_STRING([--with-system-redland],
+        [Use redland library already on system.]),
+,)
 
 AC_ARG_WITH(system-mozilla,
-[  --with-system-mozilla   Use mozilla already on system. Note that some
-                          components cannot be built against a contemporary
-                          mozilla. The flavour used can be specified by
-                          --with-system-mozilla=<flavour>. Supported are:
-                          libxul (default), xulrunner, firefox, seamonkey,
-                          mozilla
-], WITH_SYSTEM_MOZILLA=$withval, WITH_SYSTEM_MOZILLA=no)
+    AS_HELP_STRING([--with-system-mozilla],
+        [Use mozilla already on system. Note that some components cannot be built
+         against a contemporary mozilla. The flavour used can be specified by
+         --with-system-mozilla=<flavour>. Supported are: libxul (default),
+         xulrunner, firefox, seamonkey, mozilla.]),
+    WITH_SYSTEM_MOZILLA=$withval ,
+WITH_SYSTEM_MOZILLA=no)
 
 AC_ARG_WITH(stlport,
-[  --with-stlport         The location that STLport is installed in. The STL
-                          header files are assumed to be in
-                          stlport-home/stlport and the STLPort library in
-                          stlport-home/lib.
-
-                          Usage: --with-stlport=<absolute path to stlport home>
+    AS_HELP_STRING([--with-stlport],
+        [The location that STLport is installed in. The STL header files are assumed
+         to be in stlport-home/stlport and the STLPort library in stlport-home/lib.])
+    [
+                          Usage:     --with-stlport=<abs. path to stlport home>
 
                           Warning!!, disabling using --without-stlport or
                           enabling using --with-stlport on a platform that
-                          defaults to the opposite will break ABI compatability
-], WITH_STLPORT=$withval , WITH_STLPORT=auto)
+                          defaults to the opposite will break ABI compatability.
+    ],
+    WITH_STLPORT=$withval ,
+WITH_STLPORT=auto)
 
 AC_ARG_WITH(jdk-home,
-[  --with-jdk-home         if you have installed JDK 1.3 or later on your system
-                          please supply the path here.
-                          Note that this is not the location of the Java binary
-                          but the location of the entire distribution.
-
-                          Usage: --with-jdk-home=<absolute path to JDK home>
-],,)
+    AS_HELP_STRING([--with-jdk-home],
+        [If you have installed JDK 1.3 or later on your system please supply the
+         path here. Note that this is not the location of the Java binary but the
+         location of the entire distribution.])
+    [
+                          Usage:     --with-jdk-home=<absolute path to JDK home>
+    ],
+,)
 
 AC_ARG_WITH(gxx_include_path,
-[  --with-gxx-include-path if you want to override the autodetected g++ include
-                          path.
-
-                          Usage: --with-gxx-include-path=<absolute path to g++ include dir>
-],,)
+    AS_HELP_STRING([--with-gxx-include-path],
+        [If you want to override the autodetected g++ include path.])
+    [
+                          Usage:     --with-gxx-include-path=<absolute path to
+                                                                g++ include dir>
+    ],
+,)
 
 AC_ARG_WITH(java,
-[  --with-java             Build with[[out]] Java support.  If you use
-                          --without-java/--with-java=no then the build will have
-                          no support for Java components, applets, accessibility
-                          or XML filters.
-], if test "$withval" = "yes"; then WITH_JAVA=java; else WITH_JAVA=$withval; fi, WITH_JAVA=java)
+    AS_HELP_STRING([--with-java],
+        [Build with(out) Java support. If you use --without-java/--with-java=no
+         then the build will have no support for Java components, applets,
+         accessibility or XML filters.]),
+    if test "$withval" = "yes"; then
+        WITH_JAVA=java;
+    else
+        WITH_JAVA=$withval;
+    fi ,
+WITH_JAVA=java)
 
 AC_ARG_WITH(java_target_version,
-[  --with-java-target-version   Generate class files that will work on JVMs with
-              the specified version. For example, use
-              --with-java-target-version=1.4 to make sure that the
-              application will work with JVM 1.4 even when compiled
-              with JDK 1.5.
-
-              This option is ignored when you compile with gcj/gij.
-
-                          Usage: --with-java-target-version=<jvm version>
-],,)
+    AS_HELP_STRING([--with-java-target-version],
+        [Generate class files that will work on JVMs with the specified version.
+         For example, use --with-java-target-version=1.4 to make sure that the
+         application will work with JVM 1.4 even when compiled with JDK 1.5.])
+    [
+                          This option is ignored when you compile with gcj/gij.
+
+                          Usage:     --with-java-target-version=<jvm version>
+    ],
+,)
 
 AC_ARG_WITH(ant-home,
-[  --with-ant-home         If you have installed Jakarta Ant on your system,
-                          please supply the path here.
-                          Note that this is not the location of the Ant binary
-                          but the location of the entire distribution.
-
-                          Usage: --with-ant-home=<absolute path to Ant home>
-],,)
+    AS_HELP_STRING([--with-ant-home],
+        [If you have installed Jakarta Ant on your system, please supply the path here.
+         Note that this is not the location of the Ant binary but the location
+         of the entire distribution.])
+    [
+                          Usage:     --with-ant-home=<absolute path to Ant home>
+    ],
+,)
 
 AC_ARG_WITH(junit,
-[  --with-junit            Specifies the JUnit 4 jar file to use for JUnit-based
-                          tests.  --without-junit disables those tests.  Not
-                          relevant in the --without-java case.
-
-                          Usage: --with-junit=<absolute path to JUnit 4 jar>
-],,with_junit=yes)
+    AS_HELP_STRING([--with-junit],
+        [Specifies the JUnit 4 jar file to use for JUnit-based tests.
+         --without-junit disables those tests. Not relevant in the --without-java case.])
+    [
+                          Usage:     --with-junit=<absolute path to JUnit 4 jar>
+    ],
+,with_junit=yes)
 
 AC_ARG_WITH(perl-home,
-[  --with-perl-home        If you have installed the Perl 5 Distribution, on your
-                          system, please supply the path here.
-                          Note that this is not the location of the Perl binary
-                          but the location of the entire distribution.
-
-                          Usage: --with-perl-home=<absolute path to Perl 5 home>
-],,)
+    AS_HELP_STRING([--with-perl-home],
+        [If you have installed the Perl 5 Distribution, on your system, please
+         supply the path here. Note that this is not the location of the Perl
+         binary but the location of the entire distribution.])
+    [
+                          Usage:     --with-perl-home=<abs. path to Perl 5 home>
+    ],
+,)
 
 AC_ARG_WITH(cl-home,
-[  --with-cl-home          For Windows NT users, please supply the path
-                          for the Microsoft C/C++ compiler.
-                          Note that this is not the location of the compiler
-                          binary but the location of the entire distribution.
-
-                          Usage: --with-cl-home=<absolute path to Microsoft C/C++ compiler home>
-],,)
+    AS_HELP_STRING([--with-cl-home],
+        [For Windows NT users, please supply the path for the Microsoft C/C++
+         compiler. Note that this is not the location of the compiler binary but
+         the location of the entire distribution.])
+    [
+                          Usage:     --with-cl-home=<absolute path to Microsoft
+                                                            C/C++ compiler home>
+    ],
+,)
 
 AC_ARG_WITH(mspdb-path,
-[  --with-mspdb-path       For Microsoft C/C++ compiler users, please supply the
-                          path pointing to the mspdb80.dll (if using Visual
-                          Studio 2008) or mspdb100.dl (if using Visual Studio
-                          2010).
-
-                          Usage: --with-mspdb-path=<path to mspdb80.dll/mspdb100.dll>
-],,)
+    AS_HELP_STRING([--with-mspdb-path],
+        [For Microsoft C/C++ compiler users, please supply the path pointing to
+         the mspdb80.dll (if using Visual Studio 2008) or mspdb100.dl (if using
+         Visual Studio 2010).])
+    [
+                          Usage:     --with-mspdb-path=<path to
+                                                       mspdb80.dll/mspdb100.dll>
+    ],
+,)
 
 AC_ARG_WITH(midl-path,
-[  --with-midl-path        For Microsoft compiler users, please supply
-                          the path pointing to the midl.exe.
-
-                          Usage: --with-midl-path=<absolute path to midl.exe>
-],,)
+    AS_HELP_STRING([--with-midl-path],
+        [For Microsoft compiler users, please supply the path pointing to the midl.exe.])
+    [
+                          Usage:     --with-midl-path=<abs. path to midl.exe>
+    ],
+,)
 
 AC_ARG_WITH(csc-path,
-[  --with-csc-path         For Windows builds, please supply
-                          the path pointing to the csc.exe.
-                          Usually found automatically
-
-                          Usage: --with-csc-path=<absolute path to csc.exe>
-],,)
+    AS_HELP_STRING([--with-csc-path],
+        [For Windows builds, please supply the path pointing to the csc.exe.
+         Usually found automatically.])
+    [
+                          Usage:     --with-csc-path=<abs. path to csc.exe>
+    ],
+,)
 
 AC_ARG_WITH(nsis-path,
-[  --with-nsis-path        For Windows users, please supply the path to the
-                          "Nullsoft Scriptable Install System" (NSIS). If NSIS
-                          is found in the path or this option is supplied a self
-                          contained executable installer for LibreOffice will
-                          be created.
-
-                          Usage: --with-nsis-path=<absolute path to nsis.exe>
-],,)
+    AS_HELP_STRING([--with-nsis-path],
+        [For Windows users, please supply the path to the "Nullsoft Scriptable
+         Install System" (NSIS). If NSIS is found in the path or this option is
+         supplied a self contained executable installer for LibreOffice will
+         be created.])
+    [
+                          Usage:     --with-nsis-path=<abs. path to nsis.exe>
+    ],
+,)
 
 AC_ARG_WITH(frame-home,
-[  --with-frame-home       For Microsoft compiler users, please supply
-                          the path pointing to lib/mscoree.lib, usually
-                          something like:
-                          "/cygdrive/c/Program Files/Windows SDKs/Windows/v7.0"
-
-                          Note that in most cases it will be automatically found,
-                          though.
-
-                          Usage: --with-frame-home=<absolute path to .NET Framework>]
-,,)
+    AS_HELP_STRING([--with-frame-home],
+        [For Microsoft compiler users, please supply the path pointing to
+         lib/mscoree.lib, usually something like:
+         "/cygdrive/c/Program Files/Windows SDKs/Windows/v7.0"])
+    [
+                          Note that in most cases it will be automatically
+                          found, though.
+
+                          Usage:     --with-frame-home=<absolute path to .NET
+                                                                      Framework>
+    ],
+,)
 
 AC_ARG_WITH(psdk-home,
-[  --with-psdk-home        For Windows users, please supply the path to the
-                          Windnows SDK. Usually found automatically.
-
-                          Usage: --with-psdk-home=<absolute path to Windows SDK>
-],,)
+    AS_HELP_STRING([--with-psdk-home],
+        [For Windows users, please supply the path to the Windnows SDK.
+         Usually found automatically.])
+    [
+                          Usage:     --with-psdk-home=<abs. path to Windows SDK>
+    ],
+,)
 
 AC_ARG_WITH(directx-home,
-[  --with-directx-home     For Windows users, please supply the path to the
-                          Microsoft DirectX SDK.
-
-                          Usage: --with-directx-home=<absolute path to Microsoft DirectX SDK>
-],,)
+    AS_HELP_STRING([--with-directx-home],
+        [For Windows users, please supply the path to the Microsoft DirectX SDK.])
+    [
+                          Usage:     --with-directx-home=<absolute path to
+                                                          Microsoft DirectX SDK>
+    ],
+,)
 
 AC_ARG_WITH(mozilla-build,
-[  --with-mozilla-build    For Windows users, please supply the path to the
-                          mozilla build tools.
-
-                          Usage: --with-mozilla-build=<absolute path to mozilla build tools>
-
-                          At the moment of this writing, an installer for the mozilla build tools
-                          can be obtained from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32.
-],[MOZILLABUILD=$withval],)
+    AS_HELP_STRING([--with-mozilla-build],
+        [For Windows users, please supply the path to the mozilla build tools.])
+    [
+                          Usage:     --with-mozilla-build=<absolute path to
+                                                            mozilla build tools>
+
+                          At the moment of this writing, an installer for the
+                          mozilla build tools can be obtained from http://ftp.
+                          mozilla.org/pub/mozilla.org/mozilla/libraries/win32.
+    ],
+    MOZILLABUILD=$withval ,
+)
 
 AC_ARG_WITH(local-solenv,
-[  --with-local-solenv     If you have solenv in a location other than ./solenv,
-                          please supply the path here.
-
-                          Usage: --with-local-solenv=<absolute path to solenv>
-],,)
+    AS_HELP_STRING([--with-local-solenv],
+        [If you have solenv in a location other than ./solenv, please supply the path here.])
+    [
+                          Usage:     --with-local-solenv=<abs. path to solenv>
+    ],
+,)
 
 AC_ARG_WITH(local-solver,
-[  --with-local-solver     if you have solver in a location other than ./solver,
-                          please supply the path here.
-
-                          Usage: --with-local-solver=<absolute path to solver>
-],,)
+    AS_HELP_STRING([--with-local-solver],
+        [If you have solver in a location other than ./solver, please supply the path here.])
+    [
+                          Usage:     --with-local-solver=<abs. path to solver>
+    ],
+,)
 
 AC_ARG_WITH(lang,
-[  --with-lang             Use this option to build LibreOffice with
-                          additional language support. English (US) is always
-                          included by default. Separate multiple languages with
-                          space. For all languages, use --with-lang=ALL.
-
-                          Usage: --with-lang="es sw tu cs sk"
-],,)
+    AS_HELP_STRING([--with-lang],
+        [Use this option to build LibreOffice with additional language support.
+         English (US) is always included by default.
+         Separate multiple languages with space.
+         For all languages, use --with-lang=ALL.])
+    [
+                          Usage:     --with-lang="es sw tu cs sk"
+    ],
+,)
 
 AC_ARG_WITH(poor-help-localizations,
-[  --with-poor-help-localizations
-                           Use this option to specify which languages have
-                          unusable help localizations. Separate multiple
-                          languages with space.
-
-                          Usage: --with-poor-help-localizations="af ar be-BY ca"
-],,)
+    AS_HELP_STRING([--with-poor-help-localizations],
+        [Use this option to specify which languages have unusable help localizations.
+         Separate multiple languages with space.])
+    [
+                          Usage:     --with-poor-help-localizations="af be-BY"
+    ],
+,)
 
 AC_ARG_WITH(dict,
-[  --with-dict             Use this option to build LibreOffice with
-                          dictionary support. ALL dictionaries are always
-                          included by default unless overridden with
-                          this option. Separate multiple dictionaries with
-                          commas. For all dictionaries, use --with-dict=ALL.
-
-                          Usage: --with-dict=ENGB,ENUS,ITIT
-],,)
+    AS_HELP_STRING([--with-dict],
+        [Use this option to build LibreOffice with dictionary support.
+         ALL dictionaries are always included by default unless overridden with this option.
+         Separate multiple dictionaries with commas.
+         For all dictionaries, use --with-dict=ALL.])
+    [
+                          Usage:     --with-dict=ENGB,ENUS,ITIT
+    ],
+,)
 
 AC_ARG_WITH(intro-bitmaps,
-[  --with-intro-bitmaps    Prefer the specified intro bitmaps over the
-                          the default one.  Can be more than one (separated by
-                          commas), the order means priority of fallback if the
-                          first does not exist (in the installed tree).
-
-                          Usage: --with-intro-bitmaps=/path/my_ooo_intro.bmp
-],,)
+    AS_HELP_STRING([--with-intro-bitmaps],
+        [Prefer the specified intro bitmaps over the the default one.
+         Can be more than one (separated by commas), the order means priority of
+         fallback if the first does not exist (in the installed tree).])
+    [
+                          Usage:     --with-intro-bitmaps=/path/my_lo_intro.bmp
+    ],
+,)
 
 AC_ARG_WITH(about-bitmaps,
-[  --with-about-bitmaps    Similarly to --with-intro-bitmaps, this allows
-                          specification of bitmaps for the About box.
-
-                          Usage: --with-about-bitmaps=/path/my_ooo_about.bmp
-],,)
+    AS_HELP_STRING([--with-about-bitmaps],
+        [Similarly to --with-intro-bitmaps, this allows specification of bitmaps for the About box.])
+    [
+                          Usage:     --with-about-bitmaps=/path/my_lo_about.bmp
+    ],
+,)
 
 AC_ARG_WITH(vendor,
-[  --with-vendor           Set vendor of the build.
-
-                          Usage: --with-vendor="John the Builder"
-],,)
+    AS_HELP_STRING([--with-vendor],
+        [Set vendor of the build.])
+    [
+                          Usage:     --with-vendor="John the Builder"
+    ],
+,)
 
 AC_ARG_WITH(unix-wrapper,
-[  --with-unix-wrapper    Redefines the name of the UNIX wrapper that will be used
-                          in the desktop files and in the desktop-integration RPMs.
-
-                          Usage: --with-unix-wrapper=ooffice
-],,)
+    AS_HELP_STRING([--with-unix-wrapper],
+        [Redefines the name of the UNIX wrapper that will be used in the desktop
+         files and in the desktop-integration RPMs.])
+    [
+                          Usage:     --with-unix-wrapper=ooffice
+    ],
+,)
 
 AC_ARG_WITH(asm-home,
-[  --with-asm-home         For Windows users, please supply the path for the
-                          ml.exe assembler.
-
-                          Usage: --with-asm-home=<path to ml.exe directory>
-],,)
+    AS_HELP_STRING([--with-asm-home],
+        [For Windows users, please supply the path for the ml.exe assembler.])
+    [
+                          Usage:     --with-asm-home=<path to ml.exe directory>
+    ],
+,)
 
 AC_ARG_WITH(os-version,
-[  --with-os-version       For FreeBSD users, use this option option to override
-                          the detected OSVERSION.
-
-                          Usage: --with-os-version=<OSVERSION>
-],,)
+    AS_HELP_STRING([--with-os-version],
+        [For FreeBSD users, use this option option to override the detected OSVERSION.])
+    [
+                          Usage:     --with-os-version=<OSVERSION>
+    ],
+,)
 
 AC_ARG_WITH(zip-home,
-[  --with-zip-home         If you use a non standard zip, for example windows
-                          please supply the path for zip
-
-                          Usage: --with-zip-home=<path to zip executable>
-],,)
+    AS_HELP_STRING([--with-zip-home],
+        [If you use a non standard zip, for example windows please supply the path for zip.])
+    [
+                          Usage:     --with-zip-home=<path to zip executable>
+    ],
+,)
 
 AC_ARG_WITH(mingwin,
-[  --with-mingwin          For Windows users, use the mingwin32 compiler within
-                          cygwin environment
-
-                          Usage: --with-mingwin=yes
+    AS_HELP_STRING([--with-mingwin],
+        [For Windows users, use the mingwin32 compiler within cygwin environment.])
+    [
+                          Usage:     --with-mingwin=yes
 
                           For !Windows use, use the mingw32 C++ compiler to
-                          (re-) build unowinreg.dll. Specify the MinGW C++
+                          (re-)build unowinreg.dll. Specify the MinGW C++
                           Compilers name.
 
-                          Usage: --with-mingwin=i586-mingw32msvc-g++
-],WITH_MINGWIN=$withval,WITH_MINGWIN=0)
+                          Usage:     --with-mingwin=i586-mingw32msvc-g++
+    ],
+    WITH_MINGWIN=$withval ,
+WITH_MINGWIN=0)
 
 AC_ARG_WITH(build-version,
-[  --with-build-version    Allows the builder to add a custom version tag
-                          that will appear in the Help/About box for QA
-                          purposes.
-
-                          Usage: --with-build-version="Built by Jim"
-],with_build_version=$withval)
+    AS_HELP_STRING([--with-build-version],
+        [Allows the builder to add a custom version tag that will appear in the
+         Help/About box for QA purposes.])
+    [
+                          Usage:     --with-build-version="Built by Jim"
+    ],
+    with_build_version=$withval ,
+)
 
 AC_ARG_WITH(alloc,
-[  --with-alloc            Define which allocator to build with
-                          (choices are oo, system, tcmalloc, jemalloc)
-
-                          Note that on FreeBSD/NetBSD system==jemalloc
-],,)
-
-AC_ARG_WITH(sun-templates,
-[
-  --with-sun-templates      Integrate Sun template packages.],
+    AS_HELP_STRING([--with-alloc],
+        [Define which allocator to build with (choices are oo, system, tcmalloc, jemalloc).
+         Note that on FreeBSD/NetBSD system==jemalloc]),
 ,)
 
-AC_ARG_WITH(lightproof,
-[
-  --with-lightproof      Integrate Lightproof extension],
+AC_ARG_WITH(sun-templates,
+    AS_HELP_STRING([--with-sun-templates],
+        [Integrate Sun template packages.]),
 ,)
 
-AC_ARG_WITH(numbertext,
-[
-  --with-numbertext      Integrate Numbertext extension],
+AC_ARG_WITH(num-cpus,
+    AS_HELP_STRING([--with-num-cpus],
+        [Number of build processes/cpus to use (number of projects that will build at the same time).
+         Multi-process/multi-cpu builds can save a lot of time on multi-cpu machines.
+         Defaults to the number of CPUs on the machine.]),
 ,)
 
-AC_ARG_WITH(hunart,
-[
-  --with-hunart      Integrate Hungarian Cross-reference Toolbar extension],
+AC_ARG_WITH(max-jobs,
+    AS_HELP_STRING([--with-max-jobs],
+        [Maximum number of jobs per one CPU that will be issued at the same time my dmake.
+         The real number of the jobs is affected by the --with-num-cpus too, it can get up to CPUS*max_jobs.
+         Defaults to 1, unless you configure --enable-icecream - then to 10.]),
 ,)
 
-AC_ARG_WITH(typo,
-[
-  --with-typo      Integrate Typography Toolbar extension],
-,)
+dnl ---------- Deprecated since 2010-11-05 ----------
 
-AC_ARG_WITH(watch-window,
-[
-  --with-watch-window      Integrate Watch Window extension to Calc],
-,)
+AC_ARG_WITH(barcode,
+    AS_HELP_STRING([--with-barcode],
+        [Deprecated: use --enable-ext-barcode instead.]),
+    if test -z "$enable_ext_barcode"; then
+        enable_ext_barcode=$with_barcode;
+    fi ,
+)
 
 AC_ARG_WITH(diagram,
-[
-  --with-diagram      Integrate Diagram extension],
-,)
+    AS_HELP_STRING([--with-diagram],
+        [Deprecated: use --enable-ext-diagram instead.]),
+    if test -z "$enable_ext_diagram"; then
+        enable_ext_diagram=$with_diagram;
+    fi ,
+)
 
-AC_ARG_WITH(validator,
-[
-  --with-validator      Integrate Validator extension],
-,)
+AC_ARG_WITH(google-docs,
+    AS_HELP_STRING([--with-google-docs],
+        [Deprecated: use --enable-ext-google-docs instead.]),
+    if test -z "$enable_ext_google_docs"; then
+        enable_ext_google_docs=$with_google_docs;
+    fi ,
+)
 
-AC_ARG_WITH(barcode,
-[
-  --with-barcode      Integrate Barcode extension],
-,)
+AC_ARG_WITH(hunart,
+    AS_HELP_STRING([--with-hunart],
+        [Deprecated: use --enable-ext-hunart instead.]),
+    if test -z "$enable_ext_hunart"; then
+        enable_ext_hunart=$with_hunart;
+    fi ,
+)
 
-AC_ARG_WITH(google-docs,
-[
-  --with-google-docs      Download and integrate Google Documents extension.],
-,)
+AC_ARG_WITH(lightproof,
+    AS_HELP_STRING([--with-lightproof],
+        [Deprecated: use --enable-ext-lightproof instead.]),
+    if test -z "$enable_ext_lightproof"; then
+        enable_ext_lightproof=$with_lightproof;
+    fi ,
+)
 
 AC_ARG_WITH(nlpsolver,
-[
-  --with-nlpsolver      Download and integrate NLPSolver extension.],
-,)
+    AS_HELP_STRING([--with-nlpsolver],
+        [Deprecated: use --enable-ext-nlpsolver instead.]),
+    if test -z "$enable_ext_nlpsolver"; then
+        enable_ext_nlpsolver=$with_nlpsolver;
+    fi ,
+)
+
+AC_ARG_WITH(numbertext,
+    AS_HELP_STRING([--with-numbertext],
+        [Deprecated: use --enable-ext-numbertext instead.]),
+    if test -z "$enable_ext_numbertext"; then
+        enable_ext_numbertext=$with_numbertext;
+    fi ,
+)
 
 AC_ARG_WITH(oooblogger,
-[
-  --with-oooblogger      Download and integrate oooblogger extension.],
-,)
+    AS_HELP_STRING([--with-oooblogger],
+        [Deprecated: use --enable-ext-oooblogger instead.]),
+    if test -z "$enable_ext_oooblogger"; then
+        enable_ext_oooblogger=$with_oooblogger;
+    fi ,
+)
 
-AC_ARG_WITH(num-cpus,
-[  --with-num-cpus         Number of build processes/cpus to use (number of
-                          projects that will build at the same time).
-                          Multi-process/multi-cpu builds can save a lot of
-                          time on multi-cpu machines. Defaults to the number
-                          of CPUs on the machine
-],,)
+AC_ARG_WITH(typo,
+    AS_HELP_STRING([--with-typo],
+        [Deprecated: use --enable-ext-typo instead.]),
+    if test -z "$enable_ext_typo"; then
+        enable_ext_typo=$with_typo;
+    fi ,
+)
 
-AC_ARG_WITH(max-jobs,
-[  --with-max-jobs         Maximum number of jobs per one CPU that will be
-                          issued at the same time my dmake. The real number of
-                          the jobs is affected by the --with-num-cpus too, it
-                          can get up to CPUS*max_jobs. Defaults to 1, unless
-                          you configure --enable-icecream - then to 10.
-],,)
+AC_ARG_WITH(validator,
+    AS_HELP_STRING([--with-validator],
+        [Deprecated: use --enable-ext-validator instead.]),
+    if test -z "$enable_ext_validator"; then
+        enable_ext_validator=$with_validator;
+    fi ,
+)
+
+AC_ARG_WITH(watch-window,
+    AS_HELP_STRING([--with-watch-window],
+        [Deprecated: use --enable-ext-watch-window instead.]),
+    if test -z "$enable_ext_watch_window"; then
+        enable_ext_watch_window=$with_watch_window;
+    fi ,
+)
 
-BUILD_TYPE="OOo"
+BUILD_TYPE="LibO"
 
 dnl ===================================================================
 dnl Message.
 dnl ===================================================================
 echo "********************************************************************"
-echo "*                                                                  *"
-echo "*   LibreOffice build configuration.                               *"
-echo "*                                                                  *"
-echo "*   The configure process checks your platform to see whether      *"
-echo "*   you can build LibreOffice on it.                               *"
-echo "*   This process checks all pre-requisites and generates a file    *"
-echo "*   containing the necessary environment variables.                *"
-echo "*   Source this file after configure has ended successfully.       *"
-echo "*                                                                  *"
-echo "*   Any warning that is generated during the configure process     *"
-echo "*   must be taken into account since it can be a reason for        *"
-echo "*   an unsuccessful build of LibreOffice.                          *"
-echo "*                                                                  *"
-echo "********************************************************************"
-echo ""
-echo "********************************************************************"
-echo "*                                                                  *"
-echo "*   Checking the platform pre-requisites.                          *"
-echo "*                                                                  *"
+echo "*"
+echo "*   Running ${PACKAGE_NAME} build configuration."
+echo "*"
 echo "********************************************************************"
 echo ""
 dnl ===================================================================
@@ -1249,14 +1567,16 @@ dnl The following is a list of supported systems.
 dnl Sequential to keep the logic very simple
 dnl These values may be checked and reset later.
 dnl ===================================================================
+#defaults unless the os test overrides this:
+test_cairo=yes
+test_randr=yes
+
 case "$build_os" in
     solaris*)
         test_gtk=yes
-        test_cairo=yes
         build_gstreamer=yes
         test_kde=yes
         test_cups=yes
-        test_randr=yes
         test_freetype=yes
         _os=SunOS
         AC_PATH_PROG( GNUTAR, gtar,,$PATH:/usr/sfw/bin)
@@ -1286,30 +1606,29 @@ case "$build_os" in
         ;;
     linux-gnu*|k*bsd*-gnu*)
         test_gtk=yes
-        test_cairo=yes
         build_gstreamer=yes
         test_kde=yes
         test_kde4=yes
         test_cups=yes
-        test_randr=yes
         test_freetype=yes
         test_unix_quickstarter=yes
         _os=Linux
         ;;
     gnu)
+        test_randr=no
+        test_cairo=no
         test_cups=no
         _os=GNU
         ;;
     cygwin*) # Windows
         test_cups=no
-        test_cairo=yes
+        test_randr=no
         test_freetype=no
         _os=WINNT
         ;;
     darwin*) # Mac OS X
         test_cups=yes
         test_gtk=yes
-        test_cairo=yes
         test_randr=no
         test_freetype=no
         _os=Darwin
@@ -1320,21 +1639,19 @@ case "$build_os" in
       fi
         ;;
     os2*)
-        test_x=no
         test_cups=no
         test_randr=no
         test_gtk=no
+        test_cairo=no
         test_freetype=no
         _os=OS2
         ;;
     freebsd*)
         test_gtk=yes
-        test_cairo=yes
         build_gstreamer=yes
         test_kde=yes
         test_kde4=yes
         test_cups=yes
-        test_randr=yes
         test_freetype=yes
         AC_MSG_CHECKING([the FreeBSD operating system release])
         if test -n "$with_os_version"; then
@@ -1359,17 +1676,16 @@ case "$build_os" in
         ;;
     osf)
         test_cups=no
+        test_cairo=no
         test_randr=no
         _os=OSF1
         ;;
     *netbsd*)
         test_gtk=yes
-        test_cairo=yes
         build_gstreamer=yes
         test_kde=yes
         test_kde4=yes
         test_cups=yes
-        test_randr=yes
         test_freetype=yes
         PTHREAD_CFLAGS="-pthread"
         PTHREAD_LIBS="-pthread -lpthread"
@@ -1378,18 +1694,16 @@ case "$build_os" in
     aix*)
         test_cups=no
         test_randr=no
+        test_cairo=no
         test_freetype=yes
         PTHREAD_LIBS=-pthread
         _os=AIX
         ;;
     openbsd*)
-        test_x=yes
         test_gtk=yes
-        build_cairo=yes
         test_kde=yes
         test_cups=yes
         test_freetype=yes
-        test_randr=yes
         PTHREAD_CFLAGS="-pthread -D_THREAD_SAFE"
         PTHREAD_LIBS="-pthread"
         _os=OpenBSD
@@ -1423,17 +1737,17 @@ fi
 
 if test "$_os" = "WINNT"; then
    dnl ===================================================================
-   dnl Set the VC_STANDARD variable.
+   dnl Set the CL_X64 variable.
    dnl ===================================================================
-   AC_MSG_CHECKING([whether to use the standard non-optimizing compiler])
-   if test "$enable_cl_standard" = "" -o "$enable_cl_standard" = "no"; then
-      VC_STANDARD=""
+   AC_MSG_CHECKING([whether to use the Microsoft C/C++ x64 compiler])
+   if test "$enable_cl_x64" = "" -o "$enable_cl_x64" = "no"; then
+      CL_X64=""
       AC_MSG_RESULT([no])
    else
-      VC_STANDARD="TRUE"
+      CL_X64="TRUE"
       AC_MSG_RESULT([yes])
    fi
-   AC_SUBST(VC_STANDARD)
+   AC_SUBST(CL_X64)
 fi
 
 dnl ===================================================================
@@ -1722,7 +2036,7 @@ AC_SUBST(WITH_MINGWIN)
 dnl ===================================================================
 dnl Extra check for Windows. cygwin builds need gcc to build dmake
 dnl and g++ to build guw.exe although MS cl (or MinGW) is used to
-dnl build OOo.
+dnl build LibO.
 dnl ===================================================================
 if test "$_os" = "WINNT" ; then
    AC_MSG_CHECKING([for cygwin gcc/g++])
@@ -1949,7 +2263,7 @@ if test "$_os" = "SunOS"; then
       COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
       AC_MSG_CHECKING([the SunStudio C/C++ compiler version])
       dnl cc -V outputs to standard error!!!!
-      _sunstudio_string=`$CC -V 2>&1 | grep '^cc' | sed -e 's/.* C //'`
+      _sunstudio_string=`$CC -V 2>&1 | grep '^cc' | $SED -e 's/.* C //'`
       _sunstudio_version=`echo $_sunstudio_string | $AWK '{ print $1 }'`
       _sunstudio_major=`echo $_sunstudio_version | $AWK -F. '{ print $1 }'`
       if test "$_sunstudio_major" != "5"; then
@@ -2054,14 +2368,17 @@ dnl  Check which Microsoft C/C++ or MinGW compiler is used for WINNT
 dnl ===================================================================
 if test "$_os" = "WINNT"; then
     if test "$WITH_MINGWIN" != "yes"; then
-        AC_MSG_CHECKING([for friendly registry keys])
-        # VS.Net 2003, VS.Net 2005
-        # (is that just a misleading comment, or does this really apply
-        # only to .NET 2003 and MSVS 2005? which we don't support any more?)
+        AC_MSG_CHECKING([for a friendly Microsoft C/C++ compiler installation path])
         if test -z "$with_cl_home"; then
             vctest=`./oowintool --msvc-productdir`;
-            if test -x "$vctest/bin/cl.exe"; then
-                with_cl_home=$vctest;
+            if test "$enable_cl_x64" = "" -o "$enable_cl_x64" = "no"; then
+                if test -x "$vctest/bin/cl.exe"; then
+                    with_cl_home=$vctest;
+                fi
+            else
+                if test -x "$vctest/bin/x86_amd64/cl.exe"; then
+                    with_cl_home=$vctest;
+                fi
             fi
         else
             with_cl_home=`cygpath -u "$with_cl_home"`
@@ -2107,18 +2424,32 @@ if test "$_os" = "WINNT"; then
         PATH="$MSPDB_PATH:$PATH"
 
         AC_MSG_CHECKING([the Microsoft C/C++ Compiler])
-           if test -x "$with_cl_home/bin/cl.exe"; then
-               CC="$with_cl_home/bin/cl.exe"
-           else
-               AC_PATH_PROG(CC, cl.exe)
-           fi
+        if test "$enable_cl_x64" = "" -o "$enable_cl_x64" = "no"; then
+            if test -x "$with_cl_home/bin/cl.exe"; then
+                CC="$with_cl_home/bin/cl.exe"
+            fi
+		else
+            if test -x "$with_cl_home/bin/x86_amd64/cl.exe"; then
+                CC="$with_cl_home/bin/x86_amd64/cl.exe"
+            fi
+		fi
+        if test -z "$CC"; then
+            AC_PATH_PROG(CC, cl.exe)
+        fi
+
           if test -e "$CC"; then
             # This gives us a posix path with 8.3 filename restrictions
             CC=`cygpath -d "$CC"`
             CC=`cygpath -u "$CC"`
             # Remove /cl.exe from CC case insensitive
             AC_MSG_RESULT([found ($CC)])
-            COMPATH=`echo $CC | $SED 's@\/[[Bb]][[Ii]][[Nn]]\/[[cC]][[lL]]\.[[eE]][[xX]][[eE]]@@'`
+            if test "$enable_cl_x64" = "" -o "$enable_cl_x64" = "no"; then
+                COMPATH=`echo $CC | $SED 's@\/[[Bb]][[Ii]][[Nn]]\/[[cC]][[lL]]\.[[eE]][[xX]][[eE]]@@'`
+            else
+                if test -n "$with_cl_home"; then
+                    COMPATH=`echo $with_cl_home`
+                fi
+            fi
             export INCLUDE=`cygpath -d "$COMPATH/Include"`
             dnl  Check which Microsoft C/C++ compiler is found
             AC_MSG_CHECKING([the Version of Microsoft C/C++ Compiler])
@@ -2517,7 +2848,7 @@ _ACEOF
   AC_MSG_CHECKING([whether to use dynamic libgcc])
   if test -e "$MINGW_CLIB_DIR/libgcc_s.a"; then
     AC_MSG_CHECKING([dynamic libgcc name])
-    MINGW_GCCDLL_pattern=`nm $MINGW_CLIB_DIR/libgcc_s.a | sed -ne 's@.* _libgcc\(.*\)_dll_iname@libgcc\1.dll@p' | uniq | sed -e 's@_@?@g'`
+    MINGW_GCCDLL_pattern=`nm $MINGW_CLIB_DIR/libgcc_s.a | $SED -ne 's@.* _libgcc\(.*\)_dll_iname@libgcc\1.dll@p' | uniq | $SED -e 's@_@?@g'`
     MINGW_GCCDLL=`cd $COMPATH/bin && ls $MINGW_GCCDLL_pattern 2>/dev/null`
     if test -n "$MINGW_GCCDLL"; then
         MINGW_SHARED_GCCLIB=YES
@@ -2534,7 +2865,7 @@ _ACEOF
   AC_MSG_CHECKING([whether to use dynamic libstdc++])
   if test -e "$MINGW_CLIB_DIR/libstdc++_s.a" ; then
     AC_MSG_CHECKING([dynamic libstdc++ name])
-    MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/libstdc++_s.a | sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' | uniq | sed -e 's@_@?@g'`
+    MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/libstdc++_s.a | $SED -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' | uniq | $SED -e 's@_@?@g'`
     MINGW_GXXDLL=`cd $COMPATH/bin && ls $MINGW_GXXDLL_pattern 2>/dev/null`
     if test -n "$MINGW_GXXDLL"; then
         MINGW_SHARED_GXXLIB=YES
@@ -2894,6 +3225,7 @@ fi
 dnl ===================================================================
 dnl system stl sanity tests
 dnl ===================================================================
+HAVE_GCC_VISIBILITY_BROKEN=
 if test "$USE_SYSTEM_STL" = "YES"; then
    AC_MSG_CHECKING([if hash_map will be in __gnu_cxx namespace])
    AC_LANG_PUSH([C++])
@@ -2933,9 +3265,9 @@ using namespace std;
       gccvisok=no)
       AC_MSG_RESULT([$gccvisok])
       if test "$gccvisok" = "no"; then
-         AC_MSG_WARN([Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility])
-         echo "Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >> warn
-         unset HAVE_GCC_VISIBILITY_FEATURE
+         AC_MSG_WARN([Your gcc is not -fvisibility-inlines-hidden safe, disabling that.])
+         echo "Your gcc is not -fvisibility-inlines-hidden safe, disabling that." >> warn
+         HAVE_GCC_VISIBILITY_BROKEN="TRUE"
       fi
 
       LDFLAGS=$sharedlink_ldflags_save
@@ -2982,6 +3314,7 @@ _ACEOF
 fi
 
 AC_SUBST(HAVE_GCC_VISIBILITY_FEATURE)
+AC_SUBST(HAVE_GCC_VISIBILITY_BROKEN)
 
 dnl ===================================================================
 dnl allocator
@@ -3091,9 +3424,9 @@ if test "$SOLAR_JAVA" != ""; then
       JAVAINTERPRETER=`cygpath -d "$JAVAINTERPRETER"`
       JAVAINTERPRETER=`cygpath -u "$JAVAINTERPRETER"`
    elif test "$_os" = "Darwin"; then
-      dnl HACK:  There currently is only a 32 bit version of OOo for Mac OS X,
+      dnl HACK:  There currently is only a 32 bit version of LibO for Mac OS X,
       dnl and Tiger java complains about -d32 while Snow Leopard java needs it
-      dnl to run in 32 bit mode and be able to load OOo jnilibs:
+      dnl to run in 32 bit mode and be able to load LibO jnilibs:
       AC_MSG_CHECKING([whether to pass -d32 to Java interpreter])
       if "$JAVAINTERPRETER" -d32 >&5 2>&5; then
          AC_MSG_RESULT([yes])
@@ -3137,9 +3470,9 @@ if test "$SOLAR_JAVA" != ""; then
         _gij_version=`$JAVAINTERPRETER --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
         _gij_longver=`echo $_gij_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
 
-      elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "BEA"` -gt 0; then
+      elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | grep -c "BEA"` -gt 0; then
          AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.in])
-      elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "IBM"` -gt 0; then
+      elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | grep -c "IBM"` -gt 0; then
         JDK=ibm
 
         dnl IBM JDK specific tests
@@ -3673,7 +4006,7 @@ rpm - RedHat software distribution
 setld - Tru64 (setld) software distribution
 native - "Native" software distribution for the platform
 portable - Portable software distribution
-OOo additionally supports:
+LibO additionally supports:
 archive - .tar.gz or .zip
 dmg - Mac OS X .dmg
 installed - installation tree
@@ -3731,7 +4064,7 @@ msi - Windows .msi
       echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
           if test "$EPM" != "no" && test "$EPM" != "internal"; then
            if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then
-               AC_MSG_CHECKING([whether epm is patched for OOos needs])
+               AC_MSG_CHECKING([whether epm is patched for LibOs needs])
                if grep "Patched for LibreOffice" $EPM >/dev/null 2>/dev/null; then
                   AC_MSG_RESULT([yes])
                else
@@ -3971,7 +4304,7 @@ if test -n "$with_system_libwpd" -o -n "$with_system_libs" && \
         test "$with_system_libwpd" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_LIBWPD=YES
-    PKG_CHECK_MODULES( LIBWPD, libwpd-0.8 )
+    PKG_CHECK_MODULES( LIBWPD, libwpd-0.9 libwpd-stream-0.9 )
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBWPD=NO
@@ -4018,7 +4351,7 @@ if test -n "$with_system_libwps" -o -n "$with_system_libs" && \
         test "$with_system_libwps" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_LIBWPS=YES
-    PKG_CHECK_MODULES( LIBWPS, libwps-0.1 )
+    PKG_CHECK_MODULES( LIBWPS, libwps-0.2 )
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBWPS=NO
@@ -4036,7 +4369,7 @@ if test -n "$with_system_libwpg" -o -n "$with_system_libs" && \
         test "$with_system_libwpg" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_LIBWPG=YES
-    PKG_CHECK_MODULES( LIBWPG, libwpg-0.1 )
+    PKG_CHECK_MODULES( LIBWPG, libwpg-0.2 )
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBWPG=NO
@@ -4178,7 +4511,7 @@ fi
 AC_SUBST(SYSTEM_PYTHON)
 AC_SUBST(PYTHON_CFLAGS)
 AC_SUBST(PYTHON_LIBS)
-HOME=`echo $HOME | sed 's:\\\\:/:g'`
+HOME=`echo $HOME | $SED 's:\\\\:/:g'`
 AC_SUBST(HOME)
 
 dnl ===================================================================
@@ -4286,7 +4619,7 @@ AC_SUBST(LUCENE_CORE_JAR)
 AC_SUBST(LUCENE_ANALYZERS_JAR)
 
 AC_MSG_CHECKING([whether to build the MySQL Connector extension])
-if test -n "$enable_mysql_connector" -a "$enable_mysql_connector" != "no"; then
+if test -n "$enable_ext_mysql_connector" -a "$enable_ext_mysql_connector" != "no"; then
   AC_MSG_RESULT([yes])
   ENABLE_MYSQLC=YES
   AC_MSG_CHECKING([for mysqlc module])
@@ -4326,7 +4659,7 @@ if test -n "$with_system_mysql" -o -n "$with_system_libs" && \
     AC_MSG_CHECKING([for MySQL Client library])
     MYSQL_INC=`$MYSQLCONFIG --include`
     MYSQL_LIB=`$MYSQLCONFIG --libs`
-    MYSQL_DEFINES=`$MYSQLCONFIG --cflags | sed -e s,$MYSQL_INC,,`
+    MYSQL_DEFINES=`$MYSQLCONFIG --cflags | $SED -e s,$MYSQL_INC,,`
     AC_MSG_RESULT([includes $MYSQL_INC, libraries $MYSQL_LIB])
 else
     SYSTEM_MYSQL=NO
@@ -4506,7 +4839,7 @@ if test -n "$with_system_saxon" -o -n "$with_system_libs" && \
         fi
 
 dnl Saxon comes in two practically available versions, the out-of-date saxonb which
-dnl supports the java extensions that OOo uses, and the up-to-date saxon he
+dnl supports the java extensions that LibO uses, and the up-to-date saxon he
 dnl "home edition" version, which is crippled to not support those java extensions.
 dnl And as an aside the he one also needs to be tweaked to include
 dnl a META-INF/services to broadcast that it supports the jaxp transform factory
@@ -5087,15 +5420,15 @@ if test -n "$with_system_icu" -o -n "$with_system_libs" && \
    AC_LANG_PUSH([C++])
    AC_MSG_CHECKING([for unicode/rbbi.h])
    AC_TRY_CPP(unicode/rbbi.h, AC_MSG_RESULT([checked.]), AC_MSG_ERROR([icu headers not found.]))
-   AC_PATH_PROG(SYSTEM_GENBRK, genbrk, [], [$PATH:/usr/sbin:/sbin])
+   AC_PATH_PROG(SYSTEM_GENBRK, genbrk, [], [$PATH:/usr/sbin:/sbin:/usr/local/bin])
    if test -z "$SYSTEM_GENBRK"; then
       AC_MSG_ERROR([\"genbrk\" not found in \$PATH, install the icu development tool \"genbrk"\])
    fi
-   AC_PATH_PROG(SYSTEM_GENCCODE, genccode, [], [$PATH:/usr/sbin:/sbin])
+   AC_PATH_PROG(SYSTEM_GENCCODE, genccode, [], [$PATH:/usr/sbin:/sbin:/usr/local/sbin])
    if test -z "$SYSTEM_GENCCODE"; then
       AC_MSG_ERROR([\"genccode\" not found in \$PATH, install the icu development tool \"genccode"\])
    fi
-   AC_PATH_PROG(SYSTEM_GENCMN, gencmn, [], [$PATH:/usr/sbin:/sbin])
+   AC_PATH_PROG(SYSTEM_GENCMN, gencmn, [], [$PATH:/usr/sbin:/sbin:/usr/local/sbin])
    if test -z "$SYSTEM_GENCMN"; then
       AC_MSG_ERROR([\"gencmn\" not found in \$PATH, install the icu development tool \"gencmn"\])
    fi
@@ -5312,8 +5645,9 @@ AC_MSG_CHECKING([whether to enable RandR support])
 if test "$test_randr" = "yes" -a \( "$enable_randr" = "yes" -o "$enable_randr" = "TRUE" \) ; then
    if test -z "$enable_randr_link" -o "$enable_randr_link" = "no"; then
       XRANDR_DLOPEN="TRUE"
-      AC_MSG_RESULT([resorting to dlopen libXrandr at runtime])
+      AC_MSG_RESULT([configured to dlopen libXrandr at runtime])
    else
+      AC_MSG_RESULT([yes])
       XRANDR_DLOPEN="FALSE"
       PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2, ENABLE_RANDR="TRUE", ENABLE_RANDR="")
       if test "$ENABLE_RANDR" != "TRUE"; then
@@ -5324,7 +5658,6 @@ if test "$test_randr" = "yes" -a \( "$enable_randr" = "yes" -o "$enable_randr" =
               [ AC_MSG_ERROR(libXrandr not found or functional) ], [])
          XRANDR_LIBS="-lXrandr "
          ENABLE_RANDR="TRUE"
-         AC_MSG_RESULT([enabling RandR support])
       fi
    fi
 else
@@ -6219,6 +6552,8 @@ AC_MSG_CHECKING([whether to build the OpenGL Transitions component])
 ENABLE_OPENGL=
 
 if test "x$enable_opengl" != "xno" ; then
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS -lm"
    AC_MSG_RESULT([yes])
    AC_CHECK_HEADER(GL/gl.h, [],
                    [AC_MSG_ERROR([OpenGL headers not found])], [])
@@ -6227,46 +6562,51 @@ if test "x$enable_opengl" != "xno" ; then
    AC_CHECK_LIB(GLU, main, [],
      [AC_MSG_ERROR(libGLU not installed or functional)], [])
    ENABLE_OPENGL=TRUE
+   LDFLAGS=$save_LDFLAGS
 else
    AC_MSG_RESULT([no])
 fi
 
 AC_SUBST(ENABLE_OPENGL)
 
+# presenter extra ui extension?
 AC_MSG_CHECKING([whether to build extra presenter ui])
-if test -n "$enable_presenter_extra_ui" -a "$enable_presenter_extra_ui" != "no"; then
+AS_IF([test "x$enable_ext_presenter_ui" = "xyes"], [
    AC_MSG_RESULT([yes])
    ENABLE_PRESENTER_EXTRA_UI=YES
-else
+],[
    AC_MSG_RESULT([no])
    ENABLE_PRESENTER_EXTRA_UI=NO
-fi
+])
 AC_SUBST(ENABLE_PRESENTER_EXTRA_UI)
 
+# presenter minimizer extension?
 AC_MSG_CHECKING([whether to build the Presentation Minimizer extension])
-if test -n "$enable_minimizer" -a "$enable_minimizer" != "no"; then
+AS_IF([test "x$enable_ext_presenter_minimizer" = "xyes"], [
    AC_MSG_RESULT([yes])
    ENABLE_MINIMIZER=YES
-else
+],[
    AC_MSG_RESULT([no])
    ENABLE_MINIMIZER=NO
    SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MINIMIZER"
-fi
+])
 AC_SUBST(ENABLE_MINIMIZER)
 
-AC_MSG_CHECKING([whether to build the Presenter Screen extension])
-if test -n "$enable_presenter_console" -a "$enable_presenter_screen" != "no"; then
+# presenter console extension?
+AC_MSG_CHECKING([whether to build the Presenter Console extension])
+AS_IF([test "x$enable_ext_presenter_console" = "xyes"], [
    AC_MSG_RESULT([yes])
    ENABLE_PRESENTER_SCREEN=YES
-else
+],[
    AC_MSG_RESULT([no])
    ENABLE_PRESENTER_SCREEN=NO
    SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_PRESENTER_SCREEN"
-fi
+])
 AC_SUBST(ENABLE_PRESENTER_SCREEN)
 
+# pdf import extension?
 AC_MSG_CHECKING([whether to build the PDF Import extension])
-if test -n "$enable_pdfimport" -a "$enable_pdfimport" != "no"; then
+AS_IF([test "x$enable_ext_pdfimport" = "xyes"], [
   AC_MSG_RESULT([yes])
   ENABLE_PDFIMPORT=YES
 
@@ -6283,23 +6623,24 @@ if test -n "$enable_pdfimport" -a "$enable_pdfimport" != "no"; then
       AC_MSG_RESULT([internal])
       SYSTEM_POPPLER=NO
       BUILD_TYPE="$BUILD_TYPE XPDF"
-      AC_MSG_CHECKING([for xpdf module])
+      AC_MSG_CHECKING([for internal xpdf module])
       if test -d ./xpdf; then
-       AC_MSG_RESULT([OK])
+        AC_MSG_RESULT([OK])
       else
-        AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
+        AC_MSG_ERROR([not existing! (Did you get the -extensions tarball?)])
       fi
   fi
-else
-   AC_MSG_RESULT([no])
-   ENABLE_PDFIMPORT=NO
-   SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_PDFIMPORT"
-fi
+],[
+  AC_MSG_RESULT([no])
+  ENABLE_PDFIMPORT=NO
+  SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_PDFIMPORT"
+])
 AC_SUBST(ENABLE_PDFIMPORT)
 AC_SUBST(SYSTEM_POPPLER)
 AC_SUBST(POPPLER_CFLAGS)
 AC_SUBST(POPPLER_LIBS)
 
+
 if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then
   AC_MSG_CHECKING([for sdext module])
   if test -d ./sdext; then
@@ -6311,7 +6652,7 @@ if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$E
 fi
 
 AC_MSG_CHECKING([whether to build the Wiki Publisher extension])
-if test -n "$enable_wiki_publisher" -a "$enable_wiki_publisher" != "no" && test  "$WITH_JAVA" != "no"; then
+AS_IF([test "x$enable_ext_wiki_publisher" = "xyes"], [
   AC_MSG_RESULT([yes])
   AC_MSG_CHECKING([for swext module])
   if test -d ./swext; then
@@ -6321,11 +6662,14 @@ if test -n "$enable_wiki_publisher" -a "$enable_wiki_publisher" != "no" && test
   fi
   ENABLE_MEDIAWIKI=YES
   BUILD_TYPE="$BUILD_TYPE SWEXT"
-else
+  if test  "x$WITH_JAVA" = "xno"; then
+    AC_MSG_ERROR([wiki publisher requires Java! Enable java if you want to build it.])
+  fi
+],[
   AC_MSG_RESULT([no])
   ENABLE_MEDIAWIKI=NO
   SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MEDIAWIKI"
-fi
+])
 AC_SUBST(ENABLE_MEDIAWIKI)
 
 if test "$ENABLE_MEDIAWIKI" = "YES"; then
@@ -6348,7 +6692,7 @@ AC_SUBST(SYSTEM_SERVLETAPI)
 AC_SUBST(SERVLETAPI_JAR)
 
 AC_MSG_CHECKING([whether to build the Report Builder extension])
-if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test "$WITH_JAVA" != "no"; then
+if test -n "$enable_ext_report_builder" -a "$enable_ext_report_builder" != "no" && test "$WITH_JAVA" != "no"; then
   AC_MSG_RESULT([yes])
   ENABLE_REPORTBUILDER=YES
   AC_MSG_CHECKING([for reportbuilder module])
@@ -6637,15 +6981,17 @@ dnl ===================================================================
 
 KDE_CFLAGS=""
 KDE_LIBS=""
-MOC="moc"
+if test "$_os" != "OpenBSD"; then
+    MOC="moc"
+fi
 if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
     dnl Search paths for Qt3 and KDE3
     if test "$build_cpu" != "x86_64" ; then
-        qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include $x_includes"
-        qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib $x_libraries"
+        qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include /usr/local/include/X11/qt3 $x_includes"
+        qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib /usr/local/lib/qt3 $x_libraries"
     else
-        qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib64/qt3/include /usr/lib64/qt/include /usr/share/qt3/include /usr/lib/qt3/include /usr/lib/qt/include $x_includes"
-        qt_libdirs="$QTLIB /usr/local/qt/lib64 /usr/lib64/qt /usr/lib64 /usr/X11R6/lib64/X11/qt /usr/X11R6/lib64/qt /usr/lib64/qt3/lib64 /usr/lib64/qt/lib64 /usr/share/qt3/lib64 /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib $x_libraries"
+        qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib64/qt3/include /usr/lib64/qt/include /usr/share/qt3/include /usr/lib/qt3/include /usr/lib/qt/include /usr/local/include/X11/qt3 $x_includes"
+        qt_libdirs="$QTLIB /usr/local/qt/lib64 /usr/lib64/qt /usr/lib64 /usr/X11R6/lib64/X11/qt /usr/X11R6/lib64/qt /usr/lib64/qt3/lib64 /usr/lib64/qt/lib64 /usr/share/qt3/lib64 /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib /usr/local/lib/qt3 $x_libraries"
     fi
     if test -n "$QTDIR" ; then
         qt_incdirs="$QTDIR/include $qt_incdirs"
@@ -6673,9 +7019,9 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
 
     dnl What to test
     qt_test_include="qstyle.h"
-    qt_test_library="libqt-mt.so"
+    qt_test_library="libqt-mt.so*"
     kde_test_include="kapp.h"
-    kde_test_library="libDCOP.so"
+    kde_test_library="libDCOP.so*"
 
     dnl Check for Qt3 headers
     AC_MSG_CHECKING([for Qt3 headers])
@@ -6696,7 +7042,7 @@ your Qt3 installation by exporting QTDIR before running "configure".])
     AC_MSG_CHECKING([for Qt3 libraries])
     qt_libdir="no"
     for qt_check in $qt_libdirs ; do
-        if test -r "$qt_check/$qt_test_library" ; then
+        if test -r "`ls $qt_check/$qt_test_library 2>/dev/null | head -1`" ; then
             qt_libdir="$qt_check"
             break
         fi
@@ -6733,7 +7079,7 @@ your KDE3 installation by exporting KDEDIR before running "configure".])
     AC_MSG_CHECKING([for KDE3 libraries])
     kde_libdir="no"
     for kde_check in $kde_libdirs ; do
-        if test -r "$kde_check/$kde_test_library" ; then
+        if test -r "`ls $kde_check/$kde_test_library 2>/dev/null | head -1`" ; then
             kde_libdir="$kde_check"
             break
         fi
@@ -6985,18 +7331,18 @@ dnl ===================================================================
 dnl Test whether to include Lightproof extensions
 dnl ===================================================================
 AC_MSG_CHECKING([for Lightproof extensions integration (only supported languages displayed)])
-if test "z$with_lightproof" = "z" -o "z$with_lightproof" = "zno" ; then
+if test "z$enable_ext_lightproof" = "z" -o "z$enable_ext_lightproof" = "zno" ; then
     LIGHTPROOF_LANG=""
     AC_MSG_RESULT([no integration])
 else
     SCPDEFS="$SCPDEFS -DWITH_EXTENSION_LIGHTPROOF"
     lightproof_supported_langs="hu"
-    if test "z$with_lightproof" = "zyes" ; then
+    if test "z$enable_ext_lightproof" = "zyes" ; then
         wanted_lightproof="$lightproof_supported_langs"
     else
     # check whether the langs are supported by Lightproof
     wanted_lightproof=
-    for lang in $with_lightproof ; do
+    for lang in $enable_ext_lightproof ; do
         if test -n "`echo $lightproof_supported_langs | grep "$lang"`" ; then
             wanted_lightproof="$wanted_lightproof $lang"
         fi
@@ -7017,7 +7363,7 @@ dnl ===================================================================
 dnl Test whether to include Watch Window extension
 dnl ===================================================================
 AC_MSG_CHECKING([for Watch Window extension integration])
-if test "z$with_watch_window" = "z" -o "z$with_watch_window" = "zno" ; then
+if test "z$enable_ext_watch_window" = "z" -o "z$enable_ext_watch_window" = "zno" ; then
   AC_MSG_RESULT([no])
 else
   AC_MSG_RESULT([yes])
@@ -7029,7 +7375,7 @@ dnl ===================================================================
 dnl Test whether to include Diagram extension
 dnl ===================================================================
 AC_MSG_CHECKING([for Diagram extension integration])
-if test "z$with_diagram" = "z" -o "z$with_diagram" = "zno" ; then
+if test "z$enable_ext_diagram" = "z" -o "z$enable_ext_diagram" = "zno" ; then
   AC_MSG_RESULT([no])
 else
   AC_MSG_RESULT([yes])
@@ -7041,7 +7387,7 @@ dnl ===================================================================
 dnl Test whether to include Validator extension
 dnl ===================================================================
 AC_MSG_CHECKING([for Validator extension integration])
-if test "z$with_validator" = "z" -o "z$with_validator" = "zno" ; then
+if test "z$enable_ext_validator" = "z" -o "z$enable_ext_validator" = "zno" ; then
   AC_MSG_RESULT([no])
 else
   AC_MSG_RESULT([yes])
@@ -7053,7 +7399,7 @@ dnl ===================================================================
 dnl Test whether to include Barcode extension
 dnl ===================================================================
 AC_MSG_CHECKING([for Barcode extension integration])
-if test "z$with_barcode" = "z" -o "z$with_barcode" = "zno" ; then
+if test "z$enable_ext_barcode" = "z" -o "z$enable_ext_barcode" = "zno" ; then
   AC_MSG_RESULT([no])
 else
   AC_MSG_RESULT([yes])
@@ -7077,7 +7423,7 @@ dnl ===================================================================
 dnl Test whether to include Numbertext extension
 dnl ===================================================================
 AC_MSG_CHECKING([for Numbertext extension integration])
-if test "z$with_numbertext" = "z" -o "z$with_numbertext" = "zno" ; then
+if test "z$enable_ext_numbertext" = "z" -o "z$enable_ext_numbertext" = "zno" ; then
   AC_MSG_RESULT([no])
 else
   AC_MSG_RESULT([yes])
@@ -7089,7 +7435,7 @@ dnl ===================================================================
 dnl Test whether to include Hungarian Cross-reference Toolbar extension
 dnl ===================================================================
 AC_MSG_CHECKING([for Hungarian Cross-reference Toolbar extension integration])
-if test "z$with_hunart" = "z" -o "z$with_hunart" = "zno" ; then
+if test "z$enable_ext_hunart" = "z" -o "z$enable_ext_hunart" = "zno" ; then
   AC_MSG_RESULT([no])
 else
   AC_MSG_RESULT([yes])
@@ -7101,7 +7447,7 @@ dnl ===================================================================
 dnl Test whether to include Typography Toolbar extension
 dnl ===================================================================
 AC_MSG_CHECKING([for Typography Toolbar extension integration])
-if test "z$with_typo" = "z" -o "z$with_typo" = "zno" ; then
+if test "z$enable_ext_typo" = "z" -o "z$enable_ext_typo" = "zno" ; then
   AC_MSG_RESULT([no])
 else
   AC_MSG_RESULT([yes])
@@ -7113,7 +7459,7 @@ dnl ===================================================================
 dnl Test whether to include Google Docs extension
 dnl ===================================================================
 AC_MSG_CHECKING([for Google Docs extension integration])
-if test "z$with_google_docs" = "z" -o "z$with_google_docs" = "zno" ; then
+if test "z$enable_ext_google_docs" = "z" -o "z$enable_ext_google_docs" = "zno" ; then
   AC_MSG_RESULT([no])
 else
   AC_MSG_RESULT([yes])
@@ -7124,7 +7470,7 @@ dnl ===================================================================
 dnl Test whether to include NLPSolver extension
 dnl ===================================================================
 AC_MSG_CHECKING([for NLPSolver extension integration])
-if test "z$with_nlpsolver" = "z" -o "z$with_nlpsolver" = "zno" ; then
+if test "z$enable_ext_nlpsolver" = "z" -o "z$enable_ext_nlpsolver" = "zno" ; then
   AC_MSG_RESULT([no])
 else
   AC_MSG_RESULT([yes])
@@ -7148,7 +7494,7 @@ dnl ===================================================================
 dnl Test whether to include oooblogger extension
 dnl ===================================================================
 AC_MSG_CHECKING([for oooblogger extension integration])
-if test "z$with_oooblogger" = "z" -o "z$with_oooblogger" = "zno" ; then
+if test "z$enable_ext_oooblogger" = "z" -o "z$enable_ext_oooblogger" = "zno" ; then
   AC_MSG_RESULT([no])
 else
   AC_MSG_RESULT([yes])
@@ -7229,10 +7575,70 @@ else
 fi
 AC_SUBST(WITHOUT_AFMS)
 
+dnl ===================================================================
+dnl Test whether to include extra galleries
+dnl ===================================================================
+AC_MSG_CHECKING([whether to include extra galleries])
+if test "z$enable_extra_gallery" = "z" -o "z$enable_extra_gallery" = "zno" ; then
+  AC_MSG_RESULT([no])
+  WITH_EXTRA_GALLERY=NO
+else
+  AC_MSG_RESULT([yes])
+  WITH_EXTRA_GALLERY=YES
+  BUILD_TYPE="$BUILD_TYPE EXTRA_GALLERY"
+  SCPDEFS="$SCPDEFS -DWITH_EXTRA_GALLERY"  
+fi
+AC_SUBST(WITH_EXTRA_GALLERY)
+
+dnl ===================================================================
+dnl Test whether to include extra templates
+dnl ===================================================================
+AC_MSG_CHECKING([whether to include extra templates])
+if test "z$enable_extra_template" = "z" -o "z$enable_extra_template" = "zno" ; then
+  AC_MSG_RESULT([no])
+  WITH_EXTRA_TEMPLATE=NO
+else
+  AC_MSG_RESULT([yes])
+  WITH_EXTRA_TEMPLATE=YES
+  BUILD_TYPE="$BUILD_TYPE EXTRA_TEMPLATE"
+  SCPDEFS="$SCPDEFS -DWITH_EXTRA_TEMPLATE"
+fi
+AC_SUBST(WITH_EXTRA_TEMPLATE)
+
+dnl ===================================================================
+dnl Test whether to include extra samples
+dnl ===================================================================
+AC_MSG_CHECKING([whether to include extra samples])
+if test "z$enable_extra_sample" = "z" -o "z$enable_extra_sample" = "zno" ; then
+  AC_MSG_RESULT([no])
+  WITH_EXTRA_SAMPLE=NO
+else
+  AC_MSG_RESULT([yes])
+  WITH_EXTRA_SAMPLE=YES
+  BUILD_TYPE="$BUILD_TYPE EXTRA_SAMPLE"
+  SCPDEFS="$SCPDEFS -DWITH_EXTRA_SAMPLE"
+fi
+AC_SUBST(WITH_EXTRA_SAMPLE)
+
+dnl ===================================================================
+dnl Test whether to include extra fonts
+dnl ===================================================================
+AC_MSG_CHECKING([whether to include extra fonts])
+if test "z$enable_extra_font" = "z" -o "z$enable_extra_font" = "zno" ; then
+  AC_MSG_RESULT([no])
+  WITH_EXTRA_FONT=NO
+else
+  AC_MSG_RESULT([yes])
+  WITH_EXTRA_FONT=YES
+  BUILD_TYPE="$BUILD_TYPE EXTRA_FONT"
+  SCPDEFS="$SCPDEFS -DWITH_EXTRA_FONT"
+fi
+AC_SUBST(WITH_EXTRA_FONT)
+
 AC_SUBST(SCPDEFS)
 
 if test "$_os" = "WINNT"; then
-  AC_MSG_CHECKING([whether to enable ActiveX embedding of OOo components])
+  AC_MSG_CHECKING([whether to enable ActiveX embedding of LibO components])
   if test "$enable_activex_component" = "yes" -o "$enable_activex_component" = "TRUE" -o "$enable_activex_component" = ""; then
     ENABLE_ACTIVEX_COMPONENT="TRUE"
     AC_MSG_RESULT([yes])
@@ -7327,7 +7733,7 @@ else
   while test -h "$ANT"; do
      a_cwd=`pwd`
      a_basename=`basename "$ANT"`
-     a_script=`ls -l "$ANT" | sed "s/.*${a_basename} -> //g"`
+     a_script=`ls -l "$ANT" | $SED "s/.*${a_basename} -> //g"`
      cd "`dirname "$ANT"`"
      cd "`dirname "$a_script"`"
      ANT="`pwd`"/"`basename "$a_script"`"
@@ -7655,7 +8061,7 @@ AC_SUBST(ENABLE_ZENITY)
 
 
 dnl ===================================================================
-dnl Hook up OOos nodep environmental variable to automake's equivalent
+dnl Hook up LibOs nodep environmental variable to automake's equivalent
 dnl --enable-dependency-tracking configure option
 dnl ===================================================================
 AC_MSG_CHECKING([whether to enable dependency tracking])
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index 0b15c06acf15..3998ac825328 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -1,4 +1,4 @@
-cn  connectivity    :    shell  l10n comphelper MOZ:moz SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg NSS:nss NULL
+cn  connectivity    :    shell  l10n comphelper MOZ:moz svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg NSS:nss NULL
 cn  connectivity                                    usr1    -   all cn_mkout NULL
 cn  connectivity\inc                                nmake   -   all cn_inc NULL
 cn  connectivity\com\sun\star\sdbcx\comp\hsqldb     nmake   -   all cn_jhsqldbdb cn_hsqldb cn_inc NULL
diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx
index fd0da2f093e5..45741ec95232 100644
--- a/connectivity/source/commontools/CommonTools.cxx
+++ b/connectivity/source/commontools/CommonTools.cxx
@@ -236,7 +236,7 @@ namespace connectivity
         try
         {
             Reference< starjava::XJavaVM > xVM(_rxFactory->createInstance(
-                rtl::OUString::createFromAscii("com.sun.star.java.JavaVirtualMachine")), UNO_QUERY);
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.java.JavaVirtualMachine"))), UNO_QUERY);
 
             OSL_ENSURE(_rxFactory.is(),"InitJava: I have no factory!");
             if (!xVM.is() || !_rxFactory.is())
diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx
index 3f5093c3a225..56ed6748368d 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -233,7 +233,7 @@ Date DBTypeConversion::getNULLDate(const Reference< XNumberFormatsSupplier > &xS
         {
             // get the null date
             Date aDate;
-            xSupplier->getNumberFormatSettings()->getPropertyValue(::rtl::OUString::createFromAscii("NullDate")) >>= aDate;
+            xSupplier->getNumberFormatSettings()->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NullDate"))) >>= aDate;
             return aDate;
         }
         catch ( const Exception&  )
@@ -274,7 +274,7 @@ void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant,
             {   // die Formatierung soll eigentlich als Prozent erfolgen, aber der String stellt nur eine
                 // einfache Nummer dar -> anpassen
                 ::rtl::OUString sExpanded(rString);
-                static ::rtl::OUString s_sPercentSymbol = ::rtl::OUString::createFromAscii("%");
+                static ::rtl::OUString s_sPercentSymbol( RTL_CONSTASCII_USTRINGPARAM( "%" ));
                     // need a method to add a sal_Unicode to a string, 'til then we use a static string
                 sExpanded += s_sPercentSymbol;
                 fValue = xFormatter->convertStringToNumber(nKeyToUse, sExpanded);
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 9afa80803867..ad915996e1e7 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -677,55 +677,55 @@ ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getBasicValue()
 // -----------------------------------------------------------------------------
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getSelectValue()
 {
-    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("SELECT"));
+    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT")));
     return aValueRef;
 }
 // -----------------------------------------------------------------------------
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getInsertValue()
 {
-    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("INSERT"));
+    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INSERT")));
     return aValueRef;
 }
 // -----------------------------------------------------------------------------
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getDeleteValue()
 {
-    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("DELETE"));
+    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DELETE")));
     return aValueRef;
 }
 // -----------------------------------------------------------------------------
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getUpdateValue()
 {
-    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("UPDATE"));
+    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UPDATE")));
     return aValueRef;
 }
 // -----------------------------------------------------------------------------
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getCreateValue()
 {
-    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("CREATE"));
+    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CREATE")));
     return aValueRef;
 }
 // -----------------------------------------------------------------------------
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getReadValue()
 {
-    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("READ"));
+    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("READ")));
     return aValueRef;
 }
 // -----------------------------------------------------------------------------
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getAlterValue()
 {
-    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("ALTER"));
+    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ALTER")));
     return aValueRef;
 }
 // -----------------------------------------------------------------------------
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getDropValue()
 {
-    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("DROP"));
+    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DROP")));
     return aValueRef;
 }
 // -----------------------------------------------------------------------------
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getQuoteValue()
 {
-    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("'"));
+    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'")));
     return aValueRef;
 }
 // -----------------------------------------------------------------------------
@@ -835,7 +835,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA
     Sequence< ::rtl::OUString > ODatabaseMetaDataResultSet::getSupportedServiceNames_Static(  ) throw (RuntimeException)
     {
         Sequence< ::rtl::OUString > aSNS( 1 );
-        aSNS[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.ResultSet");
+        aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ResultSet"));
         return aSNS;
     }
     //------------------------------------------------------------------
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
index 7113ed87c573..0ec2d579337b 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
@@ -209,19 +209,19 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isWritable( sal_Int32 colu
 void ODatabaseMetaDataResultSetMetaData::setColumnPrivilegesMap()
 {
     setColumnMap();
-    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("GRANTOR"),
+    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GRANTOR")),
                 ColumnValue::NULLABLE,
         3,3,0,
                 DataType::VARCHAR);
-    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("GRANTEE"),
+    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GRANTEE")),
                 ColumnValue::NULLABLE,
         3,3,0,
                 DataType::VARCHAR);
-    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PRIVILEGE"),
+    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PRIVILEGE")),
                 ColumnValue::NULLABLE,
         3,3,0,
                 DataType::VARCHAR);
-    m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("IS_GRANTABLE"),
+    m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IS_GRANTABLE")),
                 ColumnValue::NULLABLE,
         3,3,0,
                 DataType::VARCHAR);
@@ -229,15 +229,15 @@ void ODatabaseMetaDataResultSetMetaData::setColumnPrivilegesMap()
 // -----------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setTableNameMap()
 {
-    m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_CAT"),
+    m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE_CAT")),
                 ColumnValue::NULLABLE,
         3,3,0,
                 DataType::VARCHAR);
-    m_mColumns[2] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_SCHEM"),
+    m_mColumns[2] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE_SCHEM")),
                 ColumnValue::NULLABLE,
         3,3,0,
                 DataType::VARCHAR);
-    m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_NAME"),
+    m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE_NAME")),
                 ColumnValue::NO_NULLS,
         3,3,0,
                 DataType::VARCHAR);
@@ -246,7 +246,7 @@ void ODatabaseMetaDataResultSetMetaData::setTableNameMap()
 void ODatabaseMetaDataResultSetMetaData::setColumnMap()
 {
     setTableNameMap();
-    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("COLUMN_NAME"),
+    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("COLUMN_NAME")),
                 ColumnValue::NO_NULLS,
         3,3,0,
                 DataType::VARCHAR);
@@ -256,59 +256,59 @@ void ODatabaseMetaDataResultSetMetaData::setColumnsMap()
 {
     setColumnMap();
 
-    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("DATA_TYPE"),
+    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATA_TYPE")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::INTEGER);
-    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TYPE_NAME"),
+    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE_NAME")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("COLUMN_SIZE"),
+    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("COLUMN_SIZE")),
                 ColumnValue::NO_NULLS,
         3,3,0,
                 DataType::INTEGER);
-    m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("BUFFER_LENGTH"),
+    m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BUFFER_LENGTH")),
                 ColumnValue::NULLABLE,
         3,3,0,
                 DataType::INTEGER);
-    m_mColumns[9] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("DECIMAL_DIGITS"),
+    m_mColumns[9] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DECIMAL_DIGITS")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::INTEGER);
-    m_mColumns[10] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("NUM_PREC_RADIX"),
+    m_mColumns[10] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NUM_PREC_RADIX")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::INTEGER);
-    m_mColumns[11] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("NULLABLE"),
+    m_mColumns[11] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULLABLE")),
                 ColumnValue::NO_NULLS,
         1,1,0,
                 DataType::INTEGER);
-    m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("REMARKS"),
+    m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REMARKS")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[13] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("COLUMN_DEF"),
+    m_mColumns[13] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("COLUMN_DEF")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[14] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("SQL_DATA_TYPE"),
+    m_mColumns[14] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_DATA_TYPE")),
                 ColumnValue::NO_NULLS,
         1,1,0,
                 DataType::INTEGER);
-    m_mColumns[15] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("SQL_DATETIME_SUB"),
+    m_mColumns[15] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_DATETIME_SUB")),
                 ColumnValue::NO_NULLS,
         1,1,0,
                 DataType::INTEGER);
-    m_mColumns[16] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("CHAR_OCTET_LENGTH"),
+    m_mColumns[16] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CHAR_OCTET_LENGTH")),
                 ColumnValue::NO_NULLS,
         1,1,0,
                 DataType::INTEGER);
-    m_mColumns[17] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("ORDINAL_POSITION"),
+    m_mColumns[17] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ORDINAL_POSITION")),
                 ColumnValue::NO_NULLS,
         1,1,0,
                 DataType::INTEGER);
-    m_mColumns[18] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("IS_NULLABLE"),
+    m_mColumns[18] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IS_NULLABLE")),
                 ColumnValue::NO_NULLS,
         1,1,0,
                 DataType::VARCHAR);
@@ -317,11 +317,11 @@ void ODatabaseMetaDataResultSetMetaData::setColumnsMap()
 void ODatabaseMetaDataResultSetMetaData::setTablesMap()
 {
     setTableNameMap();
-    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_TYPE"),
+    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE_TYPE")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("REMARKS"),
+    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REMARKS")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
@@ -329,15 +329,15 @@ void ODatabaseMetaDataResultSetMetaData::setTablesMap()
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setProcedureNameMap()
 {
-   m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PROCEDURE_CAT"),
+   m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PROCEDURE_CAT")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[2] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PROCEDURE_SCHEM"),
+    m_mColumns[2] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PROCEDURE_SCHEM")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PROCEDURE_NAME"),
+    m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PROCEDURE_NAME")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::VARCHAR);
@@ -346,43 +346,43 @@ void ODatabaseMetaDataResultSetMetaData::setProcedureNameMap()
 void ODatabaseMetaDataResultSetMetaData::setProcedureColumnsMap()
 {
     setProcedureNameMap();
-    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("COLUMN_NAME"),
+    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("COLUMN_NAME")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("COLUMN_TYPE"),
+    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("COLUMN_TYPE")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::INTEGER);
-    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("DATA_TYPE"),
+    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATA_TYPE")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::INTEGER);
-    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TYPE_NAME"),
+    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE_NAME")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PRECISION"),
+    m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PRECISION")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::INTEGER);
-    m_mColumns[9] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("LENGTH"),
+    m_mColumns[9] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LENGTH")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::INTEGER);
-    m_mColumns[10] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("SCALE"),
+    m_mColumns[10] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SCALE")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::INTEGER);
-    m_mColumns[11] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("RADIX"),
+    m_mColumns[11] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RADIX")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::INTEGER);
-    m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("NULLABLE"),
+    m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULLABLE")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::INTEGER);
-    m_mColumns[13] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("REMARKS"),
+    m_mColumns[13] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REMARKS")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
@@ -392,11 +392,11 @@ void ODatabaseMetaDataResultSetMetaData::setProcedureColumnsMap()
 void ODatabaseMetaDataResultSetMetaData::setPrimaryKeysMap()
 {
     setColumnMap();
-    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("KEY_SEQ"),
+    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_SEQ")),
                 ColumnValue::NO_NULLS,
         1,1,0,
                 DataType::INTEGER);
-    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PK_NAME"),
+    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PK_NAME")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
@@ -405,43 +405,43 @@ void ODatabaseMetaDataResultSetMetaData::setPrimaryKeysMap()
 void ODatabaseMetaDataResultSetMetaData::setIndexInfoMap()
 {
     setTableNameMap();
-    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("NON_UNIQUE"),
+    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NON_UNIQUE")),
                 ColumnValue::NO_NULLS,
         1,1,0,
                 DataType::BIT);
-    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("INDEX_QUALIFIER"),
+    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INDEX_QUALIFIER")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("INDEX_NAME"),
+    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INDEX_NAME")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TYPE"),
+    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::INTEGER);
-    m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("ORDINAL_POSITION"),
+    m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ORDINAL_POSITION")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::INTEGER);
-    m_mColumns[9] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("COLUMN_NAME"),
+    m_mColumns[9] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("COLUMN_NAME")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[10] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("ASC_OR_DESC"),
+    m_mColumns[10] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ASC_OR_DESC")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[11] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("CARDINALITY"),
+    m_mColumns[11] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CARDINALITY")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::INTEGER);
-    m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PAGES"),
+    m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PAGES")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::INTEGER);
-    m_mColumns[13] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("FILTER_CONDITION"),
+    m_mColumns[13] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FILTER_CONDITION")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
@@ -450,19 +450,19 @@ void ODatabaseMetaDataResultSetMetaData::setIndexInfoMap()
 void ODatabaseMetaDataResultSetMetaData::setTablePrivilegesMap()
 {
     setTableNameMap();
-    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("GRANTOR"),
+    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GRANTOR")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("GRANTEE"),
+    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GRANTEE")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PRIVILEGE"),
+    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PRIVILEGE")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("IS_GRANTABLE"),
+    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IS_GRANTABLE")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
@@ -470,60 +470,60 @@ void ODatabaseMetaDataResultSetMetaData::setTablePrivilegesMap()
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setCrossReferenceMap()
 {
-    m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PKTABLE_CAT"),
+    m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PKTABLE_CAT")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[2] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PKTABLE_SCHEM"),
+    m_mColumns[2] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PKTABLE_SCHEM")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PKTABLE_NAME"),
+    m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PKTABLE_NAME")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PKCOLUMN_NAME"),
+    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PKCOLUMN_NAME")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("FKTABLE_CAT"),
+    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FKTABLE_CAT")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("FKTABLE_SCHEM"),
+    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FKTABLE_SCHEM")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("FKTABLE_NAME"),
+    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FKTABLE_NAME")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("FKCOLUMN_NAME"),
+    m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FKCOLUMN_NAME")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::VARCHAR);
 
-    m_mColumns[9] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("KEY_SEQ"),
+    m_mColumns[9] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_SEQ")),
                 ColumnValue::NO_NULLS,
         1,1,0,
                 DataType::INTEGER);
-    m_mColumns[10] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("UPDATE_RULE"),
+    m_mColumns[10] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UPDATE_RULE")),
                 ColumnValue::NO_NULLS,
         1,1,0,
                 DataType::INTEGER);
-    m_mColumns[11] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("DELETE_RULE"),
+    m_mColumns[11] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DELETE_RULE")),
                 ColumnValue::NO_NULLS,
         1,1,0,
                 DataType::INTEGER);
-    m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("FK_NAME"),
+    m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FK_NAME")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[13] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PK_NAME"),
+    m_mColumns[13] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PK_NAME")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[14] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("DEFERRABILITY"),
+    m_mColumns[14] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DEFERRABILITY")),
                 ColumnValue::NO_NULLS,
         1,1,0,
                 DataType::INTEGER);
@@ -531,75 +531,75 @@ void ODatabaseMetaDataResultSetMetaData::setCrossReferenceMap()
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setTypeInfoMap()
 {
-    m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TYPE_NAME"),
+    m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE_NAME")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[2] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("DATA_TYPE"),
+    m_mColumns[2] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATA_TYPE")),
                 ColumnValue::NO_NULLS,
         1,1,0,
                 DataType::INTEGER);
-    m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PRECISION"),
+    m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PRECISION")),
                 ColumnValue::NO_NULLS,
         1,1,0,
                 DataType::INTEGER);
-    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("LITERAL_PREFIX"),
+    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LITERAL_PREFIX")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("LITERAL_SUFFIX"),
+    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LITERAL_SUFFIX")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("CREATE_PARAMS"),
+    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CREATE_PARAMS")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("NULLABLE"),
+    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULLABLE")),
                 ColumnValue::NO_NULLS,
         1,1,0,
                 DataType::INTEGER);
-    m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("CASE_SENSITIVE"),
+    m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CASE_SENSITIVE")),
                 ColumnValue::NO_NULLS,
         1,1,0,
                 DataType::BIT);
-    m_mColumns[9] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("SEARCHABLE"),
+    m_mColumns[9] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SEARCHABLE")),
                 ColumnValue::NO_NULLS,
         1,1,0,
                 DataType::INTEGER);
-    m_mColumns[10] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("UNSIGNED_ATTRIBUTE"),
+    m_mColumns[10] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNSIGNED_ATTRIBUTE")),
                 ColumnValue::NO_NULLS,
         1,1,0,
                 DataType::BIT);
-    m_mColumns[11] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("FIXED_PREC_SCALE"),
+    m_mColumns[11] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FIXED_PREC_SCALE")),
                 ColumnValue::NO_NULLS,
         1,1,0,
                 DataType::BIT);
-    m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("AUTO_INCREMENT"),
+    m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AUTO_INCREMENT")),
                 ColumnValue::NO_NULLS,
         1,1,0,
                 DataType::BIT);
-    m_mColumns[13] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("LOCAL_TYPE_NAME"),
+    m_mColumns[13] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LOCAL_TYPE_NAME")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[14] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("MINIMUM_SCALE"),
+    m_mColumns[14] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MINIMUM_SCALE")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::INTEGER);
-    m_mColumns[15] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("MAXIMUM_SCALE"),
+    m_mColumns[15] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MAXIMUM_SCALE")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::INTEGER);
-    m_mColumns[16] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("SQL_DATA_TYPE"),
+    m_mColumns[16] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_DATA_TYPE")),
                 ColumnValue::NO_NULLS,
         1,1,0,
                 DataType::INTEGER);
-    m_mColumns[17] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("SQL_DATETIME_SUB"),
+    m_mColumns[17] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_DATETIME_SUB")),
                 ColumnValue::NO_NULLS,
         1,1,0,
                 DataType::INTEGER);
-    m_mColumns[18] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("NUM_PREC_RADIX"),
+    m_mColumns[18] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NUM_PREC_RADIX")),
                 ColumnValue::NO_NULLS,
         1,1,0,
                 DataType::INTEGER);
@@ -608,23 +608,23 @@ void ODatabaseMetaDataResultSetMetaData::setTypeInfoMap()
 void ODatabaseMetaDataResultSetMetaData::setProceduresMap()
 {
     setProcedureNameMap();
-    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("RESERVED1"),
+    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RESERVED1")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("RESERVED2"),
+    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RESERVED2")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("RESERVED3"),
+    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RESERVED3")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("REMARKS"),
+    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REMARKS")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PROCEDURE_TYPE"),
+    m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PROCEDURE_TYPE")),
                 ColumnValue::NO_NULLS,
         1,1,0,
                 DataType::INTEGER);
@@ -632,7 +632,7 @@ void ODatabaseMetaDataResultSetMetaData::setProceduresMap()
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setTableTypes()
 {
-    m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_TYPE"),
+    m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE_TYPE")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
@@ -640,7 +640,7 @@ void ODatabaseMetaDataResultSetMetaData::setTableTypes()
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setCatalogsMap()
 {
-    m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_CAT"),
+    m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE_CAT")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
@@ -648,7 +648,7 @@ void ODatabaseMetaDataResultSetMetaData::setCatalogsMap()
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setSchemasMap()
 {
-    m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TABLE_SCHEM"),
+    m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE_SCHEM")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::VARCHAR);
@@ -656,35 +656,35 @@ void ODatabaseMetaDataResultSetMetaData::setSchemasMap()
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setVersionColumnsMap()
 {
-   m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("SCOPE"),
+   m_mColumns[1] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SCOPE")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::INTEGER);
-    m_mColumns[2] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("COLUMN_NAME"),
+    m_mColumns[2] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("COLUMN_NAME")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("DATA_TYPE"),
+    m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATA_TYPE")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::INTEGER);
-    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TYPE_NAME"),
+    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE_NAME")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::VARCHAR);
-    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("COLUMN_SIZE"),
+    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("COLUMN_SIZE")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::INTEGER);
-    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("BUFFER_LENGTH"),
+    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BUFFER_LENGTH")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::INTEGER);
-    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("DECIMAL_DIGITS"),
+    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DECIMAL_DIGITS")),
                 ColumnValue::NULLABLE,
         0,0,0,
                 DataType::INTEGER);
-    m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PSEUDO_COLUMN"),
+    m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PSEUDO_COLUMN")),
                 ColumnValue::NO_NULLS,
         0,0,0,
                 DataType::INTEGER);
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index ae67f54233ae..c33ad7ff312c 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -1007,7 +1007,7 @@ Any ORowSetValue::makeAny() const
             case DataType::VARBINARY:
             case DataType::LONGVARBINARY:
                 {
-                    ::rtl::OUStringBuffer sVal = ::rtl::OUString::createFromAscii("0x");
+                    ::rtl::OUStringBuffer sVal(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0x")));
                     Sequence<sal_Int8> aSeq(getSequence());
                     const sal_Int8* pBegin  = aSeq.getConstArray();
                     const sal_Int8* pEnd    = pBegin + aSeq.getLength();
diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx
index 3cbf44a64eab..294c44dc9c23 100644
--- a/connectivity/source/commontools/ParamterSubstitution.cxx
+++ b/connectivity/source/commontools/ParamterSubstitution.cxx
@@ -78,7 +78,7 @@ namespace connectivity
     Sequence< ::rtl::OUString > ParameterSubstitution::getSupportedServiceNames_Static(  ) throw (RuntimeException)
     {
         Sequence< ::rtl::OUString > aSNS( 1 );
-        aSNS[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.ParameterSubstitution");
+        aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ParameterSubstitution"));
         return aSNS;
     }
 
diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx
index 691a0c48d084..f6b61ffe80a6 100644
--- a/connectivity/source/commontools/TColumnsHelper.cxx
+++ b/connectivity/source/commontools/TColumnsHelper.cxx
@@ -182,11 +182,11 @@ sdbcx::ObjectType OColumnsHelper::appendObject( const ::rtl::OUString& _rForName
         return cloneDescriptor( descriptor );
 
     Reference<XDatabaseMetaData> xMetaData = m_pTable->getConnection()->getMetaData();
-    ::rtl::OUString aSql    = ::rtl::OUString::createFromAscii("ALTER TABLE ");
+    ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "ALTER TABLE " ));
     ::rtl::OUString aQuote  = xMetaData->getIdentifierQuoteString(  );
 
     aSql += ::dbtools::composeTableName( xMetaData, m_pTable, ::dbtools::eInTableDefinitions, false, false, true );
-    aSql += ::rtl::OUString::createFromAscii(" ADD ");
+    aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ADD "));
     aSql += ::dbtools::createStandardColumnPart(descriptor,m_pTable->getConnection(),NULL,m_pTable->getTypeCreatePattern());
 
     Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement(  );
@@ -204,12 +204,12 @@ void OColumnsHelper::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElem
     OSL_ENSURE(m_pTable,"OColumnsHelper::dropByName: Table is null!");
     if ( m_pTable && !m_pTable->isNew() )
     {
-        ::rtl::OUString aSql    = ::rtl::OUString::createFromAscii("ALTER TABLE ");
+        ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "ALTER TABLE " ));
         Reference<XDatabaseMetaData> xMetaData = m_pTable->getConnection()->getMetaData();
         ::rtl::OUString aQuote  = xMetaData->getIdentifierQuoteString(  );
 
         aSql += ::dbtools::composeTableName( xMetaData, m_pTable, ::dbtools::eInTableDefinitions, false, false, true );
-        aSql += ::rtl::OUString::createFromAscii(" DROP ");
+        aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" DROP "));
         aSql += ::dbtools::quoteName( aQuote,_sElementName);
 
         Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement(  );
diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx
index c601eb2ecbfa..34868623a507 100644
--- a/connectivity/source/commontools/TIndexColumns.cxx
+++ b/connectivity/source/commontools/TIndexColumns.cxx
@@ -71,7 +71,7 @@ sdbcx::ObjectType OIndexColumns::createObject(const ::rtl::OUString& _rName)
     if ( xResult.is() )
     {
         Reference< XRow > xRow(xResult,UNO_QUERY);
-        ::rtl::OUString aD(::rtl::OUString::createFromAscii("D"));
+        ::rtl::OUString aD(RTL_CONSTASCII_USTRINGPARAM("D"));
         while( xResult->next() )
         {
             if(xRow->getString(9) == _rName)
diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx
index 564d36b2bece..796310d36039 100644
--- a/connectivity/source/commontools/TIndexes.cxx
+++ b/connectivity/source/commontools/TIndexes.cxx
@@ -150,7 +150,7 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const ::rtl::OUString& _rForName
         ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
         ::rtl::OUStringBuffer aSql( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CREATE ")));
         ::rtl::OUString aQuote  = m_pTable->getMetaData()->getIdentifierQuoteString(  );
-        ::rtl::OUString aDot    = ::rtl::OUString::createFromAscii(".");
+        ::rtl::OUString aDot( RTL_CONSTASCII_USTRINGPARAM( "." ));
 
         if(comphelper::getBOOL(descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISUNIQUE))))
             aSql.appendAscii("UNIQUE ");
@@ -238,7 +238,7 @@ void OIndexesHelper::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElem
                 aSchema = _sElementName.copy(0,nLen);
             aName   = _sElementName.copy(nLen+1);
 
-            ::rtl::OUString aSql    = ::rtl::OUString::createFromAscii("DROP INDEX ");
+            ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "DROP INDEX " ));
 
             ::rtl::OUString aComposedName = dbtools::composeTableName( m_pTable->getMetaData(), m_pTable, ::dbtools::eInIndexDefinitions, false, false, true );
             ::rtl::OUString sIndexName,sTemp;
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index 0ed36cbfd27a..e7041a5ea05b 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -279,7 +279,7 @@ void OTableHelper::refreshColumns()
             aCatalog,
             m_SchemaName,
             m_Name,
-            ::rtl::OUString::createFromAscii("%")
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%"))
         ) );
 
         // collect the column names, together with their ordinal position
@@ -520,7 +520,7 @@ void SAL_CALL OTableHelper::rename( const ::rtl::OUString& newName ) throw(SQLEx
             ::rtl::OUString sComposedName;
             sComposedName = ::dbtools::composeTableName(getMetaData(),m_CatalogName,m_SchemaName,m_Name,sal_True,::dbtools::eInDataManipulation);
             sSql += sComposedName
-                 + ::rtl::OUString::createFromAscii(" TO ");
+                 + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" TO "));
             sComposedName = ::dbtools::composeTableName(getMetaData(),sCatalog,sSchema,sTable,sal_True,::dbtools::eInDataManipulation);
             sSql += sComposedName;
 
diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx
index ab8300f66c00..6c6516f9fd1f 100644
--- a/connectivity/source/commontools/conncleanup.cxx
+++ b/connectivity/source/commontools/conncleanup.cxx
@@ -46,7 +46,7 @@ namespace dbtools
     //=====================================================================
     static const ::rtl::OUString& getActiveConnectionPropertyName()
     {
-        static const ::rtl::OUString s_sActiveConnectionPropertyName = ::rtl::OUString::createFromAscii("ActiveConnection");
+        static const ::rtl::OUString s_sActiveConnectionPropertyName( RTL_CONSTASCII_USTRINGPARAM( "ActiveConnection" ));
         return s_sActiveConnectionPropertyName;
     }
 
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index 60addf14828c..ea96f9cb0c9e 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -221,7 +221,7 @@ void SQLExceptionInfo::prepend( const ::rtl::OUString& _rErrorMessage, const sal
     SQLException aException;
     aException.Message = _rErrorMessage;
     aException.ErrorCode = _nErrorCode;
-    aException.SQLState = ::rtl::OUString::createFromAscii( _pAsciiSQLState ? _pAsciiSQLState : "S1000" );
+    aException.SQLState = _pAsciiSQLState ? ::rtl::OUString::createFromAscii( _pAsciiSQLState ) : ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "S1000" ));
     aException.NextException = m_aContent;
     m_aContent <<= aException;
 
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index c04c76bd7bcd..04f3af9f8676 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -145,10 +145,10 @@ sal_Int32 getDefaultNumberFormat(const Reference< XPropertySet >& _xColumn,
     try
     {
         // determine the datatype of the column
-        _xColumn->getPropertyValue(::rtl::OUString::createFromAscii("Type")) >>= nDataType;
+        _xColumn->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Type"))) >>= nDataType;
 
         if (DataType::NUMERIC == nDataType || DataType::DECIMAL == nDataType)
-            _xColumn->getPropertyValue(::rtl::OUString::createFromAscii("Scale")) >>= nScale;
+            _xColumn->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scale"))) >>= nScale;
     }
     catch (Exception&)
     {
@@ -156,7 +156,7 @@ sal_Int32 getDefaultNumberFormat(const Reference< XPropertySet >& _xColumn,
     }
     return getDefaultNumberFormat(nDataType,
                     nScale,
-                    ::cppu::any2bool(_xColumn->getPropertyValue(::rtl::OUString::createFromAscii("IsCurrency"))),
+                    ::cppu::any2bool(_xColumn->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsCurrency")))),
                     _xTypes,
                     _rLocale);
 }
@@ -266,7 +266,7 @@ Reference< XDataSource> getDataSource_allowException(
 
     Reference< XNameAccess> xDatabaseContext(
         _rxFactory->createInstance(
-            ::rtl::OUString::createFromAscii( "com.sun.star.sdb.DatabaseContext" ) ),UNO_QUERY );
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.DatabaseContext" )) ),UNO_QUERY );
     OSL_ENSURE( xDatabaseContext.is(), "getDataSource_allowException: could not obtain the database context!" );
 
     return Reference< XDataSource >( xDatabaseContext->getByName( _rsTitleOrPath ), UNO_QUERY );
@@ -309,8 +309,8 @@ Reference< XConnection > getConnection_allowException(
             try
             {
                 xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD)) >>= sPwd;
-                bPwdReq = ::cppu::any2bool(xProp->getPropertyValue(::rtl::OUString::createFromAscii("IsPasswordRequired")));
-                xProp->getPropertyValue(::rtl::OUString::createFromAscii("User")) >>= sUser;
+                bPwdReq = ::cppu::any2bool(xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsPasswordRequired"))));
+                xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("User"))) >>= sUser;
             }
             catch(Exception&)
             {
@@ -321,7 +321,7 @@ Reference< XConnection > getConnection_allowException(
                 Reference<XCompletedConnection> xConnectionCompletion(xProp, UNO_QUERY);
                 if (xConnectionCompletion.is())
                 {   // instantiate the default SDB interaction handler
-                    Reference< XInteractionHandler > xHandler(_rxFactory->createInstance(::rtl::OUString::createFromAscii("com.sun.star.task.InteractionHandler")), UNO_QUERY);
+                    Reference< XInteractionHandler > xHandler(_rxFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler"))), UNO_QUERY);
                     OSL_ENSURE(xHandler.is(), "dbtools::getConnection service com.sun.star.task.InteractionHandler not available!");
                     if (xHandler.is())
                     {
@@ -388,7 +388,7 @@ Reference< XConnection> getConnection(const Reference< XRowSet>& _rxRowSet) thro
     Reference< XConnection> xReturn;
     Reference< XPropertySet> xRowSetProps(_rxRowSet, UNO_QUERY);
     if (xRowSetProps.is())
-        xRowSetProps->getPropertyValue(::rtl::OUString::createFromAscii("ActiveConnection")) >>= xReturn;
+        xRowSetProps->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection"))) >>= xReturn;
     return xReturn;
 }
 
@@ -432,11 +432,11 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R
 
         // build a connection with it's current settings (4. data source name, or 5. URL)
 
-        const ::rtl::OUString sUserProp = ::rtl::OUString::createFromAscii("User");
+        const ::rtl::OUString sUserProp( RTL_CONSTASCII_USTRINGPARAM( "User" ));
         ::rtl::OUString sDataSourceName;
-        xRowSetProps->getPropertyValue(::rtl::OUString::createFromAscii("DataSourceName")) >>= sDataSourceName;
+        xRowSetProps->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName"))) >>= sDataSourceName;
         ::rtl::OUString sURL;
-        xRowSetProps->getPropertyValue(::rtl::OUString::createFromAscii("URL")) >>= sURL;
+        xRowSetProps->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"))) >>= sURL;
 
         Reference< XConnection > xPureConnection;
         if (sDataSourceName.getLength())
@@ -455,7 +455,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R
         {   // the row set has no data source, but a connection url set
             // -> try to connection with that url
             Reference< XDriverManager > xDriverManager(
-                _rxFactory->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.sdbc.ConnectionPool")), UNO_QUERY);
+                _rxFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ConnectionPool"))), UNO_QUERY);
             if (xDriverManager.is())
             {
                 ::rtl::OUString sUser, sPwd;
@@ -716,7 +716,7 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect
 
                                 // Now set the filter to a dummy restriction which will result in an empty
                                 // result set.
-                                xComposer->setFilter( ::rtl::OUString::createFromAscii( "0=1" ) );
+                                xComposer->setFilter( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "0=1" )) );
                                 sStatementToExecute = xComposer->getQuery( );
                             }
                         }
@@ -989,7 +989,7 @@ Reference< XNumberFormatsSupplier> getNumberFormats(
     // ask the parent of the connection (should be an DatabaseAccess)
     Reference< XNumberFormatsSupplier> xReturn;
     Reference< XChild> xConnAsChild(_rxConn, UNO_QUERY);
-    ::rtl::OUString sPropFormatsSupplier = ::rtl::OUString::createFromAscii("NumberFormatsSupplier");
+    ::rtl::OUString sPropFormatsSupplier( RTL_CONSTASCII_USTRINGPARAM( "NumberFormatsSupplier" ));
     if (xConnAsChild.is())
     {
         Reference< XPropertySet> xConnParentProps(xConnAsChild->getParent(), UNO_QUERY);
@@ -998,7 +998,7 @@ Reference< XNumberFormatsSupplier> getNumberFormats(
     }
     else if(_bAlloweDefault && _rxFactory.is())
     {
-        xReturn = Reference< XNumberFormatsSupplier>(_rxFactory->createInstance(::rtl::OUString::createFromAscii("com.sun.star.util.NumberFormatsSupplier")),UNO_QUERY);
+        xReturn = Reference< XNumberFormatsSupplier>(_rxFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatsSupplier"))),UNO_QUERY);
     }
     return xReturn;
 }
@@ -1027,22 +1027,22 @@ try
     Property* pOldProps = aOldProperties.getArray();
     Property* pNewProps = aNewProperties.getArray();
 
-    ::rtl::OUString sPropDefaultControl(::rtl::OUString::createFromAscii("DefaultControl"));
-    ::rtl::OUString sPropLabelControl(::rtl::OUString::createFromAscii("LabelControl"));
-    ::rtl::OUString sPropFormatsSupplier(::rtl::OUString::createFromAscii("FormatsSupplier"));
-    ::rtl::OUString sPropCurrencySymbol(::rtl::OUString::createFromAscii("CurrencySymbol"));
-    ::rtl::OUString sPropDecimals(::rtl::OUString::createFromAscii("Decimals"));
-    ::rtl::OUString sPropEffectiveMin(::rtl::OUString::createFromAscii("EffectiveMin"));
-    ::rtl::OUString sPropEffectiveMax(::rtl::OUString::createFromAscii("EffectiveMax"));
-    ::rtl::OUString sPropEffectiveDefault(::rtl::OUString::createFromAscii("EffectiveDefault"));
-    ::rtl::OUString sPropDefaultText(::rtl::OUString::createFromAscii("DefaultText"));
-    ::rtl::OUString sPropDefaultDate(::rtl::OUString::createFromAscii("DefaultDate"));
-    ::rtl::OUString sPropDefaultTime(::rtl::OUString::createFromAscii("DefaultTime"));
-    ::rtl::OUString sPropValueMin(::rtl::OUString::createFromAscii("ValueMin"));
-    ::rtl::OUString sPropValueMax(::rtl::OUString::createFromAscii("ValueMax"));
-    ::rtl::OUString sPropDecimalAccuracy(::rtl::OUString::createFromAscii("DecimalAccuracy"));
-    ::rtl::OUString sPropClassId(::rtl::OUString::createFromAscii("ClassId"));
-    ::rtl::OUString sFormattedServiceName( ::rtl::OUString::createFromAscii( "com.sun.star.form.component.FormattedField" ) );
+    ::rtl::OUString sPropDefaultControl(RTL_CONSTASCII_USTRINGPARAM("DefaultControl"));
+    ::rtl::OUString sPropLabelControl(RTL_CONSTASCII_USTRINGPARAM("LabelControl"));
+    ::rtl::OUString sPropFormatsSupplier(RTL_CONSTASCII_USTRINGPARAM("FormatsSupplier"));
+    ::rtl::OUString sPropCurrencySymbol(RTL_CONSTASCII_USTRINGPARAM("CurrencySymbol"));
+    ::rtl::OUString sPropDecimals(RTL_CONSTASCII_USTRINGPARAM("Decimals"));
+    ::rtl::OUString sPropEffectiveMin(RTL_CONSTASCII_USTRINGPARAM("EffectiveMin"));
+    ::rtl::OUString sPropEffectiveMax(RTL_CONSTASCII_USTRINGPARAM("EffectiveMax"));
+    ::rtl::OUString sPropEffectiveDefault(RTL_CONSTASCII_USTRINGPARAM("EffectiveDefault"));
+    ::rtl::OUString sPropDefaultText(RTL_CONSTASCII_USTRINGPARAM("DefaultText"));
+    ::rtl::OUString sPropDefaultDate(RTL_CONSTASCII_USTRINGPARAM("DefaultDate"));
+    ::rtl::OUString sPropDefaultTime(RTL_CONSTASCII_USTRINGPARAM("DefaultTime"));
+    ::rtl::OUString sPropValueMin(RTL_CONSTASCII_USTRINGPARAM("ValueMin"));
+    ::rtl::OUString sPropValueMax(RTL_CONSTASCII_USTRINGPARAM("ValueMax"));
+    ::rtl::OUString sPropDecimalAccuracy(RTL_CONSTASCII_USTRINGPARAM("DecimalAccuracy"));
+    ::rtl::OUString sPropClassId(RTL_CONSTASCII_USTRINGPARAM("ClassId"));
+    ::rtl::OUString sFormattedServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.FormattedField" ) );
 
     for (sal_Int16 i=0; i<aOldProperties.getLength(); ++i)
     {
@@ -1065,9 +1065,9 @@ try
                 {
                     OSL_UNUSED( e );
 #ifdef DBG_UTIL
-                    ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii("TransferFormComponentProperties : could not transfer the value for property \"");
+                    ::rtl::OUString sMessage(RTL_CONSTASCII_USTRINGPARAM("TransferFormComponentProperties : could not transfer the value for property \""));
                     sMessage += pResult->Name;
-                    sMessage += ::rtl::OUString::createFromAscii("\"");;
+                    sMessage += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\""));
                     OSL_ENSURE(sal_False, ::rtl::OUStringToOString(sMessage, RTL_TEXTENCODING_ASCII_US));
 #endif
                 }
@@ -1273,19 +1273,19 @@ catch(const Exception&)
 //------------------------------------------------------------------------------
 sal_Bool canInsert(const Reference< XPropertySet>& _rxCursorSet)
 {
-    return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString::createFromAscii("Privileges"))) & Privilege::INSERT) != 0));
+    return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Privileges")))) & Privilege::INSERT) != 0));
 }
 
 //------------------------------------------------------------------------------
 sal_Bool canUpdate(const Reference< XPropertySet>& _rxCursorSet)
 {
-    return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString::createFromAscii("Privileges"))) & Privilege::UPDATE) != 0));
+    return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Privileges")))) & Privilege::UPDATE) != 0));
 }
 
 //------------------------------------------------------------------------------
 sal_Bool canDelete(const Reference< XPropertySet>& _rxCursorSet)
 {
-    return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString::createFromAscii("Privileges"))) & Privilege::DELETE) != 0));
+    return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Privileges")))) & Privilege::DELETE) != 0));
 }
 // -----------------------------------------------------------------------------
 Reference< XDataSource> findDataSource(const Reference< XInterface >& _xParent)
@@ -1323,22 +1323,22 @@ Reference< XDataSource> findDataSource(const Reference< XInterface >& _xParent)
             ::rtl::OUString sCommand;
             sal_Bool bEscapeProcessing = sal_False;
 
-            OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString::createFromAscii( "CommandType" )      ) >>= nCommandType      );
-            OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString::createFromAscii( "Command" )          ) >>= sCommand          );
-            OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString::createFromAscii( "EscapeProcessing" ) ) >>= bEscapeProcessing );
+            OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CommandType" ))      ) >>= nCommandType      );
+            OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Command" ))          ) >>= sCommand          );
+            OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "EscapeProcessing" )) ) >>= bEscapeProcessing );
 
             StatementComposer aComposer( xConn, sCommand, nCommandType, bEscapeProcessing );
             // append sort
             if ( _bUseRowSetOrder )
-                aComposer.setOrder( getString( _rxRowSet->getPropertyValue( ::rtl::OUString::createFromAscii( "Order" ) ) ) );
+                aComposer.setOrder( getString( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Order" )) ) ) );
 
             // append filter
             if ( _bUseRowSetFilter )
             {
                 sal_Bool bApplyFilter = sal_True;
-                _rxRowSet->getPropertyValue( ::rtl::OUString::createFromAscii( "ApplyFilter" ) ) >>= bApplyFilter;
+                _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ApplyFilter" )) ) >>= bApplyFilter;
                 if ( bApplyFilter )
-                    aComposer.setFilter( getString( _rxRowSet->getPropertyValue( ::rtl::OUString::createFromAscii( "Filter" ) ) ) );
+                    aComposer.setFilter( getString( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Filter" )) ) ) );
             }
 
             sStatement = aComposer.getQuery();
@@ -1541,10 +1541,10 @@ void showError(const SQLExceptionInfo& _rInfo,
         try
         {
             Sequence< Any > aArgs(2);
-            aArgs[0] <<= PropertyValue(::rtl::OUString::createFromAscii("SQLException"), 0, _rInfo.get(), PropertyState_DIRECT_VALUE);
-            aArgs[1] <<= PropertyValue(::rtl::OUString::createFromAscii("ParentWindow"), 0, makeAny(_xParent), PropertyState_DIRECT_VALUE);
+            aArgs[0] <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLException")), 0, _rInfo.get(), PropertyState_DIRECT_VALUE);
+            aArgs[1] <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow")), 0, makeAny(_xParent), PropertyState_DIRECT_VALUE);
 
-            static ::rtl::OUString s_sDialogServiceName = ::rtl::OUString::createFromAscii("com.sun.star.sdb.ErrorMessageDialog");
+            static ::rtl::OUString s_sDialogServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.ErrorMessageDialog" ));
             Reference< XExecutableDialog > xErrorDialog(
                 _xFactory->createInstanceWithArguments(s_sDialogServiceName, aArgs), UNO_QUERY);
             if (xErrorDialog.is())
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index 7c9db2d4a024..fd94914257aa 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -171,14 +171,14 @@ namespace dbtools
     ::rtl::OUString aDefault = ::comphelper::getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_DEFAULTVALUE)));
     if ( aDefault.getLength() )
     {
-        aSql.append(::rtl::OUString::createFromAscii(" DEFAULT "));
+        aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" DEFAULT ")));
         aSql.append(sPreFix);
         aSql.append(aDefault);
         aSql.append(sPostFix);
     } // if ( aDefault.getLength() )
 
     if(::comphelper::getINT32(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISNULLABLE))) == ColumnValue::NO_NULLS)
-        aSql.append(::rtl::OUString::createFromAscii(" NOT NULL"));
+        aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" NOT NULL")));
 
     if ( bIsAutoIncrement && sAutoIncrementValue.getLength())
     {
@@ -195,7 +195,7 @@ namespace dbtools
 
 ::rtl::OUString createStandardCreateStatement(const Reference< XPropertySet >& descriptor,const Reference< XConnection>& _xConnection,ISQLStatementHelper* _pHelper,const ::rtl::OUString& _sCreatePattern)
 {
-    ::rtl::OUStringBuffer aSql  = ::rtl::OUString::createFromAscii("CREATE TABLE ");
+    ::rtl::OUStringBuffer aSql(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CREATE TABLE ")));
     ::rtl::OUString sCatalog,sSchema,sTable,sComposedName;
 
     Reference<XDatabaseMetaData> xMetaData = _xConnection->getMetaData();
@@ -210,7 +210,7 @@ namespace dbtools
         ::dbtools::throwFunctionSequenceException(_xConnection);
 
     aSql.append(sComposedName);
-    aSql.append(::rtl::OUString::createFromAscii(" ("));
+    aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" (")));
 
     // columns
     Reference<XColumnsSupplier> xColumnSup(descriptor,UNO_QUERY);
@@ -240,7 +240,7 @@ namespace
         static const ::rtl::OUString sComma(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(",")));
 
         const ::rtl::OUString sQuote(_xMetaData->getIdentifierQuoteString());
-        ::rtl::OUString sSql = ::rtl::OUString::createFromAscii(" (");
+        ::rtl::OUString sSql( RTL_CONSTASCII_USTRINGPARAM( " (" ));
         Reference< XPropertySet > xColProp;
 
         sal_Int32 nColCount  = _xColumns->getCount();
@@ -292,7 +292,7 @@ namespace
                         ::dbtools::throwFunctionSequenceException(_xConnection);
 
                     const ::rtl::OUString sQuote     = xMetaData->getIdentifierQuoteString();
-                    aSql.append(::rtl::OUString::createFromAscii(" PRIMARY KEY "));
+                    aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" PRIMARY KEY ")));
                     aSql.append(generateColumnNames(xColumns,xMetaData));
                 }
                 else if(nKeyType == KeyType::UNIQUE)
@@ -303,7 +303,7 @@ namespace
                         ::dbtools::throwFunctionSequenceException(_xConnection);
 
                     const ::rtl::OUString sQuote     = xMetaData->getIdentifierQuoteString();
-                    aSql.append(::rtl::OUString::createFromAscii(" UNIQUE "));
+                    aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" UNIQUE ")));
                     aSql.append(generateColumnNames(xColumns,xMetaData));
                 }
                 else if(nKeyType == KeyType::FOREIGN)
@@ -315,7 +315,7 @@ namespace
                     if(!xColumns.is() || !xColumns->getCount())
                         ::dbtools::throwFunctionSequenceException(_xConnection);
 
-                    aSql.append(::rtl::OUString::createFromAscii(" FOREIGN KEY "));
+                    aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FOREIGN KEY ")));
                     ::rtl::OUString sRefTable = getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_REFERENCEDTABLE)));
                     ::dbtools::qualifiedNameComponents(xMetaData,
                                                         sRefTable,
@@ -334,16 +334,16 @@ namespace
                     switch(nDeleteRule)
                     {
                         case KeyRule::CASCADE:
-                            aSql.append(::rtl::OUString::createFromAscii(" ON DELETE CASCADE "));
+                            aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE CASCADE ")));
                             break;
                         case KeyRule::RESTRICT:
-                            aSql.append(::rtl::OUString::createFromAscii(" ON DELETE RESTRICT "));
+                            aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE RESTRICT ")));
                             break;
                         case KeyRule::SET_NULL:
-                            aSql.append(::rtl::OUString::createFromAscii(" ON DELETE SET NULL "));
+                            aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE SET NULL ")));
                             break;
                         case KeyRule::SET_DEFAULT:
-                            aSql.append(::rtl::OUString::createFromAscii(" ON DELETE SET DEFAULT "));
+                            aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE SET DEFAULT ")));
                             break;
                         default:
                             ;
@@ -377,9 +377,9 @@ namespace
     else
     {
         if ( aSql.lastIndexOf(',') == (aSql.getLength()-1) )
-            aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString::createFromAscii(")"));
+            aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
         else
-            aSql += ::rtl::OUString::createFromAscii(")");
+            aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
     }
     return aSql;
 }
@@ -645,7 +645,7 @@ Reference< XTablesSupplier> getDataDefinitionByURLAndConnection(
     try
     {
         Reference< XDriverAccess> xManager(
-            _rxFactory->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.sdbc.DriverManager") ),
+            _rxFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.DriverManager")) ),
             UNO_QUERY_THROW );
         Reference< XDataDefinitionSupplier > xSupp( xManager->getDriverByURL( _rsUrl ), UNO_QUERY );
 
@@ -681,15 +681,15 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData,
         if ( xCurrentRow.is() )
         {
             ::rtl::OUString sUserWorkingFor = _xMetaData->getUserName();
-            static const ::rtl::OUString sSELECT    = ::rtl::OUString::createFromAscii("SELECT");
-            static const ::rtl::OUString sINSERT    = ::rtl::OUString::createFromAscii("INSERT");
-            static const ::rtl::OUString sUPDATE    = ::rtl::OUString::createFromAscii("UPDATE");
-            static const ::rtl::OUString sDELETE    = ::rtl::OUString::createFromAscii("DELETE");
-            static const ::rtl::OUString sREAD      = ::rtl::OUString::createFromAscii("READ");
-            static const ::rtl::OUString sCREATE    = ::rtl::OUString::createFromAscii("CREATE");
-            static const ::rtl::OUString sALTER     = ::rtl::OUString::createFromAscii("ALTER");
-            static const ::rtl::OUString sREFERENCE = ::rtl::OUString::createFromAscii("REFERENCE");
-            static const ::rtl::OUString sDROP      = ::rtl::OUString::createFromAscii("DROP");
+            static const ::rtl::OUString sSELECT( RTL_CONSTASCII_USTRINGPARAM( "SELECT" ));
+            static const ::rtl::OUString sINSERT( RTL_CONSTASCII_USTRINGPARAM( "INSERT" ));
+            static const ::rtl::OUString sUPDATE( RTL_CONSTASCII_USTRINGPARAM( "UPDATE" ));
+            static const ::rtl::OUString sDELETE( RTL_CONSTASCII_USTRINGPARAM( "DELETE" ));
+            static const ::rtl::OUString sREAD( RTL_CONSTASCII_USTRINGPARAM( "READ" ));
+            static const ::rtl::OUString sCREATE( RTL_CONSTASCII_USTRINGPARAM( "CREATE" ));
+            static const ::rtl::OUString sALTER( RTL_CONSTASCII_USTRINGPARAM( "ALTER" ));
+            static const ::rtl::OUString sREFERENCE( RTL_CONSTASCII_USTRINGPARAM( "REFERENCE" ));
+            static const ::rtl::OUString sDROP( RTL_CONSTASCII_USTRINGPARAM( "DROP" ));
             // after creation the set is positioned before the first record, per definitionem
 #ifdef DBG_UTIL
             Reference< XResultSetMetaDataSupplier > xSup(xPrivileges,UNO_QUERY);
@@ -750,7 +750,7 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData,
     }
     catch(const SQLException& e)
     {
-        static ::rtl::OUString sNotSupportedState = ::rtl::OUString::createFromAscii("IM001");
+        static ::rtl::OUString sNotSupportedState( RTL_CONSTASCII_USTRINGPARAM( "IM001" ));
         // some drivers don't support any privileges so we assume that we are allowed to do all we want :-)
         if(e.SQLState == sNotSupportedState)
             nPrivileges |=  Privilege::DROP         |
diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx
index 9764287da3e1..feb45e5d38b4 100644
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -185,7 +185,7 @@ namespace dbtools
                 // some more formatter settings
                 _rData.m_nKeyType  = ::comphelper::getNumberFormatType( xNumberFormatsSupp->getNumberFormats(), _rData.m_nFormatKey );
                 Reference< XPropertySet > xFormatSettings( xNumberFormatsSupp->getNumberFormatSettings(), UNO_QUERY_THROW );
-                OSL_VERIFY( xFormatSettings->getPropertyValue( ::rtl::OUString::createFromAscii( "NullDate" ) ) >>= _rData.m_aNullDate );
+                OSL_VERIFY( xFormatSettings->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "NullDate" )) ) >>= _rData.m_aNullDate );
 
                 // remember the formatter
                 _rData.m_xFormatter = i_rNumberFormatter;
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 0153586b84ab..09ebd2096b9c 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -241,7 +241,7 @@ namespace dbtools
         // format is:
         // <detail_column> = :<new_param_name>
         sFilter = quoteName( m_sIdentifierQuoteString, _rDetailLink );
-        sFilter += ::rtl::OUString::createFromAscii( " = :" );
+        sFilter += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " = :" ));
 
         // generate a parameter name which is not already used
         _rNewParamName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "link_from_" ) );
@@ -443,6 +443,7 @@ namespace dbtools
         {
 #if OSL_DEBUG_LEVEL > 0
             if ( aParam->second.aInnerIndexes.size() )
+            {
                 if ( aParam->second.eType == eLinkedByColumnName )
                 {
                     if ( nSmallestIndexLinkedByColumnName == -1 )
@@ -452,6 +453,7 @@ namespace dbtools
                 {
                     nLargestIndexNotLinkedByColumnName = aParam->second.aInnerIndexes[ aParam->second.aInnerIndexes.size() - 1 ];
                 }
+            }
 #endif
             if ( aParam->second.eType != eFilledExternally )
                 continue;
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index e4ee4716d036..2a95477918c7 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -144,7 +144,7 @@ namespace dbtools
         if ( !pReturn )
         {   // is it a text field ?
             sal_Int32 nType = DataType::OTHER;
-            _rxField->getPropertyValue( ::rtl::OUString::createFromAscii( "Type" ) ) >>= nType;
+            _rxField->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Type" )) ) >>= nType;
 
             if  (   ( DataType::CHAR        == nType )
                 ||  ( DataType::VARCHAR     == nType )
@@ -203,10 +203,10 @@ namespace dbtools
                 try
                 {
                     Reference< XPropertySetInfo > xPSI( _rxField->getPropertySetInfo() );
-                    if ( xPSI.is() && xPSI->hasPropertyByName( ::rtl::OUString::createFromAscii( "FormatKey" ) ) )
+                    if ( xPSI.is() && xPSI->hasPropertyByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FormatKey" )) ) )
                     {
                         sal_Int32 nFormatKey = 0;
-                        _rxField->getPropertyValue( ::rtl::OUString::createFromAscii( "FormatKey" ) ) >>= nFormatKey;
+                        _rxField->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FormatKey" )) ) >>= nFormatKey;
                         if ( nFormatKey && m_xFormatter.is() )
                         {
                             Locale aFormatLocale;
diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx
index 3fd2b763554b..ba8ba3819e47 100644
--- a/connectivity/source/commontools/statementcomposer.cxx
+++ b/connectivity/source/commontools/statementcomposer.cxx
@@ -193,7 +193,7 @@ namespace dbtools
 
                         // the filter
                         sal_Bool bApplyFilter = sal_True;
-                        const ::rtl::OUString sPropApply = ::rtl::OUString::createFromAscii( "ApplyFilter" );
+                        const ::rtl::OUString sPropApply( RTL_CONSTASCII_USTRINGPARAM( "ApplyFilter" ));
                         if ( ::comphelper::hasProperty( sPropApply, xQuery ) )
                         {
                             OSL_VERIFY( xQuery->getPropertyValue( sPropApply ) >>= bApplyFilter );
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx
index a65c7c1c99b8..3e63d401a735 100644
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
@@ -65,7 +65,7 @@ namespace
     //--------------------------------------------------------------------
     static const ::rtl::OUString& getTimeoutNodeName()
     {
-        static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("Timeout");
+        static ::rtl::OUString s_sNodeName( RTL_CONSTASCII_USTRINGPARAM( "Timeout" ));
         return s_sNodeName;
     }
 
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index f3d2e1b3fc31..9ebdd3f08272 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -49,31 +49,31 @@ using namespace connectivity;
 //--------------------------------------------------------------------
 static const ::rtl::OUString& getConnectionPoolNodeName()
 {
-    static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("org.openoffice.Office.DataAccess/ConnectionPool");
+    static ::rtl::OUString s_sNodeName( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office.DataAccess/ConnectionPool" ));
     return s_sNodeName;
 }
 //--------------------------------------------------------------------
 static const ::rtl::OUString& getEnablePoolingNodeName()
 {
-    static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("EnablePooling");
+    static ::rtl::OUString s_sNodeName( RTL_CONSTASCII_USTRINGPARAM( "EnablePooling" ));
     return s_sNodeName;
 }
 //--------------------------------------------------------------------
 static const ::rtl::OUString& getDriverNameNodeName()
 {
-    static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("DriverName");
+    static ::rtl::OUString s_sNodeName( RTL_CONSTASCII_USTRINGPARAM( "DriverName" ));
     return s_sNodeName;
 }
 // -----------------------------------------------------------------------------
 static const ::rtl::OUString& getDriverSettingsNodeName()
 {
-    static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("DriverSettings");
+    static ::rtl::OUString s_sNodeName( RTL_CONSTASCII_USTRINGPARAM( "DriverSettings" ));
     return s_sNodeName;
 }
 //--------------------------------------------------------------------------
 static const ::rtl::OUString& getEnableNodeName()
 {
-    static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("Enable");
+    static ::rtl::OUString s_sNodeName( RTL_CONSTASCII_USTRINGPARAM( "Enable" ));
     return s_sNodeName;
 }
 
@@ -82,13 +82,13 @@ OPoolCollection::OPoolCollection(const Reference< XMultiServiceFactory >&   _rxF
     :m_xServiceFactory(_rxFactory)
 {
     // bootstrap all objects supporting the .sdb.Driver service
-    m_xManager = Reference< XDriverManager >(m_xServiceFactory->createInstance(::rtl::OUString::createFromAscii("com.sun.star.sdbc.DriverManager") ), UNO_QUERY);
+    m_xManager = Reference< XDriverManager >(m_xServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.DriverManager")) ), UNO_QUERY);
     m_xDriverAccess = Reference< XDriverAccess >(m_xManager, UNO_QUERY);
     OSL_ENSURE(m_xDriverAccess.is(), "have no (or an invalid) driver manager!");
 
     m_xProxyFactory = Reference< XProxyFactory >(
         m_xServiceFactory->createInstance(
-            ::rtl::OUString::createFromAscii("com.sun.star.reflection.ProxyFactory")),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.ProxyFactory"))),
         UNO_QUERY);
     OSL_ENSURE(m_xProxyFactory.is(), "OConnectionPool::OConnectionPool: could not create a proxy factory!");
 
@@ -99,7 +99,7 @@ OPoolCollection::OPoolCollection(const Reference< XMultiServiceFactory >&   _rxF
     osl_incrementInterlockedCount( &m_refCount );
     {
 
-        m_xDesktop = Reference< ::com::sun::star::frame::XDesktop>( m_xServiceFactory->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop") ), UNO_QUERY);
+        m_xDesktop = Reference< ::com::sun::star::frame::XDesktop>( m_xServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), UNO_QUERY);
         if ( m_xDesktop.is() )
             m_xDesktop->addTerminateListener(this);
 
@@ -182,14 +182,14 @@ Reference< XInterface > SAL_CALL OPoolCollection::CreateInstance(const Reference
 //--------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OPoolCollection::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.sdbc.OConnectionPool");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.OConnectionPool"));
 }
 
 //--------------------------------------------------------------------------
 Sequence< ::rtl::OUString > SAL_CALL OPoolCollection::getSupportedServiceNames_Static(  ) throw(RuntimeException)
 {
     Sequence< ::rtl::OUString > aSupported(1);
-    aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.ConnectionPool");
+    aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ConnectionPool"));
     return aSupported;
 }
 // -----------------------------------------------------------------------------
@@ -386,7 +386,7 @@ Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMu
             }
             else
             {
-                OSL_ENSURE(xSI->supportsService(::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")),
+                OSL_ENSURE(xSI->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))),
                     "::createWithProvider: sure this is a provider? Missing the ConfigurationProvider service!");
             }
         }
@@ -406,7 +406,7 @@ Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMu
             aCreationArgs[1] = makeAny(PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("depth")), 0, makeAny((sal_Int32)-1), PropertyState_DIRECT_VALUE));
             aCreationArgs[2] = makeAny(PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("lazywrite")), 0, makeAny(sal_True), PropertyState_DIRECT_VALUE));
 
-            static ::rtl::OUString sAccessService = ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess");
+            static ::rtl::OUString sAccessService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" ));
 
             xInterface = _rxConfProvider->createInstanceWithArguments(sAccessService, aCreationArgs);
             OSL_ENSURE(xInterface.is(), "::createWithProvider: could not create the node access!");
diff --git a/connectivity/source/cpool/Zregistration.cxx b/connectivity/source/cpool/Zregistration.cxx
index c1ebcd213031..738096bca750 100644
--- a/connectivity/source/cpool/Zregistration.cxx
+++ b/connectivity/source/cpool/Zregistration.cxx
@@ -53,9 +53,9 @@ extern "C"
 //---------------------------------------------------------------------------------------
 sal_Bool SAL_CALL component_writeInfo(void* /*_pServiceManager*/, com::sun::star::registry::XRegistryKey* _pRegistryKey)
 {
-    ::rtl::OUString sMainKeyName = ::rtl::OUString::createFromAscii("/");
+    ::rtl::OUString sMainKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" ));
     sMainKeyName += OPoolCollection::getImplementationName_Static();
-    sMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES");
+    sMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
 
     try
     {
diff --git a/connectivity/source/drivers/adabas/BCatalog.cxx b/connectivity/source/drivers/adabas/BCatalog.cxx
index 13ce824e00ec..e04f4d3a9373 100644
--- a/connectivity/source/drivers/adabas/BCatalog.cxx
+++ b/connectivity/source/drivers/adabas/BCatalog.cxx
@@ -63,7 +63,6 @@ OAdabasCatalog::OAdabasCatalog(SQLHANDLE _aConnectionHdl, OAdabasConnection* _pC
         sName += OAdabasCatalog::getDot();
     sName += _xRow->getString(3);
 
-
     return sName;
 }
 // -----------------------------------------------------------------------------
@@ -158,7 +157,7 @@ void OAdabasCatalog::correctColumnProperties(sal_Int32 /*_nPrec*/, sal_Int32& _r
         }
 //      else if(_nPrec > 15)
 //      {
-//          static const ::rtl::OUString sReal = ::rtl::OUString::createFromAscii("REAL");
+//          static const ::rtl::OUString sReal( RTL_CONSTASCII_USTRINGPARAM( "REAL" ));
 //          _rsTypeName = sReal;
 //          _rnType = DataType::REAL;
 //      }
diff --git a/connectivity/source/drivers/adabas/BFunctions.cxx b/connectivity/source/drivers/adabas/BFunctions.cxx
index ee6159aae64c..9834a9b63bed 100644
--- a/connectivity/source/drivers/adabas/BFunctions.cxx
+++ b/connectivity/source/drivers/adabas/BFunctions.cxx
@@ -119,7 +119,7 @@ sal_Bool LoadLibrary_ADABAS(::rtl::OUString &_rPath)
 
 #if ( defined(SOLARIS) && defined(SPARC)) || defined(LINUX) || defined(MACOSX)
         _rPath = ::rtl::OUString(pPath);
-        _rPath += ::rtl::OUString::createFromAscii("/lib/");
+        _rPath += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/lib/"));
 #endif
         rtl_uString_release(pPath);
     }
@@ -153,119 +153,105 @@ sal_Bool LoadLibrary_ADABAS(::rtl::OUString &_rPath)
 sal_Bool LoadFunctions(oslModule pODBCso)
 {
 
-    if( ( pODBC3SQLAllocHandle  =   (T3SQLAllocHandle)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLAllocHandle").pData )) == NULL )
+    if( ( pODBC3SQLAllocHandle  =   (T3SQLAllocHandle)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLAllocHandle")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLConnect      =   (T3SQLConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLConnect").pData )) == NULL )
+    if( ( pODBC3SQLConnect      =   (T3SQLConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLConnect")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLDriverConnect =  (T3SQLDriverConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDriverConnect").pData )) == NULL )
+    if( ( pODBC3SQLDriverConnect =  (T3SQLDriverConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLDriverConnect")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLBrowseConnect =   (T3SQLBrowseConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLBrowseConnect").pData )) == NULL )
+    if( ( pODBC3SQLBrowseConnect =   (T3SQLBrowseConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLBrowseConnect")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLGetInfo      =   (T3SQLGetInfo)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetInfo").pData )) == NULL )
+    if( ( pODBC3SQLGetInfo      =   (T3SQLGetInfo)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetInfo")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLGetTypeInfo  =   (T3SQLGetTypeInfo)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetTypeInfo").pData )) == NULL )
+    if( ( pODBC3SQLGetTypeInfo  =   (T3SQLGetTypeInfo)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetTypeInfo")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLSetConnectAttr   =   (T3SQLSetConnectAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetConnectAttr").pData )) == NULL )
+    if( ( pODBC3SQLSetConnectAttr   =   (T3SQLSetConnectAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLSetConnectAttr")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLGetConnectAttr   =   (T3SQLGetConnectAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetConnectAttr").pData )) == NULL )
+    if( ( pODBC3SQLGetConnectAttr   =   (T3SQLGetConnectAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetConnectAttr")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLSetEnvAttr   =   (T3SQLSetEnvAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetEnvAttr").pData )) == NULL )
+    if( ( pODBC3SQLSetEnvAttr   =   (T3SQLSetEnvAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLSetEnvAttr")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLGetEnvAttr   =   (T3SQLGetEnvAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetEnvAttr").pData )) == NULL )
+    if( ( pODBC3SQLGetEnvAttr   =   (T3SQLGetEnvAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetEnvAttr")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLSetStmtAttr  =   (T3SQLSetStmtAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetStmtAttr").pData )) == NULL )
+    if( ( pODBC3SQLSetStmtAttr  =   (T3SQLSetStmtAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLSetStmtAttr")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLGetStmtAttr  =   (T3SQLGetStmtAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetStmtAttr").pData )) == NULL )
+    if( ( pODBC3SQLGetStmtAttr  =   (T3SQLGetStmtAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetStmtAttr")).pData )) == NULL )
         return sal_False;
-    /*if( ( pODBC3SQLSetDescField   =   (T3SQLSetDescField)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetDescField").pData )) == NULL )
+    if( ( pODBC3SQLPrepare      =   (T3SQLPrepare)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLPrepare")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLGetDescField =   (T3SQLGetDescField)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDescField").pData )) == NULL )
-        return sal_False;*/
-    /*if( ( pODBC3SQLGetDescRec =   (T3SQLGetDescRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDescRec").pData )) == NULL )
+    if( ( pODBC3SQLBindParameter =  (T3SQLBindParameter)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLBindParameter")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLSetDescRec   =   (T3SQLSetDescRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetDescRec").pData )) == NULL )
-        return sal_False;*/
-    if( ( pODBC3SQLPrepare      =   (T3SQLPrepare)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLPrepare").pData )) == NULL )
+    if( ( pODBC3SQLSetCursorName =  (T3SQLSetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLSetCursorName")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLBindParameter =  (T3SQLBindParameter)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLBindParameter").pData )) == NULL )
+    if( ( pODBC3SQLExecute      =   (T3SQLExecute)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLExecute")).pData )) == NULL )
         return sal_False;
-//  if( ( pODBC3SQLGetCursorName =  (T3SQLGetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetCursorName").pData )) == NULL )
-//      return sal_False;
-    if( ( pODBC3SQLSetCursorName =  (T3SQLSetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetCursorName").pData )) == NULL )
+    if( ( pODBC3SQLExecDirect   =   (T3SQLExecDirect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLExecDirect")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLExecute      =   (T3SQLExecute)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLExecute").pData )) == NULL )
+    if( ( pODBC3SQLDescribeParam =   (T3SQLDescribeParam)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLDescribeParam")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLExecDirect   =   (T3SQLExecDirect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLExecDirect").pData )) == NULL )
+    if( ( pODBC3SQLNumParams        =   (T3SQLNumParams)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLNumParams")).pData )) == NULL )
         return sal_False;
-    /*if( ( pODBC3SQLNativeSql      =   (T3SQLNativeSql)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNativeSql").pData )) == NULL )
-        return sal_False;*/
-    if( ( pODBC3SQLDescribeParam =   (T3SQLDescribeParam)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDescribeParam").pData )) == NULL )
+    if( ( pODBC3SQLParamData        =   (T3SQLParamData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLParamData")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLNumParams        =   (T3SQLNumParams)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNumParams").pData )) == NULL )
+    if( ( pODBC3SQLPutData      =   (T3SQLPutData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLPutData")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLParamData        =   (T3SQLParamData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLParamData").pData )) == NULL )
+    if( ( pODBC3SQLRowCount     =   (T3SQLRowCount)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLRowCount")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLPutData      =   (T3SQLPutData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLPutData").pData )) == NULL )
+    if( ( pODBC3SQLNumResultCols =  (T3SQLNumResultCols)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLNumResultCols")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLRowCount     =   (T3SQLRowCount)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLRowCount").pData )) == NULL )
+    if( ( pODBC3SQLDescribeCol  =   (T3SQLDescribeCol)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLDescribeCol")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLNumResultCols =  (T3SQLNumResultCols)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNumResultCols").pData )) == NULL )
+    if( ( pODBC3SQLColAttribute =   (T3SQLColAttribute)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLColAttribute")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLDescribeCol  =   (T3SQLDescribeCol)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDescribeCol").pData )) == NULL )
+    if( ( pODBC3SQLBindCol      =   (T3SQLBindCol)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLBindCol")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLColAttribute =   (T3SQLColAttribute)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLColAttribute").pData )) == NULL )
+    if( ( pODBC3SQLFetch            =   (T3SQLFetch)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLFetch")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLBindCol      =   (T3SQLBindCol)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLBindCol").pData )) == NULL )
+    if( ( pODBC3SQLFetchScroll  =   (T3SQLFetchScroll)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLFetchScroll")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLFetch            =   (T3SQLFetch)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFetch").pData )) == NULL )
+    if( ( pODBC3SQLGetData      =   (T3SQLGetData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetData")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLFetchScroll  =   (T3SQLFetchScroll)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFetchScroll").pData )) == NULL )
+    if( ( pODBC3SQLSetPos       =   (T3SQLSetPos)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLSetPos")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLGetData      =   (T3SQLGetData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetData").pData )) == NULL )
+    if( ( pODBC3SQLMoreResults  =   (T3SQLMoreResults)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLMoreResults")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLSetPos       =   (T3SQLSetPos)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetPos").pData )) == NULL )
+    if( ( pODBC3SQLGetDiagRec   =   (T3SQLGetDiagRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetDiagRec")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLMoreResults  =   (T3SQLMoreResults)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLMoreResults").pData )) == NULL )
+    if( ( pODBC3SQLColumnPrivileges = (T3SQLColumnPrivileges)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLColumnPrivileges")).pData )) == NULL )
         return sal_False;
-    /*if( ( pODBC3SQLGetDiagField   =   (T3SQLGetDiagField)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDiagField").pData )) == NULL )
-        return sal_False;*/
-    if( ( pODBC3SQLGetDiagRec   =   (T3SQLGetDiagRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDiagRec").pData )) == NULL )
+    if( ( pODBC3SQLColumns      =   (T3SQLColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLColumns")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLColumnPrivileges = (T3SQLColumnPrivileges)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLColumnPrivileges").pData )) == NULL )
+    if( ( pODBC3SQLForeignKeys  =   (T3SQLForeignKeys)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLForeignKeys")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLColumns      =   (T3SQLColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLColumns").pData )) == NULL )
+    if( ( pODBC3SQLPrimaryKeys  =   (T3SQLPrimaryKeys)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLPrimaryKeys")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLForeignKeys  =   (T3SQLForeignKeys)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLForeignKeys").pData )) == NULL )
+    if( ( pODBC3SQLProcedureColumns =  (T3SQLProcedureColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLProcedureColumns")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLPrimaryKeys  =   (T3SQLPrimaryKeys)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLPrimaryKeys").pData )) == NULL )
+    if( ( pODBC3SQLProcedures   =   (T3SQLProcedures)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLProcedures")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLProcedureColumns =  (T3SQLProcedureColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLProcedureColumns").pData )) == NULL )
+    if( ( pODBC3SQLSpecialColumns =  (T3SQLSpecialColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLSpecialColumns")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLProcedures   =   (T3SQLProcedures)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLProcedures").pData )) == NULL )
+    if( ( pODBC3SQLStatistics   =   (T3SQLStatistics)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLStatistics")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLSpecialColumns =  (T3SQLSpecialColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSpecialColumns").pData )) == NULL )
+    if( ( pODBC3SQLTablePrivileges =    (T3SQLTablePrivileges)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLTablePrivileges")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLStatistics   =   (T3SQLStatistics)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLStatistics").pData )) == NULL )
+    if( ( pODBC3SQLTables       =   (T3SQLTables)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLTables")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLTablePrivileges =    (T3SQLTablePrivileges)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLTablePrivileges").pData )) == NULL )
+    if( ( pODBC3SQLFreeStmt     =   (T3SQLFreeStmt)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLFreeStmt")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLTables       =   (T3SQLTables)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLTables").pData )) == NULL )
+    if( ( pODBC3SQLCloseCursor  =   (T3SQLCloseCursor)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLCloseCursor")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLFreeStmt     =   (T3SQLFreeStmt)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFreeStmt").pData )) == NULL )
+    if( ( pODBC3SQLCancel       =   (T3SQLCancel)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLCancel")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLCloseCursor  =   (T3SQLCloseCursor)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLCloseCursor").pData )) == NULL )
+    if( ( pODBC3SQLEndTran      =   (T3SQLEndTran)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLEndTran")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLCancel       =   (T3SQLCancel)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLCancel").pData )) == NULL )
+    if( ( pODBC3SQLDisconnect   =   (T3SQLDisconnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLDisconnect")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLEndTran      =   (T3SQLEndTran)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLEndTran").pData )) == NULL )
+    if( ( pODBC3SQLFreeHandle   =   (T3SQLFreeHandle)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLFreeHandle")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLDisconnect   =   (T3SQLDisconnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDisconnect").pData )) == NULL )
+    if( ( pODBC3SQLGetCursorName    =   (T3SQLGetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetCursorName")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLFreeHandle   =   (T3SQLFreeHandle)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFreeHandle").pData )) == NULL )
-        return sal_False;
-    if( ( pODBC3SQLGetCursorName    =   (T3SQLGetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetCursorName").pData )) == NULL )
-        return sal_False;
-    if( ( pODBC3SQLNativeSql    =   (T3SQLNativeSql)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNativeSql").pData )) == NULL )
+    if( ( pODBC3SQLNativeSql    =   (T3SQLNativeSql)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLNativeSql")).pData )) == NULL )
         return sal_False;
 
     return sal_True;
diff --git a/connectivity/source/drivers/adabas/BGroup.cxx b/connectivity/source/drivers/adabas/BGroup.cxx
index 2669454192e1..aca797de83cf 100644
--- a/connectivity/source/drivers/adabas/BGroup.cxx
+++ b/connectivity/source/drivers/adabas/BGroup.cxx
@@ -70,9 +70,9 @@ void OAdabasGroup::refreshUsers()
     TStringVector aVector;
         Reference< XStatement > xStmt = m_pConnection->createStatement(  );
 
-    ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("SELECT DISTINCT USERNAME FROM DOMAIN.USERS WHERE USERNAME IS NOT NULL AND USERNAME <> ' ' AND USERNAME <> 'CONTROL' AND GROUPNAME = '");
+    ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "SELECT DISTINCT USERNAME FROM DOMAIN.USERS WHERE USERNAME IS NOT NULL AND USERNAME <> ' ' AND USERNAME <> 'CONTROL' AND GROUPNAME = '" ));
     aSql += getName( );
-    aSql += ::rtl::OUString::createFromAscii("'");
+    aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"));
 
     Reference< XResultSet >  xResult = xStmt->executeQuery(aSql);
     if(xResult.is())
diff --git a/connectivity/source/drivers/adabas/BGroups.cxx b/connectivity/source/drivers/adabas/BGroups.cxx
index f514b9eef8bb..2a58ec10ea14 100644
--- a/connectivity/source/drivers/adabas/BGroups.cxx
+++ b/connectivity/source/drivers/adabas/BGroups.cxx
@@ -65,7 +65,7 @@ Reference< XPropertySet > OGroups::createDescriptor()
 // XAppend
 sdbcx::ObjectType OGroups::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& /*descriptor*/ )
 {
-    ::rtl::OUString aSql    = ::rtl::OUString::createFromAscii("CREATE USERGROUP ");
+    ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "CREATE USERGROUP " ));
     ::rtl::OUString aQuote  = m_pConnection->getMetaData()->getIdentifierQuoteString(  );
 
     aSql = aSql + aQuote + _rForName + aQuote;
@@ -80,7 +80,7 @@ sdbcx::ObjectType OGroups::appendObject( const ::rtl::OUString& _rForName, const
 // XDrop
 void OGroups::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName)
 {
-    ::rtl::OUString aSql    = ::rtl::OUString::createFromAscii("DROP USERGROUP ");
+    ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "DROP USERGROUP " ));
     ::rtl::OUString aQuote  = m_pConnection->getMetaData()->getIdentifierQuoteString(  );
 
     aSql = aSql + aQuote + _sElementName + aQuote;
diff --git a/connectivity/source/drivers/adabas/BIndexColumns.cxx b/connectivity/source/drivers/adabas/BIndexColumns.cxx
index 5cc13d78f4f7..9d30208fd288 100644
--- a/connectivity/source/drivers/adabas/BIndexColumns.cxx
+++ b/connectivity/source/drivers/adabas/BIndexColumns.cxx
@@ -59,7 +59,7 @@ ObjectType OIndexColumns::createObject(const ::rtl::OUString& _rName)
     if(xResult.is())
     {
                 Reference< XRow > xRow(xResult,UNO_QUERY);
-        ::rtl::OUString aD(::rtl::OUString::createFromAscii("D"));
+        ::rtl::OUString aD(RTL_CONSTASCII_USTRINGPARAM("D"));
         while(xResult->next())
         {
             if(xRow->getString(9) == _rName)
diff --git a/connectivity/source/drivers/adabas/BIndexes.cxx b/connectivity/source/drivers/adabas/BIndexes.cxx
index 0da65ae53257..b338dfa8c435 100644
--- a/connectivity/source/drivers/adabas/BIndexes.cxx
+++ b/connectivity/source/drivers/adabas/BIndexes.cxx
@@ -77,7 +77,7 @@ sdbcx::ObjectType OIndexes::createObject(const ::rtl::OUString& _rName)
             if(xRow->getString(6) == aName && (!aQualifier.getLength() || xRow->getString(5) == aQualifier ))
             {
                 OAdabasIndex* pRet = new OAdabasIndex(m_pTable,aName,aQualifier,!xRow->getBoolean(4),
-                    aName == ::rtl::OUString::createFromAscii("SYSPRIMARYKEYINDEX"),
+                    aName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SYSPRIMARYKEYINDEX")),
                     xRow->getShort(7) == IndexType::CLUSTERED);
                 xRet = pRet;
                 break;
@@ -105,22 +105,22 @@ sdbcx::ObjectType OIndexes::appendObject( const ::rtl::OUString& _rForName, cons
     if ( m_pTable->isNew() )
         ::dbtools::throwFunctionSequenceException(static_cast<XTypeProvider*>(this));
 
-    ::rtl::OUString aSql    = ::rtl::OUString::createFromAscii("CREATE ");
+    ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "CREATE " ));
     ::rtl::OUString aQuote  = m_pTable->getMetaData()->getIdentifierQuoteString(  );
     const ::rtl::OUString& sDot = OAdabasCatalog::getDot();
 
     if(getBOOL(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISUNIQUE))))
-        aSql = aSql + ::rtl::OUString::createFromAscii("UNIQUE ");
-    aSql = aSql + ::rtl::OUString::createFromAscii("INDEX ");
+        aSql = aSql + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNIQUE "));
+    aSql = aSql + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INDEX "));
 
 
     if(_rForName.getLength())
     {
         aSql = aSql + aQuote + _rForName + aQuote
-                    + ::rtl::OUString::createFromAscii(" ON ")
+                    + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON "))
                     + aQuote + m_pTable->getSchema() + aQuote + sDot
                     + aQuote + m_pTable->getTableName() + aQuote
-                    + ::rtl::OUString::createFromAscii(" ( ");
+                    + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ( "));
 
         Reference<XColumnsSupplier> xColumnSup(descriptor,UNO_QUERY);
         Reference<XIndexAccess> xColumns(xColumnSup->getColumns(),UNO_QUERY);
@@ -132,12 +132,12 @@ sdbcx::ObjectType OIndexes::appendObject( const ::rtl::OUString& _rForName, cons
             aSql = aSql + aQuote + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote;
             aSql = aSql +   (getBOOL(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING)))
                                         ?
-                            ::rtl::OUString::createFromAscii(" ASC")
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ASC"))
                                         :
-                            ::rtl::OUString::createFromAscii(" DESC"))
-                        +   ::rtl::OUString::createFromAscii(",");
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" DESC")))
+                        +   ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
         }
-        aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString::createFromAscii(")"));
+        aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
     }
     else
     {
@@ -171,14 +171,14 @@ void OIndexes::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementNam
         aSchema = _sElementName.copy(0,nLen);
         aName   = _sElementName.copy(nLen+1);
 
-        ::rtl::OUString aSql    = ::rtl::OUString::createFromAscii("DROP INDEX ");
+        ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "DROP INDEX " ));
         ::rtl::OUString aQuote  = m_pTable->getMetaData()->getIdentifierQuoteString(  );
         const ::rtl::OUString& sDot = OAdabasCatalog::getDot();
 
         if (aSchema.getLength())
             (((aSql += aQuote) += aSchema) += aQuote) += sDot;
 
-        (((aSql += aQuote) += aName) += aQuote) += ::rtl::OUString::createFromAscii(" ON ");
+        (((aSql += aQuote) += aName) += aQuote) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON "));
 
         (((aSql += aQuote) += m_pTable->getSchema()) += aQuote) += sDot;
         ((aSql += aQuote) += m_pTable->getTableName()) += aQuote;
diff --git a/connectivity/source/drivers/adabas/BKeys.cxx b/connectivity/source/drivers/adabas/BKeys.cxx
index 9c130d6e5690..97c38d818efa 100644
--- a/connectivity/source/drivers/adabas/BKeys.cxx
+++ b/connectivity/source/drivers/adabas/BKeys.cxx
@@ -65,7 +65,7 @@ sdbcx::ObjectType OKeys::appendObject( const ::rtl::OUString& _rForName, const R
 
     sal_Int32 nKeyType      = getINT32(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)));
 
-    ::rtl::OUString aSql    = ::rtl::OUString::createFromAscii("ALTER TABLE ");
+    ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "ALTER TABLE " ));
     const ::rtl::OUString aQuote    = getTable()->getConnection()->getMetaData()->getIdentifierQuoteString(  );
     const ::rtl::OUString& sDot = OAdabasCatalog::getDot();
 
@@ -73,11 +73,11 @@ sdbcx::ObjectType OKeys::appendObject( const ::rtl::OUString& _rForName, const R
 
     if(nKeyType == KeyType::PRIMARY)
     {
-        aSql = aSql + ::rtl::OUString::createFromAscii(" ALTER PRIMARY KEY (");
+        aSql = aSql + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ALTER PRIMARY KEY ("));
     }
     else if(nKeyType == KeyType::FOREIGN)
     {
-        aSql = aSql + ::rtl::OUString::createFromAscii(" FOREIGN KEY (");
+        aSql = aSql + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FOREIGN KEY ("));
     }
     else
         throw SQLException();
@@ -90,9 +90,9 @@ sdbcx::ObjectType OKeys::appendObject( const ::rtl::OUString& _rForName, const R
         Reference< XPropertySet > xColProp;
         xColumns->getByIndex(i) >>= xColProp;
         aSql = aSql + aQuote + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote
-                    +   ::rtl::OUString::createFromAscii(",");
+                    +   ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
     }
-    aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString::createFromAscii(")"));
+    aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
 
     sal_Int32 nUpdateRule = 0, nDeleteRule = 0;
     ::rtl::OUString sReferencedName;
@@ -106,32 +106,32 @@ sdbcx::ObjectType OKeys::appendObject( const ::rtl::OUString& _rForName, const R
         sal_Int32 nLen = sReferencedName.indexOf('.');
         aSchema = sReferencedName.copy(0,nLen);
         aName   = sReferencedName.copy(nLen+1);
-        aSql += ::rtl::OUString::createFromAscii(" REFERENCES ")
+        aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" REFERENCES "))
                     + aQuote + aSchema + aQuote + sDot + aQuote + aName + aQuote;
-        aSql += ::rtl::OUString::createFromAscii(" (");
+        aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ("));
 
         for(sal_Int32 i=0;i<xColumns->getCount();++i)
         {
             Reference< XPropertySet > xColProp;
             xColumns->getByIndex(i) >>= xColProp;
             aSql = aSql + aQuote + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN))) + aQuote
-                        +   ::rtl::OUString::createFromAscii(",");
+                        +   ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
         }
-        aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString::createFromAscii(")"));
+        aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
 
         switch(nDeleteRule)
         {
             case KeyRule::CASCADE:
-                aSql += ::rtl::OUString::createFromAscii(" ON DELETE CASCADE ");
+                aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE CASCADE "));
                 break;
             case KeyRule::RESTRICT:
-                aSql += ::rtl::OUString::createFromAscii(" ON DELETE RESTRICT ");
+                aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE RESTRICT "));
                 break;
             case KeyRule::SET_NULL:
-                aSql += ::rtl::OUString::createFromAscii(" ON DELETE SET NULL ");
+                aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE SET NULL "));
                 break;
             case KeyRule::SET_DEFAULT:
-                aSql += ::rtl::OUString::createFromAscii(" ON DELETE SET DEFAULT ");
+                aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE SET DEFAULT "));
                 break;
             default:
                 ;
diff --git a/connectivity/source/drivers/adabas/BTable.cxx b/connectivity/source/drivers/adabas/BTable.cxx
index ad76c4a3f4b1..512bfbd5ec11 100644
--- a/connectivity/source/drivers/adabas/BTable.cxx
+++ b/connectivity/source/drivers/adabas/BTable.cxx
@@ -193,10 +193,10 @@ void SAL_CALL OAdabasTable::alterColumnByName( const ::rtl::OUString& colName, c
                 const ::rtl::OUString sQuote = m_pConnection->getMetaData()->getIdentifierQuoteString(  );
                 const ::rtl::OUString& sDot = OAdabasCatalog::getDot();
 
-                ::rtl::OUString sSql = ::rtl::OUString::createFromAscii("RENAME COLUMN ") ;
+                ::rtl::OUString sSql( RTL_CONSTASCII_USTRINGPARAM( "RENAME COLUMN " )) ;
                 sSql += ::dbtools::quoteName(sQuote,m_SchemaName) + sDot + ::dbtools::quoteName(sQuote,m_Name);
                 sSql += sDot + ::dbtools::quoteName(sQuote,colName);
-                sSql += ::rtl::OUString::createFromAscii(" TO ");
+                sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" TO "));
                 sSql += ::dbtools::quoteName(sQuote,sNewColumnName);
 
                 Reference< XStatement > xStmt = m_pConnection->createStatement(  );
@@ -241,7 +241,7 @@ void SAL_CALL OAdabasTable::alterColumnByName( const ::rtl::OUString& colName, c
 void OAdabasTable::alterColumnType(const ::rtl::OUString& _rColName, const Reference<XPropertySet>& _xDescriptor)
 {
     ::rtl::OUString sSql = getAlterTableColumnPart(_rColName);
-    sSql += ::rtl::OUString::createFromAscii(" ");
+    sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
     sSql += OTables::getColumnSqlType(_xDescriptor);
 
     Reference< XStatement > xStmt = m_pConnection->createStatement(  );
@@ -258,11 +258,11 @@ void OAdabasTable::alterNotNullValue(sal_Int32 _nNewNullable,const ::rtl::OUStri
 
     if(_nNewNullable == ColumnValue::NO_NULLS)
     {
-        sSql += ::rtl::OUString::createFromAscii(" NOT NULL");
+        sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" NOT NULL"));
     }
     else
     {
-        sSql += ::rtl::OUString::createFromAscii(" DEFAULT NULL");
+        sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" DEFAULT NULL"));
     }
 
     Reference< XStatement > xStmt = m_pConnection->createStatement();
@@ -276,7 +276,7 @@ void OAdabasTable::alterNotNullValue(sal_Int32 _nNewNullable,const ::rtl::OUStri
 void OAdabasTable::alterDefaultValue(const ::rtl::OUString& _sNewDefault,const ::rtl::OUString& _rColName)
 {
     ::rtl::OUString sSql = getAlterTableColumnPart(_rColName);
-    sSql += ::rtl::OUString::createFromAscii(" ALTER ") + _sNewDefault;
+    sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ALTER ")) + _sNewDefault;
 
     Reference< XStatement > xStmt = m_pConnection->createStatement();
     if(xStmt.is())
@@ -289,7 +289,7 @@ void OAdabasTable::alterDefaultValue(const ::rtl::OUString& _sNewDefault,const :
 void OAdabasTable::dropDefaultValue(const ::rtl::OUString& _rColName)
 {
     ::rtl::OUString sSql = getAlterTableColumnPart(_rColName);
-    sSql += ::rtl::OUString::createFromAscii(" DROP DEFAULT");
+    sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" DROP DEFAULT"));
 
     Reference< XStatement > xStmt = m_pConnection->createStatement();
     if(xStmt.is())
@@ -302,7 +302,7 @@ void OAdabasTable::dropDefaultValue(const ::rtl::OUString& _rColName)
 void OAdabasTable::addDefaultValue(const ::rtl::OUString& _sNewDefault,const ::rtl::OUString& _rColName)
 {
     ::rtl::OUString sSql = getAlterTableColumnPart(_rColName);
-    sSql += ::rtl::OUString::createFromAscii(" ADD ") + _sNewDefault;
+    sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ADD ")) + _sNewDefault;
 
     Reference< XStatement > xStmt = m_pConnection->createStatement();
     if(xStmt.is())
@@ -319,7 +319,7 @@ void OAdabasTable::beginTransAction()
         Reference< XStatement > xStmt = m_pConnection->createStatement();
         if(xStmt.is())
         {
-            xStmt->execute(::rtl::OUString::createFromAscii("SUBTRANS BEGIN") );
+            xStmt->execute(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SUBTRANS BEGIN")) );
             ::comphelper::disposeComponent(xStmt);
         }
     }
@@ -335,7 +335,7 @@ void OAdabasTable::endTransAction()
         Reference< XStatement > xStmt = m_pConnection->createStatement();
         if(xStmt.is())
         {
-            xStmt->execute(::rtl::OUString::createFromAscii("SUBTRANS END") );
+            xStmt->execute(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SUBTRANS END")) );
             ::comphelper::disposeComponent(xStmt);
         }
     }
@@ -351,7 +351,7 @@ void OAdabasTable::rollbackTransAction()
         Reference< XStatement > xStmt = m_pConnection->createStatement();
         if(xStmt.is())
         {
-            xStmt->execute(::rtl::OUString::createFromAscii("SUBTRANS ROLLBACK") );
+            xStmt->execute(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SUBTRANS ROLLBACK")) );
             ::comphelper::disposeComponent(xStmt);
         }
     }
@@ -362,12 +362,12 @@ void OAdabasTable::rollbackTransAction()
 // -----------------------------------------------------------------------------
 ::rtl::OUString OAdabasTable::getAlterTableColumnPart(const ::rtl::OUString& _rsColumnName )
 {
-    ::rtl::OUString sSql = ::rtl::OUString::createFromAscii("ALTER TABLE ");
+    ::rtl::OUString sSql( RTL_CONSTASCII_USTRINGPARAM( "ALTER TABLE " ));
     const ::rtl::OUString sQuote = m_pConnection->getMetaData()->getIdentifierQuoteString(  );
     const ::rtl::OUString& sDot = OAdabasCatalog::getDot();
 
     sSql += ::dbtools::quoteName(sQuote,m_SchemaName) + sDot + ::dbtools::quoteName(sQuote,m_Name)
-         + ::rtl::OUString::createFromAscii(" COLUMN ")
+         + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" COLUMN "))
          + ::dbtools::quoteName(sQuote,_rsColumnName);
     return sSql;
 }
diff --git a/connectivity/source/drivers/adabas/BTables.cxx b/connectivity/source/drivers/adabas/BTables.cxx
index b09476b154e8..8689ef8b87f7 100644
--- a/connectivity/source/drivers/adabas/BTables.cxx
+++ b/connectivity/source/drivers/adabas/BTables.cxx
@@ -65,9 +65,7 @@ sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName)
     aName   = _rName.copy(nLen+1);
 
     Sequence< ::rtl::OUString > aTypes(1);
-    aTypes[0] = ::rtl::OUString::createFromAscii("%");
-    //  aTypes[0] = ::rtl::OUString::createFromAscii("TABLE");
-    //  aTypes[1] = ::rtl::OUString::createFromAscii("SYSTEMTABLE");
+    aTypes[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%"));
 
     Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes);
 
@@ -112,22 +110,22 @@ sdbcx::ObjectType OTables::appendObject( const ::rtl::OUString& _rForName, const
 // -------------------------------------------------------------------------
 void OTables::setComments(const Reference< XPropertySet >& descriptor ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aSql    = ::rtl::OUString::createFromAscii("CREATE TABLE ");
+    ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "CREATE TABLE " ));
     ::rtl::OUString aQuote  = static_cast<OAdabasCatalog&>(m_rParent).getConnection()->getMetaData()->getIdentifierQuoteString(  );
     const ::rtl::OUString& sDot = OAdabasCatalog::getDot();
 
     OAdabasConnection* pConnection = static_cast<OAdabasCatalog&>(m_rParent).getConnection();
         Reference< XStatement > xStmt = pConnection->createStatement(  );
-    aSql = ::rtl::OUString::createFromAscii("COMMENT ON TABLE ");
+    aSql = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("COMMENT ON TABLE "));
     ::rtl::OUString sSchema;
     descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= sSchema;
     if(sSchema.getLength())
         aSql += ::dbtools::quoteName(aQuote, sSchema) + sDot;
 
     aSql += aQuote + getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote
-            + ::rtl::OUString::createFromAscii(" '")
+            + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" '"))
             + getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION)))
-            + ::rtl::OUString::createFromAscii("'");
+            + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"));
     xStmt->execute(aSql);
 
     // columns
@@ -135,7 +133,7 @@ void OTables::setComments(const Reference< XPropertySet >& descriptor ) throw(SQ
     Reference<XIndexAccess> xColumns(xColumnSup->getColumns(),UNO_QUERY);
     Reference< XPropertySet > xColProp;
 
-    aSql = ::rtl::OUString::createFromAscii("COMMENT ON COLUMN ");
+    aSql = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("COMMENT ON COLUMN "));
     if(sSchema.getLength())
         aSql += ::dbtools::quoteName(aQuote, sSchema) + sDot;
     aSql += aQuote + getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote  + sDot
@@ -150,9 +148,9 @@ void OTables::setComments(const Reference< XPropertySet >& descriptor ) throw(SQ
             if(aDescription.getLength())
             {
                 ::rtl::OUString aCom = aSql + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote
-                                            + ::rtl::OUString::createFromAscii(" '")
+                                            + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" '"))
                                             + aDescription
-                                            + ::rtl::OUString::createFromAscii("'");
+                                            + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"));
                 xStmt->execute(aSql);
                 ::comphelper::disposeComponent(xStmt);
             }
@@ -175,15 +173,15 @@ void OTables::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName)
         sal_Int32 nLen = _sElementName.indexOf('.');
         aSchema = _sElementName.copy(0,nLen);
         aName   = _sElementName.copy(nLen+1);
-        ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP ");
+        ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "DROP " ));
         const ::rtl::OUString& sDot = OAdabasCatalog::getDot();
 
         Reference<XPropertySet> xProp(xObject,UNO_QUERY);
         sal_Bool bIsView;
-        if((bIsView = (xProp.is() && ::comphelper::getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) == ::rtl::OUString::createFromAscii("VIEW")))) // here we have a view
-            aSql += ::rtl::OUString::createFromAscii("VIEW ");
+        if((bIsView = (xProp.is() && ::comphelper::getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW"))))) // here we have a view
+            aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW "));
         else
-            aSql += ::rtl::OUString::createFromAscii("TABLE ");
+            aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE "));
 
         aSql += m_xMetaData->getIdentifierQuoteString(  ) + aSchema + m_xMetaData->getIdentifierQuoteString(  );
         aSql += sDot;
@@ -202,7 +200,7 @@ void OTables::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName)
 // -------------------------------------------------------------------------
 void OTables::createTable( const Reference< XPropertySet >& descriptor )
 {
-    ::rtl::OUString aSql    = ::rtl::OUString::createFromAscii("CREATE TABLE ");
+    ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "CREATE TABLE " ));
     ::rtl::OUString aQuote  = static_cast<OAdabasCatalog&>(m_rParent).getConnection()->getMetaData()->getIdentifierQuoteString(  );
     const ::rtl::OUString& sDot = OAdabasCatalog::getDot();
     ::rtl::OUString sSchema;
@@ -216,7 +214,7 @@ void OTables::createTable( const Reference< XPropertySet >& descriptor )
                     ));
 
     aSql += ::dbtools::quoteName(aQuote, getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))))
-                + ::rtl::OUString::createFromAscii(" (");
+                + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ("));
 
     // columns
     Reference<XColumnsSupplier> xColumnSup(descriptor,UNO_QUERY);
@@ -235,10 +233,10 @@ void OTables::createTable( const Reference< XPropertySet >& descriptor )
 
             aSql += aQuote + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote;
 
-            aSql += ::rtl::OUString::createFromAscii(" ");
+            aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
             aSql += OTables::getColumnSqlType(xColProp);
             aSql += OTables::getColumnSqlNotNullDefault(xColProp);
-            aSql += ::rtl::OUString::createFromAscii(",");
+            aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
         }
     }
 
@@ -268,15 +266,15 @@ void OTables::createTable( const Reference< XPropertySet >& descriptor )
                     if(!xColumns->getCount())
                         throw SQLException();
 
-                    aSql += ::rtl::OUString::createFromAscii(" PRIMARY KEY (");
+                    aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" PRIMARY KEY ("));
                     for( sal_Int32 column=0; column<xColumns->getCount(); ++column )
                     {
                         if(::cppu::extractInterface(xColProp,xColumns->getByIndex(column)) && xColProp.is())
                             aSql += aQuote + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote
-                                        +   ::rtl::OUString::createFromAscii(",");
+                                        +   ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
                     }
 
-                    aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString::createFromAscii(")"));
+                    aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
                 }
                 else if(nKeyType == KeyType::UNIQUE)
                 {
@@ -285,15 +283,15 @@ void OTables::createTable( const Reference< XPropertySet >& descriptor )
                     if(!xColumns->getCount())
                         throw SQLException();
 
-                    aSql += ::rtl::OUString::createFromAscii(" UNIQUE (");
+                    aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" UNIQUE ("));
                     for( sal_Int32 column=0; column<xColumns->getCount(); ++column )
                     {
                         if(::cppu::extractInterface(xColProp,xColumns->getByIndex(column)) && xColProp.is())
                             aSql += aQuote + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote
-                                        + ::rtl::OUString::createFromAscii(",");
+                                        + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
                     }
 
-                    aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString::createFromAscii(")"));
+                    aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
                 }
                 else if(nKeyType == KeyType::FOREIGN)
                 {
@@ -304,7 +302,7 @@ void OTables::createTable( const Reference< XPropertySet >& descriptor )
                     if(!xColumns->getCount())
                         throw SQLException();
 
-                    aSql += ::rtl::OUString::createFromAscii(" FOREIGN KEY ");
+                    aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FOREIGN KEY "));
                     ::rtl::OUString aName,aSchema,aRefTable = getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REFERENCEDTABLE)));
                     sal_Int32 nLen = aRefTable.indexOf('.');
                     aSchema = aRefTable.copy(0,nLen);
@@ -312,30 +310,30 @@ void OTables::createTable( const Reference< XPropertySet >& descriptor )
 
                     aSql += aQuote + aSchema + aQuote + sDot
                                 + aQuote + aName + aQuote
-                                + ::rtl::OUString::createFromAscii(" (");
+                                + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ("));
 
                     for ( sal_Int32 column=0; column<xColumns->getCount(); ++column )
                     {
                         if(::cppu::extractInterface(xColProp,xColumns->getByIndex(column)) && xColProp.is())
                             aSql += aQuote + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote
-                                        + ::rtl::OUString::createFromAscii(",");
+                                        + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
                     }
 
-                    aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString::createFromAscii(")"));
+                    aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
 
                     switch(nDeleteRule)
                     {
                         case KeyRule::CASCADE:
-                            aSql += ::rtl::OUString::createFromAscii(" ON DELETE CASCADE ");
+                            aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE CASCADE "));
                             break;
                         case KeyRule::RESTRICT:
-                            aSql += ::rtl::OUString::createFromAscii(" ON DELETE RESTRICT ");
+                            aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE RESTRICT "));
                             break;
                         case KeyRule::SET_NULL:
-                            aSql += ::rtl::OUString::createFromAscii(" ON DELETE SET NULL ");
+                            aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE SET NULL "));
                             break;
                         case KeyRule::SET_DEFAULT:
-                            aSql += ::rtl::OUString::createFromAscii(" ON DELETE SET DEFAULT ");
+                            aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON DELETE SET DEFAULT "));
                             break;
                         default:
                             ;
@@ -346,9 +344,9 @@ void OTables::createTable( const Reference< XPropertySet >& descriptor )
     }
 
     if(aSql.lastIndexOf(',') == (aSql.getLength()-1))
-        aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString::createFromAscii(")"));
+        aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
     else
-        aSql += ::rtl::OUString::createFromAscii(")");
+        aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
 
     OAdabasConnection* pConnection = static_cast<OAdabasCatalog&>(m_rParent).getConnection();
         Reference< XStatement > xStmt = pConnection->createStatement(  );
@@ -378,10 +376,10 @@ void OTables::appendNew(const ::rtl::OUString& _rsNewTable)
     switch(nDataType)
     {
         case DataType::VARBINARY:
-            sSql += ::rtl::OUString::createFromAscii("VAR");
+            sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VAR"));
             /* run through*/
         case DataType::BINARY:
-            sSql += ::rtl::OUString::createFromAscii("CHAR");
+            sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CHAR"));
             break;
         default:
             {
@@ -389,7 +387,7 @@ void OTables::appendNew(const ::rtl::OUString& _rsNewTable)
                 if(aTypeName.hasValue() && getString(aTypeName).getLength())
                     sSql += getString(aTypeName);
                 else
-                    sSql += OTables::getTypeString(_rxColProp) + ::rtl::OUString::createFromAscii(" ");
+                    sSql += OTables::getTypeString(_rxColProp) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
             }
     }
 
@@ -399,24 +397,24 @@ void OTables::appendNew(const ::rtl::OUString& _rsNewTable)
         case DataType::VARCHAR:
         case DataType::FLOAT:
         case DataType::REAL:
-            sSql += ::rtl::OUString::createFromAscii("(")
+            sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("("))
                         + ::rtl::OUString::valueOf(getINT32(_rxColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))))
-                        + ::rtl::OUString::createFromAscii(")");
+                        + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
             break;
 
         case DataType::DECIMAL:
         case DataType::NUMERIC:
-            sSql += ::rtl::OUString::createFromAscii("(")
+            sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("("))
                         + ::rtl::OUString::valueOf(getINT32(_rxColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))))
-                        + ::rtl::OUString::createFromAscii(",")
+                        + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","))
                         + ::rtl::OUString::valueOf(getINT32(_rxColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))))
-                        + ::rtl::OUString::createFromAscii(")");
+                        + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
             break;
         case DataType::BINARY:
         case DataType::VARBINARY:
-            sSql += ::rtl::OUString::createFromAscii("(")
+            sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("("))
                         + ::rtl::OUString::valueOf(getINT32(_rxColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))))
-                        + ::rtl::OUString::createFromAscii(") BYTE");
+                        + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(") BYTE"));
             break;
     }
     return sSql;
@@ -429,14 +427,14 @@ void OTables::appendNew(const ::rtl::OUString& _rsNewTable)
     ::rtl::OUString aDefault = getString(_rxColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE)));
     if(getINT32(_rxColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))) == ColumnValue::NO_NULLS)
     {
-        sSql += ::rtl::OUString::createFromAscii(" NOT NULL");
+        sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" NOT NULL"));
         if(aDefault.getLength())
-            sSql += ::rtl::OUString::createFromAscii(" WITH DEFAULT");
+            sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WITH DEFAULT"));
     }
     else if(aDefault.getLength())
     {
-        sSql +=::rtl::OUString::createFromAscii(" DEFAULT '") + aDefault;
-        sSql += ::rtl::OUString::createFromAscii("'");
+        sSql +=::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" DEFAULT '")) + aDefault;
+        sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"));
     }
     return sSql;
 }
@@ -447,58 +445,58 @@ void OTables::appendNew(const ::rtl::OUString& _rsNewTable)
     switch(getINT32(_rxColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))))
     {
         case DataType::BIT:
-            aValue = ::rtl::OUString::createFromAscii("BOOLEAN");
+            aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BOOLEAN"));
             break;
         case DataType::TINYINT:
-            aValue = ::rtl::OUString::createFromAscii("SMALLINT");
+            aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SMALLINT"));
             break;
         case DataType::SMALLINT:
-            aValue = ::rtl::OUString::createFromAscii("SMALLINT");
+            aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SMALLINT"));
             break;
         case DataType::INTEGER:
-            aValue = ::rtl::OUString::createFromAscii("INT");
+            aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INT"));
             break;
         case DataType::FLOAT:
-            aValue = ::rtl::OUString::createFromAscii("FLOAT");
+            aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FLOAT"));
             break;
         case DataType::REAL:
-            aValue = ::rtl::OUString::createFromAscii("REAL");
+            aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REAL"));
             break;
         case DataType::DOUBLE:
-            aValue = ::rtl::OUString::createFromAscii("DOUBLE");
+            aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DOUBLE"));
             break;
         case DataType::NUMERIC:
-            aValue = ::rtl::OUString::createFromAscii("DECIMAL");
+            aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DECIMAL"));
             break;
         case DataType::DECIMAL:
-            aValue = ::rtl::OUString::createFromAscii("DECIMAL");
+            aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DECIMAL"));
             break;
         case DataType::CHAR:
-            aValue = ::rtl::OUString::createFromAscii("CHAR");
+            aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CHAR"));
             break;
         case DataType::VARCHAR:
-            aValue = ::rtl::OUString::createFromAscii("VARCHAR");
+            aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"));
             break;
         case DataType::LONGVARCHAR:
-            aValue = ::rtl::OUString::createFromAscii("LONG VARCHAR");
+            aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LONG VARCHAR"));
             break;
         case DataType::DATE:
-            aValue = ::rtl::OUString::createFromAscii("DATE");
+            aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATE"));
             break;
         case DataType::TIME:
-            aValue = ::rtl::OUString::createFromAscii("TIME");
+            aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIME"));
             break;
         case DataType::TIMESTAMP:
-            aValue = ::rtl::OUString::createFromAscii("TIMESTAMP");
+            aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP"));
             break;
         case DataType::BINARY:
-            aValue = ::rtl::OUString::createFromAscii("CHAR () BYTE");
+            aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CHAR () BYTE"));
             break;
         case DataType::VARBINARY:
-            aValue = ::rtl::OUString::createFromAscii("VARCHAR () BYTE");
+            aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR () BYTE"));
             break;
         case DataType::LONGVARBINARY:
-            aValue = ::rtl::OUString::createFromAscii("LONG BYTE");
+            aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LONG BYTE"));
             break;
     }
     return aValue;
diff --git a/connectivity/source/drivers/adabas/BUser.cxx b/connectivity/source/drivers/adabas/BUser.cxx
index 671edf6df8fb..ff54d5f936b4 100644
--- a/connectivity/source/drivers/adabas/BUser.cxx
+++ b/connectivity/source/drivers/adabas/BUser.cxx
@@ -70,9 +70,9 @@ void OAdabasUser::refreshGroups()
     TStringVector aVector;
     aVector.reserve(7); // we don't know the excatly count of users but this should fit the normal need
     Reference< XStatement > xStmt = m_pConnection->createStatement(  );
-    ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("SELECT DISTINCT GROUPNAME FROM DOMAIN.USERS WHERE GROUPNAME IS NOT NULL AND GROUPNAME <> ' ' AND USERNAME = '");
+    ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "SELECT DISTINCT GROUPNAME FROM DOMAIN.USERS WHERE GROUPNAME IS NOT NULL AND GROUPNAME <> ' ' AND USERNAME = '" ));
     aSql += getName( );
-    aSql += ::rtl::OUString::createFromAscii("'");
+    aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"));
 
     Reference< XResultSet > xResult = xStmt->executeQuery(aSql);
     if(xResult.is())
@@ -136,11 +136,11 @@ void OAdabasUser::getAnyTablePrivileges(const ::rtl::OUString& objName, sal_Int3
     ::rtl::OUString sCatalog,sSchema,sTable;
     ::dbtools::qualifiedNameComponents(xMeta,objName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation);
     Reference<XStatement> xStmt = m_pConnection->createStatement();
-    ::rtl::OUString sSql = ::rtl::OUString::createFromAscii("SELECT REFTABLENAME,PRIVILEGES FROM DOMAIN.USR_USES_TAB WHERE REFOBJTYPE <> 'SYSTEM' AND DEFUSERNAME = '");
+    ::rtl::OUString sSql( RTL_CONSTASCII_USTRINGPARAM( "SELECT REFTABLENAME,PRIVILEGES FROM DOMAIN.USR_USES_TAB WHERE REFOBJTYPE <> 'SYSTEM' AND DEFUSERNAME = '" ));
     sSql += m_Name;
-    sSql += ::rtl::OUString::createFromAscii("' AND REFTABLENAME = '");
+    sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("' AND REFTABLENAME = '"));
     sSql += sTable;
-    sSql += ::rtl::OUString::createFromAscii("'");
+    sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"));
     if(xStmt.is())
     {
         Reference<XResultSet> xRes = xStmt->executeQuery(sSql);
@@ -203,13 +203,12 @@ void SAL_CALL OAdabasUser::grantPrivileges( const ::rtl::OUString& objName, sal_
     ::rtl::OUString sPrivs = getPrivilegeString(objPrivileges);
     if(sPrivs.getLength())
     {
-        ::rtl::OUString sGrant;
-        sGrant += ::rtl::OUString::createFromAscii("GRANT ");
+        ::rtl::OUString sGrant(RTL_CONSTASCII_USTRINGPARAM("GRANT "));
         sGrant += sPrivs;
-        sGrant += ::rtl::OUString::createFromAscii(" ON ");
+        sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON "));
         Reference<XDatabaseMetaData> xMeta = m_pConnection->getMetaData();
         sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation);
-        sGrant += ::rtl::OUString::createFromAscii(" TO ");
+        sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" TO "));
         sGrant += m_Name;
 
         Reference<XStatement> xStmt = m_pConnection->createStatement();
@@ -229,13 +228,12 @@ void SAL_CALL OAdabasUser::revokePrivileges( const ::rtl::OUString& objName, sal
     ::rtl::OUString sPrivs = getPrivilegeString(objPrivileges);
     if(sPrivs.getLength())
     {
-        ::rtl::OUString sGrant;
-        sGrant += ::rtl::OUString::createFromAscii("REVOKE ");
+        ::rtl::OUString sGrant(RTL_CONSTASCII_USTRINGPARAM("REVOKE "));
         sGrant += sPrivs;
-        sGrant += ::rtl::OUString::createFromAscii(" ON ");
+        sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON "));
         Reference<XDatabaseMetaData> xMeta = m_pConnection->getMetaData();
         sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation);
-        sGrant += ::rtl::OUString::createFromAscii(" FROM ");
+        sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM "));
         sGrant += m_Name;
 
         Reference<XStatement> xStmt = m_pConnection->createStatement();
@@ -250,12 +248,11 @@ void SAL_CALL OAdabasUser::changePassword( const ::rtl::OUString& objPassword, c
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed);
-    ::rtl::OUString sAlterPwd;
-    sAlterPwd = ::rtl::OUString::createFromAscii("ALTER PASSWORD \"");
+    ::rtl::OUString sAlterPwd(RTL_CONSTASCII_USTRINGPARAM("ALTER PASSWORD \""));
     sAlterPwd += objPassword.toAsciiUpperCase();
-    sAlterPwd += ::rtl::OUString::createFromAscii("\" TO \"") ;
+    sAlterPwd += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\" TO \"")) ;
     sAlterPwd += newPassword.toAsciiUpperCase();
-    sAlterPwd += ::rtl::OUString::createFromAscii("\"") ;
+    sAlterPwd += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\"")) ;
 
     sal_Bool bDisposeConnection = sal_False;
     Reference<XConnection> xConnection = m_pConnection;
@@ -266,9 +263,9 @@ void SAL_CALL OAdabasUser::changePassword( const ::rtl::OUString& objPassword, c
         if(pNewConnection)
         {
             Sequence< PropertyValue> aSeq(2);
-            aSeq.getArray()[0].Name     = ::rtl::OUString::createFromAscii("user") ;
+            aSeq.getArray()[0].Name     = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")) ;
             aSeq.getArray()[0].Value    <<= m_Name;
-            aSeq.getArray()[1].Name     = ::rtl::OUString::createFromAscii("password") ;
+            aSeq.getArray()[1].Name     = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("password")) ;
             aSeq.getArray()[1].Value    <<= objPassword;
             pNewConnection->Construct(m_pConnection->getMetaData()->getURL(),aSeq);
         }
@@ -291,41 +288,41 @@ void SAL_CALL OAdabasUser::changePassword( const ::rtl::OUString& objPassword, c
 {
     ::rtl::OUString sPrivs;
     if((nRights & Privilege::INSERT) == Privilege::INSERT)
-        sPrivs += ::rtl::OUString::createFromAscii("INSERT");
+        sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INSERT"));
 
     if((nRights & Privilege::DELETE) == Privilege::DELETE)
     {
         if(sPrivs.getLength())
-            sPrivs += ::rtl::OUString::createFromAscii(",");
-        sPrivs += ::rtl::OUString::createFromAscii("DELETE");
+            sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+        sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DELETE"));
     }
 
     if((nRights & Privilege::UPDATE) == Privilege::UPDATE)
     {
         if(sPrivs.getLength())
-            sPrivs += ::rtl::OUString::createFromAscii(",");
-        sPrivs += ::rtl::OUString::createFromAscii("UPDATE");
+            sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+        sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UPDATE"));
     }
 
     if((nRights & Privilege::ALTER) == Privilege::ALTER)
     {
         if(sPrivs.getLength())
-            sPrivs += ::rtl::OUString::createFromAscii(",");
-        sPrivs += ::rtl::OUString::createFromAscii("ALTER");
+            sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+        sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ALTER"));
     }
 
     if((nRights & Privilege::SELECT) == Privilege::SELECT)
     {
         if(sPrivs.getLength())
-            sPrivs += ::rtl::OUString::createFromAscii(",");
-        sPrivs += ::rtl::OUString::createFromAscii("SELECT");
+            sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+        sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT"));
     }
 
     if((nRights & Privilege::REFERENCE) == Privilege::REFERENCE)
     {
         if(sPrivs.getLength())
-            sPrivs += ::rtl::OUString::createFromAscii(",");
-        sPrivs += ::rtl::OUString::createFromAscii("REFERENCES");
+            sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+        sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REFERENCES"));
     }
 
     return sPrivs;
diff --git a/connectivity/source/drivers/adabas/BUsers.cxx b/connectivity/source/drivers/adabas/BUsers.cxx
index c342a9158339..6b62f495b066 100644
--- a/connectivity/source/drivers/adabas/BUsers.cxx
+++ b/connectivity/source/drivers/adabas/BUsers.cxx
@@ -69,16 +69,16 @@ Reference< XPropertySet > OUsers::createDescriptor()
 // XAppend
 sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
-    ::rtl::OUString aSql    = ::rtl::OUString::createFromAscii("CREATE USER ");
+    ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "CREATE USER " ));
     ::rtl::OUString aQuote  = m_pConnection->getMetaData()->getIdentifierQuoteString(  );
 
     ::rtl::OUString sUserName( _rForName );
     sUserName = sUserName.toAsciiUpperCase();
     descriptor->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(sUserName));
     aSql += ::dbtools::quoteName(aQuote,sUserName)
-                + ::rtl::OUString::createFromAscii(" PASSWORD ")
+                + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" PASSWORD "))
                 + getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD)));
-    aSql += ::rtl::OUString::createFromAscii(" RESOURCE NOT EXCLUSIVE");
+    aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" RESOURCE NOT EXCLUSIVE"));
 
     Reference< XStatement > xStmt = m_pConnection->createStatement(  );
     if(xStmt.is())
@@ -94,8 +94,8 @@ void OUsers::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName)
     {
         // first we have to check if this user is live relevaant for the database
         // which means with out these users the database will miss more than one important system table
-        ::rtl::OUString sUsers = ::rtl::OUString::createFromAscii("SELECT USERMODE,USERNAME FROM DOMAIN.USERS WHERE USERNAME = '");
-        sUsers += _sElementName + ::rtl::OUString::createFromAscii("'");
+        ::rtl::OUString sUsers( RTL_CONSTASCII_USTRINGPARAM( "SELECT USERMODE,USERNAME FROM DOMAIN.USERS WHERE USERNAME = '" ));
+        sUsers += _sElementName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"));
         Reference< XStatement > xStmt = m_pConnection->createStatement();
         if(xStmt.is())
         {
@@ -103,7 +103,7 @@ void OUsers::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName)
             Reference<XRow> xRow(xRes,UNO_QUERY);
             if(xRes.is() && xRow.is() && xRes->next()) // there can only be one user with this name
             {
-                static const ::rtl::OUString sDbaUser = ::rtl::OUString::createFromAscii("DBA");
+                static const ::rtl::OUString sDbaUser( RTL_CONSTASCII_USTRINGPARAM( "DBA" ));
                 if(xRow->getString(1) == sDbaUser)
                 {
                     ::comphelper::disposeComponent(xStmt);
@@ -115,7 +115,7 @@ void OUsers::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName)
     }
 
     {
-        ::rtl::OUString aSql    = ::rtl::OUString::createFromAscii("DROP USER ");
+        ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "DROP USER " ));
         ::rtl::OUString aQuote  = m_pConnection->getMetaData()->getIdentifierQuoteString(  );
         aSql += ::dbtools::quoteName(aQuote,_sElementName);
 
diff --git a/connectivity/source/drivers/adabas/BViews.cxx b/connectivity/source/drivers/adabas/BViews.cxx
index 75caf4fd3967..4914c08f2902 100644
--- a/connectivity/source/drivers/adabas/BViews.cxx
+++ b/connectivity/source/drivers/adabas/BViews.cxx
@@ -66,16 +66,16 @@ sdbcx::ObjectType OViews::createObject(const ::rtl::OUString& _rName)
     aSchema = _rName.copy(0,nLen);
     aName   = _rName.copy(nLen+1);
 
-    ::rtl::OUString sStmt = ::rtl::OUString::createFromAscii("SELECT DISTINCT * FROM DOMAIN.SHOW_VIEW WHERE ");
+    ::rtl::OUString sStmt( RTL_CONSTASCII_USTRINGPARAM( "SELECT DISTINCT * FROM DOMAIN.SHOW_VIEW WHERE " ));
     if(aSchema.getLength())
     {
-        sStmt += ::rtl::OUString::createFromAscii("OWNER = '");
+        sStmt += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OWNER = '"));
         sStmt += aSchema;
-        sStmt += ::rtl::OUString::createFromAscii("' AND ");
+        sStmt += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("' AND "));
     }
-    sStmt += ::rtl::OUString::createFromAscii("VIEWNAME = '");
+    sStmt += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEWNAME = '"));
     sStmt += aName;
-    sStmt += ::rtl::OUString::createFromAscii("'");
+    sStmt += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"));
     Reference<XConnection> xConnection = static_cast<OAdabasCatalog&>(m_rParent).getConnection();
     Reference< XStatement > xStmt = xConnection->createStatement(  );
     Reference< XResultSet > xResult = xStmt->executeQuery(sStmt);
@@ -142,7 +142,7 @@ void OViews::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName)
         sal_Int32 nLen = _sElementName.indexOf('.');
         aSchema = _sElementName.copy(0,nLen);
         aName   = _sElementName.copy(nLen+1);
-        ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP VIEW");
+        ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "DROP VIEW" ));
         const ::rtl::OUString& sDot = OAdabasCatalog::getDot();
 
         aSql = aSql + m_xMetaData->getIdentifierQuoteString(  ) + aSchema + m_xMetaData->getIdentifierQuoteString(  );
@@ -162,7 +162,7 @@ void OViews::dropByNameImpl(const ::rtl::OUString& elementName)
 // -----------------------------------------------------------------------------
 void OViews::createView( const Reference< XPropertySet >& descriptor )
 {
-    ::rtl::OUString aSql    = ::rtl::OUString::createFromAscii("CREATE VIEW ");
+    ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "CREATE VIEW " ));
     ::rtl::OUString aQuote  = static_cast<OAdabasCatalog&>(m_rParent).getConnection()->getMetaData()->getIdentifierQuoteString(  );
     const ::rtl::OUString& sDot = OAdabasCatalog::getDot();
     ::rtl::OUString sSchema,sCommand;
@@ -174,7 +174,7 @@ void OViews::createView( const Reference< XPropertySet >& descriptor )
         descriptor->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME),makeAny(sSchema = static_cast<OAdabasCatalog&>(m_rParent).getConnection()->getMetaData()->getUserName()));
 
     aSql += ::dbtools::quoteName(aQuote, getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))))
-                + ::rtl::OUString::createFromAscii(" AS ");
+                + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" AS "));
     descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND)) >>= sCommand;
     aSql += sCommand;
 
diff --git a/connectivity/source/drivers/adabas/Bservices.cxx b/connectivity/source/drivers/adabas/Bservices.cxx
index dec42a770ba8..0e4f3f3b5e89 100644
--- a/connectivity/source/drivers/adabas/Bservices.cxx
+++ b/connectivity/source/drivers/adabas/Bservices.cxx
@@ -62,9 +62,9 @@ void REGISTER_PROVIDER(
         const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
 {
     OUString aMainKeyName;
-    aMainKeyName = OUString::createFromAscii("/");
+    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString::createFromAscii("/UNO/SERVICES");
+    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
 
     Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
     OSL_ENSURE(xNewKey.is(), "ADABAS::component_writeInfo : could not create a registry key !");
diff --git a/connectivity/source/drivers/adabas/adabas.xml b/connectivity/source/drivers/adabas/adabas.xml
index a3fd2b8b1371..a8740023988b 100644
--- a/connectivity/source/drivers/adabas/adabas.xml
+++ b/connectivity/source/drivers/adabas/adabas.xml
@@ -3,7 +3,7 @@
 <module-description xmlns:xlink="http://www.w3.org/1999/xlink">
     <module-name>adabas</module-name>
     <component-description>
-        <author>Ocke Janssen</Author>
+        <author>Ocke Janssen</author>
         <name>com.sun.star.comp.sdbcx.adabas.ODriver</name>
         <description>
             This is the implementation of the sdbc-adabas bridge.
diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx
index 20a91af98a39..a16747632c8b 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -181,7 +181,7 @@ void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& r
                 break;
 
             case PROPERTY_ID_ISAUTOINCREMENT:
-                OTools::putValue( m_aColumn.get_Properties(), ::rtl::OUString::createFromAscii( "Autoincrement" ), getBOOL( rValue ) );
+                OTools::putValue( m_aColumn.get_Properties(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Autoincrement" )), getBOOL( rValue ) );
                 break;
 
             case PROPERTY_ID_IM001:
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
index 958aa395b090..cfbd37918338 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
@@ -233,7 +233,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQLExc
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString::createFromAscii("Maximum Row Size"));
+    return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Maximum Row Size")));
 }
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength(  ) throw(SQLException, RuntimeException)
@@ -253,7 +253,6 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength(  ) throw(SQLExcept
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex(  ) throw(SQLException, RuntimeException)
 {
-    //  return getInt32Property(::rtl::OUString::createFromAscii("Max Columns in Index"));
     return 0;
 }
 // -------------------------------------------------------------------------
@@ -264,12 +263,12 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength(  ) throw(SQLExcept
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString::createFromAscii("Active Sessions"));
+    return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Active Sessions")));
 }
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString::createFromAscii("Max Columns in Table"));
+    return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Max Columns in Table")));
 }
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength(  ) throw(SQLException, RuntimeException)
@@ -284,7 +283,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength(  ) throw(SQLExcepti
 // -------------------------------------------------------------------------
 sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw(  )
 {
-    return getInt32Property(::rtl::OUString::createFromAscii("Maximum Tables in SELECT"));
+    return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Maximum Tables in SELECT")));
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
@@ -377,7 +376,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
         aRow[4] = ::connectivity::ODatabaseMetaDataResultSet::getEmptyValue();
         aRow[5] = new ::connectivity::ORowSetValueDecorator(getUserName());
         aRow[6] = ::connectivity::ODatabaseMetaDataResultSet::getSelectValue();
-        aRow[7] = new ::connectivity::ORowSetValueDecorator(::rtl::OUString::createFromAscii("NO"));
+        aRow[7] = new ::connectivity::ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO")));
 
         aRows.push_back(aRow);
         aRow[6] = ::connectivity::ODatabaseMetaDataResultSet::getInsertValue();
@@ -419,37 +418,37 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs(  ) throw(SQLException, RuntimeException)
 {
-    return getBoolProperty(::rtl::OUString::createFromAscii("Maximum Row Size Includes BLOB"));
+    return getBoolProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Maximum Row Size Includes BLOB")));
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString::createFromAscii("Identifier Case Sensitivity")) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ;
+    return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString::createFromAscii("Identifier Case Sensitivity")) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ;
+    return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ;
 }
 // -------------------------------------------------------------------------
 sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw(  )
 {
-    return (getInt32Property(::rtl::OUString::createFromAscii("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ;
+    return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString::createFromAscii("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ;
+    return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString::createFromAscii("Identifier Case Sensitivity")) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ;
+    return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString::createFromAscii("Identifier Case Sensitivity")) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ;
+    return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ;
 }
 // -------------------------------------------------------------------------
 sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithAddColumn_throw(  )
@@ -464,17 +463,17 @@ sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw(  )
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString::createFromAscii("Maximum Index Size"));
+    return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Maximum Index Size")));
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString::createFromAscii("NULL Concatenation Behavior")) == DBPROPVAL_CB_NON_NULL;
+    return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULL Concatenation Behavior"))) == DBPROPVAL_CB_NON_NULL;
 }
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException)
 {
-    return getStringProperty(::rtl::OUString::createFromAscii("Catalog Term"));
+    return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Catalog Term")));
 }
 // -------------------------------------------------------------------------
 ::rtl::OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
@@ -485,7 +484,6 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLExc
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException)
 {
-    //  return getStringProperty(::rtl::OUString::createFromAscii("Special Characters"));
     return ::rtl::OUString();
 }
 // -------------------------------------------------------------------------
@@ -496,27 +494,27 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames(  )
 // -------------------------------------------------------------------------
 sal_Bool ODatabaseMetaData::impl_isCatalogAtStart_throw(  )
 {
-    return getInt32Property(::rtl::OUString::createFromAscii("Catalog Location")) == DBPROPVAL_CL_START;
+    return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Catalog Location"))) == DBPROPVAL_CL_START;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString::createFromAscii("Transaction DDL")) == DBPROPVAL_TC_DDL_IGNORE;
+    return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Transaction DDL"))) == DBPROPVAL_TC_DDL_IGNORE;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString::createFromAscii("Transaction DDL")) == DBPROPVAL_TC_DDL_COMMIT;
+    return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Transaction DDL"))) == DBPROPVAL_TC_DDL_COMMIT;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString::createFromAscii("Transaction DDL")) == DBPROPVAL_TC_DML;
+    return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Transaction DDL"))) == DBPROPVAL_TC_DML;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString::createFromAscii("Transaction DDL")) == DBPROPVAL_TC_ALL;
+    return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Transaction DDL"))) == DBPROPVAL_TC_ALL;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete(  ) throw(SQLException, RuntimeException)
@@ -531,29 +529,29 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate(  ) throw(SQLExcep
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString::createFromAscii("Prepare Abort Behavior")) == DBPROPVAL_CB_PRESERVE;
+    return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Prepare Abort Behavior"))) == DBPROPVAL_CB_PRESERVE;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString::createFromAscii("Prepare Commit Behavior")) == DBPROPVAL_CB_PRESERVE;
+    return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Prepare Commit Behavior"))) == DBPROPVAL_CB_PRESERVE;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString::createFromAscii("Isolation Retention")) & DBPROPVAL_TR_COMMIT) == DBPROPVAL_TR_COMMIT;
+    return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Isolation Retention"))) & DBPROPVAL_TR_COMMIT) == DBPROPVAL_TR_COMMIT;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString::createFromAscii("Isolation Retention")) & DBPROPVAL_TR_ABORT) == DBPROPVAL_TR_ABORT;
+    return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Isolation Retention"))) & DBPROPVAL_TR_ABORT) == DBPROPVAL_TR_ABORT;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw(SQLException, RuntimeException)
 {
     sal_Bool bValue(sal_False);
 
-    sal_Int32 nTxn = getInt32Property(::rtl::OUString::createFromAscii("Isolation Levels"));
+    sal_Int32 nTxn = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Isolation Levels")));
     if(level == TransactionIsolation::NONE)
         bValue = sal_True;
     else if(level == TransactionIsolation::READ_UNCOMMITTED)
@@ -570,52 +568,49 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int3
 // -------------------------------------------------------------------------
 sal_Bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw(  )
 {
-    return (getInt32Property(::rtl::OUString::createFromAscii("Schema Usage")) & DBPROPVAL_SU_DML_STATEMENTS) == DBPROPVAL_SU_DML_STATEMENTS;
+    return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Schema Usage"))) & DBPROPVAL_SU_DML_STATEMENTS) == DBPROPVAL_SU_DML_STATEMENTS;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL(  ) throw(SQLException, RuntimeException)
 {
-    sal_Int32 nProp = getInt32Property(::rtl::OUString::createFromAscii("SQL Support"));
+    sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support")));
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_FULL) == DBPROPVAL_SQL_ANSI92_FULL);
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL(  ) throw(SQLException, RuntimeException)
 {
-    sal_Int32 nProp = getInt32Property(::rtl::OUString::createFromAscii("SQL Support"));
+    sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support")));
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_ENTRY) == DBPROPVAL_SQL_ANSI92_ENTRY);
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility(  ) throw(SQLException, RuntimeException)
 {
-    sal_Int32 nProp = getInt32Property(::rtl::OUString::createFromAscii("SQL Support"));
+    sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support")));
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI89_IEF) == DBPROPVAL_SQL_ANSI89_IEF);
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString::createFromAscii("Schema Usage")) & DBPROPVAL_SU_INDEX_DEFINITION) == DBPROPVAL_SU_INDEX_DEFINITION;
+    return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Schema Usage"))) & DBPROPVAL_SU_INDEX_DEFINITION) == DBPROPVAL_SU_INDEX_DEFINITION;
 }
 // -------------------------------------------------------------------------
 sal_Bool ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw(  )
 {
-    return (getInt32Property(::rtl::OUString::createFromAscii("Schema Usage")) & DBPROPVAL_SU_TABLE_DEFINITION) == DBPROPVAL_SU_TABLE_DEFINITION;
+    return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Schema Usage"))) & DBPROPVAL_SU_TABLE_DEFINITION) == DBPROPVAL_SU_TABLE_DEFINITION;
 }
 // -------------------------------------------------------------------------
 sal_Bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw(  )
 {
-    //  return (getInt32Property(::rtl::OUString::createFromAscii("Catalog Usage")) & DBPROPVAL_CU_TABLE_DEFINITION) == DBPROPVAL_CU_TABLE_DEFINITION;
     return sal_False;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions(  ) throw(SQLException, RuntimeException)
 {
-    //  return (getInt32Property(::rtl::OUString::createFromAscii("Catalog Usage")) & DBPROPVAL_CU_INDEX_DEFINITION) == DBPROPVAL_CU_INDEX_DEFINITION;
     return sal_False;
 }
 // -------------------------------------------------------------------------
 sal_Bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw(  )
 {
-    //  return (getInt32Property(::rtl::OUString::createFromAscii("Catalog Usage")) & DBPROPVAL_CU_DML_STATEMENTS) == DBPROPVAL_CU_DML_STATEMENTS;
     return sal_False;
 }
 // -------------------------------------------------------------------------
@@ -623,7 +618,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins(  ) throw(SQLException,
 {
     if ( ADOS::isJetEngine(m_pConnection->getEngineType()) )
         return sal_True;
-    return getBoolProperty(::rtl::OUString::createFromAscii("Outer Join Capabilities"));
+    return getBoolProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Outer Join Capabilities")));
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  ) throw(SQLException, RuntimeException)
@@ -648,7 +643,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength(  ) throw(SQLExcept
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString::createFromAscii("Transaction DDL")) == DBPROPVAL_TC_NONE;
+    return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Transaction DDL"))) == DBPROPVAL_TC_NONE;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable(  ) throw(SQLException, RuntimeException)
@@ -673,7 +668,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable(  ) throw(SQLExcepti
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeException)
 {
-    return getBoolProperty(::rtl::OUString::createFromAscii("Read-Only Data Source"));
+    return getBoolProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Read-Only Data Source")));
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles(  ) throw(SQLException, RuntimeException)
@@ -693,7 +688,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion(  ) throw(SQLExcepti
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString::createFromAscii("NULL Concatenation Behavior")) == DBPROPVAL_CB_NULL;
+    return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULL Concatenation Behavior"))) == DBPROPVAL_CB_NULL;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing(  ) throw(SQLException, RuntimeException)
@@ -708,27 +703,27 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames(  ) throw(SQL
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException)
 {
-    return getBoolProperty(::rtl::OUString::createFromAscii("Rowset Conversions on Command"));
+    return getBoolProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Rowset Conversions on Command")));
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy(  ) throw(SQLException, RuntimeException)
 {
-    return getBoolProperty(::rtl::OUString::createFromAscii("ORDER BY Columns in Select List"));
+    return getBoolProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ORDER BY Columns in Select List")));
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString::createFromAscii("GROUP BY Support")) != DBPROPVAL_GB_NOT_SUPPORTED;
+    return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GROUP BY Support"))) != DBPROPVAL_GB_NOT_SUPPORTED;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString::createFromAscii("GROUP BY Support")) != DBPROPVAL_GB_CONTAINS_SELECT;
+    return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GROUP BY Support"))) != DBPROPVAL_GB_CONTAINS_SELECT;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString::createFromAscii("GROUP BY Support")) == DBPROPVAL_GB_NO_RELATION;
+    return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GROUP BY Support"))) == DBPROPVAL_GB_NO_RELATION;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions(  ) throw(SQLException, RuntimeException)
@@ -748,7 +743,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause(  ) throw(SQLExcep
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated(  ) throw(SQLException, RuntimeException)
 {
-    return getBoolProperty(::rtl::OUString::createFromAscii("ORDER BY Columns in Select List"));
+    return getBoolProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ORDER BY Columns in Select List")));
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion(  ) throw(SQLException, RuntimeException)
@@ -763,32 +758,32 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll(  ) throw(SQLException, Ru
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString::createFromAscii("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED;
+    return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED;
 }
 // -------------------------------------------------------------------------
 sal_Bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw(  )
 {
-    return (getInt32Property(::rtl::OUString::createFromAscii("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED;
+    return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Identifier Case Sensitivity"))) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString::createFromAscii("NULL Collation Order")) & DBPROPVAL_NC_END) == DBPROPVAL_NC_END;
+    return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULL Collation Order"))) & DBPROPVAL_NC_END) == DBPROPVAL_NC_END;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString::createFromAscii("NULL Collation Order")) & DBPROPVAL_NC_START) == DBPROPVAL_NC_START;
+    return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULL Collation Order"))) & DBPROPVAL_NC_START) == DBPROPVAL_NC_START;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString::createFromAscii("NULL Collation Order")) & DBPROPVAL_NC_HIGH) == DBPROPVAL_NC_HIGH;
+    return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULL Collation Order"))) & DBPROPVAL_NC_HIGH) == DBPROPVAL_NC_HIGH;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString::createFromAscii("NULL Collation Order")) & DBPROPVAL_NC_LOW) == DBPROPVAL_NC_LOW;
+    return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULL Collation Order"))) & DBPROPVAL_NC_LOW) == DBPROPVAL_NC_LOW;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls(  ) throw(SQLException, RuntimeException)
@@ -798,7 +793,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls(  ) throw(S
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString::createFromAscii("Schema Usage")) & DBPROPVAL_SU_PRIVILEGE_DEFINITION) == DBPROPVAL_SU_PRIVILEGE_DEFINITION;
+    return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Schema Usage"))) & DBPROPVAL_SU_PRIVILEGE_DEFINITION) == DBPROPVAL_SU_PRIVILEGE_DEFINITION;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls(  ) throw(SQLException, RuntimeException)
@@ -808,79 +803,78 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls(  ) throw(
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException)
 {
-    //  return (getInt32Property(::rtl::OUString::createFromAscii("Catalog Usage")) & DBPROPVAL_CU_PRIVILEGE_DEFINITION) == DBPROPVAL_CU_PRIVILEGE_DEFINITION;
     return sal_False;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString::createFromAscii("Subquery Support")) & DBPROPVAL_SQ_CORRELATEDSUBQUERIES) == DBPROPVAL_SQ_CORRELATEDSUBQUERIES;
+    return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Subquery Support"))) & DBPROPVAL_SQ_CORRELATEDSUBQUERIES) == DBPROPVAL_SQ_CORRELATEDSUBQUERIES;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString::createFromAscii("Subquery Support")) & DBPROPVAL_SQ_COMPARISON) == DBPROPVAL_SQ_COMPARISON;
+    return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Subquery Support"))) & DBPROPVAL_SQ_COMPARISON) == DBPROPVAL_SQ_COMPARISON;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString::createFromAscii("Subquery Support")) & DBPROPVAL_SQ_EXISTS) == DBPROPVAL_SQ_EXISTS;
+    return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Subquery Support"))) & DBPROPVAL_SQ_EXISTS) == DBPROPVAL_SQ_EXISTS;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString::createFromAscii("Subquery Support")) & DBPROPVAL_SQ_IN) == DBPROPVAL_SQ_IN;
+    return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Subquery Support"))) & DBPROPVAL_SQ_IN) == DBPROPVAL_SQ_IN;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString::createFromAscii("Subquery Support")) & DBPROPVAL_SQ_QUANTIFIED) == DBPROPVAL_SQ_QUANTIFIED;
+    return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Subquery Support"))) & DBPROPVAL_SQ_QUANTIFIED) == DBPROPVAL_SQ_QUANTIFIED;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQLException, RuntimeException)
 {
-    sal_Int32 nProp = getInt32Property(::rtl::OUString::createFromAscii("SQL Support"));
+    sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support")));
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_INTERMEDIATE) == DBPROPVAL_SQL_ANSI92_INTERMEDIATE);
 }
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("sdbc:ado:")+ m_pADOConnection->GetConnectionString();
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:ado:"))+ m_pADOConnection->GetConnectionString();
 }
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException)
 {
-    return getStringProperty(::rtl::OUString::createFromAscii("User Name"));
+    return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("User Name")));
 }
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException)
 {
-    return getStringProperty(::rtl::OUString::createFromAscii("Provider Friendly Name"));
+    return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Provider Friendly Name")));
 }
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverVersion(  ) throw(SQLException, RuntimeException)
 {
-    return getStringProperty(::rtl::OUString::createFromAscii("Provider Version"));
+    return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Provider Version")));
 }
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException)
 {
-    return getStringProperty(::rtl::OUString::createFromAscii("DBMS Version"));
+    return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DBMS Version")));
 }
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException)
 {
-    return getStringProperty(::rtl::OUString::createFromAscii("DBMS Name"));
+    return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DBMS Name")));
 }
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException)
 {
-    return getStringProperty(::rtl::OUString::createFromAscii("Procedure Term"));
+    return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Procedure Term")));
 }
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException)
 {
-    return getStringProperty(::rtl::OUString::createFromAscii("Schema Term"));
+    return getStringProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Schema Term")));
 }
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion(  ) throw(RuntimeException)
@@ -930,7 +924,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeExc
 
         aRecordset.MoveFirst();
         OLEVariant  aValue;
-        ::rtl::OUString aRet,aComma = ::rtl::OUString::createFromAscii(",");
+        ::rtl::OUString aRet, aComma(RTL_CONSTASCII_USTRINGPARAM(","));
         while(!aRecordset.IsAtEOF())
         {
             WpOLEAppendCollection<ADOFields, ADOField, WpADOField>  aFields(aRecordset.GetFields());
@@ -977,19 +971,19 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeExc
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
-    sal_Int32 nProp = getInt32Property(::rtl::OUString::createFromAscii("SQL Support"));
+    sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support")));
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_EXTENDED) == DBPROPVAL_SQL_ODBC_EXTENDED);
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
-    sal_Int32 nProp = getInt32Property(::rtl::OUString::createFromAscii("SQL Support"));
+    sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support")));
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_CORE) == DBPROPVAL_SQL_ODBC_CORE);
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
-    sal_Int32 nProp = getInt32Property(::rtl::OUString::createFromAscii("SQL Support"));
+    sal_Int32 nProp = getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL Support")));
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_MINIMUM) == DBPROPVAL_SQL_ODBC_MINIMUM);
 }
 // -------------------------------------------------------------------------
@@ -997,7 +991,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins(  ) throw(SQLExcepti
 {
     if ( ADOS::isJetEngine(m_pConnection->getEngineType()) )
         return sal_True;
-    return (getInt32Property(::rtl::OUString::createFromAscii("Outer Join Capabilities")) & 0x00000004L) == 0x00000004L;
+    return (getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Outer Join Capabilities"))) & 0x00000004L) == 0x00000004L;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins(  ) throw(SQLException, RuntimeException)
@@ -1007,17 +1001,17 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins(  ) throw(SQLExce
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString::createFromAscii("Max Columns in GROUP BY"));
+    return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Max Columns in GROUP BY")));
 }
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString::createFromAscii("Max Columns in ORDER BY"));
+    return getInt32Property(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Max Columns in ORDER BY")));
 }
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect(  ) throw(SQLException, RuntimeException)
 {
-    return 0; // getInt32Property(::rtl::OUString::createFromAscii("Max Columns in Select"));
+    return 0;
 }
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength(  ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
index c31e40f44922..8bde02cd5239 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
@@ -128,7 +128,7 @@ sal_Bool ODatabaseMetaData::isCapable(sal_uInt32 _nId)
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setColumnPrivilegesMap()
 {
-    m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("IS_GRANTABLE"),
+    m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IS_GRANTABLE")),
         ColumnValue::NULLABLE,
         3,3,0,
         DataType::VARCHAR);
@@ -136,31 +136,31 @@ void ODatabaseMetaDataResultSetMetaData::setColumnPrivilegesMap()
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setColumnsMap()
 {
-    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("TYPE_NAME"),
+    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE_NAME")),
         ColumnValue::NO_NULLS,
         0,0,0,
         DataType::VARCHAR);
-    m_mColumns[11] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("NULLABLE"),
+    m_mColumns[11] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULLABLE")),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::INTEGER);
-    m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("REMARKS"),
+    m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REMARKS")),
         ColumnValue::NULLABLE,
         0,0,0,
         DataType::VARCHAR);
-    m_mColumns[13] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("COLUMN_DEF"),
+    m_mColumns[13] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("COLUMN_DEF")),
         ColumnValue::NULLABLE,
         0,0,0,
         DataType::VARCHAR);
-    m_mColumns[14] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("SQL_DATA_TYPE"),
+    m_mColumns[14] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_DATA_TYPE")),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::INTEGER);
-    m_mColumns[15] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("SQL_DATETIME_SUB"),
+    m_mColumns[15] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_DATETIME_SUB")),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::INTEGER);
-    m_mColumns[16] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("CHAR_OCTET_LENGTH"),
+    m_mColumns[16] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CHAR_OCTET_LENGTH")),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::INTEGER);
@@ -168,7 +168,7 @@ void ODatabaseMetaDataResultSetMetaData::setColumnsMap()
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setTablesMap()
 {
-    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("REMARKS"),
+    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REMARKS")),
         ColumnValue::NULLABLE,
         0,0,0,
         DataType::VARCHAR);
@@ -176,7 +176,7 @@ void ODatabaseMetaDataResultSetMetaData::setTablesMap()
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setProcedureColumnsMap()
 {
-    m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("NULLABLE"),
+    m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULLABLE")),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::INTEGER);
@@ -184,11 +184,11 @@ void ODatabaseMetaDataResultSetMetaData::setProcedureColumnsMap()
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setPrimaryKeysMap()
 {
-    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("KEY_SEQ"),
+    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_SEQ")),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::INTEGER);
-    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PK_NAME"),
+    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PK_NAME")),
         ColumnValue::NULLABLE,
         0,0,0,
         DataType::VARCHAR);
@@ -196,15 +196,15 @@ void ODatabaseMetaDataResultSetMetaData::setPrimaryKeysMap()
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setIndexInfoMap()
 {
-    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("NON_UNIQUE"),
+    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NON_UNIQUE")),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::BIT);
-    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("INDEX_QUALIFIER"),
+    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INDEX_QUALIFIER")),
         ColumnValue::NULLABLE,
         0,0,0,
         DataType::VARCHAR);
-    m_mColumns[10] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("ASC_OR_DESC"),
+    m_mColumns[10] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ASC_OR_DESC")),
         ColumnValue::NULLABLE,
         0,0,0,
         DataType::VARCHAR);
@@ -212,11 +212,11 @@ void ODatabaseMetaDataResultSetMetaData::setIndexInfoMap()
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setTablePrivilegesMap()
 {
-    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PRIVILEGE"),
+    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PRIVILEGE")),
         ColumnValue::NULLABLE,
         0,0,0,
         DataType::VARCHAR);
-    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("IS_GRANTABLE"),
+    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IS_GRANTABLE")),
         ColumnValue::NULLABLE,
         0,0,0,
         DataType::VARCHAR);
@@ -224,7 +224,7 @@ void ODatabaseMetaDataResultSetMetaData::setTablePrivilegesMap()
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setCrossReferenceMap()
 {
-    m_mColumns[9] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("KEY_SEQ"),
+    m_mColumns[9] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_SEQ")),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::INTEGER);
@@ -232,27 +232,27 @@ void ODatabaseMetaDataResultSetMetaData::setCrossReferenceMap()
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setTypeInfoMap()
 {
-    m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("PRECISION"),
+    m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PRECISION")),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::INTEGER);
-    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("NULLABLE"),
+    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NULLABLE")),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::INTEGER);
-    m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("AUTO_INCREMENT"),
+    m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AUTO_INCREMENT")),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::BIT);
-    m_mColumns[16] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("SQL_DATA_TYPE"),
+    m_mColumns[16] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_DATA_TYPE")),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::INTEGER);
-    m_mColumns[17] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("SQL_DATETIME_SUB"),
+    m_mColumns[17] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_DATETIME_SUB")),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::INTEGER);
-    m_mColumns[18] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("NUM_PREC_RADIX"),
+    m_mColumns[18] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NUM_PREC_RADIX")),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::INTEGER);
@@ -260,7 +260,7 @@ void ODatabaseMetaDataResultSetMetaData::setTypeInfoMap()
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setProceduresMap()
 {
-    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("REMARKS"),
+    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REMARKS")),
         ColumnValue::NULLABLE,
         0,0,0,
         DataType::VARCHAR);
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index 08b70797c635..589fd04f6675 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -908,13 +908,12 @@ void ODatabaseMetaDataResultSet::setColumnsMap()
     aMap[adFileTime]        = ADOS::MapADOType2Jdbc(adFileTime);
     aMap[adPropVariant]     = ADOS::MapADOType2Jdbc(adPropVariant);
     aMap[adVarNumeric]      = ADOS::MapADOType2Jdbc(adVarNumeric);
-//  aMap[adArray]           = ADOS::MapADOType2Jdbc(adArray);
 
     m_aValueRange[12] = aMap;
 
     ::std::map< sal_Int32,::rtl::OUString> aMap2;
-    aMap2[0] = ::rtl::OUString::createFromAscii("YES");
-    aMap2[1] = ::rtl::OUString::createFromAscii("NO");
+    aMap2[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YES"));
+    aMap2[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO"));
     m_aIntValueRange[18] = aMap2;
 
     ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);
@@ -1047,8 +1046,8 @@ void ODatabaseMetaDataResultSet::setIndexInfoMap()
 
     ::std::map< sal_Int32,::rtl::OUString> aMap3;
     aMap3[0]                    = ::rtl::OUString();
-    aMap3[DB_COLLATION_ASC]     = ::rtl::OUString::createFromAscii("A");
-    aMap3[DB_COLLATION_DESC]    = ::rtl::OUString::createFromAscii("D");
+    aMap3[DB_COLLATION_ASC]     = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("A"));
+    aMap3[DB_COLLATION_DESC]    = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("D"));
 
     m_aIntValueRange[21] = aMap3;
 
@@ -1069,8 +1068,8 @@ void ODatabaseMetaDataResultSet::setTablePrivilegesMap()
     m_aColMapping.push_back(7);
 
     ::std::map< sal_Int32,::rtl::OUString> aMap;
-    aMap[0] = ::rtl::OUString::createFromAscii("YES");
-    aMap[1] = ::rtl::OUString::createFromAscii("NO");
+    aMap[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YES"));
+    aMap[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO"));
     m_aIntValueRange[7] = aMap;
 
 
@@ -1096,11 +1095,11 @@ void ODatabaseMetaDataResultSet::setCrossReferenceMap()
     m_aColMapping.push_back(18);
 
     ::std::map< ::rtl::OUString,sal_Int32> aMap;
-    aMap[ ::rtl::OUString::createFromAscii("CASCADE")] = KeyRule::CASCADE;
-    aMap[ ::rtl::OUString::createFromAscii("RESTRICT")] = KeyRule::RESTRICT;
-    aMap[ ::rtl::OUString::createFromAscii("SET NULL")] = KeyRule::SET_NULL;
-    aMap[ ::rtl::OUString::createFromAscii("SET DEFAULT")] = KeyRule::SET_DEFAULT;
-    aMap[ ::rtl::OUString::createFromAscii("NO ACTION")] = KeyRule::NO_ACTION;
+    aMap[ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CASCADE"))] = KeyRule::CASCADE;
+    aMap[ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RESTRICT"))] = KeyRule::RESTRICT;
+    aMap[ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SET NULL"))] = KeyRule::SET_NULL;
+    aMap[ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SET DEFAULT"))] = KeyRule::SET_DEFAULT;
+    aMap[ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO ACTION"))] = KeyRule::NO_ACTION;
 
     m_aStrValueRange[14] = aMap;
     m_aStrValueRange[15] = aMap;
diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx
index 060764faea89..4259a8018c69 100644
--- a/connectivity/source/drivers/ado/ADriver.cxx
+++ b/connectivity/source/drivers/ado/ADriver.cxx
@@ -93,14 +93,14 @@ void ODriver::disposing()
 //------------------------------------------------------------------------------
 rtl::OUString ODriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return rtl::OUString::createFromAscii("com.sun.star.comp.sdbc.ado.ODriver");
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdbc.ado.ODriver"));
 }
 //------------------------------------------------------------------------------
 Sequence< ::rtl::OUString > ODriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aSNS( 2 );
-    aSNS[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.Driver");
-    aSNS[1] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Driver");
+    aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver"));
+    aSNS[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Driver"));
     return aSNS;
 }
 //------------------------------------------------------------------
@@ -150,7 +150,7 @@ Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url,
 sal_Bool SAL_CALL ODriver::acceptsURL( const ::rtl::OUString& url )
         throw(SQLException, RuntimeException)
 {
-    return (!url.compareTo(::rtl::OUString::createFromAscii("sdbc:ado:"),9));
+    return (!url.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:ado:")),9));
 }
 // -----------------------------------------------------------------------------
 void ODriver::impl_checkURL_throw(const ::rtl::OUString& _sUrl)
diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx
index 8c38fe014c58..b31d882244ba 100644
--- a/connectivity/source/drivers/ado/AKeys.cxx
+++ b/connectivity/source/drivers/ado/AKeys.cxx
@@ -88,7 +88,7 @@ sdbcx::ObjectType OKeys::appendObject( const ::rtl::OUString&, const Reference<
     WpADOKey aKey = pKey->getImpl();
     ::rtl::OUString sName = aKey.get_Name();
     if(!sName.getLength())
-        aKey.put_Name(::rtl::OUString::createFromAscii("PrimaryKey") );
+        aKey.put_Name(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrimaryKey")) );
 
     ADOKeys* pKeys = m_aCollection;
     if ( FAILED(pKeys->Append(OLEVariant((ADOKey*)aKey),
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 433ed279ba2e..4de9be871260 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -78,7 +78,7 @@ OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OTypeInf
     {   // special handling for parameters
         /* we recusive replace all occurences of ? in the statement and replace them with name like "æ¬å" */
         sal_Int32 nParameterCount = 0;
-        ::rtl::OUString sDefaultName = ::rtl::OUString::createFromAscii("parame");
+        ::rtl::OUString sDefaultName( RTL_CONSTASCII_USTRINGPARAM( "parame" ));
         replaceParameterNodeName(pNode,sDefaultName,nParameterCount);
         pNode->parseNodeToStr( sNewSql, _pConnection );
         delete pNode;
@@ -225,7 +225,7 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const DataTypeEn
     m_pParameters->get_Count(&nCount);
     if(nCount < (parameterIndex-1))
     {
-        ::rtl::OUString sDefaultName = ::rtl::OUString::createFromAscii("parame");
+        ::rtl::OUString sDefaultName( RTL_CONSTASCII_USTRINGPARAM( "parame" ));
         sDefaultName += ::rtl::OUString::valueOf(parameterIndex);
         ADOParameter* pParam = m_Command.CreateParameter(sDefaultName,_eType,adParamInput,_nSize,_Val);
         if(pParam)
@@ -548,7 +548,7 @@ void OPreparedStatement::replaceParameterNodeName(OSQLParseNode* _pNode,
         OSQLParseNode* pChildNode = _pNode->getChild(i);
         if(SQL_ISRULE(pChildNode,parameter) && pChildNode->count() == 1)
         {
-            OSQLParseNode* pNewNode = new OSQLParseNode(::rtl::OUString::createFromAscii(":") ,SQL_NODE_PUNCTUATION,0);
+            OSQLParseNode* pNewNode = new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":")) ,SQL_NODE_PUNCTUATION,0);
             delete pChildNode->replace(pChildNode->getChild(0),pNewNode);
             ::rtl::OUString sParameterName = _sDefaultName;
             sParameterName += ::rtl::OUString::valueOf(++_rParameterCount);
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index 169039ed6e2b..991b4c2cfb4e 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -65,14 +65,14 @@ using namespace com::sun::star::sdbc;
 //  IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.AResultSet","com.sun.star.sdbc.ResultSet");
 ::rtl::OUString SAL_CALL OResultSet::getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException)  \
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.ado.ResultSet");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ado.ResultSet"));
 }
 // -------------------------------------------------------------------------
 ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2);
-    aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.ResultSet");
-    aSupported[1] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.ResultSet");
+    aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ResultSet"));
+    aSupported[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ResultSet"));
     return aSupported;
 }
 // -------------------------------------------------------------------------
@@ -906,7 +906,7 @@ sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks(  ) throw(SQLException, Runtim
     ADOS::ThrowException(*((OConnection*)m_pStmt->getConnection().get())->getConnection(),*this);
     OSL_ENSURE(aProps.IsValid(),"There are no properties at the connection");
 
-    WpADOProperty aProp(aProps.GetItem(::rtl::OUString::createFromAscii("Bookmarks Ordered")));
+    WpADOProperty aProp(aProps.GetItem(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Bookmarks Ordered"))));
     OLEVariant aVar;
     if(aProp.IsValid())
         aVar = aProp.GetValue();
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index 04612e22d22f..22be6b07e888 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -365,7 +365,7 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch(  ) throw(SQLException,
     ::rtl::OUString aBatchSql;
     sal_Int32 nLen = 0;
     for(::std::list< ::rtl::OUString>::const_iterator i=m_aBatchList.begin();i != m_aBatchList.end();++i,++nLen)
-        aBatchSql = aBatchSql + *i + ::rtl::OUString::createFromAscii(";");
+        aBatchSql = aBatchSql + *i + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
 
 
     if ( m_RecordSet.IsValid() )
diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx
index c8ea5d87bfab..47b98aa23cbb 100644
--- a/connectivity/source/drivers/ado/Aolevariant.cxx
+++ b/connectivity/source/drivers/ado/Aolevariant.cxx
@@ -451,7 +451,7 @@ void OLEVariant::ChangeType(VARTYPE vartype, const OLEVariant* pSrc)
             throw ::com::sun::star::sdbc::SQLException(
                 sError,
                 NULL,
-                ::rtl::OUString::createFromAscii( "S1000" ),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "S1000" )),
                 1000,
                 ::com::sun::star::uno::Any()
             );
diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx
index 7d5aa5e22a59..4a0e6192cf71 100644
--- a/connectivity/source/drivers/ado/Aservices.cxx
+++ b/connectivity/source/drivers/ado/Aservices.cxx
@@ -61,10 +61,9 @@ void REGISTER_PROVIDER(
         const Sequence< OUString>& Services,
         const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
 {
-    OUString aMainKeyName;
-    aMainKeyName = OUString::createFromAscii("/");
+    OUString aMainKeyName(RTL_CONSTASCII_USTRINGPARAM("/"));
     aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString::createFromAscii("/UNO/SERVICES");
+    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
 
     Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
     OSL_ENSURE(xNewKey.is(), "ADO::component_writeInfo : could not create a registry key !");
@@ -86,7 +85,7 @@ struct ProviderRequest
         sal_Char const* pImplementationName
     )
     : xServiceManager(reinterpret_cast<XMultiServiceFactory*>(pServiceManager))
-    , sImplementationName(OUString::createFromAscii(pImplementationName))
+    , sImplementationName(OUString(RTL_CONSTASCII_USTRINGPARAM(pImplementationName)))
     {
     }
 
diff --git a/connectivity/source/drivers/ado/Awrapado.cxx b/connectivity/source/drivers/ado/Awrapado.cxx
index bc9bb2948608..fa8dc5739029 100644
--- a/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/connectivity/source/drivers/ado/Awrapado.cxx
@@ -2006,7 +2006,7 @@ ADORecordset* WpADOConnection::getTables( const ::com::sun::star::uno::Any& cata
 
     ++nPos;
     ::rtl::OUStringBuffer aTypes;
-    ::rtl::OUString aComma = ::rtl::OUString::createFromAscii(",");
+    ::rtl::OUString aComma( RTL_CONSTASCII_USTRINGPARAM( "," ));
     const ::rtl::OUString* pIter = types.getConstArray();
     const ::rtl::OUString* pEnd = pIter + types.getLength();
     for( ; pIter != pEnd ; ++pIter)
diff --git a/connectivity/source/drivers/calc/CCatalog.cxx b/connectivity/source/drivers/calc/CCatalog.cxx
index fd0f903b5705..96345a020f30 100644
--- a/connectivity/source/drivers/calc/CCatalog.cxx
+++ b/connectivity/source/drivers/calc/CCatalog.cxx
@@ -58,7 +58,7 @@ void OCalcCatalog::refreshTables()
     Sequence< ::rtl::OUString > aTypes;
     OCalcConnection::ODocHolder aDocHodler(((OCalcConnection*)m_pConnection));
     Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
-        ::rtl::OUString::createFromAscii("%"),::rtl::OUString::createFromAscii("%"),aTypes);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),aTypes);
 
     if(xResult.is())
     {
diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx
index 7056a07e7488..6b148ffeac98 100644
--- a/connectivity/source/drivers/calc/CConnection.cxx
+++ b/connectivity/source/drivers/calc/CConnection.cxx
@@ -124,21 +124,21 @@ Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc()
     }
     //  open read-only as long as updating isn't implemented
     Sequence<PropertyValue> aArgs(2);
-    aArgs[0].Name = ::rtl::OUString::createFromAscii("Hidden");
+    aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Hidden"));
     aArgs[0].Value <<= (sal_Bool) sal_True;
-    aArgs[1].Name = ::rtl::OUString::createFromAscii("ReadOnly");
+    aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
     aArgs[1].Value <<= (sal_Bool) sal_True;
 
     if ( m_sPassword.getLength() )
     {
         const sal_Int32 nPos = aArgs.getLength();
         aArgs.realloc(nPos+1);
-        aArgs[nPos].Name = ::rtl::OUString::createFromAscii("Password");
+        aArgs[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Password"));
         aArgs[nPos].Value <<= m_sPassword;
     }
 
     Reference< XComponentLoader > xDesktop( getDriver()->getFactory()->createInstance(
-                    ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")), UNO_QUERY );
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"))), UNO_QUERY );
     if (!xDesktop.is())
     {
         OSL_ASSERT("no desktop");
@@ -149,7 +149,7 @@ Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc()
     try
     {
         xComponent = xDesktop->loadComponentFromURL(
-            m_aFileName, ::rtl::OUString::createFromAscii("_blank"), 0, aArgs );
+            m_aFileName, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_blank")), 0, aArgs );
     }
     catch( const Exception& )
     {
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index 272ef85822cf..ca361392498d 100644
--- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
@@ -92,7 +92,7 @@ Reference< XResultSet > OCalcDatabaseMetaData::impl_getTypeInfo_throw(  )
         aRow.reserve(18);
 
         aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(new ORowSetValueDecorator(::rtl::OUString::createFromAscii("VARCHAR")));
+        aRow.push_back(new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"))));
         aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR));
         aRow.push_back(new ORowSetValueDecorator((sal_Int32)65535));
         aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
@@ -114,35 +114,35 @@ Reference< XResultSet > OCalcDatabaseMetaData::impl_getTypeInfo_throw(  )
 
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("DECIMAL"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DECIMAL")));
         aRow[2] = new ORowSetValueDecorator(DataType::DECIMAL);
         aRow[3] = ODatabaseMetaDataResultSet::get0Value();
         aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
         aRow[15] = ODatabaseMetaDataResultSet::get0Value();
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("BOOL"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BOOL")));
         aRow[2] = new ORowSetValueDecorator(DataType::BIT);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)20);
         aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
         aRow[15] = new ORowSetValueDecorator((sal_Int32)15);
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("DATE"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATE")));
         aRow[2] = new ORowSetValueDecorator(DataType::DATE);
         aRow[3] = ODatabaseMetaDataResultSet::get0Value();
         aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
         aRow[15] = ODatabaseMetaDataResultSet::get0Value();
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("TIME"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIME")));
         aRow[2] = new ORowSetValueDecorator(DataType::TIME);
         aRow[3] = ODatabaseMetaDataResultSet::get0Value();
         aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
         aRow[15] = ODatabaseMetaDataResultSet::get0Value();
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("TIMESTAMP"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP")));
         aRow[2] = new ORowSetValueDecorator(DataType::TIMESTAMP);
         aRow[3] = ODatabaseMetaDataResultSet::get0Value();
         aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
@@ -231,10 +231,10 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns(
                     switch(sal_Int32(aRow[11]->getValue()))
                     {
                     case ColumnValue::NO_NULLS:
-                        aRow[18]  = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("NO"));
+                        aRow[18]  = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO")));
                         break;
                     case ColumnValue::NULLABLE:
-                        aRow[18]  = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("YES"));
+                        aRow[18]  = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YES")));
                         break;
                     default:
                         aRow[18]  = new ORowSetValueDecorator(::rtl::OUString());
@@ -310,7 +310,7 @@ sal_Bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, const ::r
         if (xProp.is())
         {
             sal_Bool bVisible = sal_Bool();
-            Any aVisAny = xProp->getPropertyValue( ::rtl::OUString::createFromAscii("IsVisible") );
+            Any aVisAny = xProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsVisible")) );
             if ( aVisAny >>= bVisible )
                 if (!bVisible)
                     return sal_True;                // hidden
@@ -353,7 +353,7 @@ sal_Bool lcl_IsUnnamed( const Reference<XDatabaseRanges>& xRanges, const ::rtl::
         {
             try
             {
-                Any aUserAny = xRangeProp->getPropertyValue( ::rtl::OUString::createFromAscii("IsUserDefined") );
+                Any aUserAny = xRangeProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsUserDefined")) );
                 sal_Bool bUserDefined = sal_Bool();
                 if ( aUserAny >>= bUserDefined )
                     bUnnamed = !bUserDefined;
@@ -384,7 +384,7 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables(
     // check if ORowSetValue type is given
     // when no types are given then we have to return all tables e.g. TABLE
 
-    ::rtl::OUString aTable(::rtl::OUString::createFromAscii("TABLE"));
+    ::rtl::OUString aTable(RTL_CONSTASCII_USTRINGPARAM("TABLE"));
 
     sal_Bool bTableFound = sal_True;
     sal_Int32 nLength = types.getLength();
@@ -438,7 +438,7 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables(
     Reference<XPropertySet> xDocProp( xDoc, UNO_QUERY );
     if ( xDocProp.is() )
     {
-        Any aRangesAny = xDocProp->getPropertyValue( ::rtl::OUString::createFromAscii("DatabaseRanges") );
+        Any aRangesAny = xDocProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DatabaseRanges")) );
         Reference<XDatabaseRanges> xRanges;
         if ( aRangesAny >>= xRanges )
         {
diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx
index 5861836e322e..ecfd79a736c1 100644
--- a/connectivity/source/drivers/calc/CDriver.cxx
+++ b/connectivity/source/drivers/calc/CDriver.cxx
@@ -49,7 +49,7 @@ using namespace ::com::sun::star::lang;
 
 rtl::OUString ODriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return rtl::OUString::createFromAscii("com.sun.star.comp.sdbc.calc.ODriver");
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdbc.calc.ODriver"));
 }
 
 ::rtl::OUString SAL_CALL ODriver::getImplementationName(  ) throw(RuntimeException)
@@ -89,7 +89,7 @@ Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url,
 sal_Bool SAL_CALL ODriver::acceptsURL( const ::rtl::OUString& url )
                 throw(SQLException, RuntimeException)
 {
-    return url.compareTo(::rtl::OUString::createFromAscii("sdbc:calc:"),10) == 0;
+    return url.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:calc:")),10) == 0;
 }
 
 Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/calc/CResultSet.cxx b/connectivity/source/drivers/calc/CResultSet.cxx
index 3b73d3d02c7c..5357c5fd015f 100644
--- a/connectivity/source/drivers/calc/CResultSet.cxx
+++ b/connectivity/source/drivers/calc/CResultSet.cxx
@@ -56,14 +56,14 @@ OCalcResultSet::OCalcResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTr
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OCalcResultSet::getImplementationName(  ) throw ( RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.calc.ResultSet");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.calc.ResultSet"));
 }
 // -------------------------------------------------------------------------
 Sequence< ::rtl::OUString > SAL_CALL OCalcResultSet::getSupportedServiceNames(  ) throw( RuntimeException)
 {
      Sequence< ::rtl::OUString > aSupported(2);
-    aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.ResultSet");
-    aSupported[1] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.ResultSet");
+    aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ResultSet"));
+    aSupported[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ResultSet"));
     return aSupported;
 }
 // -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index 018eb4d2dfaa..d6d3122862dd 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -494,19 +494,19 @@ void OCalcTable::fillColumns()
                 }
                 break;
             case DataType::DECIMAL:
-                aTypeName = ::rtl::OUString::createFromAscii("DECIMAL");
+                aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DECIMAL"));
                 break;
             case DataType::BIT:
-                aTypeName = ::rtl::OUString::createFromAscii("BOOL");
+                aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BOOL"));
                 break;
             case DataType::DATE:
-                aTypeName = ::rtl::OUString::createFromAscii("DATE");
+                aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATE"));
                 break;
             case DataType::TIME:
-                aTypeName = ::rtl::OUString::createFromAscii("TIME");
+                aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIME"));
                 break;
             case DataType::TIMESTAMP:
-                aTypeName = ::rtl::OUString::createFromAscii("TIMESTAMP");
+                aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP"));
                 break;
             default:
                 OSL_ASSERT("missing type name");
diff --git a/connectivity/source/drivers/calc/CTables.cxx b/connectivity/source/drivers/calc/CTables.cxx
index df39fb7698db..edc9bc1bdd8c 100644
--- a/connectivity/source/drivers/calc/CTables.cxx
+++ b/connectivity/source/drivers/calc/CTables.cxx
@@ -52,7 +52,7 @@ sdbcx::ObjectType OCalcTables::createObject(const ::rtl::OUString& _rName)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTables::createObject" );
     OCalcTable* pTable = new OCalcTable(this,(OCalcConnection*)static_cast<OFileCatalog&>(m_rParent).getConnection(),
-                                        _rName,::rtl::OUString::createFromAscii("TABLE"));
+                                        _rName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE")));
     sdbcx::ObjectType xRet = pTable;
     pTable->construct();
     return xRet;
diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx
index cf99d4b4654e..8dd5a5a9029e 100644
--- a/connectivity/source/drivers/calc/Cservices.cxx
+++ b/connectivity/source/drivers/calc/Cservices.cxx
@@ -62,9 +62,9 @@ void REGISTER_PROVIDER(
         const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
 {
     OUString aMainKeyName;
-    aMainKeyName = OUString::createFromAscii("/");
+    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString::createFromAscii("/UNO/SERVICES");
+    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
 
     Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
     OSL_ENSURE(xNewKey.is(), "FILE::component_writeInfo : could not create a registry key !");
diff --git a/connectivity/source/drivers/dbase/DCatalog.cxx b/connectivity/source/drivers/dbase/DCatalog.cxx
index b0007da28a62..4d524103e7e3 100644
--- a/connectivity/source/drivers/dbase/DCatalog.cxx
+++ b/connectivity/source/drivers/dbase/DCatalog.cxx
@@ -54,7 +54,7 @@ void ODbaseCatalog::refreshTables()
     TStringVector aVector;
     Sequence< ::rtl::OUString > aTypes;
     Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
-        ::rtl::OUString::createFromAscii("%"),::rtl::OUString::createFromAscii("%"),aTypes);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),aTypes);
 
     if(xResult.is())
     {
diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index 74c053b66f8d..d1710f90dd6f 100644
--- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
@@ -83,12 +83,12 @@ Reference< XResultSet > ODbaseDatabaseMetaData::impl_getTypeInfo_throw(  )
         aRow.reserve(18);
 
         aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(new ORowSetValueDecorator(::rtl::OUString::createFromAscii("VARCHAR")));
+        aRow.push_back(new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"))));
         aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR));
         aRow.push_back(new ORowSetValueDecorator((sal_Int32)254));
         aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
         aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
-        aRow.push_back(new ORowSetValueDecorator(::rtl::OUString::createFromAscii("length")));
+        aRow.push_back(new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("length"))));
         aRow.push_back(new ORowSetValueDecorator((sal_Int32)ColumnValue::NULLABLE));
         aRow.push_back(ODatabaseMetaDataResultSet::get1Value());
         aRow.push_back(new ORowSetValueDecorator((sal_Int32)ColumnSearch::FULL));
@@ -104,20 +104,20 @@ Reference< XResultSet > ODbaseDatabaseMetaData::impl_getTypeInfo_throw(  )
 
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("LONGVARCHAR"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LONGVARCHAR")));
         aRow[2] = new ORowSetValueDecorator(DataType::LONGVARCHAR);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)2147483647);
         aRow[6] = new ORowSetValueDecorator();
         aRow[13] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("M")));
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("DATE"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATE")));
         aRow[2] = new ORowSetValueDecorator(DataType::DATE);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)10);
         aRow[13] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("D")));
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("BOOLEAN"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BOOLEAN")));
         aRow[2] = new ORowSetValueDecorator(DataType::BIT);
         aRow[3] = ODatabaseMetaDataResultSet::get1Value();
         aRow[4] = ODatabaseMetaDataResultSet::getEmptyValue();
@@ -127,36 +127,36 @@ Reference< XResultSet > ODbaseDatabaseMetaData::impl_getTypeInfo_throw(  )
         aRow[13] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("L")));
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("DOUBLE"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DOUBLE")));
         aRow[2] = new ORowSetValueDecorator(DataType::DOUBLE);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)8);
         aRow[13] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("B")));
         aRows.push_back(aRow);
 
         aRow[11] = new ORowSetValueDecorator(sal_True);
-        aRow[13] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("Y"));
+        aRow[13] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Y")));
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("TIMESTAMP"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP")));
         aRow[2] = new ORowSetValueDecorator(DataType::TIMESTAMP);
         aRow[11] = new ORowSetValueDecorator(sal_False);
         aRow[13] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("T")));
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("INTEGER"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INTEGER")));
         aRow[2] = new ORowSetValueDecorator(DataType::INTEGER);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)10);
         aRow[13] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("I")));
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("DECIMAL"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DECIMAL")));
         aRow[2] = new ORowSetValueDecorator(DataType::DECIMAL);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)20);
-        aRow[6] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("length,scale"));
+        aRow[6] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("length,scale")));
         aRow[13] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("F")));
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("NUMERIC"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NUMERIC")));
         aRow[2] = new ORowSetValueDecorator(DataType::DECIMAL);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)16);
         aRow[13] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("N")));
@@ -239,10 +239,10 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns(
                     switch(sal_Int32(aRow[11]->getValue()))
                     {
                     case ColumnValue::NO_NULLS:
-                        aRow[18] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("NO"));
+                        aRow[18] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO")));
                         break;
                     case ColumnValue::NULLABLE:
-                        aRow[18] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("YES"));
+                        aRow[18] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YES")));
                         break;
                     default:
                         aRow[18] = new ORowSetValueDecorator(::rtl::OUString());
@@ -278,7 +278,7 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo(
     ODatabaseMetaDataResultSet::ORow aRow(14);
 
     aRow[5]     = new ORowSetValueDecorator(::rtl::OUString());
-    aRow[10]    = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("A"));
+    aRow[10]    = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("A")));
 
     Reference< XIndexesSupplier> xTable;
     ::cppu::extractInterface(xTable,xNames->getByName(table));
@@ -391,7 +391,7 @@ sal_Bool SAL_CALL ODbaseDatabaseMetaData::isReadOnly(  ) throw(SQLException, Run
     ::osl::MutexGuard aGuard( m_aMutex );
 
     sal_Bool bReadOnly = sal_False;
-    static ::rtl::OUString sReadOnly = ::rtl::OUString::createFromAscii("IsReadOnly");
+    static ::rtl::OUString sReadOnly( RTL_CONSTASCII_USTRINGPARAM( "IsReadOnly" ));
     ::ucbhelper::Content aFile(m_pConnection->getContent(),Reference< XCommandEnvironment >());
     aFile.getPropertyValue(sReadOnly) >>= bReadOnly;
 
diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx
index 76c573a509a3..56f62e6c2325 100644
--- a/connectivity/source/drivers/dbase/DDriver.cxx
+++ b/connectivity/source/drivers/dbase/DDriver.cxx
@@ -47,7 +47,7 @@ using namespace ::com::sun::star::lang;
 //------------------------------------------------------------------------------
 rtl::OUString ODriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return rtl::OUString::createFromAscii("com.sun.star.comp.sdbc.dbase.ODriver");
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdbc.dbase.ODriver"));
 }
 
 //------------------------------------------------------------------
@@ -81,7 +81,7 @@ Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url,
 // --------------------------------------------------------------------------------
 sal_Bool SAL_CALL ODriver::acceptsURL( const ::rtl::OUString& url ) throw(SQLException, RuntimeException)
 {
-    return !url.compareTo(::rtl::OUString::createFromAscii("sdbc:dbase:"),11);
+    return !url.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:dbase:")),11);
 }
 // -----------------------------------------------------------------------------
 Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 1b205f08ef70..20f079369ff2 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -380,7 +380,7 @@ SvStream& connectivity::dbase::operator << (SvStream &rStream, ODbaseIndex& rInd
     ::rtl::OUString sDir = m_pTable->getConnection()->getURL();
     sDir += OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER);
     sDir += m_Name;
-    sDir += ::rtl::OUString::createFromAscii(".ndx");
+    sDir += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".ndx"));
     return sDir;
 }
 //------------------------------------------------------------------
@@ -393,7 +393,7 @@ void ODbaseIndex::createINFEntry()
     ::rtl::OUString sCfgFile(m_pTable->getConnection()->getURL());
     sCfgFile += OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER);
     sCfgFile += m_pTable->getName();
-    sCfgFile += ::rtl::OUString::createFromAscii(".inf");
+    sCfgFile += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".inf"));
 
     String sPhysicalPath;
     LocalFileHelper::ConvertURLToPhysicalName(sCfgFile,sPhysicalPath);
@@ -437,7 +437,7 @@ BOOL ODbaseIndex::DropImpl()
     ::rtl::OUString sCfgFile(m_pTable->getConnection()->getURL());
     sCfgFile += OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER);
     sCfgFile += m_pTable->getName();
-    sCfgFile += ::rtl::OUString::createFromAscii(".inf");
+    sCfgFile += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".inf"));
 
     String sPhysicalPath;
     String sNDX(sCfgFile);
diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx b/connectivity/source/drivers/dbase/DIndexes.cxx
index 53ba4b50b5d5..b65e2158aa43 100644
--- a/connectivity/source/drivers/dbase/DIndexes.cxx
+++ b/connectivity/source/drivers/dbase/DIndexes.cxx
@@ -55,7 +55,7 @@ sdbcx::ObjectType ODbaseIndexes::createObject(const ::rtl::OUString& _rName)
     ::rtl::OUString sFile = m_pTable->getConnection()->getURL();
     sFile += OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER);
     sFile += _rName;
-    sFile += ::rtl::OUString::createFromAscii(".ndx");
+    sFile += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".ndx"));
     if ( !UCBContentHelper::Exists(sFile) )
     {
         const ::rtl::OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution(
diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx
index c7489929d210..2d908607a324 100644
--- a/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/connectivity/source/drivers/dbase/DResultSet.cxx
@@ -59,14 +59,14 @@ ODbaseResultSet::ODbaseResultSet( OStatement_Base* pStmt,connectivity::OSQLParse
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL ODbaseResultSet::getImplementationName(  ) throw ( RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.dbase.ResultSet");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.dbase.ResultSet"));
 }
 // -------------------------------------------------------------------------
 Sequence< ::rtl::OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames(  ) throw( RuntimeException)
 {
      Sequence< ::rtl::OUString > aSupported(2);
-    aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.ResultSet");
-    aSupported[1] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.ResultSet");
+    aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ResultSet"));
+    aSupported[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ResultSet"));
     return aSupported;
 }
 // -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 8b5a375a28dc..d03e6fddc9a9 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -1041,7 +1041,7 @@ BOOL ODbaseTable::CreateImpl()
     {
         ::rtl::OUString aIdent = m_pConnection->getContent()->getIdentifier()->getContentIdentifier();
         if ( aIdent.lastIndexOf('/') != (aIdent.getLength()-1) )
-            aIdent += ::rtl::OUString::createFromAscii("/");
+            aIdent += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
         aIdent += m_Name;
         aName = aIdent.getStr();
     }
@@ -1080,7 +1080,7 @@ BOOL ODbaseTable::CreateImpl()
         try
         {
             Content aContent(aURL.GetMainURL(INetURLObject::NO_DECODE),Reference<XCommandEnvironment>());
-            aContent.executeCommand( rtl::OUString::createFromAscii( "delete" ),bool2any( sal_True ) );
+            aContent.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),bool2any( sal_True ) );
         }
         catch(Exception&) // an exception is thrown when no file exists
         {
@@ -1108,7 +1108,7 @@ BOOL ODbaseTable::CreateImpl()
             try
             {
                 Content aMemoContent(aURL.GetMainURL(INetURLObject::NO_DECODE),Reference<XCommandEnvironment>());
-                aMemoContent.executeCommand( rtl::OUString::createFromAscii( "delete" ),bool2any( sal_True ) );
+                aMemoContent.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),bool2any( sal_True ) );
             }
             catch(const Exception&)
             {
@@ -1124,7 +1124,7 @@ BOOL ODbaseTable::CreateImpl()
         {
             aURL.setExtension(aExt);      // kill dbf file
             Content aMemoContent(aURL.GetMainURL(INetURLObject::NO_DECODE),Reference<XCommandEnvironment>());
-            aMemoContent.executeCommand( rtl::OUString::createFromAscii( "delete" ),bool2any( sal_True ) );
+            aMemoContent.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),bool2any( sal_True ) );
             return sal_False;
         }
         m_aHeader.db_typ = dBaseIIIMemo;
@@ -1475,7 +1475,7 @@ BOOL ODbaseTable::Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFie
             try
             {
                 ::ucbhelper::Content aDeleteContent( aURL.GetMainURL( INetURLObject::NO_DECODE ), Reference< XCommandEnvironment > () );
-                aDeleteContent.executeCommand( ::rtl::OUString::createFromAscii( "delete" ), makeAny( sal_Bool( sal_True ) ) );
+                aDeleteContent.executeCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), makeAny( sal_Bool( sal_True ) ) );
             }
             catch(Exception&)
             {
@@ -2319,7 +2319,7 @@ namespace
         {
             ::rtl::OUString aIdent = _pConenction->getContent()->getIdentifier()->getContentIdentifier();
             if ( aIdent.lastIndexOf('/') != (aIdent.getLength()-1) )
-                aIdent += ::rtl::OUString::createFromAscii("/");
+                aIdent += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
             aIdent += oldName;
             aName = aIdent;
         }
@@ -2336,11 +2336,11 @@ namespace
             Content aContent(aURL.GetMainURL(INetURLObject::NO_DECODE),Reference<XCommandEnvironment>());
 
             Sequence< PropertyValue > aProps( 1 );
-            aProps[0].Name      = ::rtl::OUString::createFromAscii("Title");
+            aProps[0].Name      = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
             aProps[0].Handle    = -1; // n/a
             aProps[0].Value     = makeAny( ::rtl::OUString(sNewName) );
             Sequence< Any > aValues;
-            aContent.executeCommand( rtl::OUString::createFromAscii( "setPropertyValues" ),makeAny(aProps) ) >>= aValues;
+            aContent.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setPropertyValues")),makeAny(aProps) ) >>= aValues;
             if(aValues.getLength() && aValues[0].hasValue())
                 throw Exception();
         }
@@ -2501,7 +2501,7 @@ String ODbaseTable::createTempFile()
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::createTempFile" );
     ::rtl::OUString aIdent = m_pConnection->getContent()->getIdentifier()->getContentIdentifier();
     if ( aIdent.lastIndexOf('/') != (aIdent.getLength()-1) )
-        aIdent += ::rtl::OUString::createFromAscii("/");
+        aIdent += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     String sTempName(aIdent);
     String sExt;
     sExt.AssignAscii(".");
diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx
index 17bcf3b27ba4..ed811f9900b4 100644
--- a/connectivity/source/drivers/dbase/DTables.cxx
+++ b/connectivity/source/drivers/dbase/DTables.cxx
@@ -59,7 +59,7 @@ sdbcx::ObjectType ODbaseTables::createObject(const ::rtl::OUString& _rName)
 {
     ::rtl::OUString aName,aSchema;
     ODbaseTable* pRet = new ODbaseTable(this,(ODbaseConnection*)static_cast<OFileCatalog&>(m_rParent).getConnection(),
-                                        _rName,::rtl::OUString::createFromAscii("TABLE"));
+                                        _rName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE")));
 
     sdbcx::ObjectType xRet = pRet;
     pRet->construct();
diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx
index c576aa4b46f6..f573f895b6cd 100644
--- a/connectivity/source/drivers/dbase/Dservices.cxx
+++ b/connectivity/source/drivers/dbase/Dservices.cxx
@@ -62,9 +62,9 @@ void REGISTER_PROVIDER(
         const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
 {
     OUString aMainKeyName;
-    aMainKeyName = OUString::createFromAscii("/");
+    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString::createFromAscii("/UNO/SERVICES");
+    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
 
     Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
     OSL_ENSURE(xNewKey.is(), "FILE::component_writeInfo : could not create a registry key !");
diff --git a/connectivity/source/drivers/evoab/LCatalog.cxx b/connectivity/source/drivers/evoab/LCatalog.cxx
index 948416bda4d7..25e06e2b90c0 100644
--- a/connectivity/source/drivers/evoab/LCatalog.cxx
+++ b/connectivity/source/drivers/evoab/LCatalog.cxx
@@ -54,7 +54,7 @@ void OEvoabCatalog::refreshTables()
     TStringVector aVector;
     Sequence< ::rtl::OUString > aTypes;
     Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
-        ::rtl::OUString::createFromAscii("%"),::rtl::OUString::createFromAscii("%"),aTypes);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),aTypes);
 
     if(xResult.is())
     {
diff --git a/connectivity/source/drivers/evoab/LColumnAlias.cxx b/connectivity/source/drivers/evoab/LColumnAlias.cxx
index 320d42e65a8e..7d005bbf5fbe 100644
--- a/connectivity/source/drivers/evoab/LColumnAlias.cxx
+++ b/connectivity/source/drivers/evoab/LColumnAlias.cxx
@@ -43,39 +43,39 @@ using namespace ::com::sun::star::container;
 
 static const ::rtl::OUString sProgrammaticNames[] =
 {
-    ::rtl::OUString::createFromAscii("FirstName"),
-    ::rtl::OUString::createFromAscii("LastName"),
-    ::rtl::OUString::createFromAscii("DisplayName"),
-    ::rtl::OUString::createFromAscii("NickName"),
-    ::rtl::OUString::createFromAscii("PrimaryEmail"),
-    ::rtl::OUString::createFromAscii("SecondEmail"),
-    ::rtl::OUString::createFromAscii("PreferMailFormat"),
-    ::rtl::OUString::createFromAscii("WorkPhone"),
-    ::rtl::OUString::createFromAscii("HomePhone"),
-    ::rtl::OUString::createFromAscii("FaxNumber"),
-    ::rtl::OUString::createFromAscii("PagerNumber"),
-    ::rtl::OUString::createFromAscii("CellularNumber"),
-    ::rtl::OUString::createFromAscii("HomeAddress"),
-    ::rtl::OUString::createFromAscii("HomeAddress2"),
-    ::rtl::OUString::createFromAscii("HomeCity"),
-    ::rtl::OUString::createFromAscii("HomeState"),
-    ::rtl::OUString::createFromAscii("HomeZipCode"),
-    ::rtl::OUString::createFromAscii("HomeCountry"),
-    ::rtl::OUString::createFromAscii("WorkAddress"),
-    ::rtl::OUString::createFromAscii("WorkAddress2"),
-    ::rtl::OUString::createFromAscii("WorkCity"),
-    ::rtl::OUString::createFromAscii("WorkState"),
-    ::rtl::OUString::createFromAscii("WorkZipCode"),
-    ::rtl::OUString::createFromAscii("WorkCountry"),
-    ::rtl::OUString::createFromAscii("JobTitle"),
-    ::rtl::OUString::createFromAscii("Department"),
-    ::rtl::OUString::createFromAscii("Company"),
-    ::rtl::OUString::createFromAscii("WebPage1"),
-    ::rtl::OUString::createFromAscii("WebPage2"),
-    ::rtl::OUString::createFromAscii("BirthYear"),
-    ::rtl::OUString::createFromAscii("BirthMonth"),
-    ::rtl::OUString::createFromAscii("BirthDay"),
-    ::rtl::OUString::createFromAscii("Notes")
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstName")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LastName")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayName")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NickName")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrimaryEmail")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SecondEmail")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PreferMailFormat")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WorkPhone")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HomePhone")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FaxNumber")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PagerNumber")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellularNumber")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HomeAddress")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HomeAddress2")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HomeCity")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HomeState")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HomeZipCode")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HomeCountry")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WorkAddress")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WorkAddress2")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WorkCity")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WorkState")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WorkZipCode")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WorkCountry")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JobTitle")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Department")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Company")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WebPage1")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WebPage2")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BirthYear")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BirthMonth")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BirthDay")),
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Notes"))
 };
 //------------------------------------------------------------------------------
 OColumnAlias::OColumnAlias()
@@ -113,7 +113,7 @@ void OColumnAlias::setAlias(const ::com::sun::star::uno::Reference<
         // the config path for our own driver's settings
     Reference< XPropertySet > xEvoDriverNode = createDriverConfigNode( _rxORB, OEvoabDriver::getImplementationName_Static() );
     //Reference< XPropertySet > xMozDriverNode = createDriverConfigNode( _rxORB, mozab::OConnection::getDriverImplementationName() );
-    Reference< XPropertySet > xMozDriverNode = createDriverConfigNode( _rxORB, ::rtl::OUString::createFromAscii ("com.sun.star.comp.sdbc.MozabDriver") );
+    Reference< XPropertySet > xMozDriverNode = createDriverConfigNode( _rxORB, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.comp.sdbc.MozabDriver")) );
     if ( xEvoDriverNode.is() && xMozDriverNode.is() )
     {
         try
@@ -121,8 +121,8 @@ void OColumnAlias::setAlias(const ::com::sun::star::uno::Reference<
             //=============================================================
             Reference< XNameAccess > xEvoAliasesNode;
             Reference< XNameAccess > xMozAliasesNode;
-            xEvoDriverNode->getPropertyValue( ::rtl::OUString::createFromAscii("ColumnAliases") ) >>= xEvoAliasesNode;
-            xMozDriverNode->getPropertyValue( ::rtl::OUString::createFromAscii("ColumnAliases") ) >>= xMozAliasesNode;
+            xEvoDriverNode->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ColumnAliases")) ) >>= xEvoAliasesNode;
+            xMozDriverNode->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ColumnAliases")) ) >>= xMozAliasesNode;
             OSL_ENSURE( xEvoAliasesNode.is(), "OColumnAlias::setAlias: missing the evolution aliases node!" );
             OSL_ENSURE( xMozAliasesNode.is(), "OColumnAlias::setAlias: missing the mozilla aliases node!" );
 
diff --git a/connectivity/source/drivers/evoab/LConfigAccess.cxx b/connectivity/source/drivers/evoab/LConfigAccess.cxx
index ed8b358db1df..2181de964ac4 100644
--- a/connectivity/source/drivers/evoab/LConfigAccess.cxx
+++ b/connectivity/source/drivers/evoab/LConfigAccess.cxx
@@ -52,17 +52,17 @@ namespace connectivity
                 //=============================================================
                 // create the config provider
                 Reference< XMultiServiceFactory > xConfigProvider(
-                    _rxORB->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.configuration.ConfigurationProvider" ) ),
+                    _rxORB->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider")) ),
                     UNO_QUERY
                 );
                 OSL_ENSURE( xConfigProvider.is(), "createDriverConfigNode: could not create the config provider!" );
 
                 if ( xConfigProvider.is() )
                 {
-                    ::rtl::OUString sCompleteNodePath = ::rtl::OUString::createFromAscii ("/org.openoffice.Office.DataAccess/DriverSettings/" );
+                    ::rtl::OUString sCompleteNodePath(RTL_CONSTASCII_USTRINGPARAM ("/org.openoffice.Office.DataAccess/DriverSettings/" ));
                     sCompleteNodePath += _sDriverImplementationName;
                     //sCompleteNodePath += OEvoabConnection::getDriverImplementationName();
-                    //sCompleteNodePath += ::rtl::OUString::createFromAscii ("com.sun.star.comp.sdbc.MozabDriver");
+                    //sCompleteNodePath += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.comp.sdbc.MozabDriver"));
                     EVO_TRACE_STRING("createDriverConfigNode()::sCompleteNodePath = %s\n", sCompleteNodePath );
 
                     //=========================================================
@@ -70,14 +70,14 @@ namespace connectivity
                     Sequence< Any > aArguments(2);
                     // the path to the node to open
                     aArguments[0] <<= PropertyValue(
-                        ::rtl::OUString::createFromAscii( "nodepath"),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")),
                         0,
                         makeAny( sCompleteNodePath ),
                         PropertyState_DIRECT_VALUE
                     );
                     // the depth: -1 means unlimited
                     aArguments[1] <<= PropertyValue(
-                        ::rtl::OUString::createFromAscii( "depth"),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("depth")),
                         0,
                         makeAny( (sal_Int32)-1 ),
                         PropertyState_DIRECT_VALUE
@@ -86,7 +86,7 @@ namespace connectivity
                     //=========================================================
                     // create the access
                     Reference< XInterface > xAccess = xConfigProvider->createInstanceWithArguments(
-                        ::rtl::OUString::createFromAscii( "com.sun.star.configuration.ConfigurationAccess" ),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")),
                         aArguments
                     );
                     OSL_ENSURE( xAccess.is(), "createDriverConfigNode: invalid access returned (should throw an exception instead)!" );
@@ -142,10 +142,10 @@ namespace connectivity
                     Reference< XPropertySet > xDriverNode = createDriverConfigNode( _rxORB, OEvoabDriver::getImplementationName_Static() );
                     Reference< XPropertySet > xEvoPrefsNode;
                     if ( xDriverNode.is() )
-                        xDriverNode->getPropertyValue( ::rtl::OUString::createFromAscii( "EvolutionPreferences" ) ) >>= xEvoPrefsNode;
+                        xDriverNode->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EvolutionPreferences")) ) >>= xEvoPrefsNode;
                     OSL_ENSURE( xEvoPrefsNode.is(), "getFullPathExportingCommand: could not access the node for the evolution preferences!" );
                     if ( xEvoPrefsNode.is() )
-                        xEvoPrefsNode->getPropertyValue( ::rtl::OUString::createFromAscii( "FullPathExportingCommand" ) ) >>= sFullPathExportingCommand;
+                        xEvoPrefsNode->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FullPathExportingCommand")) ) >>= sFullPathExportingCommand;
                 }
                 catch( const Exception& )
                 {
diff --git a/connectivity/source/drivers/evoab/LConnection.cxx b/connectivity/source/drivers/evoab/LConnection.cxx
index cc0d8b9639a3..725f24ff2236 100644
--- a/connectivity/source/drivers/evoab/LConnection.cxx
+++ b/connectivity/source/drivers/evoab/LConnection.cxx
@@ -63,12 +63,12 @@ using namespace ::com::sun::star::lang;
 {
      ::rtl::OUString aExceptionType = aExceptionType_;
      if( aExceptionType.getLength() == 0 )
-         aExceptionType = ::rtl::OUString( ::rtl::OUString::createFromAscii("Unknown" ) );
+         aExceptionType = ::rtl::OUString( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown")) );
 
-     ::rtl::OUString aTypeLine( ::rtl::OUString::createFromAscii("\nType: " ) );
+     ::rtl::OUString aTypeLine( RTL_CONSTASCII_USTRINGPARAM("\nType: ") );
      aTypeLine += aExceptionType;
 
-     ::rtl::OUString aMessageLine( ::rtl::OUString::createFromAscii("\nMessage: " ) );
+     ::rtl::OUString aMessageLine( RTL_CONSTASCII_USTRINGPARAM("\nMessage: ") );
          aMessageLine += ::rtl::OUString( e.Message );
 
      ::rtl::OUString aMsg(aTypeLine);
@@ -138,23 +138,23 @@ void OEvoabConnection::construct(const ::rtl::OUString& url,const Sequence< Prop
     {
         OSL_TRACE("Error at execute evolution-addressbook-export to get VCards");
         ::dbtools::throwGenericSQLException(
-                ::rtl::OUString::createFromAscii("Error at execute evolution-addressbook-export to get VCards"),NULL);
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Error at execute evolution-addressbook-export to get VCards")),NULL);
     }
 
     Sequence<PropertyValue> aDriverParam;
     ::std::vector<PropertyValue> aParam;
 
-    aParam.push_back(PropertyValue(::rtl::OUString::createFromAscii("EnableSQL92Check"), 0, Any(), PropertyState_DIRECT_VALUE));
+    aParam.push_back(PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EnableSQL92Check")), 0, Any(), PropertyState_DIRECT_VALUE));
      ::dbtools::OCharsetMap aLookupIanaName;
      ::dbtools::OCharsetMap::const_iterator aLookup = aLookupIanaName.find(RTL_TEXTENCODING_UTF8);
-     aParam.push_back(PropertyValue(::rtl::OUString::createFromAscii("CharSet"), 0,
+     aParam.push_back(PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharSet")), 0,
                                     makeAny((*aLookup).getIanaName()), PropertyState_DIRECT_VALUE));
-    aParam.push_back(PropertyValue(::rtl::OUString::createFromAscii("Extension"), 0, makeAny(getDriver()->getFileExt()), PropertyState_DIRECT_VALUE));
-    aParam.push_back(PropertyValue(::rtl::OUString::createFromAscii("HeaderLine"), 0, makeAny(m_bHeaderLine), PropertyState_DIRECT_VALUE));
-    aParam.push_back(PropertyValue(::rtl::OUString::createFromAscii("FieldDelimiter"), 0, makeAny(::rtl::OUString(&m_cFieldDelimiter,1)), PropertyState_DIRECT_VALUE));
-    aParam.push_back(PropertyValue(::rtl::OUString::createFromAscii("StringDelimiter"), 0, makeAny(::rtl::OUString(&m_cStringDelimiter,1)), PropertyState_DIRECT_VALUE));
-    aParam.push_back(PropertyValue(::rtl::OUString::createFromAscii("DecimalDelimiter"), 0, makeAny(::rtl::OUString(&m_cDecimalDelimiter,1)), PropertyState_DIRECT_VALUE));
-    aParam.push_back(PropertyValue(::rtl::OUString::createFromAscii("ThousandDelimiter"), 0, makeAny(::rtl::OUString(&m_cThousandDelimiter,1)), PropertyState_DIRECT_VALUE));
+    aParam.push_back(PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Extension")), 0, makeAny(getDriver()->getFileExt()), PropertyState_DIRECT_VALUE));
+    aParam.push_back(PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderLine")), 0, makeAny(m_bHeaderLine), PropertyState_DIRECT_VALUE));
+    aParam.push_back(PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FieldDelimiter")), 0, makeAny(::rtl::OUString(&m_cFieldDelimiter,1)), PropertyState_DIRECT_VALUE));
+    aParam.push_back(PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StringDelimiter")), 0, makeAny(::rtl::OUString(&m_cStringDelimiter,1)), PropertyState_DIRECT_VALUE));
+    aParam.push_back(PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DecimalDelimiter")), 0, makeAny(::rtl::OUString(&m_cDecimalDelimiter,1)), PropertyState_DIRECT_VALUE));
+    aParam.push_back(PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ThousandDelimiter")), 0, makeAny(::rtl::OUString(&m_cThousandDelimiter,1)), PropertyState_DIRECT_VALUE));
 
     // build a new parameter sequence from the original parameters, appended by the new parameters from above
         PropertyValue *pParams = aParam.empty() ? 0 : &aParam[0];
diff --git a/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx b/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
index e8ef5ae53ab1..77821cb6137b 100644
--- a/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
@@ -96,7 +96,7 @@ Reference< XResultSet > OEvoabDatabaseMetaData::impl_getTypeInfo_throw(  )
         ODatabaseMetaDataResultSet::ORow aRow;
 
         aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(new ORowSetValueDecorator(::rtl::OUString::createFromAscii("CHAR")));
+        aRow.push_back(new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CHAR"))));
         aRow.push_back(new ORowSetValueDecorator(DataType::CHAR));
         aRow.push_back(new ORowSetValueDecorator((sal_Int32)254));
         aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
@@ -117,60 +117,60 @@ Reference< XResultSet > OEvoabDatabaseMetaData::impl_getTypeInfo_throw(  )
 
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("VARCHAR"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR")));
         aRow[2] = new ORowSetValueDecorator(DataType::VARCHAR);
         aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRows.push_back(aRow);
 
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("LONGVARCHAR"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LONGVARCHAR")));
         aRow[2] = new ORowSetValueDecorator(DataType::LONGVARCHAR);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)65535);
         aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("DATE"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATE")));
         aRow[2] = new ORowSetValueDecorator(DataType::DATE);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)10);
         aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("TIME"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIME")));
         aRow[2] = new ORowSetValueDecorator(DataType::TIME);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)8);
         aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("TIMESTAMP"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP")));
         aRow[2] = new ORowSetValueDecorator(DataType::TIMESTAMP);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)19);
         aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("BOOL"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BOOL")));
         aRow[2] = new ORowSetValueDecorator(DataType::BIT);
         aRow[3] = ODatabaseMetaDataResultSet::get1Value();
         aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("DECIMAL"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DECIMAL")));
         aRow[2] = new ORowSetValueDecorator(DataType::DECIMAL);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)20);
         aRow[15] = new ORowSetValueDecorator((sal_Int32)15);
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("DOUBLE"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DOUBLE")));
         aRow[2] = new ORowSetValueDecorator(DataType::DOUBLE);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)20);
         aRow[15] = ODatabaseMetaDataResultSet::get0Value();
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("NUMERIC"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NUMERIC")));
         aRow[2] = new ORowSetValueDecorator(DataType::NUMERIC);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)20);
         aRow[15] = new ORowSetValueDecorator((sal_Int32)20);
@@ -254,10 +254,10 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getColumns(
                     switch(sal_Int32(aRow[11]->getValue()))
                     {
                     case ColumnValue::NO_NULLS:
-                        aRow[18]  = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("NO"));
+                        aRow[18]  = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO")));
                         break;
                     case ColumnValue::NULLABLE:
-                        aRow[18]  = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("YES"));
+                        aRow[18]  = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YES")));
                         break;
                     default:
                         aRow[18]  = new ORowSetValueDecorator(::rtl::OUString());
@@ -294,7 +294,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables(
     // check if any type is given
     // when no types are given then we have to return all tables e.g. TABLE
 
-    static const ::rtl::OUString aTable(::rtl::OUString::createFromAscii("TABLE"));
+    static const ::rtl::OUString aTable(RTL_CONSTASCII_USTRINGPARAM("TABLE"));
 
     sal_Bool bTableFound = sal_True;
     sal_Int32 nLength = types.getLength();
@@ -354,7 +354,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables(
             ::rtl::OUString aArg2 = ::rtl::OUString::createFromAscii(pOEvoabConnection->getDriver()->getEVOAB_CLI_ARG_OUTPUT_FILE_PREFIX());
             aArg2 += aWorkingDir;
             aArg2 += aName;
-            aArg2 += ::rtl::OUString::createFromAscii(".");
+            aArg2 += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("."));
             aArg2 += ::rtl::OUString(pOEvoabConnection->getExtension());
             ::rtl::OUString aArg3 = ::rtl::OUString::createFromAscii(pOEvoabConnection->getDriver()->getEVOAB_CLI_ARG_OUTPUT_FORMAT());
 
diff --git a/connectivity/source/drivers/evoab/LDriver.cxx b/connectivity/source/drivers/evoab/LDriver.cxx
index 36363007246b..637203e787d9 100644
--- a/connectivity/source/drivers/evoab/LDriver.cxx
+++ b/connectivity/source/drivers/evoab/LDriver.cxx
@@ -66,8 +66,8 @@ OEvoabDriver::OEvoabDriver(const Reference< XMultiServiceFactory >& _rxFactory)
 
     if ( m_aEvoab_CLI_FullPathCommand.getLength() == 0 )
         m_aEvoab_CLI_FullPathCommand = ::rtl::OUString::createFromAscii(getEVOAB_CLI_FULLPATHCOMMAND());
-    if ( m_aEvoab_CLI_FullPathCommand.copy(0,7) != ::rtl::OUString::createFromAscii("file://") && m_aEvoab_CLI_FullPathCommand.copy(0,1) == ::rtl::OUString::createFromAscii("/"))
-        m_aEvoab_CLI_FullPathCommand = ::rtl::OUString::createFromAscii("file://") + m_aEvoab_CLI_FullPathCommand;
+    if ( m_aEvoab_CLI_FullPathCommand.copy(0,7) != ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file://")) && m_aEvoab_CLI_FullPathCommand.copy(0,1) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")))
+        m_aEvoab_CLI_FullPathCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file://")) + m_aEvoab_CLI_FullPathCommand;
     m_aEvoab_CLI_EffectiveCommand = m_aEvoab_CLI_FullPathCommand;
     m_aTempDir.EnableKillingFile();
 
@@ -77,7 +77,7 @@ OEvoabDriver::OEvoabDriver(const Reference< XMultiServiceFactory >& _rxFactory)
 //------------------------------------------------------------------------------
 rtl::OUString OEvoabDriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return rtl::OUString::createFromAscii(EVOAB_DRIVER_IMPL_NAME);
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(EVOAB_DRIVER_IMPL_NAME));
 }
 
 //------------------------------------------------------------------
@@ -310,7 +310,7 @@ sal_Bool OEvoabDriver::acceptsURL_Stat( const ::rtl::OUString& url )
         // There isn't any subschema: - but could be just subschema
         if ( aAddrbookURI.getLength() > 0 )
             aAddrbookScheme= aAddrbookURI;
-        else if(url == ::rtl::OUString::createFromAscii("sdbc:address:") )
+        else if(url == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:")) )
             return sal_True; // special case here
         else
             return sal_False;
diff --git a/connectivity/source/drivers/evoab/LDriver.hxx b/connectivity/source/drivers/evoab/LDriver.hxx
index 65731264409e..65b15c50cd3f 100644
--- a/connectivity/source/drivers/evoab/LDriver.hxx
+++ b/connectivity/source/drivers/evoab/LDriver.hxx
@@ -73,8 +73,8 @@ namespace connectivity
 
             inline rtl::OUString    getEvoFolderListName()          const { return m_aFolderListName;}
             inline rtl::OUString    getFileExt()                    const { return m_aFileExt;}
-            inline rtl::OUString    getEvoFolderListFileName()      const { return m_aFolderListName + ::rtl::OUString::createFromAscii(".") + m_aFileExt;}
-            inline rtl::OUString    getEvoVersionFileName()         const { return m_aVersionName + ::rtl::OUString::createFromAscii(".") + m_aFileExt;}
+            inline rtl::OUString    getEvoFolderListFileName()      const { return m_aFolderListName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")) + m_aFileExt;}
+            inline rtl::OUString    getEvoVersionFileName()         const { return m_aVersionName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")) + m_aFileExt;}
             inline rtl::OUString    getWorkingDirURL()              const { return m_aWorkingDirURL;}
             inline rtl::OUString    getEvoab_CLI_FullPathCommand()  const { return m_aEvoab_CLI_FullPathCommand;}
             inline rtl::OUString    getEvoab_CLI_EffectiveCommand() const { return m_aEvoab_CLI_EffectiveCommand;}
diff --git a/connectivity/source/drivers/evoab/LFolderList.cxx b/connectivity/source/drivers/evoab/LFolderList.cxx
index b5757ca1ac37..5a7548ceb347 100644
--- a/connectivity/source/drivers/evoab/LFolderList.cxx
+++ b/connectivity/source/drivers/evoab/LFolderList.cxx
@@ -215,12 +215,12 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
                 if(nPrecision)
                 {
                     eType = DataType::DECIMAL;
-                    aTypeName = ::rtl::OUString::createFromAscii("DECIMAL");
+                    aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DECIMAL"));
                 }
                 else
                 {
                     eType = DataType::DOUBLE;
-                    aTypeName = ::rtl::OUString::createFromAscii("DOUBLE");
+                    aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DOUBLE"));
                 }
             }
             else
@@ -234,21 +234,21 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
             {
                 case NUMBERFORMAT_DATE:
                     eType = DataType::DATE;
-                    aTypeName = ::rtl::OUString::createFromAscii("DATE");
+                    aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATE"));
                     break;
                 case NUMBERFORMAT_DATETIME:
                     eType = DataType::TIMESTAMP;
-                    aTypeName = ::rtl::OUString::createFromAscii("TIMESTAMP");
+                    aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP"));
                     break;
                 case NUMBERFORMAT_TIME:
                     eType = DataType::TIME;
-                    aTypeName = ::rtl::OUString::createFromAscii("TIME");
+                    aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIME"));
                     break;
                 default:
                     eType = DataType::VARCHAR;
                     nPrecision = 0; // nyi: Daten koennen aber laenger sein!
                     nScale = 0;
-                    aTypeName = ::rtl::OUString::createFromAscii("VARCHAR");
+                    aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"));
             };
             nFlags |= ColumnSearch::CHAR;
         }
@@ -301,8 +301,8 @@ void OEvoabFolderList::construct()
     Sequence< ::com::sun::star::uno::Any > aArg(1);
     aArg[0] <<= aAppLocale;
 
-    Reference< ::com::sun::star::util::XNumberFormatsSupplier >  xSupplier(m_pConnection->getDriver()->getFactory()->createInstanceWithArguments(::rtl::OUString::createFromAscii("com.sun.star.util.NumberFormatsSupplier"),aArg),UNO_QUERY);
-    m_xNumberFormatter = Reference< ::com::sun::star::util::XNumberFormatter >(m_pConnection->getDriver()->getFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.util.NumberFormatter")),UNO_QUERY);
+    Reference< ::com::sun::star::util::XNumberFormatsSupplier >  xSupplier(m_pConnection->getDriver()->getFactory()->createInstanceWithArguments(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatsSupplier")),aArg),UNO_QUERY);
+    m_xNumberFormatter = Reference< ::com::sun::star::util::XNumberFormatter >(m_pConnection->getDriver()->getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatter"))),UNO_QUERY);
     m_xNumberFormatter->attachNumberFormatsSupplier(xSupplier);
 
     INetURLObject aURL;
@@ -366,7 +366,7 @@ sal_Bool OEvoabFolderList::fetchRow(OValueRow _rRow,const OSQLColumns & _rCols)
                         nRes = m_xNumberFormatter->convertStringToNumber(::com::sun::star::util::NumberFormat::ALL,aStr);
                         Reference<XPropertySet> xProp(m_xNumberFormatter->getNumberFormatsSupplier()->getNumberFormatSettings(),UNO_QUERY);
                         com::sun::star::util::Date aDate;
-                        xProp->getPropertyValue(::rtl::OUString::createFromAscii("NullDate")) >>= aDate;
+                        xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NullDate"))) >>= aDate;
 
                         switch(nType)
                         {
diff --git a/connectivity/source/drivers/evoab/LResultSet.cxx b/connectivity/source/drivers/evoab/LResultSet.cxx
index 79c291126f48..762942805431 100644
--- a/connectivity/source/drivers/evoab/LResultSet.cxx
+++ b/connectivity/source/drivers/evoab/LResultSet.cxx
@@ -57,14 +57,14 @@ OEvoabResultSet::OEvoabResultSet( OStatement_Base* pStmt,connectivity::OSQLParse
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OEvoabResultSet::getImplementationName(  ) throw ( RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.evoab.ResultSet");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.evoab.ResultSet"));
 }
 // -------------------------------------------------------------------------
 Sequence< ::rtl::OUString > SAL_CALL OEvoabResultSet::getSupportedServiceNames(  ) throw( RuntimeException)
 {
      Sequence< ::rtl::OUString > aSupported(2);
-    aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.ResultSet");
-    aSupported[1] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.ResultSet");
+    aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ResultSet"));
+    aSupported[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ResultSet"));
     return aSupported;
 }
 // -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/evoab/LServices.cxx b/connectivity/source/drivers/evoab/LServices.cxx
index c99a9044994d..6a1f432cf069 100644
--- a/connectivity/source/drivers/evoab/LServices.cxx
+++ b/connectivity/source/drivers/evoab/LServices.cxx
@@ -62,9 +62,9 @@ void REGISTER_PROVIDER(
         const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
 {
     OUString aMainKeyName;
-    aMainKeyName = OUString::createFromAscii("/");
+    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString::createFromAscii("/UNO/SERVICES");
+    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
 
     Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
     OSL_ENSURE(xNewKey.is(), "FILE::component_writeInfo : could not create a registry key !");
diff --git a/connectivity/source/drivers/evoab/LTable.cxx b/connectivity/source/drivers/evoab/LTable.cxx
index 898f445e1d3b..8ac10a47ca07 100644
--- a/connectivity/source/drivers/evoab/LTable.cxx
+++ b/connectivity/source/drivers/evoab/LTable.cxx
@@ -236,12 +236,12 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
                 if(nPrecision)
                 {
                     eType = DataType::DECIMAL;
-                    aTypeName = ::rtl::OUString::createFromAscii("DECIMAL");
+                    aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DECIMAL"));
                 }
                 else
                 {
                     eType = DataType::DOUBLE;
-                    aTypeName = ::rtl::OUString::createFromAscii("DOUBLE");
+                    aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DOUBLE"));
                 }
             }
             else
@@ -255,21 +255,21 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
             {
                 case NUMBERFORMAT_DATE:
                     eType = DataType::DATE;
-                    aTypeName = ::rtl::OUString::createFromAscii("DATE");
+                    aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATE"));
                     break;
                 case NUMBERFORMAT_DATETIME:
                     eType = DataType::TIMESTAMP;
-                    aTypeName = ::rtl::OUString::createFromAscii("TIMESTAMP");
+                    aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP"));
                     break;
                 case NUMBERFORMAT_TIME:
                     eType = DataType::TIME;
-                    aTypeName = ::rtl::OUString::createFromAscii("TIME");
+                    aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIME"));
                     break;
                 default:
                     eType = DataType::VARCHAR;
                     nPrecision = 0; // nyi: Daten koennen aber laenger sein!
                     nScale = 0;
-                    aTypeName = ::rtl::OUString::createFromAscii("VARCHAR");
+                    aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"));
             };
             nFlags |= ColumnSearch::CHAR;
         }
@@ -338,8 +338,8 @@ void OEvoabTable::construct()
     Sequence< ::com::sun::star::uno::Any > aArg(1);
     aArg[0] <<= aAppLocale;
 
-    Reference< ::com::sun::star::util::XNumberFormatsSupplier >  xSupplier(m_pConnection->getDriver()->getFactory()->createInstanceWithArguments(::rtl::OUString::createFromAscii("com.sun.star.util.NumberFormatsSupplier"),aArg),UNO_QUERY);
-    m_xNumberFormatter = Reference< ::com::sun::star::util::XNumberFormatter >(m_pConnection->getDriver()->getFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.util.NumberFormatter")),UNO_QUERY);
+    Reference< ::com::sun::star::util::XNumberFormatsSupplier >  xSupplier(m_pConnection->getDriver()->getFactory()->createInstanceWithArguments(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatsSupplier")),aArg),UNO_QUERY);
+    m_xNumberFormatter = Reference< ::com::sun::star::util::XNumberFormatter >(m_pConnection->getDriver()->getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatter"))),UNO_QUERY);
     m_xNumberFormatter->attachNumberFormatsSupplier(xSupplier);
 
     INetURLObject aURL;
@@ -552,7 +552,7 @@ sal_Bool OEvoabTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sa
                         nRes = m_xNumberFormatter->convertStringToNumber(::com::sun::star::util::NumberFormat::ALL,aStr);
                         Reference<XPropertySet> xProp(m_xNumberFormatter->getNumberFormatsSupplier()->getNumberFormatSettings(),UNO_QUERY);
                         com::sun::star::util::Date aDate;
-                        xProp->getPropertyValue(::rtl::OUString::createFromAscii("NullDate")) >>= aDate;
+                        xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NullDate"))) >>= aDate;
 
                         switch(nType)
                         {
@@ -672,7 +672,7 @@ sal_Bool OEvoabTable::setColumnAliases()
 
         sal_Bool bCase = getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers();
         ::rtl::OUString aTypeName;
-        aTypeName = ::rtl::OUString::createFromAscii("VARCHAR");
+        aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"));
         sdbcx::OColumn* pColumn = new sdbcx::OColumn(sColumnFinalName,aTypeName,::rtl::OUString(),
                                                 ColumnValue::NULLABLE,
                                                 m_aPrecisions[i],
diff --git a/connectivity/source/drivers/evoab/LTables.cxx b/connectivity/source/drivers/evoab/LTables.cxx
index ff27bf54ffad..26b5009683c6 100644
--- a/connectivity/source/drivers/evoab/LTables.cxx
+++ b/connectivity/source/drivers/evoab/LTables.cxx
@@ -54,7 +54,7 @@ namespace starutil      = ::com::sun::star::util;
 sdbcx::ObjectType OEvoabTables::createObject(const ::rtl::OUString& _rName)
 {
     OEvoabTable* pRet = new OEvoabTable(this,(OEvoabConnection*)static_cast<OFileCatalog&>(m_rParent).getConnection(),
-                                        _rName,::rtl::OUString::createFromAscii("TABLE"));
+                                        _rName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE")));
     sdbcx::ObjectType xRet = pRet;
     pRet->construct();
     return xRet;
diff --git a/connectivity/source/drivers/evoab2/NCatalog.cxx b/connectivity/source/drivers/evoab2/NCatalog.cxx
index 0ed28663f72b..ec5c20392cb7 100644
--- a/connectivity/source/drivers/evoab2/NCatalog.cxx
+++ b/connectivity/source/drivers/evoab2/NCatalog.cxx
@@ -55,9 +55,9 @@ void OEvoabCatalog::refreshTables()
 {
     TStringVector aVector;
     Sequence< ::rtl::OUString > aTypes(1);
-    aTypes[0] = ::rtl::OUString::createFromAscii("TABLE");
+    aTypes[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE"));
     Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
-        ::rtl::OUString::createFromAscii("%"),::rtl::OUString::createFromAscii("%"),aTypes);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),aTypes);
 
     if(xResult.is())
     {
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index a49f2683a106..2e6a55439f76 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -57,7 +57,7 @@ using namespace ::com::sun::star::lang;
 {
      ::rtl::OUString aExceptionType = aExceptionType_;
      if( aExceptionType.getLength() == 0 )
-         aExceptionType =  ::rtl::OUString::createFromAscii("Unknown" ) ;
+         aExceptionType =  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown")) ;
 
      ::rtl::OUString aTypeLine( RTL_CONSTASCII_USTRINGPARAM("\nType: " ) );
      aTypeLine += aExceptionType;
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 9112c5c0dba9..4aed0b3ee05a 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -213,9 +213,9 @@ namespace connectivity
         switch( getFieldType( nCol ) )
         {
             case DataType::BIT:
-                return ::rtl::OUString::createFromAscii( "BIT" );
+                return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BIT"));
             case DataType::VARCHAR:
-                return ::rtl::OUString::createFromAscii( "VARCHAR" );
+                return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"));
             default:
                 break;
         }
@@ -283,9 +283,9 @@ ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows( const
     // ****************************************************
 
     // Catalog
-    aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii(""));
+    aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")));
     // Schema
-    aRow[2] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii(""));
+    aRow[2] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")));
     // COLUMN_SIZE
     aRow[7] = new ORowSetValueDecorator(s_nCOLUMN_SIZE);
     // BUFFER_LENGTH, not used
@@ -307,10 +307,10 @@ ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows( const
     // CHAR_OCTET_LENGTH, refer to [5]
     aRow[16] = new ORowSetValueDecorator(s_nCHAR_OCTET_LENGTH);
     // IS_NULLABLE
-    aRow[18] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii( "YES" ));
+    aRow[18] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YES")));
 
 
-    aRow[3] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii( "TABLE" ));
+    aRow[3] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE")));
     ::osl::MutexGuard aGuard( m_aMutex );
 
     initFields();
@@ -464,7 +464,7 @@ sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsNonNullableColumns(  ) throw(S
 ::rtl::OUString OEvoabDatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
 {
     // normally this is "
-    ::rtl::OUString aVal = ::rtl::OUString::createFromAscii("\"");
+    ::rtl::OUString aVal(RTL_CONSTASCII_USTRINGPARAM("\""));
     return aVal;
 }
 // -------------------------------------------------------------------------
@@ -1017,7 +1017,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTableTypes(  ) throw
     // there exists no possibility to get table types so we have to check
     static ::rtl::OUString sTableTypes[] =
     {
-        ::rtl::OUString::createFromAscii("TABLE"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE")),
         // Currently we only support a 'TABLE' nothing more complex
     };
     ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTableTypes);
@@ -1056,7 +1056,7 @@ Reference< XResultSet > OEvoabDatabaseMetaData::impl_getTypeInfo_throw(  )
         ODatabaseMetaDataResultSet::ORow aRow;
         aRow.reserve(19);
         aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(new ORowSetValueDecorator(::rtl::OUString::createFromAscii("VARCHAR")));
+        aRow.push_back(new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"))));
         aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR));
         aRow.push_back(new ORowSetValueDecorator((sal_Int32)s_nCHAR_OCTET_LENGTH));
         aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
@@ -1078,7 +1078,7 @@ Reference< XResultSet > OEvoabDatabaseMetaData::impl_getTypeInfo_throw(  )
 
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("VARCHAR"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR")));
         aRow[2] = new ORowSetValueDecorator(DataType::VARCHAR);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)65535);
         aRows.push_back(aRow);
@@ -1111,7 +1111,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables(
     // check if any type is given
     // when no types are given then we have to return all tables e.g. TABLE
 
-    const ::rtl::OUString aTable(::rtl::OUString::createFromAscii("TABLE"));
+    const ::rtl::OUString aTable(RTL_CONSTASCII_USTRINGPARAM("TABLE"));
 
     sal_Bool bTableFound = sal_True;
     sal_Int32 nLength = types.getLength();
diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx
index 5a71080036df..dd9e035142a2 100644
--- a/connectivity/source/drivers/evoab2/NDriver.cxx
+++ b/connectivity/source/drivers/evoab2/NDriver.cxx
@@ -46,7 +46,6 @@
 
 using namespace osl;
 using namespace connectivity::evoab;
-//using namespace connectivity::file;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::sdbcx;
@@ -91,7 +90,7 @@ void OEvoabDriver::disposing()
 //------------------------------------------------------------------------------
 rtl::OUString OEvoabDriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return rtl::OUString::createFromAscii(EVOAB_DRIVER_IMPL_NAME);
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(EVOAB_DRIVER_IMPL_NAME));
     // this name is referenced in the configuration and in the evoab.xml
     // Please take care when changing it.
 }
@@ -102,7 +101,7 @@ Sequence< ::rtl::OUString > OEvoabDriver::getSupportedServiceNames_Static(  ) th
     // which service is supported
     // for more information @see com.sun.star.sdbc.Driver
     Sequence< ::rtl::OUString > aSNS( 1 );
-    aSNS[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.Driver");
+    aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver"));
     return aSNS;
 }
 //------------------------------------------------------------------
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index 874b70d8a0ea..501dea609629 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -77,13 +77,13 @@ namespace ErrorCondition = ::com::sun::star::sdb::ErrorCondition;
 //------------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OEvoabResultSet::getImplementationName(  ) throw ( RuntimeException)   \
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.evoab.ResultSet");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.evoab.ResultSet"));
 }
 // -------------------------------------------------------------------------
  Sequence< ::rtl::OUString > SAL_CALL OEvoabResultSet::getSupportedServiceNames(  ) throw( RuntimeException)
 {
      Sequence< ::rtl::OUString > aSupported(1);
-    aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.ResultSet");
+    aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ResultSet"));
     return aSupported;
 }
 // -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
index 2265fa0f72cd..429dca24f7fa 100644
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
@@ -54,7 +54,7 @@ OEvoabResultSetMetaData::~OEvoabResultSetMetaData()
 void OEvoabResultSetMetaData::setEvoabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(SQLException)
 {
         OSQLColumns::Vector::const_iterator aIter;
-        static const ::rtl::OUString aName(::rtl::OUString::createFromAscii("Name"));
+        static const ::rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM("Name"));
 
         for (aIter = xColumns->get().begin(); aIter != xColumns->get().end(); ++aIter)
         {
@@ -134,7 +134,7 @@ sal_Bool SAL_CALL OEvoabResultSetMetaData::isCaseSensitive( sal_Int32 /*nColumnN
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getTableName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
-    return m_aTableName;//::rtl::OUString::createFromAscii("TABLE");
+    return m_aTableName;//::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE"));
 }
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getCatalogName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx
index cfdce80a9885..f26042b9ceb6 100644
--- a/connectivity/source/drivers/evoab2/NServices.cxx
+++ b/connectivity/source/drivers/evoab2/NServices.cxx
@@ -62,9 +62,9 @@ void REGISTER_PROVIDER(
         const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
 {
     OUString aMainKeyName;
-    aMainKeyName = OUString::createFromAscii("/");
+    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString::createFromAscii("/UNO/SERVICES");
+    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
 
     Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
     OSL_ENSURE(xNewKey.is(), "EVOAB::component_writeInfo : could not create a registry key !");
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index af914aae7e87..d4a36f56e867 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -413,7 +413,7 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree )
         {
             // String containing only a '%' and nothing else matches everything
             pResult = createTest( aColumnName, E_BOOK_QUERY_CONTAINS,
-                                  rtl::OUString::createFromAscii( "" ) );
+                                  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) );
         }
         else if( aMatchString.indexOf( WILDCARD ) == -1 )
         {   // Simple string , eg. "to match" "contains in evo"
diff --git a/connectivity/source/drivers/evoab2/NTables.cxx b/connectivity/source/drivers/evoab2/NTables.cxx
index 88bce2c7d869..1212214b7b63 100644
--- a/connectivity/source/drivers/evoab2/NTables.cxx
+++ b/connectivity/source/drivers/evoab2/NTables.cxx
@@ -60,10 +60,10 @@ typedef connectivity::sdbcx::OCollection OCollection_TYPE;
 
 ObjectType OEvoabTables::createObject(const ::rtl::OUString& aName)
 {
-    ::rtl::OUString aSchema = ::rtl::OUString::createFromAscii("%");
+    ::rtl::OUString aSchema( RTL_CONSTASCII_USTRINGPARAM( "%" ));
 
     Sequence< ::rtl::OUString > aTypes(1);
-    aTypes[0] = ::rtl::OUString::createFromAscii("TABLE");
+    aTypes[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE"));
     ::rtl::OUString sEmpty;
 
     Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes);
diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx
index fbf54140dc34..df810c291704 100644
--- a/connectivity/source/drivers/file/FCatalog.cxx
+++ b/connectivity/source/drivers/file/FCatalog.cxx
@@ -72,7 +72,7 @@ void OFileCatalog::refreshTables()
     TStringVector aVector;
     Sequence< ::rtl::OUString > aTypes;
     Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
-        ::rtl::OUString::createFromAscii("%"),::rtl::OUString::createFromAscii("%"),aTypes);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),aTypes);
     fillNames(xResult,aVector);
 
     if(m_pTables)
diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx
index 14ce3ddf5841..2626c1d29a30 100644
--- a/connectivity/source/drivers/file/FConnection.cxx
+++ b/connectivity/source/drivers/file/FConnection.cxx
@@ -178,7 +178,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV
         // set fields to fetch
         Sequence< OUString > aProps(1);
         OUString* pProps = aProps.getArray();
-        pProps[ 0 ] = OUString::createFromAscii( "Title" );
+        pProps[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
 
         try
         {
@@ -405,7 +405,7 @@ Reference< XDynamicResultSet > OConnection::getDir() const
     Reference<XDynamicResultSet> xContent;
     Sequence< ::rtl::OUString > aProps(1);
     ::rtl::OUString* pProps = aProps.getArray();
-    pProps[ 0 ] = ::rtl::OUString::createFromAscii( "Title" );
+    pProps[ 0 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
     try
     {
         Reference<XContentIdentifier> xIdent = getContent()->getIdentifier();
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index 91443bab7ed8..391e7ec0a623 100644
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -197,7 +197,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
     // check if any type is given
     // when no types are given then we have to return all tables e.g. TABLE
 
-    static const ::rtl::OUString aTable(::rtl::OUString::createFromAscii("TABLE"));
+    static const ::rtl::OUString aTable(RTL_CONSTASCII_USTRINGPARAM("TABLE"));
 
     sal_Bool bTableFound = sal_True;
     sal_Int32 nLength = types.getLength();
@@ -221,7 +221,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
 
     Reference<XDynamicResultSet> xContent = m_pConnection->getDir();
     Reference < XSortedDynamicResultSetFactory > xSRSFac(
-                m_pConnection->getDriver()->getFactory()->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.ucb.SortedDynamicResultSetFactory") ), UNO_QUERY );
+                m_pConnection->getDriver()->getFactory()->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory")) ), UNO_QUERY );
 
     Sequence< NumberedSortingInfo > aSortInfo( 1 );
     NumberedSortingInfo* pInfo = aSortInfo.getArray();
@@ -432,7 +432,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
 
                 aRow[2] = new ORowSetValueDecorator(*pBegin);
                 aRow[6] = ODatabaseMetaDataResultSet::getSelectValue();
-                aRow[7] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("NO"));
+                aRow[7] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO")));
                 aRows.push_back(aRow);
 
                 Reference< XPropertySet> xTable;
@@ -551,7 +551,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLExc
 ::rtl::OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::impl_getIdentifierQuoteString_throw" );
-    static const ::rtl::OUString sQuote = ::rtl::OUString::createFromAscii("\"");
+    static const ::rtl::OUString sQuote(RTL_CONSTASCII_USTRINGPARAM("\""));
     return sQuote;
 }
 // -------------------------------------------------------------------------
@@ -711,7 +711,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  ) throw(SQLE
     {
         ODatabaseMetaDataResultSet::ORow aRow;
         aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(new ORowSetValueDecorator(::rtl::OUString::createFromAscii("TABLE")));
+        aRow.push_back(new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE"))));
         aRows.push_back(aRow);
     }
     pResult->setRows(aRows);
@@ -973,7 +973,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQL
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getURL" );
-    static const ::rtl::OUString aValue = ::rtl::OUString::createFromAscii("sdbc:file:");
+    static const ::rtl::OUString aValue( RTL_CONSTASCII_USTRINGPARAM( "sdbc:file:" ));
     return aValue;
 }
 // -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx
index c41a839c3fef..708a85ce1b56 100644
--- a/connectivity/source/drivers/file/FDriver.cxx
+++ b/connectivity/source/drivers/file/FDriver.cxx
@@ -75,14 +75,14 @@ void OFileDriver::disposing()
 //------------------------------------------------------------------------------
 rtl::OUString OFileDriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return rtl::OUString::createFromAscii("com.sun.star.sdbc.driver.file.Driver");
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.driver.file.Driver"));
 }
 //------------------------------------------------------------------------------
 Sequence< ::rtl::OUString > OFileDriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aSNS( 2 );
-    aSNS[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.Driver");
-    aSNS[1] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Driver");
+    aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver"));
+    aSNS[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Driver"));
     return aSNS;
 }
 
@@ -129,7 +129,7 @@ sal_Bool SAL_CALL OFileDriver::acceptsURL( const ::rtl::OUString& url )
                 throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileDriver::acceptsURL" );
-    return (!url.compareTo(::rtl::OUString::createFromAscii("sdbc:file:"),10));
+    return (!url.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:file:")),10));
 }
 // --------------------------------------------------------------------------------
 Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx
index 52974444a43c..1aadb836fbac 100644
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -103,7 +103,7 @@ void OFileTable::refreshColumns()
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileTable::refreshColumns" );
     TStringVector aVector;
         Reference< XResultSet > xResult = m_pConnection->getMetaData()->getColumns(Any(),
-                                                    m_SchemaName,m_Name,::rtl::OUString::createFromAscii("%"));
+                                                    m_SchemaName,m_Name,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")));
 
     if(xResult.is())
     {
diff --git a/connectivity/source/drivers/flat/ECatalog.cxx b/connectivity/source/drivers/flat/ECatalog.cxx
index 5bdff8c75bff..685947f48622 100644
--- a/connectivity/source/drivers/flat/ECatalog.cxx
+++ b/connectivity/source/drivers/flat/ECatalog.cxx
@@ -55,7 +55,7 @@ void OFlatCatalog::refreshTables()
     TStringVector aVector;
     Sequence< ::rtl::OUString > aTypes;
     Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
-        ::rtl::OUString::createFromAscii("%"),::rtl::OUString::createFromAscii("%"),aTypes);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),aTypes);
 
     if(xResult.is())
     {
diff --git a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
index 29991697fb7b..161ace8941a2 100644
--- a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
@@ -82,7 +82,7 @@ Reference< XResultSet > OFlatDatabaseMetaData::impl_getTypeInfo_throw(  )
         ODatabaseMetaDataResultSet::ORow aRow;
 
         aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(new ORowSetValueDecorator(::rtl::OUString::createFromAscii("CHAR")));
+        aRow.push_back(new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CHAR"))));
         aRow.push_back(new ORowSetValueDecorator(DataType::CHAR));
         aRow.push_back(new ORowSetValueDecorator((sal_Int32)254));
         aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
@@ -103,60 +103,60 @@ Reference< XResultSet > OFlatDatabaseMetaData::impl_getTypeInfo_throw(  )
 
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("VARCHAR"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR")));
         aRow[2] = new ORowSetValueDecorator(DataType::VARCHAR);
         aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRows.push_back(aRow);
 
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("LONGVARCHAR"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LONGVARCHAR")));
         aRow[2] = new ORowSetValueDecorator(DataType::LONGVARCHAR);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)65535);
         aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("DATE"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATE")));
         aRow[2] = new ORowSetValueDecorator(DataType::DATE);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)10);
         aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("TIME"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIME")));
         aRow[2] = new ORowSetValueDecorator(DataType::TIME);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)8);
         aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("TIMESTAMP"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP")));
         aRow[2] = new ORowSetValueDecorator(DataType::TIMESTAMP);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)19);
         aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("BOOL"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BOOL")));
         aRow[2] = new ORowSetValueDecorator(DataType::BIT);
         aRow[3] = ODatabaseMetaDataResultSet::get1Value();
         aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("DECIMAL"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DECIMAL")));
         aRow[2] = new ORowSetValueDecorator(DataType::DECIMAL);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)20);
         aRow[15] = new ORowSetValueDecorator((sal_Int32)15);
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("DOUBLE"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DOUBLE")));
         aRow[2] = new ORowSetValueDecorator(DataType::DOUBLE);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)20);
         aRow[15] = ODatabaseMetaDataResultSet::get0Value();
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("NUMERIC"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NUMERIC")));
         aRow[2] = new ORowSetValueDecorator(DataType::NUMERIC);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)20);
         aRow[15] = new ORowSetValueDecorator((sal_Int32)20);
@@ -236,10 +236,10 @@ Reference< XResultSet > SAL_CALL OFlatDatabaseMetaData::getColumns(
                     switch(sal_Int32(aRow[11]->getValue()))
                     {
                     case ColumnValue::NO_NULLS:
-                        aRow[18]  = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("NO"));
+                        aRow[18]  = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO")));
                         break;
                     case ColumnValue::NULLABLE:
-                        aRow[18]  = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("YES"));
+                        aRow[18]  = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YES")));
                         break;
                     default:
                         aRow[18]  = new ORowSetValueDecorator(::rtl::OUString());
diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx
index b4ea6e4d5fc8..ef9a190102df 100644
--- a/connectivity/source/drivers/flat/EDriver.cxx
+++ b/connectivity/source/drivers/flat/EDriver.cxx
@@ -50,7 +50,7 @@ using namespace ::com::sun::star::lang;
 //------------------------------------------------------------------------------
 rtl::OUString ODriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return rtl::OUString::createFromAscii("com.sun.star.comp.sdbc.flat.ODriver");
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdbc.flat.ODriver"));
 }
 
 //------------------------------------------------------------------
@@ -85,7 +85,7 @@ Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url,
 sal_Bool SAL_CALL ODriver::acceptsURL( const ::rtl::OUString& url )
                 throw(SQLException, RuntimeException)
 {
-    return url.compareTo(::rtl::OUString::createFromAscii("sdbc:flat:"),10) == 0;
+    return url.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:flat:")),10) == 0;
 }
 // -----------------------------------------------------------------------------
 Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx
index 5c4892becdad..a910c87318f7 100644
--- a/connectivity/source/drivers/flat/EResultSet.cxx
+++ b/connectivity/source/drivers/flat/EResultSet.cxx
@@ -57,14 +57,14 @@ OFlatResultSet::OFlatResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTr
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OFlatResultSet::getImplementationName(  ) throw ( RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.flat.ResultSet");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.flat.ResultSet"));
 }
 // -------------------------------------------------------------------------
 Sequence< ::rtl::OUString > SAL_CALL OFlatResultSet::getSupportedServiceNames(  ) throw( RuntimeException)
 {
      Sequence< ::rtl::OUString > aSupported(2);
-    aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.ResultSet");
-    aSupported[1] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.ResultSet");
+    aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ResultSet"));
+    aSupported[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ResultSet"));
     return aSupported;
 }
 // -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 622da47534f2..9ed0898ccf27 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -356,11 +356,11 @@ void OFlatTable::construct()
     Sequence< ::com::sun::star::uno::Any > aArg(1);
     aArg[0] <<= aAppLocale;
 
-    Reference< ::com::sun::star::util::XNumberFormatsSupplier >  xSupplier(m_pConnection->getDriver()->getFactory()->createInstanceWithArguments(::rtl::OUString::createFromAscii("com.sun.star.util.NumberFormatsSupplier"),aArg),UNO_QUERY);
-    m_xNumberFormatter = Reference< ::com::sun::star::util::XNumberFormatter >(m_pConnection->getDriver()->getFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.util.NumberFormatter")),UNO_QUERY);
+    Reference< ::com::sun::star::util::XNumberFormatsSupplier >  xSupplier(m_pConnection->getDriver()->getFactory()->createInstanceWithArguments(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatsSupplier")),aArg),UNO_QUERY);
+    m_xNumberFormatter = Reference< ::com::sun::star::util::XNumberFormatter >(m_pConnection->getDriver()->getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatter"))),UNO_QUERY);
     m_xNumberFormatter->attachNumberFormatsSupplier(xSupplier);
     Reference<XPropertySet> xProp(xSupplier->getNumberFormatSettings(),UNO_QUERY);
-    xProp->getPropertyValue(::rtl::OUString::createFromAscii("NullDate")) >>= m_aNullDate;
+    xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NullDate"))) >>= m_aNullDate;
 
     INetURLObject aURL;
     aURL.SetURL(getEntry());
@@ -611,8 +611,8 @@ sal_Bool OFlatTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sal
                         sal_Unicode* pData = aStrConverted.AllocBuffer(aStr.Len());
                         const sal_Unicode* pStart = pData;
 
-                        OSL_ENSURE(cDecimalDelimiter && nType != DataType::INTEGER ||
-                                   !cDecimalDelimiter && nType == DataType::INTEGER,
+                        OSL_ENSURE((cDecimalDelimiter && nType != DataType::INTEGER) ||
+                                   (!cDecimalDelimiter && nType == DataType::INTEGER),
                                    "FalscherTyp");
 
                         // In Standard-Notation (DezimalPUNKT ohne Tausender-Komma) umwandeln:
diff --git a/connectivity/source/drivers/flat/ETables.cxx b/connectivity/source/drivers/flat/ETables.cxx
index a0bb6a170838..f9ba451c4854 100644
--- a/connectivity/source/drivers/flat/ETables.cxx
+++ b/connectivity/source/drivers/flat/ETables.cxx
@@ -54,7 +54,7 @@ namespace starutil      = ::com::sun::star::util;
 sdbcx::ObjectType OFlatTables::createObject(const ::rtl::OUString& _rName)
 {
     OFlatTable* pRet = new OFlatTable(this,(OFlatConnection*)static_cast<OFileCatalog&>(m_rParent).getConnection(),
-                                        _rName,::rtl::OUString::createFromAscii("TABLE"));
+                                        _rName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE")));
     sdbcx::ObjectType xRet = pRet;
     pRet->construct();
     return xRet;
diff --git a/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx
index 952365e43ab1..bab148cd35c2 100644
--- a/connectivity/source/drivers/flat/Eservices.cxx
+++ b/connectivity/source/drivers/flat/Eservices.cxx
@@ -62,9 +62,9 @@ void REGISTER_PROVIDER(
         const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
 {
     OUString aMainKeyName;
-    aMainKeyName = OUString::createFromAscii("/");
+    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString::createFromAscii("/UNO/SERVICES");
+    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
 
     Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
     OSL_ENSURE(xNewKey.is(), "FILE::component_writeInfo : could not create a registry key !");
diff --git a/connectivity/source/drivers/hsqldb/HColumns.cxx b/connectivity/source/drivers/hsqldb/HColumns.cxx
index c1a640ec4036..798afeaf20bf 100644
--- a/connectivity/source/drivers/hsqldb/HColumns.cxx
+++ b/connectivity/source/drivers/hsqldb/HColumns.cxx
@@ -83,7 +83,7 @@ void OHSQLColumn::construct()
 Sequence< ::rtl::OUString > SAL_CALL OHSQLColumn::getSupportedServiceNames(  ) throw(RuntimeException)
 {
     Sequence< ::rtl::OUString > aSupported(1);
-    aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Column");
+    aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Column"));
 
     return aSupported;
 }
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 07fc4ec5e00a..951d3f745dad 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -219,7 +219,7 @@ namespace connectivity { namespace hsqldb
     }
 
     // -------------------------------------------------------------------
-    Reference< XGraphic > SAL_CALL OHsqlConnection::getTableIcon( const ::rtl::OUString& _TableName, ::sal_Int32 _ColorMode ) throw (RuntimeException)
+    Reference< XGraphic > SAL_CALL OHsqlConnection::getTableIcon( const ::rtl::OUString& _TableName, ::sal_Int32 /*_ColorMode*/ ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
 
@@ -227,7 +227,7 @@ namespace connectivity { namespace hsqldb
         if ( !impl_isTextTable_nothrow( _TableName ) )
             return NULL;
 
-        return impl_getTextTableIcon_nothrow( _ColorMode );
+        return impl_getTextTableIcon_nothrow();
     }
 
     // -------------------------------------------------------------------
@@ -347,7 +347,7 @@ namespace connectivity { namespace hsqldb
     }
 
     // -------------------------------------------------------------------
-    Reference< XGraphic > OHsqlConnection::impl_getTextTableIcon_nothrow( ::sal_Int32 _ColorMode )
+    Reference< XGraphic > OHsqlConnection::impl_getTextTableIcon_nothrow()
     {
         Reference< XGraphic > xGraphic;
         try
@@ -359,13 +359,12 @@ namespace connectivity { namespace hsqldb
 
             // assemble the image URL
             ::rtl::OUStringBuffer aImageURL;
-            aImageURL.appendAscii( "private:graphicrepository/" );  // load the graphic from the global graphic repository
-            aImageURL.appendAscii( "database/" );                   // the relative path within the images.zip
-            if ( _ColorMode == GraphicColorMode::NORMAL )
-                aImageURL.appendAscii( LINKED_TEXT_TABLE_IMAGE_RESOURCE );
-            else
-                aImageURL.appendAscii( LINKED_TEXT_TABLE_IMAGE_RESOURCE_HC );
-                                                                    // the name of the graphic to use
+            // load the graphic from the global graphic repository
+            aImageURL.appendAscii( "private:graphicrepository/" );
+            // the relative path within the images.zip
+            aImageURL.appendAscii( "database/" );
+            aImageURL.appendAscii( LINKED_TEXT_TABLE_IMAGE_RESOURCE );
+            // the name of the graphic to use
             ::rtl::OUString sImageURL( aImageURL.makeStringAndClear() );
 
             // ask the provider to obtain a graphic
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 583c33112caa..ac53b47a4f9a 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -478,14 +478,14 @@ namespace connectivity
     //------------------------------------------------------------------------------
     rtl::OUString ODriverDelegator::getImplementationName_Static(  ) throw(RuntimeException)
     {
-        return rtl::OUString::createFromAscii("com.sun.star.sdbcx.comp.hsqldb.Driver");
+        return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.comp.hsqldb.Driver"));
     }
     //------------------------------------------------------------------------------
     Sequence< ::rtl::OUString > ODriverDelegator::getSupportedServiceNames_Static(  ) throw (RuntimeException)
     {
         Sequence< ::rtl::OUString > aSNS( 2 );
         aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver"));
-        aSNS[1] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Driver");
+        aSNS[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Driver"));
         return aSNS;
     }
     //------------------------------------------------------------------
@@ -799,7 +799,7 @@ namespace connectivity
             {
                 //.........................................................
                 Reference< XMultiServiceFactory > xConfigProvider(
-                    _rxORB->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.configuration.ConfigurationProvider" ) ),
+                    _rxORB->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider")) ),
                     UNO_QUERY
                 );
                 OSL_ENSURE( xConfigProvider.is(), "lcl_getSystemLocale: could not create the config provider!" );
@@ -811,13 +811,13 @@ namespace connectivity
                 // arguments for creating the config access
                 Sequence< Any > aArguments(2);
                 // the path to the node to open
-                ::rtl::OUString sNodePath = ::rtl::OUString::createFromAscii ("/org.openoffice.Setup/L10N" );
-                aArguments[0] <<= PropertyValue( ::rtl::OUString::createFromAscii( "nodepath"), 0,
+                ::rtl::OUString sNodePath(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/L10N" ));
+                aArguments[0] <<= PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), 0,
                     makeAny( sNodePath ), PropertyState_DIRECT_VALUE
                 );
                 // the depth: -1 means unlimited
                 aArguments[1] <<= PropertyValue(
-                    ::rtl::OUString::createFromAscii( "depth"), 0,
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("depth")), 0,
                     makeAny( (sal_Int32)-1 ), PropertyState_DIRECT_VALUE
                 );
 
@@ -825,7 +825,7 @@ namespace connectivity
                 // create the access
                 Reference< XPropertySet > xNode(
                     xConfigProvider->createInstanceWithArguments(
-                        ::rtl::OUString::createFromAscii( "com.sun.star.configuration.ConfigurationAccess" ),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")),
                         aArguments ),
                     UNO_QUERY );
                 OSL_ENSURE( xNode.is(), "lcl_getSystemLocale: invalid access returned (should throw an exception instead)!" );
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx
index 3d4373542e08..90ced7e5066c 100644
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
@@ -327,7 +327,7 @@ void OHSQLTable::dropDefaultValue(const ::rtl::OUString& _rColName)
 // -----------------------------------------------------------------------------
 ::rtl::OUString OHSQLTable::getAlterTableColumnPart()
 {
-    ::rtl::OUString sSql = ::rtl::OUString::createFromAscii("ALTER TABLE ");
+    ::rtl::OUString sSql( RTL_CONSTASCII_USTRINGPARAM( "ALTER TABLE " ));
     const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString(  );
 
     ::rtl::OUString sComposedName( ::dbtools::composeTableName( getMetaData(), m_CatalogName, m_SchemaName, m_Name, sal_True, ::dbtools::eInTableDefinitions ) );
@@ -340,7 +340,7 @@ void OHSQLTable::executeStatement(const ::rtl::OUString& _rStatement )
 {
     ::rtl::OUString sSQL = _rStatement;
     if(sSQL.lastIndexOf(',') == (sSQL.getLength()-1))
-        sSQL = sSQL.replaceAt(sSQL.getLength()-1,1,::rtl::OUString::createFromAscii(")"));
+        sSQL = sSQL.replaceAt(sSQL.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
 
     Reference< XStatement > xStmt = getConnection()->createStatement(  );
     if ( xStmt.is() )
diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx
index 44ce6dfbecc9..d055a87f2cbb 100644
--- a/connectivity/source/drivers/hsqldb/HTables.cxx
+++ b/connectivity/source/drivers/hsqldb/HTables.cxx
@@ -140,14 +140,14 @@ void OTables::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName)
         ::rtl::OUString sCatalog,sSchema,sTable;
         ::dbtools::qualifiedNameComponents(m_xMetaData,_sElementName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation);
 
-        ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP ");
+        ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "DROP " ));
 
         Reference<XPropertySet> xProp(xObject,UNO_QUERY);
         sal_Bool bIsView;
-        if((bIsView = (xProp.is() && ::comphelper::getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) == ::rtl::OUString::createFromAscii("VIEW")))) // here we have a view
-            aSql += ::rtl::OUString::createFromAscii("VIEW ");
+        if((bIsView = (xProp.is() && ::comphelper::getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW"))))) // here we have a view
+            aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW "));
         else
-            aSql += ::rtl::OUString::createFromAscii("TABLE ");
+            aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE "));
 
         ::rtl::OUString sComposedName(
             ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInDataManipulation ) );
diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx
index bfc9d5a44144..a433ed0c34a3 100644
--- a/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/connectivity/source/drivers/hsqldb/HUser.cxx
@@ -131,16 +131,16 @@ void OHSQLUser::findPrivilegesAndGrantPrivileges(const ::rtl::OUString& objName,
 
     if ( xRes.is() )
     {
-        static const ::rtl::OUString sSELECT    = ::rtl::OUString::createFromAscii("SELECT");
-        static const ::rtl::OUString sINSERT    = ::rtl::OUString::createFromAscii("INSERT");
-        static const ::rtl::OUString sUPDATE    = ::rtl::OUString::createFromAscii("UPDATE");
-        static const ::rtl::OUString sDELETE    = ::rtl::OUString::createFromAscii("DELETE");
-        static const ::rtl::OUString sREAD      = ::rtl::OUString::createFromAscii("READ");
-        static const ::rtl::OUString sCREATE    = ::rtl::OUString::createFromAscii("CREATE");
-        static const ::rtl::OUString sALTER     = ::rtl::OUString::createFromAscii("ALTER");
-        static const ::rtl::OUString sREFERENCE = ::rtl::OUString::createFromAscii("REFERENCE");
-        static const ::rtl::OUString sDROP      = ::rtl::OUString::createFromAscii("DROP");
-        static const ::rtl::OUString sYes       = ::rtl::OUString::createFromAscii("YES");
+        static const ::rtl::OUString sSELECT( RTL_CONSTASCII_USTRINGPARAM( "SELECT" ));
+        static const ::rtl::OUString sINSERT( RTL_CONSTASCII_USTRINGPARAM( "INSERT" ));
+        static const ::rtl::OUString sUPDATE( RTL_CONSTASCII_USTRINGPARAM( "UPDATE" ));
+        static const ::rtl::OUString sDELETE( RTL_CONSTASCII_USTRINGPARAM( "DELETE" ));
+        static const ::rtl::OUString sREAD( RTL_CONSTASCII_USTRINGPARAM( "READ" ));
+        static const ::rtl::OUString sCREATE( RTL_CONSTASCII_USTRINGPARAM( "CREATE" ));
+        static const ::rtl::OUString sALTER( RTL_CONSTASCII_USTRINGPARAM( "ALTER" ));
+        static const ::rtl::OUString sREFERENCE( RTL_CONSTASCII_USTRINGPARAM( "REFERENCE" ));
+        static const ::rtl::OUString sDROP( RTL_CONSTASCII_USTRINGPARAM( "DROP" ));
+        static const ::rtl::OUString sYes( RTL_CONSTASCII_USTRINGPARAM( "YES" ));
 
         nRightsWithGrant = nRights = 0;
 
@@ -239,12 +239,12 @@ void SAL_CALL OHSQLUser::grantPrivileges( const ::rtl::OUString& objName, sal_In
     if(sPrivs.getLength())
     {
         ::rtl::OUString sGrant;
-        sGrant += ::rtl::OUString::createFromAscii("GRANT ");
+        sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GRANT "));
         sGrant += sPrivs;
-        sGrant += ::rtl::OUString::createFromAscii(" ON ");
+        sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON "));
         Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
         sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation);
-        sGrant += ::rtl::OUString::createFromAscii(" TO ");
+        sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" TO "));
         sGrant += m_Name;
 
         Reference<XStatement> xStmt = m_xConnection->createStatement();
@@ -269,12 +269,12 @@ void SAL_CALL OHSQLUser::revokePrivileges( const ::rtl::OUString& objName, sal_I
     if(sPrivs.getLength())
     {
         ::rtl::OUString sGrant;
-        sGrant += ::rtl::OUString::createFromAscii("REVOKE ");
+        sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REVOKE "));
         sGrant += sPrivs;
-        sGrant += ::rtl::OUString::createFromAscii(" ON ");
+        sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON "));
         Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
         sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation);
-        sGrant += ::rtl::OUString::createFromAscii(" FROM ");
+        sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM "));
         sGrant += m_Name;
 
         Reference<XStatement> xStmt = m_xConnection->createStatement();
@@ -290,11 +290,11 @@ void SAL_CALL OHSQLUser::changePassword( const ::rtl::OUString& /*oldPassword*/,
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed);
     ::rtl::OUString sAlterPwd;
-    sAlterPwd = ::rtl::OUString::createFromAscii("SET PASSWORD FOR ");
+    sAlterPwd = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SET PASSWORD FOR "));
     sAlterPwd += m_Name;
-    sAlterPwd += ::rtl::OUString::createFromAscii("@\"%\" = PASSWORD('") ;
+    sAlterPwd += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("@\"%\" = PASSWORD('")) ;
     sAlterPwd += newPassword;
-    sAlterPwd += ::rtl::OUString::createFromAscii("')") ;
+    sAlterPwd += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("')")) ;
 
 
     Reference<XStatement> xStmt = m_xConnection->createStatement();
@@ -309,41 +309,41 @@ void SAL_CALL OHSQLUser::changePassword( const ::rtl::OUString& /*oldPassword*/,
 {
     ::rtl::OUString sPrivs;
     if((nRights & Privilege::INSERT) == Privilege::INSERT)
-        sPrivs += ::rtl::OUString::createFromAscii("INSERT");
+        sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INSERT"));
 
     if((nRights & Privilege::DELETE) == Privilege::DELETE)
     {
         if(sPrivs.getLength())
-            sPrivs += ::rtl::OUString::createFromAscii(",");
-        sPrivs += ::rtl::OUString::createFromAscii("DELETE");
+            sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+        sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DELETE"));
     }
 
     if((nRights & Privilege::UPDATE) == Privilege::UPDATE)
     {
         if(sPrivs.getLength())
-            sPrivs += ::rtl::OUString::createFromAscii(",");
-        sPrivs += ::rtl::OUString::createFromAscii("UPDATE");
+            sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+        sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UPDATE"));
     }
 
     if((nRights & Privilege::ALTER) == Privilege::ALTER)
     {
         if(sPrivs.getLength())
-            sPrivs += ::rtl::OUString::createFromAscii(",");
-        sPrivs += ::rtl::OUString::createFromAscii("ALTER");
+            sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+        sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ALTER"));
     }
 
     if((nRights & Privilege::SELECT) == Privilege::SELECT)
     {
         if(sPrivs.getLength())
-            sPrivs += ::rtl::OUString::createFromAscii(",");
-        sPrivs += ::rtl::OUString::createFromAscii("SELECT");
+            sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+        sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT"));
     }
 
     if((nRights & Privilege::REFERENCE) == Privilege::REFERENCE)
     {
         if(sPrivs.getLength())
-            sPrivs += ::rtl::OUString::createFromAscii(",");
-        sPrivs += ::rtl::OUString::createFromAscii("REFERENCES");
+            sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+        sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REFERENCES"));
     }
 
     return sPrivs;
diff --git a/connectivity/source/drivers/hsqldb/HUsers.cxx b/connectivity/source/drivers/hsqldb/HUsers.cxx
index e9c2ead9d733..a99d62bb7d64 100644
--- a/connectivity/source/drivers/hsqldb/HUsers.cxx
+++ b/connectivity/source/drivers/hsqldb/HUsers.cxx
@@ -81,18 +81,18 @@ Reference< XPropertySet > OUsers::createDescriptor()
 // XAppend
 sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
-    ::rtl::OUString aSql    = ::rtl::OUString::createFromAscii("GRANT USAGE ON * TO ");
+    ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "GRANT USAGE ON * TO " ));
     ::rtl::OUString aQuote  = m_xConnection->getMetaData()->getIdentifierQuoteString(  );
     ::rtl::OUString sUserName( _rForName );
     aSql += ::dbtools::quoteName(aQuote,sUserName)
-                + ::rtl::OUString::createFromAscii(" @\"%\" ");
+                + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" @\"%\" "));
     ::rtl::OUString sPassword;
     descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD)) >>= sPassword;
     if ( sPassword.getLength() )
     {
-        aSql += ::rtl::OUString::createFromAscii(" IDENTIFIED BY '");
+        aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" IDENTIFIED BY '"));
         aSql += sPassword;
-        aSql += ::rtl::OUString::createFromAscii("'");
+        aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"));
     }
 
     Reference< XStatement > xStmt = m_xConnection->createStatement(  );
@@ -107,7 +107,7 @@ sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const
 void OUsers::dropObject(sal_Int32 /*nPos*/,const ::rtl::OUString _sElementName)
 {
     {
-        ::rtl::OUString aSql    = ::rtl::OUString::createFromAscii("REVOKE ALL ON * FROM ");
+        ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "REVOKE ALL ON * FROM " ));
         ::rtl::OUString aQuote  = m_xConnection->getMetaData()->getIdentifierQuoteString(  );
         aSql += ::dbtools::quoteName(aQuote,_sElementName);
 
diff --git a/connectivity/source/drivers/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx
index 1ead660ac9be..edc01233dc65 100644
--- a/connectivity/source/drivers/hsqldb/HViews.cxx
+++ b/connectivity/source/drivers/hsqldb/HViews.cxx
@@ -119,7 +119,7 @@ void HViews::dropObject(sal_Int32 _nPos,const ::rtl::OUString /*_sElementName*/)
     sal_Bool bIsNew = connectivity::sdbcx::ODescriptor::isNew( xObject );
     if (!bIsNew)
     {
-        ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP VIEW");
+        ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "DROP VIEW" ));
 
         Reference<XPropertySet> xProp(xObject,UNO_QUERY);
         aSql += ::dbtools::composeTableName( m_xMetaData, xProp, ::dbtools::eInTableDefinitions, false, false, true );
@@ -142,13 +142,13 @@ void HViews::createView( const Reference< XPropertySet >& descriptor )
 {
     Reference<XConnection> xConnection = static_cast<OHCatalog&>(m_rParent).getConnection();
 
-    ::rtl::OUString aSql    = ::rtl::OUString::createFromAscii("CREATE VIEW ");
+    ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "CREATE VIEW " ));
     ::rtl::OUString aQuote  = xConnection->getMetaData()->getIdentifierQuoteString(  );
     ::rtl::OUString sSchema,sCommand;
 
     aSql += ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInTableDefinitions, false, false, true );
 
-    aSql += ::rtl::OUString::createFromAscii(" AS ");
+    aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" AS "));
     descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND)) >>= sCommand;
     aSql += sCommand;
 
diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx
index fd21de93b1d9..dfc36f425d54 100644
--- a/connectivity/source/drivers/hsqldb/Hservices.cxx
+++ b/connectivity/source/drivers/hsqldb/Hservices.cxx
@@ -63,9 +63,9 @@ void REGISTER_PROVIDER(
         const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
 {
     OUString aMainKeyName;
-    aMainKeyName = OUString::createFromAscii("/");
+    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString::createFromAscii("/UNO/SERVICES");
+    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
 
     Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
     OSL_ENSURE(xNewKey.is(), "ADABAS::component_writeInfo : could not create a registry key !");
diff --git a/connectivity/source/drivers/hsqldb/hsqlui.hrc b/connectivity/source/drivers/hsqldb/hsqlui.hrc
index fe20ec5eaf21..2f25d5a8c198 100644
--- a/connectivity/source/drivers/hsqldb/hsqlui.hrc
+++ b/connectivity/source/drivers/hsqldb/hsqlui.hrc
@@ -29,7 +29,6 @@
 #define CONNECTIVITY_HSQLUI_HRC
 
 #define LINKED_TEXT_TABLE_IMAGE_RESOURCE        "linked_text_table.png"
-#define LINKED_TEXT_TABLE_IMAGE_RESOURCE_HC     "linked_text_table_hc.png"
 
 #endif // CONNECTIVITY_HSQLUI_HRC
 
diff --git a/connectivity/source/drivers/hsqldb/hsqlui.src b/connectivity/source/drivers/hsqldb/hsqlui.src
index a2886c1a18cf..913f366429ea 100644
--- a/connectivity/source/drivers/hsqldb/hsqlui.src
+++ b/connectivity/source/drivers/hsqldb/hsqlui.src
@@ -32,7 +32,7 @@
 /*  Note:
     The resource file built here (hsqldb.res, finally) is *not* included
     in the final OOo installation. Instead, it is only built to ensure that
-    the two images below are included in the application-wide image repository
+    the image below is included in the application-wide image repository
     (images.zip). This way, they can be accessed at runtime, but without the
     indirection via a resource file - the GraphicProvider service supports
     a "private:imagerepository/*" protocol meanwhile, which allows this.
@@ -46,8 +46,3 @@ Image 1000
 {
     ImageBitmap = Bitmap { File = LINKED_TEXT_TABLE_IMAGE_RESOURCE; };
 };
-
-Image 1001
-{
-    ImageBitmap = Bitmap { File = LINKED_TEXT_TABLE_IMAGE_RESOURCE_HC; };
-};
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx
index 18ea813b25a1..71cf96564034 100644
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -65,7 +65,7 @@ java_sql_Driver::~java_sql_Driver()
 //------------------------------------------------------------------------------
 rtl::OUString java_sql_Driver::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.sdbc.JDBCDriver");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdbc.JDBCDriver"));
         // this name is referenced in the configuration and in the jdbc.xml
         // Please take care when changing it.
 }
@@ -73,7 +73,7 @@ rtl::OUString java_sql_Driver::getImplementationName_Static(  ) throw(RuntimeExc
 Sequence< ::rtl::OUString > java_sql_Driver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
 {
     Sequence< ::rtl::OUString > aSNS( 1 );
-    aSNS[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.Driver");
+    aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver"));
     return aSNS;
 }
 //------------------------------------------------------------------
@@ -129,7 +129,7 @@ sal_Bool SAL_CALL java_sql_Driver::acceptsURL( const ::rtl::OUString& url ) thro
     // I feel responsible for all jdbc url's
     sal_Bool bEnabled = sal_False;
     OSL_VERIFY_EQUALS( jfw_getEnabled( &bEnabled ), JFW_E_NONE, "error in jfw_getEnabled" );
-    static const ::rtl::OUString s_sJdbcPrefix = ::rtl::OUString::createFromAscii("jdbc:");
+    static const ::rtl::OUString s_sJdbcPrefix( RTL_CONSTASCII_USTRINGPARAM( "jdbc:" ));
     return bEnabled && 0 == url.compareTo(s_sJdbcPrefix, 5);
 }
 // -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx
index 585464125b9d..f29909d94fbd 100644
--- a/connectivity/source/drivers/jdbc/jservices.cxx
+++ b/connectivity/source/drivers/jdbc/jservices.cxx
@@ -61,9 +61,9 @@ void REGISTER_PROVIDER(
         const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
 {
     OUString aMainKeyName;
-    aMainKeyName = OUString::createFromAscii("/");
+    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString::createFromAscii("/UNO/SERVICES");
+    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
 
     Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
     OSL_ENSURE(xNewKey.is(), "SBA::component_writeInfo : could not create a registry key !");
diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
index 8ae1227a0062..e27ce35bce04 100644
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
@@ -220,7 +220,7 @@ sal_Bool SAL_CALL KabDatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLE
 ::rtl::OUString SAL_CALL KabDatabaseMetaData::getIdentifierQuoteString(  ) throw(SQLException, RuntimeException)
 {
     // normally this is "
-    ::rtl::OUString aVal = ::rtl::OUString::createFromAscii("\"");
+    ::rtl::OUString aVal(RTL_CONSTASCII_USTRINGPARAM("\""));
     return aVal;
 }
 // -------------------------------------------------------------------------
@@ -567,7 +567,7 @@ sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(S
 {
     // if someday we support more than the default address book,
     // this method should return the URL which was used to create it
-    ::rtl::OUString aValue = ::rtl::OUString::createFromAscii("sdbc:address:kab:");
+    ::rtl::OUString aValue( RTL_CONSTASCII_USTRINGPARAM( "sdbc:address:kab:" ));
     return aValue;
 }
 // -------------------------------------------------------------------------
@@ -579,13 +579,13 @@ sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(S
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL KabDatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue = ::rtl::OUString::createFromAscii("kab");
+    ::rtl::OUString aValue( RTL_CONSTASCII_USTRINGPARAM( "kab" ));
     return aValue;
 }
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL KabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue = ::rtl::OUString::createFromAscii(KAB_DRIVER_VERSION);
+    ::rtl::OUString aValue(RTL_CONSTASCII_USTRINGPARAM(KAB_DRIVER_VERSION));
     return aValue;
 }
 // -------------------------------------------------------------------------
@@ -792,7 +792,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTableTypes(  ) throw(SQ
     Reference< XResultSet > xRef = pResult;
 
     static ODatabaseMetaDataResultSet::ORows aRows;
-    static const ::rtl::OUString aTable(::rtl::OUString::createFromAscii("TABLE"));
+    static const ::rtl::OUString aTable(RTL_CONSTASCII_USTRINGPARAM("TABLE"));
 
     if (aRows.empty())
     {
@@ -816,7 +816,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTypeInfo(  ) throw(SQLE
         ODatabaseMetaDataResultSet::ORow aRow(19);
 
         aRow[0] = ODatabaseMetaDataResultSet::getEmptyValue();
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("CHAR"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CHAR")));
         aRow[2] = new ORowSetValueDecorator(DataType::CHAR);
         aRow[3] = new ORowSetValueDecorator((sal_Int32) 254);
         aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue();
@@ -887,7 +887,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns(
         aRow[14] = ODatabaseMetaDataResultSet::getEmptyValue();
         aRow[15] = ODatabaseMetaDataResultSet::getEmptyValue();
         aRow[16] = new ORowSetValueDecorator((sal_Int32) 254);
-        aRow[18] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("YES"));
+        aRow[18] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YES")));
 
         sal_Int32 nPosition = 1;
         QString aQtName;
@@ -899,7 +899,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns(
         {
             aRow[4] = new ORowSetValueDecorator(sName);
             aRow[5] = new ORowSetValueDecorator(DataType::TIMESTAMP);
-            aRow[6] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("TIMESTAMP"));
+            aRow[6] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP")));
             aRow[17] = new ORowSetValueDecorator(nPosition++);
             aRows.push_back(aRow);
         }
@@ -917,7 +917,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns(
             {
                 aRow[4] = new ORowSetValueDecorator(sName);
                 aRow[5] = new ORowSetValueDecorator(DataType::CHAR);
-                aRow[6] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("CHAR"));
+                aRow[6] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CHAR")));
                 aRow[7] = new ORowSetValueDecorator((sal_Int32) 256);
 // Might be VARCHAR and not CHAR[256]...
                 aRow[17] = new ORowSetValueDecorator(nPosition);
@@ -941,7 +941,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTables(
     // check whether we have tables in the requested types
     // for the moment, we answer only the "TABLE" table type
     // when no types are given at all, we return all the tables
-    static const ::rtl::OUString aTable(::rtl::OUString::createFromAscii("TABLE"));
+    static const ::rtl::OUString aTable(RTL_CONSTASCII_USTRINGPARAM("TABLE"));
     sal_Bool bTableFound = sal_False;
     const ::rtl::OUString* p = types.getConstArray(),
                          * pEnd = p + types.getLength();
@@ -1014,7 +1014,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getVersionColumns(
 
         aRow[2] = new ORowSetValueDecorator(sName);
         aRow[3] = new ORowSetValueDecorator(DataType::TIMESTAMP);
-        aRow[4] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("TIMESTAMP"));
+        aRow[4] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP")));
 
         aRow[5] = ODatabaseMetaDataResultSet::getEmptyValue();
         aRow[6] = ODatabaseMetaDataResultSet::getEmptyValue();
diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx
index df050f02812e..20105d9b5db0 100644
--- a/connectivity/source/drivers/kab/KDriver.cxx
+++ b/connectivity/source/drivers/kab/KDriver.cxx
@@ -126,7 +126,7 @@ bool KabImplModule::impl_loadModule()
     OSL_ENSURE( !m_hConnectorModule && !m_pConnectionFactoryFunc && !m_pApplicationInitFunc && !m_pApplicationShutdownFunc && !m_pKDEVersionCheckFunc,
         "KabImplModule::impl_loadModule: inconsistence: inconsistency (never attempted load before, but some values already set)!");
 
-    const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii( SAL_MODULENAME( "kabdrv1" ) );
+    const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM( SAL_MODULENAME( "kabdrv1" ) ));
     m_hConnectorModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, SAL_LOADMODULE_NOW );   // LAZY! #i61335#
     OSL_ENSURE( m_hConnectorModule, "KabImplModule::impl_loadModule: could not load the implementation library!" );
     if ( !m_hConnectorModule )
@@ -360,7 +360,7 @@ Sequence< ::rtl::OUString > KabDriver::getSupportedServiceNames_Static(  ) throw
     // which service is supported
     // for more information @see com.sun.star.sdbc.Driver
     Sequence< ::rtl::OUString > aSNS( 1 );
-    aSNS[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.Driver");
+    aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver"));
 
     return aSNS;
 }
@@ -418,7 +418,7 @@ sal_Bool SAL_CALL KabDriver::acceptsURL( const ::rtl::OUString& url )
         return sal_False;
 
     // here we have to look whether we support this URL format
-    return (!url.compareTo(::rtl::OUString::createFromAscii("sdbc:address:kab:"), 16));
+    return (!url.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:kab:")), 16));
 }
 // --------------------------------------------------------------------------------
 Sequence< DriverPropertyInfo > SAL_CALL KabDriver::getPropertyInfo( const ::rtl::OUString&, const Sequence< PropertyValue >& ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.cxx b/connectivity/source/drivers/kab/KResultSetMetaData.cxx
index b4739d632352..95fed3057cfc 100644
--- a/connectivity/source/drivers/kab/KResultSetMetaData.cxx
+++ b/connectivity/source/drivers/kab/KResultSetMetaData.cxx
@@ -52,7 +52,7 @@ KabResultSetMetaData::~KabResultSetMetaData()
 void KabResultSetMetaData::setKabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(SQLException)
 {
     OSQLColumns::Vector::const_iterator aIter;
-    static const ::rtl::OUString aName(::rtl::OUString::createFromAscii("Name"));
+    static const ::rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM("Name"));
 
     for (aIter = xColumns->get().begin(); aIter != xColumns->get().end(); ++aIter)
     {
diff --git a/connectivity/source/drivers/kab/KServices.cxx b/connectivity/source/drivers/kab/KServices.cxx
index b2d4ef8f3da8..94cc95b689cb 100644
--- a/connectivity/source/drivers/kab/KServices.cxx
+++ b/connectivity/source/drivers/kab/KServices.cxx
@@ -63,9 +63,9 @@ void REGISTER_PROVIDER(
         const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
 {
     OUString aMainKeyName;
-    aMainKeyName = OUString::createFromAscii("/");
+    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString::createFromAscii("/UNO/SERVICES");
+    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
 
     Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
     OSL_ENSURE(xNewKey.is(), "KAB::component_writeInfo : could not create a registry key !");
diff --git a/connectivity/source/drivers/macab/MacabAddressBook.cxx b/connectivity/source/drivers/macab/MacabAddressBook.cxx
index 346336ae6be8..1f273ad52b99 100644
--- a/connectivity/source/drivers/macab/MacabAddressBook.cxx
+++ b/connectivity/source/drivers/macab/MacabAddressBook.cxx
@@ -81,7 +81,7 @@ const ::rtl::OUString & MacabAddressBook::getDefaultTableName()
 {
     /* This string probably needs to be localized. */
     static const ::rtl::OUString aDefaultTableName
-        (::rtl::OUString::createFromAscii("Address Book"));
+        (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Address Book")));
 
     return aDefaultTableName;
 }
@@ -247,9 +247,9 @@ void MacabAddressBook::manageDuplicateGroups(::std::vector<MacabGroup *> _xGroup
         if(count != 1)
         {
             ::rtl::OUString sName = (*iter1)->getName();
-            sName += ::rtl::OUString::createFromAscii(" (") +
+            sName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" (")) +
                 ::rtl::OUString::valueOf(count) +
-                ::rtl::OUString::createFromAscii(")");
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
             (*iter1)->setName(sName);
         }
     }
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
index a7217c6bd666..896a5ca04c91 100644
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
@@ -217,7 +217,7 @@ sal_Bool SAL_CALL MacabDatabaseMetaData::supportsNonNullableColumns(  ) throw(SQ
 ::rtl::OUString SAL_CALL MacabDatabaseMetaData::getIdentifierQuoteString(  ) throw(SQLException, RuntimeException)
 {
     // normally this is "
-    ::rtl::OUString aVal = ::rtl::OUString::createFromAscii("\"");
+    ::rtl::OUString aVal(RTL_CONSTASCII_USTRINGPARAM("\""));
     return aVal;
 }
 // -------------------------------------------------------------------------
@@ -564,7 +564,7 @@ sal_Bool SAL_CALL MacabDatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw
 {
     // if someday we support more than the default address book,
     // this method should return the URL which was used to create it
-    ::rtl::OUString aValue = ::rtl::OUString::createFromAscii("sdbc:address:macab:");
+    ::rtl::OUString aValue( RTL_CONSTASCII_USTRINGPARAM( "sdbc:address:macab:" ));
     return aValue;
 }
 // -------------------------------------------------------------------------
@@ -576,13 +576,13 @@ sal_Bool SAL_CALL MacabDatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL MacabDatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue = ::rtl::OUString::createFromAscii("macab");
+    ::rtl::OUString aValue( RTL_CONSTASCII_USTRINGPARAM( "macab" ));
     return aValue;
 }
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL MacabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue = ::rtl::OUString::createFromAscii(MACAB_DRIVER_VERSION);
+    ::rtl::OUString aValue(RTL_CONSTASCII_USTRINGPARAM(MACAB_DRIVER_VERSION));
     return aValue;
 }
 // -------------------------------------------------------------------------
@@ -789,7 +789,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTableTypes(  ) throw(
     Reference< XResultSet > xRef = pResult;
 
     static ODatabaseMetaDataResultSet::ORows aRows;
-    static const ::rtl::OUString aTable(::rtl::OUString::createFromAscii("TABLE"));
+    static const ::rtl::OUString aTable(RTL_CONSTASCII_USTRINGPARAM("TABLE"));
 
     if (aRows.empty())
     {
@@ -814,7 +814,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTypeInfo(  ) throw(SQ
 
         // We support four types: char, timestamp, integer, float
         aRow[0] = ODatabaseMetaDataResultSet::getEmptyValue();
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("CHAR"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CHAR")));
         aRow[2] = new ORowSetValueDecorator(DataType::CHAR);
         aRow[3] = new ORowSetValueDecorator((sal_Int32) 254);
         aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue();
@@ -835,20 +835,20 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTypeInfo(  ) throw(SQ
 
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("TIMESTAMP"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP")));
         aRow[2] = new ORowSetValueDecorator(DataType::TIMESTAMP);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)19);
         aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("INTEGER"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INTEGER")));
         aRow[2] = new ORowSetValueDecorator(DataType::INTEGER);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)20);
         aRow[15] = new ORowSetValueDecorator((sal_Int32)20);
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("FLOAT"));
+        aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FLOAT")));
         aRow[2] = new ORowSetValueDecorator(DataType::FLOAT);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)20);
         aRow[15] = new ORowSetValueDecorator((sal_Int32)15);
@@ -909,7 +909,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumns(
         aRow[14] = ODatabaseMetaDataResultSet::getEmptyValue();
         aRow[15] = ODatabaseMetaDataResultSet::getEmptyValue();
         aRow[16] = new ORowSetValueDecorator((sal_Int32) 254);
-        aRow[18] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("YES"));
+        aRow[18] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YES")));
 
         sal_Int32 nPosition = 1;
         ::rtl::OUString sName;
@@ -930,24 +930,24 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumns(
                 {
                     case kABStringProperty:
                         aRow[5] = new ORowSetValueDecorator(DataType::CHAR);
-                        aRow[6] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("CHAR"));
+                        aRow[6] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CHAR")));
                         aRow[7] = new ORowSetValueDecorator((sal_Int32) 256);
                         aRows.push_back(aRow);
                         break;
                     case kABDateProperty:
                         aRow[5] = new ORowSetValueDecorator(DataType::TIMESTAMP);
-                        aRow[6] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("TIMESTAMP"));
+                        aRow[6] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP")));
                         aRows.push_back(aRow);
                         break;
                     case kABIntegerProperty:
                         aRow[5] = new ORowSetValueDecorator(DataType::INTEGER);
-                        aRow[6] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("INTEGER"));
+                        aRow[6] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INTEGER")));
                         aRow[7] = new ORowSetValueDecorator((sal_Int32) 20);
                         aRows.push_back(aRow);
                         break;
                     case kABRealProperty:
                         aRow[5] = new ORowSetValueDecorator(DataType::FLOAT);
-                        aRow[6] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("FLOAT"));
+                        aRow[6] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FLOAT")));
                         aRow[7] = new ORowSetValueDecorator((sal_Int32) 15);
                         aRows.push_back(aRow);
                         break;
@@ -974,7 +974,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables(
     // check whether we have tables in the requested types
     // for the moment, we answer only the "TABLE" table type
     // when no types are given at all, we return all the tables
-    static const ::rtl::OUString aTable(::rtl::OUString::createFromAscii("TABLE"));
+    static const ::rtl::OUString aTable(RTL_CONSTASCII_USTRINGPARAM("TABLE"));
     sal_Bool bTableFound = sal_False;
     const ::rtl::OUString* p = types.getConstArray(),
                          * pEnd = p + types.getLength();
@@ -1058,7 +1058,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getVersionColumns(
         aRow[1] = ODatabaseMetaDataResultSet::getEmptyValue();
         aRow[2] = new ORowSetValueDecorator(sName);
         aRow[3] = new ORowSetValueDecorator(DataType::TIMESTAMP);
-        aRow[4] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("TIMESTAMP"));
+        aRow[4] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP")));
 
         aRow[5] = ODatabaseMetaDataResultSet::getEmptyValue();
         aRow[6] = ODatabaseMetaDataResultSet::getEmptyValue();
diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx
index 796b814710db..ed6c40867c2a 100644
--- a/connectivity/source/drivers/macab/MacabDriver.cxx
+++ b/connectivity/source/drivers/macab/MacabDriver.cxx
@@ -104,7 +104,7 @@ bool MacabImplModule::impl_loadModule()
     OSL_ENSURE( !m_hConnectorModule && !m_pConnectionFactoryFunc,
         "MacabImplModule::impl_loadModule: inconsistence: inconsistency (never attempted load before, but some values already set)!");
 
-    const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii( SAL_MODULENAME( "macabdrv1" ) );
+    const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM( SAL_MODULENAME( "macabdrv1" )) );
     m_hConnectorModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, SAL_LOADMODULE_NOW );   // LAZY! #i61335#
     OSL_ENSURE( m_hConnectorModule, "MacabImplModule::impl_loadModule: could not load the implementation library!" );
     if ( !m_hConnectorModule )
@@ -235,7 +235,7 @@ Sequence< ::rtl::OUString > MacabDriver::getSupportedServiceNames_Static(  ) thr
     // which service is supported
     // for more information @see com.sun.star.sdbc.Driver
     Sequence< ::rtl::OUString > aSNS( 1 );
-    aSNS[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.Driver");
+    aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver"));
 
     return aSNS;
 }
@@ -293,7 +293,7 @@ sal_Bool SAL_CALL MacabDriver::acceptsURL( const ::rtl::OUString& url )
         return sal_False;
 
     // here we have to look whether we support this URL format
-    return (!url.compareTo(::rtl::OUString::createFromAscii("sdbc:address:macab:"), 18));
+    return (!url.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:macab:")), 18));
 }
 // --------------------------------------------------------------------------------
 Sequence< DriverPropertyInfo > SAL_CALL MacabDriver::getPropertyInfo( const ::rtl::OUString&, const Sequence< PropertyValue >& ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx
index 02c3a90cf511..93cb89f8dec3 100644
--- a/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/connectivity/source/drivers/macab/MacabRecords.cxx
@@ -568,7 +568,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert
                 multiLabelString = CFStringToOUString(localizedMultiLabel);
                 CFRelease(multiLabel);
                 CFRelease(localizedMultiLabel);
-                headerNameString = multiPropertyString + ::rtl::OUString::createFromAscii(": ") + fixLabel(multiLabelString);
+                headerNameString = multiPropertyString + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": ")) + fixLabel(multiLabelString);
                 headerNames[i] = new macabfield;
                 headerNames[i]->value = OUStringToCFString(headerNameString);
                 headerNames[i]->type = multiType;
@@ -619,7 +619,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert
                     if(multiValue && multiLabel)
                     {
                         localizedMultiLabel = ABCopyLocalizedPropertyOrLabel(multiLabel);
-                        multiLabelString = multiPropertyString + ::rtl::OUString::createFromAscii(": ") + fixLabel(CFStringToOUString(localizedMultiLabel));
+                        multiLabelString = multiPropertyString + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": ")) + fixLabel(CFStringToOUString(localizedMultiLabel));
                         CFRelease(multiLabel);
                         CFRelease(localizedMultiLabel);
                         multiLabel = OUStringToCFString(multiLabelString);
@@ -707,7 +707,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert
                 dictType = (ABPropertyType) getABTypeFromCFType( CFGetTypeID(dictValues[i]) );
                 localizedDictKey = ABCopyLocalizedPropertyOrLabel(dictKeys[i]);
                 dictKeyString = CFStringToOUString(localizedDictKey);
-                dictLabelString = propertyNameString + ::rtl::OUString::createFromAscii(": ") + fixLabel(dictKeyString);
+                dictLabelString = propertyNameString + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": ")) + fixLabel(dictKeyString);
                 dictLabel = OUStringToCFString(dictLabelString);
                 dictHeaders[i] = createHeaderForProperty(dictType, dictValues[i], dictLabel);
                 if (!dictHeaders[i])
@@ -847,7 +847,7 @@ void MacabRecords::manageDuplicateHeaders(macabfield **_headerNames, const sal_I
             // There is probably a better way to do this...
             ::rtl::OUString newName = CFStringToOUString((CFStringRef) _headerNames[i]->value);
             CFRelease(_headerNames[i]->value);
-            newName += ::rtl::OUString::createFromAscii(" (") + ::rtl::OUString::valueOf(count) + ::rtl::OUString::createFromAscii(")");
+            newName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" (")) + ::rtl::OUString::valueOf(count) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
             _headerNames[i]->value = OUStringToCFString(newName);
         }
     }
@@ -968,7 +968,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT
                     {
                         bPlaced = sal_False;
                         i++;
-                        columnName = ::rtl::OUString(_propertyName) + ::rtl::OUString::createFromAscii(" (") + ::rtl::OUString::valueOf(i) + ::rtl::OUString::createFromAscii(")");
+                        columnName = ::rtl::OUString(_propertyName) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" (")) + ::rtl::OUString::valueOf(i) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
                     }
 
                     // success!
@@ -1040,7 +1040,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT
                     localizedDictKey = ABCopyLocalizedPropertyOrLabel(dictKeys[i]);
                     dictKeyString = CFStringToOUString(localizedDictKey);
                     CFRelease(localizedDictKey);
-                    newPropertyName = _propertyName + ::rtl::OUString::createFromAscii(": ") + fixLabel(dictKeyString);
+                    newPropertyName = _propertyName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": ")) + fixLabel(dictKeyString);
                     insertPropertyIntoMacabRecord(_abrecord, _header, newPropertyName, dictValues[i]);
                 }
 
@@ -1083,7 +1083,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT
 
                     localizedMultiLabel = ABCopyLocalizedPropertyOrLabel(multiLabel);
                     multiLabelString = CFStringToOUString(localizedMultiLabel);
-                    newPropertyName = _propertyName + ::rtl::OUString::createFromAscii(": ") + fixLabel(multiLabelString);
+                    newPropertyName = _propertyName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": ")) + fixLabel(multiLabelString);
                     insertPropertyIntoMacabRecord(multiType, _abrecord, _header, newPropertyName, multiValue);
 
                     /* free our variables */
diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx
index 242e92f3cc13..6bc7d7ccca3d 100644
--- a/connectivity/source/drivers/macab/MacabResultSet.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.cxx
@@ -890,7 +890,7 @@ Any SAL_CALL MacabResultSet::getBookmark() throw( SQLException,  RuntimeExceptio
 
     if (m_nRowPos != -1 && m_nRowPos != nRecords)
     {
-        macabfield *uidField = m_aMacabRecords->getField(m_nRowPos,::rtl::OUString::createFromAscii("UID"));
+        macabfield *uidField = m_aMacabRecords->getField(m_nRowPos,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UID")));
         if(uidField != NULL)
         {
             if(uidField->type == kABStringProperty)
@@ -912,7 +912,7 @@ sal_Bool SAL_CALL MacabResultSet::moveToBookmark(const  Any& bookmark) throw( SQ
 
     for (sal_Int32 nRow = 0; nRow < nRecords; nRow++)
     {
-        macabfield *uidField = m_aMacabRecords->getField(m_nRowPos,::rtl::OUString::createFromAscii("UID"));
+        macabfield *uidField = m_aMacabRecords->getField(m_nRowPos,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UID")));
         if(uidField != NULL)
         {
             if(uidField->type == kABStringProperty)
diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
index 21cd4e9727c5..69f77633e1db 100644
--- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
@@ -55,7 +55,7 @@ MacabResultSetMetaData::~MacabResultSetMetaData()
 void MacabResultSetMetaData::setMacabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(SQLException)
 {
     OSQLColumns::Vector::const_iterator aIter;
-    static const ::rtl::OUString aName(::rtl::OUString::createFromAscii("Name"));
+    static const ::rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM("Name"));
     MacabRecords *aRecords;
     MacabHeader *aHeader;
 
diff --git a/connectivity/source/drivers/macab/MacabServices.cxx b/connectivity/source/drivers/macab/MacabServices.cxx
index cc3535ec5586..368bbd3db2fb 100644
--- a/connectivity/source/drivers/macab/MacabServices.cxx
+++ b/connectivity/source/drivers/macab/MacabServices.cxx
@@ -63,9 +63,9 @@ void REGISTER_PROVIDER(
         const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
 {
     OUString aMainKeyName;
-    aMainKeyName = OUString::createFromAscii("/");
+    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString::createFromAscii("/UNO/SERVICES");
+    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
 
     Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
     OSL_ENSURE(xNewKey.is(), "MACAB::component_writeInfo : could not create a registry key !");
diff --git a/connectivity/source/drivers/macab/macabutilities.hxx b/connectivity/source/drivers/macab/macabutilities.hxx
index 2f128ed000a0..97e84c218986 100644
--- a/connectivity/source/drivers/macab/macabutilities.hxx
+++ b/connectivity/source/drivers/macab/macabutilities.hxx
@@ -111,7 +111,7 @@ namespace connectivity
             /* Get the length, and make sure that there is actually a string
              * here.
              */
-            if(_originalLabel.indexOf(::rtl::OUString::createFromAscii("_$!<")) == 0)
+            if(_originalLabel.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_$!<"))) == 0)
             {
                 return _originalLabel.copy(4,_originalLabel.getLength()-8);
             }
diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx
index 0e4d36fe4daa..1ef4cf3ebe74 100644
--- a/connectivity/source/drivers/mozab/MConfigAccess.cxx
+++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx
@@ -58,7 +58,7 @@ namespace connectivity
 
                 if ( xConfigProvider.is() )
                 {
-                    ::rtl::OUString sCompleteNodePath = ::rtl::OUString::createFromAscii ("/org.openoffice.Office.DataAccess/DriverSettings/" );
+                    ::rtl::OUString sCompleteNodePath(RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.DataAccess/DriverSettings/" ));
                     sCompleteNodePath += OConnection::getDriverImplementationName();
 
                     //=========================================================
diff --git a/connectivity/source/drivers/mozab/MConnection.cxx b/connectivity/source/drivers/mozab/MConnection.cxx
index 68a2349a347e..9a36f943ff2c 100644
--- a/connectivity/source/drivers/mozab/MConnection.cxx
+++ b/connectivity/source/drivers/mozab/MConnection.cxx
@@ -101,7 +101,7 @@ const sal_Char* getSdbcScheme( SdbcScheme _eScheme )
 // -----------------------------------------------------------------------------
 ::rtl::OUString OConnection::getDriverImplementationName()
 {
-    return rtl::OUString::createFromAscii(MOZAB_DRIVER_IMPL_NAME);
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MOZAB_DRIVER_IMPL_NAME));
 }
 
 // -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx
index c88c6742e6b9..c0f0a39316bb 100644
--- a/connectivity/source/drivers/mozab/MDriver.cxx
+++ b/connectivity/source/drivers/mozab/MDriver.cxx
@@ -93,7 +93,7 @@ void MozabDriver::disposing()
 //------------------------------------------------------------------------------
 rtl::OUString MozabDriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return rtl::OUString::createFromAscii(MOZAB_DRIVER_IMPL_NAME);
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MOZAB_DRIVER_IMPL_NAME));
         // this name is referenced in the configuration and in the mozab.xml
         // Please take care when changing it.
 }
@@ -159,7 +159,7 @@ Reference< XConnection > SAL_CALL MozabDriver::connect( const ::rtl::OUString& u
         ::connectivity::SharedResources aResources;
         const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution(
                 STR_COULD_NOT_LOAD_LIB,
-                "$libname$", ::rtl::OUString::createFromAscii( SVLIBRARY( "mozabdrv" ) )
+                "$libname$", ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "mozabdrv" )) )
              ) );
 
         ::dbtools::throwGenericSQLException(sError,*this);
@@ -237,7 +237,7 @@ EDriverType MozabDriver::impl_classifyURL( const ::rtl::OUString& url )
         // There isn't any subschema: - but could be just subschema
         if ( aAddrbookURI.getLength() > 0 )
             aAddrbookScheme= aAddrbookURI;
-        else if(url == ::rtl::OUString::createFromAscii("sdbc:address:") )
+        else if(url == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:")) )
             return Unknown; // TODO check
         else
             return Unknown;
@@ -301,7 +301,7 @@ bool MozabDriver::ensureInit()
 
     OSL_ENSURE(NULL == m_pCreationFunc, "MozabDriver::ensureInit: inconsistence: already have a factory function!");
 
-    const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii(SVLIBRARY( "mozabdrv" ));
+    const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(SVLIBRARY( "mozabdrv" )));
 
     // load the mozabdrv library
     m_hModule = osl_loadModuleRelative(&thisModule, sModuleName.pData, 0);
diff --git a/connectivity/source/drivers/mozab/MServices.cxx b/connectivity/source/drivers/mozab/MServices.cxx
index 8fcca8ee58f4..f82bb012af98 100644
--- a/connectivity/source/drivers/mozab/MServices.cxx
+++ b/connectivity/source/drivers/mozab/MServices.cxx
@@ -162,7 +162,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
 typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const Reference< XMultiServiceFactory >& _rxFactory );
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL createMozillaBootstrap(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception )
 {
-        const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii(SVLIBRARY( "mozabdrv" ));
+        const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(SVLIBRARY( "mozabdrv" )));
 
         // load the dbtools library
         oslModule s_hModule = osl_loadModuleRelative(
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
index b4cc37bb2f03..c7ca9e1287ff 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
@@ -97,7 +97,7 @@ void MozillaBootstrap::disposing()
 //------------------------------------------------------------------------------
 rtl::OUString MozillaBootstrap::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return rtl::OUString::createFromAscii(MOZAB_MozillaBootstrap_IMPL_NAME);
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MOZAB_MozillaBootstrap_IMPL_NAME));
 }
 //------------------------------------------------------------------------------
 Sequence< ::rtl::OUString > MozillaBootstrap::getSupportedServiceNames_Static(  ) throw (RuntimeException)
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
index f16c8f481a6f..5a731bdd8376 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
@@ -67,7 +67,7 @@ namespace
         ::rtl::OUString   aConfigPath;
 
         aSecurity.getConfigDir( aConfigPath );
-        return aConfigPath + ::rtl::OUString::createFromAscii( "/" );
+        return aConfigPath + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     }
 
     // -------------------------------------------------------------------
@@ -167,7 +167,7 @@ namespace
     if (product == MozillaProductType_Default)
         return ::rtl::OUString();
 
-    return getRegistryDir(product) + ::rtl::OUString::createFromAscii(APP_REGISTRY_NAME);
+    return getRegistryDir(product) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(APP_REGISTRY_NAME));
 }
 #endif
 
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
index 7e523f44e7fd..4ded64d6b6c5 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
@@ -62,7 +62,7 @@ IniParser::IniParser(OUString const & rIniName) throw(com::sun::star::io::IOExce
         sal_uInt64 nSize = 0;
 
         osl_getFileSize(handle, &nSize);
-        OUString sectionName = OUString::createFromAscii("no name section");
+        OUString sectionName( RTL_CONSTASCII_USTRINGPARAM( "no name section" ));
         while (true)
         {
             sal_uInt64 nPos;
@@ -93,7 +93,7 @@ IniParser::IniParser(OUString const & rIniName) throw(com::sun::star::io::IOExce
                     sectionName =  OStringToOUString(
                         line.copy(nIndexStart + 1,nIndexEnd - nIndexStart -1).trim(), RTL_TEXTENCODING_ASCII_US );
                     if (!sectionName.getLength())
-                        sectionName = OUString::createFromAscii("no name section");
+                        sectionName = OUString(RTL_CONSTASCII_USTRINGPARAM("no name section"));
 
                     ini_Section *aSection = &mAllSection[sectionName];
                     aSection->sName = sectionName;
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
index dbf1c598b5c8..4f1cbbeab47d 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
@@ -90,9 +90,9 @@ static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CI
 
 // Registry Keys
 
-static ::rtl::OUString szProfileSubtreeString=::rtl::OUString::createFromAscii("Profiles");
-static ::rtl::OUString szCurrentProfileString= ::rtl::OUString::createFromAscii("CurrentProfile");
-static ::rtl::OUString szDirectoryString =::rtl::OUString::createFromAscii("directory");
+static ::rtl::OUString szProfileSubtreeString( RTL_CONSTASCII_USTRINGPARAM( "Profiles" ));
+static ::rtl::OUString szCurrentProfileString( RTL_CONSTASCII_USTRINGPARAM( "CurrentProfile" ));
+static ::rtl::OUString szDirectoryString( RTL_CONSTASCII_USTRINGPARAM( "directory" ));
 
 #ifndef MAXPATHLEN
 #define MAXPATHLEN 1024
@@ -280,7 +280,7 @@ namespace connectivity
 #endif
             ::rtl::OUString regDir = getRegistryDir(product);
             ::rtl::OUString profilesIni( regDir );
-            profilesIni += ::rtl::OUString::createFromAscii( "profiles.ini" );
+            profilesIni += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("profiles.ini"));
             IniParser parser( profilesIni );
             IniSectionMap &mAllSection = *(parser.getAllSection());
 
@@ -299,19 +299,19 @@ namespace connectivity
                     itor++)
                 {
                         struct ini_NameValue * aValue = &(*itor);
-                        if (aValue->sName.equals(::rtl::OUString::createFromAscii("Name")))
+                        if (aValue->sName.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"))))
                         {
                             profileName = aValue->sValue;
                         }
-                        else if (aValue->sName.equals(::rtl::OUString::createFromAscii("IsRelative")))
+                        else if (aValue->sName.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRelative"))))
                         {
                             sIsRelative = aValue->sValue;
                         }
-                        else if (aValue->sName.equals(::rtl::OUString::createFromAscii("Path")))
+                        else if (aValue->sName.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Path"))))
                         {
                             profilePath = aValue->sValue;
                         }
-                        else if (aValue->sName.equals(::rtl::OUString::createFromAscii("Default")))
+                        else if (aValue->sName.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Default"))))
                         {
                             sIsDefault = aValue->sValue;
                         }
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx
index d411119e5281..de6be351a854 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx
@@ -78,7 +78,7 @@ void MNSTerminateListener::addTerminateListener()
 
     if( xFact.is() )
     {
-        Reference< XDesktop > xDesktop( xFact->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ), UNO_QUERY );
+        Reference< XDesktop > xDesktop( xFact->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), UNO_QUERY );
 
         if( xDesktop.is() )
             xDesktop->addTerminateListener(mxTerminateListener);
diff --git a/connectivity/source/drivers/mysql/YColumns.cxx b/connectivity/source/drivers/mysql/YColumns.cxx
index 25ed7d7a9c20..59c8abeae61f 100644
--- a/connectivity/source/drivers/mysql/YColumns.cxx
+++ b/connectivity/source/drivers/mysql/YColumns.cxx
@@ -83,7 +83,7 @@ void OMySQLColumn::construct()
 Sequence< ::rtl::OUString > SAL_CALL OMySQLColumn::getSupportedServiceNames(  ) throw(RuntimeException)
 {
     Sequence< ::rtl::OUString > aSupported(1);
-    aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Column");
+    aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Column"));
 
     return aSupported;
 }
diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx
index dc96adba44ff..2d8e70e8e56c 100644
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
@@ -444,14 +444,14 @@ namespace connectivity
     //------------------------------------------------------------------------------
     rtl::OUString ODriverDelegator::getImplementationName_Static(  ) throw(RuntimeException)
     {
-        return rtl::OUString::createFromAscii("org.openoffice.comp.drivers.MySQL.Driver");
+        return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.drivers.MySQL.Driver"));
     }
     //------------------------------------------------------------------------------
     Sequence< ::rtl::OUString > ODriverDelegator::getSupportedServiceNames_Static(  ) throw (RuntimeException)
     {
         Sequence< ::rtl::OUString > aSNS( 2 );
-        aSNS[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.Driver");
-        aSNS[1] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Driver");
+        aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver"));
+        aSNS[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Driver"));
         return aSNS;
     }
     //------------------------------------------------------------------
diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx
index f40a348db09e..c5edb19af2bd 100644
--- a/connectivity/source/drivers/mysql/YTable.cxx
+++ b/connectivity/source/drivers/mysql/YTable.cxx
@@ -352,7 +352,7 @@ void OMySQLTable::dropDefaultValue(const ::rtl::OUString& _rColName)
 // -----------------------------------------------------------------------------
 ::rtl::OUString OMySQLTable::getAlterTableColumnPart()
 {
-    ::rtl::OUString sSql = ::rtl::OUString::createFromAscii("ALTER TABLE ");
+    ::rtl::OUString sSql( RTL_CONSTASCII_USTRINGPARAM( "ALTER TABLE " ));
     const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString(  );
 
     ::rtl::OUString sComposedName(
@@ -366,7 +366,7 @@ void OMySQLTable::executeStatement(const ::rtl::OUString& _rStatement )
 {
     ::rtl::OUString sSQL = _rStatement;
     if(sSQL.lastIndexOf(',') == (sSQL.getLength()-1))
-        sSQL = sSQL.replaceAt(sSQL.getLength()-1,1,::rtl::OUString::createFromAscii(")"));
+        sSQL = sSQL.replaceAt(sSQL.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
 
     Reference< XStatement > xStmt = getConnection()->createStatement(  );
     if ( xStmt.is() )
diff --git a/connectivity/source/drivers/mysql/YTables.cxx b/connectivity/source/drivers/mysql/YTables.cxx
index 7248e3a7327d..e40adf2c211a 100644
--- a/connectivity/source/drivers/mysql/YTables.cxx
+++ b/connectivity/source/drivers/mysql/YTables.cxx
@@ -157,14 +157,14 @@ void OTables::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName)
         ::rtl::OUString sCatalog,sSchema,sTable;
         ::dbtools::qualifiedNameComponents(m_xMetaData,_sElementName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation);
 
-        ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP ");
+        ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "DROP " ));
 
         Reference<XPropertySet> xProp(xObject,UNO_QUERY);
-        sal_Bool bIsView = xProp.is() && ::comphelper::getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) == ::rtl::OUString::createFromAscii("VIEW");
+        sal_Bool bIsView = xProp.is() && ::comphelper::getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW"));
         if(bIsView) // here we have a view
-            aSql += ::rtl::OUString::createFromAscii("VIEW ");
+            aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW "));
         else
-            aSql += ::rtl::OUString::createFromAscii("TABLE ");
+            aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE "));
 
         ::rtl::OUString sComposedName(
             ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInDataManipulation ) );
diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx
index 0cdd1bf5e8c4..01cb1cbda515 100644
--- a/connectivity/source/drivers/mysql/YUser.cxx
+++ b/connectivity/source/drivers/mysql/YUser.cxx
@@ -131,16 +131,16 @@ void OMySQLUser::findPrivilegesAndGrantPrivileges(const ::rtl::OUString& objName
 
     if ( xRes.is() )
     {
-        static const ::rtl::OUString sSELECT    = ::rtl::OUString::createFromAscii("SELECT");
-        static const ::rtl::OUString sINSERT    = ::rtl::OUString::createFromAscii("INSERT");
-        static const ::rtl::OUString sUPDATE    = ::rtl::OUString::createFromAscii("UPDATE");
-        static const ::rtl::OUString sDELETE    = ::rtl::OUString::createFromAscii("DELETE");
-        static const ::rtl::OUString sREAD      = ::rtl::OUString::createFromAscii("READ");
-        static const ::rtl::OUString sCREATE    = ::rtl::OUString::createFromAscii("CREATE");
-        static const ::rtl::OUString sALTER     = ::rtl::OUString::createFromAscii("ALTER");
-        static const ::rtl::OUString sREFERENCE = ::rtl::OUString::createFromAscii("REFERENCE");
-        static const ::rtl::OUString sDROP      = ::rtl::OUString::createFromAscii("DROP");
-        static const ::rtl::OUString sYes       = ::rtl::OUString::createFromAscii("YES");
+        static const ::rtl::OUString sSELECT( RTL_CONSTASCII_USTRINGPARAM( "SELECT" ));
+        static const ::rtl::OUString sINSERT( RTL_CONSTASCII_USTRINGPARAM( "INSERT" ));
+        static const ::rtl::OUString sUPDATE( RTL_CONSTASCII_USTRINGPARAM( "UPDATE" ));
+        static const ::rtl::OUString sDELETE( RTL_CONSTASCII_USTRINGPARAM( "DELETE" ));
+        static const ::rtl::OUString sREAD( RTL_CONSTASCII_USTRINGPARAM( "READ" ));
+        static const ::rtl::OUString sCREATE( RTL_CONSTASCII_USTRINGPARAM( "CREATE" ));
+        static const ::rtl::OUString sALTER( RTL_CONSTASCII_USTRINGPARAM( "ALTER" ));
+        static const ::rtl::OUString sREFERENCE( RTL_CONSTASCII_USTRINGPARAM( "REFERENCE" ));
+        static const ::rtl::OUString sDROP( RTL_CONSTASCII_USTRINGPARAM( "DROP" ));
+        static const ::rtl::OUString sYes( RTL_CONSTASCII_USTRINGPARAM( "YES" ));
 
         nRightsWithGrant = nRights = 0;
 
@@ -238,12 +238,12 @@ void SAL_CALL OMySQLUser::grantPrivileges( const ::rtl::OUString& objName, sal_I
     if(sPrivs.getLength())
     {
         ::rtl::OUString sGrant;
-        sGrant += ::rtl::OUString::createFromAscii("GRANT ");
+        sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GRANT "));
         sGrant += sPrivs;
-        sGrant += ::rtl::OUString::createFromAscii(" ON ");
+        sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON "));
         Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
         sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation);
-        sGrant += ::rtl::OUString::createFromAscii(" TO ");
+        sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" TO "));
         sGrant += m_Name;
 
         Reference<XStatement> xStmt = m_xConnection->createStatement();
@@ -268,12 +268,12 @@ void SAL_CALL OMySQLUser::revokePrivileges( const ::rtl::OUString& objName, sal_
     if(sPrivs.getLength())
     {
         ::rtl::OUString sGrant;
-        sGrant += ::rtl::OUString::createFromAscii("REVOKE ");
+        sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REVOKE "));
         sGrant += sPrivs;
-        sGrant += ::rtl::OUString::createFromAscii(" ON ");
+        sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ON "));
         Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
         sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation);
-        sGrant += ::rtl::OUString::createFromAscii(" FROM ");
+        sGrant += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM "));
         sGrant += m_Name;
 
         Reference<XStatement> xStmt = m_xConnection->createStatement();
@@ -289,11 +289,11 @@ void SAL_CALL OMySQLUser::changePassword( const ::rtl::OUString& /*oldPassword*/
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed);
     ::rtl::OUString sAlterPwd;
-    sAlterPwd = ::rtl::OUString::createFromAscii("SET PASSWORD FOR ");
+    sAlterPwd = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SET PASSWORD FOR "));
     sAlterPwd += m_Name;
-    sAlterPwd += ::rtl::OUString::createFromAscii("@\"%\" = PASSWORD('") ;
+    sAlterPwd += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("@\"%\" = PASSWORD('")) ;
     sAlterPwd += newPassword;
-    sAlterPwd += ::rtl::OUString::createFromAscii("')") ;
+    sAlterPwd += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("')")) ;
 
 
     Reference<XStatement> xStmt = m_xConnection->createStatement();
@@ -308,41 +308,41 @@ void SAL_CALL OMySQLUser::changePassword( const ::rtl::OUString& /*oldPassword*/
 {
     ::rtl::OUString sPrivs;
     if((nRights & Privilege::INSERT) == Privilege::INSERT)
-        sPrivs += ::rtl::OUString::createFromAscii("INSERT");
+        sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INSERT"));
 
     if((nRights & Privilege::DELETE) == Privilege::DELETE)
     {
         if(sPrivs.getLength())
-            sPrivs += ::rtl::OUString::createFromAscii(",");
-        sPrivs += ::rtl::OUString::createFromAscii("DELETE");
+            sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+        sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DELETE"));
     }
 
     if((nRights & Privilege::UPDATE) == Privilege::UPDATE)
     {
         if(sPrivs.getLength())
-            sPrivs += ::rtl::OUString::createFromAscii(",");
-        sPrivs += ::rtl::OUString::createFromAscii("UPDATE");
+            sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+        sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UPDATE"));
     }
 
     if((nRights & Privilege::ALTER) == Privilege::ALTER)
     {
         if(sPrivs.getLength())
-            sPrivs += ::rtl::OUString::createFromAscii(",");
-        sPrivs += ::rtl::OUString::createFromAscii("ALTER");
+            sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+        sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ALTER"));
     }
 
     if((nRights & Privilege::SELECT) == Privilege::SELECT)
     {
         if(sPrivs.getLength())
-            sPrivs += ::rtl::OUString::createFromAscii(",");
-        sPrivs += ::rtl::OUString::createFromAscii("SELECT");
+            sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+        sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT"));
     }
 
     if((nRights & Privilege::REFERENCE) == Privilege::REFERENCE)
     {
         if(sPrivs.getLength())
-            sPrivs += ::rtl::OUString::createFromAscii(",");
-        sPrivs += ::rtl::OUString::createFromAscii("REFERENCES");
+            sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+        sPrivs += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REFERENCES"));
     }
 
     return sPrivs;
diff --git a/connectivity/source/drivers/mysql/YUsers.cxx b/connectivity/source/drivers/mysql/YUsers.cxx
index da6e024fef62..ce0273ccd664 100644
--- a/connectivity/source/drivers/mysql/YUsers.cxx
+++ b/connectivity/source/drivers/mysql/YUsers.cxx
@@ -81,18 +81,18 @@ Reference< XPropertySet > OUsers::createDescriptor()
 // XAppend
 sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
-    ::rtl::OUString aSql    = ::rtl::OUString::createFromAscii("GRANT USAGE ON * TO ");
+    ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "GRANT USAGE ON * TO " ));
     ::rtl::OUString aQuote  = m_xConnection->getMetaData()->getIdentifierQuoteString(  );
     ::rtl::OUString sUserName( _rForName );
     aSql += ::dbtools::quoteName(aQuote,sUserName)
-                + ::rtl::OUString::createFromAscii(" @\"%\" ");
+                + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" @\"%\" "));
     ::rtl::OUString sPassword;
     descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD)) >>= sPassword;
     if ( sPassword.getLength() )
     {
-        aSql += ::rtl::OUString::createFromAscii(" IDENTIFIED BY '");
+        aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" IDENTIFIED BY '"));
         aSql += sPassword;
-        aSql += ::rtl::OUString::createFromAscii("'");
+        aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"));
     }
 
     Reference< XStatement > xStmt = m_xConnection->createStatement(  );
@@ -106,7 +106,7 @@ sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const
 // XDrop
 void OUsers::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName)
 {
-    ::rtl::OUString aSql    = ::rtl::OUString::createFromAscii("REVOKE ALL ON * FROM ");
+    ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "REVOKE ALL ON * FROM " ));
     ::rtl::OUString aQuote  = m_xConnection->getMetaData()->getIdentifierQuoteString(  );
     aSql += ::dbtools::quoteName(aQuote,_sElementName);
 
diff --git a/connectivity/source/drivers/mysql/YViews.cxx b/connectivity/source/drivers/mysql/YViews.cxx
index 767ae19cdb48..0ba85c02ddd5 100644
--- a/connectivity/source/drivers/mysql/YViews.cxx
+++ b/connectivity/source/drivers/mysql/YViews.cxx
@@ -113,7 +113,7 @@ void OViews::dropObject(sal_Int32 _nPos,const ::rtl::OUString /*_sElementName*/)
     sal_Bool bIsNew = connectivity::sdbcx::ODescriptor::isNew( xObject );
     if (!bIsNew)
     {
-        ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP VIEW");
+        ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "DROP VIEW" ));
 
         Reference<XPropertySet> xProp(xObject,UNO_QUERY);
         aSql += ::dbtools::composeTableName( m_xMetaData, xProp, ::dbtools::eInTableDefinitions, false, false, true );
@@ -136,13 +136,13 @@ void OViews::createView( const Reference< XPropertySet >& descriptor )
 {
     Reference<XConnection> xConnection = static_cast<OMySQLCatalog&>(m_rParent).getConnection();
 
-    ::rtl::OUString aSql    = ::rtl::OUString::createFromAscii("CREATE VIEW ");
+    ::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "CREATE VIEW " ));
     ::rtl::OUString aQuote  = xConnection->getMetaData()->getIdentifierQuoteString(  );
     ::rtl::OUString sSchema,sCommand;
 
     aSql += ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInTableDefinitions, false, false, true );
 
-    aSql += ::rtl::OUString::createFromAscii(" AS ");
+    aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" AS "));
     descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND)) >>= sCommand;
     aSql += sCommand;
 
diff --git a/connectivity/source/drivers/mysql/Yservices.cxx b/connectivity/source/drivers/mysql/Yservices.cxx
index 391acae12ed5..b6bdec36e9b1 100644
--- a/connectivity/source/drivers/mysql/Yservices.cxx
+++ b/connectivity/source/drivers/mysql/Yservices.cxx
@@ -62,9 +62,9 @@ void REGISTER_PROVIDER(
         const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
 {
     OUString aMainKeyName;
-    aMainKeyName = OUString::createFromAscii("/");
+    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString::createFromAscii("/UNO/SERVICES");
+    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
 
     Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
     OSL_ENSURE(xNewKey.is(), "ADABAS::component_writeInfo : could not create a registry key !");
diff --git a/connectivity/source/drivers/odbc/OFunctions.cxx b/connectivity/source/drivers/odbc/OFunctions.cxx
index fd4183b2c14b..7fe29c930afb 100644
--- a/connectivity/source/drivers/odbc/OFunctions.cxx
+++ b/connectivity/source/drivers/odbc/OFunctions.cxx
@@ -111,24 +111,24 @@ sal_Bool LoadLibrary_ODBC3(::rtl::OUString &_rPath)
     if (bLoaded)
         return sal_True;
 #ifdef WIN
-    _rPath = ::rtl::OUString::createFromAscii("ODBC.DLL");
+    _rPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ODBC.DLL"));
 
 #endif
 #ifdef WNT
-    _rPath = ::rtl::OUString::createFromAscii("ODBC32.DLL");
+    _rPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ODBC32.DLL"));
 #endif
 #ifdef UNX
  #ifdef MACOSX
-     _rPath = ::rtl::OUString::createFromAscii("libiodbc.dylib");
+     _rPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("libiodbc.dylib"));
  #else
-    _rPath = ::rtl::OUString::createFromAscii("libodbc.so.1");
+    _rPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("libodbc.so.1"));
     pODBCso = osl_loadModule( _rPath.pData,SAL_LOADMODULE_NOW );
     if ( !pODBCso )
-        _rPath = ::rtl::OUString::createFromAscii("libodbc.so");
+        _rPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("libodbc.so"));
  #endif   /* MACOSX */
 #endif
 #ifdef OS2
-    _rPath = ::rtl::OUString::createFromAscii("ODBC");
+    _rPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ODBC"));
 #endif
 
     if ( !pODBCso )
@@ -137,7 +137,7 @@ sal_Bool LoadLibrary_ODBC3(::rtl::OUString &_rPath)
 #ifdef OS2
     {
         delete pODBCso;
-        _rPath = ::rtl::OUString::createFromAscii("WOD402");
+        _rPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WOD402"));
         pODBCso = osl_loadModule( _rPath.pData,SAL_LOADMODULE_NOW );
         if( !pODBCso)
             return sal_False;
@@ -153,127 +153,127 @@ sal_Bool LoadLibrary_ODBC3(::rtl::OUString &_rPath)
 sal_Bool LoadFunctions(oslModule pODBCso)
 {
 
-    if( ( pODBC3SQLAllocHandle  =   (T3SQLAllocHandle)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLAllocHandle").pData )) == NULL )
+    if( ( pODBC3SQLAllocHandle  =   (T3SQLAllocHandle)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLAllocHandle")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLConnect      =   (T3SQLConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLConnect").pData )) == NULL )
+    if( ( pODBC3SQLConnect      =   (T3SQLConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLConnect")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLDriverConnect =  (T3SQLDriverConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDriverConnect").pData )) == NULL )
+    if( ( pODBC3SQLDriverConnect =  (T3SQLDriverConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLDriverConnect")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLBrowseConnect =   (T3SQLBrowseConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLBrowseConnect").pData )) == NULL )
+    if( ( pODBC3SQLBrowseConnect =   (T3SQLBrowseConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLBrowseConnect")).pData )) == NULL )
         return sal_False;
-    if(( pODBC3SQLDataSources   =   (T3SQLDataSources)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDataSources").pData )) == NULL )
+    if(( pODBC3SQLDataSources   =   (T3SQLDataSources)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLDataSources")).pData )) == NULL )
         return sal_False;
-    if(( pODBC3SQLDrivers       =   (T3SQLDrivers)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDrivers").pData )) == NULL )
+    if(( pODBC3SQLDrivers       =   (T3SQLDrivers)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLDrivers")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLGetInfo      =   (T3SQLGetInfo)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetInfo").pData )) == NULL )
+    if( ( pODBC3SQLGetInfo      =   (T3SQLGetInfo)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetInfo")).pData )) == NULL )
         return sal_False;
-    if(( pODBC3SQLGetFunctions  =   (T3SQLGetFunctions)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetFunctions").pData )) == NULL )
+    if(( pODBC3SQLGetFunctions  =   (T3SQLGetFunctions)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetFunctions")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLGetTypeInfo  =   (T3SQLGetTypeInfo)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetTypeInfo").pData )) == NULL )
+    if( ( pODBC3SQLGetTypeInfo  =   (T3SQLGetTypeInfo)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetTypeInfo")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLSetConnectAttr   =   (T3SQLSetConnectAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetConnectAttr").pData )) == NULL )
+    if( ( pODBC3SQLSetConnectAttr   =   (T3SQLSetConnectAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLSetConnectAttr")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLGetConnectAttr   =   (T3SQLGetConnectAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetConnectAttr").pData )) == NULL )
+    if( ( pODBC3SQLGetConnectAttr   =   (T3SQLGetConnectAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetConnectAttr")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLSetEnvAttr   =   (T3SQLSetEnvAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetEnvAttr").pData )) == NULL )
+    if( ( pODBC3SQLSetEnvAttr   =   (T3SQLSetEnvAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLSetEnvAttr")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLGetEnvAttr   =   (T3SQLGetEnvAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetEnvAttr").pData )) == NULL )
+    if( ( pODBC3SQLGetEnvAttr   =   (T3SQLGetEnvAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetEnvAttr")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLSetStmtAttr  =   (T3SQLSetStmtAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetStmtAttr").pData )) == NULL )
+    if( ( pODBC3SQLSetStmtAttr  =   (T3SQLSetStmtAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLSetStmtAttr")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLGetStmtAttr  =   (T3SQLGetStmtAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetStmtAttr").pData )) == NULL )
+    if( ( pODBC3SQLGetStmtAttr  =   (T3SQLGetStmtAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetStmtAttr")).pData )) == NULL )
         return sal_False;
-    /*if( ( pODBC3SQLSetDescField   =   (T3SQLSetDescField)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetDescField").pData )) == NULL )
+    /*if( ( pODBC3SQLSetDescField   =   (T3SQLSetDescField)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLSetDescField")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLGetDescField =   (T3SQLGetDescField)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDescField").pData )) == NULL )
+    if( ( pODBC3SQLGetDescField =   (T3SQLGetDescField)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetDescField")).pData )) == NULL )
         return sal_False;*/
-    /*if( ( pODBC3SQLGetDescRec =   (T3SQLGetDescRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDescRec").pData )) == NULL )
+    /*if( ( pODBC3SQLGetDescRec =   (T3SQLGetDescRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetDescRec")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLSetDescRec   =   (T3SQLSetDescRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetDescRec").pData )) == NULL )
+    if( ( pODBC3SQLSetDescRec   =   (T3SQLSetDescRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLSetDescRec")).pData )) == NULL )
         return sal_False;*/
-    if( ( pODBC3SQLPrepare      =   (T3SQLPrepare)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLPrepare").pData )) == NULL )
+    if( ( pODBC3SQLPrepare      =   (T3SQLPrepare)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLPrepare")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLBindParameter =  (T3SQLBindParameter)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLBindParameter").pData )) == NULL )
+    if( ( pODBC3SQLBindParameter =  (T3SQLBindParameter)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLBindParameter")).pData )) == NULL )
         return sal_False;
-//  if( ( pODBC3SQLGetCursorName =  (T3SQLGetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetCursorName").pData )) == NULL )
+//  if( ( pODBC3SQLGetCursorName =  (T3SQLGetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetCursorName")).pData )) == NULL )
 //      return sal_False;
-    if( ( pODBC3SQLSetCursorName =  (T3SQLSetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetCursorName").pData )) == NULL )
+    if( ( pODBC3SQLSetCursorName =  (T3SQLSetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLSetCursorName")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLExecute      =   (T3SQLExecute)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLExecute").pData )) == NULL )
+    if( ( pODBC3SQLExecute      =   (T3SQLExecute)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLExecute")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLExecDirect   =   (T3SQLExecDirect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLExecDirect").pData )) == NULL )
+    if( ( pODBC3SQLExecDirect   =   (T3SQLExecDirect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLExecDirect")).pData )) == NULL )
         return sal_False;
-    /*if( ( pODBC3SQLNativeSql      =   (T3SQLNativeSql)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNativeSql").pData )) == NULL )
+    /*if( ( pODBC3SQLNativeSql      =   (T3SQLNativeSql)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLNativeSql")).pData )) == NULL )
         return sal_False;*/
-    if( ( pODBC3SQLDescribeParam =   (T3SQLDescribeParam)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDescribeParam").pData )) == NULL )
+    if( ( pODBC3SQLDescribeParam =   (T3SQLDescribeParam)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLDescribeParam")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLNumParams        =   (T3SQLNumParams)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNumParams").pData )) == NULL )
+    if( ( pODBC3SQLNumParams        =   (T3SQLNumParams)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLNumParams")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLParamData        =   (T3SQLParamData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLParamData").pData )) == NULL )
+    if( ( pODBC3SQLParamData        =   (T3SQLParamData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLParamData")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLPutData      =   (T3SQLPutData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLPutData").pData )) == NULL )
+    if( ( pODBC3SQLPutData      =   (T3SQLPutData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLPutData")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLRowCount     =   (T3SQLRowCount)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLRowCount").pData )) == NULL )
+    if( ( pODBC3SQLRowCount     =   (T3SQLRowCount)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLRowCount")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLNumResultCols =  (T3SQLNumResultCols)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNumResultCols").pData )) == NULL )
+    if( ( pODBC3SQLNumResultCols =  (T3SQLNumResultCols)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLNumResultCols")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLDescribeCol  =   (T3SQLDescribeCol)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDescribeCol").pData )) == NULL )
+    if( ( pODBC3SQLDescribeCol  =   (T3SQLDescribeCol)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLDescribeCol")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLColAttribute =   (T3SQLColAttribute)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLColAttribute").pData )) == NULL )
+    if( ( pODBC3SQLColAttribute =   (T3SQLColAttribute)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLColAttribute")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLBindCol      =   (T3SQLBindCol)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLBindCol").pData )) == NULL )
+    if( ( pODBC3SQLBindCol      =   (T3SQLBindCol)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLBindCol")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLFetch            =   (T3SQLFetch)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFetch").pData )) == NULL )
+    if( ( pODBC3SQLFetch            =   (T3SQLFetch)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLFetch")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLFetchScroll  =   (T3SQLFetchScroll)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFetchScroll").pData )) == NULL )
+    if( ( pODBC3SQLFetchScroll  =   (T3SQLFetchScroll)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLFetchScroll")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLGetData      =   (T3SQLGetData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetData").pData )) == NULL )
+    if( ( pODBC3SQLGetData      =   (T3SQLGetData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetData")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLSetPos       =   (T3SQLSetPos)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetPos").pData )) == NULL )
+    if( ( pODBC3SQLSetPos       =   (T3SQLSetPos)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLSetPos")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLBulkOperations   =   (T3SQLBulkOperations)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLBulkOperations").pData )) == NULL )
+    if( ( pODBC3SQLBulkOperations   =   (T3SQLBulkOperations)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLBulkOperations")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLMoreResults  =   (T3SQLMoreResults)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLMoreResults").pData )) == NULL )
+    if( ( pODBC3SQLMoreResults  =   (T3SQLMoreResults)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLMoreResults")).pData )) == NULL )
         return sal_False;
-    /*if( ( pODBC3SQLGetDiagField   =   (T3SQLGetDiagField)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDiagField").pData )) == NULL )
+    /*if( ( pODBC3SQLGetDiagField   =   (T3SQLGetDiagField)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetDiagField")).pData )) == NULL )
         return sal_False;*/
-    if( ( pODBC3SQLGetDiagRec   =   (T3SQLGetDiagRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDiagRec").pData )) == NULL )
+    if( ( pODBC3SQLGetDiagRec   =   (T3SQLGetDiagRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetDiagRec")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLColumnPrivileges = (T3SQLColumnPrivileges)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLColumnPrivileges").pData )) == NULL )
+    if( ( pODBC3SQLColumnPrivileges = (T3SQLColumnPrivileges)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLColumnPrivileges")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLColumns      =   (T3SQLColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLColumns").pData )) == NULL )
+    if( ( pODBC3SQLColumns      =   (T3SQLColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLColumns")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLForeignKeys  =   (T3SQLForeignKeys)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLForeignKeys").pData )) == NULL )
+    if( ( pODBC3SQLForeignKeys  =   (T3SQLForeignKeys)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLForeignKeys")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLPrimaryKeys  =   (T3SQLPrimaryKeys)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLPrimaryKeys").pData )) == NULL )
+    if( ( pODBC3SQLPrimaryKeys  =   (T3SQLPrimaryKeys)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLPrimaryKeys")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLProcedureColumns =  (T3SQLProcedureColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLProcedureColumns").pData )) == NULL )
+    if( ( pODBC3SQLProcedureColumns =  (T3SQLProcedureColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLProcedureColumns")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLProcedures   =   (T3SQLProcedures)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLProcedures").pData )) == NULL )
+    if( ( pODBC3SQLProcedures   =   (T3SQLProcedures)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLProcedures")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLSpecialColumns =  (T3SQLSpecialColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSpecialColumns").pData )) == NULL )
+    if( ( pODBC3SQLSpecialColumns =  (T3SQLSpecialColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLSpecialColumns")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLStatistics   =   (T3SQLStatistics)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLStatistics").pData )) == NULL )
+    if( ( pODBC3SQLStatistics   =   (T3SQLStatistics)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLStatistics")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLTablePrivileges =    (T3SQLTablePrivileges)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLTablePrivileges").pData )) == NULL )
+    if( ( pODBC3SQLTablePrivileges =    (T3SQLTablePrivileges)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLTablePrivileges")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLTables       =   (T3SQLTables)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLTables").pData )) == NULL )
+    if( ( pODBC3SQLTables       =   (T3SQLTables)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLTables")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLFreeStmt     =   (T3SQLFreeStmt)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFreeStmt").pData )) == NULL )
+    if( ( pODBC3SQLFreeStmt     =   (T3SQLFreeStmt)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLFreeStmt")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLCloseCursor  =   (T3SQLCloseCursor)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLCloseCursor").pData )) == NULL )
+    if( ( pODBC3SQLCloseCursor  =   (T3SQLCloseCursor)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLCloseCursor")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLCancel       =   (T3SQLCancel)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLCancel").pData )) == NULL )
+    if( ( pODBC3SQLCancel       =   (T3SQLCancel)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLCancel")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLEndTran      =   (T3SQLEndTran)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLEndTran").pData )) == NULL )
+    if( ( pODBC3SQLEndTran      =   (T3SQLEndTran)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLEndTran")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLDisconnect   =   (T3SQLDisconnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDisconnect").pData )) == NULL )
+    if( ( pODBC3SQLDisconnect   =   (T3SQLDisconnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLDisconnect")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLFreeHandle   =   (T3SQLFreeHandle)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFreeHandle").pData )) == NULL )
+    if( ( pODBC3SQLFreeHandle   =   (T3SQLFreeHandle)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLFreeHandle")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLGetCursorName    =   (T3SQLGetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetCursorName").pData )) == NULL )
+    if( ( pODBC3SQLGetCursorName    =   (T3SQLGetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLGetCursorName")).pData )) == NULL )
         return sal_False;
-    if( ( pODBC3SQLNativeSql    =   (T3SQLNativeSql)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNativeSql").pData )) == NULL )
+    if( ( pODBC3SQLNativeSql    =   (T3SQLNativeSql)osl_getFunctionSymbol(pODBCso, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLNativeSql")).pData )) == NULL )
         return sal_False;
 
     return sal_True;
diff --git a/connectivity/source/drivers/odbc/oservices.cxx b/connectivity/source/drivers/odbc/oservices.cxx
index 34e29b5cbcc2..76f392c9b8a2 100644
--- a/connectivity/source/drivers/odbc/oservices.cxx
+++ b/connectivity/source/drivers/odbc/oservices.cxx
@@ -63,9 +63,9 @@ void REGISTER_PROVIDER(
         const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
 {
     OUString aMainKeyName;
-    aMainKeyName = OUString::createFromAscii("/");
+    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString::createFromAscii("/UNO/SERVICES");
+    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
 
     Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
     OSL_ENSURE(xNewKey.is(), "ODBC::component_writeInfo : could not create a registry key !");
diff --git a/connectivity/source/drivers/odbcbase/OConnection.cxx b/connectivity/source/drivers/odbcbase/OConnection.cxx
index d7bd5c6baef5..0cf2f02bdb70 100644
--- a/connectivity/source/drivers/odbcbase/OConnection.cxx
+++ b/connectivity/source/drivers/odbcbase/OConnection.cxx
@@ -161,7 +161,7 @@ SQLRETURN OConnection::OpenConnection(const ::rtl::OUString& aConnectStr,sal_Int
     {
         ::rtl::OUString sVersion;
         OTools::GetInfo(this,m_aConnectionHandle,SQL_DRIVER_ODBC_VER,sVersion,*this,getTextEncoding());
-        m_bUseOldDateFormat =  sVersion == ::rtl::OUString::createFromAscii("02.50") || sVersion == ::rtl::OUString::createFromAscii("02.00");
+        m_bUseOldDateFormat =  sVersion == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("02.50")) || sVersion == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("02.00"));
     }
     catch(Exception&)
     {
@@ -236,12 +236,12 @@ SQLRETURN OConnection::Construct(const ::rtl::OUString& url,const Sequence< Prop
         else if(!pBegin->Name.compareToAscii(pUser))
         {
             OSL_VERIFY( pBegin->Value >>= aUID );
-            aDSN = aDSN + ::rtl::OUString::createFromAscii(";UID=") + aUID;
+            aDSN = aDSN + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";UID=")) + aUID;
         }
         else if(!pBegin->Name.compareToAscii(pPwd))
         {
             OSL_VERIFY( pBegin->Value >>= aPWD );
-            aDSN = aDSN + ::rtl::OUString::createFromAscii(";PWD=") + aPWD;
+            aDSN = aDSN + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";PWD=")) + aPWD;
         }
         else if(!pBegin->Name.compareToAscii(pUseCatalog))
         {
@@ -250,7 +250,7 @@ SQLRETURN OConnection::Construct(const ::rtl::OUString& url,const Sequence< Prop
         else if(!pBegin->Name.compareToAscii(pSysDrv))
         {
             OSL_VERIFY( pBegin->Value >>= aSysDrvSettings );
-            aDSN += ::rtl::OUString::createFromAscii(";");
+            aDSN += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
             aDSN += aSysDrvSettings;
         }
         else if(0 == pBegin->Name.compareToAscii(pCharSet))
diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
index ac0fdc7333f6..c0d8383eb1a7 100644
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
@@ -62,7 +62,7 @@ ODatabaseMetaData::ODatabaseMetaData(const SQLHANDLE _pHandle,OConnection* _pCon
         {
             m_bUseCatalog   = !(usesLocalFiles() || usesLocalFilePerTable());
             ::rtl::OUString sVersion = getDriverVersion();
-            m_bOdbc3        =  sVersion != ::rtl::OUString::createFromAscii("02.50") && sVersion != ::rtl::OUString::createFromAscii("02.00");
+            m_bOdbc3        =  sVersion != ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("02.50")) && sVersion != ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("02.00"));
         }
         catch(SQLException& )
         { // doesn't matter here
@@ -734,13 +734,13 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  ) throw(SQLE
     // there exists no possibility to get table types so we have to check
     static ::rtl::OUString sTableTypes[] =
     {
-        ::rtl::OUString::createFromAscii("TABLE"),
-        ::rtl::OUString::createFromAscii("VIEW"),
-        ::rtl::OUString::createFromAscii("SYSTEM TABLE"),
-        ::rtl::OUString::createFromAscii("GLOBAL TEMPORARY"),
-        ::rtl::OUString::createFromAscii("LOCAL TEMPORARY"),
-        ::rtl::OUString::createFromAscii("ALIAS"),
-        ::rtl::OUString::createFromAscii("SYNONYM")
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE")),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW")),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SYSTEM TABLE")),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GLOBAL TEMPORARY")),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LOCAL TEMPORARY")),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ALIAS")),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SYNONYM"))
     };
     sal_Int32  nSize = sizeof(sTableTypes) / sizeof(::rtl::OUString);
     ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTableTypes);
@@ -1224,7 +1224,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQL
     ::rtl::OUString aValue = m_pConnection->getURL();
     if ( !aValue.getLength() )
     {
-        aValue = ::rtl::OUString::createFromAscii("sdbc:odbc:");
+        aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:odbc:"));
         aValue += getURLImpl();
     }
     return aValue;
diff --git a/connectivity/source/drivers/odbcbase/ODriver.cxx b/connectivity/source/drivers/odbcbase/ODriver.cxx
index 3c3d945f0d6d..0e8a49065f95 100644
--- a/connectivity/source/drivers/odbcbase/ODriver.cxx
+++ b/connectivity/source/drivers/odbcbase/ODriver.cxx
@@ -69,7 +69,7 @@ void ODBCDriver::disposing()
 //------------------------------------------------------------------------------
 rtl::OUString ODBCDriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return rtl::OUString::createFromAscii("com.sun.star.comp.sdbc.ODBCDriver");
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdbc.ODBCDriver"));
         // this name is referenced in the configuration and in the odbc.xml
         // Please take care when changing it.
 }
@@ -79,7 +79,7 @@ typedef Sequence< ::rtl::OUString > SS;
 SS ODBCDriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
 {
     SS aSNS( 1 );
-    aSNS[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.Driver");
+    aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver"));
     return aSNS;
 }
 
@@ -130,7 +130,7 @@ Reference< XConnection > SAL_CALL ODBCDriver::connect( const ::rtl::OUString& ur
 sal_Bool SAL_CALL ODBCDriver::acceptsURL( const ::rtl::OUString& url )
         throw(SQLException, RuntimeException)
 {
-    return (!url.compareTo(::rtl::OUString::createFromAscii("sdbc:odbc:"),10));
+    return (!url.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:odbc:")),10));
 }
 // --------------------------------------------------------------------------------
 Sequence< DriverPropertyInfo > SAL_CALL ODBCDriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index 2b3c45b4214c..7c36f72f3ad3 100644
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -67,14 +67,14 @@ using namespace com::sun::star::util;
 //  IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet");
 ::rtl::OUString SAL_CALL OResultSet::getImplementationName(  ) throw ( RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.odbc.ResultSet");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.odbc.ResultSet"));
 }
 // -------------------------------------------------------------------------
  Sequence< ::rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames(  ) throw( RuntimeException)
 {
      Sequence< ::rtl::OUString > aSupported(2);
-    aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.ResultSet");
-    aSupported[1] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.ResultSet");
+    aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ResultSet"));
+    aSupported[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ResultSet"));
     return aSupported;
 }
 // -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/odbcbase/OStatement.cxx b/connectivity/source/drivers/odbcbase/OStatement.cxx
index 1a6b2d49e551..91a0e9bf38f7 100644
--- a/connectivity/source/drivers/odbcbase/OStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OStatement.cxx
@@ -292,7 +292,7 @@ sal_Bool OStatement_Base::lockIfNecessary (const ::rtl::OUString& sql) throw( SQ
     // Now, look for the FOR UPDATE keywords.  If there is any extra white
     // space between the FOR and UPDATE, this will fail.
 
-    sal_Int32 index = sqlStatement.indexOf(::rtl::OUString::createFromAscii(" FOR UPDATE"));
+    sal_Int32 index = sqlStatement.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FOR UPDATE")));
 
     // We found it.  Change our concurrency level to ensure that the
     // row can be updated.
diff --git a/connectivity/source/inc/ado/ACollection.hxx b/connectivity/source/inc/ado/ACollection.hxx
index 485a151ca4a8..3dafa36b9b3a 100644
--- a/connectivity/source/inc/ado/ACollection.hxx
+++ b/connectivity/source/inc/ado/ACollection.hxx
@@ -81,7 +81,7 @@ namespace connectivity
 
             virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (staruno::RuntimeException)
             {
-                return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.ACollection");
+                return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ACollection"));
             }
             virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& _rServiceName ) throw(staruno::RuntimeException)
             {
@@ -96,7 +96,7 @@ namespace connectivity
             virtual staruno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw(staruno::RuntimeException)
             {
                 staruno::Sequence< ::rtl::OUString > aSupported(1);
-                aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Container");
+                aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Container"));
                 return aSupported;
             }
 
diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx
index ec954c102e9f..f86fdb9f4432 100644
--- a/connectivity/source/inc/hsqldb/HConnection.hxx
+++ b/connectivity/source/inc/hsqldb/HConnection.hxx
@@ -135,7 +135,7 @@ namespace connectivity
             /** retrieves the icon for HSQL TEXT TABLEs
             */
             ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >
-                impl_getTextTableIcon_nothrow( ::sal_Int32 _ColorMode );
+                impl_getTextTableIcon_nothrow();
         };
 
         //==========================================================================
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index e07d051f2099..60c9001793e5 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -59,7 +59,7 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::logging;
 using namespace ::osl;
 
-#define SERVICE_SDBC_DRIVER     ::rtl::OUString::createFromAscii("com.sun.star.sdbc.Driver")
+#define SERVICE_SDBC_DRIVER     ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver"))
 
 void throwNoSuchElementException() throw(NoSuchElementException)
 {
@@ -118,8 +118,6 @@ Any SAL_CALL ODriverEnumeration::nextElement(  ) throw(NoSuchElementException, W
     //=====================================================================
     //= helper
     //=====================================================================
-    //---------------------------------------------------------------------
-    //--- 24.08.01 11:27:59 -----------------------------------------------
 
     /// an STL functor which ensures that a SdbcDriver described by a DriverAccess is loaded
     struct EnsureDriver : public ::std::unary_function< DriverAccess, DriverAccess >
@@ -135,9 +133,6 @@ Any SAL_CALL ODriverEnumeration::nextElement(  ) throw(NoSuchElementException, W
         }
     };
 
-    //---------------------------------------------------------------------
-    //--- 24.08.01 11:28:04 -----------------------------------------------
-
     /// an STL functor which extracts a SdbcDriver from a DriverAccess
     struct ExtractDriverFromAccess : public ::std::unary_function< DriverAccess, SdbcDriver >
     {
@@ -147,9 +142,6 @@ Any SAL_CALL ODriverEnumeration::nextElement(  ) throw(NoSuchElementException, W
         }
     };
 
-    //---------------------------------------------------------------------
-    //--- 24.08.01 12:37:50 -----------------------------------------------
-
     typedef ::std::unary_compose< ExtractDriverFromAccess, EnsureDriver > ExtractAfterLoad_BASE;
     /// an STL functor which loads a driver described by a DriverAccess, and extracts the SdbcDriver
     struct ExtractAfterLoad : public ExtractAfterLoad_BASE
@@ -157,9 +149,6 @@ Any SAL_CALL ODriverEnumeration::nextElement(  ) throw(NoSuchElementException, W
         ExtractAfterLoad() : ExtractAfterLoad_BASE( ExtractDriverFromAccess(), EnsureDriver() ) { }
     };
 
-    //---------------------------------------------------------------------
-    //--- 24.08.01 11:42:36 -----------------------------------------------
-
     struct ExtractDriverFromCollectionElement : public ::std::unary_function< DriverCollection::value_type, SdbcDriver >
     {
         SdbcDriver operator()( const DriverCollection::value_type& _rElement ) const
@@ -168,9 +157,6 @@ Any SAL_CALL ODriverEnumeration::nextElement(  ) throw(NoSuchElementException, W
         }
     };
 
-    //---------------------------------------------------------------------
-    //--- 24.08.01 11:51:03 -----------------------------------------------
-
     // predicate for checking whether or not a driver accepts a given URL
     class AcceptsURL : public ::std::unary_function< SdbcDriver, bool >
     {
@@ -193,25 +179,17 @@ Any SAL_CALL ODriverEnumeration::nextElement(  ) throw(NoSuchElementException, W
         }
     };
 
-    //---------------------------------------------------------------------
-    //--- 24.08.01 12:51:54 -----------------------------------------------
-
     static sal_Int32 lcl_getDriverPrecedence( const ::comphelper::ComponentContext& _rContext, Sequence< ::rtl::OUString >& _rPrecedence )
     {
         _rPrecedence.realloc( 0 );
         try
         {
             // some strings we need
-            const ::rtl::OUString sConfigurationProviderServiceName =
-                ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider");
-            const ::rtl::OUString sDriverManagerConfigLocation =
-                ::rtl::OUString::createFromAscii("org.openoffice.Office.DataAccess/DriverManager");
-            const ::rtl::OUString sDriverPreferenceLocation =
-                ::rtl::OUString::createFromAscii("DriverPrecedence");
-            const ::rtl::OUString sNodePathArgumentName =
-                ::rtl::OUString::createFromAscii("nodepath");
-            const ::rtl::OUString sNodeAccessServiceName =
-                ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess");
+            const ::rtl::OUString sConfigurationProviderServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ));
+            const ::rtl::OUString sDriverManagerConfigLocation( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office.DataAccess/DriverManager" ));
+            const ::rtl::OUString sDriverPreferenceLocation( RTL_CONSTASCII_USTRINGPARAM( "DriverPrecedence" ));
+            const ::rtl::OUString sNodePathArgumentName( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ));
+            const ::rtl::OUString sNodeAccessServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" ));
 
             // create a configuration provider
             Reference< XMultiServiceFactory > xConfigurationProvider;
@@ -245,9 +223,6 @@ Any SAL_CALL ODriverEnumeration::nextElement(  ) throw(NoSuchElementException, W
         return _rPrecedence.getLength();
     }
 
-    //---------------------------------------------------------------------
-    //--- 24.08.01 13:01:56 -----------------------------------------------
-
     /// an STL argorithm compatible predicate comparing two DriverAccess instances by their implementation names
     struct CompareDriverAccessByName : public ::std::binary_function< DriverAccess, DriverAccess, bool >
     {
@@ -258,9 +233,6 @@ Any SAL_CALL ODriverEnumeration::nextElement(  ) throw(NoSuchElementException, W
         }
     };
 
-    //---------------------------------------------------------------------
-    //--- 24.08.01 13:08:17 -----------------------------------------------
-
     /// and STL argorithm compatible predicate comparing a DriverAccess' impl name to a string
     struct CompareDriverAccessToName : public ::std::binary_function< DriverAccess, ::rtl::OUString, bool >
     {
@@ -310,9 +282,6 @@ OSDBCDriverManager::~OSDBCDriverManager()
 {
 }
 
-//---------------------------------------------------------------------
-//--- 24.08.01 11:15:32 -----------------------------------------------
-
 void OSDBCDriverManager::bootstrapDrivers()
 {
     Reference< XContentEnumerationAccess > xEnumAccess( m_aContext.getLegacyServiceFactory(), UNO_QUERY );
@@ -594,7 +563,7 @@ Reference< XInterface > SAL_CALL OSDBCDriverManager::Create( const Reference< XM
 //--------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OSDBCDriverManager::getImplementationName_static(  ) throw(RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.sdbc.OSDBCDriverManager");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdbc.OSDBCDriverManager"));
 }
 
 //--------------------------------------------------------------------------
diff --git a/connectivity/source/manager/mregistration.cxx b/connectivity/source/manager/mregistration.cxx
index afc23aaff31a..136f9f754660 100644
--- a/connectivity/source/manager/mregistration.cxx
+++ b/connectivity/source/manager/mregistration.cxx
@@ -60,9 +60,9 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* /*_pServiceMana
 
     try
     {
-        ::rtl::OUString sMainKeyName = ::rtl::OUString::createFromAscii("/");
+        ::rtl::OUString sMainKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" ));
         sMainKeyName += ::drivermanager::OSDBCDriverManager::getImplementationName_static();
-        sMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES");
+        sMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
         Reference< XRegistryKey > xMainKey = _pRegistryKey->createKey(sMainKeyName);
         if (xMainKey.is())
         {
diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx
index 25eddfd52f47..91a12b73f1cd 100644
--- a/connectivity/source/parse/PColumn.cxx
+++ b/connectivity/source/parse/PColumn.cxx
@@ -239,9 +239,9 @@ void OOrderColumn::construct()
 {
     ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1);
     if ( m_bOrder )
-        aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.OrderColumn");
+        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OrderColumn"));
     else
-        aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.GroupColumn");
+        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.GroupColumn"));
 
     return aSupported;
 }
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index e11a0c7aa4cd..c324c7d16b07 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -4311,7 +4311,7 @@ sal_Int16 OSQLParser::buildStringNodes(OSQLParseNode*& pLiteral)
 //-----------------------------------------------------------------------------
 sal_Int16 OSQLParser::buildComparsionRule(OSQLParseNode*& pAppend,OSQLParseNode* pLiteral)
 {
-	OSQLParseNode* pComp = new OSQLInternalNode(::rtl::OUString::createFromAscii("="), SQL_NODE_EQUAL);
+	OSQLParseNode* pComp = new OSQLInternalNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("=")), SQL_NODE_EQUAL);
 	return buildPredicateRule(pAppend,pLiteral,pComp);
 }
 
@@ -4340,7 +4340,7 @@ void OSQLParser::error(sal_Char *fmt)
 	if(!m_sErrorMessage.getLength())
 	{
 		::rtl::OUString sStr(fmt,strlen(fmt),RTL_TEXTENCODING_UTF8);
-		::rtl::OUString sSQL_TOKEN(::rtl::OUString::createFromAscii("SQL_TOKEN_"));
+		::rtl::OUString sSQL_TOKEN(RTL_CONSTASCII_USTRINGPARAM("SQL_TOKEN_"));
 
 		sal_Int32 nPos1 = sStr.indexOf(sSQL_TOKEN);
 		if(nPos1 != -1)
@@ -4364,7 +4364,7 @@ void OSQLParser::error(sal_Char *fmt)
 		::rtl::OUString aError = s_pScanner->getErrorMessage();
 		if(aError.getLength())
 		{
-			m_sErrorMessage += ::rtl::OUString::createFromAscii(", ");
+			m_sErrorMessage += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(", "));
 			m_sErrorMessage += aError;
 		}
 	}
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index c6723dfd6869..8a4f5e577908 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -709,7 +709,7 @@ void OSQLScanner::SQLyyerror(sal_Char *fmt)
 	m_sErrorMessage = ::rtl::OUString(fmt,strlen(fmt),RTL_TEXTENCODING_UTF8);
 	if (m_nCurrentPos < m_sStatement.getLength())
 	{
-		m_sErrorMessage += ::rtl::OUString::createFromAscii(": ");
+		m_sErrorMessage += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": "));
 		
 		::rtl::OUString aError;
 		static sal_Int32 BUFFERSIZE = 256;
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index ef07f908836a..540bd41966d6 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -283,7 +283,7 @@ namespace
 
         static const ::rtl::OUString s_sTableTypeView(RTL_CONSTASCII_USTRINGPARAM("VIEW"));
         static const ::rtl::OUString s_sTableTypeTable(RTL_CONSTASCII_USTRINGPARAM("TABLE"));
-        static const ::rtl::OUString s_sWildcard = ::rtl::OUString::createFromAscii("%");
+        static const ::rtl::OUString s_sWildcard( RTL_CONSTASCII_USTRINGPARAM( "%" ));
 
         // we want all catalogues, all schemas, all tables
         Sequence< ::rtl::OUString > sTableTypes(3);
@@ -904,7 +904,7 @@ void OSQLParseTreeIterator::traverseCreateColumns(const OSQLParseNode* pSelectNo
             }
             else if(pDatatype && pDatatype->getNodeType() == SQL_NODE_KEYWORD)
             {
-                aTypeName = ::rtl::OUString::createFromAscii("VARCHAR");
+                aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"));
             }
 
             if (aTypeName.getLength())
@@ -946,7 +946,7 @@ bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele
     if (pSelectNode->getChild(2)->isRule() && SQL_ISPUNCTUATION(pSelectNode->getChild(2)->getChild(0),"*"))
     {
         // SELECT * ...
-        setSelectColumnName(m_aSelectColumns,::rtl::OUString::createFromAscii("*"), aEmptyString,aEmptyString);
+        setSelectColumnName(m_aSelectColumns,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")), aEmptyString,aEmptyString);
     }
     else if (SQL_ISRULE(pSelectNode->getChild(2),scalar_exp_commalist))
     {
@@ -966,7 +966,7 @@ bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele
                 // alle Spalten der Tabelle
                 ::rtl::OUString aTableRange;
                 pColumnRef->getChild(0)->parseNodeToStr( aTableRange, m_pImpl->m_xConnection, NULL, sal_False, sal_False );
-                setSelectColumnName(m_aSelectColumns,::rtl::OUString::createFromAscii("*"), aEmptyString,aTableRange);
+                setSelectColumnName(m_aSelectColumns,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")), aEmptyString,aTableRange);
                 continue;
             }
             else if (SQL_ISRULE(pColumnRef,derived_column))
@@ -1475,7 +1475,7 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode
                         ?   _rColumnAlias
                         :   _aColumnName.getLength()
                         ?   _aColumnName
-                        :   ::rtl::OUString::createFromAscii("?");
+                        :   ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("?"));
     }
     else if (SQL_ISPUNCTUATION(pMark,":"))
     {
@@ -1681,8 +1681,8 @@ OSQLTable OSQLParseTreeIterator::impl_createTableObject( const ::rtl::OUString&
         NULL,
         sal_False,
         rTableName,
-        ::rtl::OUString::createFromAscii("Table"),
-        ::rtl::OUString::createFromAscii("New Created Table"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Table")),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("New Created Table")),
         rSchemaName,
         rCatalogName
     );
@@ -1788,7 +1788,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _
                 // did not find a column with this name in any of the tables
                 OParseColumn* pColumn = new OParseColumn(
                     aNewColName,
-                    ::rtl::OUString::createFromAscii( "VARCHAR" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR")),
                         // TODO: does this match with _nType?
                         // Or should be fill this from the getTypeInfo of the connection?
                     ::rtl::OUString(),
@@ -2143,7 +2143,7 @@ void OSQLParseTreeIterator::impl_appendError( IParseContext::ErrorCode _eError,
 
         sErrorMessage = sErrorMessage.replaceAt( sErrorMessage.indexOf( sPlaceHolder1 ), sPlaceHolder1.getLength(), *_pReplaceToken1 );
         if ( _pReplaceToken2 )
-            sErrorMessage = sErrorMessage.replaceAt( sErrorMessage.indexOf( ::rtl::OUString::createFromAscii( "#2" ) ), 2, *_pReplaceToken2 );
+            sErrorMessage = sErrorMessage.replaceAt( sErrorMessage.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#2")) ), 2, *_pReplaceToken2 );
     }
 
     impl_appendError( SQLException(
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index e4286c971650..396f83ab5efe 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -422,7 +422,7 @@ void OSQLParseNode::impl_parseNodeToString_throw(::rtl::OUStringBuffer& rString,
 
     case as:
         if ( rParam.aMetaData.generateASBeforeCorrelationName() )
-            rString.append(::rtl::OUString::createFromAscii( " AS" ));
+            rString.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" AS")));
         bHandled = true;
         break;
 
@@ -670,7 +670,7 @@ void OSQLParseNode::impl_parseTableRangeNodeToString_throw(::rtl::OUStringBuffer
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseNode::impl_parseTableRangeNodeToString_throw" );
     OSL_PRECOND(  ( count() == 2 ) || ( count() == 3 ) || ( count() == 5 ) ,"Illegal count");
 
-    // rString += ::rtl::OUString::createFromAscii(" ");
+    // rString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
     ::std::for_each(m_aChildren.begin(),m_aChildren.end(),
         boost::bind( &OSQLParseNode::impl_parseNodeToString_throw, _1, boost::ref( rString ), boost::cref( rParam ) ));
 }
@@ -726,7 +726,7 @@ void OSQLParseNode::impl_parseLikeNodeToString_throw( ::rtl::OUStringBuffer& rSt
     {
         ::rtl::OUString aStr = ConvertLikeToken(pParaNode, pEscNode, rParam.bInternational);
         rString.appendAscii(" ");
-        rString.append(SetQuotation(aStr,::rtl::OUString::createFromAscii("\'"),::rtl::OUString::createFromAscii("\'\'")));
+        rString.append(SetQuotation(aStr,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\'")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\'\'"))));
     }
     else
         pParaNode->impl_parseNodeToString_throw( rString, aNewParam );
@@ -989,7 +989,7 @@ sal_Int16 OSQLParser::buildLikeRule(OSQLParseNode*& pAppend, OSQLParseNode*& pLi
                             sal_Int16 nScale = 0;
                             try
                             {
-                                Any aValue = getNumberFormatProperty( m_xFormatter, m_nFormatKey, ::rtl::OUString::createFromAscii("Decimals") );
+                                Any aValue = getNumberFormatProperty( m_xFormatter, m_nFormatKey, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Decimals")) );
                                 aValue >>= nScale;
                             }
                             catch( Exception& )
@@ -1006,7 +1006,7 @@ sal_Int16 OSQLParser::buildLikeRule(OSQLParseNode*& pAppend, OSQLParseNode*& pLi
                         break;
                     default:
                         m_sErrorMessage = m_pContext->getErrorMessage(IParseContext::ERROR_VALUE_NO_LIKE);
-                        m_sErrorMessage = m_sErrorMessage.replaceAt(m_sErrorMessage.indexOf(::rtl::OUString::createFromAscii("#1")),2,pLiteral->getTokenValue());
+                        m_sErrorMessage = m_sErrorMessage.replaceAt(m_sErrorMessage.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#1"))),2,pLiteral->getTokenValue());
                         break;
                 }
             }
@@ -1022,10 +1022,10 @@ OSQLParseNode* OSQLParser::buildNode_Date(const double& fValue, sal_Int32 nType)
 {
     ::rtl::OUString aEmptyString;
     OSQLParseNode* pNewNode = new OSQLInternalNode(aEmptyString, SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::set_fct_spec));
-    pNewNode->append(new OSQLInternalNode(::rtl::OUString::createFromAscii("{"), SQL_NODE_PUNCTUATION));
+    pNewNode->append(new OSQLInternalNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("{")), SQL_NODE_PUNCTUATION));
     OSQLParseNode* pDateNode = new OSQLInternalNode(aEmptyString, SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::odbc_fct_spec));
     pNewNode->append(pDateNode);
-    pNewNode->append(new OSQLInternalNode(::rtl::OUString::createFromAscii("}"), SQL_NODE_PUNCTUATION));
+    pNewNode->append(new OSQLInternalNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("}")), SQL_NODE_PUNCTUATION));
 
     switch (nType)
     {
@@ -1100,7 +1100,7 @@ OSQLParseNode* OSQLParser::buildNode_STR_NUM(OSQLParseNode*& _pLiteral)
 {
     ::rtl::OUString aValue;
     if(!m_xCharClass.is())
-        m_xCharClass  = Reference<XCharacterClassification>(m_xServiceFactory->createInstance(::rtl::OUString::createFromAscii("com.sun.star.i18n.CharacterClassification")),UNO_QUERY);
+        m_xCharClass  = Reference<XCharacterClassification>(m_xServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.CharacterClassification"))),UNO_QUERY);
     if(m_xCharClass.is() && s_xLocaleData.is())
     {
         try
@@ -1109,10 +1109,10 @@ OSQLParseNode* OSQLParser::buildNode_STR_NUM(OSQLParseNode*& _pLiteral)
             if((aResult.TokenType & KParseType::IDENTNAME) && aResult.EndPos == _rValue.getLength())
             {
                 aValue = ::rtl::OUString::valueOf(aResult.Value);
-                sal_Int32 nPos = aValue.lastIndexOf(::rtl::OUString::createFromAscii("."));
+                sal_Int32 nPos = aValue.lastIndexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")));
                 if((nPos+_nScale) < aValue.getLength())
                     aValue = aValue.replaceAt(nPos+_nScale,aValue.getLength()-nPos-_nScale,::rtl::OUString());
-                aValue = aValue.replaceAt(aValue.lastIndexOf(::rtl::OUString::createFromAscii(".")),1,s_xLocaleData->getLocaleItem(m_pData->aLocale).decimalSeparator);
+                aValue = aValue.replaceAt(aValue.lastIndexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("."))),1,s_xLocaleData->getLocaleItem(m_pData->aLocale).decimalSeparator);
                 return aValue;
             }
         }
@@ -1319,7 +1319,7 @@ OSQLParser::OSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star:
         s_pGarbageCollector = new OSQLParseNodesGarbageCollector();
 
         if(!s_xLocaleData.is())
-            s_xLocaleData = Reference<XLocaleData>(m_xServiceFactory->createInstance(::rtl::OUString::createFromAscii("com.sun.star.i18n.LocaleData")),UNO_QUERY);
+            s_xLocaleData = Reference<XLocaleData>(m_xServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.LocaleData"))),UNO_QUERY);
 
         // auf 0 zuruecksetzen
         memset(OSQLParser::s_nRuleIDs,0,sizeof(OSQLParser::s_nRuleIDs[0]) * (OSQLParseNode::rule_count+1));
@@ -1484,7 +1484,7 @@ void OSQLParseNode::substituteParameterNames(OSQLParseNode* _pNode)
         OSQLParseNode* pChildNode = _pNode->getChild(i);
         if(SQL_ISRULE(pChildNode,parameter) && pChildNode->count() > 1)
         {
-            OSQLParseNode* pNewNode = new OSQLParseNode(::rtl::OUString::createFromAscii("?") ,SQL_NODE_PUNCTUATION,0);
+            OSQLParseNode* pNewNode = new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("?")) ,SQL_NODE_PUNCTUATION,0);
             delete pChildNode->replace(pChildNode->getChild(0),pNewNode);
             sal_Int32 nChildCount = pChildNode->count();
             for(sal_Int32 j=1;j < nChildCount;++j)
@@ -1722,19 +1722,19 @@ sal_Bool OSQLParseNode::addDateValue(::rtl::OUStringBuffer& rString, const SQLPa
             SQL_ISTOKEN(pODBCNodeChild, T) ||
             SQL_ISTOKEN(pODBCNodeChild, TS) ))
         {
-            ::rtl::OUString suQuote(::rtl::OUString::createFromAscii("'"));
+            ::rtl::OUString suQuote(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'")));
             if (rParam.bPredicate)
             {
                  if (rParam.aMetaData.shouldEscapeDateTime())
                  {
-                     suQuote = ::rtl::OUString::createFromAscii("#");
+                     suQuote = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#"));
                  }
             }
             else
             {
                  if (rParam.aMetaData.shouldEscapeDateTime())
                  {
-                     // suQuote = ::rtl::OUString::createFromAscii("'");
+                     // suQuote = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"));
                      return sal_False;
                  }
             }
@@ -1771,7 +1771,7 @@ void OSQLParseNode::replaceNodeValue(const ::rtl::OUString& rTableAlias,const ::
         {
             OSQLParseNode * pCol = removeAt((sal_uInt32)0);
             append(new OSQLParseNode(rTableAlias,SQL_NODE_NAME));
-            append(new OSQLParseNode(::rtl::OUString::createFromAscii("."),SQL_NODE_PUNCTUATION));
+            append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")),SQL_NODE_PUNCTUATION));
             append(pCol);
         }
         else
@@ -1798,7 +1798,7 @@ OSQLParseNode* MakeANDNode(OSQLParseNode *pLeftLeaf,OSQLParseNode *pRightLeaf)
 {
     OSQLParseNode* pNewNode = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_term));
     pNewNode->append(pLeftLeaf);
-    pNewNode->append(new OSQLParseNode(::rtl::OUString::createFromAscii("AND"),SQL_NODE_KEYWORD,SQL_TOKEN_AND));
+    pNewNode->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AND")),SQL_NODE_KEYWORD,SQL_TOKEN_AND));
     pNewNode->append(pRightLeaf);
     return pNewNode;
 }
@@ -1807,7 +1807,7 @@ OSQLParseNode* MakeORNode(OSQLParseNode *pLeftLeaf,OSQLParseNode *pRightLeaf)
 {
     OSQLParseNode* pNewNode = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::search_condition));
     pNewNode->append(pLeftLeaf);
-    pNewNode->append(new OSQLParseNode(::rtl::OUString::createFromAscii("OR"),SQL_NODE_KEYWORD,SQL_TOKEN_OR));
+    pNewNode->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OR")),SQL_NODE_KEYWORD,SQL_TOKEN_OR));
     pNewNode->append(pRightLeaf);
     return pNewNode;
 }
@@ -1909,7 +1909,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition,sal_B
         {
             OSQLParseNode* pNewNode = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_term));
             pNewNode->append(pSearchCondition->removeAt((sal_uInt32)0));
-            pNewNode->append(new OSQLParseNode(::rtl::OUString::createFromAscii("AND"),SQL_NODE_KEYWORD,SQL_TOKEN_AND));
+            pNewNode->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AND")),SQL_NODE_KEYWORD,SQL_TOKEN_AND));
             pNewNode->append(pSearchCondition->removeAt((sal_uInt32)1));
             replaceAndReset(pSearchCondition,pNewNode);
 
@@ -1929,7 +1929,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition,sal_B
         {
             OSQLParseNode* pNewNode = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::search_condition));
             pNewNode->append(pSearchCondition->removeAt((sal_uInt32)0));
-            pNewNode->append(new OSQLParseNode(::rtl::OUString::createFromAscii("OR"),SQL_NODE_KEYWORD,SQL_TOKEN_OR));
+            pNewNode->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OR")),SQL_NODE_KEYWORD,SQL_TOKEN_OR));
             pNewNode->append(pSearchCondition->removeAt((sal_uInt32)1));
             replaceAndReset(pSearchCondition,pNewNode);
 
@@ -1961,22 +1961,22 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition,sal_B
         switch(pComparison->getNodeType())
         {
             case SQL_NODE_EQUAL:
-                pNewComparison = new OSQLParseNode(::rtl::OUString::createFromAscii("<>"),SQL_NODE_NOTEQUAL,SQL_NOTEQUAL);
+                pNewComparison = new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<>")),SQL_NODE_NOTEQUAL,SQL_NOTEQUAL);
                 break;
             case SQL_NODE_LESS:
-                pNewComparison = new OSQLParseNode(::rtl::OUString::createFromAscii(">="),SQL_NODE_GREATEQ,SQL_GREATEQ);
+                pNewComparison = new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">=")),SQL_NODE_GREATEQ,SQL_GREATEQ);
                 break;
             case SQL_NODE_GREAT:
-                pNewComparison = new OSQLParseNode(::rtl::OUString::createFromAscii("<="),SQL_NODE_LESSEQ,SQL_LESSEQ);
+                pNewComparison = new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<=")),SQL_NODE_LESSEQ,SQL_LESSEQ);
                 break;
             case SQL_NODE_LESSEQ:
-                pNewComparison = new OSQLParseNode(::rtl::OUString::createFromAscii(">"),SQL_NODE_GREAT,SQL_GREAT);
+                pNewComparison = new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">")),SQL_NODE_GREAT,SQL_GREAT);
                 break;
             case SQL_NODE_GREATEQ:
-                pNewComparison = new OSQLParseNode(::rtl::OUString::createFromAscii("<"),SQL_NODE_LESS,SQL_LESS);
+                pNewComparison = new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<")),SQL_NODE_LESS,SQL_LESS);
                 break;
             case SQL_NODE_NOTEQUAL:
-                pNewComparison = new OSQLParseNode(::rtl::OUString::createFromAscii("="),SQL_NODE_EQUAL,SQL_EQUAL);
+                pNewComparison = new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("=")),SQL_NODE_EQUAL,SQL_EQUAL);
                 break;
             default:
                 OSL_ENSURE( false, "OSQLParseNode::negateSearchCondition: unexpected node type!" );
@@ -2001,7 +2001,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition,sal_B
         OSQLParseNode* pNot = pPart2->getChild(nNotPos);
         OSQLParseNode* pNotNot = NULL;
         if(pNot->isRule())
-            pNotNot = new OSQLParseNode(::rtl::OUString::createFromAscii("NOT"),SQL_NODE_KEYWORD,SQL_TOKEN_NOT);
+            pNotNot = new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NOT")),SQL_NODE_KEYWORD,SQL_TOKEN_NOT);
         else
             pNotNot = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::sql_not));
         pPart2->replace(pNot, pNotNot);
@@ -2012,7 +2012,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition,sal_B
         OSQLParseNode* pNot = pSearchCondition->getChild( 1 )->getChild( 0 );
         OSQLParseNode* pNotNot = NULL;
         if(pNot->isRule())
-            pNotNot = new OSQLParseNode(::rtl::OUString::createFromAscii("NOT"),SQL_NODE_KEYWORD,SQL_TOKEN_NOT);
+            pNotNot = new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NOT")),SQL_NODE_KEYWORD,SQL_TOKEN_NOT);
         else
             pNotNot = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::sql_not));
         pSearchCondition->getChild( 1 )->replace(pNot, pNotNot);
@@ -2104,9 +2104,9 @@ void OSQLParseNode::absorptions(OSQLParseNode*& pSearchCondition)
             OSQLParseNode* p2ndAnd = MakeANDNode(new OSQLParseNode(*pA),pC);
             pNewNode = MakeORNode(p1stAnd,p2ndAnd);
             OSQLParseNode* pNode = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_primary));
-            pNode->append(new OSQLParseNode(::rtl::OUString::createFromAscii("("),SQL_NODE_PUNCTUATION));
+            pNode->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("(")),SQL_NODE_PUNCTUATION));
             pNode->append(pNewNode);
-            pNode->append(new OSQLParseNode(::rtl::OUString::createFromAscii(")"),SQL_NODE_PUNCTUATION));
+            pNode->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")),SQL_NODE_PUNCTUATION));
             OSQLParseNode::eraseBraces(p1stAnd);
             OSQLParseNode::eraseBraces(p2ndAnd);
             replaceAndReset(pSearchCondition,pNode);
@@ -2184,9 +2184,9 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition)
             OSQLParseNode* pNode    = MakeORNode(pLeft,pRight);
 
             OSQLParseNode* pNewRule = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_primary));
-            pNewRule->append(new OSQLParseNode(::rtl::OUString::createFromAscii("("),SQL_NODE_PUNCTUATION));
+            pNewRule->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("(")),SQL_NODE_PUNCTUATION));
             pNewRule->append(pNode);
-            pNewRule->append(new OSQLParseNode(::rtl::OUString::createFromAscii(")"),SQL_NODE_PUNCTUATION));
+            pNewRule->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")),SQL_NODE_PUNCTUATION));
 
             OSQLParseNode::eraseBraces(pLeft);
             OSQLParseNode::eraseBraces(pRight);
@@ -2201,9 +2201,9 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition)
             OSQLParseNode* pNode = MakeORNode(pLeft,pRight);
 
             OSQLParseNode* pNewRule = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_primary));
-            pNewRule->append(new OSQLParseNode(::rtl::OUString::createFromAscii("("),SQL_NODE_PUNCTUATION));
+            pNewRule->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("(")),SQL_NODE_PUNCTUATION));
             pNewRule->append(pNode);
-            pNewRule->append(new OSQLParseNode(::rtl::OUString::createFromAscii(")"),SQL_NODE_PUNCTUATION));
+            pNewRule->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")),SQL_NODE_PUNCTUATION));
 
             OSQLParseNode::eraseBraces(pLeft);
             OSQLParseNode::eraseBraces(pRight);
@@ -2218,9 +2218,9 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition)
             OSQLParseNode* pNode    = MakeORNode(pLeft,pRight);
 
             OSQLParseNode* pNewRule = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_primary));
-            pNewRule->append(new OSQLParseNode(::rtl::OUString::createFromAscii("("),SQL_NODE_PUNCTUATION));
+            pNewRule->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("(")),SQL_NODE_PUNCTUATION));
             pNewRule->append(pNode);
-            pNewRule->append(new OSQLParseNode(::rtl::OUString::createFromAscii(")"),SQL_NODE_PUNCTUATION));
+            pNewRule->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")),SQL_NODE_PUNCTUATION));
 
             OSQLParseNode::eraseBraces(pLeft);
             OSQLParseNode::eraseBraces(pRight);
@@ -2235,9 +2235,9 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition)
             OSQLParseNode* pNode    = MakeORNode(pLeft,pRight);
 
             OSQLParseNode* pNewRule = new OSQLParseNode(::rtl::OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_primary));
-            pNewRule->append(new OSQLParseNode(::rtl::OUString::createFromAscii("("),SQL_NODE_PUNCTUATION));
+            pNewRule->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("(")),SQL_NODE_PUNCTUATION));
             pNewRule->append(pNode);
-            pNewRule->append(new OSQLParseNode(::rtl::OUString::createFromAscii(")"),SQL_NODE_PUNCTUATION));
+            pNewRule->append(new OSQLParseNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")),SQL_NODE_PUNCTUATION));
 
             OSQLParseNode::eraseBraces(pLeft);
             OSQLParseNode::eraseBraces(pRight);
@@ -2475,7 +2475,7 @@ void OSQLParseNode::parseLeaf(::rtl::OUStringBuffer& rString, const SQLParseNode
         case SQL_NODE_STRING:
             if (rString.getLength())
                 rString.appendAscii(" ");
-            rString.append(SetQuotation(m_aNodeValue,::rtl::OUString::createFromAscii("\'"),::rtl::OUString::createFromAscii("\'\'")));
+            rString.append(SetQuotation(m_aNodeValue,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\'")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\'\'"))));
             break;
         case SQL_NODE_NAME:
             if (rString.getLength())
diff --git a/connectivity/source/sdbcx/VColumn.cxx b/connectivity/source/sdbcx/VColumn.cxx
index 2d92e22e9878..0d8827f8fc8d 100644
--- a/connectivity/source/sdbcx/VColumn.cxx
+++ b/connectivity/source/sdbcx/VColumn.cxx
@@ -47,17 +47,17 @@ using namespace ::com::sun::star::sdbc;
 ::rtl::OUString SAL_CALL OColumn::getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     if(isNew())
-        return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VColumnDescription");
-    return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VColumn");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VColumnDescription"));
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VColumn"));
 }
 // -----------------------------------------------------------------------------
 ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OColumn::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1);
     if(isNew())
-        aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.ColumnDescription");
+        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ColumnDescription"));
     else
-        aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Column");
+        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Column"));
 
     return aSupported;
 }
diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx
index e01f1d1e438a..e05b6e43056b 100644
--- a/connectivity/source/sdbcx/VIndex.cxx
+++ b/connectivity/source/sdbcx/VIndex.cxx
@@ -52,17 +52,17 @@ using namespace ::com::sun::star::lang;
 ::rtl::OUString SAL_CALL OIndex::getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     if(isNew())
-        return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VIndexDescriptor");
-    return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VIndex");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VIndexDescriptor"));
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VIndex"));
 }
 // -----------------------------------------------------------------------------
 ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OIndex::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1);
     if(isNew())
-        aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.IndexDescriptor");
+        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.IndexDescriptor"));
     else
-        aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Index");
+        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Index"));
 
     return aSupported;
 }
diff --git a/connectivity/source/sdbcx/VIndexColumn.cxx b/connectivity/source/sdbcx/VIndexColumn.cxx
index 4e82cc8a082c..ac75c14ef778 100644
--- a/connectivity/source/sdbcx/VIndexColumn.cxx
+++ b/connectivity/source/sdbcx/VIndexColumn.cxx
@@ -39,17 +39,17 @@ using namespace ::com::sun::star::uno;
 ::rtl::OUString SAL_CALL OIndexColumn::getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     if(isNew())
-        return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VIndexColumnDescription");
-    return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VIndex");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VIndexColumnDescription"));
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VIndex"));
 }
 // -----------------------------------------------------------------------------
 ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OIndexColumn::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1);
     if(isNew())
-        aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.IndexDescription");
+        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.IndexDescription"));
     else
-        aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Index");
+        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Index"));
 
     return aSupported;
 }
diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx
index 5efa7693d26f..a6ae492de35b 100644
--- a/connectivity/source/sdbcx/VKey.cxx
+++ b/connectivity/source/sdbcx/VKey.cxx
@@ -51,17 +51,17 @@ using namespace ::com::sun::star::lang;
 ::rtl::OUString SAL_CALL OKey::getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     if(isNew())
-        return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VKeyDescription");
-    return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VKey");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VKeyDescription"));
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VKey"));
 }
 // -----------------------------------------------------------------------------
 ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OKey::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1);
     if(isNew())
-        aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.KeyDescription");
+        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.KeyDescription"));
     else
-        aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Key");
+        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Key"));
 
     return aSupported;
 }
diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx
index 072b3a188661..5a8baf11f62c 100644
--- a/connectivity/source/sdbcx/VKeyColumn.cxx
+++ b/connectivity/source/sdbcx/VKeyColumn.cxx
@@ -40,17 +40,17 @@ using namespace cppu;
 ::rtl::OUString SAL_CALL OKeyColumn::getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     if(isNew())
-        return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VKeyColumnDescription");
-    return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VKeyColumn");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VKeyColumnDescription"));
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VKeyColumn"));
 }
 // -----------------------------------------------------------------------------
 ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OKeyColumn::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1);
     if(isNew())
-        aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.KeyColumnDescription");
+        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.KeyColumnDescription"));
     else
-        aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.KeyColumn");
+        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.KeyColumn"));
 
     return aSupported;
 }
diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx
index 80f37ddc440b..4f12f0daa4e1 100644
--- a/connectivity/source/sdbcx/VTable.cxx
+++ b/connectivity/source/sdbcx/VTable.cxx
@@ -54,8 +54,8 @@ using namespace ::com::sun::star::lang;
 ::rtl::OUString SAL_CALL OTable::getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     if(isNew())
-        return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VTableDescriptor");
-    return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Table");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VTableDescriptor"));
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Table"));
 }
 
 // -----------------------------------------------------------------------------
@@ -63,9 +63,9 @@ using namespace ::com::sun::star::lang;
 {
     ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1);
     if(isNew())
-        aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.TableDescriptor");
+        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.TableDescriptor"));
     else
-        aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Table");
+        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Table"));
 
     return aSupported;
 }
diff --git a/connectivity/workben/iniParser/main.cxx b/connectivity/workben/iniParser/main.cxx
index 41c183040d7b..fa0987b15b89 100644
--- a/connectivity/workben/iniParser/main.cxx
+++ b/connectivity/workben/iniParser/main.cxx
@@ -97,7 +97,7 @@ public:
             sal_uInt64 nSize = 0;
 
             osl_getFileSize(handle, &nSize);
-            OUString sectionName = OUString::createFromAscii("no name section");
+            OUString sectionName( RTL_CONSTASCII_USTRINGPARAM( "no name section" ));
             while (true)
             {
                 sal_uInt64 nPos;
@@ -128,7 +128,7 @@ public:
                         sectionName =  OStringToOUString(
                             line.copy(nIndexStart + 1,nIndexEnd - nIndexStart -1).trim(), RTL_TEXTENCODING_ASCII_US );
                         if (!sectionName.getLength())
-                            sectionName = OUString::createFromAscii("no name section");
+                            sectionName = OUString(RTL_CONSTASCII_USTRINGPARAM("no name section"));
 
                         ini_Section *aSection = &mAllSection[sectionName];
                         aSection->sName = sectionName;
@@ -184,7 +184,7 @@ int _cdecl main( int argc, char * argv[] )
 
 {
 
-    IniParser parser(OUString::createFromAscii("test.ini"));
+    IniParser parser(OUString(RTL_CONSTASCII_USTRINGPARAM("test.ini")));
     parser.Dump();
     return 0;
 }
diff --git a/connectivity/workben/little/main.cxx b/connectivity/workben/little/main.cxx
index 2bed1a8496f8..e975c38e0c69 100644
--- a/connectivity/workben/little/main.cxx
+++ b/connectivity/workben/little/main.cxx
@@ -66,28 +66,28 @@ void _cdecl main( int argc, char * argv[] )
 
     try{
         Reference< ::com::sun::star::lang::XMultiServiceFactory > xFac =
-                createRegistryServiceFactory(OUString::createFromAscii("g:\\office50\\program\\applicat.rdb"),OUString());
+                createRegistryServiceFactory(OUString(RTL_CONSTASCII_USTRINGPARAM("g:\\office50\\program\\applicat.rdb")),OUString());
         if(!xFac.is())
             return;
 
-        m_xDriver = Reference<XDriver>(xFac->createInstance(OUString::createFromAscii("com.sun.star.sdbc.driver.dbase.Driver")),UNO_QUERY);
+        m_xDriver = Reference<XDriver>(xFac->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.driver.dbase.Driver"))),UNO_QUERY);
         if(m_xDriver.is())
         {
 
             Sequence<PropertyValue> aValue;
-    //      aValue.getArray()[0] = PropertyValue( OUString::createFromAscii("user"),0,makeAny(OUString::createFromAscii("TEST1")),PropertyState_DIRECT_VALUE);
-    //      aValue.getArray()[1] = PropertyValue( OUString::createFromAscii("password"),0,makeAny(OUString::createFromAscii("TEST1")),PropertyState_DIRECT_VALUE);
+    //      aValue.getArray()[0] = PropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("user")),0,makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM("TEST1"))),PropertyState_DIRECT_VALUE);
+    //      aValue.getArray()[1] = PropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("password")),0,makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM("TEST1"))),PropertyState_DIRECT_VALUE);
     //
-            m_xConnection = m_xDriver->connect(OUString::createFromAscii("sdbc:dbase:g:\\"),aValue);
+            m_xConnection = m_xDriver->connect(OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:dbase:g:\\")),aValue);
             if(m_xConnection.is())
             {
                 Reference<XStatement> xStmt = m_xConnection->createStatement();
                 if(xStmt.is())
                 {
-                    Reference<XResultSet> xRes = xStmt->executeQuery(OUString::createFromAscii("SELECT * FROM Tele"));
+                    Reference<XResultSet> xRes = xStmt->executeQuery(OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT * FROM Tele")));
                     if(xRes.is())
                     {
-                        ::rtl::OUString aPat = ::rtl::OUString::createFromAscii("%s\t");
+                        ::rtl::OUString aPat( RTL_CONSTASCII_USTRINGPARAM( "%s\t" ));
                         Reference<XRow> xRow(xRes,UNO_QUERY);
                         Reference<XResultSetMetaData> xMeta = Reference<XResultSetMetaDataSupplier>(xRes,UNO_QUERY)->getMetaData();
                         for(sal_Int32 i=1;i<xMeta->getColumnCount();++i)
diff --git a/connectivity/workben/testmoz/main.cxx b/connectivity/workben/testmoz/main.cxx
index 390c11a0093e..2fd891b89abf 100644
--- a/connectivity/workben/testmoz/main.cxx
+++ b/connectivity/workben/testmoz/main.cxx
@@ -231,13 +231,13 @@ Reference< XMultiServiceFactory > InitializeFac( void )
                     createRegistryServiceFactory( types, sal_True );
                 Reference< XImplementationRegistration > xIR(
                     interimSmgr->createInstance(
-                        OUString::createFromAscii(
-                            "com.sun.star.registry.ImplementationRegistration" ) ), UNO_QUERY );
+                        OUString::(RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.registry.ImplementationRegistration" )) ), UNO_QUERY );
 
                 Reference< XSimpleRegistry > xReg(
                     interimSmgr->createInstance(
-                        OUString::createFromAscii(
-                            "com.sun.star.registry.SimpleRegistry" ) ), UNO_QUERY );
+                        OUString::(RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.registry.SimpleRegistry" )) ), UNO_QUERY );
                 if ( xReg.is() )
                 {
                     xReg->open(services, sal_False, sal_True);
@@ -283,12 +283,12 @@ Reference< XMultiServiceFactory > InitializeFac( void )
 
 /*  // Create simple ConfigManager
     Sequence< Any > aConfArgs(3);
-    aConfArgs[0] <<= PropertyValue( OUString::createFromAscii("servertype"), 0, makeAny( OUString::createFromAscii("local") ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE );
-    aConfArgs[1] <<= PropertyValue( OUString::createFromAscii("sourcepath"), 0, makeAny( OUString::createFromAscii("g:\\") ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE );
-    aConfArgs[2] <<= PropertyValue( OUString::createFromAscii("updatepath"), 0, makeAny( OUString::createFromAscii("g:\\") ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE );
+    aConfArgs[0] <<= PropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("servertype")), 0, makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("local")) ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE );
+    aConfArgs[1] <<= PropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("sourcepath")), 0, makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("g:\\")) ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE );
+    aConfArgs[2] <<= PropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("updatepath")), 0, makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("g:\\")) ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE );
 
     Reference< XContentProvider > xConfProvider
-        ( xSMgr->createInstanceWithArguments( OUString::createFromAscii( "com.sun.star.configuration.ConfigurationProvider" ), aConfArgs), UNO_QUERY );
+        ( xSMgr->createInstanceWithArguments( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider")), aConfArgs), UNO_QUERY );
 */
 
 
@@ -301,13 +301,13 @@ Reference< XMultiServiceFactory > InitializeFac( void )
         ucb::ContentBroker::get()->getContentProviderManagerInterface();
 
     Reference< XContentProvider > xFileProvider
-        ( xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.ucb.FileContentProvider" ) ), UNO_QUERY );
-    xUcb->registerContentProvider( xFileProvider, OUString::createFromAscii( "file" ), sal_True );
+        ( xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.FileContentProvider")) ), UNO_QUERY );
+    xUcb->registerContentProvider( xFileProvider, OUString(RTL_CONSTASCII_USTRINGPARAM("file")), sal_True );
 
 
 /*  Reference< XContentProvider > xPackageProvider
-        ( xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.ucb.PackageContentProvider" ) ), UNO_QUERY );
-    xUcb->registerContentProvider( xPackageProvider, OUString::createFromAscii( "vnd.sun.star.pkg" ), sal_True );
+        ( xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.PackageContentProvider")) ), UNO_QUERY );
+    xUcb->registerContentProvider( xPackageProvider, OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.pkg")), sal_True );
     */
     globalUcb = xUcb;
     return xSMgr;
@@ -329,10 +329,10 @@ int TestMetaData(Reference< ::com::sun::star::sdbc::XConnection> &pConnection)
                     printf("Testing getColumns() : START\n");
                     {
                         Reference<XResultSet> xRes = xDmd->getColumns(
-                                makeAny(OUString::createFromAscii("")), // Catalog
-                                OUString::createFromAscii("%"),          // Schema
-                                OUString::createFromAscii("%"),          // TabName
-                                OUString::createFromAscii("%")
+                                makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM(""))), // Catalog
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("%")),          // Schema
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("%")),          // TabName
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("%"))
                                 );
                         printXResultSets( xRes );
                     }
@@ -348,9 +348,9 @@ int TestMetaData(Reference< ::com::sun::star::sdbc::XConnection> &pConnection)
                 printf("Testing getTables() : START\n");
                     {
                         Reference<XResultSet> xRes = xDmd->getTables(
-                                makeAny(OUString::createFromAscii("")), // Catalog
-                                OUString::createFromAscii("%"),          // Schema
-                                OUString::createFromAscii("%"),          // TabName
+                                makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM(""))), // Catalog
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("%")),          // Schema
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("%")),          // TabName
                                 Sequence<rtl::OUString>()
                                 );
                         printXResultSets( xRes );
@@ -437,16 +437,16 @@ Reference< ::com::sun::star::sdbc::XConnection> TestConnected
     {
         case -1:
         case 1: //mozilla
-            url=OUString::createFromAscii("sdbc:address:mozilla://");
+            url=OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:mozilla://"));
             break;
         case 2:
-            url=OUString::createFromAscii("sdbc:address:ldap://");
+            url=OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:ldap://"));
             char hostname[40],basedn[40];
             scanf("%s %s",hostname,basedn);
             aValue.realloc(2);
-            aValue[0].Name = ::rtl::OUString::createFromAscii("HostName");
+            aValue[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HostName"));
             aValue[0].Value <<= rtl::OUString::createFromAscii(hostname);
-            aValue[1].Name = ::rtl::OUString::createFromAscii("BaseDN");
+            aValue[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseDN"));
             aValue[1].Value <<= rtl::OUString::createFromAscii(basedn);
             break;
         case 3:
@@ -454,12 +454,12 @@ Reference< ::com::sun::star::sdbc::XConnection> TestConnected
             break;
         case 5:
             //Default LDAP AB
-            url=OUString::createFromAscii("sdbc:address:ldap://");
+            url=OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:ldap://"));
             aValue.realloc(2);
-            aValue[0].Name = ::rtl::OUString::createFromAscii("HostName");
-            aValue[0].Value <<= rtl::OUString::createFromAscii("sun-ds");
-            aValue[1].Name = ::rtl::OUString::createFromAscii("BaseDN");
-            aValue[1].Value <<= rtl::OUString::createFromAscii("dc=sun,dc=com");
+            aValue[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HostName"));
+            aValue[0].Value <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sun-ds"));
+            aValue[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseDN"));
+            aValue[1].Value <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("dc=sun,dc=com"));
             break;
         default:
             return pConnection;
@@ -676,7 +676,7 @@ int _cdecl main( int argc, char * argv[] )
     {
     Reference< ::com::sun::star::sdbc::XDriver>
     m_xDriver(xMgr->createInstance(
-           OUString::createFromAscii("com.sun.star.comp.sdbc.MozabDriver")),
+           OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdbc.MozabDriver"))),
              UNO_QUERY);
         if(m_xDriver.is())
     {
diff --git a/connectivity/workben/testmoz/mozthread.cxx b/connectivity/workben/testmoz/mozthread.cxx
index f3a347043e9e..cb01c33a835b 100644
--- a/connectivity/workben/testmoz/mozthread.cxx
+++ b/connectivity/workben/testmoz/mozthread.cxx
@@ -190,10 +190,10 @@ int TestMetaData(Reference< ::com::sun::star::sdbc::XConnection> &pConnection)
         OSL_TRACE("Testing getColumns() : START\n");
         {
             Reference<XResultSet> xRes = xDmd->getColumns(
-                                makeAny(OUString::createFromAscii("")), // Catalog
-                                OUString::createFromAscii("%"),          // Schema
-                                OUString::createFromAscii("%"),          // TabName
-                                OUString::createFromAscii("%")
+                                makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM(""))), // Catalog
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("%")),          // Schema
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("%")),          // TabName
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("%"))
                                 );
             printXResultSets( xRes );
         }
@@ -209,9 +209,9 @@ int TestMetaData(Reference< ::com::sun::star::sdbc::XConnection> &pConnection)
         OSL_TRACE("Testing getTables() : START\n");
          {
             Reference<XResultSet> xRes = xDmd->getTables(
-                    makeAny(OUString::createFromAscii("")), // Catalog
-                    OUString::createFromAscii("%"),          // Schema
-                    OUString::createFromAscii("%"),          // TabName
+                    makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM(""))), // Catalog
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("%")),          // Schema
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("%")),          // TabName
                     Sequence<rtl::OUString>() );
             printXResultSets( xRes );
         }
@@ -234,7 +234,7 @@ void TestQuery(Reference< ::com::sun::star::sdbc::XConnection> &pConnection)
         OSL_TRACE(": got statement\n");
         OSL_TRACE(":   excuteQuery() : START \n");
 //      SELECT "First Name", "Display Name", "E-mail" FROM tablename
-        OUString sqlPrefix= OUString::createFromAscii("SELECT  \"First Name\", \"Display Name\", \"E-mail\" FROM ");
+        OUString sqlPrefix(RTL_CONSTASCII_USTRINGPARAM("SELECT  \"First Name\", \"Display Name\", \"E-mail\" FROM "));
         try
         {
             sal_Int32 times=0;
@@ -245,9 +245,9 @@ void TestQuery(Reference< ::com::sun::star::sdbc::XConnection> &pConnection)
                 OUString qut      = xDmd->getIdentifierQuoteString();
 
                 Reference<XResultSet> xRes = xDmd->getTables(
-                    makeAny(OUString::createFromAscii("")), // Catalog
-                    OUString::createFromAscii("%"),          // Schema
-                    OUString::createFromAscii("%"),          // TabName
+                    makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM(""))), // Catalog
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("%")),          // Schema
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("%")),          // TabName
                         Sequence<rtl::OUString>() );
                 sal_Int32 nTables = 0;
                 while( xRes.is() && xRes->next())
@@ -300,24 +300,24 @@ Reference< ::com::sun::star::sdbc::XConnection> TestConnected
     switch( nIndex)
     {
     case testLDAP:
-        url=OUString::createFromAscii("sdbc:address:ldap://");
+        url=OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:ldap://"));
         aValue.realloc(2);
-        aValue[0].Name = ::rtl::OUString::createFromAscii("HostName");
-        aValue[0].Value <<= rtl::OUString::createFromAscii("sun-ds");
-        aValue[1].Name = ::rtl::OUString::createFromAscii("BaseDN");
-        aValue[1].Value <<= rtl::OUString::createFromAscii("dc=sun,dc=com");
+        aValue[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HostName"));
+        aValue[0].Value <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sun-ds"));
+        aValue[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseDN"));
+        aValue[1].Value <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("dc=sun,dc=com"));
         break;
     case testMozilla:
-        url=OUString::createFromAscii("sdbc:address:mozilla://");
+        url=OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:mozilla://"));
         break;
     case testOp:
-        url=OUString::createFromAscii("sdbc:address:outlook://");
+        url=OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:outlook://"));
         break;
     case testOe:
-        url=OUString::createFromAscii("sdbc:address:outlookexp://");
+        url=OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:outlookexp://"));
         break;
     default:
-        url=OUString::createFromAscii("sdbc:address:mozilla://");
+        url=OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:mozilla://"));
         break;
     }
     pConnection =
@@ -364,7 +364,7 @@ void SAL_CALL mozThread(void*)
     {
         Reference< ::com::sun::star::sdbc::XDriver>
         m_xDriver(mMgr->createInstance(
-           OUString::createFromAscii("com.sun.star.comp.sdbc.MozabDriver")),
+           OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdbc.MozabDriver"))),
              UNO_QUERY);
        if(m_xDriver.is())
         {
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index b35a3a723edc..2059aaec486b 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -341,8 +341,8 @@ namespace cppcanvas
                 }
             }
 
-            UINT32 GetType () { return type; }
-            const ::Color& GetColor () { return solidColor; }
+            UINT32 GetType() const { return type; }
+            const ::Color& GetColor() const { return solidColor; }
 
             void Read (SvStream& s, ImplRenderer& rR)
             {
@@ -1022,7 +1022,7 @@ namespace cppcanvas
                     EMFP_DEBUG (printf ("EMF+\t\tset gradient\n"));
            basegfx::B2DRange aBoundsRectangle (0, 0, 1, 1);
                     if (brush->type == 4) {
-           aGradientService = rtl::OUString::createFromAscii("LinearGradient");
+           aGradientService = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LinearGradient"));
            basegfx::tools::createLinearODFGradientInfo( aGradInfo,
                                     aBoundsRectangle,
                                     aStops.getLength(),
@@ -1030,7 +1030,7 @@ namespace cppcanvas
                                     0 );
 
                     } else {
-            aGradientService = rtl::OUString::createFromAscii("EllipticalGradient");
+            aGradientService = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EllipticalGradient"));
             basegfx::tools::createEllipticalODFGradientInfo( aGradInfo,
                                      aBoundsRectangle,
                                      ::basegfx::B2DVector( 0, 0 ),
@@ -1045,13 +1045,13 @@ namespace cppcanvas
             if( xFactory.is() ) {
             uno::Sequence<uno::Any> args( 3 );
             beans::PropertyValue aProp;
-            aProp.Name = rtl::OUString::createFromAscii( "Colors" );
+            aProp.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Colors"));
             aProp.Value <<= aColors;
             args[0] <<= aProp;
-            aProp.Name = rtl::OUString::createFromAscii( "Stops" );
+            aProp.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Stops"));
             aProp.Value <<= aStops;
             args[1] <<= aProp;
-            aProp.Name = rtl::OUString::createFromAscii( "AspectRatio" );
+            aProp.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AspectRatio"));
             aProp.Value <<= static_cast<sal_Int32>(1);
             args[2] <<= aProp;
 
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index cef7e1eed16c..b36d8f962297 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -681,7 +681,7 @@ namespace cppcanvas
                             // map odf to svg gradient orientation - x
                             // instead of y direction
                             aGradInfo.maTextureTransform = aGradInfo.maTextureTransform * aRot90;
-                            aGradientService = rtl::OUString::createFromAscii("LinearGradient");
+                            aGradientService = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LinearGradient"));
                             break;
 
                         case GRADIENT_AXIAL:
@@ -701,7 +701,7 @@ namespace cppcanvas
                             aShift.translate(-0.5,0);
                             aGradInfo.maTextureTransform = aGradInfo.maTextureTransform * aShift;
 
-                            aGradientService = rtl::OUString::createFromAscii("LinearGradient");
+                            aGradientService = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LinearGradient"));
                             break;
                         }
 
@@ -711,7 +711,7 @@ namespace cppcanvas
                                                                         aOffset,
                                                                         nSteps,
                                                                         fBorder);
-                            aGradientService = rtl::OUString::createFromAscii("EllipticalGradient");
+                            aGradientService = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EllipticalGradient"));
                             break;
 
                         case GRADIENT_ELLIPTICAL:
@@ -721,7 +721,7 @@ namespace cppcanvas
                                                                             nSteps,
                                                                             fBorder,
                                                                             fRotation);
-                            aGradientService = rtl::OUString::createFromAscii("EllipticalGradient");
+                            aGradientService = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EllipticalGradient"));
                             break;
 
                         case GRADIENT_SQUARE:
@@ -731,7 +731,7 @@ namespace cppcanvas
                                                                         nSteps,
                                                                         fBorder,
                                                                         fRotation);
-                            aGradientService = rtl::OUString::createFromAscii("RectangularGradient");
+                            aGradientService = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RectangularGradient"));
                             break;
 
                         case GRADIENT_RECT:
@@ -741,7 +741,7 @@ namespace cppcanvas
                                                                              nSteps,
                                                                              fBorder,
                                                                              fRotation);
-                            aGradientService = rtl::OUString::createFromAscii("RectangularGradient");
+                            aGradientService = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RectangularGradient"));
                             break;
 
                         default:
@@ -764,13 +764,13 @@ namespace cppcanvas
 
                     uno::Sequence<uno::Any> args(3);
                     beans::PropertyValue aProp;
-                    aProp.Name = rtl::OUString::createFromAscii("Colors");
+                    aProp.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Colors"));
                     aProp.Value <<= aColors;
                     args[0] <<= aProp;
-                    aProp.Name = rtl::OUString::createFromAscii("Stops");
+                    aProp.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Stops"));
                     aProp.Value <<= aStops;
                     args[1] <<= aProp;
-                    aProp.Name = rtl::OUString::createFromAscii("AspectRatio");
+                    aProp.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AspectRatio"));
                     aProp.Value <<= aGradInfo.mfAspectRatio;
                     args[2] <<= aProp;
 
@@ -2699,7 +2699,7 @@ namespace cppcanvas
                 {
                 }
 
-                bool result()
+                bool result() const
                 {
                     return mbRet;
                 }
@@ -2734,7 +2734,7 @@ namespace cppcanvas
                 {
                 }
 
-                bool result()
+                bool result() const
                 {
                     return true; // nothing can fail here
                 }
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index c248af3228e5..0902fd98deb2 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -275,14 +275,13 @@ inline void TypeDescriptor_Init_Impl::callChain(
 //__________________________________________________________________________________________________
 TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW( () )
 {
-#ifndef CPPU_LEAK_STATIC_DATA
     if( pCache )
     {
         TypeDescriptionList_Impl::const_iterator aIt = pCache->begin();
         while( aIt != pCache->end() )
         {
             typelib_typedescription_release( (*aIt) );
-            aIt++;
+            ++aIt;
         }
         delete pCache;
         pCache = 0;
@@ -355,7 +354,6 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW( () )
 #endif
     delete pCallbacks;
     pCallbacks = 0;
-#endif // CPPU_LEAK_STATIC_DATA
 
     if( pMutex )
     {
diff --git a/cppu/util/target.pmk b/cppu/util/target.pmk
index 70be64b8e3f4..3befcb154753 100644
--- a/cppu/util/target.pmk
+++ b/cppu/util/target.pmk
@@ -45,16 +45,9 @@ CFLAGS += -O
 
 .ELSE
 
-.IF "$(COM)" == "MSC"
 # msvc++: no inlining
+.IF "$(COM)" == "MSC"
 CFLAGS += -Ob0
-.IF "$(cppu_no_leak)" == ""
-.IF "$(bndchk)" == ""
-# msvc++: workaround for strange crash at exit: just don't do the
-# cleanup of types and whatnot...
-CFLAGS += -DCPPU_LEAK_STATIC_DATA
-.ENDIF
-.ENDIF
 .ENDIF
 
 .ENDIF
diff --git a/cppuhelper/source/findsofficepath.c b/cppuhelper/source/findsofficepath.c
index 0a0cea0ff8b3..475ce747d7ad 100644
--- a/cppuhelper/source/findsofficepath.c
+++ b/cppuhelper/source/findsofficepath.c
@@ -126,7 +126,7 @@ static char* platformSpecific()
     const int SEPARATOR = '/';
     const char* PATHSEPARATOR = ":";
     const char* PATHVARNAME = "PATH";
-    const char* APPENDIX = "/soffice";
+    const char* APPENDIX = "/libreoffice";
 
     char* path = NULL;
     char* env = NULL;
@@ -197,10 +197,8 @@ char const* cppuhelper_detail_findSofficePath()
     /* get the installation path from the UNO_PATH environment variable */
     path = getenv( UNOPATHVARNAME );
 
-    if ( path == NULL || strlen( path ) == 0 )
-    {
+    if (!path || !path[0])
         path = platformSpecific();
-    }
 
     return path;
 }
diff --git a/cppuhelper/test/cfg_data/template/uno/components.xml b/cppuhelper/test/cfg_data/template/uno/components.xml
index 6ff26a5b9cec..5ab04d030fb3 100644
--- a/cppuhelper/test/cfg_data/template/uno/components.xml
+++ b/cppuhelper/test/cfg_data/template/uno/components.xml
@@ -5,7 +5,7 @@
             xmlns:cfg="http://openoffice.org/2000/registry/instance">
 
 <service>
- <available-implementations cfg:type="string" cfg:derivedBy=="list"/>
+ <available-implementations cfg:type="string" cfg:derivedBy="list"/>
  <context-properties cfg:type="set" cfg:element-type="cfg:any"/>
 </service>
 
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx
index 940b3a67cae3..7d73bb15be77 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -132,7 +132,7 @@ static sal_Bool s_quiet = false;
 static inline void out( const sal_Char * pText )
 {
     if (! s_quiet)
-        fprintf( stderr, pText );
+        fprintf( stderr, "%s", pText );
 }
 //--------------------------------------------------------------------------------------------------
 static inline void out( const OUString & rText )
@@ -140,7 +140,7 @@ static inline void out( const OUString & rText )
     if (! s_quiet)
     {
         OString aText( OUStringToOString( rText, RTL_TEXTENCODING_ASCII_US ) );
-        fprintf( stderr, aText.getStr() );
+        fprintf( stderr, "%s", aText.getStr() );
     }
 }
 
diff --git a/crashrep/prj/build.lst b/crashrep/prj/build.lst
index ef1c85cc1c62..d1a6798aa549 100755
--- a/crashrep/prj/build.lst
+++ b/crashrep/prj/build.lst
@@ -1,4 +1,4 @@
-cr	crashrep	:    l10n sal sysui SO:tools shell NULL
+cr	crashrep	:    l10n sal sysui shell NULL
 cr	crashrep				usr1	-	all	cr_mkout NULL
 cr	crashrep\source\all		nmake	-	all	cr_sresource NULL
 cr	crashrep\source\unx		nmake	-	u	cr_sunx NULL
diff --git a/crashrep/source/win32/soreport.cpp b/crashrep/source/win32/soreport.cpp
index f9b4e7ce3223..0efe0929b320 100644
--- a/crashrep/source/win32/soreport.cpp
+++ b/crashrep/source/win32/soreport.cpp
@@ -184,12 +184,12 @@ static FILE *_tmpfile(void)
 
 static BOOL GetCrashDataPath( LPTSTR szBuffer )
 {
-    ::rtl::OUString ustrValue = ::rtl::OUString::createFromAscii("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}");
+    ::rtl::OUString ustrValue(RTL_CONSTASCII_USTRINGPARAM("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}"));
     ::rtl::Bootstrap::expandMacros( ustrValue );
 
     if ( ustrValue.getLength() )
     {
-        ustrValue += ::rtl::OUString::createFromAscii("/user/crashdata");
+        ustrValue += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/user/crashdata"));
 
         ::osl::FileBase::RC result = ::osl::Directory::createPath( ustrValue );
 
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 8a3b81562bd2..b0488386f96d 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -95,22 +95,22 @@ using namespace com::sun::star;
 // definitions
 
 //-----------------------------------------------
-static ::rtl::OUString SERVICE_STORAGEFACTORY           = ::rtl::OUString::createFromAscii("com.sun.star.embed.StorageFactory"                          );
-static ::rtl::OUString SERVICE_UICONFIGMGR              = ::rtl::OUString::createFromAscii("com.sun.star.ui.UIConfigurationManager"              );
-static ::rtl::OUString SERVICE_DESKTOP                  = ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"                                 );
-static ::rtl::OUString SERVICE_MODULEMANAGER            = ::rtl::OUString::createFromAscii("com.sun.star.frame.ModuleManager"                    );
-static ::rtl::OUString SERVICE_GLOBALACCCFG             = ::rtl::OUString::createFromAscii("com.sun.star.ui.GlobalAcceleratorConfiguration"      );
-static ::rtl::OUString SERVICE_MODULEUICONFIGSUPPLIER   = ::rtl::OUString::createFromAscii("com.sun.star.ui.ModuleUIConfigurationManagerSupplier");
-static ::rtl::OUString SERVICE_UICMDDESCRIPTION         = ::rtl::OUString::createFromAscii("com.sun.star.frame.UICommandDescription"             );
+static ::rtl::OUString SERVICE_STORAGEFACTORY           (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.StorageFactory"                        ));
+static ::rtl::OUString SERVICE_UICONFIGMGR              (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.UIConfigurationManager"              ));
+static ::rtl::OUString SERVICE_DESKTOP                  (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"                               ));
+static ::rtl::OUString SERVICE_MODULEMANAGER            (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager"                  ));
+static ::rtl::OUString SERVICE_GLOBALACCCFG             (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.GlobalAcceleratorConfiguration"      ));
+static ::rtl::OUString SERVICE_MODULEUICONFIGSUPPLIER   (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"));
+static ::rtl::OUString SERVICE_UICMDDESCRIPTION         (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.UICommandDescription"             ));
 
-static ::rtl::OUString MODULEPROP_SHORTNAME             = ::rtl::OUString::createFromAscii("ooSetupFactoryShortName"                                    );
-static ::rtl::OUString MODULEPROP_UINAME                = ::rtl::OUString::createFromAscii("ooSetupFactoryUIName"                                       );
-static ::rtl::OUString CMDPROP_UINAME                   = ::rtl::OUString::createFromAscii("Name"                                                       );
+static ::rtl::OUString MODULEPROP_SHORTNAME             (RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryShortName"                                  ));
+static ::rtl::OUString MODULEPROP_UINAME                (RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryUIName"                                     ));
+static ::rtl::OUString CMDPROP_UINAME                   (RTL_CONSTASCII_USTRINGPARAM("Name"                                                     ));
 
-static ::rtl::OUString FOLDERNAME_UICONFIG              = ::rtl::OUString::createFromAscii("Configurations2"                                            );
+static ::rtl::OUString FOLDERNAME_UICONFIG              (RTL_CONSTASCII_USTRINGPARAM("Configurations2"                                          ));
 
-static ::rtl::OUString MEDIATYPE_PROPNAME               = ::rtl::OUString::createFromAscii("MediaType"                                                  );
-static ::rtl::OUString MEDIATYPE_UICONFIG               = ::rtl::OUString::createFromAscii("application/vnd.sun.xml.ui.configuration"                   );
+static ::rtl::OUString MEDIATYPE_PROPNAME               (RTL_CONSTASCII_USTRINGPARAM("MediaType"                                                ));
+static ::rtl::OUString MEDIATYPE_UICONFIG               (RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.xml.ui.configuration"                 ));
 
 //-----------------------------------------------
 static USHORT __FAR_DATA KEYCODE_ARRAY[] =
@@ -635,11 +635,6 @@ void SfxAccCfgLBoxString_Impl::Paint(const Point&       aPos   ,
                                            USHORT       /*nFlags*/,
                                            SvLBoxEntry* pEntry )
 {
-    /*/ ??? realy needed !!!
-    Font aOldFont(rDevice.GetFont());
-    Font aNewFont(aOldFont         );
-    rDevice.SetFont( aFont );
-    */
 
     if (!pEntry)
         return;
@@ -653,7 +648,6 @@ void SfxAccCfgLBoxString_Impl::Paint(const Point&       aPos   ,
     else
         rDevice.DrawCtrlText(aPos, GetText(), 0, STRING_LEN, TEXT_DRAW_DISABLE);
 
-    //rDev.SetFont( aOldFont );
 }
 
 //-----------------------------------------------
@@ -1389,7 +1383,8 @@ IMPL_LINK( SfxAcceleratorConfigPage, SaveHdl, sfx2::FileDialogHelper*, EMPTYARG
     {
         try
         {
-            uno::Reference< container::XNameAccess > xNameAccess( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.frame.UICommandDescription") ), uno::UNO_QUERY );
+            uno::Reference< container::XNameAccess > xNameAccess( ::comphelper::getProcessServiceFactory()->createInstance(
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.UICommandDescription") ) ), uno::UNO_QUERY );
             if ( xNameAccess.is() )
             {
                 uno::Reference< container::XNameAccess > xUICommandLabels;
@@ -1431,75 +1426,75 @@ String SfxAcceleratorConfigPage::GetFunctionName(KeyFuncType eType) const
     switch(eType)
     {
         case KEYFUNC_NEW :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:NewDoc") ) );
+            sName.append( RetrieveLabelFromCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:NewDoc") ) ) );
             break;
 
         case KEYFUNC_OPEN :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Open") ) );
+            sName.append( RetrieveLabelFromCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Open") ) ) );
             break;
 
         case KEYFUNC_SAVE :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Save") ) );
+            sName.append( RetrieveLabelFromCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Save") ) ) );
             break;
 
         case KEYFUNC_SAVEAS :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:SaveAs") ) );
+            sName.append( RetrieveLabelFromCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SaveAs") ) ) );
             break;
 
         case KEYFUNC_PRINT :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Print") ) );
+            sName.append( RetrieveLabelFromCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Print") ) ) );
             break;
 
         case KEYFUNC_CLOSE :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Close") ) );
+            sName.append( RetrieveLabelFromCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Close") ) ) );
             break;
 
         case KEYFUNC_QUIT :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Quit") ) );
+            sName.append( RetrieveLabelFromCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Quit") ) ) );
             break;
 
         case KEYFUNC_CUT :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Cut") ) );
+            sName.append( RetrieveLabelFromCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Cut") ) ) );
             break;
 
         case KEYFUNC_COPY :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Copy") ) );
+            sName.append( RetrieveLabelFromCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Copy") ) ) );
             break;
 
         case KEYFUNC_PASTE :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Paste") ) );
+            sName.append( RetrieveLabelFromCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Paste") ) ) );
             break;
 
         case KEYFUNC_UNDO :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Undo") ) );
+            sName.append( RetrieveLabelFromCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Undo") ) ) );
             break;
 
         case KEYFUNC_REDO :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Redo") ) );
+            sName.append( RetrieveLabelFromCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Redo") ) ) );
             break;
 
         case KEYFUNC_DELETE :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Delete") ) );
+            sName.append( RetrieveLabelFromCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Delete") ) ) );
             break;
 
         case KEYFUNC_REPEAT :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Repeat") ) );
+            sName.append( RetrieveLabelFromCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Repeat") ) ) );
             break;
 
         case KEYFUNC_FIND :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Search") ) );
+            sName.append( RetrieveLabelFromCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Search") ) ) );
             break;
 
         case KEYFUNC_FINDBACKWARD :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:SearchBackwards") ) );
+            sName.append( RetrieveLabelFromCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SearchBackwards") ) ) );
             break;
 
         case KEYFUNC_PROPERTIES :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:Options") ) );
+            sName.append( RetrieveLabelFromCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Options") ) ) );
             break;
 
         case KEYFUNC_FRONT :
-            sName.append( RetrieveLabelFromCommand( ::rtl::OUString::createFromAscii(".uno:ToFront") ) );
+            sName.append( RetrieveLabelFromCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:ToFront") ) ) );
             break;
 
         default:
@@ -1520,7 +1515,6 @@ void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const String& rTi
     m_pFileDlg = new sfx2::FileDialogHelper( nDialogType, 0 );
 
     m_pFileDlg->SetTitle( rTitle );
-//  m_pFileDlg->SetDialogHelpId( bSave ? HID_CONFIG_SAVE : HID_CONFIG_LOAD );
     m_pFileDlg->AddFilter( aFilterAllStr, DEFINE_CONST_UNICODE( FILEDIALOG_FILTER_ALL ) );
     m_pFileDlg->AddFilter( aFilterCfgStr, DEFINE_CONST_UNICODE( "*.cfg" ) );
 
diff --git a/cui/source/customize/acccfg.hrc b/cui/source/customize/acccfg.hrc
index be0771b83fc8..ccc583d62037 100644
--- a/cui/source/customize/acccfg.hrc
+++ b/cui/source/customize/acccfg.hrc
@@ -26,50 +26,43 @@
  ************************************************************************/
 
 #define GRP_FUNCTIONS 22
-#define BTN_ACC_OK 1
-#define BTN_ACC_CANCEL 2
-#define BTN_ACC_CHANGE 3
-#define BTN_ACC_REMOVE 4
-#define BOX_ACC_ENTRIES 5
-#define TXT_ACC_DESCRIPTIONTEXT 6
-#define TXT_ACC_DESCRIPTIONINFO 7
-#define GRP_ACC_KEYBOARD 8
-#define TXT_ACC_GROUP 9
-#define BOX_ACC_GROUP 10
-#define TXT_ACC_FUNCTION 11
-#define BOX_ACC_FUNCTION 12
-#define TXT_ACC_KEY 13
-#define BOX_ACC_KEY 14
-#define GRP_ACC_FUNCTIONS 15
-#define BTN_RESET   20
-#define BTN_LOAD 40
-#define BTN_SAVE 41
-#define RB_OFFICE 44
-#define RB_MODULE 45
-#define STR_LOADACCELCONFIG 46
-#define STR_SAVEACCELCONFIG 47
-
-#define IMG_HARDDISK 48
-#define IMG_HARDDISK_HC 49
-#define STR_PRODMACROS 50
-#define STR_MYMACROS 51
-#define IMG_LIB       52
-#define IMG_LIB_HC      53
-#define IMG_MACRO         54
-#define IMG_MACRO_HC        55
-#define IMG_DOC          56
-#define IMG_DOC_HC         57
-#define STR_GROUP_STYLES    58
-#define STR_PDF_EXPORT_SEND   59
-#define STR_RECHECK_DOCUMENT  60
-#define IMG_INFO            61
-#define STR_BASICNAME 62
-#define BMP_COLLAPSED 63
-#define BMP_EXPANDED 64
-#define BMP_COLLAPSED_HC 65
-#define BMP_EXPANDED_HC 66
-#define STR_BASICMACROS 67
-#define STR_DLG_MACROS 68
-#define STR_HUMAN_APPNAME 69
-#define STR_FILTERNAME_CFG 70
+#define BTN_ACC_OK               1
+#define BTN_ACC_CANCEL           2
+#define BTN_ACC_CHANGE           3
+#define BTN_ACC_REMOVE           4
+#define BOX_ACC_ENTRIES          5
+#define TXT_ACC_DESCRIPTIONTEXT  6
+#define TXT_ACC_DESCRIPTIONINFO  7
+#define GRP_ACC_KEYBOARD         8
+#define TXT_ACC_GROUP            9
+#define BOX_ACC_GROUP           10
+#define TXT_ACC_FUNCTION        11
+#define BOX_ACC_FUNCTION        12
+#define TXT_ACC_KEY             13
+#define BOX_ACC_KEY             14
+#define GRP_ACC_FUNCTIONS       15
+#define BTN_RESET               20
+#define BTN_LOAD                40
+#define BTN_SAVE                41
+#define RB_OFFICE               44
+#define RB_MODULE               45
+#define STR_LOADACCELCONFIG     46
+#define STR_SAVEACCELCONFIG     47
 
+#define IMG_HARDDISK            48
+#define STR_PRODMACROS          50
+#define STR_MYMACROS            51
+#define IMG_LIB                 52
+#define IMG_MACRO               54
+#define IMG_DOC                 56
+#define STR_GROUP_STYLES        58
+#define STR_PDF_EXPORT_SEND     59
+#define STR_RECHECK_DOCUMENT    60
+#define IMG_INFO                61
+#define STR_BASICNAME           62
+#define BMP_COLLAPSED           63
+#define BMP_EXPANDED            64
+#define STR_BASICMACROS         67
+#define STR_DLG_MACROS          68
+#define STR_HUMAN_APPNAME       69
+#define STR_FILTERNAME_CFG      70
diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src
index 74188426a787..c993aca90b90 100644
--- a/cui/source/customize/acccfg.src
+++ b/cui/source/customize/acccfg.src
@@ -233,41 +233,21 @@ Resource RID_SVXPAGE_CONFIGGROUPBOX
         ImageBitmap = Bitmap { File = "harddisk_16.bmp" ; };
         MASKCOLOR
     };
-    Image IMG_HARDDISK_HC
-    {
-        ImageBitmap = Bitmap { File = "harddisk_16_h.bmp" ; };
-        MASKCOLOR
-    };
     Image IMG_LIB
     {
         ImageBitmap = Bitmap { File = "im30820.png"; };
         MASKCOLOR
     };
-    Image IMG_LIB_HC
-    {
-        ImageBitmap = Bitmap { File = "imh30820.png"; };
-        MASKCOLOR
-    };
     Image IMG_MACRO
     {
         ImageBitmap = Bitmap { File = "im30821.png"; };
         MASKCOLOR
     };
-    Image IMG_MACRO_HC
-    {
-        ImageBitmap = Bitmap { File = "imh30821.png"; };
-        MASKCOLOR
-    };
     Image IMG_DOC
     {
         ImageBitmap = Bitmap { File = "im30826.png"; };
         MASKCOLOR
     };
-    Image IMG_DOC_HC
-    {
-        ImageBitmap = Bitmap { File = "imh30826.png"; };
-        MASKCOLOR
-    };
     String STR_BASICNAME
     {
         Text = "%PRODUCTNAME Basic" ;
@@ -278,7 +258,6 @@ Resource RID_SVXPAGE_CONFIGGROUPBOX
         {
             File = "plus.bmp" ;
         };
-         // MaskColor = Color { Predefine = COL_GREEN ; };
     };
     Image BMP_EXPANDED
     {
@@ -286,72 +265,7 @@ Resource RID_SVXPAGE_CONFIGGROUPBOX
         {
             File = "minus.bmp" ;
         };
-         // MaskColor = Color { Predefine = COL_GREEN ; };
-    };
-    Image BMP_EXPANDED_HC
-    {
-        ImageBitmap = Bitmap
-        {
-            File = "minus_h.bmp" ;
-        };
-    };
-    Image BMP_COLLAPSED_HC
-    {
-        ImageBitmap = Bitmap
-        {
-            File = "plus_h.bmp" ;
-        };
     };
 };
 
  // ********************************************************************** EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 46296a3f6f1f..ca3d19e04a8b 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -56,7 +56,6 @@
 #include <toolkit/unohlp.hxx>
 
 #include <algorithm>
-//add
 #include <cuires.hrc>
 #include "cfg.hrc"
 #include "helpid.hrc"
@@ -150,7 +149,7 @@ void printPropertySet(
 
         uno::Any a = xPropSet->getPropertyValue( aPropDetails[i].Name );
 
-        if ( ( a >>= tmp ) /* && tmp.getLength() != 0 */ )
+        if ( a >>= tmp )
         {
             OSL_TRACE("%s: Got property: %s = %s",
                 PRTSTR(prefix), PRTSTR(aPropDetails[i].Name), PRTSTR(tmp));
@@ -214,7 +213,7 @@ OUString replaceSaveInName(
     const OUString& rSaveInName )
 {
     OUString name;
-    OUString placeholder = OUString::createFromAscii( "%SAVE IN SELECTION%" );
+    OUString placeholder(RTL_CONSTASCII_USTRINGPARAM( "%SAVE IN SELECTION%" ));
 
     sal_Int32 pos = rMessage.indexOf( placeholder );
 
@@ -223,10 +222,6 @@ OUString replaceSaveInName(
         name = rMessage.replaceAt(
             pos, placeholder.getLength(), rSaveInName );
     }
-    else
-    {
-        // don't change the message
-    }
 
     return name;
 }
@@ -258,10 +253,10 @@ generateCustomName(
 {
     // find and replace the %n placeholder in the prefix string
     OUString name;
-    OUString placeholder = OUString::createFromAscii( "%n" );
+    OUString placeholder(RTL_CONSTASCII_USTRINGPARAM( "%n" ));
 
     sal_Int32 pos = prefix.indexOf(
-        OUString::createFromAscii( "%n" ) );
+        OUString(RTL_CONSTASCII_USTRINGPARAM( "%n" )) );
 
     if ( pos != -1 )
     {
@@ -308,8 +303,8 @@ OUString
 generateCustomURL(
     SvxEntries* entries )
 {
-    OUString url = OUString::createFromAscii( ITEM_TOOLBAR_URL );
-    url += OUString::createFromAscii( CUSTOM_TOOLBAR_STR );
+    OUString url = OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_TOOLBAR_URL ));
+    url += OUString(RTL_CONSTASCII_USTRINGPARAM( CUSTOM_TOOLBAR_STR ));
 
     // use a random number to minimize possible clash with existing custom toolbars
     url += OUString::valueOf( sal_Int64( generateRandomValue() ), 16 );
@@ -343,7 +338,7 @@ generateCustomMenuURL(
     SvxEntries* entries,
     sal_Int32 suffix = 1 )
 {
-    OUString url = OUString::createFromAscii( CUSTOM_MENU_STR );
+    OUString url(RTL_CONSTASCII_USTRINGPARAM( CUSTOM_MENU_STR ));
     url += OUString::valueOf( suffix );
 
     // now check is there is an already existing entry with this url
@@ -384,13 +379,6 @@ void InitImageType()
     {
         theImageType |= css::ui::ImageType::SIZE_LARGE;
     }
-
-    Window* topwin = Application::GetActiveTopWindow();
-    if ( topwin != NULL &&
-         topwin->GetSettings().GetStyleSettings().GetHighContrastMode() )
-    {
-        theImageType |= css::ui::ImageType::COLOR_HIGHCONTRAST;
-    }
 }
 
 sal_Int16 GetImageType()
@@ -431,29 +419,29 @@ OUString GetModuleName( const OUString& aModuleId )
 {
     if ( aModuleId.equalsAscii( "com.sun.star.text.TextDocument" ) ||
          aModuleId.equalsAscii( "com.sun.star.text.GlobalDocument" ) )
-        return OUString::createFromAscii("Writer");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("Writer"));
     else if ( aModuleId.equalsAscii( "com.sun.star.text.WebDocument" ) )
-        return OUString::createFromAscii("Writer/Web");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("Writer/Web"));
     else if ( aModuleId.equalsAscii( "com.sun.star.drawing.DrawingDocument" ) )
-        return OUString::createFromAscii("Draw");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("Draw"));
     else if ( aModuleId.equalsAscii( "com.sun.star.presentation.PresentationDocument" ) )
-        return OUString::createFromAscii("Impress");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("Impress"));
     else if ( aModuleId.equalsAscii( "com.sun.star.sheet.SpreadsheetDocument" ) )
-        return OUString::createFromAscii("Calc");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("Calc"));
     else if ( aModuleId.equalsAscii( "com.sun.star.script.BasicIDE" ) )
-        return OUString::createFromAscii("Basic");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("Basic"));
     else if ( aModuleId.equalsAscii( "com.sun.star.formula.FormulaProperties" ) )
-        return OUString::createFromAscii("Math");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("Math"));
     else if ( aModuleId.equalsAscii( "com.sun.star.sdb.RelationDesign" ) )
-        return OUString::createFromAscii("Relation Design");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("Relation Design"));
     else if ( aModuleId.equalsAscii( "com.sun.star.sdb.QueryDesign" ) )
-        return OUString::createFromAscii("Query Design");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("Query Design"));
     else if ( aModuleId.equalsAscii( "com.sun.star.sdb.TableDesign" ) )
-        return OUString::createFromAscii("Table Design");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("Table Design"));
     else if ( aModuleId.equalsAscii( "com.sun.star.sdb.DataSourceBrowser" ) )
-        return OUString::createFromAscii("Data Source Browser" );
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("Data Source Browser" ));
     else if ( aModuleId.equalsAscii( "com.sun.star.sdb.DatabaseDocument" ) )
-        return OUString::createFromAscii("Database" );
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("Database" ));
 
     return ::rtl::OUString();
 }
@@ -803,9 +791,9 @@ SfxTabPage *CreateSvxEventConfigPage( Window *pParent, const SfxItemSet& rSet )
 
 sal_Bool impl_showKeyConfigTabPage( const css::uno::Reference< css::frame::XFrame >& xFrame )
 {
-    static ::rtl::OUString SERVICENAME_MODULEMANAGER = ::rtl::OUString::createFromAscii("com.sun.star.frame.ModuleManager");
-    static ::rtl::OUString SERVICENAME_DESKTOP       = ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"             );
-    static ::rtl::OUString MODULEID_STARTMODULE      = ::rtl::OUString::createFromAscii("com.sun.star.frame.StartModule"         );
+    static ::rtl::OUString SERVICENAME_MODULEMANAGER (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.frame.ModuleManager") );
+    static ::rtl::OUString SERVICENAME_DESKTOP       (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.frame.Desktop"           ) );
+    static ::rtl::OUString MODULEID_STARTMODULE      (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.frame.StartModule"       ) );
 
     try
     {
@@ -858,7 +846,7 @@ SvxConfigDialog::SvxConfigDialog(
     {
         OUString text = ((const SfxStringItem*)pItem)->GetValue();
 
-        if (text.indexOf(OUString::createFromAscii(ITEM_TOOLBAR_URL)) == 0)
+        if (text.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM(ITEM_TOOLBAR_URL))) == 0)
         {
             SetCurPageId( RID_SVXPAGE_TOOLBARS );
         }
@@ -936,7 +924,7 @@ SaveInData::SaveInData(
         ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
 
     xProps->getPropertyValue(
-        OUString::createFromAscii( "DefaultContext" ))
+        OUString(RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" )))
             >>= m_xComponentContext;
 
     m_aSeparatorSeq.realloc( 1 );
@@ -998,7 +986,7 @@ uno::Reference< graphic::XGraphic > GetGraphic(
 
     if ( xImageManager.is() )
     {
-        // TODO handle large and high contrast graphics
+        // TODO handle large graphics
         uno::Sequence< uno::Reference< graphic::XGraphic > > aGraphicSeq;
 
         uno::Sequence< OUString > aImageCmdSeq( 1 );
@@ -1716,7 +1704,7 @@ void SvxConfigPage::Reset( const SfxItemSet& )
         OUString aModuleName = GetUIModuleName( aModuleId, xModuleManager );
 
         OUString title = aTopLevelSeparator.GetText();
-        OUString aSearchString = OUString::createFromAscii( "%MODULENAME" );
+        OUString aSearchString(RTL_CONSTASCII_USTRINGPARAM( "%MODULENAME" ));
         sal_Int32 index = title.indexOf( aSearchString );
 
         if ( index != -1 )
@@ -1754,7 +1742,7 @@ void SvxConfigPage::Reset( const SfxItemSet& )
             OUString label;
             utl::ConfigManager::GetDirectConfigProperty(
                 utl::ConfigManager::PRODUCTNAME ) >>= label;
-            label += OUString::createFromAscii( " " );
+            label += OUString(RTL_CONSTASCII_USTRINGPARAM( " " ));
             label += aModuleName;
 
             nPos = aSaveInListBox.InsertEntry( label );
@@ -2637,7 +2625,7 @@ IMPL_LINK( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton )
                 GetSaveInData()->SetModified( TRUE );
             }
 
-            // #i68101# Moemory leak (!)
+            // #i68101# Memory leak (!)
             delete pNameDialog;
 
             break;
@@ -3123,7 +3111,7 @@ SvxConfigEntry::GetHelpText()
 {
     if ( aHelpText.getLength() == 0 )
     {
-        OUString helpid = OUString::createFromAscii( "helpid:" );
+        OUString helpid(RTL_CONSTASCII_USTRINGPARAM( "helpid:" ));
         if ( aHelpURL.indexOf( helpid ) != -1 )
         {
             aHelpURL = aHelpURL.copy( helpid.getLength() );
@@ -3235,42 +3223,6 @@ SvxConfigEntry::GetProperties(
     return aPropSeq;
 }
 
-/*
-SvxMenuConfigEntry::SvxMenuConfigEntry(
-    const uno::Sequence< beans::PropertyValue >& rProperties,
-    const uno::Reference< container::XNameAccess >& rCommandToLabelMap )
-    :
-        SvxConfigEntry( rProperties, rCommandToLabelMap )
-{
-    uno::Reference< container::XIndexAccess > aChildren;
-
-    for ( sal_Int32 i = 0; i < rProperties.getLength(); i++ )
-    {
-        if ( rProperties[i].Name.equalsAscii( ITEM_DESCRIPTOR_CONTAINER ))
-        {
-            rProperties[i].Value >>= aChildren;
-        }
-    }
-
-    if ( aChildren.is() )
-    {
-        SetPopup( TRUE );
-        SetEntries( new SvxEntries() );
-
-           uno::Sequence< beans::PropertyValue > aProps;
-        for ( sal_Int32 i = 0; i < aChildren->getCount(); i++ )
-        {
-               if ( aChildren->getByIndex( i ) >>= aProps )
-            {
-                SvxConfigEntry* pEntry =
-                    new SvxMenuConfigEntry( aProps, rCommandToLabelMap );
-                GetEntries()->push_back( pEntry );
-            }
-        }
-    }
-}
-*/
-
 SvxConfigEntry::SvxConfigEntry( const OUString& rDisplayName,
                                 const OUString& rCommandURL, bool bPopup, bool bParentData )
     : nId( 1 )
@@ -3396,8 +3348,8 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(
 
     // default toolbar to select is standardbar unless a different one
     // has been passed in
-    m_aURLToSelect = OUString::createFromAscii( ITEM_TOOLBAR_URL );
-    m_aURLToSelect += OUString::createFromAscii( "standardbar" );
+    m_aURLToSelect = OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_TOOLBAR_URL ));
+    m_aURLToSelect += OUString(RTL_CONSTASCII_USTRINGPARAM( "standardbar" ));
 
     const SfxPoolItem* pItem =
         rSet.GetItem( rSet.GetPool()->GetWhich( SID_CONFIG ) );
@@ -3405,7 +3357,7 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(
     if ( pItem )
     {
         OUString text = ((const SfxStringItem*)pItem)->GetValue();
-        if (text.indexOf(OUString::createFromAscii(ITEM_TOOLBAR_URL)) == 0)
+        if (text.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM(ITEM_TOOLBAR_URL))) == 0)
         {
             m_aURLToSelect = text.copy( 0 );
         }
@@ -3947,8 +3899,8 @@ void SvxToolbarConfigPage::Init()
         }
 
         // in future select the default toolbar: Standard
-        m_aURLToSelect = OUString::createFromAscii( ITEM_TOOLBAR_URL );
-        m_aURLToSelect += OUString::createFromAscii( "standardbar" );
+        m_aURLToSelect = OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_TOOLBAR_URL ));
+        m_aURLToSelect += OUString(RTL_CONSTASCII_USTRINGPARAM( "standardbar" ));
     }
 
     aTopLevelListBox.SelectEntryPos(nPos, TRUE);
@@ -4053,7 +4005,7 @@ void ToolbarSaveInData::SetSystemStyle(
     const OUString& rResourceURL,
     sal_Int32 nStyle )
 {
-    if ( rResourceURL.indexOf( OUString::createFromAscii( "private" ) ) == 0 &&
+    if ( rResourceURL.indexOf( OUString(RTL_CONSTASCII_USTRINGPARAM( "private" )) ) == 0 &&
          m_xPersistentWindowState.is() &&
          m_xPersistentWindowState->hasByName( rResourceURL ) )
     {
@@ -4092,7 +4044,7 @@ sal_Int32 ToolbarSaveInData::GetSystemStyle( const OUString& rResourceURL )
 {
     sal_Int32 result = 0;
 
-    if ( rResourceURL.indexOf( OUString::createFromAscii( "private" ) ) == 0 &&
+    if ( rResourceURL.indexOf( OUString(RTL_CONSTASCII_USTRINGPARAM( "private" )) ) == 0 &&
          m_xPersistentWindowState.is() &&
          m_xPersistentWindowState->hasByName( rResourceURL ) )
     {
@@ -4126,7 +4078,7 @@ OUString ToolbarSaveInData::GetSystemUIName( const OUString& rResourceURL )
 {
     OUString result;
 
-    if ( rResourceURL.indexOf( OUString::createFromAscii( "private" ) ) == 0 &&
+    if ( rResourceURL.indexOf( OUString(RTL_CONSTASCII_USTRINGPARAM( "private" )) ) == 0 &&
          m_xPersistentWindowState.is() &&
          m_xPersistentWindowState->hasByName( rResourceURL ) )
     {
@@ -4152,7 +4104,7 @@ OUString ToolbarSaveInData::GetSystemUIName( const OUString& rResourceURL )
         }
     }
 
-    if ( rResourceURL.indexOf( OUString::createFromAscii( ".uno" ) ) == 0 &&
+    if ( rResourceURL.indexOf( OUString(RTL_CONSTASCII_USTRINGPARAM( ".uno" )) ) == 0 &&
          m_xCommandToLabelMap.is() &&
          m_xCommandToLabelMap->hasByName( rResourceURL ) )
     {
@@ -4253,7 +4205,7 @@ SvxEntries* ToolbarSaveInData::GetEntries()
                 // insert into hash_map to filter duplicates from the parent
                 aToolbarInfo.insert( ToolbarInfo::value_type( systemname, true ));
 
-                OUString custom = OUString::createFromAscii(CUSTOM_TOOLBAR_STR);
+                OUString custom(RTL_CONSTASCII_USTRINGPARAM(CUSTOM_TOOLBAR_STR));
                 if ( systemname.indexOf( custom ) == 0 )
                 {
                     pEntry->SetUserDefined( TRUE );
@@ -4305,7 +4257,7 @@ SvxEntries* ToolbarSaveInData::GetEntries()
                 }
 
                 // custom toolbars of the parent are not visible in the document layer
-                OUString custom = OUString::createFromAscii(CUSTOM_TOOLBAR_STR);
+                OUString custom(RTL_CONSTASCII_USTRINGPARAM(CUSTOM_TOOLBAR_STR));
                 if ( systemname.indexOf( custom ) == 0 )
                     continue;
 
@@ -4524,7 +4476,7 @@ void ToolbarSaveInData::ApplyToolbar( SvxConfigEntry* pToolbar )
     if ( pToolbar->IsUserDefined() )
     {
         xProps->setPropertyValue(
-            OUString::createFromAscii( ITEM_DESCRIPTOR_UINAME ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_UINAME )),
             uno::makeAny( OUString( pToolbar->GetName() ) ) );
     }
 
@@ -4572,7 +4524,7 @@ void ToolbarSaveInData::CreateToolbar( SvxConfigEntry* pToolbar )
         xPropertySet( xSettings, uno::UNO_QUERY );
 
     xPropertySet->setPropertyValue(
-        OUString::createFromAscii( ITEM_DESCRIPTOR_UINAME ),
+        OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_UINAME )),
             uno::makeAny( pToolbar->GetName() ) );
 
     try
@@ -5104,8 +5056,6 @@ SvxToolbarEntriesListBox::SvxToolbarEntriesListBox(
     m_pButtonData = new SvLBoxButtonData( this );
     BuildCheckBoxButtonImages( m_pButtonData );
     EnableCheckButton( m_pButtonData );
-
-    m_bHiContrastMode = GetSettings().GetStyleSettings().GetHighContrastMode();
 }
 
 // --------------------------------------------------------
@@ -5180,9 +5130,6 @@ void SvxToolbarEntriesListBox::DataChanged( const DataChangedEvent& rDCEvt )
     if (( rDCEvt.GetType() == DATACHANGED_SETTINGS ) &&
         ( rDCEvt.GetFlags() & SETTINGS_STYLE ))
     {
-        // We have to reset all images because we change to/from high contrast mode
-        m_bHiContrastMode = GetSettings().GetStyleSettings().GetHighContrastMode();
-
         BuildCheckBoxButtonImages( m_pButtonData );
         Invalidate();
     }
@@ -5365,8 +5312,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow,
     {
         m_xGraphProvider = uno::Reference< graphic::XGraphicProvider >(
             xServiceManager->createInstance(
-                ::rtl::OUString::createFromAscii(
-                    "com.sun.star.graphic.GraphicProvider" ) ),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.graphic.GraphicProvider" ) ) ),
             uno::UNO_QUERY );
     }
 
@@ -5376,7 +5322,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow,
     }
 
     uno::Reference< beans::XPropertySet > xPropSet(
-        xServiceManager->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.util.PathSettings" ) ),
+        xServiceManager->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.PathSettings" ) ) ),
         uno::UNO_QUERY );
 
     uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UserConfig" ) ) );
@@ -5404,7 +5350,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow,
 
     uno::Reference< lang::XSingleServiceFactory > xStorageFactory(
         xServiceManager->createInstance(
-        ::rtl::OUString::createFromAscii( "com.sun.star.embed.FileSystemStorageFactory" )),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.FileSystemStorageFactory" ) ) ),
         uno::UNO_QUERY );
 
     uno::Sequence< uno::Any > aArgs( 2 );
@@ -5427,7 +5373,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow,
 
     m_xImportedImageManager = uno::Reference< com::sun::star::ui::XImageManager >(
         xServiceManager->createInstanceWithArguments(
-        ::rtl::OUString::createFromAscii( "com.sun.star.ui.ImageManager" ), aProp ),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.ImageManager" ) ), aProp ),
         uno::UNO_QUERY );
 
     ImageInfo mImageInfo;
@@ -5670,7 +5616,7 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem(
 
     uno::Reference< graphic::XGraphic > xGraphic;
     uno::Sequence< beans::PropertyValue > aMediaProps( 1 );
-    aMediaProps[0].Name = ::rtl::OUString::createFromAscii("URL");
+    aMediaProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL") );
     aMediaProps[0].Value <<= aURL;
 
     com::sun::star::awt::Size aSize;
@@ -5682,7 +5628,7 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem(
         uno::Reference< beans::XPropertySet > props =
             m_xGraphProvider->queryGraphicDescriptor( aMediaProps );
         uno::Any a = props->getPropertyValue(
-            OUString::createFromAscii("SizePixel") );
+            OUString(RTL_CONSTASCII_USTRINGPARAM("SizePixel")) );
         a >>= aSize;
         if (0 == aSize.Width || 0 == aSize.Height)
             return FALSE;
@@ -5749,7 +5695,7 @@ void SvxIconSelectorDialog::ImportGraphics(
     uno::Sequence< OUString > URLs(1);
     uno::Sequence< uno::Reference<graphic::XGraphic > > aImportGraph( 1 );
     uno::Sequence< beans::PropertyValue > aMediaProps( 1 );
-    aMediaProps[0].Name = ::rtl::OUString::createFromAscii("URL");
+    aMediaProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL") );
     uno::Reference< css::ui::XUIConfigurationPersistence >
         xConfigPer( m_xImportedImageManager, uno::UNO_QUERY );
 
@@ -5778,7 +5724,7 @@ void SvxIconSelectorDialog::ImportGraphics(
     {
         ::rtl::OUString aSourcePath( rPaths[0] );
         if ( rPaths[0].lastIndexOf( '/' ) != rPaths[0].getLength() -1 )
-            aSourcePath = rPaths[0] + ::rtl::OUString::createFromAscii( "/" );
+            aSourcePath = rPaths[0] + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" ) );
 
         for ( sal_Int32 i = 1; i < rPaths.getLength(); i++ )
         {
@@ -5826,11 +5772,11 @@ void SvxIconSelectorDialog::ImportGraphics(
 
     if ( rejectedCount != 0 )
     {
-        OUString message =OUString::createFromAscii("");
-        OUString newLine = OUString::createFromAscii("\n");
-        rtl::OUString fPath = OUString::createFromAscii("");
+        OUString message;
+        OUString newLine(RTL_CONSTASCII_USTRINGPARAM("\n"));
+        OUString fPath;
         if (rejectedCount > 1)
-              fPath = rPaths[0].copy(8) + ::rtl::OUString::createFromAscii( "/" );
+              fPath = rPaths[0].copy(8) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" ) );
         for ( sal_Int32 i = 0; i < rejectedCount; i++ )
         {
             message += fPath + rejected[i];
@@ -5850,7 +5796,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL )
     ++m_nNextId;
 
     uno::Sequence< beans::PropertyValue > aMediaProps( 1 );
-    aMediaProps[0].Name = ::rtl::OUString::createFromAscii("URL");
+    aMediaProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL") );
 
     uno::Reference< graphic::XGraphic > xGraphic;
     com::sun::star::awt::Size aSize;
@@ -5862,7 +5808,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL )
             m_xGraphProvider->queryGraphicDescriptor( aMediaProps );
 
         uno::Any a = props->getPropertyValue(
-            OUString::createFromAscii("SizePixel") );
+            OUString(RTL_CONSTASCII_USTRINGPARAM("SizePixel")) );
 
             xGraphic = m_xGraphProvider->queryGraphic( aMediaProps );
             if ( xGraphic.is() )
@@ -5953,7 +5899,7 @@ rtl::OUString SvxIconReplacementDialog :: ReplaceIconName( const OUString& rMess
 {
     rtl::OUString name;
     rtl::OUString message = String( CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) );
-    rtl::OUString placeholder = OUString::createFromAscii( "%ICONNAME" );
+    rtl::OUString placeholder(RTL_CONSTASCII_USTRINGPARAM( "%ICONNAME" ));
     sal_Int32 pos = message.indexOf( placeholder );
     if ( pos != -1 )
     {
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 46f9576058e0..7d6e89b4bff5 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -81,8 +81,8 @@ using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::document;
 namespace css = ::com::sun::star;
 
-static ::rtl::OUString SERVICE_UICATEGORYDESCRIPTION = ::rtl::OUString::createFromAscii("com.sun.star.ui.UICategoryDescription"         );
-static ::rtl::OUString SERVICE_UICMDDESCRIPTION      = ::rtl::OUString::createFromAscii("com.sun.star.frame.UICommandDescription");
+static ::rtl::OUString SERVICE_UICATEGORYDESCRIPTION (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.UICategoryDescription") );
+static ::rtl::OUString SERVICE_UICMDDESCRIPTION      (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.UICommandDescription") );
 
 SfxStylesInfo_Impl::SfxStylesInfo_Impl()
 {}
@@ -92,20 +92,20 @@ void SfxStylesInfo_Impl::setModel(const ::com::sun::star::uno::Reference< ::com:
     m_xDoc = xModel;
 }
 
-static ::rtl::OUString FAMILY_CHARACTERSTYLE = ::rtl::OUString::createFromAscii("CharacterStyles");
-static ::rtl::OUString FAMILY_PARAGRAPHSTYLE = ::rtl::OUString::createFromAscii("ParagraphStyles");
-static ::rtl::OUString FAMILY_FRAMESTYLE     = ::rtl::OUString::createFromAscii("FrameStyles"    );
-static ::rtl::OUString FAMILY_PAGESTYLE      = ::rtl::OUString::createFromAscii("PageStyles"     );
-static ::rtl::OUString FAMILY_NUMBERINGSTYLE = ::rtl::OUString::createFromAscii("NumberingStyles");
+static ::rtl::OUString FAMILY_CHARACTERSTYLE (RTL_CONSTASCII_USTRINGPARAM("CharacterStyles") );
+static ::rtl::OUString FAMILY_PARAGRAPHSTYLE (RTL_CONSTASCII_USTRINGPARAM("ParagraphStyles") );
+static ::rtl::OUString FAMILY_FRAMESTYLE     (RTL_CONSTASCII_USTRINGPARAM("FrameStyles"    ) );
+static ::rtl::OUString FAMILY_PAGESTYLE      (RTL_CONSTASCII_USTRINGPARAM("PageStyles"     ) );
+static ::rtl::OUString FAMILY_NUMBERINGSTYLE (RTL_CONSTASCII_USTRINGPARAM("NumberingStyles") );
 
-static ::rtl::OUString CMDURL_SPART  = ::rtl::OUString::createFromAscii(".uno:StyleApply?Style:string=");
-static ::rtl::OUString CMDURL_FPART2 = ::rtl::OUString::createFromAscii("&FamilyName:string=");
+static ::rtl::OUString CMDURL_SPART  (RTL_CONSTASCII_USTRINGPARAM(".uno:StyleApply?Style:string=") );
+static ::rtl::OUString CMDURL_FPART2 (RTL_CONSTASCII_USTRINGPARAM("&FamilyName:string=") );
 
-static ::rtl::OUString CMDURL_STYLEPROT_ONLY = ::rtl::OUString::createFromAscii(".uno:StyleApply?");
-static ::rtl::OUString CMDURL_SPART_ONLY     = ::rtl::OUString::createFromAscii("Style:string=");
-static ::rtl::OUString CMDURL_FPART_ONLY     = ::rtl::OUString::createFromAscii("FamilyName:string=");
+static ::rtl::OUString CMDURL_STYLEPROT_ONLY (RTL_CONSTASCII_USTRINGPARAM(".uno:StyleApply?") );
+static ::rtl::OUString CMDURL_SPART_ONLY     (RTL_CONSTASCII_USTRINGPARAM("Style:string=") );
+static ::rtl::OUString CMDURL_FPART_ONLY     (RTL_CONSTASCII_USTRINGPARAM("FamilyName:string=") );
 
-static ::rtl::OUString STYLEPROP_UINAME = ::rtl::OUString::createFromAscii("DisplayName");
+static ::rtl::OUString STYLEPROP_UINAME (RTL_CONSTASCII_USTRINGPARAM("DisplayName") );
 
 ::rtl::OUString SfxStylesInfo_Impl::generateCommand(const ::rtl::OUString& sFamily, const ::rtl::OUString& sStyle)
 {
@@ -185,15 +185,6 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle)
     if (!aStyle.sLabel.getLength())
     {
         aStyle.sLabel = aStyle.sCommand;
-        /*
-        #if OSL_DEBUG_LEVEL > 1
-        ::rtl::OUStringBuffer sMsg(256);
-        sMsg.appendAscii("There is no UIName for the style command \"");
-        sMsg.append     (aStyle.sCommand                              );
-        sMsg.appendAscii("\". The UI will be invalid then ..."        );
-        OSL_ENSURE(sal_False, ::rtl::OUStringToOString(sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8).getStr());
-        #endif
-        */
     }
 }
 
@@ -239,7 +230,7 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle)
 
 ::std::vector< SfxStyleInfo_Impl > SfxStylesInfo_Impl::getStyles(const ::rtl::OUString& sFamily)
 {
-    static ::rtl::OUString PROP_UINAME = ::rtl::OUString::createFromAscii("DisplayName");
+    static ::rtl::OUString PROP_UINAME (RTL_CONSTASCII_USTRINGPARAM("DisplayName") );
 
     css::uno::Sequence< ::rtl::OUString > lStyleNames;
     css::uno::Reference< css::style::XStyleFamiliesSupplier > xModel(m_xDoc, css::uno::UNO_QUERY_THROW);
@@ -291,7 +282,7 @@ SfxConfigFunctionListBox_Impl::SfxConfigFunctionListBox_Impl( Window* pParent, c
     SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT );
     GetModel()->SetSortMode( SortAscending );
 
-    // Timer f"ur die BallonHelp
+    // Timer for the BallonHelp
     aTimer.SetTimeout( 200 );
     aTimer.SetTimeoutHdl(
         LINK( this, SfxConfigFunctionListBox_Impl, TimerHdl ) );
@@ -304,21 +295,8 @@ SfxConfigFunctionListBox_Impl::~SfxConfigFunctionListBox_Impl()
 
 void SfxConfigFunctionListBox_Impl::MouseMove( const MouseEvent& )
 {
-    /* --> PB 2004-12-01 #i37000# - no own help text needed any longer
-    Point aMousePos = rMEvt.GetPosPixel();
-    pCurEntry = GetCurEntry();
-
-    if ( pCurEntry && GetEntry( aMousePos ) == pCurEntry )
-        aTimer.Start();
-    else
-    {
-        Help::ShowBalloon( this, aMousePos, String() );
-        aTimer.Stop();
-    }
-    */
 }
 
-
 IMPL_LINK( SfxConfigFunctionListBox_Impl, TimerHdl, Timer*, pTimer)
 /*  Beschreibung
     Timer-Handler f"ur die Einblendung eines Hilfetextes. Wenn nach Ablauf des Timers
@@ -327,16 +305,6 @@ IMPL_LINK( SfxConfigFunctionListBox_Impl, TimerHdl, Timer*, pTimer)
 */
 {
     (void)pTimer; // unused
-    /* --> PB 2004-12-01 #i37000# - no own help text needed any longer
-    aTimer.Stop();
-    Point aMousePos = GetPointerPosPixel();
-    SvLBoxEntry *pEntry = GetCurEntry();
-    if ( pEntry && GetEntry( aMousePos ) == pEntry && pCurEntry == pEntry )
-    {
-        String sHelpText = GetHelpText( pEntry );
-        Help::ShowBalloon( this, OutputToScreenPixel( aMousePos ), sHelpText );
-    }
-    */
     return 0L;
 }
 
@@ -464,57 +432,12 @@ USHORT SfxConfigFunctionListBox_Impl::GetId( SvLBoxEntry *pEntry )
     return 0;
 }
 
-/*
-String SfxConfigFunctionListBox_Impl::GetHelpText( SvLBoxEntry *pEntry )
-{
-    // Information zum selektierten Entry aus den Userdaten holen
-    SfxGroupInfo_Impl *pInfo = pEntry ? (SfxGroupInfo_Impl*) pEntry->GetUserData(): 0;
-    if ( pInfo )
-    {
-        switch ( pInfo->nKind )
-        {
-            case SFX_CFGGROUP_FUNCTION :
-            case SFX_CFGFUNCTION_SLOT :
-            {
-                // Eintrag ist eine Funktion, Hilfe aus der Office-Hilfe
-                USHORT nId = pInfo->nOrd;
-                String aText = Application::GetHelp()->GetHelpText( nId, this );
-
-                if ( !aText.Len() )
-                    aText = SFX_SLOTPOOL().GetSlotHelpText_Impl( nId );
-                return aText;
-            }
-
-            case SFX_CFGGROUP_SCRIPTCONTAINER :
-            case SFX_CFGFUNCTION_SCRIPT :
-            case SFX_CFGGROUP_BASICMGR :
-            case SFX_CFGGROUP_DOCBASICMGR :
-            case SFX_CFGGROUP_BASICLIB :
-            case SFX_CFGGROUP_BASICMOD :
-            case SFX_CFGFUNCTION_MACRO :
-            {
-                // Eintrag ist ein Macro, Hilfe aus der MacroInfo
-                SfxMacroInfo *pMacInfo = (SfxMacroInfo*) pInfo->pObject;
-                return pMacInfo->GetHelpText();
-            }
-
-            case SFX_CFGGROUP_STYLES :
-                return String();
-        }
-    }
-
-    return String();
-}*/
-
 void SfxConfigFunctionListBox_Impl::FunctionSelected()
 /*  Beschreibung
     Setzt die Balloonhelp zur"uck, da diese immer den Helptext des selektierten
     Entry anzeigen soll.
 */
 {
-    /* --> PB 2004-12-01 #i37000# - no own help text needed any longer
-    Help::ShowBalloon( this, Point(), String() );
-    */
 }
 
 void SfxConfigFunctionListBox_Impl::SetStylesInfo(SfxStylesInfo_Impl* pStyles)
@@ -525,13 +448,9 @@ void SfxConfigFunctionListBox_Impl::SetStylesInfo(SfxStylesInfo_Impl* pStyles)
 struct SvxConfigGroupBoxResource_Impl : public Resource
 {
     Image m_hdImage;
-    Image m_hdImage_hc;
     Image m_libImage;
-    Image m_libImage_hc;
     Image m_macImage;
-    Image m_macImage_hc;
     Image m_docImage;
-    Image m_docImage_hc;
     ::rtl::OUString m_sMyMacros;
     ::rtl::OUString m_sProdMacros;
     String m_sMacros;
@@ -540,9 +459,7 @@ struct SvxConfigGroupBoxResource_Impl : public Resource
     String m_aStrGroupStyles;
     String m_aScriptType;
     Image m_collapsedImage;
-    Image m_collapsedImage_hc;
     Image m_expandedImage;
-    Image m_expandedImage_hc;
 
     SvxConfigGroupBoxResource_Impl();
 };
@@ -550,13 +467,9 @@ struct SvxConfigGroupBoxResource_Impl : public Resource
 SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
     Resource(CUI_RES(RID_SVXPAGE_CONFIGGROUPBOX)),
     m_hdImage(CUI_RES(IMG_HARDDISK)),
-    m_hdImage_hc(CUI_RES(IMG_HARDDISK_HC)),
     m_libImage(CUI_RES(IMG_LIB)),
-    m_libImage_hc(CUI_RES(IMG_LIB_HC)),
     m_macImage(CUI_RES(IMG_MACRO)),
-    m_macImage_hc(CUI_RES(IMG_MACRO_HC)),
     m_docImage(CUI_RES(IMG_DOC)),
-    m_docImage_hc(CUI_RES(IMG_DOC_HC)),
     m_sMyMacros(String(CUI_RES(STR_MYMACROS))),
     m_sProdMacros(String(CUI_RES(STR_PRODMACROS))),
     m_sMacros(String(CUI_RES(STR_BASICMACROS))),
@@ -565,9 +478,7 @@ SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
     m_aStrGroupStyles(String(CUI_RES(STR_GROUP_STYLES))),
     m_aScriptType(String(CUI_RES(STR_BASICNAME))),
     m_collapsedImage(CUI_RES(BMP_COLLAPSED)),
-    m_collapsedImage_hc(CUI_RES(BMP_COLLAPSED_HC)),
-    m_expandedImage(CUI_RES(BMP_EXPANDED)),
-    m_expandedImage_hc(CUI_RES(BMP_EXPANDED_HC))
+    m_expandedImage(CUI_RES(BMP_EXPANDED))
 {
     FreeResource();
 }
@@ -578,8 +489,7 @@ SfxConfigGroupListBox_Impl::SfxConfigGroupListBox_Impl(
         , pImp(new SvxConfigGroupBoxResource_Impl()), pFunctionListBox(0), nMode( nConfigMode ), bShowSF( FALSE ), bShowBasic( TRUE ), pStylesInfo(0)
 {
     SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT );
-    SetNodeBitmaps( pImp->m_collapsedImage, pImp->m_expandedImage, BMP_COLOR_NORMAL );
-    SetNodeBitmaps( pImp->m_collapsedImage_hc, pImp->m_expandedImage_hc, BMP_COLOR_HIGHCONTRAST );
+    SetNodeBitmaps( pImp->m_collapsedImage, pImp->m_expandedImage );
 
     // Check configuration to see whether only Basic macros,
     // only Scripting Framework scripts, or both should be listed
@@ -587,8 +497,7 @@ SfxConfigGroupListBox_Impl::SfxConfigGroupListBox_Impl(
     sal_Bool tmp = false;
 
     value = ::utl::ConfigManager::GetConfigManager().GetLocalProperty(
-        ::rtl::OUString::createFromAscii(
-            "Office.Scripting/ScriptDisplaySettings/ShowBasic" ) );
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Office.Scripting/ScriptDisplaySettings/ShowBasic" ) ) );
 
     value >>= tmp;
 
@@ -600,8 +509,7 @@ SfxConfigGroupListBox_Impl::SfxConfigGroupListBox_Impl(
     }
 
     value = ::utl::ConfigManager::GetConfigManager().GetLocalProperty(
-        ::rtl::OUString::createFromAscii(
-            "Office.Scripting/ScriptDisplaySettings/ShowSF" ) );
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Scripting/ScriptDisplaySettings/ShowSF" ) ) );
 
     value >>= tmp;
 
@@ -817,7 +725,6 @@ namespace
         }
         catch( const Exception& )
         {
-            //DBG_UNHANDLED_EXCEPTION();
         }
 
         return xDocument;
@@ -847,46 +754,6 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
         InitStyles();
     }
 
-    /*
-
-    // Verwendet wird der aktuelle Slotpool
-    if ( nMode )
-    {
-        pSlotPool = pPool ? pPool : &SFX_SLOTPOOL();
-        for ( USHORT i=1; i<pSlotPool->GetGroupCount(); i++ )
-        {
-            // Gruppe anw"ahlen ( Gruppe 0 ist intern )
-            String aName = pSlotPool->SeekGroup( i );
-            const SfxSlot *pSfxSlot = pSlotPool->FirstSlot();
-            if ( pSfxSlot )
-            {
-                // Check if all entries are not useable. Don't
-                // insert a group without any useable function.
-                sal_Bool bActiveEntries = sal_False;
-                while ( pSfxSlot )
-                {
-                    USHORT nId = pSfxSlot->GetSlotId();
-                    if ( pSfxSlot->GetMode() & nMode )
-                    {
-                        bActiveEntries = sal_True;
-                        break;
-                    }
-
-                    pSfxSlot = pSlotPool->NextSlot();
-                }
-
-                if ( bActiveEntries )
-                {
-                    // Wenn Gruppe nicht leer
-                    SvLBoxEntry *pEntry = InsertEntry( aName, NULL );
-                    SfxGroupInfo_Impl *pInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_FUNCTION, i );
-                    aArr.Insert( pInfo, aArr.Count() );
-                    pEntry->SetUserData( pInfo );
-                }
-            }
-        }
-    }
-*/
     SfxApplication *pSfxApp = SFX_APP();
     if ( bShowBasic )
     {
@@ -898,20 +765,6 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
         // Zuerst AppBasic
         BasicManager *pAppBasicMgr = pSfxApp->GetBasicManager();
         BOOL bInsert = TRUE;
-        /*
-        if ( pArr )
-        {
-            bInsert = FALSE;
-            for ( USHORT n=0; n<pArr->Count(); n++ )
-            {
-                if ( *(*pArr)[n] == pSfxApp->GetName() )
-                {
-                    bInsert = TRUE;
-                    break;
-                }
-            }
-        }
-        */
 
         if ( bInsert )
         {
@@ -923,10 +776,8 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
                 aAppBasTitle += aMacroName;
                 SvLBoxEntry *pEntry = InsertEntry( aAppBasTitle, 0 );
                 SfxGroupInfo_Impl *pInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_BASICMGR, 0, pAppBasicMgr );
-    //          aArr.Insert( pInfo, aArr.Count() );
                 pEntry->SetUserData( pInfo );
                 pEntry->EnableChildsOnDemand( TRUE );
-    //          Expand( pEntry );
             }
         }
 
@@ -965,9 +816,8 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
                 ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
             xCtx.set( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), UNO_QUERY_THROW );
             Reference< browse::XBrowseNodeFactory > xFac( xCtx->getValueByName(
-                ::rtl::OUString::createFromAscii( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory") ), UNO_QUERY_THROW );
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory") ) ), UNO_QUERY_THROW );
             rootNode.set( xFac->createView( browse::BrowseNodeFactoryViewTypes::MACROSELECTOR ) );
-            //rootNode.set( xFac->createView( browse::BrowseNodeFactoryViewTypes::MACROORGANIZER ) );
         }
         catch( Exception& e )
         {
@@ -1006,9 +856,9 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
                             rootNode->getChildNodes();
                         BOOL bIsRootNode = FALSE;
 
-                        ::rtl::OUString user = ::rtl::OUString::createFromAscii("user");
-                        ::rtl::OUString share = ::rtl::OUString::createFromAscii("share");
-                        if ( rootNode->getName().equals(::rtl::OUString::createFromAscii("Root") ))
+                        ::rtl::OUString user( RTL_CONSTASCII_USTRINGPARAM("user") );
+                        ::rtl::OUString share( RTL_CONSTASCII_USTRINGPARAM("share") );
+                        if ( rootNode->getName().equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Root") ) ) )
                         {
                             bIsRootNode = TRUE;
                         }
@@ -1052,23 +902,19 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
                             }
                             if (children[n]->getType() != browse::BrowseNodeTypes::SCRIPT  && bDisplay )
                             {
-
-//                                  We call acquire on the XBrowseNode so that it does not
-//                                  get autodestructed and become invalid when accessed later.
+//                              We call acquire on the XBrowseNode so that it does not
+//                              get autodestructed and become invalid when accessed later.
                                 theChild->acquire();
 
                                 SfxGroupInfo_Impl* pInfo =
                                     new SfxGroupInfo_Impl(SFX_CFGGROUP_SCRIPTCONTAINER,
                                         0, static_cast<void *>( theChild.get()));
 
-                                Image aImage = GetImage( theChild, xCtx, bIsRootNode,BMP_COLOR_NORMAL );
+                                Image aImage = GetImage( theChild, xCtx, bIsRootNode );
                                 SvLBoxEntry* pNewEntry =
                                     InsertEntry( uiName, NULL);
-                                SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
-                                SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
-                                aImage = GetImage( theChild, xCtx, bIsRootNode,BMP_COLOR_HIGHCONTRAST );
-                                SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
-                                SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
+                                SetExpandedEntryBmp(  pNewEntry, aImage );
+                                SetCollapsedEntryBmp( pNewEntry, aImage );
 
                                 pNewEntry->SetUserData( pInfo );
                                 aArr.Insert( pInfo, aArr.Count() );
@@ -1109,30 +955,23 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
         pEntry->EnableChildsOnDemand( TRUE );
     }
 
-/*  {
-        String sSymbols( String::CreateFromAscii("Symbols") );
-        SvLBoxEntry *pEntry = InsertEntry( sSymbols, 0 );
-        SfxGroupInfo_Impl *pInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_SPECIALCHARACTERS, 0, 0 ); // TODO last parameter should contain user data
-        aArr.Insert( pInfo, aArr.Count() );
-        pEntry->SetUserData( pInfo );
-    } */
-
     MakeVisible( GetEntry( 0,0 ) );
     SetUpdateMode( TRUE );
 }
-Image SfxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > node, Reference< XComponentContext > xCtx, bool bIsRootNode, bool bHighContrast )
+Image SfxConfigGroupListBox_Impl::GetImage(
+    Reference< browse::XBrowseNode > node,
+    Reference< XComponentContext > xCtx,
+    bool bIsRootNode
+)
 {
     Image aImage;
     if ( bIsRootNode )
     {
-        ::rtl::OUString user = ::rtl::OUString::createFromAscii("user");
-        ::rtl::OUString share = ::rtl::OUString::createFromAscii("share");
+        ::rtl::OUString user( RTL_CONSTASCII_USTRINGPARAM("user") );
+        ::rtl::OUString share( RTL_CONSTASCII_USTRINGPARAM("share") );
         if (node->getName().equals( user ) || node->getName().equals(share ) )
         {
-            if( bHighContrast == BMP_COLOR_NORMAL )
-                aImage = pImp->m_hdImage;
-            else
-                aImage = pImp->m_hdImage_hc;
+            aImage = pImp->m_hdImage;
         }
         else
         {
@@ -1145,8 +984,8 @@ Image SfxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > nod
                     xModuleManager(
                         xCtx->getServiceManager()
                             ->createInstanceWithContext(
-                                ::rtl::OUString::createFromAscii("" // xxx todo
-                                      "com.sun.star.frame.ModuleManager"),
+                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("" // xxx todo
+                                      "com.sun.star.frame.ModuleManager") ),
                                 xCtx ),
                             UNO_QUERY_THROW );
                 Reference<container::XNameAccess> xModuleConfig(
@@ -1158,7 +997,7 @@ Image SfxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > nod
                 Any aAny = xModuleConfig->getByName(appModule);
                 if( sal_True != ( aAny >>= moduleDescr ) )
                 {
-                    throw RuntimeException(::rtl::OUString::createFromAscii("SFTreeListBox::Init: failed to get PropertyValue"), Reference< XInterface >());
+                    throw RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SFTreeListBox::Init: failed to get PropertyValue") ), Reference< XInterface >());
                 }
                 beans::PropertyValue const * pmoduleDescr =
                     moduleDescr.getConstArray();
@@ -1177,40 +1016,20 @@ Image SfxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > nod
             }
             if( factoryURL.getLength() > 0 )
             {
-                if( bHighContrast == BMP_COLOR_NORMAL )
-                    aImage = SvFileInformationManager::GetFileImage(
-                        INetURLObject(factoryURL), false,
-                        BMP_COLOR_NORMAL );
-                else
-                    aImage = SvFileInformationManager::GetFileImage(
-                        INetURLObject(factoryURL), false,
-                        BMP_COLOR_HIGHCONTRAST );
+                aImage = SvFileInformationManager::GetFileImage( INetURLObject(factoryURL), false );
             }
             else
             {
-                if( bHighContrast == BMP_COLOR_NORMAL )
-                    aImage = pImp->m_docImage;
-                else
-                    aImage = pImp->m_docImage_hc;
+                aImage = pImp->m_docImage;
             }
         }
     }
     else
     {
         if( node->getType() == browse::BrowseNodeTypes::SCRIPT )
-        {
-            if( bHighContrast == BMP_COLOR_NORMAL )
-                aImage = pImp->m_macImage;
-            else
-                aImage = pImp->m_macImage_hc;
-        }
+            aImage = pImp->m_macImage;
         else
-        {
-            if( bHighContrast == BMP_COLOR_NORMAL )
-                aImage = pImp->m_libImage;
-            else
-                aImage = pImp->m_libImage_hc;
-        }
+            aImage = pImp->m_libImage;
     }
     return aImage;
 }
@@ -1223,7 +1042,7 @@ SfxConfigGroupListBox_Impl::getDocumentModel( Reference< XComponentContext >& xC
             xCtx->getServiceManager();
     Reference< frame::XDesktop > desktop (
         mcf->createInstanceWithContext(
-            ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"),                 xCtx ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop") ),                 xCtx ),
             UNO_QUERY );
 
     Reference< container::XEnumerationAccess > componentsAccess =
@@ -1253,7 +1072,7 @@ SfxConfigGroupListBox_Impl::getDocumentModel( Reference< XComponentContext >& xC
     // strip out the last leaf of location name
     // e.g. file://dir1/dir2/Blah.sxw - > Blah.sxw
     ::rtl::OUString temp = location;
-    sal_Int32 lastSlashIndex = temp.lastIndexOf( ::rtl::OUString::createFromAscii( "/" ) );
+    sal_Int32 lastSlashIndex = temp.lastIndexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" ) ) );
 
     if ( ( lastSlashIndex + 1 ) <  temp.getLength()  )
     {
@@ -1278,7 +1097,7 @@ SfxConfigGroupListBox_Impl::getDocumentModel( Reference< XComponentContext >& xC
         if (xModuleConf.is())
         {
             ::comphelper::SequenceAsHashMap lProps(xModuleConf->getByName(sCommand));
-            sUIName = lProps.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("Name"), ::rtl::OUString());
+            sUIName = lProps.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name") ), ::rtl::OUString());
         }
     }
     catch(const css::uno::RuntimeException& exRun)
@@ -1290,15 +1109,6 @@ SfxConfigGroupListBox_Impl::getDocumentModel( Reference< XComponentContext >& xC
     if (!sUIName.getLength())
     {
         sUIName = sCommand;
-        /*
-        #if OSL_DEBUG_LEVEL > 1
-        ::rtl::OUStringBuffer sMsg(256);
-        sMsg.appendAscii("There is no UIName for the internal command \"");
-        sMsg.append     (sCommand                                        );
-        sMsg.appendAscii("\". The UI will be invalid then ..."           );
-        OSL_ENSURE(sal_False, ::rtl::OUStringToOString(sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8).getStr());
-        #endif
-        */
     }
 
     return sUIName;
@@ -1424,14 +1234,11 @@ void SfxConfigGroupListBox_Impl::GroupSelected()
                                     new SfxGroupInfo_Impl(SFX_CFGFUNCTION_SCRIPT,
                                         aInfo->GetSlotId(), aInfo);
 
-                                Image aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False, BMP_COLOR_NORMAL );
+                                Image aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False );
                                 SvLBoxEntry* pNewEntry =
                                     pFunctionListBox->InsertEntry( children[n]->getName(), NULL );
-                                pFunctionListBox->SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
-                                pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
-                                aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False, BMP_COLOR_HIGHCONTRAST );
-                                pFunctionListBox->SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
-                                pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
+                                pFunctionListBox->SetExpandedEntryBmp( pNewEntry, aImage );
+                                pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage );
 
                                 pGrpInfo->sCommand = uri;
                                 pGrpInfo->sLabel = children[n]->getName();
@@ -1576,7 +1383,7 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
                 {
                     SbModule* pMod = (SbModule*)pLib->GetModules()->Get( nMod );
 
-                    BOOL bIsStarScript = FALSE; //pMod->ISA( SbJScriptModule );
+                    BOOL bIsStarScript = FALSE;
                     BOOL bWantsStarScript = pImp->m_aScriptType.EqualsAscii("StarScript");
                     if ( bIsStarScript != bWantsStarScript )
                         continue;
@@ -1604,9 +1411,9 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
                             rootNode->getChildNodes();
                         BOOL bIsRootNode = FALSE;
 
-                        ::rtl::OUString user = ::rtl::OUString::createFromAscii("user");
-                        ::rtl::OUString share = ::rtl::OUString::createFromAscii("share");
-                        if ( rootNode->getName().equals(::rtl::OUString::createFromAscii("Root") ))
+                        ::rtl::OUString user( RTL_CONSTASCII_USTRINGPARAM("user") );
+                        ::rtl::OUString share( RTL_CONSTASCII_USTRINGPARAM("share" ));
+                        if ( rootNode->getName().equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Root") ) ) )
                         {
                             bIsRootNode = TRUE;
                         }
@@ -1648,14 +1455,11 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
                                     new SfxGroupInfo_Impl(SFX_CFGGROUP_SCRIPTCONTAINER,
                                         0, static_cast<void *>( theChild.get()));
 
-                                Image aImage = GetImage( theChild, Reference< XComponentContext >(), sal_False, BMP_COLOR_NORMAL );
+                                Image aImage = GetImage( theChild, Reference< XComponentContext >(), sal_False );
                                 SvLBoxEntry* pNewEntry =
                                     InsertEntry( theChild->getName(), pEntry );
-                                SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
-                                SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
-                                aImage = GetImage( theChild, Reference< XComponentContext >(), sal_False, BMP_COLOR_HIGHCONTRAST );
-                                SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
-                                SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
+                                SetExpandedEntryBmp( pNewEntry, aImage );
+                                SetCollapsedEntryBmp(pNewEntry, aImage );
 
                                 pNewEntry->SetUserData( pGrpInfo );
                                 aArr.Insert( pGrpInfo, aArr.Count() );
@@ -1714,21 +1518,6 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
 
 void SfxConfigGroupListBox_Impl::AddAndSelect( const SfxStringItem* , const SfxStringItem* )
 {
-    /*
-    if ( pText )
-    {
-        Select( GetEntry( GetEntryCount()-1) );
-        SvLBoxEntry* pFuncEntry = pFunctionListBox->InsertEntry( pText->GetValue(), NULL );
-        SfxGroupInfo_Impl *pGrpInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_SPECIALCHARACTERS, 0, 0 );
-        String aCommand = String::CreateFromAscii(".uno:InsertSymbol?Symbols:string=");
-        aCommand += pText->GetValue();
-        pFunctionListBox->aArr.Insert( pGrpInfo, pFunctionListBox->aArr.Count() );
-        pGrpInfo->sCommand = aCommand;
-        pGrpInfo->sLabel = String::CreateFromAscii("Symbols: ");
-        pGrpInfo->sLabel += pText->GetValue();
-        pFuncEntry->SetUserData( pGrpInfo );
-    }
-    */
 }
 
 void SfxConfigGroupListBox_Impl::SelectMacro( const SfxMacroInfoItem *pItem )
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index 8a5d00fa6216..85c2d44a6a64 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -82,8 +82,6 @@ SvxEventConfigPage::SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet,
     mpImpl->pDeletePB           = new PushButton( this, CUI_RES( PB_DELETE ));
     mpImpl->pMacroImg           = new Image( CUI_RES( IMG_MACRO) );
     mpImpl->pComponentImg       = new Image( CUI_RES( IMG_COMPONENT) );
-    mpImpl->pMacroImg_h         = new Image( CUI_RES( IMG_MACRO_H) );
-    mpImpl->pComponentImg_h     = new Image( CUI_RES( IMG_COMPONENT_H) );
 
     FreeResource();
 
@@ -97,11 +95,10 @@ SvxEventConfigPage::SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet,
 
     uno::Reference< document::XEventsSupplier > xSupplier;
 
-//    xSupplier = uno::Reference< document::XEventsSupplier >( new GlobalEventConfig());
     xSupplier = uno::Reference< document::XEventsSupplier > (
         ::comphelper::getProcessServiceFactory()->createInstance(
-            OUString::createFromAscii(
-                "com.sun.star.frame.GlobalEventBroadcaster" ) ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.frame.GlobalEventBroadcaster" )) ),
         uno::UNO_QUERY );
 
     USHORT nPos(0);
@@ -205,7 +202,7 @@ IMPL_LINK( SvxEventConfigPage, SelectHdl_Impl, ListBox *, pBox )
 
         uno::Reference< frame::XFramesSupplier > xFramesSupplier(
             ::comphelper::getProcessServiceFactory()->createInstance(
-                OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ),
+                OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" )) ),
             uno::UNO_QUERY );
 
         uno::Reference< frame::XFrame > xFrame =
diff --git a/cui/source/customize/eventdlg.src b/cui/source/customize/eventdlg.src
index e8c0e21677ac..b121caca1420 100644
--- a/cui/source/customize/eventdlg.src
+++ b/cui/source/customize/eventdlg.src
@@ -98,14 +98,4 @@ TabPage RID_SVXPAGE_EVENTS
         ImageBitmap = Bitmap { File = "component_16.png"; };
         MASKCOLOR
     };
-    Image IMG_MACRO_H
-    {
-        ImageBitmap = Bitmap { File = "idh018.png"; };
-        MASKCOLOR
-    };
-    Image IMG_COMPONENT_H
-    {
-        ImageBitmap = Bitmap { File = "component_16_h.png"; };
-        MASKCOLOR
-    };
 };
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 5cb41f93a829..f697b6cefa07 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -60,10 +60,8 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-static ::rtl::OUString aVndSunStarUNO =
-    ::rtl::OUString::createFromAscii( "vnd.sun.star.UNO:" );
-static ::rtl::OUString aVndSunStarScript =
-    ::rtl::OUString::createFromAscii( "vnd.sun.star.script:" );
+static ::rtl::OUString aVndSunStarUNO( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.UNO:") );
+static ::rtl::OUString aVndSunStarScript( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:") );
 
 _SvxMacroTabPage_Impl::_SvxMacroTabPage_Impl( const SfxItemSet& rAttrSet ) :
     pAssignFT( NULL ),
@@ -72,8 +70,6 @@ _SvxMacroTabPage_Impl::_SvxMacroTabPage_Impl( const SfxItemSet& rAttrSet ) :
     pDeletePB( NULL ),
     pMacroImg( NULL ),
     pComponentImg( NULL ),
-    pMacroImg_h( NULL ),
-    pComponentImg_h( NULL ),
     pStrEvent( NULL ),
     pAssignedMacro( NULL ),
     pEventLB( NULL ),
@@ -93,8 +89,6 @@ _SvxMacroTabPage_Impl::~_SvxMacroTabPage_Impl()
     delete pDeletePB;
     delete pMacroImg;
     delete pComponentImg;
-    delete pMacroImg_h;
-    delete pComponentImg_h;
     delete pStrEvent;
     delete pAssignedMacro;
     delete pEventLB;
@@ -130,7 +124,6 @@ IMPL_LINK( _HeaderTabListBox, HeaderEndDrag_Impl, HeaderBar*, pBar )
     {
         Size    aSz;
         USHORT    _nTabs = maHeaderBar.GetItemCount();
-        long    nTmpSz = 0;
         long    nWidth = maHeaderBar.GetItemSize( ITEMID_EVENT );
         long    nBarWidth = maHeaderBar.GetSizePixel().Width();
 
@@ -140,7 +133,7 @@ IMPL_LINK( _HeaderTabListBox, HeaderEndDrag_Impl, HeaderBar*, pBar )
             maHeaderBar.SetItemSize( ITEMID_EVENT, nBarWidth - TAB_WIDTH_MIN );
 
         {
-            long    _nWidth;
+            long _nWidth, nTmpSz = 0;
             for( USHORT i = 1 ; i < _nTabs ; ++i )
             {
                 _nWidth = maHeaderBar.GetItemSize( i );
@@ -284,9 +277,6 @@ void _SvxMacroTabPage::InitResources()
     aDisplayNames.push_back( EventDisplayName( "OnPrint",               RID_SVXSTR_EVENT_PRINTDOC ) );
     aDisplayNames.push_back( EventDisplayName( "OnModifyChanged",       RID_SVXSTR_EVENT_MODIFYCHANGED ) );
     aDisplayNames.push_back( EventDisplayName( "OnTitleChanged",        RID_SVXSTR_EVENT_TITLECHANGED ) );
-//    aDisplayNames.push_back( EventDisplayName( "OnModeChanged",         RID_SVXSTR_EVENT_MODECHANGED ) );
-//    aDisplayNames.push_back( EventDisplayName( "OnVisAreaChanged",      RID_SVXSTR_EVENT_VISAREACHANGED ) );
-//    aDisplayNames.push_back( EventDisplayName( "OnStorageChanged",      RID_SVXSTR_EVENT_STORAGECHANGED ) );
 
     // application specific events
     aDisplayNames.push_back( EventDisplayName( "OnMailMerge",           RID_SVXSTR_EVENT_MAILMERGE ) );
@@ -296,7 +286,6 @@ void _SvxMacroTabPage::InitResources()
     aDisplayNames.push_back( EventDisplayName( "OnPageCountChange",     RID_SVXSTR_EVENT_PAGECOUNTCHANGE ) );
     aDisplayNames.push_back( EventDisplayName( "OnSubComponentOpened",  RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED ) );
     aDisplayNames.push_back( EventDisplayName( "OnSubComponentClosed",  RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED ) );
-//    aDisplayNames.push_back( EventDisplayName( "OnLayoutFinished",        RID_SVXSTR_EVENT_LAYOUT_FINISHED ) );
     aDisplayNames.push_back( EventDisplayName( "OnSelect",              RID_SVXSTR_EVENT_SELECTIONCHANGED ) );
     aDisplayNames.push_back( EventDisplayName( "OnDoubleClick",         RID_SVXSTR_EVENT_DOUBLECLICK ) );
     aDisplayNames.push_back( EventDisplayName( "OnRightClick",          RID_SVXSTR_EVENT_RIGHTCLICK ) );
@@ -455,25 +444,20 @@ class IconLBoxString : public SvLBoxString
 {
     Image* m_pMacroImg;
     Image* m_pComponentImg;
-    Image* m_pMacroImg_h;
-    Image* m_pComponentImg_h;
     int m_nxImageOffset;
 
     public:
         IconLBoxString( SvLBoxEntry* pEntry, USHORT nFlags, const String& sText,
-            Image* pMacroImg, Image* pComponentImg,
-            Image* pMacroImg_h, Image* pComponentImg_h );
+            Image* pMacroImg, Image* pComponentImg );
         virtual void Paint(const Point& aPos, SvLBox& aDevice, USHORT nFlags, SvLBoxEntry* pEntry );
 };
 
 
 IconLBoxString::IconLBoxString( SvLBoxEntry* pEntry, USHORT nFlags, const String& sText,
-    Image* pMacroImg, Image* pComponentImg, Image* pMacroImg_h, Image* pComponentImg_h )
+    Image* pMacroImg, Image* pComponentImg )
         : SvLBoxString( pEntry, nFlags, sText )
         , m_pMacroImg( pMacroImg )
         , m_pComponentImg( pComponentImg )
-        , m_pMacroImg_h( pMacroImg_h )
-        , m_pComponentImg_h( pComponentImg_h )
 {
     m_nxImageOffset = 20;
 }
@@ -489,12 +473,7 @@ void IconLBoxString::Paint( const Point& aPos, SvLBox& aDevice,
         sal_Int32 nIndex = aURL.indexOf( aVndSunStarUNO );
         bool bUNO = nIndex == 0;
 
-        BOOL bHC = aDevice.GetSettings().GetStyleSettings().GetHighContrastMode();
-        const Image* pImg;
-        if( bHC )
-            pImg = bUNO ? m_pComponentImg_h : m_pMacroImg_h;
-        else
-            pImg = bUNO ? m_pComponentImg : m_pMacroImg;
+        const Image* pImg = bUNO ? m_pComponentImg : m_pMacroImg;
         aDevice.DrawImage( aPos, *pImg );
 
         ::rtl::OUString aPureMethod;
@@ -578,8 +557,7 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents)
         _pE->SetUserData( (void*)pEventName );
         String sNew( eventURL );
         _pE->ReplaceItem( new IconLBoxString( _pE, 0, sNew,
-            mpImpl->pMacroImg, mpImpl->pComponentImg,
-            mpImpl->pMacroImg_h, mpImpl->pComponentImg_h ), LB_MACROS_ITEMPOS );
+            mpImpl->pMacroImg, mpImpl->pComponentImg ), LB_MACROS_ITEMPOS );
         rListBox.GetModel()->InvalidateEntry( _pE );
         rListBox.Select( _pE );
         rListBox.MakeVisible( _pE );
@@ -669,7 +647,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
     if( pBtn == pImpl->pDeletePB )
     {
         // delete pressed
-        sEventType = ::rtl::OUString::createFromAscii("Script");
+        sEventType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Script") );
         sEventURL = ::rtl::OUString();
         if(!pThis->bAppEvents)
             pThis->bDocModified = true;
@@ -687,7 +665,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
         short ret = pAssignDlg->Execute();
         if( ret )
         {
-            sEventType = ::rtl::OUString::createFromAscii("UNO");
+            sEventType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNO"));
             sEventURL = pAssignDlg->getURL();
             if(!pThis->bAppEvents)
                 pThis->bDocModified = true;
@@ -703,7 +681,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
             short ret = pDlg->Execute();
             if ( ret )
             {
-                sEventType = ::rtl::OUString::createFromAscii("Script");
+                sEventType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Script"));
                 sEventURL = pDlg->GetScriptURL();
                 if(!pThis->bAppEvents)
                     pThis->bDocModified = true;
@@ -727,10 +705,8 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
 
     // update the listbox entry
     pImpl->pEventLB->SetUpdateMode( FALSE );
-    // pE->ReplaceItem( new SvLBoxString( pE, 0, sEventURL ), LB_MACROS_ITEMPOS );
     pE->ReplaceItem( new IconLBoxString( pE, 0, sEventURL,
-            pImpl->pMacroImg, pImpl->pComponentImg,
-            pImpl->pMacroImg_h, pImpl->pComponentImg_h ), LB_MACROS_ITEMPOS );
+            pImpl->pMacroImg, pImpl->pComponentImg ), LB_MACROS_ITEMPOS );
 
     rListBox.GetModel()->InvalidateEntry( pE );
     rListBox.Select( pE );
@@ -853,8 +829,6 @@ SvxMacroTabPage::SvxMacroTabPage( Window* pParent, const Reference< frame::XFram
     mpImpl->pAssignComponentPB  = new PushButton( this,         CUI_RES( PB_ASSIGN_COMPONENT ) );
     mpImpl->pMacroImg           = new Image(                        CUI_RES(IMG_MACRO) );
     mpImpl->pComponentImg       = new Image(                        CUI_RES(IMG_COMPONENT) );
-    mpImpl->pMacroImg_h         = new Image(                        CUI_RES(IMG_MACRO_H) );
-    mpImpl->pComponentImg_h     = new Image(                        CUI_RES(IMG_COMPONENT_H) );
 
     FreeResource();
 
@@ -862,9 +836,6 @@ SvxMacroTabPage::SvxMacroTabPage( Window* pParent, const Reference< frame::XFram
 
     if( !mpImpl->bIDEDialogMode )
     {
-        // Size aSizeAssign;
-        // Point aPosAssign;
-        // mpImpl->pAssignPB->GetPosSizePixel( aPosAssign, aSizeAssign );
         Point aPosAssign = mpImpl->pAssignPB->GetPosPixel();
         Point aPosComp = mpImpl->pAssignComponentPB->GetPosPixel();
 
diff --git a/cui/source/customize/macropg.hrc b/cui/source/customize/macropg.hrc
index a7387e410432..b8ffa3694be2 100644
--- a/cui/source/customize/macropg.hrc
+++ b/cui/source/customize/macropg.hrc
@@ -43,8 +43,6 @@
 // Starting new IDs with 30 as eventdlg.hrc also includes this file
 #define     IMG_MACRO               30
 #define     IMG_COMPONENT           31
-#define     IMG_MACRO_H             32
-#define     IMG_COMPONENT_H         33
 
 #define     RID_PB_OK               41
 #define     RID_PB_CANCEL           42
diff --git a/cui/source/customize/macropg.src b/cui/source/customize/macropg.src
index 10d9149233e0..aeb8e43b024e 100644
--- a/cui/source/customize/macropg.src
+++ b/cui/source/customize/macropg.src
@@ -36,7 +36,6 @@
 
 TabPage RID_SVXPAGE_MACROASSIGN
 {
-     // HelpID = HID_MACROASSIGN ;
     Hide = TRUE ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
@@ -98,16 +97,6 @@ TabPage RID_SVXPAGE_MACROASSIGN
         ImageBitmap = Bitmap { File = "component_16.png"; };
         MASKCOLOR
     };
-    Image IMG_MACRO_H
-    {
-        ImageBitmap = Bitmap { File = "idh018.png"; };
-        MASKCOLOR
-    };
-    Image IMG_COMPONENT_H
-    {
-        ImageBitmap = Bitmap { File = "component_16_h.png"; };
-        MASKCOLOR
-    };
 };
 
 ModalDialog RID_SVXDLG_ASSIGNCOMPONENT
diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx
index 0e527e5a7623..c6501e4b30a1 100644
--- a/cui/source/customize/macropg_impl.hxx
+++ b/cui/source/customize/macropg_impl.hxx
@@ -41,8 +41,6 @@ public:
     PushButton*                     pDeletePB;
     Image*                          pMacroImg;
     Image*                          pComponentImg;
-    Image*                          pMacroImg_h;
-    Image*                          pComponentImg_h;
     String*                         pStrEvent;
     String*                         pAssignedMacro;
     _HeaderTabListBox*              pEventLB;
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index b52f8c29a6f3..b3fd2e69dc95 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -94,7 +94,7 @@ SvxConfigFunctionListBox_Impl::SvxConfigFunctionListBox_Impl( Window* pParent, c
     SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT );
     GetModel()->SetSortMode( SortAscending );
 
-    // Timer f"ur die BallonHelp
+    // Timer for the BallonHelp
     aTimer.SetTimeout( 200 );
     aTimer.SetTimeoutHdl(
         LINK( this, SvxConfigFunctionListBox_Impl, TimerHdl ) );
@@ -246,13 +246,9 @@ SvxConfigGroupListBox_Impl::SvxConfigGroupListBox_Impl(
         : SvTreeListBox( pParent, rResId )
         , m_bShowSlots( _bShowSlots ),
     m_hdImage(ResId(IMG_HARDDISK,*rResId.GetResMgr())),
-    m_hdImage_hc(ResId(IMG_HARDDISK_HC,*rResId.GetResMgr())),
     m_libImage(ResId(IMG_LIB,*rResId.GetResMgr())),
-    m_libImage_hc(ResId(IMG_LIB_HC,*rResId.GetResMgr())),
     m_macImage(ResId(IMG_MACRO,*rResId.GetResMgr())),
-    m_macImage_hc(ResId(IMG_MACRO_HC,*rResId.GetResMgr())),
     m_docImage(ResId(IMG_DOC,*rResId.GetResMgr())),
-    m_docImage_hc(ResId(IMG_DOC_HC,*rResId.GetResMgr())),
     m_sMyMacros(String(ResId(STR_MYMACROS,*rResId.GetResMgr()))),
     m_sProdMacros(String(ResId(STR_PRODMACROS,*rResId.GetResMgr())))
 {
@@ -269,13 +265,8 @@ SvxConfigGroupListBox_Impl::SvxConfigGroupListBox_Impl(
 
     SetNodeBitmaps(
         aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ),
-        aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ),
-        BMP_COLOR_NORMAL );
-
-    SetNodeBitmaps(
-        aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ),
-        aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ),
-        BMP_COLOR_HIGHCONTRAST );
+        aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE )
+    );
 }
 
 
@@ -419,13 +410,9 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows
                 SvLBoxEntry* pNewEntry = InsertEntry( sUIName, _pParentEntry );
 
                 ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
-                Image aImage = GetImage( theChild, aContext.getUNOContext(), bIsRootNode, BMP_COLOR_NORMAL );
-                SetExpandedEntryBmp( pNewEntry, aImage, BMP_COLOR_NORMAL );
-                SetCollapsedEntryBmp( pNewEntry, aImage, BMP_COLOR_NORMAL );
-
-                aImage = GetImage( theChild, aContext.getUNOContext(), bIsRootNode, BMP_COLOR_HIGHCONTRAST );
-                SetExpandedEntryBmp( pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST );
-                SetCollapsedEntryBmp( pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST );
+                Image aImage = GetImage( theChild, aContext.getUNOContext(), bIsRootNode );
+                SetExpandedEntryBmp( pNewEntry, aImage );
+                SetCollapsedEntryBmp( pNewEntry, aImage );
 
                 SvxGroupInfo_Impl* pInfo =
                     new SvxGroupInfo_Impl( SVX_CFGGROUP_SCRIPTCONTAINER, 0, theChild );
@@ -489,8 +476,8 @@ void SvxConfigGroupListBox_Impl::Init()
 
         Reference< ::com::sun::star::frame::XModuleManager >
             xModuleManager( xMCF->createInstanceWithContext(
-                OUString::createFromAscii(
-                    "com.sun.star.frame.ModuleManager" ),
+                OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.frame.ModuleManager" )),
                 xContext ),
             UNO_QUERY );
 
@@ -502,8 +489,8 @@ void SvxConfigGroupListBox_Impl::Init()
 
         Reference< container::XNameAccess > xNameAccess(
             xMCF->createInstanceWithContext(
-                OUString::createFromAscii(
-                    "com.sun.star.frame.UICommandDescription" ),
+                OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.frame.UICommandDescription" )),
                 xContext ),
             UNO_QUERY );
 
@@ -514,8 +501,8 @@ void SvxConfigGroupListBox_Impl::Init()
 
         Reference< container::XNameAccess > xAllCategories(
             xMCF->createInstanceWithContext(
-                OUString::createFromAscii(
-                    "com.sun.star.ui.UICategoryDescription" ),
+                OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.ui.UICategoryDescription" )),
                 xContext ),
             UNO_QUERY );
 
@@ -597,7 +584,7 @@ void SvxConfigGroupListBox_Impl::Init()
                 ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
             xCtx.set( _xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), UNO_QUERY_THROW );
             Reference< browse::XBrowseNodeFactory > xFac( xCtx->getValueByName(
-                OUString::createFromAscii( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory") ), UNO_QUERY_THROW );
+                OUString(RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory")) ), UNO_QUERY_THROW );
             rootNode.set( xFac->createView( browse::BrowseNodeFactoryViewTypes::MACROSELECTOR ) );
         }
         catch( const Exception& )
@@ -630,17 +617,18 @@ void SvxConfigGroupListBox_Impl::Init()
     SetUpdateMode( TRUE );
 }
 
-Image SvxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > node, Reference< XComponentContext > xCtx, bool bIsRootNode, bool bHighContrast )
+Image SvxConfigGroupListBox_Impl::GetImage(
+    Reference< browse::XBrowseNode > node,
+    Reference< XComponentContext > xCtx,
+    bool bIsRootNode
+)
 {
     Image aImage;
     if ( bIsRootNode )
     {
         if ( node->getName().equalsAscii( "user" ) || node->getName().equalsAscii( "share" ) )
         {
-            if( bHighContrast == BMP_COLOR_NORMAL )
-                aImage = m_hdImage;
-            else
-                aImage = m_hdImage_hc;
+            aImage = m_hdImage;
         }
         else
         {
@@ -653,7 +641,7 @@ Image SvxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > nod
                     xModuleManager(
                         xCtx->getServiceManager()
                             ->createInstanceWithContext(
-                                OUString::createFromAscii("com.sun.star.frame.ModuleManager"),
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager")),
                                 xCtx ),
                             UNO_QUERY_THROW );
                 Reference<container::XNameAccess> xModuleConfig(
@@ -665,7 +653,7 @@ Image SvxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > nod
                 Any aAny = xModuleConfig->getByName(appModule);
                 if( sal_True != ( aAny >>= moduleDescr ) )
                 {
-                    throw RuntimeException(OUString::createFromAscii("SFTreeListBox::Init: failed to get PropertyValue"), Reference< XInterface >());
+                    throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("SFTreeListBox::Init: failed to get PropertyValue")), Reference< XInterface >());
                 }
                 beans::PropertyValue const * pmoduleDescr =
                     moduleDescr.getConstArray();
@@ -682,40 +670,20 @@ Image SvxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > nod
             }
             if( factoryURL.getLength() > 0 )
             {
-                if( bHighContrast == BMP_COLOR_NORMAL )
-                    aImage = SvFileInformationManager::GetFileImage(
-                        INetURLObject(factoryURL), false,
-                        BMP_COLOR_NORMAL );
-                else
-                    aImage = SvFileInformationManager::GetFileImage(
-                        INetURLObject(factoryURL), false,
-                        BMP_COLOR_HIGHCONTRAST );
+                aImage = SvFileInformationManager::GetFileImage( INetURLObject(factoryURL), false );
             }
             else
             {
-                if( bHighContrast == BMP_COLOR_NORMAL )
-                    aImage = m_docImage;
-                else
-                    aImage = m_docImage_hc;
+                aImage = m_docImage;
             }
         }
     }
     else
     {
         if( node->getType() == browse::BrowseNodeTypes::SCRIPT )
-        {
-            if( bHighContrast == BMP_COLOR_NORMAL )
-                aImage = m_macImage;
-            else
-                aImage = m_macImage_hc;
-        }
+            aImage = m_macImage;
         else
-        {
-            if( bHighContrast == BMP_COLOR_NORMAL )
-                aImage = m_libImage;
-            else
-                aImage = m_libImage_hc;
-        }
+            aImage = m_libImage;
     }
     return aImage;
 }
@@ -729,7 +697,7 @@ SvxConfigGroupListBox_Impl::getDocumentModel(
             xCtx->getServiceManager();
     Reference< frame::XDesktop > desktop (
         mcf->createInstanceWithContext(
-            OUString::createFromAscii("com.sun.star.frame.Desktop"),                 xCtx ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")),                 xCtx ),
             UNO_QUERY );
 
     Reference< container::XEnumerationAccess > componentsAccess =
@@ -899,14 +867,11 @@ void SvxConfigGroupListBox_Impl::GroupSelected()
                                 new SvxGroupInfo_Impl(
                                     SVX_CFGFUNCTION_SCRIPT, 123, uri, description );
 
-                            Image aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False, BMP_COLOR_NORMAL );
+                            Image aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False );
                             SvLBoxEntry* pNewEntry =
                                 pFunctionListBox->InsertEntry( children[n]->getName(), NULL );
-                            pFunctionListBox->SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
-                            pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
-                            aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False, BMP_COLOR_HIGHCONTRAST );
-                            pFunctionListBox->SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
-                            pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
+                            pFunctionListBox->SetExpandedEntryBmp( pNewEntry, aImage );
+                            pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage );
 
                             pNewEntry->SetUserData( _pGroupInfo );
 
@@ -1040,7 +1005,6 @@ SvxScriptSelectorDialog::SvxScriptSelectorDialog(
 
     aCategories.SetFunctionListBox( &aCommands );
     aCategories.Init();
-    // aCategories.Select( aCategories.GetEntry( 0, 0 ) );
 
     aCategories.SetSelectHdl(
             LINK( this, SvxScriptSelectorDialog, SelectHdl ) );
diff --git a/cui/source/customize/selector.hrc b/cui/source/customize/selector.hrc
index 78929c8c9de5..a8dee0cc128a 100644
--- a/cui/source/customize/selector.hrc
+++ b/cui/source/customize/selector.hrc
@@ -35,14 +35,11 @@
 #define BTN_SELECTOR_HELP 8
 #define GRP_SELECTOR_DESCRIPTION 9
 #define TXT_SELECTOR_DESCRIPTION 10
+
 #define IMG_HARDDISK                   1
-#define IMG_HARDDISK_HC                2
 #define IMG_LIB                        3
-#define IMG_LIB_HC                     4
 #define IMG_MACRO                      5
-#define IMG_MACRO_HC                   6
 #define IMG_DOC                        7
-#define IMG_DOC_HC                     8
 
 #define STR_SELECTOR_ADD 310
 #define STR_SELECTOR_CLOSE 311
diff --git a/cui/source/customize/selector.src b/cui/source/customize/selector.src
index cd4ea9dd5d12..34e7a7726804 100644
--- a/cui/source/customize/selector.src
+++ b/cui/source/customize/selector.src
@@ -128,41 +128,21 @@ ModelessDialog RID_DLG_SCRIPTSELECTOR
         ImageBitmap = Bitmap { File = "harddisk_16.bmp" ; };
         MASKCOLOR
     };
-    Image IMG_HARDDISK_HC
-    {
-        ImageBitmap = Bitmap { File = "harddisk_16_h.bmp" ; };
-        MASKCOLOR
-    };
     Image IMG_LIB
     {
         ImageBitmap = Bitmap { File = "im30820.png"; };
         MASKCOLOR
     };
-    Image IMG_LIB_HC
-    {
-        ImageBitmap = Bitmap { File = "imh30820.png"; };
-        MASKCOLOR
-    };
     Image IMG_MACRO
     {
         ImageBitmap = Bitmap { File = "im30821.png"; };
         MASKCOLOR
     };
-    Image IMG_MACRO_HC
-    {
-        ImageBitmap = Bitmap { File = "imh30821.png"; };
-        MASKCOLOR
-    };
     Image IMG_DOC
     {
         ImageBitmap = Bitmap { File = "im30826.png"; };
         MASKCOLOR
     };
-    Image IMG_DOC_HC
-    {
-        ImageBitmap = Bitmap { File = "imh30826.png"; };
-        MASKCOLOR
-    };
   };
   FixedText TXT_SELECTOR_COMMANDS
   {
diff --git a/cui/source/dialogs/SpellAttrib.cxx b/cui/source/dialogs/SpellAttrib.cxx
index c4c55b9ebe1b..f3098f0688de 100644
--- a/cui/source/dialogs/SpellAttrib.cxx
+++ b/cui/source/dialogs/SpellAttrib.cxx
@@ -37,134 +37,116 @@ using namespace svx;
 using namespace com::sun::star::linguistic2;
 using namespace com::sun::star::uno;
 
-/*-- 26.06.2008 10:41:57---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 SpellErrorAttrib::SpellErrorAttrib( const SpellErrorDescription& rDesc ) :
     TextAttrib(TEXTATTR_SPELL_ERROR),
     m_aSpellErrorDescription( rDesc )
 {
 }
 
-/*-- 10.09.2003 12:54:34---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 SpellErrorAttrib::SpellErrorAttrib( const SpellErrorAttrib& rAttr ) :
     TextAttrib(TEXTATTR_SPELL_ERROR),
     m_aSpellErrorDescription( rAttr.m_aSpellErrorDescription )
 {
 }
-/*-- 10.09.2003 12:54:34---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 SpellErrorAttrib::~SpellErrorAttrib()
 {
 }
-/*-- 10.09.2003 12:54:35---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 void SpellErrorAttrib::SetFont( Font&  ) const
 {
     //this attribute doesn't have a visual effect
 }
-/*-- 10.09.2003 12:54:35---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 TextAttrib*     SpellErrorAttrib::Clone() const
 {
     return new SpellErrorAttrib(*this);
 }
-/*-- 10.09.2003 12:54:35---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 int SpellErrorAttrib::operator==( const TextAttrib& rAttr ) const
 {
     return Which() == rAttr.Which() &&
             m_aSpellErrorDescription == static_cast<const SpellErrorAttrib&>(rAttr).m_aSpellErrorDescription;
 }
-/*-- 10.09.2003 14:27:43---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 SpellLanguageAttrib::SpellLanguageAttrib(LanguageType eLang) :
     TextAttrib(TEXTATTR_SPELL_LANGUAGE),
     m_eLanguage(eLang)
 {
 }
-/*-- 10.09.2003 14:27:43---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 SpellLanguageAttrib::SpellLanguageAttrib( const SpellLanguageAttrib& rAttr ) :
     TextAttrib(TEXTATTR_SPELL_LANGUAGE),
     m_eLanguage(rAttr.m_eLanguage)
 {
 }
-/*-- 10.09.2003 14:27:43---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 SpellLanguageAttrib::~SpellLanguageAttrib()
 {
 }
-/*-- 10.09.2003 14:27:43---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 void SpellLanguageAttrib::SetFont( Font&  ) const
 {
     //no visual effect
 }
-/*-- 10.09.2003 14:27:44---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 TextAttrib* SpellLanguageAttrib::Clone() const
 {
     return new SpellLanguageAttrib(*this);
 }
-/*-- 10.09.2003 14:27:44---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 int SpellLanguageAttrib::operator==( const TextAttrib& rAttr ) const
 {
     return Which() == rAttr.Which() &&
             m_eLanguage == static_cast<const SpellLanguageAttrib&>(rAttr).m_eLanguage;
 }
-/*-- 31.10.2003 16:07:45---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 SpellBackgroundAttrib::SpellBackgroundAttrib(const Color& rCol) :
     TextAttrib(TEXTATTR_SPELL_BACKGROUND),
     m_aBackgroundColor(rCol)
 {
 }
-/*-- 31.10.2003 16:07:45---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 SpellBackgroundAttrib::SpellBackgroundAttrib( const SpellBackgroundAttrib& rAttr ) :
     TextAttrib(TEXTATTR_SPELL_BACKGROUND),
     m_aBackgroundColor(rAttr.m_aBackgroundColor)
 {
 }
-/*-- 31.10.2003 16:07:46---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 SpellBackgroundAttrib::~SpellBackgroundAttrib()
 {
 }
-/*-- 31.10.2003 16:07:46---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 void SpellBackgroundAttrib::SetFont( Font& rFont ) const
 {
     rFont.SetFillColor(m_aBackgroundColor);
 }
-/*-- 31.10.2003 16:07:46---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 TextAttrib* SpellBackgroundAttrib::Clone() const
 {
     return new SpellBackgroundAttrib(*this);
 }
-/*-- 31.10.2003 16:07:47---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 int  SpellBackgroundAttrib::operator==( const TextAttrib& rAttr ) const
 {
     return Which() == rAttr.Which() &&
diff --git a/cui/source/dialogs/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx
index 72e69270239a..9ebc229380ce 100644
--- a/cui/source/dialogs/SpellAttrib.hxx
+++ b/cui/source/dialogs/SpellAttrib.hxx
@@ -35,9 +35,6 @@
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/linguistic2/XProofreader.hpp>
 #include <tools/color.hxx>
-//namespace com{ namespace sun{ namespace star{ namespace linguistic2{
-//    class XSpellAlternatives;
-//}}}}
 
 #define TEXTATTR_SPELL_ERROR            (TEXTATTR_USER_START + 1)
 #define TEXTATTR_SPELL_LANGUAGE         (TEXTATTR_USER_START + 2)
@@ -97,21 +94,18 @@ struct SpellErrorDescription
                 sRuleId == rDesc.sRuleId;
     }
 };
-/* -----------------10.09.2003 14:23-----------------
 
- --------------------------------------------------*/
+//-------------------------------------------------
 class SpellErrorAttrib : public TextAttrib
 {
 public:
 
 private:
-    //com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellAlternatives> m_xAlternatives;
     SpellErrorDescription        m_aSpellErrorDescription;
 
                             //not accessible
                             SpellErrorAttrib();
 public:
-//                            SpellErrorAttrib(com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellAlternatives> xAlternatives);
                             SpellErrorAttrib( const SpellErrorDescription& );
                             SpellErrorAttrib( const SpellErrorAttrib& rAttr );
                             ~SpellErrorAttrib();
@@ -123,9 +117,8 @@ public:
     virtual TextAttrib*     Clone() const;
     virtual int             operator==( const TextAttrib& rAttr ) const;
 };
-/* -----------------10.09.2003 14:23-----------------
 
- --------------------------------------------------*/
+//-------------------------------------------------
 class SpellLanguageAttrib : public TextAttrib
 {
     LanguageType m_eLanguage;
@@ -147,9 +140,8 @@ public:
     virtual TextAttrib*     Clone() const;
     virtual int             operator==( const TextAttrib& rAttr ) const;
 };
-/* -----------------31.10.2003 16:01-----------------
 
- --------------------------------------------------*/
+//-------------------------------------------------
 class SpellBackgroundAttrib : public TextAttrib
 {
     Color   m_aBackgroundColor;
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 304407cdba07..55717e723a64 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -85,7 +85,6 @@ struct SpellDialog_Impl
     Sequence< Reference< XDictionary >  >   aDics;
 };
 // -----------------------------------------------------------------------
-//#define VENDOR_IMAGE_HEIGHT 44 //as specified
 
 #define SPELLUNDO_CHANGE_LANGUAGE           (TEXTUNDO_USER + 1)
 #define SPELLUNDO_CHANGE_TEXTENGINE         (TEXTUNDO_USER + 2)
@@ -157,7 +156,6 @@ public:
     void                    SetErrorLanguageSelected(bool bSet){ m_bIsErrorLanguageSelected = bSet;}
     bool                    IsErrorLanguageSelected() const {return m_bIsErrorLanguageSelected;}
 
-
     void                    SetDictionary(Reference<XDictionary> xDict) { m_xDictionary = xDict; }
     Reference<XDictionary>  GetDictionary() const {return m_xDictionary;}
     void                    SetAddedWord(const ::rtl::OUString& rWord) {m_sAddedWord = rWord;}
@@ -172,22 +170,19 @@ public:
 };
 }//namespace svx
 using namespace ::svx;
-/*-- 06.11.2003 12:16:02---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 SpellUndoAction_Impl::~SpellUndoAction_Impl()
 {
 }
-/*-- 06.11.2003 12:16:02---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 void SpellUndoAction_Impl::Undo()
 {
     m_rActionLink.Call(this);
 }
-/*-- 06.11.2003 12:16:02---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 USHORT SpellUndoAction_Impl::GetId()const
 {
     return m_nId;
@@ -231,7 +226,6 @@ SpellDialog::SpellDialog(
     aBackgroundGB   ( this, CUI_RES( GB_BACKGROUND ) ),
 
     aVendorImage    ( CUI_RES( IMG_DEFAULT_VENDOR ) ),
-    aVendorImageHC  ( CUI_RES( IMG_DEFAULT_VENDOR_HC ) ),
 
     aResumeST       ( CUI_RES(ST_RESUME )),
     aIgnoreOnceST   ( aIgnorePB.GetText()),
@@ -328,13 +322,11 @@ void SpellDialog::UpdateBoxes_Impl()
     const SpellErrorDescription* pSpellErrorDescription = aSentenceED.GetAlternatives();
 
     LanguageType nAltLanguage = LANGUAGE_NONE;
-    //String      aAltWord;
     Sequence< ::rtl::OUString > aNewWords;
     bool bIsGrammarError = false;
     if( pSpellErrorDescription )
     {
         nAltLanguage    = SvxLocaleToLanguage( pSpellErrorDescription->aLocale );
-        //aAltWord       = String( xAlt->getWord() );
         aNewWords       = pSpellErrorDescription->aSuggestions;
         bIsGrammarError = pSpellErrorDescription->bIsGrammarError;
         aExplainPB.SetExplanation(pSpellErrorDescription->sExplanation );
@@ -350,7 +342,6 @@ void SpellDialog::UpdateBoxes_Impl()
         SetTitle_Impl( nAltLanguage );
     SetSelectedLang_Impl( nAltLanguage );
 
-
     // Alternativen eintragen
     const ::rtl::OUString *pNewWords = aNewWords.getConstArray();
     const sal_Int32 nSize = aNewWords.getLength();
@@ -366,7 +357,6 @@ void SpellDialog::UpdateBoxes_Impl()
     if(!nSize)
         aSuggestionLB.InsertEntry( aNoSuggestionsST );
     aAutoCorrPB.Enable( nSize > 0 );
-    //aSentenceED.GrabFocus();
 
     aSuggestionFT.Enable(nSize > 0);
     aSuggestionLB.Enable(nSize > 0);
@@ -417,7 +407,6 @@ void SpellDialog::SpellContinue_Impl(bool bUseSavedSentence, bool bIgnoreCurrent
             }
             while(aControls[++nIdx]);
 
-
         }
         if( bNextSentence )
         {
@@ -427,10 +416,9 @@ void SpellDialog::SpellContinue_Impl(bool bUseSavedSentence, bool bIgnoreCurrent
         }
     }
 }
-/* -----------------10.09.2003 14:04-----------------
-    Initialize, asynchronous to prevent virtial calls
-    from a constructor
- --------------------------------------------------*/
+/* Initialize, asynchronous to prevent virtial calls
+   from a constructor
+ */
 IMPL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog *, EMPTYARG )
 {
     pThis->SetUpdateMode( sal_False );
@@ -486,7 +474,6 @@ IMPL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog *, EMPTYARG )
                     aVendorSize.Width() = aImageSize.Width();
                 pThis->aVendorImageFI.SetSizePixel( aVendorSize );
             }
-            //aVendorSize.Height() = nDiff;
             sal_Int32 nDiff = aVendorSize.Height();
             pThis->aVendorImageFI.SetSizePixel(aVendorSize);
             Control* aControls[] = {
@@ -634,7 +621,6 @@ IMPL_LINK( SpellDialog, ChangeHdl, Button *, EMPTYARG )
     return 1;
 }
 
-
 // -----------------------------------------------------------------------
 
 IMPL_LINK( SpellDialog, ChangeAllHdl, Button *, EMPTYARG )
@@ -717,9 +703,8 @@ IMPL_LINK( SpellDialog, IgnoreAllHdl, Button *, pButton )
     aSentenceED.UndoActionEnd( SPELLUNDO_CHANGE_GROUP );
     return 1;
 }
-/*-- 06.11.2003 11:24:08---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 IMPL_LINK( SpellDialog, UndoHdl, Button*, EMPTYARG )
 {
     aSentenceED.Undo();
@@ -727,9 +712,8 @@ IMPL_LINK( SpellDialog, UndoHdl, Button*, EMPTYARG )
         aUndoPB.Enable(FALSE);
     return 0;
 }
-/*-- 06.11.2003 12:19:15---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 IMPL_LINK( SpellDialog, DialogUndoHdl, SpellUndoAction_Impl*, pAction )
 {
     switch(pAction->GetId())
@@ -806,7 +790,6 @@ IMPL_LINK( SpellDialog, IgnoreHdl, Button *, EMPTYARG )
     return 1;
 }
 
-
 // -----------------------------------------------------------------------
 
 sal_Bool SpellDialog::Close()
@@ -830,9 +813,8 @@ LanguageType SpellDialog::GetSelectedLang_Impl() const
     INT16 nLang = aLanguageLB.GetSelectLanguage();
     return nLang;
 }
-/* -----------------28.10.2003 14:27-----------------
 
- --------------------------------------------------*/
+//-------------------------------------------------
 IMPL_LINK(SpellDialog, LanguageSelectHdl, SvxLanguageBox*, pBox)
 {
     //if currently an error is selected then search for alternatives for
@@ -873,9 +855,7 @@ void SpellDialog::SetLanguage( sal_uInt16 nLang )
     // den richtigen Eintrag finden, da sortiert
     aLanguageLB.SelectLanguage( nLang );
 }
-/*-- 16.06.2008 11:27:02---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 static Image lcl_GetImageFromPngUrl( const ::rtl::OUString &rFileUrl )
 {
     Image aRes;
@@ -898,9 +878,8 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang)
         const SpellErrorDescription* pSpellErrorDescription = aSentenceED.GetAlternatives();
         if( pSpellErrorDescription && pSpellErrorDescription->sServiceName.getLength() )
         {
-            bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
             ::rtl::OUString sSuggestionImageUrl =
-                SvtLinguConfig().GetSpellAndGrammarDialogImage( pSpellErrorDescription->sServiceName, bHighContrast );
+                SvtLinguConfig().GetSpellAndGrammarDialogImage( pSpellErrorDescription->sServiceName );
             aVendorImageFI.SetImage( lcl_GetImageFromPngUrl( sSuggestionImageUrl ) );
             uno::Reference< lang::XServiceDisplayName > xDisplayName( pSpellErrorDescription->xGrammarChecker, uno::UNO_QUERY );
             if( xDisplayName.is() )
@@ -908,8 +887,7 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang)
         }
         else
         {
-            bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-            aVendorImageFI.SetImage( bHighContrast ? aVendorImageHC : aVendorImage );
+            aVendorImageFI.SetImage( aVendorImage );
         }
 
         if( sVendor.Len() )
@@ -919,7 +897,6 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang)
         }
         else
         {
-            //bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
             sTitle = m_sTitleSpellingGrammar;
         }
     }
@@ -995,9 +972,8 @@ void SpellDialog::InitUserDicts()
         }
     }
 }
-/*-- 20.10.2003 15:31:06---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 IMPL_LINK(SpellDialog, AddToDictionaryHdl, MenuButton*, pButton )
 {
     aSentenceED.UndoActionStart( SPELLUNDO_CHANGE_GROUP );
@@ -1041,9 +1017,8 @@ IMPL_LINK(SpellDialog, AddToDictionaryHdl, MenuButton*, pButton )
     aSentenceED.UndoActionEnd( SPELLUNDO_CHANGE_GROUP );
     return 0;
 }
-/*-------------------------------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 IMPL_LINK(SpellDialog, ModifyHdl, SentenceEditWindow_Impl*, pEd)
 {
     if (&aSentenceED == pEd)
@@ -1068,9 +1043,8 @@ IMPL_LINK(SpellDialog, ModifyHdl, SentenceEditWindow_Impl*, pEd)
     }
     return 0;
 };
-/*-------------------------------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 IMPL_LINK(SpellDialog, CancelHdl, Button *, EMPTYARG )
 {
     //apply changes and ignored text parts first - if there are any
@@ -1078,9 +1052,8 @@ IMPL_LINK(SpellDialog, CancelHdl, Button *, EMPTYARG )
     Close();
     return 0;
 }
-/*-------------------------------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 void SpellDialog::Paint( const Rectangle& rRect )
 {
     ModelessDialog::Paint(rRect );
@@ -1088,9 +1061,8 @@ void SpellDialog::Paint( const Rectangle& rRect )
     DecorationView aDecoView( this );
     aDecoView.DrawButton( aRect, BUTTON_DRAW_NOFILL);
 }
-/*-- 28.10.2003 13:26:39---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 long SpellDialog::Notify( NotifyEvent& rNEvt )
 {
     /* #i38338#
@@ -1117,9 +1089,8 @@ long SpellDialog::Notify( NotifyEvent& rNEvt )
     }
     return SfxModelessDialog::Notify(rNEvt);
 }
-/* -----------------10.09.2003 08:26-----------------
 
- --------------------------------------------------*/
+//-------------------------------------------------
 void SpellDialog::InvalidateDialog()
 {
     if( bFocusLocked )
@@ -1151,13 +1122,11 @@ void SpellDialog::InvalidateDialog()
     SfxModelessDialog::Deactivate();
 }
 
-/*-- 10.09.2003 08:35:56---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck)
 {
     bool bRet = false;
-    if(!bUseSavedSentence /*&& aSentenceED.IsModified()*/)
+    if(!bUseSavedSentence)
     {
         //apply changes and ignored text parts
         rParent.ApplyChangedSentence(aSentenceED.CreateSpellPortions(true), bRecheck);
@@ -1244,7 +1213,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck)
     }
     return bRet;
 }
-/*-- 12.11.2003 15:21:25---------------------------------------------------
+/*-------------------------------------------------------------------------
     replace errrors that have a replacement in the ChangeAllList
     returns false if the result doesn't contain errors after the replacement
   -----------------------------------------------------------------------*/
@@ -1277,9 +1246,8 @@ bool SpellDialog::ApplyChangeAllList_Impl(SpellPortions& rSentence, bool &bHasRe
     }
     return bRet;
 }
-/*-- 10.09.2003 10:40:21---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 SentenceEditWindow_Impl::SentenceEditWindow_Impl( SpellDialog* pParent, const ResId& rResId ) :
     MultiLineEdit( pParent, rResId ),
     m_nErrorStart(0),
@@ -1288,13 +1256,12 @@ SentenceEditWindow_Impl::SentenceEditWindow_Impl( SpellDialog* pParent, const Re
 {
     DisableSelectionOnFocus();
 }
-/*-- 10.09.2003 10:40:11---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 SentenceEditWindow_Impl::~SentenceEditWindow_Impl()
 {
 }
-/*-- 20.10.2003 13:42:34---------------------------------------------------
+/*-------------------------------------------------------------------------
     The selection before inputting a key may have a range or not
     and it may be inside or outside of field or error attributes.
     A range may include the attribute partially, completely or together
@@ -1386,7 +1353,6 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
             bool bHasError = false;
             bool bHasFieldLeft = false;
             bool bHasErrorLeft = false;
-//            bool bInsideAttr = false;
 
             bool bHasRange = rCurrentSelection.HasRange();
             sal_uInt8 nSelectionType = 0; // invalid type!
@@ -1466,7 +1432,6 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
                     pErrorAttrLeft = pTextEngine->FindCharAttrib( aCursor, TEXTATTR_SPELL_ERROR );
                     bHasFieldLeft = pBackAttrLeft !=0;
                     bHasErrorLeft = pErrorAttrLeft != 0;
-//                    bInsideAttr = (bHasField || bHasError) && (bHasFieldLeft || bHasErrorLeft);
                     ++aCursor.GetIndex();
                 }
             }
@@ -1481,9 +1446,6 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
             bool bBackspace = rKeyCode.GetCode() == KEY_BACKSPACE;
 
             sal_Int8 nAction = ACTION_CONTINUE;
-//            nAction = ACTION_UNDOEDIT
-//            nAction = ACTION_SELECTFIELD
-//            nAction = ACTION_EXPAND
             switch(nSelectionType)
             {
 //    1 - backspace                   delete                      any other
@@ -1637,9 +1599,8 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
     long nRet = bChange ? 1 : MultiLineEdit::PreNotify(rNEvt);
     return nRet;
 }
-/*-- 10.09.2003 13:38:14---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError )
 {
     if (bIgnoreCurrentError)
@@ -1675,7 +1636,6 @@ bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError )
         Reference<XDictionary> xChangeAll( SvxGetChangeAllList(), UNO_QUERY );
         Reference<XDictionaryEntry> xEntry;
 
-//        Reference <XSpellAlternatives> xAlternatives;
         const SpellErrorDescription* pSpellErrorDescription = 0;
         if(pNextError)
         {
@@ -1725,9 +1685,7 @@ bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError )
     return bRet;
 }
 
-/*-- 06.11.2003 13:30:26---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 void SentenceEditWindow_Impl::MoveErrorMarkTo(USHORT nStart, USHORT nEnd, bool bGrammarError)
 {
     TextEngine* pTextEngine = GetTextEngine();
@@ -1739,9 +1697,7 @@ void SentenceEditWindow_Impl::MoveErrorMarkTo(USHORT nStart, USHORT nEnd, bool b
     m_nErrorEnd = nEnd;
 }
 
-/*-- 17.09.2003 10:13:08---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 void SentenceEditWindow_Impl::ChangeMarkedWord(const String& rNewWord, LanguageType eLanguage)
 {
     //calculate length changes
@@ -1752,7 +1708,6 @@ void SentenceEditWindow_Impl::ChangeMarkedWord(const String& rNewWord, LanguageT
     pTextEngine->UndoActionStart( TEXTUNDO_INSERT );
     const TextCharAttrib*  pErrorAttrib = pTextEngine->FindCharAttrib( TextPaM(0, m_nErrorStart), TEXTATTR_SPELL_ERROR );
     DBG_ASSERT(pErrorAttrib, "no error attribute found");
-//  Reference <XSpellAlternatives> xAlternatives;
     const SpellErrorDescription* pSpellErrorDescription = 0;
     if(pErrorAttrib)
     {
@@ -1761,7 +1716,7 @@ void SentenceEditWindow_Impl::ChangeMarkedWord(const String& rNewWord, LanguageT
     }
     const TextCharAttrib*  pBackAttrib = pTextEngine->FindCharAttrib( TextPaM(0, m_nErrorStart), TEXTATTR_SPELL_BACKGROUND );
     pTextEngine->ReplaceText( aSel, rNewWord );
-    //
+
     if(!m_nErrorStart)
     {
         //attributes following an error at the start of the text are not moved but expanded from the
@@ -1804,16 +1759,14 @@ void SentenceEditWindow_Impl::ChangeMarkedWord(const String& rNewWord, LanguageT
     SetAttrib( SpellLanguageAttrib(eLanguage), 0, m_nErrorStart, m_nErrorEnd );
     pTextEngine->UndoActionEnd( TEXTUNDO_INSERT );
 }
-/* -----------------08.10.2003 13:18-----------------
 
- --------------------------------------------------*/
+//-------------------------------------------------
 String SentenceEditWindow_Impl::GetErrorText() const
 {
     return GetTextEngine()->GetText(TextSelection(TextPaM(0, m_nErrorStart), TextPaM(0, m_nErrorEnd) ));
 }
-/*-- 26.06.2008 10:54:13---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 const SpellErrorDescription* SentenceEditWindow_Impl::GetAlternatives()
 {
     TextPaM aCursor(0, m_nErrorStart);
@@ -1821,9 +1774,8 @@ const SpellErrorDescription* SentenceEditWindow_Impl::GetAlternatives()
             GetTextEngine()->FindAttrib( aCursor, TEXTATTR_SPELL_ERROR));
     return pAttrib ? &pAttrib->GetErrorDescription() : 0;
 }
-/*-- 06.09.2004 10:50:32---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 void SentenceEditWindow_Impl::RestoreCurrentError()
 {
     TextPaM aCursor(0, m_nErrorStart);
@@ -1836,9 +1788,8 @@ void SentenceEditWindow_Impl::RestoreCurrentError()
             ChangeMarkedWord(rDesc.sErrorText, SvxLocaleToLanguage( rDesc.aLocale ));
     }
 }
-/*-- 28.10.2003 14:44:10---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 void SentenceEditWindow_Impl::SetAlternatives( Reference< XSpellAlternatives> xAlt )
 {
     TextPaM aCursor(0, m_nErrorStart);
@@ -1862,25 +1813,20 @@ void SentenceEditWindow_Impl::SetAlternatives( Reference< XSpellAlternatives> xA
     GetTextEngine()->SetAttrib( SpellErrorAttrib(aDesc), 0, m_nErrorStart, m_nErrorEnd );
 }
 
-/*-- 10.09.2003 14:43:02---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 void SentenceEditWindow_Impl::SetAttrib( const TextAttrib& rAttr, ULONG nPara, USHORT nStart, USHORT nEnd )
 {
     GetTextEngine()->SetAttrib(rAttr, nPara, nStart, nEnd);
 }
-/*-- 10.09.2003 14:43:02---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 void SentenceEditWindow_Impl::SetText( const String& rStr )
 {
     m_nErrorStart = m_nErrorEnd = 0;
     GetTextEngine()->SetText(rStr);
-//    InitScrollBars();
 }
-/*-- 08.10.2003 14:35:52---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 struct LanguagePosition_Impl
 {
     USHORT          nPosition;
@@ -1917,7 +1863,7 @@ void lcl_InsertBreakPosition_Impl(
     }
     rBreakPositions.push_back(LanguagePosition_Impl(nInsert, eLanguage));
 }
-/*-- 17.09.2003 14:26:59---------------------------------------------------
+/*-------------------------------------------------------------------------
     Returns the text in spell portions. Each portion contains text with an
     equal language and attribute. The spell alternatives are empty.
   -----------------------------------------------------------------------*/
@@ -1954,7 +1900,7 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions( bool bSetIgnore
             }
             aCursor.GetIndex()++;
         }
-        //
+
         if(nTextLen && aBreakPositions.empty())
         {
             //if all content has been overwritten the attributes may have been removed, too
@@ -1982,7 +1928,7 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions( bool bSetIgnore
                 aPortion1.sText = pTextEngine->GetText(
                             TextSelection(TextPaM(0, nStart), TextPaM(0, aStart->nPosition)));
                 bool bIsIgnoreError = m_aIgnoreErrorsAt.find( nStart ) != m_aIgnoreErrorsAt.end();
-                if( bSetIgnoreFlag && bIsIgnoreError /*m_nErrorStart == nStart*/ )
+                if( bSetIgnoreFlag && bIsIgnoreError )
                 {
                     aPortion1.bIgnoreThisError = true;
                 }
@@ -2021,9 +1967,7 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions( bool bSetIgnore
     return aRet;
 }
 
-/*-- 06.11.2003 11:30:10---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 void SentenceEditWindow_Impl::Undo()
 {
     SfxUndoManager& rUndoMgr = GetTextEngine()->GetUndoManager();
@@ -2042,47 +1986,40 @@ void SentenceEditWindow_Impl::Undo()
     if(bSaveUndoEdit || SPELLUNDO_CHANGE_GROUP == nId)
         GetSpellDialog()->UpdateBoxes_Impl();
 }
-/*-- 06.11.2003 11:30:10---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 void SentenceEditWindow_Impl::ResetUndo()
 {
     GetTextEngine()->ResetUndo();
 }
-/*-- 06.11.2003 12:30:41---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 void SentenceEditWindow_Impl::AddUndoAction( SfxUndoAction *pAction, BOOL bTryMerg )
 {
     SfxUndoManager& rUndoMgr = GetTextEngine()->GetUndoManager();
     rUndoMgr.AddUndoAction(pAction, bTryMerg);
     GetSpellDialog()->aUndoPB.Enable();
 }
-/*-- 06.11.2003 12:38:44---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 USHORT SentenceEditWindow_Impl::GetUndoActionCount()
 {
     return GetTextEngine()->GetUndoManager().GetUndoActionCount();
 }
 
-/*-- 12.11.2003 12:12:38---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 void SentenceEditWindow_Impl::UndoActionStart( USHORT nId )
 {
     GetTextEngine()->UndoActionStart(nId);
 }
-/*-- 12.11.2003 12:12:38---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 void SentenceEditWindow_Impl::UndoActionEnd( USHORT nId )
 {
     GetTextEngine()->UndoActionEnd(nId);
 }
-/*-- 12.11.2003 12:12:38---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 void SentenceEditWindow_Impl::MoveErrorEnd(long nOffset)
 {
     if(nOffset > 0)
@@ -2090,9 +2027,8 @@ void SentenceEditWindow_Impl::MoveErrorEnd(long nOffset)
     else
         m_nErrorEnd = m_nErrorEnd -(USHORT)- nOffset;
 }
-/*-- 13.11.2003 15:15:19---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 void  SentenceEditWindow_Impl::SetUndoEditMode(bool bSet)
 {
     DBG_ASSERT(!bSet || m_bIsUndoEditMode != bSet, "SetUndoEditMode with equal values?");
@@ -2133,15 +2069,12 @@ void  SentenceEditWindow_Impl::SetUndoEditMode(bool bSet)
     pSpellDialog->aChangePB.Enable();
 }
 
-/*-- 30.06.2008 14:15:19---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 ExplainButton::~ExplainButton()
 {
 }
-/*-- 30.06.2008 14:15:19---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
+//-----------------------------------------------------------------------
 void ExplainButton::RequestHelp( const HelpEvent& )
 {
     Help::ShowBalloon( this, GetPosPixel(), m_sExplanation );
diff --git a/cui/source/dialogs/SpellDialog.hrc b/cui/source/dialogs/SpellDialog.hrc
index 5c9a82ffef0e..d51ec1e82249 100644
--- a/cui/source/dialogs/SpellDialog.hrc
+++ b/cui/source/dialogs/SpellDialog.hrc
@@ -51,5 +51,4 @@
 #define PB_EXPLAIN                  55
 #define IMG_VENDOR                  56
 #define IMG_DEFAULT_VENDOR          57
-#define IMG_DEFAULT_VENDOR_HC       58
 #define PB_IGNORERULE               59
diff --git a/cui/source/dialogs/SpellDialog.src b/cui/source/dialogs/SpellDialog.src
index 5a97025f02af..cc14ba6a9f4b 100644
--- a/cui/source/dialogs/SpellDialog.src
+++ b/cui/source/dialogs/SpellDialog.src
@@ -214,29 +214,5 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
     {
         ImageBitmap = Bitmap { File = "vendor01.png"; };
     };
-    Image IMG_DEFAULT_VENDOR_HC
-    {
-        ImageBitmap = Bitmap { File = "vendor01h.png"; };
-    };
-
 };
  // ********************************************************************** EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cui/source/dialogs/charmap.src b/cui/source/dialogs/charmap.src
index 02e2e728f412..8dc5b3a3f857 100644
--- a/cui/source/dialogs/charmap.src
+++ b/cui/source/dialogs/charmap.src
@@ -38,7 +38,6 @@ ModalDialog RID_SVXDLG_CHARMAP
     HelpId = SID_CHARMAP ;
     SvLook = TRUE ;
     Text [ en-US ] = "Special Characters";
-/*  Size = MAP_APPFONT ( 297 , 169 ) ; */
     Size = MAP_APPFONT ( 297 , 153 ) ;
     OutputSize = TRUE ;
     Moveable = TRUE ;
@@ -92,7 +91,6 @@ ModalDialog RID_SVXDLG_CHARMAP
     {
         HelpId = HID_CHARMAP_CTL_SHOWTEXT ;
         Pos = MAP_APPFONT ( 46 , 137 ) ;
-/*      Size = MAP_APPFONT ( 190 , 16 ) ; */
         Size = MAP_APPFONT ( 244 , 16 ) ;
         Group = TRUE ;
     };
@@ -134,26 +132,6 @@ ModalDialog RID_SVXDLG_CHARMAP
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Delete";
     };
-/*
-    PushButton BT_ASSIGN
-    {
-        Pos = MAP_APPFONT ( 242 , 140 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~Assign shortcut...";
-    };
-    FixedText FT_ASSIGN
-    {
-        Pos = MAP_APPFONT ( 6 , 156 ) ;
-        Size = MAP_APPFONT ( 100 , 8 ) ;
-        Left = TRUE ;
-        Text [ en-US ] = "Shortcut key: ";
-    };
-    Control CT_ASSIGN
-    {
-        Pos = MAP_APPFONT ( 60 , 156 ) ;
-        Size = MAP_APPFONT ( 160 , 8 ) ;
-    };
-*/
 };
 
 // ********************************************************************** EOF
diff --git a/cui/source/dialogs/commonlingui.src b/cui/source/dialogs/commonlingui.src
index 60a1eff0e14f..639c5ef755ef 100644
--- a/cui/source/dialogs/commonlingui.src
+++ b/cui/source/dialogs/commonlingui.src
@@ -134,20 +134,3 @@ Window RID_SVX_WND_COMMON_LINGU
         Text [ en-US ] = "~Close" ;
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 6348b73d4e14..771686f970d6 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -264,12 +264,10 @@ SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, BOOL bOne_, ResMgr* pRe
 :   mpDialog( pDialog ),
     aShowSet        ( pDialog, ResId( CT_SHOWSET, *pResContext ) ),
     aShowText       ( pDialog, ResId( CT_SHOWTEXT, *pResContext ) ),
-//    aShowShortcut   ( pDialog, ResId( CT_ASSIGN, *pResContext ) ),
     aOKBtn          ( pDialog, ResId( BTN_CHAR_OK, *pResContext ) ),
     aCancelBtn      ( pDialog, ResId( BTN_CHAR_CANCEL, *pResContext ) ),
     aHelpBtn        ( pDialog, ResId( BTN_CHAR_HELP, *pResContext ) ),
     aDeleteBtn      ( pDialog, ResId( BTN_DELETE, *pResContext ) ),
-//    aAssignBtn      ( pDialog, ResId( BT_ASSIGN, *pResContext ) ),
     aFontText       ( pDialog, ResId( FT_FONT, *pResContext ) ),
     aFontLB         ( pDialog, ResId( LB_FONT, *pResContext ) ),
     aSubsetText     ( pDialog, ResId( FT_SUBSET, *pResContext ) ),
@@ -277,7 +275,6 @@ SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, BOOL bOne_, ResMgr* pRe
     aSymbolText     ( pDialog, ResId( FT_SYMBOLE, *pResContext ) ),
     aShowChar       ( pDialog, ResId( CT_SHOWCHAR, *pResContext ), TRUE ),
     aCharCodeText   ( pDialog, ResId( FT_CHARCODE, *pResContext ) ),
-//    aAssignText     ( pDialog, ResId( FT_ASSIGN, *pResContext ) ),
     bOne( bOne_ ),
     pSubsetMap( NULL )
 {
@@ -342,7 +339,6 @@ SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, BOOL bOne_, ResMgr* pRe
     aShowSet.SetHighlightHdl( LINK( this, SvxCharMapData, CharHighlightHdl ) );
     aShowSet.SetPreSelectHdl( LINK( this, SvxCharMapData, CharPreSelectHdl ) );
     aDeleteBtn.SetClickHdl( LINK( this, SvxCharMapData, DeleteHdl ) );
-//    aAssignBtn.SetClickHdl( LINK( this, SvxCharMapData, AssignHdl ) );
 
     if( SvxShowCharSet::getSelectedChar() == ' ')
         aOKBtn.Disable();
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 7cf48b0c1821..d8723d468a4d 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -85,7 +85,6 @@ void FmSearchDialog::initCommon( const Reference< XResultSet >& _rxCursor )
         m_aHalfFullFormsCJK.Hide();
 
         // never ignore the width (ignoring is expensive) if the option is not available at all
-        // 04.12.2001 - 91973 - fs@openoffice.org
         m_pSearchEngine->SetIgnoreWidthCJK( sal_False );
     }
 
@@ -630,7 +629,6 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable)
     if ( !bEnable )
     {
         // if one of my children has the focus, remember it
-        // 104332 - 2002-10-17 - fs@openoffice.org
         Window* pFocusWindow = Application::GetFocusWindow( );
         if ( pFocusWindow && IsChild( pFocusWindow ) )
             m_pPreSearchFocus = pFocusWindow;
@@ -665,7 +663,6 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable)
         {   // this means we're preparing for starting a search
             // In this case, EnableSearchForDependees disabled the search button
             // But as we're about to use it for cancelling the search, we really need to enable it, again
-            // 07.12.2001 - 95246 - fs@openoffice.org
             m_pbSearchAgain.Enable( sal_True );
         }
     }
@@ -678,7 +675,6 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable)
 
     if ( bEnable )
     {   // restore focus
-        // 104332 - 2002-10-17 - fs@openoffice.org
         if ( m_pPreSearchFocus )
         {
             m_pPreSearchFocus->GrabFocus();
@@ -809,7 +805,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress)
                 : RID_SVXERR_SEARCH_NORECORD;
             ErrorBox(this, CUI_RES(nErrorId)).Execute();
         }
-            // KEIN break !
+            // NO break !
         case FmSearchProgress::STATE_CANCELED:
             EnableSearchUI(sal_True);
             if (m_lnkCanceledNotFoundHdl.IsSet())
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 26c13ee9fbfa..43f0f5dc5845 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -149,8 +149,8 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL,
         Content aCnt( rStartURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv );
         Sequence< OUString > aProps( 2 );
 
-        aProps.getArray()[ 0 ] = OUString::createFromAscii( "IsFolder" );
-        aProps.getArray()[ 1 ] = OUString::createFromAscii( "IsDocument" );
+        aProps.getArray()[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ));
+        aProps.getArray()[ 1 ] = OUString(RTL_CONSTASCII_USTRINGPARAM( "IsDocument" ));
         ::com::sun::star::uno::Reference< XResultSet > xResultSet(
             aCnt.createCursor( aProps, INCLUDE_FOLDERS_AND_DOCUMENTS ) );
 
@@ -1033,11 +1033,10 @@ IMPL_LINK( TPGalleryThemeProperties, ClickSearchHdl, void *, EMPTYARG )
             if( xMgr.is() )
             {
                 xFolderPicker = ::com::sun::star::uno::Reference< XFolderPicker >(
-                    xMgr->createInstance( OUString::createFromAscii( "com.sun.star.ui.dialogs.FolderPicker" )), UNO_QUERY );
+                    xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FolderPicker" ))), UNO_QUERY );
 
                 if ( xFolderPicker.is() )
                 {
-//                  svt::SetDialogHelpId( xFolderPicker, HID_GALLERY_NEWTHEME_FINDFILES );
                     String  aDlgPathName( SvtPathOptions().GetGraphicPath() );
                     xFolderPicker->setDisplayDirectory(aDlgPathName);
 
@@ -1148,7 +1147,6 @@ IMPL_LINK( TPGalleryThemeProperties, ClickTakeHdl, void*, EMPTYARG )
         if( !aLbxFound.GetSelectEntryCount() || !bEntriesFound )
         {
             SvxOpenGraphicDialog aDlg(String( RTL_CONSTASCII_USTRINGPARAM( "Gallery" ) ) );
-//          aDlg.SetDialogHelpId( HID_GALLERY_NEWTHEME_ADDFILES );
             aDlg.EnableLink(sal_False);
             aDlg.AsLink(sal_False);
 
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index ba85929192f4..eb80960da935 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -112,29 +112,24 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings)
     mbGrabFocus = sal_True;
     // insert pages
     Image aImage;
-    Image aImageHC;
     String aStrTitle;
     SvxIconChoiceCtrlEntry* pEntry = NULL;
 
     aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLINETTP );
     aImage = Image( CUI_RES ( RID_SVXBMP_HLINETTP ) );
-    aImageHC = Image( CUI_RES ( RID_SVXBMP_HLINETTP_H ) );
-    pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_INTERNET, aStrTitle, aImage, aImageHC, SvxHyperlinkInternetTp::Create );
+    pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_INTERNET, aStrTitle, aImage, SvxHyperlinkInternetTp::Create );
     pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLINETTP_HELP ) );
     aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLMAILTP );
     aImage = Image( CUI_RES ( RID_SVXBMP_HLMAILTP ) );
-    aImageHC = Image( CUI_RES ( RID_SVXBMP_HLMAILTP_H ) );
-    pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_MAIL, aStrTitle, aImage, aImageHC, SvxHyperlinkMailTp::Create );
+    pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_MAIL, aStrTitle, aImage, SvxHyperlinkMailTp::Create );
     pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLMAILTP_HELP ) );
     aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCTP );
     aImage = Image( CUI_RES ( RID_SVXBMP_HLDOCTP ) );
-    aImageHC = Image( CUI_RES ( RID_SVXBMP_HLDOCTP_H ) );
-    pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_DOCUMENT, aStrTitle, aImage, aImageHC, SvxHyperlinkDocTp::Create );
+    pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_DOCUMENT, aStrTitle, aImage, SvxHyperlinkDocTp::Create );
     pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCTP_HELP ) );
     aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP );
     aImage = Image( CUI_RES ( RID_SVXBMP_HLDOCNTP ) );
-    aImageHC = Image( CUI_RES ( RID_SVXBMP_HLDOCNTP_H ) );
-    pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT, aStrTitle, aImage, aImageHC, SvxHyperlinkNewDocTp::Create );
+    pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT, aStrTitle, aImage, SvxHyperlinkNewDocTp::Create );
     pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) );
 
     // all tab pages set -> create mnemonics
@@ -238,26 +233,6 @@ void SvxHpLinkDlg::Move()
     Window::Move();
 }
 
-/*long SvxHpLinkDlg::PreNotify( NotifyEvent& rNEvt )
-{
-    long nRet = 0;
-
-    if( rNEvt.GetType() == EVENT_KEYINPUT )
-    {
-        DBG_ASSERT( rNEvt.GetKeyEvent(), "-SvxHpLinkDlg::PreNotify(): no KeyEvent for key event?!" );
-
-        const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
-
-        if( KEY_MOD2 == pKEvt->GetKeyCode().GetModifier() && pKEvt->GetCharCode() && HandleShortCutKey( *pKEvt ) )
-            nRet = 1;
-    }
-
-    if( !nRet )
-        nRet = IconChoiceDialog::PreNotify( rNEvt );
-
-    return nRet;
-}*/
-
 /*************************************************************************
 |*
 |* Click on Apply-button
diff --git a/cui/source/dialogs/dlgname.src b/cui/source/dialogs/dlgname.src
index e3e961880dfc..1d72e877f230 100644
--- a/cui/source/dialogs/dlgname.src
+++ b/cui/source/dialogs/dlgname.src
@@ -242,28 +242,3 @@ ModalDialog RID_SVXDLG_MESSBOX
     };
 };
  // ********************************************************************** EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cui/source/dialogs/grfflt.src b/cui/source/dialogs/grfflt.src
index fc1921b47cce..76cf9ecc6f74 100644
--- a/cui/source/dialogs/grfflt.src
+++ b/cui/source/dialogs/grfflt.src
@@ -420,35 +420,3 @@ ModalDialog RID_SVX_GRFFILTER_DLG_EMBOSS
         TabStop = TRUE ;
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index cb986f6dd1dd..bc16fa576d04 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -370,7 +370,7 @@ namespace svx
         m_aValueSet.SetLineCount( LINE_CNT );
         m_aValueSet.SetStyle( m_aValueSet.GetStyle() | WB_ITEMBORDER | WB_FLATVALUESET | WB_VSCROLL );
         m_aValueSet.SetBorderStyle( WINDOW_BORDER_MONO );
-        String aOneCharacter(RTL_CONSTASCII_STRINGPARAM("AU"));
+        String aOneCharacter(RTL_CONSTASCII_USTRINGPARAM("AU"));
         long nItemWidth = 2*GetTextWidth( aOneCharacter );
         m_aValueSet.SetItemWidth( nItemWidth );
 
@@ -600,19 +600,15 @@ namespace svx
         m_pPlayground->SetButtonHandler( SvxCommonLinguisticControl::eOptions,
                                         LINK( this, HangulHanjaConversionDialog, OnOption ) );
         m_pPlayground->GetButton( SvxCommonLinguisticControl::eOptions )->Show();
-//      m_pPlayground->EnableButton( SvxCommonLinguisticControl::eOptions, true );
 
         if ( editeng::HangulHanjaConversion::eHangulToHanja == _ePrimaryDirection )
         {
-//          m_aHanjaOnly.Enable( sal_False );
             m_pIgnoreNonPrimary = &m_aHangulOnly;
         }
         else
         {
-//          m_aHangulOnly.Enable( sal_False );
             m_pIgnoreNonPrimary = &m_aHanjaOnly;
         }
-//        m_pIgnoreNonPrimary->Check();
 
         // initial focus
         FocusSuggestion( );
@@ -894,8 +890,6 @@ namespace svx
     //-------------------------------------------------------------------------
     sal_Bool HangulHanjaConversionDialog::GetUseBothDirections( ) const
     {
-//      DBG_ASSERT( m_pIgnoreNonPrimary, "HangulHanjaConversionDialog::GetUseBothDirections: where's the check box pointer?" );
-//      return m_pIgnoreNonPrimary ? !m_pIgnoreNonPrimary->IsChecked( ) : sal_True;
         return !m_aHangulOnly.IsChecked() && !m_aHanjaOnly.IsChecked();
     }
 
@@ -1173,7 +1167,6 @@ namespace svx
         m_aDictsLB.SetWindowBits( WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE );
         m_aDictsLB.SetSelectionMode( SINGLE_SELECTION );
         m_aDictsLB.SetHighlightRange();
-//      m_aDictsLB.SetHelpId( xxx );
         m_aDictsLB.SetSelectHdl( LINK( this, HangulHanjaOptionsDialog, DictsLB_SelectHdl ) );
         m_aDictsLB.SetDeselectHdl( LINK( this, HangulHanjaOptionsDialog, DictsLB_SelectHdl ) );
 
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index db9ab3647e41..22075863e2da 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -124,7 +124,6 @@ SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( Window *pParent, const SfxItemSet&
     maLbDocTypes    ( this, CUI_RES (LB_DOCUMENT_TYPES) )
 {
     // Set HC bitmaps and disable display of bitmap names.
-    maBtCreate.SetModeImage( Image( CUI_RES( IMG_CREATE_HC ) ), BMP_COLOR_HIGHCONTRAST );
     maBtCreate.EnableTextDisplay (FALSE);
 
     InitStdControls();
@@ -136,7 +135,6 @@ SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( Window *pParent, const SfxItemSet&
                                 LogicToPixel( Size ( 176 - COL_DIFF, 60), MAP_APPFONT ) );
     maCbbPath.Show();
     maCbbPath.SetBaseURL(SvtPathOptions().GetWorkPath());
-//  maCbbPath.SetHelpId( HID_HYPERDLG_DOC_PATH );
 
     // set defaults
     maRbtEditNow.Check();
@@ -391,7 +389,6 @@ void SvxHyperlinkNewDocTp::DoApply ()
                     SfxStringItem aReferer( SID_REFERER, UniString::CreateFromAscii(
                                                 RTL_CONSTASCII_STRINGPARAM( "private:user" ) ) );
                     SfxStringItem aFrame( SID_TARGETNAME, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "_blank" ) ) );
-                    //SfxBoolItem aFrame( SID_OPEN_NEW_VIEW, TRUE );
 
                     String aStrFlags ( sal_Unicode('S') );
                     if ( maRbtEditLater.IsChecked() )
@@ -413,7 +410,6 @@ void SvxHyperlinkNewDocTp::DoApply ()
                         pViewFrame = pItem->GetFrame();
                         if (pViewFrame)
                         {
-                            //SfxViewFrame *pViewFrame = pFrame->GetCurrentViewFrame();
                             SfxStringItem aNewName( SID_FILE_NAME, aURL.GetMainURL( INetURLObject::NO_DECODE ) );
 
                             pViewFrame->GetDispatcher()->Execute( SID_SAVEASDOC,
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index 095e959cdca6..b341cc3b3c40 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -64,10 +64,8 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( Window *pParent, const SfxItemSet& rItemS
     maBtBrowse      ( this, CUI_RES (BTN_BROWSE) ),
     mbMarkWndOpen   ( FALSE )
 {
-    // Set HC bitmaps and disable display of bitmap names.
-    maBtBrowse.SetModeImage( Image( CUI_RES( IMG_BROWSE_HC ) ), BMP_COLOR_HIGHCONTRAST );
+    // Disable display of bitmap names.
     maBtBrowse.EnableTextDisplay (FALSE);
-    maBtFileopen.SetModeImage( Image( CUI_RES( IMG_FILEOPEN_HC ) ), BMP_COLOR_HIGHCONTRAST );
     maBtFileopen.EnableTextDisplay (FALSE);
 
     InitStdControls();
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index f0d3cf1878e8..1d18e8f7020d 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -71,10 +71,8 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent,
     maBtTarget              ( this, CUI_RES (BTN_TARGET) ),
     mbMarkWndOpen           ( FALSE )
 {
-    // Set HC bitmaps and display display of bitmap names.
-    maBtBrowse.SetModeImage( Image( CUI_RES( IMG_BROWSE_HC ) ), BMP_COLOR_HIGHCONTRAST );
+    // Disable display of bitmap names.
     maBtBrowse.EnableTextDisplay (FALSE);
-    maBtTarget.SetModeImage( Image( CUI_RES( IMG_TARGET_HC ) ), BMP_COLOR_HIGHCONTRAST );
     maBtTarget.EnableTextDisplay (FALSE);
 
     InitStdControls();
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index b7d26c2cb378..5312ccbdc830 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -63,8 +63,7 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( Window *pParent, const SfxItemSet& rIte
     maFtSubject     ( this, CUI_RES (FT_SUBJECT) ),
     maEdSubject     ( this, CUI_RES (ED_SUBJECT) )
 {
-    // Set HC bitmaps and disable display of bitmap names.
-    maBtAdrBook.SetModeImage( Image( CUI_RES( IMG_ADRESSBOOK_HC ) ), BMP_COLOR_HIGHCONTRAST );
+    // Disable display of bitmap names.
     maBtAdrBook.EnableTextDisplay (FALSE);
 
     InitStdControls();
@@ -311,51 +310,6 @@ IMPL_LINK ( SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, void *, EMPTYARG )
     }
 
 
-/*  uno::Reference< frame::XDispatchProvider > xProv( pViewFrame->GetFrame().GetFrameInterface(), uno::UNO_QUERY );
-    if ( xProv.is() )
-    {
-!!! (pb) we need a new config item here
-        SfxAppIniManagerProperty aProp;
-        GetpApp()->Property( aProp );
-        if( !aProp.GetIniManager() )
-            return ( 0L );
-
-        String aAddressBook = aProp.GetIniManager()->Get( SFX_KEY_ADDRESSBOOK );
-        INetURLObject aObj;
-        aObj.SetSmartProtocol( INET_PROT_FILE );
-        aObj.SetURL( aAddressBook.GetToken( 0, sal_Unicode( ';' ) ) );
-
-        String aMark( RTL_CONSTASCII_USTRINGPARAM( "db:Table;" ) );
-        aMark += aAddressBook.GetToken( 1, sal_Unicode( ';' ) );
-        aObj.SetMark( aMark );
-
-        util::URL aURL;
-        aURL.Complete = ::rtl::OUString( aObj.GetMainURL( INetURLObject::NO_DECODE ) );
-
-        uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
-        if( xFactory.is() )
-        {
-            uno::Reference< util::XURLTransformer > xTrans( xFactory->createInstance
-                ( OUString::createFromAscii( "com.sun.star.util.URLTransformer" ) ),
-                                  uno::UNO_QUERY);
-            xTrans->parseStrict( aURL );
-
-            uno::Reference< frame::XDispatch > aDisp = xProv->queryDispatch( aURL,
-                                                        OUString::createFromAscii( "_beamer" ),
-                                                        frame::FrameSearchFlag::GLOBAL |
-                                                        frame::FrameSearchFlag::CREATE );
-            if ( aDisp.is() )
-            {
-                uno::Sequence< beans::PropertyValue > aArgs(1);
-                beans::PropertyValue* pArg = aArgs.getArray();
-                pArg[0].Name = DEFINE_CONST_UNICODE("Referer");
-                pArg[0].Value = uno::makeAny( OUString( DEFINE_CONST_UNICODE("private:user") ) );
-                aDisp->dispatch( aURL, aArgs );
-            }
-        }
-    }
-*/
-
     return( 0L );
 }
 
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 99b18e053783..670e743f091d 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -257,7 +257,7 @@ BOOL SvxHlinkDlgMarkWnd::RefreshFromDoc( OUString aURL )
     uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
     if( xFactory.is() )
     {
-        uno::Reference< frame::XDesktop > xDesktop( xFactory->createInstance( OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ),
+        uno::Reference< frame::XDesktop > xDesktop( xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" )) ),
                     uno::UNO_QUERY );
         if( xDesktop.is() )
         {
@@ -272,9 +272,9 @@ BOOL SvxHlinkDlgMarkWnd::RefreshFromDoc( OUString aURL )
                     try
                     {
                         uno::Sequence< beans::PropertyValue > aArg(1);
-                        aArg.getArray()[0].Name = OUString::createFromAscii( "Hidden" );
+                        aArg.getArray()[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( "Hidden" ));
                         aArg.getArray()[0].Value <<= (sal_Bool) TRUE;
-                        xComp = xLoader->loadComponentFromURL( aURL, OUString::createFromAscii( "_blank" ), 0, aArg );
+                        xComp = xLoader->loadComponentFromURL( aURL, OUString(RTL_CONSTASCII_USTRINGPARAM( "_blank" )), 0, aArg );
                     }
                     catch( const io::IOException& )
                     {
@@ -316,27 +316,6 @@ BOOL SvxHlinkDlgMarkWnd::RefreshFromDoc( OUString aURL )
     }
     return (mnError==0);
 }
-/*
-void SvxHlinkDlgMarkWnd::Error(int nNr)
-{
-    switch(nNr)
-    {
-        case 0:
-        {
-            Rectangle aDrawRect( Point( 0, 0 ), maLbTree.GetSizePixel() );
-            //maLbTree.SetTextColor( Color(COL_BLACK) );
-            //maLbTree.DrawText( aDrawRect, "Keine Ziele im Dokument vorhanden.", TEXT_DRAW_LEFT);// | TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK );
-            maLbTree.DrawText( Point(0,0), "Keine Ziele im Dokument vorhanden.");
-            maLbTree.DrawLine(aDrawRect.TopLeft(), aDrawRect.BottomRight() );
-        }
-        break;
-        case 1:
-            Rectangle aDrawRect( Point( 0, 0 ), maLbTree.GetSizePixel() );
-            maLbTree.DrawText( aDrawRect, "Das Dokument konnte nicht ge�ffnet werden.", TEXT_DRAW_LEFT | TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK );
-            break;
-    }
-}
-*/
 /*************************************************************************
 |*
 |* Fill Tree-Control
@@ -407,8 +386,6 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink
                                                         pParentEntry,
                                                         FALSE, LIST_APPEND,
                                                         (void*)pData );
-                        maLbTree.SetExpandedEntryBmp( pEntry, aBmp, BMP_COLOR_HIGHCONTRAST );
-                        maLbTree.SetCollapsedEntryBmp( pEntry, aBmp, BMP_COLOR_HIGHCONTRAST );
                         nEntries++;
                     }
                     else
diff --git a/cui/source/dialogs/hlmarkwn.hrc b/cui/source/dialogs/hlmarkwn.hrc
index 1ac36dafa099..f9d03f14e91c 100644
--- a/cui/source/dialogs/hlmarkwn.hrc
+++ b/cui/source/dialogs/hlmarkwn.hrc
@@ -29,6 +29,3 @@
 #define BT_CLOSE    2
 #define TLB_MARK    3
 
-//#define HYPERLINK_BMP_EXPAND      301
-//#define HYPERLINK_BMP_COLLAPSE    302
-
diff --git a/cui/source/dialogs/hlmarkwn.src b/cui/source/dialogs/hlmarkwn.src
index 396e8cd573e0..ac0bba11e346 100644
--- a/cui/source/dialogs/hlmarkwn.src
+++ b/cui/source/dialogs/hlmarkwn.src
@@ -76,20 +76,3 @@ String RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN
 {
     Text [ en-US ] = "Couldn't open the document." ;
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index cc09d911be0c..2181535ed18f 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -230,8 +230,6 @@ void SvxHyperlinkTabPageBase::InitStdControls ()
         mpBtScript    = new ImageButton         ( this, ResId (BTN_SCRIPT, *m_pResMgr) );
 
         mpBtScript->SetClickHdl ( LINK ( this, SvxHyperlinkTabPageBase, ClickScriptHdl_Impl ) );
-
-        mpBtScript->SetModeImage( Image( ResId( IMG_SCRIPT_HC, *m_pResMgr ) ), BMP_COLOR_HIGHCONTRAST );
         mpBtScript->EnableTextDisplay (FALSE);
     }
 
@@ -448,7 +446,6 @@ IMPL_LINK ( SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, void *, EMPTYARG )
                                               SID_ATTR_MACROITEM );
         pItemSet->Put ( aItem, SID_ATTR_MACROITEM );
 
-        // --> PB 2006-01-13 #123474#
         /*  disable HyperLinkDlg for input while the MacroAssignDlg is working
             because if no JAVA is installed an error box occurs and then it is possible
             to close the HyperLinkDlg before its child (MacroAssignDlg) -> GPF
@@ -472,7 +469,6 @@ IMPL_LINK ( SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, void *, EMPTYARG )
             pMacroPage->AddEvent( String( CUI_RESSTR(RID_SVXSTR_HYPDLG_MACROACT3) ),
                                   SFX_EVENT_MOUSEOUT_OBJECT);
 
-        // --> PB 2006-01-13 #123474#
         if ( bIsInputEnabled )
             GetParent()->EnableInput( TRUE );
         // <--
@@ -534,7 +530,7 @@ BOOL SvxHyperlinkTabPageBase::FileExists( const INetURLObject& rURL )
             Content     aCnt( rURL.GetMainURL( INetURLObject::NO_DECODE ), ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() );
             ::rtl::OUString aTitle;
 
-            aCnt.getPropertyValue( ::rtl::OUString::createFromAscii( "Title" ) ) >>= aTitle;
+            aCnt.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Title" ) ) ) >>= aTitle;
             bRet = ( aTitle.getLength() > 0 );
         }
         catch( ... )
diff --git a/cui/source/dialogs/hyperdlg.hrc b/cui/source/dialogs/hyperdlg.hrc
index 0228d65bf3d2..c838ffd9c20d 100644
--- a/cui/source/dialogs/hyperdlg.hrc
+++ b/cui/source/dialogs/hyperdlg.hrc
@@ -40,8 +40,6 @@
 #define CBX_ANONYMOUS               11
 #define BTN_BROWSE                  12
 #define BTN_TARGET                  13
-#define IMG_BROWSE_HC               14
-#define IMG_TARGET_HC               15
 
 /* Tabpage : Hyperlink - Mail & News */
 
@@ -53,7 +51,6 @@
 #define FT_SUBJECT                  6
 #define ED_SUBJECT                  7
 #define BTN_ADRESSBOOK              8
-#define IMG_ADRESSBOOK_HC           9
 
 /* Tabpage : Hyperlink - Document */
 
@@ -66,7 +63,6 @@
 #define ED_TARGET_DOC               7
 #define FT_URL                      8
 #define FT_FULL_URL                 9
-#define IMG_FILEOPEN_HC             10
 
 /* Tabpage : Hyperlink - New document */
 
@@ -78,7 +74,6 @@
 #define FT_DOCUMENT_TYPES           6
 #define LB_DOCUMENT_TYPES           7
 #define BTN_CREATE                  8
-#define IMG_CREATE_HC               9
 
 /* Tabpage-section : Hyperlink - more justifications */
 
@@ -92,9 +87,7 @@
 #define FT_TEXT                     37
 #define ED_TEXT                     38
 #define BTN_SCRIPT                  39
-#define IMG_SCRIPT_HC               40
 
 #define COL_OLD     54
 #define COL_2       63
 #define COL_DIFF    (COL_2 - COL_OLD)
-
diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src
index 4ed7d1419bba..734cc181f9b3 100644
--- a/cui/source/dialogs/hyperdlg.src
+++ b/cui/source/dialogs/hyperdlg.src
@@ -124,11 +124,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
             MASKCOLOR
         };
     };
-    Image IMG_BROWSE_HC
-    {
-        ImageBitmap = Bitmap { File = "browse_hc.bmp" ; };
-        MASKCOLOR
-    };
+
     ImageButton BTN_TARGET
     {
         Pos = MAP_APPFONT ( 235, 40+2 ) ;
@@ -143,11 +139,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
             MASKCOLOR
         };
     };
-    Image IMG_TARGET_HC
-    {
-        ImageBitmap = Bitmap { File = "target_hc.bmp" ; };
-        MASKCOLOR
-    };
+
     FixedLine GRP_MORE
     {
         Pos = MAP_APPFONT ( 6 , 92 ) ;
@@ -228,11 +220,6 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
         };
         Text [ en-US ] = "Events";
     };
-    Image IMG_SCRIPT_HC
-    {
-        ImageBitmap = Bitmap { File = "script_hc.bmp" ; };
-        MASKCOLOR
-    };
 };
 
 /*************************************************************************
@@ -301,11 +288,6 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL
         Text [ en-US ] = "Data Sources...";
         QuickHelpText [ en-US ] = "Data Sources..." ;
     };
-    Image IMG_ADRESSBOOK_HC
-    {
-        ImageBitmap = Bitmap { File = "adrbook_hc.bmp" ; };
-        MASKCOLOR
-    };
 
     FixedLine GRP_MORE
     {
@@ -386,11 +368,6 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL
         };
         Text [ en-US ] = "Events";
     };
-    Image IMG_SCRIPT_HC
-    {
-        ImageBitmap = Bitmap { File = "script_hc.bmp" ; };
-        MASKCOLOR
-    };
 };
 
 /*************************************************************************
@@ -433,12 +410,6 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
         };
         Text [ en-US ] = "Open File";
     };
-    Image IMG_FILEOPEN_HC
-    {
-        ImageBitmap = Bitmap { File = "fileopen_hc.bmp" ; };
-        MASKCOLOR
-    };
-
     FixedLine GRP_TARGET
     {
         Pos = MAP_APPFONT ( 6 , 38 ) ;
@@ -482,11 +453,6 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
         };
         Text [ en-US ] = "Target in Document";
     };
-    Image IMG_BROWSE_HC
-    {
-        ImageBitmap = Bitmap { File = "target_hc.bmp" ; };
-        MASKCOLOR
-    };
 
     FixedLine GRP_MORE
     {
@@ -567,11 +533,6 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
         };
         Text [ en-US ] = "Events";
     };
-    Image IMG_SCRIPT_HC
-    {
-        ImageBitmap = Bitmap { File = "script_hc.bmp" ; };
-        MASKCOLOR
-    };
 };
 
 /*************************************************************************
@@ -647,11 +608,6 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
         };
         Text [ en-US ] = "Select Path";
     };
-    Image IMG_CREATE_HC
-    {
-        ImageBitmap = Bitmap { File = "newdoc_hc.bmp" ; };
-        MASKCOLOR
-    };
 
     FixedLine GRP_MORE
     {
@@ -732,11 +688,6 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
         };
         Text [ en-US ] = "Events";
     };
-    Image IMG_SCRIPT_HC
-    {
-        ImageBitmap = Bitmap { File = "script_hc.bmp" ; };
-        MASKCOLOR
-    };
 };
 
 /*************************************************************************
@@ -860,109 +811,3 @@ Image RID_SVXBMP_HLDOCNTP
     ImageBitmap = Bitmap { File = "hldocntp.bmp" ; };
     MASKCOLOR
 };
-
-Image RID_SVXBMP_HLINETTP_H
-{
-    ImageBitmap = Bitmap { File = "hlinettp_h.bmp" ; };
-    MASKCOLOR
-};
-
-Image RID_SVXBMP_HLMAILTP_H
-{
-    ImageBitmap = Bitmap { File = "hlmailtp_h.bmp" ; };
-    MASKCOLOR
-};
-
-Image RID_SVXBMP_HLDOCTP_H
-{
-    ImageBitmap = Bitmap { File = "hldoctp_h.bmp" ; };
-    MASKCOLOR
-};
-
-Image RID_SVXBMP_HLDOCNTP_H
-{
-    ImageBitmap = Bitmap { File = "hldocntp_h.bmp" ; };
-    MASKCOLOR
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 7f9bede9aedc..be532c66f482 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -75,7 +75,6 @@ HyphenEdit_Impl::HyphenEdit_Impl( Window* pParent, const ResId& rResId ) :
 
 void HyphenEdit_Impl::KeyInput( const KeyEvent& rKEvt )
 {
-//  sal_uInt16 nMod  = rKEvt.GetKeyCode().GetModifier();
     sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode();
 
     switch ( nCode )
@@ -105,7 +104,6 @@ void HyphenEdit_Impl::KeyInput( const KeyEvent& rKEvt )
 struct SvxHyphenWordDialog_Impl
 {
     SvxHyphenWordDialog *       m_pDialog;
-//    Window *                    m_pParent;
 
     FixedText           aWordFT;
     HyphenEdit_Impl     aWordEdit;
@@ -514,7 +512,7 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, HyphenateAllHdl_Impl, Button *, EMPTYARG /*
         try
         {
             uno::Reference< beans::XPropertySet >  xProp( SvxGetLinguPropertySet() );
-            const rtl::OUString aName( rtl::OUString::createFromAscii( "IsHyphAuto" ) );
+            const rtl::OUString aName( RTL_CONSTASCII_USTRINGPARAM( "IsHyphAuto" ) );
             uno::Any aAny;
 
             aAny <<= sal_True;
diff --git a/cui/source/dialogs/hyphen.src b/cui/source/dialogs/hyphen.src
index f10e94626f31..5a727fb096df 100755
--- a/cui/source/dialogs/hyphen.src
+++ b/cui/source/dialogs/hyphen.src
@@ -122,5 +122,3 @@ ModalDialog RID_SVXDLG_HYPHENATE
         TABSTOP = TRUE ;
     };
 };
-
-
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 140338916149..03a1faa2383a 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -268,12 +268,12 @@ void IconChoicePage::DataChanged( const DataChangedEvent& rDCEvt )
 
 IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId,
                                      const EIconChoicePos ePos,
-                                     const SfxItemSet *pItemSet )//, BOOL bEditFmt, const String *pUserButtonText = 0 )
+                                     const SfxItemSet *pItemSet )
 :   ModalDialog         ( pParent, rResId ),
     meChoicePos     ( ePos ),
     maIconCtrl      ( this, WB_3DLOOK | WB_ICON | WB_BORDER |
                             WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME |
-                            /* WB_NOSELECTION | */ WB_NODRAGSELECTION | WB_TABSTOP ),
+                            WB_NODRAGSELECTION | WB_TABSTOP ),
     mnCurrentPageId ( USHRT_MAX ),
 
     aOKBtn          ( this, WB_DEFBUTTON ),
@@ -292,10 +292,8 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId,
     bModified       ( FALSE ),
     bItemsReset     ( FALSE )
 {
-    // IconChoiceCtrl-Settings
-    //maIconCtrl.SetBackground ( Wallpaper( Color (146, 146, 186) ) );
 
-    maIconCtrl.SetStyle (WB_3DLOOK | WB_ICON | WB_BORDER | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | /* WB_NOSELECTION | */ WB_NODRAGSELECTION | WB_TABSTOP | WB_CLIPCHILDREN );
+    maIconCtrl.SetStyle (WB_3DLOOK | WB_ICON | WB_BORDER | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | WB_NODRAGSELECTION | WB_TABSTOP | WB_CLIPCHILDREN );
     SetCtrlPos ( meChoicePos );
     maIconCtrl.SetClickHdl ( LINK ( this, IconChoiceDialog , ChosePageHdl_Impl ) );
     maIconCtrl.Show();
@@ -327,26 +325,6 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId,
 
 // -----------------------------------------------------------------------
 
-/*
-IconChoiceDialog ::IconChoiceDialog ( SfxViewFrame *pViewFrame, Window* pParent, const ResId &rResId,
-                   const SfxItemSet * = 0, BOOL bEditFmt = FALSE,
-                   const String *pUserButtonText = 0 )
-:   meChoicePos     ( PosLeft ),    // Default erst ma Links
-    maIconCtrl      ( this, Die_Winbits ),
-    aOKBtn          ( this ),
-    pUserBtn        ( pUserButtonText? new PushButton(this): 0 ),
-    aCancelBtn      ( this ),
-    aHelpBtn        ( this ),
-    aResetBtn       ( this ),
-    aBaseFmtBtn     ( this ),
-    mnCurrentPageId ( 0 )
-{
-    FreeResource();
-}
-*/
-
-// -----------------------------------------------------------------------
-
 IconChoiceDialog ::~IconChoiceDialog ()
 {
     ULONG i;
@@ -381,18 +359,6 @@ IconChoiceDialog ::~IconChoiceDialog ()
         delete pData;
     }
 
-    // remove Pagelist
-/*  for ( i=0; i<maPageList.Count(); i++ )
-    {
-        IconChoicePageData* pData = (IconChoicePageData*)maPageList.GetObject ( i );
-
-        if ( pData->bOnDemand )
-            delete ( SfxItemSet * )&( pData->pPage->GetItemSet() );
-
-        delete pData->pPage;
-        delete pData;
-    }*/
-
     // remove Userdata from Icons
     for ( i=0; i<maIconCtrl.GetEntryCount(); i++)
     {
@@ -414,11 +380,15 @@ IconChoiceDialog ::~IconChoiceDialog ()
 |
 \**********************************************************************/
 
-SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String& rIconText,
-                                   const Image& rChoiceIcon,
-                                   CreatePage pCreateFunc /* != 0 */,
-                                   GetPageRanges pRangesFunc /* darf 0 sein */,
-                                   BOOL bItemsOnDemand, ULONG /*nPos*/ )
+SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage(
+    USHORT          nId,
+    const String&   rIconText,
+    const Image&    rChoiceIcon,
+    CreatePage      pCreateFunc /* != 0 */,
+    GetPageRanges   pRangesFunc /* darf 0 sein */,
+    BOOL            bItemsOnDemand,
+    ULONG           /*nPos*/
+)
 {
     IconChoicePageData* pData = new IconChoicePageData ( nId, pCreateFunc,
                                                          pRangesFunc,
@@ -434,27 +404,6 @@ SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String&
     return pEntry;
 }
 
-SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String& rIconText,
-                                   const Image& rChoiceIcon,
-                                   const Image& rChoiceIconHC,
-                                   CreatePage pCreateFunc /* != 0 */,
-                                   GetPageRanges pRangesFunc /* darf 0 sein */,
-                                   BOOL bItemsOnDemand, ULONG /*nPos*/ )
-{
-    IconChoicePageData* pData = new IconChoicePageData ( nId, pCreateFunc,
-                                                         pRangesFunc,
-                                                         bItemsOnDemand );
-    maPageList.Insert ( pData, LIST_APPEND );
-
-    pData->fnGetRanges = pRangesFunc;
-    pData->bOnDemand = bItemsOnDemand;
-
-    USHORT *pId = new USHORT ( nId );
-    SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.InsertEntry( rIconText, rChoiceIcon, rChoiceIconHC );
-    pEntry->SetUserData ( (void*) pId );
-    return pEntry;
-}
-
 /**********************************************************************
 |
 | remove page
@@ -1250,7 +1199,7 @@ void IconChoiceDialog::Start_Impl()
     USHORT nActPage;
 
     if ( mnCurrentPageId == 0 || mnCurrentPageId == USHRT_MAX )
-        nActPage = maPageList.GetObject(0)->nId;//First()->nId;
+        nActPage = maPageList.GetObject(0)->nId;
     else
         nActPage = mnCurrentPageId;
 
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 7ffcd1eefe98..935876869f5d 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -529,11 +529,11 @@ short SvInsertPlugInDialog::Execute()
             uno::Reference < beans::XPropertySet > xSet( m_xObj->getComponent(), uno::UNO_QUERY );
             if ( xSet.is() )
             {
-                xSet->setPropertyValue( ::rtl::OUString::createFromAscii("PluginURL"),
+                xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginURL") ),
                         makeAny( ::rtl::OUString( m_pURL->GetMainURL( INetURLObject::NO_DECODE ) ) ) );
                 uno::Sequence< beans::PropertyValue > aCommandSequence;
                 Plugin_ImplFillCommandSequence( m_aCommands, aCommandSequence );
-                xSet->setPropertyValue( ::rtl::OUString::createFromAscii("PluginCommands"), makeAny( aCommandSequence ) );
+                xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginCommands") ), makeAny( aCommandSequence ) );
             }
         }
         else
@@ -658,14 +658,14 @@ short SvInsertAppletDialog::Execute()
                 m_xObj->changeState( embed::EmbedStates::RUNNING );
             xSet = uno::Reference < beans::XPropertySet >( m_xObj->getComponent(), uno::UNO_QUERY );
             ::rtl::OUString aStr;
-            uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("AppletCode") );
+            uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCode") ) );
             if ( aAny >>= aStr )
                 SetClass( aStr );
-            aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("AppletCodeBase") );
+            aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCodeBase") ) );
             if ( aAny >>= aStr )
                 SetClassLocation( aStr );
             uno::Sequence< beans::PropertyValue > aCommands;
-            aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("AppletCommands") );
+            aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCommands") ) );
             if ( aAny >>= aCommands )
             {
                 SvCommandList aList;
@@ -712,17 +712,17 @@ short SvInsertAppletDialog::Execute()
 
                 // Hack, aFileName wird auch fuer Class benutzt
                 m_aClass = GetClass();
-                xSet->setPropertyValue( ::rtl::OUString::createFromAscii("AppletCode"), makeAny( ::rtl::OUString( m_aClass ) ) );
+                xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCode") ), makeAny( ::rtl::OUString( m_aClass ) ) );
 
                 ::rtl::OUString tmp = aClassLocation;
                 ::osl::File::getFileURLFromSystemPath(tmp, tmp);
                 aClassLocation = tmp;
-                xSet->setPropertyValue( ::rtl::OUString::createFromAscii("AppletCodeBase"), makeAny( tmp ) );
+                xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCodeBase") ), makeAny( tmp ) );
                 m_aCommands = GetAppletOptions();
 
                 uno::Sequence< beans::PropertyValue > aCommandSequence;
                 Plugin_ImplFillCommandSequence( m_aCommands, aCommandSequence );
-                xSet->setPropertyValue( ::rtl::OUString::createFromAscii("AppletCommands"), makeAny( aCommandSequence ) );
+                xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCommands") ), makeAny( aCommandSequence ) );
 
                 if ( bIPActive )
                     m_xObj->changeState( embed::EmbedStates::INPLACE_ACTIVE );
@@ -841,15 +841,15 @@ short SfxInsertFloatingFrameDialog::Execute()
                 m_xObj->changeState( embed::EmbedStates::RUNNING );
             xSet = uno::Reference < beans::XPropertySet >( m_xObj->getComponent(), uno::UNO_QUERY );
             ::rtl::OUString aStr;
-            uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameURL") );
+            uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameURL") ) );
             if ( aAny >>= aStr )
                 aEDURL.SetText( aStr );
-            aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameName") );
+            aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameName") ) );
             if ( aAny >>= aStr )
                 aEDName.SetText( aStr );
 
             sal_Int32 nSize = SIZE_NOT_SET;
-            aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameMarginWidth") );
+            aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginWidth") ) );
             aAny >>= nSize;
 
             if ( nSize == SIZE_NOT_SET )
@@ -862,7 +862,7 @@ short SfxInsertFloatingFrameDialog::Execute()
             else
                 aNMMarginWidth.SetText( String::CreateFromInt32( nSize ) );
 
-            aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameMarginHeight") );
+            aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginHeight") ) );
             aAny >>= nSize;
 
             if ( nSize == SIZE_NOT_SET )
@@ -880,11 +880,11 @@ short SfxInsertFloatingFrameDialog::Execute()
             BOOL bScrollAuto = FALSE;
 
             sal_Bool bSet = sal_False;
-            aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameIsAutoScroll") );
+            aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoScroll") ) );
             aAny >>= bSet;
             if ( !bSet )
             {
-                aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameIsScrollingMode") );
+                aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsScrollingMode") ) );
                 aAny >>= bSet;
                 bScrollOn = bSet;
                 bScrollOff = !bSet;
@@ -897,11 +897,11 @@ short SfxInsertFloatingFrameDialog::Execute()
             aRBScrollingAuto.Check( bScrollAuto );
 
             bSet = sal_False;
-            aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameIsAutoBorder") );
+            aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoBorder") ) );
             aAny >>= bSet;
             if ( !bSet )
             {
-                aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameIsBorder") );
+                aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsBorder") ) );
                 aAny >>= bSet;
                 aRBFrameBorderOn.Check( bSet );
                 aRBFrameBorderOff.Check( !bSet );
@@ -975,27 +975,23 @@ short SfxInsertFloatingFrameDialog::Execute()
                 else
                     lMarginHeight = SIZE_NOT_SET;
 
-                xSet->setPropertyValue( ::rtl::OUString::createFromAscii("FrameURL"), makeAny( aURL ) );
-                xSet->setPropertyValue( ::rtl::OUString::createFromAscii("FrameName"), makeAny( aName ) );
+                xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameURL") ), makeAny( aURL ) );
+                xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameName") ), makeAny( aName ) );
 
                 if ( eScroll == ScrollingAuto )
-                    xSet->setPropertyValue( ::rtl::OUString::createFromAscii("FrameIsAutoScroll"),
+                    xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoScroll") ),
                         makeAny( sal_True ) );
                 else
-                    xSet->setPropertyValue( ::rtl::OUString::createFromAscii("FrameIsScrollingMode"),
+                    xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsScrollingMode") ),
                         makeAny( (sal_Bool) ( eScroll == ScrollingYes) ) );
 
-                //if ( aFrmDescr.IsFrameBorderSet() )
-                    xSet->setPropertyValue( ::rtl::OUString::createFromAscii("FrameIsBorder"),
+                    xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsBorder") ),
                         makeAny( bHasBorder ) );
-                /*else
-                    xSet->setPropertyValue( ::rtl::OUString::createFromAscii("FrameIsAutoBorder"),
-                        makeAny( sal_True ) );*/
 
-                xSet->setPropertyValue( ::rtl::OUString::createFromAscii("FrameMarginWidth"),
+                xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginWidth") ),
                     makeAny( sal_Int32( lMarginWidth ) ) );
 
-                xSet->setPropertyValue( ::rtl::OUString::createFromAscii("FrameMarginHeight"),
+                xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginHeight") ),
                     makeAny( sal_Int32( lMarginHeight ) ) );
 
                 if ( bIPActive )
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 26f08b73e2f0..f6ab7c4183e5 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -126,7 +126,6 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, BOOL bHtml
     Automatic().SetClickHdl( LINK( this, SvBaseLinksDlg, AutomaticClickHdl ) );
     Manual().SetClickHdl( LINK( this, SvBaseLinksDlg, ManualClickHdl ) );
     UpdateNow().SetClickHdl( LINK( this, SvBaseLinksDlg, UpdateNowClickHdl ) );
-//  OpenSource().SetClickHdl( LINK( this, SvBaseLinksDlg, OpenSourceClickHdl ) );
     ChangeSource().SetClickHdl( LINK( this, SvBaseLinksDlg, ChangeSourceClickHdl ) );
     if(!bHtmlMode)
         BreakLink().SetClickHdl( LINK( this, SvBaseLinksDlg, BreakLinkClickHdl ) );
@@ -337,15 +336,6 @@ IMPL_LINK( SvBaseLinksDlg, UpdateNowClickHdl, PushButton *, EMPTYARG )
     return 0;
 }
 
-/*
-IMPL_LINK_INLINE_START( SvBaseLinksDlg, OpenSourceClickHdl, PushButton *, pPushButton )
-{
-    DBG_ASSERT( !this, "Open noch nicht impl." );
-    return 0;
-}
-IMPL_LINK_INLINE_END( SvBaseLinksDlg, OpenSourceClickHdl, PushButton *, pPushButton )
-*/
-
 IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton )
 {
     (void)pPushButton;
@@ -485,7 +475,6 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton )
             Automatic().Disable();
             Manual().Disable();
             UpdateNow().Disable();
-//            OpenSource().Disable();
             ChangeSource().Disable();
             BreakLink().Disable();
 
@@ -502,8 +491,6 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton )
 IMPL_LINK( SvBaseLinksDlg, UpdateWaitingHdl, Timer*, pTimer )
 {
     (void)pTimer;
-//    for( SvLBoxEntry* pBox = Links().First(); pBox;
-//          pBox = Links().Next( pBox ))
 
     Links().SetUpdateMode(FALSE);
     for( ULONG nPos = Links().GetEntryCount(); nPos; )
@@ -529,7 +516,6 @@ IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink )
 
     if( _pLink && _pLink->WasLastEditOK() )
     {
-        // JP 09.01.98:
         // StarImpress/Draw tauschen die LinkObjecte selbst aus!
         // also suche den Link im Manager, wenn der nicht mehr existiert,
         // dann setze fuelle die Liste komplett neu. Ansonsten braucht
diff --git a/cui/source/dialogs/multipat.src b/cui/source/dialogs/multipat.src
index 987867492e13..a43ab32bbbf6 100644
--- a/cui/source/dialogs/multipat.src
+++ b/cui/source/dialogs/multipat.src
@@ -125,26 +125,3 @@ String RID_SVXSTR_MULTIFILE_DBL_ERR
 {
     Text [ en-US ] = "The file %1 already exists." ;
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cui/source/dialogs/newtabledlg.src b/cui/source/dialogs/newtabledlg.src
index 4bbbd564edd1..6d9bf1998810 100644
--- a/cui/source/dialogs/newtabledlg.src
+++ b/cui/source/dialogs/newtabledlg.src
@@ -99,37 +99,3 @@ ModalDialog RID_SVX_NEWTABLE_DLG
         TabStop = TRUE ;
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index f218fdd2557a..f10ac3586baf 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -69,8 +69,6 @@ public:
 PasswordReenterEdit_Impl::PasswordReenterEdit_Impl( Window * pParent, const ResId &rResId ) :
     Edit( pParent, rResId )
 {
-// currently the spec does not want to display this text anymore...
-//    m_aDefaultTxt = String( CUI_RES( STR_PASSWD_MUST_BE_CONFIRMED ) );
 }
 
 
@@ -83,16 +81,7 @@ void PasswordReenterEdit_Impl::Paint( const Rectangle& rRect )
 {
     if (GetText().Len() == 0)
     {
-        Push( /*PUSH_FILLCOLOR | PUSH_TEXTFILLCOLOR |*/ PUSH_TEXTCOLOR );
-/*
-        Color aFillColor( GetParent()->GetBackground().GetColor() );
-        SetLineColor(); // don't draw a border when painting the Edit field rectangle with the new background color
-        SetFillColor( aFillColor );
-        SetTextFillColor( aFillColor );
-        SetTextColor( GetParent()->GetTextColor() );    // use plain text color even if the Edit field is disabled (it is hard to read the text otherwise)
-
-        DrawRect( Rectangle( Point(), GetOutputSizePixel() ) );
-*/
+        Push( PUSH_TEXTCOLOR );
         SetTextColor( Color( COL_GRAY ) );
         DrawText( Point(), m_aDefaultTxt );
 
@@ -114,7 +103,6 @@ struct PasswordToOpenModifyDialog_Impl
     Edit                        m_aPasswdToOpenED;
     FixedText                   m_aReenterPasswdToOpenFT;
     PasswordReenterEdit_Impl    m_aReenterPasswdToOpenED;
-//    FixedImage                  m_aPasswdToOpenMatchFI;
     FixedText                   m_aPasswdNoteFT;
     FixedLine                   m_aButtonsFL;
     MoreButton                  m_aMoreFewerOptionsBTN;
@@ -126,7 +114,6 @@ struct PasswordToOpenModifyDialog_Impl
     Edit                        m_aPasswdToModifyED;
     FixedText                   m_aReenterPasswdToModifyFT;
     PasswordReenterEdit_Impl    m_aReenterPasswdToModifyED;
-//    FixedImage                  m_aPasswdToModifyMatchFI;
 
     String                      m_aOneMismatch;
     String                      m_aTwoMismatch;
@@ -136,7 +123,6 @@ struct PasswordToOpenModifyDialog_Impl
     bool                        m_bIsPasswordToModify;
 
 
-//    DECL_LINK( ModifyHdl, Edit * );
     DECL_LINK( OkBtnClickHdl, OKButton * );
 
     PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent,
@@ -156,7 +142,6 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl(
     m_aPasswdToOpenED           ( pParent, CUI_RES( ED_PASSWD_TO_OPEN ) ),
     m_aReenterPasswdToOpenFT    ( pParent, CUI_RES( FT_REENTER_PASSWD_TO_OPEN ) ),
     m_aReenterPasswdToOpenED    ( pParent, CUI_RES( ED_REENTER_PASSWD_TO_OPEN ) ),
-//    m_aPasswdToOpenMatchFI      ( pParent, CUI_RES( FI_PASSWD_TO_OPEN_MATCH ) ),
     m_aPasswdNoteFT             ( pParent, CUI_RES( FT_PASSWD_NOTE ) ),
     m_aButtonsFL                ( pParent, CUI_RES( FL_BUTTONS ) ),
     m_aMoreFewerOptionsBTN      ( pParent, CUI_RES( BTN_MORE_FEWER_OPTIONS ) ),
@@ -168,35 +153,17 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl(
     m_aPasswdToModifyED         ( pParent, CUI_RES( ED_PASSWD_TO_MODIFY ) ),
     m_aReenterPasswdToModifyFT  ( pParent, CUI_RES( FT_REENTER_PASSWD_TO_MODIFY ) ),
     m_aReenterPasswdToModifyED  ( pParent, CUI_RES( ED_REENTER_PASSWD_TO_MODIFY ) ),
-//    m_aPasswdToModifyMatchFI    ( pParent, CUI_RES( FI_PASSWD_TO_MODIFY_MATCH ) )
     m_aOneMismatch( CUI_RES( STR_ONE_PASSWORD_MISMATCH ) ),
     m_aTwoMismatch( CUI_RES( STR_TWO_PASSWORDS_MISMATCH ) ),
     m_aInvalidStateForOkButton( CUI_RES( STR_INVALID_STATE_FOR_OK_BUTTON ) ),
     m_aInvalidStateForOkButton_v2( CUI_RES( STR_INVALID_STATE_FOR_OK_BUTTON_V2 ) ),
     m_bIsPasswordToModify( bIsPasswordToModify )
 {
-/*
-    const sal_Bool bHighContrast = pParent->GetSettings().GetStyleSettings().GetHighContrastMode();
-    const Image aImage( CUI_RES( bHighContrast ? IMG_PASSWD_MATCH_HC : IMG_PASSWD_MATCH ) );
-    m_aPasswdToOpenMatchFI.SetImage( aImage );
-    m_aPasswdToModifyMatchFI.SetImage( aImage );
-*/
-
     m_aMoreFewerOptionsBTN.SetMoreText( String( CUI_RES( STR_MORE_OPTIONS ) ) );
     m_aMoreFewerOptionsBTN.SetLessText( String( CUI_RES( STR_FEWER_OPTIONS ) ) );
 
-#if 0
-    Link aModifyLink = LINK( this, PasswordToOpenModifyDialog_Impl, ModifyHdl );
-    m_aPasswdToOpenED.SetModifyHdl( aModifyLink );
-    m_aReenterPasswdToOpenED.SetModifyHdl( aModifyLink );
-    m_aPasswdToModifyED.SetModifyHdl( aModifyLink );
-    m_aReenterPasswdToModifyED.SetModifyHdl( aModifyLink );
-#endif
-
     m_aOk.SetClickHdl( LINK( this, PasswordToOpenModifyDialog_Impl, OkBtnClickHdl ) );
 
-//    m_aOk.Enable( FALSE );
-
     if (nMaxPasswdLen)
     {
         m_aPasswdToOpenED.SetMaxTextLen( nMaxPasswdLen );
@@ -209,8 +176,6 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl(
 
     m_aPasswdToOpenED.GrabFocus();
 
-//    ModifyHdl( NULL );
-
     m_aMoreFewerOptionsBTN.Enable( bIsPasswordToModify );
     if (!bIsPasswordToModify)
         m_aMoreFewerOptionsBTN.Hide( TRUE );
@@ -221,32 +186,6 @@ PasswordToOpenModifyDialog_Impl::~PasswordToOpenModifyDialog_Impl()
 {
 }
 
-#if 0
-IMPL_LINK( PasswordToOpenModifyDialog_Impl, ModifyHdl, Edit *, EMPTYARG /*pEdit*/ )
-{
-    // force repaints to get the m_aDefaultTxt displayed again
-    if (m_aReenterPasswdToOpenED.GetText().Len() == 0)
-        m_aReenterPasswdToOpenED.Invalidate();
-    if (m_aReenterPasswdToModifyED.GetText().Len() == 0)
-        m_aReenterPasswdToModifyED.Invalidate();
-
-    const sal_Int32 nPasswdToOpenLen    = m_aPasswdToOpenED.GetText().Len();
-    const sal_Int32 nPasswdToModifyLen  = m_aPasswdToModifyED.GetText().Len();
-
-    const bool bBothEmpty       = nPasswdToOpenLen == 0 && nPasswdToModifyLen == 0;
-    const bool bToOpenMatch     = m_aPasswdToOpenED.GetText()   == m_aReenterPasswdToOpenED.GetText();
-    const bool bToModifyMatch   = m_aPasswdToModifyED.GetText() == m_aReenterPasswdToModifyED.GetText();
-
-    m_aOk.Enable( bToOpenMatch && bToModifyMatch && !bBothEmpty );
-
-//    m_aPasswdToOpenMatchFI.Enable( bToOpenMatch && !bBothEmpty );
-//    m_aPasswdToModifyMatchFI.Enable( bToModifyMatch && !bBothEmpty );
-
-    return 0;
-}
-#endif
-
-
 IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG /*pBtn*/ )
 {
     bool bInvalidState = !m_aOpenReadonlyCB.IsChecked() &&
diff --git a/cui/source/dialogs/passwdomdlg.hrc b/cui/source/dialogs/passwdomdlg.hrc
index 522e4edf1da2..edeae469a3c5 100755
--- a/cui/source/dialogs/passwdomdlg.hrc
+++ b/cui/source/dialogs/passwdomdlg.hrc
@@ -58,4 +58,3 @@
 #define STR_INVALID_STATE_FOR_OK_BUTTON_V2  57
 
 #endif
-
diff --git a/cui/source/dialogs/passwdomdlg.src b/cui/source/dialogs/passwdomdlg.src
index edb84813d387..129874b92c45 100755
--- a/cui/source/dialogs/passwdomdlg.src
+++ b/cui/source/dialogs/passwdomdlg.src
@@ -81,13 +81,7 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY
         Border = TRUE ;
         PassWord = TRUE ;
     };
-/*
-    FixedImage FI_PASSWD_TO_OPEN_MATCH
-    {
-        Pos = MAP_APPFONT ( 150, 42 ) ;
-        Size = MAP_APPFONT ( 12 , 12 ) ;
-    };
-*/
+
     FixedText FT_PASSWD_NOTE
     {
         Pos = MAP_APPFONT( 6, 80 );
@@ -176,13 +170,6 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY
         Border = TRUE ;
         PassWord = TRUE ;
     };
-/*
-    FixedImage FI_PASSWD_TO_MODIFY_MATCH
-    {
-        Pos = MAP_APPFONT ( 150, 224 ) ;
-        Size = MAP_APPFONT ( 12 , 12 ) ;
-    };
-*/
 
     String STR_PASSWD_MUST_BE_CONFIRMED
     {
@@ -213,16 +200,4 @@ ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY
     {
         Text [ en-US ] = "Please enter a password to open or to modify, or check the open read-only option to continue." ;
     };
-/*
-    Image IMG_PASSWD_MATCH
-    {
-        ImageBitmap = Bitmap { File = "apply.png"; };
-    };
-
-    Image IMG_PASSWD_MATCH_HC
-    {
-        ImageBitmap = Bitmap { File = "apply_h.png"; };
-    };
-*/
 };
-
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index 90b3c1a8211e..c9c55f65be84 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -164,53 +164,6 @@ ULONG SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
         String* pName = (String*) aSupplementTable.Get( nFormat );
         String aName;
 
-#ifdef WNT
-/*
-        if( !pName &&
-            ( nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE_OLE || nFormat == SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE ) )
-        {
-            BOOL IsClipboardObject_Impl( SotDataObject * );
-            if( IsClipboardObject_Impl( pDataObj ) )
-            {
-                IDataObject * pDO = NULL;
-                OleGetClipboard( &pDO );
-                if( pDO )
-                {
-                    FORMATETC fe;
-                    STGMEDIUM stm;
-                    (fe).cfFormat=RegisterClipboardFormat( "Object Descriptor" );
-                    (fe).dwAspect=DVASPECT_CONTENT;
-                    (fe).ptd=NULL;
-                    (fe).tymed=TYMED_HGLOBAL;
-                    (fe).lindex=-1;
-
-                    if (SUCCEEDED(pDO->GetData(&fe, &stm)))
-                    {
-                        LPOBJECTDESCRIPTOR pOD=(LPOBJECTDESCRIPTOR)GlobalLock(stm.hGlobal);
-                        if( pOD->dwFullUserTypeName )
-                        {
-                            OLECHAR * pN = (OLECHAR *)(((BYTE *)pOD) + pOD->dwFullUserTypeName);
-                            aName.Append( pN );
-                            pName = &aName;
-                            // set format to ole object
-                            nFormat = SOT_FORMATSTR_ID_EMBED_SOURCE_OLE;
-                        }
-                        if( pOD->dwSrcOfCopy )
-                        {
-                            OLECHAR * pN = (OLECHAR *)(((BYTE *)pOD) + pOD->dwSrcOfCopy);
-                            aSourceName.Append( *pN++ );
-                        }
-                        else
-                            aSourceName = String( ResId( STR_UNKNOWN_SOURCE, SOAPP->GetResMgr() ) );
-                        GlobalUnlock(stm.hGlobal);
-                        ReleaseStgMedium(&stm);
-                    }
-                }
-            }
-        }
-*/
-#endif
-
         // if there is an "Embed Source" or and "Embedded Object" on the
         // Clipboard we read the Description and the Source of this object
         // from an accompanied "Object Descriptor" format on the clipboard
diff --git a/cui/source/dialogs/plfilter.cxx b/cui/source/dialogs/plfilter.cxx
index de3a7ae9a09c..e94528f18d91 100644
--- a/cui/source/dialogs/plfilter.cxx
+++ b/cui/source/dialogs/plfilter.cxx
@@ -62,7 +62,7 @@ void fillNetscapePluginFilters( Sequence< rtl::OUString >& rPluginNames, Sequenc
 {
     Reference< XMultiServiceFactory > xMan( ::utl::getProcessServiceFactory() );
     Reference< XPluginManager > xPMgr( xMan->createInstance(
-        rtl::OUString::createFromAscii("com.sun.star.plugin.PluginManager") ), UNO_QUERY );
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginManager") ) ), UNO_QUERY );
 
     if ( xPMgr.is() )
     {
diff --git a/cui/source/dialogs/postdlg.hrc b/cui/source/dialogs/postdlg.hrc
index c0df97b971e2..364ab737dc6a 100644
--- a/cui/source/dialogs/postdlg.hrc
+++ b/cui/source/dialogs/postdlg.hrc
@@ -48,4 +48,3 @@
 
 
 #endif
-
diff --git a/cui/source/dialogs/postdlg.src b/cui/source/dialogs/postdlg.src
index 904319d45355..c8262ab5f7a1 100644
--- a/cui/source/dialogs/postdlg.src
+++ b/cui/source/dialogs/postdlg.src
@@ -122,7 +122,6 @@ ModalDialog RID_SVXDLG_POSTIT
     String STR_NOTIZ_INSERT
     {
         /* ### ACHTUNG: Neuer Text in Resource? Notiz einfügen : Notiz einf³gen */
-        /* ### ACHTUNG: Neuer Text in Resource? Notiz einfügen : Notiz einf³gen */
         Text [ en-US ] = "Insert note" ;
     };
 };
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 9d44e12f55f1..6aa067682b00 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -87,13 +87,9 @@ void ShowErrorDialog( const Any& aException )
 SFTreeListBox::SFTreeListBox( Window* pParent, const ResId& rResId ) :
     SvTreeListBox( pParent, ResId( rResId.GetId(),*rResId.GetResMgr() ) ),
     m_hdImage(ResId(IMG_HARDDISK,*rResId.GetResMgr())),
-    m_hdImage_hc(ResId(IMG_HARDDISK_HC,*rResId.GetResMgr())),
     m_libImage(ResId(IMG_LIB,*rResId.GetResMgr())),
-    m_libImage_hc(ResId(IMG_LIB_HC,*rResId.GetResMgr())),
     m_macImage(ResId(IMG_MACRO,*rResId.GetResMgr())),
-    m_macImage_hc(ResId(IMG_MACRO_HC,*rResId.GetResMgr())),
     m_docImage(ResId(IMG_DOCUMENT,*rResId.GetResMgr())),
-    m_docImage_hc(ResId(IMG_DOCUMENT_HC,*rResId.GetResMgr())),
     m_sMyMacros(String(ResId(STR_MYMACROS,*rResId.GetResMgr()))),
     m_sProdMacros(String(ResId(STR_PRODMACROS,*rResId.GetResMgr())))
 {
@@ -176,11 +172,10 @@ void SFTreeListBox::Init( const ::rtl::OUString& language  )
 
     Sequence< Reference< browse::XBrowseNode > > children;
 
-    ::rtl::OUString userStr = ::rtl::OUString::createFromAscii("user");
-    ::rtl::OUString shareStr = ::rtl::OUString::createFromAscii("share");
+    ::rtl::OUString userStr( RTL_CONSTASCII_USTRINGPARAM("user") );
+    ::rtl::OUString shareStr( RTL_CONSTASCII_USTRINGPARAM("share") );
 
-    ::rtl::OUString singleton = ::rtl::OUString::createFromAscii(
-        "/singletons/com.sun.star.script.browse.theBrowseNodeFactory" );
+    ::rtl::OUString singleton( RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.script.browse.theBrowseNodeFactory" ) );
 
     try
     {
@@ -235,7 +230,7 @@ void SFTreeListBox::Init( const ::rtl::OUString& language  )
             {
                 Reference< ::com::sun::star::frame::XModuleManager >
                     xModuleManager( xCtx->getServiceManager()->createInstanceWithContext(
-                        ::rtl::OUString::createFromAscii("com.sun.star.frame.ModuleManager"), xCtx ),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager") ), xCtx ),
                                     UNO_QUERY_THROW );
 
                 Reference<container::XNameAccess> xModuleConfig(
@@ -267,7 +262,6 @@ void SFTreeListBox::Init( const ::rtl::OUString& language  )
         Reference< browse::XBrowseNode > langEntries =
             getLangNodeFromRootNode( children[ n ], lang );
 
-        /*SvLBoxEntry* pBasicManagerRootEntry =*/
             insertEntry( uiName, app ? IMG_HARDDISK : IMG_DOCUMENT,
                 0, true, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SFROOT, langEntries, xDocumentModel )), factoryURL );
     }
@@ -283,7 +277,7 @@ SFTreeListBox::getDocumentModel( Reference< XComponentContext >& xCtx, ::rtl::OU
             xCtx->getServiceManager();
     Reference< frame::XDesktop > desktop (
         mcf->createInstanceWithContext(
-            ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"),                 xCtx ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop") ),                 xCtx ),
             UNO_QUERY );
 
     Reference< container::XEnumerationAccess > componentsAccess =
@@ -393,17 +387,10 @@ SvLBoxEntry * SFTreeListBox::insertEntry(
     SvLBoxEntry * p;
     if( nBitmap == IMG_DOCUMENT && factoryURL.getLength() > 0 )
     {
-        Image aImage = SvFileInformationManager::GetFileImage(
-            INetURLObject(factoryURL), false,
-            BMP_COLOR_NORMAL );
-        Image aHCImage = SvFileInformationManager::GetFileImage(
-            INetURLObject(factoryURL), false,
-            BMP_COLOR_HIGHCONTRAST );
+        Image aImage = SvFileInformationManager::GetFileImage( INetURLObject(factoryURL), false );
         p = InsertEntry(
             rText, aImage, aImage, pParent, bChildrenOnDemand, LIST_APPEND,
             aUserData.release()); // XXX possible leak
-        SetExpandedEntryBmp(p, aHCImage, BMP_COLOR_HIGHCONTRAST);
-        SetCollapsedEntryBmp(p, aHCImage, BMP_COLOR_HIGHCONTRAST);
     }
     else
     {
@@ -416,33 +403,27 @@ SvLBoxEntry * SFTreeListBox::insertEntry(
     String const & rText, USHORT nBitmap, SvLBoxEntry * pParent,
     bool bChildrenOnDemand, std::auto_ptr< SFEntry > aUserData )
 {
-    Image aHCImage, aImage;
+    Image aImage;
     if( nBitmap == IMG_HARDDISK )
     {
         aImage = m_hdImage;
-        aHCImage = m_hdImage_hc;
     }
     else if( nBitmap == IMG_LIB )
     {
         aImage = m_libImage;
-        aHCImage = m_libImage_hc;
     }
     else if( nBitmap == IMG_MACRO )
     {
         aImage = m_macImage;
-        aHCImage = m_macImage_hc;
     }
     else if( nBitmap == IMG_DOCUMENT )
     {
         aImage = m_docImage;
-        aHCImage = m_docImage_hc;
     }
     SvLBoxEntry * p = InsertEntry(
         rText, aImage, aImage, pParent, bChildrenOnDemand, LIST_APPEND,
         aUserData.release()); // XXX possible leak
-    SetExpandedEntryBmp(p, aHCImage, BMP_COLOR_HIGHCONTRAST);
-    SetCollapsedEntryBmp(p, aHCImage, BMP_COLOR_HIGHCONTRAST);
-    return p;
+   return p;
 }
 
 void __EXPORT SFTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
@@ -467,18 +448,6 @@ void __EXPORT SFTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
 
 void __EXPORT SFTreeListBox::ExpandedHdl()
 {
-/*        SvLBoxEntry* pEntry = GetHdlEntry();
-        DBG_ASSERT( pEntry, "Was wurde zugeklappt?" );
-
-        if ( !IsExpanded( pEntry ) && pEntry->HasChildsOnDemand() )
-        {
-                SvLBoxEntry* pChild = FirstChild( pEntry );
-                while ( pChild )
-                {
-                        GetModel()->Remove( pChild );   // Ruft auch den DTOR
-                        pChild = FirstChild( pEntry );
-                }
-        }*/
 }
 
 // ----------------------------------------------------------------------------
@@ -865,7 +834,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton )
                         try
                         {
                             // ISSUE need code to run script here
-                            xInv->invoke( ::rtl::OUString::createFromAscii( "Editable" ), args, outIndex, outArgs );
+                            xInv->invoke( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Editable" ) ), args, outIndex, outArgs );
                         }
                         catch( Exception& e )
                         {
@@ -930,7 +899,7 @@ SvxScriptOrgDialog::getDocumentModel( Reference< XComponentContext >& xCtx, ::rt
             xCtx->getServiceManager();
     Reference< frame::XDesktop > desktop (
         mcf->createInstanceWithContext(
-            ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"), xCtx ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop") ), xCtx ),
             UNO_QUERY );
 
     Reference< container::XEnumerationAccess > componentsAccess =
@@ -968,11 +937,11 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
         USHORT nMode = INPUTMODE_NEWLIB;
         if( aScriptsBox.GetModel()->GetDepth( pEntry ) == 0 )
         {
-            aNewStdName = ::rtl::OUString::createFromAscii( "Library" ) ;
+            aNewStdName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Library") ) ;
         }
         else
         {
-            aNewStdName = ::rtl::OUString::createFromAscii( "Macro" ) ;
+            aNewStdName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Macro") ) ;
             nMode = INPUTMODE_NEWMACRO;
         }
         //do we need L10N for this? ie somethng like:
@@ -1076,7 +1045,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
         try
         {
             Any aResult;
-            aResult = xInv->invoke( ::rtl::OUString::createFromAscii( "Creatable" ), args, outIndex, outArgs );
+            aResult = xInv->invoke( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Creatable") ), args, outIndex, outArgs );
             Reference< browse::XBrowseNode > newNode( aResult, UNO_QUERY );
             aChildNode = newNode;
 
@@ -1166,21 +1135,6 @@ void SvxScriptOrgDialog::renameEntry( SvLBoxEntry* pEntry )
             {
                 ::rtl::OUString aUserSuppliedName = xNewDlg->GetObjectName();
                 bValid = TRUE;
-                /*
-                for( sal_Int32 index = 0; index < childNodes.getLength(); index++ )
-                {
-                    if ( (aUserSuppliedName+extn).equals( childNodes[index]->getName() ) )
-                    {
-                        bValid = FALSE;
-                        String aError( m_createErrStr );
-                        aError.Append( m_createDupStr );
-                        ErrorBox aErrorBox( static_cast<Window*>(this), WB_OK | RET_OK, aError );
-                        aErrorBox.SetText( m_createErrTitleStr );
-                        aErrorBox.Execute();
-                        xNewDlg->SetObjectName( aNewName );
-                        break;
-                    }
-                } */
                 if( bValid )
                     aNewName = aUserSuppliedName;
             }
@@ -1199,7 +1153,7 @@ void SvxScriptOrgDialog::renameEntry( SvLBoxEntry* pEntry )
         try
         {
             Any aResult;
-            aResult = xInv->invoke( ::rtl::OUString::createFromAscii( "Renamable" ), args, outIndex, outArgs );
+            aResult = xInv->invoke( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Renamable") ), args, outIndex, outArgs );
             Reference< browse::XBrowseNode > newNode( aResult, UNO_QUERY );
             aChildNode = newNode;
 
@@ -1250,7 +1204,7 @@ void SvxScriptOrgDialog::deleteEntry( SvLBoxEntry* pEntry )
         try
         {
             Any aResult;
-            aResult = xInv->invoke( ::rtl::OUString::createFromAscii( "Deletable" ), args, outIndex, outArgs );
+            aResult = xInv->invoke( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Deletable") ), args, outIndex, outArgs );
             aResult >>= result; // or do we just assume true if no exception ?
         }
         catch( Exception& e )
@@ -1375,8 +1329,8 @@ void SvxScriptOrgDialog::RestorePreviousSelection()
 BOOL SFTreeListBox::dialogSort1( Reference< browse::XBrowseNode > node1,
     Reference< browse::XBrowseNode > node2 )
 {
-    ::rtl::OUString userStr = ::rtl::OUString::createFromAscii("user");
-    ::rtl::OUString shareStr = ::rtl::OUString::createFromAscii("share");
+    ::rtl::OUString userStr( RTL_CONSTASCII_USTRINGPARAM("user") );
+    ::rtl::OUString shareStr( RTL_CONSTASCII_USTRINGPARAM("share") );
     if( node1->getName().equals( userStr ) )
         return true;
     if( node2->getName().equals( userStr ) )
@@ -1422,25 +1376,25 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
     ::rtl::OUString result = unformatted.copy( 0 );
 
     result = ReplaceString(
-        result, ::rtl::OUString::createFromAscii( "%LANGUAGENAME" ), language );
+        result, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%LANGUAGENAME") ), language );
     result = ReplaceString(
-        result, ::rtl::OUString::createFromAscii( "%SCRIPTNAME" ), script );
+        result, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%SCRIPTNAME") ), script );
     result = ReplaceString(
-        result, ::rtl::OUString::createFromAscii( "%LINENUMBER" ), line );
+        result, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%LINENUMBER") ), line );
 
     if ( type.getLength() != 0 )
     {
-        result += ::rtl::OUString::createFromAscii( "\n\n" );
+        result += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n\n") );
         result += ::rtl::OUString(String(CUI_RES(RID_SVXSTR_ERROR_TYPE_LABEL)));
-        result += ::rtl::OUString::createFromAscii( " " );
+        result += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ") );
         result += type;
     }
 
     if ( message.getLength() != 0 )
     {
-        result += ::rtl::OUString::createFromAscii( "\n\n" );
+        result += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n\n") );
         result += ::rtl::OUString(String(CUI_RES(RID_SVXSTR_ERROR_MESSAGE_LABEL)));
-        result += ::rtl::OUString::createFromAscii( " " );
+        result += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ") );
         result += message;
     }
 
@@ -1452,7 +1406,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
 {
     ::rtl::OUString unformatted = String( CUI_RES( RID_SVXSTR_ERROR_AT_LINE ) );
 
-    ::rtl::OUString unknown = ::rtl::OUString::createFromAscii( "UNKNOWN" );
+    ::rtl::OUString unknown( RTL_CONSTASCII_USTRINGPARAM("UNKNOWN") );
     ::rtl::OUString language = unknown;
     ::rtl::OUString script = unknown;
     ::rtl::OUString line = unknown;
@@ -1495,7 +1449,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
     ::rtl::OUString unformatted =
           String( CUI_RES( RID_SVXSTR_EXCEPTION_AT_LINE ) );
 
-    ::rtl::OUString unknown = ::rtl::OUString::createFromAscii( "UNKNOWN" );
+    ::rtl::OUString unknown( RTL_CONSTASCII_USTRINGPARAM("UNKNOWN") );
     ::rtl::OUString language = unknown;
     ::rtl::OUString script = unknown;
     ::rtl::OUString line = unknown;
@@ -1543,11 +1497,9 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
     ::rtl::OUString unformatted = String(
         CUI_RES( RID_SVXSTR_FRAMEWORK_ERROR_RUNNING ) );
 
-    ::rtl::OUString language =
-        ::rtl::OUString::createFromAscii( "UNKNOWN" );
+    ::rtl::OUString language( RTL_CONSTASCII_USTRINGPARAM("UNKNOWN") );
 
-    ::rtl::OUString script =
-        ::rtl::OUString::createFromAscii( "UNKNOWN" );
+    ::rtl::OUString script( RTL_CONSTASCII_USTRINGPARAM("UNKNOWN") );
 
     ::rtl::OUString message;
 
@@ -1564,7 +1516,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
         message = String(
             CUI_RES(  RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED ) );
         message =  ReplaceString(
-            message, ::rtl::OUString::createFromAscii( "%LANGUAGENAME" ), language );
+            message, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%LANGUAGENAME") ), language );
 
     }
     else
diff --git a/cui/source/dialogs/scriptdlg.hrc b/cui/source/dialogs/scriptdlg.hrc
index 95ba3ddf38c2..5568b447ab96 100644
--- a/cui/source/dialogs/scriptdlg.hrc
+++ b/cui/source/dialogs/scriptdlg.hrc
@@ -43,13 +43,9 @@
 #define SF_PB_HELP                      9
 
 #define IMG_HARDDISK                    1
-#define IMG_HARDDISK_HC                 2
 #define IMG_LIB                         3
-#define IMG_LIB_HC                      4
 #define IMG_MACRO                       5
-#define IMG_MACRO_HC                    6
 #define IMG_DOCUMENT                    7
-#define IMG_DOCUMENT_HC                 8
 
 #define RID_IMGLST_OBJECTS              ( RID_BASICIDE_START +  7 )
 #define RID_IMGLST_OBJECTS_HC (RID_BASICIDE_START + 13)
diff --git a/cui/source/dialogs/scriptdlg.src b/cui/source/dialogs/scriptdlg.src
index 67a81376d662..5a551cede7ef 100644
--- a/cui/source/dialogs/scriptdlg.src
+++ b/cui/source/dialogs/scriptdlg.src
@@ -59,41 +59,21 @@ ModalDialog RID_DLG_SCRIPTORGANIZER
             ImageBitmap = Bitmap { File = "harddisk_16.bmp" ; };
             MASKCOLOR
         };
-        Image IMG_HARDDISK_HC
-        {
-            ImageBitmap = Bitmap { File = "harddisk_16_h.bmp" ; };
-            MASKCOLOR
-        };
         Image IMG_LIB
         {
             ImageBitmap = Bitmap { File = "im30820.png"; };
             MASKCOLOR
         };
-        Image IMG_LIB_HC
-        {
-            ImageBitmap = Bitmap { File = "imh30820.png"; };
-            MASKCOLOR
-        };
         Image IMG_MACRO
         {
             ImageBitmap = Bitmap { File = "im30821.png"; };
             MASKCOLOR
         };
-        Image IMG_MACRO_HC
-        {
-            ImageBitmap = Bitmap { File = "imh30821.png"; };
-            MASKCOLOR
-        };
         Image IMG_DOCUMENT
         {
             ImageBitmap = Bitmap { File = "im30826.png"; };
             MASKCOLOR
         };
-        Image IMG_DOCUMENT_HC
-        {
-            ImageBitmap = Bitmap { File = "imh30826.png"; };
-            MASKCOLOR
-        };
         String STR_MYMACROS
         {
             Text [ en-US ] = "My Macros";
diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx
index 9686e04b57aa..44ae64458d1f 100644
--- a/cui/source/dialogs/sdrcelldlg.cxx
+++ b/cui/source/dialogs/sdrcelldlg.cxx
@@ -54,14 +54,6 @@ SvxFormatCellsDialog::SvxFormatCellsDialog( Window* pParent, const SfxItemSet* p
     AddTabPage( RID_SVXPAGE_CHAR_EFFECTS );
     AddTabPage( RID_SVXPAGE_BORDER );
     AddTabPage( RID_SVXPAGE_AREA );
-
-/*
-    SvtCJKOptions aCJKOptions;
-    if( aCJKOptions.IsAsianTypographyEnabled() )
-        AddTabPage( RID_SVXPAGE_PARA_ASIAN);
-    else
-        RemoveTabPage( RID_SVXPAGE_PARA_ASIAN );
-*/
 }
 
 SvxFormatCellsDialog::~SvxFormatCellsDialog()
@@ -80,13 +72,7 @@ void SvxFormatCellsDialog::PageCreated( USHORT nId, SfxTabPage &rPage )
             ( (SvxAreaTabPage&) rPage ).SetPageType( PT_AREA );
             ( (SvxAreaTabPage&) rPage ).SetDlgType( 1 );
             ( (SvxAreaTabPage&) rPage ).SetPos( 0 );
-//          ( (SvxAreaTabPage&) rPage ).SetAreaTP( &mbAreaTP );
-//          ( (SvxAreaTabPage&) rPage ).SetGrdChgd( &mnGradientListState );
-//          ( (SvxAreaTabPage&) rPage ).SetHtchChgd( &mnHatchingListState );
-//          ( (SvxAreaTabPage&) rPage ).SetBmpChgd( &mnBitmapListState );
-//          ( (SvxAreaTabPage&) rPage ).SetColorChgd( &mnColorTableState );
             ( (SvxAreaTabPage&) rPage ).Construct();
-            // ActivatePage() wird das erste mal nicht gerufen
             ( (SvxAreaTabPage&) rPage ).ActivatePage( mrOutAttrs );
 
         break;
diff --git a/cui/source/dialogs/sdrcelldlg.src b/cui/source/dialogs/sdrcelldlg.src
index c3ece3326544..223028d45b40 100644
--- a/cui/source/dialogs/sdrcelldlg.src
+++ b/cui/source/dialogs/sdrcelldlg.src
@@ -108,34 +108,3 @@ TabDialog RID_SVX_FORMAT_CELLS_DLG
     };
     Text [ x-comment ] = " ";
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cui/source/dialogs/showcols.src b/cui/source/dialogs/showcols.src
index 465591e8f0a0..a66622a2091a 100644
--- a/cui/source/dialogs/showcols.src
+++ b/cui/source/dialogs/showcols.src
@@ -70,33 +70,3 @@ ModalDialog RID_SVX_DLG_SHOWGRIDCOLUMNS
     };
     Text [ en-US ] = "Show columns";
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx
index b2574fdb1e37..ffa88f5bf3c7 100644
--- a/cui/source/dialogs/splitcelldlg.cxx
+++ b/cui/source/dialogs/splitcelldlg.cxx
@@ -52,8 +52,6 @@ SvxSplitTableDlg::SvxSplitTableDlg( Window *pParent, bool bIsTableVertical, long
 , mnMaxVertical( nMaxVertical )
 , mnMaxHorizontal( nMaxHorizontal )
 {
-    maVertBox.SetModeRadioImage(Image(CUI_RES(BMP_SPLIT_VERT)), BMP_COLOR_HIGHCONTRAST);
-    maHorzBox.SetModeRadioImage(Image(CUI_RES(BMP_SPLIT_HORZ)), BMP_COLOR_HIGHCONTRAST);
     FreeResource();
     maHorzBox.SetClickHdl( LINK( this, SvxSplitTableDlg, ClickHdl ));
     maPropCB.SetClickHdl( LINK( this, SvxSplitTableDlg, ClickHdl ));
diff --git a/cui/source/dialogs/splitcelldlg.hrc b/cui/source/dialogs/splitcelldlg.hrc
index 143f4685abe4..7698c9687f12 100644
--- a/cui/source/dialogs/splitcelldlg.hrc
+++ b/cui/source/dialogs/splitcelldlg.hrc
@@ -33,10 +33,6 @@
 #define RB_VERT     12
 #define FL_DIR      12
 
-#define BMP_SPLIT_VERT 13
-#define BMP_SPLIT_HORZ 14
-
 #define BT_OK       100
 #define BT_CANCEL   101
 #define BT_HELP     102
-
diff --git a/cui/source/dialogs/splitcelldlg.src b/cui/source/dialogs/splitcelldlg.src
index 5326ca2d0e4d..9f435e3169b7 100644
--- a/cui/source/dialogs/splitcelldlg.src
+++ b/cui/source/dialogs/splitcelldlg.src
@@ -102,14 +102,6 @@ ModalDialog RID_SVX_SPLITCELLDLG
         Size = MAP_APPFONT ( 91 , 12 ) ;
         Text [ en-US ] = "~Into equal proportions";
     };
-    Image BMP_SPLIT_VERT
-        {
-            ImageBitmap = Bitmap { File = "zetlver2_h.bmp" ; };
-        };
-    Image BMP_SPLIT_HORZ
-        {
-            ImageBitmap = Bitmap { File = "zetlhor2_h.bmp" ; };
-        };
     ImageRadioButton RB_VERT
     {
         Pos = MAP_APPFONT ( 12 , 84 ) ;
@@ -128,5 +120,3 @@ ModalDialog RID_SVX_SPLITCELLDLG
         Text [ en-US ] = "Direction" ;
     };
 };
-
-
diff --git a/cui/source/dialogs/srchxtra.hrc b/cui/source/dialogs/srchxtra.hrc
index 5df6d9bd4767..995f0097586e 100644
--- a/cui/source/dialogs/srchxtra.hrc
+++ b/cui/source/dialogs/srchxtra.hrc
@@ -44,8 +44,4 @@
 #define NF_LONGER           21
 #define FL_SIMILARITY       22
 
-
-
-
 #endif
-
diff --git a/cui/source/dialogs/svuidlg.src b/cui/source/dialogs/svuidlg.src
index 74a8eae82274..dc3469a468a5 100644
--- a/cui/source/dialogs/svuidlg.src
+++ b/cui/source/dialogs/svuidlg.src
@@ -76,15 +76,6 @@ ModalDialog MD_PASTE_OBJECT
         Size = MAP_APPFONT ( 64 , 10 ) ;
         Text [ en-US ] = "~As icon" ;
     };
-    /*
-    FixedIcon FI_DISPLAY
-    {
-        Border = TRUE ;
-        Hide = TRUE ;
-        Pos = MAP_APPFONT ( 167 , 75 ) ;
-        Size = MAP_APPFONT ( 30 , 30 ) ;
-    };
-*/
     PushButton PB_CHANGE_ICON
     {
         Hide = TRUE ;
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index d62d0d98d63e..864e7f0775d6 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -59,7 +59,6 @@
 #include <comphelper/processfactory.hxx>
 #include <osl/file.hxx>
 
-
 #include <stack>
 #include <algorithm>
 
@@ -70,11 +69,8 @@
 using namespace ::com::sun::star;
 using ::rtl::OUString;
 
-
 #define A2S(x)          String::CreateFromAscii( x )
 
-
-
 // GetReplaceEditString -------------------------------
 
 static void GetReplaceEditString( String &rText )
@@ -117,18 +113,15 @@ LookUpComboBox_Impl::LookUpComboBox_Impl(
     EnableAutocomplete( FALSE );
 }
 
-
 LookUpComboBox_Impl::~LookUpComboBox_Impl()
 {
 }
 
-
 void LookUpComboBox_Impl::Modify()
 {
     m_aModifyTimer.Start();
 }
 
-
 IMPL_LINK( LookUpComboBox_Impl, ModifyTimer_Hdl, Timer *, EMPTYARG /*pTimer*/ )
 {
     m_rDialogImpl.LookUp( GetText() );
@@ -136,7 +129,6 @@ IMPL_LINK( LookUpComboBox_Impl, ModifyTimer_Hdl, Timer *, EMPTYARG /*pTimer*/ )
     return 0;
 }
 
-
 // class ReplaceEdit_Impl --------------------------------------------------
 
 ReplaceEdit_Impl::ReplaceEdit_Impl(
@@ -145,12 +137,10 @@ ReplaceEdit_Impl::ReplaceEdit_Impl(
 {
 }
 
-
 ReplaceEdit_Impl::~ReplaceEdit_Impl()
 {
 }
 
-
 void ReplaceEdit_Impl::Modify()
 {
     if (m_pBtn)
@@ -163,20 +153,18 @@ void ReplaceEdit_Impl::SetText( const XubString& rStr )
     Modify();
 }
 
-
 void ReplaceEdit_Impl::SetText( const XubString& rStr, const Selection& rNewSelection )
 {
     Edit::SetText( rStr, rNewSelection );
     Modify();
 }
 
-
 // class ThesaurusAlternativesCtrl_Impl ----------------------------------
 
 AlternativesString_Impl::AlternativesString_Impl(
     ThesaurusAlternativesCtrl_Impl &rControl,
     SvLBoxEntry* pEntry, USHORT nFlags, const String& rStr ) :
-    //
+
     SvLBoxString( pEntry, nFlags, rStr ),
     m_rControlImpl( rControl )
 {
@@ -203,7 +191,6 @@ void AlternativesString_Impl::Paint(
     rDev.SetFont( aOldFont );
 }
 
-
 ThesaurusAlternativesCtrl_Impl::ThesaurusAlternativesCtrl_Impl(
         Window* pParent,
         SvxThesaurusDialog_Impl &rImpl ) :
@@ -214,20 +201,17 @@ ThesaurusAlternativesCtrl_Impl::ThesaurusAlternativesCtrl_Impl(
     SetHighlightRange();
 }
 
-
 ThesaurusAlternativesCtrl_Impl::~ThesaurusAlternativesCtrl_Impl()
 {
     ClearExtraData();
 }
 
-
 void ThesaurusAlternativesCtrl_Impl::ClearExtraData()
 {
     UserDataMap_t   aEmpty;
     m_aUserData.swap( aEmpty );
 }
 
-
 void ThesaurusAlternativesCtrl_Impl::SetExtraData(
     const SvLBoxEntry *pEntry,
     const AlternativesExtraData &rData )
@@ -242,7 +226,6 @@ void ThesaurusAlternativesCtrl_Impl::SetExtraData(
         m_aUserData[ pEntry ] = rData;
 }
 
-
 AlternativesExtraData * ThesaurusAlternativesCtrl_Impl::GetExtraData(
     const SvLBoxEntry *pEntry )
 {
@@ -253,7 +236,6 @@ AlternativesExtraData * ThesaurusAlternativesCtrl_Impl::GetExtraData(
     return pRes;
 }
 
-
 SvLBoxEntry * ThesaurusAlternativesCtrl_Impl::AddEntry( sal_Int32 nVal, const String &rText, bool bIsHeader )
 {
     SvLBoxEntry* pEntry = new SvLBoxEntry;
@@ -277,7 +259,6 @@ SvLBoxEntry * ThesaurusAlternativesCtrl_Impl::AddEntry( sal_Int32 nVal, const St
     return pEntry;
 }
 
-
 void ThesaurusAlternativesCtrl_Impl::KeyInput( const KeyEvent& rKEvt )
 {
     const KeyCode& rKey = rKEvt.GetKeyCode();
@@ -290,32 +271,23 @@ void ThesaurusAlternativesCtrl_Impl::KeyInput( const KeyEvent& rKEvt )
         SvxCheckListBox::KeyInput( rKEvt );
 }
 
-
 void ThesaurusAlternativesCtrl_Impl::Paint( const Rectangle& rRect )
 {
     if (!m_rDialogImpl.m_bWordFound)
     {
-/*        Push( PUSH_FONT );
-
-        Font aFont( GetFont() );
-        aFont.SetHeight( 2 * aFont.GetHeight() );
-        SetFont( aFont );
-*/
         Size aTextSize( GetTextWidth( m_rDialogImpl.aErrStr ), GetTextHeight() );
         aTextSize  = LogicToPixel( aTextSize );
         Point aPos;
         aPos.X() += GetSizePixel().Width() / 2  - aTextSize.Width() / 2;
-        aPos.Y() += GetSizePixel().Height() / 2 /*- aTextSize.Height() / 2*/;
+        aPos.Y() += GetSizePixel().Height() / 2;
         aPos = PixelToLogic( aPos );
         DrawText( aPos, m_rDialogImpl.aErrStr );
 
-//        Pop();
     }
     else
         SvxCheckListBox::Paint( rRect );
 }
 
-
 // struct SvxThesaurusDialog_Impl ----------------------------------------
 
 SvxThesaurusDialog_Impl::SvxThesaurusDialog_Impl( SvxThesaurusDialog * pDialog ) :
@@ -335,7 +307,6 @@ SvxThesaurusDialog_Impl::SvxThesaurusDialog_Impl( SvxThesaurusDialog * pDialog )
     aCancelBtn      ( pDialog, CUI_RES( BTN_THES_CANCEL ) ),
     aErrStr                 ( CUI_RES( STR_ERR_TEXTNOTFOUND ) ),
     aVendorDefaultImage     ( CUI_RES( IMG_DEFAULT_VENDOR ) ),
-    aVendorDefaultImageHC   ( CUI_RES( IMG_DEFAULT_VENDOR_HC ) ),
     xThesaurus      ( NULL ),
     aLookUpText     (),
     nLookUpLanguage ( LANGUAGE_NONE ),
@@ -354,13 +325,11 @@ SvxThesaurusDialog_Impl::SvxThesaurusDialog_Impl( SvxThesaurusDialog * pDialog )
     Application::PostUserEvent( STATIC_LINK( this, SvxThesaurusDialog_Impl, VendorImageInitHdl ) );
 }
 
-
 SvxThesaurusDialog_Impl::~SvxThesaurusDialog_Impl()
 {
     delete aLangMBtn.GetPopupMenu();
 }
 
-
 uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL SvxThesaurusDialog_Impl::queryMeanings_Impl(
         OUString& rTerm,
         const lang::Locale& rLocale,
@@ -388,7 +357,6 @@ uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL SvxThesaurusDi
     return aMeanings;
 }
 
-
 bool SvxThesaurusDialog_Impl::UpdateAlternativesBox_Impl()
 {
     lang::Locale aLocale( SvxCreateLocale( nLookUpLanguage ) );
@@ -422,7 +390,6 @@ bool SvxThesaurusDialog_Impl::UpdateAlternativesBox_Impl()
     return nMeanings > 0;
 }
 
-
 void SvxThesaurusDialog_Impl::LookUp( const String &rText )
 {
     if (rText != aWordCB.GetText()) // avoid moving of the cursor if the text is the same
@@ -430,7 +397,6 @@ void SvxThesaurusDialog_Impl::LookUp( const String &rText )
     LookUp_Impl();
 }
 
-
 IMPL_LINK( SvxThesaurusDialog_Impl, LeftBtnHdl_Impl, Button *, pBtn )
 {
     if (pBtn && aLookUpHistory.size() >= 2)
@@ -443,7 +409,6 @@ IMPL_LINK( SvxThesaurusDialog_Impl, LeftBtnHdl_Impl, Button *, pBtn )
     return 0;
 }
 
-
 IMPL_LINK( SvxThesaurusDialog_Impl, LanguageHdl_Impl, MenuButton *, pBtn )
 {
     PopupMenu *pMenu = aLangMBtn.GetPopupMenu();
@@ -462,7 +427,6 @@ IMPL_LINK( SvxThesaurusDialog_Impl, LanguageHdl_Impl, MenuButton *, pBtn )
     return 0;
 }
 
-
 void SvxThesaurusDialog_Impl::LookUp_Impl()
 {
     String aText( aWordCB.GetText() );
@@ -482,7 +446,6 @@ void SvxThesaurusDialog_Impl::LookUp_Impl()
     aLeftBtn.Enable( aLookUpHistory.size() > 1 );
 }
 
-
 IMPL_LINK( SvxThesaurusDialog_Impl, WordSelectHdl_Impl, ComboBox *, pBox )
 {
     if (pBox && !aWordCB.IsTravelSelect())  // act only upon return key and not when traveling with cursor keys
@@ -497,7 +460,6 @@ IMPL_LINK( SvxThesaurusDialog_Impl, WordSelectHdl_Impl, ComboBox *, pBox )
     return 0;
 }
 
-
 IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesSelectHdl_Impl, SvxCheckListBox *, pBox )
 {
     SvLBoxEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL;
@@ -515,7 +477,6 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesSelectHdl_Impl, SvxCheckListBox
     return 0;
 }
 
-
 IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesDoubleClickHdl_Impl, SvxCheckListBox *, pBox )
 {
     SvLBoxEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL;
@@ -540,7 +501,6 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesDoubleClickHdl_Impl, SvxCheckLis
     return 0;
 }
 
-
 IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, SelectFirstHdl_Impl, SvxCheckListBox *, pBox )
 {
     (void) pThis;
@@ -567,7 +527,6 @@ static Image lcl_GetImageFromPngUrl( const OUString &rFileUrl )
     return aRes;
 }
 
-
 static String lcl_GetThesImplName( const lang::Locale &rLocale )
 {
     String aRes;
@@ -584,7 +543,7 @@ static String lcl_GetThesImplName( const lang::Locale &rLocale )
         if (xLngMgr.is())
         {
             uno::Sequence< OUString > aServiceNames = xLngMgr->getConfiguredServices(
-                    OUString::createFromAscii("com.sun.star.linguistic2.Thesaurus"), rLocale );
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.Thesaurus")), rLocale );
             // there should be at most one thesaurus configured for each language
             DBG_ASSERT( aServiceNames.getLength() <= 1, "more than one thesaurus found. Should not be possible" );
             if (aServiceNames.getLength() == 1)
@@ -600,7 +559,6 @@ static String lcl_GetThesImplName( const lang::Locale &rLocale )
     return aRes;
 }
 
-
 void SvxThesaurusDialog_Impl::UpdateVendorImage()
 {
     m_pDialog->SetUpdateMode( sal_False );
@@ -608,22 +566,19 @@ void SvxThesaurusDialog_Impl::UpdateVendorImage()
     SvtLinguConfig aCfg;
     if (aCfg.HasVendorImages( "ThesaurusDialogImage" ))
     {
-        const bool bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
-
         Image aImage;
         String sThesImplName( lcl_GetThesImplName( SvxCreateLocale( nLookUpLanguage ) ) );
-        OUString aThesDialogImageUrl( aCfg.GetThesaurusDialogImage( sThesImplName, bHC ) );
+        OUString aThesDialogImageUrl( aCfg.GetThesaurusDialogImage( sThesImplName ) );
         if (sThesImplName.Len() > 0 && aThesDialogImageUrl.getLength() > 0)
             aImage = Image( lcl_GetImageFromPngUrl( aThesDialogImageUrl ) );
         else
-            aImage = bHC ? aVendorDefaultImageHC : aVendorDefaultImage;
+            aImage = aVendorDefaultImage;
         aVendorImageFI.SetImage( aImage );
     }
 
     m_pDialog->SetUpdateMode( sal_True );
 }
 
-
 IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, VendorImageInitHdl, SvxThesaurusDialog_Impl *, EMPTYARG )
 {
     pThis->m_pDialog->SetUpdateMode( sal_False );
@@ -631,8 +586,7 @@ IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, VendorImageInitHdl, SvxThesaurusDialo
     SvtLinguConfig aCfg;
     if (aCfg.HasVendorImages( "ThesaurusDialogImage" ))
     {
-        const bool bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
-        Image aImage( bHC ? pThis->aVendorDefaultImageHC : pThis->aVendorDefaultImage );
+        Image aImage( pThis->aVendorDefaultImage );
         pThis->aVendorImageFI.SetImage( aImage );
         pThis->aVendorImageFI.Show();
 
@@ -683,7 +637,6 @@ IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, VendorImageInitHdl, SvxThesaurusDialo
     return 0;
 };
 
-
 // class SvxThesaurusDialog ----------------------------------------------
 
 SvxThesaurusDialog::SvxThesaurusDialog(
@@ -744,12 +697,10 @@ SvxThesaurusDialog::SvxThesaurusDialog(
         Enable( sal_False );
 }
 
-
 SvxThesaurusDialog::~SvxThesaurusDialog()
 {
 }
 
-
 void SvxThesaurusDialog::SetWindowTitle( LanguageType nLanguage )
 {
     // Sprache anpassen
@@ -761,22 +712,18 @@ void SvxThesaurusDialog::SetWindowTitle( LanguageType nLanguage )
     SetText( aStr );    // set window title
 }
 
-
 String SvxThesaurusDialog::GetWord()
 {
     return m_pImpl->aReplaceEdit.GetText();
 }
 
-
 sal_uInt16 SvxThesaurusDialog::GetLanguage() const
 {
     return m_pImpl->nLookUpLanguage;
 }
 
-
 void SvxThesaurusDialog::Apply()
 {
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/thesdlg.hrc b/cui/source/dialogs/thesdlg.hrc
index 994c933246de..aef4131db3e6 100755
--- a/cui/source/dialogs/thesdlg.hrc
+++ b/cui/source/dialogs/thesdlg.hrc
@@ -43,10 +43,7 @@
 #define CT_THES_ALTERNATIVES    25
 #define IMG_VENDOR              26
 #define IMG_DEFAULT_VENDOR      27
-#define IMG_DEFAULT_VENDOR_HC   28
 
 #define STR_ERR_TEXTNOTFOUND    101
 
-
 #endif
-
diff --git a/cui/source/dialogs/thesdlg.src b/cui/source/dialogs/thesdlg.src
index 6c6a6444b33d..ca0f69c4ef2a 100755
--- a/cui/source/dialogs/thesdlg.src
+++ b/cui/source/dialogs/thesdlg.src
@@ -138,9 +138,5 @@ ModalDialog RID_SVXDLG_THESAURUS
     {
         ImageBitmap = Bitmap { File = "vendor01.png"; };
     };
-    Image IMG_DEFAULT_VENDOR_HC
-    {
-        ImageBitmap = Bitmap { File = "vendor01h.png"; };
-    };
 };
 
diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx
index d72b8625e3ea..b2d11087f3d6 100644
--- a/cui/source/dialogs/thesdlg_impl.hxx
+++ b/cui/source/dialogs/thesdlg_impl.hxx
@@ -191,7 +191,6 @@ struct SvxThesaurusDialog_Impl
 
     String          aErrStr;
     Image           aVendorDefaultImage;
-    Image           aVendorDefaultImageHC;
 
     uno::Reference< linguistic2::XThesaurus >   xThesaurus;
     OUString                aLookUpText;
diff --git a/cui/source/dialogs/winpluginlib.cpp b/cui/source/dialogs/winpluginlib.cpp
index c7f0e0af1d61..242607952c99 100644
--- a/cui/source/dialogs/winpluginlib.cpp
+++ b/cui/source/dialogs/winpluginlib.cpp
@@ -37,7 +37,6 @@
 #include <Shlwapi.h>
 #include <stdio.h>
 
-
 #define SO_PATH_SIZE        4096
 #define MOZ_PLUGIN_DLL_NAME "npsopluginmi.dll"
 extern "C" {
@@ -81,8 +80,7 @@ int lc_isInstalled(const  char* realFilePath)
         sprintf(sSoPath,"%s", realFilePath);
         ret = 0;
     }
-    //ret =  GetCurrentDirectory( SO_PATH_SIZE, sSoPath);
-    //ret = GetEnvironmentVariable("prog", sSoPath, SO_PATH_SIZE);
+
     // GetCurrentDirectory return the char number of the string
     if(ret == 0){
         DWORD  dType = REG_SZ;
@@ -156,7 +154,6 @@ int lc_installPlugin(const  char* realFilePath)
     char sSoPath[SO_PATH_SIZE];
     DWORD  sState;
 
-
     LONG ret;
     ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE,  "SOFTWARE",  0,  KEY_READ|KEY_WRITE, &hKeySoftware);
     if(ret != ERROR_SUCCESS){
@@ -196,7 +193,6 @@ int lc_installPlugin(const  char* realFilePath)
     RegFlushKey(hStarOffice);
     RegFlushKey(hMozillaPlugins);
 
-
     if((realFilePath == NULL) || (strlen(realFilePath) == 0) || (strlen(realFilePath) >= SO_PATH_SIZE))
         ret = -1;
     else{
@@ -204,7 +200,6 @@ int lc_installPlugin(const  char* realFilePath)
         ret = 0;
     }
 
-    //ret =  GetCurrentDirectory( SO_PATH_SIZE, sSoPath);
     // GetCurrentDirectory return the char number of the string
     if(ret == 0){
         ret = RegSetValueEx( hStarOffice, "Path", 0, REG_SZ,  (LPBYTE) sSoPath, strlen(sSoPath) + 1);
diff --git a/cui/source/dialogs/zoom.hrc b/cui/source/dialogs/zoom.hrc
index 49412ad085f0..32c1cc2dc97a 100644
--- a/cui/source/dialogs/zoom.hrc
+++ b/cui/source/dialogs/zoom.hrc
@@ -50,4 +50,3 @@
 #define BTN_ZOOM_HELP                           30
 
 #endif
-
diff --git a/cui/source/dialogs/zoom.src b/cui/source/dialogs/zoom.src
index 8137b1c7bb89..67ca4ad3b957 100644
--- a/cui/source/dialogs/zoom.src
+++ b/cui/source/dialogs/zoom.src
@@ -154,4 +154,3 @@ ModalDialog RID_SVXDLG_ZOOM
 };
 
 // ********************************************************************** EOF
-
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 7683eb0bcd81..b773e3e79d09 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -132,7 +132,6 @@ short AbstractSvxZoomDialog_Impl::Execute()
     return pDlg->Execute();
 }
 
-//IMPL_ABSTDLG_BASE(AbstractSvxZoomDialog_Impl);
 IMPL_ABSTDLG_BASE(AbstractSearchProgress_Impl);
 IMPL_ABSTDLG_BASE(AbstractTakeProgress_Impl);
 IMPL_ABSTDLG_BASE(AbstractTitleDialog_Impl);
@@ -1129,7 +1128,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTextTabDialog( Window* p
     return new AbstractTabDialog_Impl( pDlg );
 }
 
-//TabDialog that use functionality of the drawing layer and add AnchorTypes  -- for SvxCaptionTabDialog CHINA001
+// TabDialog that use functionality of the drawing layer and add AnchorTypes -- for SvxCaptionTabDialog
 AbstractSvxCaptionDialog*       AbstractDialogFactory_Impl::CreateCaptionDialog( Window* pParent,
                                             const SdrView* pView,
                                             USHORT nAnchorTypes )
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 09659128b47a..3dd321a6769b 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -80,7 +80,6 @@ public:                                             \
                      {}                             \
     virtual         ~Class();                       \
     virtual short   Execute() ;
-//  virtual void    Show( BOOL bVisible = TRUE, USHORT nFlags = 0 )
 
 #define IMPL_ABSTDLG_BASE(Class)                    \
 Class::~Class()                                     \
@@ -136,11 +135,11 @@ class AbstractTabDialog_Impl : public SfxAbstractTabDialog
     DECL_ABSTDLG_BASE(AbstractTabDialog_Impl,SfxTabDialog)
     virtual void                SetCurPageId( USHORT nId );
     virtual const SfxItemSet*   GetOutputItemSet() const;
-    virtual const USHORT*       GetInputRanges( const SfxItemPool& pItem ); //add by CHINA001
-    virtual void                SetInputSet( const SfxItemSet* pInSet );   //add by CHINA001
+    virtual const USHORT*       GetInputRanges( const SfxItemPool& pItem );
+    virtual void                SetInputSet( const SfxItemSet* pInSet );
         //From class Window.
-    virtual void        SetText( const XubString& rStr ); //add by CHINA001
-    virtual String      GetText() const; //add by CHINA001
+    virtual void        SetText( const XubString& rStr );
+    virtual String      GetText() const;
 };
 
 //for SvxDistributeDialog begin
@@ -235,24 +234,7 @@ class AbstractSpellDialog_Impl : public AbstractSpellDialog
     virtual Window*     GetWindow();
     virtual SfxBindings& GetBindings();
 };
-
-//for SvxSpellCheckDialog begin
-//STRIP001 class AbstractSvxSpellCheckDialog_Impl : public AbstractSvxSpellCheckDialog //add for FmShowColsDialog
-//STRIP001 {
-//STRIP001 SvxSpellCheckDialog * pDlg;
-//STRIP001 public
-//STRIP001 AbstractSvxSpellCheckDialog_Impl ( SvxSpellCheckDialog* p)
-//STRIP001 : pDlg(p)
-//STRIP001 {}
-//STRIP001 virtual  USHORT          Execute() ;
-//STRIP001 virtual  void SetNewEditWord( const String& _rNew ) ;
-//STRIP001 virtual void SetLanguage( sal_uInt16 nLang ) ;
-//STRIP001 virtual void HideAutoCorrect() ;
-//STRIP001 virtual String   GetNewEditWord();
-//STRIP001 virtual void SetNewEditWord( const String& _rNew );
-//STRIP001 }
-//for SvxSpellCheckDialog end
-
+//for SvxSpellDialog end
 
 //for SearchProgress begin
 class SearchProgress;
@@ -642,10 +624,10 @@ public:
                                             SdrModel* pModel=0 ); //add for SvxTextTabDialog
     virtual SfxAbstractTabDialog*       CreateTabItemDialog( Window* pParent,
                                             const SfxItemSet& rSet,
-                                            sal_uInt32 nResId); //add by CHINA001
+                                            sal_uInt32 nResId);
     virtual AbstractSvxCaptionDialog*   CreateCaptionDialog( Window* pParent,
                                             const SdrView* pView,
-                                            USHORT nAnchorTypes = 0 );      //add for SvxCaptionTabDialog CHINA001
+                                            USHORT nAnchorTypes = 0 ); //add for SvxCaptionTabDialog
     virtual AbstractSvxDistributeDialog*    CreateSvxDistributeDialog(Window* pParent,
                                             const SfxItemSet& rAttr,
                                             SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone,
@@ -658,7 +640,7 @@ public:
    virtual  SfxAbstractPasteDialog*         CreatePasteDialog( Window* pParent );
    virtual  SfxAbstractLinksDialog*         CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, BOOL bHTML, sfx2::SvBaseLink* p=0  );
 
-   virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent,  //add for HangulHanjaConversionDialog CHINA001
+   virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent,  //add for HangulHanjaConversionDialog
                                             editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection );
     virtual AbstractThesaurusDialog*        CreateThesaurusDialog( Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus >  xThesaurus,
                                                 const String &rWord, sal_Int16 nLanguage );
@@ -689,11 +671,6 @@ public:
                             SfxBindings* pBindings,
                             svx::SpellDialogChildWindow* pSpellChildWindow );
 
-//STRIP001    virtual AbstractSvxSpellCheckDialog * CreateSvxSpellCheckDialog( Window* pParent, //add for SvxSpellCheckDialog
-//STRIP001    ::com::sun::star::uno::Reference<
-//STRIP001    ::com::sun::star::linguistic2::XSpellChecker1 >  &xChecker,
-//STRIP001    SvxSpellWrapper* pWrapper,
-//STRIP001    sal_uInt32 nResId);
     virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( Window* pParent, GalleryTheme* pThm );
     virtual AbstractSearchProgress * CreateSearchProgressDialog( Window* pParent,
                                             const INetURLObject& rStartURL);
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index cd7fa148462d..45cb973d3249 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -70,7 +70,7 @@ namespace svx{
 class SpellDialog;
 struct SpellErrorDescription;
 // ------------------------------------------------------------------
-class SentenceEditWindow_Impl : public MultiLineEdit/*, public SfxListener*/
+class SentenceEditWindow_Impl : public MultiLineEdit
 {
     using MultiLineEdit::SetText;
 
@@ -184,7 +184,6 @@ private:
     GroupBox        aBackgroundGB;
 
     Image           aVendorImage;
-    Image           aVendorImageHC;
 
     String          aResumeST;
     String          aIgnoreOnceST;
@@ -236,7 +235,7 @@ private:
 
     /** Retrieves the next sentence.
      */
-    bool            GetNextSentence_Impl(bool bUseSavedSentence, bool bRechek /*for rechecking the curretn sentence*/);
+    bool            GetNextSentence_Impl(bool bUseSavedSentence, bool bRechek /*for rechecking the current sentence*/);
     /** Corrects all errors that have been selected to be changed always
      */
     bool            ApplyChangeAllList_Impl(SpellPortions& rSentence, bool& bHasReplaced);
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 85b51cefaf28..71b5529a0d59 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -222,50 +222,6 @@ public:
     void ExpandEntry ( USHORT nPos, const String &rStr );
 };
 
-/*
-// class USHORTArr **********************************************************
-
-DECL_2BYTEARRAY(USHORTArr, USHORT, 10, 10)
-
-// class SfxAcceleratorConfigDialog **************************************************
-
-class SfxAcceleratorConfigDialog : public ModalDialog
-{
-    OKButton           aOKButton;
-    CancelButton       aCancelButton;
-    PushButton         aChangeButton;
-    PushButton         aRemoveButton;
-    SfxAcceleratorConfigListBox aEntriesBox;
-    FixedText          aDescriptionTextText;
-    FixedText          aDescriptionInfoText;
-    FixedLine          aKeyboardGroup;
-    FixedText          aGroupText;
-    ListBox            aGroupLBox;
-    FixedText          aFunctionText;
-    ListBox            aFunctionBox;
-    FixedText          aKeyText;
-    ListBox            aKeyBox;
-    FixedLine          aFunctionsGroup;
-
-    USHORTArr     aAccelArr;
-    USHORTArr     aFunctionArr;
-    USHORTArr     aKeyArr;
-
-    void OKHdl    ( Button  * );
-    void ChangeHdl( Button  * );
-    void RemoveHdl( Button  * );
-    void SelectHdl( ListBox *pListBox );
-
-    KeyCode PosToKeyCode   ( USHORT nPos )          const;
-    USHORT  KeyCodeToPos   ( const KeyCode &rCode ) const;
-    String  GetFunctionName( KeyFuncType eType )    const;
-
-public:
-
-    SfxAcceleratorConfigDialog( Window *pParent );
-};
-*/
-
 class SvxShortcutAssignDlg : public SfxSingleTabDialog
 {
 public:
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index d11df2b971cf..0338e23125ea 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -305,7 +305,7 @@ private:
     DECL_LINK(SelectHdl, ListBox*);
     DECL_LINK(ModifyHdl, Edit*);
 
-    void            RefillReplaceBoxes(BOOL bFromReset, //Box mit neuer Sprache fuellen
+    void            RefillReplaceBoxes(BOOL bFromReset, //Box filled with new language
                                         LanguageType eOldLanguage,
                                         LanguageType eNewLanguage);
 public:
@@ -417,7 +417,6 @@ class OfaAutoCompleteTabPage : public SfxTabPage
 
     CheckBox        aCBCollect;//Collect words
     CheckBox        aCBRemoveList;//...save the list for later use...
-    //--removed--CheckBox        aCBEndless;//
 
     FixedText       aFTExpandKey;
     ListBox         aDCBExpandKey;
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index ce6eccbfa78f..2f9cb86a55a5 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -69,11 +69,11 @@ public:
     virtual void        FillUserData();
     virtual void        PointChanged( Window* pWindow, RECT_POINT eRP );
 
-    void                ShowSelector(); // Umschalt-ListBox aktivieren
-    void                ShowTblControl(); // fuer den Writer (Zellen/Zeilen/Tabelle)
-    void                ShowParaControl(BOOL bCharOnly = FALSE); // fuer den Writer (Absatz/Zeichen)
+    void                ShowSelector(); // Shift-ListBox activation
+    void                ShowTblControl(); // for the Writer (cells/rows/tables)
+    void                ShowParaControl(BOOL bCharOnly = FALSE); // for the Writer (paragraph/characters)
     void                EnableTransparency(BOOL bColor, BOOL bGraphic);
-    virtual void        PageCreated (SfxAllItemSet aSet); //add CHINA001
+    virtual void        PageCreated (SfxAllItemSet aSet);
 protected:
     virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
 
@@ -81,7 +81,7 @@ private:
     SvxBackgroundTabPage( Window* pParent, const SfxItemSet& rCoreSet );
     ~SvxBackgroundTabPage();
 
-    // Hintergrundfarbe ------------------------------------
+    // Background color ------------------------------------
     Control                 aBorderWin;
     ValueSet                aBackgroundColorSet;
     FixedLine               aBackgroundColorBox;
@@ -89,7 +89,7 @@ private:
     //color transparency
     FixedText               aColTransFT;
     MetricField             aColTransMF;
-    // Hintergrund-Bitmap ----------------------------------
+    // Background Bitmap ----------------------------------
     PushButton              aBtnBrowse;
     CheckBox                aBtnLink;
     CheckBox                aBtnPreview;
@@ -105,13 +105,13 @@ private:
     MetricField             aGraphTransMF;
 
     BackgroundPreviewImpl*  pPreviewWin2;
-    // Selektor --------------------------------------------
+    // Selector --------------------------------------------
     FixedText               aSelectTxt;
     ListBox                 aLbSelect;
     const String            aStrBrowse;
     const String            aStrUnlinked;
 
-    // DDListBox fuer Writer -------------------------------
+    // DDListBox for Writer -------------------------------
 
     FixedText               aTblDesc;
     ListBox                 aTblLBox;
@@ -133,9 +133,9 @@ private:
     SvxBackgroundPage_Impl* pPageImpl;
     SvxOpenGraphicDialog* pImportDlg;
 
-    // Items fuer Sw-Tabelle muessen gesammelt werden
+    // Items for Sw-Table must be corrected
     SvxBackgroundTable_Impl*    pTableBck_Impl;
-    // auch fuer die Absatzvorlage
+    // also for the paragraph style
     SvxBackgroundPara_Impl* pParaBck_Impl;
 
 #ifdef _SVX_BACKGRND_CXX
diff --git a/cui/source/inc/bbdlg.hxx b/cui/source/inc/bbdlg.hxx
index 73f3bc66a122..0de4d99fa3a4 100644
--- a/cui/source/inc/bbdlg.hxx
+++ b/cui/source/inc/bbdlg.hxx
@@ -49,7 +49,7 @@ protected:
     virtual void    PageCreated( USHORT nPageId, SfxTabPage& rTabPage );
 
 private:
-    BOOL    bEnableBackgroundSelector; // fuer Border/Background-Dlg
+    BOOL    bEnableBackgroundSelector; // for Border/Background
 };
 
 
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 7b4e7fab3b62..aae0290453f2 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -59,7 +59,7 @@ public:
     virtual void        Reset( const SfxItemSet& );
 
     void                HideShadowControls();
-    virtual void        PageCreated (SfxAllItemSet aSet); //add CHINA001
+    virtual void        PageCreated (SfxAllItemSet aSet);
 protected:
     virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
     virtual void        DataChanged( const DataChangedEvent& rDCEvt );
@@ -105,7 +105,7 @@ private:
     //properties - "Merge with next paragraph" in Writer
     FixedLine           aPropertiesFL;
     CheckBox            aMergeWithNextCB;
-    // --> collapsing table borders FME 2005-05-27 #i29550#
+    // --> collapsing table borders #i29550#
     CheckBox            aMergeAdjacentBordersCB;
     // <--
 
@@ -145,7 +145,7 @@ private:
     // Filler
     void                FillLineListBox_Impl();
 
-    // Setzen von einzelnen Frame-/Core-Linien
+    // share for individual Frame-/Core-Line
     void                ResetFrameLine_Impl( svx::FrameBorderType eBorder,
                                              const SvxBorderLine* pCurLine,
                                              bool bValid );
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 5a84b2a98c14..ff02aa70ba39 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -437,7 +437,7 @@ protected:
     ::com::sun::star::uno::Reference
         < ::com::sun::star::frame::XFrame > m_xFrame;
 
-    SvxConfigPage( Window*, /* const ResId&, */ const SfxItemSet& );
+    SvxConfigPage( Window*, const SfxItemSet& );
     virtual ~SvxConfigPage();
 
     DECL_LINK( MoveHdl, Button * );
@@ -582,7 +582,6 @@ class SvxToolbarEntriesListBox : public SvxMenuEntriesListBox
     Size            m_aCheckBoxImageSizePixel;
     Link            m_aChangedListener;
     SvLBoxButtonData*   m_pButtonData;
-    BOOL            m_bHiContrastMode;
     SvxConfigPage*  pPage;
 
     void            ChangeVisibility( SvLBoxEntry* pEntry );
@@ -783,7 +782,7 @@ private:
     void ImportGraphics(
         const com::sun::star::uno::Sequence< rtl::OUString >& aURLs );
 
-    BitmapEx AutoScaleBitmap(BitmapEx & aBitmap, const long aStandardSize);// Added by shizhoubo
+    BitmapEx AutoScaleBitmap(BitmapEx & aBitmap, const long aStandardSize);
 
 public:
 
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index db8d4740b054..dbab5bf29df7 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -157,7 +157,6 @@ struct SvxConfigGroupBoxResource_Impl;
 class SfxConfigGroupListBox_Impl : public SvTreeListBox
 {
     SvxConfigGroupBoxResource_Impl* pImp;
-    //SfxSlotPool*                    pSlotPool;
     SfxConfigFunctionListBox_Impl*  pFunctionListBox;
     SfxGroupInfoArr_Impl            aArr;
     ULONG                           nMode;
@@ -171,9 +170,17 @@ class SfxConfigGroupListBox_Impl : public SvTreeListBox
     css::uno::Reference< css::container::XNameAccess > m_xModuleCategoryInfo;
     css::uno::Reference< css::container::XNameAccess > m_xUICmdDescription;
 
-    Image GetImage( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx, bool bIsRootNode, bool bHighContrast );
+    Image GetImage(
+        ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node,
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx,
+        bool bIsRootNode
+    );
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface  > getDocumentModel(
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx,
+        ::rtl::OUString& docName
+    );
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface  > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName );
     ::rtl::OUString parseLocationName( const ::rtl::OUString& location );
 
     void InitModule();
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 494d77bf7f13..dda5a8de47e4 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -82,7 +82,6 @@ public:
     using SfxTabPage::DeactivatePage;
 
     virtual void        ActivatePage( const SfxItemSet& rSet );
-//    virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
 
 };
 
@@ -254,10 +253,8 @@ private:
     DECL_LINK(          ColorBoxSelectHdl_Impl, ColorListBox* );
 
 public:
-//    using SfxTabPage::ActivatePage;
     using SfxTabPage::DeactivatePage;
 
-//    virtual void        ActivatePage( const SfxItemSet& rSet );
     virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
 
 public:
diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx
index 8bceb90b7ff4..eed7886fc6f1 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -96,7 +96,7 @@ public:
 
     void         Construct();
     void         SetView( const SdrView* pSdrView ) { pView = pSdrView; }
-    virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
+    virtual void PageCreated (SfxAllItemSet aSet);
 };
 
 /*************************************************************************
@@ -114,7 +114,6 @@ public:
     ~SvxConnectionDialog();
 };
 
-
 #endif // _SVX_CONNECT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index 987759813c27..9480141e1bb5 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -89,12 +89,10 @@ friend class SvxCharacterMap;
 
     SvxShowCharSet  aShowSet;
     SvxShowText     aShowText;
-//    SvxShowText     aShowShortcut;
     OKButton        aOKBtn;
     CancelButton    aCancelBtn;
     HelpButton      aHelpBtn;
     PushButton      aDeleteBtn;
-//    PushButton        aAssignBtn;
     FixedText       aFontText;
     ListBox         aFontLB;
     FixedText       aSubsetText;
@@ -102,7 +100,6 @@ friend class SvxCharacterMap;
     FixedText       aSymbolText;
     SvxShowText     aShowChar;
     FixedText       aCharCodeText;
-//  FixedText       aAssignText;
     Font            aFont;
     BOOL            bOne;
     const SubsetMap* pSubsetMap;
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index 52e3663707aa..68ebcc3b80c3 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -31,7 +31,7 @@
 
 #include <com/sun/star/sdbc/XResultSet.hpp>
 
-#include <svx/fmsearch.hxx> //CHINA001
+#include <svx/fmsearch.hxx>
 
 #define _SVSTDARR_STRINGSDTOR
 #include <svl/svstdarr.hxx>
@@ -55,7 +55,7 @@ namespace svxform {
 }
 
 // ===================================================================================================
-// = class FmSearchDialog - Dialog fuer Suchen in Formularen/Tabellen
+// = class FmSearchDialog - Dialog for searching in Forms/Tables
 // ===================================================================================================
 
 struct FmSearchProgress;
@@ -66,7 +66,7 @@ class FmSearchDialog : public ModalDialog
 {
     friend class FmSearchEngine;
 
-    // meine ganzen Controls
+    // my all Controls
     FixedLine       m_flSearchFor;
     RadioButton     m_rbSearchForText;
     RadioButton     m_rbSearchForNull;
@@ -104,19 +104,19 @@ class FmSearchDialog : public ModalDialog
 
     Window*         m_pPreSearchFocus;
 
-    Link    m_lnkFoundHandler;          // Handler fuer "gefunden"
-    Link    m_lnkCanceledNotFoundHdl;   // Handler fuer Positionierung des Cursors
+    Link    m_lnkFoundHandler;          // Handler for "found"
+    Link    m_lnkCanceledNotFoundHdl;   // Handler for Positioning the Cursors
 
-    Link    m_lnkContextSupplier;       // fuer Suche in verschiedenen Kontexten
+    Link    m_lnkContextSupplier;       // for search in contexts
 
-    // ein Array, in dem ich mir fuer jeden Kontext das aktuell selektierte Feld merke
+    // an Array, in dem ich mir fuer jeden Kontext das aktuell selektierte Feld merke
     ::std::vector<String> m_arrContextFields;
 
     // fuer die eigentliche Arbeit ...
     FmSearchEngine* m_pSearchEngine;
 
     Timer           m_aDelayedPaint;
-        // siehe EnableSearchUI
+        // see EnableSearchUI
 
     ::svxform::FmSearchConfigItem*      m_pConfig;
 public:
@@ -183,7 +183,7 @@ protected:
     void SaveParams() const;
 
 private:
-    // Handler fuer die Controls
+    // Handler for the Controls
     DECL_LINK( OnClickedFieldRadios, Button* );
     DECL_LINK( OnClickedSearchAgain, Button* );
     DECL_LINK( OnClickedSpecialSettings, Button* );
@@ -201,7 +201,7 @@ private:
     DECL_LINK( OnSearchProgress, FmSearchProgress* );
 
     DECL_LINK( OnDelayedPaint, void* );
-        // siehe EnableSearchUI
+        // see EnableSearchUI
 
     void implMoveControls(Control** _ppControls, sal_Int32 _nControls, sal_Int32 _nUp, Control* _pToResize);
 
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index ac1bf38ad904..9fa35dd4dc87 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -40,30 +40,7 @@
 #include <svx/graphctl.hxx>
 #include <svx/dlgctrl.hxx>
 #include <svx/rectenum.hxx>
-/*
-// ---------------
-// - Error codes -
-// ---------------
 
-#define SVX_GRAPHICFILTER_ERRCODE_NONE              0x00000000
-#define SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE   0x00000001
-#define SVX_GRAPHICFILTER_UNSUPPORTED_SLOT          0x00000002
-
-// --------------------
-// - SvxGraphicFilter -
-// --------------------
-
-class SfxRequest;
-class SfxItemSet;
-
-class SvxGraphicFilter
-{
-public:
-
-    static ULONG    ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject );
-    static void     DisableGraphicFilterSlots( SfxItemSet& rSet );
-};
-*/
 // -----------------------
 // - GraphicFilterDialog -
 // -----------------------
diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx
index c183473da03b..3c2d1ebc10cf 100644
--- a/cui/source/inc/cuihyperdlg.hxx
+++ b/cui/source/inc/cuihyperdlg.hxx
@@ -95,7 +95,6 @@ protected:
     virtual BOOL            Close();
     virtual void            Move();
 
-//    virtual long          PreNotify( NotifyEvent& rNEvt );
 public:
     SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings );
     ~SvxHpLinkDlg ();
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 023d9281de94..27756e8c4db0 100755
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -76,8 +76,6 @@
 #define RID_SVXSTR_PAGEDIR_RTL_VERT         (RID_SVX_START + 967)
 #define RID_SVXSTR_PAGEDIR_LTR_VERT         (RID_SVX_START + 968)
 #define RID_STR_EDIT_GRAPHIC                (RID_SVX_START + 509)
-#define RID_SVXIMG_LOAD_H                   (RID_SVX_START + 283)
-#define RID_SVXIMG_SAVE_H                   (RID_SVX_START + 284)
 
 #define RID_SVXSTR_DESC_GRADIENT            (RID_SVX_START + 163)
 #define RID_SVXSTR_ASK_DEL_GRADIENT         (RID_SVX_START + 165)
@@ -133,7 +131,6 @@
 #define RID_OFADLG_OPTIONS_TREE_PAGES   (RID_OFA_START + 116)
 #define RID_OFADLG_OPTIONS_TREE         (RID_OFA_START + 115)
 #define RID_IMGLIST_TREEOPT             (RID_OFA_START + 174)
-#define RID_IMGLIST_TREEOPT_HC          (RID_OFA_START + 175)
 #define RID_RIDER_SLL_SITE              (RID_OFA_START + 100)//?
 #define RID_RIDER_SLL_PERSONAL          (RID_OFA_START + 101)//?
 #define RID_OFADLG_OPTIONS_TREE_HINT    (RID_OFA_START + 118)//?
@@ -180,7 +177,6 @@
 #define RID_SVXSTR_PATH_NAME_START          (RID_SVX_START + 1003)
 #define RID_SVXDLG_FILTER_WARNING           (RID_SVX_START + 248)
 #define RID_SVXBMP_LOCK                     (RID_SVX_START + 118)
-#define RID_SVXBMP_LOCK_HC                  (RID_SVX_START + 119)
 #define RID_SVXSTR_READONLY_CONFIG_TIP      (RID_SVX_START + 1026)
 #define RID_SVXQB_CHANGEDATA                (RID_SVX_START + 214)       //?
 #define RID_SVXERR_OPT_DOUBLEPATHS          (RID_SVX_START + 208)       //?
@@ -219,10 +215,6 @@
 
 // hyperlink dialog
 #define RID_SVXDLG_NEWHYPERLINK             (RID_SVX_START + 227)
-#define RID_SVXBMP_HLINETTP_H               (RID_SVX_START + 272)
-#define RID_SVXBMP_HLMAILTP_H               (RID_SVX_START + 273)
-#define RID_SVXBMP_HLDOCTP_H                (RID_SVX_START + 274)
-#define RID_SVXBMP_HLDOCNTP_H               (RID_SVX_START + 275)
 #define RID_SVXBMP_HLINETTP                 (RID_SVX_START + 556)
 #define RID_SVXBMP_HLMAILTP                 (RID_SVX_START + 557)
 #define RID_SVXBMP_HLDOCTP                  (RID_SVX_START + 558)
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index bc7c024fd35e..25af5b0283b4 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -42,7 +42,6 @@ class SvxAreaTabDialog : public SfxTabDialog
 {
 private:
     SdrModel*           mpDrawModel;
-//  const SdrView*      mpView;
 
     XColorTable*        mpColorTab;
     XColorTable*        mpNewColorTab;
@@ -120,10 +119,8 @@ class SvxTransparenceTabPage : public SvxTabPage
     const SfxItemSet&   rOutAttrs;
     RECT_POINT          eRP;
 
-    //CHINA001 UINT16*             pPageType;
-    //CHINA001 UINT16*             pDlgType;
-    UINT16             nPageType; //add CHINA001
-    UINT16             nDlgType;  //add CHINA001
+    UINT16             nPageType;
+    UINT16             nDlgType;
 
     // main selection
     FixedLine           aFlProp;
@@ -188,11 +185,9 @@ public:
     virtual int  DeactivatePage(SfxItemSet* pSet);
     virtual void PointChanged(Window* pWindow, RECT_POINT eRP);
 
-    //CHINA001 void SetPageType(UINT16 *pInType) { pPageType = pInType; }
-    //CHINA001 void SetDlgType(UINT16* pInType) { pDlgType = pInType; }
-    void SetPageType(UINT16 nInType) { nPageType = nInType; } //add CHINA001
-    void SetDlgType(UINT16 nInType) { nDlgType = nInType; }//add CHINA001
-    virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
+    void SetPageType(UINT16 nInType) { nPageType = nInType; }
+    void SetDlgType(UINT16 nInType) { nDlgType = nInType; }
+    virtual void PageCreated (SfxAllItemSet aSet);
 };
 
 /*************************************************************************
@@ -258,12 +253,9 @@ private:
     ChangeType*         pnGradientListState;
     ChangeType*         pnHatchingListState;
 
-    //CHINA001 USHORT*             pPageType;
-    //CHINA001 USHORT*             pDlgType;
-    //CHINA001 USHORT*             pPos;
-    UINT16 nPageType; //add CHINA001
-    UINT16 nDlgType;//add CHINA001
-    UINT16 nPos; //add CHINA001
+    UINT16 nPageType;
+    UINT16 nDlgType;
+    UINT16 nPos;
 
     BOOL*               pbAreaTP;
 
@@ -287,7 +279,6 @@ private:
     DECL_LINK( ToggleHatchBckgrdColorHdl_Impl, void * );
     DECL_LINK( ClickBitmapHdl_Impl, void * );
     DECL_LINK( ModifyBitmapHdl_Impl, void * );
-//  DECL_LINK( ModifyTransparentHdl_Impl, void * );
     DECL_LINK( ModifyStepCountHdl_Impl, void * );
     DECL_LINK( ModifyTileHdl_Impl, void * );
     DECL_LINK( ClickScaleHdl_Impl, void * );
@@ -314,14 +305,11 @@ public:
                 { pHatchingList = pHtchLst; }
     void    SetBitmapList( XBitmapList* pBmpLst) { pBitmapList = pBmpLst; }
 
-    //CHINA001 void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
-    void    SetPageType( UINT16 nInType ) { nPageType = nInType; } //add CHINA001
-    //CHINA001 void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
-    void    SetDlgType( UINT16 nInType ) { nDlgType = nInType; }//add CHINA001
-    //CHINA001 void    SetPos( USHORT* pInPos ) { pPos = pInPos; }
-    void    SetPos( UINT16 nInPos ) { nPos = nInPos; }//add CHINA001
+    void    SetPageType( UINT16 nInType ) { nPageType = nInType; }
+    void    SetDlgType( UINT16 nInType ) { nDlgType = nInType; }
+    void    SetPos( UINT16 nInPos ) { nPos = nInPos; }
     void    SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
-    virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
+    virtual void PageCreated (SfxAllItemSet aSet);
     void    SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
     void    SetGrdChgd( ChangeType* pIn ) { pnGradientListState = pIn; }
     void    SetHtchChgd( ChangeType* pIn ) { pnHatchingListState = pIn; }
@@ -357,8 +345,8 @@ private:
 
     XColorTable*        pColorTab;
     ChangeType*         pnColorTableState;
-    UINT16              nPageType;  //add CHINA001
-    UINT16              nDlgType;   //add CHINA001
+    UINT16              nPageType;
+    UINT16              nDlgType;
     USHORT*             pPos;
     BOOL*               pbAreaTP;
 
@@ -388,13 +376,11 @@ public:
     virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
 
     void    SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
-//CHINA001  void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
-//CHINA001  void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
-    void    SetPageType( UINT16 nInType ) { nPageType = nInType; } //add CHINA001
-    void    SetDlgType( UINT16 nInType ) { nDlgType = nInType; }    //add CHINA001
+    void    SetPageType( UINT16 nInType ) { nPageType = nInType; }
+    void    SetDlgType( UINT16 nInType ) { nDlgType = nInType; }
     void    SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
     void    SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
-    virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
+    virtual void PageCreated (SfxAllItemSet aSet);
     void    DisablePage( BOOL bIn ) { bDisable = bIn; }
 };
 
@@ -798,7 +784,6 @@ public:
     virtual void FillUserData();
 };
 
-
 #endif // _CUI_TAB_AREA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index efb22b2ff607..0f7fca4b6cba 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -174,8 +174,8 @@ private:
     ChangeType*         pnLineEndListState;
     ChangeType*         pnDashListState;
     ChangeType*         pnColorTableState;
-    UINT16             nPageType; //add CHINA001
-    UINT16             nDlgType; //add CHINA001
+    UINT16             nPageType;
+    UINT16             nDlgType;
     USHORT*             pPosDashLb;
     USHORT*             pPosLineEndLb;
 
@@ -190,7 +190,6 @@ private:
     DECL_STATIC_LINK( SvxLineTabPage, GraphicArrivedHdl_Impl, SvxBrushItem* );
     DECL_LINK( SizeHdl_Impl, MetricField * );
     DECL_LINK( RatioHdl_Impl, CheckBox * );
-    // <- Symbole
 
 #ifdef _SVX_TPLINE_CXX
     DECL_LINK( ClickInvisibleHdl_Impl, void * );
@@ -215,7 +214,6 @@ public:
 
     void    Construct();
 
-
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
     static  USHORT*    GetRanges();
 
@@ -234,8 +232,8 @@ public:
     void    SetLineEndList( XLineEndList* pLneEndLst) { pLineEndList = pLneEndLst; }
     void    SetObjSelected( BOOL bHasObj ) { bObjSelected = bHasObj; }
 
-    void    SetPageType( UINT16 nInType ) { nPageType = nInType; }//CHINA001 void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
-    void    SetDlgType( UINT16 nInType ) { nDlgType = nInType; }    //CHINA001 void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
+    void    SetPageType( UINT16 nInType ) { nPageType = nInType; }
+    void    SetDlgType( UINT16 nInType ) { nDlgType = nInType; }
     void    SetPosDashLb( USHORT* pInPos ) { pPosDashLb = pInPos; }
     void    SetPosLineEndLb( USHORT* pInPos ) { pPosLineEndLb = pInPos; }
 
@@ -243,7 +241,7 @@ public:
     void    SetDashChgd( ChangeType* pIn ) { pnDashListState = pIn; }
     void    SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
 
-    virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
+    virtual void PageCreated (SfxAllItemSet aSet);
     virtual void    DataChanged( const DataChangedEvent& rDCEvt );
 };
 
@@ -426,7 +424,6 @@ public:
     virtual void    DataChanged( const DataChangedEvent& rDCEvt );
 };
 
-
 #endif // _CUI_TAB_LINE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/dialmgr.hxx b/cui/source/inc/dialmgr.hxx
index 4d5f4f115931..de8931edbce7 100644
--- a/cui/source/inc/dialmgr.hxx
+++ b/cui/source/inc/dialmgr.hxx
@@ -34,17 +34,17 @@
 
 // forward ---------------------------------------------------------------
 
+#define CUI_MGR()   (*CuiResMgr::GetResMgr())
+#define CUI_RES(i)      ResId(i,CUI_MGR())
+#define CUI_RESSTR(i)   UniString(ResId(i,CUI_MGR()))
+#define CUI_RESSSTR(i)  String(ResId(i,CUI_MGR()))
+
 class ResMgr;
 struct CuiResMgr
 {
     static ResMgr*      GetResMgr();
 };
 
-#define CUI_MGR()   (*CuiResMgr::GetResMgr())
-#define CUI_RES(i)      ResId(i,CUI_MGR())
-#define CUI_RESSTR(i)   UniString(ResId(i,CUI_MGR()))
-#define CUI_RESSSTR(i)  String(ResId(i,CUI_MGR()))
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx
index 7c38ffa7c5c5..c26a3c82257d 100644
--- a/cui/source/inc/dstribut.hxx
+++ b/cui/source/inc/dstribut.hxx
@@ -31,30 +31,7 @@
 #include <svx/dlgctrl.hxx>
 #include <vcl/group.hxx>
 #include <vcl/fixed.hxx>
-#include <svx/dstribut_enum.hxx> //CHINA001
-/*************************************************************************
-|*
-\************************************************************************/
-
-/*
-enum SvxDistributeHorizontal
-{
-    SvxDistributeHorizontalNone = 0,
-    SvxDistributeHorizontalLeft,
-    SvxDistributeHorizontalCenter,
-    SvxDistributeHorizontalDistance,
-    SvxDistributeHorizontalRight
-};
-
-enum SvxDistributeVertical
-{
-    SvxDistributeVerticalNone = 0,
-    SvxDistributeVerticalTop,
-    SvxDistributeVerticalCenter,
-    SvxDistributeVerticalDistance,
-    SvxDistributeVerticalBottom
-};
-*/
+#include <svx/dstribut_enum.hxx>
 
 /*************************************************************************
 |*
diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx
index 0bd7309fd953..a44363aeb105 100644
--- a/cui/source/inc/hldocntp.hxx
+++ b/cui/source/inc/hldocntp.hxx
@@ -51,11 +51,10 @@ private:
     sal_Bool            ImplGetURLObject( const String& rPath, const String& rBase, INetURLObject& aURLObject ) const;
     void                FillDocumentList ();
 
-    DECL_LINK (ClickNewHdl_Impl          , void * );        // Button : New
+    DECL_LINK (ClickNewHdl_Impl          , void * );
 
     Image GetImage( USHORT nId );
-    void ReadURLFile( const String& rFile, String& rTitle, String& rURL, sal_Int32& rIconId, BOOL* pShowAsFolder);//, String* pFrame, String* pOpenAs, String* pDefTempl, String* pDefURL );
-    //String ReadURL_Impl( Config& rURLFile, const DirEntry& rFile );
+    void ReadURLFile( const String& rFile, String& rTitle, String& rURL, sal_Int32& rIconId, BOOL* pShowAsFolder);
 
 protected:
     void FillDlgFields     ( String& aStrURL );
diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx
index a8e3df5e3a2d..ff3fd1698714 100644
--- a/cui/source/inc/hldoctp.hxx
+++ b/cui/source/inc/hldoctp.hxx
@@ -55,15 +55,15 @@ private:
 
     BOOL                mbMarkWndOpen;
 
-    DECL_LINK (ClickFileopenHdl_Impl  , void * );       // Button : Fileopen
-    DECL_LINK (ClickTargetHdl_Impl    , void * );       // Button : Target
+    DECL_LINK (ClickFileopenHdl_Impl  , void * );
+    DECL_LINK (ClickTargetHdl_Impl    , void * );
 
-    DECL_LINK (ModifiedPathHdl_Impl  , void * );        // Contens of combobox "Path" modified
-    DECL_LINK (ModifiedTargetHdl_Impl, void * );        // Contens of editfield "Target" modified
+    DECL_LINK (ModifiedPathHdl_Impl  , void * ); // Contens of combobox "Path" modified
+    DECL_LINK (ModifiedTargetHdl_Impl, void * ); // Contens of editfield "Target" modified
 
-    DECL_LINK (LostFocusPathHdl_Impl,  void * );        // Combobox "path" lost its focus
+    DECL_LINK (LostFocusPathHdl_Impl,  void * ); // Combobox "path" lost its focus
 
-    DECL_LINK (TimeoutHdl_Impl      ,  Timer * );       // Handler for timer -timeout
+    DECL_LINK (TimeoutHdl_Impl      ,  Timer * );   // Handler for timer -timeout
 
     enum EPathType { Type_Unknown, Type_Invalid,
                      Type_ExistsFile, Type_File,
diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx
index 024637e77991..e5691351a999 100644
--- a/cui/source/inc/hlmarkwn.hxx
+++ b/cui/source/inc/hlmarkwn.hxx
@@ -34,7 +34,7 @@
 #include <vcl/button.hxx>
 #include <svtools/svtreebx.hxx>
 
-#include "hlmarkwn_def.hxx" //ADD CHINA001
+#include "hlmarkwn_def.hxx"
 class SvxHyperlinkTabPageBase;
 
 //########################################################################
@@ -69,7 +69,6 @@ private:
 
     PushButton      maBtApply;
     PushButton      maBtClose;
-    //SvTreeListBox maLbTree;
     SvxHlmarkTreeLBox maLbTree;
 
     BOOL            mbUserMoved;
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index f93f5f346c9e..3d6a84a144a7 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -83,10 +83,7 @@ class SvxHyperURLBox : public SvtURLBox, public DropTargetHelper
 private:
     BOOL   mbAccessAddress;
 
-//  String GetAllEmailNamesFromDragItem( USHORT nItem );
-
 protected:
-
     virtual sal_Int8    AcceptDrop( const AcceptDropEvent& rEvt );
     virtual sal_Int8    ExecuteDrop( const ExecuteDropEvent& rEvt );
 
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 38725c02ecb7..a81f4970212e 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -245,11 +245,6 @@ public :
         CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/,
         BOOL bItemsOnDemand = FALSE, ULONG nPos = LIST_APPEND );
 
-    SvxIconChoiceCtrlEntry* AddTabPage(
-        USHORT nId, const String& rIconText, const Image& rChoiceIcon, const Image& rChoiceIconHC,
-        CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/,
-        BOOL bItemsOnDemand = FALSE, ULONG nPos = LIST_APPEND );
-
     void                RemoveTabPage( USHORT nId );
 
     void                SetCurPageId( USHORT nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); }
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index c4c9254a0894..e35a83144c82 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -61,7 +61,6 @@ private:
     CheckBox        aCB_LAENGE;
 
     Image*          mpBmpCapTypes[CAPTYPE_BITMAPS_COUNT];
-    Image*          mpBmpCapTypesH[CAPTYPE_BITMAPS_COUNT];
 
     String          aStrHorzList;
     String          aStrVertList;
@@ -115,7 +114,6 @@ public:
 class SvxCaptionTabDialog : public SfxTabDialog
 {
 private:
-//  const SfxItemSet&   rOutAttrs;
     const SdrView*      pView;
     USHORT              nAnchorCtrls;
 
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index c469410c4247..eb169352b0e3 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -134,10 +134,6 @@ public:
     virtual             ~SvxMacroAssignSingleTabDialog();
 
     void                SetTabPage( SfxTabPage* pTabPage );
-    // SfxTabPage*          GetTabPage() const { return pPage; }
-
-    // OKButton*            GetOKButton() const { return pOKBtn; }
-    // CancelButton*        GetCancelButton() const { return pCancelBtn; }
 
 private:
     SfxViewFrame*       pFrame;
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index 035232349443..268b4d9dd301 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -105,7 +105,7 @@ public:
 
     void         Construct();
     void         SetView( const SdrView* pSdrView ) { pView = pSdrView; }
-    virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
+    virtual void PageCreated (SfxAllItemSet aSet);
 };
 
 /*************************************************************************
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 12cac90278d6..865efbdef5e1 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -42,13 +42,6 @@
 #include <svx/langbox.hxx>
 #include <svx/fontlb.hxx>
 
-//CHINA001 #define SVX_NUMVAL_STANDARD      -1234.12345678901234
-//CHINA001 #define SVX_NUMVAL_CURRENCY      -1234
-//CHINA001 #define SVX_NUMVAL_PERCENT       -0.1295
-//CHINA001 #define SVX_NUMVAL_TIME      36525.5678935185
-//CHINA001 #define SVX_NUMVAL_DATE      36525.5678935185
-//CHINA001 #define SVX_NUMVAL_BOOLEAN       1
-
 //------------------------------------------------------------------------
 
 class SvxNumberFormatShell;
@@ -108,7 +101,7 @@ public:
     void                    SetOkHdl( const Link& rOkHandler );
     void                    HideLanguage(BOOL nFlag=TRUE);
     virtual long            PreNotify( NotifyEvent& rNEvt );
-    virtual void            PageCreated (SfxAllItemSet aSet); //add CHINA001
+    virtual void            PageCreated (SfxAllItemSet aSet);
 private:
     SvxNumberFormatTabPage( Window* pParent,
                             const SfxItemSet& rCoreAttrs );
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index c56001f196f5..c06924ec90ad 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -49,9 +49,8 @@ class ValueSet;
 class SvxNumberingPreview;
 class SvxBrushItem;
 
-/*-----------------13.02.97 14.02-------------------
 
---------------------------------------------------*/
+//------------------------------------------------
 
 struct SvxNumSettings_Impl
 {
@@ -70,9 +69,8 @@ struct SvxNumSettings_Impl
 typedef SvxNumSettings_Impl* SvxNumSettings_ImplPtr;
 SV_DECL_PTRARR_DEL(SvxNumSettingsArr_Impl,SvxNumSettings_ImplPtr,8,4)
 
-/*-----------------07.02.97 11.36-------------------
 
---------------------------------------------------*/
+//------------------------------------------------
 class SvxSingleNumPickTabPage : public SfxTabPage
 {
     using TabPage::ActivatePage;
@@ -110,9 +108,8 @@ class SvxSingleNumPickTabPage : public SfxTabPage
     void                SetNumCharFmtName(const String& rName){sNumCharFmtName = rName;}
 };
 
-/*-----------------07.02.97 11.36-------------------
 
---------------------------------------------------*/
+//------------------------------------------------
 
 class SvxBulletPickTabPage : public SfxTabPage
 {
@@ -146,10 +143,10 @@ class SvxBulletPickTabPage : public SfxTabPage
     virtual void        Reset( const SfxItemSet& rSet );
 
     void                SetCharFmtName(const String& rName){sBulletCharFmtName = rName;}
-    virtual void        PageCreated(SfxAllItemSet aSet); // add CHINA001
+    virtual void        PageCreated(SfxAllItemSet aSet);
 };
 
-/*-----------------07.02.97 11.36-------------------
+/*--------------------------------------------------
     TabPage fuer vollstaendig Numerierung
 --------------------------------------------------*/
 #define NUMTYPE_MEMBER 4   // Anzahl der Elemente des FormatStrings je Ebene
@@ -194,12 +191,11 @@ class SvxNumPickTabPage : public SfxTabPage
     void                SetCharFmtNames(const String& rCharName, const String& rBulName)
                             {   sNumCharFmtName = rCharName;
                                 sBulletCharFmtName = rBulName;}
-    virtual void        PageCreated(SfxAllItemSet aSet); // add CHINA001
+    virtual void        PageCreated(SfxAllItemSet aSet);
 };
 
-/*-----------------12.02.97 07.42-------------------
 
---------------------------------------------------*/
+//------------------------------------------------
 class SvxBitmapPickTabPage : public SfxTabPage
 {
     using TabPage::ActivatePage;
@@ -242,9 +238,7 @@ class SvxBitmapPickTabPage : public SfxTabPage
     void                SetNumCharFmtName(const String& rName){sNumCharFmtName = rName;}
 };
 
-/*-----------------01.12.97 16:13-------------------
-
---------------------------------------------------*/
+//------------------------------------------------
 class SvxNumOptionsTabPage : public SfxTabPage
 {
     using TabPage::ActivatePage;
@@ -350,7 +344,6 @@ class SvxNumOptionsTabPage : public SfxTabPage
     virtual BOOL        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
-//???   void                SetWrtShell(SwWrtShell* pSh);
     void                SetCharFmts(const String& rNumName, const String& rBulletName )
                                 {
                                     sNumCharFmtName = rNumName;
@@ -360,12 +353,10 @@ class SvxNumOptionsTabPage : public SfxTabPage
 
     ListBox&            GetCharFmtListBox() {return aCharFmtLB;}
     void                SetModified(BOOL bRepaint = TRUE);
-    virtual void        PageCreated(SfxAllItemSet aSet); // add CHINA001
+    virtual void        PageCreated(SfxAllItemSet aSet);
 };
 
-/*-----------------03.12.97 10:18-------------------
-
---------------------------------------------------*/
+//------------------------------------------------
 class SvxNumPositionTabPage : public SfxTabPage
 {
     using TabPage::ActivatePage;
@@ -386,7 +377,6 @@ class SvxNumPositionTabPage : public SfxTabPage
     MetricField         aDistNumMF;
     FixedText           aAlignFT;
     ListBox             aAlignLB;
-    // <--
 
     // new set of controls shown for numbering rules containing list level
     // attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_ALIGNMENT
@@ -400,7 +390,6 @@ class SvxNumPositionTabPage : public SfxTabPage
     MetricField         aAlignedAtMF;
     FixedText           aIndentAtFT;
     MetricField         aIndentAtMF;
-    // <--
 
     PushButton          aStandardPB;
 
@@ -452,7 +441,7 @@ public:
 
     void                SetMetric(FieldUnit eSet);
     void                SetModified(BOOL bRepaint = TRUE);
-    virtual void        PageCreated(SfxAllItemSet aSet); // add CHINA001
+    virtual void        PageCreated(SfxAllItemSet aSet);
 };
 
 #endif
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index 8fba32b2bbd1..e7f4506c4796 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -41,15 +41,6 @@
 #include <i18npool/paper.hxx>
 #include <svx/flagsdef.hxx>
 
-// enum ------------------------------------------------------------------
-
-//CHINA001 enum SvxModeType
-//CHINA001 {
-//CHINA001  SVX_PAGE_MODE_STANDARD,
-//CHINA001  SVX_PAGE_MODE_CENTER,
-//CHINA001  SVX_PAGE_MODE_PRESENTATION
-//CHINA001 };
-
 // class SvxPageDescPage -------------------------------------------------
 
 /*  {k:\svx\prototyp\dialog\page.bmp}
@@ -232,7 +223,7 @@ public:
                             { ePaperStart = eStart, ePaperEnd = eEnd; }
 
     void                SetCollectionList(const List* pList);
-    virtual void        PageCreated (SfxAllItemSet aSet); //add CHINA001
+    virtual void        PageCreated (SfxAllItemSet aSet);
 };
 
 #endif // #ifndef _SVX_PAGE_HXX
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 579ea4a4a6ad..7182d2b0d91a 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -39,12 +39,6 @@
 #include <vcl/lstbox.hxx>
 #include <svx/flagsdef.hxx>
 
-// define ----------------------------------------------------------------
-
-// 1/2 cm in TWIPS
-// wird auch fuer Minimalgrosse der LayFrms aller Arten benutzt
-//CHINA001 #define MM50   283
-
 // forward ---------------------------------------------------------------
 
 class SvxLineSpacingItem;
@@ -142,7 +136,7 @@ public:
     void                    EnableAutoFirstLine();
     void                    EnableAbsLineDist(long nMinTwip);
     void                    EnableNegativeMode();
-    virtual void            PageCreated(SfxAllItemSet aSet); // add CHINA001
+    virtual void            PageCreated(SfxAllItemSet aSet);
 };
 
 // class SvxParaAlignTabPage ------------------------------------------------
@@ -197,7 +191,7 @@ public:
     virtual void            Reset( const SfxItemSet& rSet );
 
     void                    EnableJustifyExt();
-    virtual void            PageCreated(SfxAllItemSet aSet); // add CHINA001
+    virtual void            PageCreated(SfxAllItemSet aSet);
 };
 
 // class SvxExtParagraphTabPage ------------------------------------------
@@ -242,10 +236,8 @@ private:
     TriStateBox         aHyphenBox;
     FixedText           aBeforeText;
     NumericField        aExtHyphenBeforeBox;
-//  FixedText           aHyphenBeforeLabel;
     FixedText           aAfterText;
     NumericField        aExtHyphenAfterBox;
-//  FixedText           aHyphenAfterLabel;
     FixedText           aMaxHyphenLabel;
     NumericField        aMaxHyphenEdit;
     FixedLine           aExtFL;
@@ -291,11 +283,10 @@ private:
     DECL_LINK( PageBreakPosHdl_Impl, ListBox* );
     DECL_LINK( PageBreakTypeHdl_Impl, ListBox* );
 #endif
-    virtual void            PageCreated(SfxAllItemSet aSet); // add CHINA001
+    virtual void            PageCreated(SfxAllItemSet aSet);
 };
-/* -----------------------------29.11.00 11:33--------------------------------
 
- ---------------------------------------------------------------------------*/
+//--------------------------------------------------------------------------
 class SvxAsianTabPage : public SfxTabPage
 {
     FixedLine       aOptionsFL;
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 685de4367180..4182e4c729b0 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -47,13 +47,7 @@
 #include <hash_map>
 
 #define OBJTYPE_BASICMANAGER    1L
-//#define OBJTYPE_LIB               2L
-//#define OBJTYPE_MODULE            3L
 #define OBJTYPE_METHOD          2L
-//#define OBJTYPE_METHODINOBJ       5L
-//#define OBJTYPE_OBJECT            6L
-//#define OBJTYPE_SUBOBJ            7L
-//#define OBJTYPE_PROPERTY      8L
 #define OBJTYPE_SCRIPTCONTAINER     3L
 #define OBJTYPE_SFROOT      4L
 
@@ -78,13 +72,9 @@ class SFTreeListBox : public SvTreeListBox
 private:
     USHORT          nMode;
     Image m_hdImage;
-    Image m_hdImage_hc;
     Image m_libImage;
-    Image m_libImage_hc;
     Image m_macImage;
-    Image m_macImage_hc;
     Image m_docImage;
-    Image m_docImage_hc;
     ::rtl::OUString m_sMyMacros;
     ::rtl::OUString m_sProdMacros;
 
@@ -215,7 +205,6 @@ protected:
     String      getListOfChildren( ::com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node, int depth );
     void        StoreCurrentSelection();
     void        RestorePreviousSelection();
-    //String                GetInfo( SbxVariable* pVar );
 
 public:
                     // prob need another arg in the ctor
@@ -225,7 +214,6 @@ public:
 
     virtual short   Execute();
 
-    //DECL_LINK( ActivatePageHdl, TabControl * );
 };
 
 class SvxScriptErrorDialog : public VclAbstractDialog
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index 5ea0be27a980..7ca6dbeb3054 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -150,17 +150,21 @@ class SvxConfigGroupListBox_Impl : public SvTreeListBox
         < ::com::sun::star::container::XNameAccess > m_xModuleCommands;
 
     Image m_hdImage;
-    Image m_hdImage_hc;
     Image m_libImage;
-    Image m_libImage_hc;
     Image m_macImage;
-    Image m_macImage_hc;
     Image m_docImage;
-    Image m_docImage_hc;
     ::rtl::OUString m_sMyMacros;
     ::rtl::OUString m_sProdMacros;
-    Image GetImage( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx, bool bIsRootNode, bool bHighContrast );
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface  > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName );
+    Image GetImage(
+        ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node,
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx,
+        bool bIsRootNode
+    );
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface  > getDocumentModel(
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx,
+        ::rtl::OUString& docName
+    );
 
 private:
     void    fillScriptList(
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index 79d63daa8b9f..b6175bb0bf28 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -43,22 +43,6 @@
 
 class TabWin_Impl;
 
-// define ----------------------------------------------------------------
-
-// Bitfelder f"ur DisableControls()
-//CHINA001 #define TABTYPE_LEFT     0x0001
-//CHINA001 #define TABTYPE_RIGHT        0x0002
-//CHINA001 #define TABTYPE_CENTER       0x0004
-//CHINA001 #define TABTYPE_DEZIMAL      0x0008
-//CHINA001 #define TABTYPE_ALL          0x000F
-//CHINA001
-//CHINA001 #define TABFILL_NONE     0x0010
-//CHINA001 #define TABFILL_POINT        0x0020
-//CHINA001 #define TABFILL_DASHLINE     0x0040
-//CHINA001 #define TABFILL_SOLIDLINE    0x0080
-//CHINA001 #define TABFILL_SPECIAL      0x0100
-//CHINA001 #define TABFILL_ALL          0x01F0
-
 // class SvxTabulatorTabPage ---------------------------------------------
 /*
     {k:\svx\prototyp\dialog\tabstop.bmp}
@@ -152,7 +136,7 @@ private:
     DECL_LINK( GetFillCharHdl_Impl, Edit* );
     DECL_LINK( GetDezCharHdl_Impl, Edit* );
 #endif
-    virtual void            PageCreated(SfxAllItemSet aSet); // add CHINA001
+    virtual void            PageCreated(SfxAllItemSet aSet);
 };
 
 #endif // #ifndef _SVX_TABSTPGE_HXX
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index 427e94e26870..b713c232aee5 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -51,7 +51,6 @@ private:
     FixedLine           aFlEffect;
     FixedText           aFtEffects;
     ListBox             aLbEffect;
-    //ValueSet          aCtlEffect;
     FixedText           aFtDirection;
     ImageButton         aBtnUp;
     ImageButton         aBtnLeft;
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 8c427bef17d1..acb77178de36 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -149,8 +149,6 @@ private:
     DECL_LINK( ChangeSizeProtectHdl, void * );
     DECL_LINK( ChangePosXHdl, void * );
     DECL_LINK( ChangePosYHdl, void * );
-//  DECL_LINK( SetAnchorHdl, ListBox * );
-//  DECL_LINK( SetOrientHdl, ListBox * );
 
     void SetMinMaxPosition();
     void GetTopLeftPosition(double& rfX, double& rfY, const basegfx::B2DRange& rRange);
@@ -183,7 +181,6 @@ public:
     void         Construct();
     void         SetView( const SdrView* pSdrView ) { mpView = pSdrView; }
 
-//  void         ShowAnchorCtrls(USHORT nAnchorCtrls); // Writer-spezifische Controls anzeigen
     virtual void FillUserData();
 
     void        DisableResize();
@@ -263,11 +260,9 @@ private:
     FixedLine           aFlRadius;
     FixedText           aFtRadius;
     MetricField         aMtrRadius;
-    //TriStateBox           aTsbVertical;
     FixedLine           aFlAngle;
     FixedText           aFtAngle;
     MetricField         aMtrAngle;
-    //SvxRectCtl            aCtlAngle;
 
     const SfxItemSet&   rOutAttrs;
 
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 35f51d7b0183..bcd2904449ad 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -44,7 +44,6 @@ CreateTabPage   GetSSOCreator( void );
 
 // class OfaOptionsTreeListBox -------------------------------------------
 
-//!#define NUMBER_OF_OPTION_PAGES  12
 class SfxModule;
 class SfxShell;
 class SfxItemSet;
@@ -189,7 +188,6 @@ private:
     FixedImage      aHelpImg;
 
     ImageList       aPageImages;
-    ImageList       aPageImagesHC;
 
     ResStringArray  aHelpTextsArr;
 
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index e80e1fd867a7..b33be88ebf32 100644
--- a/cui/source/options/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -171,11 +171,11 @@ bool SvxChartColorTable::operator==( const SvxChartColorTable & _rOther ) const
 // ====================
 
 SvxChartOptions::SvxChartOptions() :
-    ::utl::ConfigItem( rtl::OUString::createFromAscii( "Office.Chart" )),
+    ::utl::ConfigItem( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Chart") ) ),
     mbIsInitialized( FALSE )
 {
     maPropertyNames.realloc( 1 );
-    maPropertyNames[ 0 ] = ::rtl::OUString::createFromAscii( "DefaultColor/Series" );
+    maPropertyNames[ 0 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultColor/Series") );
 }
 
 SvxChartOptions::~SvxChartOptions()
diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx
index 6caab1652ff1..ad93e38ac2fc 100644
--- a/cui/source/options/connpoolconfig.cxx
+++ b/cui/source/options/connpoolconfig.cxx
@@ -51,42 +51,42 @@ namespace offapp
     //--------------------------------------------------------------------
     static const ::rtl::OUString& getConnectionPoolNodeName()
     {
-        static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("org.openoffice.Office.DataAccess/ConnectionPool");
+        static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.DataAccess/ConnectionPool") );
         return s_sNodeName;
     }
 
     //--------------------------------------------------------------------
     static const ::rtl::OUString& getEnablePoolingNodeName()
     {
-        static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("EnablePooling");
+        static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("EnablePooling"));
         return s_sNodeName;
     }
 
     //--------------------------------------------------------------------
     static const ::rtl::OUString& getDriverSettingsNodeName()
     {
-        static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("DriverSettings");
+        static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("DriverSettings"));
         return s_sNodeName;
     }
 
     //--------------------------------------------------------------------
     static const ::rtl::OUString& getDriverNameNodeName()
     {
-        static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("DriverName");
+        static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("DriverName"));
         return s_sNodeName;
     }
 
     //--------------------------------------------------------------------
     static const ::rtl::OUString& getEnableNodeName()
     {
-        static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("Enable");
+        static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("Enable"));
         return s_sNodeName;
     }
 
     //--------------------------------------------------------------------
     static const ::rtl::OUString& getTimeoutNodeName()
     {
-        static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("Timeout");
+        static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("Timeout"));
         return s_sNodeName;
     }
 
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index 9c37502c5ff4..68d4d3a9644c 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -107,7 +107,6 @@ namespace offapp
 
     //--------------------------------------------------------------------
     DriverListControl::DriverListControl( Window* _pParent, const ResId& _rId)
-//      :DriverListControl_Base(_pParent, _rId, DBBF_NOROWPICTURE, BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL | BROWSER_COLUMNSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL | BROWSER_HIDESELECT | BROWSER_CURSOR_WO_FOCUS)
         :DriverListControl_Base(_pParent, _rId, EBBF_NOROWPICTURE, BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL | BROWSER_HIDECURSOR | BROWSER_AUTOSIZE_LASTCOL)
         ,m_aSeekRow(m_aSettings.end())
         ,m_sYes(ResId(STR_YES,*_rId.GetResMgr()))
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index bc856f37ad20..8c0d0c3fc9fe 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -413,8 +413,7 @@ void DbRegistrationOptionsPage::insertNewEntry( const ::rtl::OUString& _sName,co
     SvLBoxEntry* pEntry = NULL;
     if ( _bReadOnly )
     {
-        sal_Bool bHighContrast = pPathBox->GetDisplayBackground().GetColor().IsDark();
-        Image aLocked( CUI_RES( bHighContrast ? RID_SVXBMP_LOCK_HC : RID_SVXBMP_LOCK ) );
+        Image aLocked( CUI_RES( RID_SVXBMP_LOCK ) );
         pEntry = pPathBox->InsertEntry( aStr, aLocked, aLocked );
     }
     else
diff --git a/cui/source/options/dbregister.src b/cui/source/options/dbregister.src
index 444d4faac22d..6b2fb2fa5a33 100644
--- a/cui/source/options/dbregister.src
+++ b/cui/source/options/dbregister.src
@@ -34,7 +34,6 @@
 #define STD_MASKCOLOR Color { Red=0xffff; Green=0x0000; Blue=0xffff; }
 TabPage RID_SFXPAGE_DBREGISTER
 {
-    // HelpId = HID_OPTIONS_DBREGISTER ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Hide = TRUE ;
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index f2fcf7aa2550..12af2c5da37f 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -83,7 +83,6 @@ namespace svx
 
         validate();
 
-        //  m_aURL.SetHelpId( HID_DOCLINKEDIT_URL );
         m_aURL.SetDropDownLineCount( 5 );
     }
 
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index e9da5da794db..af302be381c5 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -137,7 +137,6 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent,
     sHeader += sHeader3;
     sHeader += sTabSpace;
     sHeader += sHeader4;
-//   sHeader += sTabSpace;
     aCheckLB.InsertHeaderEntry(sHeader);
 
     HeaderBar* pBar = aCheckLB.GetTheHeaderBar();
@@ -377,9 +376,8 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, Window*, pWin)
 
     return 0;
 }
-/* -----------------------------29.08.2002 11:47------------------------------
 
- ---------------------------------------------------------------------------*/
+//--------------------------------------------------------------------------
 IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, CheckBox*, pBox)
 {
     String sFontName = aFontNameLB.GetSelectEntry();
@@ -397,9 +395,6 @@ IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, CheckBox*, pBox)
     aFontNameLB.SelectEntry(sFontName);
     return 0;
 }
-/*********************************************************************/
-/*                                                                   */
-/*********************************************************************/
 
 void SvxFontSubstTabPage::CheckEnable()
 {
@@ -415,14 +410,6 @@ void SvxFontSubstTabPage::CheckEnable()
         sEntry += '\t';
         sEntry += aFont2CB.GetText();
 
-/*      if (!aFont1CB.GetText().Len() || !aFont2CB.GetText().Len() ||
-            aFont1CB.GetText() == aFont2CB.GetText() ||
-            aCheckLB.GetEntryPos(sEntry) != 0xffffffff ||
-            (pEntry != 0 && aCheckLB.NextSelected(pEntry) != 0))
-            bApply = FALSE;
-        else
-            bApply = TRUE;*/
-
         // Wegen OS/2-Optimierungsfehler (Bug #56267) etwas umstaendlicher:
         if (!aFont1CB.GetText().Len() || !aFont2CB.GetText().Len())
             bApply = FALSE;
@@ -468,10 +455,6 @@ void SvxFontSubstTabPage::CheckEnable()
     aFont2CB.Enable(bEnableAll);
 }
 
-/*********************************************************************/
-/*                                                                   */
-/*********************************************************************/
-
 void SvxFontSubstCheckListBox::SetTabs()
 {
     SvxSimpleTable::SetTabs();
@@ -485,9 +468,7 @@ void SvxFontSubstCheckListBox::SetTabs()
     pTab->nFlags &= ~nAdjust;
     pTab->nFlags |= SV_LBOXTAB_PUSHABLE|SV_LBOXTAB_ADJUST_CENTER|SV_LBOXTAB_FORCE;
 }
-/* -----------------------------22.05.2002 11:06------------------------------
 
- ---------------------------------------------------------------------------*/
 void    SvxFontSubstCheckListBox::KeyInput( const KeyEvent& rKEvt )
 {
     if(!rKEvt.GetKeyCode().GetModifier() &&
@@ -515,10 +496,6 @@ void    SvxFontSubstCheckListBox::KeyInput( const KeyEvent& rKEvt )
         SvxSimpleTable::KeyInput(rKEvt);
 }
 
-/*********************************************************************/
-/*                                                                   */
-/*********************************************************************/
-
 void SvxFontSubstCheckListBox::CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChecked)
 {
     if ( nPos < GetEntryCount() )
@@ -529,10 +506,6 @@ void SvxFontSubstCheckListBox::CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChec
                                        SvButtonState( SV_BUTTON_UNCHECKED ) );
 }
 
-/*********************************************************************/
-/*                                                                   */
-/*********************************************************************/
-
 void SvxFontSubstCheckListBox::CheckEntry(SvLBoxEntry* pEntry, USHORT nCol, BOOL bChecked)
 {
     if ( pEntry )
@@ -543,28 +516,16 @@ void SvxFontSubstCheckListBox::CheckEntry(SvLBoxEntry* pEntry, USHORT nCol, BOOL
                                        SvButtonState( SV_BUTTON_UNCHECKED ) );
 }
 
-/*********************************************************************/
-/*                                                                   */
-/*********************************************************************/
-
 BOOL SvxFontSubstCheckListBox::IsChecked(ULONG nPos, USHORT nCol)
 {
     return GetCheckButtonState( GetEntry(nPos), nCol ) == SV_BUTTON_CHECKED;
 }
 
-/*********************************************************************/
-/*                                                                   */
-/*********************************************************************/
-
 BOOL SvxFontSubstCheckListBox::IsChecked(SvLBoxEntry* pEntry, USHORT nCol)
 {
     return GetCheckButtonState( pEntry, nCol ) == SV_BUTTON_CHECKED;
 }
 
-/*********************************************************************/
-/*                                                                   */
-/*********************************************************************/
-
 void SvxFontSubstCheckListBox::SetCheckButtonState( SvLBoxEntry* pEntry, USHORT nCol, SvButtonState eState)
 {
     SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1));
@@ -590,10 +551,6 @@ void SvxFontSubstCheckListBox::SetCheckButtonState( SvLBoxEntry* pEntry, USHORT
     }
 }
 
-/*********************************************************************/
-/*                                                                   */
-/*********************************************************************/
-
 SvButtonState SvxFontSubstCheckListBox::GetCheckButtonState( SvLBoxEntry* pEntry, USHORT nCol ) const
 {
     SvButtonState eState = SV_BUTTON_UNCHECKED;
diff --git a/cui/source/options/fontsubs.hrc b/cui/source/options/fontsubs.hrc
index e23bcf2365a3..bb6386c37223 100644
--- a/cui/source/options/fontsubs.hrc
+++ b/cui/source/options/fontsubs.hrc
@@ -39,7 +39,6 @@
 #define TBX_SUBSTNEWDEL         6
 #define BT_SUBSTAPPLY           7
 #define BT_SUBSTDELETE          8
-//#define BT_SUBSTINFO            9
 
 #define STR_HEADER1             10
 #define STR_HEADER2             11
@@ -58,5 +57,3 @@
 #define STR_AUTOMATIC           28
 
 #endif
-
-
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index ddae7a3af68e..153ad24de1f5 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -122,15 +122,4 @@ public:
 
 #endif // _SVX_FONT_SUBSTITUTION_HXX
 
-
-
-
-
-
-
-
-
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/fontsubs.src b/cui/source/options/fontsubs.src
index 1b5f3298913e..20ceb4af6adc 100644
--- a/cui/source/options/fontsubs.src
+++ b/cui/source/options/fontsubs.src
@@ -36,10 +36,6 @@
 
 
 /**************************************************************************/
-/*                                                                        */
-/*                                                                        */
-/*                                                                        */
-/**************************************************************************/
 
 TabPage RID_SVX_FONT_SUBSTITUTION
 {
diff --git a/cui/source/options/internationaloptions.cxx b/cui/source/options/internationaloptions.cxx
index 9166eabe3996..f003ec944cda 100644
--- a/cui/source/options/internationaloptions.cxx
+++ b/cui/source/options/internationaloptions.cxx
@@ -99,11 +99,6 @@ namespace offapp
                                     m_aRB_TxtDirLeft2Right.IsChecked() ),
                     SID_ATTR_PARA_LEFT_TO_RIGHT );
 
-        // handling of SheetView stuff
-//      if( m_bEnable_SheetView_Opt )
-//      {
-//      }
-
         return TRUE;
     }
 
@@ -117,13 +112,6 @@ namespace offapp
         BOOL                bLeft2Right = pLeft2RightItem? pLeft2RightItem->GetValue() : TRUE;
         m_aRB_TxtDirLeft2Right.Check( bLeft2Right );
 
-        // handling of SheetView stuff
-//      if( m_bEnable_SheetView_Opt )
-//      {
-//          m_aCB_ShtVwRight2Left.Check( FALSE );
-//
-//          m_aCB_ShtVwCurrentDocOnly.Check( FALSE );
-//      }
     }
 
     InternationalOptionsPage::InternationalOptionsPage( Window* _pParent, const SfxItemSet& _rAttrSet ) :
@@ -142,7 +130,6 @@ namespace offapp
     SfxTabPage* InternationalOptionsPage::CreateSc( Window* _pParent, const SfxItemSet& _rAttrSet )
     {
         InternationalOptionsPage*   p = new InternationalOptionsPage( _pParent, _rAttrSet );
-//      p->m_pImpl->EnableOption_SheetView();
         return p;
     }
 
@@ -161,6 +148,6 @@ namespace offapp
         m_pImpl->Reset( _rSet );
     }
 
-}   // /namespace offapp
+}   // namespace offapp
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/internationaloptions.src b/cui/source/options/internationaloptions.src
index 3acd1ac2766c..b07baaf47aa8 100644
--- a/cui/source/options/internationaloptions.src
+++ b/cui/source/options/internationaloptions.src
@@ -80,24 +80,3 @@ TabPage RID_OFA_TP_INTERNATIONAL
         Text [ en-US ] = "~Current document only";
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index 02678936e05e..e2a76f3e4a6f 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -162,7 +162,6 @@ void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet& )
     m_aAnimatedGraphics.Check(        m_pImpl->m_aConfig.GetIsAllowAnimatedGraphics() );
     m_aAnimatedTexts.Check(           m_pImpl->m_aConfig.GetIsAllowAnimatedText() );
     m_aAutomaticFontColor.Check(      m_pImpl->m_aConfig.GetIsAutomaticFontColor() );
-//  m_aSystemFont.Check(              m_pImpl->m_aConfig.GetIsSystemFont() );
     m_aTextSelectionInReadonly.Check( m_pImpl->m_aConfig.IsSelectionInReadonly() );
     m_aAutoDetectHC.Check(            m_pImpl->m_aConfig.GetAutoDetectSystemHC() );
 
diff --git a/cui/source/options/optaccessibility.hrc b/cui/source/options/optaccessibility.hrc
index 35c02cc3e756..6cc5e0a891d1 100644
--- a/cui/source/options/optaccessibility.hrc
+++ b/cui/source/options/optaccessibility.hrc
@@ -64,8 +64,6 @@
 #define DIFF(v1,v2)             (v2-v1)
 #define SUM(v1,v2)              (v2+v1)
 
-//
-
 #define FL_MISCELLANEOUS        1
 #define CB_PAGE_PREVIEWS        2
 #define FL_HC_OPTIONS           3
diff --git a/cui/source/options/optaccessibility.src b/cui/source/options/optaccessibility.src
index 4d7e1985d838..8f2afb38f574 100644
--- a/cui/source/options/optaccessibility.src
+++ b/cui/source/options/optaccessibility.src
@@ -125,28 +125,3 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
         Text [ en-US ] = "~Use system colors for page previews";
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 154ccb9d59d0..50284925852e 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -92,9 +92,7 @@ struct SvxAsianLayoutPage_Impl
     SvxForbiddenChars_Impl* getForbiddenCharacters(LanguageType eLang);
     void                    addForbiddenCharacters(LanguageType eLang, ForbiddenCharacters* pForbidden);
 };
-/* -----------------------------24.01.01 14:50--------------------------------
 
- ---------------------------------------------------------------------------*/
 SvxForbiddenCharacterTable_Impl::~SvxForbiddenCharacterTable_Impl()
 {
     for( SvxForbiddenChars_Impl*  pDel = First(); pDel; pDel = Next() )
@@ -103,16 +101,12 @@ SvxForbiddenCharacterTable_Impl::~SvxForbiddenCharacterTable_Impl()
         delete pDel;
     }
 }
-/* -----------------------------24.01.01 14:50--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool    SvxAsianLayoutPage_Impl::hasForbiddenCharacters(LanguageType eLang)
 {
     return 0 != aChangedLanguagesTbl.Get(eLang);
 }
-/* -----------------------------24.01.01 14:50--------------------------------
 
- ---------------------------------------------------------------------------*/
 SvxForbiddenChars_Impl* SvxAsianLayoutPage_Impl::getForbiddenCharacters(LanguageType eLang)
 {
     SvxForbiddenChars_Impl* pImp = aChangedLanguagesTbl.Get(eLang);
@@ -121,9 +115,7 @@ SvxForbiddenChars_Impl* SvxAsianLayoutPage_Impl::getForbiddenCharacters(Language
         return pImp;
     return 0;
 }
-/* -----------------------------24.01.01 14:50--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SvxAsianLayoutPage_Impl::addForbiddenCharacters(
     LanguageType eLang, ForbiddenCharacters* pForbidden)
 {
@@ -143,9 +135,7 @@ void SvxAsianLayoutPage_Impl::addForbiddenCharacters(
     }
 
 }
-/*-- 09.01.01 13:29:02---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 static LanguageType eLastUsedLanguageTypeForForbiddenCharacters = USHRT_MAX;
 
 SvxAsianLayoutPage::SvxAsianLayoutPage( Window* pParent, const SfxItemSet& rSet ) :
@@ -178,23 +168,17 @@ SvxAsianLayoutPage::SvxAsianLayoutPage( Window* pParent, const SfxItemSet& rSet
 
     aLanguageLB.SetLanguageList( LANG_LIST_FBD_CHARS, FALSE, FALSE );
 }
-/*-- 09.01.01 13:29:02---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SvxAsianLayoutPage::~SvxAsianLayoutPage()
 {
     delete pImpl;
 }
-/*-- 09.01.01 13:29:02---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SfxTabPage* SvxAsianLayoutPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
 {
     return new SvxAsianLayoutPage(pParent, rAttrSet);
 }
-/*-- 09.01.01 13:29:03---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 BOOL SvxAsianLayoutPage::FillItemSet( SfxItemSet& )
 {
     if(aCharKerningRB.IsChecked() != aCharKerningRB.GetSavedValue())
@@ -251,9 +235,7 @@ BOOL SvxAsianLayoutPage::FillItemSet( SfxItemSet& )
 
     return FALSE;
 }
-/*-- 09.01.01 13:29:03---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvxAsianLayoutPage::Reset( const SfxItemSet& )
 {
     SfxViewFrame* pCurFrm = SfxViewFrame::Current();
@@ -340,9 +322,7 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet& )
     aLanguageLB.SelectLanguage( eLastUsedLanguageTypeForForbiddenCharacters );
     LanguageHdl(&aLanguageLB);
 }
-/* -----------------------------17.01.01 11:02--------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK(SvxAsianLayoutPage, LanguageHdl, SvxLanguageBox*, EMPTYARG )
 {
     //set current value
@@ -408,9 +388,7 @@ IMPL_LINK(SvxAsianLayoutPage, LanguageHdl, SvxLanguageBox*, EMPTYARG )
 
     return 0;
 }
-/* -----------------------------17.01.01 11:02--------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK(SvxAsianLayoutPage, ChangeStandardHdl, CheckBox*, pBox)
 {
     sal_Bool bCheck = pBox->IsChecked();
@@ -422,9 +400,7 @@ IMPL_LINK(SvxAsianLayoutPage, ChangeStandardHdl, CheckBox*, pBox)
     ModifyHdl(&aStartED);
     return 0;
 }
-/* -----------------------------17.01.01 12:26--------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit)
 {
     Locale aLocale;
@@ -442,12 +418,10 @@ IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit)
                 ForbiddenCharacters aSet;
                 aSet.beginLine = sStart;
                 aSet.endLine = sEnd;
-//              pImpl->xForbidden->setForbiddenCharacters( aLocale, aSet );
                 pImpl->addForbiddenCharacters(eSelectLanguage, &aSet);
             }
             else
                 pImpl->addForbiddenCharacters(eSelectLanguage, 0);
-//              pImpl->xForbidden->removeForbiddenCharacters( aLocale );
         }
         catch(Exception&)
         {
@@ -457,9 +431,7 @@ IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit)
     pImpl->aConfig.SetStartEndChars( aLocale, bEnable ? &sStart : 0, bEnable ? &sEnd : 0);
     return 0;
 }
-/*-- 07.09.2007 12:05:09---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 USHORT* SvxAsianLayoutPage::GetRanges()
 {
     //no items are used
diff --git a/cui/source/options/optasian.src b/cui/source/options/optasian.src
index c9a2c9606c98..564294f8afc1 100644
--- a/cui/source/options/optasian.src
+++ b/cui/source/options/optasian.src
@@ -136,39 +136,3 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
     };
     Text [ en-US ] = "Proxy";
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index f13f6f659cc1..f9eebcca1c28 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -381,9 +381,6 @@ sal_Int16 lcl_getGroup( sal_Int32 _nFeature )
     return nRet;
 }
 
-/* -----------------------------25.03.2002 17:05------------------------------
-
----------------------------------------------------------------------------*/
 ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rResId) :
         Window(pParent, rResId),
         aGeneralBackWN(this),
diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx
index 1f31a3da6420..57d90ec574a8 100644
--- a/cui/source/options/optcolor.hxx
+++ b/cui/source/options/optcolor.hxx
@@ -35,9 +35,6 @@
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
 
-/* -----------------------------25.03.2002 10:40------------------------------
-
- ---------------------------------------------------------------------------*/
 namespace svtools {class EditableColorConfig;class EditableExtendedColorConfig;}
 class ColorConfigCtrl_Impl;
 class AbstractSvxNameDialog; //CHINA001 class SvxNameDialog;
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 7a03329d209f..8e35b22a028b 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -120,10 +120,6 @@ BOOL OfaMSFilterTabPage::FillItemSet( SfxItemSet& )
     return FALSE;
 }
 
-/*-----------------02.09.96 13.47-------------------
-
---------------------------------------------------*/
-
 void OfaMSFilterTabPage::Reset( const SfxItemSet& )
 {
     SvtFilterOptions* pOpt = SvtFilterOptions::Get();
@@ -151,9 +147,6 @@ void OfaMSFilterTabPage::Reset( const SfxItemSet& )
 
 }
 
-/*-----------------29.06.00 13:22-------------------
- *
- * --------------------------------------------------*/
 OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent,
                                         const SfxItemSet& rSet )
     : SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_MSFILTEROPT2 ), rSet ),
@@ -358,9 +351,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::HBarClick()
 {
     // Sortierung durch diese Ueberladung abgeklemmt
 }
-/* -----------------------------2002/06/20 11:51------------------------------
 
- ---------------------------------------------------------------------------*/
 void OfaMSFilterTabPage2::MSFltrSimpleTable::SetCheckButtonState(
                             SvLBoxEntry* pEntry, USHORT nCol, SvButtonState eState)
 {
@@ -386,9 +377,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::SetCheckButtonState(
         InvalidateEntry( pEntry );
     }
 }
-/* -----------------------------2002/06/20 11:56------------------------------
 
- ---------------------------------------------------------------------------*/
 SvButtonState OfaMSFilterTabPage2::MSFltrSimpleTable::GetCheckButtonState(
                                     SvLBoxEntry* pEntry, USHORT nCol ) const
 {
@@ -404,9 +393,7 @@ SvButtonState OfaMSFilterTabPage2::MSFltrSimpleTable::GetCheckButtonState(
 
     return eState;
 }
-/* -----------------------------2002/06/20 11:57------------------------------
 
- ---------------------------------------------------------------------------*/
 void OfaMSFilterTabPage2::MSFltrSimpleTable::CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChecked)
 {
     if ( nPos < GetEntryCount() )
@@ -416,9 +403,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::CheckEntryPos(ULONG nPos, USHORT nC
             bChecked ? SvButtonState( SV_BUTTON_CHECKED ) :
                                        SvButtonState( SV_BUTTON_UNCHECKED ) );
 }
-/* -----------------------------2002/06/20 11:51------------------------------
 
- ---------------------------------------------------------------------------*/
 void OfaMSFilterTabPage2::MSFltrSimpleTable::KeyInput( const KeyEvent& rKEvt )
 {
     if(!rKEvt.GetKeyCode().GetModifier() &&
diff --git a/cui/source/options/optfltr.src b/cui/source/options/optfltr.src
index b6e8932136de..b586bb454503 100644
--- a/cui/source/options/optfltr.src
+++ b/cui/source/options/optfltr.src
@@ -96,20 +96,20 @@ TabPage RID_OFAPAGE_MSFILTEROPT
 
     FixedLine GB_PPOINT
     {
-        Pos = MAP_APPFONT ( 6 , 99 ) ;
+        Pos = MAP_APPFONT ( 6 , 113 ) ;
         Size = MAP_APPFONT ( 248 , 8 ) ;
         Text [ en-US ] = "Microsoft PowerPoint 97/2000/XP";
     };
     CheckBox CB_PBAS_CODE
     {
-        Pos = MAP_APPFONT ( 12 , 110 ) ;
+        Pos = MAP_APPFONT ( 12 , 124 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Load Ba~sic code";
     };
     CheckBox CB_PBAS_STG
     {
-        Pos = MAP_APPFONT ( 12 , 124 ) ;
+        Pos = MAP_APPFONT ( 12 , 138 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Sav~e original Basic code";
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index aff379aa2f46..b3ce0a34e296 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -136,7 +136,7 @@ namespace
             if ( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) )
             {
                 #ifdef ENABLE_GTK
-                return ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.GtkFilePicker" );
+                return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.GtkFilePicker") );
                 #else
                 return rtl::OUString();
                 #endif
@@ -144,7 +144,7 @@ namespace
             else if ( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde4" ) )
             {
                 #ifdef ENABLE_KDE4
-                return ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.KDE4FilePicker" );
+                return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.KDE4FilePicker") );
                 #else
                 return rtl::OUString();
                 #endif
@@ -152,15 +152,15 @@ namespace
             else if ( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) )
             {
                 #ifdef ENABLE_KDE
-                return ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.KDEFilePicker" );
+                return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.KDEFilePicker") );
                 #else
                 return rtl::OUString();
                 #endif
             }
             #if defined WNT
-            return ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.SystemFilePicker" );
+            return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker") );
             #elif (defined MACOSX && defined QUARTZ)
-            return ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.AquaFilePicker" );
+            return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.AquaFilePicker") );
             #else
             return rtl::OUString();
             #endif
@@ -570,30 +570,30 @@ CanvasSettings::CanvasSettings() :
         Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory();
         Reference<XMultiServiceFactory> xConfigProvider(
             xFactory->createInstance(
-                OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))),
                 UNO_QUERY_THROW );
 
         Any propValue(
             makeAny( PropertyValue(
-                         OUString::createFromAscii("nodepath"), -1,
-                         makeAny( OUString::createFromAscii("/org.openoffice.Office.Canvas") ),
+                         OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), -1,
+                         makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Canvas")) ),
                          PropertyState_DIRECT_VALUE ) ) );
 
         mxForceFlagNameAccess.set(
             xConfigProvider->createInstanceWithArguments(
-                OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess")),
                 Sequence<Any>( &propValue, 1 ) ),
             UNO_QUERY_THROW );
 
         propValue = makeAny(
             PropertyValue(
-                OUString::createFromAscii("nodepath"), -1,
-                makeAny( OUString::createFromAscii("/org.openoffice.Office.Canvas/CanvasServiceList") ),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), -1,
+                makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Canvas/CanvasServiceList")) ),
                 PropertyState_DIRECT_VALUE ) );
 
         Reference<XNameAccess> xNameAccess(
             xConfigProvider->createInstanceWithArguments(
-                OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")),
                 Sequence<Any>( &propValue, 1 ) ), UNO_QUERY_THROW );
         Reference<XHierarchicalNameAccess> xHierarchicalNameAccess(
             xNameAccess, UNO_QUERY_THROW);
@@ -610,7 +610,7 @@ CanvasSettings::CanvasSettings() :
             if( xEntryNameAccess.is() )
             {
                 Sequence<OUString> preferredImplementations;
-                if( (xEntryNameAccess->getByName( OUString::createFromAscii("PreferredImplementations") ) >>= preferredImplementations) )
+                if( (xEntryNameAccess->getByName( OUString(RTL_CONSTASCII_USTRINGPARAM("PreferredImplementations")) ) >>= preferredImplementations) )
                     maAvailableImplementations.push_back( std::make_pair(*pCurr,preferredImplementations) );
             }
 
@@ -648,7 +648,7 @@ BOOL CanvasSettings::IsHardwareAccelerationAvailable() const
                                                           pCurrImpl->trim() ),
                                                       UNO_QUERY_THROW );
                     bool bHasAccel(false);
-                    if( (xPropSet->getPropertyValue(OUString::createFromAscii("HardwareAcceleration")) >>= bHasAccel) )
+                    if( (xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("HardwareAcceleration"))) >>= bHasAccel) )
                         if( bHasAccel )
                         {
                             mbHWAccelAvailable = true;
@@ -675,7 +675,7 @@ BOOL CanvasSettings::IsHardwareAccelerationEnabled() const
     if( !mxForceFlagNameAccess.is() )
         return true;
 
-    if( !(mxForceFlagNameAccess->getByName( OUString::createFromAscii("ForceSafeServiceImpl") ) >>= bForceLastEntry) )
+    if( !(mxForceFlagNameAccess->getByName( OUString(RTL_CONSTASCII_USTRINGPARAM("ForceSafeServiceImpl")) ) >>= bForceLastEntry) )
         return true;
 
     return !bForceLastEntry;
@@ -690,7 +690,7 @@ void CanvasSettings::EnabledHardwareAcceleration( BOOL _bEnabled ) const
     if( !xNameReplace.is() )
         return;
 
-    xNameReplace->replaceByName( OUString::createFromAscii("ForceSafeServiceImpl"),
+    xNameReplace->replaceByName( OUString(RTL_CONSTASCII_USTRINGPARAM("ForceSafeServiceImpl")),
                                  makeAny(!_bEnabled) );
 
     Reference< XChangesBatch > xChangesBatch(
@@ -843,14 +843,18 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
     {
         ::rtl::OUString aAutoStr( aIconStyleLB.GetEntry( 0 ) );
 
-        aAutoStr += ::rtl::OUString::createFromAscii( " (" );
+        aAutoStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" (") );
 
-        ULONG nAutoStyle = aStyleSettings.GetAutoSymbolsStyle();
+        // prefer the icon style set by the desktop native widgets modules
+        ULONG nAutoStyle = aStyleSettings.GetPreferredSymbolsStyle();
+        // fallback to the statically defined values
+        if ( nAutoStyle == STYLE_SYMBOLS_AUTO || !aIconStyleItemId[nAutoStyle] )
+            nAutoStyle = aStyleSettings.GetAutoSymbolsStyle();
         if ( aIconStyleItemId[nAutoStyle] )
             aAutoStr += aIconStyleLB.GetEntry( aIconStyleItemId[nAutoStyle] );
 
         aIconStyleLB.RemoveEntry( 0 );
-        aIconStyleLB.InsertEntry( aAutoStr += ::rtl::OUString::createFromAscii( ")" ), 0 );
+        aIconStyleLB.InsertEntry( aAutoStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")") ), 0 );
         // separate auto and other icon themes
         aIconStyleLB.SetSeparatorPos( 0 );
     }
@@ -864,7 +868,6 @@ OfaViewTabPage::~OfaViewTabPage()
 }
 
 #if defined( UNX )
-//--- 20.08.01 10:16:12 ---------------------------------------------------
 IMPL_LINK( OfaViewTabPage, OnAntialiasingToggled, void*, NOTINTERESTEDIN )
 {
     (void)NOTINTERESTEDIN;
@@ -888,19 +891,11 @@ IMPL_LINK( OfaViewTabPage, OnSelectionToggled, void*, NOTINTERESTEDIN )
     return 0;
 }
 
-/*-----------------06.12.96 11.50-------------------
-
---------------------------------------------------*/
-
 SfxTabPage* OfaViewTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
 {
     return new OfaViewTabPage(pParent, rAttrSet);
 }
 
-/*-----------------06.12.96 11.50-------------------
-
---------------------------------------------------*/
-
 BOOL OfaViewTabPage::FillItemSet( SfxItemSet& )
 {
     SvtFontOptions aFontOpt;
@@ -1099,9 +1094,6 @@ BOOL OfaViewTabPage::FillItemSet( SfxItemSet& )
     return bModified;
 }
 
-/*-----------------06.12.96 11.50-------------------
-
---------------------------------------------------*/
 void OfaViewTabPage::Reset( const SfxItemSet& )
 {
     SvtMiscOptions aMiscOptions;
@@ -1206,9 +1198,7 @@ void OfaViewTabPage::Reset( const SfxItemSet& )
     LINK( this, OfaViewTabPage, OnAntialiasingToggled ).Call( NULL );
 #endif
 }
-/* -----------------------------23.11.00 14:55--------------------------------
 
- ---------------------------------------------------------------------------*/
 class LangConfigItem_Impl : public ConfigItem
 {
     Any         aValue;
@@ -1222,9 +1212,7 @@ public:
     const Any&  GetValue() const {return aValue;}
     void        SetValue(Any& rValue)  {aValue = rValue; SetModified();}
 };
-/* -----------------------------23.11.00 15:06--------------------------------
 
- ---------------------------------------------------------------------------*/
 LangConfigItem_Impl::LangConfigItem_Impl(
     const OUString& rTree, const OUString& rProperty) :
     ConfigItem(rTree),
@@ -1235,14 +1223,10 @@ LangConfigItem_Impl::LangConfigItem_Impl(
     Sequence<Any> aValues = GetProperties(aNames);
     aValue = aValues.getConstArray()[0];
 }
-/* -----------------------------23.11.00 15:06--------------------------------
 
- ---------------------------------------------------------------------------*/
 LangConfigItem_Impl::~LangConfigItem_Impl()
 {}
-/* -----------------------------23.11.00 15:10--------------------------------
 
- ---------------------------------------------------------------------------*/
 void LangConfigItem_Impl::Commit()
 {
     Sequence<OUString> aNames(1);
@@ -1251,32 +1235,28 @@ void LangConfigItem_Impl::Commit()
     aValues.getArray()[0] = aValue;
     PutProperties(aNames, aValues);
 }
-/* -----------------22.07.2003 10:33-----------------
 
- --------------------------------------------------*/
 struct LanguageConfig_Impl
 {
     SvtLanguageOptions aLanguageOptions;
     SvtSysLocaleOptions aSysLocaleOptions;
     SvtLinguConfig aLinguConfig;
 };
-/* -----------------------------23.11.00 13:06--------------------------------
 
- ---------------------------------------------------------------------------*/
 static sal_Bool bLanguageCurrentDoc_Impl = sal_False;
 
 // some things we'll need...
-static const OUString sConfigSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider");
-static const OUString sAccessSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess");
-static const OUString sAccessUpdSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess");
-static const OUString sInstalledLocalesPath = OUString::createFromAscii("org.openoffice.Setup/Office/InstalledLocales");
-static OUString sUserLocalePath = OUString::createFromAscii("org.openoffice.Office.Linguistic/General");
-//static const OUString sUserLocalePath = OUString::createFromAscii("org.openoffice.Office/Linguistic");
-static const OUString sUserLocaleKey = OUString::createFromAscii("UILocale");
-static const OUString sSystemLocalePath = OUString::createFromAscii("org.openoffice.System/L10N");
-static const OUString sSystemLocaleKey = OUString::createFromAscii("UILocale");
-static const OUString sOfficeLocalePath = OUString::createFromAscii("org.openoffice.Office/L10N");
-static const OUString sOfficeLocaleKey = OUString::createFromAscii("ooLocale");
+static const OUString sConfigSrvc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"));
+static const OUString sAccessSrvc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess"));
+static const OUString sAccessUpdSrvc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess"));
+static const OUString sInstalledLocalesPath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/Office/InstalledLocales"));
+static OUString sUserLocalePath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Linguistic/General"));
+//static const OUString sUserLocalePath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office/Linguistic"));
+static const OUString sUserLocaleKey(RTL_CONSTASCII_USTRINGPARAM("UILocale"));
+static const OUString sSystemLocalePath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.System/L10N"));
+static const OUString sSystemLocaleKey(RTL_CONSTASCII_USTRINGPARAM("UILocale"));
+static const OUString sOfficeLocalePath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office/L10N"));
+static const OUString sOfficeLocaleKey(RTL_CONSTASCII_USTRINGPARAM("ooLocale"));
 static Sequence< OUString > seqInstalledLanguages;
 
 OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet ) :
@@ -1336,8 +1316,8 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe
         Reference< XNameAccess > theNameAccess;
 
         // find out which locales are currently installed and add them to the listbox
-        theArgs[0] = makeAny(NamedValue(OUString::createFromAscii("NodePath"), makeAny(sInstalledLocalesPath)));
-        theArgs[1] = makeAny(NamedValue(OUString::createFromAscii("reload"), makeAny(sal_True)));
+        theArgs[0] = makeAny(NamedValue(OUString(RTL_CONSTASCII_USTRINGPARAM("NodePath")), makeAny(sInstalledLocalesPath)));
+        theArgs[1] = makeAny(NamedValue(OUString(RTL_CONSTASCII_USTRINGPARAM("reload")), makeAny(sal_True)));
     theNameAccess = Reference< XNameAccess > (
             theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs ), UNO_QUERY_THROW );
         seqInstalledLanguages = theNameAccess->getElementNames();
@@ -1356,7 +1336,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe
 
         // find out whether the user has a specific locale specified
         Sequence< Any > theArgs2(1);
-        theArgs2[0] = makeAny(NamedValue(OUString::createFromAscii("NodePath"), makeAny(sUserLocalePath)));
+        theArgs2[0] = makeAny(NamedValue(OUString(RTL_CONSTASCII_USTRINGPARAM("NodePath")), makeAny(sUserLocalePath)));
         theNameAccess = Reference< XNameAccess > (
             theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs2 ), UNO_QUERY_THROW );
         if (theNameAccess->hasByName(sUserLocaleKey))
@@ -1436,23 +1416,17 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe
     aCTLSupportFI.Show(bReadonly);
     SupportHdl( &aCTLSupportCB );
 }
-/*-- 23.11.00 13:06:40---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 OfaLanguagesTabPage::~OfaLanguagesTabPage()
 {
     delete pLangConfig;
 }
-/*-- 23.11.00 13:06:40---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SfxTabPage* OfaLanguagesTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
 {
     return new OfaLanguagesTabPage(pParent, rAttrSet);
 }
-/*-- 23.11.00 13:06:41---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 LanguageType lcl_LangStringToLangType(const OUString& rLang)
 {
     Locale aLocale;
@@ -1469,9 +1443,6 @@ LanguageType lcl_LangStringToLangType(const OUString& rLang)
     return eLangType;
 }
 
-/*-- 23.11.00 13:06:40---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBoolItems[], sal_uInt16 nCount)
 {
     SfxViewFrame* pCurrentFrm = SfxViewFrame::Current();
@@ -1555,7 +1526,7 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
             // tell quickstarter to stop being a veto listener
 
             Reference< XInitialization > xInit(theMSF->createInstance(
-                OUString::createFromAscii("com.sun.star.office.Quickstart")), UNO_QUERY);
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.office.Quickstart"))), UNO_QUERY);
             if (xInit.is())
             {
                 Sequence< Any > args(3);
@@ -1884,9 +1855,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet )
         aCurrentDocCB.Check(TRUE);
     }
 }
-/* -----------------------------20.04.01 15:09--------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK(  OfaLanguagesTabPage, SupportHdl, CheckBox*, pBox )
 {
     DBG_ASSERT( pBox, "OfaLanguagesTabPage::SupportHdl(): pBox invalid" );
@@ -1933,9 +1902,7 @@ namespace
         _rCB.Enable( !_bNewValue );
     }
 }
-/* -----------------08.06.01 17:56-------------------
 
- --------------------------------------------------*/
 IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl, SvxLanguageBox*, pBox )
 {
     LanguageType eLang = pBox->GetSelectLanguage();
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 72402ce7f7ed..6db4f285414d 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -165,9 +165,7 @@ public:
     virtual BOOL        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 };
-/* -----------------------------23.11.00 13:04--------------------------------
 
- ---------------------------------------------------------------------------*/
 struct LanguageConfig_Impl;
 class OfaLanguagesTabPage : public SfxTabPage
 {
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index c5901e3d007c..633a29b60ac9 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -356,7 +356,7 @@ IMPL_LINK( SvxGeneralTabPage, ModifyHdl_Impl, Edit *, pEdit )
         switch ( aShortStr.Len() )
         {
             case 0:
-                aShortStr = String( RTL_CONSTASCII_STRINGPARAM("  ") );
+                aShortStr = String( RTL_CONSTASCII_USTRINGPARAM("  ") );
                 break;
 
             case 1:
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index c8c52f8126f9..34ed35a716dd 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -114,28 +114,16 @@ OfaHtmlTabPage::OfaHtmlTabPage(Window* pParent, const SfxItemSet& rSet) :
     aCharSetLB.FillWithMimeAndSelectBest();
 }
 
-/*-----------------02.09.96 13.47-------------------
-
---------------------------------------------------*/
-
 OfaHtmlTabPage::~OfaHtmlTabPage()
 {
 }
 
-/*-----------------02.09.96 13.47-------------------
-
---------------------------------------------------*/
-
 SfxTabPage* OfaHtmlTabPage::Create( Window* pParent,
                                 const SfxItemSet& rAttrSet )
 {
     return new OfaHtmlTabPage(pParent, rAttrSet);
 }
 
-/*-----------------02.09.96 13.47-------------------
-
---------------------------------------------------*/
-
 BOOL OfaHtmlTabPage::FillItemSet( SfxItemSet& )
 {
     SvxHtmlOptions* pHtmlOpt = SvxHtmlOptions::Get();
@@ -184,10 +172,6 @@ BOOL OfaHtmlTabPage::FillItemSet( SfxItemSet& )
     return FALSE;
 }
 
-/*-----------------02.09.96 13.47-------------------
-
---------------------------------------------------*/
-
 void OfaHtmlTabPage::Reset( const SfxItemSet& )
 {
     SvxHtmlOptions* pHtmlOpt = SvxHtmlOptions::Get();
@@ -238,9 +222,6 @@ void OfaHtmlTabPage::Reset( const SfxItemSet& )
         aCharSetLB.SelectTextEncoding( pHtmlOpt->GetTextEncoding() );
 }
 
-/*-----------------16.04.98 16:03-------------------
-
---------------------------------------------------*/
 IMPL_LINK(OfaHtmlTabPage, ExportHdl_Impl, ListBox*, pBox)
 {
     USHORT nExport = aPosToExportArr[ pBox->GetSelectEntryPos() ];
@@ -256,9 +237,7 @@ IMPL_LINK(OfaHtmlTabPage, ExportHdl_Impl, ListBox*, pBox)
 
     return 0;
 }
-/* -----------------05.02.99 09:17-------------------
- *
- * --------------------------------------------------*/
+
 IMPL_LINK(OfaHtmlTabPage, CheckBoxHdl_Impl, CheckBox*, pBox)
 {
     aStarBasicWarningCB.Enable(!pBox->IsChecked());
diff --git a/cui/source/options/optimprove.cxx b/cui/source/options/optimprove.cxx
index 5c1aefd3eb1b..b44f12af7e04 100644
--- a/cui/source/options/optimprove.cxx
+++ b/cui/source/options/optimprove.cxx
@@ -173,22 +173,22 @@ IMPL_LINK( SvxImprovementDialog, HandleOK, OKButton*, EMPTYARG )
 {
     uno::Reference< lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
     uno::Reference< com::sun::star::oooimprovement::XCoreController > core_c(
-            xSMGR->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.oooimprovement.CoreController")),
+            xSMGR->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.CoreController") ) ),
             uno::UNO_QUERY);
     if(core_c.is())
     {
         ::comphelper::ConfigurationHelper::writeDirectKey(
             xSMGR,
-            ::rtl::OUString::createFromAscii("/org.openoffice.Office.OOoImprovement.Settings"),
-            ::rtl::OUString::createFromAscii("Participation"),
-            ::rtl::OUString::createFromAscii("ShowedInvitation"),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.OOoImprovement.Settings") ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Participation") ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowedInvitation") ),
             uno::makeAny( true ),
             ::comphelper::ConfigurationHelper::E_STANDARD );
         ::comphelper::ConfigurationHelper::writeDirectKey(
             xSMGR,
-            ::rtl::OUString::createFromAscii("/org.openoffice.Office.OOoImprovement.Settings"),
-            ::rtl::OUString::createFromAscii("Participation"),
-            ::rtl::OUString::createFromAscii("InvitationAccepted"),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.OOoImprovement.Settings") ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Participation") ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InvitationAccepted") ),
             uno::makeAny( m_pPage->IsYesChecked() ),
             ::comphelper::ConfigurationHelper::E_STANDARD );
         // TODO: refactor
diff --git a/cui/source/options/optimprove2.cxx b/cui/source/options/optimprove2.cxx
index ceed7015dba6..a503ed0c3bbf 100644
--- a/cui/source/options/optimprove2.cxx
+++ b/cui/source/options/optimprove2.cxx
@@ -144,11 +144,11 @@ IMPL_LINK( SvxImprovementOptionsPage, HandleShowData, PushButton*, EMPTYARG )
         ::rtl::OUString sLogFile( m_sLogPath );
         sLogFile += C2S("/Current.csv");
         uno::Sequence< beans::PropertyValue > aArgs(3);
-        aArgs[0].Name = ::rtl::OUString::createFromAscii("FilterName");
-        aArgs[0].Value = uno::makeAny(::rtl::OUString::createFromAscii("Text - txt - csv (StarCalc)"));
-        aArgs[1].Name = ::rtl::OUString::createFromAscii("FilterOptions");
-        aArgs[1].Value = uno::makeAny(::rtl::OUString::createFromAscii("44,34,12,1,"));
-        aArgs[2].Name = ::rtl::OUString::createFromAscii("ReadOnly");
+        aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName") );
+        aArgs[0].Value = uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Text - txt - csv (StarCalc)") ) );
+        aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterOptions") );
+        aArgs[1].Value = uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("44,34,12,1,") ) );
+        aArgs[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly") );
         aArgs[2].Value = uno::makeAny(true);
 
         uno::Reference< lang::XComponent > xDoc = ::comphelper::SynchronousDispatch::dispatch(
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 6143c3211b18..f85f15d592ea 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -306,27 +306,15 @@ SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet ) :
     ArrangeControls_Impl();
 }
 
-/*-----------------12.08.96 14.55-------------------
-
---------------------------------------------------*/
-
 SvxProxyTabPage::~SvxProxyTabPage()
 {
 }
 
-/*-----------------12.08.96 14.55-------------------
-
---------------------------------------------------*/
-
 SfxTabPage* SvxProxyTabPage::Create(Window* pParent, const SfxItemSet& rAttrSet )
 {
     return new SvxProxyTabPage(pParent, rAttrSet);
 }
 
-/*-----------------02.09.04 14.55-------------------
-
---------------------------------------------------*/
-
 void SvxProxyTabPage::ReadConfigData_Impl()
 {
     try {
@@ -390,10 +378,6 @@ void SvxProxyTabPage::ReadConfigData_Impl()
 
 }
 
-/*-----------------02.09.04 14.55-------------------
-
---------------------------------------------------*/
-
 void SvxProxyTabPage::ReadConfigDefaults_Impl()
 {
     try
@@ -453,10 +437,6 @@ void SvxProxyTabPage::ReadConfigDefaults_Impl()
     }
 }
 
-/*-----------------02.09.04 14.55-------------------
-
---------------------------------------------------*/
-
 void SvxProxyTabPage::RestoreConfigDefaults_Impl()
 {
     try
@@ -491,10 +471,6 @@ void SvxProxyTabPage::RestoreConfigDefaults_Impl()
     }
 }
 
-/*-----------------12.08.96 14.55-------------------
-
---------------------------------------------------*/
-
 void SvxProxyTabPage::Reset(const SfxItemSet&)
 {
     ReadConfigData_Impl();
@@ -511,10 +487,6 @@ void SvxProxyTabPage::Reset(const SfxItemSet&)
     EnableControls_Impl( aProxyModeLB.GetSelectEntryPos() == 2 );
 }
 
-/*-----------------12.08.96 16.34-------------------
-
---------------------------------------------------*/
-
 BOOL SvxProxyTabPage::FillItemSet(SfxItemSet& )
 {
     BOOL bModified=FALSE;
@@ -614,7 +586,7 @@ BOOL SvxProxyTabPage::FillItemSet(SfxItemSet& )
 
 void SvxProxyTabPage::ArrangeControls_Impl()
 {
-    //-->Calculate dynamical width of controls, add buy wuy for i71445 Time: 2007.02.27
+    // calculate dynamic width of controls, to not cut-off translated strings #i71445#
     long nWidth = aProxyModeFT.GetCtrlTextWidth( aProxyModeFT.GetText() );
     long nTemp = aHttpProxyFT.GetCtrlTextWidth( aHttpProxyFT.GetText() );
     if ( nTemp > nWidth )
@@ -660,12 +632,8 @@ void SvxProxyTabPage::ArrangeControls_Impl()
         aNewPos.Y() = aNoProxyForED.GetPosPixel().Y();
         aNoProxyForED.SetPosSizePixel( aNewPos, aNewSize );
     }
-    //<--End buy wuy for i71445 Time: 2007.02.27
 }
 
-/*-----------------12.08.96 13.38-------------------
-
---------------------------------------------------*/
 void SvxProxyTabPage::EnableControls_Impl(BOOL bEnable)
 {
     aHttpProxyFT.Enable(bEnable);
@@ -1143,9 +1111,6 @@ IMPL_LINK( SvxSearchTabPage, SearchPartHdl_Impl, RadioButton *, EMPTYARG )
 /********************************************************************/
 /********************************************************************/
 
-/*-----------------15.05.97 09:51-------------------
-
---------------------------------------------------*/
 /*
 SvxPatternField::SvxPatternField( Window* pParent, const ResId& rResId ) :
 
@@ -1159,10 +1124,6 @@ SvxPatternField::SvxPatternField( Window* pParent, const ResId& rResId ) :
     SelectFixedFont();
 } */
 
-/*-----------------15.05.97 09:51-------------------
-
---------------------------------------------------*/
-
 /*void SvxPatternField::KeyInput( const KeyEvent& rKEvt )
 {
     PatternField::KeyInput( rKEvt );
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 9b7e5b20acbc..8c41db2ee4f3 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -303,9 +303,6 @@ public:
 //added by jmeng end
 #endif
 
-/* -----------------------------20.06.01 16:32--------------------------------
-
- ---------------------------------------------------------------------------*/
 #ifdef WNT
 #else
 #define HELPER_PAGE_COMPLETE
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 3d905fc2c779..3d6e4e305df6 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -304,7 +304,7 @@ IMPL_LINK( SvxJavaOptionsPage, AddHdl_Impl, PushButton *, EMPTYARG )
     {
         Reference < XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
         xFolderPicker = Reference< XFolderPicker >(
-            xMgr->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.FolderPicker" ) ), UNO_QUERY );
+            xMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FolderPicker") ) ), UNO_QUERY );
 
         String sWorkFolder = SvtPathOptions().GetWorkPath();
         xFolderPicker->setDisplayDirectory( sWorkFolder );
@@ -582,11 +582,11 @@ void SvxJavaOptionsPage::HandleCheckEntry( SvLBoxEntry* _pEntry )
 void SvxJavaOptionsPage::AddFolder( const ::rtl::OUString& _rFolder )
 {
     bool bStartAgain = true;
-    sal_Int32 nPos = 0;
     JavaInfo* pInfo = NULL;
     javaFrameworkError eErr = jfw_getJavaInfoByPath( _rFolder.pData, &pInfo );
     if ( JFW_E_NONE == eErr && pInfo )
     {
+        sal_Int32 nPos = 0;
         bool bFound = false;
         JavaInfo** parInfo = m_parJavaInfo;
         for ( sal_Int32 i = 0; i < m_nInfoSize; ++i )
@@ -993,7 +993,7 @@ IMPL_LINK( SvxJavaClassPathDlg, AddArchiveHdl_Impl, PushButton *, EMPTYARG )
         String sFile = aURL.getFSysPath( INetURLObject::FSYS_DETECT );
         if ( !IsPathDuplicate( sURL ) )
         {
-            USHORT nPos = m_aPathList.InsertEntry( sFile, SvFileInformationManager::GetImage( aURL ) );
+            USHORT nPos = m_aPathList.InsertEntry( sFile, SvFileInformationManager::GetImage( aURL, false ) );
             m_aPathList.SelectEntryPos( nPos );
         }
         else
@@ -1031,7 +1031,7 @@ IMPL_LINK( SvxJavaClassPathDlg, AddPathHdl_Impl, PushButton *, EMPTYARG )
         String sNewFolder = aURL.getFSysPath( INetURLObject::FSYS_DETECT );
         if ( !IsPathDuplicate( sFolderURL ) )
         {
-            USHORT nPos = m_aPathList.InsertEntry( sNewFolder, SvFileInformationManager::GetImage( aURL ) );
+            USHORT nPos = m_aPathList.InsertEntry( sNewFolder, SvFileInformationManager::GetImage( aURL, false ) );
             m_aPathList.SelectEntryPos( nPos );
         }
         else
@@ -1127,7 +1127,7 @@ void SvxJavaClassPathDlg::SetClassPath( const String& _rPath )
         String sToken = _rPath.GetToken( 0, CLASSPATH_DELIMITER, nIdx );
         INetURLObject aURL( sToken, INetURLObject::FSYS_DETECT );
         String sPath = aURL.getFSysPath( INetURLObject::FSYS_DETECT );
-        m_aPathList.InsertEntry( sPath, SvFileInformationManager::GetImage( aURL ) );
+        m_aPathList.InsertEntry( sPath, SvFileInformationManager::GetImage( aURL, false ) );
     }
     // select first entry
     m_aPathList.SelectEntryPos(0);
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 84b080fcf395..6a5680833db7 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -172,9 +172,6 @@ static void lcl_OpenURL( ::rtl::OUString sURL )
     }
 }
 
-/*--------------------------------------------------
---------------------------------------------------*/
-
 static const sal_uInt16 nNameLen = 8;
 
 static sal_uInt16 pRanges[] =
@@ -190,7 +187,7 @@ sal_Bool KillFile_Impl( const String& rURL )
     try
     {
         Content aCnt( rURL, uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > () );
-        aCnt.executeCommand( OUString::createFromAscii( "delete" ), makeAny( sal_Bool( sal_True ) ) );
+        aCnt.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), makeAny( sal_Bool( sal_True ) ) );
     }
     catch( ::com::sun::star::ucb::CommandAbortedException& )
     {
@@ -205,9 +202,7 @@ sal_Bool KillFile_Impl( const String& rURL )
 
     return bRet;
 }
-/* -----------------------------27.11.00 14:07--------------------------------
 
- ---------------------------------------------------------------------------*/
 // 0x 0p 0t 0c nn
 // p: 1 -> parent
 // t: 1 -> spell, 2 -> hyph, 3 -> thes, 4 -> grammar
@@ -245,8 +240,6 @@ public:
 
 };
 
-/*--------------------------------------------------
---------------------------------------------------*/
 //
 // User for user-dictionaries (XDictionary interface)
 //
@@ -336,10 +329,6 @@ void BrwStringDic_Impl::Paint( const Point& rPos, SvLBox& rDev, USHORT,
     rDev.SetFont( aOldFont );
 }
 
-
-/*--------------------------------------------------
---------------------------------------------------*/
-
 class OptionsBreakSet : public ModalDialog
 {
     OKButton        aOKPB;
@@ -576,7 +565,7 @@ public:
     void SetChecked( const Sequence< OUString > &rConfiguredServices );
     void Reconfigure( const OUString &rDisplayName, BOOL bEnable );
 
-    const Sequence<Locale> &    GetAllSupportedLocales() { return aAllServiceLocales; }
+    const Sequence<Locale> &    GetAllSupportedLocales() const { return aAllServiceLocales; }
 
     const LangImplNameTable &   GetSpellTable() const   { return aCfgSpellTable; }
     LangImplNameTable &         GetSpellTable()         { return aCfgSpellTable; }
@@ -711,9 +700,7 @@ void lcl_MergeLocales(Sequence< Locale >& aAllLocales, const Sequence< Locale >&
     for(i = 0; i < nFound; i++)
         pAllLocales2[nLength++] = pLocToAdd[i];
 }
-/* -----------------------------27.11.00 16:48--------------------------------
 
- ---------------------------------------------------------------------------*/
 void lcl_MergeDisplayArray(
         SvxLinguData_Impl &rData,
         const ServiceInfo_Impl &rToAdd )
@@ -768,9 +755,7 @@ void lcl_MergeDisplayArray(
     rData.GetDisplayServiceArray().push_back( rToAdd );
     rData.SetDisplayServiceCount( nCnt + 1 );
 }
-/* -----------------------------26.11.00 18:07--------------------------------
 
- ---------------------------------------------------------------------------*/
 SvxLinguData_Impl::SvxLinguData_Impl() :
     nDisplayServices    (0)
 {
@@ -913,9 +898,7 @@ SvxLinguData_Impl::SvxLinguData_Impl() :
         }
     }
 }
-/* -----------------------------22.05.01 10:43--------------------------------
 
----------------------------------------------------------------------------*/
 SvxLinguData_Impl::SvxLinguData_Impl( const SvxLinguData_Impl &rData ) :
     aDisplayServiceArr  (rData.aDisplayServiceArr),
     nDisplayServices    (rData.nDisplayServices),
@@ -928,9 +911,7 @@ SvxLinguData_Impl::SvxLinguData_Impl( const SvxLinguData_Impl &rData ) :
     xLinguSrvcMgr       (rData.xLinguSrvcMgr)
 {
 }
-/* -----------------------------22.05.01 10:43--------------------------------
 
- ---------------------------------------------------------------------------*/
 SvxLinguData_Impl & SvxLinguData_Impl::operator = (const SvxLinguData_Impl &rData)
 {
     xMSF                = rData.xMSF;
@@ -944,15 +925,11 @@ SvxLinguData_Impl & SvxLinguData_Impl::operator = (const SvxLinguData_Impl &rDat
     nDisplayServices    = rData.nDisplayServices;
     return *this;
 }
-/* -----------------------------26.11.00 18:08--------------------------------
 
- ---------------------------------------------------------------------------*/
 SvxLinguData_Impl::~SvxLinguData_Impl()
 {
 }
-/* -----------------------------26.11.00 19:42--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SvxLinguData_Impl::SetChecked(const Sequence<OUString>& rConfiguredServices)
 {
     const OUString* pConfiguredServices = rConfiguredServices.getConstArray();
@@ -978,9 +955,6 @@ void SvxLinguData_Impl::SetChecked(const Sequence<OUString>& rConfiguredServices
         }
     }
 }
-/* -----------------------------26.11.00 20:43--------------------------------
-
- ---------------------------------------------------------------------------*/
 
 sal_Bool SvxLinguData_Impl::AddRemove(
             Sequence< OUString > &rConfigured,
@@ -1173,7 +1147,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent,
             != SvtExtendedSecurityOptions::OPEN_NEVER )
     {
         aMoreDictsLink.SetURL( String(
-            RTL_CONSTASCII_STRINGPARAM( "http://extensions.libreoffice.org/dictionary/" ) ) );
+            RTL_CONSTASCII_USTRINGPARAM( "http://extensions.libreoffice.org/dictionary/" ) ) );
         aMoreDictsLink.SetClickHdl( LINK( this, SvxLinguTabPage, OpenURLHdl_Impl ) );
     }
     else
@@ -2026,8 +2000,6 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp )
         }
     }
 }
-/*--------------------------------------------------
---------------------------------------------------*/
 
 SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData) :
     ModalDialog( pParent, CUI_RES(RID_SVXDLG_EDIT_MODULES ) ),
@@ -2071,7 +2043,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData)
             != SvtExtendedSecurityOptions::OPEN_NEVER )
     {
         aMoreDictsLink.SetURL( String(
-            RTL_CONSTASCII_STRINGPARAM( "http://extensions.libreoffice.org/dictionary/" ) ) );
+            RTL_CONSTASCII_USTRINGPARAM( "http://extensions.libreoffice.org/dictionary/" ) ) );
         aMoreDictsLink.SetClickHdl( LINK( this, SvxEditModulesDlg, OpenURLHdl_Impl ) );
     }
     else
@@ -2137,9 +2109,6 @@ SvLBoxEntry* SvxEditModulesDlg::CreateEntry( String& rTxt, USHORT nCol )
     return pEntry;
 }
 
-/* ---------------------------------------------------------------------------
-
- ---------------------------------------------------------------------------*/
 IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox )
 {
     if (&aModulesCLB == pBox)
@@ -2175,9 +2144,7 @@ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox )
 
     return 0;
 }
-/* -----------------------------28.05.01 11:00--------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox )
 {
 //    if (pBox == (SvTreeListBox *) &aModulesCLB)
@@ -2210,9 +2177,7 @@ IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox )
 //    }
     return 0;
 }
-/* -----------------------------27.11.00 14:00--------------------------------
 
- ---------------------------------------------------------------------------*/
 OUString lcl_GetServiceName(BYTE nType)
 {
     switch(nType)
@@ -2485,9 +2450,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
     aLastLocale.Country = aCurLocale.Country;
     return 0;
 }
-/* -----------------------------27.11.00 19:50--------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, PushButton *, pBtn )
 {
     sal_Bool bUp = &aPrioUpPB == pBtn;
@@ -2516,9 +2479,7 @@ IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, PushButton *, pBtn )
     }
     return 0;
 }
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK( SvxEditModulesDlg, ClickHdl_Impl, PushButton *, pBtn )
 {
     if (&aClosePB == pBtn)
@@ -2534,9 +2495,7 @@ IMPL_LINK( SvxEditModulesDlg, ClickHdl_Impl, PushButton *, pBtn )
 
     return 0;
 }
-/* -----------------------------27.11.00 20:31--------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK( SvxEditModulesDlg, BackHdl_Impl, PushButton *, EMPTYARG )
 {
     rLinguData = *pDefaultLinguData;
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 5a4f22495629..56c05f9062d5 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -355,8 +355,7 @@ void SvxPathTabPage::Reset( const SfxItemSet& )
                 SvLBoxEntry* pEntry = pPathBox->InsertEntry( aStr );
                 if ( bReadOnly )
                 {
-                    pPathBox->SetCollapsedEntryBmp( pEntry, pImpl->m_aLockImage, BMP_COLOR_NORMAL );
-                    pPathBox->SetCollapsedEntryBmp( pEntry, pImpl->m_aLockImageHC, BMP_COLOR_HIGHCONTRAST );
+                    pPathBox->SetCollapsedEntryBmp( pEntry, pImpl->m_aLockImage );
                 }
                 PathUserData_Impl* pPathImpl = new PathUserData_Impl(i);
                 pPathImpl->sUserPath = sUser;
@@ -407,11 +406,6 @@ void SvxPathTabPage::FillUserData()
 // -----------------------------------------------------------------------
 
 IMPL_LINK( SvxPathTabPage, PathSelect_Impl, svx::OptHeaderTabListBox *, EMPTYARG )
-
-/*  [Beschreibung]
-
-*/
-
 {
     USHORT nSelCount = 0;
     SvLBoxEntry* pEntry = pPathBox->FirstSelected();
diff --git a/cui/source/options/optpath.src b/cui/source/options/optpath.src
index 6b02abb5764a..7114f90b8de9 100644
--- a/cui/source/options/optpath.src
+++ b/cui/source/options/optpath.src
@@ -86,11 +86,6 @@ TabPage RID_SFXPAGE_PATH
         ImageBitmap = Bitmap { File = "lock.bmp"; };
         MaskColor = STD_MASKCOLOR;
     };
-    Image IMG_LOCK_HC
-    {
-        ImageBitmap = Bitmap { File = "lock_hc.bmp"; };
-        MaskColor = STD_MASKCOLOR;
-    };
     String STR_MULTIPATHDLG
     {
         Text [ en-US ] = "Edit Paths: %1" ;
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 261390df80c5..c0e2d1deda7f 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -73,7 +73,7 @@ using namespace comphelper;
 using rtl::OUString;
 
 #define C2U(cChar)                  OUString::createFromAscii(cChar)
-#define C2S(cChar)                  String( RTL_CONSTASCII_STRINGPARAM(cChar) )
+#define C2S(cChar)                  String( RTL_CONSTASCII_USTRINGPARAM(cChar) )
 #define CFG_PAGE_AND_GROUP          C2S("General"), C2S("LoadSave")
 // !! you have to update these index, if you changed the list of the child windows !!
 #define WININDEX_AUTOSAVE           ((USHORT)6)
@@ -227,9 +227,7 @@ SfxSaveTabPage::SfxSaveTabPage( Window* pParent, const SfxItemSet& rCoreSet ) :
     pImpl               ( new SvxSaveTabPage_Impl )
 
 {
-    sal_Bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-    aODFWarningFI.SetImage(
-        Image( CUI_RES( bHighContrast ? IMG_ODF_WARNING_HC : IMG_ODF_WARNING ) ) );
+    aODFWarningFI.SetImage( Image( CUI_RES( IMG_ODF_WARNING )));
 
     FreeResource();
 
@@ -325,9 +323,6 @@ SfxTabPage* SfxSaveTabPage::Create( Window* pParent,
     return ( new SfxSaveTabPage( pParent, rAttrSet ) );
 }
 
-/* -----------------------------05.04.01 13:10--------------------------------
-
- ---------------------------------------------------------------------------*/
 OUString lcl_ExtractUIName(const Sequence<PropertyValue> rProperties)
 {
     OUString sRet;
@@ -603,10 +598,10 @@ void SfxSaveTabPage::Reset( const SfxItemSet& )
                     while(xList->hasMoreElements())
                     {
                         SequenceAsHashMap aFilter(xList->nextElement());
-                        OUString sFilter = aFilter.getUnpackedValueOrDefault(OUString::createFromAscii("Name"),OUString());
+                        OUString sFilter = aFilter.getUnpackedValueOrDefault(OUString(RTL_CONSTASCII_USTRINGPARAM("Name")),OUString());
                         if (sFilter.getLength())
                         {
-                            sal_Int32 nFlags = aFilter.getUnpackedValueOrDefault(OUString::createFromAscii("Flags"),sal_Int32());
+                            sal_Int32 nFlags = aFilter.getUnpackedValueOrDefault(OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")),sal_Int32());
                             lList.push_back(sFilter);
                             lAlienList.push_back(0 != (nFlags & SFX_FILTER_ALIEN));
                             lODFList.push_back( isODFFormat( sFilter ) );
@@ -705,9 +700,7 @@ IMPL_LINK( SfxSaveTabPage, AutoClickHdl_Impl, CheckBox *, pBox )
     }
     return 0;
 }
-/* -----------------------------05.04.01 13:10--------------------------------
 
- ---------------------------------------------------------------------------*/
 OUString lcl_ExtracUIName(const Sequence<PropertyValue> rProperties)
 {
     OUString sRet;
@@ -734,9 +727,7 @@ OUString lcl_ExtracUIName(const Sequence<PropertyValue> rProperties)
     }
     return sRet;
 }
-/* -----------------------------05.04.01 13:37--------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK( SfxSaveTabPage, FilterHdl_Impl, ListBox *, pBox )
 {
     USHORT nCurPos = aDocTypeLB.GetSelectEntryPos();
diff --git a/cui/source/options/optsave.hrc b/cui/source/options/optsave.hrc
index 4cbdc0e2db4b..f0fcbe982822 100644
--- a/cui/source/options/optsave.hrc
+++ b/cui/source/options/optsave.hrc
@@ -59,7 +59,6 @@
 #define FI_ODF_WARNING          50
 
 #define IMG_ODF_WARNING         1
-#define IMG_ODF_WARNING_HC      2
 
 #define APP_WRITER              0
 #define APP_WRITER_WEB          1
diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src
index 36fc60e94435..cdbdbd46ae62 100644
--- a/cui/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -228,14 +228,6 @@ TabPage RID_SFXPAGE_SAVE
         };
         MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
     };
-    Image IMG_ODF_WARNING_HC
-    {
-        ImageBitmap = Bitmap
-        {
-            File = "odfwarning_h.png";
-        };
-        MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
-    };
 };
 
 ModalDialog RID_SVXDLG_FILTER_WARNING
diff --git a/cui/source/options/readonlyimage.cxx b/cui/source/options/readonlyimage.cxx
index 0a301c05eb89..274c1eaf7478 100644
--- a/cui/source/options/readonlyimage.cxx
+++ b/cui/source/options/readonlyimage.cxx
@@ -34,25 +34,16 @@
 #include <dialmgr.hxx>
 #include <cuires.hrc>
 
-/*-- 26.02.2004 13:31:04---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 ReadOnlyImage::ReadOnlyImage(Window* pParent, const ResId rResId) :
             FixedImage(pParent, rResId)
 {
-    sal_Bool bHighContrast = pParent->GetSettings().GetStyleSettings().GetHighContrastMode();
-    SetImage( Image(CUI_RES(bHighContrast ? RID_SVXBMP_LOCK_HC : RID_SVXBMP_LOCK )));
+    SetImage( Image(CUI_RES( RID_SVXBMP_LOCK )));
 }
 
-/*-- 26.02.2004 13:31:04---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 ReadOnlyImage::~ReadOnlyImage()
 {
 }
-/*-- 26.02.2004 13:31:04---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void ReadOnlyImage::RequestHelp( const HelpEvent& rHEvt )
 {
     if( Help::IsBalloonHelpEnabled() || Help::IsQuickHelpEnabled() )
@@ -72,9 +63,6 @@ void ReadOnlyImage::RequestHelp( const HelpEvent& rHEvt )
         Window::RequestHelp( rHEvt );
 }
 
-/*-- 26.02.2004 14:20:21---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 const String& ReadOnlyImage::GetHelpTip()
 {
      static String  aStr(CUI_RES(RID_SVXSTR_READONLY_CONFIG_TIP));
diff --git a/cui/source/options/readonlyimage.src b/cui/source/options/readonlyimage.src
index bd63c32771e7..6adcd4986ecd 100644
--- a/cui/source/options/readonlyimage.src
+++ b/cui/source/options/readonlyimage.src
@@ -25,8 +25,6 @@
  *
  ************************************************************************/
 
- // include ---------------------------------------------------------------
-
 #include <cuires.hrc>
 
 String RID_SVXSTR_READONLY_CONFIG_TIP
@@ -41,12 +39,3 @@ Image RID_SVXBMP_LOCK
     };
     MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
 };
-Image RID_SVXBMP_LOCK_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "lock_hc.bmp";
-    };
-    MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
-};
-
diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx
index f092c3d3f72e..aefd70d69a1b 100644
--- a/cui/source/options/sdbcdriverenum.cxx
+++ b/cui/source/options/sdbcdriverenum.cxx
@@ -64,7 +64,7 @@ namespace offapp
         try
         {
             Reference< XMultiServiceFactory > xORB = ::comphelper::getProcessServiceFactory();
-            Reference< XInterface > xDM = xORB->createInstance(::rtl::OUString::createFromAscii("com.sun.star.sdbc.DriverManager"));
+            Reference< XInterface > xDM = xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.DriverManager") ) );
             OSL_ENSURE(xDM.is(), "ODriverEnumerationImpl::ODriverEnumerationImpl: no access to the SDBC driver manager!");
 
             Reference< XEnumerationAccess > xEnumAccess(xDM, UNO_QUERY);
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index df35f40fa435..6cb450931c0f 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -288,9 +288,6 @@ static USHORT getGroupNodeId( const rtl::OUString& rModule )
     return nNodeId;
 }
 
-/*-- 29.10.2004 13:57:25---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 class MailMergeCfg_Impl : public utl::ConfigItem
 {
     friend class SvxEMailTabPage;
@@ -307,9 +304,7 @@ public:
     sal_Bool IsEmailSupported() const {return bIsEmailSupported;}
 
 };
-/*-- 29.10.2004 13:57:25---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 MailMergeCfg_Impl::MailMergeCfg_Impl() :
     utl::ConfigItem(C2U("Office.Writer/MailMergeWizard")),
     bIsEmailSupported(sal_False)
@@ -321,9 +316,7 @@ MailMergeCfg_Impl::MailMergeCfg_Impl() :
     if(aValues.getLength() && pValues[0].hasValue())
         pValues[0] >>= bIsEmailSupported;
 }
-/*-- 29.10.2004 13:57:25---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 MailMergeCfg_Impl::~MailMergeCfg_Impl()
 {
 }
@@ -511,9 +504,6 @@ static sal_Bool lcl_isOptionHidden( USHORT _nPageId, const SvtOptionsDialogOptio
     return bIsHidden;
 }
 
-/* -----------------11.02.99 09:56-------------------
- *
- * --------------------------------------------------*/
 struct OptionsPageInfo
 {
     SfxTabPage*         m_pPage;
@@ -543,9 +533,6 @@ struct OptionsGroupInfo
     ~OptionsGroupInfo() { delete m_pInItemSet; delete m_pOutItemSet; }
 };
 
-/* -----------------04.05.99 15:51-------------------
- *
- * --------------------------------------------------*/
 sal_Bool OfaOptionsTreeListBox::Collapse( SvLBoxEntry* pParent )
 {
     bInCollapse = sal_True;
@@ -621,10 +608,6 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog( Window* pParent, const rtl::OUString
     ActivateLastSelection();
 }
 
-/* -----------------11.02.99 07:58-------------------
- *
- * --------------------------------------------------*/
-
 OfaTreeOptionsDialog::~OfaTreeOptionsDialog()
 {
     SvLBoxEntry* pEntry = aTreeLB.First();
@@ -682,9 +665,6 @@ OfaTreeOptionsDialog::~OfaTreeOptionsDialog()
     deleteGroupNames();
 }
 
-/* -----------------11.02.99 08:21-------------------
- *
- * --------------------------------------------------*/
 OptionsPageInfo* OfaTreeOptionsDialog::AddTabPage(
     sal_uInt16 nId, const String& rPageName, sal_uInt16 nGroup )
 {
@@ -696,9 +676,7 @@ OptionsPageInfo* OfaTreeOptionsDialog::AddTabPage(
     return pPageInfo;
 }
 
-/* -----------------11.02.99 10:02-------------------
- *  der ItemSet* geht in den Besitz des Dialogs
- * --------------------------------------------------*/
+// der ItemSet* geht in den Besitz des Dialogs
 sal_uInt16  OfaTreeOptionsDialog::AddGroup(const String& rGroupName,
                                         SfxShell* pCreateShell,
                                         SfxModule* pCreateModule,
@@ -719,9 +697,6 @@ sal_uInt16  OfaTreeOptionsDialog::AddGroup(const String& rGroupName,
     return nRet - 1;
 }
 
-/* -----------------11.02.99 10:31-------------------
- *
- * --------------------------------------------------*/
 IMPL_LINK(OfaTreeOptionsDialog, ShowPageHdl_Impl, SvTreeListBox*, EMPTYARG)
 {
     if ( aSelectTimer.GetTimeout() == SELECT_FIRST_TIMEOUT )
@@ -734,9 +709,7 @@ IMPL_LINK(OfaTreeOptionsDialog, ShowPageHdl_Impl, SvTreeListBox*, EMPTYARG)
 
     return 0;
 }
-/* -----------------11.02.99 10:49-------------------
- *
- * --------------------------------------------------*/
+
 IMPL_LINK( OfaTreeOptionsDialog, BackHdl_Impl, PushButton*, EMPTYARG )
 {
     if ( pCurrentPageEntry && aTreeLB.GetParent( pCurrentPageEntry ) )
@@ -756,9 +729,7 @@ IMPL_LINK( OfaTreeOptionsDialog, BackHdl_Impl, PushButton*, EMPTYARG )
     }
     return 0;
 }
-/* -----------------11.02.99 16:45-------------------
- *
- * --------------------------------------------------*/
+
 IMPL_LINK( OfaTreeOptionsDialog, OKHdl_Impl, Button *, EMPTYARG )
 {
     aTreeLB.EndSelection();
@@ -809,9 +780,7 @@ IMPL_LINK( OfaTreeOptionsDialog, OKHdl_Impl, Button *, EMPTYARG )
     return 0;
 }
 
-/* -----------------17.02.99 09:15-------------------
- * Eine aufgeklappte Gruppe soll vollstaendig sichtbar sein
- * --------------------------------------------------*/
+// Eine aufgeklappte Gruppe soll vollstaendig sichtbar sein
 IMPL_LINK(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, pBox )
 {
     pBox->Update();
@@ -846,9 +815,6 @@ IMPL_LINK(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, pBox )
     return 0;
 }
 
-/* -----------------11.02.99 10:49-------------------
- *
- * --------------------------------------------------*/
 void OfaTreeOptionsDialog::ApplyItemSets()
 {
     SvLBoxEntry* pEntry = aTreeLB.First();
@@ -887,10 +853,6 @@ void OfaTreeOptionsDialog::InitTreeAndHandler()
     aImgLstRes.SetRT( RSC_IMAGELIST );
     if ( pIsoRes->IsAvailable( aImgLstRes ) )
         aPageImages = ImageList( ResId( RID_IMGLIST_TREEOPT, *pIsoRes ) );
-    ResId aImgLstHCRes( RID_IMGLIST_TREEOPT_HC, *pIsoRes );
-    aImgLstHCRes.SetRT( RSC_IMAGELIST );
-    if ( pIsoRes->IsAvailable( aImgLstHCRes ) )
-        aPageImagesHC = ImageList( ResId( RID_IMGLIST_TREEOPT_HC, *pIsoRes ) );
     delete pIsoRes;
 
     aTreeLB.SetHelpId( HID_OFADLG_TREELISTBOX );
@@ -910,9 +872,6 @@ void OfaTreeOptionsDialog::InitTreeAndHandler()
     aSelectTimer.SetTimeoutHdl( LINK( this, OfaTreeOptionsDialog, SelectHdl_Impl ) );
 }
 
-/* -----------------17.02.99 09:51-------------------
- *
- * --------------------------------------------------*/
 void OfaTreeOptionsDialog::ActivatePage( sal_uInt16 nResId )
 {
     bIsForSetDocumentLanguage = false;
@@ -943,15 +902,12 @@ void OfaTreeOptionsDialog::ActivatePage( const String& rPageURL )
     ActivateLastSelection();
 }
 
-/* -----------------16.02.99 13:17-------------------
- *
- * --------------------------------------------------*/
 void OfaTreeOptionsDialog::ActivateLastSelection()
 {
     SvLBoxEntry* pEntry = NULL;
     if ( pLastPageSaver )
     {
-        String sExpand( RTL_CONSTASCII_STRINGPARAM( EXPAND_PROTOCOL ) );
+        String sExpand( RTL_CONSTASCII_USTRINGPARAM( EXPAND_PROTOCOL ) );
         String sLastURL = bIsFromExtensionManager ? pLastPageSaver->m_sLastPageURL_ExtMgr
                                                   : pLastPageSaver->m_sLastPageURL_Tools;
         if ( sLastURL.Len() == 0 )
@@ -1020,9 +976,6 @@ void OfaTreeOptionsDialog::ActivateLastSelection()
     aTreeLB.GrabFocus();
 }
 
-/* -----------------22.02.99 08:52-------------------
- *
- * --------------------------------------------------*/
 long    OfaTreeOptionsDialog::Notify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == EVENT_KEYINPUT )
@@ -1075,8 +1028,7 @@ void OfaTreeOptionsDialog::DataChanged( const DataChangedEvent& rDCEvt )
         !aTreeLB.GetParent(pEntry))
     {
         OptionsGroupInfo* pInfo = static_cast<OptionsGroupInfo*>(pEntry->GetUserData());
-        bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-        ImageList* pImgLst = bHighContrast ? &aPageImagesHC : &aPageImages;
+        ImageList* pImgLst = &aPageImages;
         for ( sal_uInt16 i = 0; i < aHelpTextsArr.Count(); ++i )
         {
             if ( aHelpTextsArr.GetValue(i) == pInfo->m_nDialogId )
@@ -1333,8 +1285,7 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG )
         OptionsGroupInfo* pTGInfo = (OptionsGroupInfo *)pEntry->GetUserData();
         if ( pTGInfo->m_sPageURL.getLength() == 0 )
         {
-            bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-            ImageList* pImgLst = bHighContrast ? &aPageImagesHC : &aPageImages;
+            ImageList* pImgLst = &aPageImages;
             //hier den Hilfetext anzeigen
             for ( sal_uInt16 i = 0; i < aHelpTextsArr.Count(); ++i )
             {
@@ -1442,10 +1393,6 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG )
     return 0;
 }
 
-/* -----------------11.02.99 15:51-------------------
- *
- * --------------------------------------------------*/
-
 OfaPageResource::OfaPageResource() :
     Resource(CUI_RES(RID_OFADLG_OPTIONS_TREE_PAGES)),
     aGeneralDlgAry(CUI_RES(SID_GENERAL_OPTIONS)),
@@ -1476,30 +1423,30 @@ BOOL EnableSSO( void )
     rtl::OUString theIniFile;
     osl_getExecutableFile( &theIniFile.pData );
     theIniFile = theIniFile.copy( 0, theIniFile.lastIndexOf( '/' ) + 1 ) +
-                 rtl::OUString::createFromAscii( SAL_CONFIGFILE( "configmgr" ) );
+                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SAL_CONFIGFILE( "configmgr" )) );
     ::rtl::Bootstrap theBootstrap( theIniFile );
 
     rtl::OUString theOfflineValue;
-    rtl::OUString theDefaultOfflineValue = rtl::OUString::createFromAscii( "false" );
-    theBootstrap.getFrom( rtl::OUString::createFromAscii( "CFG_Offline" ),
+    rtl::OUString theDefaultOfflineValue (RTL_CONSTASCII_USTRINGPARAM("false") );
+    theBootstrap.getFrom( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CFG_Offline") ),
                           theOfflineValue,
                           theDefaultOfflineValue );
 
     rtl::OUString theServerTypeValue;
-    theBootstrap.getFrom( rtl::OUString::createFromAscii( "CFG_ServerType" ),
+    theBootstrap.getFrom( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CFG_ServerType") ),
                           theServerTypeValue );
 
     rtl::OUString theBackendServiceTypeValue;
-    theBootstrap.getFrom( rtl::OUString::createFromAscii( "CFG_BackendService" ),
+    theBootstrap.getFrom( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CFG_BackendService") ),
                           theBackendServiceTypeValue );
 
     BOOL bSSOEnabled =
         ( theOfflineValue == theDefaultOfflineValue                     &&
           ( theServerTypeValue.getLength() == 0 ||
-          theServerTypeValue == rtl::OUString::createFromAscii( "uno" ) ) &&
+          theServerTypeValue == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("uno") ) ) &&
           theBackendServiceTypeValue ==
-            rtl::OUString::createFromAscii(
-                "com.sun.star.comp.configuration.backend.LdapSingleBackend" ) );
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.comp.configuration.backend.LdapSingleBackend") ) );
     if ( bSSOEnabled && GetSSOCreator() == 0 )
     {
         bSSOEnabled = FALSE;
@@ -1519,7 +1466,7 @@ CreateTabPage GetSSOCreator( void )
         if( aModule.loadRelative(
                 &thisModule, theModuleName, SAL_LOADMODULE_DEFAULT ) )
         {
-            rtl::OUString theSymbolName( rtl::OUString::createFromAscii( "CreateSSOTabPage" ) );
+            rtl::OUString theSymbolName( RTL_CONSTASCII_USTRINGPARAM("CreateSSOTabPage" ) );
             theSymbol = reinterpret_cast<CreateTabPage>(aModule.getFunctionSymbol( theSymbolName ));
         }
     }
@@ -1766,8 +1713,8 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet)
     }
     Reference< XMultiServiceFactory >  xMgr( ::comphelper::getProcessServiceFactory() );
     Reference< XPropertySet >  xProp(
-            xMgr->createInstance( ::rtl::OUString::createFromAscii(
-                    "com.sun.star.linguistic2.LinguProperties") ),
+            xMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.linguistic2.LinguProperties") ) ),
             UNO_QUERY );
     if ( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_HYPHENREGION, sal_False, &pItem ) )
     {
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 91dd75b57d83..772ee2a27fbb 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -322,7 +322,7 @@ void AlignmentTabPage::InitVsRefEgde()
     // remember selection - is deleted in call to ValueSet::Clear()
     USHORT nSel = maVsRefEdge.GetSelectItemId();
 
-    ResId aResId( GetSettings().GetStyleSettings().GetHighContrastMode() ? IL_LOCK_BMPS_HC : IL_LOCK_BMPS, CUI_MGR() );
+    ResId aResId( IL_LOCK_BMPS, CUI_MGR() );
     ImageList aImageList( aResId );
     Size aItemSize( aImageList.GetImage( IID_BOTTOMLOCK ).GetSizePixel() );
 
diff --git a/cui/source/tabpages/align.hrc b/cui/source/tabpages/align.hrc
index f58e9ac221bc..133064889e9e 100644
--- a/cui/source/tabpages/align.hrc
+++ b/cui/source/tabpages/align.hrc
@@ -74,7 +74,6 @@
 
 // image list for ValueSets:
 #define IL_LOCK_BMPS                1100
-#define IL_LOCK_BMPS_HC             1101
 #define IID_BOTTOMLOCK              1
 #define IID_TOPLOCK                 2
 #define IID_CELLLOCK                3
diff --git a/cui/source/tabpages/align.src b/cui/source/tabpages/align.src
index d7d267991073..d0e8f16b591e 100644
--- a/cui/source/tabpages/align.src
+++ b/cui/source/tabpages/align.src
@@ -222,18 +222,6 @@ TabPage RID_SVXPAGE_ALIGNMENT
         };
         IdCount = { 3 ; };
     };
-    ImageList IL_LOCK_BMPS_HC
-    {
-        Prefix = "loh";
-        MaskColor = IL_LOCK_MCOL ;
-        IdList =
-        {
-            IID_BOTTOMLOCK ;
-            IID_TOPLOCK ;
-            IID_CELLLOCK ;
-        };
-        IdCount = { 3 ; };
-    };
     String STR_BOTTOMLOCK
     {
         Text [ en-US ] = "Text Extension From Lower Cell Border" ;
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 10797c780615..903ae3eeb55d 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -81,10 +81,6 @@ static ::com::sun::star::uno::Reference<
     return xMSF;
 }
 
-/*-----------------14.10.96 15.47-------------------
-
---------------------------------------------------*/
-
 OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) :
     SfxTabDialog(pParent, CUI_RES( RID_OFA_AUTOCORR_DLG ), _pSet),
     aLanguageFT(    this, CUI_RES(FT_LANG         )),
@@ -168,9 +164,6 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) :
     if ( bOpenSmartTagOptions )
         SetCurPageId( RID_OFAPAGE_SMARTTAG_OPTIONS );
 }
-/*-----------------16.10.96 14.06-------------------
-
---------------------------------------------------*/
 
 BOOL lcl_FindEntry( ListBox& rLB, const String& rEntry,
                     CollatorWrapper& rCmpClass )
@@ -191,9 +184,6 @@ BOOL lcl_FindEntry( ListBox& rLB, const String& rEntry,
     return FALSE;
 }
 
-/* -----------------23.11.98 10:46-------------------
- *
- * --------------------------------------------------*/
 IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox*, pBox)
 {
     USHORT nPos = pBox->GetSelectEntryPos();
@@ -210,9 +200,6 @@ IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox*, pBox)
     }
     return 0;
 }
-/*-----------------14.10.96 15.57-------------------
-
---------------------------------------------------*/
 
 OfaAutocorrOptionsPage::OfaAutocorrOptionsPage( Window* pParent,
                                                 const SfxItemSet& rSet ) :
@@ -233,29 +220,15 @@ OfaAutocorrOptionsPage::OfaAutocorrOptionsPage( Window* pParent,
     aCheckLB.SetHelpId(HID_OFAPAGE_AUTOCORR_CLB);
 }
 
-/*-----------------14.10.96 15.58-------------------
-
---------------------------------------------------*/
-
-
 OfaAutocorrOptionsPage::~OfaAutocorrOptionsPage()
 {
 }
 
-/*-----------------14.10.96 15.58-------------------
-
---------------------------------------------------*/
-
-
 SfxTabPage* OfaAutocorrOptionsPage::Create( Window* pParent,
                                 const SfxItemSet& rSet)
 {
     return new OfaAutocorrOptionsPage(pParent, rSet);
 }
-/*-----------------14.10.96 15.58-------------------
-
---------------------------------------------------*/
-
 
 BOOL OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& )
 {
@@ -282,19 +255,11 @@ BOOL OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& )
     return bReturn;
 }
 
-/* -----------------23.11.98 16:15-------------------
- *
- * --------------------------------------------------*/
 void    OfaAutocorrOptionsPage::ActivatePage( const SfxItemSet& )
 {
     ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(FALSE);
 }
 
-/*-----------------14.10.96 15.58-------------------
-
---------------------------------------------------*/
-
-
 void OfaAutocorrOptionsPage::Reset( const SfxItemSet& )
 {
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect();
@@ -695,9 +660,6 @@ BOOL OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet&  )
     return TRUE;
 }
 
-/* -----------------23.11.98 16:15-------------------
- *
- * --------------------------------------------------*/
 void    OfaSwAutoFmtOptionsPage::ActivatePage( const SfxItemSet& )
 {
     ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(FALSE);
@@ -938,9 +900,7 @@ void OfaACorrCheckListBox::HBarClick()
 {
     // Sortierung durch diese Ueberladung abgeklemmt
 }
-/* -----------------------------22.05.2002 11:06------------------------------
 
- ---------------------------------------------------------------------------*/
 void    OfaACorrCheckListBox::KeyInput( const KeyEvent& rKEvt )
 {
     if(!rKEvt.GetKeyCode().GetModifier() &&
@@ -967,9 +927,7 @@ void    OfaACorrCheckListBox::KeyInput( const KeyEvent& rKEvt )
     else
         SvxSimpleTable::KeyInput(rKEvt);
 }
-/* -----------------19.11.98 15:57-------------------
- *
- * --------------------------------------------------*/
+
 struct DoubleString
 {
     String  sShort;
@@ -980,9 +938,6 @@ typedef DoubleString* DoubleStringPtr;
 SV_DECL_PTRARR_DEL(DoubleStringArray, DoubleStringPtr, 4, 4)
 SV_IMPL_PTRARR(DoubleStringArray, DoubleStringPtr);
 
-/* -----------------19.11.98 16:07-------------------
- *
- * --------------------------------------------------*/
 void lcl_ClearTable(DoubleStringTable& rTable)
 {
     DoubleStringArrayPtr pArray = rTable.Last();
@@ -995,10 +950,6 @@ void lcl_ClearTable(DoubleStringTable& rTable)
     rTable.Clear();
 }
 
-/*-----------------14.10.96 15.57-------------------
-
---------------------------------------------------*/
-
 OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* pParent,
                                                 const SfxItemSet& rSet ) :
     SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_REPLACE ), rSet),
@@ -1045,11 +996,6 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* pParent,
     aShortED.SetMaxTextLen(30);
 }
 
-/*-----------------14.10.96 15.58-------------------
-
---------------------------------------------------*/
-
-
 OfaAutocorrReplacePage::~OfaAutocorrReplacePage()
 {
     delete pFormatText;
@@ -1057,34 +1003,24 @@ OfaAutocorrReplacePage::~OfaAutocorrReplacePage()
     delete pCompareClass;
     delete pCharClass;
 }
-/*-----------------14.10.96 15.58-------------------
-
---------------------------------------------------*/
 
 SfxTabPage* OfaAutocorrReplacePage::Create( Window* pParent,
                                 const SfxItemSet& rSet)
 {
     return new OfaAutocorrReplacePage(pParent, rSet);
 }
-/* -----------------20.11.98 13:26-------------------
- *
- * --------------------------------------------------*/
+
 void    OfaAutocorrReplacePage::ActivatePage( const SfxItemSet& )
 {
     if(eLang != eLastDialogLanguage)
         SetLanguage(eLastDialogLanguage);
     ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(TRUE);
 }
-/* -----------------20.11.98 13:26-------------------
- *
- * --------------------------------------------------*/
+
 int OfaAutocorrReplacePage::DeactivatePage( SfxItemSet*  )
 {
     return LEAVE_PAGE;
 }
-/*-----------------14.10.96 15.58-------------------
-
---------------------------------------------------*/
 
 BOOL OfaAutocorrReplacePage::FillItemSet( SfxItemSet& )
 {
@@ -1218,9 +1154,6 @@ BOOL OfaAutocorrReplacePage::FillItemSet( SfxItemSet& )
     return FALSE;
 }
 
-/* -----------------19.11.98 13:16-------------------
- *
- * --------------------------------------------------*/
 void OfaAutocorrReplacePage::RefillReplaceBox(BOOL bFromReset,
                                         LanguageType eOldLanguage,
                                         LanguageType eNewLanguage)
@@ -1330,9 +1263,6 @@ void OfaAutocorrReplacePage::RefillReplaceBox(BOOL bFromReset,
     else
         aTextOnlyCB.Enable( FALSE );
 }
-/*-----------------14.10.96 15.58-------------------
-
---------------------------------------------------*/
 
 void OfaAutocorrReplacePage::Reset( const SfxItemSet& )
 {
@@ -1340,9 +1270,6 @@ void OfaAutocorrReplacePage::Reset( const SfxItemSet& )
     aShortED.GrabFocus();
 }
 
-/* -----------------23.11.98 10:33-------------------
- *
- * --------------------------------------------------*/
 void OfaAutocorrReplacePage::SetLanguage(LanguageType eSet)
 {
     //save old settings an refill
@@ -1360,10 +1287,6 @@ void OfaAutocorrReplacePage::SetLanguage(LanguageType eSet)
         ModifyHdl(&aShortED);
     }
 }
-/*-----------------14.10.96 15.58-------------------
-
---------------------------------------------------*/
-
 
 IMPL_LINK(OfaAutocorrReplacePage, SelectHdl, SvTabListBox*, pBox)
 {
@@ -1395,11 +1318,6 @@ IMPL_LINK(OfaAutocorrReplacePage, SelectHdl, SvTabListBox*, pBox)
     return 0;
 };
 
-/*-----------------14.10.96 15.58-------------------
-
---------------------------------------------------*/
-
-
 IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*, pBtn)
 {
     SvLBoxEntry* _pEntry = aReplaceTLB.FirstSelected();
@@ -1466,9 +1384,6 @@ IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*, pBtn)
     return 1;
 }
 
-/*-----------------17.10.96 07.49-------------------
-
---------------------------------------------------*/
 IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt)
 {
     SvLBoxEntry* pFirstSel = aReplaceTLB.FirstSelected();
@@ -1554,10 +1469,6 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt)
     return 0;
 }
 
-/* -----------------20.11.98 13:48-------------------
- *
- * --------------------------------------------------*/
-
 struct StringsArrays
 {
 
@@ -1568,9 +1479,7 @@ struct StringsArrays
         aAbbrevStrings(5,5), aDoubleCapsStrings(5,5) {}
 };
 typedef StringsArrays* StringsArraysPtr;
-/* -----------------19.11.98 16:07-------------------
- *
- * --------------------------------------------------*/
+
 BOOL lcl_FindInArray(SvStringsDtor& rStrings, const String& rString)
 {
     for(USHORT i = 0; i < rStrings.Count(); i++)
@@ -1590,10 +1499,6 @@ void lcl_ClearTable(StringsTable& rTable)
     rTable.Clear();
 }
 
-/*-----------------14.10.96 15.57-------------------
-
---------------------------------------------------*/
-
 OfaAutocorrExceptPage::OfaAutocorrExceptPage( Window* pParent,
                                                 const SfxItemSet& rSet ) :
     SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_EXCEPT ), rSet),
@@ -1633,44 +1538,29 @@ OfaAutocorrExceptPage::OfaAutocorrExceptPage( Window* pParent,
 
 }
 
-/*-----------------14.10.96 15.58-------------------
-
---------------------------------------------------*/
-
 OfaAutocorrExceptPage::~OfaAutocorrExceptPage()
 {
     lcl_ClearTable(aStringsTable);
     delete pCompareClass;
 }
 
-/*-----------------14.10.96 15.58-------------------
-
---------------------------------------------------*/
-
 SfxTabPage* OfaAutocorrExceptPage::Create( Window* pParent,
                                 const SfxItemSet& rSet)
 {
     return new OfaAutocorrExceptPage(pParent, rSet);
 }
-/* -----------------20.11.98 13:26-------------------
- *
- * --------------------------------------------------*/
+
 void    OfaAutocorrExceptPage::ActivatePage( const SfxItemSet& )
 {
     if(eLang != eLastDialogLanguage)
         SetLanguage(eLastDialogLanguage);
     ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(TRUE);
 }
-/* -----------------20.11.98 13:26-------------------
- *
- * --------------------------------------------------*/
+
 int     OfaAutocorrExceptPage::DeactivatePage( SfxItemSet* )
 {
     return LEAVE_PAGE;
 }
-/*-----------------14.10.96 15.58-------------------
-
---------------------------------------------------*/
 
 BOOL OfaAutocorrExceptPage::FillItemSet( SfxItemSet&  )
 {
@@ -1780,9 +1670,6 @@ BOOL OfaAutocorrExceptPage::FillItemSet( SfxItemSet&  )
     return FALSE;
 }
 
-/* -----------------23.11.98 10:33-------------------
- *
- * --------------------------------------------------*/
 void OfaAutocorrExceptPage::SetLanguage(LanguageType eSet)
 {
     if(eLang != eSet)
@@ -1799,9 +1686,7 @@ void OfaAutocorrExceptPage::SetLanguage(LanguageType eSet)
         ModifyHdl(&aDoubleCapsED);
     }
 }
-/* -----------------20.11.98 14:06-------------------
- *
- * --------------------------------------------------*/
+
 void OfaAutocorrExceptPage::RefillReplaceBoxes(BOOL bFromReset,
                                         LanguageType eOldLanguage,
                                         LanguageType eNewLanguage)
@@ -1875,10 +1760,6 @@ void OfaAutocorrExceptPage::RefillReplaceBoxes(BOOL bFromReset,
     }
 }
 
-/*-----------------14.10.96 15.58-------------------
-
---------------------------------------------------*/
-
 void OfaAutocorrExceptPage::Reset( const SfxItemSet& )
 {
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect();
@@ -1889,11 +1770,6 @@ void OfaAutocorrExceptPage::Reset( const SfxItemSet& )
     aAutoCapsCB.SaveValue();
 }
 
-/*-----------------16.10.96 12.27-------------------
-
---------------------------------------------------*/
-
-
 IMPL_LINK(OfaAutocorrExceptPage, NewDelHdl, PushButton*, pBtn)
 {
     if((pBtn == &aNewAbbrevPB || pBtn == (PushButton*)&aAbbrevED )
@@ -1921,10 +1797,6 @@ IMPL_LINK(OfaAutocorrExceptPage, NewDelHdl, PushButton*, pBtn)
     return 0;
 }
 
-/*-----------------16.10.96 12.57-------------------
-
---------------------------------------------------*/
-
 IMPL_LINK(OfaAutocorrExceptPage, SelectHdl, ListBox*, pBox)
 {
     if(pBox == &aAbbrevLB)
@@ -1942,10 +1814,6 @@ IMPL_LINK(OfaAutocorrExceptPage, SelectHdl, ListBox*, pBox)
     return 0;
 }
 
-/*-----------------16.10.96 13.02-------------------
-
---------------------------------------------------*/
-
 IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit*, pEdt)
 {
 //  BOOL bSame = pEdt->GetText() == ->GetSelectEntry();
@@ -1970,10 +1838,6 @@ IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit*, pEdt)
     return 0;
 }
 
-/*-----------------16.10.96 15.03-------------------
-
---------------------------------------------------*/
-
 void AutoCorrEdit::KeyInput( const KeyEvent& rKEvt )
 {
     const KeyCode aKeyCode = rKEvt.GetKeyCode();
@@ -1989,10 +1853,6 @@ void AutoCorrEdit::KeyInput( const KeyEvent& rKEvt )
         Edit::KeyInput(rKEvt);
 }
 
-/*-----------------03.07.97 13:17-------------------
-
---------------------------------------------------*/
-
 enum OfaQuoteOptions
 {
     ADD_NONBRK_SPACE,
@@ -2104,24 +1964,18 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) :
     aSglStandardPB.SetClickHdl(LINK(this,   OfaQuoteTabPage, StdQuoteHdl));
 
 }
-/*-----------------03.07.97 13:17-------------------
 
---------------------------------------------------*/
 OfaQuoteTabPage::~OfaQuoteTabPage()
 {
     delete( pCheckButtonData );
 }
-/*-----------------03.07.97 13:17-------------------
 
---------------------------------------------------*/
 SfxTabPage* OfaQuoteTabPage::Create( Window* pParent,
                                 const SfxItemSet& rAttrSet)
 {
     return new OfaQuoteTabPage(pParent, rAttrSet);
 }
-/*-----------------03.07.97 13:18-------------------
 
---------------------------------------------------*/
 BOOL OfaQuoteTabPage::FillItemSet( SfxItemSet&  )
 {
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect();
@@ -2189,16 +2043,12 @@ BOOL OfaQuoteTabPage::FillItemSet( SfxItemSet&  )
     }
     return bReturn;
 }
-/* -----------------23.11.98 16:15-------------------
- *
- * --------------------------------------------------*/
+
 void OfaQuoteTabPage::ActivatePage( const SfxItemSet& )
 {
     ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(FALSE);
 }
-/*-----------------03.07.97 13:18-------------------
 
---------------------------------------------------*/
 void OfaQuoteTabPage::Reset( const SfxItemSet& )
 {
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect();
@@ -2256,10 +2106,6 @@ void OfaQuoteTabPage::Reset( const SfxItemSet& )
     aDblEndExFT   .SetText(ChangeStringExt_Impl(cEndQuote));
 }
 
-
-/*-----------------15.10.96 16.42-------------------
-
---------------------------------------------------*/
 #define SGL_START       0
 #define DBL_START       1
 #define SGL_END         2
@@ -2342,9 +2188,6 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, PushButton*, pBtn )
     return 0;
 }
 
-/*-----------------27.06.97 09.55-------------------
-
---------------------------------------------------*/
 IMPL_LINK( OfaQuoteTabPage, StdQuoteHdl, PushButton*, pBtn )
 {
     if(pBtn == &aDblStandardPB)
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index d3224b6bf78b..489a64b5411a 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -113,9 +113,7 @@ struct SvxBackgroundPage_Impl
     SvxBackgroundPage_Impl() :
         pLoadTimer(NULL), bIsImportDlgInExecute(FALSE) {}
 };
-/* -----------------------------15.08.2002 12:21------------------------------
 
- ---------------------------------------------------------------------------*/
 inline BYTE lcl_PercentToTransparency(long nPercent)
 {
     //0xff must not be returned!
@@ -133,10 +131,6 @@ void lcl_SetTransparency(SvxBrushItem& rBrush, long nTransparency)
 }
 //-------------------------------------------------------------------------
 
-/*  [Beschreibung]
-
-*/
-
 USHORT GetItemId_Impl( ValueSet& rValueSet, const Color& rCol )
 {
     BOOL    bFound = FALSE;
@@ -196,10 +190,6 @@ BackgroundPreviewImpl::BackgroundPreviewImpl
     BOOL bIsBmpPreview
 ) :
 
-/*  [Beschreibung]
-
-*/
-
     Window( pParent, rResId ),
 
     bIsBmp   ( bIsBmpPreview ),
@@ -215,11 +205,6 @@ BackgroundPreviewImpl::BackgroundPreviewImpl
 //-----------------------------------------------------------------------
 
 BackgroundPreviewImpl::~BackgroundPreviewImpl()
-
-/*  [Beschreibung]
-
-*/
-
 {
     delete pBitmap;
 }
@@ -241,10 +226,6 @@ void BackgroundPreviewImpl::NotifyChange( const Color& rColor )
 //-----------------------------------------------------------------------
 
 void BackgroundPreviewImpl::NotifyChange( const Bitmap* pNewBitmap )
-/*  [Beschreibung]
-
-*/
-
 {
     if ( bIsBmp && (pNewBitmap || pBitmap) )
     {
@@ -318,9 +299,7 @@ void BackgroundPreviewImpl::Paint( const Rectangle& )
         }
     }
 }
-/* -----------------------------27.02.2002 11:07------------------------------
 
- ---------------------------------------------------------------------------*/
 void BackgroundPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt )
 {
     if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
@@ -338,10 +317,6 @@ void BackgroundPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt )
 SvxBackgroundTabPage::SvxBackgroundTabPage( Window* pParent,
                                             const SfxItemSet& rCoreSet ) :
 
-/*  [Beschreibung]
-
-*/
-
     SvxTabPage( pParent, CUI_RES( RID_SVXPAGE_BACKGROUND ), rCoreSet ),
 
     aBorderWin          ( this, CUI_RES(CT_BORDER) ),
@@ -408,11 +383,6 @@ SvxBackgroundTabPage::SvxBackgroundTabPage( Window* pParent,
 //------------------------------------------------------------------------
 
 SvxBackgroundTabPage::~SvxBackgroundTabPage()
-
-/*  [Beschreibung]
-
-*/
-
 {
     delete pPreviewWin1;
     delete pPreviewWin2;
@@ -466,11 +436,6 @@ SfxTabPage* SvxBackgroundTabPage::Create( Window* pParent,
 //------------------------------------------------------------------------
 
 void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet )
-
-/*  [Beschreibung]
-
-*/
-
 {
 // os: So ein Unsinn! Irgendwo laesst sich so ein Item immer finden,
 //      es muss aber im rSet vorhanden sein!
@@ -739,11 +704,6 @@ void SvxBackgroundTabPage::FillUserData()
 //------------------------------------------------------------------------
 
 BOOL SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
-
-/*  [Beschreibung]
-
-*/
-
 {
     if ( pPageImpl->pLoadTimer && pPageImpl->pLoadTimer->IsActive() )
     {
@@ -1092,11 +1052,6 @@ int SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet )
 //-----------------------------------------------------------------------
 
 void SvxBackgroundTabPage::PointChanged( Window* , RECT_POINT  )
-
-/*  [Beschreibung]
-
-*/
-
 {
     // muss implementiert werden, damit Position-Control funktioniert
 }
@@ -1104,11 +1059,6 @@ void SvxBackgroundTabPage::PointChanged( Window* , RECT_POINT  )
 //-----------------------------------------------------------------------
 
 void SvxBackgroundTabPage::ShowSelector()
-
-/*  [Beschreibung]
-
-*/
-
 {
     if( bAllowShowSelector)
     {
@@ -1143,11 +1093,6 @@ void SvxBackgroundTabPage::ShowSelector()
 
 
 void SvxBackgroundTabPage::RaiseLoadError_Impl()
-
-/*  [Beschreibung]
-
-*/
-
 {
     SfxErrorContext aContext( ERRCTX_SVX_BACKGROUND,
                               String(),
@@ -1163,11 +1108,6 @@ void SvxBackgroundTabPage::RaiseLoadError_Impl()
 //------------------------------------------------------------------------
 
 BOOL SvxBackgroundTabPage::LoadLinkedGraphic_Impl()
-
-/*  [Beschreibung]
-
-*/
-
 {
     BOOL bResult = ( aBgdGraphicPath.Len() > 0 ) &&
                    ( GRFILTER_OK == GraphicFilter::LoadGraphic( aBgdGraphicPath,
@@ -1430,11 +1370,6 @@ IMPL_LINK( SvxBackgroundTabPage, BackgroundColorHdl_Impl, ValueSet*, EMPTYARG )
 //------------------------------------------------------------------------
 
 IMPL_LINK( SvxBackgroundTabPage, SelectHdl_Impl, ListBox*, EMPTYARG )
-
-/*  [Beschreibung]
-
-*/
-
 {
     if ( 0 == aLbSelect.GetSelectEntryPos() )
     {
@@ -1452,11 +1387,6 @@ IMPL_LINK( SvxBackgroundTabPage, SelectHdl_Impl, ListBox*, EMPTYARG )
 //------------------------------------------------------------------------
 
 IMPL_LINK( SvxBackgroundTabPage, FileClickHdl_Impl, CheckBox*, pBox )
-
-/*  [Beschreibung]
-
-*/
-
 {
     if ( &aBtnLink == pBox )
     {
@@ -1501,11 +1431,6 @@ IMPL_LINK( SvxBackgroundTabPage, FileClickHdl_Impl, CheckBox*, pBox )
 //------------------------------------------------------------------------
 
 IMPL_LINK( SvxBackgroundTabPage, RadioClickHdl_Impl, RadioButton*, pBtn )
-
-/*  [Beschreibung]
-
-*/
-
 {
     if ( pBtn == &aBtnPosition )
     {
@@ -1628,11 +1553,6 @@ IMPL_LINK( SvxBackgroundTabPage, LoadTimerHdl_Impl, Timer* , pTimer )
 //-----------------------------------------------------------------------
 
 void SvxBackgroundTabPage::ShowTblControl()
-
-/*  [Beschreibung]
-
-*/
-
 {
     aTblLBox            .SetSelectHdl( HDL(TblDestinationHdl_Impl) );
     aTblLBox            .SelectEntryPos(0);
@@ -1656,11 +1576,6 @@ void SvxBackgroundTabPage::ShowParaControl(BOOL bCharOnly)
 //-----------------------------------------------------------------------
 
 IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox )
-
-/*  [Beschreibung]
-
-*/
-
 {
     USHORT nSelPos = pBox->GetSelectEntryPos();
     if( pTableBck_Impl && pTableBck_Impl->nActPos != nSelPos)
@@ -1802,11 +1717,6 @@ IMPL_LINK( SvxBackgroundTabPage, ParaDestinationHdl_Impl, ListBox*, pBox )
 
 void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr,
                                               const String& rUserData )
-
-/*  [Beschreibung]
-
-*/
-
 {
     SvxGraphicPosition  ePos = rBgdAttr.GetGraphicPos();
     const Color& rColor = rBgdAttr.GetColor();
@@ -1935,9 +1845,7 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr,
         SetGraphicPosition_Impl( ePos );
     }
 }
-/* -----------------------------09.08.2002 14:04------------------------------
 
- ---------------------------------------------------------------------------*/
 void SvxBackgroundTabPage::EnableTransparency(BOOL bColor, BOOL bGraphic)
 {
     bColTransparency  = bColor;
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index ffe2fae38679..d4abee233e50 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -215,9 +215,7 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
         aPropertiesFL   ( this, CUI_RES( FL_PROPERTIES ) ),
         aMergeWithNextCB( this, CUI_RES( CB_MERGEWITHNEXT ) ),
         aMergeAdjacentBordersCB( this, CUI_RES( CB_MERGEADJACENTBORDERS ) ),
-        aShadowImgLstH( CUI_RES(ILH_SDW_BITMAPS)),
         aShadowImgLst( CUI_RES(IL_SDW_BITMAPS)),
-        aBorderImgLstH( CUI_RES(ILH_PRE_BITMAPS)),
         aBorderImgLst( CUI_RES(IL_PRE_BITMAPS)),
         nMinValue(0),
         nSWMode(0),
@@ -1044,9 +1042,7 @@ USHORT SvxBorderTabPage::GetPresetStringId( USHORT nValueSetIdx ) const
 
 void SvxBorderTabPage::FillPresetVS()
 {
-    // find correct image list
-    bool bHC = aWndPresets.GetSettings().GetStyleSettings().GetHighContrastMode();
-    ImageList& rImgList = bHC ? aBorderImgLstH : aBorderImgLst;
+    ImageList& rImgList = aBorderImgLst;
     Size aImgSize( rImgList.GetImage( IID_PRE_CELL_NONE ).GetSizePixel() );
 
     // basic initialization of the ValueSet
@@ -1071,9 +1067,7 @@ void SvxBorderTabPage::FillPresetVS()
 
 void SvxBorderTabPage::FillShadowVS()
 {
-    // find correct image list
-    bool bHC = aWndPresets.GetSettings().GetStyleSettings().GetHighContrastMode();
-    ImageList& rImgList = bHC ? aShadowImgLstH : aShadowImgLst;
+    ImageList& rImgList = aShadowImgLst;
     Size aImgSize( rImgList.GetImage( IID_SHADOWNONE ).GetSizePixel() );
 
     // basic initialization of the ValueSet
diff --git a/cui/source/tabpages/border.hrc b/cui/source/tabpages/border.hrc
index 3f7699df951b..faf4837eebb7 100644
--- a/cui/source/tabpages/border.hrc
+++ b/cui/source/tabpages/border.hrc
@@ -70,7 +70,6 @@
 
 // ImageListe fuer ValueSets:
 #define IL_PRE_BITMAPS          1400
-#define ILH_PRE_BITMAPS         1401
 #define IID_PRE_CELL_NONE       1
 #define IID_PRE_CELL_ALL        2
 #define IID_PRE_CELL_LR         3
@@ -94,7 +93,6 @@
 #define IID_PRE_TABLE_OUTER2    21
 
 #define IL_SDW_BITMAPS          1500
-#define ILH_SDW_BITMAPS         1501
 #define IID_SHADOWNONE          1
 #define IID_SHADOW_BOT_RIGHT    2
 #define IID_SHADOW_BOT_LEFT     3
diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src
index 811f5429aeb7..583302898e15 100644
--- a/cui/source/tabpages/border.src
+++ b/cui/source/tabpages/border.src
@@ -324,12 +324,6 @@ TabPage RID_SVXPAGE_BORDER
         MaskColor = STD_MASKCOLOR ;
         _PREVIEW_IDLIST_
     };
-    ImageList ILH_PRE_BITMAPS
-    {
-        Prefix = "prh";
-        MaskColor = STD_MASKCOLOR ;
-        _PREVIEW_IDLIST_
-    };
 
 #define _SHADOW_IDLIST_             \
         IdList =                    \
@@ -348,12 +342,6 @@ TabPage RID_SVXPAGE_BORDER
         MaskColor = STD_MASKCOLOR ;
         _SHADOW_IDLIST_
     };
-    ImageList ILH_SDW_BITMAPS
-    {
-        Prefix = "shh";
-        MaskColor = STD_MASKCOLOR ;
-        _SHADOW_IDLIST_
-    };
 };
 
 String RID_SVXSTR_TABLE_PRESET_NONE
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index e0356b2b5391..c9f2cb482f88 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -3343,9 +3343,6 @@ IMPL_LINK( SvxCharPositionPage, ScaleWidthModifyHdl_Impl, MetricField*, EMPTYARG
     return 0;
 }
 
-/* -----------------28.08.2003 12:12-----------------
-
- --------------------------------------------------*/
 void  SvxCharPositionPage::ActivatePage( const SfxItemSet& rSet )
 {
     //update the preview
diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx
index 433b5e6e2ab5..d45ba2df61ca 100644
--- a/cui/source/tabpages/dstribut.cxx
+++ b/cui/source/tabpages/dstribut.cxx
@@ -88,36 +88,27 @@ SvxDistributePage::SvxDistributePage(
 :   SvxTabPage(pWindow, CUI_RES(RID_SVXPAGE_DISTRIBUTE), rInAttrs),
     meDistributeHor(eHor),
     meDistributeVer(eVer),
-    maFlHorizontal      (this, CUI_RES(FL_HORIZONTAL        )),
+    maFlHorizontal      (this, CUI_RES(FL_HORIZONTAL    )),
     maBtnHorNone        (this, CUI_RES(BTN_HOR_NONE     )),
     maBtnHorLeft        (this, CUI_RES(BTN_HOR_LEFT     )),
-    maBtnHorCenter      (this, CUI_RES(BTN_HOR_CENTER       )),
+    maBtnHorCenter      (this, CUI_RES(BTN_HOR_CENTER   )),
     maBtnHorDistance    (this, CUI_RES(BTN_HOR_DISTANCE )),
-    maBtnHorRight       (this, CUI_RES(BTN_HOR_RIGHT        )),
+    maBtnHorRight       (this, CUI_RES(BTN_HOR_RIGHT    )),
     maHorLow            (this, CUI_RES(IMG_HOR_LOW      )),
-    maHorCenter         (this, CUI_RES(IMG_HOR_CENTER       )),
+    maHorCenter         (this, CUI_RES(IMG_HOR_CENTER   )),
     maHorDistance       (this, CUI_RES(IMG_HOR_DISTANCE )),
     maHorHigh           (this, CUI_RES(IMG_HOR_HIGH     )),
     maFlVertical        (this, CUI_RES(FL_VERTICAL      )),
     maBtnVerNone        (this, CUI_RES(BTN_VER_NONE     )),
     maBtnVerTop         (this, CUI_RES(BTN_VER_TOP      )),
-    maBtnVerCenter      (this, CUI_RES(BTN_VER_CENTER       )),
+    maBtnVerCenter      (this, CUI_RES(BTN_VER_CENTER   )),
     maBtnVerDistance    (this, CUI_RES(BTN_VER_DISTANCE )),
-    maBtnVerBottom      (this, CUI_RES(BTN_VER_BOTTOM       )),
-    maVerLow            (this, CUI_RES(IMG_VER_LOW        )),
-    maVerCenter         (this, CUI_RES(IMG_VER_CENTER       )),
-    maVerDistance       (this, CUI_RES(IMG_VER_DISTANCE   )),
-    maVerHigh           (this, CUI_RES(IMG_VER_HIGH       ))
+    maBtnVerBottom      (this, CUI_RES(BTN_VER_BOTTOM   )),
+    maVerLow            (this, CUI_RES(IMG_VER_LOW      )),
+    maVerCenter         (this, CUI_RES(IMG_VER_CENTER   )),
+    maVerDistance       (this, CUI_RES(IMG_VER_DISTANCE )),
+    maVerHigh           (this, CUI_RES(IMG_VER_HIGH     ))
 {
-    maHorLow.SetModeImage( Image( CUI_RES( IMG_HOR_LOW_H ) ), BMP_COLOR_HIGHCONTRAST );
-    maHorCenter.SetModeImage( Image( CUI_RES( IMG_HOR_CENTER_H ) ), BMP_COLOR_HIGHCONTRAST );
-    maHorDistance.SetModeImage( Image( CUI_RES( IMG_HOR_DISTANCE_H ) ), BMP_COLOR_HIGHCONTRAST );
-    maHorHigh.SetModeImage( Image( CUI_RES( IMG_HOR_HIGH_H ) ), BMP_COLOR_HIGHCONTRAST );
-    maVerDistance.SetModeImage( Image( CUI_RES( IMG_VER_DISTANCE_H ) ), BMP_COLOR_HIGHCONTRAST );
-    maVerLow.SetModeImage( Image( CUI_RES( IMG_VER_LOW_H ) ), BMP_COLOR_HIGHCONTRAST );
-    maVerCenter.SetModeImage( Image( CUI_RES( IMG_VER_CENTER_H ) ), BMP_COLOR_HIGHCONTRAST );
-    maVerHigh.SetModeImage( Image( CUI_RES( IMG_VER_HIGH_H ) ), BMP_COLOR_HIGHCONTRAST );
-
     FreeResource();
 }
 
@@ -180,11 +171,11 @@ void __EXPORT SvxDistributePage::Reset(const SfxItemSet& )
 
     switch(meDistributeHor)
     {
-        case SvxDistributeHorizontalNone : maBtnHorNone.SetState(TRUE); break;
-        case SvxDistributeHorizontalLeft : maBtnHorLeft.SetState(TRUE); break;
-        case SvxDistributeHorizontalCenter : maBtnHorCenter.SetState(TRUE); break;
+        case SvxDistributeHorizontalNone     : maBtnHorNone.SetState(TRUE);     break;
+        case SvxDistributeHorizontalLeft     : maBtnHorLeft.SetState(TRUE);     break;
+        case SvxDistributeHorizontalCenter   : maBtnHorCenter.SetState(TRUE);   break;
         case SvxDistributeHorizontalDistance : maBtnHorDistance.SetState(TRUE); break;
-        case SvxDistributeHorizontalRight : maBtnHorRight.SetState(TRUE); break;
+        case SvxDistributeHorizontalRight    : maBtnHorRight.SetState(TRUE);    break;
     }
 
     maBtnVerNone.SetState(FALSE);
diff --git a/cui/source/tabpages/dstribut.hrc b/cui/source/tabpages/dstribut.hrc
index 201fac2b5227..564d7d8c3d64 100644
--- a/cui/source/tabpages/dstribut.hrc
+++ b/cui/source/tabpages/dstribut.hrc
@@ -44,12 +44,3 @@
 #define IMG_VER_CENTER          19
 #define IMG_VER_DISTANCE        20
 #define IMG_VER_HIGH            21
-
-#define IMG_HOR_LOW_H           22
-#define IMG_HOR_CENTER_H        23
-#define IMG_HOR_DISTANCE_H      24
-#define IMG_HOR_HIGH_H          25
-#define IMG_VER_LOW_H           26
-#define IMG_VER_CENTER_H        27
-#define IMG_VER_DISTANCE_H      28
-#define IMG_VER_HIGH_H          29
diff --git a/cui/source/tabpages/dstribut.src b/cui/source/tabpages/dstribut.src
index 18e38fd5236a..30746cbc72bc 100644
--- a/cui/source/tabpages/dstribut.src
+++ b/cui/source/tabpages/dstribut.src
@@ -204,88 +204,6 @@ TabPage RID_SVXPAGE_DISTRIBUTE
         };
     };
 
-
-    Image IMG_HOR_LOW_H
-    {
-        ImageBitmap = Bitmap { File = "dsth_low_h.bmp" ; };
-        MaskColor = STD_MASKCOLOR ;
-    };
-
-    Image IMG_HOR_DISTANCE_H
-    {
-        ImageBitmap = Bitmap { File = "dsth_dst_h.bmp" ; };
-        MaskColor = STD_MASKCOLOR ;
-    };
-
-    Image IMG_HOR_CENTER_H
-    {
-        ImageBitmap = Bitmap { File = "dsth_cen_h.bmp" ; };
-        MaskColor = STD_MASKCOLOR ;
-    };
-
-    Image IMG_HOR_HIGH_H
-    {
-        ImageBitmap = Bitmap { File = "dsth_hig_h.bmp" ; };
-        MaskColor = STD_MASKCOLOR ;
-    };
-
-    Image IMG_VER_HIGH_H
-    {
-        ImageBitmap = Bitmap { File = "dstv_hig_h.bmp" ; };
-        MaskColor = STD_MASKCOLOR ;
-    };
-
-    Image IMG_VER_CENTER_H
-    {
-        ImageBitmap = Bitmap { File = "dstv_cen_h.bmp" ; };
-        MaskColor = STD_MASKCOLOR ;
-    };
-
-    Image IMG_VER_DISTANCE_H
-    {
-        ImageBitmap = Bitmap { File = "dstv_dst_h.bmp" ; };
-        MaskColor = STD_MASKCOLOR ;
-    };
-
-    Image IMG_VER_LOW_H
-    {
-        ImageBitmap = Bitmap { File = "dstv_low_h.bmp" ; };
-        MaskColor = STD_MASKCOLOR ;
-    };
-
 };
 
 // ********************************************************************** EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 0500207c2049..85bc19f67daf 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -137,26 +137,15 @@ SvxGrfCropPage::SvxGrfCropPage ( Window *pParent, const SfxItemSet &rSet )
     aTimer.SetTimeout( 1500 );
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 SvxGrfCropPage::~SvxGrfCropPage()
 {
     aTimer.Stop();
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 SfxTabPage* SvxGrfCropPage::Create(Window *pParent, const SfxItemSet &rSet)
 {
     return new SvxGrfCropPage( pParent, rSet );
 }
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
 
 void SvxGrfCropPage::Reset( const SfxItemSet &rSet )
 {
@@ -247,10 +236,6 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet )
     bReset = FALSE;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 BOOL SvxGrfCropPage::FillItemSet(SfxItemSet &rSet)
 {
     const SfxItemPool& rPool = *rSet.GetPool();
@@ -316,10 +301,6 @@ BOOL SvxGrfCropPage::FillItemSet(SfxItemSet &rSet)
     return bModified;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet)
 {
 #ifdef DBG_UTIL
@@ -391,10 +372,6 @@ void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet)
     CalcZoom();
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 int SvxGrfCropPage::DeactivatePage(SfxItemSet *_pSet)
 {
     if ( _pSet )
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 4eeb6be807fe..e63ea5855ce4 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -126,10 +126,7 @@ SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs
 
     sal_uInt16 nBitmap;
     for( nBitmap = 0; nBitmap < CAPTYPE_BITMAPS_COUNT; nBitmap++ )
-    {
         mpBmpCapTypes[nBitmap]  = new Image(Bitmap(CUI_RES(BMP_CAPTTYPE_1   + nBitmap)), COL_LIGHTMAGENTA );
-        mpBmpCapTypesH[nBitmap] = new Image(Bitmap(CUI_RES(BMP_CAPTTYPE_1_H + nBitmap)), COL_LIGHTMAGENTA );
-    }
 
     //------------ValueSet installieren--------------------------
     aCT_CAPTTYPE.SetStyle( aCT_CAPTTYPE.GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_NAMEFIELD );
@@ -157,10 +154,7 @@ SvxCaptionTabPage::~SvxCaptionTabPage()
 {
     sal_uInt16 nBitmap;
     for( nBitmap = 0; nBitmap < CAPTYPE_BITMAPS_COUNT; nBitmap++ )
-    {
         delete mpBmpCapTypes[nBitmap];
-        delete mpBmpCapTypesH[nBitmap];
-    }
 }
 
 // -----------------------------------------------------------------------
@@ -568,9 +562,7 @@ void SvxCaptionTabPage::DataChanged( const DataChangedEvent& rDCEvt )
 
 void SvxCaptionTabPage::FillValueSet()
 {
-    bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
-    Image** ppBitmaps = bHighContrast ? mpBmpCapTypesH : mpBmpCapTypes;
+    Image** ppBitmaps = mpBmpCapTypes;
     aCT_CAPTTYPE.SetItemImage(BMP_CAPTTYPE_1, *(ppBitmaps[0]) );
     aCT_CAPTTYPE.SetItemImage(BMP_CAPTTYPE_2, *(ppBitmaps[1]) );
     aCT_CAPTTYPE.SetItemImage(BMP_CAPTTYPE_3, *(ppBitmaps[2]) );
@@ -640,9 +632,7 @@ void SvxCaptionTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage )
         break;
     }
 }
-/*-- 05.03.2004 13:54:26---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvxCaptionTabDialog::SetValidateFramePosLink( const Link& rLink )
 {
     aValidateLink = rLink;
diff --git a/cui/source/tabpages/labdlg.hrc b/cui/source/tabpages/labdlg.hrc
index 8f76e8572f86..8759a0158f22 100644
--- a/cui/source/tabpages/labdlg.hrc
+++ b/cui/source/tabpages/labdlg.hrc
@@ -66,11 +66,6 @@
 #define BMP_CAPTTYPE_3          3
 #define BMP_CAPTTYPE_4          4
 
-#define BMP_CAPTTYPE_1_H        5
-#define BMP_CAPTTYPE_2_H        6
-#define BMP_CAPTTYPE_3_H        7
-#define BMP_CAPTTYPE_4_H        8
-
 #define SHOW_HORZ               1
 #define SHOW_VERT               2
 #define SHOW_ABS                3
diff --git a/cui/source/tabpages/labdlg.src b/cui/source/tabpages/labdlg.src
index ed13f2de9b49..05497e59b7a4 100644
--- a/cui/source/tabpages/labdlg.src
+++ b/cui/source/tabpages/labdlg.src
@@ -214,22 +214,6 @@ TabPage RID_SVXPAGE_CAPTION
     {
         File = "legtyp4.bmp" ;
     };
-    Bitmap BMP_CAPTTYPE_1_H
-    {
-        File = "legtyp1_hc.bmp" ;
-    };
-    Bitmap BMP_CAPTTYPE_2_H
-    {
-        File = "legtyp2_hc.bmp" ;
-    };
-    Bitmap BMP_CAPTTYPE_3_H
-    {
-        File = "legtyp3_hc.bmp" ;
-    };
-    Bitmap BMP_CAPTTYPE_4_H
-    {
-        File = "legtyp4_hc.bmp" ;
-    };
 };
  // RID_SVXDLG_CAPTION ----------------------------------------------------
 
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 1fe6de438dc0..0a93e86b637f 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -308,7 +308,6 @@ SvxNumberFormatTabPage::~SvxNumberFormatTabPage()
 void SvxNumberFormatTabPage::Init_Impl()
 {
     ImageList               aIconList( CUI_RES_PLAIN ( IL_ICON ) );
-    ImageList               aIconListHC( CUI_RES_PLAIN ( IL_ICON_HC ) );
 
     bNumItemFlag=TRUE;
     bOneAreaFlag=FALSE;
@@ -321,13 +320,8 @@ void SvxNumberFormatTabPage::Init_Impl()
     nStdFormatHeight=nCurFormatY-nStdFormatY+nCurFormatHeight;
 
     aIbAdd.     SetModeImage( aIconList.GetImage( IID_ADD ) );
-    aIbAdd.     SetModeImage( aIconListHC.GetImage( IID_ADD ), BMP_COLOR_HIGHCONTRAST );
-
     aIbRemove.  SetModeImage( aIconList.GetImage( IID_REMOVE ) );
-    aIbRemove.  SetModeImage( aIconListHC.GetImage( IID_REMOVE ), BMP_COLOR_HIGHCONTRAST );
-
     aIbInfo.    SetModeImage( aIconList.GetImage( IID_INFO ) );
-    aIbInfo.    SetModeImage( aIconListHC.GetImage( IID_INFO ), BMP_COLOR_HIGHCONTRAST );
 
     aIbAdd.Enable(FALSE );
     aIbRemove.Enable(FALSE );
@@ -1925,12 +1919,11 @@ void SvxNumberFormatTabPage::SetCategory(USHORT nPos)
     }
     aLbCategory.SelectEntryPos(nPos);
 }
-/* -----------------12.11.2002 14:35-----------------
- * to support Writer text field language handling an
- * additional entry needs to be inserted into the ListBox
- * which marks a certain language as automatically detected
- * Additionally the "Default" language is removed
- * --------------------------------------------------*/
+/* to support Writer text field language handling an
+   additional entry needs to be inserted into the ListBox
+   which marks a certain language as automatically detected
+   Additionally the "Default" language is removed
+*/
 void SvxNumberFormatTabPage::AddAutomaticLanguage_Impl(LanguageType eAutoLang, BOOL bSelect)
 {
     aLbLanguage.RemoveLanguage(LANGUAGE_SYSTEM);
diff --git a/cui/source/tabpages/numfmt.hrc b/cui/source/tabpages/numfmt.hrc
index f863a303c800..6b72d486af41 100644
--- a/cui/source/tabpages/numfmt.hrc
+++ b/cui/source/tabpages/numfmt.hrc
@@ -62,7 +62,6 @@
 #define IL_ICON                 32
 #define LB_CURRENCY             33
 #define CB_SOURCEFORMAT         34
-#define IL_ICON_HC              35
 #define STR_AUTO_ENTRY          36
 
 #define TBX_ADDREMOVE           1
diff --git a/cui/source/tabpages/numfmt.src b/cui/source/tabpages/numfmt.src
index 2538b196932c..b8c35b2d17ad 100644
--- a/cui/source/tabpages/numfmt.src
+++ b/cui/source/tabpages/numfmt.src
@@ -240,18 +240,6 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
         };
         IdCount = { 3 ; };
     };
-    ImageList IL_ICON_HC
-    {
-        Prefix = "nuh";
-        MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-        IdList =
-        {
-            IID_ADD ;
-            IID_REMOVE ;
-            IID_INFO ;
-        };
-        IdCount = { 3 ; };
-    };
 
     String STR_AUTO_ENTRY
     {
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 0a1e02b78a9e..97d81ea2828e 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -94,9 +94,6 @@ using rtl::OUString;
 
 SV_IMPL_PTRARR(SvxNumSettingsArr_Impl,SvxNumSettings_ImplPtr);
 
-/*-----------------07.02.97 15.37-------------------
-
---------------------------------------------------*/
 #define NUM_PAGETYPE_BULLET         0
 #define NUM_PAGETYPE_SINGLENUM      1
 #define NUM_PAGETYPE_NUM            2
@@ -118,9 +115,7 @@ static const sal_Char cPrefix[] = "Prefix";
 static const sal_Char cSuffix[] = "Suffix";
 static const sal_Char cBulletChar[] = "BulletChar";
 static const sal_Char cBulletFontName[] = "BulletFontName";
-/* -----------------------------31.01.01 10:23--------------------------------
 
- ---------------------------------------------------------------------------*/
 Reference<XDefaultNumberingProvider> lcl_GetNumberingProvider()
 {
     Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
@@ -131,9 +126,7 @@ Reference<XDefaultNumberingProvider> lcl_GetNumberingProvider()
 
     return xRet;
 }
-/* -----------------------------31.01.01 11:40--------------------------------
 
- ---------------------------------------------------------------------------*/
 SvxNumSettings_ImplPtr lcl_CreateNumSettingsPtr(const Sequence<PropertyValue>& rLevelProps)
 {
     const PropertyValue* pValues = rLevelProps.getConstArray();
@@ -155,9 +148,7 @@ SvxNumSettings_ImplPtr lcl_CreateNumSettingsPtr(const Sequence<PropertyValue>& r
     }
     return pNew;
 }
-/* -----------------28.10.98 08:32-------------------
- *
- * --------------------------------------------------*/
+
 // Die Auswahl an Bullets aus den StarSymbol
 static const sal_Unicode aBulletTypes[] =
 {
@@ -170,9 +161,7 @@ static const sal_Unicode aBulletTypes[] =
     0x2717,
     0x2714
 };
-/* -----------------28.10.98 09:42-------------------
- *
- * --------------------------------------------------*/
+
 static sal_Char __READONLY_DATA aNumChar[] =
 {
     'A', //CHARS_UPPER_LETTER
@@ -183,9 +172,7 @@ static sal_Char __READONLY_DATA aNumChar[] =
     ' '
 };
 
-/*-----------------18.03.98 08:35-------------------
-    Ist eins der maskierten Formate gesetzt?
---------------------------------------------------*/
+// Ist eins der maskierten Formate gesetzt?
 BOOL lcl_IsNumFmtSet(SvxNumRule* pNum, USHORT nLevelMask)
 {
     BOOL bRet = FALSE;
@@ -198,9 +185,6 @@ BOOL lcl_IsNumFmtSet(SvxNumRule* pNum, USHORT nLevelMask)
     }
     return bRet;
 }
-/* -----------------28.10.98 08:50-------------------
- *
- * --------------------------------------------------*/
 
 Font& lcl_GetDefaultBulletFont()
 {
@@ -273,9 +257,6 @@ SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(Window* pParent,
         pExamplesVS->SetNumberingSettings(aNumberings, xFormat, aLocale);
     }
 }
-/*-----------------07.02.97 12.08-------------------
-
---------------------------------------------------*/
 
  SvxSingleNumPickTabPage::~SvxSingleNumPickTabPage()
 {
@@ -285,21 +266,12 @@ SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(Window* pParent,
     aNumSettingsArr.DeleteAndDestroy(0, aNumSettingsArr.Count());
 }
 
-/*-----------------07.02.97 12.13-------------------
-
---------------------------------------------------*/
-
 SfxTabPage*  SvxSingleNumPickTabPage::Create( Window* pParent,
                                 const SfxItemSet& rAttrSet)
 {
     return new SvxSingleNumPickTabPage(pParent, rAttrSet);
 }
 
-/*-----------------07.02.97 12.09-------------------
-
---------------------------------------------------*/
-
-
 BOOL  SvxSingleNumPickTabPage::FillItemSet( SfxItemSet& rSet )
 {
     if( (bPreset || bModified) && pSaveNum)
@@ -312,10 +284,6 @@ BOOL  SvxSingleNumPickTabPage::FillItemSet( SfxItemSet& rSet )
     return bModified;
 }
 
-/*-----------------08.02.97 16.27-------------------
-
---------------------------------------------------*/
-
 void  SvxSingleNumPickTabPage::ActivatePage(const SfxItemSet& rSet)
 {
     const SfxPoolItem* pItem;
@@ -351,10 +319,6 @@ void  SvxSingleNumPickTabPage::ActivatePage(const SfxItemSet& rSet)
     bModified = FALSE;
 }
 
-/*-----------------08.02.97 11.28-------------------
-
---------------------------------------------------*/
-
 int  SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet)
 {
     if(_pSet)
@@ -362,11 +326,6 @@ int  SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet)
     return TRUE;
 }
 
-/*-----------------07.02.97 12.09-------------------
-
---------------------------------------------------*/
-
-
 void  SvxSingleNumPickTabPage::Reset( const SfxItemSet& rSet )
 {
     const SfxPoolItem* pItem;
@@ -393,9 +352,6 @@ void  SvxSingleNumPickTabPage::Reset( const SfxItemSet& rSet )
     else if(*pSaveNum != *pActNum)
         *pActNum = *pSaveNum;
 }
-/*-----------------08.02.97 11.40-------------------
-
---------------------------------------------------*/
 
 IMPL_LINK(SvxSingleNumPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG)
 {
@@ -439,9 +395,6 @@ IMPL_LINK(SvxSingleNumPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG)
     return 0;
 }
 
-/*-----------------06.06.97 11.15-------------------
-
---------------------------------------------------*/
 IMPL_LINK(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG)
 {
     NumSelectHdl_Impl(pExamplesVS);
@@ -475,10 +428,6 @@ SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent,
     pExamplesVS->SetHelpId(HID_VALUESET_BULLET    );
 
 }
-/*-----------------07.02.97 12.10-------------------
-
---------------------------------------------------*/
-
 
  SvxBulletPickTabPage::~SvxBulletPickTabPage()
 {
@@ -486,10 +435,6 @@ SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent,
     delete pExamplesVS;
     delete pSaveNum;
 }
-/*-----------------07.02.97 12.10-------------------
-
---------------------------------------------------*/
-
 
 SfxTabPage*  SvxBulletPickTabPage::Create( Window* pParent,
                                 const SfxItemSet& rAttrSet)
@@ -497,11 +442,6 @@ SfxTabPage*  SvxBulletPickTabPage::Create( Window* pParent,
     return new SvxBulletPickTabPage(pParent, rAttrSet);
 }
 
-/*-----------------07.02.97 12.10-------------------
-
---------------------------------------------------*/
-
-
 BOOL  SvxBulletPickTabPage::FillItemSet( SfxItemSet& rSet )
 {
     if( (bPreset || bModified) && pActNum)
@@ -512,9 +452,6 @@ BOOL  SvxBulletPickTabPage::FillItemSet( SfxItemSet& rSet )
     }
     return bModified;
 }
-/*-----------------08.02.97 16.28-------------------
-
---------------------------------------------------*/
 
 void  SvxBulletPickTabPage::ActivatePage(const SfxItemSet& rSet)
 {
@@ -549,9 +486,6 @@ void  SvxBulletPickTabPage::ActivatePage(const SfxItemSet& rSet)
     bPreset |= bIsPreset;
     bModified = FALSE;
 }
-/*-----------------08.02.97 11.28-------------------
-
---------------------------------------------------*/
 
 int  SvxBulletPickTabPage::DeactivatePage(SfxItemSet *_pSet)
 {
@@ -560,11 +494,6 @@ int  SvxBulletPickTabPage::DeactivatePage(SfxItemSet *_pSet)
     return TRUE;
 }
 
-/*-----------------07.02.97 12.11-------------------
-
---------------------------------------------------*/
-
-
 void  SvxBulletPickTabPage::Reset( const SfxItemSet& rSet )
 {
     const SfxPoolItem* pItem;
@@ -593,9 +522,6 @@ void  SvxBulletPickTabPage::Reset( const SfxItemSet& rSet )
     else if(*pSaveNum != *pActNum)
         *pActNum = *pSaveNum;
 }
-/*-----------------08.02.97 11.58-------------------
-
---------------------------------------------------*/
 
 IMPL_LINK(SvxBulletPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG)
 {
@@ -709,10 +635,6 @@ SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent,
         pExamplesVS->SetOutlineNumberingSettings(aOutlineAccess, xFormat, aLocale);
     }
 }
-/*-----------------07.02.97 12.12-------------------
-
---------------------------------------------------*/
-
 
  SvxNumPickTabPage::~SvxNumPickTabPage()
 {
@@ -721,22 +643,12 @@ SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent,
     delete pSaveNum;
 }
 
-/*-----------------07.02.97 12.12-------------------
-
---------------------------------------------------*/
-
-
 SfxTabPage*  SvxNumPickTabPage::Create( Window* pParent,
                                 const SfxItemSet& rAttrSet)
 {
     return new SvxNumPickTabPage(pParent, rAttrSet);
 }
 
-/*-----------------07.02.97 12.12-------------------
-
---------------------------------------------------*/
-
-
 BOOL  SvxNumPickTabPage::FillItemSet( SfxItemSet& rSet )
 {
     if( (bPreset || bModified) && pActNum)
@@ -747,9 +659,6 @@ BOOL  SvxNumPickTabPage::FillItemSet( SfxItemSet& rSet )
     }
     return bModified;
 }
-/*-----------------08.02.97 16.28-------------------
-
---------------------------------------------------*/
 
 void  SvxNumPickTabPage::ActivatePage(const SfxItemSet& rSet)
 {
@@ -785,10 +694,6 @@ void  SvxNumPickTabPage::ActivatePage(const SfxItemSet& rSet)
     bModified = FALSE;
 }
 
-/* -----------------08.02.97 11.29-------------------
-
---------------------------------------------------*/
-
 int  SvxNumPickTabPage::DeactivatePage(SfxItemSet *_pSet)
 {
     if(_pSet)
@@ -796,10 +701,6 @@ int  SvxNumPickTabPage::DeactivatePage(SfxItemSet *_pSet)
     return TRUE;
 }
 
-/*-----------------07.02.97 12.12-------------------
-
---------------------------------------------------*/
-
 void  SvxNumPickTabPage::Reset( const SfxItemSet& rSet )
 {
     const SfxPoolItem* pItem;
@@ -829,10 +730,7 @@ void  SvxNumPickTabPage::Reset( const SfxItemSet& rSet )
 
 }
 
-/*-----------------08.02.97 11.58-------------------
-    Hier werden alle Ebenen veraendert,
---------------------------------------------------*/
-
+// Hier werden alle Ebenen veraendert
 IMPL_LINK(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG)
 {
     if(pActNum)
@@ -1004,11 +902,7 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent,
 
 }
 
-/*-----------------12.02.97 07.46-------------------
-
---------------------------------------------------*/
-
- SvxBitmapPickTabPage::~SvxBitmapPickTabPage()
+SvxBitmapPickTabPage::~SvxBitmapPickTabPage()
 {
     String* pStr = (String*)aGrfNames.First();
     while( pStr )
@@ -1021,20 +915,12 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent,
     delete pSaveNum;
 }
 
-/*-----------------12.02.97 07.46-------------------
-
---------------------------------------------------*/
-
 SfxTabPage*  SvxBitmapPickTabPage::Create( Window* pParent,
                                 const SfxItemSet& rAttrSet)
 {
     return new SvxBitmapPickTabPage(pParent, rAttrSet);
 }
 
-/*-----------------12.02.97 07.46-------------------
-
---------------------------------------------------*/
-
 void  SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet)
 {
     const SfxPoolItem* pItem;
@@ -1070,9 +956,6 @@ void  SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet)
     bPreset |= bIsPreset;
     bModified = FALSE;
 }
-/*-----------------12.02.97 07.46-------------------
-
---------------------------------------------------*/
 
 int  SvxBitmapPickTabPage::DeactivatePage(SfxItemSet *_pSet)
 {
@@ -1080,9 +963,6 @@ int  SvxBitmapPickTabPage::DeactivatePage(SfxItemSet *_pSet)
         FillItemSet(*_pSet);
     return TRUE;
 }
-/*-----------------12.02.97 07.46-------------------
-
---------------------------------------------------*/
 
 BOOL  SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet )
 {
@@ -1101,9 +981,6 @@ BOOL  SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet )
 
     return bModified;
 }
-/*-----------------12.02.97 07.46-------------------
-
---------------------------------------------------*/
 
 void  SvxBitmapPickTabPage::Reset( const SfxItemSet& rSet )
 {
@@ -1142,10 +1019,6 @@ void  SvxBitmapPickTabPage::Reset( const SfxItemSet& rSet )
     }
 }
 
-/*-----------------12.02.97 07.53-------------------
-
---------------------------------------------------*/
-
 IMPL_LINK(SvxBitmapPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG)
 {
     if(pActNum)
@@ -1193,9 +1066,6 @@ IMPL_LINK(SvxBitmapPickTabPage, NumSelectHdl_Impl, ValueSet*, EMPTYARG)
     return 0;
 }
 
-/*-----------------06.06.97 11.17-------------------
-
---------------------------------------------------*/
 IMPL_LINK(SvxBitmapPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG)
 {
     NumSelectHdl_Impl(pExamplesVS);
@@ -1203,9 +1073,7 @@ IMPL_LINK(SvxBitmapPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG)
     rOk.GetClickHdl().Call(&rOk);
     return 0;
 }
-/* -----------------03.11.99 13:46-------------------
 
- --------------------------------------------------*/
 IMPL_LINK(SvxBitmapPickTabPage, LinkBmpHdl_Impl, CheckBox*, EMPTYARG )
 {
     if(!pExamplesVS->IsNoSelection())
@@ -1215,70 +1083,7 @@ IMPL_LINK(SvxBitmapPickTabPage, LinkBmpHdl_Impl, CheckBox*, EMPTYARG )
     return 0;
 }
 
-//CHINA001 SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent, const ResId& rResId/*, const List& rStrNames*/ ) :
-//CHINA001
-//CHINA001 SvxNumValueSet( pParent, rResId, NUM_PAGETYPE_BMP ),
-//CHINA001 //    rStrList    ( rStrNames ),
-//CHINA001 bGrfNotFound( FALSE )
-//CHINA001
-//CHINA001 {
-//CHINA001 GalleryExplorer::BeginLocking(GALLERY_THEME_BULLETS);
-//CHINA001 SetStyle( GetStyle() | WB_VSCROLL );
-//CHINA001 SetLineCount( 3 );
-//CHINA001 aFormatTimer.SetTimeout(300);
-//CHINA001 aFormatTimer.SetTimeoutHdl(LINK(this, SvxBmpNumValueSet, FormatHdl_Impl));
-//CHINA001 }
-//CHINA001
-//CHINA001 SvxBmpNumValueSet::~SvxBmpNumValueSet()
-//CHINA001 {
-//CHINA001 GalleryExplorer::EndLocking(GALLERY_THEME_BULLETS);
-//CHINA001 aFormatTimer.Stop();
-//CHINA001 }
-//CHINA001
-//CHINA001 void     SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
-//CHINA001 {
-//CHINA001 SvxNumValueSet::UserDraw(rUDEvt);
-//CHINA001
-//CHINA001 Rectangle aRect = rUDEvt.GetRect();
-//CHINA001 OutputDevice*  pDev = rUDEvt.GetDevice();
-//CHINA001 USHORT   nItemId = rUDEvt.GetItemId();
-//CHINA001 Point aBLPos = aRect.TopLeft();
-//CHINA001
-//CHINA001 int nRectHeight = aRect.GetHeight();
-//CHINA001 Size aSize(nRectHeight/8, nRectHeight/8);
-//CHINA001
-//CHINA001 Graphic aGraphic;
-//CHINA001 if(!GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, nItemId - 1,
-//CHINA001 &aGraphic, NULL))
-//CHINA001 {
-//CHINA001 bGrfNotFound = TRUE;
-//CHINA001  }
-//CHINA001  else
-//CHINA001 {
-//CHINA001 Point aPos(aBLPos.X() + 5, 0);
-//CHINA001 for( USHORT i = 0; i < 3; i++ )
-//CHINA001 {
-//CHINA001 USHORT nY = 11 + i * 33;
-//CHINA001 aPos.Y() = aBLPos.Y() + nRectHeight  * nY / 100;
-//CHINA001 aGraphic.Draw( pDev, aPos, aSize );
-//CHINA001      }
-//CHINA001  }
-//CHINA001 }
-//CHINA001
-//CHINA001 IMPL_LINK(SvxBmpNumValueSet, FormatHdl_Impl, Timer*, EMPTYARG)
-//CHINA001 {
-//CHINA001 // nur, wenn eine Grafik nicht da war, muss formatiert werden
-//CHINA001 if(bGrfNotFound)
-//CHINA001 {
-//CHINA001 bGrfNotFound = FALSE;
-//CHINA001 Format();
-//CHINA001  }
-//CHINA001 Invalidate();
-//CHINA001 return 0;
-//CHINA001 }
-/*-----------------01.12.97 16:15-------------------
-    Tabpage Numerierungsoptionen
---------------------------------------------------*/
+// Tabpage Numerierungsoptionen
 #define NUM_NO_GRAPHIC 1000
 SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent,
                                const SfxItemSet& rSet) :
@@ -1422,9 +1227,6 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent,
     }
 }
 
-/*-----------------01.12.97 16:30-------------------
-
---------------------------------------------------*/
 SvxNumOptionsTabPage::~SvxNumOptionsTabPage()
 {
     delete aBitmapMB.GetPopupMenu()->GetPopupMenu( MN_GALLERY );
@@ -1439,9 +1241,6 @@ SvxNumOptionsTabPage::~SvxNumOptionsTabPage()
     delete pSaveNum;
 }
 
-/*-----------------03.12.97 07:52-------------------
-
---------------------------------------------------*/
 void SvxNumOptionsTabPage::SetMetric(FieldUnit eMetric)
 {
     if(eMetric == FUNIT_MM)
@@ -1453,17 +1252,12 @@ void SvxNumOptionsTabPage::SetMetric(FieldUnit eMetric)
     aHeightMF .SetUnit( eMetric );
 }
 
-/*-----------------01.12.97 16:30-------------------
-
---------------------------------------------------*/
 SfxTabPage* SvxNumOptionsTabPage::Create( Window* pParent,
                                 const SfxItemSet& rAttrSet)
 {
     return new SvxNumOptionsTabPage(pParent, rAttrSet);
 };
-/*-----------------01.12.97 16:29-------------------
 
---------------------------------------------------*/
 void    SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet)
 {
     const SfxPoolItem* pItem;
@@ -1504,18 +1298,14 @@ void    SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet)
     }
 
 }
-/*-----------------01.12.97 16:29-------------------
 
---------------------------------------------------*/
 int     SvxNumOptionsTabPage::DeactivatePage(SfxItemSet * _pSet)
 {
     if(_pSet)
         FillItemSet(*_pSet);
     return TRUE;
 }
-/*-----------------01.12.97 16:29-------------------
 
---------------------------------------------------*/
 BOOL    SvxNumOptionsTabPage::FillItemSet( SfxItemSet& rSet )
 {
     rSet.Put(SfxUInt16Item(SID_PARAM_CUR_NUM_LEVEL, nActNumLvl));
@@ -1527,9 +1317,7 @@ BOOL    SvxNumOptionsTabPage::FillItemSet( SfxItemSet& rSet )
     }
     return bModified;
 };
-/*-----------------01.12.97 16:29-------------------
 
---------------------------------------------------*/
 void    SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
 {
     const SfxPoolItem* pItem;
@@ -1702,9 +1490,7 @@ void    SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
     bModified = FALSE;
 
 }
-/*-----------------02.12.97 13:47-------------------
 
---------------------------------------------------*/
 void SvxNumOptionsTabPage::InitControls()
 {
     BOOL bShowBullet    = TRUE;
@@ -1885,10 +1671,7 @@ void SvxNumOptionsTabPage::InitControls()
     pPreviewWIN->Invalidate();
 }
 
-/*-----------------02.12.97 14:01-------------------
-     0 - Nummer; 1 - Bullet; 2 - Bitmap
---------------------------------------------------*/
-
+// 0 - Nummer; 1 - Bullet; 2 - Bitmap
 void SvxNumOptionsTabPage::SwitchNumberType( BYTE nType, BOOL )
 {
     if(nBullet == nType)
@@ -1963,9 +1746,7 @@ void SvxNumOptionsTabPage::SwitchNumberType( BYTE nType, BOOL )
     aOrientLB   .Enable(bEnableBitmap);
 
 }
-/*-----------------02.12.97 13:51-------------------
 
---------------------------------------------------*/
 IMPL_LINK( SvxNumOptionsTabPage, LevelHdl_Impl, ListBox *, pBox )
 {
     USHORT nSaveNumLvl = nActNumLvl;
@@ -2007,17 +1788,13 @@ IMPL_LINK( SvxNumOptionsTabPage, LevelHdl_Impl, ListBox *, pBox )
     InitControls();
     return 0;
 }
-/* -----------------------------05.04.2002 15:30------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK( SvxNumOptionsTabPage, PreviewInvalidateHdl_Impl, Timer*, EMPTYARG )
 {
     pPreviewWIN->Invalidate();
     return 0;
 }
-/*-----------------03.12.97 12:01-------------------
 
---------------------------------------------------*/
 IMPL_LINK( SvxNumOptionsTabPage, AllLevelHdl_Impl, NumericField*, pBox )
 {
     for(USHORT i = 0; i < pActNum->GetLevelCount(); i++)
@@ -2038,9 +1815,6 @@ IMPL_LINK( SvxNumOptionsTabPage, AllLevelHdl_Impl, NumericField*, pBox )
     return 0;
 }
 
-/*-----------------02.12.97 08:56-------------------
-
---------------------------------------------------*/
 IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
 {
     String sSelectStyle;
@@ -2129,9 +1903,7 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
     }
     return 0;
 }
-/* -----------------06.11.2002 14:27-----------------
- *
- * --------------------------------------------------*/
+
 void SvxNumOptionsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType)
 {
     BOOL bIsNull = aStartED.GetValue() == 0;
@@ -2142,9 +1914,7 @@ void SvxNumOptionsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType)
     if(bIsNull && bNoZeroAllowed)
         aStartED.GetModifyHdl().Call(&aStartED);
 }
-/*-----------------03.12.97 16:43-------------------
 
---------------------------------------------------*/
 IMPL_LINK( SvxNumOptionsTabPage, OrientHdl_Impl, ListBox *, pBox )
 {
     USHORT nPos = pBox->GetSelectEntryPos();
@@ -2172,9 +1942,6 @@ IMPL_LINK( SvxNumOptionsTabPage, OrientHdl_Impl, ListBox *, pBox )
 
 }
 
-/*-----------------06.12.97 12:00-------------------
-
---------------------------------------------------*/
 IMPL_LINK( SvxNumOptionsTabPage, SameLevelHdl_Impl, CheckBox *, pBox )
 {
     BOOL bSet = pBox->IsChecked();
@@ -2193,9 +1960,7 @@ IMPL_LINK( SvxNumOptionsTabPage, SameLevelHdl_Impl, CheckBox *, pBox )
     InitControls();
     return 0;
 }
-/* -----------------16.11.98 14:20-------------------
- *
- * --------------------------------------------------*/
+
 IMPL_LINK( SvxNumOptionsTabPage, BulColorHdl_Impl, ColorListBox*, pBox )
 {
     Color nSetColor = pBox->GetSelectEntryColor();
@@ -2214,9 +1979,7 @@ IMPL_LINK( SvxNumOptionsTabPage, BulColorHdl_Impl, ColorListBox*, pBox )
     SetModified();
     return 0;
 }
-/* -----------------16.11.98 14:20-------------------
- *
- * --------------------------------------------------*/
+
 IMPL_LINK( SvxNumOptionsTabPage, BulRelSizeHdl_Impl, MetricField *, pField)
 {
     USHORT nRelSize = (USHORT)pField->GetValue();
@@ -2236,9 +1999,6 @@ IMPL_LINK( SvxNumOptionsTabPage, BulRelSizeHdl_Impl, MetricField *, pField)
     return 0;
 }
 
-/*-----------------02.12.97 10:50-------------------
-
---------------------------------------------------*/
 IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton )
 {
     USHORT                  nItemId = pButton->GetCurItemId();
@@ -2314,9 +2074,7 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton )
     }
     return 0;
 }
-/* -----------------27.07.99 12:20-------------------
 
- --------------------------------------------------*/
 IMPL_LINK( SvxNumOptionsTabPage, PopupActivateHdl_Impl, Menu *, EMPTYARG )
 {
     if(!bMenuButtonInitialized)
@@ -2369,9 +2127,6 @@ IMPL_LINK( SvxNumOptionsTabPage, PopupActivateHdl_Impl, Menu *, EMPTYARG )
     return 0;
 }
 
-/*-----------------02.12.97 10:58-------------------
-
---------------------------------------------------*/
 IMPL_LINK( SvxNumOptionsTabPage, BulletHdl_Impl, Button *, EMPTYARG )
 {
     SvxCharacterMap* pMap = new SvxCharacterMap( this, TRUE );
@@ -2433,10 +2188,6 @@ IMPL_LINK( SvxNumOptionsTabPage, BulletHdl_Impl, Button *, EMPTYARG )
     return 0;
 }
 
-/*-----------------03.03.97 15:21-------------------
-
---------------------------------------------------*/
-
 IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, MetricField *, pField)
 {
     BOOL bWidth = pField == &aWidthMF;
@@ -2505,10 +2256,6 @@ IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, MetricField *, pField)
     return 0;
 }
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
 IMPL_LINK( SvxNumOptionsTabPage, RatioHdl_Impl, CheckBox *, pBox )
 {
     if (pBox->IsChecked())
@@ -2521,9 +2268,6 @@ IMPL_LINK( SvxNumOptionsTabPage, RatioHdl_Impl, CheckBox *, pBox )
     return 0;
 }
 
-/*-----------------02.12.97 16:07-------------------
-
---------------------------------------------------*/
 IMPL_LINK( SvxNumOptionsTabPage, CharFmtHdl_Impl, ListBox *, EMPTYARG )
 {
     bAutomaticCharStyles = FALSE;
@@ -2552,9 +2296,6 @@ IMPL_LINK( SvxNumOptionsTabPage, CharFmtHdl_Impl, ListBox *, EMPTYARG )
 
 };
 
-/*-----------------03.12.97 11:01-------------------
-
---------------------------------------------------*/
 IMPL_LINK( SvxNumOptionsTabPage, EditModifyHdl_Impl, Edit *, pEdit )
 {
     BOOL bPrefix = pEdit == &aPrefixED;
@@ -2591,9 +2332,6 @@ IMPL_LINK( SvxNumOptionsTabPage, EditModifyHdl_Impl, Edit *, pEdit )
     return 0;
 }
 
-/*-----------------09.12.97 11:49-------------------
-
---------------------------------------------------*/
 USHORT lcl_DrawGraphic(VirtualDevice* pVDev, const SvxNumberFormat &rFmt, USHORT nXStart,
                         USHORT nYStart, USHORT nDivision)
 {
@@ -2616,9 +2354,6 @@ USHORT lcl_DrawGraphic(VirtualDevice* pVDev, const SvxNumberFormat &rFmt, USHORT
 
 }
 
-/*-----------------09.12.97 11:54-------------------
-
---------------------------------------------------*/
 USHORT lcl_DrawBullet(VirtualDevice* pVDev,
             const SvxNumberFormat& rFmt, USHORT nXStart,
             USHORT nYStart, const Size& rSize)
@@ -2653,9 +2388,8 @@ USHORT lcl_DrawBullet(VirtualDevice* pVDev,
     pVDev->SetFont(aTmpFont);
     return nRet;
 }
-/*-----------------02.12.97 10:34-------------------
-    Vorschau der Numerierung painten
---------------------------------------------------*/
+
+// Vorschau der Numerierung painten
 void    SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
 {
     Size aSize(PixelToLogic(GetOutputSizePixel()));
@@ -2955,9 +2689,6 @@ void    SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
 
 }
 
-/*-----------------03.12.97 10:02-------------------
-
---------------------------------------------------*/
 SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent,
                                const SfxItemSet& rSet) :
     SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_NUM_POSITION ), rSet ),
@@ -3059,9 +2790,7 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent,
     pDebugFixedText->SetText( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "Das ist ein Debug-Text" ) ) );
 #endif
 }
-/*-----------------03.12.97 10:02-------------------
 
---------------------------------------------------*/
 SvxNumPositionTabPage::~SvxNumPositionTabPage()
 {
     delete pActNum;
@@ -3101,9 +2830,6 @@ void lcl_PrintDebugOutput(FixedText& rFixed, const SvxNumberFormat& rNumFmt)
 }
 #endif
 
-/*-----------------03.12.97 10:06-------------------
-
---------------------------------------------------*/
 void SvxNumPositionTabPage::InitControls()
 {
     bInInintControl = TRUE;
@@ -3303,9 +3029,6 @@ void SvxNumPositionTabPage::InitControls()
     bInInintControl = FALSE;
 }
 
-/*-----------------03.12.97 10:02-------------------
-
---------------------------------------------------*/
 void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet)
 {
     const SfxPoolItem* pItem;
@@ -3353,9 +3076,6 @@ void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet)
     pPreviewWIN->Invalidate();
 }
 
-/*-----------------03.12.97 10:02-------------------
-
---------------------------------------------------*/
 int  SvxNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet)
 {
     if(_pSet)
@@ -3363,9 +3083,6 @@ int  SvxNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet)
     return TRUE;
 }
 
-/*-----------------03.12.97 10:02-------------------
-
---------------------------------------------------*/
 BOOL SvxNumPositionTabPage::FillItemSet( SfxItemSet& rSet )
 {
     rSet.Put(SfxUInt16Item(SID_PARAM_CUR_NUM_LEVEL, nActNumLvl));
@@ -3379,9 +3096,6 @@ BOOL SvxNumPositionTabPage::FillItemSet( SfxItemSet& rSet )
     return bModified;
 }
 
-/*-----------------03.12.97 10:02-------------------
-
---------------------------------------------------*/
 void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet )
 {
     const SfxPoolItem* pItem;
@@ -3505,18 +3219,12 @@ void SvxNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode()
     aIndentAtMF.Show( bLabelAlignmentPosAndSpaceModeActive );
 }
 
-/*-----------------03.12.97 10:02-------------------
-
---------------------------------------------------*/
 SfxTabPage* SvxNumPositionTabPage::Create( Window* pParent,
                                 const SfxItemSet& rAttrSet)
 {
     return new SvxNumPositionTabPage(pParent, rAttrSet);
 }
 
-/*-----------------04.12.97 12:51-------------------
-
---------------------------------------------------*/
 void    SvxNumPositionTabPage::SetMetric(FieldUnit eMetric)
 {
     if(eMetric == FUNIT_MM)
@@ -3536,9 +3244,6 @@ void    SvxNumPositionTabPage::SetMetric(FieldUnit eMetric)
     aIndentAtMF.SetUnit( eMetric );
 }
 
-/*-----------------03.12.97 11:06-------------------
-
---------------------------------------------------*/
 IMPL_LINK( SvxNumPositionTabPage, EditModifyHdl_Impl, Edit *, EMPTYARG )
 {
     USHORT nMask = 1;
@@ -3564,9 +3269,7 @@ IMPL_LINK( SvxNumPositionTabPage, EditModifyHdl_Impl, Edit *, EMPTYARG )
     SetModified();
     return 0;
 }
-/*-----------------03.12.97 11:11-------------------
 
---------------------------------------------------*/
 IMPL_LINK( SvxNumPositionTabPage, LevelHdl_Impl, ListBox *, pBox )
 {
     USHORT nSaveNumLvl = nActNumLvl;
@@ -3612,9 +3315,7 @@ IMPL_LINK( SvxNumPositionTabPage, LevelHdl_Impl, ListBox *, pBox )
     InitControls();
     return 0;
 }
-/*-----------------03.12.97 12:24-------------------
 
---------------------------------------------------*/
 IMPL_LINK( SvxNumPositionTabPage, DistanceHdl_Impl, MetricField *, pFld )
 {
     if(bInInintControl)
@@ -3686,9 +3387,6 @@ IMPL_LINK( SvxNumPositionTabPage, DistanceHdl_Impl, MetricField *, pFld )
     return 0;
 }
 
-/*-----------------04.12.97 12:35-------------------
-
---------------------------------------------------*/
 IMPL_LINK( SvxNumPositionTabPage, RelativeHdl_Impl, CheckBox *, pBox )
 {
     BOOL bOn = pBox->IsChecked();
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index bae6fde93b8b..398b6bf8c7e1 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1378,9 +1378,8 @@ void    SvxParaAlignTabPage::UpdateExample_Impl( BOOL bAll )
 
     aExampleWin.Draw( bAll );
 }
-/*-----------------17.01.97 08.04-------------------
-    Erweiterungen fuer den Blocksatz einschalten
---------------------------------------------------*/
+
+// Erweiterungen fuer den Blocksatz einschalten
 void SvxParaAlignTabPage::EnableJustifyExt()
 {
     aLastLineFT.Show();
@@ -2332,9 +2331,7 @@ void SvxAsianTabPage::Reset( const SfxItemSet& rSet )
 //  aPuntuationCB       .Enable(FALSE);
 //  aAdjustNumbersCB    .Enable(FALSE);
 }
-/* -----------------------------19.12.00 12:59--------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK( SvxAsianTabPage, ClickHdl_Impl, TriStateBox*, pBox )
 {
     pBox->EnableTriState( FALSE );
diff --git a/cui/source/tabpages/paragrph.src b/cui/source/tabpages/paragrph.src
index d52283ceea8f..db0f85e035d6 100644
--- a/cui/source/tabpages/paragrph.src
+++ b/cui/source/tabpages/paragrph.src
@@ -659,9 +659,8 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
         Left = TRUE ;
     };
 };
-/*-- 29.11.00 11:36:24---------------------------------------------------
-  Asian typography
-  -----------------------------------------------------------------------*/
+
+// Asian typography
 TabPage RID_SVXPAGE_PARA_ASIAN
 {
     HelpId = HID_SVXPAGE_PARA_ASIAN ;
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index b8bfdf5c5052..5cb7ccce540e 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -365,9 +365,7 @@ static FrmMap __FAR_DATA aVAsCharHtmlMap[] =
     {SwFPos::BOTTOM,        SwFPos::BOTTOM,         VertOrientation::LINE_BOTTOM,   LB_REL_ROW},
     {SwFPos::CENTER_VERT,   SwFPos::CENTER_VERT,    VertOrientation::LINE_CENTER,   LB_REL_ROW}
 };
-/*-- 05.03.2004 15:52:56---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 std::size_t lcl_GetFrmMapCount(const FrmMap* pMap)
 {
     if ( pMap )
@@ -422,9 +420,7 @@ std::size_t lcl_GetFrmMapCount(const FrmMap* pMap)
     }
     return 0;
 }
-/*-- 03.03.2004 12:21:33---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL(
             SvxSwFramePosString::StringId eStringId, BOOL bVertical, BOOL bRTL)
 {
@@ -520,9 +516,7 @@ ULONG lcl_GetLBRelationsForStrID( const FrmMap* _pMap,
 
     return nLBRelations;
 }
-/*-- 03.03.2004 12:21:33---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SvxSwPosSizeTabPage::SvxSwPosSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs  ) :
     SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_SWPOSSIZE ), rInAttrs ),
 #ifdef _MSC_VER
@@ -624,22 +618,16 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage( Window* pParent, const SfxItemSet& rIn
     m_aHoriMirrorCB.SetClickHdl(LINK(this, SvxSwPosSizeTabPage, MirrorHdl));
     m_aPositionCB.SetClickHdl(LINK(this, SvxSwPosSizeTabPage, ProtectHdl));
 }
-/*-- 03.03.2004 12:21:33---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SvxSwPosSizeTabPage::~SvxSwPosSizeTabPage()
 {
 }
-/*-- 03.03.2004 12:21:33---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SfxTabPage* SvxSwPosSizeTabPage::Create( Window* pParent, const SfxItemSet& rSet)
 {
     return new SvxSwPosSizeTabPage(pParent, rSet);
 }
-/*-- 05.03.2004 17:27:42---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 USHORT* SvxSwPosSizeTabPage::GetRanges()
 {
     static USHORT pSwPosRanges[] =
@@ -668,9 +656,7 @@ USHORT* SvxSwPosSizeTabPage::GetRanges()
     };
     return pSwPosRanges;
 }
-/*-- 03.03.2004 12:21:34---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 BOOL SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet)
 {
     bool bAnchorChanged = false;
@@ -826,9 +812,7 @@ BOOL SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet)
 
     return bModified;
 }
-/*-- 03.03.2004 12:21:34---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet)
 {
     const SfxPoolItem* pItem = GetItem( rSet, SID_ATTR_TRANSFORM_ANCHOR );
@@ -1003,18 +987,14 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet)
         RangeModifyHdl(&m_aWidthMF);  // initially set maximum values
     }
 }
-/*-- 03.03.2004 12:21:35---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 int  SvxSwPosSizeTabPage::DeactivatePage( SfxItemSet* _pSet )
 {
     if( _pSet )
         FillItemSet( *_pSet );
     return( LEAVE_PAGE );
 }
-/*-- 04.03.2004 09:14:41---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvxSwPosSizeTabPage::EnableAnchorTypes(USHORT nAnchorEnable)
 {
     if((nAnchorEnable & SVX_OBJ_AT_FLY))
@@ -1022,9 +1002,7 @@ void SvxSwPosSizeTabPage::EnableAnchorTypes(USHORT nAnchorEnable)
     if(!(nAnchorEnable & SVX_OBJ_PAGE))
         m_aToPageRB.Enable(FALSE);
 }
-/*-- 04.03.2004 09:33:33---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 short SvxSwPosSizeTabPage::GetAnchorType(bool* pbHasChanged)
 {
     short nRet = -1;
@@ -1066,9 +1044,7 @@ short SvxSwPosSizeTabPage::GetAnchorType(bool* pbHasChanged)
     }
    return nRet;
 }
-/*-- 05.03.2004 10:43:32---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK( SvxSwPosSizeTabPage, RangeModifyHdl, Edit *, EMPTYARG )
 {
     if(m_bPositioningDisabled)
@@ -1152,9 +1128,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, RangeModifyHdl, Edit *, EMPTYARG )
 
     return 0;
 }
-/*-- 05.03.2004 11:12:56---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK( SvxSwPosSizeTabPage, AnchorTypeHdl, RadioButton *, EMPTYARG )
 {
     m_aHoriMirrorCB.Enable(!m_aAsCharRB.IsChecked() && !m_bIsMultiSelection);
@@ -1175,9 +1149,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, AnchorTypeHdl, RadioButton *, EMPTYARG )
     }
     return 0;
 }
-/*-- 05.03.2004 14:20:19---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK( SvxSwPosSizeTabPage, MirrorHdl, CheckBox *, EMPTYARG )
 {
     short nId = GetAnchorType();
@@ -1185,9 +1157,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, MirrorHdl, CheckBox *, EMPTYARG )
 
     return 0;
 }
-/*-- 05.03.2004 14:20:19---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, ListBox *, pLB )
 {
     BOOL bHori = pLB == &m_aHoriToLB;
@@ -1246,9 +1216,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, ListBox *, pLB )
     return 0;
 
 }
-/*-- 05.03.2004 14:20:19---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox *, pLB )
 {
     BOOL bHori = pLB == &m_aHoriLB;
@@ -1353,9 +1321,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox *, pLB )
     }
     return 0;
 }
-/*-- 05.03.2004 14:20:19---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK( SvxSwPosSizeTabPage, ModifyHdl, Edit *, pEdit )
 {
     sal_Int64 nWidth = m_aWidthMF.Denormalize(m_aWidthMF.GetValue(FUNIT_TWIP));
@@ -1377,17 +1343,13 @@ IMPL_LINK( SvxSwPosSizeTabPage, ModifyHdl, Edit *, pEdit )
     UpdateExample();
     return 0;
 }
-/*-- 11.03.2004 15:40:17---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK( SvxSwPosSizeTabPage, ProtectHdl, TriStateBox *, EMPTYARG)
 {
     m_aSizeCB.Enable(m_aPositionCB.IsEnabled() && !m_aPositionCB.IsChecked());
     return 0;
 }
-/*-- 05.03.2004 14:20:19---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 short SvxSwPosSizeTabPage::GetRelation(FrmMap *, ListBox &rRelationLB)
 {
     short nRel = 0;
@@ -1401,9 +1363,7 @@ short SvxSwPosSizeTabPage::GetRelation(FrmMap *, ListBox &rRelationLB)
 
     return nRel;
 }
-/*-- 05.03.2004 14:20:19---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 short SvxSwPosSizeTabPage::GetAlignment(FrmMap *pMap, USHORT nMapPos, ListBox &/*rAlignLB*/, ListBox &rRelationLB)
 {
     short nAlign = 0;
@@ -1438,9 +1398,7 @@ short SvxSwPosSizeTabPage::GetAlignment(FrmMap *pMap, USHORT nMapPos, ListBox &/
 
     return nAlign;
 }
-/*-- 05.03.2004 14:20:19---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 USHORT SvxSwPosSizeTabPage::GetMapPos(FrmMap *pMap, ListBox &rAlignLB)
 {
     USHORT nMapPos = 0;
@@ -1472,9 +1430,7 @@ USHORT SvxSwPosSizeTabPage::GetMapPos(FrmMap *pMap, ListBox &rAlignLB)
 
     return nMapPos;
 }
-/*-- 05.03.2004 14:20:19---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvxSwPosSizeTabPage::InitPos(short nAnchor,
                                 USHORT nH,
                                 USHORT nHRel,
@@ -1624,9 +1580,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor,
     m_aVertByMF.Enable( bEnable );
     UpdateExample();
 }
-/*-- 05.03.2004 14:20:19---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvxSwPosSizeTabPage::UpdateExample()
 {
     USHORT nPos = m_aHoriLB.GetSelectEntryPos();
@@ -1659,9 +1613,7 @@ void SvxSwPosSizeTabPage::UpdateExample()
     m_aExampleWN.SetAnchor( GetAnchorType() );
     m_aExampleWN.Invalidate();
 }
-/*-- 05.03.2004 14:20:19---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ULONG SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, USHORT nMapPos, USHORT nAlign,
         USHORT nRel, ListBox &rLB, FixedText &rFT)
 {
@@ -1807,9 +1759,7 @@ ULONG SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, USHORT nMapPos, USHORT nAlign
 
     return nLBRelations;
 }
-/*-- 05.03.2004 14:20:19---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 USHORT SvxSwPosSizeTabPage::FillPosLB(FrmMap *_pMap,
                                       USHORT _nAlign,
                                       const USHORT _nRel,
@@ -1862,9 +1812,7 @@ USHORT SvxSwPosSizeTabPage::FillPosLB(FrmMap *_pMap,
 
     return GetMapPos(_pMap, _rLB);
 }
-/*-- 09.03.2004 15:37:50---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView )
 {
     m_pSdrView = pSdrView;
diff --git a/cui/source/tabpages/swpossizetabpage.hxx b/cui/source/tabpages/swpossizetabpage.hxx
index 4ad36b9aa1d7..200c261a4408 100644
--- a/cui/source/tabpages/swpossizetabpage.hxx
+++ b/cui/source/tabpages/swpossizetabpage.hxx
@@ -35,9 +35,7 @@
 #include <svx/swframeposstrings.hxx>
 #include <svx/swframeexample.hxx>
 
-/*-- 01.03.2004 15:45:01---------------------------------------------------
-  SvxSwPosSizeTabPage - position and size page for Writer drawing objects
-  -----------------------------------------------------------------------*/
+// SvxSwPosSizeTabPage - position and size page for Writer drawing objects
 struct FrmMap;
 class SdrView;
 class SvxSwPosSizeTabPage : public SfxTabPage
diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src
index f5ff6b24ff66..11be9e726a2b 100644
--- a/cui/source/tabpages/tabarea.src
+++ b/cui/source/tabpages/tabarea.src
@@ -1463,77 +1463,4 @@ TabDialog RID_SVXDLG_AREA
     };
 };
 
-Image RID_SVXIMG_LOAD_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "sch05501.bmp" ;
-    };
-    MASKCOLOR
-};
-
-Image RID_SVXIMG_SAVE_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "sch05502.bmp" ;
-    };
-    MASKCOLOR
-};
-
  // ********************************************************************** EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 8ca6d49e4ab1..cdb3286127a5 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -66,34 +66,6 @@ static USHORT pRanges[] =
 
 /*************************************************************************
 |*
-|* Dialog zum Kopieren von Objekten
-|*
-\************************************************************************/
-
-//CHINA001 SvxTextAttrDialog::SvxTextAttrDialog( Window* pParent, const SfxItemSet& rInAttrs,
-//CHINA001                              const SdrView* pSdrView ) :
-//CHINA001      SfxSingleTabDialog( pParent, rInAttrs, RID_SVXPAGE_TEXTATTR )
-//CHINA001 {
-//CHINA001 SvxTextAttrPage* pPage = new SvxTextAttrPage( this, rInAttrs );
-//CHINA001
-//CHINA001 pPage->SetView( pSdrView );
-//CHINA001 pPage->Construct();
-//CHINA001
-//CHINA001 SetTabPage( pPage );
-//CHINA001 SetText( pPage->GetText() );
-//CHINA001 }
-/*************************************************************************
-|*
-|* Dtor
-|*
-\************************************************************************/
-
-//CHINA001 SvxTextAttrDialog::~SvxTextAttrDialog()
-//CHINA001 {
-//CHINA001 }
-
-/*************************************************************************
-|*
 |* Dialog (Seite) zum Kopieren von Objekten
 |*
 \************************************************************************/
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 2b1ae42646c9..3216a8cff824 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -117,8 +117,6 @@ SvxBitmapTabPage::SvxBitmapTabPage
     aXFillAttr          ( pXPool ),
     rXFSet              ( aXFillAttr.GetItemSet() )
 {
-    aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
     FreeResource();
 
     // diese Page braucht ExchangeSupport
@@ -970,39 +968,36 @@ IMPL_LINK( SvxBitmapTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
             pBmpList->SetName( aURL.getName() );
             if( pBmpList->Load() )
             {
-                if( pBmpList )
-                {
-                    // Pruefen, ob Tabelle geloescht werden darf:
-                    if( pBitmapList != ( (SvxAreaTabDialog*) DLGWIN )->GetBitmapList() )
-                        delete pBitmapList;
-
-                    pBitmapList = pBmpList;
-                    ( (SvxAreaTabDialog*) DLGWIN )->SetNewBitmapList( pBitmapList );
+                // Pruefen, ob Tabelle geloescht werden darf:
+                if( pBitmapList != ( (SvxAreaTabDialog*) DLGWIN )->GetBitmapList() )
+                    delete pBitmapList;
 
-                    aLbBitmaps.Clear();
-                    aLbBitmaps.Fill( pBitmapList );
-                    Reset( rOutAttrs );
+                pBitmapList = pBmpList;
+                ( (SvxAreaTabDialog*) DLGWIN )->SetNewBitmapList( pBitmapList );
 
-                    pBitmapList->SetName( aURL.getName() );
+                aLbBitmaps.Clear();
+                aLbBitmaps.Fill( pBitmapList );
+                Reset( rOutAttrs );
 
-                    // Ermitteln (evtl. abschneiden) des Namens und in
-                    // der GroupBox darstellen
-                    String aString( ResId( RID_SVXSTR_TABLE, rMgr ) );
-                    aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+                pBitmapList->SetName( aURL.getName() );
 
-                    if ( aURL.getBase().getLength() > 18 )
-                    {
-                        aString += String(aURL.getBase()).Copy( 0, 15 );
-                        aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) );
-                    }
-                    else
-                        aString += String(aURL.getBase());
+                // Ermitteln (evtl. abschneiden) des Namens und in
+                // der GroupBox darstellen
+                String aString( ResId( RID_SVXSTR_TABLE, rMgr ) );
+                aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
 
-                    // Flag fuer gewechselt setzen
-                    *pnBitmapListState |= CT_CHANGED;
-                    // Flag fuer modifiziert entfernen
-                    *pnBitmapListState &= ~CT_MODIFIED;
+                if ( aURL.getBase().getLength() > 18 )
+                {
+                    aString += String(aURL.getBase()).Copy( 0, 15 );
+                    aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) );
                 }
+                else
+                    aString += String(aURL.getBase());
+
+                // Flag fuer gewechselt setzen
+                *pnBitmapListState |= CT_CHANGED;
+                // Flag fuer modifiziert entfernen
+                *pnBitmapListState &= ~CT_MODIFIED;
                 LeaveWait();
             }
             else
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 00f5fb5739cb..039cd18a16cd 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -127,9 +127,6 @@ SvxColorTabPage::SvxColorTabPage
     eCM                 ( CM_RGB )
 
 {
-    aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
-
     FreeResource();
 
     // diese Page braucht ExchangeSupport
@@ -762,74 +759,71 @@ IMPL_LINK( SvxColorTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
             pColTab->SetName( aURL.getName() ); // XXX
             if( pColTab->Load() )
             {
-                if( pColTab )
+                // Pruefen, ob Tabelle geloescht werden darf:
+                const XColorTable *pTempTable = 0;
+                SvxAreaTabDialog* pArea = dynamic_cast< SvxAreaTabDialog* >( DLGWIN );
+                SvxLineTabDialog* pLine = dynamic_cast< SvxLineTabDialog* >( DLGWIN );
+                if( pArea )
+                {
+                    pTempTable = pArea->GetColorTable();
+                }
+                else if( pLine )
+                {
+                        pTempTable = pLine->GetColorTable();
+                }
+
+                if( pColorTab != pTempTable )
                 {
-                    // Pruefen, ob Tabelle geloescht werden darf:
-                    const XColorTable *pTempTable = 0;
-                    SvxAreaTabDialog* pArea = dynamic_cast< SvxAreaTabDialog* >( DLGWIN );
-                    SvxLineTabDialog* pLine = dynamic_cast< SvxLineTabDialog* >( DLGWIN );
-                    if( pArea )
-                    {
-                        pTempTable = pArea->GetColorTable();
-                    }
-                    else if( pLine )
-                    {
-                            pTempTable = pLine->GetColorTable();
-                    }
-
-                    if( pColorTab != pTempTable )
-                    {
-                        if( bDeleteColorTable )
-                            delete pColorTab;
-                        else
-                            bDeleteColorTable = TRUE;
-                    }
-
-                    pColorTab = pColTab;
-                    if( pArea )
-                    {
-                        pArea->SetNewColorTable( pColorTab );
-                    }
-                    else if( pLine )
-                    {
-                        pLine->SetNewColorTable( pColorTab );
-                    }
-
-                    aLbColor.Clear();
-                    aValSetColorTable.Clear();
-                    Construct();
-                    Reset( rOutAttrs );
-
-                    pColorTab->SetName( aURL.getName() );
-
-                    // Ermitteln (evtl. abschneiden) des Namens und in
-                    // der GroupBox darstellen
-                    String aString( ResId( RID_SVXSTR_TABLE, rMgr ) );
-                    aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
-
-                    if ( aURL.getBase().getLength() > 18 )
-                    {
-                        aString += String(aURL.getBase()).Copy( 0, 15 );
-                        aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) );
-                    }
+                    if( bDeleteColorTable )
+                        delete pColorTab;
                     else
-                        aString += String(aURL.getBase());
+                        bDeleteColorTable = TRUE;
+                }
 
-                    aTableNameFT.SetText( aString );
+                pColorTab = pColTab;
+                if( pArea )
+                {
+                    pArea->SetNewColorTable( pColorTab );
+                }
+                else if( pLine )
+                {
+                    pLine->SetNewColorTable( pColorTab );
+                }
 
-                    // Flag fuer gewechselt setzen
-                    *pnColorTableState |= CT_CHANGED;
-                    // Flag fuer modifiziert entfernen
-                    *pnColorTableState &= ~CT_MODIFIED;
+                aLbColor.Clear();
+                aValSetColorTable.Clear();
+                Construct();
+                Reset( rOutAttrs );
 
-                    if( aLbColor.GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND )
-                        aLbColor.SelectEntryPos( 0 );
-                    else
-                        aLbColor.SelectEntryPos( aLbColor.GetSelectEntryPos() );
+                pColorTab->SetName( aURL.getName() );
+
+                // Ermitteln (evtl. abschneiden) des Namens und in
+                // der GroupBox darstellen
+                String aString( ResId( RID_SVXSTR_TABLE, rMgr ) );
+                aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
 
-                    ChangeColorHdl_Impl( this );
-                    SelectColorLBHdl_Impl( this );
+                if ( aURL.getBase().getLength() > 18 )
+                {
+                    aString += String(aURL.getBase()).Copy( 0, 15 );
+                    aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) );
                 }
+                else
+                    aString += String(aURL.getBase());
+
+                aTableNameFT.SetText( aString );
+
+                // Flag fuer gewechselt setzen
+                *pnColorTableState |= CT_CHANGED;
+                // Flag fuer modifiziert entfernen
+                *pnColorTableState &= ~CT_MODIFIED;
+
+                if( aLbColor.GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND )
+                    aLbColor.SelectEntryPos( 0 );
+                else
+                    aLbColor.SelectEntryPos( aLbColor.GetSelectEntryPos() );
+
+                ChangeColorHdl_Impl( this );
+                SelectColorLBHdl_Impl( this );
             }
             else
             {
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index ef48bbbe9483..492802a80a17 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -108,9 +108,6 @@ SvxGradientTabPage::SvxGradientTabPage
     aXFillAttr          ( pXPool ),
     rXFSet              ( aXFillAttr.GetItemSet() )
 {
-    aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
-
     FreeResource();
 
     // diese Page braucht ExchangeSupport
@@ -685,41 +682,38 @@ IMPL_LINK( SvxGradientTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
 
             if ( pGrdList->Load() )
             {
-                if ( pGrdList )
+                // Pruefen, ob Tabelle geloescht werden darf:
+                if ( pGradientList !=
+                     ( (SvxAreaTabDialog*) DLGWIN )->GetGradientList() )
+                    delete pGradientList;
+
+                pGradientList = pGrdList;
+                ( (SvxAreaTabDialog*) DLGWIN )->
+                    SetNewGradientList( pGradientList );
+
+                aLbGradients.Clear();
+                aLbGradients.Fill( pGradientList );
+                Reset( rOutAttrs );
+
+                pGradientList->SetName( aURL.getName() );
+
+                // Ermitteln (evtl. abschneiden) des Namens und in
+                // der GroupBox darstellen
+                String aString( ResId( RID_SVXSTR_TABLE, rMgr ) );
+                aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+
+                if ( aURL.getBase().getLength() > 18 )
                 {
-                    // Pruefen, ob Tabelle geloescht werden darf:
-                    if ( pGradientList !=
-                         ( (SvxAreaTabDialog*) DLGWIN )->GetGradientList() )
-                        delete pGradientList;
-
-                    pGradientList = pGrdList;
-                    ( (SvxAreaTabDialog*) DLGWIN )->
-                        SetNewGradientList( pGradientList );
-
-                    aLbGradients.Clear();
-                    aLbGradients.Fill( pGradientList );
-                    Reset( rOutAttrs );
-
-                    pGradientList->SetName( aURL.getName() );
-
-                    // Ermitteln (evtl. abschneiden) des Namens und in
-                    // der GroupBox darstellen
-                    String aString( ResId( RID_SVXSTR_TABLE, rMgr ) );
-                    aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
-
-                    if ( aURL.getBase().getLength() > 18 )
-                    {
-                        aString += String(aURL.getBase()).Copy( 0, 15 );
-                        aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) );
-                    }
-                    else
-                        aString += String(aURL.getBase());
-
-                    // Flag fuer gewechselt setzen
-                    *pnGradientListState |= CT_CHANGED;
-                    // Flag fuer modifiziert entfernen
-                    *pnGradientListState &= ~CT_MODIFIED;
+                    aString += String(aURL.getBase()).Copy( 0, 15 );
+                    aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) );
                 }
+                else
+                    aString += String(aURL.getBase());
+
+                // Flag fuer gewechselt setzen
+                *pnGradientListState |= CT_CHANGED;
+                // Flag fuer modifiziert entfernen
+                *pnGradientListState &= ~CT_MODIFIED;
                 LeaveWait();
             }
             else
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 3ff6cb8134be..771ad92430e5 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -104,9 +104,6 @@ SvxHatchTabPage::SvxHatchTabPage
     rXFSet              ( aXFillAttr.GetItemSet() )
 
 {
-    aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
-
     FreeResource();
 
     // diese Page braucht ExchangeSupport
@@ -741,39 +738,36 @@ IMPL_LINK( SvxHatchTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
             pHatchList->SetName( aURL.getName() );
             if( pHatchList->Load() )
             {
-                if( pHatchList )
+                // Pruefen, ob Tabelle geloescht werden darf:
+                if( pHatchingList != ( (SvxAreaTabDialog*) DLGWIN )->GetHatchingList() )
+                    delete pHatchingList;
+
+                pHatchingList = pHatchList;
+                ( (SvxAreaTabDialog*) DLGWIN )->SetNewHatchingList( pHatchingList );
+
+                aLbHatchings.Clear();
+                aLbHatchings.Fill( pHatchingList );
+                Reset( rOutAttrs );
+
+                pHatchingList->SetName( aURL.getName() );
+
+                // Ermitteln (evtl. abschneiden) des Namens und in
+                // der GroupBox darstellen
+                String aString( ResId( RID_SVXSTR_TABLE, rMgr ) );
+                aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+
+                if ( aURL.getBase().getLength() > 18 )
                 {
-                    // Pruefen, ob Tabelle geloescht werden darf:
-                    if( pHatchingList != ( (SvxAreaTabDialog*) DLGWIN )->GetHatchingList() )
-                        delete pHatchingList;
-
-                    pHatchingList = pHatchList;
-                    ( (SvxAreaTabDialog*) DLGWIN )->SetNewHatchingList( pHatchingList );
-
-                    aLbHatchings.Clear();
-                    aLbHatchings.Fill( pHatchingList );
-                    Reset( rOutAttrs );
-
-                    pHatchingList->SetName( aURL.getName() );
-
-                    // Ermitteln (evtl. abschneiden) des Namens und in
-                    // der GroupBox darstellen
-                    String aString( ResId( RID_SVXSTR_TABLE, rMgr ) );
-                    aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
-
-                    if ( aURL.getBase().getLength() > 18 )
-                    {
-                        aString += String(aURL.getBase()).Copy( 0, 15 );
-                        aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) );
-                    }
-                    else
-                        aString += String(aURL.getBase());
-
-                    // Flag fuer gewechselt setzen
-                    *pnHatchingListState |= CT_CHANGED;
-                    // Flag fuer modifiziert entfernen
-                    *pnHatchingListState &= ~CT_MODIFIED;
+                    aString += String(aURL.getBase()).Copy( 0, 15 );
+                    aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) );
                 }
+                else
+                    aString += String(aURL.getBase());
+
+                // Flag fuer gewechselt setzen
+                *pnHatchingListState |= CT_CHANGED;
+                // Flag fuer modifiziert entfernen
+                *pnHatchingListState &= ~CT_MODIFIED;
             }
             else
                 ErrorBox( DLGWIN, WinBits( WB_OK ),
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 4aeb0959456e..f4057e3ae1b8 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -109,9 +109,6 @@ SvxLineDefTabPage::SvxLineDefTabPage
     aXLineAttr          ( pXPool ),
     rXLSet              ( aXLineAttr.GetItemSet() )
 {
-    aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
-
     FreeResource();
 
     // diese Page braucht ExchangeSupport
@@ -210,16 +207,6 @@ void SvxLineDefTabPage::ActivatePage( const SfxItemSet& )
             aURL.Append( pDashList->GetName() );
             DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
 
-/*          if ( aURL.getBase().Len() > 18 )
-            {
-                aString += aURL.getBase().Copy( 0, 15 );
-                aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) );
-            }
-            else
-                aString += aURL.getBase();
-
-            aFTLinestyle.SetText( aString );
-*/
             *pPageType = 0; // 2
             *pPosDashLb = LISTBOX_ENTRY_NOTFOUND;
         }
@@ -274,21 +261,17 @@ void SvxLineDefTabPage::CheckChanges_Impl()
             case RET_BTN_1: // Aendern
             {
                 ClickModifyHdl_Impl( this );
-                //aXDash = pDashList->Get( nPos )->GetDash();
             }
             break;
 
             case RET_BTN_2: // Hinzufuegen
             {
                 ClickAddHdl_Impl( this );
-                //nPos = aLbLineStyles.GetSelectEntryPos();
-                //aXDash = pDashList->Get( nPos )->GetDash();
             }
             break;
 
             case RET_CANCEL:
             break;
-            // return( TRUE ); // Abbruch
         }
         delete aMessDlg;
     }
@@ -310,8 +293,6 @@ BOOL SvxLineDefTabPage::FillItemSet( SfxItemSet& rAttrs )
     {
         if( *pPageType == 2 )
         {
-            //CheckChanges_Impl();
-
             FillDash_Impl();
 
             String aString( aLbLineStyles.GetSelectEntry() );
@@ -805,41 +786,23 @@ IMPL_LINK( SvxLineDefTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
 
             if( pDshLst->Load() )
             {
-                if( pDshLst )
-                {
-                    // Pruefen, ob Tabelle geloescht werden darf:
-                    if( pDashList != ( (SvxLineTabDialog*) DLGWIN )->GetDashList() )
-                        delete pDashList;
-
-                    pDashList = pDshLst;
-                    ( (SvxLineTabDialog*) DLGWIN )->SetNewDashList( pDashList );
-
-                    aLbLineStyles.Clear();
-                    aLbLineStyles.Fill( pDashList );
-                    Reset( rOutAttrs );
-
-                    pDashList->SetName( aURL.getName() );
-
-/*                  // Ermitteln (evtl. abschneiden) des Namens und in
-                    // der GroupBox darstellen
-                    String aString( ResId( RID_SVXSTR_TABLE, rMgr ) );
-                    aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
-
-                    if ( aURL.getBase().Len() > 18 )
-                    {
-                        aString += aURL.getBase().Copy( 0, 15 );
-                        aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) );
-                    }
-                    else
-                        aString += aURL.getBase();
-
-                    aGrpLinestyles.SetText( aString );
-*/
-                    // Flag fuer gewechselt setzen
-                    *pnDashListState |= CT_CHANGED;
-                    // Flag fuer modifiziert entfernen
-                    *pnDashListState &= ~CT_MODIFIED;
-                }
+                // Pruefen, ob Tabelle geloescht werden darf:
+                if( pDashList != ( (SvxLineTabDialog*) DLGWIN )->GetDashList() )
+                    delete pDashList;
+
+                pDashList = pDshLst;
+                ( (SvxLineTabDialog*) DLGWIN )->SetNewDashList( pDashList );
+
+                aLbLineStyles.Clear();
+                aLbLineStyles.Fill( pDashList );
+                Reset( rOutAttrs );
+
+                pDashList->SetName( aURL.getName() );
+
+                // Flag fuer gewechselt setzen
+                *pnDashListState |= CT_CHANGED;
+                // Flag fuer modifiziert entfernen
+                *pnDashListState &= ~CT_MODIFIED;
             }
             else
                 //aIStream.Close();
@@ -898,21 +861,6 @@ IMPL_LINK( SvxLineDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
 
         if( pDashList->Save() )
         {
-/*          // Ermitteln (evtl. abschneiden) des Namens und in
-            // der GroupBox darstellen
-            String aString( CUI_RES( RID_SVXSTR_TABLE ) );
-            aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
-
-            if ( aURL.getBase().Len() > 18 )
-            {
-                aString += aURL.getBase().Copy( 0, 15 );
-                aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) );
-            }
-            else
-                aString += aURL.getBase();
-
-            aGrpLinestyles.SetText( aString );
-*/
             // Flag fuer gespeichert setzen
             *pnDashListState |= CT_SAVED;
             // Flag fuer modifiziert entfernen
@@ -934,14 +882,6 @@ void SvxLineDefTabPage::FillDash_Impl()
 {
     XDashStyle eXDS;
 
-/*  Alle Stile werden z.Z. nicht benutzt
-    if( aRbtEnds1.IsChecked() )
-        eXDS = XDASH_ROUND;
-    else if( aRbtEnds2.IsChecked() )
-        eXDS = XDASH_RECT;
-    else
-        eXDS = XDASH_RECT;
-*/
     if( aCbxSynchronize.IsChecked() )
         eXDS = XDASH_RECTRELATIVE;
     else
@@ -973,14 +913,11 @@ void SvxLineDefTabPage::FillDialog_Impl()
         aCbxSynchronize.Check( FALSE );
 
     aNumFldNumber1.SetValue( aDash.GetDots() );
-    //aMtrLength1.SetValue( aDash.GetDotLen() );
     SetMetricValue( aMtrLength1, aDash.GetDotLen(), ePoolUnit );
     aLbType1.SelectEntryPos( aDash.GetDotLen() == 0 ? 0 : 1 );
     aNumFldNumber2.SetValue( aDash.GetDashes() );
-    //aMtrLength2.SetValue( aDash.GetDashLen() );
     SetMetricValue( aMtrLength2, aDash.GetDashLen(), ePoolUnit );
     aLbType2.SelectEntryPos( aDash.GetDashLen() == 0 ? 0 : 1 );
-    //aMtrDistance.SetValue( aDash.GetDistance() );
     SetMetricValue( aMtrDistance, aDash.GetDistance(), ePoolUnit );
 
     ChangeMetricHdl_Impl( NULL );
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 68cbc76aa7a0..9b5573416dd1 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -105,9 +105,6 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage
     rXLSet              ( aXLineAttr.GetItemSet() ),
     pLineEndList( NULL )
 {
-    aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
-
     FreeResource();
 
     // diese Page braucht ExchangeSupport
@@ -190,20 +187,6 @@ void SvxLineEndDefTabPage::ActivatePage( const SfxItemSet& )
 
             aURL.Append( pLineEndList->GetName() );
             DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
-/*          // Ermitteln (evtl. abschneiden) des Namens und in
-            // der GroupBox darstellen
-            String          aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
-
-            if ( aURL.getBase().Len() > 18 )
-            {
-                aString += aURL.getBase().Copy( 0, 15 );
-                aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) );
-            }
-            else
-                aString += aURL.getBase();
-
-            aGrpLineEnds.SetText( aString );
-*/
             *pPageType = 0; // 3
             *pPosLineEndLb = LISTBOX_ENTRY_NOTFOUND;
         }
@@ -615,39 +598,22 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
             pLeList->SetName( aURL.getName() );
             if( pLeList->Load() )
             {
-                if( pLeList )
-                {
-                    // Pruefen, ob Tabelle geloescht werden darf:
-                    if( pLineEndList != ( (SvxLineTabDialog*) DLGWIN )->GetLineEndList() )
-                        delete pLineEndList;
-
-                    pLineEndList = pLeList;
-                    ( (SvxLineTabDialog*) DLGWIN )->SetNewLineEndList( pLineEndList );
-                    aLbLineEnds.Clear();
-                    aLbLineEnds.Fill( pLineEndList );
-                    Reset( rOutAttrs );
-
-                    pLineEndList->SetName( aURL.getName() );
-
-/*                  // Ermitteln (evtl. abschneiden) des Namens und in
-                    // der GroupBox darstellen
-                    String aString( ResId( RID_SVXSTR_TABLE, rMgr ) );
-                    aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
-                    if( aURL.getBase().Len() > 18 )
-                    {
-                        aString += aURL.getBase().Copy( 0, 15 );
-                        aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) );
-                    }
-                    else
-                        aString += aURL.getBase();
-
-                    aGrpLineEnds.SetText( aString );
-*/
-                    // Flag fuer gewechselt setzen
-                    *pnLineEndListState |= CT_CHANGED;
-                    // Flag fuer modifiziert entfernen
-                    *pnLineEndListState &= ~CT_MODIFIED;
-                }
+                // Pruefen, ob Tabelle geloescht werden darf:
+                if( pLineEndList != ( (SvxLineTabDialog*) DLGWIN )->GetLineEndList() )
+                    delete pLineEndList;
+
+                pLineEndList = pLeList;
+                ( (SvxLineTabDialog*) DLGWIN )->SetNewLineEndList( pLineEndList );
+                aLbLineEnds.Clear();
+                aLbLineEnds.Fill( pLineEndList );
+                Reset( rOutAttrs );
+
+                pLineEndList->SetName( aURL.getName() );
+
+                // Flag fuer gewechselt setzen
+                *pnLineEndListState |= CT_CHANGED;
+                // Flag fuer modifiziert entfernen
+                *pnLineEndListState &= ~CT_MODIFIED;
             }
             else
                 ErrorBox( DLGWIN, WinBits( WB_OK ),
@@ -705,20 +671,6 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG )
 
         if( pLineEndList->Save() )
         {
-/*          // Ermitteln (evtl. abschneiden) des Namens und in
-            // der GroupBox darstellen
-            String aString( CUI_RES( RID_SVXSTR_TABLE ) );
-            aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
-
-            if ( aURL.getBase().Len() > 18 )
-            {
-                aString += aURL.getBase().Copy( 0, 15 );
-                aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) );
-            }
-            else
-                aString += aURL.getBase();
-            aGrpLineEnds.SetText( aString );
-*/
             // Flag fuer gespeichert setzen
             *pnLineEndListState |= CT_SAVED;
             // Flag fuer modifiziert entfernen
diff --git a/dbaccess/inc/ToolBoxHelper.hxx b/dbaccess/inc/ToolBoxHelper.hxx
index e95e40a0f4a1..280d523a8ca0 100644
--- a/dbaccess/inc/ToolBoxHelper.hxx
+++ b/dbaccess/inc/ToolBoxHelper.hxx
@@ -43,7 +43,6 @@ namespace dbaui
 {
     class DBACCESS_DLLPUBLIC OToolBoxHelper
     {
-        sal_Bool        m_bIsHiContrast;// true when the toolbox is in hi contrast mode
         sal_Int16       m_nSymbolsSize; // shows the toolbox large or small bitmaps
         ToolBox*        m_pToolBox;     // our toolbox (may be NULL)
     public:
@@ -62,7 +61,7 @@ namespace dbaui
             @param  _bHiContast
                 <TRUE/> when in high contrast mode.
         */
-        virtual ImageList getImageList(sal_Int16 _eSymbolsSize,sal_Bool _bHiContast) const = 0;
+        virtual ImageList getImageList(sal_Int16 _eSymbolsSize) const = 0;
 
         /** only the member will be set, derived classes can overload this function and do what need to be done.
             @param  _pTB
@@ -72,13 +71,12 @@ namespace dbaui
         */
         virtual void    setToolBox(ToolBox* _pTB);
 
-        inline ToolBox* getToolBox() const          { return m_pToolBox; }
+        inline ToolBox* getToolBox() const  { return m_pToolBox; }
 
         /** checks if the toolbox needs a new imagelist.
         */
         void checkImageList();
 
-        inline sal_Bool isToolBoxHiContrast() const { return m_bIsHiContrast; }
     protected:
         DECL_LINK(ConfigOptionsChanged, SvtMiscOptions*);
         DECL_LINK(SettingsChanged, VclWindowEvent* );
diff --git a/dbaccess/qa/complex/dbaccess/Beamer.java b/dbaccess/qa/complex/dbaccess/Beamer.java
index 909bf39d1707..503db8090f88 100644
--- a/dbaccess/qa/complex/dbaccess/Beamer.java
+++ b/dbaccess/qa/complex/dbaccess/Beamer.java
@@ -142,7 +142,6 @@ public class Beamer extends complexlib.ComplexTestCase
         final XFrame frame = controller.getFrame();
         final XDispatchProvider dispatchP = (XDispatchProvider) UnoRuntime.queryInterface(XDispatchProvider.class, frame);
         URL command = new URL();
-        // command.Complete = ".component:DB/DataSourceBrowser";
         command.Complete = ".uno:ViewDataSourceBrowser";
 
         Object instance = getORB().createInstance("com.sun.star.util.URLTransformer");
diff --git a/dbaccess/qa/complex/dbaccess/RowSet.java b/dbaccess/qa/complex/dbaccess/RowSet.java
index 5a13f6724d1f..3ebfb2263148 100644
--- a/dbaccess/qa/complex/dbaccess/RowSet.java
+++ b/dbaccess/qa/complex/dbaccess/RowSet.java
@@ -97,11 +97,7 @@ public class RowSet extends ComplexTestCase
                 for (int i = 0; m_resultSet.next(); ++i)
                 {
                     int pos = m_resultSet.getRow();
-                    // final int val = m_row.getInt(1);
-//                    log.println("Clone Move(" + m_id +")  before i: " + (i+1) + " Pos: " + pos + " Val: " + val);
                     testPosition(m_resultSet, m_row, i + 1, "clone move(" + m_id + ")");
-//                    val = m_row.getInt(1);
-//                    log.println("Clone Move(" + m_id +") after i: " + (i+1) + " Pos: " + pos + " Val: " + val);
                     int pos2 = m_resultSet.getRow();
                     assure("ResultSetMovementStress wrong position: " + i + " Pos1: " + pos + " Pos2: " + pos2, pos == pos2);
                 }
@@ -380,7 +376,6 @@ public class RowSet extends ComplexTestCase
         log.println("testing Thread");
         try
         {
-            // final XRow _row = (XRow)UnoRuntime.queryInterface(XRow.class,_resultSet);
             _resultSet.beforeFirst();
 
             final int numberOfThreads = 10;
diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx
index 5a88c248befd..f9cf63233a67 100644
--- a/dbaccess/source/core/api/BookmarkSet.cxx
+++ b/dbaccess/source/core/api/BookmarkSet.cxx
@@ -43,11 +43,9 @@ using namespace ::dbtools;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::sdbc;
-//  using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
-//  using namespace ::cppu;
 using namespace ::osl;
 
 void OBookmarkSet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter)
@@ -133,7 +131,6 @@ void SAL_CALL OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const conne
 void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& /*_xTable*/  ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::updateRow" );
-    //  OCacheSet::updateRow( _rInsertRow,_rOrginalRow,_xTable);
     Reference<XRowUpdate> xUpdRow(m_xRowLocate,UNO_QUERY);
     if(!xUpdRow.is())
         ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XROWUPDATE ), SQL_GENERAL_ERROR, *this );
@@ -205,8 +202,6 @@ void OBookmarkSet::updateColumn(sal_Int32 nPos,Reference< XRowUpdate > _xParamet
                     break;
                 case DataType::CHAR:
                 case DataType::VARCHAR:
-                //case DataType::DECIMAL:
-                //case DataType::NUMERIC:
                     _xParameter->updateString(nPos,_rValue);
                     break;
                 case DataType::BIGINT:
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx
index c31cc17b6ec2..ee9b67c5d26b 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -42,7 +42,6 @@ using namespace comphelper;
 using namespace connectivity;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
-//  using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
@@ -256,10 +255,8 @@ sdbcx::ObjectType ORowSetDataColumns::createObject(const ::rtl::OUString& _rName
 
 void SAL_CALL ORowSetDataColumns::disposing(void)
 {
-    //  clear_NoDispose();
     ORowSetDataColumns_BASE::disposing();
     m_aColumns = NULL;
-    //  m_aColumns.clear();
 }
 
 void ORowSetDataColumns::assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const ::std::vector< ::rtl::OUString> &_rVector)
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index 2ebed10c0479..f8e0d90d31a5 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -61,12 +61,10 @@ using namespace connectivity;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::sdbc;
-//  using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::io;
-//  using namespace ::cppu;
 using namespace ::osl;
 
 DBG_NAME(OCacheSet)
@@ -219,7 +217,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow
                                         ,::std::list< sal_Int32>& _rOrgValues)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::fillParameters" );
-    // use keys and indexes for excat postioning
+    // use keys and indexes for exact positioning
     // first the keys
     Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
     const Reference<XNameAccess> xPrimaryKeyColumns = getPrimaryKeyColumns_throw(xSet);
@@ -273,7 +271,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow
             _sCondition.append(aAnd);
             _rOrgValues.push_back(nCheckCount);
 
-        } // if(xPrimaryKeyColumns.is() && xPrimaryKeyColumns->hasByName(aColumnName))
+        }
         ::std::vector< Reference<XNameAccess> >::const_iterator aIndexEnd = aAllIndexColumns.end();
         for( ::std::vector< Reference<XNameAccess> >::const_iterator aIndexIter = aAllIndexColumns.begin();
                 aIndexIter != aIndexEnd;++aIndexIter)
@@ -336,7 +334,7 @@ void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetR
             setParameter(i,xParameter,*aIter,m_xSetMetaData->getColumnType(i),m_xSetMetaData->getScale(i));
             ++i;
         }
-    } // for(ORowVector< ORowSetValue >::Vector::const_iterator aIter = _rInsertRow->get().begin()+1; aIter != aEnd;++aIter)
+    }
     ::std::list< sal_Int32>::const_iterator aOrgValueEnd = aOrgValues.end();
     for(::std::list< sal_Int32>::const_iterator aOrgValue = aOrgValues.begin(); aOrgValue != aOrgValueEnd;++aOrgValue,++i)
     {
@@ -360,7 +358,7 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti
     ::rtl::OUString aQuote  = getIdentifierQuoteString();
     static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND "));
 
-    // use keys and indexes for excat postioning
+    // use keys and indexes for exact positioning
     // first the keys
     const Reference<XNameAccess> xPrimaryKeyColumns = getPrimaryKeyColumns_throw(xSet);
     // second the indexes
@@ -392,7 +390,7 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti
 
     aSql.setLength(aSql.getLength()-5);
 
-    // now create end execute the prepared statement
+    // now create and execute the prepared statement
     Reference< XPreparedStatement > xPrep(m_xConnection->prepareStatement(aSql.makeStringAndClear()));
     Reference< XParameters > xParameter(xPrep,UNO_QUERY);
     sal_Int32 i = 1;
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx
index 4befdc824b03..e99e91de7a7b 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -189,7 +189,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std
         }
         else
         {
-            // for wildcard search : remove all table filters which are a wildcard expression and build a WilCard
+            // for wildcard search : remove all table filters which are a wildcard expression and build a WildCard
             // for them
             ::std::vector< WildCard > aWildCardTableFilter;
             Sequence< ::rtl::OUString > aNonWildCardTableFilter = _tableFilter;
@@ -313,7 +313,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std
         Sequence< ::rtl::OUString > aTableFilter(_rTableFilter);
         sal_Int32   nTableFilterLen = aTableFilter.getLength();
 
-        // for wildcard search : remove all table filters which are a wildcard expression and build a WilCard
+        // for wildcard search : remove all table filters which are a wildcard expression and build a WildCard
         // for them
         ::std::vector< WildCard > aWCSearch;
         nTableFilterLen = createWildCardVector(aTableFilter,aWCSearch);
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 0d4c3147efb6..46526def1d16 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -288,15 +288,12 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::O
                 for(SelectColumnsMetaData::iterator aPosIter = (*m_pForeignColumnNames).begin();aPosIter != aPosEnd;++aPosIter)
                 {
                     // look for columns not in the source columns to use them as filter as well
-                    // if ( !xSourceColumns->hasByName(aPosIter->first) )
-                    {
                         if ( aFilter.getLength() )
                             aFilter.append(aAnd);
                         aFilter.append(::dbtools::quoteName( aQuote,sSelectTableName));
                         aFilter.append(s_sDot);
                         aFilter.append(::dbtools::quoteName( aQuote,aPosIter->second.sRealName));
                         aFilter.append(s_sParam);
-                    }
                 }
                 break;
             }
@@ -519,7 +516,6 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow
     SelectColumnsMetaData::const_iterator aEnd = m_pColumnNames->end();
     for(;aIter != aEnd;++aIter,++i)
     {
-        //if(xKeyColumns.is() && xKeyColumns->hasByName(aIter->first))
         if ( m_pKeyColumnNames->find(aIter->first) != m_pKeyColumnNames->end() )
         {
             sKeyCondition.append(::dbtools::quoteName( aQuote,aIter->second.sRealName));
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index 9433df191294..270e45d0960f 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -200,7 +200,6 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow
     TSQLStatements aIndexConditions;
     TSQLStatements aSql;
 
-    // sal_Int32 i = 1;
     // here we build the condition part for the update statement
     SelectColumnsMetaData::const_iterator aIter = m_pColumnNames->begin();
     SelectColumnsMetaData::const_iterator aEnd = m_pColumnNames->end();
@@ -393,7 +392,6 @@ void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const conne
     TSQLStatements aIndexConditions;
     TSQLStatements aSql;
 
-    // sal_Int32 i = 1;
     // here we build the condition part for the update statement
     SelectColumnsMetaData::const_iterator aIter = m_pColumnNames->begin();
     SelectColumnsMetaData::const_iterator aEnd = m_pColumnNames->end();
@@ -430,7 +428,7 @@ void OptimisticSet::executeDelete(const ORowSetRow& _rDeleteRow,const ::rtl::OUS
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::executeDelete" );
 
-    // now create end execute the prepared statement
+    // now create and execute the prepared statement
     Reference< XPreparedStatement > xPrep(m_xConnection->prepareStatement(i_sSQL));
     Reference< XParameters > xParameter(xPrep,UNO_QUERY);
 
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index d035d1480648..b8cee8a485ed 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -560,7 +560,7 @@ void ORowSet::freeResources( bool _bComplete )
 
     // free all clones
     connectivity::OWeakRefArray::iterator aEnd = m_aClones.end();
-    for (connectivity::OWeakRefArray::iterator i = m_aClones.begin(); aEnd != i; i++)
+    for (connectivity::OWeakRefArray::iterator i = m_aClones.begin(); aEnd != i; ++i)
     {
         Reference< XComponent > xComp(i->get(), UNO_QUERY);
         if (xComp.is())
@@ -1809,9 +1809,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
         }
 
         // get the locale
-        //  ConfigManager*  pConfigMgr = ConfigManager::GetConfigManager();
         Locale aLocale = SvtSysLocale().GetLocaleData().getLocale();
-        //  pConfigMgr->GetDirectConfigProperty(ConfigManager::LOCALE) >>= aLocale;
 
         // get the numberformatTypes
         OSL_ENSURE(m_xActiveConnection.is(),"No ActiveConnection");
@@ -1928,8 +1926,6 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
                     if(!xColumn.is())
                     {
                         // no column found so we could look at the position i
-                        //bReFetchName = sal_True;
-                        //sColumnLabel = ::rtl::OUString();
                         Reference<XIndexAccess> xIndexAccess(m_xColumns,UNO_QUERY);
                         if(xIndexAccess.is() && i <= xIndexAccess->getCount())
                         {
@@ -2122,7 +2118,7 @@ void ORowSet::notifyRowSetAndClonesRowDelete( const Any& _rBookmark )
     onDeleteRow( _rBookmark );
     // notify the clones
     connectivity::OWeakRefArray::iterator aEnd = m_aClones.end();
-    for (connectivity::OWeakRefArray::iterator i = m_aClones.begin(); aEnd != i; i++)
+    for (connectivity::OWeakRefArray::iterator i = m_aClones.begin(); aEnd != i; ++i)
     {
         Reference< XUnoTunnel > xTunnel(i->get(),UNO_QUERY);
         if(xTunnel.is())
@@ -2140,7 +2136,7 @@ void ORowSet::notifyRowSetAndClonesRowDeleted( const Any& _rBookmark, sal_Int32
     onDeletedRow( _rBookmark, _nPos );
     // notify the clones
     connectivity::OWeakRefArray::iterator aEnd = m_aClones.end();
-    for (connectivity::OWeakRefArray::iterator i = m_aClones.begin(); aEnd != i; i++)
+    for (connectivity::OWeakRefArray::iterator i = m_aClones.begin(); aEnd != i; ++i)
     {
         Reference< XUnoTunnel > xTunnel(i->get(),UNO_QUERY);
         if(xTunnel.is())
@@ -2641,7 +2637,6 @@ void SAL_CALL ORowSet::clearWarnings(  ) throw (SQLException, RuntimeException)
 
 void ORowSet::doCancelModification( )
 {
-    //OSL_ENSURE( isModification(), "ORowSet::doCancelModification: invalid call (no cache!)!" );
     if ( isModification() )
     {
         // read-only flag restored
@@ -2678,8 +2673,8 @@ void ORowSet::checkUpdateIterator()
         m_pCache->setUpdateIterator(m_aCurrentRow);
         m_aCurrentRow = m_pCache->m_aInsertRow;
         m_bModified = sal_True;
-    } // if(!m_bModified && !m_bNew)
-    else if ( m_bNew ) // here we are modifing a value
+    }
+    else if ( m_bNew ) // here we are modifying a value
         m_bModified = sal_True;
 }
 
@@ -2756,9 +2751,6 @@ ORowSetClone::ORowSetClone( const ::comphelper::ComponentContext& _rContext, ORo
     ::std::vector< ::rtl::OUString> aNames;
 
     ::rtl::OUString aDescription;
-    //  ConfigManager*  pConfigMgr = ConfigManager::GetConfigManager();
-    //  Locale aLocale;
-    //  pConfigMgr->GetDirectConfigProperty(ConfigManager::LOCALE) >>= aLocale;
     Locale aLocale = SvtSysLocale().GetLocaleData().getLocale();
 
     if ( rParent.m_pColumns )
@@ -2801,7 +2793,7 @@ ORowSetClone::ORowSetClone( const ::comphelper::ComponentContext& _rContext, ORo
             pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_HELPTEXT,xColumn->getPropertyValue(PROPERTY_HELPTEXT));
             pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_CONTROLDEFAULT,xColumn->getPropertyValue(PROPERTY_CONTROLDEFAULT));
 
-        } // for(sal_Int32 i=1;pIter != pEnd ;++pIter,++i)
+        }
     }
     Reference<XDatabaseMetaData> xMeta = rParent.m_xActiveConnection->getMetaData();
     m_pColumns = new ORowSetDataColumns(xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(),
@@ -2810,7 +2802,6 @@ ORowSetClone::ORowSetClone( const ::comphelper::ComponentContext& _rContext, ORo
     sal_Int32 nRT   = PropertyAttribute::READONLY   | PropertyAttribute::TRANSIENT;
 
     // sdb.RowSet Properties
-    //  registerProperty(PROPERTY_CURSORNAME,       PROPERTY_ID_CURSORNAME,         PropertyAttribute::READONLY,        &m_aDataSourceName,     ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
     registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   &rParent.m_aActiveConnection,   ::getCppuType(reinterpret_cast< Reference< XConnection >* >(NULL)));
     registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY,   PropertyAttribute::READONLY,    &m_nResultSetConcurrency,::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
     registerProperty(PROPERTY_RESULTSETTYPE,        PROPERTY_ID_RESULTSETTYPE,          PropertyAttribute::READONLY,    &m_nResultSetType,      ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
@@ -2942,7 +2933,6 @@ void SAL_CALL ORowSetClone::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,c
 
 void ORowSetClone::doCancelModification( )
 {
-    //OSL_ENSURE( sal_False, "ORowSetClone::doCancelModification: invalid call!" );
 }
 
 sal_Bool ORowSetClone::isModification( )
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index f27dc80b5a64..8857420ecfef 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -608,7 +608,7 @@ sal_Int32 SAL_CALL ORowSetBase::findColumn( const ::rtl::OUString& columnName )
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
 
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
-    // it is possible to save some time her when we remember the names - position relation in a map
+    // it is possible to save some time here when we remember the names - position relation in a map
     return m_pColumns ? m_pColumns->findColumn(columnName) : sal_Int32(0);
 }
 
@@ -1108,7 +1108,6 @@ void ORowSetBase::setCurrentRow( sal_Bool _bMoved, sal_Bool _bDoNotify, const OR
     DBG_TRACE2("DBACCESS ORowSetBase::setCurrentRow() Clone = %i ID = %i\n",m_bClone,osl_getThreadIdentifier(NULL));
     m_bBeforeFirst  = m_pCache->isBeforeFirst();
     m_bAfterLast    = m_pCache->isAfterLast();
-    //m_pCache->resetInsertRow(sal_True);
 
     if(!(m_bBeforeFirst || m_bAfterLast))
     {
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index 3710a0e0c108..0d53b83a5e9a 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -264,9 +264,6 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs,
         // need to check if we could handle this select clause
         bAllKeysFound = bAllKeysFound && (nTablesCount == 1 || checkJoin(xConnection,_xAnalyzer,aUpdateTableName));
 
-        // || !(comphelper::hasProperty(PROPERTY_CANUPDATEINSERTEDROWS,xProp) && any2bool(xProp->getPropertyValue(PROPERTY_CANUPDATEINSERTEDROWS)))
-
-        // oj removed because keyset uses only the next// || (xProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_RESULTSETTYPE) && comphelper::getINT32(xProp->getPropertyValue(PROPERTY_RESULTSETTYPE)) == ResultSetType::FORWARD_ONLY)
         if(!bAllKeysFound )
         {
             m_pCacheSet = new OStaticSet();
@@ -371,7 +368,6 @@ ORowSetCache::~ORowSetCache()
 
 void ORowSetCache::setMaxRowSize(sal_Int32 _nSize)
 {
-
     if(_nSize == m_nFetchSize)
         return;
 
@@ -413,7 +409,7 @@ void ORowSetCache::setMaxRowSize(sal_Int32 _nSize)
             m_aMatrixIter = m_pMatrix->end();
         m_aMatrixEnd = m_pMatrix->end();
 
-        // now adjust their positions because a resize invalid all iterators
+        // now adjust their positions because a resize invalidates all iterators
         ::std::vector<sal_Int32>::const_iterator aIter = aPositions.begin();
         ::std::map<sal_Int32,sal_Bool>::const_iterator aPosChangeIter = aCacheIterToChange.begin();
         for(    aCacheIter = m_aCacheIterators.begin();
@@ -463,7 +459,6 @@ Any lcl_getBookmark(ORowSetValue& i_aValue,OCacheSet* i_pCacheSet)
 // ::com::sun::star::sdbcx::XRowLocate
 Any ORowSetCache::getBookmark(  )
 {
-
     if(m_bAfterLast)
         throwFunctionSequenceException(m_xSet.get());
 
@@ -512,7 +507,6 @@ sal_Bool ORowSetCache::moveRelativeToBookmark( const Any& bookmark, sal_Int32 ro
     {
         m_nPosition = m_pCacheSet->getRow() + rows;
         absolute(m_nPosition);
-        //  for(sal_Int32 i=0;i<rows && m_aMatrixIter != m_pMatrix->end();++i,++m_aMatrixIter) ;
 
         bRet = m_aMatrixIter != m_pMatrix->end() && (*m_aMatrixIter).is();
     }
@@ -656,27 +650,21 @@ sal_Bool ORowSetCache::isBeforeFirst(  )
 
 sal_Bool ORowSetCache::isAfterLast(  )
 {
-
     return m_bAfterLast;
 }
 
 sal_Bool ORowSetCache::isFirst(  )
 {
-
     return m_nPosition == 1; // ask resultset for
 }
 
 sal_Bool ORowSetCache::isLast(  )
 {
-    //  return m_bRowCountFinal ? (m_nPosition==m_nRowCount) : m_pCacheSet->isLast();
-
     return m_nPosition == m_nRowCount;
 }
 
 sal_Bool ORowSetCache::beforeFirst(  )
 {
-
-
     if(!m_bBeforeFirst)
     {
         m_bAfterLast    = sal_False;
@@ -691,8 +679,6 @@ sal_Bool ORowSetCache::beforeFirst(  )
 
 sal_Bool ORowSetCache::afterLast(  )
 {
-
-
     if(!m_bAfterLast)
     {
         m_bBeforeFirst = sal_False;
@@ -764,7 +750,6 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32& _nNewStartPos,sal_Int32 _nNewEndPos
         }
         bCheck = m_pCacheSet->next();
     }
-    //  m_nStartPos = _nNewStartPos;
     // we have to read one row forward to enshure that we know when we are on last row
     // but only when we don't know it already
     if(!m_bRowCountFinal)
@@ -784,12 +769,10 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32& _nNewStartPos,sal_Int32 _nNewEndPos
 
 sal_Bool ORowSetCache::moveWindow()
 {
-
     sal_Bool bRet = sal_True;
 
     sal_Int32 nDiff = (sal_Int32)(m_nFetchSize*0.5 -0.5);
     sal_Int32 nNewStartPos  = (m_nPosition - nDiff);
-    //  sal_Int32 nNewEndPos    = (m_nPosition+m_nFetchSize*0.5);
     sal_Int32 nNewEndPos    = nNewStartPos + m_nFetchSize;
 
     if ( m_nPosition <= m_nStartPos )
@@ -808,7 +791,6 @@ sal_Bool ORowSetCache::moveWindow()
             if ( nNewStartPos < 1 )
             {
                 bCheck = m_pCacheSet->first();
-                //  aEnd = m_pMatrix->begin() + (sal_Int32)(m_nFetchSize*0.5);
                 OSL_ENSURE((nNewEndPos - m_nStartPos - nNewStartPos) < (sal_Int32)m_pMatrix->size(),"Position is behind end()!");
                 aEnd = m_pMatrix->begin() + (nNewEndPos - m_nStartPos - nNewStartPos);
                 aIter = aEnd;
@@ -864,7 +846,7 @@ sal_Bool ORowSetCache::moveWindow()
                 }
             }
             else
-            { // normaly this should never happen
+            { // normally this should never happen
                 OSL_ENSURE(0,"What the hell is happen here!");
                 return sal_False;
             }
@@ -944,9 +926,6 @@ sal_Bool ORowSetCache::moveWindow()
             sal_Bool bCheck = m_pCacheSet->absolute(nPos);
             bCheck = fill(aIter,aEnd,nPos,bCheck); // refill the region wew don't need anymore
 
-//          // we know that this is the current maximal rowcount here
-//          if ( !m_bRowCountFinal && bCheck )
-//              m_nRowCount = std::max(nPos,m_nRowCount);
             // we have to read one row forward to enshure that we know when we are on last row
             // but only when we don't know it already
             sal_Bool bOk = sal_True;
@@ -973,7 +952,6 @@ sal_Bool ORowSetCache::moveWindow()
             {   // the end was reached before end() so we can set the start before nNewStartPos
 
                 m_nStartPos += (aIter - m_pMatrix->begin());
-                //  m_nStartPos = (aIter - m_pMatrix->begin());
                 ::std::rotate(m_pMatrix->begin(),aIter,m_pMatrix->end());
                 // now correct the iterator in our iterator vector
                 rotateCacheIterator( (sal_Int16)( aIter - m_pMatrix->begin() ) );
@@ -1273,7 +1251,7 @@ void ORowSetCache::cancelRowModification()
     {
         if ( aCacheIter->second.pRowSet->isInsertRow() && aCacheIter->second.aIterator == m_aInsertRow )
             aCacheIter->second.aIterator = m_pMatrix->end();
-    } // for(;aCacheIter != aCacheEnd;++aCacheIter)
+    }
     resetInsertRow(sal_False);
 }
 
@@ -1313,7 +1291,6 @@ bool ORowSetCache::deleteRow(  )
     if(isAfterLast() || isBeforeFirst())
         throw SQLException(DBACORE_RESSTRING(RID_STR_NO_DELETEROW),NULL,SQLSTATE_GENERAL,1000,Any() );
 
-    //  m_pCacheSet->absolute(m_nPosition);
     m_pCacheSet->deleteRow(*m_aMatrixIter,m_aUpdateTable);
     if ( !m_pCacheSet->rowDeleted() )
         return false;
@@ -1376,7 +1353,6 @@ void ORowSetCache::moveToInsertRow(  )
 
 ORowSetCacheIterator ORowSetCache::createIterator(ORowSetBase* _pRowSet)
 {
-
     ORowSetCacheIterator_Helper aHelper;
     aHelper.aIterator = m_pMatrix->end();
     aHelper.pRowSet = _pRowSet;
@@ -1392,7 +1368,7 @@ void ORowSetCache::deleteIterator(const ORowSetBase* _pRowSet)
         {
             m_aCacheIterators.erase(aCacheIter);
             aCacheIter = m_aCacheIterators.begin();
-        } // if ( aCacheIter->second.pRowSet == _pRowSet )
+        }
         else
             ++aCacheIter;
     }
@@ -1466,10 +1442,10 @@ sal_Bool ORowSetCache::checkInnerJoin(const ::connectivity::OSQLParseNode *pNode
     {
         bOk = checkInnerJoin(pNode->getChild(1),_xConnection,_sUpdateTableName);
     }
-    else if ((SQL_ISRULE(pNode,search_condition) || SQL_ISRULE(pNode,boolean_term)) &&          // AND/OR-Verknuepfung:
+    else if ((SQL_ISRULE(pNode,search_condition) || SQL_ISRULE(pNode,boolean_term)) && // AND/OR link
                 pNode->count() == 3)
     {
-        // nur AND Verknüpfung zulassen
+        // only allow an AND link
         if ( SQL_ISTOKEN(pNode->getChild(1),AND) )
             bOk = checkInnerJoin(pNode->getChild(0),_xConnection,_sUpdateTableName)
                 && checkInnerJoin(pNode->getChild(2),_xConnection,_sUpdateTableName);
@@ -1568,7 +1544,7 @@ void ORowSetCache::clearInsertRow()
             aIter->setBound(sal_False);
             aIter->setModified(sal_False);
             aIter->setNull();
-        } // for(;aIter != (*m_aInsertRow)->end();++aIter)
+        }
     }
 }
 
@@ -1579,7 +1555,6 @@ ORowSetMatrix::iterator ORowSetCache::calcPosition() const
     return ( nValue < 0 || nValue >= static_cast<sal_Int32>(m_pMatrix->size()) ) ? m_pMatrix->end() : (m_pMatrix->begin() + nValue);
 }
 
-
 TORowSetOldRowHelperRef ORowSetCache::registerOldRow()
 {
     TORowSetOldRowHelperRef pRef = new ORowSetOldRowHelper(ORowSetRow());
@@ -1612,7 +1587,7 @@ sal_Bool ORowSetCache::reFillMatrix(sal_Int32 _nNewStartPos,sal_Int32 _nNewEndPo
     sal_Int32 nNewSt = _nNewStartPos;
     sal_Bool bRet = fillMatrix(nNewSt,_nNewEndPos);
     m_nStartPos = nNewSt - 1;
-    rotateCacheIterator(static_cast<sal_Int16>(m_nFetchSize+1)); // forces that every iterator will be set to null
+    rotateCacheIterator(static_cast<sal_Int16>(m_nFetchSize+1)); // forces every iterator to null
     return bRet;
 }
 
diff --git a/dbaccess/source/core/api/RowSetCache.hxx b/dbaccess/source/core/api/RowSetCache.hxx
index dedf04ead36b..3256babcfaa5 100644
--- a/dbaccess/source/core/api/RowSetCache.hxx
+++ b/dbaccess/source/core/api/RowSetCache.hxx
@@ -90,7 +90,6 @@ namespace dbaccess
         ORowSetMatrix*                  m_pInsertMatrix;        // represent the rows which should be inserted normally this is only one
         ORowSetMatrix::iterator         m_aInsertRow;           // represent a insert row
 
-        //  ORowSetRow                      m_aInsertRow;           // present the row that should be inserted
         sal_Int32                       m_nLastColumnIndex;     // the last column ask for, used for wasNull()
 
         connectivity::OSQLTable         m_aUpdateTable;         // used for updates/deletes and inserts
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index ec2ce273be59..7f024cb35a03 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -990,7 +990,6 @@ sal_Bool OSingleSelectQueryComposer::setORCriteria(OSQLParseNode* pCondition, OS
         {
             // Ist das erste Element wieder eine OR-Verknuepfung?
             // Dann rekursiv absteigen ...
-            //if (!i && SQL_ISRULE(pCondition->getChild(i),search_condition))
             if (SQL_ISRULE(pCondition->getChild(i),search_condition))
                 bResult = setORCriteria(pCondition->getChild(i), _rIterator, rFilters, xFormatter);
             else
@@ -1042,9 +1041,7 @@ sal_Bool OSingleSelectQueryComposer::setANDCriteria( OSQLParseNode * pCondition,
             ::rtl::OUString aColumnName;
 
 
-            //  pCondition->parseNodeToStr(aValue,m_xMetaData, xFormatter, m_aLocale,static_cast<sal_Char>(m_sDecimalSep.toChar()));
             pCondition->parseNodeToStr( aValue, m_xConnection, NULL );
-            //  pCondition->getChild(0)->parseNodeToStr(aColumnName,m_xMetaData, xFormatter, m_aLocale,static_cast<sal_Char>(m_sDecimalSep.toChar()));
             pCondition->getChild(0)->parseNodeToStr( aColumnName, m_xConnection, NULL );
 
             // don't display the column name
@@ -1314,7 +1311,7 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon
         const ::rtl::OUString* pEnd     = pBegin + aNames.getLength();
 
         if(!aTable.getLength())
-        { // we don't found a table name, now we must search every table for this column
+        { // we haven't found a table name, now we must search every table for this column
             for(;pBegin != pEnd;++pBegin)
             {
                 Reference<XColumnsSupplier> xColumnsSupp;
@@ -1322,10 +1319,6 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon
 
                 if(xColumnsSupp.is() && xColumnsSupp->getColumns()->hasByName(aColumnName))
                 {
-//                  Reference<XPropertySet> xTableProp(xColumnsSupp,UNO_QUERY);
-//                  xTableProp->getPropertyValue(PROPERTY_CATALOGNAME)  >>= aCatalog;
-//                  xTableProp->getPropertyValue(PROPERTY_SCHEMANAME)   >>= aSchema;
-//                  xTableProp->getPropertyValue(PROPERTY_NAME)         >>= aTable;
                     aTable = *pBegin;
                     break;
                 }
diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx
index 0093f673d2b9..59f892d8d649 100644
--- a/dbaccess/source/core/api/StaticSet.cxx
+++ b/dbaccess/source/core/api/StaticSet.cxx
@@ -45,11 +45,9 @@ using namespace connectivity;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::sdbc;
-//  using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
-//  using namespace ::cppu;
 using namespace ::osl;
 
 void OStaticSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 /*_nPosition*/)
diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx
index 4ed9dcdfcc65..0c3265e6b4f9 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -427,9 +427,6 @@ void SAL_CALL ODBTableDecorator::rename( const ::rtl::OUString& _rNewName ) thro
     Reference<XRename> xRename(m_xTable,UNO_QUERY);
     if(xRename.is())
     {
-//      ::rtl::OUString sOldName;
-//      Reference<XPropertySet> xProp(m_xTable,UNO_QUERY);
-//      xProp->getPropertyValue(PROPERTY_NAME) >>= sOldName;
         xRename->rename(_rNewName);
     }
     else // not supported
@@ -539,7 +536,7 @@ Sequence< sal_Int8 > ODBTableDecorator::getUnoTunnelImplementationId()
 void ODBTableDecorator::fillPrivileges() const
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::fillPrivileges" );
-    // somebody is asking for the privileges an we do not know them, yet
+    // somebody is asking for the privileges and we do not know them, yet
     m_nPrivileges = 0;
     try
     {
diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx
index b1bd9a71056e..0b00c63a0a88 100644
--- a/dbaccess/source/core/api/WrappedResultSet.cxx
+++ b/dbaccess/source/core/api/WrappedResultSet.cxx
@@ -46,11 +46,9 @@ using namespace ::dbtools;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::sdbc;
-//  using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
-//  using namespace ::cppu;
 using namespace ::osl;
 
 void WrappedResultSet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter)
@@ -192,8 +190,6 @@ void WrappedResultSet::updateColumn(sal_Int32 nPos,Reference< XRowUpdate > _xPar
                     break;
                 case DataType::CHAR:
                 case DataType::VARCHAR:
-                //case DataType::DECIMAL:
-                //case DataType::NUMERIC:
                     _xParameter->updateString(nPos,_rValue);
                     break;
                 case DataType::BIGINT:
diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx
index 12f83abf28fd..321591ee2eda 100644
--- a/dbaccess/source/core/api/querycontainer.cxx
+++ b/dbaccess/source/core/api/querycontainer.cxx
@@ -316,7 +316,7 @@ Reference< XVeto > SAL_CALL OQueryContainer::approveRemoveElement( const Contain
 void SAL_CALL OQueryContainer::disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw(::com::sun::star::uno::RuntimeException)
 {
     if (_rSource.Source.get() == Reference< XInterface >(m_xCommandDefinitions, UNO_QUERY).get())
-    {   // our "master container" (with the command definitions) is beeing disposed
+    {   // our "master container" (with the command definitions) is being disposed
         DBG_ERROR("OQueryContainer::disposing : nobody should dispose the CommandDefinition container before disposing my connection !");
         dispose();
     }
diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx
index 6d0669b874e7..580bd5b232bc 100644
--- a/dbaccess/source/core/api/resultset.cxx
+++ b/dbaccess/source/core/api/resultset.cxx
@@ -50,7 +50,6 @@
 
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdbcx;
-//using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx
index ebdc129d8c20..251facd240a9 100644
--- a/dbaccess/source/core/api/statement.cxx
+++ b/dbaccess/source/core/api/statement.cxx
@@ -113,7 +113,7 @@ Any OStatementBase::queryInterface( const Type & rType ) throw (RuntimeException
             Reference< XGeneratedResultSet > xGRes(m_xAggregateAsSet, UNO_QUERY);
             if ( ::getCppuType( (const Reference< XGeneratedResultSet > *)0 ) == rType && xGRes.is() )
                 aIface = ::cppu::queryInterface(rType,static_cast< XGeneratedResultSet * >( this ));
-        } // if ( !aIface.hasValue() )
+        }
         if ( !aIface.hasValue() )
         {
             Reference< XPreparedBatchExecution > xGRes(m_xAggregateAsSet, UNO_QUERY);
diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
index 827fbf2cf465..e17f89f0f3e0 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -266,8 +266,8 @@ Reference< XPropertySet > OTableContainer::createDescriptor()
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::createDescriptor" );
     Reference< XPropertySet > xRet;
 
-    // frist we have to look if the master tables does support this
-    // and if then create a table object as well with the master tables
+    // first we have to look if the master tables support this
+    // and if so then create a table object as well with the master tables
     Reference<XColumnsSupplier > xMasterColumnsSup;
     Reference<XDataDescriptorFactory> xDataFactory(m_xMasterContainer,UNO_QUERY);
     if ( xDataFactory.is() && m_xMetaData.is() )
diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx
index 075bb806f095..4800b79b8f85 100644
--- a/dbaccess/source/core/api/viewcontainer.cxx
+++ b/dbaccess/source/core/api/viewcontainer.cxx
@@ -125,8 +125,8 @@ ObjectType OViewContainer::createObject(const ::rtl::OUString& _rName)
 Reference< XPropertySet > OViewContainer::createDescriptor()
 {
     Reference< XPropertySet > xRet;
-    // frist we have to look if the master tables does support this
-    // and if then create a table object as well with the master tables
+    // first we have to look if the master tables support this
+    // and if so then create a table object as well with the master tables
     Reference<XColumnsSupplier > xMasterColumnsSup;
     Reference<XDataDescriptorFactory> xDataFactory(m_xMasterContainer,UNO_QUERY);
     if(xDataFactory.is())
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index fb6bf98877fc..22ac97723d01 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -89,7 +89,7 @@ void SAL_CALL OContentHelper::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
-    // say our listeners goobye
+    // say goodbye to our listeners
     EventObject aEvt(*this);
     m_aContentListeners.disposeAndClear(aEvt);
 
@@ -363,24 +363,27 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue
         {
             // Read-only property!
             aRet[ n ] <<= 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( RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) )
         {
             // Read-only property!
             aRet[ n ] <<= 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( RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) )
         {
             // Read-only property!
             aRet[ n ] <<= 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( RTL_CONSTASCII_STRINGPARAM( "Title" ) ) )
@@ -415,8 +418,9 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue
             else
             {
                 aRet[ n ] <<= IllegalTypeException(
-                                rtl::OUString::createFromAscii(
-                                    "Property value has wrong type!" ),
+                                ::rtl::OUString(
+                                    RTL_CONSTASCII_USTRINGPARAM("Property value has wrong type!")
+                                ),
                                 static_cast< cppu::OWeakObject * >( this ) );
             }
         }
@@ -424,17 +428,15 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue
         else
         {
             aRet[ n ] <<= 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 ) );
         }
     }
 
     if ( nChanged > 0 )
     {
-        // @@@ Save changes.
-//      storeData();
-
         notifyDataSourceModified();
         aGuard.clear();
         aChanges.realloc( nChanged );
@@ -486,27 +488,27 @@ Reference< XRow > OContentHelper::getPropertyValues( const Sequence< Property >&
     {
         // Append all Core Properties.
         xRow->appendString (
-            Property( rtl::OUString::createFromAscii( "ContentType" ),
+            Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType")),
                       -1,
                       getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
                       PropertyAttribute::BOUND
                         | PropertyAttribute::READONLY ),
             getContentType() );
         xRow->appendString (
-            Property( rtl::OUString::createFromAscii( "Title" ),
+            Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title" )),
                       -1,
                       getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
                       PropertyAttribute::BOUND ),
             m_pImpl->m_aProps.aTitle );
         xRow->appendBoolean(
-            Property( rtl::OUString::createFromAscii( "IsDocument" ),
+            Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")),
                       -1,
                       getCppuBooleanType(),
                       PropertyAttribute::BOUND
                         | PropertyAttribute::READONLY ),
             m_pImpl->m_aProps.bIsDocument );
         xRow->appendBoolean(
-            Property( rtl::OUString::createFromAscii( "IsFolder" ),
+            Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")),
                       -1,
                       getCppuBooleanType(),
                       PropertyAttribute::BOUND
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 5d31055d2cc2..56fecd7e6867 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -440,9 +440,9 @@ ODatabaseModelImpl::ODatabaseModelImpl( const Reference< XMultiServiceFactory >&
 {
     // some kind of default
     DBG_CTOR(ODatabaseModelImpl,NULL);
-    m_sConnectURL = ::rtl::OUString::createFromAscii("jdbc:");
+    m_sConnectURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("jdbc:"));
     m_aTableFilter.realloc(1);
-    m_aTableFilter[0] = ::rtl::OUString::createFromAscii("%");
+    m_aTableFilter[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%"));
     impl_construct_nothrow();
 }
 
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index d18f820bff47..d4899c247ab5 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -573,7 +573,7 @@ public:
     inline void checkDisposed() const
     {
         if ( !m_pImpl.is() )
-            throw ::com::sun::star::lang::DisposedException( ::rtl::OUString::createFromAscii( "Component is already disposed." ), getThis() );
+            throw ::com::sun::star::lang::DisposedException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Component is already disposed.")), getThis() );
     }
 
     inline void lockModify()
diff --git a/dbaccess/source/core/dataaccess/SharedConnection.cxx b/dbaccess/source/core/dataaccess/SharedConnection.cxx
index 6c18633de23e..87ad268e9e49 100644
--- a/dbaccess/source/core/dataaccess/SharedConnection.cxx
+++ b/dbaccess/source/core/dataaccess/SharedConnection.cxx
@@ -38,7 +38,6 @@ namespace dbaccess
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
-//  using namespace ::com::sun::star::reflection;
 using namespace connectivity;
 
 DBG_NAME(OSharedConnection)
diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
index a7d17634a81d..372e48bbd5e8 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
@@ -70,7 +70,7 @@ void OBookmarkContainer::dispose()
 {
     MutexGuard aGuard(m_rMutex);
 
-    // say our listeners goobye
+    // say goodbye to our listeners
     EventObject aEvt(*this);
     m_aContainerListeners.disposeAndClear(aEvt);
 
@@ -97,7 +97,7 @@ OBookmarkContainer::~OBookmarkContainer()
 // XServiceInfo
 ::rtl::OUString SAL_CALL OBookmarkContainer::getImplementationName(  ) throw(RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.dba.OBookmarkContainer");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.dba.OBookmarkContainer"));
 }
 
 sal_Bool SAL_CALL OBookmarkContainer::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException)
@@ -110,7 +110,7 @@ sal_Bool SAL_CALL OBookmarkContainer::supportsService( const ::rtl::OUString& _r
 Sequence< ::rtl::OUString > SAL_CALL OBookmarkContainer::getSupportedServiceNames(  ) throw(RuntimeException)
 {
     Sequence< ::rtl::OUString > aReturn(1);
-    aReturn.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.DefinitionContainer");
+    aReturn.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.DefinitionContainer"));
     return aReturn;
 }
 
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx
index 8ab8abe30755..e96da41181ea 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.cxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx
@@ -115,7 +115,7 @@ IMPLEMENT_PROPERTYCONTAINER_DEFAULTS2(OCommandDefinition,OCommandDefinition_PROP
 
 ::rtl::OUString OCommandDefinition::getImplementationName_static(  ) throw(RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.dba.OCommandDefinition");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.dba.OCommandDefinition"));
 }
 
 ::rtl::OUString SAL_CALL OCommandDefinition::getImplementationName(  ) throw(RuntimeException)
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index 89840f11e2cb..d3a1086da46d 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -88,7 +88,7 @@ namespace dbaccess
 rtl::OUString OConnection::getImplementationName(  ) throw(RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getImplementationName" );
-    return rtl::OUString::createFromAscii("com.sun.star.comp.dbaccess.Connection");
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.dbaccess.Connection"));
 }
 
 sal_Bool OConnection::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException)
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 16d578588f0d..2f32428cb2b7 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -160,7 +160,7 @@ namespace dbaccess
                     {
                         Reference<util::XCloseable> xCloseable(xModel,UNO_QUERY_THROW);
                         xCloseable->close(sal_False);
-                    } // if ( !xModel->getControllers()->hasMoreElements() )
+                    }
                 }
                 catch(const CloseVetoException&)
                 {
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index f6dea5f99b3c..60b237bb5bfb 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1056,7 +1056,7 @@ void ODatabaseDocument::impl_storeAs_throw( const ::rtl::OUString& _rURL, const
 Reference< XStorage > ODatabaseDocument::impl_createStorageFor_throw( const ::rtl::OUString& _rURL ) const
 {
     Reference < ::com::sun::star::ucb::XSimpleFileAccess > xTempAccess;
-    m_pImpl->m_aContext.createComponent( ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ,xTempAccess);
+    m_pImpl->m_aContext.createComponent( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")) ,xTempAccess);
     Reference< io::XStream > xStream = xTempAccess->openFileReadWrite( _rURL );
     Reference< io::XTruncate > xTruncate(xStream,UNO_QUERY);
     if ( xTruncate.is() )
@@ -1711,7 +1711,7 @@ void ODatabaseDocument::disposing()
     // the security warning, again.
     m_pImpl->resetMacroExecutionMode();
 
-    // similar argueing for our ViewMonitor
+    // similar arguing for our ViewMonitor
     m_aViewMonitor.reset();
 
     // tell our Impl to forget us
@@ -1760,7 +1760,7 @@ rtl::OUString ODatabaseDocument::getImplementationName(  ) throw(RuntimeExceptio
 
 rtl::OUString ODatabaseDocument::getImplementationName_static(  ) throw(RuntimeException)
 {
-    return rtl::OUString::createFromAscii("com.sun.star.comp.dba.ODatabaseDocument");
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.dba.ODatabaseDocument"));
 }
 
 Sequence< ::rtl::OUString > ODatabaseDocument::getSupportedServiceNames(  ) throw (RuntimeException)
@@ -1991,7 +1991,6 @@ uno::Reference< frame::XUntitledNumbers > ODatabaseDocument::impl_getUntitledHel
     }
     catch(uno::Exception)
     {
-        // ni
     }
     uno::Reference< frame::XUntitledNumbers > xNumberedControllers;
 
@@ -2003,7 +2002,7 @@ uno::Reference< frame::XUntitledNumbers > ODatabaseDocument::impl_getUntitledHel
         xNumberedControllers.set(static_cast< ::cppu::OWeakObject* >(pHelper), uno::UNO_QUERY_THROW);
 
         pHelper->setOwner          (xThis);
-        //pHelper->setUntitledPrefix (::rtl::OUString::createFromAscii(" : "));
+        //pHelper->setUntitledPrefix (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" : ")));
 
         m_aNumberedControllers.insert(TNumberedController::value_type(sModuleId,xNumberedControllers));
     }
diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
index 83b6d482b769..e2a521b71d23 100644
--- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
+++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
@@ -67,19 +67,19 @@ namespace dbaccess
 
     static const ::rtl::OUString& getConfigurationRootPath()
     {
-        static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("org.openoffice.Office.DataAccess/RegisteredNames");
+        static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.DataAccess/RegisteredNames"));
         return s_sNodeName;
     }
 
     const ::rtl::OUString& getLocationNodeName()
     {
-        static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii( "Location" );
+        static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("Location"));
         return s_sNodeName;
     }
 
     const ::rtl::OUString& getNameNodeName()
     {
-        static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii( "Name" );
+        static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("Name"));
         return s_sNodeName;
     }
 
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index 092432d7e487..12cbdd5244e6 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -203,7 +203,7 @@ void SAL_CALL FlushNotificationAdapter::disposing( const EventObject& Source ) t
 }
 
 OAuthenticationContinuation::OAuthenticationContinuation()
-    :m_bRemberPassword(sal_True),   // TODO: a meaningfull default
+    :m_bRemberPassword(sal_True),   // TODO: a meaningful default
     m_bCanSetUserName(sal_True)
 {
 }
@@ -220,7 +220,7 @@ void SAL_CALL OAuthenticationContinuation::setRealm( const ::rtl::OUString& /*Re
 
 sal_Bool SAL_CALL OAuthenticationContinuation::canSetUserName(  ) throw(RuntimeException)
 {
-    // we alwas allow this, even if the database document is read-only. In this case,
+    // we always allow this, even if the database document is read-only. In this case,
     // it's simply that the user cannot store the new user name.
     return m_bCanSetUserName;
 }
@@ -316,7 +316,7 @@ class OSharedConnectionManager : public OConnectionHelper_BASE
     typedef ::std::map< Reference< XConnection >,TConnectionMap::iterator>  TSharedConnectionMap;// holds the shared connections
 
     ::osl::Mutex                m_aMutex;
-    TConnectionMap              m_aConnections;         // remeber the master connection in conjunction with the digest
+    TConnectionMap              m_aConnections;         // remember the master connection in conjunction with the digest
     TSharedConnectionMap        m_aSharedConnection;    // the shared connections with conjunction with an iterator into the connections map
     Reference< XProxyFactory >  m_xProxyFactory;
 
@@ -602,7 +602,7 @@ rtl::OUString ODatabaseSource::getImplementationName(  ) throw(RuntimeException)
 rtl::OUString ODatabaseSource::getImplementationName_static(  ) throw(RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getImplementationName_static" );
-    return rtl::OUString::createFromAscii("com.sun.star.comp.dba.ODatabaseSource");
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.dba.ODatabaseSource"));
 }
 
 Sequence< ::rtl::OUString > ODatabaseSource::getSupportedServiceNames(  ) throw (RuntimeException)
@@ -680,13 +680,13 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const ::rtl::O
         sal_Int32 nArgPos = 0;
         if (sUser.getLength())
         {
-            aUserPwd[ nArgPos ].Name = ::rtl::OUString::createFromAscii("user");
+            aUserPwd[ nArgPos ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user"));
             aUserPwd[ nArgPos ].Value <<= sUser;
             ++nArgPos;
         }
         if (sPwd.getLength())
         {
-            aUserPwd[ nArgPos ].Name = ::rtl::OUString::createFromAscii("password");
+            aUserPwd[ nArgPos ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("password"));
             aUserPwd[ nArgPos ].Value <<= sPwd;
         }
         Reference< XDriver > xDriver;
@@ -876,9 +876,9 @@ namespace
         }
     };
 
-    /** sets a new set of property values at a given property bag instance
+    /** sets a new set of property values for a given property bag instance
 
-        The methods takes a property bag, and a sequence of property values to set at this bag.
+        The method takes a property bag, and a sequence of property values to set for this bag.
         Upon return, every property which is not part of the given sequence is
         <ul><li>removed from the bag, if it's a removeable property</li>
             <li><em>or</em>reset to its default value, if it's not a removeable property</li>
@@ -887,7 +887,7 @@ namespace
         @param  _rxPropertyBag
             the property bag to operate on
         @param  _rAllNewPropertyValues
-            the new property values to set at the bag
+            the new property values to set for the bag
     */
     void lcl_setPropertyValues_resetOrRemoveOther( const Reference< XPropertyAccess >& _rxPropertyBag, const Sequence< PropertyValue >& _rAllNewPropertyValues )
     {
@@ -920,7 +920,7 @@ namespace
                     continue;
 
                 // this property is not to be set, but currently exists in the bag.
-                // -> Remove, respectively default, it
+                // -> Remove it, or reset it to the default.
                 if ( ( pExistentProperty->Attributes & PropertyAttribute::REMOVEABLE ) != 0 )
                     xPropertyContainer->removeProperty( pExistentProperty->Name );
                 else
@@ -952,7 +952,7 @@ void ODatabaseSource::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const
                 break;
             case PROPERTY_ID_USER:
                 rValue >>= m_pImpl->m_sUser;
-                // if the user name changed, reset the password
+                // if the user name has changed, reset the password
                 m_pImpl->m_aPassword = ::rtl::OUString();
                 break;
             case PROPERTY_ID_PASSWORD:
@@ -1031,7 +1031,7 @@ void ODatabaseSource::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) con
                     Sequence< PropertyValue > aValues( m_pImpl->m_xSettings->getPropertyValues() );
 
                     // transform them so that only property values which fulfill certain
-                    // criterions survive
+                    // criteria survive
                     Sequence< PropertyValue > aNonDefaultOrUserDefined( aValues.getLength() );
                     const PropertyValue* pCopyEnd = ::std::remove_copy_if(
                         aValues.getConstArray(),
diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
index ef3c8af0a61b..f670d3b383fc 100644
--- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
+++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
@@ -530,7 +530,7 @@ void ODefinitionContainer::implAppend(const ::rtl::OUString& _rName, const Refer
         ODefinitionContainer_Impl::const_iterator aFind = rDefinitions.find( _rName );
         if ( aFind == rDefinitions.end() )
         {
-            // ensure that the new object thas the proper name.
+            // ensure that the new object has the proper name.
             // Somebody could create an object with name "foo", and insert it as "bar"
             // into a container. In this case, we need to ensure that the object name
             // is also "bar"
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index 498882f5885e..410ee2a52971 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -186,7 +186,7 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments
     {
         MutexGuard aGuard(m_aMutex);
 
-        // extrat known arguments
+        // extract known arguments
         ::rtl::OUString sName, sPersistentName, sURL, sMediaType, sDocServiceName;
         Reference< XCommandProcessor > xCopyFrom;
         Reference< XConnection > xConnection;
@@ -572,7 +572,6 @@ Reference< XComponent > SAL_CALL ODocumentContainer::loadComponentFromURL( const
     }
     catch(WrappedTargetException e)
     {
-        // throw IllegalArgumentException();
         throw;
     }
     return xComp;
@@ -752,8 +751,6 @@ void SAL_CALL ODocumentContainer::removeByName( const ::rtl::OUString& _rName )
     // do the removal
     implRemove(_rName);
 
-    //  disposeComponent(xContent); // no dispose here, the object may be inserted again under a different name
-
     notifyByName( aGuard, _rName, NULL, NULL, E_REMOVED, ContainerListemers );
 }
 
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 305a01363177..3b1dfa8dc649 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -219,7 +219,6 @@ namespace dbaccess
         if ( !m_bInChangingState && nNewState == EmbedStates::RUNNING && nOldState == EmbedStates::ACTIVE && m_pDefinition )
         {
             m_bInChangingState = true;
-            //m_pDefinition->save(sal_False);
             m_bInChangingState = false;
         }
     }
@@ -1509,9 +1508,9 @@ sal_Bool ODocumentDefinition::objectSupportsEmbeddedScripts() const
     bool bAllowDocumentMacros = !m_pImpl->m_pDataSource
                             ||  ( m_pImpl->m_pDataSource->determineEmbeddedMacros() == ODatabaseModelImpl::eSubDocumentMacros );
 
-    // if *any* of the objects of the database document already has macros, we continue to allow it
-    // to have them, until the user did a migration.
-    // If there are no macros, yet, we don't allow to create them
+    // if *any* of the objects of the database document already has macros, we
+    // continue to allow it to have them, until the user does a migration.
+    // If there are no macros, we don't allow them to be created.
 
     return bAllowDocumentMacros;
 }
diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx
index 7fe1d9089bbc..204ad978d2d6 100644
--- a/dbaccess/source/core/dataaccess/intercept.cxx
+++ b/dbaccess/source/core/dataaccess/intercept.cxx
@@ -171,12 +171,12 @@ void SAL_CALL OInterceptor::dispatch( const URL& _URL,const Sequence<PropertyVal
             if ( nInd == aNewArgs.getLength() )
             {
                 aNewArgs.realloc( nInd + 1 );
-                aNewArgs[nInd].Name = ::rtl::OUString::createFromAscii( "SaveTo" );
+                aNewArgs[nInd].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SaveTo"));
                 aNewArgs[nInd].Value <<= sal_True;
             }
 
             Reference< XDispatch > xDispatch = m_xSlaveDispatchProvider->queryDispatch(
-                _URL, ::rtl::OUString::createFromAscii( "_self" ), 0 );
+                _URL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")), 0 );
             if ( xDispatch.is() )
                 xDispatch->dispatch( _URL, aNewArgs );
         }
@@ -204,7 +204,7 @@ IMPL_LINK( OInterceptor, OnDispatch, void*, _pDispatcher )
         if ( m_pContentHolder && m_pContentHolder->prepareClose() && m_xSlaveDispatchProvider.is() )
         {
             Reference< XDispatch > xDispatch = m_xSlaveDispatchProvider->queryDispatch(
-                pHelper->aURL, ::rtl::OUString::createFromAscii( "_self" ), 0 );
+                pHelper->aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")), 0 );
             if ( xDispatch.is() )
             {
                 Reference< ::com::sun::star::document::XEventBroadcaster> xEvtB(m_pContentHolder->getComponent(),UNO_QUERY);
diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx
index 8c2d1eda7c14..63ebe2213306 100644
--- a/dbaccess/source/core/inc/table.hxx
+++ b/dbaccess/source/core/inc/table.hxx
@@ -143,7 +143,6 @@ namespace dbaccess
         DECLARE_SERVICE_INFO();
 
     // com::sun::star::beans::XPropertySet
-        //  virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const;
 
     // ::com::sun::star::sdbcx::XRename,
diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
index bb1fc1cf59b2..3e1fbc1c2b25 100644
--- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
+++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
@@ -119,7 +119,7 @@ uno::Any DatabaseDataProvider::queryInterface(uno::Type const & type) throw (uno
 //------------------------------------------------------------------------------
 rtl::OUString DatabaseDataProvider::getImplementationName_Static(  ) throw(uno::RuntimeException)
 {
-    return rtl::OUString::createFromAscii("com.sun.star.comp.chart2.data.DatabaseDataProvider");
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.chart2.data.DatabaseDataProvider"));
 }
 // -----------------------------------------------------------------------------
 // -------------------------------------------------------------------------
@@ -173,7 +173,6 @@ void SAL_CALL DatabaseDataProvider::initialize(const uno::Sequence< uno::Any > &
 // chart2::data::XDataProvider:
 ::sal_Bool SAL_CALL DatabaseDataProvider::createDataSourcePossible(const uno::Sequence< beans::PropertyValue > & _aArguments) throw (uno::RuntimeException)
 {
-    //::osl::ResettableMutexGuard aClearForNotifies(m_aMutex);
     const beans::PropertyValue* pArgIter = _aArguments.getConstArray();
     const beans::PropertyValue* pArgEnd  = pArgIter + _aArguments.getLength();
     for(;pArgIter != pArgEnd;++pArgIter)
@@ -184,7 +183,7 @@ void SAL_CALL DatabaseDataProvider::initialize(const uno::Sequence< uno::Any > &
             pArgIter->Value >>= eRowSource;
             if ( eRowSource != ::com::sun::star::chart::ChartDataRowSource_COLUMNS )
                 return sal_False;
-        } // if ( pArgIter->Name.equalsAscii("DataRowSource") )
+        }
         else if ( pArgIter->Name.equalsAscii("CellRangeRepresentation") )
         {
             ::rtl::OUString sRange;
diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx
index 39c29c4f4925..50b05d0578a3 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -51,7 +51,6 @@ namespace dbaccess
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::beans;
     using namespace ::com::sun::star::lang;
-    //using namespace ::com::sun::star::sdbc;
 
     namespace
     {
@@ -173,7 +172,7 @@ bool ODsnTypeCollection::isConnectionUrlRequired(const ::rtl::OUString& _sURL) c
             sRet = *aIter;
             sOldPattern = *aIter;
         }
-    } // for(;aIter != aEnd;++aIter)
+    }
     return sRet.GetChar(sRet.Len()-1) == '*';
 }
 // -----------------------------------------------------------------------------
@@ -203,7 +202,7 @@ String ODsnTypeCollection::getDatasourcePrefixFromMediaType(const ::rtl::OUStrin
             if ( !sFileExtension.getLength() && _sExtension.getLength() )
                 sFallbackURL = *pIter;
         }
-    } // for(;pIter != pEnd;++pIter )
+    }
 
     if ( !sURL.Len() && sFallbackURL.Len() )
         sURL = sFallbackURL;
@@ -239,7 +238,7 @@ void ODsnTypeCollection::extractHostNamePort(const ::rtl::OUString& _rDsn,String
         if ( _rsHostname.Len() )
             _rsHostname = _rsHostname.GetToken(_rsHostname.GetTokenCount('@') - 1,'@');
         _sDatabaseName = sUrl.GetToken(sUrl.GetTokenCount(':') - 1,':');
-    } // if ( _rDsn.matchIgnoreAsciiCaseAsciiL("jdbc:oracle:thin:",sizeof("jdbc:oracle:thin:")-1) )
+    }
     else if ( _rDsn.matchIgnoreAsciiCaseAsciiL("sdbc:address:ldap:",sizeof("sdbc:address:ldap:")-1) )
     {
         lcl_extractHostAndPort(sUrl,_sDatabaseName,_nPortNumber);
@@ -334,7 +333,7 @@ bool ODsnTypeCollection::isEmbeddedDatabase( const ::rtl::OUString& _sURL ) cons
             if ( sEmbeddedDatabaseURL.getLength() )
                 aInstalled.getNodeValue(s_sValue + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + sEmbeddedDatabaseURL + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/URL"))) >>= sEmbeddedDatabaseURL;
         }
-    } // if ( aInstalled.isValid() )
+    }
     if ( !sEmbeddedDatabaseURL.getLength() )
         sEmbeddedDatabaseURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:embedded:hsqldb"));
     return sEmbeddedDatabaseURL;
@@ -530,7 +529,7 @@ void ODsnTypeCollection::fillPageIds(const ::rtl::OUString& _sURL,::std::vector<
         {
             sOldPattern = *aIter;
         }
-    } // for(sal_Int32 i = 0;aIter != aEnd;++aIter,++i)
+    }
     return sOldPattern;
 }
 // -----------------------------------------------------------------------------
diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx
index 189e4f1e36e4..5cc8a588f085 100644
--- a/dbaccess/source/core/misc/services.cxx
+++ b/dbaccess/source/core/misc/services.cxx
@@ -64,8 +64,8 @@ namespace dba{
 
 //***************************************************************************************
 //
-// Die vorgeschriebene C-Api muss erfuellt werden!
-// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen.
+// The prescribed C api must be complied with
+// It consists of three functions which must be exported by the module.
 //
 extern "C" void SAL_CALL createRegistryInfo_DBA()
 {
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index c579e014e657..c8c594a6f9cb 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -506,7 +506,7 @@ namespace dbaccess
         case REPORT:
             if ( sModuleIdentifier.equalsAscii( "com.sun.star.report.ReportDefinition" ) )
             {
-                // it's an SRB report desginer
+                // it's an SRB report designer
                 m_aCompDesc.bForEditing = true;
                 break;
             }
diff --git a/dbaccess/source/core/resource/makefile.mk b/dbaccess/source/core/resource/makefile.mk
index 293b92b5e4cf..35a54c6cccdb 100644
--- a/dbaccess/source/core/resource/makefile.mk
+++ b/dbaccess/source/core/resource/makefile.mk
@@ -41,7 +41,10 @@ SRS1NAME=core_strings
 SRC1FILES= \
     strings.src 	\
 
-SLOFILES=	$(SLO)$/core_resource.obj \
+EXCEPTIONSFILES= \
+	$(SLO)$/core_resource.obj
+
+SLOFILES=	$(EXCEPTIONSFILES)
 
 # --- Targets ----------------------------------
 
diff --git a/dbaccess/source/core/resource/strings.src b/dbaccess/source/core/resource/strings.src
index dc7023ca6fba..c431f2cd233d 100644
--- a/dbaccess/source/core/resource/strings.src
+++ b/dbaccess/source/core/resource/strings.src
@@ -32,6 +32,7 @@ String RID_STR_TRIED_OPEN_TABLE
 {
     Text [ en-US ] = "Tried to open the table $name$.";
 };
+
 String RID_STR_CONNECTION_INVALID
 {
     Text [ en-US ] = "No connection could be established.";
@@ -47,7 +48,6 @@ String RID_STR_NEED_CONFIG_WRITE_ACCESS
     Text [ en-US ] = "You have no write access to the configuration data the object is based on.";
 };
 
-
 String RID_STR_COULDNOTCONNECT_UNSPECIFIED
 {
     Text [ en-US ] = "The connection to the external data source could not be established. An unknown error occurred. The driver is probably defective.";
@@ -77,106 +77,132 @@ String RID_STR_DATASOURCE_NOT_STORED
 {
     Text [ en-US ] = "The data source was not saved. Please use the interface XStorable to save the data source.";
 };
+
 String RID_STR_ONLY_QUERY
 {
     Text [ en-US ] = "The given command is not a SELECT statement.\nOnly queries are allowed.";
 };
+
 String RID_STR_NO_VALUE_CHANGED
 {
     Text [ en-US ] = "No values were modified.";
 };
+
 String RID_STR_NO_XROWUPDATE
 {
     Text [ en-US ] = "Values could not be inserted. The XRowUpdate interface is not supported by ResultSet.";
 };
+
 String RID_STR_NO_XRESULTSETUPDATE
 {
     Text [ en-US ] = "Values could not be inserted. The XResultSetUpdate interface is not supported by ResultSet.";
 };
+
 String RID_STR_NO_UPDATE_MISSING_CONDITION
 {
     Text [ en-US ] = "Values could not be modified, due to a missing condition statement.";
 };
+
 String RID_STR_NO_COLUMN_ADD
 {
     Text [ en-US ] = "The adding of columns is not supported.";
 };
+
 String RID_STR_NO_COLUMN_DROP
 {
     Text [ en-US ] = "The dropping of columns is not supported.";
 };
+
 String RID_STR_NO_CONDITION_FOR_PK
 {
     Text [ en-US ] = "The WHERE condition could not be created for the primary key.";
 };
+
 String RID_STR_COLUMN_UNKNOWN_PROP
 {
     Text [ en-US ] = "The column does not support the property '%value'.";
 };
+
 String RID_STR_COLUMN_NOT_SEARCHABLE
 {
     Text [ en-US ] = "The column is not searchable!";
 };
+
 String RID_STR_NOT_SEQUENCE_INT8
 {
     Text [ en-US ] = "The value of the columns is not of the type Sequence<sal_Int8>.";
 };
+
 String RID_STR_COLUMN_NOT_VALID
 {
     Text [ en-US ] = "The column is not valid.";
 };
+
 String RID_STR_COLUMN_MUST_VISIBLE
 {
     Text [ en-US ] = "The column '%name' must be visible as a column.";
 };
+
 String RID_STR_NO_XQUERIESSUPPLIER
 {
     Text [ en-US ] = "The interface XQueriesSupplier is not available.";
 };
+
 String RID_STR_NOT_SUPPORTED_BY_DRIVER
 {
     Text [ en-US ] = "The driver does not support this function.";
 };
+
 String RID_STR_NO_ABS_ZERO
 {
     Text [ en-US ] = "An 'absolute(0)' call is not allowed.";
 };
+
 String RID_STR_NO_RELATIVE
 {
     Text [ en-US ] = "Relative positioning is not allowed in this state.";
 };
+
 String RID_STR_NO_REFESH_AFTERLAST
 {
     Text [ en-US ] = "A row cannot be refreshed when the ResultSet is positioned after the last row.";
 };
+
 String RID_STR_NO_MOVETOINSERTROW_CALLED
 {
     Text [ en-US ] = "A new row cannot be inserted when the ResultSet is not first moved to the insert row.";
 };
+
 String RID_STR_NO_UPDATEROW
 {
     Text [ en-US ] = "A row cannot be modified in this state";
 };
+
 String RID_STR_NO_DELETEROW
 {
     Text [ en-US ] = "A row cannot be deleted in this state.";
 };
+
 String RID_STR_NO_TABLE_RENAME
 {
     Text [ en-US ] = "The driver does not support table renaming.";
 };
+
 String RID_STR_NO_ALTER_COLUMN_DEF
 {
     Text [ en-US ] = "The driver does not support the modification of column descriptions.";
 };
+
 String RID_STR_COLUMN_ALTER_BY_NAME
 {
     Text [ en-US ] = "The driver does not support the modification of column descriptions by changing the name.";
 };
+
 String RID_STR_COLUMN_ALTER_BY_INDEX
 {
     Text [ en-US ] = "The driver does not support the modification of column descriptions by changing the index.";
 };
+
 String RID_STR_FILE_DOES_NOT_EXIST
 {
     Text[ en-US ] = "The file \"$file$\" does not exist.";
@@ -200,7 +226,6 @@ String RID_STR_CONFLICTING_NAMES
 String RID_STR_COMMAND_LEADING_TO_ERROR
 {
     Text [ en-US ] = "The SQL command leading to this error is:\n\n$command$";
-
 };
 
 String RID_STR_STATEMENT_WITHOUT_RESULT_SET
@@ -247,79 +272,99 @@ String RID_NO_SUCH_DATA_SOURCE
 {
     Text [ en-US ] = "Error accessing data source '$name$':\n$error$";
 };
+
 String RID_STR_NO_SUB_FOLDER
 {
     Text [ en-US ] = "There exists no folder named \"$folder$\".";
 };
+
 String RID_STR_NO_DELETE_BEFORE_AFTER
 {
     Text [ en-US ] = "Cannot delete the before-first or after-last row.";
 };
+
 String RID_STR_NO_DELETE_INSERT_ROW
 {
     Text [ en-US ] = "Cannot delete the insert-row.";
 };
+
 String RID_STR_RESULT_IS_READONLY
 {
     Text [ en-US ] = "Result set is read only.";
 };
+
 String RID_STR_NO_DELETE_PRIVILEGE
 {
     Text [ en-US ] = "DELETE privilege not available.";
 };
+
 String RID_STR_ROW_ALREADY_DELETED
 {
     Text [ en-US ] = "Current row is already deleted.";
 };
+
 String RID_STR_UPDATE_FAILED
 {
     Text [ en-US ] = "Current row could be updated.";
 };
+
 //-------------------------------------------------------------------------
+
 String RID_STR_NO_INSERT_PRIVILEGE
 {
     Text [ en-US ] = "INSERT privilege not available.";
 };
+
 String RID_STR_INTERNAL_ERROR
 {
     Text [ en-US ] = "Internal error: no statement object provided by the database driver.";
 };
+
 String RID_STR_EXPRESSION1
 {
     Text [ en-US ] = "Expression1";
 };
+
 String RID_STR_NO_SQL_COMMAND
 {
     Text [ en-US ] = "No SQL command was provided.";
 };
+
 String RID_STR_INVALID_INDEX
 {
     Text [ en-US ] = "Invalid column index.";
 };
+
 String RID_STR_INVALID_CURSOR_STATE
 {
     Text [ en-US ] = "Invalid cursor state.";
 };
+
 String RID_STR_CURSOR_BEFORE_OR_AFTER
 {
     Text [ en-US ] = "The cursor points to before the first or after the last row.";
 };
+
 String RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER
 {
     Text [ en-US ] = "The rows before the first and after the last row don't have a bookmark.";
 };
+
 String RID_STR_NO_BOOKMARK_DELETED
 {
     Text [ en-US ] = "The current row is deleted, and thus doesn't have a bookmark.";
 };
+
 String RID_STR_NO_EMBEDDING
 {
     Text [ en-US ] = "Embedding of database documents is not supported.";
 };
+
 String RID_STR_CONNECTION_REQUEST
 {
     Text [ en-US ] = "A connection for the following URL was requested \"$name$\".";
 };
+
 String RID_STR_MISSING_EXTENSION
 {
     Text [ en-US ] = "The extension is not installed.";
diff --git a/dbaccess/source/ext/adabas/ANewDb.cxx b/dbaccess/source/ext/adabas/ANewDb.cxx
index 3fc0d952cf40..38311fde9076 100644
--- a/dbaccess/source/ext/adabas/ANewDb.cxx
+++ b/dbaccess/source/ext/adabas/ANewDb.cxx
@@ -87,7 +87,7 @@ Reference< XInterface > SAL_CALL OAdabasCreateDialog::Create(const Reference< XM
 //-------------------------------------------------------------------------
 ::rtl::OUString OAdabasCreateDialog::getImplementationName_Static() throw(RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("org.openoffice.comp.adabasui.AdabasCreateDialog");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.adabasui.AdabasCreateDialog"));
 }
 
 //-------------------------------------------------------------------------
@@ -100,7 +100,7 @@ Reference< XInterface > SAL_CALL OAdabasCreateDialog::Create(const Reference< XM
 ::comphelper::StringSequence OAdabasCreateDialog::getSupportedServiceNames_Static() throw(RuntimeException)
 {
     ::comphelper::StringSequence aSupported(1);
-    aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.AdabasCreationDialog");
+    aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.AdabasCreationDialog"));
     return aSupported;
 }
 
diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.cxx b/dbaccess/source/ext/adabas/Acomponentmodule.cxx
index cab3b7170bc2..76f8f113e99c 100644
--- a/dbaccess/source/ext/adabas/Acomponentmodule.cxx
+++ b/dbaccess/source/ext/adabas/Acomponentmodule.cxx
@@ -266,7 +266,7 @@ namespace COMPMOD_NAMESPACE
         {
             ::rtl::OUString aMainKeyName(sRootKey);
             aMainKeyName += *pImplName;
-            aMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES");
+            aMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
 
             try
             {
diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.cxx b/dbaccess/source/ext/adabas/AdabasNewDb.cxx
index 5ba64ae9c5c7..648bc3c990dd 100644
--- a/dbaccess/source/ext/adabas/AdabasNewDb.cxx
+++ b/dbaccess/source/ext/adabas/AdabasNewDb.cxx
@@ -107,7 +107,6 @@ namespace adabasui
         catch(Exception&)
         {
             OSL_ASSERT(0);
-            //  showError(::dbtools::SQLExceptionInfo(e),this,);
         }
     }
     void SAL_CALL ODatabaseCreator::onTerminated()
diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.src b/dbaccess/source/ext/adabas/AdabasNewDb.src
index 33915b06266b..9a3eebb3e9de 100644
--- a/dbaccess/source/ext/adabas/AdabasNewDb.src
+++ b/dbaccess/source/ext/adabas/AdabasNewDb.src
@@ -51,7 +51,8 @@ ModalDialog DLG_ADABAS_NEWDB
         Pos     = MAP_APPFONT ( 12 , 6) ;
         Size    = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
         Text[ en-US ] = "Database ~name";
-};
+    };
+
     Edit ET_DATABASENAME
     {
         Border  = TRUE ;
@@ -66,26 +67,28 @@ ModalDialog DLG_ADABAS_NEWDB
         Pos     = MAP_APPFONT ( 6 , 3 + MOVE_Y) ;
         Size    = MAP_APPFONT ( WIN_X - 12 , 8 ) ;
         Text[ en-US ] = "User settings";
-};
+    };
 
     FixedText FT_CONUSR
     {
         Pos     = MAP_APPFONT ( 12 , 31 + MOVE_Y) ;
         Size    = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
         Text[ en-US ] = "~Control user";
-};
+    };
+
     FixedText FT_SYSUSR
     {
         Pos     = MAP_APPFONT ( 12 , 14 + MOVE_Y) ;
         Size    = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
         Text[ en-US ] = "~Administrator";
-};
+    };
+
     FixedText FT_DOMAIN_USR
     {
         Pos     = MAP_APPFONT ( 12 , 48 + MOVE_Y) ;
         Size    = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
         Text[ en-US ] = "~Domain user";
-};
+    };
 
     Edit ET_SYSUSR
     {
@@ -103,7 +106,7 @@ ModalDialog DLG_ADABAS_NEWDB
         TabStop = TRUE ;
         HelpID  = HID_DLG_ADABAS_SYSPWD ;
         Text[ en-US ] = "P~assword...";
-};
+    };
 
     Edit ET_CONUSR
     {
@@ -121,7 +124,8 @@ ModalDialog DLG_ADABAS_NEWDB
         TabStop = TRUE ;
         HelpID  = HID_DLG_ADABAS_CONPWD ;
         Text[ en-US ] = "~Password...";
-};
+    };
+
     Edit ET_DOMAIN_USR
     {
         Pos     = MAP_APPFONT ( 77 + ADJUST_X, 47 + MOVE_Y) ;
@@ -140,7 +144,7 @@ ModalDialog DLG_ADABAS_NEWDB
         TabStop = TRUE ;
         HelpID  = HID_DLG_ADABAS_DOMAINPWD ;
         Text[ en-US ] = "Passwo~rd...";
-};
+    };
 
     FixedImage BMP_CON
     {
@@ -148,12 +152,14 @@ ModalDialog DLG_ADABAS_NEWDB
         Size    = MAP_APPFONT ( 20 , 20 ) ;
         HelpID  = HID_DLG_ADABAS_CON_PWD ;
     };
+
     FixedImage BMP_SYS
     {
         Pos     = MAP_APPFONT ( 240 , 11 + MOVE_Y) ;
         Size    = MAP_APPFONT ( 20 , 20 ) ;
         HelpID  = HID_DLG_ADABAS_SYS_PWD ;
     };
+
     FixedImage BMP_DOMAIN
     {
         Pos     = MAP_APPFONT ( 240 , 44 + MOVE_Y) ;
@@ -166,7 +172,7 @@ ModalDialog DLG_ADABAS_NEWDB
         Pos     = MAP_APPFONT ( 12 , 13 + MOVE_Y) ;
         Size    = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
         Text[ en-US ] = "~Backup file";
-};
+    };
 
     Edit ET_RESTORE
     {
@@ -184,7 +190,7 @@ ModalDialog DLG_ADABAS_NEWDB
         TabStop = TRUE ;
         HelpID  = HID_DLG_ADABAS_PBRESTORE ;
         Text[ en-US ]   = "...";
-};
+    };
 
     /* DEVSPACE positions */
     FixedLine FL_DBSETTINGS
@@ -192,28 +198,28 @@ ModalDialog DLG_ADABAS_NEWDB
         Pos     = MAP_APPFONT ( 6 , 70 + MOVE_Y) ;
         Size    = MAP_APPFONT ( WIN_X - 12 , 8 ) ;
         Text[ en-US ] = "Database settings";
-};
+    };
 
     FixedText FT_SYSDEVSPACE
     {
         Pos     = MAP_APPFONT ( 12 , 83 + MOVE_Y) ;
         Size    = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ;
         Text[ en-US ] = "S~YSDEVSPACE";
-};
+    };
 
     FixedText FT_TRANSACTIONLOG
     {
         Pos     = MAP_APPFONT ( 12 , 99 + MOVE_Y) ;
         Size    = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ;
         Text[ en-US ] = "TRANSACTI~ONLOG";
-};
+    };
 
     FixedText FT_DATADEVSPACE
     {
         Pos     = MAP_APPFONT ( 12 , 116 + MOVE_Y) ;
         Size    = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ;
         Text[ en-US ] = "DATAD~EVSPACE";
-};
+    };
 
     Edit ET_SYSDEVSPACE
     {
@@ -231,7 +237,7 @@ ModalDialog DLG_ADABAS_NEWDB
         TabStop = TRUE ;
         HelpID  = HID_DLG_ADABAS_PBSYSDEVSPACE ;
         Text[ en-US ]   = "...";
-};
+    };
 
     Edit ET_TRANSACTIONLOG
     {
@@ -249,7 +255,7 @@ ModalDialog DLG_ADABAS_NEWDB
         TabStop = TRUE ;
         HelpID  = HID_DLG_ADABAS_PBTRANSACTIONLOG ;
         Text[ en-US ] = "...";
-};
+    };
 
     Edit ET_DATADEVSPACE
     {
@@ -260,7 +266,6 @@ ModalDialog DLG_ADABAS_NEWDB
         HelpID  = HID_DLG_ADABAS_DATADEVSPACE ;
     };
 
-
     PushButton PB_DATADEVSPACE
     {
         Pos     = MAP_APPFONT ( WIN_X - 24, 114 + MOVE_Y) ;
@@ -268,14 +273,16 @@ ModalDialog DLG_ADABAS_NEWDB
         TabStop = TRUE ;
         HelpID  = HID_DLG_ADABAS_PBDATADEVSPACE ;
         Text[ en-US ] = "...";
-};
+    };
+
     /* DEVSPACE sizes */
     FixedText FT_TRANSACTIONLOG_SIZE
     {
         Pos = MAP_APPFONT ( 12 , 133 + MOVE_Y) ;
         Size = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ;
         Text[ en-US ] = "Transaction ~file (MB)";
-};
+    };
+
     NumericField NF_TRANSACTIONLOG_SIZE
     {
         Pos             = MAP_APPFONT ( 77 + ADJUST_X, 131 + MOVE_Y) ;
@@ -283,15 +290,17 @@ ModalDialog DLG_ADABAS_NEWDB
         Border          = TRUE ;
         TabStop         = TRUE ;
         Spin            = TRUE ;
-StrictFormat    = TRUE;
+        StrictFormat    = TRUE;
         HelpID  = HID_DLG_ADABAS_TRANSACTIONLOG_SIZE ;
     };
+
     FixedText FT_DATADEVSPACE_SIZE
     {
         Pos = MAP_APPFONT ( 12 , 150 + MOVE_Y) ;
         Size = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ;
         Text[ en-US ] = "Data~base size (MB)";
-};
+    };
+
     NumericField NF_DATADEVSPACE_SIZE
     {
         Pos             = MAP_APPFONT ( 77 + ADJUST_X, 148 + MOVE_Y) ;
@@ -299,15 +308,17 @@ StrictFormat    = TRUE;
         Border          = TRUE ;
         TabStop         = TRUE ;
         Spin            = TRUE ;
-StrictFormat    = TRUE;
+        StrictFormat    = TRUE;
         HelpID  = HID_DLG_ADABAS_DATADEVSPACE_SIZE ;
     };
+
     FixedText FT_CACHE_SIZE
     {
         Pos = MAP_APPFONT ( 12 , 167 + MOVE_Y) ;
         Size = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ;
         Text[ en-US ] = "Data ~buffer size (MB)";
-};
+    };
+
     NumericField NF_CACHE_SIZE
     {
         Pos             = MAP_APPFONT ( 77 + ADJUST_X, 165 + MOVE_Y) ;
@@ -315,14 +326,16 @@ StrictFormat    = TRUE;
         Border          = TRUE ;
         TabStop         = TRUE ;
         Spin            = TRUE ;
-StrictFormat    = TRUE;
+        StrictFormat    = TRUE;
         HelpID          = HID_DLG_ADABAS_CACHE_SIZE ;
     };
+
     FixedLine FL_END
     {
         Pos     = MAP_APPFONT ( 0 , WIN_Y - 24 + MOVE_Y) ;
         Size    = MAP_APPFONT ( WIN_X , 1 ) ;
     };
+
     OKButton PB_OK
     {
         Pos         = MAP_APPFONT ( WIN_X - 112, WIN_Y - 20 + MOVE_Y) ;
@@ -330,6 +343,7 @@ StrictFormat    = TRUE;
         TabStop     = TRUE ;
         DefButton   = TRUE ;
     };
+
     CancelButton PB_CANCEL
     {
         Pos         = MAP_APPFONT ( WIN_X - 56 , WIN_Y - 20+ MOVE_Y) ;
@@ -340,26 +354,29 @@ StrictFormat    = TRUE;
     String STR_BACKUPFILE_LOAD
     {
         Text[ en-US ]   = "Backup file information";
-};
+    };
 
     Text[ en-US ] = "Create New Adabas D Database";
 };
 
 Image CHECK_GREEN
 {
-    ImageBitmap = Bitmap { File = "nu07.bmp"; };
+    ImageBitmap = Bitmap { File = "nu07.png"; };
     MaskColor   = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
 };
+
 Image UNCHECK_RED
 {
-    ImageBitmap = Bitmap { File = "nu08.bmp"; };
+    ImageBitmap = Bitmap { File = "nu08.png"; };
     MaskColor   = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
 };
+
 Image DEFAULT_BLUE
 {
-    ImageBitmap = Bitmap { File = "nu09.bmp"; };
+    ImageBitmap = Bitmap { File = "nu09.png"; };
     MaskColor   = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
 };
+
 /* Fehlermeldungen beim Erstellen einer Adabas DB */
 
 String STR_ADABAS_NO_PARAM_SET
@@ -376,6 +393,7 @@ String STR_ADABAS_NO_SYSTEM_TABLES
 {
     Text[ en-US ]   = "An error occurred as the system tables were being created.";
 };
+
 String STR_ADABAS_NO_BACKUP_FILE
 {
     Text[ en-US ]   = "The backup file entered does not exist.";
@@ -390,10 +408,12 @@ String STR_NO_SAME_USER
 {
     Text[ en-US ] = "The administrator and the control user cannot have the same name!";
 };
+
 String STR_DEVSPACE_NO_FILE
 {
     Text[ en-US ] = "No name has been entered for the $name$ file!";
 };
+
 String STR_NO_PERMISSION
 {
     Text[ en-US ] = "You have to have administrator rights to create a new database!";
@@ -423,11 +443,12 @@ String STR_ADABAS_CREATEPARAM_FILE
 {
     Text [ en-US ] = "Creating database configuration file." ;
 };
+
 String STR_ADABAS_START_DATABASE
 {
     Text [ en-US ] = "Starting database for the first time." ;
-
 };
+
 String STR_ADABAS_DB_EXISTS
 {
     Text[ en-US ] = "The name entered already exists.";
@@ -452,4 +473,3 @@ String STR_ADABAS_PASSWORD_ILLEGAL
 {
     Text[ en-US ] = "Spaces are not permitted in the password. Please enter a new password.";
 };
-
diff --git a/dbaccess/source/ext/macromigration/macromigration.src b/dbaccess/source/ext/macromigration/macromigration.src
index 9742dcdfec71..b00ce03925ec 100644
--- a/dbaccess/source/ext/macromigration/macromigration.src
+++ b/dbaccess/source/ext/macromigration/macromigration.src
@@ -339,6 +339,7 @@ TabPage TP_SUMMARY
     {
         Text [ en-US ] = "The migration was successful. Below is a log of the actions which have been taken to your document.";
     };
+
     String STR_UNSUCCESSFUL
     {
         Text [ en-US ] = "The migration was not successful. Examine the migration log below for details.";
@@ -443,10 +444,12 @@ String STR_INVALID_NUMBER_ARGS
 {
     Text [ en-US ] = "Invalid number of initialization arguments. Expected 1.";
 };
+
 String STR_NO_DATABASE
 {
     Text [ en-US ] = "No database document found in the initializatin arguments.";
 };
+
 String STR_NOT_READONLY
 {
     Text [ en-US ] = "Not applicable to read-only documents.";
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx
index ec884adb3474..f5ef73f23589 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -1163,7 +1163,7 @@ namespace dbmm
         aProgressMixer.registerPhase( PHASE_PYTHON, 1 );
         aProgressMixer.registerPhase( PHASE_JAVA, 1 );
         aProgressMixer.registerPhase( PHASE_BASIC, 5 );
-            // more weight than then others, assuming that usually, there are much more Basic macros than any other scripts
+            // more weight than the others, assuming that usually, there are many more Basic macros than any other scripts
         aProgressMixer.registerPhase( PHASE_DIALOGS, 1 );
 
         bool bSuccess = impl_checkScriptStorageStructure_nothrow( aSubDocument );
@@ -1223,7 +1223,7 @@ namespace dbmm
             const ::rtl::OUString& _rSourceLibName, const Reference< XNameAccess >& _rxTargetContainer )
         {
             // The new library name is composed from the prefix, the base name, and the old library name.
-            const ::rtl::OUString sPrefix( ::rtl::OUString::createFromAscii( _rDocument.eType == eForm ? "Form_" : "Report_" ) );
+            const ::rtl::OUString sPrefix = (_rDocument.eType == eForm)?rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Form_")): rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Report_"));
 
             ::rtl::OUString sBaseName( _rDocument.sHierarchicalName.copy(
                 _rDocument.sHierarchicalName.lastIndexOf( '/' ) + 1 ) );
@@ -1232,7 +1232,7 @@ namespace dbmm
             // The bug requesting to change this is #i95409#.
             // Unfortunately, the storage implementation does not complain if you use invalid characters/names, but instead
             // it silently accepts them, and produces garbage in the file (#i95408).
-            // So, until especially the former is fixed, we need to strip the name from all invalid characters.
+            // So, until especially the former is fixed, we need to strip all invalid characters from the name.
             // #i95865# / 2008-11-06 / frank.schoenheit@sun.com
 
             // The general idea is to replace invalid characters with '_'. However, since "valid" essentially means
diff --git a/dbaccess/source/filter/migration/cfgimport.cxx b/dbaccess/source/filter/migration/cfgimport.cxx
index a6eb5b7b073b..dcfa5324026c 100644
--- a/dbaccess/source/filter/migration/cfgimport.cxx
+++ b/dbaccess/source/filter/migration/cfgimport.cxx
@@ -302,7 +302,7 @@ void LoadTableFieldDesc(const Reference< XObjectInputStream>& _rxIn,PropertyValu
     ::rtl::OUString     aFieldName;     // column
     ::rtl::OUString     aFieldAlias;    // column alias
     ::rtl::OUString     aDatabaseName;  // qualifier or catalog
-    ::rtl::OUString     aFunctionName;  // enth"alt den Funktionsnamen, nur wenn eFunctionType != FKT_NONE gesetzt
+    ::rtl::OUString     aFunctionName;  // contains the function name if eFunctionType != FKT_NONE
 
     sal_Int32           eDataType;
     sal_Int32           eFunctionType;
@@ -393,7 +393,7 @@ sal_Bool isDocumentReport(const Reference< XMultiServiceFactory >& _xORB,const :
                 aMedDescr[nPos++].Value <<= sal_False;
                 aMedDescr[nPos].Name = PROPERTY_URL;
                 aMedDescr[nPos++].Value <<= _sDocumentLocation;
-                aMedDescr[nPos].Name = ::rtl::OUString::createFromAscii( "ReadOnly" );
+                aMedDescr[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
                 aMedDescr[nPos++].Value <<= sal_True;
                 Reference< XTypeDetection > xTypeDetection(_xORB->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection")) ),UNO_QUERY );
 
@@ -509,7 +509,7 @@ void OCfgImport::createDataSource(const ::rtl::OUString& _sName)
         while( aRet.SearchAndReplaceAscii( "*.", String() ) != STRING_NOTFOUND ) ;
         sExtension = aRet;
     }
-    // then look for which of them settings are stored in the configuration
+    // then look for which of the settings are stored in the configuration
     ::rtl::OUString sFileName;
     try
     {
@@ -693,9 +693,6 @@ void SAL_CALL OCfgImport::addOrReplaceNode(
                 break;
         }
     }
-    /*if ( aName.equalsAscii("org.openoffice.Office.DataAccess") )
-        m_aStack.push(TElementStack::value_type(aName,0));
-    else*/
     if ( aName.equalsAscii("DataSources") )
         m_aStack.push(TElementStack::value_type(aName,DATASOURCES));
     else if ( aName.equalsAscii("DataSourceSettings") )
@@ -1111,8 +1108,8 @@ void SAL_CALL  OCfgImport::setPropertyValue(
                             if ( aInputSequence.getLength() )
                             {
                                 Reference< XInputStream>       xInStreamHelper = new SequenceInputStream(aInputSequence);;  // used for wrapping sequence to xinput
-                                Reference< XObjectInputStream> xInStream = Reference< XObjectInputStream >(m_xORB->createInstance(::rtl::OUString::createFromAscii("com.sun.star.io.ObjectInputStream")),UNO_QUERY);
-                                Reference< XInputStream> xMarkInStream = Reference< XInputStream >(m_xORB->createInstance(::rtl::OUString::createFromAscii("com.sun.star.io.MarkableInputStream")),UNO_QUERY);
+                                Reference< XObjectInputStream> xInStream = Reference< XObjectInputStream >(m_xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.ObjectInputStream"))),UNO_QUERY);
+                                Reference< XInputStream> xMarkInStream = Reference< XInputStream >(m_xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.MarkableInputStream"))),UNO_QUERY);
                                 Reference< XActiveDataSink >(xMarkInStream,UNO_QUERY)->setInputStream(xInStreamHelper);
                                 Reference< XActiveDataSink >   xInDataSource(xInStream, UNO_QUERY);
                                 OSL_ENSURE(xInDataSource.is(),"Couldn't create com.sun.star.io.ObjectInputStream!");
diff --git a/dbaccess/source/filter/migration/makefile.mk b/dbaccess/source/filter/migration/makefile.mk
index 7bb53208d9d0..9d4b95035a2a 100644
--- a/dbaccess/source/filter/migration/makefile.mk
+++ b/dbaccess/source/filter/migration/makefile.mk
@@ -63,7 +63,6 @@ SHL1STDLIBS=\
 SHL1DEPN=
 SHL1LIBS=$(LIB1TARGET)
 SHL1IMPLIB=	i$(SHL1TARGET)
-# SHL1LIBS=	$(SLB)$/$(TARGET).lib
 SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index 715e58000ec2..6e2663ef0d79 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -122,7 +122,7 @@ public:
     // static methods
     static ::rtl::OUString          getImplementationName_Static() throw(  )
     {
-        return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbflt.DBTypeDetection");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbflt.DBTypeDetection"));
     }
     static Sequence< ::rtl::OUString> getSupportedServiceNames_Static(void) throw(  );
     static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
@@ -231,7 +231,7 @@ Sequence< ::rtl::OUString > SAL_CALL DBTypeDetection::getSupportedServiceNames(v
 Sequence< ::rtl::OUString > DBTypeDetection::getSupportedServiceNames_Static(void) throw(  )
 {
     Sequence< ::rtl::OUString > aSNS( 1 );
-    aSNS.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExtendedTypeDetection");
+    aSNS.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExtendedTypeDetection"));
     return aSNS;
 }
 // -------------------------------------------------------------------------
@@ -262,7 +262,7 @@ public:
     // static methods
     static ::rtl::OUString          getImplementationName_Static() throw(  )
     {
-        return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbflt.DBContentLoader2");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbflt.DBContentLoader2"));
     }
     static Sequence< ::rtl::OUString> getSupportedServiceNames_Static(void) throw(  );
     static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
@@ -330,7 +330,7 @@ Sequence< ::rtl::OUString > SAL_CALL DBContentLoader::getSupportedServiceNames(v
 Sequence< ::rtl::OUString > DBContentLoader::getSupportedServiceNames_Static(void) throw(  )
 {
     Sequence< ::rtl::OUString > aSNS( 1 );
-    aSNS.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.frame.FrameLoader");
+    aSNS.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.FrameLoader"));
     return aSNS;
 }
 
@@ -643,17 +643,17 @@ extern "C" void SAL_CALL writeDBLoaderInfo2(void* pRegistryKey)
     Reference< XRegistryKey> xKey(reinterpret_cast< XRegistryKey*>(pRegistryKey));
 
     // register content loader for dispatch
-    ::rtl::OUString aImpl = ::rtl::OUString::createFromAscii("/");
+    ::rtl::OUString aImpl(RTL_CONSTASCII_USTRINGPARAM("/"));
     aImpl += ::dbaxml::DBContentLoader::getImplementationName_Static();
 
     ::rtl::OUString aImpltwo = aImpl;
-    aImpltwo += ::rtl::OUString::createFromAscii("/UNO/Loader");
+    aImpltwo += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/Loader"));
     Reference< XRegistryKey> xNewKey = xKey->createKey( aImpltwo );
     aImpltwo = aImpl;
-    aImpltwo += ::rtl::OUString::createFromAscii("/Loader");
+    aImpltwo += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/Loader"));
     Reference< XRegistryKey >  xLoaderKey = xKey->createKey( aImpltwo );
-    xNewKey = xLoaderKey->createKey( ::rtl::OUString::createFromAscii("Pattern") );
-    xNewKey->setAsciiValue( ::rtl::OUString::createFromAscii("private:factory/sdatabase") );
+    xNewKey = xLoaderKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Pattern")) );
+    xNewKey->setAsciiValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/sdatabase")) );
 }
 // -----------------------------------------------------------------------------
 
diff --git a/dbaccess/source/filter/xml/makefile.mk b/dbaccess/source/filter/xml/makefile.mk
index 6c6091c5f69e..3f3b0219512b 100644
--- a/dbaccess/source/filter/xml/makefile.mk
+++ b/dbaccess/source/filter/xml/makefile.mk
@@ -103,7 +103,6 @@ SHL1STDLIBS+= \
 SHL1DEPN=
 SHL1LIBS=$(LIB1TARGET)
 SHL1IMPLIB=	i$(SHL1TARGET)
-# SHL1LIBS=	$(SLB)$/$(TARGET).lib
 SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 
diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx b/dbaccess/source/filter/xml/xmlColumn.cxx
index ba826ebdc721..40a1242a4377 100644
--- a/dbaccess/source/filter/xml/xmlColumn.cxx
+++ b/dbaccess/source/filter/xml/xmlColumn.cxx
@@ -101,7 +101,6 @@ OXMLColumn::OXMLColumn( ODBFilter& rImport
             case XML_TOK_COLUMN_DEFAULT_VALUE:
                 if ( sValue.getLength() && sType.getLength() )
                     m_aDefaultValue <<= sValue;
-                //    SvXMLUnitConverter::convertAny(m_aDefaultValue,sType,sValue);
                 break;
             case XML_TOK_COLUMN_VISIBLE:
                 m_bHidden = sValue.equalsAscii("false");
@@ -152,7 +151,7 @@ void OXMLColumn::EndElement()
                         pAutoStyle->FillPropertySet(xProp);
                     }
                 }
-            } // if ( m_sStyleName.getLength() )
+            }
             if ( m_sCellStyleName.getLength() )
             {
                 const SvXMLStylesContext* pAutoStyles = GetOwnImport().GetAutoStyles();
@@ -169,7 +168,7 @@ void OXMLColumn::EndElement()
             }
 
         }
-    } // if ( xFac.is() && m_sName.getLength() )
+    }
     else if ( m_sCellStyleName.getLength() )
     {
         const SvXMLStylesContext* pAutoStyles = GetOwnImport().GetAutoStyles();
diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
index 5aac0f307824..ad1b238ee836 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
@@ -131,7 +131,7 @@ OXMLDataSourceInfo::OXMLDataSourceInfo( ODBFilter& rImport
                 aProperty.Name = INFO_THOUSANDSDELIMITER;
                 aProperty.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
                 rImport.addInfo(aProperty);
-            } // if ( !bFoundThousand )
+            }
         }
         if ( XML_TOK_FONT_CHARSET == _nToken && !bFoundCharset )
         {
diff --git a/dbaccess/source/filter/xml/xmlDocuments.cxx b/dbaccess/source/filter/xml/xmlDocuments.cxx
index 99e981a581d7..259425f2aff0 100644
--- a/dbaccess/source/filter/xml/xmlDocuments.cxx
+++ b/dbaccess/source/filter/xml/xmlDocuments.cxx
@@ -105,7 +105,6 @@ SvXMLImportContext* OXMLDocuments::CreateChildContext(
             GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
             pContext = new OXMLComponent( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_sComponentServiceName );
             break;
-        //  case XML_TOK_QUERY_COLLECTION:
         case XML_TOK_COMPONENT_COLLECTION:
             GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
             pContext = new OXMLHierarchyCollection( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_sCollectionServiceName,m_sComponentServiceName );
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 40e2341cdecc..10ede93e8c17 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -118,13 +118,13 @@ namespace dbaxml
     //---------------------------------------------------------------------
     ::rtl::OUString SAL_CALL ODBExportHelper::getImplementationName_Static(  ) throw (RuntimeException)
     {
-        return ::rtl::OUString::createFromAscii("com.sun.star.comp.sdb.XMLSettingsExporter");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdb.XMLSettingsExporter"));
     }
     //---------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL ODBExportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
     {
         Sequence< ::rtl::OUString > aSupported(1);
-        aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExportFilter");
+        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter"));
         return aSupported;
     }
 
@@ -137,13 +137,13 @@ namespace dbaxml
     //---------------------------------------------------------------------
     ::rtl::OUString SAL_CALL ODBFullExportHelper::getImplementationName_Static(  ) throw (RuntimeException)
     {
-        return ::rtl::OUString::createFromAscii("com.sun.star.comp.sdb.XMLFullExporter");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdb.XMLFullExporter"));
     }
     //---------------------------------------------------------------------
     Sequence< ::rtl::OUString > SAL_CALL ODBFullExportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
     {
         Sequence< ::rtl::OUString > aSupported(1);
-        aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExportFilter");
+        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter"));
         return aSupported;
     }
 
@@ -241,36 +241,32 @@ ODBExport::ODBExport(const Reference< XMultiServiceFactory >& _rxMSF,sal_uInt16
     m_xExportHelper = new SvXMLExportPropertyMapper(GetTableStylesPropertySetMapper());
     m_xColumnExportHelper = new OSpecialHanldeXMLExportPropertyMapper(GetColumnStylesPropertySetMapper());
 
-    //UniReference < XMLPropertySetMapper > xCellStylesPropertySetMapper = new XMLPropertySetMapper(OXMLHelper::GetCellStylesPropertySetMapper(),m_xPropHdlFactory);
-    //m_xCellExportHelper = new OSpecialHanldeXMLExportPropertyMapper(xCellStylesPropertySetMapper);
-    //m_xCellExportHelper = new OSpecialHanldeXMLExportPropertyMapper(GetCellStylesPropertySetMapper());
-    //m_xCellExportHelper->ChainExportMapper(XMLTextParagraphExport::CreateParaExtPropMapper(*this));
     m_xCellExportHelper = new OSpecialHanldeXMLExportPropertyMapper(GetCellStylesPropertySetMapper());
     m_xRowExportHelper = new OSpecialHanldeXMLExportPropertyMapper(OXMLHelper::GetRowStylesPropertySetMapper());
 
     GetAutoStylePool()->AddFamily(
         XML_STYLE_FAMILY_TABLE_TABLE,
-        rtl::OUString::createFromAscii( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME ),
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME )),
         m_xExportHelper.get(),
-        rtl::OUString::createFromAscii( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX ));
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX )));
 
     GetAutoStylePool()->AddFamily(
         XML_STYLE_FAMILY_TABLE_COLUMN,
-        rtl::OUString::createFromAscii( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ),
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME )),
         m_xColumnExportHelper.get(),
-        rtl::OUString::createFromAscii( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX ));
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX )));
 
     GetAutoStylePool()->AddFamily(
         XML_STYLE_FAMILY_TABLE_CELL,
-        rtl::OUString::createFromAscii( XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME ),
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME )),
         m_xCellExportHelper.get(),
-        rtl::OUString::createFromAscii( XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX ));
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX )));
 
     GetAutoStylePool()->AddFamily(
         XML_STYLE_FAMILY_TABLE_ROW,
-        rtl::OUString::createFromAscii( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME ),
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME )),
         m_xRowExportHelper.get(),
-        rtl::OUString::createFromAscii( XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX ));
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX )));
 }
 // -----------------------------------------------------------------------------
 IMPLEMENT_SERVICE_INFO1_STATIC( ODBExport, "com.sun.star.comp.sdb.DBExportFilter", "com.sun.star.document.ExportFilter")
@@ -574,7 +570,7 @@ void ODBExport::exportConnectionData()
                         sURL.append(sal_Unicode('/'));
 
                     AddAttribute(XML_NAMESPACE_XLINK,XML_HREF,GetRelativeReference(sURL.makeStringAndClear()));
-                } // if ( sOrigUrl == sFileName )
+                }
                 else
                     AddAttribute(XML_NAMESPACE_XLINK,XML_HREF,sOrigUrl);
                 AddAttribute(XML_NAMESPACE_DB,XML_MEDIA_TYPE,m_aTypeCollection.getMediaType(sValue));
@@ -595,7 +591,6 @@ void ODBExport::exportConnectionData()
                 }
                 catch(const Exception&)
                 {
-                    // nii
                 }
                 SvXMLElementExport aFileBasedDB(*this,XML_NAMESPACE_DB, XML_FILE_BASED_DATABASE, sal_True, sal_True);
             }
@@ -1234,9 +1229,9 @@ void ODBExport::exportAutoStyle(XPropertySet* _xProp)
                         }
                     }
                     ++aItr;
-                } // while ( aItr != aEnd )
+                }
 
-            } // if ( !aPropStates.empty() )
+            }
             if ( XML_STYLE_FAMILY_TABLE_CELL == pExportHelper[i].second.second )
                 ::std::copy( m_aCurrentPropertyStates.begin(), m_aCurrentPropertyStates.end(), ::std::back_inserter( aPropStates ));
             if ( !aPropStates.empty() )
diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx b/dbaccess/source/filter/xml/xmlHelper.cxx
index 99807b88a5b6..4854bdce71fd 100644
--- a/dbaccess/source/filter/xml/xmlHelper.cxx
+++ b/dbaccess/source/filter/xml/xmlHelper.cxx
@@ -91,34 +91,6 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetTableStylesPropertySetMappe
 {
     static const XMLPropertyMapEntry s_aTableStylesProperties[] =
     {
-        //MAP_CONST( PROPERTY_FONTNAME,         XML_NAMESPACE_STYLE,    XML_FONT_NAME,              XML_TYPE_STRING, 0 ),
-        //MAP_CONST( PROPERTY_TEXTCOLOR,            XML_NAMESPACE_FO,       XML_COLOR,                  XML_TYPE_COLOR, 0 ),
-        //MAP_CONST( PROPERTY_TEXTLINECOLOR,        XML_NAMESPACE_STYLE,    XML_TEXT_UNDERLINE_COLOR,   XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ),
-
-        //MAP_CONST( PROPERTY_TEXTRELIEF,           XML_NAMESPACE_STYLE,    XML_FONT_RELIEF,                XML_TYPE_TEXT_FONT_RELIEF|MID_FLAG_MULTI_PROPERTY, 0 ),
-        //MAP_CONST( PROPERTY_TEXTEMPHASIS,     XML_NAMESPACE_STYLE,    XML_TEXT_EMPHASIZE,             XML_TYPE_CONTROL_TEXT_EMPHASIZE, 0 ),
-        //MAP_CONST( PROPERTY_FONTCHARWIDTH,        XML_NAMESPACE_STYLE,    XML_FONT_CHAR_WIDTH,            XML_TYPE_NUMBER16, 0 ),
-        //MAP_CONST( PROPERTY_FONTCHARSET,      XML_NAMESPACE_STYLE,    XML_FONT_CHARSET,               XML_TYPE_TEXT_FONTENCODING, 0 ),
-        //MAP_CONST( PROPERTY_FONTFAMILY,           XML_NAMESPACE_STYLE,    XML_FONT_FAMILY_GENERIC,        XML_TYPE_TEXT_FONTFAMILY, 0 ),
-        //MAP_CONST( PROPERTY_FONTHEIGHT,           XML_NAMESPACE_FO,       XML_FONT_SIZE,                  XML_TYPE_MEASURE16, 0 ),
-        //MAP_CONST( PROPERTY_FONTKERNING,      XML_NAMESPACE_STYLE,    XML_LETTER_KERNING,             XML_TYPE_BOOL, 0 ),
-        //
-        //MAP_CONST( PROPERTY_FONTORIENTATION,  XML_NAMESPACE_STYLE,    XML_ROTATION_ANGLE,             XML_TYPE_ROTATION_ANGLE, 0 ),
-        //MAP_CONST( PROPERTY_FONTPITCH,            XML_NAMESPACE_STYLE,    XML_FONT_PITCH,                 XML_TYPE_TEXT_FONTPITCH, 0 ),
-        //MAP_CONST( PROPERTY_FONTSLANT,            XML_NAMESPACE_FO,       XML_FONT_STYLE,                 XML_TYPE_TEXT_POSTURE, 0 ),
-        //MAP_CONST_ASCII( "CharStrikeout",     XML_NAMESPACE_STYLE,    XML_TEXT_LINE_THROUGH_STYLE,    XML_TYPE_TEXT_CROSSEDOUT_STYLE|MID_FLAG_MERGE_PROPERTY, 0),
-        //MAP_CONST_ASCII( "CharStrikeout",     XML_NAMESPACE_STYLE,    XML_TEXT_LINE_THROUGH_TYPE,     XML_TYPE_TEXT_CROSSEDOUT_TYPE|MID_FLAG_MERGE_PROPERTY,  0),
-        //MAP_CONST_ASCII( "CharStrikeout",     XML_NAMESPACE_STYLE,    XML_TEXT_LINE_THROUGH_WIDTH,    XML_TYPE_TEXT_CROSSEDOUT_WIDTH|MID_FLAG_MERGE_PROPERTY, 0),
-        //MAP_CONST_ASCII( "CharStrikeout",     XML_NAMESPACE_STYLE,    XML_TEXT_LINE_THROUGH_TEXT,     XML_TYPE_TEXT_CROSSEDOUT_TEXT|MID_FLAG_MERGE_PROPERTY,  0),
-        //MAP_CONST( PROPERTY_FONTSTYLENAME,        XML_NAMESPACE_STYLE,    XML_FONT_STYLE_NAME,            XML_TYPE_STRING, 0 ),
-        //MAP_CONST_ASCII( "CharUnderline",     XML_NAMESPACE_STYLE,    XML_TEXT_UNDERLINE_STYLE,       XML_TYPE_TEXT_UNDERLINE_STYLE|MID_FLAG_MERGE_PROPERTY, 0 ),
-        //MAP_CONST_ASCII( "CharUnderline",     XML_NAMESPACE_STYLE,    XML_TEXT_UNDERLINE_TYPE,        XML_TYPE_TEXT_UNDERLINE_TYPE|MID_FLAG_MERGE_PROPERTY, 0 ),
-        //MAP_CONST_ASCII( "CharUnderline",     XML_NAMESPACE_STYLE,    XML_TEXT_UNDERLINE_WIDTH,       XML_TYPE_TEXT_UNDERLINE_WIDTH|MID_FLAG_MERGE_PROPERTY, 0 ),
-        //MAP_CONST_ASCII( "CharUnderlineColor",    XML_NAMESPACE_STYLE,    XML_TEXT_UNDERLINE_COLOR,       XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0    ),
-        //MAP_CONST_ASCII( "CharUnderlineHasColor",XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR,       XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, 0    ),
-        //MAP_CONST( PROPERTY_FONTWEIGHT,           XML_NAMESPACE_FO,       XML_FONT_WEIGHT,                XML_TYPE_TEXT_WEIGHT, 0 ),
-        //MAP_CONST( PROPERTY_FONTWIDTH,            XML_NAMESPACE_STYLE,    XML_FONT_WIDTH,                 XML_TYPE_FONT_WIDTH, 0 ),
-        //MAP_CONST( PROPERTY_FONTWORDLINEMODE, XML_NAMESPACE_STYLE,    XML_TEXT_UNDERLINE_MODE,        XML_TYPE_TEXT_LINE_MODE, 0 ),
         MAP_END()
     };
     UniReference < XMLPropertyHandlerFactory> xFac = new ::xmloff::OControlPropertyHandlerFactory();
diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
index d132f7666151..24a3c39b65a8 100644
--- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
+++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
@@ -144,9 +144,6 @@ SvXMLImportContext* OXMLHierarchyCollection::CreateChildContext(
 
     switch( rTokenMap.Get( nPrefix, rLocalName ) )
     {
-//      case XML_TOK_QUERY:
-//          pContext = new OXMLQuery( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer );
-//          break;
         case XML_TOK_COMPONENT:
             GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
             pContext = new OXMLComponent( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_sComponentServiceName );
@@ -155,7 +152,6 @@ SvXMLImportContext* OXMLHierarchyCollection::CreateChildContext(
             GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
             pContext = new OXMLColumn( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_xTable);
             break;
-        //  case XML_TOK_QUERY_COLLECTION:
         case XML_TOK_COMPONENT_COLLECTION:
             GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
             pContext = new OXMLHierarchyCollection( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_sCollectionServiceName,m_sComponentServiceName);
diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx
index 67ea8c5bc77e..2ef6a564b669 100644
--- a/dbaccess/source/filter/xml/xmlStyleImport.cxx
+++ b/dbaccess/source/filter/xml/xmlStyleImport.cxx
@@ -129,7 +129,6 @@ void OTableStyleContext::FillPropertySet(
                     uno::Any aNumberFormat;
                     m_nNumberFormat = pStyle->GetKey();
                     aNumberFormat <<= m_nNumberFormat;
-                    //rPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_NUMBERFORMAT)), aNumberFormat);
                     AddProperty(CTF_DB_NUMBERFORMAT, aNumberFormat);
                 }
             }
diff --git a/dbaccess/source/filter/xml/xmlStyleImport.hxx b/dbaccess/source/filter/xml/xmlStyleImport.hxx
index 16bea01cc12b..87c93c793c02 100644
--- a/dbaccess/source/filter/xml/xmlStyleImport.hxx
+++ b/dbaccess/source/filter/xml/xmlStyleImport.hxx
@@ -51,7 +51,6 @@ namespace dbaxml
         ::rtl::OUString             sPageStyle;
         const rtl::OUString         sNumberFormat;
         SvXMLStylesContext*         pStyles;
-        //  std::vector<ScXMLMapContent>    aMaps;
         com::sun::star::uno::Any    aConditionalFormat;
         sal_Int32                   m_nNumberFormat;
         sal_Bool                    bConditionalFormatCreated : 1;
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 25c48491af22..ecc714155328 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -124,8 +124,8 @@ namespace dbaxml
                         (void)ex;
                         OSL_ASSERT(0);
                     }
-                } // if ( s_bFirstTime )
-            } // if ( m_eWhat == E_JAVA )
+                }
+            }
             else if ( m_eWhat == E_CALC )
             {
                 static bool s_bFirstTime = true;
@@ -199,7 +199,7 @@ namespace dbaxml
                 if ( m_aTypeCollection.needsJVM(sURL) )
                 {
                     pCreatorThread = new FastLoader(m_xFactory,FastLoader::E_JAVA);
-                } // if ( m_aTypeCollection.needsJVM(sURL) )
+                }
                 else if ( sURL.matchIgnoreAsciiCaseAsciiL("sdbc:calc:",10,0) )
                 {
                     pCreatorThread = new FastLoader(m_xFactory,FastLoader::E_CALC);
@@ -241,7 +241,7 @@ sal_Int32 ReadThroughComponent(
     // get parser
     uno::Reference< XParser > xParser(
         rFactory->createInstance(
-        ::rtl::OUString::createFromAscii("com.sun.star.xml.sax.Parser") ),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser"))),
         UNO_QUERY );
     DBG_ASSERT( xParser.is(), "Can't create parser" );
     if( !xParser.is() )
@@ -846,10 +846,8 @@ SvXMLImportContext* ODBFilter::CreateStylesContext(sal_uInt16 _nPrefix,const ::r
     {
         pContext = new OTableStylesContext(*this, _nPrefix, rLocalName, xAttrList, bIsAutoStyle);
         if (bIsAutoStyle)
-            //xAutoStyles = pContext;
             SetAutoStyles((SvXMLStylesContext*)pContext);
         else
-            //xStyles = pContext;
             SetStyles((SvXMLStylesContext*)pContext);
     }
     return pContext;
diff --git a/dbaccess/source/sdbtools/connection/tablename.cxx b/dbaccess/source/sdbtools/connection/tablename.cxx
index 4d6357a88d1b..47fb343a14ac 100644
--- a/dbaccess/source/sdbtools/connection/tablename.cxx
+++ b/dbaccess/source/sdbtools/connection/tablename.cxx
@@ -212,7 +212,7 @@ namespace sdbtools
     //--------------------------------------------------------------------
     namespace
     {
-        /** translates a CopmositionType into a EComposeRule
+        /** translates a CompositionType into a EComposeRule
             @throws IllegalArgumentException
                 if the given value does not denote a valid CompositionType
         */
diff --git a/dbaccess/source/shared/registrationhelper.cxx b/dbaccess/source/shared/registrationhelper.cxx
index 56246cee507a..878b9cec5688 100644
--- a/dbaccess/source/shared/registrationhelper.cxx
+++ b/dbaccess/source/shared/registrationhelper.cxx
@@ -144,7 +144,7 @@ sal_Bool OModuleRegistration::writeComponentInfos(
     {
         ::rtl::OUString aMainKeyName(sRootKey);
         aMainKeyName += *pImplName;
-        aMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES");
+        aMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
 
         try
         {
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 68d5aac5fa33..cd7e8fd6ebfb 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -194,7 +194,7 @@ namespace DatabaseObjectContainer = ::com::sun::star::sdb::application::Database
 Sequence< ::rtl::OUString> OApplicationController::getSupportedServiceNames_Static(void) throw( RuntimeException )
 {
     Sequence< ::rtl::OUString> aSupported(1);
-    aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.application.DefaultViewController");
+    aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.application.DefaultViewController"));
     return aSupported;
 }
 //-------------------------------------------------------------------------
@@ -2500,9 +2500,6 @@ sal_Int8 OApplicationController::queryDrop( const AcceptDropEvent& _rEvt, const
                                 nAction = DND_ACTION_NONE;
                         }
                     }
-                    /*else
-                        nAction = nActionAskedFor & DND_ACTION_COPYMOVE;
-                    */
                 }
                 return nAction;
             }
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index b89f72956344..d2613c93c66d 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -568,7 +568,7 @@ sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAcc
 
             if ( CommandType::QUERY == nCommandType || CommandType::COMMAND == nCommandType )
             {
-                // read all nescessary data
+                // read all necessary data
 
                 ::rtl::OUString sCommand;
                 sal_Bool bEscapeProcessing = sal_True;
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index d89c495e5106..df0987676ef0 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -193,7 +193,7 @@ namespace
         {
             SetTextColor( rStyleSettings.GetFieldTextColor() );
             SetTextFillColor();
-        } // if( bForeground || bFont )
+        }
 
         if( bBackground )
             SetBackground( rStyleSettings.GetFieldColor() );
@@ -543,13 +543,11 @@ sal_Bool OAppDetailPageHelper::isCutAllowed()
 // -----------------------------------------------------------------------------
 sal_Bool OAppDetailPageHelper::isCopyAllowed()
 {
-    //int nPos = getVisibleControlIndex();
     return sal_True;
 }
 // -----------------------------------------------------------------------------
 sal_Bool OAppDetailPageHelper::isPasteAllowed()
 {
-    //int nPos = getVisibleControlIndex();
     return sal_True;
 }
 // -----------------------------------------------------------------------------
@@ -623,8 +621,7 @@ void OAppDetailPageHelper::createTablesPage(const Reference< XConnection>& _xCon
 
         ImageProvider aImageProvider( _xConnection );
         createTree( pTreeView,
-            aImageProvider.getDefaultImage( DatabaseObject::TABLE, false ),
-            aImageProvider.getDefaultImage( DatabaseObject::TABLE, true )
+            aImageProvider.getDefaultImage( DatabaseObject::TABLE )
         );
 
         pTreeView->notifyHiContrastChanged();
@@ -644,10 +641,10 @@ void OAppDetailPageHelper::createTablesPage(const Reference< XConnection>& _xCon
 }
 
 // -----------------------------------------------------------------------------
-void OAppDetailPageHelper::getElementIcons( ElementType _eType, USHORT& _rImageId, USHORT& _rHighContrastImageId )
+void OAppDetailPageHelper::getElementIcons( ElementType _eType, USHORT& _rImageId )
 {
     ImageProvider aImageProvider;
-    _rImageId = _rHighContrastImageId = 0;
+    _rImageId = 0;
 
     sal_Int32 nDatabaseObjectType( 0 );
     switch(_eType )
@@ -659,8 +656,7 @@ void OAppDetailPageHelper::getElementIcons( ElementType _eType, USHORT& _rImageI
             OSL_ENSURE( sal_False, "OAppDetailPageHelper::GetElementIcons: invalid element type!" );
             return;
     }
-    _rImageId = aImageProvider.getDefaultImageResourceID( nDatabaseObjectType, false );
-    _rHighContrastImageId = aImageProvider.getDefaultImageResourceID( nDatabaseObjectType, true );
+    _rImageId = aImageProvider.getDefaultImageResourceID( nDatabaseObjectType );
 }
 
 // -----------------------------------------------------------------------------
@@ -668,41 +664,38 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA
 {
     OSL_ENSURE(E_TABLE != _eType,"E_TABLE isn't allowed.");
 
-    USHORT nHelpId = 0, nImageId = 0, nImageIdH = 0;
+    USHORT nHelpId = 0, nImageId = 0;
     ImageProvider aImageProvider;
-    Image aFolderImage, aFolderImageHC;
+    Image aFolderImage;
     switch( _eType )
     {
         case E_FORM:
             nHelpId = HID_APP_FORM_TREE;
-            aFolderImage = aImageProvider.getFolderImage( DatabaseObject::FORM, false );
-            aFolderImageHC = aImageProvider.getFolderImage( DatabaseObject::FORM, true );
+            aFolderImage = aImageProvider.getFolderImage( DatabaseObject::FORM );
             break;
         case E_REPORT:
             nHelpId = HID_APP_REPORT_TREE;
-            aFolderImage = aImageProvider.getFolderImage( DatabaseObject::REPORT, false );
-            aFolderImageHC = aImageProvider.getFolderImage( DatabaseObject::REPORT, true );
+            aFolderImage = aImageProvider.getFolderImage( DatabaseObject::REPORT );
             break;
         case E_QUERY:
             nHelpId = HID_APP_QUERY_TREE;
-            aFolderImage = aImageProvider.getFolderImage( DatabaseObject::QUERY, false );
-            aFolderImageHC = aImageProvider.getFolderImage( DatabaseObject::QUERY, true );
+            aFolderImage = aImageProvider.getFolderImage( DatabaseObject::QUERY );
             break;
         default:
             OSL_ENSURE(0,"Illegal call!");
     }
-    getElementIcons( _eType, nImageId, nImageIdH );
+    getElementIcons( _eType, nImageId );
 
     if ( !m_pLists[_eType] )
     {
-        m_pLists[_eType] = createSimpleTree( nHelpId, aFolderImage, aFolderImageHC );
+        m_pLists[_eType] = createSimpleTree( nHelpId, aFolderImage );
     }
 
     if ( m_pLists[_eType] )
     {
         if ( !m_pLists[_eType]->GetEntryCount() && _xContainer.is() )
         {
-            fillNames( _xContainer, _eType, nImageId, nImageIdH, NULL );
+            fillNames( _xContainer, _eType, nImageId, NULL );
 
             m_pLists[_eType]->SelectAll(FALSE);
         }
@@ -750,7 +743,7 @@ namespace
 
 // -----------------------------------------------------------------------------
 void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContainer, const ElementType _eType,
-                                      const USHORT _nImageId, const USHORT _nHighContrastImageId, SvLBoxEntry* _pParent )
+                                      const USHORT _nImageId, SvLBoxEntry* _pParent )
 {
     OSL_ENSURE(_xContainer.is(),"Data source is NULL! -> GPF");
     OSL_ENSURE( ( _eType >= E_TABLE ) && ( _eType < E_ELEMENT_TYPE_COUNT ), "OAppDetailPageHelper::fillNames: invalid type!" );
@@ -775,33 +768,29 @@ void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContaine
             {
                 pEntry = pList->InsertEntry( *pIter, _pParent, FALSE, LIST_APPEND, reinterpret_cast< void* >( nFolderIndicator ) );
                 getBorderWin().getView()->getAppController().containerFound( Reference< XContainer >( xSubElements, UNO_QUERY ) );
-                fillNames( xSubElements, _eType, _nImageId, _nHighContrastImageId, pEntry );
+                fillNames( xSubElements, _eType, _nImageId, pEntry );
             }
             else
             {
                 pEntry = pList->InsertEntry( *pIter, _pParent );
 
                 Image aImage = Image( ModuleRes( _nImageId ) );
-                pList->SetExpandedEntryBmp( pEntry, aImage, BMP_COLOR_NORMAL );
-                pList->SetCollapsedEntryBmp( pEntry, aImage, BMP_COLOR_NORMAL );
-
-                Image aHCImage = Image( ModuleRes( _nHighContrastImageId ) );
-                pList->SetExpandedEntryBmp( pEntry, aHCImage, BMP_COLOR_HIGHCONTRAST );
-                pList->SetCollapsedEntryBmp( pEntry, aHCImage, BMP_COLOR_HIGHCONTRAST );
+                pList->SetExpandedEntryBmp(  pEntry, aImage );
+                pList->SetCollapsedEntryBmp( pEntry, aImage );
             }
         }
     }
 }
 // -----------------------------------------------------------------------------
-DBTreeListBox* OAppDetailPageHelper::createSimpleTree( ULONG _nHelpId, const Image& _rImage, const Image& _rImageHC )
+DBTreeListBox* OAppDetailPageHelper::createSimpleTree( ULONG _nHelpId, const Image& _rImage )
 {
     DBTreeListBox* pTreeView = new DBTreeListBox(this,getBorderWin().getView()->getORB(),WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP);
     pTreeView->SetHelpId(_nHelpId);
-    return createTree( pTreeView, _rImage, _rImageHC );
+    return createTree( pTreeView, _rImage );
 }
 
 // -----------------------------------------------------------------------------
-DBTreeListBox* OAppDetailPageHelper::createTree( DBTreeListBox* _pTreeView, const Image& _rImage, const Image& _rImageHC )
+DBTreeListBox* OAppDetailPageHelper::createTree( DBTreeListBox* _pTreeView, const Image& _rImage )
 {
     WaitObject aWaitCursor(this);
 
@@ -811,9 +800,7 @@ DBTreeListBox* OAppDetailPageHelper::createTree( DBTreeListBox* _pTreeView, cons
     _pTreeView->SetSelectionMode(MULTIPLE_SELECTION);
 
     _pTreeView->SetDefaultCollapsedEntryBmp( _rImage );
-    _pTreeView->SetDefaultCollapsedEntryBmp( _rImageHC, BMP_COLOR_HIGHCONTRAST );
     _pTreeView->SetDefaultExpandedEntryBmp( _rImage );
-    _pTreeView->SetDefaultExpandedEntryBmp( _rImageHC, BMP_COLOR_HIGHCONTRAST );
 
     _pTreeView->SetDoubleClickHdl(LINK(this, OAppDetailPageHelper, OnEntryDoubleClick));
     _pTreeView->SetEnterKeyHdl(LINK(this, OAppDetailPageHelper, OnEntryDoubleClick));
@@ -905,26 +892,22 @@ SvLBoxEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const ::rtl::
             }
         }
 
-        USHORT nImageId = 0, nImageIdH = 0;
-        getElementIcons( _eType, nImageId, nImageIdH );
+        USHORT nImageId = 0;
+        getElementIcons( _eType, nImageId );
         Reference<XNameAccess> xContainer(_rObject,UNO_QUERY);
         if ( xContainer.is() )
         {
             const sal_Int32 nFolderIndicator = lcl_getFolderIndicatorForType( _eType );
             pRet = pTreeView->InsertEntry( _rName, pEntry, FALSE, LIST_APPEND, reinterpret_cast< void* >( nFolderIndicator ) );
-            fillNames( xContainer, _eType, nImageId, nImageIdH, pRet );
+            fillNames( xContainer, _eType, nImageId, pRet );
         }
         else
         {
             pRet = pTreeView->InsertEntry( _rName, pEntry );
 
             Image aImage = Image( ModuleRes( nImageId ) );
-            pTreeView->SetExpandedEntryBmp( pRet, aImage, BMP_COLOR_NORMAL );
-            pTreeView->SetCollapsedEntryBmp( pRet, aImage, BMP_COLOR_NORMAL );
-
-            Image aHCImage = Image( ModuleRes( nImageIdH ) );
-            pTreeView->SetExpandedEntryBmp( pRet, aHCImage, BMP_COLOR_HIGHCONTRAST );
-            pTreeView->SetCollapsedEntryBmp( pRet, aHCImage, BMP_COLOR_HIGHCONTRAST );
+            pTreeView->SetExpandedEntryBmp(  pRet, aImage );
+            pTreeView->SetCollapsedEntryBmp( pRet, aImage );
         }
     }
     return pRet;
@@ -1007,8 +990,7 @@ IMPL_LINK( OAppDetailPageHelper, OnDeleteEntry, void*, /*NOINTERESTEDIN*/ )
 // -----------------------------------------------------------------------------
 void OAppDetailPageHelper::Resize()
 {
-    //////////////////////////////////////////////////////////////////////
-    // Abmessungen parent window
+    // parent window dimension
     Size aOutputSize( GetOutputSize() );
     long nOutputWidth  = aOutputSize.Width();
     long nOutputHeight = aOutputSize.Height();
@@ -1145,12 +1127,6 @@ void OAppDetailPageHelper::showPreview(const Reference< XContent >& _xContent)
             {
                 m_aPreview.Hide();
                 m_aDocumentInfo.Hide();
-
-                // Why the below code? It might have side effects, as the tree view needs to know
-                // its current selection for other purposes than the preview, too.
-//                DBTreeListBox* pTreeView = getCurrentView();
-//                if ( pTreeView )
-//                    pTreeView->clearCurrentSelection();
             }
         }
         catch( const Exception& )
@@ -1179,7 +1155,7 @@ void OAppDetailPageHelper::showPreview( const ::rtl::OUString& _sDataSourceName,
 
                 // work-around for #150518#: no layout manager (and thus no toolbars) in the preview
                 // Must be called after initialize ... but before any other call to this frame.
-                // Otherwhise frame throws "life time exceptions" as e.g. NON_INITIALIZED
+                // Otherwise frame throws "life time exceptions" as e.g. NON_INITIALIZED
                 Reference< XPropertySet > xFrameProps( m_xFrame, UNO_QUERY_THROW );
                 xFrameProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ) ), makeAny(Reference< XLayoutManager >()) );
 
@@ -1314,34 +1290,25 @@ void OAppDetailPageHelper::DataChanged( const DataChangedEvent& rDCEvt )
 void OAppDetailPageHelper::ImplInitSettings()
 {
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
-    if( true )
-    {
         Font aFont;
         aFont = rStyleSettings.GetFieldFont();
         aFont.SetColor( rStyleSettings.GetWindowTextColor() );
         SetPointFont( aFont );
         m_aTBPreview.SetPointFont( aFont );
-    }
 
-    if( true )
-    {
         SetTextColor( rStyleSettings.GetFieldTextColor() );
         SetTextFillColor();
         m_aBorder.SetTextColor( rStyleSettings.GetFieldTextColor() );
         m_aBorder.SetTextFillColor();
         m_aTBPreview.SetTextColor( rStyleSettings.GetFieldTextColor() );
         m_aTBPreview.SetTextFillColor();
-    } // if( true )
 
-    if( true )
-    {
         SetBackground( rStyleSettings.GetFieldColor() );
         m_aBorder.SetBackground( rStyleSettings.GetFieldColor() );
         m_aFL.SetBackground( rStyleSettings.GetFieldColor() );
         m_aDocumentInfo.SetBackground( rStyleSettings.GetFieldColor() );
         m_aTBPreview.SetBackground( rStyleSettings.GetFieldColor() );
         m_pTablePreview->SetBackground( rStyleSettings.GetFieldColor() );
-    } // if( true )
 }
 // -----------------------------------------------------------------------------
 OPreviewWindow::OPreviewWindow(Window* _pParent)
@@ -1428,7 +1395,7 @@ void OPreviewWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal
     {
         SetTextColor( rStyleSettings.GetFieldTextColor() );
         SetTextFillColor();
-    } // if( bForeground || bFont )
+    }
 
     if( bBackground )
         SetBackground( rStyleSettings.GetFieldColor() );
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index cb4a79970fca..465299e10a23 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -119,7 +119,7 @@ namespace dbaui
 
         /** retrieves the resource ids of the images representing elements of the given type
         */
-        void getElementIcons( ElementType _eType, USHORT& _rImageId, USHORT& _rHighContrastImageId );
+        void getElementIcons( ElementType _eType, USHORT& _rImageId );
 
         /** fills the names in the listbox
             @param  _xContainer
@@ -128,15 +128,12 @@ namespace dbaui
                 the type of elements which are being filled
             @param _nImageId
                 the resource id of the image to use for non-container entries
-            @param _nHighContrastImageId
-                the resource id of the high contrast image to use for non-container entries
             @param  _pParent
                 The parent of the entries to be inserted.
         */
         void fillNames( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer,
                         const ElementType _eType,
                         const USHORT _nImageId,
-                        const USHORT _nHighContrastImageId,
                         SvLBoxEntry* _pParent );
 
         /** sets the detail page
@@ -150,24 +147,20 @@ namespace dbaui
                 The newly created DBTreeListBox
             @param  _rImage
                 the resource id of the default icon
-            @param  _rImageHC
-                the resource id of the default icon (HC version)
             @return
                 The new tree.
         */
-        DBTreeListBox* createTree( DBTreeListBox* _pTreeView, const Image& _rImage, const Image& _rImageHC );
+        DBTreeListBox* createTree( DBTreeListBox* _pTreeView, const Image& _rImage );
 
         /** creates the tree and sets all HandleCallbacks
             @param  _nHelpId
                 The help id of the control
             @param  _nCollapsedBitmap
-                The image to use for tree entries.
-            @param  _rImageHC
                 The image to use in high contrast mode.
             @return
                 The new tree.
         */
-        DBTreeListBox* createSimpleTree( ULONG _nHelpId, const Image& _rImage, const Image& _rImageHC );
+        DBTreeListBox* createSimpleTree( ULONG _nHelpId, const Image& _rImage );
 
         DECL_LINK( OnEntryDoubleClick,          SvTreeListBox* );
         DECL_LINK( OnEntrySelChange,            void* );
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 4003c14e854c..c104799aa2cc 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -346,7 +346,7 @@ void OCreationList::KeyInput( const KeyEvent& rKEvt )
         {
             InvalidateEntry( pNewCurrent );
             CallEventListeners( VCLEVENT_LISTBOX_SELECT, pNewCurrent );
-        } // if ( pNewCurrent )
+        }
         updateHelpText();
     }
 }
@@ -409,8 +409,6 @@ void OTasksWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_B
         m_aHelpText.SetTextFillColor();
         m_aDescription.SetTextColor( rStyleSettings.GetFieldTextColor() );
         m_aDescription.SetTextFillColor();
-        //m_aFL.SetTextColor( rStyleSettings.GetFieldTextColor() );
-        //m_aFL.SetTextFillColor();
     }
 
     if( bBackground )
@@ -433,11 +431,6 @@ void OTasksWindow::setHelpText(USHORT _nId)
     {
         String sText = ModuleRes(_nId);
 
-        // calulate the size of the text field
-        // Size aHelpTextSize = m_aHelpText.GetSizePixel();
-        // Size aHelpTextPixelSize = LogicToPixel( aHelpTextSize, MAP_APPFONT );
-        // Rectangle aPrimaryRect( Point(0,0), aHelpTextSize );
-        // Rectangle aSuggestedRect( GetTextRect( aPrimaryRect, sText, TEXT_DRAW_MULTILINE | TEXT_DRAW_LEFT | TEXT_DRAW_WORDBREAK ) );
         m_aHelpText.SetText(sText);
     }
     else
@@ -458,8 +451,8 @@ IMPL_LINK(OTasksWindow, OnEntrySelectHdl, SvTreeListBox*, /*_pTreeBox*/)
 void OTasksWindow::Resize()
 {
     DBG_CHKTHIS(OTasksWindow,NULL);
-    //////////////////////////////////////////////////////////////////////
-    // Abmessungen parent window
+
+    // parent window dimension
     Size aOutputSize( GetOutputSize() );
     long nOutputWidth   = aOutputSize.Width();
     long nOutputHeight  = aOutputSize.Height();
@@ -471,9 +464,6 @@ void OTasksWindow::Resize()
     m_aCreation.SetPosSizePixel( Point(0, 0), Size(nHalfOutputWidth - n6PPT, nOutputHeight) );
     // i77897 make the m_aHelpText a little bit smaller. (-5)
     sal_Int32 nNewWidth = nOutputWidth - nHalfOutputWidth - aFLSize.Width() - 5;
-    // m_aHelpText.SetBackground( MAKE_SALCOLOR( 0xe0, 0xe0, 0xe0 ) );
-    // Wallpaper aLightGray(Color(0xe0, 0xe0, 0xe0));
-    // m_aHelpText.SetBackground( aLightGray );
     m_aDescription.SetPosSizePixel( Point(nHalfOutputWidth + n6PPT, 0), Size(nNewWidth, nOutputHeight) );
     Size aDesc = m_aDescription.CalcMinimumSize();
     m_aHelpText.SetPosSizePixel( Point(nHalfOutputWidth + n6PPT, aDesc.Height() ), Size(nNewWidth, nOutputHeight - aDesc.Height() - n6PPT) );
@@ -488,9 +478,16 @@ void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList )
 
     try
     {
-        Reference<XModuleUIConfigurationManagerSupplier> xModuleCfgMgrSupplier(getDetailView()->getBorderWin().getView()->getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"))),UNO_QUERY);
-        Reference<XUIConfigurationManager> xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OfficeDatabaseDocument")));
-        Reference<XImageManager> xImageMgr(xUIConfigMgr->getImageManager(),UNO_QUERY);
+        Reference< XModuleUIConfigurationManagerSupplier > xModuleCfgMgrSupplier(
+            getDetailView()->getBorderWin().getView()->getORB()->createInstance(
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.ModuleUIConfigurationManagerSupplier" ) )
+            ) ,
+            UNO_QUERY
+        );
+        Reference< XUIConfigurationManager > xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager(
+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.OfficeDatabaseDocument" ) )
+        );
+        Reference< XImageManager > xImageMgr( xUIConfigMgr->getImageManager(), UNO_QUERY );
 
         // copy the commands so we can use them with the config managers
         Sequence< ::rtl::OUString > aCommands( _rList.size() );
@@ -499,24 +496,21 @@ void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList )
         for ( TaskEntryList::const_iterator pCopyTask = _rList.begin(); pCopyTask != aEnd; ++pCopyTask, ++pCommands )
             *pCommands = pCopyTask->sUNOCommand;
 
-        Sequence< Reference< XGraphic> > aImages = xImageMgr->getImages( ImageType::SIZE_DEFAULT | ImageType::COLOR_NORMAL, aCommands );
-        Sequence< Reference< XGraphic> > aHCImages = xImageMgr->getImages( ImageType::SIZE_DEFAULT | ImageType::COLOR_HIGHCONTRAST, aCommands );
+        Sequence< Reference< XGraphic> > aImages = xImageMgr->getImages(
+            ImageType::SIZE_DEFAULT | ImageType::COLOR_NORMAL ,
+            aCommands
+        );
 
         const Reference< XGraphic >* pImages( aImages.getConstArray() );
-        const Reference< XGraphic >* pHCImages( aHCImages.getConstArray() );
 
-        for ( TaskEntryList::const_iterator pTask = _rList.begin(); pTask != aEnd; ++pTask, ++pImages, ++pHCImages )
+        for ( TaskEntryList::const_iterator pTask = _rList.begin(); pTask != aEnd; ++pTask, ++pImages )
         {
             SvLBoxEntry* pEntry = m_aCreation.InsertEntry( pTask->sTitle );
             pEntry->SetUserData( reinterpret_cast< void* >( new TaskEntry( *pTask ) ) );
 
             Image aImage = Image( *pImages );
-            m_aCreation.SetExpandedEntryBmp( pEntry, aImage, BMP_COLOR_NORMAL );
-            m_aCreation.SetCollapsedEntryBmp( pEntry, aImage, BMP_COLOR_NORMAL );
-
-            Image aHCImage = Image( *pHCImages );
-            m_aCreation.SetExpandedEntryBmp( pEntry, aHCImage, BMP_COLOR_HIGHCONTRAST );
-            m_aCreation.SetCollapsedEntryBmp( pEntry, aHCImage, BMP_COLOR_HIGHCONTRAST );
+            m_aCreation.SetExpandedEntryBmp(  pEntry, aImage );
+            m_aCreation.SetCollapsedEntryBmp( pEntry, aImage );
         }
     }
     catch(Exception&)
@@ -611,7 +605,6 @@ void OApplicationDetailView::ImplInitSettings( sal_Bool bFont, sal_Bool bForegro
     if( bBackground )
         SetBackground( rStyleSettings.GetFieldColor() );
 
-    //SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetDialogColor() ) );
     m_aHorzSplitter.SetBackground( rStyleSettings.GetDialogColor() );
     m_aHorzSplitter.SetFillColor( rStyleSettings.GetDialogColor() );
     m_aHorzSplitter.SetTextFillColor(rStyleSettings.GetDialogColor() );
@@ -704,7 +697,6 @@ const TaskPaneData& OApplicationDetailView::impl_getTaskPaneData( ElementType _e
     OSL_ENSURE( ( _eType >= 0 ) && ( _eType < E_ELEMENT_TYPE_COUNT ), "OApplicationDetailView::impl_getTaskPaneData: illegal element type!" );
     TaskPaneData& rData = m_aTaskPaneData[ _eType ];
 
-//    if ( rData.aTasks.empty() )
     //oj: do not check, otherwise extensions will only be visible after a reload.
     impl_fillTaskPaneData( _eType, rData );
 
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx
index ef2001ab65fb..06aa8ecb4411 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -171,7 +171,6 @@ namespace dbaui
         OApplicationDetailView(OAppBorderWindow& _rParent,PreviewMode _ePreviewMode);
         virtual ~OApplicationDetailView();
         // window overloads
-        //  virtual void Resize();
         virtual void GetFocus();
 
         /** creates the tables page
diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx
index 939d174b23e9..2fb94bb6b77f 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -56,19 +56,17 @@ OApplicationIconControl::OApplicationIconControl(Window* _pParent)
         USHORT      nLabelResId;
         ElementType eType;
         USHORT      nImageResId;
-        USHORT      nImageResIdHC;
     }   aCategories[] = {
-        { RID_STR_TABLES_CONTAINER,     E_TABLE,    IMG_TABLEFOLDER_TREE_L, IMG_TABLEFOLDER_TREE_LHC    },
-        { RID_STR_QUERIES_CONTAINER,    E_QUERY,    IMG_QUERYFOLDER_TREE_L, IMG_QUERYFOLDER_TREE_LHC    },
-        { RID_STR_FORMS_CONTAINER,      E_FORM,     IMG_FORMFOLDER_TREE_L,  IMG_FORMFOLDER_TREE_LHC     },
-        { RID_STR_REPORTS_CONTAINER,    E_REPORT,   IMG_REPORTFOLDER_TREE_L,IMG_REPORTFOLDER_TREE_LHC   }
+        { RID_STR_TABLES_CONTAINER,     E_TABLE,    IMG_TABLEFOLDER_TREE_L  },
+        { RID_STR_QUERIES_CONTAINER,    E_QUERY,    IMG_QUERYFOLDER_TREE_L  },
+        { RID_STR_FORMS_CONTAINER,      E_FORM,     IMG_FORMFOLDER_TREE_L   },
+        { RID_STR_REPORTS_CONTAINER,    E_REPORT,   IMG_REPORTFOLDER_TREE_L }
     };
     for ( size_t i=0; i < SAL_N_ELEMENTS(aCategories); ++i)
     {
         SvxIconChoiceCtrlEntry* pEntry = InsertEntry(
-            String( ModuleRes( aCategories[i].nLabelResId ) ),
-            Image( ModuleRes( aCategories[i].nImageResId ) ),
-            Image( ModuleRes( aCategories[i].nImageResIdHC ) ) );
+            String( ModuleRes( aCategories[i].nLabelResId ) ) ,
+            Image(  ModuleRes( aCategories[i].nImageResId ) ) );
         if ( pEntry )
             pEntry->SetUserData( new ElementType( aCategories[i].eType ) );
     }
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index e8b0393dec54..fc8e885928e7 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -58,7 +58,6 @@ OApplicationSwapWindow::OApplicationSwapWindow( Window* _pParent, OAppBorderWind
     ,m_rBorderWin( _rBorderWindow )
 {
     DBG_CTOR(OApplicationSwapWindow,NULL);
-//  SetCompoundControl( TRUE );
 
     ImplInitSettings( sal_True, sal_True, sal_True );
 
@@ -66,7 +65,6 @@ OApplicationSwapWindow::OApplicationSwapWindow( Window* _pParent, OAppBorderWind
     m_aIconControl.setControlActionListener( &m_rBorderWin.getView()->getAppController() );
     m_aIconControl.SetHelpId(HID_APP_SWAP_ICONCONTROL);
     m_aIconControl.Show();
-    //m_aIconControl.Enable(TRUE);
 }
 // -----------------------------------------------------------------------------
 OApplicationSwapWindow::~OApplicationSwapWindow()
@@ -169,7 +167,7 @@ bool OApplicationSwapWindow::onContainerSelected( ElementType _eType )
         if ( _eType != E_NONE )
             m_eLastType = _eType;
         return true;
-    } // if ( m_rBorderWin.getView()->getAppController().onContainerSelect( _eType ) )
+    }
 
     PostUserEvent( LINK( this, OApplicationSwapWindow, ChangeToLastSelected ) );
     return false;
diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx
index f0166e49d69a..f487353a5163 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -77,8 +77,7 @@ void OTitleWindow::setChildWindow(Window* _pChild)
 // -----------------------------------------------------------------------------
 void OTitleWindow::Resize()
 {
-    //////////////////////////////////////////////////////////////////////
-    // Abmessungen parent window
+    // parent window dimension
     Size aOutputSize( GetOutputSize() );
     long nOutputWidth   = aOutputSize.Width();
     long nOutputHeight  = aOutputSize.Height();
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 17a16c5ea2b4..6ca2fa0ae5ea 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -101,8 +101,7 @@ OAppBorderWindow::OAppBorderWindow(OApplicationView* _pParent,PreviewMode _ePrev
 // -----------------------------------------------------------------------------
 OAppBorderWindow::~OAppBorderWindow()
 {
-    //////////////////////////////////////////////////////////////////////
-    // Childs zerstoeren
+    // destroy children
     if ( m_pPanel )
     {
         m_pPanel->Hide();
@@ -127,8 +126,7 @@ void OAppBorderWindow::GetFocus()
 // -----------------------------------------------------------------------------
 void OAppBorderWindow::Resize()
 {
-    //////////////////////////////////////////////////////////////////////
-    // Abmessungen parent window
+    // parent window dimension
     Size aOutputSize( GetOutputSize() );
     long nOutputWidth   = aOutputSize.Width();
     long nOutputHeight  = aOutputSize.Height();
@@ -185,10 +183,6 @@ void OAppBorderWindow::ImplInitSettings()
 
     if( true )
         SetBackground( rStyleSettings.GetDialogColor() );
-
-    /*SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetDialogColor() ) );
-    SetFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() );
-    SetTextFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() );*/
 }
 // -----------------------------------------------------------------------------
 OApplicationView* OAppBorderWindow::getView() const
@@ -601,9 +595,6 @@ void OApplicationView::ImplInitSettings()
 
     if( true )
         SetBackground( rStyleSettings.GetFieldColor() );
-    /*SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetDialogColor() ) );
-    SetFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() );
-    SetTextFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() );*/
 }
 //-----------------------------------------------------------------------------
 
diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src
index 2dec9005f847..b723d282bb14 100644
--- a/dbaccess/source/ui/app/app.src
+++ b/dbaccess/source/ui/app/app.src
@@ -312,43 +312,53 @@ String RID_STR_REPORTS_HELP_TEXT_WIZARD
 {
     Text [ en-US ] = "The wizard will guide you through the steps necessary to create a report." ;
 };
+
 String RID_STR_FORMS_HELP_TEXT
 {
     Text [ en-US ] = "Create a form by specifying the record source, controls, and control properties." ;
 };
+
 String RID_STR_REPORT_HELP_TEXT
 {
     Text [ de ] ="Erstellen Sie einen Bericht, indem Sie die Datensatzquelle, Steuerelemente und Steuerelementeigenschaften angeben." ;
     Text [ en-US ] = "Create a report by specifying the record source, controls, and control properties." ;
 };
+
 String RID_STR_FORMS_HELP_TEXT_WIZARD
 {
     Text [ en-US ] = "The wizard will guide you through the steps necessary to create a form." ;
 };
+
 String RID_STR_QUERIES_HELP_TEXT
 {
     Text [ en-US ] = "Create a query by specifying the filters, input tables, field names,  and  properties for sorting or grouping." ;
 };
+
 String RID_STR_QUERIES_HELP_TEXT_SQL
 {
     Text [ en-US ] = "Create a query  entering an SQL statement directly." ;
 };
+
 String RID_STR_QUERIES_HELP_TEXT_WIZARD
 {
     Text [ en-US ] = "The wizard will guide you through the steps necessary to create a query." ;
 };
+
 String RID_STR_TABLES_HELP_TEXT_DESIGN
 {
     Text [ en-US ] = "Create a table by specifying the field names and properties, as well as the data types." ;
 };
+
 String RID_STR_TABLES_HELP_TEXT_WIZARD
 {
     Text [ en-US ] = "Choose from a selection of business and personal table samples, which you customize to create a table." ;
 };
+
 String RID_STR_VIEWS_HELP_TEXT_DESIGN
 {
     Text [ en-US ] = "Create a view by specifying the tables and field names you would like to have visible." ;
 };
+
 String RID_STR_VIEWS_HELP_TEXT_WIZARD
 {
     Text [ en-US ] = "Opens the view wizard" ;
@@ -358,28 +368,34 @@ String STR_DATABASE
 {
     Text [ en-US ] = "Database" ;
 };
+
 String STR_TASKS
 {
     Text [ en-US ] = "Tasks" ;
 };
+
 String STR_DESCRIPTION
 {
     Text [ en-US ] = "Description" ;
 };
+
 String STR_PREVIEW
 {
     Text [ en-US ] = "Preview" ;
 };
+
 String STR_DISABLEPREVIEW
 {
     Text [ en-US ] = "Disable Preview" ;
 };
+
 QueryBox APP_SAVEMODIFIED
 {
     Buttons = WB_YES_NO_CANCEL ;
     DefButton = WB_DEF_YES ;
     Message [ en-US ] = "The database has been modified.\nDo you want to save the changes?" ;
 };
+
 QueryBox APP_CLOSEDOCUMENTS
 {
     Buttons = WB_YES_NO ;
@@ -423,6 +439,7 @@ Menu RID_MENU_APP_PREVIEW
         };
     };
 };
+
 String RID_STR_FORM
 {
     Text [ en-US ] = "Form";
@@ -432,10 +449,12 @@ String RID_STR_REPORT
 {
     Text [ en-US ] = "Report";
 };
+
 String STR_FRM_LABEL
 {
     Text [ en-US ] = "F~orm name" ;
 };
+
 String STR_RPT_LABEL
 {
     Text [ en-US ] = "~Report name" ;
@@ -466,10 +485,12 @@ String RID_STR_EMBEDDED_DATABASE
 {
     Text [ en-US ] = "Embedded database";
 };
+
 String RID_STR_NO_DIFF_CAT
 {
     Text [ en-US ] = "You cannot select different categories.";
 };
+
 String RID_STR_UNSUPPORTED_OBJECT_TYPE
 {
     Text [ en-US ] = "Unsupported object type found ($type$).";
diff --git a/dbaccess/source/ui/app/makefile.mk b/dbaccess/source/ui/app/makefile.mk
index a7097b4330e1..658456f4135b 100644
--- a/dbaccess/source/ui/app/makefile.mk
+++ b/dbaccess/source/ui/app/makefile.mk
@@ -40,19 +40,19 @@ TARGET=app
 # --- Files --------------------------------------------------------
 
 EXCEPTIONSFILES=\
-            $(SLO)$/AppDetailView.obj		\
             $(SLO)$/AppController.obj		\
             $(SLO)$/AppControllerDnD.obj	\
             $(SLO)$/AppControllerGen.obj	\
             $(SLO)$/AppDetailPageHelper.obj	\
+            $(SLO)$/AppDetailView.obj		\
+            $(SLO)$/AppIconControl.obj		\
             $(SLO)$/AppSwapWindow.obj		\
             $(SLO)$/AppTitleWindow.obj		\
-            $(SLO)$/AppView.obj             \
+            $(SLO)$/AppView.obj			\
             $(SLO)$/subcomponentmanager.obj
             
 
 SLOFILES =\
-            $(SLO)$/AppIconControl.obj		\
             $(EXCEPTIONSFILES)
 
 SRS1NAME=$(TARGET)
diff --git a/dbaccess/source/ui/browser/bcommon.src b/dbaccess/source/ui/browser/bcommon.src
index 8c79179eda20..d5b8401b4e8c 100644
--- a/dbaccess/source/ui/browser/bcommon.src
+++ b/dbaccess/source/ui/browser/bcommon.src
@@ -32,4 +32,3 @@ String RID_STR_TBL_TITLE
 {
     Text [ en-US ] = "Table #" ;
 };
-
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 66e774b22a53..82663d00fccb 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -764,7 +764,7 @@ void SbaXDataBrowserController::initFormatter()
     {
         // create a new formatter
         m_xFormatter = Reference< ::com::sun::star::util::XNumberFormatter > (
-            getORB()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.util.NumberFormatter")), UNO_QUERY);
+            getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatter"))), UNO_QUERY);
         if (m_xFormatter.is())
             m_xFormatter->attachNumberFormatsSupplier(xSupplier);
     }
@@ -935,14 +935,14 @@ void SbaXDataBrowserController::RemoveColumnListener(const Reference< XPropertyS
 Reference< XRowSet >  SbaXDataBrowserController::CreateForm()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::CreateForm" );
-    return Reference< XRowSet > (getORB()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.form.component.Form")), UNO_QUERY);
+    return Reference< XRowSet > (getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.Form"))), UNO_QUERY);
 }
 
 //------------------------------------------------------------------------------
 Reference< ::com::sun::star::form::XFormComponent >  SbaXDataBrowserController::CreateGridModel()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::CreateGridModel" );
-    return Reference< ::com::sun::star::form::XFormComponent > (getORB()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.form.component.GridControl")), UNO_QUERY);
+    return Reference< ::com::sun::star::form::XFormComponent > (getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.GridControl"))), UNO_QUERY);
 }
 
 // -------------------------------------------------------------------------
@@ -1209,31 +1209,17 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t
     // the filter or the sort criterias have changed ? -> update our parser
     if (evt.PropertyName.equals(PROPERTY_ACTIVECOMMAND))
     {
-      //  if (m_xParser.is())
-            //DO_SAFE( m_xParser->setElementaryQuery(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new query to my parser !" );
     }
     else if (evt.PropertyName.equals(PROPERTY_FILTER))
     {
-  //      if ( m_xParser.is() && m_xParser->getFilter() != ::comphelper::getString(evt.NewValue))
-        //{
-        //  DO_SAFE( m_xParser->setFilter(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new filter to my parser !" );
-        //}
         InvalidateFeature(ID_BROWSER_REMOVEFILTER);
     }
     else if (evt.PropertyName.equals(PROPERTY_HAVING_CLAUSE))
     {
-        //if ( m_xParser.is() && m_xParser->getHavingClause() != ::comphelper::getString(evt.NewValue))
-        //{
-        //  DO_SAFE( m_xParser->setHavingClause(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new filter to my parser !" );
-        //}
         InvalidateFeature(ID_BROWSER_REMOVEFILTER);
     }
     else if (evt.PropertyName.equals(PROPERTY_ORDER))
     {
-        //if ( m_xParser.is() && m_xParser->getOrder() != ::comphelper::getString(evt.NewValue))
-        //{
-        //  DO_SAFE( m_xParser->setOrder(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new order to my parser !" );
-        //}
         InvalidateFeature(ID_BROWSER_REMOVEFILTER);
     }
 
@@ -1600,7 +1586,7 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const
                     try
                     {
                         Reference< XPropertySet > xRowSetProps( getRowSet(), UNO_QUERY_THROW );
-                        OSL_VERIFY( xRowSetProps->getPropertyValue( ::rtl::OUString::createFromAscii( "AllowInserts" ) ) >>= bAllowInsertions );
+                        OSL_VERIFY( xRowSetProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AllowInserts")) ) >>= bAllowInsertions );
                     }
                     catch( const Exception& )
                     {
@@ -1619,7 +1605,7 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const
                     try
                     {
                         Reference< XPropertySet > xRowSetProps( getRowSet(), UNO_QUERY_THROW );
-                        OSL_VERIFY( xRowSetProps->getPropertyValue( ::rtl::OUString::createFromAscii( "AllowDeletes" ) ) >>= bAllowDeletions );
+                        OSL_VERIFY( xRowSetProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AllowDeletes")) ) >>= bAllowDeletions );
                         OSL_VERIFY( xRowSetProps->getPropertyValue( PROPERTY_ROWCOUNT ) >>= nRowCount );
                         OSL_VERIFY( xRowSetProps->getPropertyValue( PROPERTY_ISNEW ) >>= bInsertionRow );
                     }
@@ -1736,9 +1722,9 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const
                     break;  // no datasource -> no edit mode
 
                 sal_Int32 nDataSourcePrivileges = ::comphelper::getINT32(xDataSourceSet->getPropertyValue(PROPERTY_PRIVILEGES));
-                sal_Bool bInsertAllowedAndPossible = ((nDataSourcePrivileges & ::com::sun::star::sdbcx::Privilege::INSERT) != 0) && ::comphelper::getBOOL(xDataSourceSet->getPropertyValue(::rtl::OUString::createFromAscii("AllowInserts")));
-                sal_Bool bUpdateAllowedAndPossible = ((nDataSourcePrivileges & ::com::sun::star::sdbcx::Privilege::UPDATE) != 0) && ::comphelper::getBOOL(xDataSourceSet->getPropertyValue(::rtl::OUString::createFromAscii("AllowUpdates")));
-                sal_Bool bDeleteAllowedAndPossible = ((nDataSourcePrivileges & ::com::sun::star::sdbcx::Privilege::DELETE) != 0) && ::comphelper::getBOOL(xDataSourceSet->getPropertyValue(::rtl::OUString::createFromAscii("AllowDeletes")));
+                sal_Bool bInsertAllowedAndPossible = ((nDataSourcePrivileges & ::com::sun::star::sdbcx::Privilege::INSERT) != 0) && ::comphelper::getBOOL(xDataSourceSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AllowInserts"))));
+                sal_Bool bUpdateAllowedAndPossible = ((nDataSourcePrivileges & ::com::sun::star::sdbcx::Privilege::UPDATE) != 0) && ::comphelper::getBOOL(xDataSourceSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AllowUpdates"))));
+                sal_Bool bDeleteAllowedAndPossible = ((nDataSourcePrivileges & ::com::sun::star::sdbcx::Privilege::DELETE) != 0) && ::comphelper::getBOOL(xDataSourceSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AllowDeletes"))));
                 if (!bInsertAllowedAndPossible && !bUpdateAllowedAndPossible && !bDeleteAllowedAndPossible)
                     break;  // no insert/update/delete -> no edit mode
 
@@ -1806,7 +1792,6 @@ void SbaXDataBrowserController::applyParserOrder(const ::rtl::OUString& _rOldOrd
     if (!bSuccess)
     {
         xFormSet->setPropertyValue(PROPERTY_ORDER, makeAny(_rOldOrder));
-        //DO_SAFE( _xParser->setOrder(_rOldOrder), "SbaXDataBrowserController::applyParserOrder: could not restore the old order of my parser !" );
 
         try
         {
@@ -1914,8 +1899,6 @@ void SbaXDataBrowserController::ExecuteFilterSortCrit(sal_Bool bFilter)
             String aFilter;
             if(!aDlg.Execute())
             {
-                //m_xParser->setFilter(sOldVal);
-                //m_xParser->setHavingClause(sOldHaving);
                 return; // if so we don't need to actualize the grid
             }
             aDlg.BuildWherePart();
@@ -1926,7 +1909,6 @@ void SbaXDataBrowserController::ExecuteFilterSortCrit(sal_Bool bFilter)
             String aOrder;
             if(!aDlg.Execute())
             {
-                //m_xParser->setOrder(sOldVal);
                 return; // if so we don't need to actualize the grid
             }
             aDlg.BuildOrderPart();
@@ -1992,9 +1974,9 @@ void SbaXDataBrowserController::ExecuteSearch()
     // prohibit the synchronization of the grid's display with the cursor's position
     Reference< XPropertySet >  xModelSet(getControlModel(), UNO_QUERY);
     DBG_ASSERT(xModelSet.is(), "SbaXDataBrowserController::ExecuteSearch : no model set ?!");
-    xModelSet->setPropertyValue(::rtl::OUString::createFromAscii("DisplayIsSynchron"), ::comphelper::makeBoolAny(sal_Bool(sal_False)));
-    xModelSet->setPropertyValue(::rtl::OUString::createFromAscii("AlwaysShowCursor"), ::comphelper::makeBoolAny(sal_Bool(sal_True)));
-    xModelSet->setPropertyValue(::rtl::OUString::createFromAscii("CursorColor"), makeAny(sal_Int32(COL_LIGHTRED)));
+    xModelSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayIsSynchron")), ::comphelper::makeBoolAny(sal_Bool(sal_False)));
+    xModelSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AlwaysShowCursor")), ::comphelper::makeBoolAny(sal_Bool(sal_True)));
+    xModelSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CursorColor")), makeAny(sal_Int32(COL_LIGHTRED)));
 
     Reference< ::com::sun::star::util::XNumberFormatsSupplier >  xNFS(::dbtools::getNumberFormats(::dbtools::getConnection(m_xRowSet), sal_True,getORB()));
 
@@ -2017,9 +1999,9 @@ void SbaXDataBrowserController::ExecuteSearch()
     }
 
     // restore the grid's normal operating state
-    xModelSet->setPropertyValue(::rtl::OUString::createFromAscii("DisplayIsSynchron"), ::comphelper::makeBoolAny(sal_Bool(sal_True)));
-    xModelSet->setPropertyValue(::rtl::OUString::createFromAscii("AlwaysShowCursor"), ::comphelper::makeBoolAny(sal_Bool(sal_False)));
-    xModelSet->setPropertyValue(::rtl::OUString::createFromAscii("CursorColor"), Any());
+    xModelSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayIsSynchron")), ::comphelper::makeBoolAny(sal_Bool(sal_True)));
+    xModelSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AlwaysShowCursor")), ::comphelper::makeBoolAny(sal_Bool(sal_False)));
+    xModelSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CursorColor")), Any());
 }
 
 //------------------------------------------------------------------------------
@@ -2535,7 +2517,7 @@ IMPL_LINK(SbaXDataBrowserController, OnSearchContextRequest, FmSearchContext*, p
         if (!xCurrentColumn.is())
             continue;
 
-        // can we use this column control fo searching ?
+        // can we use this column control for searching ?
         if (!IsSearchableControl(xCurrentColumn))
             continue;
 
@@ -2577,9 +2559,9 @@ IMPL_LINK(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation*, pIn
     // let the grid snyc it's display with the cursor
     Reference< XPropertySet >  xModelSet(getControlModel(), UNO_QUERY);
     DBG_ASSERT(xModelSet.is(), "SbaXDataBrowserController::OnFoundData : no model set ?!");
-    Any aOld = xModelSet->getPropertyValue(::rtl::OUString::createFromAscii("DisplayIsSynchron"));
-    xModelSet->setPropertyValue(::rtl::OUString::createFromAscii("DisplayIsSynchron"), ::comphelper::makeBoolAny(sal_Bool(sal_True)));
-    xModelSet->setPropertyValue(::rtl::OUString::createFromAscii("DisplayIsSynchron"), aOld);
+    Any aOld = xModelSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayIsSynchron")));
+    xModelSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayIsSynchron")), ::comphelper::makeBoolAny(sal_Bool(sal_True)));
+    xModelSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayIsSynchron")), aOld);
 
     // and move to the field
     Reference< ::com::sun::star::container::XIndexAccess >  aColumnControls(getBrowserView()->getGridControl()->getPeer(), UNO_QUERY);
@@ -2621,12 +2603,12 @@ IMPL_LINK(SbaXDataBrowserController, OnCanceledNotFound, FmFoundRecordInformatio
 
     try
     {
-        // let the grid snyc it's display with the cursor
+        // let the grid snyc its display with the cursor
         Reference< XPropertySet >  xModelSet(getControlModel(), UNO_QUERY);
         DBG_ASSERT(xModelSet.is(), "SbaXDataBrowserController::OnCanceledNotFound : no model set ?!");
-        Any aOld = xModelSet->getPropertyValue(::rtl::OUString::createFromAscii("DisplayIsSynchron"));
-        xModelSet->setPropertyValue(::rtl::OUString::createFromAscii("DisplayIsSynchron"), ::comphelper::makeBoolAny(sal_Bool(sal_True)));
-        xModelSet->setPropertyValue(::rtl::OUString::createFromAscii("DisplayIsSynchron"), aOld);
+        Any aOld = xModelSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayIsSynchron")));
+        xModelSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayIsSynchron")), ::comphelper::makeBoolAny(sal_Bool(sal_True)));
+        xModelSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayIsSynchron")), aOld);
     }
     catch( const Exception& )
     {
@@ -2708,22 +2690,7 @@ void SbaXDataBrowserController::initializeParser() const
             {   // (only if the statement isn't native)
                 // (it is allowed to use the PROPERTY_ISPASSTHROUGH : _after_ loading a form it is valid)
                 xFormSet->getPropertyValue(PROPERTY_SINGLESELECTQUERYCOMPOSER) >>= m_xParser;
-/*
-                const Reference<XMultiServiceFactory> xFactory(::dbtools::getConnection(getRowSet()),UNO_QUERY);
-                if ( xFactory.is() )
-                    m_xParser.set(xFactory->createInstance(SERVICE_NAME_SINGLESELECTQUERYCOMPOSER),UNO_QUERY);
-*/
             }
-/*
-            // initialize the parser with the current sql-statement of the form
-            if ( m_xParser.is() )
-            {
-                m_xParser->setElementaryQuery(::comphelper::getString(xFormSet->getPropertyValue(PROPERTY_ACTIVECOMMAND)));
-                m_xParser->setFilter(::comphelper::getString(xFormSet->getPropertyValue(PROPERTY_FILTER)));
-                m_xParser->setHavingClause(::comphelper::getString(xFormSet->getPropertyValue(PROPERTY_HAVING_CLAUSE)));
-                m_xParser->setOrder(::comphelper::getString(xFormSet->getPropertyValue(PROPERTY_ORDER)));
-            }
-*/
         }
         catch(Exception&)
         {
@@ -2754,21 +2721,11 @@ void SbaXDataBrowserController::unloaded(const EventObject& /*aEvent*/) throw( R
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::unloaded" );
     m_xParser.clear();
     InvalidateAll();
-        // do this asynchron, there are other listeners reacting on this message ...
+        // do this asynchronously, there are other listeners reacting on this message ...
         // (it's a little hack : the grid columns are listening to this event, too, and their bound field may
         // change as a reaction on that event. as we have no chance to be notified of this change (which is
         // the one we're interested in) we give them time to do what they want to before invalidating our
         // bound-field-dependent slots ....
-    /*
-    try
-    {
-        ::comphelper::disposeComponent(m_xParser);
-    }
-    catch(Exception&)
-    {
-        OSL_ENSURE(0,"Exception thrown by dispose");
-    }
-    */
 }
 
 //------------------------------------------------------------------------------
@@ -2838,7 +2795,7 @@ sal_Bool SbaXDataBrowserController::isValidCursor() const
         {
             bIsValid = m_xParser.is();
         }
-    } // if ( !bIsValid )
+    }
     return bIsValid;
 }
 
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index bb4ae9b35b28..e4e8ca814616 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -93,7 +93,7 @@ public:
     // static methods
     static ::rtl::OUString          getImplementationName_Static() throw(  )
     {
-        return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.DBContentLoader");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.DBContentLoader"));
     }
     static Sequence< ::rtl::OUString> getSupportedServiceNames_Static(void) throw(  );
     static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
@@ -161,8 +161,8 @@ Sequence< ::rtl::OUString > SAL_CALL DBContentLoader::getSupportedServiceNames(v
 Sequence< ::rtl::OUString > DBContentLoader::getSupportedServiceNames_Static(void) throw(  )
 {
     Sequence< ::rtl::OUString > aSNS( 2 );
-    aSNS.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.frame.FrameLoader");
-    aSNS.getArray()[1] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.ContentLoader");
+    aSNS.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.FrameLoader"));
+    aSNS.getArray()[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ContentLoader"));
     return aSNS;
 }
 // -------------------------------------------------------------------------
@@ -171,17 +171,17 @@ extern "C" void SAL_CALL writeDBLoaderInfo(void* pRegistryKey)
     Reference< XRegistryKey> xKey(reinterpret_cast< XRegistryKey*>(pRegistryKey));
 
     // register content loader for dispatch
-    ::rtl::OUString aImpl = ::rtl::OUString::createFromAscii("/");
+    ::rtl::OUString aImpl(RTL_CONSTASCII_USTRINGPARAM("/"));
     aImpl += DBContentLoader::getImplementationName_Static();
 
     ::rtl::OUString aImpltwo = aImpl;
-    aImpltwo += ::rtl::OUString::createFromAscii("/UNO/Loader");
+    aImpltwo += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/Loader"));
     Reference< XRegistryKey> xNewKey = xKey->createKey( aImpltwo );
     aImpltwo = aImpl;
-    aImpltwo += ::rtl::OUString::createFromAscii("/Loader");
+    aImpltwo += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/Loader"));
     Reference< XRegistryKey >  xLoaderKey = xKey->createKey( aImpltwo );
-    xNewKey = xLoaderKey->createKey( ::rtl::OUString::createFromAscii("Pattern") );
-    xNewKey->setAsciiValue( ::rtl::OUString::createFromAscii(".component:DB*") );
+    xNewKey = xLoaderKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Pattern")) );
+    xNewKey->setAsciiValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".component:DB*")) );
 }
 
 // -----------------------------------------------------------------------
@@ -307,7 +307,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const ::
         try
         {
             Reference<XInitialization > xIni(xController,UNO_QUERY);
-            PropertyValue aFrame(::rtl::OUString::createFromAscii("Frame"),0,makeAny(rFrame),PropertyState_DIRECT_VALUE);
+            PropertyValue aFrame(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Frame")),0,makeAny(rFrame),PropertyState_DIRECT_VALUE);
             Sequence< Any > aInitArgs(m_aArgs.getLength()+1);
 
             Any* pBegin = aInitArgs.getArray();
diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
index 26c7860a474e..27854f3c69f2 100644
--- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
+++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
@@ -157,7 +157,7 @@ void SbaTableQueryBrowser::SelectionChanged()
         InvalidateFeature(ID_BROWSER_INSERTCOLUMNS);
         InvalidateFeature(ID_BROWSER_INSERTCONTENT);
         InvalidateFeature(ID_BROWSER_FORMLETTER);
-    } // if ( !m_bShowMenu )
+    }
     InvalidateFeature(ID_BROWSER_COPY);
     InvalidateFeature(ID_BROWSER_CUT);
 }
@@ -224,25 +224,21 @@ void SbaTableQueryBrowser::notifyHiContrastChanged()
             ::std::auto_ptr< ImageProvider > pImageProvider( getImageProviderFor( pEntryLoop ) );
 
             // the images for this entry
-            Image aImage, aImageHC;
+            Image aImage;
             if ( pData->eType == etDatasource )
-            {
-                aImage = pImageProvider->getDatabaseImage( false );
-                aImageHC = pImageProvider->getDatabaseImage( true );
-            }
+                aImage = pImageProvider->getDatabaseImage();
             else
             {
                 bool bIsFolder = !isObject( pData->eType );
                 if ( bIsFolder )
                 {
                     sal_Int32 nObjectType( getDatabaseObjectType( pData->eType ) );
-                    aImage = pImageProvider->getFolderImage( nObjectType, false );
-                    aImageHC = pImageProvider->getFolderImage( nObjectType, true );
+                    aImage = pImageProvider->getFolderImage( nObjectType );
                 }
                 else
                 {
                     sal_Int32 nObjectType( getDatabaseObjectType( pData->eType ) );
-                    pImageProvider->getImages( GetEntryText( pEntryLoop ), nObjectType, aImage, aImageHC );
+                    pImageProvider->getImages( GetEntryText( pEntryLoop ), nObjectType, aImage );
                 }
             }
 
@@ -256,10 +252,8 @@ void SbaTableQueryBrowser::notifyHiContrastChanged()
 
                 SvLBoxContextBmp* pContextBitmapItem = static_cast< SvLBoxContextBmp* >( pItem );
 
-                pContextBitmapItem->SetBitmap1( aImage, BMP_COLOR_NORMAL );
-                pContextBitmapItem->SetBitmap2( aImage, BMP_COLOR_NORMAL );
-                pContextBitmapItem->SetBitmap1( aImageHC, BMP_COLOR_HIGHCONTRAST );
-                pContextBitmapItem->SetBitmap2( aImageHC, BMP_COLOR_HIGHCONTRAST );
+                pContextBitmapItem->SetBitmap1( aImage );
+                pContextBitmapItem->SetBitmap2( aImage );
                 break;
             }
 
diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx
index 6526592112fc..0b3e76a54115 100644
--- a/dbaccess/source/ui/browser/exsrcbrw.cxx
+++ b/dbaccess/source/ui/browser/exsrcbrw.cxx
@@ -154,7 +154,7 @@ void SbaExternalSourceBrowser::modified(const ::com::sun::star::lang::EventObjec
 void SAL_CALL SbaExternalSourceBrowser::dispatch(const ::com::sun::star::util::URL& aURL, const Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) throw(::com::sun::star::uno::RuntimeException)
 {
     const ::com::sun::star::beans::PropertyValue* pArguments = aArgs.getConstArray();
-    if (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/AddGridColumn")))
+    if (aURL.Complete.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FormSlots/AddGridColumn"))))
     {
         // search the argument describing the column to create
         ::rtl::OUString sControlType;
@@ -163,21 +163,21 @@ void SAL_CALL SbaExternalSourceBrowser::dispatch(const ::com::sun::star::util::U
         sal_uInt16 i;
         for ( i = 0; i < aArgs.getLength(); ++i, ++pArguments )
         {
-            if (pArguments->Name.equals(::rtl::OUString::createFromAscii("ColumnType")))
+            if (pArguments->Name.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ColumnType"))))
             {
                 sal_Bool bCorrectType = pArguments->Value.getValueType().equals(::getCppuType((const ::rtl::OUString*)0));
                 OSL_ENSURE(bCorrectType, "invalid type for argument \"ColumnType\" !");
                 if (bCorrectType)
                     sControlType = ::comphelper::getString(pArguments->Value);
             }
-            else if (pArguments->Name.equals(::rtl::OUString::createFromAscii("ColumnPosition")))
+            else if (pArguments->Name.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ColumnPosition"))))
             {
                 sal_Bool bCorrectType = pArguments->Value.getValueType().equals(::getCppuType((const sal_Int16*)0));
                 OSL_ENSURE(bCorrectType, "invalid type for argument \"ColumnPosition\" !");
                 if (bCorrectType)
                     nControlPos = ::comphelper::getINT16(pArguments->Value);
             }
-            else if (pArguments->Name.equals(::rtl::OUString::createFromAscii("ColumnProperties")))
+            else if (pArguments->Name.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ColumnProperties"))))
             {
                 sal_Bool bCorrectType = pArguments->Value.getValueType().equals(::getCppuType((const Sequence< ::com::sun::star::beans::PropertyValue>*)0));
                 OSL_ENSURE(bCorrectType, "invalid type for argument \"ColumnProperties\" !");
@@ -190,7 +190,7 @@ void SAL_CALL SbaExternalSourceBrowser::dispatch(const ::com::sun::star::util::U
         if (!sControlType.getLength())
         {
             OSL_ENSURE(sal_False, "SbaExternalSourceBrowser::dispatch(AddGridColumn) : missing argument (ColumnType) !");
-            sControlType = ::rtl::OUString::createFromAscii("TextField");
+            sControlType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextField"));
         }
         OSL_ENSURE(aControlProps.getLength(), "SbaExternalSourceBrowser::dispatch(AddGridColumn) : missing argument (ColumnProperties) !");
 
@@ -200,7 +200,7 @@ void SAL_CALL SbaExternalSourceBrowser::dispatch(const ::com::sun::star::util::U
         Reference< XPropertySetInfo > xNewColProperties;
         if (xNewCol.is())
             xNewColProperties = xNewCol->getPropertySetInfo();
-        // set it's properties
+        // set its properties
         if (xNewColProperties.is())
         {
             const ::com::sun::star::beans::PropertyValue* pControlProps = aControlProps.getConstArray();
@@ -232,20 +232,20 @@ void SAL_CALL SbaExternalSourceBrowser::dispatch(const ::com::sun::star::util::U
         // append the column
         xColContainer->insertByIndex(nControlPos, makeAny(xNewCol));
     }
-    else if (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/ClearView")))
+    else if (aURL.Complete.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FormSlots/ClearView"))))
     {
         ClearView();
     }
-    else if (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/AttachToForm")))
+    else if (aURL.Complete.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FormSlots/AttachToForm"))))
     {
         if (!m_pDataSourceImpl)
             return;
 
         Reference< XRowSet >  xMasterForm;
-        // search the arguments for he master form
+        // search the arguments for the master form
         for (sal_uInt16 i=0; i<aArgs.getLength(); ++i, ++pArguments)
         {
-            if ((pArguments->Name.equals(::rtl::OUString::createFromAscii("MasterForm"))) && (pArguments->Value.getValueTypeClass() == TypeClass_INTERFACE))
+            if ((pArguments->Name.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MasterForm")))) && (pArguments->Value.getValueTypeClass() == TypeClass_INTERFACE))
             {
                 xMasterForm = Reference< XRowSet > (*(Reference< XInterface > *)pArguments->Value.getValue(), UNO_QUERY);
                 break;
@@ -272,22 +272,22 @@ Reference< ::com::sun::star::frame::XDispatch >  SAL_CALL SbaExternalSourceBrows
 
     m_bInQueryDispatch = sal_True;
 
-    if  (   (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/AttachToForm")))
+    if  (   (aURL.Complete.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FormSlots/AttachToForm"))))
             // attach a new external form
-        ||  (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/AddGridColumn")))
+        ||  (aURL.Complete.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FormSlots/AddGridColumn"))))
             // add a column to the grid
-        ||  (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/ClearView")))
+        ||  (aURL.Complete.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FormSlots/ClearView"))))
             // clear the grid
         )
         xReturn = (::com::sun::star::frame::XDispatch*)this;
 
     if  (   !xReturn.is()
-        &&  (   (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToFirst")))
-            ||  (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToPrev")))
-            ||  (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToNext")))
-            ||  (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToLast")))
-            ||  (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToNew")))
-            ||  (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/undoRecord")))
+        &&  (   (aURL.Complete.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FormSlots/moveToFirst"))))
+            ||  (aURL.Complete.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FormSlots/moveToPrev"))))
+            ||  (aURL.Complete.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FormSlots/moveToNext"))))
+            ||  (aURL.Complete.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FormSlots/moveToLast"))))
+            ||  (aURL.Complete.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FormSlots/moveToNew"))))
+            ||  (aURL.Complete.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FormSlots/undoRecord"))))
             )
         )
     {
@@ -300,7 +300,7 @@ Reference< ::com::sun::star::frame::XDispatch >  SAL_CALL SbaExternalSourceBrows
             m_xUrlTransformer->parseStrict( aNewUrl );
 
         // set a new mark
-        aNewUrl.Mark = ::rtl::OUString::createFromAscii("DB/FormGridView");
+        aNewUrl.Mark = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DB/FormGridView"));
             // this controller is instantiated when somebody dispatches the ".component:DB/FormGridView" in any
             // frame, so we use "FormGridView" as mark that a dispatch request came from this view
 
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 6bac728cad62..fda42e1afa80 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -209,7 +209,7 @@ OGenericUnoController::OGenericUnoController(const Reference< XMultiServiceFacto
 
     try
     {
-        m_xUrlTransformer = Reference< XURLTransformer > (_rM->createInstance(::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer")), UNO_QUERY);
+        m_xUrlTransformer = Reference< XURLTransformer > (_rM->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY);
     }
     catch(Exception&)
     {
@@ -308,12 +308,6 @@ void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArgumen
         {
             xFrame.set(aValue.Value,UNO_QUERY_THROW);
         }
-        /* #i42316#
-        else if ( ( *pIter >>= aValue ) && ( 0 == aValue.Name.compareToAscii( "ReadOnly" ) ) )
-        {
-            aValue.Value >>= m_bReadOnly;
-        }
-        */
         else if ( ( *pIter >>= aValue ) && ( 0 == aValue.Name.compareToAscii( "Preview" ) ) )
         {
             aValue.Value >>= m_bPreview;
@@ -330,7 +324,7 @@ void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArgumen
         Window* pParentWin = pParentComponent ? pParentComponent->GetWindow() : NULL;
         if (!pParentWin)
         {
-            throw IllegalArgumentException( ::rtl::OUString::createFromAscii( "Parent window is null" ), *this, 1 );
+            throw IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Parent window is null")), *this, 1 );
         }
 
         m_aInitParameters.assign( aArguments );
@@ -338,7 +332,7 @@ void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArgumen
 
         ODataView* pView = getView();
         if ( !pView )
-            throw RuntimeException( ::rtl::OUString::createFromAscii( "unable to create a view" ), *this );
+            throw RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unable to create a view")), *this );
 
         if ( m_bReadOnly || m_bPreview )
             pView->EnableInput( FALSE );
@@ -674,7 +668,7 @@ void OGenericUnoController::InvalidateAll()
 void OGenericUnoController::InvalidateAll_Impl()
 {
     // ---------------------------------
-    // invalidate all aupported features
+    // invalidate all supported features
 
     for (   SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.begin();
             aIter != m_aSupportedFeatures.end();
@@ -793,12 +787,12 @@ void OGenericUnoController::addStatusListener(const Reference< XStatusListener >
     if ( m_xUrlTransformer.is() )
         m_xUrlTransformer->parseStrict( aParsedURL );
 
-    // remeber the listener together with the URL
+    // remember the listener together with the URL
     m_arrStatusListener.insert( m_arrStatusListener.end(), DispatchTarget( aParsedURL, aListener ) );
 
     // initially broadcast the state
     ImplBroadcastFeatureState( aParsedURL.Complete, aListener, sal_True );
-        // force the new state to be broadcasted to the new listener
+        // force the new state to be broadcast to the new listener
 }
 
 // -----------------------------------------------------------------------
@@ -1314,7 +1308,7 @@ namespace
 void OGenericUnoController::openHelpAgent(rtl::OUString const& _suHelpStringURL )
 {
     rtl::OUString suURL(_suHelpStringURL);
-    rtl::OUString sLanguage = rtl::OUString::createFromAscii("Language=");
+    rtl::OUString sLanguage(RTL_CONSTASCII_USTRINGPARAM("Language="));
     if (suURL.indexOf(sLanguage) == -1)
     {
         AppendConfigToken(suURL, sal_False /* sal_False := add '&' */ );
@@ -1571,6 +1565,16 @@ Sequence< ::sal_Int16 > SAL_CALL OGenericUnoController::getSupportedCommandGroup
     return aCommandGroups;
 }
 
+namespace
+{
+    //Current c++0x draft (apparently) has std::identity, but not operator()
+    template<typename T> struct SGI_identity : public std::unary_function<T,T>
+    {
+        T& operator()(T& x) const { return x; }
+        const T& operator()(const T& x) const { return x; }
+    };
+}
+
 // -----------------------------------------------------------------------------
 Sequence< DispatchInformation > SAL_CALL OGenericUnoController::getConfigurableDispatchInformation( ::sal_Int16 CommandGroup ) throw (RuntimeException)
 {
@@ -1592,7 +1596,7 @@ Sequence< DispatchInformation > SAL_CALL OGenericUnoController::getConfigurableD
     ::std::transform( aInformationList.begin(),
         aInformationList.end(),
         aInformation.getArray(),
-        ::std::identity< DispatchInformation >()
+        SGI_identity< DispatchInformation >()
     );
 
     return aInformation;
diff --git a/dbaccess/source/ui/browser/makefile.mk b/dbaccess/source/ui/browser/makefile.mk
index a7dbd7413d78..4d0cbc8f8517 100644
--- a/dbaccess/source/ui/browser/makefile.mk
+++ b/dbaccess/source/ui/browser/makefile.mk
@@ -37,25 +37,25 @@ TARGET=browser
 # --- Files --------------------------------------------------------
 
 EXCEPTIONSFILES=\
-            $(SLO)$/genericcontroller.obj		\
-            $(SLO)$/dsbrowserDnD.obj			\
-            $(SLO)$/dataview.obj				\
-            $(SLO)$/dbexchange.obj				\
-            $(SLO)$/dbloader.obj				\
-            $(SLO)$/sbagrid.obj					\
-            $(SLO)$/formadapter.obj				\
-            $(SLO)$/brwview.obj					\
-            $(SLO)$/brwctrlr.obj				\
-            $(SLO)$/unodatbr.obj				\
-            $(SLO)$/sbamultiplex.obj			\
+            $(SLO)$/AsyncronousLink.obj		\
+            $(SLO)$/brwctrlr.obj		\
+            $(SLO)$/brwview.obj			\
+            $(SLO)$/dataview.obj		\
+            $(SLO)$/dbexchange.obj		\
+            $(SLO)$/dbloader.obj		\
+            $(SLO)$/dbtreemodel.obj		\
+            $(SLO)$/dbtreeview.obj		\
+            $(SLO)$/dsEntriesNoExp.obj		\
+            $(SLO)$/dsbrowserDnD.obj		\
             $(SLO)$/exsrcbrw.obj                \
-            $(SLO)$/dbtreemodel.obj				\
-            $(SLO)$/dsEntriesNoExp.obj			\
-            $(SLO)$/dbtreeview.obj
+            $(SLO)$/formadapter.obj		\
+            $(SLO)$/genericcontroller.obj	\
+            $(SLO)$/sbagrid.obj			\
+            $(SLO)$/sbamultiplex.obj		\
+            $(SLO)$/unodatbr.obj
 
 SLOFILES =\
-            $(EXCEPTIONSFILES)\
-            $(SLO)$/AsyncronousLink.obj
+            $(EXCEPTIONSFILES)
 
 SRS1NAME=$(TARGET)
 SRC1FILES =  sbabrw.src	\
diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src
index 747a2d7ac8cf..d31d08cfcaa7 100644
--- a/dbaccess/source/ui/browser/sbabrw.src
+++ b/dbaccess/source/ui/browser/sbabrw.src
@@ -33,7 +33,6 @@
 #ifndef DBACCESS_UI_BROWSER_ID_HXX
 #include "browserids.hxx"
 #endif
-//  #include <sfx2/sfx.hrc>
 #ifndef _GLOBLMN_HRC
 #include <svx/globlmn.hrc>
 #endif
@@ -63,6 +62,7 @@ String SBA_BROWSER_SETTING_ORDER
 {
     Text [ en-US ] = "Error setting the sort criteria";
 };
+
 String SBA_BROWSER_SETTING_FILTER
 {
     Text [ en-US ] = "Error setting the filter criteria";
@@ -140,13 +140,13 @@ QueryBox QUERY_BRW_DELETE_QUERY_CONFIRM
 {
     Buttons = WB_YES_NO ;
     Message [ en-US ] = "The query already exists. Do you want to delete it?" ;
-    };
+};
 
 QueryBox QUERY_CONNECTION_LOST
 {
     Buttons = WB_YES_NO ;
     Message [ en-US ] = "The connection to the database has been lost. Do you want to reconnect?" ;
-    };
+};
 
 String STR_OPENTABLES_WARNINGS
 {
@@ -161,22 +161,22 @@ String STR_OPENTABLES_WARNINGS_DETAILS
 String STR_CONNECTING_DATASOURCE
 {
     Text [ en-US ] = "Connecting to \"$name$\" ...";
-    };
+};
 
 String STR_LOADING_QUERY
 {
     Text [ en-US ] = "Loading query $name$ ...";
-    };
+};
 
 String STR_LOADING_TABLE
 {
     Text [ en-US ] = "Loading table $name$ ...";
-    };
+};
 
 String STR_NO_TABLE_FORMAT_INSIDE
 {
     Text [ en-US ] = "No table format could be found." ;
-    };
+};
 
 String STR_COULDNOTCONNECT_DATASOURCE
 {
@@ -202,4 +202,3 @@ Menu RID_MENU_REFRESH_DATA
         };
     };
 };
-
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 1652ed46b094..f4d783f4df89 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -160,16 +160,16 @@ Reference< XInterface > SAL_CALL SbaXGridControl::Create(const Reference<XMultiS
 //------------------------------------------------------------------------------
 ::rtl::OUString SbaXGridControl::getImplementationName_Static() throw( RuntimeException )
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.dbu.SbaXGridControl");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.dbu.SbaXGridControl"));
 }
 
 //------------------------------------------------------------------------------
 Sequence< ::rtl::OUString> SbaXGridControl::getSupportedServiceNames_Static(void) throw( RuntimeException )
 {
     Sequence< ::rtl::OUString> aSupported(3);
-    aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.form.control.InteractionGridControl");
-    aSupported[1] = ::rtl::OUString::createFromAscii("com.sun.star.form.control.GridControl");
-    aSupported[2] = ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControl");
+    aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.control.InteractionGridControl"));
+    aSupported[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.control.GridControl"));
+    aSupported[2] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControl"));
     return aSupported;
 }
 DBG_NAME(SbaXGridControl );
@@ -257,8 +257,6 @@ void SAL_CALL SbaXGridControl::createPeer(const Reference< ::com::sun::star::awt
 
     // TODO: why the hell this whole class does not use any mutex?
 
-//  if (0 == m_nPeerCreationLevel)
-    {
         Reference< ::com::sun::star::frame::XDispatch >  xDisp(getPeer(), UNO_QUERY);
         for (   StatusMultiplexerArray::iterator aIter = m_aStatusMultiplexer.begin();
                 aIter != m_aStatusMultiplexer.end();
@@ -267,7 +265,6 @@ void SAL_CALL SbaXGridControl::createPeer(const Reference< ::com::sun::star::awt
             if ((*aIter).second && (*aIter).second->getLength())
                 xDisp->addStatusListener((*aIter).second, (*aIter).first);
         }
-    }
 }
 
 //---------------------------------------------------------------------------------------
@@ -423,10 +420,10 @@ Any SAL_CALL SbaXGridPeer::queryInterface(const Type& _rType) throw (RuntimeExce
 //---------------------------------------------------------------------------------------
 Reference< ::com::sun::star::frame::XDispatch >  SAL_CALL SbaXGridPeer::queryDispatch(const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException )
 {
-    if  (   (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/BrowserAttribs")))
-        ||  (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/RowHeight")))
-        ||  (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/ColumnAttribs")))
-        ||  (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/ColumnWidth")))
+    if  (   (aURL.Complete.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:GridSlots/BrowserAttribs"))))
+        ||  (aURL.Complete.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:GridSlots/RowHeight"))))
+        ||  (aURL.Complete.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:GridSlots/ColumnAttribs"))))
+        ||  (aURL.Complete.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:GridSlots/ColumnWidth"))))
         )
     {
         return (::com::sun::star::frame::XDispatch*)this;
@@ -509,17 +506,17 @@ void SAL_CALL SbaXGridPeer::dispatch(const URL& aURL, const Sequence< PropertyVa
     const PropertyValue* pArgs = aArgs.getConstArray();
     for (sal_uInt16 i=0; i<aArgs.getLength(); ++i, ++pArgs)
     {
-        if (pArgs->Name == ::rtl::OUString::createFromAscii("ColumnViewPos"))
+        if (pArgs->Name == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ColumnViewPos")))
         {
             nColId = pGrid->GetColumnIdFromViewPos(::comphelper::getINT16(pArgs->Value));
             break;
         }
-        if (pArgs->Name == ::rtl::OUString::createFromAscii("ColumnModelPos"))
+        if (pArgs->Name == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ColumnModelPos")))
         {
             nColId = pGrid->GetColumnIdFromModelPos(::comphelper::getINT16(pArgs->Value));
             break;
         }
-        if (pArgs->Name == ::rtl::OUString::createFromAscii("ColumnId"))
+        if (pArgs->Name == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ColumnId")))
         {
             nColId = ::comphelper::getINT16(pArgs->Value);
             break;
@@ -675,10 +672,6 @@ void SbaGridHeader::MouseButtonDown( const MouseEvent& _rMEvt )
             // the base class will start a column move here, which we don't want to allow
             // (at the moment. If we store relative positions with the columns, we can allow column moves ....)
 
-//          sal_uInt16  nPos(0);
-//          sal_uInt16  nHitTest = ImplHitTest( _rMEvt.GetPosPixel(), mnMouseOff, nPos );
-//          if (!nHitTest & HEAD_HITTEST_DIVIDER)
-//              return;
         }
 
     FmGridHeader::MouseButtonDown(_rMEvt);
@@ -863,7 +856,7 @@ void SbaGridControl::PreExecuteRowContextMenu(sal_uInt16 nRow, PopupMenu& rMenu)
         rMenu.InsertItem(ID_BROWSER_ROWHEIGHT, aNewItems.GetItemText(ID_BROWSER_ROWHEIGHT), 0, nPos++);
         rMenu.SetHelpId(ID_BROWSER_ROWHEIGHT, aNewItems.GetHelpId(ID_BROWSER_ROWHEIGHT));
         rMenu.InsertSeparator(nPos++);
-    } // if (!IsReadOnlyDB())
+    }
 
     if ( GetSelectRowCount() > 0 )
     {
@@ -994,13 +987,13 @@ void SbaGridControl::SetBrowserAttrs()
     try
     {
         PropertyValue aArg;
-        aArg.Name = ::rtl::OUString::createFromAscii("IntrospectedObject");
+        aArg.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IntrospectedObject"));
         aArg.Value <<= xGridModel;
         Sequence< Any > aDialogArgs(1);
         aDialogArgs[0] <<= aArg;
 
         Reference< XInterface > xDialog = getServiceManager()->createInstanceWithArguments(
-            ::rtl::OUString::createFromAscii("com.sun.star.form.ControlFontDialog"),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.ControlFontDialog")),
             aDialogArgs
             );
         if (!xDialog.is())
@@ -1206,14 +1199,14 @@ void SbaGridControl::StartDrag( sal_Int8 _nAction, const Point& _rPosPixel )
         // check which kind of dragging has to be initiated
         if  (   bHitHandle                          //  the handle column
                                                     // AND
-            &&  (   GetSelectRowCount()                     //  at least one row is selected
-                                                        // OR
-                ||  (   (nRow >= 0)                         //  a row below the header
-                    &&  !bCurrentRowVirtual                 //  we aren't appending a new record
-                    &&  (nRow != GetCurrentPos())           //  a row which is not the current one
-                    )                                   // OR
-                ||  (   (0 == GetSelectRowCount())          // no rows selected
-                    &&  (-1 == nRow)                        // hit the header
+            &&  (   GetSelectRowCount()             //  at least one row is selected
+                                                    // OR
+                ||  (   (nRow >= 0)                 //  a row below the header
+                    &&  !bCurrentRowVirtual         //  we aren't appending a new record
+                    &&  (nRow != GetCurrentPos())   //  a row which is not the current one
+                    )                               // OR
+                ||  (   (0 == GetSelectRowCount())  // no rows selected
+                    &&  (-1 == nRow)                // hit the header
                     )
                 )
             )
@@ -1397,8 +1390,6 @@ void SbaGridControl::DoFieldDrag(sal_uInt16 nColumnPos, sal_Int16 nRowPos)
         {
             switch (_aType.mnSotId)
             {
-//              case SOT_FORMAT_RTF:                    // RTF data descriptions
-//              case SOT_FORMATSTR_ID_HTML:             // HTML data descriptions
                 case SOT_FORMATSTR_ID_DBACCESS_TABLE:   // table descriptor
                 case SOT_FORMATSTR_ID_DBACCESS_QUERY:   // query descriptor
                 case SOT_FORMATSTR_ID_DBACCESS_COMMAND: // SQL command
diff --git a/dbaccess/source/ui/browser/sbagrid.src b/dbaccess/source/ui/browser/sbagrid.src
index 1362944d5847..ca43b02732ba 100644
--- a/dbaccess/source/ui/browser/sbagrid.src
+++ b/dbaccess/source/ui/browser/sbagrid.src
@@ -102,10 +102,12 @@ String STR_QRY_TITLE
 {
     Text [ en-US ] = "Query #" ;
 };
+
 String STR_TBL_TITLE
 {
     Text [ en-US ] = "Table #" ;
 };
+
 String STR_VIEW_TITLE
 {
     Text [ en-US ] = "View #" ;
@@ -136,4 +138,3 @@ String STR_DATASOURCE_GRIDCONTROL_DESC
 {
     Text [ en-US ] = "Shows the selected table or query.";
 };
-
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index f963afecab31..af280c66794f 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -207,13 +207,13 @@ void SafeRemovePropertyListener(const Reference< XPropertySet > & xSet, const ::
 // -------------------------------------------------------------------------
 ::rtl::OUString SbaTableQueryBrowser::getImplementationName_Static() throw(RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.ODatasourceBrowser");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.ODatasourceBrowser"));
 }
 //-------------------------------------------------------------------------
 ::comphelper::StringSequence SbaTableQueryBrowser::getSupportedServiceNames_Static() throw(RuntimeException)
 {
     ::comphelper::StringSequence aSupported(1);
-    aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.DataSourceBrowser");
+    aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.DataSourceBrowser"));
     return aSupported;
 }
 //-------------------------------------------------------------------------
@@ -369,7 +369,7 @@ sal_Bool SbaTableQueryBrowser::Construct(Window* pParent)
         xDatabaseRegistrations->addDatabaseRegistrationsListener( this );
 
         // the collator for the string compares
-        m_xCollator = Reference< XCollator >( getORB()->createInstance(::rtl::OUString::createFromAscii( "com.sun.star.i18n.Collator" ) ), UNO_QUERY_THROW );
+        m_xCollator = Reference< XCollator >( getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.Collator")) ), UNO_QUERY_THROW );
         m_xCollator->loadDefaultCollator( Application::GetSettings().GetLocale(), 0 );
     }
     catch(Exception&)
@@ -608,7 +608,7 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun::
                     case DataType::BIT:
                     case DataType::BOOLEAN:
                     {
-                        aCurrentModelType = ::rtl::OUString::createFromAscii("CheckBox");
+                        aCurrentModelType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CheckBox"));
                         aInitialValues.push_back( NamedValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VisualEffect" ) ), makeAny( VisualEffect::FLAT ) ) );
                         sDefaultProperty = PROPERTY_DEFAULTSTATE;
 
@@ -628,7 +628,7 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun::
                     case DataType::BINARY:
                     case DataType::VARBINARY:
                     case DataType::LONGVARBINARY:
-                        aCurrentModelType = ::rtl::OUString::createFromAscii("TextField");
+                        aCurrentModelType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextField"));
                         sDefaultProperty = PROPERTY_DEFAULTTEXT;
                         break;
 
@@ -637,12 +637,12 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun::
                         bFormattedIsNumeric = sal_False;
                         // NO break!
                     default:
-                        aCurrentModelType = ::rtl::OUString::createFromAscii("FormattedField");
+                        aCurrentModelType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormattedField"));
                         sDefaultProperty = PROPERTY_EFFECTIVEDEFAULT;
 
                         if ( xSupplier.is() )
-                            aInitialValues.push_back( NamedValue( ::rtl::OUString::createFromAscii( "FormatsSupplier" ), makeAny( xSupplier ) ) );
-                        aInitialValues.push_back( NamedValue( ::rtl::OUString::createFromAscii( "TreatAsNumber" ), makeAny( (sal_Bool)bFormattedIsNumeric ) ) );
+                            aInitialValues.push_back( NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormatsSupplier")), makeAny( xSupplier ) ) );
+                        aInitialValues.push_back( NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TreatAsNumber")), makeAny( (sal_Bool)bFormattedIsNumeric ) ) );
                         aCopyProperties.push_back( PROPERTY_FORMATKEY );
                         break;
                 }
@@ -955,7 +955,7 @@ void SbaTableQueryBrowser::checkDocumentDataSource()
     if (!bKnownDocDataSource)
     {
         if (NULL != pDataSourceEntry)
-        {   // at least the data source is know
+        {   // at least the data source is known
             if (NULL != pContainerEntry)
                 bKnownDocDataSource = sal_True; // assume we know it.
                 // TODO: should we expand the object container? This may be too expensive just for checking ....
@@ -1006,7 +1006,6 @@ namespace
         if ( aURL.GetProtocol() != INET_PROT_NOT_VALID )
         {
             _rDisplayName = aURL.getBase(INetURLObject::LAST_SEGMENT,true,INetURLObject::DECODE_WITH_CHARSET);
-            //  _rDisplayName = aURL.getName(INetURLObject::LAST_SEGMENT,true,INetURLObject::DECODE_WITH_CHARSET);
             _rUniqueId = aURL.GetMainURL( INetURLObject::NO_DECODE );
             return true;
         }
@@ -1149,7 +1148,6 @@ SvLBoxEntry* SbaTableQueryBrowser::getObjectEntry(const ::rtl::OUString& _rDataS
                             }
                         }
                     }
-                     //   m_pTreeView->getListBox().Expand(pCommandType);
                 }
                 while ( nIndex >= 0 );
             }
@@ -1211,7 +1209,7 @@ void SbaTableQueryBrowser::connectExternalDispatches()
             )
         {
             feature->second.xDispatcher = xProvider->queryDispatch(
-                feature->second.aURL, ::rtl::OUString::createFromAscii("_parent"), FrameSearchFlag::PARENT
+                feature->second.aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_parent")), FrameSearchFlag::PARENT
             );
 
             if ( feature->second.xDispatcher.get() == static_cast< XDispatch* >( this ) )
@@ -1308,7 +1306,7 @@ void SAL_CALL SbaTableQueryBrowser::disposing( const EventObject& _rSource ) thr
                     DBTreeListUserData* pData = static_cast<DBTreeListUserData*>(pDSLoop->GetUserData());
                     if ( pData && pData->xConnection == xCon )
                     {
-                        // we set the conenction to null to avoid a second disposing of the connection
+                        // we set the connection to null to avoid a second disposing of the connection
                         pData->xConnection.clear();
                         closeConnection(pDSLoop,sal_False);
                         break;
@@ -1428,7 +1426,7 @@ void SbaTableQueryBrowser::attachFrame(const Reference< ::com::sun::star::frame:
     Reference< XFrame > xCurrentFrame( getFrame() );
     if ( xCurrentFrame.is() )
     {
-        m_xCurrentFrameParent = xCurrentFrame->findFrame(::rtl::OUString::createFromAscii("_parent"),FrameSearchFlag::PARENT);
+        m_xCurrentFrameParent = xCurrentFrame->findFrame(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_parent")),FrameSearchFlag::PARENT);
         if ( m_xCurrentFrameParent.is() )
             m_xCurrentFrameParent->addFrameActionListener((::com::sun::star::frame::XFrameActionListener*)this);
 
@@ -1750,7 +1748,7 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const
                     {
                         aReturn.bEnabled = m_aCurrentFrame.isActive();
                         break;
-                    } // if ( getBrowserView()->getVclControl()->GetSelectRowCount() )
+                    }
                     else
                         aReturn.bEnabled = pControl->canCopyCellText(pControl->GetCurRow(), pControl->GetCurColumnId());
                     break;
@@ -1980,12 +1978,12 @@ void SbaTableQueryBrowser::implAddDatasource(const String& _rDbName, Image& _rDb
 
     ImageProvider aImageProvider;
     if (!_rQueryImage)
-        _rQueryImage = aImageProvider.getFolderImage( DatabaseObject::QUERY, isHiContrast() );
+        _rQueryImage = aImageProvider.getFolderImage( DatabaseObject::QUERY );
     if (!_rTableImage)
-        _rTableImage = aImageProvider.getFolderImage( DatabaseObject::TABLE, isHiContrast() );
+        _rTableImage = aImageProvider.getFolderImage( DatabaseObject::TABLE );
 
     if (!_rDbImage)
-        _rDbImage = aImageProvider.getDatabaseImage( isHiContrast() );
+        _rDbImage = aImageProvider.getDatabaseImage();
 
     // add the entry for the data source
     // special handling for data sources denoted by URLs - we do not want to display this ugly URL, do we?
@@ -2077,15 +2075,13 @@ SvLBoxEntry* SbaTableQueryBrowser::implAppendEntry( SvLBoxEntry* _pParent, const
 {
     ::std::auto_ptr< ImageProvider > pImageProvider( getImageProviderFor( _pParent ) );
 
-    Image aImage, aImageHC;
-    pImageProvider->getImages( _rName, getDatabaseObjectType( _eEntryType ), aImage, aImageHC );
+    Image aImage;
+    pImageProvider->getImages( _rName, getDatabaseObjectType( _eEntryType ), aImage );
 
     SvLBoxEntry* pNewEntry = m_pTreeView->getListBox().InsertEntry( _rName, _pParent, _eEntryType == etQueryContainer , LIST_APPEND, _pUserData );
 
-    m_pTreeView->getListBox().SetExpandedEntryBmp( pNewEntry, aImage, BMP_COLOR_NORMAL );
-    m_pTreeView->getListBox().SetCollapsedEntryBmp( pNewEntry, aImage, BMP_COLOR_NORMAL );
-    m_pTreeView->getListBox().SetExpandedEntryBmp( pNewEntry, aImageHC, BMP_COLOR_HIGHCONTRAST );
-    m_pTreeView->getListBox().SetCollapsedEntryBmp( pNewEntry, aImageHC, BMP_COLOR_HIGHCONTRAST );
+    m_pTreeView->getListBox().SetExpandedEntryBmp(  pNewEntry, aImage );
+    m_pTreeView->getListBox().SetCollapsedEntryBmp( pNewEntry, aImage );
 
     return pNewEntry;
 }
@@ -3500,7 +3496,7 @@ sal_Bool SbaTableQueryBrowser::implGetQuerySignature( ::rtl::OUString& _rCommand
 
     try
     {
-        // ontain the dss (data source signature) of the form
+        // contain the dss (data source signature) of the form
         ::rtl::OUString sDataSourceName;
         ::rtl::OUString sCommand;
         sal_Int32       nCommandType = CommandType::COMMAND;
@@ -3570,14 +3566,6 @@ void SbaTableQueryBrowser::clearGridColumns(const Reference< XNameContainer >& _
     }
 }
 // -----------------------------------------------------------------------------
-sal_Bool SbaTableQueryBrowser::isHiContrast() const
-{
-    sal_Bool bRet = sal_False;
-    if ( m_pTreeView )
-        bRet = m_pTreeView->getListBox().GetSettings().GetStyleSettings().GetHighContrastMode();
-    return bRet;
-}
-// -----------------------------------------------------------------------------
 void SbaTableQueryBrowser::loadMenu(const Reference< XFrame >& _xFrame)
 {
     if ( m_bShowMenu )
@@ -3614,7 +3602,7 @@ void SbaTableQueryBrowser::loadMenu(const Reference< XFrame >& _xFrame)
             sTitle = aURL.getBase(INetURLObject::LAST_SEGMENT,true,INetURLObject::DECODE_WITH_CHARSET);
         if ( sName.getLength() )
         {
-            sName += ::rtl::OUString::createFromAscii(" - ");
+            sName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" - "));
             sName += sTitle;
             sTitle = sName;
         }
@@ -3655,7 +3643,6 @@ void SbaTableQueryBrowser::postReloadForm()
 {
     InitializeGridModel(getFormComponent());
     LoadFinished(sal_True);
-    //updateTitle();
 }
 
 //------------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx
index 094b1c6f4271..db9bd6809d7a 100644
--- a/dbaccess/source/ui/control/ColumnControlWindow.cxx
+++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx
@@ -73,7 +73,6 @@ void OColumnControlWindow::ActivateAggregate( EControlType eType )
     {
         case tpFormat:
         case tpDefault:
-//      case tpAutoIncrement:
         case tpColumnName:
             break;
         default:
@@ -87,7 +86,6 @@ void OColumnControlWindow::DeactivateAggregate( EControlType eType )
     {
         case tpFormat:
         case tpDefault:
-//      case tpAutoIncrement:
         case tpColumnName:
             break;
         default:
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 353fba74e3e1..db5bc13ac1e3 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -410,7 +410,6 @@ void OFieldDescControl::CheckScrollBars()
     {
         m_pVertScroll->Show();
         m_pVertScroll->SetRangeMax(nActive - nLastVisible);
-//      m_pVertScroll->SetThumbPos(0);
 
         m_pVertScroll->SetPosSizePixel( Point(nNewHWidth, 0), Size(nVScrollWidth, szOverallSize.Height()) );
     }
@@ -425,7 +424,6 @@ void OFieldDescControl::CheckScrollBars()
     {
         m_pHorzScroll->Show();
         m_pHorzScroll->SetRangeMax((lMaxXPosition - lMaxXAvailable + HSCROLL_STEP - 1 )/HSCROLL_STEP);
-//      m_pHorzScroll->SetThumbPos(0);
 
         m_pHorzScroll->SetPosSizePixel( Point(0, nNewVHeight), Size(bNeedVScrollBar ? nNewHWidth : szOverallSize.Width(), nHScrollHeight) );
     }
@@ -516,7 +514,7 @@ sal_Int32 OFieldDescControl::GetMaxControlHeight() const
             const Size aTemp( ppAggregates[i]->GetOptimalSize(WINDOWSIZE_PREFERRED) );
             if ( aTemp.Height() > aHeight.Height() )
                 aHeight.Height() = aTemp.Height();
-        } // if ( ppAggregates[i] )
+        }
     }
 
     return aHeight.Height();
@@ -1194,7 +1192,7 @@ void OFieldDescControl::SetPosSize( Control** ppControl, long nRow, sal_uInt16 n
         case 4:
             aSize.Width()  = CONTROL_WIDTH_4;
             break;
-        } // switch( nCol )
+        }
     }
 
 
@@ -1710,7 +1708,7 @@ void OFieldDescControl::SaveData( OFieldDescription* pFieldDescr )
         catch(const Exception&)
         {
         }
-    } // if ( sDefault.getLength() )
+    }
     else
         pFieldDescr->SetControlDefault(Any());
 
@@ -1907,7 +1905,7 @@ String OFieldDescControl::getControlDefault( const OFieldDescription* _pFieldDes
             Reference<XPropertySet> xFormSet = xNumberFormatter->getNumberFormatsSupplier()->getNumberFormats()->getByKey(nFormatKey);
             OSL_ENSURE(xFormSet.is(),"XPropertySet is null!");
             ::rtl::OUString sFormat;
-            xFormSet->getPropertyValue(::rtl::OUString::createFromAscii("FormatString")) >>= sFormat;
+            xFormSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormatString"))) >>= sFormat;
 
             if ( !bTextFormat )
             {
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index 0687b61d7b8e..b92fa0014b36 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -134,7 +134,7 @@ namespace dbaui
     DBG_NAME(ORelationControl)
     //------------------------------------------------------------------------
     ORelationControl::ORelationControl( OTableListBoxControl* pParent ,const OJoinTableView::OTableWindowMap* _pTableMap)
-        :EditBrowseBox( pParent, EBBF_SMART_TAB_TRAVEL | EBBF_NOROWPICTURE, WB_TABSTOP | /*WB_3DLOOK | */WB_BORDER | BROWSER_AUTOSIZE_LASTCOL)
+        :EditBrowseBox( pParent, EBBF_SMART_TAB_TRAVEL | EBBF_NOROWPICTURE, WB_TABSTOP | WB_BORDER | BROWSER_AUTOSIZE_LASTCOL)
         ,m_pTableMap(_pTableMap)
         ,m_pBoxControl(pParent)
         ,m_xSourceDef( NULL )
@@ -518,7 +518,7 @@ OTableListBoxControl::OTableListBoxControl(  Window* _pParent
                 pInitialRight = aIter->second;
                 m_strCurrentRight = aIter->first;
             }
-        } // for(;aIter != m_pTableMap->end();++aIter)
+        }
 
         if ( !pInitialRight )
         {
@@ -668,7 +668,6 @@ OTableListBoxControl::OTableListBoxControl(  Window* _pParent
         {
             _pTableSeparator->SetZOrder(&m_lmbRightTable, WINDOW_ZORDER_BEHIND);
             m_pRC_Tables->SetZOrder(_pTableSeparator, WINDOW_ZORDER_BEHIND);
-            //aDlgPoint = m_pTableSeparator->GetPosPixel() + Point(0,aSize.Height()) + LogicToPixel( Point(0,6), MAP_APPFONT );
             _pTableSeparator->SetPosPixel(Point(0,m_aFL_InvolvedFields.GetPosPixel().Y()));
             const Size aSize = _pTableSeparator->GetSizePixel();
             aDlgPoint.Y() = _pTableSeparator->GetPosPixel().Y() + aSize.Height();
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.src b/dbaccess/source/ui/control/TableGrantCtrl.src
index 8da72a1f9fe1..8b870e4927b6 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.src
+++ b/dbaccess/source/ui/control/TableGrantCtrl.src
@@ -53,6 +53,7 @@ String STR_TABLE_PRIV_ALTER
 {
     Text [ en-US ] = "Alter structure";
 };
+
 String STR_TABLE_PRIV_SELECT
 {
     Text [ en-US ] = "Read data";
@@ -67,30 +68,3 @@ String STR_TABLE_PRIV_DROP
 {
     Text [ en-US ] = "Drop structure";
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 381c7036677f..1c272c4839b3 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -515,7 +515,7 @@ namespace
             {
                 lcl_adjustMenuItemIDs( *pPopup, _rCommandController );
                 continue;
-            } // if ( pPopup )
+            }
 
             const USHORT nCommandId = _rCommandController.registerCommandURL( aCommand );
             _rMenu.InsertItem( nCommandId, _rMenu.GetItemText( nId ), _rMenu.GetItemImage( nId ),
@@ -533,8 +533,6 @@ namespace
     }
     void lcl_insertMenuItemImages( Menu& _rMenu, IController& _rCommandController )
     {
-        const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-        const BOOL bHiContrast = rSettings.GetHighContrastMode();
         uno::Reference< frame::XController > xController = _rCommandController.getXController();
         uno::Reference< frame::XFrame> xFrame;
         if ( xController.is() )
@@ -553,10 +551,10 @@ namespace
             {
                 lcl_insertMenuItemImages( *pPopup, _rCommandController );
                 continue;
-            } // if ( pPopup )
+            }
 
             if ( xFrame.is() )
-                _rMenu.SetItemImage(nId,framework::GetImageFromURL(xFrame,aCommand,FALSE,bHiContrast));
+                _rMenu.SetItemImage(nId,framework::GetImageFromURL(xFrame,aCommand,FALSE));
         }
     }
     // =========================================================================
@@ -694,7 +692,7 @@ PopupMenu* DBTreeListBox::CreateContextMenu( void )
         // the interceptors only know command URLs, but our menus primarily work
         // with IDs -> we need to translate the commands to IDs
         lcl_adjustMenuItemIDs( *pModifiedMenu, m_pContextMenuProvider->getCommandController() );
-    } // if ( bModifiedMenu )
+    }
 
     return pContextMenu.release();
 }
diff --git a/dbaccess/source/ui/control/makefile.mk b/dbaccess/source/ui/control/makefile.mk
index 76857497cb6b..913a4752e544 100644
--- a/dbaccess/source/ui/control/makefile.mk
+++ b/dbaccess/source/ui/control/makefile.mk
@@ -48,29 +48,29 @@ SRC1FILES =	\
 # ... exception files .........................
 
 EXCEPTIONSFILES=\
-        $(SLO)$/statusbarontroller.obj	\
-        $(SLO)$/RelationControl.obj		\
-        $(SLO)$/toolboxcontroller.obj	\
-        $(SLO)$/tabletree.obj			\
-        $(SLO)$/TableGrantCtrl.obj		\
-        $(SLO)$/dbtreelistbox.obj       \
-        $(SLO)$/sqledit.obj				\
         $(SLO)$/ColumnControlWindow.obj	\
         $(SLO)$/FieldDescControl.obj    \
-        $(SLO)$/opendoccontrols.obj
+        $(SLO)$/RelationControl.obj	\
+        $(SLO)$/SqlNameEdit.obj		\
+        $(SLO)$/TableGrantCtrl.obj	\
+        $(SLO)$/VertSplitView.obj	\
+        $(SLO)$/charsetlistbox.obj	\
+        $(SLO)$/curledit.obj           	\
+        $(SLO)$/dbtreelistbox.obj       \
+        $(SLO)$/listviewitems.obj	\
+        $(SLO)$/marktree.obj		\
+        $(SLO)$/opendoccontrols.obj	\
+        $(SLO)$/sqledit.obj		\
+        $(SLO)$/statusbarontroller.obj	\
+        $(SLO)$/tabletree.obj		\
+        $(SLO)$/toolboxcontroller.obj	\
+        $(SLO)$/undosqledit.obj
 
 # ... object files ............................
 
 SLOFILES=	\
-        $(EXCEPTIONSFILES)				\
-        $(SLO)$/ScrollHelper.obj		\
-        $(SLO)$/VertSplitView.obj		\
-        $(SLO)$/SqlNameEdit.obj			\
-        $(SLO)$/listviewitems.obj		\
-        $(SLO)$/undosqledit.obj			\
-        $(SLO)$/marktree.obj			\
-        $(SLO)$/curledit.obj            \
-        $(SLO)$/charsetlistbox.obj
+        $(EXCEPTIONSFILES)		\
+        $(SLO)$/ScrollHelper.obj
 
 # --- Targets ----------------------------------
 
diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx
index 1ecb15575ca9..01c32a851269 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -152,8 +152,8 @@ SvButtonState OMarkableTreeListBox::implDetermineState(SvLBoxEntry* _pEntry)
         // we did not finish the loop because at least one of the children is in tristate
         eState = SV_BUTTON_TRISTATE;
 
-        // but this means that we did not finish all the siblings of pChildLoop, so their checking may be
-        // incorrect at the moment
+        // but this means that we did not finish all the siblings of pChildLoop,
+        // so their checking may be incorrect at the moment
         // -> correct this
         // 88485 - 20.06.2001 - frank.schoenheit@sun.com
         while (pChildLoop)
@@ -163,9 +163,9 @@ SvButtonState OMarkableTreeListBox::implDetermineState(SvLBoxEntry* _pEntry)
         }
     }
     else
-        // none if the children is in tristate
+        // none if the children are in tristate
         if (nCheckedChildren)
-            // we have at least one chil checked
+            // we have at least one child checked
             if (nCheckedChildren != nChildrenOverall)
                 // not all children are checked
                 eState = SV_BUTTON_TRISTATE;
diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx
index 78fd8f4fdd1c..447710e4e0de 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -195,7 +195,7 @@ namespace dbaui
         SetText( sLabel );
 
         // Place icon left of text and both centered in the button.
-        SetModeImage( GetCommandIcon( ".uno:Open", m_sModule ), BMP_COLOR_NORMAL );
+        SetModeImage( GetCommandIcon( ".uno:Open", m_sModule ) );
         EnableImageDisplay( TRUE );
         EnableTextDisplay( TRUE );
         SetImageAlign( IMAGEALIGN_LEFT );
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index 832459021f1e..73212e395748 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -105,10 +105,8 @@ OTableTreeListBox::~OTableTreeListBox()
 void OTableTreeListBox::implSetDefaultImages()
 {
     ImageProvider aImageProvider;
-    SetDefaultExpandedEntryBmp( aImageProvider.getFolderImage( DatabaseObject::TABLE, false ), BMP_COLOR_NORMAL );
-    SetDefaultExpandedEntryBmp( aImageProvider.getFolderImage( DatabaseObject::TABLE, true ), BMP_COLOR_HIGHCONTRAST );
-    SetDefaultCollapsedEntryBmp( aImageProvider.getFolderImage( DatabaseObject::TABLE, false ), BMP_COLOR_NORMAL );
-    SetDefaultCollapsedEntryBmp( aImageProvider.getFolderImage( DatabaseObject::TABLE, true ), BMP_COLOR_HIGHCONTRAST );
+    SetDefaultExpandedEntryBmp(  aImageProvider.getFolderImage( DatabaseObject::TABLE ) );
+    SetDefaultCollapsedEntryBmp( aImageProvider.getFolderImage( DatabaseObject::TABLE ) );
 }
 
 // -----------------------------------------------------------------------------
@@ -139,25 +137,19 @@ void OTableTreeListBox::notifyHiContrastChanged()
             {
                 SvLBoxContextBmp* pContextBitmapItem = static_cast< SvLBoxContextBmp* >( pItem );
 
-                Image aImage, aImageHC;
+                Image aImage;
                 if ( isFolderEntry( pEntryLoop ) )
                 {
-                    aImage = m_pImageProvider->getFolderImage( DatabaseObject::TABLE, false );
-                    aImageHC = m_pImageProvider->getFolderImage( DatabaseObject::TABLE, true );
+                    aImage = m_pImageProvider->getFolderImage( DatabaseObject::TABLE );
                 }
                 else
                 {
                     String sCompleteName( getQualifiedTableName( pEntryLoop ) );
-                    m_pImageProvider->getImages( sCompleteName, DatabaseObject::TABLE, aImage, aImageHC );
+                    m_pImageProvider->getImages( sCompleteName, DatabaseObject::TABLE, aImage );
                 }
 
-                pContextBitmapItem->SetBitmap1( aImage, BMP_COLOR_NORMAL );
-                pContextBitmapItem->SetBitmap2( aImage, BMP_COLOR_NORMAL );
-                pContextBitmapItem->SetBitmap1( aImageHC, BMP_COLOR_HIGHCONTRAST );
-                pContextBitmapItem->SetBitmap2( aImageHC, BMP_COLOR_HIGHCONTRAST );
-                // TODO: Now that we give both images to the entry item, it is not necessary anymore
-                // to do this anytime HC changes - the tree control will do this itself now.
-                // We would only need to properly initialize newly inserted entries.
+                pContextBitmapItem->SetBitmap1( aImage );
+                pContextBitmapItem->SetBitmap2( aImage );
                 break;
             }
         }
@@ -392,8 +384,8 @@ void OTableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry)
 {
     OMarkableTreeListBox::checkedButton_noBroadcast(_pEntry);
 
-    // if an entry has children, it makes a difference if the entry is checked because alls children are checked
-    // or if the user checked it explicitly.
+    // if an entry has children, it makes a difference if the entry is checked
+    // because all children are checked or if the user checked it explicitly.
     // So we track explicit (un)checking
 
     SvButtonState eState = GetCheckButtonState(_pEntry);
@@ -507,13 +499,11 @@ SvLBoxEntry* OTableTreeListBox::implAddEntry(
     {
         pRet = InsertEntry( sName, pParentEntry, FALSE, LIST_APPEND );
 
-        Image aImage, aImageHC;
-        m_pImageProvider->getImages( _rTableName, DatabaseObject::TABLE, aImage, aImageHC );
+        Image aImage;
+        m_pImageProvider->getImages( _rTableName, DatabaseObject::TABLE, aImage );
 
-        SetExpandedEntryBmp( pRet, aImage, BMP_COLOR_NORMAL );
-        SetCollapsedEntryBmp( pRet, aImage, BMP_COLOR_NORMAL );
-        SetExpandedEntryBmp( pRet, aImageHC, BMP_COLOR_HIGHCONTRAST );
-        SetCollapsedEntryBmp( pRet, aImageHC, BMP_COLOR_HIGHCONTRAST );
+        SetExpandedEntryBmp( pRet, aImage );
+        SetCollapsedEntryBmp( pRet, aImage );
     }
     return pRet;
 }
diff --git a/dbaccess/source/ui/control/tabletree.src b/dbaccess/source/ui/control/tabletree.src
index d08535f3e8da..71f3945e245e 100644
--- a/dbaccess/source/ui/control/tabletree.src
+++ b/dbaccess/source/ui/control/tabletree.src
@@ -33,7 +33,6 @@
 #endif
 #include "browserids.hxx"
 
-
 Menu MENU_TABLETREE_POPUP
 {
     ItemList =
@@ -65,24 +64,28 @@ String STR_COULDNOTCONNECT
 {
     Text [ en-US ] = "No connection could be established for the URL #connurl#.";
 };
+
 String STR_COULDNOTCONNECT_PLEASECHECK
 {
     Text [ en-US ] = "Please check the current settings, for example user name and password.";
 };
+
 String STR_NOTABLEINFO
 {
     Text [ en-US ] = "Successfully connected, but information about database tables is not available.";
 };
+
 String STR_ALL_TABLES
 {
     Text [ en-US ] = "All tables";
 };
+
 String STR_ALL_VIEWS
 {
     Text [ en-US ] = "All views";
 };
+
 String STR_ALL_TABLES_AND_VIEWS
 {
     Text [ en-US ] = "All tables and views";
 };
-
diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx
index 57618dea47b1..5be041603daf 100644
--- a/dbaccess/source/ui/control/toolboxcontroller.cxx
+++ b/dbaccess/source/ui/control/toolboxcontroller.cxx
@@ -192,8 +192,6 @@ namespace dbaui
         {
             pMenu.reset( new PopupMenu( ModuleRes( RID_MENU_APP_NEW ) ) );
 
-            sal_Bool bHighContrast = isHighContrast();
-
             try
             {
                 Reference<XModuleUIConfigurationManagerSupplier> xModuleCfgMgrSupplier(getServiceManager()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"))),UNO_QUERY);
@@ -202,8 +200,6 @@ namespace dbaui
 
 
                 short nImageType = hasBigImages() ? ImageType::SIZE_LARGE : ImageType::SIZE_DEFAULT;
-                if ( bHighContrast )
-                    nImageType |= ImageType::COLOR_HIGHCONTRAST;
 
                 Sequence< ::rtl::OUString> aSeq(1);
                 USHORT nCount = pMenu->GetItemCount();
diff --git a/dbaccess/source/ui/control/undosqledit.src b/dbaccess/source/ui/control/undosqledit.src
index 814a304d18c0..aab44ad5e7db 100644
--- a/dbaccess/source/ui/control/undosqledit.src
+++ b/dbaccess/source/ui/control/undosqledit.src
@@ -33,34 +33,3 @@ String STR_QUERY_UNDO_MODIFYSQLEDIT
 {
     Text [ en-US ] = "Modify SQL statement(s)" ;
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dbaccess/source/ui/dlg/AdabasStat.cxx b/dbaccess/source/ui/dlg/AdabasStat.cxx
index 6f4af6e9aae8..59b453d80fcc 100644
--- a/dbaccess/source/ui/dlg/AdabasStat.cxx
+++ b/dbaccess/source/ui/dlg/AdabasStat.cxx
@@ -99,14 +99,14 @@ OAdabasStatistics::OAdabasStatistics( Window* pParent,
         try
         {
             xMetaData = m_xConnection->getMetaData();
-            bCanSelect = checkSystemTable(::rtl::OUString::createFromAscii("SERVERDBSTATISTICS"),sSchema);
+            bCanSelect = checkSystemTable(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SERVERDBSTATISTICS")), sSchema);
 
             if(bCanSelect)
             {
-                aStmt = ::rtl::OUString::createFromAscii("SELECT SERVERDBSIZE, UNUSEDPAGES FROM ");
+                aStmt = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT SERVERDBSIZE, UNUSEDPAGES FROM "));
 
                 aStmt += ::dbtools::quoteTableName(xMetaData,sSchema,::dbtools::eInDataManipulation);
-                aStmt += ::rtl::OUString::createFromAscii(".\"SERVERDBSTATISTICS\"");
+                aStmt += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".\"SERVERDBSTATISTICS\""));
 
                 xStmt = m_xConnection->createStatement();
                 xRes = xStmt->executeQuery(aStmt);
@@ -153,14 +153,14 @@ OAdabasStatistics::OAdabasStatistics( Window* pParent,
         {
             try
             {
-                bCanSelect = checkSystemTable(::rtl::OUString::createFromAscii("DATADEVSPACES"),sSchema);
+                bCanSelect = checkSystemTable(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATADEVSPACES")), sSchema);
 
                 if(bCanSelect)
                 {
                     // then the db files
-                    aStmt = ::rtl::OUString::createFromAscii("SELECT DEVSPACENAME FROM ");
+                    aStmt = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT DEVSPACENAME FROM "));
                     aStmt += ::dbtools::quoteTableName(xMetaData,sSchema,::dbtools::eInDataManipulation);
-                    aStmt += ::rtl::OUString::createFromAscii(".\"DATADEVSPACES\"");
+                    aStmt += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".\"DATADEVSPACES\""));
                     xStmt = m_xConnection->createStatement();
                     xRes = xStmt->executeQuery(aStmt);
 
@@ -197,13 +197,13 @@ OAdabasStatistics::OAdabasStatistics( Window* pParent,
             {
                 try
                 {
-                    bCanSelect = checkSystemTable(::rtl::OUString::createFromAscii("CONFIGURATION"),sSchema);
+                    bCanSelect = checkSystemTable(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CONFIGURATION")), sSchema);
 
                     if(bCanSelect)
                     {
-                        aStmt = ::rtl::OUString::createFromAscii("SELECT * FROM ");
+                        aStmt = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT * FROM "));
                         aStmt += ::dbtools::quoteTableName(xMetaData,sSchema,::dbtools::eInDataManipulation);
-                        aStmt += ::rtl::OUString::createFromAscii(".CONFIGURATION WHERE DESCRIPTION LIKE 'SYS%DEVSPACE%NAME'");
+                        aStmt += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".CONFIGURATION WHERE DESCRIPTION LIKE 'SYS%DEVSPACE%NAME'"));
                         xStmt = m_xConnection->createStatement();
                         xRes = xStmt->executeQuery(aStmt);
                         if(xRes.is() && xRes->next())
@@ -214,9 +214,9 @@ OAdabasStatistics::OAdabasStatistics( Window* pParent,
                         else
                             showError();
 
-                        aStmt = ::rtl::OUString::createFromAscii("SELECT * FROM ");
+                        aStmt = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT * FROM "));
                         aStmt += ::dbtools::quoteTableName(xMetaData,sSchema,::dbtools::eInDataManipulation);
-                        aStmt += ::rtl::OUString::createFromAscii(".CONFIGURATION WHERE DESCRIPTION = 'TRANSACTION LOG NAME'");
+                        aStmt += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".CONFIGURATION WHERE DESCRIPTION = 'TRANSACTION LOG NAME'"));
                         xRes = xStmt->executeQuery(aStmt);
                         if(xRes.is() && xRes->next())
                         {
@@ -268,11 +268,11 @@ sal_Bool OAdabasStatistics::checkSystemTable(const ::rtl::OUString& _rsSystemTab
     Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
     if ( xMeta.is() )
     {
-        Reference<XResultSet> xRes = xMeta->getTablePrivileges(Any(),::rtl::OUString::createFromAscii("%"),  _rsSystemTable);
+        Reference<XResultSet> xRes = xMeta->getTablePrivileges(Any(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")), _rsSystemTable);
         if(xRes.is())
         {
             Reference<XRow> xRow(xRes,UNO_QUERY);
-            static const ::rtl::OUString sSelect = ::rtl::OUString::createFromAscii("SELECT");
+            static const ::rtl::OUString sSelect(RTL_CONSTASCII_USTRINGPARAM("SELECT"));
             // first the db sizes
             while( xRow.is() && xRes->next() )
             {
diff --git a/dbaccess/source/ui/dlg/AdabasStat.src b/dbaccess/source/ui/dlg/AdabasStat.src
index ff29ac12383d..418729d4564e 100644
--- a/dbaccess/source/ui/dlg/AdabasStat.src
+++ b/dbaccess/source/ui/dlg/AdabasStat.src
@@ -199,33 +199,3 @@ String STR_ADABAS_ERROR_SYSTEMTABLES
 {
     Text [ en-US ] = "No information could be displayed because no access rights exist for the required system tables.";
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dbaccess/source/ui/dlg/AutoControls.src b/dbaccess/source/ui/dlg/AutoControls.src
index 1bfe3c0233a9..e43e2a13a7fb 100644
--- a/dbaccess/source/ui/dlg/AutoControls.src
+++ b/dbaccess/source/ui/dlg/AutoControls.src
@@ -69,13 +69,11 @@ String STR_MSACCESS_MDB_FILE
     Text[ en-US ] = "Microsoft Access database file";
 };
 
-
 String STR_NO_ADDITIONAL_SETTINGS
 {
     Text[ en-US ] = "No more settings are necessary. To verify that the connection is working, click the '%test' button.";
 };
 
-
 String STR_COMMONURL
 {
     Text [ en-US ] = "Datasource URL" ;
@@ -85,18 +83,15 @@ String STR_HOSTNAME
 {
     Text[ en-US ] = "~Host name";
 };
+
 String STR_MOZILLA_PROFILE_NAME
 {
     Text[ en-US ] = "~Mozilla profile name";
 };
+
 String STR_THUNDERBIRD_PROFILE_NAME
 {
     Text[ en-US ] = "~Thunderbird profile name";
 };
 
-
 // -------------------------------------------------------------------------------------------------
-
-
-
-
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index c3308fd53f9a..f250dad416cb 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -107,9 +107,7 @@ OCollectionView::OCollectionView( Window * pParent
 
     m_aNewFolder.SetStyle( m_aNewFolder.GetStyle() | WB_NOPOINTERFOCUS );
     m_aUp.SetModeImage(ModuleRes(IMG_NAVIGATION_BTN_UP_SC));
-    m_aUp.SetModeImage(ModuleRes(IMG_NAVIGATION_BTN_UP_SCH),BMP_COLOR_HIGHCONTRAST);
     m_aNewFolder.SetModeImage(ModuleRes(IMG_NAVIGATION_CREATEFOLDER_SC));
-    m_aNewFolder.SetModeImage(ModuleRes(IMG_NAVIGATION_CREATEFOLDER_SCH),BMP_COLOR_HIGHCONTRAST);
 
     m_aView.SetDoubleClickHdl( LINK( this, OCollectionView, Dbl_Click_FileView ) );
     m_aView.EnableAutoResize();
@@ -213,7 +211,6 @@ IMPL_LINK( OCollectionView, Save_Click, PushButton*, EMPTYARG )
                 QueryBox aBox( this, WB_YES_NO, ModuleRes( STR_ALREADYEXISTOVERWRITE ) );
                 if ( aBox.Execute() != RET_YES )
                     return 0;
-                // xNameContainer->removeByName(sName);
             }
             m_aName.SetText(sName);
             EndDialog( TRUE );
diff --git a/dbaccess/source/ui/dlg/CollectionView.src b/dbaccess/source/ui/dlg/CollectionView.src
index 018893384dab..0d26722a7033 100644
--- a/dbaccess/source/ui/dlg/CollectionView.src
+++ b/dbaccess/source/ui/dlg/CollectionView.src
@@ -43,14 +43,12 @@
 #define FIXEDLINE_HEIGHT    1
 #define IMG_SIZE            15
 
-
 ModalDialog DLG_COLLECTION_VIEW
 {
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Moveable = TRUE ;
     Closeable = TRUE ;
-    //Sizeable = TRUE;
     HelpId = HID_EXPLORERDLG_COLLECTION ;
 
     Size = MAP_APPFONT ( WIN_X , WIN_Y ) ;
@@ -128,7 +126,6 @@ ModalDialog DLG_COLLECTION_VIEW
         Size = MAP_APPFONT ( 50 , BUTTON_HEIGHT ) ;
     };
 
-
     String STR_PATHNAME
     {
         Text [ en-US ] = "~Path:" ;
@@ -139,29 +136,20 @@ String STR_NEW_FOLDER
 {
     Text [ en-US ] = "Folder" ;
 };
+
 Image IMG_NAVIGATION_BTN_UP_SC
 {
     ImageBitmap = Bitmap { File = "fp010"; };
     MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
 };
-Image IMG_NAVIGATION_BTN_UP_SCH
-{
-    ImageBitmap = Bitmap { File = "fph010"; };
-    MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
-};
+
 Image IMG_NAVIGATION_CREATEFOLDER_SC
 {
     ImageBitmap = Bitmap { File = "fp015"; };
     MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
 };
-Image IMG_NAVIGATION_CREATEFOLDER_SCH
-{
-    ImageBitmap = Bitmap { File = "fph015"; };
-    MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
-};
 
 String STR_ALREADYEXISTOVERWRITE
 {
     Text [ en-US ] = "The file already exists. Overwrite?" ;
 };
-
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 7e6ac39f658f..e8c04fefc37b 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -446,7 +446,7 @@ DBG_NAME(OConnectionHelper)
         {
             if ( m_pCollection->isFileSystemBased( m_eType ) )
             {
-                // get the tow parts: prefix and file URL
+                // get the two parts: prefix and file URL
                 String sTypePrefix, sFileURLEncoded;
                 if ( _bPrefix )
                 {
@@ -492,7 +492,7 @@ DBG_NAME(OConnectionHelper)
         {
             if ( m_pCollection->isFileSystemBased( m_eType ) )
             {
-                // get the tow parts: prefix and file URL
+                // get the two parts: prefix and file URL
                 String sTypePrefix, sFileURLDecoded;
                 if ( _bPrefix )
                 {
@@ -742,7 +742,7 @@ DBG_NAME(OConnectionHelper)
                             return 1L;  // handled
                     }
                     break;
-            } // switch (_rNEvt.GetType())
+            }
         }
 
         return OGenericAdministrationPage::PreNotify( _rNEvt );
@@ -785,18 +785,18 @@ DBG_NAME(OConnectionHelper)
             ::rtl::OUString sContentType;
             if ( INET_PROT_FILE == eProtocol )
             {
-                sContentType = ::rtl::OUString::createFromAscii( "application/vnd.sun.staroffice.fsys-folder" );
+                sContentType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.staroffice.fsys-folder"));
                 // the file UCP currently does not support the ContentType property
             }
             else
             {
-                Any aContentType = aParent.getPropertyValue( ::rtl::OUString::createFromAscii( "ContentType" ) );
+                Any aContentType = aParent.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType")) );
                 aContentType >>= sContentType;
             }
 
             // the properties which need to be set on the new content
             Sequence< ::rtl::OUString > aNewDirectoryProperties(1);
-            aNewDirectoryProperties[0] = ::rtl::OUString::createFromAscii("Title");
+            aNewDirectoryProperties[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
 
             // the values to be set
             Sequence< Any > aNewDirectoryAttributes(1);
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 03f2b5f057df..57b4e4c2b32a 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -268,7 +268,7 @@ namespace dbaui
                     m_aJavaDriver.SetText(sDefaultJdbcDriverName);
                     m_aJavaDriver.SetModifyFlag();
                 }
-            } // if ( !pJdbcDrvItem->GetValue().Len() )
+            }
             else
                 m_aJavaDriver.SetText(pJdbcDrvItem->GetValue());
 
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.src b/dbaccess/source/ui/dlg/ConnectionPage.src
index 8ead374bdef4..61515a2589a8 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.src
+++ b/dbaccess/source/ui/dlg/ConnectionPage.src
@@ -54,10 +54,8 @@ TabPage PAGE_CONNECTION
         Text[ en-US ] = "General";
     };
 
-
     AUTO_BROWSECONTROLGROUP( 6, UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS, PAGE_X, HID_DSADMIN_URL_GENERAL)
 
-
     FixedText FT_NO_ADDITIONAL_SETTINGS
     {
         Hide = TRUE;
@@ -66,7 +64,6 @@ TabPage PAGE_CONNECTION
         Size = MAP_APPFONT ( PAGE_X - 12 , 3*FIXEDTEXT_HEIGHT ) ;
     };
 
-
     FixedText FT_HOSTNAME
     {
         Hide = TRUE;
@@ -75,7 +72,6 @@ TabPage PAGE_CONNECTION
         Text[ en-US ] = "~Host name";
     };
 
-
     FixedLine FL_SEPARATOR2
     {
         Pos = MAP_APPFONT ( 4 , 3*FIXEDTEXT_HEIGHT + 3*UNRELATED_CONTROLS + RELATED_CONTROLS ) ;
@@ -89,6 +85,7 @@ TabPage PAGE_CONNECTION
         Size = MAP_APPFONT ( 90 - 12 , FIXEDTEXT_HEIGHT ) ;
         Text [ en-US ] = "~User name" ;
     };
+
     Edit ET_USERNAME
     {
         Border = TRUE ;
@@ -96,6 +93,7 @@ TabPage PAGE_CONNECTION
         Size = MAP_APPFONT ( 105 , EDIT_HEIGHT ) ;
         TabStop = TRUE ;
     };
+
     CheckBox CB_PASSWORD_REQUIRED
     {
         Pos = MAP_APPFONT ( 90 , 4*UNRELATED_CONTROLS + 5*FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS ) ;
@@ -118,6 +116,7 @@ TabPage PAGE_CONNECTION
         Size = MAP_APPFONT ( 90 - 12 , FIXEDTEXT_HEIGHT ) ;
         Text [ en-US ] = "~JDBC driver class" ;
     };
+
     Edit ET_JDBCDRIVERCLASS
     {
         Border = TRUE ;
@@ -184,4 +183,3 @@ String STR_MSACCESS_2007_FILTERNAME
 {
     Text [ en-US ] = "MS Access 2007 file";
 };
-
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 66a1c3b44787..dbb348fe1cb2 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -73,14 +73,6 @@ namespace dbaui
 {
 //.........................................................................
 using namespace ::com::sun::star;
-//  using namespace ::com::sun::star::ucb;
-//  using namespace ::com::sun::star::ui::dialogs;
-//  using namespace ::com::sun::star::sdbc;
-//  using namespace ::com::sun::star::beans;
-//  using namespace ::com::sun::star::lang;
-//  using namespace ::com::sun::star::container;
-//  using namespace ::dbtools;
-//  using namespace ::svt;
 
     OGenericAdministrationPage* OTextConnectionPageSetup::CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
     {
@@ -218,7 +210,6 @@ DBG_NAME(OTextConnectionPageSetup)
             bChangedSomething = sal_True;
         }
 
-        // fillString(_rSet,&m_aETHostServer, DSID_CONNECTURL, bChangedSomething);
         fillBool(_rSet,&m_aCBUseSSL,DSID_CONN_LDAP_USESSL,bChangedSomething);
         return bChangedSomething;
     }
@@ -664,8 +655,8 @@ DBG_NAME(OMySQLIntroPageSetup)
                 {
                     m_aETDriverClass.SetText(sDefaultJdbcDriverName);
                     m_aETDriverClass.SetModifyFlag();
-                } // if ( sDefaultJdbcDriverName.Len() )
-            } // if ( !pJdbcDrvItem->GetValue().Len() )
+                }
+            }
             else
             {
                 m_aETDriverClass.SetText(pDrvItem->GetValue());
@@ -686,7 +677,6 @@ DBG_NAME(OMySQLIntroPageSetup)
         BOOL bEnableTestConnection = !m_aConnectionURL.IsVisible() || (m_aConnectionURL.GetTextNoPrefix().Len() != 0);
         bEnableTestConnection = bEnableTestConnection && (m_aETDriverClass.GetText().Len() != 0);
         return bEnableTestConnection;
-//      m_aTestConnection.Enable(bEnableTestConnection);
     }
 
 
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index da3735b18cc7..48c0931b946e 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -48,7 +48,6 @@ namespace dbaui
 //.........................................................................
 
     class IDatabaseSettingsDialog;
-//      static  OGenericAdministrationPage* CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
 
 
        //========================================================================
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 8be379b9aa89..83e42119c1e5 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -207,18 +207,18 @@ ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Refer
     m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_NAMED_PIPE, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NamedPipe" ) ) ) );
 
     // special settings for adabas
-    m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_SHUTSERVICE, ::rtl::OUString::createFromAscii("ShutdownDatabase")));
-    m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_DATAINC, ::rtl::OUString::createFromAscii("DataCacheSizeIncrement")));
-    m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_CACHESIZE, ::rtl::OUString::createFromAscii("DataCacheSize")));
-    m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_CTRLUSER, ::rtl::OUString::createFromAscii("ControlUser")));
-    m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_CTRLPWD, ::rtl::OUString::createFromAscii("ControlPassword")));
+    m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_SHUTSERVICE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShutdownDatabase"))));
+    m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_DATAINC, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataCacheSizeIncrement"))));
+    m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_CACHESIZE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataCacheSize"))));
+    m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_CTRLUSER, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlUser"))));
+    m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_CTRLPWD, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlPassword"))));
 
     // extra settings for odbc
     m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_USECATALOG, INFO_USECATALOG));
     // extra settings for a ldap address book
     m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_LDAP_BASEDN, INFO_CONN_LDAP_BASEDN));
     m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_LDAP_ROWCOUNT, INFO_CONN_LDAP_ROWCOUNT));
-    m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_LDAP_USESSL, ::rtl::OUString::createFromAscii("UseSSL")));
+    m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_LDAP_USESSL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseSSL"))));
     m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_DOCUMENT_URL, PROPERTY_URL));
 
     // oracle
@@ -586,7 +586,6 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const
             break;
         case  ::dbaccess::DST_LDAP:
             {
-                //  SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pHostName, SfxStringItem, DSID_CONN_HOSTNAME, sal_True);
                 SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pPortNumber, SfxInt32Item, DSID_CONN_LDAP_PORTNUMBER, sal_True);
                 sNewUrl = pCollection->cutPrefix(pUrlItem->GetValue());
                 sNewUrl += lcl_createHostWithPort(NULL,pPortNumber);
@@ -664,7 +663,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr
             if (0 == pAdditionalInfo->Name.compareToAscii("JDBCDRV"))
             {   // compatibility
                 PropertyValue aCompatibility(*pAdditionalInfo);
-                aCompatibility.Name = ::rtl::OUString::createFromAscii("JavaDriverClass");
+                aCompatibility.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JavaDriverClass"));
                 aInfos.insert(aCompatibility);
             }
             else
@@ -1119,7 +1118,6 @@ void ODbDataSourceAdministrationHelper::convertUrl(SfxItemSet& _rDest)
     USHORT nPortNumberId    = 0;
     sal_Int32 nPortNumber   = -1;
     String sNewHostName;
-    //String sUrl = pCollection->cutPrefix(pUrlItem->GetValue());
     String sUrlPart;
 
     pCollection->extractHostNamePort(pUrlItem->GetValue(),sUrlPart,sNewHostName,nPortNumber);
diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
index 47b77106cd3e..38ee66e46719 100644
--- a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
+++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
@@ -130,19 +130,6 @@ DBG_NAME( dbu_OExtensionNotPresentDialog )
 
     m_aFI_WARNING.SetImage(WarningBox::GetStandardImage());
 
-    // set an image in high contrast
-    // m_aFI_WARNING.SetModeImage(Image(BMP_EXCEPTION_WARNING_SCH), BMP_COLOR_HIGHCONTRAST);
-
-    // to resize images
-    // WinBits aBits = m_aFI_WARNING.GetStyle();
-    // aBits |= WB_SCALE;
-    // m_aFI_WARNING.SetStyle(aBits);
-    //
-    // Size aImageSize = m_aFI_WARNING.GetSizePixel();
-    // (void) aImageSize;
-    // m_aFI_WARNING.Resize();
-
-
     Resize();
     FreeResource();
 }
diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc b/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc
index 69794e3a76bc..712193982075 100644
--- a/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc
+++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc
@@ -37,7 +37,6 @@
 #define BUTTON_HEIGHT       14
 #define BUTTON_WIDTH        55
 #define BROWSER_HEIGHT      75
-// #define PAGE_WIDTH           ( CELL_PADDING + BUTTON_WIDTH + CELL_PADDING + BUTTON_WIDTH + CELL_PADDING)
 #define LEFT_PADDING        32 /* size for the icon */
 #define RIGHT_PADDING       16
 #define DLG_WIDTH           ( 250 )
diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.src b/dbaccess/source/ui/dlg/ExtensionNotPresent.src
index 9507c4256360..b224714cd482 100644
--- a/dbaccess/source/ui/dlg/ExtensionNotPresent.src
+++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.src
@@ -35,13 +35,7 @@ String RID_STR_EXTENSION_NOT_PRESENT
 {
     // #i96130# use hard coded name
     Text [ en-US ] = "To open a report you require the extension Sunâ„¢ Report Builder.\n\nClick 'Download...' to download and install the extension.";
-    // OLD: Text [ en-US ] = "To open a report you require the extension %RPT_EXTENSION_NAME.\n\nClick 'Download...' to download and install the extension.";
 };
-// To open a report you require the extension Sun Report Designer weiss der Geier Hauptsache extra langer Name
-// String RID_STR_EXTENSION_NAME
-// {
-//  Text = "Sun(TM) Report Builder";
-// };
 
 ModalDialog RID_EXTENSION_NOT_PRESENT_DLG
 {
@@ -66,7 +60,6 @@ ModalDialog RID_EXTENSION_NOT_PRESENT_DLG
     {
         Pos                 = MAP_APPFONT ( 32 , CELL_PADDING ) ;
         Size                = MAP_APPFONT ( DLG_WIDTH - LEFT_PADDING - RIGHT_PADDING , 3 * (FIXEDTEXT_HEIGHT + 2) ) ;
-        // Border = TRUE ;
         // Text will set outside from RID_STR_EXTENSION_NOT_PRESENT
     };
 
@@ -86,4 +79,3 @@ ModalDialog RID_EXTENSION_NOT_PRESENT_DLG
         TabStop = TRUE ;
     };
 };
-
diff --git a/dbaccess/source/ui/dlg/RelationDlg.src b/dbaccess/source/ui/dlg/RelationDlg.src
index 68399ca52619..908cbab62c92 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.src
+++ b/dbaccess/source/ui/dlg/RelationDlg.src
@@ -33,7 +33,6 @@
 #endif
 #include "dbaccess_helpid.hrc"
 
-
 ModalDialog DLG_REL_PROPERTIES
 {
     OutputSize = TRUE ;
@@ -43,7 +42,6 @@ ModalDialog DLG_REL_PROPERTIES
     Moveable = TRUE ;
     Closeable = TRUE ;
 
-
     Window WND_CONTROL
     {
         Pos = MAP_APPFONT( 0, 0 );
@@ -86,9 +84,6 @@ ModalDialog DLG_REL_PROPERTIES
         };
     };
 
-
-
-
     FixedLine FL_CASC_UPD
     {
         Pos = MAP_APPFONT ( 6 , 114 ) ;
@@ -124,7 +119,6 @@ ModalDialog DLG_REL_PROPERTIES
         HelpId  = HID_DLG_REL_CASC_UPD_DEFAULT ;
         Text [ en-US ] = "Set ~default" ;
     };
-// zweite FixedLine
     FixedLine FL_CASC_DEL
     {
         Pos = MAP_APPFONT ( 96 , 114 ) ;
@@ -182,4 +176,3 @@ ModalDialog DLG_REL_PROPERTIES
     };
 
 };
-
diff --git a/dbaccess/source/ui/dlg/UserAdmin.src b/dbaccess/source/ui/dlg/UserAdmin.src
index 2cab4f9e89f0..34a42a048931 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.src
+++ b/dbaccess/source/ui/dlg/UserAdmin.src
@@ -71,7 +71,6 @@ TabPage TAB_PAGE_USERADMIN
         HelpId              = HID_TAB_PAGE_LBUSER ;
     };
 
-
     PushButton PB_NEWUSER
     {
         Pos                 = MAP_APPFONT ( 12 , 29 ) ;
@@ -150,7 +149,6 @@ ModalDialog DLG_PASSWORD
         Size = MAP_APPFONT ( WIN_X - 3 - 6 - 6 - 50 , 8 ) ;
         Text [ en-US ] = "User \"$name$:  $\"";
     };
-
     FixedText FT_OLDPASSWORD
     {
         Pos = MAP_APPFONT ( 6 , 17 ) ;
@@ -215,28 +213,3 @@ String STR_ERROR_PASSWORDS_NOT_IDENTICAL
 {
     Text [ en-US ] = "The passwords do not match. Please enter the password again.";
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.src b/dbaccess/source/ui/dlg/UserAdminDlg.src
index faa7f33302d7..5509820d1828 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.src
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.src
@@ -35,7 +35,6 @@
 #include "dbu_dlg.hrc"
 #endif
 
-
 TabDialog DLG_DATABASE_USERADMIN
 {
     OutputSize = TRUE ;
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index 68b7d64abd8c..3c0ca82d77fa 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -190,7 +190,7 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews )
                     m_pContainerListener = new ::comphelper::OContainerListenerAdapter(this,xContainer);
             }
             sTables = xTables->getElementNames();
-        } // if ( xTables.is() )
+        }
 
         xViewSupp.set( xTableSupp, UNO_QUERY );
         if ( xViewSupp.is() )
@@ -298,13 +298,10 @@ void QueryListFacade::updateTableObjectList( bool /*_bAllowViews*/ )
     try
     {
         ImageProvider aImageProvider( m_xConnection );
-        Image aQueryImage( aImageProvider.getDefaultImage( DatabaseObject::QUERY, false ) );
-        Image aQueryImageHC( aImageProvider.getDefaultImage( DatabaseObject::QUERY, true ) );
+        Image aQueryImage( aImageProvider.getDefaultImage( DatabaseObject::QUERY ) );
 
-        m_rQueryList.SetDefaultExpandedEntryBmp( aQueryImage, BMP_COLOR_NORMAL );
-        m_rQueryList.SetDefaultCollapsedEntryBmp( aQueryImage, BMP_COLOR_NORMAL );
-        m_rQueryList.SetDefaultExpandedEntryBmp( aQueryImageHC, BMP_COLOR_HIGHCONTRAST );
-        m_rQueryList.SetDefaultCollapsedEntryBmp( aQueryImageHC, BMP_COLOR_HIGHCONTRAST );
+        m_rQueryList.SetDefaultExpandedEntryBmp( aQueryImage );
+        m_rQueryList.SetDefaultCollapsedEntryBmp( aQueryImage );
 
         Reference< XQueriesSupplier > xSuppQueries( m_xConnection, UNO_QUERY_THROW );
         Reference< XNameAccess > xQueries( xSuppQueries->getQueries(), UNO_QUERY_THROW );
diff --git a/dbaccess/source/ui/dlg/adtabdlg.src b/dbaccess/source/ui/dlg/adtabdlg.src
index af1d861a0faa..ecff324d7ec9 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.src
+++ b/dbaccess/source/ui/dlg/adtabdlg.src
@@ -67,6 +67,7 @@ ModelessDialog DLG_JOIN_TABADD
         Hide = TRUE;
         Group = TRUE;
     };
+
     PushButton PB_ADDTABLE
     {
         Pos = MAP_APPFONT ( 123 , 6 ) ;
@@ -75,6 +76,7 @@ ModelessDialog DLG_JOIN_TABADD
         TabStop = TRUE ;
         DefButton = TRUE ;
     };
+
     CancelButton PB_CLOSE
     {
         Pos = MAP_APPFONT ( 123 , 22 ) ;
@@ -83,6 +85,7 @@ ModelessDialog DLG_JOIN_TABADD
         Text [ en-US ] = "~Close" ;
         TabStop = TRUE ;
     };
+
     HelpButton PB_HELP
     {
         Pos = MAP_APPFONT ( 123 , 43 ) ;
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 028705d806ea..99ed8e6a4e2d 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -149,7 +149,6 @@ void ODbAdminDialog::impl_selectDataSource(const ::com::sun::star::uno::Any& _aD
     {
         case  ::dbaccess::DST_DBASE:
             addDetailPage(PAGE_DBASE, STR_PAGETITLE_ADVANCED, ODriversSettings::CreateDbase);
-            //  bResetPasswordRequired = sal_True;
             break;
 
         case  ::dbaccess::DST_ADO:
@@ -158,7 +157,6 @@ void ODbAdminDialog::impl_selectDataSource(const ::com::sun::star::uno::Any& _aD
 
         case  ::dbaccess::DST_FLAT:
             addDetailPage(PAGE_TEXT, STR_PAGETITLE_ADVANCED, ODriversSettings::CreateText);
-            //  bResetPasswordRequired = sal_True;
             break;
 
         case  ::dbaccess::DST_ODBC:
diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src
index c4457c62eec0..e0fb99ac299a 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -82,7 +82,6 @@
         Pos = MAP_APPFONT ( EDIT_X , AUTO_Y ) ;                                                         \
         Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ;                                                       \
     };                                                                                                  \
-                                                                                                        \
     FixedText FT_PORTNUMBER                                                                             \
     {                                                                                                   \
         Pos = MAP_APPFONT ( 6 , AUTO_Y + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + 2 ) ;                  \
@@ -725,8 +724,8 @@ TabPage PAGE_TEXT
     HelpId = HID_DSADMIN_PAGE_TEXT;
 
     AUTO_SEPARATORCONTROLGROUP(UNRELATED_CONTROLS, PAGE_X)
-
 };
+
 //.........................................................................
 TabPage PAGE_USERDRIVER
 {
diff --git a/dbaccess/source/ui/dlg/dbadmin2.src b/dbaccess/source/ui/dlg/dbadmin2.src
index 50b796541872..0c0bd3a48504 100644
--- a/dbaccess/source/ui/dlg/dbadmin2.src
+++ b/dbaccess/source/ui/dlg/dbadmin2.src
@@ -71,22 +71,27 @@ String STR_ADDRESSBOOK_SYSTEM
 {
     Text[ en-US ] = "Windows address book";
 };
+
 String STR_ADDRESSBOOK_OUTLOOK
 {
     Text[ en-US ] = "MS Outlook";
 };
+
 String STR_ADDRESSBOOK_MOZILLA
 {
     Text[ en-US ] = "Mozilla address book";
 };
+
 String STR_ADDRESSBOOK_THUNDERBIRD
 {
     Text[ en-US ] = "Thunderbird address book";
 };
+
 String STR_ADDRESSBOOK_EVOLUTION
 {
     Text[ en-US ] = "Evolution address book";
 };
+
 String STR_ADDRESSBOOK_LDAP
 {
     Text[ en-US ] = "LDAP address book";
@@ -185,4 +190,3 @@ TabPage PAGE_TABLESUBSCRIPTION
         Text [ en-US ] = "Mark the tables that should be visible for the applications.";
     };
 };
-
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src
index 7b0dbe011342..8e0cd31b521e 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.src
+++ b/dbaccess/source/ui/dlg/dbadminsetup.src
@@ -142,7 +142,6 @@ ModalDialog DLG_DATABASE_WIZARD
     };
 };
 
-
 String STR_DATABASEDEFAULTNAME
 {
     Text[ en-US ]  = "New Database" ;
@@ -164,7 +163,6 @@ TabPage PAGE_DBWIZARD_MYSQL_INTRO
         WordBreak = TRUE;
     };
 
-
     FixedText FT_MYSQL_HELPTEXT
     {
         Pos = MAP_APPFONT (START_X , 27 )  ;
@@ -202,7 +200,6 @@ TabPage PAGE_DBWIZARD_MYSQL_INTRO
         Text[ en-US ] = "Connect directly" ;
         Hide = TRUE ;
     };
-
 };
 
 #define AUTHENTEDIT_X   (EDIT_X - 10)
@@ -222,7 +219,6 @@ TabPage PAGE_DBWIZARD_AUTHENTIFICATION
         WordBreak = TRUE;
     };
 
-
     FixedText FT_AUTHENTIFICATIONHELPTEXT\
     {
         Pos = MAP_APPFONT (START_X , 27 )  ;
@@ -261,7 +257,6 @@ TabPage PAGE_DBWIZARD_AUTHENTIFICATION
         Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
         Text[ en-US ] = "~Test Connection" ;
     };
-
 };
 
 
@@ -272,7 +267,6 @@ TabPage PAGE_DBWIZARD_FINAL
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
     Hide = TRUE ;
 
-
     FixedText FT_FINALHEADER
     {
         Pos = MAP_APPFONT ( START_X , 8 ) ;
@@ -289,7 +283,6 @@ TabPage PAGE_DBWIZARD_FINAL
         WordBreak = TRUE ;
     };
 
-
     RadioButton RB_REGISTERDATASOURCE
     {
         HelpId = HID_PAGE_DBWIZARD_FINAL_RB_REGISTERDATASOURCE;
@@ -299,7 +292,6 @@ TabPage PAGE_DBWIZARD_FINAL
         Text[ en-US ] = "~Yes, register the database for me" ;
     };
 
-
     RadioButton RB_DONTREGISTERDATASOURCE
     {
         HelpId = HID_PAGE_DBWIZARD_FINAL_RB_DONTREGISTERDATASOURCE ;
@@ -348,7 +340,6 @@ TabPage PAGE_DBWIZARD_MYSQL_JDBC
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
     Hide = TRUE ;
 
-
     String STR_MYSQLJDBC_HEADERTEXT
     {
         Text[ en-US ] = "Set up connection to a MySQL database using JDBC" ;
@@ -410,42 +401,34 @@ TabPage PAGE_DBWIZARD_DBASE
         Text[ en-US ] = "Set up a connection to dBASE files" ;
     };
 
-
     String STR_DBASE_HELPTEXT
     {
         Text[ en-US ]  = "Select the folder where the dBASE files are stored." ;
     };
 
-     AUTO_HELP_BROWSECONTROLGROUP( 3, HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION)
+    AUTO_HELP_BROWSECONTROLGROUP( 3, HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION)
 };
 
-
 TabPage PAGE_DBWIZARD_TEXT
 {
-
     String STR_TEXT_HEADERTEXT
     {
         Text[ en-US ]   = "Set up a connection to text files" ;
     };
 
-
     String STR_TEXT_HELPTEXT
     {
         Text[ en-US ]   = "Select the folder where the CSV (Comma Separated Values) text files are stored. %PRODUCTNAME Base will open these files in read-only mode." ;
     };
 
-
     String STR_TEXT_PATH_OR_FILE{
         Text[ en-US ]  = "Path to text files";
     };
 
-
     AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE)
     AUTO_SEPARATORCONTROLGROUP(82, WIZARD_PAGE_X)
  };
 
-
-
 TabPage PAGE_DBWIZARD_MSACCESS
 {
     SVLook = TRUE ;
@@ -458,17 +441,14 @@ TabPage PAGE_DBWIZARD_MSACCESS
         Text[ en-US ] = "Set up a connection to a Microsoft Access database" ;
     };
 
-
     String STR_MSACCESS_HELPTEXT
     {
         Text[ en-US ] = "Please select the Microsoft Access file you want to access.";
     };
 
     AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION)
-// FT_MSACCESS_MDB_FILE
 };
 
-
 TabPage PAGE_DBWIZARD_LDAP
 {
     SVLook = TRUE ;
@@ -484,7 +464,6 @@ TabPage PAGE_DBWIZARD_LDAP
         WordBreak = TRUE;
     };
 
-
     FixedText FT_LDAP_HELPTEXT
     {
         Pos = MAP_APPFONT (START_X , 27 )  ;
@@ -509,7 +488,6 @@ TabPage PAGE_DBWIZARD_LDAP
     };
 };
 
-
 TabPage PAGE_DBWIZARD_ADABAS
 {
     SVLook = TRUE ;
@@ -522,7 +500,6 @@ TabPage PAGE_DBWIZARD_ADABAS
         Text[ en-US ]   = "Set up a connection to an Adabas D database" ;
     };
 
-
     String STR_ADABAS_HELPTEXT{
         Text[ en-US ] = "Enter the name of the Adabas D database you want to connect to.\nClick 'Browse...' to select an Adabas D database that is already registered in %PRODUCTNAME." ;
     };
@@ -530,7 +507,6 @@ TabPage PAGE_DBWIZARD_ADABAS
     AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME)
 };
 
-
 TabPage PAGE_DBWIZARD_ADO
 {
     SVLook = TRUE ;
@@ -548,7 +524,6 @@ TabPage PAGE_DBWIZARD_ADO
     };
 
     AUTO_HELP_BROWSECONTROLGROUP(5, HID_PAGE_DBWIZARD_ADO_ET_ADOURL)
-
 };
 
 
@@ -581,8 +556,6 @@ TabPage PAGE_DBWIZARD_USERDEFINED
     AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE)
 };
 
-
-
 TabPage PAGE_DBWIZARD_JDBC
 {
     SVLook = TRUE ;
@@ -622,12 +595,10 @@ TabPage PAGE_DBWIZARD_ORACLE
         Text[ en-US ] = "Default: 1521" ;
     };
 
-
     String STR_ORACLE_DRIVERCLASSTEXT{
         Text [ en-US ] = "Oracle JDBC ~driver class";
     };
 
-
     String STR_ORACLE_HELPTEXT{
         Text[ en-US ] = "Please enter the required information to connect to an Oracle database.Note that a JDBC Driver Class must be installed on your system and registered with %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ;
     };
@@ -648,12 +619,10 @@ TabPage PAGE_DBWIZARD_SPREADSHEET
         Text[ en-US ] = "Set up a connection to spreadsheets";
     };
 
-
     String STR_SPREADSHEET_HELPTEXT{
         Text[ en-US ] = "Click 'Browse...' to select a %PRODUCTNAME spreadsheet or Microsoft Excel workbook.\n%PRODUCTNAME will open this file in read-only mode." ;
     };
 
-
     AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH )
 
     String STR_SPREADSHEETPATH{
@@ -669,5 +638,3 @@ TabPage PAGE_DBWIZARD_SPREADSHEET
         Text[ en-US ] = "~Password required" ;
     };
 };
-
-
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 809ccddc27eb..432b45a3d3eb 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -94,12 +94,6 @@ ODbaseIndexDialog::ODbaseIndexDialog( Window * pParent, String aDataSrcName )
     Init();
     SetCtrls();
     FreeResource();
-
-    // set Hi contrast bitmaps
-    aIB_Add.SetModeImage(       ModuleRes(IMG_ONE_LEFT_H),BMP_COLOR_HIGHCONTRAST);
-    aIB_AddAll.SetModeImage(    ModuleRes(IMG_ALL_LEFT_H),BMP_COLOR_HIGHCONTRAST);
-    aIB_Remove.SetModeImage(    ModuleRes(IMG_ONE_RIGHT_H),BMP_COLOR_HIGHCONTRAST);
-    aIB_RemoveAll.SetModeImage( ModuleRes(IMG_ALL_RIGHT_H),BMP_COLOR_HIGHCONTRAST);
 }
 
 //-------------------------------------------------------------------------
@@ -354,8 +348,8 @@ void ODbaseIndexDialog::Init()
 
     Sequence< ::rtl::OUString> aFolderContent( ::utl::LocalFileHelper::GetFolderContents(m_aDSN,bFolder));
 
-    ::rtl::OUString aIndexExt = ::rtl::OUString::createFromAscii("ndx");
-    ::rtl::OUString aTableExt = ::rtl::OUString::createFromAscii("dbf");
+    ::rtl::OUString aIndexExt(RTL_CONSTASCII_USTRINGPARAM("ndx"));
+    ::rtl::OUString aTableExt(RTL_CONSTASCII_USTRINGPARAM("dbf"));
 
     ::std::vector< String > aUsedIndexes;
 
@@ -541,7 +535,7 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const
         try
         {
             ::ucbhelper::Content aContent(aURL.GetURLNoPass(),Reference<XCommandEnvironment>());
-            aContent.executeCommand( rtl::OUString::createFromAscii( "delete" ),makeAny( sal_Bool( sal_True ) ) );
+            aContent.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),makeAny( sal_Bool( sal_True ) ) );
         }
         catch (const Exception& e )
         {
diff --git a/dbaccess/source/ui/dlg/dbfindex.src b/dbaccess/source/ui/dlg/dbfindex.src
index ad401102601d..8c253554ffde 100644
--- a/dbaccess/source/ui/dlg/dbfindex.src
+++ b/dbaccess/source/ui/dlg/dbfindex.src
@@ -35,62 +35,6 @@
 #define WIN_X   264
 #define WIN_Y   149
 
-Image IMG_ONE_LEFT_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "one_left_h.bmp" ;
-    };
-    MaskColor = Color
-    {
-        Red = 0xFFFF ;
-        Green = 0x0000 ;
-        Blue = 0xFFFF ;
-    };
-};
-
-Image IMG_ALL_LEFT_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "all_left_h.bmp" ;
-    };
-    MaskColor = Color
-    {
-        Red = 0xFFFF ;
-        Green = 0x0000 ;
-        Blue = 0xFFFF ;
-    };
-};
-
-Image IMG_ONE_RIGHT_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "one_right_h.bmp" ;
-    };
-    MaskColor = Color
-    {
-        Red = 0xFFFF ;
-        Green = 0x0000 ;
-        Blue = 0xFFFF ;
-    };
-};
-
-Image IMG_ALL_RIGHT_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "all_right_h.bmp" ;
-    };
-    MaskColor = Color
-    {
-        Red = 0xFFFF ;
-        Green = 0x0000 ;
-        Blue = 0xFFFF ;
-    };
-};
-
 ModalDialog DLG_DBASE_INDEXES
 {
     OutputSize = TRUE ;
@@ -175,7 +119,7 @@ ModalDialog DLG_DBASE_INDEXES
         {
             ImageBitmap = Bitmap
             {
-                File = "one_left.bmp" ;
+                File = "one_left.png" ;
             };
             MaskColor = Color
             {
@@ -194,7 +138,7 @@ ModalDialog DLG_DBASE_INDEXES
         {
             ImageBitmap = Bitmap
             {
-                File = "all_left.bmp" ;
+                File = "all_left.png" ;
             };
             MaskColor = Color
             {
@@ -213,7 +157,7 @@ ModalDialog DLG_DBASE_INDEXES
         {
             ImageBitmap = Bitmap
             {
-                File = "one_right.bmp" ;
+                File = "one_right.png" ;
             };
             MaskColor = Color
             {
@@ -232,7 +176,7 @@ ModalDialog DLG_DBASE_INDEXES
         {
             ImageBitmap = Bitmap
             {
-                File = "all_right.bmp" ;
+                File = "all_right.png" ;
             };
             MaskColor = Color
             {
@@ -242,5 +186,4 @@ ModalDialog DLG_DBASE_INDEXES
             };
         };
     };
-
 };
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index aea15cf0fb8a..c09b34bb151f 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -181,7 +181,6 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent
     m_pOutSet = new SfxItemSet( *_pItems->GetPool(), _pItems->GetRanges() );
 
     m_pImpl->translateProperties(xDatasource, *m_pOutSet);
-//  eType = m_pImpl->getDatasourceType(*m_pOutSet);
 
     SetPageSizePixel(LogicToPixel(::Size(WIZARD_PAGE_X, WIZARD_PAGE_Y), MAP_APPFONT));
     ShowButtonFixedLine(sal_True);
@@ -229,7 +228,7 @@ void ODbTypeWizDialogSetup::declareAuthDepPath( const ::rtl::OUString& _sURL, Pa
     {
         if ( bHasAuthentication || ( *aIter != PAGE_DBSETUPWIZARD_AUTHENTIFICATION ) )
             aPath.push_back( *aIter );
-    } // for(;aIter != aEnd;++aIter)
+    }
 
     // call base method
     ::svt::RoadmapWizard::declarePath( _nPathId, aPath );
@@ -359,7 +358,7 @@ void ODbTypeWizDialogSetup::activateDatabasePath()
     {
         sal_Int32 nCreateNewDBIndex = m_pCollection->getIndexOf( m_pCollection->getEmbeddedDatabase() );
         if ( nCreateNewDBIndex == -1 )
-            nCreateNewDBIndex = m_pCollection->getIndexOf( ::rtl::OUString::createFromAscii( "sdbc:dbase:" ) );
+            nCreateNewDBIndex = m_pCollection->getIndexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:dbase:")) );
         OSL_ENSURE( nCreateNewDBIndex != -1, "ODbTypeWizDialogSetup::activateDatabasePath: the GeneralPage should have prevented this!" );
         activatePath( static_cast< PathId >( nCreateNewDBIndex + 1 ), sal_True );
 
@@ -655,7 +654,7 @@ IMPL_LINK(ODbTypeWizDialogSetup, ImplClickHdl, OMySQLIntroPageSetup*, _pMySQLInt
         case  OMySQLIntroPageSetup::VIA_NATIVE:
             sURLPrefix = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:mysqlc:"));
             break;
-    } // switch( _pMySQLIntroPageSetup->getMySQLMode() )
+    }
     activatePath( static_cast<PathId>(m_pCollection->getIndexOf(sURLPrefix) + 1), sal_True);
     return sal_True;
 }
@@ -860,15 +859,13 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
         }
         else if ( m_pCollection->isFileSystemBased(eType) )
         {
-            Reference< XSimpleFileAccess > xSimpleFileAccess(getORB()->createInstance(::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" )), UNO_QUERY);
+            Reference< XSimpleFileAccess > xSimpleFileAccess(getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), UNO_QUERY);
             INetURLObject aDBPathURL(m_sWorkPath);
             aDBPathURL.Append(m_aDocURL.getBase());
             createUniqueFolderName(&aDBPathURL);
             ::rtl::OUString sPrefix = eType;
             sUrl = aDBPathURL.GetMainURL( INetURLObject::NO_DECODE);
             xSimpleFileAccess->createFolder(sUrl);
-            //OFileNotation aFileNotation(sUrl);
-            //sUrl = aFileNotation.get(OFileNotation::N_SYSTEM);
              sUrl = sPrefix.concat(sUrl);
         }
         m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, sUrl));
@@ -929,7 +926,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
     //-------------------------------------------------------------------------
     void ODbTypeWizDialogSetup::createUniqueFolderName(INetURLObject* pURL)
     {
-        Reference< XSimpleFileAccess > xSimpleFileAccess(getORB()->createInstance(::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" )), UNO_QUERY);
+        Reference< XSimpleFileAccess > xSimpleFileAccess(getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), UNO_QUERY);
         :: rtl::OUString sLastSegmentName = pURL->getName();
         sal_Bool bFolderExists = sal_True;
         sal_Int32 i = 1;
@@ -947,7 +944,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
     //-------------------------------------------------------------------------
     String ODbTypeWizDialogSetup::createUniqueFileName(const INetURLObject& _rURL)
     {
-        Reference< XSimpleFileAccess > xSimpleFileAccess(getORB()->createInstance(::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" )), UNO_QUERY);
+        Reference< XSimpleFileAccess > xSimpleFileAccess(getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), UNO_QUERY);
         :: rtl::OUString sFilename = _rURL.getName();
         ::rtl::OUString BaseName = _rURL.getBase();
         ::rtl::OUString sExtension = _rURL.getExtension();
diff --git a/dbaccess/source/ui/dlg/directsql.src b/dbaccess/source/ui/dlg/directsql.src
index 230fe4dac320..74d9b3b69775 100644
--- a/dbaccess/source/ui/dlg/directsql.src
+++ b/dbaccess/source/ui/dlg/directsql.src
@@ -131,4 +131,3 @@ String STR_DIRECTSQL_CONNECTIONLOST
 {
     Text [ en-US ] = "The connection to the database has been lost. This dialog will be closed.";
 };
-
diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx
index 20537fce089d..9ea519ddc27b 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -63,7 +63,6 @@ SbaSbAttrDlg::SbaSbAttrDlg(Window* pParent, const SfxItemSet* pCellAttrs, SvNumb
         SetText(aTitle);
     if( nFlags & TP_ATTR_CHAR )
     {
-//        AddTabPage( RID_SVXPAGE_CHAR_STD,String(ModuleRes(TP_ATTR_CHAR)),SvxCharStdPage::Create,            0 );
         DBG_ERROR( "found flag TP_ATTR_CHAR" );
     }
     if( nFlags & TP_ATTR_NUMBER )
@@ -96,14 +95,11 @@ void SbaSbAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage )
 
         case RID_SVXPAGE_CHAR_STD:
         {
-            //  ((SvxCharStdPage&)rTabPage).SetFontList(SBA_MOD_EXT()->FontListItem());
         }
         break;
 
         case RID_SVXPAGE_ALIGNMENT:
         {
-//           aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, WBA_NO_ORIENTATION|WBA_NO_LINEBREAK|WBA_NO_GRIDLINES|WBA_NO_VERTICAL|WBA_NO_LEFTINDENT));
-//           rTabPage.PageCreated(aSet);
         }
         break;
 
diff --git a/dbaccess/source/ui/dlg/dlgattr.src b/dbaccess/source/ui/dlg/dlgattr.src
index 8dce0835aa69..a1f689bcb33a 100644
--- a/dbaccess/source/ui/dlg/dlgattr.src
+++ b/dbaccess/source/ui/dlg/dlgattr.src
@@ -36,6 +36,7 @@
 #ifndef DBAUI_SBATTRDLG_HRC
 #include "dlgattr.hrc"
 #endif
+
  //================================================
  // Der Attributdialog:
 TabDialog DLG_ATTR
@@ -89,34 +90,3 @@ TabDialog DLG_ATTR
         Text [ en-US ] = "Table Format" ;
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dbaccess/source/ui/dlg/dlgsave.src b/dbaccess/source/ui/dlg/dlgsave.src
index d550704b85f8..5ebc5374155c 100644
--- a/dbaccess/source/ui/dlg/dlgsave.src
+++ b/dbaccess/source/ui/dlg/dlgsave.src
@@ -138,4 +138,3 @@ ModalDialog DLG_SAVE_AS
         Text [ en-US ] = "Insert as";
     };
 };
-
diff --git a/dbaccess/source/ui/dlg/dlgsize.src b/dbaccess/source/ui/dlg/dlgsize.src
index ade6f3ff1222..949dc38fc489 100644
--- a/dbaccess/source/ui/dlg/dlgsize.src
+++ b/dbaccess/source/ui/dlg/dlgsize.src
@@ -156,34 +156,3 @@ ModalDialog DLG_COLWIDTH
     };
     Text [ en-US ] = "Column Width" ;
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx
index dc7e5426c1d8..0f787bcc996d 100644
--- a/dbaccess/source/ui/dlg/dsselect.cxx
+++ b/dbaccess/source/ui/dlg/dsselect.cxx
@@ -149,7 +149,7 @@ IMPL_LINK( ODatasourceSelectDialog, CreateDBClickHdl, PushButton*, /*pButton*/ )
         if ( xCatalog.is() && m_pOutputSet )
         {
             Sequence< Any > aArgs(2);
-            aArgs[0] <<= PropertyValue(::rtl::OUString::createFromAscii("CreateCatalog"), 0,makeAny(xCatalog) , PropertyState_DIRECT_VALUE);
+            aArgs[0] <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateCatalog")), 0, makeAny(xCatalog), PropertyState_DIRECT_VALUE);
             aArgs[1] <<= PropertyValue(PROPERTY_PARENTWINDOW, 0, makeAny(VCLUnoHelper::GetInterface(this)), PropertyState_DIRECT_VALUE);
 
             Reference< XExecutableDialog > xDialog(
diff --git a/dbaccess/source/ui/dlg/dsselect.src b/dbaccess/source/ui/dlg/dsselect.src
index 8eff7fffe6c4..8c59a26d1a16 100644
--- a/dbaccess/source/ui/dlg/dsselect.src
+++ b/dbaccess/source/ui/dlg/dsselect.src
@@ -103,5 +103,3 @@ ModalDialog DLG_DATASOURCE_SELECTION
         Text [ en-US ] = "Choose a database";
     };
 };
-
-
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 1103a375b636..1c164b0de875 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -105,7 +105,7 @@ namespace dbaui
         // If no driver for embedded DBs is installed, and no dBase driver, then hide the "Create new database" option
         sal_Int32 nCreateNewDBIndex = m_pCollection->getIndexOf( m_pCollection->getEmbeddedDatabase() );
         if ( nCreateNewDBIndex == -1 )
-            nCreateNewDBIndex = m_pCollection->getIndexOf( ::rtl::OUString::createFromAscii( "sdbc:dbase:" ) );
+            nCreateNewDBIndex = m_pCollection->getIndexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:dbase:")) );
         bool bHideCreateNew = ( nCreateNewDBIndex == -1 );
 
         // also, if our application policies tell us to hide the option, do it
@@ -213,7 +213,7 @@ namespace dbaui
                         ++loop
                     )
                     insertDatasourceTypeEntryData( loop->eType, loop->sDisplayName );
-            } // if ( m_pCollection )
+            }
         }
     }
 
@@ -607,7 +607,6 @@ namespace dbaui
         const SfxFilter* pFilter = getStandardDatabaseFilter();
         if ( pFilter )
         {
-//          aFileDlg.AddFilter(pFilter->GetUIName(),pFilter->GetDefaultExtension());
             aFileDlg.SetCurrentFilter(pFilter->GetUIName());
         }
         if ( aFileDlg.Execute() == ERRCODE_NONE )
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index 780fe621157f..e59d09024192 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -186,7 +186,7 @@ DBG_NAME(DbaIndexDialog)
                                     const Reference< XMultiServiceFactory >& _rxORB,sal_Int32 _nMaxColumnsInIndex)
         :ModalDialog( _pParent, ModuleRes(DLG_INDEXDESIGN))
         ,m_xConnection(_rxConnection)
-        ,m_aGeometrySettings(E_DIALOG, ::rtl::OUString::createFromAscii("dbaccess.tabledesign.indexdialog"))
+        ,m_aGeometrySettings(E_DIALOG, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("dbaccess.tabledesign.indexdialog")))
         ,m_aActions                         (this, ModuleRes(TLB_ACTIONS))
         ,m_aIndexes                         (this, ModuleRes(CTR_INDEXLIST))
         ,m_aIndexDetails                    (this, ModuleRes(FL_INDEXDETAILS))
@@ -239,14 +239,6 @@ DBG_NAME(DbaIndexDialog)
 
         m_aClose.SetClickHdl(LINK(this, DbaIndexDialog, OnCloseDialog));
 
-        // get our most recent geometry settings
-//      if (m_aGeometrySettings.Exists())
-//      {
-//          Point aPos;
-//          m_aGeometrySettings.GetPosition(aPos.X(), aPos.Y());
-//          SetPosPixel(aPos);
-//      }
-
         // if all of the indexes have an empty description, we're not interested in displaying it
         Indexes::const_iterator aCheck;
 
@@ -316,8 +308,7 @@ DBG_NAME(DbaIndexDialog)
     //------------------------------------------------------------------
     void DbaIndexDialog::fillIndexList()
     {
-        sal_Bool bHiContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-        Image aPKeyIcon(ModuleRes( bHiContrast ? IMG_PKEYICON_SCH : IMG_PKEYICON));
+        Image aPKeyIcon(ModuleRes( IMG_PKEYICON ));
         // fill the list with the index names
         m_aIndexes.Clear();
         Indexes::iterator aIndexLoop = m_pIndexes->begin();
@@ -343,10 +334,6 @@ DBG_NAME(DbaIndexDialog)
         delete m_pIndexes;
         delete m_pFields;
 
-        // save our geometry settings
-//      Point aPos = GetPosPixel();
-//      m_aGeometrySettings.SetPosition(aPos.X(), aPos.Y());
-
         DBG_DTOR(DbaIndexDialog,NULL);
     }
 
@@ -889,16 +876,14 @@ DBG_NAME(DbaIndexDialog)
         }
     }
     //------------------------------------------------------------------
-    ImageList DbaIndexDialog::getImageList(sal_Int16 _eBitmapSet,sal_Bool _bHiContast) const
+    ImageList DbaIndexDialog::getImageList(sal_Int16 _eBitmapSet) const
     {
         sal_Int16 nN = IMG_INDEX_DLG_SC;
-        sal_Int16 nH = IMG_INDEX_DLG_SCH;
         if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE )
         {
             nN = IMG_INDEX_DLG_LC;
-            nH = IMG_INDEX_DLG_LCH;
-        } // if ( _eBitmapSet == SFX_SYMBOLS_LARGE )
-        return ImageList(ModuleRes( _bHiContast ? nH : nN ));
+        }
+        return ImageList( nN );
     }
     //------------------------------------------------------------------
     void DbaIndexDialog::resizeControls(const Size& _rDiff)
diff --git a/dbaccess/source/ui/dlg/indexdialog.src b/dbaccess/source/ui/dlg/indexdialog.src
index ae8f80d6c616..05b294d3aa07 100644
--- a/dbaccess/source/ui/dlg/indexdialog.src
+++ b/dbaccess/source/ui/dlg/indexdialog.src
@@ -57,7 +57,6 @@ ModalDialog DLG_INDEXDESIGN
     ToolBox TLB_ACTIONS
     {
         Pos = MAP_APPFONT ( 6 , 6 ) ;
-        //  Size = MAP_APPFONT ( DIALOG_SIZE_X - 14 , 14 ) ;
         ButtonType = BUTTON_SYMBOL;
         Align = BOXALIGN_TOP;
         HelpId = HID_INDEX_DIALOG_ACTION_TB;
@@ -171,14 +170,17 @@ String STR_TAB_INDEX_SORTORDER
 {
     Text [ en-US ] = "Sort order" ;
 };
+
 String STR_TAB_INDEX_FIELD
 {
     Text [ en-US ] = "Index field" ;
 };
+
 String STR_ORDER_ASCENDING
 {
     Text [ en-US ] = "Ascending" ;
 };
+
 String STR_ORDER_DESCENDING
 {
     Text [ en-US ] = "Descending" ;
@@ -196,12 +198,7 @@ String STR_LOGICAL_INDEX_NAME
 
 Image IMG_PKEYICON
 {
-    ImageBitmap = Bitmap { File = "pkey.bmp"; };
-    MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
-};
-Image IMG_PKEYICON_SCH
-{
-    ImageBitmap = Bitmap { File = "pkey_sch.bmp"; };
+    ImageBitmap = Bitmap { File = "pkey.png"; };
     MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
 };
 
@@ -233,4 +230,3 @@ String STR_INDEXDESIGN_DOUBLE_COLUMN_NAME
 {
     Text [ en-US ] = "In an index definition, no table column may occur more than once. However, you have entered column \"$name$\" twice.";
 };
-
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index a617abd6baa6..927e62c7ddf8 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -198,7 +198,6 @@ DBG_NAME(IndexFieldsControl)
         // insert rows for the the fields
         RowInserted(GetRowCount(), m_aFields.size(), sal_False);
         // insert an additional row for a new field for that index
-//      if(!m_nMaxColumnsInIndex || GetRowCount() < m_nMaxColumnsInIndex )
         RowInserted(GetRowCount(), 1, sal_False);
         SetUpdateMode(sal_True);
 
diff --git a/dbaccess/source/ui/dlg/makefile.mk b/dbaccess/source/ui/dlg/makefile.mk
index 270741d00857..4f0058a03906 100644
--- a/dbaccess/source/ui/dlg/makefile.mk
+++ b/dbaccess/source/ui/dlg/makefile.mk
@@ -85,47 +85,47 @@ SRC1FILES =	\
 
 # ... object files ............................
 EXCEPTIONSFILES=						\
+        $(SLO)$/AdabasStat.obj			\
+        $(SLO)$/CollectionView.obj		\
+        $(SLO)$/ConnectionHelper.obj		\
+        $(SLO)$/ConnectionPage.obj		\
+        $(SLO)$/ConnectionPageSetup.obj		\
+        $(SLO)$/DBSetupConnectionPages.obj 	\
+        $(SLO)$/DbAdminImpl.obj			\
+        $(SLO)$/DriverSettings.obj      	\
+        $(SLO)$/RelationDlg.obj			\
+        $(SLO)$/TablesSingleDlg.obj		\
+        $(SLO)$/TextConnectionHelper.obj	\
+        $(SLO)$/UserAdmin.obj			\
+        $(SLO)$/UserAdminDlg.obj		\
+        $(SLO)$/admincontrols.obj       	\
+        $(SLO)$/adminpages.obj			\
+        $(SLO)$/adtabdlg.obj			\
+        $(SLO)$/advancedsettings.obj    	\
+        $(SLO)$/dbadmin.obj			\
+        $(SLO)$/dbfindex.obj            	\
+        $(SLO)$/dbwiz.obj			\
+        $(SLO)$/dbwizsetup.obj			\
+        $(SLO)$/detailpages.obj			\
         $(SLO)$/directsql.obj			\
-        $(SLO)$/dbwiz.obj				\
-        $(SLO)$/dbwizsetup.obj				\
+        $(SLO)$/dlgattr.obj             	\
+        $(SLO)$/dlgsave.obj			\
+        $(SLO)$/dlgsize.obj			\
+        $(SLO)$/dsselect.obj			\
+        $(SLO)$/finteraction.obj		\
         $(SLO)$/generalpage.obj			\
-        $(SLO)$/indexfieldscontrol.obj	\
         $(SLO)$/indexdialog.obj			\
-        $(SLO)$/RelationDlg.obj			\
-        $(SLO)$/adtabdlg.obj			\
-        $(SLO)$/dlgsave.obj				\
-        $(SLO)$/admincontrols.obj       \
-        $(SLO)$/adminpages.obj			\
-        $(SLO)$/queryorder.obj			\
-        $(SLO)$/queryfilter.obj			\
+        $(SLO)$/indexfieldscontrol.obj		\
+        $(SLO)$/odbcconfig.obj          	\
         $(SLO)$/paramdialog.obj			\
-        $(SLO)$/dbadmin.obj				\
-        $(SLO)$/detailpages.obj			\
+        $(SLO)$/queryfilter.obj			\
+        $(SLO)$/queryorder.obj			\
         $(SLO)$/sqlmessage.obj			\
-        $(SLO)$/finteraction.obj		\
-        $(SLO)$/ConnectionPage.obj		\
-        $(SLO)$/ConnectionHelper.obj	\
-        $(SLO)$/TextConnectionHelper.obj	\
-        $(SLO)$/ConnectionPageSetup.obj	\
-        $(SLO)$/DBSetupConnectionPages.obj 	\
-        $(SLO)$/UserAdminDlg.obj		\
-        $(SLO)$/UserAdmin.obj			\
-        $(SLO)$/AdabasStat.obj			\
         $(SLO)$/tablespage.obj			\
-        $(SLO)$/DbAdminImpl.obj			\
-        $(SLO)$/TablesSingleDlg.obj		\
-        $(SLO)$/CollectionView.obj		\
-        $(SLO)$/dsselect.obj			\
-        $(SLO)$/dbfindex.obj            \
-        $(SLO)$/DriverSettings.obj      \
-        $(SLO)$/odbcconfig.obj          \
-        $(SLO)$/advancedsettings.obj    \
         $(SLO)$/textconnectionsettings.obj
 
-SLOFILES=								\
-        $(EXCEPTIONSFILES)				\
-        $(SLO)$/dlgsize.obj				\
-        $(SLO)$/dlgattr.obj             \
+SLOFILES=					\
+        $(EXCEPTIONSFILES)			\
         $(SLO)$/optionalboolitem.obj 
 
 .IF "$(WINDOWS_VISTA_PSDK)"!="" && "$(PROF_EDITION)"==""
diff --git a/dbaccess/source/ui/dlg/paramdialog.src b/dbaccess/source/ui/dlg/paramdialog.src
index 3993096f8847..6e8b61debff5 100644
--- a/dbaccess/source/ui/dlg/paramdialog.src
+++ b/dbaccess/source/ui/dlg/paramdialog.src
@@ -43,7 +43,6 @@ ModalDialog DLG_PARAMETERS
     Moveable = TRUE ;
     Closeable = TRUE ;
 
-
     FixedLine FL_PARAMS
     {
         Pos = MAP_APPFONT ( 4 , 3 ) ;
@@ -97,4 +96,3 @@ ModalDialog DLG_PARAMETERS
         Text [ en-US ] = "The entry could not be converted to a valid value for the \"$name$\"column";
     };
 };
-
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx
index 6c3a6124f5b4..98e54ca522f5 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -363,7 +363,7 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom
                     sTableName += _rFilter.Name;
                     _rFilter.Name = sTableName;
                 }
-            } // if ( !bFunction )
+            }
         }
     }
     catch(Exception)
@@ -586,11 +586,9 @@ void DlgFilterCrit::SelectField( ListBox& rBox, const String& rField )
 {
     DBG_CHKTHIS(DlgFilterCrit,NULL);
     sal_uInt16 nCnt = rBox.GetEntryCount();
-    //  sal_Bool bCase = m_rIterator.TablesAreSensitive();
 
     for( sal_uInt16 i=0 ; i<nCnt ; i++ )
     {
-        //  if(bCase ? rBox.GetEntry(i) == rField : rBox.GetEntry(i).EqualsIgnoreCaseAscii(rField))
         if(rBox.GetEntry(i) == rField)
         {
             rBox.SelectEntryPos(i);
@@ -781,7 +779,6 @@ void DlgFilterCrit::BuildWherePart()
     Sequence<Sequence<PropertyValue> > aFilter,aHaving;
     aFilter.realloc(1);
     aHaving.realloc(1);
-    //  ::rtl::OUString aFilter;
 
     if( LbPos(aLB_WHEREFIELD1) != 0 )
     {
diff --git a/dbaccess/source/ui/dlg/queryfilter.src b/dbaccess/source/ui/dlg/queryfilter.src
index 2b1ef6e6baf5..60019320839d 100644
--- a/dbaccess/source/ui/dlg/queryfilter.src
+++ b/dbaccess/source/ui/dlg/queryfilter.src
@@ -30,15 +30,6 @@
 #endif
 #include "dbaccess_helpid.hrc"
 
-/*
-#define STRLST_AND_OR \
-    StringList [ en-US ] = \
-    {\
-        < "AND" ; Default ; > ; \
-        < "OR" ; Default ; > ; \
-    };\
-*/
-
 ModalDialog DLG_FILTERCRIT
 {
     OutputSize = TRUE ;
@@ -84,7 +75,6 @@ ModalDialog DLG_FILTERCRIT
         TabStop = TRUE ;
         DropDown = TRUE ;
         CurPos = 0 ;
-//      STRLST_AND_OR
         StringList [ en-US ] =
         {
             < "AND" ; Default ; > ;
@@ -124,7 +114,6 @@ ModalDialog DLG_FILTERCRIT
         TabStop = TRUE ;
         DropDown = TRUE ;
         CurPos = 0 ;
-//      STRLST_AND_OR
         StringList [ en-US ] =
         {
             < "AND" ; Default ; > ;
@@ -219,4 +208,3 @@ ModalDialog DLG_FILTERCRIT
         Text [ en-US ] = "=;<>;<;<=;>;>=;like;not like;null;not null";
     };
 };
-
diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx
index d237978ce1ce..caa2b79e9a17 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -247,8 +247,8 @@ void DlgOrderCrit::EnableLines()
     DBG_CHKTHIS(DlgOrderCrit,NULL);
     Reference<XDatabaseMetaData> xMetaData = m_xConnection->getMetaData();
     ::rtl::OUString sQuote  = xMetaData.is() ? xMetaData->getIdentifierQuoteString() : ::rtl::OUString();
-    static const ::rtl::OUString sDESC = ::rtl::OUString::createFromAscii(" DESC ");
-    static const ::rtl::OUString sASC  = ::rtl::OUString::createFromAscii(" ASC ");
+    static const ::rtl::OUString sDESC(RTL_CONSTASCII_USTRINGPARAM(" DESC "));
+    static const ::rtl::OUString sASC(RTL_CONSTASCII_USTRINGPARAM(" ASC "));
 
     Reference< XNameAccess> xColumns = Reference< XColumnsSupplier >(m_xQueryComposer,UNO_QUERY)->getColumns();
 
@@ -258,7 +258,7 @@ void DlgOrderCrit::EnableLines()
         if(m_aColumnList[i]->GetSelectEntryPos() != 0)
         {
             if(sOrder.getLength())
-                sOrder += ::rtl::OUString::createFromAscii(",");
+                sOrder += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
 
             String sName = m_aColumnList[i]->GetSelectEntry();
             try
diff --git a/dbaccess/source/ui/dlg/queryorder.src b/dbaccess/source/ui/dlg/queryorder.src
index 2f2f85a797a0..fe750422564f 100644
--- a/dbaccess/source/ui/dlg/queryorder.src
+++ b/dbaccess/source/ui/dlg/queryorder.src
@@ -173,39 +173,3 @@ ModalDialog DLG_ORDERCRIT
         Text [ en-US ] = "<none>" ;
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 0220c2691ade..2299c82f8425 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -70,7 +70,7 @@ namespace
     class IImageProvider
     {
     public:
-        virtual Image   getImage( bool _highContrast ) const = 0;
+        virtual Image   getImage() const = 0;
 
         virtual ~IImageProvider() { }
     };
@@ -89,27 +89,17 @@ namespace
     {
     private:
         USHORT  m_defaultImageID;
-        USHORT  m_highContrastImageID;
 
         mutable Image   m_defaultImage;
-        mutable Image   m_highContrastImage;
 
     public:
-        ImageProvider( USHORT _defaultImageID, USHORT _highContrastImageID )
+        ImageProvider( USHORT _defaultImageID )
             :m_defaultImageID( _defaultImageID )
-            ,m_highContrastImageID( _highContrastImageID )
         {
         }
 
-        virtual Image getImage( bool _highContrast ) const
+        virtual Image getImage() const
         {
-            if ( _highContrast )
-            {
-                if ( !m_highContrastImage )
-                    m_highContrastImage = Image( ModuleRes( m_highContrastImageID ) );
-                return m_highContrastImage;
-            }
-
             if ( !m_defaultImage )
                 m_defaultImage = Image( ModuleRes( m_defaultImageID ) );
             return m_defaultImage;
@@ -153,20 +143,17 @@ namespace
         {
             ::boost::shared_ptr< IImageProvider >* ppProvider( &m_pErrorImage );
             USHORT nNormalImageID( BMP_EXCEPTION_ERROR );
-            USHORT nHCImageID( BMP_EXCEPTION_ERROR_SCH );
 
             switch ( _eType )
             {
             case SQLExceptionInfo::SQL_WARNING:
                 ppProvider = &m_pWarningsImage;
                 nNormalImageID = BMP_EXCEPTION_WARNING;
-                nHCImageID = BMP_EXCEPTION_WARNING_SCH;
                 break;
 
             case SQLExceptionInfo::SQL_CONTEXT:
                 ppProvider = &m_pInfoImage;
                 nNormalImageID = BMP_EXCEPTION_INFO;
-                nHCImageID = BMP_EXCEPTION_INFO_SCH;
                 break;
 
             default:
@@ -174,7 +161,7 @@ namespace
             }
 
             if ( !ppProvider->get() )
-                ppProvider->reset( new ImageProvider( nNormalImageID, nHCImageID ) );
+                ppProvider->reset( new ImageProvider( nNormalImageID ) );
             return *ppProvider;
         }
 
@@ -314,9 +301,9 @@ namespace
     }
 
     //------------------------------------------------------------------------------
-    void lcl_insertExceptionEntry( SvTreeListBox& _rList, bool _bHiContrast, size_t _nElementPos, const ExceptionDisplayInfo& _rEntry )
+    void lcl_insertExceptionEntry( SvTreeListBox& _rList, size_t _nElementPos, const ExceptionDisplayInfo& _rEntry )
     {
-        Image aEntryImage( _rEntry.pImageProvider->getImage( _bHiContrast ) );
+        Image aEntryImage( _rEntry.pImageProvider->getImage() );
         SvLBoxEntry* pListEntry =
             _rList.InsertEntry( _rEntry.pLabelProvider->getLabel(), aEntryImage, aEntryImage );
         pListEntry->SetUserData( reinterpret_cast< void* >( _nElementPos ) );
@@ -375,7 +362,6 @@ OExceptionChainDialog::OExceptionChainDialog( Window* pParent, const ExceptionDi
     m_aExceptionText.SetReadOnly(sal_True);
 
     bool bHave22018 = false;
-    bool bHiContrast = isHiContrast( this );
     size_t elementPos = 0;
 
     for (   ExceptionDisplayChain::const_iterator loop = m_aExceptions.begin();
@@ -383,7 +369,7 @@ OExceptionChainDialog::OExceptionChainDialog( Window* pParent, const ExceptionDi
             ++loop, ++elementPos
         )
     {
-        lcl_insertExceptionEntry( m_aExceptionList, bHiContrast, elementPos, *loop );
+        lcl_insertExceptionEntry( m_aExceptionList, elementPos, *loop );
         bHave22018 = loop->sSQLState.EqualsAscii( "22018" );
     }
 
@@ -399,7 +385,7 @@ OExceptionChainDialog::OExceptionChainDialog( Window* pParent, const ExceptionDi
         aInfo22018.pImageProvider = aProviderFactory.getImageProvider( SQLExceptionInfo::SQL_CONTEXT );
         m_aExceptions.push_back( aInfo22018 );
 
-        lcl_insertExceptionEntry( m_aExceptionList, bHiContrast, m_aExceptions.size() - 1, aInfo22018 );
+        lcl_insertExceptionEntry( m_aExceptionList, m_aExceptions.size() - 1, aInfo22018 );
     }
 }
 
diff --git a/dbaccess/source/ui/dlg/sqlmessage.src b/dbaccess/source/ui/dlg/sqlmessage.src
index af3d53f785dd..979fdd3709df 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.src
+++ b/dbaccess/source/ui/dlg/sqlmessage.src
@@ -38,36 +38,19 @@
 //-------------------------------------------------------------------------
 Image BMP_EXCEPTION_ERROR
 {
-    ImageBitmap = Bitmap { File = "exerror.bmp"; };
+    ImageBitmap = Bitmap { File = "exerror.png"; };
     MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
 };
 
 Image BMP_EXCEPTION_WARNING
 {
-    ImageBitmap = Bitmap { File = "exwarning.bmp"; };
+    ImageBitmap = Bitmap { File = "exwarning.png"; };
     MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
 };
 
 Image BMP_EXCEPTION_INFO
 {
-    ImageBitmap = Bitmap { File = "exinfo.bmp"; };
-    MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
-};
-Image BMP_EXCEPTION_ERROR_SCH
-{
-    ImageBitmap = Bitmap { File = "exerror_sch.bmp"; };
-    MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
-};
-
-Image BMP_EXCEPTION_WARNING_SCH
-{
-    ImageBitmap = Bitmap { File = "exwarning_sch.bmp"; };
-    MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
-};
-
-Image BMP_EXCEPTION_INFO_SCH
-{
-    ImageBitmap = Bitmap { File = "exinfo_sch.bmp"; };
+    ImageBitmap = Bitmap { File = "exinfo.png"; };
     MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
 };
 
diff --git a/dbaccess/source/ui/imagelists/dbimagelists.src b/dbaccess/source/ui/imagelists/dbimagelists.src
index 2e2a64d87448..8f993554f7c7 100644
--- a/dbaccess/source/ui/imagelists/dbimagelists.src
+++ b/dbaccess/source/ui/imagelists/dbimagelists.src
@@ -56,13 +56,6 @@ ImageList IMG_INDEX_DLG_SC
     IL_TOOL_2 ;
 };
 
-ImageList IMG_INDEX_DLG_SCH
-{
-    MASKCOLOR;
-    prefix = "sch";
-    IL_TOOL_2 ;
-};
-
 ImageList IMG_INDEX_DLG_LC
 {
     MASKCOLOR;
@@ -70,53 +63,29 @@ ImageList IMG_INDEX_DLG_LC
     IL_TOOL_2 ;
 };
 
-ImageList IMG_INDEX_DLG_LCH
-{
-    MASKCOLOR;
-    prefix = "lch";
-    IL_TOOL_2 ;
-};
-
 Image IMG_FORMFOLDER_TREE_L
 {
     ImageBitmap = Bitmap { File = "forms_32"; };
     MASKCOLOR;
 };
-Image IMG_FORMFOLDER_TREE_LHC
-{
-    ImageBitmap = Bitmap { File = "forms_32_h"; };
-    MASKCOLOR;
-};
+
 Image IMG_REPORTFOLDER_TREE_L
 {
     ImageBitmap = Bitmap { File = "reports_32"; };
     MASKCOLOR;
 };
-Image IMG_REPORTFOLDER_TREE_LHC
-{
-    ImageBitmap = Bitmap { File = "reports_32_h"; };
-    MASKCOLOR;
-};
+
 Image IMG_QUERYFOLDER_TREE_L
 {
     ImageBitmap = Bitmap { File = "queries_32"; };
     MASKCOLOR;
 };
-Image IMG_QUERYFOLDER_TREE_LHC
-{
-    ImageBitmap = Bitmap { File = "queries_32_h"; };
-    MASKCOLOR;
-};
+
 Image IMG_TABLEFOLDER_TREE_L
 {
     ImageBitmap = Bitmap { File = "tables_32"; };
     MASKCOLOR;
 };
-Image IMG_TABLEFOLDER_TREE_LHC
-{
-    ImageBitmap = Bitmap { File = "tables_32_h"; };
-    MASKCOLOR;
-};
 
 //========================================================================
 //= database object icons
@@ -126,13 +95,7 @@ Image IMG_TABLEFOLDER_TREE_LHC
 
 Image DATABASE_TREE_ICON
 {
-    ImageBitmap = Bitmap { File = "db.bmp"; };
-    MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
-};
-
-Image DATABASE_TREE_ICON_SCH
-{
-    ImageBitmap = Bitmap { File = "db_sch.bmp"; };
+    ImageBitmap = Bitmap { File = "db.png"; };
     MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
 };
 
@@ -145,24 +108,12 @@ Image TABLE_TREE_ICON
     MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
 };
 
-Image TABLE_TREE_ICON_SCH
-{
-    ImageBitmap = Bitmap { File = "sxh03188.png"; };
-    MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
-};
-
 Image TABLEFOLDER_TREE_ICON
 {
     ImageBitmap = Bitmap { File = "sx03187.png"; };
     MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
 };
 
-Image TABLEFOLDER_TREE_ICON_SCH
-{
-    ImageBitmap = Bitmap { File = "sxh03187.png"; };
-    MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
-};
-
 //------------------------------------------------------------------------
 // views
 
@@ -172,36 +123,18 @@ Image VIEW_TREE_ICON
     MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
 };
 
-Image VIEW_TREE_ICON_SCH
-{
-    ImageBitmap = Bitmap { File = "sxh16670.png"; };
-    MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
-};
-
 //------------------------------------------------------------------------
 // queries and query folders
 
 Image QUERY_TREE_ICON
 {
-    ImageBitmap = Bitmap { File = "sx03202.bmp"; };
-    MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
-};
-
-Image QUERY_TREE_ICON_SCH
-{
-    ImageBitmap = Bitmap { File = "sxh03202.bmp"; };
+    ImageBitmap = Bitmap { File = "sx03202.png"; };
     MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
 };
 
 Image QUERYFOLDER_TREE_ICON
 {
-    ImageBitmap = Bitmap { File = "sx03201.bmp"; };
-    MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
-};
-
-Image QUERYFOLDER_TREE_ICON_SCH
-{
-    ImageBitmap = Bitmap { File = "sxh03201.bmp"; };
+    ImageBitmap = Bitmap { File = "sx03201.png"; };
     MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
 };
 
@@ -214,24 +147,12 @@ Image FORM_TREE_ICON
     MASKCOLOR;
 };
 
-Image FORM_TREE_ICON_SCH
-{
-    ImageBitmap = Bitmap { File = "form_16_h"; };
-    MASKCOLOR;
-};
-
 Image FORMFOLDER_TREE_ICON
 {
     ImageBitmap = Bitmap { File = "forms_16"; };
     MASKCOLOR;
 };
 
-Image FORMFOLDER_TREE_ICON_SCH
-{
-    ImageBitmap = Bitmap { File = "forms_16_h"; };
-    MASKCOLOR;
-};
-
 //------------------------------------------------------------------------
 // reports and report folders
 
@@ -241,22 +162,8 @@ Image REPORT_TREE_ICON
     MASKCOLOR;
 };
 
-Image REPORT_TREE_ICON_SCH
-{
-    ImageBitmap = Bitmap { File = "report_16_h"; };
-    MASKCOLOR;
-};
 Image REPORTFOLDER_TREE_ICON
 {
     ImageBitmap = Bitmap { File = "reports_16"; };
     MASKCOLOR;
 };
-
-Image REPORTFOLDER_TREE_ICON_SCH
-{
-    ImageBitmap = Bitmap { File = "reports_16_h"; };
-    MASKCOLOR;
-};
-
-//========================================================================
-
diff --git a/dbaccess/source/ui/inc/RefFunctor.hxx b/dbaccess/source/ui/inc/RefFunctor.hxx
index 20912af0af1c..41d48ca7b094 100644
--- a/dbaccess/source/ui/inc/RefFunctor.hxx
+++ b/dbaccess/source/ui/inc/RefFunctor.hxx
@@ -47,10 +47,6 @@ namespace dbaui
         {
             m_aFunction(_aType.get());
         }
-//      inline void operator()(const ::rtl::Reference<T>& _aType)
-//      {
-//          m_aFunction(_aType.get());
-//      }
     };
 // -----------------------------------------------------------------------------
 } // namespace dbaui
diff --git a/dbaccess/source/ui/inc/TableConnectionData.hxx b/dbaccess/source/ui/inc/TableConnectionData.hxx
index 0a91e9bf5cc2..ec85e99dc825 100644
--- a/dbaccess/source/ui/inc/TableConnectionData.hxx
+++ b/dbaccess/source/ui/inc/TableConnectionData.hxx
@@ -37,7 +37,6 @@
 
 namespace dbaui
 {
-#define MAX_CONN_COUNT 2
     //==================================================================
     // ConnData     ---------->*    ConnLineData
     //    ^1                            ^1
diff --git a/dbaccess/source/ui/inc/TableRow.hxx b/dbaccess/source/ui/inc/TableRow.hxx
index 3fe4afa56854..9f29ea2b1684 100644
--- a/dbaccess/source/ui/inc/TableRow.hxx
+++ b/dbaccess/source/ui/inc/TableRow.hxx
@@ -37,9 +37,6 @@
 
 namespace dbaui
 {
-//  class OTableRow;
-//  friend SvStream& operator<<( SvStream& rStr, OTableRow& _rRow );
-
     class OFieldDescription;
     class OTypeInfo;
     class OTableRow
diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx
index 8bd112c38742..6da9a71b2726 100644
--- a/dbaccess/source/ui/inc/UITools.hxx
+++ b/dbaccess/source/ui/inc/UITools.hxx
@@ -266,14 +266,6 @@ namespace dbaui
     */
     void adjustToolBoxSize(ToolBox* _pToolBox);
 
-    /** isHiContrast check if we are in hi contrast mode.
-        @param  _pWindow
-            The window we have to check on.
-        @return
-            <TRUE/> if so, otherwise <FALSE/>
-    */
-    sal_Bool isHiContrast(Window* _pWindow);
-
     void adjustBrowseBoxColumnWidth( ::svt::EditBrowseBox* _pBox, sal_uInt16 _nColId );
 
     /** check if SQL92 name checking is enabled
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index be49adc0e518..a1f852d2130e 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -249,48 +249,23 @@
 // free
 // free
 #define IMG_PKEYICON                    RID_IMAGE_START + 12
-#define REPORTFOLDER_TREE_ICON_SCH      RID_IMAGE_START + 13
-#define FORMFOLDER_TREE_ICON_SCH        RID_IMAGE_START + 14
-#define IMG_DATABASE_CONNECTED          RID_IMAGE_START + 15
-#define QUERYFOLDER_TREE_ICON_SCH       RID_IMAGE_START + 16
-#define TABLEFOLDER_TREE_ICON_SCH       RID_IMAGE_START + 17
 // free
-#define DATABASE_TREE_ICON_SCH          RID_IMAGE_START + 19
-#define IMG_DATABASE_CONNECTED_SCH      RID_IMAGE_START + 20
-#define TABLE_TREE_ICON_SCH             RID_IMAGE_START + 21
-#define VIEW_TREE_ICON_SCH              RID_IMAGE_START + 22
-#define QUERY_TREE_ICON_SCH             RID_IMAGE_START + 23
-#define REPORTFOLDER_TREE_ICON          RID_IMAGE_START + 24
 // free
+#define IMG_DATABASE_CONNECTED          RID_IMAGE_START + 15
 // free
+//  ...
 // free
-#define BMP_EXCEPTION_ERROR_SCH         RID_IMAGE_START + 28
-#define BMP_EXCEPTION_WARNING_SCH       RID_IMAGE_START + 29
-#define BMP_EXCEPTION_INFO_SCH          RID_IMAGE_START + 30
-#define IMG_PKEYICON_SCH                RID_IMAGE_START + 31
-#define IMG_JOINS_H                     RID_IMAGE_START + 32
-#define IMG_ALL_LEFT_H                  RID_IMAGE_START + 33
-#define IMG_ONE_LEFT_H                  RID_IMAGE_START + 34
-#define IMG_ONE_RIGHT_H                 RID_IMAGE_START + 35
-#define IMG_ALL_RIGHT_H                 RID_IMAGE_START + 36
-#define IMG_SORTUP_H                    RID_IMAGE_START + 37
-#define IMG_SORTDOWN_H                  RID_IMAGE_START + 38
+#define REPORTFOLDER_TREE_ICON          RID_IMAGE_START + 24
 #define IMG_FORMFOLDER_TREE_L           RID_IMAGE_START + 39
 #define IMG_REPORTFOLDER_TREE_L         RID_IMAGE_START + 40
 #define IMG_QUERYFOLDER_TREE_L          RID_IMAGE_START + 41
 #define IMG_TABLEFOLDER_TREE_L          RID_IMAGE_START + 42
-#define IMG_FORMFOLDER_TREE_LHC         RID_IMAGE_START + 43
-#define IMG_REPORTFOLDER_TREE_LHC       RID_IMAGE_START + 44
-#define IMG_QUERYFOLDER_TREE_LHC        RID_IMAGE_START + 45
-#define IMG_TABLEFOLDER_TREE_LHC        RID_IMAGE_START + 46
 #define IMG_NAVIGATION_BTN_UP_SC        RID_IMAGE_START + 47
-#define IMG_NAVIGATION_BTN_UP_SCH       RID_IMAGE_START + 48
 #define IMG_NAVIGATION_CREATEFOLDER_SC  RID_IMAGE_START + 49
-#define IMG_NAVIGATION_CREATEFOLDER_SCH RID_IMAGE_START + 50
 #define FORM_TREE_ICON                  RID_IMAGE_START + 51
 #define REPORT_TREE_ICON                RID_IMAGE_START + 52
-#define FORM_TREE_ICON_SCH              RID_IMAGE_START + 53
-#define REPORT_TREE_ICON_SCH            RID_IMAGE_START + 54
+// free
+// free
 #define FORMFOLDER_TREE_ICON            RID_IMAGE_START + 55
 
 
@@ -298,17 +273,17 @@
 // image lists
 #define IMG_JOINS                       RID_IMAGELIST_START +  0
 #define IMG_INDEX_DLG_SC                RID_IMAGELIST_START +  1
-#define IMG_INDEX_DLG_SCH               RID_IMAGELIST_START +  2
+// free
 #define IMG_INDEX_DLG_LC                RID_IMAGELIST_START +  3
-#define IMG_INDEX_DLG_LCH               RID_IMAGELIST_START +  4
+// free
 #define IMP_FORM_SC                     RID_IMAGELIST_START +  5
-#define IMP_FORM_SCH                    RID_IMAGELIST_START +  6
+// free
 #define IMP_FORM_LC                     RID_IMAGELIST_START +  7
-#define IMP_FORM_LCH                    RID_IMAGELIST_START +  8
+// free
 #define IMP_REPORT_SC                   RID_IMAGELIST_START +  9
-#define IMP_REPORT_SCH                  RID_IMAGELIST_START + 10
+// free
 #define IMP_REPORT_LC                   RID_IMAGELIST_START + 11
-#define IMP_REPORT_LCH                  RID_IMAGELIST_START + 12
+// free
 
 //========================================================================
 // menues
@@ -393,17 +368,17 @@
 // free
 #define RSC_QUERY_OBJECT_TYPE           RID_UNTYPED_START +  4
 #define IMG_TABLESUBCRIPTION_SC         RID_UNTYPED_START +  5
-#define IMG_TABLESUBCRIPTION_SCH        RID_UNTYPED_START +  6
+// free
 #define IMG_TABLESUBCRIPTION_LC         RID_UNTYPED_START +  7
-#define IMG_TABLESUBCRIPTION_LCH        RID_UNTYPED_START +  8
+// free
 #define IMG_QUERYADMINISTRATION_SC      RID_UNTYPED_START +  9
-#define IMG_QUERYADMINISTRATION_SCH     RID_UNTYPED_START + 10
+// free
 #define IMG_QUERYADMINISTRATION_LC      RID_UNTYPED_START + 11
-#define IMG_QUERYADMINISTRATION_LCH     RID_UNTYPED_START + 12
+// free
 #define IMG_DOCUMENTLINKS_SC            RID_UNTYPED_START + 13
-#define IMG_DOCUMENTLINKS_SCH           RID_UNTYPED_START + 14
+// free
 #define IMG_DOCUMENTLINKS_LC            RID_UNTYPED_START + 15
-#define IMG_DOCUMENTLINKS_LCH           RID_UNTYPED_START + 16
+// free
 
 //========================================================================
 // various
diff --git a/dbaccess/source/ui/inc/imageprovider.hxx b/dbaccess/source/ui/inc/imageprovider.hxx
index fd1c479917f1..b6563801c8c1 100644
--- a/dbaccess/source/ui/inc/imageprovider.hxx
+++ b/dbaccess/source/ui/inc/imageprovider.hxx
@@ -87,16 +87,13 @@ namespace dbaui
                 the name of the object
             @param  _out_rImage
                 the normal image to use for the object
-            @param  _out_rImageHC
-                the high-contrast version of the image to use for the object
             @return
                 the image to be used for the object.
         */
         void getImages(
             const String& _rName,
             const sal_Int32 _nDatabaseObjectType,
-            Image& _out_rImage,
-            Image& _out_rImageHC
+            Image& _out_rImage
         );
 
         /** returns the default image to be used for a database object
@@ -108,18 +105,11 @@ namespace dbaui
             @param  _nDatabaseObjectType
                 the type of the object. Must be one of the css.sdb.application.DatabaseObject
                 constants.
-            @param  _bHighContrast
-                indicates whether High-Contrast icons should be used.
-                Note that normally, this would be some application-wide setting. However,
-                in current OOo, HC support is decided on a per-control basis, means every
-                control decides itself whether its images must be HC versions or not.
-                Thus callers need to specify this flag.
             @return
                 the image to be used for the object type.
         */
         Image getDefaultImage(
-            sal_Int32 _nDatabaseObjectType,
-            bool _bHighContrast
+            sal_Int32 _nDatabaseObjectType
         );
 
         /** returns the resource ID for the default image to be used for a database object
@@ -131,19 +121,12 @@ namespace dbaui
             @param  _nDatabaseObjectType
                 the type of the object. Must be one of the css.sdb.application.DatabaseObject
                 constants.
-            @param  _bHighContrast
-                indicates whether High-Contrast icons should be used.
-                Note that normally, this would be some application-wide setting. However,
-                in current OOo, HC support is decided on a per-control basis, means every
-                control decides itself whether its images must be HC versions or not.
-                Thus callers need to specify this flag.
             @return
                 the resource ID image to be used for the object type. Must be fed into a
                 ModuleRes instance to actually load the image.
         */
         USHORT getDefaultImageResourceID(
-            sal_Int32 _nDatabaseObjectType,
-            bool _bHighContrast
+            sal_Int32 _nDatabaseObjectType
         );
 
         /** retrieves the image to be used for folders of database objects
@@ -152,31 +135,18 @@ namespace dbaui
                 constants.
             @param  _rName
                 the name of the object
-            @param  _bHighContrast
-                indicates whether High-Contrast icons should be used.
-                Note that normally, this would be some application-wide setting. However,
-                in current OOo, HC support is decided on a per-control basis, means every
-                control decides itself whether its images must be HC versions or not.
-                Thus callers need to specify this flag.
             @return
                 the image to be used for folders of the given type
         */
         Image getFolderImage(
-            sal_Int32 _nDatabaseObjectType,
-            bool _bHighContrast
+            sal_Int32 _nDatabaseObjectType
         );
 
         /** retrieves the image to be used for a database as a whole.
-            @param  _bHighContrast
-                indicates whether High-Contrast icons should be used.
-                Note that normally, this would be some application-wide setting. However,
-                in current OOo, HC support is decided on a per-control basis, means every
-                control decides itself whether its images must be HC versions or not.
-                Thus callers need to specify this flag.
             @return
                 the image to be used for folders of this type
         */
-        Image getDatabaseImage( bool _bHighContrast );
+        Image getDatabaseImage();
     };
 
 //........................................................................
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx
index f7d4c41a45fb..10839459626b 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -136,7 +136,7 @@ namespace dbaui
             @param  _bHiContast
                 <TRUE/> when in high contrast mode.
         */
-        virtual ImageList getImageList(sal_Int16 _eBitmapSet,sal_Bool _bHiContast) const;
+        virtual ImageList getImageList(sal_Int16 _eBitmapSet) const;
 
         /** will be called when the controls need to be resized.
         */
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index 857c32d8f010..0f91c8fa06d8 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -29,8 +29,6 @@
 #ifndef _SBA_GRID_HXX
 #define _SBA_GRID_HXX
 
-//  #include <sdb/tools.hxx>
-
 #include <svx/fmgridcl.hxx>
 
 #include <svx/fmgridif.hxx>
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index deb68c99b6a0..9ec12527ffa5 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -471,9 +471,6 @@ namespace dbaui
         // remove all grid columns and dispose them
         void clearGridColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _xColContainer);
 
-        sal_Bool isHiContrast() const;
-
-
         /** checks if the currently displayed entry changed
             @param  _sName
                     Name of the changed entry
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index 4473031808fe..221b38e228ef 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -290,7 +290,7 @@ ODatabaseExport::ODatabaseExport(const SharedConnection& _rxConnection,
                 break;
             }
         }
-    } // if(xSet.is())
+    }
     if ( !m_pTypeInfo )
         m_pTypeInfo = TOTypeInfoSP(new OTypeInfo());
     SetColumnTypes(pList,_pInfoMap);
@@ -326,20 +326,17 @@ void ODatabaseExport::insertValueIntoColumn()
                 sal_Int32 nPos = m_vColumns[nNewPos].first;
                 if ( nPos != COLUMN_POSITION_NOT_FOUND )
                 {
-    //                  if(m_nDefToken != LANGUAGE_DONTKNOW) // falls Sprache anders als Systemsprache
-    //                      m_pNF->ChangeIntl((LanguageType)m_nDefToken);
-
                     if ( !m_sTextToken.Len() && pField->IsNullable() )
                         m_pUpdateHelper->updateNull(nPos,pField->GetType());
                     else
                     {
-                        sal_Int32 nNumberFormat = 0;
-                        double fOutNumber = 0.0;
                         OSL_ENSURE((nNewPos) < static_cast<sal_Int32>(m_vColumnTypes.size()),"Illegal index for vector");
                         if (m_vColumnTypes[nNewPos] != DataType::VARCHAR && m_vColumnTypes[nNewPos] != DataType::CHAR && m_vColumnTypes[nNewPos] != DataType::LONGVARCHAR )
                         {
                             RTL_LOGFILE_CONTEXT_TRACE( aLogger, "ODatabaseExport::insertValueIntoColumn != DataType::VARCHAR" );
                             ensureFormatter();
+                            sal_Int32 nNumberFormat = 0;
+                            double fOutNumber = 0.0;
                             bool bNumberFormatError = false;
                             if ( m_pFormatter && m_sNumToken.Len() )
                             {
@@ -790,7 +787,7 @@ void ODatabaseExport::showErrorDialog(const ::com::sun::star::sdbc::SQLException
             m_bDontAskAgain = TRUE;
         else
             m_bError = TRUE;
-    } // if(!m_bDontAskAgain)
+    }
 }
 // -----------------------------------------------------------------------------
 void ODatabaseExport::adjustFormat()
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx
index 2764d2fc6116..144996500527 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -337,7 +337,6 @@ void OHTMLReader::fetchOptions()
             case HTML_O_SDVAL:
             {
                 m_sValToken = pOption->GetString();
-                //m_sTextToken = pOption->GetString();
                 m_bSDNum = sal_True;
             }
             break;
@@ -446,7 +445,7 @@ sal_Int16 OHTMLReader::GetWidthPixel( const HTMLOption* pOption )
     {
         if ( rOptVal.Search('*') != STRING_NOTFOUND )
         {   // relativ zu was?!?
-//2do: ColArray aller relativen Werte sammeln und dann MakeCol
+//TODO: ColArray aller relativen Werte sammeln und dann MakeCol
             return 0;
         }
         else
diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx
index 386c17312221..e7931223700e 100644
--- a/dbaccess/source/ui/misc/RowSetDrop.cxx
+++ b/dbaccess/source/ui/misc/RowSetDrop.cxx
@@ -48,7 +48,6 @@ using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::lang;
-//  using namespace ::com::sun::star::sdbcx;
 
 // export data
 ORowSetImportExport::ORowSetImportExport(   Window* _pParent,
@@ -84,7 +83,7 @@ void ORowSetImportExport::initialize()
     m_aColumnTypes.reserve(nCount);
     for (sal_Int32 i = 1;i <= nCount; ++i)
     {
-        sal_Int32 nPos = -1; // -1 means column is autoincrement or doesn't exists
+        sal_Int32 nPos = -1; // -1 means column is autoincrement or doesn't exist
         if(!m_xTargetResultSetMetaData->isAutoIncrement(i))
         {
             try
@@ -95,7 +94,7 @@ void ORowSetImportExport::initialize()
             catch(const SQLException&)
             {
                 if(m_xTargetResultSetMetaData->isNullable(i))
-                    nPos = 0; // column doesn't exists but we could set it to null
+                    nPos = 0; // column doesn't exist but we could set it to null
             }
         }
 
@@ -131,7 +130,7 @@ BOOL ORowSetImportExport::Read()
         {
             sal_Int32 nPos = -1;
             *pBegin >>= nPos;
-            OSL_ENSURE(nPos != -1,"Invalid posiotion!");
+            OSL_ENSURE(nPos != -1,"Invalid position!");
             bContinue = (m_xResultSet.is() && m_xResultSet->absolute(nPos) && insertNewRow());
         }
     }
diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx
index f4f1ae4013cb..66be160e20da 100644
--- a/dbaccess/source/ui/misc/RtfReader.cxx
+++ b/dbaccess/source/ui/misc/RtfReader.cxx
@@ -315,8 +315,6 @@ sal_Bool ORTFReader::CreateTable(int nToken)
                 }
                 break;
             case RTF_CF:
-                //  if(nTokenValue < m_vecColor.size())
-                    //  m_xTable->setPropertyValue(PROPERTY_TEXTCOLOR,makeAny(m_vecColor[nTokenValue]));
                 break;
             case RTF_B:
                 aFont.Weight = ::com::sun::star::awt::FontWeight::BOLD;
diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx
index 8cca42ddf1b4..c305a173f409 100644
--- a/dbaccess/source/ui/misc/TableCopyHelper.cxx
+++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx
@@ -223,7 +223,7 @@ void OTableCopyHelper::pasteTable( SotFormatStringId _nFormatId
             aTrans.bHtml            = SOT_FORMATSTR_ID_HTML == _nFormatId;
             aTrans.sDefaultTableName = GetTableNameForAppend();
             if ( !copyTagTable(aTrans,sal_False,_xConnection) )
-                m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString::createFromAscii("S1000") ,0,Any()));
+                m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")),0,Any()));
         }
         catch(const SQLException&)
         {
@@ -235,7 +235,7 @@ void OTableCopyHelper::pasteTable( SotFormatStringId _nFormatId
         }
     }
     else
-        m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString::createFromAscii("S1000") ,0,Any()));
+        m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")),0,Any()));
 }
 
 // -----------------------------------------------------------------------------
@@ -335,7 +335,7 @@ void OTableCopyHelper::asyncCopyTagTable(  DropDescriptor& _rDesc
     else if ( !_rDesc.bError )
         pasteTable(_rDesc.aDroppedData,i_rDestDataSource,_xConnection);
     else
-        m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString::createFromAscii("S1000") ,0,Any()));
+        m_pController->showError(SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*m_pController,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")),0,Any()));
 }
 // -----------------------------------------------------------------------------
 //........................................................................
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index e165df1c7b1b..311eec0c00ed 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -201,8 +201,6 @@ void SAL_CALL ODatabaseImportExport::disposing( const EventObject& Source ) thro
         m_xConnection.clear();
         dispose();
         m_bNeedToReInitialize = true;
-        //if(!m_bInInitialize)
-        //  initialize();
     }
 }
 // -----------------------------------------------------------------------------
@@ -332,7 +330,7 @@ void ODatabaseImportExport::initialize()
             // the result set may be already set with the datadescriptor
             if ( !m_xResultSet.is() )
             {
-                m_xResultSet.set( m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.sdb.RowSet" ) ), UNO_QUERY );
+                m_xResultSet.set( m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.RowSet")) ), UNO_QUERY );
                 Reference< XPropertySet > xProp( m_xResultSet, UNO_QUERY_THROW );
                 xProp->setPropertyValue( PROPERTY_ACTIVE_CONNECTION, makeAny( m_xConnection.getTyped() ) );
                 xProp->setPropertyValue( PROPERTY_COMMAND_TYPE, makeAny( m_nCommandType ) );
@@ -369,7 +367,7 @@ BOOL ODatabaseImportExport::Write()
     {
         if ( !m_bInInitialize )
             initialize();
-    } // if ( m_bNeedToReInitialize )
+    }
     return TRUE;
 }
 // -----------------------------------------------------------------------------
@@ -379,7 +377,7 @@ BOOL ODatabaseImportExport::Read()
     {
         if ( !m_bInInitialize )
             initialize();
-    } // if ( m_bNeedToReInitialize )
+    }
     return TRUE;
 }
 // -----------------------------------------------------------------------------
@@ -404,54 +402,6 @@ BOOL ORTFImportExport::Write()
     (*m_pStream) << OOO_STRING_SVTOOLS_RTF_ANSI << ODatabaseImportExport::sNewLine;
     rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252;
 
-    /*
-    // Access RTF Export Beispiel
-    {\rtf1\ansi
-        {\colortbl\red0\green0\blue0;\red255\green255\blue255;\red192\green192\blue192;}
-        {\fonttbl\f0\fcharset0\fnil MS Sans Serif;\f1\fcharset0\fnil Arial;\f2\fcharset0\fnil Arial;}
-        \trowd\trgaph40
-                \clbrdrl\brdrs\brdrcf0\clbrdrt\brdrs\brdrcf0\clbrdrb\brdrs\brdrcf0\clbrdrr\brdrs\brdrcf0\clshdng10000\clcfpat2\cellx1437
-                \clbrdrl\brdrs\brdrcf0\clbrdrt\brdrs\brdrcf0\clbrdrb\brdrs\brdrcf0\clbrdrr\brdrs\brdrcf0\clshdng10000\clcfpat2\cellx2874
-        {
-            \trrh-270\pard\intbl
-                {\qc\fs20\b\f1\cf0\cb2 text\cell}
-                \pard\intbl
-                {\qc\fs20\b\f1\cf0\cb2 datum\cell}
-                \pard\intbl\row
-        }
-        \trowd\trgaph40\clbrdrl\brdrs\brdrcf2\clbrdrt\brdrs\brdrcf2\clbrdrb\brdrs\brdrcf2\clbrdrr\brdrs\brdrcf2\clshdng10000\clcfpat1\cellx1437\clbrdrl\brdrs\brdrcf2\clbrdrt\brdrs\brdrcf2\clbrdrb\brdrs\brdrcf2\clbrdrr\brdrs\brdrcf2\clshdng10000\clcfpat1\cellx2874
-        {\trrh-270\pard\intbl
-            {\ql\fs20\f2\cf0\cb1 heute\cell}
-            \pard\intbl
-            {\qr\fs20\f2\cf0\cb1 10.11.98\cell}
-            \pard\intbl\row
-        }
-        \trowd\trgaph40\clbrdrl\brdrs\brdrcf2\clbrdrt\brdrs\brdrcf2\clbrdrb\brdrs\brdrcf2\clbrdrr\brdrs\brdrcf2\clshdng10000\clcfpat1\cellx1437\clbrdrl\brdrs\brdrcf2\clbrdrt\brdrs\brdrcf2\clbrdrb\brdrs\brdrcf2\clbrdrr\brdrs\brdrcf2\clshdng10000\clcfpat1\cellx2874
-        {\trrh-270\pard\intbl
-            {\ql\fs20\f2\cf0\cb1 morgen\cell}
-            \pard\intbl
-            {\qr\fs20\f2\cf0\cb1 11.11.98\cell}
-            \pard\intbl\row
-        }
-        \trowd\trgaph40\clbrdrl\brdrs\brdrcf2\clbrdrt\brdrs\brdrcf2\clbrdrb\brdrs\brdrcf2\clbrdrr\brdrs\brdrcf2\clshdng10000\clcfpat1\cellx1437\clbrdrl\brdrs\brdrcf2\clbrdrt\brdrs\brdrcf2\clbrdrb\brdrs\brdrcf2\clbrdrr\brdrs\brdrcf2\clshdng10000\clcfpat1\cellx2874
-        {\trrh-270\pard\intbl
-            {\ql\fs20\f2\cf0\cb1 bruder\cell}
-            \pard\intbl
-            {\qr\fs20\f2\cf0\cb1 21.04.98\cell}
-            \pard\intbl\row
-        }
-        \trowd\trgaph40
-        \clbrdrl\brdrs\brdrcf2\clbrdrt\brdrs\brdrcf2\clbrdrb\brdrs\brdrcf2\clbrdrr\brdrs\brdrcf2\clshdng10000\clcfpat1\cellx
-        \clbrdrl\brdrs\brdrcf2\clbrdrt\brdrs\brdrcf2\clbrdrb\brdrs\brdrcf2\clbrdrr\brdrs\brdrcf2\clshdng10000\clcfpat1\cellx2874
-        {\trrh-270\pard\intbl
-            {\ql\fs20\f2\cf0\cb1 vater\cell}
-            \pard\intbl
-            {\qr\fs20\f2\cf0\cb1 28.06.98\cell}
-            \pard\intbl\row
-        }
-    }
-    */
-
     BOOL bBold          = ( ::com::sun::star::awt::FontWeight::BOLD     == m_aFont.Weight );
     BOOL bItalic        = ( ::com::sun::star::awt::FontSlant_ITALIC     == m_aFont.Slant );
     BOOL bUnderline     = ( ::com::sun::star::awt::FontUnderline::NONE  != m_aFont.Underline );
@@ -671,8 +621,6 @@ void ORTFImportExport::appendRow(::rtl::OString* pHorzChar,sal_Int32 _nColumnCou
                 Reference<XPropertySet> xColumn(m_xRowSetColumns->getByIndex(i-1),UNO_QUERY_THROW);
                 dbtools::FormattedColumnValue aFormatedValue(aContext,xRowSet,xColumn);
                 ::rtl::OUString sValue = aFormatedValue.getFormattedValue();
-                // m_xRow->getString(i);
-                //if (!m_xRow->wasNull())
                 if ( sValue.getLength() )
                     RTFOutFuncs::Out_String(*m_pStream,sValue,m_eDestEnc);
             }
@@ -724,7 +672,7 @@ const sal_Int16 OHTMLImportExport::nCellSpacing = 0;
 const char __FAR_DATA OHTMLImportExport::sIndentSource[nIndentMax+1] = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
 
 //========================================================================
-// Makros fuer HTML-Export
+// Macros for HTML-Export
 //========================================================================
 #define OUT_PROLOGUE()      ((*m_pStream) << sHTML30_Prologue << ODatabaseImportExport::sNewLine << ODatabaseImportExport::sNewLine)
 #define TAG_ON( tag )       HTMLOutFuncs::Out_AsciiTag( (*m_pStream), tag )
@@ -802,8 +750,8 @@ void OHTMLImportExport::WriteHeader()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::WriteHeader" );
     uno::Reference<document::XDocumentProperties> xDocProps(
-        m_xFactory->createInstance(::rtl::OUString::createFromAscii(
-            "com.sun.star.document.DocumentProperties")),
+        m_xFactory->createInstance(::rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.DocumentProperties"))),
         uno::UNO_QUERY);
     if (xDocProps.is()) {
         xDocProps->setTitle(m_sName);
@@ -835,7 +783,7 @@ void OHTMLImportExport::WriteBody()
     IncIndent(-1); OUT_LF(); TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_style );
     OUT_LF();
 
-    // default Textfarbe schwarz
+    // default Textcolour black
     (*m_pStream) << '<' << OOO_STRING_SVTOOLS_HTML_body << ' ' << OOO_STRING_SVTOOLS_HTML_O_text << '=';
     sal_Int32 nColor = 0;
     if(m_xObject.is())
@@ -1057,13 +1005,13 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat,sal_Int32 nWidthPixel,sal_I
     aStrTD = aStrTD + "=";
     aStrTD = aStrTD + pChar;
 
-    double fVal = 0.0;
-
     Reference< ::com::sun::star::util::XNumberFormatsSupplier >  xSupplier = m_xFormatter->getNumberFormatsSupplier();
     SvNumberFormatsSupplierObj* pSupplierImpl = SvNumberFormatsSupplierObj::getImplementation( xSupplier );
     SvNumberFormatter* pFormatter = pSupplierImpl ? pSupplierImpl->GetNumberFormatter() : NULL;
     if(pFormatter)
     {
+        double fVal = 0.0;
+
         try
         {
             fVal = m_xFormatter->convertStringToNumber(nFormat,rValue);
diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx b/dbaccess/source/ui/misc/ToolBoxHelper.cxx
index 43e5883b86db..4e9c5b6c565a 100644
--- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx
+++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx
@@ -40,9 +40,8 @@ namespace dbaui
 {
     DBG_NAME(OToolBoxHelper)
     OToolBoxHelper::OToolBoxHelper()
-        : m_bIsHiContrast(sal_False)
-        ,m_nSymbolsSize(-1 )
-        ,m_pToolBox(NULL)
+        : m_nSymbolsSize(-1 )
+        , m_pToolBox(NULL)
     {
         DBG_CTOR(OToolBoxHelper,NULL);
 
@@ -64,14 +63,11 @@ namespace dbaui
         if ( m_pToolBox )
         {
             sal_Int16 nCurSymbolsSize = SvtMiscOptions().GetCurrentSymbolsSize();
-            if ( nCurSymbolsSize != m_nSymbolsSize ||
-                m_bIsHiContrast != m_pToolBox->GetSettings().GetStyleSettings().GetHighContrastMode() )
+            if ( nCurSymbolsSize != m_nSymbolsSize )
             {
                 m_nSymbolsSize  = nCurSymbolsSize;
-                m_bIsHiContrast = m_pToolBox->GetSettings().GetStyleSettings().GetHighContrastMode();
 
-
-                m_pToolBox->SetImageList( getImageList(m_nSymbolsSize,m_bIsHiContrast) );
+                m_pToolBox->SetImageList( getImageList(m_nSymbolsSize) );
                 Size aTbOldSize = m_pToolBox->GetSizePixel();
                 adjustToolBoxSize(m_pToolBox);
                 Size aTbNewSize = m_pToolBox->GetSizePixel();
@@ -117,7 +113,6 @@ namespace dbaui
         m_pToolBox = _pTB;
         if ( m_pToolBox )
         {
-            //  m_bIsHiContrast = m_pToolBox->GetSettings().GetStyleSettings().GetHighContrastMode();
             ConfigOptionsChanged(NULL);
             if ( bFirstTime )
                 adjustToolBoxSize(m_pToolBox);
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 089025b511f7..e813d2c24f81 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -233,8 +233,6 @@ SQLExceptionInfo createConnection(  const Reference< ::com::sun::star::beans::XP
     catch(SQLException& e) { aInfo = SQLExceptionInfo(e); }
     catch(Exception&) { OSL_ENSURE(0,"SbaTableQueryBrowser::OnExpandEntry: could not connect - unknown exception!"); }
 
-    //  showError(aInfo);
-
     return aInfo;
 }
 // -----------------------------------------------------------------------------
@@ -419,11 +417,6 @@ TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo,
             // -> drop the precision and the scale restriction, accept any type with the property
             // type id (nType)
 
-            //OSL_ENSURE(sal_False,
-            //  (   ::rtl::OString("getTypeInfoFromType: did not find a matching type")
-            //  +=  ::rtl::OString(" (expected type name: ")
-            //  +=  ::rtl::OString(_sTypeName.getStr(), _sTypeName.getLength(), gsl_getSystemTextEncoding())
-            //  +=  ::rtl::OString(")! Defaulting to the first matching type.")).getStr());
             for(aIter = aPair.first; aIter != aPair.second; ++aIter)
             {
                 // search the best matching type (now comparing the local names)
@@ -511,8 +504,8 @@ void fillTypeInfo(  const Reference< ::com::sun::star::sdbc::XConnection>& _rxCo
     // Information for a single SQL type
     if(xRs.is())
     {
-        static const ::rtl::OUString aB1 = ::rtl::OUString::createFromAscii(" [ ");
-        static const ::rtl::OUString aB2 = ::rtl::OUString::createFromAscii(" ]");
+        static const ::rtl::OUString aB1(RTL_CONSTASCII_USTRINGPARAM(" [ "));
+        static const ::rtl::OUString aB2(RTL_CONSTASCII_USTRINGPARAM(" ]"));
         Reference<XResultSetMetaData> xResultSetMetaData = Reference<XResultSetMetaDataSupplier>(xRs,UNO_QUERY)->getMetaData();
         ::connectivity::ORowSetValue aValue;
         ::std::vector<sal_Int32> aTypes;
@@ -947,7 +940,7 @@ sal_Bool callColumnFormatDialog(Window* _pParent,
                                 sal_Bool  _bHasFormat)
 {
     sal_Bool bRet = sal_False;
-    // the allowed format changes depend of the type of the field ...
+    // the allowed format changes depending on the type of the field ...
     _nFlags = TP_ATTR_ALIGN;
 
     if (_bHasFormat)
@@ -1085,7 +1078,7 @@ sal_Bool appendToFilter(const Reference<XConnection>& _xConnection,
             xProp->getPropertyValue(PROPERTY_TABLEFILTER) >>= aFilter;
             // first check if we have something like SCHEMA.%
             sal_Bool bHasToInsert = sal_True;
-            static ::rtl::OUString sPattern = ::rtl::OUString::createFromAscii("%");
+            static ::rtl::OUString sPattern(RTL_CONSTASCII_USTRINGPARAM("%"));
             const ::rtl::OUString* pBegin = aFilter.getConstArray();
             const ::rtl::OUString* pEnd = pBegin + aFilter.getLength();
             for (;pBegin != pEnd; ++pBegin)
@@ -1150,22 +1143,6 @@ void adjustToolBoxSize(ToolBox* _pToolBox)
     }
 }
 // -----------------------------------------------------------------------------
-sal_Bool isHiContrast(Window* _pWindow)
-{
-    OSL_ENSURE(_pWindow,"Window must be not null!");
-    Window* pIter = _pWindow;
-    //  while( pIter &&  pIter->GetBackground().GetColor().GetColor() == COL_TRANSPARENT )
-    while( pIter )
-    {
-        if ( pIter->GetBackground().GetColor().GetColor() == COL_TRANSPARENT )
-            pIter = pIter->GetParent();
-        else
-            break;
-    }
-    return pIter && pIter->GetSettings().GetStyleSettings().GetHighContrastMode();
-}
-
-// -----------------------------------------------------------------------------
 void adjustBrowseBoxColumnWidth( ::svt::EditBrowseBox* _pBox, sal_uInt16 _nColId )
 {
     sal_Int32 nColSize = -1;
@@ -1231,7 +1208,7 @@ void fillAutoIncrementValue(const Reference<XPropertySet>& _xDatasource,
             pValue->Value >>= _rsAutoIncrementValue;
         pValue =::std::find_if(aInfo.getConstArray(),
                                                     aInfo.getConstArray() + aInfo.getLength(),
-                                                    ::std::bind2nd(TPropertyValueEqualFunctor(),::rtl::OUString::createFromAscii("IsAutoRetrievingEnabled") ));
+                                                    ::std::bind2nd(TPropertyValueEqualFunctor(),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsAutoRetrievingEnabled")) ));
         if ( pValue && pValue != (aInfo.getConstArray() + aInfo.getLength()) )
             pValue->Value >>= _rAutoIncrementValueEnabled;
     }
@@ -1306,7 +1283,7 @@ namespace
         {
             ::ucbhelper::Content aCnt( INetURLObject( _rURL ).GetMainURL( INetURLObject::NO_DECODE ),
                                  Reference< ::com::sun::star::ucb::XCommandEnvironment > () );
-            if ( ( aCnt.getPropertyValue( ::rtl::OUString::createFromAscii( "AnchorName" ) ) >>= sAnchor ) )
+            if ( ( aCnt.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AnchorName")) ) >>= sAnchor ) )
             {
 
                 if ( sAnchor.getLength() > 0 )
@@ -1464,13 +1441,13 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rType
             break;
         default:
             ;
-    } // switch(_nDataType)
+    }
     if ( !pTypeInfo )
     {
         ::rtl::OUString sCreate(RTL_CONSTASCII_USTRINGPARAM("x")),sTypeName;
         sal_Bool bForce = sal_True;
         pTypeInfo = ::dbaui::getTypeInfoFromType(_rTypeInfo,DataType::VARCHAR,sTypeName,sCreate,50,0,sal_False,bForce);
-    } // if ( !pTypeInfo )
+    }
     OSL_ENSURE(pTypeInfo,"Wrong DataType supplied!");
     return pTypeInfo;
 }
diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx
index 905846ba9892..9677140a9b2c 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -134,7 +134,7 @@ IMPL_LINK( OCopyTable, AppendDataClickHdl, Button*, /*pButton*/ )
     SetAppendDataRadio();
     return 0;
 }
-//--------dyf ADD
+
 void OCopyTable::SetAppendDataRadio()
 {
     m_pParent->EnableButton(OCopyTableWizard::WIZARD_NEXT,sal_True);
@@ -144,7 +144,6 @@ void OCopyTable::SetAppendDataRadio()
     m_pParent->setOperation(CopyTableOperation::AppendData);
 }
 
-//--------add end
 //------------------------------------------------------------------------
 IMPL_LINK( OCopyTable, RadioChangeHdl, Button*, pButton )
 {
@@ -351,7 +350,6 @@ void OCopyTable::setCreatePrimaryKey( bool _bDoCreate, const ::rtl::OUString& _r
 }
 
 // -----------------------------------------------------------------------------
-//---dyf add 2006/7/10
 void OCopyTable::setCreateStyleAction()
 {
     // reselect the last action before
@@ -382,6 +380,5 @@ void OCopyTable::setCreateStyleAction()
             }
     }
 }
-//---add end
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index 11095d00f660..c1b5c4dedee5 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -161,7 +161,6 @@ sal_Bool OWizColumnSelect::LeavePage()
 {
     DBG_CHKTHIS(OWizColumnSelect,NULL);
 
-    //  m_pParent->getColumns()->clear();
     m_pParent->clearDestColumns();
 
     for(sal_uInt16 i=0 ; i< m_lbNewColumnNames.GetEntryCount();++i)
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 4ab963777312..ba8e1f02121f 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -1025,7 +1025,7 @@ IMPL_LINK( OCopyTableWizard, ImplActivateHdl, WizardDialog*, EMPTYARG )
 void OCopyTableWizard::CheckButtons()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::CheckButtons" );
-    if(GetCurLevel() == 0) // erste Seite hat kein PrevButton
+    if(GetCurLevel() == 0) // the first page has no back button
     {
         if(m_nPageCount > 1)
             m_pbNext.Enable(sal_True);
@@ -1034,7 +1034,7 @@ void OCopyTableWizard::CheckButtons()
 
         m_pbPrev.Enable(sal_False);
     }
-    else if(GetCurLevel() == m_nPageCount-1) // letzte Seite hat keinen Next Button
+    else if(GetCurLevel() == m_nPageCount-1) // the last page has no next button
     {
         m_pbNext.Enable(sal_False);
         m_pbPrev.Enable(sal_True);
@@ -1042,14 +1042,13 @@ void OCopyTableWizard::CheckButtons()
     else
     {
         m_pbPrev.Enable(sal_True);
-        // next has already his state
+        // next already has its state
     }
 }
 // -----------------------------------------------------------------------
 void OCopyTableWizard::EnableButton(Wizard_Button_Style eStyle,sal_Bool bEnable)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::EnableButton" );
-//  CheckButtons();
     Button* pButton;
     if(eStyle == WIZARD_NEXT)
         pButton = &m_pbNext;
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index 20a4177e3e3a..356f8176a0ef 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -81,12 +81,6 @@ OWizNameMatching::OWizNameMatching( Window* pParent)
     m_sDestText     = m_FT_TABLE_RIGHT.GetText();
     m_sDestText.AppendAscii("\n");
 
-    // set hiContrast
-    m_ibColumn_up.SetModeImage(ModuleRes(IMG_SORTUP_H),BMP_COLOR_HIGHCONTRAST);
-    m_ibColumn_down.SetModeImage(ModuleRes(IMG_SORTDOWN_H),BMP_COLOR_HIGHCONTRAST);
-    m_ibColumn_up_right.SetModeImage(ModuleRes(IMG_SORTUP_H),BMP_COLOR_HIGHCONTRAST);
-    m_ibColumn_down_right.SetModeImage(ModuleRes(IMG_SORTDOWN_H),BMP_COLOR_HIGHCONTRAST);
-
     FreeResource();
 }
 // -----------------------------------------------------------------------
@@ -111,7 +105,6 @@ void OWizNameMatching::Reset()
         m_bFirstTime = sal_False;
     }
 
-    //  m_CTRL_LEFT.Clear();
 }
 // -----------------------------------------------------------------------
 void OWizNameMatching::ActivatePage( )
@@ -170,7 +163,6 @@ sal_Bool OWizNameMatching::LeavePage()
             ;
         const sal_Int32 nPos = ::std::distance(pSrcColumns->begin(),aSrcIter);
 
-        //  sal_Int32 nPos = m_CTRL_LEFT.GetModel()->GetAbsPos(pLeftEntry);
         if(m_CTRL_LEFT.GetCheckButtonState(pLeftEntry) == SV_BUTTON_CHECKED)
         {
             OFieldDescription* pDestField = static_cast<OFieldDescription*>(pRightEntry->GetUserData());
@@ -228,7 +220,6 @@ IMPL_LINK( OWizNameMatching, ButtonClickHdl, Button *, pButton )
         if(pButton == &m_ibColumn_down && (nThumbPos+nVisibleSize+1) < nPos)
         {
             m_CTRL_LEFT.GetVScroll()->DoScrollAction(SCROLL_LINEDOWN);
-            //  m_CTRL_LEFT.MakeVisible(pEntry,sal_True);
         }
 
         TableListClickHdl(&m_CTRL_LEFT);
@@ -357,18 +348,7 @@ public:
     }
 
     virtual void Paint(const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry);
-    //virtual void InitViewData( SvLBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* pViewData);
 };
-
-
-
-//------------------------------------------------------------------------
-/*
-void OColumnString::InitViewData( SvLBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* pViewData)
-{
-    SvLBoxString::InitViewData(pView,pEntry,pViewData);
-}
-*/
 //------------------------------------------------------------------------
 void OColumnString::Paint(const Point& rPos, SvLBox& rDev, sal_uInt16 /*nFlags*/, SvLBoxEntry* /*pEntry*/ )
 {
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index efc94d56524b..68bf316c33dd 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -49,7 +49,6 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::sdbc;
-//  using namespace ::com::sun::star::sdbcx;
 
 //========================================================================
 // OWizTypeSelectControl
@@ -246,7 +245,7 @@ OWizTypeSelect::OWizTypeSelect( Window* pParent, SvStream* _pStream )
     DBG_CTOR(OWizTypeSelect,NULL);
     m_lbColumnNames.SetSelectHdl(LINK(this,OWizTypeSelect,ColumnSelectHdl));
 
-    ModuleRes aModuleRes(isHiContrast(&m_lbColumnNames) ? IMG_JOINS_H : IMG_JOINS);
+    ModuleRes aModuleRes(IMG_JOINS);
     ImageList aImageList(aModuleRes);
     m_imgPKey = aImageList.GetImage(IMG_PRIMARY_KEY);
 
diff --git a/dbaccess/source/ui/misc/WizardPages.src b/dbaccess/source/ui/misc/WizardPages.src
index 9871c3f7d810..c52576702594 100644
--- a/dbaccess/source/ui/misc/WizardPages.src
+++ b/dbaccess/source/ui/misc/WizardPages.src
@@ -70,7 +70,6 @@ ModalDialog WIZ_RTFCOPYTABLE
 
     Text [ en-US ] = "Copy RTF Table" ;
 
-
     OutputSize      = TRUE ;
     SVLook          = TRUE ;
     Moveable        = TRUE ;
@@ -123,11 +122,10 @@ TabPage TAB_WIZ_COLUMN_SELECT
 
     FixedLine FL_COLUMN_SELECT
     {
-        Pos                 = MAP_APPFONT ( 6 , 3  ) ;
-        Size                = MAP_APPFONT ( WINDOW_SIZE_X - 12 , 8 ) ;
-        Text [ en-US ] = "Existing columns" ;
+        Pos             = MAP_APPFONT ( 6 , 3  ) ;
+        Size            = MAP_APPFONT ( WINDOW_SIZE_X - 12 , 8 ) ;
+        Text [ en-US ]  = "Existing columns" ;
     };
-
     MultiListBox LB_ORG_COLUMN_NAMES
     {
         Border              = TRUE ;
@@ -149,7 +147,7 @@ TabPage TAB_WIZ_COLUMN_SELECT
         {
             ImageBitmap = Bitmap
             {
-                File = "one_right.bmp" ;
+                File = "one_right.png" ;
             };
             MaskColor = Color
             {
@@ -169,7 +167,7 @@ TabPage TAB_WIZ_COLUMN_SELECT
         {
             ImageBitmap = Bitmap
             {
-                File = "all_right.bmp" ;
+                File = "all_right.png" ;
             };
             MaskColor = Color
             {
@@ -188,7 +186,7 @@ TabPage TAB_WIZ_COLUMN_SELECT
         {
             ImageBitmap = Bitmap
             {
-                File = "one_left.bmp" ;
+                File = "one_left.png1" ;
             };
             MaskColor = Color
             {
@@ -207,7 +205,7 @@ TabPage TAB_WIZ_COLUMN_SELECT
         {
             ImageBitmap = Bitmap
             {
-                File = "all_left.bmp" ;
+                File = "all_left.png" ;
             };
             MaskColor = Color
             {
@@ -314,6 +312,7 @@ Menu RID_SBA_RTF_PKEYPOPUP
         };
     };
 };
+
 //==================================================================
  // TAB_WIZ_NAME_MATCHING
  //==================================================================
@@ -368,7 +367,7 @@ TabPage TAB_WIZ_NAME_MATCHING
         {
             ImageBitmap = Bitmap
             {
-                File = "sortup.bmp" ;
+                File = "sortup.png" ;
             };
             MaskColor = Color
             {
@@ -387,7 +386,7 @@ TabPage TAB_WIZ_NAME_MATCHING
         {
             ImageBitmap = Bitmap
             {
-                File = "sortdown.bmp" ;
+                File = "sortdown.png" ;
             };
             MaskColor = Color
             {
@@ -407,7 +406,7 @@ TabPage TAB_WIZ_NAME_MATCHING
         {
             ImageBitmap = Bitmap
             {
-                File = "sortup.bmp" ;
+                File = "sortup.png" ;
             };
             MaskColor = Color
             {
@@ -426,7 +425,7 @@ TabPage TAB_WIZ_NAME_MATCHING
         {
             ImageBitmap = Bitmap
             {
-                File = "sortdown.bmp" ;
+                File = "sortdown.png" ;
             };
             MaskColor = Color
             {
@@ -453,6 +452,7 @@ TabPage TAB_WIZ_NAME_MATCHING
         Text [ en-US ]  = "Non~e" ;
     };
 };
+
 TabPage TAB_WIZ_COPYTABLE
 {
     SVLook  = TRUE ;
@@ -562,69 +562,3 @@ String STR_INVALID_TABLE_NAME_LENGTH
 {
     Text [ en-US ] = "Please change the table name. It is too long.";
 };
-
-Image IMG_SORTUP_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "sortup_h.bmp" ;
-    };
-    MaskColor = Color
-    {
-        Red = 0xFFFF ;
-        Green = 0x0000 ;
-        Blue = 0xFFFF ;
-    };
-};
-
-Image IMG_SORTDOWN_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "sortdown_h.bmp" ;
-    };
-    MaskColor = Color
-    {
-        Red = 0xFFFF ;
-        Green = 0x0000 ;
-        Blue = 0xFFFF ;
-    };
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dbaccess/source/ui/misc/controllerframe.cxx b/dbaccess/source/ui/misc/controllerframe.cxx
index 23a336d76266..54d612329400 100644
--- a/dbaccess/source/ui/misc/controllerframe.cxx
+++ b/dbaccess/source/ui/misc/controllerframe.cxx
@@ -236,7 +236,7 @@ namespace dbaui
         {
             if ( _rData.m_xDocEventBroadcaster.is() )
             {
-                ::rtl::OUString sEventName( ::rtl::OUString::createFromAscii( _bActive ? "OnFocus" : "OnUnfocus" ) );
+                ::rtl::OUString sEventName = _bActive ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnFocus")) : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnUnfocus"));
                 Reference< XController2 > xController( _rData.m_rController.getXController(), UNO_QUERY_THROW );
                 _rData.m_xDocEventBroadcaster->notifyDocumentEvent( sEventName, xController, Any() );
             }
@@ -295,11 +295,6 @@ namespace dbaui
                 const Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow );
                 ENSURE_OR_THROW( pContainerWindow, "no Window implementation for the frame's container window!" );
 
-                /*const Window* pContainerParentWindow = pContainerWindow->GetParent();
-                if ( pContainerParentWindow && ( pContainerParentWindow->GetType() == WINDOW_BORDERWINDOW ) )
-                    pContainerParentWindow = pContainerParentWindow->GetParent();
-                m_pData->m_bIsTopLevelDocumentWindow = ( pContainerParentWindow == NULL );*/
-
                 m_pData->m_bIsTopLevelDocumentWindow = ( pContainerWindow->GetExtendedStyle() & WB_EXT_DOCUMENT ) != 0;
             }
 
diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx
index 9e0e5d352cc4..967f9752eb4d 100644
--- a/dbaccess/source/ui/misc/databaseobjectview.cxx
+++ b/dbaccess/source/ui/misc/databaseobjectview.cxx
@@ -131,16 +131,16 @@ namespace dbaui
                 // if we have no externally provided frame, create one
                 if ( !m_xFrameLoader.is() )
                 {
-                    Reference< XSingleServiceFactory > xFact(m_xORB->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.TaskCreator")), UNO_QUERY_THROW);
+                    Reference< XSingleServiceFactory > xFact(m_xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.TaskCreator"))), UNO_QUERY_THROW);
                     Sequence< Any > lArgs(2);
                     NamedValue      aProp;
                     sal_Int32       nArg = 0;
 
-                    aProp.Name    = ::rtl::OUString::createFromAscii("ParentFrame");
+                    aProp.Name    = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentFrame"));
                     aProp.Value <<= m_xParentFrame;
                     lArgs[nArg++] <<= aProp;
 
-                    aProp.Name    = ::rtl::OUString::createFromAscii("TopWindow");
+                    aProp.Name    = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TopWindow"));
                     aProp.Value <<= sal_True;
                     lArgs[nArg++] <<= aProp;
 
diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/dbumiscres.src
index 552a076147d5..ae5979c0a96a 100644
--- a/dbaccess/source/ui/misc/dbumiscres.src
+++ b/dbaccess/source/ui/misc/dbumiscres.src
@@ -61,7 +61,6 @@ String STR_MISSING_TABLES_XDROP
 String STR_BUTTON_TEXT_ALL
 {
     Text [ en-US ] = "~All";
-
 };
 
 String STR_UNDO_COLON
@@ -93,6 +92,7 @@ String STR_NAMED_OBJECT_ALREADY_EXISTS
 {
     Text [ en-US ] = "The name '$#$' already exists.\nPlease enter another name." ;
 };
+
 String RID_STR_EXTENSION_NOT_PRESENT
 {
     // #i96130# use hard coded name
diff --git a/dbaccess/source/ui/misc/imageprovider.cxx b/dbaccess/source/ui/misc/imageprovider.cxx
index 8147e2bd242a..959f02a20ef1 100644
--- a/dbaccess/source/ui/misc/imageprovider.cxx
+++ b/dbaccess/source/ui/misc/imageprovider.cxx
@@ -82,15 +82,12 @@ namespace dbaui
     {
         //................................................................
         static void lcl_getConnectionProvidedTableIcon_nothrow(  const ImageProvider_Data& _rData,
-            const ::rtl::OUString& _rName, Reference< XGraphic >& _out_rxGraphic, Reference< XGraphic >& _out_rxGraphicHC )
+            const ::rtl::OUString& _rName, Reference< XGraphic >& _out_rxGraphic )
         {
             try
             {
                 if ( _rData.xTableUI.is() )
-                {
                     _out_rxGraphic = _rData.xTableUI->getTableIcon( _rName, GraphicColorMode::NORMAL );
-                    _out_rxGraphicHC = _rData.xTableUI->getTableIcon( _rName, GraphicColorMode::HIGH_CONTRAST );
-                }
             }
             catch( const Exception& )
             {
@@ -100,21 +97,19 @@ namespace dbaui
 
         //................................................................
         static void lcl_getTableImageResourceID_nothrow( const ImageProvider_Data& _rData, const ::rtl::OUString& _rName,
-            USHORT& _out_rResourceID, USHORT& _out_rResourceID_HC )
+            USHORT& _out_rResourceID )
         {
-            _out_rResourceID = _out_rResourceID_HC = 0;
+            _out_rResourceID = 0;
             try
             {
                 bool bIsView = _rData.xViews.is() && _rData.xViews->hasByName( _rName );
                 if ( bIsView )
                 {
                     _out_rResourceID = VIEW_TREE_ICON;
-                    _out_rResourceID_HC = VIEW_TREE_ICON_SCH;
                 }
                 else
                 {
                     _out_rResourceID = TABLE_TREE_ICON;
-                    _out_rResourceID_HC = TABLE_TREE_ICON_SCH;
                 }
             }
             catch( const Exception& )
@@ -152,67 +147,60 @@ namespace dbaui
     }
 
     //--------------------------------------------------------------------
-    void ImageProvider::getImages( const String& _rName, const sal_Int32 _nDatabaseObjectType, Image& _out_rImage, Image& _out_rImageHC )
+    void ImageProvider::getImages( const String& _rName, const sal_Int32 _nDatabaseObjectType, Image& _out_rImage )
     {
         if ( _nDatabaseObjectType != DatabaseObject::TABLE )
         {
             // for types other than tables, the icon does not depend on the concrete object
-            _out_rImage = getDefaultImage( _nDatabaseObjectType, false );
-            _out_rImageHC = getDefaultImage( _nDatabaseObjectType, true );
+            _out_rImage = getDefaultImage( _nDatabaseObjectType );
         }
         else
         {
             // check whether the connection can give us an icon
             Reference< XGraphic > xGraphic;
-            Reference< XGraphic > xGraphicHC;
-            lcl_getConnectionProvidedTableIcon_nothrow( *m_pData, _rName, xGraphic, xGraphicHC );
+            lcl_getConnectionProvidedTableIcon_nothrow( *m_pData, _rName, xGraphic );
             if ( xGraphic.is() )
                 _out_rImage = Image( xGraphic );
-            if ( xGraphicHC.is() )
-                _out_rImageHC = Image( xGraphicHC );
 
-            if ( !_out_rImage || !_out_rImageHC )
+            if ( !_out_rImage )
             {
                 // no -> determine by type
                 USHORT nImageResourceID = 0;
-                USHORT nImageResourceID_HC = 0;
-                lcl_getTableImageResourceID_nothrow( *m_pData, _rName, nImageResourceID, nImageResourceID_HC );
+                lcl_getTableImageResourceID_nothrow( *m_pData, _rName, nImageResourceID );
 
                 if ( nImageResourceID && !_out_rImage )
                     _out_rImage = Image( ModuleRes( nImageResourceID ) );
-                if ( nImageResourceID_HC && !_out_rImageHC )
-                    _out_rImageHC = Image( ModuleRes( nImageResourceID_HC ) );
             }
         }
     }
 
     //--------------------------------------------------------------------
-    Image ImageProvider::getDefaultImage( sal_Int32 _nDatabaseObjectType, bool _bHighContrast )
+    Image ImageProvider::getDefaultImage( sal_Int32 _nDatabaseObjectType )
     {
         Image aObjectImage;
-        USHORT nImageResourceID( getDefaultImageResourceID( _nDatabaseObjectType, _bHighContrast ) );
+        USHORT nImageResourceID( getDefaultImageResourceID( _nDatabaseObjectType ) );
         if ( nImageResourceID )
             aObjectImage = Image( ModuleRes( nImageResourceID ) );
         return aObjectImage;
     }
 
     //--------------------------------------------------------------------
-    USHORT ImageProvider::getDefaultImageResourceID( sal_Int32 _nDatabaseObjectType, bool _bHighContrast )
+    USHORT ImageProvider::getDefaultImageResourceID( sal_Int32 _nDatabaseObjectType )
     {
         USHORT nImageResourceID( 0 );
         switch ( _nDatabaseObjectType )
         {
         case DatabaseObject::QUERY:
-            nImageResourceID = _bHighContrast ? QUERY_TREE_ICON_SCH : QUERY_TREE_ICON;
+            nImageResourceID = QUERY_TREE_ICON;
             break;
         case DatabaseObject::FORM:
-            nImageResourceID = _bHighContrast ? FORM_TREE_ICON_SCH : FORM_TREE_ICON;
+            nImageResourceID = FORM_TREE_ICON;
             break;
         case DatabaseObject::REPORT:
-            nImageResourceID = _bHighContrast ? REPORT_TREE_ICON_SCH : REPORT_TREE_ICON;
+            nImageResourceID = REPORT_TREE_ICON;
             break;
         case DatabaseObject::TABLE:
-            nImageResourceID = _bHighContrast ? TABLE_TREE_ICON_SCH : TABLE_TREE_ICON;
+            nImageResourceID = TABLE_TREE_ICON;
             break;
         default:
             OSL_ENSURE( false, "ImageProvider::getDefaultImage: invalid database object type!" );
@@ -222,22 +210,22 @@ namespace dbaui
     }
 
     //--------------------------------------------------------------------
-    Image ImageProvider::getFolderImage( sal_Int32 _nDatabaseObjectType, bool _bHighContrast )
+    Image ImageProvider::getFolderImage( sal_Int32 _nDatabaseObjectType )
     {
         USHORT nImageResourceID( 0 );
         switch ( _nDatabaseObjectType )
         {
         case DatabaseObject::QUERY:
-            nImageResourceID = _bHighContrast ? QUERYFOLDER_TREE_ICON_SCH : QUERYFOLDER_TREE_ICON;
+            nImageResourceID = QUERYFOLDER_TREE_ICON;
             break;
         case DatabaseObject::FORM:
-            nImageResourceID = _bHighContrast ? FORMFOLDER_TREE_ICON_SCH : FORMFOLDER_TREE_ICON;
+            nImageResourceID = FORMFOLDER_TREE_ICON;
             break;
         case DatabaseObject::REPORT:
-            nImageResourceID = _bHighContrast ? REPORTFOLDER_TREE_ICON_SCH : REPORTFOLDER_TREE_ICON;
+            nImageResourceID = REPORTFOLDER_TREE_ICON;
             break;
         case DatabaseObject::TABLE:
-            nImageResourceID = _bHighContrast ? TABLEFOLDER_TREE_ICON_SCH : TABLEFOLDER_TREE_ICON;
+            nImageResourceID = TABLEFOLDER_TREE_ICON;
             break;
         default:
             OSL_ENSURE( false, "ImageProvider::getDefaultImage: invalid database object type!" );
@@ -251,9 +239,9 @@ namespace dbaui
     }
 
     //--------------------------------------------------------------------
-    Image ImageProvider::getDatabaseImage( bool _bHighContrast )
+    Image ImageProvider::getDatabaseImage()
     {
-        return Image( ModuleRes( _bHighContrast ? DATABASE_TREE_ICON_SCH : DATABASE_TREE_ICON ) );
+        return Image( ModuleRes( DATABASE_TREE_ICON ) );
     }
 
 //........................................................................
diff --git a/dbaccess/source/ui/misc/indexcollection.cxx b/dbaccess/source/ui/misc/indexcollection.cxx
index 137f9eeb696e..318856ba2345 100644
--- a/dbaccess/source/ui/misc/indexcollection.cxx
+++ b/dbaccess/source/ui/misc/indexcollection.cxx
@@ -65,12 +65,6 @@ namespace dbaui
     }
 
     //------------------------------------------------------------------
-//  OIndexCollection::OIndexCollection(const Reference< XNameAccess >& _rxIndexes)
-//  {
-//      implConstructFrom(_rxIndexes);
-//  }
-
-    //------------------------------------------------------------------
     const OIndexCollection& OIndexCollection::operator=(const OIndexCollection& _rSource)
     {
         detach();
@@ -182,9 +176,9 @@ namespace dbaui
             }
 
             // set the properties
-            static const ::rtl::OUString s_sUniquePropertyName = ::rtl::OUString::createFromAscii("IsUnique");
-            static const ::rtl::OUString s_sSortPropertyName = ::rtl::OUString::createFromAscii("IsAscending");
-            static const ::rtl::OUString s_sNamePropertyName = ::rtl::OUString::createFromAscii("Name");
+            static const ::rtl::OUString s_sUniquePropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsUnique"));
+            static const ::rtl::OUString s_sSortPropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsAscending"));
+            static const ::rtl::OUString s_sNamePropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"));
             // the index' own props
             xIndexDescriptor->setPropertyValue(s_sUniquePropertyName, ::cppu::bool2any(_rPos->bUnique));
             xIndexDescriptor->setPropertyValue(s_sNamePropertyName, makeAny(_rPos->sName));
@@ -288,10 +282,10 @@ namespace dbaui
     //------------------------------------------------------------------
     void OIndexCollection::implFillIndexInfo(OIndex& _rIndex, Reference< XPropertySet > _rxDescriptor) SAL_THROW((Exception))
     {
-        static const ::rtl::OUString s_sPrimaryIndexPropertyName = ::rtl::OUString::createFromAscii("IsPrimaryKeyIndex");
-        static const ::rtl::OUString s_sUniquePropertyName = ::rtl::OUString::createFromAscii("IsUnique");
-        static const ::rtl::OUString s_sSortPropertyName = ::rtl::OUString::createFromAscii("IsAscending");
-        static const ::rtl::OUString s_sCatalogPropertyName = ::rtl::OUString::createFromAscii("Catalog");
+        static const ::rtl::OUString s_sPrimaryIndexPropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsPrimaryKeyIndex"));
+        static const ::rtl::OUString s_sUniquePropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsUnique"));
+        static const ::rtl::OUString s_sSortPropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsAscending"));
+        static const ::rtl::OUString s_sCatalogPropertyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Catalog"));
 
         _rIndex.bPrimaryKey = ::cppu::any2bool(_rxDescriptor->getPropertyValue(s_sPrimaryIndexPropertyName));
         _rIndex.bUnique = ::cppu::any2bool(_rxDescriptor->getPropertyValue(s_sUniquePropertyName));
diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx
index 8d470332158e..2b80ac434021 100644
--- a/dbaccess/source/ui/misc/linkeddocuments.cxx
+++ b/dbaccess/source/ui/misc/linkeddocuments.cxx
@@ -360,7 +360,6 @@ namespace dbaui
 
                 com::sun::star::sdbc::SQLException aSQLException;
                 aSQLException.Message = sMessage;
-                // aSQLException.Context = e.Context;
                 aInfo = dbtools::SQLExceptionInfo(aSQLException);
             }
             return xRet;
diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx
index d6cc403765bf..13ec3dfd716b 100644
--- a/dbaccess/source/ui/misc/singledoccontroller.cxx
+++ b/dbaccess/source/ui/misc/singledoccontroller.cxx
@@ -309,7 +309,7 @@ namespace dbaui
             if(xSupplier.is())
             {
                 m_pImpl->m_xFormatter = Reference< XNumberFormatter >(getORB()
-                    ->createInstance(::rtl::OUString::createFromAscii("com.sun.star.util.NumberFormatter")), UNO_QUERY);
+                    ->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatter"))), UNO_QUERY);
                 m_pImpl->m_xFormatter->attachNumberFormatsSupplier(xSupplier);
             }
             OSL_ENSURE(m_pImpl->m_xFormatter.is(),"No NumberFormatter!");
@@ -667,13 +667,6 @@ namespace dbaui
             sTitle.appendAscii(" : ");
         }
         sTitle.append( getPrivateTitle() );
-        // There can be only one view with the same object
-        //const sal_Int32 nCurrentView = getCurrentStartNumber();
-        //if ( nCurrentView > 1 )
-        //{
-        //    sTitle.appendAscii(" : ");
-        //    sTitle.append(nCurrentView);
-        //}
 
         return sTitle.makeStringAndClear();
     }
diff --git a/dbaccess/source/ui/querydesign/ConnectionData.hxx b/dbaccess/source/ui/querydesign/ConnectionData.hxx
deleted file mode 100644
index 67a768e79f40..000000000000
--- a/dbaccess/source/ui/querydesign/ConnectionData.hxx
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef DBAUI_CONNECTIONDATA_HXX
-#define DBAUI_CONNECTIONDATA_HXX
-
-namespace dbaui
-{
-
-    //==================================================================
-    // ConnData     ---------->*    ConnLineData
-    //    ^1                            ^1
-    //    |                             |
-    //  Conn        ---------->*    ConnLine
-    //==================================================================
-
-
-}
-#endif // DBAUI_CONNECTIONDATA_HXX
-
-DECLARE_LIST( OConnectionLineDataList, OConnectionLineData* );
-
-//==================================================================
-class SbaJoinTabConn;
-
-
-
-DECLARE_LIST( OConnectionLineList, OConnectionLine* );
-
-DECLARE_LIST( OTableConnectionDataList, OTableConnectionData* );
-
-//==================================================================
-const USHORT MAX_CONN_COUNT     = 2;
-
-class SbaJoinTabWin;
-class SbaJoinTabWinCont;
-
-
-
-DECLARE_LIST( SbaJoinTabConnList, SbaJoinTabConn* );
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
index 8f532687e72c..a1297dfc68b0 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
@@ -46,7 +46,6 @@ namespace dbaui
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::beans;
     using namespace ::com::sun::star::lang;
-    //  using namespace ::com::sun::star::awt;
     using namespace ::com::sun::star;
 
     OConnectionLineAccess::OConnectionLineAccess(OTableConnection* _pLine)
@@ -81,7 +80,7 @@ namespace dbaui
     // -----------------------------------------------------------------------------
     ::rtl::OUString OConnectionLineAccess::getImplementationName_Static(void) throw( RuntimeException )
     {
-        return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.ConnectionLineAccessibility");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.ConnectionLineAccessibility"));
     }
     // -----------------------------------------------------------------------------
     // XAccessibleContext
diff --git a/dbaccess/source/ui/querydesign/JAccess.cxx b/dbaccess/source/ui/querydesign/JAccess.cxx
index 155aac4c27da..90feae92b25d 100644
--- a/dbaccess/source/ui/querydesign/JAccess.cxx
+++ b/dbaccess/source/ui/querydesign/JAccess.cxx
@@ -57,7 +57,7 @@ namespace dbaui
     // -----------------------------------------------------------------------------
     ::rtl::OUString OJoinDesignViewAccess::getImplementationName_Static(void) throw( RuntimeException )
     {
-        return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.JoinViewAccessibility");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.JoinViewAccessibility"));
     }
     // -----------------------------------------------------------------------------
     void OJoinDesignViewAccess::clearTableView()
diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index 85c5a9eb9120..397bb804c829 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -49,7 +49,6 @@
 #include <comphelper/extract.hxx>
 #include "UITools.hxx"
 #include "JoinTableView.hxx"
-//  #include <com/sun/star/util/URL.hdl>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -95,7 +94,6 @@ void OJoinDesignView::Construct()
 // -----------------------------------------------------------------------------
 void OJoinDesignView::initialize()
 {
-    //  getAddTableDialog()->Update();
 }
 // -------------------------------------------------------------------------
 void OJoinDesignView::resizeDocumentView(Rectangle& _rPlayground)
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 60099ed9999d..05e95d2f0933 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -171,8 +171,6 @@ void OScrollWindowHelper::Resize()
 // class OJoinTableView
 //==================================================================
 
-//const long WINDOW_WIDTH = 1000;
-//const long WINDOW_HEIGHT = 1000;
 DBG_NAME(OJoinTableView);
 //------------------------------------------------------------------------------
 OJoinTableView::OJoinTableView( Window* pParent, OJoinDesignView* pView )
@@ -466,7 +464,6 @@ namespace
         Point aUpperLeft = _rPoint;
         // normalize with respect to visibility
         aUpperLeft -= _pView->GetScrollOffset();
-        //  aUpperLeft.Y() -= _pView->GetScrollOffset().Y();
         Point aLowerRight(aUpperLeft.X() + _rSize.Width(), aUpperLeft.Y() + _rSize.Height());
 
         // data about ourself
@@ -485,7 +482,6 @@ namespace
                     _nScrollX = aLowerRight.X() - aSize.Width() + TABWIN_SPACING_X;
 
                 // ensure the visibility of the left border (higher priority)
-                //  if ( (aUpperLeft.X() - _nScrollX) < 0 )
                 if ( aUpperLeft.X() < 0 )
                     _nScrollX = aUpperLeft.X() - TABWIN_SPACING_X;
             }
@@ -496,7 +492,6 @@ namespace
                 if ( aLowerRight.Y() > aSize.Height() )
                     _nScrollY = aLowerRight.Y() - aSize.Height() + TABWIN_SPACING_Y;
                 // upper border
-                //  if ( (aUpperLeft.Y() - _nScrollY) < 0 )
                 if ( aUpperLeft.Y() < 0 )
                     _nScrollY = aUpperLeft.Y() - TABWIN_SPACING_Y;
             }
@@ -534,7 +529,6 @@ void OJoinTableView::EnsureVisible(const OTableWindow* _pWin)
 {
     // data about the tab win
     TTableWindowData::value_type pData = _pWin->GetData();
-    //  Point aUpperLeft = pData->GetPosition();
     EnsureVisible( pData->GetPosition() , pData->GetSize());
     Invalidate(INVALIDATE_NOCHILDREN);
 }
@@ -1228,10 +1222,6 @@ BOOL OJoinTableView::IsAddAllowed()
         return FALSE;
     }
 
-    // nicht wenn keine Joins moeglich
-//  if (!GetDatabase()->IsCapable(SDB_CAP_JOIN) && nMax <= GetTabWinCount())
-//      return FALSE;
-
     return TRUE;
 }
 // -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/QTableConnection.cxx b/dbaccess/source/ui/querydesign/QTableConnection.cxx
index 4bba1b75eaaa..98a21fbb21ea 100644
--- a/dbaccess/source/ui/querydesign/QTableConnection.cxx
+++ b/dbaccess/source/ui/querydesign/QTableConnection.cxx
@@ -46,7 +46,6 @@ OQueryTableConnection::OQueryTableConnection(OQueryTableView* pContainer, const
     DBG_CTOR(OQueryTableConnection,NULL);
 }
 
-
 //------------------------------------------------------------------------
 OQueryTableConnection::OQueryTableConnection(const OQueryTableConnection& rConn)
     :OTableConnection( rConn )
@@ -97,9 +96,4 @@ sal_Bool OQueryTableConnection::operator==(const OQueryTableConnection& rCompare
 }
 // -----------------------------------------------------------------------------
 
-
-
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
index a15714a299cc..991ef5733171 100644
--- a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
+++ b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
@@ -166,7 +166,4 @@ BOOL OQueryTableConnectionData::Update()
 }
 // -----------------------------------------------------------------------------
 
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx
index 45135346cde9..60fc544a276f 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@@ -120,11 +120,10 @@ sal_Bool OQueryTableWindow::Init()
     sAliasName = String(sAliasName).EraseAllChars('"');
     SetAliasName(sAliasName);
         // SetAliasName reicht das als WinName weiter, dadurch benutzt es die Basisklasse
-    // reset the titel
+    // reset the title
     m_aTitle.SetText( pWinData->GetWinName() );
     m_aTitle.Show();
 
-    //  sal_Bool bSuccess(sal_True);
     if (!bSuccess)
     {   // es soll nur ein Dummy-Window aufgemacht werden ...
         DBG_ASSERT(GetAliasName().getLength(), "OQueryTableWindow::Init : kein Alias- UND kein Tabellenname geht nicht !");
@@ -239,6 +238,4 @@ void OQueryTableWindow::KeyInput( const KeyEvent& rEvt )
 }
 // -----------------------------------------------------------------------------
 
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 60e71a4a8e7d..ed1f7e1c6c1d 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -83,8 +83,8 @@ using namespace ::com::sun::star::container;
 // please look at the book LargeScale C++ to know why
 namespace
 {
-    static const ::rtl::OUString C_AND = ::rtl::OUString::createFromAscii(" AND ");
-    static const ::rtl::OUString C_OR  = ::rtl::OUString::createFromAscii(" OR ");
+    static const ::rtl::OUString C_AND(RTL_CONSTASCII_USTRINGPARAM(" AND "));
+    static const ::rtl::OUString C_OR(RTL_CONSTASCII_USTRINGPARAM(" OR "));
 
     // forward declarations
     sal_Bool InsertJoin(    const OQueryDesignView* _pView,
@@ -375,7 +375,6 @@ namespace
     {
         ::rtl::OUString aDBName(pEntryTab->GetComposedName());
 
-        //  Reference< XConnection> xConnection = static_cast<OQueryController&>(_pView->getController()).getConnection();
         if( _xConnection.is() )
         {
             try
@@ -389,9 +388,9 @@ namespace
                 ::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString();
                 if ( _bForce || isAppendTableAliasEnabled( _xConnection ) || pEntryTab->GetAliasName() != aDBName )
                 {
-                    aTableListStr += ::rtl::OUString::createFromAscii(" ");
+                    aTableListStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
                     if ( generateAsBeforeTableAlias( _xConnection ) )
-                        aTableListStr += ::rtl::OUString::createFromAscii("AS ");
+                        aTableListStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AS "));
                     aTableListStr += ::dbtools::quoteName( aQuote, pEntryTab->GetAliasName() );
                 }
                 aDBName = aTableListStr;
@@ -481,8 +480,6 @@ namespace
         if ( pEntryConnData->GetJoinType() == INNER_JOIN && !pEntryConnData->isNatural() )
             return;
 
-        //  Reference< XConnection> xConnection = static_cast<OQueryController&>(_pView->getController()).getConnection();
-
         if(!aJoin.getLength())
         {
             OQueryTableWindow* pEntryTabFrom = static_cast<OQueryTableWindow*>(pEntryConn->GetSourceWin());
@@ -580,7 +577,6 @@ namespace
             if ( pLeftTable )
             {
                 OQueryTableWindow*  pLeftWindow = static_cast<OQueryTableView*>(_pView->getTableView())->FindTable( getTableRange(_pView,pLeftTable->getByRule(OSQLParseNode::table_ref) ));
-                // OQueryTableWindow*   pRightWindow = static_cast<OQueryTableView*>(_pView->getTableView())->FindTable( getTableRange(_pView,pRightTable->getByRule(OSQLParseNode::table_ref) ));
                 if ( pLeftWindow == aDragLeft->GetTabWindow() )
                     insertConnection(_pView,_eJoinType,aDragLeft,aDragRight);
                 else
@@ -975,7 +971,7 @@ namespace
                     eErrorCode = eStatementTooLong;
                 else
                 {
-                    _rsRet = ::rtl::OUString::createFromAscii(" ORDER BY ");
+                    _rsRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ORDER BY "));
                     _rsRet += aWorkStr;
                 }
             }
@@ -1210,7 +1206,7 @@ namespace
             if ( aGroupByStr.getLength() )
             {
                 aGroupByStr = aGroupByStr.replaceAt(aGroupByStr.getLength()-1,1, ::rtl::OUString(' ') );
-                ::rtl::OUString aGroupByStr2 = ::rtl::OUString::createFromAscii(" GROUP BY ");
+                ::rtl::OUString aGroupByStr2(RTL_CONSTASCII_USTRINGPARAM(" GROUP BY "));
                 aGroupByStr2 += aGroupByStr;
                 aGroupByStr = aGroupByStr2;
             }
@@ -1549,13 +1545,6 @@ namespace
                                         &rController.getParser().getContext(),
                                         sal_True,
                                         sal_True); // quote is to true because we need quoted elements inside the function
-            // i75557
-            //pFunction->parseNodeToPredicateStr(aColumnName,
-            //                                  xConnection,
-            //                                  rController.getNumberFormatter(),
-            //                                  _pView->getLocale(),
-            //                                  static_cast<sal_Char>(_pView->getDecimalSeparator().toChar()),
-            //                                  &rController.getParser().getContext());
             // don't display the column name
             aCondition = aCondition.copy(aColumnName.getLength());
             aCondition = aCondition.trim();
@@ -1575,7 +1564,7 @@ namespace
                     for(;aIter != aTabEnd;++aIter)
                     {
                         OQueryTableWindow* pTabWin = static_cast<OQueryTableWindow*>(aIter->second);
-                        if (pTabWin->ExistsField( ::rtl::OUString::createFromAscii("*"), aDragLeft ))
+                        if (pTabWin->ExistsField( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")), aDragLeft ))
                         {
                             aDragLeft->SetAlias(String());
                             aDragLeft->SetTable(String());
@@ -1689,22 +1678,22 @@ namespace
                     case SQL_NODE_LESS:
                         // take the opposite as we change the order
                         i--;
-                        aCondition = aCondition + ::rtl::OUString::createFromAscii(">");
+                        aCondition = aCondition + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">"));
                         break;
                     case SQL_NODE_LESSEQ:
                         // take the opposite as we change the order
                         i--;
-                        aCondition = aCondition + ::rtl::OUString::createFromAscii(">=");
+                        aCondition = aCondition + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">="));
                         break;
                     case SQL_NODE_GREAT:
                         // take the opposite as we change the order
                         i--;
-                        aCondition = aCondition + ::rtl::OUString::createFromAscii("<");
+                        aCondition = aCondition + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<"));
                         break;
                     case SQL_NODE_GREATEQ:
                         // take the opposite as we change the order
                         i--;
-                        aCondition = aCondition + ::rtl::OUString::createFromAscii("<=");
+                        aCondition = aCondition + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<="));
                         break;
                     default:
                         break;
@@ -2205,11 +2194,6 @@ namespace
                                                             _pView->getLocale(),
                                                             static_cast<sal_Char>(_pView->getDecimalSeparator().toChar()),
                                                             &rController.getParser().getContext());
-                        //pColumnRef->parseNodeToStr(   aColumns,
-                        //                          xConnection,
-                        //                          &rController.getParser().getContext(),
-                        //                          sal_True,
-                        //                          sal_True); // quote is to true because we need quoted elements inside the function
 
                         sal_Int32 nFunctionType = FKT_NONE;
                         ::connectivity::OSQLParseNode* pParamRef = NULL;
@@ -2232,7 +2216,7 @@ namespace
                                 for(;aIter != aEnd;++aIter)
                                 {
                                     OQueryTableWindow* pTabWin = static_cast<OQueryTableWindow*>(aIter->second);
-                                    if (pTabWin->ExistsField( ::rtl::OUString::createFromAscii("*"), aInfo ))
+                                    if (pTabWin->ExistsField( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")), aInfo ))
                                     {
                                         aInfo->SetAlias(String());
                                         aInfo->SetTable(String());
@@ -2279,7 +2263,7 @@ namespace
                         eErrorCode = _pView->InsertField(aInfo, sal_True, bFirstField);
                         bFirstField = sal_False;
                     }
-                    else //if(SQL_ISRULE(pColumnRef,num_value_exp)  || SQL_ISRULE(pColumnRef,term))
+                    else
                     {
                         ::rtl::OUString aColumns;
                         pColumnRef->parseNodeToStr( aColumns,
@@ -2839,7 +2823,7 @@ sal_Bool OQueryDesignView::checkStatement()
 {
     sal_Bool bRet = sal_True;
     if ( m_pSelectionBox )
-        bRet = m_pSelectionBox->Save(); // a error occured so we return no
+        bRet = m_pSelectionBox->Save(); // an error occured so we return no
     return bRet;
 }
 //-------------------------------------------------------------------------------
@@ -2903,9 +2887,9 @@ sal_Bool OQueryDesignView::checkStatement()
     GenerateInnerJoinCriterias(xConnection,aJoinCrit,pConnList);
     if(aJoinCrit.getLength())
     {
-        ::rtl::OUString aTmp = ::rtl::OUString::createFromAscii("( ");
+        ::rtl::OUString aTmp(RTL_CONSTASCII_USTRINGPARAM("( "));
         aTmp += aJoinCrit;
-        aTmp += ::rtl::OUString::createFromAscii(" )");
+        aTmp += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" )"));
         if(aCriteriaListStr.getLength())
         {
             aTmp += C_AND;
@@ -2914,16 +2898,16 @@ sal_Bool OQueryDesignView::checkStatement()
         aCriteriaListStr = aTmp;
     }
     // ----------------- Statement aufbauen ----------------------
-    ::rtl::OUStringBuffer aSqlCmd(::rtl::OUString::createFromAscii("SELECT "));
+    ::rtl::OUStringBuffer aSqlCmd(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT ")));
     if(static_cast<OQueryController&>(getController()).isDistinct())
-        aSqlCmd.append(::rtl::OUString::createFromAscii(" DISTINCT "));
+        aSqlCmd.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" DISTINCT ")));
     aSqlCmd.append(aFieldListStr);
-    aSqlCmd.append(::rtl::OUString::createFromAscii(" FROM "));
+    aSqlCmd.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM ")));
     aSqlCmd.append(aTableListStr);
 
     if (aCriteriaListStr.getLength())
     {
-        aSqlCmd.append(::rtl::OUString::createFromAscii(" WHERE "));
+        aSqlCmd.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE ")));
         aSqlCmd.append(aCriteriaListStr.makeStringAndClear());
     }
     // ----------------- GroupBy aufbauen und Anh"angen ------------
@@ -2938,7 +2922,7 @@ sal_Bool OQueryDesignView::checkStatement()
     // ----------------- having Anh"angen ------------
     if(aHavingStr.getLength())
     {
-        aSqlCmd.append(::rtl::OUString::createFromAscii(" HAVING "));
+        aSqlCmd.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" HAVING ")));
         aSqlCmd.append(aHavingStr.makeStringAndClear());
     }
     // ----------------- Sortierung aufbauen und Anh"angen ------------
@@ -3029,7 +3013,6 @@ void OQueryDesignView::SaveUIConfig()
 {
     OQueryController& rCtrl = static_cast<OQueryController&>(getController());
     rCtrl.SaveTabWinsPosSize( m_pTableView->GetTabWinMap(), m_pScrollWindow->GetHScrollBar()->GetThumbPos(), m_pScrollWindow->GetVScrollBar()->GetThumbPos() );
-    //  rCtrl.SaveTabFieldsWidth( m_pSelectionBox );
     rCtrl.setVisibleRows( m_pSelectionBox->GetNoneVisibleRows() );
     if ( m_aSplitter.GetSplitPosPixel() != 0 )
         rCtrl.setSplitPos( m_aSplitter.GetSplitPosPixel() );
diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
index 953cab5fa552..ff95ed986b25 100644
--- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
@@ -134,8 +134,4 @@ void OTabFieldMovedUndoAct::Undo()
 }
 // -----------------------------------------------------------------------------
 
-
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index b4b0506950ca..dcdc0b139c22 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -832,8 +832,6 @@ void OQueryTableView::GetConnection(OQueryTableConnection* pConn)
     // bei mir und dem Dokument einfuegen
 
     addConnection( pConn );
-    // invalidieren (damit es neu gezeichnet wird)
-    //  pConn->Invalidate();
 }
 
 //------------------------------------------------------------------------
@@ -963,9 +961,6 @@ sal_Bool OQueryTableView::ShowTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUn
             for(;aIter != aEnd;++aIter)
                 addConnection(*aIter); // add all connections from the undo action
 
-            // each connection should invalidated inside addConnection so we don't need this here any longer
-//          if ( !pOwnList->empty() )
-//              InvalidateConnections();
             pTableCon->clear();
 
             // und die Daten des Fensters ebenfalls in Liste (des Docs)
diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx
index cd2e92a4d2cd..3e19ab75aa62 100644
--- a/dbaccess/source/ui/querydesign/QueryTextView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx
@@ -62,7 +62,6 @@ OQueryTextView::OQueryTextView(OQueryContainerWindow* _pParent)
     m_pEdit->SaveValue();
     m_pEdit->SetPosPixel( Point( 0, 0 ) );
     m_pEdit->Show();
-    //  m_pEdit->GrabFocus();
 }
 // -----------------------------------------------------------------------------
 OQueryTextView::~OQueryTextView()
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 9ff9b6133430..6bb3a056bb80 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -136,7 +136,6 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent )
                 |   BROWSER_HEADERBAR_NEW   ;
 
     m_pTextCell     = new Edit(&GetDataWindow(), 0);
-    //  m_pTextCell->EnableSpecialCheck(sal_False);
     m_pVisibleCell  = new CheckBoxControl(&GetDataWindow());
     m_pTableCell    = new ListBoxControl(&GetDataWindow());     m_pTableCell->SetDropDownLineCount( 20 );
     m_pFieldCell    = new ComboBoxControl(&GetDataWindow());    m_pFieldCell->SetDropDownLineCount( 20 );
@@ -153,9 +152,6 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent )
     // TriState der ::com::sun::star::form::CheckBox abschalten
     m_pVisibleCell->GetBox().EnableTriState( sal_False );
 
-//  m_pEmptyEntry = new OTableFieldDesc();
-//  m_pEmptyEntry->SetColWidth(DEFAULT_SIZE);
-
     Font aTitleFont = OutputDevice::GetDefaultFont( DEFAULTFONT_SANS_UNICODE,Window::GetSettings().GetLanguage(),DEFAULTFONT_FLAGS_ONLYONE);
     aTitleFont.SetSize(Size(0, 6));
     SetTitleFont(aTitleFont);
@@ -217,7 +213,7 @@ void OSelectionBrowseBox::initialize()
             m_aFunctionStrings += String(RTL_CONSTASCII_USTRINGPARAM(";"));
             m_aFunctionStrings += String(ByteString(rContext.getIntlKeywordAscii(eFunctions[i])),RTL_TEXTENCODING_UTF8);
 
-        } // for (sal_Int32 i = 0; i < SAL_N_ELEMENTS(eFunctions) ; ++i)
+        }
         m_aFunctionStrings += String(RTL_CONSTASCII_USTRINGPARAM(";"));
         m_aFunctionStrings += sGroup;
 
@@ -336,7 +332,7 @@ void OSelectionBrowseBox::ColumnMoved( USHORT nColId,BOOL _bCreateUndo )
                 pUndoAct->SetTabFieldDescr(pOldEntry);
 
                 getDesignView()->getController().addUndoActionAndInvalidate(pUndoAct);
-            } // if ( !m_bInUndoMode && _bCreateUndo )
+            }
         }
     }
     else
@@ -367,7 +363,7 @@ void OSelectionBrowseBox::Init()
         const Size aTemp( pControls[i]->GetOptimalSize(WINDOWSIZE_PREFERRED) );
         if ( aTemp.Height() > aHeight.Height() )
             aHeight.Height() = aTemp.Height();
-    } // for(int i= 0; i < SAL_N_ELEMENTS(pControls);++i
+    }
     SetDataRowHeight(aHeight.Height());
     SetTitleLines(1);
     // Anzahl der sichtbaren Zeilen ermitteln
@@ -1194,7 +1190,6 @@ sal_Bool OSelectionBrowseBox::SaveModified()
                             bError = sal_True;
                         }
                     }
-                    //  }
                 }
                 strOldCellContents = pEntry->GetCriteria(nIdx);
                 pEntry->SetCriteria(nIdx, aCrit);
@@ -1593,7 +1588,7 @@ void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, USHORT& _nColu
             getFields()[nOldPosition - 1] = pEntry;
 
         ColumnMoved(pEntry->GetColumnId(),FALSE);
-    } // if ( pEntry->GetColumnId() != nColumnId )
+    }
 
     if ( pEntry->GetFunctionType() & (FKT_AGGREGATE) )
     {
@@ -1798,8 +1793,8 @@ void OSelectionBrowseBox::DuplicateConditionLevel( const sal_uInt16 nLevel)
                 ++m_nVisibleCount;
             }
             m_bVisibleRow[BROW_CRIT1_ROW + nNewLevel] = sal_True;
-        } // if (!pEntry->GetCriteria(nLevel).getLength() )
-    } // for(;aIter != getFields().end();++aIter)
+        }
+    }
 }
 //------------------------------------------------------------------------------
 void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const String& rValue, const sal_uInt16 nLevel,bool _bAddOrOnOneLine )
@@ -1833,7 +1828,6 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const S
                 pEntry->SetGroupBy(sal_False);
             else
             {
-//              pEntry->SetGroupBy(rInfo->IsGroupBy());
                 if(!m_bGroupByUnRelated && pEntry->IsGroupBy())
                     pEntry->SetVisible(sal_True);
             }
@@ -1848,13 +1842,13 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const S
                 }
                 m_bVisibleRow[BROW_CRIT1_ROW + nLevel] = sal_True;
                 break;
-            } // if (!pEntry->GetCriteria(nLevel).getLength() )
+            }
             if ( _bAddOrOnOneLine )
             {
                 pLastEntry = pEntry;
             }
         }
-    } // for(;aIter != getFields().end();++aIter)
+    }
     if ( pLastEntry.is() )
     {
         String sCriteria = rValue;
@@ -2339,7 +2333,6 @@ sal_Bool OSelectionBrowseBox::GetFunctionName(sal_uInt32 _nFunctionTokenId,Strin
 String OSelectionBrowseBox::GetCellContents(sal_Int32 nCellIndex, USHORT nColId)
 {
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
-    //  DBG_ASSERT(nCellIndex < (GetRowCount()-1),"CellIndex ist zu gross");
     if ( GetCurColumnId() == nColId && !m_bInUndoMode )
         SaveModified();
 
diff --git a/dbaccess/source/ui/querydesign/TableConnectionData.cxx b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
index f097c35eb6f1..263dab0e9593 100644
--- a/dbaccess/source/ui/querydesign/TableConnectionData.cxx
+++ b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
@@ -83,7 +83,6 @@ OTableConnectionData::~OTableConnectionData()
     DBG_DTOR(OTableConnectionData,NULL);
     // LineDataList loeschen
     OConnectionLineDataVec().swap(m_vConnLineData);
-    //ResetConnLines(FALSE);
 }
 
 //------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 1c0dd80e93f8..0bf51df79eac 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -121,7 +121,7 @@ OTableWindow::~OTableWindow()
         OSL_ENSURE(m_pListBox->GetEntryCount()==0,"Forgot to call EmptyListbox()!");
         ::std::auto_ptr<Window> aTemp(m_pListBox);
         m_pListBox = NULL;
-    } // if (m_pListBox)
+    }
     if ( m_pContainerListener.is() )
         m_pContainerListener->dispose();
 
@@ -188,13 +188,13 @@ BOOL OTableWindow::FillListBox()
             m_pContainerListener = new ::comphelper::OContainerListenerAdapter(this,xContainer);
     }
     // mark all primary keys with special image
-    ModuleRes TmpRes(isHiContrast(m_pListBox) ? IMG_JOINS_H : IMG_JOINS);
+    ModuleRes TmpRes(IMG_JOINS);
     ImageList aImageList(TmpRes);
     Image aPrimKeyImage = aImageList.GetImage(IMG_PRIMARY_KEY);
 
     if (GetData()->IsShowAll())
     {
-        SvLBoxEntry* pEntry = m_pListBox->InsertEntry( ::rtl::OUString::createFromAscii("*") );
+        SvLBoxEntry* pEntry = m_pListBox->InsertEntry( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")) );
         pEntry->SetUserData( createUserData(NULL,false) );
     }
 
@@ -273,17 +273,16 @@ void OTableWindow::impl_updateImage()
 {
     ImageProvider aImageProvider( getDesignView()->getController().getConnection() );
 
-    Image aImage, aImageHC;
-    aImageProvider.getImages( GetComposedName(), m_pData->isQuery() ? DatabaseObject::QUERY : DatabaseObject::TABLE, aImage, aImageHC );
+    Image aImage;
+    aImageProvider.getImages( GetComposedName(), m_pData->isQuery() ? DatabaseObject::QUERY : DatabaseObject::TABLE, aImage );
 
-    if ( !aImage || !aImageHC )
+    if ( !aImage )
     {
         OSL_ENSURE( false, "OTableWindow::impl_updateImage: no images!" );
         return;
     }
 
-    m_aTypeImage.SetModeImage( aImage, BMP_COLOR_NORMAL );
-    m_aTypeImage.SetModeImage( aImageHC, BMP_COLOR_HIGHCONTRAST );
+    m_aTypeImage.SetModeImage( aImage );
     m_aTypeImage.Show();
 }
 
diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
index aad8a07fa4cc..44b3953b57e8 100644
--- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
@@ -49,7 +49,6 @@ namespace dbaui
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::beans;
     using namespace ::com::sun::star::lang;
-    //  using namespace ::com::sun::star::awt;
     using namespace ::com::sun::star;
 
     OTableWindowAccess::OTableWindowAccess(OTableWindow* _pTable)
@@ -100,14 +99,14 @@ namespace dbaui
     Sequence< ::rtl::OUString > OTableWindowAccess::getSupportedServiceNames_Static(void) throw( RuntimeException )
     {
         Sequence< ::rtl::OUString > aSupported(2);
-        aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.accessibility.Accessible");
-        aSupported[1] = ::rtl::OUString::createFromAscii("com.sun.star.accessibility.AccessibleContext");
+        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.Accessible"));
+        aSupported[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleContext"));
         return aSupported;
     }
     // -----------------------------------------------------------------------------
     ::rtl::OUString OTableWindowAccess::getImplementationName_Static(void) throw( RuntimeException )
     {
-        return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.TableWindowAccessibility");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.TableWindowAccessibility"));
     }
     // -----------------------------------------------------------------------------
     // XAccessibleContext
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index 936148c5ed93..530f808b46f9 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -166,7 +166,6 @@ long OTableWindowListBox::PreNotify(NotifyEvent& rNEvt)
                 if(m_pTabWin)
                 {
                     bHandled = m_pTabWin->HandleKeyInput(*pKeyEvent);
-                    //  bHandled = TRUE;
                 }
                 break;
             }
@@ -196,7 +195,6 @@ IMPL_LINK( OTableWindowListBox, ScrollUpHdl, SvTreeListBox*, /*pBox*/ )
         ScrollOutputArea( -1 );
         pEntry = GetEntry( m_aMousePos );
         Select( pEntry, TRUE );
-//      m_aScrollTimer.Start();
     }
 
     return 0;
@@ -214,7 +212,6 @@ IMPL_LINK( OTableWindowListBox, ScrollDownHdl, SvTreeListBox*, /*pBox*/ )
         ScrollOutputArea( 1 );
         pEntry = GetEntry( m_aMousePos );
         Select( pEntry, TRUE );
-//      m_aScrollTimer.Start();
     }
 
     return 0;
@@ -247,7 +244,6 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt )
         && OJoinExchObj::isFormatAvailable(GetDataFlavorExVector(),SOT_FORMATSTR_ID_SBA_JOIN) )
     {   // don't drop into the window if it's the drag source itself
 
-
         // remove the selection if the dragging operation is leaving the window
         if (_rEvt.mbLeaving)
             SelectAll(FALSE);
diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
index 48e9865dd1ce..c4e9d279a03e 100644
--- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
@@ -129,15 +129,6 @@ void OTableWindowTitle::Command( const CommandEvent& rEvt )
 }
 
 //------------------------------------------------------------------------------
-//void OTableWindowTitle::Paint( const Rectangle& rRect )
-//{
-//  //////////////////////////////////////////////////////////////////////
-//  // Ausgabe des Textes in der Titelzeile
-//  Rectangle aWinRect( Point(0,0), GetSizePixel() );
-//  DrawText( aWinRect, GetText(), TEXT_DRAW_CENTER|TEXT_DRAW_VCENTER|TEXT_DRAW_ENDELLIPSIS );
-//}
-
-//------------------------------------------------------------------------------
 void OTableWindowTitle::KeyInput( const KeyEvent& rEvt )
 {
     if ( m_pTabWin )
@@ -216,7 +207,4 @@ void OTableWindowTitle::StateChanged( StateChangedType nType )
     }
 }
 
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/makefile.mk b/dbaccess/source/ui/querydesign/makefile.mk
index 36e36c960023..a4a39c36a79c 100644
--- a/dbaccess/source/ui/querydesign/makefile.mk
+++ b/dbaccess/source/ui/querydesign/makefile.mk
@@ -38,42 +38,42 @@ TARGET=querydesign
 # --- Files --------------------------------------------------------
 
 EXCEPTIONSFILES =\
+            $(SLO)$/ConnectionLine.obj		\
             $(SLO)$/ConnectionLineAccess.obj	\
-            $(SLO)$/TableWindowAccess.obj		\
-            $(SLO)$/JAccess.obj					\
-            $(SLO)$/JoinDesignView.obj			\
-            $(SLO)$/JoinController.obj			\
-            $(SLO)$/QueryDesignView.obj			\
-            $(SLO)$/SelectionBrowseBox.obj		\
-            $(SLO)$/querydlg.obj				\
-            $(SLO)$/QueryTabWinUndoAct.obj		\
+            $(SLO)$/JAccess.obj			\
+            $(SLO)$/JoinController.obj		\
+            $(SLO)$/JoinDesignView.obj		\
+            $(SLO)$/JoinExchange.obj		\
+            $(SLO)$/JoinTableView.obj		\
+            $(SLO)$/QTableConnection.obj	\
+            $(SLO)$/QTableConnectionData.obj	\
+            $(SLO)$/QTableWindow.obj		\
+            $(SLO)$/QTableWindowData.obj	\
+            $(SLO)$/QueryDesignView.obj		\
             $(SLO)$/QueryMoveTabWinUndoAct.obj	\
             $(SLO)$/QueryTabConnUndoAction.obj	\
+            $(SLO)$/QueryTabWinUndoAct.obj	\
+            $(SLO)$/QueryTableView.obj		\
+            $(SLO)$/QueryTextView.obj		\
+            $(SLO)$/QueryViewSwitch.obj		\
+            $(SLO)$/SelectionBrowseBox.obj	\
+            $(SLO)$/TableConnection.obj		\
+            $(SLO)$/TableConnectionData.obj	\
             $(SLO)$/TableFieldDescription.obj	\
-            $(SLO)$/JoinTableView.obj			\
-            $(SLO)$/QueryViewSwitch.obj			\
-            $(SLO)$/QueryTableView.obj			\
-            $(SLO)$/TableWindowData.obj			\
-            $(SLO)$/QTableWindow.obj			\
-            $(SLO)$/TableWindow.obj				\
-            $(SLO)$/JoinExchange.obj			\
-            $(SLO)$/TableWindowListBox.obj		\
-            $(SLO)$/TableWindowTitle.obj		\
-            $(SLO)$/QueryTextView.obj			\
-            $(SLO)$/QTableConnection.obj		\
-            $(SLO)$/querycontroller.obj			\
+            $(SLO)$/TableWindow.obj		\
+            $(SLO)$/TableWindowAccess.obj	\
+            $(SLO)$/TableWindowData.obj		\
+            $(SLO)$/TableWindowListBox.obj	\
+            $(SLO)$/TableWindowTitle.obj	\
             $(SLO)$/querycontainerwindow.obj    \
-            $(SLO)$/queryview.obj               \
-            $(SLO)$/TableConnection.obj			\
-            $(SLO)$/TableConnectionData.obj
+            $(SLO)$/querycontroller.obj		\
+            $(SLO)$/querydlg.obj		\
+            $(SLO)$/queryview.obj
 
 SLOFILES =\
-            $(EXCEPTIONSFILES)					\
-            $(SLO)$/TableFieldInfo.obj			\
-            $(SLO)$/QTableConnectionData.obj	\
-            $(SLO)$/QTableWindowData.obj		\
-            $(SLO)$/ConnectionLine.obj			\
-            $(SLO)$/ConnectionLineData.obj
+            $(EXCEPTIONSFILES)			\
+            $(SLO)$/ConnectionLineData.obj	\
+            $(SLO)$/TableFieldInfo.obj
 
 SRS1NAME=$(TARGET)
 SRC1FILES =  query.src		\
diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src
index d8a2162e1d14..aae5a07545ae 100644
--- a/dbaccess/source/ui/querydesign/query.src
+++ b/dbaccess/source/ui/querydesign/query.src
@@ -97,27 +97,11 @@ Menu RID_QUERYCOLPOPUPMENU
         };
     };
 };
+
 ImageList IMG_JOINS
 {
     Prefix = "jo";
-    MaskColor   = Color {
-            Red   = 0xffff;
-            Green = 0x0000;
-            Blue  = 0xffff;
-    };
-    IdList = {
-        IMG_PRIMARY_KEY; IMG_FOREIGN_KEY;
-    };
-    IdCount = { 2; };
-};
-ImageList IMG_JOINS_H
-{
-    Prefix = "joh";
-    MaskColor   = Color {
-            Red   = 0xffff;
-            Green = 0x0000;
-            Blue  = 0xffff;
-    };
+    MaskColor   = Color { Red   = 0xffff; Green = 0x0000; Blue  = 0xffff; };
     IdList = {
         IMG_PRIMARY_KEY; IMG_FOREIGN_KEY;
     };
@@ -161,6 +145,7 @@ String STR_QUERY_UNDO_TABFIELDCREATE
 {
     Text [ en-US ] = "Add Column" ;
 };
+
 String RID_STR_TABLE_DOESNT_EXIST
 {
     Text [ en-US ] = "Invalid expression, table '$name$' does not exist.";
@@ -170,6 +155,7 @@ String RID_STR_FIELD_DOESNT_EXIST
 {
     Text [ en-US ] = "Invalid expression, field name '$name$' does not exist.";
 };
+
 String RID_STR_TOMUCHTABLES
 {
     Text [ en-US ] = "The query covers #num# tables. The selected database type, however, can only process a maximum of #maxnum# table(s) per statement.";
@@ -184,10 +170,12 @@ String STR_QUERY_UNDO_MODIFY_CELL
 {
     Text [ en-US ] = "Edit Column Description";
 };
+
 String STR_QUERY_UNDO_SIZE_COLUMN
 {
     Text [ en-US ] = "Adjust column width";
 };
+
 String STR_QUERY_SORTTEXT
 {
     Text [ en-US ] = "(not sorted);ascending;descending" ;
@@ -197,14 +185,17 @@ String STR_QUERY_FUNCTIONS
 {
     Text [ en-US ] = "(no function);Group";
 };
+
 String STR_QUERY_NOTABLE
 {
     Text [ en-US ] = "(no table)";
 };
+
 String STR_QRY_ORDERBY_UNRELATED
 {
     Text [ en-US ] = "The database only supports sorting for visible fields.";
 };
+
 Menu RID_QUERYFUNCTION_POPUPMENU
 {
     ItemList =
@@ -243,6 +234,7 @@ Menu RID_QUERYFUNCTION_POPUPMENU
         };
     };
 };
+
 String STR_QUERY_HANDLETEXT
 {
     Text [ en-US ] = "Field;Alias;Table;Sort;Visible;Function;Criterion;Or;Or";
@@ -257,38 +249,47 @@ ErrorBox ERR_QRY_CRITERIA_ON_ASTERISK
 {
     Message [ en-US ] = "A condition cannot be applied to field [*]" ;
 };
+
 String STR_QRY_TOO_LONG_STATEMENT
 {
     Text [ en-US ] = "The SQL statement created is too long.";
 };
+
 String STR_QRY_TOOCOMPLEX
 {
     Text [ en-US ] = "Query is too complex" ;
 };
+
 String STR_QRY_NOSELECT
 {
     Text [ en-US ] = "Nothing has been selected." ;
 };
+
 String STR_QRY_TOOMANYCOND
 {
     Text [ en-US ] = "Too many search criteria" ;
 };
+
 String STR_QRY_SYNTAX
 {
     Text [ en-US ] = "SQL syntax error" ;
 };
+
 ErrorBox ERR_QRY_ORDERBY_ON_ASTERISK
 {
     Message [ en-US ] = "[*] cannot be used as a sort criterion.";
 };
+
 String STR_QUERY_TRUE
 {
     Text [ en-US ] = "TRUE" ;
 };
+
 String STR_QUERY_FALSE
 {
     Text [ en-US ] = "FALSE" ;
 };
+
 String STR_QRY_TOO_MANY_TABLES
 {
     Text [ en-US ] = "There are too many tables.";
@@ -298,10 +299,12 @@ String STR_QRY_NATIVE
 {
     Text [ en-US ] = "The statement will not be applied when querying in the SQL dialect of the database." ;
 };
+
 ErrorBox ERR_QRY_AMB_FIELD
 {
     Message [ en-US ] = "Field name not found or not unique" ;
 };
+
 String STR_QRY_ILLEGAL_JOIN
 {
     Text [ en-US ] = "Join could not be processed" ;
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index 56343b778e0a..af5244bd281d 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -86,12 +86,11 @@ namespace dbaui
             m_xBeamer = NULL;
             if(xCloseable.is())
                 xCloseable->close(sal_False); // false - holds the owner ship of this frame
-            //  m_xBeamer->setComponent(NULL,NULL);
-        }
-        {
-            ::std::auto_ptr<Window> aTemp(m_pSplitter);
-            m_pSplitter = NULL;
         }
+
+        ::std::auto_ptr<Window> aTemp(m_pSplitter);
+        m_pSplitter = NULL;
+
     }
     // -----------------------------------------------------------------------------
     bool OQueryContainerWindow::switchView( ::dbtools::SQLExceptionInfo* _pErrorInfo )
@@ -207,7 +206,7 @@ namespace dbaui
 
             ::dbaui::notifySystemWindow(this,m_pBeamer,::comphelper::mem_fun(&TaskPaneList::AddWindow));
 
-            Reference < XFrame > xBeamerFrame( m_pViewSwitch->getORB()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.Frame")),UNO_QUERY );
+            Reference < XFrame > xBeamerFrame( m_pViewSwitch->getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame"))),UNO_QUERY );
             m_xBeamer.set( xBeamerFrame );
             OSL_ENSURE(m_xBeamer.is(),"No frame created!");
             m_xBeamer->initialize( VCLUnoHelper::GetInterface ( m_pBeamer ) );
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 82122c97aed1..eeb8f26c5b59 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -124,12 +124,12 @@ namespace dbaui
         // need by registration
         static ::rtl::OUString getImplementationName_Static() throw( RuntimeException )
         {
-            return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.OViewDesign");
+            return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OViewDesign"));
         }
         static Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( RuntimeException )
         {
             Sequence< ::rtl::OUString> aSupported(1);
-            aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.ViewDesign");
+            aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ViewDesign"));
             return aSupported;
         }
         static Reference< XInterface > SAL_CALL Create(const Reference< XMultiServiceFactory >& _rM)
@@ -156,11 +156,11 @@ namespace dbaui
             if (!_pNode->isToken())
             {
                 // Regelnamen als rule: ...
-                rString = ::rtl::OUString::createFromAscii("RULE_ID: ");
+                rString = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RULE_ID: "));
                 rString += ::rtl::OUString::valueOf( (sal_Int32)_pNode->getRuleID());
-                rString+= ::rtl::OUString::createFromAscii("(");
+                rString+= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("("));
                 rString += OSQLParser::RuleIDToStr(_pNode->getRuleID());
-                rString+= ::rtl::OUString::createFromAscii(")");
+                rString+= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
 
 
                 _pParent = _pBox->InsertEntry(rString,_pParent);
@@ -181,50 +181,55 @@ namespace dbaui
 
                 case SQL_NODE_KEYWORD:
                     {
-                        rString+= ::rtl::OUString::createFromAscii("SQL_KEYWORD:");
+                        rString+= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_KEYWORD:"));
                         ::rtl::OString sT = OSQLParser::TokenIDToStr(_pNode->getTokenID());
                         rString += ::rtl::OUString(sT,sT.getLength(),RTL_TEXTENCODING_UTF8);
                      break;}
 
                 case SQL_NODE_COMPARISON:
-                    {rString+= ::rtl::OUString::createFromAscii("SQL_COMPARISON:");
-                    rString += _pNode->getTokenValue(); // haenge Nodevalue an
+                    {
+                        rString+= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_COMPARISON:"));
+                        rString += _pNode->getTokenValue(); // haenge Nodevalue an
                             // und beginne neu Zeile
-                    break;}
+                        break;}
 
                 case SQL_NODE_NAME:
-                    {rString+= ::rtl::OUString::createFromAscii("SQL_NAME:");
-                     rString+= ::rtl::OUString::createFromAscii("\"");
-                     rString += _pNode->getTokenValue();
-                     rString+= ::rtl::OUString::createFromAscii("\"");
-
-                     break;}
+                    {
+                        rString+= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_NAME:"));
+                        rString+= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\""));
+                        rString += _pNode->getTokenValue();
+                        rString+= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\""));
+                        break;}
 
                 case SQL_NODE_STRING:
-                    {rString += ::rtl::OUString::createFromAscii("SQL_STRING:'");
-                     rString += _pNode->getTokenValue();
-                     break;}
+                    {
+                        rString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_STRING:'"));
+                        rString += _pNode->getTokenValue();
+                        break;}
 
                 case SQL_NODE_INTNUM:
-                    {rString += ::rtl::OUString::createFromAscii("SQL_INTNUM:");
-                     rString += _pNode->getTokenValue();
-                     break;}
+                    {
+                        rString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_INTNUM:"));
+                        rString += _pNode->getTokenValue();
+                        break;}
 
                 case SQL_NODE_APPROXNUM:
-                    {rString += ::rtl::OUString::createFromAscii("SQL_APPROXNUM:");
-                     rString += _pNode->getTokenValue();
-                     break;}
+                    {
+                        rString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_APPROXNUM:"));
+                        rString += _pNode->getTokenValue();
+                        break;}
 
                 case SQL_NODE_PUNCTUATION:
-                    {rString += ::rtl::OUString::createFromAscii("SQL_PUNCTUATION:");
-                    rString += _pNode->getTokenValue(); // haenge Nodevalue an
-                    break;}
+                    {
+                        rString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_PUNCTUATION:"));
+                        rString += _pNode->getTokenValue(); // haenge Nodevalue an
+                        break;}
 
                 case SQL_NODE_AMMSC:
-                    {rString += ::rtl::OUString::createFromAscii("SQL_AMMSC:");
-                    rString += _pNode->getTokenValue(); // haenge Nodevalue an
-
-                    break;}
+                    {
+                        rString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_AMMSC:"));
+                        rString += _pNode->getTokenValue(); // haenge Nodevalue an
+                        break;}
 
                 default:
                     OSL_ASSERT("OSQLParser::ShowParseTree: unzulaessiger NodeType");
@@ -303,13 +308,13 @@ namespace
 //------------------------------------------------------------------------------
 ::rtl::OUString OQueryController::getImplementationName_Static() throw( RuntimeException )
 {
-    return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.OQueryDesign");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OQueryDesign"));
 }
 //------------------------------------------------------------------------------
 Sequence< ::rtl::OUString> OQueryController::getSupportedServiceNames_Static(void) throw( RuntimeException )
 {
     Sequence< ::rtl::OUString> aSupported(1);
-    aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.QueryDesign");
+    aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.QueryDesign"));
     return aSupported;
 }
 //-------------------------------------------------------------------------
@@ -694,7 +699,6 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >&
                 if(m_bGraphicalDesign)
                     InvalidateFeature(ID_BROWSER_ADDTABLE);
             }
-            //  InvalidateFeature(ID_BROWSER_QUERY_EXECUTE);
             break;
         case SID_QUERY_VIEW_FUNCTIONS:
         case SID_QUERY_VIEW_TABLES:
@@ -734,15 +738,10 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >&
             break;
         case ID_QUERY_ZOOM_IN:
             {
-//              m_aZoom *= Fraction(1,10);
-//              static_cast<OQueryViewSwitch*>(getView())->zoomTableView(m_aZoom);
             }
             break;
         case ID_QUERY_ZOOM_OUT:
             {
-//              if(m_aZoom != Fraction(1,1))
-//                  m_aZoom /= Fraction(1,10);
-//              static_cast<OQueryViewSwitch*>(getView())->zoomTableView(m_aZoom);
             }
             break;
 #if OSL_DEBUG_LEVEL > 1
@@ -779,11 +778,10 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >&
                                 pNodeTmp = pTemp->getChild(1);
                                 OSQLParseNode::compress(pNodeTmp);
                                 pNodeTmp = pTemp->getChild(1);
-                            } // if ( pCondition ) // no where clause
+                            }
                             ::rtl::OUString sTemp;
                             pNode->parseNodeToStr(sTemp,getConnection());
                             getContainer()->setStatement(sTemp);
-
                         }
                     }
 
@@ -1165,7 +1163,7 @@ void SAL_CALL OQueryController::disposing( const EventObject& Source ) throw(Run
     if ( getContainer() && Source.Source.is() )
     {
         if ( Source.Source == m_aCurrentFrame.getFrame() )
-        {   // our frame is beeing disposed -> close the preview window (if we have one)
+        {   // our frame is being disposed -> close the preview window (if we have one)
             Reference< XFrame > xPreviewFrame( getContainer()->getPreviewFrame() );
             ::comphelper::disposeComponent( xPreviewFrame );
         }
@@ -1290,7 +1288,7 @@ void OQueryController::executeQuery()
             InvalidateFeature(SID_DB_QUERY_PREVIEW);
 
             URL aWantToDispatch;
-            aWantToDispatch.Complete = ::rtl::OUString::createFromAscii(".component:DB/DataSourceBrowser");
+            aWantToDispatch.Complete = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".component:DB/DataSourceBrowser"));
 
             ::rtl::OUString sFrameName( FRAME_NAME_QUERY_PREVIEW );
             sal_Int32 nSearchFlags = FrameSearchFlag::CHILDREN;
@@ -1382,7 +1380,6 @@ sal_Bool OQueryController::askForNewName(const Reference<XNameAccess>& _xElement
         {
             String sName = String( ModuleRes( editingView() ? STR_VIEW_TITLE : STR_QRY_TITLE ) );
             aDefaultName = sName.GetToken(0,' ');
-            //aDefaultName = getPrivateTitle( );
             aDefaultName = ::dbtools::createUniqueName(_xElements,aDefaultName);
         }
 
@@ -1548,7 +1545,7 @@ bool OQueryController::doSaveAsDoc(sal_Bool _bSaveAs)
 
                 // now check if our datasource has set a tablefilter and if so, append the new table name to it
                 ::dbaui::appendToFilter( getConnection(), m_sName, getORB(), getView() );
-            } // if ( editingView() )
+            }
             Reference< XTitleChangeListener> xEventListener(impl_getTitleHelper_throw(),UNO_QUERY);
             if ( xEventListener.is() )
             {
diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx
index f7348dd25294..d2fb74b53327 100644
--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@@ -255,12 +255,12 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ )
     String sHelpText = String( ModuleRes( nResId ) );
     if( nPos )
     {
-        sHelpText.SearchAndReplace( String( RTL_CONSTASCII_STRINGPARAM( "%1" ) ), sFirstWinName );
-        sHelpText.SearchAndReplace( String( RTL_CONSTASCII_STRINGPARAM( "%2" ) ), sSecondWinName );
+        sHelpText.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%1" ) ), sFirstWinName );
+        sHelpText.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%2" ) ), sSecondWinName );
     }
     if ( bAddHint )
     {
-        sHelpText += String( RTL_CONSTASCII_STRINGPARAM( "\n" ) );
+        sHelpText += String( RTL_CONSTASCII_USTRINGPARAM( "\n" ) );
         sHelpText += String( ModuleRes( STR_JOIN_TYPE_HINT ) );
     }
 
@@ -320,8 +320,6 @@ TTableConnectionData::value_type DlgQryJoin::getConnectionData() const
 // -----------------------------------------------------------------------------
 void DlgQryJoin::setValid(sal_Bool _bValid)
 {
-    //LBChangeHdl(&aLB_JoinType);
-
     aPB_OK.Enable(_bValid || eJoinType == CROSS_JOIN );
 }
 // -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/querydlg.src b/dbaccess/source/ui/querydesign/querydlg.src
index 687df3159186..fe8f32da49a1 100644
--- a/dbaccess/source/ui/querydesign/querydlg.src
+++ b/dbaccess/source/ui/querydesign/querydlg.src
@@ -182,13 +182,13 @@ String STR_QUERY_FULL_JOIN
 {
     Text [ en-US ] = "Contains ALL records from '%1' and from '%2'.";
 };
+
 String STR_QUERY_CROSS_JOIN
 {
     Text [ en-US ] = "Contains the cartesian product of ALL records from '%1' and from '%2'.";
 };
+
 String STR_QUERY_NATURAL_JOIN
 {
     Text [ en-US ] = "Contains only one column for each pair of equally-named columns from '%1' and from '%2'.";
 };
-
-
diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
index db145f75664f..b4dc806ea161 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
@@ -416,7 +416,7 @@ xKey.clear();
             }
         }
     xKey.clear();
-    } // for(sal_Int32 i=0;i<xKeys->getCount();++i)
+    }
     if ( bDropRelation )
     {
         DropRelation();
@@ -424,8 +424,6 @@ xKey.clear();
         ::dbtools::throwGenericSQLException(sError,NULL);
     }
 
-//  OSL_ENSURE(xKey.is(),"No key found have insertion!");
-
     // The fields the relation marks may not be the same as our LineDatas mark after the relation has been updated
     if ( xColSup.is() )
     {
@@ -454,8 +452,8 @@ xKey.clear();
                 m_vConnLineData.push_back(pNewData);
             }
         }
-    } // if ( xColSup.is() )
-    // NOTE : the caller is resposible for updating any other objects referencing the old LineDatas (for instance a ConnLine)
+    }
+    // NOTE : the caller is responsible for updating any other objects referencing the old LineDatas (for instance a ConnLine)
 
     ////////////////////////////////////////////////////////////
     // Kardinalitaet bestimmen
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 43400cb2c6a9..eae22012b8b7 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -96,8 +96,6 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::ui::dialogs;
 using namespace ::com::sun::star::util;
-//  using namespace ::com::sun::star::sdbcx;
-//  using namespace ::connectivity;
 using namespace ::dbtools;
 using namespace ::dbaui;
 using namespace ::comphelper;
@@ -112,13 +110,13 @@ using namespace ::osl;
 //------------------------------------------------------------------------------
 ::rtl::OUString ORelationController::getImplementationName_Static() throw( RuntimeException )
 {
-    return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.ORelationDesign");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.ORelationDesign"));
 }
 //------------------------------------------------------------------------------
 Sequence< ::rtl::OUString> ORelationController::getSupportedServiceNames_Static(void) throw( RuntimeException )
 {
     Sequence< ::rtl::OUString> aSupported(1);
-    aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.RelationDesign");
+    aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.RelationDesign"));
     return aSupported;
 }
 //-------------------------------------------------------------------------
@@ -348,7 +346,7 @@ namespace
                 {
                     ::comphelper::disposeComponent(xResult);
                     loadTableData(m_xTables->getByName(*pIter));
-                } // if ( xResult.is() && xResult->next() )
+                }
             }
             catch( const Exception& )
             {
@@ -367,12 +365,10 @@ namespace
         Reference<XPropertySet> xTableProp(_aTable,UNO_QUERY);
         const ::rtl::OUString sSourceName = ::dbtools::composeTableName( m_xMetaData, xTableProp, ::dbtools::eInTableDefinitions, false, false, false );
         TTableDataHelper::iterator aFind = m_aTableData.find(sSourceName);
-        bool bNotFound = true, bAdded = false;
         if ( aFind == m_aTableData.end() )
         {
             aFind = m_aTableData.insert(TTableDataHelper::value_type(sSourceName,::boost::shared_ptr<OTableWindowData>(new OTableWindowData(xTableProp,sSourceName, sSourceName)))).first;
             aFind->second->ShowAll(FALSE);
-            bAdded = true;
         }
         TTableWindowData::value_type pReferencingTable = aFind->second;
         Reference<XIndexAccess> xKeys = pReferencingTable->getKeys();
@@ -394,7 +390,6 @@ namespace
                 xKey->getPropertyValue(PROPERTY_TYPE) >>= nKeyType;
                 if ( KeyType::FOREIGN == nKeyType )
                 {
-                    bNotFound = false;
                     ::rtl::OUString sReferencedTable;
                     xKey->getPropertyValue(PROPERTY_REFERENCEDTABLE) >>= sReferencedTable;
                     //////////////////////////////////////////////////////////////////////
@@ -410,7 +405,7 @@ namespace
                         }
                         else
                             continue; // table name could not be found so we do not show this table releation
-                    } // if ( aFind == m_aTableData.end() )
+                    }
                     TTableWindowData::value_type pReferencedTable = aRefFind->second;
 
                     ::rtl::OUString sKeyName;
@@ -454,7 +449,7 @@ namespace
                     pTabConnData->SetCardinality();
                 }
             }
-        } // if ( xKeys.is() )
+        }
     }
 }
 
@@ -478,7 +473,7 @@ void ORelationController::mergeData(const TTableConnectionData& _aConnectionData
         {
             m_vTableData.push_back((*aConnDataIter)->getReferencedTable());
         }
-    } // for(;aConnDataIter != aConnDataEnd;++aConnDataIter)
+    }
     if ( m_nThreadEvent )
     {
         --m_nThreadEvent;
@@ -535,8 +530,8 @@ void ORelationController::loadData()
                 nStart = nEnd;
                 nEnd += nMaxElements;
                 nEnd = ::std::min(nEnd,nCount);
-            } // for(;pIter != pEnd;++pIter)
-        } // if ( aMeta.supportsThreads() )
+            }
+        }
         else
         {
             RelationLoader* pThread = new RelationLoader(this,xMetaData,m_xTables,aNames,0,nCount);
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index d608ee531d25..b345ecaa4a07 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -180,7 +180,7 @@ void ORelationTableView::ReSync()
                 pTabConnDataList->erase( ::std::remove(pTabConnDataList->begin(),pTabConnDataList->end(),*aConIter),pTabConnDataList->end() );
                 continue;
             }
-        } // if ( !arrInvalidTables.empty() )
+        }
 
         addConnection( new ORelationTableConnection(this, *aConIter), sal_False ); // don't add the data again
     }
@@ -385,30 +385,6 @@ void ORelationTableView::RemoveTabWin( OTableWindow* pTabWin )
     }
 }
 // -----------------------------------------------------------------------------
-//namespace
-//{
-//    class OReleationAskDialog : public ButtonDialog
-//    {
-//        FixedImage        m_aInfoImage;
-//        FixedText     m_aTitle;
-//      FixedText       m_aMessage;
-//    public:
-//        OReleationDialog(Window* _pParent) : ButtonDialog(_pParent,WB_HORZ | WB_STDDIALOG)
-//            ,m_aInfoImage(this)
-//            ,m_aTitle(this,WB_WORDBREAK | WB_LEFT)
-//          ,m_aMessage(this,WB_WORDBREAK | WB_LEFT)
-//        {
-//            m_aMessage.SetText(ModuleRes(STR_QUERY_REL_EDIT_RELATION));
-//            m_aMessage.Show();
-//
-//            // Changed as per BugID 79541 Branding/Configuration
-//            String sDialogTitle( lcl_getProductName() );
-//            SetText( sDialogTitle.AppendAscii( " Base" ) );
-//            m_aTitle.Show();
-//        }
-//    };
-//}
-// -----------------------------------------------------------------------------
 void ORelationTableView::lookForUiActivities()
 {
     if(m_pExistingConnection)
@@ -477,7 +453,7 @@ void ORelationTableView::_elementRemoved( const container::ContainerEvent& _rEve
             m_pView->getController().InvalidateFeature(ID_BROWSER_UNDO);
             m_pView->getController().InvalidateFeature(ID_BROWSER_REDO);
         }
-    } // if ( _rEvent.Accessor >>= sName )
+    }
     m_bInRemove = false;
 }
 // -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/relationdesign/relation.src b/dbaccess/source/ui/relationdesign/relation.src
index e3c555debd79..4420ade06100 100644
--- a/dbaccess/source/ui/relationdesign/relation.src
+++ b/dbaccess/source/ui/relationdesign/relation.src
@@ -44,22 +44,27 @@ String STR_QUERY_REL_EDIT_RELATION
 {
     Text [ en-US ] = "This relation already exists. Do you want to edit it or create a new one?" ;
 };
+
 String STR_QUERY_REL_EDIT
 {
     Text [ en-US ] = "Edit..." ;
 };
+
 String STR_QUERY_REL_CREATE
 {
     Text [ en-US ] = "Create..." ;
 };
+
 String STR_RELATIONDESIGN
 {
     Text [ en-US ] = " - %PRODUCTNAME Base: Relation design" ;
 };
+
 String STR_RELATIONDESIGN_NOT_AVAILABLE
 {
     Text [ en-US ] = "The database does not support relations." ;
 };
+
 QueryBox RELATION_DESIGN_SAVEMODIFIED
 {
     Buttons = WB_YES_NO_CANCEL ;
@@ -76,55 +81,3 @@ String STR_QUERY_REL_COULD_NOT_CREATE
 {
     Text [ en-US ] = "The database could not create the relation. May be foreign keys for this kind of table aren't supported.\nPlease check your documentation of the database.";
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
index 22756f48a909..b61e97b06f1e 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
@@ -110,11 +110,6 @@ OTableEditorCtrl* OFieldDescGenWin::GetEditorCtrl()
 }
 #endif
 //------------------------------------------------------------------------------
-//short OFieldDescGenWin::GetFormatCategory(OFieldDescription* pFieldDescr)
-//{
-//  return m_pFieldControl->GetFormatCategory(pFieldDescr);
-//}
-//------------------------------------------------------------------------------
 void OFieldDescGenWin::SaveData( OFieldDescription* pFieldDescr )
 {
     DBG_CHKTHIS(OFieldDescGenWin,NULL);
@@ -184,8 +179,4 @@ void OFieldDescGenWin::paste()
 }
 // -----------------------------------------------------------------------------
 
-
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
index 0f7ef63d5d94..a307f0766766 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
@@ -561,7 +561,7 @@ sal_Int32                   OFieldDescription::GetPrecision()           const
                 if ( !nPrec )
                     nPrec = pTypeInfo->nPrecision;
                 break;
-        } // switch ( pTypeInfo->nType )
+        }
     }
 
     return nPrec;
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 06bd03125f51..48ae96c47928 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -241,11 +241,6 @@ void OTableEditorCtrl::SetReadOnly( sal_Bool bRead )
     DeactivateCell();
 
     //////////////////////////////////////////////////////////////////////
-    // ::com::sun::star::beans::Property Controls disablen
-//  if (pDescrWin)
-//      pDescrWin->SetReadOnly(bReadOnly || !SetDataPtr(nRow) || GetActRow()->IsReadOnly());
-
-    //////////////////////////////////////////////////////////////////////
     // Cursor des Browsers anpassen
     BrowserMode nMode(BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_KEEPSELECTION |
                       BROWSER_HLINESFULL      | BROWSER_VLINESFULL|BROWSER_AUTOSIZE_LASTCOL);
@@ -313,7 +308,7 @@ void OTableEditorCtrl::InitCellController()
         const Size aTemp( pControls[i]->GetOptimalSize(WINDOWSIZE_PREFERRED) );
         if ( aTemp.Height() > aHeight.Height() )
             aHeight.Height() = aTemp.Height();
-    } // for(int i= 0; i < SAL_N_ELEMENTS(pControls);++i
+    }
     SetDataRowHeight(aHeight.Height());
 
     ClearModified();
@@ -402,8 +397,6 @@ void OTableEditorCtrl::PaintCell(OutputDevice& rDev, const Rectangle& rRect,
 
     if (rDev.IsClipRegion())
         rDev.SetClipRegion();
-//  rDev.DrawText(rRect.TopLeft(), aText);
-//  rDev.SetClipRegion( );
 }
 
 //------------------------------------------------------------------------------
@@ -415,7 +408,7 @@ CellController* OTableEditorCtrl::GetController(long nRow, sal_uInt16 nColumnId)
     Reference<XPropertySet> xTable = GetView()->getController().getTable();
     if (IsReadOnly() || (   xTable.is() &&
                             xTable->getPropertySetInfo()->hasPropertyByName(PROPERTY_TYPE) &&
-                            ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString::createFromAscii("VIEW")))
+                            ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW"))))
         return NULL;
 
     //////////////////////////////////////////////////////////////////////
@@ -711,15 +704,6 @@ sal_Bool OTableEditorCtrl::SaveModified()
     switch( nColId )
     {
         //////////////////////////////////////////////////////////////
-        // NameCell
-        case FIELD_NAME:
-        {
-            // removed the former duplicate-check. this is done in OTableDocShell::CheckDefConsistency now.
-            // FS - 07.12.99 - 69575
-
-        } break;
-
-        //////////////////////////////////////////////////////////////
         // TypeCell
         case FIELD_TYPE:
         {
@@ -1191,7 +1175,6 @@ void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const ::com::s
             break;
 
         case FIELD_PROPERTY_NUMTYPE:
-            //  pFieldDescr->SetNumType( _rNewData );
             OSL_ENSURE(sal_False, "OTableEditorCtrl::SetCellData: invalid column!");
             break;
 
@@ -1276,7 +1259,7 @@ Any OTableEditorCtrl::GetCellData( long nRow, sal_uInt16 nColId )
 
         case FIELD_PROPERTY_NUMTYPE:
             OSL_ENSURE(sal_False, "OTableEditorCtrl::GetCellData: invalid column!");
-            //  return pFieldDescr->GetNumType();
+            break;
 
         case FIELD_PROPERTY_AUTOINC:
             sValue = pFieldDescr->IsAutoIncrement() ? strYes : strNo;
@@ -1360,11 +1343,6 @@ sal_Bool OTableEditorCtrl::IsCutAllowed( long nRow )
         }
     }
 
-//  Reference<XPropertySet> xTable = GetView()->getController().getTable();
-//  if( !IsCopyAllowed(nRow) || (xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString::createFromAscii("VIEW")))
-//      return sal_False;
-
-    //  return bCutAllowed && IsDeleteAllowed( nRow );
     return bIsCutAllowed;
 }
 
@@ -1382,7 +1360,7 @@ sal_Bool OTableEditorCtrl::IsCopyAllowed( long /*nRow*/ )
     else if(m_eChildFocus == ROW)
     {
         Reference<XPropertySet> xTable = GetView()->getController().getTable();
-        if( !GetSelectRowCount() || (xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString::createFromAscii("VIEW")))
+        if( !GetSelectRowCount() || (xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW"))))
             return sal_False;
 
         //////////////////////////////////////////////////////////////////////
@@ -1551,7 +1529,7 @@ sal_Bool OTableEditorCtrl::IsPrimaryKeyAllowed( long /*nRow*/ )
     // Key darf nicht veraendert werden
     // Dies gilt jedoch nur, wenn die Tabelle nicht neu ist und keine ::com::sun::star::sdbcx::View. Ansonsten wird kein DROP ausgeführt
 
-    if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString::createFromAscii("VIEW"))
+    if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW")))
         return sal_False;
     //////////////////////////////////////////////////////////////
     // Wenn leeres Feld, kein PrimKey
@@ -1779,7 +1757,7 @@ void OTableEditorCtrl::AdjustFieldDescription(OFieldDescription* _pFieldDesc,
     {
         _pFieldDesc->SetIsNullable(ColumnValue::NO_NULLS);
         _pFieldDesc->SetControlDefault(Any());
-    } // if(!_bSet && _pFieldDesc->getTypeInfo()->bNullable)
+    }
     if ( _pFieldDesc->IsAutoIncrement() && !_bPrimaryKey )
     {
         OTableController& rController = GetView()->getController();
@@ -1803,7 +1781,6 @@ void OTableEditorCtrl::SetPrimaryKey( sal_Bool bSet )
     // Evtl. vorhandene Primary Keys loeschen
     MultiSelection aDeletedPrimKeys;
     aDeletedPrimKeys.SetTotalRange( Range(0,GetRowCount()) );
-    long nIndex = 0;
 
     ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aIter = m_pRowList->begin();
     ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aEnd = m_pRowList->end();
@@ -1822,7 +1799,7 @@ void OTableEditorCtrl::SetPrimaryKey( sal_Bool bSet )
     aInsertedPrimKeys.SetTotalRange( Range(0,GetRowCount()) );
     if( bSet )
     {
-        nIndex = FirstSelectedRow();
+        long nIndex = FirstSelectedRow();
         while( nIndex >= 0 && nIndex < static_cast<long>(m_pRowList->size()) )
         {
             //////////////////////////////////////////////////////////////////////
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index 3336906c21aa..0061bac5fed3 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -145,13 +145,13 @@ namespace
 //------------------------------------------------------------------------------
 ::rtl::OUString OTableController::getImplementationName_Static() throw( RuntimeException )
 {
-    return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.OTableDesign");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OTableDesign"));
 }
 //------------------------------------------------------------------------------
 Sequence< ::rtl::OUString> OTableController::getSupportedServiceNames_Static(void) throw( RuntimeException )
 {
     Sequence< ::rtl::OUString> aSupported(1);
-    aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.TableDesign");
+    aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.TableDesign"));
     return aSupported;
 }
 //-------------------------------------------------------------------------
@@ -349,7 +349,6 @@ sal_Bool OTableController::doSaveDoc(sal_Bool _bSaveAs)
             {
                 String aName = String(ModuleRes(STR_TBL_TITLE));
                 aDefaultName = aName.GetToken(0,' ');
-                //aDefaultName = getPrivateTitle();
                 aDefaultName = ::dbtools::createUniqueName(xTables,aDefaultName);
             }
 
@@ -475,7 +474,6 @@ sal_Bool OTableController::doSaveDoc(sal_Bool _bSaveAs)
             stopTableListening();
             m_xTable = NULL;
         }
-        //  reload(); // a error occured so we have to reload
     }
     return ! (aInfo.isValid() || bError);
 }
@@ -582,8 +580,6 @@ sal_Bool OTableController::Construct(Window* pParent)
 {
     setView( * new OTableDesignView( pParent, getORB(), *this ) );
     OTableController_BASE::Construct(pParent);
-//  m_pView->Construct();
-//  m_pView->Show();
     return sal_True;
 }
 // -----------------------------------------------------------------------------
@@ -646,10 +642,7 @@ sal_Bool SAL_CALL OTableController::suspend(sal_Bool /*_bSuspend*/) throw( Runti
             }
         }
     }
-/*
-    if ( bCheck )
-        OSingleDocumentController::suspend(_bSuspend);
-*/
+
     return bCheck;
 }
 // -----------------------------------------------------------------------------
@@ -912,7 +905,6 @@ void OTableController::loadData()
             {
                 pActFieldDescr->SetName(sName);
                 pActFieldDescr->SetFormatKey(nFormatKey);
-                //  pActFieldDescr->SetPrimaryKey(pPrimary->GetValue());
                 pActFieldDescr->SetDescription(sDescription);
                 pActFieldDescr->SetHelpText(sHelpText);
                 pActFieldDescr->SetAutoIncrement(bIsAutoIncrement);
@@ -1027,7 +1019,7 @@ sal_Bool OTableController::checkColumns(sal_Bool _bNew) throw(::com::sun::star::
             pActFieldDescr->SetAutoIncrement(sal_False); // #95927# pTypeInfo->bAutoIncrement
             pActFieldDescr->SetIsNullable(ColumnValue::NO_NULLS);
 
-            pActFieldDescr->SetName( createUniqueName(::rtl::OUString::createFromAscii("ID") ));
+            pActFieldDescr->SetName( createUniqueName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ID")) ));
             pActFieldDescr->SetPrimaryKey( sal_True );
             m_vRowList.insert(m_vRowList.begin(),pNewRow);
 
@@ -1110,7 +1102,6 @@ void OTableController::alterColumns()
                 // Normally, sdbcx::Column objects are expected to have a TypeName property
             }
 
-            //  xColumn->getPropertyValue(PROPERTY_ISCURRENCY,::cppu::bool2any(pField->IsCurrency()));
             // check if something changed
             if((nType != pField->GetType()                  ||
                 sTypeName != pField->GetTypeName()         ||
@@ -1214,7 +1205,7 @@ void OTableController::alterColumns()
         }
         else
             bReload = sal_True;
-    } // for(sal_Int32 nPos = 0;aIter != aEnd;++aIter,++nPos)
+    }
     // alter column settings
     aIter = m_vRowList.begin();
 
@@ -1245,7 +1236,7 @@ void OTableController::alterColumns()
                 xColumn->setPropertyValue(PROPERTY_FORMATKEY,makeAny(pField->GetFormatKey()));
             if(xInfo->hasPropertyByName(PROPERTY_ALIGN))
                 xColumn->setPropertyValue(PROPERTY_ALIGN,makeAny(dbaui::mapTextAllign(pField->GetHorJustify())));
-        } // if ( xColumns->hasByName(pField->GetName()) )
+        }
     }
     // second drop all columns which could be found by name
     Reference<XNameAccess> xKeyColumns  = getKeyColumns();
@@ -1287,7 +1278,7 @@ void OTableController::alterColumns()
 
                     SQLException aNewException;
                     aNewException.Message = sError;
-                    aNewException.SQLState = ::rtl::OUString::createFromAscii( "S1000" );
+                    aNewException.SQLState = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000"));
                     aNewException.NextException = ::cppu::getCaughtException();
 
                     throw aNewException;
@@ -1458,7 +1449,6 @@ void OTableController::assignTable()
             }
         }
     }
-    //updateTitle();
 }
 // -----------------------------------------------------------------------------
 sal_Bool OTableController::isAddAllowed() const
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index 97de4f457d62..4c3ef7d87cd4 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -75,9 +75,6 @@ void OTableRowView::Init()
 {
     EditBrowseBox::Init();
 
-//  SetMapMode( MapMode(MAP_TWIP) );
-//  GetDataWindow().SetMapMode( GetMapMode() );
-
     Font aFont( GetDataWindow().GetFont() );
     aFont.SetWeight( WEIGHT_NORMAL );
     GetDataWindow().SetFont( aFont );
@@ -113,7 +110,7 @@ void OTableRowView::KeyInput( const KeyEvent& rEvt )
         if( rEvt.GetKeyCode().GetCode() == KEY_F2 )
         {
             ::com::sun::star::util::URL aUrl;
-            aUrl.Complete =::rtl::OUString::createFromAscii(".uno:DSBEditDoc");
+            aUrl.Complete =::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DSBEditDoc"));
             GetView()->getController().dispatch( aUrl,Sequence< PropertyValue >() );
         }
     }
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index 66b5d8c621f3..39ffb23df34d 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -148,7 +148,6 @@ void OTableBorderWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground,
         if ( IsControlFont() )
             aFont.Merge( GetControlFont() );
         SetPointFont( aFont );
-//      Set/*Zoomed*/PointFont( aFont );
     }
 
     if ( bFont || bForeground )
diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
index 14ef3955eebe..4eb83be92c2b 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
@@ -68,7 +68,7 @@ sal_Bool OTableFieldControl::IsReadOnly()
     {
         // Die Spalten einer ::com::sun::star::sdbcx::View können nicht verändert werden
         Reference<XPropertySet> xTable = GetCtrl()->GetView()->getController().getTable();
-        if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString::createFromAscii("VIEW"))
+        if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW")))
             bRead = sal_True;
         else
         {
@@ -153,7 +153,4 @@ sal_Bool OTableFieldControl::isAutoIncrementValueEnabled() const
 }
 // -----------------------------------------------------------------------------
 
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index c6e810353794..4b5815ea6e81 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -317,5 +317,4 @@ long OTableFieldDescWin::PreNotify( NotifyEvent& rNEvt )
     return bHandled ? 1L : TabPage::PreNotify(rNEvt);
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx
index 84c5f293a125..b9891730c1e5 100644
--- a/dbaccess/source/ui/tabledesign/TableRow.cxx
+++ b/dbaccess/source/ui/tabledesign/TableRow.cxx
@@ -156,7 +156,7 @@ namespace dbaui
             _rStr << sal_Int32(pFieldDesc->IsAutoIncrement() ? 1 : 0);
             _rStr << sal_Int32(pFieldDesc->IsPrimaryKey() ? 1 : 0);
             _rStr << sal_Int32(pFieldDesc->IsCurrency() ? 1 : 0);
-        } // if(pFieldDesc)
+        }
         else
             _rStr << (sal_Int32)0;
         return _rStr;
@@ -226,6 +226,4 @@ namespace dbaui
     // -----------------------------------------------------------------------------
 }
 
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
index 516fcaf0fac4..ee2522df46c8 100644
--- a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
+++ b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
@@ -81,11 +81,4 @@ namespace dbaui
     // -----------------------------------------------------------------------------
 }
 
-
-
-
-
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx b/dbaccess/source/ui/tabledesign/TableUndo.cxx
index 5d7e1da08c81..794aefe3963b 100644
--- a/dbaccess/source/ui/tabledesign/TableUndo.cxx
+++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx
@@ -473,7 +473,4 @@ void OPrimKeyUndoAct::Redo()
     OTableEditorUndoAct::Redo();
 }
 
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src
index e2a73292ec8d..0a9c5f4e46e5 100644
--- a/dbaccess/source/ui/tabledesign/table.src
+++ b/dbaccess/source/ui/tabledesign/table.src
@@ -65,18 +65,22 @@ String STR_VALUE_YES
 {
     Text [ en-US ] = "Yes" ;
 };
+
 String STR_VALUE_NO
 {
     Text [ en-US ] = "No" ;
 };
+
 String STR_VALUE_ASC
 {
     Text [ en-US ] = "Ascending" ;
 };
+
 String STR_VALUE_DESC
 {
     Text [ en-US ] = "Descending" ;
 };
+
 String STR_VALUE_NONE
 {
     // Bemerkung : sollte auch in anderen Sprachen irgendwie zum Wort 'Wert' passen : Wert - keiner ....
@@ -87,46 +91,57 @@ String STR_TAB_FIELD_NAME
 {
     Text [ en-US ] = "Field name" ;
 };
+
 String STR_TAB_FIELD_COLUMN_NAME
 {
     Text [ en-US ] = "Field Name" ;
 };
+
 String STR_TAB_FIELD_DATATYPE
 {
     Text [ en-US ] = "Field ~type" ;
 };
+
 String STR_TAB_FIELD_COLUMN_DATATYPE
 {
     Text [ en-US ] = "Field Type" ;
 };
+
 String STR_TAB_FIELD_LENGTH
 {
     Text [ en-US ] = "Field length" ;
 };
+
 String STR_TAB_HELP_TEXT
 {
     Text [ en-US ] = "Description" ;
 };
+
 String STR_COLUMN_DESCRIPTION
 {
     Text [ en-US ] = "Column Description" ;
 };
+
 String STR_TAB_FIELD_NULLABLE
 {
     Text [ en-US ] = "Input required" ;
 };
+
 String STR_FIELD_AUTOINCREMENT
 {
     Text [ en-US ] = "~AutoValue";
 };
+
 String STR_TAB_PROPERTIES
 {
     Text [ en-US ] = "Field Properties" ;
 };
+
 String STR_TABPAGE_GENERAL
 {
     Text [ en-US ] = "General" ;
 };
+
 String STR_TAB_TABLE_DESCRIPTION
 {
     Text [ en-US ] = "Description:";
@@ -156,61 +171,67 @@ Menu RID_TABLEDESIGNROWPOPUPMENU
 {
     ItemList =
     {
-    MenuItem
-    {
-        ITEM_EDIT_CUT
-    };
-    MenuItem
-    {
-        ITEM_EDIT_COPY
-    };
-    MenuItem
-    {
-        ITEM_EDIT_PASTE
-    };
-    MenuItem
-    {
-        ITEM_EDIT_DELETE
-    };
-    MenuItem
-    {
-        Identifier = SID_TABLEDESIGN_INSERTROWS ;
-        HelpID = SID_TABLEDESIGN_INSERTROWS ;
-        Text [ en-US ] = "Insert Rows" ;
+        MenuItem
+        {
+            ITEM_EDIT_CUT
         };
-    MenuItem
-    {
-        Separator = TRUE ;
-    };
-    MenuItem
-    {
-        Identifier = SID_TABLEDESIGN_TABED_PRIMARYKEY ;
-        HelpID = SID_TABLEDESIGN_TABED_PRIMARYKEY ;
-        Checkable = TRUE ;
-        Text [ en-US ] = "Primary Key" ;
+        MenuItem
+        {
+            ITEM_EDIT_COPY
+        };
+        MenuItem
+        {
+            ITEM_EDIT_PASTE
+        };
+        MenuItem
+        {
+            ITEM_EDIT_DELETE
+        };
+        MenuItem
+        {
+            Identifier = SID_TABLEDESIGN_INSERTROWS ;
+            HelpID = SID_TABLEDESIGN_INSERTROWS ;
+            Text [ en-US ] = "Insert Rows" ;
+        };
+        MenuItem
+        {
+            Separator = TRUE ;
+        };
+        MenuItem
+        {
+            Identifier = SID_TABLEDESIGN_TABED_PRIMARYKEY ;
+            HelpID = SID_TABLEDESIGN_TABED_PRIMARYKEY ;
+            Checkable = TRUE ;
+            Text [ en-US ] = "Primary Key" ;
         };
     };
 };
+
 String STR_TABED_UNDO_CELLMODIFIED
 {
     Text [ en-US ] = "Modify cell" ;
 };
+
 String STR_TABED_UNDO_ROWDELETED
 {
     Text [ en-US ] = "Delete row" ;
 };
+
 String STR_TABED_UNDO_TYPE_CHANGED
 {
     Text [ en-US ] = "Modify field type";
 };
+
 String STR_TABED_UNDO_ROWINSERTED
 {
     Text [ en-US ] = "Insert row" ;
 };
+
 String STR_TABED_UNDO_NEWROWINSERTED
 {
     Text [ en-US ] = "Insert new row" ;
 };
+
 String STR_TABED_UNDO_PRIMKEY
 {
     Text [ en-US ] = "Insert/remove primary key" ;
@@ -220,114 +241,141 @@ String STR_DEFAULT_VALUE
 {
     Text [ en-US ] = "~Default value" ;
 };
+
 String STR_FIELD_REQUIRED
 {
     Text [ en-US ] = "~Entry required" ;
 };
+
 String STR_TEXT_LENGTH
 {
     Text [ en-US ] = "~Length" ;
 };
+
 String STR_NUMERIC_TYPE
 {
     Text [ en-US ] = "~Type" ;
 };
+
 String STR_LENGTH
 {
     Text [ en-US ] = "~Length" ;
 };
+
 String STR_SCALE
 {
     Text [ en-US ] = "Decimal ~places" ;
 };
+
 String STR_FORMAT
 {
     Text [ en-US ] = "Format example";
 };
+
 String STR_HELP_BOOL_DEFAULT
 {
     Text [ en-US ] = "Select a value that is to appear in all new records as default.\nIf the field is not to have a default value, select the empty string.";
 };
+
 String STR_HELP_DEFAULT_VALUE
 {
     Text [ en-US ] = "Enter a default value for this field.\n\nWhen you later enter data in the table, this string will be used in each new record for the field selected. It should, therefore, correspond to the cell format that needs to be entered below." ;
 };
+
 String STR_HELP_FIELD_REQUIRED
 {
     Text [ en-US ] = "Activate this option if this field cannot contain NULL values, i.e. the user must always enter data." ;
 };
+
 String STR_HELP_TEXT_LENGTH
 {
     Text [ en-US ] = "Enter the maximum text length permitted." ;
 };
+
 String STR_HELP_NUMERIC_TYPE
 {
     Text [ en-US ] = "Enter the number format." ;
 };
+
 String STR_HELP_LENGTH
 {
     Text [ en-US ] = "Determine the length data can have in this field.\n\nIf decimal fields, then the maximum length of the number to be entered, if binary fields, then the length of the data block.\nThe value will be corrected accordingly when it exceeds the maximum for this database." ;
 };
+
 String STR_HELP_SCALE
 {
     Text [ en-US ] = "Specify the number of decimal places permitted in this field." ;
 };
+
 String STR_HELP_FORMAT_CODE
 {
     Text [ en-US ] = "This is where you see how the data would be displayed in the current format (use the button on the right to modify the format).";
 };
+
 String STR_HELP_FORMAT_BUTTON
 {
     Text [ en-US ] = "This is where you determine the output format of the data.";
 };
+
 String STR_HELP_AUTOINCREMENT
 {
     Text [ en-US ] = "Choose if this field should contain AutoIncrement values.\n\nYou can not enter data in fields of this type. An intrinsic value will be assigned to each new record automatically (resulting from the increment of the previous record)." ;
 };
+
 PushButton PB_FORMAT
 {
     TabStop = TRUE ;
     Text [ en-US ] = "~...";
 };
+
 String STR_TABLEDESIGN_DUPLICATE_NAME
 {
     Text [ en-US ] = "The table cannot be saved because column name \"$column$\" was assigned twice.";
 };
+
 String STR_TBL_COLUMN_IS_KEYCOLUMN
 {
     Text [ en-US ] = "The column \"$column$\" belongs to the primary key. If the column is deleted, the primary key will also be deleted. Do you really want to continue?";
 };
+
 String STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE
 {
     Text [ en-US ] = "Primary Key Affected";
 };
+
 String STR_COLUMN_NAME
 {
     Text [ en-US ] = "Column";
 };
+
 String STR_QRY_CONTINUE
 {
     Text [ en-US ] = "Continue anyway?" ;
 };
+
 String STR_STAT_WARNING
 {
     Text [ en-US ] = "Warning!" ;
 };
+
 QueryBox TABLE_DESIGN_SAVEMODIFIED
 {
     Buttons = WB_YES_NO_CANCEL ;
     DefButton = WB_DEF_YES ;
     Message [ en-US ] = "The table has been changed.\nDo you want to save the changes?" ;
 };
+
 QueryBox TABLE_QUERY_CONNECTION_LOST
 {
     Buttons = WB_YES_NO ;
     Message [ en-US ] = "The connection to the database was lost! The table design can only be used with limited functionality without a connection.\nReconnect?" ;
 };
+
 String STR_TABLEDESIGN_CONNECTION_MISSING
 {
     Text [ en-US ] = "The table could not be saved due to problems connecting to the database.";
 };
+
 String STR_TABLEDESIGN_DATASOURCE_DELETED
 {
     Text [ en-US ] = "The table filter could not be adjusted because the data source has been deleted.";
@@ -339,14 +387,18 @@ QueryBox QUERY_SAVE_TABLE_EDIT_INDEXES
 
     Buttons = WB_YES_NO ;
 };
+
 String STR_TABLEDESIGN_NO_PRIM_KEY_HEAD
 {
     Text [ en-US ] = "No primary key" ;
 };
+
 String STR_TABLEDESIGN_NO_PRIM_KEY
 {
     Text [ en-US ] = "A unique index or primary key is required for data record identification in this database.\nYou can only enter data into this table when one of these two structural conditions has been met.\n\nShould a primary key be created now?" ;
 };
+
+
 String STR_TABLEDESIGN_TITLE
 {
     Text [ en-US ] = " - %PRODUCTNAME Base: Table Design";
@@ -382,6 +434,7 @@ String STR_AUTOINCREMENT_VALUE
 {
     Text [ en-US ] = "A~uto-increment statement";
 };
+
 String STR_HELP_AUTOINCREMENT_VALUE
 {
     Text [ en-US ] = "Enter an SQL statement for the auto-increment field.\n\nThis statement will be directly transferred to the database when the table is created.";
diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx
index 6957f4c8e300..ec48a29409a0 100644
--- a/dbaccess/source/ui/uno/ColumnModel.cxx
+++ b/dbaccess/source/ui/uno/ColumnModel.cxx
@@ -105,8 +105,6 @@ void OColumnControlModel::registerProperties()
         &m_xConnection, ::getCppuType( &m_xConnection ) );
     Any a;
     a <<= m_xColumn;
-//  registerMayBeVoidProperty( PROPERTY_COLUMN, PROPERTY_ID_COLUMN, PropertyAttribute::TRANSIENT | PropertyAttribute::BOUND| PropertyAttribute::MAYBEVOID,
-//          &a, ::getCppuType( &m_xColumn ) );
     registerProperty( PROPERTY_COLUMN, PROPERTY_ID_COLUMN, PropertyAttribute::TRANSIENT | PropertyAttribute::BOUND,
             &m_xColumn, ::getCppuType( &m_xColumn ) );
 
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index 65315cd0e738..2091f941838d 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -1502,7 +1502,7 @@ void CopyTableWizard::impl_doCopy_nothrow()
             sColumns.append(aDestColumnNames[aPosIter->second - 1]);
             sColumns.append(sQuote);
         }
-    } // for ( ; aPosIter != aColumnMapping.end() ; ++aPosIter )
+    }
     ::rtl::OUStringBuffer sSql;
     sSql.appendAscii("INSERT INTO ");
     const ::rtl::OUString sComposedTableName = ::dbtools::composeTableName( xDestMetaData, _xTable, ::dbtools::eInDataManipulation, false, false, true );
diff --git a/dbaccess/source/ui/uno/copytablewizard.src b/dbaccess/source/ui/uno/copytablewizard.src
index fc6d00804607..a0dd16eabf4e 100644
--- a/dbaccess/source/ui/uno/copytablewizard.src
+++ b/dbaccess/source/ui/uno/copytablewizard.src
@@ -66,14 +66,17 @@ String STR_CTW_ERROR_DURING_INITIALIZATION
 {
     Text [ en-US ] = "An error occurred during initialization.";
 };
+
 String STR_CTW_ERROR_UNSUPPORTED_SETTING
 {
     Text [ en-US ] = "Unsupported setting in the copy source descriptor: $name$.";
 };
+
 String STR_CTW_ERROR_NO_QUERY
 {
     Text [ en-US ] = "To copy a query, your connection must be able to provide queries.";
 };
+
 String STR_CTW_ERROR_INVALID_INTERACTIONHANDLER
 {
     Text [ en-US ] = "The given interaction handler is invalid.";
diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx
index 1396cbcf6495..978468a8acd5 100644
--- a/dbaccess/source/ui/uno/unosqlmessage.cxx
+++ b/dbaccess/source/ui/uno/unosqlmessage.cxx
@@ -89,7 +89,7 @@ Reference< XInterface > SAL_CALL OSQLMessageDialog::Create(const Reference< XMul
 //-------------------------------------------------------------------------
 ::rtl::OUString OSQLMessageDialog::getImplementationName_Static() throw(RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.OSQLMessageDialog");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OSQLMessageDialog"));
 }
 
 //-------------------------------------------------------------------------
@@ -102,7 +102,7 @@ Reference< XInterface > SAL_CALL OSQLMessageDialog::Create(const Reference< XMul
 ::comphelper::StringSequence OSQLMessageDialog::getSupportedServiceNames_Static() throw(RuntimeException)
 {
     ::comphelper::StringSequence aSupported(1);
-    aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.ErrorMessageDialog");
+    aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ErrorMessageDialog"));
     return aSupported;
 }
 
diff --git a/dbaccess/uiconfig/dbapp/menubar/menubar.xml b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
index e2f32ad8eb21..a76fda58c575 100644
--- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
@@ -135,6 +135,7 @@
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:ShowLicense"/>
             <menu:menuseparator/>
+            <menu:menuitem menu:id=".uno:ShowCredits"/>
             <menu:menuitem menu:id=".uno:About"/>
         </menu:menupopup>
     </menu:menu>
diff --git a/dbaccess/uiconfig/dbquery/menubar/menubar.xml b/dbaccess/uiconfig/dbquery/menubar/menubar.xml
index 091b5affc073..2d6ec8d05abc 100644
--- a/dbaccess/uiconfig/dbquery/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbquery/menubar/menubar.xml
@@ -76,6 +76,7 @@
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:ShowLicense"/>
             <menu:menuseparator/>
+            <menu:menuitem menu:id=".uno:ShowCredits"/>
             <menu:menuitem menu:id=".uno:About"/>
         </menu:menupopup>
     </menu:menu>
diff --git a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
index 767099a76936..b7460a447e54 100644
--- a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
@@ -59,6 +59,7 @@
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:ShowLicense"/>
             <menu:menuseparator/>
+            <menu:menuitem menu:id=".uno:ShowCredits"/>
             <menu:menuitem menu:id=".uno:About"/>
         </menu:menupopup>
     </menu:menu>
diff --git a/dbaccess/uiconfig/dbtable/menubar/menubar.xml b/dbaccess/uiconfig/dbtable/menubar/menubar.xml
index 0ec51965a0ab..ede5eed2c224 100644
--- a/dbaccess/uiconfig/dbtable/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbtable/menubar/menubar.xml
@@ -60,6 +60,7 @@
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:ShowLicense"/>
             <menu:menuseparator/>
+            <menu:menuitem menu:id=".uno:ShowCredits"/>
             <menu:menuitem menu:id=".uno:About"/>
         </menu:menupopup>
     </menu:menu>
diff --git a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
index 1a7cc0095828..d1beb43c743f 100644
--- a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
@@ -69,6 +69,7 @@
             <menu:menuitem menu:id=".uno:ShowLicense"/>
             <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
             <menu:menuseparator/>
+            <menu:menuitem menu:id=".uno:ShowCredits"/>
             <menu:menuitem menu:id=".uno:About"/>
         </menu:menupopup>
     </menu:menu>
diff --git a/default_images/brand/shell/backing_hc-pt_BR.png b/default_images/brand/shell/backing_hc-pt_BR.png
deleted file mode 100644
index c023ea7759f8..000000000000
--- a/default_images/brand/shell/backing_hc-pt_BR.png
+++ /dev/null
diff --git a/default_images/brand/shell/backing_hc.png b/default_images/brand/shell/backing_hc.png
deleted file mode 100644
index b975b84ac34a..000000000000
--- a/default_images/brand/shell/backing_hc.png
+++ /dev/null
diff --git a/default_images/brand/shell/backing_right_hc-pt_BR.png b/default_images/brand/shell/backing_right_hc-pt_BR.png
deleted file mode 100644
index e16bf9637f87..000000000000
--- a/default_images/brand/shell/backing_right_hc-pt_BR.png
+++ /dev/null
diff --git a/default_images/brand/shell/backing_right_hc.png b/default_images/brand/shell/backing_right_hc.png
deleted file mode 100644
index e16bf9637f87..000000000000
--- a/default_images/brand/shell/backing_right_hc.png
+++ /dev/null
diff --git a/default_images/brand/shell/backing_rtl_left_hc.png b/default_images/brand/shell/backing_rtl_left_hc.png
deleted file mode 100644
index b975b84ac34a..000000000000
--- a/default_images/brand/shell/backing_rtl_left_hc.png
+++ /dev/null
diff --git a/default_images/brand/shell/backing_rtl_right_hc.png b/default_images/brand/shell/backing_rtl_right_hc.png
deleted file mode 100644
index e16bf9637f87..000000000000
--- a/default_images/brand/shell/backing_rtl_right_hc.png
+++ /dev/null
diff --git a/default_images/brand/shell/backing_space_hc.png b/default_images/brand/shell/backing_space_hc.png
deleted file mode 100644
index c81dcc3df7cb..000000000000
--- a/default_images/brand/shell/backing_space_hc.png
+++ /dev/null
diff --git a/default_images/dbaccess/res/sxh03187.png b/default_images/dbaccess/res/sxh03187.png
deleted file mode 100644
index 728327d92696..000000000000
--- a/default_images/dbaccess/res/sxh03187.png
+++ /dev/null
diff --git a/default_images/dbaccess/res/sxh16670.png b/default_images/dbaccess/res/sxh16670.png
deleted file mode 100644
index d0bb80e93687..000000000000
--- a/default_images/dbaccess/res/sxh16670.png
+++ /dev/null
diff --git a/default_images/framework/res/backing_hc.png b/default_images/framework/res/backing_hc.png
deleted file mode 100644
index 0cbe207830ee..000000000000
--- a/default_images/framework/res/backing_hc.png
+++ /dev/null
diff --git a/default_images/framework/res/backing_right_hc.png b/default_images/framework/res/backing_right_hc.png
deleted file mode 100644
index ba0483c2a8cc..000000000000
--- a/default_images/framework/res/backing_right_hc.png
+++ /dev/null
diff --git a/default_images/framework/res/backing_rtl_left_hc.png b/default_images/framework/res/backing_rtl_left_hc.png
deleted file mode 100644
index c7b28576c3b1..000000000000
--- a/default_images/framework/res/backing_rtl_left_hc.png
+++ /dev/null
diff --git a/default_images/framework/res/backing_rtl_right_hc.png b/default_images/framework/res/backing_rtl_right_hc.png
deleted file mode 100644
index d18927157780..000000000000
--- a/default_images/framework/res/backing_rtl_right_hc.png
+++ /dev/null
diff --git a/default_images/framework/res/backing_space_hc.png b/default_images/framework/res/backing_space_hc.png
deleted file mode 100644
index 1e6b6464936c..000000000000
--- a/default_images/framework/res/backing_space_hc.png
+++ /dev/null
diff --git a/default_images/introabout/about.bmp b/default_images/introabout/about.bmp
deleted file mode 100644
index 35b5bdf2a4f9..000000000000
--- a/default_images/introabout/about.bmp
+++ /dev/null
diff --git a/default_images/introabout/about.png b/default_images/introabout/about.png
deleted file mode 100755
index 315221594da0..000000000000
--- a/default_images/introabout/about.png
+++ /dev/null
diff --git a/default_images/introabout/intro.bmp b/default_images/introabout/intro.bmp
deleted file mode 100644
index c83b6916a42a..000000000000
--- a/default_images/introabout/intro.bmp
+++ /dev/null
diff --git a/default_images/introabout/intro.png b/default_images/introabout/intro.png
deleted file mode 100755
index 26be4214e9b1..000000000000
--- a/default_images/introabout/intro.png
+++ /dev/null
diff --git a/default_images/res/missing_icon.png b/default_images/res/missing_icon.png
new file mode 100644
index 000000000000..2438714af8a6
--- /dev/null
+++ b/default_images/res/missing_icon.png
diff --git a/default_images/res/odb_32_hc.png b/default_images/res/odb_32_hc.png
deleted file mode 100644
index 3877231f0df2..000000000000
--- a/default_images/res/odb_32_hc.png
+++ /dev/null
diff --git a/default_images/res/odf_32_hc.png b/default_images/res/odf_32_hc.png
deleted file mode 100644
index 54e97b0ea56e..000000000000
--- a/default_images/res/odf_32_hc.png
+++ /dev/null
diff --git a/default_images/res/odg_32_hc.png b/default_images/res/odg_32_hc.png
deleted file mode 100644
index 2679e6e07e23..000000000000
--- a/default_images/res/odg_32_hc.png
+++ /dev/null
diff --git a/default_images/res/odp_32_hc.png b/default_images/res/odp_32_hc.png
deleted file mode 100644
index e7d63630d207..000000000000
--- a/default_images/res/odp_32_hc.png
+++ /dev/null
diff --git a/default_images/res/ods_32_hc.png b/default_images/res/ods_32_hc.png
deleted file mode 100644
index 0a3e2b848fb3..000000000000
--- a/default_images/res/ods_32_hc.png
+++ /dev/null
diff --git a/default_images/res/odt_32_hc.png b/default_images/res/odt_32_hc.png
deleted file mode 100644
index 294314778c07..000000000000
--- a/default_images/res/odt_32_hc.png
+++ /dev/null
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index a10bb11266ef..8ef83095cf1e 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -155,6 +155,7 @@ class Desktop : public Application
         sal_Bool                InitializeInstallation( const rtl::OUString& rAppFilename );
         sal_Bool                InitializeConfiguration();
         void                    FlushConfiguration();
+        static sal_Bool         shouldLaunchQuickstart();
         sal_Bool                InitializeQuickstartMode( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rSMgr );
 
         void                    HandleBootstrapPathErrors( ::utl::Bootstrap::Status, const ::rtl::OUString& aMsg );
diff --git a/desktop/inc/deployment.hrc b/desktop/inc/deployment.hrc
index 370996c710ae..22492cd8ae88 100644
--- a/desktop/inc/deployment.hrc
+++ b/desktop/inc/deployment.hrc
@@ -40,27 +40,19 @@
 
 #define RID_DEPLOYMENT_BUNDLE_START          (RID_DEPLOYMENT_START+2000)
 #define RID_IMG_DEF_PACKAGE_BUNDLE           RID_DEPLOYMENT_BUNDLE_START
-#define RID_IMG_DEF_PACKAGE_BUNDLE_HC        (RID_DEPLOYMENT_BUNDLE_START+1)
 
 #define RID_DEPLOYMENT_SCRIPT_START          (RID_DEPLOYMENT_START+2500)
 #define RID_IMG_SCRIPTLIB                    RID_DEPLOYMENT_SCRIPT_START
-#define RID_IMG_SCRIPTLIB_HC                 (RID_DEPLOYMENT_SCRIPT_START+1)
 #define RID_IMG_DIALOGLIB                    (RID_DEPLOYMENT_SCRIPT_START+2)
-#define RID_IMG_DIALOGLIB_HC                 (RID_DEPLOYMENT_SCRIPT_START+3)
 
 #define RID_DEPLOYMENT_CONF_START            (RID_DEPLOYMENT_START+3000)
 #define RID_IMG_CONF_XML                     RID_DEPLOYMENT_CONF_START
-#define RID_IMG_CONF_XML_HC                  (RID_DEPLOYMENT_CONF_START+1)
 
 #define RID_DEPLOYMENT_COMPONENT_START       (RID_DEPLOYMENT_START+3500)
 #define RID_IMG_COMPONENT                    RID_DEPLOYMENT_COMPONENT_START
-#define RID_IMG_COMPONENT_HC                 (RID_DEPLOYMENT_COMPONENT_START+1)
 #define RID_IMG_JAVA_COMPONENT               (RID_DEPLOYMENT_COMPONENT_START+2)
-#define RID_IMG_JAVA_COMPONENT_HC            (RID_DEPLOYMENT_COMPONENT_START+3)
 #define RID_IMG_TYPELIB                      (RID_DEPLOYMENT_COMPONENT_START+4)
-#define RID_IMG_TYPELIB_HC                   (RID_DEPLOYMENT_COMPONENT_START+5)
 #define RID_IMG_JAVA_TYPELIB                 (RID_DEPLOYMENT_COMPONENT_START+6)
-#define RID_IMG_JAVA_TYPELIB_HC              (RID_DEPLOYMENT_COMPONENT_START+7)
 
 #define RID_DEPLOYMENT_UNOPKG_START          (RID_DEPLOYMENT_START+4000)
 #define RID_STR_UNOPKG_ACCEPT_LIC_1          (RID_DEPLOYMENT_UNOPKG_START+1)
@@ -83,5 +75,4 @@
 
 #define RID_DEPLOYMENT_HELP_START           (RID_DEPLOYMENT_START+5000)
 #define RID_IMG_HELP                        RID_DEPLOYMENT_HELP_START
-#define RID_IMG_HELP_HC                     (RID_DEPLOYMENT_HELP_START+1)
 #endif
diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst
index 162c43b38f15..90f96d0176a6 100644
--- a/desktop/prj/build.lst
+++ b/desktop/prj/build.lst
@@ -1,4 +1,4 @@
-dt      desktop :    l10n sfx2 stoc BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp sal unoil officecfg offuh NULL
+dt      desktop :    l10n sfx2 stoc BERKELEYDB:berkeleydb sysui BOOST:boost svx xmlhelp sal unoil officecfg offuh NULL
 dt	desktop									usr1	-	all	dt_mkout NULL
 dt	desktop\inc								nmake	-	all	dt_inc NULL
 dt	desktop\prj								get		-	all	dt_prj NULL
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 006f28d5250d..80264e6f446a 100644
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -60,7 +60,35 @@ if [ -e ooenv ] ; then
     . ./ooenv
 fi
 
-sd_binary=`basename "$0"`.bin
+sd_binary=`basename "$0" | sed 's/libreoffice/soffice/g'`.bin
+
+# this is a temporary hack until we can live with the default search paths
+case "`uname -s`" in
+OpenBSD)
+    sd_prog1="$sd_prog/../basis-link/program"
+    sd_prog2="$sd_prog/../basis-link/ure-link/lib"
+    LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
+    JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
+    export LD_LIBRARY_PATH
+    if [ -n "${JAVA_HOME}" ]; then
+        export JAVA_HOME
+    fi
+    ;;
+esac
+
+# this is a temporary hack until we can live with the default search paths
+case "`uname -s`" in
+OpenBSD)
+    sd_prog1="$sd_prog/../basis-link/program"
+    sd_prog2="$sd_prog/../basis-link/ure-link/lib"
+    LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
+    JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
+    export LD_LIBRARY_PATH
+    if [ -n "${JAVA_HOME}" ]; then
+        export JAVA_HOME
+    fi
+    ;;
+esac
 
 #collect all bootstrap variables specified on the command line
 #so that they can be passed as arguments to javaldx later on
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh
index 7a8901525357..c629f65587a8 100644
--- a/desktop/scripts/unopkg.sh
+++ b/desktop/scripts/unopkg.sh
@@ -43,6 +43,20 @@ fi
 sd_prog=`pwd`
 cd "$sd_cwd"
 
+# this is a temporary hack until we can live with the default search paths
+case "`uname -s`" in
+OpenBSD)
+    sd_prog1="$sd_prog/../basis-link/program"
+    sd_prog2="$sd_prog/../basis-link/ure-link/lib"
+    LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
+    JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
+    export LD_LIBRARY_PATH
+    if [ -n "${JAVA_HOME}" ]; then
+        export JAVA_HOME
+    fi
+    ;;
+esac
+
 #collect all bootstrap variables specified on the command line
 #so that they can be passed as arguments to javaldx later on
 for arg in $@
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 9dd988ba4d49..7428422a4d65 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -140,6 +140,9 @@
 #include <vcl/stdtext.hxx>
 #include <vcl/msgbox.hxx>
 #include <sfx2/sfx.hrc>
+#include <sfx2/app.hxx>
+#include <svl/itemset.hxx>
+#include <svl/eitem.hxx>
 #include <ucbhelper/contentbroker.hxx>
 #include <unotools/bootstrap.hxx>
 #include <cppuhelper/bootstrap.hxx>
@@ -1831,8 +1834,8 @@ void Desktop::Main()
     catch ( ... )
     {
         FatalError( MakeStartupErrorMessage(
-            OUString::createFromAscii(
-            "Unknown error during startup (Office wrapper service).\nInstallation could be damaged.")));
+            OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "Unknown error during startup (Office wrapper service).\nInstallation could be damaged."))));
         return;
     }
     */
@@ -1883,8 +1886,8 @@ void Desktop::Main()
         catch ( ... )
         {
             FatalError( MakeStartupErrorMessage(
-                OUString::createFromAscii(
-                "Unknown error during startup (TD/Desktop service).\nInstallation could be damaged.")));
+                OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "Unknown error during startup (TD/Desktop service).\nInstallation could be damaged."))));
             return;
         }
         */
@@ -2071,6 +2074,22 @@ void Desktop::FlushConfiguration()
     }
 }
 
+sal_Bool Desktop::shouldLaunchQuickstart()
+{
+    sal_Bool bQuickstart = GetCommandLineArgs()->IsQuickstart();
+    if (!bQuickstart)
+    {
+        const SfxPoolItem* pItem=0;
+        SfxItemSet aQLSet(SFX_APP()->GetPool(), SID_ATTR_QUICKLAUNCHER, SID_ATTR_QUICKLAUNCHER);
+        SFX_APP()->GetOptions(aQLSet);
+        SfxItemState eState = aQLSet.GetItemState(SID_ATTR_QUICKLAUNCHER, FALSE, &pItem);
+        if (SFX_ITEM_SET == eState)
+            bQuickstart = ((SfxBoolItem*)pItem)->GetValue();
+    }
+    return bQuickstart;
+}
+
+
 sal_Bool Desktop::InitializeQuickstartMode( Reference< XMultiServiceFactory >& rSMgr )
 {
     try
@@ -2080,9 +2099,7 @@ sal_Bool Desktop::InitializeQuickstartMode( Reference< XMultiServiceFactory >& r
         // this will only be activated if -quickstart was specified on cmdline
         RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) createInstance com.sun.star.office.Quickstart" );
 
-        sal_Bool bQuickstart = GetCommandLineArgs()->IsQuickstart();
-        Sequence< Any > aSeq( 1 );
-        aSeq[0] <<= bQuickstart;
+        sal_Bool bQuickstart = shouldLaunchQuickstart();
 
         // Try to instanciate quickstart service. This service is not mandatory, so
         // do nothing if service is not available
@@ -2095,6 +2112,8 @@ sal_Bool Desktop::InitializeQuickstartMode( Reference< XMultiServiceFactory >& r
         if ( bQuickstart )
         #endif
         {
+            Sequence< Any > aSeq( 1 );
+            aSeq[0] <<= bQuickstart;
             Reference < XComponent > xQuickstart( rSMgr->createInstanceWithArguments(
                                                 DEFINE_CONST_UNICODE( "com.sun.star.office.Quickstart" ), aSeq ),
                                                 UNO_QUERY );
@@ -2700,9 +2719,9 @@ void Desktop::OpenClients()
      /*
         ::comphelper::ConfigurationHelper::writeDirectKey(
                 ::comphelper::getProcessServiceFactory(),
-                ::rtl::OUString::createFromAscii("org.openoffice.Office.Recovery"),
-                ::rtl::OUString::createFromAscii("AutoSave"),
-                ::rtl::OUString::createFromAscii("Enabled"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Recovery")),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoSave")),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Enabled")),
                 ::com::sun::star::uno::makeAny(sal_False),
                 ::comphelper::ConfigurationHelper::E_STANDARD);
 
diff --git a/desktop/source/app/appfirststart.cxx b/desktop/source/app/appfirststart.cxx
index 321110a64343..5517405e403f 100644
--- a/desktop/source/app/appfirststart.cxx
+++ b/desktop/source/app/appfirststart.cxx
@@ -81,11 +81,11 @@ OUString Desktop::GetLicensePath()
     aLangString = aLocale.Language;
     if ( aLocale.Country.getLength() != 0 )
     {
-        aLangString += OUString::createFromAscii("-");
+        aLangString += OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
         aLangString += aLocale.Country;
         if ( aLocale.Variant.getLength() != 0 )
         {
-            aLangString += OUString::createFromAscii("-");
+            aLangString += OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
             aLangString += aLocale.Variant;
         }
     }
@@ -93,14 +93,14 @@ OUString Desktop::GetLicensePath()
     aLicensePath =
         aBaseInstallPath + OUString::createFromAscii(szLicensePath)
         + OUString::createFromAscii(szWNTLicenseName)
-        + OUString::createFromAscii("_")
+        + OUString(RTL_CONSTASCII_USTRINGPARAM("_"))
         + aLangString
         + OUString::createFromAscii(szWNTLicenseExt);
 #else
     aLicensePath =
         aBaseInstallPath + OUString::createFromAscii(szLicensePath)
         + OUString::createFromAscii(szUNXLicenseName)
-        + OUString::createFromAscii("_")
+        + OUString(RTL_CONSTASCII_USTRINGPARAM("_"))
         + aLangString
         + OUString::createFromAscii(szUNXLicenseExt);
 #endif
@@ -153,7 +153,7 @@ static sal_Bool impl_isFirstStart()
     try {
         Reference< XPropertySet > xPSet = impl_getConfigurationAccess( OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Setup/Office" ) ) );
 
-        Any result = xPSet->getPropertyValue(OUString::createFromAscii("FirstStartWizardCompleted"));
+        Any result = xPSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("FirstStartWizardCompleted")));
         sal_Bool bCompleted = sal_False;
         if ((result >>= bCompleted) && bCompleted)
             return sal_False;  // wizard was already completed
@@ -188,10 +188,10 @@ static sal_Bool impl_parseDateTime(const OUString& aString, DateTime& aDateTime)
     sal_Int32 nDateLength = 10;
     sal_Int32 nTimeLength = 8;
 
-    OUString aDateTimeSep = OUString::createFromAscii("T");
-    OUString aDateSep = OUString::createFromAscii("-");
-    OUString aTimeSep = OUString::createFromAscii(":");
-    OUString aUTCString = OUString::createFromAscii("Z");
+    OUString aDateTimeSep(RTL_CONSTASCII_USTRINGPARAM("T"));
+    OUString aDateSep(RTL_CONSTASCII_USTRINGPARAM("-"));
+    OUString aTimeSep(RTL_CONSTASCII_USTRINGPARAM(":"));
+    OUString aUTCString(RTL_CONSTASCII_USTRINGPARAM("Z"));
 
     OUString aDateString = aDateTimeString.copy(0, nDateLength);
     OUString aTimeString = aDateTimeString.copy(nDateLength+1, nTimeLength);
@@ -229,7 +229,7 @@ static sal_Bool impl_isLicenseAccepted()
     {
         Reference< XPropertySet > xPSet = impl_getConfigurationAccess( OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Setup/Office" ) ) );
 
-        Any result = xPSet->getPropertyValue(OUString::createFromAscii("LicenseAcceptDate"));
+        Any result = xPSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LicenseAcceptDate")));
 
         OUString aAcceptDate;
         if (result >>= aAcceptDate)
@@ -285,9 +285,9 @@ void Desktop::DoRestartActionsIfNecessary( sal_Bool bQuickStart )
                 xPSet->setPropertyValue( sPropName, makeAny( sal_False ) );
                 Reference< util::XChangesBatch >( xPSet, UNO_QUERY_THROW )->commitChanges();
 
-                Sequence< Any > aSeq( 2 );
-                aSeq[0] <<= sal_True;
-                aSeq[1] <<= sal_True;
+                Sequence< Any > aSeq( 1 );
+                sal_Bool bQuickstart = shouldLaunchQuickstart();
+                aSeq[0] <<= bQuickstart;
 
                 Reference < XInitialization > xQuickstart( ::comphelper::getProcessServiceFactory()->createInstance(
                     OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.office.Quickstart" ) ) ),UNO_QUERY_THROW );
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 82ae6571d953..09a13d938405 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -118,14 +118,13 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect)
 
     Sequence< Any > aArgs(6);
     aArgs[0]
-        <<= rtl::OUString::createFromAscii(bServer ?
-                                               UCB_CONFIGURATION_KEY1_SERVER :
-                                               UCB_CONFIGURATION_KEY1_LOCAL);
+        <<= bServer ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UCB_CONFIGURATION_KEY1_SERVER)) :
+                      rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UCB_CONFIGURATION_KEY1_LOCAL));
     aArgs[1]
-        <<= rtl::OUString::createFromAscii(UCB_CONFIGURATION_KEY2_OFFICE);
-    aArgs[2] <<= rtl::OUString::createFromAscii("PIPE");
+        <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UCB_CONFIGURATION_KEY2_OFFICE));
+    aArgs[2] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PIPE"));
     aArgs[3] <<= aPipe;
-    aArgs[4] <<= rtl::OUString::createFromAscii("PORTAL");
+    aArgs[4] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PORTAL"));
     aArgs[5] <<= aPortal.makeStringAndClear();
 
     bool ret =
@@ -161,13 +160,13 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect)
                     {
                         Reference<XContentProvider> xCP(
                             xServiceFactory->createInstance(
-                                rtl::OUString::createFromAscii(
-                                    "com.sun.star.ucb.GnomeVFSContentProvider")),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "com.sun.star.ucb.GnomeVFSContentProvider"))),
                             UNO_QUERY);
                         if(xCP.is())
                             xCPM->registerContentProvider(
                                 xCP,
-                                rtl::OUString::createFromAscii(".*"),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".*")),
                                 false);
                     } catch (...)
                     {
@@ -278,7 +277,7 @@ void Desktop::RegisterServices( Reference< XMultiServiceFactory >& xSMgr )
         if ( !configureUcb( bServer, aPortalConnect ) )
         {
             DBG_ERROR( "Can't configure UCB" );
-            throw com::sun::star::uno::Exception(rtl::OUString::createFromAscii("RegisterServices, configureUcb"), NULL);
+            throw com::sun::star::uno::Exception(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RegisterServices, configureUcb")), NULL);
         }
 
         CreateTemporaryDirectory();
@@ -306,7 +305,7 @@ void Desktop::createAcceptor(const OUString& aAcceptString)
         aSeq[1] <<= bAccept;
         Reference<XInitialization> rAcceptor(
             ::comphelper::getProcessServiceFactory()->createInstance(
-            OUString::createFromAscii( "com.sun.star.office.Acceptor" )), UNO_QUERY );
+            OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.office.Acceptor" ))), UNO_QUERY );
         if ( rAcceptor.is() ) {
             try{
                 rAcceptor->initialize( aSeq );
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index b46508a9f3f5..20bad6f4504a 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -334,15 +334,15 @@ static void impl_setNeedsCompatCheck()
                 xFactory->createInstance(sConfigSrvc), UNO_QUERY_THROW);
 
         Sequence< Any > theArgs(1);
-        beans::NamedValue v( OUString::createFromAscii("NodePath"),
-                      makeAny( OUString::createFromAscii("org.openoffice.Setup/Office") ) );
+        beans::NamedValue v( OUString(RTL_CONSTASCII_USTRINGPARAM("NodePath")),
+                      makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/Office")) ) );
         theArgs[0] <<= v;
         Reference< beans::XPropertySet > pset = Reference< beans::XPropertySet >(
             theConfigProvider->createInstanceWithArguments( sAccessSrvc, theArgs ), UNO_QUERY_THROW );
 
-        Any value = makeAny( OUString::createFromAscii("never") );
+        Any value = makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("never")) );
 
-        pset->setPropertyValue( OUString::createFromAscii("LastCompatibilityCheckID"), value );
+        pset->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("LastCompatibilityCheckID")), value );
         Reference< util::XChangesBatch >( pset, UNO_QUERY_THROW )->commitChanges();
     }
     catch (const Exception&) {}
@@ -387,20 +387,20 @@ static bool impl_needsCompatCheck()
                 xFactory->createInstance(sConfigSrvc), UNO_QUERY_THROW);
 
         Sequence< Any > theArgs(1);
-        beans::NamedValue v( OUString::createFromAscii("NodePath"),
-                      makeAny( OUString::createFromAscii("org.openoffice.Setup/Office") ) );
+        beans::NamedValue v( OUString(RTL_CONSTASCII_USTRINGPARAM("NodePath")),
+                      makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/Office")) ) );
         theArgs[0] <<= v;
         Reference< beans::XPropertySet > pset = Reference< beans::XPropertySet >(
             theConfigProvider->createInstanceWithArguments( sAccessSrvc, theArgs ), UNO_QUERY_THROW );
 
-        Any result = pset->getPropertyValue( OUString::createFromAscii("LastCompatibilityCheckID") );
+        Any result = pset->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("LastCompatibilityCheckID")) );
 
         result >>= aLastCheckBuildID;
         if ( aLastCheckBuildID != aCurrentBuildID )
         {
             bNeedsCheck = true;
             result <<= aCurrentBuildID;
-            pset->setPropertyValue( OUString::createFromAscii("LastCompatibilityCheckID"), result );
+            pset->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("LastCompatibilityCheckID")), result );
             Reference< util::XChangesBatch >( pset, UNO_QUERY_THROW )->commitChanges();
         }
 #ifdef DEBUG
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 71e749510375..bb9599bf71c4 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -138,8 +138,8 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
 
     Reference< XExternalUriReferenceTranslator > xTranslator(
         xMS->createInstance(
-        OUString::createFromAscii(
-        "com.sun.star.uri.ExternalUriReferenceTranslator")),
+        OUString(RTL_CONSTASCII_USTRINGPARAM(
+        "com.sun.star.uri.ExternalUriReferenceTranslator"))),
         UNO_QUERY);
 
     // parse command line arguments
@@ -168,7 +168,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
             break;
         }
         // convert file URLs to internal form #112849#
-        if (aArg.indexOf(OUString::createFromAscii("file:"))==0 &&
+        if (aArg.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM("file:")))==0 &&
             xTranslator.is())
         {
             OUString tmp(xTranslator->translateToInternal(aArg));
@@ -982,8 +982,6 @@ sal_Bool CommandLineArgs::GetConversionOut( ::rtl::OUString& rPara ) const
     return m_aStrSetParams[ CMD_STRINGPARAM_CONVERSIONOUT ];
 }
 
-
-
 sal_Bool CommandLineArgs::IsEmpty() const
 {
     osl::MutexGuard  aMutexGuard( m_aMutex );
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index ae4a9f4bacd1..1ccfb42c2a2a 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -536,7 +536,7 @@ void LanguageSelection::resetUserLanguage()
     try
     {
         Reference< XPropertySet > xProp(getConfigAccess("org.openoffice.Office.Linguistic/General", sal_True), UNO_QUERY_THROW);
-        xProp->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("UILocale")), makeAny(OUString::createFromAscii("")));
+        xProp->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("UILocale")), makeAny(OUString()));
         Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges();
     }
     catch ( PropertyVetoException& )
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 065a665e2427..113732b5245d 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -979,13 +979,13 @@ static void AddConversionsToDispatchList(
 
     if( rParamOut.trim().getLength() )
     {
-        aParam += ::rtl::OUString::createFromAscii(";");
+        aParam += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
         aParam += aOutDir;
     }
     else
     {
         ::osl::FileBase::getSystemPathFromFileURL( aPWD, aPWD );
-        aParam += ::rtl::OUString::createFromAscii( ";" ) + aPWD;
+        aParam += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ";" )) + aPWD;
     }
 
     if ( rRequestList.getLength() > 0 )
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index f1afda0590d7..263c09e16a54 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -109,8 +109,8 @@ namespace desktop {
 
             Sequence< Any > theArgs(1);
             NamedValue v;
-            v.Name = OUString::createFromAscii("NodePath");
-            v.Value = makeAny(OUString::createFromAscii("org.openoffice.Setup"));
+            v.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("NodePath"));
+            v.Value = makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup")));
             theArgs[0] <<= v;
             Reference< XHierarchicalNameAccess> hnacc(
                 theConfigProvider->createInstanceWithArguments(
@@ -202,7 +202,7 @@ namespace desktop {
                     rtl::OUString itemname = aFileStatus.getFileName();
                     // append trailing '/' if needed
                     if (newDstUnqPath.lastIndexOf(sal_Unicode('/')) != newDstUnqPath.getLength()-1)
-                        newDstUnqPath += rtl::OUString::createFromAscii("/");
+                        newDstUnqPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
                     newDstUnqPath += itemname;
                     // recursion
                     err = copy_recursive(newSrcUnqPath, newDstUnqPath);
@@ -261,21 +261,21 @@ namespace desktop {
         }
         try
         {
-            OUString sConfigSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider");
-            OUString sAccessSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess");
+            OUString sConfigSrvc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"));
+            OUString sAccessSrvc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess"));
 
             // get configuration provider
             Reference< XMultiServiceFactory > theMSF = comphelper::getProcessServiceFactory();
             Reference< XMultiServiceFactory > theConfigProvider = Reference< XMultiServiceFactory >(
                 theMSF->createInstance(sConfigSrvc), UNO_QUERY_THROW);
             Sequence< Any > theArgs(1);
-            NamedValue v(OUString::createFromAscii("NodePath"), makeAny(OUString::createFromAscii("org.openoffice.Setup")));
-            //v.Name = OUString::createFromAscii("NodePath");
-            //v.Value = makeAny(OUString::createFromAscii("org.openoffice.Setup"));
+            NamedValue v(OUString(RTL_CONSTASCII_USTRINGPARAM("NodePath")), makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup"))));
+            //v.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("NodePath"));
+            //v.Value = makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup")));
             theArgs[0] <<= v;
             Reference< XHierarchicalPropertySet> hpset(
                 theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs), UNO_QUERY_THROW);
-            hpset->setHierarchicalPropertyValue(OUString::createFromAscii("Office/ooSetupInstCompleted"), makeAny(sal_True));
+            hpset->setHierarchicalPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Office/ooSetupInstCompleted")), makeAny(sal_True));
             Reference< XChangesBatch >(hpset, UNO_QUERY_THROW)->commitChanges();
         }
         catch ( PropertyVetoException& )
diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc
index 5f52b042edf3..d0ae3c468d9b 100755
--- a/desktop/source/deployment/gui/dp_gui.hrc
+++ b/desktop/source/deployment/gui/dp_gui.hrc
@@ -57,7 +57,6 @@
 #define FL_LICENSE                              69
 #define FI_LICENSE_ARROW1                       60
 #define FI_LICENSE_ARROW2                       61
-#define IMG_LICENCE_ARROW_HC                    62
 #define BTN_LICENSE_ACCEPT                      63
 
 // local RIDs for "Download and Install" dialog
@@ -94,28 +93,27 @@
 #define RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES        (RID_DEPLOYMENT_GUI_START + 8)
 #define RID_WARNINGBOX_INSTALL_EXTENSION                          (RID_DEPLOYMENT_GUI_START + 9)
 
-#define RID_DLG_UPDATE (RID_DEPLOYMENT_GUI_START + 10)
-
-#define RID_DLG_UPDATE_CHECKING 1
-#define RID_DLG_UPDATE_THROBBER 2
-#define RID_DLG_UPDATE_UPDATE 3
-#define RID_DLG_UPDATE_UPDATES 4
-#define RID_DLG_UPDATE_ALL 5
-#define RID_DLG_UPDATE_DESCRIPTION 6
-#define RID_DLG_UPDATE_DESCRIPTIONS 7
-#define RID_DLG_UPDATE_LINE 8
-#define RID_DLG_UPDATE_HELP 9
-#define RID_DLG_UPDATE_OK 10
-#define RID_DLG_UPDATE_CANCEL 11
-#define RID_DLG_UPDATE_NORMALALERT 12
-#define RID_DLG_UPDATE_HIGHCONTRASTALERT 13
-#define RID_DLG_UPDATE_ERROR 14
-#define RID_DLG_UPDATE_NONE 15
-#define RID_DLG_UPDATE_NOINSTALLABLE 16
-#define RID_DLG_UPDATE_FAILURE 17
-#define RID_DLG_UPDATE_UNKNOWNERROR 18
-#define RID_DLG_UPDATE_NODESCRIPTION 19
-#define RID_DLG_UPDATE_NOINSTALL 20
+#define RID_DLG_UPDATE                      (RID_DEPLOYMENT_GUI_START + 10)
+
+#define RID_DLG_UPDATE_CHECKING             1
+#define RID_DLG_UPDATE_THROBBER             2
+#define RID_DLG_UPDATE_UPDATE               3
+#define RID_DLG_UPDATE_UPDATES              4
+#define RID_DLG_UPDATE_ALL                  5
+#define RID_DLG_UPDATE_DESCRIPTION          6
+#define RID_DLG_UPDATE_DESCRIPTIONS         7
+#define RID_DLG_UPDATE_LINE                 8
+#define RID_DLG_UPDATE_HELP                 9
+#define RID_DLG_UPDATE_OK                   10
+#define RID_DLG_UPDATE_CANCEL               11
+#define RID_DLG_UPDATE_NORMALALERT          12
+#define RID_DLG_UPDATE_ERROR                14
+#define RID_DLG_UPDATE_NONE                 15
+#define RID_DLG_UPDATE_NOINSTALLABLE        16
+#define RID_DLG_UPDATE_FAILURE              17
+#define RID_DLG_UPDATE_UNKNOWNERROR         18
+#define RID_DLG_UPDATE_NODESCRIPTION        19
+#define RID_DLG_UPDATE_NOINSTALL            20
 #define RID_DLG_UPDATE_NODEPENDENCY         21
 #define RID_DLG_UPDATE_NODEPENDENCY_CUR_VER 22
 #define RID_DLG_UPDATE_NOPERMISSION         23
@@ -133,13 +131,9 @@
 #define RID_INFOBOX_UPDATE_SHARED_EXTENSION    (RID_DEPLOYMENT_GUI_START + 21)
 
 #define RID_IMG_WARNING                        (RID_DEPLOYMENT_GUI_START+56)
-#define RID_IMG_WARNING_HC                     (RID_DEPLOYMENT_GUI_START+57)
 #define RID_IMG_LOCKED                         (RID_DEPLOYMENT_GUI_START+58)
-#define RID_IMG_LOCKED_HC                      (RID_DEPLOYMENT_GUI_START+59)
 #define RID_IMG_EXTENSION                      (RID_DEPLOYMENT_GUI_START+60)
-#define RID_IMG_EXTENSION_HC                   (RID_DEPLOYMENT_GUI_START+61)
 #define RID_IMG_SHARED                         (RID_DEPLOYMENT_GUI_START+62)
-#define RID_IMG_SHARED_HC                      (RID_DEPLOYMENT_GUI_START+63)
 
 #define RID_STR_ADD_PACKAGES                   (RID_DEPLOYMENT_GUI_START+70)
 
diff --git a/desktop/source/deployment/gui/dp_gui_backend.src b/desktop/source/deployment/gui/dp_gui_backend.src
index 4d554ab4ded9..e5adb84ba596 100644
--- a/desktop/source/deployment/gui/dp_gui_backend.src
+++ b/desktop/source/deployment/gui/dp_gui_backend.src
@@ -33,11 +33,6 @@ Image RID_IMG_DEF_PACKAGE_BUNDLE
     ImageBitmap = Bitmap { File = "sx03256.bmp"; };
     MASKCOLOR
 };
-Image RID_IMG_DEF_PACKAGE_BUNDLE_HC
-{
-    ImageBitmap = Bitmap { File = "sxh03256.bmp"; };
-    MASKCOLOR
-};
 
 // script, dialog:
 Image RID_IMG_SCRIPTLIB
@@ -45,22 +40,12 @@ Image RID_IMG_SCRIPTLIB
     ImageBitmap = Bitmap { File = "im30820.bmp"; };
     MASKCOLOR
 };
-Image RID_IMG_SCRIPTLIB_HC
-{
-    ImageBitmap = Bitmap { File = "imh30820.bmp"; };
-    MASKCOLOR
-};
 
 Image RID_IMG_DIALOGLIB
 {
     ImageBitmap = Bitmap { File = "dialogfolder_16.bmp"; };
     MASKCOLOR
 };
-Image RID_IMG_DIALOGLIB_HC
-{
-    ImageBitmap = Bitmap { File = "dialogfolder_16_h.bmp"; };
-    MASKCOLOR
-};
 
 // configuration:
 Image RID_IMG_CONF_XML
@@ -68,11 +53,6 @@ Image RID_IMG_CONF_XML
     ImageBitmap = Bitmap { File = "xml_16.bmp"; };
     MASKCOLOR
 };
-Image RID_IMG_CONF_XML_HC
-{
-    ImageBitmap = Bitmap { File = "xml_16_h.bmp"; };
-    MASKCOLOR
-};
 
 // component, typelib:
 Image RID_IMG_COMPONENT
@@ -80,52 +60,27 @@ Image RID_IMG_COMPONENT
     ImageBitmap = Bitmap { File = "component_16.bmp"; };
     MASKCOLOR
 };
-Image RID_IMG_COMPONENT_HC
-{
-    ImageBitmap = Bitmap { File = "component_16_h.bmp"; };
-    MASKCOLOR
-};
 
 Image RID_IMG_JAVA_COMPONENT
 {
     ImageBitmap = Bitmap { File = "javacomponent_16.bmp"; };
     MASKCOLOR
 };
-Image RID_IMG_JAVA_COMPONENT_HC
-{
-    ImageBitmap = Bitmap { File = "javacomponent_16_h.bmp"; };
-    MASKCOLOR
-};
 
 Image RID_IMG_TYPELIB
 {
     ImageBitmap = Bitmap { File = "library_16.bmp"; };
     MASKCOLOR
 };
-Image RID_IMG_TYPELIB_HC
-{
-    ImageBitmap = Bitmap { File = "library_16_h.bmp"; };
-    MASKCOLOR
-};
 
 Image RID_IMG_JAVA_TYPELIB
 {
     ImageBitmap = Bitmap { File = "javalibrary_16.bmp"; };
     MASKCOLOR
 };
-Image RID_IMG_JAVA_TYPELIB_HC
-{
-    ImageBitmap = Bitmap { File = "javalibrary_16_h.bmp"; };
-    MASKCOLOR
-};
 
 Image RID_IMG_HELP
 {
     ImageBitmap = Bitmap { File = "commandimagelist/sc_helperdialog.bmp"; };
     MASKCOLOR
 };
-Image RID_IMG_HELP_HC
-{
-    ImageBitmap = Bitmap { File = "commandimagelist/sch_helperdialog.bmp"; };
-    MASKCOLOR
-};
diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src b/desktop/source/deployment/gui/dp_gui_dialog.src
index 15823288ee20..2ea6fefff877 100755
--- a/desktop/source/deployment/gui/dp_gui_dialog.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog.src
@@ -31,27 +31,33 @@ String RID_STR_ADD_PACKAGES
 {
     Text [ en-US ] = "Add Extension(s)";
 };
+
 String RID_CTX_ITEM_REMOVE
 {
     Text [ en-US ] = "~Remove";
 };
+
 String RID_CTX_ITEM_ENABLE
 {
     Text [ en-US ] = "~Enable";
 };
+
 String RID_CTX_ITEM_DISABLE
 {
     Text [ en-US ] = "~Disable";
 };
+
 String RID_CTX_ITEM_CHECK_UPDATE
 {
     Text [ en-US ] = "~Update...";
 };
+
 String RID_CTX_ITEM_OPTIONS
 {
     Text [ en-US ] = "~Options...";
 };
 
+
 String RID_STR_ADDING_PACKAGES
 {
     Text [ en-US ] = "Adding %EXTENSION_NAME";
@@ -177,7 +183,6 @@ ModalDialog RID_DLG_LICENSE
     Moveable = TRUE;
     Closeable = TRUE;
     Sizeable = FALSE;
-//    Hide = TRUE;
 
     MultiLineEdit ML_LICENSE
     {
@@ -196,6 +201,7 @@ ModalDialog RID_DLG_LICENSE
         NoLabel = TRUE;
         Text [ en-US ] = "Please follow these steps to proceed with the installation of the extension:";
     };
+
     FixedText FT_LICENSE_BODY_1
     {
         Pos = MAP_APPFONT(COL2_X, ROW3_Y);
@@ -203,6 +209,7 @@ ModalDialog RID_DLG_LICENSE
         NoLabel = TRUE;
         Text [ en-US ] = "1.";
     };
+
     //spans col3 + col4
     FixedText FT_LICENSE_BODY_1_TXT
     {
@@ -212,6 +219,7 @@ ModalDialog RID_DLG_LICENSE
         NoLabel = TRUE;
         Text [ en-US ] = "Read the complete License Agreement. Use the scroll bar or the \'Scroll Down\' button in this dialog to view the entire license text.";
     };
+
     FixedText FT_LICENSE_BODY_2
     {
         Pos = MAP_APPFONT(COL2_X, ROW4_Y);
@@ -219,6 +227,7 @@ ModalDialog RID_DLG_LICENSE
         NoLabel = TRUE;
         Text [ en-US ] = "2.";
     };
+
     FixedText FT_LICENSE_BODY_2_TXT
     {
         Pos = MAP_APPFONT(COL3_X, ROW4_Y);
@@ -228,6 +237,7 @@ ModalDialog RID_DLG_LICENSE
         Text [ en-US ] = "Accept the License Agreement for the extension by pressing the \'Accept\' button.";
 
     };
+
     PushButton PB_LICENSE_DOWN
     {
         TabStop = TRUE ;
@@ -236,6 +246,7 @@ ModalDialog RID_DLG_LICENSE
         Text [ en-US ] = "~Scroll Down";
 
     };
+
     FixedLine FL_LICENSE
     {
         Pos = MAP_APPFONT ( 0, ROW5_Y) ;
@@ -264,12 +275,6 @@ ModalDialog RID_DLG_LICENSE
         };
     };
 
-    Image IMG_LICENCE_ARROW_HC
-    {
-        ImageBitmap = Bitmap { File = "sch06300.png"; };
-        MASKCOLOR
-    };
-
     OKButton BTN_LICENSE_ACCEPT
     {
         Pos = MAP_APPFONT(COL4_X, ROW6_Y);
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.src b/desktop/source/deployment/gui/dp_gui_dialog2.src
index 7c47365999a0..5233890d1da8 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.src
@@ -158,41 +158,21 @@ Image RID_IMG_WARNING
     ImageBitmap = Bitmap { File = "caution_16.png"; };
 };
 
-Image RID_IMG_WARNING_HC
-{
-    ImageBitmap = Bitmap { File = "caution_16_h.png"; };
-};
-
 Image RID_IMG_LOCKED
 {
     ImageBitmap = Bitmap { File = "lock_16.png"; };
 };
 
-Image RID_IMG_LOCKED_HC
-{
-    ImageBitmap = Bitmap { File = "lock_16_h.png"; };
-};
-
 Image RID_IMG_SHARED
 {
     ImageBitmap = Bitmap { File = "shared_16.png"; };
 };
 
-Image RID_IMG_SHARED_HC
-{
-    ImageBitmap = Bitmap { File = "shared_16_h.png"; };
-};
-
 Image RID_IMG_EXTENSION
 {
     ImageBitmap = Bitmap { File = "extension_32.png"; };
 };
 
-Image RID_IMG_EXTENSION_HC
-{
-    ImageBitmap = Bitmap { File = "extension_32_h.png"; };
-};
-
 QueryBox RID_QUERYBOX_INSTALL_FOR_ALL
 {
     Buttons = WB_YES_NO_CANCEL;
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 6b904dd65b34..db52d6395bd9 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -1019,7 +1019,7 @@ void ExtensionCmdQueue::Thread::_checkForUpdates(
         int countWebsiteDownload = 0;
         typedef std::vector< dp_gui::UpdateData >::const_iterator cit;
 
-        for ( cit i = vData.begin(); i < vData.end(); i++ )
+        for ( cit i = vData.begin(); i < vData.end(); ++i )
         {
             if ( i->sWebsiteURL.getLength() > 0 )
                 countWebsiteDownload ++;
@@ -1039,7 +1039,7 @@ void ExtensionCmdQueue::Thread::_checkForUpdates(
         //Now start the webbrowser and navigate to the websites where we get the updates
         if ( RET_OK == nDialogResult )
         {
-            for ( cit i = vData.begin(); i < vData.end(); i++ )
+            for ( cit i = vData.begin(); i < vData.end(); ++i )
             {
                 if ( m_pDialogHelper && ( i->sWebsiteURL.getLength() > 0 ) )
                     m_pDialogHelper->openWebBrowser( i->sWebsiteURL, m_pDialogHelper->getWindow()->GetText() );
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 2e4cac48457b..1e0e489a4902 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -72,29 +72,34 @@ Entry_Impl::Entry_Impl( const uno::Reference< deployment::XPackage > &xPackage,
     m_pPublisher( NULL ),
     m_xPackage( xPackage )
 {
-    m_sTitle = xPackage->getDisplayName();
-    m_sVersion = xPackage->getVersion();
-    m_sDescription = xPackage->getDescription();
-
-    beans::StringPair aInfo( m_xPackage->getPublisherInfo() );
-    m_sPublisher = aInfo.First;
-    m_sPublisherURL = aInfo.Second;
-
-    // get the icons for the package if there are any
-    uno::Reference< graphic::XGraphic > xGraphic = xPackage->getIcon( false );
-    if ( xGraphic.is() )
-        m_aIcon = Image( xGraphic );
-
-    xGraphic = xPackage->getIcon( true );
-    if ( xGraphic.is() )
-        m_aIconHC = Image( xGraphic );
-    else
-        m_aIconHC = m_aIcon;
+    try
+    {
+        m_sTitle = xPackage->getDisplayName();
+        m_sVersion = xPackage->getVersion();
+        m_sDescription = xPackage->getDescription();
+
+        beans::StringPair aInfo( m_xPackage->getPublisherInfo() );
+        m_sPublisher = aInfo.First;
+        m_sPublisherURL = aInfo.Second;
+
+        // get the icons for the package if there are any
+        uno::Reference< graphic::XGraphic > xGraphic = xPackage->getIcon( false );
+        if ( xGraphic.is() )
+            m_aIcon = Image( xGraphic );
+
+        xGraphic = xPackage->getIcon( true );
+        if ( xGraphic.is() )
+            m_aIconHC = Image( xGraphic );
+        else
+            m_aIconHC = m_aIcon;
 
-    if ( eState == AMBIGUOUS )
-        m_sErrorText = DialogHelper::getResourceString( RID_STR_ERROR_UNKNOWN_STATUS );
-    else if ( eState == NOT_REGISTERED )
-        checkDependencies();
+        if ( eState == AMBIGUOUS )
+            m_sErrorText = DialogHelper::getResourceString( RID_STR_ERROR_UNKNOWN_STATUS );
+        else if ( eState == NOT_REGISTERED )
+            checkDependencies();
+    }
+    catch (deployment::ExtensionRemovedException &) {}
+    catch (uno::RuntimeException &) {}
 }
 
 //------------------------------------------------------------------------------
@@ -179,13 +184,9 @@ ExtensionBox_Impl::ExtensionBox_Impl( Dialog* pParent, TheExtensionManager *pMan
     m_nActiveHeight( 0 ),
     m_nExtraHeight( 2 ),
     m_aSharedImage( DialogHelper::getResId( RID_IMG_SHARED ) ),
-    m_aSharedImageHC( DialogHelper::getResId( RID_IMG_SHARED_HC ) ),
     m_aLockedImage( DialogHelper::getResId( RID_IMG_LOCKED ) ),
-    m_aLockedImageHC( DialogHelper::getResId( RID_IMG_LOCKED_HC ) ),
     m_aWarningImage( DialogHelper::getResId( RID_IMG_WARNING ) ),
-    m_aWarningImageHC( DialogHelper::getResId( RID_IMG_WARNING_HC ) ),
     m_aDefaultImage( DialogHelper::getResId( RID_IMG_EXTENSION ) ),
-    m_aDefaultImageHC( DialogHelper::getResId( RID_IMG_EXTENSION_HC ) ),
     m_pScrollBar( NULL ),
     m_pManager( pManager )
 {
@@ -526,9 +527,9 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntr
     aPos += Point( TOP_OFFSET, TOP_OFFSET );
     Image aImage;
     if ( ! pEntry->m_aIcon )
-        aImage = isHCMode() ? m_aDefaultImageHC : m_aDefaultImage;
+        aImage = m_aDefaultImage;
     else
-        aImage = isHCMode() ? pEntry->m_aIconHC : pEntry->m_aIcon;
+        aImage = pEntry->m_aIcon;
     Size aImageSize = aImage.GetSizePixel();
     if ( ( aImageSize.Width() <= ICON_WIDTH ) && ( aImageSize.Height() <= ICON_HEIGHT ) )
         DrawImage( Point( aPos.X()+((ICON_WIDTH-aImageSize.Width())/2), aPos.Y()+((ICON_HEIGHT-aImageSize.Height())/2) ), aImage );
@@ -634,14 +635,14 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntr
     {
         aPos = rRect.TopRight() + Point( -(RIGHT_ICON_OFFSET + SMALL_ICON_SIZE), TOP_OFFSET );
         if ( pEntry->m_bLocked )
-            DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), isHCMode() ? m_aLockedImageHC : m_aLockedImage );
+            DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), m_aLockedImage );
         else
-            DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), isHCMode() ? m_aSharedImageHC : m_aSharedImage );
+            DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), m_aSharedImage );
     }
     if ( ( pEntry->m_eState == AMBIGUOUS ) || pEntry->m_bMissingDeps || pEntry->m_bMissingLic )
     {
         aPos = rRect.TopRight() + Point( -(RIGHT_ICON_OFFSET + SPACE_BETWEEN + 2*SMALL_ICON_SIZE), TOP_OFFSET );
-        DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), isHCMode() ? m_aWarningImageHC : m_aWarningImage );
+        DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), m_aWarningImage );
     }
 
     SetLineColor( Color( COL_LIGHTGRAY ) );
@@ -964,6 +965,11 @@ long ExtensionBox_Impl::addEntry( const uno::Reference< deployment::XPackage > &
     bool         bLocked = m_pManager->isReadOnly( xPackage );
 
     TEntry_Impl pEntry( new Entry_Impl( xPackage, eState, bLocked ) );
+
+    // Don't add empty entries
+    if ( ! pEntry->m_sTitle.Len() )
+        return 0;
+
     xPackage->addEventListener( uno::Reference< lang::XEventListener > ( m_xRemoveListener, uno::UNO_QUERY ) );
 
     ::osl::ClearableMutexGuard guard(m_entriesMutex);
@@ -1174,11 +1180,6 @@ void ExtensionBox_Impl::checkEntries()
             Invalidate();
     }
 }
-//------------------------------------------------------------------------------
-bool ExtensionBox_Impl::isHCMode()
-{
-    return (bool)GetSettings().GetStyleSettings().GetHighContrastMode();
-}
 
 //------------------------------------------------------------------------------
 void ExtensionBox_Impl::SetScrollHdl( const Link& rLink )
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index 8120d3b3bfad..7cdaa7483e7f 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -137,13 +137,9 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox
     long            m_nExtraHeight;
     Size            m_aOutputSize;
     Image           m_aSharedImage;
-    Image           m_aSharedImageHC;
     Image           m_aLockedImage;
-    Image           m_aLockedImageHC;
     Image           m_aWarningImage;
-    Image           m_aWarningImageHC;
     Image           m_aDefaultImage;
-    Image           m_aDefaultImageHC;
     Link            m_aClickHdl;
 
     ScrollBar      *m_pScrollBar;
@@ -172,7 +168,6 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox
     bool            HandleTabKey( bool bReverse );
     bool            HandleCursorKey( USHORT nKeyCode );
     bool            FindEntryPos( const TEntry_Impl pEntry, long nStart, long nEnd, long &nFound );
-    bool            isHCMode();
     void            DeleteRemoved();
 
     //-----------------
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index b2e176550f0f..d82f70e397e9 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -565,8 +565,7 @@ UpdateDialog::UpdateDialog(
     m_update(this, DpGuiResId(RID_DLG_UPDATE_UPDATE)),
     m_updates(
         *this, DpGuiResId(RID_DLG_UPDATE_UPDATES),
-        Image(DpGuiResId(RID_DLG_UPDATE_NORMALALERT)),
-        Image(DpGuiResId(RID_DLG_UPDATE_HIGHCONTRASTALERT))),
+        Image(DpGuiResId(RID_DLG_UPDATE_NORMALALERT))),
     m_all(this, DpGuiResId(RID_DLG_UPDATE_ALL)),
     m_description(this, DpGuiResId(RID_DLG_UPDATE_DESCRIPTION)),
     m_PublisherLabel(this, DpGuiResId(RID_DLG_UPDATE_PUBLISHER_LABEL)),
@@ -667,9 +666,9 @@ short UpdateDialog::Execute() {
 
 UpdateDialog::CheckListBox::CheckListBox(
     UpdateDialog & dialog, ResId const & resource,
-    Image const & normalStaticImage, Image const & highContrastStaticImage):
+    Image const & normalStaticImage):
     SvxCheckListBox(
-        &dialog, resource, normalStaticImage, highContrastStaticImage),
+        &dialog, resource, normalStaticImage),
     m_dialog(dialog)
 {}
 
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index b9882123d0fd..f59cdd5eb13f 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -122,8 +122,7 @@ private:
     public:
         CheckListBox(
             UpdateDialog & dialog, ResId const & resource,
-            Image const & normalStaticImage,
-            Image const & highContrastStaticImage);
+            Image const & normalStaticImage);
 
         virtual ~CheckListBox();
 
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.src b/desktop/source/deployment/gui/dp_gui_updatedialog.src
index 325d98c88d48..47497cb3846b 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.src
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.src
@@ -212,11 +212,6 @@ ModalDialog RID_DLG_UPDATE {
             File = "caution_12.png";
         };
     };
-    Image RID_DLG_UPDATE_HIGHCONTRASTALERT {
-        ImageBitmap = Bitmap {
-            File = "caution_12_h.png";
-        };
-    };
     String RID_DLG_UPDATE_ERROR {
         Text[en-US] = "Error";
     };
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 2ebd75cbc377..32faa7123b5b 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -215,13 +215,6 @@ LicenseDialogImpl::LicenseDialogImpl(
 
 {
 
-    if (GetSettings().GetStyleSettings().GetHighContrastMode())
-    {
-        // high contrast mode needs other images
-        m_fiArrow1.SetImage(Image(DpGuiResId(IMG_LICENCE_ARROW_HC)));
-        m_fiArrow2.SetImage(Image(DpGuiResId(IMG_LICENCE_ARROW_HC)));
-    }
-
     FreeResource();
 
     m_acceptButton.SetUniqueId(UID_BTN_LICENSE_ACCEPT);
diff --git a/desktop/source/deployment/inc/db.hxx b/desktop/source/deployment/inc/db.hxx
index 890059fd10a3..22e9e357b549 100644
--- a/desktop/source/deployment/inc/db.hxx
+++ b/desktop/source/deployment/inc/db.hxx
@@ -28,6 +28,8 @@
 #ifndef BERKELEYDBPROXY_DB_HXX_
 #define BERKELEYDBPROXY_DB_HXX_
 
+#include <boost/noncopyable.hpp>
+
 #ifdef SYSTEM_DB
 #include <db.h>
 #else
@@ -43,26 +45,12 @@ extern "C" {
   typedef void (*db_free_fcn_type)(void *);
 }
 
-
 namespace berkeleydbproxy {
 
     class DbEnv;
     class Dbc;
     class Dbt;
 
-    namespace db_internal
-    {
-        class Noncopyable
-        {
-            // not implemented
-            Noncopyable(const Noncopyable&);
-            void operator=(const Noncopyable&);
-        protected:
-            Noncopyable() {}
-            ~Noncopyable() {}
-        };
-    }
-
     class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC DbException
     {
         rtl::OString what_;
@@ -78,7 +66,7 @@ namespace berkeleydbproxy {
     };
 
 
-    class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC DbEnv : db_internal::Noncopyable
+    class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC DbEnv : boost::noncopyable
     {
         friend class Db;
 
@@ -89,7 +77,7 @@ namespace berkeleydbproxy {
         static char *strerror(int);
     };
 
-    class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC Db : db_internal::Noncopyable
+    class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC Db : boost::noncopyable
     {
     private:
         DB* m_pDBP;
@@ -116,7 +104,7 @@ namespace berkeleydbproxy {
         int cursor(DB_TXN *txnid, Dbc **cursorp, u_int32_t flags);
     };
 
-    class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC Dbc : db_internal::Noncopyable
+    class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC Dbc : boost::noncopyable
     {
         friend class Db;
         friend class Dbt;
@@ -156,20 +144,4 @@ namespace berkeleydbproxy {
 }
 
 #endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx
index f863dbbb86d6..e159382f2c7b 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.cxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx
@@ -287,33 +287,7 @@ void SilentCheckPrerequisitesCommandEnv::handle(
         m_UnknownException = request;
     }
 }
-// NoExceptionCommandEnv::NoExceptionCommandEnv(
-//     css::uno::Reference< css::task::XInteractionHandler> const & handler,
-//     css::uno::Type const & type):
-//     BaseCommandEnv(handler),
-//     m_type(type)
-// {
-// }
-// // XInteractionHandler
-// void NoExceptionCommandEnv::handle(
-//     Reference< task::XInteractionRequest> const & xRequest )
-//     throw (uno::RuntimeException)
-// {
-//     uno::Any request( xRequest->getRequest() );
-//     OSL_ASSERT( request.getValueTypeClass() == uno::TypeClass_EXCEPTION );
-
-//  deployment::LicenseException licExc;
 
-//     bool approve = false;
-//     bool abort = false;
-
-//     if (request.getValueType() == m_type)
-//     {
-//         approve = true;
-//     }
-//     handle_(approve, abort, xRequest);
-// }
-
-} // namespace dp_manager
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx
index da64628792bd..59349c469af0 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.hxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx
@@ -100,7 +100,7 @@ private:
     ::rtl::OUString m_repository;
     bool m_bSuppressLicense;
 public:
-    LicenseCommandEnv(){};
+    LicenseCommandEnv() : m_bSuppressLicense(false) {};
     LicenseCommandEnv(
         css::uno::Reference< css::task::XInteractionHandler> const & handler,
         bool bSuppressLicense,
@@ -154,22 +154,6 @@ public:
     css::uno::Any m_UnknownException;
 };
 
-// class NoExceptionCommandEnv : public BaseCommandEnv
-// {
-//     css::uno::Type m_type;
-// public:
-//     NoExceptionCommandEnv::NoExceptionCommandEnv(){};
-//     NoExceptionCommandEnv::NoExceptionCommandEnv(
-//         css::uno::Reference< css::task::XInteractionHandler> const & handler,
-//         css::uno::Type const & type);
-
-// // XInteractionHandler
-//     virtual void SAL_CALL handle(
-//         css::uno::Reference<css::task::XInteractionRequest > const & xRequest )
-//         throw (css::uno::RuntimeException);
-
-// };
-
 }
 
 #endif
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index c6529ec0e8cc..4584862d19db 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -78,8 +78,6 @@ namespace beans = com::sun::star::beans;
 namespace util = com::sun::star::util;
 namespace css = com::sun::star;
 
-//#define OUSTR(s) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))
-
 using ::com::sun::star::uno::Reference;
 using ::rtl::OUString;
 
@@ -90,7 +88,6 @@ struct CompIdentifiers
     bool operator() (::std::vector<Reference<deploy::XPackage> > const & a,
                      ::std::vector<Reference<deploy::XPackage> > const & b)
         {
-
             if (getName(a).compareTo(getName(b)) < 0)
                 return true;
             return false;
@@ -170,7 +167,7 @@ ExtensionRemoveGuard::~ExtensionRemoveGuard()
     }
 }
 
-} //end namespace
+}
 
 namespace dp_manager {
 
@@ -227,7 +224,7 @@ ExtensionManager::getPackageManager(::rtl::OUString const & repository)
   Enters the XPackage objects into a map. They must be all from the
   same repository. The value type of the map is a vector, where each vector
   represents an extension with a particular identifier. The first member
-  is represents the user extension, the second the shared extension and the
+  represents the user extension, the second the shared extension and the
   third the bundled extension.
  */
 void ExtensionManager::addExtensionsToMap(
@@ -266,8 +263,8 @@ void ExtensionManager::addExtensionsToMap(
 
 /*
    returns a list containing extensions with the same identifier from
-   all repositories (user, shared, bundled) If one repository does not
-   have this extension, then the list contains an empty Referenc. The list
+   all repositories (user, shared, bundled). If one repository does not
+   have this extension, then the list contains an empty Reference. The list
    is ordered according to the priority of the repostories:
    1. user
    2. shared
@@ -283,29 +280,21 @@ void ExtensionManager::addExtensionsToMap(
 
 {
     ::std::list<Reference<deploy::XPackage> > extensionList;
-    try
-    {   //will throw an exception if the extension does not exist
-        extensionList.push_back(m_userRepository->getDeployedPackage(
-            identifier, fileName, Reference<ucb::XCommandEnvironment>()));
-    } catch(lang::IllegalArgumentException &)
+    Reference<deploy::XPackageManager> lRepos[] = {
+        m_userRepository, m_sharedRepository, m_bundledRepository };
+    for (int i(0); i != SAL_N_ELEMENTS(lRepos); ++i)
     {
-        extensionList.push_back(Reference<deploy::XPackage>());
-    }
-    try
-    {
-        extensionList.push_back(m_sharedRepository->getDeployedPackage(
-            identifier, fileName, Reference<ucb::XCommandEnvironment>()));
-    } catch (lang::IllegalArgumentException &)
-    {
-        extensionList.push_back(Reference<deploy::XPackage>());
-    }
-    try
-    {
-       extensionList.push_back(m_bundledRepository->getDeployedPackage(
-           identifier, fileName, Reference<ucb::XCommandEnvironment>()));
-    } catch (lang::IllegalArgumentException &)
-    {
-        extensionList.push_back(Reference<deploy::XPackage>());
+        Reference<deploy::XPackage> xPackage;
+        try
+        {
+            xPackage = lRepos[i]->getDeployedPackage(
+                identifier, fileName, Reference<ucb::XCommandEnvironment>());
+        }
+        catch(lang::IllegalArgumentException &)
+        {
+            // thrown if the extension does not exist in this repository
+        }
+        extensionList.push_back(xPackage);
     }
     OSL_ASSERT(extensionList.size() == 3);
     return extensionList;
@@ -720,7 +709,7 @@ Reference<deploy::XPackage> ExtensionManager::addExtension(
                 }
                 //check again dependencies but prevent user interaction,
                 //We can disregard the license, because the user must have already
-                //accepted it, whe we called checkPrerequisites the first time
+                //accepted it, when we called checkPrerequisites the first time
                 SilentCheckPrerequisitesCommandEnv * pSilentCommandEnv =
                     new SilentCheckPrerequisitesCommandEnv();
                 Reference<ucb::XCommandEnvironment> silentCommandEnv(pSilentCommandEnv);
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx
index 0b8b90eeb241..375138d86532 100644
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.cxx
@@ -57,13 +57,25 @@ namespace css = ::com::sun::star;
 static char const xmlNamespace[] =
     "http://openoffice.org/extensions/description/2006";
 
-bool satisfiesMinimalVersion(::rtl::OUString const & version) {
-    ::rtl::OUString v(
+bool
+lcl_versionIsNot(dp_misc::Order i_eOrder, ::rtl::OUString const& i_rVersion)
+{
+    ::rtl::OUString aVersion(
         RTL_CONSTASCII_USTRINGPARAM(
             "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version")
             ":Version:OOOPackageVersion}"));
-    ::rtl::Bootstrap::expandMacros(v);
-    return ::dp_misc::compareVersions(v, version) != ::dp_misc::LESS;
+    ::rtl::Bootstrap::expandMacros(aVersion);
+    return ::dp_misc::compareVersions(aVersion, i_rVersion) != i_eOrder;
+}
+
+bool satisfiesMinimalVersion(::rtl::OUString const& i_rVersion)
+{
+    return lcl_versionIsNot(dp_misc::LESS, i_rVersion);
+}
+
+bool satisfiesMaximalVersion(::rtl::OUString const& i_rVersion)
+{
+    return lcl_versionIsNot(dp_misc::GREATER, i_rVersion);
 }
 
 }
@@ -81,14 +93,14 @@ check(::dp_misc::DescriptionInfoset const & infoset) {
         unsatisfied(n);
     ::sal_Int32 unsat = 0;
     for (::sal_Int32 i = 0; i < n; ++i) {
-        static char const minimalVersion[] = "OpenOffice.org-minimal-version";
+        static rtl::OUString const minimalVersion(
+                RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org-minimal-version"));
         css::uno::Reference< css::xml::dom::XElement > e(
             deps->item(i), css::uno::UNO_QUERY_THROW);
         bool sat = false;
         if (e->getNamespaceURI().equalsAsciiL(
                 RTL_CONSTASCII_STRINGPARAM(xmlNamespace))
-            && e->getTagName().equalsAsciiL(
-                RTL_CONSTASCII_STRINGPARAM(minimalVersion)))
+            && (e->getTagName() == minimalVersion))
         {
             sat = satisfiesMinimalVersion(
                 e->getAttribute(
@@ -99,28 +111,18 @@ check(::dp_misc::DescriptionInfoset const & infoset) {
                        RTL_CONSTASCII_STRINGPARAM(
                            "OpenOffice.org-maximal-version")))
         {
-            ::rtl::OUString v(
-                RTL_CONSTASCII_USTRINGPARAM(
-                    "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version")
-                    ":Version:OOOBaseVersion}"));
-            ::rtl::Bootstrap::expandMacros(v);
-            sat =
-                ::dp_misc::compareVersions(
-                    v,
+            sat = satisfiesMaximalVersion(
                     e->getAttribute(
-                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value"))))
-                != ::dp_misc::GREATER;
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value"))));
         } else if (e->hasAttributeNS(
                        ::rtl::OUString(
                            RTL_CONSTASCII_USTRINGPARAM(xmlNamespace)),
-                       ::rtl::OUString(
-                           RTL_CONSTASCII_USTRINGPARAM(minimalVersion))))
+                        minimalVersion))
         {
             sat = satisfiesMinimalVersion(
                 e->getAttributeNS(
                     ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(xmlNamespace)),
-                    ::rtl::OUString(
-                        RTL_CONSTASCII_USTRINGPARAM(minimalVersion))));
+                    minimalVersion));
         }
         if (!sat) {
             unsatisfied[unsat++] = e;
diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx
index 27ab39b60c44..459e7da4b5f0 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -113,9 +113,7 @@ namespace
                 ::rtl::OUStringBuffer buf;
                 buf.append( StrOperatingSystem::get() );
                 buf.append( static_cast<sal_Unicode>('_') );
-                OUString arch( RTL_CONSTASCII_USTRINGPARAM("$_ARCH") );
-                ::rtl::Bootstrap::expandMacros( arch );
-                buf.append( arch );
+                buf.append( StrCPU::get() );
                 return buf.makeStringAndClear();
             }
     };
diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx
index 97453d6b2781..8eedd0955e32 100644
--- a/desktop/source/deployment/misc/dp_update.cxx
+++ b/desktop/source/deployment/misc/dp_update.cxx
@@ -187,11 +187,9 @@ void getDefaultUpdateInfos(
 bool containsBundledOnly(Sequence<Reference<deployment::XPackage> > const & sameIdExtensions)
 {
     OSL_ASSERT(sameIdExtensions.getLength() == 3);
-    if (!sameIdExtensions[0].is() && !sameIdExtensions[1].is() && sameIdExtensions[2].is())
-        return true;
-    else
-        return false;
+    return !sameIdExtensions[0].is() && !sameIdExtensions[1].is() && sameIdExtensions[2].is();
 }
+
 /** Returns true if the list of extensions are bundled extensions and there are no
     other extensions with the same identifier in the shared or user repository.
     If extensionList is NULL, then it is checked if there are only bundled extensions.
@@ -205,17 +203,12 @@ bool onlyBundledExtensions(
     if (extensionList)
     {
         typedef std::vector<Reference<deployment::XPackage > >::const_iterator CIT;
-        for (CIT i = extensionList->begin(); i != extensionList->end(); i++)
+        for (CIT i(extensionList->begin()), aEnd(extensionList->end()); onlyBundled && i != aEnd; ++i)
         {
             Sequence<Reference<deployment::XPackage> > seqExt = xExtMgr->getExtensionsWithSameIdentifier(
                 dp_misc::getIdentifier(*i), (*i)->getName(), Reference<ucb::XCommandEnvironment>());
 
-            if (!containsBundledOnly(seqExt))
-            {
-                onlyBundled = false;
-                break;
-            }
-
+            onlyBundled = containsBundledOnly(seqExt);
         }
     }
     else
@@ -223,13 +216,9 @@ bool onlyBundledExtensions(
         const uno::Sequence< uno::Sequence< Reference<deployment::XPackage > > > seqAllExt =
             xExtMgr->getAllExtensions(Reference<task::XAbortChannel>(), Reference<ucb::XCommandEnvironment>());
 
-        for (int pos = seqAllExt.getLength(); pos --; )
+        for (int pos(0), nLen(seqAllExt.getLength()); onlyBundled && pos != nLen; ++pos)
         {
-            if (!containsBundledOnly(seqAllExt[pos]))
-            {
-                onlyBundled = false;
-                break;
-            }
+            onlyBundled = containsBundledOnly(seqAllExt[pos]);
         }
     }
     return onlyBundled;
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 535e261f7b1b..1cda30d69297 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -520,16 +520,14 @@ BackendImpl::BackendImpl(
                                    getPlatformString(),
                                    OUSTR("*" SAL_DLLEXTENSION),
                                    getResourceString(RID_STR_DYN_COMPONENT),
-                                   RID_IMG_COMPONENT,
-                                   RID_IMG_COMPONENT_HC ) ),
+                                   RID_IMG_COMPONENT) ),
       m_xJavaComponentTypeInfo( new Package::TypeInfo(
                                     OUSTR("application/"
                                           "vnd.sun.star.uno-component;"
                                           "type=Java"),
                                     OUSTR("*.jar"),
                                     getResourceString(RID_STR_JAVA_COMPONENT),
-                                    RID_IMG_JAVA_COMPONENT,
-                                    RID_IMG_JAVA_COMPONENT_HC ) ),
+                                    RID_IMG_JAVA_COMPONENT) ),
       m_xPythonComponentTypeInfo( new Package::TypeInfo(
                                       OUSTR("application/"
                                             "vnd.sun.star.uno-component;"
@@ -537,23 +535,21 @@ BackendImpl::BackendImpl(
                                       OUSTR("*.py"),
                                       getResourceString(
                                           RID_STR_PYTHON_COMPONENT),
-                                      RID_IMG_COMPONENT,
-                                      RID_IMG_COMPONENT_HC ) ),
+                                      RID_IMG_COMPONENT ) ),
       m_xRDBTypelibTypeInfo( new Package::TypeInfo(
                                  OUSTR("application/"
                                        "vnd.sun.star.uno-typelibrary;"
                                        "type=RDB"),
                                  OUSTR("*.rdb"),
                                  getResourceString(RID_STR_RDB_TYPELIB),
-                                 RID_IMG_TYPELIB, RID_IMG_TYPELIB_HC ) ),
+                                 RID_IMG_TYPELIB ) ),
       m_xJavaTypelibTypeInfo( new Package::TypeInfo(
                                   OUSTR("application/"
                                         "vnd.sun.star.uno-typelibrary;"
                                         "type=Java"),
                                   OUSTR("*.jar"),
                                   getResourceString(RID_STR_JAVA_TYPELIB),
-                                  RID_IMG_JAVA_TYPELIB,
-                                  RID_IMG_JAVA_TYPELIB_HC ) ),
+                                  RID_IMG_JAVA_TYPELIB ) ),
       m_typeInfos( 5 )
 {
     m_typeInfos[ 0 ] = m_xDynComponentTypeInfo;
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index 5d89c2deca24..18769bea8b3c 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -185,13 +185,13 @@ BackendImpl::BackendImpl(
                                      "vnd.sun.star.configuration-data"),
                                OUSTR("*.xcu"),
                                getResourceString(RID_STR_CONF_DATA),
-                               RID_IMG_CONF_XML, RID_IMG_CONF_XML_HC ) ),
+                               RID_IMG_CONF_XML ) ),
       m_xConfSchemaTypeInfo( new Package::TypeInfo(
                                  OUSTR("application/"
                                        "vnd.sun.star.configuration-schema"),
                                  OUSTR("*.xcs"),
                                  getResourceString(RID_STR_CONF_SCHEMA),
-                                 RID_IMG_CONF_XML, RID_IMG_CONF_XML_HC ) ),
+                                 RID_IMG_CONF_XML ) ),
       m_typeInfos( 2 )
 {
     m_typeInfos[ 0 ] = m_xConfDataTypeInfo;
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index 09a6a04651bf..1199f661bb41 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -275,7 +275,7 @@ void PackageRegistryBackend::deleteUnusedFolders(
         // get all temp directories:
         ::std::vector<OUString> tempEntries;
 
-        char tmp[] = ".tmp";
+        const char tmp[] = ".tmp";
 
         while (xResultSet->next())
         {
@@ -284,7 +284,7 @@ void PackageRegistryBackend::deleteUnusedFolders(
                     xResultSet, UNO_QUERY_THROW )->getString(
                         1 /* Title */ ) );
 
-            if (title.endsWithAsciiL(tmp, sizeof(tmp) - 1))
+            if (title.endsWithAsciiL(RTL_CONSTASCII_STRINGPARAM(tmp)))
                 tempEntries.push_back(
                     makeURLAppendSysPathSegment(sDataFolder, title));
         }
@@ -797,12 +797,19 @@ OUString Package::TypeInfo::getFileFilter() throw (RuntimeException)
 }
 
 //______________________________________________________________________________
-Any Package::TypeInfo::getIcon( sal_Bool highContrast, sal_Bool smallIcon )
+/**************************
+ * Get Icon
+ *
+ * @param highContrast NOTE: disabled the returning of high contrast icons.
+ *                     This bool is a noop now.
+ * @param smallIcon    Return the small version of the icon
+ */
+Any Package::TypeInfo::getIcon( sal_Bool /*highContrast*/, sal_Bool smallIcon )
     throw (RuntimeException)
 {
     if (! smallIcon)
         return Any();
-    const sal_uInt16 nIconId = (highContrast ? m_smallIcon_HC : m_smallIcon);
+    const sal_uInt16 nIconId = m_smallIcon;
     return Any( &nIconId, getCppuType( static_cast<sal_uInt16 const *>(0) ) );
 }
 
diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx b/desktop/source/deployment/registry/dp_backenddb.cxx
index a93bc0b45093..bafeb18a7192 100644
--- a/desktop/source/deployment/registry/dp_backenddb.cxx
+++ b/desktop/source/deployment/registry/dp_backenddb.cxx
@@ -566,13 +566,10 @@ OUString BackendDb::readSimpleElement(
 }
 
 
-
-//================================================================================
 RegisteredDb::RegisteredDb(
     Reference<XComponentContext> const &  xContext,
     ::rtl::OUString const & url):BackendDb(xContext, url)
 {
-
 }
 
 void RegisteredDb::addEntry(::rtl::OUString const & url)
@@ -626,14 +623,10 @@ bool RegisteredDb::getEntry(::rtl::OUString const & url)
         Reference<css::xml::dom::XNode> root = doc->getFirstChild();
 
         Reference<css::xml::xpath::XXPathAPI> xpathApi = getXPathAPI();
-        //find the extension element that is to be removed
         Reference<css::xml::dom::XNode> aNode =
             xpathApi->selectSingleNode(root, sExpression);
-        if (!aNode.is())
-        {
-            return false;
-        }
-        return true;
+
+        return aNode.is();
     }
     catch(css::uno::Exception &)
     {
@@ -644,7 +637,6 @@ bool RegisteredDb::getEntry(::rtl::OUString const & url)
     }
 }
 
-
 } // namespace backend
 } // namespace dp_registry
 
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index b120bd9a4465..1b05a3fae184 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -118,8 +118,7 @@ BackendImpl::BackendImpl(
                                 OUSTR("application/vnd.sun.star.executable"),
                                 OUSTR(""),
                                 OUSTR("Executable"),
-                                RID_IMG_COMPONENT,
-                                RID_IMG_COMPONENT_HC ) )
+                                RID_IMG_COMPONENT ) )
 {
     if (!transientMode())
     {
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 38aa08674baf..d69e5698b7a4 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -135,7 +135,7 @@ BackendImpl::BackendImpl(
                                OUSTR("application/vnd.sun.star.help"),
                                rtl::OUString(),
                                getResourceString(RID_STR_HELP),
-                               RID_IMG_HELP, RID_IMG_HELP_HC ) ),
+                               RID_IMG_HELP ) ),
       m_typeInfos( 1 )
 {
     m_typeInfos[ 0 ] = m_xHelpTypeInfo;
@@ -261,7 +261,6 @@ BackendImpl * BackendImpl::PackageImpl::getMyBackend() const
     return pBackend;
 }
 
-
 bool BackendImpl::PackageImpl::extensionContainsCompiledHelp()
 {
     bool bCompiled = true;
@@ -362,12 +361,10 @@ beans::Optional< OUString > BackendImpl::PackageImpl::getRegistrationDataURL()
     return beans::Optional<OUString>(true, OUString());
 }
 
-
 //##############################################################################
 
-static rtl::OUString aSlash( rtl::OUString::createFromAscii( "/" ) );
-static rtl::OUString aHelpStr( rtl::OUString::createFromAscii( "help" ) );
-
+static rtl::OUString aSlash(RTL_CONSTASCII_USTRINGPARAM("/"));
+static rtl::OUString aHelpStr(RTL_CONSTASCII_USTRINGPARAM("help"));
 
 void BackendImpl::implProcessHelp
 ( Reference< deployment::XPackage > xPackage, bool doRegisterPackage, bool compiledHelp,
@@ -394,7 +391,7 @@ void BackendImpl::implProcessHelp
             if( !xSFA->isFolder( aExpandedHelpURL ) )
             {
                 rtl::OUString aErrStr = getResourceString( RID_STR_HELPPROCESSING_GENERAL_ERROR );
-                aErrStr += rtl::OUString::createFromAscii( "No help folder" );
+                aErrStr += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No help folder" ));
                 OWeakObject* oWeakThis = static_cast<OWeakObject *>(this);
                 throw deployment::DeploymentException( rtl::OUString(), oWeakThis,
                                                        makeAny( uno::Exception( aErrStr, oWeakThis ) ) );
@@ -407,8 +404,8 @@ void BackendImpl::implProcessHelp
                 try
                 {
                     xInvocation = Reference< script::XInvocation >(
-                        xContext->getServiceManager()->createInstanceWithContext( rtl::OUString::createFromAscii(
-                                                                                      "com.sun.star.help.HelpIndexer" ), xContext ) , UNO_QUERY );
+                        xContext->getServiceManager()->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                                                                      "com.sun.star.help.HelpIndexer" )), xContext ) , UNO_QUERY );
                 }
                 catch (Exception &)
                 {
@@ -451,9 +448,9 @@ void BackendImpl::implProcessHelp
                         aJarFile, rtl_UriCharClassPchar,
                         rtl_UriEncodeIgnoreEscapes,
                         RTL_TEXTENCODING_UTF8 );
-                    rtl::OUString aDestBasePath = rtl::OUString::createFromAscii( "vnd.sun.star.pkg://" );
+                    rtl::OUString aDestBasePath(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.pkg://" ));
                     aDestBasePath += aEncodedJarFilePath;
-                    aDestBasePath += rtl::OUString::createFromAscii( "/" );
+                    aDestBasePath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" ));
 
                     sal_Int32 nLenLangFolderURL = aLangURL.getLength() + 1;
 
@@ -499,20 +496,20 @@ void BackendImpl::implProcessHelp
                     {
                         Sequence<uno::Any> aParamsSeq( 6 );
 
-                        aParamsSeq[0] = uno::makeAny( rtl::OUString::createFromAscii( "-lang" ) );
+                        aParamsSeq[0] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-lang" )) );
 
                         rtl::OUString aLang;
                         sal_Int32 nLastSlash = aLangURL.lastIndexOf( '/' );
                         if( nLastSlash != -1 )
                             aLang = aLangURL.copy( nLastSlash + 1 );
                         else
-                            aLang = rtl::OUString::createFromAscii( "en" );
+                            aLang = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "en" ));
                         aParamsSeq[1] = uno::makeAny( aLang );
 
-                        aParamsSeq[2] = uno::makeAny( rtl::OUString::createFromAscii( "-mod" ) );
-                        aParamsSeq[3] = uno::makeAny( rtl::OUString::createFromAscii( "help" ) );
+                        aParamsSeq[2] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-mod" )) );
+                        aParamsSeq[3] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "help" )) );
 
-                        aParamsSeq[4] = uno::makeAny( rtl::OUString::createFromAscii( "-zipdir" ) );
+                        aParamsSeq[4] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-zipdir" )) );
                         rtl::OUString aSystemPath;
                         osl::FileBase::getSystemPathFromFileURL(
                             langFolderDestExpanded, aSystemPath );
@@ -520,7 +517,7 @@ void BackendImpl::implProcessHelp
 
                         Sequence< sal_Int16 > aOutParamIndex;
                         Sequence< uno::Any > aOutParam;
-                        uno::Any aRet = xInvocation->invoke( rtl::OUString::createFromAscii( "createIndex" ),
+                        uno::Any aRet = xInvocation->invoke( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "createIndex" )),
                                                              aParamsSeq, aOutParamIndex, aOutParam );
                     }
 
@@ -560,14 +557,14 @@ void BackendImpl::implProcessHelp
                             aErrStr += aErrMsg;
                             if( nErrStrId == RID_STR_HELPPROCESSING_XMLPARSING_ERROR && aErrorInfo.m_aXMLParsingFile.getLength() )
                             {
-                                aErrStr += rtl::OUString::createFromAscii( " in " );
+                                aErrStr += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " in " ));
 
                                 rtl::OUString aDecodedFile = rtl::Uri::decode( aErrorInfo.m_aXMLParsingFile,
                                                                                rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 );
                                 aErrStr += aDecodedFile;
                                 if( aErrorInfo.m_nXMLParsingLine != -1 )
                                 {
-                                    aErrStr += rtl::OUString::createFromAscii( ", line " );
+                                    aErrStr += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ", line " ));
                                     aErrStr += ::rtl::OUString::valueOf( aErrorInfo.m_nXMLParsingLine );
                                 }
                             }
@@ -590,7 +587,6 @@ void BackendImpl::implProcessHelp
     }
 }
 
-
 void BackendImpl::implCollectXhpFiles( const rtl::OUString& aDir,
     std::vector< rtl::OUString >& o_rXhpFileVector )
 {
@@ -613,7 +609,7 @@ void BackendImpl::implCollectXhpFiles( const rtl::OUString& aDir,
             if( nLastDot != -1 )
             {
                 rtl::OUString aExt = aURL.copy( nLastDot + 1 );
-                if( aExt.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii( "xhp" ) ) )
+                if( aExt.equalsIgnoreAsciiCase( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "xhp" )) ) )
                     o_rXhpFileVector.push_back( aURL );
             }
         }
@@ -629,15 +625,15 @@ Reference< ucb::XSimpleFileAccess > BackendImpl::getFileAccess( void )
         {
             m_xSFA = Reference< ucb::XSimpleFileAccess >(
                 xContext->getServiceManager()->createInstanceWithContext(
-                    rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" )),
                     xContext ), UNO_QUERY );
         }
         if( !m_xSFA.is() )
         {
             throw RuntimeException(
-                ::rtl::OUString::createFromAscii(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "dp_registry::backend::help::BackendImpl::getFileAccess(), "
-                "could not instatiate SimpleFileAccess." ),
+                "could not instatiate SimpleFileAccess." )),
                 Reference< XInterface >() );
         }
     }
diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
index 2f3a566e6151..315b32867760 100644
--- a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
+++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
@@ -136,40 +136,9 @@ HelpBackendDb::getEntry(::rtl::OUString const & url)
 
 ::std::list<OUString> HelpBackendDb::getAllDataUrls()
 {
-    try
-    {
-        ::std::list<OUString> listRet;
-        Reference<css::xml::dom::XDocument> doc = getDocument();
-        Reference<css::xml::dom::XNode> root = doc->getFirstChild();
-
-        Reference<css::xml::xpath::XXPathAPI> xpathApi = getXPathAPI();
-        const OUString sPrefix = getNSPrefix();
-        OUString sExpression(
-            sPrefix + OUSTR(":help/") + sPrefix + OUSTR(":data-url/text()"));
-        Reference<css::xml::dom::XNodeList> nodes =
-            xpathApi->selectNodeList(root, sExpression);
-        if (nodes.is())
-        {
-            sal_Int32 length = nodes->getLength();
-            for (sal_Int32 i = 0; i < length; i++)
-                listRet.push_back(nodes->item(i)->getNodeValue());
-        }
-        return listRet;
-    }
-    catch (css::deployment::DeploymentException& )
-    {
-        throw;
-    }
-    catch(css::uno::Exception &)
-    {
-        Any exc( ::cppu::getCaughtException() );
-        throw css::deployment::DeploymentException(
-            OUSTR("Extension Manager: failed to read data entry in help backend db: ") +
-            m_urlDb, 0, exc);
-    }
+    return getOneChildFromAllEntries(OUString(RTL_CONSTASCII_USTRINGPARAM("data-url")));
 }
 
-
 } // namespace help
 } // namespace backend
 } // namespace dp_registry
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h
index afadfc6cf5fd..4e97689e253f 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -56,8 +56,7 @@ namespace css = ::com::sun::star;
 
 class PackageRegistryBackend;
 
-char const* const BACKEND_SERVICE_NAME =
-"com.sun.star.deployment.PackageRegistryBackend";
+#define BACKEND_SERVICE_NAME "com.sun.star.deployment.PackageRegistryBackend"
 
 typedef ::cppu::WeakComponentImplHelper1<
     css::deployment::XPackage > t_PackageBase;
@@ -122,16 +121,16 @@ public:
         const ::rtl::OUString m_mediaType;
         const ::rtl::OUString m_fileFilter;
         const ::rtl::OUString m_shortDescr;
-        const sal_uInt16 m_smallIcon, m_smallIcon_HC;
+        const sal_uInt16 m_smallIcon;
     public:
         virtual ~TypeInfo();
         TypeInfo( ::rtl::OUString const & mediaType,
                   ::rtl::OUString const & fileFilter,
                   ::rtl::OUString const & shortDescr,
-                  sal_uInt16 smallIcon, sal_uInt16 smallIcon_HC )
+                  sal_uInt16 smallIcon)
             : m_mediaType(mediaType), m_fileFilter(fileFilter),
               m_shortDescr(shortDescr),
-              m_smallIcon(smallIcon), m_smallIcon_HC(smallIcon_HC)
+              m_smallIcon(smallIcon)
             {}
         // XPackageTypeInfo
         virtual ::rtl::OUString SAL_CALL getMediaType()
diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx
index 5e9b6c0cf703..e06538595cb7 100644
--- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx
+++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx
@@ -140,8 +140,6 @@ protected:
      */
     virtual ::rtl::OUString getKeyElementName()=0;
 
-
-
 public:
     BackendDb(css::uno::Reference<css::uno::XComponentContext> const &  xContext,
               ::rtl::OUString const & url);
@@ -164,7 +162,6 @@ public:
 
 };
 
-
 }
 }
 #endif
diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
index 0ae1004e7119..29df20956ea0 100644
--- a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
+++ b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
@@ -29,7 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_desktop.hxx"
 
-#include "rtl/string.h"
 #include "rtl/bootstrap.hxx"
 #include "cppuhelper/exc_hlp.hxx"
 #include "com/sun/star/uno/XComponentContext.hpp"
diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
index d045dfffef91..e94c846887c3 100644
--- a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
+++ b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
@@ -26,13 +26,14 @@
  *
  ************************************************************************/
 
-
 #if ! defined INCLUDED_DP_EXTBACKENDDB_HXX
 #define INCLUDED_DP_EXTBACKENDDB_HXX
 
-#include "rtl/ustring.hxx"
-#include "rtl/string.hxx"
+#include <utility>
 #include <vector>
+
+#include "rtl/ustring.hxx"
+
 #include "dp_backenddb.hxx"
 
 namespace css = ::com::sun::star;
@@ -74,11 +75,9 @@ public:
         ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString> > items;
         typedef ::std::vector<
             ::std::pair< ::rtl::OUString, ::rtl::OUString> >::const_iterator ITC_ITEMS;
-
     };
 
 public:
-
     ExtensionBackendDb( css::uno::Reference<css::uno::XComponentContext> const &  xContext,
                         ::rtl::OUString const & url);
 
@@ -88,8 +87,6 @@ public:
 
 };
 
-
-
 }
 }
 }
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 78c49dd065f2..dba70f598857 100644..100755
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -301,15 +301,13 @@ BackendImpl::BackendImpl(
                              OUSTR("application/vnd.sun.star.package-bundle"),
                              OUSTR("*.oxt;*.uno.pkg"),
                              getResourceString(RID_STR_PACKAGE_BUNDLE),
-                             RID_IMG_DEF_PACKAGE_BUNDLE,
-                             RID_IMG_DEF_PACKAGE_BUNDLE_HC ) ),
+                             RID_IMG_DEF_PACKAGE_BUNDLE ) ),
       m_xLegacyBundleTypeInfo( new Package::TypeInfo(
                                    OUSTR("application/"
                                          "vnd.sun.star.legacy-package-bundle"),
                                    OUSTR("*.zip"),
                                    m_xBundleTypeInfo->getShortDescription(),
-                                   RID_IMG_DEF_PACKAGE_BUNDLE,
-                                   RID_IMG_DEF_PACKAGE_BUNDLE_HC ) ),
+                                   RID_IMG_DEF_PACKAGE_BUNDLE ) ),
     m_typeInfos(2)
 {
     m_typeInfos[ 0 ] = m_xBundleTypeInfo;
@@ -347,7 +345,7 @@ Sequence<OUString> BackendImpl::getSupportedServiceNames()
     throw (RuntimeException)
 {
     return comphelper::makeSequence(
-        OUString::createFromAscii(BACKEND_SERVICE_NAME) );
+        OUString(RTL_CONSTASCII_USTRINGPARAM(BACKEND_SERVICE_NAME)) );
 }
 
 // XPackageRegistry
@@ -987,16 +985,20 @@ OUString BackendImpl::PackageImpl::getDescription()
     if (sRelativeURL.getLength())
     {
         OUString sURL = m_url_expanded + OUSTR("/") + sRelativeURL;
-        sDescription = getTextFromURL(
-            css::uno::Reference< css::ucb::XCommandEnvironment >(), sURL);
 
+        try
+        {
+            sDescription = getTextFromURL( css::uno::Reference< css::ucb::XCommandEnvironment >(), sURL );
+        }
+        catch ( css::deployment::DeploymentException& )
+        {
+            OSL_ENSURE( 0, ::rtl::OUStringToOString( ::comphelper::anyToString( ::cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() );
+        }
     }
+
     if (sDescription.getLength())
         return sDescription;
-    else if(m_oldDescription.getLength())
-        return m_oldDescription;
-    else
-        return OUString();
+    return m_oldDescription;
 }
 
 //______________________________________________________________________________
diff --git a/desktop/source/deployment/registry/script/dp_lib_container.cxx b/desktop/source/deployment/registry/script/dp_lib_container.cxx
index 1fc4c3d211bc..2bc2c07130a0 100644
--- a/desktop/source/deployment/registry/script/dp_lib_container.cxx
+++ b/desktop/source/deployment/registry/script/dp_lib_container.cxx
@@ -29,11 +29,17 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_desktop.hxx"
 
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/ucb/XCommandEnvironment.hpp"
+
 #include "dp_script.hrc"
 #include "dp_resource.h"
 #include "dp_xml.h"
 #include "dp_lib_container.h"
+
+#include "rtl/ustring.hxx"
 #include "ucbhelper/content.hxx"
+#include "xmlscript/xmllib_imexp.hxx"
 
 
 using namespace ::dp_misc;
diff --git a/desktop/source/deployment/registry/script/dp_lib_container.h b/desktop/source/deployment/registry/script/dp_lib_container.h
index 13e29659d30e..0cd5cb2cba90 100644
--- a/desktop/source/deployment/registry/script/dp_lib_container.h
+++ b/desktop/source/deployment/registry/script/dp_lib_container.h
@@ -29,11 +29,20 @@
 #if ! defined INCLUDED_DP_LIB_CONTAINER_H
 #define INCLUDED_DP_LIB_CONTAINER_H
 
-#include "rtl/ustring.hxx"
-#include "xmlscript/xmllib_imexp.hxx"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "com/sun/star/ucb/XCommandEnvironment.hpp"
+#include <com/sun/star/uno/Reference.hxx>
 
+namespace com { namespace sun { namespace star {
+    namespace uno {
+        class XComponentContext;
+    }
+    namespace ucb {
+        class XCommandEnvironment;
+    }
+}}}
+
+namespace rtl {
+    class OUString;
+}
 
 namespace css = ::com::sun::star;
 
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index d578ffcf0c40..f760e98bbf7f 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -41,7 +41,6 @@
 #include "svl/inettype.hxx"
 #include "com/sun/star/util/XUpdatable.hpp"
 #include "com/sun/star/script/XLibraryContainer3.hpp"
-#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
 #include <com/sun/star/util/XMacroExpander.hpp>
 #include <com/sun/star/uri/XUriReferenceFactory.hpp>
 #include <memory>
@@ -62,7 +61,6 @@ namespace {
 typedef ::cppu::ImplInheritanceHelper1<
     ::dp_registry::backend::PackageRegistryBackend, util::XUpdatable > t_helper;
 
-//==============================================================================
 class BackendImpl : public t_helper
 {
     class PackageImpl : public ::dp_registry::backend::Package
@@ -105,11 +103,6 @@ class BackendImpl : public t_helper
     void deleteDataFromDb(OUString const & url);
     bool isRegisteredInDb(OUString const & url);
 
-
-
-//     Reference< ucb::XSimpleFileAccess > getFileAccess( void );
-//  Reference< ucb::XSimpleFileAccess > m_xSFA;
-
     const Reference<deployment::XPackageTypeInfo> m_xBasicLibTypeInfo;
     const Reference<deployment::XPackageTypeInfo> m_xDialogLibTypeInfo;
     Sequence< Reference<deployment::XPackageTypeInfo> > m_typeInfos;
@@ -164,13 +157,13 @@ BackendImpl::BackendImpl(
                                      "vnd.sun.star.basic-library"),
                                OUString() /* no file filter */,
                                getResourceString(RID_STR_BASIC_LIB),
-                               RID_IMG_SCRIPTLIB, RID_IMG_SCRIPTLIB_HC ) ),
+                               RID_IMG_SCRIPTLIB) ),
       m_xDialogLibTypeInfo( new Package::TypeInfo(
                                 OUSTR("application/"
                                       "vnd.sun.star.dialog-library"),
                                 OUString() /* no file filter */,
                                 getResourceString(RID_STR_DIALOG_LIB),
-                                RID_IMG_DIALOGLIB, RID_IMG_DIALOGLIB_HC ) ),
+                                RID_IMG_DIALOGLIB) ),
       m_typeInfos( 2 )
 {
     m_typeInfos[ 0 ] = m_xBasicLibTypeInfo;
@@ -310,15 +303,13 @@ BackendImpl * BackendImpl::PackageImpl::getMyBackend() const
     }
     return pBackend;
 }
-//______________________________________________________________________________
+
 beans::Optional< beans::Ambiguous<sal_Bool> >
 BackendImpl::PackageImpl::isRegistered_(
-    ::osl::ResettableMutexGuard &,
-    ::rtl::Reference<AbortChannel> const &,
-    Reference<XCommandEnvironment> const & xCmdEnv )
+    ::osl::ResettableMutexGuard & /* guard */,
+    ::rtl::Reference<AbortChannel> const & /* abortChannel */,
+    Reference<XCommandEnvironment> const & /* xCmdEnv */ )
 {
-    (void)xCmdEnv;
-
     BackendImpl * that = getMyBackend();
     Reference< deployment::XPackage > xThisPackage( this );
 
@@ -328,16 +319,67 @@ BackendImpl::PackageImpl::isRegistered_(
         beans::Ambiguous<sal_Bool>( registered, false /* IsAmbiguous */ ) );
 }
 
-//______________________________________________________________________________
+void
+lcl_maybeRemoveScript(
+        bool const bExists,
+        OUString const& rName,
+        OUString const& rScriptURL,
+        Reference<css::script::XLibraryContainer3> const& xScriptLibs)
+{
+    if (bExists && xScriptLibs.is() && xScriptLibs->hasByName(rName))
+    {
+        const OUString sScriptUrl = xScriptLibs->getOriginalLibraryLinkURL(rName);
+        if (sScriptUrl.equals(rScriptURL))
+            xScriptLibs->removeLibrary(rName);
+    }
+}
+
+bool
+lcl_maybeAddScript(
+        bool const bExists,
+        OUString const& rName,
+        OUString const& rScriptURL,
+        Reference<css::script::XLibraryContainer3> const& xScriptLibs)
+{
+    if (bExists && xScriptLibs.is())
+    {
+        bool bCanAdd = true;
+        if (xScriptLibs->hasByName(rName))
+        {
+            const OUString sOriginalUrl = xScriptLibs->getOriginalLibraryLinkURL(rName);
+            //We assume here that library names in extensions are unique, which may not be the case
+            //ToDo: If the script exist in another extension, then both extensions must have the
+            //same id
+            if (sOriginalUrl.match(OUSTR("vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE"))
+                || sOriginalUrl.match(OUSTR("vnd.sun.star.expand:$UNO_SHARED_PACKAGES_CACHE"))
+                || sOriginalUrl.match(OUSTR("vnd.sun.star.expand:$BUNDLED_EXTENSIONS")))
+            {
+                xScriptLibs->removeLibrary(rName);
+                bCanAdd = true;
+            }
+            else
+            {
+                bCanAdd = false;
+            }
+        }
+
+        if (bCanAdd)
+        {
+            xScriptLibs->createLibraryLink(rName, rScriptURL, false);
+            return xScriptLibs->hasByName(rName);
+        }
+    }
+
+    return false;
+}
+
 void BackendImpl::PackageImpl::processPackage_(
-    ::osl::ResettableMutexGuard &,
+    ::osl::ResettableMutexGuard & /* guard */,
     bool doRegisterPackage,
     bool startup,
-    ::rtl::Reference<AbortChannel> const &,
-    Reference<XCommandEnvironment> const & xCmdEnv )
+    ::rtl::Reference<AbortChannel> const & /* abortChannel */,
+    Reference<XCommandEnvironment> const & /* xCmdEnv */ )
 {
-    (void)xCmdEnv;
-
     BackendImpl * that = getMyBackend();
 
     Reference< deployment::XPackage > xThisPackage( this );
@@ -386,19 +428,8 @@ void BackendImpl::PackageImpl::processPackage_(
             //we also prevent and live deployment at startup
             if (!isRemoved() && !startup)
             {
-                if (bScript && xScriptLibs.is() && xScriptLibs->hasByName(m_name))
-                {
-                    const OUString sScriptUrl = xScriptLibs->getOriginalLibraryLinkURL(m_name);
-                    if (sScriptUrl.equals(m_scriptURL))
-                        xScriptLibs->removeLibrary(m_name);
-                }
-
-                if (bDialog && xDialogLibs.is() && xDialogLibs->hasByName(m_dialogName))
-                {
-                    const OUString sDialogUrl = xDialogLibs->getOriginalLibraryLinkURL(m_dialogName);
-                    if (sDialogUrl.equals(m_dialogURL))
-                        xDialogLibs->removeLibrary(m_dialogName);
-                }
+                lcl_maybeRemoveScript(bScript, m_name, m_scriptURL, xScriptLibs);
+                lcl_maybeRemoveScript(bDialog, m_dialogName, m_dialogURL, xDialogLibs);
             }
             getMyBackend()->deleteDataFromDb(getURL());
             return;
@@ -409,72 +440,14 @@ void BackendImpl::PackageImpl::processPackage_(
 
     // Update LibraryContainer
     bool bScriptSuccess = false;
-    const bool bReadOnly = false;
-
     bool bDialogSuccess = false;
     if (!startup)
     {
         //If there is a bundled extension, and the user installes the same extension
         //then the script from the bundled extension must be removed. If this does not work
         //then live deployment does not work for scripts.
-        if (bScript && xScriptLibs.is())
-        {
-            bool bCanAdd = true;
-            if (xScriptLibs->hasByName(m_name))
-            {
-                const OUString sOriginalUrl = xScriptLibs->getOriginalLibraryLinkURL(m_name);
-                //We assume here that library names in extensions are unique, which may not be the case
-                //ToDo: If the script exist in another extension, then both extensions must have the
-                //same id
-                if (sOriginalUrl.match(OUSTR("vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE"))
-                    || sOriginalUrl.match(OUSTR("vnd.sun.star.expand:$UNO_SHARED_PACKAGES_CACHE"))
-                    || sOriginalUrl.match(OUSTR("vnd.sun.star.expand:$BUNDLED_EXTENSIONS")))
-                {
-                    xScriptLibs->removeLibrary(m_name);
-                    bCanAdd = true;
-                }
-                else
-                {
-                    bCanAdd = false;
-                }
-            }
-
-            if (bCanAdd)
-            {
-                xScriptLibs->createLibraryLink( m_name, m_scriptURL, bReadOnly );
-                bScriptSuccess = xScriptLibs->hasByName( m_name );
-            }
-        }
-
-
-        if (bDialog && xDialogLibs.is())
-        {
-            bool bCanAdd = true;
-            if (xDialogLibs->hasByName(m_dialogName))
-            {
-                const OUString sOriginalUrl = xDialogLibs->getOriginalLibraryLinkURL(m_dialogName);
-                //We assume here that library names in extensions are unique, which may not be the case
-                //ToDo: If the script exist in another extension, then both extensions must have the
-                //same id
-                if (sOriginalUrl.match(OUSTR("vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE"))
-                    || sOriginalUrl.match(OUSTR("vnd.sun.star.expand:$UNO_SHARED_PACKAGES_CACHE"))
-                    || sOriginalUrl.match(OUSTR("vnd.sun.star.expand:$BUNDLED_EXTENSIONS")))
-                {
-                    xDialogLibs->removeLibrary(m_dialogName);
-                    bCanAdd = true;
-                }
-                else
-                {
-                    bCanAdd = false;
-                }
-            }
-
-            if (bCanAdd)
-            {
-                xDialogLibs->createLibraryLink( m_dialogName, m_dialogURL, bReadOnly );
-                bDialogSuccess = xDialogLibs->hasByName(m_dialogName);
-            }
-        }
+        bScriptSuccess = lcl_maybeAddScript(bScript, m_name, m_scriptURL, xScriptLibs);
+        bDialogSuccess = lcl_maybeAddScript(bDialog, m_dialogName, m_dialogURL, xDialogLibs);
     }
     bool bSuccess = bScript || bDialog;     // Something must have happened
     if( bRunning && !startup)
diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
index fe0f378160d9..11835ddfa957 100644
--- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
@@ -99,9 +99,9 @@ ParcelDescDocHandler::startElement( const OUString& aName,
         aName + OUSTR("\n"));
     if ( !skipIndex )
     {
-        if ( aName.equals( OUString::createFromAscii( "parcel" ) ) )
+        if ( aName.equals( OUString(RTL_CONSTASCII_USTRINGPARAM( "parcel" )) ) )
         {
-            m_sLang = xAttribs->getValueByName( OUString::createFromAscii( "language" ) );
+            m_sLang = xAttribs->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM( "language" )) );
         }
         ++skipIndex;
     }
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index 02b6452f33cb..7904331ef11b 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -168,7 +168,7 @@ BackendImpl::BackendImpl(
                        OUSTR("application/vnd.sun.star.framework-script"),
                        OUString() /* no file filter */,
                        OUSTR("Scripting Framework Script Library"),
-                       RID_IMG_SCRIPTLIB, RID_IMG_SCRIPTLIB_HC ) )
+                       RID_IMG_SCRIPTLIB ) )
 {
     if (! transientMode())
     {
@@ -256,7 +256,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
         {
             if (subType.EqualsIgnoreCaseAscii("vnd.sun.star.framework-script"))
             {
-                OUString lang = OUString::createFromAscii("Script");
+                OUString lang = OUString(RTL_CONSTASCII_USTRINGPARAM("Script"));
                 OUString sParcelDescURL = makeURL(
                     url, OUSTR("parcel-descriptor.xml") );
 
diff --git a/desktop/source/migration/cfgfilter.cxx b/desktop/source/migration/cfgfilter.cxx
index 7ee970235acc..5928ad8ce76f 100644
--- a/desktop/source/migration/cfgfilter.cxx
+++ b/desktop/source/migration/cfgfilter.cxx
@@ -53,7 +53,7 @@ void SAL_CALL CConfigFilter::initialize(const Sequence< Any >& seqArgs)
         throw (Exception)
 {
     NamedValue nv;
-    for (sal_Int32 i=0; i < seqArgs.getLength(); i++)
+    for (sal_Int32 i=0; i < seqArgs.getLength(); ++i)
     {
         if (seqArgs[i] >>= nv)
         {
@@ -64,7 +64,7 @@ void SAL_CALL CConfigFilter::initialize(const Sequence< Any >& seqArgs)
         }
     }
     if (m_aCurrentComponent.getLength() == 0)
-        m_aCurrentComponent = OUString::createFromAscii("unknown.component");
+        m_aCurrentComponent = OUString(RTL_CONSTASCII_USTRINGPARAM("unknown.component"));
 
     if (!m_xSourceLayer.is()) {
         throw Exception();
@@ -78,7 +78,7 @@ void CConfigFilter::pushElement(rtl::OUString aName, sal_Bool bUse)
     OUString aPath;
     if (!m_elementStack.empty()) {
         aPath = m_elementStack.top().path; // or use base path
-        aPath += OUString::createFromAscii("/");
+        aPath += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     }
     aPath += aName;
 
@@ -103,13 +103,13 @@ sal_Bool CConfigFilter::checkElement(rtl::OUString aName)
     // get full pathname for element
     OUString aFullPath;
     if (!m_elementStack.empty())
-        aFullPath = m_elementStack.top().path + OUString::createFromAscii("/");
+        aFullPath = m_elementStack.top().path + OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
     aFullPath += aName;
 
     // check whether any include patterns patch this path
     for (strings_v::const_iterator i_in = m_pvInclude->begin();
-        i_in != m_pvInclude->end(); i_in++)
+        i_in != m_pvInclude->end(); ++i_in)
     {
         // pattern is beginning of path
         // or path is a begiing for pattern
@@ -124,7 +124,7 @@ sal_Bool CConfigFilter::checkElement(rtl::OUString aName)
     if (bResult)
     {
         for (strings_v::const_iterator i_ex = m_pvExclude->begin();
-            i_ex != m_pvExclude->end(); i_ex++)
+            i_ex != m_pvExclude->end(); ++i_ex)
         {
             if (aFullPath.match(*i_ex, 0)) // pattern is beginning of path
             {
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 54799c7ab507..0f3726e663a0 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -85,6 +85,7 @@ static const ::rtl::OUString ITEM_DESCRIPTOR_LABEL(RTL_CONSTASCII_USTRINGPARAM("
 
 static const ::rtl::OUString MENU_SEPERATOR(RTL_CONSTASCII_USTRINGPARAM(" | "));
 static const ::rtl::OUString MENU_SUBMENU(RTL_CONSTASCII_USTRINGPARAM("..."));
+static const ::rtl::OUString MIGRATION_STAMP_NAME(RTL_CONSTASCII_USTRINGPARAM("/MIGRATED"));
 
 ::rtl::OUString retrieveLabelFromCommand(const ::rtl::OUString& sCommand, const ::rtl::OUString& sModuleIdentifier)
 {
@@ -194,15 +195,31 @@ static const ::rtl::OUString MENU_SUBMENU(RTL_CONSTASCII_USTRINGPARAM("..."));
     return sIdentifier;
 }
 
-sal_Bool MigrationImpl::initializeMigration()
+bool MigrationImpl::alreadyMigrated()
 {
-    sal_Bool bRet = sal_False;
+    rtl::OUString aStr = m_aInfo.userdata + MIGRATION_STAMP_NAME;
+    File aFile(aStr);
+    // create migration stamp, and/or check its existence
+    bool bRet = aFile.open (osl_File_OpenFlag_Write | osl_File_OpenFlag_Create | osl_File_OpenFlag_NoLock) == FileBase::E_EXIST;
+    OSL_TRACE( "File '%s' exists? %d\n",
+             rtl::OUStringToOString(aStr, RTL_TEXTENCODING_ASCII_US).getStr(),
+             bRet );
+    return bRet;
+}
+
+bool MigrationImpl::initializeMigration()
+{
+    bool bRet = false;
 
     if (!checkMigrationCompleted()) {
         readAvailableMigrations(m_vMigrationsAvailable);
         sal_Int32 nIndex = findPreferedMigrationProcess(m_vMigrationsAvailable);
-        if ( nIndex >= 0 )
+        // m_aInfo is now set to the preferred migration source
+        if ( nIndex >= 0 ) {
+            if (alreadyMigrated())
+                return false;
             m_vrMigrations = readMigrationSteps(m_vMigrationsAvailable[nIndex].name);
+        }
 
         bRet = m_aInfo.userdata.getLength() > 0;
     }
@@ -358,7 +375,7 @@ void MigrationImpl::setMigrationCompleted()
     }
 }
 
-sal_Bool MigrationImpl::checkMigrationCompleted()
+bool MigrationImpl::checkMigrationCompleted()
 {
     sal_Bool bMigrationCompleted = sal_False;
     try {
@@ -367,15 +384,17 @@ sal_Bool MigrationImpl::checkMigrationCompleted()
         aPropertySet->getPropertyValue(
             OUString(RTL_CONSTASCII_USTRINGPARAM("MigrationCompleted"))) >>= bMigrationCompleted;
 
-        static const char* pEnv = getenv("SAL_DISABLE_USERMIGRATION" );
-        if( !bMigrationCompleted && pEnv != NULL )
+        if( !bMigrationCompleted && getenv("SAL_DISABLE_USERMIGRATION" ) )
         {
             // migration prevented - fake it's success
             setMigrationCompleted();
+            bMigrationCompleted = sal_True;
         }
     } catch (Exception&) {
         // just return false...
     }
+    OSL_TRACE( "Migration %s", bMigrationCompleted ? "already completed" : "not done" );
+
     return bMigrationCompleted;
 }
 
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index 9a1fb2074090..ebb7c96c620c 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -207,6 +207,7 @@ private:
 
     // functions to control the migration process
     bool          readAvailableMigrations(migrations_available&);
+    bool          alreadyMigrated();
     migrations_vr readMigrationSteps(const ::rtl::OUString& rMigrationName);
     sal_Int32     findPreferedMigrationProcess(const migrations_available&);
     install_info  findInstallation(const strings_v& rVersions);
@@ -235,12 +236,12 @@ private:
     void refresh();
 
     void setMigrationCompleted();
-    sal_Bool checkMigrationCompleted();
+    bool checkMigrationCompleted();
 
 public:
     MigrationImpl(const NS_UNO::Reference< NS_CSS::lang::XMultiServiceFactory >&);
     ~MigrationImpl();
-    sal_Bool initializeMigration();
+    bool initializeMigration();
     sal_Bool doMigration();
     rtl::OUString getOldVersionName();
 };
diff --git a/desktop/source/migration/services/autocorrmigration.cxx b/desktop/source/migration/services/autocorrmigration.cxx
index 3030b429d1e9..a54ed08548cc 100644
--- a/desktop/source/migration/services/autocorrmigration.cxx
+++ b/desktop/source/migration/services/autocorrmigration.cxx
@@ -175,7 +175,7 @@ namespace migration
                 ::rtl::OUString sLanguageType = sSourceLocalName.copy( nStart, nEnd - nStart );
                 ::rtl::OUString sIsoName = MsLangId::convertLanguageToIsoString( (LanguageType) sLanguageType.toInt32() );
                 ::rtl::OUString sTargetLocalName = sBaseName;
-                sTargetLocalName += ::rtl::OUString::createFromAscii( "_" );
+                sTargetLocalName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_" ));
                 sTargetLocalName += sIsoName;
                 sTargetLocalName += sSuffix;
                 ::rtl::OUString sTargetName = sTargetDir + sTargetLocalName;
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index 01c445630290..a5b13a636bfc 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -69,10 +69,10 @@ Acceptor::Acceptor( const Reference< XMultiServiceFactory >& rFactory )
 {
     m_rSMgr = rFactory;
     m_rAcceptor = Reference< XAcceptor > (m_rSMgr->createInstance(
-        rtl::OUString::createFromAscii( "com.sun.star.connection.Acceptor" )),
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.connection.Acceptor" ))),
         UNO_QUERY );
     m_rBridgeFactory = Reference < XBridgeFactory > (m_rSMgr->createInstance(
-        rtl::OUString::createFromAscii( "com.sun.star.bridge.BridgeFactory" )),
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.bridge.BridgeFactory" ))),
         UNO_QUERY );
     // get component context
     m_rContext = getComponentContext(m_rSMgr);
@@ -174,7 +174,7 @@ void SAL_CALL Acceptor::initialize( const Sequence<Any>& aArguments )
         // "<connectString>;<protocol>"
         sal_Int32 nIndex1 = m_aAcceptString.indexOf( (sal_Unicode) ';' );
         if (nIndex1 < 0) throw IllegalArgumentException(
-            OUString::createFromAscii("Invalid accept-string format"), m_rContext, 1);
+            OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid accept-string format")), m_rContext, 1);
         m_aConnectString = m_aAcceptString.copy( 0 , nIndex1 ).trim();
         nIndex1++;
         sal_Int32 nIndex2 = m_aAcceptString.indexOf( (sal_Unicode) ';' , nIndex1 );
@@ -200,7 +200,7 @@ void SAL_CALL Acceptor::initialize( const Sequence<Any>& aArguments )
     if (!bOk)
     {
         throw IllegalArgumentException(
-            OUString::createFromAscii("invalid initialization"), m_rContext, 1);
+            OUString(RTL_CONSTASCII_USTRINGPARAM("invalid initialization")), m_rContext, 1);
     }
 }
 
@@ -275,14 +275,14 @@ Reference<XInterface> SAL_CALL AccInstanceProvider::getInstance (const OUString&
     else if ( aName.compareToAscii("StarOffice.NamingService" ) == 0 )
     {
         Reference< XNamingService > rNamingService(
-            m_rSMgr->createInstance( OUString::createFromAscii( "com.sun.star.uno.NamingService" )),
+            m_rSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.NamingService" ))),
             UNO_QUERY );
         if ( rNamingService.is() )
         {
             rNamingService->registerObject(
-                OUString::createFromAscii( "StarOffice.ServiceManager" ), m_rSMgr );
+                OUString(RTL_CONSTASCII_USTRINGPARAM( "StarOffice.ServiceManager" )), m_rSMgr );
             rNamingService->registerObject(
-                OUString::createFromAscii( "StarOffice.ComponentContext" ), getComponentContext( m_rSMgr ));
+                OUString(RTL_CONSTASCII_USTRINGPARAM( "StarOffice.ComponentContext" )), getComponentContext( m_rSMgr ));
             rInstance = rNamingService;
         }
     }
diff --git a/desktop/source/so_comp/evaluation.cxx b/desktop/source/so_comp/evaluation.cxx
index 9712aa6eaf72..8f00343ce3a9 100644
--- a/desktop/source/so_comp/evaluation.cxx
+++ b/desktop/source/so_comp/evaluation.cxx
@@ -67,7 +67,7 @@ const char* SOEvaluation::serviceName = "com.sun.star.office.Evaluation";
 
 OUString SOEvaluation::GetImplementationName()
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( implementationName));
+    return OUString::createFromAscii(implementationName);
 }
 
 Sequence< OUString > SOEvaluation::GetSupportedServiceNames()
@@ -151,7 +151,7 @@ rtl::OUString SAL_CALL SOEvaluation::getExactName( const rtl::OUString& rApproxi
                     rValue.Value >>= aEval;
             }
             // append eval string to title
-            aTitle += OUString::createFromAscii(" ") + aEval;
+            aTitle += OUString(RTL_CONSTASCII_USTRINGPARAM(" ")) + aEval;
             if ( bExpired )
                 throw RuntimeException();
         }
diff --git a/desktop/source/so_comp/oemjob.cxx b/desktop/source/so_comp/oemjob.cxx
index e2e9a05a9a80..1ff4c1e4c29c 100644
--- a/desktop/source/so_comp/oemjob.cxx
+++ b/desktop/source/so_comp/oemjob.cxx
@@ -68,7 +68,7 @@ const char* OEMPreloadJob::serviceName = "com.sun.star.office.OEMPreloadJob";
 
 OUString OEMPreloadJob::GetImplementationName()
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( implementationName));
+    return OUString::createFromAscii(implementationName);
 }
 
 Sequence< OUString > OEMPreloadJob::GetSupportedServiceNames()
@@ -151,7 +151,7 @@ throw ( RuntimeException )
     {
         // create OEM preload service dialog
         Reference <XExecutableDialog> xDialog( m_xServiceManager->createInstance(
-            OUString::createFromAscii("org.openoffice.comp.preload.OEMPreloadWizard")),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.preload.OEMPreloadWizard"))),
             UNO_QUERY );
         if ( xDialog.is() ){
             // execute OEM preload dialog and check return value
@@ -165,7 +165,7 @@ throw ( RuntimeException )
                 // terminate.
                 /*
                 Reference< XDesktop > xDesktop( m_xServiceManager->createInstance(
-                    OUString::createFromAscii("com.sun.star.frame.Desktop")),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"))),
                     UNO_QUERY );
                 xDesktop->terminate();
                 */
@@ -199,7 +199,7 @@ throw ( RuntimeException )
     }
     /*
     NamedValue nv;
-    nv.Name  = OUString::createFromAscii("Deactivate");
+    nv.Name  = OUString(RTL_CONSTASCII_USTRINGPARAM("Deactivate"));
     nv.Value <<=  bDeactivate;
     Sequence<NamedValue> s(1);
     s[0] = nv;
@@ -209,7 +209,6 @@ throw ( RuntimeException )
     return r;
 }
 
-
 static sal_Bool existsURL( OUString const& _sURL )
 {
     using namespace osl;
@@ -221,7 +220,6 @@ static sal_Bool existsURL( OUString const& _sURL )
     return sal_False;
 }
 
-
 // locate soffice.ini/.rc file
 static OUString locateIniFile()
 {
diff --git a/desktop/source/so_comp/services.cxx b/desktop/source/so_comp/services.cxx
index a4709b632f27..1eedd4d47bda 100644
--- a/desktop/source/so_comp/services.cxx
+++ b/desktop/source/so_comp/services.cxx
@@ -72,7 +72,6 @@ static const fProvider pInstanceProviders[] =
     NULL
 };
 
-
 static const char** pSupportedServices[] =
 {
     SOEvaluation::interfaces,
@@ -118,9 +117,9 @@ component_writeInfo(
     for (int i = 0; (pServices[i]!=NULL)&&(pImplementations[i]!=NULL); i++) {
         pServiceName= pServices[i];
         pImplName = pImplementations[i];
-        aImpl = OUString::createFromAscii("/")
+        aImpl = OUString(RTL_CONSTASCII_USTRINGPARAM("/"))
               + OUString::createFromAscii(pImplName)
-              + OUString::createFromAscii("/UNO/SERVICES");
+              + OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
         Reference<XRegistryKey> xNewKey = xKey->createKey(aImpl);
         xNewKey->createKey(OUString::createFromAscii(pServiceName));
     }
diff --git a/desktop/source/splash/services_spl.cxx b/desktop/source/splash/services_spl.cxx
index 1421f53e2401..b63f89792a29 100644
--- a/desktop/source/splash/services_spl.cxx
+++ b/desktop/source/splash/services_spl.cxx
@@ -37,7 +37,6 @@
 
 #include "splash.hxx"
 
-
 using namespace rtl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -65,7 +64,6 @@ static const fProvider pInstanceProviders[] =
     NULL
 };
 
-
 static const char** pSupportedServices[] =
 {
     SplashScreen::interfaces,
@@ -110,9 +108,9 @@ component_writeInfo(
     for (int i = 0; (pServices[i]!=NULL)&&(pImplementations[i]!=NULL); i++) {
         pServiceName= pServices[i];
         pImplName = pImplementations[i];
-        aImpl = OUString::createFromAscii("/")
+        aImpl = OUString(RTL_CONSTASCII_USTRINGPARAM("/"))
               + OUString::createFromAscii(pImplName)
-              + OUString::createFromAscii("/UNO/SERVICES");
+              + OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
         Reference<XRegistryKey> xNewKey = xKey->createKey(aImpl);
         xNewKey->createKey(OUString::createFromAscii(pServiceName));
     }
diff --git a/desktop/test/deployment/executable_content/build/hello.c b/desktop/test/deployment/executable_content/build/hello.c
index 4b5b1ae47418..4af0b02ff888 100644
--- a/desktop/test/deployment/executable_content/build/hello.c
+++ b/desktop/test/deployment/executable_content/build/hello.c
@@ -35,9 +35,9 @@ int main(int argc , char** argv, char** envp)
 {
     //prevent warning about unused parameters
     //we need to provide parameter names in C
-    argc = argc;
-    argv = argv;
-    envp = envp;
+    (void)argc;
+    (void)argv;
+    (void)envp;
 
     fprintf(stdout,"Hello world!\n");
     return 0;
diff --git a/desktop/test/deployment/locationtest/manifest.xml b/desktop/test/deployment/locationtest/manifest.xml
index 8791582798bd..3dd6460faffa 100644
--- a/desktop/test/deployment/locationtest/manifest.xml
+++ b/desktop/test/deployment/locationtest/manifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<manifest:manifest>
+<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
  <manifest:file-entry manifest:full-path="LocationTest.jar" manifest:media-type="application/vnd.sun.star.uno-component;type=Java"/>
  <manifest:file-entry manifest:full-path="LocationTest.rdb" manifest:media-type="application/vnd.sun.star.uno-typelibrary;type=RDB"/>
-</manifest:manifest>
\ No newline at end of file
+</manifest:manifest>
diff --git a/desktop/test/deployment/update/updateinfocreation/build/manifest.xml b/desktop/test/deployment/update/updateinfocreation/build/manifest.xml
index 7e3e7947aa0f..fcedabf96b4b 100755
--- a/desktop/test/deployment/update/updateinfocreation/build/manifest.xml
+++ b/desktop/test/deployment/update/updateinfocreation/build/manifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<manifest:manifest>
+<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
  <manifest:file-entry manifest:full-path="TestExtension.jar" manifest:media-type="application/vnd.sun.star.uno-component;type=Java"/>
  <manifest:file-entry manifest:full-path="TestExtension.rdb" manifest:media-type="application/vnd.sun.star.uno-typelibrary;type=RDB"/>
-</manifest:manifest>
\ No newline at end of file
+</manifest:manifest>
diff --git a/desktop/unx/splash/services_unxsplash.cxx b/desktop/unx/splash/services_unxsplash.cxx
index 6e8b63afa57c..2e472983eda8 100644
--- a/desktop/unx/splash/services_unxsplash.cxx
+++ b/desktop/unx/splash/services_unxsplash.cxx
@@ -88,7 +88,7 @@ extern "C"
 void SAL_CALL
 component_getImplementationEnvironment(
     const sal_Char** ppEnvironmentTypeName,
-    uno_Environment** ppEnvironment )
+    uno_Environment** /*ppEnvironment*/ )
 {
     *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
 }
@@ -111,9 +111,9 @@ component_writeInfo(
     {
         pServiceName= pServices[i];
         pImplName = pImplementations[i];
-        aImpl = OUString::createFromAscii( "/" )
+        aImpl = OUString(RTL_CONSTASCII_USTRINGPARAM( "/" ))
               + OUString::createFromAscii( pImplName )
-              + OUString::createFromAscii( "/UNO/SERVICES" );
+              + OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
         Reference<XRegistryKey> xNewKey = xKey->createKey( aImpl );
         xNewKey->createKey( OUString::createFromAscii( pServiceName ) );
     }
@@ -124,7 +124,7 @@ void* SAL_CALL
 component_getFactory(
     const sal_Char* pImplementationName,
     void* pServiceManager,
-    void* pRegistryKey )
+    void* /*pRegistryKey*/ )
 {
     // Set default return value for this operation - if it failed.
     if ( pImplementationName && pServiceManager )
diff --git a/desktop/unx/splash/unxsplash.cxx b/desktop/unx/splash/unxsplash.cxx
index 6c1501416322..ea13f1b381de 100644
--- a/desktop/unx/splash/unxsplash.cxx
+++ b/desktop/unx/splash/unxsplash.cxx
@@ -110,7 +110,7 @@ void SAL_CALL UnxSplashScreen::setValue( sal_Int32 nValue )
 
 // XInitialize
 void SAL_CALL
-UnxSplashScreen::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& aArguments )
+UnxSplashScreen::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& )
     throw ( RuntimeException )
 {
     for ( sal_uInt32 i = 0; i < osl_getCommandArgCount(); i++ )
diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
index 6ab0812b27a6..96ca10484549 100644
--- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
@@ -67,7 +67,7 @@ namespace drawinglayer
 
                 if(xSet.is())
                 {
-                    uno::Any aValue(xSet->getPropertyValue(rtl::OUString::createFromAscii("DefaultControl")));
+                    uno::Any aValue(xSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultControl"))));
                     rtl::OUString aUnoControlTypeName;
 
                     if(aValue >>= aUnoControlTypeName)
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 64d0af5c4b68..e135a3509ba6 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -249,9 +249,12 @@ namespace
             if(nPushFlags)
             {
                 OSL_ENSURE(maPropertyHolders.size(), "PropertyHolders: PUSH with no property holders (!)");
-                PropertyHolder* pNew = new PropertyHolder(*maPropertyHolders.back());
-                pNew->setPushFlags(nPushFlags);
-                maPropertyHolders.push_back(pNew);
+                if ( !maPropertyHolders.empty() )
+                {
+                    PropertyHolder* pNew = new PropertyHolder(*maPropertyHolders.back());
+                    pNew->setPushFlags(nPushFlags);
+                    maPropertyHolders.push_back(pNew);
+                }
             }
         }
 
@@ -355,8 +358,9 @@ namespace
 
         PropertyHolder& Current()
         {
+            static PropertyHolder aDummy;
             OSL_ENSURE(maPropertyHolders.size(), "PropertyHolders: CURRENT with no property holders (!)");
-            return *maPropertyHolders.back();
+            return maPropertyHolders.empty() ? aDummy : *maPropertyHolders.back();
         }
 
         ~PropertyHolders()
diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
index de799da011e1..6c60b3f22281 100644
--- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
@@ -210,7 +210,7 @@ namespace drawinglayer
             if(!xLocalBreakIterator.is())
             {
                 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF(::comphelper::getProcessServiceFactory());
-                xLocalBreakIterator.set(xMSF->createInstance(rtl::OUString::createFromAscii("com.sun.star.i18n.BreakIterator")), ::com::sun::star::uno::UNO_QUERY);
+                xLocalBreakIterator.set(xMSF->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator"))), ::com::sun::star::uno::UNO_QUERY);
             }
 
             if(xLocalBreakIterator.is() && getTextLength())
diff --git a/drawinglayer/source/processor2d/canvasprocessor.cxx b/drawinglayer/source/processor2d/canvasprocessor.cxx
index eeb9e8e5bd19..460cc76487e6 100644
--- a/drawinglayer/source/processor2d/canvasprocessor.cxx
+++ b/drawinglayer/source/processor2d/canvasprocessor.cxx
@@ -1043,8 +1043,8 @@ using namespace com::sun::star;
                         basegfx::B2DPolyPolygon aPoly;
                         basegfx::tools::importFromSvgD(
                             aPoly,
-                            rtl::OUString::createFromAscii(
-                                "m-1 0 h2 m0 -1 v2" ));
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                "m-1 0 h2 m0 -1 v2" )));
                         mxCrossMarkerPoly =
                             basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(
                                 mxCanvas->getDevice(),
@@ -1059,8 +1059,8 @@ using namespace com::sun::star;
                         basegfx::B2DPolyPolygon aPoly;
                         basegfx::tools::importFromSvgD(
                             aPoly,
-                            rtl::OUString::createFromAscii(
-                                "m-2 -3 l5 5 m-3 -2 l5 5 m-3 2 l5 -5 m-2 3 l5 -5" ));
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                "m-2 -3 l5 5 m-3 -2 l5 5 m-3 2 l5 -5 m-2 3 l5 -5" )));
                         mxGluePointPoly =
                             basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(
                                 mxCanvas->getDevice(),
@@ -1071,8 +1071,8 @@ using namespace com::sun::star;
                         basegfx::B2DPolyPolygon aPoly;
                         basegfx::tools::importFromSvgD(
                             aPoly,
-                            rtl::OUString::createFromAscii(
-                                "m-2 -2 l4 4 m-2 2 l4 -4" ));
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                "m-2 -2 l4 4 m-2 2 l4 -4" )));
                         mxGluePointHighlightPoly =
                             basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(
                                 mxCanvas->getDevice(),
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 55b63a8cd7ff..36c06cfc8b18 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1076,7 +1076,7 @@ namespace drawinglayer
                         if(!mxBreakIterator.is())
                         {
                             uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF(::comphelper::getProcessServiceFactory());
-                            mxBreakIterator.set(xMSF->createInstance(rtl::OUString::createFromAscii("com.sun.star.i18n.BreakIterator")), uno::UNO_QUERY);
+                            mxBreakIterator.set(xMSF->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator"))), uno::UNO_QUERY);
                         }
 
                         if(mxBreakIterator.is())
diff --git a/dtrans/source/cnttype/mcnttfactory.cxx b/dtrans/source/cnttype/mcnttfactory.cxx
index 3197ed8b050b..58cadbebdb64 100644
--- a/dtrans/source/cnttype/mcnttfactory.cxx
+++ b/dtrans/source/cnttype/mcnttfactory.cxx
@@ -62,7 +62,7 @@ namespace
     Sequence< OUString > SAL_CALL MimeContentTypeFactory_getSupportedServiceNames( )
     {
         Sequence< OUString > aRet(1);
-        aRet[0] = OUString::createFromAscii("com.sun.star.datatransfer.MimeContentTypeFactory");
+        aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.MimeContentTypeFactory"));
         return aRet;
     }
 }
@@ -94,7 +94,7 @@ Reference< XMimeContentType > CMimeContentTypeFactory::createMimeContentType( co
 OUString SAL_CALL CMimeContentTypeFactory::getImplementationName(  )
     throw( RuntimeException )
 {
-    return OUString::createFromAscii( MIMECONTENTTYPEFACTORY_IMPL_NAME );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( MIMECONTENTTYPEFACTORY_IMPL_NAME ));
 }
 
 // -------------------------------------------------
diff --git a/dtrans/source/cnttype/mcnttype.cxx b/dtrans/source/cnttype/mcnttype.cxx
index 98518ea59508..3edc2eca2ba1 100644
--- a/dtrans/source/cnttype/mcnttype.cxx
+++ b/dtrans/source/cnttype/mcnttype.cxx
@@ -49,10 +49,10 @@ using namespace osl;
 // constants
 //------------------------------------------------------------------------
 
-const OUString TSPECIALS = OUString::createFromAscii( "()<>@,;:\\\"/[]?=" );
-const OUString TOKEN     = OUString::createFromAscii( "!#$%&'*+-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ^_`abcdefghijklmnopqrstuvwxyz{|}~." );
-const OUString SPACE     = OUString::createFromAscii( " " );
-const OUString SEMICOLON = OUString::createFromAscii( ";" );
+const OUString TSPECIALS (RTL_CONSTASCII_USTRINGPARAM( "()<>@,;:\\\"/[]?=" ));
+const OUString TOKEN     (RTL_CONSTASCII_USTRINGPARAM("!#$%&'*+-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ^_`abcdefghijklmnopqrstuvwxyz{|}~."));
+const OUString SPACE     (RTL_CONSTASCII_USTRINGPARAM(" "));
+const OUString SEMICOLON (RTL_CONSTASCII_USTRINGPARAM(";"));
 
 //------------------------------------------------------------------------
 // ctor
@@ -87,7 +87,7 @@ OUString SAL_CALL CMimeContentType::getMediaSubtype( ) throw(RuntimeException)
 
 OUString SAL_CALL CMimeContentType::getFullMediaType( ) throw(RuntimeException)
 {
-    return m_MediaType + OUString::createFromAscii( "/" ) + m_MediaSubtype;
+    return m_MediaType + OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + m_MediaSubtype;
 }
 
 //------------------------------------------------------------------------
@@ -206,7 +206,7 @@ void SAL_CALL CMimeContentType::type( void )
     {
         if ( isInRange( m_nxtSym, TOKEN ) )
             m_MediaType += m_nxtSym;
-        else if ( isInRange( m_nxtSym, OUString::createFromAscii( "/ " ) ) )
+        else if ( isInRange( m_nxtSym, OUString(RTL_CONSTASCII_USTRINGPARAM("/ ")) ) )
             break;
         else
             throw IllegalArgumentException( );
@@ -215,7 +215,7 @@ void SAL_CALL CMimeContentType::type( void )
 
     // check FOLLOW( type )
     skipSpaces( );
-    acceptSym( OUString::createFromAscii( "/" ) );
+    acceptSym( OUString(RTL_CONSTASCII_USTRINGPARAM("/")) );
 
     subtype( );
 }
@@ -236,7 +236,7 @@ void SAL_CALL CMimeContentType::subtype( void )
     {
         if ( isInRange( m_nxtSym, TOKEN ) )
             m_MediaSubtype += m_nxtSym;
-        else if ( isInRange( m_nxtSym, OUString::createFromAscii( "; " ) ) )
+        else if ( isInRange( m_nxtSym, OUString(RTL_CONSTASCII_USTRINGPARAM("; ")) ) )
             break;
         else
             throw IllegalArgumentException( );
@@ -256,13 +256,13 @@ void SAL_CALL CMimeContentType::trailer( void )
 {
     while( m_nxtSym.getLength( ) )
     {
-        if ( m_nxtSym == OUString::createFromAscii( "(" ) )
+        if ( m_nxtSym == OUString(RTL_CONSTASCII_USTRINGPARAM("(")) )
         {
             getSym( );
             comment( );
-            acceptSym( OUString::createFromAscii( ")" ) );
+            acceptSym( OUString(RTL_CONSTASCII_USTRINGPARAM(")")) );
         }
-        else if ( m_nxtSym == OUString::createFromAscii( ";" ) )
+        else if ( m_nxtSym == OUString(RTL_CONSTASCII_USTRINGPARAM(";")) )
         {
             // get the parameter name
             getSym( );
@@ -274,7 +274,7 @@ void SAL_CALL CMimeContentType::trailer( void )
             OUString pname = pName( );
 
             skipSpaces();
-            acceptSym( OUString::createFromAscii( "=" ) );
+            acceptSym( OUString(RTL_CONSTASCII_USTRINGPARAM("=")) );
 
             // get the parameter value
             skipSpaces( );
@@ -304,7 +304,7 @@ OUString SAL_CALL CMimeContentType::pName( )
     {
         if ( isInRange( m_nxtSym, TOKEN ) )
             pname += m_nxtSym;
-        else if ( isInRange( m_nxtSym, OUString::createFromAscii( "= " ) ) )
+        else if ( isInRange( m_nxtSym, OUString(RTL_CONSTASCII_USTRINGPARAM("= ")) ) )
             break;
         else
             throw IllegalArgumentException( );
@@ -323,12 +323,12 @@ OUString SAL_CALL CMimeContentType::pValue( )
     OUString pvalue;
 
     // quoted pvalue
-    if ( m_nxtSym == OUString::createFromAscii( "\"" ) )
+    if ( m_nxtSym == OUString(RTL_CONSTASCII_USTRINGPARAM( "\"" )) )
     {
         getSym( );
         pvalue = quotedPValue( );
 
-        if (  OUString( &pvalue[pvalue.getLength() - 1], 1 ) != OUString::createFromAscii( "\"" ) )
+        if (  OUString( &pvalue[pvalue.getLength() - 1], 1 ) != OUString(RTL_CONSTASCII_USTRINGPARAM( "\"" )) )
             throw IllegalArgumentException( );
 
         // remove the last quote-sign
@@ -366,7 +366,7 @@ OUString SAL_CALL CMimeContentType::quotedPValue( )
         else if ( isInRange( m_nxtSym, TOKEN + TSPECIALS + SPACE ) )
         {
             pvalue += m_nxtSym;
-            if ( m_nxtSym == OUString::createFromAscii( "\"" ) )
+            if ( m_nxtSym == OUString(RTL_CONSTASCII_USTRINGPARAM( "\"" )) )
                 bAfterQuoteSign = sal_True;
             else
                 bAfterQuoteSign = sal_False;
@@ -391,7 +391,7 @@ OUString SAL_CALL CMimeContentType::nonquotedPValue( )
     {
         if ( isInRange( m_nxtSym, TOKEN ) )
             pvalue += m_nxtSym;
-        else if ( isInRange( m_nxtSym, OUString::createFromAscii( "; " ) ) )
+        else if ( isInRange( m_nxtSym, OUString(RTL_CONSTASCII_USTRINGPARAM("; ")) ) )
             break;
         else
             throw IllegalArgumentException( );
@@ -411,7 +411,7 @@ void SAL_CALL CMimeContentType::comment( void )
     {
         if ( isInRange( m_nxtSym, TOKEN + SPACE ) )
             getSym( );
-        else if ( m_nxtSym == OUString::createFromAscii( ")" ) )
+        else if ( m_nxtSym == OUString(RTL_CONSTASCII_USTRINGPARAM(")")) )
             break;
         else
             throw IllegalArgumentException( );
diff --git a/dtrans/source/cnttype/wbench/testcnttype.cxx b/dtrans/source/cnttype/wbench/testcnttype.cxx
index dc569a8446d1..5013ff8b714e 100644
--- a/dtrans/source/cnttype/wbench/testcnttype.cxx
+++ b/dtrans/source/cnttype/wbench/testcnttype.cxx
@@ -97,7 +97,7 @@ void CheckMimeContentType( const OUString& aCntType, const OUString& aType, cons
             pvalue = xMimeCntType->getParameterValue( param );
         }
 
-        pvalue = xMimeCntType->getParameterValue( OUString::createFromAscii( "aparam" ) );
+        pvalue = xMimeCntType->getParameterValue( OUString(RTL_CONSTASCII_USTRINGPARAM("aparam")) );
     }
     catch( IllegalArgumentException& )
     {
@@ -181,32 +181,32 @@ sal_Bool processCntTypesAndWriteResultIntoFile( char* fname, vector< string >& v
 
             Reference< XMimeContentType > xMCntTyp = cnttypeFactory->createMimeContentType( OUString::createFromAscii( iter->c_str( ) ) );
 
-            fwprintf( fstream, OUString::createFromAscii( "Type: %s\n" ),  xMCntTyp->getMediaType( ).getStr( ) );
-            fwprintf( fstream, OUString::createFromAscii( "Subtype: %s\n" ), xMCntTyp->getMediaSubtype( ).getStr( ) );
+            fwprintf( fstream, OUString(RTL_CONSTASCII_USTRINGPARAM("Type: %s\n")),  xMCntTyp->getMediaType( ).getStr( ) );
+            fwprintf( fstream, OUString(RTL_CONSTASCII_USTRINGPARAM("Subtype: %s\n")), xMCntTyp->getMediaSubtype( ).getStr( ) );
 
             Sequence< OUString > seqParam = xMCntTyp->getParameters( );
             sal_Int32 nParams = seqParam.getLength( );
 
             for ( sal_Int32 i = 0; i < nParams; i++ )
             {
-                fwprintf( fstream, OUString::createFromAscii("PName: %s\n" ), seqParam[i].getStr( ) );
-                fwprintf( fstream, OUString::createFromAscii("PValue: %s\n" ), xMCntTyp->getParameterValue( seqParam[i] ).getStr( ) );
+                fwprintf( fstream, OUString(RTL_CONSTASCII_USTRINGPARAM("PName: %s\n")), seqParam[i].getStr( ) );
+                fwprintf( fstream, OUString(RTL_CONSTASCII_USTRINGPARAM("PValue: %s\n")), xMCntTyp->getParameterValue( seqParam[i] ).getStr( ) );
             }
         }
         catch( IllegalArgumentException& ex )
         {
-            fwprintf( fstream, OUString::createFromAscii( "Fehlerhafter Content-Type gelesen!!!\n\n" ) );
+            fwprintf( fstream, OUString(RTL_CONSTASCII_USTRINGPARAM("Fehlerhafter Content-Type gelesen!!!\n\n")) );
         }
         catch( NoSuchElementException& )
         {
-            fwprintf( fstream, OUString::createFromAscii( "Parameterwert nicht vorhanden\n" ) );
+            fwprintf( fstream, OUString(RTL_CONSTASCII_USTRINGPARAM("Parameterwert nicht vorhanden\n")) );
         }
         catch( ... )
         {
-            fwprintf( fstream, OUString::createFromAscii( "Unbekannter Fehler!!!\n\n" ) );
+            fwprintf( fstream, OUString(RTL_CONSTASCII_USTRINGPARAM("Unbekannter Fehler!!!\n\n")) );
         }
 
-        fwprintf( fstream, OUString::createFromAscii( "\n#############################################\n\n" ) );
+        fwprintf( fstream, OUString(RTL_CONSTASCII_USTRINGPARAM("\n#############################################\n\n")) );
     }
 
     fclose( fstream );
@@ -246,7 +246,7 @@ int SAL_CALL main( int nArgc, char* argv[] )
     }
 
     Reference< XMimeContentTypeFactory >
-        xMCntTypeFactory( g_xFactory->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.MimeContentTypeFactory" ) ), UNO_QUERY );
+        xMCntTypeFactory( g_xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.MimeContentTypeFactory")) ), UNO_QUERY );
 
     if ( !xMCntTypeFactory.is( ) )
     {
diff --git a/dtrans/source/generic/clipboardmanager.cxx b/dtrans/source/generic/clipboardmanager.cxx
index 1221cd20f046..9535803281a6 100644
--- a/dtrans/source/generic/clipboardmanager.cxx
+++ b/dtrans/source/generic/clipboardmanager.cxx
@@ -48,7 +48,7 @@ using ::rtl::OUString;
 
 ClipboardManager::ClipboardManager():
     WeakComponentImplHelper3< XClipboardManager, XEventListener, XServiceInfo > (m_aMutex),
-    m_aDefaultName(OUString::createFromAscii("default"))
+    m_aDefaultName(OUString(RTL_CONSTASCII_USTRINGPARAM("default")))
 {
 }
 
@@ -63,7 +63,7 @@ ClipboardManager::~ClipboardManager()
 OUString SAL_CALL ClipboardManager::getImplementationName(  )
     throw(RuntimeException)
 {
-    return OUString::createFromAscii(CLIPBOARDMANAGER_IMPLEMENTATION_NAME);
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(CLIPBOARDMANAGER_IMPLEMENTATION_NAME));
 }
 
 // ------------------------------------------------------------------------
@@ -97,7 +97,7 @@ Reference< XClipboard > SAL_CALL ClipboardManager::getClipboard( const OUString&
 
     // object is disposed already
     if (rBHelper.bDisposed)
-        throw DisposedException(OUString::createFromAscii("object is disposed."),
+        throw DisposedException(OUString(RTL_CONSTASCII_USTRINGPARAM("object is disposed.")),
                                 static_cast < XClipboardManager * > (this));
 
     ClipboardMap::iterator iter =
@@ -118,13 +118,13 @@ void SAL_CALL ClipboardManager::addClipboard( const Reference< XClipboard >& xCl
 
     // check parameter
     if (!xClipboard.is())
-        throw IllegalArgumentException(OUString::createFromAscii("empty reference"),
+        throw IllegalArgumentException(OUString(RTL_CONSTASCII_USTRINGPARAM("empty reference")),
                                        static_cast < XClipboardManager * > (this), 1);
 
     // the name "default" is reserved for internal use
     OUString aName = xClipboard->getName();
     if (m_aDefaultName.compareTo(aName) == 0)
-        throw IllegalArgumentException(OUString::createFromAscii("name reserved"),
+        throw IllegalArgumentException(OUString(RTL_CONSTASCII_USTRINGPARAM("name reserved")),
                                        static_cast < XClipboardManager * > (this), 1);
 
     // try to add new clipboard to the list
@@ -167,7 +167,7 @@ Sequence< OUString > SAL_CALL ClipboardManager::listClipboardNames()
     MutexGuard aGuard(m_aMutex);
 
     if (rBHelper.bDisposed)
-        throw DisposedException(OUString::createFromAscii("object is disposed."),
+        throw DisposedException(OUString(RTL_CONSTASCII_USTRINGPARAM("object is disposed.")),
                                 static_cast < XClipboardManager * > (this));
 
     if (rBHelper.bInDispose)
@@ -257,7 +257,7 @@ Sequence< OUString > SAL_CALL ClipboardManager_getSupportedServiceNames()
 {
     Sequence < OUString > SupportedServicesNames( 1 );
     SupportedServicesNames[0] =
-        OUString::createFromAscii("com.sun.star.datatransfer.clipboard.ClipboardManager");
+        OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.ClipboardManager"));
     return SupportedServicesNames;
 }
 
diff --git a/dtrans/source/generic/dtrans.cxx b/dtrans/source/generic/dtrans.cxx
index 40eb6967adb3..dbe2ff05c79d 100644
--- a/dtrans/source/generic/dtrans.cxx
+++ b/dtrans/source/generic/dtrans.cxx
@@ -61,7 +61,7 @@ sal_Bool SAL_CALL component_writeInfo(void * /*pServiceManager*/, void * pRegist
         {
             Reference< XRegistryKey > xNewKey(
                 reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-                    OUString::createFromAscii("/" CLIPBOARDMANAGER_IMPLEMENTATION_NAME "/UNO/SERVICES" ) ) );
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("/" CLIPBOARDMANAGER_IMPLEMENTATION_NAME "/UNO/SERVICES" )) ) );
 
             const Sequence< OUString > & rSNL = ClipboardManager_getSupportedServiceNames();
             const OUString * pArray = rSNL.getConstArray();
@@ -70,7 +70,7 @@ sal_Bool SAL_CALL component_writeInfo(void * /*pServiceManager*/, void * pRegist
                 xNewKey->createKey( pArray[nPos] );
 
             xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-                OUString::createFromAscii("/" GENERIC_CLIPBOARD_IMPLEMENTATION_NAME "/UNO/SERVICES" ) );
+                OUString(RTL_CONSTASCII_USTRINGPARAM("/" GENERIC_CLIPBOARD_IMPLEMENTATION_NAME "/UNO/SERVICES" )) );
 
             const Sequence< OUString > & rSNL2 = GenericClipboard_getSupportedServiceNames();
             pArray = rSNL2.getConstArray();
diff --git a/dtrans/source/generic/generic_clipboard.cxx b/dtrans/source/generic/generic_clipboard.cxx
index eacab35dc9f6..57160e32785e 100644
--- a/dtrans/source/generic/generic_clipboard.cxx
+++ b/dtrans/source/generic/generic_clipboard.cxx
@@ -76,7 +76,7 @@ void SAL_CALL GenericClipboard::initialize( const Sequence< Any >& aArguments )
 OUString SAL_CALL GenericClipboard::getImplementationName(  )
     throw(RuntimeException)
 {
-    return OUString::createFromAscii(GENERIC_CLIPBOARD_IMPLEMENTATION_NAME);
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(GENERIC_CLIPBOARD_IMPLEMENTATION_NAME));
 }
 
 // ------------------------------------------------------------------------
@@ -193,7 +193,7 @@ void SAL_CALL GenericClipboard::removeClipboardListener( const Reference< XClipb
 Sequence< OUString > SAL_CALL GenericClipboard_getSupportedServiceNames()
 {
     Sequence< OUString > aRet(1);
-    aRet[0] = OUString::createFromAscii("com.sun.star.datatransfer.clipboard.GenericClipboard");
+    aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.GenericClipboard"));
     return aRet;
 }
 
diff --git a/dtrans/source/os2/clipb/Os2Clipboard.cxx b/dtrans/source/os2/clipb/Os2Clipboard.cxx
index 8ac20f9db56e..cc8c5240d6fb 100644
--- a/dtrans/source/os2/clipb/Os2Clipboard.cxx
+++ b/dtrans/source/os2/clipb/Os2Clipboard.cxx
@@ -134,7 +134,7 @@ void SAL_CALL Os2Clipboard::initialize( const Sequence< Any >& aArguments )
 OUString SAL_CALL Os2Clipboard::getImplementationName() throw( RuntimeException )
 {
     debug_printf("Os2Clipboard::getImplementationName\n");
-    return OUString::createFromAscii( OS2_CLIPBOARD_IMPL_NAME );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( OS2_CLIPBOARD_IMPL_NAME ));
 }
 
 sal_Bool SAL_CALL Os2Clipboard::supportsService( const OUString& ServiceName ) throw( RuntimeException )
@@ -237,10 +237,10 @@ void SAL_CALL Os2Clipboard::setContents( const Reference< XTransferable >& xTran
 #endif
 
     // we can only export text or bitmap
-    DataFlavor nFlavorText( OUString::createFromAscii( "text/plain;charset=utf-16" ),
-                        OUString::createFromAscii( "Unicode-Text" ), CPPUTYPE_OUSTRING);
-    DataFlavor nFlavorBitmap( OUString::createFromAscii( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ),
-                        OUString::createFromAscii( "Bitmap" ), CPPUTYPE_DEFAULT);
+    DataFlavor nFlavorText( OUString(RTL_CONSTASCII_USTRINGPARAM("text/plain;charset=utf-16")),
+                        OUString(RTL_CONSTASCII_USTRINGPARAM("Unicode-Text")), CPPUTYPE_OUSTRING);
+    DataFlavor nFlavorBitmap( OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" )),
+                        OUString(RTL_CONSTASCII_USTRINGPARAM("Bitmap")), CPPUTYPE_DEFAULT);
 
     // try text transfer data (if any)
     PSZ pSharedText = NULL;
@@ -414,7 +414,7 @@ void SAL_CALL Os2Clipboard::notifyAllClipboardListener( )
 Sequence< OUString > SAL_CALL Os2Clipboard_getSupportedServiceNames()
 {
     Sequence< OUString > aRet(1);
-    aRet[0] = OUString::createFromAscii( OS2_CLIPBOARD_SERVICE_NAME );
+    aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( OS2_CLIPBOARD_SERVICE_NAME ));
     return aRet;
 }
 
diff --git a/dtrans/source/os2/clipb/Os2Transferable.cxx b/dtrans/source/os2/clipb/Os2Transferable.cxx
index 5028799715dc..bc1840d38c0a 100644
--- a/dtrans/source/os2/clipb/Os2Transferable.cxx
+++ b/dtrans/source/os2/clipb/Os2Transferable.cxx
@@ -60,13 +60,13 @@ Os2Transferable::Os2Transferable(
     {
         ULONG handle = UWinQueryClipbrdData( hAB, UCLIP_CF_UNICODETEXT);
         if (handle) {
-            aFlavor.MimeType = OUString::createFromAscii( "text/plain;charset=utf-16" );
+            aFlavor.MimeType = OUString(RTL_CONSTASCII_USTRINGPARAM("text/plain;charset=utf-16"));
             aFlavor.DataType = getCppuType( (OUString*)0 );
             //debug_printf("Os2Transferable::Os2Transferable pszText %s\n", pszText);
         }
         handle = UWinQueryClipbrdData( hAB, UCLIP_CF_BITMAP);
         if (handle) {
-            aFlavor.MimeType = OUString::createFromAscii( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" );
+            aFlavor.MimeType = OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ));
             aFlavor.DataType = getCppuType( (OUString*)0 );
             //debug_printf("Os2Transferable::Os2Transferable pszText %s\n", pszText);
         }
@@ -97,7 +97,7 @@ Any SAL_CALL Os2Transferable::getTransferData( const DataFlavor& rFlavor )
     Sequence< sal_Int8 > aData;
 
     // retrieve unicode text
-    if( rFlavor.MimeType.equalsIgnoreAsciiCase( OUString::createFromAscii( "text/plain;charset=utf-16" ) ) )
+    if( rFlavor.MimeType.equalsIgnoreAsciiCase( OUString(RTL_CONSTASCII_USTRINGPARAM("text/plain;charset=utf-16")) ) )
     {
         if( UWinOpenClipbrd( hAB ) )
         {
@@ -115,7 +115,7 @@ Any SAL_CALL Os2Transferable::getTransferData( const DataFlavor& rFlavor )
     }
 
     // retrieve bitmap
-    if( rFlavor.MimeType.equalsIgnoreAsciiCase( OUString::createFromAscii( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ) ) )
+    if( rFlavor.MimeType.equalsIgnoreAsciiCase( OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" )) ) )
     {
         if( UWinOpenClipbrd( hAB ) )
         {
@@ -161,7 +161,7 @@ sal_Bool SAL_CALL Os2Transferable::isDataFlavorSupported( const DataFlavor& aFla
 
     if( aFlavor.DataType != getCppuType( (Sequence< sal_Int8 >*)0 ) )
     {
-        if( ! aFlavor.MimeType.equalsIgnoreAsciiCase( OUString::createFromAscii( "text/plain;charset=utf-16" ) ) &&
+        if( ! aFlavor.MimeType.equalsIgnoreAsciiCase( OUString(RTL_CONSTASCII_USTRINGPARAM("text/plain;charset=utf-16")) ) &&
             aFlavor.DataType == getCppuType( (OUString*)0 ) )
             return false;
     }
diff --git a/dtrans/source/test/test_dtrans.cxx b/dtrans/source/test/test_dtrans.cxx
index 430c63071228..3bb0966e286d 100644
--- a/dtrans/source/test/test_dtrans.cxx
+++ b/dtrans/source/test/test_dtrans.cxx
@@ -236,7 +236,7 @@ private:
 StringTransferable::StringTransferable( ) :
     m_seqDFlv( 1 ),
     m_receivedLostOwnership( sal_False ),
-    m_Data( OUString::createFromAscii("clipboard test content") )
+    m_Data( OUString(RTL_CONSTASCII_USTRINGPARAM("clipboard test content")) )
 {
     DataFlavor df;
 
@@ -248,7 +248,7 @@ StringTransferable::StringTransferable( ) :
     */
 
     //df.MimeType = L"text/plain; charset=windows1252";
-    df.MimeType = OUString::createFromAscii( "text/html" );
+    df.MimeType = OUString(RTL_CONSTASCII_USTRINGPARAM("text/html"));
     df.DataType = getCppuType( ( Sequence< sal_Int8 >* )0 );
 
     m_seqDFlv[0] = df;
@@ -359,10 +359,10 @@ int SAL_CALL main( int argc, const char* argv[] )
         //--------------------------------------------------------------
 
         Sequence< Any > arguments(1);
-        arguments[0] = makeAny( OUString::createFromAscii( "generic" ) );
+        arguments[0] = makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("generic")) );
 
         Reference< XClipboard > xClipboard( xServiceManager->createInstanceWithArguments(
-            OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.GenericClipboard" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.GenericClipboard")),
             arguments ), UNO_QUERY );
 
         ENSURE( xClipboard.is(), "*** ERROR *** generic clipboard service could not be created." );
@@ -442,7 +442,7 @@ int SAL_CALL main( int argc, const char* argv[] )
         //--------------------------------------------------------------
 
         Reference< XClipboardManager > xClipboardManager( xServiceManager->createInstance(
-            OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.ClipboardManager" ) ), UNO_QUERY );
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.ClipboardManager")) ), UNO_QUERY );
 
         ENSURE( xClipboardManager.is(), "*** ERROR *** clipboard manager service could not be created." );
 
@@ -455,14 +455,14 @@ int SAL_CALL main( int argc, const char* argv[] )
         TEST( "initial number of clipboards (0): ", xClipboardManager->listClipboardNames().getLength() == 0 );
         PERFORM( "insertion of generic clipboard: ", xClipboardManager->addClipboard( xClipboard ) );
         TEST( "number of inserted clipboards (1): ", xClipboardManager->listClipboardNames().getLength() == 1 );
-        TEST( "name of inserted clipboard (generic): ", xClipboardManager->listClipboardNames()[0] == OUString::createFromAscii( "generic" ) );
-        TEST( "inserted clipboard instance: ", xClipboardManager->getClipboard( OUString::createFromAscii( "generic" ) ) == xClipboard );
-        PERFORM( "removal of generic clipboard: ", xClipboardManager->removeClipboard( OUString::createFromAscii( "generic" ) ) );
+        TEST( "name of inserted clipboard (generic): ", xClipboardManager->listClipboardNames()[0] == OUString(RTL_CONSTASCII_USTRINGPARAM("generic")) );
+        TEST( "inserted clipboard instance: ", xClipboardManager->getClipboard( OUString(RTL_CONSTASCII_USTRINGPARAM("generic")) ) == xClipboard );
+        PERFORM( "removal of generic clipboard: ", xClipboardManager->removeClipboard( OUString(RTL_CONSTASCII_USTRINGPARAM("generic")) ) );
         TEST( "number of inserted clipboards (0): ", xClipboardManager->listClipboardNames().getLength() == 0 );
         TRACE( "Testing inserted clipboard instance (none): " );
         try
         {
-            xClipboardManager->getClipboard( OUString::createFromAscii( "generic" ) );
+            xClipboardManager->getClipboard( OUString(RTL_CONSTASCII_USTRINGPARAM("generic")) );
             TRACE( "FAILED\n" );
         }
         catch( NoSuchElementException e )
diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx b/dtrans/source/win32/clipb/WinClipboard.cxx
index 8439040a6337..0ade8dcad446 100644
--- a/dtrans/source/win32/clipb/WinClipboard.cxx
+++ b/dtrans/source/win32/clipb/WinClipboard.cxx
@@ -68,7 +68,7 @@ namespace
     Sequence< OUString > SAL_CALL WinClipboard_getSupportedServiceNames()
     {
         Sequence< OUString > aRet(1);
-        aRet[0] = OUString::createFromAscii("com.sun.star.datatransfer.clipboard.SystemClipboard");
+        aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.SystemClipboard"));
         return aRet;
     }
 }
@@ -102,7 +102,7 @@ Reference< XTransferable > SAL_CALL CWinClipboard::getContents( ) throw( Runtime
     MutexGuard aGuard( m_aMutex );
 
     if ( rBHelper.bDisposed )
-        throw DisposedException( OUString::createFromAscii( "object is already disposed" ),
+        throw DisposedException( OUString(RTL_CONSTASCII_USTRINGPARAM("object is already disposed")),
                                  static_cast< XClipboardEx* >( this ) );
 
     if ( NULL != m_pImpl.get( ) )
@@ -122,7 +122,7 @@ void SAL_CALL CWinClipboard::setContents( const Reference< XTransferable >& xTra
     MutexGuard aGuard( m_aMutex );
 
     if ( rBHelper.bDisposed )
-        throw DisposedException( OUString::createFromAscii( "object is already disposed" ),
+        throw DisposedException( OUString(RTL_CONSTASCII_USTRINGPARAM("object is already disposed")),
                                  static_cast< XClipboardEx* >( this ) );
 
     if ( NULL != m_pImpl.get( ) )
@@ -136,13 +136,13 @@ void SAL_CALL CWinClipboard::setContents( const Reference< XTransferable >& xTra
 OUString SAL_CALL CWinClipboard::getName(  ) throw( RuntimeException )
 {
     if ( rBHelper.bDisposed )
-        throw DisposedException( OUString::createFromAscii( "object is already disposed" ),
+        throw DisposedException( OUString(RTL_CONSTASCII_USTRINGPARAM("object is already disposed")),
                                  static_cast< XClipboardEx* >( this ) );
 
     if ( NULL != m_pImpl.get( ) )
         return m_pImpl->getName( );
 
-    return OUString::createFromAscii( "" );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(""));
 }
 
 //========================================================================
@@ -154,7 +154,7 @@ void SAL_CALL CWinClipboard::flushClipboard( ) throw( RuntimeException )
     MutexGuard aGuard( m_aMutex );
 
     if ( rBHelper.bDisposed )
-        throw DisposedException( OUString::createFromAscii( "object is already disposed" ),
+        throw DisposedException( OUString(RTL_CONSTASCII_USTRINGPARAM("object is already disposed")),
                                  static_cast< XClipboardEx* >( this ) );
 
     if ( NULL != m_pImpl.get( ) )
@@ -168,7 +168,7 @@ void SAL_CALL CWinClipboard::flushClipboard( ) throw( RuntimeException )
 sal_Int8 SAL_CALL CWinClipboard::getRenderingCapabilities(  ) throw( RuntimeException )
 {
     if ( rBHelper.bDisposed )
-        throw DisposedException( OUString::createFromAscii( "object is already disposed" ),
+        throw DisposedException( OUString(RTL_CONSTASCII_USTRINGPARAM("object is already disposed")),
                                  static_cast< XClipboardEx* >( this ) );
 
     if ( NULL != m_pImpl.get( ) )
@@ -189,12 +189,12 @@ void SAL_CALL CWinClipboard::addClipboardListener( const Reference< XClipboardLi
     throw( RuntimeException )
 {
     if ( rBHelper.bDisposed )
-        throw DisposedException( OUString::createFromAscii( "object is already disposed" ),
+        throw DisposedException( OUString(RTL_CONSTASCII_USTRINGPARAM("object is already disposed")),
                                  static_cast< XClipboardEx* >( this ) );
 
     // check input parameter
     if ( !listener.is( ) )
-        throw IllegalArgumentException( OUString::createFromAscii( "empty reference" ),
+        throw IllegalArgumentException( OUString(RTL_CONSTASCII_USTRINGPARAM("empty reference")),
                                         static_cast< XClipboardEx* >( this ),
                                         1 );
 
@@ -209,12 +209,12 @@ void SAL_CALL CWinClipboard::removeClipboardListener( const Reference< XClipboar
     throw( RuntimeException )
 {
     if ( rBHelper.bDisposed )
-        throw DisposedException( OUString::createFromAscii( "object is already disposed" ),
+        throw DisposedException( OUString(RTL_CONSTASCII_USTRINGPARAM("object is already disposed")),
                                  static_cast< XClipboardEx* >( this ) );
 
     // check input parameter
     if ( !listener.is( ) )
-        throw IllegalArgumentException( OUString::createFromAscii( "empty reference" ),
+        throw IllegalArgumentException( OUString(RTL_CONSTASCII_USTRINGPARAM("empty reference")),
                                         static_cast< XClipboardEx* >( this ),
                                         1 );
 
@@ -293,7 +293,7 @@ void SAL_CALL CWinClipboard::disposing()
 OUString SAL_CALL CWinClipboard::getImplementationName(  )
     throw(RuntimeException)
 {
-    return OUString::createFromAscii( WINCLIPBOARD_IMPL_NAME );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( WINCLIPBOARD_IMPL_NAME ));
 }
 
 // -------------------------------------------------
diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx
index 5c051da5678d..11d963da3093 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -502,7 +502,7 @@ sal_Bool SAL_CALL CDOTransferable::compareDataFlavors(
     if ( !m_rXMimeCntFactory.is( ) )
     {
         m_rXMimeCntFactory = Reference< XMimeContentTypeFactory >( m_SrvMgr->createInstance(
-            OUString::createFromAscii( "com.sun.star.datatransfer.MimeContentTypeFactory" ) ), UNO_QUERY );
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.MimeContentTypeFactory")) ), UNO_QUERY );
     }
     OSL_ASSERT( m_rXMimeCntFactory.is( ) );
 
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
index c832a7a24996..6ed4450333f4 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
@@ -77,11 +77,11 @@ const Type       CPPUTYPE_OUSTRING   = getCppuType((OUString*)0);
 const Type       CPPUTYPE_SEQSALINT8 = getCppuType((Sequence< sal_Int8>*)0);
 const sal_Int32  MAX_CLIPFORMAT_NAME = 256;
 
-const OUString TEXT_PLAIN_CHARSET   = OUString::createFromAscii( "text/plain;charset=" );
-const OUString HPNAME_OEM_ANSI_TEXT = OUString::createFromAscii( "OEM/ANSI Text" );
+const OUString TEXT_PLAIN_CHARSET   (RTL_CONSTASCII_USTRINGPARAM("text/plain;charset="));
+const OUString HPNAME_OEM_ANSI_TEXT (RTL_CONSTASCII_USTRINGPARAM("OEM/ANSI Text"));
 
-const OUString HTML_FORMAT_NAME_WINDOWS = OUString::createFromAscii( "HTML Format" );
-const OUString HTML_FORMAT_NAME_SOFFICE = OUString::createFromAscii( "HTML (HyperText Markup Language)" );
+const OUString HTML_FORMAT_NAME_WINDOWS (RTL_CONSTASCII_USTRINGPARAM("HTML Format"));
+const OUString HTML_FORMAT_NAME_SOFFICE (RTL_CONSTASCII_USTRINGPARAM("HTML (HyperText Markup Language)"));
 
 //------------------------------------------------------------------------
 //
@@ -91,7 +91,7 @@ CDataFormatTranslator::CDataFormatTranslator( const Reference< XMultiServiceFact
     m_SrvMgr( aServiceManager )
 {
     m_XDataFormatTranslator = Reference< XDataFormatTranslator >(
-        m_SrvMgr->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.DataFormatTranslator" ) ), UNO_QUERY );
+        m_SrvMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.DataFormatTranslator")) ), UNO_QUERY );
 }
 
 //------------------------------------------------------------------------
diff --git a/dtrans/source/win32/dtobj/FetcList.cxx b/dtrans/source/win32/dtobj/FetcList.cxx
index 2364a0a14341..3f7be8b53f2b 100644
--- a/dtrans/source/win32/dtobj/FetcList.cxx
+++ b/dtrans/source/win32/dtobj/FetcList.cxx
@@ -283,7 +283,7 @@ void SAL_CALL CFormatRegistrar::RegisterFormats(
                 aFormatEtcContainer.addFormatEtc( fetc );
 
                 // and HTML Format
-                OUString htmlFormat( OUString::createFromAscii( "HTML Format" ) );
+                OUString htmlFormat( RTL_CONSTASCII_USTRINGPARAM("HTML Format") );
                 aFormatEtcContainer.addFormatEtc(
                     m_DataFormatTranslator.getFormatEtcForClipformatName( htmlFormat ) );
             }
@@ -361,8 +361,8 @@ OUString SAL_CALL CFormatRegistrar::getCharsetFromDataFlavor( const DataFlavor&
     try
     {
         Reference< XMimeContentTypeFactory > xMimeFac(
-            m_SrvMgr->createInstance( OUString::createFromAscii( \
-                "com.sun.star.datatransfer.MimeContentTypeFactory" ) ), UNO_QUERY );
+            m_SrvMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( \
+                "com.sun.star.datatransfer.MimeContentTypeFactory" )) ), UNO_QUERY );
 
         if( xMimeFac.is( ) )
         {
diff --git a/dtrans/source/win32/dtobj/MimeAttrib.hxx b/dtrans/source/win32/dtobj/MimeAttrib.hxx
index e9538ac7ae1f..fd62793f1478 100644
--- a/dtrans/source/win32/dtobj/MimeAttrib.hxx
+++ b/dtrans/source/win32/dtobj/MimeAttrib.hxx
@@ -40,12 +40,12 @@
 // deklarations
 //------------------------------------------------------------------------
 
-const rtl::OUString TEXTPLAIN_PARAM_CHARSET = rtl::OUString::createFromAscii( "charset" );
+const rtl::OUString TEXTPLAIN_PARAM_CHARSET = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("charset"));
 
-const rtl::OUString PRE_WINDOWS_CODEPAGE = rtl::OUString::createFromAscii( "windows" );
-const rtl::OUString PRE_OEM_CODEPAGE     = rtl::OUString::createFromAscii( "cp" );
-const rtl::OUString CHARSET_UTF16        = rtl::OUString::createFromAscii( "utf-16" );
-const rtl::OUString CHARSET_UNICODE      = rtl::OUString::createFromAscii( "unicode" );
+const rtl::OUString PRE_WINDOWS_CODEPAGE (RTL_CONSTASCII_USTRINGPARAM("windows"));
+const rtl::OUString PRE_OEM_CODEPAGE     (RTL_CONSTASCII_USTRINGPARAM("cp"));
+const rtl::OUString CHARSET_UTF16        (RTL_CONSTASCII_USTRINGPARAM("utf-16"));
+const rtl::OUString CHARSET_UNICODE      (RTL_CONSTASCII_USTRINGPARAM("unicode"));
 
 
 #endif
diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx
index 16c0e0f0afd0..f2e1fd579f8e 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.cxx
@@ -454,7 +454,7 @@ void SAL_CALL CXTDataObject::renderSynthesizedHtmlAndSetupStgMedium( FORMATETC&
     DataFlavor aFlavor;
 
     // creating a DataFlavor on the fly
-    aFlavor.MimeType = OUString::createFromAscii( "text/html" );
+    aFlavor.MimeType = OUString(RTL_CONSTASCII_USTRINGPARAM("text/html"));
     aFlavor.DataType = getCppuType( (Sequence< sal_Int8 >*)0 );
 
     Any aAny = m_XTransferable->getTransferData( aFlavor );
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx
index e27cefcc3f22..fb1eec247c59 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -60,10 +60,10 @@
 #define CPPUTYPE_SALINT32         getCppuType( ( sal_Int32 * ) 0 )
 #define OUSTR( str )              OUString::createFromAscii( #str )
 #define OUSTR_( str )             OUString::createFromAscii( str )
-#define EMPTY_OUSTR               OUString::createFromAscii( "" )
+#define EMPTY_OUSTR               OUString()
 //#define PRIVATE_OO                  OUString::createFromAscii( "application/x-openoffice;" "windows_formatname=" )
 
-const rtl::OUString Windows_FormatName = rtl::OUString::createFromAscii("windows_formatname");
+const rtl::OUString Windows_FormatName (RTL_CONSTASCII_USTRINGPARAM("windows_formatname"));
 const com::sun::star::uno::Type CppuType_ByteSequence = ::getCppuType((const com::sun::star::uno::Sequence<sal_Int8>*)0);
 const com::sun::star::uno::Type CppuType_String       = ::getCppuType((const ::rtl::OUString*)0);
 
@@ -89,7 +89,7 @@ namespace MODULE_PRIVATE
     Sequence< OUString > SAL_CALL DataFormatTranslator_getSupportedServiceNames( )
     {
         Sequence< OUString > aRet(1);
-        aRet[0] = OUString::createFromAscii("com.sun.star.datatransfer.DataFormatTranslator");
+        aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.DataFormatTranslator"));
         return aRet;
     }
 }
@@ -236,7 +236,7 @@ DataFlavor SAL_CALL CDataFormatTranslator::getDataFlavorFromSystemDataType( cons
 OUString SAL_CALL CDataFormatTranslator::getImplementationName(  )
     throw( RuntimeException )
 {
-    return OUString::createFromAscii( IMPL_NAME );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( IMPL_NAME ));
 }
 
 // -------------------------------------------------
diff --git a/dtrans/source/win32/workbench/test_wincb.cxx b/dtrans/source/win32/workbench/test_wincb.cxx
index 65118eed7fbd..ccfff019f461 100644
--- a/dtrans/source/win32/workbench/test_wincb.cxx
+++ b/dtrans/source/win32/workbench/test_wincb.cxx
@@ -168,7 +168,7 @@ private:
 
 CTransferable::CTransferable( ) :
     m_FlavorList( 1 ),
-    m_Data( OUString::createFromAscii( "Ich habe mir ein neues Fahrrad gekauft!" ) )
+    m_Data( OUString(RTL_CONSTASCII_USTRINGPARAM("Ich habe mir ein neues Fahrrad gekauft!")) )
 {
     DataFlavor df;
 
diff --git a/dtrans/test/win32/dnd/targetlistener.cxx b/dtrans/test/win32/dnd/targetlistener.cxx
index 7b74d1cde55a..ecc70e472916 100644
--- a/dtrans/test/win32/dnd/targetlistener.cxx
+++ b/dtrans/test/win32/dnd/targetlistener.cxx
@@ -67,7 +67,7 @@ void SAL_CALL DropTargetListener::drop( const DropTargetDropEvent& e )
 //  for( int i=0; i < flavors.getLength(); i++)
 //      aFlavor= flavors[4];
 
-    DataFlavor flavor( OUString(OUString::createFromAscii("text/plain;charset=windows-1252")),
+    DataFlavor flavor( OUString(OUString(RTL_CONSTASCII_USTRINGPARAM("text/plain;charset=windows-1252"))),
         OUString(L"Text plain"), getCppuType( ( Sequence<sal_Int8>*)0 ) );
 
     Any anyData= e.Transferable->getTransferData( flavor);
diff --git a/editeng/inc/editeng/AccessibleEditableTextPara.hxx b/editeng/inc/editeng/AccessibleEditableTextPara.hxx
index 22b34aadf515..e00966497547 100644
--- a/editeng/inc/editeng/AccessibleEditableTextPara.hxx
+++ b/editeng/inc/editeng/AccessibleEditableTextPara.hxx
@@ -405,7 +405,7 @@ namespace accessibility
         /// Our listeners (guarded by maMutex)
         int mnNotifierClientId;
 
-        // --> OD 2006-01-11 #i27138#
+        // Text paragraphs should provide FLOWS_TO and FLOWS_FROM relations (#i27138#)
         // the paragraph manager, which created this instance - is NULL, if
         // instance isn't created by AccessibleParaManager.
         // Needed for method <getAccessibleRelationSet()> to retrieve predecessor
diff --git a/editeng/inc/editeng/acorrcfg.hxx b/editeng/inc/editeng/acorrcfg.hxx
index 555aaea150d0..0d5b0b820d60 100644
--- a/editeng/inc/editeng/acorrcfg.hxx
+++ b/editeng/inc/editeng/acorrcfg.hxx
@@ -32,9 +32,7 @@
 
 #include "editeng/editengdllapi.h"
 #include <unotools/configitem.hxx>
-/* -----------------------------12.10.00 11:40--------------------------------
 
- ---------------------------------------------------------------------------*/
 class SvxAutoCorrect;
 class SvxAutoCorrCfg;
 class EDITENG_DLLPUBLIC SvxBaseAutoCorrCfg : public utl::ConfigItem
@@ -51,9 +49,7 @@ public:
     virtual void            Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
     void                    SetModified() {ConfigItem::SetModified();}
 };
-/* -----------------------------12.10.00 11:40--------------------------------
 
- ---------------------------------------------------------------------------*/
 class EDITENG_DLLPUBLIC SvxSwAutoCorrCfg : public utl::ConfigItem
 {
     SvxAutoCorrCfg& rParent;
diff --git a/editeng/inc/editeng/nhypitem.hxx b/editeng/inc/editeng/nhypitem.hxx
index 6e5849ebee8a..185a20a834a1 100644
--- a/editeng/inc/editeng/nhypitem.hxx
+++ b/editeng/inc/editeng/nhypitem.hxx
@@ -34,12 +34,6 @@
 #include <editeng/editengdllapi.h>
 
 // class SvxNoHyphenItem -------------------------------------------------
-
-/*  [Beschreibung]
-
-    PB: ???
-*/
-
 class EDITENG_DLLPUBLIC SvxNoHyphenItem : public SfxBoolItem
 {
 public:
diff --git a/editeng/inc/editeng/nlbkitem.hxx b/editeng/inc/editeng/nlbkitem.hxx
index e45384902bc3..b6d4bfa097d9 100644
--- a/editeng/inc/editeng/nlbkitem.hxx
+++ b/editeng/inc/editeng/nlbkitem.hxx
@@ -35,13 +35,6 @@
 #include "editeng/editengdllapi.h"
 
 // class SvxNoLinebreakItem ----------------------------------------------
-
-
-/*  [Beschreibung]
-
-    PB: ???
-*/
-
 class EDITENG_DLLPUBLIC SvxNoLinebreakItem : public SfxBoolItem
 {
 public:
diff --git a/editeng/inc/editeng/numitem.hxx b/editeng/inc/editeng/numitem.hxx
index e28fdccea552..e94fe8fda653 100644
--- a/editeng/inc/editeng/numitem.hxx
+++ b/editeng/inc/editeng/numitem.hxx
@@ -300,9 +300,7 @@ public:
 
     BOOL                    UnLinkGraphics();
 };
-/* -----------------27.10.98 13:04-------------------
- *
- * --------------------------------------------------*/
+
 class EDITENG_DLLPUBLIC SvxNumBulletItem : public SfxPoolItem
 {
     SvxNumRule*             pNumRule;
@@ -323,9 +321,7 @@ public:
     virtual bool            QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
     virtual bool            PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
 };
-/* -----------------28.10.98 15:21-------------------
- *
- * --------------------------------------------------*/
+
 class SvxNodeNum
 {
     USHORT nLevelVal[ SVX_MAX_NUM ];    // Nummern aller Levels
diff --git a/editeng/inc/editeng/svxrtf.hxx b/editeng/inc/editeng/svxrtf.hxx
index 3174e328d5c3..307fb5654418 100644
--- a/editeng/inc/editeng/svxrtf.hxx
+++ b/editeng/inc/editeng/svxrtf.hxx
@@ -37,7 +37,8 @@
 #define _SVSTDARR_USHORTS
 #include <svl/svstdarr.hxx>
 #include <editeng/editengdllapi.h>
-
+#include <utility>
+#include <vector>
 class Font;
 class Color;
 class Graphic;
@@ -105,7 +106,7 @@ struct SvxRTFStyleType
 
 
 // Bitmap - Mode
-
+typedef ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString > > PictPropertyNameValuePairs;
 struct EDITENG_DLLPUBLIC SvxRTFPictureType
 {
     // Format der Bitmap
@@ -136,7 +137,7 @@ struct EDITENG_DLLPUBLIC SvxRTFPictureType
     USHORT  nWidthBytes;
     USHORT  nScalX, nScalY;
     short   nCropT, nCropB, nCropL, nCropR;
-
+    PictPropertyNameValuePairs aPropertyPairs;
     SvxRTFPictureType() { ResetValues(); }
     // alle Werte auf default; wird nach einlesen der Bitmap aufgerufen !
     void ResetValues();
diff --git a/editeng/source/accessibility/AccessibleComponentBase.cxx b/editeng/source/accessibility/AccessibleComponentBase.cxx
index ee41d062c6a0..472ca07424c0 100644
--- a/editeng/source/accessibility/AccessibleComponentBase.cxx
+++ b/editeng/source/accessibility/AccessibleComponentBase.cxx
@@ -200,7 +200,7 @@ sal_Int32 SAL_CALL AccessibleComponentBase::getBackground (void)
 ::rtl::OUString SAL_CALL AccessibleComponentBase::getTitledBorderText (void)
         throw (::com::sun::star::uno::RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii ("");
+    return ::rtl::OUString ();
 }
 
 
@@ -209,7 +209,7 @@ sal_Int32 SAL_CALL AccessibleComponentBase::getBackground (void)
 ::rtl::OUString SAL_CALL AccessibleComponentBase::getToolTipText (void)
     throw (::com::sun::star::uno::RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii ("");
+    return ::rtl::OUString ();
 }
 
 
diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx
index 2c33b83e2250..0868e6d1a56a 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -638,7 +638,7 @@ void AccessibleContextBase::SetAccessibleName (
 ::rtl::OUString AccessibleContextBase::CreateAccessibleDescription (void)
     throw (::com::sun::star::uno::RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii ("Empty Description");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("Empty Description"));
 }
 
 
@@ -647,7 +647,7 @@ void AccessibleContextBase::SetAccessibleName (
 ::rtl::OUString AccessibleContextBase::CreateAccessibleName (void)
     throw (::com::sun::star::uno::RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii ("Empty Name");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("Empty Name"));
 }
 
 
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index f6e4ff48d2d7..ea0bd2b76254 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -1259,7 +1259,7 @@ namespace accessibility
 #ifdef TL_DEBUG
         {
             uno::Sequence< rtl::OUString > aNames(1);
-            aNames.getArray()[0] = rtl::OUString::createFromAscii("CharHeight");
+            aNames.getArray()[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharHeight"));
             const rtl::OUString *pNames = aNames.getConstArray();
             const uno::Sequence< beans::PropertyValue > aAttribs( getRunAttributes( nIndex, aNames ) );
             const beans::PropertyValue *pAttribs = aAttribs.getConstArray();
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 7b4cd9408173..2db119a18b0e 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1459,7 +1459,7 @@ ULONG EditDoc::GetTextLen() const
     {
         ContentNode* pNode = GetObject( nNode );
         nLen += pNode->Len();
-        // Felder k”nnen laenger sein als der Platzhalter im Node.
+        // Fields can be longer than the placeholder in the Node
         const CharAttribArray& rAttrs = pNode->GetCharAttribs().GetAttribs();
         for ( USHORT nAttr = rAttrs.Count(); nAttr; )
         {
@@ -1941,12 +1941,11 @@ void EditDoc::FindAttribs( ContentNode* pNode, USHORT nStartPos, USHORT nEndPos,
             {
                 // pItem = pAttr->GetItem();
                 // s.o.
-                /*-----------------31.05.95 16:01-------------------
-                 Ist falsch, wenn das gleiche Attribut sofort wieder
-                 eingestellt wird!
-                 => Sollte am besten nicht vorkommen, also gleich beim
-                    Setzen von Attributen richtig machen!
-                --------------------------------------------------*/
+                /* Ist falsch, wenn das gleiche Attribut sofort wieder
+                   eingestellt wird!
+                   => Sollte am besten nicht vorkommen, also gleich beim
+                      Setzen von Attributen richtig machen!
+                */
                 rCurSet.InvalidateItem( pAttr->GetItem()->Which() );
             }
 
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 734b8d75ee8e..ddb540ddb4c2 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2186,42 +2186,31 @@ EESpellState EditEngine::HasSpellErrors()
 
     return pImpEditEngine->HasSpellErrors();
 }
-/*-- 13.10.2003 16:56:23---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void EditEngine::StartSpelling(EditView& rEditView, sal_Bool bMultipleDoc)
 {
     DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->StartSpelling(rEditView, bMultipleDoc);
 }
-/*-- 13.10.2003 16:56:23---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void EditEngine::EndSpelling()
 {
     DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->EndSpelling();
 }
 
-/*-- 13.10.2003 16:43:27---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 bool EditEngine::SpellSentence(EditView& rView, ::svx::SpellPortions& rToFill, bool bIsGrammarChecking )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->SpellSentence( rView, rToFill, bIsGrammarChecking );
 }
-/*-- 08.09.2008 11:38:32---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void EditEngine::PutSpellingToSentenceStart( EditView& rEditView )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->PutSpellingToSentenceStart( rEditView );
 }
-/*-- 13.10.2003 16:43:27---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void EditEngine::ApplyChangedSentence(EditView& rEditView, const ::svx::SpellPortions& rNewPortions, bool bRecheck )
 {
     DBG_CHKTHIS( EditEngine, 0 );
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 6d30e0205c06..5b1e3b310215 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -1069,7 +1069,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
         // implementation here by providing an additional parameter.
         Sequence< PropertyValue > aPropVals(1);
         PropertyValue &rVal = aPropVals.getArray()[0];
-        rVal.Name = OUString::createFromAscii( UPN_MAX_NUMBER_OF_SUGGESTIONS );
+        rVal.Name = OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_MAX_NUMBER_OF_SUGGESTIONS ));
         rVal.Value <<= (INT16) 7;
         //
         // Gibt es Replace-Vorschlaege?
@@ -1145,7 +1145,6 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
             aPopupMenu.RemoveItem( MN_AUTOCORR );   // Loeschen?
 
         SvtLinguConfig aCfg;
-        const bool bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
 
         Reference< XDictionaryList >  xDicList( SvxGetDictionaryList() );
         Sequence< Reference< XDictionary >  > aDics;
@@ -1185,7 +1184,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
                     if (xSvcInfo.is())
                     {
                         OUString aDictionaryImageUrl( aCfg.GetSpellAndGrammarContextDictionaryImage(
-                                xSvcInfo->getImplementationName(), bHC) );
+                                xSvcInfo->getImplementationName()) );
                         if (aDictionaryImageUrl.getLength() > 0)
                         {
                             Image aImage( lcl_GetImageFromPngUrl( aDictionaryImageUrl ) );
diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index c4f518982991..2a80fe77ca65 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -204,7 +204,7 @@ uno::Reference< linguistic2::XLanguageGuessing > GlobalEditData::GetLanguageGues
         {
             xLanguageGuesser = uno::Reference< linguistic2::XLanguageGuessing >(
                     xMgr->createInstance(
-                        rtl::OUString::createFromAscii( "com.sun.star.linguistic2.LanguageGuessing" ) ),
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.linguistic2.LanguageGuessing" )) ),
                         uno::UNO_QUERY );
         }
     }
diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx
index 39cde4f129a3..49967ac72df8 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -55,6 +55,7 @@ void SvxRTFPictureType::ResetValues()
     nBitsPerPixel = nPlanes = 1;
     nScalX = nScalY = 100;      // Skalierung in Prozent
     nCropT = nCropB = nCropL = nCropR = 0;
+    aPropertyPairs.clear();
 }
 
 ImportInfo::ImportInfo( ImportState eSt, SvParser* pPrsrs, const ESelection& rSel )
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index af282a6f094d..4b42f96a64b9 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -214,7 +214,7 @@ public:
     EditView*   GetView()       { return pView; }
 };
 
-// ----------------------------------------------------------------------
+//  ----------------------------------------------------------------------
 //  class ImpEditView
 //  ----------------------------------------------------------------------
 class ImpEditView : public vcl::unohelper::DragAndDropClient
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 8894a2949d9e..b4a4a32745e0 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -3076,7 +3076,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
                                     nTextLen = pTextPortion->GetLen();
                                     pDXArray = pLine->GetCharPosArray().GetData()+( nIndex-pLine->GetStart() );
 
-                                    // --> FME 2005-10-18 #i55716# Paint control characters
+                                    // Paint control characters (#i55716#)
                                     if ( aStatus.MarkFields() )
                                     {
                                         xub_StrLen nTmpIdx;
@@ -3164,7 +3164,6 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
                                             }
                                         }
                                     }
-                                    // <--
                                 }
                                 else if ( pTextPortion->GetKind() == PORTIONKIND_FIELD )
                                 {
@@ -3415,14 +3414,13 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
                                             aRealOutPos.X() += pTextPortion->GetExtraInfos()->nPortionOffsetX;
                                         }
 
-                                        // --> FME 2005-06-17 #i37132# RTL portions with
+                                        // RTL portions with (#i37132#)
                                         // compressed blank should not paint this blank:
                                         if ( pTextPortion->IsRightToLeft() && nTextLen >= 2 &&
                                              pDXArray[ nTextLen - 1 ] ==
                                              pDXArray[ nTextLen - 2 ] &&
                                              ' ' == aText.GetChar( nTextStart + nTextLen - 1 ) )
                                             --nTextLen;
-                                        // <--
 
                                         // output directly
                                         aTmpFont.QuickDrawText( pOutDev, aRealOutPos, aText, nTextStart, nTextLen, pDXArray );
@@ -3437,7 +3435,6 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
                                             pOutDev->DrawRect( aRect );
                                         }
 
-
                                         // PDF export:
                                         if ( pPDFExtOutDevData )
                                         {
@@ -4527,7 +4524,7 @@ Reference < i18n::XBreakIterator > ImpEditEngine::ImplGetBreakIterator() const
     if ( !xBI.is() )
     {
         Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory() );
-        xBI.set( xMSF->createInstance( OUString::createFromAscii( "com.sun.star.i18n.BreakIterator" ) ), UNO_QUERY );
+        xBI.set( xMSF->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.BreakIterator" )) ), UNO_QUERY );
     }
     return xBI;
 }
@@ -4537,7 +4534,7 @@ Reference < i18n::XExtendedInputSequenceChecker > ImpEditEngine::ImplGetInputSeq
     if ( !xISC.is() )
     {
         Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
-        Reference < XInterface > xI = xMSF->createInstance( OUString::createFromAscii( "com.sun.star.i18n.InputSequenceChecker" ) );
+        Reference < XInterface > xI = xMSF->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.InputSequenceChecker" )) );
         if ( xI.is() )
         {
             Any x = xI->queryInterface( ::getCppuType((const Reference< i18n::XExtendedInputSequenceChecker >*)0) );
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index d4ba71348c4b..1fbda1e44dee 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -1959,16 +1959,12 @@ Reference< XSpellAlternatives > ImpEditEngine::ImpSpell( EditView* pEditView )
     return xSpellAlt;
 #endif
 }
-/*-- 13.10.2003 16:43:27---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void ImpEditEngine::EndSpelling()
 {
     DELETEZ(pSpellInfo);
 }
-/*-- 13.10.2003 16:43:27---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void ImpEditEngine::StartSpelling(EditView& rEditView, sal_Bool bMultipleDoc)
 {
     DBG_ASSERT(!pSpellInfo, "pSpellInfo already set?");
@@ -1976,9 +1972,7 @@ void ImpEditEngine::StartSpelling(EditView& rEditView, sal_Bool bMultipleDoc)
     EditSelection aCurSel( rEditView.pImpEditView->GetEditSelection() );
     pSpellInfo = CreateSpellInfo( aCurSel, bMultipleDoc );
 }
-/*-- 13.10.2003 16:43:27---------------------------------------------------
-    Search for the next wrong word within the given selection
-  -----------------------------------------------------------------------*/
+
 Reference< XSpellAlternatives > ImpEditEngine::ImpFindNextError(EditSelection& rSelection)
 {
     /* ContentNode* pLastNode = */ aEditDoc.SaveGetObject( (aEditDoc.Count()-1) );
@@ -2024,9 +2018,7 @@ Reference< XSpellAlternatives > ImpEditEngine::ImpFindNextError(EditSelection& r
     }
     return xSpellAlt;
 }
-/*-- 13.10.2003 16:43:27---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 bool ImpEditEngine::SpellSentence(EditView& rEditView,
     ::svx::SpellPortions& rToFill,
     bool /*bIsGrammarChecking*/ )
@@ -2090,9 +2082,7 @@ bool ImpEditEngine::SpellSentence(EditView& rEditView,
     return bRet;
 }
 
-/*-- 15.10.2003 16:09:12---------------------------------------------------
-    adds one portion to the SpellPortions
-  -----------------------------------------------------------------------*/
+// Adds one portion to the SpellPortions
 void ImpEditEngine::AddPortion(
                             const EditSelection rSel,
                             uno::Reference< XSpellAlternatives > xAlt,
@@ -2118,9 +2108,7 @@ void ImpEditEngine::AddPortion(
 #endif
 }
 
-/*-- 15.10.2003 16:07:47---------------------------------------------------
-    adds one or more portions of text to the SpellPortions depending on language changes
-  -----------------------------------------------------------------------*/
+// Adds one or more portions of text to the SpellPortions depending on language changes
 void ImpEditEngine::AddPortionIterated(
                             EditView& rEditView,
                             const EditSelection rSel,
@@ -2193,9 +2181,6 @@ void ImpEditEngine::AddPortionIterated(
 #endif
 }
 
-/*-- 13.10.2003 16:43:33---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 void ImpEditEngine::ApplyChangedSentence(EditView& rEditView,
     const ::svx::SpellPortions& rNewPortions,
     bool bRecheck )
@@ -2326,9 +2311,7 @@ void ImpEditEngine::ApplyChangedSentence(EditView& rEditView,
     }
 #endif
 }
-/*-- 08.09.2008 11:33:02---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void ImpEditEngine::PutSpellingToSentenceStart( EditView& rEditView )
 {
 #ifdef SVX_LIGHT
diff --git a/editeng/source/items/charhiddenitem.cxx b/editeng/source/items/charhiddenitem.cxx
index bc910b75c283..2c4d4586585e 100644
--- a/editeng/source/items/charhiddenitem.cxx
+++ b/editeng/source/items/charhiddenitem.cxx
@@ -36,23 +36,16 @@
 
 TYPEINIT1_FACTORY(SvxCharHiddenItem, SfxBoolItem, new SvxCharHiddenItem(sal_False, 0));
 
-/*-- 16.12.2003 15:24:25---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SvxCharHiddenItem::SvxCharHiddenItem( const sal_Bool bHidden, const USHORT nId ) :
     SfxBoolItem( nId, bHidden )
 {
 }
-/*-- 16.12.2003 15:24:25---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SfxPoolItem* SvxCharHiddenItem::Clone( SfxItemPool * ) const
 {
     return new SvxCharHiddenItem( *this );
 }
-/*-- 16.12.2003 15:24:25---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SfxItemPresentation SvxCharHiddenItem::GetPresentation
 (
     SfxItemPresentation ePres,
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 407e175d14e0..39d805e64f41 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1166,8 +1166,6 @@ int SvxProtectItem::operator==( const SfxPoolItem& rAttr ) const
              bPos   == ( (SvxProtectItem&)rAttr ).bPos );
 }
 
-/*-----------------16.03.98 12:42-------------------
---------------------------------------------------*/
 bool SvxProtectItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 {
 //  sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -1186,9 +1184,7 @@ bool SvxProtectItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     rVal = Bool2Any( bValue );
     return true;
 }
-/*-----------------16.03.98 12:42-------------------
 
---------------------------------------------------*/
 bool    SvxProtectItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 {
 //  sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -2097,7 +2093,7 @@ bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
         {
             // serialization for basic macro recording
             uno::Reference < script::XTypeConverter > xConverter
-                    ( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.script.Converter")),
+                    ( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter"))),
                     uno::UNO_QUERY );
             uno::Sequence < uno::Any > aSeq;
             uno::Any aNew;
@@ -2958,7 +2954,7 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
             {
                 // serialization for basic macro recording
                 uno::Reference < script::XTypeConverter > xConverter
-                        ( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.script.Converter")),
+                        ( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter"))),
                         uno::UNO_QUERY );
                 uno::Any aNew;
                 uno::Sequence < uno::Any > aSeq;
@@ -4334,9 +4330,7 @@ CntWallpaperItem* SvxBrushItem::CreateCntWallpaperItem() const
 #ifdef _MSC_VER
 #pragma optimize ( "", on )
 #endif
-/* -----------------------------16.08.2002 09:18------------------------------
 
- ---------------------------------------------------------------------------*/
 void  SvxBrushItem::ApplyGraphicTransparency_Impl()
 {
     DBG_ASSERT(pImpl->pGraphicObject, "no GraphicObject available" );
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index a492c94bdc04..e3360c1a0756 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -79,7 +79,7 @@ void lcl_getFormatter(com::sun::star::uno::Reference<com::sun::star::text::XNumb
         {
             Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
             Reference < XInterface > xI = xMSF->createInstance(
-                ::rtl::OUString::createFromAscii( "com.sun.star.text.DefaultNumberingProvider" ) );
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.DefaultNumberingProvider" )) );
             Reference<XDefaultNumberingProvider> xRet(xI, UNO_QUERY);
             DBG_ASSERT(xRet.is(), "service missing: \"com.sun.star.text.DefaultNumberingProvider\"");
             _xFormatter = Reference<XNumberingFormatter> (xRet, UNO_QUERY);
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 27b3629f5d39..8e324ab66bb3 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -141,14 +141,12 @@ int SvxLineSpacingItem::operator==( const SfxPoolItem& rAttr ) const
                 1 : 0;
 }
 
-/*-----------------18.03.98 16:32-------------------
-    os: wer weiss noch, wieso das LineSpacingItem so
-    kompliziert ist? Fuer UNO koennen wir das nicht
-    gebrauchen. Da gibt es nur zwei Werte:
-        - ein sal_uInt16 fuer den Modus
-        - ein sal_uInt32 fuer alle Werte (Abstand, Hoehe, rel. Angaben)
-
---------------------------------------------------*/
+/* wer weiss noch, wieso das LineSpacingItem so
+   kompliziert ist? Fuer UNO koennen wir das nicht
+   gebrauchen. Da gibt es nur zwei Werte:
+      - ein sal_uInt16 fuer den Modus
+      - ein sal_uInt32 fuer alle Werte (Abstand, Hoehe, rel. Angaben)
+*/
 bool SvxLineSpacingItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -193,9 +191,7 @@ bool SvxLineSpacingItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 
     return true;
 }
-/*-----------------18.03.98 16:32-------------------
 
---------------------------------------------------*/
 bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -388,9 +384,6 @@ int SvxAdjustItem::operator==( const SfxPoolItem& rAttr ) const
         ? 1 : 0 );
 }
 
-/*-----------------18.03.98 16:15-------------------
-
---------------------------------------------------*/
 bool SvxAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -409,9 +402,6 @@ bool SvxAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     }
     return true;
 }
-/*-----------------18.03.98 16:15-------------------
-
---------------------------------------------------*/
 
 bool SvxAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId  )
 {
@@ -1012,9 +1002,6 @@ struct   ::com::sun::star::style::TabStop
 typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence;
 
  */
-/*-----------------19.03.98 08:50-------------------
-
---------------------------------------------------*/
 
 bool SvxTabStopItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 {
@@ -1056,9 +1043,6 @@ bool SvxTabStopItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     }
     return sal_True;
 }
-/*-----------------19.03.98 08:50-------------------
-
---------------------------------------------------*/
 
 bool SvxTabStopItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 {
@@ -1560,25 +1544,19 @@ SvxForbiddenRuleItem::SvxForbiddenRuleItem(
     : SfxBoolItem( nId, bOn )
 {
 }
-/* -----------------------------29.11.00 11:23--------------------------------
 
- ---------------------------------------------------------------------------*/
 SfxPoolItem* SvxForbiddenRuleItem::Clone( SfxItemPool * ) const
 {
     return new SvxForbiddenRuleItem( GetValue(), Which() );
 }
-/* -----------------------------29.11.00 11:23--------------------------------
 
- ---------------------------------------------------------------------------*/
 SfxPoolItem* SvxForbiddenRuleItem::Create(SvStream & rStrm, USHORT) const
 {
     sal_Bool nValue;
     rStrm >> nValue;
     return new SvxForbiddenRuleItem( nValue, Which() );
 }
-/* -----------------------------29.11.00 11:23--------------------------------
 
- ---------------------------------------------------------------------------*/
 USHORT SvxForbiddenRuleItem::GetVersion( USHORT nFFVer ) const
 {
     DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
@@ -1588,9 +1566,7 @@ USHORT SvxForbiddenRuleItem::GetVersion( USHORT nFFVer ) const
 
     return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0;
 }
-/* -----------------------------29.11.00 11:23--------------------------------
 
- ---------------------------------------------------------------------------*/
 SfxItemPresentation SvxForbiddenRuleItem::GetPresentation(
         SfxItemPresentation ePres,
         SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index ff0b1868ed69..fc73703d3957 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -572,10 +572,6 @@ XubString SvxPostureItem::GetValueTextByPos( USHORT nPos ) const
     return sTxt;
 }
 
-
-/*-----------------13.03.98 14:28-------------------
-
---------------------------------------------------*/
 bool SvxPostureItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -591,9 +587,7 @@ bool SvxPostureItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     }
     return true;
 }
-/*-----------------13.03.98 14:28-------------------
 
---------------------------------------------------*/
 bool SvxPostureItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -733,9 +727,6 @@ XubString SvxWeightItem::GetValueTextByPos( USHORT nPos ) const
     return EE_RESSTR( RID_SVXITEMS_WEIGHT_BEGIN + nPos );
 }
 
-/*-----------------13.03.98 14:18-------------------
-
---------------------------------------------------*/
 bool SvxWeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -753,9 +744,7 @@ bool SvxWeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     }
     return true;
 }
-/*-----------------13.03.98 14:18-------------------
 
---------------------------------------------------*/
 bool SvxWeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -855,9 +844,6 @@ int SvxFontHeightItem::operator==( const SfxPoolItem& rItem ) const
             GetPropUnit() == ((SvxFontHeightItem&)rItem).GetPropUnit();
 }
 
-/*-----------------13.03.98 14:53-------------------
-
---------------------------------------------------*/
 bool SvxFontHeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 {
     //  In StarOne sind im uno::Any immer 1/100mm. Ueber die MemberId wird
@@ -957,9 +943,8 @@ bool SvxFontHeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     }
     return sal_True;
 }
-/* -----------------01.07.98 13:43-------------------
- *  Relative Abweichung aus der Hoehe herausrechnen
- * --------------------------------------------------*/
+
+// Relative Abweichung aus der Hoehe herausrechnen
 sal_uInt32 lcl_GetRealHeight_Impl(sal_uInt32 nHeight, sal_uInt16 nProp, SfxMapUnit eProp, sal_Bool bCoreInTwip)
 {
     sal_uInt32 nRet = nHeight;
@@ -993,9 +978,6 @@ sal_uInt32 lcl_GetRealHeight_Impl(sal_uInt32 nHeight, sal_uInt16 nProp, SfxMapUn
     return nRet;
 }
 
-/*-----------------13.03.98 14:53-------------------
-
---------------------------------------------------*/
 bool SvxFontHeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -1250,9 +1232,6 @@ int SvxFontWidthItem::operator==( const SfxPoolItem& rItem ) const
             GetProp() == ((SvxFontWidthItem&)rItem).GetProp();
 }
 
-/*-----------------13.03.98 16:03-------------------
-
---------------------------------------------------*/
 bool SvxFontWidthItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -1268,9 +1247,7 @@ bool SvxFontWidthItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     }
     return true;
 }
-/*-----------------13.03.98 16:03-------------------
 
---------------------------------------------------*/
 bool SvxFontWidthItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -1423,9 +1400,6 @@ XubString SvxTextLineItem::GetValueTextByPos( USHORT /*nPos*/ ) const
     return XubString();
 }
 
-/*-----------------13.03.98 16:25-------------------
-
---------------------------------------------------*/
 bool SvxTextLineItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -1448,9 +1422,7 @@ bool SvxTextLineItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return true;
 
 }
-/*-----------------13.03.98 16:28-------------------
 
---------------------------------------------------*/
 bool SvxTextLineItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -1656,9 +1628,6 @@ XubString SvxCrossedOutItem::GetValueTextByPos( USHORT nPos ) const
     return EE_RESSTR( RID_SVXITEMS_STRIKEOUT_BEGIN + nPos );
 }
 
-/*-----------------13.03.98 16:28-------------------
-
---------------------------------------------------*/
 bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -1674,9 +1643,7 @@ bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     }
     return true;
 }
-/*-----------------13.03.98 16:29-------------------
 
---------------------------------------------------*/
 bool SvxCrossedOutItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -2275,9 +2242,7 @@ SfxItemPresentation SvxKerningItem::GetPresentation
 #endif
     return SFX_ITEM_PRESENTATION_NONE;
 }
-/* -----------------------------19.02.01 12:21--------------------------------
 
- ---------------------------------------------------------------------------*/
 bool SvxKerningItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 {
     sal_Int16 nVal = GetValue();
@@ -2368,9 +2333,6 @@ XubString SvxCaseMapItem::GetValueTextByPos( USHORT nPos ) const
     return EE_RESSTR( RID_SVXITEMS_CASEMAP_BEGIN + nPos );
 }
 
-/*-----------------13.03.98 16:29-------------------
-
---------------------------------------------------*/
 bool SvxCaseMapItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
 {
     sal_Int16 nRet = style::CaseMap::NONE;
@@ -2385,9 +2347,7 @@ bool SvxCaseMapItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
     rVal <<= (sal_Int16)(nRet);
     return true;
 }
-/*-----------------13.03.98 16:29-------------------
 
---------------------------------------------------*/
 bool SvxCaseMapItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
 {
     sal_uInt16 nVal = sal_uInt16();
@@ -2550,9 +2510,6 @@ void SvxEscapementItem::SetEnumValue( USHORT nVal )
     SetEscapement( (const SvxEscapement)nVal );
 }
 
-/*-----------------13.03.98 17:05-------------------
-
---------------------------------------------------*/
 bool SvxEscapementItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -2571,9 +2528,7 @@ bool SvxEscapementItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     }
     return true;
 }
-/*-----------------13.03.98 17:05-------------------
 
---------------------------------------------------*/
 bool SvxEscapementItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -2691,9 +2646,6 @@ SfxItemPresentation SvxLanguageItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-/*-----------------14.03.98 14:13-------------------
-
---------------------------------------------------*/
 bool SvxLanguageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -2710,9 +2662,7 @@ bool SvxLanguageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     }
     return true;
 }
-/*-----------------14.03.98 14:13-------------------
 
---------------------------------------------------*/
 bool SvxLanguageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index 3d8ad6be94c8..c00e4e225912 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -96,9 +96,7 @@ void SvxAutoCorrCfg::SetAutoCorrect( SvxAutoCorrect* pNew )
         pAutoCorrect = pNew;
     }
 }
-/*-- 12.10.00 11:44:17---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 Sequence<OUString>  SvxBaseAutoCorrCfg::GetPropertyNames()
 {
     static const char* aPropNames[] =
@@ -129,9 +127,7 @@ Sequence<OUString>  SvxBaseAutoCorrCfg::GetPropertyNames()
         pNames[i] = OUString::createFromAscii(aPropNames[i]);
     return aNames;
 }
-/*-- 12.10.00 11:44:18---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvxBaseAutoCorrCfg::Load(sal_Bool bInit)
 {
     Sequence<OUString> aNames = GetPropertyNames();
@@ -235,23 +231,17 @@ void SvxBaseAutoCorrCfg::Load(sal_Bool bInit)
 
     }
 }
-/*-- 12.10.00 11:44:19---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SvxBaseAutoCorrCfg::SvxBaseAutoCorrCfg(SvxAutoCorrCfg& rPar) :
     utl::ConfigItem(C2U("Office.Common/AutoCorrect")),
     rParent(rPar)
 {
 }
-/*-- 12.10.00 11:44:19---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SvxBaseAutoCorrCfg::~SvxBaseAutoCorrCfg()
 {
 }
-/*-- 12.10.00 11:44:20---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvxBaseAutoCorrCfg::Commit()
 {
     Sequence<OUString> aNames( GetPropertyNames() );
@@ -338,16 +328,12 @@ void SvxBaseAutoCorrCfg::Commit()
     }
     PutProperties(aNames, aValues);
 }
-/*-- 12.10.00 11:44:21---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvxBaseAutoCorrCfg::Notify( const Sequence<OUString>& /* aPropertyNames */)
 {
     Load(sal_False);
 }
-/*-- 12.10.00 11:51:48---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 Sequence<OUString>  SvxSwAutoCorrCfg::GetPropertyNames()
 {
     static const char* aPropNames[] =
@@ -407,9 +393,7 @@ Sequence<OUString>  SvxSwAutoCorrCfg::GetPropertyNames()
         pNames[i] = OUString::createFromAscii(aPropNames[i]);
     return aNames;
 }
-/*-- 12.10.00 11:51:48---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvxSwAutoCorrCfg::Load(sal_Bool bInit)
 {
     Sequence<OUString> aNames = GetPropertyNames();
@@ -556,23 +540,17 @@ void SvxSwAutoCorrCfg::Load(sal_Bool bInit)
         }
     }
 }
-/*-- 12.10.00 11:51:48---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SvxSwAutoCorrCfg::SvxSwAutoCorrCfg(SvxAutoCorrCfg& rPar) :
     utl::ConfigItem(C2U("Office.Writer/AutoFunction")),
     rParent(rPar)
 {
 }
-/*-- 12.10.00 11:51:48---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SvxSwAutoCorrCfg::~SvxSwAutoCorrCfg()
 {
 }
-/*-- 12.10.00 11:51:48---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvxSwAutoCorrCfg::Commit()
 {
     Sequence<OUString> aNames = GetPropertyNames();
@@ -669,9 +647,7 @@ void SvxSwAutoCorrCfg::Commit()
     }
     PutProperties(aNames, aValues);
 }
-/*-- 12.10.00 11:51:49---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvxSwAutoCorrCfg::Notify( const Sequence<OUString>& /* aPropertyNames */ )
 {
     Load(sal_False);
diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx
index 11d335578260..3384b2c02c36 100644
--- a/editeng/source/misc/splwrap.cxx
+++ b/editeng/source/misc/splwrap.cxx
@@ -180,7 +180,7 @@ SvxSpellWrapper::SvxSpellWrapper( Window* pWn,
     Reference< beans::XPropertySet >  xProp( SvxGetLinguPropertySet() );
     sal_Bool bWrapReverse = xProp.is() ?
         *(sal_Bool*)xProp->getPropertyValue(
-            ::rtl::OUString::createFromAscii(UPN_IS_WRAP_REVERSE) ).getValue()
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UPN_IS_WRAP_REVERSE)) ).getValue()
         : sal_False;
     bReverse = bRevAllow && bWrapReverse;
     bStartDone = bOther || ( !bReverse && bStart );
@@ -428,7 +428,7 @@ sal_Bool SvxSpellWrapper::SpellNext( )
     Reference< beans::XPropertySet >  xProp( SvxGetLinguPropertySet() );
     sal_Bool bWrapReverse = xProp.is() ?
             *(sal_Bool*)xProp->getPropertyValue(
-                ::rtl::OUString::createFromAscii(UPN_IS_WRAP_REVERSE) ).getValue()
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UPN_IS_WRAP_REVERSE)) ).getValue()
             : sal_False;
     sal_Bool bActRev = bRevAllowed && bWrapReverse;
 
@@ -474,7 +474,7 @@ sal_Bool SvxSpellWrapper::SpellNext( )
     {
         sal_Bool bIsSpellSpecial = xProp.is() ?
             *(sal_Bool*)xProp->getPropertyValue(
-                ::rtl::OUString::createFromAscii(UPN_IS_SPELL_SPECIAL) ).getValue()
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UPN_IS_SPELL_SPECIAL)) ).getValue()
             : sal_False;
         // Bodybereich erledigt, Frage nach Sonderbereich
         if( !IsHyphen() && bIsSpellSpecial && HasOtherCnt() )
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 773523d5999f..eb009a575c1b 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -289,9 +289,6 @@ BOOL SvxAutocorrWordList::Seek_Entry( const SvxAutocorrWordPtr aE, USHORT* pP )
     return FALSE;
 }
 
-/* -----------------18.11.98 15:28-------------------
- *
- * --------------------------------------------------*/
 void lcl_ClearTable(SvxAutoCorrLanguageTable_Impl& rLangTable)
 {
     SvxAutoCorrectLanguageListsPtr pLists = rLangTable.Last();
@@ -303,10 +300,6 @@ void lcl_ClearTable(SvxAutoCorrLanguageTable_Impl& rLangTable)
     rLangTable.Clear();
 }
 
-/* -----------------03.11.06 10:15-------------------
- *
- * --------------------------------------------------*/
-
 sal_Bool SvxAutoCorrect::IsAutoCorrectChar( sal_Unicode cChar )
 {
     return  cChar == '\0' || cChar == '\t' || cChar == 0x0a ||
@@ -322,9 +315,6 @@ sal_Bool SvxAutoCorrect::NeedsHardspaceAutocorr( sal_Unicode cChar )
         cChar == '/' /*case for the urls exception*/;
 }
 
-/* -----------------19.11.98 10:15-------------------
- *
- * --------------------------------------------------*/
 long SvxAutoCorrect::GetDefaultFlags()
 {
     long nRet = Autocorrect
@@ -651,13 +641,13 @@ BOOL SvxAutoCorrect::FnAddNonBrkSpace(
     CharClass& rCC = GetCharClass( eLang );
     const lang::Locale rLocale = rCC.getLocale( );
 
-    if ( rLocale.Language == OUString::createFromAscii( "fr" ) )
+    if ( rLocale.Language == OUString(RTL_CONSTASCII_USTRINGPARAM( "fr" )) )
     {
-        bool bFrCA = rLocale.Country == OUString::createFromAscii( "CA" );
-        OUString allChars = OUString::createFromAscii( ":;!?" );
+        bool bFrCA = rLocale.Country == OUString(RTL_CONSTASCII_USTRINGPARAM( "CA" ));
+        OUString allChars = OUString(RTL_CONSTASCII_USTRINGPARAM( ":;!?" ));
         OUString chars( allChars );
         if ( bFrCA )
-            chars = OUString::createFromAscii( ":" );
+            chars = OUString(RTL_CONSTASCII_USTRINGPARAM( ":" ));
 
         sal_Unicode cChar = rTxt.GetChar( nEndPos );
         bool bHasSpace = chars.indexOf( cChar ) != -1;
@@ -700,7 +690,7 @@ BOOL SvxAutoCorrect::FnAddNonBrkSpace(
                     bRunNext = true;
             }
         }
-        else if ( cChar == '/' )
+        else if ( cChar == '/' && nEndPos > 1 && rTxt.Len() > (nEndPos - 1) )
         {
             // Remove the hardspace right before to avoid formatting URLs
             sal_Unicode cPrevChar = rTxt.GetChar( nEndPos - 1 );
@@ -831,10 +821,8 @@ BOOL SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
         {
             if( lcl_IsInAsciiArr( sImplWordChars, *pStr ) &&
                 pWordStt - 1 == pStr &&
-                // --> FME 2005-02-14 #i38971#
-                // l'intallazione at beginning of paragraph. Replaced < by <=
+                // l'intallazione at beginning of paragraph. Replaced < by <= (#i38971#)
                 (long)(pStart + 1) <= (long)pStr &&
-                // <--
                 rCC.isLetter(
                     aText,
                     sal::static_int_cast< xub_StrLen >( pStr-1 - pStart ) ) )
@@ -1754,10 +1742,6 @@ void DecryptBlockName_Imp( String& rName )
     }
 }
 
-
-/* -----------------18.11.98 16:00-------------------
- *
- * --------------------------------------------------*/
 const SvxAutocorrWord* lcl_SearchWordsInList(
                 SvxAutoCorrectLanguageListsPtr pList, const String& rTxt,
                 xub_StrLen& rStt, xub_StrLen nEndPos, SvxAutoCorrDoc& )
@@ -1849,9 +1833,7 @@ const SvxAutocorrWord* SvxAutoCorrect::SearchWordsInList(
     }
     return 0;
 }
-/* -----------------18.11.98 13:46-------------------
- *
- * --------------------------------------------------*/
+
 BOOL SvxAutoCorrect::FindInWrdSttExceptList( LanguageType eLang,
                                              const String& sWord )
 {
@@ -1893,9 +1875,7 @@ BOOL SvxAutoCorrect::FindInWrdSttExceptList( LanguageType eLang,
     }
     return FALSE;
 }
-/* -----------------18.11.98 14:28-------------------
- *
- * --------------------------------------------------*/
+
 BOOL lcl_FindAbbreviation( const SvStringsISortDtor* pList, const String& sWord)
 {
     String sAbk( '~' );
@@ -1929,9 +1909,7 @@ BOOL lcl_FindAbbreviation( const SvStringsISortDtor* pList, const String& sWord)
             "falsch sortierte ExeptionListe?" );
     return FALSE;
 }
-/* -----------------18.11.98 14:49-------------------
- *
- * --------------------------------------------------*/
+
 BOOL SvxAutoCorrect::FindInCplSttExceptList(LanguageType eLang,
                                 const String& sWord, BOOL bAbbreviation)
 {
@@ -1980,9 +1958,6 @@ BOOL SvxAutoCorrect::FindInCplSttExceptList(LanguageType eLang,
 
 }
 
-/* -----------------20.11.98 11:53-------------------
- *
- * --------------------------------------------------*/
 String SvxAutoCorrect::GetAutoCorrFileName( LanguageType eLang,
                                             BOOL bNewFile, BOOL bTst ) const
 {
@@ -2003,9 +1978,6 @@ String SvxAutoCorrect::GetAutoCorrFileName( LanguageType eLang,
     return sRet;
 }
 
-/* -----------------18.11.98 11:16-------------------
- *
- * --------------------------------------------------*/
 SvxAutoCorrectLanguageLists::SvxAutoCorrectLanguageLists(
                 SvxAutoCorrect& rParent,
                 const String& rShareAutoCorrectFile,
@@ -2022,9 +1994,6 @@ SvxAutoCorrectLanguageLists::SvxAutoCorrectLanguageLists(
 {
 }
 
-/* -----------------18.11.98 11:16-------------------
- *
- * --------------------------------------------------*/
 SvxAutoCorrectLanguageLists::~SvxAutoCorrectLanguageLists()
 {
     delete pCplStt_ExcptLst;
@@ -2032,9 +2001,6 @@ SvxAutoCorrectLanguageLists::~SvxAutoCorrectLanguageLists()
     delete pAutocorr_List;
 }
 
-/* -----------------18.11.98 11:26-------------------
- *
- * --------------------------------------------------*/
 BOOL SvxAutoCorrectLanguageLists::IsFileChanged_Imp()
 {
     // nur alle 2 Minuten aufs FileSystem zugreifen um den
@@ -2110,7 +2076,7 @@ void SvxAutoCorrectLanguageLists::LoadXMLExceptList_Imp(
 
                 // get parser
                 uno::Reference< XInterface > xXMLParser = xServiceFactory->createInstance(
-                    OUString::createFromAscii("com.sun.star.xml.sax.Parser") );
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) );
                 DBG_ASSERT( xXMLParser.is(),
                     "XMLReader::Read: com.sun.star.xml.sax.Parser service missing" );
                 if( !xXMLParser.is() )
@@ -2154,9 +2120,7 @@ void SvxAutoCorrectLanguageLists::LoadXMLExceptList_Imp(
     }
 
 }
-/* -----------------18.11.98 11:26-------------------
- *
- * --------------------------------------------------*/
+
 void SvxAutoCorrectLanguageLists::SaveExceptList_Imp(
                             const SvStringsISortDtor& rLst,
                             const sal_Char* pStrmName,
@@ -2228,9 +2192,7 @@ void SvxAutoCorrectLanguageLists::SaveExceptList_Imp(
         }
     }
 }
-/* -----------------18.11.98 11:26-------------------
- *
- * --------------------------------------------------*/
+
 SvxAutocorrWordList* SvxAutoCorrectLanguageLists::LoadAutocorrWordList()
 {
     if( pAutocorr_List )
@@ -2251,7 +2213,7 @@ SvxAutocorrWordList* SvxAutoCorrectLanguageLists::LoadAutocorrWordList()
         aParserInput.aInputStream = xStrm->getInputStream();
 
         // get parser
-        uno::Reference< XInterface > xXMLParser = xServiceFactory->createInstance( OUString::createFromAscii("com.sun.star.xml.sax.Parser") );
+        uno::Reference< XInterface > xXMLParser = xServiceFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) );
         DBG_ASSERT( xXMLParser.is(), "XMLReader::Read: com.sun.star.xml.sax.Parser service missing" );
         if( xXMLParser.is() )
         {
@@ -2277,10 +2239,6 @@ SvxAutocorrWordList* SvxAutoCorrectLanguageLists::LoadAutocorrWordList()
     return pAutocorr_List;
 }
 
-/* -----------------18.11.98 11:26-------------------
- *
- * --------------------------------------------------*/
-
 void SvxAutoCorrectLanguageLists::SetAutocorrWordList( SvxAutocorrWordList* pList )
 {
     if( pAutocorr_List && pList != pAutocorr_List )
@@ -2294,27 +2252,20 @@ void SvxAutoCorrectLanguageLists::SetAutocorrWordList( SvxAutocorrWordList* pLis
     nFlags |= ChgWordLstLoad;
 }
 
-/* -----------------18.11.98 11:26-------------------
- *
- * --------------------------------------------------*/
 const SvxAutocorrWordList* SvxAutoCorrectLanguageLists::GetAutocorrWordList()
 {
     if( !( ChgWordLstLoad & nFlags ) || IsFileChanged_Imp() )
         SetAutocorrWordList( LoadAutocorrWordList() );
     return pAutocorr_List;
 }
-/* -----------------18.11.98 11:26-------------------
- *
- * --------------------------------------------------*/
+
 SvStringsISortDtor* SvxAutoCorrectLanguageLists::GetCplSttExceptList()
 {
     if( !( CplSttLstLoad & nFlags ) || IsFileChanged_Imp() )
         SetCplSttExceptList( LoadCplSttExceptList() );
     return pCplStt_ExcptLst;
 }
-/* -----------------18.11.98 11:26-------------------
- *
- * --------------------------------------------------*/
+
 BOOL SvxAutoCorrectLanguageLists::AddToCplSttExceptList(const String& rNew)
 {
     String* pNew = new String( rNew );
@@ -2335,9 +2286,7 @@ BOOL SvxAutoCorrectLanguageLists::AddToCplSttExceptList(const String& rNew)
         delete pNew, pNew = 0;
     return 0 != pNew;
 }
-/* -----------------18.11.98 15:20-------------------
- *
- * --------------------------------------------------*/
+
 BOOL SvxAutoCorrectLanguageLists::AddToWrdSttExceptList(const String& rNew)
 {
     String* pNew = new String( rNew );
@@ -2360,9 +2309,6 @@ BOOL SvxAutoCorrectLanguageLists::AddToWrdSttExceptList(const String& rNew)
     return 0 != pNew;
 }
 
-/* -----------------18.11.98 11:26-------------------
- *
- * --------------------------------------------------*/
 SvStringsISortDtor* SvxAutoCorrectLanguageLists::LoadCplSttExceptList()
 {
     SotStorageRef xStg = new SotStorage( sShareAutoCorrFile, STREAM_READ | STREAM_SHARE_DENYNONE, TRUE );
@@ -2373,9 +2319,6 @@ SvStringsISortDtor* SvxAutoCorrectLanguageLists::LoadCplSttExceptList()
     return pCplStt_ExcptLst;
 }
 
-/* -----------------18.11.98 11:26-------------------
- *
- * --------------------------------------------------*/
 void SvxAutoCorrectLanguageLists::SaveCplSttExceptList()
 {
     MakeUserStorage_Impl();
@@ -2391,9 +2334,6 @@ void SvxAutoCorrectLanguageLists::SaveCplSttExceptList()
     aLastCheckTime = Time();
 }
 
-/* -----------------18.11.98 11:26-------------------
- *
- * --------------------------------------------------*/
 void SvxAutoCorrectLanguageLists::SetCplSttExceptList( SvStringsISortDtor* pList )
 {
     if( pCplStt_ExcptLst && pList != pCplStt_ExcptLst )
@@ -2407,9 +2347,7 @@ void SvxAutoCorrectLanguageLists::SetCplSttExceptList( SvStringsISortDtor* pList
     }
     nFlags |= CplSttLstLoad;
 }
-/* -----------------18.11.98 11:26-------------------
- *
- * --------------------------------------------------*/
+
 SvStringsISortDtor* SvxAutoCorrectLanguageLists::LoadWrdSttExceptList()
 {
     SotStorageRef xStg = new SotStorage( sShareAutoCorrFile, STREAM_READ | STREAM_SHARE_DENYNONE, TRUE );
@@ -2418,9 +2356,7 @@ SvStringsISortDtor* SvxAutoCorrectLanguageLists::LoadWrdSttExceptList()
         LoadXMLExceptList_Imp( pWrdStt_ExcptLst, pXMLImplWrdStt_ExcptLstStr, xStg );
     return pWrdStt_ExcptLst;
 }
-/* -----------------18.11.98 11:26-------------------
- *
- * --------------------------------------------------*/
+
 void SvxAutoCorrectLanguageLists::SaveWrdSttExceptList()
 {
     MakeUserStorage_Impl();
@@ -2434,9 +2370,7 @@ void SvxAutoCorrectLanguageLists::SaveWrdSttExceptList()
                                             &aModifiedDate, &aModifiedTime );
     aLastCheckTime = Time();
 }
-/* -----------------18.11.98 11:26-------------------
- *
- * --------------------------------------------------*/
+
 void SvxAutoCorrectLanguageLists::SetWrdSttExceptList( SvStringsISortDtor* pList )
 {
     if( pWrdStt_ExcptLst && pList != pWrdStt_ExcptLst )
@@ -2449,18 +2383,14 @@ void SvxAutoCorrectLanguageLists::SetWrdSttExceptList( SvStringsISortDtor* pList
     }
     nFlags |= WrdSttLstLoad;
 }
-/* -----------------18.11.98 11:26-------------------
- *
- * --------------------------------------------------*/
+
 SvStringsISortDtor* SvxAutoCorrectLanguageLists::GetWrdSttExceptList()
 {
     if( !( WrdSttLstLoad & nFlags ) || IsFileChanged_Imp() )
         SetWrdSttExceptList( LoadWrdSttExceptList() );
     return pWrdStt_ExcptLst;
 }
-/* -----------------18.11.98 11:26-------------------
- *
- * --------------------------------------------------*/
+
 void SvxAutoCorrectLanguageLists::RemoveStream_Imp( const String& rName )
 {
     if( sShareAutoCorrFile != sUserAutoCorrFile )
@@ -2585,9 +2515,6 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl()
         sShareAutoCorrFile = sUserAutoCorrFile;
 }
 
-/* -----------------18.11.98 11:26-------------------
- *
- * --------------------------------------------------*/
 BOOL SvxAutoCorrectLanguageLists::MakeBlocklist_Imp( SvStorage& rStg )
 {
     String sStrmName( pXMLImplAutocorr_ListStr, RTL_TEXTENCODING_MS_1252 );
@@ -2697,9 +2624,6 @@ BOOL SvxAutoCorrectLanguageLists::MakeBlocklist_Imp( SvStorage& rStg )
     return bRet;
 }
 
-/* -----------------18.11.98 11:26-------------------
- *
- * --------------------------------------------------*/
 BOOL SvxAutoCorrectLanguageLists::PutText( const String& rShort,
                                            const String& rLong )
 {
@@ -2751,10 +2675,8 @@ BOOL SvxAutoCorrectLanguageLists::PutText( const String& rShort,
     }
     return bRet;
 }
-/* -----------------18.11.98 11:26-------------------
- *
- * --------------------------------------------------*/
-    //  - Text mit Attributierung (kann nur der SWG - SWG-Format!)
+
+// Text mit Attributierung (kann nur der SWG - SWG-Format!)
 BOOL SvxAutoCorrectLanguageLists::PutText( const String& rShort,
                                         SfxObjectShell& rShell )
 {
@@ -2794,10 +2716,7 @@ BOOL SvxAutoCorrectLanguageLists::PutText( const String& rShort,
     return bRet;
 }
 
-/* -----------------18.11.98 11:26-------------------
- *
- * --------------------------------------------------*/
-    //  - loesche einen Eintrag
+// loesche einen Eintrag
 BOOL SvxAutoCorrectLanguageLists::DeleteText( const String& rShort )
 {
     // erstmal akt. Liste besorgen!
diff --git a/editeng/source/misc/swafopt.cxx b/editeng/source/misc/swafopt.cxx
index 038120a057d4..9baae476f365 100644
--- a/editeng/source/misc/swafopt.cxx
+++ b/editeng/source/misc/swafopt.cxx
@@ -33,10 +33,6 @@
 
 #include <editeng/swafopt.hxx>
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
 SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
     : aBulletFont( String::CreateFromAscii(
                         RTL_CONSTASCII_STRINGPARAM( "StarSymbol" )),
diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx
index cccda2c1f523..12b6510947ca 100644
--- a/editeng/source/misc/txtrange.cxx
+++ b/editeng/source/misc/txtrange.cxx
@@ -122,12 +122,10 @@ TextRanger::~TextRanger()
     delete mpLinePolyPolygon;
 }
 
-/*-----------------17.11.00 09:49-------------------
- * TextRanger::SetVertical(..)
- * If there's is a change in the writing direction,
- * the cache has to be cleared.
- * --------------------------------------------------*/
-
+/* TextRanger::SetVertical(..)
+   If there's is a change in the writing direction,
+   the cache has to be cleared.
+*/
 void TextRanger::SetVertical( BOOL bNew )
 {
     if( IsVertical() != bNew )
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index 0a786cff44b7..61bd21427ead 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -777,37 +777,27 @@ BOOL Outliner::IsForceAutoColor() const
     DBG_CHKTHIS(Outliner,0);
     return pEditEngine->IsForceAutoColor();
 }
-/*-- 13.10.2003 16:56:23---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void Outliner::StartSpelling(EditView& rEditView, sal_Bool bMultipleDoc)
 {
     pEditEngine->StartSpelling(rEditView, bMultipleDoc);
 }
-/*-- 13.10.2003 16:56:23---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void Outliner::EndSpelling()
 {
     pEditEngine->EndSpelling();
 }
-/*-- 13.10.2003 16:56:23---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 bool Outliner::SpellSentence(EditView& rEditView, ::svx::SpellPortions& rToFill, bool bIsGrammarChecking )
 {
     return pEditEngine->SpellSentence(rEditView, rToFill, bIsGrammarChecking );
 }
-/*-- 08.09.2008 11:39:05---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void Outliner::PutSpellingToSentenceStart( EditView& rEditView )
 {
     pEditEngine->PutSpellingToSentenceStart( rEditView );
 }
-/*-- 13.10.2003 16:56:25---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void Outliner::ApplyChangedSentence(EditView& rEditView, const ::svx::SpellPortions& rNewPortions, bool bRecheck )
 {
     pEditEngine->ApplyChangedSentence( rEditView, rNewPortions, bRecheck );
diff --git a/editeng/source/rtf/makefile.mk b/editeng/source/rtf/makefile.mk
index 6a05ab66c4e6..1af1f0c026cc 100644
--- a/editeng/source/rtf/makefile.mk
+++ b/editeng/source/rtf/makefile.mk
@@ -29,20 +29,16 @@ PRJ=..$/..
 
 PRJNAME=editeng
 TARGET=rtf
-
+ENABLE_EXCEPTIONS=TRUE
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
 .INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
 # --- Files --------------------------------------------------------
 
-EXCEPTIONSFILES= \
-        $(SLO)$/svxrtf.obj \
-        $(SLO)$/rtfgrf.obj
-
 SLOFILES= \
-        $(EXCEPTIONSFILES) \
+        $(SLO)$/svxrtf.obj \
+        $(SLO)$/rtfgrf.obj \
         $(SLO)$/rtfitem.obj
 
 # ==========================================================================
diff --git a/editeng/source/rtf/rtfgrf.cxx b/editeng/source/rtf/rtfgrf.cxx
index a5ad1c6a81af..417f1e05d2fc 100644
--- a/editeng/source/rtf/rtfgrf.cxx
+++ b/editeng/source/rtf/rtfgrf.cxx
@@ -39,6 +39,7 @@
 
 #include <editeng/svxrtf.hxx>
 
+using namespace ::rtl;
 
 #ifndef DBG_UTIL
 #undef DEBUG_JP
@@ -316,14 +317,26 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
 
     if( RTF_SHPPICT == GetStackPtr(0)->nTokenId )
         ++nValidDataBraket;
-
+    OUString sShapePropertyName, sShapePropertyValue;
+    int nShapePropertyBracket = -1;
     while( _nOpenBrakets && IsParserWorking() && bValidBmp )
     {
         nToken = GetNextToken();
         USHORT nVal = USHORT( nTokenValue );
         switch( nToken )
         {
-        case '}':       --_nOpenBrakets;    break;
+        case '}':
+            --_nOpenBrakets;
+            if( nShapePropertyBracket > 0 && nShapePropertyBracket > _nOpenBrakets )
+            {
+                nShapePropertyBracket = -1;
+                if( sShapePropertyName.getLength() )
+                {
+                    rPicType.aPropertyPairs.push_back( ::std::pair< OUString, OUString >( sShapePropertyName, sShapePropertyValue ) );
+                    sShapePropertyName = sShapePropertyValue = ::rtl::OUString();
+                }
+            }
+        break;
         case '{':
             {
                 if( RTF_IGNOREFLAG != GetNextToken() )
@@ -439,7 +452,24 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
         case RTF_PICCROPB:          rPicType.nCropB = (short)nTokenValue; break;
         case RTF_PICCROPL:          rPicType.nCropL = (short)nTokenValue; break;
         case RTF_PICCROPR:          rPicType.nCropR = (short)nTokenValue; break;
-
+        case RTF_SP:
+            //read pairs of {\sn Name}{\sv Value}
+            nShapePropertyBracket = _nOpenBrakets;
+        break;
+        case RTF_SN:
+            nToken = GetNextToken();
+            if( nToken != '}' )
+                sShapePropertyName = aToken;
+            else
+                nToken = SkipToken( -1 );
+        break;
+        case RTF_SV:
+            nToken = GetNextToken();
+            if( nToken != '}' )
+                sShapePropertyValue = aToken;
+            else
+                nToken = SkipToken( -1 );
+        break;
         case RTF_TEXTTOKEN:
             // JP 26.06.98: Bug #51719# - nur TextToken auf 1. Ebene
             //              auswerten. Alle anderen sind irgendwelche
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index ab4d6a18f657..7f2a92a1492d 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -2019,9 +2019,7 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
 
             // Verhaeltnis der def. TabWidth / Tabs errechnen und
             // enstsprechend die neue Anzahl errechnen.
-/*-----------------14.12.94 19:32-------------------
- ?? wie kommt man auf die 13 ??
---------------------------------------------------*/
+            // ?? wie kommt man auf die 13 ??
             USHORT nAnzTabs = (SVX_TAB_DEFDIST * 13 ) / USHORT(nValue);
             /*
              cmc, make sure we have at least one, or all hell breaks loose in
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 4e385920edd4..95aae9283e26 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -65,10 +65,10 @@ CharSet lcl_GetDefaultTextEncodingForRTF()
     aLocale = Application::GetSettings().GetLocale();
     aLangString = aLocale.Language;
 
-    if ( aLangString.equals( ::rtl::OUString::createFromAscii( "ru" ) )
-      || aLangString.equals( ::rtl::OUString::createFromAscii( "uk" ) ) )
+    if ( aLangString.equals( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ru" )) )
+      || aLangString.equals( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "uk" )) ) )
         return RTL_TEXTENCODING_MS_1251;
-    if ( aLangString.equals( ::rtl::OUString::createFromAscii( "tr" ) ) )
+    if ( aLangString.equals( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "tr" )) ) )
         return RTL_TEXTENCODING_MS_1254;
     else
         return RTL_TEXTENCODING_MS_1252;
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 1ef3d1c3ce0b..782830467404 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -1104,8 +1104,8 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextField::getSupportedServiceNames()
     OUString* pServices = aSeq.getArray();
     pServices[0] = OUString::createFromAscii( pNewServiceNames[mnServiceId] );
     pServices[1] = OUString::createFromAscii( pOldServiceNames[mnServiceId] );
-    pServices[2] = OUString::createFromAscii( "com.sun.star.text.TextContent" ),
-    pServices[3] = OUString::createFromAscii( "com.sun.star.text.TextField" );
+    pServices[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextContent" )),
+    pServices[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextField" ));
 
     return aSeq;
 }
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 4c9aadfdae98..2f0f19c63b4f 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -2290,9 +2290,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::appendTextPortion(
     }
     return xRet;
 }
-/*-- 25.03.2008 08:16:09---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvxUnoTextBase::copyText(
     const uno::Reference< text::XTextCopy >& xSource ) throw ( uno::RuntimeException )
 {
diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx
index 33c6f5012814..c53ffb377ab0 100644
--- a/embeddedobj/source/commonembedding/embedobj.cxx
+++ b/embeddedobj/source/commonembedding/embedobj.cxx
@@ -113,7 +113,7 @@ void OCommonEmbeddedObject::Deactivate()
         catch( uno::Exception& e )
         {
             throw embed::StorageWrappedTargetException(
-                ::rtl::OUString::createFromAscii( "The client could not store the object!" ),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The client could not store the object!" )),
                 uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >( this ) ),
                 uno::makeAny( e ) );
         }
@@ -397,7 +397,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState )
         }
     }
     else
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object is in unacceptable state!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is in unacceptable state!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 }
 
@@ -410,7 +410,7 @@ uno::Sequence< sal_Int32 > OCommonEmbeddedObject::GetIntermediateStatesSequence_
             break;
 
     if ( nCurInd == m_aAcceptedStates.getLength() )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object is in unacceptable state!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is in unacceptable state!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     sal_Int32 nDestInd = 0;
@@ -420,7 +420,7 @@ uno::Sequence< sal_Int32 > OCommonEmbeddedObject::GetIntermediateStatesSequence_
 
     if ( nDestInd == m_aAcceptedStates.getLength() )
         throw embed::UnreachableStateException(
-            ::rtl::OUString::createFromAscii( "The state either not reachable, or the object allows the state only as an intermediate one!\n" ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The state either not reachable, or the object allows the state only as an intermediate one!\n" )),
             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
             m_nObjectState,
             nNewState );
@@ -444,7 +444,7 @@ void SAL_CALL OCommonEmbeddedObject::changeState( sal_Int32 nNewState )
             throw lang::DisposedException(); // TODO
 
         if ( m_nObjectState == -1 )
-            throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object has no persistence!\n" ),
+            throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
         sal_Int32 nOldState = m_nObjectState;
@@ -507,7 +507,7 @@ uno::Sequence< sal_Int32 > SAL_CALL OCommonEmbeddedObject::getReachableStates()
         throw lang::DisposedException(); // TODO
 
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object has no persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     return m_aAcceptedStates;
@@ -523,7 +523,7 @@ sal_Int32 SAL_CALL OCommonEmbeddedObject::getCurrentState()
         throw lang::DisposedException(); // TODO
 
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object has no persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     return m_nObjectState;
@@ -544,7 +544,7 @@ void SAL_CALL OCommonEmbeddedObject::doVerb( sal_Int32 nVerbID )
         throw lang::DisposedException(); // TODO
 
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object has no persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     // for internal documents this call is just a duplicate of changeState
@@ -575,7 +575,7 @@ uno::Sequence< embed::VerbDescriptor > SAL_CALL OCommonEmbeddedObject::getSuppor
         throw lang::DisposedException(); // TODO
 
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object has no persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     return m_aObjectVerbs;
@@ -595,7 +595,7 @@ void SAL_CALL OCommonEmbeddedObject::setClientSite(
     {
         if ( m_nObjectState != embed::EmbedStates::LOADED && m_nObjectState != embed::EmbedStates::RUNNING )
             throw embed::WrongStateException(
-                                    ::rtl::OUString::createFromAscii( "The client site can not be set currently!\n" ),
+                                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The client site can not be set currently!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
         m_xClientSite = xClient;
@@ -612,7 +612,7 @@ uno::Reference< embed::XEmbeddedClient > SAL_CALL OCommonEmbeddedObject::getClie
         throw lang::DisposedException(); // TODO
 
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object has no persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     return m_xClientSite;
@@ -629,7 +629,7 @@ void SAL_CALL OCommonEmbeddedObject::update()
         throw lang::DisposedException(); // TODO
 
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object has no persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     PostEvent_Impl( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnVisAreaChanged" ) ),
@@ -646,7 +646,7 @@ void SAL_CALL OCommonEmbeddedObject::setUpdateMode( sal_Int32 nMode )
         throw lang::DisposedException(); // TODO
 
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object has no persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     OSL_ENSURE( nMode == embed::EmbedUpdateModes::ALWAYS_UPDATE
diff --git a/embeddedobj/source/commonembedding/inplaceobj.cxx b/embeddedobj/source/commonembedding/inplaceobj.cxx
index 7a70663f440f..6ca80ce1c2d6 100644
--- a/embeddedobj/source/commonembedding/inplaceobj.cxx
+++ b/embeddedobj/source/commonembedding/inplaceobj.cxx
@@ -57,7 +57,7 @@ void SAL_CALL OCommonEmbeddedObject::setObjectRectangles( const awt::Rectangle&
 
     if ( m_nObjectState != embed::EmbedStates::INPLACE_ACTIVE
       && m_nObjectState != embed::EmbedStates::UI_ACTIVE )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object is not activated inplace!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not activated inplace!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     awt::Rectangle aNewRectToShow = GetRectangleInterception( aPosRect, aClipRect );
diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx
index f71c4ce2cda8..75241b933486 100644
--- a/embeddedobj/source/commonembedding/miscobj.cxx
+++ b/embeddedobj/source/commonembedding/miscobj.cxx
@@ -508,15 +508,10 @@ uno::Reference< util::XCloseable > SAL_CALL OCommonEmbeddedObject::getComponent(
     if ( m_nObjectState == -1 )
     {
         // the object is still not loaded
-        throw uno::RuntimeException( ::rtl::OUString::createFromAscii( "Can't store object without persistence!\n" ),
+        throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't store object without persistence!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
-    // if ( m_bWaitSaveCompleted )
-    //  throw embed::WrongStateException(
-    //              ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
-    //              uno::Reference< uno::XInterface >( reinterpret_cast< ::cppu::OWeakObject* >(this) ) );
-
     return uno::Reference< util::XCloseable >( m_pDocHolder->GetComponent(), uno::UNO_QUERY );
 }
 
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index 48776dc36edb..dba384690bd8 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -125,7 +125,7 @@ uno::Sequence< beans::PropertyValue > addAsTemplate( const uno::Sequence< beans:
     if ( !bAsTemplateSet )
     {
         aResult.realloc( nLength + 1 );
-        aResult[nLength].Name = ::rtl::OUString::createFromAscii( "AsTemplate" );
+        aResult[nLength].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AsTemplate" ));
         aResult[nLength].Value <<= sal_True;
     }
 
@@ -148,7 +148,7 @@ uno::Reference< io::XInputStream > createTempInpStreamFromStor(
     if ( xTempStream.is() )
     {
         uno::Reference < lang::XSingleServiceFactory > xStorageFactory(
-                    xFactory->createInstance ( ::rtl::OUString::createFromAscii( "com.sun.star.embed.StorageFactory" ) ),
+                    xFactory->createInstance ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.StorageFactory" )) ),
                     uno::UNO_QUERY );
 
         uno::Sequence< uno::Any > aArgs( 2 );
@@ -165,7 +165,7 @@ uno::Reference< io::XInputStream > createTempInpStreamFromStor(
         } catch( uno::Exception& e )
         {
             throw embed::StorageWrappedTargetException(
-                        ::rtl::OUString::createFromAscii( "Can't copy storage!" ),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't copy storage!" )),
                         uno::Reference< uno::XInterface >(),
                         uno::makeAny( e ) );
         }
@@ -245,7 +245,7 @@ static void SetDocToEmbedded( const uno::Reference< frame::XModel > xDocument, c
     if ( xDocument.is() )
     {
         uno::Sequence< beans::PropertyValue > aSeq( 1 );
-        aSeq[0].Name = ::rtl::OUString::createFromAscii( "SetEmbedded" );
+        aSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SetEmbedded" ));
         aSeq[0].Value <<= sal_True;
         xDocument->attachResource( ::rtl::OUString(), aSeq );
 
@@ -403,9 +403,9 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadLink_Impl()
 
     sal_Int32 nLen = 2;
     uno::Sequence< beans::PropertyValue > aArgs( nLen );
-    aArgs[0].Name = ::rtl::OUString::createFromAscii( "URL" );
+    aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "URL" ));
     aArgs[0].Value <<= m_aLinkURL;
-    aArgs[1].Name = ::rtl::OUString::createFromAscii( "FilterName" );
+    aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
     aArgs[1].Value <<= m_aLinkFilterName;
     if ( m_bLinkHasPassword )
     {
@@ -540,7 +540,7 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadDocumentFromStorag
             // no need to let the file stay after the stream is removed since the embedded document
             // can not be stored directly
             uno::Reference< beans::XPropertySet > xTempStreamProps( xTempInpStream, uno::UNO_QUERY_THROW );
-            xTempStreamProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Uri" ) ) >>= aTempFileURL;
+            xTempStreamProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Uri" )) ) >>= aTempFileURL;
         }
         catch( uno::Exception& )
         {
@@ -598,7 +598,7 @@ uno::Reference< io::XInputStream > OCommonEmbeddedObject::StoreDocumentToTempStr
                                                                             const ::rtl::OUString& aHierarchName )
 {
     uno::Reference < io::XOutputStream > xTempOut(
-                m_xFactory->createInstance ( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ),
+                m_xFactory->createInstance ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.TempFile" )) ),
                 uno::UNO_QUERY );
     uno::Reference< io::XInputStream > aResult( xTempOut, uno::UNO_QUERY );
 
@@ -622,16 +622,16 @@ uno::Reference< io::XInputStream > OCommonEmbeddedObject::StoreDocumentToTempStr
         throw io::IOException(); // TODO:
 
     uno::Sequence< beans::PropertyValue > aArgs( 4 );
-    aArgs[0].Name = ::rtl::OUString::createFromAscii( "FilterName" );
+    aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
     aArgs[0].Value <<= aFilterName;
-    aArgs[1].Name = ::rtl::OUString::createFromAscii( "OutputStream" );
+    aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OutputStream" ));
     aArgs[1].Value <<= xTempOut;
-    aArgs[2].Name = ::rtl::OUString::createFromAscii( "DocumentBaseURL" );
+    aArgs[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DocumentBaseURL" ));
     aArgs[2].Value <<= aBaseURL;
-    aArgs[3].Name = ::rtl::OUString::createFromAscii( "HierarchicalDocumentName" );
+    aArgs[3].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HierarchicalDocumentName" ));
     aArgs[3].Value <<= aHierarchName;
 
-    xStorable->storeToURL( ::rtl::OUString::createFromAscii( "private:stream" ), aArgs );
+    xStorable->storeToURL( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "private:stream" )), aArgs );
     try
     {
         xTempOut->closeOutput();
@@ -784,11 +784,11 @@ void OCommonEmbeddedObject::StoreDocToStorage_Impl( const uno::Reference< embed:
             throw io::IOException(); // TODO:
 
         uno::Sequence< beans::PropertyValue > aArgs( 3 );
-        aArgs[0].Name = ::rtl::OUString::createFromAscii( "FilterName" );
+        aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
         aArgs[0].Value <<= aFilterName;
-        aArgs[2].Name = ::rtl::OUString::createFromAscii( "DocumentBaseURL" );
+        aArgs[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DocumentBaseURL" ));
         aArgs[2].Value <<= aBaseURL;
-        aArgs[1].Name = ::rtl::OUString::createFromAscii( "HierarchicalDocumentName" );
+        aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HierarchicalDocumentName" ));
         aArgs[1].Value <<= aHierarchName;
 
         xDoc->storeToStorage( xStorage, aArgs );
@@ -805,7 +805,7 @@ void OCommonEmbeddedObject::StoreDocToStorage_Impl( const uno::Reference< embed:
 
         // open storage based on document temporary file for reading
         uno::Reference < lang::XSingleServiceFactory > xStorageFactory(
-                    m_xFactory->createInstance ( ::rtl::OUString::createFromAscii( "com.sun.star.embed.StorageFactory" ) ),
+                    m_xFactory->createInstance ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.StorageFactory" )) ),
                     uno::UNO_QUERY );
 
         uno::Sequence< uno::Any > aArgs(1);
@@ -894,7 +894,7 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::CreateTempDocFromLink_
             // no need to let the file stay after the stream is removed since the embedded document
             // can not be stored directly
             uno::Reference< beans::XPropertySet > xTempStreamProps( xTempStream, uno::UNO_QUERY_THROW );
-            xTempStreamProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Uri" ) ) >>= aTempFileURL;
+            xTempStreamProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Uri" )) ) >>= aTempFileURL;
         }
         catch( uno::Exception& )
         {
@@ -902,24 +902,22 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::CreateTempDocFromLink_
 
         OSL_ENSURE( aTempFileURL.getLength(), "Coudn't retrieve temporary file URL!\n" );
 
-        aTempMediaDescr[0].Name = ::rtl::OUString::createFromAscii( "URL" );
+        aTempMediaDescr[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "URL" ));
         aTempMediaDescr[0].Value <<= aTempFileURL;
-        aTempMediaDescr[1].Name = ::rtl::OUString::createFromAscii( "InputStream" );
+        aTempMediaDescr[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "InputStream" ));
         aTempMediaDescr[1].Value <<= xTempStream;
-        aTempMediaDescr[2].Name = ::rtl::OUString::createFromAscii( "FilterName" );
+        aTempMediaDescr[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
         aTempMediaDescr[2].Value <<= GetFilterName( nStorageFormat );
-        aTempMediaDescr[3].Name = ::rtl::OUString::createFromAscii( "AsTemplate" );
+        aTempMediaDescr[3].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AsTemplate" ));
         aTempMediaDescr[3].Value <<= sal_True;
     }
     else
     {
         aTempMediaDescr.realloc( 2 );
-        aTempMediaDescr[0].Name = ::rtl::OUString::createFromAscii( "URL" );
+        aTempMediaDescr[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "URL" ));
         aTempMediaDescr[0].Value <<= m_aLinkURL;
-        aTempMediaDescr[1].Name = ::rtl::OUString::createFromAscii( "FilterName" );
+        aTempMediaDescr[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
         aTempMediaDescr[1].Value <<= m_aLinkFilterName;
-        // aTempMediaDescr[2].Name = ::rtl::OUString::createFromAscii( "AsTemplate" );
-        // aTempMediaDescr[2].Value <<= sal_True;
     }
 
     xResult = CreateDocFromMediaDescr_Impl( aTempMediaDescr );
@@ -950,12 +948,12 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
         throw lang::DisposedException(); // TODO
 
     if ( !xStorage.is() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No parent storage is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             1 );
 
     if ( !sEntName.getLength() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Empty element name is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             2 );
 
@@ -970,7 +968,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
         // it can switch persistant representation only without initialization
 
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "Can't change persistant representation of activated object!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't change persistant representation of activated object!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
@@ -980,7 +978,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
             saveCompleted( ( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) ) );
         else
             throw embed::WrongStateException(
-                        ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
@@ -1137,7 +1135,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
             //TODO:
         //}
         else
-            throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Wrong connection mode is provided!\n" ),
+            throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Wrong connection mode is provided!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                         3 );
     }
@@ -1163,13 +1161,13 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed::
     if ( m_nObjectState == -1 )
     {
         // the object is still not loaded
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "Can't store object without persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't store object without persistence!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     // for now support of this interface is required to allow breaking of links and converting them to normal embedded
@@ -1291,13 +1289,13 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed::
     if ( m_nObjectState == -1 )
     {
         // the object is still not loaded
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "Can't store object without persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't store object without persistence!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     // for now support of this interface is required to allow breaking of links and converting them to normal embedded
@@ -1338,7 +1336,7 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed::
         OSL_ENSURE( sal_False, "Can not retrieve own storage media type!\n" );
     }
 
-    PostEvent_Impl( ::rtl::OUString::createFromAscii( "OnSaveAs" ) );
+    PostEvent_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSaveAs" )) );
 
     sal_Bool bTryOptimization = sal_False;
     for ( sal_Int32 nInd = 0; nInd < lObjArgs.getLength(); nInd++ )
@@ -1426,7 +1424,7 @@ void SAL_CALL OCommonEmbeddedObject::saveCompleted( sal_Bool bUseNew )
     if ( m_nObjectState == -1 )
     {
         // the object is still not loaded
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "Can't store object without persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't store object without persistence!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
@@ -1462,7 +1460,7 @@ void SAL_CALL OCommonEmbeddedObject::saveCompleted( sal_Bool bUseNew )
         if ( xModif.is() )
             xModif->setModified( sal_False );
 
-        PostEvent_Impl( ::rtl::OUString::createFromAscii( "OnSaveAsDone" ) );
+        PostEvent_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSaveAsDone" ) ));
     }
     else
     {
@@ -1505,7 +1503,7 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::hasEntry()
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     if ( m_xObjectStorage.is() )
@@ -1526,13 +1524,13 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::hasEntry()
     if ( m_nObjectState == -1 )
     {
         // the object is still not loaded
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object persistence is not initialized!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object persistence is not initialized!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     return m_aEntryName;
@@ -1558,13 +1556,13 @@ void SAL_CALL OCommonEmbeddedObject::storeOwn()
     if ( m_nObjectState == -1 )
     {
         // the object is still not loaded
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "Can't store object without persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't store object without persistence!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     if ( m_bReadOnly )
@@ -1574,7 +1572,7 @@ void SAL_CALL OCommonEmbeddedObject::storeOwn()
     if ( m_nObjectState == embed::EmbedStates::LOADED )
         return;
 
-    PostEvent_Impl( ::rtl::OUString::createFromAscii( "OnSave" ) );
+    PostEvent_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSave" )) );
 
     OSL_ENSURE( m_pDocHolder->GetComponent().is(), "If an object is activated or in running state it must have a document!\n" );
     if ( !m_pDocHolder->GetComponent().is() )
@@ -1623,7 +1621,7 @@ void SAL_CALL OCommonEmbeddedObject::storeOwn()
     if ( xModif.is() )
         xModif->setModified( sal_False );
 
-    PostEvent_Impl( ::rtl::OUString::createFromAscii( "OnSaveDone" ) );
+    PostEvent_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSaveDone" )) );
 }
 
 //------------------------------------------------------
@@ -1638,13 +1636,13 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::isReadonly()
     if ( m_nObjectState == -1 )
     {
         // the object is still not loaded
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object persistence is not initialized!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object persistence is not initialized!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     return m_bReadOnly;
@@ -1670,7 +1668,7 @@ void SAL_CALL OCommonEmbeddedObject::reload(
     if ( m_nObjectState == -1 )
     {
         // the object is still not loaded
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object persistence is not initialized!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object persistence is not initialized!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
@@ -1678,13 +1676,13 @@ void SAL_CALL OCommonEmbeddedObject::reload(
     {
         // the object is still not loaded
         throw embed::WrongStateException(
-                                ::rtl::OUString::createFromAscii( "The object must be in loaded state to be reloaded!\n" ),
+                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object must be in loaded state to be reloaded!\n" )),
                                 uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     if ( m_bIsLink )
@@ -1792,7 +1790,7 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt
     {
         // it must be a linked initialized object
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object is not a valid linked object!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not a valid linked object!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
     else
@@ -1802,12 +1800,12 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt
     }
 
     if ( !xStorage.is() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No parent storage is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             1 );
 
     if ( !sEntName.getLength() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Empty element name is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             2 );
 
@@ -1815,13 +1813,13 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt
     {
         // it must be a linked initialized object
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object is not a valid linked object!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not a valid linked object!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     uno::Reference< container::XNameAccess > xNameAccess( xStorage, uno::UNO_QUERY );
@@ -1879,12 +1877,6 @@ sal_Bool SAL_CALL  OCommonEmbeddedObject::isLink()
     if ( m_bDisposed )
         throw lang::DisposedException(); // TODO
 
-    // Actually this information is clear even in case object is wayting for saveCompleted
-    // if ( m_bWaitSaveCompleted )
-    //  throw embed::WrongStateException(
-    //              ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
-    //              uno::Reference< uno::XInterface >( reinterpret_cast< ::cppu::OWeakObject* >(this) ) );
-
     return m_bIsLink;
 }
 
@@ -1898,15 +1890,9 @@ sal_Bool SAL_CALL  OCommonEmbeddedObject::isLink()
     if ( m_bDisposed )
         throw lang::DisposedException(); // TODO
 
-    // Actually this information is clear even in case object is wayting for saveCompleted
-    // if ( m_bWaitSaveCompleted )
-    //  throw embed::WrongStateException(
-    //              ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
-    //              uno::Reference< uno::XInterface >( reinterpret_cast< ::cppu::OWeakObject* >(this) ) );
-
     if ( !m_bIsLink )
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object is not a link object!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not a link object!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     return m_aLinkURL;
diff --git a/embeddedobj/source/commonembedding/specialobject.cxx b/embeddedobj/source/commonembedding/specialobject.cxx
index 6234f339e232..802056b72af7 100644
--- a/embeddedobj/source/commonembedding/specialobject.cxx
+++ b/embeddedobj/source/commonembedding/specialobject.cxx
@@ -118,13 +118,13 @@ embed::VisualRepresentation SAL_CALL OSpecialEmbeddedObject::getPreferredVisualR
 
     // TODO: if object is in loaded state it should switch itself to the running state
     if ( m_nObjectState == -1 || m_nObjectState == embed::EmbedStates::LOADED )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The own object has no model!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The own object has no model!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
     if ( nAspect == embed::Aspects::MSOLE_ICON )
         // no representation can be retrieved
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "Illegal call!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     // TODO: return for the aspect of the document
@@ -136,8 +136,8 @@ embed::VisualRepresentation SAL_CALL OSpecialEmbeddedObject::getPreferredVisualR
         throw uno::RuntimeException();
 
     datatransfer::DataFlavor aDataFlavor(
-            ::rtl::OUString::createFromAscii( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ),
-            ::rtl::OUString::createFromAscii( "GDIMetaFile" ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" )),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "GDIMetaFile" )),
             ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) );
 
     aVisualRepresentation.Data = xTransferable->getTransferData( aDataFlavor );
@@ -158,7 +158,7 @@ void SAL_CALL OSpecialEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, cons
     OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
     if ( nAspect == embed::Aspects::MSOLE_ICON )
         // no representation can be retrieved
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "Illegal call!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     maSize = aSize;
@@ -177,11 +177,11 @@ awt::Size SAL_CALL OSpecialEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect
     OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
     if ( nAspect == embed::Aspects::MSOLE_ICON )
         // no representation can be retrieved
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "Illegal call!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The own object has no model!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The own object has no model!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     awt::Size aResult;
@@ -199,7 +199,7 @@ sal_Int32 SAL_CALL OSpecialEmbeddedObject::getMapUnit( sal_Int64 nAspect )
     OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
     if ( nAspect == embed::Aspects::MSOLE_ICON )
         // no representation can be retrieved
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "Illegal call!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     return embed::EmbedMapUnits::ONE_100TH_MM;
@@ -228,7 +228,7 @@ void SAL_CALL OSpecialEmbeddedObject::doVerb( sal_Int32 nVerbID )
         throw lang::DisposedException(); // TODO
 
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object has no persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     if ( nVerbID == -7 )
diff --git a/embeddedobj/source/commonembedding/visobj.cxx b/embeddedobj/source/commonembedding/visobj.cxx
index 206e57804bdb..7be21d75f92b 100644
--- a/embeddedobj/source/commonembedding/visobj.cxx
+++ b/embeddedobj/source/commonembedding/visobj.cxx
@@ -57,11 +57,11 @@ void SAL_CALL OCommonEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const
     OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
     if ( nAspect == embed::Aspects::MSOLE_ICON )
         // no representation can be retrieved
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "Illegal call!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The own object has no persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The own object has no persistence!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     m_bHasClonedSize = sal_False;
@@ -97,7 +97,7 @@ awt::Size SAL_CALL OCommonEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
         throw lang::DisposedException(); // TODO
 
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The own object has no persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The own object has no persistence!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
@@ -137,11 +137,11 @@ sal_Int32 SAL_CALL OCommonEmbeddedObject::getMapUnit( sal_Int64 nAspect )
     OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
     if ( nAspect == embed::Aspects::MSOLE_ICON )
         // no representation can be retrieved
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "Illegal call!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The own object has no persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The own object has no persistence!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     if ( m_bHasClonedSize )
@@ -180,14 +180,14 @@ embed::VisualRepresentation SAL_CALL OCommonEmbeddedObject::getPreferredVisualRe
         throw lang::DisposedException(); // TODO
 
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The own object has no persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The own object has no persistence!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
 
     OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
     if ( nAspect == embed::Aspects::MSOLE_ICON )
         // no representation can be retrieved
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "Illegal call!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     sal_Bool bBackToLoaded = sal_False;
@@ -216,8 +216,8 @@ embed::VisualRepresentation SAL_CALL OCommonEmbeddedObject::getPreferredVisualRe
             throw uno::RuntimeException();
 
         datatransfer::DataFlavor aDataFlavor(
-                ::rtl::OUString::createFromAscii( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ),
-                ::rtl::OUString::createFromAscii( "GDIMetaFile" ),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" )),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "GDIMetaFile" )),
                 ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) );
 
         if( xTransferable->isDataFlavorSupported( aDataFlavor ))
diff --git a/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx
index dfa7464a3dbf..72aecfe07d15 100644
--- a/embeddedobj/source/commonembedding/xfactory.cxx
+++ b/embeddedobj/source/commonembedding/xfactory.cxx
@@ -50,15 +50,15 @@ using namespace ::com::sun::star;
 uno::Sequence< ::rtl::OUString > SAL_CALL OOoEmbeddedObjectFactory::impl_staticGetSupportedServiceNames()
 {
     uno::Sequence< ::rtl::OUString > aRet(2);
-    aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.embed.OOoEmbeddedObjectFactory");
-    aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.OOoEmbeddedObjectFactory");
+    aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.OOoEmbeddedObjectFactory"));
+    aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.OOoEmbeddedObjectFactory"));
     return aRet;
 }
 
 //-------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OOoEmbeddedObjectFactory::impl_staticGetImplementationName()
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.OOoEmbeddedObjectFactory");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.OOoEmbeddedObjectFactory"));
 }
 
 //-------------------------------------------------------------------------
@@ -83,12 +83,12 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
     RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OOoEmbeddedObjectFactory::createInstanceInitFromEntry" );
 
     if ( !xStorage.is() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No parent storage is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             1 );
 
     if ( !sEntName.getLength() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Empty element name is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             2 );
 
@@ -113,7 +113,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
 
         ::rtl::OUString aMediaType;
         try {
-            uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString::createFromAscii( "MediaType" ) );
+            uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MediaType" )) );
             aAny >>= aMediaType;
         }
         catch ( uno::Exception& )
@@ -174,12 +174,12 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
     RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OOoEmbeddedObjectFactory::createInstanceInitFromMediaDescriptor" );
 
     if ( !xStorage.is() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No parent storage is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             1 );
 
     if ( !sEntName.getLength() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Empty element name is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             2 );
 
@@ -241,12 +241,12 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
     uno::Reference< uno::XInterface > xResult;
 
     if ( !xStorage.is() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No parent storage is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             3 );
 
     if ( !sEntName.getLength() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Empty element name is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             4 );
 
@@ -293,12 +293,12 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
 
     // the initialization is completelly controlled by user
     if ( !xStorage.is() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No parent storage is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             1 );
 
     if ( !sEntName.getLength() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Empty element name is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             2 );
 
@@ -362,7 +362,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
             aTempMedDescr[nInd].Value >>= aURL;
 
     if ( !aURL.getLength() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No URL for the link is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No URL for the link is provided!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                         3 );
 
@@ -411,12 +411,12 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
 
     // the initialization is completelly controlled by user
     if ( !xStorage.is() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No parent storage is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             1 );
 
     if ( !sEntName.getLength() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Empty element name is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             2 );
 
@@ -428,7 +428,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
             aTempMedDescr[nInd].Value >>= aURL;
 
     if ( !aURL.getLength() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No URL for the link is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No URL for the link is provided!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                         3 );
 
@@ -489,15 +489,15 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OOoEmbeddedObjectFactory::getSupported
 uno::Sequence< ::rtl::OUString > SAL_CALL OOoSpecialEmbeddedObjectFactory::impl_staticGetSupportedServiceNames()
 {
     uno::Sequence< ::rtl::OUString > aRet(2);
-    aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.embed.OOoSpecialEmbeddedObjectFactory");
-    aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory");
+    aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.OOoSpecialEmbeddedObjectFactory"));
+    aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory"));
     return aRet;
 }
 
 //-------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OOoSpecialEmbeddedObjectFactory::impl_staticGetImplementationName()
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.OOoSpecialEmbeddedObjectFactory"));
 }
 
 //-------------------------------------------------------------------------
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index 93e152db1e73..c87bff4cd597 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -175,11 +175,11 @@ DocumentHolder::DocumentHolder( const uno::Reference< lang::XMultiServiceFactory
     m_aOutplaceFrameProps.realloc( 3 );
     beans::NamedValue aArg;
 
-    aArg.Name = ::rtl::OUString::createFromAscii("TopWindow");
+    aArg.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TopWindow"));
     aArg.Value <<= sal_True;
     m_aOutplaceFrameProps[0] <<= aArg;
 
-    aArg.Name = ::rtl::OUString::createFromAscii("MakeVisible");
+    aArg.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MakeVisible"));
     aArg.Value <<= sal_False;
     m_aOutplaceFrameProps[1] <<= aArg;
 
@@ -197,7 +197,7 @@ DocumentHolder::DocumentHolder( const uno::Reference< lang::XMultiServiceFactory
         }
         m_refCount--;
 
-        aArg.Name = ::rtl::OUString::createFromAscii("ParentFrame");
+        aArg.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentFrame"));
         aArg.Value <<= xDesktop; //TODO/LATER: should use parent document frame
         m_aOutplaceFrameProps[2] <<= aArg;
     }
@@ -433,7 +433,7 @@ sal_Bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >&
 
             uno::Reference< embed::XHatchWindowFactory > xHatchFactory(
                     m_xFactory->createInstance(
-                        ::rtl::OUString::createFromAscii( "com.sun.star.embed.HatchWindowFactory" ) ),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.HatchWindowFactory" )) ),
                     uno::UNO_QUERY );
 
             if ( !xHatchFactory.is() )
@@ -468,7 +468,7 @@ sal_Bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >&
                                                 awt::WindowAttribute::SHOW | awt::VclWindowPeerAttribute::CLIPCHILDREN );
 
         uno::Reference< awt::XToolkit > xToolkit(
-                            m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.awt.Toolkit" ) ),
+                            m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.Toolkit" )) ),
                             uno::UNO_QUERY );
         if ( !xToolkit.is() )
             throw uno::RuntimeException();
@@ -480,20 +480,20 @@ sal_Bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >&
 
         // create a frame based on the specified window
         uno::Reference< lang::XSingleServiceFactory > xFrameFact(
-            m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.frame.TaskCreator" ) ),
+            m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.TaskCreator" )) ),
             uno::UNO_QUERY_THROW );
 
         uno::Sequence< uno::Any > aArgs( 2 );
         beans::NamedValue aArg;
 
-        aArg.Name    = ::rtl::OUString::createFromAscii("ContainerWindow");
+        aArg.Name    = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContainerWindow"));
         aArg.Value <<= xOwnWindow;
         aArgs[0] <<= aArg;
 
         uno::Reference< frame::XFrame > xContFrame( xContDisp, uno::UNO_QUERY );
         if ( xContFrame.is() )
         {
-            aArg.Name    = ::rtl::OUString::createFromAscii("ParentFrame");
+            aArg.Name    = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentFrame"));
             aArg.Value <<= xContFrame;
             aArgs[1] <<= aArg;
         }
@@ -871,7 +871,7 @@ uno::Reference< frame::XFrame > DocumentHolder::GetDocFrame()
     if ( !m_xFrame.is() )
     {
         uno::Reference< lang::XSingleServiceFactory > xFrameFact(
-            m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.frame.TaskCreator" ) ),
+            m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.TaskCreator" ) )),
             uno::UNO_QUERY_THROW );
 
         m_xFrame.set(xFrameFact->createInstanceWithArguments( m_aOutplaceFrameProps ), uno::UNO_QUERY_THROW);
@@ -1033,13 +1033,13 @@ sal_Bool DocumentHolder::LoadDocToFrame( sal_Bool bInPlace )
                 sUrl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".component:DB/ReportDesign"));
             }
             else if( xServiceInfo.is()
-                &&   xServiceInfo->supportsService( ::rtl::OUString::createFromAscii("com.sun.star.chart2.ChartDocument")) )
+                &&   xServiceInfo->supportsService( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.ChartDocument")) ))
                 sUrl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/schart"));
             else
                 sUrl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:object"));
 
             xComponentLoader->loadComponentFromURL( sUrl,
-                                                        rtl::OUString::createFromAscii( "_self" ),
+                                                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_self" )),
                                                         0,
                                                         aArgs.getPropertyValues() );
 
diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx
index 3079edc21aff..c459ffc1fb90 100644
--- a/embeddedobj/source/general/dummyobject.cxx
+++ b/embeddedobj/source/general/dummyobject.cxx
@@ -55,7 +55,7 @@ void ODummyEmbeddedObject::CheckInit()
         throw lang::DisposedException();
 
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object has no persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 }
 
@@ -240,7 +240,7 @@ void SAL_CALL ODummyEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const
     OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
     if ( nAspect == embed::Aspects::MSOLE_ICON )
         // no representation can be retrieved
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "Illegal call!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     m_nCachedAspect = nAspect;
@@ -261,7 +261,7 @@ awt::Size SAL_CALL ODummyEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
     OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
     if ( nAspect == embed::Aspects::MSOLE_ICON )
         // no representation can be retrieved
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "Illegal call!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     if ( !m_bHasCachedSize || m_nCachedAspect != nAspect )
@@ -283,7 +283,7 @@ sal_Int32 SAL_CALL ODummyEmbeddedObject::getMapUnit( sal_Int64 nAspect )
     OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
     if ( nAspect == embed::Aspects::MSOLE_ICON )
         // no representation can be retrieved
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "Illegal call!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     return embed::EmbedMapUnits::ONE_100TH_MM;
@@ -300,7 +300,7 @@ embed::VisualRepresentation SAL_CALL ODummyEmbeddedObject::getPreferredVisualRep
     CheckInit();
 
     // no representation can be retrieved
-    throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "Illegal call!\n" ),
+    throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
                                 uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 }
 
@@ -322,12 +322,12 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry(
         throw lang::DisposedException(); // TODO
 
     if ( !xStorage.is() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No parent storage is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             1 );
 
     if ( !sEntName.getLength() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Empty element name is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             2 );
 
@@ -335,7 +335,7 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry(
       && ( m_nObjectState == -1 || nEntryConnectionMode != embed::EntryInitModes::NO_INIT ) )
     {
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "Can't change persistant representation of activated object!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't change persistant representation of activated object!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
@@ -345,7 +345,7 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry(
             saveCompleted( ( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) ) );
         else
             throw embed::WrongStateException(
-                        ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
@@ -360,13 +360,13 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry(
             m_nObjectState = embed::EmbedStates::LOADED;
         }
         else
-            throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Wrong entry is provided!\n" ),
+            throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Wrong entry is provided!\n" )),
                                 uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                 2 );
 
     }
     else
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Wrong connection mode is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Wrong connection mode is provided!\n" )),
                                 uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                 3 );
 }
@@ -387,7 +387,7 @@ void SAL_CALL ODummyEmbeddedObject::storeToEntry( const uno::Reference< embed::X
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     m_xParentStorage->copyElementTo( m_aEntryName, xStorage, sEntName );
@@ -409,10 +409,10 @@ void SAL_CALL ODummyEmbeddedObject::storeAsEntry( const uno::Reference< embed::X
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
-    PostEvent_Impl( ::rtl::OUString::createFromAscii( "OnSaveAs" ),
+    PostEvent_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSaveAs" )),
                     uno::Reference< uno::XInterface >( static_cast< cppu::OWeakObject* >( this ) ) );
 
     m_xParentStorage->copyElementTo( m_aEntryName, xStorage, sEntName );
@@ -448,7 +448,7 @@ void SAL_CALL ODummyEmbeddedObject::saveCompleted( sal_Bool bUseNew )
         m_xParentStorage = m_xNewParentStorage;
         m_aEntryName = m_aNewEntryName;
 
-        PostEvent_Impl( ::rtl::OUString::createFromAscii( "OnSaveAsDone" ),
+        PostEvent_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSaveAsDone" )),
                         uno::Reference< uno::XInterface >( static_cast< cppu::OWeakObject* >( this ) ) );
     }
 
@@ -467,7 +467,7 @@ sal_Bool SAL_CALL ODummyEmbeddedObject::hasEntry()
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     if ( m_aEntryName.getLength() )
@@ -486,7 +486,7 @@ sal_Bool SAL_CALL ODummyEmbeddedObject::hasEntry()
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     return m_aEntryName;
@@ -504,7 +504,7 @@ void SAL_CALL ODummyEmbeddedObject::storeOwn()
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     // the object can not be activated or changed
@@ -521,7 +521,7 @@ sal_Bool SAL_CALL ODummyEmbeddedObject::isReadonly()
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     // this object can not be changed
@@ -543,7 +543,7 @@ void SAL_CALL ODummyEmbeddedObject::reload(
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     // nothing to reload
diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx
index ec919a957f47..db8d735ce11a 100644
--- a/embeddedobj/source/general/intercept.cxx
+++ b/embeddedobj/source/general/intercept.cxx
@@ -184,12 +184,12 @@ Interceptor::dispatch(
             if ( nInd == aNewArgs.getLength() )
             {
                 aNewArgs.realloc( nInd + 1 );
-                aNewArgs[nInd].Name = ::rtl::OUString::createFromAscii( "SaveTo" );
+                aNewArgs[nInd].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SaveTo" ));
                 aNewArgs[nInd].Value <<= sal_True;
             }
 
             uno::Reference< frame::XDispatch > xDispatch = m_xSlaveDispatchProvider->queryDispatch(
-                URL, ::rtl::OUString::createFromAscii( "_self" ), 0 );
+                URL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_self" )), 0 );
             if ( xDispatch.is() )
                 xDispatch->dispatch( URL, aNewArgs );
         }
diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx
index 46846f778541..84804d41b7de 100644
--- a/embeddedobj/source/general/xcreator.cxx
+++ b/embeddedobj/source/general/xcreator.cxx
@@ -52,15 +52,15 @@ using namespace ::com::sun::star;
 uno::Sequence< ::rtl::OUString > SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetSupportedServiceNames()
 {
     uno::Sequence< ::rtl::OUString > aRet(2);
-    aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.embed.EmbeddedObjectCreator");
-    aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.EmbeddedObjectCreator");
+    aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.EmbeddedObjectCreator"));
+    aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.EmbeddedObjectCreator"));
     return aRet;
 }
 
 //-------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetImplementationName()
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.EmbeddedObjectCreator");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.EmbeddedObjectCreator"));
 }
 
 //-------------------------------------------------------------------------
@@ -87,12 +87,12 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
     uno::Reference< uno::XInterface > xResult;
 
     if ( !xStorage.is() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No parent storage is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             3 );
 
     if ( !sEntName.getLength() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Empty element name is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             4 );
 
@@ -101,7 +101,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
     {
         // use system fallback
         // TODO: in future users factories can be tested
-        aEmbedFactory = ::rtl::OUString::createFromAscii( "com.sun.star.embed.OLEEmbeddedObjectFactory" );
+        aEmbedFactory = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLEEmbeddedObjectFactory" ));
     }
 
     uno::Reference < uno::XInterface > xFact( m_xFactory->createInstance( aEmbedFactory ) );
@@ -130,12 +130,12 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
     RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) UNOEmbeddedObjectCreator::createInstanceInitFromEntry" );
 
     if ( !xStorage.is() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No parent storage is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             1 );
 
     if ( !sEntName.getLength() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Empty element name is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             2 );
 
@@ -160,7 +160,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
             throw uno::RuntimeException();
 
         try {
-            uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString::createFromAscii( "MediaType" ) );
+            uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ));
             aAny >>= aMediaType;
         }
         catch ( uno::Exception& )
@@ -192,7 +192,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
             throw uno::RuntimeException();
 
         try {
-            uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString::createFromAscii( "MediaType" ) );
+            uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ));
             aAny >>= aMediaType;
             if ( aMediaType.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.sun.star.oleobject" ) ) ) )
                 aEmbedFactory = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLEEmbeddedObjectFactory" ) );
@@ -251,12 +251,12 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
     // TODO: use lObjArgs
 
     if ( !xStorage.is() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No parent storage is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             1 );
 
     if ( !sEntName.getLength() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Empty element name is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             2 );
 
@@ -271,7 +271,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
         // the object can be loaded by one of the office application
         uno::Reference< embed::XEmbedObjectCreator > xOOoEmbCreator(
                             m_xFactory->createInstance(
-                                    ::rtl::OUString::createFromAscii( "com.sun.star.embed.OOoEmbeddedObjectFactory" ) ),
+                                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OOoEmbeddedObjectFactory" ) )),
                             uno::UNO_QUERY );
         if ( !xOOoEmbCreator.is() )
             throw uno::RuntimeException(); // TODO:
@@ -294,7 +294,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
 
         uno::Reference< embed::XEmbedObjectCreator > xOleEmbCreator(
                             m_xFactory->createInstance(
-                                    ::rtl::OUString::createFromAscii( "com.sun.star.embed.OLEEmbeddedObjectFactory" ) ),
+                                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLEEmbeddedObjectFactory" ) )),
                             uno::UNO_QUERY );
         if ( !xOleEmbCreator.is() )
             throw uno::RuntimeException(); // TODO:
@@ -324,12 +324,12 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
     uno::Reference< uno::XInterface > xResult;
 
     if ( !xStorage.is() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No parent storage is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             3 );
 
     if ( !sEntName.getLength() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Empty element name is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             4 );
 
@@ -373,7 +373,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
             aTempMedDescr[nInd].Value >>= aURL;
 
     if ( !aURL.getLength() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No URL for the link is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No URL for the link is provided!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                         3 );
 
@@ -384,7 +384,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
         // the object can be loaded by one of the office application
         uno::Reference< embed::XLinkCreator > xOOoLinkCreator(
                             m_xFactory->createInstance(
-                                    ::rtl::OUString::createFromAscii( "com.sun.star.embed.OOoEmbeddedObjectFactory" ) ),
+                                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OOoEmbeddedObjectFactory" ) )),
                             uno::UNO_QUERY );
         if ( !xOOoLinkCreator.is() )
             throw uno::RuntimeException(); // TODO:
@@ -406,20 +406,20 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
         // was also extended.
 
         if ( !xStorage.is() )
-            throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No parent storage is provided!\n" ),
+            throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
                                                 uno::Reference< uno::XInterface >(
                                                     static_cast< ::cppu::OWeakObject* >(this) ),
                                                 3 );
 
         if ( !sEntName.getLength() )
-            throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Empty element name is provided!\n" ),
+            throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
                                                 uno::Reference< uno::XInterface >(
                                                     static_cast< ::cppu::OWeakObject* >(this) ),
                                                 4 );
 
         uno::Reference< embed::XLinkCreator > xLinkCreator(
                             m_xFactory->createInstance(
-                                ::rtl::OUString::createFromAscii( "com.sun.star.embed.OLEEmbeddedObjectFactory" ) ),
+                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLEEmbeddedObjectFactory" ) )),
                             uno::UNO_QUERY );
         if ( !xLinkCreator.is() )
             throw uno::RuntimeException(); // TODO:
diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx
index cb4637bdc286..e82136d5a37b 100644
--- a/embeddedobj/source/inc/docholder.hxx
+++ b/embeddedobj/source/inc/docholder.hxx
@@ -139,7 +139,7 @@ public:
 
     rtl::OUString GetTitle() const
     {
-        return m_aContainerName + ::rtl::OUString::createFromAscii( " - " ) + m_aDocumentNamePart;
+        return m_aContainerName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " - " )) + m_aDocumentNamePart;
     }
 
     rtl::OUString GetContainerName() const { return m_aContainerName; }
diff --git a/embeddedobj/source/msole/graphconvert.cxx b/embeddedobj/source/msole/graphconvert.cxx
index 0642d66f383d..f177f19be449 100644
--- a/embeddedobj/source/msole/graphconvert.cxx
+++ b/embeddedobj/source/msole/graphconvert.cxx
@@ -63,11 +63,11 @@ sal_Bool ConvertBufferToFormat( void* pBuf,
         uno::Reference < io::XInputStream > xIn = new comphelper::SequenceInputStream( aData );
         try
         {
-            uno::Reference < graphic::XGraphicProvider > xGraphicProvider( comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.graphic.GraphicProvider") ), uno::UNO_QUERY );
+            uno::Reference < graphic::XGraphicProvider > xGraphicProvider( comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.graphic.GraphicProvider")) ), uno::UNO_QUERY );
             if( xGraphicProvider.is() )
             {
                 uno::Sequence< beans::PropertyValue > aMediaProperties( 1 );
-                aMediaProperties[0].Name = ::rtl::OUString::createFromAscii( "InputStream" );
+                aMediaProperties[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "InputStream" ));
                 aMediaProperties[0].Value <<= xIn;
                 uno::Reference< graphic::XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties  ) );
                 if( xGraphic.is() )
@@ -76,9 +76,9 @@ sal_Bool ConvertBufferToFormat( void* pBuf,
 //                  uno::Reference < io::XOutputStream > xOut = new utl::OOutputStreamHelper( aNewStream.GetLockBytes() );
                     uno::Reference < io::XStream > xOut = new utl::OStreamWrapper( aNewStream );
                     uno::Sequence< beans::PropertyValue > aOutMediaProperties( 2 );
-                    aOutMediaProperties[0].Name = ::rtl::OUString::createFromAscii( "OutputStream" );
+                    aOutMediaProperties[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OutputStream" ));
                     aOutMediaProperties[0].Value <<= xOut;
-                    aOutMediaProperties[1].Name = ::rtl::OUString::createFromAscii( "MimeType" );
+                    aOutMediaProperties[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MimeType" ));
                     aOutMediaProperties[1].Value <<= aMimeType;
 
                     xGraphicProvider->storeGraphic( xGraphic, aOutMediaProperties );
diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx
index ac0b05fd96fa..616e3fc17d36 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -198,28 +198,28 @@ struct OleComponentNative_Impl {
         m_aSupportedGraphFormats.realloc( 5 );
 
         m_aSupportedGraphFormats[0] = datatransfer::DataFlavor(
-            ::rtl::OUString::createFromAscii( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ),
-            ::rtl::OUString::createFromAscii( "Windows Enhanced Metafile" ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" )),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Windows Enhanced Metafile" )),
             getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
 
         m_aSupportedGraphFormats[1] = datatransfer::DataFlavor(
-            ::rtl::OUString::createFromAscii( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ),
-            ::rtl::OUString::createFromAscii( "Windows Metafile" ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Windows Metafile" )),
             getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
 
         m_aSupportedGraphFormats[2] = datatransfer::DataFlavor(
-            ::rtl::OUString::createFromAscii( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ),
-            ::rtl::OUString::createFromAscii( "Bitmap" ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" )),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Bitmap" )),
             getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
 
         m_aSupportedGraphFormats[3] = datatransfer::DataFlavor(
-            ::rtl::OUString::createFromAscii( "image/png" ),
-            ::rtl::OUString::createFromAscii( "PNG" ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "image/png" )),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "PNG" )),
             getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
 
         m_aSupportedGraphFormats[0] = datatransfer::DataFlavor(
-            ::rtl::OUString::createFromAscii( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ),
-            ::rtl::OUString::createFromAscii( "GDIMetafile" ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" )),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "GDIMetafile" )),
             getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) );
     }
 
@@ -239,11 +239,11 @@ struct OleComponentNative_Impl {
 //----------------------------------------------
 DWORD GetAspectFromFlavor( const datatransfer::DataFlavor& aFlavor )
 {
-    if ( aFlavor.MimeType.indexOf( ::rtl::OUString::createFromAscii( ";Aspect=THUMBNAIL" ) ) != -1 )
+    if ( aFlavor.MimeType.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ";Aspect=THUMBNAIL" )) ) != -1 )
         return DVASPECT_THUMBNAIL;
-    else if ( aFlavor.MimeType.indexOf( ::rtl::OUString::createFromAscii( ";Aspect=ICON" ) ) != -1 )
+    else if ( aFlavor.MimeType.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ";Aspect=ICON" )) ) != -1 )
         return DVASPECT_ICON;
-    else if ( aFlavor.MimeType.indexOf( ::rtl::OUString::createFromAscii( ";Aspect=DOCPRINT" ) ) != -1 )
+    else if ( aFlavor.MimeType.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ";Aspect=DOCPRINT" )) ) != -1 )
         return DVASPECT_DOCPRINT;
     else
         return DVASPECT_CONTENT;
@@ -255,11 +255,11 @@ DWORD GetAspectFromFlavor( const datatransfer::DataFlavor& aFlavor )
     ::rtl::OUString aResult;
 
     if ( nAsp == DVASPECT_THUMBNAIL )
-        aResult = ::rtl::OUString::createFromAscii( ";Aspect=THUMBNAIL" );
+        aResult = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ";Aspect=THUMBNAIL" ));
     else if ( nAsp == DVASPECT_ICON )
-        aResult = ::rtl::OUString::createFromAscii( ";Aspect=ICON" );
+        aResult = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ";Aspect=ICON" ));
     else if ( nAsp == DVASPECT_DOCPRINT )
-        aResult = ::rtl::OUString::createFromAscii( ";Aspect=DOCPRINT" );
+        aResult = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ";Aspect=DOCPRINT" ));
 
     // no suffix for DVASPECT_CONTENT
 
@@ -301,7 +301,7 @@ sal_Bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium
 
         if ( aMedium.tymed == TYMED_MFPICT ) // Win Metafile
         {
-            aFormat = ::rtl::OUString::createFromAscii("image/x-wmf");
+            aFormat = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("image/x-wmf"));
             METAFILEPICT* pMF = ( METAFILEPICT* )GlobalLock( aMedium.hMetaFilePict );
             if ( pMF )
             {
@@ -332,7 +332,7 @@ sal_Bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium
         }
         else if ( aMedium.tymed == TYMED_ENHMF ) // Enh Metafile
         {
-            aFormat = ::rtl::OUString::createFromAscii("image/x-emf");
+            aFormat = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("image/x-emf"));
             nBufSize = GetEnhMetaFileBits( aMedium.hEnhMetaFile, 0, NULL );
             pBuf = new unsigned char[nBufSize];
             if ( nBufSize && nBufSize == GetEnhMetaFileBits( aMedium.hEnhMetaFile, nBufSize, pBuf ) )
@@ -346,7 +346,7 @@ sal_Bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium
         }
         else if ( aMedium.tymed == TYMED_GDI ) // Bitmap
         {
-            aFormat = ::rtl::OUString::createFromAscii("image/x-MS-bmp");
+            aFormat = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("image/x-MS-bmp"));
             nBufSize = GetBitmapBits( aMedium.hBitmap, 0, NULL );
             pBuf = new unsigned char[nBufSize];
             if ( nBufSize && nBufSize == sal::static_int_cast< ULONG >( GetBitmapBits( aMedium.hBitmap, nBufSize, pBuf ) ) )
@@ -417,7 +417,7 @@ sal_Bool GetClassIDFromSequence_Impl( uno::Sequence< sal_Int8 > aSeq, CLSID& aRe
         {
             if ( *pStr == '&' )
             {
-                aResult += ::rtl::OUString::createFromAscii( "~" );
+                aResult += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "~" ));
                 while( *( ++pStr ) == '&' );
             }
             else
@@ -1420,7 +1420,7 @@ void OleComponent::OnViewChange_Impl( sal_uInt32 dwAspect )
     {
         uno::Reference < awt::XRequestCallback > xRequestCallback(
             m_xFactory->createInstance(
-             ::rtl::OUString::createFromAscii("com.sun.star.awt.AsyncCallback") ),
+             ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AsyncCallback") )),
              uno::UNO_QUERY );
         xRequestCallback->addCallback( new MainThreadNotificationRequest( xLockObject, OLECOMP_ONVIEWCHANGE, dwAspect ), uno::Any() );
     }
@@ -1441,7 +1441,7 @@ void OleComponent::OnClose_Impl()
     {
         uno::Reference < awt::XRequestCallback > xRequestCallback(
             m_xFactory->createInstance(
-             ::rtl::OUString::createFromAscii("com.sun.star.awt.AsyncCallback") ),
+             ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AsyncCallback") )),
              uno::UNO_QUERY );
         xRequestCallback->addCallback( new MainThreadNotificationRequest( xLockObject, OLECOMP_ONCLOSE ), uno::Any() );
     }
@@ -1604,7 +1604,7 @@ uno::Any SAL_CALL OleComponent::getTransferData( const datatransfer::DataFlavor&
         // allow to retrieve stream-representation of the object persistence
         bSupportedFlavor = sal_True;
         uno::Reference < io::XStream > xTempFileStream(
-            m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ),
+            m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.TempFile" ) )),
             uno::UNO_QUERY );
 
         if ( !xTempFileStream.is() )
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index 2f077a44f3af..c441693f4917 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -287,7 +287,7 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo()
             || aFilterName.equals( ::rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM( "MS Word 2007 XML" ) ) ) ) )
         {
             uno::Reference< container::XNameAccess > xFilterFactory(
-                m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ),
+                m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" ) )),
                 uno::UNO_QUERY_THROW );
 
             ::rtl::OUString aDocServiceName;
@@ -313,21 +313,21 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo()
                 // let the model behave as embedded one
                 uno::Reference< frame::XModel > xModel( xDocument, uno::UNO_QUERY_THROW );
                 uno::Sequence< beans::PropertyValue > aSeq( 1 );
-                aSeq[0].Name = ::rtl::OUString::createFromAscii( "SetEmbedded" );
+                aSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SetEmbedded" ));
                 aSeq[0].Value <<= sal_True;
                 xModel->attachResource( ::rtl::OUString(), aSeq );
 
                 // load the model from the stream
                 uno::Sequence< beans::PropertyValue > aArgs( 5 );
-                aArgs[0].Name = ::rtl::OUString::createFromAscii( "HierarchicalDocumentName" );
+                aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HierarchicalDocumentName" ));
                 aArgs[0].Value <<= m_aEntryName;
-                aArgs[1].Name = ::rtl::OUString::createFromAscii( "ReadOnly" );
+                aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ReadOnly" ));
                 aArgs[1].Value <<= sal_True;
-                aArgs[2].Name = ::rtl::OUString::createFromAscii( "FilterName" );
+                aArgs[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
                 aArgs[2].Value <<= aFilterName;
-                aArgs[3].Name = ::rtl::OUString::createFromAscii( "URL" );
-                aArgs[3].Value <<= ::rtl::OUString::createFromAscii( "private:stream" );
-                aArgs[4].Name = ::rtl::OUString::createFromAscii( "InputStream" );
+                aArgs[3].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "URL" ));
+                aArgs[3].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "private:stream" ));
+                aArgs[4].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "InputStream" ));
                 aArgs[4].Value <<= m_xObjectStream->getInputStream();
 
                 xSeekable->seek( 0 );
@@ -339,7 +339,7 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo()
                 xDocument->close( sal_True );
                 uno::Reference< beans::XPropertySet > xStorProps( xTmpStorage, uno::UNO_QUERY_THROW );
                 ::rtl::OUString aMediaType;
-                xStorProps->getPropertyValue( ::rtl::OUString::createFromAscii( "MediaType" ) ) >>= aMediaType;
+                xStorProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MediaType" )) ) >>= aMediaType;
                 xTmpStorage->dispose();
 
                 // look for the related embedded object factory
@@ -475,7 +475,7 @@ void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState )
         throw lang::DisposedException(); // TODO
 
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object has no persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     // in case the object is already in requested state
@@ -632,7 +632,7 @@ uno::Sequence< sal_Int32 > SAL_CALL OleEmbeddedObject::getReachableStates()
         throw lang::DisposedException(); // TODO
 
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object has no persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
 #ifdef WNT
@@ -674,7 +674,7 @@ sal_Int32 SAL_CALL OleEmbeddedObject::getCurrentState()
         throw lang::DisposedException(); // TODO
 
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object has no persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     // TODO: Shouldn't we ask object? ( I guess no )
@@ -785,7 +785,7 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID )
         throw lang::DisposedException(); // TODO
 
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object has no persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
 #ifdef WNT
@@ -921,7 +921,7 @@ uno::Sequence< embed::VerbDescriptor > SAL_CALL OleEmbeddedObject::getSupportedV
         throw lang::DisposedException(); // TODO
 
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object has no persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 #ifdef WNT
     if ( m_pOleComponent )
@@ -966,7 +966,7 @@ void SAL_CALL OleEmbeddedObject::setClientSite(
     {
         if ( m_nObjectState != embed::EmbedStates::LOADED && m_nObjectState != embed::EmbedStates::RUNNING )
             throw embed::WrongStateException(
-                                    ::rtl::OUString::createFromAscii( "The client site can not be set currently!\n" ),
+                                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The client site can not be set currently!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
         m_xClientSite = xClient;
@@ -992,7 +992,7 @@ uno::Reference< embed::XEmbeddedClient > SAL_CALL OleEmbeddedObject::getClientSi
         throw lang::DisposedException(); // TODO
 
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object has no persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     return m_xClientSite;
@@ -1019,7 +1019,7 @@ void SAL_CALL OleEmbeddedObject::update()
         throw lang::DisposedException(); // TODO
 
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object has no persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     if ( m_nUpdateMode == embed::EmbedUpdateModes::EXPLICIT_UPDATE )
@@ -1053,7 +1053,7 @@ void SAL_CALL OleEmbeddedObject::setUpdateMode( sal_Int32 nMode )
         throw lang::DisposedException(); // TODO
 
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object has no persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object has no persistence!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     OSL_ENSURE( nMode == embed::EmbedUpdateModes::ALWAYS_UPDATE
@@ -1083,7 +1083,7 @@ sal_Int64 SAL_CALL OleEmbeddedObject::getStatus( sal_Int64
         throw lang::DisposedException(); // TODO
 
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object must be in running state!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object must be in running state!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     sal_Int64 nResult = 0;
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx
index 1fb2e8977d4c..016115fd45fe 100644
--- a/embeddedobj/source/msole/olemisc.cxx
+++ b/embeddedobj/source/msole/olemisc.cxx
@@ -387,15 +387,10 @@ uno::Reference< util::XCloseable > SAL_CALL OleEmbeddedObject::getComponent()
     if ( m_nObjectState == -1 ) // || m_nObjectState == embed::EmbedStates::LOADED )
     {
         // the object is still not running
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object is not loaded!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not loaded!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
-    // if ( m_bWaitSaveCompleted )
-    //  throw embed::WrongStateException(
-    //              ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
-    //              uno::Reference< uno::XInterface >( reinterpret_cast< ::cppu::OWeakObject* >(this) ) );
-
     if ( !m_pOleComponent )
     {
         // TODO/LATER: Is it correct???
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx
index 68a3a057edc4..14e670acd06e 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -73,7 +73,7 @@ sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang:
     {
         uno::Reference < ucb::XSimpleFileAccess > xAccess(
                 xFactory->createInstance (
-                        ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" ) )),
                 uno::UNO_QUERY );
 
         if ( xAccess.is() )
@@ -97,15 +97,15 @@ sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang:
     ::rtl::OUString aResult;
 
     uno::Reference < beans::XPropertySet > xTempFile(
-            xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ),
+            xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.TempFile" ) )),
             uno::UNO_QUERY );
 
     if ( !xTempFile.is() )
         throw uno::RuntimeException(); // TODO
 
     try {
-        xTempFile->setPropertyValue( ::rtl::OUString::createFromAscii( "RemoveFile" ), uno::makeAny( sal_False ) );
-        uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString::createFromAscii( "Uri" ) );
+        xTempFile->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RemoveFile" )), uno::makeAny( sal_False ) );
+        uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Uri" ) ));
         aUrl >>= aResult;
     }
     catch ( uno::Exception& )
@@ -133,7 +133,7 @@ sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang:
         try {
             uno::Reference < ucb::XSimpleFileAccess > xTempAccess(
                             xFactory->createInstance (
-                                    ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ),
+                                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" ) )),
                             uno::UNO_QUERY );
 
             if ( !xTempAccess.is() )
@@ -183,14 +183,14 @@ sal_Bool KillFile_Impl( const ::rtl::OUString& aURL, const uno::Reference< lang:
     try
     {
         uno::Reference < beans::XPropertySet > xTempFile(
-                xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ),
+                xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.TempFile" ) )),
                 uno::UNO_QUERY );
         uno::Reference < io::XStream > xTempStream( xTempFile, uno::UNO_QUERY_THROW );
 
         xParentStorage->copyStreamElementData( aEntryName, xTempStream );
 
-        xTempFile->setPropertyValue( ::rtl::OUString::createFromAscii( "RemoveFile" ), uno::makeAny( sal_False ) );
-        uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString::createFromAscii( "Uri" ) );
+        xTempFile->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RemoveFile" )), uno::makeAny( sal_False ) );
+        uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Uri" ) ));
         aUrl >>= aResult;
     }
     catch( uno::RuntimeException& )
@@ -214,7 +214,7 @@ void SetStreamMediaType_Impl( const uno::Reference< io::XStream >& xStream, cons
     if ( !xPropSet.is() )
         throw uno::RuntimeException(); // TODO: all the storage streams must support XPropertySet
 
-    xPropSet->setPropertyValue( ::rtl::OUString::createFromAscii( "MediaType" ), uno::makeAny( aMediaType ) );
+    xPropSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MediaType" )), uno::makeAny( aMediaType ) );
 }
 #endif
 //------------------------------------------------------
@@ -224,7 +224,7 @@ void LetCommonStoragePassBeUsed_Impl( const uno::Reference< io::XStream >& xStre
     if ( !xPropSet.is() )
         throw uno::RuntimeException(); // Only StorageStreams must be provided here, they must implement the interface
 
-    xPropSet->setPropertyValue( ::rtl::OUString::createFromAscii( "UseCommonStoragePasswordEncryption" ),
+    xPropSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UseCommonStoragePasswordEncryption" )),
                                 uno::makeAny( (sal_Bool)sal_True ) );
 }
 #ifdef WNT
@@ -289,7 +289,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::GetNewFilledTempStream_Impl( co
     OSL_ENSURE( xInStream.is(), "Wrong parameter is provided!\n" );
 
     uno::Reference < io::XStream > xTempFile(
-            m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ),
+            m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.TempFile" ) )),
             uno::UNO_QUERY_THROW );
 
     uno::Reference< io::XOutputStream > xTempOutStream = xTempFile->getOutputStream();
@@ -381,7 +381,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToGetAcceptableFormat_Impl(
     {
         // this is either a bitmap or a metafile clipboard format, retrieve the pure stream
         uno::Reference < io::XStream > xResult(
-            m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ),
+            m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.TempFile" ) )),
             uno::UNO_QUERY_THROW );
         uno::Reference < io::XSeekable > xResultSeek( xResult, uno::UNO_QUERY_THROW );
         uno::Reference < io::XOutputStream > xResultOut = xResult->getOutputStream();
@@ -389,48 +389,6 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToGetAcceptableFormat_Impl(
         if ( !xResultOut.is() || !xResultIn.is() )
             throw uno::RuntimeException();
 
-        // if it is windows metafile the size must be provided
-        // the solution is not used currently
-//      if ( bSetSizeToRepl && abs( aSizeToSet.Width ) < 0xFFFF && abs( aSizeToSet.Height ) < 0xFFFF )
-//      {
-//          uno::Sequence< sal_Int8 > aHeader(22);
-//          sal_uInt8* pBuffer = (sal_uInt8*)aHeader.getArray();
-//
-//          // write 0x9ac6cdd7L
-//          pBuffer[0] = 0xd7;
-//          pBuffer[1] = 0xcd;
-//          pBuffer[2] = 0xc6;
-//          pBuffer[3] = 0x9a;
-//
-//          // following data seems to have no value
-//          pBuffer[4] = 0;
-//          pBuffer[5] = 0;
-//
-//          // must be set to 0
-//          pBuffer[6] = 0;
-//          pBuffer[7] = 0;
-//          pBuffer[8] = 0;
-//          pBuffer[9] = 0;
-//
-//          // width of the picture
-//          pBuffer[10] = abs( aSizeToSet.Width ) % 0x100;
-//          pBuffer[11] = ( abs( aSizeToSet.Width ) / 0x100 ) % 0x100;
-//
-//          // height of the picture
-//          pBuffer[12] = abs( aSizeToSet.Height ) % 0x100;
-//          pBuffer[13] = ( abs( aSizeToSet.Height ) / 0x100 ) % 0x100;
-//
-//          // write 2540
-//          pBuffer[14] = 0x6c; //0xec;
-//          pBuffer[15] = 0x01; //0x09;
-//
-//          // fill with 0
-//          for ( sal_Int32 nInd = 16; nInd < 22; nInd++ )
-//              pBuffer[nInd] = 0;
-//
-//          xResultOut->writeBytes( aHeader );
-//      }
-
         xSeek->seek( nHeaderOffset ); // header size for these formats
         ::comphelper::OStorageHelper::CopyInputToOutput( xInStream, xResultOut );
         xResultOut->closeOutput();
@@ -459,7 +417,7 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStrea
 
     uno::Reference< container::XNameContainer > xNameContainer(
             m_xFactory->createInstanceWithArguments(
-                    ::rtl::OUString::createFromAscii( "com.sun.star.embed.OLESimpleStorage" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLESimpleStorage" )),
                     aArgs ),
             uno::UNO_QUERY );
 
@@ -471,7 +429,7 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStrea
         xCachedSeek->seek( 0 );
 
     uno::Reference < io::XStream > xTempFile(
-            m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ),
+            m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.TempFile" ) )),
             uno::UNO_QUERY_THROW );
 
     uno::Reference< io::XSeekable > xTempSeek( xTempFile, uno::UNO_QUERY_THROW );
@@ -582,7 +540,7 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStrea
         throw io::IOException(); // TODO:
 
     // insert the result file as replacement image
-    ::rtl::OUString aCacheName = ::rtl::OUString::createFromAscii( "\002OlePres000" );
+    ::rtl::OUString aCacheName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "\002OlePres000" ));
     if ( xNameContainer->hasByName( aCacheName ) )
         xNameContainer->replaceByName( aCacheName, uno::makeAny( xTempFile ) );
     else
@@ -608,7 +566,7 @@ void OleEmbeddedObject::RemoveVisualCache_Impl( const uno::Reference< io::XStrea
     aArgs[1] <<= (sal_Bool)sal_True; // do not create copy
     uno::Reference< container::XNameContainer > xNameContainer(
             m_xFactory->createInstanceWithArguments(
-                    ::rtl::OUString::createFromAscii( "com.sun.star.embed.OLESimpleStorage" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLESimpleStorage" )),
                     aArgs ),
             uno::UNO_QUERY );
 
@@ -617,7 +575,7 @@ void OleEmbeddedObject::RemoveVisualCache_Impl( const uno::Reference< io::XStrea
 
     for ( sal_uInt8 nInd = 0; nInd < 10; nInd++ )
     {
-        ::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" );
+        ::rtl::OUString aStreamName(RTL_CONSTASCII_USTRINGPARAM( "\002OlePres00" ));
         aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd );
         if ( xNameContainer->hasByName( aStreamName ) )
             xNameContainer->removeByName( aStreamName );
@@ -658,7 +616,7 @@ sal_Bool OleEmbeddedObject::HasVisReplInStream()
                     // open temporary file for reading
                     uno::Reference < ucb::XSimpleFileAccess > xTempAccess(
                                     m_xFactory->createInstance (
-                                            ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ),
+                                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" ) )),
                                     uno::UNO_QUERY );
 
                     if ( !xTempAccess.is() )
@@ -682,7 +640,7 @@ sal_Bool OleEmbeddedObject::HasVisReplInStream()
                 aArgs[1] <<= (sal_Bool)sal_True; // do not create copy
                 uno::Reference< container::XNameContainer > xNameContainer(
                         m_xFactory->createInstanceWithArguments(
-                                ::rtl::OUString::createFromAscii( "com.sun.star.embed.OLESimpleStorage" ),
+                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLESimpleStorage" )),
                                 aArgs ),
                         uno::UNO_QUERY );
 
@@ -690,7 +648,7 @@ sal_Bool OleEmbeddedObject::HasVisReplInStream()
                 {
                     for ( sal_uInt8 nInd = 0; nInd < 10 && !bExists; nInd++ )
                     {
-                        ::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" );
+                        ::rtl::OUString aStreamName(RTL_CONSTASCII_USTRINGPARAM( "\002OlePres00" ));
                         aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd );
                         try
                         {
@@ -729,7 +687,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres
         {
             xNameContainer = uno::Reference< container::XNameContainer >(
                 m_xFactory->createInstanceWithArguments(
-                        ::rtl::OUString::createFromAscii( "com.sun.star.embed.OLESimpleStorage" ),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLESimpleStorage" )),
                         aArgs ),
                 uno::UNO_QUERY );
         }
@@ -740,7 +698,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres
         {
             for ( sal_uInt8 nInd = 0; nInd < 10; nInd++ )
             {
-                ::rtl::OUString aStreamName = ::rtl::OUString::createFromAscii( "\002OlePres00" );
+                ::rtl::OUString aStreamName(RTL_CONSTASCII_USTRINGPARAM( "\002OlePres00" ));
                 aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd );
                 uno::Reference< io::XStream > xCachedCopyStream;
                 try
@@ -956,7 +914,7 @@ sal_Bool OleEmbeddedObject::OnShowWindow_Impl( sal_Bool bShow )
 void OleEmbeddedObject::OnIconChanged_Impl()
 {
     // TODO/LATER: currently this notification seems to be impossible
-    // MakeEventListenerNotification_Impl( ::rtl::OUString::createFromAscii( "OnIconChanged" ) );
+    // MakeEventListenerNotification_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnIconChanged" )) );
 }
 
 //------------------------------------------------------
@@ -986,7 +944,7 @@ void OleEmbeddedObject::OnViewChanged_Impl()
         // The view is changed while the object is in running state, save the new object
         m_xCachedVisualRepresentation = uno::Reference< io::XStream >();
         SaveObject_Impl();
-        MakeEventListenerNotification_Impl( ::rtl::OUString::createFromAscii( "OnVisAreaChanged" ) );
+        MakeEventListenerNotification_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnVisAreaChanged" )) );
     }
     // ===============================================================
 }
@@ -1129,7 +1087,7 @@ void OleEmbeddedObject::StoreObjectToStream( uno::Reference< io::XOutputStream >
     // open temporary file for reading
     uno::Reference < ucb::XSimpleFileAccess > xTempAccess(
                     m_xFactory->createInstance (
-                            ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ),
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" ) )),
                     uno::UNO_QUERY );
 
     if ( !xTempAccess.is() )
@@ -1173,13 +1131,13 @@ void OleEmbeddedObject::StoreToLocation_Impl(
     if ( m_nObjectState == -1 )
     {
         // the object is still not loaded
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "Can't store object without persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't store object without persistence!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     OSL_ENSURE( m_xParentStorage.is() && m_xObjectStream.is(), "The object has no valid persistence!\n" );
@@ -1261,7 +1219,7 @@ void OleEmbeddedObject::StoreToLocation_Impl(
         if ( !xTargetStream.is() )
             throw io::IOException(); //TODO: access denied
 
-        SetStreamMediaType_Impl( xTargetStream, ::rtl::OUString::createFromAscii( "application/vnd.sun.star.oleobject" ) );
+        SetStreamMediaType_Impl( xTargetStream, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/vnd.sun.star.oleobject" ) ));
         uno::Reference< io::XOutputStream > xOutStream = xTargetStream->getOutputStream();
         if ( !xOutStream.is() )
             throw io::IOException(); //TODO: access denied
@@ -1408,12 +1366,12 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
         throw lang::DisposedException(); // TODO
 
     if ( !xStorage.is() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No parent storage is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             1 );
 
     if ( !sEntName.getLength() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Empty element name is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             2 );
 
@@ -1428,7 +1386,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
         // it can switch persistant representation only without initialization
 
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "Can't change persistant representation of activated object!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't change persistant representation of activated object!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
@@ -1438,7 +1396,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
             saveCompleted( ( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) ) );
         else
             throw embed::WrongStateException(
-                        ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
@@ -1535,7 +1493,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
 
             if ( !aURL.getLength() )
                 throw lang::IllegalArgumentException(
-                                    ::rtl::OUString::createFromAscii( "Empty URL is provided in the media descriptor!\n" ),
+                                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty URL is provided in the media descriptor!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                     4 );
 
@@ -1557,7 +1515,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
             //TODO:
         //}
         else
-            throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Wrong connection mode is provided!\n" ),
+            throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Wrong connection mode is provided!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                         3 );
     }
@@ -1575,7 +1533,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
         // do nothing, the object has already switched it's persistence
     }
     else
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Wrong connection mode is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Wrong connection mode is provided!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                     3 );
 
@@ -1675,7 +1633,7 @@ void SAL_CALL OleEmbeddedObject::saveCompleted( sal_Bool bUseNew )
     if ( m_nObjectState == -1 )
     {
         // the object is still not loaded
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "Can't store object without persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't store object without persistence!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
@@ -1740,13 +1698,13 @@ void SAL_CALL OleEmbeddedObject::saveCompleted( sal_Bool bUseNew )
     aGuard.clear();
     if ( bUseNew )
     {
-        MakeEventListenerNotification_Impl( ::rtl::OUString::createFromAscii( "OnSaveAsDone" ) );
+        MakeEventListenerNotification_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSaveAsDone" ) ));
 
         // the object can be changed only on windows
         // the notification should be done only if the object is not in loaded state
         if ( m_pOleComponent && m_nUpdateMode == embed::EmbedUpdateModes::ALWAYS_UPDATE && !bStoreLoaded )
         {
-            MakeEventListenerNotification_Impl( ::rtl::OUString::createFromAscii( "OnVisAreaChanged" ) );
+            MakeEventListenerNotification_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnVisAreaChanged" ) ));
         }
     }
 }
@@ -1771,7 +1729,7 @@ sal_Bool SAL_CALL OleEmbeddedObject::hasEntry()
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     if ( m_xObjectStream.is() )
@@ -1801,13 +1759,13 @@ sal_Bool SAL_CALL OleEmbeddedObject::hasEntry()
     if ( m_nObjectState == -1 )
     {
         // the object is still not loaded
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object persistence is not initialized!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object persistence is not initialized!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     return m_aEntryName;
@@ -1846,13 +1804,13 @@ void SAL_CALL OleEmbeddedObject::storeOwn()
     if ( m_nObjectState == -1 )
     {
         // the object is still not loaded
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "Can't store object without persistence!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Can't store object without persistence!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     if ( m_bReadOnly )
@@ -1872,7 +1830,7 @@ void SAL_CALL OleEmbeddedObject::storeOwn()
         if ( !m_xObjectStream.is() )
             throw io::IOException(); //TODO: access denied
 
-        SetStreamMediaType_Impl( m_xObjectStream, ::rtl::OUString::createFromAscii( "application/vnd.sun.star.oleobject" ) );
+        SetStreamMediaType_Impl( m_xObjectStream, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/vnd.sun.star.oleobject" ) ));
         uno::Reference< io::XOutputStream > xOutStream = m_xObjectStream->getOutputStream();
         if ( !xOutStream.is() )
             throw io::IOException(); //TODO: access denied
@@ -1940,12 +1898,12 @@ void SAL_CALL OleEmbeddedObject::storeOwn()
 
     aGuard.clear();
 
-    MakeEventListenerNotification_Impl( ::rtl::OUString::createFromAscii( "OnSaveDone" ) );
+    MakeEventListenerNotification_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnSaveDone" ) ));
 
     // the object can be changed only on Windows
     // the notification should be done only if the object is not in loaded state
     if ( m_pOleComponent && m_nUpdateMode == embed::EmbedUpdateModes::ALWAYS_UPDATE && !bStoreLoaded )
-        MakeEventListenerNotification_Impl( ::rtl::OUString::createFromAscii( "OnVisAreaChanged" ) );
+        MakeEventListenerNotification_Impl( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OnVisAreaChanged" ) ));
 }
 
 //------------------------------------------------------
@@ -1969,13 +1927,13 @@ sal_Bool SAL_CALL OleEmbeddedObject::isReadonly()
     if ( m_nObjectState == -1 )
     {
         // the object is still not loaded
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object persistence is not initialized!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object persistence is not initialized!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     return m_bReadOnly;
@@ -2010,13 +1968,13 @@ void SAL_CALL OleEmbeddedObject::reload(
     if ( m_nObjectState == -1 )
     {
         // the object is still not loaded
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object persistence is not initialized!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object persistence is not initialized!\n" )),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     // TODO:
@@ -2049,12 +2007,12 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag
         throw lang::DisposedException(); // TODO
 
     if ( !xStorage.is() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No parent storage is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             1 );
 
     if ( !sEntName.getLength() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Empty element name is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             2 );
 
@@ -2063,7 +2021,7 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag
     {
         // it must be a linked initialized object
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object is not a valid linked object!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not a valid linked object!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
@@ -2072,7 +2030,7 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
 
@@ -2187,12 +2145,12 @@ sal_Bool SAL_CALL  OleEmbeddedObject::isLink()
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object waits for saveCompleted() call!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     if ( !m_bIsLink )
         throw embed::WrongStateException(
-                    ::rtl::OUString::createFromAscii( "The object is not a link object!\n" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not a link object!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     // TODO: probably the link URL can be retrieved from OLE
diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx
index 31be74774e69..cafafec515ba 100644
--- a/embeddedobj/source/msole/olevisual.cxx
+++ b/embeddedobj/source/msole/olevisual.cxx
@@ -65,16 +65,16 @@ embed::VisualRepresentation OleEmbeddedObject::GetVisualRepresentationInNativeFo
     {
         // it's a bitmap
         aVisualRepr.Flavor = datatransfer::DataFlavor(
-            ::rtl::OUString::createFromAscii( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ),
-            ::rtl::OUString::createFromAscii( "Bitmap" ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" )),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Bitmap" )),
             ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) );
     }
     else
     {
         // it's a metafile
         aVisualRepr.Flavor = datatransfer::DataFlavor(
-            ::rtl::OUString::createFromAscii( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ),
-            ::rtl::OUString::createFromAscii( "Windows Metafile" ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Windows Metafile" )),
             ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) );
     }
 
@@ -111,11 +111,11 @@ void SAL_CALL OleEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const awt
     OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
     if ( nAspect == embed::Aspects::MSOLE_ICON )
         // no representation can be retrieved
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "Illegal call!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object is not loaded!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not loaded!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
 #ifdef WNT
@@ -191,11 +191,11 @@ awt::Size SAL_CALL OleEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
     OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
     if ( nAspect == embed::Aspects::MSOLE_ICON )
         // no representation can be retrieved
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "Illegal call!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object is not loaded!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not loaded!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     awt::Size aResult;
@@ -339,13 +339,13 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres
     OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
     if ( nAspect == embed::Aspects::MSOLE_ICON )
         // no representation can be retrieved
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "Illegal call!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     // TODO: if the object has cached representation then it should be returned
     // TODO: if the object has no cached representation and is in loaded state it should switch itself to the running state
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object is not loaded!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not loaded!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     embed::VisualRepresentation aVisualRepr;
@@ -372,8 +372,8 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres
                 changeState( embed::EmbedStates::RUNNING );
 
             datatransfer::DataFlavor aDataFlavor(
-                    ::rtl::OUString::createFromAscii( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ),
-                    ::rtl::OUString::createFromAscii( "Windows Metafile" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Windows Metafile" )),
                     ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) );
 
             aVisualRepr.Data = m_pOleComponent->getTransferData( aDataFlavor );
@@ -405,7 +405,7 @@ embed::VisualRepresentation SAL_CALL OleEmbeddedObject::getPreferredVisualRepres
     if ( !m_xCachedVisualRepresentation.is() )
     {
         // no representation can be retrieved
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "Illegal call!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
@@ -432,11 +432,11 @@ sal_Int32 SAL_CALL OleEmbeddedObject::getMapUnit( sal_Int64 nAspect )
     OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
     if ( nAspect == embed::Aspects::MSOLE_ICON )
         // no representation can be retrieved
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "Illegal call!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Illegal call!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object is not loaded!\n" ),
+        throw embed::WrongStateException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object is not loaded!\n" )),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     return embed::EmbedMapUnits::ONE_100TH_MM;
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index 92f233dd2a29..5e158fef6e91 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -126,35 +126,35 @@ sal_Bool OwnView_Impl::CreateModelFromURL( const ::rtl::OUString& aFileURL )
         try {
             uno::Reference < frame::XComponentLoader > xDocumentLoader(
                             m_xFactory->createInstance (
-                                        ::rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ),
+                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ) )),
                             uno::UNO_QUERY );
 
             if ( xDocumentLoader.is() )
             {
                 uno::Sequence< beans::PropertyValue > aArgs( m_aFilterName.getLength() ? 5 : 4 );
 
-                aArgs[0].Name = ::rtl::OUString::createFromAscii( "URL" );
+                aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "URL" ));
                 aArgs[0].Value <<= aFileURL;
 
-                aArgs[1].Name = ::rtl::OUString::createFromAscii( "ReadOnly" );
+                aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ReadOnly" ));
                 aArgs[1].Value <<= sal_True;
 
-                aArgs[2].Name = ::rtl::OUString::createFromAscii( "InteractionHandler" );
+                aArgs[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ));
                 aArgs[2].Value <<= uno::Reference< task::XInteractionHandler >(
                                     static_cast< ::cppu::OWeakObject* >( new DummyHandler_Impl() ), uno::UNO_QUERY );
 
-                aArgs[3].Name = ::rtl::OUString::createFromAscii( "DontEdit" );
+                aArgs[3].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DontEdit" ));
                 aArgs[3].Value <<= sal_True;
 
                 if ( m_aFilterName.getLength() )
                 {
-                    aArgs[4].Name = ::rtl::OUString::createFromAscii( "FilterName" );
+                    aArgs[4].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
                     aArgs[4].Value <<= m_aFilterName;
                 }
 
                 uno::Reference< frame::XModel > xModel( xDocumentLoader->loadComponentFromURL(
                                                                 aFileURL,
-                                                                ::rtl::OUString::createFromAscii( "_blank" ),
+                                                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_blank" )),
                                                                 0,
                                                                 aArgs ),
                                                             uno::UNO_QUERY );
@@ -214,7 +214,7 @@ sal_Bool OwnView_Impl::CreateModel( sal_Bool bUseNative )
         throw uno::RuntimeException();
 
     uno::Reference< document::XTypeDetection > xTypeDetection(
-            xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.TypeDetection" ) ),
+            xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" ) )),
             uno::UNO_QUERY_THROW );
 
     ::rtl::OUString aTypeName;
@@ -276,7 +276,7 @@ sal_Bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io
     // create m_aNativeTempURL
     ::rtl::OUString aNativeTempURL;
     uno::Reference < beans::XPropertySet > xNativeTempFile(
-            m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ),
+            m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.TempFile" ) )),
             uno::UNO_QUERY_THROW );
     uno::Reference < io::XStream > xNativeTempStream( xNativeTempFile, uno::UNO_QUERY_THROW );
     uno::Reference < io::XOutputStream > xNativeOutTemp = xNativeTempStream->getOutputStream();
@@ -285,8 +285,8 @@ sal_Bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io
         throw uno::RuntimeException();
 
     try {
-        xNativeTempFile->setPropertyValue( ::rtl::OUString::createFromAscii( "RemoveFile" ), uno::makeAny( sal_False ) );
-        uno::Any aUrl = xNativeTempFile->getPropertyValue( ::rtl::OUString::createFromAscii( "Uri" ) );
+        xNativeTempFile->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RemoveFile" )), uno::makeAny( sal_False ) );
+        uno::Any aUrl = xNativeTempFile->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Uri" ) ));
         aUrl >>= aNativeTempURL;
     }
     catch ( uno::Exception& )
@@ -430,7 +430,7 @@ void OwnView_Impl::CreateNative()
     {
         uno::Reference < ucb::XSimpleFileAccess > xAccess(
                 m_xFactory->createInstance (
-                        ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" ) )),
                 uno::UNO_QUERY_THROW );
 
         uno::Reference< io::XInputStream > xInStream = xAccess->openFileRead( m_aTempFileURL );
@@ -441,11 +441,11 @@ void OwnView_Impl::CreateNative()
         aArgs[0] <<= xInStream;
         uno::Reference< container::XNameAccess > xNameAccess(
                 m_xFactory->createInstanceWithArguments(
-                        ::rtl::OUString::createFromAscii( "com.sun.star.embed.OLESimpleStorage" ),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLESimpleStorage" )),
                         aArgs ),
                 uno::UNO_QUERY_THROW );
 
-        ::rtl::OUString aSubStreamName = ::rtl::OUString::createFromAscii( "\1Ole10Native" );
+        ::rtl::OUString aSubStreamName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "\1Ole10Native" ));
         uno::Reference< embed::XClassifiedObject > xStor( xNameAccess, uno::UNO_QUERY_THROW );
         uno::Sequence< sal_Int8 > aStorClassID = xStor->getClassID();
 
diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx
index efaad69d11c7..5305771a1d9b 100644
--- a/embeddedobj/source/msole/xdialogcreator.cxx
+++ b/embeddedobj/source/msole/xdialogcreator.cxx
@@ -118,15 +118,15 @@ uno::Sequence< sal_Int8 > GetRelatedInternalID_Impl( const uno::Sequence< sal_In
 uno::Sequence< ::rtl::OUString > SAL_CALL MSOLEDialogObjectCreator::impl_staticGetSupportedServiceNames()
 {
     uno::Sequence< ::rtl::OUString > aRet(2);
-    aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.embed.MSOLEObjectSystemCreator");
-    aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.MSOLEObjectSystemCreator");
+    aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.MSOLEObjectSystemCreator"));
+    aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.MSOLEObjectSystemCreator"));
     return aRet;
 }
 
 //-------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL MSOLEDialogObjectCreator::impl_staticGetImplementationName()
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.MSOLEObjectSystemCreator");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.MSOLEObjectSystemCreator"));
 }
 
 //-------------------------------------------------------------------------
@@ -152,12 +152,12 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia
 #ifdef WNT
 
     if ( !xStorage.is() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No parent storage is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             1 );
 
     if ( !sEntName.getLength() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Empty element name is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             2 );
 
@@ -180,11 +180,11 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia
 
 
     ::osl::Module aOleDlgLib;
-    if( !aOleDlgLib.load( ::rtl::OUString::createFromAscii( "oledlg" ) ) )
+    if( !aOleDlgLib.load( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "oledlg" ) ) ))
         throw uno::RuntimeException();
 
     OleUIInsertObjectA_Type * pInsertFct = (OleUIInsertObjectA_Type *)
-                                aOleDlgLib.getSymbol( ::rtl::OUString::createFromAscii( "OleUIInsertObjectA" ) );
+                                aOleDlgLib.getSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OleUIInsertObjectA" ) ));
     if( !pInsertFct )
         throw uno::RuntimeException();
 
@@ -196,7 +196,7 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia
         {
             uno::Reference< embed::XEmbedObjectCreator > xEmbCreator(
                         m_xFactory->createInstance(
-                                ::rtl::OUString::createFromAscii( "com.sun.star.embed.EmbeddedObjectCreator" ) ),
+                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.EmbeddedObjectCreator" ) )),
                         uno::UNO_QUERY );
             if ( !xEmbCreator.is() )
                 throw uno::RuntimeException();
@@ -229,7 +229,7 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia
                 throw uno::RuntimeException();
 
             uno::Sequence< beans::PropertyValue > aMediaDescr( 1 );
-            aMediaDescr[0].Name = ::rtl::OUString::createFromAscii( "URL" );
+            aMediaDescr[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "URL" ));
             aMediaDescr[0].Value <<= aFileURL;
 
             // TODO: use config helper for type detection
@@ -239,12 +239,12 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia
             if ( aHelper.AddFilterNameCheckOwnFile( aMediaDescr ) )
                 xEmbCreator = uno::Reference< embed::XEmbedObjectCreator >(
                         m_xFactory->createInstance(
-                                ::rtl::OUString::createFromAscii( "com.sun.star.embed.EmbeddedObjectCreator" ) ),
+                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.EmbeddedObjectCreator" ) )),
                         uno::UNO_QUERY );
             else
                 xEmbCreator = uno::Reference< embed::XEmbedObjectCreator >(
                         m_xFactory->createInstance(
-                                ::rtl::OUString::createFromAscii( "com.sun.star.embed.OLEEmbeddedObjectFactory" ) ),
+                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLEEmbeddedObjectFactory" ) )),
                         uno::UNO_QUERY );
 
             if ( !xEmbCreator.is() )
@@ -273,14 +273,14 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia
                 if ( nBufSize && nBufSize == GetMetaFileBitsEx( pMF->hMF, nBufSize, pBuf+22 ) )
                 {
                     datatransfer::DataFlavor aFlavor(
-                        ::rtl::OUString::createFromAscii( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ),
-                        ::rtl::OUString::createFromAscii( "Image WMF" ),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Image WMF" )),
                         getCppuType( ( const uno::Sequence< sal_Int8 >* ) 0 ) );
 
                     aObjectInfo.Options.realloc( 2 );
-                    aObjectInfo.Options[0].Name = ::rtl::OUString::createFromAscii( "Icon" );
+                    aObjectInfo.Options[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Icon" ));
                     aObjectInfo.Options[0].Value <<= aMetafile;
-                    aObjectInfo.Options[1].Name = ::rtl::OUString::createFromAscii( "IconFormat" );
+                    aObjectInfo.Options[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IconFormat" ));
                     aObjectInfo.Options[1].Value <<= aFlavor;
                 }
 
@@ -317,12 +317,12 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceInitF
 #ifdef WNT
 
     if ( !xStorage.is() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No parent storage is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             1 );
 
     if ( !sEntryName.getLength() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Empty element name is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             2 );
 
diff --git a/embeddedobj/source/msole/xolefactory.cxx b/embeddedobj/source/msole/xolefactory.cxx
index ee2212636ad7..0b1ea1e2542b 100644
--- a/embeddedobj/source/msole/xolefactory.cxx
+++ b/embeddedobj/source/msole/xolefactory.cxx
@@ -50,15 +50,15 @@ using namespace ::com::sun::star;
 uno::Sequence< ::rtl::OUString > SAL_CALL OleEmbeddedObjectFactory::impl_staticGetSupportedServiceNames()
 {
     uno::Sequence< ::rtl::OUString > aRet(2);
-    aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.embed.OLEEmbeddedObjectFactory");
-    aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.OLEEmbeddedObjectFactory");
+    aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.OLEEmbeddedObjectFactory"));
+    aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.OLEEmbeddedObjectFactory"));
     return aRet;
 }
 
 //-------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OleEmbeddedObjectFactory::impl_staticGetImplementationName()
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.OLEEmbeddedObjectFactory");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.OLEEmbeddedObjectFactory"));
 }
 
 //-------------------------------------------------------------------------
@@ -83,12 +83,12 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
     RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OleEmbeddedObjectFactory::createInstanceInitFromEntry" );
 
     if ( !xStorage.is() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No parent storage is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             1 );
 
     if ( !sEntName.getLength() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Empty element name is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             2 );
 
@@ -155,12 +155,12 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
     RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OleEmbeddedObjectFactory::createInstanceInitFromMediaDescriptor" );
 
     if ( !xStorage.is() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No parent storage is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             1 );
 
     if ( !sEntName.getLength() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Empty element name is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             2 );
 
@@ -197,12 +197,12 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
     RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OleEmbeddedObjectFactory::createInstanceInitNew" );
 
     if ( !xStorage.is() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No parent storage is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             3 );
 
     if ( !sEntName.getLength() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Empty element name is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             4 );
 
@@ -238,13 +238,13 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
     RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) OleEmbeddedObjectFactory::createInstanceLink" );
 
     if ( !xStorage.is() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No parent storage is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
                                             uno::Reference< uno::XInterface >(
                                                 static_cast< ::cppu::OWeakObject* >(this) ),
                                             1 );
 
     if ( !sEntName.getLength() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Empty element name is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
                                             uno::Reference< uno::XInterface >(
                                                 static_cast< ::cppu::OWeakObject* >(this) ),
                                             2 );
@@ -285,12 +285,12 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
 
     // the initialization is completelly controlled by user
     if ( !xStorage.is() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No parent storage is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No parent storage is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             1 );
 
     if ( !sEntName.getLength() )
-        throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "Empty element name is provided!\n" ),
+        throw lang::IllegalArgumentException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Empty element name is provided!\n" )),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             2 );
 
diff --git a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx
index 204588c136a2..bf5c9f75af26 100644
--- a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx
+++ b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx
@@ -97,14 +97,14 @@ uno::Any SAL_CALL UNOMainThreadExecutor::execute( const uno::Sequence< beans::Na
 uno::Sequence< ::rtl::OUString > SAL_CALL UNOMainThreadExecutor::impl_staticGetSupportedServiceNames()
 {
     uno::Sequence< ::rtl::OUString > aRet(1);
-    aRet[0] = ::rtl::OUString::createFromAscii( "com.sun.star.comp.thread.MainThreadExecutor" );
+    aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.thread.MainThreadExecutor"));
     return aRet;
 }
 
 //-------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL UNOMainThreadExecutor::impl_staticGetImplementationName()
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.thread.MainThreadExecutor" );
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.thread.MainThreadExecutor"));
 }
 
 //-------------------------------------------------------------------------
diff --git a/embeddedobj/test/mtexecutor/bitmapcreator.cxx b/embeddedobj/test/mtexecutor/bitmapcreator.cxx
index e2b11a94f7f5..6327fc7b7d53 100644
--- a/embeddedobj/test/mtexecutor/bitmapcreator.cxx
+++ b/embeddedobj/test/mtexecutor/bitmapcreator.cxx
@@ -41,15 +41,15 @@ using namespace ::com::sun::star;
 uno::Sequence< ::rtl::OUString > SAL_CALL VCLBitmapCreator::impl_staticGetSupportedServiceNames()
 {
     uno::Sequence< ::rtl::OUString > aRet(2);
-    aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.embed.BitmapCreator");
-    aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.BitmapCreator");
+    aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.BitmapCreator"));
+    aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.BitmapCreator"));
     return aRet;
 }
 
 //-------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL VCLBitmapCreator::impl_staticGetImplementationName()
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.BitmapCreator");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.BitmapCreator"));
 }
 
 //-------------------------------------------------------------------------
diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
index 293797dc890a..4ae8527a3eea 100644
--- a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
+++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
@@ -39,15 +39,15 @@ using namespace ::com::sun::star;
 uno::Sequence< ::rtl::OUString > SAL_CALL MainThreadExecutor::impl_staticGetSupportedServiceNames()
 {
     uno::Sequence< ::rtl::OUString > aRet(2);
-    aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.thread.MainThreadExecutor");
-    aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.comp.thread.MainThreadExecutor");
+    aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.thread.MainThreadExecutor"));
+    aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.thread.MainThreadExecutor"));
     return aRet;
 }
 
 //-------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL MainThreadExecutor::impl_staticGetImplementationName()
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.thread.MainThreadExecutor");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.thread.MainThreadExecutor"));
 }
 
 //-------------------------------------------------------------------------
diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx
index 02e8d01bf9b7..db918fdc0dcf 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -396,7 +396,7 @@ HRESULT DocumentHolder::InPlaceActivate(
             if( xPS.is() )
             {
                 aAny = xPS->getPropertyValue(
-                    rtl::OUString::createFromAscii("LayoutManager"));
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")));
                 aAny >>= m_xLayoutManager;
             }
 
@@ -418,8 +418,8 @@ HRESULT DocumentHolder::InPlaceActivate(
             if(m_xLayoutManager.is()) {
                 uno::Reference< ::com::sun::star::ui::XUIElement > xUIEl(
                     m_xLayoutManager->getElement(
-                        rtl::OUString::createFromAscii(
-                            "private:resource/menubar/menubar")));
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                            "private:resource/menubar/menubar"))));
                 OSL_ENSURE(xUIEl.is(),"no menubar");
                 uno::Reference<awt::XSystemDependentMenuPeer> xSDMP(
                     xUIEl->getRealInterface(),
@@ -786,7 +786,7 @@ void DocumentHolder::SetDocument( const uno::Reference< frame::XModel >& xDoc, s
     {
         // set the document mode to embedded
         uno::Sequence< beans::PropertyValue > aSeq(1);
-        aSeq[0].Name = ::rtl::OUString::createFromAscii( "SetEmbedded" );
+        aSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SetEmbedded" ));
         aSeq[0].Value <<= sal_True;
         m_xDocument->attachResource(::rtl::OUString(),aSeq);
     }
@@ -929,11 +929,11 @@ void DocumentHolder::show()
             if ( xProps.is() )
             {
                 uno::Reference< frame::XLayoutManager > xLayoutManager;
-                xProps->getPropertyValue( rtl::OUString::createFromAscii( "LayoutManager" ) ) >>= xLayoutManager;
+                xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )) ) >>= xLayoutManager;
                 uno::Reference< beans::XPropertySet > xLMProps( xLayoutManager, uno::UNO_QUERY );
                 if ( xLMProps.is() )
                 {
-                    xLMProps->setPropertyValue( ::rtl::OUString::createFromAscii( "MenuBarCloser" ),
+                    xLMProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MenuBarCloser" )),
                                                 uno::makeAny( uno::Reference< frame::XStatusListener >() ) );
                 }
             }
diff --git a/embedserv/source/embed/intercept.cxx b/embedserv/source/embed/intercept.cxx
index 08a01020510d..0d0856c0a2cb 100644
--- a/embedserv/source/embed/intercept.cxx
+++ b/embedserv/source/embed/intercept.cxx
@@ -224,12 +224,12 @@ Interceptor::dispatch(
                 if ( nInd == aNewArgs.getLength() )
                 {
                     aNewArgs.realloc( nInd + 1 );
-                    aNewArgs[nInd].Name = ::rtl::OUString::createFromAscii( "SaveTo" );
+                    aNewArgs[nInd].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SaveTo" ));
                     aNewArgs[nInd].Value <<= sal_True;
                 }
 
                 uno::Reference< frame::XDispatch > xDispatch = m_xSlaveDispatchProvider->queryDispatch(
-                    URL, ::rtl::OUString::createFromAscii( "_self" ), 0 );
+                    URL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_self" )), 0 );
                 if ( xDispatch.is() )
                     xDispatch->dispatch( URL, aNewArgs );
             }
diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx
index c692a6c10dff..11625aa1c746 100644
--- a/eventattacher/source/eventattacher.cxx
+++ b/eventattacher/source/eventattacher.cxx
@@ -381,7 +381,7 @@ Reference< XIntrospection > EventAttacherImpl::getIntrospection() throw( Excepti
     // Haben wir den Service schon? Sonst anlegen
     if( !m_xIntrospection.is() )
     {
-        Reference< XInterface > xIFace( m_xSMgr->createInstance( rtl::OUString::createFromAscii("com.sun.star.beans.Introspection") ) );
+        Reference< XInterface > xIFace( m_xSMgr->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.Introspection")) ) );
         m_xIntrospection = Reference< XIntrospection >( xIFace, UNO_QUERY );
     }
     return m_xIntrospection;
@@ -395,7 +395,7 @@ Reference< XIdlReflection > EventAttacherImpl::getReflection() throw( Exception
     // Haben wir den Service schon? Sonst anlegen
     if( !m_xReflection.is() )
     {
-        Reference< XInterface > xIFace( m_xSMgr->createInstance( rtl::OUString::createFromAscii("com.sun.star.reflection.CoreReflection") ) );
+        Reference< XInterface > xIFace( m_xSMgr->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.CoreReflection")) ) );
         m_xReflection = Reference< XIdlReflection >( xIFace, UNO_QUERY);
     }
     return m_xReflection;
@@ -409,7 +409,7 @@ Reference< XInvocationAdapterFactory > EventAttacherImpl::getInvocationAdapterSe
     // Haben wir den Service schon? Sonst anlegen
     if( !m_xInvocationAdapterFactory.is() )
     {
-        Reference< XInterface > xIFace( m_xSMgr->createInstance( rtl::OUString::createFromAscii("com.sun.star.script.InvocationAdapterFactory") ) );
+        Reference< XInterface > xIFace( m_xSMgr->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.InvocationAdapterFactory")) ) );
         m_xInvocationAdapterFactory = Reference< XInvocationAdapterFactory >( xIFace, UNO_QUERY );
     }
     return m_xInvocationAdapterFactory;
@@ -424,7 +424,7 @@ Reference< XTypeConverter > EventAttacherImpl::getConverter() throw( Exception )
     // Haben wir den Service schon? Sonst anlegen
     if( !m_xConverter.is() )
     {
-        Reference< XInterface > xIFace( m_xSMgr->createInstance( rtl::OUString::createFromAscii("com.sun.star.script.Converter") ) );
+        Reference< XInterface > xIFace( m_xSMgr->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter")) ) );
         m_xConverter = Reference< XTypeConverter >( xIFace, UNO_QUERY );
     }
     return m_xConverter;
diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx
index 41eda708fd19..622c913201d0 100644
--- a/extensions/source/abpilot/admininvokationimpl.cxx
+++ b/extensions/source/abpilot/admininvokationimpl.cxx
@@ -85,14 +85,14 @@ namespace abp
 
             // the parent window
             Reference< XWindow > xDialogParent = VCLUnoHelper::GetInterface(m_pMessageParent);
-            *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii("ParentWindow"), -1, makeAny(xDialogParent), PropertyState_DIRECT_VALUE);
+            *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow")), -1, makeAny(xDialogParent), PropertyState_DIRECT_VALUE);
 
             // the title of the dialog
             String sAdminDialogTitle(ModuleRes(RID_STR_ADMINDIALOGTITLE));
-            *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii("Title"), -1, makeAny(::rtl::OUString(sAdminDialogTitle)), PropertyState_DIRECT_VALUE);
+            *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")), -1, makeAny(::rtl::OUString(sAdminDialogTitle)), PropertyState_DIRECT_VALUE);
 
             // the name of the new data source
-            *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii("InitialSelection"), -1, makeAny(m_xDataSource), PropertyState_DIRECT_VALUE);
+            *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InitialSelection")), -1, makeAny(m_xDataSource), PropertyState_DIRECT_VALUE);
 
             // create the dialog
             Reference< XExecutableDialog > xDialog;
@@ -110,7 +110,7 @@ namespace abp
                 // context needs to be freshly created
                 // Thus, we access the context here (within the WaitCursor), which means the user sees a waitcursor
                 // while his/her office blocks a few seconds ....
-                m_xORB->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.sdbc.DriverManager" ) );
+                m_xORB->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbc.DriverManager" )) );
             }
 
             if (xDialog.is())
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index eb024565a840..328f7513fd5f 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -81,7 +81,7 @@ namespace abp
     //---------------------------------------------------------------------
     static Reference< XNameAccess > lcl_getDataSourceContext( const Reference< XMultiServiceFactory >& _rxORB ) SAL_THROW (( Exception ))
     {
-        Reference< XNameAccess > xContext( _rxORB->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.sdb.DatabaseContext" ) ), UNO_QUERY );
+        Reference< XNameAccess > xContext( _rxORB->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.DatabaseContext" )) ), UNO_QUERY );
         DBG_ASSERT(xContext.is(), "lcl_getDataSourceContext: could not access the data source context!");
         return xContext;
     }
@@ -136,7 +136,7 @@ namespace abp
             if (xNewDataSource.is())
             {
                 xNewDataSource->setPropertyValue(
-                    ::rtl::OUString::createFromAscii( "URL" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "URL" )),
                     makeAny( ::rtl::OUString::createFromAscii( _pInitialAsciiURL ) )
                 );
             }
@@ -524,7 +524,7 @@ namespace abp
 
         // ................................................................
         // create the interaction handler (needed for authentication and error handling)
-        static ::rtl::OUString s_sInteractionHandlerServiceName = ::rtl::OUString::createFromAscii("com.sun.star.task.InteractionHandler");
+        static ::rtl::OUString s_sInteractionHandlerServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler"));
         Reference< XInteractionHandler > xInteractions;
         try
         {
diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx
index c7af76636362..88c6c4747d71 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -61,16 +61,14 @@ namespace abp
     //---------------------------------------------------------------------
     static const ::rtl::OUString& lcl_getDriverSettingsNodeName()
     {
-        static const ::rtl::OUString s_sDriverSettingsNodeName =
-            ::rtl::OUString::createFromAscii( "/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver" );
+        static const ::rtl::OUString s_sDriverSettingsNodeName(RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver" ));
         return s_sDriverSettingsNodeName;
     }
 
     //---------------------------------------------------------------------
     static const ::rtl::OUString& lcl_getAddressBookNodeName()
     {
-        static const ::rtl::OUString s_sAddressBookNodeName =
-            ::rtl::OUString::createFromAscii( "/org.openoffice.Office.DataAccess/AddressBook" );
+        static const ::rtl::OUString s_sAddressBookNodeName(RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.DataAccess/AddressBook" ));
         return s_sAddressBookNodeName;
     }
 
@@ -99,22 +97,22 @@ namespace abp
 
                 // the parent window
                 Reference< XWindow > xDialogParent = VCLUnoHelper::GetInterface( _pParent );
-                *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii( "ParentWindow" ), -1, makeAny( xDialogParent ), PropertyState_DIRECT_VALUE);
+                *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" )), -1, makeAny( xDialogParent ), PropertyState_DIRECT_VALUE);
 
                 // the data source to use
-                *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii( "DataSource" ), -1, makeAny( _rxDataSource ), PropertyState_DIRECT_VALUE);
-                *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii( "DataSourceName" ), -1, makeAny( (sal_Bool)_rSettings.bRegisterDataSource ? _rSettings.sRegisteredDataSourceName : _rSettings.sDataSourceName ), PropertyState_DIRECT_VALUE);
+                *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataSource" )), -1, makeAny( _rxDataSource ), PropertyState_DIRECT_VALUE);
+                *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataSourceName" )), -1, makeAny( (sal_Bool)_rSettings.bRegisterDataSource ? _rSettings.sRegisteredDataSourceName : _rSettings.sDataSourceName ), PropertyState_DIRECT_VALUE);
 
                 // the table to use
-                *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii( "Command" ), -1, makeAny( _rSettings.sSelectedTable ), PropertyState_DIRECT_VALUE);
+                *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Command" )), -1, makeAny( _rSettings.sSelectedTable ), PropertyState_DIRECT_VALUE);
 
                 // the title
                 ::rtl::OUString sTitle = String( ModuleRes( RID_STR_FIELDDIALOGTITLE ) );
-                *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii( "Title" ), -1, makeAny( sTitle ), PropertyState_DIRECT_VALUE);
+                *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Title" )), -1, makeAny( sTitle ), PropertyState_DIRECT_VALUE);
 
                 // ........................................................
                 // create an instance of the dialog service
-                static ::rtl::OUString s_sAdressBookFieldAssignmentServiceName = ::rtl::OUString::createFromAscii( "com.sun.star.ui.AddressBookSourceDialog" );
+                static ::rtl::OUString s_sAdressBookFieldAssignmentServiceName(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.AddressBookSourceDialog" ));
                 Reference< XExecutableDialog > xDialog(
                     _rxORB->createInstanceWithArguments( s_sAdressBookFieldAssignmentServiceName, aArguments ),
                     UNO_QUERY
@@ -135,7 +133,7 @@ namespace abp
 #ifdef DBG_UTIL
                     sal_Bool bSuccess =
 #endif
-                    xDialogProps->getPropertyValue( ::rtl::OUString::createFromAscii( "FieldMapping" ) ) >>= aMapping;
+                    xDialogProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FieldMapping" )) ) >>= aMapping;
                     DBG_ASSERT( bSuccess, "fieldmapping::invokeDialog: invalid property type for FieldMapping!" );
 
                     // and copy it into the map
@@ -201,7 +199,7 @@ namespace abp
 
                 // access the configuration information which the driver uses for determining it's column names
                 ::rtl::OUString sDriverAliasesNodeName = lcl_getDriverSettingsNodeName();
-                sDriverAliasesNodeName += ::rtl::OUString::createFromAscii( "/ColumnAliases" );
+                sDriverAliasesNodeName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/ColumnAliases" ));
 
                 // create a config node for this
                 OConfigurationTreeRoot aDriverFieldAliasing = OConfigurationTreeRoot::createWithServiceFactory(
@@ -261,15 +259,15 @@ namespace abp
             OConfigurationTreeRoot aAddressBookSettings = OConfigurationTreeRoot::createWithServiceFactory(
                 _rxORB, sAddressBookNodeName, -1, OConfigurationTreeRoot::CM_UPDATABLE);
 
-            OConfigurationNode aFields = aAddressBookSettings.openNode( ::rtl::OUString::createFromAscii( "Fields" ) );
+            OConfigurationNode aFields = aAddressBookSettings.openNode( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Fields" )) );
 
             // loop through all existent fields
             Sequence< ::rtl::OUString > aExistentFields = aFields.getNodeNames();
             const ::rtl::OUString* pExistentFields = aExistentFields.getConstArray();
             const ::rtl::OUString* pExistentFieldsEnd = pExistentFields + aExistentFields.getLength();
 
-            const ::rtl::OUString sProgrammaticNodeName = ::rtl::OUString::createFromAscii( "ProgrammaticFieldName" );
-            const ::rtl::OUString sAssignedNodeName = ::rtl::OUString::createFromAscii( "AssignedFieldName" );
+            const ::rtl::OUString sProgrammaticNodeName(RTL_CONSTASCII_USTRINGPARAM( "ProgrammaticFieldName" ));
+            const ::rtl::OUString sAssignedNodeName(RTL_CONSTASCII_USTRINGPARAM( "AssignedFieldName" ));
 
             for ( ; pExistentFields != pExistentFieldsEnd; ++pExistentFields )
             {
@@ -338,9 +336,9 @@ namespace abp
             OConfigurationTreeRoot aAddressBookSettings = OConfigurationTreeRoot::createWithServiceFactory(
                 _rxORB, sAddressBookNodeName, -1, OConfigurationTreeRoot::CM_UPDATABLE);
 
-            aAddressBookSettings.setNodeValue( ::rtl::OUString::createFromAscii( "DataSourceName" ), makeAny( _rDataSourceName ) );
-            aAddressBookSettings.setNodeValue( ::rtl::OUString::createFromAscii( "Command" ), makeAny( _rTableName ) );
-            aAddressBookSettings.setNodeValue( ::rtl::OUString::createFromAscii( "CommandType" ), makeAny( (sal_Int32)CommandType::TABLE ) );
+            aAddressBookSettings.setNodeValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataSourceName" )), makeAny( _rDataSourceName ) );
+            aAddressBookSettings.setNodeValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Command" )), makeAny( _rTableName ) );
+            aAddressBookSettings.setNodeValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CommandType" )), makeAny( (sal_Int32)CommandType::TABLE ) );
 
             // commit the changes done
             aAddressBookSettings.commit();
@@ -357,7 +355,7 @@ namespace abp
                 _rxORB, sAddressBookNodeName, -1, OConfigurationTreeRoot::CM_UPDATABLE);
 
             // set the flag
-            aAddressBookSettings.setNodeValue( ::rtl::OUString::createFromAscii( "AutoPilotCompleted" ), makeAny( (sal_Bool)sal_True ) );
+            aAddressBookSettings.setNodeValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoPilotCompleted" )), makeAny( (sal_Bool)sal_True ) );
 
             // commit the changes done
             aAddressBookSettings.commit();
diff --git a/extensions/source/abpilot/makefile.mk b/extensions/source/abpilot/makefile.mk
index 19477e1b6b2b..95c4208553f4 100644
--- a/extensions/source/abpilot/makefile.mk
+++ b/extensions/source/abpilot/makefile.mk
@@ -44,21 +44,21 @@ CDEFS+=-DCOMPMOD_RESPREFIX=abp
 # --- Files --------------------------------------------------------
 
 EXCEPTIONSFILES=	\
-        $(SLO)$/fieldmappingimpl.obj	\
-        $(SLO)$/datasourcehandling.obj	\
+        $(SLO)$/abpfinalpage.obj	\
+        $(SLO)$/abpservices.obj		\
+        $(SLO)$/abspage.obj		\
+        $(SLO)$/abspilot.obj		\
         $(SLO)$/admininvokationimpl.obj	\
-        $(SLO)$/unodialogabp.obj	\
-        $(SLO)$/moduleabp.obj	\
-        $(SLO)$/abpservices.obj \
+        $(SLO)$/admininvokationpage.obj	\
+        $(SLO)$/datasourcehandling.obj	\
+        $(SLO)$/fieldmappingimpl.obj	\
+        $(SLO)$/fieldmappingpage.obj	\
+        $(SLO)$/moduleabp.obj		\
+        $(SLO)$/tableselectionpage.obj	\
         $(SLO)$/typeselectionpage.obj	\
+        $(SLO)$/unodialogabp.obj	\
 
 SLOFILES=	\
-        $(SLO)$/fieldmappingpage.obj	\
-        $(SLO)$/abpfinalpage.obj	\
-        $(SLO)$/tableselectionpage.obj	\
-        $(SLO)$/admininvokationpage.obj	\
-        $(SLO)$/abspage.obj	\
-        $(SLO)$/abspilot.obj \
         $(EXCEPTIONSFILES)
 
 
diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx
index 2d7c8633489c..5eb4b1d7681a 100644
--- a/extensions/source/abpilot/unodialogabp.cxx
+++ b/extensions/source/abpilot/unodialogabp.cxx
@@ -120,7 +120,7 @@ namespace abp
     //---------------------------------------------------------------------
     ::rtl::OUString OABSPilotUno::getImplementationName_Static() throw(RuntimeException)
     {
-        return ::rtl::OUString::createFromAscii("org.openoffice.comp.abp.OAddressBookSourcePilot");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.abp.OAddressBookSourcePilot"));
     }
 
     //---------------------------------------------------------------------
@@ -133,7 +133,7 @@ namespace abp
     ::comphelper::StringSequence OABSPilotUno::getSupportedServiceNames_Static() throw(RuntimeException)
     {
         ::comphelper::StringSequence aSupported(1);
-        aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.AddressBookSourcePilot");
+        aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.AddressBookSourcePilot"));
         return aSupported;
     }
 
@@ -177,7 +177,7 @@ namespace abp
         // (or he can start it again by using wizard-menu!)
         // So we should deregister it on our general job execution service by using right protocol parameters.
         ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > lProtocol(1);
-        lProtocol[0].Name    = ::rtl::OUString::createFromAscii("Deactivate");
+        lProtocol[0].Name    = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Deactivate"));
         lProtocol[0].Value <<= sal_True;
         return makeAny( lProtocol );
     }
diff --git a/extensions/source/activex/main/SOActionsApproval.cpp b/extensions/source/activex/main/SOActionsApproval.cpp
index b795b92fcf76..e0ce5c5da58e 100644
--- a/extensions/source/activex/main/SOActionsApproval.cpp
+++ b/extensions/source/activex/main/SOActionsApproval.cpp
@@ -5,6 +5,7 @@
 
 #include "so_activex.h"
 #include "SOActionsApproval.h"
+#include <sal/macros.h>
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -16,7 +17,7 @@ STDMETHODIMP SOActionsApproval::InterfaceSupportsErrorInfo(REFIID riid)
         &IID_ISOActionsApproval,
     };
 
-    for (int i=0;i<sizeof(arr)/sizeof(arr[0]);i++)
+    for (int i=0;i<SAL_N_ELEMENTS(arr);i++)
     {
 #if defined(_MSC_VER) && (_MSC_VER >= 1300)
         if (InlineIsEqualGUID(*arr[i],riid))
diff --git a/extensions/source/activex/main/SOComWindowPeer.cpp b/extensions/source/activex/main/SOComWindowPeer.cpp
index 6ae1c805fa39..7fb56dbdfd32 100644
--- a/extensions/source/activex/main/SOComWindowPeer.cpp
+++ b/extensions/source/activex/main/SOComWindowPeer.cpp
@@ -4,6 +4,7 @@
 #include "stdafx2.h"
 #include "so_activex.h"
 #include "SOComWindowPeer.h"
+#include <sal/macros.h>
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -15,7 +16,7 @@ STDMETHODIMP SOComWindowPeer::InterfaceSupportsErrorInfo(REFIID riid)
         &IID_ISOComWindowPeer,
     };
 
-    for (int i=0;i<sizeof(arr)/sizeof(arr[0]);i++)
+    for (int i=0;i<SAL_N_ELEMENTS(arr);i++)
     {
 #if defined(_MSC_VER) && (_MSC_VER >= 1300)
         if (InlineIsEqualGUID(*arr[i],riid))
diff --git a/extensions/source/activex/main/SODispatchInterceptor.cpp b/extensions/source/activex/main/SODispatchInterceptor.cpp
index 5a4455265b97..dcddf0d86b0c 100644
--- a/extensions/source/activex/main/SODispatchInterceptor.cpp
+++ b/extensions/source/activex/main/SODispatchInterceptor.cpp
@@ -7,6 +7,7 @@
 #include "SOActiveX.h"
 #include "SODispatchInterceptor.h"
 #include "com_uno_helper.h"
+#include <sal/macros.h>
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -18,7 +19,7 @@ STDMETHODIMP SODispatchInterceptor::InterfaceSupportsErrorInfo(REFIID riid)
         &IID_ISODispatchInterceptor,
     };
 
-    for (int i=0;i<sizeof(arr)/sizeof(arr[0]);i++)
+    for (int i=0;i<SAL_N_ELEMENTS(arr);i++)
     {
 #if defined(_MSC_VER) && (_MSC_VER >= 1300)
         if (InlineIsEqualGUID(*arr[i],riid))
diff --git a/extensions/source/bibliography/bib.hrc b/extensions/source/bibliography/bib.hrc
index 319c58d509ad..abcf68855263 100644
--- a/extensions/source/bibliography/bib.hrc
+++ b/extensions/source/bibliography/bib.hrc
@@ -45,9 +45,8 @@
 #define RID_BIB_CONTROLS            (RID_BIB_START + 100)
 #define RID_BIB_TOOLBAR             (RID_BIB_CONTROLS+ 1)
 #define RID_TOOLBAR_IMGLIST         (RID_BIB_CONTROLS+ 2)
-#define RID_TOOLBAR_IMGLIST_HC      (RID_BIB_CONTROLS+ 3)
+// free
 #define RID_TOOLBAR_BIGIMGLIST      (RID_BIB_CONTROLS+ 4)
-#define RID_TOOLBAR_BIGIMGLIST_HC   (RID_BIB_CONTROLS+ 5)
 
 //Menu(100)
 #define RID_BIB_MENU                (RID_BIB_CONTROLS + 100)
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index 2ab99b35bf23..c86369f834b6 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -44,9 +44,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
-/* -----------------11.11.99 14:34-------------------
 
- --------------------------------------------------*/
 typedef Mapping* MappingPtr;
 SV_DECL_PTRARR_DEL(MappingArray, MappingPtr, 2, 2)
 SV_IMPL_PTRARR(MappingArray, MappingPtr);
@@ -54,9 +52,7 @@ SV_IMPL_PTRARR(MappingArray, MappingPtr);
 #define C2U(cChar) OUString::createFromAscii(cChar)
 
 const char* cDataSourceHistory = "DataSourceHistory";
-/* -----------------------------13.11.00 12:21--------------------------------
 
- ---------------------------------------------------------------------------*/
 Sequence<OUString> BibConfig::GetPropertyNames()
 {
     static Sequence<OUString> aNames;
@@ -75,9 +71,7 @@ Sequence<OUString> BibConfig::GetPropertyNames()
     }
     return aNames;
 }
-/* -----------------------------13.11.00 11:00--------------------------------
 
- ---------------------------------------------------------------------------*/
 BibConfig::BibConfig() :
     ConfigItem(C2U("Office.DataAccess/Bibliography"), CONFIG_MODE_DELAYED_UPDATE),
     pMappingsArr(new MappingArray),
@@ -211,18 +205,14 @@ BibConfig::BibConfig() :
         }
     }
 }
-/* -----------------------------13.11.00 11:00--------------------------------
 
- ---------------------------------------------------------------------------*/
 BibConfig::~BibConfig()
 {
     if(IsModified())
         Commit();
     delete pMappingsArr;
 }
-/* -----------------------------13.11.00 12:08--------------------------------
 
- ---------------------------------------------------------------------------*/
 BibDBDescriptor BibConfig::GetBibliographyURL()
 {
     BibDBDescriptor aRet;
@@ -231,9 +221,7 @@ BibDBDescriptor BibConfig::GetBibliographyURL()
     aRet.nCommandType = nTblOrQuery;
     return aRet;
 };
-/* -----------------------------13.11.00 12:20--------------------------------
 
- ---------------------------------------------------------------------------*/
 void BibConfig::SetBibliographyURL(const BibDBDescriptor& rDesc)
 {
     sDataSource = rDesc.sDataSource;
@@ -321,9 +309,7 @@ void    BibConfig::Commit()
         }
     }
 }
-/* -----------------------------13.11.00 12:23--------------------------------
 
- ---------------------------------------------------------------------------*/
 const Mapping*  BibConfig::GetMapping(const BibDBDescriptor& rDesc) const
 {
     for(sal_uInt16 i = 0; i < pMappingsArr->Count(); i++)
@@ -335,9 +321,7 @@ const Mapping*  BibConfig::GetMapping(const BibDBDescriptor& rDesc) const
     }
     return 0;
 }
-/* -----------------------------13.11.00 12:23--------------------------------
 
- ---------------------------------------------------------------------------*/
 void BibConfig::SetMapping(const BibDBDescriptor& rDesc, const Mapping* pSetMapping)
 {
     for(sal_uInt16 i = 0; i < pMappingsArr->Count(); i++)
@@ -354,21 +338,15 @@ void BibConfig::SetMapping(const BibDBDescriptor& rDesc, const Mapping* pSetMapp
     pMappingsArr->Insert(pNew, pMappingsArr->Count());
     SetModified();
 }
-/* -----------------------------20.11.00 11:56--------------------------------
 
- ---------------------------------------------------------------------------*/
 DBChangeDialogConfig_Impl::DBChangeDialogConfig_Impl()
 {
 }
-/* -----------------------------20.11.00 11:57--------------------------------
 
- ---------------------------------------------------------------------------*/
 DBChangeDialogConfig_Impl::~DBChangeDialogConfig_Impl()
 {
 }
-/* -----------------------------14.03.01 12:53--------------------------------
 
- ---------------------------------------------------------------------------*/
 const Sequence<OUString>& DBChangeDialogConfig_Impl::GetDataSourceNames()
 {
     if(!aSourceNames.getLength())
diff --git a/extensions/source/bibliography/bibconfig.hxx b/extensions/source/bibliography/bibconfig.hxx
index 093f0078b828..982430bdacdb 100644
--- a/extensions/source/bibliography/bibconfig.hxx
+++ b/extensions/source/bibliography/bibconfig.hxx
@@ -140,9 +140,7 @@ public:
     void                    SetShowColumnAssignmentWarning(sal_Bool bSet)
                                 { bShowColumnAssignmentWarning = bSet;}
 };
-/* -----------------------------20.11.00 11:47--------------------------------
 
- ---------------------------------------------------------------------------*/
 class DBChangeDialogConfig_Impl
 {
     com::sun::star::uno::Sequence<rtl::OUString> aSourceNames;
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index db46e5d9f8d6..c4e8d93aa193 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -227,13 +227,12 @@ extern "C"
     {
         try
         {
-            rtl::OUString sKey = rtl::OUString::createFromAscii("/");
+            rtl::OUString sKey(RTL_CONSTASCII_USTRINGPARAM("/"));
             sKey += BibliographyLoader::getImplementationName_Static();
             //creates the impl key:  /com.sun.star.extensions.Bibliography
             Reference< registry::XRegistryKey > xImplKey = pRegistryKey->createKey(sKey);
 
 
-            //sKey += rtl::OUString::createFromAscii("/UNO/SERVICES");
             Reference< registry::XRegistryKey > xNewKey = xImplKey->createKey(  C2U("/UNO/SERVICES") );
             Sequence< rtl::OUString > aServices = BibliographyLoader::getSupportedServiceNames_Static();
             for( INT32 i = 0; i < aServices.getLength(); i++ )
@@ -411,9 +410,7 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const rtl:
     if ( xLayoutManager.is() )
         xLayoutManager->createElement( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/menubar/menubar" )));
 }
-/* -----------------06.12.99 14:37-------------------
 
- --------------------------------------------------*/
 BibDataManager* BibliographyLoader::GetDataManager()const
 {
     if(!m_pDatMan)
@@ -425,9 +422,7 @@ BibDataManager* BibliographyLoader::GetDataManager()const
     }
     return m_pDatMan;
 }
-/* -----------------06.12.99 14:39-------------------
 
- --------------------------------------------------*/
 Reference< XNameAccess >  BibliographyLoader::GetDataColumns() const
 {
     if (!m_xColumns.is())
@@ -483,9 +478,7 @@ Reference< XNameAccess >  BibliographyLoader::GetDataColumns() const
 
     return m_xColumns;
 }
-/* -----------------17.12.99 12:29-------------------
 
- --------------------------------------------------*/
 Reference< sdb::XColumn >  BibliographyLoader::GetIdentifierColumn() const
 {
     BibDataManager* pDatMan = GetDataManager();
@@ -501,9 +494,6 @@ Reference< sdb::XColumn >  BibliographyLoader::GetIdentifierColumn() const
     return xReturn;
 }
 
-/* -----------------06.12.99 15:05-------------------
-
- --------------------------------------------------*/
 Reference< XResultSet >  BibliographyLoader::GetDataCursor() const
 {
     if (!m_xCursor.is())
@@ -513,9 +503,6 @@ Reference< XResultSet >  BibliographyLoader::GetDataCursor() const
     return m_xCursor;
 }
 
-/*-- 17.11.99 12:51:38---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 rtl::OUString lcl_AddProperty(Reference< XNameAccess >  xColumns,
         const Mapping* pMapping, const String& rColumnName)
 {
@@ -595,9 +582,7 @@ Any BibliographyLoader::getByName(const rtl::OUString& rName) throw
     }
     return aRet;
 }
-/*-- 17.11.99 12:51:39---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 Sequence< rtl::OUString > BibliographyLoader::getElementNames(void) throw ( RuntimeException )
 {
     Sequence< rtl::OUString > aRet(10);
@@ -632,9 +617,7 @@ Sequence< rtl::OUString > BibliographyLoader::getElementNames(void) throw ( Runt
     aRet.realloc(nRealNameCount);
     return aRet;
 }
-/*-- 17.11.99 12:51:39---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool BibliographyLoader::hasByName(const rtl::OUString& rName) throw ( RuntimeException )
 {
     sal_Bool bRet = sal_False;
@@ -663,16 +646,12 @@ sal_Bool BibliographyLoader::hasByName(const rtl::OUString& rName) throw ( Runti
     }
     return bRet;
 }
-/*-- 17.11.99 12:51:39---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 Type  BibliographyLoader::getElementType(void) throw ( RuntimeException )
 {
     return ::getCppuType((Sequence<PropertyValue>*)0);
 }
-/*-- 17.11.99 12:51:40---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool BibliographyLoader::hasElements(void) throw ( RuntimeException )
 {
     Reference< XResultSet >  xCursor = GetDataCursor();
@@ -680,9 +659,6 @@ sal_Bool BibliographyLoader::hasElements(void) throw ( RuntimeException )
     return xColumns.is() && (xColumns->getElementNames().getLength() != 0);
 }
 
-/*-- 07.12.99 14:28:39---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 Reference< XPropertySetInfo >  BibliographyLoader::getPropertySetInfo(void) throw
                                             ( RuntimeException )
 {
@@ -695,9 +671,7 @@ Reference< XPropertySetInfo >  BibliographyLoader::getPropertySetInfo(void) thro
         SfxItemPropertySet(aBibProps_Impl).getPropertySetInfo();
     return xRet;
 }
-/*-- 07.12.99 14:28:39---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void BibliographyLoader::setPropertyValue(const rtl::OUString& /*PropertyName*/,
                                         const Any& /*aValue*/)
     throw( UnknownPropertyException, PropertyVetoException,
@@ -706,9 +680,7 @@ void BibliographyLoader::setPropertyValue(const rtl::OUString& /*PropertyName*/,
     throw UnknownPropertyException();
     //no changeable properties
 }
-/*-- 07.12.99 14:28:39---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 Any BibliographyLoader::getPropertyValue(const rtl::OUString& rPropertyName)
     throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
 {
@@ -763,36 +735,28 @@ Any BibliographyLoader::getPropertyValue(const rtl::OUString& rPropertyName)
         throw UnknownPropertyException();
     return aRet;
 }
-/*-- 07.12.99 14:28:40---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void BibliographyLoader::addPropertyChangeListener(
         const rtl::OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/)
         throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
 {
     //no bound properties
 }
-/*-- 07.12.99 14:28:40---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void BibliographyLoader::removePropertyChangeListener(
         const rtl::OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/)
         throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
 {
     //no bound properties
 }
-/*-- 07.12.99 14:28:40---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void BibliographyLoader::addVetoableChangeListener(
     const rtl::OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/)
     throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
 {
     //no vetoable properties
 }
-/*-- 07.12.99 14:28:40---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void BibliographyLoader::removeVetoableChangeListener(
     const rtl::OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/)
     throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx
index abf2d293ba82..c985291a5121 100644
--- a/extensions/source/bibliography/bibview.cxx
+++ b/extensions/source/bibliography/bibview.cxx
@@ -114,9 +114,6 @@ namespace bib
         m_xGeneralPage = NULL;
     }
 
-    /* -----------------16.11.99 13:13-------------------
-
-     --------------------------------------------------*/
     void BibView::UpdatePages()
     {
         // TODO:
@@ -168,8 +165,6 @@ namespace bib
             }
         }
     }
-    //---------------------------------------------------------------------
-    //--- 19.10.01 16:55:49 -----------------------------------------------
 
     void BibView::_loaded( const EventObject& _rEvent )
     {
@@ -183,17 +178,12 @@ namespace bib
         FormControlContainer::_loaded( _rEvent );
     }
 
-    /* -----------------------------02.02.00 16:49--------------------------------
-
-     ---------------------------------------------------------------------------*/
     IMPL_STATIC_LINK( BibView, CallMappingHdl, BibView*, EMPTYARG )
     {
         pThis->m_pDatMan->CreateMappingDialog( pThis );
         return 0;
     }
-    /* -----------------------------13.04.00 16:12--------------------------------
 
-     ---------------------------------------------------------------------------*/
     void BibView::Resize()
     {
         if ( m_pGeneralPage )
@@ -204,9 +194,6 @@ namespace bib
         Window::Resize();
     }
 
-    //---------------------------------------------------------------------
-    //--- 18.10.01 18:52:45 -----------------------------------------------
-
     Reference< awt::XControlContainer > BibView::getControlContainer()
     {
         Reference< awt::XControlContainer > xReturn;
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index fa9775377896..54ab918d7fbe 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -105,10 +105,6 @@ using namespace ::ucb;
 #define MAP_TOKEN ';'
 #define PAIR_TOKEN ':'
 
-
-/* -----------------17.01.00 14:38-------------------
-
- --------------------------------------------------*/
 Reference< XConnection > getConnection(const ::rtl::OUString& _rURL)
 {
     // first get the sdb::DataSource corresponding to the url
@@ -138,19 +134,12 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL)
         ::rtl::OUString sUser, sPwd;
         Reference< XPropertySet >  xDataSourceProps(xDataSource, UNO_QUERY);
         Reference< XCompletedConnection > xComplConn(xDataSource, UNO_QUERY);
-/*      Reference< XPropertySetInfo >  xInfo = xDataSourceProps.is() ? xDataSourceProps->getPropertySetInfo() : Reference< XPropertySetInfo > ();
-        if (xInfo.is() && xInfo->hasPropertyByName(C2U("User")))
-            xDataSourceProps->getPropertyValue(C2U("User")) >>= sUser;
-        if (xInfo.is() && xInfo->hasPropertyByName(C2U("Password")))
-            xDataSourceProps->getPropertyValue(C2U("Password"))>>= sPwd;
-*/
         try
         {
 
             Reference<XInterface> xHdl = xMgr->createInstance(C2U("com.sun.star.task.InteractionHandler"));
             Reference<task::XInteractionHandler> xIHdl(xHdl, UNO_QUERY);
             xConn = xComplConn->connectWithCompletion(xIHdl);
-//          xConn = xDataSource->getConnection(sUser, sPwd);
         }
         catch(SQLException&)
         {
@@ -165,9 +154,6 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL)
     return xConn;
 }
 
-/* -----------------17.01.00 14:46-------------------
-
- --------------------------------------------------*/
 Reference< XConnection >    getConnection(const Reference< XInterface > & xRowSet)
 {
     Reference< XConnection >    xConn;
@@ -191,9 +177,7 @@ Reference< XConnection >    getConnection(const Reference< XInterface > & xRowSe
 
     return xConn;
 }
-/* -----------------17.01.00 16:07-------------------
 
- --------------------------------------------------*/
 Reference< XNameAccess >  getColumns(const Reference< XForm > & _rxForm)
 {
     Reference< XNameAccess >  xReturn;
@@ -242,9 +226,6 @@ Reference< XNameAccess >  getColumns(const Reference< XForm > & _rxForm)
     return xReturn;
 }
 
-/* -----------------11.11.99 15:54-------------------
-
- --------------------------------------------------*/
 class MappingDialog_Impl : public ModalDialog
 {
     BibDataManager* pDatMan;
@@ -331,9 +312,7 @@ public:
     void    SetModified() {bModified = TRUE;}
 
 };
-/* -----------------11.11.99 16:42-------------------
 
- --------------------------------------------------*/
 sal_uInt16 lcl_FindLogicalName(BibConfig* pConfig ,
                                     const ::rtl::OUString& rLogicalColumnName)
 {
@@ -532,14 +511,10 @@ MappingDialog_Impl::MappingDialog_Impl(Window* pParent, BibDataManager* pMan) :
         }
     }
 }
-/* -----------------11.11.99 16:44-------------------
 
- --------------------------------------------------*/
 MappingDialog_Impl::~MappingDialog_Impl()
 {}
-/* -----------------15.11.99 10:38-------------------
 
- --------------------------------------------------*/
 IMPL_LINK(MappingDialog_Impl, ListBoxSelectHdl, ListBox*, pListBox)
 {
     sal_uInt16 nEntryPos = pListBox->GetSelectEntryPos();
@@ -554,9 +529,7 @@ IMPL_LINK(MappingDialog_Impl, ListBoxSelectHdl, ListBox*, pListBox)
     SetModified();
     return 0;
 }
-/* -----------------12.11.99 14:50-------------------
 
- --------------------------------------------------*/
 IMPL_LINK(MappingDialog_Impl, OkHdl, OKButton*, EMPTYARG)
 {
     if(bModified)
@@ -587,9 +560,7 @@ IMPL_LINK(MappingDialog_Impl, OkHdl, OKButton*, EMPTYARG)
     EndDialog(bModified ? RET_OK : RET_CANCEL);
     return 0;
 }
-/* -----------------18.11.99 10:23-------------------
 
- --------------------------------------------------*/
 class DBChangeDialog_Impl : public ModalDialog
 {
     OKButton        aOKBT;
@@ -604,7 +575,6 @@ class DBChangeDialog_Impl : public ModalDialog
 
     BibDataManager* pDatMan;
 
-//  DECL_LINK(EndDragHdl, HeaderBar*);
     DECL_LINK(DoubleClickHdl, SvTabListBox*);
 public:
     DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan );
@@ -613,9 +583,6 @@ public:
     String      GetCurrentURL()const;
 };
 
-/*-- 18.11.99 10:35:20---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan ) :
     ModalDialog(pParent, BibResId(RID_DLG_DBCHANGE) ),
     aOKBT(this,         BibResId( BT_OK     )),
@@ -669,36 +636,17 @@ DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan )
 
 
 }
-/* -----------------06.12.99 12:09-------------------
 
- --------------------------------------------------*/
 IMPL_LINK(DBChangeDialog_Impl, DoubleClickHdl, SvTabListBox*, /*pLB*/)
 {
     EndDialog(RET_OK);
     return 0;
 }
-/* -----------------18.11.99 11:17-------------------
-
- --------------------------------------------------*/
-/*IMPL_LINK(DBChangeDialog_Impl, EndDragHdl, HeaderBar*, pHB)
-{
-    long nTabs[3];
-    nTabs[0] = 2;// Number of Tabs
-    nTabs[1] = 0;
-    nTabs[2] = pHB->GetItemSize( 1 );
-    aSelectionLB.SetTabs( &nTabs[0], MAP_PIXEL );
-    return 0;
-};*/
-
-/*-- 18.11.99 10:35:20---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 DBChangeDialog_Impl::~DBChangeDialog_Impl()
 {
 }
-/* -----------------18.11.99 12:36-------------------
 
- --------------------------------------------------*/
 String  DBChangeDialog_Impl::GetCurrentURL()const
 {
     String sRet;
@@ -710,7 +658,6 @@ String  DBChangeDialog_Impl::GetCurrentURL()const
     return sRet;
 }
 
-// #100312# --------------------------------------------------------------------
 // XDispatchProvider
 BibInterceptorHelper::BibInterceptorHelper( ::bib::BibBeamer* pBibBeamer, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch)
 {
@@ -796,7 +743,6 @@ void SAL_CALL BibInterceptorHelper::setMasterDispatchProvider( const ::com::sun:
 
 BibDataManager::BibDataManager()
     :BibDataManager_Base( GetMutex() )
-    // #100312# --------------
     ,m_pInterceptorHelper( NULL )
     ,m_aLoadListeners(m_aMutex)
     ,pBibView( NULL )
@@ -825,7 +771,6 @@ BibDataManager::~BibDataManager()
             xConnection->dispose();
         m_xForm = NULL;
     }
-    // #100312# ----------------
     if( m_pInterceptorHelper )
     {
         m_pInterceptorHelper->ReleaseInterceptor();
@@ -944,9 +889,6 @@ Reference< awt::XControlModel > BibDataManager::updateGridModel(const Reference<
             m_xGridModel = createGridModel( gGridName );
 
             Reference< XNameContainer >  xNameCont(xDbForm, UNO_QUERY);
-//          if (xNameCont->hasByName(sName))
-//              xNameCont->removeByName(sName);
-//
             xNameCont->insertByName( sName, makeAny( m_xGridModel ) );
         }
 
@@ -1163,9 +1105,7 @@ void BibDataManager::startQueryWith(const ::rtl::OUString& rQuery)
     }
     setFilter(aQueryString);
 }
-/* -----------------03.12.99 15:05-------------------
 
- --------------------------------------------------*/
 void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL)
 {
     ::rtl::OUString uTable;
@@ -1435,7 +1375,7 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUS
         Reference< XPropertySetInfo > xPropInfo = xPropSet->getPropertySetInfo();
         if (xPropInfo->hasPropertyByName(uProp))
         {
-            ::rtl::OUString sId = ::rtl::OUString::createFromAscii( "HID:" );
+            ::rtl::OUString sId(RTL_CONSTASCII_USTRINGPARAM( "HID:" ));
             sId += ::rtl::OUString::valueOf( (sal_Int32) HID_BIB_DB_GRIDCTRL );
             xPropSet->setPropertyValue( uProp, makeAny( ::rtl::OUString( sId ) ) );
         }
@@ -1549,7 +1489,6 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel(
             // (as an anologon to the XStatusListener semantics).
             //
             // But this would be way too risky for this last-day fix here.
-            // 97140 - 30.01.2002 - fs@openoffice.org
             Reference< XLoadable > xLoad( m_xForm, UNO_QUERY );
             if ( xLoad.is() && xLoad->isLoaded() )
             {
@@ -1703,18 +1642,13 @@ catch(Exception& e )
 
 
 }
-/* -----------------11.11.99 15:51-------------------
 
- --------------------------------------------------*/
 void BibDataManager::CreateMappingDialog(Window* pParent)
 {
     MappingDialog_Impl* pDlg = new MappingDialog_Impl(pParent, this);
     if(RET_OK == pDlg->Execute() && pBibView)
     {
         reload();
-//      unload();
-//      pBibView->UpdatePages();
-//      load();
     }
     delete pDlg;
 }
@@ -1736,17 +1670,13 @@ void BibDataManager::CreateMappingDialog(Window* pParent)
     delete pDlg;
     return uRet;
 }
-/*-- 18.05.2004 15:20:15---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void BibDataManager::DispatchDBChangeDialog()
 {
     if(pToolbar)
         pToolbar->SendDispatch(TBC_BT_CHANGESOURCE, Sequence< PropertyValue >());
 }
-/* -----------------06.12.99 15:11-------------------
 
- --------------------------------------------------*/
 const ::rtl::OUString& BibDataManager::GetIdentifierMapping()
 {
     if(!sIdentifierMapping.getLength())
@@ -1772,18 +1702,14 @@ const ::rtl::OUString& BibDataManager::GetIdentifierMapping()
     }
     return sIdentifierMapping;
 }
-/* -----------------------------20.11.00 10:31--------------------------------
 
- ---------------------------------------------------------------------------*/
 void BibDataManager::SetToolbar(BibToolBar* pSet)
 {
     pToolbar = pSet;
     if(pToolbar)
         pToolbar->SetDatMan(*this);
 }
-/* -----------------------------08.05.2002 09:26------------------------------
 
- ---------------------------------------------------------------------------*/
 uno::Reference< form::runtime::XFormController > BibDataManager::GetFormController()
 {
     if(!m_xFormCtrl.is())
@@ -1792,13 +1718,11 @@ uno::Reference< form::runtime::XFormController > BibDataManager::GetFormControll
         m_xFormCtrl = uno::Reference< form::runtime::XFormController > (
             xMgr->createInstance(C2U("com.sun.star.form.runtime.FormController")), UNO_QUERY);
         m_xFormCtrl->setModel(uno::Reference< awt::XTabControllerModel > (getForm(), UNO_QUERY));
-        // #100312# -------------
         m_xFormDispatch = uno::Reference< frame::XDispatch > ( m_xFormCtrl, UNO_QUERY);
     }
     return m_xFormCtrl;
 }
 
-// #100312# ----------
 void BibDataManager::RegisterInterceptor( ::bib::BibBeamer* pBibBeamer)
 {
     DBG_ASSERT( !m_pInterceptorHelper, "BibDataManager::RegisterInterceptor: called twice!" );
@@ -1809,9 +1733,7 @@ void BibDataManager::RegisterInterceptor( ::bib::BibBeamer* pBibBeamer)
         m_pInterceptorHelper->acquire();
 }
 
-/*-- 18.05.2004 17:04:20---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool BibDataManager::HasActiveConnection()const
 {
     sal_Bool bRet = sal_False;
@@ -1824,9 +1746,7 @@ sal_Bool BibDataManager::HasActiveConnection()const
     }
     return bRet;
 }
-/*-- 04.06.2004 14:37:29---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool BibDataManager::HasActiveConnection()
 {
     return getConnection( m_xForm ).is();
diff --git a/extensions/source/bibliography/formcontrolcontainer.cxx b/extensions/source/bibliography/formcontrolcontainer.cxx
index db61efc3e7c3..665ced0242c5 100644
--- a/extensions/source/bibliography/formcontrolcontainer.cxx
+++ b/extensions/source/bibliography/formcontrolcontainer.cxx
@@ -54,8 +54,6 @@ namespace bib
     {
     }
 
-    //---------------------------------------------------------------------
-    //--- 18.10.01 18:54:57 -----------------------------------------------
     FormControlContainer::~FormControlContainer( )
     {
         DBG_ASSERT( !isFormConnected(), "FormControlContainer::~FormControlContainer: you should disconnect in your derived class!" );
@@ -63,8 +61,6 @@ namespace bib
             disconnectForm();
     }
 
-    //---------------------------------------------------------------------
-    //--- 18.10.01 17:03:14 -----------------------------------------------
     void FormControlContainer::disconnectForm()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -77,8 +73,6 @@ namespace bib
         }
     }
 
-    //---------------------------------------------------------------------
-    //--- 18.10.01 16:56:01 -----------------------------------------------
     void FormControlContainer::connectForm( const Reference< XLoadable >& _rxForm )
     {
         DBG_ASSERT( !isFormConnected(), "FormControlContainer::connectForm: already connected!" );
@@ -96,8 +90,6 @@ namespace bib
         m_xForm = _rxForm;
     }
 
-    //---------------------------------------------------------------------
-    //--- 18.10.01 18:50:14 -----------------------------------------------
     struct ControlModeSwitch : public ::std::unary_function< Reference< XControl >, void >
     {
         sal_Bool bDesign;
@@ -110,8 +102,6 @@ namespace bib
         }
     };
 
-    //---------------------------------------------------------------------
-    //--- 18.10.01 18:49:57 -----------------------------------------------
     void FormControlContainer::implSetDesignMode( sal_Bool _bDesign )
     {
         try
@@ -134,42 +124,30 @@ namespace bib
         }
     }
 
-    //---------------------------------------------------------------------
-    //--- 18.10.01 18:16:54 -----------------------------------------------
     void FormControlContainer::ensureDesignMode()
     {
         implSetDesignMode( !m_xForm.is() || !m_xForm->isLoaded() );
     }
 
-    //---------------------------------------------------------------------
-    //--- 18.10.01 16:45:33 -----------------------------------------------
     void FormControlContainer::_loaded( const ::com::sun::star::lang::EventObject& /*_rEvent*/ )
     {
         implSetDesignMode( sal_False );
     }
 
-    //---------------------------------------------------------------------
-    //--- 18.10.01 16:45:35 -----------------------------------------------
     void FormControlContainer::_unloading( const ::com::sun::star::lang::EventObject& /*_rEvent*/ )
     {
         implSetDesignMode( sal_True );
     }
 
-    //---------------------------------------------------------------------
-    //--- 18.10.01 16:45:36 -----------------------------------------------
     void FormControlContainer::_unloaded( const ::com::sun::star::lang::EventObject& /*_rEvent*/ )
     {
     }
 
-    //---------------------------------------------------------------------
-    //--- 18.10.01 16:45:36 -----------------------------------------------
     void FormControlContainer::_reloading( const ::com::sun::star::lang::EventObject& /*_rEvent*/ )
     {
         implSetDesignMode( sal_True );
     }
 
-    //---------------------------------------------------------------------
-    //--- 18.10.01 16:45:37 -----------------------------------------------
     void FormControlContainer::_reloaded( const ::com::sun::star::lang::EventObject& /*_rEvent*/ )
     {
         implSetDesignMode( sal_False );
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 1194982782c3..ff9f40229de9 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -218,7 +218,7 @@ BibFrameController_Impl::~BibFrameController_Impl()
 
 ::rtl::OUString SAL_CALL BibFrameController_Impl::getImplementationName() throw (::com::sun::star::uno::RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.extensions.Bibliography");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.Bibliography"));
 }
 
 sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const ::rtl::OUString& sServiceName ) throw (::com::sun::star::uno::RuntimeException)
@@ -234,7 +234,7 @@ sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const ::rtl::OUStrin
     // return only top level services ...
     // base services are included there and should be asked by uno-rtti.
     ::com::sun::star::uno::Sequence< ::rtl::OUString > lNames(1);
-    lNames[0] = ::rtl::OUString::createFromAscii("com.sun.star.frame.Bibliography");
+    lNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Bibliography"));
     return lNames;
 }
 
@@ -379,9 +379,7 @@ sal_Bool canInsertRecords(const Reference< beans::XPropertySet>& _rxCursorSet)
     _rxCursorSet->getPropertyValue(C2U("Privileges")) >>= nPriv;
     return ((_rxCursorSet.is() && (nPriv & sdbcx::Privilege::INSERT) != 0));
 }
-/* -----------------------------08.05.2002 08:58------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool BibFrameController_Impl::SaveModified(const Reference< form::runtime::XFormController>& xController)
 {
     if (!xController.is())
@@ -397,7 +395,7 @@ sal_Bool BibFrameController_Impl::SaveModified(const Reference< form::runtime::X
     if (!_xSet.is())
         return sal_False;
 
-    // muß gespeichert werden ?
+    // need to save?
     sal_Bool  bIsNew        = ::comphelper::getBOOL(_xSet->getPropertyValue(C2U("IsNew")));
     sal_Bool  bIsModified   = ::comphelper::getBOOL(_xSet->getPropertyValue(C2U("IsModified")));
     sal_Bool bResult = !bIsModified;
@@ -513,27 +511,27 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
                 Sequence< Any > aDialogCreationArgs( 3 );
                 Any* pDialogCreationArgs = aDialogCreationArgs.getArray();
                 // the query composer
-                *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString::createFromAscii( "QueryComposer" ),
+                *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "QueryComposer" )),
                                                         -1,
                                                         makeAny( pDatMan->getParser() ),
                                                         beans::PropertyState_DIRECT_VALUE
                                                       );
 
                 // the rowset
-                *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString::createFromAscii( "RowSet" ),
+                *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowSet" )),
                                                         -1,
                                                         makeAny( pDatMan->getForm() ),
                                                         beans::PropertyState_DIRECT_VALUE
                                                       );
                 // the parent window for the dialog
-                *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString::createFromAscii( "ParentWindow" ),
+                *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" )),
                                                         -1,
                                                         makeAny( xWindow ),
                                                         beans::PropertyState_DIRECT_VALUE
                                                       );
 
                 // create the dialog object
-                const ::rtl::OUString sDialogServiceName = ::rtl::OUString::createFromAscii( "com.sun.star.sdb.FilterDialog" );
+                const ::rtl::OUString sDialogServiceName(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.FilterDialog" ));
                 uno::Reference< uno::XInterface > xDialog = xORB->createInstanceWithArguments(
                     sDialogServiceName,
                     aDialogCreationArgs
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 3cee7f8b8364..8100c1fcfa86 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -93,9 +93,7 @@ OUString lcl_GetColumnName( const Mapping* pMapping, sal_uInt16 nIndexPos )
         }
     return sRet;
 }
-/* -----------------------------04.01.00 10:54--------------------------------
 
- ---------------------------------------------------------------------------*/
 class BibPosListener    :public cppu::WeakImplHelper1 <sdbc::XRowSetListener>
 {
     BibGeneralPage*     pParentPage;
@@ -111,16 +109,12 @@ public:
     virtual void SAL_CALL disposing(const lang::EventObject& Source) throw( uno::RuntimeException );
 
 };
-/* -----------------------------04.01.00 10:57--------------------------------
 
- ---------------------------------------------------------------------------*/
 BibPosListener::BibPosListener(BibGeneralPage* pParent) :
     pParentPage(pParent)
 {
 }
-/* -----------------------------04.01.00 10:57--------------------------------
 
- ---------------------------------------------------------------------------*/
 void BibPosListener::cursorMoved(const lang::EventObject& /*aEvent*/) throw( uno::RuntimeException )
 {
     try
@@ -193,16 +187,11 @@ void BibPosListener::cursorMoved(const lang::EventObject& /*aEvent*/) throw( uno
         DBG_ERROR("BibPosListener::positioned: something went wrong !");
     }
 }
-/* -----------------------------04.01.00 11:28--------------------------------
 
- ---------------------------------------------------------------------------*/
 void BibPosListener::disposing(const lang::EventObject& /*Source*/) throw( uno::RuntimeException )
 {
 }
 
-/* -----------------16.11.99 13:06-------------------
-
- --------------------------------------------------*/
 BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan):
     BibTabPage(pParent,BibResId(RID_TP_GENERAL)),
     aControlParentWin(this, WB_DIALOGCONTROL),
@@ -432,11 +421,9 @@ BibGeneralPage::~BibGeneralPage()
             xRowSet->removeRowSetListener(xPosListener);
     }
 }
- /* -----------------------------14.04.00 13:11--------------------------------
 
-  ---------------------------------------------------------------------------*/
- void BibGeneralPage::RemoveListeners()
- {
+void BibGeneralPage::RemoveListeners()
+{
     for(USHORT i = 0; i < FIELD_COUNT; i++)
     {
         if(aControls[i].is())
@@ -446,10 +433,8 @@ BibGeneralPage::~BibGeneralPage()
             aControls[i] = 0;
         }
     }
- }
-/* -----------------------------21.01.00 17:05--------------------------------
+}
 
- ---------------------------------------------------------------------------*/
 void BibGeneralPage::CommitActiveControl()
 {
     uno::Reference< form::runtime::XFormController > xFormCtrl = pDatMan->GetFormController();
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 1cfb4726068d..986a9d78aad1 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -84,10 +84,6 @@ void BibToolBarListener::statusChanged(const ::com::sun::star::frame::FeatureSta
             pToolBar->CheckItem(nIndex, bChecked);
         }
 
-        /*
-        rtl::OUString FeatureDescriptor;
-        sal_Bool Requery;
-        ::com::sun::star::uno::Any State;*/
     }
 };
 
@@ -166,7 +162,6 @@ void BibTBQueryMenuListener::statusChanged(const frame::FeatureStateEvent& rEvt)
                 sal_uInt16 nID=pToolBar->InsertFilterItem(String(pStringArray[i]));
                 if(pStringArray[i]==rEvt.FeatureDescriptor)
                 {
-//                  XubString aStr = rEvt.FeatureDescriptor;
                     pToolBar->SelectFilterItem(nID);
                 }
             }
@@ -204,9 +199,7 @@ SV_IMPL_PTRARR( BibToolBarListenerArr, BibToolBarListenerPtr);
 BibToolBar::BibToolBar(Window* pParent, Link aLink, WinBits nStyle):
     ToolBox(pParent,BibResId(RID_BIB_TOOLBAR)),
     aImgLst(BibResId(  RID_TOOLBAR_IMGLIST     )),
-    aImgLstHC(BibResId(RID_TOOLBAR_IMGLIST_HC  )),
     aBigImgLst(BibResId( RID_TOOLBAR_BIGIMGLIST )),
-    aBigImgLstHC(BibResId( RID_TOOLBAR_BIGIMGLIST_HC )),
     aFtSource(this,WB_VCENTER),
     aLBSource(this,WB_DROPDOWN),
     aFtQuery(this,WB_VCENTER),
@@ -462,7 +455,7 @@ long BibToolBar::PreNotify( NotifyEvent& rNEvt )
     long nResult=sal_True;
 
     sal_uInt16 nSwitch=rNEvt.GetType();
-    if(aEdQuery.HasFocus() && nSwitch==EVENT_KEYINPUT)// || nSwitch==EVENT_KEYUP)
+    if(aEdQuery.HasFocus() && nSwitch==EVENT_KEYINPUT)
     {
         const KeyCode& aKeyCode=rNEvt.GetKeyEvent()->GetKeyCode();
         sal_uInt16 nKey = aKeyCode.GetCode();
@@ -551,9 +544,7 @@ void    BibToolBar::statusChanged(const frame::FeatureStateEvent& rEvent)
         (*pListener)->statusChanged(rEvent);
     }
 }
-/* -----------------------------07.05.2002 15:08------------------------------
 
- ---------------------------------------------------------------------------*/
 void BibToolBar::DataChanged( const DataChangedEvent& rDCEvt )
 {
     if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
@@ -561,8 +552,6 @@ void BibToolBar::DataChanged( const DataChangedEvent& rDCEvt )
             ApplyImageList();
     ToolBox::DataChanged( rDCEvt );
 }
-/* -----------------------------07.05.2002 15:09------------------------------
- ---------------------------------------------------------------------------*/
 
 IMPL_LINK( BibToolBar, OptionsChanged_Impl, void*, /*pVoid*/ )
 {
@@ -614,8 +603,8 @@ void BibToolBar::RebuildToolbar()
 void BibToolBar::ApplyImageList()
 {
     ImageList& rList = ( nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ) ?
-                       ( GetSettings().GetStyleSettings().GetHighContrastMode() ? aImgLstHC : aImgLst ) :
-                       ( GetSettings().GetStyleSettings().GetHighContrastMode() ? aBigImgLstHC : aBigImgLst );
+                       ( aImgLst ) :
+                       ( aBigImgLst );
 
     SetItemImage(TBC_BT_AUTOFILTER  , rList.GetImage(SID_FM_AUTOFILTER));
     SetItemImage(TBC_BT_FILTERCRIT  , rList.GetImage(SID_FM_FILTERCRIT));
diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx
index fe1f615d8c2c..23237389fe1b 100644
--- a/extensions/source/bibliography/toolbar.hxx
+++ b/extensions/source/bibliography/toolbar.hxx
@@ -120,7 +120,6 @@ class BibToolBar:   public ToolBox
         BibToolBarListenerArr   aListenerArr;
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >            xController;
         Timer                   aTimer;
-//      Timer                   aMenuTimer;
         ImageList               aImgLst;
         ImageList               aImgLstHC;
         ImageList               aBigImgLst;
diff --git a/extensions/source/bibliography/toolbar.src b/extensions/source/bibliography/toolbar.src
index b8a604587bc4..e968a78151a7 100644
--- a/extensions/source/bibliography/toolbar.src
+++ b/extensions/source/bibliography/toolbar.src
@@ -212,12 +212,6 @@ ImageList RID_TOOLBAR_IMGLIST
     MASKCOLOR
     BIB_IMAGES
 };
-ImageList RID_TOOLBAR_IMGLIST_HC
-{
-    Prefix = "sch";
-    MASKCOLOR
-    BIB_IMAGES
-};
 
 ImageList RID_TOOLBAR_BIGIMGLIST
 {
@@ -225,13 +219,6 @@ ImageList RID_TOOLBAR_BIGIMGLIST
     MASKCOLOR
     BIB_IMAGES
 };
-ImageList RID_TOOLBAR_BIGIMGLIST_HC
-{
-    Prefix = "lch";
-    MASKCOLOR
-    BIB_IMAGES
-};
-
 
 
 
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx
index 9a4747b74811..0d50f32ce945 100644
--- a/extensions/source/config/ldap/ldapaccess.cxx
+++ b/extensions/source/config/ldap/ldapaccess.cxx
@@ -297,20 +297,20 @@ void LdapConnection::loadModule()
         s_Ldap_Module = osl_loadModuleRelative(&thisModule, sModuleName.pData, 0);
         if ( s_Ldap_Module != NULL )
         {
-            s_p_unbind_s = (t_ldap_unbind_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_unbind_s").pData));
-            s_p_simple_bind_s = (t_ldap_simple_bind_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_simple_bind_s").pData));
-            s_p_set_option = (t_ldap_set_option)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_set_option").pData));
-            s_p_err2string = (t_ldap_err2string)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_err2string").pData));
-            s_p_init = (t_ldap_init)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_init").pData));
-            s_p_msgfree = (t_ldap_msgfree)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_msgfree").pData));
-            s_p_get_dn = (t_ldap_get_dn)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_get_dn").pData));
-            s_p_first_entry = (t_ldap_first_entry)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_first_entry").pData));
-            s_p_first_attribute = (t_ldap_first_attribute)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_first_attribute").pData));
-            s_p_next_attribute = (t_ldap_next_attribute)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_next_attribute").pData));
-            s_p_search_s = (t_ldap_search_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_search_s").pData));
-            s_p_value_free = (t_ldap_value_free)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_value_free").pData));
-            s_p_get_values = (t_ldap_get_values)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_get_values").pData));
-            s_p_memfree = (t_ldap_memfree)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_memfree").pData));
+            s_p_unbind_s = (t_ldap_unbind_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_unbind_s")).pData));
+            s_p_simple_bind_s = (t_ldap_simple_bind_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_simple_bind_s")).pData));
+            s_p_set_option = (t_ldap_set_option)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_set_option")).pData));
+            s_p_err2string = (t_ldap_err2string)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_err2string")).pData));
+            s_p_init = (t_ldap_init)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_init")).pData));
+            s_p_msgfree = (t_ldap_msgfree)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_msgfree")).pData));
+            s_p_get_dn = (t_ldap_get_dn)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_get_dn")).pData));
+            s_p_first_entry = (t_ldap_first_entry)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_first_entry")).pData));
+            s_p_first_attribute = (t_ldap_first_attribute)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_first_attribute")).pData));
+            s_p_next_attribute = (t_ldap_next_attribute)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_next_attribute")).pData));
+            s_p_search_s = (t_ldap_search_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_search_s")).pData));
+            s_p_value_free = (t_ldap_value_free)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_value_free")).pData));
+            s_p_get_values = (t_ldap_get_values)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_get_values")).pData));
+            s_p_memfree = (t_ldap_memfree)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_memfree")).pData));
         }
     }
 }
diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx
index c87c5935fee9..0a1c3a4bec6d 100644
--- a/extensions/source/config/ldap/ldapuserprofilebe.cxx
+++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx
@@ -74,7 +74,7 @@ LdapUserProfileBe::LdapUserProfileBe( const uno::Reference<uno::XComponentContex
                         &aDefinition, &loggedOnUser))
                 {
                     throw css::uno::RuntimeException(
-                        rtl::OUString::createFromAscii("LdapUserProfileBe- LDAP not configured"),
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LdapUserProfileBe- LDAP not configured")),
                         NULL);
                 }
 
@@ -126,7 +126,7 @@ bool LdapUserProfileBe::readLdapConfiguration(
         if (!xCfgProvider.is())
             return false;
 
-        css::beans::NamedValue aPath(rtl::OUString::createFromAscii("nodepath"), uno::makeAny(kComponent) );
+        css::beans::NamedValue aPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), uno::makeAny(kComponent) );
 
         uno::Sequence< uno::Any > aArgs(1);
         aArgs[0] <<=  aPath;
@@ -234,7 +234,7 @@ css::uno::Any LdapUserProfileBe::getPropertyValue(
 
 //------------------------------------------------------------------------------
 rtl::OUString SAL_CALL LdapUserProfileBe::getLdapUserProfileBeName(void) {
-    return rtl::OUString::createFromAscii("com.sun.star.comp.configuration.backend.LdapUserProfileBe") ;
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.configuration.backend.LdapUserProfileBe"));
 }
 //------------------------------------------------------------------------------
 
@@ -276,5 +276,4 @@ SAL_CALL LdapUserProfileBe::getSupportedServiceNames(void)
 }}}
 // ---------------------------------------------------------------------------------------
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 8554dc52500f..1a5f7fb0aab6 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -120,7 +120,7 @@ namespace dbp
         try
         {
             ::rtl::OUString sDataSourceName;
-            rContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("DataSourceName")) >>= sDataSourceName;
+            rContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName"))) >>= sDataSourceName;
 
             Reference< XConnection > xConnection;
             bool bEmbedded = ::dbtools::isEmbeddedInDatabase( rContext.xForm, xConnection );
@@ -138,9 +138,9 @@ namespace dbp
             implFillTables(xConnection);
 
             ::rtl::OUString sCommand;
-            OSL_VERIFY( rContext.xForm->getPropertyValue( ::rtl::OUString::createFromAscii("Command") ) >>= sCommand );
+            OSL_VERIFY( rContext.xForm->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command")) ) >>= sCommand );
             sal_Int32 nCommandType = CommandType::TABLE;
-            OSL_VERIFY( rContext.xForm->getPropertyValue( ::rtl::OUString::createFromAscii("CommandType") ) >>= nCommandType );
+            OSL_VERIFY( rContext.xForm->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CommandType")) ) >>= nCommandType );
 
             // search the entry of the given type with the given name
             XubString sLookup( sCommand );
@@ -175,13 +175,13 @@ namespace dbp
                 xOldConn = getFormConnection();
 
                 ::rtl::OUString sDataSource = m_aDatasource.GetSelectEntry();
-                rContext.xForm->setPropertyValue( ::rtl::OUString::createFromAscii("DataSourceName"), makeAny( sDataSource ) );
+                rContext.xForm->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName")), makeAny( sDataSource ) );
             }
             ::rtl::OUString sCommand = m_aTable.GetSelectEntry();
             sal_Int32 nCommandType = reinterpret_cast< sal_IntPtr >( m_aTable.GetEntryData( m_aTable.GetSelectEntryPos() ) );
 
-            rContext.xForm->setPropertyValue( ::rtl::OUString::createFromAscii("Command"), makeAny( sCommand ) );
-            rContext.xForm->setPropertyValue( ::rtl::OUString::createFromAscii("CommandType"), makeAny( nCommandType ) );
+            rContext.xForm->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command")), makeAny( sCommand ) );
+            rContext.xForm->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CommandType")), makeAny( nCommandType ) );
 
             if ( !rContext.bEmbedded )
                 setFormConnection( xOldConn, sal_False );
@@ -370,9 +370,8 @@ namespace dbp
         {
             ::svt::OLocalResourceAccess aLocalResAccess( ModuleRes( RID_PAGE_TABLESELECTION ), RSC_TABPAGE );
 
-            bool bIsHiContrast = m_aTable.GetSettings().GetStyleSettings().GetHighContrastMode();
-            aTableImage = Image( ModuleRes( bIsHiContrast ? IMG_TABLE_HC : IMG_TABLE ) );
-            aQueryImage = Image( ModuleRes( bIsHiContrast ? IMG_QUERY_HC : IMG_QUERY ) );
+            aTableImage = Image( ModuleRes( IMG_TABLE ) );
+            aQueryImage = Image( ModuleRes( IMG_QUERY ) );
         }
         lcl_fillEntries( m_aTable, aTableNames, aTableImage, CommandType::TABLE );
         lcl_fillEntries( m_aTable, aQueryNames, aQueryImage, CommandType::QUERY );
diff --git a/extensions/source/dbpilots/commonpagesdbp.src b/extensions/source/dbpilots/commonpagesdbp.src
index 41d199a70209..4e6969b57619 100644
--- a/extensions/source/dbpilots/commonpagesdbp.src
+++ b/extensions/source/dbpilots/commonpagesdbp.src
@@ -96,24 +96,11 @@ TabPage RID_PAGE_TABLESELECTION
         MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
     };
 
-    Image IMG_TABLE_HC
-    {
-        ImageBitmap = Bitmap { File = "sxh03188.bmp"; };
-        MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
-    };
-
     Image IMG_QUERY
     {
         ImageBitmap = Bitmap { File = "sx03202.bmp"; };
         MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
     };
-
-    Image IMG_QUERY_HC
-    {
-        ImageBitmap = Bitmap { File = "sxh03202.bmp"; };
-        MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
-    };
-
 };
 
 TabPage RID_PAGE_OPTION_DBFIELD
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index 202263cff749..408a45dda260 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -240,9 +240,9 @@ namespace dbp
             sal_Int32 nCommandType = CommandType::COMMAND;
             try
             {
-                rContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("DataSourceName")) >>= sDataSource;
-                rContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("Command")) >>= sCommand;
-                rContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("CommandType")) >>= nCommandType;
+                rContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName"))) >>= sDataSource;
+                rContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command"))) >>= sCommand;
+                rContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CommandType"))) >>= nCommandType;
             }
             catch(const Exception&)
             {
@@ -306,7 +306,7 @@ namespace dbp
         sal_Int16 nClassId = FormComponentType::CONTROL;
         try
         {
-            getContext().xObjectModel->getPropertyValue(::rtl::OUString::createFromAscii("ClassId")) >>= nClassId;
+            getContext().xObjectModel->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ClassId"))) >>= nClassId;
         }
         catch(Exception&)
         {
@@ -448,7 +448,7 @@ namespace dbp
 
             Reference< XInterface > xContext;
             if (xORB.is())
-                xContext = xORB->createInstance(::rtl::OUString::createFromAscii("com.sun.star.sdb.DatabaseContext"));
+                xContext = xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.DatabaseContext")));
             DBG_ASSERT(xContext.is(), "OControlWizard::implGetDSContext: invalid database context!");
 
             m_aContext.xDatasourceContext = Reference< XNameAccess >(xContext, UNO_QUERY);
@@ -472,7 +472,7 @@ namespace dbp
         try
         {
             if ( !::dbtools::isEmbeddedInDatabase(m_aContext.xForm,xConn) )
-                m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("ActiveConnection")) >>= xConn;
+                m_aContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection"))) >>= xConn;
         }
         catch(const Exception&)
         {
@@ -502,7 +502,7 @@ namespace dbp
             }
             else
             {
-                m_aContext.xForm->setPropertyValue( ::rtl::OUString::createFromAscii("ActiveConnection"), makeAny( _rxConn ) );
+                m_aContext.xForm->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection")), makeAny( _rxConn ) );
             }
         }
         catch(const Exception&)
@@ -519,7 +519,7 @@ namespace dbp
     //---------------------------------------------------------------------
     Reference< XInteractionHandler > OControlWizard::getInteractionHandler(Window* _pWindow) const
     {
-        const ::rtl::OUString sInteractionHandlerServiceName = ::rtl::OUString::createFromAscii("com.sun.star.task.InteractionHandler");
+        const ::rtl::OUString sInteractionHandlerServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler"));
         Reference< XInteractionHandler > xHandler;
         try
         {
@@ -572,8 +572,8 @@ namespace dbp
             if (m_aContext.xForm.is())
             {
                 // collect some properties of the form
-                ::rtl::OUString sObjectName = ::comphelper::getString(m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("Command")));
-                sal_Int32 nObjectType = ::comphelper::getINT32(m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("CommandType")));
+                ::rtl::OUString sObjectName = ::comphelper::getString(m_aContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command"))));
+                sal_Int32 nObjectType = ::comphelper::getINT32(m_aContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CommandType"))));
 
                 // calculate the connection the rowset is working with
                 Reference< XConnection > xConnection;
@@ -618,7 +618,7 @@ namespace dbp
 
                             // not interested in any results, only in the fields
                             Reference< XPropertySet > xStatementProps(xStatement, UNO_QUERY);
-                            xStatementProps->setPropertyValue(::rtl::OUString::createFromAscii("MaxRows"), makeAny(sal_Int32(0)));
+                            xStatementProps->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxRows")), makeAny(sal_Int32(0)));
 
                             // TODO: think about handling local SQLExceptions here ...
                             Reference< XColumnsSupplier >  xSupplyCols(xStatement->executeQuery(), UNO_QUERY);
@@ -632,7 +632,7 @@ namespace dbp
             if (xColumns.is())
             {
                 m_aContext.aFieldNames = xColumns->getElementNames();
-                static const ::rtl::OUString s_sFieldTypeProperty   = ::rtl::OUString::createFromAscii("Type");
+                static const ::rtl::OUString s_sFieldTypeProperty(RTL_CONSTASCII_USTRINGPARAM("Type"));
                 const ::rtl::OUString* pBegin = m_aContext.aFieldNames.getConstArray();
                 const ::rtl::OUString* pEnd   = pBegin + m_aContext.aFieldNames.getLength();
                 for(;pBegin != pEnd;++pBegin)
@@ -697,13 +697,13 @@ namespace dbp
         // the only thing we have at the moment is the label
         try
         {
-            ::rtl::OUString sLabelPropertyName = ::rtl::OUString::createFromAscii("Label");
+            ::rtl::OUString sLabelPropertyName(RTL_CONSTASCII_USTRINGPARAM("Label"));
             Reference< XPropertySetInfo > xInfo = m_aContext.xObjectModel->getPropertySetInfo();
             if (xInfo.is() && xInfo->hasPropertyByName(sLabelPropertyName))
             {
                 ::rtl::OUString sControlLabel(_pSettings->sControlLabel);
                 m_aContext.xObjectModel->setPropertyValue(
-                    ::rtl::OUString::createFromAscii("Label"),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")),
                     makeAny(sControlLabel)
                 );
             }
@@ -724,7 +724,7 @@ namespace dbp
         // initialize some settings from the control model give
         try
         {
-            ::rtl::OUString sLabelPropertyName = ::rtl::OUString::createFromAscii("Label");
+            ::rtl::OUString sLabelPropertyName(RTL_CONSTASCII_USTRINGPARAM("Label"));
             Reference< XPropertySetInfo > xInfo = m_aContext.xObjectModel->getPropertySetInfo();
             if (xInfo.is() && xInfo->hasPropertyByName(sLabelPropertyName))
             {
@@ -745,31 +745,6 @@ namespace dbp
         // lemme see ...
         return (0 == getContext().aFieldNames.getLength());
             // if we got fields, the data source is valid ...
-//      try
-//      {
-//          // first, we need a valid data source name
-//          ::rtl::OUString sDataSourceName;
-//          m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("DataSourceName")) >>= sDataSourceName;
-//          if (m_aContext.xDatasourceContext.is() && m_aContext.xDatasourceContext->hasByName(sDataSourceName))
-//          {   // at least the data source name is valid ...
-//              // then, a CommandType "table" would be nice ...
-//              sal_Int32 nCommandType = CommandType::COMMAND;
-//              m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("CommandType")) >>= nCommandType;
-//              if (CommandType::TABLE == nCommandType)
-//              {   // okay ....
-//                  // now the table itself should be valid
-//                  ::rtl::OUString sTableName;
-//                  m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("Command")) >>= sTableName;
-//                  if (m_aContext.xObjectContainer.is() && m_aContext.xObjectContainer->hasByName(sTableName))
-//                      return sal_False;
-//              }
-//          }
-//      }
-//      catch(Exception&)
-//      {
-//          DBG_ERROR("OControlWizard::needDatasourceSelection: caught an exception while checking the form settings!");
-//      }
-//      return sal_True;
     }
 
 //.........................................................................
diff --git a/extensions/source/dbpilots/dbpresid.hrc b/extensions/source/dbpilots/dbpresid.hrc
index ecb424c5e3b7..4b5c1ec92d6d 100644
--- a/extensions/source/dbpilots/dbpresid.hrc
+++ b/extensions/source/dbpilots/dbpresid.hrc
@@ -210,9 +210,7 @@
 // Image
 
 #define IMG_TABLE                   1
-#define IMG_TABLE_HC                2
 #define IMG_QUERY                   3
-#define IMG_QUERY_HC                4
 
 //========================================================================
 // defines
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index f3bd194a27c3..ebc03de45850 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -111,10 +111,10 @@ namespace dbp
         if (!xColumnFactory.is() || !xColumnContainer.is())
             return;
 
-        static const ::rtl::OUString s_sDataFieldProperty   = ::rtl::OUString::createFromAscii("DataField");
-        static const ::rtl::OUString s_sLabelProperty       = ::rtl::OUString::createFromAscii("Label");
-        static const ::rtl::OUString s_sWidthProperty       = ::rtl::OUString::createFromAscii("Width");
-        static const ::rtl::OUString s_sMouseWheelBehavior  = ::rtl::OUString::createFromAscii("MouseWheelBehavior");
+        static const ::rtl::OUString s_sDataFieldProperty   (RTL_CONSTASCII_USTRINGPARAM("DataField"));
+        static const ::rtl::OUString s_sLabelProperty       (RTL_CONSTASCII_USTRINGPARAM("Label"));
+        static const ::rtl::OUString s_sWidthProperty       (RTL_CONSTASCII_USTRINGPARAM("Width"));
+        static const ::rtl::OUString s_sMouseWheelBehavior (RTL_CONSTASCII_USTRINGPARAM("MouseWheelBehavior"));
         static const ::rtl::OUString s_sEmptyString;
 
         // collect "descriptors" for the to-be-created (grid)columns
@@ -143,14 +143,14 @@ namespace dbp
             {
                 case DataType::BIT:
                 case DataType::BOOLEAN:
-                    aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("CheckBox"));
+                    aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CheckBox")));
                     aColumnLabelPostfixes.push_back(s_sEmptyString);
                     break;
 
                 case DataType::TINYINT:
                 case DataType::SMALLINT:
                 case DataType::INTEGER:
-                    aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("NumericField"));
+                    aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumericField")));
                     aColumnLabelPostfixes.push_back(s_sEmptyString);
                     break;
 
@@ -159,31 +159,31 @@ namespace dbp
                 case DataType::DOUBLE:
                 case DataType::NUMERIC:
                 case DataType::DECIMAL:
-                    aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("FormattedField"));
+                    aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormattedField")));
                     aColumnLabelPostfixes.push_back(s_sEmptyString);
                     break;
 
                 case DataType::DATE:
-                    aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("DateField"));
+                    aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateField")));
                     aColumnLabelPostfixes.push_back(s_sEmptyString);
                     break;
 
                 case DataType::TIME:
-                    aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("TimeField"));
+                    aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeField")));
                     aColumnLabelPostfixes.push_back(s_sEmptyString);
                     break;
 
                 case DataType::TIMESTAMP:
-                    aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("DateField"));
+                    aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateField")));
                     aColumnLabelPostfixes.push_back(String(ModuleRes(RID_STR_DATEPOSTFIX)));
 
                     aFormFieldNames.push_back(*pSelectedFields);
-                    aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("TimeField"));
+                    aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeField")));
                     aColumnLabelPostfixes.push_back(String(ModuleRes(RID_STR_TIMEPOSTFIX)));
                     break;
 
                 default:
-                    aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("TextField"));
+                    aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextField")));
                     aColumnLabelPostfixes.push_back(s_sEmptyString);
             }
         }
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index f8cd1c509ebf..66c97e59b83e 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -84,9 +84,6 @@ namespace dbp
     {
         switch (_nState)
         {
-//          case GBW_STATE_DATASELECTION:
-//              return new OTableSelectionPage(this);
-//
             case GBW_STATE_OPTIONLIST:
                 return new ORadioSelectionPage(this);
 
@@ -111,9 +108,6 @@ namespace dbp
     {
         switch (_nCurrentState)
         {
-//          case GBW_STATE_DATASELECTION:
-//              return GBW_STATE_OPTIONLIST;
-//
             case GBW_STATE_OPTIONLIST:
                 return GBW_STATE_DEFAULTOPTION;
 
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index d70fdcb97378..0a93ad8c22d1 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -187,12 +187,12 @@ namespace dbp
             }
 
             // ListSourceType: SQL
-            getContext().xObjectModel->setPropertyValue(::rtl::OUString::createFromAscii("ListSourceType"), makeAny((sal_Int32)ListSourceType_SQL));
+            getContext().xObjectModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ListSourceType")), makeAny((sal_Int32)ListSourceType_SQL));
 
             if (isListBox())
             {
                 // BoundColumn: 1
-                getContext().xObjectModel->setPropertyValue(::rtl::OUString::createFromAscii("BoundColumn"), makeAny((sal_Int16)1));
+                getContext().xObjectModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BoundColumn")), makeAny((sal_Int16)1));
 
                 // build the statement to set as list source
                 String sStatement;
@@ -204,7 +204,7 @@ namespace dbp
                 sStatement += getSettings().sListContentTable;
                 Sequence< ::rtl::OUString > aListSource(1);
                 aListSource[0] = sStatement;
-                getContext().xObjectModel->setPropertyValue(::rtl::OUString::createFromAscii("ListSource"), makeAny(aListSource));
+                getContext().xObjectModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ListSource")), makeAny(aListSource));
             }
             else
             {
@@ -214,11 +214,11 @@ namespace dbp
                 sStatement += getSettings().sListContentField;
                 sStatement.AppendAscii(" FROM ");
                 sStatement += getSettings().sListContentTable;
-                getContext().xObjectModel->setPropertyValue(::rtl::OUString::createFromAscii("ListSource"), makeAny(::rtl::OUString(sStatement)));
+                getContext().xObjectModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ListSource")), makeAny(::rtl::OUString(sStatement)));
             }
 
             // the bound field
-            getContext().xObjectModel->setPropertyValue(::rtl::OUString::createFromAscii("DataField"), makeAny(::rtl::OUString(getSettings().sLinkedFormField)));
+            getContext().xObjectModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataField")), makeAny(::rtl::OUString(getSettings().sLinkedFormField)));
         }
         catch(Exception&)
         {
diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx
index 13c453243d0f..e1de8e380b85 100644
--- a/extensions/source/dbpilots/optiongrouplayouter.cxx
+++ b/extensions/source/dbpilots/optiongrouplayouter.cxx
@@ -109,7 +109,7 @@ namespace dbp
 
         // shape collection (for grouping the shapes)
         Reference< XShapes > xButtonCollection(m_xORB->createInstance(
-                ::rtl::OUString::createFromAscii("com.sun.star.drawing.ShapeCollection")),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ShapeCollection"))),
             UNO_QUERY);
         // first member : the shape of the control
         xButtonCollection->add(_rContext.xObjectShape.get());
@@ -124,7 +124,7 @@ namespace dbp
         ::com::sun::star::awt::Point aButtonPosition;
         aButtonPosition.X = aShapePosition.X + OFFSET;
 
-        ::rtl::OUString sElementsName = ::rtl::OUString::createFromAscii("RadioGroup");
+        ::rtl::OUString sElementsName(RTL_CONSTASCII_USTRINGPARAM("RadioGroup"));
         disambiguateName(Reference< XNameAccess >(_rContext.xForm, UNO_QUERY), sElementsName);
 
         StringArray::const_iterator aLabelIter = _rSettings.aLabels.begin();
@@ -134,28 +134,28 @@ namespace dbp
             aButtonPosition.Y = aShapePosition.Y + (i+1) * nTempHeight + nTopSpace;
 
             Reference< XPropertySet > xRadioModel(
-                    xDocFactory->createInstance(::rtl::OUString::createFromAscii("com.sun.star.form.component.RadioButton")),
+                    xDocFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.RadioButton"))),
                 UNO_QUERY);
 
             // the label
-            xRadioModel->setPropertyValue(::rtl::OUString::createFromAscii("Label"), makeAny(rtl::OUString(*aLabelIter)));
+            xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")), makeAny(rtl::OUString(*aLabelIter)));
             // the value
-            xRadioModel->setPropertyValue(::rtl::OUString::createFromAscii("RefValue"), makeAny(rtl::OUString(*aValueIter)));
+            xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RefValue")), makeAny(rtl::OUString(*aValueIter)));
 
             // default selection
             if (_rSettings.sDefaultField == *aLabelIter)
-                xRadioModel->setPropertyValue(::rtl::OUString::createFromAscii("DefaultState"), makeAny(sal_Int16(1)));
+                xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultState")), makeAny(sal_Int16(1)));
 
             // the connection to the database field
             if (0 != _rSettings.sDBField.Len())
-                xRadioModel->setPropertyValue(::rtl::OUString::createFromAscii("DataField"), makeAny(::rtl::OUString(_rSettings.sDBField)));
+                xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataField")), makeAny(::rtl::OUString(_rSettings.sDBField)));
 
             // the name for the model
-            xRadioModel->setPropertyValue(::rtl::OUString::createFromAscii("Name"), makeAny(sElementsName));
+            xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), makeAny(sElementsName));
 
             // create a shape for the radio button
             Reference< XControlShape > xRadioShape(
-                    xDocFactory->createInstance(::rtl::OUString::createFromAscii("com.sun.star.drawing.ControlShape")),
+                    xDocFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape"))),
                 UNO_QUERY);
             Reference< XPropertySet > xShapeProperties(xRadioShape, UNO_QUERY);
 
@@ -170,7 +170,7 @@ namespace dbp
 
             // the name of the shape
             if (xShapeProperties.is())
-                xShapeProperties->setPropertyValue(::rtl::OUString::createFromAscii("Name"), makeAny(sElementsName));
+                xShapeProperties->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), makeAny(sElementsName));
 
             // add to the page
             xPageShapes->add(xRadioShape.get());
@@ -179,7 +179,7 @@ namespace dbp
 
             // set the GroupBox as "LabelControl" for the RadioButton
             // (_after_ having inserted the model into the page!)
-            xRadioModel->setPropertyValue(::rtl::OUString::createFromAscii("LabelControl"), makeAny(_rContext.xObjectModel));
+            xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LabelControl")), makeAny(_rContext.xObjectModel));
         }
 
         // group the shapes
@@ -203,7 +203,7 @@ namespace dbp
     //---------------------------------------------------------------------
     void OOptionGroupLayouter::implAnchorShape(const Reference< XPropertySet >& _rxShapeProps)
     {
-        static const ::rtl::OUString s_sAnchorPropertyName = ::rtl::OUString::createFromAscii("AnchorType");
+        static const ::rtl::OUString s_sAnchorPropertyName(RTL_CONSTASCII_USTRINGPARAM("AnchorType"));
         Reference< XPropertySetInfo > xPropertyInfo;
         if (_rxShapeProps.is())
             xPropertyInfo = _rxShapeProps->getPropertySetInfo();
diff --git a/extensions/source/dbpilots/wizardservices.cxx b/extensions/source/dbpilots/wizardservices.cxx
index 23d0c2b6c80b..d6ac0d4765c3 100644
--- a/extensions/source/dbpilots/wizardservices.cxx
+++ b/extensions/source/dbpilots/wizardservices.cxx
@@ -70,14 +70,14 @@ namespace dbp
     //---------------------------------------------------------------------
     ::rtl::OUString OGroupBoxSI::getImplementationName() const
     {
-        return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbp.OGroupBoxWizard");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbp.OGroupBoxWizard"));
     }
 
     //---------------------------------------------------------------------
     Sequence< ::rtl::OUString > OGroupBoxSI::getServiceNames() const
     {
         Sequence< ::rtl::OUString > aReturn(1);
-        aReturn[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.GroupBoxAutoPilot");
+        aReturn[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.GroupBoxAutoPilot"));
         return aReturn;
     }
 
@@ -87,14 +87,14 @@ namespace dbp
     //---------------------------------------------------------------------
     ::rtl::OUString OListComboSI::getImplementationName() const
     {
-        return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbp.OListComboWizard");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbp.OListComboWizard"));
     }
 
     //---------------------------------------------------------------------
     Sequence< ::rtl::OUString > OListComboSI::getServiceNames() const
     {
         Sequence< ::rtl::OUString > aReturn(1);
-        aReturn[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.ListComboBoxAutoPilot");
+        aReturn[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ListComboBoxAutoPilot"));
         return aReturn;
     }
 
@@ -104,14 +104,14 @@ namespace dbp
     //---------------------------------------------------------------------
     ::rtl::OUString OGridSI::getImplementationName() const
     {
-        return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbp.OGridWizard");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbp.OGridWizard"));
     }
 
     //---------------------------------------------------------------------
     Sequence< ::rtl::OUString > OGridSI::getServiceNames() const
     {
         Sequence< ::rtl::OUString > aReturn(1);
-        aReturn[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.GridControlAutoPilot");
+        aReturn[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.GridControlAutoPilot"));
         return aReturn;
     }
 
diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx
index fe8321be9cdd..35daf0e83799 100644
--- a/extensions/source/inc/componentmodule.cxx
+++ b/extensions/source/inc/componentmodule.cxx
@@ -264,7 +264,7 @@ namespace COMPMOD_NAMESPACE
         {
             ::rtl::OUString aMainKeyName(sRootKey);
             aMainKeyName += *pImplName;
-            aMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES");
+            aMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
 
             try
             {
diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx
index f6320c22f33e..742bedecc0e7 100644
--- a/extensions/source/nsplugin/source/so_instance.cxx
+++ b/extensions/source/nsplugin/source/so_instance.cxx
@@ -70,7 +70,6 @@ using namespace com::sun::star;
 char SoPluginInstance::sSO_Dir[] = {0};
 Reference< XMultiServiceFactory > SoPluginInstance::mxRemoteMSF = Reference< XMultiServiceFactory >(NULL);
 
-
 SoPluginInstance::SoPluginInstance(long pParent, Reference< XMultiServiceFactory > xMSF):
     m_xUnoWin(NULL),
     m_xComponent(NULL),
@@ -86,7 +85,6 @@ SoPluginInstance::SoPluginInstance(long pParent, Reference< XMultiServiceFactory
     m_nY = 0;
     m_nFlag = 15;
     m_bInit = sal_False;
-    m_sURL = rtl::OUString::createFromAscii("");
     m_hParent = 0;
     m_pParent = pParent;
     m_dParentStyl = 0;
@@ -136,7 +134,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
     {
         // try to create netscape plugin window
         Reference< awt::XToolkit > xToolkit(
-            mxRemoteMSF->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.awt.Toolkit") ),
+            mxRemoteMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Toolkit")) ),
             uno::UNO_QUERY );
         if( !xToolkit.is() )
         {
@@ -189,7 +187,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
 
         // create frame
         m_xFrame = Reference< frame::XFrame >(
-            mxRemoteMSF->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.frame.Frame") ),
+            mxRemoteMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame") )),
             uno::UNO_QUERY );
         if (!m_xFrame.is())
         {
@@ -205,16 +203,16 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
             // currently ignore errors in this code
             uno::Reference< beans::XPropertySet > xFrameProps( m_xFrame, uno::UNO_QUERY_THROW );
             uno::Reference< beans::XPropertySet > xLMProps;
-            xFrameProps->getPropertyValue( ::rtl::OUString::createFromAscii("LayoutManager") ) >>= xLMProps;
+            xFrameProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) ) >>= xLMProps;
             if ( xLMProps.is() )
-                xLMProps->setPropertyValue( ::rtl::OUString::createFromAscii("AutomaticToolbars"), uno::makeAny( (sal_Bool)sal_False ) );
+                xLMProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutomaticToolbars")), uno::makeAny( (sal_Bool)sal_False ) );
         }
         catch( uno::Exception& )
         {}
 
         // get frames supplier
         Reference< frame::XFramesSupplier > m_xFramesSupplier(
-            mxRemoteMSF->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop") ),
+            mxRemoteMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ),
             uno::UNO_QUERY );
         if ( !m_xFramesSupplier.is() )
         {
@@ -243,7 +241,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
 
         //create stream for the document
         Reference< ::com::sun::star::ucb::XSimpleFileAccess > xSimpleFileAccess(
-            mxRemoteMSF->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess") ),
+            mxRemoteMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccessw")) ),
             uno::UNO_QUERY );
         if(!xSimpleFileAccess.is())
         {
@@ -275,14 +273,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
             ::rtl::OUStringToOString( m_sURL, RTL_TEXTENCODING_ASCII_US ).getStr( ),
             m_sURL.getLength() );
 
-
         // load document
-/*
-        m_xComponent = xLoader->loadComponentFromURL(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("private:stream")), //m_sURL,
-            m_xFrame->getName(), 0, setPropValues );
-  */
-
          Sequence< ::com::sun::star::beans::PropertyValue > setPropValues2(3);
         setPropValues2[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("ViewOnly") );
         setPropValues2[0].Value <<= sal_True;
@@ -316,7 +307,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
 
         // create frame::XDispatchHelper and frame::XDispatchProvider
         m_xDispatcher = Reference< frame::XDispatchHelper > (
-            mxRemoteMSF->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.DispatchHelper")),
+            mxRemoteMSF->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.DispatchHelper"))),
             uno::UNO_QUERY );
         if(!m_xDispatcher.is())
         {
@@ -335,7 +326,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
         propertyValue[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("FunctionBarVisible") );
         propertyValue[0].Value <<= sal_True;
         m_xDispatcher->executeDispatch(m_xDispatchProvider,
-                ::rtl::OUString::createFromAscii(".uno:FunctionBarVisible"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FunctionBarVisible")),
                 m_xFrame->getName(), 0,
                 propertyValue );
 
@@ -419,12 +410,6 @@ sal_Bool SoPluginInstance::Destroy(void)
     if(m_dParentStyl != 0)
         NSP_RestoreWinStyl(m_hParent, m_dParentStyl);
 #endif
-//  if(m_xDispatcher.is()){
-//   m_xDispatcher->executeDispatch(m_xDispatchProvider,
-//                ::rtl::OUString::createFromAscii(".uno:CloseFrame"),
-//                ::rtl::OUString::createFromAscii("_top"), 0,
-//                Sequence< ::com::sun::star::beans::PropertyValue >() );
-//  }
 
     uno::Reference< util::XCloseable > xCloseable( m_xFrame, uno::UNO_QUERY );
 
@@ -489,7 +474,7 @@ sal_Bool SoPluginInstance::Print(void)
 
     Sequence< ::com::sun::star::beans::PropertyValue > propertyValue(1);
     m_xDispatcher->executeDispatch(m_xDispatchProvider,
-        ::rtl::OUString::createFromAscii(".uno:PrintDefault"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:PrintDefault")),
         m_xFrame->getName(), 0,
         propertyValue );
     return sal_True;
diff --git a/extensions/source/ole/ole2uno.cxx b/extensions/source/ole/ole2uno.cxx
index 203c6b4d3b8b..9bf89b02a398 100644
--- a/extensions/source/ole/ole2uno.cxx
+++ b/extensions/source/ole/ole2uno.cxx
@@ -55,22 +55,6 @@ Mutex * getBridgeMutex()
 }
 
 
-// Mutex* getBridgeMutex()
-// {
-//  static Mutex* pMutex= NULL;
-
-//  if( ! pMutex)
-//  {
-//      MutexGuard guard( Mutex::getGlobalMutex() );
-//      if( !pMutex)
-//      {
-//          static Mutex aMutex;
-//          pMutex= &aMutex;
-//      }
-//  }
-//  return pMutex;
-// }
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index 847ce89ce4f9..5696375a5971 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -491,7 +491,7 @@ Any SAL_CALL IUnknownWrapper_Impl::getValue( const OUString& aPropertyName )
         // Instead here I chose a name that should be illegal both in COM and
         // UNO ( from an IDL point of view ) therefore I think this is a safe
         // hack
-        if ( aPropertyName.equals( rtl::OUString::createFromAscii("$GetTypeName") ))
+        if ( aPropertyName.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$GetTypeName")) ))
         {
             if ( pInfo && m_sTypeName.getLength() == 0 )
             {
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index a220bd5d1578..1ce9f3c9ae0b 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -563,13 +563,6 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny,
                     bFail = true;
                 break;
             default:
-// case TypeClass_SERVICE:  break;  // meta construct
-// case TypeClass_TYPEDEF: break;
-// case TypeClass_UNION:    break;
-// case TypeClass_MODULE:   break;      // module
-// case TypeClass_EXCEPTION: break;
-// case TypeClass_ARRAY: break;    // there's no Array at the moment
-// case TypeClass_UNKNOWN:  break;
                 bCannotConvert = true;
                 break;
             }
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index cae9ecb5caa3..91e154dd190f 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -1125,7 +1125,7 @@ HRESULT InterfaceOleWrapper_Impl::InvokeGeneral( DISPID dispidMember, unsigned s
             sal_Bool bStruct= sal_False;
 
 
-            Reference<XInterface> xIntCore= m_smgr->createInstance( OUString::createFromAscii("com.sun.star.reflection.CoreReflection"));
+            Reference<XInterface> xIntCore= m_smgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.CoreReflection")));
             Reference<XIdlReflection> xRefl( xIntCore, UNO_QUERY);
             if( xRefl.is() )
             {
diff --git a/extensions/source/ole/unotypewrapper.hxx b/extensions/source/ole/unotypewrapper.hxx
index 748d7a59da58..f2433befa6e1 100644
--- a/extensions/source/ole/unotypewrapper.hxx
+++ b/extensions/source/ole/unotypewrapper.hxx
@@ -35,8 +35,8 @@
 #define STRICT
 #define _WIN32_WINNT 0x0403
 #define _WIN32_DCOM
-#if OSL_DEBUG_LEVEL > 0
-//#define _ATL_DEBUG_INTERFACES
+#if OSL_DEBUG_LEVEL > 2
+#define _ATL_DEBUG_INTERFACES
 #endif
 #include <atlbase.h>
 extern CComModule _Module;
diff --git a/extensions/source/oooimprovecore/core.cxx b/extensions/source/oooimprovecore/core.cxx
index 472d844337a3..00b6978a1e1d 100644
--- a/extensions/source/oooimprovecore/core.cxx
+++ b/extensions/source/oooimprovecore/core.cxx
@@ -121,17 +121,17 @@ namespace oooimprovecore
 
         OUString help_url;
         Reference<XCoreController> core_c(
-            xServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.oooimprovement.CoreController")),
+            xServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.CoreController"))),
             UNO_QUERY);
         if(core_c.is())
             ::comphelper::ConfigurationHelper::readDirectKey(
                 xServiceFactory,
-                OUString::createFromAscii("/org.openoffice.Office.OOoImprovement.Settings"),
-                OUString::createFromAscii("Participation"),
-                OUString::createFromAscii("HelpUrl"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.OOoImprovement.Settings")),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("Participation")),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("HelpUrl")),
                 ::comphelper::ConfigurationHelper::E_READONLY) >>= help_url;
         else
-            help_url = OUString::createFromAscii("http://www.libreoffice.org");
+            help_url = OUString(RTL_CONSTASCII_USTRINGPARAM("http://www.libreoffice.org"));
         {
             SolarMutexGuard aGuard;
             SfxAllItemSet aSet( SFX_APP()->GetPool() );
@@ -161,12 +161,12 @@ namespace oooimprovecore
     { return getSupportedServiceNames_static(); }
 
     OUString SAL_CALL Core::getImplementationName_static()
-    { return OUString::createFromAscii("com.sun.star.comp.extensions.oooimprovecore.Core"); }
+    { return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.oooimprovecore.Core")); }
 
     Sequence<OUString> SAL_CALL Core::getSupportedServiceNames_static()
     {
         Sequence<OUString> aServiceNames(1);
-        aServiceNames[0] = OUString::createFromAscii("com.sun.star.oooimprovement.Core");
+        aServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.Core"));
         return aServiceNames;
     }
 
diff --git a/extensions/source/oooimprovement/config.cxx b/extensions/source/oooimprovement/config.cxx
index 296df200d50d..751adf3c965d 100644
--- a/extensions/source/oooimprovement/config.cxx
+++ b/extensions/source/oooimprovement/config.cxx
@@ -43,32 +43,32 @@ namespace
 {
     using namespace oooimprovement;
 
-    static const OUString CFG_COUNTERS = OUString::createFromAscii("Counters");
-    static const OUString CFG_ENABLINGALLOWED = OUString::createFromAscii("EnablingAllowed");
-    static const OUString CFG_EVENTSCOUNT = OUString::createFromAscii("LoggedEvents");
-    static const OUString CFG_EXTENSION = OUString::createFromAscii("ooSetupExtension");
-    static const OUString CFG_FAILEDATTEMPTS = OUString::createFromAscii("FailedAttempts");
-    static const OUString CFG_INVACCEPT = OUString::createFromAscii("InvitationAccepted");
-    static const OUString CFG_L10N = OUString::createFromAscii("L10N");
-    static const OUString CFG_LOCALE = OUString::createFromAscii("ooLocale");
-    static const OUString CFG_LOGGING = OUString::createFromAscii("/org.openoffice.Office.Logging");
-    static const OUString CFG_LOGPATH = OUString::createFromAscii("LogPath");
-    static const OUString CFG_NAME = OUString::createFromAscii("ooName");
-    static const OUString CFG_OFFICESTARTCOUNTDOWN = OUString::createFromAscii("OfficeStartCounterdown");
-    static const OUString CFG_OOOIMPROVEMENT = OUString::createFromAscii("OOoImprovement");
-    static const OUString CFG_OOOIMPROVEMENTPACK = OUString::createFromAscii("/org.openoffice.Office.OOoImprovement.Settings");
-    static const OUString CFG_PARTICIPATION = OUString::createFromAscii("Participation");
-    static const OUString CFG_PRODUCT = OUString::createFromAscii("Product");
-    static const OUString CFG_REPORTCOUNT = OUString::createFromAscii("UploadedReports");
-    static const OUString CFG_REPORTEREMAIL = OUString::createFromAscii("ReporterEmail");
-    static const OUString CFG_SETUP = OUString::createFromAscii("/org.openoffice.Setup");
-    static const OUString CFG_SHOWEDINV = OUString::createFromAscii("ShowedInvitation");
-    static const OUString CFG_SOAPIDADD = OUString::createFromAscii("SoapIdAdditions");
-    static const OUString CFG_SOAPURL = OUString::createFromAscii("SoapUrl");
-    static const OUString CFG_UPLOAD = OUString::createFromAscii("Upload");
-    static const OUString CFG_VERSION = OUString::createFromAscii("ooSetupVersion");
-
-    static const OUString SOAPID = OUString::createFromAscii("OpenOffice.org Improvement Report - Version 1\n");
+    static const OUString CFG_COUNTERS(RTL_CONSTASCII_USTRINGPARAM("Counters"));
+    static const OUString CFG_ENABLINGALLOWED(RTL_CONSTASCII_USTRINGPARAM("EnablingAllowed"));
+    static const OUString CFG_EVENTSCOUNT(RTL_CONSTASCII_USTRINGPARAM("LoggedEvents"));
+    static const OUString CFG_EXTENSION(RTL_CONSTASCII_USTRINGPARAM("ooSetupExtension"));
+    static const OUString CFG_FAILEDATTEMPTS(RTL_CONSTASCII_USTRINGPARAM("FailedAttempts"));
+    static const OUString CFG_INVACCEPT(RTL_CONSTASCII_USTRINGPARAM("InvitationAccepted"));
+    static const OUString CFG_L10N(RTL_CONSTASCII_USTRINGPARAM("L10N"));
+    static const OUString CFG_LOCALE(RTL_CONSTASCII_USTRINGPARAM("ooLocale"));
+    static const OUString CFG_LOGGING(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Logging"));
+    static const OUString CFG_LOGPATH(RTL_CONSTASCII_USTRINGPARAM("LogPath"));
+    static const OUString CFG_NAME(RTL_CONSTASCII_USTRINGPARAM("ooName"));
+    static const OUString CFG_OFFICESTARTCOUNTDOWN(RTL_CONSTASCII_USTRINGPARAM("OfficeStartCounterdown"));
+    static const OUString CFG_OOOIMPROVEMENT(RTL_CONSTASCII_USTRINGPARAM("OOoImprovement"));
+    static const OUString CFG_OOOIMPROVEMENTPACK(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.OOoImprovement.Settings"));
+    static const OUString CFG_PARTICIPATION(RTL_CONSTASCII_USTRINGPARAM("Participation"));
+    static const OUString CFG_PRODUCT(RTL_CONSTASCII_USTRINGPARAM("Product"));
+    static const OUString CFG_REPORTCOUNT(RTL_CONSTASCII_USTRINGPARAM("UploadedReports"));
+    static const OUString CFG_REPORTEREMAIL(RTL_CONSTASCII_USTRINGPARAM("ReporterEmail"));
+    static const OUString CFG_SETUP(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup"));
+    static const OUString CFG_SHOWEDINV(RTL_CONSTASCII_USTRINGPARAM("ShowedInvitation"));
+    static const OUString CFG_SOAPIDADD(RTL_CONSTASCII_USTRINGPARAM("SoapIdAdditions"));
+    static const OUString CFG_SOAPURL(RTL_CONSTASCII_USTRINGPARAM("SoapUrl"));
+    static const OUString CFG_UPLOAD(RTL_CONSTASCII_USTRINGPARAM("Upload"));
+    static const OUString CFG_VERSION(RTL_CONSTASCII_USTRINGPARAM("ooSetupVersion"));
+
+    static const OUString SOAPID(RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org Improvement Report - Version 1\n"));
 
     static sal_Int32 incrementCfgValue(
         const Reference<XMultiServiceFactory> sm,
@@ -183,14 +183,14 @@ namespace oooimprovement
             MyConfigurationHelper::E_READONLY) >>= value;
         result.append(value);
 
-        value = OUString::createFromAscii("");
+        value = OUString();
         MyConfigurationHelper::readDirectKey(
             m_ServiceFactory,
             CFG_SETUP, CFG_PRODUCT, CFG_VERSION,
             MyConfigurationHelper::E_READONLY) >>= value;
         if(value.getLength()) result.appendAscii(" ").append(value);
 
-        value = OUString::createFromAscii("");
+        value = OUString();
         MyConfigurationHelper::readDirectKey(
             m_ServiceFactory,
             CFG_SETUP, CFG_PRODUCT, CFG_EXTENSION,
diff --git a/extensions/source/oooimprovement/corecontroller.cxx b/extensions/source/oooimprovement/corecontroller.cxx
index 8a9bae0f62dd..269d947c3e08 100644
--- a/extensions/source/oooimprovement/corecontroller.cxx
+++ b/extensions/source/oooimprovement/corecontroller.cxx
@@ -76,12 +76,12 @@ namespace oooimprovement
     { return getSupportedServiceNames_static(); }
 
     OUString SAL_CALL CoreController::getImplementationName_static()
-    { return OUString::createFromAscii("com.sun.star.comp.extensions.oooimprovement.CoreController"); }
+    { return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.oooimprovement.CoreController")); }
 
     Sequence<OUString> SAL_CALL CoreController::getSupportedServiceNames_static()
     {
         Sequence<OUString> aServiceNames(1);
-        aServiceNames[0] = OUString::createFromAscii("com.sun.star.oooimprovement.CoreController");
+        aServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.CoreController"));
         return aServiceNames;
     }
 
diff --git a/extensions/source/oooimprovement/invite_job.cxx b/extensions/source/oooimprovement/invite_job.cxx
index 1b96c0c181cd..c62ab07671c0 100644
--- a/extensions/source/oooimprovement/invite_job.cxx
+++ b/extensions/source/oooimprovement/invite_job.cxx
@@ -50,7 +50,7 @@ namespace
     // [add additional conditions here]
     static bool lcl_IsInvitationAllowed()
     {
-        static OUString sNoFirstStartWizard = OUString::createFromAscii("-nofirststartwizard");
+        static OUString sNoFirstStartWizard(RTL_CONSTASCII_USTRINGPARAM("-nofirststartwizard"));
         sal_Int32 nCount = rtl_getAppCommandArgCount();
         for(sal_Int32 nCurrent=0; nCurrent<nCount; nCurrent++)
         {
@@ -65,12 +65,6 @@ namespace
 
 namespace oooimprovement
 {
-//    InviteJob::InviteJob(const Reference<XComponentContext>& context)
-//        : m_ServiceFactory(Reference<XMultiServiceFactory>(
-//            context->getServiceManager()->createInstanceWithContext(
-//                OUString::createFromAscii("com.sun.star.lang.XMultiServiceFactory"), context),
-//            UNO_QUERY))
-//    { }
 
     InviteJob::InviteJob(const Reference<XMultiServiceFactory>& sf)
         : m_ServiceFactory(sf)
@@ -93,7 +87,7 @@ namespace oooimprovement
             if(lcl_IsInvitationAllowed() && !config.getShowedInvitation())
             {
                 Reference<XCore> core(
-                    m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.oooimprovement.Core")),
+                    m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.Core"))),
                     UNO_QUERY);
                 if(core.is()) core->inviteUser();
             }
@@ -117,18 +111,15 @@ namespace oooimprovement
     { return getSupportedServiceNames_static(); }
 
     OUString SAL_CALL InviteJob::getImplementationName_static()
-    { return OUString::createFromAscii("com.sun.star.comp.extensions.oooimprovement.InviteJob"); }
+    { return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.oooimprovement.InviteJob")); }
 
     Sequence<OUString> SAL_CALL InviteJob::getSupportedServiceNames_static()
     {
         Sequence<OUString> aServiceNames(1);
-        aServiceNames[0] = OUString::createFromAscii("com.sun.star.task.XAsyncJob");
+        aServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.XAsyncJob"));
         return aServiceNames;
     }
 
-//    Reference<XInterface> InviteJob::Create(const Reference<XComponentContext>& context)
-//    { return *(new InviteJob(context)); }
-
     Reference<XInterface> InviteJob::Create(const Reference<XMultiServiceFactory>& sm)
     { return *(new InviteJob(sm)); }
 }
diff --git a/extensions/source/oooimprovement/logpacker.cxx b/extensions/source/oooimprovement/logpacker.cxx
index 4defc2ab2cbe..e74b74c31982 100644
--- a/extensions/source/oooimprovement/logpacker.cxx
+++ b/extensions/source/oooimprovement/logpacker.cxx
@@ -74,13 +74,13 @@ namespace oooimprovement
     sal_Int32 LogPacker::pack(const OUString& fileurl)
     {
         Reference<XSimpleFileAccess> file_access(
-            m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")),
+            m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))),
             UNO_QUERY_THROW);
 
         Reference<XStorage> storage;
         {
             Reference<XSingleServiceFactory> storage_factory(
-                m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.embed.StorageFactory")),
+                m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.StorageFactory"))),
                 UNO_QUERY_THROW);
             Sequence<Any> storage_init_args(2);
             storage_init_args[0] = Any(getZipfileurl(fileurl));
@@ -91,7 +91,7 @@ namespace oooimprovement
         }
 
         Reference<XOutputStream> zipped_stream = storage->openStreamElement(
-            OUString::createFromAscii("logdata.csv"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("logdata.csv")),
             ElementModes::WRITE)->getOutputStream();
         Reference<XInputStream> unzipped_stream = file_access->openFileRead(fileurl);
         const sal_Int32 bufsize = 1024;
diff --git a/extensions/source/oooimprovement/logstorage.cxx b/extensions/source/oooimprovement/logstorage.cxx
index 7181ed2fdce6..7bf3ef10ff10 100644
--- a/extensions/source/oooimprovement/logstorage.cxx
+++ b/extensions/source/oooimprovement/logstorage.cxx
@@ -47,7 +47,7 @@ namespace
 {
     using namespace oooimprovement;
 
-    static const OUString CSSU_PATHSUB = OUString::createFromAscii("com.sun.star.util.PathSubstitution");
+    static const OUString CSSU_PATHSUB(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.PathSubstitution"));
 
     static OUString getLogPathFromCfg(const Reference<XMultiServiceFactory>& sf)
     {
@@ -63,14 +63,14 @@ namespace
 
     static bool isZipfile(const OUString& fileurl)
     {
-        static const OUString file_extension = OUString::createFromAscii(".zip");
+        static const OUString file_extension(RTL_CONSTASCII_USTRINGPARAM(".zip"));
         return fileurl.match(file_extension, fileurl.getLength()-file_extension.getLength());
     };
 
     static bool isLogfile(const OUString& fileurl)
     {
-        static const OUString file_extension = OUString::createFromAscii(".csv");
-        static const OUString current = OUString::createFromAscii("Current.csv");
+        static const OUString file_extension(RTL_CONSTASCII_USTRINGPARAM(".csv"));
+        static const OUString current(RTL_CONSTASCII_USTRINGPARAM("Current.csv"));
         return
             fileurl.match(file_extension, fileurl.getLength()-file_extension.getLength())
             && !fileurl.match(current, fileurl.getLength()-current.getLength());
@@ -84,7 +84,7 @@ namespace
     static Sequence<OUString> getAllLogStoragefiles(const Reference<XMultiServiceFactory>& sf)
     {
         Reference<XSimpleFileAccess> file_access(
-            sf->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")),
+            sf->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))),
             UNO_QUERY_THROW);
         return file_access->getFolderContents(
             getLogPathFromCfg(sf),
@@ -107,7 +107,7 @@ namespace
     static void assureLogStorageExists(const Reference<XMultiServiceFactory>& sf)
     {
         Reference<XSimpleFileAccess> file_access(
-            sf->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")),
+            sf->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))),
             UNO_QUERY_THROW);
         OUString log_path(getLogPathFromCfg(sf));
         if(!file_access->isFolder(log_path))
@@ -130,7 +130,7 @@ namespace oooimprovement
     void LogStorage::clear()
     {
         Reference<XSimpleFileAccess> file_access(
-            m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")),
+            m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))),
             UNO_QUERY_THROW);
         vector<OUString> files_to_kill = getLogStoragefiles(m_ServiceFactory, &isZipOrLogFile);
         for(vector<OUString>::iterator item = files_to_kill.begin();
diff --git a/extensions/source/oooimprovement/myconfigurationhelper.cxx b/extensions/source/oooimprovement/myconfigurationhelper.cxx
index d9ff3ecd03dc..b211fdb6756c 100644
--- a/extensions/source/oooimprovement/myconfigurationhelper.cxx
+++ b/extensions/source/oooimprovement/myconfigurationhelper.cxx
@@ -74,28 +74,28 @@ namespace oooimprovement
         sal_Int32 eMode)
     {
         Reference<XMultiServiceFactory> xConfigProvider(
-            xSMGR->createInstance(OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")),
+            xSMGR->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))),
             UNO_QUERY_THROW);
 
         vector<Any> lParams;
         css::beans::PropertyValue aParam;
 
         // set root path
-        aParam.Name = OUString::createFromAscii("nodepath");
+        aParam.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath"));
         aParam.Value <<= sPackage;
         lParams.push_back(makeAny(aParam));
 
         // enable all locales mode
         if ((eMode & MyConfigurationHelper::E_ALL_LOCALES)==MyConfigurationHelper::E_ALL_LOCALES)
         {
-            aParam.Name = OUString::createFromAscii("locale");
-            aParam.Value <<= OUString::createFromAscii("*");
+            aParam.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("locale"));
+            aParam.Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("*"));
             lParams.push_back(makeAny(aParam));
         }
 
         // enable lazy writing
         sal_Bool bLazy = ((eMode & MyConfigurationHelper::E_LAZY_WRITE)==MyConfigurationHelper::E_LAZY_WRITE);
-        aParam.Name = OUString::createFromAscii("lazywrite");
+        aParam.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("lazywrite"));
         aParam.Value = makeAny(bLazy);
         lParams.push_back(makeAny(aParam));
 
@@ -105,11 +105,11 @@ namespace oooimprovement
         sal_Bool bReadOnly = ((eMode & MyConfigurationHelper::E_READONLY)==MyConfigurationHelper::E_READONLY);
         if (bReadOnly)
             xCFG = xConfigProvider->createInstanceWithArguments(
-                OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")),
                 sequenceFromVector(lParams));
         else
             xCFG = xConfigProvider->createInstanceWithArguments(
-                OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess")),
                 sequenceFromVector(lParams));
         return xCFG;
     }
diff --git a/extensions/source/oooimprovement/onlogrotate_job.cxx b/extensions/source/oooimprovement/onlogrotate_job.cxx
index 18108df7629e..5407c4b6edf0 100644
--- a/extensions/source/oooimprovement/onlogrotate_job.cxx
+++ b/extensions/source/oooimprovement/onlogrotate_job.cxx
@@ -74,7 +74,7 @@ namespace
         {
             Config config(sf);
             Reference<XSimpleFileAccess> file_access(
-                sf->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")),
+                sf->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))),
                 UNO_QUERY_THROW);
             SoapSender sender(sf, config.getSoapUrl());
             OUString soap_id = config.getSoapId();
@@ -148,7 +148,7 @@ namespace oooimprovement
     OnLogRotateJob::OnLogRotateJob(const Reference<XComponentContext>& context)
         : m_ServiceFactory(Reference<XMultiServiceFactory>(
             context->getServiceManager()->createInstanceWithContext(
-                OUString::createFromAscii("com.sun.star.lang.XMultiServiceFactory"), context),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.XMultiServiceFactory")), context),
             UNO_QUERY))
     { }
 
@@ -186,12 +186,12 @@ namespace oooimprovement
     { return getSupportedServiceNames_static(); }
 
     OUString SAL_CALL OnLogRotateJob::getImplementationName_static()
-    { return OUString::createFromAscii("com.sun.star.comp.extensions.oooimprovement.OnLogRotateJob"); }
+    { return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.oooimprovement.OnLogRotateJob")); }
 
     Sequence<OUString> SAL_CALL OnLogRotateJob::getSupportedServiceNames_static()
     {
         Sequence<OUString> aServiceNames(1);
-        aServiceNames[0] = OUString::createFromAscii("com.sun.star.task.XAsyncJob");
+        aServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.XAsyncJob"));
         return aServiceNames;
     }
 
diff --git a/extensions/source/oooimprovement/soaprequest.cxx b/extensions/source/oooimprovement/soaprequest.cxx
index aad080ed9520..d4b1c8a2d85b 100644
--- a/extensions/source/oooimprovement/soaprequest.cxx
+++ b/extensions/source/oooimprovement/soaprequest.cxx
@@ -116,7 +116,7 @@ namespace
     static void writeFile(const Reference<XMultiServiceFactory>& sf, const Reference<XOutputStream>& target, const OUString& fileurl)
     {
         Reference<XSimpleFileAccess> file_access(
-            sf->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")),
+            sf->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))),
             UNO_QUERY);
         Reference<XInputStream> file = file_access->openFileRead(fileurl);
         const sal_Int32 bufsize = 3;
diff --git a/extensions/source/oooimprovement/soapsender.cxx b/extensions/source/oooimprovement/soapsender.cxx
index 17a3252fb608..8cb9c2e9104f 100644
--- a/extensions/source/oooimprovement/soapsender.cxx
+++ b/extensions/source/oooimprovement/soapsender.cxx
@@ -78,13 +78,13 @@ namespace oooimprovement
     void SoapSender::send(const SoapRequest& request) const
     {
         Reference<XTempFile> temp_file(
-            m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.io.TempFile")),
+            m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile"))),
             UNO_QUERY_THROW);
         Reference<XSimpleFileAccess> file_access(
-            m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")),
+            m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))),
             UNO_QUERY_THROW);
         Reference<XURLTransformer> url_trans(
-            m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.util.URLTransformer")),
+            m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))),
             UNO_QUERY_THROW);
 
         // writing request to tempfile
@@ -109,7 +109,7 @@ namespace oooimprovement
             oslSocketResult result = socket->connect(addr);
             if(result != osl_Socket_Ok)
                 throw RuntimeException(
-                    OUString::createFromAscii("unable to connect to SOAP server"),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("unable to connect to SOAP server")),
                     Reference<XInterface>());
         }
 
@@ -121,7 +121,7 @@ namespace oooimprovement
             const OString header = getHttpPostHeader(path_on_server.makeStringAndClear(), file_access->getSize(temp_file->getUri()));
             if(socket->write(header.getStr(), header.getLength()) != static_cast<sal_Int32>(header.getLength()))
                 throw RuntimeException(
-                    OUString::createFromAscii("error while sending HTTP header"),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("error while sending HTTP header")),
                     Reference<XInterface>());
         }
 
@@ -140,7 +140,7 @@ namespace oooimprovement
                     buf2[idx] = buf[idx];
                 if(socket->write(buf2, bytes_read) != bytes_read)
                     throw RuntimeException(
-                        OUString::createFromAscii("error while sending SOAP request"),
+                        OUString(RTL_CONSTASCII_USTRINGPARAM("error while sending SOAP request")),
                         Reference<XInterface>());
             } while(bytes_read == bufsize);
         }
@@ -154,7 +154,7 @@ namespace oooimprovement
             const sal_Int32 returncode_start = answer.indexOf(' ');
             if(returncode_start==-1 || !answer.copy(returncode_start, 4).equals(OString(" 200")))
                 throw RuntimeException(
-                    OUString::createFromAscii("SOAP server returns a error"),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("SOAP server returns a error")),
                     Reference<XInterface>());
         }
     }
diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx
index 4d6a109d57e5..5f295a13e76b 100644
--- a/extensions/source/plugin/base/context.cxx
+++ b/extensions/source/plugin/base/context.cxx
@@ -124,7 +124,7 @@ XPluginContext_Impl::~XPluginContext_Impl()
 
 void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target) throw( ::com::sun::star::plugin::PluginException, RuntimeException )
 {
-    Reference< XInterface >  xInst = m_xSMgr->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" ) );
+    Reference< XInterface >  xInst = m_xSMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) );
     if( ! xInst.is() )
         return;
 
@@ -151,7 +151,7 @@ void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlu
         try
         {
             ::com::sun::star::beans::PropertyValue aValue;
-            aValue.Name     = ::rtl::OUString::createFromAscii( "Referer" );
+            aValue.Name     = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
             aValue.Value <<= pPlugin->getRefererURL();
 
             Sequence< ::com::sun::star::beans::PropertyValue > aArgs( &aValue, 1 );
@@ -186,7 +186,7 @@ void XPluginContext_Impl::getURLNotify(const Reference< ::com::sun::star::plugin
 ::rtl::OUString XPluginContext_Impl::getUserAgent(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/)
     throw( ::com::sun::star::plugin::PluginException, RuntimeException )
 {
-    return ::rtl::OUString::createFromAscii( "Mozilla 3.0" );
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Mozilla 3.0"));
 }
 
 void XPluginContext_Impl::displayStatusText(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/, const ::rtl::OUString& /*message*/)
@@ -217,7 +217,7 @@ void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPl
         }
     }
 
-    Reference< XInterface > xInst = m_xSMgr->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" ) );
+    Reference< XInterface > xInst = m_xSMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) );
     if( ! xInst.is() )
         return ;
 
@@ -228,10 +228,10 @@ void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPl
         try
         {
             ::com::sun::star::beans::PropertyValue aValues[2];
-            aValues[0].Name = ::rtl::OUString::createFromAscii( "Referer" );
+            aValues[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
             aValues[0].Value <<= pPlugin->getRefererURL();
 
-            aValues[1].Name = ::rtl::OUString::createFromAscii( "PostString" );
+            aValues[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PostString"));
             aValues[1].Value <<= ::rtl::OStringToOUString( (char*)( file ? aBuf : buf ).getConstArray(), m_aEncoding );
             Sequence< ::com::sun::star::beans::PropertyValue > aArgs( aValues, 2 );
             Reference< ::com::sun::star::lang::XComponent >  xComp =
@@ -302,7 +302,7 @@ void FileSink::closeOutput() throw()
     if( fp )
         fclose( fp );
 
-    Reference< XInterface >  xInst = m_xSMgr->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" ) );
+    Reference< XInterface >  xInst = m_xSMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) );
     Reference< ::com::sun::star::frame::XComponentLoader >  xLoader( xInst, UNO_QUERY );
     XPlugin_Impl* pPlugin = XPluginManager_Impl::getPluginImplementation( m_xPlugin );
 
@@ -311,7 +311,7 @@ void FileSink::closeOutput() throw()
         try
         {
             ::com::sun::star::beans::PropertyValue aValue;
-            aValue.Name = ::rtl::OUString::createFromAscii( "Referer" );
+            aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
             aValue.Value <<= pPlugin->getRefererURL();
 
             Sequence< ::com::sun::star::beans::PropertyValue > aArgs( &aValue, 1 );
diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx
index 0ebee37244c9..9c0bd7dc1c7d 100644
--- a/extensions/source/plugin/base/manager.cxx
+++ b/extensions/source/plugin/base/manager.cxx
@@ -129,7 +129,7 @@ Sequence< ::rtl::OUString > XPluginManager_Impl::getSupportedServiceNames(void)
 Sequence< ::rtl::OUString > XPluginManager_Impl::getSupportedServiceNames_Static(void) throw(  )
 {
     Sequence< ::rtl::OUString > aSNS( 1 );
-    aSNS.getArray()[0] = ::rtl::OUString::createFromAscii( "com.sun.star.plugin.PluginManager" );
+    aSNS.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginManager"));
     return aSNS;
 }
 
diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx
index b378795a92f1..297f96a0a441 100644
--- a/extensions/source/plugin/base/nfuncs.cxx
+++ b/extensions/source/plugin/base/nfuncs.cxx
@@ -583,23 +583,6 @@ NPError SAL_CALL NP_LOADDS  NPN_GetValue( NPP instance, NPNVariable variable, vo
             *(NPBool*)value = false;
             break;
     }
-    /*
-    provisional code should there ever be NPNVariables that we actually
-    want to query from the PluginContext
-    ::rtl::OUString aValue;
-    try
-    {
-        pImpl->enterPluginCallback();
-        aValue = pImpl->getPluginContext()->
-            getValue( pImpl, (::com::sun::star::plugin::PluginVariable)variable );
-        pImpl->leavePluginCallback();
-    }
-    catch( ::com::sun::star::plugin::PluginException& e )
-    {
-        pImpl->leavePluginCallback();
-        return e.ErrorCode;
-    }
-    */
 
     return aResult;
 }
diff --git a/extensions/source/plugin/base/plmodel.cxx b/extensions/source/plugin/base/plmodel.cxx
index 9cd5cd0e79cc..775e25bd07ff 100644
--- a/extensions/source/plugin/base/plmodel.cxx
+++ b/extensions/source/plugin/base/plmodel.cxx
@@ -58,7 +58,7 @@ Any PluginModel::queryAggregation( const Type& type ) throw( RuntimeException )
 Sequence< ::rtl::OUString > PluginModel::getSupportedServiceNames_Static(void) throw()
 {
     Sequence< ::rtl::OUString > aSNS( 1 );
-    aSNS.getArray()[0] = ::rtl::OUString::createFromAscii( "com.sun.star.plugin.PluginModel" );
+    aSNS.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginModel"));
     return aSNS;
 }
 
@@ -190,7 +190,7 @@ void PluginModel::dispose(void) throw()
 // ::com::sun::star::io::XPersistObject
 ::rtl::OUString PluginModel::getServiceName() throw()
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.plugin.PluginModel" );
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginModel"));
 }
 
 void PluginModel::write(const Reference< ::com::sun::star::io::XObjectOutputStream > & OutStream) throw()
diff --git a/extensions/source/plugin/base/service.cxx b/extensions/source/plugin/base/service.cxx
index 1ce6dcc1a05c..51a79bdbc153 100644
--- a/extensions/source/plugin/base/service.cxx
+++ b/extensions/source/plugin/base/service.cxx
@@ -69,14 +69,14 @@ extern "C" {
             {
                 Reference< ::com::sun::star::registry::XRegistryKey > xKey( reinterpret_cast< ::com::sun::star::registry::XRegistryKey* >( pXUnoKey ) );
 
-                ::rtl::OUString aImplName = ::rtl::OUString::createFromAscii( "/" );
+                ::rtl::OUString aImplName (RTL_CONSTASCII_USTRINGPARAM("/"));
                 aImplName += XPluginManager_Impl::getImplementationName_Static();
-                aImplName += ::rtl::OUString::createFromAscii( "/UNO/SERVICES/com.sun.star.plugin.PluginManager" );
+                aImplName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES/com.sun.star.plugin.PluginManager"));
                 xKey->createKey( aImplName );
 
-                aImplName = ::rtl::OUString::createFromAscii( "/" );
+                aImplName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
                 aImplName += PluginModel::getImplementationName_Static();
-                aImplName += ::rtl::OUString::createFromAscii( "/UNO/SERVICES/com.sun.star.plugin.PluginModel" );
+                aImplName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES/com.sun.star.plugin.PluginModel"));
                 xKey->createKey( aImplName );
 
                 return sal_True;
diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx
index 8e8af63b94b8..7dd600266e41 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -461,7 +461,7 @@ OUString XPlugin_Impl::getCreationURL()
     uno::Reference< com::sun::star::beans::XPropertySet >  xPS( m_xModel, UNO_QUERY );
     if( xPS.is() )
     {
-        Any aValue = xPS->getPropertyValue( OUString::createFromAscii( "URL" ) );
+        Any aValue = xPS->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) );
         aValue >>= aRet;
     }
     return aRet;
@@ -649,9 +649,9 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype,
         {
             try
             {
-                xPS->setPropertyValue( OUString::createFromAscii( "URL" ), aAny );
+                xPS->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("URL")), aAny );
                 aAny <<= mimetype;
-                xPS->setPropertyValue( OUString::createFromAscii( "TYPE" ), aAny );
+                xPS->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE")), aAny );
             }
             catch(...)
             {
@@ -713,7 +713,7 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype,
              {
                  Any aAny;
                  aAny <<= m_aDescription.Mimetype;
-                 xPS->setPropertyValue( OUString::createFromAscii( "TYPE" ), aAny );
+                 xPS->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE")), aAny );
              }
              catch(...)
              {
@@ -723,22 +723,8 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype,
 
      // there may be plugins that can use the file length information,
      // but currently none are known. Since this file opening/seeking/closing
-     // is rather costly, it is #if'ed out. If there are plugins known to
+     // is rather costly, it is not implemented. If there are plugins known to
      // make use of the file length, simply put it in
-#if 0
-    if( isfile && ! length )
-    {
-        osl::File aFile( url );
-        if( aFile.open( OpenFlag_Read ) == FileBase::E_None )
-        {
-            aFile.setPos( Pos_End, 0 );
-            sal_uInt64 nPos = 0;
-            if( aFile.getPos( nPos ) == FileBase::E_None )
-                length = nPos;
-            aFile.close();
-        }
-    }
-#endif
 
      PluginInputStream* pStream = new PluginInputStream( this, aURL.getStr(),
                                                         length, lastmodified );
@@ -890,7 +876,7 @@ void XPlugin_Impl::setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_,
 
 PluginDescription XPlugin_Impl::fitDescription( const OUString& rURL )
 {
-    uno::Reference< XPluginManager >  xPMgr( m_xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.plugin.PluginManager" ) ), UNO_QUERY );
+    uno::Reference< XPluginManager >  xPMgr( m_xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginManager")) ), UNO_QUERY );
     if( !xPMgr.is() )
     {
         m_nProvidingState = PROVIDING_NONE;
@@ -1140,7 +1126,7 @@ PluginOutputStream::PluginOutputStream( XPlugin_Impl* pPlugin,
                                         sal_uInt32 len,
                                         sal_uInt32 lastmod ) :
         PluginStream( pPlugin, url, len, lastmod ),
-        m_xStream( pPlugin->getServiceManager()->createInstance( OUString::createFromAscii( "com.sun.star.io.DataOutputStream" ) ), UNO_QUERY )
+        m_xStream( pPlugin->getServiceManager()->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataOutputStream")) ), UNO_QUERY )
 {
     Guard< Mutex > aGuard( m_pPlugin->getMutex() );
 
diff --git a/extensions/source/plugin/unx/npnapi.cxx b/extensions/source/plugin/unx/npnapi.cxx
index 6e862f67b2c0..d4cb19e3bce0 100644
--- a/extensions/source/plugin/unx/npnapi.cxx
+++ b/extensions/source/plugin/unx/npnapi.cxx
@@ -340,27 +340,6 @@ static const char* l_NPN_UserAgent( NPP instance )
     return pAgent;
 }
 
-#if 0
-static void l_NPN_Version( int* major, int* minor, int* net_major, int* net_minor )
-{
-    MediatorMessage* pMes = pConnector->
-        Transact( eNPN_Version,
-                  NULL );
-
-    if( ! pMes )
-        return;
-
-    *major = pMes->GetUINT32();
-    *minor = pMes->GetUINT32();
-    *net_major = pMes->GetUINT32();
-    *net_minor = pMes->GetUINT32();
-
-    medDebug( 1, "pluginapp: NPN_Version: results %d %d, %d %d\n", *major, *minor, *net_major, *net_minor );
-
-    delete pMes;
-}
-#endif
-
 static int32 l_NPN_Write( NPP instance, NPStream* stream, int32 len, void* buffer )
 {
     UINT32 nFileID = pConnector->GetStreamID( stream );
diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx
index 0ecd12b65ff7..20c91bfba8b8 100644
--- a/extensions/source/plugin/unx/unxmgr.cxx
+++ b/extensions/source/plugin/unx/unxmgr.cxx
@@ -308,7 +308,7 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th
         // create return value
         aDescriptions = Sequence<PluginDescription>( aPlugins.size() );
 #if OSL_DEBUG_LEVEL > 1
-        fprintf( stderr, "found %d plugins\n", aPlugins.size() );
+        fprintf( stderr, "found %" SAL_PRI_SIZET "u plugins\n", aPlugins.size() );
 #endif
         list<PluginDescription*>::iterator iter;
         for( iter = aPlugins.begin(), i=0; iter != aPlugins.end(); ++iter ,i++ )
diff --git a/extensions/source/plugin/win/winmgr.cxx b/extensions/source/plugin/win/winmgr.cxx
index db90cfbf7a45..8ebb7484271a 100644
--- a/extensions/source/plugin/win/winmgr.cxx
+++ b/extensions/source/plugin/win/winmgr.cxx
@@ -422,7 +422,7 @@ Sequence< PluginDescription > XPluginManager_Impl::impl_getPluginDescriptions(vo
                         rDescr.Description = aComment;
 
                         sal_Int32 nPos = 0, nLen = aExtToken.getLength();
-                        OUString aExtensions( OUString::createFromAscii( nLen ? "*." : "*.*" ) );
+                        OUString aExtensions(nLen ?  RTL_CONSTASCII_USTRINGPARAM( "*.") : RTL_CONSTASCII_USTRINGPARAM( "*.*" ) );
 
                         for ( ; nPos < nLen; ++nPos )
                         {
@@ -431,7 +431,7 @@ Sequence< PluginDescription > XPluginManager_Impl::impl_getPluginDescriptions(vo
                             {
                             case ',':
                             case ';':
-                                aExtensions += OUString::createFromAscii( ";*." );
+                                aExtensions += OUString(RTL_CONSTASCII_USTRINGPARAM(";*."));
                             case ' ':
                                 break;
                             case '*':
diff --git a/extensions/source/preload/oemwiz.cxx b/extensions/source/preload/oemwiz.cxx
index 9264205d7ae0..e50a7426918f 100644
--- a/extensions/source/preload/oemwiz.cxx
+++ b/extensions/source/preload/oemwiz.cxx
@@ -74,9 +74,7 @@ namespace preload
         }
         void WriteUserData();
     };
-/* -----------------------------14.11.2001 11:33------------------------------
 
- ---------------------------------------------------------------------------*/
     OEMPreloadDialog_Impl::OEMPreloadDialog_Impl(OEMPreloadDialog* pDialog)
         {
             SfxItemPool& rPool = SFX_APP()->GetPool();
@@ -93,18 +91,13 @@ namespace preload
             pWelcomePage = new OEMWelcomeTabPage(pDialog);
             pLicensePage = new OEMLicenseTabPage(pDialog);
         }
-/* -----------------------------14.11.2001 11:33------------------------------
 
- ---------------------------------------------------------------------------*/
         void OEMPreloadDialog_Impl::WriteUserData()
         {
             if ( pUserDataPage )
                 ((SfxTabPage*)pUserDataPage)->FillItemSet(*pSet);
         }
 
-/* -----------------------------14.11.2001 11:33------------------------------
-
- ---------------------------------------------------------------------------*/
     //=====================================================================
     //= OEMPreloadDialog
     //=====================================================================
@@ -144,16 +137,12 @@ namespace preload
               SetPage( OEM_USERDATA, pImpl->pUserDataPage );
           ShowPage( OEM_WELCOME );
     }
-/* -----------------------------14.11.2001 11:33------------------------------
 
- ---------------------------------------------------------------------------*/
     OEMPreloadDialog::~OEMPreloadDialog( )
     {
         delete pImpl;
     }
-/* -----------------------------14.11.2001 11:33------------------------------
 
- ---------------------------------------------------------------------------*/
     IMPL_LINK(OEMPreloadDialog, NextPrevPageHdl, PushButton*, pButton)
     {
         if(pButton == &aPrevPB)
@@ -191,9 +180,7 @@ namespace preload
         aPrevPB.Enable(GetCurLevel() != OEM_WELCOME);
         return 0;
     }
-/* -----------------------------14.11.2001 11:33------------------------------
 
- ---------------------------------------------------------------------------*/
     sal_Bool OEMPreloadDialog::LoadFromLocalFile(const String& rFileName, String& rContent)
     {
         SvtPathOptions aPathOpt;
@@ -224,24 +211,17 @@ namespace preload
         aCancelPB.SetText(rText);
     }
 
-/* -----------------------------13.11.2001 12:29------------------------------
-
- ---------------------------------------------------------------------------*/
     OEMWelcomeTabPage::OEMWelcomeTabPage(Window* pParent) :
         TabPage(pParent, ModuleRes(RID_TP_WELCOME)),
         aInfoFT(this, ModuleRes(FT_INFO))
     {
         FreeResource();
     }
-/* -----------------------------13.11.2001 12:30------------------------------
 
- ---------------------------------------------------------------------------*/
     OEMWelcomeTabPage::~OEMWelcomeTabPage()
     {
     }
-/* -----------------------------13.11.2001 12:29------------------------------
 
- ---------------------------------------------------------------------------*/
     OEMLicenseTabPage::OEMLicenseTabPage(OEMPreloadDialog* pParent) :
         TabPage(pParent, ModuleRes(RID_TP_LICENSE)),
         aLicenseML(this, ModuleRes(ML_LICENSE)),
@@ -278,15 +258,11 @@ namespace preload
         aText.SearchAndReplaceAll( UniString::CreateFromAscii("%PAGEDOWN"), aPBPageDown.GetText() );
         aInfo2FT.SetText( aText );
     }
-/* -----------------------------13.11.2001 12:30------------------------------
 
- ---------------------------------------------------------------------------*/
     OEMLicenseTabPage::~OEMLicenseTabPage()
     {
     }
-/* ---------------------------14.11.2001 11:24----------------------------
 
-    -----------------------------------------------------------------------*/
     void OEMLicenseTabPage::ActivatePage()
     {
         if(!aLicenseML.GetText().Len())
diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
index b84319c47ad3..2b77ee5833fa 100644
--- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
+++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
@@ -74,7 +74,7 @@ namespace pcr
     //---------------------------------------------------------------------
     ::rtl::OUString MasterDetailLinkDialog::getImplementationName_static() throw(RuntimeException)
     {
-        return ::rtl::OUString::createFromAscii("org.openoffice.comp.form.ui.MasterDetailLinkDialog");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.form.ui.MasterDetailLinkDialog"));
     }
 
     //---------------------------------------------------------------------
@@ -87,7 +87,7 @@ namespace pcr
     ::comphelper::StringSequence MasterDetailLinkDialog::getSupportedServiceNames_static() throw(RuntimeException)
     {
         ::comphelper::StringSequence aSupported(1);
-        aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.form.MasterDetailLinkDialog");
+        aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.MasterDetailLinkDialog"));
         return aSupported;
     }
 
diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx
index ad43e61ca7f9..2a9ea8c493e8 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -413,7 +413,7 @@ namespace pcr
     }
 
     //------------------------------------------------------------------
-    void OBrowserLine::impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage, Image& _out_rHCImage )
+    void OBrowserLine::impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage )
     {
         try
         {
@@ -425,24 +425,7 @@ namespace pcr
             aMediaProperties[0].Value <<= _rImageURL;
 
             Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ), UNO_QUERY_THROW );
-            _out_rImage = _out_rHCImage = Image( xGraphic );
-
-            // see if we find an HC version beside the normal graphic
-            INetURLObject aURL( _rImageURL );
-            ::rtl::OUString sBaseName( aURL.getBase() );
-            aURL.setBase( sBaseName + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_hc" ) ) );
-            ::rtl::OUString sHCImageURL( aURL.GetMainURL( INetURLObject::NO_DECODE ) );
-
-            Reference< XGraphic > xHCGraphic;
-            try
-            {
-                aMediaProperties[0].Value <<= sHCImageURL;
-                xHCGraphic = xGraphicProvider->queryGraphic( aMediaProperties );
-            }
-            catch( const Exception& ) { }
-
-            if ( xHCGraphic.is() )
-                _out_rHCImage = Image( xHCGraphic );
+            _out_rImage = Image( xGraphic );
         }
         catch( const Exception& )
         {
@@ -456,12 +439,11 @@ namespace pcr
         PushButton& rButton( impl_ensureButton( _bPrimary ) );
 
         OSL_PRECOND( _rImageURL.getLength(), "OBrowserLine::ShowBrowseButton: use the other version if you don't have an image!" );
-        Image aImage, aHCImage;
-        impl_getImagesFromURL_nothrow( _rImageURL, aImage, aHCImage );
+        Image aImage;
+        impl_getImagesFromURL_nothrow( _rImageURL, aImage );
 
-        rButton.SetModeImage( aImage, BMP_COLOR_NORMAL );
-        rButton.SetModeImage( aHCImage, BMP_COLOR_HIGHCONTRAST );
-    }
+        rButton.SetModeImage( aImage );
+   }
 
     //------------------------------------------------------------------
     void OBrowserLine::ShowBrowseButton( const Image& _rImage, sal_Bool _bPrimary )
diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx
index fd091c712e78..37a6a1f6a389 100644
--- a/extensions/source/propctrlr/browserline.hxx
+++ b/extensions/source/propctrlr/browserline.hxx
@@ -79,7 +79,7 @@ namespace pcr
                             ~OBrowserLine();
 
         void setControl( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl );
-        const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& getControl()
+        const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& getControl() const
         {
             return m_xControl;
         }
@@ -131,7 +131,7 @@ namespace pcr
         void    impl_layoutComponents();
 
         PushButton& impl_ensureButton( bool _bPrimary );
-        void        impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage, Image& _out_rHCImage );
+        void        impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage );
     };
 
 //............................................................................
diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx
index 90c729b01ab7..c08fba0e5fb9 100644
--- a/extensions/source/propctrlr/browserview.hxx
+++ b/extensions/source/propctrlr/browserview.hxx
@@ -33,7 +33,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <vcl/window.hxx>
 #include <tools/resid.hxx>
-// #95343# --------------------
 #include <com/sun/star/awt/Size.hpp>
 
 //............................................................................
@@ -74,7 +73,6 @@ namespace pcr
         void    setPageActivationHandler(const Link& _rHdl) { m_aPageActivationHandler = _rHdl; }
         Link    getPageActivationHandler() const { return m_aPageActivationHandler; }
 
-        // #95343# ------------------
         ::com::sun::star::awt::Size getMinimumSize();
 
     protected:
diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx
index fbe64bf1bd30..508d13ca6552 100644
--- a/extensions/source/propctrlr/controlfontdialog.cxx
+++ b/extensions/source/propctrlr/controlfontdialog.cxx
@@ -97,7 +97,7 @@ namespace pcr
     //---------------------------------------------------------------------
     ::rtl::OUString OControlFontDialog::getImplementationName_static() throw(RuntimeException)
     {
-        return ::rtl::OUString::createFromAscii("org.openoffice.comp.form.ui.OControlFontDialog");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.form.ui.OControlFontDialog"));
     }
 
     //---------------------------------------------------------------------
@@ -110,7 +110,7 @@ namespace pcr
     ::comphelper::StringSequence OControlFontDialog::getSupportedServiceNames_static() throw(RuntimeException)
     {
         ::comphelper::StringSequence aSupported(1);
-        aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.form.ControlFontDialog");
+        aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.ControlFontDialog"));
         return aSupported;
     }
 
diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx
index 3fd14196537a..1cf3c9dc86e2 100644
--- a/extensions/source/propctrlr/defaultforminspection.cxx
+++ b/extensions/source/propctrlr/defaultforminspection.cxx
@@ -102,14 +102,14 @@ namespace pcr
     //------------------------------------------------------------------------
     ::rtl::OUString DefaultFormComponentInspectorModel::getImplementationName_static(  ) throw(RuntimeException)
     {
-        return ::rtl::OUString::createFromAscii( "org.openoffice.comp.extensions.DefaultFormComponentInspectorModel");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.extensions.DefaultFormComponentInspectorModel"));
     }
 
     //------------------------------------------------------------------------
     Sequence< ::rtl::OUString > DefaultFormComponentInspectorModel::getSupportedServiceNames_static(  ) throw(RuntimeException)
     {
         Sequence< ::rtl::OUString > aSupported(1);
-        aSupported[0] = ::rtl::OUString::createFromAscii( "com.sun.star.form.inspection.DefaultFormComponentInspectorModel" );
+        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.inspection.DefaultFormComponentInspectorModel"));
         return aSupported;
     }
 
diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx
index f9d9fd8f5967..179eef90a819 100644
--- a/extensions/source/propctrlr/defaulthelpprovider.cxx
+++ b/extensions/source/propctrlr/defaulthelpprovider.cxx
@@ -90,14 +90,14 @@ namespace pcr
     //------------------------------------------------------------------------
     ::rtl::OUString DefaultHelpProvider::getImplementationName_static(  ) throw(RuntimeException)
     {
-        return ::rtl::OUString::createFromAscii( "org.openoffice.comp.extensions.DefaultHelpProvider");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.extensions.DefaultHelpProvider"));
     }
 
     //------------------------------------------------------------------------
     Sequence< ::rtl::OUString > DefaultHelpProvider::getSupportedServiceNames_static(  ) throw(RuntimeException)
     {
         Sequence< ::rtl::OUString > aSupported(1);
-        aSupported[0] = ::rtl::OUString::createFromAscii( "com.sun.star.inspection.DefaultHelpProvider" );
+        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.inspection.DefaultHelpProvider"));
         return aSupported;
     }
 
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index 08aaa69b37cb..92eb90251607 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -447,9 +447,9 @@ namespace pcr
 
         Any aRet;
         Sequence< PropertyValue > aScriptDescriptor( 2 );
-        aScriptDescriptor[0].Name = ::rtl::OUString::createFromAscii( "EventType" );
+        aScriptDescriptor[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EventType"));
         aScriptDescriptor[0].Value <<= aDescriptor.ScriptType;
-        aScriptDescriptor[1].Name = ::rtl::OUString::createFromAscii( "Script" );
+        aScriptDescriptor[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Script"));
         aScriptDescriptor[1].Value <<= aDescriptor.ScriptCode;
 
         return makeAny( aScriptDescriptor );
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index c5eb86be632c..63dac91d9b7f 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -383,8 +383,8 @@ namespace pcr
                     // StringItemList?
                     else if( eType == TypeClass_SEQUENCE )
                     {
-                        static ::rtl::OUString aDot = ::rtl::OUString::createFromAscii( "." );
-                        static ::rtl::OUString aEsc = ::rtl::OUString::createFromAscii( "&" );
+                        static ::rtl::OUString aDot(RTL_CONSTASCII_USTRINGPARAM("."));
+                        static ::rtl::OUString aEsc(RTL_CONSTASCII_USTRINGPARAM("&"));
 
                         // Put strings into resource using new ids
                         Sequence< ::rtl::OUString > aNewStrings;
@@ -1424,7 +1424,7 @@ namespace pcr
             aDescriptor.HasSecondaryButton = sal_True;
 
         bool bIsDataProperty = ( nPropertyUIFlags & PROP_FLAG_DATA_PROPERTY ) != 0;
-        aDescriptor.Category = ::rtl::OUString::createFromAscii( bIsDataProperty ? "Data" : "General" );
+        aDescriptor.Category = bIsDataProperty ? ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Data")) : ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("General"));
         return aDescriptor;
     }
 
@@ -2785,8 +2785,9 @@ namespace pcr
 
         aFileDlg.SetTitle(aStrTrans);
         // non-linked images ( e.g. those located in the document
-        // stream ) cannot *currently* be handled by openoffice basic dialogs.
-        bool bHandleNonLink = ( m_eComponentClass == eFormControl );
+        // stream ) only if document is available
+        Reference< XModel > xModel( impl_getContextDocument_nothrow() );
+        bool bHandleNonLink = xModel.is();
 
         Reference< XFilePickerControlAccess > xController(aFileDlg.GetFilePicker(), UNO_QUERY);
         DBG_ASSERT(xController.is(), "FormComponentPropertyHandler::impl_browseForImage_nothrow: missing the controller interface on the file picker!");
diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx
index 14a4d6465bfc..9e6667baf5ff 100644
--- a/extensions/source/propctrlr/formcontroller.cxx
+++ b/extensions/source/propctrlr/formcontroller.cxx
@@ -145,14 +145,14 @@ namespace pcr
     //------------------------------------------------------------------------
     ::rtl::OUString FormController::getImplementationName_static(  ) throw(RuntimeException)
     {
-        return ::rtl::OUString::createFromAscii("org.openoffice.comp.extensions.FormController");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.extensions.FormController"));
     }
 
     //------------------------------------------------------------------------
     Sequence< ::rtl::OUString > FormController::getSupportedServiceNames_static(  ) throw(RuntimeException)
     {
         Sequence< ::rtl::OUString > aSupported(1);
-        aSupported[0] = ::rtl::OUString::createFromAscii( "com.sun.star.form.PropertyBrowserController" );
+        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.PropertyBrowserController"));
         return aSupported;
     }
 
@@ -273,14 +273,14 @@ namespace pcr
     //------------------------------------------------------------------------
     ::rtl::OUString DialogController::getImplementationName_static(  ) throw(RuntimeException)
     {
-        return ::rtl::OUString::createFromAscii("org.openoffice.comp.extensions.DialogController");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.extensions.DialogController"));
     }
 
     //------------------------------------------------------------------------
     Sequence< ::rtl::OUString > DialogController::getSupportedServiceNames_static(  ) throw(RuntimeException)
     {
         Sequence< ::rtl::OUString > aSupported(1);
-        aSupported[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.PropertyBrowserController" );
+        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.PropertyBrowserController"));
         return aSupported;
     }
 
diff --git a/extensions/source/propctrlr/formlocalid.hrc b/extensions/source/propctrlr/formlocalid.hrc
index dca59a024321..708a1dbc2211 100644
--- a/extensions/source/propctrlr/formlocalid.hrc
+++ b/extensions/source/propctrlr/formlocalid.hrc
@@ -33,7 +33,5 @@
 
 #define IMG_PLUS        1
 #define IMG_MINUS       2
-#define IMG_PLUS_HC     3
-#define IMG_MINUS_HC    4
 
 #endif // _EXTENSIONS_PROPCTRLR_FORMLOCALID_HRC_
diff --git a/extensions/source/propctrlr/formresid.hrc b/extensions/source/propctrlr/formresid.hrc
index 0aeab5306da9..2ab294754a9d 100644
--- a/extensions/source/propctrlr/formresid.hrc
+++ b/extensions/source/propctrlr/formresid.hrc
@@ -308,7 +308,6 @@
 // - ImageLists
 
 #define RID_IL_FORMEXPLORER                 ( RID_PROPCONTROLLER_START +  0 )
-#define RID_IL_FORMEXPLORER_HC              ( RID_PROPCONTROLLER_START +  1 )
 
 // -----------------------------------------------------------------------
 // - untyped resources
diff --git a/extensions/source/propctrlr/pcr.xml b/extensions/source/propctrlr/pcr.xml
index 3507a452d056..abd86572fc6b 100644
--- a/extensions/source/propctrlr/pcr.xml
+++ b/extensions/source/propctrlr/pcr.xml
@@ -4,7 +4,7 @@
   <module-name>pcr</module-name>
 
   <component-description>
-    <author>Frank Sch&ouml;nheit</author>
+    <author>Frank Sch&#246;nheit</author>
     <name>org.openoffice.comp.form.ui.OTabOrderDialog</name>
     <description></description>
     <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
@@ -14,7 +14,7 @@
   </component-description>
 
   <component-description>
-    <author>Frank Sch&ouml;nheit</author>
+    <author>Frank Sch&#246;nheit</author>
     <name>org.openoffice.comp.form.ControlFontDialog</name>
     <description></description>
     <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
@@ -24,7 +24,7 @@
   </component-description>
 
   <component-description>
-    <author>Frank Sch&ouml;nheit</author>
+    <author>Frank Sch&#246;nheit</author>
     <name>com.sun.star.comp.extensions.FormComponentPropertyHandler</name>
     <description></description>
     <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
@@ -34,7 +34,7 @@
   </component-description>
 
   <component-description>
-    <author>Frank Sch&ouml;nheit</author>
+    <author>Frank Sch&#246;nheit</author>
     <name>com.sun.star.comp.extensions.EFormsPropertyHandler</name>
     <description></description>
     <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
@@ -44,7 +44,7 @@
   </component-description>
 
   <component-description>
-    <author>Frank Sch&ouml;nheit</author>
+    <author>Frank Sch&#246;nheit</author>
     <name>com.sun.star.comp.extensions.EditPropertyHandler</name>
     <description></description>
     <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
@@ -54,7 +54,7 @@
   </component-description>
 
   <component-description>
-    <author>Frank Sch&ouml;nheit</author>
+    <author>Frank Sch&#246;nheit</author>
     <name>org.openoffice.comp.extensions.ObjectInspector</name>
     <description></description>
     <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
@@ -64,7 +64,7 @@
   </component-description>
 
   <component-description>
-    <author>Frank Sch&ouml;nheit</author>
+    <author>Frank Sch&#246;nheit</author>
     <name>org.openoffice.comp.extensions.ObjectInspectorModel</name>
     <description></description>
     <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
@@ -74,7 +74,7 @@
   </component-description>
 
   <component-description>
-    <author>Frank Sch&ouml;nheit</author>
+    <author>Frank Sch&#246;nheit</author>
     <name>org.openoffice.comp.extensions.FormController</name>
     <description></description>
     <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
@@ -84,7 +84,7 @@
   </component-description>
 
   <component-description>
-    <author>Frank Sch&ouml;nheit</author>
+    <author>Frank Sch&#246;nheit</author>
     <name>com.sun.star.comp.extensions.GenericPropertyHandler</name>
     <description></description>
     <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
@@ -94,7 +94,7 @@
   </component-description>
 
   <component-description>
-    <author>Frank Sch&ouml;nheit</author>
+    <author>Frank Sch&#246;nheit</author>
     <name>com.sun.star.comp.extensions.EventHandler</name>
     <description></description>
     <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
@@ -104,7 +104,7 @@
   </component-description>
 
   <component-description>
-    <author>Frank Sch&ouml;nheit</author>
+    <author>Frank Sch&#246;nheit</author>
     <name>com.sun.star.comp.extensions.XSDValidationPropertyHandler</name>
     <description></description>
     <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
@@ -114,7 +114,7 @@
   </component-description>
 
   <component-description>
-    <author>Frank Sch&ouml;nheit</author>
+    <author>Frank Sch&#246;nheit</author>
     <name>com.sun.star.comp.extensions.CellBindingPropertyHandler</name>
     <description></description>
     <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
@@ -124,7 +124,7 @@
   </component-description>
 
   <component-description>
-    <author>Frank Sch&ouml;nheit</author>
+    <author>Frank Sch&#246;nheit</author>
     <name>com.sun.star.comp.extensions.ButtonNavigationHandler</name>
     <description></description>
     <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
@@ -134,7 +134,7 @@
   </component-description>
 
   <component-description>
-    <author>Frank Sch&ouml;nheit</author>
+    <author>Frank Sch&#246;nheit</author>
     <name>com.sun.star.comp.extensions.DefaultFormComponentInspectorModel</name>
     <description></description>
     <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
diff --git a/extensions/source/propctrlr/pcrmiscres.src b/extensions/source/propctrlr/pcrmiscres.src
index d547b52ed5ea..98f30c30a12d 100644
--- a/extensions/source/propctrlr/pcrmiscres.src
+++ b/extensions/source/propctrlr/pcrmiscres.src
@@ -48,14 +48,6 @@ Resource RID_RSC_BUTTON_IMAGES
     {
         ImageBitmap = Bitmap{ file = "buttonminus.png"; };
     };
-    Image IMG_PLUS_HC
-    {
-        ImageBitmap = Bitmap{ file = "buttonplus_hc.png"; };
-    };
-    Image IMG_MINUS_HC
-    {
-        ImageBitmap = Bitmap{ file = "buttonminus_hc.png"; };
-    };
 };
 
 #define IMAGE_IDS \
@@ -100,13 +92,6 @@ ImageList RID_IL_FORMEXPLORER
     IMAGE_IDS;
 };
 
-ImageList RID_IL_FORMEXPLORER_HC
-{
-    Prefix = "sxh";
-    MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
-    IMAGE_IDS;
-};
-
 String RID_STR_PROPTITLE_PUSHBUTTON
 {
     Text [ en-US ] = "Button" ;
diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx
index f02be18b2f3b..20470e4ef802 100644
--- a/extensions/source/propctrlr/pcrunodialogs.cxx
+++ b/extensions/source/propctrlr/pcrunodialogs.cxx
@@ -97,7 +97,7 @@ namespace pcr
     //---------------------------------------------------------------------
     ::rtl::OUString OTabOrderDialog::getImplementationName_static() throw(RuntimeException)
     {
-        return ::rtl::OUString::createFromAscii( "org.openoffice.comp.form.ui.OTabOrderDialog" );
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.form.ui.OTabOrderDialog"));
     }
 
     //---------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 50a6ed66bd65..657b1f2e9955 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -375,7 +375,7 @@ namespace pcr
         ::osl::MutexGuard aGuard( m_aMutex );
 
         if (_rxFrame.is() && haveView())
-            throw RuntimeException(::rtl::OUString::createFromAscii("Unable to attach to a second frame."),*this);
+            throw RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unable to attach to a second frame.")),*this);
 
         // revoke as focus listener from the old container window
         stopContainerWindowListening();
@@ -391,7 +391,7 @@ namespace pcr
         VCLXWindow* pContainerWindow = VCLXWindow::GetImplementation(xContainerWindow);
         Window* pParentWin = pContainerWindow ? pContainerWindow->GetWindow() : NULL;
         if (!pParentWin)
-            throw RuntimeException(::rtl::OUString::createFromAscii("The frame is invalid. Unable to extract the container window."),*this);
+            throw RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The frame is invalid. Unable to extract the container window.")),*this);
 
         if ( Construct( pParentWin ) )
         {
@@ -597,14 +597,14 @@ namespace pcr
     //------------------------------------------------------------------------
     ::rtl::OUString OPropertyBrowserController::getImplementationName_static(  ) throw(RuntimeException)
     {
-        return ::rtl::OUString::createFromAscii("org.openoffice.comp.extensions.ObjectInspector");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.extensions.ObjectInspector"));
     }
 
     //------------------------------------------------------------------------
     Sequence< ::rtl::OUString > OPropertyBrowserController::getSupportedServiceNames_static(  ) throw(RuntimeException)
     {
         Sequence< ::rtl::OUString > aSupported(1);
-        aSupported[0] = ::rtl::OUString::createFromAscii( "com.sun.star.inspection.ObjectInspector" );
+        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.inspection.ObjectInspector"));
         return aSupported;
     }
 
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 8279dddd4356..5dea67099f86 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -590,7 +590,7 @@ namespace pcr
             // everything which survived the checks above should result in a factor of 1, i.e.,
             // it should have a direct counterpart as FieldUnit
             throw RuntimeException();
-        getTypedControlWindow()->SetUnit( eFieldUnit );
+        getTypedControlWindow()->MetricFormatter::SetUnit( eFieldUnit );
     }
 
     //--------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index c21539e43d13..61dc96f287d7 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -106,9 +106,7 @@ namespace pcr
         aPB_OK.SetClickHdl( LINK( this, TabOrderDialog, OKClickHdl ) );
         aPB_OK.Disable();
 
-        sal_Bool bIsHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-        pImageList = new ImageList( PcrRes( bIsHighContrast ? RID_IL_FORMEXPLORER_HC : RID_IL_FORMEXPLORER ) );
-
+        pImageList = new ImageList( PcrRes( RID_IL_FORMEXPLORER ) );
 
         if ( m_xModel.is() )
             m_xTempModel = new OSimpleTabModel( m_xModel->getControlModels() );
@@ -302,9 +300,7 @@ namespace pcr
         }
 
         // TODO: UNO action (to bracket all the single actions which are being created)
-//        pDrawModel->BegUndo(PcrRes(RID_STR_UNDO_TABORDER));
         m_xModel->setControlModels( aSortedControlModelSeq );
-//        pDrawModel->EndUndo();
 
         EndDialog( sal_True );
         return 0;
diff --git a/extensions/source/resource/resource.cxx b/extensions/source/resource/resource.cxx
index e5a61e69e376..8ebea6dc85d3 100644
--- a/extensions/source/resource/resource.cxx
+++ b/extensions/source/resource/resource.cxx
@@ -172,7 +172,7 @@ Reference< XInvocation > ResourceService::getDefaultInvocation() const
     /* f�hrt zur Zeit noch zu einer rekursion
     if( xSMgr.is() )
     {
-        Reference< XSingleServiceFactory > xFact( xSMgr->createInstance( OUString::createFromAscii("com.sun.star.script.Invocation") ), UNO_QUERY );
+        Reference< XSingleServiceFactory > xFact( xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Invocation")) ), UNO_QUERY );
         if( xFact.is() )
         {
             Sequence< Any > aArgs( 1 );
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx
index d6df2a30644a..9c2bf4a4ac45 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -160,7 +160,6 @@ SANE_Status Sane::ControlOption( int nOption, SANE_Action nAction,
                  pAction );
     }
 #endif
-//  if( nInfo & ( SANE_INFO_RELOAD_OPTIONS | SANE_INFO_RELOAD_PARAMS ) )
     if( nInfo &  SANE_INFO_RELOAD_OPTIONS )
         ReloadOptions();
     return nStatus;
@@ -188,17 +187,17 @@ Sane::~Sane()
 
 void Sane::Init()
 {
-    ::rtl::OUString sSaneLibName( ::rtl::OUString::createFromAscii( "libsane" SAL_DLLEXTENSION ) );
+    ::rtl::OUString sSaneLibName( RTL_CONSTASCII_USTRINGPARAM( "libsane" SAL_DLLEXTENSION ) );
     pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY );
     if( ! pSaneLib )
     {
-        sSaneLibName = ::rtl::OUString::createFromAscii( "libsane" SAL_DLLEXTENSION ".1" );
+        sSaneLibName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "libsane" SAL_DLLEXTENSION ".1" ));
         pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY );
     }
     // try reasonable places that might not be in the library search path
     if( ! pSaneLib )
     {
-        ::rtl::OUString sSaneLibSystemPath( ::rtl::OUString::createFromAscii( "/usr/local/lib/libsane" SAL_DLLEXTENSION ) );
+        ::rtl::OUString sSaneLibSystemPath( RTL_CONSTASCII_USTRINGPARAM( "/usr/local/lib/libsane" SAL_DLLEXTENSION ) );
         osl_getFileURLFromSystemPath( sSaneLibSystemPath.pData, &sSaneLibName.pData );
         pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY );
     }
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index 0ab5a1271b0f..d1e8ed07ad58 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -743,21 +743,23 @@ void SaneDlg::AcquirePreview()
     maReslBox.SetValue( (ULONG)fResl );
 
     if( mbDragEnable )
+    {
         maPreviewRect = Rectangle( maTopLeft,
                                    Size( maBottomRight.X() - maTopLeft.X(),
                                          maBottomRight.Y() - maTopLeft.Y() )
                                    );
+    }
     else
     {
         Size aBMSize( maPreviewBitmap.GetSizePixel() );
-        if( aBMSize.Width() > aBMSize.Height() )
+        if( aBMSize.Width() > aBMSize.Height() && aBMSize.Width() )
         {
             int nVHeight = (maBottomRight.X() - maTopLeft.X()) * aBMSize.Height() / aBMSize.Width();
             maPreviewRect = Rectangle( Point( maTopLeft.X(), ( maTopLeft.Y() + maBottomRight.Y() )/2 - nVHeight/2 ),
                                        Size( maBottomRight.X() - maTopLeft.X(),
                                              nVHeight ) );
         }
-        else
+        else if (aBMSize.Height())
         {
             int nVWidth = (maBottomRight.Y() - maTopLeft.Y()) * aBMSize.Width() / aBMSize.Height();
             maPreviewRect = Rectangle( Point( ( maTopLeft.X() + maBottomRight.X() )/2 - nVWidth/2, maTopLeft.Y() ),
diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx
index 7043c3d9a971..3b26c18afe52 100644
--- a/extensions/source/scanner/scanunx.cxx
+++ b/extensions/source/scanner/scanunx.cxx
@@ -268,7 +268,7 @@ SEQ( ScannerContext ) ScannerManager::getAvailableScanners() throw()
     if( Sane::IsSane() )
     {
         SEQ( ScannerContext ) aRet(1);
-        aRet.getArray()[0].ScannerName      = ::rtl::OUString::createFromAscii( "SANE" );
+        aRet.getArray()[0].ScannerName      = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SANE"));
         aRet.getArray()[0].InternalData     = 0;
         return aRet;
     }
@@ -289,7 +289,7 @@ BOOL ScannerManager::configureScanner( ScannerContext& scanner_context ) throw(
 
     if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() )
         throw ScannerException(
-            ::rtl::OUString::createFromAscii( "Scanner does not exist" ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner does not exist")),
             REF( XScannerManager )( this ),
             ScanError_InvalidContext
             );
@@ -297,7 +297,7 @@ BOOL ScannerManager::configureScanner( ScannerContext& scanner_context ) throw(
     boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData];
     if( pHolder->m_bBusy )
         throw ScannerException(
-            ::rtl::OUString::createFromAscii( "Scanner is busy" ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner is busy")),
             REF( XScannerManager )( this ),
             ScanError_ScanInProgress
             );
@@ -324,14 +324,14 @@ void ScannerManager::startScan( const ScannerContext& scanner_context,
 
     if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() )
         throw ScannerException(
-            ::rtl::OUString::createFromAscii( "Scanner does not exist" ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner does not exist")),
             REF( XScannerManager )( this ),
             ScanError_InvalidContext
             );
     boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData];
     if( pHolder->m_bBusy )
         throw ScannerException(
-            ::rtl::OUString::createFromAscii( "Scanner is busy" ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner is busy")),
             REF( XScannerManager )( this ),
             ScanError_ScanInProgress
             );
@@ -350,7 +350,7 @@ ScanError ScannerManager::getError( const ScannerContext& scanner_context ) thro
 
     if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() )
         throw ScannerException(
-            ::rtl::OUString::createFromAscii( "Scanner does not exist" ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner does not exist")),
             REF( XScannerManager )( this ),
             ScanError_InvalidContext
             );
@@ -369,7 +369,7 @@ REF( AWT::XBitmap ) ScannerManager::getBitmap( const ScannerContext& scanner_con
 
     if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() )
         throw ScannerException(
-            ::rtl::OUString::createFromAscii( "Scanner does not exist" ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner does not exist")),
             REF( XScannerManager )( this ),
             ScanError_InvalidContext
             );
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index 457be67d0f9b..f1fd8b69c8af 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -222,7 +222,7 @@ ImpTwain::ImpTwain( ScannerManager& rMgr, const Link& rNotifyLink ) :
     hTwainWnd = CreateWindowEx( WS_EX_TOPMOST, aWc.lpszClassName, "TWAIN", 0, 0, 0, 0, 0, HWND_DESKTOP, NULL, aWc.hInstance, 0 );
     hTwainHook = SetWindowsHookEx( WH_GETMESSAGE, &TwainMsgProc, NULL, GetCurrentThreadId() );
 
-    // #107835# block destruction until ImplDestroyHdl is called
+    // block destruction until ImplDestroyHdl is called
     mxSelfRef = static_cast< ::cppu::OWeakObject* >( this );
 }
 
@@ -347,7 +347,7 @@ bool ImpTwain::ImplEnableSource()
         aNotifyLink.Call( (void*) TWAIN_EVENT_SCANNING );
         nCurState = 5;
 
-        // #107835# register as vetoable close listener, to prevent application to die under us
+        // register as vetoable close listener, to prevent application to die under us
         ImplRegisterCloseListener();
 
         if( PFUNC( &aAppIdent, &aSrcIdent, DG_CONTROL, DAT_USERINTERFACE, MSG_ENABLEDS, &aUI ) == TWRC_SUCCESS )
@@ -358,7 +358,7 @@ bool ImpTwain::ImplEnableSource()
         {
             nCurState = 4;
 
-            // #107835# deregister as vetoable close listener, dialog failed
+            // deregister as vetoable close listener, dialog failed
             ImplDeregisterCloseListener();
         }
     }
@@ -506,7 +506,7 @@ IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData )
             PFUNC( &aAppIdent, &aSrcIdent, DG_CONTROL, DAT_USERINTERFACE, MSG_DISABLEDS, &aUI );
             nCurState = 4;
 
-            // #107835# deregister as vetoable close listener
+            // deregister as vetoable close listener
             ImplDeregisterCloseListener();
         }
         break;
@@ -559,7 +559,7 @@ IMPL_LINK( ImpTwain, ImplDestroyHdl, void*, /*p*/ )
     if( hTwainHook )
         UnhookWindowsHookEx( hTwainHook );
 
-    // #107835# permit destruction of ourselves (normally, refcount
+    // permit destruction of ourselves (normally, refcount
     // should drop to zero exactly here)
     mxSelfRef = NULL;
     pImpTwainInstance = NULL;
@@ -579,7 +579,7 @@ uno::Reference< frame::XFrame > ImpTwain::ImplGetActiveFrame()
         {
             // query desktop instance
             uno::Reference< frame::XDesktop > xDesktop( xMgr->createInstance(
-                                                            OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ), uno::UNO_QUERY );
+                                                            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), uno::UNO_QUERY );
 
             if( xDesktop.is() )
             {
@@ -593,7 +593,7 @@ uno::Reference< frame::XFrame > ImpTwain::ImplGetActiveFrame()
                     try
                     {
                         aActiveFrame = xDesktopProps->getPropertyValue(
-                            OUString::createFromAscii( "ActiveFrame" ) );
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveFrame")) );
                     }
                     catch( const beans::UnknownPropertyException& )
                     {
@@ -787,7 +787,7 @@ bool Twain::SelectSource( ScannerManager& rMgr )
 
     if( !mpImpTwain )
     {
-        // #107835# hold reference to ScannerManager, to prevent premature death
+        // hold reference to ScannerManager, to prevent premature death
         mxMgr = uno::Reference< scanner::XScannerManager >( static_cast< OWeakObject* >( const_cast< ScannerManager* >( mpCurMgr = &rMgr ) ),
                                                             uno::UNO_QUERY ),
 
@@ -809,7 +809,7 @@ bool Twain::PerformTransfer( ScannerManager& rMgr, const uno::Reference< lang::X
 
     if( !mpImpTwain )
     {
-        // #107835# hold reference to ScannerManager, to prevent premature death
+        // hold reference to ScannerManager, to prevent premature death
         mxMgr = uno::Reference< scanner::XScannerManager >( static_cast< OWeakObject* >( const_cast< ScannerManager* >( mpCurMgr = &rMgr ) ),
                                                             uno::UNO_QUERY ),
 
diff --git a/extensions/source/svg/svgaction.cxx b/extensions/source/svg/svgaction.cxx
index 14cd09c7fa20..97e1921542c2 100644
--- a/extensions/source/svg/svgaction.cxx
+++ b/extensions/source/svg/svgaction.cxx
@@ -842,19 +842,19 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
         {
             String aTransform;
 
-            aTransform = NMSP_RTL::OUString::createFromAscii( "translate" );
+            aTransform = NMSP_RTL::OUString(RTL_CONSTASCII_USTRINGPARAM("translate"));
             aTransform += '(';
             aTransform += String( GetValueString( aPt.X(), mbDoublePoints ) );
             aTransform += ',';
             aTransform += String( GetValueString( aPt.Y(), mbDoublePoints ) );
             aTransform += ')';
 
-            aTransform += String( NMSP_RTL::OUString::createFromAscii( " rotate" ) );
+            aTransform += String( NMSP_RTL::OUString(RTL_CONSTASCII_USTRINGPARAM(" rotate")) );
             aTransform += '(';
             aTransform += String( NMSP_RTL::OUString::valueOf( rFont.GetOrientation() * -0.1 ) );
             aTransform += ')';
 
-            aTransform += String( NMSP_RTL::OUString::createFromAscii( " translate" ) );
+            aTransform += String( NMSP_RTL::OUString(RTL_CONSTASCII_USTRINGPARAM(" translate")) );
             aTransform += '(';
             aTransform += String( GetValueString( -aPt.X(), mbDoublePoints ) );
             aTransform += ',';
diff --git a/extensions/source/svg/svgwriter.cxx b/extensions/source/svg/svgwriter.cxx
index 30d5eded34ac..5344d516e87e 100644
--- a/extensions/source/svg/svgwriter.cxx
+++ b/extensions/source/svg/svgwriter.cxx
@@ -54,7 +54,6 @@ protected:
 
 public:
 
-    // #110680#
     SVGMtfExport(
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
         const REF( NMSP_SAX::XDocumentHandler )& rxHandler );
@@ -66,7 +65,6 @@ public:
 
 // -----------------------------------------------------------------------------
 
-// #110680#
 SVGMtfExport::SVGMtfExport(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
     const REF( NMSP_SAX::XDocumentHandler )& rxHandler )
@@ -167,8 +165,6 @@ void SAL_CALL SVGWriter::write( const REF( NMSP_SAX::XDocumentHandler )& rxDocHa
 
     const REF( NMSP_SAX::XDocumentHandler ) xDocumentHandler( rxDocHandler );
 
-    // #110680#
-    // SVGMtfExport* pWriter = new SVGMtfExport( xDocumentHandler );
     SVGMtfExport* pWriter = new SVGMtfExport( mxFact, xDocumentHandler );
 
     pWriter->writeMtf( aMtf );
diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx
index 881fe2572d67..f897eb668b3e 100644
--- a/extensions/source/update/check/updatecheckconfig.cxx
+++ b/extensions/source/update/check/updatecheckconfig.cxx
@@ -211,7 +211,7 @@ rtl::OUString UpdateCheckConfig::getDesktopDirectory()
     // This should become a desktop specific setting in some system backend ..
     rtl::OUString aHomeDir;
     osl::Security().getHomeDir( aHomeDir );
-    aRet = aHomeDir + rtl::OUString::createFromAscii("/Desktop");
+    aRet = aHomeDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/Desktop"));
 
     // Set path to home directory when there is no /Desktop directory
     osl::Directory aDocumentsDir( aRet );
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index 550705ee4a67..1ef024d7e3dd 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -311,17 +311,10 @@ Image UpdateCheckUI::GetMenuBarIcon( MenuBar* pMBar )
     if ( pMBarWin )
         nMBarHeight = pMBarWin->GetOutputSizePixel().getHeight();
 
-    if ( Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) {
-        if ( nMBarHeight >= 35 )
-            nResID = RID_UPDATE_AVAILABLE_26_HC;
-        else
-            nResID = RID_UPDATE_AVAILABLE_16_HC;
-    } else {
-        if ( nMBarHeight >= 35 )
-            nResID = RID_UPDATE_AVAILABLE_26;
-        else
-            nResID = RID_UPDATE_AVAILABLE_16;
-    }
+    if ( nMBarHeight >= 35 )
+        nResID = RID_UPDATE_AVAILABLE_26;
+    else
+        nResID = RID_UPDATE_AVAILABLE_16;
 
     return Image( ResId( nResID, *mpUpdResMgr ) );
 }
@@ -344,12 +337,12 @@ Image UpdateCheckUI::GetBubbleImage( ::rtl::OUString &rURL )
         {
             uno::Reference< graphic::XGraphicProvider > xGraphProvider(
                     xServiceManager->createInstance(
-                            ::rtl::OUString::createFromAscii( "com.sun.star.graphic.GraphicProvider" ) ),
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.graphic.GraphicProvider")) ),
                     uno::UNO_QUERY );
             if ( xGraphProvider.is() )
             {
                 uno::Sequence< beans::PropertyValue > aMediaProps( 1 );
-                aMediaProps[0].Name = ::rtl::OUString::createFromAscii( "URL" );
+                aMediaProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"));
                 aMediaProps[0].Value <<= rURL;
 
                 uno::Reference< graphic::XGraphic > xGraphic = xGraphProvider->queryGraphic( aMediaProps );
diff --git a/extensions/source/update/ui/updatecheckui.hrc b/extensions/source/update/ui/updatecheckui.hrc
index 3d92e4579f58..636cff231ada 100644
--- a/extensions/source/update/ui/updatecheckui.hrc
+++ b/extensions/source/update/ui/updatecheckui.hrc
@@ -31,6 +31,4 @@
 
  #define RID_UPDATE_AVAILABLE_16            RID_UPDATECHECKUI_START + 1
  #define RID_UPDATE_AVAILABLE_26            RID_UPDATECHECKUI_START + 2
- #define RID_UPDATE_AVAILABLE_16_HC         RID_UPDATECHECKUI_START + 3
- #define RID_UPDATE_AVAILABLE_26_HC         RID_UPDATECHECKUI_START + 4
 
diff --git a/extensions/source/update/ui/updatecheckui.src b/extensions/source/update/ui/updatecheckui.src
index 39b6f44dce4d..084b2f82149d 100644
--- a/extensions/source/update/ui/updatecheckui.src
+++ b/extensions/source/update/ui/updatecheckui.src
@@ -39,13 +39,3 @@
         ImageBitmap = Bitmap{ file = "onlineupdate_26.png"; };
         STD_MASK_COLOR
     };
-    Image RID_UPDATE_AVAILABLE_16_HC
-    {
-        ImageBitmap = Bitmap{ file = "onlineupdate_16_h.png"; };
-        STD_MASK_COLOR
-    };
-    Image RID_UPDATE_AVAILABLE_26_HC
-    {
-        ImageBitmap = Bitmap{ file = "onlineupdate_26_h.png"; };
-        STD_MASK_COLOR
-    };
diff --git a/extensions/test/ole/cpnt/cpnt.cxx b/extensions/test/ole/cpnt/cpnt.cxx
index c44728b9def5..eff03c8aedd4 100644
--- a/extensions/test/ole/cpnt/cpnt.cxx
+++ b/extensions/test/ole/cpnt/cpnt.cxx
@@ -1639,7 +1639,7 @@ void SAL_CALL OComponent::testInterface(  const Reference< XCallback >& xCallbac
             if( any.getValueTypeClass() == TypeClass_STRUCT)
             {
                 SimpleStruct* pStruct= ( SimpleStruct*) any.getValue();
-                pStruct->message= OUString::createFromAscii("This struct was created in OleTest");
+                pStruct->message= OUString(RTL_CONSTASCII_USTRINGPARAM("This struct was created in OleTest"));
 
                 SimpleStruct aStruct;
                 any >>= aStruct;
@@ -1788,7 +1788,7 @@ void SAL_CALL OComponent::testInterface(  const Reference< XCallback >& xCallbac
             if( any.getValueTypeClass() == TypeClass_STRUCT)
             {
                 SimpleStruct* pStruct= ( SimpleStruct*) any.getValue();
-                pStruct->message= OUString::createFromAscii("This struct was created in OleTest");
+                pStruct->message= OUString(RTL_CONSTASCII_USTRINGPARAM("This struct was created in OleTest"));
                 any >>= aStruct;
             }
         }
@@ -1959,7 +1959,7 @@ void SAL_CALL OComponent::testInterface(  const Reference< XCallback >& xCallbac
                 if( any.getValueTypeClass() == TypeClass_STRUCT)
                 {
                     SimpleStruct* pStruct= ( SimpleStruct*) any.getValue();
-                    pStruct->message= OUString::createFromAscii("This struct was created in OleTest");
+                    pStruct->message= OUString(RTL_CONSTASCII_USTRINGPARAM("This struct was created in OleTest"));
                     any >>= aStruct;
                 }
             }
diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx
index 705d451da5be..9ba161f9eea8 100644
--- a/extensions/workben/testcomponent.cxx
+++ b/extensions/workben/testcomponent.cxx
@@ -84,15 +84,10 @@ int __LOADONCALLAPI main (int argc, char **argv)
     try {
         // Create registration service
         XInterfaceRef x = xSMgr->createInstance(
-            UString::createFromAscii( "com.sun.star.registry.ImplementationRegistration" ) );
+            UString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.ImplementationRegistration" )) );
         x->queryInterface( XImplementationRegistration::getSmartUik() , xReg );
 
-/*      x = xSMgr->createInstance( L"stardiv.uno.repos.SimpleRegistry" );
-        OSL_ASSERT( x.is() );
-        x->queryInterface( XSimpleRegistry::getSmartUik() , xSimpleReg );
-        OSL_ASSERT( xSimpleReg.is() );
-        xSimpleReg->open( L"testcomp.rdb" , FALSE , TRUE );
-*/  }
+    }
     catch( Exception& e ) {
         printf( "%s\n" , OWStringToOString( e.getName() , CHARSET_SYSTEM ).getStr() );
         exit(1);
@@ -108,7 +103,7 @@ int __LOADONCALLAPI main (int argc, char **argv)
             UString aDllName( OStringToOWString( szBuf, CHARSET_SYSTEM ) );
 
             xReg->registerImplementation(
-                UString::createFromAscii( "com.sun.star.loader.SharedLibrary" ),
+                UString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.loader.SharedLibrary" )),
                 aDllName,
                 xSimpleReg );
         }
@@ -129,7 +124,7 @@ int __LOADONCALLAPI main (int argc, char **argv)
         ORealDynamicLoader::computeModuleName( sTestName.getStr() , szBuf, 1024 );
         UString aDllName = OStringToOWString( szBuf, CHARSET_SYSTEM );
         xReg->registerImplementation(
-            UString::createFromAscii( "com.sun.star.loader.SharedLibrary" ) ,
+            UString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.loader.SharedLibrary" )) ,
             aDllName,
             xSimpleReg );
     }
diff --git a/extensions/workben/testpgp.cxx b/extensions/workben/testpgp.cxx
index 6027a68e4d70..0773dc711646 100644
--- a/extensions/workben/testpgp.cxx
+++ b/extensions/workben/testpgp.cxx
@@ -512,75 +512,6 @@ inline rtl::OWString S2U (const sal_Char *ascii)
     return rtl::OWString::createFromAscii (ascii);
 }
 
-#if 0  /* OLD */
-
-/*
- * queryModuleActivator.
- */
-BOOL queryModuleActivator (
-    const XServiceManagerRef &rxManager,
-    XServiceActivatorRef     &rxActivator)
-{
-    XServiceProviderRef xProv;
-    XInterfaceRef       xProvInst;
-
-    xProv = rxManager->queryServiceProvider (
-        L"stardiv.uno.ServiceActivator.module");
-    if (!xProv.is())
-    {
-        printf ("Error: no ServiceActivator service.\n");
-        return FALSE;
-    }
-
-    xProvInst = xProv->createInstance();
-    if (!xProvInst.is())
-    {
-        printf ("Error: no ServiceActivator instance.\n");
-        return FALSE;
-    }
-
-    return xProvInst->queryInterface (
-        XServiceActivator::getSmartUik(), rxActivator);
-}
-
-/*
- * install.
- */
-BOOL install (
-    const XServiceActivatorRef &rxActivator,
-    const char                 *prefix)
-{
-    String aModule ("module://");
-    char   pBuffer[1024];
-
-    vos:ORealDynamicLoader::computeModuleName (
-        prefix, pBuffer, sizeof(pBuffer));
-    aModule += pBuffer;
-
-    return rxActivator->install (
-        StringToUString (aModule, CHARSET_SYSTEM));
-}
-
-/*
- * uninstall.
- */
-BOOL uninstall (
-    const XServiceActivatorRef &rxActivator,
-    const char                 *prefix)
-{
-    String aModule ("module://");
-    char   pBuffer[1024];
-
-    vos::ORealDynamicLoader::computeModuleName (
-        prefix, pBuffer, sizeof(pBuffer));
-    aModule += pBuffer;
-
-    return rxActivator->deinstall (
-        StringToUString (aModule, CHARSET_SYSTEM));
-}
-
-#endif /* OLD */
-
 /*
  * main.
  */
@@ -675,17 +606,7 @@ int SAL_CALL main (int argc, char **argv)
 
     if (nOptions & OPTION_INSTALL)
     {
-#if 0  /* OLD */
-        XServiceActivatorRef xActivator;
-        if (queryModuleActivator (xManager, xActivator))
-        {
-            if (install (xActivator, "pgp"))
-                printf ("Module PGP installed.\n");
-            else
-                printf ("Error: module PGP not installed.\n");
-        }
-        nOptions &= ~OPTION_INSTALL;
-#endif /* OLD */
+
     }
 
     if (nOptions & (OPTION_DECRYPT | OPTION_ENCRYPT | OPTION_SIGN))
@@ -823,17 +744,7 @@ int SAL_CALL main (int argc, char **argv)
 
     if (nOptions & OPTION_UNINSTALL)
     {
-#if 0  /* OLD */
-        XServiceActivatorRef xActivator;
-        if (queryModuleActivator (xManager, xActivator))
-        {
-            if (uninstall (xActivator, "pgp"))
-                printf ("Module PGP uninstalled.\n");
-            else
-                printf ("Error: module PGP not uninstalled.\n");
-        }
-        nOptions &= ~OPTION_UNINSTALL;
-#endif /* OLD */
+
     }
 
     return 0;
diff --git a/extras/prj/build.lst b/extras/prj/build.lst
index 72aadb048832..e8ee483514a6 100644
--- a/extras/prj/build.lst
+++ b/extras/prj/build.lst
@@ -12,6 +12,62 @@ er      extras\source\gallery\rulers                            nmake   -
 er      extras\source\gallery\sounds                            nmake   -       all     er_gsnds NULL
 er      extras\source\gallery\www-back                          nmake   -       all     er_gwbck NULL
 er      extras\source\gallery\www-graf                          nmake   -       all     er_gwgrf NULL
+er      extras\source\gallery\accessories                       nmake   -       all     er_gacce NULL
+er      extras\source\gallery\accessories\Draws\People          nmake   -       all     er_gadpe NULL
+er      extras\source\gallery\accessories\Photos\Buildings      nmake   -       all     er_gapbu NULL
+er      extras\source\gallery\accessories\Photos\Celebration    nmake   -       all     er_gapce NULL
+er      extras\source\gallery\accessories\Photos\Cities         nmake   -       all     er_gapci NULL
+er      extras\source\gallery\accessories\Photos\Fauna          nmake   -       all     er_gapfa NULL
+er      extras\source\gallery\accessories\Photos\Flowers        nmake   -       all     er_gapfl NULL
+er      extras\source\gallery\accessories\Photos\FoodsandDrinks nmake   -       all     er_gapfo NULL
+er      extras\source\gallery\accessories\Photos\Humans         nmake   -       all     er_gaphu NULL
+er      extras\source\gallery\accessories\Photos\Landscapes     nmake   -       all     er_gapla NULL
+er      extras\source\gallery\accessories\Photos\Objects        nmake   -       all     er_gapob NULL
+er      extras\source\gallery\accessories\Photos\Plants         nmake   -       all     er_gappl NULL
+er      extras\source\gallery\accessories\Photos\Space          nmake   -       all     er_gapsp NULL
+er      extras\source\gallery\accessories\Photos\Statues        nmake   -       all     er_gapst NULL
+er      extras\source\gallery\accessories\Photos\Travel         nmake   -       all     er_gaptr NULL
+er      extras\source\premium\templates\layout\lang             nmake   -       all     er_prtela NULL
+er      extras\source\premium\templates\presnt\lang             nmake   -       all     er_prtepr NULL
+er      extras\source\premium\templates\educate\lang            nmake   -       all     er_prteed NULL
+er      extras\source\premium\templates\finance\lang            nmake   -       all     er_prtefi NULL
+er      extras\source\premium\templates\forms\lang              nmake   -       all     er_prtefo NULL
+er      extras\source\premium\templates\labels\lang             nmake   -       all     er_prtelb NULL
+er      extras\source\premium\templates\misc\lang               nmake   -       all     er_prtemi NULL
+er      extras\source\premium\templates\officorr\lang           nmake   -       all     er_prteoc NULL
+er      extras\source\premium\templates\offimisc\lang           nmake   -       all     er_prteom NULL
+er      extras\source\premium\templates\personal\lang           nmake   -       all     er_prtepe NULL
+er      extras\source\premium\templates\lang                    nmake   -       all     er_prtemp NULL
+er      extras\source\premium\templates\common\layout             nmake   -       all     er_prtecola NULL
+er      extras\source\premium\templates\common\presnt             nmake   -       all     er_prtecopr NULL
+er      extras\source\premium\templates\common\educate            nmake   -       all     er_prtecoed NULL
+er      extras\source\premium\templates\common\finance            nmake   -       all     er_prtecofi NULL
+er      extras\source\premium\templates\common\forms              nmake   -       all     er_prtecofo NULL
+er      extras\source\premium\templates\common\labels             nmake   -       all     er_prtecolb NULL
+er      extras\source\premium\templates\common\misc               nmake   -       all     er_prtecomi NULL
+er      extras\source\premium\templates\common\officorr           nmake   -       all     er_prtecooc NULL
+er      extras\source\premium\templates\common\offimisc           nmake   -       all     er_prtecoom NULL
+er      extras\source\premium\templates\common\personal           nmake   -       all     er_prtecope NULL
+er      extras\source\premium\templates\common                    nmake   -       all     er_prtecomp NULL
+er      extras\source\premium\samples\advertisement\lang        nmake   -       all     er_prsaad NULL
+er      extras\source\premium\samples\documentation\lang        nmake   -       all     er_prsedo NULL
+er      extras\source\premium\samples\lang                      nmake   -       all     er_prsamp NULL
+er      extras\source\premium\templates-nonfree\layout\lang             nmake   -       all     er_prtelanf NULL
+er      extras\source\premium\templates-nonfree\presnt\lang             nmake   -       all     er_prteprnf NULL
+er      extras\source\premium\templates-nonfree\educate\lang            nmake   -       all     er_prteednf NULL
+er      extras\source\premium\templates-nonfree\finance\lang            nmake   -       all     er_prtefinf NULL
+er      extras\source\premium\templates-nonfree\forms\lang              nmake   -       all     er_prtefonf NULL
+er      extras\source\premium\templates-nonfree\labels\lang             nmake   -       all     er_prtelbnf NULL
+er      extras\source\premium\templates-nonfree\misc\lang               nmake   -       all     er_prteminf NULL
+er      extras\source\premium\templates-nonfree\officorr\lang           nmake   -       all     er_prteocnf NULL
+er      extras\source\premium\templates-nonfree\offimisc\lang           nmake   -       all     er_prteomnf NULL
+er      extras\source\premium\templates-nonfree\personal\lang           nmake   -       all     er_prtepenf NULL
+er      extras\source\premium\templates-nonfree\lang                    nmake   -       all     er_prtempnf NULL
+er      extras\source\premium\samples-nonfree\advertisement\lang        nmake   -       all     er_prsaadnf NULL
+er      extras\source\premium\samples-nonfree\documentation\lang        nmake   -       all     er_prsedonf NULL
+er      extras\source\premium\samples-nonfree\lang                      nmake   -       all     er_prsampnf NULL
+er      extras\source\gallery\accessories\Elements\Bullets2          nmake   -       all     er_gaeb2 NULL
+er      extras\source\gallery\accessories-nonfree                       nmake   -       all     er_gaccenf NULL
 er	extras\source\misc_config				nmake	-	all	er_mcnf NULL
 er	extras\source\palettes\lang				nmake	-	all	er_pall NULL
 er	extras\source\palettes					nmake	-	all	er_palet NULL
diff --git a/extras/prj/d.lst b/extras/prj/d.lst
index 517f29211425..d1a176c70ff7 100644
--- a/extras/prj/d.lst
+++ b/extras/prj/d.lst
@@ -9,5 +9,8 @@ mkdir: %COMMON_DEST%\pck%_EXT%\openoffice
 ..\%COMMON_OUTDIR%\bin\wordbook_en-US.zip %COMMON_DEST%\pck%_EXT%\wordbook_zh-CN.zip
 ..\%COMMON_OUTDIR%\bin\wordbook_en-US.zip %COMMON_DEST%\pck%_EXT%\wordbook_zh-TW.zip
 ..\source\truetype\symbol\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
+..\source\truetype\symbol\*.otf %COMMON_DEST%\pck%_EXT%\*.otf
+..\source\truetype\decorative\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
+..\source\truetype\decorative\*.otf %COMMON_DEST%\pck%_EXT%\*.otf
 ..\source\shellnew\soffice.* %COMMON_DEST%\pck%_EXT%\soffice.*
 ..\unx\source\fonts\fonts.dir %COMMON_DEST%\pck%_EXT%\openoffice\fonts.dir
diff --git a/extras/source/autotext/lang/hu/mytexts.bau b/extras/source/autotext/lang/hu/mytexts.bau
deleted file mode 100644
index a4ca31494089..000000000000
--- a/extras/source/autotext/lang/hu/mytexts.bau
+++ /dev/null
diff --git a/extras/source/autotext/lang/lt/acor_lt_LT.dat b/extras/source/autotext/lang/lt/acor_lt-LT.dat
index ae37be4608f3..ae37be4608f3 100644
--- a/extras/source/autotext/lang/lt/acor_lt_LT.dat
+++ b/extras/source/autotext/lang/lt/acor_lt-LT.dat
diff --git a/extras/source/autotext/lang/sl/mytexts.bau b/extras/source/autotext/lang/sl/mytexts.bau
deleted file mode 100644
index b9c6c7221d04..000000000000
--- a/extras/source/autotext/lang/sl/mytexts.bau
+++ /dev/null
diff --git a/extras/source/gallery/accessories-nonfree/delzip b/extras/source/gallery/accessories-nonfree/delzip
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/extras/source/gallery/accessories-nonfree/delzip
diff --git a/extras/source/gallery/accessories-nonfree/makefile.mk b/extras/source/gallery/accessories-nonfree/makefile.mk
new file mode 100644
index 000000000000..aff08aaa6f83
--- /dev/null
+++ b/extras/source/gallery/accessories-nonfree/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=galleryaccessoriesnonfree
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_GALLERY)" != "NO"
+
+
+ZIP1TARGET      = $(GALLERY_ACCESSORIES_NONFREE_ROOT_TARGET)
+
+ZIP1LIST        = * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/gallery/accessories/Draws/People/delzip b/extras/source/gallery/accessories/Draws/People/delzip
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/extras/source/gallery/accessories/Draws/People/delzip
diff --git a/extras/source/gallery/accessories/Draws/People/makefile.mk b/extras/source/gallery/accessories/Draws/People/makefile.mk
new file mode 100644
index 000000000000..ee10239820b3
--- /dev/null
+++ b/extras/source/gallery/accessories/Draws/People/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=galleryaccessoriesdrawspeople
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_GALLERY)" != "NO"
+
+
+ZIP1TARGET      = $(GALLERY_ACCESSORIES_DRAWS_PEOPLE_TARGET)
+
+ZIP1LIST        = * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/gallery/accessories/Elements/Bullets2/delzip b/extras/source/gallery/accessories/Elements/Bullets2/delzip
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/extras/source/gallery/accessories/Elements/Bullets2/delzip
diff --git a/extras/source/gallery/accessories/Elements/Bullets2/makefile.mk b/extras/source/gallery/accessories/Elements/Bullets2/makefile.mk
new file mode 100644
index 000000000000..c19f464cce80
--- /dev/null
+++ b/extras/source/gallery/accessories/Elements/Bullets2/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=galleryaccessorieselementsbullets2
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_GALLERY)" != "NO"
+
+
+ZIP1TARGET      = $(GALLERY_ACCESSORIES_ELEMENTS_BULLETS2_TARGET)
+
+ZIP1LIST        = * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/gallery/accessories/Photos/Buildings/delzip b/extras/source/gallery/accessories/Photos/Buildings/delzip
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/extras/source/gallery/accessories/Photos/Buildings/delzip
diff --git a/extras/source/gallery/accessories/Photos/Buildings/makefile.mk b/extras/source/gallery/accessories/Photos/Buildings/makefile.mk
new file mode 100644
index 000000000000..39accdcbcca5
--- /dev/null
+++ b/extras/source/gallery/accessories/Photos/Buildings/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=galleryaccessoriesphotosbuildings
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+
+.IF "$(WITH_EXTRA_GALLERY)" != "NO"
+
+ZIP1TARGET      = $(GALLERY_ACCESSORIES_PHOTOS_BUILDINGS_TARGET)
+
+ZIP1LIST        = * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/gallery/accessories/Photos/Celebration/delzip b/extras/source/gallery/accessories/Photos/Celebration/delzip
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/extras/source/gallery/accessories/Photos/Celebration/delzip
diff --git a/extras/source/gallery/accessories/Photos/Celebration/makefile.mk b/extras/source/gallery/accessories/Photos/Celebration/makefile.mk
new file mode 100644
index 000000000000..9dcb05438a86
--- /dev/null
+++ b/extras/source/gallery/accessories/Photos/Celebration/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=galleryaccessoriesphotoscelebration
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+
+.IF "$(WITH_EXTRA_GALLERY)" != "NO"
+
+ZIP1TARGET      = $(GALLERY_ACCESSORIES_PHOTOS_CELEBRATION_TARGET)
+
+ZIP1LIST        = * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/gallery/accessories/Photos/Cities/delzip b/extras/source/gallery/accessories/Photos/Cities/delzip
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/extras/source/gallery/accessories/Photos/Cities/delzip
diff --git a/extras/source/gallery/accessories/Photos/Cities/makefile.mk b/extras/source/gallery/accessories/Photos/Cities/makefile.mk
new file mode 100644
index 000000000000..5decd2ff1357
--- /dev/null
+++ b/extras/source/gallery/accessories/Photos/Cities/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=galleryaccessoriesphotoscities
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_GALLERY)" != "NO"
+
+
+ZIP1TARGET      = $(GALLERY_ACCESSORIES_PHOTOS_CITIES_TARGET)
+
+ZIP1LIST        = * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/gallery/accessories/Photos/Fauna/delzip b/extras/source/gallery/accessories/Photos/Fauna/delzip
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/extras/source/gallery/accessories/Photos/Fauna/delzip
diff --git a/extras/source/gallery/accessories/Photos/Fauna/makefile.mk b/extras/source/gallery/accessories/Photos/Fauna/makefile.mk
new file mode 100644
index 000000000000..1b42e21b2aa2
--- /dev/null
+++ b/extras/source/gallery/accessories/Photos/Fauna/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=galleryaccessoriesphotosfauna
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_GALLERY)" != "NO"
+
+
+ZIP1TARGET      = $(GALLERY_ACCESSORIES_PHOTOS_FAUNA_TARGET)
+
+ZIP1LIST        = * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/gallery/accessories/Photos/Flowers/delzip b/extras/source/gallery/accessories/Photos/Flowers/delzip
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/extras/source/gallery/accessories/Photos/Flowers/delzip
diff --git a/extras/source/gallery/accessories/Photos/Flowers/makefile.mk b/extras/source/gallery/accessories/Photos/Flowers/makefile.mk
new file mode 100644
index 000000000000..25dd2ac4648d
--- /dev/null
+++ b/extras/source/gallery/accessories/Photos/Flowers/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=galleryaccessoriesphotosflowers
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_GALLERY)" != "NO"
+
+
+ZIP1TARGET      = $(GALLERY_ACCESSORIES_PHOTOS_FLOWERS_TARGET)
+
+ZIP1LIST        = * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/gallery/accessories/Photos/FoodsandDrinks/delzip b/extras/source/gallery/accessories/Photos/FoodsandDrinks/delzip
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/extras/source/gallery/accessories/Photos/FoodsandDrinks/delzip
diff --git a/extras/source/gallery/accessories/Photos/FoodsandDrinks/makefile.mk b/extras/source/gallery/accessories/Photos/FoodsandDrinks/makefile.mk
new file mode 100644
index 000000000000..c3c62f273615
--- /dev/null
+++ b/extras/source/gallery/accessories/Photos/FoodsandDrinks/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=galleryaccessoriesphotosfoodsanddrinks
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_GALLERY)" != "NO"
+
+
+ZIP1TARGET      = $(GALLERY_ACCESSORIES_PHOTOS_FOODSANDDRINKS_TARGET)
+
+ZIP1LIST        = * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/gallery/accessories/Photos/Humans/delzip b/extras/source/gallery/accessories/Photos/Humans/delzip
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/extras/source/gallery/accessories/Photos/Humans/delzip
diff --git a/extras/source/gallery/accessories/Photos/Humans/makefile.mk b/extras/source/gallery/accessories/Photos/Humans/makefile.mk
new file mode 100644
index 000000000000..6a2aad4d910d
--- /dev/null
+++ b/extras/source/gallery/accessories/Photos/Humans/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=galleryaccessoriesphotoshumans
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_GALLERY)" != "NO"
+
+
+ZIP1TARGET      = $(GALLERY_ACCESSORIES_PHOTOS_HUMANS_TARGET)
+
+ZIP1LIST        = * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/gallery/accessories/Photos/Landscapes/delzip b/extras/source/gallery/accessories/Photos/Landscapes/delzip
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/extras/source/gallery/accessories/Photos/Landscapes/delzip
diff --git a/extras/source/gallery/accessories/Photos/Landscapes/makefile.mk b/extras/source/gallery/accessories/Photos/Landscapes/makefile.mk
new file mode 100644
index 000000000000..598f68d8cbe7
--- /dev/null
+++ b/extras/source/gallery/accessories/Photos/Landscapes/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=galleryaccessoriesphotoslandscapes
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_GALLERY)" != "NO"
+
+
+ZIP1TARGET      = $(GALLERY_ACCESSORIES_PHOTOS_LANDSCAPES_TARGET)
+
+ZIP1LIST        = * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/gallery/accessories/Photos/Objects/delzip b/extras/source/gallery/accessories/Photos/Objects/delzip
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/extras/source/gallery/accessories/Photos/Objects/delzip
diff --git a/extras/source/gallery/accessories/Photos/Objects/makefile.mk b/extras/source/gallery/accessories/Photos/Objects/makefile.mk
new file mode 100644
index 000000000000..45673d96019e
--- /dev/null
+++ b/extras/source/gallery/accessories/Photos/Objects/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=galleryaccessoriesphotosobjects
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_GALLERY)" != "NO"
+
+
+ZIP1TARGET      = $(GALLERY_ACCESSORIES_PHOTOS_OBJECTS_TARGET)
+
+ZIP1LIST        = * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/gallery/accessories/Photos/Plants/delzip b/extras/source/gallery/accessories/Photos/Plants/delzip
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/extras/source/gallery/accessories/Photos/Plants/delzip
diff --git a/extras/source/gallery/accessories/Photos/Plants/makefile.mk b/extras/source/gallery/accessories/Photos/Plants/makefile.mk
new file mode 100644
index 000000000000..6514370a994b
--- /dev/null
+++ b/extras/source/gallery/accessories/Photos/Plants/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=galleryaccessoriesphotosplants
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_GALLERY)" != "NO"
+
+
+ZIP1TARGET      = $(GALLERY_ACCESSORIES_PHOTOS_PLANTS_TARGET)
+
+ZIP1LIST        = * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/gallery/accessories/Photos/Space/delzip b/extras/source/gallery/accessories/Photos/Space/delzip
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/extras/source/gallery/accessories/Photos/Space/delzip
diff --git a/extras/source/gallery/accessories/Photos/Space/makefile.mk b/extras/source/gallery/accessories/Photos/Space/makefile.mk
new file mode 100644
index 000000000000..d355e341f315
--- /dev/null
+++ b/extras/source/gallery/accessories/Photos/Space/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=galleryaccessoriesphotosspace
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_GALLERY)" != "NO"
+
+
+ZIP1TARGET      = $(GALLERY_ACCESSORIES_PHOTOS_SPACE_TARGET)
+
+ZIP1LIST        = * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/gallery/accessories/Photos/Statues/delzip b/extras/source/gallery/accessories/Photos/Statues/delzip
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/extras/source/gallery/accessories/Photos/Statues/delzip
diff --git a/extras/source/gallery/accessories/Photos/Statues/makefile.mk b/extras/source/gallery/accessories/Photos/Statues/makefile.mk
new file mode 100644
index 000000000000..40821d737e14
--- /dev/null
+++ b/extras/source/gallery/accessories/Photos/Statues/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=galleryaccessoriesphotosstatues
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_GALLERY)" != "NO"
+
+
+ZIP1TARGET      = $(GALLERY_ACCESSORIES_PHOTOS_STATUES_TARGET)
+
+ZIP1LIST        = * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/gallery/accessories/Photos/Travel/delzip b/extras/source/gallery/accessories/Photos/Travel/delzip
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/extras/source/gallery/accessories/Photos/Travel/delzip
diff --git a/extras/source/gallery/accessories/Photos/Travel/makefile.mk b/extras/source/gallery/accessories/Photos/Travel/makefile.mk
new file mode 100644
index 000000000000..11b1bfec2635
--- /dev/null
+++ b/extras/source/gallery/accessories/Photos/Travel/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=galleryaccessoriesphotostravel
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_GALLERY)" != "NO"
+
+
+ZIP1TARGET      = $(GALLERY_ACCESSORIES_PHOTOS_TRAVEL_TARGET)
+
+ZIP1LIST        = * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/gallery/accessories/delzip b/extras/source/gallery/accessories/delzip
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/extras/source/gallery/accessories/delzip
diff --git a/extras/source/gallery/accessories/makefile.mk b/extras/source/gallery/accessories/makefile.mk
new file mode 100644
index 000000000000..4f766403a3f8
--- /dev/null
+++ b/extras/source/gallery/accessories/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=galleryaccessories
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_GALLERY)" != "NO"
+
+
+ZIP1TARGET      = $(GALLERY_ACCESSORIES_ROOT_TARGET)
+
+ZIP1LIST        = * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/samples-nonfree/advertisement/lang/delzip b/extras/source/premium/samples-nonfree/advertisement/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/samples-nonfree/advertisement/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/samples-nonfree/advertisement/lang/makefile.mk b/extras/source/premium/samples-nonfree/advertisement/lang/makefile.mk
new file mode 100644
index 000000000000..4c192e6bdd55
--- /dev/null
+++ b/extras/source/premium/samples-nonfree/advertisement/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumsamplesnonfreeadvertisement
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_SAMPLE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_SAMPLES_NONFREE_ADVERTISEMENT_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/samples-nonfree/documentation/lang/delzip b/extras/source/premium/samples-nonfree/documentation/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/samples-nonfree/documentation/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/samples-nonfree/documentation/lang/makefile.mk b/extras/source/premium/samples-nonfree/documentation/lang/makefile.mk
new file mode 100644
index 000000000000..10244a846810
--- /dev/null
+++ b/extras/source/premium/samples-nonfree/documentation/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumsamplesnonfreedocumentation
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_SAMPLE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_SAMPLES_NONFREE_DOCUMENTATION_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/samples-nonfree/lang/delzip b/extras/source/premium/samples-nonfree/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/samples-nonfree/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/samples-nonfree/lang/makefile.mk b/extras/source/premium/samples-nonfree/lang/makefile.mk
new file mode 100644
index 000000000000..ca8735d2c8ab
--- /dev/null
+++ b/extras/source/premium/samples-nonfree/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumsamplesnonfreegeneral
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_SAMPLE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_SAMPLES_NONFREE_ROOT_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/* $(LANGDIR)$/.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/samples/advertisement/lang/delzip b/extras/source/premium/samples/advertisement/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/samples/advertisement/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/samples/advertisement/lang/makefile.mk b/extras/source/premium/samples/advertisement/lang/makefile.mk
new file mode 100644
index 000000000000..ef44958c6ee1
--- /dev/null
+++ b/extras/source/premium/samples/advertisement/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumsamplesadvertisement
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_SAMPLE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_SAMPLES_ADVERTISEMENT_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/samples/documentation/lang/delzip b/extras/source/premium/samples/documentation/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/samples/documentation/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/samples/documentation/lang/makefile.mk b/extras/source/premium/samples/documentation/lang/makefile.mk
new file mode 100644
index 000000000000..4197f58d927b
--- /dev/null
+++ b/extras/source/premium/samples/documentation/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumsamplesdocumentation
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_SAMPLE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_SAMPLES_DOCUMENTATION_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/samples/lang/delzip b/extras/source/premium/samples/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/samples/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/samples/lang/makefile.mk b/extras/source/premium/samples/lang/makefile.mk
new file mode 100644
index 000000000000..9d9347548add
--- /dev/null
+++ b/extras/source/premium/samples/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumsamplesgeneral
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_SAMPLE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_SAMPLES_ROOT_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/* $(LANGDIR)$/.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates-nonfree/educate/lang/delzip b/extras/source/premium/templates-nonfree/educate/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates-nonfree/educate/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates-nonfree/educate/lang/makefile.mk b/extras/source/premium/templates-nonfree/educate/lang/makefile.mk
new file mode 100644
index 000000000000..e38b9797bd72
--- /dev/null
+++ b/extras/source/premium/templates-nonfree/educate/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatesnonfreeeducate
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_NONFREE_EDUCATE_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates-nonfree/finance/lang/delzip b/extras/source/premium/templates-nonfree/finance/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates-nonfree/finance/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates-nonfree/finance/lang/makefile.mk b/extras/source/premium/templates-nonfree/finance/lang/makefile.mk
new file mode 100644
index 000000000000..2eb09344675b
--- /dev/null
+++ b/extras/source/premium/templates-nonfree/finance/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatesnonfreefinance
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_NONFREE_FINANCE_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates-nonfree/forms/lang/delzip b/extras/source/premium/templates-nonfree/forms/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates-nonfree/forms/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates-nonfree/forms/lang/makefile.mk b/extras/source/premium/templates-nonfree/forms/lang/makefile.mk
new file mode 100644
index 000000000000..929e4de23e66
--- /dev/null
+++ b/extras/source/premium/templates-nonfree/forms/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatesnonfreeforms
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_NONFREE_FORMS_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates-nonfree/labels/lang/delzip b/extras/source/premium/templates-nonfree/labels/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates-nonfree/labels/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates-nonfree/labels/lang/makefile.mk b/extras/source/premium/templates-nonfree/labels/lang/makefile.mk
new file mode 100644
index 000000000000..09b56d7c60d9
--- /dev/null
+++ b/extras/source/premium/templates-nonfree/labels/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatesnonfreelabels
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_NONFREE_LABELS_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates-nonfree/lang/delzip b/extras/source/premium/templates-nonfree/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates-nonfree/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates-nonfree/lang/makefile.mk b/extras/source/premium/templates-nonfree/lang/makefile.mk
new file mode 100644
index 000000000000..8cc17f0aae82
--- /dev/null
+++ b/extras/source/premium/templates-nonfree/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatesnonfreegeneral
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_NONFREE_ROOT_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates-nonfree/layout/lang/delzip b/extras/source/premium/templates-nonfree/layout/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates-nonfree/layout/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates-nonfree/layout/lang/makefile.mk b/extras/source/premium/templates-nonfree/layout/lang/makefile.mk
new file mode 100644
index 000000000000..e44e094343cc
--- /dev/null
+++ b/extras/source/premium/templates-nonfree/layout/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatesnonfreelayout
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_NONFREE_LAYOUT_IMPRESS_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates-nonfree/misc/lang/delzip b/extras/source/premium/templates-nonfree/misc/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates-nonfree/misc/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates-nonfree/misc/lang/makefile.mk b/extras/source/premium/templates-nonfree/misc/lang/makefile.mk
new file mode 100644
index 000000000000..48259a11ec23
--- /dev/null
+++ b/extras/source/premium/templates-nonfree/misc/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatesnonfreemisc
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_NONFREE_MISC_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates-nonfree/officorr/lang/delzip b/extras/source/premium/templates-nonfree/officorr/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates-nonfree/officorr/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates-nonfree/officorr/lang/makefile.mk b/extras/source/premium/templates-nonfree/officorr/lang/makefile.mk
new file mode 100644
index 000000000000..43896eb6a084
--- /dev/null
+++ b/extras/source/premium/templates-nonfree/officorr/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatesnonfreeofficorr
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_NONFREE_OFFICORR_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates-nonfree/offimisc/lang/delzip b/extras/source/premium/templates-nonfree/offimisc/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates-nonfree/offimisc/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates-nonfree/offimisc/lang/makefile.mk b/extras/source/premium/templates-nonfree/offimisc/lang/makefile.mk
new file mode 100644
index 000000000000..106b5af5b736
--- /dev/null
+++ b/extras/source/premium/templates-nonfree/offimisc/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatesnonfreeoffimisc
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_NONFREE_OFFIMISC_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates-nonfree/personal/lang/delzip b/extras/source/premium/templates-nonfree/personal/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates-nonfree/personal/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates-nonfree/personal/lang/makefile.mk b/extras/source/premium/templates-nonfree/personal/lang/makefile.mk
new file mode 100644
index 000000000000..189a85454b77
--- /dev/null
+++ b/extras/source/premium/templates-nonfree/personal/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatesnonfreepersonal
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_NONFREE_PERSONAL_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates-nonfree/presnt/lang/delzip b/extras/source/premium/templates-nonfree/presnt/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates-nonfree/presnt/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates-nonfree/presnt/lang/makefile.mk b/extras/source/premium/templates-nonfree/presnt/lang/makefile.mk
new file mode 100644
index 000000000000..7ffde4ce3503
--- /dev/null
+++ b/extras/source/premium/templates-nonfree/presnt/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatesnonfreepresnt
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_NONFREE_PRESNT_IMPRESS_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates/common/delzip b/extras/source/premium/templates/common/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates/common/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates/common/educate/delzip b/extras/source/premium/templates/common/educate/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates/common/educate/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates/common/educate/makefile.mk b/extras/source/premium/templates/common/educate/makefile.mk
new file mode 100644
index 000000000000..94ff0319673e
--- /dev/null
+++ b/extras/source/premium/templates/common/educate/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatescommoneducate
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_COMMON_EDUCATE_TARGET)
+
+ZIP1LIST	= * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates/common/finance/delzip b/extras/source/premium/templates/common/finance/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates/common/finance/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates/common/finance/makefile.mk b/extras/source/premium/templates/common/finance/makefile.mk
new file mode 100644
index 000000000000..d101065a0408
--- /dev/null
+++ b/extras/source/premium/templates/common/finance/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatescommonfinance
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_COMMON_FINANCE_TARGET)
+
+ZIP1LIST	= * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates/common/forms/delzip b/extras/source/premium/templates/common/forms/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates/common/forms/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates/common/forms/makefile.mk b/extras/source/premium/templates/common/forms/makefile.mk
new file mode 100644
index 000000000000..e66108d7c917
--- /dev/null
+++ b/extras/source/premium/templates/common/forms/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatescommonforms
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_COMMON_FORMS_TARGET)
+
+ZIP1LIST	= * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates/common/labels/delzip b/extras/source/premium/templates/common/labels/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates/common/labels/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates/common/labels/makefile.mk b/extras/source/premium/templates/common/labels/makefile.mk
new file mode 100644
index 000000000000..538877dc4e45
--- /dev/null
+++ b/extras/source/premium/templates/common/labels/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatescommonlabels
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_COMMON_LABELS_TARGET)
+
+ZIP1LIST	= * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates/common/layout/delzip b/extras/source/premium/templates/common/layout/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates/common/layout/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates/common/layout/makefile.mk b/extras/source/premium/templates/common/layout/makefile.mk
new file mode 100644
index 000000000000..c78dab55fcbc
--- /dev/null
+++ b/extras/source/premium/templates/common/layout/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatescommonlayout
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_COMMON_LAYOUT_IMPRESS_TARGET)
+
+ZIP1LIST	= * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates/common/makefile.mk b/extras/source/premium/templates/common/makefile.mk
new file mode 100644
index 000000000000..1fe2caf4fdda
--- /dev/null
+++ b/extras/source/premium/templates/common/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatesgeneral
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_COMMON_ROOT_TARGET)
+
+ZIP1LIST	= * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates/common/misc/delzip b/extras/source/premium/templates/common/misc/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates/common/misc/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates/common/misc/makefile.mk b/extras/source/premium/templates/common/misc/makefile.mk
new file mode 100644
index 000000000000..2a4a1c61a20b
--- /dev/null
+++ b/extras/source/premium/templates/common/misc/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatescommonmisc
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_COMMON_MISC_TARGET)
+
+ZIP1LIST	= * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates/common/officorr/delzip b/extras/source/premium/templates/common/officorr/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates/common/officorr/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates/common/officorr/makefile.mk b/extras/source/premium/templates/common/officorr/makefile.mk
new file mode 100644
index 000000000000..1392a5e92d79
--- /dev/null
+++ b/extras/source/premium/templates/common/officorr/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatescommonofficorr
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_COMMON_OFFICORR_TARGET)
+
+ZIP1LIST	= * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates/common/offimisc/delzip b/extras/source/premium/templates/common/offimisc/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates/common/offimisc/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates/common/offimisc/makefile.mk b/extras/source/premium/templates/common/offimisc/makefile.mk
new file mode 100644
index 000000000000..619de6fd43b9
--- /dev/null
+++ b/extras/source/premium/templates/common/offimisc/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatescommonoffimisc
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_COMMON_OFFIMISC_TARGET)
+
+ZIP1LIST	= * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates/common/personal/delzip b/extras/source/premium/templates/common/personal/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates/common/personal/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates/common/personal/makefile.mk b/extras/source/premium/templates/common/personal/makefile.mk
new file mode 100644
index 000000000000..30539aef248b
--- /dev/null
+++ b/extras/source/premium/templates/common/personal/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatescommonpersonal
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_COMMON_PERSONAL_TARGET)
+
+ZIP1LIST	= * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates/common/presnt/delzip b/extras/source/premium/templates/common/presnt/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates/common/presnt/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates/common/presnt/makefile.mk b/extras/source/premium/templates/common/presnt/makefile.mk
new file mode 100644
index 000000000000..2d5ea56bab60
--- /dev/null
+++ b/extras/source/premium/templates/common/presnt/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatescommonpresnt
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_COMMON_PRESNT_IMPRESS_TARGET)
+
+ZIP1LIST	= * -x makefile.*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates/educate/lang/delzip b/extras/source/premium/templates/educate/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates/educate/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates/educate/lang/makefile.mk b/extras/source/premium/templates/educate/lang/makefile.mk
new file mode 100644
index 000000000000..a8c5dd27c9cb
--- /dev/null
+++ b/extras/source/premium/templates/educate/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplateseducate
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_EDUCATE_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates/finance/lang/delzip b/extras/source/premium/templates/finance/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates/finance/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates/finance/lang/makefile.mk b/extras/source/premium/templates/finance/lang/makefile.mk
new file mode 100644
index 000000000000..330122ce2810
--- /dev/null
+++ b/extras/source/premium/templates/finance/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatesfinance
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_FINANCE_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates/forms/lang/delzip b/extras/source/premium/templates/forms/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates/forms/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates/forms/lang/makefile.mk b/extras/source/premium/templates/forms/lang/makefile.mk
new file mode 100644
index 000000000000..c94a33ad0ca4
--- /dev/null
+++ b/extras/source/premium/templates/forms/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatesforms
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_FORMS_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates/labels/lang/delzip b/extras/source/premium/templates/labels/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates/labels/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates/labels/lang/makefile.mk b/extras/source/premium/templates/labels/lang/makefile.mk
new file mode 100644
index 000000000000..3374438e21d3
--- /dev/null
+++ b/extras/source/premium/templates/labels/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplateslabels
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_LABELS_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates/lang/delzip b/extras/source/premium/templates/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates/lang/makefile.mk b/extras/source/premium/templates/lang/makefile.mk
new file mode 100644
index 000000000000..3daa3e836a3e
--- /dev/null
+++ b/extras/source/premium/templates/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatesgeneral
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_ROOT_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates/layout/lang/delzip b/extras/source/premium/templates/layout/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates/layout/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates/layout/lang/makefile.mk b/extras/source/premium/templates/layout/lang/makefile.mk
new file mode 100644
index 000000000000..31c277b2c15e
--- /dev/null
+++ b/extras/source/premium/templates/layout/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplateslayout
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_LAYOUT_IMPRESS_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates/misc/lang/delzip b/extras/source/premium/templates/misc/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates/misc/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates/misc/lang/makefile.mk b/extras/source/premium/templates/misc/lang/makefile.mk
new file mode 100644
index 000000000000..2ad2036f0399
--- /dev/null
+++ b/extras/source/premium/templates/misc/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatesmisc
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_MISC_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates/officorr/lang/delzip b/extras/source/premium/templates/officorr/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates/officorr/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates/officorr/lang/makefile.mk b/extras/source/premium/templates/officorr/lang/makefile.mk
new file mode 100644
index 000000000000..650fbd2d58bd
--- /dev/null
+++ b/extras/source/premium/templates/officorr/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatesofficorr
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_OFFICORR_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates/offimisc/lang/delzip b/extras/source/premium/templates/offimisc/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates/offimisc/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates/offimisc/lang/makefile.mk b/extras/source/premium/templates/offimisc/lang/makefile.mk
new file mode 100644
index 000000000000..5a3cf7f59464
--- /dev/null
+++ b/extras/source/premium/templates/offimisc/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatesoffimisc
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_OFFIMISC_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates/personal/lang/delzip b/extras/source/premium/templates/personal/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates/personal/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates/personal/lang/makefile.mk b/extras/source/premium/templates/personal/lang/makefile.mk
new file mode 100644
index 000000000000..fbfec9fd5710
--- /dev/null
+++ b/extras/source/premium/templates/personal/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatespersonal
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_PERSONAL_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/source/premium/templates/presnt/lang/delzip b/extras/source/premium/templates/presnt/lang/delzip
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/extras/source/premium/templates/presnt/lang/delzip
@@ -0,0 +1 @@
+
diff --git a/extras/source/premium/templates/presnt/lang/makefile.mk b/extras/source/premium/templates/presnt/lang/makefile.mk
new file mode 100644
index 000000000000..74eb7121d7ba
--- /dev/null
+++ b/extras/source/premium/templates/presnt/lang/makefile.mk
@@ -0,0 +1,52 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+PRJ=..$/..$/..$/..$/..
+
+
+
+PRJNAME=extras
+TARGET=premiumtemplatespresnt
+
+.INCLUDE : settings.mk
+
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+.IF "$(WITH_EXTRA_TEMPLATE)" != "NO"
+
+
+ZIP1TARGET      = $(PREMIUM_TEMPLATES_PRESNT_IMPRESS_TARGET)
+
+ZIP1LIST	= $(LANGDIR)$/*
+
+
+.ENDIF
+
+.INCLUDE : target.mk
+
+
+
diff --git a/extras/util/target.pmk b/extras/util/target.pmk
index 2280f7d8916c..88122ebc58ee 100644
--- a/extras/util/target.pmk
+++ b/extras/util/target.pmk
@@ -68,6 +68,68 @@ GALLERY_WWWANIM_TARGET          = gallwwwanim
 GALLERY_WWWBACK_TARGET          = gallwwwback
 GALLERY_WWWGRAF_TARGET          = gallwwwgraf
 
+GALLERY_ACCESSORIES_ROOT_TARGET = accessoriesgallery
+GALLERY_ACCESSORIES_DRAWS_PEOPLE_TARGET = accessoriesgallerydrawspeople
+GALLERY_ACCESSORIES_PHOTOS_BUILDINGS_TARGET = accessoriesgalleryphotosbuildings
+GALLERY_ACCESSORIES_PHOTOS_CELEBRATION_TARGET = accessoriesgalleryphotoscelebration
+GALLERY_ACCESSORIES_PHOTOS_CITIES_TARGET = accessoriesgalleryphotoscities
+GALLERY_ACCESSORIES_PHOTOS_FAUNA_TARGET = accessoriesgalleryphotosfauna
+GALLERY_ACCESSORIES_PHOTOS_FLOWERS_TARGET = accessoriesgalleryphotosflowers
+GALLERY_ACCESSORIES_PHOTOS_FOODSANDDRINKS_TARGET = accessoriesgalleryphotosfoodsanddrinks
+GALLERY_ACCESSORIES_PHOTOS_HUMANS_TARGET = accessoriesgalleryphotoshumans
+GALLERY_ACCESSORIES_PHOTOS_LANDSCAPES_TARGET = accessoriesgalleryphotoslandscapes
+GALLERY_ACCESSORIES_PHOTOS_OBJECTS_TARGET = accessoriesgalleryphotosobjects
+GALLERY_ACCESSORIES_PHOTOS_PLANTS_TARGET = accessoriesgalleryphotosplants
+GALLERY_ACCESSORIES_PHOTOS_SPACE_TARGET = accessoriesgalleryphotosspace
+GALLERY_ACCESSORIES_PHOTOS_STATUES_TARGET = accessoriesgalleryphotosstatues
+GALLERY_ACCESSORIES_PHOTOS_TRAVEL_TARGET = accessoriesgalleryphotostravel
+GALLERY_ACCESSORIES_ELEMENTS_BULLETS2_TARGET = accessoriesgalleryelementsbullets2
+
+GALLERY_ACCESSORIES_NONFREE_ROOT_TARGET = accessoriesgallerynonfree
+
+PREMIUM_TEMPLATES_LAYOUT_IMPRESS_TARGET     = accessoriestemplateslayout
+PREMIUM_TEMPLATES_PRESNT_IMPRESS_TARGET     = accessoriestemplatespresent
+PREMIUM_TEMPLATES_EDUCATE_TARGET            = accessoriestemplateseducate
+PREMIUM_TEMPLATES_FINANCE_TARGET            = accessoriestemplatesfinance
+PREMIUM_TEMPLATES_FORMS_TARGET              = accessoriestemplatesforms
+PREMIUM_TEMPLATES_LABELS_TARGET             = accessoriestemplateslabels
+PREMIUM_TEMPLATES_MISC_TARGET               = accessoriestemplatesmisc
+PREMIUM_TEMPLATES_OFFICORR_TARGET           = accessoriestemplatesofficorr
+PREMIUM_TEMPLATES_OFFIMISC_TARGET           = accessoriestemplatesoffimisc
+PREMIUM_TEMPLATES_PERSONAL_TARGET           = accessoriestemplatespersonal
+PREMIUM_TEMPLATES_ROOT_TARGET               = accessoriestemplates
+
+PREMIUM_TEMPLATES_COMMON_LAYOUT_IMPRESS_TARGET     = accessoriestemplatescommonlayout
+PREMIUM_TEMPLATES_COMMON_PRESNT_IMPRESS_TARGET     = accessoriestemplatescommonpresent
+PREMIUM_TEMPLATES_COMMON_EDUCATE_TARGET            = accessoriestemplatescommoneducate
+PREMIUM_TEMPLATES_COMMON_FINANCE_TARGET            = accessoriestemplatescommonfinance
+PREMIUM_TEMPLATES_COMMON_FORMS_TARGET              = accessoriestemplatescommonforms
+PREMIUM_TEMPLATES_COMMON_LABELS_TARGET             = accessoriestemplatescommonlabels
+PREMIUM_TEMPLATES_COMMON_MISC_TARGET               = accessoriestemplatescommonmisc
+PREMIUM_TEMPLATES_COMMON_OFFICORR_TARGET           = accessoriestemplatescommonofficorr
+PREMIUM_TEMPLATES_COMMON_OFFIMISC_TARGET           = accessoriestemplatescommonoffimisc
+PREMIUM_TEMPLATES_COMMON_PERSONAL_TARGET           = accessoriestemplatescommonpersonal
+PREMIUM_TEMPLATES_COMMON_ROOT_TARGET               = accessoriestemplatescommon
+
+PREMIUM_SAMPLES_ROOT_TARGET                 = accessoriessamples
+PREMIUM_SAMPLES_DOCUMENTATION_TARGET        = accessoriessamplesdocumentation
+PREMIUM_SAMPLES_ADVERTISEMENT_TARGET        = accessoriessamplesadvertisement
+
+PREMIUM_TEMPLATES_NONFREE_LAYOUT_IMPRESS_TARGET     = accessoriestemplatesnonfreelayout
+PREMIUM_TEMPLATES_NONFREE_PRESNT_IMPRESS_TARGET     = accessoriestemplatesnonfreepresent
+PREMIUM_TEMPLATES_NONFREE_EDUCATE_TARGET            = accessoriestemplatesnonfreeeducate
+PREMIUM_TEMPLATES_NONFREE_FINANCE_TARGET            = accessoriestemplatesnonfreefinance
+PREMIUM_TEMPLATES_NONFREE_FORMS_TARGET              = accessoriestemplatesnonfreeforms
+PREMIUM_TEMPLATES_NONFREE_LABELS_TARGET             = accessoriestemplatesnonfreelabels
+PREMIUM_TEMPLATES_NONFREE_MISC_TARGET               = accessoriestemplatesnonfreemisc
+PREMIUM_TEMPLATES_NONFREE_OFFICORR_TARGET           = accessoriestemplatesnonfreeofficorr
+PREMIUM_TEMPLATES_NONFREE_OFFIMISC_TARGET           = accessoriestemplatesnonfreeoffimisc
+PREMIUM_TEMPLATES_NONFREE_PERSONAL_TARGET           = accessoriestemplatesnonfreepersonal
+PREMIUM_TEMPLATES_NONFREE_ROOT_TARGET               = accessoriestemplatesnonfree
+PREMIUM_SAMPLES_NONFREE_ROOT_TARGET                 = accessoriessamplesnonfree
+PREMIUM_SAMPLES_NONFREE_DOCUMENTATION_TARGET        = accessoriessamplesnonfreedocumentation
+PREMIUM_SAMPLES_NONFREE_ADVERTISEMENT_TARGET        = accessoriessamplesnonfreeadvertisement
+
 INSO_DUTCH_TARGET               = inso31
 INSO_ENGLISH_UK_TARGET          = inso44
 INSO_ENGLISH_US_TARGET          = inso01
diff --git a/fileaccess/source/FileAccess.cxx b/fileaccess/source/FileAccess.cxx
index e33ab4205b1e..4242d41066df 100644
--- a/fileaccess/source/FileAccess.cxx
+++ b/fileaccess/source/FileAccess.cxx
@@ -374,7 +374,7 @@ void OFileAccess::kill( const rtl::OUString& FileURL )
     ucbhelper::Content aCnt( aDeleteObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment );
     try
     {
-        aCnt.executeCommand( rtl::OUString::createFromAscii( "delete" ), makeAny( sal_Bool( sal_True ) ) );
+        aCnt.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "delete" )), makeAny( sal_Bool( sal_True ) ) );
     }
     catch ( ::com::sun::star::ucb::CommandFailedException const & )
     {
@@ -495,7 +495,7 @@ sal_Int32 OFileAccess::getSize( const rtl::OUString& FileURL )
     sal_Int64 nTemp = 0;
     INetURLObject aObj( FileURL, INET_PROT_FILE );
     ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment );
-    aCnt.getPropertyValue( rtl::OUString::createFromAscii( "Size" ) ) >>= nTemp;
+    aCnt.getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Size" )) ) >>= nTemp;
     nSize = (sal_Int32)nTemp;
     return nSize;
 }
@@ -519,7 +519,7 @@ DateTime OFileAccess::getDateTimeModified( const rtl::OUString& FileURL )
 
     Reference< XCommandEnvironment > aCmdEnv;
     ucbhelper::Content aYoung( aFileObj.GetMainURL( INetURLObject::NO_DECODE ), aCmdEnv );
-    aYoung.getPropertyValue( rtl::OUString::createFromAscii( "DateModified" ) ) >>= aDateTime;
+    aYoung.getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DateModified" )) ) >>= aDateTime;
     return aDateTime;
 }
 
@@ -537,9 +537,6 @@ Sequence< rtl::OUString > OFileAccess::getFolderContents( const rtl::OUString& F
     ucbhelper::Content aCnt( aFolderObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment );
     Reference< XResultSet > xResultSet;
     Sequence< rtl::OUString > aProps(0);
-    //Sequence< rtl::OUString > aProps(1);
-    //rtl::OUString* pProps = aProps.getArray();
-    //pProps[0] == rtl::OUString::createFromAscii( "Url" );
 
     ucbhelper::ResultSetInclude eInclude = bIncludeFolders ? ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS : ucbhelper::INCLUDE_DOCUMENTS_ONLY;
 
@@ -664,7 +661,7 @@ Reference< XStream > OFileAccess::openFileReadWrite( const rtl::OUString& FileUR
 
     try
     {
-        aCnt.executeCommand( rtl::OUString::createFromAscii( "open" ), aCmdArg );
+        aCnt.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "open" )), aCmdArg );
     }
     catch ( InteractiveIOException const & e )
     {
@@ -682,7 +679,7 @@ Reference< XStream > OFileAccess::openFileReadWrite( const rtl::OUString& FileUR
             aInsertArg.ReplaceExisting = sal_False;
 
             aCmdArg <<= aInsertArg;
-            aCnt.executeCommand( rtl::OUString::createFromAscii( "insert" ), aCmdArg );
+            aCnt.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "insert" )), aCmdArg );
 
             // Retry...
             return openFileReadWrite( FileURL );
@@ -858,7 +855,7 @@ Sequence< rtl::OUString > FileAccess_getSupportedServiceNames()
         if( !pNames )
         {
             static Sequence< rtl::OUString > seqNames(1);
-            seqNames.getArray()[0] = rtl::OUString::createFromAscii( SERVICE_NAME );
+            seqNames.getArray()[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ));
             pNames = &seqNames;
         }
     }
@@ -889,7 +886,7 @@ sal_Bool SAL_CALL component_writeInfo(
         {
             Reference< XRegistryKey > xNewKey(
                 reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-                    rtl::OUString::createFromAscii("/" IMPLEMENTATION_NAME "/UNO/SERVICES" ) ) );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/" IMPLEMENTATION_NAME "/UNO/SERVICES" )) ) );
 
             const Sequence< rtl::OUString > & rSNL = io_FileAccess::FileAccess_getSupportedServiceNames();
             const rtl::OUString * pArray = rSNL.getConstArray();
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx
index fdb8fed902af..a75b8e455f7d 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -74,7 +74,7 @@ public:
     ULONG   nFilePos;
 public:
     DffRecordHeader() : nRecVer(0), nRecInstance(0), nImpVerInst(0), nRecType(0), nRecLen(0), nFilePos(0) {}
-    FASTBOOL IsContainer() const { return nRecVer == DFF_PSFLAG_CONTAINER; }
+    bool IsContainer() const { return nRecVer == DFF_PSFLAG_CONTAINER; }
     ULONG    GetRecBegFilePos() const { return nFilePos; }
     ULONG    GetRecEndFilePos() const { return nFilePos + DFF_COMMON_RECORD_HEADER_SIZE + nRecLen; }
     void SeekToEndOfRecord(SvStream& rIn) const { rIn.Seek(nFilePos + DFF_COMMON_RECORD_HEADER_SIZE + nRecLen ); }
@@ -472,7 +472,7 @@ protected :
     long            nEmuDiv;
     long            nPntMul;
     long            nPntDiv;
-    FASTBOOL        bNeedMap;
+    bool        bNeedMap;
     UINT32          nSvxMSDffSettings;
     UINT32          nSvxMSDffOLEConvFlags;
 
@@ -501,7 +501,7 @@ protected :
                                 ULONG nPosGroup,
                                 const unsigned long nDrawingContainerId );
 
-    FASTBOOL ReadGraphic( SvStream& rSt, ULONG nIndex, Graphic& rGraphic ) const;
+    bool ReadGraphic( SvStream& rSt, ULONG nIndex, Graphic& rGraphic ) const;
     SdrObject* ImportFontWork( SvStream&, SfxItemSet&, Rectangle& rBoundRect ) const;
     SdrObject* ImportGraphic( SvStream&, SfxItemSet&, const DffObjData& ) const;
     // #i32596# - pass <nCalledByGroup> to method
@@ -531,10 +531,10 @@ protected :
     virtual BOOL ProcessClientData(  SvStream& rStData, ULONG nDatLen, char*& rpBuff, UINT32& rBuffLen ) const;
     virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj = NULL);
     virtual ULONG Calc_nBLIPPos( ULONG nOrgVal, ULONG nStreamPos ) const;
-    virtual FASTBOOL GetColorFromPalette(USHORT nNum, Color& rColor) const;
+    virtual bool GetColorFromPalette(USHORT nNum, Color& rColor) const;
 
-    FASTBOOL ReadDffString(SvStream& rSt, String& rTxt) const;
-    FASTBOOL ReadObjText(SvStream& rSt, SdrObject* pObj) const;
+    bool ReadDffString(SvStream& rSt, String& rTxt) const;
+    bool ReadObjText(SvStream& rSt, SdrObject* pObj) const;
 
     // SJ: New implementation of ReadObjText is used by Fontwork objects, because
     // the old one does not properly import multiple paragraphs
@@ -573,10 +573,10 @@ public:
     Color MSO_TEXT_CLR_ToColor( sal_uInt32 nColorCode ) const;
     Color MSO_CLR_ToColor( sal_uInt32 nColorCode, sal_uInt16 nContextProperty = DFF_Prop_lineColor ) const;
     virtual BOOL SeekToShape( SvStream& rSt, void* pClientData, UINT32 nId ) const;
-    FASTBOOL SeekToRec( SvStream& rSt, USHORT nRecId, ULONG nMaxFilePos, DffRecordHeader* pRecHd = NULL, ULONG nSkipCount = 0 ) const;
-    FASTBOOL SeekToRec2( USHORT nRecId1, USHORT nRecId2, ULONG nMaxFilePos, DffRecordHeader* pRecHd = NULL, ULONG nSkipCount = 0 ) const;
+    bool SeekToRec( SvStream& rSt, USHORT nRecId, ULONG nMaxFilePos, DffRecordHeader* pRecHd = NULL, ULONG nSkipCount = 0 ) const;
+    bool SeekToRec2( USHORT nRecId1, USHORT nRecId2, ULONG nMaxFilePos, DffRecordHeader* pRecHd = NULL, ULONG nSkipCount = 0 ) const;
 
-    static void MSDFFReadZString( SvStream& rIn, String& rStr, ULONG nMaxLen, FASTBOOL bUniCode = FALSE );
+    static void MSDFFReadZString( SvStream& rIn, String& rStr, ULONG nMaxLen, bool bUniCode = FALSE );
 
     static BOOL ReadCommonRecordHeader( DffRecordHeader& rRec, SvStream& rIn );
     static BOOL ReadCommonRecordHeader( SvStream& rSt,
diff --git a/filter/inc/filter/msfilter/msocximex.hxx b/filter/inc/filter/msfilter/msocximex.hxx
index 7269b1f7f5bb..345e29a51000 100644
--- a/filter/inc/filter/msfilter/msocximex.hxx
+++ b/filter/inc/filter/msfilter/msocximex.hxx
@@ -294,6 +294,8 @@ public:
     rtl::OUString msCtrlSource;
     rtl::OUString msRowSource;
         SfxObjectShell *pDocSh;
+    ::rtl::OUString sImageUrl;
+    com::sun::star::uno::Reference< com::sun::star::graphic::XGraphicObject> mxGrfObj;
 protected:
 
     sal_uInt32 ImportColor(sal_uInt32 nColorCode) const;
@@ -416,30 +418,31 @@ public:
 
     sal_uInt8 pPictureHeader[20];
     sal_uInt32 nPictureLen;
-    ::rtl::OUString sImageUrl;
-    com::sun::star::uno::Reference< com::sun::star::graphic::XGraphicObject> mxGrfObj;
 
 };
 
 class OCX_TabStrip : public OCX_Control
 {
 public:
-    OCX_TabStrip() : OCX_Control( rtl::OUString::createFromAscii("TabStrip")) {}
+    OCX_TabStrip() : OCX_Control( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TabStrip" ))), nIdentifier(0), nFixedAreaLen(0), nNumTabs(0), bHasTabs(true) {}
+
         virtual sal_Bool ReadFontData(SotStorageStream *pS);
         virtual sal_Bool Read(SotStorageStream *pS);
 
+    std::vector< rtl::OUString > msItems;
     sal_uInt16  nIdentifier;
     sal_uInt16  nFixedAreaLen;
     sal_uInt8   pBlockFlags[4];
-    sal_uInt16  nNumTabs;
+    sal_Int32   nNumTabs;
+    bool        bHasTabs;
 };
 
 class OCX_Image : public OCX_Control
 {
 public:
-    OCX_Image() : OCX_Control(rtl::OUString::createFromAscii("Image")), fEnabled(1), fBackStyle(0), bPictureTiling(false), bAutoSize(false) {
-                msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.DatabaseImageControl");
-        msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlImageControlModel");
+    OCX_Image() : OCX_Control(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Image" ))), fEnabled(1), fBackStyle(0), bPictureTiling(false), bAutoSize(false) {
+                msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.DatabaseImageControl" ));
+        msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlImageControlModel" ));
          }
 
     ~OCX_Image() { }
@@ -465,8 +468,6 @@ public:
     sal_uInt8   nSpecialEffect;
 
         bool bAutoSize;
-        ::rtl::OUString sImageUrl;
-        com::sun::star::uno::Reference< com::sun::star::graphic::XGraphicObject> mxGrfObj;
         sal_Bool Read(SotStorageStream *pS);
 
     using OCX_Control::Import; // to not hide the other two import methods
@@ -487,8 +488,7 @@ public:
 };
 struct ContainerRecord
 {
-    ContainerRecord():nTop(0), nLeft(0), nSubStorageId(0), nSubStreamLen(0), nTabPos(0), nTypeIdent(0), bVisible( true ) {}
-
+    ContainerRecord():nTop(0), nLeft(0), nSubStorageId(0), nSubStreamLen(0), nTabPos(0), nTypeIdent(0), bVisible( true ), bTabStop( true ) {}
     ::rtl::OUString cName;
     ::rtl::OUString controlTip;
     ::rtl::OUString sCtrlSource;
@@ -501,6 +501,7 @@ struct ContainerRecord
     sal_uInt16  nTabPos;
     sal_uInt16 nTypeIdent;
     bool bVisible;
+    bool bTabStop;
 };
 
 typedef std::vector<OCX_Control*>::iterator CtrlIterator;
@@ -509,44 +510,32 @@ typedef std::vector<OCX_Control*>  CtrlList;
 
 class OCX_OptionButton;
 
-class OCX_ContainerControl : public OCX_Control
+class OCX_ParentControl : public OCX_Control
 {
 public:
-    virtual ~OCX_ContainerControl();
-        // sub class will process the control specific information
-        // e.g frame or userform ( maybe tab, mulipage in the future )
-        // Base (this) class will process the container specific information
-        // e.g. the controls contained by this container
-        // will
-        // a) create the controls
-        // b) read the controls
-        // c) store these controls in a list for post processing
-        //     e.g. import
-        //
     virtual sal_Bool Read(SvStorageStream *pS);
-        // No Font record
     virtual sal_Bool ReadFontData(SvStorageStream* /*pS*/) { return sal_True; }
 
     using OCX_Control::Import; // to not hide the other two import methods
+
     virtual sal_Bool Import(com::sun::star::uno::Reference<
         com::sun::star::beans::XPropertySet> &rPropSet);
 
         SotStorageStreamRef getContainerStream() { return mContainerStream; }
 
+        SotStorageStreamRef getOStream() { return mContainedControlsStream; }
         virtual void ProcessControl( OCX_Control* pControl, SvStorageStream* pS, ContainerRecord& rec );
-        bool createFromContainerRecord( ContainerRecord& record,
+        bool createFromContainerRecord( const ContainerRecord& record,
             OCX_Control*& );
         SotStorageStreamRef getContainedControlsStream(){ return mContainedControlsStream; }
 protected:
-        // This class not meant to be instantiated
-        // needs to be subclassed
-    OCX_ContainerControl( SotStorageRef& parent,
+    OCX_ParentControl( SotStorageRef& parent,
             const ::rtl::OUString& storageName,
             const ::rtl::OUString& sN,
             const com::sun::star::uno::Reference<
-                com::sun::star::container::XNameContainer >  &rParent,
+            com::sun::star::container::XNameContainer >  &rDialog,
             OCX_Control* pParent = NULL );
-        rtl::OUString createSubStreamName( const sal_uInt32& subStorageID );
+    ~OCX_ParentControl();
 
         com::sun::star::uno::Reference<
                 com::sun::star::container::XNameContainer > mxParent;
@@ -555,84 +544,56 @@ protected:
         SotStorageRef mContainerStorage;
         SotStorageStreamRef mContainerStream;
         SotStorageStreamRef mContainedControlsStream;
-    sal_uInt32 nNoRecords;
-    sal_uInt32 nTotalLen;
-        sal_uInt32 containerType;
-
-private:
-        OCX_ContainerControl(); // not implemented
-        OCX_ContainerControl(const OCX_ContainerControl&); // not implemented
-};
-
-
-class OCX_MultiPage : public OCX_ContainerControl
-{
-public:
-    OCX_MultiPage( SotStorageRef& parent,
-            const ::rtl::OUString& storageName,
-            const ::rtl::OUString& sN,
-            const com::sun::star::uno::Reference<
-                com::sun::star::container::XNameContainer >  &rDialog, OCX_Control* pParent = NULL);
-    virtual ~OCX_MultiPage()
-    {
-        delete[] pCaption;
-        delete[] pIcon;
-        delete[] pPicture;
-    }
-    virtual sal_Bool Read(SvStorageStream *pS);
-
-    using OCX_ContainerControl::Import; // to not hide the other two import methods
-    virtual sal_Bool Import(com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet> &rPropSet);
-    virtual sal_Bool Import(com::sun::star::uno::Reference<
-        com::sun::star::container::XNameContainer>
-        &rDialog);
-        virtual void ProcessControl( OCX_Control* pControl, SvStorageStream* pS, ContainerRecord& rec );
-    /*sal_uInt8 for sal_uInt8 Word Struct*/
     sal_uInt16 nIdentifier;
     sal_uInt16 nFixedAreaLen;
     sal_uInt8   pBlockFlags[4];
 
-    sal_uInt32  fUnknown1;
+    sal_uInt32  nChildrenA;
+    sal_uInt32  nNextAvailableID;
+    sal_uInt32  nBooleanProperties;
+    sal_uInt32  nGroupCnt;
+    sal_uInt32  nZoom;
 
-    sal_uInt8   fUnknown2:1;
+    sal_uInt8   fUnknown1:1;
     sal_uInt8   fEnabled:1;
     sal_uInt8   fLocked:1;
     sal_uInt8   fBackStyle:1;
-    sal_uInt8   fUnknown3:4;
+    sal_uInt8   fUnknown2:4;
 
-    sal_uInt8   fUnknown4:8;
+    sal_uInt8   fUnknown3:8;
 
-    sal_uInt8   fUnknown5:7;
+    sal_uInt8   fUnknown4:7;
     sal_uInt8   fWordWrap:1;
 
-    sal_uInt8   fUnknown6:4;
+    sal_uInt8   fUnknown5:4;
     sal_uInt8   fAutoSize:1;
-    sal_uInt8   fUnknown7:3;
+    sal_uInt8   fUnknown6:3;
 
     sal_uInt32  nCaptionLen;
     sal_uInt16  nVertPos;
     sal_uInt16  nHorzPos;
-    sal_uInt8   nMousePointer;
     sal_uInt32  nBorderColor;
-    sal_uInt32  fUnknown8;
-    sal_uInt32  fUnknown9;
+    sal_uInt32  nDrawBuffer;
+    sal_uInt32  nShapeCookie;
     sal_uInt8   nKeepScrollBarsVisible;
     sal_uInt8   nCycle;
-    sal_uInt16  nBorderStyle;
-    sal_uInt16  nSpecialEffect;
+    sal_uInt8   nBorderStyle;
+    sal_uInt8   nMousePointer;
+    sal_uInt8   nSpecialEffect;
     sal_uInt16  nPicture;
     sal_uInt8   nPictureAlignment;
     sal_uInt8   nPictureSizeMode;
     bool        bPictureTiling;
     sal_uInt16  nAccelerator;
     sal_uInt16  nIcon;
+    sal_uInt16  fUnknown7;
 
     char *pCaption;
 
     sal_uInt32  nScrollWidth;
     sal_uInt32  nScrollHeight;
-
+    sal_uInt32  nScrollLeft;
+    sal_uInt32  nScrollTop;
 
     sal_uInt8 pIconHeader[20];
     sal_uInt32  nIconLen;
@@ -640,253 +601,91 @@ public:
 
     sal_uInt8 pPictureHeader[20];
     sal_uInt32  nPictureLen;
-    sal_uInt8 *pPicture;
 private:
-        sal_Int32 mnCurrentPageStep;
-};
-
+     OCX_ParentControl(); // not implemented
+     OCX_ParentControl(const OCX_ParentControl&); // not implemented
 
+};
 
-class OCX_Page : public OCX_ContainerControl
+class OCX_Page;
+class OCX_MultiPage : public OCX_ParentControl
 {
 public:
-    OCX_Page( SotStorageRef& parentStorage,
+    OCX_MultiPage( SotStorageRef& parent,
             const ::rtl::OUString& storageName,
             const ::rtl::OUString& sN,
             const com::sun::star::uno::Reference<
-                com::sun::star::container::XNameContainer >  &rDialog, OCX_Control* parent = NULL);
-    virtual ~OCX_Page()
-    {
-        delete[] pCaption;
-        delete[] pIcon;
-        delete[] pPicture;
-    }
+                com::sun::star::container::XNameContainer >  &rDialog, OCX_Control* pParent = NULL);
+
     virtual sal_Bool Read(SvStorageStream *pS);
 
-    using OCX_ContainerControl::Import; // to not hide the other two import methods
+    using OCX_ParentControl::Import; // to not hide the other two import methods
     virtual sal_Bool Import(com::sun::star::uno::Reference<
-        com::sun::star::container::XNameContainer>
-        &rDialog);
-/*  virtual sal_Bool Import(com::sun::star::uno::Reference<
         com::sun::star::beans::XPropertySet> &rPropSet);
-*/
-    /*sal_uInt8 for sal_uInt8 Word Struct*/
-    sal_uInt16 nIdentifier;
-    sal_uInt16 nFixedAreaLen;
-    sal_uInt8   pBlockFlags[4];
-
-    sal_uInt32  fUnknown1;
-
-    sal_uInt8   fUnknown2:1;
-    sal_uInt8   fEnabled:1;
-    sal_uInt8   fLocked:1;
-    sal_uInt8   fBackStyle:1;
-    sal_uInt8   fUnknown3:4;
-
-    sal_uInt8   fUnknown4:8;
-
-    sal_uInt8   fUnknown5:7;
-    sal_uInt8   fWordWrap:1;
-
-    sal_uInt8   fUnknown6:4;
-    sal_uInt8   fAutoSize:1;
-    sal_uInt8   fUnknown7:3;
-
-    sal_uInt32  nCaptionLen;
-    sal_uInt16  nVertPos;
-    sal_uInt16  nHorzPos;
-    sal_uInt8   nMousePointer;
-    sal_uInt32  nBorderColor;
-    sal_uInt32  fUnknown8;
-    sal_uInt32  fUnknown9;
-    sal_uInt8   nKeepScrollBarsVisible;
-    sal_uInt8   nCycle;
-    sal_uInt16  nBorderStyle;
-    sal_uInt16  nSpecialEffect;
-    sal_uInt16  nPicture;
-    sal_uInt8   nPictureAlignment;
-    sal_uInt8   nPictureSizeMode;
-    bool        bPictureTiling;
-    sal_uInt16  nAccelerator;
-    sal_uInt16  nIcon;
-
-    char *pCaption;
-
-    sal_uInt32  nScrollWidth;
-    sal_uInt32  nScrollHeight;
+    virtual void ProcessControl( OCX_Control* pControl, SvStorageStream* pS, ContainerRecord& rec );
+private:
+    sal_Int32 nActiveTab;
+    SotStorageStreamRef mXStream;
+    bool bHasTabs;
+    std::vector< rtl::OUString > sCaptions;
+    // order of Ids corrosponds to the order of captions above
+    std::vector< sal_Int32 > mPageIds;
+    std::hash_map< sal_Int32, OCX_Page* > idToPage;
+};
 
 
-    sal_uInt8 pIconHeader[20];
-    sal_uInt32  nIconLen;
-    sal_uInt8 *pIcon;
+class OCX_Page : public OCX_ParentControl
+{
+public:
+    OCX_Page( SotStorageRef& parentStorage,
+        sal_Int32 nID,
+        const ::rtl::OUString& sN,
+        const com::sun::star::uno::Reference<
+        com::sun::star::container::XNameContainer >  &rDialog, OCX_Control* parent = NULL);
+    virtual sal_Bool Read(SvStorageStream *pS);
 
-    sal_uInt8 pPictureHeader[20];
-    sal_uInt32  nPictureLen;
-    sal_uInt8 *pPicture;
+    using OCX_ParentControl::Import; // to not hide the other two import methods
+    virtual sal_Bool Import(com::sun::star::uno::Reference<
+        com::sun::star::beans::XPropertySet> &rPropSet);
+    rtl::OUString msTitle; // #FIXME we should use the existing caption
+    sal_Int32 mnID;
 private:
 };
 
 
-class OCX_Frame : public OCX_ContainerControl
+class OCX_Frame : public OCX_ParentControl
 {
 public:
     OCX_Frame( SotStorageRef& parent,
-            const ::rtl::OUString& storageName,
-            const ::rtl::OUString& sN,
-            const com::sun::star::uno::Reference<
-                com::sun::star::container::XNameContainer >  &rDialog, OCX_Control* pParent = NULL);
-    virtual ~OCX_Frame()
-    {
-        delete[] pCaption;
-        delete[] pIcon;
-        delete[] pPicture;
-    }
+        const ::rtl::OUString& storageName,
+        const ::rtl::OUString& sN,
+        const com::sun::star::uno::Reference<
+        com::sun::star::container::XNameContainer >  &rDialog, OCX_Control* pParent = NULL);
     virtual sal_Bool Read(SvStorageStream *pS);
 
-    using OCX_ContainerControl::Import; // to not hide the other two import methods
+    using OCX_ParentControl::Import; // to not hide the other two import methods
     virtual sal_Bool Import(com::sun::star::uno::Reference<
         com::sun::star::beans::XPropertySet> &rPropSet);
-
-    /*sal_uInt8 for sal_uInt8 Word Struct*/
-    sal_uInt16 nIdentifier;
-    sal_uInt16 nFixedAreaLen;
-    sal_uInt8   pBlockFlags[4];
-
-    sal_uInt32  fUnknown1;
-
-    sal_uInt8   fUnknown2:1;
-    sal_uInt8   fEnabled:1;
-    sal_uInt8   fLocked:1;
-    sal_uInt8   fBackStyle:1;
-    sal_uInt8   fUnknown3:4;
-
-    sal_uInt8   fUnknown4:8;
-
-    sal_uInt8   fUnknown5:7;
-    sal_uInt8   fWordWrap:1;
-
-    sal_uInt8   fUnknown6:4;
-    sal_uInt8   fAutoSize:1;
-    sal_uInt8   fUnknown7:3;
-
-    sal_uInt32  nCaptionLen;
-    sal_uInt16  nVertPos;
-    sal_uInt16  nHorzPos;
-    sal_uInt8   nMousePointer;
-    sal_uInt32  nBorderColor;
-    sal_uInt32  fUnknown8;
-    sal_uInt32  fUnknown9;
-    sal_uInt8   nKeepScrollBarsVisible;
-    sal_uInt8   nCycle;
-    sal_uInt16  nBorderStyle;
-    sal_uInt16  nSpecialEffect;
-    sal_uInt16  nPicture;
-    sal_uInt8   nPictureAlignment;
-    sal_uInt8   nPictureSizeMode;
-    bool        bPictureTiling;
-    sal_uInt16  nAccelerator;
-    sal_uInt16  nIcon;
-
-    char *pCaption;
-
-    sal_uInt32  nScrollWidth;
-    sal_uInt32  nScrollHeight;
-    sal_uInt32  nScrollLeft;
-    sal_uInt32  nScrollTop;
-
-
-    sal_uInt8 pIconHeader[20];
-    sal_uInt32  nIconLen;
-    sal_uInt8 *pIcon;
-
-    sal_uInt8 pPictureHeader[20];
-    sal_uInt32  nPictureLen;
-    sal_uInt8 *pPicture;
-private:
 };
 
-class OCX_UserForm : public OCX_ContainerControl
+
+class OCX_UserForm : public OCX_ParentControl
 {
 public:
     OCX_UserForm( SotStorageRef& parent,
-            const ::rtl::OUString& storageName,
-            const ::rtl::OUString& sN,
-            const com::sun::star::uno::Reference<
-                com::sun::star::container::XNameContainer >  &rDialog,
-            const com::sun::star::uno::Reference<
-                com::sun::star::lang::XMultiServiceFactory >& rMsf);
-    ~OCX_UserForm()
-    {
-        delete[] pCaption;
-        delete[] pIcon;
-    }
-
-    virtual sal_Bool Read(SvStorageStream *pS);
-
-    using OCX_ContainerControl::Import; // to not hide the other two import methods
+        const ::rtl::OUString& storageName,
+        const ::rtl::OUString& sN,
+        const com::sun::star::uno::Reference<
+        com::sun::star::container::XNameContainer >  &rDialog,
+        const com::sun::star::uno::Reference<
+        com::sun::star::lang::XMultiServiceFactory >& rMsf);
+    using OCX_ParentControl::Import; // to not hide the other two import methods
     virtual sal_Bool Import( com::sun::star::uno::Reference<
         com::sun::star::container::XNameContainer>
         &rDialog);
-
-    /*sal_uInt8 for sal_uInt8 Word Struct*/
-    sal_uInt16 nIdentifier;
-    sal_uInt16 nFixedAreaLen;
-    sal_uInt8   pBlockFlags[4];
-
-    sal_uInt32  nChildrenA;
-
-    sal_uInt8   fUnknown1:1;
-    sal_uInt8   fEnabled:1;
-    sal_uInt8   fLocked:1;
-    sal_uInt8   fBackStyle:1;
-    sal_uInt8   fUnknown2:4;
-
-    sal_uInt8   fUnknown3:8;
-
-    sal_uInt8   fUnknown4:7;
-    sal_uInt8   fWordWrap:1;
-
-    sal_uInt8   fUnknown5:4;
-    sal_uInt8   fAutoSize:1;
-    sal_uInt8   fUnknown6:3;
-
-    sal_uInt32  nCaptionLen;
-    sal_uInt16  nVertPos;
-    sal_uInt16  nHorzPos;
-    sal_uInt8   nMousePointer;
-    sal_uInt32  nBorderColor;
-    sal_uInt32  nDrawBuffer;
-    sal_uInt32  nChildrenB;
-    sal_uInt8   nKeepScrollBarsVisible;
-    sal_uInt8   nCycle;
-    sal_uInt16  nBorderStyle;
-    sal_uInt8   nSpecialEffect;
-    sal_uInt16  nPicture;
-    sal_uInt8   nPictureAlignment;
-    sal_uInt8   nPictureSizeMode;
-    bool        bPictureTiling;
-    sal_uInt16  nAccelerator;
-    sal_uInt16  nIcon;
-    sal_uInt16  fUnknown7;
-
-    char *pCaption;
-
-    sal_uInt32  nScrollWidth;
-    sal_uInt32  nScrollHeight;
-    sal_uInt32  nScrollLeft;
-    sal_uInt32  nScrollTop;
-
-    sal_uInt8 pIconHeader[20];
-    sal_uInt32  nIconLen;
-    sal_uInt8 *pIcon;
-
-    sal_uInt8 pPictureHeader[20];
-    sal_uInt32  nPictureLen;
-    ::rtl::OUString sImageUrl;
-    com::sun::star::uno::Reference< com::sun::star::graphic::XGraphicObject> mxGrfObj;
 private:
-        com::sun::star::uno::Reference<
-                com::sun::star::uno::XComponentContext> mxCtx;
+    com::sun::star::uno::Reference<
+        com::sun::star::uno::XComponentContext> mxCtx;
 };
 
 
@@ -894,9 +693,9 @@ private:
 class OCX_CheckBox : public OCX_ModernControl
 {
 public:
-    OCX_CheckBox() : OCX_ModernControl(rtl::OUString::createFromAscii("CheckBox")){
-        msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.CheckBox");
-        msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlCheckBoxModel");
+    OCX_CheckBox() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CheckBox" ))){
+        msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.CheckBox" ));
+        msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlCheckBoxModel" ));
         mnBackColor = 0x80000005L;
         mnForeColor = 0x80000008L;
         aFontData.SetHasAlign(TRUE);
@@ -919,11 +718,11 @@ public:
 class OCX_OptionButton : public OCX_ModernControl
 {
 public:
-    OCX_OptionButton() : OCX_ModernControl(rtl::OUString::createFromAscii("OptionButton"))
+    OCX_OptionButton() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OptionButton" )))
     {
-        msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.RadioButton");
-        //msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlRadioButtonModel");
-        msDialogType = rtl::OUString::createFromAscii("com.sun.star.form.component.RadioButton");
+        msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.RadioButton" ));
+        //msDialogType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlRadioButtonModel"));
+        msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.RadioButton" ));
         mnBackColor = 0x80000005L;
         mnForeColor = 0x80000008L;
         aFontData.SetHasAlign(TRUE);
@@ -948,9 +747,9 @@ public:
 class OCX_TextBox : public OCX_ModernControl
 {
 public:
-    OCX_TextBox() : OCX_ModernControl(rtl::OUString::createFromAscii("TextBox")) {
-        msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.TextField");
-        msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlEditModel");
+    OCX_TextBox() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextBox" ))) {
+        msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.TextField" ));
+        msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlEditModel" ));
         mnBackColor = 0x80000005L;
         mnForeColor = 0x80000008L;
         nBorderColor = 0x80000006L;
@@ -975,7 +774,7 @@ public:
 class OCX_FieldControl: public OCX_ModernControl
 {
 public:
-    OCX_FieldControl() : OCX_ModernControl(rtl::OUString::createFromAscii("TextBox")) {
+    OCX_FieldControl() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextBox" ))) {
         mnBackColor = 0x80000005L;
         mnForeColor = 0x80000008L;
         nBorderColor = 0x80000006L;
@@ -995,9 +794,9 @@ public:
 class OCX_ToggleButton : public OCX_ModernControl
 {
 public:
-    OCX_ToggleButton() : OCX_ModernControl(rtl::OUString::createFromAscii("ToggleButton")) {
-                msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.CommandButton");
-                msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlButtonModel");
+    OCX_ToggleButton() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ToggleButton" ))) {
+                msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.CommandButton" ));
+                msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlButtonModel" ));
 
         mnBackColor = 0x8000000F;
         mnForeColor = 0x80000012;
@@ -1022,9 +821,9 @@ public:
 class OCX_ComboBox : public OCX_ModernControl
 {
 public:
-    OCX_ComboBox() : OCX_ModernControl(rtl::OUString::createFromAscii("ComboBox")){
-        msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.ComboBox");
-            msDialogType = rtl::OUString::createFromAscii("com.sun.star.form.component.ComboBox");
+    OCX_ComboBox() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ComboBox" ))){
+        msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ComboBox" ));
+            msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ComboBox" ));
         mnBackColor = 0x80000005;
         mnForeColor = 0x80000008;
         nBorderColor = 0x80000006;
@@ -1047,10 +846,10 @@ public:
 class OCX_ListBox : public OCX_ModernControl
 {
 public:
-    OCX_ListBox() : OCX_ModernControl(rtl::OUString::createFromAscii("ListBox")){
-        msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.ListBox");
-        //msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlListBoxModel");
-        msDialogType = rtl::OUString::createFromAscii("com.sun.star.form.component.ListBox");
+    OCX_ListBox() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListBox" ))){
+        msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ListBox" ));
+        //msDialogType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlListBoxModel"));
+        msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ListBox" ));
         mnBackColor = 0x80000005;
         mnForeColor = 0x80000008;
         nBorderColor = 0x80000006;
@@ -1080,8 +879,8 @@ public:
         nAccelerator(0), nIcon(0), pCaption(0), nIconLen(0), pIcon(0), nPictureLen(0),
         mbTakeFocus( true )
     {
-            msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.CommandButton");
-            msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlButtonModel");
+            msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.CommandButton" ));
+            msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlButtonModel" ));
             mnForeColor = 0x80000012L;
                 mnBackColor = 0x8000000FL;
     }
@@ -1131,8 +930,6 @@ public:
 
     sal_uInt8 pPictureHeader[20];
     sal_uInt32  nPictureLen;
-    ::rtl::OUString sImageUrl;
-    com::sun::star::uno::Reference< com::sun::star::graphic::XGraphicObject> mxGrfObj;
 
     bool        mbTakeFocus;
 
@@ -1189,15 +986,15 @@ public:
 class OCX_Label : public OCX_Control
 {
 public:
-    OCX_Label(OCX_Control* pParent = NULL ) : OCX_Control(rtl::OUString::createFromAscii("Label"), pParent ), fEnabled(1),
+    OCX_Label(OCX_Control* pParent = NULL ) : OCX_Control(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Label" )), pParent ), fEnabled(1),
         fLocked(0),fBackStyle(1),fWordWrap(1),
     fAutoSize(0),nCaptionLen(0),nVertPos(1),nHorzPos(7),nMousePointer(0),
     nBorderColor(0x80000006),nBorderStyle(0),nSpecialEffect(0),
     nPicture(0),nAccelerator(0),nIcon(0),pCaption(0),nIconLen(0),pIcon(0),
-    nPictureLen(0),pPicture(0)
+    nPictureLen(0)
     {
-        msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.FixedText");
-        msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFixedTextModel");
+        msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.FixedText" ));
+        msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlFixedTextModel" ));
                 mnForeColor = 0x80000008;
                 mnBackColor = 0x80000005;
         aFontData.SetHasAlign(TRUE);
@@ -1206,7 +1003,6 @@ public:
     ~OCX_Label() {
         if (pCaption) delete[] pCaption;
         if (pIcon) delete[] pIcon;
-        if (pPicture) delete[] pPicture;
     }
     sal_Bool Read(SotStorageStream *pS);
 
@@ -1250,7 +1046,6 @@ public:
 
     sal_uInt8 pPictureHeader[20];
     sal_uInt32  nPictureLen;
-    sal_uInt8 *pPicture;
 
     static OCX_Control *Create() { return new OCX_Label;}
 
@@ -1386,9 +1181,9 @@ public:
 class HTML_TextBox : public OCX_ModernControl
 {
 public:
-    HTML_TextBox() : OCX_ModernControl(rtl::OUString::createFromAscii("TextBox")) {
-        msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.TextField");
-        msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlEditModel");
+    HTML_TextBox() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextBox" ))) {
+        msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.TextField" ));
+        msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlEditModel" ));
         mnBackColor = 0x80000005L;
         mnForeColor = 0x80000008L;
         nBorderColor = 0x80000006L;
diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx
index c443f169e586..1bdf54fbb774 100644
--- a/filter/inc/filter/msfilter/svdfppt.hxx
+++ b/filter/inc/filter/msfilter/svdfppt.hxx
@@ -454,7 +454,7 @@ public:
 
                         SdrEscherImport( PowerPointImportParam&, const String& rBaseURL );
     virtual             ~SdrEscherImport();
-    virtual FASTBOOL    GetColorFromPalette( USHORT nNum, Color& rColor ) const;
+    virtual bool    GetColorFromPalette( USHORT nNum, Color& rColor ) const;
     virtual BOOL        SeekToShape( SvStream& rSt, void* pClientData, UINT32 nId ) const;
     PptFontEntityAtom*  GetFontEnityAtom( UINT32 nNum ) const;
     CharSet             GetCharSet( UINT32 nNum ) const;
@@ -598,7 +598,7 @@ public:
     USHORT      GetMasterPageIndex( USHORT nPageNum, PptPageKind ePageKind = PPT_SLIDEPAGE ) const;
 
     void        ImportPage( SdrPage* pPage, const PptSlidePersistEntry* pMasterPersist = NULL );
-    virtual FASTBOOL    GetColorFromPalette(USHORT nNum, Color& rColor) const;
+    virtual bool    GetColorFromPalette(USHORT nNum, Color& rColor) const;
     virtual BOOL        SeekToShape( SvStream& rSt, void* pClientData, UINT32 nId ) const;
     sal_Unicode         PPTSubstitute( UINT16 nFont, sal_Unicode nChar,
                                         UINT32& nMappedFontId, Font& rFont, char nDefault ) const;
diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx
index 2653366a5b38..29cc0cc5d321 100644
--- a/filter/source/config/cache/basecontainer.cxx
+++ b/filter/source/config/cache/basecontainer.cxx
@@ -156,7 +156,7 @@ void BaseContainer::impl_initFlushMode()
         m_pFlushCache = m_rCache->clone();
     if (!m_pFlushCache)
         throw css::uno::RuntimeException(
-                ::rtl::OUString::createFromAscii("Cant create write copy of internal used cache on demand."),
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant create write copy of internal used cache on demand." )),
                 dynamic_cast< css::container::XNameAccess* >(this));
     // <- SAFE
 }
@@ -231,7 +231,7 @@ void SAL_CALL BaseContainer::insertByName(const ::rtl::OUString& sItem ,
 {
     if (!sItem.getLength())
         throw css::lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii("empty value not allowed as item name."),
+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "empty value not allowed as item name." )),
             static_cast< css::container::XNameContainer* >(this),
             1);
 
@@ -297,7 +297,7 @@ void SAL_CALL BaseContainer::replaceByName(const ::rtl::OUString& sItem ,
 {
     if (!sItem.getLength())
         throw css::lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii("empty value not allowed as item name."),
+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "empty value not allowed as item name." )),
             static_cast< css::container::XNameContainer* >(this),
             1);
 
@@ -338,7 +338,7 @@ css::uno::Any SAL_CALL BaseContainer::getByName(const ::rtl::OUString& sItem)
 {
     if (!sItem.getLength())
         throw css::container::NoSuchElementException(
-                ::rtl::OUString::createFromAscii("An empty item cant be part of this cache!"),
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "An empty item cant be part of this cache!" )),
                 css::uno::Reference< css::uno::XInterface >(static_cast< css::container::XNameAccess* >(this), css::uno::UNO_QUERY));
 
     css::uno::Any aValue;
@@ -543,7 +543,7 @@ void SAL_CALL BaseContainer::flush()
 
     if (!m_pFlushCache)
         throw css::lang::WrappedTargetRuntimeException(
-                ::rtl::OUString::createFromAscii("Cant guarantee cache consistency. Special flush container does not exists!"),
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant guarantee cache consistency. Special flush container does not exists!" )),
                 dynamic_cast< css::container::XNameAccess* >(this),
                 css::uno::Any());
 
@@ -566,7 +566,7 @@ void SAL_CALL BaseContainer::flush()
         // later again ...
 
         throw css::lang::WrappedTargetRuntimeException(
-                ::rtl::OUString::createFromAscii("Flush rejected by internal container."),
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Flush rejected by internal container." )),
                 dynamic_cast< css::container::XNameAccess* >(this),
                 css::uno::makeAny(ex));
     }
diff --git a/filter/source/config/cache/configflush.cxx b/filter/source/config/cache/configflush.cxx
index 426d3495d3c8..b675cee4312b 100644
--- a/filter/source/config/cache/configflush.cxx
+++ b/filter/source/config/cache/configflush.cxx
@@ -146,7 +146,7 @@ void SAL_CALL ConfigFlush::removeRefreshListener(const css::uno::Reference< css:
 //-----------------------------------------------
 ::rtl::OUString ConfigFlush::impl_getImplementationName()
 {
-    static ::rtl::OUString IMPLNAME = ::rtl::OUString::createFromAscii("com.sun.star.comp.filter.config.ConfigFlush");
+    static ::rtl::OUString IMPLNAME( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.filter.config.ConfigFlush" ));
     return IMPLNAME;
 }
 
diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx
index 7e9bf1a4356d..c842df864f7a 100644
--- a/filter/source/config/cache/contenthandlerfactory.cxx
+++ b/filter/source/config/cache/contenthandlerfactory.cxx
@@ -176,7 +176,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL ContentHandlerFactory::getAvailab
 -----------------------------------------------*/
 ::rtl::OUString ContentHandlerFactory::impl_getImplementationName()
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.filter.config.ContentHandlerFactory");
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.filter.config.ContentHandlerFactory" ));
 }
 
 /*-----------------------------------------------
@@ -185,7 +185,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL ContentHandlerFactory::getAvailab
 css::uno::Sequence< ::rtl::OUString > ContentHandlerFactory::impl_getSupportedServiceNames()
 {
     css::uno::Sequence< ::rtl::OUString > lServiceNames(1);
-    lServiceNames[0] = ::rtl::OUString::createFromAscii("com.sun.star.frame.ContentHandlerFactory");
+    lServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ContentHandlerFactory" ));
     return lServiceNames;
 }
 
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 31e7690cd0e1..b9688063a486 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -77,7 +77,7 @@ namespace css = ::com::sun::star;
 // Error message in case filter config seems to be corrupted.
 // Note: Dont tell user something about "setup -repair"!
 // Its no longer supported by using native installers ...
-static ::rtl::OUString MESSAGE_CORRUPTED_FILTERCONFIG = ::rtl::OUString::createFromAscii("The filter configuration appears to be defective. Please install the office suite again.");
+static ::rtl::OUString MESSAGE_CORRUPTED_FILTERCONFIG( RTL_CONSTASCII_USTRINGPARAM( "The filter configuration appears to be defective. Please install the office suite again." ));
 
 /*-----------------------------------------------
     15.03.2004 08:59
@@ -550,14 +550,14 @@ void FilterCache::addStatePropsToItem(      EItemType        eType,
     {
         case E_TYPE :
             {
-                xPackage = css::uno::Reference< css::container::XNameAccess >(impl_openConfig(E_PROVIDER_TYPES), css::uno::UNO_QUERY);
+                xPackage = css::uno::Reference< css::container::XNameAccess >(impl_openConfig(E_PROVIDER_TYPES), css::uno::UNO_QUERY_THROW);
                 xPackage->getByName(CFGSET_TYPES) >>= xSet;
             }
             break;
 
         case E_FILTER :
             {
-                xPackage = css::uno::Reference< css::container::XNameAccess >(impl_openConfig(E_PROVIDER_FILTERS), css::uno::UNO_QUERY);
+                xPackage = css::uno::Reference< css::container::XNameAccess >(impl_openConfig(E_PROVIDER_FILTERS), css::uno::UNO_QUERY_THROW);
                 xPackage->getByName(CFGSET_FILTERS) >>= xSet;
             }
             break;
@@ -585,14 +585,14 @@ void FilterCache::addStatePropsToItem(      EItemType        eType,
                 }
                 /* <-- HACK */
 
-                xPackage = css::uno::Reference< css::container::XNameAccess >(impl_openConfig(E_PROVIDER_OTHERS), css::uno::UNO_QUERY);
+                xPackage = css::uno::Reference< css::container::XNameAccess >(impl_openConfig(E_PROVIDER_OTHERS), css::uno::UNO_QUERY_THROW);
                 xPackage->getByName(CFGSET_FRAMELOADERS) >>= xSet;
             }
             break;
 
         case E_CONTENTHANDLER :
             {
-                xPackage = css::uno::Reference< css::container::XNameAccess >(impl_openConfig(E_PROVIDER_OTHERS), css::uno::UNO_QUERY);
+                xPackage = css::uno::Reference< css::container::XNameAccess >(impl_openConfig(E_PROVIDER_OTHERS), css::uno::UNO_QUERY_THROW);
                 xPackage->getByName(CFGSET_CONTENTHANDLERS) >>= xSet;
             }
             break;
@@ -658,7 +658,7 @@ void FilterCache::flush()
 
     if (m_lChangedTypes.size() > 0)
     {
-        css::uno::Reference< css::container::XNameAccess > xConfig(impl_openConfig(E_PROVIDER_TYPES), css::uno::UNO_QUERY);
+        css::uno::Reference< css::container::XNameAccess > xConfig(impl_openConfig(E_PROVIDER_TYPES), css::uno::UNO_QUERY_THROW);
         css::uno::Reference< css::container::XNameAccess > xSet   ;
 
         xConfig->getByName(CFGSET_TYPES) >>= xSet;
@@ -670,7 +670,7 @@ void FilterCache::flush()
 
     if (m_lChangedFilters.size() > 0)
     {
-        css::uno::Reference< css::container::XNameAccess > xConfig(impl_openConfig(E_PROVIDER_FILTERS), css::uno::UNO_QUERY);
+        css::uno::Reference< css::container::XNameAccess > xConfig(impl_openConfig(E_PROVIDER_FILTERS), css::uno::UNO_QUERY_THROW);
         css::uno::Reference< css::container::XNameAccess > xSet   ;
 
         xConfig->getByName(CFGSET_FILTERS) >>= xSet;
@@ -717,7 +717,7 @@ void FilterCache::impl_flushByList(const css::uno::Reference< css::container::XN
                 // special case. no exception - but not a valid item => set must be finalized or mandatory!
                 // Reject flush operation by throwing an exception. At least one item couldnt be flushed.
                 if (!xItem.is())
-                    throw css::uno::Exception(::rtl::OUString::createFromAscii("Cant add item. Set is finalized or mandatory!"),
+                    throw css::uno::Exception(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant add item. Set is finalized or mandatory!" )),
                                               css::uno::Reference< css::uno::XInterface >()                                   );
 
                 CacheItemList::const_iterator pItem = rCache.find(sItem);
@@ -734,7 +734,7 @@ void FilterCache::impl_flushByList(const css::uno::Reference< css::container::XN
                 // special case. no exception - but not a valid item => it must be finalized or mandatory!
                 // Reject flush operation by throwing an exception. At least one item couldnt be flushed.
                 if (!xItem.is())
-                    throw css::uno::Exception(::rtl::OUString::createFromAscii("Cant change item. Its finalized or mandatory!"),
+                    throw css::uno::Exception(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant change item. Its finalized or mandatory!" )),
                                               css::uno::Reference< css::uno::XInterface >()                                    );
 
                 CacheItemList::const_iterator pItem = rCache.find(sItem);
@@ -831,7 +831,7 @@ CacheItemList& FilterCache::impl_getItemList(EItemType eType) const
         case E_CONTENTHANDLER : return m_lContentHandlers;
         case E_DETECTSERVICE  : return m_lDetectServices ;
 
-        default : throw css::uno::Exception(::rtl::OUString::createFromAscii("unknown sub container requested."),
+        default : throw css::uno::Exception(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unknown sub container requested." )),
                                             css::uno::Reference< css::uno::XInterface >()                      );
     }
 
@@ -901,7 +901,7 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_openConfig(EConfig
         }
         break;
 
-        default : throw css::uno::Exception(::rtl::OUString::createFromAscii("These configuration node isnt supported here for open!"), 0);
+        default : throw css::uno::Exception(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "These configuration node isnt supported here for open!" )), 0);
     }
 
     {
@@ -1072,7 +1072,7 @@ void FilterCache::impl_validateAndOptimize()
         throw css::document::CorruptedFilterConfigurationException(
                 MESSAGE_CORRUPTED_FILTERCONFIG,
                 css::uno::Reference< css::uno::XInterface >(),
-                ::rtl::OUString::createFromAscii("The list of types or filters is empty."));
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "The list of types or filters is empty." )));
     }
 
     // Create a log for all detected problems, which
@@ -1372,7 +1372,7 @@ void FilterCache::impl_addItem2FlushList(      EItemType        eType,
                 pList = &m_lChangedDetectServices;
                 break;
 
-        default : throw css::uno::Exception(::rtl::OUString::createFromAscii("unsupported item type"), 0);
+        default : throw css::uno::Exception(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unsupported item type" )), 0);
     }
 
     OUStringList::const_iterator pItem = ::std::find(pList->begin(), pList->end(), sItem);
@@ -1453,7 +1453,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
         // Attention! If config couldnt be opened successfully
         // and exception os thrown automaticly and must be forwarded
         // to our calli ...
-        css::uno::Reference< css::container::XNameAccess > xTypes(impl_openConfig(E_PROVIDER_TYPES), css::uno::UNO_QUERY);
+        css::uno::Reference< css::container::XNameAccess > xTypes(impl_openConfig(E_PROVIDER_TYPES), css::uno::UNO_QUERY_THROW);
         {
             RTL_LOGFILE_CONTEXT( aLog, "framework (as96863) ::FilterCache::load std");
             impl_loadSet(xTypes, E_TYPE, E_READ_STANDARD, &m_lTypes);
@@ -1470,7 +1470,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
         // Attention! If config couldnt be opened successfully
         // and exception os thrown automaticly and must be forwarded
         // to our calli ...
-        css::uno::Reference< css::container::XNameAccess > xTypes(impl_openConfig(E_PROVIDER_TYPES), css::uno::UNO_QUERY);
+        css::uno::Reference< css::container::XNameAccess > xTypes(impl_openConfig(E_PROVIDER_TYPES), css::uno::UNO_QUERY_THROW);
         {
             RTL_LOGFILE_CONTEXT( aLog, "framework (as96863) ::FilterCache::load all types");
             impl_loadSet(xTypes, E_TYPE, E_READ_UPDATE, &m_lTypes);
@@ -1487,7 +1487,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
         // Attention! If config couldnt be opened successfully
         // and exception os thrown automaticly and must be forwarded
         // to our calli ...
-        css::uno::Reference< css::container::XNameAccess > xFilters(impl_openConfig(E_PROVIDER_FILTERS), css::uno::UNO_QUERY);
+        css::uno::Reference< css::container::XNameAccess > xFilters(impl_openConfig(E_PROVIDER_FILTERS), css::uno::UNO_QUERY_THROW);
         {
             RTL_LOGFILE_CONTEXT( aLog, "framework (as96863) ::FilterCache::load all filters");
             impl_loadSet(xFilters, E_FILTER, E_READ_ALL, &m_lFilters);
@@ -1504,7 +1504,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
         // Attention! If config couldnt be opened successfully
         // and exception os thrown automaticly and must be forwarded
         // to our calli ...
-        css::uno::Reference< css::container::XNameAccess > xLoaders(impl_openConfig(E_PROVIDER_OTHERS), css::uno::UNO_QUERY);
+        css::uno::Reference< css::container::XNameAccess > xLoaders(impl_openConfig(E_PROVIDER_OTHERS), css::uno::UNO_QUERY_THROW);
         {
             RTL_LOGFILE_CONTEXT( aLog, "framework (as96863) ::FilterCache::load all frame loader");
             impl_loadSet(xLoaders, E_FRAMELOADER, E_READ_ALL, &m_lFrameLoaders);
@@ -1521,7 +1521,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
         // Attention! If config couldnt be opened successfully
         // and exception os thrown automaticly and must be forwarded
         // to our calli ...
-        css::uno::Reference< css::container::XNameAccess > xHandlers(impl_openConfig(E_PROVIDER_OTHERS), css::uno::UNO_QUERY);
+        css::uno::Reference< css::container::XNameAccess > xHandlers(impl_openConfig(E_PROVIDER_OTHERS), css::uno::UNO_QUERY_THROW);
         {
             RTL_LOGFILE_CONTEXT( aLog, "framework (as96863) ::FilterCache::load all content handler");
             impl_loadSet(xHandlers, E_CONTENTHANDLER, E_READ_ALL, &m_lContentHandlers);
@@ -1666,8 +1666,8 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe
                                               CacheItem&                                          rItem)
     throw(css::uno::Exception)
 {
-    static ::rtl::OUString FORMATNAME_VAR       = ::rtl::OUString::createFromAscii("%productname%"  );
-    static ::rtl::OUString FORMATVERSION_VAR    = ::rtl::OUString::createFromAscii("%formatversion%");
+    static ::rtl::OUString FORMATNAME_VAR(    RTL_CONSTASCII_USTRINGPARAM( "%productname%" ));
+    static ::rtl::OUString FORMATVERSION_VAR( RTL_CONSTASCII_USTRINGPARAM( "%formatversion%" ));
 
     // SAFE -> ----------------------------------
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -2348,8 +2348,8 @@ void FilterCache::impl_interpretDataVal4Filter(const ::rtl::OUString& sValue,
 void FilterCache::impl_readOldFormat()
     throw(css::uno::Exception)
 {
-    static ::rtl::OUString TYPES_SET  = ::rtl::OUString::createFromAscii("Types"  );
-    static ::rtl::OUString FILTER_SET = ::rtl::OUString::createFromAscii("Filters");
+    static ::rtl::OUString TYPES_SET(  RTL_CONSTASCII_USTRINGPARAM( "Types" ));
+    static ::rtl::OUString FILTER_SET( RTL_CONSTASCII_USTRINGPARAM( "Filters" ));
 
     // Attention: Opening/Reading of this old configuration format has to be handled gracefully.
     // Its optional and shouldnt disturb our normal work!
@@ -2403,7 +2403,7 @@ CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::containe
     xSet->getByName(sItem) >>= xItem;
     if (!xItem.is())
         throw css::uno::Exception(
-                ::rtl::OUString::createFromAscii("Cant read old item."),
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant read old item." )),
                 css::uno::Reference< css::uno::XInterface >());
 
     CacheItem aItem;
@@ -2418,7 +2418,7 @@ CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::containe
     // Data
     ::rtl::OUString sData;
     OUStringList    lData;
-    xItem->getByName(::rtl::OUString::createFromAscii("Data")) >>= sData;
+    xItem->getByName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Data" ))) >>= sData;
     lData = impl_tokenizeString(sData, (sal_Unicode)',');
     if (
         (!sData.getLength()) ||
@@ -2426,7 +2426,7 @@ CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::containe
        )
     {
         throw css::uno::Exception(
-                ::rtl::OUString::createFromAscii("Cant read old item property DATA."),
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant read old item property DATA." )),
                 css::uno::Reference< css::uno::XInterface >());
     }
 
@@ -2522,7 +2522,7 @@ sal_Bool FilterCache::impl_isModuleInstalled(const ::rtl::OUString& sModule)
         m_xModuleCfg = css::uno::Reference< css::container::XNameAccess >(
                             ::comphelper::ConfigurationHelper::openConfig(
                                 m_xSMGR,
-                                ::rtl::OUString::createFromAscii("org.openoffice.Setup/Office/Factories"),
+                                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Setup/Office/Factories" )),
                                 ::comphelper::ConfigurationHelper::E_READONLY),
                             css::uno::UNO_QUERY_THROW);
     }
diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx
index 9ce090ba4a9e..155bb5e79fc2 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -84,17 +84,17 @@ namespace css = ::com::sun::star;
 #define SEPERATOR_QUERYPARAM                            ((sal_Unicode)':')
 #define SEPERATOR_QUERYPARAMVALUE                       ((sal_Unicode)'=')
 
-#define QUERYPARAM_IFLAGS                               ::rtl::OUString::createFromAscii("iflags")
-#define QUERYPARAM_EFLAGS                               ::rtl::OUString::createFromAscii("eflags")
-#define QUERYPARAM_SORT_PROP                            ::rtl::OUString::createFromAscii("sort_prop")
+#define QUERYPARAM_IFLAGS                               ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "iflags" ))
+#define QUERYPARAM_EFLAGS                               ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "eflags" ))
+#define QUERYPARAM_SORT_PROP                            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sort_prop" ))
 
-#define QUERYPARAM_DESCENDING                           ::rtl::OUString::createFromAscii("descending")
-#define QUERYPARAM_USE_ORDER                            ::rtl::OUString::createFromAscii("use_order")
-#define QUERYPARAM_DEFAULT_FIRST                        ::rtl::OUString::createFromAscii("default_first")
-#define QUERYPARAM_CASE_SENSITIVE                       ::rtl::OUString::createFromAscii("case_sensitive")
+#define QUERYPARAM_DESCENDING                           ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "descending" ))
+#define QUERYPARAM_USE_ORDER                            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "use_order" ))
+#define QUERYPARAM_DEFAULT_FIRST                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "default_first" ))
+#define QUERYPARAM_CASE_SENSITIVE                       ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "case_sensitive" ))
 
-#define QUERYPARAMVALUE_SORT_PROP_NAME                  ::rtl::OUString::createFromAscii("name")
-#define QUERYPARAMVALUE_SORT_PROP_UINAME                ::rtl::OUString::createFromAscii("uiname")
+#define QUERYPARAMVALUE_SORT_PROP_NAME                  ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "name" ))
+#define QUERYPARAMVALUE_SORT_PROP_UINAME                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "uiname" ))
 
 /*-----------------------------------------------
     09.07.2003 07:43
@@ -249,7 +249,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::crea
 
     // convert "_query_xxx:..." to "getByDocService=xxx:..."
     ::rtl::OUString sNewQuery(sQuery);
-    sal_Int32 pos = sNewQuery.indexOf(::rtl::OUString::createFromAscii("_query_"),0);
+    sal_Int32 pos = sNewQuery.indexOf(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_query_" )),0);
     if (pos != -1)
     {
         OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use new query format: 'matchByDocumentService=...'");
@@ -301,7 +301,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::crea
             //-------------------------------------------
             // 1) getDefaultFilterForType=<internal_typename>
 
-            pIt = lTokens.find(::rtl::OUString::createFromAscii("getDefaultFilterForType"));
+            pIt = lTokens.find(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getDefaultFilterForType")));
             if (pIt != lTokens.end())
             {
                 // SAFE ->
@@ -354,43 +354,43 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize
     if (sDocumentService.equalsAscii("writer"))
     {
         OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!");
-        sDocumentService = ::rtl::OUString::createFromAscii("com.sun.star.text.TextDocument");
+        sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" ));
     }
     else
     if (sDocumentService.equalsAscii("web"))
     {
         OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!");
-        sDocumentService = ::rtl::OUString::createFromAscii("com.sun.star.text.WebDocument");
+        sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.WebDocument" ));
     }
     else
     if (sDocumentService.equalsAscii("global"))
     {
         OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!");
-        sDocumentService = ::rtl::OUString::createFromAscii("com.sun.star.text.GlobalDocument");
+        sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.GlobalDocument" ));
     }
     else
     if (sDocumentService.equalsAscii("calc"))
     {
         OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!");
-        sDocumentService = ::rtl::OUString::createFromAscii("com.sun.star.sheet.SpreadsheetDocument");
+        sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ));
     }
     else
     if (sDocumentService.equalsAscii("draw"))
     {
         OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!");
-        sDocumentService = ::rtl::OUString::createFromAscii("com.sun.star.drawing.DrawingDocument");
+        sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" ));
     }
     else
     if (sDocumentService.equalsAscii("impress"))
     {
         OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!");
-        sDocumentService = ::rtl::OUString::createFromAscii("com.sun.star.presentation.PresentationDocument");
+        sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ));
     }
     else
     if (sDocumentService.equalsAscii("math"))
     {
         OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!");
-        sDocumentService = ::rtl::OUString::createFromAscii("com.sun.star.formula.FormulaProperties");
+        sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.formula.FormulaProperties" ));
     }
 #endif
 
@@ -699,7 +699,7 @@ OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const ::rtl::OUS
 -----------------------------------------------*/
 ::rtl::OUString FilterFactory::impl_getImplementationName()
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.filter.config.FilterFactory");
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.filter.config.FilterFactory" ));
 }
 
 /*-----------------------------------------------
@@ -708,7 +708,7 @@ OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const ::rtl::OUS
 css::uno::Sequence< ::rtl::OUString > FilterFactory::impl_getSupportedServiceNames()
 {
     css::uno::Sequence< ::rtl::OUString > lServiceNames(1);
-    lServiceNames[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.FilterFactory");
+    lServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" ));
     return lServiceNames;
 }
 
diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx
index 075b721b29b3..822d826d52bf 100644
--- a/filter/source/config/cache/frameloaderfactory.cxx
+++ b/filter/source/config/cache/frameloaderfactory.cxx
@@ -173,7 +173,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL FrameLoaderFactory::getAvailableS
 -----------------------------------------------*/
 ::rtl::OUString FrameLoaderFactory::impl_getImplementationName()
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.filter.config.FrameLoaderFactory");
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.filter.config.FrameLoaderFactory" ));
 }
 
 /*-----------------------------------------------
@@ -182,7 +182,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL FrameLoaderFactory::getAvailableS
 css::uno::Sequence< ::rtl::OUString > FrameLoaderFactory::impl_getSupportedServiceNames()
 {
     css::uno::Sequence< ::rtl::OUString > lServiceNames(1);
-    lServiceNames[0] = ::rtl::OUString::createFromAscii("com.sun.star.frame.FrameLoaderFactory");
+    lServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.FrameLoaderFactory" ));
     return lServiceNames;
 }
 
diff --git a/filter/source/config/cache/lateinitlistener.cxx b/filter/source/config/cache/lateinitlistener.cxx
index 0ac452760de8..5c022a0a0b41 100644
--- a/filter/source/config/cache/lateinitlistener.cxx
+++ b/filter/source/config/cache/lateinitlistener.cxx
@@ -60,8 +60,8 @@ LateInitListener::LateInitListener(const css::uno::Reference< css::lang::XMultiS
     osl_incrementInterlockedCount( &m_refCount );
 
     m_xBroadcaster = css::uno::Reference< css::document::XEventBroadcaster >(
-        m_xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.GlobalEventBroadcaster")),
-        css::uno::UNO_QUERY);
+        m_xSMGR->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.GlobalEventBroadcaster" ))),
+        css::uno::UNO_QUERY_THROW);
 
     m_xBroadcaster->addEventListener(static_cast< css::document::XEventListener* >(this));
 
diff --git a/filter/source/config/cache/lateinitthread.cxx b/filter/source/config/cache/lateinitthread.cxx
index 14309ca27f55..0812e3f280b3 100644
--- a/filter/source/config/cache/lateinitthread.cxx
+++ b/filter/source/config/cache/lateinitthread.cxx
@@ -77,6 +77,11 @@ void SAL_CALL LateInitThread::run()
     rCache->load(FilterCache::E_CONTAINS_ALL, sal_True);
 }
 
+void SAL_CALL LateInitThread::onTerminated()
+{
+    delete this;
+}
+
     } // namespace config
 } // namespace filter
 
diff --git a/filter/source/config/cache/lateinitthread.hxx b/filter/source/config/cache/lateinitthread.hxx
index c4162d2ef3ea..98c59b00972b 100644
--- a/filter/source/config/cache/lateinitthread.hxx
+++ b/filter/source/config/cache/lateinitthread.hxx
@@ -82,6 +82,8 @@ class LateInitThread : public ::osl::Thread
         /** @short  thread function.
          */
         virtual void SAL_CALL run();
+
+        virtual void SAL_CALL onTerminated();
 };
 
     } // namespace config
diff --git a/filter/source/config/cache/registration.hxx b/filter/source/config/cache/registration.hxx
index fda49155492c..2c1ff3f79c0c 100644
--- a/filter/source/config/cache/registration.hxx
+++ b/filter/source/config/cache/registration.hxx
@@ -67,7 +67,7 @@ namespace comphelper{
                                                  MyClass::st_getServNames())
 
                    b) _COMPHELPER_COMPONENTINFO( MyClass,
-                                                 ::rtl::OUString::createFromAscii("css.MyClass"),
+                                                 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "css.MyClass" )),
                                                  lServiceNames)
 
     @param  CLASS
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 0b28ee823ada..53ad148dd827 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -140,7 +140,7 @@ TypeDetection::~TypeDetection()
     ::rtl::OUString sURL = stlDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_URL(), ::rtl::OUString());
 
 #if OSL_DEBUG_LEVEL > 0
-    if (stlDescriptor.find(::rtl::OUString::createFromAscii("FileName")) != stlDescriptor.end())
+    if (stlDescriptor.find(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FileName" ))) != stlDescriptor.end())
         OSL_ENSURE(sal_False, "Detect using of deprecated and already unsupported MediaDescriptor property \"FileName\"!");
 #endif
 
@@ -266,7 +266,7 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(::comphelper::MediaDescrip
                 )
                )
             {
-                sRealType = ::rtl::OUString::createFromAscii("calc_Text_txt_csv_StarCalc");
+                sRealType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "calc_Text_txt_csv_StarCalc" ));
             }
             else
             if (
@@ -274,7 +274,7 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(::comphelper::MediaDescrip
                 (sRealType.equalsAscii("calc_Text_txt_csv_StarCalc"           ))
                )
             {
-                sRealType = ::rtl::OUString::createFromAscii("writer_Text");
+                sRealType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "writer_Text" ));
             }
             #endif // WORKAROUND_CSV_TXT_BUG_i60158
 
@@ -1230,7 +1230,7 @@ sal_Bool TypeDetection::impl_validateAndSetFilterOnDescriptor(      ::comphelper
 -----------------------------------------------*/
 ::rtl::OUString TypeDetection::impl_getImplementationName()
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.filter.config.TypeDetection");
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.filter.config.TypeDetection" ));
 }
 
 /*-----------------------------------------------
@@ -1239,7 +1239,7 @@ sal_Bool TypeDetection::impl_validateAndSetFilterOnDescriptor(      ::comphelper
 css::uno::Sequence< ::rtl::OUString > TypeDetection::impl_getSupportedServiceNames()
 {
     css::uno::Sequence< ::rtl::OUString > lServiceNames(1);
-    lServiceNames[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.TypeDetection");
+    lServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" ));
     return lServiceNames;
 }
 
diff --git a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML.xcu b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML.xcu
index 7fdcbd702a54..138d449fcd24 100644
--- a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML.xcu
+++ b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML.xcu
@@ -1,5 +1,5 @@
 <node oor:name="Impress MS PowerPoint 2007 XML" oor:op="replace">
-    <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop>
+    <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop>
     <prop oor:name="UIComponent"/>
     <prop oor:name="FilterService"><value>com.sun.star.comp.Impress.oox.PowerPointImport</value></prop>
     <prop oor:name="UserData"/>
diff --git a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu
index 28b9ea8b09f6..eb9fea60875c 100644
--- a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu
+++ b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu
@@ -1,5 +1,5 @@
 <node oor:name="Impress MS PowerPoint 2007 XML Template" oor:op="replace">
-    <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER TEMPLATE TEMPLATEPATH PREFERRED</value></prop>
+    <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER TEMPLATE TEMPLATEPATH PREFERRED</value></prop>
     <prop oor:name="UIComponent"/>
     <prop oor:name="FilterService"><value>com.sun.star.comp.Impress.oox.PowerPointImport</value></prop>
     <prop oor:name="UserData"/>
diff --git a/filter/source/config/fragments/makefile.mk b/filter/source/config/fragments/makefile.mk
index d827b3496359..c97818bfdb97 100644
--- a/filter/source/config/fragments/makefile.mk
+++ b/filter/source/config/fragments/makefile.mk
@@ -182,7 +182,7 @@ $(ALL_FLAGS) : $(INCLUDE_FRAGMENTS)
 .IF "$(SOLAR_JAVA)"==""
 #cmc, hack to workaround the java build requirement
 .IF "$(SYSTEM_PYTHON)" == "YES"
-MERGE:=python ../tools/merge/pyAltFCFGMerge
+MERGE:=$(PYTHON) ../tools/merge/pyAltFCFGMerge
 .ELSE
 MERGE:=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/python ../tools/merge/pyAltFCFGMerge
 .ENDIF
diff --git a/filter/source/config/fragments/types/MS_PowerPoint_2007_XML.xcu b/filter/source/config/fragments/types/MS_PowerPoint_2007_XML.xcu
index 99f22ee47e7a..1cc12bf44b86 100644
--- a/filter/source/config/fragments/types/MS_PowerPoint_2007_XML.xcu
+++ b/filter/source/config/fragments/types/MS_PowerPoint_2007_XML.xcu
@@ -1,7 +1,7 @@
 <node oor:name="MS PowerPoint 2007 XML" oor:op="replace" >
     <prop oor:name="DetectService"><value>com.sun.star.comp.oox.FormatDetector</value></prop>
     <prop oor:name="URLPattern"/>
-    <prop oor:name="Extensions"><value>pptm pptx</value></prop>
+    <prop oor:name="Extensions"><value>pptx pptm</value></prop>
     <prop oor:name="MediaType"/>
     <prop oor:name="Preferred"><value>true</value></prop>
     <prop oor:name="PreferredFilter"><value>Impress MS PowerPoint 2007 XML</value></prop>
diff --git a/filter/source/filtertracer/filtertracer.cxx b/filter/source/filtertracer/filtertracer.cxx
index 78bae8efe8f1..eb6ac53edfef 100644
--- a/filter/source/filtertracer/filtertracer.cxx
+++ b/filter/source/filtertracer/filtertracer.cxx
@@ -62,7 +62,7 @@ FilterTracer::FilterTracer( const REF( NMSP_LANG::XMultiServiceFactory )& rxMgr
     mpStream    ( NULL ),
     mnLogLevel  ( NMSP_LOGGING::LogLevel::ALL )
 {
-    REF( NMSP_UNO::XInterface ) xObj( rxMgr->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.util.TextSearch" ) ) );
+    REF( NMSP_UNO::XInterface ) xObj( rxMgr->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.TextSearch" )) ) );
     mxTextSearch = REF( NMSP_UTIL::XTextSearch )( xObj, ::com::sun::star::uno::UNO_QUERY );
 }
 FilterTracer::~FilterTracer()
diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx
index 40b0295c391f..c412e5463525 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -155,8 +155,6 @@ class FlashExportFilter : public cppu::WeakImplHelper4
     Reference< XMultiServiceFactory > mxMSF;
     Reference< XStatusIndicator> mxStatusIndicator;
 
-    osl::File* mpFile;
-
 public:
     FlashExportFilter( const Reference< XMultiServiceFactory > &rxMSF);
 
@@ -276,7 +274,7 @@ sal_Bool FlashExportFilter::ExportAsMultipleFiles(const Sequence< PropertyValue
     if(!xDrawPages.is())
         return sal_False;
 
-    Reference< XDesktop > rDesktop( mxMSF->createInstance(OUString::createFromAscii("com.sun.star.frame.Desktop")), UNO_QUERY);
+    Reference< XDesktop > rDesktop( mxMSF->createInstance(OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ))), UNO_QUERY);
     if (!rDesktop.is())
         return sal_False;
 
diff --git a/filter/source/flash/swfuno.cxx b/filter/source/flash/swfuno.cxx
index 875031bc8611..22f33980a898 100644
--- a/filter/source/flash/swfuno.cxx
+++ b/filter/source/flash/swfuno.cxx
@@ -80,12 +80,12 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
         {
             Reference< XRegistryKey > xNewKey(
                 reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( FlashExportFilter_getImplementationName() ) );
-            xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+            xNewKey = xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" )) );
 
             singlecomponent_writeInfo( xNewKey, FlashExportFilter_getSupportedServiceNames() );
 
             xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( SWFDialog_getImplementationName() );
-            xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+            xNewKey = xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" )) );
 
             singlecomponent_writeInfo( xNewKey, SWFDialog_getSupportedServiceNames() );
 
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index ae09da181e18..5e68fc04fb4b 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -2121,7 +2121,7 @@ Reference < XBreakIterator > Writer::Impl_GetBreakIterator()
     if ( !mxBreakIterator.is() )
     {
         Reference< XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory() );
-        mxBreakIterator.set( xMSF->createInstance( OUString::createFromAscii( "com.sun.star.i18n.BreakIterator" ) ), UNO_QUERY );
+        mxBreakIterator.set( xMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.BreakIterator" )) ), UNO_QUERY );
     }
     return mxBreakIterator;
 }
diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx
index 8ea437c45f12..ce0d5f191238 100644
--- a/filter/source/graphicfilter/icgm/actimpr.cxx
+++ b/filter/source/graphicfilter/icgm/actimpr.cxx
@@ -130,11 +130,11 @@ void CGMImpressOutAct::ImplSetOrientation( FloatPoint& rRefPoint, double& rOrien
 {
     uno::Any aAny;
     aAny <<= (sal_Int32)rRefPoint.X;
-    maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("RotationPointX"), aAny );
+    maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RotationPointX" )), aAny );
     aAny <<= (sal_Int32)rRefPoint.Y;
-    maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("RotationPointY"), aAny );
+    maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RotationPointY" )), aAny );
     aAny <<= (sal_Int32)( rOrientation * 100.0 );
-    maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("RotateAngle"), aAny );
+    maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RotateAngle" )), aAny );
 }
 
 // ---------------------------------------------------------------
@@ -162,10 +162,10 @@ void CGMImpressOutAct::ImplSetLineBundle()
         fLineWidth = mpCGM->pElement->aLineBundle.nLineWidth;
 
     aAny <<= (sal_Int32)nLineColor;
-    maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineColor"), aAny );
+    maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineColor" )), aAny );
 
     aAny <<= (sal_Int32)fLineWidth;
-    maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineWidth"), aAny );
+    maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineWidth" )), aAny );
 
     switch( eLineType )
     {
@@ -186,12 +186,12 @@ void CGMImpressOutAct::ImplSetLineBundle()
         break;
     }
     aAny <<= eLS;
-    maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineStyle"), aAny );
+    maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineStyle" )), aAny );
     if ( eLS == drawing::LineStyle_DASH )
     {
         drawing::LineDash aLineDash( drawing::DashStyle_RECTRELATIVE, 1, 50, 3, 33, 100 );
         aAny <<= aLineDash;
-        maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineDash"), aAny );
+        maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineDash" )), aAny );
     }
 };
 
@@ -249,7 +249,7 @@ void CGMImpressOutAct::ImplSetFillBundle()
         nPatternIndex = mpCGM->pElement->aFillBundle.nFillPatternIndex;
 
     aAny <<= (sal_Int32)nFillColor;
-    maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("FillColor"), aAny );
+    maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillColor" )), aAny );
 
     switch ( eFillStyle )
     {
@@ -297,27 +297,27 @@ void CGMImpressOutAct::ImplSetFillBundle()
     if ( eFS == drawing::FillStyle_GRADIENT )
     {
         aAny <<= *mpGradient;
-        maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("FillGradient"), aAny );
+        maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillGradient" )), aAny );
     }
     aAny <<= eFS;
-    maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("FillStyle"), aAny );
+    maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" )), aAny );
 
     eLS = drawing::LineStyle_NONE;
     if ( eFillStyle == FIS_HOLLOW )
     {
         eLS = drawing::LineStyle_SOLID;
         aAny <<= (sal_Int32)nFillColor;
-        maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineColor"), aAny );
+        maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineColor" )), aAny );
         aAny <<= (sal_Int32)0;
-        maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineWidth"), aAny );
+        maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineWidth" )), aAny );
     }
     else if ( eEdgeType != ET_NONE )
     {
         aAny <<= (sal_Int32)nEdgeColor;
-        maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineColor"), aAny );
+        maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineColor" )), aAny );
 
         aAny <<= (sal_Int32)fEdgeWidth;
-        maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineWidth"), aAny );
+        maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineWidth" )), aAny );
 
         switch( eEdgeType )
         {
@@ -346,7 +346,7 @@ void CGMImpressOutAct::ImplSetFillBundle()
     }
 
     aAny <<= eLS;
-    maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineStyle"), aAny );
+    maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineStyle" )), aAny );
 
     if ( eFS == drawing::FillStyle_HATCH )
     {
@@ -375,7 +375,7 @@ void CGMImpressOutAct::ImplSetFillBundle()
             aHatch.Angle = 15 * ( ( nHatchIndex & 0x1f ) - 5 );
         }
         aAny <<= aHatch;
-        maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("FillHatch"), aAny );
+        maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillHatch" )), aAny );
     }
 };
 
@@ -412,7 +412,7 @@ void CGMImpressOutAct::ImplSetTextBundle( const uno::Reference< beans::XProperty
         nTextColor = mpCGM->pElement->aTextBundle.GetColor();
 
     aAny <<= (sal_Int32)nTextColor;
-    rProperty->setPropertyValue( rtl::OUString::createFromAscii("CharColor"), aAny );
+    rProperty->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharColor" )), aAny );
 
     sal_uInt32 nFontType = 0;
     awt::FontDescriptor aFontDescriptor;
@@ -435,7 +435,7 @@ void CGMImpressOutAct::ImplSetTextBundle( const uno::Reference< beans::XProperty
         aFontDescriptor.Underline = awt::FontUnderline::SINGLE;
     }
     aAny <<= aFontDescriptor;
-    rProperty->setPropertyValue( rtl::OUString::createFromAscii("FontDescriptor"), aAny );
+    rProperty->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FontDescriptor" )), aAny );
 };
 
 // ---------------------------------------------------------------
@@ -485,7 +485,7 @@ void CGMImpressOutAct::EndGroup()
                 uno::Reference< drawing::XShapes >  aXShapes;
 //              if ( maXServiceManagerSC->createInstance( L"stardiv.one.drawing.ShapeCollection" )->queryInterface( ::getCppuType((const Reference< drawing::XShapes >*)0), aXShapes ) )
 
-                uno::Reference< drawing::XShape >  aXShapeCollection( maXServiceManagerSC->createInstance( rtl::OUString::createFromAscii("com.sun.star.drawing.ShapeCollection") ), uno::UNO_QUERY );
+                uno::Reference< drawing::XShape >  aXShapeCollection( maXServiceManagerSC->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.ShapeCollection" )) ), uno::UNO_QUERY );
                 if ( aXShapeCollection.is() )
                 {
                     aXShapes = uno::Reference< drawing::XShapes >( aXShapeCollection, uno::UNO_QUERY );
@@ -523,7 +523,7 @@ void CGMImpressOutAct::DrawRectangle( FloatRect& rFloatRect )
 {
     if ( mnGroupActCount != ( mpCGM->mnActCount - 1 ) )         // POWERPOINT HACK !!!
     {
-        if ( ImplCreateShape( rtl::OUString::createFromAscii("com.sun.star.drawing.RectangleShape") ) )
+        if ( ImplCreateShape( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.RectangleShape" )) ) )
         {
             awt::Size aSize( (long)(rFloatRect.Right - rFloatRect.Left ), (long)(rFloatRect.Bottom-rFloatRect.Top ) );
             maXShape->setSize( aSize );
@@ -537,11 +537,11 @@ void CGMImpressOutAct::DrawRectangle( FloatRect& rFloatRect )
 
 void CGMImpressOutAct::DrawEllipse( FloatPoint& rCenter, FloatPoint& rSize, double& rOrientation )
 {
-    if ( ImplCreateShape( rtl::OUString::createFromAscii("com.sun.star.drawing.EllipseShape") ) )
+    if ( ImplCreateShape( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.EllipseShape" )) ) )
     {
         drawing::CircleKind eCircleKind = drawing::CircleKind_FULL;
         uno::Any aAny( &eCircleKind, ::getCppuType((const drawing::CircleKind*)0) );
-        maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("CircleKind"), aAny );
+        maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CircleKind" )), aAny );
 
         long nXSize = (long)( rSize.X * 2.0 );      // Merkwuerdigkes Verhalten bei einer awt::Size von 0
         long nYSize = (long)( rSize.Y * 2.0 );
@@ -565,7 +565,7 @@ void CGMImpressOutAct::DrawEllipse( FloatPoint& rCenter, FloatPoint& rSize, doub
 void CGMImpressOutAct::DrawEllipticalArc( FloatPoint& rCenter, FloatPoint& rSize, double& rOrientation,
             sal_uInt32 nType, double& fStartAngle, double& fEndAngle )
 {
-    if ( ImplCreateShape( rtl::OUString::createFromAscii("com.sun.star.drawing.EllipseShape") ) )
+    if ( ImplCreateShape( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.EllipseShape" )) ) )
     {
         uno::Any aAny;
         drawing::CircleKind eCircleKind;
@@ -604,11 +604,11 @@ void CGMImpressOutAct::DrawEllipticalArc( FloatPoint& rCenter, FloatPoint& rSize
         else
         {
             aAny.setValue( &eCircleKind, ::getCppuType((const drawing::CircleKind*)0) );
-            maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("CircleKind"), aAny );
+            maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CircleKind" )), aAny );
             aAny <<= (sal_Int32)( (long)( fStartAngle * 100 ) );
-            maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("CircleStartAngle"), aAny );
+            maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CircleStartAngle" )), aAny );
             aAny <<= (sal_Int32)( (long)( fEndAngle * 100 ) );
-            maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("CircleEndAngle"), aAny );
+            maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CircleEndAngle" )), aAny );
         }
         maXShape->setPosition( awt::Point( (long)( rCenter.X - rSize.X ), (long)( rCenter.Y - rSize.Y ) ) );
         if ( rOrientation != 0 )
@@ -627,7 +627,7 @@ void CGMImpressOutAct::DrawEllipticalArc( FloatPoint& rCenter, FloatPoint& rSize
                 ImplSetLineBundle();
                 drawing::FillStyle eFillStyle = drawing::FillStyle_NONE;
                 aAny.setValue( &eFillStyle, ::getCppuType((const drawing::FillStyle*)0) );
-                maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("FillStyle"), aAny );
+                maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" )), aAny );
             }
         }
     }
@@ -655,7 +655,7 @@ void CGMImpressOutAct::DrawBitmap( CGMBitmapDescriptor* pBmpDesc )
         mpCGM->ImplMapX( fdx );
         mpCGM->ImplMapY( fdy );
 
-        if ( ImplCreateShape( rtl::OUString::createFromAscii("com.sun.star.drawing.GraphicObjectShape") ) )
+        if ( ImplCreateShape( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.GraphicObjectShape" )) ) )
         {
             maXShape->setSize( awt::Size( (long)fdx, (long)fdy ) );
             maXShape->setPosition( awt::Point( (long)aOrigin.X, (long)aOrigin.Y ) );
@@ -668,7 +668,7 @@ void CGMImpressOutAct::DrawBitmap( CGMBitmapDescriptor* pBmpDesc )
             uno::Reference< awt::XBitmap > xBitmap( VCLUnoHelper::CreateBitmap( BitmapEx( *( pBmpDesc->mpBitmap ) ) ) );
             uno::Any aAny;
             aAny <<= xBitmap;
-            maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("GraphicObjectFillBitmap"), aAny );
+            maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "GraphicObjectFillBitmap" )), aAny );
 
         }
     }
@@ -680,7 +680,7 @@ void CGMImpressOutAct::DrawPolygon( Polygon& rPoly )
 {
     sal_uInt16 nPoints = rPoly.GetSize();
 
-    if ( ( nPoints > 1 ) && ImplCreateShape( rtl::OUString::createFromAscii("com.sun.star.drawing.PolyPolygonShape") ) )
+    if ( ( nPoints > 1 ) && ImplCreateShape( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.PolyPolygonShape" )) ) )
     {
         drawing::PointSequenceSequence aRetval;
 
@@ -701,7 +701,7 @@ void CGMImpressOutAct::DrawPolygon( Polygon& rPoly )
 
         uno::Any aParam;
         aParam <<= aRetval;
-        maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("PolyPolygon"), aParam );
+        maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PolyPolygon" )), aParam );
         ImplSetFillBundle();
     }
 };
@@ -713,7 +713,7 @@ void CGMImpressOutAct::DrawPolyLine( Polygon& rPoly )
 {
     sal_uInt16 nPoints = rPoly.GetSize();
 
-    if ( ( nPoints > 1 ) && ImplCreateShape( rtl::OUString::createFromAscii("com.sun.star.drawing.PolyLineShape") ) )
+    if ( ( nPoints > 1 ) && ImplCreateShape( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.PolyLineShape" )) ) )
     {
         drawing::PointSequenceSequence aRetval;
 
@@ -734,7 +734,7 @@ void CGMImpressOutAct::DrawPolyLine( Polygon& rPoly )
 
         uno::Any aParam;
         aParam <<= aRetval;
-        maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("PolyPolygon"), aParam );
+        maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PolyPolygon" )), aParam );
         ImplSetLineBundle();
     }
 };
@@ -744,7 +744,7 @@ void CGMImpressOutAct::DrawPolyLine( Polygon& rPoly )
 void CGMImpressOutAct::DrawPolybezier( Polygon& rPolygon )
 {
     USHORT nPoints = rPolygon.GetSize();
-    if ( ( nPoints > 1 ) && ImplCreateShape( rtl::OUString::createFromAscii("com.sun.star.drawing.OpenBezierShape") ) )
+    if ( ( nPoints > 1 ) && ImplCreateShape( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.OpenBezierShape" )) ) )
     {
         drawing::PolyPolygonBezierCoords aRetval;
 
@@ -769,7 +769,7 @@ void CGMImpressOutAct::DrawPolybezier( Polygon& rPolygon )
         }
         uno::Any aParam;
         aParam <<= aRetval;
-        maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("PolyPolygonBezier"), aParam );
+        maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PolyPolygonBezier" )), aParam );
         ImplSetLineBundle();
     }
 };
@@ -779,7 +779,7 @@ void CGMImpressOutAct::DrawPolybezier( Polygon& rPolygon )
 void CGMImpressOutAct::DrawPolyPolygon( PolyPolygon& rPolyPolygon )
 {
     sal_uInt32 nNumPolys = rPolyPolygon.Count();
-    if ( nNumPolys && ImplCreateShape( rtl::OUString::createFromAscii("com.sun.star.drawing.ClosedBezierShape") ) )
+    if ( nNumPolys && ImplCreateShape( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.ClosedBezierShape" )) ) )
     {
         drawing::PolyPolygonBezierCoords aRetval;
 
@@ -814,7 +814,7 @@ void CGMImpressOutAct::DrawPolyPolygon( PolyPolygon& rPolyPolygon )
         }
         uno::Any aParam;
         aParam <<= aRetval;
-        maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("PolyPolygonBezier"), aParam);
+        maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PolyPolygonBezier" )), aParam);
         ImplSetFillBundle();
     }
 };
@@ -823,7 +823,7 @@ void CGMImpressOutAct::DrawPolyPolygon( PolyPolygon& rPolyPolygon )
 
 void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, char* pString, sal_uInt32 /*nSize*/, FinalFlag eFlag )
 {
-    if ( ImplCreateShape( rtl::OUString::createFromAscii("com.sun.star.drawing.TextShape") ) )
+    if ( ImplCreateShape( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.TextShape" )) ) )
     {
         uno::Any    aAny;
         long    nWidth = rTextSize.Width;
@@ -876,17 +876,17 @@ void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, cha
         if ( nOrientation )
         {
             aAny <<= (sal_Int32)( aTextPos.X );
-            maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("RotationPointX"), aAny );
+            maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RotationPointX" )), aAny );
             aAny <<= (sal_Int32)( aTextPos.Y + nHeight );
-            maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("RotationPointY"), aAny );
+            maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RotationPointY" )), aAny );
             aAny <<= (sal_Int32)( (sal_Int32)( nOrientation * 100 ) );
-            maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("RotateAngle"), aAny );
+            maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RotateAngle" )), aAny );
         }
         if ( nWidth == -1 )
         {
             sal_Bool bTrue( sal_True );
             aAny.setValue( &bTrue, ::getCppuType((const sal_Bool*)0 ));
-            maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("TextAutoGrowWidth"), aAny );
+            maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextAutoGrowWidth" )), aAny );
 
             drawing::TextAdjust eTextAdjust;
             switch ( mpCGM->pElement->eTextAlignmentH )
@@ -904,13 +904,13 @@ void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, cha
                 break;
             }
             aAny <<= eTextAdjust;
-            maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("TextHorizontalAdjust"), aAny );
+            maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextHorizontalAdjust" )), aAny );
         }
         if ( nHeight == -1 )
         {
             sal_Bool bTrue = sal_True;
             aAny.setValue( &bTrue, ::getCppuType((const sal_Bool*)0) );
-            maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("TextAutoGrowHeight"), aAny );
+            maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextAutoGrowHeight" )), aAny );
         }
         uno::Reference< text::XText >  xText;
         uno::Any aFirstQuery( maXShape->queryInterface( ::getCppuType((const uno::Reference< text::XText >*)0) ));
@@ -946,13 +946,13 @@ void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, cha
                                     aAny <<= (sal_Int16)style::HorizontalAlignment_CENTER;
                                 break;
                             }
-                            aCursorPropSet->setPropertyValue( rtl::OUString::createFromAscii("ParaAdjust"), aAny );
+                            aCursorPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ParaAdjust" )), aAny );
                         }
                         if ( nWidth > 0 && nHeight > 0 )    // restricted text
                         {
                             sal_Bool bTrue = sal_True;
                             aAny.setValue( &bTrue, ::getCppuType((const sal_Bool*)0));
-                            maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("TextFitToSize"), aAny );
+                            maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextFitToSize" )), aAny );
                         }
                         aCursorText->setString( aStr );
                         aXTextCursor->gotoEnd( sal_True );
diff --git a/filter/source/graphicfilter/icgm/bitmap.hxx b/filter/source/graphicfilter/icgm/bitmap.hxx
index 774d4ba4d414..606f725c3619 100644
--- a/filter/source/graphicfilter/icgm/bitmap.hxx
+++ b/filter/source/graphicfilter/icgm/bitmap.hxx
@@ -54,20 +54,26 @@ class CGMBitmapDescriptor
         sal_uInt32              mnX, mnY;
         long                    mnLocalColorPrecision;
         sal_uInt32              mnCompressionMode;
-                                CGMBitmapDescriptor() :
-                                mpBuf       ( NULL ),
-                                mpBitmap    ( NULL ),
-                                mpAcc       ( NULL ),
-                                mbStatus    ( sal_False ),
-                                mbVMirror   ( sal_False ),
-                                mbHMirror   ( sal_False ) { };
-                                ~CGMBitmapDescriptor()
-                                {
-                                    if ( mpAcc )
-                                        mpBitmap->ReleaseAccess( mpAcc );
-                                    if ( mpBitmap )
-                                        delete mpBitmap;
-                                };
+
+        CGMBitmapDescriptor()
+            : mpBuf(NULL)
+            , mpBitmap(NULL)
+            , mpAcc(NULL)
+            , mbStatus(sal_False)
+            , mbVMirror(sal_False)
+            , mbHMirror(sal_False)
+            , mndx(0.0)
+            , mndy(0.0)
+            , mnOrientation(0.0)
+            , mnLocalColorPrecision(0)
+            { };
+        ~CGMBitmapDescriptor()
+        {
+            if ( mpAcc )
+                mpBitmap->ReleaseAccess( mpAcc );
+            if ( mpBitmap )
+                delete mpBitmap;
+        };
 };
 
 class CGMBitmap
diff --git a/filter/source/graphicfilter/icgm/bundles.cxx b/filter/source/graphicfilter/icgm/bundles.cxx
index 2c74c3229fa4..3431734a4573 100644
--- a/filter/source/graphicfilter/icgm/bundles.cxx
+++ b/filter/source/graphicfilter/icgm/bundles.cxx
@@ -49,7 +49,7 @@ void Bundle::SetColor( sal_uInt32 nColor )
     mnColor = nColor;
 }
 
-sal_uInt32 Bundle::GetColor()
+sal_uInt32 Bundle::GetColor() const
 {
     return mnColor;
 }
diff --git a/filter/source/graphicfilter/icgm/bundles.hxx b/filter/source/graphicfilter/icgm/bundles.hxx
index a05c37bf4803..f9d75b24f7ee 100644
--- a/filter/source/graphicfilter/icgm/bundles.hxx
+++ b/filter/source/graphicfilter/icgm/bundles.hxx
@@ -46,7 +46,7 @@ class Bundle
 
 public:
     void                SetColor( sal_uInt32 nColor ) ;
-    sal_uInt32              GetColor() ;
+    sal_uInt32              GetColor() const;
     long                GetIndex() const { return mnBundleIndex; } ;
     void                SetIndex( long nBundleIndex ) { mnBundleIndex = nBundleIndex; } ;
 
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx
index 0487e7e837d7..2a82022ec317 100644
--- a/filter/source/graphicfilter/icgm/cgm.cxx
+++ b/filter/source/graphicfilter/icgm/cgm.cxx
@@ -882,7 +882,7 @@ extern "C" sal_uInt32 __LOADONCALLAPI ImportCGM( String& rFileName, uno::Referen
                             aXStatInd = *(uno::Reference< task::XStatusIndicator > *)pProgressBar;
                         bProgressBar = aXStatInd.is();
                         if ( bProgressBar )
-                            aXStatInd->start( rtl::OUString::createFromAscii("CGM Import"), nInSize );
+                            aXStatInd->start( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CGM Import" )), nInSize );
 #endif
 
                         while ( pCGM->IsValid() && ( pIn->Tell() < nInSize ) && !pCGM->IsFinished() )
diff --git a/filter/source/graphicfilter/icgm/cgm.hxx b/filter/source/graphicfilter/icgm/cgm.hxx
index 3b82d144d5c9..11fd45cb5a39 100644
--- a/filter/source/graphicfilter/icgm/cgm.hxx
+++ b/filter/source/graphicfilter/icgm/cgm.hxx
@@ -168,8 +168,8 @@ class CGM
 #endif
         void                ImplComment( sal_uInt32, const char* );
         sal_uInt32              GetBackGroundColor();
-        sal_Bool                IsValid() { return mbStatus; };
-        sal_Bool                IsFinished() { return mbIsFinished; };
+        sal_Bool                IsValid() const { return mbStatus; };
+        sal_Bool                IsFinished() const { return mbIsFinished; };
         sal_Bool                Write( SvStream& rIStm );
 
         friend SvStream& operator>>( SvStream& rOStm, CGM& rCGM );
diff --git a/filter/source/graphicfilter/icgm/class4.cxx b/filter/source/graphicfilter/icgm/class4.cxx
index 3d0e023146c5..04937099e6d7 100644
--- a/filter/source/graphicfilter/icgm/class4.cxx
+++ b/filter/source/graphicfilter/icgm/class4.cxx
@@ -376,8 +376,6 @@ void CGM::ImplDoClass4()
 
             case 0x0d : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Circular Arc 3 Point" )
             {
-                int     nSwitch = 0;
-
                 FloatPoint aStartingPoint, aIntermediatePoint, aEndingPoint, aCenterPoint;
                 ImplGetPoint( aStartingPoint, sal_True );
                 ImplGetPoint( aIntermediatePoint, sal_True );
@@ -402,6 +400,8 @@ void CGM::ImplDoClass4()
                     double fInterAngle = ImplGetOrientation( aCenterPoint, aIntermediatePoint );
                     double fEndAngle = ImplGetOrientation( aCenterPoint, aEndingPoint );
 
+                    int nSwitch = 0;
+
                     if ( fStartAngle > fEndAngle )
                     {
                         nSwitch ^=1;
@@ -447,8 +447,6 @@ void CGM::ImplDoClass4()
 
             case 0x0e : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Circular Arc 3 Point Close" )
             {
-                int nSwitch = 0;
-
                 if ( mbFigure )
                     mpOutAct->CloseRegion();
 
@@ -476,6 +474,8 @@ void CGM::ImplDoClass4()
                     double fInterAngle = ImplGetOrientation( aCenterPoint, aIntermediatePoint );
                     double fEndAngle = ImplGetOrientation( aCenterPoint, aEndingPoint );
 
+                    int nSwitch = 0;
+
                     if ( fStartAngle > fEndAngle )
                     {
                         nSwitch ^=1;
@@ -513,7 +513,7 @@ void CGM::ImplDoClass4()
 
             case 0x0f : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Circular Arc Centre" )
             {
-                double fOrientation, fStartAngle, fEndAngle, vector[ 4 ];
+                double fStartAngle, fEndAngle, vector[ 4 ];
                 FloatPoint aCenter, aRadius;
 
                 if ( mbFigure )
@@ -557,7 +557,7 @@ void CGM::ImplDoClass4()
                 }
                 else
                 {
-                    fOrientation = 0;
+                    double fOrientation = 0;
                     mpOutAct->DrawEllipticalArc( aCenter, aRadius, fOrientation, 2, fStartAngle, fEndAngle );
                 }
                 mnParaSize = mnElementSize;
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
index 46de91410c90..3090f3b604fc 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
@@ -48,21 +48,6 @@ ULONG DXF2GDIMetaFile::CountEntities(const DXFEntities & rEntities)
     return nRes;
 }
 
-
-void DXF2GDIMetaFile::MayCallback(ULONG /*nMainEntitiesProcessed*/)
-{
-    // ULONG nPercent;
-/*
-    if (pCallback!=NULL && nMainEntitiesCount!=0) {
-        nPercent=nMinPercent+(nMaxPercent-nMinPercent)*nMainEntitiesProcessed/nMainEntitiesCount;
-        if (nPercent>=nLastPercent+4) {
-            if (((*pCallback)(pCallerData,(USHORT)nPercent))==TRUE) bStatus=FALSE;
-            nLastPercent=nPercent;
-        }
-    }
-*/
-}
-
 Color DXF2GDIMetaFile::ConvertColor(BYTE nColor)
 {
     return Color(
@@ -506,7 +491,7 @@ void DXF2GDIMetaFile::DrawInsertEntity(const DXFInsertEntity & rE, const DXFTran
                 aParentLayerDXFLineInfo=LTypeToDXFLineInfo(pLayer->sLineType);
             }
         }
-        DrawEntities(*pB,aT,FALSE);
+        DrawEntities(*pB,aT);
         aBlockDXFLineInfo=aSavedBlockDXFLineInfo;
         aParentLayerDXFLineInfo=aSavedParentLayerDXFLineInfo;
         nBlockColor=nSavedBlockColor;
@@ -757,7 +742,7 @@ void DXF2GDIMetaFile::DrawDimensionEntity(const DXFDimensionEntity & rE, const D
                 aParentLayerDXFLineInfo=LTypeToDXFLineInfo(pLayer->sLineType);
             }
         }
-        DrawEntities(*pB,aT,FALSE);
+        DrawEntities(*pB,aT);
         aBlockDXFLineInfo=aSavedBlockDXFLineInfo;
         aParentLayerDXFLineInfo=aSavedParentLayerDXFLineInfo;
         nBlockColor=nSavedBlockColor;
@@ -767,8 +752,7 @@ void DXF2GDIMetaFile::DrawDimensionEntity(const DXFDimensionEntity & rE, const D
 
 
 void DXF2GDIMetaFile::DrawEntities(const DXFEntities & rEntities,
-                                   const DXFTransform & rTransform,
-                                   BOOL bTopEntities)
+                                   const DXFTransform & rTransform)
 {
     ULONG nCount=0;
     DXFTransform aET;
@@ -834,7 +818,6 @@ void DXF2GDIMetaFile::DrawEntities(const DXFEntities & rEntities,
         }
         pE=pE->pSucc;
         nCount++;
-        if (bTopEntities) MayCallback(nCount);
     }
 }
 
@@ -957,7 +940,7 @@ BOOL DXF2GDIMetaFile::Convert(const DXFRepresentation & rDXF, GDIMetaFile & rMTF
     }
 
     if (bStatus==TRUE)
-        DrawEntities(pDXF->aEntities,aTransform,TRUE);
+        DrawEntities(pDXF->aEntities,aTransform);
 
     rMTF.Stop();
 
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.hxx b/filter/source/graphicfilter/idxf/dxf2mtf.hxx
index 3d0d2357d143..56915314f91c 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.hxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.hxx
@@ -65,8 +65,6 @@ private:
 
     ULONG CountEntities(const DXFEntities & rEntities);
 
-    void MayCallback(ULONG nMainEntitiesProcessed);
-
     Color ConvertColor(BYTE nColor);
 
     long GetEntityColor(const DXFBasicEntity & rE);
@@ -111,8 +109,7 @@ private:
     void DrawHatchEntity( const DXFHatchEntity & rE, const DXFTransform & rTransform );
 
     void DrawEntities(const DXFEntities & rEntities,
-                      const DXFTransform & rTransform,
-                      BOOL bTopEntities);
+                      const DXFTransform & rTransform);
 
 public:
 
diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.cxx b/filter/source/graphicfilter/idxf/dxfgrprd.cxx
index 2101447ddefb..c27ef74c7575 100644
--- a/filter/source/graphicfilter/idxf/dxfgrprd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfgrprd.cxx
@@ -185,7 +185,7 @@ USHORT DXFGroupReader::Read()
 }
 
 
-long DXFGroupReader::GetI(USHORT nG)
+long DXFGroupReader::GetI(USHORT nG) const
 {
     sal_Int32 nRetValue = 0;
     if ( ( nG >= 60 ) && ( nG <= 79 ) )
@@ -199,7 +199,7 @@ long DXFGroupReader::GetI(USHORT nG)
     return nRetValue;
 }
 
-double DXFGroupReader::GetF(USHORT nG)
+double DXFGroupReader::GetF(USHORT nG) const
 {
     nG-=10;
     if (nG<50) return F10_59[nG];
@@ -218,7 +218,7 @@ double DXFGroupReader::GetF(USHORT nG)
     }
 }
 
-const char * DXFGroupReader::GetS(USHORT nG)
+const char * DXFGroupReader::GetS(USHORT nG) const
 {
     if (nG<10) return S0_9[nG];
     else if ( nG == 100 )
diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.hxx b/filter/source/graphicfilter/idxf/dxfgrprd.hxx
index e8b0b285ede9..0e5855790450 100644
--- a/filter/source/graphicfilter/idxf/dxfgrprd.hxx
+++ b/filter/source/graphicfilter/idxf/dxfgrprd.hxx
@@ -44,7 +44,7 @@ public:
 
     DXFGroupReader( SvStream & rIStream, USHORT nMinPercent, USHORT nMaxPercent );
 
-    BOOL GetStatus();
+    BOOL GetStatus() const;
 
     void SetError();
 
@@ -53,20 +53,20 @@ public:
         // Im Falle eines Fehlers liefert GetStatus() FALSE, Gruppencode wird 0
         // gesetzt, und es wird SetS(0,"EOF") ausgefuehrt.
 
-    USHORT GetG();
+    USHORT GetG() const;
         // Liefert den letzten Gruppencode (also was Read() zuletzt lieferte)
 
-    long   GetI();
+    long   GetI() const;
         // Liefert den Integer-Wert zur Gruppe, die vorher mit Read() gelesen wurde.
         // Dabei muss es sich um einen Gruppencode fuer den Datentyp Integer
         // gehandelt haben, wenn nicht, wird 0 gelieferet.
 
-    double GetF();
+    double GetF() const;
         // Liefert den Floatingpoint-Wert zur Gruppe, die vorher mit Read() gelesen wurde.
         // Dabei muss es sich um einen Gruppencode fuer den Datentyp Floatingpoint
         // gehandelt haben, wenn nicht, wird 0 geliefert.
 
-    const char * GetS();
+    const char * GetS() const;
         // Liefert den String zur Gruppe, die vorher mit Read() gelesen wurde.
         // Dabei muss es sich um einen Gruppencode fuer den Datentyp String
         // gehandelt haben, wenn nicht, wird NULL geliefert.
@@ -75,9 +75,9 @@ public:
     // aktuelle Gruppencode angegeben werden. (DXFGroupReader speichert die Parameter
     // zu allen Gruppencodes. Dadurch ist es moeglich, dass zunaechst mit Read() einige
     // verschiedene Gruppen eingelesen werden, bevor sie ausgewertet werden.)
-    long         GetI(USHORT nG);
-    double       GetF(USHORT nG);
-    const char * GetS(USHORT nG);
+    long         GetI(USHORT nG) const;
+    double       GetF(USHORT nG) const;
+    const char * GetS(USHORT nG) const;
 
     // Mit folgenden Methoden koennen die aktuell gespeicherten Werte zu den
     // Gruppencodes veraendert werden. (z.B. um Defaultwerte zu setzen, bevor
@@ -93,7 +93,6 @@ private:
     void   ReadS(char * ptgt);
 
     SvStream & rIS;
-    char sIBuff[1024];
     USHORT nIBuffSize,nIBuffPos;
     BOOL bStatus;
     USHORT nLastG;
@@ -120,7 +119,7 @@ private:
 };
 
 
-inline BOOL DXFGroupReader::GetStatus()
+inline BOOL DXFGroupReader::GetStatus() const
 {
     return bStatus;
 }
@@ -131,22 +130,22 @@ inline void DXFGroupReader::SetError()
     bStatus=FALSE;
 }
 
-inline USHORT DXFGroupReader::GetG()
+inline USHORT DXFGroupReader::GetG() const
 {
     return nLastG;
 }
 
-inline long DXFGroupReader::GetI()
+inline long DXFGroupReader::GetI() const
 {
     return GetI(nLastG);
 }
 
-inline double DXFGroupReader::GetF()
+inline double DXFGroupReader::GetF() const
 {
     return GetF(nLastG);
 }
 
-inline const char * DXFGroupReader::GetS()
+inline const char * DXFGroupReader::GetS() const
 {
     return GetS(nLastG);
 }
diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx
index 53959ac2a9c0..160a63aa27fb 100644
--- a/filter/source/graphicfilter/ipbm/ipbm.cxx
+++ b/filter/source/graphicfilter/ipbm/ipbm.cxx
@@ -39,7 +39,7 @@ class PBMReader {
 
 private:
 
-    SvStream*           mpPBM;          // Die einzulesende PBM-Datei
+    SvStream&           mrPBM;          // Die einzulesende PBM-Datei
 
     BOOL                mbStatus;
     BOOL                mbRemark;       // FALSE wenn sich stream in einem Kommentar befindet
@@ -55,18 +55,19 @@ private:
     BOOL                ImplReadHeader();
 
 public:
-                        PBMReader();
+                        PBMReader(SvStream & rPBM);
                         ~PBMReader();
-    BOOL                ReadPBM( SvStream & rPBM, Graphic & rGraphic );
+    BOOL                ReadPBM(Graphic & rGraphic );
 };
 
 //=================== Methoden von PBMReader ==============================
 
-PBMReader::PBMReader() :
-    mbStatus    ( TRUE ),
-    mbRemark    ( FALSE ),
-    mbRaw       ( TRUE ),
-    mpAcc       ( NULL )
+PBMReader::PBMReader(SvStream & rPBM)
+    : mrPBM( rPBM )
+    , mbStatus( TRUE )
+    , mbRemark( FALSE )
+    , mbRaw( TRUE )
+    , mpAcc( NULL )
 {
 }
 
@@ -81,7 +82,7 @@ BOOL PBMReader::ImplCallback( USHORT /*nPercent*/ )
     {
         if ( ( (*pCallback)( pCallerData, nPercent ) ) == TRUE )
         {
-            mpPBM->SetError( SVSTREAM_FILEFORMAT_ERROR );
+            mrPBM.SetError( SVSTREAM_FILEFORMAT_ERROR );
             return TRUE;
         }
     }
@@ -89,15 +90,14 @@ BOOL PBMReader::ImplCallback( USHORT /*nPercent*/ )
     return FALSE;
 }
 
-BOOL PBMReader::ReadPBM( SvStream & rPBM, Graphic & rGraphic )
+BOOL PBMReader::ReadPBM(Graphic & rGraphic )
 {
     USHORT i;
 
-    if ( rPBM.GetError() )
+    if ( mrPBM.GetError() )
         return FALSE;
 
-    mpPBM = &rPBM;
-    mpPBM->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
+    mrPBM.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
 
     // Kopf einlesen:
 
@@ -167,7 +167,7 @@ BOOL PBMReader::ImplReadHeader()
     BYTE    nMax, nCount = 0;
     BOOL    bFinished = FALSE;
 
-    *mpPBM >> nID[ 0 ] >> nID[ 1 ];
+    mrPBM >> nID[ 0 ] >> nID[ 1 ];
     if ( nID[ 0 ] != 'P' )
         return FALSE;
     mnMaxVal = mnWidth = mnHeight = 0;
@@ -197,10 +197,10 @@ BOOL PBMReader::ImplReadHeader()
     }
     while ( bFinished == FALSE )
     {
-        if ( mpPBM->GetError() )
+        if ( mrPBM.GetError() )
             return FALSE;
 
-        *mpPBM >> nDat;
+        mrPBM >> nDat;
 
         if ( nDat == '#' )
         {
@@ -262,10 +262,10 @@ BOOL PBMReader::ImplReadBody()
     ULONG   nGrey, nRGB[3];
     ULONG   nWidth = 0;
     ULONG   nHeight = 0;
-    signed char nShift = 0;
 
     if ( mbRaw )
     {
+        signed char nShift = 0;
         switch ( mnMode )
         {
 
@@ -273,12 +273,12 @@ BOOL PBMReader::ImplReadBody()
             case 0 :
                 while ( nHeight != mnHeight )
                 {
-                    if ( mpPBM->IsEof() || mpPBM->GetError() )
+                    if ( mrPBM.IsEof() || mrPBM.GetError() )
                         return FALSE;
 
                     if ( --nShift < 0 )
                     {
-                        *mpPBM >> nDat;
+                        mrPBM >> nDat;
                         nShift = 7;
                     }
                     mpAcc->SetPixel( nHeight, nWidth, nDat >> nShift );
@@ -296,10 +296,10 @@ BOOL PBMReader::ImplReadBody()
             case 1 :
                 while ( nHeight != mnHeight )
                 {
-                    if ( mpPBM->IsEof() || mpPBM->GetError() )
+                    if ( mrPBM.IsEof() || mrPBM.GetError() )
                         return FALSE;
 
-                    *mpPBM >> nDat;
+                    mrPBM >> nDat;
                     mpAcc->SetPixel( nHeight, nWidth++, nDat);
 
                     if ( nWidth == mnWidth )
@@ -315,12 +315,12 @@ BOOL PBMReader::ImplReadBody()
             case 2 :
                 while ( nHeight != mnHeight )
                 {
-                    if ( mpPBM->IsEof() || mpPBM->GetError() )
+                    if ( mrPBM.IsEof() || mrPBM.GetError() )
                         return FALSE;
 
                     BYTE    nR, nG, nB;
                     ULONG   nRed, nGreen, nBlue;
-                    *mpPBM >> nR >> nG >> nB;
+                    mrPBM >> nR >> nG >> nB;
                     nRed = 255 * nR / mnMaxVal;
                     nGreen = 255 * nG / mnMaxVal;
                     nBlue = 255 * nB / mnMaxVal;
@@ -341,10 +341,10 @@ BOOL PBMReader::ImplReadBody()
         case 0 :
             while ( bFinished == FALSE )
             {
-                if ( mpPBM->IsEof() || mpPBM->GetError() )
+                if ( mrPBM.IsEof() || mrPBM.GetError() )
                     return FALSE;
 
-                *mpPBM >> nDat;
+                mrPBM >> nDat;
 
                 if ( nDat == '#' )
                 {
@@ -402,10 +402,10 @@ BOOL PBMReader::ImplReadBody()
                     continue;
                 }
 
-                if ( mpPBM->IsEof() || mpPBM->GetError() )
+                if ( mrPBM.IsEof() || mrPBM.GetError() )
                     return FALSE;
 
-                *mpPBM >> nDat;
+                mrPBM >> nDat;
 
                 if ( nDat == '#' )
                 {
@@ -478,10 +478,10 @@ BOOL PBMReader::ImplReadBody()
                     continue;
                 }
 
-                if ( mpPBM->IsEof() || mpPBM->GetError() )
+                if ( mrPBM.IsEof() || mrPBM.GetError() )
                     return FALSE;
 
-                *mpPBM >> nDat;
+                mrPBM >> nDat;
 
                 if ( nDat == '#' )
                 {
@@ -532,9 +532,9 @@ BOOL PBMReader::ImplReadBody()
 
 extern "C" BOOL __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, BOOL )
 {
-    PBMReader aPBMReader;
+    PBMReader aPBMReader(rStream);
 
-    return aPBMReader.ReadPBM( rStream, rGraphic );
+    return aPBMReader.ReadPBM(rGraphic );
 }
 
 //================== ein bischen Muell fuer Windows ==========================
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 2a089960af16..58b2f7a023f9 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -580,7 +580,7 @@ void EscherPropertyContainer::CreateTextProperties(
 
 /*
     if ( rObj.ImplGetPropertyValue(
-        ::rtl::OUString::createFromAscii("TextWritingMode") ) )
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextWritingMode")) ) )
     {
         ::com::sun::star::text::WritingMode eMode;
         rObj.GetUsrAny() >>= eMode;
@@ -3011,7 +3011,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
                             if ( xText.is() )
                                 aText = xText->getString();
                             if ( !aText.getLength() )
-                                aText = ::rtl::OUString::createFromAscii( "your text" );    // todo: moving into a resource
+                                aText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "your text" ));   // todo: moving into a resource
                             AddOpt( DFF_Prop_gtextUNICODE, aText );
 
                             // FontWork Font
@@ -3020,7 +3020,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
                             uno::Any aAny = aXPropSet->getPropertyValue( sCharFontName );
                             aAny >>= aFontName;
                             if ( !aFontName.getLength() )
-                                aFontName = ::rtl::OUString::createFromAscii( "Arial Black" );
+                                aFontName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Arial Black" ));
                             AddOpt( DFF_Prop_gtextFont, aFontName );
 
                             sal_Int16 nCharScaleWidth = 100;
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index 375b1a946568..f7608830e72b 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -216,14 +216,14 @@ UINT32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
             }
             break;
         }
-        rObj.SetAngle( rObj.ImplGetInt32PropertyValue( ::rtl::OUString::createFromAscii("RotateAngle") ));
+        rObj.SetAngle( rObj.ImplGetInt32PropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RotateAngle" )) ));
 
-        if( ( rObj.ImplGetPropertyValue( ::rtl::OUString::createFromAscii("IsFontwork") ) &&
+        if( ( rObj.ImplGetPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFontwork" )) ) &&
             ::cppu::any2bool( rObj.GetUsrAny() ) ) ||
             rObj.GetType().EqualsAscii( "drawing.Measure" ) || rObj.GetType().EqualsAscii( "drawing.Caption" ) )
         {
 /*
-            if( rObj.ImplGetPropertyValue( ::rtl::OUString::createFromAscii("BoundRect") ) )
+            if( rObj.ImplGetPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BoundRect")) ) )
             {
                 ::com::sun::star::awt::Rectangle aRect( *(::com::sun::star::awt::Rectangle*)rObj.GetUsrAny().getValue() );
                 rObj.SetRect( ImplMapPoint( Point( aRect.X, aRect.Y ) ),
@@ -305,7 +305,7 @@ UINT32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
         {
             mpEscherEx->OpenContainer( ESCHER_SpContainer );
             sal_Int32 nRadius = (sal_Int32)rObj.ImplGetInt32PropertyValue(
-                                            ::rtl::OUString::createFromAscii("CornerRadius"));
+                                            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CornerRadius" )));
             if( nRadius )
             {
                 nRadius = ImplMapSize( Size( nRadius, 0 )).Width();
@@ -334,7 +334,7 @@ UINT32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
         {
             CircleKind  eCircleKind = CircleKind_FULL;
             PolyStyle   ePolyKind = PolyStyle();
-            if ( rObj.ImplGetPropertyValue( ::rtl::OUString::createFromAscii("CircleKind") ) )
+            if ( rObj.ImplGetPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CircleKind" )) ) )
             {
                 eCircleKind = *( (CircleKind*)rObj.GetUsrAny().getValue() );
                 switch ( eCircleKind )
@@ -369,10 +369,10 @@ UINT32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
             else
             {
                 INT32 nStartAngle, nEndAngle;
-                if ( !rObj.ImplGetPropertyValue( ::rtl::OUString::createFromAscii("CircleStartAngle") ) )
+                if ( !rObj.ImplGetPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CircleStartAngle" )) ) )
                     break;
                 nStartAngle = *( (INT32*)rObj.GetUsrAny().getValue() );
-                if( !rObj.ImplGetPropertyValue( ::rtl::OUString::createFromAscii("CircleEndAngle") ) )
+                if( !rObj.ImplGetPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CircleEndAngle" )) ) )
                     break;
                 nEndAngle = *( (INT32*)rObj.GetUsrAny().getValue() );
 
@@ -704,7 +704,7 @@ UINT32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
                  'D' == rObj.GetType().GetChar( 9 ) )   // drawing.3D
         {
             // SceneObject, CubeObject, SphereObject, LatheObject, ExtrudeObject, PolygonObject
-            if ( !rObj.ImplGetPropertyValue( ::rtl::OUString::createFromAscii("Bitmap") ) )
+            if ( !rObj.ImplGetPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Bitmap" )) ) )
                 break;
 
             mpEscherEx->OpenContainer( ESCHER_SpContainer );
@@ -728,7 +728,7 @@ UINT32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
         aPropOpt.CreateShadowProperties( rObj.mXPropSet );
 
         if( USHRT_MAX != mpEscherEx->GetHellLayerId() &&
-            rObj.ImplGetPropertyValue( ::rtl::OUString::createFromAscii("LayerID") ) &&
+            rObj.ImplGetPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayerID" )) ) &&
             (*((UINT16*)rObj.GetUsrAny().getValue()) ) == mpEscherEx->GetHellLayerId() )
         {
             aPropOpt.AddOpt( ESCHER_Prop_fPrint, 0x200020 );
@@ -789,7 +789,7 @@ void ImplEESdrWriter::ImplWriteAdditionalText( ImplEESdrObject& rObj,
         if ( !mpPicStrm )
             mpPicStrm = mpEscherEx->QueryPictureStream();
         EscherPropertyContainer aPropOpt( mpEscherEx->GetGraphicProvider(), mpPicStrm, aRect100thmm );
-        rObj.SetAngle( rObj.ImplGetInt32PropertyValue( ::rtl::OUString::createFromAscii("RotateAngle")));
+        rObj.SetAngle( rObj.ImplGetInt32PropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RotateAngle" ))));
         INT32 nAngle = rObj.GetAngle();
         if( rObj.GetType().EqualsAscii( "drawing.Line" ))
         {
@@ -1186,8 +1186,8 @@ void ImplEESdrObject::Init( ImplEESdrWriter& rEx )
         xub_StrLen nPos = mType.SearchAscii( "Shape" );
         mType.Erase( nPos, 5 );
 
-        static const OUString sPresStr(rtl::OUString::createFromAscii("IsPresentationObject"));
-        static const OUString sEmptyPresStr(rtl::OUString::createFromAscii("IsEmptyPresentationObject"));
+        static const OUString sPresStr(RTL_CONSTASCII_USTRINGPARAM( "IsPresentationObject" ));
+        static const OUString sEmptyPresStr(RTL_CONSTASCII_USTRINGPARAM( "IsEmptyPresentationObject" ));
 
         if( ImplGetPropertyValue( sPresStr ) )
             mbPresObj = ::cppu::any2bool( mAny );
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 3af7b517a560..71b1b681d3eb 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -3682,9 +3682,9 @@ BOOL SvxMSDffManager::SeekToShape( SvStream& rSt, void* /* pClientData */, UINT3
     return bRet;
 }
 
-FASTBOOL SvxMSDffManager::SeekToRec( SvStream& rSt, USHORT nRecId, ULONG nMaxFilePos, DffRecordHeader* pRecHd, ULONG nSkipCount ) const
+bool SvxMSDffManager::SeekToRec( SvStream& rSt, USHORT nRecId, ULONG nMaxFilePos, DffRecordHeader* pRecHd, ULONG nSkipCount ) const
 {
-    FASTBOOL bRet = FALSE;
+    bool bRet = FALSE;
     ULONG nFPosMerk = rSt.Tell(); // FilePos merken fuer ggf. spaetere Restauration
     DffRecordHeader aHd;
     do
@@ -3712,9 +3712,9 @@ FASTBOOL SvxMSDffManager::SeekToRec( SvStream& rSt, USHORT nRecId, ULONG nMaxFil
     return bRet;
 }
 
-FASTBOOL SvxMSDffManager::SeekToRec2( USHORT nRecId1, USHORT nRecId2, ULONG nMaxFilePos, DffRecordHeader* pRecHd, ULONG nSkipCount ) const
+bool SvxMSDffManager::SeekToRec2( USHORT nRecId1, USHORT nRecId2, ULONG nMaxFilePos, DffRecordHeader* pRecHd, ULONG nSkipCount ) const
 {
-    FASTBOOL bRet = FALSE;
+    bool bRet = FALSE;
     ULONG nFPosMerk = rStCtrl.Tell();   // FilePos merken fuer ggf. spaetere Restauration
     DffRecordHeader aHd;
     do
@@ -3743,7 +3743,7 @@ FASTBOOL SvxMSDffManager::SeekToRec2( USHORT nRecId1, USHORT nRecId2, ULONG nMax
 }
 
 
-FASTBOOL SvxMSDffManager::GetColorFromPalette( USHORT /* nNum */, Color& rColor ) const
+bool SvxMSDffManager::GetColorFromPalette( USHORT /* nNum */, Color& rColor ) const
 {
     // diese Methode ist in der zum Excel-Import
     // abgeleiteten Klasse zu ueberschreiben...
@@ -4001,15 +4001,15 @@ Color SvxMSDffManager::MSO_CLR_ToColor( sal_uInt32 nColorCode, sal_uInt16 nConte
     return aColor;
 }
 
-FASTBOOL SvxMSDffManager::ReadDffString(SvStream& rSt, String& rTxt) const
+bool SvxMSDffManager::ReadDffString(SvStream& rSt, String& rTxt) const
 {
-    FASTBOOL bRet=FALSE;
+    bool bRet=FALSE;
     DffRecordHeader aStrHd;
     if( !ReadCommonRecordHeader(aStrHd, rSt) )
         rSt.Seek( aStrHd.nFilePos );
     else if ( aStrHd.nRecType == DFF_PST_TextBytesAtom || aStrHd.nRecType == DFF_PST_TextCharsAtom )
     {
-        FASTBOOL bUniCode=aStrHd.nRecType==DFF_PST_TextCharsAtom;
+        bool bUniCode=aStrHd.nRecType==DFF_PST_TextCharsAtom;
         bRet=TRUE;
         ULONG nBytes = aStrHd.nRecLen;
         MSDFFReadZString( rSt, rTxt, nBytes, bUniCode );
@@ -4092,9 +4092,9 @@ void SvxMSDffManager::ReadObjText( const String& rText, SdrObject* pObj ) const
     }
 }
 
-FASTBOOL SvxMSDffManager::ReadObjText(SvStream& rSt, SdrObject* pObj) const
+bool SvxMSDffManager::ReadObjText(SvStream& rSt, SdrObject* pObj) const
 {
-    FASTBOOL bRet=FALSE;
+    bool bRet=FALSE;
     SdrTextObj* pText = PTR_CAST(SdrTextObj, pObj);
     if( pText )
     {
@@ -4116,7 +4116,7 @@ FASTBOOL SvxMSDffManager::ReadObjText(SvStream& rSt, SdrObject* pObj) const
 
             { // Wohl 'nen kleiner Bug der EditEngine, das die
               // Absastzattribute bei Clear() nicht entfernt werden.
-                FASTBOOL bClearParaAttribs = TRUE;
+                bool bClearParaAttribs = TRUE;
                 rOutliner.SetStyleSheet( 0, NULL );
                 SfxItemSet aSet(rOutliner.GetEmptyItemSet());
                 aSet.Put(SvxColorItem( COL_BLACK ));
@@ -4271,7 +4271,7 @@ FASTBOOL SvxMSDffManager::ReadObjText(SvStream& rSt, SdrObject* pObj) const
 
 //static
 void SvxMSDffManager::MSDFFReadZString( SvStream& rIn, String& rStr,
-                                    ULONG nRecLen, FASTBOOL bUniCode )
+                                    ULONG nRecLen, bool bUniCode )
 {
     sal_uInt16 nLen = (sal_uInt16)nRecLen;
     if( nLen )
@@ -4854,8 +4854,8 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
 
     if ( mbTracing )
         mpTracer->AddAttribute( aObjData.nSpFlags & SP_FGROUP
-                                ? rtl::OUString::createFromAscii( "GroupShape" )
-                                : rtl::OUString::createFromAscii( "Shape" ),
+                                ? rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "GroupShape" ))
+                                : rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Shape" )),
                                 rtl::OUString::valueOf( (sal_Int32)aObjData.nShapeId ) );
     aObjData.bOpt = maShapeRecords.SeekToContent( rSt, DFF_msofbtOPT, SEEK_FROM_CURRENT_AND_RESTART );
     if ( aObjData.bOpt )
@@ -4927,7 +4927,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
             }
         }
         aTextRect = aObjData.aBoundRect;
-        FASTBOOL bGraphic = IsProperty( DFF_Prop_pib ) ||
+        bool bGraphic = IsProperty( DFF_Prop_pib ) ||
                             IsProperty( DFF_Prop_pibName ) ||
                             IsProperty( DFF_Prop_pibFlags );
 
@@ -5422,8 +5422,8 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
 
     if ( mbTracing )
         mpTracer->RemoveAttribute( aObjData.nSpFlags & SP_FGROUP
-                                    ? rtl::OUString::createFromAscii( "GroupShape" )
-                                    : rtl::OUString::createFromAscii( "Shape" ) );
+                                    ? rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "GroupShape" ))
+                                    : rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Shape" )) );
     return pRet;
 }
 
@@ -5637,7 +5637,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
             //textbox, this was changed for #88277# to be created as a simple
             //rect to keep impress happy. For the rest of us we'd like to turn
             //it back into a textbox again.
-            FASTBOOL bTextFrame = (pImpRec->eShapeType == mso_sptTextBox);
+            bool bTextFrame = (pImpRec->eShapeType == mso_sptTextBox);
             if (!bTextFrame)
             {
                 //Either
@@ -6184,7 +6184,7 @@ SvxMSDffManager::SvxMSDffManager(SvStream& rStCtrl_,
 {
     if ( mpTracer )
     {
-        uno::Any aAny( mpTracer->GetProperty( rtl::OUString::createFromAscii( "On" ) ) );
+        uno::Any aAny( mpTracer->GetProperty( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "On" )) ) );
         aAny >>= mbTracing;
     }
     SetModel( pSdrModel_, nApplicationScale );
@@ -6236,7 +6236,7 @@ SvxMSDffManager::SvxMSDffManager( SvStream& rStCtrl_, const String& rBaseURL, MS
 {
     if ( mpTracer )
     {
-        uno::Any aAny( mpTracer->GetProperty( rtl::OUString::createFromAscii( "On" ) ) );
+        uno::Any aAny( mpTracer->GetProperty( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "On" )) ) );
         aAny >>= mbTracing;
     }
     SetModel( NULL, 0 );
@@ -7063,12 +7063,12 @@ BOOL SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, Rect
         aFileName.Append( String::CreateFromInt32( nCount++ ) );
         switch( nInst &~ 1 )
         {
-            case 0x216 : aFileName.Append( String( RTL_CONSTASCII_STRINGPARAM( ".wmf" ) ) ); break;
-            case 0x3d4 : aFileName.Append( String( RTL_CONSTASCII_STRINGPARAM( ".emf" ) ) ); break;
-            case 0x542 : aFileName.Append( String( RTL_CONSTASCII_STRINGPARAM( ".pct" ) ) ); break;
-            case 0x46a : aFileName.Append( String( RTL_CONSTASCII_STRINGPARAM( ".jpg" ) ) ); break;
-            case 0x6e0 : aFileName.Append( String( RTL_CONSTASCII_STRINGPARAM( ".png" ) ) ); break;
-            case 0x7a8 : aFileName.Append( String( RTL_CONSTASCII_STRINGPARAM( ".bmp" ) ) ); break;
+            case 0x216 : aFileName.Append( String( RTL_CONSTASCII_USTRINGPARAM( ".wmf" ) ) ); break;
+            case 0x3d4 : aFileName.Append( String( RTL_CONSTASCII_USTRINGPARAM( ".emf" ) ) ); break;
+            case 0x542 : aFileName.Append( String( RTL_CONSTASCII_USTRINGPARAM( ".pct" ) ) ); break;
+            case 0x46a : aFileName.Append( String( RTL_CONSTASCII_USTRINGPARAM( ".jpg" ) ) ); break;
+            case 0x6e0 : aFileName.Append( String( RTL_CONSTASCII_USTRINGPARAM( ".png" ) ) ); break;
+            case 0x7a8 : aFileName.Append( String( RTL_CONSTASCII_USTRINGPARAM( ".bmp" ) ) ); break;
         }
 
         String aURLStr;
@@ -7830,7 +7830,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage(
                         // TODO/LATER: should the caller be notified if the aspect changes in future?
 
                         SvStorageStreamRef xObjInfoSrc = xObjStg->OpenSotStream(
-                            String( RTL_CONSTASCII_STRINGPARAM( "\3ObjInfo" ) ),
+                            String( RTL_CONSTASCII_USTRINGPARAM( "\3ObjInfo" ) ),
                             STREAM_STD_READ | STREAM_NOCREATE );
                         if ( xObjInfoSrc.Is() && !xObjInfoSrc->GetError() )
                         {
diff --git a/filter/source/msfilter/msfiltertracer.cxx b/filter/source/msfilter/msfiltertracer.cxx
index 103dc286dcd1..46a91d45701a 100644
--- a/filter/source/msfilter/msfiltertracer.cxx
+++ b/filter/source/msfilter/msfiltertracer.cxx
@@ -56,7 +56,7 @@ MSFilterTracer::MSFilterTracer( const ::rtl::OUString& rConfigPath, uno::Sequenc
     mpStream( NULL ),
     mbEnabled( sal_False )  // will be set to true in StartTracing()
 {
-    if ( mpCfgItem->ReadBool( rtl::OUString::createFromAscii( "On" ), sal_False ) )
+    if ( mpCfgItem->ReadBool( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "On" )), sal_False ) )
     {
         uno::Reference< lang::XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
         if ( xMgr.is() )
@@ -65,17 +65,17 @@ MSFilterTracer::MSFilterTracer( const ::rtl::OUString& rConfigPath, uno::Sequenc
             parameter as default into the property sequence of the FilterConfigItem. It means we ensure that
             the property is available by trying to read it (the return value of the method is ignored) */
             ::rtl::OUString aEmptyString;
-            mpCfgItem->ReadInt32( rtl::OUString::createFromAscii( "LogLevel" ), util::logging::LogLevel::ALL );
-            mpCfgItem->ReadString( rtl::OUString::createFromAscii( "ClassFilter" ), aEmptyString );
-            mpCfgItem->ReadString( rtl::OUString::createFromAscii( "MethodFilter" ), aEmptyString );
-            mpCfgItem->ReadString( rtl::OUString::createFromAscii( "MessageFilter" ), aEmptyString );
+            mpCfgItem->ReadInt32( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LogLevel" )), util::logging::LogLevel::ALL );
+            mpCfgItem->ReadString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ClassFilter" )), aEmptyString );
+            mpCfgItem->ReadString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MethodFilter" )), aEmptyString );
+            mpCfgItem->ReadString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MessageFilter" )), aEmptyString );
             util::SearchAlgorithms eSearchAlgorithm = (util::SearchAlgorithms)
-                mpCfgItem->ReadInt32( rtl::OUString::createFromAscii( "SearchAlgorithm" ), util::SearchAlgorithms_ABSOLUTE );
+                mpCfgItem->ReadInt32( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SearchAlgorithm" )), util::SearchAlgorithms_ABSOLUTE );
 
             // creating the name of the log file
-            rtl::OUString aPath( mpCfgItem->ReadString( rtl::OUString::createFromAscii( "Path" ), aEmptyString ) );
-            rtl::OUString aName( mpCfgItem->ReadString( rtl::OUString::createFromAscii( "Name" ), aEmptyString ) );
-            rtl::OUString aDocumentURL( mpCfgItem->ReadString( rtl::OUString::createFromAscii( "DocumentURL" ), aEmptyString ) );
+            rtl::OUString aPath( mpCfgItem->ReadString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Path" )), aEmptyString ) );
+            rtl::OUString aName( mpCfgItem->ReadString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" )), aEmptyString ) );
+            rtl::OUString aDocumentURL( mpCfgItem->ReadString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentURL" )), aEmptyString ) );
             INetURLObject aLogFile( aDocumentURL );
             if ( aLogFile.GetMainURL( INetURLObject::NO_DECODE ).getLength() )
             {
@@ -103,10 +103,10 @@ MSFilterTracer::MSFilterTracer( const ::rtl::OUString& rConfigPath, uno::Sequenc
                     }
                 }
                 if ( !aName.getLength() )
-                    aName = rtl::OUString::createFromAscii( "tracer" );
+                    aName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "tracer" ));
                 aLogFile.insertName( aName );
             }
-            aLogFile.setExtension( rtl::OUString::createFromAscii( "log" ) );
+            aLogFile.setExtension( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "log" )) );
 
             // creating the file stream
             mpStream = ::utl::UcbStreamHelper::CreateStream( aLogFile.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC | STREAM_SHARE_DENYNONE );
@@ -117,28 +117,28 @@ MSFilterTracer::MSFilterTracer( const ::rtl::OUString& rConfigPath, uno::Sequenc
                 uno::Reference< io::XOutputStream > xOutputStream( pHelper );
 
                 // instanciating the DocumentHandler, then setting the OutputStream
-                mxHandler = uno::Reference< xml::sax::XDocumentHandler >( xMgr->createInstance( rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Writer" ) ), uno::UNO_QUERY );
+                mxHandler = uno::Reference< xml::sax::XDocumentHandler >( xMgr->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Writer" )) ), uno::UNO_QUERY );
                 uno::Reference< io::XActiveDataSource > xDocSrc( mxHandler, uno::UNO_QUERY );
                 xDocSrc->setOutputStream( xOutputStream );
                 mxHandler->startDocument();
-                mxHandler->ignorableWhitespace ( rtl::OUString::createFromAscii( " " ) );
+                mxHandler->ignorableWhitespace ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " )) );
 
                 // writing the "DocumentHandler" property, so the FilterTracer component
                 // will use it for the output
                 uno::Any aAny;
                 aAny <<= xDocSrc;
-                mpCfgItem->WriteAny( rtl::OUString::createFromAscii( "DocumentHandler" ), aAny );
+                mpCfgItem->WriteAny( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentHandler" )), aAny );
 
                 SvXMLAttributeList* pAttrList = new SvXMLAttributeList;
-                pAttrList->AddAttribute( rtl::OUString::createFromAscii( "DocumentURL" ), aDocumentURL );
+                pAttrList->AddAttribute( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentURL" )), aDocumentURL );
                 uno::Reference < xml::sax::XAttributeList > xAttributeList(pAttrList);
-                mxHandler->startElement( rtl::OUString::createFromAscii( "Document" ), xAttributeList );
+                mxHandler->startElement( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Document" )), xAttributeList );
             }
 
             uno::Sequence< uno::Any > aArgument( 1 );
             uno::Sequence< beans::PropertyValue > aPropValues( mpCfgItem->GetFilterData() );
             aArgument[ 0 ] <<= aPropValues;
-            mxFilterTracer = xMgr->createInstanceWithArguments( rtl::OUString::createFromAscii( "com.sun.star.util.FilterTracer" ), aArgument );
+            mxFilterTracer = xMgr->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.FilterTracer" )), aArgument );
             if ( mxFilterTracer.is() )
             {
                 mxTextSearch = uno::Reference< util::XTextSearch >( mxFilterTracer, uno::UNO_QUERY );
@@ -159,9 +159,9 @@ MSFilterTracer::~MSFilterTracer()
     mxFilterTracer = NULL;
     if ( mxHandler.is() )
     {
-        mxHandler->ignorableWhitespace ( rtl::OUString::createFromAscii( " " ) );
-        mxHandler->endElement( rtl::OUString::createFromAscii( "Document" ) );
-        mxHandler->ignorableWhitespace ( rtl::OUString::createFromAscii( " " ) );
+        mxHandler->ignorableWhitespace ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " )) );
+        mxHandler->endElement( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Document" )) );
+        mxHandler->ignorableWhitespace ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " )) );
         mxHandler->endDocument();
         mxHandler = NULL;
     }
@@ -172,7 +172,7 @@ MSFilterTracer::~MSFilterTracer()
 
 void MSFilterTracer::StartTracing()
 {
-    mbEnabled = mpCfgItem->ReadBool( rtl::OUString::createFromAscii( "On" ), sal_False );
+    mbEnabled = mpCfgItem->ReadBool( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "On" )), sal_False );
 }
 
 void MSFilterTracer::EndTracing()
diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx
index bd957d032700..b34b1d5813fd 100644
--- a/filter/source/msfilter/msocximex.cxx
+++ b/filter/source/msfilter/msocximex.cxx
@@ -78,6 +78,7 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <comphelper/componentcontext.hxx>
 #include <unotools/streamwrap.hxx>
+#include <sal/macros.h>
 
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/table/XCellRange.hpp>
@@ -352,14 +353,14 @@ uno::Reference< graphic::XGraphicObject> lcl_readGraphicObject( SotStorageStream
         {
             // use the GraphicProvider service to get the XGraphic
             uno::Reference< graphic::XGraphicProvider > xGraphProvider(
-                    xServiceManager->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.graphic.GraphicProvider" ) ), uno::UNO_QUERY );
+                    xServiceManager->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.graphic.GraphicProvider" )) ), uno::UNO_QUERY );
             if( xGraphProvider.is() )
             {
                 uno::Reference< io::XInputStream > xStream( new utl::OInputStreamWrapper( *pS ) );
                 if( xStream.is() )
                 {
                     uno::Sequence< beans::PropertyValue > aMediaProps( 1 );
-                    aMediaProps[0].Name = ::rtl::OUString::createFromAscii( "InputStream" );
+                    aMediaProps[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InputStream" ));
                     aMediaProps[0].Value <<= xStream;
                     uno::Reference< graphic::XGraphic > xGraphic = xGraphProvider->queryGraphic( aMediaProps );
                     if( xGraphic.is() )
@@ -521,7 +522,6 @@ void lclReadCharArray( SvStorageStream& rStrm, char*& rpcCharArr, sal_uInt32 nLe
     }
 }
 
-
 /** Creates an OUString from a character array created with lclReadCharArray().
 
     The passed parameters must match, that means the length field must be the
@@ -549,6 +549,39 @@ OUString lclCreateOUString( const char* pcCharArr, sal_uInt32 nLenFld )
     return svt::BinFilterUtils::CreateOUStringFromUniStringArray( pcCharArr, nBufSize );
 }
 
+void readArrayString( SotStorageStream *pS, std::vector< rtl::OUString >& sStringsOut, sal_Int32 nSize, long nStart )
+{
+    unsigned long nFinish = pS->Tell() + nSize;
+    while ( pS->Tell() < nFinish )
+    {
+        sal_Int32 nStringLen = 0;
+        *pS >> nStringLen;
+        sal_uInt32 nStringSize = lclGetBufferSize( nStringLen );
+        sal_Char* pString = new sal_Char[ nStringSize ];
+        pS->Read( pString, nStringSize );
+        rtl::OUString sString = lclCreateOUString( pString, nStringLen );
+        delete[] pString;
+        sStringsOut.push_back( sString );
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+    }
+}
+
+OUString createSubStreamName( const sal_uInt32& subStorageId )
+{
+    static OUString sI( RTL_CONSTASCII_USTRINGPARAM( "i" ));
+    static OUString sZero( RTL_CONSTASCII_USTRINGPARAM( "0" ));
+    OUStringBuffer buf( 6 );
+    buf.append( sI );
+    // for subStorage id < 10 stream name has leading '0'
+    // eg "i07"
+    if ( subStorageId < 10 )
+    {
+        buf.append( sZero );
+    }
+    buf.append( OUString::valueOf( (sal_Int32)subStorageId ) );
+    return buf.makeStringAndClear();
+}
+
 // export ---------------------------------------------------------------------
 
 /** This class implements writing a character array from a Unicode string.
@@ -641,6 +674,44 @@ void SvxOcxString::WriteCharArray( SvStorageStream& rStrm ) const
     }
 }
 
+class MultiPageProps
+{
+public:
+    sal_uInt16  nIdentifier; // major & minor version
+    sal_uInt16  nFixedAreaLen; // size of record
+    sal_uInt8   pBlockFlags[4]; // size of record
+    sal_Int32   mnPageCount;
+    sal_Int32   mnID;
+    bool        mbEnabled;
+    std::vector< sal_Int32 > mnIDs;
+
+    MultiPageProps();
+    bool Read(SotStorageStream *pS);
+};
+
+MultiPageProps::MultiPageProps() : nIdentifier(0), nFixedAreaLen(0), mnPageCount(0), mnID(0), mbEnabled( true )
+{
+}
+
+bool MultiPageProps::Read(SotStorageStream *pS)
+{
+    *pS >> nIdentifier >> nFixedAreaLen;
+    pS->Read( pBlockFlags, sizeof( pBlockFlags ) );
+    if ( pBlockFlags[ 0 ] & 0x02 )
+        *pS >> mnPageCount;
+    if ( pBlockFlags[ 0 ] & 0x04 )
+        *pS >> mnID;
+    if ( pBlockFlags[ 0 ] & 0x08 )
+        mbEnabled = false;
+    for ( sal_Int32 i=0; i<mnPageCount; ++i )
+    {
+        sal_Int32 nID(0);
+        *pS >> nID;
+        mnIDs.push_back( nID );
+    }
+    return true;
+}
+
 const sal_uInt16 USERFORM = (sal_uInt16)0xFF;
 const sal_uInt16 STDCONTAINER = (sal_uInt16)0xFE;
 
@@ -666,48 +737,42 @@ const sal_uInt16 TOGGLEBUTTON = (sal_uInt16)0x1C;
 const sal_uInt16 SCROLLBAR = (sal_uInt16)0x2F;
 
 const sal_uInt16 MULTIPAGE = (sal_uInt16)0x39;
-// The IDs with bit 0x8000 set appear to be generated.
-// It looks like these ID's are used with the non-toolbox [1]
-// ActiveX controls that can be present in a Userform
-// ( note: RefEdit seems to be an exception )
-// In UserForm::Read just before the Container record starts
-// you will notice there can be sometimes trailing records,
-// it seems that these records have a 1:1 relationship with the non-toolbox
-// controls present in the Userform. An id in the trailing record
-// seems to identify the specific ActiveX control and an artificial nTypeIdent
-// e.g. 0x8000, 0x8001 etc. is created so as to be able to associate
-// the ActiveX control when referenced later
-// [1] Such ActiveX controls are added via Tools/AddionalControls
-// menu
-
-// create a fixed set of those special id(s)
-// ahem, we can only read one Progress bars at the moment so....
+
+const sal_uInt16 UNKNOWNCTRL = (sal_uInt16)0x7FFF;
 const sal_uInt16 PROGRESSBAR = (sal_uInt16)0x8000;
 
-// A set of IDs from the trailing records mentioned above that seem to
-// identify the following ActiveX controls
+// following ActiveX controls are just for reference ( are NOT supported )
+const sal_uInt16 REFEDIT = (sal_uInt16)0x8001;
+const sal_uInt16 CALENDAR = (sal_uInt16)0x8002;
+const sal_uInt16 IMAGECOMBO = (sal_uInt16)0x8003;
+const sal_uInt16 IMAGELIST = (sal_uInt16)0x8004;
+const sal_uInt16 SLIDER = (sal_uInt16)0x8005;
+const sal_uInt16 STATUSBAR = (sal_uInt16)0x8006;
+const sal_uInt16 CHARTSPACE = (sal_uInt16)0x8007;
+
+// A set of common CLSIDs
+// there are to identify the following ActiveX controls ( that appear in the ClassTable records )
 // Currently we only can process ( in a limited way ) the ProgressBar
 // the other ID's are for reference ( & future )
 
-// RefEdit control {00024512-0000-0000-c000-000000000046}
-const sal_uInt8 aRefEditID[] =
-{
-0x12, 0x45, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,
-};
-
 // Microsoft ProgressBar Control, version 6.0 {35053A22-8589-11D1-B16A-00C0F0283628}
 const sal_uInt8 aProgressID[] =
 {
 0x22, 0x3a, 0x05, 0x35, 0x89, 0x85, 0xd1, 0x11,  0xb1, 0x6a, 0x00, 0xc0, 0xf0, 0x28, 0x36, 0x28,
 };
 
+// RefEdit control {00024512-0000-0000-c000-000000000046}
+const sal_uInt8 aRefEditID[] =
+{
+0x12, 0x45, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,
+};
+
 // Calendar Control 10.0
 const sal_uInt8 aCalendarID[] =
 {
 0x2b, 0xc9, 0x27, 0x8e, 0x64, 0x12, 0x1c, 0x10, 0x8a, 0x2f, 0x04, 0x02, 0x24, 0x00, 0x9c, 0x02,
 };
 
-
 // Microsoft ImageComboxBox Control, version 6.0 {DD9DA666-8594-11D1-B16A-00C0F0283628}
 const sal_uInt8 aImageComboID[] =
 {
@@ -738,238 +803,364 @@ const sal_uInt8 aChartSpaceID[] =
 0x46, 0xe5, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,
 };
 
-const sal_Int16 ActiveXIDLen = 0x10; // CLSID len
-const sal_Int16 ActiveXIDBlockLen = 0x30; // the block len that contains the CLSID
+const sal_uInt8 nSizeOfClsid = sizeof( aProgressID );
 
-bool lcl_handleActiveXControl(  SvStorageStream *pS, sal_uInt16& nTypeID )
+struct ClsIdTypeIDPair
 {
-    nTypeID = 0; // Illegal ActiveX ID
-    bool bRes = false;
-    sal_uInt16 nIdentifier, nFixedAreaLen;
-    *pS >> nIdentifier;
-    *pS >> nFixedAreaLen;
-    pS->SeekRel( ( nFixedAreaLen - ActiveXIDBlockLen ) );
-    sal_uInt8 aID[ ActiveXIDLen ];
-    if ( !pS->IsEof() )
-    {
-        pS->Read( aID, ActiveXIDLen );
-        pS->SeekRel( ActiveXIDBlockLen - ActiveXIDLen ); // read remainer of record
-        if ( memcmp( aID, aProgressID, ActiveXIDLen ) == 0 )
+//    ClsIdTypeIDPair() : pClsID( NULL ), nTypeID( UNKNOWNCTRL ) {}
+    const sal_uInt8* pClsID;
+    const sal_uInt16 nTypeID;
+};
+
+ClsIdTypeIDPair ClsidList[] = { { aProgressID, PROGRESSBAR },
+// unsupported common activex controls
+#ifdef DEBUG
+                                 { aRefEditID, REFEDIT },
+                                 { aCalendarID, CALENDAR },
+                                 { aImageComboID, IMAGECOMBO },
+                                 { aImageListID, IMAGELIST },
+                                 { aSliderID, SLIDER },
+                                 { aStatusBarID, STATUSBAR },
+                                 { aChartSpaceID, CHARTSPACE },
+#endif
+};
+
+typedef std::vector< ContainerRecord > ContainerRecordList;
+
+class FormObjectDepthTypeCount
+{
+    public:
+    sal_uInt8 depth;
+    sal_uInt8 TypeOrCount;
+    std::auto_ptr< sal_uInt8 > OptionalType;
+    FormObjectDepthTypeCount() : depth(0), TypeOrCount(0) {}
+    bool Read( SvStorageStream* pS )
+    {
+        *pS >> depth >> TypeOrCount;
+        if ( TypeOrCount &  0x80 )
         {
-            nTypeID = PROGRESSBAR;
-            OSL_TRACE("Found supported ***PROGRESSBAR*** ActiveX control");
-            bRes = true;
+            OptionalType.reset( new sal_uInt8 );
+            *pS >> *OptionalType;
         }
-#if (OSL_DEBUG_LEVEL > 0)
-        // If we really want to process these more controls we should put them in
-        // a list or array and have a single loop testing each id. For the moment
-        // as we only can process PROGRESSBAR, not much point doing that until
-        // we add support for at least another activex control
-
-        else if ( memcmp( aID, aCalendarID, ActiveXIDLen ) == 0 )
-            OSL_TRACE("Found unsupported ***CALENDAR*** ActiveX control");
-        else if ( memcmp( aID, aRefEditID, ActiveXIDLen ) == 0 )
-            OSL_TRACE("Found unsupported ***REFEDIT*** ActiveX control");
-        else if ( memcmp( aID, aImageComboID, ActiveXIDLen ) == 0 )
-            OSL_TRACE("Found unsupported ***IMAGECOMBO*** ActiveX control");
-        else if ( memcmp( aID, aImageListID, ActiveXIDLen ) == 0 )
-            OSL_TRACE("Found unsupported ***IMAGELIST*** ActiveX control");
-        else if ( memcmp( aID, aChartSpaceID, ActiveXIDLen ) == 0 )
-            OSL_TRACE("Found unsupported ***CHARTSPACE*** ActiveX control");
-        else if ( memcmp( aID, aSliderID, ActiveXIDLen ) == 0 )
-            OSL_TRACE("Found unsupported ***SLIDER*** ActiveX control");
-        else if ( memcmp( aID, aStatusBarID, ActiveXIDLen ) == 0 )
-            OSL_TRACE("Found unsupported ***STATUSBAR*** ActiveX control");
-#endif
-        else
+        TypeOrCount = ( TypeOrCount >> 1 );
+        return true;
+    }
+};
+
+class ClassTable
+{
+    sal_uInt16 nIdentifier;
+    sal_uInt16 nFixedAreaLen;
+    sal_uInt32 nContentFlags;
+    sal_uInt16 nClassTableFlags;
+    sal_uInt16 nVarFlags;
+    sal_Int32 nCountOfMethods;
+    sal_Int32 nDispidBind;
+    sal_uInt16 nGetBindIndex;
+    sal_uInt16 nPutBindIndex;
+    sal_uInt16 nBindType;
+    sal_uInt16 nGetValueIndex;
+    sal_uInt16 nPutValueIndex;
+    sal_uInt16 nValueType;
+    sal_uInt32 nDisidRowset;
+    sal_uInt16 nSetRowset;
+    sal_uInt8 pClsId[16];
+    sal_uInt8 pDispEvent[16];
+    sal_uInt8 pDefaultProg[16];
+    sal_uInt16 nTypeId;
+public:
+    ClassTable() :  nIdentifier( 0 )
+                   ,nFixedAreaLen( 0 )
+                   ,nContentFlags(0)
+                   ,nClassTableFlags(0)
+                   ,nVarFlags(0)
+                   ,nCountOfMethods(0)
+                   ,nDispidBind(0)
+                   ,nGetBindIndex(0)
+                   ,nPutBindIndex(0)
+                   ,nBindType(0)
+                   ,nGetValueIndex(0)
+                   ,nPutValueIndex(0)
+                   ,nValueType(0)
+                   ,nDisidRowset(0)
+                   ,nSetRowset(0)
+                   ,nTypeId(UNKNOWNCTRL)
+
+    {
+        memset( pClsId, 0, sizeof( pClsId ) );
+        memset( pDispEvent, 0, sizeof( pDispEvent ) );
+        memset( pDefaultProg, 0, sizeof( pDefaultProg ) );
+    }
+    bool Read(  SvStorageStream* pS )
+    {
+        long nStartPos = pS->Tell();
+        *pS >> nIdentifier >> nFixedAreaLen >> nContentFlags;
+        bool bClsID( false );
+        bool bDispEvent( false );
+        bool bDefaultProg( false );
+        if (  nContentFlags & 0x00000001 )
+            bClsID = true;
+        if (  nContentFlags & 0x00000002 )
+            bDispEvent = true;
+//        if (  nContentFlags & 0x00000004 ) ' not set should be 0
+        if (  nContentFlags & 0x00000008 )
+            bDefaultProg = true;
+        if (  nContentFlags & 0x00000010 )
+            *pS >> nClassTableFlags >> nVarFlags;
+        if (  nContentFlags & 0x00000020 )
+            *pS >> nCountOfMethods;
+        if (  nContentFlags & 0x00000040 )
+            *pS >> nDispidBind;
+        if (  nContentFlags & 0x00000080 )
+            *pS >> nGetBindIndex;
+        if (  nContentFlags & 0x00000100 )
+            *pS >> nPutBindIndex;
+        if (  nContentFlags & 0x00000200 )
+            *pS >> nBindType;
+        if (  nContentFlags & 0x00000400 )
+            *pS >> nGetValueIndex;
+        if (  nContentFlags & 0x00000800 )
+            *pS >> nPutValueIndex;
+        if (  nContentFlags & 0x00001000 )
+            *pS >> nValueType;
+        if (  nContentFlags & 0x00002000 )
         {
-            OSL_TRACE("Unknown activeX ID !");
+            ReadAlign( pS, pS->Tell() - nStartPos, 4 );
+            *pS >> nDisidRowset;
         }
+        if (  nContentFlags & 0x00004000 )
+            *pS >> nSetRowset;
+        ReadAlign( pS, pS->Tell() - nStartPos, 4 );
+        // Extra Block
+        if ( bClsID )
+            pS->Read( pClsId, sizeof( pClsId ) );
+        if ( bDispEvent )
+            pS->Read( pDispEvent, sizeof( pDispEvent ) );
+        if ( bDefaultProg )
+            pS->Read( pDefaultProg, sizeof( pDefaultProg ) );
+
+        sal_Int32 nNumIds =  SAL_N_ELEMENTS( ClsidList );
+
+        if ( bClsID )
+        {
+            for ( sal_Int32 index = 0; index < nNumIds; ++index )
+            {
+                if ( memcmp( pClsId, ClsidList[ index ].pClsID, nSizeOfClsid ) == 0 )
+                {
+                    nTypeId = ClsidList[ index ].nTypeID;
+                    OSL_TRACE( "... found activex control ClsidList[ %d ] and have given it TypeIdent 0x%x", index, nTypeId );
+                }
+            }
+        }
+        ReadAlign( pS, pS->Tell() - nStartPos, 4 );
+        return true;
     }
-    return bRes;
-}
 
-typedef std::vector< ContainerRecord > ContainerRecordList;
+    sal_uInt16 getTypeId() { return nTypeId; }
+};
 
-class ContainerRecReader
+class OleSiteConcreteControl
 {
-    public:
+    sal_uInt16 nIdentifier;
+    sal_uInt16 nFixedAreaLen;
+    sal_uInt32 nContentFlags;
+public:
+    OleSiteConcreteControl() :  nIdentifier( 0 ), nFixedAreaLen( 0 ), nContentFlags(0) {}
+    bool Read( ContainerRecord& rec, SvStorageStream* pS )
+    {
+        long nStartPos = pS->Tell();
+        *pS >> nIdentifier >> nFixedAreaLen >> nContentFlags;
+
+        bool bPosition( false );
+
+        sal_uInt32 nNameLen = 0;
+        // length of control name
+        if ( nContentFlags & 0x00000001 )
+            *pS >> nNameLen;
+        // length of control tag
+        sal_uInt32 nTagLen = 0;
+        if( nContentFlags & 0x00000002 )
+            *pS >> nTagLen;
+        // substorage id for frames
+        if( nContentFlags & 0x00000004 )
+            *pS >> rec.nSubStorageId;
+        // help-context id
+        if( nContentFlags & 0x00000008 )
+            pS->SeekRel( 4 );
+        // option flags
+        if( nContentFlags & 0x00000010 )
+        {
+            sal_uInt32 nBitFlags = 0;
+            *pS >> nBitFlags;
+            rec.bVisible = ( nBitFlags & 0x02 );
+            rec.bTabStop = ( nBitFlags & 0x01 );
+        }
+        // substream size
+        if( nContentFlags & 0x00000020 )
+            *pS >> rec.nSubStreamLen;
+        // tabstop position
+        if( nContentFlags & 0x00000040 )
+        {
+            ReadAlign( pS, pS->Tell() - nStartPos, 2 );
+            *pS >> rec.nTabPos;
+        }
+        // control type
+        if( nContentFlags & 0x00000080 )
+        {
+            ReadAlign( pS, pS->Tell() - nStartPos, 2 );
+            *pS >> rec.nTypeIdent;
+        }
+        if( nContentFlags & 0x00000100 )
+            bPosition = true;
+        sal_Int16 nGroupId = 0;
+        if( nContentFlags & 0x00000200 )
+        {
+            ReadAlign( pS, pS->Tell() - nStartPos, 2 );
+            *pS >> nGroupId;
+        }
 
-    virtual ~ContainerRecReader() {}
+        // length of infotip
+        sal_uInt32 nTipLen = 0;
+        if( nContentFlags & 0x00000800 )
+        {
+            ReadAlign( pS, pS->Tell() - nStartPos, 4 );
+            *pS >> nTipLen;
+        }
+        sal_uInt32 nCntrlIdLen = 0;
+        if( nContentFlags & 0x00001000 )
+        {
+            ReadAlign( pS, pS->Tell() - nStartPos, 4 );
+            *pS >> nCntrlIdLen;
+        }
 
-    virtual bool Read( OCX_ContainerControl* pContainerControl, SvStorageStream *pS)
-    {
-        *pS >> nNoRecords;
-        *pS >> nTotalLen;
+        // length of control source name
+        sal_uInt32 nCtrlSrcLen = 0;
+        if( nContentFlags & 0x00002000 )
+        {
+            ReadAlign( pS, pS->Tell() - nStartPos, 4 );
+            *pS >> nCtrlSrcLen;
+        }
 
-        if ( isMultiPage )
+        // length of row source name
+        sal_uInt32 nRowSrcLen = 0;
+        if( nContentFlags & 0x00004000 )
         {
-            if ( !handleMultiPageHdr( pS ) )
-            {
-                return false;
-            }
+            ReadAlign( pS, pS->Tell() - nStartPos, 4 );
+            *pS >> nRowSrcLen;
         }
-        else
+
+        ReadAlign( pS, pS->Tell() - nStartPos, 4 );
+        // control name
+        sal_Char* pName = 0;
+        sal_uInt32 nNameBufSize = lclGetBufferSize( nNameLen );
+        if( nNameBufSize > 0 )
         {
-            if ( !handleStandardHdr( pS ) )
-            {
-                return false;
-            }
+            ReadAlign( pS, pS->Tell() - nStartPos, 4 );
+            pName = new char[ nNameBufSize ];
+            pS->Read( pName, nNameBufSize );
+        }
+        // control tag
+        sal_uInt32 nTagBufSize = lclGetBufferSize( nTagLen );
+        if( nTagBufSize > 0 )
+        {
+            ReadAlign( pS, pS->Tell() - nStartPos, 4 );
+            pS->SeekRel( nTagBufSize );
         }
 
-        records.clear();
-        for (sal_uInt32 nRecord = 0; nRecord < nNoRecords; ++nRecord)
+        // control position
+        if( bPosition )
         {
-            // DR #134146# redo loading of FrameChild data
+            ReadAlign( pS, pS->Tell() - nStartPos, 4 );
+            *pS >> rec.nLeft >> rec.nTop;
+        }
 
-            ContainerRecord rec;
+        // control infotip
+        sal_uInt32 nTipBufSize = lclGetBufferSize( nTipLen );
+        if( nTipBufSize > 0 )
+        {
+            ReadAlign( pS, pS->Tell() - nStartPos, 4 );
+            std::auto_ptr< sal_Char > pTipName;
+            pTipName.reset( new sal_Char[ nTipBufSize ] );
+            pS->Read( pTipName.get(), nTipBufSize );
+            rec.controlTip = lclCreateOUString( pTipName.get(), nTipLen );
+        }
+        // control id
+        sal_uInt32 nCntrlIdSize = lclGetBufferSize( nCntrlIdLen );
+        if( nCntrlIdSize > 0 )
+        {
+            ReadAlign( pS, pS->Tell() - nStartPos, 4 );
+            pS->SeekRel( nCntrlIdSize );
+        }
+        // control source name
+        sal_uInt32 nCtrlSrcBufSize = lclGetBufferSize( nCtrlSrcLen );
+        if( nCtrlSrcBufSize > 0 )
+        {
+            ReadAlign( pS, pS->Tell() - nStartPos, 4 );
+            std::vector< sal_Char > pCtrlSrcName( nCtrlSrcBufSize );
+            pS->Read( &pCtrlSrcName[0], nCtrlSrcBufSize );
+            rec.sCtrlSource = lclCreateOUString( &pCtrlSrcName[0], nCtrlSrcLen );
+            OSL_TRACE("*** *** *** ControlSourceName -> %s ", rtl::OUStringToOString( rec.sCtrlSource, RTL_TEXTENCODING_UTF8 ).getStr() );
+        }
+        // row source name
+        sal_uInt32 nRowSrcBufSize = lclGetBufferSize( nRowSrcLen );
+        if( nRowSrcBufSize > 0 )
+        {
+            ReadAlign( pS, pS->Tell() - nStartPos, 4 );
+            std::vector< sal_Char > pRowSrcName( nRowSrcBufSize );
+            pS->Read( &pRowSrcName[0], nRowSrcBufSize );
+            rec.sRowSource =  lclCreateOUString( &pRowSrcName[0], nRowSrcLen );
+            OSL_TRACE("*** *** *** RowSourceName -> %s ", rtl::OUStringToOString( rec.sRowSource, RTL_TEXTENCODING_UTF8 ).getStr() );
+        }
 
-            // record header
-            sal_uInt16 nId, nSize;
-            *pS >> nId >> nSize;
-            sal_Size nStartPos = pS->Tell();
-
-            // content flags
-            sal_uInt32 nContentFlags;
-            *pS >> nContentFlags;
-
-            // length of control name
-            sal_uInt32 nNameLen = 0;
-            if( nContentFlags & 0x00000001 )
-                *pS >> nNameLen;
-            // length of control tag
-            sal_uInt32 nTagLen = 0;
-            if( nContentFlags & 0x00000002 )
-                *pS >> nTagLen;
-            // substorage id for frames
-            if( nContentFlags & 0x00000004 )
-                *pS >> rec.nSubStorageId;
-            // help-context id
-            if( nContentFlags & 0x00000008 )
-                pS->SeekRel( 4 );
-            // option flags
-            if( nContentFlags & 0x00000010 )
-            {
-                sal_uInt32 nBitFlags = 0;
-                *pS >> nBitFlags;
-                rec.bVisible = ( ( nBitFlags & 0x02 ) == 0x02 );
-            }
-            // substream size
-            if( nContentFlags & 0x00000020 )
-                *pS >> rec.nSubStreamLen;
-            // tabstop position
-            if( nContentFlags & 0x00000040 )
-                *pS >> rec.nTabPos;
-            // control type
-            if( nContentFlags & 0x00000080 )
-                *pS >> rec.nTypeIdent;
-            if( nContentFlags & 0x00000200 )
-                pS->SeekRel( 4 ); // Grouping?
-            // length of infotip
-            sal_uInt32 nTipLen = 0;
-            if( nContentFlags & 0x00000800 )
-            {
-                ReadAlign( pS, pS->Tell() - nStartPos, 4 );
-                *pS >> nTipLen;
-            }
+        ReadAlign( pS, pS->Tell() - nStartPos, 4 );
+        rec.cName = lclCreateOUString(pName, nNameLen);
+        delete[] pName;
+        return true;
+    }
+};
 
-            sal_uInt32 nCntrlIdLen = 0;
-            if( nContentFlags & 0x00001000 )
-                *pS >> nCntrlIdLen;
+class ContainerRecReader
+{
+    public:
 
-            // length of control source name
-            sal_uInt32 nCtrlSrcLen = 0;
-            if( nContentFlags & 0x00002000 )
-            {
-                ReadAlign( pS, pS->Tell() - nStartPos, 4 );
-                *pS >> nCtrlSrcLen;
-            }
+    virtual ~ContainerRecReader() {}
 
-            // length of row source name
-            sal_uInt32 nRowSrcLen = 0;
-            if( nContentFlags & 0x00004000 )
-            {
-                ReadAlign( pS, pS->Tell() - nStartPos, 4 );
-                *pS >> nRowSrcLen;
-            }
+    virtual bool Read( OCX_ParentControl* pContainerControl, SvStorageStream *pS, std::vector< ClassTable >& rSiteClassInfo )
+    {
+        *pS >> nNoRecords;
+        *pS >> nTotalLen;
+        long nStart = pS->Tell();
+        for ( sal_uInt32 nSite = 0; nSite < nNoRecords; )
+        {
+            FormObjectDepthTypeCount siteAndDepth;
+            siteAndDepth.Read( pS );
+            nSite += ( siteAndDepth.OptionalType.get() ? siteAndDepth.TypeOrCount : 1 );
+        }
 
-            // control name
-            sal_Char* pName = 0;
-            sal_uInt32 nNameBufSize = lclGetBufferSize( nNameLen );
-            if( nNameBufSize > 0 )
-            {
-                pName = new char[ nNameBufSize ];
-                ReadAlign( pS, pS->Tell() - nStartPos, 4 );
-                pS->Read( pName, nNameBufSize );
-            }
-            // control tag
-            sal_uInt32 nTagBufSize = lclGetBufferSize( nTagLen );
-            if( nTagBufSize > 0 )
-            {
-                ReadAlign( pS, pS->Tell() - nStartPos, 4 );
-                pS->SeekRel( nTagBufSize );
-            }
+        ReadAlign(pS, pS->Tell() - nStart, 4);
 
-            // control position
-            if( nContentFlags & 0x00000100 )
-            {
-                ReadAlign( pS, pS->Tell() - nStartPos, 4 );
-                *pS >> rec.nLeft >> rec.nTop;
-            }
+        for (sal_uInt32 nRecord = 0; nRecord < nNoRecords; ++nRecord)
+        {
 
-            // control infotip
-            sal_uInt32 nTipBufSize = lclGetBufferSize( nTipLen );
-            if( nTipBufSize > 0 )
-            {
-                std::auto_ptr< sal_Char > pTipName;
-                pTipName.reset( new sal_Char[ nTipBufSize ] );
-                ReadAlign( pS, pS->Tell() - nStartPos, 4 );
-                pS->Read( pTipName.get(), nTipBufSize );
-                rec.controlTip = lclCreateOUString( pTipName.get(), nTipLen );
-            }
-            // control id
-            sal_uInt32 nCntrlIdSize = lclGetBufferSize( nCntrlIdLen );
-            if( nCntrlIdSize > 0 )
-            {
-                ReadAlign( pS, pS->Tell() - nStartPos, 4 );
-                pS->SeekRel( nCntrlIdSize );
-            }
-            // control source name
-            sal_uInt32 nCtrlSrcBufSize = lclGetBufferSize( nCtrlSrcLen );
-            if( nCtrlSrcBufSize > 0 )
-            {
-                ReadAlign( pS, pS->Tell() - nStartPos, 4 );
-                std::auto_ptr< sal_Char > pCtrlSrcName;
-                pCtrlSrcName.reset( new sal_Char[ nCtrlSrcBufSize ] );
-                pS->Read( pCtrlSrcName.get(), nCtrlSrcBufSize );
-                rec.sCtrlSource = lclCreateOUString( pCtrlSrcName.get(), nCtrlSrcLen );
-                OSL_TRACE("*** *** *** ControlSourceName -> %s ", rtl::OUStringToOString( rec.sCtrlSource, RTL_TEXTENCODING_UTF8 ).getStr() );
-            }
-            // row source name
-            sal_uInt32 nRowSrcBufSize = lclGetBufferSize( nRowSrcLen );
-            if( nRowSrcBufSize > 0 )
+            ContainerRecord rec;
+
+            OleSiteConcreteControl site;
+            site.Read( rec, pS );
+            if ( rec.nTypeIdent >= ( UNKNOWNCTRL + 1 ) )
             {
-                ReadAlign( pS, pS->Tell() - nStartPos, 4 );
-                std::auto_ptr< sal_Char > pRowSrcName;
-                pRowSrcName.reset( new sal_Char[ nRowSrcBufSize ] );
-                pS->Read( pRowSrcName.get(), nRowSrcBufSize );
-                rec.sRowSource =  lclCreateOUString( pRowSrcName.get(), nRowSrcLen );
-                OSL_TRACE("*** *** *** RowSourceName -> %s ", rtl::OUStringToOString( rec.sRowSource, RTL_TEXTENCODING_UTF8 ).getStr() );
+                sal_uInt16 nIndex = rec.nTypeIdent - ( UNKNOWNCTRL + 1 );
+                if ( nIndex <  rSiteClassInfo.size() )
+                    rec.nTypeIdent = rSiteClassInfo[ nIndex ].getTypeId();
             }
-
-            // seek to end of data
-            pS->Seek( nStartPos + nSize );
-
-            rec.cName = lclCreateOUString(pName, nNameLen);
-            delete[] pName;
-
             OCX_Control* pControl = NULL;
+            OSL_TRACE("** About to create control of type 0x%x with name %s from rec", rec.nTypeIdent, rtl::OUStringToOString( rec.cName, RTL_TEXTENCODING_UTF8 ).getStr() );
             if( pContainerControl->createFromContainerRecord( rec, pControl ) &&
                 pControl )
             {
                 // propagate doc shell from parent
                 pControl->pDocSh = pContainerControl->pDocSh;
                 pContainerControl->ProcessControl( pControl, pS, rec );
+
             }
             else if ( rec.nTypeIdent & 0x8000 )
             {
@@ -987,90 +1178,12 @@ class ContainerRecReader
         return true;
     }
 
+    ContainerRecReader():nNoRecords(0), nTotalLen(0){}
     protected:
-    ContainerRecReader() : isMultiPage(false){}
-    bool isMultiPage;
     sal_uInt32 nNoRecords;
     sal_uInt32 nTotalLen;
 
     private:
-    bool handleStandardHdr( SvStorageStream* pS )
-    {
-        sal_uInt8 aUnknown11[4];
-        pS->Read(aUnknown11, sizeof(aUnknown11));
-        // discovered a dialog with value of 0xFF for aUnknown11
-        // needed an extra 4 bytes to offset correctly  into the control
-        // records. Valid test or coincidence ?
-        if ( aUnknown11[1] == 0xFF )
-           pS->Read( aUnknown11, sizeof(aUnknown11));
-        return true;
-    }
-
-    bool handleMultiPageHdr( SvStorageStream* pS )
-    {
-        sal_uInt32 nUnknown_32b; // unknown 32 bit structure, flags ?
-        sal_uInt16 nUnknown_16b; // unknown 16 bit structure
-        sal_uInt16 nMysteryLen; // lenght of unknown sub record
-
-        *pS >> nUnknown_32b;
-        *pS >> nUnknown_16b;
-        *pS >> nMysteryLen;
-
-        pS->SeekRel( nMysteryLen );
-        return true;
-    }
-    ContainerRecordList records;
-};
-
-class StdContainerRecReader : public ContainerRecReader
-{
-    public:
-    StdContainerRecReader(){}
-};
-
-class MultiPageContainerRecReader : public ContainerRecReader
-{
-    public:
-    MultiPageContainerRecReader()
-    {
-        // NP ( 27-01-05 )
-        // Strictly speaking this approach shouldn't be necessary.
-        // It should be possible to have a common routine read the
-        // container record array and by examining the flags present in
-        // the record to determine we expect to read or not.
-        // In this case for a MultPage control there is no Top or Left
-        // values in the control record array, however time contraints
-        // and associated risk prevent further investigation of this
-        // at the moment.
-        // similar situation exists for the start of the container record
-        // which in the case of the MultiPage is different from
-        // UserForm & Frame ( the other containers )
-
-        isMultiPage = true; // tell the base class skip
-    }
-};
-
-class ContainerRecordReaderFac
-{
-    public:
-    static ContainerRecReader* instance( sal_uInt32 containerType )
-    {
-        switch( containerType )
-        {
-            case PAGE:
-            case FRAME:
-            case USERFORM:
-            case STDCONTAINER:
-                return new StdContainerRecReader();
-            case MULTIPAGE:
-                return new MultiPageContainerRecReader();
-            default:
-                DBG_ERROR("Illegal container type for factory");
-                return NULL;
-        }
-    }
-    private:
-    ContainerRecordReaderFac();
 };
 
 } // namespace
@@ -1273,6 +1386,7 @@ sal_Bool OCX_Control::Import(uno::Reference<container::XNameContainer> &rDialog
     }
 
     uno::Reference<beans::XPropertySet> xPropSet(xCreate, uno::UNO_QUERY);
+
     if (!xPropSet.is())
         return sal_False;
 
@@ -1920,7 +2034,7 @@ sal_Bool OCX_OptionButton::Import(com::sun::star::uno::Reference<
         sGroupName = sParentName.concat( C2U( ":" ) ).concat( sGroupName );
     }
     if ( sGroupName.getLength() == 0 )
-        sGroupName = rtl::OUString::createFromAscii("DefaultGroup");
+        sGroupName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultGroup" ));
     OSL_TRACE("RadioButton %s has groupname %s",
         rtl::OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr(),  rtl::OUStringToOString( sGroupName, RTL_TEXTENCODING_UTF8 ).getStr() );
         try
@@ -2202,6 +2316,12 @@ sal_Bool OCX_TextBox::Import(com::sun::star::uno::Reference<
         }
     }
 
+    if ( sImageUrl.getLength() )
+    {
+        aTmp <<= sImageUrl;
+        rPropSet->setPropertyValue( WW8_ASCII2STR("ImageURL"), aTmp);
+    }
+
     aFontData.Import(rPropSet);
     return sal_True;
 }
@@ -3648,8 +3768,15 @@ sal_Bool OCX_Label::Read(SvStorageStream *pS)
     {
         pS->Read(pPictureHeader,20);
         *pS >> nPictureLen;
-        pPicture = new sal_uInt8[nPictureLen];
-        pS->Read(pPicture,nPictureLen);
+        long imagePos = pS->Tell();
+        mxGrfObj = lcl_readGraphicObject( pS );
+        if( mxGrfObj.is() )
+        {
+            sImageUrl = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( GRAPHOBJ_URLPREFIX ) );
+            sImageUrl = sImageUrl + mxGrfObj->getUniqueID();
+        }
+        // make sure the stream position should be pointing after the image
+        pS->Seek( imagePos + nPictureLen );
     }
     if (nIcon)
     {
@@ -3669,325 +3796,61 @@ TypeName::TypeName(sal_Char *pName, sal_uInt32 nStoreId, sal_uInt32 nLen, sal_uI
 {
 }
 
-OCX_ContainerControl::OCX_ContainerControl( SotStorageRef& parent,
-            const ::rtl::OUString& storageName,
-            const ::rtl::OUString& sN,
-            const uno::Reference< container::XNameContainer >  &rParent,
-            OCX_Control* pParent ) :
-                OCX_Control(sN, pParent), mxParent(rParent), nNoRecords(0), nTotalLen(0), containerType( STDCONTAINER )
-{
-
-    mContainerStorage = parent->OpenSotStorage(storageName,
-        STREAM_READWRITE |
-        STREAM_NOCREATE |
-        STREAM_SHARE_DENYALL);
-    mContainerStream = mContainerStorage->OpenSotStream(
-        String(RTL_CONSTASCII_STRINGPARAM("f"),
-        RTL_TEXTENCODING_MS_1252),
-        STREAM_STD_READ | STREAM_NOCREATE);
-    mContainedControlsStream = mContainerStorage->OpenSotStream( String(RTL_CONSTASCII_STRINGPARAM("o"),
-        RTL_TEXTENCODING_MS_1252),
-        STREAM_STD_READ | STREAM_NOCREATE);
-}
-OCX_ContainerControl::~OCX_ContainerControl()
-{
-    CtrlIterator aEnd = mpControls.end();
-    for (CtrlIterator aIter = mpControls.begin(); aIter != aEnd; ++ aIter )
-    {
-        delete *aIter;
-    }
-}
-
-// Really import should receive the parent e.g. a Userform, Frame or Multi Page
-// and call import on its containees with itself  ( up-called from
-// the base class ) but... the reality is we have no containment model
-// so we make sure rPropSet is always the parent Dialog
-
-sal_Bool OCX_ContainerControl::Import(uno::Reference<beans::XPropertySet>& /* rProps */ )
-{
-    if ( !mxParent.is() )
-    {
-        return sal_False;
-    }
-    CtrlIterator aEnd = mpControls.end();
-//    int count = 0;
-    for (CtrlIterator aIter = mpControls.begin(); aIter != aEnd; ++ aIter )
-    {
-        if ( !(*aIter)->Import( mxParent ) )
-        {
-            return sal_False;
-        }
-    }
-    return sal_True;
-}
-
-OUString OCX_ContainerControl::createSubStreamName( const sal_uInt32& subStorageId )
-{
-    static OUString sI = OUString::createFromAscii("i");
-    static OUString sZero = OUString::createFromAscii( "0" );
-    OUStringBuffer buf( 6 );
-    buf.append( sI );
-    // for subStorage id < 10 stream name has leading '0'
-    // eg "i07"
-    if ( subStorageId < 10 )
-    {
-        buf.append( sZero );
-    }
-    buf.append( OUString::valueOf( (sal_Int32)subStorageId ) );
-    return buf.makeStringAndClear();
-}
-
-
-bool OCX_ContainerControl::createFromContainerRecord( ContainerRecord& record, OCX_Control*& pControl )
-{
-    pControl = NULL;
-    if (  record.nTypeIdent & 0x8000 )
-    {
-        std::hash_map<sal_uInt16, sal_uInt16>::iterator it = mActiveXIDMap.find( record.nTypeIdent );
-        if ( it == mActiveXIDMap.end() )
-            return false;
-        // replace the generated id with our hardcoded one
-        record.nTypeIdent = it->second;
-    }
-    switch ( record.nTypeIdent)
-        {
-            case CMDBUTTON:
-                pControl = new OCX_CommandButton;
-                break;
-            case LABEL:
-                pControl = new OCX_UserFormLabel(this);
-                break;
-            case TEXTBOX:
-                pControl = new OCX_TextBox;
-                break;
-            case LISTBOX:
-                pControl = new OCX_ListBox;
-                break;
-            case COMBOBOX:
-                pControl = new OCX_ComboBox;
-                break;
-            case CHECKBOX:
-                pControl =  new OCX_CheckBox;
-                break;
-            case OPTIONBUTTON:
-                pControl = new OCX_OptionButton;
-                break;
-            case TOGGLEBUTTON:
-                pControl = new OCX_ToggleButton;
-                break;
-            case IMAGE: //Image
-            {
-                pControl = new OCX_Image;
-                break;
-            }
-            case PAGE: // Page
-            {
-                OUString sMSStore = createSubStreamName( record.nSubStorageId );
-                pControl = new OCX_Page(mContainerStorage, sMSStore,
-                    record.cName, mxParent, this);
-                break;
-            }
-            case MULTIPAGE: // MultiPage
-            {
-                OUString sMSStore = createSubStreamName( record.nSubStorageId );
-                pControl = new OCX_MultiPage( mContainerStorage, sMSStore,
-                    record.cName, mxParent, this);
-                break;
-            }
-            case FRAME:  //Frame
-            {
-                OUString sFrameStore = createSubStreamName( record.nSubStorageId );
-                pControl = new OCX_Frame(mContainerStorage, sFrameStore,
-                    record.cName, mxParent, this);
-
-                break;
-            }
-            case SPINBUTTON: //SpinButton
-            {
-                pControl = new OCX_SpinButton;
-                break;
-            }
-            case TABSTRIP: //TabStrip
-            {
-                pControl = new OCX_TabStrip;
-                break;
-            }
-            case SCROLLBAR: //ScrollBar
-                pControl = new OCX_ScrollBar;
-                break;
-            case PROGRESSBAR: //ProgressBar Active X control
-                pControl = new OCX_ProgressBar;
-                break;
-            default:
-                OSL_TRACE( "**** Unknown control 0x%x", record.nTypeIdent );
-                DBG_ERROR( "Unknown control");
-                return false;
-        }
-        pControl->sName = record.cName;
-        return true;
-}
-
-
-void addSeperator( std::vector< OCX_Control* >& dest )
-{
-    OCX_Control* seperator = new OCX_CommandButton;
-    seperator->SetInDialog(true);
-    seperator->sName = C2S("GroupSeperator");
-    dest.push_back( seperator );
-}
-
-void addRButtons( std::vector< OCX_Control* >& src,
-                  std::vector< OCX_Control* >& dest,
-                  bool addGroupSeperator )
-{
-    if ( addGroupSeperator )
-    {
-        addSeperator( dest );
-    }
-
-    for ( CtrlIterator rbIter = src.begin(); rbIter != src.end(); ++rbIter )
-    {
-        dest.push_back( *rbIter );
-    }
-}
-
-void OCX_ContainerControl::ProcessControl(OCX_Control* pControl,SvStorageStream* /* pS */,  ContainerRecord& rec )
-{
-    SotStorageStreamRef oStream = mContainedControlsStream;
-
-    // can insert into OO Dialog (e.g is this a supported dialog control)??
-    if ( rec.nTypeIdent == TABSTRIP )
-    {
-        // skip the record in the stream, discard the control
-        oStream->SeekRel( rec.nSubStreamLen );
-        delete pControl;
-    }
-    else
-    {
-        // A container control needs to read the f stream in
-        // the folder ( substorage ) associated with this control
-        switch ( rec.nTypeIdent )
-        {
-            case FRAME:
-            case MULTIPAGE:
-            case PAGE:
-                {
-                    OCX_ContainerControl* pContainer =
-                        static_cast< OCX_ContainerControl* >( pControl );
-                    oStream = pContainer->getContainerStream();
-                    break;
-                }
-            case LISTBOX:
-            case OPTIONBUTTON:
-            case COMBOBOX:
-            case SPINBUTTON:
-            case SCROLLBAR:
-                {
-                    pControl->msCtrlSource = rec.sCtrlSource;
-                    pControl->msRowSource = rec.sRowSource;
-                }
-        }
-        pControl->sName = rec.cName;
-        pControl->msToolTip = rec.controlTip;
-        // Position of controls is relative to the container
-        pControl->mnTop = rec.nTop + mnTop;
-        pControl->mnLeft = rec.nLeft + mnLeft;
-        // MS tabIndex, pretty useless in OpenOffice land
-        // as tab indexes in MS are relative to parent container.
-        // However we need this value in order to set
-        // OpenOffice tab indices in a sensible way to
-        // reflect the ms tabbing from orig MS UserForm, see below
-        pControl->mnTabPos = rec.nTabPos;
-        pControl->SetInDialog(true);
-        pControl->mbVisible = rec.bVisible;
-        if ( mnStep )
-        {
-            // If the container has a step then it should be
-            // applied to all containees
-            pControl->mnStep = mnStep;
-        }
-        pControl->msParentName = sName;
-
-        // #117490# DR: container records provide size of substream, use it here...
-
-        // remember initial position to set correct stream position
-        ULONG nStrmPos = oStream->Tell();
-        // import control, may return with invalid stream position
-        pControl->FullRead(oStream);
-        // set stream to position behind substream of this control
-        oStream->Seek( nStrmPos + rec.nSubStreamLen );
-
-        mpControls.push_back( pControl );
-    }
-}
-
-sal_Bool OCX_ContainerControl::Read(SvStorageStream *pS)
-{
-
-    if ( mpParent )
-    {
-        mnBackColor = mpParent->mnBackColor;
-    }
-
-    std::auto_ptr< ContainerRecReader > reader (
-        ContainerRecordReaderFac::instance( containerType ) );
-
-    reader->Read( this, pS );
-    // Need to honour the MS Tab Indexes. However MS tab indexes are
-    // relative to parent, this hack sorts the controls in each container
-    // based on the ms tab indexes. When import is called we create the
-    // controls in Open/Star office based on the order of the tab indexes,
-    // this ensures that the default tab index created by Star/Open office
-    // reflects the "flattened" ms tab order.
-    ::std::sort( mpControls.begin(), mpControls.end(), SortOrderByTabPos() );
-    return true;
-}
-
 OCX_MultiPage::OCX_MultiPage( SotStorageRef& parent,
             const ::rtl::OUString& storageName,
             const ::rtl::OUString& sN,
             const uno::Reference< container::XNameContainer >  &rDialog,
             OCX_Control* pParent):
-        OCX_ContainerControl(parent, storageName, sN, rDialog, pParent ), fUnknown1(0), fEnabled(1),
-        fLocked(0), fBackStyle(1), fWordWrap(1), fAutoSize(0), nCaptionLen(0),
-        nVertPos(1), nHorzPos(7), nMousePointer(0), nBorderColor(0x80000012),
-        nKeepScrollBarsVisible(3), nCycle(0), nBorderStyle(0), nSpecialEffect(0),
-        nPicture(0), nPictureAlignment(2), nPictureSizeMode(0),
-        bPictureTiling(FALSE), nAccelerator(0), nIcon(0), pCaption(0),
-        nScrollWidth(0), nScrollHeight(0), nIconLen(0), pIcon(0), nPictureLen(0),
-        pPicture(0)
-{
-    //msDialogType = C2U("NotSupported");
+                OCX_ParentControl(parent, storageName, sN, rDialog, pParent ), bHasTabs( true )
+
+{
     msDialogType = C2U("com.sun.star.awt.UnoMultiPageModel");
     mnForeColor = 0x80000012L,
     mnBackColor = 0x8000000FL;
     bSetInDialog = true;// UserForm control only
     aFontData.SetHasAlign(TRUE);
-    containerType = MULTIPAGE;
-    mnCurrentPageStep = 0;
+    nActiveTab = 0;
+    // open up the 'x' stream
+    mXStream = mContainerStorage->OpenSotStream(
+        String(RTL_CONSTASCII_STRINGPARAM("x"),
+        RTL_TEXTENCODING_MS_1252),
+        STREAM_STD_READ | STREAM_NOCREATE);
 }
 
 void OCX_MultiPage::ProcessControl(OCX_Control* pControl, SvStorageStream* /* pS */,  ContainerRecord& rec )
 {
     SotStorageStreamRef oStream = mContainedControlsStream;
 
-    OCX_Page *pPage = NULL;
-    if ( rec.nTypeIdent == PAGE )
-        pPage = static_cast< OCX_Page* >( pControl );
-    if ( pPage != NULL )
+    if ( rec.nTypeIdent == TABSTRIP )
     {
-        pPage->mnStep = ++mnCurrentPageStep;
-
-        pPage->mnTop =  mnTop;// move these to Page::import ?
-        pPage->mnLeft = mnLeft;
-        pPage->mnBackColor = mnBackColor;
-
-        oStream = pPage->getContainerStream();;
-        // Position of controls is relative to pos of this MuliPage
-        // Control
-        pPage->FullRead( oStream );
+        // TabStrip reads the 'o' stream
+        OCX_TabStrip oTabStrip;
+        oTabStrip.sName = C2S("FromMultiPage-o");
+        oTabStrip.Read( mContainedControlsStream );
+        sCaptions = oTabStrip.msItems;
+        bHasTabs = oTabStrip.bHasTabs;
+        nHeight = oTabStrip.nHeight;
+        nWidth = oTabStrip.nWidth;
+    }
+    else if ( rec.nTypeIdent == PAGE )
+    {
+        OCX_Page *pPage = NULL;
+        pPage = static_cast< OCX_Page* >( pControl );
+        if ( pPage != NULL )
+        {
+            oStream = pPage->getContainerStream();;
+            // Position of controls is relative to pos of this MuliPage
+            // Control
+            pPage->FullRead( oStream );
+            // nWidth & nHeight seem to screw up multipage control
+            pPage->nWidth = 0;
+            pPage->nHeight = 0;
+            pPage->mnBackColor = mnBackColor;
+
+            mpControls.push_back( pPage );
+            idToPage[ pPage->mnID ] = pPage;
+        }
 
-        mpControls.push_back( pPage );
     }
     else
     {
@@ -4001,110 +3864,78 @@ sal_Bool OCX_MultiPage::Read(SvStorageStream *pS)
 {
     // Unlike the other containers e.g. UserForm & Frame
     // the o stream is does not contain info for the contained controls
-    // ( e.g. the pages themselves ) but seems to be for the MultiPage
-    // itself - need to check this in more detail
-
-    // For the moment skip read of the MultiPage specific properties
-    // not much point reading these as we can't display the multi page
-    // control or in fact any sort of tabbed layout, best we can do is
-    // import just the contained controls of the individual pages
-    // Note: the record skipped below ( does not contain the expected
-    // info on this control, that seems to be contained in the o stream,
-    // see comment above)
+    // 'o' stream contains a tabstrip control
+    // 'f' stream as usual ( info about the containees )
+    // '01..09' ( etc. ) these streams contain the page controls
+    // 'x' stream, this contains an array of properties for each page followed
+    //    by a set of properties for the multipage control itself
+
+    // read the 'f' stream
+    OCX_ParentControl::Read(pS);
+
+    // Read the 'x' stream
+    // consists of
+    //   a) nTabs + 1 PageProperties ( which are little use to us )
+    //      => skip
+    //   b) a MutliPageProperty ( which contains at least the page count and
+    //       IDs of the pages ( and order ) - useful for associating correct page
+    //       with correct tab
+
+
     OCX_Control skip(C2S("Dummy"));
-    skip.Read( pS );
-    mnCurrentPageStep = mnStep; //( set step of of pages relative to step
-                                //of this MultiPage ( e.g. emulate containment )
-    return OCX_ContainerControl::Read(pS);
+    sal_Int32 nPagePropsToRead = sCaptions.size() + 1;
+    for ( sal_Int32 page = 0; page < nPagePropsToRead; ++page )
+        skip.Read( mXStream );
+    MultiPageProps multiPage;
+    multiPage.Read( mXStream );
+    mPageIds = multiPage.mnIDs;
+    return true;
 }
 
 
 sal_Bool OCX_MultiPage::Import(com::sun::star::uno::Reference<
     com::sun::star::beans::XPropertySet> &rPropSet)
 {
-    OCX_ContainerControl::Import( rPropSet );
-    return sal_True;
-}
-
-sal_Bool OCX_MultiPage::Import(com::sun::star::uno::Reference<
-        com::sun::star::container::XNameContainer>
-        &rDialog)
-{
-    uno::Reference<beans::XPropertySet> xPropSet( rDialog, uno::UNO_QUERY );
-
-    // Although MultiPage is not represeted by a "real" control we still
-    // need to propagate the backcolor of this logical parent
-    // ( the dialog or Frame or whatever ) to the children of this control.
-    // For example the controls contained in the Page of a
-    // MultiPage control use the parents backcolor ( e,g,
-    // Pages backcolor ) when trying to fake transparency
-    mnBackColor = mpParent->mnBackColor;
-
-    if ( xPropSet.is() )
-    {
-        uno::Reference<lang::XMultiServiceFactory>
-            xFactory(rDialog, uno::UNO_QUERY);
-    OSL_TRACE("** MultiPage creating control %s", rtl::OUStringToOString( msDialogType, RTL_TEXTENCODING_UTF8 ).getStr() );
-    uno::Reference<uno::XInterface> xCreate = xFactory->createInstance(msDialogType);
-    if (!xCreate.is())
-        return sal_False;
-
-    uno::Reference<awt::XControlModel> xModel(xCreate, uno::UNO_QUERY);
-    if (!xModel.is())
-        return sal_False;
-
-        try
+    uno::Any aTmp(&sName,getCppuType((OUString *)0));
+    rPropSet->setPropertyValue(
+        OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), aTmp);
+    if ( !bHasTabs )
+        rPropSet->setPropertyValue(
+            OUString(RTL_CONSTASCII_USTRINGPARAM("Decoration")), uno::makeAny( sal_False ) );
+    aTmp <<= ImportColor(mnBackColor);
+    rPropSet->setPropertyValue( WW8_ASCII2STR("BackgroundColor"), aTmp);
+    // apply caption/titles to pages
+    std::vector<sal_Int32>::iterator itCtrlId = mPageIds.begin();
+    std::vector<sal_Int32>::iterator itCtrlId_end = mPageIds.end();
+    std::vector< rtl::OUString >::iterator  itCaption = sCaptions.begin();
+    mpControls.clear();
+    // need to sort the controls according to the order of the ids
+    for ( sal_Int32 index = 1 ; ( sCaptions.size() == idToPage.size() ) && itCtrlId != itCtrlId_end; ++itCtrlId, ++itCaption, ++index )
+    {
+        std::hash_map< sal_Int32, OCX_Page* >::iterator it = idToPage.find( *itCtrlId );
+        if ( it != idToPage.end() )
         {
-        // we should just call MultiPage::Import( XPropertySet )
-            OSL_TRACE("********* MULTIPAGE cName %s", rtl::OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr() );
-        uno::Any aTmp(&sName,getCppuType((OUString *)0));
-        uno::Reference<beans::XPropertySet> xPrps(xModel, uno::UNO_QUERY);
-        xPrps->setPropertyValue( WW8_ASCII2STR("Name"), aTmp );
-        aTmp = uno::makeAny( mnCurrentPageStep );
-        xPrps->setPropertyValue( WW8_ASCII2STR("ProgressValueMax"), aTmp );
-        // default current page to 0 ( #FIXME, we need to read this value )
-        aTmp = uno::makeAny( sal_Int32(0) );
-        xPrps->setPropertyValue( WW8_ASCII2STR("ProgressValue"), aTmp );
-            OSL_TRACE("********* MULTIPAGE vomitted out properties");
+            it->second->msTitle = *itCaption;
+            if ( it->second->mbVisible )
+                nActiveTab = index;
+            mpControls.push_back( it->second );
 
-    // Calls import on contained controls
-            rDialog->insertByName(sName, uno::makeAny(xModel));
-            OSL_TRACE("*** inserted ***");
         }
-        catch( uno::Exception& )
-        {
-            DBG_ERRORFILE(
-                ByteString( "OCX_Control::Import - cannot insert control \"" ).
-                Append( ByteString( sName, RTL_TEXTENCODING_UTF8 ) ).
-                Append( '"' ).GetBuffer() );
-        }
-
-        // Calls import on contained pages
-        return OCX_ContainerControl::Import( xPropSet );
     }
-    OSL_TRACE("*** Major problem, no dialog to add controls to ");
-    DBG_ERROR(" Major problem, no dialog to add controls to ");
-    return false;
-}
-
 
+    OCX_ParentControl::Import( rPropSet );
+    rPropSet->setPropertyValue( WW8_ASCII2STR("MultiPageValue"), uno::makeAny( nActiveTab ));
+    return sal_True;
+}
 
 OCX_Page::OCX_Page( SotStorageRef& parent,
-            const ::rtl::OUString& storageName,
+            sal_Int32 nId,
             const ::rtl::OUString& sN,
             const uno::Reference< container::XNameContainer >  &rDialog,
             OCX_Control* pParent):
-        OCX_ContainerControl(parent, storageName, sN, rDialog, pParent ),
-        fUnknown1(0), fEnabled(1), fLocked(0),
-        fBackStyle(1), fWordWrap(1), fAutoSize(0), nCaptionLen(0), nVertPos(1),
-        nHorzPos(7), nMousePointer(0), nBorderColor(0x80000012),
-        nKeepScrollBarsVisible(3), nCycle(0), nBorderStyle(0), nSpecialEffect(0),
-        nPicture(0), nPictureAlignment(2), nPictureSizeMode(0),
-        bPictureTiling(FALSE), nAccelerator(0), nIcon(0), pCaption(0),
-        nScrollWidth(0), nScrollHeight(0), nIconLen(0), pIcon(0), nPictureLen(0),
-        pPicture(0)
-{
-    msDialogType = C2U("NotSupported");
+                OCX_ParentControl(parent, createSubStreamName( nId ), sN, rDialog, pParent ), mnID( nId )
+{
+    msDialogType = C2U("com.sun.star.awt.UnoPageModel");
     mnForeColor = 0x80000012,
     mnBackColor = 0x8000000F,
     bSetInDialog = true;// UserForm control only
@@ -4114,65 +3945,35 @@ OCX_Page::OCX_Page( SotStorageRef& parent,
 
 sal_Bool OCX_Page::Read(SvStorageStream *pS)
 {
-    long nStart = pS->Tell();
-    *pS >> nIdentifier;
-    DBG_ASSERT(0x400==nIdentifier,
-            "A control that has a different identifier");
-    *pS >> nFixedAreaLen;
-    pS->Read(pBlockFlags,4);
-
-    pS->SeekRel( nFixedAreaLen - sizeof( pBlockFlags ) );
-
-    ReadAlign( pS, pS->Tell() - nStart, 4);
-
-    if (pBlockFlags[2] & 0x10)
-    {
-        //Font Stuff..
-        pS->SeekRel(0x1a);
-        sal_uInt8 nFontLen;
-        *pS >> nFontLen;
-        pS->SeekRel(nFontLen);
-    }
-    return OCX_ContainerControl::Read(pS);
-
+    return OCX_ParentControl::Read(pS);
 }
 
 sal_Bool OCX_Page::Import(com::sun::star::uno::Reference<
-        com::sun::star::container::XNameContainer>
-        &rDialog)
+    com::sun::star::beans::XPropertySet>
+    &rPropSet)
 {
+    uno::Any aTmp(&sName,getCppuType((OUString *)0));
+    rPropSet->setPropertyValue(
+        OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), aTmp);
+
+    if (msTitle.getLength())
+        rPropSet->setPropertyValue( WW8_ASCII2STR("Title"), uno::makeAny( msTitle ) );
+
+    aTmp <<= ImportColor(mnBackColor);
+    rPropSet->setPropertyValue( WW8_ASCII2STR("BackgroundColor"), aTmp);
+
+    // Calls import on contained controls
+    OCX_ParentControl::Import( rPropSet );
+    return sal_True;
 
-    uno::Reference<beans::XPropertySet> xPropSet( rDialog, uno::UNO_QUERY );
-    if ( xPropSet.is() )
-    {
-        // apply Step to contained controls
-        CtrlIterator aEnd = mpControls.end();
-        for (CtrlIterator aIter = mpControls.begin(); aIter != aEnd; ++ aIter )
-        {
-            (*aIter)->mnStep = mnStep;
-        }
-        // Calls import on contained pages
-        return OCX_ContainerControl::Import( xPropSet );
-    }
-    OSL_TRACE("*** Major problem, no dialog to add controls to ");
-    DBG_ERROR("*** Major problem, no dialog to add controls to ");
-    return sal_False;
 }
 
 OCX_Frame::OCX_Frame( SotStorageRef& parent,
             const ::rtl::OUString& storageName,
             const ::rtl::OUString& sN,
-            const uno::Reference< container::XNameContainer >  &rDialog, OCX_Control* pParent):
-        OCX_ContainerControl(parent, storageName, sN, rDialog, pParent ),fUnknown1(0),fEnabled(1), fLocked(0),
-        fBackStyle(1), fWordWrap(1), fAutoSize(0), nCaptionLen(0), nVertPos(1),
-        nHorzPos(7), nMousePointer(0), nBorderColor(0x80000012),
-        nKeepScrollBarsVisible(3), nCycle(0), nBorderStyle(0), nSpecialEffect(0),
-        nPicture(0), nPictureAlignment(2), nPictureSizeMode(0),
-        bPictureTiling(FALSE), nAccelerator(0), nIcon(0), pCaption(0),
-        nScrollWidth(0), nScrollHeight(0), nScrollLeft(0), nScrollTop(0), nIconLen(0), pIcon(0), nPictureLen(0),
-        pPicture(0)
-{
-    msDialogType = C2U("com.sun.star.awt.UnoControlGroupBoxModel");
+            const uno::Reference< container::XNameContainer >  &rDialog, OCX_Control* pParent): OCX_ParentControl(parent, storageName, sN, rDialog, pParent )
+{
+    msDialogType = C2U("com.sun.star.awt.UnoFrameModel");
     mnForeColor = 0x80000012;
     mnBackColor = 0x8000000F;
     bSetInDialog = true;// UserForm control only
@@ -4182,159 +3983,7 @@ OCX_Frame::OCX_Frame( SotStorageRef& parent,
 
 sal_Bool OCX_Frame::Read(SvStorageStream *pS)
 {
-    long nStart = pS->Tell();
-    *pS >> nIdentifier;
-    DBG_ASSERT(0x400==nIdentifier,
-            "A control that has a different identifier");
-    *pS >> nFixedAreaLen;
-    pS->Read(pBlockFlags,4);
-
-    if (pBlockFlags[0] & 0x01)
-    {
-            DBG_ASSERT(!this, "ARSE");
-    }
-    if (pBlockFlags[0] & 0x02)
-            *pS >> mnBackColor;
-    if (pBlockFlags[0] & 0x04)
-            *pS >> mnForeColor;
-    if (pBlockFlags[0] & 0x08)
-        *pS >> fUnknown1;
-    if (pBlockFlags[0] & 0x40)
-    {
-        sal_uInt8 nTemp;
-        *pS >> nTemp;
-        fEnabled = (nTemp&0x04)>>2;
-        fBackStyle = (nTemp&0x08)>>3;
-        *pS >> nTemp;
-        *pS >> nTemp;
-        fWordWrap = (nTemp&0x80)>>7;
-        *pS >> nTemp;
-        fAutoSize = (nTemp&0x10)>>4;
-    }
-    if (pBlockFlags[0] & 0x80)
-    {
-        *pS >> nBorderStyle;
-    }
-
-    ReadAlign(pS, pS->Tell() - nStart, 4);
-
-    if (pBlockFlags[1] & 0x01)
-        *pS >> nMousePointer;
-    if (pBlockFlags[1] & 0x02)
-        *pS >> nKeepScrollBarsVisible;
-    if (pBlockFlags[1] & 0x20)
-        *pS >> fUnknown1; // another unknown 32 bit ( or is 8 or 16 bit with padding ? )
-
-    if (pBlockFlags[1] & 0x80)
-    {
-        ReadAlign(pS, pS->Tell() - nStart, 2);
-        *pS >> nIcon;
-        DBG_ASSERT(nIcon == 0xFFFF, "Unexpected nIcon");
-    }
-
-    bool bCaption = false;
-
-    if (pBlockFlags[2] & 0x01)
-        *pS >> nCycle;
-    if (pBlockFlags[2] & 0x02)
-        *pS >> nSpecialEffect;
-
-    if (pBlockFlags[2] & 0x04)
-    {
-        ReadAlign(pS, pS->Tell() - nStart, 4);
-        *pS >> nBorderColor;
-    }
-
-    if (pBlockFlags[2] & 0x08)
-    {
-        ReadAlign(pS, pS->Tell() - nStart, 4);
-        *pS >> nCaptionLen;
-        bCaption = true;
-    }
-
-    if (pBlockFlags[2] & 0x10)
-    {
-        ReadAlign(pS, pS->Tell() - nStart, 2);
-        sal_uInt16 nNoIdea;
-        *pS >> nNoIdea;
-        DBG_ASSERT(nNoIdea == 0xFFFF, "Expected 0xFFFF, (related to font ?)");
-    }
-
-    if (pBlockFlags[2] & 0x20)
-    {
-        ReadAlign(pS, pS->Tell() - nStart, 2);
-        *pS >> nPicture;
-        DBG_ASSERT(nPicture == 0xFFFF, "Unexpected nIcon");
-    }
-
-    if (pBlockFlags[2] & 0x80)
-        *pS >> nPictureAlignment;
-
-    if (pBlockFlags[3] & 0x01)
-        bPictureTiling = true;
-
-    if (pBlockFlags[3] & 0x02)
-        *pS >> nPictureSizeMode;
-
-    if (pBlockFlags[3] & 0x04)
-    {
-        ReadAlign(pS, pS->Tell() - nStart, 4);
-        *pS >> fUnknown8;
-    }
-
-    if (pBlockFlags[3] & 0x08)
-    {
-        ReadAlign(pS, pS->Tell() - nStart, 4);
-        *pS >> fUnknown9;
-    }
-
-    ReadAlign(pS, pS->Tell() - nStart, 4);
-    *pS >> nWidth;
-    *pS >> nHeight;
-    *pS >> nScrollWidth;
-    *pS >> nScrollHeight;
-
-    if (pBlockFlags[1] & 0x10)
-    {
-        *pS >> nScrollLeft;
-        *pS >> nScrollTop;
-    }
-
-    if ( bCaption )
-    {
-        lclReadCharArray( *pS, pCaption, nCaptionLen, pS->Tell() - nStart);
-    }
-
-    OUString tempCaption =  lclCreateOUString( pCaption, nCaptionLen );
-
-    if (nIcon)
-    {
-        pS->Read(pIconHeader,20);
-        *pS >> nIconLen;
-        pIcon = new sal_uInt8[nIconLen];
-        pS->Read(pIcon,nIconLen);
-    }
-
-    if (nPicture)
-    {
-        pS->Read(pPictureHeader,20);
-        *pS >> nPictureLen;
-        pPicture = new sal_uInt8[nPictureLen];
-        pS->Read(pPicture,nPictureLen);
-    }
-
-    ReadAlign( pS, pS->Tell() - nStart, 4);
-
-    if (pBlockFlags[2] & 0x10)
-    {
-        //Font Stuff..
-        pS->SeekRel(0x1a);
-        sal_uInt8 nFontLen;
-        *pS >> nFontLen;
-        pS->SeekRel(nFontLen);
-    }
-
-    return OCX_ContainerControl::Read( pS );
+    return OCX_ParentControl::Read( pS );
 }
 
 sal_Bool OCX_Frame::Import(com::sun::star::uno::Reference<
@@ -4349,195 +3998,26 @@ sal_Bool OCX_Frame::Import(com::sun::star::uno::Reference<
         rPropSet->setPropertyValue( WW8_ASCII2STR("Label"), aTmp);
     }
 
+    aTmp <<= ImportColor(mnBackColor);
+    rPropSet->setPropertyValue( WW8_ASCII2STR("BackgroundColor"), aTmp);
+
     // Calls import on contained controls
-    OCX_ContainerControl::Import( rPropSet );
+    OCX_ParentControl::Import( rPropSet );
     return sal_True;
 }
+
 OCX_UserForm::OCX_UserForm( SotStorageRef& parent,
             const OUString& storageName,
             const OUString& sN,
             const ::uno::Reference< container::XNameContainer >  &rDialog,
             const ::uno::Reference< lang::XMultiServiceFactory >& rMsf):
-        OCX_ContainerControl(parent, storageName, sN, rDialog),
-        nChildrenA(0), fEnabled(1), fLocked(0),
-        fBackStyle(1), fWordWrap(1), fAutoSize(0), nCaptionLen(0), nVertPos(1),
-        nHorzPos(7), nMousePointer(0), nBorderColor(0x80000012), nChildrenB(0),
-        nKeepScrollBarsVisible(3), nCycle(0), nBorderStyle(0), nSpecialEffect(0),
-        nPicture(0), nPictureAlignment(2), nPictureSizeMode(0),
-        bPictureTiling(FALSE), nAccelerator(0), nIcon(0), pCaption(0),
-        nScrollWidth(0), nScrollHeight(0), nScrollLeft(0), nScrollTop(0), nIconLen(0), pIcon(0), nPictureLen(0)
-    {
-            mnForeColor = 0x80000012;
-            mnBackColor = 0x8000000F;
-            uno::Reference< beans::XPropertySet> xProps( rMsf, uno::UNO_QUERY);
-            if ( xProps.is() )
-            {
-                xProps->getPropertyValue(C2S("DefaultContext"))  >>= mxCtx;
-            }
-            aFontData.SetHasAlign(TRUE);
-        }
-sal_Bool OCX_UserForm::Read(SvStorageStream *pS)
-{
-    long nStart = pS->Tell();
-    *pS >> nIdentifier;
-    DBG_ASSERT(0x400==nIdentifier,
-            "A control that has a different identifier");
-    *pS >> nFixedAreaLen;
-    pS->Read(pBlockFlags,4);
-
-    if (pBlockFlags[0] & 0x01)
-    {
-            DBG_ASSERT(!this, "ARSE");
-    }
-    if (pBlockFlags[0] & 0x02)
-        *pS >> mnBackColor;
-    if (pBlockFlags[0] & 0x04)
-        *pS >> mnForeColor;
-    if (pBlockFlags[0] & 0x08)
-        *pS >> nChildrenA;
-    if (pBlockFlags[0] & 0x40)
-    {
-        sal_uInt8 nTemp;
-        *pS >> nTemp;
-        fEnabled = (nTemp&0x04)>>2;
-        fBackStyle = (nTemp&0x08)>>3;
-        *pS >> nTemp;
-        *pS >> nTemp;
-        fWordWrap = (nTemp&0x80)>>7;
-        *pS >> nTemp;
-        fAutoSize = (nTemp&0x10)>>4;
-    }
-    if (pBlockFlags[0] & 0x80)
-    {
-        ReadAlign(pS, pS->Tell() - nStart, 4);
-        *pS >> nBorderStyle;
-    }
-#if 0
-        sal_uInt16 nFixedOrAlign;
-        *pS >> nFixedOrAlign;
-#endif
-    if (pBlockFlags[1] & 0x01)
-        *pS >> nMousePointer;
-    if (pBlockFlags[1] & 0x02)
-        *pS >> nKeepScrollBarsVisible;
-    if (pBlockFlags[1] & 0x20)
-    {
-        sal_uInt32 nUnknown32;
-        *pS >> nUnknown32;
-    }
-    if (pBlockFlags[1] & 0x80)
-    {
-        ReadAlign(pS, pS->Tell() - nStart, 2);
-        *pS >> nIcon;
-        DBG_ASSERT(nIcon == 0xFFFF, "Unexpected nIcon");
-    }
-    if (pBlockFlags[2] & 0x01)
-        *pS >> nCycle;
-    if (pBlockFlags[2] & 0x02)
-        *pS >> nSpecialEffect;
-
-    if (pBlockFlags[2] & 0x04)
-    {
-        ReadAlign(pS, pS->Tell() - nStart, 4);
-        *pS >> nBorderColor;
-    }
-
-    if (pBlockFlags[2] & 0x10)
-    {
-        ReadAlign(pS, pS->Tell() - nStart, 2);
-        sal_uInt16 nNoIdea;
-        *pS >> nNoIdea;
-        DBG_ASSERT(nNoIdea == 0xFFFF, "Expected 0xFFFF, (related to font ?)");
-    }
-
-    if (pBlockFlags[2] & 0x20)
-    {
-        ReadAlign(pS, pS->Tell() - nStart, 2);
-        *pS >> nPicture;
-        DBG_ASSERT(nPicture == 0xFFFF, "Unexpected nIcon");
-    }
-
-    if (pBlockFlags[2] & 0x80)
-        *pS >> nPictureAlignment;
-
-    if (pBlockFlags[3] & 0x01)
-        bPictureTiling = true;
-
-    if (pBlockFlags[3] & 0x02)
-        *pS >> nPictureSizeMode;
-
-    if (pBlockFlags[3] & 0x04)
-    {
-        ReadAlign(pS, pS->Tell() - nStart, 4);
-        *pS >> nChildrenB;
-    }
-
-    ReadAlign(pS, pS->Tell() - nStart, 4);
-    *pS >> nDrawBuffer;
-
-    ReadAlign(pS, pS->Tell() - nStart, 4);
-    *pS >> nWidth;
-    *pS >> nHeight;
-    *pS >> nScrollWidth;
-    *pS >> nScrollHeight;
-
-    if (pBlockFlags[1] & 0x10)
-    {
-        *pS >> nScrollLeft;
-        *pS >> nScrollTop;
-    }
-
-    if (nIcon)
-    {
-        pS->Read(pIconHeader,20);
-        *pS >> nIconLen;
-        pIcon = new sal_uInt8[nIconLen];
-        pS->Read(pIcon,nIconLen);
-    }
-
-    ReadAlign( pS, pS->Tell() - nStart, 4);
-    if (pBlockFlags[2] & 0x10)
+            OCX_ParentControl(parent, storageName, sN, rDialog )
     {
-        //Font Stuff..
-        pS->SeekRel(0x1a);
-        sal_uInt8 nFontLen;
-        *pS >> nFontLen;
-        pS->SeekRel(nFontLen);
-    }
-    if (nPicture)
-    {
-        pS->Read(pPictureHeader,20);
-        *pS >> nPictureLen;
-        long imagePos = pS->Tell();
-        // great embedded object
-        mxGrfObj = lcl_readGraphicObject( pS );
-        if( mxGrfObj.is() )
-        {
-            sImageUrl = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( GRAPHOBJ_URLPREFIX ) );
-            sImageUrl = sImageUrl + mxGrfObj->getUniqueID();
-        }
-        // make sure the stream position should be pointing after the image.
-        pS->Seek( imagePos + nPictureLen );
-    }
-
-    sal_Int16 numTrailingRecs = 0;
-    *pS >> numTrailingRecs;
-    // seems to be no. of trailing records,
-    // before container record starts proper
-    // ( unknown what these trailing records are for)
-    if ( numTrailingRecs )
+    uno::Reference< beans::XPropertySet> xProps( rMsf, uno::UNO_QUERY);
+    if ( xProps.is() )
     {
-        for ( sal_Int16 i = 0 ; numTrailingRecs ; --numTrailingRecs, ++i )
-        {
-            sal_uInt16 nTypeID = 0;
-            if ( lcl_handleActiveXControl( pS, nTypeID ) )
-            {
-                if ( nTypeID & 0x8000 ) // valid ActiveXID
-                    mActiveXIDMap[ ( i | 0x8000 ) ] = nTypeID;
-            }
-        }
+        xProps->getPropertyValue(C2S("DefaultContext"))  >>= mxCtx;
     }
-    return OCX_ContainerControl::Read( pS );
 }
 
 sal_Bool OCX_UserForm::Import(
@@ -4563,9 +4043,15 @@ sal_Bool OCX_UserForm::Import(
     aTmp <<= sal_Int32( aAppFontSize.Height ); //100th mm
     xDialogPropSet->setPropertyValue(WW8_ASCII2STR("Height"), aTmp);
 
+    if ( sImageUrl.getLength() )
+    {
+        aTmp <<= sImageUrl;
+        xDialogPropSet->setPropertyValue( WW8_ASCII2STR("ImageURL"), aTmp);
+    }
 
     uno::Reference<beans::XPropertySet> xPropSet( mxParent, uno::UNO_QUERY );
-    OCX_ContainerControl::Import( xPropSet );
+    OCX_ParentControl::Import( xPropSet );
+    uno::Reference< frame::XModel > xModel(  pDocSh ? pDocSh->GetModel() : NULL );
 
     uno::Reference<io::XInputStreamProvider> xSource =
         xmlscript::exportDialogModel(mxParent, mxCtx, pDocSh->GetModel() );
@@ -4832,7 +4318,7 @@ OCX_Control * SvxMSConvertOCXControls::OCX_Factory(
         rControlModel,uno::UNO_QUERY);
 
     uno::Any aTmp = xPropSet->getPropertyValue(
-        OUString::createFromAscii("ClassId"));
+        OUString( RTL_CONSTASCII_USTRINGPARAM( "ClassId" )));
     sal_Int16 nClassId = *(sal_Int16*) aTmp.getValue();
 
 //Begin nasty hack
@@ -4852,8 +4338,7 @@ OCX_Control * SvxMSConvertOCXControls::OCX_Factory(
         uno::Reference< lang::XServiceInfo > xInfo(rControlModel,
             uno::UNO_QUERY);
         if (xInfo->
-            supportsService(OUString::createFromAscii(
-                "com.sun.star.form.component.FormattedField")))
+            supportsService(OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.FormattedField" ))))
         {
             rId.AppendAscii("8BD21D10-EC42-11CE-9e0d-00aa006002f3");
             rName.AppendAscii("TextBox");
@@ -4865,8 +4350,7 @@ OCX_Control * SvxMSConvertOCXControls::OCX_Factory(
         uno::Reference< lang::XServiceInfo > xInfo(rControlModel,
             uno::UNO_QUERY);
         if (xInfo->
-            supportsService(OUString::createFromAscii(
-                "com.sun.star.form.component.ImageControl")))
+            supportsService(OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ImageControl" ))))
         nClassId = form::FormComponentType::IMAGECONTROL;
     }
 //End nasty hack
@@ -4998,7 +4482,7 @@ sal_Bool SvxMSConvertOCXControls::WriteOCXStream( SvStorageRef& rSrc1,
 
 #if 0
     uno::Any aTmp = xPropSet->getPropertyValue(
-        OUString::createFromAscii("ClassId"));
+        OUString(RTL_CONSTASCII_USTRINGPARAM("ClassId")));
     sal_Int16 nClassId = *(sal_Int16*) aTmp.getValue();
 #endif
 
@@ -5133,6 +4617,11 @@ sal_Bool OCX_CheckBox::Import(com::sun::star::uno::Reference<
     rPropSet->setPropertyValue( WW8_ASCII2STR("VerticalAlign"), aTmp );
 
     aFontData.Import(rPropSet);
+    if ( sImageUrl.getLength() )
+    {
+        aTmp <<= sImageUrl;
+        rPropSet->setPropertyValue( WW8_ASCII2STR("ImageURL"), aTmp);
+    }
     return(sal_True);
 }
 
@@ -5592,38 +5081,242 @@ sal_Bool HTML_TextBox::ReadFontData(SotStorageStream * /*pS*/)
   return sal_True;
 }
 
-
 // Doesn't really read anything but just skips the
 // record.
 sal_Bool OCX_TabStrip::Read(SotStorageStream *pS)
 {
-    const long skipLen = 0x18;
+    long nStart = pS->Tell();
     *pS >> nIdentifier;
     DBG_ASSERT(nStandardId==nIdentifier,
         "A control that has a different identifier");
     *pS >> nFixedAreaLen;
 
     pS->Read(pBlockFlags, sizeof(pBlockFlags));
-    pS->SeekRel(skipLen);
-    *pS >> nNumTabs;
-    // skip to end of control
-    pS->SeekRel(nFixedAreaLen - sizeof(pBlockFlags) - sizeof(nNumTabs) - skipLen );
-    return sal_True;
-}
 
-sal_Bool OCX_TabStrip::ReadFontData(SotStorageStream *pS)
-{
-    // Seems like there is a real font record followed by
-    // a number of blank records ( e.g. nFixedAreaLen = 0 )
-    // The number of trailing blank records is equal to the number of tabs
-    OCX_Control::ReadFontData(pS);
-    for ( sal_uInt16 index = 0; index < nNumTabs; index++ )
+    bool bSize = false;
+    bool bMultiRow = false;
+    bool bTooltips = true;
+    bool hasEmbeddedImage = false;
+    sal_Int32 nameSize = 0;
+    sal_Int32 tipStringSize = 0;
+    sal_Int32 nAcceleratorSize = 0;
+    sal_Int32 nItemSize = 0;
+    sal_Int32 nTagSize = 0;
+    if ( pBlockFlags[ 0 ] & 0x01 )
+    {
+        //List index
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        sal_Int32 nOptional32 = 0; //
+        *pS >> nOptional32;
+    }
+    if (pBlockFlags[0] & 0x02)
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        *pS >> mnBackColor;
+    }
+    if (pBlockFlags[0] & 0x04)
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        *pS >> mnForeColor;
+    }
+    if (pBlockFlags[0] & 0x10)
+         bSize = true;
+    if (pBlockFlags[0] & 0x20)
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        *pS >> nItemSize;
+    }
+    if (pBlockFlags[0] & 0x40)
+    {
+        sal_Int8 nOptional8 = 0; // mouse pointer
+        *pS >> nOptional8;
+    }
+    if (pBlockFlags[1] & 0x01)
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        sal_Int32 nOptional32 = 0; // taborientation
+        *pS >> nOptional32;
+    }
+    if (pBlockFlags[1] & 0x02)
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        sal_Int32 nOptional32 = 0; // tabstyle
+        *pS >> nOptional32;
+        if ( nOptional32 == 2 )
+            bHasTabs =false;
+    }
+    if (pBlockFlags[1] & 0x04)
+        bMultiRow = true;
+    if (pBlockFlags[1] & 0x08)
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        sal_Int32 nOptional32 = 0; // tabfixedwidth
+        *pS >> nOptional32;
+    }
+    if (pBlockFlags[1] & 0x10)
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        sal_Int32 nOptional32 = 0; // tabfixedheight
+        *pS >> nOptional32;
+    }
+    if (pBlockFlags[1] & 0x20)
+        bTooltips = false;
+
+    if (pBlockFlags[1] & 0x80)
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        *pS >> tipStringSize;
+    }
+
+    if (pBlockFlags[2] & 0x02)
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        *pS >> nameSize;
+    }
+
+    if (pBlockFlags[2] & 0x04)
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        sal_Int32 nOptional32 = 0; // variouspropertybits
+        *pS >> nOptional32;
+    }
+
+    if (pBlockFlags[2] & 0x10)
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        sal_Int32 nOptional32 = 0; // tabsallocated
+        *pS >> nOptional32;
+    }
+
+    if (pBlockFlags[2] & 0x20)
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        *pS >> nTagSize;
+    }
+
+    if (pBlockFlags[2] & 0x40)
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        *pS >> nNumTabs;
+    }
+
+    if (pBlockFlags[2] & 0x80)
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        *pS >> nAcceleratorSize;
+    }
+
+    if (pBlockFlags[3] & 0x01)
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 2);
+        sal_Int16 nOptional16 = 0; //  Mouse Icon
+        *pS >> nOptional16;
+        hasEmbeddedImage = true;
+    }
+
+    // Extra block
+    if ( bSize )
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        *pS >> nWidth;
+        *pS >> nHeight;
+    }
+    if ( nItemSize )
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        // read the caption for each tab
+        readArrayString( pS, msItems, nItemSize, nStart );
+        std::vector< rtl::OUString >::iterator it = msItems.begin();
+        std::vector< rtl::OUString >::iterator it_end = msItems.end();
+        for ( sal_Int32 i=0; it != it_end; ++i, ++it )
+            OSL_TRACE(" Caption [ %d ] is %s", i, rtl::OUStringToOString( *it, RTL_TEXTENCODING_UTF8 ).getStr() );
+    }
+
+    if ( tipStringSize )
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        // read the tip for each tab
+        std::vector< rtl::OUString > sTips;
+        readArrayString( pS, sTips, tipStringSize, nStart );
+        std::vector< rtl::OUString >::iterator it = sTips.begin();
+        std::vector< rtl::OUString >::iterator it_end = sTips.end();
+        for ( sal_Int32 i=0; it != it_end; ++i, ++it )
+            OSL_TRACE(" Tip [ %d ] is %s", i, rtl::OUStringToOString( *it, RTL_TEXTENCODING_UTF8 ).getStr() );
+    }
+
+    if ( nameSize )
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        // read the name for each tab
+        std::vector< rtl::OUString > sNames;
+        readArrayString( pS, sNames, nameSize, nStart );
+        std::vector< rtl::OUString >::iterator it = sNames.begin();
+        std::vector< rtl::OUString >::iterator it_end = sNames.end();
+        for ( sal_Int32 i=0; it != it_end; ++i, ++it )
+            OSL_TRACE(" Name [ %d ] is %s", i, rtl::OUStringToOString( *it, RTL_TEXTENCODING_UTF8 ).getStr() );
+    }
+
+    if ( nTagSize )
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        // read the name for each tab
+        std::vector< rtl::OUString > sTags;
+        readArrayString( pS, sTags, nTagSize, nStart );
+        std::vector< rtl::OUString >::iterator it = sTags.begin();
+        std::vector< rtl::OUString >::iterator it_end = sTags.end();
+        for ( sal_Int32 i=0; it != it_end; ++i, ++it )
+            OSL_TRACE(" Tag [ %d ] is %s", i, rtl::OUStringToOString( *it, RTL_TEXTENCODING_UTF8 ).getStr() );
+    }
+
+    if ( nAcceleratorSize )
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        // read the name for each tab
+        std::vector< rtl::OUString > sAccelerators;
+        readArrayString( pS, sAccelerators, nAcceleratorSize, nStart );
+        std::vector< rtl::OUString >::iterator it = sAccelerators.begin();
+        std::vector< rtl::OUString >::iterator it_end = sAccelerators.end();
+        for ( sal_Int32 i=0; it != it_end; ++i, ++it )
+            OSL_TRACE(" Accelerator [ %d ] is %s", i, rtl::OUStringToOString( *it, RTL_TEXTENCODING_UTF8 ).getStr() );
+    }
+
+    // Stream data
+    if ( hasEmbeddedImage )
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        sal_uInt8 pPictureHeader[20];
+        sal_uInt32 nPictureLen(0);
+        pS->Read(pPictureHeader,20);
+        *pS >> nPictureLen;
+        long imagePos = pS->Tell();
+        // great embedded object
+        mxGrfObj = lcl_readGraphicObject( pS );
+        if( mxGrfObj.is() )
+        {
+            sImageUrl = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( GRAPHOBJ_URLPREFIX ) );
+            sImageUrl = sImageUrl + mxGrfObj->getUniqueID();
+        }
+        // make sure the stream position should be pointing after the image.
+        pS->Seek( imagePos + nPictureLen );
+    }
+
+    ReadAlign(pS, pS->Tell() - nStart, 4);
+    OCX_Control::ReadFontData(pS); // read textprops
+    ReadAlign(pS, pS->Tell() - nStart, 4);
+    for ( sal_Int32 i = 0; i < nNumTabs; ++i )
     {
-        OCX_Control::Read(pS); // read trailing records
+        sal_uInt32 TabStripTabFlags(0);
+        *pS >> TabStripTabFlags;
     }
     return sal_True;
 }
 
+sal_Bool OCX_TabStrip::ReadFontData(SotStorageStream* /* pS */)
+{
+    // OCX_TabStrip::Read includes the text props
+    return true;
+}
+
 sal_Bool OCX_Image::Read(SotStorageStream *pS)
 {
     ULONG nStart = pS->Tell();
@@ -5707,12 +5400,10 @@ sal_Bool OCX_Image::Read(SotStorageStream *pS)
 
     if ( hasEmbeddedImage )
     {
-        //image follows this block
-        //len of image is 0x14 relative to end of this block
-        pS->Seek( pS->Tell() + 0x14 );
-
-        sal_uInt32 nImageLen = 0;
-        *pS >> nImageLen;
+        sal_uInt8 pPictureHeader[20];
+        sal_uInt32 nPictureLen(0);
+        pS->Read(pPictureHeader,20);
+        *pS >> nPictureLen;
 
         long imagePos = pS->Tell();
 
@@ -5723,7 +5414,7 @@ sal_Bool OCX_Image::Read(SotStorageStream *pS)
             sImageUrl = sImageUrl + mxGrfObj->getUniqueID();
         }
         // make sure the stream position should be pointing after the image
-        pS->Seek( imagePos + nImageLen );
+        pS->Seek( imagePos + nPictureLen );
     }
     return sal_True;
 }
@@ -6400,6 +6091,375 @@ sal_Bool OCX_ProgressBar::Import(uno::Reference< beans::XPropertySet > &rPropSet
         rPropSet->setPropertyValue( WW8_ASCII2STR("Enabled"), uno::makeAny( sal_False ) );
     return sal_True;
 }
+
 // ============================================================================
+OCX_ParentControl::OCX_ParentControl( SotStorageRef& parent, const OUString& storageName, const OUString& sN, const ::uno::Reference< container::XNameContainer >  &rParent, OCX_Control* pParent ) : OCX_Control(sN, pParent),  mxParent(rParent), nNextAvailableID(0), nBooleanProperties(0), nGroupCnt(0), nZoom(0), fEnabled(1), fLocked(0), fBackStyle(1), fWordWrap(1), fAutoSize(0), nCaptionLen(0), nVertPos(1), nHorzPos(7), nBorderColor(0x80000012), nShapeCookie(0), nKeepScrollBarsVisible(3), nCycle(0), nBorderStyle(0), nMousePointer(0), nSpecialEffect(0), nPicture(0), nPictureAlignment(2), nPictureSizeMode(0), bPictureTiling(FALSE), nAccelerator(0), nIcon(0), pCaption(0), nScrollWidth(0), nScrollHeight(0), nScrollLeft(0), nScrollTop(0), nIconLen(0), pIcon(0), nPictureLen(0)
+{
+    mnForeColor = 0x80000012;
+    mnBackColor = 0x8000000F;
+    aFontData.SetHasAlign(TRUE);
+    mContainerStorage = parent->OpenSotStorage(storageName,
+        STREAM_READWRITE |
+        STREAM_NOCREATE |
+        STREAM_SHARE_DENYALL);
+    mContainerStream = mContainerStorage->OpenSotStream(
+        String(RTL_CONSTASCII_STRINGPARAM("f"),
+        RTL_TEXTENCODING_MS_1252),
+        STREAM_STD_READ | STREAM_NOCREATE);
+    mContainedControlsStream = mContainerStorage->OpenSotStream( String(RTL_CONSTASCII_STRINGPARAM("o"),
+        RTL_TEXTENCODING_MS_1252),
+        STREAM_STD_READ | STREAM_NOCREATE);
+}
+
+OCX_ParentControl::~OCX_ParentControl()
+{
+    CtrlIterator aEnd = mpControls.end();
+    for (CtrlIterator aIter = mpControls.begin(); aIter != aEnd; ++ aIter )
+    {
+        delete *aIter;
+    }
+}
+
+sal_Bool OCX_ParentControl::Import(uno::Reference<beans::XPropertySet>&  rProps  )
+{
+    // #FIXME we probably don't need this (fake) parent (mxParen) which is the dialog iirc
+    if ( !mxParent.is() )
+    {
+        return sal_False;
+    }
+    CtrlIterator aEnd = mpControls.end();
+//    int count = 0;
+    for (CtrlIterator aIter = mpControls.begin(); aIter != aEnd; ++ aIter )
+    {
+        uno::Reference< container::XNameContainer > xNameContainer( rProps, uno::UNO_QUERY );
+        if ( !(*aIter)->Import( xNameContainer ) )
+        {
+            return sal_False;
+        }
+    }
+    return sal_True;
+}
+
+bool OCX_ParentControl::createFromContainerRecord( const ContainerRecord& record, OCX_Control*& pControl )
+{
+    pControl = NULL;
+    switch ( record.nTypeIdent)
+        {
+            case CMDBUTTON:
+                pControl = new OCX_CommandButton;
+                break;
+            case LABEL:
+                pControl = new OCX_UserFormLabel(this);
+                break;
+            case TEXTBOX:
+                pControl = new OCX_TextBox;
+                break;
+            case LISTBOX:
+                pControl = new OCX_ListBox;
+                break;
+            case COMBOBOX:
+                pControl = new OCX_ComboBox;
+                break;
+            case CHECKBOX:
+                pControl =  new OCX_CheckBox;
+                break;
+            case OPTIONBUTTON:
+                pControl = new OCX_OptionButton;
+                break;
+            case TOGGLEBUTTON:
+                pControl = new OCX_ToggleButton;
+                break;
+            case IMAGE: //Image
+            {
+                pControl = new OCX_Image;
+                break;
+            }
+            case PAGE: // Page
+            {
+                pControl = new OCX_Page(mContainerStorage, record.nSubStorageId,
+                    record.cName, mxParent, this);
+                break;
+            }
+            case MULTIPAGE: // MultiPage
+            {
+                OUString sMSStore = createSubStreamName( record.nSubStorageId );
+                pControl = new OCX_MultiPage( mContainerStorage, sMSStore,
+                    record.cName, mxParent, this);
+                break;
+            }
+            case FRAME:  //Frame
+            {
+                OUString sFrameStore = createSubStreamName( record.nSubStorageId );
+                pControl = new OCX_Frame(mContainerStorage, sFrameStore,
+                    record.cName, mxParent, this);
+
+                break;
+            }
+            case SPINBUTTON: //SpinButton
+            {
+                pControl = new OCX_SpinButton;
+                break;
+            }
+            case TABSTRIP: //TabStrip
+            {
+                pControl = new OCX_TabStrip;
+                break;
+            }
+            case SCROLLBAR: //ScrollBar
+                pControl = new OCX_ScrollBar;
+                break;
+            case PROGRESSBAR: //ProgressBar Active X control
+                pControl = new OCX_ProgressBar;
+                break;
+            default:
+                OSL_TRACE( "**** Unknown control 0x%x", record.nTypeIdent );
+                DBG_ERROR( "Unknown control");
+                return false;
+        }
+        pControl->sName = record.cName;
+
+        pControl->msToolTip = record.controlTip;
+        pControl->mnTop = record.nTop;
+        pControl->mnLeft = record.nLeft;
+        // MS tabIndex, pretty useless in OpenOffice land
+        // as tab indexes in MS are relative to parent container.
+        // However we need this value in order to set
+        // OpenOffice tab indices in a sensible way to
+        // reflect the ms tabbing from orig MS UserForm, see below
+        pControl->mnTabPos = record.nTabPos;
+        pControl->SetInDialog(true);
+        pControl->mbVisible = record.bVisible;
+
+        return true;
+}
+
+void OCX_ParentControl::ProcessControl(OCX_Control* pControl,SvStorageStream* /* pS */,  ContainerRecord& rec )
+{
+    SotStorageStreamRef oStream = mContainedControlsStream;
+
+    // can insert into OO Dialog (e.g is this a supported dialog control)??
+    if ( rec.nTypeIdent == TABSTRIP )
+    {
+        // skip the record in the stream, discard the control
+        oStream->SeekRel( rec.nSubStreamLen );
+        delete pControl;
+    }
+    else
+    {
+        // A container control needs to read the f stream in
+        // the folder ( substorage ) associated with this control
+        if (  rec.nTypeIdent ==  FRAME ||
+            rec.nTypeIdent ==  MULTIPAGE||
+            rec.nTypeIdent ==  PAGE )
+        {
+            OCX_ParentControl* pContainer =
+               static_cast< OCX_ParentControl* >( pControl );
+            oStream = pContainer->getContainerStream();
+        }
+        // #117490# DR: container records provide size of substream, use it here...
+
+        // remember initial position to set correct stream position
+        ULONG nStrmPos = oStream->Tell();
+        // import control, may return with invalid stream position
+        pControl->FullRead(oStream);
+        // set stream to position behind substream of this control
+        oStream->Seek( nStrmPos + rec.nSubStreamLen );
+    }
+}
+
+sal_Bool OCX_ParentControl::Read(SvStorageStream *pS)
+{
+    long nStart = pS->Tell();
+
+    *pS >> nIdentifier;
+    DBG_ASSERT(0x400==nIdentifier,
+        "A control that has a different identifier");
+    *pS >> nFixedAreaLen;
+    pS->Read(pBlockFlags,4);
+
+    bool bExtraSize = false;
+    bool bLogicalSize = false;
+    bool bScrollPosition = false;
+    bool bFont = false;
+    if (pBlockFlags[0] & 0x01)
+    {
+        DBG_ASSERT(!this, "ARSE");
+    }
+    if (pBlockFlags[0] & 0x02)
+        *pS >> mnBackColor;
+    if (pBlockFlags[0] & 0x04)
+        *pS >> mnForeColor;
+    if (pBlockFlags[0] & 0x08)
+        *pS >> nNextAvailableID;
+    if (pBlockFlags[0] & 0x40)
+        *pS >> nBooleanProperties;
+    ReadAlign(pS, pS->Tell() - nStart, 4);
+    if (pBlockFlags[0] & 0x80)
+    {
+        *pS >> nBorderStyle;
+    }
+    if (pBlockFlags[1] & 0x01)
+        *pS >> nMousePointer;
+    if (pBlockFlags[1] & 0x02)
+        *pS >> nKeepScrollBarsVisible;
+    if (pBlockFlags[1] & 0x04)
+        bExtraSize = true;
+    if (pBlockFlags[1] & 0x08)
+        bLogicalSize = true;
+    if (pBlockFlags[1] & 0x10)
+        bScrollPosition = true;
+    if (pBlockFlags[1] & 0x20)
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        *pS >> nGroupCnt;
+    }
+
+    if (pBlockFlags[1] & 0x80)
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 2);
+        *pS >> nIcon;
+        DBG_ASSERT(nIcon == 0xFFFF, "Unexpected nIcon");
+    }
+    if (pBlockFlags[2] & 0x01)
+        *pS >> nCycle;
+    if (pBlockFlags[2] & 0x02)
+        *pS >> nSpecialEffect;
+    if (pBlockFlags[2] & 0x04)
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        *pS >> nBorderColor;
+    }
+    if (pBlockFlags[2] & 0x08)
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        *pS >> nCaptionLen;
+    }
+
+    if (pBlockFlags[2] & 0x10)
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 2);
+        sal_uInt16 nNoIdea;
+        *pS >> nNoIdea;
+        DBG_ASSERT(nNoIdea == 0xFFFF, "Expected 0xFFFF, (related to font ?)");
+        bFont = true;
+    }
+    if (pBlockFlags[2] & 0x20)
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 2);
+        *pS >> nPicture;
+        DBG_ASSERT(nPicture == 0xFFFF, "Unexpected nIcon");
+    }
+
+    if (pBlockFlags[2] & 0x40)
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        *pS >> nZoom;
+    }
+    if (pBlockFlags[2] & 0x80)
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        *pS >> nPictureAlignment;
+    }
+
+    if (pBlockFlags[3] & 0x01)
+        bPictureTiling = true;
+
+    if (pBlockFlags[3] & 0x02)
+        *pS >> nPictureSizeMode;
+
+    if (pBlockFlags[3] & 0x04)
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        *pS >> nShapeCookie;
+    }
+    if (pBlockFlags[3] & 0x08)
+    {
+        ReadAlign(pS, pS->Tell() - nStart, 4);
+        *pS >> nDrawBuffer;
+    }
+
+    ReadAlign(pS, pS->Tell() - nStart, 4);
+    // Extra
+    if ( bExtraSize )
+    {
+        *pS >> nWidth;
+        *pS >> nHeight;
+    }
+    if ( bLogicalSize )
+    {
+        *pS >> nScrollWidth;
+        *pS >> nScrollHeight;
+    }
+    if ( bScrollPosition )
+    {
+        *pS >> nScrollLeft;
+        *pS >> nScrollTop;
+    }
+    if  ( nCaptionLen )
+    {
+        sal_uInt32 nCaptionSize = lclGetBufferSize( nCaptionLen );
+        if ( nCaptionSize )
+        {
+            pCaption = new sal_Char[ nCaptionSize ];
+            pS->Read( pCaption, nCaptionSize );
+        }
+    }
+
+    ReadAlign(pS, pS->Tell() - nStart, 4);
+
+    // StreamData
+    if (nIcon)
+    {
+        pS->Read(pIconHeader,20);
+        *pS >> nIconLen;
+        pIcon = new sal_uInt8[nIconLen];
+        pS->Read(pIcon,nIconLen);
+    }
+    if ( bFont )
+    {
+        //Font Stuff..
+        pS->SeekRel(0x1a);
+        sal_uInt8 nFontLen;
+        *pS >> nFontLen;
+        pS->SeekRel(nFontLen);
+    }
+    if (nPicture)
+    {
+        pS->Read(pPictureHeader,20);
+        *pS >> nPictureLen;
+        long imagePos = pS->Tell();
+        // great embedded object
+        mxGrfObj = lcl_readGraphicObject( pS );
+        if( mxGrfObj.is() )
+        {
+            sImageUrl = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( GRAPHOBJ_URLPREFIX ) );
+            sImageUrl = sImageUrl + mxGrfObj->getUniqueID();
+        }
+        // make sure the stream position should be pointing after the image.
+        pS->Seek( imagePos + nPictureLen );
+    }
+    // FormSiteData
+    std::vector< ClassTable > siteClassInfo;
+    if ( ( nBooleanProperties & 0x00008000 ) == 0x0)
+    {
+        sal_Int16 numTrailingRecs = 0;
+        *pS >> numTrailingRecs;
+        if ( numTrailingRecs )
+        {
+            for ( ; numTrailingRecs ; --numTrailingRecs )
+            {
+                ClassTable cacheClass;
+                cacheClass.Read( pS );
+                siteClassInfo.push_back( cacheClass );
+            }
+        }
+    }
+    // Sites
+    ContainerRecReader reader;
+    reader.Read( this, pS, siteClassInfo );
+
+    return true;
+}
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx
index a3fa45784977..abb5d680cc57 100644
--- a/filter/source/msfilter/msoleexp.cxx
+++ b/filter/source/msfilter/msoleexp.cxx
@@ -214,7 +214,7 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvSto
             //TODO/LATER: a "StoreTo" method at embedded object would be nice
             uno::Sequence < beans::PropertyValue > aSeq(2);
             SvStream* pStream = new SvMemoryStream;
-            aSeq[0].Name = ::rtl::OUString::createFromAscii( "OutputStream" );
+            aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OutputStream" ));
             ::uno::Reference < io::XOutputStream > xOut = new ::utl::OOutputStreamWrapper( *pStream );
             aSeq[0].Value <<= xOut;
             aSeq[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ) );
@@ -222,7 +222,7 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvSto
             uno::Reference < frame::XStorable > xStor( rObj->getComponent(), uno::UNO_QUERY );
         try
         {
-            xStor->storeToURL( ::rtl::OUString::createFromAscii( "private:stream" ), aSeq );
+            xStor->storeToURL( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:stream" )), aSeq );
         }
         catch( uno::Exception& ) {} // #TODO really handle exceptions - interactionalhandler etc. ?
 
@@ -319,11 +319,11 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvSto
                         //TODO/LATER: is stream instead of outputstream a better choice?!
                         //TODO/LATER: a "StoreTo" method at embedded object would be nice
                         uno::Sequence < beans::PropertyValue > aSeq(1);
-                        aSeq[0].Name = ::rtl::OUString::createFromAscii( "OutputStream" );
+                        aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OutputStream" ));
                         ::uno::Reference < io::XOutputStream > xOut = new ::utl::OOutputStreamWrapper( *xEmbStm );
                         aSeq[0].Value <<= xOut;
                         uno::Reference < frame::XStorable > xStor( rObj->getComponent(), uno::UNO_QUERY );
-                        xStor->storeToURL( ::rtl::OUString::createFromAscii( "private:stream" ), aSeq );
+                        xStor->storeToURL( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:stream" )), aSeq );
                     }
                     catch( uno::Exception& )
                     {
@@ -348,7 +348,7 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvSto
         if ( xPers.is() )
         {
             uno::Sequence < beans::PropertyValue > aEmptySeq;
-            ::rtl::OUString aTempName(::rtl::OUString::createFromAscii("bla"));
+            ::rtl::OUString aTempName( RTL_CONSTASCII_USTRINGPARAM( "bla" ));
             try
             {
                 xPers->storeToEntry( xStor, aTempName, aEmptySeq, aEmptySeq );
diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx
index b34fadcf99f3..b39ca1e5e81b 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -108,8 +108,8 @@ uno::Any
 CustomToolBarImportHelper::createCommandFromMacro( const rtl::OUString& sCmd )
 {
 //"vnd.sun.star.script:Standard.Module1.Main?language=Basic&location=document"
-    static rtl::OUString scheme = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
-    static rtl::OUString part2 = rtl::OUString::createFromAscii("?language=Basic&location=document");
+    static rtl::OUString scheme( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:" ));
+    static rtl::OUString part2( RTL_CONSTASCII_USTRINGPARAM( "?language=Basic&location=document" ));
     // create script url
     rtl::OUString scriptURL = scheme + sCmd + part2;
     return uno::makeAny( scriptURL );
@@ -493,7 +493,7 @@ TBCGeneralInfo::ImportToolBarControlData( CustomToolBarImportHelper& helper, std
             if ( aMacroInf.IsResolved() )
                 aProp.Value = helper.createCommandFromMacro( aMacroInf.ResolvedMacro() );
             else
-                aProp.Value <<= rtl::OUString::createFromAscii("UnResolvedMacro[").concat( extraInfo.getOnAction() ).concat( rtl::OUString::createFromAscii("]") );
+                aProp.Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UnResolvedMacro[" )).concat( extraInfo.getOnAction() ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "]" )) );
             sControlData.push_back( aProp );
         }
 
diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx
index 5baf69bf11a5..b0b9b42d861f 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -37,6 +37,7 @@
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentInfoSupplier.hpp>
+#include <com/sun/star/script/vba/XVBACompatibility.hpp>
 #include <tools/urlobj.hxx>
 #include <osl/file.hxx>
 #include <unotools/pathoptions.hxx>
@@ -45,8 +46,8 @@ using namespace ::com::sun::star;
 
 namespace ooo { namespace vba {
 
-const static rtl::OUString sUrlPart0 = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
-const static rtl::OUString sUrlPart1 = rtl::OUString::createFromAscii( "?language=Basic&location=document");
+const static rtl::OUString sUrlPart0( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:" ));
+const static rtl::OUString sUrlPart1( RTL_CONSTASCII_USTRINGPARAM( "?language=Basic&location=document" ));
 
 String makeMacroURL( const String& sMacroName )
 {
@@ -121,7 +122,7 @@ SfxObjectShell* findShellForUrl( const rtl::OUString& sMacroURLOrPath )
                         bDocNameNoPathMatch = xModel->getURL().copy( lastSlashIndex + 1 ).equals( aURL );
                         if ( !bDocNameNoPathMatch )
                         {
-                            rtl::OUString aTmpName = rtl::OUString::createFromAscii("'") + xModel->getURL().copy( lastSlashIndex + 1 ) + rtl::OUString::createFromAscii("'");
+                            rtl::OUString aTmpName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "'" )) + xModel->getURL().copy( lastSlashIndex + 1 ) + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "'" ));
                             bDocNameNoPathMatch = aTmpName.equals( aURL );
                         }
                     }
@@ -287,15 +288,15 @@ VBAMacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUStrin
         {
             // Ok, if we have no Container specified then we need to search them in order, this document, template this document created from, global templates,
             // get the name of Project/Library for 'this' document
-            rtl::OUString sThisProject;
-            BasicManager* pBasicMgr = pShell-> GetBasicManager();
-            if ( pBasicMgr )
+            rtl::OUString sThisProject = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Standard") );
+            try
             {
-                if ( pBasicMgr->GetName().Len() )
-                   sThisProject = pBasicMgr->GetName();
-                else // cater for the case where VBA is not enabled
-                   sThisProject = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Standard") );
+                uno::Reference< beans::XPropertySet > xProps( pShell->GetModel(), uno::UNO_QUERY_THROW );
+                uno::Reference< script::vba::XVBACompatibility > xVBAMode( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BasicLibraries") ) ), uno::UNO_QUERY_THROW );
+                sThisProject = xVBAMode->getProjectName();
             }
+            catch( uno::Exception& /*e*/) {}
+
             sSearchList.push_back( sThisProject ); // First Lib to search
             if ( xPrjNameCache.is() )
             {
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 79c6eaf12631..f8151dd9f7eb 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -580,7 +580,7 @@ sal_Bool SdrEscherImport::ReadString( String& rStr ) const
     return bRet;
 }
 
-FASTBOOL SdrEscherImport::GetColorFromPalette(USHORT /*nNum*/, Color& /*rColor*/) const
+bool SdrEscherImport::GetColorFromPalette(USHORT /*nNum*/, Color& /*rColor*/) const
 {
     return FALSE;
 }
@@ -1398,12 +1398,16 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const S
 
     if ( bOk )
     {
-        // PersistPtrs lesen (alle)
-        nPersistPtrAnz = aUserEditAtom.nMaxPersistWritten + 1;  // 1 mehr, damit ich immer direkt indizieren kann
-        pPersistPtr = new UINT32[ nPersistPtrAnz ];             // (die fangen naemlich eigentlich bei 1 an)
+        nPersistPtrAnz = aUserEditAtom.nMaxPersistWritten + 1;
+        if ( ( nPersistPtrAnz >> 2 ) > nStreamLen )     // sj: at least nPersistPtrAnz is not allowed to be greater than filesize
+            bOk = FALSE;                                // (it should not be greater than the PPT_PST_PersistPtrIncrementalBlock, but
+                                                        // we are reading this block later, so we do not have access yet)
+
+        if ( bOk && ( nPersistPtrAnz < ( SAL_MAX_UINT32 / sizeof( UINT32 ) ) ) )
+            pPersistPtr = new (std::nothrow) UINT32[ nPersistPtrAnz ];
         if ( !pPersistPtr )
             bOk = FALSE;
-        else
+        if ( bOk )
         {
             memset( pPersistPtr, 0x00, nPersistPtrAnz * 4 );
 
@@ -1730,7 +1734,7 @@ sal_Bool PPTConvertOCXControls::InsertControl(
         if( rServiceFactory.is() )
         {
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  xCreate = rServiceFactory
-                ->createInstance(String( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.ControlShape" ) ) );
+                ->createInstance(String( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.ControlShape" ) ) );
             if( xCreate.is() )
             {
                 xShape = ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >(xCreate, ::com::sun::star::uno::UNO_QUERY);
@@ -2203,7 +2207,7 @@ sal_Bool SdrPowerPointImport::ReadFontCollection()
                 aFont.SetHeight( 100 );
 
                 if ( mbTracing && !pFont->bAvailable )
-                    mpTracer->Trace( rtl::OUString::createFromAscii( "sd1000" ), pFont->aName );
+                    mpTracer->Trace( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sd1000" )), pFont->aName );
 
 #ifdef DBG_EXTRACTFONTMETRICS
 
@@ -2644,7 +2648,7 @@ Size SdrPowerPointImport::GetPageSize() const
     return aRet;
 }
 
-FASTBOOL SdrPowerPointImport::GetColorFromPalette( USHORT nNum, Color& rColor ) const
+bool SdrPowerPointImport::GetColorFromPalette( USHORT nNum, Color& rColor ) const
 {
     if ( nPageColorsNum != nAktPageNum || ePageColorsKind != eAktPageKind )
     {
@@ -2879,8 +2883,8 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry*
     {
         if ( mbTracing )
             mpTracer->AddAttribute( eAktPageKind == PPT_SLIDEPAGE
-                                    ? rtl::OUString::createFromAscii( "Page" )
-                                    : rtl::OUString::createFromAscii( "NotesPage" ),
+                                    ? rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Page" ))
+                                    : rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NotesPage" )),
                                     rtl::OUString::valueOf( (sal_Int32)nAktPageNum + 1 ) );
 
         rSlidePersist.pHeaderFooterEntry = new HeaderFooterEntry( pMasterPersist );
@@ -3073,8 +3077,8 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry*
             SolveSolver( *rSlidePersist.pSolverContainer );
         if ( mbTracing )
             mpTracer->RemoveAttribute( eAktPageKind == PPT_SLIDEPAGE
-                                        ? rtl::OUString::createFromAscii( "Page" )
-                                        : rtl::OUString::createFromAscii( "NotesPage" ) );
+                                        ? rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Page" ))
+                                        : rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NotesPage" )) );
     }
     rStCtrl.Seek( nMerk );
 }
@@ -5016,8 +5020,8 @@ void PPTStyleTextPropReader::ReadParaProps( SvStream& rIn, SdrPowerPointImport&
             rIn >> nCharCount
                 >> aParaPropSet.pParaSet->mnDepth;  // Einruecktiefe
 
-            aParaPropSet.pParaSet->mnDepth =
-                std::min(sal_uInt16(9),
+            aParaPropSet.pParaSet->mnDepth =        // taking care of about using not more than 9 outliner levels
+                std::min(sal_uInt16(8),
                     aParaPropSet.pParaSet->mnDepth);
 
             nCharCount--;
diff --git a/filter/source/msfilter/svxmsbas.cxx b/filter/source/msfilter/svxmsbas.cxx
index 00eb6f4b9676..7aabccd91dcd 100644
--- a/filter/source/msfilter/svxmsbas.cxx
+++ b/filter/source/msfilter/svxmsbas.cxx
@@ -135,7 +135,7 @@ bool SvxImportMSVBasic::ImportForms_Impl(const String& rStorageName,
        // hacky test code to read referenced projects on linux
        sal_Int32 nPos = (*it).lastIndexOf('\\');
        sFileName = (*it).copy( nPos + 1 );
-       sFileName =  rtl::OUString::createFromAscii("~/Documents/") + sFileName;
+       sFileName =  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "~/Documents/" )) + sFileName;
 #endif
 #endif
        SotStorageRef rRoot = new SotStorage( sFileName, STREAM_STD_READWRITE, STORAGE_TRANSACTED );
@@ -518,7 +518,7 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( VBA_Impl& aVBA, const std::vector< Stri
                 }
                 if (bAsComment)
                 {
-                        aSource += rtl::OUString::createFromAscii("\nEnd Sub");
+                        aSource += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "\nEnd Sub" ));
                 }
                 ::rtl::OUString aModName( sModule );
                 aSource = modeTypeComment + aSource;
diff --git a/filter/source/odfflatxml/odfflatxmlexport.xsl b/filter/source/odfflatxml/odfflatxmlexport.xsl
index e08afd75f79f..2c1ea97eea33 100644
--- a/filter/source/odfflatxml/odfflatxmlexport.xsl
+++ b/filter/source/odfflatxml/odfflatxmlexport.xsl
@@ -11,4 +11,6 @@
   <xsl:template match="@office:mimetype[string(.)='application/vnd.oasis.opendocument.drawing']">
       <xsl:attribute name="office:mimetype">application/vnd.oasis.opendocument.graphics</xsl:attribute>
   </xsl:template>
+
+  <xsl:include href="split-long-lines.xsl"/>
 </xsl:stylesheet>
diff --git a/filter/source/odfflatxml/split-long-lines.xsl b/filter/source/odfflatxml/split-long-lines.xsl
new file mode 100644
index 000000000000..0e9d310a5ac5
--- /dev/null
+++ b/filter/source/odfflatxml/split-long-lines.xsl
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Version: MPL 1.1 / GPLv3+ / LGPLv3+
+
+The contents of this file are subject to the Mozilla Public License Version
+1.1 (the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+http://www.mozilla.org/MPL/
+
+Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+for the specific language governing rights and limitations under the
+License.
+
+The Initial Developer of the Original Code is
+       Gioele Barabucci <gioele@svario.it>
+Portions created by the Initial Developer are Copyright (C) 2010 the
+Initial Developer. All Rights Reserved.
+
+Contributor(s): Gioele Barabucci <gioele@svario.it>
+
+Alternatively, the contents of this file may be used under the terms of
+either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+instead of those above.
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+                version="1.0">
+	<xsl:param name="num-max-spaces">5</xsl:param>
+	<xsl:param name="sep"><xsl:text xml:space="preserve">&#32;</xsl:text></xsl:param>
+	<xsl:param name="newline"><xsl:text xml:space="preserve">&#10;</xsl:text></xsl:param>
+
+	<xsl:template match="text:p/text()">
+		<xsl:call-template name="split-current-text-node"/>
+	</xsl:template>
+
+	<xsl:template match="text:p/text:span/text()">
+		<xsl:call-template name="split-current-text-node"/>
+	</xsl:template>
+
+	<xsl:template name="split-current-text-node">
+		<xsl:call-template name="split-text">
+			<xsl:with-param name="num-prec-spaces">0</xsl:with-param>
+			<xsl:with-param name="text" select="."/>
+		</xsl:call-template>
+	</xsl:template>
+
+	<xsl:template name="split-text">
+		<xsl:param name="num-prec-spaces"/>
+		<xsl:param name="text"/>
+
+		<xsl:variable name="contains-space" select="contains($text, $sep)"/>
+		<xsl:variable name="text-before">
+			<xsl:choose>
+				<xsl:when test="$contains-space"><xsl:value-of select="substring-before($text, $sep)"/></xsl:when>
+				<xsl:when test="$text = $sep"><xsl:value-of select="$text"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="text-after">
+			<xsl:choose>
+				<xsl:when test="$contains-space"><xsl:value-of select="substring-after($text, $sep)"/></xsl:when>
+				<xsl:otherwise></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="finished" select="string-length($text-after) = 0"/>
+		<xsl:variable name="is-empty" select="string-length($text-before) = 0"/>
+
+		<xsl:value-of select="$text-before"/>
+
+		<xsl:choose>
+			<xsl:when test="$num-prec-spaces = $num-max-spaces">
+				<xsl:value-of select="$newline"/>
+				<xsl:call-template name="split-text">
+					<xsl:with-param name="text" select="$text-after"/>
+					<xsl:with-param name="num-prec-spaces">0</xsl:with-param>
+				</xsl:call-template>
+			</xsl:when>
+
+			<xsl:otherwise>
+				<xsl:if test="$contains-space">
+					<xsl:value-of select="$sep"/>
+				</xsl:if>
+
+				<xsl:if test="not($finished)">
+					<xsl:variable name="incr" select="number(not($is-empty))"/>
+
+					<xsl:call-template name="split-text">
+						<xsl:with-param name="text" select="$text-after"/>
+						<xsl:with-param name="num-prec-spaces" select="$num-prec-spaces + $incr"/>
+					</xsl:call-template>
+				</xsl:if>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index a450892da164..723e61e2f4a4 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -332,7 +332,7 @@ static OUString getMimetypeForDocument( const Reference< XMultiServiceFactory >&
                         // find the related type name
                         OUString aTypeName;
                         Reference< container::XNameAccess > xFilterFactory(
-                            xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ),
+                            xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" )) ),
                             uno::UNO_QUERY );
 
                         Sequence< beans::PropertyValue > aFilterData;
@@ -345,7 +345,7 @@ static OUString getMimetypeForDocument( const Reference< XMultiServiceFactory >&
                         {
                             // find the mediatype
                             Reference< container::XNameAccess > xTypeDetection(
-                                xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.TypeDetection" ) ),
+                                xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" )) ),
                                 UNO_QUERY );
 
                             Sequence< beans::PropertyValue > aTypeData;
@@ -393,15 +393,15 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue
             Reference< XServiceInfo > xInfo( mxSrcDoc, UNO_QUERY );
             if ( xInfo.is() )
             {
-                if ( xInfo->supportsService( rtl::OUString::createFromAscii( "com.sun.star.presentation.PresentationDocument" ) ) )
+                if ( xInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" )) ) )
                     aCreator.AppendAscii( "Impress" );
-                else if ( xInfo->supportsService( rtl::OUString::createFromAscii( "com.sun.star.drawing.DrawingDocument" ) ) )
+                else if ( xInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" )) ) )
                     aCreator.AppendAscii( "Draw" );
-                else if ( xInfo->supportsService( rtl::OUString::createFromAscii( "com.sun.star.text.TextDocument" ) ) )
+                else if ( xInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" )) ) )
                     aCreator.AppendAscii( "Writer" );
-                else if ( xInfo->supportsService( rtl::OUString::createFromAscii( "com.sun.star.sheet.SpreadsheetDocument" ) ) )
+                else if ( xInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" )) ) )
                     aCreator.AppendAscii( "Calc" );
-                else if ( xInfo->supportsService( rtl::OUString::createFromAscii( "com.sun.star.formula.FormulaProperties" ) ) )
+                else if ( xInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.formula.FormulaProperties" )) ) )
                     aCreator.AppendAscii( "Math" );
             }
 
diff --git a/filter/source/pdf/pdfuno.cxx b/filter/source/pdf/pdfuno.cxx
index a278cd5fd6bd..59ef536df046 100644
--- a/filter/source/pdf/pdfuno.cxx
+++ b/filter/source/pdf/pdfuno.cxx
@@ -64,14 +64,14 @@ extern "C"
                 sal_Int32                   nPos;
 
                 xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( PDFFilter_getImplementationName() );
-                xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+                xNewKey = xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" )) );
                 const Sequence< OUString > & rSNL1 = PDFFilter_getSupportedServiceNames();
                 const OUString * pArray1 = rSNL1.getConstArray();
                 for ( nPos = rSNL1.getLength(); nPos--; )
                     xNewKey->createKey( pArray1[nPos] );
 
                 xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( PDFDialog_getImplementationName() );
-                xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+                xNewKey = xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" )) );
                 const Sequence< OUString > & rSNL2 = PDFDialog_getSupportedServiceNames();
                 const OUString * pArray2 = rSNL2.getConstArray();
                 for ( nPos = rSNL2.getLength(); nPos--; )
diff --git a/filter/source/placeware/tempfile.cxx b/filter/source/placeware/tempfile.cxx
index 93ec0abbcd0a..6c85817d1da1 100644
--- a/filter/source/placeware/tempfile.cxx
+++ b/filter/source/placeware/tempfile.cxx
@@ -163,7 +163,7 @@ OUString TempFile::createTempFileURL()
         if( aTmp.getStr()[ aTmp.getLength() - 1 ] != sal_Unicode( '/' ) )
             aTmp += OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ));
         aTmp += OUString::valueOf( (sal_Int32) (unsigned) u, nRadix );
-        aTmp += OUString::createFromAscii( ".tmp" );
+        aTmp += OUString( RTL_CONSTASCII_USTRINGPARAM( ".tmp" ));
 
         osl::File aFile( aTmp );
         osl::FileBase::RC err = aFile.open(osl_File_OpenFlag_Create);
diff --git a/filter/source/placeware/uno.cxx b/filter/source/placeware/uno.cxx
index ad18fb3db186..d7c8795ca20f 100644
--- a/filter/source/placeware/uno.cxx
+++ b/filter/source/placeware/uno.cxx
@@ -69,7 +69,7 @@ sal_Bool SAL_CALL component_writeInfo(
         {
             Reference< XRegistryKey > xNewKey(
                 reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( PlaceWareExportFilter_getImplementationName() ) );
-            xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+            xNewKey = xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" )) );
 
             const Sequence< OUString > & rSNL = PlaceWareExportFilter_getSupportedServiceNames();
             const OUString * pArray = rSNL.getConstArray();
diff --git a/filter/source/svg/gfxtypes.hxx b/filter/source/svg/gfxtypes.hxx
index 242888f0d7ca..8cad13556cdf 100644
--- a/filter/source/svg/gfxtypes.hxx
+++ b/filter/source/svg/gfxtypes.hxx
@@ -40,7 +40,7 @@ namespace svgi
 
 struct ARGBColor
 {
-    double toDoubleColor( sal_uInt8 val ) { return val/255.0; }
+    double toDoubleColor( sal_uInt8 val ) const { return val/255.0; }
 
     ARGBColor() : a(1.0), r(0.0), g(0.0), b(0.0)
     {}
diff --git a/filter/source/svg/parserfragments.cxx b/filter/source/svg/parserfragments.cxx
index a85de2fbb6c7..c515e856cd23 100644
--- a/filter/source/svg/parserfragments.cxx
+++ b/filter/source/svg/parserfragments.cxx
@@ -37,8 +37,8 @@
 #include <string.h>
 #include <limits.h>
 #include <boost/bind.hpp>
-#include <boost/spirit.hpp>
-#include <boost/spirit/dynamic/while.hpp>
+#include <boost/spirit/include/classic.hpp>
+#include <boost/spirit/include/classic_while.hpp>
 #include <numeric>
 #include <algorithm>
 
@@ -130,7 +130,7 @@ geometry::AffineMatrix2D multiplyMatrix( const geometry::AffineMatrix2D& rLHS,
 
 namespace
 {
-    struct ColorGrammar : public ::boost::spirit::grammar< ColorGrammar >
+    struct ColorGrammar : public ::boost::spirit::classic::grammar< ColorGrammar >
     {
     public:
         ARGBColor& m_rColor;
@@ -138,10 +138,10 @@ namespace
         template< typename ScannerT >
         struct definition
         {
-            ::boost::spirit::rule< ScannerT > colorExpression;
+            ::boost::spirit::classic::rule< ScannerT > colorExpression;
             definition( const ColorGrammar& self )
             {
-                using namespace ::boost::spirit;
+                using namespace ::boost::spirit::classic;
 
                 int_parser<sal_uInt8,10,1,3> byte_p;
                 colorExpression =
@@ -182,14 +182,14 @@ namespace
                          >> ')')
                      );
             }
-            ::boost::spirit::rule<ScannerT> const& start() const { return colorExpression; }
+            ::boost::spirit::classic::rule<ScannerT> const& start() const { return colorExpression; }
         };
     };
 }
 
 bool parseColor( const char* sColor, ARGBColor& rColor  )
 {
-    using namespace ::boost::spirit;
+    using namespace ::boost::spirit::classic;
 
     if( parse(sColor,
               ColorGrammar(rColor) >> end_p,
@@ -366,7 +366,7 @@ bool parseColor( const char* sColor, ARGBColor& rColor  )
 
 bool parseOpacity (const char* sOpacity, ARGBColor& rColor )
 {
-    using namespace ::boost::spirit;
+    using namespace ::boost::spirit::classic;
 
     if( parse(sOpacity,
               // Begin grammar
@@ -385,7 +385,7 @@ bool parseOpacity (const char* sOpacity, ARGBColor& rColor )
 
 bool parseTransform( const char* sTransform, basegfx::B2DHomMatrix& rTransform )
 {
-    using namespace ::boost::spirit;
+    using namespace ::boost::spirit::classic;
 
     double fRefOffsetX(0.0);
     double fRefOffsetY(0.0);
@@ -501,7 +501,7 @@ bool parseTransform( const char* sTransform, basegfx::B2DHomMatrix& rTransform )
 
 bool parseViewBox( const char* sViewbox, basegfx::B2DRange& rRect )
 {
-    using namespace ::boost::spirit;
+    using namespace ::boost::spirit::classic;
 
     double x=0.0,y=0.0,w=0.0,h=0.0;
 
@@ -529,7 +529,7 @@ bool parseViewBox( const char* sViewbox, basegfx::B2DRange& rRect )
 
 bool parseDashArray( const char* sDashArray, std::vector<double>& rOutputVector )
 {
-    using namespace ::boost::spirit;
+    using namespace ::boost::spirit::classic;
 
     rOutputVector.clear();
     return parse(sDashArray,
@@ -555,7 +555,7 @@ bool parsePaintUri( std::pair<const char*,const char*>& o_rPaintUri,
                     std::pair<ARGBColor,bool>&          io_rColor,
                     const char*                         sPaintUri )
 {
-    using namespace ::boost::spirit;
+    using namespace ::boost::spirit::classic;
 
     const bool bRes = parse(sPaintUri,
         //  Begin grammar
@@ -587,7 +587,7 @@ void appendChar( std::string& str, char character)
 
 bool parseXlinkHref( const char* sXlinkHref, std::string& data )
 {
-    using namespace ::boost::spirit;
+    using namespace ::boost::spirit::classic;
 
     data.erase(data.begin(),data.end());
 
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 914e3b396b9c..892a5860b2b7 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -90,7 +90,7 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
     else
     if( mxSrcDoc.is() )
     {
-        uno::Reference< frame::XDesktop > xDesktop( mxMSF->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ),
+        uno::Reference< frame::XDesktop > xDesktop( mxMSF->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" )) ),
                                                     uno::UNO_QUERY);
         if( xDesktop.is() )
         {
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 10e152e30dce..67e5432991e5 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -1124,8 +1124,7 @@ struct AnnotatingVisitor
             if( aPaintUri.first != aPaintUri.second )
             {
                 // assuming gradient. assumption does not hold generally
-                const char* pClosingBracket;
-                if( (pClosingBracket=strstr(sValue,")")) && rValue.getLength() > 5 )
+                if( strstr(sValue,")") && rValue.getLength() > 5 )
                 {
                     ElementRefMapType::iterator aRes;
                     if( (aRes=maGradientIdMap.find(
@@ -1813,7 +1812,7 @@ sal_Bool SVGReader::parseAndConvert()
 {
     uno::Reference<xml::dom::XDocumentBuilder> xDomBuilder(
         m_xServiceFactory->createInstance(
-            rtl::OUString::createFromAscii("com.sun.star.xml.dom.DocumentBuilder")), uno::UNO_QUERY_THROW );
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.dom.DocumentBuilder" ))), uno::UNO_QUERY_THROW );
 
     uno::Reference<xml::dom::XDocument> xDom(
         xDomBuilder->parse(m_xInputStream),
@@ -2719,7 +2718,7 @@ bool importSvg(SvStream & rStream, Graphic & rGraphic )
 
     uno::Reference<xml::dom::XDocumentBuilder> xDomBuilder(
         xServiceFactory->createInstance(
-            rtl::OUString::createFromAscii("com.sun.star.xml.dom.DocumentBuilder")),
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.dom.DocumentBuilder" ))),
         uno::UNO_QUERY_THROW );
 
     uno::Reference<io::XInputStream> xStream(
diff --git a/filter/source/svg/svguno.cxx b/filter/source/svg/svguno.cxx
index b94675d7adb7..92e092e8155c 100644
--- a/filter/source/svg/svguno.cxx
+++ b/filter/source/svg/svguno.cxx
@@ -61,7 +61,7 @@ extern "C"
             {
                 Reference< XRegistryKey > xNewKey(
                     reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( SVGFilter_getImplementationName() ) );
-                xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+                xNewKey = xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" )) );
 
                 const Sequence< OUString > & rSNL = SVGFilter_getSupportedServiceNames();
                 const OUString * pArray = rSNL.getConstArray();
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 37dc24b7d309..766b1fc8aaea 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -872,7 +872,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
         {
             String aTransform;
 
-            aTransform = NMSP_RTL::OUString::createFromAscii( "translate" );
+            aTransform = NMSP_RTL::OUString( RTL_CONSTASCII_USTRINGPARAM( "translate" ));
             aTransform += '(';
             aTransform += String( GetValueString( aPt.X() ) );
             aTransform += ',';
@@ -881,7 +881,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
 
             if( rFont.GetOrientation() )
             {
-                aTransform += String( NMSP_RTL::OUString::createFromAscii( " rotate" ) );
+                aTransform += String( NMSP_RTL::OUString( RTL_CONSTASCII_USTRINGPARAM( " rotate" )) );
                 aTransform += '(';
                 aTransform += String( NMSP_RTL::OUString::valueOf( rFont.GetOrientation() * -0.1 ) );
                 aTransform += ')';
@@ -889,13 +889,13 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
 
             if( rFont.GetItalic() != ITALIC_NONE )
             {
-                aTransform += String( NMSP_RTL::OUString::createFromAscii( " skewX" ) );
+                aTransform += String( NMSP_RTL::OUString( RTL_CONSTASCII_USTRINGPARAM( " skewX" )) );
                 aTransform += '(';
                 aTransform += String( NMSP_RTL::OUString::valueOf( (sal_Int32) -10 ) );
                 aTransform += ')';
             }
 
-            aTransform += String( NMSP_RTL::OUString::createFromAscii( " translate" ) );
+            aTransform += String( NMSP_RTL::OUString( RTL_CONSTASCII_USTRINGPARAM( " translate" )) );
             aTransform += '(';
             aTransform += String( GetValueString( -aPt.X() ) );
             aTransform += ',';
diff --git a/filter/source/svg/units.cxx b/filter/source/svg/units.cxx
index 96a810dccc8c..50487e6591e0 100644
--- a/filter/source/svg/units.cxx
+++ b/filter/source/svg/units.cxx
@@ -29,17 +29,10 @@
 #include "precompiled_filter.hxx"
 
 #include "units.hxx"
+#include <basegfx/range/b2drange.hxx>
 #include "gfxtypes.hxx"
-#include "spirit_supplements.hxx"
-
-#include <string.h>
 #include <rtl/ustring.hxx>
-
-#include <boost/bind.hpp>
-// workaround. spirit uses INT_MAX.
-#include <limits.h>
-#include <boost/spirit.hpp>
-
+#include <boost/spirit/include/classic.hpp>
 
 namespace svgi
 {
@@ -92,7 +85,8 @@ double convLength( double value, SvgUnit unit, const State& rState, char dir )
 
 double convLength( const rtl::OUString& sValue, const State& rState, char dir )
 {
-    using namespace ::boost::spirit;
+    //FIXME: convert deprecated spirit::classic to use spirit::qi
+    using namespace ::boost::spirit::classic;
 
     rtl::OString aUTF8 = rtl::OUStringToOString( sValue,
                                                  RTL_TEXTENCODING_UTF8 );
diff --git a/filter/source/t602/filterenv.cxx b/filter/source/t602/filterenv.cxx
index 97a82e6b24b8..4327cc251b06 100644
--- a/filter/source/t602/filterenv.cxx
+++ b/filter/source/t602/filterenv.cxx
@@ -63,7 +63,7 @@ sal_Bool SAL_CALL component_writeInfo(
             sal_Int32 nPos = 0;
             Reference< XRegistryKey > xNewKey(
                 reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( T602ImportFilter_getImplementationName() ) );
-            xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+            xNewKey = xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" )) );
 
             const Sequence< OUString > & rSNL = T602ImportFilter_getSupportedServiceNames();
             const OUString * pArray = rSNL.getConstArray();
@@ -71,7 +71,7 @@ sal_Bool SAL_CALL component_writeInfo(
                 xNewKey->createKey( pArray[nPos] );
 
             xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( T602ImportFilterDialog_getImplementationName() );
-            xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+            xNewKey = xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" )) );
 
             const Sequence< OUString > & rSNL2 = T602ImportFilterDialog_getSupportedServiceNames();
             pArray = rSNL2.getConstArray();
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx
index a5cbe7b2a590..d7b78072668e 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -932,7 +932,7 @@ throw ( RuntimeException )
         MutexGuard guard( Mutex::getGlobalMutex() );
         if( !pNames ) {
             static Sequence< OUString > seqNames(2);
-            seqNames.getArray()[0] = OUString::createFromAscii(IMPLEMENTATION_NAME);
+            seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLEMENTATION_NAME));
             pNames = &seqNames;
         }
     }
@@ -1041,12 +1041,12 @@ sal_Bool T602ImportFilterDialog::OptionsDlg()
     ous[2] = getResStr(T602FILTER_STR_ENCODING_CP895);
     ous[3] = getResStr(T602FILTER_STR_ENCODING_KOI8CS2);
     any <<= ous;
-    xPSetCodeLB->setPropertyValue(OUString::createFromAscii("StringItemList"), any);
+    xPSetCodeLB->setPropertyValue(OUString( RTL_CONSTASCII_USTRINGPARAM( "StringItemList" )), any);
 
     Sequence < sal_Int16 > shr(1);
     shr[0] = ini.forcecode ? ((sal_Int16) ini.xcode) + 1 : 0;
     any <<= shr;
-    xPSetCodeLB->setPropertyValue(OUString::createFromAscii("SelectedItems"), any);
+    xPSetCodeLB->setPropertyValue(OUString( RTL_CONSTASCII_USTRINGPARAM( "SelectedItems" )), any);
 
     Reference < XInterface > AzbCheckBoxModel = _Inst("com.sun.star.awt.UnoControlCheckBoxModel");
     Reference < XPropertySet > xPSetAzbukaCB( AzbCheckBoxModel, UNO_QUERY );
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index 27cd84d42634..cf13627d3463 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
@@ -101,7 +101,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star
 
     Sequence< Any > aAnys(1);
     OUString aBaseURI;
-    if (aMediaMap.find(OUString::createFromAscii("URL"))->second >>= aBaseURI)
+    if (aMediaMap.find(OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" )))->second >>= aBaseURI)
     {
         INetURLObject aURLObj(aBaseURI);
         // base URI in this case is the URI of the actual saving location
@@ -119,7 +119,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star
      Reference< XPropertySet > xInfoSet(
         GenericPropertySet_CreateInstance( new PropertySetInfo( aImportInfoMap ) ) );
      xInfoSet->setPropertyValue(
-        OUString::createFromAscii( "BaseURI" ), makeAny( aBaseURI ));
+        OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseURI" )), makeAny( aBaseURI ));
     aAnys[0] <<= xInfoSet;
 
 
@@ -170,12 +170,12 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star
             Sequence<com::sun::star::beans::PropertyValue> pValue=xstyleLoader->getStyleLoaderOptions();
 
             //Load the Styles from the Template URL Supplied in the TypeDetection file
-            if(msTemplateName.indexOf(OUString::createFromAscii("file:"))==-1)
+            if(msTemplateName.indexOf(OUString( RTL_CONSTASCII_USTRINGPARAM( "file:" )))==-1)
             {
                 Reference< XConfigManager >xCfgMgr ( mxMSF->createInstance(
-                    OUString::createFromAscii("com.sun.star.config.SpecialConfigManager") ), UNO_QUERY );
-                OUString PathString=xCfgMgr->substituteVariables(OUString::createFromAscii("$(progurl)"));
-                PathString=PathString.concat(OUString::createFromAscii("/"));
+                    OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.config.SpecialConfigManager" )) ), UNO_QUERY );
+                OUString PathString(xCfgMgr->substituteVariables(OUString(RTL_CONSTASCII_USTRINGPARAM("$(progurl)"))));
+                PathString = PathString.concat(OUString( RTL_CONSTASCII_USTRINGPARAM( "/" )));
                 msTemplateName=PathString.concat(msTemplateName);
             }
 
@@ -272,7 +272,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star
 
         // get the base URI, so we can use relative links
         OUString aBaseURI;
-        if (aMediaMap.find(OUString::createFromAscii("URL"))->second >>= aBaseURI)
+        if (aMediaMap.find(OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" )))->second >>= aBaseURI)
         {
             INetURLObject aURLObj(aBaseURI);
             // base URI in this case is the URI of the actual saving location
@@ -292,12 +292,12 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star
          Reference< XPropertySet > xInfoSet(
             GenericPropertySet_CreateInstance( new PropertySetInfo( aImportInfoMap ) ) );
          xInfoSet->setPropertyValue(
-            OUString::createFromAscii( "UsePrettyPrinting" ), makeAny( bPrettyPrint ));
+            OUString( RTL_CONSTASCII_USTRINGPARAM( "UsePrettyPrinting" )), makeAny( bPrettyPrint ));
         xInfoSet->setPropertyValue(
-                        OUString::createFromAscii( "ExportTextNumberElement" ),
+                        OUString( RTL_CONSTASCII_USTRINGPARAM( "ExportTextNumberElement" )),
                         makeAny( bExportTextNumberElementForListItems ));
          xInfoSet->setPropertyValue(
-            OUString::createFromAscii( "BaseURI" ), makeAny( aBaseURI ));
+            OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseURI" )), makeAny( aBaseURI ));
         aAnys[1] <<= xInfoSet;
 
         Reference< XExporter > xExporter( mxMSF->createInstanceWithArguments (
@@ -376,11 +376,11 @@ void SAL_CALL XmlFilterAdaptor::initialize( const Sequence< Any >& aArguments )
     {
         comphelper::SequenceAsHashMap aMap(aAnySeq);
         msFilterName = aMap.getUnpackedValueOrDefault(
-            OUString::createFromAscii("Type"), OUString());
+            OUString( RTL_CONSTASCII_USTRINGPARAM( "Type" )), OUString());
         msUserData = aMap.getUnpackedValueOrDefault(
-            OUString::createFromAscii("UserData"), Sequence< OUString >());
+            OUString( RTL_CONSTASCII_USTRINGPARAM( "UserData" )), Sequence< OUString >());
         msTemplateName = aMap.getUnpackedValueOrDefault(
-            OUString::createFromAscii("TemplateName"), OUString());
+            OUString( RTL_CONSTASCII_USTRINGPARAM( "TemplateName" )), OUString());
     }
 }
 OUString XmlFilterAdaptor_getImplementationName ()
diff --git a/filter/source/xmlfilteradaptor/genericfilter.cxx b/filter/source/xmlfilteradaptor/genericfilter.cxx
index b0dbd18f8fc9..0effdf85d795 100644
--- a/filter/source/xmlfilteradaptor/genericfilter.cxx
+++ b/filter/source/xmlfilteradaptor/genericfilter.cxx
@@ -101,7 +101,7 @@ sal_Bool SAL_CALL component_writeInfo(
 
                 reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( XmlFilterAdaptor_getImplementationName() ) );
 
-            xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+            xNewKey = xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" )) );
 
 
 
diff --git a/filter/source/xmlfilterdetect/fdcomp.cxx b/filter/source/xmlfilterdetect/fdcomp.cxx
index 5f11adff9986..82731faf90fb 100644
--- a/filter/source/xmlfilterdetect/fdcomp.cxx
+++ b/filter/source/xmlfilterdetect/fdcomp.cxx
@@ -101,7 +101,7 @@ sal_Bool SAL_CALL component_writeInfo(
 
                 reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( FilterDetect_getImplementationName() ) );
 
-            xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+            xNewKey = xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" )) );
 
 
 
diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx
index 4b60983f4d06..02079fe52c47 100644
--- a/filter/source/xmlfilterdetect/filterdetect.cxx
+++ b/filter/source/xmlfilterdetect/filterdetect.cxx
@@ -99,8 +99,8 @@ Reference< com::sun::star::frame::XModel > xModel;
 
 ::rtl::OUString SAL_CALL FilterDetect::detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aArguments ) throw( com::sun::star::uno::RuntimeException )
 {
-        ::rtl::OUString sTypeName = OUString::createFromAscii("");
-        ::rtl::OUString sUrl = OUString::createFromAscii("");
+        ::rtl::OUString sTypeName;
+        ::rtl::OUString sUrl;
         ::rtl::OUString originalTypeName;
         Sequence<PropertyValue > lProps ;
 
@@ -156,7 +156,7 @@ Reference< com::sun::star::frame::XModel > xModel;
 
 
              // test typedetect code
-            Reference <XNameAccess> xTypeCont(mxMSF->createInstance(OUString::createFromAscii("com.sun.star.document.TypeDetection")),UNO_QUERY);
+            Reference <XNameAccess> xTypeCont(mxMSF->createInstance(OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" ))),UNO_QUERY);
             Sequence < ::rtl::OUString > myTypes= xTypeCont->getElementNames();
             nLength = myTypes.getLength();
 
@@ -172,7 +172,7 @@ Reference< com::sun::star::frame::XModel > xModel;
                 sal_Int32 j =0;
                 while( j < new_nlength && sTypeName.equalsAscii(""))
                 {
-                    ::rtl::OUString tmpStr =OUString::createFromAscii("");
+                    ::rtl::OUString tmpStr;
                     lProps[j].Value >>=tmpStr;
                     if((lProps[j].Name.equalsAscii("ClipboardFormat")) && (!tmpStr.equalsAscii("")) )
                     {
@@ -191,14 +191,14 @@ Reference< com::sun::star::frame::XModel > xModel;
         }
         if(sTypeName.equalsAscii(""))
         {
-            //sTypeName=::rtl::OUString::createFromAscii("writer_Flat_XML_File");
+            //sTypeName=::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("writer_Flat_XML_File"));
         }
         else
         {
             if ( location == aArguments.getLength() )
             {
                 aArguments.realloc(nLength+1);
-                aArguments[location].Name = ::rtl::OUString::createFromAscii( "TypeName" );
+                aArguments[location].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TypeName" ));
             }
             aArguments[location].Value <<=sTypeName;
         }
@@ -213,8 +213,8 @@ Reference< com::sun::star::frame::XModel > xModel;
 ::rtl::OUString SAL_CALL supportedByType( const ::rtl::OUString clipBoardFormat ,  const ::rtl::OString resultString, const ::rtl::OUString checkType)
 {
 
-    ::rtl::OUString sTypeName= OUString::createFromAscii("");
-    if((clipBoardFormat.match(OUString::createFromAscii("doctype:"))))
+    ::rtl::OUString sTypeName;
+    if((clipBoardFormat.match(OUString( RTL_CONSTASCII_USTRINGPARAM( "doctype:" )))))
     {
             ::rtl::OString tryStr = ::rtl::OUStringToOString(clipBoardFormat.copy(8),RTL_TEXTENCODING_ASCII_US).getStr();
             // OSL_ENSURE( sal_False, tryStr);
diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 70cb8b716be9..c5c0ac86320e 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -1778,7 +1778,7 @@
 		3) 'fo:text-indent' the indent of the first line of some child (e.g. paragraph) (applied by CSS class style)
 
 	Possible list children:
-	<!ELEMENT text:list-item (text:p|text:h|text:list|text:list)+>
+	<!ELEMENT text:list-item (text:p|text:h|text:list)+>
 
 	In the Office the list label before the text depends on two attributes:
 		- 'text:min-label-width': the distance between list label and all text of the list item.
@@ -1827,6 +1827,7 @@
 			<xsl:if test="$listStyle/text:list-style/text:list-level-style-number">
 				<xsl:choose>
 					<xsl:when test="$isListHeader">0</xsl:when>
+                    <xsl:when test="$isEmptyList">
 						<!--  An empty list item (no text:h/text:p as child), will not count as item and does not increment the count.  -->
 						<xsl:variable name="tempItemNumber">
 							<xsl:choose>
diff --git a/filter/source/xsltdialog/typedetectionexport.cxx b/filter/source/xsltdialog/typedetectionexport.cxx
index 3974b101d7bf..c350f7ff2216 100644
--- a/filter/source/xsltdialog/typedetectionexport.cxx
+++ b/filter/source/xsltdialog/typedetectionexport.cxx
@@ -110,10 +110,10 @@ void TypeDetectionExporter::doExport( Reference< XOutputStream > xOS,  const XML
         xDocSrc->setOutputStream( xOS );
 
         ::comphelper::AttributeList * pAttrList = new ::comphelper::AttributeList;
-        pAttrList->AddAttribute ( OUString::createFromAscii( "xmlns:oor" ), sCdataAttribute, OUString::createFromAscii( "http://openoffice.org/2001/registry" ) );
-        pAttrList->AddAttribute ( OUString::createFromAscii( "xmlns:xs" ), sCdataAttribute, OUString::createFromAscii( "http://www.w3.org/2001/XMLSchema" ) );
-        pAttrList->AddAttribute ( sName, sCdataAttribute, OUString::createFromAscii( "TypeDetection" ) );
-        pAttrList->AddAttribute ( OUString::createFromAscii( "oor:package" ), sCdataAttribute, OUString::createFromAscii( "org.openoffice.Office" ) );
+        pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "xmlns:oor" )), sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "http://openoffice.org/2001/registry" )) );
+        pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "xmlns:xs" )), sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "http://www.w3.org/2001/XMLSchema" )) );
+        pAttrList->AddAttribute ( sName, sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "TypeDetection" )) );
+        pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "oor:package" )), sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office" )) );
         Reference < XAttributeList > xAttrList (pAttrList);
 
         xHandler->startDocument();
@@ -123,7 +123,7 @@ void TypeDetectionExporter::doExport( Reference< XOutputStream > xOS,  const XML
         // export types
         {
             xAttrList = pAttrList = new ::comphelper::AttributeList;
-            pAttrList->AddAttribute ( sName, sCdataAttribute, OUString::createFromAscii( "Types" ) );
+            pAttrList->AddAttribute ( sName, sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "Types" )) );
             xHandler->ignorableWhitespace ( sWhiteSpace );
             xHandler->startElement( sNode, xAttrList );
 
@@ -166,7 +166,7 @@ void TypeDetectionExporter::doExport( Reference< XOutputStream > xOS,  const XML
         // export filters
         {
             xAttrList = pAttrList = new ::comphelper::AttributeList;
-            pAttrList->AddAttribute ( sName, sCdataAttribute, OUString::createFromAscii( "Filters" ) );
+            pAttrList->AddAttribute ( sName, sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "Filters" )) );
             xHandler->ignorableWhitespace ( sWhiteSpace );
             xHandler->startElement( sNode, xAttrList );
 
@@ -242,8 +242,8 @@ void TypeDetectionExporter::addProperty( Reference< XDocumentHandler > xHandler,
         const OUString sWhiteSpace          ( RTL_CONSTASCII_USTRINGPARAM ( " " ) );
 
         ::comphelper::AttributeList * pAttrList = new ::comphelper::AttributeList;
-        pAttrList->AddAttribute ( OUString::createFromAscii( "oor:name" ), sCdataAttribute, rName );
-        pAttrList->AddAttribute ( OUString::createFromAscii( "oor:type" ), sCdataAttribute, OUString::createFromAscii( "xs:string" ) );
+        pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "oor:name" )), sCdataAttribute, rName );
+        pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "oor:type" )), sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "xs:string" )) );
         Reference < XAttributeList > xAttrList (pAttrList);
 
         xHandler->ignorableWhitespace ( sWhiteSpace );
@@ -272,14 +272,14 @@ void TypeDetectionExporter::addLocaleProperty( Reference< XDocumentHandler > xHa
         const OUString sWhiteSpace          ( RTL_CONSTASCII_USTRINGPARAM ( " " ) );
 
         ::comphelper::AttributeList * pAttrList = new ::comphelper::AttributeList;
-        pAttrList->AddAttribute ( OUString::createFromAscii( "oor:name" ), sCdataAttribute, rName );
-        pAttrList->AddAttribute ( OUString::createFromAscii( "oor:type" ), sCdataAttribute, OUString::createFromAscii( "xs:string" ) );
+        pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "oor:name" )), sCdataAttribute, rName );
+        pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "oor:type" )), sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "xs:string" )) );
         Reference < XAttributeList > xAttrList (pAttrList);
 
         xHandler->ignorableWhitespace ( sWhiteSpace );
         xHandler->startElement( sProp, xAttrList );
         xAttrList = pAttrList = new ::comphelper::AttributeList;
-        pAttrList->AddAttribute ( OUString::createFromAscii( "xml:lang" ), sCdataAttribute, OUString::createFromAscii( "en-US" ) );
+        pAttrList->AddAttribute ( OUString( RTL_CONSTASCII_USTRINGPARAM( "xml:lang" )), sCdataAttribute, OUString( RTL_CONSTASCII_USTRINGPARAM( "en-US" )) );
         xHandler->ignorableWhitespace ( sWhiteSpace );
         xHandler->startElement( sValue, xAttrList );
         xHandler->characters( rValue );
diff --git a/filter/source/xsltdialog/typedetectionimport.cxx b/filter/source/xsltdialog/typedetectionimport.cxx
index dbb1e65d6bdd..52070b03517c 100644
--- a/filter/source/xsltdialog/typedetectionimport.cxx
+++ b/filter/source/xsltdialog/typedetectionimport.cxx
@@ -72,7 +72,7 @@ void TypeDetectionImporter::doImport( Reference< XMultiServiceFactory >& xMSF, R
 {
     try
     {
-        Reference< XParser > xParser( xMSF->createInstance(OUString::createFromAscii( "com.sun.star.xml.sax.Parser" ) ), UNO_QUERY );
+        Reference< XParser > xParser( xMSF->createInstance(OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Parser" )) ), UNO_QUERY );
         if( xParser.is() )
         {
             TypeDetectionImporter* pImporter = new TypeDetectionImporter( xMSF );
diff --git a/filter/source/xsltdialog/xmlfileview.cxx b/filter/source/xsltdialog/xmlfileview.cxx
index dca8b7a86dbb..11973b431582 100644
--- a/filter/source/xsltdialog/xmlfileview.cxx
+++ b/filter/source/xsltdialog/xmlfileview.cxx
@@ -618,7 +618,7 @@ void XMLSourceFileDialog::onValidate()
 
     try
     {
-        Reference< XImportFilter > xImporter( mxMSF->createInstance( OUString::createFromAscii( "com.sun.star.documentconversion.XSLTValidate" ) ), UNO_QUERY );
+        Reference< XImportFilter > xImporter( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.documentconversion.XSLTValidate" )) ), UNO_QUERY );
         if( xImporter.is() )
         {
             osl::File aInputFile( maFileURL );
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index bdd241d89a19..c981ee28d32d 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -131,7 +131,7 @@ XMLFilterDialogComponent::XMLFilterDialogComponent( const com::sun::star::uno::R
     mxMSF( rxMSF ),
     mpDialog( NULL )
 {
-    Reference< XDesktop > xDesktop( mxMSF->createInstance( OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ), UNO_QUERY );
+    Reference< XDesktop > xDesktop( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" )) ), UNO_QUERY );
     if( xDesktop.is() )
     {
         Reference< XTerminateListener > xListener( this );
@@ -422,7 +422,7 @@ sal_Bool SAL_CALL component_writeInfo(
         {
             Reference< XRegistryKey > xNewKey(
                 reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( XMLFilterDialogComponent_getImplementationName() ) );
-            xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+            xNewKey = xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" )) );
 
             singlecomponent_writeInfo( xNewKey, XMLFilterDialogComponent_getSupportedServiceNames() );
 
diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx
index 2130b09db727..6489e21101cb 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -81,7 +81,7 @@ XMLFilterJarHelper::XMLFilterJarHelper( Reference< XMultiServiceFactory >& xMSF
 {
     try
     {
-        Reference< XConfigManager > xCfgMgr( xMSF->createInstance(OUString::createFromAscii("com.sun.star.config.SpecialConfigManager")), UNO_QUERY );
+        Reference< XConfigManager > xCfgMgr( xMSF->createInstance(OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.config.SpecialConfigManager" ))), UNO_QUERY );
         if( xCfgMgr.is() )
         {
             sProgPath = xCfgMgr->substituteVariables( sProgPath );
@@ -187,8 +187,7 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt
 
         Reference< XHierarchicalNameAccess > xIfc(
             mxMSF->createInstanceWithArguments(
-                rtl::OUString::createFromAscii(
-                                "com.sun.star.packages.comp.ZipPackage" ),
+                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.packages.comp.ZipPackage" )),
                 aArguments ), UNO_QUERY );
 
         if( xIfc.is() )
@@ -290,8 +289,7 @@ void XMLFilterJarHelper::openPackage( const OUString& rPackageURL, XMLFilterVect
 
         Reference< XHierarchicalNameAccess > xIfc(
             mxMSF->createInstanceWithArguments(
-                rtl::OUString::createFromAscii(
-                                "com.sun.star.packages.comp.ZipPackage" ),
+                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.packages.comp.ZipPackage" )),
                 aArguments ), UNO_QUERY );
 
         if( xIfc.is() )
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index fe764009ba49..33a0aff4e5b4 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -102,11 +102,11 @@ XMLFilterSettingsDialog::XMLFilterSettingsDialog( Window* pParent, ResMgr& rResM
 
     try
     {
-        mxFilterContainer = Reference< XNameContainer >::query( rxMSF->createInstance( OUString::createFromAscii("com.sun.star.document.FilterFactory" ) ) );
-        mxTypeDetection = Reference< XNameContainer >::query( rxMSF->createInstance( OUString::createFromAscii("com.sun.star.document.TypeDetection" ) ));
-        mxExtendedTypeDetection = Reference< XNameContainer >::query( rxMSF->createInstance( OUString::createFromAscii("com.sun.star.document.ExtendedTypeDetectionFactory" ) ) );
+        mxFilterContainer = Reference< XNameContainer >::query( rxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" )) ) );
+        mxTypeDetection = Reference< XNameContainer >::query( rxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" )) ));
+        mxExtendedTypeDetection = Reference< XNameContainer >::query( rxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.ExtendedTypeDetectionFactory" )) ) );
 
-        Reference< XConfigManager > xCfgMgr( mxMSF->createInstance(OUString::createFromAscii("com.sun.star.config.SpecialConfigManager") ), UNO_QUERY );
+        Reference< XConfigManager > xCfgMgr( mxMSF->createInstance(OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.config.SpecialConfigManager" )) ), UNO_QUERY );
         if( xCfgMgr.is() )
         {
             sTemplatePath = xCfgMgr->substituteVariables( sTemplatePath );
@@ -251,7 +251,7 @@ void XMLFilterSettingsDialog::onNew()
     aTempInfo.maInterfaceName = createUniqueInterfaceName( String( RESID( STR_DEFAULT_UI_NAME ) ) );
 
     // set default application
-    aTempInfo.maDocumentService = OUString::createFromAscii("com.sun.star.text.TextDocument");
+    aTempInfo.maDocumentService = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" ));
 
     // execute XML Filter Dialog
     XMLFilterTabDialog aDlg( this, *mpResMgr, mxMSF, &aTempInfo );
@@ -1378,9 +1378,9 @@ OUString getApplicationUIName( const OUString& rServiceName )
         OUString aRet = String( RESID( STR_UNKNOWN_APPLICATION ) );
         if( rServiceName.getLength() )
         {
-            aRet += OUString::createFromAscii(" (");
+            aRet += OUString( RTL_CONSTASCII_USTRINGPARAM( " (" ));
             aRet += rServiceName;
-            aRet += OUString::createFromAscii(")");
+            aRet += OUString( RTL_CONSTASCII_USTRINGPARAM( ")" ));
         }
         return aRet;
     }
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
index 7a612d139490..15aee854fee4 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
@@ -146,7 +146,7 @@ bool XMLFilterTabDialog::onOk()
         {
             try
             {
-                Reference< XNameAccess > xFilterContainer( mxMSF->createInstance( OUString::createFromAscii("com.sun.star.document.FilterFactory" ) ), UNO_QUERY );
+                Reference< XNameAccess > xFilterContainer( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" )) ), UNO_QUERY );
                 if( xFilterContainer.is() )
                 {
                     if( xFilterContainer->hasByName( mpNewInfo->maFilterName ) )
@@ -178,7 +178,7 @@ bool XMLFilterTabDialog::onOk()
         {
             try
             {
-                Reference< XNameAccess > xFilterContainer( mxMSF->createInstance( OUString::createFromAscii("com.sun.star.document.FilterFactory" ) ), UNO_QUERY );
+                Reference< XNameAccess > xFilterContainer( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" )) ), UNO_QUERY );
                 if( xFilterContainer.is() )
                 {
                     Sequence< OUString > aFilterNames( xFilterContainer->getElementNames() );
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
index 7572228a0299..48da5ae6eee5 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
@@ -78,7 +78,7 @@ XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( Window* pParent, ResMgr& rResMgr, co
 
     try
     {
-        Reference< XConfigManager > xCfgMgr( rxMSF->createInstance(OUString::createFromAscii("com.sun.star.config.SpecialConfigManager")), UNO_QUERY );
+        Reference< XConfigManager > xCfgMgr( rxMSF->createInstance(OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.config.SpecialConfigManager" ))), UNO_QUERY );
         if( xCfgMgr.is() )
             sInstPath = xCfgMgr->substituteVariables( sInstPath );
     }
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index c59957645715..4f027de246ab 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -181,11 +181,11 @@ XMLFilterTestDialog::XMLFilterTestDialog( Window* pParent, ResMgr& rResMgr, cons
 
     try
     {
-        Reference< XConfigManager > xCfgMgr( mxMSF->createInstance( OUString::createFromAscii("com.sun.star.config.SpecialConfigManager")), UNO_QUERY );
+        Reference< XConfigManager > xCfgMgr( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.config.SpecialConfigManager" ))), UNO_QUERY );
         if( xCfgMgr.is() )
             sDTDPath = xCfgMgr->substituteVariables( sDTDPath );
 
-        mxGlobalBroadcaster = Reference < XEventBroadcaster >::query( mxMSF->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.GlobalEventBroadcaster") ) );
+        mxGlobalBroadcaster = Reference < XEventBroadcaster >::query( mxMSF->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.GlobalEventBroadcaster" )) ) );
         if ( mxGlobalBroadcaster.is() )
         {
             mxGlobalEventListener = new GlobalEventListenerImpl( this );
@@ -329,8 +329,8 @@ void XMLFilterTestDialog::onExportBrowse()
             com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
             0 );
 
-        Reference< XNameAccess > xFilterContainer( mxMSF->createInstance( OUString::createFromAscii("com.sun.star.document.FilterFactory" ) ), UNO_QUERY );
-        Reference< XNameAccess > xTypeDetection( mxMSF->createInstance( OUString::createFromAscii("com.sun.star.document.TypeDetection" ) ), UNO_QUERY );
+        Reference< XNameAccess > xFilterContainer( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" )) ), UNO_QUERY );
+        Reference< XNameAccess > xTypeDetection( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" )) ), UNO_QUERY );
         if( xFilterContainer.is() && xTypeDetection.is() )
         {
             Sequence< OUString > aFilterNames( xFilterContainer->getElementNames() );
@@ -404,7 +404,7 @@ void XMLFilterTestDialog::onExportBrowse()
                                         {
                                             if( n > 0 )
                                                 aExtension += OUString( sal_Unicode(';') );
-                                            aExtension += OUString::createFromAscii("*.");
+                                            aExtension += OUString( RTL_CONSTASCII_USTRINGPARAM( "*." ));
                                             aExtension += (*pExtensions++);
                                         }
                                     }
@@ -434,13 +434,13 @@ void XMLFilterTestDialog::onExportBrowse()
         {
             maExportRecentFile = aDlg.GetPath();
 
-            Reference< XComponentLoader > xLoader( mxMSF->createInstance( OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ), UNO_QUERY );
-            Reference< XInteractionHandler > xInter( mxMSF->createInstance( OUString::createFromAscii( "com.sun.star.task.InteractionHandler" ) ), UNO_QUERY );
+            Reference< XComponentLoader > xLoader( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" )) ), UNO_QUERY );
+            Reference< XInteractionHandler > xInter( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.InteractionHandler" )) ), UNO_QUERY );
             if( xLoader.is() && xInter.is() )
             {
                 OUString aFrame( RTL_CONSTASCII_USTRINGPARAM( "_default" ) );
                 Sequence< PropertyValue > aArguments(1);
-                aArguments[0].Name = OUString::createFromAscii( "InteractionHandler" );
+                aArguments[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ));
                 aArguments[0].Value <<= xInter;
                 Reference< XComponent > xComp( xLoader->loadComponentFromURL( maExportRecentFile, aFrame, 0, aArguments ) );
                 if( xComp.is() )
@@ -505,7 +505,7 @@ void XMLFilterTestDialog::doExport( Reference< XComponent > xComp )
                     aSourceData[i++].Value <<= mpFilterInfo->maDocType;
                 }
 
-                Reference< XExportFilter > xExporter( mxMSF->createInstance( OUString::createFromAscii( "com.sun.star.documentconversion.XSLTFilter" ) ), UNO_QUERY );
+                Reference< XExportFilter > xExporter( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.documentconversion.XSLTFilter" )) ), UNO_QUERY );
                 Reference< XDocumentHandler > xHandler( xExporter, UNO_QUERY );
                 if( xHandler.is() )
                 {
@@ -521,8 +521,8 @@ void XMLFilterTestDialog::doExport( Reference< XComponent > xComp )
                     {
                         try
                         {
-                            xGrfResolver = Reference< XGraphicObjectResolver >::query( xDocFac->createInstance( OUString::createFromAscii("com.sun.star.document.ExportGraphicObjectResolver") ) );
-                            xObjectResolver = Reference< XEmbeddedObjectResolver >::query( xDocFac->createInstance( OUString::createFromAscii("com.sun.star.document.ExportEmbeddedObjectResolver") ) );
+                            xGrfResolver = Reference< XGraphicObjectResolver >::query( xDocFac->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.ExportGraphicObjectResolver" )) ) );
+                            xObjectResolver = Reference< XEmbeddedObjectResolver >::query( xDocFac->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.ExportEmbeddedObjectResolver" )) ) );
                         }
                         catch( Exception& )
                         {
@@ -588,7 +588,7 @@ void XMLFilterTestDialog::onImportBrowse()
         if( i > 0 )
             aExtensions += ';';
 
-        aExtensions += String( RTL_CONSTASCII_STRINGPARAM("*.") );
+        aExtensions += String( RTL_CONSTASCII_USTRINGPARAM("*.") );
 
         if( nLastIndex == -1 )
         {
@@ -628,16 +628,16 @@ void XMLFilterTestDialog::import( const OUString& rURL )
 {
     try
     {
-        Reference< XComponentLoader > xLoader( mxMSF->createInstance( OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ), UNO_QUERY );
-        Reference< XInteractionHandler > xInter( mxMSF->createInstance( OUString::createFromAscii( "com.sun.star.task.InteractionHandler" ) ), UNO_QUERY );
+        Reference< XComponentLoader > xLoader( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" )) ), UNO_QUERY );
+        Reference< XInteractionHandler > xInter( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.InteractionHandler" )) ), UNO_QUERY );
         if( xLoader.is() && xInter.is() )
         {
 
             OUString aFrame( RTL_CONSTASCII_USTRINGPARAM( "_default" ) );
             Sequence< PropertyValue > aArguments(2);
-            aArguments[0].Name = OUString::createFromAscii( "FilterName" );
+            aArguments[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
             aArguments[0].Value <<= mpFilterInfo->maFilterName;
-            aArguments[1].Name = OUString::createFromAscii( "InteractionHandler" );
+            aArguments[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ));
             aArguments[1].Value <<= xInter;
 
             xLoader->loadComponentFromURL( rURL, aFrame, 0, aArguments );
@@ -648,7 +648,7 @@ void XMLFilterTestDialog::import( const OUString& rURL )
             TempFile aTempFile;
             OUString aTempFileURL( aTempFile.GetURL() );
 
-            Reference< XImportFilter > xImporter( mxMSF->createInstance( OUString::createFromAscii( "com.sun.star.documentconversion.XSLTFilter" ) ), UNO_QUERY );
+            Reference< XImportFilter > xImporter( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.documentconversion.XSLTFilter" )) ), UNO_QUERY );
             if( xImporter.is() )
             {
                 osl::File aInputFile( rURL );
@@ -659,22 +659,22 @@ void XMLFilterTestDialog::import( const OUString& rURL )
                 Sequence< PropertyValue > aSourceData( 5 );
                 int i = 0;
 
-                aSourceData[i  ].Name = OUString::createFromAscii( "InputStream" );
+                aSourceData[i  ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "InputStream" ));
                 aSourceData[i++].Value <<= xIS;
 
-                aSourceData[i  ].Name = OUString::createFromAscii( "FileName" );
+                aSourceData[i  ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "FileName" ));
                 aSourceData[i++].Value <<= rURL;
 
-                aSourceData[i  ].Name = OUString::createFromAscii( "Indent" );
+                aSourceData[i  ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Indent" ));
                 aSourceData[i++].Value <<= (sal_Bool)sal_True;
 
-                aSourceData[i  ].Name = OUString::createFromAscii("DocType_Public");
-                aSourceData[i++].Value <<= OUString::createFromAscii("-//OpenOffice.org//DTD OfficeDocument 1.0//EN");
+                aSourceData[i  ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "DocType_Public" ));
+                aSourceData[i++].Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM( "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" ));
 
-                aSourceData[i  ].Name = OUString::createFromAscii("DocType_System");
+                aSourceData[i  ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "DocType_System" ));
                 aSourceData[i++].Value <<= sDTDPath;
 
-                Reference< XDocumentHandler > xWriter( mxMSF->createInstance( OUString::createFromAscii( "com.sun.star.xml.sax.Writer" ) ), UNO_QUERY );
+                Reference< XDocumentHandler > xWriter( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Writer" )) ), UNO_QUERY );
 
                 File aOutputFile( aTempFileURL );
                 rc = aOutputFile.open( OpenFlag_Write );
@@ -729,7 +729,7 @@ Reference< XComponent > XMLFilterTestDialog::getFrontMostDocument( const OUStrin
 
     try
     {
-        Reference< XDesktop > xDesktop( mxMSF->createInstance( OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ), UNO_QUERY );
+        Reference< XDesktop > xDesktop( mxMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" )) ), UNO_QUERY );
         if( xDesktop.is() )
         {
             Reference< XComponent > xTest( mxLastFocusModel );
diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx
index f9186d31b6f7..73200ac24d42 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -307,10 +307,10 @@ void XSLTFilter::disposing(const EventObject& ) throw (RuntimeException)
     {
         Reference< XComponentContext > xContext;
         Reference< XPropertySet > xProps( m_rServiceFactory, UNO_QUERY_THROW );
-        xContext.set( xProps->getPropertyValue( ::rtl::OUString::createFromAscii( "DefaultContext" ) ), UNO_QUERY_THROW );
-        Reference< XMacroExpander > xMacroExpander( xContext->getValueByName( ::rtl::OUString::createFromAscii( "/singletons/com.sun.star.util.theMacroExpander" ) ), UNO_QUERY_THROW );
+        xContext.set( xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" )) ), UNO_QUERY_THROW );
+        Reference< XMacroExpander > xMacroExpander( xContext->getValueByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theMacroExpander" )) ), UNO_QUERY_THROW );
         sExpandedUrl = xMacroExpander->expandMacros(sUrl);
-        sal_Int32 nPos = sExpandedUrl.indexOf(::rtl::OUString::createFromAscii("vnd.sun.star.expand:"));
+        sal_Int32 nPos = sExpandedUrl.indexOf(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.expand:" )));
         if ( nPos != -1 )
             sExpandedUrl = sExpandedUrl.copy(nPos+20);
     }
@@ -348,8 +348,8 @@ OUString XSLTFilter::rel2abs(const OUString& s)
 {
 
     Reference< XStringSubstitution > subs(m_rServiceFactory->createInstance(
-        OUString::createFromAscii("com.sun.star.util.PathSubstitution")), UNO_QUERY);
-    OUString aWorkingDir = subs->getSubstituteVariableValue(OUString::createFromAscii("$(progurl)"));
+        OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.PathSubstitution" ))), UNO_QUERY);
+    OUString aWorkingDir(subs->getSubstituteVariableValue(OUString(RTL_CONSTASCII_USTRINGPARAM("$(progurl)"))));
     INetURLObject aObj( aWorkingDir );
     aObj.setFinalSlash();
     bool bWasAbsolute;
@@ -395,7 +395,7 @@ sal_Bool XSLTFilter::importer(
     // create SAX parser that will read the document file
     // and provide events to xHandler passed to this call
     Reference < XParser > xSaxParser( m_rServiceFactory->createInstance(
-        OUString::createFromAscii("com.sun.star.xml.sax.Parser")), UNO_QUERY );
+        OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Parser" ))), UNO_QUERY );
     OSL_ASSERT(xSaxParser.is());
     if(!xSaxParser.is())return sal_False;
 
@@ -403,16 +403,16 @@ sal_Bool XSLTFilter::importer(
     Sequence< Any > args(3);
     NamedValue nv;
 
-    nv.Name = OUString::createFromAscii("StylesheetURL");
+    nv.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "StylesheetURL" ));
     nv.Value <<= expandUrl(udStyleSheet); args[0] <<= nv;
-    nv.Name = OUString::createFromAscii("SourceURL");
+    nv.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "SourceURL" ));
     nv.Value <<= aURL; args[1] <<= nv;
-    nv.Name = OUString::createFromAscii("SourceBaseURL");
+    nv.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "SourceBaseURL" ));
     nv.Value <<= OUString(INetURLObject(aURL).getBase());
     args[2] <<= nv;
 
     m_tcontrol = Reference< XActiveDataControl >(m_rServiceFactory->createInstanceWithArguments(
-        OUString::createFromAscii("com.sun.star.comp.JAXTHelper"), args), UNO_QUERY);
+        OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.JAXTHelper" )), args), UNO_QUERY);
 
     OSL_ASSERT(xHandler.is());
     OSL_ASSERT(xInputStream.is());
@@ -430,7 +430,7 @@ sal_Bool XSLTFilter::importer(
 
             // create pipe
             Reference< XOutputStream > pipeout(m_rServiceFactory->createInstance(
-                OUString::createFromAscii("com.sun.star.io.Pipe")), UNO_QUERY);
+                OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.Pipe" ))), UNO_QUERY);
             Reference< XInputStream > pipein(pipeout, UNO_QUERY);
 
             //connect transformer to pipe
@@ -516,22 +516,22 @@ sal_Bool XSLTFilter::exporter(
         // get the document writer
         m_rDocumentHandler = Reference<XExtendedDocumentHandler>(
             m_rServiceFactory->createInstance(
-            OUString::createFromAscii("com.sun.star.xml.sax.Writer")),
+            OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Writer" ))),
                 UNO_QUERY);
     }
 
     // create transformer
     Sequence< Any > args(4);
     NamedValue nv;
-    nv.Name = OUString::createFromAscii("StylesheetURL");
+    nv.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "StylesheetURL" ));
     nv.Value <<= expandUrl(udStyleSheet); args[0] <<= nv;
-    nv.Name = OUString::createFromAscii("TargetURL");
+    nv.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "TargetURL" ));
     nv.Value <<= sURL; args[1] <<= nv;
-    nv.Name = OUString::createFromAscii("DoctypeSystem");
+    nv.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "DoctypeSystem" ));
     nv.Value <<= aDoctypeSystem; args[2] <<= nv;
-    nv.Name = OUString::createFromAscii("DoctypePublic");
+    nv.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "DoctypePublic" ));
     nv.Value <<= aDoctypePublic; args[3] <<= nv;
-    nv.Name = OUString::createFromAscii("TargetBaseURL");
+    nv.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "TargetBaseURL" ));
     INetURLObject ineturl(sURL);
     ineturl.removeSegment();
     m_aExportBaseUrl = ineturl.GetMainURL(INetURLObject::NO_DECODE);
@@ -539,7 +539,7 @@ sal_Bool XSLTFilter::exporter(
     args[3] <<= nv;
 
     m_tcontrol = Reference< XActiveDataControl >(m_rServiceFactory->createInstanceWithArguments(
-        OUString::createFromAscii("com.sun.star.comp.JAXTHelper"), args), UNO_QUERY);
+        OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.JAXTHelper" )), args), UNO_QUERY);
 
     OSL_ASSERT(m_rDocumentHandler.is());
     OSL_ASSERT(m_rOutputStream.is());
@@ -551,7 +551,7 @@ sal_Bool XSLTFilter::exporter(
 
         // create pipe
         Reference< XOutputStream > pipeout(m_rServiceFactory->createInstance(
-            OUString::createFromAscii("com.sun.star.io.Pipe")), UNO_QUERY);
+            OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.Pipe" ))), UNO_QUERY);
         Reference< XInputStream > pipein(pipeout, UNO_QUERY);
 
         // connect sax writer to pipe
@@ -664,7 +664,7 @@ static Sequence< OUString > getSupportedServiceNames()
         if( !pNames )
         {
             static Sequence< OUString > seqNames(1);
-                seqNames.getArray()[0] = OUString::createFromAscii(SERVICE_NAME);
+                seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME));
             pNames = &seqNames;
         }
     }
@@ -691,7 +691,7 @@ sal_Bool SAL_CALL component_writeInfo(void * /* pServiceManager */, void * pRegi
         {
             Reference< XRegistryKey > xNewKey(
                 reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-                    OUString::createFromAscii( "/" IMPLEMENTATION_NAME "/UNO/SERVICES" ) ) );
+                    OUString( RTL_CONSTASCII_USTRINGPARAM( "/" IMPLEMENTATION_NAME "/UNO/SERVICES" )) ) );
 
             const Sequence< OUString > & rSNL = getSupportedServiceNames();
             const OUString * pArray = rSNL.getConstArray();
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index d64ebab3ed8c..9bc330360e56 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -94,8 +94,8 @@ const StringSequence& getColumnTypes()
 //------------------------------------------------------------------------------
 sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName)
 {
-    const ::rtl::OUString aModelPrefix = ::rtl::OUString::createFromAscii("com.sun.star.form.component.");
-    const ::rtl::OUString aCompatibleModelPrefix = ::rtl::OUString::createFromAscii("stardiv.one.form.component.");
+    const ::rtl::OUString aModelPrefix (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.") );
+    const ::rtl::OUString aCompatibleModelPrefix (RTL_CONSTASCII_USTRINGPARAM("stardiv.one.form.component.") );
 
     sal_Int32 nTypeId = -1;
     if (aModelName == FRM_COMPONENT_EDIT)
diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx
index efcbaeae18e1..ed919f60b0d6 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -121,11 +121,11 @@ void OCurrencyModel::implConstruct()
                     bPrependCurrencySymbol = sal_False;
                     break;
                 case 2: // $ 1
-                    sCurrencySymbol = ::rtl::OUString(String(aLocaleInfo.getCurrSymbol())) + ::rtl::OUString::createFromAscii(" ");
+                    sCurrencySymbol = ::rtl::OUString(String(aLocaleInfo.getCurrSymbol())) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ") );
                     bPrependCurrencySymbol = sal_True;
                     break;
                 case 3: // 1 $
-                    sCurrencySymbol = ::rtl::OUString::createFromAscii(" ") + ::rtl::OUString(String(aLocaleInfo.getCurrSymbol()));
+                    sCurrencySymbol = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ") ) + ::rtl::OUString(String(aLocaleInfo.getCurrSymbol()));
                     bPrependCurrencySymbol = sal_False;
                     break;
             }
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 248fbb44c0b9..d6dbf397b029 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -995,7 +995,7 @@ void ODatabaseForm::Encode( ::rtl::OUString& rString ) const
             switch( nCharCode )
             {
                 case 13:    // CR
-                    aResult += ::rtl::OUString::createFromAscii("%0D%0A");  // Hex-Darstellung CR LF
+                    aResult += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%0D%0A") ); // Hex-Darstellung CR LF
                     break;
 
 
@@ -1042,7 +1042,7 @@ void ODatabaseForm::InsertTextPart( INetMIMEMessage& rParent, const ::rtl::OUStr
 
 
     // Header
-    ::rtl::OUString aContentDisp = ::rtl::OUString::createFromAscii("form-data; name=\"");
+    ::rtl::OUString aContentDisp (RTL_CONSTASCII_USTRINGPARAM("form-data; name=\"") );
     aContentDisp += rName;
     aContentDisp += UniString('\"');
     pChild->SetContentDisposition( aContentDisp );
@@ -1107,15 +1107,15 @@ sal_Bool ODatabaseForm::InsertFilePart( INetMIMEMessage& rParent, const ::rtl::O
 
 
     // Header
-    ::rtl::OUString aContentDisp = ::rtl::OUString::createFromAscii( "form-data; name=\"" );
+    ::rtl::OUString aContentDisp (RTL_CONSTASCII_USTRINGPARAM( "form-data; name=\"") );
     aContentDisp += rName;
     aContentDisp += UniString('\"');
-    aContentDisp += ::rtl::OUString::createFromAscii("; filename=\"");
+    aContentDisp += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("; filename=\"") );
     aContentDisp += aFileName;
     aContentDisp += UniString('\"');
     pChild->SetContentDisposition( aContentDisp );
     pChild->SetContentType( aContentType );
-    pChild->SetContentTransferEncoding( UniString(::rtl::OUString::createFromAscii("8bit")) );
+    pChild->SetContentTransferEncoding( UniString(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("8bit") ) ) );
 
 
     // Body
@@ -2186,7 +2186,7 @@ void lcl_dispatch(const Reference< XFrame >& xFrame,const Reference<XURLTransfor
     if (xDisp.is())
     {
         Sequence<PropertyValue> aArgs(2);
-        aArgs.getArray()[0].Name = ::rtl::OUString::createFromAscii("Referer");
+        aArgs.getArray()[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer") );
         aArgs.getArray()[0].Value <<= aReferer;
 
         // build a sequence from the to-be-submitted string
@@ -2195,7 +2195,7 @@ void lcl_dispatch(const Reference< XFrame >& xFrame,const Reference<XURLTransfor
         Sequence< sal_Int8 > aPostData((sal_Int8*)a8BitData.GetBuffer(), a8BitData.Len());
         Reference< XInputStream > xPostData = new SequenceInputStream(aPostData);
 
-        aArgs.getArray()[1].Name = ::rtl::OUString::createFromAscii("PostData");
+        aArgs.getArray()[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PostData") );
         aArgs.getArray()[1].Value <<= xPostData;
 
         xDisp->dispatch(aURL, aArgs);
@@ -2254,7 +2254,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
 
     Reference<XURLTransformer>
         xTransformer(m_xServiceFactory->createInstance(
-            ::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer")), UNO_QUERY);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer") ) ), UNO_QUERY);
     DBG_ASSERT(xTransformer.is(), "ODatabaseForm::submit_impl : could not create an URL transformer !");
 
     // URL-Encoding
@@ -2283,7 +2283,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
             if (xDisp.is())
             {
                 Sequence<PropertyValue> aArgs(1);
-                aArgs.getArray()->Name = ::rtl::OUString::createFromAscii("Referer");
+                aArgs.getArray()->Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer") );
                 aArgs.getArray()->Value <<= aReferer;
                 xDisp->dispatch(aURL, aArgs);
             }
@@ -2316,15 +2316,15 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
                 return;
 
             Sequence<PropertyValue> aArgs(3);
-            aArgs.getArray()[0].Name = ::rtl::OUString::createFromAscii("Referer");
+            aArgs.getArray()[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer") );
             aArgs.getArray()[0].Value <<= aReferer;
-            aArgs.getArray()[1].Name = ::rtl::OUString::createFromAscii("ContentType");
+            aArgs.getArray()[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType") );
             aArgs.getArray()[1].Value <<= aContentType;
 
             // build a sequence from the to-be-submitted string
             Reference< XInputStream > xPostData = new SequenceInputStream(aData);
 
-            aArgs.getArray()[2].Name = ::rtl::OUString::createFromAscii("PostData");
+            aArgs.getArray()[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PostData") );
             aArgs.getArray()[2].Value <<= xPostData;
 
             xDisp->dispatch(aURL, aArgs);
@@ -3826,7 +3826,7 @@ Sequence< ::rtl::OUString > SAL_CALL ODatabaseForm::getCurrentServiceNames_Stati
     ::rtl::OUString* pServices = aServices.getArray();
 
     *pServices++ = FRM_SUN_FORMCOMPONENT;
-    *pServices++ = ::rtl::OUString::createFromAscii("com.sun.star.form.FormComponents");
+    *pServices++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.FormComponents") );
     *pServices++ = FRM_SUN_COMPONENT_FORM;
     *pServices++ = FRM_SUN_COMPONENT_HTMLFORM;
     *pServices++ = FRM_SUN_COMPONENT_DATAFORM;
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index 229ae6e0a954..e5f5375f0e1a 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -629,7 +629,7 @@ void OEditModel::onConnectedDbColumn( const Reference< XInterface >& _rxForm )
             if ( !m_bMaxTextLenModified )
             {
                 sal_Int32 nFieldLen = 0;
-                xField->getPropertyValue(::rtl::OUString::createFromAscii("Precision")) >>= nFieldLen;
+                xField->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Precision") ) ) >>= nFieldLen;
 
                 if (nFieldLen && nFieldLen <= USHRT_MAX)
                 {
diff --git a/forms/source/component/EventThread.cxx b/forms/source/component/EventThread.cxx
index 7e16c62715e0..c729ae4350d4 100644
--- a/forms/source/component/EventThread.cxx
+++ b/forms/source/component/EventThread.cxx
@@ -147,25 +147,16 @@ void OComponentEventThread::addEvent( const EventObject* _pEvt,
     m_aCond.set();
 }
 
-//---------------------------------------------------------------------
-//--- 22.08.01 15:48:15 -----------------------------------------------
-
 void OComponentEventThread::implStarted( )
 {
     acquire( );
 }
 
-//---------------------------------------------------------------------
-//--- 22.08.01 15:48:16 -----------------------------------------------
-
 void OComponentEventThread::implTerminated( )
 {
     release( );
 }
 
-//---------------------------------------------------------------------
-//--- 22.08.01 15:47:31 -----------------------------------------------
-
 void SAL_CALL OComponentEventThread::kill()
 {
     OComponentEventThread_TBASE::terminate();
@@ -174,9 +165,6 @@ void SAL_CALL OComponentEventThread::kill()
     implTerminated( );
 }
 
-//---------------------------------------------------------------------
-//--- 22.08.01 15:47:33 -----------------------------------------------
-
 void SAL_CALL OComponentEventThread::onTerminated()
 {
     OComponentEventThread_TBASE::onTerminated();
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index 362c0fc77097..ca75f26b0e03 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -168,22 +168,22 @@ namespace frm
         switch (m_nControlClass)
         {
             case FormComponentType::RADIOBUTTON:
-                aServiceName = ::rtl::OUString::createFromAscii("radiobutton");
+                aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("radiobutton") );
                 break;
             case FormComponentType::CHECKBOX:
-                aServiceName = ::rtl::OUString::createFromAscii("checkbox");
+                aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("checkbox") );
                 break;
             case FormComponentType::COMBOBOX:
-                aServiceName = ::rtl::OUString::createFromAscii("combobox");
+                aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("combobox") );
                 break;
             case FormComponentType::LISTBOX:
-                aServiceName = ::rtl::OUString::createFromAscii("listbox");
+                aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("listbox") );
                 break;
             default:
                 if (m_bMultiLine)
-                    aServiceName = ::rtl::OUString::createFromAscii("MultiLineEdit");
+                    aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MultiLineEdit") );
                 else
-                    aServiceName = ::rtl::OUString::createFromAscii("Edit");
+                    aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Edit") );
         }
         return aServiceName;
     }
@@ -711,10 +711,10 @@ namespace frm
         try
         {
             Sequence< Any > aArgs(2);
-            aArgs[0] <<= PropertyValue(::rtl::OUString::createFromAscii("SQLException"), 0, makeAny( _rExcept ), PropertyState_DIRECT_VALUE);
-            aArgs[1] <<= PropertyValue(::rtl::OUString::createFromAscii("ParentWindow"), 0, makeAny( m_xMessageParent ), PropertyState_DIRECT_VALUE);
+            aArgs[0] <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLException") ), 0, makeAny( _rExcept ), PropertyState_DIRECT_VALUE);
+            aArgs[1] <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow") ), 0, makeAny( m_xMessageParent ), PropertyState_DIRECT_VALUE);
 
-            static ::rtl::OUString s_sDialogServiceName = ::rtl::OUString::createFromAscii( "com.sun.star.sdb.ErrorMessageDialog" );
+            static ::rtl::OUString s_sDialogServiceName (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ErrorMessageDialog") );
 
             Reference< XExecutableDialog > xErrorDialog( m_aContext.createComponentWithArguments( s_sDialogServiceName, aArgs ), UNO_QUERY );
             if ( xErrorDialog.is() )
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 768eaca5f489..1e37ae8ae474 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -784,7 +784,7 @@ Sequence< ::rtl::OUString > SAL_CALL OControlModel::getSupportedServiceNames_Sta
 {
     Sequence< ::rtl::OUString > aServiceNames( 2 );
     aServiceNames[ 0 ] = FRM_SUN_FORMCOMPONENT;
-    aServiceNames[ 1 ] = ::rtl::OUString::createFromAscii( "com.sun.star.form.FormControlModel" );
+    aServiceNames[ 1 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.FormControlModel") );
     return aServiceNames;
 }
 
@@ -1654,7 +1654,7 @@ StringSequence SAL_CALL OBoundControlModel::getSupportedServiceNames() throw(Run
 Sequence< ::rtl::OUString > SAL_CALL OBoundControlModel::getSupportedServiceNames_Static() throw( RuntimeException )
 {
     Sequence< ::rtl::OUString > aOwnServiceNames( 1 );
-    aOwnServiceNames[ 0 ] = ::rtl::OUString::createFromAscii( "com.sun.star.form.DataAwareControlModel" );
+    aOwnServiceNames[ 0 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.DataAwareControlModel") );
 
     return ::comphelper::concatSequences(
         OControlModel::getSupportedServiceNames_Static(),
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 8bafb3f893b4..145671a6e120 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -790,7 +790,7 @@ void OFormattedModel::onConnectedDbColumn( const Reference< XInterface >& _rxFor
     Reference<XNumberFormatsSupplier>  xSupplier = calcFormatsSupplier();
     m_bNumeric = getBOOL( getPropertyValue( PROPERTY_TREATASNUMERIC ) );
     m_nKeyType  = getNumberFormatType( xSupplier->getNumberFormats(), nFormatKey );
-    xSupplier->getNumberFormatSettings()->getPropertyValue( ::rtl::OUString::createFromAscii("NullDate") ) >>= m_aNullDate;
+    xSupplier->getNumberFormatSettings()->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NullDate") ) ) >>= m_aNullDate;
 
     OEditBaseModel::onConnectedDbColumn( _rxForm );
 }
@@ -852,7 +852,7 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
         ::rtl::OUString         sFormatDescription;
         LanguageType    eFormatLanguage = LANGUAGE_DONTKNOW;
 
-        static const ::rtl::OUString s_aLocaleProp = ::rtl::OUString::createFromAscii("Locale");
+        static const ::rtl::OUString s_aLocaleProp (RTL_CONSTASCII_USTRINGPARAM("Locale") );
         Reference<com::sun::star::beans::XPropertySet>  xFormat = xFormats->getByKey(nKey);
         if (hasProperty(s_aLocaleProp, xFormat))
         {
@@ -865,7 +865,7 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
             }
         }
 
-        static const ::rtl::OUString s_aFormatStringProp = ::rtl::OUString::createFromAscii("FormatString");
+        static const ::rtl::OUString s_aFormatStringProp (RTL_CONSTASCII_USTRINGPARAM("FormatString") );
         if (hasProperty(s_aFormatStringProp, xFormat))
             xFormat->getPropertyValue(s_aFormatStringProp) >>= sFormatDescription;
 
diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx
index 53f340fd9d70..6ac7740f78b0 100644
--- a/forms/source/component/FormattedFieldWrapper.cxx
+++ b/forms/source/component/FormattedFieldWrapper.cxx
@@ -205,7 +205,7 @@ Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType) throw
 //------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OFormattedFieldWrapper::getImplementationName(  ) throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.forms.OFormattedFieldWrapper");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.forms.OFormattedFieldWrapper") );
 }
 
 //------------------------------------------------------------------
diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx
index b6629e91cb94..2b72d8e42f57 100644
--- a/forms/source/component/FormsCollection.cxx
+++ b/forms/source/component/FormsCollection.cxx
@@ -119,7 +119,7 @@ Any SAL_CALL OFormsCollection::queryAggregation(const Type& _rType) throw(Runtim
 //------------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OFormsCollection::getImplementationName() throw(RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.forms.OFormsCollection");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.forms.OFormsCollection") );
 }
 
 //------------------------------------------------------------------------------
@@ -139,7 +139,7 @@ StringSequence SAL_CALL OFormsCollection::getSupportedServiceNames() throw(Runti
     StringSequence aReturn(2);
 
     aReturn.getArray()[0] = FRM_SUN_FORMS_COLLECTION;
-    aReturn.getArray()[1] = ::rtl::OUString::createFromAscii("com.sun.star.form.FormComponents");
+    aReturn.getArray()[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.FormComponents") );
 
     return aReturn;
 }
diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx
index c9b8e4616e73..7704af43018e 100644
--- a/forms/source/component/GroupManager.cxx
+++ b/forms/source/component/GroupManager.cxx
@@ -121,11 +121,11 @@ OGroupComp::OGroupComp(const OGroupComp& _rSource)
 
 //------------------------------------------------------------------
 OGroupComp::OGroupComp(const Reference<XPropertySet>& rxSet, sal_Int32 nInsertPos )
-    :m_xComponent( rxSet )
-    ,m_xControlModel(rxSet,UNO_QUERY)
-    ,m_nPos( nInsertPos )
-    ,m_nTabIndex(0)
-    ,m_aName( OGroupManager::GetGroupName( rxSet ) )
+    : m_aName( OGroupManager::GetGroupName( rxSet ) )
+    , m_xComponent( rxSet )
+    , m_xControlModel(rxSet,UNO_QUERY)
+    , m_nPos( nInsertPos )
+    , m_nTabIndex(0)
 {
     if (m_xComponent.is())
     {
@@ -269,7 +269,7 @@ Sequence< Reference<XControlModel>  > OGroup::GetControlModels() const
 DBG_NAME(OGroupManager);
 //------------------------------------------------------------------
 OGroupManager::OGroupManager(const Reference< XContainer >& _rxContainer)
-    :m_pCompGroup( new OGroup( ::rtl::OUString::createFromAscii( "AllComponentGroup" ) ) )
+    :m_pCompGroup( new OGroup( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AllComponentGroup") ) ) )
     ,m_xContainer(_rxContainer)
 {
     DBG_CTOR(OGroupManager,NULL);
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 3be8f97f112b..734704c33c76 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -744,17 +744,17 @@ namespace frm
 
                     Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData();
                     ::rtl::OUString aQuote = xMeta->getIdentifierQuoteString();
-                    ::rtl::OUString aStatement = ::rtl::OUString::createFromAscii("SELECT ");
+                    ::rtl::OUString aStatement(RTL_CONSTASCII_USTRINGPARAM("SELECT "));
                     if (!aBoundFieldName.getLength())   // act like a combobox
-                        aStatement += ::rtl::OUString::createFromAscii("DISTINCT ");
+                        aStatement += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DISTINCT ") );
 
                     aStatement += quoteName(aQuote,aFieldName);
                     if (aBoundFieldName.getLength())
                     {
-                        aStatement += ::rtl::OUString::createFromAscii(", ");
+                        aStatement += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(", ") );
                         aStatement += quoteName(aQuote, aBoundFieldName);
                     }
-                    aStatement += ::rtl::OUString::createFromAscii(" FROM ");
+                    aStatement += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM ") );
 
                     ::rtl::OUString sCatalog, sSchema, sTable;
                     qualifiedNameComponents( xMeta, sListSource, sCatalog, sSchema, sTable, eInDataManipulation );
@@ -846,7 +846,7 @@ namespace frm
                         try
                         {
                             Reference< XPropertySet > xBoundField( xColumns->getByIndex( nBoundColumn ), UNO_QUERY_THROW );
-                            OSL_VERIFY( xBoundField->getPropertyValue( ::rtl::OUString::createFromAscii( "Type" ) ) >>= m_nBoundColumnType );
+                            OSL_VERIFY( xBoundField->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Type") ) ) >>= m_nBoundColumnType );
                         }
                         catch( const Exception& )
                         {
diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx
index abf2e33ae11b..68dbd633c85f 100644
--- a/forms/source/component/RadioButton.cxx
+++ b/forms/source/component/RadioButton.cxx
@@ -89,7 +89,7 @@ void SAL_CALL ORadioButtonControl::createPeer(const Reference<starawt::XToolkit>
     // (formerly this switch-off was done in the toolkit - but the correct place is here ...)
 //  Reference< XVclWindowPeer >  xVclWindowPeer( getPeer(), UNO_QUERY );
 //  if (xVclWindowPeer.is())
-//      xVclWindowPeer->setProperty(::rtl::OUString::createFromAscii("AutoToggle"), ::cppu::bool2any(sal_False));
+//      xVclWindowPeer->setProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoToggle")), ::cppu::bool2any(sal_False));
     // new order: do _not_ switch off the auto toggle because:
     // * today, it is not necessary anymore to handle the toggling ourself (everything works fine without it)
     // * without auto toggle, the AccessibleEvents as fired by the radio buttons are
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index 2c62e7960f69..f37c6bbeb89f 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -317,7 +317,7 @@ namespace frm
 
                     Sequence<PropertyValue> aArgs(1);
                     PropertyValue& rProp = aArgs.getArray()[0];
-                    rProp.Name = ::rtl::OUString::createFromAscii("Referer");
+                    rProp.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer") );
                     rProp.Value <<= xModel->getURL();
 
                     if (xDisp.is())
diff --git a/forms/source/helper/commandimageprovider.cxx b/forms/source/helper/commandimageprovider.cxx
index c8025bb66f1a..6b3599678543 100644
--- a/forms/source/helper/commandimageprovider.cxx
+++ b/forms/source/helper/commandimageprovider.cxx
@@ -82,7 +82,7 @@ namespace frm
         }
 
         // ICommandImageProvider
-        virtual CommandImages getCommandImages( const CommandURLs& _rCommandURLs, const bool _bLarge, const bool _bHiContrast ) const;
+        virtual CommandImages getCommandImages( const CommandURLs& _rCommandURLs, const bool _bLarge ) const;
 
     private:
         void    impl_init_nothrow( const ::comphelper::ComponentContext& _rContext, const Reference< XModel >& _rxDocument );
@@ -130,15 +130,14 @@ namespace frm
     }
 
     //--------------------------------------------------------------------
-    CommandImages DocumentCommandImageProvider::getCommandImages( const CommandURLs& _rCommandURLs, const bool _bLarge, const bool _bHiContrast ) const
+    CommandImages DocumentCommandImageProvider::getCommandImages( const CommandURLs& _rCommandURLs, const bool _bLarge ) const
     {
         const size_t nCommandCount = _rCommandURLs.getLength();
         CommandImages aImages( nCommandCount );
         try
         {
-            const sal_Int16 nImageType =
-                    ( _bLarge       ? ImageType::SIZE_LARGE         : ImageType::SIZE_DEFAULT )
-                +   ( _bHiContrast  ? ImageType::COLOR_HIGHCONTRAST : ImageType::COLOR_NORMAL );
+            const sal_Int16 nImageType = ImageType::COLOR_NORMAL
+                                       +  ( _bLarge ? ImageType::SIZE_LARGE : ImageType::SIZE_DEFAULT );
 
             Sequence< Reference< XGraphic > > aDocImages( nCommandCount );
             Sequence< Reference< XGraphic > > aModImages( nCommandCount );
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index d9f009ce21ae..a1771caf15c4 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -104,7 +104,7 @@ namespace frm
     // old macro for quickly implementing XServiceInfo::getImplementationName
     #define IMPLEMENTATION_NAME(ImplName)                                       \
     virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException) \
-        { return ::rtl::OUString::createFromAscii("com.sun.star.comp.forms.") + ::rtl::OUString::createFromAscii(#ImplName); }
+        { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.forms.") ) + ::rtl::OUString::createFromAscii(#ImplName); }
 
     class OControlModel;
 
diff --git a/forms/source/inc/commandimageprovider.hxx b/forms/source/inc/commandimageprovider.hxx
index 8fece35e50e9..caf19b4f2c5f 100644
--- a/forms/source/inc/commandimageprovider.hxx
+++ b/forms/source/inc/commandimageprovider.hxx
@@ -54,8 +54,7 @@ namespace frm
     public:
         virtual CommandImages   getCommandImages(
                                     const CommandURLs& _rCommandURLs,
-                                    const bool _bLarge,
-                                    const bool _bHiContrast
+                                    const bool _bLarge
                                 ) const = 0;
 
         virtual ~ICommandImageProvider() { }
diff --git a/forms/source/inc/forms_module_impl.hxx b/forms/source/inc/forms_module_impl.hxx
index 3269eec68df0..b3063b30546f 100644
--- a/forms/source/inc/forms_module_impl.hxx
+++ b/forms/source/inc/forms_module_impl.hxx
@@ -135,7 +135,7 @@ namespace FORMS_MODULE_NAMESPACE
         {
             ::rtl::OUString aMainKeyName(sRootKey);
             aMainKeyName += *pImplName;
-            aMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES");
+            aMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
 
             try
             {
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index 9235b085d14a..4d481274a681 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -96,7 +96,7 @@ lcl_hasVbaEvents( const Sequence< ScriptEventDescriptor >& sEvents  )
     const ScriptEventDescriptor* pEnd = ( pDesc + sEvents.getLength() );
     for ( ; pDesc != pEnd; ++pDesc )
     {
-        if ( pDesc->ScriptType.equals( rtl::OUString::createFromAscii( "VBAInterop" ) ) )
+        if ( pDesc->ScriptType.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VBAInterop") ) ) )
             return true;
     }
     return false;
@@ -112,7 +112,7 @@ lcl_stripVbaEvents( const Sequence< ScriptEventDescriptor >& sEvents )
     sal_Int32 nCopied = 0;
     for ( ; pDesc != pEnd; ++pDesc )
     {
-        if ( !pDesc->ScriptType.equals( rtl::OUString::createFromAscii( "VBAInterop" ) ) )
+        if ( !pDesc->ScriptType.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VBAInterop") ) ) )
         {
             sStripped[ nCopied++ ] = *pDesc;
         }
@@ -134,7 +134,7 @@ void OInterfaceContainer::impl_addVbEvents_nolck_nothrow(  const sal_Int32 i_nIn
                 break;
 
             Reference< XMultiServiceFactory > xDocFac( xDoc, UNO_QUERY_THROW );
-            Reference< XCodeNameQuery > xNameQuery( xDocFac->createInstance( rtl::OUString::createFromAscii( "ooo.vba.VBACodeNameProvider" ) ), UNO_QUERY );
+            Reference< XCodeNameQuery > xNameQuery( xDocFac->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo.vba.VBACodeNameProvider") ) ), UNO_QUERY );
             if ( !xNameQuery.is() )
                 break;
 
@@ -152,9 +152,9 @@ void OInterfaceContainer::impl_addVbEvents_nolck_nothrow(  const sal_Int32 i_nIn
 
             Reference< XPropertySet > xProps( xElement, UNO_QUERY_THROW );
             ::rtl::OUString sServiceName;
-            xProps->getPropertyValue( rtl::OUString::createFromAscii("DefaultControl" ) ) >>= sServiceName;
+            xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultControl") ) ) >>= sServiceName;
 
-            Reference< ooo::vba::XVBAToOOEventDescGen > xDescSupplier( m_xServiceFactory->createInstance( rtl::OUString::createFromAscii( "ooo.vba.VBAToOOEventDesc" ) ), UNO_QUERY_THROW );
+            Reference< ooo::vba::XVBAToOOEventDescGen > xDescSupplier( m_xServiceFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo.vba.VBAToOOEventDesc") ) ), UNO_QUERY_THROW );
             Reference< XInterface > xInterface = m_xServiceFactory->createInstance( sServiceName );
             Sequence< ScriptEventDescriptor > vbaEvents = xDescSupplier->getEventDescriptions( xInterface, sCodeName );
             // register the vba script events
diff --git a/forms/source/misc/limitedformats.cxx b/forms/source/misc/limitedformats.cxx
index 8d2e13e0ea69..a4707f03a25d 100644
--- a/forms/source/misc/limitedformats.cxx
+++ b/forms/source/misc/limitedformats.cxx
@@ -64,8 +64,8 @@ namespace frm
     //---------------------------------------------------------------------
     static const Locale& getLocale(LocaleType _eType)
     {
-        static const Locale s_aEnglishUS( ::rtl::OUString::createFromAscii("en"), ::rtl::OUString::createFromAscii("us"), ::rtl::OUString() );
-        static const Locale s_aGerman( ::rtl::OUString::createFromAscii("de"), ::rtl::OUString::createFromAscii("DE"), ::rtl::OUString() );
+        static const Locale s_aEnglishUS( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en") ), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("us") ), ::rtl::OUString() );
+        static const Locale s_aGerman( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de") ), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE") ), ::rtl::OUString() );
         static const ::rtl::OUString s_sEmptyString;
         static const Locale s_aSystem( s_sEmptyString, s_sEmptyString, s_sEmptyString );
 
@@ -342,7 +342,7 @@ namespace frm
 
             if (!bFoundIt)
             {   // somebody gave us an format which we can't translate
-                ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii("This control supports only a very limited number of formats.");
+                ::rtl::OUString sMessage (RTL_CONSTASCII_USTRINGPARAM("This control supports only a very limited number of formats.") );
                 throw IllegalArgumentException(sMessage, NULL, 2);
             }
 
diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx
index 2732b86bfc8f..597cb2effb9d 100644
--- a/forms/source/misc/services.cxx
+++ b/forms/source/misc/services.cxx
@@ -134,7 +134,7 @@ void registerClassInfo(
 //.......................................................................................
 #define REGISTER_CLASS_CORE(classImplName) \
     registerClassInfo( \
-        ::rtl::OUString::createFromAscii("com.sun.star.form.") + ::rtl::OUString::createFromAscii(#classImplName), \
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.") ) + ::rtl::OUString::createFromAscii(#classImplName), \
         aServices, \
         frm::classImplName##_CreateInstance)
 
@@ -229,7 +229,7 @@ void ensureClassInfos()
     aServices.getArray()[2] = frm::FRM_SUN_COMPONENT_DATABASE_FORMATTEDFIELD;
     aServices.getArray()[3] = frm::BINDABLE_DATABASE_FORMATTED_FIELD;
 
-    registerClassInfo(::rtl::OUString::createFromAscii("com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted"),
+    registerClassInfo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted") ),
         aServices,
         frm::OFormattedFieldWrapper_CreateInstance_ForceFormatted);
 
@@ -287,9 +287,9 @@ void ensureClassInfos()
 //---------------------------------------------------------------------------------------
 void registerServiceProvider(const ::rtl::OUString& _rServiceImplName, const Sequence< ::rtl::OUString >& _rServices, XRegistryKey* _pKey)
 {
-    ::rtl::OUString sMainKeyName = ::rtl::OUString::createFromAscii("/");
+    ::rtl::OUString sMainKeyName (RTL_CONSTASCII_USTRINGPARAM("/") );
     sMainKeyName += _rServiceImplName;
-    sMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES");
+    sMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") );
     Reference< XRegistryKey > xNewKey = _pKey->createKey(sMainKeyName);
     OSL_ENSURE(xNewKey.is(), "forms::registerProvider : could not create a registry key !");
     if (!xNewKey.is())
diff --git a/forms/source/resource/makefile.mk b/forms/source/resource/makefile.mk
index cde68a98a339..39ffdca28daf 100644
--- a/forms/source/resource/makefile.mk
+++ b/forms/source/resource/makefile.mk
@@ -42,7 +42,9 @@ SRC1FILES= \
     strings.src 	\
     xforms.src
 
-SLOFILES=	$(SLO)$/frm_resource.obj \
+EXCEPTIONSFILES=	$(SLO)$/frm_resource.obj
+
+SLOFILES=		$(EXCEPTIONSFILES)
 
 # --- Targets ----------------------------------
 
diff --git a/forms/source/richtext/makefile.mk b/forms/source/richtext/makefile.mk
index 5c62a1a9e675..b7d08ef379e6 100644
--- a/forms/source/richtext/makefile.mk
+++ b/forms/source/richtext/makefile.mk
@@ -38,21 +38,21 @@ TARGET=richtext
 # --- Files -------------------------------------
 
 EXCEPTIONSFILES=\
-            $(SLO)$/richtextunowrapper.obj \
-            $(SLO)$/richtextmodel.obj \
-            $(SLO)$/richtextcontrol.obj \
-            $(SLO)$/featuredispatcher.obj \
-            $(SLO)$/clipboarddispatcher.obj \
             $(SLO)$/attributedispatcher.obj \
+            $(SLO)$/clipboarddispatcher.obj \
+            $(SLO)$/featuredispatcher.obj \
             $(SLO)$/parametrizedattributedispatcher.obj \
-            $(SLO)$/specialdispatchers.obj \
+            $(SLO)$/richtextcontrol.obj \
             $(SLO)$/richtextengine.obj \
-            $(SLO)$/richtextimplcontrol.obj
-
-SLOFILES=	$(EXCEPTIONSFILES) \
+            $(SLO)$/richtextimplcontrol.obj \
+            $(SLO)$/richtextmodel.obj \
+            $(SLO)$/richtextunowrapper.obj \
             $(SLO)$/richtextvclcontrol.obj \
             $(SLO)$/richtextviewport.obj \
             $(SLO)$/rtattributehandler.obj \
+            $(SLO)$/specialdispatchers.obj
+
+SLOFILES=	$(EXCEPTIONSFILES)
 
 # --- Targets ----------------------------------
 
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index dd71a80f9172..527e20cc75f3 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -375,7 +375,7 @@ namespace frm
     void ORichTextPeer::dispose( ) throw(RuntimeException)
     {
         {
-            ::osl::SolarGuard aGuard( GetMutex() );
+            SolarMutexGuard aGuard;
             RichTextControl* pRichTextControl = static_cast< RichTextControl* >( GetWindow() );
 
             if ( pRichTextControl )
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index 601af810779b..7744168f9ef4 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -414,7 +414,7 @@ namespace frm
 
                 ::rtl::OUString sValue = ::rtl::OUString::valueOf( sal_Int32( nCount ) );
                 if ( !bFinalCount )
-                    sValue += ::rtl::OUString::createFromAscii( " *" );
+                    sValue += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" *") );
 
                 aState.State <<= sValue;
                 aState.Enabled = sal_True;
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index 7e5974971283..b1c6f0d3a588 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -369,8 +369,6 @@ namespace frm
         if ( !m_pImageProvider )
             return;
 
-        const bool bIsHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
         const USHORT nItemCount = m_pToolbar->GetItemCount();
 
         // collect the FormFeatures in the toolbar
@@ -396,7 +394,7 @@ namespace frm
         }
 
         // retrieve the images for the command URLs
-        CommandImages aCommandImages = m_pImageProvider->getCommandImages( aCommandURLs, m_eImageSize == eLarge, bIsHighContrast );
+        CommandImages aCommandImages = m_pImageProvider->getCommandImages( aCommandURLs, m_eImageSize == eLarge );
 
         // and set them at the toolbar
         CommandImages::const_iterator commandImage = aCommandImages.begin();
@@ -547,9 +545,6 @@ namespace frm
         m_pToolbar->SetControlBackground();
         forEachItemWindow( &NavigationToolBar::setItemBackground, NULL );
 
-        // the contrast of the background color may have changed, so force
-        // the images to be rebuild (high contrast requires a possibly different
-        // image set)
         implUpdateImages();
     }
 
@@ -560,9 +555,6 @@ namespace frm
         m_pToolbar->SetControlBackground( _rColor );
         forEachItemWindow( &NavigationToolBar::setItemBackground, &_rColor );
 
-        // the contrast of the background color may have changed, so force
-        // the images to be rebuild (high contrast requires a possibly different
-        // image set)
         implUpdateImages();
     }
 
diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx
index 244e1443e6cb..20509dd30040 100644
--- a/forms/source/xforms/model_ui.cxx
+++ b/forms/source/xforms/model_ui.cxx
@@ -954,7 +954,7 @@ OUString Model::getResultForExpression(
             pBinding->getMIPEvaluationContexts();
         for( std::vector<EvaluationContext>::iterator aIter = aContext.begin();
              aIter != aContext.end();
-             aIter ++ )
+             ++aIter )
         {
             aExpression.evaluate( *aIter );
             aBuffer.append( lcl_serializeForDisplay(aExpression.getXPath()) );
diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx
index deafc88cb5e9..aece48afe574 100644
--- a/forms/source/xforms/submission.cxx
+++ b/forms/source/xforms/submission.cxx
@@ -665,7 +665,7 @@ Reference< XDocumentFragment > Submission::createSubmissionDocument(const Refere
 {
     using namespace com::sun::star::xml::xpath;
     Reference< XDocumentBuilder > aDocBuilder(m_aFactory->createInstance(
-        OUString::createFromAscii("com.sun.star.xml.dom.DocumentBuilder")), UNO_QUERY);
+        OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.dom.DocumentBuilder"))), UNO_QUERY);
     Reference< XDocument > aDocument = aDocBuilder->newDocument();
     Reference< XDocumentFragment > aFragment = aDocument->createDocumentFragment();
 
diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx
index da5968bc0123..cfcdb1626439 100644
--- a/forms/source/xforms/submission/replace.cxx
+++ b/forms/source/xforms/submission/replace.cxx
@@ -67,19 +67,18 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla
 
             if (!xLoader.is())
                 xLoader = Reference< XComponentLoader >(xFactory->createInstance(
-                    ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")), UNO_QUERY_THROW);
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop") ) ), UNO_QUERY_THROW);
 
             // open the stream from the result...
             // build media descriptor
             Sequence< PropertyValue > descriptor(2);
-            descriptor[0] = PropertyValue(::rtl::OUString::createFromAscii(
-                "InputStream"), -1, makeAny(m_aResultStream), PropertyState_DIRECT_VALUE);
-            descriptor[1] = PropertyValue(::rtl::OUString::createFromAscii(
-                "ReadOnly"), -1, makeAny(sal_True), PropertyState_DIRECT_VALUE);
+            descriptor[0] = PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream") ),
+                -1, makeAny(m_aResultStream), PropertyState_DIRECT_VALUE);
+            descriptor[1] = PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly") ),
+                -1, makeAny(sal_True), PropertyState_DIRECT_VALUE);
 
-            //::rtl::OUString aURL = ::rtl::OUString::createFromAscii("private:stream");
             ::rtl::OUString aURL = m_aURLObj.GetMainURL(INetURLObject::NO_DECODE);
-            ::rtl::OUString aTarget = ::rtl::OUString::createFromAscii("_default");
+            ::rtl::OUString aTarget = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default") );
             xLoader->loadComponentFromURL(aURL, aTarget, FrameSearchFlag::ALL, descriptor);
 
             return CSubmission::SUCCESS;
@@ -88,7 +87,7 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla
             if (aDocument.is()) {
                 // parse the result stream into a new document
                 Reference< XDocumentBuilder > xBuilder(xFactory->createInstance(
-                    ::rtl::OUString::createFromAscii("com.sun.star.xml.dom.DocumentBuilder")), UNO_QUERY_THROW);
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.dom.DocumentBuilder") ) ), UNO_QUERY_THROW);
                 Reference< XDocument > aNewDocument = xBuilder->parse(m_aResultStream);
 
                 if (aNewDocument.is()) {
@@ -96,7 +95,6 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla
                     Reference< XElement > oldRoot = aDocument->getDocumentElement();
                     Reference< XElement > newRoot = aNewDocument->getDocumentElement();
 
-                    // aDocument->removeChild(Reference< XNode >(oldRoot, UNO_QUERY_THROW));
                     Reference< XNode > aImportedNode = aDocument->importNode(Reference< XNode >(newRoot, UNO_QUERY_THROW), sal_True);
                     Reference< XNode >(aDocument, UNO_QUERY_THROW)->replaceChild(aImportedNode, Reference< XNode >(oldRoot, UNO_QUERY_THROW));
                     return CSubmission::SUCCESS;
@@ -131,7 +129,7 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla
         pHelper->m_aInteractionHandler = _xHandler;
     else
         pHelper->m_aInteractionHandler = CSS::uno::Reference< XInteractionHandler >(m_aFactory->createInstance(
-        ::rtl::OUString::createFromAscii("com.sun.star.task.InteractionHandler")), UNO_QUERY);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler") ) ), UNO_QUERY);
     OSL_ENSURE(pHelper->m_aInteractionHandler.is(), "failed to create IntreractionHandler");
 
     CProgressHandlerHelper *pProgressHelper = new CProgressHandlerHelper;
diff --git a/forms/source/xforms/submission/serialization_app_xml.cxx b/forms/source/xforms/submission/serialization_app_xml.cxx
index 76989ad7fdfb..c3e2ab545668 100644
--- a/forms/source/xforms/submission/serialization_app_xml.cxx
+++ b/forms/source/xforms/submission/serialization_app_xml.cxx
@@ -45,7 +45,7 @@
 CSerializationAppXML::CSerializationAppXML()
     : m_aFactory(utl::getProcessServiceFactory())
     , m_aPipe(CSS::uno::Reference< CSS::io::XOutputStream > (m_aFactory->createInstance(
-        rtl::OUString::createFromAscii("com.sun.star.io.Pipe")), CSS::uno::UNO_QUERY))
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe") ) ), CSS::uno::UNO_QUERY))
 {
     OSL_ENSURE(m_aPipe.is(), "cannot create Pipe");
 }
diff --git a/forms/source/xforms/submission/serialization_urlencoded.cxx b/forms/source/xforms/submission/serialization_urlencoded.cxx
index cb6403c8d13e..e5ab54533e61 100644
--- a/forms/source/xforms/submission/serialization_urlencoded.cxx
+++ b/forms/source/xforms/submission/serialization_urlencoded.cxx
@@ -52,7 +52,7 @@ using namespace CSS::xml::dom;
 CSerializationURLEncoded::CSerializationURLEncoded()
     : m_aFactory(getProcessServiceFactory())
     , m_aPipe(Reference< XOutputStream > (m_aFactory->createInstance(
-        ::rtl::OUString::createFromAscii("com.sun.star.io.Pipe")), UNO_QUERY))
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe") ) ), UNO_QUERY))
 {
 }
 
diff --git a/forms/source/xforms/submission/submission_get.cxx b/forms/source/xforms/submission/submission_get.cxx
index 95d1ce3ce2be..c8e87fa68a04 100644
--- a/forms/source/xforms/submission/submission_get.cxx
+++ b/forms/source/xforms/submission/submission_get.cxx
@@ -71,7 +71,7 @@ CSubmission::SubmissionResult CSubmissionGet::submit(const CSS::uno::Reference<
         pHelper->m_aInteractionHandler = aInteractionHandler;
     else
         pHelper->m_aInteractionHandler = CSS::uno::Reference< XInteractionHandler >(m_aFactory->createInstance(
-            OUString::createFromAscii("com.sun.star.task.InteractionHandler")), UNO_QUERY);
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler"))), UNO_QUERY);
     OSL_ENSURE(pHelper->m_aInteractionHandler.is(), "failed to create IntreractionHandler");
     CProgressHandlerHelper *pProgressHelper = new CProgressHandlerHelper;
     pHelper->m_aProgressHandler = CSS::uno::Reference< XProgressHandler >(pProgressHelper);
@@ -98,7 +98,7 @@ CSubmission::SubmissionResult CSubmissionGet::submit(const CSS::uno::Reference<
         OUString aQueryURL = OStringToOUString(aUTF8QueryURL.makeStringAndClear(), RTL_TEXTENCODING_UTF8);
         ucbhelper::Content aContent(aQueryURL, aEnvironment);
         CSS::uno::Reference< XOutputStream > aPipe(m_aFactory->createInstance(
-            OUString::createFromAscii("com.sun.star.io.Pipe")), UNO_QUERY_THROW);
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe"))), UNO_QUERY_THROW);
         aContent.openStream(aPipe);
         // get reply
         try {
diff --git a/forms/source/xforms/submission/submission_post.cxx b/forms/source/xforms/submission/submission_post.cxx
index fc2fde7d3668..c76d492873d9 100644
--- a/forms/source/xforms/submission/submission_post.cxx
+++ b/forms/source/xforms/submission/submission_post.cxx
@@ -67,15 +67,12 @@ CSubmission::SubmissionResult CSubmissionPost::submit(const CSS::uno::Reference<
 
         // use post command
 
-        OUString aCommandName = OUString::createFromAscii("post");
+        OUString aCommandName(RTL_CONSTASCII_USTRINGPARAM("post"));
         PostCommandArgument2 aPostArgument;
         aPostArgument.Source = apSerialization->getInputStream();
-        //CSS::uno::Reference< XInterface > aSink( m_aFactory->createInstance(
-        //    OUString::createFromAscii("com.sun.star.io.Pipe")), UNO_QUERY_THROW);
         CSS::uno::Reference< XActiveDataSink > aSink(new ucbhelper::ActiveDataSink);
-        //    OUString::createFromAscii("com.sun.star.io.Pipe")), UNO_QUERY_THROW);
         aPostArgument.Sink = aSink;
-        aPostArgument.MediaType = OUString::createFromAscii("application/xml");
+        aPostArgument.MediaType = OUString(RTL_CONSTASCII_USTRINGPARAM("application/xml"));
         aPostArgument.Referer = OUString();
         Any aCommandArgument;
         aCommandArgument <<= aPostArgument;
diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx
index 26bc2b7640fc..28ff7941996c 100644
--- a/forms/source/xforms/xpathlib/extension.cxx
+++ b/forms/source/xforms/xpathlib/extension.cxx
@@ -46,22 +46,19 @@ using com::sun::star::xml::dom::XNode;
 Reference< XInterface > SAL_CALL CLibxml2XFormsExtension::Create(
     const Reference< XMultiServiceFactory >& /*aFactory*/)
 {
-    // printf("_create_\n");
     Reference< XInterface > aInstance(static_cast< XXPathExtension* >(new CLibxml2XFormsExtension(/*aFactory*/)));
     return aInstance;
 }
 
 ::rtl::OUString SAL_CALL CLibxml2XFormsExtension::getImplementationName_Static()
 {
-    // printf("_implname_\n");
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.xml.xpath.XFormsExtension");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.xml.xpath.XFormsExtension") );
 }
 
 Sequence< ::rtl::OUString > SAL_CALL CLibxml2XFormsExtension::getSupportedServiceNames_Static()
 {
-    // printf("_services_\n");
     Sequence< ::rtl::OUString > aSequence(1);
-    aSequence[0] = ::rtl::OUString::createFromAscii("com.sun.star.xml.xpath.XPathExtension");
+    aSequence[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.xpath.XPathExtension") );
     return aSequence;
 }
 
diff --git a/forms/source/xforms/xpathlib/xpathlib.cxx b/forms/source/xforms/xpathlib/xpathlib.cxx
index 49918c7c8b6f..9a6f59a1592f 100644
--- a/forms/source/xforms/xpathlib/xpathlib.cxx
+++ b/forms/source/xforms/xpathlib/xpathlib.cxx
@@ -211,7 +211,7 @@ void xforms_countNonEmptyFunction(xmlXPathParserContextPtr ctxt, int nargs)
     for (int i = 0; i <  xmlXPathNodeSetGetLength(pNodeSet); i++)
     {
         aString = xmlXPathCastNodeToString(xmlXPathNodeSetItem(pNodeSet, i));
-        if (strlen((char*)aString) > 0) nNotEmpty++;
+        if (*aString != 0) nNotEmpty++;
     }
     xmlXPathReturnNumber(ctxt, nNotEmpty);
 }
@@ -311,10 +311,10 @@ static sal_Bool parseDateTime(const ::rtl::OUString& aString, DateTime& aDateTim
     sal_Int32 nDateLength = 10;
     sal_Int32 nTimeLength = 8;
 
-    ::rtl::OUString aDateTimeSep = ::rtl::OUString::createFromAscii("T");
-    ::rtl::OUString aDateSep = ::rtl::OUString::createFromAscii("-");
-    ::rtl::OUString aTimeSep = ::rtl::OUString::createFromAscii(":");
-    ::rtl::OUString aUTCString = ::rtl::OUString::createFromAscii("Z");
+    ::rtl::OUString aDateTimeSep(RTL_CONSTASCII_USTRINGPARAM("T"));
+    ::rtl::OUString aDateSep(RTL_CONSTASCII_USTRINGPARAM("-"));
+    ::rtl::OUString aTimeSep(RTL_CONSTASCII_USTRINGPARAM(":"));
+    ::rtl::OUString aUTCString(RTL_CONSTASCII_USTRINGPARAM("Z"));
 
     ::rtl::OUString aDateString = aDateTimeString.copy(0, nDateLength);
     ::rtl::OUString aTimeString = aDateTimeString.copy(nDateLength+1, nTimeLength);
diff --git a/forms/source/xforms/xpathlib/xpathlib.hxx b/forms/source/xforms/xpathlib/xpathlib.hxx
index 109f32837591..2a74c1899bc8 100644
--- a/forms/source/xforms/xpathlib/xpathlib.hxx
+++ b/forms/source/xforms/xpathlib/xpathlib.hxx
@@ -16,38 +16,11 @@
  * An XPath parser context. It contains pure parsing informations,
  * an xmlXPathContext, and the stack of objects.
  */
-#if 0
-// for reference from xpath.h
-struct _xmlXPathParserContext {
-    const xmlChar *cur;         /* the current char being parsed */
-    const xmlChar *base;            /* the full expression */
-
-    int error;              /* error code */
-
-    xmlXPathContextPtr  context;    /* the evaluation context */
-    xmlXPathObjectPtr     value;    /* the current value */
-    int                 valueNr;    /* number of values stacked */
-    int                valueMax;    /* max number of values stacked */
-    xmlXPathObjectPtr *valueTab;    /* stack of values */
-
-    xmlXPathCompExprPtr comp;       /* the precompiled expression */
-    int xptr;               /* it this an XPointer expression */
-    xmlNodePtr         ancestor;    /* used for walking preceding axis */
-};
-
-#endif
 
 extern "C"
 {
 
 // XForms
-/*
-void xforms_getInstanceDocumentFunction(xmlXPathParserContextPtr ctxt, int nargs);
-void xforms_rebuildFunction(xmlXPathParserContextPtr ctxt, int nargs);
-void xforms_recalculateFunction(xmlXPathParserContextPtr ctxt, int nargs);
-void xforms_revalidateFunction(xmlXPathParserContextPtr ctxt, int nargs);
-void xforms_refreshFunction(xmlXPathParserContextPtr ctxt, int nargs);
-*/
 
 // XForms Core Functions
 // boolean functions
diff --git a/formula/inc/formula/funcutl.hxx b/formula/inc/formula/funcutl.hxx
index 8f47e072018e..110084dd6419 100644
--- a/formula/inc/formula/funcutl.hxx
+++ b/formula/inc/formula/funcutl.hxx
@@ -78,9 +78,7 @@ class FORMULA_DLLPUBLIC RefButton : public ImageButton
 {
 private:
     Image               aImgRefStart;   /// Start reference input
-    Image               aImgRefStartHC; /// Start reference input (high contrast)
     Image               aImgRefDone;    /// Stop reference input
-    Image               aImgRefDoneHC;  /// Stop reference input (high contrast)
     IControlReferenceHandler*      pAnyRefDlg;     // parent dialog
     RefEdit*            pRefEdit;       // zugeordnetes Edit-Control
 
diff --git a/formula/source/ui/dlg/formdlgs.hrc b/formula/source/ui/dlg/formdlgs.hrc
index 9e6378a53d2c..4f76ba9681e1 100644
--- a/formula/source/ui/dlg/formdlgs.hrc
+++ b/formula/source/ui/dlg/formdlgs.hrc
@@ -68,10 +68,6 @@
 #define BMP_STR_OPEN        2
 #define BMP_STR_END         3
 #define BMP_STR_ERROR       4
-#define BMP_STR_CLOSE_H     11
-#define BMP_STR_OPEN_H      12
-#define BMP_STR_END_H       13
-#define BMP_STR_ERROR_H     14
 
 // Texte
 #define STR_STRUCT_ERR1     1
diff --git a/formula/source/ui/dlg/formdlgs.src b/formula/source/ui/dlg/formdlgs.src
index c85aa561ced8..fde1a7d44ca7 100644
--- a/formula/source/ui/dlg/formdlgs.src
+++ b/formula/source/ui/dlg/formdlgs.src
@@ -111,41 +111,21 @@ TabPage RID_FORMULATAB_STRUCT
         ImageBitmap = Bitmap { File = "fapclose.bmp"; };
         MaskColor = STD_MASKCOLOR;
     };
-    Image BMP_STR_CLOSE_H
-    {
-        ImageBitmap = Bitmap { File = "fapclose_h.bmp"; };
-        MaskColor = STD_MASKCOLOR;
-    };
     Image BMP_STR_OPEN
     {
         ImageBitmap = Bitmap { File = "fapopen.bmp"; };
         MaskColor = STD_MASKCOLOR;
     };
-    Image BMP_STR_OPEN_H
-    {
-        ImageBitmap = Bitmap { File = "fapopen_h.bmp"; };
-        MaskColor = STD_MASKCOLOR;
-    };
     Image BMP_STR_END
     {
         ImageBitmap = Bitmap { File = "fapok.bmp"; };
         MaskColor = STD_MASKCOLOR;
     };
-    Image BMP_STR_END_H
-    {
-        ImageBitmap = Bitmap { File = "fapok_h.bmp"; };
-        MaskColor = STD_MASKCOLOR;
-    };
     Image BMP_STR_ERROR
     {
         ImageBitmap = Bitmap { File = "faperror.bmp"; };
         MaskColor = STD_MASKCOLOR;
     };
-    Image BMP_STR_ERROR_H
-    {
-        ImageBitmap = Bitmap { File = "faperror_h.bmp"; };
-        MaskColor = STD_MASKCOLOR;
-    };
     String STR_STRUCT_ERR1
     {
         Text [ en-US ] = "=?" ;
@@ -485,15 +465,6 @@ Image RID_BMP_REFBTN1
     MaskColor = STD_MASKCOLOR;
 };
 
-Image RID_BMP_REFBTN1_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "refinp1_h.bmp";
-    };
-    MaskColor = STD_MASKCOLOR;
-};
-
 Image RID_BMP_REFBTN2
 {
     ImageBitmap = Bitmap
@@ -502,35 +473,3 @@ Image RID_BMP_REFBTN2
     };
     MaskColor = STD_MASKCOLOR;
 };
-
-Image RID_BMP_REFBTN2_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "refinp2_h.bmp";
-    };
-    MaskColor = STD_MASKCOLOR;
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index bc4449f7c40d..d52217be5e18 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -1665,7 +1665,7 @@ BOOL FormulaDlg_Impl::CheckMatrix(String& aFormula)
     aTabCtrl.SetCurPageId(TP_STRUCT);
     return bMatrix;
 }
-IMPL_LINK( FormulaDlg_Impl, StructSelHdl, StructPage*, pStruP )
+IMPL_LINK( FormulaDlg_Impl, StructSelHdl, StructPage*, EMPTYARG )
 {
     bStructUpdate=FALSE;
     if(pStructPage->IsVisible())    aBtnForward.Enable(FALSE); //@New
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 41b89fd34491..0e294a284f76 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -1032,9 +1032,7 @@ IMPL_LINK( RefEdit, UpdateHdl, Timer*, EMPTYARG )
 RefButton::RefButton( Window* _pParent, const ResId& rResId) :
     ImageButton( _pParent, rResId ),
     aImgRefStart( ModuleRes( RID_BMP_REFBTN1 ) ),
-    aImgRefStartHC( ModuleRes( RID_BMP_REFBTN1_H ) ),
     aImgRefDone( ModuleRes( RID_BMP_REFBTN2 ) ),
-    aImgRefDoneHC( ModuleRes( RID_BMP_REFBTN2_H ) ),
     pAnyRefDlg( NULL ),
     pRefEdit( NULL )
 {
@@ -1044,9 +1042,7 @@ RefButton::RefButton( Window* _pParent, const ResId& rResId) :
 RefButton::RefButton( Window* _pParent, const ResId& rResId, RefEdit* pEdit, IControlReferenceHandler* _pDlg ) :
     ImageButton( _pParent, rResId ),
     aImgRefStart( ModuleRes( RID_BMP_REFBTN1 ) ),
-    aImgRefStartHC( ModuleRes( RID_BMP_REFBTN1_H ) ),
     aImgRefDone( ModuleRes( RID_BMP_REFBTN2 ) ),
-    aImgRefDoneHC( ModuleRes( RID_BMP_REFBTN2_H ) ),
     pAnyRefDlg( _pDlg ),
     pRefEdit( pEdit )
 {
@@ -1056,13 +1052,11 @@ RefButton::RefButton( Window* _pParent, const ResId& rResId, RefEdit* pEdit, ICo
 void RefButton::SetStartImage()
 {
     SetModeImage( aImgRefStart );
-    SetModeImage( aImgRefStartHC, BMP_COLOR_HIGHCONTRAST );
 }
 
 void RefButton::SetEndImage()
 {
     SetModeImage( aImgRefDone );
-    SetModeImage( aImgRefDoneHC, BMP_COLOR_HIGHCONTRAST );
 }
 
 void RefButton::SetReferences( IControlReferenceHandler* pDlg, RefEdit* pEdit )
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index e651dec89ee4..520b8ebfdbb6 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -82,7 +82,6 @@ ParaWin::ParaWin(Window* pParent,IControlReferenceHandler* _pDlg,Point aPos):
     m_sRequired     ( ModuleRes( STR_REQUIRED ) ),
     bRefMode        (FALSE)
 {
-    Image aFxHC( ModuleRes( IMG_FX_H ) );
     FreeResource();
     aDefaultString=aFtEditDesc.GetText();
 
@@ -95,11 +94,6 @@ ParaWin::ParaWin(Window* pParent,IControlReferenceHandler* _pDlg,Point aPos):
     aSlider.SetEndScrollHdl( LINK( this, ParaWin, ScrollHdl ) );
     aSlider.SetScrollHdl( LINK( this, ParaWin, ScrollHdl ) );
 
-    aBtnFx1.SetModeImage( aFxHC, BMP_COLOR_HIGHCONTRAST );
-    aBtnFx2.SetModeImage( aFxHC, BMP_COLOR_HIGHCONTRAST );
-    aBtnFx3.SetModeImage( aFxHC, BMP_COLOR_HIGHCONTRAST );
-    aBtnFx4.SetModeImage( aFxHC, BMP_COLOR_HIGHCONTRAST );
-
     InitArgInput( 0, aFtArg1, aBtnFx1, aEdArg1, aRefBtn1);
     InitArgInput( 1, aFtArg2, aBtnFx2, aEdArg2, aRefBtn2);
     InitArgInput( 2, aFtArg3, aBtnFx3, aEdArg3, aRefBtn3);
diff --git a/formula/source/ui/dlg/parawin.hrc b/formula/source/ui/dlg/parawin.hrc
index f6367c6259db..e7ef4c43c5b6 100644
--- a/formula/source/ui/dlg/parawin.hrc
+++ b/formula/source/ui/dlg/parawin.hrc
@@ -47,7 +47,6 @@
 #define RB_ARG3             18
 #define RB_ARG4             19
 #define WND_SLIDER          20
-#define IMG_FX_H            30
 
 #define STR_OPTIONAL        1
 #define STR_REQUIRED        2
diff --git a/formula/source/ui/dlg/parawin.src b/formula/source/ui/dlg/parawin.src
index eda2bfcecda9..8af91786d699 100644
--- a/formula/source/ui/dlg/parawin.src
+++ b/formula/source/ui/dlg/parawin.src
@@ -161,29 +161,4 @@ TabPage RID_FORMULATAB_PARAMETER
     {
         Text [ en-US ] = "(required)" ;
     };
-
-    Image IMG_FX_H
-    {
-        ImageBitmap = Bitmap { File = "fx_h.bmp" ; };
-        MaskColor = STD_MASKCOLOR;
-    };
-
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index ea2569248823..537b0ec6b720 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -61,14 +61,10 @@ StructListBox::StructListBox(Window* pParent, const ResId& rResId ):
 
 SvLBoxEntry* StructListBox::InsertStaticEntry(
         const XubString& rText,
-        const Image& rEntryImg, const Image& rEntryImgHC,
+        const Image& rEntryImg,
         SvLBoxEntry* pParent, ULONG nPos, IFormulaToken* pToken )
 {
     SvLBoxEntry* pEntry = InsertEntry( rText, rEntryImg, rEntryImg, pParent, FALSE, nPos, pToken );
-    SvLBoxContextBmp* pBmpItem = static_cast< SvLBoxContextBmp* >( pEntry->GetFirstItem( SV_ITEM_ID_LBOXCONTEXTBMP ) );
-    DBG_ASSERT( pBmpItem, "StructListBox::InsertStaticEntry - missing item" );
-    pBmpItem->SetBitmap1( rEntryImgHC, BMP_COLOR_HIGHCONTRAST );
-    pBmpItem->SetBitmap2( rEntryImgHC, BMP_COLOR_HIGHCONTRAST );
     return pEntry;
 }
 
@@ -109,18 +105,14 @@ StructPage::StructPage(Window* pParent):
     aTlbStruct      ( this, ModuleRes( TLB_STRUCT ) ),
     maImgEnd        ( ModuleRes( BMP_STR_END ) ),
     maImgError      ( ModuleRes( BMP_STR_ERROR ) ),
-    maImgEndHC      ( ModuleRes( BMP_STR_END_H ) ),
-    maImgErrorHC    ( ModuleRes( BMP_STR_ERROR_H ) ),
     pSelectedToken  ( NULL )
 {
     aTlbStruct.SetWindowBits(WB_HASLINES|WB_CLIPCHILDREN|
                         WB_HASBUTTONS|WB_HSCROLL|WB_NOINITIALSELECTION);
 
     aTlbStruct.SetNodeDefaultImages();
-    aTlbStruct.SetDefaultExpandedEntryBmp( Image( ModuleRes( BMP_STR_OPEN ) ) );
+    aTlbStruct.SetDefaultExpandedEntryBmp(  Image( ModuleRes( BMP_STR_OPEN  ) ) );
     aTlbStruct.SetDefaultCollapsedEntryBmp( Image( ModuleRes( BMP_STR_CLOSE ) ) );
-    aTlbStruct.SetDefaultExpandedEntryBmp( Image( ModuleRes( BMP_STR_OPEN_H ) ), BMP_COLOR_HIGHCONTRAST );
-    aTlbStruct.SetDefaultCollapsedEntryBmp( Image( ModuleRes( BMP_STR_CLOSE_H ) ), BMP_COLOR_HIGHCONTRAST );
 
     FreeResource();
 
@@ -145,10 +137,10 @@ SvLBoxEntry* StructPage::InsertEntry( const XubString& rText, SvLBoxEntry* pPare
             pEntry = aTlbStruct.InsertEntry( rText, pParent, FALSE, nPos, pIFormulaToken );
         break;
         case STRUCT_END:
-            pEntry = aTlbStruct.InsertStaticEntry( rText, maImgEnd, maImgEndHC, pParent, nPos, pIFormulaToken );
+            pEntry = aTlbStruct.InsertStaticEntry( rText, maImgEnd, pParent, nPos, pIFormulaToken );
         break;
         case STRUCT_ERROR:
-            pEntry = aTlbStruct.InsertStaticEntry( rText, maImgError, maImgErrorHC, pParent, nPos, pIFormulaToken );
+            pEntry = aTlbStruct.InsertStaticEntry( rText, maImgError, pParent, nPos, pIFormulaToken );
         break;
     }
 
diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx
index 98a0be4b84cc..6146e2bca535 100644
--- a/formula/source/ui/dlg/structpg.hxx
+++ b/formula/source/ui/dlg/structpg.hxx
@@ -63,7 +63,6 @@ public:
     SvLBoxEntry*    InsertStaticEntry(
                         const XubString& rText,
                         const Image& rEntryImg,
-                        const Image& rEntryImgHC,
                         SvLBoxEntry* pParent = NULL,
                         ULONG nPos = LIST_APPEND,
                         IFormulaToken* pToken = NULL );
@@ -87,8 +86,6 @@ private:
     StructListBox   aTlbStruct;
     Image           maImgEnd;
     Image           maImgError;
-    Image           maImgEndHC;
-    Image           maImgErrorHC;
 
     IFormulaToken*  pSelectedToken;
 
diff --git a/formula/source/ui/inc/ForResId.hrc b/formula/source/ui/inc/ForResId.hrc
index 32b59f296cec..bf2e4c3f750a 100644
--- a/formula/source/ui/inc/ForResId.hrc
+++ b/formula/source/ui/inc/ForResId.hrc
@@ -55,9 +55,7 @@
 
 // bitmap
 #define RID_BMP_REFBTN1                             (RID_BITMAP_START + 0)
-#define RID_BMP_REFBTN1_H                           (RID_BITMAP_START + 1)
 #define RID_BMP_REFBTN2                             (RID_BITMAP_START + 2)
-#define RID_BMP_REFBTN2_H                           (RID_BITMAP_START + 3)
 
 
 // pages
@@ -67,8 +65,6 @@
 #define RID_FORMULATAB_PARAMETER                    (RID_PAGE_START + 3)
 #define RID_FORMULADLG_FORMULA_MODAL                (RID_PAGE_START + 4)
 
-// misc
-
 // -----------------------------------------------------------------------
 
 #endif          // FORMULA_FORRESID_HRC
diff --git a/fpicker/source/aqua/FPentry.cxx b/fpicker/source/aqua/FPentry.cxx
index f1b1e4cde76d..3a264fc61789 100644
--- a/fpicker/source/aqua/FPentry.cxx
+++ b/fpicker/source/aqua/FPentry.cxx
@@ -89,8 +89,8 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr
         try
         {
             Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );
-            pXNewKey->createKey( OUString::createFromAscii( FILE_PICKER_REGKEY_NAME ) );
-            pXNewKey->createKey( OUString::createFromAscii( FOLDER_PICKER_REGKEY_NAME ) );
+            pXNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_REGKEY_NAME ) ));
+            pXNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_REGKEY_NAME ) ));
         }
         catch( InvalidRegistryException& )
         {
@@ -122,7 +122,7 @@ void* SAL_CALL component_getFactory(
             {
                 Sequence< OUString > aSNS( 1 );
                 aSNS.getArray( )[0] =
-                    OUString::createFromAscii(FILE_PICKER_SERVICE_NAME);
+                    OUString(RTL_CONSTASCII_USTRINGPARAM(FILE_PICKER_SERVICE_NAME));
 
                 xFactory = createSingleFactory(
                     reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
@@ -134,7 +134,7 @@ void* SAL_CALL component_getFactory(
             {
                 Sequence< OUString > aSNS( 1 );
                 aSNS.getArray( )[0] =
-                    OUString::createFromAscii(FOLDER_PICKER_SERVICE_NAME);
+                    OUString(RTL_CONSTASCII_USTRINGPARAM(FOLDER_PICKER_SERVICE_NAME));
 
                 xFactory = createSingleFactory(
                     reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
diff --git a/fpicker/source/aqua/FilterHelper.cxx b/fpicker/source/aqua/FilterHelper.cxx
index b85e7ab8448b..c0a590977ca3 100644
--- a/fpicker/source/aqua/FilterHelper.cxx
+++ b/fpicker/source/aqua/FilterHelper.cxx
@@ -372,7 +372,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::
 
     // append the filter
     if (bPrependSeparator) {
-        rtl::OUString dash = rtl::OUString::createFromAscii("-");
+        rtl::OUString dash(RTL_CONSTASCII_USTRINGPARAM("-"));
         OUStringList emptyList;
         m_pFilterList->push_back(FilterEntry(dash, emptyList));
     }
@@ -419,7 +419,7 @@ sal_Bool FilterHelper::filenameMatchesFilter(NSString* sFilename)
 
     {
         rtl::OUString aName = [sFilename OUString];
-        rtl::OUString allMatcher = rtl::OUString::createFromAscii(".*");
+        rtl::OUString allMatcher(RTL_CONSTASCII_USTRINGPARAM(".*"));
         for(OUStringList::iterator iter = suffixList.begin(); iter != suffixList.end(); iter++) {
             if (aName.matchIgnoreAsciiCase(*iter, aName.getLength() - (*iter).getLength()) || ((*iter).equals(allMatcher))) {
                 return sal_True;
diff --git a/fpicker/source/aqua/SalAquaFilePicker.cxx b/fpicker/source/aqua/SalAquaFilePicker.cxx
index e05fe4fb8dc9..12846f54caf3 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.cxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.cxx
@@ -94,9 +94,9 @@ namespace
     uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames()
     {
         uno::Sequence<rtl::OUString> aRet(3);
-        aRet[0] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.FilePicker" );
-        aRet[1] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.SystemFilePicker" );
-        aRet[2] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.AquaFilePicker" );
+        aRet[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ));
+        aRet[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.SystemFilePicker" ));
+        aRet[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.AquaFilePicker" ));
         return aRet;
     }
 }
@@ -187,7 +187,6 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException )
     // if m_pDialog is nil after initialization, something must have gone wrong before
     // or there was no initialization (see issue http://www.openoffice.org/issues/show_bug.cgi?id=100214)
     if (m_pDialog == nil) {
-        //throw uno::RuntimeException(rtl::OUString::createFromAscii("The dialog was not properly initialized!"), static_cast< XFilePicker* >( this ));
         m_nDialogType = NAVIGATIONSERVICES_OPEN;
     }
 
@@ -206,7 +205,7 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException )
                     rtl::OUString ouName = [windowTitle OUString];
                     //a window title will typically be something like "Untitled1 - OpenOffice.org Writer"
                     //but we only want the "Untitled1" part of it
-                    sal_Int32 indexOfDash = ouName.indexOf(rtl::OUString::createFromAscii(" - "));
+                    sal_Int32 indexOfDash = ouName.indexOf(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" - ")));
                     if (indexOfDash > -1) {
                         m_sSaveFileName = ouName.copy(0,indexOfDash);
                         if (m_sSaveFileName.getLength() > 0) {
@@ -244,7 +243,7 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException )
             break;
 
         default:
-            throw uno::RuntimeException(rtl::OUString::createFromAscii("The dialog returned with an unknown result!"), static_cast< XFilePicker* >( this ));
+            throw uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The dialog returned with an unknown result!")), static_cast< XFilePicker* >( this ));
             break;
     }
 
@@ -506,14 +505,14 @@ throw( uno::Exception, uno::RuntimeException )
     // parameter checking
     uno::Any aAny;
     if( 0 == aArguments.getLength() )
-        throw lang::IllegalArgumentException(rtl::OUString::createFromAscii( "no arguments" ),
+        throw lang::IllegalArgumentException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "no arguments" )),
                                              static_cast<XFilePicker*>( this ), 1 );
 
     aAny = aArguments[0];
 
     if( ( aAny.getValueType() != ::getCppuType( ( sal_Int16* )0 ) ) &&
         (aAny.getValueType() != ::getCppuType( ( sal_Int8* )0 ) ) )
-        throw lang::IllegalArgumentException(rtl::OUString::createFromAscii( "invalid argument type" ),
+        throw lang::IllegalArgumentException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid argument type" )),
                                              static_cast<XFilePicker*>( this ), 1 );
 
     sal_Int16 templateId = -1;
@@ -566,7 +565,7 @@ throw( uno::Exception, uno::RuntimeException )
             OSL_TRACE( "Template: FILESAVE_AUTOEXTENSION" );
             break;
         default:
-            throw lang::IllegalArgumentException(rtl::OUString::createFromAscii( "Unknown template" ),
+            throw lang::IllegalArgumentException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Unknown template" )),
                                                  static_cast< XFilePicker* >( this ),
                                                  1 );
     }
@@ -625,7 +624,7 @@ throw( uno::RuntimeException )
 {
     DBG_PRINT_ENTRY(CLASS_NAME, __func__);
 
-    rtl::OUString retVal = rtl::OUString::createFromAscii( FILE_PICKER_IMPL_NAME );
+    rtl::OUString retVal(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_IMPL_NAME ));
 
     DBG_PRINT_EXIT(CLASS_NAME, __func__, retVal);
 
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.cxx b/fpicker/source/aqua/SalAquaFolderPicker.cxx
index 115bc1afe50c..7f269ec2b3c4 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.cxx
+++ b/fpicker/source/aqua/SalAquaFolderPicker.cxx
@@ -80,8 +80,8 @@ namespace
     uno::Sequence<rtl::OUString> SAL_CALL FolderPicker_getSupportedServiceNames()
     {
         uno::Sequence<rtl::OUString> aRet(2);
-        aRet[0] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.SystemFolderPicker" );
-        aRet[1] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.AquaFolderPicker" );
+        aRet[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.SystemFolderPicker" ));
+        aRet[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.AquaFolderPicker" ));
         return aRet;
     }
 }
@@ -137,7 +137,7 @@ sal_Int16 SAL_CALL SalAquaFolderPicker::execute() throw( uno::RuntimeException )
         break;
 
     default:
-        throw uno::RuntimeException(rtl::OUString::createFromAscii("The dialog returned with an unknown result!"), static_cast< XFolderPicker* >( this ));
+        throw uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The dialog returned with an unknown result!")), static_cast< XFolderPicker* >( this ));
         break;
     }
 
@@ -189,7 +189,7 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getDirectory() throw( uno::RuntimeEx
     OSL_TRACE("# of items: %d", nFiles);
 
     if (nFiles < 1) {
-        throw uno::RuntimeException(rtl::OUString::createFromAscii("no directory selected"), static_cast< XFolderPicker* >( this ));
+        throw uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("no directory selected")), static_cast< XFolderPicker* >( this ));
     }
 
     rtl::OUString aDirectory;
@@ -226,7 +226,7 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getImplementationName()
 {
     DBG_PRINT_ENTRY(CLASS_NAME, __func__);
 
-    rtl::OUString retVal = rtl::OUString::createFromAscii( FOLDER_PICKER_IMPL_NAME );
+    rtl::OUString retVal(RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_IMPL_NAME ));
 
     DBG_PRINT_EXIT(CLASS_NAME, __func__, retVal);
 
diff --git a/fpicker/source/odma/ODMAFilePicker.cxx b/fpicker/source/odma/ODMAFilePicker.cxx
index 39153b631f53..685da9f377eb 100644
--- a/fpicker/source/odma/ODMAFilePicker.cxx
+++ b/fpicker/source/odma/ODMAFilePicker.cxx
@@ -85,7 +85,7 @@ ODMAFilePicker::ODMAFilePicker( const Reference < XMultiServiceFactory >& xFacto
 {
     m_bUseDMS = ::odma::DMSsAvailable();
     m_xSystemFilePicker = xFactory->createInstance(
-        ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.Win32FilePicker" ) );
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.Win32FilePicker" ) ));
 }
 
 // XExecutableDialog functions
@@ -163,7 +163,7 @@ sal_Int16 SAL_CALL ODMAFilePicker::execute( )
                     // Insane API... the first element is a full URI, the rest
                     // are just the "basenames" in the same "directory".
                     if (i == 0)
-                        strings[0] = rtl::OUString::createFromAscii( "vnd.sun.star.odma:/" ) + rtl::OUString::createFromAscii( p );
+                        strings[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.odma:/" )) + rtl::OUString::createFromAscii( p );
                     else
                         strings[i] = rtl::OUString::createFromAscii( p );
                     p += strlen( p );
@@ -198,7 +198,7 @@ sal_Int16 SAL_CALL ODMAFilePicker::execute( )
             NODMUnRegisterApp( handle );
             if (status == ODM_SUCCESS)
             {
-                rtl::OUString s( rtl::OUString::createFromAscii( "vnd.sun.star.odma:/" ) +
+                rtl::OUString s( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.odma:/" )) +
                                  rtl::OUString::createFromAscii( newdocid ) );
                 // Create a Content for the odma URL so that
                 // odma::ContentProvider will learn about the DOCID we
@@ -520,7 +520,7 @@ Sequence< rtl::OUString > ODMAFilePicker::impl_getStaticSupportedServiceNames( )
 {
     Sequence< rtl::OUString > seqServiceNames( 2 );
     rtl::OUString* pArray = seqServiceNames.getArray();
-    pArray[0] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.ODMAFilePicker" );
+    pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.ODMAFilePicker" ));
 
     // Super-ugly, but check the function sal_Bool
     // lcl_isSystemFilePicker( const Reference< XFilePicker >& ) in
@@ -530,13 +530,13 @@ Sequence< rtl::OUString > ODMAFilePicker::impl_getStaticSupportedServiceNames( )
     // isn't it?  If we don't claim to implement this "service" (which
     // is not defined in any IDL file, btw), we get hangs.
 
-    pArray[1] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.SystemFilePicker" );
+    pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.SystemFilePicker" ));
     return seqServiceNames ;
 }
 
 rtl::OUString ODMAFilePicker::impl_getStaticImplementationName( )
 {
-    return rtl::OUString::createFromAscii( "com.sun.star.svtools.ODMAFilePicker" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.svtools.ODMAFilePicker" ));
 }
 
 Reference< XInterface > SAL_CALL ODMAFilePicker::impl_createInstance(
diff --git a/fpicker/source/odma/ODMAFolderPicker.cxx b/fpicker/source/odma/ODMAFolderPicker.cxx
index 82e83a918bc6..5c9536ac3290 100644
--- a/fpicker/source/odma/ODMAFolderPicker.cxx
+++ b/fpicker/source/odma/ODMAFolderPicker.cxx
@@ -67,7 +67,7 @@ ODMAFolderPicker::ODMAFolderPicker( const Reference < XMultiServiceFactory >& xF
     m_bUseDMS( sal_False )
 {
     m_xInterface = xFactory->createInstance(
-        ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.SystemFolderPicker" ) );
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.SystemFolderPicker" ) ));
 }
 
 // XExecutableDialog functions
@@ -166,13 +166,13 @@ Sequence< ::rtl::OUString > ODMAFolderPicker::impl_getStaticSupportedServiceName
 {
     Sequence< ::rtl::OUString > seqServiceNames( 1 );
     ::rtl::OUString* pArray = seqServiceNames.getArray();
-    pArray[0] = ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.ODMAFolderPicker" );
+    pArray[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.ODMAFolderPicker" ));
     return seqServiceNames ;
 }
 
 ::rtl::OUString ODMAFolderPicker::impl_getStaticImplementationName( )
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.svtools.ODMAFolderPicker" );
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.svtools.ODMAFolderPicker" ));
 }
 
 Reference< XInterface > SAL_CALL ODMAFolderPicker::impl_createInstance( const Reference< XComponentContext >& rxContext )
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index a5ea04e122bf..20b542825c8b 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -1166,14 +1166,14 @@ Sequence< rtl::OUString > SvtFilePicker::impl_getStaticSupportedServiceNames()
 {
     Sequence< rtl::OUString > seqServiceNames( 1 );
     rtl::OUString* pArray = seqServiceNames.getArray();
-    pArray[0] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.OfficeFilePicker" );
+    pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.OfficeFilePicker" ));
     return seqServiceNames ;
 }
 
 /* Helper for XServiceInfo */
 rtl::OUString SvtFilePicker::impl_getStaticImplementationName()
 {
-    return rtl::OUString::createFromAscii( "com.sun.star.svtools.OfficeFilePicker" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.svtools.OfficeFilePicker" ));
 }
 
 /* Helper for registry */
diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx
index 0077ce45bab4..945616b5ec4a 100644
--- a/fpicker/source/office/OfficeFolderPicker.cxx
+++ b/fpicker/source/office/OfficeFolderPicker.cxx
@@ -246,14 +246,14 @@ Sequence< ::rtl::OUString > SAL_CALL SvtFolderPicker::getSupportedServiceNames()
 Sequence< ::rtl::OUString > SvtFolderPicker::impl_getStaticSupportedServiceNames()
 {
     Sequence< ::rtl::OUString > seqServiceNames(1);
-    seqServiceNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.OfficeFolderPicker" );
+    seqServiceNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.OfficeFolderPicker" ));
     return seqServiceNames ;
 }
 
 /* Helper for XServiceInfo */
 ::rtl::OUString SvtFolderPicker::impl_getStaticImplementationName()
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.svtools.OfficeFolderPicker" );
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.svtools.OfficeFolderPicker" ));
 }
 
 /* Helper for registry */
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index ea5d284d6084..59181a3db9e6 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -67,13 +67,13 @@ namespace svt
     {
         // the two properties we have
         registerProperty(
-            ::rtl::OUString::createFromAscii( "HelpURL" ), PROPERTY_ID_HELPURL,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HelpURL" )), PROPERTY_ID_HELPURL,
             PropertyAttribute::TRANSIENT,
             &m_sHelpURL, ::getCppuType( &m_sHelpURL )
         );
 
         registerProperty(
-            ::rtl::OUString::createFromAscii( "Window" ), PROPERTY_ID_WINDOW,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Window" )), PROPERTY_ID_WINDOW,
             PropertyAttribute::TRANSIENT | PropertyAttribute::READONLY,
             &m_xWindow, ::getCppuType( &m_xWindow )
         );
diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx
index 2c37710d1061..31c7030afb03 100644
--- a/fpicker/source/office/fpsmartcontent.cxx
+++ b/fpicker/source/office/fpsmartcontent.cxx
@@ -226,7 +226,7 @@ namespace svt
         try
         {
             ::rtl::OUString sTitle;
-            m_pContent->getPropertyValue( ::rtl::OUString::createFromAscii( "Title" ) ) >>= sTitle;
+            m_pContent->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Title" )) ) >>= sTitle;
             _rTitle =  sTitle;
 
             // from here on, we definately know that the content is valid
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index ef54e5662ea7..f7d48f81b72a 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -521,7 +521,7 @@ SvtFileDialog::~SvtFileDialog()
         SvtViewOptions aDlgOpt( E_DIALOG, _pImp->_aIniKey );
         aDlgOpt.SetWindowState( String( GetWindowState(), osl_getThreadTextEncoding() ) );
         String sUserData = _pFileView->GetConfigString();
-        aDlgOpt.SetUserItem( ::rtl::OUString::createFromAscii( "UserData" ),
+        aDlgOpt.SetUserItem( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UserData" )),
                              makeAny( ::rtl::OUString( sUserData ) ) );
     }
 
@@ -548,8 +548,7 @@ void SvtFileDialog::Init_Impl
     WinBits nStyle
 )
 {
-    sal_Bool bIsHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-    m_aImages = ImageList( SvtResId( bIsHighContrast ? RID_FILEPICKER_IMAGES_HC : RID_FILEPICKER_IMAGES ) );
+    m_aImages = ImageList( SvtResId( RID_FILEPICKER_IMAGES ) );
 
     _pImp->_nStyle = nStyle;
     _pImp->_a6Size = LogicToPixel( Size( 6, 6 ), MAP_APPFONT );
@@ -2072,8 +2071,8 @@ short SvtFileDialog::PrepareExecute()
                                                     INetURLObject::NO_DECODE ) ),
                                  Reference< XCommandEnvironment >() );
             Sequence< rtl::OUString > aProps(2);
-            aProps[0] = rtl::OUString::createFromAscii( "IsVolume" );
-            aProps[1] = rtl::OUString::createFromAscii( "IsRemoveable" );
+            aProps[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IsVolume" ));
+            aProps[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IsRemoveable" ));
 
             Reference< XResultSet > xResultSet
                 = aCnt.createCursor( aProps, ::ucbhelper::INCLUDE_FOLDERS_ONLY );
@@ -2503,7 +2502,7 @@ void SvtFileDialog::InitSize()
     {
         SetWindowState( ByteString( String( aDlgOpt.GetWindowState() ), osl_getThreadTextEncoding() ) );
 
-        Any aUserData = aDlgOpt.GetUserItem( ::rtl::OUString::createFromAscii( "UserData" ) );
+        Any aUserData = aDlgOpt.GetUserItem( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UserData" ) ));
         ::rtl::OUString sCfgStr;
         if ( aUserData >>= sCfgStr )
             _pFileView->SetConfigString( String( sCfgStr ) );
@@ -2672,11 +2671,7 @@ BOOL SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilter )
 //-----------------------------------------------------------------------------
 void SvtFileDialog::implUpdateImages( )
 {
-    // determine high contrast mode
-    {
-        sal_Bool bIsHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-        m_aImages = ImageList( SvtResId( bIsHighContrast ? RID_FILEPICKER_IMAGES_HC : RID_FILEPICKER_IMAGES ) );
-    }
+    m_aImages = ImageList( SvtResId( RID_FILEPICKER_IMAGES ) );
 
     // set the appropriate images on the buttons
     if ( _pImp->_pBtnUp )
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index a7c19cb601d2..249383dc8a47 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -53,13 +53,6 @@ ImageList RID_FILEPICKER_IMAGES
     FILEPICKER_IL_IDLIST
 };
 
-ImageList RID_FILEPICKER_IMAGES_HC
-{
-    Prefix = "fph";
-    MASKCOLOR
-    FILEPICKER_IL_IDLIST
-};
-
  // dialogs *******************************************************************
 
 ModalDialog DLG_SVT_EXPLORERFILE
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 86d1387c9ca6..dfaac9bc7b01 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -226,8 +226,7 @@ void SvtUpButton_Impl::FillURLMenu( PopupMenu* _pMenu )
     ::svtools::VolumeInfo aVolInfo( sal_True /* volume */, sal_False /* remote */,
                                     sal_False /* removable */, sal_False /* floppy */,
                                     sal_False /* compact disk */ );
-    sal_Bool bIsHighContrast = pBox->GetSettings().GetStyleSettings().GetHighContrastMode();
-    Image aVolumeImage( SvFileInformationManager::GetFolderImage( aVolInfo, bIsHighContrast ) );
+    Image aVolumeImage( SvFileInformationManager::GetFolderImage( aVolInfo ) );
 
     while ( nCount >= 1 )
     {
@@ -242,8 +241,7 @@ void SvtUpButton_Impl::FillURLMenu( PopupMenu* _pMenu )
                 aTitle = aObject.getName();
 
             Image aImage = ( nCount > 1 ) // if nCount == 1 means workplace, which detects the wrong image
-                ? SvFileInformationManager::GetImage( aObject, bIsHighContrast )
-                : aVolumeImage;
+                ? SvFileInformationManager::GetImage( aObject ) : aVolumeImage;
 
             _pMenu->InsertItem( nItemId++, aTitle, aImage );
             _pURLs->Insert( pParentURL, _pURLs->Count() );
@@ -314,8 +312,6 @@ void SvtTravelButton_Impl::FillURLMenu( PopupMenu* _pMenu )
 
     _pMenu->Clear();
 
-    sal_Bool bIsHighContrast = GetDialogParent()->GetView()->GetSettings().GetStyleSettings().GetHighContrastMode();
-
     USHORT nItemId = 1;
     String sDisplayName;
 
@@ -324,8 +320,7 @@ void SvtTravelButton_Impl::FillURLMenu( PopupMenu* _pMenu )
     {
         if ( GetDialogParent()->isUrlAllowed( *aLoop ) )
         {
-            Image aImage = SvFileInformationManager::GetImage(
-                INetURLObject(*aLoop), bIsHighContrast );
+            Image aImage = SvFileInformationManager::GetImage( INetURLObject(*aLoop) );
             if ( LocalFileHelper::ConvertURLToSystemPath(*aLoop, sDisplayName) )
                 _pMenu->InsertItem( nItemId, sDisplayName, aImage );
             else
diff --git a/fpicker/source/unx/gnome/FPentry.cxx b/fpicker/source/unx/gnome/FPentry.cxx
index 3c852ceecbbe..4e533a55ad01 100644
--- a/fpicker/source/unx/gnome/FPentry.cxx
+++ b/fpicker/source/unx/gnome/FPentry.cxx
@@ -115,8 +115,8 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr
         try
         {
             Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );
-            pXNewKey->createKey( OUString::createFromAscii( FILE_PICKER_REGKEY_NAME ) );
-            pXNewKey->createKey( OUString::createFromAscii( FOLDER_PICKER_REGKEY_NAME ) );
+            pXNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_REGKEY_NAME ) ));
+            pXNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_REGKEY_NAME ) ));
         }
         catch( InvalidRegistryException& )
         {
@@ -153,7 +153,7 @@ void* SAL_CALL component_getFactory(
             {
                 Sequence< OUString > aSNS( 1 );
                 aSNS.getArray( )[0] =
-                    OUString::createFromAscii(FILE_PICKER_SERVICE_NAME);
+                    OUString(RTL_CONSTASCII_USTRINGPARAM(FILE_PICKER_SERVICE_NAME));
 
                 xFactory = createSingleFactory(
                     reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
@@ -165,7 +165,7 @@ void* SAL_CALL component_getFactory(
             {
                 Sequence< OUString > aSNS( 1 );
                 aSNS.getArray( )[0] =
-                    OUString::createFromAscii(FOLDER_PICKER_SERVICE_NAME);
+                    OUString(RTL_CONSTASCII_USTRINGPARAM(FOLDER_PICKER_SERVICE_NAME));
 
                 xFactory = createSingleFactory(
                     reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
index 28e081b9f62a..4b681ab4f6fa 100644
--- a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
@@ -89,9 +89,9 @@ namespace
     uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames()
     {
         uno::Sequence<rtl::OUString> aRet(3);
-            aRet[0] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.FilePicker" );
-        aRet[1] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.SystemFilePicker" );
-        aRet[2] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.GtkFilePicker" );
+            aRet[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ));
+        aRet[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.SystemFilePicker" ));
+        aRet[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.GtkFilePicker" ));
         return aRet;
     }
 }
@@ -907,7 +907,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw
 
                     if( sExtension.getLength() >= 3 ) // 3 = typical/minimum extension length
                     {
-                        static const OUString aStarDot = OUString::createFromAscii( "*." );
+                        static const OUString aStarDot(RTL_CONSTASCII_USTRINGPARAM( "*." ));
 
                         ::rtl::OUString aNewFilter;
                         ::rtl::OUString aOldFilter = getCurrentFilter();
@@ -917,7 +917,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw
                               ++aListIter
                         )
                         {
-                            if( aListIter->getFilter().indexOf( aStarDot+sExtension ) >= 0 )
+                            if( aListIter->getFilter().equalsIgnoreAsciiCase( aStarDot+sExtension ) )
                             {
                                 if( !aNewFilter.getLength() )
                                     aNewFilter = aListIter->getTitle();
@@ -977,7 +977,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw
             if( !bExtensionTypedIn && ( !sToken.equalsAscii( "*" ) ) )
             {
                 //if the filename does not already have the auto extension, stick it on
-                OUString sExtension = OUString::createFromAscii( "." ) + sToken;
+                OUString sExtension = OUString(RTL_CONSTASCII_USTRINGPARAM( "." )) + sToken;
                 OUString &rBase = aSelectedFiles[nIndex];
                 sal_Int32 nExtensionIdx = rBase.getLength() - sExtension.getLength();
                 OSL_TRACE( "idx are %d %d\n", rBase.lastIndexOf( sExtension ), nExtensionIdx );
@@ -1028,7 +1028,7 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException )
     int btn = GTK_RESPONSE_NO;
 
     uno::Reference< awt::XExtendedToolkit > xToolkit(
-        m_xServiceMgr->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.awt.Toolkit") ), uno::UNO_QUERY);
+        m_xServiceMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Toolkit")) ), uno::UNO_QUERY);
 
     RunDialog* pRunDialog = new RunDialog(m_pDialog, xToolkit);
     uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunDialog);
@@ -1505,7 +1505,7 @@ void SalGtkFilePicker::implChangeType( GtkTreeSelection *selection )
     {
         gchar *title;
         gtk_tree_model_get (model, &iter, 2, &title, -1);
-        aLabel += rtl::OUString::createFromAscii( ": " );
+        aLabel += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ": " ));
         aLabel += rtl::OUString( title, strlen(title), RTL_TEXTENCODING_UTF8 );
         g_free (title);
     }
@@ -1640,7 +1640,7 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu
     uno::Any aAny;
     if( 0 == aArguments.getLength() )
         throw lang::IllegalArgumentException(
-            rtl::OUString::createFromAscii( "no arguments" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "no arguments" )),
             static_cast<XFilePicker2*>( this ), 1 );
 
     aAny = aArguments[0];
@@ -1648,7 +1648,7 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu
     if( ( aAny.getValueType() != ::getCppuType( ( sal_Int16* )0 ) ) &&
          (aAny.getValueType() != ::getCppuType( ( sal_Int8* )0 ) ) )
          throw lang::IllegalArgumentException(
-            rtl::OUString::createFromAscii( "invalid argument type" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid argument type" )),
             static_cast<XFilePicker2*>( this ), 1 );
 
     sal_Int16 templateId = -1;
@@ -1736,7 +1736,7 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu
                 break;
         default:
                 throw lang::IllegalArgumentException(
-                rtl::OUString::createFromAscii( "Unknown template" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Unknown template" )),
                 static_cast< XFilePicker2* >( this ),
                 1 );
     }
@@ -1815,7 +1815,7 @@ void SAL_CALL SalGtkFilePicker::cancel() throw( uno::RuntimeException )
 rtl::OUString SAL_CALL SalGtkFilePicker::getImplementationName()
     throw( uno::RuntimeException )
 {
-    return rtl::OUString::createFromAscii( FILE_PICKER_IMPL_NAME );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_IMPL_NAME ));
 }
 
 // -------------------------------------------------
@@ -1915,7 +1915,7 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O
     OString aFilterName = rtl::OUStringToOString( aShrunkName, RTL_TEXTENCODING_UTF8 );
     gtk_file_filter_set_name( filter, aFilterName );
 
-    static const OUString aStarDot = OUString::createFromAscii( "*." );
+    static const OUString aStarDot(RTL_CONSTASCII_USTRINGPARAM( "*." ));
     OUString aTokens;
 
     bool bAllGlob = !rType.compareToAscii( "*.*" ) || !rType.compareToAscii( "*" );
@@ -1933,7 +1933,7 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O
             if (aToken.getLength())
             {
                 if (aTokens.getLength())
-                    aTokens += OUString::createFromAscii(",");
+                    aTokens += OUString(RTL_CONSTASCII_USTRINGPARAM(","));
                 aTokens = aTokens += aToken;
                 gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_URI,
                     case_insensitive_filter,
diff --git a/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
index dba73a512ce8..0a3c807066d6 100644
--- a/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
@@ -79,8 +79,8 @@ namespace
     uno::Sequence<rtl::OUString> SAL_CALL FolderPicker_getSupportedServiceNames()
     {
         uno::Sequence<rtl::OUString> aRet(2);
-        aRet[0] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.SystemFolderPicker" );
-        aRet[1] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.GtkFolderPicker" );
+        aRet[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.SystemFolderPicker" ));
+        aRet[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.GtkFolderPicker" ));
         return aRet;
     }
 }
@@ -182,7 +182,7 @@ sal_Int16 SAL_CALL SalGtkFolderPicker::execute() throw( uno::RuntimeException )
     sal_Int16 retVal = 0;
 
     uno::Reference< awt::XExtendedToolkit > xToolkit(
-        m_xServiceMgr->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.awt.Toolkit") ), uno::UNO_QUERY);
+        m_xServiceMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Toolkit")) ), uno::UNO_QUERY);
 
     RunDialog* pRunDialog = new RunDialog(m_pDialog, xToolkit);
     uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunDialog);
@@ -221,7 +221,7 @@ void SAL_CALL SalGtkFolderPicker::cancel() throw( uno::RuntimeException )
 rtl::OUString SAL_CALL SalGtkFolderPicker::getImplementationName()
     throw( uno::RuntimeException )
 {
-    return rtl::OUString::createFromAscii( FOLDER_PICKER_IMPL_NAME );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( FOLDER_PICKER_IMPL_NAME ));
 }
 
 // -------------------------------------------------
diff --git a/fpicker/source/unx/gnome/SalGtkPicker.cxx b/fpicker/source/unx/gnome/SalGtkPicker.cxx
index 70b99fcd543b..782b44d11e7c 100644
--- a/fpicker/source/unx/gnome/SalGtkPicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkPicker.cxx
@@ -221,19 +221,19 @@ static void lcl_setGTKLanguage(const uno::Reference<lang::XMultiServiceFactory>&
     {
         uno::Reference<lang::XMultiServiceFactory> xConfigMgr =
           uno::Reference<lang::XMultiServiceFactory>(xServiceMgr->createInstance(
-            OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))),
               UNO_QUERY_THROW );
 
         Sequence< Any > theArgs(1);
-        theArgs[ 0 ] <<= OUString::createFromAscii("org.openoffice.Office.Linguistic/General");
+        theArgs[ 0 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Linguistic/General"));
 
         uno::Reference< container::XNameAccess > xNameAccess =
           uno::Reference< container::XNameAccess >(xConfigMgr->createInstanceWithArguments(
-            OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"), theArgs ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")), theArgs ),
               UNO_QUERY_THROW );
 
         if (xNameAccess.is())
-            xNameAccess->getByName(OUString::createFromAscii("UILocale")) >>= sUILocale;
+            xNameAccess->getByName(OUString(RTL_CONSTASCII_USTRINGPARAM("UILocale"))) >>= sUILocale;
     } catch (...) {}
 
     if (sUILocale.getLength())
diff --git a/fpicker/source/unx/kde4/KDE4FPEntry.cxx b/fpicker/source/unx/kde4/KDE4FPEntry.cxx
index f59a8e59637a..6587930bcba9 100644
--- a/fpicker/source/unx/kde4/KDE4FPEntry.cxx
+++ b/fpicker/source/unx/kde4/KDE4FPEntry.cxx
@@ -65,7 +65,7 @@ extern "C"
             try
             {
                 Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );
-                pXNewKey->createKey( OUString::createFromAscii( FILE_PICKER_REGKEY_NAME ) );
+                pXNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_REGKEY_NAME ) ));
             }
             catch( InvalidRegistryException& )
             {
@@ -84,7 +84,7 @@ extern "C"
         if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, FILE_PICKER_IMPL_NAME ) ) )
         {
             Sequence< OUString > aSNS( 1 );
-            aSNS.getArray( )[0] = OUString::createFromAscii( FILE_PICKER_SERVICE_NAME );
+            aSNS.getArray( )[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_SERVICE_NAME ));
 
             Reference< XSingleServiceFactory > xFactory ( createSingleFactory(
                         reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index 9e7392a0dc45..fa4d3daede21 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
@@ -99,9 +99,9 @@ namespace
     uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames()
     {
         uno::Sequence<rtl::OUString> aRet(3);
-        aRet[0] = rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.FilePicker");
-        aRet[1] = rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.SystemFilePicker");
-        aRet[2] = rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.KDE4FilePicker");
+        aRet[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FilePicker"));
+        aRet[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker"));
+        aRet[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.KDE4FilePicker"));
         return aRet;
     }
 }
@@ -615,7 +615,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args )
     if (args.getLength() == 0)
     {
         throw lang::IllegalArgumentException(
-                rtl::OUString::createFromAscii( "no arguments" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "no arguments" )),
                 static_cast< XFilePicker* >( this ), 1 );
     }
 
@@ -625,7 +625,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args )
         ( arg.getValueType() != ::getCppuType((sal_Int8*)0)))
     {
         throw lang::IllegalArgumentException(
-                rtl::OUString::createFromAscii( "invalid argument type" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid argument type" )),
                 static_cast< XFilePicker* >( this ), 1 );
     }
 
@@ -697,7 +697,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args )
 
         default:
             throw lang::IllegalArgumentException(
-                    rtl::OUString::createFromAscii( "Unknown template" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Unknown template" )),
                     static_cast< XFilePicker* >( this ),
                     1 );
     }
@@ -726,7 +726,7 @@ void SAL_CALL KDE4FilePicker::disposing( const lang::EventObject &rEvent )
 rtl::OUString SAL_CALL KDE4FilePicker::getImplementationName()
     throw( uno::RuntimeException )
 {
-    return rtl::OUString::createFromAscii( FILE_PICKER_IMPL_NAME );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_IMPL_NAME ));
 }
 
 sal_Bool SAL_CALL KDE4FilePicker::supportsService( const rtl::OUString& ServiceName )
diff --git a/fpicker/source/unx/kde_unx/UnxFPentry.cxx b/fpicker/source/unx/kde_unx/UnxFPentry.cxx
index ac011348eac6..c577440cde0b 100644
--- a/fpicker/source/unx/kde_unx/UnxFPentry.cxx
+++ b/fpicker/source/unx/kde_unx/UnxFPentry.cxx
@@ -82,7 +82,7 @@ sal_Bool SAL_CALL component_writeInfo( void* pServiceManager, void* pRegistryKey
         try
         {
             Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );
-            pXNewKey->createKey( OUString::createFromAscii( FILE_PICKER_REGKEY_NAME ) );
+            pXNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_REGKEY_NAME ) ));
         }
         catch( InvalidRegistryException& )
         {
@@ -105,7 +105,7 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* p
     if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, FILE_PICKER_IMPL_NAME ) ) )
     {
         Sequence< OUString > aSNS( 1 );
-        aSNS.getArray( )[0] = OUString::createFromAscii( FILE_PICKER_SERVICE_NAME );
+        aSNS.getArray( )[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_SERVICE_NAME ));
 
         Reference< XSingleServiceFactory > xFactory ( createSingleFactory(
                     reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
diff --git a/fpicker/source/unx/kde_unx/UnxFilePicker.cxx b/fpicker/source/unx/kde_unx/UnxFilePicker.cxx
index 21e32dc7f9c9..e280d837fc3c 100644
--- a/fpicker/source/unx/kde_unx/UnxFilePicker.cxx
+++ b/fpicker/source/unx/kde_unx/UnxFilePicker.cxx
@@ -77,9 +77,9 @@ namespace
     uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames()
     {
         uno::Sequence<rtl::OUString> aRet(3);
-        aRet[0] = rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.FilePicker");
-        aRet[1] = rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.SystemFilePicker");
-        aRet[2] = rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.KDEFilePicker");
+        aRet[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FilePicker"));
+        aRet[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker"));
+        aRet[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.KDEFilePicker"));
         return aRet;
     }
 }
@@ -113,7 +113,7 @@ UnxFilePicker::~UnxFilePicker()
 {
     if ( m_nFilePickerPid > 0 )
     {
-        sendCommand( ::rtl::OUString::createFromAscii( "exit" ) );
+        sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "exit" )) );
         waitpid( m_nFilePickerPid, NULL, 0 );
     }
 
@@ -182,7 +182,7 @@ sal_Int16 SAL_CALL UnxFilePicker::execute()
     // this is _not_ an osl::Condition, see i#93366
     m_pCommandThread->execCondition().reset();
 
-    sendCommand( ::rtl::OUString::createFromAscii( "exec" ) );
+    sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "exec" ) ));
 
     m_pCommandThread->execCondition().wait();
 
@@ -196,8 +196,8 @@ void SAL_CALL UnxFilePicker::setMultiSelectionMode( sal_Bool bMode )
     ::osl::MutexGuard aGuard( m_aMutex );
 
     ::rtl::OUString aString = bMode?
-        ::rtl::OUString::createFromAscii( "setMultiSelection true" ):
-        ::rtl::OUString::createFromAscii( "setMultiSelection false" );
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "setMultiSelection true" )):
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "setMultiSelection false" ));
 
     sendCommand( aString );
 }
@@ -236,7 +236,7 @@ rtl::OUString SAL_CALL UnxFilePicker::getDisplayDirectory()
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    sendCommand( ::rtl::OUString::createFromAscii( "getDirectory" ),
+    sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getDirectory" )),
                  m_pCommandThread->getDirectoryCondition() );
 
     return m_pCommandThread->getDirectory();
@@ -248,7 +248,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL UnxFilePicker::getFiles()
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    sendCommand( ::rtl::OUString::createFromAscii( "getFiles" ),
+    sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getFiles" )),
                  m_pCommandThread->getFilesCondition() );
 
     return m_pCommandThread->getFiles();
@@ -290,7 +290,7 @@ rtl::OUString SAL_CALL UnxFilePicker::getCurrentFilter()
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    sendCommand( ::rtl::OUString::createFromAscii( "getCurrentFilter" ),
+    sendCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getCurrentFilter" )),
                  m_pCommandThread->getCurrentFilterCondition() );
 
     return m_pCommandThread->getCurrentFilter();
@@ -543,21 +543,21 @@ void SAL_CALL UnxFilePicker::initialize( const uno::Sequence<uno::Any> &rArgumen
     uno::Any aAny;
     if ( 0 == rArguments.getLength( ) )
         throw lang::IllegalArgumentException(
-                rtl::OUString::createFromAscii( "no arguments" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "no arguments" )),
                 static_cast< XFilePicker* >( this ), 1 );
 
     aAny = rArguments[0];
 
     if ( ( aAny.getValueType() != ::getCppuType( (sal_Int16*)0 ) ) && ( aAny.getValueType() != ::getCppuType( (sal_Int8*)0 ) ) )
         throw lang::IllegalArgumentException(
-                rtl::OUString::createFromAscii( "invalid argument type" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid argument type" )),
                 static_cast< XFilePicker* >( this ), 1 );
 
     sal_Int16 templateId = -1;
     aAny >>= templateId;
 
-    ::rtl::OUString aTypeOpen   = ::rtl::OUString::createFromAscii( "setType \"open\"" );
-    ::rtl::OUString aTypeSaveAs = ::rtl::OUString::createFromAscii( "setType \"save\"" );
+    ::rtl::OUString aTypeOpen(RTL_CONSTASCII_USTRINGPARAM( "setType \"open\"" ));
+    ::rtl::OUString aTypeSaveAs(RTL_CONSTASCII_USTRINGPARAM( "setType \"save\"" ));
 
     switch ( templateId )
     {
@@ -634,7 +634,7 @@ void SAL_CALL UnxFilePicker::initialize( const uno::Sequence<uno::Any> &rArgumen
 
         default:
             throw lang::IllegalArgumentException(
-                    rtl::OUString::createFromAscii( "Unknown template" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Unknown template" )),
                     static_cast< XFilePicker* >( this ),
                     1 );
     }
@@ -662,7 +662,7 @@ void SAL_CALL UnxFilePicker::disposing( const lang::EventObject &rEvent )
 rtl::OUString SAL_CALL UnxFilePicker::getImplementationName()
     throw( uno::RuntimeException )
 {
-    return rtl::OUString::createFromAscii( FILE_PICKER_IMPL_NAME );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_IMPL_NAME ));
 }
 
 sal_Bool SAL_CALL UnxFilePicker::supportsService( const rtl::OUString& ServiceName )
@@ -773,7 +773,7 @@ void UnxFilePicker::checkFilePicker() throw( ::com::sun::star::uno::RuntimeExcep
     else
     {
         throw uno::RuntimeException(
-                ::rtl::OUString::createFromAscii( "the external file picker does not run" ),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "the external file picker does not run" )),
                 *this );
     }
 }
@@ -783,7 +783,7 @@ void UnxFilePicker::sendCommand( const ::rtl::OUString &rCommand )
     if ( m_nFilePickerWrite < 0 )
         return;
 
-    ::rtl::OString aUtfString = OUStringToOString( rCommand + ::rtl::OUString::createFromAscii( "\n" ), RTL_TEXTENCODING_UTF8 );
+    ::rtl::OString aUtfString = OUStringToOString( rCommand + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "\n" )), RTL_TEXTENCODING_UTF8 );
 
 #if OSL_DEBUG_LEVEL > 0
     ::std::cerr << "UnxFilePicker sent: \"" << aUtfString.getStr() << "\"" << ::std::endl;
diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx
index 3adf90836013..82eadcc4eb84 100644
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/fpicker/source/win32/filepicker/FPentry.cxx
@@ -114,7 +114,7 @@ sal_Bool SAL_CALL component_writeInfo( void*, void* pRegistryKey )
         try
         {
             Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );
-            pXNewKey->createKey( OUString::createFromAscii( FILE_PICKER_REGKEY_NAME ) );
+            pXNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_REGKEY_NAME ) ));
         }
         catch( InvalidRegistryException& )
         {
@@ -138,7 +138,7 @@ void* SAL_CALL component_getFactory(
     if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, FILE_PICKER_IMPL_NAME ) ) )
     {
         Sequence< OUString > aSNS( 1 );
-        aSNS.getArray( )[0] = OUString::createFromAscii( FILE_PICKER_SERVICE_NAME );
+        aSNS.getArray( )[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_SERVICE_NAME ));
 
         Reference< XSingleServiceFactory > xFactory ( createSingleFactory(
             reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index 2021e8c93794..545c54b9fa3f 100644
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -76,8 +76,8 @@ namespace
     uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames()
     {
         uno::Sequence<rtl::OUString> aRet(2);
-        aRet[0] = rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.FilePicker");
-        aRet[1] = rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.SystemFilePicker");
+        aRet[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FilePicker"));
+        aRet[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker"));
         return aRet;
     }
 }
@@ -123,7 +123,7 @@ void SAL_CALL CFilePicker::addFilePickerListener(const uno::Reference<XFilePicke
 {
     if ( rBHelper.bDisposed )
         throw lang::DisposedException(
-            rtl::OUString::createFromAscii( "object is already disposed" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "object is already disposed" )),
             static_cast< XFilePicker2* >( this ) );
 
     if ( !rBHelper.bInDispose && !rBHelper.bDisposed )
@@ -139,7 +139,7 @@ void SAL_CALL CFilePicker::removeFilePickerListener(const uno::Reference<XFilePi
 {
     if ( rBHelper.bDisposed )
         throw lang::DisposedException(
-            rtl::OUString::createFromAscii( "object is already disposed" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "object is already disposed" )),
             static_cast< XFilePicker2* >( this ) );
 
     rBHelper.aLC.removeInterface( getCppuType( &xListener ), xListener );
@@ -462,7 +462,7 @@ sal_Int16 SAL_CALL CFilePicker::execute() throw(uno::RuntimeException)
         OSL_ENSURE(sal_False, "Could not start event notifier thread!");
 
         throw uno::RuntimeException(
-            rtl::OUString::createFromAscii("Error executing dialog"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Error executing dialog")),
             static_cast<XFilePicker2*>(this));
     }
 
@@ -630,7 +630,7 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments)
     uno::Any aAny;
     if ( 0 == aArguments.getLength( ) )
         throw lang::IllegalArgumentException(
-            rtl::OUString::createFromAscii( "no arguments" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "no arguments" )),
             static_cast<XFilePicker2*>(this), 1);
 
     aAny = aArguments[0];
@@ -638,7 +638,7 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments)
     if ( (aAny.getValueType() != ::getCppuType((sal_Int16*)0)) &&
          (aAny.getValueType() != ::getCppuType((sal_Int8*)0)) )
          throw lang::IllegalArgumentException(
-            rtl::OUString::createFromAscii("invalid argument type"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid argument type")),
             static_cast<XFilePicker2*>(this), 1);
 
     sal_Int16 templateId = -1;
@@ -728,7 +728,7 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments)
 
     default:
         throw lang::IllegalArgumentException(
-            rtl::OUString::createFromAscii( "Unknown template" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Unknown template" )),
             static_cast< XFilePicker2* >( this ),
             1 );
     }
@@ -768,7 +768,7 @@ void SAL_CALL CFilePicker::cancel()
 rtl::OUString SAL_CALL CFilePicker::getImplementationName()
     throw(uno::RuntimeException)
 {
-    return rtl::OUString::createFromAscii(FILE_PICKER_IMPL_NAME);
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(FILE_PICKER_IMPL_NAME));
 }
 
 // -------------------------------------------------
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index 3770cdaa330c..83b040f7edff 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -92,8 +92,8 @@ namespace
     css::uno::Sequence< ::rtl::OUString > SAL_CALL VistaFilePicker_getSupportedServiceNames()
     {
         css::uno::Sequence< ::rtl::OUString > aRet(2);
-        aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.FilePicker");
-        aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.SystemFilePicker");
+        aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FilePicker"));
+        aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker"));
         return aRet;
     }
 }
@@ -552,17 +552,9 @@ void SAL_CALL VistaFilePicker::initialize(const css::uno::Sequence< css::uno::An
     throw(css::uno::Exception       ,
           css::uno::RuntimeException)
 {
-    /*
-    // called twice ?
-    if (m_pDlg)
-        throw css::uno::Exception(
-                ::rtl::OUString::createFromAscii( "XInitialization::initialize() called twice." ),
-                static_cast< css::ui::dialogs::XFilePicker* >( this ));
-    */
-
     if (lArguments.getLength() < 1)
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii( "XInitialization::initialize() called without arguments." ),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "XInitialization::initialize() called without arguments." )),
                 static_cast< css::ui::dialogs::XFilePicker2* >( this ),
                 1);
 
@@ -692,7 +684,7 @@ void SAL_CALL VistaFilePicker::cancel()
 ::rtl::OUString SAL_CALL VistaFilePicker::getImplementationName()
     throw(css::uno::RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.fpicker.VistaFileDialog");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.fpicker.VistaFileDialog"));
 }
 
 // -------------------------------------------------
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index 42bab08800b0..541d1a166687 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -164,7 +164,7 @@ STDMETHODIMP VistaFilePickerEventHandler::OnFolderChange(IFileDialog* /*pDialog*
 //-----------------------------------------------------------------------------------------
 void lcl_updateVersionListDirectly(IFileDialog* pDialog)
 {
-    static const ::rtl::OUString SERVICENAME_REVISIONPERSISTENCE = ::rtl::OUString::createFromAscii("com.sun.star.document.DocumentRevisionListPersistence");
+    static const ::rtl::OUString SERVICENAME_REVISIONPERSISTENCE(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.DocumentRevisionListPersistence"));
     static const ::sal_Int16     CONTROL_VERSIONLIST             = css::ui::dialogs::ExtendedFilePickerElementIds::LISTBOX_VERSION;
 
     TFileDialog          iDialog   (pDialog);
@@ -405,8 +405,8 @@ void VistaFilePickerEventHandler::stopListening()
     }
 }
 
-static const ::rtl::OUString PROP_CONTROL_ID      = ::rtl::OUString::createFromAscii("control_id");
-static const ::rtl::OUString PROP_PICKER_LISTENER = ::rtl::OUString::createFromAscii("picker_listener");
+static const ::rtl::OUString PROP_CONTROL_ID(RTL_CONSTASCII_USTRINGPARAM("control_id"));
+static const ::rtl::OUString PROP_PICKER_LISTENER(RTL_CONSTASCII_USTRINGPARAM("picker_listener"));
 
 //-----------------------------------------------------------------------------------------
 class AsyncPickerEvents : public RequestHandler
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
index c07a476b3671..1149c9657f22 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
@@ -93,24 +93,24 @@ static const ::sal_Int32 FEATURE_PLAY           =  256;
 static const ::sal_Int32 FEATURE_READONLY       =  512;
 static const ::sal_Int32 FEATURE_VERSION        = 1024;
 
-static const ::rtl::OUString PROP_PICKER_LISTENER     = ::rtl::OUString::createFromAscii("picker_listener"    ); // [XFilePickerListenert]
-static const ::rtl::OUString PROP_DIALOG_SHOW_RESULT  = ::rtl::OUString::createFromAscii("dialog_show_result" ); // [sal_Bool] true=OK, false=CANCEL
-static const ::rtl::OUString PROP_SELECTED_FILES      = ::rtl::OUString::createFromAscii("selected_files"     ); // [seq< OUString >] contains all user selected files (can be empty!)
-static const ::rtl::OUString PROP_MULTISELECTION_MODE = ::rtl::OUString::createFromAscii("multiselection_mode"); // [sal_Bool] true=ON, false=OFF
-static const ::rtl::OUString PROP_TITLE               = ::rtl::OUString::createFromAscii("title"              ); // [OUString]
-static const ::rtl::OUString PROP_FILENAME            = ::rtl::OUString::createFromAscii("filename"           ); // [OUString]
-static const ::rtl::OUString PROP_DIRECTORY           = ::rtl::OUString::createFromAscii("directory"          ); // [OUString]
-static const ::rtl::OUString PROP_FEATURES            = ::rtl::OUString::createFromAscii("features"           ); // [sal_Int32]
-static const ::rtl::OUString PROP_TEMPLATE_DESCR      = ::rtl::OUString::createFromAscii("templatedescription"); // [sal_Int32]
-static const ::rtl::OUString PROP_FILTER_TITLE        = ::rtl::OUString::createFromAscii("filter_title"       ); // [OUString]
-static const ::rtl::OUString PROP_FILTER_VALUE        = ::rtl::OUString::createFromAscii("filter_value"       ); // [OUString]
-static const ::rtl::OUString PROP_FORCE               = ::rtl::OUString::createFromAscii("force"              ); // [sal_Bool]
-
-static const ::rtl::OUString PROP_CONTROL_ID          = ::rtl::OUString::createFromAscii("control_id"         ); // [sal_Int16]
-static const ::rtl::OUString PROP_CONTROL_ACTION      = ::rtl::OUString::createFromAscii("control_action"     ); // [sal_Int16]
-static const ::rtl::OUString PROP_CONTROL_VALUE       = ::rtl::OUString::createFromAscii("control_value"      ); // [Any]
-static const ::rtl::OUString PROP_CONTROL_LABEL       = ::rtl::OUString::createFromAscii("control_label"      ); // [OUString]
-static const ::rtl::OUString PROP_CONTROL_ENABLE      = ::rtl::OUString::createFromAscii("control_enable"     ); // [sal_Bool] true=ON, false=OFF
+static const ::rtl::OUString PROP_PICKER_LISTENER(RTL_CONSTASCII_USTRINGPARAM("picker_listener"   ) ); // [XFilePickerListenert]
+static const ::rtl::OUString PROP_DIALOG_SHOW_RESULT(RTL_CONSTASCII_USTRINGPARAM("dialog_show_result" )); // [sal_Bool] true=OK, false=CANCEL
+static const ::rtl::OUString PROP_SELECTED_FILES(RTL_CONSTASCII_USTRINGPARAM("selected_files"     )); // [seq< OUString >] contains all user selected files (can be empty!)
+static const ::rtl::OUString PROP_MULTISELECTION_MODE(RTL_CONSTASCII_USTRINGPARAM("multiselection_mode")); // [sal_Bool] true=ON, false=OFF
+static const ::rtl::OUString PROP_TITLE(RTL_CONSTASCII_USTRINGPARAM("title"              )); // [OUString]
+static const ::rtl::OUString PROP_FILENAME(RTL_CONSTASCII_USTRINGPARAM("filename"          ) ); // [OUString]
+static const ::rtl::OUString PROP_DIRECTORY(RTL_CONSTASCII_USTRINGPARAM("directory"          )); // [OUString]
+static const ::rtl::OUString PROP_FEATURES(RTL_CONSTASCII_USTRINGPARAM("features"           )); // [sal_Int32]
+static const ::rtl::OUString PROP_TEMPLATE_DESCR(RTL_CONSTASCII_USTRINGPARAM("templatedescription")); // [sal_Int32]
+static const ::rtl::OUString PROP_FILTER_TITLE(RTL_CONSTASCII_USTRINGPARAM("filter_title"       )); // [OUString]
+static const ::rtl::OUString PROP_FILTER_VALUE(RTL_CONSTASCII_USTRINGPARAM("filter_value"       )); // [OUString]
+static const ::rtl::OUString PROP_FORCE(RTL_CONSTASCII_USTRINGPARAM("force"              )); // [sal_Bool]
+
+static const ::rtl::OUString PROP_CONTROL_ID(RTL_CONSTASCII_USTRINGPARAM("control_id"         )); // [sal_Int16]
+static const ::rtl::OUString PROP_CONTROL_ACTION(RTL_CONSTASCII_USTRINGPARAM("control_action"     )); // [sal_Int16]
+static const ::rtl::OUString PROP_CONTROL_VALUE(RTL_CONSTASCII_USTRINGPARAM("control_value"      )); // [Any]
+static const ::rtl::OUString PROP_CONTROL_LABEL(RTL_CONSTASCII_USTRINGPARAM("control_label"      )); // [OUString]
+static const ::rtl::OUString PROP_CONTROL_ENABLE(RTL_CONSTASCII_USTRINGPARAM("control_enable"     )); // [sal_Bool] true=ON, false=OFF
 
 //-----------------------------------------------------------------------------
 /** native implementation of the file picker on Vista and upcoming windows versions.
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index b7751a6f83a4..00c41cdfe30a 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -134,7 +134,7 @@ void CWinFileOpenImpl::setDisplayDirectory(const rtl::OUString& aDirectory)
         if ( ::osl::FileBase::E_None !=
              ::osl::FileBase::getSystemPathFromFileURL(aDirectory,aSysDirectory))
             throw IllegalArgumentException(
-                rtl::OUString::createFromAscii("Invalid directory"),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid directory")),
                 static_cast<XFilePicker2*>(m_FilePicker), 1);
 
         // we ensure that there is a trailing '/' at the end of
@@ -205,7 +205,7 @@ sal_Int16 SAL_CALL CWinFileOpenImpl::execute(  ) throw(uno::RuntimeException)
         rc = ::com::sun::star::ui::dialogs::ExecutableDialogResults::CANCEL;
     else
         throw uno::RuntimeException(
-            rtl::OUString::createFromAscii("Error executing dialog"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Error executing dialog")),
             static_cast<XFilePicker2*>(m_FilePicker));
 
     return rc;
@@ -224,7 +224,7 @@ void SAL_CALL CWinFileOpenImpl::appendFilter(const rtl::OUString& aTitle, const
 
     if (!bRet)
         throw IllegalArgumentException(
-            rtl::OUString::createFromAscii("filter already exists"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("filter already exists")),
             static_cast<XFilePicker2*>(m_FilePicker), 1);
 
     // #95345# see MSDN OPENFILENAME
@@ -249,7 +249,7 @@ void SAL_CALL CWinFileOpenImpl::setCurrentFilter(const rtl::OUString& aTitle)
 
     if (filterPos < 0)
         throw IllegalArgumentException(
-            rtl::OUString::createFromAscii("filter doesn't exist"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("filter doesn't exist")),
             static_cast<XFilePicker2*>(m_FilePicker), 1);
 
     // filter index of the base class starts with 1
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
index 0e71ec966b3d..02805f007a8e 100644
--- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
@@ -94,12 +94,12 @@ void SAL_CALL CAsyncEventNotifier::addListener(const uno::Type&
 {
     if ( m_rBroadcastHelper.bDisposed )
         throw lang::DisposedException(
-            ::rtl::OUString::createFromAscii( "FilePicker is already disposed" ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilePicker is already disposed" )),
             uno::Reference< uno::XInterface >() );
 
     if ( m_rBroadcastHelper.bInDispose )
         throw lang::DisposedException(
-            ::rtl::OUString::createFromAscii( "FilePicker will be disposed now." ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilePicker will be disposed now." )),
             uno::Reference< uno::XInterface >() );
 
     m_rBroadcastHelper.aLC.addInterface( aType, xListener );
@@ -114,7 +114,7 @@ void SAL_CALL CAsyncEventNotifier::removeListener(const uno::Type&
 {
     if ( m_rBroadcastHelper.bDisposed )
         throw lang::DisposedException(
-            ::rtl::OUString::createFromAscii( "FilePicker is already disposed." ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilePicker is already disposed." )),
             uno::Reference< uno::XInterface >() );
 
     m_rBroadcastHelper.aLC.removeInterface( aType, xListener );
diff --git a/fpicker/source/win32/filepicker/previewbase.cxx b/fpicker/source/win32/filepicker/previewbase.cxx
index 4047e693a50a..2c26ad2750e6 100644
--- a/fpicker/source/win32/filepicker/previewbase.cxx
+++ b/fpicker/source/win32/filepicker/previewbase.cxx
@@ -90,11 +90,11 @@ void SAL_CALL PreviewBase::setImage( sal_Int16 aImageFormat, const ::com::sun::s
 {
     if (aImageFormat != ::com::sun::star::ui::dialogs::FilePreviewImageFormats::BITMAP)
         throw IllegalArgumentException(
-            OUString::createFromAscii("unsupported image format"), 0, 1);
+            OUString(RTL_CONSTASCII_USTRINGPARAM("unsupported image format")), 0, 1);
 
     if (aImage.hasValue() && (aImage.getValueType() != getCppuType((Sequence<sal_Int8>*)0)))
         throw IllegalArgumentException(
-            OUString::createFromAscii("invalid image data"), 0, 2);
+            OUString(RTL_CONSTASCII_USTRINGPARAM("invalid image data")), 0, 2);
 
      // save the new image data and force a redraw
     m_ImageData   = aImage;
diff --git a/fpicker/source/win32/filepicker/shared.hxx b/fpicker/source/win32/filepicker/shared.hxx
index a1334518b17b..38580770515a 100644
--- a/fpicker/source/win32/filepicker/shared.hxx
+++ b/fpicker/source/win32/filepicker/shared.hxx
@@ -31,9 +31,9 @@
 
 #include <rtl/ustring.hxx>
 
-const ::rtl::OUString BACKSLASH          = ::rtl::OUString::createFromAscii( "\\" );
-const ::rtl::OUString FILTER_SEPARATOR   = ::rtl::OUString::createFromAscii( "------------------------------------------" );
-const ::rtl::OUString ALL_FILES_WILDCARD = ::rtl::OUString::createFromAscii( "*.*" );
+const ::rtl::OUString BACKSLASH(RTL_CONSTASCII_USTRINGPARAM( "\\" ));
+const ::rtl::OUString FILTER_SEPARATOR(RTL_CONSTASCII_USTRINGPARAM( "------------------------------------------" ));
+const ::rtl::OUString ALL_FILES_WILDCARD(RTL_CONSTASCII_USTRINGPARAM( "*.*" ));
 const ::sal_Bool      ALLOW_DUPLICATES   = sal_True;
 
 #endif
diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
index 776268b6e2d2..a0d3aa974a0b 100644
--- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
+++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
@@ -98,7 +98,7 @@ void TestFilterManager( Reference< XFilePicker > xFilePicker );
 
 Reference< XMultiServiceFactory >   g_xFactory;
 
-const OUString BMP_EXTENSION = OUString::createFromAscii( "bmp" );
+const OUString BMP_EXTENSION(RTL_CONSTASCII_USTRINGPARAM( "bmp" ));
 
 //-------------------------------------------------------------------------------------------------------------------------
 // a test client
@@ -294,7 +294,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* Env[]  )
 
     Reference< XFilePicker > xFilePicker = Reference< XFilePicker >(
         g_xFactory->createInstanceWithArguments(
-            OUString::createFromAscii( FILE_PICKER_SERVICE_NAME ), arguments ), UNO_QUERY );
+            OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_SERVICE_NAME )), arguments ), UNO_QUERY );
 
         // install a FilePicker notifier
         Reference< XFilePickerListener > xFPListener(
@@ -304,9 +304,9 @@ int SAL_CALL main(int nArgc, char* Argv[], char* Env[]  )
         if ( xFPNotifier.is( ) )
             xFPNotifier->addFilePickerListener( xFPListener );
 
-        xFilePicker->setTitle( OUString::createFromAscii("FileOpen Simple..."));
+        xFilePicker->setTitle( OUString(RTL_CONSTASCII_USTRINGPARAM("FileOpen Simple...")));
         xFilePicker->setMultiSelectionMode( sal_True );
-        xFilePicker->setDefaultName( OUString::createFromAscii("d:\\test2.sxw"));
+        xFilePicker->setDefaultName( OUString(RTL_CONSTASCII_USTRINGPARAM("d:\\test2.sxw")));
 
         OUString aDirURL;
         OUString aSysPath = OStringToOUString( "d:\\ueaeoe", osl_getThreadTextEncoding( ) );
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx
index bccaac0bf418..5483b7d78ee9 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.cxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx
@@ -71,7 +71,7 @@ namespace
     Sequence< OUString > SAL_CALL FolderPicker_getSupportedServiceNames()
     {
         Sequence< OUString > aRet(1);
-        aRet[0] = OUString::createFromAscii("com.sun.star.ui.dialogs.SystemFolderPicker");
+        aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFolderPicker"));
         return aRet;
     }
 }
@@ -166,7 +166,7 @@ sal_Int16 SAL_CALL CFolderPicker::execute( )
 OUString SAL_CALL CFolderPicker::getImplementationName(  )
     throw( RuntimeException )
 {
-    return OUString::createFromAscii( FOLDERPICKER_IMPL_NAME );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( FOLDERPICKER_IMPL_NAME ));
 }
 
 // -------------------------------------------------
diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
index 143d91dc3527..fdf191f07318 100644
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
@@ -58,7 +58,7 @@ using osl::FileBase;
 //
 //------------------------------------------------------------------------
 
-const OUString BACKSLASH = OUString::createFromAscii( "\\" );
+const OUString BACKSLASH(RTL_CONSTASCII_USTRINGPARAM( "\\" ));
 
 //------------------------------------------------------------------------
 // ctor
@@ -94,7 +94,7 @@ void SAL_CALL CWinFolderPickerImpl::setDisplayDirectory( const OUString& aDirect
 
         if ( ::osl::FileBase::E_None != rc )
             throw IllegalArgumentException(
-                OUString::createFromAscii( "directory is not a valid file url" ),
+                OUString(RTL_CONSTASCII_USTRINGPARAM( "directory is not a valid file url" )),
                 static_cast< XFolderPicker* >( m_pFolderPicker ),
                 1 );
 
diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx
index efd0985d5836..301a5bc9e6bc 100644
--- a/fpicker/source/win32/misc/WinImplHelper.cxx
+++ b/fpicker/source/win32/misc/WinImplHelper.cxx
@@ -54,9 +54,9 @@ using ::com::sun::star::uno::Sequence;
 //
 //------------------------------------------------------------
 
-const rtl::OUString TILDE = OUString::createFromAscii( "~" );
+const rtl::OUString TILDE(RTL_CONSTASCII_USTRINGPARAM( "~" ));
 const sal_Unicode   TILDE_SIGN = L'~';
-const rtl::OUString AMPERSAND = OUString::createFromAscii( "&" );
+const rtl::OUString AMPERSAND(RTL_CONSTASCII_USTRINGPARAM( "&" ));
 const sal_Unicode   AMPERSAND_SIGN = L'&';
 
 //------------------------------------------------------------
@@ -248,7 +248,7 @@ void SAL_CALL ListboxAddItem( HWND hwnd, const Any& aItem, const Reference< XInt
     if ( !aItem.hasValue( ) ||
          aItem.getValueType( ) != getCppuType((OUString*)0) )
          throw IllegalArgumentException(
-            OUString::createFromAscii( "invalid value type or any has no value" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )),
             rXInterface,
             aArgPos );
 
@@ -270,7 +270,7 @@ void SAL_CALL ListboxAddItems( HWND hwnd, const Any& aItemList, const Reference<
     if ( !aItemList.hasValue( ) ||
          aItemList.getValueType( ) != getCppuType((Sequence<OUString>*)0) )
          throw IllegalArgumentException(
-            OUString::createFromAscii( "invalid value type or any has no value" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )),
             rXInterface,
             aArgPos );
 
@@ -298,7 +298,7 @@ void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Referenc
            (aPosition.getValueType( ) != getCppuType((sal_Int16*)0)) &&
            (aPosition.getValueType( ) != getCppuType((sal_Int8*)0)) ) )
          throw IllegalArgumentException(
-            OUString::createFromAscii( "invalid value type or any has no value" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )),
             rXInterface,
             aArgPos );
 
@@ -311,7 +311,7 @@ void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Referenc
     // index was not correct
     if ( CB_ERR == lRet )
         throw IllegalArgumentException(
-            OUString::createFromAscii( "inavlid item position" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid item position" )),
             rXInterface,
             aArgPos );
 }
@@ -350,7 +350,7 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref
            (aPosition.getValueType( ) != getCppuType((sal_Int16*)0)) &&
            (aPosition.getValueType( ) != getCppuType((sal_Int8*)0)) ) )
          throw IllegalArgumentException(
-            OUString::createFromAscii( "invalid value type or any has no value" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )),
             rXInterface,
             aArgPos );
 
@@ -359,7 +359,7 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref
 
     if ( nPos < -1 )
         throw IllegalArgumentException(
-            OUString::createFromAscii("invalid index"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("invalid index")),
             rXInterface,
             aArgPos );
 
@@ -367,7 +367,7 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref
 
     if ( (CB_ERR == lRet) && (-1 != nPos) )
         throw IllegalArgumentException(
-            OUString::createFromAscii("invalid index"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("invalid index")),
             rXInterface,
             aArgPos );
 }
@@ -460,7 +460,7 @@ void SAL_CALL CheckboxSetState(
     if ( !aState.hasValue( ) ||
          aState.getValueType( ) != getCppuType((sal_Bool*)0) )
          throw IllegalArgumentException(
-            OUString::createFromAscii( "invalid value type or any has no value" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )),
             rXInterface,
             aArgPos );
 
diff --git a/framework/inc/classes/addonmenu.hxx b/framework/inc/classes/addonmenu.hxx
index d3518843a6c1..90f6cb42bded 100644
--- a/framework/inc/classes/addonmenu.hxx
+++ b/framework/inc/classes/addonmenu.hxx
@@ -51,18 +51,19 @@ namespace framework
 class AddonMenu : public PopupMenu
 {
     public:
-                        AddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
-                        ~AddonMenu();
+        AddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
+        ~AddonMenu();
 
     protected:
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame;
 };
 
 class AddonMenuManager;
+
 class AddonPopupMenu : public AddonMenu
 {
     public:
-                                ~AddonPopupMenu();
+        ~AddonPopupMenu();
 
         // Check if command URL string has the unique prefix to identify addon popup menus
         static sal_Bool         IsCommandURLPrefix( const rtl::OUString& aCmdURL );
@@ -71,12 +72,12 @@ class AddonPopupMenu : public AddonMenu
         const rtl::OUString&    GetCommandURL() const { return m_aCommandURL; }
 
     protected:
-        void                    Initialize( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rAddonPopupMenuDefinition );
+        void Initialize( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rAddonPopupMenuDefinition );
 
     private:
-                                AddonPopupMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame );
+        AddonPopupMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame );
 
-    rtl::OUString               m_aCommandURL;
+        rtl::OUString               m_aCommandURL;
 
     friend class AddonMenuManager;
 };
diff --git a/framework/inc/classes/addonsoptions.hxx b/framework/inc/classes/addonsoptions.hxx
index eef01ef79467..4d77e4cf0885 100644
--- a/framework/inc/classes/addonsoptions.hxx
+++ b/framework/inc/classes/addonsoptions.hxx
@@ -313,9 +313,9 @@ class AddonsOptions
             @onerror    An empty image
         *//*-*****************************************************************************************************/
 
-        Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const;
+        Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const;
+        Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig ) const;
 
-        Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast ) const;
     //-------------------------------------------------------------------------------------------------------------
     //  private methods
     //-------------------------------------------------------------------------------------------------------------
diff --git a/framework/inc/classes/bmkmenu.hxx b/framework/inc/classes/bmkmenu.hxx
index 2645a535950f..6bfc741857c5 100644
--- a/framework/inc/classes/bmkmenu.hxx
+++ b/framework/inc/classes/bmkmenu.hxx
@@ -54,25 +54,28 @@ class BmkMenu_Impl;
 class BmkMenu : public AddonMenu
 {
     public:
-                        enum BmkMenuType
-                        {
-                            BMK_NEWMENU,
-                            BMK_WIZARDMENU
-                        };
+        enum BmkMenuType
+        {
+            BMK_NEWMENU,
+            BMK_WIZARDMENU
+        };
 
-                        BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
-                                 BmkMenuType nType );
-                        ~BmkMenu();
+        BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+                 BmkMenuType nType
+        );
 
-    void                Initialize(); // Synchrones Laden der Eintraege
+        ~BmkMenu();
+
+        void Initialize(); // Synchrones Laden der Eintraege
 
     protected:
         BmkMenu::BmkMenuType m_nType;
-        USHORT          CreateMenuId();
+        USHORT CreateMenuId();
 
     private:
-                        BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
-                                 BmkMenuType, BmkMenu* pRoot );
+        BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+                 BmkMenuType, BmkMenu* pRoot
+        );
 
         BmkMenu_Impl*   _pImp;
 };
diff --git a/framework/inc/classes/checkediterator.hxx b/framework/inc/classes/checkediterator.hxx
index 353e0a43ae77..4ae7d17eddb2 100644
--- a/framework/inc/classes/checkediterator.hxx
+++ b/framework/inc/classes/checkediterator.hxx
@@ -44,9 +44,7 @@
 //_________________________________________________________________________________________________________________
 #include <sal/types.h>
 
-#ifndef __SGI_STL_ITERATOR
 #include <iterator>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  namespace
diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx
index 2c55f287e82f..99ad2e9268d8 100644
--- a/framework/inc/classes/menumanager.hxx
+++ b/framework/inc/classes/menumanager.hxx
@@ -102,7 +102,11 @@ class MenuManager : public ThreadHelpBase           ,
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory();
 
         static void UpdateSpecialWindowMenu( Menu* pMenu ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,IMutex& _rMutex);
-        static void FillMenuImages(::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& xFrame,Menu* _pMenu,sal_Bool bIsHiContrast,sal_Bool bShowMenuImages);
+        static void FillMenuImages(
+            ::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& xFrame,
+            Menu* _pMenu,
+            sal_Bool bShowMenuImages
+        );
 
     protected:
         DECL_LINK( Highlight, Menu * );
@@ -144,7 +148,6 @@ class MenuManager : public ThreadHelpBase           ,
         sal_Bool                            m_bDeleteChildren;
         sal_Bool                            m_bActive;
         sal_Bool                            m_bIsBookmarkMenu;
-        sal_Bool                            m_bWasHiContrast;
         sal_Bool                            m_bShowMenuImages;
         ::rtl::OUString                     m_aMenuItemCommand;
         Menu*                               m_pVCLMenu;
diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc
index 8c9bd2e854b0..22fd6740c397 100644
--- a/framework/inc/classes/resource.hrc
+++ b/framework/inc/classes/resource.hrc
@@ -69,19 +69,19 @@
 #define RID_IMAGE_STATUSBAR_LOGO                (RID_IMAGE_START+0)
 
 // License Dialog
-#define DLG_LICENSE                         (RID_FWK_DIALOG_START+256)
-#define ML_LICENSE                          (RID_FWK_DIALOG_START+11)
-#define FT_INFO1                            (RID_FWK_DIALOG_START+12)
-#define FT_INFO2                            (RID_FWK_DIALOG_START+13)
-#define FT_INFO3                            (RID_FWK_DIALOG_START+14)
-#define FT_INFO2_1                          (RID_FWK_DIALOG_START+15)
-#define FT_INFO3_1                          (RID_FWK_DIALOG_START+16)
-#define FL_DIVIDE                           (RID_FWK_DIALOG_START+17)
-#define PB_PAGEDOWN                         (RID_FWK_DIALOG_START+18)
-#define IMG_ARROW                           (RID_FWK_DIALOG_START+19)
-#define LICENSE_ACCEPT                      (RID_FWK_DIALOG_START+20)
-#define LICENSE_NOTACCEPT                   (RID_FWK_DIALOG_START+21)
-#define PB_DECLINE                          (RID_FWK_DIALOG_START+22)
-#define PB_ACCEPT                           (RID_FWK_DIALOG_START+23)
+#define DLG_LICENSE                             (RID_FWK_DIALOG_START+256)
+#define ML_LICENSE                              (RID_FWK_DIALOG_START+11)
+#define FT_INFO1                                (RID_FWK_DIALOG_START+12)
+#define FT_INFO2                                (RID_FWK_DIALOG_START+13)
+#define FT_INFO3                                (RID_FWK_DIALOG_START+14)
+#define FT_INFO2_1                              (RID_FWK_DIALOG_START+15)
+#define FT_INFO3_1                              (RID_FWK_DIALOG_START+16)
+#define FL_DIVIDE                               (RID_FWK_DIALOG_START+17)
+#define PB_PAGEDOWN                             (RID_FWK_DIALOG_START+18)
+#define IMG_ARROW                               (RID_FWK_DIALOG_START+19)
+#define LICENSE_ACCEPT                          (RID_FWK_DIALOG_START+20)
+#define LICENSE_NOTACCEPT                       (RID_FWK_DIALOG_START+21)
+#define PB_DECLINE                              (RID_FWK_DIALOG_START+22)
+#define PB_ACCEPT                               (RID_FWK_DIALOG_START+23)
 
 #endif
diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx
index 39b6d14e716f..29c553d2173b 100644
--- a/framework/inc/dispatch/interceptionhelper.hxx
+++ b/framework/inc/dispatch/interceptionhelper.hxx
@@ -58,9 +58,7 @@
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/weakref.hxx>
 
-#ifndef __SGI_STL_DEQUE
 #include <deque>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  namespace
diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc
index 1817b60d90e9..05af2f8ce35f 100644
--- a/framework/inc/framework.hrc
+++ b/framework/inc/framework.hrc
@@ -30,19 +30,19 @@
 
 #include "svl/solar.hrc"
 
-#define RID_FWK_START               260
+#define RID_FWK_START                       260
 
-#define RID_GROUPS_OFFSET           32000
-#define RID_GROUPS_END              32767
+#define RID_GROUPS_OFFSET                   32000
+#define RID_GROUPS_END                      32767
 
 #define RID_FWK_DIALOG_START_CORRECT        (RID_FWK_START + 2048)
 
-#define DLG_FILTER_SELECT           (RID_FWK_DIALOG_START_CORRECT + 0)
+#define DLG_FILTER_SELECT                   (RID_FWK_DIALOG_START_CORRECT + 0)
 
-#define STR_FILTER_DOWNLOAD         (RID_FWK_START+0)
-#define STR_FILTER_CHOOSER          (RID_FWK_START+1)
-#define STR_FILTER_OTHERS           (RID_FWK_START+2)
-#define STR_FILTER_ZIPPED           (RID_FWK_START+3)
+#define STR_FILTER_DOWNLOAD                 (RID_FWK_START+0)
+#define STR_FILTER_CHOOSER                  (RID_FWK_START+1)
+#define STR_FILTER_OTHERS                   (RID_FWK_START+2)
+#define STR_FILTER_ZIPPED                   (RID_FWK_START+3)
 
 // ResIds for BackingWindow
 #define DLG_BACKING                         (RID_FWK_DIALOG_START_CORRECT+100)
@@ -57,13 +57,7 @@
 #define STR_BACKING_TPLREP                  9
 
 #define RES_BACKING_IMAGES                  (DLG_BACKING+1)
-#define RES_BACKING_IMAGES_HC               (DLG_BACKING+2)
 
-#define BMP_BACKING_BACKGROUND_LEFT         1
-#define BMP_BACKING_BACKGROUND_MIDDLE       2
-#define BMP_BACKING_BACKGROUND_RIGHT        3
-#define BMP_BACKING_BACKGROUND_RTL_LEFT     4
-#define BMP_BACKING_BACKGROUND_RTL_RIGHT    5
 #define BMP_BACKING_EXT                     6
 #define BMP_BACKING_REG                     7
 #define BMP_BACKING_INFO                    8
diff --git a/framework/inc/helper/imageproducer.hxx b/framework/inc/helper/imageproducer.hxx
index 36542832bf18..7a488011dedc 100644
--- a/framework/inc/helper/imageproducer.hxx
+++ b/framework/inc/helper/imageproducer.hxx
@@ -40,14 +40,22 @@
 namespace framework
 {
 
-typedef Image ( *pfunc_getImage)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
+typedef Image ( *pfunc_getImage)(
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    const ::rtl::OUString& aURL,
+    BOOL bBig
+);
 
 pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pGetImageFunc );
 
-Image SAL_CALL GetImageFromURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
+Image SAL_CALL GetImageFromURL(
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    const ::rtl::OUString& aURL,
+    BOOL bBig
+);
 
 }
 
-#endif // __FRAMEWORK_HELPER_IMAGEPRODUCER_HXX_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/macros/debug/memorymeasure.hxx b/framework/inc/macros/debug/memorymeasure.hxx
index b0c441127337..a7bf5c1df258 100644
--- a/framework/inc/macros/debug/memorymeasure.hxx
+++ b/framework/inc/macros/debug/memorymeasure.hxx
@@ -50,9 +50,7 @@
     #include <rtl/strbuf.hxx>
     #endif
 
-    #ifndef __SGI_STL_VECTOR
     #include <vector>
-    #endif
 
     /*_____________________________________________________________________________________________________________
         LOGFILE_MEMORYMEASURE
diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx
index 8c72a556f4a7..f031a37ff8b4 100644
--- a/framework/inc/macros/xserviceinfo.hxx
+++ b/framework/inc/macros/xserviceinfo.hxx
@@ -157,7 +157,7 @@ ________________________________________________________________________________
         throw( css::uno::Exception )                                                                                                                                \
     {                                                                                                                                                               \
         /* retrieve component context from the given service manager */                                                                                             \
-        static const ::rtl::OUString PROP_DEFAULTCONTEXT = ::rtl::OUString::createFromAscii("DefaultContext");                                                      \
+        static const ::rtl::OUString PROP_DEFAULTCONTEXT(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"));                                                        \
         css::uno::Reference< css::beans::XPropertySet >    xSMGRProps(xServiceManager, css::uno::UNO_QUERY_THROW);                                                  \
         css::uno::Reference< css::uno::XComponentContext > xComponentContext;                                                                                       \
         xSMGRProps->getPropertyValue( PROP_DEFAULTCONTEXT ) >>= xComponentContext;                                                                                  \
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index 8dcc87227780..79e04ca967ac 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -429,6 +429,8 @@ class Desktop   :   // interfaces
          */
         ::sal_Bool impl_closeFrames(::sal_Bool bAllowUI);
 
+        sal_Bool impl_terminate();
+
     //-------------------------------------------------------------------------------------------------------------
     //  debug methods
     //  (should be private everytime!)
@@ -507,6 +509,8 @@ class Desktop   :   // interfaces
 
         css::uno::Reference< css::frame::XUntitledNumbers > m_xTitleNumberGenerator;
 
+        bool m_bTerminating;    // we are in the process of terminating already
+
 };      //  class Desktop
 
 }       //  namespace framework
diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx
index 63d7523b9e90..e575ff7ee469 100644
--- a/framework/inc/services/substitutepathvars.hxx
+++ b/framework/inc/services/substitutepathvars.hxx
@@ -192,10 +192,9 @@ enum PreDefVariable
     PREDEFVAR_PROGURL,
     PREDEFVAR_USERURL,
     PREDEFVAR_WORKDIRURL,
-    // --> PB 2004-10-27 #i32656# - new variable of hierachy service
+    // New variable of hierachy service (#i32656#)
     PREDEFVAR_BASEINSTURL,
     PREDEFVAR_USERDATAURL,
-    // <--
     PREDEFVAR_BRANDBASEURL,
     PREDEFVAR_COUNT
 };
diff --git a/framework/inc/uiconfiguration/imagetype.hxx b/framework/inc/uiconfiguration/imagetype.hxx
index 9ccf1c8ebb3d..4c2b2b687321 100644
--- a/framework/inc/uiconfiguration/imagetype.hxx
+++ b/framework/inc/uiconfiguration/imagetype.hxx
@@ -39,8 +39,6 @@ enum ImageType
 {
     ImageType_Color = 0,
     ImageType_Color_Large,
-    ImageType_HC,
-    ImageType_HC_Large,
     ImageType_COUNT
 };
 
diff --git a/framework/inc/uielement/controlmenucontroller.hxx b/framework/inc/uielement/controlmenucontroller.hxx
index 3bbc0ba9b055..9d307bba4af5 100644
--- a/framework/inc/uielement/controlmenucontroller.hxx
+++ b/framework/inc/uielement/controlmenucontroller.hxx
@@ -106,8 +106,7 @@ namespace framework
             void updateImagesPopupMenu( PopupMenu* pPopupMenu );
             void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
 
-            sal_Bool            m_bWasHiContrast : 1,
-                                m_bShowMenuImages : 1;
+            sal_Bool            m_bShowMenuImages : 1;
             PopupMenu*          m_pResPopupMenu;
             UrlToDispatchMap    m_aURLToDispatchMap;
     };
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index 3555ea9fc7df..bc9c422dd24d 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -248,7 +248,6 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
                                                                                                m_bDeleteChildren : 1,
                                                                                                m_bActive : 1,
                                                                                                m_bIsBookmarkMenu : 1,
-                                                                                               m_bWasHiContrast : 1,
                                                                                                m_bShowMenuImages : 1;
         sal_Bool                                                                               m_bRetrieveImages : 1,
                                                                                                m_bAcceleratorCfg : 1;
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index 628f360e506d..e89002ff19ae 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
@@ -113,12 +113,11 @@ namespace framework
                                                      std::vector< KeyCode >& aMenuShortCuts );
             void setAccelerators( PopupMenu* pPopupMenu );
             void determineAndSetNewDocAccel( PopupMenu* pPopupMenu, const KeyCode& rKeyCode );
-            void setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImages, sal_Bool bHiContrast );
+            void setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImages );
 
         private:
             // members
             sal_Bool            m_bShowImages : 1,
-                                m_bHiContrast : 1,
                                 m_bNewMenu    : 1,
                                 m_bModuleIdentified : 1,
                                 m_bAcceleratorCfg : 1;
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index f09ec6b6db75..0fbd7b6d3e6b 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -200,7 +200,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
         sal_uInt16 ConvertStyleToToolboxItemBits( sal_Int32 nStyle );
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModelFromFrame() const;
         sal_Bool IsPluginMode() const;
-        Image QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages, bool bHiContrast );
+        Image QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages );
         long HandleClick(void ( SAL_CALL ::com::sun::star::frame::XToolbarController::*_pClick )(  ));
         void setToolBarImage(const Image& _aImage,const CommandToInfoMap::const_iterator& _pIter);
         void impl_elementChanged(bool _bRemove,const ::com::sun::star::ui::ConfigurationEvent& Event );
@@ -215,7 +215,6 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
 
         typedef ::std::hash_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > > MenuDescriptionMap;
         sal_Bool                                                                               m_bDisposed : 1,
-                                                                                               m_bIsHiContrast : 1,
                                                                                                m_bSmallSymbols : 1,
                                                                                                m_bModuleIdentified : 1,
                                                                                                m_bAddedToTaskPaneList : 1,
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index d00c2d451566..6577ece9d77f 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -189,13 +189,13 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
         (aKeyEvent.Modifiers == 0)
         )
         throw css::lang::IllegalArgumentException(
-        ::rtl::OUString::createFromAscii("Such key event seams not to be supported by any operating system."),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Such key event seams not to be supported by any operating system.")),
         static_cast< ::cppu::OWeakObject* >(this),
         0);
 
     if (!sCommand.getLength())
         throw css::lang::IllegalArgumentException(
-        ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
         static_cast< ::cppu::OWeakObject* >(this),
         1);
 
@@ -235,7 +235,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati
 {
     if (!sCommand.getLength())
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
                 static_cast< ::cppu::OWeakObject* >(this),
                 1);
 
@@ -272,7 +272,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::g
         const ::rtl::OUString& rCommand = lCommandList[i];
         if (!rCommand.getLength())
             throw css::lang::IllegalArgumentException(
-                    ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
                     static_cast< ::cppu::OWeakObject* >(this),
                     (sal_Int16)i);
 
@@ -301,7 +301,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
 {
     if (!sCommand.getLength())
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
                 static_cast< ::cppu::OWeakObject* >(this),
                 0);
 
@@ -311,7 +311,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
     AcceleratorCache& rCache = impl_getCFG(sal_True); // TRUE => force getting of a writeable cache!
     if (!rCache.hasCommand(sCommand))
         throw css::container::NoSuchElementException(
-                ::rtl::OUString::createFromAscii("Command does not exists inside this container."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command does not exists inside this container.")),
                 static_cast< ::cppu::OWeakObject* >(this));
     rCache.removeCommand(sCommand);
 
@@ -342,7 +342,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload()
         xIn = xStream->getInputStream();
     if (!xIn.is())
         throw css::io::IOException(
-        ::rtl::OUString::createFromAscii("Could not open accelerator configuration for reading."),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Could not open accelerator configuration for reading.")),
         static_cast< ::cppu::OWeakObject* >(this));
 
     // impl_ts_load() does not clear the cache
@@ -381,7 +381,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::store()
 
     if (!xOut.is())
         throw css::io::IOException(
-        ::rtl::OUString::createFromAscii("Could not open accelerator configuration for saving."),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Could not open accelerator configuration for saving.")),
         static_cast< ::cppu::OWeakObject* >(this));
 
     impl_ts_save(xOut);
@@ -408,7 +408,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
 
     if (!xOut.is())
         throw css::io::IOException(
-                ::rtl::OUString::createFromAscii("Could not open accelerator configuration for saving."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Could not open accelerator configuration for saving.")),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     impl_ts_save(xOut);
@@ -635,9 +635,9 @@ AcceleratorCache& XMLBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bWriteA
 //-----------------------------------------------
 ::comphelper::Locale XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const
 {
-    static ::rtl::OUString LOCALE_PACKAGE = ::rtl::OUString::createFromAscii("/org.openoffice.Setup");
-    static ::rtl::OUString LOCALE_PATH    = ::rtl::OUString::createFromAscii("L10N"                 );
-    static ::rtl::OUString LOCALE_KEY     = ::rtl::OUString::createFromAscii("ooLocale"             );
+    static ::rtl::OUString LOCALE_PACKAGE(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup"));
+    static ::rtl::OUString LOCALE_PATH(RTL_CONSTASCII_USTRINGPARAM("L10N"));
+    static ::rtl::OUString LOCALE_KEY(RTL_CONSTASCII_USTRINGPARAM("ooLocale"));
 
     // SAFE -> ----------------------------------
     ReadGuard aReadLock(m_aLock);
@@ -760,13 +760,13 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
         (aKeyEvent.Modifiers == 0)
         )
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii("Such key event seams not to be supported by any operating system."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Such key event seams not to be supported by any operating system.")),
                 static_cast< ::cppu::OWeakObject* >(this),
                 0);
 
     if (!sCommand.getLength())
                 throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
                 static_cast< ::cppu::OWeakObject* >(this),
                 1);
 
@@ -883,7 +883,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati
 {
     if (!sCommand.getLength())
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
                 static_cast< ::cppu::OWeakObject* >(this),
                 1);
 
@@ -947,7 +947,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::g
         const ::rtl::OUString& rCommand = lCommandList[i];
         if (!rCommand.getLength())
             throw css::lang::IllegalArgumentException(
-                    ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
                     static_cast< ::cppu::OWeakObject* >(this),
                     (sal_Int16)i);
 
@@ -980,7 +980,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
 {
     if (!sCommand.getLength())
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")),
                 static_cast< ::cppu::OWeakObject* >(this),
                 0);
 
@@ -992,7 +992,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
 
     if (!rPrimaryCache.hasCommand(sCommand) && !rSecondaryCache.hasCommand(sCommand))
         throw css::container::NoSuchElementException(
-                ::rtl::OUString::createFromAscii("Command does not exists inside this container."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command does not exists inside this container.")),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     if (rPrimaryCache.hasCommand(sCommand))
@@ -1084,17 +1084,17 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
         return;
 
     long nOpenModes = css::embed::ElementModes::READWRITE;
-    css::uno::Reference< css::embed::XStorage > xAcceleratorTypeStorage = xStorage->openStorageElement(::rtl::OUString::createFromAscii("accelerator"), nOpenModes);
+    css::uno::Reference< css::embed::XStorage > xAcceleratorTypeStorage = xStorage->openStorageElement(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("accelerator")), nOpenModes);
     if (!xAcceleratorTypeStorage.is())
         return;
 
-    css::uno::Reference< css::io::XStream > xStream = xAcceleratorTypeStorage->openStreamElement(::rtl::OUString::createFromAscii("current"), nOpenModes);
+    css::uno::Reference< css::io::XStream > xStream = xAcceleratorTypeStorage->openStreamElement(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("current")), nOpenModes);
     css::uno::Reference< css::io::XOutputStream > xOut;
     if (xStream.is())
         xOut = xStream->getOutputStream();
     if (!xOut.is())
         throw css::io::IOException(
-        ::rtl::OUString::createFromAscii("Could not open accelerator configuration for saving."),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Could not open accelerator configuration for saving.")),
         static_cast< ::cppu::OWeakObject* >(this));
 
     // the original m_aCache has been split into primay cache and secondary cache...
@@ -1293,7 +1293,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
     }
 
     const ::rtl::OUString sIsoLang       = impl_ts_getLocale().toISO();
-    const ::rtl::OUString sDefaultLocale = ::rtl::OUString::createFromAscii("en-US");
+    const ::rtl::OUString sDefaultLocale(RTL_CONSTASCII_USTRINGPARAM("en-US"));
 
     css::uno::Reference< css::container::XNameAccess > xKey;
     css::uno::Reference< css::container::XNameAccess > xCommand;
@@ -1342,7 +1342,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
 
             sal_Int32 nIndex = 0;
             ::rtl::OUString sKeyCommand = sKey.getToken(0, '_', nIndex);
-            ::rtl::OUString sPrefix = ::rtl::OUString::createFromAscii("KEY_");
+            ::rtl::OUString sPrefix(RTL_CONSTASCII_USTRINGPARAM("KEY_"));
             aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(sPrefix + sKeyCommand);
 
             css::uno::Sequence< ::rtl::OUString > sToken(4);
@@ -1577,7 +1577,7 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr
 
     sal_Int32 nIndex = 0;
     sKeyIdentifier = sKey.getToken(0, '_', nIndex);
-    aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(::rtl::OUString::createFromAscii("KEY_")+sKeyIdentifier);
+    aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_"))+sKeyIdentifier);
 
     css::uno::Sequence< ::rtl::OUString > sToken(3);
     const sal_Int32 nToken = 3;
@@ -1677,9 +1677,9 @@ AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bPrefer
 //-----------------------------------------------
 ::comphelper::Locale XCUBasedAcceleratorConfiguration::impl_ts_getLocale() const
 {
-    static ::rtl::OUString LOCALE_PACKAGE = ::rtl::OUString::createFromAscii("/org.openoffice.Setup");
-    static ::rtl::OUString LOCALE_PATH    = ::rtl::OUString::createFromAscii("L10N"                 );
-    static ::rtl::OUString LOCALE_KEY     = ::rtl::OUString::createFromAscii("ooLocale"             );
+    static ::rtl::OUString LOCALE_PACKAGE(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup"));
+    static ::rtl::OUString LOCALE_PATH(RTL_CONSTASCII_USTRINGPARAM("L10N"));
+    static ::rtl::OUString LOCALE_KEY(RTL_CONSTASCII_USTRINGPARAM("ooLocale"));
 
     // SAFE -> ----------------------------------
     ReadGuard aReadLock(m_aLock);
diff --git a/framework/source/accelerators/acceleratorexecute.cxx b/framework/source/accelerators/acceleratorexecute.cxx
index 185cb3fbfb49..298c02b27f10 100644
--- a/framework/source/accelerators/acceleratorexecute.cxx
+++ b/framework/source/accelerators/acceleratorexecute.cxx
@@ -358,7 +358,7 @@ IMPL_LINK(AcceleratorExecute, impl_ts_asyncCallback, void*, pVoid)
         if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
         {
             Sequence<css::beans::PropertyValue> source;
-            ::comphelper::UiEventsLogger::appendDispatchOrigin(OUString::createFromAscii("AcceleratorExecute"));
+            ::comphelper::UiEventsLogger::appendDispatchOrigin(OUString(RTL_CONSTASCII_USTRINGPARAM("AcceleratorExecute")));
             ::comphelper::UiEventsLogger::logDispatch(aURL, source);
         }
         xDispatch->dispatch(aURL, css::uno::Sequence< css::beans::PropertyValue >());
diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx
index bd8a34b1f565..36999f0a64e0 100644
--- a/framework/source/accelerators/documentacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx
@@ -121,7 +121,7 @@ void SAL_CALL DocumentAcceleratorConfiguration::initialize(const css::uno::Seque
 
     ::comphelper::SequenceAsHashMap lArgs(lArguments);
     m_xDocumentRoot = lArgs.getUnpackedValueOrDefault(
-                        ::rtl::OUString::createFromAscii("DocumentRoot"),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentRoot")),
                         css::uno::Reference< css::embed::XStorage >());
 
     aWriteLock.unlock();
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index 07e98c8c6e76..42f2bba1d283 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -114,12 +114,12 @@ void SAL_CALL ModuleAcceleratorConfiguration::initialize(const css::uno::Sequenc
     WriteGuard aWriteLock(m_aLock);
 
     ::comphelper::SequenceAsHashMap lArgs(lArguments);
-    m_sModule = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleIdentifier"), ::rtl::OUString());
-    m_sLocale = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("Locale")          , ::rtl::OUString::createFromAscii("x-default"));
+    m_sModule = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleIdentifier")), ::rtl::OUString());
+    m_sLocale = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Locale"))          , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x-default")));
 
     if (!m_sModule.getLength())
         throw css::uno::RuntimeException(
-                ::rtl::OUString::createFromAscii("The module dependend accelerator configuration service was initialized with an empty module identifier!"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The module dependend accelerator configuration service was initialized with an empty module identifier!")),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     aWriteLock.unlock();
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index 6287a796c966..bcd4788790d0 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -212,7 +212,7 @@ void PresetHandler::forgetCachedStorages()
 //-----------------------------------------------
 ::rtl::OUString lcl_getLocalizedMessage(::sal_Int32 nID)
 {
-    ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii("Unknown error.");
+    ::rtl::OUString sMessage(RTL_CONSTASCII_USTRINGPARAM("Unknown error."));
 
     switch(nID)
     {
@@ -260,7 +260,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag
     // Note: May be an user uses URLs without a final slash! Check it ...
     nPos = sShareLayer.lastIndexOf('/');
     if (nPos != sShareLayer.getLength()-1)
-        sShareLayer += ::rtl::OUString::createFromAscii("/");
+        sShareLayer += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
     sShareLayer += RELPATH_SHARE_LAYER; // folder
     /*
@@ -316,7 +316,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag
     // Note: May be an user uses URLs without a final slash! Check it ...
     sal_Int32 nPos = sUserLayer.lastIndexOf('/');
     if (nPos != sUserLayer.getLength()-1)
-        sUserLayer += ::rtl::OUString::createFromAscii("/");
+        sUserLayer += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
     sUserLayer  += RELPATH_USER_LAYER; // storage file
 
@@ -416,7 +416,7 @@ void PresetHandler::connectToResource(      PresetHandler::EConfigType
     {
         if (!xDocumentRoot.is())
             throw css::uno::RuntimeException(
-                    ::rtl::OUString::createFromAscii("There is valid root storage, where the UI configuration can work on."),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("There is valid root storage, where the UI configuration can work on.")),
                     css::uno::Reference< css::uno::XInterface >());
         m_lDocumentStorages.setRootStorage(xDocumentRoot);
         xShare = xDocumentRoot;
diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx
index 6537f934d680..88d3fe1977c6 100644
--- a/framework/source/accelerators/storageholder.cxx
+++ b/framework/source/accelerators/storageholder.cxx
@@ -64,7 +64,7 @@
 
 #define PATH_SEPERATOR_ASCII        "/"
 #define PATH_SEPERATOR_UNICODE      ((sal_Unicode)'/')
-#define PATH_SEPERATOR              ::rtl::OUString::createFromAscii(PATH_SEPERATOR_ASCII)
+#define PATH_SEPERATOR              ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATH_SEPERATOR_ASCII))
 
 //===============================================
 // namespace
diff --git a/framework/source/classes/addonsoptions.cxx b/framework/source/classes/addonsoptions.cxx
index ccfbbfbffca1..ae1a7553f28a 100644
--- a/framework/source/classes/addonsoptions.cxx
+++ b/framework/source/classes/addonsoptions.cxx
@@ -269,7 +269,7 @@ class AddonsOptions_Impl : public ConfigItem
         const Sequence< Sequence< PropertyValue > >&    GetAddonsToolBarPart ( sal_uInt32 nIndex ) const ;
         const ::rtl::OUString                           GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const;
         const Sequence< Sequence< PropertyValue > >&    GetAddonsHelpMenu    () const ;
-        Image                                           GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const;
+        Image                                           GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const;
         const MergeMenuInstructionContainer&            GetMergeMenuInstructions() const;
         bool                                            GetMergeToolbarInstructions( const ::rtl::OUString& rToolbarName, MergeToolbarInstructionContainer& rToolbarInstructions ) const;
 
@@ -292,13 +292,9 @@ class AddonsOptions_Impl : public ConfigItem
         {
             Image   aImageSmall;
             Image   aImageBig;
-            Image   aImageSmallHC;
-            Image   aImageBigHC;
 
             Image   aImageSmallNoScale;
             Image   aImageBigNoScale;
-            Image   aImageSmallHCNoScale;
-            Image   aImageBigHCNoScale;
         };
 
         typedef std::hash_map< ::rtl::OUString, ImageEntry, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ImageManager;
@@ -366,15 +362,15 @@ class AddonsOptions_Impl : public ConfigItem
         ImageEntry* ReadOptionalImageData( const ::rtl::OUString& aMenuNodeName );
 
         sal_Int32                                         m_nRootAddonPopupMenuId;
-        ::rtl::OUString                                          m_aPropNames[PROPERTYCOUNT_INDEX];
-        ::rtl::OUString                                          m_aPropImagesNames[PROPERTYCOUNT_IMAGES];
-        ::rtl::OUString                                          m_aPropMergeMenuNames[PROPERTYCOUNT_MERGE_MENUBAR];
-        ::rtl::OUString                                          m_aPropMergeToolbarNames[PROPERTYCOUNT_MERGE_TOOLBAR];
-        ::rtl::OUString                                          m_aEmpty;
-        ::rtl::OUString                                          m_aPathDelimiter;
-        ::rtl::OUString                                          m_aSeparator;
-        ::rtl::OUString                                          m_aRootAddonPopupMenuURLPrexfix;
-        ::rtl::OUString                                          m_aPrivateImageURL;
+        ::rtl::OUString                                   m_aPropNames[PROPERTYCOUNT_INDEX];
+        ::rtl::OUString                                   m_aPropImagesNames[PROPERTYCOUNT_IMAGES];
+        ::rtl::OUString                                   m_aPropMergeMenuNames[PROPERTYCOUNT_MERGE_MENUBAR];
+        ::rtl::OUString                                   m_aPropMergeToolbarNames[PROPERTYCOUNT_MERGE_TOOLBAR];
+        ::rtl::OUString                                   m_aEmpty;
+        ::rtl::OUString                                   m_aPathDelimiter;
+        ::rtl::OUString                                   m_aSeparator;
+        ::rtl::OUString                                   m_aRootAddonPopupMenuURLPrexfix;
+        ::rtl::OUString                                   m_aPrivateImageURL;
         Sequence< Sequence< PropertyValue > >             m_aCachedMenuProperties;
         Sequence< Sequence< PropertyValue > >             m_aCachedMenuBarPartProperties;
         AddonToolBars                                     m_aCachedToolBarPartProperties;
@@ -607,27 +603,17 @@ bool AddonsOptions_Impl::GetMergeToolbarInstructions(
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-Image AddonsOptions_Impl::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const
+Image AddonsOptions_Impl::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const
 {
     Image aImage;
 
     ImageManager::const_iterator pIter = m_aImageManager.find( aURL );
     if ( pIter != m_aImageManager.end() )
     {
-        if ( !bHiContrast  )
-        {
-            if ( bNoScale )
-                aImage = ( bBig ? pIter->second.aImageBigNoScale : pIter->second.aImageSmallNoScale );
-            if ( !aImage )
-                aImage = ( bBig ? pIter->second.aImageBig : pIter->second.aImageSmall );
-        }
-        else
-        {
-            if ( bNoScale )
-                aImage = ( bBig ? pIter->second.aImageBigHCNoScale : pIter->second.aImageSmallHCNoScale );
-            if ( !aImage )
-                aImage = ( bBig ? pIter->second.aImageBigHC : pIter->second.aImageSmallHC );
-        }
+        if ( bNoScale )
+            aImage = ( bBig ? pIter->second.aImageBigNoScale : pIter->second.aImageSmallNoScale );
+        if ( !aImage )
+            aImage = ( bBig ? pIter->second.aImageBig : pIter->second.aImageSmall );
     }
 
     return aImage;
@@ -1406,8 +1392,8 @@ void AddonsOptions_Impl::ReadImageFromURL( ImageSize nImageSize, const ::rtl::OU
 //*****************************************************************************************************************
 void AddonsOptions_Impl::ReadAndAssociateImages( const ::rtl::OUString& aURL, const ::rtl::OUString& aImageId )
 {
-    const int   MAX_NUM_IMAGES = 4;
-    const char* aExtArray[MAX_NUM_IMAGES] = { "_16", "_26", "_16h", "_26h" };
+    const int   MAX_NUM_IMAGES = 2;
+    const char* aExtArray[MAX_NUM_IMAGES] = { "_16", "_26" };
     const char* pBmpExt = ".bmp";
 
     if ( aImageId.getLength() == 0 )
@@ -1442,14 +1428,6 @@ void AddonsOptions_Impl::ReadAndAssociateImages( const ::rtl::OUString& aURL, co
                     aImageEntry.aImageBig            = aImage;
                     aImageEntry.aImageBigNoScale     = aImageNoScale;
                     break;
-                case 2:
-                    aImageEntry.aImageSmallHC        = aImage;
-                    aImageEntry.aImageSmallHCNoScale = aImageNoScale;
-                    break;
-                case 3:
-                    aImageEntry.aImageBigHC          = aImage;
-                    aImageEntry.aImageBigHCNoScale   = aImageNoScale;
-                    break;
             }
         }
     }
@@ -1482,8 +1460,7 @@ AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const ::rtl::
             if (( aPropertyData[i] >>= aImageDataSeq ) &&
                 aImageDataSeq.getLength() > 0 &&
                 ( CreateImageFromSequence( aImage,
-                                        (( i == OFFSET_IMAGES_BIG ) ||
-                                        ( i == OFFSET_IMAGES_BIGHC )),
+                                        ( i == OFFSET_IMAGES_BIG ),
                                         aImageDataSeq )) )
             {
                 if ( !pEntry )
@@ -1493,10 +1470,6 @@ AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const ::rtl::
                     pEntry->aImageSmall = aImage;
                 else if ( i == OFFSET_IMAGES_BIG )
                     pEntry->aImageBig = aImage;
-                else if ( i == OFFSET_IMAGES_SMALLHC )
-                    pEntry->aImageSmallHC = aImage;
-                else
-                    pEntry->aImageBigHC = aImage;
             }
         }
         else
@@ -1523,21 +1496,11 @@ AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const ::rtl::
                         pEntry->aImageSmall = aImage;
                         pEntry->aImageSmallNoScale = aImageNoScale;
                     }
-                    else if ( i == OFFSET_IMAGES_BIG_URL && !pEntry->aImageBig )
+                    else if ( !pEntry->aImageBig )
                     {
                         pEntry->aImageBig = aImage;
                         pEntry->aImageBigNoScale = aImageNoScale;
                     }
-                    else if ( i == OFFSET_IMAGES_SMALLHC_URL && !pEntry->aImageSmallHC )
-                    {
-                        pEntry->aImageSmallHC = aImage;
-                        pEntry->aImageSmallHCNoScale = aImageNoScale;
-                    }
-                    else if ( !pEntry->aImageBigHC )
-                    {
-                        pEntry->aImageBigHC = aImage;
-                        pEntry->aImageBigHCNoScale = aImageNoScale;
-                    }
                 }
             }
         }
@@ -1806,18 +1769,18 @@ bool AddonsOptions::GetMergeToolbarInstructions(
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const
+Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
-    return m_pDataContainer->GetImageFromURL( aURL, bBig, bHiContrast, bNoScale );
+    return m_pDataContainer->GetImageFromURL( aURL, bBig, bNoScale );
 }
 
 //*****************************************************************************************************************
 //  public method
 //*****************************************************************************************************************
-Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast ) const
+Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig ) const
 {
-    return GetImageFromURL( aURL, bBig, bHiContrast, sal_False );
+    return GetImageFromURL( aURL, bBig, sal_False );
 }
 
 //*****************************************************************************************************************
diff --git a/framework/source/classes/bmkmenu.cxx b/framework/source/classes/bmkmenu.cxx
index 2910cd65bd07..32da85841494 100644
--- a/framework/source/classes/bmkmenu.cxx
+++ b/framework/source/classes/bmkmenu.cxx
@@ -171,8 +171,6 @@ void BmkMenu::Initialize()
     ::rtl::OUString aTargetFrame;
     ::rtl::OUString aImageId;
 
-    BOOL bIsHiContrastMode = rSettings.GetHighContrastMode();
-
     UINT32 i, nCount = aDynamicMenuEntries.getLength();
     for ( i = 0; i < nCount; ++i )
     {
@@ -192,7 +190,7 @@ void BmkMenu::Initialize()
             {
                 if ( aImageId.getLength() > 0 )
                 {
-                    Image aImage = GetImageFromURL( m_xFrame, aImageId, FALSE, bIsHiContrastMode );
+                    Image aImage = GetImageFromURL( m_xFrame, aImageId, FALSE );
                     if ( !!aImage )
                     {
                         bImageSet = sal_True;
@@ -202,7 +200,7 @@ void BmkMenu::Initialize()
 
                 if ( !bImageSet )
                 {
-                    Image aImage = GetImageFromURL( m_xFrame, aURL, FALSE, bIsHiContrastMode );
+                    Image aImage = GetImageFromURL( m_xFrame, aURL, FALSE );
                     if ( !aImage )
                         InsertItem( nId, aTitle );
                     else
@@ -212,8 +210,6 @@ void BmkMenu::Initialize()
             else
                 InsertItem( nId, aTitle );
 
-            // Store values from configuration to the New and Wizard menu entries to enable
-            // sfx2 based code to support high contrast mode correctly!
             MenuConfiguration::Attributes* pUserAttributes = new MenuConfiguration::Attributes( aTargetFrame, aImageId );
             SetUserValue( nId, (ULONG)pUserAttributes );
 
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index 1a68e18cb8bb..d5e2e602b445 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -50,12 +50,11 @@
 #include <vcl/image.hxx>
 #include <vcl/msgbox.hxx>
 
-const ::rtl::OUString SERVICENAME_WINPROVIDER
-                                        = ::rtl::OUString::createFromAscii("com.sun.star.awt.ContainerWindowProvider");
-const ::rtl::OUString EXTERNAL_EVENT    = ::rtl::OUString::createFromAscii("external_event");
-const ::rtl::OUString BACK_METHOD       = ::rtl::OUString::createFromAscii("back");
-const ::rtl::OUString INITIALIZE_METHOD = ::rtl::OUString::createFromAscii("initialize");
-const ::rtl::OUString OK_METHOD         = ::rtl::OUString::createFromAscii("ok");
+const ::rtl::OUString SERVICENAME_WINPROVIDER(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.ContainerWindowProvider"));
+const ::rtl::OUString EXTERNAL_EVENT(RTL_CONSTASCII_USTRINGPARAM("external_event"));
+const ::rtl::OUString BACK_METHOD(RTL_CONSTASCII_USTRINGPARAM("back"));
+const ::rtl::OUString INITIALIZE_METHOD(RTL_CONSTASCII_USTRINGPARAM("initialize"));
+const ::rtl::OUString OK_METHOD(RTL_CONSTASCII_USTRINGPARAM("ok"));
 
 using namespace ::com::sun::star;
 
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 2275a1d7eb82..15e6a815b787 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -152,7 +152,6 @@ MenuManager::MenuManager(
     SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)this )->acquire();
 
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-    m_bWasHiContrast    = rSettings.GetHighContrastMode();
     m_bShowMenuImages   = rSettings.GetUseImagesInMenus();
 
     sal_Int32 nAddonsURLPrefixLength = ADDONSPOPUPMENU_URL_PREFIX.getLength();
@@ -212,7 +211,7 @@ MenuManager::MenuManager(
                         // Set image for the addon popup menu item
                         if ( bShowMenuImages && !pPopupMenu->GetItemImage( ITEMID_ADDONLIST ))
                         {
-                            Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast );
+                            Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE );
                             if ( !!aImage )
                                    pPopupMenu->SetItemImage( ITEMID_ADDONLIST, aImage );
                         }
@@ -239,7 +238,7 @@ MenuManager::MenuManager(
                 AddMenu(pSubMenu,::rtl::OUString(),nItemId,sal_True,sal_False);
                 if ( bShowMenuImages && !pMenu->GetItemImage( nItemId ))
                 {
-                    Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast );
+                    Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE );
                     if ( !!aImage )
                            pMenu->SetItemImage( nItemId, aImage );
                 }
@@ -261,7 +260,7 @@ MenuManager::MenuManager(
 
                 if ( bShowMenuImages && !pMenu->GetItemImage( nItemId ))
                 {
-                    Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast );
+                    Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE );
                     if ( !!aImage )
                            pMenu->SetItemImage( nItemId, aImage );
                 }
@@ -282,14 +281,14 @@ MenuManager::MenuManager(
                         if ( pMenuAttributes && pMenuAttributes->aImageId.getLength() > 0 )
                         {
                             // Retrieve image id from menu attributes
-                            aImage = GetImageFromURL( rFrame, aImageId, FALSE, m_bWasHiContrast );
+                            aImage = GetImageFromURL( rFrame, aImageId, FALSE );
                         }
 
                         if ( !aImage )
                         {
-                            aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast );
+                            aImage = GetImageFromURL( rFrame, aItemCommand, FALSE );
                             if ( !aImage )
-                                aImage = AddonsOptions().GetImageFromURL( aItemCommand, FALSE, m_bWasHiContrast );
+                                aImage = AddonsOptions().GetImageFromURL( aItemCommand, FALSE );
                         }
 
                         if ( !!aImage )
@@ -297,7 +296,7 @@ MenuManager::MenuManager(
                     }
                     else if ( !pMenu->GetItemImage( nItemId ))
                     {
-                        Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast );
+                        Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE );
                         if ( !!aImage )
                                pMenu->SetItemImage( nItemId, aImage );
                     }
@@ -310,7 +309,6 @@ MenuManager::MenuManager(
         }
     }
 
-
     // retrieve label information for all menu items without item text
 
     SetHdl();
@@ -825,14 +823,11 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
                   UpdateSpecialWindowMenu( pMenu,getServiceFactory(),m_aLock );
 
         // Check if some modes have changed so we have to update our menu images
-        sal_Bool bIsHiContrast = rSettings.GetHighContrastMode();
-
-        if ( m_bWasHiContrast != bIsHiContrast || bShowMenuImages != m_bShowMenuImages )
+        if ( bShowMenuImages != m_bShowMenuImages )
         {
             // The mode changed so we have to replace all images
-            m_bWasHiContrast    = bIsHiContrast;
             m_bShowMenuImages   = bShowMenuImages;
-            FillMenuImages(m_xFrame,pMenu,bIsHiContrast,bShowMenuImages);
+            FillMenuImages( m_xFrame, pMenu, bShowMenuImages );
         }
 
         if ( m_bInitialized )
@@ -1028,7 +1023,7 @@ USHORT MenuManager::FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,
     }
     return nItemId;
 }
-void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_Bool bIsHiContrast,sal_Bool bShowMenuImages)
+void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_Bool bShowMenuImages)
 {
     AddonsOptions       aAddonOptions;
 
@@ -1058,7 +1053,7 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_B
 
                 if ( aImageId.getLength() > 0 )
                 {
-                    Image aImage = GetImageFromURL( _xFrame, aImageId, FALSE, bIsHiContrast );
+                    Image aImage = GetImageFromURL( _xFrame, aImageId, FALSE );
                     if ( !!aImage )
                     {
                         bImageSet = sal_True;
@@ -1069,9 +1064,9 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_B
                 if ( !bImageSet )
                 {
                     rtl::OUString aMenuItemCommand = _pMenu->GetItemCommand( nId );
-                    Image aImage = GetImageFromURL( _xFrame, aMenuItemCommand, FALSE, bIsHiContrast );
+                    Image aImage = GetImageFromURL( _xFrame, aMenuItemCommand, FALSE );
                     if ( !aImage )
-                        aImage = aAddonOptions.GetImageFromURL( aMenuItemCommand, FALSE, bIsHiContrast );
+                        aImage = aAddonOptions.GetImageFromURL( aMenuItemCommand, FALSE );
 
                     _pMenu->SetItemImage( nId, aImage );
                 }
diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src
index 1cd9ecc6dd30..3f354d438879 100644
--- a/framework/source/classes/resource.src
+++ b/framework/source/classes/resource.src
@@ -131,8 +131,6 @@ String STR_STATUSBAR_LOGOTEXT
 //       License Dialog
 // ***********************************************************************
 #define LICENSE_DIALOG_WIDTH  260
-//#define LICENSE_DIALOG_HEIGTH 185
-//#define LICENSE_DIALOG_HEIGTH 190
 #define LICENSE_RIGHT_BORDER  7
 #define LICENSE_BOTTOM_BORDER  0
 #define LICENSE_ROW_1 (7)
@@ -322,31 +320,37 @@ String STR_LANGSTATUS_MULTIPLE_LANGUAGES
     Text [ en-US ] = "Multiple Languages" ;
     Text [ x-comment ] = " ";
 };
+
 String STR_LANGSTATUS_NONE
 {
     Text [ en-US ] = "None (Do not check spelling)" ;
     Text [ x-comment ] = " ";
 };
+
 String STR_RESET_TO_DEFAULT_LANGUAGE
 {
     Text [ en-US ] = "Reset to Default Language" ;
     Text [ x-comment ] = " ";
 };
+
 String STR_LANGSTATUS_MORE
 {
     Text [ en-US ] = "More..." ;
     Text [ x-comment ] = " ";
 };
+
 String STR_SET_LANGUAGE_FOR_SELECTION
 {
     Text [ en-US ] = "Set Language for Selection" ;
     Text [ x-comment ] = " ";
 };
+
 String STR_SET_LANGUAGE_FOR_PARAGRAPH
 {
     Text [ en-US ] = "Set Language for Paragraph" ;
     Text [ x-comment ] = " ";
 };
+
 String STR_SET_LANGUAGE_FOR_ALL_TEXT
 {
     Text [ en-US ] = "Set Language for all Text" ;
diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx
index 7eb96c9f7ef3..6edfc8d192ac 100644
--- a/framework/source/classes/taskcreator.cxx
+++ b/framework/source/classes/taskcreator.cxx
@@ -105,9 +105,9 @@ TaskCreator::~TaskCreator()
 css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const ::rtl::OUString& sName    ,
                                                                          sal_Bool         bVisible )
 {
-    static ::rtl::OUString PACKAGE = ::rtl::OUString::createFromAscii("org.openoffice.Office.TabBrowse");
-    static ::rtl::OUString RELPATH = ::rtl::OUString::createFromAscii("TaskCreatorService"             );
-    static ::rtl::OUString KEY     = ::rtl::OUString::createFromAscii("ImplementationName"             );
+    static ::rtl::OUString PACKAGE(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.TabBrowse"));
+    static ::rtl::OUString RELPATH(RTL_CONSTASCII_USTRINGPARAM("TaskCreatorService"));
+    static ::rtl::OUString KEY(RTL_CONSTASCII_USTRINGPARAM("ImplementationName"));
 
     /* SAFE { */
     ReadGuard aReadLock( m_aLock );
diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx
index c5ef58be88ca..bef585ed6ab5 100644
--- a/framework/source/dispatch/dispatchinformationprovider.cxx
+++ b/framework/source/dispatch/dispatchinformationprovider.cxx
@@ -173,7 +173,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvide
     if (!xFrame.is())
         return css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > >();
 
-    CloseDispatcher* pCloser = new CloseDispatcher(xSMGR, xFrame, ::rtl::OUString::createFromAscii("_self")); // explicit "_self" ... not "" ... see implementation of close dispatcher itself!
+    CloseDispatcher* pCloser = new CloseDispatcher(xSMGR, xFrame, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self"))); // explicit "_self" ... not "" ... see implementation of close dispatcher itself!
     css::uno::Reference< css::uno::XInterface > xCloser(static_cast< css::frame::XDispatch* >(pCloser), css::uno::UNO_QUERY);
 
     css::uno::Reference< css::frame::XDispatchInformationProvider > xCloseDispatch(xCloser                                                      , css::uno::UNO_QUERY);
diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx
index f892495e8c79..8dc54239ad0e 100644
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -172,7 +172,7 @@ void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const css:
     else
     {
         aInfo.lURLPattern.realloc(1);
-        aInfo.lURLPattern[0] = ::rtl::OUString::createFromAscii("*");
+        aInfo.lURLPattern[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*"));
     }
 
     // SAFE {
diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx
index e76c11ecf8da..248df065e38d 100644
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -383,7 +383,7 @@ IMPL_LINK( MenuDispatcher, Close_Impl, void*, EMPTYARG )
         return 0;
 
     css::util::URL aURL;
-    aURL.Complete = ::rtl::OUString::createFromAscii(".uno:CloseWin");
+    aURL.Complete = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin"));
     css::uno::Reference< css::util::XURLTransformer >  xTrans ( m_xFactory->createInstance(
                         SERVICENAME_URLTRANSFORMER ), css::uno::UNO_QUERY );
     if( xTrans.is() )
diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx
index e869b613bd81..695fea4b3d81 100644
--- a/framework/source/dispatch/oxt_handler.cxx
+++ b/framework/source/dispatch/oxt_handler.cxx
@@ -269,7 +269,7 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL&
         // I think we can the following ones:
         //  a) look for given extension of url to map our type decision HARD CODED!!!
         //  b) return preferred type every time... it's easy :-)
-        sTypeName = ::rtl::OUString::createFromAscii("oxt_OpenOffice_Extension");
+        sTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("oxt_OpenOffice_Extension"));
         aDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()] <<= sTypeName;
         aDescriptor >> lDescriptor;
     }
diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx
index 1df848ad358f..09efdb3e8ae6 100644
--- a/framework/source/dispatch/windowcommanddispatch.cxx
+++ b/framework/source/dispatch/windowcommanddispatch.cxx
@@ -65,8 +65,8 @@ namespace css = ::com::sun::star;
 //_______________________________________________
 // declarations
 
-const ::rtl::OUString WindowCommandDispatch::COMMAND_PREFERENCES = ::rtl::OUString::createFromAscii(".uno:OptionsTreeDialog");
-const ::rtl::OUString WindowCommandDispatch::COMMAND_ABOUTBOX    = ::rtl::OUString::createFromAscii(".uno:About");
+const ::rtl::OUString WindowCommandDispatch::COMMAND_PREFERENCES(RTL_CONSTASCII_USTRINGPARAM(".uno:OptionsTreeDialog"));
+const ::rtl::OUString WindowCommandDispatch::COMMAND_ABOUTBOX(RTL_CONSTASCII_USTRINGPARAM(".uno:About"));
 
 //-----------------------------------------------
 WindowCommandDispatch::WindowCommandDispatch(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ,
diff --git a/framework/source/helper/actiontriggerhelper.cxx b/framework/source/helper/actiontriggerhelper.cxx
index 3506e0590af9..a5e0a1438a1e 100644
--- a/framework/source/helper/actiontriggerhelper.cxx
+++ b/framework/source/helper/actiontriggerhelper.cxx
@@ -115,9 +115,6 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta
     if ( xIndexAccess.is() )
     {
         AddonsOptions aAddonOptions;
-        const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-        sal_Bool bHiContrast = rSettings.GetHighContrastMode();
-
         OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
 
         for ( sal_Int32 i = 0; i < xIndexAccess->getCount(); i++ )
@@ -221,7 +218,7 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta
                             else
                             {
                                 // Support add-on images for context menu interceptors
-                                Image aImage = aAddonOptions.GetImageFromURL( aCommandURL, sal_False, bHiContrast, sal_True );
+                                Image aImage = aAddonOptions.GetImageFromURL( aCommandURL, sal_False, sal_True );
                                 if ( !!aImage )
                                     pSubMenu->SetItemImage( nNewItemId, aImage );
                             }
diff --git a/framework/source/helper/imageproducer.cxx b/framework/source/helper/imageproducer.cxx
index 2630fab87373..e6435d822e06 100644
--- a/framework/source/helper/imageproducer.cxx
+++ b/framework/source/helper/imageproducer.cxx
@@ -45,10 +45,14 @@ pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pNewGetImageFunc )
 }
 
 
-Image SAL_CALL GetImageFromURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast )
+Image SAL_CALL GetImageFromURL(
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    const ::rtl::OUString& aURL,
+    BOOL bBig
+)
 {
     if ( _pGetImageFunc )
-        return _pGetImageFunc( rFrame, aURL, bBig, bHiContrast );
+        return _pGetImageFunc( rFrame, aURL, bBig );
     else
         return Image();
 }
diff --git a/framework/source/helper/mischelper.cxx b/framework/source/helper/mischelper.cxx
index 19f8b8ee272c..0f021a453cbb 100644
--- a/framework/source/helper/mischelper.cxx
+++ b/framework/source/helper/mischelper.cxx
@@ -65,7 +65,7 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues
         {
             m_xLanguageGuesser = uno::Reference< linguistic2::XLanguageGuessing >(
                     m_xServiceManager->createInstance(
-                        rtl::OUString::createFromAscii( "com.sun.star.linguistic2.LanguageGuessing" ) ),
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.LanguageGuessing")) ),
                         uno::UNO_QUERY );
         }
         catch (uno::Exception &r)
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index bd854e6397ce..bcd61affb6ea 100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -302,7 +302,7 @@ Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsExce
 
       sal_uInt32 nCount = m_pFrameContainer->getCount();
       if ( nIndex < 0 || ( sal::static_int_cast< sal_uInt32 >( nIndex ) >= nCount ))
-          throw IndexOutOfBoundsException( OUString::createFromAscii( "OFrames::getByIndex - Index out of bounds" ),
+          throw IndexOutOfBoundsException( OUString(RTL_CONSTASCII_USTRINGPARAM("OFrames::getByIndex - Index out of bounds")),
                                            (OWeakObject *)this );
 
     // Set default return value.
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx
index de582de5a145..e285a8510a6d 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -228,9 +228,9 @@ void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&)
     sRelPathBuf.append     (sModuleName            );
     sRelPathBuf.appendAscii("\"]"                  );
 
-    ::rtl::OUString sPackage = ::rtl::OUString::createFromAscii("org.openoffice.Setup/");
+    ::rtl::OUString sPackage(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/"));
     ::rtl::OUString sRelPath = sRelPathBuf.makeStringAndClear();
-    ::rtl::OUString sKey     = ::rtl::OUString::createFromAscii("ooSetupFactoryWindowAttributes");
+    ::rtl::OUString sKey(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryWindowAttributes"));
 
     try
     {
@@ -258,9 +258,9 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere
     sRelPathBuf.append     (sModuleName            );
     sRelPathBuf.appendAscii("\"]"                  );
 
-    ::rtl::OUString sPackage = ::rtl::OUString::createFromAscii("org.openoffice.Setup/");
+    ::rtl::OUString sPackage(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/"));
     ::rtl::OUString sRelPath = sRelPathBuf.makeStringAndClear();
-    ::rtl::OUString sKey     = ::rtl::OUString::createFromAscii("ooSetupFactoryWindowAttributes");
+    ::rtl::OUString sKey(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryWindowAttributes"));
 
     try
     {
diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx
index 2e595386f8a3..0180d9cee95a 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -74,7 +74,7 @@ namespace framework{
 // definitions
 
 sal_Int32 StatusIndicatorFactory::m_nInReschedule = 0;  /// static counter for rescheduling
-static ::rtl::OUString PROGRESS_RESOURCE = ::rtl::OUString::createFromAscii("private:resource/progressbar/progressbar");
+static ::rtl::OUString PROGRESS_RESOURCE(RTL_CONSTASCII_USTRINGPARAM("private:resource/progressbar/progressbar"));
 
 //-----------------------------------------------
 DEFINE_XINTERFACE_5(StatusIndicatorFactory                              ,
@@ -435,9 +435,9 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed()
         bool bForceFrontAndFocus(false);
         ::comphelper::ConfigurationHelper::readDirectKey(
             xSMGR,
-            ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/View"),
-            ::rtl::OUString::createFromAscii("NewDocumentHandling"),
-            ::rtl::OUString::createFromAscii("ForceFocusAndToFront"),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/View")),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NewDocumentHandling")),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ForceFocusAndToFront")),
             ::comphelper::ConfigurationHelper::E_READONLY) >>= bForceFrontAndFocus;
 
         pWindow->Show(sal_True, bForceFrontAndFocus ? SHOW_FOREGROUNDTASK : 0 );
diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx
index d3b9d7fea9d5..6cb4ed5adcc2 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -235,26 +235,26 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr
              aModuleId.equalsAscii( "com.sun.star.text.GlobalDocument" ) ||
              aModuleId.equalsAscii( "com.sun.star.text.WebDocument" ) ||
              aModuleId.equalsAscii( "com.sun.star.xforms.XMLFormDocument" ) )
-            sDesktopName = ::rtl::OUString::createFromAscii("writer");
+            sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("writer"));
         else if ( aModuleId.equalsAscii( "com.sun.star.sheet.SpreadsheetDocument" ) )
-            sDesktopName = ::rtl::OUString::createFromAscii("calc");
+            sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("calc"));
         else if ( aModuleId.equalsAscii( "com.sun.star.presentation.PresentationDocument" ) )
-            sDesktopName = ::rtl::OUString::createFromAscii("impress");
+            sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("impress"));
         else if ( aModuleId.equalsAscii( "com.sun.star.drawing.DrawingDocument" ) )
-            sDesktopName = ::rtl::OUString::createFromAscii("draw");
+            sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("draw"));
         else if ( aModuleId.equalsAscii( "com.sun.star.formula.FormulaProperties" ) )
-            sDesktopName = ::rtl::OUString::createFromAscii("math");
+            sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("math"));
         else if ( aModuleId.equalsAscii( "com.sun.star.sdb.DatabaseDocument" ) ||
                   aModuleId.equalsAscii( "com.sun.star.sdb.OfficeDatabaseDocument" ) ||
                   aModuleId.equalsAscii( "com.sun.star.sdb.RelationDesign" ) ||
                   aModuleId.equalsAscii( "com.sun.star.sdb.QueryDesign" ) ||
                   aModuleId.equalsAscii( "com.sun.star.sdb.TableDesign" ) ||
                   aModuleId.equalsAscii( "com.sun.star.sdb.DataSourceBrowser" ) )
-            sDesktopName = ::rtl::OUString::createFromAscii("base");
+            sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("base"));
         else if ( aModuleId.equalsAscii( "com.sun.star.frame.StartModule" ) )
-            sDesktopName = ::rtl::OUString::createFromAscii("startcenter");
+            sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("startcenter"));
         else
-            sDesktopName = ::rtl::OUString::createFromAscii("startcenter");
+            sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("startcenter"));
         sApplicationID = aProductName.toAsciiLowerCase();
         sApplicationID += ::rtl::OUString(sal_Unicode('-'));
         sApplicationID += sDesktopName;
diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx
index 1578b3d45454..26baf432f2fe 100644
--- a/framework/source/helper/vclstatusindicator.cxx
+++ b/framework/source/helper/vclstatusindicator.cxx
@@ -70,7 +70,7 @@ VCLStatusIndicator::VCLStatusIndicator(const css::uno::Reference< css::lang::XMu
 {
     if (!m_xParentWindow.is())
         throw css::uno::RuntimeException(
-                ::rtl::OUString::createFromAscii("Cant work without a parent window!"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cant work without a parent window!")),
                 static_cast< css::task::XStatusIndicator* >(this));
 }
 
diff --git a/framework/source/inc/pattern/configuration.hxx b/framework/source/inc/pattern/configuration.hxx
index 580c20195cd1..f5c6a296863b 100644
--- a/framework/source/inc/pattern/configuration.hxx
+++ b/framework/source/inc/pattern/configuration.hxx
@@ -119,7 +119,7 @@ class ConfigurationHelper
                                                                       const ::rtl::OUString&                                        sRelPath  ,
                                                                             sal_Int32                                               nOpenFlags)
         {
-            static ::rtl::OUString PATH_SEPERATOR = ::rtl::OUString::createFromAscii("/");
+            static ::rtl::OUString PATH_SEPERATOR(RTL_CONSTASCII_USTRINGPARAM("/"));
 
             css::uno::Reference< css::uno::XInterface > xCFG;
 
@@ -143,13 +143,13 @@ class ConfigurationHelper
                 css::uno::Sequence< css::uno::Any > lParams(c);
                 css::beans::PropertyValue           aParam;
 
-                aParam.Name    = ::rtl::OUString::createFromAscii("nodepath");
+                aParam.Name    = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath"));
                 aParam.Value <<= sPath.makeStringAndClear();
                 lParams[0]   <<= aParam;
 
                 if (bAllLocales)
                 {
-                    aParam.Name    = ::rtl::OUString::createFromAscii("*");
+                    aParam.Name    = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*"));
                     aParam.Value <<= sal_True;
                     lParams[1]   <<= aParam;
                 }
diff --git a/framework/source/interaction/preventduplicateinteraction.cxx b/framework/source/interaction/preventduplicateinteraction.cxx
index ba3169875a3c..635e6449e310 100644
--- a/framework/source/interaction/preventduplicateinteraction.cxx
+++ b/framework/source/interaction/preventduplicateinteraction.cxx
@@ -57,7 +57,7 @@ namespace css = ::com::sun::star;
 //  exported const
 //_________________________________________________________________________________________________________________
 
-#define IMPLEMENTATIONNAME_UIINTERACTIONHANDLER                 ::rtl::OUString::createFromAscii("com.sun.star.comp.uui.UUIInteractionHandler")
+#define IMPLEMENTATIONNAME_UIINTERACTIONHANDLER                 ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uui.UUIInteractionHandler"))
 
 //_________________________________________________________________________________________________________________
 //  exported definitions
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index 3bfa06f46acc..ec84096eda94 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -60,26 +60,26 @@ namespace framework{
 // definitions
 
 // path to module config
-static ::rtl::OUString CFG_PACKAGE_MODULES      = ::rtl::OUString::createFromAscii("/org.openoffice.Setup/Office/Factories");
-static ::rtl::OUString CFG_PACKAGE_SETUP        = ::rtl::OUString::createFromAscii("/org.openoffice.Setup"             );
-static ::rtl::OUString CFG_PACKAGE_COMMON       = ::rtl::OUString::createFromAscii("/org.openoffice.Office.Common"     );
-static ::rtl::OUString CFG_PATH_L10N            = ::rtl::OUString::createFromAscii("L10N"                              );
-static ::rtl::OUString CFG_PATH_HELP            = ::rtl::OUString::createFromAscii("Help"                              );
-static ::rtl::OUString CFG_KEY_LOCALE           = ::rtl::OUString::createFromAscii("ooLocale"                          );
-static ::rtl::OUString CFG_KEY_HELPSYSTEM       = ::rtl::OUString::createFromAscii("System"                            );
+static ::rtl::OUString CFG_PACKAGE_MODULES     (RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Office/Factories"));
+static ::rtl::OUString CFG_PACKAGE_SETUP       (RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup"));
+static ::rtl::OUString CFG_PACKAGE_COMMON      (RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Common"));
+static ::rtl::OUString CFG_PATH_L10N           (RTL_CONSTASCII_USTRINGPARAM("L10N"));
+static ::rtl::OUString CFG_PATH_HELP           (RTL_CONSTASCII_USTRINGPARAM("Help"));
+static ::rtl::OUString CFG_KEY_LOCALE          (RTL_CONSTASCII_USTRINGPARAM("ooLocale"));
+static ::rtl::OUString CFG_KEY_HELPSYSTEM      (RTL_CONSTASCII_USTRINGPARAM("System"));
 
 // props of job environment
-static ::rtl::OUString PROP_ENVIRONMENT         = ::rtl::OUString::createFromAscii("Environment"                       );
-static ::rtl::OUString PROP_JOBCONFIG           = ::rtl::OUString::createFromAscii("JobConfig"                         );
-static ::rtl::OUString PROP_ENVTYPE             = ::rtl::OUString::createFromAscii("EnvType"                           );
-static ::rtl::OUString PROP_MODEL               = ::rtl::OUString::createFromAscii("Model"                             );
+static ::rtl::OUString PROP_ENVIRONMENT        (RTL_CONSTASCII_USTRINGPARAM("Environment"));
+static ::rtl::OUString PROP_JOBCONFIG          (RTL_CONSTASCII_USTRINGPARAM("JobConfig"));
+static ::rtl::OUString PROP_ENVTYPE            (RTL_CONSTASCII_USTRINGPARAM("EnvType"));
+static ::rtl::OUString PROP_MODEL              (RTL_CONSTASCII_USTRINGPARAM("Model"));
 
 // props of module config
-static ::rtl::OUString PROP_HELP_BASEURL        = ::rtl::OUString::createFromAscii("ooSetupFactoryHelpBaseURL"         );
-static ::rtl::OUString PROP_AUTOMATIC_HELP      = ::rtl::OUString::createFromAscii("ooSetupFactoryHelpOnOpen"          );
+static ::rtl::OUString PROP_HELP_BASEURL       (RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryHelpBaseURL"));
+static ::rtl::OUString PROP_AUTOMATIC_HELP     (RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryHelpOnOpen"));
 
 // special value of job environment
-static ::rtl::OUString ENVTYPE_DOCUMENTEVENT    = ::rtl::OUString::createFromAscii("DOCUMENTEVENT"                     );
+static ::rtl::OUString ENVTYPE_DOCUMENTEVENT   (RTL_CONSTASCII_USTRINGPARAM("DOCUMENTEVENT"));
 
 //-----------------------------------------------
 
diff --git a/framework/source/jobs/jobconst.cxx b/framework/source/jobs/jobconst.cxx
index 4a4fb39227da..9d3403db5cfb 100644
--- a/framework/source/jobs/jobconst.cxx
+++ b/framework/source/jobs/jobconst.cxx
@@ -56,19 +56,19 @@ namespace framework{
 
 const ::rtl::OUString JobConst::ANSWER_DEACTIVATE_JOB()
 {
-    static const ::rtl::OUString PROP = ::rtl::OUString::createFromAscii("Deactivate");
+    static const ::rtl::OUString PROP(RTL_CONSTASCII_USTRINGPARAM("Deactivate"));
     return PROP;
 }
 
 const ::rtl::OUString JobConst::ANSWER_SAVE_ARGUMENTS()
 {
-    static const ::rtl::OUString PROP = ::rtl::OUString::createFromAscii("SaveArguments");
+    static const ::rtl::OUString PROP(RTL_CONSTASCII_USTRINGPARAM("SaveArguments"));
     return PROP;
 }
 
 const ::rtl::OUString JobConst::ANSWER_SEND_DISPATCHRESULT()
 {
-    static const ::rtl::OUString PROP = ::rtl::OUString::createFromAscii("SendDispatchResult");
+    static const ::rtl::OUString PROP(RTL_CONSTASCII_USTRINGPARAM("SendDispatchResult"));
     return PROP;
 }
 
diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx
index f3017923ab9c..2d1b69198d66 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -181,8 +181,7 @@ void JobData::setAlias( const ::rtl::OUString& sAlias )
 
     // try to open the configuration set of this job directly and get a property access to it
     // We open it readonly here
-    ::rtl::OUString sKey;
-    sKey  = ::rtl::OUString::createFromAscii(JOBCFG_ROOT);
+    ::rtl::OUString sKey(::rtl::OUString::createFromAscii(JOBCFG_ROOT));
     sKey += ::utl::wrapConfigurationElementName(m_sAlias);
 
     ConfigAccess aConfig(m_xSMGR, sKey);
@@ -312,8 +311,7 @@ void JobData::setJobConfig( const css::uno::Sequence< css::beans::NamedValue >&
         // It doesn't matter if this config object was already opened before.
         // It doesn nothing here then ... or it change the mode automaticly, if
         // it was opened using another one before.
-        ::rtl::OUString sKey;
-        sKey  = ::rtl::OUString::createFromAscii(JOBCFG_ROOT);
+        ::rtl::OUString sKey(::rtl::OUString::createFromAscii(JOBCFG_ROOT));
         sKey += ::utl::wrapConfigurationElementName(m_sAlias);
 
         ConfigAccess aConfig(m_xSMGR, sKey);
@@ -422,15 +420,15 @@ JobData::EEnvironment JobData::getEnvironment() const
     switch(m_eEnvironment)
     {
         case E_EXECUTION :
-            sDescriptor = ::rtl::OUString::createFromAscii("EXECUTOR");
+            sDescriptor = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EXECUTOR"));
             break;
 
         case E_DISPATCH :
-            sDescriptor = ::rtl::OUString::createFromAscii("DISPATCH");
+            sDescriptor = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DISPATCH"));
             break;
 
         case E_DOCUMENTEVENT :
-            sDescriptor = ::rtl::OUString::createFromAscii("DOCUMENTEVENT");
+            sDescriptor = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DOCUMENTEVENT"));
             break;
         default:
             break;
@@ -576,7 +574,7 @@ sal_Bool isEnabled( const ::rtl::OUString& sAdminTime ,
         we have to encode all '?' signs. Otherwhise e.g. "??-" will be translated
         to "~" ...
      */
-    static ::rtl::OUString PATTERN_ISO8601 = ::rtl::OUString::createFromAscii("\?\?\?\?-\?\?-\?\?*\0");
+    static ::rtl::OUString PATTERN_ISO8601(RTL_CONSTASCII_USTRINGPARAM("\?\?\?\?-\?\?-\?\?*\0"));
     WildCard aISOPattern(PATTERN_ISO8601);
 
     sal_Bool bValidAdmin = aISOPattern.Matches(sAdminTime);
diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx
index 08280950ae99..7cc29e1b686e 100644
--- a/framework/source/jobs/shelljob.cxx
+++ b/framework/source/jobs/shelljob.cxx
@@ -62,19 +62,19 @@ namespace framework{
 // definitions
 
 /** adress job configuration inside argument set provided on method execute(). */
-static const ::rtl::OUString PROP_JOBCONFIG = ::rtl::OUString::createFromAscii("JobConfig");
+static const ::rtl::OUString PROP_JOBCONFIG(RTL_CONSTASCII_USTRINGPARAM("JobConfig"));
 
 /** adress job configuration property "Command". */
-static const ::rtl::OUString PROP_COMMAND = ::rtl::OUString::createFromAscii("Command");
+static const ::rtl::OUString PROP_COMMAND(RTL_CONSTASCII_USTRINGPARAM("Command"));
 
 /** adress job configuration property "Arguments". */
-static const ::rtl::OUString PROP_ARGUMENTS = ::rtl::OUString::createFromAscii("Arguments");
+static const ::rtl::OUString PROP_ARGUMENTS(RTL_CONSTASCII_USTRINGPARAM("Arguments"));
 
 /** adress job configuration property "DeactivateJobIfDone". */
-static const ::rtl::OUString PROP_DEACTIVATEJOBIFDONE = ::rtl::OUString::createFromAscii("DeactivateJobIfDone");
+static const ::rtl::OUString PROP_DEACTIVATEJOBIFDONE(RTL_CONSTASCII_USTRINGPARAM("DeactivateJobIfDone"));
 
 /** adress job configuration property "CheckExitCode". */
-static const ::rtl::OUString PROP_CHECKEXITCODE = ::rtl::OUString::createFromAscii("CheckExitCode");
+static const ::rtl::OUString PROP_CHECKEXITCODE(RTL_CONSTASCII_USTRINGPARAM("CheckExitCode"));
 
 //-----------------------------------------------
 
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 73fa53b6a3d6..64646e35aabc 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -292,12 +292,11 @@ static sal_Bool implts_isFrameOrWindowTop( const css::uno::Reference< css::frame
     css::uno::Reference< css::awt::XTopWindow > xWindowCheck(xFrame->getContainerWindow(), css::uno::UNO_QUERY); // dont use _THROW here ... its a check only
     if (xWindowCheck.is())
     {
-        // --> PB 2007-06-18 #i76867# top and system window is required.
+        // Top and system window is required (#i76867#)
         SolarMutexGuard aGuard;
         css::uno::Reference< css::awt::XWindow > xWindow( xWindowCheck, UNO_QUERY );
         Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
         return ( pWindow && pWindow->IsSystemWindow() );
-        // <--
     }
 
     return sal_False;
@@ -334,7 +333,7 @@ static void impl_setDockingWindowVisibility( const css::uno::Reference< css::lan
         xDispatcher->executeDispatch(
             xProvider,
             aDockWinCommand,
-            ::rtl::OUString::createFromAscii("_self"),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")),
             0,
             aArgs);
     }
@@ -765,7 +764,7 @@ void LayoutManager::implts_destroyElements()
     aWriteLock.unlock();
 
     UIElementVector::iterator pIter;
-    for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ )
+    for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); ++pIter )
     {
         Reference< XComponent > xComponent( pIter->m_xUIElement, UNO_QUERY );
         if ( xComponent.is() )
@@ -1112,7 +1111,7 @@ void LayoutManager::implts_toggleFloatingUIElementsVisibility( sal_Bool bActive
     UIElementVector::iterator pIter;
 
     ReadGuard aReadLock( m_aLock );
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
     {
         if ( pIter->m_xUIElement.is() )
         {
@@ -1184,7 +1183,7 @@ sal_Bool LayoutManager::implts_findElement( const rtl::OUString& aName, rtl::OUS
             UIElementVector::const_iterator pIter;
 
             ReadGuard aReadLock( m_aLock );
-            for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+            for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
             {
                 if ( pIter->m_aName == aName )
                 {
@@ -1203,7 +1202,7 @@ sal_Bool LayoutManager::implts_findElement( const Reference< XInterface >& xUIEl
     UIElementVector::const_iterator pIter;
 
     ReadGuard aReadLock( m_aLock );
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
     {
         if ( pIter->m_xUIElement.is() )
         {
@@ -1224,7 +1223,7 @@ sal_Bool LayoutManager::implts_findElement( const rtl::OUString& aName, UIElemen
     UIElementVector::const_iterator pIter;
 
     ReadGuard aReadLock( m_aLock );
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
     {
         if ( pIter->m_aName == aName )
         {
@@ -1243,7 +1242,7 @@ LayoutManager::UIElement& LayoutManager::impl_findElement( const rtl::OUString&
     UIElementVector::iterator pIter;
 
     ReadGuard aReadLock( m_aLock );
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
     {
         if ( pIter->m_aName == aName )
             return *pIter;
@@ -1331,7 +1330,7 @@ void LayoutManager::implts_refreshContextToolbarsVisibility()
     UIElementVisibility aUIElementVisible;
 
     UIElementVector::iterator pIter;
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
     {
         if ( pIter->m_aType.equalsAsciiL( "toolbar", 7 ))
         {
@@ -1768,7 +1767,7 @@ void LayoutManager::implts_setElementData( UIElement& rElement, const Reference<
 
     // Try to find a cascaded position for the new floating window
     UIElementVector::const_iterator pIter;
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
     {
         if ( pIter->m_xUIElement.is() )
         {
@@ -1974,7 +1973,7 @@ void LayoutManager::implts_sortUIElements()
 
     // We have to reset our temporary flags.
     UIElementVector::iterator pIter;
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
     {
         // why check, just set it to false
         //if ( pIter->m_bUserActive )
@@ -2002,7 +2001,7 @@ void LayoutManager::implts_getDockingAreaElementInfos( DockingArea eDockingArea,
     aWindowVector.reserve(m_aUIElements.size());
     xDockAreaWindow = m_xDockAreaWindows[eDockingArea];
     UIElementVector::iterator   pIter;
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
     {
         if ( pIter->m_aDockedData.m_nDockedArea == eDockingArea && pIter->m_bVisible && !pIter->m_bFloating )
         {
@@ -2188,7 +2187,7 @@ void LayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( DockingArea
     ReadGuard aReadLock( m_aLock );
     UIElementVector::iterator   pIter;
     UIElementVector::iterator   pEnd = m_aUIElements.end();
-    for ( pIter = m_aUIElements.begin(); pIter != pEnd; pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != pEnd; ++pIter )
     {
         if ( pIter->m_aDockedData.m_nDockedArea == eDockingArea )
         {
@@ -2939,7 +2938,7 @@ void LayoutManager::implts_renumberRowColumnData(
 
     WriteGuard aWriteLock( m_aLock );
     UIElementVector::iterator pIter;
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
     {
         if (( pIter->m_aDockedData.m_nDockedArea == sal_Int16( eDockingArea )) &&
             ( pIter->m_aName != rUIElement.m_aName ))
@@ -3086,7 +3085,7 @@ void LayoutManager::implts_setVisibleState( sal_Bool bShow )
      /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     WriteGuard aWriteLock( m_aLock );
     UIElementVector::iterator pIter;
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
         pIter->m_bMasterHide = !bShow;
     m_aStatusBarElement.m_bMasterHide = !bShow;
     aWriteLock.unlock();
@@ -3116,7 +3115,7 @@ void LayoutManager::implts_updateUIElementsVisibleState( sal_Bool bSetVisible )
     ReadGuard aReadLock( m_aLock );
     aWinVector.reserve(m_aUIElements.size());
     UIElementVector::iterator pIter;
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
     {
         if ( pIter->m_xUIElement.is() )
         {
@@ -3245,7 +3244,7 @@ void LayoutManager::implts_setCurrentUIVisibility( sal_Bool bShow )
      /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     WriteGuard aWriteLock( m_aLock );
     UIElementVector::iterator pIter;
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
     {
         if ( !bShow && pIter->m_bVisible && pIter->m_xUIElement.is() )
             pIter->m_bMasterHide = true;
@@ -3931,7 +3930,7 @@ void LayoutManager::implts_reparentChildWindows()
     if ( pContainerWindow )
     {
         UIElementVector::iterator pIter;
-        for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ )
+        for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); ++pIter )
         {
             Reference< XUIElement > xUIElement( pIter->m_xUIElement );
             if ( xUIElement.is() )
@@ -4021,7 +4020,7 @@ IMPL_LINK( LayoutManager, WindowEventListener, VclSimpleEvent*, pEvent )
                 std::vector< css::uno::Reference< css::ui::XUIFunctionListener > > aListenerArray;
                 UIElementVector::iterator pIter;
 
-                for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+                for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
                 {
                     if ( pIter->m_aType.equalsAscii( "toolbar" ) &&
                         pIter->m_xUIElement.is() )
@@ -4309,7 +4308,7 @@ throw (RuntimeException)
         {
             UIElementVector::iterator pIter;
 
-            for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+            for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
             {
                 if ( pIter->m_aName == aName )
                 {
@@ -4461,7 +4460,7 @@ throw (::com::sun::star::uno::RuntimeException)
                 bool bFound( false );
                 bool bShowElement( false );
 
-                for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+                for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
                 {
                     if ( pIter->m_aName == ResourceURL )
                     {
@@ -4588,7 +4587,7 @@ throw (::com::sun::star::uno::RuntimeException)
 
     sal_Int32 nIndex = 0;
     UIElementVector::const_iterator pIter;
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
     {
         if ( pIter->m_xUIElement.is() )
             aSeq[nIndex++] = pIter->m_xUIElement;
@@ -4656,7 +4655,7 @@ throw (RuntimeException)
             UIElementVector::iterator pIter;
 
             WriteGuard aWriteLock( m_aLock );
-            for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+            for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
             {
                 if ( pIter->m_aName == aName && pIter->m_xUIElement.is() )
                 {
@@ -4789,7 +4788,7 @@ throw (RuntimeException)
             UIElementVector::iterator pIter;
 
             WriteGuard aWriteLock( m_aLock );
-            for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+            for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
             {
                 if ( pIter->m_aName == aName && pIter->m_xUIElement.is() )
                 {
@@ -4944,7 +4943,7 @@ throw (RuntimeException)
         {
             ReadGuard aReadLock( m_aLock );
             UIElementVector::iterator pIter;
-            for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+            for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
             {
                 if ( pIter->m_aType.equalsAscii( "toolbar" ) &&
                      pIter->m_xUIElement.is() &&
@@ -5266,7 +5265,7 @@ throw (RuntimeException)
             UIElementVector::const_iterator pIter;
 
             ReadGuard aReadLock( m_aLock );
-            for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+            for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
             {
                 if ( pIter->m_aName == aName && pIter->m_xUIElement.is() )
                 {
@@ -5298,7 +5297,7 @@ throw (RuntimeException)
     UIElementVector::const_iterator pIter;
 
     ReadGuard aReadLock( m_aLock );
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
     {
         if ( pIter->m_aName == aName && pIter->m_xUIElement.is() )
         {
@@ -5316,7 +5315,7 @@ throw (RuntimeException)
     UIElementVector::const_iterator pIter;
 
     ReadGuard aReadLock( m_aLock );
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
     {
         if ( pIter->m_aName == aName && pIter->m_xUIElement.is() )
         {
@@ -5334,7 +5333,7 @@ throw (::com::sun::star::uno::RuntimeException)
     UIElementVector::const_iterator pIter;
 
     ReadGuard aReadLock( m_aLock );
-    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+    for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
     {
         if (( pIter->m_aName == ResourceURL ) && ( pIter->m_xUIElement.is() ))
         {
@@ -5943,7 +5942,7 @@ css::awt::Rectangle LayoutManager::implts_calcDockingAreaSizes()
         aRowColumnSizes[nCurrDockingArea].clear();
         aRowColumnSizes[nCurrDockingArea].push_back( 0 );
 
-        for ( pConstIter = aWindowVector.begin(); pConstIter != aWindowVector.end(); pConstIter++ )
+        for ( pConstIter = aWindowVector.begin(); pConstIter != aWindowVector.end(); ++pConstIter )
         {
             Reference< XUIElement > xUIElement( pConstIter->m_xUIElement, UNO_QUERY );
             if ( xUIElement.is() )
@@ -6228,8 +6227,8 @@ IMPL_LINK( LayoutManager, MenuBarClose, MenuBar *, EMPTYARG )
 
     xDispatcher->executeDispatch(
         xProvider,
-        ::rtl::OUString::createFromAscii(".uno:CloseWin"),
-        ::rtl::OUString::createFromAscii("_self"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin")),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")),
         0,
         css::uno::Sequence< css::beans::PropertyValue >());
 
@@ -6258,7 +6257,7 @@ IMPL_LINK( LayoutManager, OptionsChanged, void*, EMPTYARG )
         aReadLock.lock();
         {
             UIElementVector::iterator pIter;
-            for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ )
+            for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
             {
                 if ( pIter->m_xUIElement.is() )
                     aToolBarVector.push_back( Reference< XUpdatable >( pIter->m_xUIElement, UNO_QUERY ));
@@ -6269,7 +6268,7 @@ IMPL_LINK( LayoutManager, OptionsChanged, void*, EMPTYARG )
         lock();
         {
             std::vector< Reference< XUpdatable > >::iterator pIter;
-            for ( pIter = aToolBarVector.begin(); pIter != aToolBarVector.end(); pIter++ )
+            for ( pIter = aToolBarVector.begin(); pIter != aToolBarVector.end(); ++pIter )
             {
                 if ( (*pIter).is() )
                     (*pIter)->update();
@@ -6423,7 +6422,6 @@ throw (::com::sun::star::uno::RuntimeException)
             ::Rectangle aHotZoneRightDockRect( implts_calcHotZoneRect( aRightDockRect, nMagneticZone ));
 
             Window* pContainerWindow( VCLUnoHelper::GetWindow( xContainerWindow ) );
-            Window* pDockingAreaWindow( 0 );
             ::Point aMousePos( pContainerWindow->ScreenToOutputPixel( ::Point( e.MousePos.X, e.MousePos.Y )));
 
             if ( aHotZoneTopDockRect.IsInside( aMousePos ))
@@ -6457,25 +6455,25 @@ throw (::com::sun::star::uno::RuntimeException)
                 {
                     aUIDockingElement.m_aDockedData.m_nDockedArea = DockingArea_DOCKINGAREA_TOP;
                     aUIDockingElement.m_bFloating = sal_False;
-                    pDockingAreaWindow = VCLUnoHelper::GetWindow( xTopDockingWindow );
+                    VCLUnoHelper::GetWindow( xTopDockingWindow );
                 }
                 else if ( eDockingArea == DockingArea_DOCKINGAREA_BOTTOM )
                 {
                     aUIDockingElement.m_aDockedData.m_nDockedArea = DockingArea_DOCKINGAREA_BOTTOM;
                     aUIDockingElement.m_bFloating = sal_False;
-                    pDockingAreaWindow = VCLUnoHelper::GetWindow( xBottomDockingWindow );
+                    VCLUnoHelper::GetWindow( xBottomDockingWindow );
                 }
                 else if ( eDockingArea == DockingArea_DOCKINGAREA_LEFT )
                 {
                     aUIDockingElement.m_aDockedData.m_nDockedArea = DockingArea_DOCKINGAREA_LEFT;
                     aUIDockingElement.m_bFloating = sal_False;
-                    pDockingAreaWindow = VCLUnoHelper::GetWindow( xLeftDockingWindow );
+                    VCLUnoHelper::GetWindow( xLeftDockingWindow );
                 }
                 else if ( eDockingArea == DockingArea_DOCKINGAREA_RIGHT )
                 {
                     aUIDockingElement.m_aDockedData.m_nDockedArea = DockingArea_DOCKINGAREA_RIGHT;
                     aUIDockingElement.m_bFloating = sal_False;
-                    pDockingAreaWindow = VCLUnoHelper::GetWindow( xRightDockingWindow );
+                    VCLUnoHelper::GetWindow( xRightDockingWindow );
                 }
 
                 ::Point aOutputPos = pContainerWindow->ScreenToOutputPixel( aTrackingRect.TopLeft() );
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 39314fe9d9af..8c0717281d7f 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -206,13 +206,13 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const
         {
             case LoadEnvException::ID_INVALID_MEDIADESCRIPTOR:
                     throw css::lang::IllegalArgumentException(
-                            ::rtl::OUString::createFromAscii("Optional list of arguments seem to be corrupted."),
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Optional list of arguments seem to be corrupted.")),
                             xLoader,
                             4);
 
             case LoadEnvException::ID_UNSUPPORTED_CONTENT:
                     throw css::lang::IllegalArgumentException(
-                            ::rtl::OUString::createFromAscii("URL seems to be an unsupported one."),
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL seems to be an unsupported one.")),
                             xLoader,
                             1);
 
@@ -818,8 +818,8 @@ LoadEnv::EContentType LoadEnv::classifyContent(const ::rtl::OUString&
 void LoadEnv::impl_detectTypeAndFilter()
     throw(LoadEnvException, css::uno::RuntimeException)
 {
-    static ::rtl::OUString TYPEPROP_PREFERREDFILTER = ::rtl::OUString::createFromAscii("PreferredFilter");
-    static ::rtl::OUString FILTERPROP_FLAGS         = ::rtl::OUString::createFromAscii("Flags"          );
+    static ::rtl::OUString TYPEPROP_PREFERREDFILTER(RTL_CONSTASCII_USTRINGPARAM("PreferredFilter"));
+    static ::rtl::OUString FILTERPROP_FLAGS        (RTL_CONSTASCII_USTRINGPARAM("Flags"));
     static sal_Int32       FILTERFLAG_TEMPLATEPATH  = 16;
 
     // SAFE ->
@@ -1003,9 +1003,9 @@ sal_Bool LoadEnv::impl_furtherDocsAllowed()
     {
         css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey(
                                 xSMGR,
-                                ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/"),
-                                ::rtl::OUString::createFromAscii("Misc"),
-                                ::rtl::OUString::createFromAscii("MaxOpenDocuments"),
+                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/")),
+                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Misc")),
+                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxOpenDocuments")),
                                 ::comphelper::ConfigurationHelper::E_READONLY);
 
         // NIL means: count of allowed documents = infinite !
@@ -1304,7 +1304,7 @@ void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& x
     // <- SAFE
 
     css::util::URL aCmd;
-    aCmd.Complete = ::rtl::OUString::createFromAscii(".uno:JumpToMark");
+    aCmd.Complete = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:JumpToMark"));
 
     css::uno::Reference< css::util::XURLTransformer > xParser(xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), css::uno::UNO_QUERY_THROW);
     xParser->parseStrict(aCmd);
@@ -1314,7 +1314,7 @@ void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& x
         return;
 
     ::comphelper::SequenceAsHashMap lArgs;
-    lArgs[::rtl::OUString::createFromAscii("Bookmark")] <<= aURL.Mark;
+    lArgs[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Bookmark"))] <<= aURL.Mark;
     xDispatcher->dispatch(aCmd, lArgs.getAsConstPropertyValueList());
 }
 
@@ -1757,9 +1757,9 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X
         bool bForceFrontAndFocus(false);
         css::uno::Any a = ::comphelper::ConfigurationHelper::readDirectKey(
             xSMGR,
-            ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/View"),
-            ::rtl::OUString::createFromAscii("NewDocumentHandling"),
-            ::rtl::OUString::createFromAscii("ForceFocusAndToFront"),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/View")),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NewDocumentHandling")),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ForceFocusAndToFront")),
             ::comphelper::ConfigurationHelper::E_READONLY);
         a >>= bForceFrontAndFocus;
 
@@ -1802,7 +1802,7 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X
 -----------------------------------------------*/
 void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow)
 {
-    static ::rtl::OUString PACKAGE_SETUP_MODULES = ::rtl::OUString::createFromAscii("/org.openoffice.Setup/Office/Factories");
+    static ::rtl::OUString PACKAGE_SETUP_MODULES(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Office/Factories"));
 
     // no window -> action not possible
     if (!xWindow.is())
diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx
index 2c36f88743bb..f7cce11699bb 100644
--- a/framework/source/recording/dispatchrecorder.cxx
+++ b/framework/source/recording/dispatchrecorder.cxx
@@ -132,7 +132,7 @@ DispatchRecorder::DispatchRecorder( const css::uno::Reference< css::lang::XMulti
         : ThreadHelpBase     ( &Application::GetSolarMutex() )
         , ::cppu::OWeakObject(                               )
         , m_xSMGR            ( xSMGR                         )
-        , m_xConverter( m_xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.script.Converter")), css::uno::UNO_QUERY )
+        , m_xConverter( m_xSMGR->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter"))), css::uno::UNO_QUERY )
 {
 }
 
@@ -202,7 +202,7 @@ void SAL_CALL DispatchRecorder::endRecording() throw( css::uno::RuntimeException
     aScriptBuffer.appendAscii("dispatcher = createUnoService(\"com.sun.star.frame.DispatchHelper\")\n\n");
 
     std::vector< com::sun::star::frame::DispatchStatement>::iterator p;
-    for ( p = m_aStatements.begin(); p != m_aStatements.end(); p++ )
+    for ( p = m_aStatements.begin(); p != m_aStatements.end(); ++p )
         implts_recordMacro( p->aCommand, p->aArgs, p->bIsComment, aScriptBuffer );
     ::rtl::OUString sScript = aScriptBuffer.makeStringAndClear();
     return sScript;
@@ -345,7 +345,7 @@ void SAL_CALL DispatchRecorder::implts_recordMacro( const ::rtl::OUString& aURL,
     ::rtl::OUStringBuffer aArgumentBuffer(1000);
     ::rtl::OUString       sArrayName;
     // this value is used to name the arrays of aArgumentBuffer
-    sArrayName = ::rtl::OUString::createFromAscii("args");
+    sArrayName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("args"));
     sArrayName += ::rtl::OUString::valueOf((sal_Int32)m_nRecordingID);
 
     aScriptBuffer.appendAscii("rem ----------------------------------------------------------------------\n");
diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx
index f7d65fa26498..e7e7dc7a8fec 100644
--- a/framework/source/services/backingcomp.cxx
+++ b/framework/source/services/backingcomp.cxx
@@ -462,17 +462,17 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f
     // check some required states
     if (m_xFrame.is())
         throw css::uno::RuntimeException(
-                ::rtl::OUString::createFromAscii("already attached"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("already attached")),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     if (!xFrame.is())
         throw css::uno::RuntimeException(
-                ::rtl::OUString::createFromAscii("invalid frame reference"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid frame reference")),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     if (!m_xWindow.is())
         throw css::uno::RuntimeException(
-                ::rtl::OUString::createFromAscii("instance seams to be not or wrong initialized"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("instance seams to be not or wrong initialized")),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     // safe the frame reference
@@ -661,7 +661,7 @@ void SAL_CALL BackingComp::disposing( /*IN*/ const css::lang::EventObject& aEven
 
     if (!aEvent.Source.is() || aEvent.Source!=m_xWindow || !m_xWindow.is())
         throw css::uno::RuntimeException(
-                ::rtl::OUString::createFromAscii("unexpected source or called twice"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unexpected source or called twice")),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     m_xWindow = css::uno::Reference< css::awt::XWindow >();
@@ -755,7 +755,7 @@ void SAL_CALL BackingComp::addEventListener( /*IN*/ const css::uno::Reference< c
     throw(css::uno::RuntimeException)
 {
     throw css::uno::RuntimeException(
-            ::rtl::OUString::createFromAscii("not supported"),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not supported")),
             static_cast< ::cppu::OWeakObject* >(this));
 }
 
@@ -802,7 +802,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno
 
     if (m_xWindow.is())
         throw css::uno::Exception(
-                ::rtl::OUString::createFromAscii("already initialized"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("already initialized")),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     css::uno::Reference< css::awt::XWindow > xParentWindow;
@@ -813,7 +813,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno
        )
     {
         throw css::uno::Exception(
-                ::rtl::OUString::createFromAscii("wrong or corrupt argument list"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wrong or corrupt argument list")),
                 static_cast< ::cppu::OWeakObject* >(this));
     }
 
@@ -824,7 +824,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno
 
     if (!m_xWindow.is())
         throw css::uno::RuntimeException(
-                ::rtl::OUString::createFromAscii("couldn't create component window"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("couldn't create component window")),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     // start listening for window disposing
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index a7d7741bbc04..0398aaef8901 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -410,7 +410,7 @@ void BackingWindow::initBackground()
     Color aTextBGColor( bDark ? COL_BLACK : COL_WHITE );
 
     // select image set
-    ImageContainerRes aRes( FwkResId( bDark ? RES_BACKING_IMAGES_HC : RES_BACKING_IMAGES ) );
+    ImageContainerRes aRes( FwkResId( RES_BACKING_IMAGES ) );
 
     // scale middle segment
     Size aMiddleSize;
@@ -673,7 +673,7 @@ void BackingWindow::layoutButton(
                           const String& i_rStr
                           )
 {
-    rtl::OUString aURL( rtl::OUString::createFromAscii( i_pURL ? i_pURL : "" ) );
+    rtl::OUString aURL( i_pURL ? rtl::OUString::createFromAscii( i_pURL ) : rtl::OUString() );
     // setup button
     i_rBtn.SetPaintTransparent( TRUE );
     i_rBtn.SetClickHdl( LINK( this, BackingWindow, ClickHdl ) );
@@ -993,8 +993,8 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
 
         Sequence< com::sun::star::beans::PropertyValue > aArgs(1);
         PropertyValue* pArg = aArgs.getArray();
-        pArg[0].Name = rtl::OUString::createFromAscii("Referer");
-        pArg[0].Value <<= rtl::OUString::createFromAscii("private:user");
+        pArg[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
+        pArg[0].Value <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:user"));
 
         dispatchURL( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(OPEN_URL) ), rtl::OUString(), xFrame, aArgs );
     }
@@ -1004,8 +1004,8 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
 
         Sequence< com::sun::star::beans::PropertyValue > aArgs(1);
         PropertyValue* pArg = aArgs.getArray();
-        pArg[0].Name = rtl::OUString::createFromAscii("Referer");
-        pArg[0].Value <<= rtl::OUString::createFromAscii("private:user");
+        pArg[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
+        pArg[0].Value <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:user"));
 
         dispatchURL( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(TEMPLATE_URL) ), rtl::OUString(), xFrame, aArgs );
     }
@@ -1084,7 +1084,7 @@ void BackingWindow::dispatchURL( const rtl::OUString& i_rURL,
     aDispatchURL.Complete = i_rURL;
 
     Reference < com::sun::star::util::XURLTransformer > xURLTransformer(
-        comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer") ),
+        comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer")) ),
         com::sun::star::uno::UNO_QUERY );
     if ( xURLTransformer.is() )
     {
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 1c862faf36bf..216c7a94624c 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -83,6 +83,7 @@
 //_________________________________________________________________________________________________________________
 //  includes of other projects
 //_________________________________________________________________________________________________________________
+#include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/factory.hxx>
@@ -264,6 +265,7 @@ Desktop::Desktop( const css::uno::Reference< css::lang::XMultiServiceFactory >&
         ,   m_xSWThreadManager      (                                               )
         ,   m_xSfxTerminator        (                                               )
         ,   m_xTitleNumberGenerator (                                               )
+        ,   m_bTerminating(false)
 {
     // Safe impossible cases
     // We don't accept all incoming parameter.
@@ -291,6 +293,39 @@ Desktop::~Desktop()
 sal_Bool SAL_CALL Desktop::terminate()
     throw( css::uno::RuntimeException )
 {
+    bool bTerminating(false);
+    {
+        WriteGuard aGuard(m_aLock);
+        bTerminating = m_bTerminating;
+        m_bTerminating = true;
+    }
+    if (bTerminating)
+        return false;
+
+    css::uno::Any aException;
+    sal_Bool bTerminate(false);
+    try
+    {
+        bTerminate = impl_terminate();
+    }
+    catch (const css::uno::RuntimeException& rEx)
+    {
+        aException <<= rEx;
+    }
+
+    {
+        WriteGuard aGuard(m_aLock);
+        m_bTerminating = false;
+    }
+
+    if (aException.hasValue())
+        cppu::throwException(aException);
+
+    return bTerminate;
+}
+
+sal_Bool Desktop::impl_terminate()
+{
     TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
 
     SYNCHRONIZED_START
diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx
index e41b91d1302d..629ebe735035 100644
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
@@ -148,7 +148,7 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
     css::uno::Sequence< css::beans::PropertyValue > aArguments( lArguments );
     sal_Int32 nLength = lArguments.getLength();
     aArguments.realloc( nLength + 1 );
-    aArguments[ nLength ].Name = ::rtl::OUString::createFromAscii("SynchronMode");
+    aArguments[ nLength ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SynchronMode"));
     aArguments[ nLength ].Value <<= (sal_Bool) sal_True;
 
     css::uno::Any aResult;
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 7113181372bd..67adb5242c0c 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -557,7 +557,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >&
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
     if (!xWindow.is())
         throw css::uno::RuntimeException(
-                    ::rtl::OUString::createFromAscii("Frame::initialize() called without a valid container window reference."),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Frame::initialize() called without a valid container window reference.")),
                     static_cast< css::frame::XFrame* >(this));
 
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -565,7 +565,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >&
 
     if ( m_xContainerWindow.is() )
         throw css::uno::RuntimeException(
-                ::rtl::OUString::createFromAscii("Frame::initialized() is called more then once, which isnt usefull nor allowed."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Frame::initialized() is called more then once, which isnt usefull nor allowed.")),
                 static_cast< css::frame::XFrame* >(this));
 
     // Look for rejected calls first!
@@ -2614,7 +2614,7 @@ void SAL_CALL Frame::impl_setPropertyValue(const ::rtl::OUString& /*sProperty*/,
                                            const css::uno::Any&   aValue   )
 
 {
-    static ::rtl::OUString MATERIALPROP_TITLE = ::rtl::OUString::createFromAscii("title");
+    static ::rtl::OUString MATERIALPROP_TITLE(RTL_CONSTASCII_USTRINGPARAM("title"));
 
     /* There is no need to lock any mutex here. Because we share the
        solar mutex with our base class. And we said to our base class: "dont release it on calling us" .-)
diff --git a/framework/source/services/fwk_services.src b/framework/source/services/fwk_services.src
index bdbe81bc7fb3..d2368f9eacdc 100644
--- a/framework/source/services/fwk_services.src
+++ b/framework/source/services/fwk_services.src
@@ -123,78 +123,6 @@ Resource RES_BACKING_IMAGES
     };
 };
 
-Resource RES_BACKING_IMAGES_HC
-{
-    Bitmap BMP_BACKING_BACKGROUND_LEFT
-    {
-        File = "backing_hc.png";
-    };
-    Bitmap BMP_BACKING_BACKGROUND_MIDDLE
-    {
-        File = "backing_space_hc.png";
-    };
-    Bitmap BMP_BACKING_BACKGROUND_RIGHT
-    {
-        File = "backing_right_hc.png";
-    };
-    Bitmap BMP_BACKING_BACKGROUND_RTL_LEFT
-    {
-        File = "backing_rtl_left_hc.png";
-    };
-    Bitmap BMP_BACKING_BACKGROUND_RTL_RIGHT
-    {
-        File = "backing_rtl_right_hc.png";
-    };
-    Bitmap BMP_BACKING_EXT
-    {
-        File = "extension_hc.png";
-    };
-    Bitmap BMP_BACKING_REG
-    {
-        File = "register_hc.png";
-    };
-    Bitmap BMP_BACKING_INFO
-    {
-        File = "info_hc.png";
-    };
-    Bitmap BMP_BACKING_TPLREP
-    {
-        File = "template_hc.png";
-    };
-    Bitmap BMP_BACKING_WRITER
-    {
-        File = "odt_32_hc.png";
-    };
-    Bitmap BMP_BACKING_CALC
-    {
-        File = "ods_32_hc.png";
-    };
-    Bitmap BMP_BACKING_IMPRESS
-    {
-        File = "odp_32_hc.png";
-    };
-    Bitmap BMP_BACKING_DRAW
-    {
-        File = "odg_32_hc.png";
-    };
-    Bitmap BMP_BACKING_DATABASE
-    {
-        File = "odb_32_hc.png";
-    };
-    Bitmap BMP_BACKING_FORMULA
-    {
-        File = "odf_32_hc.png";
-    };
-    Bitmap BMP_BACKING_OPENFILE
-    {
-        File = "folder_32_hc.png";
-    };
-    Bitmap BMP_BACKING_OPENTEMPLATE
-    {
-        File = "templates_32_hc.png";
-    };
-};
-
 Window WIN_TABWINDOW
 {
     OutputSize = TRUE ;
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index 7f7c2980eced..a4fba2983e8d 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -211,10 +211,10 @@ static sal_Bool _parseDateTime(const ::rtl::OUString& aString, DateTime& aDateTi
     sal_Int32 nDateLength = 10;
     sal_Int32 nTimeLength = 8;
 
-    ::rtl::OUString aDateTimeSep = ::rtl::OUString::createFromAscii("T");
-    ::rtl::OUString aDateSep = ::rtl::OUString::createFromAscii("-");
-    ::rtl::OUString aTimeSep = ::rtl::OUString::createFromAscii(":");
-    ::rtl::OUString aUTCString = ::rtl::OUString::createFromAscii("Z");
+    ::rtl::OUString aDateTimeSep(RTL_CONSTASCII_USTRINGPARAM("T"));
+    ::rtl::OUString aDateSep(RTL_CONSTASCII_USTRINGPARAM("-"));
+    ::rtl::OUString aTimeSep(RTL_CONSTASCII_USTRINGPARAM(":"));
+    ::rtl::OUString aUTCString(RTL_CONSTASCII_USTRINGPARAM("Z"));
 
     ::rtl::OUString aDateString = aDateTimeString.copy(0, nDateLength);
     ::rtl::OUString aTimeString = aDateTimeString.copy(nDateLength+1, nTimeLength);
@@ -276,11 +276,11 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
         aLangString = aLocale.Language;
         if ( aLocale.Country.getLength() != 0 )
         {
-            aLangString += ::rtl::OUString::createFromAscii("-");
+            aLangString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
             aLangString += aLocale.Country;
             if ( aLocale.Variant.getLength() != 0 )
             {
-                aLangString += ::rtl::OUString::createFromAscii("-");
+                aLangString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
                 aLangString += aLocale.Variant;
             }
         }
@@ -288,21 +288,21 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
         ::rtl::OUString aLicensePath =
             aBaseInstallPath + ::rtl::OUString::createFromAscii(szLicensePath)
             + ::rtl::OUString::createFromAscii(szWNTLicenseName)
-            + ::rtl::OUString::createFromAscii("_")
+            + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_"))
             + aLangString
             + ::rtl::OUString::createFromAscii(szWNTLicenseExt);
 #else
         ::rtl::OUString aLicensePath =
             aBaseInstallPath + ::rtl::OUString::createFromAscii(szLicensePath)
             + ::rtl::OUString::createFromAscii(szUNXLicenseName)
-            + ::rtl::OUString::createFromAscii("_")
+            + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_"))
             + aLangString
             + ::rtl::OUString::createFromAscii(szUNXLicenseExt);
 #endif
         // check if we need to show the license at all
         // open org.openoffice.Setup/Office/ooLicenseAcceptDate
         ::rtl::OUString sConfigSrvc = SERVICENAME_CFGPROVIDER;
-        ::rtl::OUString sAccessSrvc = ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess");
+        ::rtl::OUString sAccessSrvc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess"));
         ::rtl::OUString sReadSrvc   = SERVICENAME_CFGREADACCESS;
 
         // get configuration provider
@@ -310,15 +310,15 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
         m_xFactory->createInstance(sConfigSrvc), UNO_QUERY_THROW);
         Sequence< Any > theArgs(1);
         NamedValue v;
-        v.Name = ::rtl::OUString::createFromAscii("NodePath");
-        v.Value <<= ::rtl::OUString::createFromAscii("org.openoffice.Setup/Office");
+        v.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NodePath"));
+        v.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/Office"));
         theArgs[0] <<= v;
         Reference< XPropertySet > pset = Reference< XPropertySet >(
             theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs), UNO_QUERY_THROW);
 
         // if we find a date there, compare it to baseinstall license date
         ::rtl::OUString aAcceptDate;
-        if (pset->getPropertyValue(::rtl::OUString::createFromAscii("ooLicenseAcceptDate")) >>= aAcceptDate)
+        if (pset->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooLicenseAcceptDate"))) >>= aAcceptDate)
         {
             // get LicenseFileDate from base install
             ::rtl::OUString aLicenseURL = aLicensePath;
@@ -356,7 +356,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
 
             // write org.openoffice.Setup/ooLicenseAcceptDate
             aAcceptDate = _getCurrentDateString();
-            pset->setPropertyValue(::rtl::OUString::createFromAscii("ooLicenseAcceptDate"), makeAny(aAcceptDate));
+            pset->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooLicenseAcceptDate")), makeAny(aAcceptDate));
             Reference< XChangesBatch >(pset, UNO_QUERY_THROW)->commitChanges();
 
             // enable quickstarter
@@ -367,7 +367,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
             aSeq[1] <<= bAutostart;
 
             Reference < XInitialization > xQuickstart( ::comphelper::getProcessServiceFactory()->createInstance(
-                ::rtl::OUString::createFromAscii( "com.sun.star.office.Quickstart" )),UNO_QUERY );
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.office.Quickstart"))),UNO_QUERY );
             if ( xQuickstart.is() )
                 xQuickstart->initialize( aSeq );
 
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index 86c6c030ffc3..d394b305bad3 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -56,8 +56,8 @@
 namespace framework
 {
 
-static const ::rtl::OUString CFGPATH_FACTORIES     = ::rtl::OUString::createFromAscii("/org.openoffice.Setup/Office/Factories");
-static const ::rtl::OUString MODULEPROP_IDENTIFIER = ::rtl::OUString::createFromAscii("ooSetupFactoryModuleIdentifier" );
+static const ::rtl::OUString CFGPATH_FACTORIES    (RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Office/Factories"));
+static const ::rtl::OUString MODULEPROP_IDENTIFIER(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryModuleIdentifier"));
 
 /*-----------------------------------------------
     04.12.2003 09:32
@@ -146,7 +146,7 @@ ModuleManager::~ModuleManager()
        )
     {
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii("Given module is not a frame nor a window, controller or model."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Given module is not a frame nor a window, controller or model.")),
                 static_cast< ::cppu::OWeakObject* >(this),
                 1);
     }
@@ -176,7 +176,7 @@ ModuleManager::~ModuleManager()
 
     if (sModule.getLength() < 1)
         throw css::frame::UnknownModuleException(
-                ::rtl::OUString::createFromAscii("Cant find suitable module for the given component."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cant find suitable module for the given component.")),
                 static_cast< ::cppu::OWeakObject* >(this));
 
     return sModule;
@@ -196,7 +196,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName ,
     if (lProps.empty() )
     {
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii("No properties given to replace part of module."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No properties given to replace part of module.")),
                 static_cast< css::container::XNameAccess* >(this),
                 2);
     }
@@ -223,7 +223,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName ,
     if (!xModule.is())
     {
         throw css::uno::RuntimeException(
-                ::rtl::OUString::createFromAscii("Was not able to get write access to the requested module entry inside configuration."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Was not able to get write access to the requested module entry inside configuration.")),
                 static_cast< css::container::XNameAccess* >(this));
     }
 
@@ -258,7 +258,7 @@ css::uno::Any SAL_CALL ModuleManager::getByName(const ::rtl::OUString& sName)
     if (!xModule.is())
     {
         throw css::uno::RuntimeException(
-                ::rtl::OUString::createFromAscii("Was not able to get write access to the requested module entry inside configuration."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Was not able to get write access to the requested module entry inside configuration.")),
                 static_cast< css::container::XNameAccess* >(this));
     }
 
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index ccf17e45a630..181cda0b0df4 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -164,7 +164,7 @@ void SessionListener::StoreSession( sal_Bool bAsync )
         css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW);
         css::uno::Reference< XURLTransformer > xURLTransformer(m_xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), UNO_QUERY_THROW);
         URL aURL;
-        aURL.Complete = OUString::createFromAscii("vnd.sun.star.autorecovery:/doSessionSave");
+        aURL.Complete = OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.autorecovery:/doSessionSave"));
         xURLTransformer->parseStrict(aURL);
 
         // in case of asynchronous call the notification will trigger saveDone()
@@ -172,7 +172,7 @@ void SessionListener::StoreSession( sal_Bool bAsync )
             xDispatch->addStatusListener(this, aURL);
 
         Sequence< PropertyValue > args(1);
-        args[0] = PropertyValue(OUString::createFromAscii("DispatchAsynchron"),-1,makeAny(bAsync),PropertyState_DIRECT_VALUE);
+        args[0] = PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("DispatchAsynchron")),-1,makeAny(bAsync),PropertyState_DIRECT_VALUE);
         xDispatch->dispatch(aURL, args);
     } catch (com::sun::star::uno::Exception& e) {
         OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
@@ -196,11 +196,11 @@ void SessionListener::QuitSessionQuietly()
         css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW);
         css::uno::Reference< XURLTransformer > xURLTransformer(m_xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), UNO_QUERY_THROW);
         URL aURL;
-        aURL.Complete = OUString::createFromAscii("vnd.sun.star.autorecovery:/doSessionQuietQuit");
+        aURL.Complete = OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.autorecovery:/doSessionQuietQuit"));
         xURLTransformer->parseStrict(aURL);
 
         Sequence< PropertyValue > args(1);
-        args[0] = PropertyValue(OUString::createFromAscii("DispatchAsynchron"),-1,makeAny(sal_False),PropertyState_DIRECT_VALUE);
+        args[0] = PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("DispatchAsynchron")),-1,makeAny(sal_False),PropertyState_DIRECT_VALUE);
         xDispatch->dispatch(aURL, args);
     } catch (com::sun::star::uno::Exception& e) {
         OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8);
@@ -216,7 +216,7 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any  >& args)
     throw (RuntimeException)
 {
 
-    OUString aSMgr = OUString::createFromAscii("com.sun.star.frame.SessionManagerClient");
+    OUString aSMgr(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.SessionManagerClient"));
     if (args.getLength() > 0)
     {
         NamedValue v;
@@ -273,7 +273,7 @@ sal_Bool SAL_CALL SessionListener::doRestore()
         css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW);
 
         URL aURL;
-        aURL.Complete = OUString::createFromAscii("vnd.sun.star.autorecovery:/doSessionRestore");
+        aURL.Complete = OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.autorecovery:/doSessionRestore"));
         css::uno::Reference< XURLTransformer > xURLTransformer(m_xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), UNO_QUERY_THROW);
         xURLTransformer->parseStrict(aURL);
         Sequence< PropertyValue > args;
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 446e3aa9015f..29746ee42ce6 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -101,10 +101,9 @@
 #define REPLACELENGTH_LANGID            9
 #define REPLACELENGTH_VLANG             8
 #define REPLACELENGTH_WORKDIRURL        13
-// --> PB 2004-10-27 #i32656# - new variable of hierachy service
+// New variable of hierachy service (#i32656#)
 #define REPLACELENGTH_BASEINSTURL       14
 #define REPLACELENGTH_USERDATAURL       14
-// <--
 
 // Name of the pre defined path variables
 #define VARIABLE_INST                   "$(inst)"
@@ -124,10 +123,9 @@
 #define VARIABLE_PROGURL                "$(progurl)"
 #define VARIABLE_USERURL                "$(userurl)"
 #define VARIABLE_WORKDIRURL             "$(workdirurl)"
-// --> PB 2004-10-27 #i32656# - new variable of hierachy service
+// New variable of hierachy service (#i32656#)
 #define VARIABLE_BASEINSTURL            "$(baseinsturl)"
 #define VARIABLE_USERDATAURL            "$(userdataurl)"
-// <--
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
@@ -214,10 +212,9 @@ static FixedVariable aFixedVarTable[] =
     { VARIABLE_PROGURL,     PREDEFVAR_PROGURL,      REPLACELENGTH_PROGURL       },
     { VARIABLE_USERURL,     PREDEFVAR_USERURL,      REPLACELENGTH_USERURL       },
     { VARIABLE_WORKDIRURL,  PREDEFVAR_WORKDIRURL,   REPLACELENGTH_WORKDIRURL    },  // Special variable (transient) and don't use for resubstitution!
-    // --> PB 2004-10-27 #i32656# - new variable of hierachy service
+    // New variable of hierachy service (#i32656#)
     { VARIABLE_BASEINSTURL, PREDEFVAR_BASEINSTURL,  REPLACELENGTH_BASEINSTURL   },
     { VARIABLE_USERDATAURL, PREDEFVAR_USERDATAURL,  REPLACELENGTH_USERDATAURL   },
-    // <--
     { "$(brandbaseurl)", PREDEFVAR_BRANDBASEURL,
       RTL_CONSTASCII_LENGTH("$(brandbaseurl)") }
 };
@@ -1198,16 +1195,14 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable
     // Set $(inst), $(instpath), $(insturl)
     aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTURL ]    = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ];
     aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INST ]       = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ];
-    // --> PB 2004-10-27 #i32656# - new variable of hierachy service
+    // New variable of hierachy service (#i32656#)
     aPreDefPathVariables.m_FixedVar[ PREDEFVAR_BASEINSTURL ]= aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ];
-    // <--
 
     // Set $(user), $(userpath), $(userurl)
     aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERURL ]    = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ];
     aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USER ]       = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ];
-    // --> PB 2004-11-11 #i32656# - new variable of hierachy service
+    // New variable of hierachy service (#i32656#)
     aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERDATAURL ]= aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ];
-    // <--
 
     // Detect the program directory
     // Set $(prog), $(progpath), $(progurl)
diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx
index 5a0c45fc9a48..641328f69be3 100644
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.cxx
@@ -441,7 +441,7 @@ void TabWindowService::impl_checkTabIndex (::sal_Int32 nID)
        )
     {
         throw css::lang::IndexOutOfBoundsException(
-                ::rtl::OUString::createFromAscii("Tab index out of bounds."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tab index out of bounds.")),
                 css::uno::Reference< css::uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY ));
     }
 }
@@ -455,7 +455,7 @@ TTabPageInfoHash::iterator TabWindowService::impl_getTabPageInfo(::sal_Int32 nID
     TTabPageInfoHash::iterator pIt = m_lTabPageInfos.find(nID);
     if (pIt == m_lTabPageInfos.end ())
         throw css::lang::IndexOutOfBoundsException(
-                ::rtl::OUString::createFromAscii("Tab index out of bounds."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tab index out of bounds.")),
                 css::uno::Reference< css::uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY ));
     return pIt;
 }
diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx
index 16c5dae13072..01e52f0f30cd 100644
--- a/framework/source/services/urltransformer.cxx
+++ b/framework/source/services/urltransformer.cxx
@@ -350,7 +350,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException
         if ( !bWithPassword && aTestURL.Password.getLength() > 0 )
         {
             // Exchange password text with other placeholder string
-            aTestURL.Password = ::rtl::OUString::createFromAscii( "<******>" );
+            aTestURL.Password = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<******>"));
             assemble( aTestURL );
         }
 
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 51112cc6764e..24330148eb32 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -88,8 +88,7 @@ using namespace ::cppu;
 // Image sizes for our toolbars/menus
 const sal_Int32 IMAGE_SIZE_NORMAL         = 16;
 const sal_Int32 IMAGE_SIZE_LARGE          = 26;
-const sal_Int16 MAX_IMAGETYPE_VALUE       = ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST|
-                                            ::com::sun::star::ui::ImageType::SIZE_LARGE;
+const sal_Int16 MAX_IMAGETYPE_VALUE       = ::com::sun::star::ui::ImageType::SIZE_LARGE;
 
 static const char   IMAGE_FOLDER[]        = "images";
 static const char   BITMAPS_FOLDER[]      = "Bitmaps";
@@ -98,17 +97,13 @@ static const char   IMAGE_EXTENSION[]     = ".png";
 static const char*  IMAGELIST_XML_FILE[]  =
 {
     "sc_imagelist.xml",
-    "lc_imagelist.xml",
-    "sch_imagelist.xml",
-    "lch_imagelist.xml"
+    "lc_imagelist.xml"
 };
 
 static const char*  BITMAP_FILE_NAMES[]   =
 {
     "sc_userimages.png",
-    "lc_userimages.png",
-    "sch_userimages.png",
-    "lch_userimages.png"
+    "lc_userimages.png"
 };
 
 namespace framework
@@ -119,9 +114,7 @@ namespace framework
     static const char* ImageType_Prefixes[ImageType_COUNT] =
     {
         "res/commandimagelist/sc_",
-        "res/commandimagelist/lc_",
-        "res/commandimagelist/sch_",
-        "res/commandimagelist/lch_"
+        "res/commandimagelist/lc_"
     };
 
 typedef GraphicNameAccess CmdToXGraphicNameAccess;
@@ -427,8 +420,7 @@ static sal_Bool implts_checkAndScaleGraphic( uno::Reference< XGraphic >& rOutGra
     Size   aSize = aImage.GetSizePixel();
     bool   bMustScale( false );
 
-    if (( nImageType == ImageType_Color_Large ) ||
-        ( nImageType == ImageType_HC_Large ))
+    if ( nImageType == ImageType_Color_Large )
         bMustScale = ( aSize != aLargeSize );
     else
         bMustScale = ( aSize != aNormSize );
@@ -450,8 +442,6 @@ static sal_Int16 implts_convertImageTypeToIndex( sal_Int16 nImageType )
     sal_Int16 nIndex( 0 );
     if ( nImageType & ::com::sun::star::ui::ImageType::SIZE_LARGE )
         nIndex += 1;
-    if ( nImageType & ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST )
-        nIndex += 2;
     return nIndex;
 }
 
@@ -473,11 +463,11 @@ void ImageManagerImpl::implts_initialize()
 
         try
         {
-            m_xUserImageStorage = m_xUserConfigStorage->openStorageElement( OUString::createFromAscii( IMAGE_FOLDER ),
+            m_xUserImageStorage = m_xUserConfigStorage->openStorageElement( OUString(RTL_CONSTASCII_USTRINGPARAM( IMAGE_FOLDER )),
                                                                             nModes );
             if ( m_xUserImageStorage.is() )
             {
-                m_xUserBitmapsStorage = m_xUserImageStorage->openStorageElement( OUString::createFromAscii( BITMAPS_FOLDER ),
+                m_xUserBitmapsStorage = m_xUserImageStorage->openStorageElement( OUString(RTL_CONSTASCII_USTRINGPARAM( BITMAPS_FOLDER )),
                                                                                  nModes );
             }
         }
@@ -1367,11 +1357,11 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException
     {
         long nModes = ElementModes::READWRITE;
 
-        uno::Reference< XStorage > xUserImageStorage = Storage->openStorageElement( OUString::createFromAscii( IMAGE_FOLDER ),
+        uno::Reference< XStorage > xUserImageStorage = Storage->openStorageElement( OUString(RTL_CONSTASCII_USTRINGPARAM( IMAGE_FOLDER )),
                                                                                     nModes );
         if ( xUserImageStorage.is() )
         {
-            uno::Reference< XStorage > xUserBitmapsStorage = xUserImageStorage->openStorageElement( OUString::createFromAscii( BITMAPS_FOLDER ),
+            uno::Reference< XStorage > xUserBitmapsStorage = xUserImageStorage->openStorageElement( OUString(RTL_CONSTASCII_USTRINGPARAM( BITMAPS_FOLDER )),
                                                                                                     nModes );
             for ( sal_Int32 i = 0; i < ImageType_COUNT; i++ )
             {
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index 823afbcb764f..e030cb380938 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -169,7 +169,7 @@ RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "Modul
         m_xDefaultCfgRootStorage = Reference< XStorage >( xStorageFactory->createInstanceWithArguments( aArgs ), UNO_QUERY_THROW );
 
         Reference < XOutputStream > xTempOut( m_xServiceManager->createInstance (
-                                                ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ),
+                                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")) ),
                                               UNO_QUERY );
 
         Reference< XPackageStructureCreator > xPackageStructCreator( m_xServiceManager->createInstance(
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index fb8418dbb04e..70441c252e40 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -828,8 +828,8 @@ void SAL_CALL ModuleUIConfigurationManager::initialize( const Sequence< Any >& a
     if ( !m_bInitialized )
     {
         ::comphelper::SequenceAsHashMap lArgs(aArguments);
-        m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleIdentifier"), ::rtl::OUString());
-        m_aModuleShortName  = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleShortName"), ::rtl::OUString());
+        m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleIdentifier")), ::rtl::OUString());
+        m_aModuleShortName  = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleShortName")), ::rtl::OUString());
 
         for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
         {
@@ -1390,7 +1390,7 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getShortCutManage
         Reference< XInitialization > xInit    (xManager, UNO_QUERY_THROW);
 
         PropertyValue aProp;
-        aProp.Name    = ::rtl::OUString::createFromAscii("ModuleIdentifier");
+        aProp.Name    = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleIdentifier"));
         aProp.Value <<= aModule;
 
         Sequence< Any > lArgs(1);
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index 6a839fa55ebb..b5081693fa7d 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -452,7 +452,7 @@ UICategoryDescription::UICategoryDescription( const Reference< XMultiServiceFact
 
     // insert generic categories mappings
     m_aModuleToCommandFileMap.insert( ModuleToCommandFileMap::value_type(
-        rtl::OUString::createFromAscii( GENERIC_MODULE_NAME ), aGenericCategories ));
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( GENERIC_MODULE_NAME )), aGenericCategories ));
 
     UICommandsHashMap::iterator pCatIter = m_aUICommandsHashMap.find( aGenericCategories );
     if ( pCatIter != m_aUICommandsHashMap.end() )
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 01b5511f19cb..e784f560c6b5 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -1107,7 +1107,7 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getShortCutManager() th
     Reference< XInitialization > xInit      (xAccConfig, UNO_QUERY_THROW);
 
     PropertyValue aProp;
-    aProp.Name    = ::rtl::OUString::createFromAscii("DocumentRoot");
+    aProp.Name    = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentRoot"));
     aProp.Value <<= xDocumentRoot;
 
     Sequence< Any > lArgs(1);
diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
index 54bd1422f209..cb221f0bcfab 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
@@ -803,8 +803,8 @@ void UIConfigurationManagerImpl::initialize( const Sequence< Any >& aArguments )
     if ( !m_bInitialized )
     {
         ::comphelper::SequenceAsHashMap lArgs(aArguments);
-        m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleIdentifier"), ::rtl::OUString());
-        m_aModuleShortName  = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleShortName"), ::rtl::OUString());
+        m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleIdentifier")), ::rtl::OUString());
+        m_aModuleShortName  = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleShortName")), ::rtl::OUString());
 
         for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ )
         {
@@ -1386,7 +1386,7 @@ Reference< XInterface > UIConfigurationManagerImpl::getShortCutManager() throw (
     } // if ( m_bUseDefault )
     else
     {
-        aProp.Name    = ::rtl::OUString::createFromAscii("DocumentRoot");
+        aProp.Name    = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentRoot"));
         aProp.Value <<= xDocumentRoot;
     }
     lArgs[0] <<= aProp;
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index cc23cb2475b5..0adf1f1c8417 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -1224,7 +1224,7 @@ void ConfigurationAccess_WindowState::impl_putPropertiesFromStruct( const Window
     sal_Int32                 i( 0 );
     sal_Int32                 nCount( m_aPropArray.size() );
     Sequence< PropertyValue > aPropSeq;
-    ::rtl::OUString                  aDelim( ::rtl::OUString::createFromAscii( "," ));
+    ::rtl::OUString                  aDelim( RTL_CONSTASCII_USTRINGPARAM(",") );
 
     for ( i = 0; i < nCount; i++ )
     {
@@ -1374,7 +1374,14 @@ WindowStateConfiguration::WindowStateConfiguration( const Reference< XMultiServi
                                                     UNO_QUERY );
     Reference< XNameAccess > xEmptyNameAccess;
     Reference< XNameAccess > xNameAccess( m_xModuleManager, UNO_QUERY_THROW );
-    Sequence< rtl::OUString > aElementNames = xNameAccess->getElementNames();
+    Sequence< rtl::OUString > aElementNames;
+    try
+    {
+        aElementNames = xNameAccess->getElementNames();
+    }
+    catch (::com::sun::star::uno::RuntimeException &)
+    {
+    }
     Sequence< PropertyValue > aSeq;
     ::rtl::OUString                  aModuleIdentifier;
 
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index 73514daf6ad0..6841066ab47a 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -142,25 +142,25 @@ static sal_Bool IsCorrectContext( const ::rtl::OUString& rModuleIdentifier, cons
 static Image RetrieveImage( Reference< com::sun::star::frame::XFrame >& rFrame,
                             const rtl::OUString& aImageId,
                             const rtl::OUString& aURL,
-                            BOOL bBigImage,
-                            BOOL bHiContrast )
+                            BOOL bBigImage
+)
 {
     Image aImage;
 
     if ( aImageId.getLength() > 0 )
     {
-        aImage = framework::AddonsOptions().GetImageFromURL( aImageId, bBigImage, bHiContrast );
+        aImage = framework::AddonsOptions().GetImageFromURL( aImageId, bBigImage );
         if ( !!aImage )
             return aImage;
         else
-            aImage = GetImageFromURL( rFrame, aImageId, bBigImage, bHiContrast );
+            aImage = GetImageFromURL( rFrame, aImageId, bBigImage );
         if ( !!aImage )
             return aImage;
     }
 
-    aImage = framework::AddonsOptions().GetImageFromURL( aURL, bBigImage, bHiContrast );
+    aImage = framework::AddonsOptions().GetImageFromURL( aURL, bBigImage );
     if ( !aImage )
-        aImage = GetImageFromURL( rFrame, aImageId, bBigImage, bHiContrast );
+        aImage = GetImageFromURL( rFrame, aImageId, bBigImage );
 
     return aImage;
 }
@@ -215,11 +215,10 @@ void AddonsToolBarManager::RefreshImages()
             if ( pRuntimeItemData )
                 aImageId  = pRuntimeItemData->aImageId;
 
-            m_pToolBar->SetItemImage( nId, RetrieveImage( m_xFrame,
-                                                          aImageId,
-                                                          aCommandURL,
-                                                          bBigImages,
-                                                          m_bIsHiContrast ));
+            m_pToolBar->SetItemImage(
+                nId,
+                RetrieveImage( m_xFrame, aImageId, aCommandURL, bBigImages )
+            );
         }
     }
 }
@@ -298,7 +297,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
 
                 m_pToolBar->InsertItem( nId, aTitle );
 
-                Image aImage = RetrieveImage( m_xFrame, aImageId, aURL, !m_bSmallSymbols, m_bIsHiContrast );
+                Image aImage = RetrieveImage( m_xFrame, aImageId, aURL, !m_bSmallSymbols );
                 if ( !!aImage )
                     m_pToolBar->SetItemImage( nId, aImage );
 
@@ -508,7 +507,6 @@ IMPL_LINK( AddonsToolBarManager, StateChanged, StateChangedType*, pStateChangedT
 {
     if ( *pStateChangedType == STATE_CHANGE_CONTROLBACKGROUND )
     {
-        // Check if we need to get new images for normal/high contrast mode
         CheckAndUpdateImages();
     }
     return 1;
@@ -520,7 +518,6 @@ IMPL_LINK( AddonsToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEve
         (  pDataChangedEvent->GetType() == DATACHANGED_DISPLAY  ))  &&
         ( pDataChangedEvent->GetFlags() & SETTINGS_STYLE        ))
     {
-        // Check if we need to get new images for normal/high contrast mode
         CheckAndUpdateImages();
     }
 
diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx
index c57eb210b4fc..05c567251a45 100644
--- a/framework/source/uielement/buttontoolbarcontroller.cxx
+++ b/framework/source/uielement/buttontoolbarcontroller.cxx
@@ -282,7 +282,7 @@ throw (::com::sun::star::uno::RuntimeException)
             aArgs[0].Value  <<= KeyModifier;
 
             if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-                UiEventLogHelper(::rtl::OUString::createFromAscii("ButtonToolbarController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
+                UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ButtonToolbarController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
             xDispatch->dispatch( aTargetURL, aArgs );
         }
         catch ( DisposedException& )
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index 2448f2004f98..f1d6291531da 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -157,7 +157,7 @@ throw ( RuntimeException )
         pExecuteInfo->aTargetURL    = aTargetURL;
         pExecuteInfo->aArgs         = aArgs;
         if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-            UiEventLogHelper(::rtl::OUString::createFromAscii("ComplexToolbarController")).log(
+            UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ComplexToolbarController"))).log(
                 m_xServiceManager,
                 m_xFrame,
                 aTargetURL,
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 7cf66b62405a..6b2730195458 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -69,7 +69,6 @@
 // Function-Id's
 #define RID_FMSHELL_CONVERSIONMENU (RID_FORMS_START + 4)
 #define RID_SVXIMGLIST_FMEXPL      (RID_FORMS_START + 0)
-#define RID_SVXIMGLIST_FMEXPL_HC   (RID_FORMS_START + 2)
 
 // Forms - Ids, used to address images from image list
 #define SID_FMSLOTS_START                   (SID_SVX_START + 592)
@@ -220,7 +219,6 @@ ControlMenuController::ControlMenuController( const ::com::sun::star::uno::Refer
     m_pResPopupMenu( 0 )
 {
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-    m_bWasHiContrast    = rSettings.GetHighContrastMode();
     m_bShowMenuImages   = rSettings.GetUseImagesInMenus();
 
 }
@@ -235,7 +233,7 @@ void ControlMenuController::updateImagesPopupMenu( PopupMenu* pPopupMenu )
     rtl::OUString aResName( RTL_CONSTASCII_USTRINGPARAM( "svx" ));
 
     ResMgr* pResMgr = ResMgr::CreateResMgr( rtl::OUStringToOString( aResName, RTL_TEXTENCODING_ASCII_US ));
-    ResId aResId( m_bWasHiContrast ? RID_SVXIMGLIST_FMEXPL_HC : RID_SVXIMGLIST_FMEXPL, *pResMgr );
+    ResId aResId( RID_SVXIMGLIST_FMEXPL, *pResMgr );
     aResId.SetRT( RSC_IMAGELIST );
 
     if ( pResMgr->IsAvailable( aResId ))
@@ -346,7 +344,7 @@ void ControlMenuController::impl_select(const Reference< XDispatch >& /*_xDispat
         Sequence<PropertyValue>      aArgs;
         Reference< XDispatch > xDispatch = pIter->second;
         if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-            UiEventLogHelper(::rtl::OUString::createFromAscii("ControlMenuController")).log(m_xServiceManager, m_xFrame, aURL, aArgs);
+            UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlMenuController"))).log(m_xServiceManager, m_xFrame, aURL, aArgs);
         if ( xDispatch.is() )
             xDispatch->dispatch( aURL, aArgs );
     }
@@ -362,14 +360,11 @@ void SAL_CALL ControlMenuController::activate( const css::awt::MenuEvent& ) thro
 
         // Check if some modes have changed so we have to update our menu images
         const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-        sal_Bool bIsHiContrast      = rSettings.GetHighContrastMode();
         sal_Bool bShowMenuImages    = rSettings.GetUseImagesInMenus();
-        sal_Bool bUpdateImages      = (( m_bWasHiContrast != bIsHiContrast ) || ( bShowMenuImages != m_bShowMenuImages ));
+        sal_Bool bUpdateImages      = (bShowMenuImages != m_bShowMenuImages);
 
         if ( bUpdateImages )
         {
-            // The mode has changed or the complete menu so we have to retrieve all images again
-            m_bWasHiContrast    = bIsHiContrast;
             m_bShowMenuImages   = bShowMenuImages;
 
             VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( m_xPopupMenu );
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index 3ef69ce99276..3e9df2b5ae46 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -178,7 +178,7 @@ void FontMenuController::impl_select(const Reference< XDispatch >& _xDispatch,co
 {
     Sequence<PropertyValue>      aArgs;
     if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-        UiEventLogHelper(::rtl::OUString::createFromAscii("FontMenuController")).log(
+        UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FontMenuController"))).log(
             m_xServiceManager,
             m_xFrame,
             aTargetURL,
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index 955b909891cd..b72dde21e33c 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -316,7 +316,7 @@ void FontSizeMenuController::impl_select(const Reference< XDispatch >& _xDispatc
 {
     Sequence<PropertyValue>      aArgs;
     if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-        UiEventLogHelper(::rtl::OUString::createFromAscii("FontSizeMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
+        UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FontSizeMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
     OSL_ENSURE(_xDispatch.is(),"FontSizeMenuController::impl_select: No dispatch");
     if ( _xDispatch.is() )
         _xDispatch->dispatch( aTargetURL, aArgs );
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 42f1acbb4ac0..18a0a772dd86 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -200,7 +200,7 @@ throw ( RuntimeException )
         pExecuteInfo->aTargetURL    = aTargetURL;
         pExecuteInfo->aArgs         = aArgs;
         if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-            UiEventLogHelper(::rtl::OUString::createFromAscii("GenericToolbarController")).log( m_xServiceManager, m_xFrame, aTargetURL, aArgs);
+            UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GenericToolbarController"))).log( m_xServiceManager, m_xFrame, aTargetURL, aArgs);
         Application::PostUserEvent( STATIC_LINK(0, GenericToolbarController , ExecuteHdl_Impl), pExecuteInfo );
     }
 }
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index fc99b77451c6..705dc9020b32 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -136,9 +136,8 @@ ImageButtonToolbarController::ImageButtonToolbarController(
     ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand )
 {
     sal_Bool bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() );
-    sal_Bool bHiContrast( pToolbar->GetSettings().GetStyleSettings().GetHighContrastMode() );
 
-    Image aImage = AddonsOptions().GetImageFromURL( aCommand, bBigImages, bHiContrast, sal_True );
+    Image aImage = AddonsOptions().GetImageFromURL( aCommand, bBigImages, sal_True );
 
     // Height will be controlled by scaling according to button height
     m_pToolbar->SetItemImage( m_nID, aImage );
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index ec7f306cce03..c6cd2943a628 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -189,7 +189,7 @@ void LanguageSelectionMenuController::impl_select(const Reference< XDispatch >&
     {
         Sequence<PropertyValue>      aArgs;
         if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-            UiEventLogHelper( OUString::createFromAscii("LanguageSelectionMenuController")).log( m_xServiceManager, m_xFrame, aTargetURL, aArgs );
+            UiEventLogHelper( OUString(RTL_CONSTASCII_USTRINGPARAM("LanguageSelectionMenuController"))).log( m_xServiceManager, m_xFrame, aTargetURL, aArgs );
         xDispatch->dispatch( aTargetURL, aArgs );
     }
 }
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index a668d4890986..485db0d26489 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -285,55 +285,55 @@ throw (::com::sun::star::uno::RuntimeException)
         {
             //set selected language as current language for selection
             String aSelectedLang = aLangMap[nId];
-            aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Current_");
+            aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Current_"));
             aURL.Complete += aSelectedLang;
         }
         else if (nId == MID_LANG_SEL_NONE)
         {
             //set None as current language for selection
-            aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Current_LANGUAGE_NONE");
+            aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Current_LANGUAGE_NONE"));
         }
         else if (nId == MID_LANG_SEL_RESET)
         {
             // reset language attributes for selection
-            aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Current_RESET_LANGUAGES");
+            aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Current_RESET_LANGUAGES"));
         }
         else if (nId == MID_LANG_SEL_MORE)
         {
             //open the dialog "format/character" for current selection
-            aURL.Complete += OUString::createFromAscii(".uno:FontDialog?Language:string=*");
+            aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FontDialog?Language:string=*"));
         }
         else if (MID_LANG_PARA_1 <= nId && nId <= MID_LANG_PARA_9)
         {
             //set selected language for current paragraph
             String aSelectedLang = aLangMap[nId];
-            aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Paragraph_");
+            aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Paragraph_"));
             aURL.Complete += aSelectedLang;
         }
         else if (nId == MID_LANG_PARA_NONE)
         {
             //set None as language for current paragraph
-            aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Paragraph_LANGUAGE_NONE");
+            aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Paragraph_LANGUAGE_NONE"));
         }
         else if (nId == MID_LANG_PARA_RESET)
         {
             // reset language attributes for paragraph
-            aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Paragraph_RESET_LANGUAGES");
+            aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Paragraph_RESET_LANGUAGES"));
         }
         else if (nId == MID_LANG_PARA_MORE)
         {
             //open the dialog "format/character" for current paragraph
-            aURL.Complete += OUString::createFromAscii(".uno:FontDialogForParagraph");
+            aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FontDialogForParagraph"));
         }
 
-        uno::Reference< util::XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( OUString::createFromAscii("com.sun.star.util.URLTransformer" )), uno::UNO_QUERY );
+        uno::Reference< util::XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), uno::UNO_QUERY );
         xURLTransformer->parseStrict( aURL );
         uno::Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch(aURL, OUString(), 0);
         if( xDispatch.is() )
         {
             uno::Sequence< beans::PropertyValue > aPV;
             if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-                UiEventLogHelper( OUString::createFromAscii("ButtonToolbarController")).log(m_xServiceManager, m_xFrame, aURL, aPV);
+                UiEventLogHelper( OUString(RTL_CONSTASCII_USTRINGPARAM("ButtonToolbarController"))).log(m_xServiceManager, m_xFrame, aURL, aPV);
             xDispatch->dispatch( aURL, aPV);
         }
     }
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index 83ed615f1d80..986260ba4098 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -152,7 +152,7 @@ void MacrosMenuController::impl_select(const Reference< XDispatch >& /*_xDispatc
         pExecuteInfo->aTargetURL    = aTargetURL;
         //pExecuteInfo->aArgs         = aArgs;
         if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-            UiEventLogHelper(::rtl::OUString::createFromAscii("MacrosMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, pExecuteInfo->aArgs);
+            UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MacrosMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, pExecuteInfo->aArgs);
 //                xDispatch->dispatch( aTargetURL, aArgs );
         Application::PostUserEvent( STATIC_LINK(0, MacrosMenuController , ExecuteHdl_Impl), pExecuteInfo );
     }
@@ -188,10 +188,8 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, USHORT startIt
 {
     const String aCmdBase = String::CreateFromAscii( ".uno:ScriptOrganizer?ScriptOrganizer.Language:string=" );
     const String ellipsis = String::CreateFromAscii( "..." );
-    const ::rtl::OUString providerKey =
-    ::rtl::OUString::createFromAscii("com.sun.star.script.provider.ScriptProviderFor" );
-    const ::rtl::OUString languageProviderName =
-        ::rtl::OUString::createFromAscii("com.sun.star.script.provider.LanguageScriptProvider" );
+    const ::rtl::OUString providerKey(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.provider.ScriptProviderFor"));
+    const ::rtl::OUString languageProviderName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.provider.LanguageScriptProvider"));
     USHORT itemId = startItemId;
     Reference< XContentEnumerationAccess > xEnumAccess = Reference< XContentEnumerationAccess >( m_xServiceManager, UNO_QUERY_THROW );
     Reference< XEnumeration > xEnum = xEnumAccess->createContentEnumeration ( languageProviderName );
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index d6a6c0473656..2effdc8d9026 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -188,13 +188,11 @@ const ::rtl::OUString aSpecialWindowCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:
 
 const ::rtl::OUString UNO_COMMAND( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ));
 
-static sal_Int16 getImageTypeFromBools( sal_Bool bBig, sal_Bool bHighContrast )
+static sal_Int16 getImageTypeFromBools( sal_Bool bBig )
 {
     sal_Int16 n( 0 );
     if ( bBig )
         n |= ::com::sun::star::ui::ImageType::SIZE_LARGE;
-    if ( bHighContrast )
-        n |= ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST;
     return n;
 }
 
@@ -458,7 +456,7 @@ throw (RuntimeException)
         return;
 
     sal_Int16 nImageType = sal_Int16();
-    sal_Int16 nCurrentImageType = getImageTypeFromBools( sal_False, m_bWasHiContrast );
+    sal_Int16 nCurrentImageType = getImageTypeFromBools( sal_False );
     if (( Event.aInfo >>= nImageType ) &&
         ( nImageType == nCurrentImageType ))
         RequestImages();
@@ -869,20 +867,16 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
              MenuManager::UpdateSpecialWindowMenu( pMenu,getServiceFactory(),m_aLock );
 
         // Check if some modes have changed so we have to update our menu images
-        sal_Bool bIsHiContrast = rSettings.GetHighContrastMode();
         sal_Int16 nSymbolsStyle = SvtMiscOptions().GetCurrentSymbolsStyle();
 
         if ( m_bRetrieveImages ||
-             m_bWasHiContrast != bIsHiContrast ||
              bShowMenuImages != m_bShowMenuImages ||
              nSymbolsStyle != m_nSymbolsStyle )
         {
-            // The mode changed so we have to replace all images
-            m_bWasHiContrast    = bIsHiContrast;
             m_bShowMenuImages   = bShowMenuImages;
             m_bRetrieveImages   = sal_False;
             m_nSymbolsStyle     = nSymbolsStyle;
-            MenuManager::FillMenuImages(m_xFrame,pMenu,bIsHiContrast,bShowMenuImages);
+            MenuManager::FillMenuImages( m_xFrame, pMenu, bShowMenuImages );
         }
 
         // Try to map commands to labels
@@ -1145,7 +1139,7 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
     {
         const sal_uInt32 nRef = Application::ReleaseSolarMutex();
         if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-            UiEventLogHelper(::rtl::OUString::createFromAscii("MenuBarManager")).log(getServiceFactory(), m_xFrame, aTargetURL, aArgs);
+            UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MenuBarManager"))).log(getServiceFactory(), m_xFrame, aTargetURL, aArgs);
         xDispatch->dispatch( aTargetURL, aArgs );
         Application::AcquireSolarMutex( nRef );
     }
@@ -1266,7 +1260,6 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
     m_xDispatchProvider = rDispatchProvider;
 
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-    m_bWasHiContrast    = rSettings.GetHighContrastMode();
     m_bShowMenuImages   = rSettings.GetUseImagesInMenus();
     m_bRetrieveImages   = sal_False;
 
@@ -1431,7 +1424,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
                         if ( bItemShowMenuImages && !pPopup->GetItemImage( ITEMID_ADDONLIST ))
                         {
                             Reference< XFrame > xTemp( rFrame );
-                            Image aImage = GetImageFromURL( xTemp, aItemCommand, FALSE, m_bWasHiContrast );
+                            Image aImage = GetImageFromURL( xTemp, aItemCommand, FALSE );
                             if ( !!aImage )
                                    pPopup->SetItemImage( ITEMID_ADDONLIST, aImage );
                         }
@@ -1461,14 +1454,14 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
                     if ( pMenuAttributes && pMenuAttributes->aImageId.getLength() > 0 )
                     {
                         // Retrieve image id from menu attributes
-                        aImage = GetImageFromURL( m_xFrame, aImageId, FALSE, m_bWasHiContrast );
+                        aImage = GetImageFromURL( m_xFrame, aImageId, FALSE );
                     }
 
                     if ( !aImage )
                     {
-                        aImage = GetImageFromURL( m_xFrame, aItemCommand, FALSE, m_bWasHiContrast );
+                        aImage = GetImageFromURL( m_xFrame, aItemCommand, FALSE );
                         if ( !aImage )
-                            aImage = AddonsOptions().GetImageFromURL( aItemCommand, FALSE, m_bWasHiContrast );
+                            aImage = AddonsOptions().GetImageFromURL( aItemCommand, FALSE );
                     }
 
                     if ( !!aImage )
@@ -2066,9 +2059,6 @@ void MenuBarManager::Init(const Reference< XFrame >& rFrame,AddonMenu* pAddonMen
         getServiceFactory()->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.PopupMenuControllerFactory" ))),
         UNO_QUERY );
 
-    const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-    m_bWasHiContrast    = rSettings.GetHighContrastMode();
-
     Reference< XStatusListener > xStatusListener;
     Reference< XDispatch > xDispatch;
     USHORT nItemCount = pAddonMenu->GetItemCount();
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index a89daf163cf2..3c6404ae081b 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -94,7 +94,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   NewMenuController
 
 DEFINE_INIT_SERVICE                     (   NewMenuController, {} )
 
-void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImages, sal_Bool bHiContrast )
+void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImages )
 {
     USHORT nItemCount = pPopupMenu->GetItemCount();
     Image               aImage;
@@ -116,7 +116,7 @@ void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImage
 
                 if ( aImageId.getLength() > 0 )
                 {
-                    aImage = GetImageFromURL( xFrame, aImageId, FALSE, bHiContrast );
+                    aImage = GetImageFromURL( xFrame, aImageId, FALSE );
                     if ( !!aImage )
                     {
                         bImageSet = sal_True;
@@ -128,7 +128,7 @@ void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImage
                 {
                     String aCmd( pPopupMenu->GetItemCommand( nItemId ) );
                     if ( aCmd.Len() )
-                        aImage = GetImageFromURL( xFrame, aCmd, FALSE, bHiContrast );
+                        aImage = GetImageFromURL( xFrame, aCmd, FALSE );
 
                     if ( !!aImage )
                         pPopupMenu->SetItemImage( nItemId, aImage );
@@ -328,7 +328,6 @@ void NewMenuController::retrieveShortcutsFromConfiguration(
 NewMenuController::NewMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
     svt::PopupMenuControllerBase( xServiceManager ),
     m_bShowImages( sal_True ),
-    m_bHiContrast( sal_False ),
     m_bNewMenu( sal_False ),
     m_bModuleIdentified( sal_False ),
     m_bAcceleratorCfg( sal_False ),
@@ -388,7 +387,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup
         }
 
         if ( m_bShowImages )
-            setMenuImages( pVCLPopupMenu, m_bShowImages, m_bHiContrast );
+            setMenuImages( pVCLPopupMenu, m_bShowImages );
 
         delete pSubMenu;
     }
@@ -447,7 +446,7 @@ void SAL_CALL NewMenuController::select( const css::awt::MenuEvent& rEvent ) thr
             xURLTransformer->parseStrict( aTargetURL );
 
             aArgsList[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" ));
-            aArgsList[0].Value = makeAny( ::rtl::OUString::createFromAscii( SFX_REFERER_USER ));
+            aArgsList[0].Value = makeAny( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SFX_REFERER_USER )));
 
             rtl::OUString aTargetFrame( m_aTargetFrame );
             AddInfoForId::const_iterator pItem = m_aAddInfoForItem.find( rEvent.MenuId );
@@ -468,7 +467,7 @@ void SAL_CALL NewMenuController::select( const css::awt::MenuEvent& rEvent ) thr
         pNewDocument->aTargetURL = aTargetURL;
         pNewDocument->aArgSeq    = aArgsList;
         if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-            UiEventLogHelper(::rtl::OUString::createFromAscii("NewMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgsList);
+            UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NewMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgsList);
         Application::PostUserEvent( STATIC_LINK(0, NewMenuController, ExecuteHdl_Impl), pNewDocument );
     }
 }
@@ -483,17 +482,13 @@ void SAL_CALL NewMenuController::activate( const css::awt::MenuEvent& ) throw (R
         {
             const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
             sal_Bool bShowImages( rSettings.GetUseImagesInMenus() );
-            sal_Bool bHiContrast( rSettings.GetHighContrastMode() );
 
             PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
 
-            if (( m_bShowImages != bShowImages ) ||
-                ( m_bHiContrast != bHiContrast ))
+            if ( m_bShowImages != bShowImages )
             {
                 m_bShowImages = bShowImages;
-                m_bHiContrast = bHiContrast;
-
-                setMenuImages( pVCLPopupMenu, m_bShowImages, m_bHiContrast );
+                setMenuImages( pVCLPopupMenu, m_bShowImages );
             }
 
             setAccelerators( pVCLPopupMenu );
@@ -560,8 +555,6 @@ void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments )
             const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
 
             m_bShowImages   = rSettings.GetUseImagesInMenus();
-            m_bHiContrast   = rSettings.GetHighContrastMode();
-
             m_bNewMenu      = m_aCommandURL.equalsAscii( ".uno:AddDirect" );
         }
     }
diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx
index ebe99722af25..dd009de823a8 100644
--- a/framework/source/uielement/objectmenucontroller.cxx
+++ b/framework/source/uielement/objectmenucontroller.cxx
@@ -154,7 +154,7 @@ void ObjectMenuController::impl_select(const Reference< XDispatch >& _xDispatch,
 {
     Sequence<PropertyValue>      aArgs;
     if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-        UiEventLogHelper(::rtl::OUString::createFromAscii("ObjectMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
+        UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ObjectMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
     OSL_ENSURE(_xDispatch.is(),"ObjectMenuController::impl_select: No dispatch");
     if ( _xDispatch.is() )
         _xDispatch->dispatch( aTargetURL, aArgs );
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 78186f94aac8..54fed3dfb0a8 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -300,7 +300,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex )
 
         aArgsList.realloc( NUM_OF_PICKLIST_ARGS );
         aArgsList[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" ));
-        aArgsList[0].Value = makeAny( ::rtl::OUString::createFromAscii( SFX_REFERER_USER ));
+        aArgsList[0].Value = makeAny( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SFX_REFERER_USER )));
 
         // documents in the picklist will never be opened as templates
         aArgsList[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AsTemplate" ));
@@ -325,7 +325,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex )
         aArgsList[NUM_OF_PICKLIST_ARGS-1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
         aArgsList[NUM_OF_PICKLIST_ARGS-1].Value <<= aFilter;
 
-        xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString::createFromAscii("_default"), 0 );
+        xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default")), 0 );
     }
 
     if ( xDispatch.is() )
@@ -338,7 +338,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex )
         pLoadRecentFile->aTargetURL = aTargetURL;
         pLoadRecentFile->aArgSeq    = aArgsList;
         if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-            UiEventLogHelper(::rtl::OUString::createFromAscii("RecentFilesMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgsList);
+            UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RecentFilesMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgsList);
         Application::PostUserEvent( STATIC_LINK(0, RecentFilesMenuController, ExecuteHdl_Impl), pLoadRecentFile );
     }
 }
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 03fe343a8102..a939b2c472f4 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -79,7 +79,7 @@ using namespace ::com::sun::star;
 #endif
 
 const sal_Int32  HELPID_PREFIX_LENGTH    = 7;
-static const char*      HELPID_PREFIX           = "helpid:";
+static const char HELPID_PREFIX[] = "helpid:";
 
 // Property names of a menu/menu item ItemDescriptor
 static const char ITEM_DESCRIPTOR_COMMANDURL[]  = "CommandURL";
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 0821a55c75eb..edfbee532561 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -176,13 +176,11 @@ throw ( RuntimeException )
 
 //*****************************************************************************************************************
 
-static sal_Int16 getImageTypeFromBools( sal_Bool bBig, sal_Bool bHighContrast )
+static sal_Int16 getImageTypeFromBools( sal_Bool bBig )
 {
     sal_Int16 n( 0 );
     if ( bBig )
         n |= ::com::sun::star::ui::ImageType::SIZE_LARGE;
-    if ( bHighContrast )
-        n |= ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST;
     return n;
 }
 
@@ -239,7 +237,6 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic
     ThreadHelpBase( &Application::GetSolarMutex() ),
     OWeakObject(),
     m_bDisposed( sal_False ),
-    m_bIsHiContrast( pToolBar->GetSettings().GetStyleSettings().GetHighContrastMode() ),
     m_bSmallSymbols( !SvtMiscOptions().AreCurrentSymbolsLarge() ),
     m_bModuleIdentified( sal_False ),
     m_bAddedToTaskPaneList( sal_True ),
@@ -288,7 +285,7 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic
     // enables a menu for clipped items and customization
     SvtCommandOptions aCmdOptions;
     USHORT nMenuType = TOOLBOX_MENUTYPE_CLIPPEDITEMS;
-    if ( !aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, ::rtl::OUString::createFromAscii( "CreateDialog" )))
+    if ( !aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialog"))))
          nMenuType |= TOOLBOX_MENUTYPE_CUSTOMIZE;
     //added for issue33668 by shizhoubo
     m_pToolBar->SetCommandHdl( LINK( this, ToolBarManager, Command ) );
@@ -369,21 +366,6 @@ void ToolBarManager::CheckAndUpdateImages()
     ResetableGuard aGuard( m_aLock );
     sal_Bool bRefreshImages = sal_False;
 
-    // Check if high contrast/normal mode have changed
-    if ( m_pToolBar->GetSettings().GetStyleSettings().GetHighContrastMode() )
-    {
-        if ( !m_bIsHiContrast )
-        {
-            bRefreshImages = TRUE;
-            m_bIsHiContrast = sal_True;
-        }
-    }
-    else if ( m_bIsHiContrast )
-    {
-        bRefreshImages = sal_True;
-        m_bIsHiContrast = sal_False;
-    }
-
     SvtMiscOptions aMiscOptions;
     bool bCurrentSymbolsSmall = !aMiscOptions.AreCurrentSymbolsLarge();
     if ( m_bSmallSymbols != bCurrentSymbolsSmall )
@@ -416,11 +398,11 @@ void ToolBarManager::RefreshImages()
         if ( nId > 0 )
         {
             ::rtl::OUString aCommandURL = m_pToolBar->GetItemCommand( nId );
-            Image aImage = GetImageFromURL( m_xFrame, aCommandURL, bBigImages, m_bIsHiContrast );
+            Image aImage = GetImageFromURL( m_xFrame, aCommandURL, bBigImages );
             // Try also to query for add-on images before giving up and use an
             // empty image.
             if ( !aImage )
-                aImage = QueryAddonsImage( aCommandURL, bBigImages, m_bIsHiContrast );
+                aImage = QueryAddonsImage( aCommandURL, bBigImages );
             m_pToolBar->SetItemImage( nId, aImage );
         }
     }
@@ -764,8 +746,8 @@ void ToolBarManager::impl_elementChanged(bool _bRemove,const ::com::sun::star::u
     Reference< XNameAccess > xNameAccess;
     sal_Int16                nImageType = sal_Int16();
     sal_Int16                nCurrentImageType = getImageTypeFromBools(
-                                                    SvtMiscOptions().AreCurrentSymbolsLarge(),
-                                                    m_bIsHiContrast );
+                                                    SvtMiscOptions().AreCurrentSymbolsLarge()
+                                                    );
 
     if (( Event.aInfo >>= nImageType ) &&
         ( nImageType == nCurrentImageType ) &&
@@ -1559,8 +1541,7 @@ void ToolBarManager::RequestImages()
     }
 
     sal_Bool  bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() );
-    m_bIsHiContrast = m_pToolBar->GetSettings().GetStyleSettings().GetHighContrastMode();
-    sal_Int16 p = getImageTypeFromBools( SvtMiscOptions().AreCurrentSymbolsLarge(), m_bIsHiContrast );
+    sal_Int16 p = getImageTypeFromBools( SvtMiscOptions().AreCurrentSymbolsLarge() );
 
     if ( m_xDocImageManager.is() )
         aDocGraphicSeq = m_xDocImageManager->getImages( p, aCmdURLSeq );
@@ -1581,7 +1562,7 @@ void ToolBarManager::RequestImages()
             // Try also to query for add-on images before giving up and use an
             // empty image.
             if ( !aImage )
-                aImage = QueryAddonsImage( aCmdURLSeq[i], bBigImages, m_bIsHiContrast );
+                aImage = QueryAddonsImage( aCmdURLSeq[i], bBigImages );
 
             pIter->second.nImageInfo = 1; // mark image as module based
         }
@@ -1836,10 +1817,8 @@ PopupMenu * ToolBarManager::GetToolBarCustomMeun(ToolBox* pToolBar)
                 pItemMenu->CheckItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->IsItemVisible( nId ) );
                 pItemMenu->SetItemCommand( STARTID_CUSTOMIZE_POPUPMENU+nPos, aCommandURL );
                 pItemMenu->SetItemImage( STARTID_CUSTOMIZE_POPUPMENU+nPos,
-                                         GetImageFromURL( m_xFrame,
-                                                          aCommandURL,
-                                                          sal_False,
-                                                          m_bIsHiContrast ));
+                                         GetImageFromURL( m_xFrame, aCommandURL, sal_False )
+                                       );
             }
             else
             {
@@ -2135,7 +2114,6 @@ IMPL_LINK( ToolBarManager, StateChanged, StateChangedType*, pStateChangedType )
 
     if ( *pStateChangedType == STATE_CHANGE_CONTROLBACKGROUND )
     {
-        // Check if we need to get new images for normal/high contrast mode
         CheckAndUpdateImages();
     }
     else if ( *pStateChangedType == STATE_CHANGE_VISIBLE )
@@ -2156,7 +2134,6 @@ IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent  )
         (  pDataChangedEvent->GetType() == DATACHANGED_DISPLAY  ))  &&
         ( pDataChangedEvent->GetFlags() & SETTINGS_STYLE        ))
     {
-        // Check if we need to get new images for normal/high contrast mode
         CheckAndUpdateImages();
     }
 
@@ -2241,9 +2218,9 @@ IMPL_STATIC_LINK_NOINSTANCE( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo*, pExe
     return 0;
 }
 
-Image ToolBarManager::QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages, bool bHiContrast )
+Image ToolBarManager::QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages )
 {
-    Image aImage = framework::AddonsOptions().GetImageFromURL( aCommandURL, bBigImages, bHiContrast );
+    Image aImage = framework::AddonsOptions().GetImageFromURL( aCommandURL, bBigImages );
     return aImage;
 }
 
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 52deaff461e8..f4288dc529f6 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -203,7 +203,7 @@ void ToolbarsMenuController::addCommand(
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
 
     if ( rSettings.GetUseImagesInMenus() )
-        aImage = GetImageFromURL( m_xFrame, rCommandURL, FALSE, rSettings.GetHighContrastMode() );
+        aImage = GetImageFromURL( m_xFrame, rCommandURL, FALSE );
 
     VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( rPopupMenu );
     if ( pPopupMenu )
@@ -747,7 +747,7 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent
                     pExecuteInfo->aTargetURL    = aTargetURL;
                     pExecuteInfo->aArgs         = aArgs;
                     if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
-                        UiEventLogHelper(::rtl::OUString::createFromAscii("ToolbarsMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
+                        UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ToolbarsMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs);
                     Application::PostUserEvent( STATIC_LINK(0, ToolbarsMenuController, ExecuteHdl_Impl), pExecuteInfo );
                 }
             }
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index fb6b1337f104..36aa8d15ecda 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -643,7 +643,7 @@ UICommandDescription::UICommandDescription( const Reference< XMultiServiceFactor
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UICommandDescription::UICommandDescription" );
     Reference< XNameAccess > xEmpty;
-    rtl::OUString aGenericUICommand( ::rtl::OUString::createFromAscii( "GenericCommands" ));
+    rtl::OUString aGenericUICommand( RTL_CONSTASCII_USTRINGPARAM("GenericCommands") );
     m_xGenericUICommands = new ConfigurationAccess_UICommand( aGenericUICommand, xEmpty, xServiceManager );
 
     impl_fillElements("ooSetupFactoryCommandConfigRef");
diff --git a/framework/source/xml/acceleratorconfigurationwriter.cxx b/framework/source/xml/acceleratorconfigurationwriter.cxx
index 7f7c8522c134..be48788fa3db 100644
--- a/framework/source/xml/acceleratorconfigurationwriter.cxx
+++ b/framework/source/xml/acceleratorconfigurationwriter.cxx
@@ -136,16 +136,16 @@ void AcceleratorConfigurationWriter::impl_ts_writeKeyCommandPair(const css::awt:
     pAttribs->AddAttribute(AL_ATTRIBUTE_URL    , ATTRIBUTE_TYPE_CDATA, sCommand);
 
     if ((aKey.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT)
-        pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_SHIFT, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString::createFromAscii("true"));
+        pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_SHIFT, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")));
 
     if ((aKey.Modifiers & css::awt::KeyModifier::MOD1) == css::awt::KeyModifier::MOD1)
-        pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD1, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString::createFromAscii("true"));
+        pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD1, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")));
 
     if ((aKey.Modifiers & css::awt::KeyModifier::MOD2) == css::awt::KeyModifier::MOD2)
-        pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD2, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString::createFromAscii("true"));
+        pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD2, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")));
 
     if ((aKey.Modifiers & css::awt::KeyModifier::MOD3) == css::awt::KeyModifier::MOD3)
-        pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD3, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString::createFromAscii("true"));
+        pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD3, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")));
 
     xConfig->ignorableWhitespace(::rtl::OUString());
     xConfig->startElement(AL_ELEMENT_ITEM, xAttribs);
diff --git a/framework/source/xml/toolboxdocumenthandler.cxx b/framework/source/xml/toolboxdocumenthandler.cxx
index a30c5a38b2ce..c7097253545f 100644
--- a/framework/source/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/xml/toolboxdocumenthandler.cxx
@@ -188,15 +188,15 @@ OReadToolBoxDocumentHandler::OReadToolBoxDocumentHandler( const Reference< XInde
     }
 
     // pre-calculate a hash code for all style strings to speed up xml read process
-    m_nHashCode_Style_Radio         = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_RADIO ).hashCode();
-    m_nHashCode_Style_Auto          = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_AUTO ).hashCode();
-    m_nHashCode_Style_Left          = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_LEFT ).hashCode();
-    m_nHashCode_Style_AutoSize      = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_AUTOSIZE ).hashCode();
-    m_nHashCode_Style_DropDown      = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_DROPDOWN ).hashCode();
-    m_nHashCode_Style_Repeat        = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_REPEAT ).hashCode();
-    m_nHashCode_Style_DropDownOnly  = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY ).hashCode();
-    m_nHashCode_Style_Text  = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_TEXT ).hashCode();
-    m_nHashCode_Style_Image  = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_IMAGE ).hashCode();
+    m_nHashCode_Style_Radio         = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_RADIO )).hashCode();
+    m_nHashCode_Style_Auto          = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_AUTO )).hashCode();
+    m_nHashCode_Style_Left          = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_LEFT )).hashCode();
+    m_nHashCode_Style_AutoSize      = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_AUTOSIZE )).hashCode();
+    m_nHashCode_Style_DropDown      = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_DROPDOWN )).hashCode();
+    m_nHashCode_Style_Repeat        = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_REPEAT )).hashCode();
+    m_nHashCode_Style_DropDownOnly  = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY )).hashCode();
+    m_nHashCode_Style_Text  = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_TEXT )).hashCode();
+    m_nHashCode_Style_Image  = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE )).hashCode();
 
     m_bToolBarStartFound            = sal_False;
     m_bToolBarEndFound              = sal_False;
diff --git a/framework/source/xml/xmlnamespaces.cxx b/framework/source/xml/xmlnamespaces.cxx
index fb36edaf2793..2352192138b2 100644
--- a/framework/source/xml/xmlnamespaces.cxx
+++ b/framework/source/xml/xmlnamespaces.cxx
@@ -116,7 +116,7 @@ void XMLNamespaces::addNamespace( const ::rtl::OUString& aName, const ::rtl::OUS
         if ( aName.getLength() > index+1 )
         {
             ::rtl::OUString aAttributeName = getNamespaceValue( aName.copy( 0, index ) );
-            aAttributeName += ::rtl::OUString::createFromAscii( "^" );
+            aAttributeName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("^"));
             aAttributeName += aName.copy( index+1 );
             return aAttributeName;
         }
@@ -147,7 +147,7 @@ void XMLNamespaces::addNamespace( const ::rtl::OUString& aName, const ::rtl::OUS
     if ( aNamespace.getLength() > 0 )
     {
         aElementName = aNamespace;
-        aElementName += ::rtl::OUString::createFromAscii( "^" );
+        aElementName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("^"));
     }
     else
         return aName;
diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml
index fac0b3c0815c..5ac4c3eb4b7c 100644
--- a/framework/uiconfig/startmodule/menubar/menubar.xml
+++ b/framework/uiconfig/startmodule/menubar/menubar.xml
@@ -76,7 +76,7 @@
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:ShowLicense"/>
             <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:Credits"/>
+            <menu:menuitem menu:id=".uno:ShowCredits"/>
             <menu:menuitem menu:id=".uno:About"/>
         </menu:menupopup>
     </menu:menu>
diff --git a/graphite/graphite-removeobsolete.patch b/graphite/graphite-removeobsolete.patch
new file mode 100644
index 000000000000..3dcfb36a10c3
--- /dev/null
+++ b/graphite/graphite-removeobsolete.patch
@@ -0,0 +1,34 @@
+--- misc/silgraphite-2.3.1.orig/engine/include/graphite/Segment.h
++++ misc/build/silgraphite-2.3.1/engine/include/graphite/Segment.h
+@@ -142,7 +142,6 @@
+ 		LineBrk lbStart, LineBrk lbEnd, SegEnd est,
+ 		bool fStartLine, bool fEndLine, bool fWsRtl);
+ 	void DestroyContents();
+-	void SwapWith(Segment * pgrseg);
+ 	void ClearAltEndLineSeg();
+ 
+ 	ITextSource * GetString(); // client is responsible to Release()
+--- misc/silgraphite-2.3.1.orig/engine/src/segment/Segment.cpp
++++ misc/build/silgraphite-2.3.1/engine/src/segment/Segment.cpp
+@@ -569,21 +569,6 @@
+ }
+ 
+ /*----------------------------------------------------------------------------------------------
+-	Swap the guts of the two segments.
+-	OBSOLETE
+-----------------------------------------------------------------------------------------------*/
+-void Segment::SwapWith(Segment * pgrseg)
+-{
+-	int crefThis = m_cref;
+-	int crefOther = pgrseg->m_cref;
+-
+-	std::swap(*this, *pgrseg);
+-
+-	m_cref = crefThis;
+-	pgrseg->m_cref = crefOther;
+-}
+-
+-/*----------------------------------------------------------------------------------------------
+ 	Delete the pointer to the alternate-end-of-line segment.
+ ----------------------------------------------------------------------------------------------*/
+ void Segment::ClearAltEndLineSeg()
diff --git a/graphite/makefile.mk b/graphite/makefile.mk
index b9ecb7aea396..1134a29a4403 100644
--- a/graphite/makefile.mk
+++ b/graphite/makefile.mk
@@ -47,7 +47,9 @@ all:
 .IF "$(ENABLE_GRAPHITE)"=="TRUE"
 TARFILE_NAME=silgraphite-2.3.1
 TARFILE_MD5=d35724900f6a4105550293686688bbb3
-PATCH_FILES=graphite-2.3.1.patch
+PATCH_FILES=\
+    graphite-2.3.1.patch \
+    graphite-removeobsolete.patch
 
 # convert line-endings to avoid problems when patching
 CONVERTFILES=\
diff --git a/hwpfilter/source/attributes.cxx b/hwpfilter/source/attributes.cxx
index 6acc757b4853..e6774454cc0f 100644
--- a/hwpfilter/source/attributes.cxx
+++ b/hwpfilter/source/attributes.cxx
@@ -30,9 +30,7 @@
 #include "precompiled_hwpfilter.hxx"
 
 #include <assert.h>
-#ifndef __SGI_STL_VECTOR
 #include <vector>
-#endif
 #include "attributes.hxx"
 
 //using namespace ::std;
diff --git a/hwpfilter/source/hstream.cpp b/hwpfilter/source/hstream.cpp
index c7ece7d679d9..c6b8c24a2152 100644
--- a/hwpfilter/source/hstream.cpp
+++ b/hwpfilter/source/hstream.cpp
@@ -70,7 +70,7 @@ int HStream::skipBytes(int aToSkip)
 }
 
 
-int HStream::available()
+int HStream::available() const
 {
     return size - pos;
 }
diff --git a/hwpfilter/source/hstream.h b/hwpfilter/source/hstream.h
index f8aeadecc5d6..47bbb7f4ac66 100644
--- a/hwpfilter/source/hstream.h
+++ b/hwpfilter/source/hstream.h
@@ -54,7 +54,7 @@ class HStream
 /**
  * @returns Size of remained stream
  */
-        int available();
+        int available() const;
 /**
  * remove the stream from this object.
  */
diff --git a/hwpfilter/source/htags.cpp b/hwpfilter/source/htags.cpp
index ad3d307d3c5b..6f1ade734457 100644
--- a/hwpfilter/source/htags.cpp
+++ b/hwpfilter/source/htags.cpp
@@ -138,28 +138,33 @@ bool OlePicture::Read(HWPFile & hwpf)
     if (signature != FILESTG_SIGNATURE_NORMAL)
         return false;
 #ifdef WIN32
-     char *data;
-     data = new char[size];
-     if( data == 0 || hwpf.ReadBlock(data,size) == 0 )
-          return false;
-     FILE *fp;
-     char tname[200];
-     wchar_t wtname[200];
-     tmpnam(tname);
-     if (0 == (fp = fopen(tname, "wb")))
-          return false;
-     fwrite(data, size, 1, fp);
-     fclose(fp);
-     MultiByteToWideChar(CP_ACP, 0, tname, -1, wtname, 200);
-     if( StgOpenStorage(wtname, NULL,
-                     STGM_READWRITE|STGM_SHARE_EXCLUSIVE|STGM_TRANSACTED,
-                     NULL, 0, &pis) != S_OK ) {
-          pis = 0;
-          unlink(tname);
+    char *data = new char[size];
+    if( data == 0 || hwpf.ReadBlock(data,size) == 0 )
+    {
+          delete [] data;
           return false;
-     }
-     unlink(tname);
-     delete [] data;
+    }
+    FILE *fp;
+    char tname[200];
+    wchar_t wtname[200];
+    tmpnam(tname);
+    if (0 == (fp = fopen(tname, "wb")))
+    {
+         delete [] data;
+         return false;
+    }
+    fwrite(data, size, 1, fp);
+    delete [] data;
+    fclose(fp);
+    MultiByteToWideChar(CP_ACP, 0, tname, -1, wtname, 200);
+    if( StgOpenStorage(wtname, NULL,
+                    STGM_READWRITE|STGM_SHARE_EXCLUSIVE|STGM_TRANSACTED,
+                    NULL, 0, &pis) != S_OK ) {
+         pis = 0;
+         unlink(tname);
+         return false;
+    }
+    unlink(tname);
 #else
     if (pis == 0 || hwpf.ReadBlock(pis, size) == 0)
         return false;
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index ba4c0f0b5821..71fd82d5e5f8 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -128,12 +128,12 @@ throw(SAXException, IOException, RuntimeException)
     Reference< XInputStream> rInputStream;
     for ( sal_Int32 i = 0; i < aDescriptor.getLength(); i++ )
     {
-        if ( aDescriptor[i].Name == OUString::createFromAscii( "InputStream" ) )
+        if ( aDescriptor[i].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream")) )
         {
             aDescriptor[i].Value >>= rInputStream;
             break;
         }
-        else if ( aDescriptor[i].Name == OUString::createFromAscii( "URL" ) )
+        else if ( aDescriptor[i].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) )
         {
             OUString sURL;
             aDescriptor[i].Value >>= sURL;
@@ -3208,25 +3208,25 @@ void HwpReader::makeFieldCode(FieldCode *hbox)
 /* ???????? */
     else if( hbox->type[0] == 3 && hbox->type[1] == 0 )
     {
-        if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("title")))
+        if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("title"))))
         {
             rstartEl( ascii("text:title"), rList );
             rchars(  hconv(hbox->str2, gstr) );
             rendEl( ascii("text:title") );
         }
-        else if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("subject")))
+        else if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("subject"))))
         {
             rstartEl( ascii("text:subject"), rList );
             rchars(  hconv(hbox->str2, gstr) );
             rendEl( ascii("text:subject") );
         }
-        else if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("author")))
+        else if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("author"))))
         {
             rstartEl( ascii("text:author-name"), rList );
             rchars(  hconv(hbox->str2, gstr) );
             rendEl( ascii("text:author-name") );
         }
-        else if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("keywords")))
+        else if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("keywords"))))
         {
             rstartEl( ascii("text:keywords"), rList );
             rchars(  hconv(hbox->str2, gstr) );
@@ -3236,61 +3236,61 @@ void HwpReader::makeFieldCode(FieldCode *hbox)
 /* ???????? */
     else if( hbox->type[0] == 3 && hbox->type[1] == 1 )
     {
-        if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("User")))
+        if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("User"))))
         {
             rstartEl( ascii("text:sender-lastname"), rList );
             rchars(  hconv(hbox->str2, gstr) );
             rendEl( ascii("text:sender-lastname") );
         }
-        else if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("Company")))
+        else if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Company"))))
         {
             rstartEl( ascii("text:sender-company"), rList );
             rchars(  hconv(hbox->str2, gstr) );
             rendEl( ascii("text:sender-company") );
         }
-        else if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("Position")))
+        else if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Position"))))
         {
             rstartEl( ascii("text:sender-title"), rList );
             rchars(  hconv(hbox->str2, gstr) );
             rendEl( ascii("text:sender-title") );
         }
-        else if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("Division")))
+        else if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Division"))))
         {
             rstartEl( ascii("text:sender-position"), rList );
             rchars(  hconv(hbox->str2, gstr) );
             rendEl( ascii("text:sender-position") );
         }
-        else if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("Fax")))
+        else if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Fax"))))
         {
             rstartEl( ascii("text:sender-fax"), rList );
             rchars(  hconv(hbox->str2, gstr) );
             rendEl( ascii("text:sender-fax") );
         }
-        else if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("Pager")))
+        else if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Pager"))))
         {
             rstartEl( ascii("text:phone-private"), rList );
             rchars(  hconv(hbox->str2, gstr) );
             rendEl( ascii("text:phone-private") );
         }
-        else if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("E-mail")))
+        else if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("E-mail"))))
         {
             rstartEl( ascii("text:sender-email"), rList );
             rchars(  hconv(hbox->str2, gstr) );
             rendEl( ascii("text:sender-email") );
         }
-        else if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("Zipcode(office)")))
+        else if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Zipcode(office)"))))
         {
             rstartEl( ascii("text:sender-postal-code"), rList );
             rchars(  hconv(hbox->str2, gstr) );
             rendEl( ascii("text:sender-postal-code") );
         }
-        else if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("Phone(office)")))
+        else if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Phone(office)"))))
         {
             rstartEl( ascii("text:sender-phone-work"), rList );
             rchars(  hconv(hbox->str2, gstr) );
             rendEl( ascii("text:sender-phone-work") );
         }
-        else if( hconv( hbox->str3, gstr ).equals(OUString::createFromAscii("Address(office)")))
+        else if( hconv( hbox->str3, gstr ).equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Address(office)"))))
         {
             rstartEl( ascii("text:sender-street"), rList );
             rchars(  hconv(hbox->str2, gstr) );
diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx
index 0c9c574e554d..c296ed792cfa 100644
--- a/hwpfilter/source/hwpreader.hxx
+++ b/hwpfilter/source/hwpreader.hxx
@@ -259,11 +259,11 @@ HwpImportFilter::HwpImportFilter( const Reference< XMultiServiceFactory > xFact
         p->setDocumentHandler( xHandler );
 
           Sequence< Any > aArgs( 2 );
-          aArgs[0] <<= OUString::createFromAscii( "Local" );
-          aArgs[1] <<= OUString::createFromAscii( "Office" );
+          aArgs[0] <<= OUString(RTL_CONSTASCII_USTRINGPARAM("Local"));
+          aArgs[1] <<= OUString(RTL_CONSTASCII_USTRINGPARAM("Office"));
           Reference< XInterface > xUCB
               ( xFact->createInstanceWithArguments
-                 (OUString::createFromAscii("com.sun.star.ucb.UniversalContentBroker"),
+                 (OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.UniversalContentBroker")),
                   aArgs));
           p->setUCB( xUCB );
 
diff --git a/i18npool/inc/transliterationImpl.hxx b/i18npool/inc/transliterationImpl.hxx
index 8497c1f8dcd4..94fba9679009 100644
--- a/i18npool/inc/transliterationImpl.hxx
+++ b/i18npool/inc/transliterationImpl.hxx
@@ -38,7 +38,7 @@
 namespace com { namespace sun { namespace star { namespace i18n {
 
 #if OSL_DEBUG_LEVEL > 1
-#define RETURN_DEBUG_STRING (rtl::OUString::createFromAscii("return from transliterationImpl"));
+#define RETURN_DEBUG_STRING (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("return from transliterationImpl")));
 #define RETURN_DEBUG_NUMBER 'TRAN'
 #else
 #define RETURN_DEBUG_STRING
diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx
index e36cd4df1773..aabd980f9161 100644
--- a/i18npool/source/breakiterator/breakiteratorImpl.cxx
+++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx
@@ -459,6 +459,7 @@ static UBlock2Script scriptList[] = {
     {UBLOCK_CHEROKEE, UBLOCK_RUNIC, ScriptType::LATIN},
     {UBLOCK_KHMER, UBLOCK_MONGOLIAN, ScriptType::COMPLEX},
     {UBLOCK_LATIN_EXTENDED_ADDITIONAL, UBLOCK_GREEK_EXTENDED, ScriptType::LATIN},
+    {UBLOCK_GENERAL_PUNCTUATION, UBLOCK_GENERAL_PUNCTUATION, ScriptType::LATIN},
     {UBLOCK_CJK_RADICALS_SUPPLEMENT, UBLOCK_HANGUL_SYLLABLES, ScriptType::ASIAN},
     {UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS, UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS, ScriptType::ASIAN},
     {UBLOCK_ARABIC_PRESENTATION_FORMS_A, UBLOCK_ARABIC_PRESENTATION_FORMS_A, ScriptType::COMPLEX},
@@ -517,7 +518,7 @@ sal_Bool SAL_CALL BreakIteratorImpl::createLocaleSpecificBreakIterator(const OUS
         }
 
         Reference < uno::XInterface > xI = xMSF->createInstance(
-            OUString::createFromAscii("com.sun.star.i18n.BreakIterator_") + aLocaleName);
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator_")) + aLocaleName);
 
         if ( xI.is() ) {
             xI->queryInterface( getCppuType((const Reference< XBreakIterator>*)0) ) >>= xBI;
@@ -568,7 +569,7 @@ BreakIteratorImpl::getLocaleSpecificBreakIterator(const Locale& rLocale) throw (
                     // load service with name <base>_<lang>
                     createLocaleSpecificBreakIterator(rLocale.Language)) ||
                     // load default service with name <base>_Unicode
-                    createLocaleSpecificBreakIterator(OUString::createFromAscii("Unicode"))) {
+                    createLocaleSpecificBreakIterator(OUString(RTL_CONSTASCII_USTRINGPARAM("Unicode")))) {
                 lookupTable.push_back( new lookupTableItem(aLocale, xBI) );
                 return xBI;
             }
diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx
index 7a0f563a0a96..b968c499ee1e 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -79,15 +79,15 @@ xdictionary::xdictionary(const sal_Char *lang) :
         hModule = osl_loadModuleRelative( &thisModule, aBuf.makeStringAndClear().pData, SAL_LOADMODULE_DEFAULT );
         if( hModule ) {
             sal_IntPtr (*func)();
-            func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString::createFromAscii("getExistMark").pData );
+            func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString(RTL_CONSTASCII_USTRINGPARAM("getExistMark")).pData );
             existMark = (sal_uInt8*) (*func)();
-            func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString::createFromAscii("getIndex1").pData );
+            func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString(RTL_CONSTASCII_USTRINGPARAM("getIndex1")).pData );
             index1 = (sal_Int16*) (*func)();
-            func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString::createFromAscii("getIndex2").pData );
+            func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString(RTL_CONSTASCII_USTRINGPARAM("getIndex2")).pData );
             index2 = (sal_Int32*) (*func)();
-            func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString::createFromAscii("getLenArray").pData );
+            func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString(RTL_CONSTASCII_USTRINGPARAM("getLenArray")).pData );
             lenArray = (sal_Int32*) (*func)();
-            func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString::createFromAscii("getDataArea").pData );
+            func = (sal_IntPtr(*)()) osl_getFunctionSymbol( hModule, OUString(RTL_CONSTASCII_USTRINGPARAM("getDataArea")).pData );
             dataArea = (sal_Unicode*) (*func)();
         }
         else
diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx
index be3802ee9062..296fad980c87 100644
--- a/i18npool/source/calendar/calendarImpl.cxx
+++ b/i18npool/source/calendar/calendarImpl.cxx
@@ -82,7 +82,7 @@ CalendarImpl::loadCalendar(const OUString& uniqueID, const Locale& rLocale ) thr
 
     if (i >= sal::static_int_cast<sal_Int32>(lookupTable.size())) {
         Reference < XInterface > xI = xMSF->createInstance(
-                OUString::createFromAscii("com.sun.star.i18n.Calendar_") + uniqueID);
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.Calendar_")) + uniqueID);
 
         if ( ! xI.is() ) {
             // check if the calendar is defined in localedata, load gregorian calendar service.
@@ -90,7 +90,7 @@ CalendarImpl::loadCalendar(const OUString& uniqueID, const Locale& rLocale ) thr
             for (i = 0; i < xC.getLength(); i++) {
                 if (uniqueID == xC[i].Name) {
                     xI = xMSF->createInstance(
-                        OUString::createFromAscii("com.sun.star.i18n.Calendar_gregorian"));
+                        OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.Calendar_gregorian")));
                     break;
                 }
             }
@@ -304,7 +304,7 @@ CalendarImpl::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativ
 OUString SAL_CALL
 CalendarImpl::getImplementationName(void) throw( RuntimeException )
 {
-    return OUString::createFromAscii("com.sun.star.i18n.CalendarImpl");
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.CalendarImpl"));
 }
 
 const sal_Char cCalendar[] = "com.sun.star.i18n.LocaleCalendar";
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
index 51180b01d058..c4ebade521ed 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -190,7 +190,7 @@ Calendar_hanja::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16
         if ( displayIndex == CalendarDisplayIndex::AM_PM ) {
             // Am/Pm string for Korean Hanja calendar will refer to Japanese locale
             com::sun::star::lang::Locale jaLocale =
-                com::sun::star::lang::Locale(OUString::createFromAscii("ja"), OUString(), OUString());
+                com::sun::star::lang::Locale(OUString(RTL_CONSTASCII_USTRINGPARAM("ja")), OUString(), OUString());
             if (idx == 0) return LocaleData().getLocaleItem(jaLocale).timeAM;
             else if (idx == 1) return LocaleData().getLocaleItem(jaLocale).timePM;
             else throw ERROR;
@@ -204,7 +204,7 @@ Calendar_hanja::loadCalendar( const OUString& /*uniqueID*/, const com::sun::star
 {
         // Since this class could be called by service name 'hanja_yoil', we have to
         // rename uniqueID to get right calendar defined in locale data.
-        Calendar_gregorian::loadCalendar(OUString::createFromAscii("hanja"), rLocale);
+        Calendar_gregorian::loadCalendar(OUString(RTL_CONSTASCII_USTRINGPARAM("hanja")), rLocale);
 }
 
 static Era gengou_eraArray[] = {
diff --git a/i18npool/source/calendar/calendar_jewish.cxx b/i18npool/source/calendar/calendar_jewish.cxx
index f7eb64061a1a..79f50ab9ff9c 100644
--- a/i18npool/source/calendar/calendar_jewish.cxx
+++ b/i18npool/source/calendar/calendar_jewish.cxx
@@ -192,9 +192,9 @@ public:
          + HebrewEpoch));         // Days elapsed before absolute date 1.
     }
 
-    sal_Int32 GetMonth() { return month; }
-    sal_Int32 GetDay() { return day; }
-    sal_Int32 GetYear() { return year; }
+    sal_Int32 GetMonth() const { return month; }
+    sal_Int32 GetDay() const { return day; }
+    sal_Int32 GetYear() const { return year; }
 
 };
 
@@ -251,9 +251,9 @@ public:
            + (year - 1)/400);   // ...plus prior years divisible by 400
     }
 
-    int GetMonth() { return month; }
-    int GetDay() { return day; }
-    int GetYear() { return year; }
+    int GetMonth() const { return month; }
+    int GetDay() const { return day; }
+    int GetYear() const { return year; }
 
 };
 
diff --git a/i18npool/source/characterclassification/characterclassificationImpl.cxx b/i18npool/source/characterclassification/characterclassificationImpl.cxx
index 0539bd7e46ab..36bedb4d8846 100644
--- a/i18npool/source/characterclassification/characterclassificationImpl.cxx
+++ b/i18npool/source/characterclassification/characterclassificationImpl.cxx
@@ -41,7 +41,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
 CharacterClassificationImpl::CharacterClassificationImpl(
         const Reference < lang::XMultiServiceFactory >& rxMSF ) : xMSF( rxMSF )
 {
-        if (createLocaleSpecificCharacterClassification(OUString::createFromAscii("Unicode"), Locale()))
+        if (createLocaleSpecificCharacterClassification(OUString(RTL_CONSTASCII_USTRINGPARAM("Unicode")), Locale()))
             xUCI = cachedItem->xCI;
 }
 
@@ -150,7 +150,7 @@ sal_Bool SAL_CALL CharacterClassificationImpl::createLocaleSpecificCharacterClas
         }
 
         Reference < XInterface > xI = xMSF->createInstance(
-            OUString::createFromAscii("com.sun.star.i18n.CharacterClassification_") + serviceName);
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.CharacterClassification_")) + serviceName);
 
         Reference < XCharacterClassification > xCI;
         if ( xI.is() ) {
@@ -178,7 +178,7 @@ CharacterClassificationImpl::getLocaleSpecificCharacterClassification(const Loca
             }
 
             static sal_Unicode under = (sal_Unicode)'_';
-            static OUString tw(OUString::createFromAscii("TW"));
+            static OUString tw(RTL_CONSTASCII_USTRINGPARAM("TW"));
             sal_Int32 l = rLocale.Language.getLength();
             sal_Int32 c = rLocale.Country.getLength();
             sal_Int32 v = rLocale.Variant.getLength();
@@ -203,7 +203,7 @@ CharacterClassificationImpl::getLocaleSpecificCharacterClassification(const Loca
                     createLocaleSpecificCharacterClassification(rLocale.Language, rLocale))) {
                 return cachedItem->xCI;
             } else if (xUCI.is()) {
-                lookupTable.push_back( cachedItem = new lookupTableItem(rLocale, OUString::createFromAscii("Unicode"), xUCI) );
+                lookupTable.push_back( cachedItem = new lookupTableItem(rLocale, OUString(RTL_CONSTASCII_USTRINGPARAM("Unicode")), xUCI) );
                 return cachedItem->xCI;
             }
         }
diff --git a/i18npool/source/collator/chaptercollator.cxx b/i18npool/source/collator/chaptercollator.cxx
index 6b337c6cd75e..7cc7739abbbe 100644
--- a/i18npool/source/collator/chaptercollator.cxx
+++ b/i18npool/source/collator/chaptercollator.cxx
@@ -45,7 +45,7 @@ ChapterCollator::ChapterCollator( const Reference < XMultiServiceFactory >& rxMS
 {
     if ( rxMSF.is()) {
         Reference < XInterface > xI =
-        rxMSF->createInstance( OUString::createFromAscii("com.sun.star.i18n.CharacterClassification"));
+        rxMSF->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.CharacterClassification")));
         if ( xI.is() )
             xI->queryInterface(::getCppuType((const Reference< XCharacterClassification>*)0)) >>= cclass;
     }
diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx
index 9903df6fd00e..7576cc70fc8b 100644
--- a/i18npool/source/collator/collatorImpl.cxx
+++ b/i18npool/source/collator/collatorImpl.cxx
@@ -44,7 +44,7 @@ CollatorImpl::CollatorImpl( const Reference < XMultiServiceFactory >& rxMSF ) :
 {
     if ( rxMSF.is()) {
         Reference < XInterface > xI =
-            xMSF->createInstance( OUString::createFromAscii("com.sun.star.i18n.LocaleData"));
+            xMSF->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.LocaleData")));
         if ( xI.is() )
             xI->queryInterface(::getCppuType((const Reference< XLocaleData>*)0)) >>= localedata;
     }
@@ -168,7 +168,7 @@ CollatorImpl::createCollator(const lang::Locale& rLocale, const OUString& servic
     }
     if (xMSF.is()) {
         Reference < XInterface > xI =
-            xMSF->createInstance(OUString::createFromAscii("com.sun.star.i18n.Collator_") + serviceName);
+            xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.Collator_")) + serviceName);
 
         if (xI.is()) {
             Reference < XCollator > xC;
@@ -195,8 +195,8 @@ CollatorImpl::loadCachedCollator(const lang::Locale& rLocale, const OUString& rS
     }
 
     static sal_Unicode under = (sal_Unicode) '_';
-    static OUString tw(OUString::createFromAscii("TW"));
-    static OUString unicode(OUString::createFromAscii("Unicode"));
+    static OUString tw(RTL_CONSTASCII_USTRINGPARAM("TW"));
+    static OUString unicode(RTL_CONSTASCII_USTRINGPARAM("Unicode"));
 
     sal_Int32 l = rLocale.Language.getLength();
     sal_Int32 c = rLocale.Country.getLength();
diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx
index 2afdd401123f..b6ebeecbd68f 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -97,9 +97,9 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
                 aBuf.appendAscii("get_").append(rLocale.Language).appendAscii("_");
                 if (rLocale.Language.equalsAscii("zh")) {
                     OUString func_base = aBuf.makeStringAndClear();
-                    if (OUString::createFromAscii("TW HK MO").indexOf(rLocale.Country) >= 0)
+                    if (OUString(RTL_CONSTASCII_USTRINGPARAM("TW HK MO")).indexOf(rLocale.Country) >= 0)
                         func=(const sal_uInt8* (*)()) osl_getFunctionSymbol(hModule,
-                                    (func_base + OUString::createFromAscii("TW_") + rAlgorithm).pData);
+                                    (func_base + OUString(RTL_CONSTASCII_USTRINGPARAM("TW_")) + rAlgorithm).pData);
                     if (!func)
                         func=(const sal_uInt8* (*)()) osl_getFunctionSymbol(hModule, (func_base + rAlgorithm).pData);
                 } else {
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 264117fe16a6..d316740a0490 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -420,10 +420,10 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
                result += OUString::valueOf( number );
                break;
           case NUMBER_NONE:
-               return OUString::createFromAscii(""); // ignore prefix and suffix
+               return OUString(RTL_CONSTASCII_USTRINGPARAM("")); // ignore prefix and suffix
           case CHAR_SPECIAL:
                // apparently, we're supposed to return an empty string in this case...
-               return OUString::createFromAscii(""); // ignore prefix and suffix
+               return OUString(RTL_CONSTASCII_USTRINGPARAM("")); // ignore prefix and suffix
           case PAGE_DESCRIPTOR:
           case BITMAP:
                OSL_ASSERT(0);
@@ -459,25 +459,25 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
                 break;
           case NUMBER_LOWER_ZH:
                 natNum = NativeNumberMode::NATNUM7;
-                locale.Language = OUString::createFromAscii("zh");
+                locale.Language = OUString(RTL_CONSTASCII_USTRINGPARAM("zh"));
                 break;
           case NUMBER_UPPER_ZH_TW:
-                locale.Country = OUString::createFromAscii("TW");
+                locale.Country = OUString(RTL_CONSTASCII_USTRINGPARAM("TW"));
           case NUMBER_UPPER_ZH:
                 natNum = NativeNumberMode::NATNUM8;
-                locale.Language = OUString::createFromAscii("zh");
+                locale.Language = OUString(RTL_CONSTASCII_USTRINGPARAM("zh"));
                 break;
           case NUMBER_TRADITIONAL_JA:
                 natNum = NativeNumberMode::NATNUM8;
-                locale.Language = OUString::createFromAscii("ja");
+                locale.Language = OUString(RTL_CONSTASCII_USTRINGPARAM("ja"));
                 break;
           case NUMBER_UPPER_KO:
                 natNum = NativeNumberMode::NATNUM8;
-                locale.Language = OUString::createFromAscii("ko");
+                locale.Language = OUString(RTL_CONSTASCII_USTRINGPARAM("ko"));
                 break;
           case NUMBER_HANGUL_KO:
                 natNum = NativeNumberMode::NATNUM11;
-                locale.Language = OUString::createFromAscii("ko");
+                locale.Language = OUString(RTL_CONSTASCII_USTRINGPARAM("ko"));
                 break;
 
           case CIRCLE_NUMBER:
@@ -646,9 +646,6 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
 
         return result;
 }
-/* -----------------------------21.02.01 15:57--------------------------------
-
- ---------------------------------------------------------------------------*/
 
 #define LANG_ALL        (1 << 0)
 #define LANG_CJK        (1 << 1)
@@ -715,9 +712,6 @@ static const Supported_NumberingType aSupportedTypes[] =
         {style::NumberingType::CHARS_PERSIAN,   NULL, LANG_CTL},
 };
 static const sal_Int32 nSupported_NumberingTypes = sizeof(aSupportedTypes) / sizeof(Supported_NumberingType);
-/* -----------------------------21.02.01 15:57--------------------------------
-
- ---------------------------------------------------------------------------*/
 
 OUString DefaultNumberingProvider::makeNumberingIdentifier(sal_Int16 index)
                                 throw(RuntimeException)
@@ -727,17 +721,17 @@ OUString DefaultNumberingProvider::makeNumberingIdentifier(sal_Int16 index)
 //            return OUString::createFromAscii(aSupportedTypes[index].cSymbol);
         else {
             OUString result;
-            Locale aLocale(OUString::createFromAscii("en"), OUString(), OUString());
+            Locale aLocale(OUString(RTL_CONSTASCII_USTRINGPARAM("en")), OUString(), OUString());
             Sequence<beans::PropertyValue> aProperties(2);
-            aProperties[0].Name = OUString::createFromAscii("NumberingType");
+            aProperties[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("NumberingType"));
             aProperties[0].Value <<= aSupportedTypes[index].nType;
-            aProperties[1].Name = OUString::createFromAscii("Value");
+            aProperties[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("Value"));
             for (sal_Int32 j = 1; j <= 3; j++) {
                 aProperties[1].Value <<= j;
                 result += makeNumberingString( aProperties, aLocale );
-                result += OUString::createFromAscii(", ");
+                result += OUString(RTL_CONSTASCII_USTRINGPARAM(", "));
             }
-            result += OUString::createFromAscii("...");
+            result += OUString(RTL_CONSTASCII_USTRINGPARAM("..."));
             return result;
         }
 }
@@ -748,7 +742,7 @@ DefaultNumberingProvider::isScriptFlagEnabled(const OUString& aName) throw(Runti
     if (! xHierarchicalNameAccess.is()) {
         Reference< XInterface > xInterface;
 
-        xInterface = xSMgr->createInstance(OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider"));
+        xInterface = xSMgr->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider")));
         Reference< XMultiServiceFactory > xConfigProvider =
                 Reference< XMultiServiceFactory >(xInterface, UNO_QUERY );
 
@@ -757,12 +751,12 @@ DefaultNumberingProvider::isScriptFlagEnabled(const OUString& aName) throw(Runti
 
         Sequence< Any > aArgs(1);
         beans::PropertyValue aPath;
-        aPath.Name = OUString::createFromAscii("nodepath");
-        aPath.Value <<= OUString::createFromAscii("/org.openoffice.Office.Common/I18N"),
+        aPath.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath"));
+        aPath.Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Common/I18N")),
         aArgs[0] <<= aPath;
 
         xInterface = xConfigProvider->createInstanceWithArguments(
-            OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"), aArgs);
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")), aArgs);
 
         xHierarchicalNameAccess.set(xInterface, UNO_QUERY);
 
@@ -785,8 +779,8 @@ Sequence< sal_Int16 > DefaultNumberingProvider::getSupportedNumberingTypes(  )
         Sequence< sal_Int16 > aRet(nSupported_NumberingTypes );
         sal_Int16* pArray = aRet.getArray();
 
-        sal_Bool cjkEnabled = isScriptFlagEnabled(OUString::createFromAscii("CJK/CJKFont"));
-        sal_Bool ctlEnabled = isScriptFlagEnabled(OUString::createFromAscii("CTL/CTLFont"));
+        sal_Bool cjkEnabled = isScriptFlagEnabled(OUString(RTL_CONSTASCII_USTRINGPARAM("CJK/CJKFont")));
+        sal_Bool ctlEnabled = isScriptFlagEnabled(OUString(RTL_CONSTASCII_USTRINGPARAM("CTL/CTLFont")));
 
         for(sal_Int16 i = 0; i < nSupported_NumberingTypes; i++) {
             if ( (aSupportedTypes[i].langOption & LANG_ALL) ||
@@ -796,9 +790,7 @@ Sequence< sal_Int16 > DefaultNumberingProvider::getSupportedNumberingTypes(  )
         }
         return aRet;
 }
-/* -----------------------------21.02.01 15:57--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Int16 DefaultNumberingProvider::getNumberingType( const OUString& rNumberingIdentifier )
                                 throw(RuntimeException)
 {
@@ -807,9 +799,7 @@ sal_Int16 DefaultNumberingProvider::getNumberingType( const OUString& rNumbering
                         return aSupportedTypes[i].nType;
         throw RuntimeException();
 }
-/* -----------------------------21.02.01 15:57--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool DefaultNumberingProvider::hasNumberingType( const OUString& rNumberingIdentifier )
                                 throw(RuntimeException)
 {
@@ -818,9 +808,7 @@ sal_Bool DefaultNumberingProvider::hasNumberingType( const OUString& rNumberingI
                         return sal_True;
         return sal_False;
 }
-/* -----------------------------21.02.01 15:57--------------------------------
 
- ---------------------------------------------------------------------------*/
 OUString DefaultNumberingProvider::getNumberingIdentifier( sal_Int16 nNumberingType )
                                 throw(RuntimeException)
 {
@@ -829,26 +817,20 @@ OUString DefaultNumberingProvider::getNumberingIdentifier( sal_Int16 nNumberingT
                 return makeNumberingIdentifier(i);
         return OUString();
 }
-/* -----------------------------05.07.01 13:34--------------------------------
 
- ---------------------------------------------------------------------------*/
 const sal_Char cDefaultNumberingProvider[] = "com.sun.star.text.DefaultNumberingProvider";
 OUString DefaultNumberingProvider::getImplementationName(void)
                 throw( RuntimeException )
 {
     return OUString::createFromAscii(cDefaultNumberingProvider);
 }
-/* -----------------------------05.07.01 13:34--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool DefaultNumberingProvider::supportsService(const rtl::OUString& rServiceName)
                 throw( RuntimeException )
 {
     return rServiceName.equalsAscii(cDefaultNumberingProvider);
 }
-/* -----------------------------05.07.01 13:34--------------------------------
 
- ---------------------------------------------------------------------------*/
 Sequence< OUString > DefaultNumberingProvider::getSupportedServiceNames(void)
                 throw( RuntimeException )
 {
diff --git a/i18npool/source/indexentry/indexentrysupplier.cxx b/i18npool/source/indexentry/indexentrysupplier.cxx
index e3b682656fa2..583e8053b5ee 100644
--- a/i18npool/source/indexentry/indexentrysupplier.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier.cxx
@@ -113,7 +113,7 @@ OUString SAL_CALL IndexEntrySupplier::getIndexCharacter( const OUString& rIndexE
 sal_Bool SAL_CALL IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(const OUString& name) throw( RuntimeException )
 {
         Reference < XInterface > xI = xMSF->createInstance(
-            OUString::createFromAscii("com.sun.star.i18n.IndexEntrySupplier_") + name);
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.IndexEntrySupplier_")) + name);
 
         if ( xI.is() ) {
             xI->queryInterface( ::getCppuType((const Reference< com::sun::star::i18n::XExtendedIndexEntrySupplier>*)0) ) >>= xIES;
@@ -168,7 +168,7 @@ IndexEntrySupplier::getLocaleSpecificIndexEntrySupplier(const Locale& rLocale, c
                         // load service with name <base>_<algorithm>
                 (a > 0 && createLocaleSpecificIndexEntrySupplier(aSortAlgorithm)) ||
                         // load default service with name <base>_Unicode
-                        createLocaleSpecificIndexEntrySupplier(OUString::createFromAscii("Unicode"))) {
+                        createLocaleSpecificIndexEntrySupplier(OUString(RTL_CONSTASCII_USTRINGPARAM("Unicode")))) {
                 return xIES;
             }
         }
diff --git a/i18npool/source/indexentry/indexentrysupplier_asian.cxx b/i18npool/source/indexentry/indexentrysupplier_asian.cxx
index 1590b59c0913..b29d20e8067a 100644
--- a/i18npool/source/indexentry/indexentrysupplier_asian.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_asian.cxx
@@ -46,9 +46,9 @@ IndexEntrySupplier_asian::IndexEntrySupplier_asian(
 {
     implementationName = "com.sun.star.i18n.IndexEntrySupplier_asian";
 #ifdef SAL_DLLPREFIX
-    OUString lib=OUString::createFromAscii(SAL_DLLPREFIX"index_data"SAL_DLLEXTENSION);
+    OUString lib(RTL_CONSTASCII_USTRINGPARAM(SAL_DLLPREFIX"index_data"SAL_DLLEXTENSION));
 #else
-    OUString lib=OUString::createFromAscii("index_data"SAL_DLLEXTENSION);
+    OUString lib(RTL_CONSTASCII_USTRINGPARAM("index_data"SAL_DLLEXTENSION));
 #endif
     hModule = osl_loadModuleRelative(
         &thisModule, lib.pData, SAL_LOADMODULE_DEFAULT );
@@ -66,10 +66,10 @@ IndexEntrySupplier_asian::getIndexCharacter( const OUString& rIndexEntry,
     sal_Int32 i=0;
     sal_uInt32 ch = rIndexEntry.iterateCodePoints(&i, 0);
     if (hModule) {
-        OUString get=OUString::createFromAscii("get_indexdata_");
+        OUString get(RTL_CONSTASCII_USTRINGPARAM("get_indexdata_"));
         sal_uInt16** (*func)(sal_Int16*)=NULL;
-        if (rLocale.Language.equalsAscii("zh") && OUString::createFromAscii("TW HK MO").indexOf(rLocale.Country) >= 0)
-            func=(sal_uInt16** (*)(sal_Int16*))osl_getFunctionSymbol(hModule, (get+rLocale.Language+OUString::createFromAscii("_TW_")+rAlgorithm).pData);
+        if (rLocale.Language.equalsAscii("zh") && OUString(RTL_CONSTASCII_USTRINGPARAM("TW HK MO")).indexOf(rLocale.Country) >= 0)
+            func=(sal_uInt16** (*)(sal_Int16*))osl_getFunctionSymbol(hModule, (get+rLocale.Language+OUString(RTL_CONSTASCII_USTRINGPARAM("_TW_"))+rAlgorithm).pData);
         if (!func)
             func=(sal_uInt16** (*)(sal_Int16*))osl_getFunctionSymbol(hModule, (get+rLocale.Language+OUString('_')+rAlgorithm).pData);
         if (func) {
@@ -121,7 +121,7 @@ IndexEntrySupplier_asian::getPhoneticCandidate( const OUString& rIndexEntry,
         sal_uInt16 **(*func)(sal_Int16*)=NULL;
         const sal_Char *func_name=NULL;
         if (rLocale.Language.equalsAscii("zh"))
-            func_name=(OUString::createFromAscii("TW HK MO").indexOf(rLocale.Country) >= 0) ?  "get_zh_zhuyin" : "get_zh_pinyin";
+            func_name=(OUString(RTL_CONSTASCII_USTRINGPARAM("TW HK MO")).indexOf(rLocale.Country) >= 0) ?  "get_zh_zhuyin" : "get_zh_pinyin";
         else if (rLocale.Language.equalsAscii("ko"))
             func_name="get_ko_phonetic";
         if (func_name)
diff --git a/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx
index 5057eb91559d..6d6ceb6e1aee 100644
--- a/i18npool/source/indexentry/indexentrysupplier_default.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_default.cxx
@@ -170,7 +170,7 @@ OUString Index::getIndexDescription(const OUString& rIndexEntry)
     return OUString(&indexChar, 1);
 }
 
-#define LOCALE_EN lang::Locale(OUString::createFromAscii("en"), OUString(), OUString())
+#define LOCALE_EN lang::Locale(OUString(RTL_CONSTASCII_USTRINGPARAM("en")), OUString(), OUString())
 
 void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm) throw (RuntimeException)
 {
diff --git a/i18npool/source/inputchecker/inputsequencechecker.cxx b/i18npool/source/inputchecker/inputsequencechecker.cxx
index 6ddc168b1ca9..610308e3e053 100644
--- a/i18npool/source/inputchecker/inputsequencechecker.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker.cxx
@@ -129,7 +129,7 @@ InputSequenceCheckerImpl::getInputSequenceChecker(sal_Char* rLanguage) throw (Ru
             }
 
             Reference < uno::XInterface > xI = xMSF->createInstance(
-                        OUString::createFromAscii("com.sun.star.i18n.InputSequenceChecker_") +
+                        OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.InputSequenceChecker_")) +
                         OUString::createFromAscii(rLanguage));
 
             if ( xI.is() ) {
diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index 7b8cceb09bd3..2796ba427ff6 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -168,7 +168,7 @@ void print_OUString( const OUString& s )
     printf( "%s", OUStringToOString( s, RTL_TEXTENCODING_UTF8).getStr());
 }
 
-bool is_empty( const OUString& s )
+bool is_empty_string( const OUString& s )
 {
      return (s.getLength()==0) || (s.getLength()==1 && s[0]=='\n');
 }
@@ -208,7 +208,7 @@ void print_node( const LocaleNode* p, int depth=0 )
      }
      printf(">");
      printf("\n");
-     if( !is_empty( p->getValue() ) )
+     if( !is_empty_string( p->getValue() ) )
      {
           print_indent( depth+1 );
           printf("value: ");
@@ -1111,7 +1111,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
             }
         }
         if (ref_name.getLength() > 0 && daysNode == NULL) {
-            of.writeParameter("dayRef", OUString::createFromAscii("ref"), i);
+            of.writeParameter("dayRef", OUString(RTL_CONSTASCII_USTRINGPARAM("ref")), i);
             of.writeParameter("dayRefName", ref_name, i);
             nbOfDays[i] = 0;
         } else {
@@ -1143,7 +1143,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
             }
         }
         if (ref_name.getLength() > 0 && monthsNode == NULL) {
-            of.writeParameter("monthRef", OUString::createFromAscii("ref"), i);
+            of.writeParameter("monthRef", OUString(RTL_CONSTASCII_USTRINGPARAM("ref")), i);
             of.writeParameter("monthRefName", ref_name, i);
             nbOfMonths[i] = 0;
         } else {
@@ -1175,7 +1175,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
             }
         }
         if (ref_name.getLength() > 0 && erasNode == NULL) {
-            of.writeParameter("eraRef", OUString::createFromAscii("ref"), i);
+            of.writeParameter("eraRef", OUString(RTL_CONSTASCII_USTRINGPARAM("ref")), i);
             of.writeParameter("eraRefName", ref_name, i);
             nbOfEras[i] = 0;
         } else {
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 9fe8234d48f6..08c54ae99ff2 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -432,8 +432,8 @@ oslGenericFunction SAL_CALL lcl_LookupTableHelper::getFunctionSymbolByName(
             if ( module->loadRelative(&thisModule, aBuf.makeStringAndClear()) )
             {
                 ::osl::MutexGuard aGuard( maMutex );
-                LocaleDataLookupTableItem* pNewItem = 0;
-                maLookupTable.push_back(pNewItem = new LocaleDataLookupTableItem(aLibTable[i].pLib, module, aLibTable[i].pLocale ));
+                LocaleDataLookupTableItem* pNewItem = new LocaleDataLookupTableItem(aLibTable[i].pLib, module, aLibTable[i].pLocale);
+                maLookupTable.push_back(pNewItem);
                 OSL_ASSERT( pOutCachedItem );
                 if( pOutCachedItem )
                 {
@@ -484,7 +484,7 @@ Sequence< CalendarItem > &LocaleData::getCalendarItemByName(const OUString& name
             // Refered locale does not found, return name for en_US locale.
             if (index == cals.getLength()) {
                 cals = getAllCalendars(
-                        Locale(OUString::createFromAscii("en"), OUString::createFromAscii("US"), OUString()));
+                        Locale(OUString(RTL_CONSTASCII_USTRINGPARAM("en")), OUString(RTL_CONSTASCII_USTRINGPARAM("US")), OUString()));
                 if (cals.getLength() > 0)
                     ref_cal = cals[0];
                 else
@@ -876,7 +876,7 @@ OUString SAL_CALL
 LocaleData::getIndexKeysByAlgorithm( const Locale& rLocale, const OUString& algorithm ) throw(RuntimeException)
 {
         sal_Unicode **indexArray = getIndexArrayForAlgorithm(rLocale, algorithm);
-        return indexArray ? OUString::createFromAscii("0-9")+OUString(indexArray[2]) : OUString();
+        return indexArray ? OUString(RTL_CONSTASCII_USTRINGPARAM("0-9"))+OUString(indexArray[2]) : OUString();
 }
 
 OUString SAL_CALL
@@ -1296,8 +1296,8 @@ oslGenericFunction SAL_CALL LocaleData::getFunctionSymbol( const Locale& rLocale
         }
 
         oslGenericFunction pSymbol = 0;
-        static OUString tw(OUString::createFromAscii("TW"));
-        static OUString en_US(OUString::createFromAscii("en_US"));
+        static OUString tw(RTL_CONSTASCII_USTRINGPARAM("TW"));
+        static OUString en_US(RTL_CONSTASCII_USTRINGPARAM("en_US"));
 
         sal_Int32 l = rLocale.Language.getLength();
         sal_Int32 c = rLocale.Country.getLength();
diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx
index dd6c02225cef..f994af59c01f 100644
--- a/i18npool/source/localedata/saxparser.cxx
+++ b/i18npool/source/localedata/saxparser.cxx
@@ -354,7 +354,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     {
         // Create registration service
         Reference < XInterface > x = xSMgr->createInstance(
-            OUString::createFromAscii( "com.sun.star.registry.ImplementationRegistration" ) );
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration")) );
         xReg = Reference<  XImplementationRegistration > ( x , UNO_QUERY );
     }
     catch( Exception & ) {
@@ -366,10 +366,9 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     try
     {
         // Load dll for the tested component
-        OUString aDllName =
-            OUString::createFromAscii( "sax.uno" SAL_DLLEXTENSION );
+        OUString aDllName(RTL_CONSTASCII_USTRINGPARAM( "sax.uno" SAL_DLLEXTENSION ));
         xReg->registerImplementation(
-            OUString::createFromAscii( "com.sun.star.loader.SharedLibrary" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")),
             aDllName,
             Reference< XSimpleRegistry > ()  );
     }
@@ -386,7 +385,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     // read xml from a file and count elements
     //--------------------------------
     Reference< XInterface > x = xSMgr->createInstance(
-        OUString::createFromAscii( "com.sun.star.xml.sax.Parser" ) );
+        OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) );
     int nError = 0;
     if( x.is() )
     {
diff --git a/i18npool/source/numberformatcode/numberformatcode.cxx b/i18npool/source/numberformatcode/numberformatcode.cxx
index 8a080ea214d6..441a8e5c06ab 100644
--- a/i18npool/source/numberformatcode/numberformatcode.cxx
+++ b/i18npool/source/numberformatcode/numberformatcode.cxx
@@ -283,7 +283,7 @@ NumberFormatCodeMapper::createLocaleDataObject() {
 NumberFormatCodeMapper::getImplementationName(void)
                 throw( ::com::sun::star::uno::RuntimeException )
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.i18n.NumberFormatCodeMapper");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.NumberFormatCodeMapper"));
 }
 
 const sal_Char cNumFormat[] = "com.sun.star.i18n.NumberFormatMapper";
diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
index b5f30058da2e..f541553a9efa 100644
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
@@ -59,22 +59,22 @@ static OUString getOrdinalSuffixEn( sal_Int32 nNumber )
     switch( labs( nNumber ) % 100 )
     {
         case 11: case 12: case 13:
-            retValue = OUString::createFromAscii( "th" );
+            retValue = OUString(RTL_CONSTASCII_USTRINGPARAM("th"));
             break;
         default:
             switch( nNumber % 10 )
             {
                 case 1:
-                    retValue = OUString::createFromAscii( "st" );
+                    retValue = OUString(RTL_CONSTASCII_USTRINGPARAM("st"));
                     break;
                 case 2:
-                    retValue = OUString::createFromAscii( "nd" );
+                    retValue = OUString(RTL_CONSTASCII_USTRINGPARAM("nd"));
                     break;
                 case 3:
-                    retValue = OUString::createFromAscii( "rd" );
+                    retValue = OUString(RTL_CONSTASCII_USTRINGPARAM("rd"));
                     break;
                 default:
-                    retValue = OUString::createFromAscii( "th" );
+                    retValue = OUString(RTL_CONSTASCII_USTRINGPARAM("th"));
                     break;
             }
             break;
diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx
index cf73d0961bd6..8e84bf0081be 100644
--- a/i18npool/source/registerservices/registerservices.cxx
+++ b/i18npool/source/registerservices/registerservices.cxx
@@ -596,7 +596,7 @@ sal_Bool SAL_CALL component_writeInfo( void* /*_pServiceManager*/, void* _pRegis
             xNewKey = pRegistryKey->createKey(
                     ::rtl::OUString::createFromAscii( pArr->pImplementationNm )  );
             xNewKey = xNewKey->createKey(
-                    ::rtl::OUString::createFromAscii( "/UNO/SERVICES" ) );
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
             xNewKey->createKey(
                     ::rtl::OUString::createFromAscii( pArr->pServiceNm ) );
         }
diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx
index ecf236f5cdde..ab4d50f7397f 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -114,8 +114,8 @@ void TextSearch::setOptions( const SearchOptions& rOptions ) throw( RuntimeExcep
         if( !xTranslit.is() )
         {
             Reference < XInterface > xI = xMSF->createInstance(
-                    OUString::createFromAscii(
-                        "com.sun.star.i18n.Transliteration"));
+                    OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.i18n.Transliteration")));
             if ( xI.is() )
                 xI->queryInterface( ::getCppuType(
                             (const Reference< XExtendedTransliteration >*)0))
@@ -136,8 +136,8 @@ void TextSearch::setOptions( const SearchOptions& rOptions ) throw( RuntimeExcep
         if( !xTranslit2.is() )
         {
             Reference < XInterface > xI = xMSF->createInstance(
-                    OUString::createFromAscii(
-                        "com.sun.star.i18n.Transliteration"));
+                    OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.i18n.Transliteration")));
             if ( xI.is() )
                 xI->queryInterface( ::getCppuType(
                             (const Reference< XExtendedTransliteration >*)0))
@@ -153,7 +153,7 @@ void TextSearch::setOptions( const SearchOptions& rOptions ) throw( RuntimeExcep
     if ( !xBreak.is() )
     {
         Reference < XInterface > xI = xMSF->createInstance(
-                OUString::createFromAscii( "com.sun.star.i18n.BreakIterator"));
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")));
         if( xI.is() )
             xI->queryInterface( ::getCppuType(
                         (const Reference< XBreakIterator >*)0))
@@ -413,7 +413,7 @@ bool TextSearch::IsDelimiter( const OUString& rStr, sal_Int32 nPos ) const
         if ( !xCharClass.is() )
         {
             Reference < XInterface > xI = xMSF->createInstance(
-                    OUString::createFromAscii( "com.sun.star.i18n.CharacterClassification"));
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.CharacterClassification")));
             if( xI.is() )
                 xI->queryInterface( ::getCppuType(
                             (const Reference< XCharacterClassification >*)0))
@@ -1001,7 +1001,7 @@ sal_Bool SAL_CALL component_writeInfo(
 
         xNewKey = pRegistryKey->createKey( getImplementationName_Static() );
         xNewKey = xNewKey->createKey(
-                ::rtl::OUString::createFromAscii( "/UNO/SERVICES" ) );
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
         xNewKey->createKey( getServiceName_Static() );
     }
     return sal_True;
diff --git a/i18npool/source/textconversion/textconversion.cxx b/i18npool/source/textconversion/textconversion.cxx
index 0ece5709d1eb..7b850049290f 100644
--- a/i18npool/source/textconversion/textconversion.cxx
+++ b/i18npool/source/textconversion/textconversion.cxx
@@ -42,9 +42,9 @@ extern "C" { static void SAL_CALL thisModule() {} }
 TextConversion::TextConversion()
 {
 #ifdef SAL_DLLPREFIX
-    OUString lib=OUString::createFromAscii(SAL_DLLPREFIX"textconv_dict"SAL_DLLEXTENSION);
+    OUString lib(RTL_CONSTASCII_USTRINGPARAM(SAL_DLLPREFIX"textconv_dict"SAL_DLLEXTENSION));
 #else
-    OUString lib=OUString::createFromAscii("textconv_dict"SAL_DLLEXTENSION);
+    OUString lib(RTL_CONSTASCII_USTRINGPARAM("textconv_dict"SAL_DLLEXTENSION));
 #endif
     hModule = osl_loadModuleRelative(
         &thisModule, lib.pData, SAL_LOADMODULE_DEFAULT );
diff --git a/i18npool/source/textconversion/textconversionImpl.cxx b/i18npool/source/textconversion/textconversionImpl.cxx
index 9bc191ac71b5..8e21e384a880 100644
--- a/i18npool/source/textconversion/textconversionImpl.cxx
+++ b/i18npool/source/textconversion/textconversionImpl.cxx
@@ -99,17 +99,17 @@ TextConversionImpl::getLocaleSpecificTextConversion(const Locale& rLocale) throw
         Reference < XInterface > xI;
 
         xI = xMSF->createInstance(
-            OUString::createFromAscii("com.sun.star.i18n.TextConversion_") + aLocale.Language);
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.TextConversion_")) + aLocale.Language);
 
         if ( ! xI.is() )
             xI = xMSF->createInstance(
-                OUString::createFromAscii("com.sun.star.i18n.TextConversion_") + aLocale.Language +
-                OUString::createFromAscii("_") + aLocale.Country);
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.TextConversion_")) + aLocale.Language +
+                OUString(RTL_CONSTASCII_USTRINGPARAM("_")) + aLocale.Country);
         if ( ! xI.is() )
             xI = xMSF->createInstance(
-                OUString::createFromAscii("com.sun.star.i18n.TextConversion_") + aLocale.Language +
-                OUString::createFromAscii("_") + aLocale.Country +
-                OUString::createFromAscii("_") + aLocale.Variant);
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.TextConversion_")) + aLocale.Language +
+                OUString(RTL_CONSTASCII_USTRINGPARAM("_")) + aLocale.Country +
+                OUString(RTL_CONSTASCII_USTRINGPARAM("_")) + aLocale.Variant);
 
         if (xI.is())
             xI->queryInterface( getCppuType((const Reference< XTextConversion>*)0) ) >>= xTC;
diff --git a/i18npool/source/textconversion/textconversion_ko.cxx b/i18npool/source/textconversion/textconversion_ko.cxx
index 9d5570efd6a2..40c89c2fd5b1 100644
--- a/i18npool/source/textconversion/textconversion_ko.cxx
+++ b/i18npool/source/textconversion/textconversion_ko.cxx
@@ -55,13 +55,13 @@ TextConversion_ko::TextConversion_ko( const Reference < XMultiServiceFactory >&
     Reference < XInterface > xI;
 
     xI = xMSF->createInstance(
-        OUString::createFromAscii("com.sun.star.i18n.ConversionDictionary_ko"));
+        OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.ConversionDictionary_ko")));
 
     if ( xI.is() )
         xI->queryInterface( getCppuType((const Reference< XConversionDictionary>*)0) ) >>= xCD;
 
     xI = xMSF->createInstance(
-        OUString::createFromAscii( "com.sun.star.linguistic2.ConversionDictionaryList" ));
+        OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.ConversionDictionaryList")));
 
     if ( xI.is() )
         xI->queryInterface( getCppuType((const Reference< XConversionDictionaryList>*)0) ) >>= xCDL;
@@ -70,8 +70,8 @@ TextConversion_ko::TextConversion_ko( const Reference < XMultiServiceFactory >&
 
     // get maximum length of word in dictionary
     if (xCDL.is()) {
-        Locale loc(OUString::createFromAscii("ko"),
-                    OUString::createFromAscii("KR"),
+        Locale loc(OUString(RTL_CONSTASCII_USTRINGPARAM("ko")),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("KR")),
                     OUString());
         maxLeftLength = xCDL->queryMaxCharCount(loc,
                         ConversionDictionaryType::HANGUL_HANJA,
diff --git a/i18npool/source/textconversion/textconversion_zh.cxx b/i18npool/source/textconversion/textconversion_zh.cxx
index 71fee17ff342..177fbd160ba8 100644
--- a/i18npool/source/textconversion/textconversion_zh.cxx
+++ b/i18npool/source/textconversion/textconversion_zh.cxx
@@ -49,7 +49,7 @@ TextConversion_zh::TextConversion_zh( const Reference < XMultiServiceFactory >&
 {
     Reference < XInterface > xI;
     xI = xMSF->createInstance(
-        OUString::createFromAscii( "com.sun.star.linguistic2.ConversionDictionaryList" ));
+        OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.ConversionDictionaryList")));
     if ( xI.is() )
         xI->queryInterface( getCppuType((const Reference< XConversionDictionaryList>*)0) ) >>= xCDL;
 
diff --git a/i18npool/source/transliteration/textToPronounce_zh.cxx b/i18npool/source/transliteration/textToPronounce_zh.cxx
index 8444f4dd79d8..786906366510 100644
--- a/i18npool/source/transliteration/textToPronounce_zh.cxx
+++ b/i18npool/source/transliteration/textToPronounce_zh.cxx
@@ -149,9 +149,9 @@ extern "C" { static void SAL_CALL thisModule() {} }
 TextToPronounce_zh::TextToPronounce_zh(const sal_Char* func_name)
 {
 #ifdef SAL_DLLPREFIX
-    OUString lib=OUString::createFromAscii(SAL_DLLPREFIX"index_data"SAL_DLLEXTENSION);
+    OUString lib(RTL_CONSTASCII_USTRINGPARAM(SAL_DLLPREFIX"index_data"SAL_DLLEXTENSION));
 #else
-    OUString lib=OUString::createFromAscii("index_data"SAL_DLLEXTENSION);
+    OUString lib(RTL_CONSTASCII_USTRINGPARAM("index_data"SAL_DLLEXTENSION));
 #endif
     hModule = osl_loadModuleRelative(
         &thisModule, lib.pData, SAL_LOADMODULE_DEFAULT );
diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx
index 2209ef9eb68b..c2783cda6237 100644
--- a/i18npool/source/transliteration/transliterationImpl.cxx
+++ b/i18npool/source/transliteration/transliterationImpl.cxx
@@ -158,7 +158,7 @@ TransliterationImpl::TransliterationImpl(const Reference <XMultiServiceFactory>&
     if ( xMSF.is() )
     {
         Reference < XInterface > xI=
-                xMSF->createInstance(OUString::createFromAscii("com.sun.star.i18n.LocaleData"));
+                xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.LocaleData")));
         if ( xI.is() ) {
             Any x = xI->queryInterface( ::getCppuType( (const uno::Reference< i18n::XLocaleData >*)0) );
             x >>= localedata;
@@ -180,7 +180,7 @@ TransliterationImpl::getName() throw(RuntimeException)
     if (numCascade == 1 && bodyCascade[0].is())
         return bodyCascade[0]->getName();
     if (numCascade < 1)
-        return ( OUString::createFromAscii("Not Loaded"));
+        return ( OUString(RTL_CONSTASCII_USTRINGPARAM("Not Loaded")));
     throw ERROR;
 }
 
@@ -604,7 +604,7 @@ void TransliterationImpl::loadBody( OUString &implName, Reference<XExtendedTrans
 
     Reference< XContentEnumerationAccess > xEnumAccess( xSMgr, UNO_QUERY );
     Reference< XEnumeration > xEnum(xEnumAccess->createContentEnumeration(
-                                    OUString::createFromAscii(TRLT_SERVICELNAME_L10N)));
+                                    OUString(RTL_CONSTASCII_USTRINGPARAM(TRLT_SERVICELNAME_L10N))));
     if (xEnum.is()) {
         while (xEnum->hasMoreElements()) {
             Any a = xEnum->nextElement();
@@ -634,7 +634,7 @@ sal_Bool SAL_CALL
 TransliterationImpl::loadModuleByName( const OUString& implName,
         Reference<XExtendedTransliteration>& body, const Locale& rLocale) throw(RuntimeException)
 {
-    OUString cname = OUString::createFromAscii(TRLT_IMPLNAME_PREFIX) + implName;
+    OUString cname = OUString(RTL_CONSTASCII_USTRINGPARAM(TRLT_IMPLNAME_PREFIX)) + implName;
     loadBody(cname, body);
     if (body.is()) {
         body->loadModule((TransliterationModules)0, rLocale); // toUpper/toLoad need rLocale
@@ -645,7 +645,7 @@ TransliterationImpl::loadModuleByName( const OUString& implName,
                 if (i == 0) // current module is caseignore
                     body->loadModule(TMlist[0].tm, rLocale); // caseingore need to setup module name
                 if (! caseignore.is()) {
-                    OUString bname = OUString::createFromAscii(TRLT_IMPLNAME_PREFIX) +
+                    OUString bname = OUString(RTL_CONSTASCII_USTRINGPARAM(TRLT_IMPLNAME_PREFIX)) +
                                 OUString::createFromAscii(TMlist[0].implName);
                     loadBody(bname, caseignore);
                 }
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index d352d28c1d6b..90ac42303d40 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -233,11 +233,6 @@ void SvMetaName::Save( SvPersistStream & rStm )
     if( nMask & 0x10 ) rStm << aDescription;
 }
 
-/*************************************************************************
-|*
-|*
-|*    Beschreibung
-*************************************************************************/
 BOOL SvMetaName::SetName( const ByteString & rName, SvIdlDataBase * )
 {
     aName = rName;
diff --git a/idlc/source/preproc/macro.c b/idlc/source/preproc/macro.c
index be9f30abf085..824a966fda84 100644
--- a/idlc/source/preproc/macro.c
+++ b/idlc/source/preproc/macro.c
@@ -76,14 +76,14 @@ void
     args = NULL;
     if (tp < trp->lp && tp->type == LP && tp->wslen == 0)
     {
-        /* macro with args */
-        int narg = 0;
-
         tp += 1;
         args = new(Tokenrow);
         maketokenrow(2, args);
         if (tp->type != RP)
         {
+            /* macro with args */
+            int narg = 0;
+
             int err = 0;
 
             for (;;)
@@ -301,7 +301,7 @@ void
     expand(Tokenrow * trp, Nlist * np)
 {
     Tokenrow ntr;
-    int ntokc, narg, i;
+    int ntokc, narg;
     Tokenrow *atr[NARG + 1];
 
     if (Mflag == 2)
@@ -317,6 +317,8 @@ void
         ntokc = 1;
     else
     {
+        int i;
+
         ntokc = gatherargs(trp, atr, &narg);
         if (narg < 0)
         {                               /* not actually a call (no '(') */
@@ -330,7 +332,7 @@ void
             return;
         }
         substargs(np, &ntr, atr);       /* put args into replacement */
-        for (i = 0; i < narg; i++)
+        for (i = 0; i < narg; ++i)
         {
             dofree(atr[i]->bp);
             dofree(atr[i]);
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
index 9bb051e56492..3968375a8815 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
@@ -2,4 +2,6 @@ Property	Signature_
 s72	s72
 AppSearch	Property	Signature_
 INSTALLLOCATION	installuser
+INSTALLLOCATION	installuser_
 INSTALLLOCATION	installmachine
+INSTALLLOCATION	installmachine_
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
index 2c3517369d69..c082322086ad 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
@@ -1,5 +1,7 @@
 Signature_	Root	Key	Name	Type
 s72	i2	s255	S255	I2
 RegLocator	Signature_
-installuser	1	Software\LibreOffice\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
-installmachine	2	Software\LibreOffice\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
+installuser	1	Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
+installuser_	1	Software\LibreOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
+installmachine	2	Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
+installmachine_	2	Software\LibreOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt
index 41ff1521764a..9a3dac51143c 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt
@@ -2,4 +2,6 @@ Property	Signature_
 s72	s72
 AppSearch	Property	Signature_
 INSTALLLOCATION	basisinstalluser
+INSTALLLOCATION	basisinstalluser_
 INSTALLLOCATION	basisinstallmachine
+INSTALLLOCATION	basisinstallmachine_
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
index d2b233364f98..995f919993eb 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
@@ -1,5 +1,7 @@
 Signature_	Root	Key	Name	Type
 s72	i2	s255	S255	I2
 RegLocator	Signature_
-basisinstalluser	1	Software\LibreOffice\LAYERNAMETEMPLATE\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
-basisinstallmachine	2	Software\LibreOffice\LAYERNAMETEMPLATE\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
+basisinstalluser	1	Software\LibreOffice\Layers\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
+basisinstalluser_	1	Software\LibreOffice\Layers_\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
+basisinstallmachine	2	Software\LibreOffice\Layers\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
+basisinstallmachine_	2	Software\LibreOffice\Layers_\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 5f18a524a091..117aba3afd5b 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -72,7 +72,6 @@ LOCALPYFILES= \
     $(BIN)$/uno.py \
     $(BIN)$/unohelper.py \
     $(BIN)$/pythonloader.py \
-    $(BIN)$/pythonscript.py \
     $(BIN)$/officehelper.py \
     $(BIN)$/mailmerge.py
 
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 836899ce3969..4b19075f3096 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -53,6 +53,7 @@ LibreOffice
 		variables
 		{
 			PRODUCTNAME LibreOffice
+			PRODUCTNAME_BR BrOffice
 			PRODUCTVERSION 3.3
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
@@ -92,6 +93,8 @@ LibreOffice
 			PATCHCODEFILE ooo_patchcodes.txt
 			DOWNLOADBANNER	ooobanner.bmp
 			DOWNLOADBITMAP	ooobitmap.bmp
+			DOWNLOADBANNER_BR	brobanner.bmp
+			DOWNLOADBITMAP_BR	brobitmap.bmp
 			DOWNLOADSETUPICO	ooosetup.ico
 			RELATIVE_PATHES_IN_DDF 1
             STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
@@ -118,6 +121,7 @@ LibreOffice_wJRE
 		variables
 		{
 			PRODUCTNAME LibreOffice
+			PRODUCTNAME_BR BrOffice
 			PRODUCTVERSION 3.3
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
@@ -300,6 +304,7 @@ LibreOffice_SDK
         variables
         {
             PRODUCTNAME LibreOffice
+            PRODUCTNAME_BR BrOffice
             PRODUCTVERSION 3.3
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
diff --git a/jvmaccess/util/cc5_solaris_sparc.map b/jvmaccess/util/cc5_solaris_sparc.map
index bb59a648f4c5..e2cb767dc65e 100644
--- a/jvmaccess/util/cc5_solaris_sparc.map
+++ b/jvmaccess/util/cc5_solaris_sparc.map
@@ -25,7 +25,7 @@
 #
 #*************************************************************************
 
-UDK_3_0_0 {
+UDK_3.1 {
     global:
         # jvmaccess/virtualmachine.hxx:
         __1cJjvmaccessOVirtualMachineLAttachGuardRCreationException2t6M_v_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
@@ -52,7 +52,7 @@ UDK_3.2 {
         __1cJjvmaccesscQ__RTTI__1CpnJjvmaccessOVirtualMachineLAttachGuardRCreationException__; # RTTI for jvmaccess::VirtualMachine::AttachGuard::CreationException *
         __1cJjvmaccesscR__RTTI__1CpknJjvmaccessOVirtualMachineLAttachGuardRCreationException__; # RTTI for jvmaccess::VirtualMachine::AttachGuard::CreationException const *
         __1cJjvmaccessOVirtualMachine2t5B6MpnHJavaVM__ibpnHJNIEnv___v_; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *) #Nvariant 1
-} UDK_3_0_0;
+} UDK_3.1;
 
 UDK_3.3 {
     global:
diff --git a/jvmaccess/util/gcc3.map b/jvmaccess/util/gcc3.map
index 707645d2c829..330651a1cf6e 100644
--- a/jvmaccess/util/gcc3.map
+++ b/jvmaccess/util/gcc3.map
@@ -25,7 +25,7 @@
 #
 #*************************************************************************
 
-UDK_3_0_0 {
+UDK_3.1 {
     global:
         # jvmaccess/virtualmachine.hxx:
         _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC1Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
@@ -59,7 +59,7 @@ UDK_3.2 {
     # We put the '*' at the beginning because its unlikely that these symbols will ever be a postfix of another symbol.
         _*ZN9jvmaccess14VirtualMachineC1EP10_Jv_JavaVMibP10_Jv_JNIEnv; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
         _*ZN9jvmaccess14VirtualMachineC2EP10_Jv_JavaVMibP10_Jv_JNIEnv; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
-} UDK_3_0_0;
+} UDK_3.1;
 
 UDK_3.3 {
     global:
diff --git a/jvmaccess/util/msvc_win32_intel.map b/jvmaccess/util/msvc_win32_intel.map
index 4620b1caa940..fd148b1892ba 100644
--- a/jvmaccess/util/msvc_win32_intel.map
+++ b/jvmaccess/util/msvc_win32_intel.map
@@ -1,4 +1,4 @@
-UDK_3_0_0 {
+UDK_3.1 {
     global:
         # jvmaccess/virtualmachine.hxx:
         ??0CreationException@AttachGuard@VirtualMachine@jvmaccess@@QAE@XZ; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
@@ -15,7 +15,7 @@ UDK_3_0_0 {
 
 UDK_3.2 {
     global:
-} UDK_3_0_0;
+} UDK_3.1;
 
 UDK_3.3 {
     global:
diff --git a/l10ntools/layout/tralay.cxx b/l10ntools/layout/tralay.cxx
index b9a2b383cbcd..1bff2ef8a744 100644
--- a/l10ntools/layout/tralay.cxx
+++ b/l10ntools/layout/tralay.cxx
@@ -247,9 +247,9 @@ static void insertMarker( XMLParentNode *p, ByteString const& file )
             if ( lst->Count() > 1
                  && lst->GetObject( 2 )->GetNodeType() == XML_NODE_TYPE_DEFAULT )
                 i++;
-            OUString marker = OUString::createFromAscii( "\n    NOTE: This file has been generated automagically by transex3/layout/tralay,\n          from source template: " )
+            OUString marker = OUString(RTL_CONSTASCII_USTRINGPARAM("\n    NOTE: This file has been generated automagically by transex3/layout/tralay,\n          from source template: "))
                 + STRING( file )
-                + OUString::createFromAscii( ".\n          Do not edit, changes will be lost.\n" );
+                + OUString(RTL_CONSTASCII_USTRINGPARAM(".\n          Do not edit, changes will be lost.\n"));
             lst->Insert( new XMLComment( marker, 0 ), i );
         }
 }
diff --git a/l10ntools/source/help/HelpCompiler.cxx b/l10ntools/source/help/HelpCompiler.cxx
index 277e9d00f9e7..8050a58c1411 100644
--- a/l10ntools/source/help/HelpCompiler.cxx
+++ b/l10ntools/source/help/HelpCompiler.cxx
@@ -567,7 +567,7 @@ namespace fs
                         rtl::OUString suFilename = aStatus.getFileName();
                         rtl::OUString suFullFileURL;
                         suFullFileURL += _suDirURL;
-                        suFullFileURL += rtl::OUString::createFromAscii("/");
+                        suFullFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
                         suFullFileURL += suFilename;
 
                         if (aStatus.getFileType() == osl::FileStatus::Directory)
diff --git a/l10ntools/source/help/HelpCompiler.hxx b/l10ntools/source/help/HelpCompiler.hxx
index 81b5bde0b182..5b57b7fbe680 100644
--- a/l10ntools/source/help/HelpCompiler.hxx
+++ b/l10ntools/source/help/HelpCompiler.hxx
@@ -274,6 +274,7 @@ struct HelpProcessingException
     HelpProcessingException( HelpProcessingErrorClass eErrorClass, const std::string& aErrorMsg )
         : m_eErrorClass( eErrorClass )
         , m_aErrorMsg( aErrorMsg )
+        , m_nXMLParsingLine( 0 )
     {}
     HelpProcessingException( const std::string& aErrorMsg, const std::string& aXMLParsingFile, int nXMLParsingLine )
         : m_eErrorClass( HELPPROCESSING_XMLPARSING_ERROR )
diff --git a/l10ntools/source/help/HelpLinker.cxx b/l10ntools/source/help/HelpLinker.cxx
index 9a9bfd4d1bbb..3f6f2c9379bc 100644
--- a/l10ntools/source/help/HelpLinker.cxx
+++ b/l10ntools/source/help/HelpLinker.cxx
@@ -999,7 +999,7 @@ void HelpLinker::main( std::vector<std::string> &args,
         //This part is used when compileExtensionHelp is called from the extensions manager.
         //If extension help is compiled using helplinker in the build process
         rtl::OUString aIdxCaptionPathFileURL( *pOfficeHelpPath );
-        aIdxCaptionPathFileURL += rtl::OUString::createFromAscii( "/idxcaption.xsl" );
+        aIdxCaptionPathFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/idxcaption.xsl"));
 
         rtl::OString aOStr_IdxCaptionPathFileURL( rtl::OUStringToOString
             ( aIdxCaptionPathFileURL, fs::getThreadTextEncoding() ) );
@@ -1024,7 +1024,7 @@ void HelpLinker::main( std::vector<std::string> &args,
         //then  -idxcontent must be supplied
         //This part is used when compileExtensionHelp is called from the extensions manager.
         rtl::OUString aIdxContentPathFileURL( *pOfficeHelpPath );
-        aIdxContentPathFileURL += rtl::OUString::createFromAscii( "/idxcontent.xsl" );
+        aIdxContentPathFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/idxcontent.xsl"));
 
         rtl::OString aOStr_IdxContentPathFileURL( rtl::OUStringToOString
             ( aIdxContentPathFileURL, fs::getThreadTextEncoding() ) );
@@ -1189,7 +1189,7 @@ HELPLINKER_DLLPUBLIC bool compileExtensionHelp
 
     // i83624: Tree files
     ::rtl::OUString aTreeFileURL = aExtensionLanguageRoot;
-    aTreeFileURL += rtl::OUString::createFromAscii( "/help.tree" );
+    aTreeFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/help.tree"));
     osl::DirectoryItem aTreeFileItem;
     osl::FileBase::RC rcGet = osl::DirectoryItem::get( aTreeFileURL, aTreeFileItem );
     osl::FileStatus aFileStatus( FileStatusMask_FileSize );
diff --git a/l10ntools/source/srciter.cxx b/l10ntools/source/srciter.cxx
index 12dc8d52d14e..eb5d78f775af 100644
--- a/l10ntools/source/srciter.cxx
+++ b/l10ntools/source/srciter.cxx
@@ -64,13 +64,13 @@ void SourceTreeIterator::ExecuteDirectory( transex::Directory& aDirectory )
     if ( bInExecute ) {
         rtl::OUString sDirName = aDirectory.getDirectoryName();
 
-        static rtl::OUString WCARD1 ( rtl::OUString::createFromAscii( "unxlng" ) );
-        static rtl::OUString WCARD2 ( rtl::OUString::createFromAscii( "unxsol" ) );
-        static rtl::OUString WCARD3 ( rtl::OUString::createFromAscii( "wntmsc" ) );
-        static rtl::OUString WCARD4 ( rtl::OUString::createFromAscii( "common" ) );
-        static rtl::OUString WCARD5 ( rtl::OUString::createFromAscii( "unxmac" ) );
-        static rtl::OUString WCARD6 ( rtl::OUString::createFromAscii( "unxubt" ) );
-        static rtl::OUString WCARD7 ( rtl::OUString::createFromAscii( ".svn" ) );
+        static rtl::OUString WCARD1 ( RTL_CONSTASCII_USTRINGPARAM("unxlng") );
+        static rtl::OUString WCARD2 ( RTL_CONSTASCII_USTRINGPARAM("unxsol") );
+        static rtl::OUString WCARD3 ( RTL_CONSTASCII_USTRINGPARAM("wntmsc") );
+        static rtl::OUString WCARD4 ( RTL_CONSTASCII_USTRINGPARAM("common") );
+        static rtl::OUString WCARD5 ( RTL_CONSTASCII_USTRINGPARAM("unxmac") );
+        static rtl::OUString WCARD6 ( RTL_CONSTASCII_USTRINGPARAM("unxubt") );
+        static rtl::OUString WCARD7 ( RTL_CONSTASCII_USTRINGPARAM(".svn") );
 
 
         if( sDirName.indexOf( WCARD1 , 0 ) > -1 ||
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index d93f7ffa3ce9..9733648cadc1 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -899,7 +899,7 @@ void XMLElement::Print(XMLNode *pCur, OUStringBuffer& buffer , bool rootelement
 /*****************************************************************************/
     //YD FIXME somewhere COMMENT is defined as 4!
     static const String _COMMENT = String::CreateFromAscii("comment");
-    static const OUString XML_LANG ( OUString::createFromAscii("xml-lang") );
+    static const OUString XML_LANG ( RTL_CONSTASCII_USTRINGPARAM("xml-lang") );
 
     if(pCur!=NULL){
         if(rootelement){
@@ -921,34 +921,34 @@ void XMLElement::Print(XMLNode *pCur, OUStringBuffer& buffer , bool rootelement
                 XMLElement *pElement = ( XMLElement * ) pCur;
 
                 if(  !pElement->GetName().EqualsIgnoreCaseAscii( _COMMENT ) ){
-                    buffer.append( OUString::createFromAscii("\\<") );
+                    buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("\\<")) );
                     buffer.append( pElement->GetName() );
                     if ( pElement->GetAttributeList()){
                         for ( ULONG j = 0; j < pElement->GetAttributeList()->Count(); j++ ){
 
                             OUString aAttrName( *pElement->GetAttributeList()->GetObject( j ) );
                             if( !aAttrName.equalsIgnoreAsciiCase( XML_LANG ) ) {
-                                buffer.append( OUString::createFromAscii(" ") );
+                                buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM(" ")) );
                                 buffer.append( aAttrName );
-                                buffer.append( OUString::createFromAscii("=") );
-                                buffer.append( OUString::createFromAscii("\\\"") );
+                                buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("=")) );
+                                buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("\\\"")) );
                                 buffer.append( pElement->GetAttributeList()->GetObject( j )->GetValue() );
-                                buffer.append( OUString::createFromAscii("\\\"") );
+                                buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("\\\"")) );
                             }
                         }
                     }
                     if ( !pElement->GetChildList())
-                        buffer.append( OUString::createFromAscii("/\\>") );
+                        buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("/\\>")) );
                     else {
-                        buffer.append( OUString::createFromAscii("\\>") );
+                        buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("\\>")) );
                         XMLChildNode* tmp=NULL;
                         for ( ULONG k = 0; k < pElement->GetChildList()->Count(); k++ ){
                             tmp=pElement->GetChildList()->GetObject( k );
                             Print( tmp, buffer , false);
                         }
-                        buffer.append( OUString::createFromAscii("\\</") );
+                        buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("\\</")) );
                         buffer.append( pElement->GetName() );
-                        buffer.append( OUString::createFromAscii("\\>") );
+                        buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("\\>")) );
                     }
                 }
             }
@@ -961,9 +961,9 @@ void XMLElement::Print(XMLNode *pCur, OUStringBuffer& buffer , bool rootelement
             break;
             case XML_NODE_TYPE_COMMENT: {
                 XMLComment *pComment = ( XMLComment * ) pCur;
-                buffer.append( OUString::createFromAscii("<!--") );
+                buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("<!--")) );
                 buffer.append( pComment->GetComment() );
-                buffer.append( OUString::createFromAscii("-->") );
+                buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("-->")) );
             }
             break;
             case XML_NODE_TYPE_DEFAULT: {
diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk
index d12173d79dad..f30a317e0aa4 100644
--- a/libwpd/makefile.mk
+++ b/libwpd/makefile.mk
@@ -41,8 +41,8 @@ TARGET=wpd
     @echo "Using system libwpd..."
 .ENDIF
 
-TARFILE_NAME=libwpd-0.8.14
-TARFILE_MD5=64d66018897d759358f454010b6e75d2
+TARFILE_NAME=libwpd-0.9.0
+TARFILE_MD5=86e390f015e505dd71a66f0123c62f09
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 BUILD_DIR=src$/lib
 
diff --git a/libwpd/prj/d.lst b/libwpd/prj/d.lst
index beb6d5879bde..ef6944359362 100644
--- a/libwpd/prj/d.lst
+++ b/libwpd/prj/d.lst
@@ -1,12 +1,15 @@
 mkdir: %_DEST%\inc%_EXT%\libwpd
+mkdir: %_DEST%\inc%_EXT%\libwpd-stream
 ..\%__SRC%\misc\build\libwpd*\src\lib\libwpd.h %_DEST%\inc%_EXT%\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\libwpd_types.h %_DEST%\inc%_EXT%\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXStream.h %_DEST%\inc%_EXT%\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPDocument.h %_DEST%\inc%_EXT%\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXBinaryData.h %_DEST%\inc%_EXT%\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXDocumentInterface.h %_DEST%\inc%_EXT%\libwpd\
 ..\%__SRC%\misc\build\libwpd*\src\lib\WPXProperty.h %_DEST%\inc%_EXT%\libwpd\
 ..\%__SRC%\misc\build\libwpd*\src\lib\WPXPropertyList.h %_DEST%\inc%_EXT%\libwpd\
 ..\%__SRC%\misc\build\libwpd*\src\lib\WPXString.h %_DEST%\inc%_EXT%\libwpd\
 ..\%__SRC%\misc\build\libwpd*\src\lib\WPXPropertyListVector.h %_DEST%\inc%_EXT%\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPDocument.h %_DEST%\inc%_EXT%\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXHLListenerImpl.h %_DEST%\inc%_EXT%\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\libwpd-stream.h %_DEST%\inc%_EXT%\libwpd-stream\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXStream.h %_DEST%\inc%_EXT%\libwpd-stream\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXStreamImplementation.h %_DEST%\inc%_EXT%\libwpd-stream\
 ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
 ..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib
diff --git a/libwpg/makefile.mk b/libwpg/makefile.mk
index 424fd9896c0c..0fa701f10075 100644
--- a/libwpg/makefile.mk
+++ b/libwpg/makefile.mk
@@ -46,10 +46,11 @@ TARGET=wpg
 INCPRE+=$(LIBWPD_CFLAGS)
 .ELSE
 INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
+INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream
 .ENDIF
 
-TARFILE_NAME=libwpg-0.1.3
-TARFILE_MD5=db556b750bf3eac8481a4cc5e29e5af1
+TARFILE_NAME=libwpg-0.2.0
+TARFILE_MD5=5ba6a61a2f66dfd5fee8cdd4cd262a37
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 BUILD_DIR=src/lib
 
diff --git a/libwpg/prj/d.lst b/libwpg/prj/d.lst
index d01a25a0c772..2093e0d69a26 100644
--- a/libwpg/prj/d.lst
+++ b/libwpg/prj/d.lst
@@ -1,16 +1,6 @@
 mkdir: %_DEST%\inc%_EXT%\libwpg
 ..\%__SRC%\misc\build\libwpg*\src\lib\libwpg.h %_DEST%\inc%_EXT%\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGBitmap.h %_DEST%\inc%_EXT%\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGBinaryData.h %_DEST%\inc%_EXT%\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGBrush.h %_DEST%\inc%_EXT%\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGColor.h %_DEST%\inc%_EXT%\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGGradient.h %_DEST%\inc%_EXT%\libwpg\
 ..\%__SRC%\misc\build\libwpg*\src\lib\WPGPaintInterface.h %_DEST%\inc%_EXT%\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGPath.h %_DEST%\inc%_EXT%\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGPen.h %_DEST%\inc%_EXT%\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGPoint.h %_DEST%\inc%_EXT%\libwpg\
 ..\%__SRC%\misc\build\libwpg*\src\lib\WPGraphics.h %_DEST%\inc%_EXT%\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGRect.h %_DEST%\inc%_EXT%\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGString.h %_DEST%\inc%_EXT%\libwpg\
 ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
 ..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib
diff --git a/libwps/libwps-0.2.0.patch b/libwps/libwps-0.2.0.patch
new file mode 100644
index 000000000000..6af2989b70af
--- /dev/null
+++ b/libwps/libwps-0.2.0.patch
@@ -0,0 +1,11 @@
+diff -up misc/build/libwps-0.2.0/src/lib/libwps_internal.h.old misc/build/libwps-0.2.0/src/lib/libwps_internal.h
+--- misc/build/libwps-0.2.0/src/lib/libwps_internal.h.old	2010-11-17 20:47:23.288507198 +0100
++++ misc/build/libwps-0.2.0/src/lib/libwps_internal.h	2010-11-17 20:47:26.596839807 +0100
+@@ -23,6 +23,7 @@
+ #define LIBWPS_INTERNAL_H
+ #ifdef DEBUG
+ #include <bitset>
++#include <stdio.h>
+ #endif
+ #include <libwpd-stream/libwpd-stream.h>
+ #include <libwpd/libwpd.h>
diff --git a/libwps/makefile.mk b/libwps/makefile.mk
index 3d9cefe0f4ed..3f9667bf008f 100644
--- a/libwps/makefile.mk
+++ b/libwps/makefile.mk
@@ -46,13 +46,16 @@ TARGET=wps
 INCPRE+=$(LIBWPD_CFLAGS)
 .ELSE
 INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
+INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream
 .ENDIF
 
-TARFILE_NAME=libwps-0.1.2
-TARFILE_MD5=799fc3b835a79adce8c88a3fee0150c1
+TARFILE_NAME=libwps-0.2.0
+TARFILE_MD5=9e436bff44c60dc8b97cba0c7fc11a5c
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 BUILD_DIR=src/lib
 
+PATCH_FILES=libwps-0.2.0.patch
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
diff --git a/libwps/prj/d.lst b/libwps/prj/d.lst
index fe897d7fd386..a71985a7ae1a 100644
--- a/libwps/prj/d.lst
+++ b/libwps/prj/d.lst
@@ -1,6 +1,5 @@
 mkdir: %_DEST%\inc%_EXT%\libwps
 ..\%__SRC%\misc\build\libwps*\src\lib\libwps.h %_DEST%\inc%_EXT%\libwps\
-..\%__SRC%\misc\build\libwps*\src\lib\WPSStream.h %_DEST%\inc%_EXT%\libwps\
 ..\%__SRC%\misc\build\libwps*\src\lib\WPSDocument.h %_DEST%\inc%_EXT%\libwps\
 ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
 ..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib
diff --git a/libxmlsec/prj/build.lst b/libxmlsec/prj/build.lst
index a4faaa8f00fa..75939b33892b 100644
--- a/libxmlsec/prj/build.lst
+++ b/libxmlsec/prj/build.lst
@@ -1,3 +1,3 @@
-ls  libxmlsec   : stlport soltools LIBXML2:libxml2 MOZ:moz SO:moz_prebuilt NULL
+ls  libxmlsec   : stlport soltools LIBXML2:libxml2 MOZ:moz NULL
 ls	libxmlsec			    usr1	-	all	ls_mkout NULL
 ls	libxmlsec			    nmake	-	all	ls_xmlsec1 NULL
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index c96a7484f38a..434ed1b368c8 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -305,7 +305,7 @@ void ConvDic::Save()
         {
             xSaxWriter = uno::Reference< io::XActiveDataSource >(
                     xServiceFactory->createInstance(
-                    OUString::createFromAscii( "com.sun.star.xml.sax.Writer" ) ), UNO_QUERY );
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer")) ), UNO_QUERY );
         }
         catch (uno::Exception &)
         {
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index 62c7426ba6eb..3f17d8f43da5 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -320,7 +320,7 @@ void SAL_CALL ConvDicNameContainer::removeByName( const OUString& rName )
         {
             ::ucbhelper::Content    aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ),
                                     uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > () );
-            aCnt.executeCommand( OUString::createFromAscii( "delete" ), makeAny( sal_Bool( sal_True ) ) );
+            aCnt.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), makeAny( sal_Bool( sal_True ) ) );
         }
         catch( ::com::sun::star::ucb::CommandAbortedException& )
         {
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index 2519aa0cea89..d1627898637c 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -792,7 +792,7 @@ sal_Int32 GrammarCheckingIterator::GetSuggestedEndOfSentence(
         uno::Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
         if ( xMSF.is() )
             xBreakIterator = uno::Reference < i18n::XBreakIterator >( xMSF->createInstance(
-                ::rtl::OUString::createFromAscii("com.sun.star.i18n.BreakIterator") ), uno::UNO_QUERY );
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")) ), uno::UNO_QUERY );
     }
     sal_Int32 nTextLen = rText.getLength();
     sal_Int32 nEndPosition = nTextLen;
diff --git a/linguistic/source/grammarchecker.cxx b/linguistic/source/grammarchecker.cxx
index 3085ee54e0bc..bf782c0579fd 100644
--- a/linguistic/source/grammarchecker.cxx
+++ b/linguistic/source/grammarchecker.cxx
@@ -163,10 +163,10 @@ uno::Sequence< linguistic2::SingleGrammarError > GrammarChecker::GrammarChecking
     Error_t aError;
     uno::Sequence< OUString > aSuggestion(1);
     OUString *pSeggestion = aSuggestion.getArray();
-    pSeggestion[0] = OUString::createFromAscii("Modified");
+    pSeggestion[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("Modified"));
 
-    aError[OUString::createFromAscii("GrammarError")]  = aSuggestion;
-    aError[OUString::createFromAscii("Grammar Error")] = aSuggestion;
+    aError[OUString(RTL_CONSTASCII_USTRINGPARAM("GrammarError"))]  = aSuggestion;
+    aError[OUString(RTL_CONSTASCII_USTRINGPARAM("Grammar Error"))] = aSuggestion;
 
     typedef std::vector< linguistic2::SingleGrammarError> ErrorVector_t;
     ErrorVector_t aErrorVector;
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index 179c61d6e934..4e102bf1aaa6 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -300,16 +300,10 @@ OUString LinguOptions::GetName( INT32 nWID )
     OUString aRes;
 
     INT32 nLen = SAL_N_ELEMENTS( aWID_Name );
-    if (0 <= nWID  &&  nWID < nLen
-        && aWID_Name[ nWID ].nWID == nWID)
-    {
-        aRes = OUString( RTL_CONSTASCII_USTRINGPARAM(
-                aWID_Name[ nWID ].pPropertyName ) );
-    }
+    if (0 <= nWID && nWID < nLen && aWID_Name[ nWID ].nWID == nWID)
+        aRes = OUString::createFromAscii(aWID_Name[nWID].pPropertyName);
     else
-    {
-        DBG_ASSERT( 0,"lng : unknown WID");
-    }
+        OSL_ENSURE(false, "lng : unknown WID");
 
     return aRes;
 }
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 3d665b819f41..136d85d6bf27 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -1795,7 +1795,7 @@ uno::Sequence< OUString > SAL_CALL
     OUString *pNames = aNames.getArray();
     if ( 0 == rServiceName.compareToAscii( SN_SPELLCHECKER ) )
     {
-        OUString aNode( OUString::createFromAscii( "ServiceManager/SpellCheckerList" ));
+        OUString aNode( RTL_CONSTASCII_USTRINGPARAM("ServiceManager/SpellCheckerList"));
         const uno::Sequence< OUString > aNodeEntries( GetNodeNames( aNode ) );
         if (lcl_SeqHasString( aNodeEntries, aCfgLocale ))
         {
@@ -1810,7 +1810,7 @@ uno::Sequence< OUString > SAL_CALL
     }
     else if ( 0 == rServiceName.compareToAscii( SN_GRAMMARCHECKER ) )
     {
-        OUString aNode( OUString::createFromAscii( "ServiceManager/GrammarCheckerList" ));
+        OUString aNode( RTL_CONSTASCII_USTRINGPARAM("ServiceManager/GrammarCheckerList"));
         const uno::Sequence< OUString > aNodeEntries( GetNodeNames( aNode ) );
         if (lcl_SeqHasString( aNodeEntries, aCfgLocale ))
         {
@@ -1825,7 +1825,7 @@ uno::Sequence< OUString > SAL_CALL
     }
     else if ( 0 == rServiceName.compareToAscii( SN_HYPHENATOR ) )
     {
-        OUString aNode( OUString::createFromAscii( "ServiceManager/HyphenatorList" ));
+        OUString aNode( RTL_CONSTASCII_USTRINGPARAM("ServiceManager/HyphenatorList"));
         const uno::Sequence< OUString > aNodeEntries( GetNodeNames( aNode ) );
         if (lcl_SeqHasString( aNodeEntries, aCfgLocale ))
         {
@@ -1840,7 +1840,7 @@ uno::Sequence< OUString > SAL_CALL
     }
     else if ( 0 == rServiceName.compareToAscii( SN_THESAURUS ) )
     {
-        OUString aNode( OUString::createFromAscii( "ServiceManager/ThesaurusList" ));
+        OUString aNode( RTL_CONSTASCII_USTRINGPARAM("ServiceManager/ThesaurusList"));
         const uno::Sequence< OUString > aNodeEntries( GetNodeNames( aNode ) );
         if (lcl_SeqHasString( aNodeEntries, aCfgLocale ))
         {
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
index e1a02b6b095a..020ff9abf32a 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
@@ -69,7 +69,7 @@ private:
     std::vector< OUString > m_vStringChunks;
     SvStream& m_InputStream;
 
-    bool CheckValidData( sal_Int8 nChar )
+    bool CheckValidData( sal_Int8 nChar ) const
     {
         if( ( nChar >= 0x20 && nChar <= 0x7E ) && ( nChar != 0X40 ) )
             return  true;
diff --git a/lotuswordpro/source/filter/genericfilter.cxx b/lotuswordpro/source/filter/genericfilter.cxx
index d6285353a56d..0e5a6da345ff 100644
--- a/lotuswordpro/source/filter/genericfilter.cxx
+++ b/lotuswordpro/source/filter/genericfilter.cxx
@@ -36,7 +36,7 @@ sal_Bool SAL_CALL component_writeInfo(
             sal_Int32 nPos = 0;
             Reference< XRegistryKey > xNewKey(
                 reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( LotusWordProImportFilter_getImplementationName() ) );
-            xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+            xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
 
             const Sequence< OUString > & rSNL = LotusWordProImportFilter_getSupportedServiceNames();
             const OUString * pArray = rSNL.getConstArray();
diff --git a/lotuswordpro/source/filter/lwp9reader.cxx b/lotuswordpro/source/filter/lwp9reader.cxx
index 63d28551dabd..16019b34de39 100644
--- a/lotuswordpro/source/filter/lwp9reader.cxx
+++ b/lotuswordpro/source/filter/lwp9reader.cxx
@@ -206,7 +206,7 @@ void Lwp9Reader::ParseDocument()
     pChangeMgr->ConvertAllChange(m_pStream);
 
     doc->Parse(m_pStream);
-    m_pStream->EndElement(::rtl::OUString::createFromAscii("office:body"));
+    m_pStream->EndElement(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("office:body")));
 
     WriteDocEnd();
 }
@@ -242,7 +242,7 @@ void Lwp9Reader::WriteDocHeader()
     pAttrList->AddAttribute( A2OUSTR("office:class"), A2OUSTR("text"));
     pAttrList->AddAttribute( A2OUSTR("office:version"), A2OUSTR("1.0"));
 
-    m_pStream->StartElement( ::rtl::OUString::createFromAscii("office:document") );
+    m_pStream->StartElement( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("office:document")) );
     pAttrList->Clear();
 
 }
@@ -251,7 +251,7 @@ void Lwp9Reader::WriteDocHeader()
  */
 void Lwp9Reader::WriteDocEnd()
 {
-    m_pStream->EndElement(::rtl::OUString::createFromAscii("office:document"));
+    m_pStream->EndElement(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("office:document")));
     m_pStream->EndDocument();
 }
 
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
index 57202172db64..939b7fcf3e86 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
@@ -103,21 +103,21 @@ rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOv
     if(!pPara || !pIndent || !pBullOver)
     {
 //      assert(false);
-        return rtl::OUString::createFromAscii("");
+        return rtl::OUString();
     }
 
     LwpSilverBullet* pSilverBullet = pPara->GetSilverBullet();
     if (!pSilverBullet)
     {
         assert(false);
-        return rtl::OUString::createFromAscii("");
+        return rtl::OUString();
     }
 
     LwpPara* pBulletPara = pSilverBullet->GetBulletPara();
     if (!pBulletPara)
     {
         assert(false);
-        return rtl::OUString::createFromAscii("");
+        return rtl::OUString();
     }
 
     LwpParaProperty* pProp = pPara->GetProperty(PP_LOCAL_INDENT);
@@ -185,7 +185,7 @@ rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOv
     }
     else
     {
-        rtl::OUString aPrefix = rtl::OUString::createFromAscii("");
+        rtl::OUString aPrefix = rtl::OUString();
 
         LwpFrib* pFrib = pBulletParaFribs->HasFrib(FRIB_TAG_DOCVAR);
         LwpFribDocVar* pDocVarFrib = NULL;
@@ -210,7 +210,7 @@ rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOv
         {
             for (sal_uInt8 nPos = 1; nPos < 10; nPos++)
             {
-                aPrefix = rtl::OUString::createFromAscii("");
+                aPrefix = rtl::OUString();
                 if (pParaNumber->GetStyleID() != NUMCHAR_other)
                 {
                     XFNumFmt aFmt;
@@ -223,7 +223,7 @@ rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOv
                     rtl::OUString aNumber = LwpSilverBullet::GetNumCharByStyleID(pParaNumber);
                     if (pParaNumber->GetStyleID() == NUMCHAR_01 || pParaNumber->GetStyleID() == NUMCHAR_Chinese4)
                     {
-                        aPrefix += rtl::OUString::createFromAscii("0");
+                        aPrefix += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0"));
                     }
                     aFmt.SetPrefix(aPrefix);
 
@@ -251,7 +251,7 @@ rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOv
                     }
 
                     pListStyle->SetListBullet(nPos, LwpSilverBullet::GetNumCharByStyleID(pParaNumber).toChar(),
-                        rtl::OUString::createFromAscii("Times New Roman"), aPrefix, aSuffix);
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Times New Roman")), aPrefix, aSuffix);
                 }
 
                 pListStyle->SetListPosition(nPos, 0.0, 0.635, 0.0);
@@ -281,7 +281,7 @@ rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOv
 
     if (!m_pFoundry)
     {
-        return rtl::OUString::createFromAscii("");
+        return rtl::OUString();
     }
     LwpFontManager* pFontMgr = m_pFoundry->GetFontManger();
 
@@ -293,7 +293,7 @@ rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOv
 
     for (sal_uInt8 nC = 1; nC < 11; nC++)
     {
-        pListStyle->SetListBullet(nC, cBulletChar, aFontName, rtl::OUString::createFromAscii(""), aSuffix);
+        pListStyle->SetListBullet(nC, cBulletChar, aFontName, rtl::OUString(), aSuffix);
 
         if (pIndent->GetMRest() > 0.001)
         {
@@ -555,10 +555,10 @@ rtl::OUString LwpBulletStyleMgr::GetDivisionName()
 {
     if (!m_pFoundry)
     {
-        return rtl::OUString::createFromAscii("");
+        return rtl::OUString();
     }
 
-    rtl::OUString aRet = rtl::OUString::createFromAscii("");
+    rtl::OUString aRet = rtl::OUString();
 
     LwpDocument* pDoc = m_pFoundry->GetDocument();
     if (pDoc)
@@ -578,13 +578,13 @@ rtl::OUString LwpBulletStyleMgr::GetSectionName(LwpPara* pPara)
     LwpObjectID* pStoryID = pPara->GetStoryID();
     if (pStoryID->IsNull())
     {
-        return rtl::OUString::createFromAscii("");
+        return rtl::OUString();
     }
 
     LwpStory* pStory = static_cast<LwpStory*>(pStoryID->obj(VO_STORY));
     if (!pStory)
     {
-        return rtl::OUString::createFromAscii("");
+        return rtl::OUString();
     }
 
     return pStory->GetSectionName();
diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx
index 8f2bb8bac648..92c6cc292ed5 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -90,8 +90,10 @@
  * @descr   Constructor of class LwpDrawObj
  * @param   pStream   The memory stream which contains the lwp-sdw draw objects
  */
-LwpDrawObj::LwpDrawObj(SvStream * pStream, DrawingOffsetAndScale* pTransData) :
-m_pStream(pStream), m_pTransData(pTransData), m_eType(OT_UNDEFINED)
+LwpDrawObj::LwpDrawObj(SvStream * pStream, DrawingOffsetAndScale* pTransData)
+    : m_eType(OT_UNDEFINED)
+    , m_pStream(pStream)
+    , m_pTransData(pTransData)
 {
     this->ReadObjHeaderRecord();
 }
@@ -338,31 +340,31 @@ rtl::OUString LwpDrawObj::GetArrowName(sal_uInt8 nArrowStyle)
     {
     default:
     case AH_ARROW_FULLARROW:
-        aArrowName = rtl::OUString::createFromAscii("Symmetric arrow");
+        aArrowName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Symmetric arrow"));
         break;
     case AH_ARROW_HALFARROW:
-        aArrowName = rtl::OUString::createFromAscii("Arrow concave");
+        aArrowName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Arrow concave"));
         break;
     case AH_ARROW_LINEARROW:
-        aArrowName = rtl::OUString::createFromAscii("arrow100");
+        aArrowName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("arrow100"));
         break;
     case AH_ARROW_INVFULLARROW:
-        aArrowName = rtl::OUString::createFromAscii("reverse arrow");
+        aArrowName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("reverse arrow"));
         break;
     case AH_ARROW_INVHALFARROW:
-        aArrowName = rtl::OUString::createFromAscii("reverse concave arrow");
+        aArrowName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("reverse concave arrow"));
         break;
     case AH_ARROW_INVLINEARROW:
-        aArrowName = rtl::OUString::createFromAscii("reverse line arrow");
+        aArrowName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("reverse line arrow"));
         break;
     case AH_ARROW_TEE:
-        aArrowName = rtl::OUString::createFromAscii("Dimension lines");
+        aArrowName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Dimension lines"));
         break;
     case AH_ARROW_SQUARE:
-        aArrowName = rtl::OUString::createFromAscii("Square");
+        aArrowName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Square"));
         break;
     case AH_ARROW_CIRCLE:
-        aArrowName = rtl::OUString::createFromAscii("Circle");
+        aArrowName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Circle"));
         break;
     }
 
diff --git a/lotuswordpro/source/filter/lwpdrawobj.hxx b/lotuswordpro/source/filter/lwpdrawobj.hxx
index 3f485ac4cfb8..a899d298f791 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.hxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.hxx
@@ -156,7 +156,7 @@ public:
 
 protected:
     virtual void Read() {}
-    virtual rtl::OUString RegisterStyle() { return rtl::OUString::createFromAscii(""); }
+    virtual rtl::OUString RegisterStyle() { return rtl::OUString(); }
     virtual XFFrame* CreateDrawObj(const rtl::OUString& /*rStyleName*/) { return NULL; }
     virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& /*rStyleName*/) { return NULL; }
 };
@@ -350,7 +350,7 @@ public:
 
 protected:
     virtual void Read();
-    virtual rtl::OUString RegisterStyle() {return rtl::OUString::createFromAscii("");}
+    virtual rtl::OUString RegisterStyle() {return rtl::OUString();}
     virtual XFFrame* CreateDrawObj(const rtl::OUString& /*rStyleName*/){return NULL;}
     virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& /*rStyleName*/){return NULL;}
 };
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx
index 34836c8b7921..74783f3ea7d4 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -117,9 +117,9 @@ sal_Bool LWPFilterReader::filter( const Sequence< PropertyValue >& aDescriptor )
     ::rtl::OUString sURL;
     for( sal_Int32 i = 0; i < aDescriptor.getLength(); i++ )
     {
-        if( aDescriptor[i].Name == OUString::createFromAscii( "InputStream" ) )
+        if( aDescriptor[i].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream")) )
             aDescriptor[i].Value >>= xInputStream;
-        if( aDescriptor[i].Name == OUString::createFromAscii( "URL" ) )
+        if( aDescriptor[i].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) )
             aDescriptor[i].Value >>= sURL;
     }
 
@@ -165,7 +165,7 @@ LWPFilterImportFilter::LWPFilterImportFilter( const uno::Reference< XMultiServic
 
     try
     {
-        uno::Reference< XDocumentHandler > xDoc( xFact->createInstance( OUString::createFromAscii( STR_WRITER_IMPORTER_NAME ) ), UNO_QUERY );
+        uno::Reference< XDocumentHandler > xDoc( xFact->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( STR_WRITER_IMPORTER_NAME )) ), UNO_QUERY );
 
         LWPFilterReader *p = new LWPFilterReader;
         p->setDocumentHandler( xDoc );
@@ -206,12 +206,12 @@ void LWPFilterImportFilter::setTargetDocument( const uno::Reference< XComponent
 
 OUString LWPFilterImportFilter::getImplementationName_Static() throw()
 {
-    return OUString::createFromAscii( STR_IMPLEMENTATION_NAME );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( STR_IMPLEMENTATION_NAME ));
 }
 
 OUString LWPFilterImportFilter::getImplementationName() throw()
 {
-    return OUString::createFromAscii( STR_IMPLEMENTATION_NAME );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( STR_IMPLEMENTATION_NAME ));
 }
 
 sal_Bool LWPFilterImportFilter::supportsService( const OUString& ServiceName ) throw()
@@ -230,7 +230,7 @@ sal_Bool LWPFilterImportFilter::supportsService( const OUString& ServiceName ) t
 Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) throw()
 {
     Sequence< OUString > seq(1);
-    seq.getArray()[0] = OUString::createFromAscii( STR_SERVICE_NAME );
+    seq.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( STR_SERVICE_NAME ));
     return seq;
 }
 
@@ -261,7 +261,7 @@ Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) thro
     {
         OUString strTemp;
         aDescriptor[i].Value >>= strTemp;
-        if( aDescriptor[i].Name == OUString::createFromAscii( "InputStream" ) )
+        if( aDescriptor[i].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream")) )
         {
             uno::Reference< XInputStream> rInputStream;
             aDescriptor[i].Value >>= rInputStream;
@@ -276,19 +276,19 @@ Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) thro
                     if(!bOpenAsTemplate)
                     {
                         aDescriptor.realloc( nPropertyCount + 1 );
-                        aDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("AsTemplate");
+                        aDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AsTemplate"));
                         aDescriptor[nPropertyCount].Value <<= sal_True;
                     }
-                    return OUString::createFromAscii("wordpro_template");
+                    return OUString(RTL_CONSTASCII_USTRINGPARAM("wordpro_template"));
                 }
                 else
                 {
-                    return OUString::createFromAscii("wordpro");
+                    return OUString(RTL_CONSTASCII_USTRINGPARAM("wordpro"));
                 }
             }
             return ret;
         }
-        else if( aDescriptor[i].Name == OUString::createFromAscii( "URL" ) )
+        else if( aDescriptor[i].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) )
         {
                     OUString        sURL;
             OUString        sFileName;
@@ -311,14 +311,14 @@ Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) thro
                     if(!bOpenAsTemplate)
                     {
                         aDescriptor.realloc( nPropertyCount + 1 );
-                        aDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("AsTemplate");
+                        aDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AsTemplate"));
                         aDescriptor[nPropertyCount].Value <<= sal_True;
                     }
-                    return OUString::createFromAscii("wordpro_template");
+                    return OUString(RTL_CONSTASCII_USTRINGPARAM("wordpro_template"));
                 }
                 else
                 {
-                    return OUString::createFromAscii("wordpro");
+                    return OUString(RTL_CONSTASCII_USTRINGPARAM("wordpro"));
                 }
             }
             return ret;
diff --git a/lotuswordpro/source/filter/lwpfont.cxx b/lotuswordpro/source/filter/lwpfont.cxx
index 6273871a31e1..e421d2cc3b98 100644
--- a/lotuswordpro/source/filter/lwpfont.cxx
+++ b/lotuswordpro/source/filter/lwpfont.cxx
@@ -269,7 +269,7 @@ OUString LwpFontTable::GetFaceName(sal_uInt16 index) //index: start from 1
 {
     assert(index>0);
     if (index < 1)//add by , for fix crash,2005/12/20
-        return OUString::createFromAscii("");//add end
+        return OUString();//add end
     return m_pFontEntries[index-1].GetFaceName();
 }
 
diff --git a/lotuswordpro/source/filter/lwpfribmark.cxx b/lotuswordpro/source/filter/lwpfribmark.cxx
index a8f61b2783dc..fb2bd846edef 100644
--- a/lotuswordpro/source/filter/lwpfribmark.cxx
+++ b/lotuswordpro/source/filter/lwpfribmark.cxx
@@ -657,7 +657,7 @@ void LwpFribField::RegisterDateTimeStyle(OUString sFormula)
         else if (sFormula == A2OUSTR("%FLeeeeoa") || sFormula == A2OUSTR("%FLffffooaa") || sFormula == A2OUSTR("%FLEEEEOA"))
         {
             pDateStyle = new XFDateStyle;
-    //      OUString lang = OUString::createFromAscii("zh-CN");
+    //      OUString lang(RTL_CONSTASCII_USTRINGPARAM("zh-CN"));
     //      pDateStyle->SetLanguage( lang);
             rtl::OUString sText;
             pDateStyle->AddYear();
diff --git a/lotuswordpro/source/filter/lwpsilverbullet.cxx b/lotuswordpro/source/filter/lwpsilverbullet.cxx
index 6e76f195b47b..ced9019be7b1 100644
--- a/lotuswordpro/source/filter/lwpsilverbullet.cxx
+++ b/lotuswordpro/source/filter/lwpsilverbullet.cxx
@@ -181,7 +181,7 @@ void LwpSilverBullet::RegisterStyle()
                     }
 
                     pListStyle->SetListBullet(nPos, this->GetNumCharByStyleID(pParaNumber).toChar(),
-                        rtl::OUString::createFromAscii("Times New Roman"), aPrefix, aSuffix);
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Times New Roman")), aPrefix, aSuffix);
                 }
 
                 pListStyle->SetListPosition(nPos, 0.0, 0.635, 0.0);
@@ -215,13 +215,13 @@ rtl::OUString LwpSilverBullet::GetBulletFontName()
     //foundry has been set?
     if (!m_pFoundry)
     {
-        return rtl::OUString::createFromAscii("");
+        return rtl::OUString();
     }
 
     LwpFontManager* pFontMgr = m_pFoundry->GetFontManger();
     if (!pFontMgr)
     {
-        return rtl::OUString::createFromAscii("");
+        return rtl::OUString();
     }
 
     sal_uInt32 nBulletFontID = m_pBulletPara->GetBulletFontID();
@@ -230,7 +230,7 @@ rtl::OUString LwpSilverBullet::GetBulletFontName()
     //final fontid is valid?
     if (nFinalFont > 255 || nFinalFont == 0)
     {
-        return rtl::OUString::createFromAscii("");
+        return rtl::OUString();
     }
 
     //get font name from font manager.
@@ -252,12 +252,12 @@ UChar32 LwpSilverBullet::GetBulletChar()
 
 rtl::OUString LwpSilverBullet::GetPrefix()
 {
-    return rtl::OUString::createFromAscii("");
+    return rtl::OUString();
 }
 
 rtl::OUString LwpSilverBullet::GetSuffix()
 {
-    return rtl::OUString::createFromAscii("");
+    return rtl::OUString();
 }
 /**
  * @short:   Get the LwpPara object through story id.
@@ -290,10 +290,10 @@ rtl::OUString LwpSilverBullet::GetNumCharByStyleID(LwpFribParaNumber* pParaNumbe
     if (!pParaNumber)
     {
         assert(false);
-        return rtl::OUString::createFromAscii("");
+        return rtl::OUString();
     }
 
-    rtl::OUString strNumChar = rtl::OUString::createFromAscii("1");
+    rtl::OUString strNumChar(RTL_CONSTASCII_USTRINGPARAM("1"));
     sal_uInt16 nStyleID = pParaNumber->GetStyleID();
     UChar32 uC = 0x0000;
 
@@ -302,19 +302,19 @@ rtl::OUString LwpSilverBullet::GetNumCharByStyleID(LwpFribParaNumber* pParaNumbe
     case NUMCHAR_1:
     case NUMCHAR_01:
     case NUMCHAR_Chinese4:
-        strNumChar =  rtl::OUString::createFromAscii("1");
+        strNumChar =  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1"));
         break;
     case NUMCHAR_A :
-        strNumChar =  rtl::OUString::createFromAscii("A");
+        strNumChar =  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("A"));
         break;
     case NUMCHAR_a:
-        strNumChar = rtl::OUString::createFromAscii("a");
+        strNumChar = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("a"));
         break;
     case NUMCHAR_I:
-        strNumChar = rtl::OUString::createFromAscii("I");
+        strNumChar = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("I"));
         break;
     case NUMCHAR_i:
-        strNumChar = rtl::OUString::createFromAscii("i");
+        strNumChar = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("i"));
         break;
     case NUMCHAR_other:
         uC = static_cast<UChar32>(pParaNumber->GetNumberChar());
@@ -339,7 +339,7 @@ rtl::OUString LwpSilverBullet::GetNumCharByStyleID(LwpFribParaNumber* pParaNumbe
         }
         break;
     case NUMCHAR_none:
-        strNumChar = rtl::OUString::createFromAscii("");
+        strNumChar = rtl::OUString();
         break;
     default:
         break;
@@ -390,7 +390,7 @@ sal_uInt16 LwpSilverBullet::GetDisplayLevel(sal_uInt8 nPos)
  */
 rtl::OUString LwpSilverBullet::GetAdditionalName(sal_uInt8 nPos)
 {
-    rtl::OUString aRet = rtl::OUString::createFromAscii("");
+    rtl::OUString aRet = rtl::OUString();
     sal_uInt16 nHideBit = (1 << nPos);
     sal_Bool bDivisionName = sal_False;
     sal_Bool bSectionName = sal_False;
@@ -398,7 +398,7 @@ rtl::OUString LwpSilverBullet::GetAdditionalName(sal_uInt8 nPos)
     LwpFrib* pParaFrib = m_pBulletPara->GetFribs()->GetFribs();
     if (!pParaFrib)
     {
-        return rtl::OUString::createFromAscii("");
+        return rtl::OUString();
     }
 
     while (pParaFrib)
@@ -408,7 +408,7 @@ rtl::OUString LwpSilverBullet::GetAdditionalName(sal_uInt8 nPos)
             ModifierInfo* pMoInfo = pParaFrib->GetModifiers();
             if (!pMoInfo)
             {
-                return rtl::OUString::createFromAscii("");
+                return rtl::OUString();
             }
             sal_uInt16 nHideLevels = pMoInfo->aTxtAttrOverride.GetHideLevels();
             sal_uInt16 nType = static_cast<LwpFribDocVar*>(pParaFrib)->GetType();
@@ -444,10 +444,10 @@ rtl::OUString LwpSilverBullet::GetDivisionName()
 {
     if (!m_pFoundry)
     {
-        return rtl::OUString::createFromAscii("");
+        return rtl::OUString();
     }
 
-    rtl::OUString aRet = rtl::OUString::createFromAscii("");
+    rtl::OUString aRet = rtl::OUString();
 
     LwpDocument* pDoc = m_pFoundry->GetDocument();
     if (pDoc)
@@ -467,7 +467,7 @@ rtl::OUString LwpSilverBullet::GetSectionName()
     LwpStory* pStory = static_cast<LwpStory*>(m_aStory.obj(VO_STORY));
     if (!pStory)
     {
-        return rtl::OUString::createFromAscii("");
+        return rtl::OUString();
     }
 
     return pStory->GetSectionName();
diff --git a/lotuswordpro/source/filter/schxmlwrapper.cxx b/lotuswordpro/source/filter/schxmlwrapper.cxx
index 87c47fa066c2..17ad276e9dc9 100644
--- a/lotuswordpro/source/filter/schxmlwrapper.cxx
+++ b/lotuswordpro/source/filter/schxmlwrapper.cxx
@@ -290,7 +290,7 @@ sal_Int32 SchXMLWrapper::Import()
 
     // get the sax parser component
     uno::Reference< xml::sax::XParser > xXMLParser(
-        xServiceFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Parser" )),
+        xServiceFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser"))),
         uno::UNO_QUERY );
 
     if( ! xXMLParser.is() )
diff --git a/lotuswordpro/source/filter/xfilter/xfchartstreamtools.cxx b/lotuswordpro/source/filter/xfilter/xfchartstreamtools.cxx
index 3901380c1c7f..9923911936c7 100644
--- a/lotuswordpro/source/filter/xfilter/xfchartstreamtools.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfchartstreamtools.cxx
@@ -89,7 +89,7 @@ void XFChartStreamTools::ParseStream(SvStorageStreamRef rInpStream, Reference<XD
             return;
         }
         xParser = uno::Reference< xml::sax::XParser > (
-            xServiceFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Parser" )),
+            xServiceFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser"))),
             uno::UNO_QUERY );
 
         if( ! xParser.is() )
diff --git a/lotuswordpro/source/filter/xfilter/xflist.cxx b/lotuswordpro/source/filter/xfilter/xflist.cxx
index ed49dc7bcadd..ec674b24611c 100644
--- a/lotuswordpro/source/filter/xfilter/xflist.cxx
+++ b/lotuswordpro/source/filter/xfilter/xflist.cxx
@@ -77,6 +77,7 @@ XFList::XFList(sal_Bool ordered)
 {
     m_bOrdered = ordered;
     m_bContinueNumber = sal_False;
+    m_pHeader = NULL;
 }
 
 XFList::~XFList()
diff --git a/lotuswordpro/source/filter/xfilter/xftextcontent.cxx b/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
index d2921e4452cd..c728ad57b87e 100644
--- a/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
@@ -90,8 +90,8 @@ rtl::OUString XFTextContent::GetText()
 void    XFTextContent::ToXml(IXFStream *pStrm)
 {
 //  pStrm->Characters(m_strText);
-    rtl::OUString sSpaceToken = rtl::OUString::createFromAscii(" ");
-    sSpaceToken += rtl::OUString::createFromAscii(" ");
+    rtl::OUString sSpaceToken(RTL_CONSTASCII_USTRINGPARAM(" "));
+    sSpaceToken += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
     rtl::OUString sSubString;
     sal_Int32 nIndex = 0;
     sal_Int32 nSize = m_strText.getLength();
diff --git a/lotuswordpro/source/filter/xfilter/xftextstyle.cxx b/lotuswordpro/source/filter/xfilter/xftextstyle.cxx
index 01e8401a4dc7..10bb786f53bb 100644
--- a/lotuswordpro/source/filter/xfilter/xftextstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextstyle.cxx
@@ -120,12 +120,12 @@ void    XFTextStyle::ToXml(IXFStream *strm)
 
     pAttrList->Clear();
     if( style.getLength() )
-        pAttrList->AddAttribute(rtl::OUString::createFromAscii("style:name"),GetStyleName());
+        pAttrList->AddAttribute(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("style:name")),GetStyleName());
     if( GetParentStyleName().getLength() > 0 )
         pAttrList->AddAttribute(A2OUSTR("style:parent-style-name"),GetParentStyleName());
 
-    pAttrList->AddAttribute(rtl::OUString::createFromAscii("style:family"),A2OUSTR("text") );
-    strm->StartElement(rtl::OUString::createFromAscii("style:style"));
+    pAttrList->AddAttribute(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("style:family")),A2OUSTR("text") );
+    strm->StartElement(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("style:style")));
 
     //Font properties:
     pAttrList->Clear();
@@ -133,10 +133,10 @@ void    XFTextStyle::ToXml(IXFStream *strm)
     if( m_pFont )
         m_pFont->ToXml(strm);
 
-    strm->StartElement(rtl::OUString::createFromAscii("style:properties"));
-    strm->EndElement(rtl::OUString::createFromAscii("style:properties"));
+    strm->StartElement(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("style:properties")));
+    strm->EndElement(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("style:properties")));
 
-    strm->EndElement(rtl::OUString::createFromAscii("style:style"));
+    strm->EndElement(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("style:style")));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/moz/prj/build.lst b/moz/prj/build.lst
index 717c309da96e..02c1bae213df 100644
--- a/moz/prj/build.lst
+++ b/moz/prj/build.lst
@@ -1,4 +1,4 @@
-moz	moz : solenv SO:so_prereq NSS:nss NULL
+moz	moz : solenv NSS:nss NULL
 moz	moz				usr1	-	all	moz_mkout NULL
 moz	moz				nmake	-	all	moz_mozilla     NULL
 moz	moz\zipped			nmake	-	all	moz_zipped	moz_mozilla NULL
diff --git a/mysqlc/source/description.xml b/mysqlc/source/description.xml
index 458ee6efb4d1..4980e27256a7 100755
--- a/mysqlc/source/description.xml
+++ b/mysqlc/source/description.xml
@@ -16,7 +16,6 @@
     </publisher>
     <icon>
         <default xlink:href="images/extension_32.png" />
-        <high-contrast xlink:href="images/extension_32_h.png" />
     </icon>
     <extension-description>
         <src lang="#LANG#" xlink:href="description/description_#LANG#.txt"/>
diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk
index 49c67344698f..468504978d6c 100755
--- a/mysqlc/source/makefile.mk
+++ b/mysqlc/source/makefile.mk
@@ -225,9 +225,7 @@ COMPONENT_LIBRARIES=\
             $(COMPONENT_LIBRARY)
 
 COMPONENT_IMAGES= \
-    $(EXTENSIONDIR)$/images$/extension_32.png \
-    $(EXTENSIONDIR)$/images$/extension_32_h.png
-
+    $(EXTENSIONDIR)$/images$/extension_32.png
 
 # ........ component description ........
 # one file for each WITH_LANG token
diff --git a/odk/configure.pl b/odk/configure.pl
index c02755c56772..c03fe0081c17 100755
--- a/odk/configure.pl
+++ b/odk/configure.pl
@@ -5,6 +5,7 @@
 #
 
 use IO::File;
+use File::Basename;
 
 $main::hostname= $ARGV[0];
 $main::sdkpath= $ARGV[1];
@@ -549,15 +550,26 @@ sub resolveLink
 {
     my $base= shift;
     my $link= shift;
-    my $linktarget =  readlink "$base/$link";
+
+    my $resolvedpath = "$base/$link";
+    my $linktarget =  readlink "$resolvedpath";
     my $resolvedlink = "";
 
     while ( $linktarget ne "") {
-    $link = $linktarget;
-    $linktarget = readlink "$base/$link";
+
+    if ( $linktarget =~ m/^\/.*/ )
+    {
+        $resolvedpath = "$linktarget";
+    } else {
+        $resolvedpath = `cd $base/$linktarget; pwd`;
+        chop $resolvedpath;
     }
+    $base = dirname("$resolvedpath");
 
-    $resolvedlink = `cd $base/$link; pwd`;
+    $linktarget = readlink "$resolvedpath";
+    }
+
+    $resolvedlink = `cd $resolvedpath; pwd`;
     chop $resolvedlink;
     return $resolvedlink;
 }
@@ -573,6 +585,7 @@ sub searchprog
     {
         if ( $main::operatingSystem =~ m/darwin/ ) {
             $progDir = resolveLink("/System/Library/Frameworks/JavaVM.Framework/Versions", "CurrentJDK");
+
             if ( -e "$progDir/$main::OO_SDK_JAVA_BIN_DIR/javac" )
             {
                 return "$progDir/$main::OO_SDK_JAVA_BIN_DIR";
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
index 1e52822705b8..05e34cbd8153 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
@@ -109,12 +109,12 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV
         else if(!pBegin->Name.compareToAscii(pUser))
         {
             pBegin->Value >>= aUID;
-            aDSN = aDSN + ::rtl::OUString::createFromAscii(";UID=") + aUID;
+            aDSN = aDSN + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";UID=")) + aUID;
         }
         else if(!pBegin->Name.compareToAscii(pPwd))
         {
             pBegin->Value >>= aPWD;
-            aDSN = aDSN + ::rtl::OUString::createFromAscii(";PWD=") + aPWD;
+            aDSN = aDSN + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";PWD=")) + aPWD;
         }
         else if(!pBegin->Name.compareToAscii(pUseCatalog))
         {
@@ -123,7 +123,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV
         else if(!pBegin->Name.compareToAscii(pSysDrv))
         {
             pBegin->Value >>= aSysDrvSettings;
-            aDSN += ::rtl::OUString::createFromAscii(";");
+            aDSN += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
             aDSN += aSysDrvSettings;
         }
     }
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx
index 0a8bf55cbed1..ac21ce7ea941 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx
@@ -213,7 +213,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLExc
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getIdentifierQuoteString(  ) throw(SQLException, RuntimeException)
 {
     // normally this is "
-    ::rtl::OUString aVal = ::rtl::OUString::createFromAscii("\"");
+    ::rtl::OUString aVal(RTL_CONSTASCII_USTRINGPARAM("\""));
     return aVal;
 }
 // -------------------------------------------------------------------------
@@ -557,7 +557,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQL
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue = ::rtl::OUString::createFromAscii("sdbc:skeleton:");
+    ::rtl::OUString aValue(RTL_CONSTASCII_USTRINGPARAM("sdbc:skeleton:"));
     return aValue;
 }
 // -------------------------------------------------------------------------
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx
index 6e3521d8b878..83984ec95e2c 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx
@@ -79,7 +79,7 @@ void SkeletonDriver::disposing()
 //------------------------------------------------------------------------------
 rtl::OUString SkeletonDriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return rtl::OUString::createFromAscii("com.sun.star.comp.sdbc.SkeletonDriver");
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdbc.SkeletonDriver"));
         // this name is referenced in the configuration and in the skeleton.xml
         // Please take care when changing it.
 }
@@ -89,7 +89,7 @@ Sequence< ::rtl::OUString > SkeletonDriver::getSupportedServiceNames_Static(  )
     // which service is supported
     // for more information @see com.sun.star.sdbc.Driver
     Sequence< ::rtl::OUString > aSNS( 1 );
-    aSNS[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.Driver");
+    aSNS[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver"));
     return aSNS;
 }
 
@@ -134,7 +134,7 @@ sal_Bool SAL_CALL SkeletonDriver::acceptsURL( const ::rtl::OUString& url )
 {
     // here we have to look if we support this url format
     // change the URL format to your needs, but please aware that the first on who accepts the URl wins.
-    return (!url.compareTo(::rtl::OUString::createFromAscii("sdbc:skeleton:"),14));
+    return (!url.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:skeleton:")),14));
 }
 // --------------------------------------------------------------------------------
 Sequence< DriverPropertyInfo > SAL_CALL SkeletonDriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx
index 985ddb032fc5..7a9f8454dae6 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx
@@ -57,14 +57,14 @@ using namespace com::sun::star::util;
 //  IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet");
 ::rtl::OUString SAL_CALL OResultSet::getImplementationName(  ) throw ( RuntimeException)    \
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.skeleton.ResultSet");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.skeleton.ResultSet"));
 }
 // -------------------------------------------------------------------------
  Sequence< ::rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames(  ) throw( RuntimeException)
 {
      Sequence< ::rtl::OUString > aSupported(2);
-    aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.ResultSet");
-    aSupported[1] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.ResultSet");
+    aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ResultSet"));
+    aSupported[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ResultSet"));
     return aSupported;
 }
 // -------------------------------------------------------------------------
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx
index 86ec005351ae..eda38de35d78 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx
@@ -80,7 +80,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(
 
 ::rtl::OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("Column") + ::rtl::OUString::valueOf(column);
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Column")) + ::rtl::OUString::valueOf(column);
 }
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException)
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
index fdfedd684766..2341582cdc03 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
@@ -66,10 +66,9 @@ void REGISTER_PROVIDER(
         const Sequence< OUString>& Services,
         const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
 {
-    OUString aMainKeyName;
-    aMainKeyName = OUString::createFromAscii("/");
+    OUString aMainKeyName(RTL_CONSTASCII_USTRINGPARAM("/"));
     aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString::createFromAscii("/UNO/SERVICES");
+    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
 
     Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
     OSL_ENSURE(xNewKey.is(), "SKELETON::component_writeInfo : could not create a registry key !");
diff --git a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/META-INF/manifest.xml b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/META-INF/manifest.xml
index a7b501ba1b82..2334c0892b20 100644
--- a/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/META-INF/manifest.xml
+++ b/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/META-INF/manifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<manifest:manifest>
+<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
  <manifest:file-entry manifest:full-path="DialogWithHelp/" manifest:media-type="application/vnd.sun.star.basic-library"/>
  <manifest:file-entry manifest:media-type="application/vnd.sun.star.help" manifest:full-path="help"/>
  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" manifest:full-path="Addons.xcu"/>
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
index c6f5f9629453..badd3bdb5cca 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
@@ -67,7 +67,7 @@ sal_Bool SAL_CALL component_writeInfo(
         {
             Reference< XRegistryKey > xNewKey(
                 reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( FilterDetect_getImplementationName() ) );
-            xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+            xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
 
             const Sequence< OUString > & rSNL = FilterDetect_getSupportedServiceNames();
             const OUString * pArray = rSNL.getConstArray();
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx
index e6bbe85cb2c7..8db6e8e8f59e 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx
@@ -96,7 +96,7 @@ OUString SAL_CALL FilterDetect::detect(Sequence< PropertyValue >& aArguments )
     {
         // open the stream if it was not suplied by the framework
         Reference< XSimpleFileAccess > xSFI(mxMSF->createInstance(
-            OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess" )), UNO_QUERY);
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), UNO_QUERY);
         if (sURL.getLength() > 0 && xSFI.is())
         {
             try
@@ -151,25 +151,25 @@ OUString SAL_CALL FilterDetect::detect(Sequence< PropertyValue >& aArguments )
             // return type for class found
             if      (aMimeType.equals("application/x-vnd.oasis.opendocument.text") ||
                        aMimeType.equals("application/vnd.oasis.opendocument.text"))
-                sTypeName = OUString::createFromAscii("devguide_FlatXMLType_Cpp_writer");
+                sTypeName = OUString(RTL_CONSTASCII_USTRINGPARAM("devguide_FlatXMLType_Cpp_writer"));
             else if (aMimeType.equals("application/x-vnd.oasis.opendocument.text-master") ||
                        aMimeType.equals("application/vnd.oasis.opendocument.text-master"))
-                sTypeName = OUString::createFromAscii("devguide_FlatXMLType_Cpp_master");
+                sTypeName = OUString(RTL_CONSTASCII_USTRINGPARAM("devguide_FlatXMLType_Cpp_master"));
            else if (aMimeType.equals("application/x-vnd.oasis.openoffice.text-global") ||
                       aMimeType.equals("application/vnd.oasis.openoffice.text-global"))
-                sTypeName = OUString::createFromAscii("devguide_FlatXMLType_Cpp_master");
+                sTypeName = OUString(RTL_CONSTASCII_USTRINGPARAM("devguide_FlatXMLType_Cpp_master"));
            else if (aMimeType.equals("application/x-vnd.oasis.opendocument.spreadsheet") ||
                        aMimeType.equals("application/vnd.oasis.opendocument.spreadsheet"))
-                sTypeName = OUString::createFromAscii("devguide_FlatXMLType_Cpp_calc");
+                sTypeName = OUString(RTL_CONSTASCII_USTRINGPARAM("devguide_FlatXMLType_Cpp_calc"));
             else if (aMimeType.equals("application/x-vnd.oasis.opendocument.drawing") ||
                        aMimeType.equals("application/vnd.oasis.opendocument.drawing"))
-                sTypeName = OUString::createFromAscii("devguide_FlatXMLType_Cpp_draw");
+                sTypeName = OUString(RTL_CONSTASCII_USTRINGPARAM("devguide_FlatXMLType_Cpp_draw"));
             else if (aMimeType.equals("application/x-vnd.oasis.opendocument.presentation") ||
                        aMimeType.equals("application/vnd.oasis.opendocument.presentation"))
-                sTypeName = OUString::createFromAscii("devguide_FlatXMLType_Cpp_impress");
+                sTypeName = OUString(RTL_CONSTASCII_USTRINGPARAM("devguide_FlatXMLType_Cpp_impress"));
             else if (aMimeType.equals("application/x-vnd.oasis.opendocument.presentation") ||
                        aMimeType.equals("application/vnd.oasis.opendocument.presentation"))
-                sTypeName = OUString::createFromAscii("devguide_FlatXMLType_Cpp_impress");
+                sTypeName = OUString(RTL_CONSTASCII_USTRINGPARAM("devguide_FlatXMLType_Cpp_impress"));
         }
     }
     return sTypeName;
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
index 6935eb351f55..c171e56d3145 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
@@ -162,7 +162,7 @@ sal_Bool XFlatXml::importer(
     // create SAX parser that will read the document file
     // and provide events to xHandler passed to this call
     Reference < XParser > xSaxParser( m_rServiceFactory->createInstance(
-        OUString::createFromAscii("com.sun.star.xml.sax.Parser")), UNO_QUERY );
+        OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser"))), UNO_QUERY );
     OSL_ASSERT(xSaxParser.is());
     if(!xSaxParser.is())return sal_False;
 
@@ -213,7 +213,7 @@ sal_Bool XFlatXml::exporter(
         // get the document writer
         m_rDocumentHandler = Reference<XExtendedDocumentHandler>(
             m_rServiceFactory->createInstance(
-            OUString::createFromAscii("com.sun.star.xml.sax.Writer")),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer"))),
                 UNO_QUERY);
         OSL_ASSERT(m_rDocumentHandler.is());
         if (!m_rDocumentHandler.is()) return sal_False;
@@ -303,8 +303,8 @@ Sequence< OUString > getSupportedServiceNames()
         if( !pNames )
         {
             static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = OUString::createFromAscii(
-                "devguide.officedev.samples.filter.FlatXmlCpp");
+            seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "devguide.officedev.samples.filter.FlatXmlCpp"));
             pNames = &seqNames;
         }
     }
@@ -333,7 +333,7 @@ sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void * pRegistryKe
         {
             Reference< XRegistryKey > xNewKey(
                 reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-                    OUString::createFromAscii( "/" IMPLEMENTATION_NAME "/UNO/SERVICES" ) ) );
+                    OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLEMENTATION_NAME "/UNO/SERVICES" )) ) );
 
             const Sequence< OUString > & rSNL = getSupportedServiceNames();
             const OUString * pArray = rSNL.getConstArray();
diff --git a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx
index 9b476874ce26..a02b184047da 100644
--- a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx
+++ b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx
@@ -61,7 +61,7 @@ SAL_IMPLEMENT_MAIN()
     // instantiate a sample service with the servicemanager.
     Reference< XInterface > rInstance =
         rServiceManager->createInstanceWithContext(
-            OUString::createFromAscii("com.sun.star.bridge.UnoUrlResolver" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.UnoUrlResolver")),
             rComponentContext );
 
     // Query for the XUnoUrlResolver interface
@@ -75,8 +75,8 @@ SAL_IMPLEMENT_MAIN()
     try
     {
         // resolve the uno-url
-        rInstance = rResolver->resolve( OUString::createFromAscii(
-            "uno:socket,host=localhost,port=2083;urp;StarOffice.ServiceManager" ) );
+        rInstance = rResolver->resolve( OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "uno:socket,host=localhost,port=2083;urp;StarOffice.ServiceManager" )) );
 
         if( ! rInstance.is() )
         {
diff --git a/odk/examples/OLE/activex/SOComWindowPeer.cpp b/odk/examples/OLE/activex/SOComWindowPeer.cpp
index 35982bda75a3..6e88bdbcd333 100644
--- a/odk/examples/OLE/activex/SOComWindowPeer.cpp
+++ b/odk/examples/OLE/activex/SOComWindowPeer.cpp
@@ -38,6 +38,7 @@
 #include "stdafx2.h"
 #include "so_activex.h"
 #include "SOComWindowPeer.h"
+#include <sal/macros.h>
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -49,7 +50,7 @@ STDMETHODIMP SOComWindowPeer::InterfaceSupportsErrorInfo(REFIID riid)
         &IID_ISOComWindowPeer,
     };
 
-    for (int i=0;i<sizeof(arr)/sizeof(arr[0]);i++)
+    for (int i=0;i<SAL_N_ELEMENTS(arr);i++)
     {
         if (InlineIsEqualGUID(*arr[i],riid))
             return S_OK;
diff --git a/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx b/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx
index 6d72448c8762..f18cb7b165be 100644
--- a/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx
+++ b/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx
@@ -114,7 +114,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     */
     Reference< XInterface > xInterface =
         xMultiComponentFactoryClient->createInstanceWithContext(
-            OUString::createFromAscii( "com.sun.star.bridge.UnoUrlResolver" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.UnoUrlResolver")),
             xComponentContext );
 
     Reference< XUnoUrlResolver > resolver( xInterface, UNO_QUERY );
@@ -135,7 +135,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 
     // gets the server component context as property of the office component factory
     Reference< XPropertySet > xPropSet( xInterface, UNO_QUERY );
-    xPropSet->getPropertyValue( OUString::createFromAscii("DefaultContext") ) >>= xComponentContext;
+    xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xComponentContext;
 
     // gets the service manager from the office
     Reference< XMultiComponentFactory > xMultiComponentFactoryServer(
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyJob.cxx b/odk/examples/cpp/complextoolbarcontrols/MyJob.cxx
index c87f14195929..c4a6218d4c40 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyJob.cxx
+++ b/odk/examples/cpp/complextoolbarcontrols/MyJob.cxx
@@ -49,9 +49,9 @@ using com::sun::star::document::XEventBroadcaster;
 Any SAL_CALL MyJob::execute( const Sequence< NamedValue >& aArguments )
     throw ( IllegalArgumentException, Exception, RuntimeException )
 {
-    Reference < XEventBroadcaster > xBrd( mxMSF->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.GlobalEventBroadcaster") ), UNO_QUERY );
+    Reference < XEventBroadcaster > xBrd( mxMSF->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.GlobalEventBroadcaster")) ), UNO_QUERY );
     Reference < com::sun::star::document::XEventListener > xLstner( mxMSF->createInstance(
-        ::rtl::OUString::createFromAscii("com.sun.star.comp.Office.MyListener" ) ), UNO_QUERY );
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Office.MyListener")) ), UNO_QUERY );
     if ( xBrd.is() )
         xBrd->addEventListener( xLstner );
     return Any();
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx b/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx
index a780efcfba23..73934563ad55 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx
+++ b/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx
@@ -98,11 +98,11 @@ css::uno::Any SAL_CALL MyListener::execute(const css::uno::Sequence< css::beans:
         return css::uno::Any();
 
     css::uno::Reference< css::lang::XServiceInfo > xInfo(xModel, css::uno::UNO_QUERY);
-    sal_Bool bCalc   = xInfo->supportsService(::rtl::OUString::createFromAscii("com.sun.star.sheet.SpreadsheetDocument"));
+    sal_Bool bCalc   = xInfo->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument")));
     sal_Bool bWriter = (
-                         xInfo->supportsService(::rtl::OUString::createFromAscii("com.sun.star.text.TextDocument"  )) &&
-                        !xInfo->supportsService(::rtl::OUString::createFromAscii("com.sun.star.text.WebDocument"   )) &&
-                        !xInfo->supportsService(::rtl::OUString::createFromAscii("com.sun.star.text.GlobalDocument"))
+                         xInfo->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument"))) &&
+                        !xInfo->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.WebDocument"))) &&
+                        !xInfo->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.GlobalDocument")))
                        );
 
     // Wir interessieren uns nur für Writer und Calc. Werden hier aber für
@@ -131,7 +131,7 @@ css::uno::Any SAL_CALL MyListener::execute(const css::uno::Sequence< css::beans:
 ::rtl::OUString SAL_CALL MyListener::getImplementationName()
     throw (css::uno::RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii(MYLISTENER_IMPLEMENTATIONNAME);
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MYLISTENER_IMPLEMENTATIONNAME));
 }
 
 /*-----------------------------------------------------
@@ -141,7 +141,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL MyListener::getSupportedServiceNa
     throw (css::uno::RuntimeException)
 {
     css::uno::Sequence< ::rtl::OUString > lNames(1);
-    lNames[0] = ::rtl::OUString::createFromAscii(MYLISTENER_SERVICENAME);
+    lNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MYLISTENER_SERVICENAME));
     return lNames;
 }
 
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
index d0fd2b200898..8bec59245220 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
+++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
@@ -206,7 +206,7 @@ Sequence < Reference< XDispatch > > SAL_CALL MyProtocolHandler::queryDispatches(
 ::rtl::OUString MyProtocolHandler_getImplementationName ()
     throw (RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii(MYPROTOCOLHANDLER_IMPLEMENTATIONNAME);
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MYPROTOCOLHANDLER_IMPLEMENTATIONNAME));
 }
 
 sal_Bool SAL_CALL MyProtocolHandler_supportsService( const ::rtl::OUString& ServiceName )
@@ -222,7 +222,7 @@ Sequence< ::rtl::OUString > SAL_CALL MyProtocolHandler_getSupportedServiceNames(
     throw (RuntimeException)
 {
     Sequence < ::rtl::OUString > aRet(1);
-    aRet[0] = ::rtl::OUString::createFromAscii(MYPROTOCOLHANDLER_SERVICENAME);
+    aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MYPROTOCOLHANDLER_SERVICENAME));
     return aRet;
 }
 
@@ -269,9 +269,9 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property
         if ( !aURL.Path.compareToAscii("Command1" ) )
         {
             // open the OpenOffice.org web page
-            ::rtl::OUString sURL(::rtl::OUString::createFromAscii("http://www.openoffice.org"));
+            ::rtl::OUString sURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("http://www.openoffice.org")));
             Reference< XSystemShellExecute > xSystemShellExecute( mxMSF->createInstance(
-                ::rtl::OUString::createFromAscii( "com.sun.star.system.SystemShellExecute" )), UNO_QUERY );
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SystemShellExecute"))), UNO_QUERY );
             if ( xSystemShellExecute.is() )
             {
                 try
@@ -291,7 +291,7 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property
             Sequence< NamedValue > aRemoveArgs( 1 );
             aRemoveArgs[0].Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" ));
             aRemoveArgs[0].Value <<= maComboBoxText;
-            SendCommand( aURL, ::rtl::OUString::createFromAscii( "RemoveEntryText" ), aRemoveArgs, sal_True );
+            SendCommand( aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RemoveEntryText")), aRemoveArgs, sal_True );
 
             // add the new text to the start of the list
             Sequence< NamedValue > aInsertArgs( 2 );
@@ -299,7 +299,7 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property
             aInsertArgs[0].Value <<= sal_Int32( 0 );
             aInsertArgs[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" ));
             aInsertArgs[1].Value <<= maComboBoxText;
-            SendCommand( aURL, ::rtl::OUString::createFromAscii( "InsertEntry" ), aInsertArgs, sal_True );
+            SendCommand( aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InsertEntry")), aInsertArgs, sal_True );
         }
         else if ( !aURL.Path.compareToAscii("Command3" ) )
         {
@@ -316,15 +316,15 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property
 
             // create new URL to address the combox box
             URL aCmdURL;
-            aCmdURL.Path = rtl::OUString::createFromAscii( "Command2" );
-            aCmdURL.Protocol = rtl::OUString::createFromAscii( "vnd.demo.complextoolbarcontrols.demoaddon:" );
+            aCmdURL.Path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command2"));
+            aCmdURL.Protocol = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.demo.complextoolbarcontrols.demoaddon:"));
             aCmdURL.Complete = aCmdURL.Path + aCmdURL.Protocol;
 
             // set the selected item as text into the combobox
             Sequence< NamedValue > aArgs( 1 );
-            aArgs[0].Name = rtl::OUString::createFromAscii( "Text" );
+            aArgs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Text"));
             aArgs[0].Value <<= aText;
-            SendCommand( aCmdURL, ::rtl::OUString::createFromAscii( "SetText" ), aArgs, sal_True );
+            SendCommand( aCmdURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetText")), aArgs, sal_True );
         }
         else if ( !aURL.Path.compareToAscii("Command4" ) )
         {
@@ -349,8 +349,8 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property
 
             // create new URL to address the image button
             URL aCmdURL;
-            aCmdURL.Path = rtl::OUString::createFromAscii( "Command1" );
-            aCmdURL.Protocol = rtl::OUString::createFromAscii( "vnd.demo.complextoolbarcontrols.demoaddon:" );
+            aCmdURL.Path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command1"));
+            aCmdURL.Protocol = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.demo.complextoolbarcontrols.demoaddon:"));
             aCmdURL.Complete = aCmdURL.Path + aCmdURL.Protocol;
 
             // create and initialize FeatureStateEvent with IsEnabled
@@ -406,18 +406,18 @@ void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener
 
             // send command to set context menu content
             Sequence< rtl::OUString > aContextMenu( 3 );
-            aContextMenu[0] = rtl::OUString::createFromAscii( "Command 1" );
-            aContextMenu[1] = rtl::OUString::createFromAscii( "Command 2" );
-            aContextMenu[2] = rtl::OUString::createFromAscii( "Command 3" );
+            aContextMenu[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command 1"));
+            aContextMenu[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command 2"));
+            aContextMenu[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command 3"));
 
-            aArgs[0].Name = rtl::OUString::createFromAscii( "List" );
+            aArgs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("List"));
             aArgs[0].Value <<= aContextMenu;
-            SendCommandTo( xControl, aURL, rtl::OUString::createFromAscii( "SetList" ), aArgs, sal_True );
+            SendCommandTo( xControl, aURL, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetList")), aArgs, sal_True );
 
             // send command to check item on pos=0
             aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Pos" ));
             aArgs[0].Value <<= sal_Int32( 0 );
-            SendCommandTo( xControl, aURL, ::rtl::OUString::createFromAscii( "CheckItemPos" ), aArgs, sal_True );
+            SendCommandTo( xControl, aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CheckItemPos")), aArgs, sal_True );
         }
         else if ( aURL.Path.equalsAscii("Command4" ) )
         {
@@ -428,12 +428,12 @@ void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener
 
             // send command to set context menu content
             Sequence< rtl::OUString > aContextMenu( 2 );
-            aContextMenu[0] = rtl::OUString::createFromAscii( "Button Enabled" );
-            aContextMenu[1] = rtl::OUString::createFromAscii( "Button Disabled" );
+            aContextMenu[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Button Enabled"));
+            aContextMenu[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Button Disabled"));
 
-            aArgs[0].Name = rtl::OUString::createFromAscii( "List" );
+            aArgs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("List"));
             aArgs[0].Value <<= aContextMenu;
-            SendCommandTo( xControl, aURL, rtl::OUString::createFromAscii( "SetList" ), aArgs, sal_True );
+            SendCommandTo( xControl, aURL, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetList")), aArgs, sal_True );
 
             // set position according to enable/disable state of button
             sal_Int32 nPos( mbButtonEnabled ? 0 : 1 );
@@ -441,7 +441,7 @@ void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener
             // send command to check item on pos=0
             aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Pos" ));
             aArgs[0].Value <<= nPos;
-            SendCommandTo( xControl, aURL, ::rtl::OUString::createFromAscii( "CheckItemPos" ), aArgs, sal_True );
+            SendCommandTo( xControl, aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CheckItemPos")), aArgs, sal_True );
         }
         else if ( aURL.Path.equalsAscii("Command5" ) )
         {
@@ -449,18 +449,18 @@ void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener
             Sequence< NamedValue > aArgs( 5 );
 
             // send command to initialize spin button
-            aArgs[0].Name = rtl::OUString::createFromAscii( "Value" );
+            aArgs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value"));
             aArgs[0].Value <<= double( 0.0 );
-            aArgs[1].Name = rtl::OUString::createFromAscii( "UpperLimit" );
+            aArgs[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UpperLimit"));
             aArgs[1].Value <<= double( 10.0 );
-            aArgs[2].Name = rtl::OUString::createFromAscii( "LowerLimit" );
+            aArgs[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LowerLimit"));
             aArgs[2].Value <<= double( 0.0 );
-            aArgs[3].Name = rtl::OUString::createFromAscii( "Step" );
+            aArgs[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Step"));
             aArgs[3].Value <<= double( 0.1 );
-            aArgs[4].Name = rtl::OUString::createFromAscii( "OutputFormat" );
-            aArgs[4].Value <<= rtl::OUString::createFromAscii( "%.2f cm" );
+            aArgs[4].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OutputFormat"));
+            aArgs[4].Value <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%.2f cm"));
 
-            SendCommandTo( xControl, aURL, rtl::OUString::createFromAscii( "SetValues" ), aArgs, sal_True );
+            SendCommandTo( xControl, aURL, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetValues")), aArgs, sal_True );
         }
         else if ( aURL.Path.equalsAscii("Command7" ) )
         {
@@ -470,20 +470,20 @@ void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener
 
             // send command to set context menu content
             Sequence< rtl::OUString > aList( 10 );
-            aList[0] = rtl::OUString::createFromAscii( "White" );
-            aList[1] = rtl::OUString::createFromAscii( "Black" );
-            aList[2] = rtl::OUString::createFromAscii( "Red" );
-            aList[3] = rtl::OUString::createFromAscii( "Blue" );
-            aList[4] = rtl::OUString::createFromAscii( "Green" );
-            aList[5] = rtl::OUString::createFromAscii( "Grey" );
-            aList[6] = rtl::OUString::createFromAscii( "Yellow" );
-            aList[7] = rtl::OUString::createFromAscii( "Orange" );
-            aList[8] = rtl::OUString::createFromAscii( "Brown" );
-            aList[9] = rtl::OUString::createFromAscii( "Pink" );
-
-            aArgs[0].Name = rtl::OUString::createFromAscii( "List" );
+            aList[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("White"));
+            aList[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Black"));
+            aList[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Red"));
+            aList[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Blue"));
+            aList[4] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Green"));
+            aList[5] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Grey"));
+            aList[6] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Yellow"));
+            aList[7] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Orange"));
+            aList[8] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Brown"));
+            aList[9] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Pink"));
+
+            aArgs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("List"));
             aArgs[0].Value <<= aList;
-            SendCommandTo( xControl, aURL, rtl::OUString::createFromAscii( "SetList" ), aArgs, sal_True );
+            SendCommandTo( xControl, aURL, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SetList")), aArgs, sal_True );
         }
 
         aListenerHelper.AddListener( mxFrame, xControl, aURL.Path );
diff --git a/odk/examples/cpp/complextoolbarcontrols/exports.cxx b/odk/examples/cpp/complextoolbarcontrols/exports.cxx
index 1a850cfd7458..34e54f5fc3e8 100644
--- a/odk/examples/cpp/complextoolbarcontrols/exports.cxx
+++ b/odk/examples/cpp/complextoolbarcontrols/exports.cxx
@@ -100,14 +100,14 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplNa
     if (sImplName.equalsAscii(MYLISTENER_IMPLEMENTATIONNAME))
     {
         css::uno::Sequence< ::rtl::OUString > lNames(1);
-        lNames[0] = ::rtl::OUString::createFromAscii(MYLISTENER_IMPLEMENTATIONNAME);
+        lNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MYLISTENER_IMPLEMENTATIONNAME));
         xFactory = ::cppu::createSingleFactory(xSMGR, sImplName, MyListener::st_createInstance, lNames);
     }
     else
     if (sImplName.equalsAscii(MYPROTOCOLHANDLER_IMPLEMENTATIONNAME))
     {
         css::uno::Sequence< ::rtl::OUString > lNames(1);
-        lNames[0] = ::rtl::OUString::createFromAscii(MYPROTOCOLHANDLER_SERVICENAME);
+        lNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MYPROTOCOLHANDLER_SERVICENAME));
         xFactory = ::cppu::createSingleFactory(xSMGR, sImplName, MyProtocolHandler_createInstance, lNames);
     }
 
diff --git a/odk/examples/cpp/counter/countermain.cxx b/odk/examples/cpp/counter/countermain.cxx
index 9473ff01d1ae..2a64acec106f 100644
--- a/odk/examples/cpp/counter/countermain.cxx
+++ b/odk/examples/cpp/counter/countermain.cxx
@@ -72,7 +72,7 @@ SAL_IMPLEMENT_MAIN()
     Reference< XSimpleRegistry > xReg = createSimpleRegistry();
     OSL_ENSURE( xReg.is(), "### cannot get service instance of \"com.sun.star.regiystry.SimpleRegistry\"!" );
 
-    xReg->open(OUString::createFromAscii("counter.uno.rdb"), sal_False, sal_False);
+    xReg->open(OUString(RTL_CONSTASCII_USTRINGPARAM("counter.uno.rdb")), sal_False, sal_False);
     OSL_ENSURE( xReg->isValid(), "### cannot open test registry \"counter.uno.rdb\"!" );
 
     Reference< XComponentContext > xContext = bootstrap_InitialComponentContext(xReg);
@@ -83,21 +83,21 @@ SAL_IMPLEMENT_MAIN()
 
     // register my counter component
     Reference< XImplementationRegistration > xImplReg(
-        xMgr->createInstanceWithContext(OUString::createFromAscii("com.sun.star.registry.ImplementationRegistration"), xContext), UNO_QUERY);
+        xMgr->createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration")), xContext), UNO_QUERY);
     OSL_ENSURE( xImplReg.is(), "### cannot get service instance of \"com.sun.star.registry.ImplementationRegistration\"!" );
 
     if (xImplReg.is())
     {
         xImplReg->registerImplementation(
-            OUString::createFromAscii("com.sun.star.loader.SharedLibrary"), // loader for component
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), // loader for component
 #ifdef UNX
 #ifdef MACOSX
-            OUString::createFromAscii("counter.uno.dylib"),     // component location
+            OUString(RTL_CONSTASCII_USTRINGPARAM("counter.uno.dylib")),     // component location
 #else
-            OUString::createFromAscii("counter.uno.so"),        // component location
+            OUString(RTL_CONSTASCII_USTRINGPARAM("counter.uno.so")),        // component location
 #endif
 #else
-            OUString::createFromAscii("counter.uno.dll"),       // component location
+            OUString(RTL_CONSTASCII_USTRINGPARAM("counter.uno.dll")),       // component location
 #endif
             Reference< XSimpleRegistry >()   // registry omitted,
                                              // defaulting to service manager registry used
@@ -105,7 +105,7 @@ SAL_IMPLEMENT_MAIN()
 
         // get a counter instance
         Reference< XInterface > xx ;
-        xx = xMgr->createInstanceWithContext(OUString::createFromAscii("foo.Counter"), xContext);
+        xx = xMgr->createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM("foo.Counter")), xContext);
         Reference< XCountable > xCount( xx, UNO_QUERY );
         OSL_ENSURE( xCount.is(), "### cannot get service instance of \"foo.Counter\"!" );
 
diff --git a/odk/examples/cpp/remoteclient/remoteclient.cxx b/odk/examples/cpp/remoteclient/remoteclient.cxx
index 47d83d1558f4..90863b4c78d8 100644
--- a/odk/examples/cpp/remoteclient/remoteclient.cxx
+++ b/odk/examples/cpp/remoteclient/remoteclient.cxx
@@ -148,7 +148,7 @@ sal_Int32 PipeClientMain::run( const Sequence< OUString > & aArguments ) throw (
     {
         try {
             Reference < XInterface > r =
-                m_xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.bridge.UnoUrlResolver" ) );
+                m_xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.UnoUrlResolver")) );
             Reference < XUnoUrlResolver > rResolver( r , UNO_QUERY );
 
             // connect to the remote process and retrieve the initial object
@@ -212,7 +212,7 @@ Sequence< OUString > getSupportedServiceNames()
         if( !pNames )
         {
             static Sequence< OUString > seqNames(1);
-            seqNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.bridge.example.RemoteClientSample" );
+            seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.example.RemoteClientSample"));
             pNames = &seqNames;
         }
     }
@@ -243,7 +243,7 @@ sal_Bool SAL_CALL component_writeInfo(
         {
             Reference< XRegistryKey > xNewKey(
                 reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
-                    OUString::createFromAscii( "/" IMPLEMENTATION_NAME "/UNO/SERVICES" ) ) );
+                    OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLEMENTATION_NAME "/UNO/SERVICES" )) ) );
 
             const Sequence< OUString > & rSNL = getSupportedServiceNames();
             const OUString * pArray = rSNL.getConstArray();
diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk
index 02471bd53638..20c3f656c49e 100644
--- a/odk/pack/copying/makefile.mk
+++ b/odk/pack/copying/makefile.mk
@@ -240,10 +240,6 @@ $(DESTDIRSETTINGS)/dk.mk : dk.mk
     -$(MKDIRHIER) $(@:d)
     tr -d "\015" < dk.mk | sed -e 's/@@RELEASE@@/$(PRODUCT_RELEASE)/' -e 's/@@BUILDID@@/$(RSCREVISION)/'> $@
 
-$(CONVERTTAGFLAG) : $(DOCUHTMLFILES)
-#    $(PERL) $(CONVERTTAGSCRIPT) 1 "$(TITLE)" "$(OFFICEPRODUCTNAME)" $(DOCUHTMLFILES)
-    @echo "tags converted" > $@
-
 $(IDL_DOCU_CLEANUP_FLAG) : $(IDL_CHAPTER_REFS) $(PRJ)/docs/common/ref/idl.css $(DESTIDLLIST)
     @@-$(MY_DELETE_RECURSIVE) $(DESTDIRGENIDLREF)
     $(TOUCH) $@
diff --git a/odk/source/com/sun/star/lib/loader/InstallationFinder.java b/odk/source/com/sun/star/lib/loader/InstallationFinder.java
index cb1ec7ad1143..0b67d85e369e 100644
--- a/odk/source/com/sun/star/lib/loader/InstallationFinder.java
+++ b/odk/source/com/sun/star/lib/loader/InstallationFinder.java
@@ -71,7 +71,7 @@ final class InstallationFinder {
     private static final String SYSPROP_NAME =
         "com.sun.star.lib.loader.unopath";
     private static final String ENVVAR_NAME = "UNO_PATH";
-    private static final String SOFFICE = "soffice"; // Unix/Linux only
+    private static final String SOFFICE = "libreoffice"; // Unix/Linux only
 
     private InstallationFinder() {} // do not instantiate
 
diff --git a/odk/source/unoapploader/unx/makefile.mk b/odk/source/unoapploader/unx/makefile.mk
index 56a5024d19c5..7a93bce6a3be 100644
--- a/odk/source/unoapploader/unx/makefile.mk
+++ b/odk/source/unoapploader/unx/makefile.mk
@@ -43,7 +43,7 @@ LIBSALCPPRT=
 LINK=$(CC)
 .ENDIF
 
-.IF "$(OS)"!="FREEBSD"
+.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD"
 STDLIB= -ldl
 .ENDIF
 
diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk
index 2578c78382ee..b497977762d9 100644
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -64,10 +64,6 @@ IDLOUT=$(SOLARIDLDIR)
 XMLOUT=$(SOLARXMLDIR)
 LIBOUT=$(SOLARLIBDIR)
 
-CONVERTTAGSCRIPT=$(SOLARENV)/bin/converttags.pl
-CONVERTTAGFLAGNAME=converttags_html_files.flag
-CONVERTTAGFLAG = $(MISC)/$(CONVERTTAGFLAGNAME)
-
 MY_AUTODOC=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/autodoc
 
 .IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="MACOSX" || "$(OS)"=="AIX"
diff --git a/offapi/com/sun/star/configuration/AdministrationProvider.idl b/offapi/com/sun/star/configuration/AdministrationProvider.idl
index 0c4a419fcf1f..2fbf0175578c 100644
--- a/offapi/com/sun/star/configuration/AdministrationProvider.idl
+++ b/offapi/com/sun/star/configuration/AdministrationProvider.idl
@@ -149,8 +149,8 @@ published service AdministrationProvider
  the locale set up for the user. But this service by default gets data for all
  locales for which data is present. Locale-dependent values in this case are
  replaced by a <type>SetAccess</type> using the language names as accessors.
- This also allows targetted setting of values for selected locales.
- This behavior can be requested explicitly by specifing a special argument
+ This also allows targeted setting of values for selected locales.
+ This behavior can be requested explicitly by specifying a special argument
  value <code>locale = "*"</code>.
  </p>
 
diff --git a/offapi/com/sun/star/configuration/ConfigurationProvider.idl b/offapi/com/sun/star/configuration/ConfigurationProvider.idl
index c6924acf6c6e..2807fc6c9911 100644
--- a/offapi/com/sun/star/configuration/ConfigurationProvider.idl
+++ b/offapi/com/sun/star/configuration/ConfigurationProvider.idl
@@ -109,7 +109,7 @@ published service ConfigurationProvider
  accept a single argument named <code>nodepath</code> of type <atom>string</atom>.
  This argument must contain the absolute path to an element of the
  configuration. The view that is selected consists of the named element and
- all its decendants.
+ all its descendants.
  </p>
 
  <p>Other arguments can be used to control the behavior of the view. These
diff --git a/offapi/com/sun/star/configuration/ConfigurationRegistry.idl b/offapi/com/sun/star/configuration/ConfigurationRegistry.idl
index 870af90e7986..828bf0203e7b 100644
--- a/offapi/com/sun/star/configuration/ConfigurationRegistry.idl
+++ b/offapi/com/sun/star/configuration/ConfigurationRegistry.idl
@@ -86,7 +86,7 @@ published service ConfigurationRegistry
     /** is used to commit changes to the configuration.
         <p>As specified for the
         <type scope="com::sun::star::configuration">ConfigurationUpdateAccess</type>
-        service, all changes made to an configuration subtree have to be commited
+        service, all changes made to an configuration subtree have to be committed
         before they become persistent.
         To do this for a configuration accessed as a registry, call
         <method scope="com::sun::star::util">XFlushable::flush</method>.
diff --git a/offapi/com/sun/star/configuration/ConfigurationUpdateAccess.idl b/offapi/com/sun/star/configuration/ConfigurationUpdateAccess.idl
index bd13b167c2c5..500768dc64c3 100644
--- a/offapi/com/sun/star/configuration/ConfigurationUpdateAccess.idl
+++ b/offapi/com/sun/star/configuration/ConfigurationUpdateAccess.idl
@@ -76,7 +76,7 @@ module com { module sun { module star { module configuration {
         The root element of a modifiable tree provides extended functionality
         to control processing of changes for the entire tree (fragment) by
         supporting <type scope="com::sun::star::util">XChangesBatch</type>.
-        For elements of a <em>set</em> or a <em>group</em> no additinal
+        For elements of a <em>set</em> or a <em>group</em> no additional
         interfaces are supported.
     </li>
  </ul>
diff --git a/offapi/com/sun/star/configuration/HierarchyAccess.idl b/offapi/com/sun/star/configuration/HierarchyAccess.idl
index a5779042cd42..a476ea266f0d 100644
--- a/offapi/com/sun/star/configuration/HierarchyAccess.idl
+++ b/offapi/com/sun/star/configuration/HierarchyAccess.idl
@@ -111,7 +111,7 @@ published service HierarchyAccess
  any other interfaces that allow access to or manipulation of subnodes
  selected by name or hierarchical name.
  </p>
- <p>If an inexact name could be matched to either a simple or a hierachical
+ <p>If an inexact name could be matched to either a simple or a hierarchical
  name, the simple (immediate child) name is preferred.
  </p>
 */
diff --git a/offapi/com/sun/star/configuration/backend/Backend.idl b/offapi/com/sun/star/configuration/backend/Backend.idl
index 0932291c74bd..9d0b82e0ade4 100644
--- a/offapi/com/sun/star/configuration/backend/Backend.idl
+++ b/offapi/com/sun/star/configuration/backend/Backend.idl
@@ -57,7 +57,7 @@ module com { module sun { module star { module configuration { module backend {
         A component contains configuration data for a particular
         application domain or software module.
     </p>
-    <p> Entities are organised hierarchically in organisations,
+    <p> Entities are organized hierarchically in organizations,
         groups, roles and individual users. Each element of the associated
         hierarchy corresponds to a layer that applies to an entity.
     </p>
diff --git a/offapi/com/sun/star/configuration/backend/LdapMultiLayerStratum.idl b/offapi/com/sun/star/configuration/backend/LdapMultiLayerStratum.idl
index f02bd733498e..eb7b7c540acc 100644
--- a/offapi/com/sun/star/configuration/backend/LdapMultiLayerStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/LdapMultiLayerStratum.idl
@@ -39,7 +39,7 @@ module com { module sun { module star { module configuration { module backend {
 
 /**
    implements <type>MultiLayerStratum</type> that
-    provides access to a multiple layers of configuration data from ldap source
+    provides access to a multiple layers of configuration data from LDAP source
 */
 service LdapMultiLayerStratum
 {
diff --git a/offapi/com/sun/star/configuration/backend/LdapSingleBackend.idl b/offapi/com/sun/star/configuration/backend/LdapSingleBackend.idl
index 31897515ce7c..12d4fe84fc77 100644
--- a/offapi/com/sun/star/configuration/backend/LdapSingleBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/LdapSingleBackend.idl
@@ -39,7 +39,7 @@ module com { module sun { module star { module configuration { module backend {
 
 /**
     implements <type>SingleBackend</type> that stores data in an
-    LDAP directoy.
+    LDAP directroy.
 
     @since OOo 1.1.2
 */
diff --git a/offapi/com/sun/star/configuration/backend/LdapSingleStratum.idl b/offapi/com/sun/star/configuration/backend/LdapSingleStratum.idl
index ae50be4c836a..86195e67377b 100644
--- a/offapi/com/sun/star/configuration/backend/LdapSingleStratum.idl
+++ b/offapi/com/sun/star/configuration/backend/LdapSingleStratum.idl
@@ -39,7 +39,7 @@ module com { module sun { module star { module configuration { module backend {
 
 /**
    implements <type>SingleLayerStratum</type> that
-    provides access to a single layer of configuration data from ldap source
+    provides access to a single layer of configuration data from LDAP source
 */
 service LdapSingleStratum
 {
diff --git a/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl b/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl
index c5d44ac4b7bf..34b1c0ccfb56 100644
--- a/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl
+++ b/offapi/com/sun/star/configuration/backend/MergeRecoveryRequest.idl
@@ -71,9 +71,9 @@ exception MergeRecoveryRequest: ::com::sun::star::uno::Exception
     string ErrorLayerId;
 
     /**
-        specifies whether the requestor wants to remove or skip the invalid layer.
+        specifies whether the requester wants to remove or skip the invalid layer.
 
-        <p> If <TRUE/> the requestor wants to remove the underlying data of
+        <p> If <TRUE/> the requester wants to remove the underlying data of
             the layer.<BR/>
             If <FALSE/> the request is to skip the underlying data this time,
             but without removing it.
diff --git a/offapi/com/sun/star/configuration/backend/OfflineBackend.idl b/offapi/com/sun/star/configuration/backend/OfflineBackend.idl
index 57775a6a4afd..4d7c1d3706ff 100644
--- a/offapi/com/sun/star/configuration/backend/OfflineBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/OfflineBackend.idl
@@ -52,16 +52,16 @@ published service OfflineBackend
 
     /** provides access to configuration data from a <type>SingleBackend</type>.
 
-      <p>If no backend is provided during initalization or if the context
-        contains an <code>Offline</code> flag that is <TRUE/>, then offline mode
-        is activated. This may fail, if the offline cache has not been filled
+      <p>If no backend is provided during initialization or if the context
+        contains an <code>Offline</code> flag that is <TRUE/>, then off-line mode
+        is activated. This may fail, if the off-line cache has not been filled
         during a previous execution.
       </p>
       <p>Less entities may be available from <type>XBackendEntities</type>,
-      when operating in offline mode than when operating with an online
+      when operating in off-line mode than when operating with an on-line
       <type>SingleBackend</type>.
       </p>
-      <p>If offline mode is not invoked, the implementation behaves
+      <p>If off-line mode is not invoked, the implementation behaves
         like any other <type>BackendAdapter</type>.
       </p>
 
diff --git a/offapi/com/sun/star/configuration/backend/Schema.idl b/offapi/com/sun/star/configuration/backend/Schema.idl
index 873f7c464b15..75d0237780fd 100644
--- a/offapi/com/sun/star/configuration/backend/Schema.idl
+++ b/offapi/com/sun/star/configuration/backend/Schema.idl
@@ -41,7 +41,7 @@ module com { module sun { module star { module configuration { module backend {
 /**
   provides read only access to a configuration component schema.
 
-  <p>A component is a set of hierarchically organised and semantically
+  <p>A component is a set of hierarchically organized and semantically
   related configuration settings, e.g StarWriter settings.
   </p>
   <p>A component schema contains two separate sections, one which
diff --git a/offapi/com/sun/star/configuration/backend/SingleBackend.idl b/offapi/com/sun/star/configuration/backend/SingleBackend.idl
index 2cf1dc898661..911fa93f32c6 100644
--- a/offapi/com/sun/star/configuration/backend/SingleBackend.idl
+++ b/offapi/com/sun/star/configuration/backend/SingleBackend.idl
@@ -58,7 +58,7 @@ module com { module sun { module star { module configuration { module backend {
         A component contains configuration data for a particular
         application domain or software module.
     </p>
-    <p> Entities are organised hierarchically in organisations,
+    <p> Entities are organized hierarchically in organizations,
         groups, roles and individual users. Each element of the associated
         hierarchy corresponds to a layer that applies to an entity.
     </p>
diff --git a/offapi/com/sun/star/configuration/backend/SystemIntegration.idl b/offapi/com/sun/star/configuration/backend/SystemIntegration.idl
index 5aa281a67ec0..a6fb930ae8e1 100644
--- a/offapi/com/sun/star/configuration/backend/SystemIntegration.idl
+++ b/offapi/com/sun/star/configuration/backend/SystemIntegration.idl
@@ -56,7 +56,7 @@ service SystemIntegration
     /**
        allows initialization of backend data sources
 
-       <p>no parameters need to be passed as backends are initialised
+       <p>no parameters need to be passed as backends are initialized
           using the service registration database 'services.rdb'.
        </p>
 
diff --git a/offapi/com/sun/star/configuration/backend/XBackendChangesNotifier.idl b/offapi/com/sun/star/configuration/backend/XBackendChangesNotifier.idl
index ca2861bcf443..637527de5895 100644
--- a/offapi/com/sun/star/configuration/backend/XBackendChangesNotifier.idl
+++ b/offapi/com/sun/star/configuration/backend/XBackendChangesNotifier.idl
@@ -48,7 +48,7 @@ module com {  module sun {  module star {  module configuration {  module backen
 interface XBackendChangesNotifier: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
-    /** adds the specified listener to receive events when changes occured.
+    /** adds the specified listener to receive events when changes occurred.
         @param aListener
             specifies the listener object.
 
diff --git a/offapi/com/sun/star/configuration/backend/XLayerHandler.idl b/offapi/com/sun/star/configuration/backend/XLayerHandler.idl
index 22b75c9466dc..15ba5085ef25 100644
--- a/offapi/com/sun/star/configuration/backend/XLayerHandler.idl
+++ b/offapi/com/sun/star/configuration/backend/XLayerHandler.idl
@@ -150,7 +150,7 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
     /** receives notification that a new item is started.
 
         <p> The current node must be a set and
-            a preexisting item (if any) must be removeable.
+            a preexisting item (if any) must be removable.
         </p>
         <p> The new item will be created from the default template
             of the set.
@@ -178,7 +178,7 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
             <li>if there isn't a set node in progress currently</li>
             <li>if there already was a change to a node of that name</li>
             <li>if the template for the new node is not found</li>
-            <li>if an item of that name on a lower layer is not removeable</li>
+            <li>if an item of that name on a lower layer is not removable</li>
             <li>if the name is not a valid item name</li>
             <li>if the attributes are not valid for the node</li>
             </ul>
@@ -199,7 +199,7 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
         is started.
 
         <p> The current node must be a set and
-            a preexisting item (if any) must be removeable.
+            a preexisting item (if any) must be removable.
         </p>
         <p> Subsequent calls describe the difference from the template
             of properties and members or items of the node until
@@ -228,7 +228,7 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
             <li>if there already was a change to a node of that name</li>
             <li>if the template for the new node is not found</li>
             <li>if the template is not a valid item type for the containing set</li>
-            <li>if an item of that name on a lower layer is not removeable</li>
+            <li>if an item of that name on a lower layer is not removable</li>
             <li>if the name is not a valid item name</li>
             <li>if the attributes are not valid for the node</li>
             </ul>
@@ -272,7 +272,7 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
     /** receives notification that a node is dropped from a set.
 
         <p> The current node must be a set and
-            the item must be removeable.
+            the item must be removable.
         </p>
 
         @param aName
@@ -283,7 +283,7 @@ published interface XLayerHandler: ::com::sun::star::uno::XInterface
             <li>if there isn't a set node in progress currently</li>
             <li>if there already was a change to a node of that name</li>
             <li>if there is no item with that name</li>
-            <li>if the item is not removeable</li>
+            <li>if the item is not removable</li>
             <li>if the name is not a valid node name</li>
             </ul>
             <p><em>Not every implementation can detect each condition</em></p>
diff --git a/offapi/com/sun/star/configuration/backend/XSchemaHandler.idl b/offapi/com/sun/star/configuration/backend/XSchemaHandler.idl
index 635eb6164bbd..b1dae967d353 100644
--- a/offapi/com/sun/star/configuration/backend/XSchemaHandler.idl
+++ b/offapi/com/sun/star/configuration/backend/XSchemaHandler.idl
@@ -59,7 +59,7 @@ published interface XSchemaHandler: ::com::sun::star::uno::XInterface
 
     /** receives notification that a schema description is started.
 
-        <p> The schema descrption may comprise components templates or both.
+        <p> The schema description may comprise components templates or both.
         </p>
 
         @throws com::sun::star::configuration::backend::MalformedDataException
diff --git a/offapi/com/sun/star/configuration/backend/XUpdateHandler.idl b/offapi/com/sun/star/configuration/backend/XUpdateHandler.idl
index 918eee7ea365..5545fc3bfa21 100644
--- a/offapi/com/sun/star/configuration/backend/XUpdateHandler.idl
+++ b/offapi/com/sun/star/configuration/backend/XUpdateHandler.idl
@@ -169,7 +169,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
     /** receives notification that a node is started as a new item.
 
         <p> The current node must be a set and
-            a preexisting item (if any) must be removeable.
+            a preexisting item (if any) must be removable.
         </p>
         <p> The new item will be created from the default template
             of the set.
@@ -196,7 +196,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
             <li>if there isn't a set node in progress currently</li>
             <li>if there already was a change to an item of that name</li>
             <li>if the template for the new node is not found</li>
-            <li>if an item of that name exists and is not removeable</li>
+            <li>if an item of that name exists and is not removable</li>
             <li>if the name is not a valid item name</li>
             <li>if the attributes are not valid for the node</li>
             </ul>
@@ -217,7 +217,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
         based on a particular template.
 
         <p> The current node must be a set and
-            a preexisting item (if any) must be removeable.
+            a preexisting item (if any) must be removable.
         </p>
         <p> Subsequent calls describe the difference from the template
             of properties or members of the node until a matching call
@@ -244,7 +244,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
             <li>if there isn't a set node in progress currently</li>
             <li>if there already was a change to an item of that name</li>
             <li>if the template for the new node is not found</li>
-            <li>if an item of that name exists and is not removeable</li>
+            <li>if an item of that name exists and is not removable</li>
             <li>if the name is not a valid item name</li>
             <li>if the template is not a valid item type for the containing set</li>
             <li>if the attributes are not valid for the node</li>
@@ -289,7 +289,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
     /** receives notification that an item is to be dropped from a set.
 
         <p> The current node must be a set and
-            the item must be removeable.
+            the item must be removable.
         </p>
 
         @param aName
@@ -300,7 +300,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
             <li>if there isn't a set node in progress currently</li>
             <li>if there already was a change to a node of that name</li>
             <li>if there is no item with that name</li>
-            <li>if the item is not removeable</li>
+            <li>if the item is not removable</li>
             <li>if the name is not a valid node name</li>
             </ul>
             <p><em>Not every implementation can detect each condition</em></p>
@@ -538,7 +538,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
 
         <p> The current node must be extensible and
             a preexisting property (if any) must be
-            removeable in this layer.
+            removable in this layer.
         </p>
 
         @param aName
@@ -564,7 +564,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
             <ul>
             <li>if there isn't a group or extensible node in progress currently</li>
             <li>if there already was a change to a property of that name</li>
-            <li>if a property of that name exists and is not removeable</li>
+            <li>if a property of that name exists and is not removable</li>
             <li>if the specified type is not allowed</li>
             <li>if the name is not a valid property name</li>
             <li>if the attributes are not valid for the property</li>
@@ -588,7 +588,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
 
         <p> The current node must be extensible and
             a preexisting property (if any) must be
-            removeable in this layer.
+            removable in this layer.
         </p>
 
         @param aName
@@ -618,7 +618,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
             <ul>
             <li>if there isn't a group or extensible node in progress currently</li>
             <li>if there already was a change to a property of that name</li>
-            <li>if a property of that name exists and is not removeable</li>
+            <li>if a property of that name exists and is not removable</li>
             <li>if the type of the value is not an allowed type,
                 or if the value is <void/></li>
             <li>if the name is not a valid property name</li>
@@ -640,7 +640,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
 
     /** receives notification that a property is dropped from the current node.
 
-        <p>The current node must be extensible and the property removeable.</p>
+        <p>The current node must be extensible and the property removable.</p>
 
         @param aName
             specifies the name of the property.
@@ -649,7 +649,7 @@ published interface XUpdateHandler: ::com::sun::star::uno::XInterface
             <ul>
             <li>if there isn't a group or extensible node in progress currently</li>
             <li>if there is no property with that name</li>
-            <li>if the property is not removeable</li>
+            <li>if the property is not removable</li>
             <li>if the name is not a valid node name</li>
             </ul>
             <p><em>Not every implementation can detect each condition</em></p>
diff --git a/offapi/com/sun/star/configuration/backend/xml/LayerParser.idl b/offapi/com/sun/star/configuration/backend/xml/LayerParser.idl
index 864051bae236..f95dc12b5022 100644
--- a/offapi/com/sun/star/configuration/backend/xml/LayerParser.idl
+++ b/offapi/com/sun/star/configuration/backend/xml/LayerParser.idl
@@ -50,12 +50,12 @@ module xml {
     represents a configuration data layer that is stored in a stream in
     OOR Update XML format.
 
-    <p> The configuration layer xml from a given stream is parsed and fed to a
+    <p> The configuration layer XML from a given stream is parsed and fed to a
     <type scope="com::sun::star::configuration::backend">XLayerHandler</type>.
     </p>
 
     @see com::sun::star::configuration::backend::xml::SchemaParser
-        Service that represents a configuration schema stored in xml.
+        Service that represents a configuration schema stored in XML.
 
     @see com::sun::star::configuration::backend::xml::LayerWriter
         Service that writes OOR Update XML for data described via
@@ -73,7 +73,7 @@ published service LayerParser
 
     //-------------------------------------------------------------------------
 
-    /** provides access to the source xml stream.
+    /** provides access to the source XML stream.
       */
     interface com::sun::star::io::XActiveDataSink ;
 
diff --git a/offapi/com/sun/star/configuration/backend/xml/LayerWriter.idl b/offapi/com/sun/star/configuration/backend/xml/LayerWriter.idl
index 1a32587ad13a..a578418ae25e 100644
--- a/offapi/com/sun/star/configuration/backend/xml/LayerWriter.idl
+++ b/offapi/com/sun/star/configuration/backend/xml/LayerWriter.idl
@@ -47,7 +47,7 @@ module xml {
 //=============================================================================
 
 /**
-    can be used to parse a stream of configuration layer xml.
+    can be used to parse a stream of configuration layer XML.
 
     <p> The configuration layer data described to a
     <type scope="com::sun::star::configuration::backend">XLayerHandler</type>
@@ -55,7 +55,7 @@ module xml {
     </p>
 
     @see com::sun::star::configuration::backend::xml::LayerParser
-        Service that parses configuration layer xml.
+        Service that parses configuration layer XML.
 
     @since OOo 1.1.2
 */
diff --git a/offapi/com/sun/star/configuration/backend/xml/SchemaParser.idl b/offapi/com/sun/star/configuration/backend/xml/SchemaParser.idl
index 6c60fa2a338a..f280f221ff9c 100644
--- a/offapi/com/sun/star/configuration/backend/xml/SchemaParser.idl
+++ b/offapi/com/sun/star/configuration/backend/xml/SchemaParser.idl
@@ -49,12 +49,12 @@ module xml {
 /** represents a configuration schema that is stored in a stream in
     OOR Schema XML format.
 
-    <p> The configuration schema xml from a given stream is parsed and fed to a
+    <p> The configuration schema XML from a given stream is parsed and fed to a
         <type scope="com::sun::star::configuration::backend">XSchemaHandler</type>.
     </p>
 
     @see com::sun::star::configuration::backend::xml::LayerParser
-        Service that parses configuration layer xml.
+        Service that parses configuration layer XML.
 
     @since OOo 1.1.2
 */
@@ -68,7 +68,7 @@ published service SchemaParser
 
     //-------------------------------------------------------------------------
 
-    /** provides access to the source xml stream.
+    /** provides access to the source XML stream.
       */
     interface com::sun::star::io::XActiveDataSink ;
 
diff --git a/offapi/com/sun/star/configuration/bootstrap/BootstrapContext.idl b/offapi/com/sun/star/configuration/bootstrap/BootstrapContext.idl
index 3441b45e73a1..1d66d43ad0e0 100644
--- a/offapi/com/sun/star/configuration/bootstrap/BootstrapContext.idl
+++ b/offapi/com/sun/star/configuration/bootstrap/BootstrapContext.idl
@@ -47,7 +47,7 @@ module com { module sun { module star { module configuration { module bootstrap
         <type scope="com::sun::star::configuration::backend">DefaultBackend</type> of the
         component context.
     </p>
-    <p> The implementation is usally available as singleton in the context
+    <p> The implementation is usually available as a singleton in the context
         that it wraps..
     </p>
 
diff --git a/offapi/com/sun/star/deployment/XPackage.idl b/offapi/com/sun/star/deployment/XPackage.idl
index 9709b579bc2e..89ba0529ad06 100644
--- a/offapi/com/sun/star/deployment/XPackage.idl
+++ b/offapi/com/sun/star/deployment/XPackage.idl
@@ -71,8 +71,8 @@ interface XPackage
 
     /** checks if the package can be installed.
 
-        Only if the return value is true the package is allowed to be installed.
-        In case of false or in case of an exception, the package must be removed
+        Only if the return value is <TRUE/> the package is allowed to be installed.
+        In case of <FALSE/> or in case of an exception, the package must be removed
         completely.
         After return of this function no code from the extension may be used
         anymore, so that the extension can be safely removed from the harddisk.
@@ -80,10 +80,10 @@ interface XPackage
         @param xCmdEnv
                command environment for error handling and other interaction.
         @alreadyInstalled
-            indicates that an extension with the same identifyer is already installed.
+            indicates that an extension with the same identifier is already installed.
 
         @return
-            null - all prerequisites are met. Otherwise, a value from
+            <NULL/> - all prerequisites are met. Otherwise, a value from
             <member>Prerequisites</member> indicating what prerequisites are missing.
      */
     long checkPrerequisites(
@@ -97,7 +97,7 @@ interface XPackage
 
     /** checks if the dependencies for this package are still satisfied
 
-        After updateing the OpenOffice.org, some dependencies for packages might
+        After updating the OpenOffice.org, some dependencies for packages might
         no longer be satisfied.
 
         @since OOo 3.2.0
@@ -106,8 +106,8 @@ interface XPackage
                command environment for error handling and other interaction.
 
         @return
-            true - all dependencies are satisfied
-            false - at least one dependency failed.
+            <TRUE/> - all dependencies are satisfied
+            <FALSE/> - at least one dependency failed.
      */
     boolean checkDependencies(
         [in] com::sun::star::ucb::XCommandEnvironment xCmdEnv )
@@ -116,12 +116,12 @@ interface XPackage
                 com::sun::star::ucb::CommandFailedException);
 
 
-    /** determines whether the package is currently is registered, i.e.
+    /** determines whether the package is currently registered, i.e.
         whether it is active.
 
         @param xAbortChannel
                abort channel to asynchronously abort the registration process,
-               or null
+               or <NULL/>
         @param xCmdEnv
                command environment for error and progress handling
         @return
@@ -143,11 +143,11 @@ interface XPackage
 
         @param startup
                indicates that registration is adapted to the particular
-               startup scenario. That is, it is set to true, when called
+               startup scenario. That is, it is set to <TRUE/>, when called
                from <member>XExtensionManager::synchronize</member>
         @param xAbortChannel
                abort channel to asynchronously abort the registration process,
-               or null
+               or <NULL/>
         @param xCmdEnv
                command environment for error and progress handling
     */
@@ -167,7 +167,7 @@ interface XPackage
 
         @param xAbortChannel
                abort channel to asynchronously abort the registration process,
-               or null
+               or <NULL/>
         @param xCmdEnv
                command environment for error and progress handling
     */
@@ -183,18 +183,18 @@ interface XPackage
         e.g. a zip (legacy) package file or a document hosting script packages.
 
         @return
-                in case this package relfects a package bundle
+                <TRUE/> if this package is a package bundle, <FALSE/> otherwise
     */
     boolean isBundle();
 
     /** Gets packages of the bundle.
 
-        If <member>isRemoved</member> returns true then getBundle may return an
+        If <member>isRemoved</member> returns <TRUE/> then getBundle may return an
         empty sequence in case the object is not registered.
 
         @param xAbortChannel
                abort channel to asynchronously abort the registration process,
-               or null
+               or <NULL/>
         @param xCmdEnv
                command environment for error and progress handling
         @return
@@ -273,8 +273,8 @@ interface XPackage
     */
     sequence<string> getUpdateInformationURLs()
         raises (ExtensionRemovedException);
-    /** returns the publisher info for a package, the strings
-        might be empty, if there are no publisher
+    /** returns the publisher info for the package, the strings
+        might be empty, if there is no publisher
 
         <type scope="::com::sun::star::beans">StringPair</type>::First
         represents the publisher name and
@@ -294,7 +294,7 @@ interface XPackage
     /** exports package to given destination URL.
 
         @param destFolderURL
-               package destination folder URL, must be UCB conform
+               package destination folder URL, must be UCB conforming
         @param newTitle
                new package name
         @param nameClashAction
@@ -337,7 +337,7 @@ interface XPackage
         If registration data are created during registration, but the package is
         currently not registered, for example after calling
         <member>XPackage::revokePackage</member>, then <member
-        scope="com::sun::star::beans">Optional::IsPresent</member> is true and
+        scope="com::sun::star::beans">Optional::IsPresent</member> is <TRUE/> and
         the <member scope="com::sun::star::beans">Optional::Value</member> may
         be an empty string.
     */
@@ -346,7 +346,7 @@ interface XPackage
 
     /** indicates if this object represents a removed extension or extension
         item. This is the case when it was created by providing
-        <code>true</code> for the <code>removed</code> parameter in the function
+        <TRUE/> for the <code>removed</code> parameter in the function
         <member>XPackageRegistry::bindPackage</member>.
      */
     boolean isRemoved();
diff --git a/offapi/com/sun/star/script/vba/XVBACompatibility.idl b/offapi/com/sun/star/script/vba/XVBACompatibility.idl
index bfa9d01655fa..0b23021efd42 100644
--- a/offapi/com/sun/star/script/vba/XVBACompatibility.idl
+++ b/offapi/com/sun/star/script/vba/XVBACompatibility.idl
@@ -39,6 +39,7 @@ interface XVBACompatibility
     //-------------------------------------------------------------------------
 
     [attribute] boolean VBACompatibilityMode;
+    [attribute ] string  ProjectName;
 
     //-------------------------------------------------------------------------
 };
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
index cae148ac6a47..7395d91c1eb0 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
@@ -217,7 +217,7 @@
             </node>
             <node oor:name="ooo-entrance-breaks" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Put on the Breaks</value>
+                    <value xml:lang="en-US">Put on the Brakes</value>
 
                 </prop>
             </node>
@@ -791,7 +791,7 @@
             </node>
             <node oor:name="ooo-exit-breaks" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Put on the Breaks</value>
+                    <value xml:lang="en-US">Put on the Brakes</value>
 
                 </prop>
             </node>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 01ce2a378484..18d131cf35bb 100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -4145,7 +4145,7 @@
                     <value xml:lang="en-US">License Information...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:Credits" oor:op="replace">
+            <node oor:name=".uno:ShowCredits" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">%PRODUCTNAME Credits...</value>
                 </prop>
diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu
index 575c0aba053b..f9267d6763e9 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -64,25 +64,25 @@
   <node oor:name="DefaultFonts">
     <node oor:name="en" oor:op="replace">
       <prop oor:name="LATIN_DISPLAY" oor:type="xs:string" oor:op="replace">
-        <value>Arial;Albany;Albany AMT;Liberation Sans;Nimbus Sans L;DejaVu Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Liberation Sans;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="CJK_DISPLAY" oor:type="xs:string" oor:op="replace">
         <value>Andale Sans UI;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic;AR PL ShanHeiSun Uni;MS PGothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_HEADING" oor:type="xs:string" oor:op="replace">
-        <value>Arial;Albany;Albany AMT;Liberation Sans;Nimbus Sans L;DejaVu Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Liberation Sans;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_FIXED" oor:type="xs:string" oor:op="replace">
-        <value>Courier New;Cumberland;Cumberland AMT;Liberation Mono;Nimbus Mono L;DejaVu Sans Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
+        <value>Cumberland AMT;Cumberland;Courier New;Liberation Mono;Nimbus Mono L;DejaVu Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
       </prop>
       <prop oor:name="LATIN_PRESENTATION" oor:type="xs:string" oor:op="replace">
-        <value>Arial;Albany;Albany AMT;Liberation Sans;Nimbus Sans L;DejaVu Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Liberation Sans;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-        <value>Arial;Albany;Albany AMT;Liberation Sans;Nimbus Sans L;DejaVu Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Liberation Sans;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>Times New Roman;Liberation Serif;Thorndale;Thorndale AMT;Nimbus Roman No9 L;DejaVu Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Thorndale;Times New Roman;Liberation Serif;Nimbus Roman No9 L;DejaVu Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="CJK_HEADING" oor:type="xs:string" oor:op="replace">
         <value>HG Mincho Light J;MS Mincho;HG Mincho J;HG Mincho L;HG Mincho;Mincho;MS PMincho;HG Mincho Light J;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS PGothic;AR PL ShanHeiSun Uni;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
@@ -109,49 +109,49 @@
         <value>Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value>
       </prop>
       <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
-        <value>Arial;Albany;Albany AMT;Liberation Sans;Nimbus Sans L;DejaVu Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Liberation Sans;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="SANS_UNICODE" oor:type="xs:string" oor:op="replace">
-        <value>Andale Sans UI;Arial Unicode MS;DejaVu Sans;Lucida Sans Unicode;Tahoma;Albany AMT;Albany AMT;Arial;Nimbus Sans L;Helvetica;Lucida;Geneva;Helmet;SansSerif</value>
+        <value>Andale Sans UI;Arial Unicode MS;DejaVu Sans;Lucida Sans Unicode;Tahoma;Albany AMT;Albany;Arial;Nimbus Sans L;Helvetica;Lucida;Geneva;Helmet;SansSerif</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
-        <value>Times New Roman;Thorndale;Thorndale AMT;Liberation Serif;DejaVu Serif;Nimbus Roman No9 L;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Thorndale;Times New Roman;Liberation Serif;DejaVu Serif;Nimbus Roman No9 L;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="SYMBOL" oor:type="xs:string" oor:op="replace">
         <value>StarSymbol;OpenSymbol;Andale Sans UI;Arial Unicode MS;StarBats;Zapf Dingbats;WingDings;Symbol</value>
       </prop>
       <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
-        <value>Cumberland;Cumberland AMT;Courier New;Liberation Mono;Nimbus Mono L;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
+        <value>Cumberland AMT;Cumberland;Courier New;Liberation Mono;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
       </prop>
       <prop oor:name="FIXED" oor:type="xs:string" oor:op="replace">
-        <value>Cumberland;Cumberland AMT;Courier New;Liberation Mono;Nimbus Mono L;DejaVu Sans Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
+        <value>Cumberland AMT;Cumberland;Courier New;Liberation Mono;Nimbus Mono L;DejaVu Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
       </prop>
       <prop oor:name="UI_SANS" oor:type="xs:string" oor:op="replace">
-        <value>Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;DejaVu Sans;Albany AMT;Albany;Arial;Nimbus Sans L;Bitstream Vera Sans;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Lucida;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
+        <value>Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;DejaVu Sans;Albany AMT;Albany;Arial;Nimbus Sans L;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Lucida;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
       </prop>
     </node>
 
     <node oor:name="cs" oor:op="replace">
       <prop oor:name="LATIN_DISPLAY" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Serif;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Serif;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_HEADING" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_FIXED" oor:type="xs:string" oor:op="replace">
         <value>Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
       </prop>
       <prop oor:name="LATIN_PRESENTATION" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Serif;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Serif;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
         <value>Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
         <value>Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
@@ -203,25 +203,25 @@
     </node>
    <node oor:name="hr-HR" oor:op="replace">
       <prop oor:name="LATIN_DISPLAY" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Serif;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Serif;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_HEADING" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_FIXED" oor:type="xs:string" oor:op="replace">
         <value>Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
       </prop>
       <prop oor:name="LATIN_PRESENTATION" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
         <value>Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
         <value>Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
@@ -238,25 +238,25 @@
     </node>
    <node oor:name="hu-HU" oor:op="replace">
       <prop oor:name="LATIN_DISPLAY" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Serif;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Serif;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_HEADING" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_FIXED" oor:type="xs:string" oor:op="replace">
         <value>Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
       </prop>
       <prop oor:name="LATIN_PRESENTATION" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
         <value>Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
         <value>Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
@@ -273,25 +273,25 @@
     </node>
    <node oor:name="pl-PL" oor:op="replace">
       <prop oor:name="LATIN_DISPLAY" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Serif;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Serif;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_HEADING" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_FIXED" oor:type="xs:string" oor:op="replace">
         <value>Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
       </prop>
       <prop oor:name="LATIN_PRESENTATION" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
         <value>Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
         <value>Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
@@ -308,60 +308,60 @@
     </node>
    <node oor:name="tg" oor:op="replace">
       <prop oor:name="LATIN_DISPLAY" oor:type="xs:string" oor:op="replace">
-        <value>Palatino Linotype;Arial;Helvetica;Lucida;Palatino;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Palatino Linotype;Albany AMT;Albany;Arial;Nimbus Sans L;Helvetica;Lucida;Palatino;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_HEADING" oor:type="xs:string" oor:op="replace">
-        <value>Palatino Linotype;Arial;Helvetica;Lucida;Palatino;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Palatino Linotype;Albany AMT;Albany;Arial;Nimbus Sans L;Helvetica;Lucida;Palatino;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_FIXED" oor:type="xs:string" oor:op="replace">
-        <value>Palatino Linotype;Arial;Helvetica;Lucida;Palatino;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Palatino Linotype;Albany AMT;Albany;Arial;Nimbus Sans L;Helvetica;Lucida;Palatino;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_PRESENTATION" oor:type="xs:string" oor:op="replace">
-        <value>Palatino Linotype;Arial;Helvetica;Lucida;Palatino;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Palatino Linotype;Albany AMT;Albany;Arial;Nimbus Sans L;Helvetica;Lucida;Palatino;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-        <value>Palatino Linotype;Arial;Helvetica;Lucida;Palatino;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Palatino Linotype;Albany AMT;Albany;Arial;Nimbus Sans L;Helvetica;Lucida;Palatino;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>Palatino Linotype;Arial;Helvetica;Lucida;Palatino;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Palatino Linotype;Albany AMT;Albany;Arial;Nimbus Sans L;Helvetica;Lucida;Palatino;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
-        <value>Palatino Linotype;Arial;Helvetica;Lucida;Palatino;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Palatino Linotype;Albany AMT;Albany;Arial;Nimbus Sans L;Helvetica;Lucida;Palatino;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
-        <value>Arial;Helvetica;Lucida;Palatino;Palatino Linotype;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Helvetica;Lucida;Palatino;Palatino Linotype;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
-        <value>Palatino Linotype;Arial;Helvetica;Lucida;Palatino;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Palatino Linotype;Albany AMT;Albany;Arial;Nimbus Sans L;Helvetica;Lucida;Palatino;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="FIXED" oor:type="xs:string" oor:op="replace">
-        <value>Palatino Linotype;Arial;Helvetica;Lucida;Palatino;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Palatino Linotype;Albany AMT;Albany;Arial;Nimbus Sans L;Helvetica;Lucida;Palatino;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="UI_SANS" oor:type="xs:string" oor:op="replace">
-        <value>Palatino Linotype;Arial;Helvetica;Lucida;Palatino;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Palatino Linotype;Albany AMT;Albany;Arial;Nimbus Sans L;Helvetica;Lucida;Palatino;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
     </node>
    <node oor:name="ro-RO" oor:op="replace">
       <prop oor:name="LATIN_DISPLAY" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Serif;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Serif;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_HEADING" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_FIXED" oor:type="xs:string" oor:op="replace">
         <value>Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
       </prop>
       <prop oor:name="LATIN_PRESENTATION" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
         <value>Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
         <value>Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
@@ -378,25 +378,25 @@
     </node>
    <node oor:name="sk-SK" oor:op="replace">
       <prop oor:name="LATIN_DISPLAY" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Serif;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Serif;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_HEADING" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_FIXED" oor:type="xs:string" oor:op="replace">
         <value>Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
       </prop>
       <prop oor:name="LATIN_PRESENTATION" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
         <value>Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
         <value>Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
@@ -413,25 +413,25 @@
     </node>
    <node oor:name="sl-SI" oor:op="replace">
       <prop oor:name="LATIN_DISPLAY" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Serif;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Serif;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_HEADING" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_FIXED" oor:type="xs:string" oor:op="replace">
         <value>Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
       </prop>
       <prop oor:name="LATIN_PRESENTATION" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
         <value>Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
-        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
         <value>Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
@@ -472,25 +472,25 @@
     </node>
     <node oor:name="he" oor:op="replace">
      <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string">
-        <value>tahoma;nachlieli;lucidagrande;lucidasans;supplement;Andale Sans UI;arialunicodems;lucidasansunicode;interfaceuser;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif</value>
+        <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;tahoma;nachlieli;lucidagrande;lucidasans;supplement;Andale Sans UI;arialunicodems;lucidasansunicode;interfaceuser;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
      </prop>
       <prop oor:name="SANS_UNICODE" oor:type="xs:string" oor:op="replace">
-        <value>lucidasans;arialunicodems;lucidasansunicode;tahoma;nachlieli;lucidagrande;clearlyu;lucida;sansserif</value>
+        <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;lucidasans;arialunicodems;lucidasansunicode;tahoma;nachlieli;lucidagrande;clearlyu;lucida;sansserif</value>
       </prop>
      <prop oor:name="CTL_DISPLAY" oor:type="xs:string" oor:op="replace">
-        <value>tahoma;nachlieli;lucidagrande;lucidasans;arialunicodems</value>
+        <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;tahoma;nachlieli;lucidagrande;lucidasans;arialunicodems</value>
      </prop>
      <prop oor:name="CTL_HEADING" oor:type="xs:string" oor:op="replace">
-        <value>tahoma;nachlieli;lucidagrande;lucidasans;arialunicodems</value>
+        <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;tahoma;nachlieli;lucidagrande;lucidasans;arialunicodems</value>
      </prop>
      <prop oor:name="CTL_PRESENTATION" oor:type="xs:string" oor:op="replace">
-        <value>tahoma;nachlieli;lucidagrande;lucidasans;arialunicodems</value>
+        <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;tahoma;nachlieli;lucidagrande;lucidasans;arialunicodems</value>
      </prop>
      <prop oor:name="CTL_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-        <value>tahoma;nachlieli;lucidagrande;lucidasans;arialunicodems</value>
+        <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;tahoma;nachlieli;lucidagrande;lucidasans;arialunicodems</value>
      </prop>
      <prop oor:name="CTL_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>tahoma;nachlieli;lucidagrande;lucidasans;arialunicodems</value>
+        <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;tahoma;nachlieli;lucidagrande;lucidasans;arialunicodems</value>
      </prop>
     </node>
     <node oor:name="th" oor:op="replace">
@@ -547,171 +547,171 @@
     </node>
     <node oor:name="zh-cn" oor:op="replace">
       <prop oor:name="CJK_DISPLAY" oor:type="xs:string" oor:op="replace">
-        <value>微软雅黑;方正宋体;MSung Light SC;SimSun;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>微软雅黑;方正宋体;ZYSong18030;AR PL SungtiL GB;MSung Light SC;SimSun;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_FIXED" oor:type="xs:string" oor:op="replace">
-        <value>方正宋体;新宋体;NSimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light SC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
+        <value>方正宋体;ZYSong18030;AR PL SungtiL GB;新宋体;NSimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light SC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
       </prop>
       <prop oor:name="CJK_HEADING" oor:type="xs:string" oor:op="replace">
-        <value>微软雅黑;方正黑体;方正宋体;宋体;SimSun;黑体;文鼎PL中楷Uni;AR PL ZenKai Uni;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light SC;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>微软雅黑;方正黑体;方正宋体;ZYSong18030;AR PL SungtiL GB;宋体;SimSun;黑体;文鼎PL中楷Uni;AR PL ZenKai Uni;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light SC;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="CJK_PRESENTATION" oor:type="xs:string" oor:op="replace">
-        <value>微软雅黑;方正宋体;宋体;SimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light SC;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>微软雅黑;方正宋体;ZYSong18030;AR PL SungtiL GB;宋体;SimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light SC;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="CJK_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-        <value>微软雅黑;方正宋体;宋体;SimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light SC;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>微软雅黑;方正宋体;ZYSong18030;AR PL SungtiL GB;宋体;SimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light SC;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="CJK_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>方正宋体;SimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light SC;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>方正宋体;ZYSong18030;AR PL SungtiL GB;SimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light SC;Song;FZSongYi;FZShuSong;NSimSun;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
-        <value>方正宋体;新宋体;NSimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light SC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
+        <value>方正宋体;ZYSong18030;AR PL SungtiL GB;新宋体;NSimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light SC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
       </prop>
       <prop oor:name="FIXED" oor:type="xs:string" oor:op="replace">
-        <value>方正宋体;新宋体;NSimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light SC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
+        <value>方正宋体;ZYSong18030;AR PL SungtiL GB;新宋体;NSimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light SC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
       </prop>
       <prop oor:name="UI_SANS" oor:type="xs:string" oor:op="replace">
-        <value>方正宋体;SimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;Andale Sans UI;ZYSong18030;AR PL SungtiL GB;AR PL KaitiM GB;SimSun;Arial Unicode MS;Fangsong;Hei;Song;Kai;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif</value>
+        <value>方正宋体;ZYSong18030;AR PL SungtiL GB;SimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;Andale Sans UI;ZYSong18030;AR PL SungtiL GB;AR PL KaitiM GB;SimSun;Arial Unicode MS;Fangsong;Hei;Song;Kai;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
       </prop>
     </node>
     <node oor:name="zh-tw" oor:op="replace">
       <prop oor:name="LATIN_FIXED" oor:type="xs:string" oor:op="replace">
-        <value>方正明體;細明體;MingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
+        <value>方正明體;AR PL Mingti2L Big5;細明體;MingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
       </prop>
       <prop oor:name="CJK_DISPLAY" oor:type="xs:string" oor:op="replace">
-        <value>微软雅黑;方正明體;新細明體;PMingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;MingLiU;Ming;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>微软雅黑;方正明體;AR PL Mingti2L Big5;新細明體;PMingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;MingLiU;Ming;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="CJK_HEADING" oor:type="xs:string" oor:op="replace">
         <value>方正黑体;新細明體;PMingLiU;文鼎PL中楷Uni;AR PL ZenKai Uni;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;MingLiU;Ming;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="CJK_PRESENTATION" oor:type="xs:string" oor:op="replace">
-        <value>微软雅黑;方正明體;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>微软雅黑;方正明體;AR PL Mingti2L Big5;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="CJK_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-        <value>微软雅黑;方正明體;新細明體;PMingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;MingLiU;Ming;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>微软雅黑;方正明體;AR PL Mingti2L Big5;新細明體;PMingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;MingLiU;Ming;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="CJK_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>微软雅黑;方正明體;新細明體;PMingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;MingLiU;Ming;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>微软雅黑;方正明體;AR PL Mingti2L Big5;新細明體;PMingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;MingLiU;Ming;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
-        <value>方正明體;細明體;MingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
+        <value>方正明體;AR PL Mingti2L Big5;細明體;MingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
       </prop>
       <prop oor:name="FIXED" oor:type="xs:string" oor:op="replace">
-        <value>方正明體;細明體;MingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
+        <value>方正明體;AR PL Mingti2L Big5;細明體;MingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
       </prop>
       <prop oor:name="UI_SANS" oor:type="xs:string" oor:op="replace">
-        <value>微软雅黑;方正明體;新細明體;PMingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;Andale Sans UI;AR PL Mingti2L Big5;AR PL KaitiM Big5;Kai;Arial Unicode MS;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif</value>
+        <value>微软雅黑;方正明體;AR PL Mingti2L Big5;新細明體;PMingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;Andale Sans UI;AR PL Mingti2L Big5;AR PL KaitiM Big5;Kai;Arial Unicode MS;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
       </prop>
     </node>
     <node oor:name="zh-hk" oor:op="replace">
       <prop oor:name="LATIN_FIXED" oor:type="xs:string" oor:op="replace">
-        <value>方正明體;細明體;MingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
+        <value>方正明體;AR PL Mingti2L Big5;細明體;MingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
       </prop>
       <prop oor:name="CJK_DISPLAY" oor:type="xs:string" oor:op="replace">
-        <value>微软雅黑;方正明體;新細明體;PMingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;MingLiU;Ming;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>微软雅黑;方正明體;AR PL Mingti2L Big5;新細明體;PMingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;MingLiU;Ming;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="CJK_HEADING" oor:type="xs:string" oor:op="replace">
-        <value>微软雅黑;FZHeiTi;方正明體;新細明體;PMingLiU;文鼎PL中楷Uni;AR PL ZenKai Uni;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;MingLiU;Ming;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>微软雅黑;FZHeiTi;方正明體;AR PL Mingti2L Big5;新細明體;PMingLiU;文鼎PL中楷Uni;AR PL ZenKai Uni;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;MingLiU;Ming;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="CJK_PRESENTATION" oor:type="xs:string" oor:op="replace">
-        <value>微软雅黑;方正明體;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>微软雅黑;方正明體;AR PL Mingti2L Big5;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="CJK_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-        <value>微软雅黑;方正明體;新細明體;PMingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;MingLiU;Ming;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>微软雅黑;方正明體;AR PL Mingti2L Big5;新細明體;PMingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;MingLiU;Ming;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="CJK_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>方正明體;新細明體;PMingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;MingLiU;Ming;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>方正明體;AR PL Mingti2L Big5;新細明體;PMingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;MingLiU;Ming;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
-        <value>方正明體;細明體;MingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
+        <value>方正明體;AR PL Mingti2L Big5;細明體;MingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
       </prop>
       <prop oor:name="FIXED" oor:type="xs:string" oor:op="replace">
-        <value>方正明體;細明體;MingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
+        <value>方正明體;AR PL Mingti2L Big5;細明體;MingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
       </prop>
       <prop oor:name="UI_SANS" oor:type="xs:string" oor:op="replace">
-        <value>微软雅黑;方正明體;新細明體;PMingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;Andale Sans UI;AR PL Mingti2L Big5;AR PL KaitiM Big5;Kai;Arial Unicode MS;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif</value>
+        <value>微软雅黑;方正明體;AR PL Mingti2L Big5;新細明體;PMingLiU;文鼎PL細上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;Andale Sans UI;AR PL Mingti2L Big5;AR PL KaitiM Big5;Kai;Arial Unicode MS;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
       </prop>
     </node>
     <node oor:name="zh-sg" oor:op="replace">
       <prop oor:name="LATIN_FIXED" oor:type="xs:string" oor:op="replace">
-        <value>方正宋体;新宋体;NSimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
+        <value>方正宋体;ZYSong18030;AR PL SungtiL GB;新宋体;NSimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
       </prop>
       <prop oor:name="CJK_DISPLAY" oor:type="xs:string" oor:op="replace">
-        <value>微软雅黑;方正宋体;宋体;SimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;Song;FZSongYi;FZShuSong;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>微软雅黑;方正宋体;ZYSong18030;AR PL SungtiL GB;宋体;SimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;Song;FZSongYi;FZShuSong;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="CJK_HEADING" oor:type="xs:string" oor:op="replace">
-        <value>微软雅黑;方正黑体;方正宋体;宋体;SimSun;文鼎PL中楷Uni;AR PL ZenKai Uni;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;Song;FZSongYi;FZShuSong;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>微软雅黑;方正黑体;方正宋体;ZYSong18030;AR PL SungtiL GB;宋体;SimSun;文鼎PL中楷Uni;AR PL ZenKai Uni;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;Song;FZSongYi;FZShuSong;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="CJK_PRESENTATION" oor:type="xs:string" oor:op="replace">
-        <value>微软雅黑;方正宋体;SimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;Song;FZSongYi;FZShuSong;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>微软雅黑;方正宋体;ZYSong18030;AR PL SungtiL GB;SimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;Song;FZSongYi;FZShuSong;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="CJK_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-        <value>微软雅黑;方正宋体;SimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;Song;FZSongYi;FZShuSong;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>微软雅黑;方正宋体;ZYSong18030;AR PL SungtiL GB;SimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;Song;FZSongYi;FZShuSong;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="CJK_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>微软雅黑;方正宋体;宋体;SimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;Song;FZSongYi;FZShuSong;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>微软雅黑;方正宋体;ZYSong18030;AR PL SungtiL GB;宋体;SimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;Song;FZSongYi;FZShuSong;MSung Light TC;MingLiU;Ming;PMingLiU;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
-        <value>方正宋体;新宋体;NSimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
+        <value>方正宋体;ZYSong18030;AR PL SungtiL GB;新宋体;NSimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
       </prop>
       <prop oor:name="FIXED" oor:type="xs:string" oor:op="replace">
-        <value>方正宋体;新宋体;NSimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
+        <value>方正宋体;ZYSong18030;AR PL SungtiL GB;新宋体;NSimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
       </prop>
       <prop oor:name="UI_SANS" oor:type="xs:string" oor:op="replace">
-        <value>方正宋体;SimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;Andale Sans UI;ZYSong18030;AR PL SungtiL GB;AR PL KaitiM GB;SimSun;Arial Unicode MS;Fangsong;Hei;Song;Kai;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif</value>
+        <value>方正宋体;ZYSong18030;AR PL SungtiL GB;SimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;Andale Sans UI;ZYSong18030;AR PL SungtiL GB;AR PL KaitiM GB;SimSun;Arial Unicode MS;Fangsong;Hei;Song;Kai;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif</value>
       </prop>
     </node>
     <node oor:name="ko-kr" oor:op="replace">
       <prop oor:name="LATIN_FIXED" oor:type="xs:string" oor:op="replace">
-        <value>�굴림;SunGulim;굴림;Gulim;Baekmuk Batang;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
+        <value>�굴림;SunGulim;Baekmuk Gulim;굴림;Gulim;Baekmuk Batang;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
       </prop>
       <prop oor:name="LATIN_DISPLAY" oor:type="xs:string" oor:op="replace">
-        <value>��움;SunDotum;�움;Dotum;�굴림;SunGulim;굴림;Gulim;Baekmuk Batang;Roundgothic;Albany AMT;Albany;Arial;Nimbus Sans L;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>��움;SunDotum;Baekmuk Dotum;�움;Dotum;�굴림;SunGulim;Baekmuk Gulim;굴림;Gulim;Baekmuk Batang;Roundgothic;Albany AMT;Albany;Arial;Nimbus Sans L;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_HEADING" oor:type="xs:string" oor:op="replace">
-        <value>�바탕;SunBatang;바탕;Batang;Myeongjo;�굴림;SunGulim;굴림;Gulim;Baekmuk Batang;Roundgothic;Albany AMT;Albany;Arial;Nimbus Sans L;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>�바탕;SunBatang;Baekmuk Batang;바탕;Batang;Myeongjo;�굴림;SunGulim;Baekmuk Gulim;굴림;Gulim;Baekmuk Batang;Roundgothic;Albany AMT;Albany;Arial;Nimbus Sans L;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_PRESENTATION" oor:type="xs:string" oor:op="replace">
-        <value>�굴림;SunGulim;굴림;Gulim;Batang;Myeongjo;Gulim;Baekmuk Batang;Roundgothic;Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>�굴림;SunGulim;Baekmuk Gulim;굴림;Gulim;Batang;Myeongjo;Gulim;Baekmuk Batang;Roundgothic;Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-        <value>��움;SunDotum;�움;Dotum;백묵�움;BaekmukDotum;Batang;Myeongjo;�굴림;SunGulim;Gulim;Baekmuk Batang;Roundgothic</value>
+        <value>��움;SunDotum;Baekmuk Dotum;�움;Dotum;백묵�움;BaekmukDotum;Batang;Myeongjo;�굴림;SunGulim;Baekmuk Gulim;Gulim;Baekmuk Batang;Roundgothic</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>�바탕;SunBatang;Batang;Myeongjo;�굴림;SunGulim;Gulim;Baekmuk Batang;Roundgothic;Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>�바탕;SunBatang;Baekmuk Batang;Batang;Myeongjo;�굴림;SunGulim;Baekmuk Gulim;Gulim;Baekmuk Batang;Roundgothic;Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
-        <value>��움;SunDotum;�움;Dotum;바탕;Batang;Myeongjo;�굴림;SunGulim;굴림;Gulim;Baekmuk Batang;Roundgothic;Albany AMT;Albany;Arial;Nimbus Sans L;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>��움;SunDotum;Baekmuk Dotum;�움;Dotum;바탕;Batang;Myeongjo;�굴림;SunGulim;Baekmuk Gulim;굴림;Gulim;Baekmuk Batang;Roundgothic;Albany AMT;Albany;Arial;Nimbus Sans L;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="SANS_UNICODE" oor:type="xs:string" oor:op="replace">
-        <value>�굴림;SunGulim;굴림;Gulim;Baekmuk Batang;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;Albany AMT;Albany;Arial;Nimbus Sans L;Helvetica;Lucida;Geneva;Helmet;SansSerif</value>
+        <value>�굴림;SunGulim;Baekmuk Gulim;굴림;Gulim;Baekmuk Batang;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;Albany AMT;Albany;Arial;Nimbus Sans L;Helvetica;Lucida;Geneva;Helmet;SansSerif</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
-        <value>�굴림;SunGulim;굴림;Gulim;Batang;Myeongjo;Gulim;Baekmuk Batang;Roundgothic;Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>�굴림;SunGulim;Baekmuk Gulim;굴림;Gulim;Batang;Myeongjo;Gulim;Baekmuk Batang;Roundgothic;Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="CJK_DISPLAY" oor:type="xs:string" oor:op="replace">
-        <value>�굴림;SunGulim;굴림;Gulim;Baekmuk Batang;Roundgothic;Andale Sans UI;Arial Unicode MS</value>
+        <value>�굴림;SunGulim;Baekmuk Gulim;굴림;Gulim;Baekmuk Batang;Roundgothic;Andale Sans UI;Arial Unicode MS</value>
       </prop>
       <prop oor:name="CJK_HEADING" oor:type="xs:string" oor:op="replace">
-        <value>�바탕;SunBatang;바탕;Batang;Myeongjo;�굴림;SunGulim;Andale Sans UI;Gulim;Baekmuk Batang;Roundgothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode</value>
+        <value>�바탕;SunBatang;Baekmuk Batang;바탕;Batang;Myeongjo;�굴림;SunGulim;Baekmuk Gulim;Andale Sans UI;Gulim;Baekmuk Batang;Roundgothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode</value>
       </prop>
       <prop oor:name="CJK_PRESENTATION" oor:type="xs:string" oor:op="replace">
-        <value>�굴림;SunGulim;굴림;Gulim;바탕;Batang;Baekmuk Batang;Myeongjo;Andale Sans UI;Gulim;Roundgothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode</value>
+        <value>�굴림;SunGulim;Baekmuk Gulim;굴림;Gulim;바탕;Batang;Baekmuk Batang;Myeongjo;Andale Sans UI;Gulim;Roundgothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode</value>
       </prop>
       <prop oor:name="CJK_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-        <value>��움;SunDotum;�움;Dotum;바탕;Batang;Myeongjo;�굴림;SunGulim;Baekmuk Batang;Andale Sans UI;Gulim;Roundgothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode</value>
+        <value>��움;SunDotum;Baekmuk Dotum;�움;Dotum;바탕;Batang;Myeongjo;�굴림;SunGulim;Baekmuk Gulim;Baekmuk Batang;Andale Sans UI;Gulim;Roundgothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode</value>
       </prop>
       <prop oor:name="CJK_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>�바탕;SunBatang;바탕;Batang;Myeongjo;�굴림;SunGulim;Andale Sans UI;Gulim;Baekmuk Batang;Roundgothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode</value>
+        <value>�바탕;SunBatang;Baekmuk Batang;바탕;Batang;Myeongjo;�굴림;SunGulim;Baekmuk Gulim;Andale Sans UI;Gulim;Baekmuk Batang;Roundgothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode</value>
       </prop>
       <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
-        <value>�굴림;SunGulim;굴림;Gulim;Baekmuk Batang;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
+        <value>�굴림;SunGulim;Baekmuk Gulim;굴림;Gulim;Baekmuk Batang;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
       </prop>
       <prop oor:name="UI_SANS" oor:type="xs:string" oor:op="replace">
         <value>�굴림;sungulim;굴림;Gulim;Baekmuk Batang;RoundGothic;Arial Unicode MS;Lucida Sans Unicode;AndaleSansUI;GNU-Unifont</value>
       </prop>
       <prop oor:name="FIXED" oor:type="xs:string" oor:op="replace">
-        <value>�굴림;SunGulim;굴림;Gulim;Baekmuk Batang;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
+        <value>�굴림;SunGulim;Baekmuk Gulim;굴림;Gulim;Baekmuk Batang;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
       </prop>
     </node>
     <node oor:name="bn" oor:op="replace">
@@ -1097,61 +1097,61 @@
 
     <node oor:name="ak-GH" oor:op="replace">
     <prop oor:name="LATIN_DISPLAY" oor:type="xs:string" oor:op="replace">
-        <value>Arial Unicode MS;Lucida Sans Unicode;Gentium;Aboriginal Sans;FreeSans;Arial;Luxi Sans;Helvetica;Lucida;Geneva;SansSerif;Andale Sans UI;Tahoma</value>
+        <value>Arial Unicode MS;Lucida Sans Unicode;Gentium;Aboriginal Sans;FreeSans;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Andale Sans UI;Tahoma;SansSerif</value>
     </prop>
     <prop oor:name="LATIN_HEADING" oor:type="xs:string" oor:op="replace">
-        <value>Arial Unicode MS;Lucida Sans Unicode;Gentium;Aboriginal Sans;FreeSans;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Tahoma</value>
+        <value>Arial Unicode MS;Lucida Sans Unicode;Gentium;Aboriginal Sans;FreeSans;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Tahoma;SansSerif</value>
     </prop>
     <prop oor:name="LATIN_FIXED" oor:type="xs:string" oor:op="replace">
-        <value>FreeMono;Courier New;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
+        <value>FreeMono;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
     </prop>
     <prop oor:name="LATIN_PRESENTATION" oor:type="xs:string" oor:op="replace">
-        <value>Arial Unicode MS;Lucida Sans Unicode;Gentium;Aboriginal Sans;FreeSans;Arial;Luxi Sans;Helvetica;Lucida;Geneva;SansSerif;Andale Sans UI;Tahoma</value>
+        <value>Arial Unicode MS;Lucida Sans Unicode;Gentium;Aboriginal Sans;FreeSans;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Andale Sans UI;Tahoma;SansSerif</value>
     </prop>
     <prop oor:name="LATIN_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-        <value>Arial Unicode MS;Lucida Sans Unicode;Gentium;Aboriginal Sans;FreeSans;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Tahoma</value>
+        <value>Arial Unicode MS;Lucida Sans Unicode;Gentium;Aboriginal Sans;FreeSans;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Tahoma;SansSerif</value>
     </prop>
     <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>Gentium;Aboriginal Serif;FreeSerif;Luxi Serif;Times New Roman;Times;Lucida Serif;Lucida Bright;Serif</value>
+        <value>Gentium;Aboriginal Serif;FreeSerif;Luxi Serif;Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Times;Lucida Serif;Lucida Bright;Serif</value>
     </prop>
     <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
-        <value>Arial Unicode MS;Lucida Sans Unicode;Gentium;Aboriginal Sans;FreeSans;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Tahoma</value>
+        <value>Arial Unicode MS;Lucida Sans Unicode;Gentium;Aboriginal Sans;FreeSans;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Tahoma;SansSerif</value>
     </prop>
     <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
-        <value> Gentium;Aboriginal Serif;FreeSerif;Luxi Serif;Times New Roman;Times;Lucida Serif;Lucida Bright;Serif</value>
+        <value> Gentium;Aboriginal Serif;FreeSerif;Luxi Serif;Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Times;Lucida Serif;Lucida Bright;Serif</value>
     </prop>
     <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
-        <value>FreeMono;Courier New;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
+        <value>FreeMono;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
     </prop>
     <prop oor:name="FIXED" oor:type="xs:string" oor:op="replace">
-        <value>FreeMono;Courier New;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
+        <value>FreeMono;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
     </prop>
     <prop oor:name="UI_SANS" oor:type="xs:string" oor:op="replace">
-        <value>Arial Unicode MS;Lucida Sans Unicode;Gentium;Aboriginal Sans;FreeSans;Arial;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Tahoma</value>
+        <value>Arial Unicode MS;Lucida Sans Unicode;Gentium;Aboriginal Sans;FreeSans;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Tahoma;SansSerif</value>
     </prop>
     </node>
 
     <node oor:name="uz" oor:op="replace">
       <prop oor:name="LATIN_DISPLAY" oor:type="xs:string" oor:op="replace">
-        <value>DejaVu Sans;Arial Unicode MS;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Serif;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Lucida Sans Unicode;Tahoma</value>
+        <value>DejaVu Sans;Arial Unicode MS;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Serif;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_HEADING" oor:type="xs:string" oor:op="replace">
-        <value>DejaVu Sans;Arial Unicode MS;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Lucida Sans Unicode;Tahoma</value>
+        <value>DejaVu Sans;Arial Unicode MS;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_FIXED" oor:type="xs:string" oor:op="replace">
         <value>DejaVu Sans Mono;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Luxi Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
       </prop>
       <prop oor:name="LATIN_PRESENTATION" oor:type="xs:string" oor:op="replace">
-        <value>DejaVu Sans;Arial Unicode MS;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Serif;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Lucida Sans Unicode;Tahoma</value>
+        <value>DejaVu Sans;Arial Unicode MS;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Serif;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-        <value>DejaVu Sans;Arial Unicode MS;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Lucida Sans Unicode;Tahoma</value>
+        <value>DejaVu Sans;Arial Unicode MS;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
         <value>DejaVu Serif;Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
-        <value>DejaVu Sans;Arial Unicode MS;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Lucida Sans Unicode;Tahoma</value>
+        <value>DejaVu Sans;Arial Unicode MS;Albany AMT;Albany;Arial;Nimbus Sans L;Luxi Sans;Helvetica;Lucida;Geneva;Helmet;Andale Sans UI;Lucida Sans Unicode;Tahoma;SansSerif</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
         <value>DejaVu Serif;Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
@@ -1216,7 +1216,7 @@
     <node oor:name="en" oor:op="replace">
       <node oor:name="albany" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>albanyamt;arial;liberationsans;nimbussansl;helvetica;lucidasans;lucida;geneva;helmet;sansserif;nimbussans;andalesansui;arialunicodems;lucidaunicode</value>
+          <value>albanyamt;albany;arial;liberationsans;nimbussansl;helvetica;lucidasans;lucida;geneva;helmet;sansserif;nimbussans;andalesansui;arialunicodems;lucidaunicode</value>
         </prop>
         <prop oor:name="SubstFontsMS">
           <value>Arial</value>
@@ -1239,7 +1239,7 @@
       </node>
       <node oor:name="albanyamt" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>albany;arial;liberationsans;nimbussansl;helvetica;lucidasans;lucida;geneva;helmet;sansserif;nimbussans;andalesansui;arialunicodems;lucidaunicode</value>
+          <value>albanyamt;albany;arial;liberationsans;nimbussansl;helvetica;lucidasans;lucida;geneva;helmet;sansserif;nimbussans;andalesansui;arialunicodems;lucidaunicode</value>
         </prop>
         <prop oor:name="SubstFontsMS">
           <value>Arial</value>
@@ -1423,7 +1423,7 @@
       </node>
       <node oor:name="arial" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>liberationsans;albany;albanyamt;nimbussansl;helvetica;lucidasans;lucida;geneva;helmet;nimbussans;andalesansui;arialunicodems;lucidaunicode</value>
+          <value>liberationsans;albanyamt;albany;nimbussansl;helvetica;lucidasans;lucida;geneva;helmet;nimbussans;andalesansui;arialunicodems;lucidaunicode</value>
         </prop>
         <prop oor:name="SubstFontsMS"><value></value></prop>
         <prop oor:name="SubstFontsPS"><value>Helvetica</value></prop>
@@ -1661,7 +1661,7 @@
       </node>
       <node oor:name="bitstreamverasansmono" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>dejavusansmono;couriernew;liberationmono</value>
+          <value>dejavusansmono;cumberlandamt;cumberland;couriernew;nimbusmonol;liberationmono</value>
         </prop>
         <prop oor:name="SubstFontsHTML"><value>monospace</value></prop>
         <prop oor:name="FontWeight"><value>Normal</value></prop>
@@ -2026,7 +2026,7 @@
       </node>
       <node oor:name="cgtimes" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>thorndale;thorndaleamt;timesnewroman;liberationserif;nimbusromanno9l;times;timesroman;newyork;timmons;lucidaserif;lucidabright;roman;nimbusromanno9;bookman;itcbookman;garamond;garamondmt;palatino</value>
+          <value>thorndaleamt;thorndale;timesnewroman;liberationserif;nimbusromanno9l;times;timesroman;newyork;timmons;lucidaserif;lucidabright;roman;nimbusromanno9;bookman;itcbookman;garamond;garamondmt;palatino</value>
         </prop>
         <prop oor:name="SubstFontsMS">
           <value></value>
@@ -2394,7 +2394,7 @@
       </node>
       <node oor:name="courier" oor:op="replace">
     <prop oor:name="SubstFonts">
-          <value>cumberland;cumberlandamt;liberationmono;couriernew;nimbusmonol;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>
+          <value>cumberlandamt;cumberland;liberationmono;couriernew;nimbusmonol;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>
         </prop>
     <prop oor:name="SubstFontsMS"><value>Courier New</value></prop>
     <prop oor:name="SubstFontsPS"><value></value></prop>
@@ -2405,7 +2405,7 @@
       </node>
       <node oor:name="couriernew" oor:op="replace">
     <prop oor:name="SubstFonts">
-      <value>cumberland;cumberlandamt;liberationmono;dejavusansmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>
+      <value>cumberlandamt;cumberland;liberationmono;dejavusansmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>
         </prop>
     <prop oor:name="SubstFontsMS"><value></value></prop>
     <prop oor:name="SubstFontsPS"><value>Courier</value></prop>
@@ -2416,7 +2416,7 @@
       </node>
       <node oor:name="cumberland" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>cumberlandamt;couriernew;liberationmono;dejavusansmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>
+          <value>cumberlandamt;cumberland;couriernew;liberationmono;dejavusansmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>
         </prop>
         <prop oor:name="SubstFontsMS">
           <value>Courier New</value>
@@ -2439,7 +2439,7 @@
       </node>
       <node oor:name="cumberlandamt" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>cumberland;couriernew;liberationmono;dejavusansmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>
+          <value>cumberlandamt;cumberland;couriernew;liberationmono;dejavusansmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>
         </prop>
         <prop oor:name="SubstFontsMS">
           <value>Courier New</value>
@@ -2528,7 +2528,7 @@
       </node>
       <node oor:name="dejavusansmono" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>bitstreamverasansmono;couriernew;liberationmono</value>
+          <value>bitstreamverasansmono;cumberlandamt;cumberland;couriernew;nimbusmonol;liberationmono</value>
         </prop>
         <prop oor:name="SubstFontsHTML"><value>monospace</value></prop>
         <prop oor:name="FontWeight"><value>Normal</value></prop>
@@ -3549,7 +3549,7 @@
       </node>
       <node oor:name="helv" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>albany;albanyamt;arial;liberationsans;nimbussansl;helvetica;lucidasans;lucida;geneva;helmet;sansserif;nimbussans;andalesansui;arialunicodems;lucidaunicode</value>
+          <value>albanyamt;albany;arial;liberationsans;nimbussansl;helvetica;lucidasans;lucida;geneva;helmet;sansserif;nimbussans;andalesansui;arialunicodems;lucidaunicode</value>
         </prop>
         <prop oor:name="SubstFontsMS">
           <value>Arial</value>
@@ -3572,7 +3572,7 @@
       </node>
       <node oor:name="helvetica" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>albany;albanyamt;liberationsans;arial;nimbussansl;lucidasans;lucida;geneva;helmet;sansserif;nimbussans;andalesansui;arialunicodems;lucidaunicode</value>
+          <value>albanyamt;albany;liberationsans;arial;nimbussansl;lucidasans;lucida;geneva;helmet;sansserif;nimbussans;andalesansui;arialunicodems;lucidaunicode</value>
         </prop>
         <prop oor:name="SubstFontsMS">
           <value>Arial</value>
@@ -4721,7 +4721,7 @@
       </node>
       <node oor:name="liberationsans" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>albany;albanyamt;arial;nimbussansl;helvetica;lucidasans;lucida;geneva;helmet;nimbussans;andalesansui;arialunicodems;lucidaunicode</value>
+          <value>albanyamt;albany;arial;nimbussansl;helvetica;lucidasans;lucida;geneva;helmet;nimbussans;andalesansui;arialunicodems;lucidaunicode</value>
         </prop>
         <prop oor:name="SubstFontsMS">
           <value>Arial</value>
@@ -4744,7 +4744,7 @@
       </node>
       <node oor:name="liberationserif" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>thorndale;thorndaleamt;timesnewroman;nimbusromanno9l;times;timesroman;newyork;timmons;lucidaserif;lucidabright;roman;nimbusromanno9;bookman;itcbookman;garamond;garamondmt;palatino</value>
+          <value>thorndaleamt;thorndale;timesnewroman;nimbusromanno9l;times;timesroman;newyork;timmons;lucidaserif;lucidabright;roman;nimbusromanno9;bookman;itcbookman;garamond;garamondmt;palatino</value>
         </prop>
         <prop oor:name="SubstFontsMS">
           <value>Times New Roman</value>
@@ -4767,7 +4767,7 @@
       </node>
       <node oor:name="liberationmono" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>cumberland;cumberlandamt;couriernew;dejavusansmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>
+          <value>cumberlandamt;cumberland;couriernew;dejavusansmono;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>
         </prop>
         <prop oor:name="SubstFontsMS">
           <value>Courier New</value>
@@ -5940,7 +5940,7 @@
     </node>
     <node oor:name="nimbusmonol" oor:op="replace">
     <prop oor:name="SubstFonts">
-      <value>cumberland;cumberlandamt;couriernew;liberationmono;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono</value>
+      <value>cumberlandamt;cumberland;couriernew;nimbusmonol;liberationmono;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono</value>
         </prop>
     <prop oor:name="SubstFontsMS"><value>Courier New</value></prop>
     <prop oor:name="SubstFontsPS"><value>courier</value></prop>
@@ -6561,7 +6561,7 @@
       </node>
       <node oor:name="sansl" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>albany;albanyamt;arial;liberationsans;nimbussansl;helvetica;lucidasans;lucida;geneva;helmet;sansserif;nimbussans;andalesansui;arialunicodems;lucidaunicode</value>
+          <value>albanyamt;albany;arial;liberationsans;nimbussansl;helvetica;lucidasans;lucida;geneva;helmet;sansserif;nimbussans;andalesansui;arialunicodems;lucidaunicode</value>
         </prop>
         <prop oor:name="SubstFontsMS">
           <value>Verdana</value>
@@ -7228,7 +7228,7 @@
       </node>
       <node oor:name="thorndale" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>thorndaleamt;timesnewroman;liberationserif;nimbusromanno9l;times;timesroman;newyork;timmons;serif;lucidaserif;lucidabright;roman;nimbusromanno9;bookman;itcbookman;garamond;garamondmt;palatino</value>
+          <value>thorndaleamt;thorndale;timesnewroman;liberationserif;nimbusromanno9l;times;timesroman;newyork;timmons;serif;lucidaserif;lucidabright;roman;nimbusromanno9;bookman;itcbookman;garamond;garamondmt;palatino</value>
         </prop>
         <prop oor:name="SubstFontsMS">
           <value>Times New Roman</value>
@@ -7251,7 +7251,7 @@
       </node>
       <node oor:name="thorndaleamt" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>thorndale;timesnewroman;liberationserif;nimbusromanno9l;times;timesroman;newyork;timmons;serif;lucidaserif;lucidabright;roman;nimbusromanno9;bookman;itcbookman;garamond;garamondmt;palatino</value>
+          <value>thorndaleamt;thorndale;timesnewroman;liberationserif;nimbusromanno9l;times;timesroman;newyork;timmons;serif;lucidaserif;lucidabright;roman;nimbusromanno9;bookman;itcbookman;garamond;garamondmt;palatino</value>
         </prop>
         <prop oor:name="SubstFontsMS">
           <value>Times New Roman</value>
@@ -7274,7 +7274,7 @@
       </node>
       <node oor:name="times" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>thorndale;thorndaleamt;timesnewroman;liberationserif;timesroman;newyork;timmons;lucidaserif;lucidabright;roman;nimbusromanno9;nimbusromanno9l;bookman;itcbookman;garamond;garamondmt;palatino</value>
+          <value>thorndaleamt;thorndale;timesnewroman;liberationserif;timesroman;newyork;timmons;lucidaserif;lucidabright;roman;nimbusromanno9;nimbusromanno9l;bookman;itcbookman;garamond;garamondmt;palatino</value>
         </prop>
         <prop oor:name="SubstFontsMS"><value>Times New Roman</value></prop>
         <prop oor:name="SubstFontsPS"><value></value></prop>
@@ -7285,7 +7285,7 @@
       </node>
       <node oor:name="timesnewroman" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>thorndale;thorndaleamt;liberationserif;nimbusromanno9l;times;timesroman;newyork;timmons;lucidaserif;lucidabright;roman;nimbusromanno9;bookman;itcbookman;garamond;garamondmt;palatino</value>
+          <value>thorndaleamt;thorndale;liberationserif;nimbusromanno9l;times;timesroman;newyork;timmons;lucidaserif;lucidabright;roman;nimbusromanno9;bookman;itcbookman;garamond;garamondmt;palatino</value>
         </prop>
         <prop oor:name="SubstFontsMS"><value></value></prop>
         <prop oor:name="SubstFontsPS"><value>Times</value></prop>
@@ -7296,7 +7296,7 @@
       </node>
       <node oor:name="timesroman" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>thorndale;thorndaleamt;timesnewroman;liberationserif;nimbusromanno9l;times;newyork;timmons;lucidaserif;lucidabright;roman;nimbusromanno9;bookman;itcbookman;garamond;garamondmt;palatino</value>
+          <value>thorndaleamt;thorndale;timesnewroman;liberationserif;nimbusromanno9l;times;newyork;timmons;lucidaserif;lucidabright;roman;nimbusromanno9;bookman;itcbookman;garamond;garamondmt;palatino</value>
         </prop>
         <prop oor:name="SubstFontsMS"><value>Times New Roman</value></prop>
         <prop oor:name="SubstFontsPS"><value></value></prop>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index b5fa24ac2502..a85b598f0375 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5823,7 +5823,7 @@
 						</info>
 					</enumeration>
 				</constraints>
-				<value>1</value>
+				<value>2</value>
 			</prop>
 			<prop oor:name="SymbolStyle" oor:type="xs:string">
 				<!-- UIHints: Tools  Options General View -->
diff --git a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
index 8762f839b781..aa758a161252 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
@@ -91,61 +91,30 @@
                     <label>Spell and grammar dialog image</label>
                 </info>
             </prop>
-            <prop oor:name="SpellAndGrammarDialogImage_HC" oor:type="xs:string">
-                <info>
-                    <desc>The path to the image for the spell and grammar checking dialog in high contrast mode.</desc>
-                    <label>Spell and grammar dialog image</label>
-                </info>
-            </prop>
             <prop oor:name="SpellAndGrammarContextMenuSuggestionImage" oor:type="xs:string">
                 <info>
                     <desc>The path to the image for the spell and grammar checking suggestions in the context menu context menu.</desc>
                     <label>Spell and grammar context menu suggestions image</label>
                 </info>
             </prop>
-            <prop oor:name="SpellAndGrammarContextMenuSuggestionImage_HC" oor:type="xs:string">
-                <info>
-                    <desc>The path to the image for the spell and grammar checking suggestions in the context menu context menu in high contrast mode.</desc>
-                    <label>Spell and grammar context menu suggestions image</label>
-                </info>
-            </prop>
             <prop oor:name="SpellAndGrammarContextMenuDictionaryImage" oor:type="xs:string">
                 <info>
                     <desc>The path to the image for the spell and grammar checking context menu context menu.</desc>
                     <label>Spell and grammar context menu dictionary image</label>
                 </info>
             </prop>
-            <prop oor:name="SpellAndGrammarContextMenuDictionaryImage_HC" oor:type="xs:string">
-                <info>
-                    <desc>The path to the image for the spell and grammar checking context menu in high contrast mode.</desc>
-                    <label>Spell and grammar context menu dictionary image</label>
-                </info>
-            </prop>
             <prop oor:name="ThesaurusDialogImage" oor:type="xs:string">
                 <info>
                     <desc>The path to the image for the thesaurus dialog.</desc>
                     <label>Thesaurus dialog image</label>
                 </info>
             </prop>
-            <prop oor:name="ThesaurusDialogImage_HC" oor:type="xs:string">
-                <info>
-                    <desc>The path to the image for the thesaurus dialog in high contrast mode.</desc>
-                    <label>Thesaurus dialog image</label>
-                </info>
-            </prop>
             <prop oor:name="SynonymsContextMenuImage" oor:type="xs:string">
                 <info>
                     <desc>The path to the image for the synonyms context menu.</desc>
                     <label>Synonyms context menu image</label>
                 </info>
             </prop>
-            <prop oor:name="SynonymsContextMenuImage_HC" oor:type="xs:string">
-                <info>
-                    <desc>The path to the image for the synonyms context menu in high contrast mode.</desc>
-                    <label>Synonyms context menu image</label>
-                </info>
-            </prop>
-
         </group>
 
         <group oor:name="GrammarCheckerEntry">
diff --git a/ooo.lst b/ooo.lst
index 59b247fc2c63..802a85ae4f6f 100644
--- a/ooo.lst
+++ b/ooo.lst
@@ -77,11 +77,9 @@ debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
 e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz
 0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz
 71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz
-http://download.go-oo.org/SRC680
-799fc3b835a79adce8c88a3fee0150c1-libwps-0.1.2.tar.gz
-db556b750bf3eac8481a4cc5e29e5af1-libwpg-0.1.3.tar.gz
-http://download.go-oo.org/libwpd
-64d66018897d759358f454010b6e75d2-libwpd-0.8.14.tar.gz
+5ba6a61a2f66dfd5fee8cdd4cd262a37-libwpg-0.2.0.tar.bz2
+86e390f015e505dd71a66f0123c62f09-libwpd-0.9.0.tar.bz2
+9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2
 http://download.go-oo.org/extern
 185d60944ea767075d27247c3162b3bc-unowinreg.dll
 http://www.numbertext.org/linux
diff --git a/ooo_custom_images/classic/classic_images.tar.gz b/ooo_custom_images/classic/classic_images.tar.gz
index 53f81400484f..ecef0d4824be 100644
--- a/ooo_custom_images/classic/classic_images.tar.gz
+++ b/ooo_custom_images/classic/classic_images.tar.gz
diff --git a/default_images/avmedia/res/avh02048.png b/ooo_custom_images/hicontrast/avmedia/res/av02048.png
index 892919bfea2a..892919bfea2a 100644
--- a/default_images/avmedia/res/avh02048.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/av02048.png
diff --git a/default_images/avmedia/res/avh02049.png b/ooo_custom_images/hicontrast/avmedia/res/av02049.png
index 5cfbc9ba784c..5cfbc9ba784c 100644
--- a/default_images/avmedia/res/avh02049.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/av02049.png
diff --git a/default_images/avmedia/res/avh02050.png b/ooo_custom_images/hicontrast/avmedia/res/av02050.png
index 63952fc93f90..63952fc93f90 100644
--- a/default_images/avmedia/res/avh02050.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/av02050.png
diff --git a/default_images/avmedia/res/avh02051.png b/ooo_custom_images/hicontrast/avmedia/res/av02051.png
index 7d51cff77c01..7d51cff77c01 100644
--- a/default_images/avmedia/res/avh02051.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/av02051.png
diff --git a/default_images/avmedia/res/avh02052.png b/ooo_custom_images/hicontrast/avmedia/res/av02052.png
index 979260d3bf73..979260d3bf73 100644
--- a/default_images/avmedia/res/avh02052.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/av02052.png
diff --git a/default_images/avmedia/res/avh02053.png b/ooo_custom_images/hicontrast/avmedia/res/av02053.png
index 49cb42a5f69f..49cb42a5f69f 100644
--- a/default_images/avmedia/res/avh02053.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/av02053.png
diff --git a/default_images/avmedia/res/avh02054.png b/ooo_custom_images/hicontrast/avmedia/res/av02054.png
index 8fea29281eb6..8fea29281eb6 100644
--- a/default_images/avmedia/res/avh02054.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/av02054.png
diff --git a/default_images/avmedia/res/avlh02048.png b/ooo_custom_images/hicontrast/avmedia/res/avl02048.png
index ab22bf9486dd..ab22bf9486dd 100644
--- a/default_images/avmedia/res/avlh02048.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/avl02048.png
diff --git a/default_images/avmedia/res/avlh02049.png b/ooo_custom_images/hicontrast/avmedia/res/avl02049.png
index 574b9cb55bce..574b9cb55bce 100644
--- a/default_images/avmedia/res/avlh02049.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/avl02049.png
diff --git a/default_images/avmedia/res/avlh02050.png b/ooo_custom_images/hicontrast/avmedia/res/avl02050.png
index fa0f33ce2277..fa0f33ce2277 100644
--- a/default_images/avmedia/res/avlh02050.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/avl02050.png
diff --git a/default_images/avmedia/res/avlh02051.png b/ooo_custom_images/hicontrast/avmedia/res/avl02051.png
index 9a8abe340cf0..9a8abe340cf0 100644
--- a/default_images/avmedia/res/avlh02051.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/avl02051.png
diff --git a/default_images/avmedia/res/avlh02052.png b/ooo_custom_images/hicontrast/avmedia/res/avl02052.png
index 4c7dfe34ee9a..4c7dfe34ee9a 100644
--- a/default_images/avmedia/res/avlh02052.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/avl02052.png
diff --git a/default_images/avmedia/res/avlh02053.png b/ooo_custom_images/hicontrast/avmedia/res/avl02053.png
index ac65e8fea6fa..ac65e8fea6fa 100644
--- a/default_images/avmedia/res/avlh02053.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/avl02053.png
diff --git a/default_images/avmedia/res/avlh02054.png b/ooo_custom_images/hicontrast/avmedia/res/avl02054.png
index 15363032d80a..15363032d80a 100644
--- a/default_images/avmedia/res/avlh02054.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/avl02054.png
diff --git a/default_images/basctl/res/imh01.png b/ooo_custom_images/hicontrast/basctl/res/im01.png
index 53b7e5ba8044..53b7e5ba8044 100644
--- a/default_images/basctl/res/imh01.png
+++ b/ooo_custom_images/hicontrast/basctl/res/im01.png
diff --git a/default_images/basctl/res/locked_h.png b/ooo_custom_images/hicontrast/basctl/res/locked.png
index 5bbcb24e6f3c..5bbcb24e6f3c 100644
--- a/default_images/basctl/res/locked_h.png
+++ b/ooo_custom_images/hicontrast/basctl/res/locked.png
diff --git a/default_images/chart2/res/areas3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/areas3d_52x60.png
index ab4c6d4b06f3..ab4c6d4b06f3 100644
--- a/default_images/chart2/res/areas3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/areas3d_52x60.png
diff --git a/default_images/chart2/res/areas_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/areas_52x60.png
index 08057eb93755..08057eb93755 100644
--- a/default_images/chart2/res/areas_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/areas_52x60.png
diff --git a/default_images/chart2/res/areasfull3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/areasfull3d_52x60.png
index 34a643737f27..34a643737f27 100644
--- a/default_images/chart2/res/areasfull3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/areasfull3d_52x60.png
diff --git a/default_images/chart2/res/areasfull_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/areasfull_52x60.png
index 942f360d830e..942f360d830e 100644
--- a/default_images/chart2/res/areasfull_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/areasfull_52x60.png
diff --git a/default_images/chart2/res/areaspiled3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/areaspiled3d_52x60.png
index 5e7738c63e05..5e7738c63e05 100644
--- a/default_images/chart2/res/areaspiled3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/areaspiled3d_52x60.png
diff --git a/default_images/chart2/res/areaspiled_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/areaspiled_52x60.png
index 69d832334a79..69d832334a79 100644
--- a/default_images/chart2/res/areaspiled_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/areaspiled_52x60.png
diff --git a/default_images/chart2/res/bar3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/bar3d_52x60.png
index 003cf473f134..003cf473f134 100644
--- a/default_images/chart2/res/bar3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/bar3d_52x60.png
diff --git a/default_images/chart2/res/bar3ddeep_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/bar3ddeep_52x60.png
index 7fe16396e94a..7fe16396e94a 100644
--- a/default_images/chart2/res/bar3ddeep_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/bar3ddeep_52x60.png
diff --git a/default_images/chart2/res/bar_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/bar_52x60.png
index b4c397f6acfd..b4c397f6acfd 100644
--- a/default_images/chart2/res/bar_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/bar_52x60.png
diff --git a/default_images/chart2/res/barpercent3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/barpercent3d_52x60.png
index 1490457423dd..1490457423dd 100644
--- a/default_images/chart2/res/barpercent3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/barpercent3d_52x60.png
diff --git a/default_images/chart2/res/barpercent_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/barpercent_52x60.png
index ac920921d960..ac920921d960 100644
--- a/default_images/chart2/res/barpercent_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/barpercent_52x60.png
diff --git a/default_images/chart2/res/barstack3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/barstack3d_52x60.png
index 2c75cfc47d0d..2c75cfc47d0d 100644
--- a/default_images/chart2/res/barstack3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/barstack3d_52x60.png
diff --git a/default_images/chart2/res/barstack_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/barstack_52x60.png
index 576225daf6eb..576225daf6eb 100644
--- a/default_images/chart2/res/barstack_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/barstack_52x60.png
diff --git a/default_images/chart2/res/bubble_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/bubble_52x60.png
index 5aebfeb81121..5aebfeb81121 100644
--- a/default_images/chart2/res/bubble_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/bubble_52x60.png
diff --git a/default_images/chart2/res/columnline_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/columnline_52x60.png
index 064ac930e695..064ac930e695 100644
--- a/default_images/chart2/res/columnline_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/columnline_52x60.png
diff --git a/default_images/chart2/res/columnpercent3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/columnpercent3d_52x60.png
index 0443d09cc260..0443d09cc260 100644
--- a/default_images/chart2/res/columnpercent3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/columnpercent3d_52x60.png
diff --git a/default_images/chart2/res/columnpercent_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/columnpercent_52x60.png
index d3573d750d9f..d3573d750d9f 100644
--- a/default_images/chart2/res/columnpercent_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/columnpercent_52x60.png
diff --git a/default_images/chart2/res/columns3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/columns3d_52x60.png
index 4c28217a4b38..4c28217a4b38 100644
--- a/default_images/chart2/res/columns3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/columns3d_52x60.png
diff --git a/default_images/chart2/res/columns3ddeep_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/columns3ddeep_52x60.png
index 663524e96107..663524e96107 100644
--- a/default_images/chart2/res/columns3ddeep_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/columns3ddeep_52x60.png
diff --git a/default_images/chart2/res/columns_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/columns_52x60.png
index 5e8737003a0e..5e8737003a0e 100644
--- a/default_images/chart2/res/columns_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/columns_52x60.png
diff --git a/default_images/chart2/res/columnstack3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/columnstack3d_52x60.png
index 4112b5396289..4112b5396289 100644
--- a/default_images/chart2/res/columnstack3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/columnstack3d_52x60.png
diff --git a/default_images/chart2/res/columnstack_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/columnstack_52x60.png
index a5ad9dbb6aa0..a5ad9dbb6aa0 100644
--- a/default_images/chart2/res/columnstack_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/columnstack_52x60.png
diff --git a/default_images/chart2/res/columnstackline_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/columnstackline_52x60.png
index c39b5d488e55..c39b5d488e55 100644
--- a/default_images/chart2/res/columnstackline_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/columnstackline_52x60.png
diff --git a/default_images/chart2/res/cone_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/cone_52x60.png
index 36fc5085e5f7..36fc5085e5f7 100644
--- a/default_images/chart2/res/cone_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/cone_52x60.png
diff --git a/default_images/chart2/res/conedeep_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/conedeep_52x60.png
index 7f45402b6cae..7f45402b6cae 100644
--- a/default_images/chart2/res/conedeep_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/conedeep_52x60.png
diff --git a/default_images/chart2/res/conehori_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/conehori_52x60.png
index 1d7c34f6a777..1d7c34f6a777 100644
--- a/default_images/chart2/res/conehori_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/conehori_52x60.png
diff --git a/default_images/chart2/res/conehorideep_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/conehorideep_52x60.png
index f71160315dd8..f71160315dd8 100644
--- a/default_images/chart2/res/conehorideep_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/conehorideep_52x60.png
diff --git a/default_images/chart2/res/conehoripercent_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/conehoripercent_52x60.png
index a3db0d35eb0c..a3db0d35eb0c 100644
--- a/default_images/chart2/res/conehoripercent_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/conehoripercent_52x60.png
diff --git a/default_images/chart2/res/conehoristack_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/conehoristack_52x60.png
index 7f687b60b51b..7f687b60b51b 100644
--- a/default_images/chart2/res/conehoristack_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/conehoristack_52x60.png
diff --git a/default_images/chart2/res/conepercent_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/conepercent_52x60.png
index 403a3799d23c..403a3799d23c 100644
--- a/default_images/chart2/res/conepercent_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/conepercent_52x60.png
diff --git a/default_images/chart2/res/conestack_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/conestack_52x60.png
index c753d72dc8ca..c753d72dc8ca 100644
--- a/default_images/chart2/res/conestack_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/conestack_52x60.png
diff --git a/default_images/chart2/res/cylinder_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/cylinder_52x60.png
index aedb8f108623..aedb8f108623 100644
--- a/default_images/chart2/res/cylinder_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/cylinder_52x60.png
diff --git a/default_images/chart2/res/cylinderdeep_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/cylinderdeep_52x60.png
index 84be0da0b586..84be0da0b586 100644
--- a/default_images/chart2/res/cylinderdeep_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/cylinderdeep_52x60.png
diff --git a/default_images/chart2/res/cylinderhori_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/cylinderhori_52x60.png
index 705bbad1b348..705bbad1b348 100644
--- a/default_images/chart2/res/cylinderhori_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/cylinderhori_52x60.png
diff --git a/default_images/chart2/res/cylinderhorideep_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/cylinderhorideep_52x60.png
index e8028a0fd7c7..e8028a0fd7c7 100644
--- a/default_images/chart2/res/cylinderhorideep_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/cylinderhorideep_52x60.png
diff --git a/default_images/chart2/res/cylinderhoriprocent_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/cylinderhoriprocent_52x60.png
index a57705d2df53..a57705d2df53 100644
--- a/default_images/chart2/res/cylinderhoriprocent_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/cylinderhoriprocent_52x60.png
diff --git a/default_images/chart2/res/cylinderhoristack_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/cylinderhoristack_52x60.png
index 794017eca6af..794017eca6af 100644
--- a/default_images/chart2/res/cylinderhoristack_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/cylinderhoristack_52x60.png
diff --git a/default_images/chart2/res/cylinderpercent_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/cylinderpercent_52x60.png
index d05c616d7507..d05c616d7507 100644
--- a/default_images/chart2/res/cylinderpercent_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/cylinderpercent_52x60.png
diff --git a/default_images/chart2/res/cylinderstack_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/cylinderstack_52x60.png
index 9d3e16593b98..9d3e16593b98 100644
--- a/default_images/chart2/res/cylinderstack_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/cylinderstack_52x60.png
diff --git a/default_images/chart2/res/dataeditor_icon_h01.png b/ooo_custom_images/hicontrast/chart2/res/dataeditor_icon01.png
index a7d562eebb82..a7d562eebb82 100644
--- a/default_images/chart2/res/dataeditor_icon_h01.png
+++ b/ooo_custom_images/hicontrast/chart2/res/dataeditor_icon01.png
diff --git a/default_images/chart2/res/dataeditor_icon_h02.png b/ooo_custom_images/hicontrast/chart2/res/dataeditor_icon02.png
index badc08eed41d..badc08eed41d 100644
--- a/default_images/chart2/res/dataeditor_icon_h02.png
+++ b/ooo_custom_images/hicontrast/chart2/res/dataeditor_icon02.png
diff --git a/default_images/chart2/res/dataeditor_icon_h03.png b/ooo_custom_images/hicontrast/chart2/res/dataeditor_icon03.png
index d72592d15bb2..d72592d15bb2 100644
--- a/default_images/chart2/res/dataeditor_icon_h03.png
+++ b/ooo_custom_images/hicontrast/chart2/res/dataeditor_icon03.png
diff --git a/default_images/chart2/res/dataeditor_icon_h04.png b/ooo_custom_images/hicontrast/chart2/res/dataeditor_icon04.png
index 264a83ad5b28..264a83ad5b28 100644
--- a/default_images/chart2/res/dataeditor_icon_h04.png
+++ b/ooo_custom_images/hicontrast/chart2/res/dataeditor_icon04.png
diff --git a/default_images/chart2/res/dataeditor_icon_h05.png b/ooo_custom_images/hicontrast/chart2/res/dataeditor_icon05.png
index d296378dd089..d296378dd089 100644
--- a/default_images/chart2/res/dataeditor_icon_h05.png
+++ b/ooo_custom_images/hicontrast/chart2/res/dataeditor_icon05.png
diff --git a/default_images/chart2/res/dataeditor_icon_h06.png b/ooo_custom_images/hicontrast/chart2/res/dataeditor_icon06.png
index e2081a67d867..e2081a67d867 100644
--- a/default_images/chart2/res/dataeditor_icon_h06.png
+++ b/ooo_custom_images/hicontrast/chart2/res/dataeditor_icon06.png
diff --git a/default_images/chart2/res/dataeditor_icon_h07.png b/ooo_custom_images/hicontrast/chart2/res/dataeditor_icon07.png
index badc08eed41d..badc08eed41d 100644
--- a/default_images/chart2/res/dataeditor_icon_h07.png
+++ b/ooo_custom_images/hicontrast/chart2/res/dataeditor_icon07.png
diff --git a/default_images/chart2/res/donut3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/donut3d_52x60.png
index 1cbcdf9a3b25..1cbcdf9a3b25 100644
--- a/default_images/chart2/res/donut3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/donut3d_52x60.png
diff --git a/default_images/chart2/res/donut3dexploded_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/donut3dexploded_52x60.png
index e5ed546d5183..e5ed546d5183 100644
--- a/default_images/chart2/res/donut3dexploded_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/donut3dexploded_52x60.png
diff --git a/default_images/chart2/res/donut_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/donut_52x60.png
index 6c8cf0ddd17f..6c8cf0ddd17f 100644
--- a/default_images/chart2/res/donut_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/donut_52x60.png
diff --git a/default_images/chart2/res/donutexploded_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/donutexploded_52x60.png
index a001545fa72c..a001545fa72c 100644
--- a/default_images/chart2/res/donutexploded_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/donutexploded_52x60.png
diff --git a/default_images/chart2/res/errorbothhori_30_h.png b/ooo_custom_images/hicontrast/chart2/res/errorbothhori_30.png
index cf19e10853b6..cf19e10853b6 100644
--- a/default_images/chart2/res/errorbothhori_30_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/errorbothhori_30.png
diff --git a/default_images/chart2/res/errorbothverti_30_h.png b/ooo_custom_images/hicontrast/chart2/res/errorbothverti_30.png
index 156c6013d5af..156c6013d5af 100644
--- a/default_images/chart2/res/errorbothverti_30_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/errorbothverti_30.png
diff --git a/default_images/chart2/res/errordown_30_h.png b/ooo_custom_images/hicontrast/chart2/res/errordown_30.png
index 2419d6da8fa4..2419d6da8fa4 100644
--- a/default_images/chart2/res/errordown_30_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/errordown_30.png
diff --git a/default_images/chart2/res/errorleft_30_h.png b/ooo_custom_images/hicontrast/chart2/res/errorleft_30.png
index 66dba3c64c2c..66dba3c64c2c 100644
--- a/default_images/chart2/res/errorleft_30_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/errorleft_30.png
diff --git a/default_images/chart2/res/errorright_30_h.png b/ooo_custom_images/hicontrast/chart2/res/errorright_30.png
index c566cbfc75ea..c566cbfc75ea 100644
--- a/default_images/chart2/res/errorright_30_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/errorright_30.png
diff --git a/default_images/chart2/res/errorup_30_h.png b/ooo_custom_images/hicontrast/chart2/res/errorup_30.png
index 884047076a7e..884047076a7e 100644
--- a/default_images/chart2/res/errorup_30_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/errorup_30.png
diff --git a/default_images/chart2/res/net_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/net_52x60.png
index 17700d0f78f7..17700d0f78f7 100644
--- a/default_images/chart2/res/net_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/net_52x60.png
diff --git a/default_images/chart2/res/netfill_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/netfill_52x60.png
index 0b75834e7eb7..0b75834e7eb7 100644
--- a/default_images/chart2/res/netfill_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/netfill_52x60.png
diff --git a/default_images/chart2/res/netlinepoint_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/netlinepoint_52x60.png
index 468b8f8d81e0..468b8f8d81e0 100644
--- a/default_images/chart2/res/netlinepoint_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/netlinepoint_52x60.png
diff --git a/default_images/chart2/res/netlinepointstack_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/netlinepointstack_52x60.png
index cd6ce2d385cb..cd6ce2d385cb 100644
--- a/default_images/chart2/res/netlinepointstack_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/netlinepointstack_52x60.png
diff --git a/default_images/chart2/res/netpoint_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/netpoint_52x60.png
index efa51464b4c5..efa51464b4c5 100644
--- a/default_images/chart2/res/netpoint_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/netpoint_52x60.png
diff --git a/default_images/chart2/res/netpointstack_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/netpointstack_52x60.png
index 78bbf74880d9..78bbf74880d9 100644
--- a/default_images/chart2/res/netpointstack_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/netpointstack_52x60.png
diff --git a/default_images/chart2/res/netstack_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/netstack_52x60.png
index 2b12a581c593..2b12a581c593 100644
--- a/default_images/chart2/res/netstack_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/netstack_52x60.png
diff --git a/default_images/chart2/res/netstackfill_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/netstackfill_52x60.png
index 60b01120d6c1..60b01120d6c1 100644
--- a/default_images/chart2/res/netstackfill_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/netstackfill_52x60.png
diff --git a/default_images/chart2/res/nostackdirect3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/nostackdirect3d_52x60.png
index acb56b95ef56..acb56b95ef56 100644
--- a/default_images/chart2/res/nostackdirect3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/nostackdirect3d_52x60.png
diff --git a/default_images/chart2/res/nostackdirectboth_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/nostackdirectboth_52x60.png
index fd079bdc41ca..fd079bdc41ca 100644
--- a/default_images/chart2/res/nostackdirectboth_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/nostackdirectboth_52x60.png
diff --git a/default_images/chart2/res/nostackdirectlines_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/nostackdirectlines_52x60.png
index bb9447bca439..bb9447bca439 100644
--- a/default_images/chart2/res/nostackdirectlines_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/nostackdirectlines_52x60.png
diff --git a/default_images/chart2/res/nostackdirectpoints_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/nostackdirectpoints_52x60.png
index 33c1b82a1fcd..33c1b82a1fcd 100644
--- a/default_images/chart2/res/nostackdirectpoints_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/nostackdirectpoints_52x60.png
diff --git a/default_images/chart2/res/nostacksmooth3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/nostacksmooth3d_52x60.png
index e31a33a2f6af..e31a33a2f6af 100644
--- a/default_images/chart2/res/nostacksmooth3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/nostacksmooth3d_52x60.png
diff --git a/default_images/chart2/res/nostacksmoothboth_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/nostacksmoothboth_52x60.png
index d10c5cb1fbef..d10c5cb1fbef 100644
--- a/default_images/chart2/res/nostacksmoothboth_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/nostacksmoothboth_52x60.png
diff --git a/default_images/chart2/res/nostacksmoothlines_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/nostacksmoothlines_52x60.png
index aafb920fbffa..aafb920fbffa 100644
--- a/default_images/chart2/res/nostacksmoothlines_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/nostacksmoothlines_52x60.png
diff --git a/default_images/chart2/res/pie3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/pie3d_52x60.png
index 45b85c92bb3f..45b85c92bb3f 100644
--- a/default_images/chart2/res/pie3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/pie3d_52x60.png
diff --git a/default_images/chart2/res/pie3dexploded_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/pie3dexploded_52x60.png
index 1ffa4e7afba0..1ffa4e7afba0 100644
--- a/default_images/chart2/res/pie3dexploded_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/pie3dexploded_52x60.png
diff --git a/default_images/chart2/res/pie_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/pie_52x60.png
index c6a642635f42..c6a642635f42 100644
--- a/default_images/chart2/res/pie_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/pie_52x60.png
diff --git a/default_images/chart2/res/pieexploded_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/pieexploded_52x60.png
index 67a6caae4177..67a6caae4177 100644
--- a/default_images/chart2/res/pieexploded_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/pieexploded_52x60.png
diff --git a/default_images/chart2/res/pyramind_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/pyramind_52x60.png
index 51fd9cebcf18..51fd9cebcf18 100644
--- a/default_images/chart2/res/pyramind_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/pyramind_52x60.png
diff --git a/default_images/chart2/res/pyraminddeep_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/pyraminddeep_52x60.png
index 81d0d1614ab6..81d0d1614ab6 100644
--- a/default_images/chart2/res/pyraminddeep_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/pyraminddeep_52x60.png
diff --git a/default_images/chart2/res/pyramindhori_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/pyramindhori_52x60.png
index e3c83e62b758..e3c83e62b758 100644
--- a/default_images/chart2/res/pyramindhori_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/pyramindhori_52x60.png
diff --git a/default_images/chart2/res/pyramindhorideep_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/pyramindhorideep_52x60.png
index 91ab219dcf4f..91ab219dcf4f 100644
--- a/default_images/chart2/res/pyramindhorideep_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/pyramindhorideep_52x60.png
diff --git a/default_images/chart2/res/pyramindhoripercent_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/pyramindhoripercent_52x60.png
index ff3d195bfd7d..ff3d195bfd7d 100644
--- a/default_images/chart2/res/pyramindhoripercent_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/pyramindhoripercent_52x60.png
diff --git a/default_images/chart2/res/pyramindhoristack_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/pyramindhoristack_52x60.png
index 498a3b3fafb3..498a3b3fafb3 100644
--- a/default_images/chart2/res/pyramindhoristack_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/pyramindhoristack_52x60.png
diff --git a/default_images/chart2/res/pyramindpercent_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/pyramindpercent_52x60.png
index 8e32f5eb355f..8e32f5eb355f 100644
--- a/default_images/chart2/res/pyramindpercent_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/pyramindpercent_52x60.png
diff --git a/default_images/chart2/res/pyramindstack_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/pyramindstack_52x60.png
index 8e594b59bf45..8e594b59bf45 100644
--- a/default_images/chart2/res/pyramindstack_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/pyramindstack_52x60.png
diff --git a/default_images/chart2/res/regexp_h.png b/ooo_custom_images/hicontrast/chart2/res/regexp.png
index 1f8bc81783f8..1f8bc81783f8 100644
--- a/default_images/chart2/res/regexp_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/regexp.png
diff --git a/default_images/chart2/res/reglin_h.png b/ooo_custom_images/hicontrast/chart2/res/reglin.png
index ec92d0412b40..ec92d0412b40 100644
--- a/default_images/chart2/res/reglin_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/reglin.png
diff --git a/default_images/chart2/res/reglog_h.png b/ooo_custom_images/hicontrast/chart2/res/reglog.png
index 201b063282f7..201b063282f7 100644
--- a/default_images/chart2/res/reglog_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/reglog.png
diff --git a/default_images/chart2/res/regno_h.png b/ooo_custom_images/hicontrast/chart2/res/regno.png
index f45877ea5273..f45877ea5273 100644
--- a/default_images/chart2/res/regno_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/regno.png
diff --git a/default_images/chart2/res/regpow_h.png b/ooo_custom_images/hicontrast/chart2/res/regpow.png
index fa59f7cb0366..fa59f7cb0366 100644
--- a/default_images/chart2/res/regpow_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/regpow.png
diff --git a/default_images/chart2/res/selectrange_h.png b/ooo_custom_images/hicontrast/chart2/res/selectrange.png
index cf4145b3cf72..cf4145b3cf72 100644
--- a/default_images/chart2/res/selectrange_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/selectrange.png
diff --git a/default_images/chart2/res/stackdirect3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/stackdirect3d_52x60.png
index 926198c70c28..926198c70c28 100644
--- a/default_images/chart2/res/stackdirect3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/stackdirect3d_52x60.png
diff --git a/default_images/chart2/res/stackdirectboth_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/stackdirectboth_52x60.png
index 408c7bd4a7eb..408c7bd4a7eb 100644
--- a/default_images/chart2/res/stackdirectboth_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/stackdirectboth_52x60.png
diff --git a/default_images/chart2/res/stackdirectlines_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/stackdirectlines_52x60.png
index 66256bf3a9e3..66256bf3a9e3 100644
--- a/default_images/chart2/res/stackdirectlines_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/stackdirectlines_52x60.png
diff --git a/default_images/chart2/res/stackdirectpoints_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/stackdirectpoints_52x60.png
index e35350eb518e..e35350eb518e 100644
--- a/default_images/chart2/res/stackdirectpoints_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/stackdirectpoints_52x60.png
diff --git a/default_images/chart2/res/stacksmooth3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/stacksmooth3d_52x60.png
index 21c7513396b2..21c7513396b2 100644
--- a/default_images/chart2/res/stacksmooth3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/stacksmooth3d_52x60.png
diff --git a/default_images/chart2/res/stacksmoothboth_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/stacksmoothboth_52x60.png
index c675e02d7c4b..c675e02d7c4b 100644
--- a/default_images/chart2/res/stacksmoothboth_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/stacksmoothboth_52x60.png
diff --git a/default_images/chart2/res/stacksmoothlines_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/stacksmoothlines_52x60.png
index 00330e6824ee..00330e6824ee 100644
--- a/default_images/chart2/res/stacksmoothlines_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/stacksmoothlines_52x60.png
diff --git a/default_images/chart2/res/stock_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/stock_52x60.png
index 2c3f893580bd..2c3f893580bd 100644
--- a/default_images/chart2/res/stock_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/stock_52x60.png
diff --git a/default_images/chart2/res/stockblock_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/stockblock_52x60.png
index de1bd09c57e8..de1bd09c57e8 100644
--- a/default_images/chart2/res/stockblock_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/stockblock_52x60.png
diff --git a/default_images/chart2/res/stockcolumns_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/stockcolumns_52x60.png
index 657d594a9bd2..657d594a9bd2 100644
--- a/default_images/chart2/res/stockcolumns_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/stockcolumns_52x60.png
diff --git a/default_images/chart2/res/stockcolumnsattach_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/stockcolumnsattach_52x60.png
index a97f36996dc9..a97f36996dc9 100644
--- a/default_images/chart2/res/stockcolumnsattach_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/stockcolumnsattach_52x60.png
diff --git a/default_images/chart2/res/typearea_16_h.png b/ooo_custom_images/hicontrast/chart2/res/typearea_16.png
index 3377629dd324..3377629dd324 100644
--- a/default_images/chart2/res/typearea_16_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/typearea_16.png
diff --git a/default_images/chart2/res/typebar_16_h.png b/ooo_custom_images/hicontrast/chart2/res/typebar_16.png
index abb1a018776e..abb1a018776e 100644
--- a/default_images/chart2/res/typebar_16_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/typebar_16.png
diff --git a/default_images/chart2/res/typebubble_16_h.png b/ooo_custom_images/hicontrast/chart2/res/typebubble_16.png
index 00f40cf76a86..00f40cf76a86 100644
--- a/default_images/chart2/res/typebubble_16_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/typebubble_16.png
diff --git a/default_images/chart2/res/typecolumn_16_h.png b/ooo_custom_images/hicontrast/chart2/res/typecolumn_16.png
index 4cfe08672db7..4cfe08672db7 100644
--- a/default_images/chart2/res/typecolumn_16_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/typecolumn_16.png
diff --git a/default_images/chart2/res/typecolumnline_16_h.png b/ooo_custom_images/hicontrast/chart2/res/typecolumnline_16.png
index d672a0420c00..d672a0420c00 100644
--- a/default_images/chart2/res/typecolumnline_16_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/typecolumnline_16.png
diff --git a/default_images/chart2/res/typenet_16_h.png b/ooo_custom_images/hicontrast/chart2/res/typenet_16.png
index 197b14f95aa7..197b14f95aa7 100644
--- a/default_images/chart2/res/typenet_16_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/typenet_16.png
diff --git a/default_images/chart2/res/typepie_16_h.png b/ooo_custom_images/hicontrast/chart2/res/typepie_16.png
index 66cef40825b9..66cef40825b9 100644
--- a/default_images/chart2/res/typepie_16_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/typepie_16.png
diff --git a/default_images/chart2/res/typepointline_16_h.png b/ooo_custom_images/hicontrast/chart2/res/typepointline_16.png
index c8fe9a440eea..c8fe9a440eea 100644
--- a/default_images/chart2/res/typepointline_16_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/typepointline_16.png
diff --git a/default_images/chart2/res/typestock_16_h.png b/ooo_custom_images/hicontrast/chart2/res/typestock_16.png
index 8ef5899e7d05..8ef5899e7d05 100644
--- a/default_images/chart2/res/typestock_16_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/typestock_16.png
diff --git a/default_images/chart2/res/typexy_16_h.png b/ooo_custom_images/hicontrast/chart2/res/typexy_16.png
index b298b1802837..b298b1802837 100644
--- a/default_images/chart2/res/typexy_16_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/typexy_16.png
diff --git a/default_images/chart2/res/valueaxisdirect3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/valueaxisdirect3d_52x60.png
index 6fc981aea364..6fc981aea364 100644
--- a/default_images/chart2/res/valueaxisdirect3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/valueaxisdirect3d_52x60.png
diff --git a/default_images/chart2/res/valueaxisdirectboth_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/valueaxisdirectboth_52x60.png
index 29578b0383a3..29578b0383a3 100644
--- a/default_images/chart2/res/valueaxisdirectboth_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/valueaxisdirectboth_52x60.png
diff --git a/default_images/chart2/res/valueaxisdirectlines_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/valueaxisdirectlines_52x60.png
index d3a04f76f58a..d3a04f76f58a 100644
--- a/default_images/chart2/res/valueaxisdirectlines_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/valueaxisdirectlines_52x60.png
diff --git a/default_images/chart2/res/valueaxisdirectpoints_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/valueaxisdirectpoints_52x60.png
index 2c708671e5ff..2c708671e5ff 100644
--- a/default_images/chart2/res/valueaxisdirectpoints_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/valueaxisdirectpoints_52x60.png
diff --git a/default_images/chart2/res/valueaxissmooth3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/valueaxissmooth3d_52x60.png
index 27c98b800c49..27c98b800c49 100644
--- a/default_images/chart2/res/valueaxissmooth3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/valueaxissmooth3d_52x60.png
diff --git a/default_images/chart2/res/valueaxissmoothboth_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/valueaxissmoothboth_52x60.png
index d70bd7572015..d70bd7572015 100644
--- a/default_images/chart2/res/valueaxissmoothboth_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/valueaxissmoothboth_52x60.png
diff --git a/default_images/chart2/res/valueaxissmoothlines_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/valueaxissmoothlines_52x60.png
index cbdf277c809e..cbdf277c809e 100644
--- a/default_images/chart2/res/valueaxissmoothlines_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/valueaxissmoothlines_52x60.png
diff --git a/default_images/database/linked_text_table_hc.png b/ooo_custom_images/hicontrast/database/linked_text_table.png
index 48e2a663698a..48e2a663698a 100644
--- a/default_images/database/linked_text_table_hc.png
+++ b/ooo_custom_images/hicontrast/database/linked_text_table.png
diff --git a/default_images/dbaccess/res/all_left_h.png b/ooo_custom_images/hicontrast/dbaccess/res/all_left.png
index 434c8e78cfaf..434c8e78cfaf 100644
--- a/default_images/dbaccess/res/all_left_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/all_left.png
diff --git a/default_images/dbaccess/res/all_right_h.png b/ooo_custom_images/hicontrast/dbaccess/res/all_right.png
index 96cc16ea0296..96cc16ea0296 100644
--- a/default_images/dbaccess/res/all_right_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/all_right.png
diff --git a/default_images/dbaccess/res/db_sch.png b/ooo_custom_images/hicontrast/dbaccess/res/db.png
index 1957da9c09b6..1957da9c09b6 100644
--- a/default_images/dbaccess/res/db_sch.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/db.png
diff --git a/default_images/dbaccess/res/exerror_sch.png b/ooo_custom_images/hicontrast/dbaccess/res/exerror.png
index aacdc837bdf2..aacdc837bdf2 100644
--- a/default_images/dbaccess/res/exerror_sch.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/exerror.png
diff --git a/default_images/dbaccess/res/exinfo_sch.png b/ooo_custom_images/hicontrast/dbaccess/res/exinfo.png
index 391878a51b8d..391878a51b8d 100644
--- a/default_images/dbaccess/res/exinfo_sch.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/exinfo.png
diff --git a/default_images/dbaccess/res/exwarning_sch.png b/ooo_custom_images/hicontrast/dbaccess/res/exwarning.png
index e71835f2813e..e71835f2813e 100644
--- a/default_images/dbaccess/res/exwarning_sch.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/exwarning.png
diff --git a/default_images/dbaccess/res/form_16_h.png b/ooo_custom_images/hicontrast/dbaccess/res/form_16.png
index 2a3410139c0c..2a3410139c0c 100644
--- a/default_images/dbaccess/res/form_16_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/form_16.png
diff --git a/default_images/dbaccess/res/forms_16_h.png b/ooo_custom_images/hicontrast/dbaccess/res/forms_16.png
index a5a568c92ead..a5a568c92ead 100644
--- a/default_images/dbaccess/res/forms_16_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/forms_16.png
diff --git a/default_images/dbaccess/res/forms_32_h.png b/ooo_custom_images/hicontrast/dbaccess/res/forms_32.png
index cbf8fd8f8eee..cbf8fd8f8eee 100644
--- a/default_images/dbaccess/res/forms_32_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/forms_32.png
diff --git a/default_images/dbaccess/res/joh01.png b/ooo_custom_images/hicontrast/dbaccess/res/jo01.png
index 8b3f7c3866aa..8b3f7c3866aa 100644
--- a/default_images/dbaccess/res/joh01.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/jo01.png
diff --git a/default_images/dbaccess/res/joh02.png b/ooo_custom_images/hicontrast/dbaccess/res/jo02.png
index 48bc6b4d47f8..48bc6b4d47f8 100644
--- a/default_images/dbaccess/res/joh02.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/jo02.png
diff --git a/default_images/dbaccess/res/lch036.png b/ooo_custom_images/hicontrast/dbaccess/res/lc036.png
index 56493022c8f9..56493022c8f9 100644
--- a/default_images/dbaccess/res/lch036.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/lc036.png
diff --git a/default_images/dbaccess/res/lch037.png b/ooo_custom_images/hicontrast/dbaccess/res/lc037.png
index ba7f99d53f02..ba7f99d53f02 100644
--- a/default_images/dbaccess/res/lch037.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/lc037.png
diff --git a/default_images/dbaccess/res/lch038.png b/ooo_custom_images/hicontrast/dbaccess/res/lc038.png
index 71b0f7759320..71b0f7759320 100644
--- a/default_images/dbaccess/res/lch038.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/lc038.png
diff --git a/default_images/dbaccess/res/lch039.png b/ooo_custom_images/hicontrast/dbaccess/res/lc039.png
index 611b050228fc..611b050228fc 100644
--- a/default_images/dbaccess/res/lch039.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/lc039.png
diff --git a/default_images/dbaccess/res/lch040.png b/ooo_custom_images/hicontrast/dbaccess/res/lc040.png
index d5cf61087353..d5cf61087353 100644
--- a/default_images/dbaccess/res/lch040.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/lc040.png
diff --git a/default_images/dbaccess/res/nuh07.png b/ooo_custom_images/hicontrast/dbaccess/res/nu07.png
index 116c6f25209d..116c6f25209d 100644
--- a/default_images/dbaccess/res/nuh07.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/nu07.png
diff --git a/default_images/dbaccess/res/nuh08.png b/ooo_custom_images/hicontrast/dbaccess/res/nu08.png
index 7975f8f88258..7975f8f88258 100644
--- a/default_images/dbaccess/res/nuh08.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/nu08.png
diff --git a/default_images/dbaccess/res/nuh09.png b/ooo_custom_images/hicontrast/dbaccess/res/nu09.png
index 38aa7844d846..38aa7844d846 100644
--- a/default_images/dbaccess/res/nuh09.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/nu09.png
diff --git a/default_images/dbaccess/res/one_left_h.png b/ooo_custom_images/hicontrast/dbaccess/res/one_left.png
index 9438a2056498..9438a2056498 100644
--- a/default_images/dbaccess/res/one_left_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/one_left.png
diff --git a/default_images/dbaccess/res/one_right_h.png b/ooo_custom_images/hicontrast/dbaccess/res/one_right.png
index 0fd15a34441e..0fd15a34441e 100644
--- a/default_images/dbaccess/res/one_right_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/one_right.png
diff --git a/default_images/dbaccess/res/pkey_sch.png b/ooo_custom_images/hicontrast/dbaccess/res/pkey.png
index b0c01b9cd7fb..b0c01b9cd7fb 100644
--- a/default_images/dbaccess/res/pkey_sch.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/pkey.png
diff --git a/default_images/dbaccess/res/queries_32_h.png b/ooo_custom_images/hicontrast/dbaccess/res/queries_32.png
index 8364bbe4e9dc..8364bbe4e9dc 100644
--- a/default_images/dbaccess/res/queries_32_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/queries_32.png
diff --git a/default_images/dbaccess/res/report_16_h.png b/ooo_custom_images/hicontrast/dbaccess/res/report_16.png
index 6c23aac4cc85..6c23aac4cc85 100644
--- a/default_images/dbaccess/res/report_16_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/report_16.png
diff --git a/default_images/dbaccess/res/reports_16_h.png b/ooo_custom_images/hicontrast/dbaccess/res/reports_16.png
index 4df27d4af3b2..4df27d4af3b2 100644
--- a/default_images/dbaccess/res/reports_16_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/reports_16.png
diff --git a/default_images/dbaccess/res/reports_32_h.png b/ooo_custom_images/hicontrast/dbaccess/res/reports_32.png
index 13d570649bc8..13d570649bc8 100644
--- a/default_images/dbaccess/res/reports_32_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/reports_32.png
diff --git a/default_images/dbaccess/res/sch036.png b/ooo_custom_images/hicontrast/dbaccess/res/sc036.png
index 204ab83fa0dd..204ab83fa0dd 100644
--- a/default_images/dbaccess/res/sch036.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/sc036.png
diff --git a/default_images/dbaccess/res/sch037.png b/ooo_custom_images/hicontrast/dbaccess/res/sc037.png
index a497b4a907d4..a497b4a907d4 100644
--- a/default_images/dbaccess/res/sch037.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/sc037.png
diff --git a/default_images/dbaccess/res/sch038.png b/ooo_custom_images/hicontrast/dbaccess/res/sc038.png
index 5587a17bba8f..5587a17bba8f 100644
--- a/default_images/dbaccess/res/sch038.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/sc038.png
diff --git a/default_images/dbaccess/res/sch039.png b/ooo_custom_images/hicontrast/dbaccess/res/sc039.png
index 016cce802b86..016cce802b86 100644
--- a/default_images/dbaccess/res/sch039.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/sc039.png
diff --git a/default_images/dbaccess/res/sch040.png b/ooo_custom_images/hicontrast/dbaccess/res/sc040.png
index f5c2ed7916f3..f5c2ed7916f3 100644
--- a/default_images/dbaccess/res/sch040.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/sc040.png
diff --git a/default_images/dbaccess/res/sortdown_h.png b/ooo_custom_images/hicontrast/dbaccess/res/sortdown.png
index e1537b0c9309..e1537b0c9309 100644
--- a/default_images/dbaccess/res/sortdown_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/sortdown.png
diff --git a/default_images/dbaccess/res/sortup_h.png b/ooo_custom_images/hicontrast/dbaccess/res/sortup.png
index a9ac1e23e527..a9ac1e23e527 100644
--- a/default_images/dbaccess/res/sortup_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/sortup.png
diff --git a/default_images/dbaccess/res/tables_32_h.png b/ooo_custom_images/hicontrast/dbaccess/res/tables_32.png
index a51e23e37cba..a51e23e37cba 100644
--- a/default_images/dbaccess/res/tables_32_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/tables_32.png
diff --git a/default_images/desktop/res/caution_12_h.png b/ooo_custom_images/hicontrast/desktop/res/caution_12.png
index 2f3b2f731fcd..2f3b2f731fcd 100644
--- a/default_images/desktop/res/caution_12_h.png
+++ b/ooo_custom_images/hicontrast/desktop/res/caution_12.png
diff --git a/default_images/desktop/res/caution_16_h.png b/ooo_custom_images/hicontrast/desktop/res/caution_16.png
index 42c2482f51ba..42c2482f51ba 100644
--- a/default_images/desktop/res/caution_16_h.png
+++ b/ooo_custom_images/hicontrast/desktop/res/caution_16.png
diff --git a/default_images/desktop/res/extension_16_h.png b/ooo_custom_images/hicontrast/desktop/res/extension_16.png
index 31ed87340c1f..31ed87340c1f 100644
--- a/default_images/desktop/res/extension_16_h.png
+++ b/ooo_custom_images/hicontrast/desktop/res/extension_16.png
diff --git a/default_images/desktop/res/extension_32_h.png b/ooo_custom_images/hicontrast/desktop/res/extension_32.png
index efb69cb582e4..efb69cb582e4 100644
--- a/default_images/desktop/res/extension_32_h.png
+++ b/ooo_custom_images/hicontrast/desktop/res/extension_32.png
diff --git a/default_images/desktop/res/info_16_h.png b/ooo_custom_images/hicontrast/desktop/res/info_16.png
index efecc9c56d90..efecc9c56d90 100644
--- a/default_images/desktop/res/info_16_h.png
+++ b/ooo_custom_images/hicontrast/desktop/res/info_16.png
diff --git a/default_images/desktop/res/lock_16_h.png b/ooo_custom_images/hicontrast/desktop/res/lock_16.png
index 1fd15626c206..1fd15626c206 100644
--- a/default_images/desktop/res/lock_16_h.png
+++ b/ooo_custom_images/hicontrast/desktop/res/lock_16.png
diff --git a/default_images/desktop/res/shared_16_h.png b/ooo_custom_images/hicontrast/desktop/res/shared_16.png
index 9ebfe1e73361..9ebfe1e73361 100644
--- a/default_images/desktop/res/shared_16_h.png
+++ b/ooo_custom_images/hicontrast/desktop/res/shared_16.png
diff --git a/default_images/extensions/res/buttonminus_hc.png b/ooo_custom_images/hicontrast/extensions/res/buttonminus.png
index baa9d9a24b6f..baa9d9a24b6f 100644
--- a/default_images/extensions/res/buttonminus_hc.png
+++ b/ooo_custom_images/hicontrast/extensions/res/buttonminus.png
diff --git a/default_images/extensions/res/buttonplus_hc.png b/ooo_custom_images/hicontrast/extensions/res/buttonplus.png
index 75ec8825ad90..75ec8825ad90 100644
--- a/default_images/extensions/res/buttonplus_hc.png
+++ b/ooo_custom_images/hicontrast/extensions/res/buttonplus.png
diff --git a/default_images/extensions/source/update/ui/onlineupdate_16_h.png b/ooo_custom_images/hicontrast/extensions/source/update/ui/onlineupdate_16.png
index 8a5fcfe2f04e..8a5fcfe2f04e 100644
--- a/default_images/extensions/source/update/ui/onlineupdate_16_h.png
+++ b/ooo_custom_images/hicontrast/extensions/source/update/ui/onlineupdate_16.png
diff --git a/default_images/extensions/source/update/ui/onlineupdate_26_h.png b/ooo_custom_images/hicontrast/extensions/source/update/ui/onlineupdate_26.png
index 4559ae79e756..4559ae79e756 100644
--- a/default_images/extensions/source/update/ui/onlineupdate_26_h.png
+++ b/ooo_custom_images/hicontrast/extensions/source/update/ui/onlineupdate_26.png
diff --git a/default_images/formula/res/fapclose_h.png b/ooo_custom_images/hicontrast/formula/res/fapclose.png
index c45570379c14..c45570379c14 100644
--- a/default_images/formula/res/fapclose_h.png
+++ b/ooo_custom_images/hicontrast/formula/res/fapclose.png
diff --git a/default_images/formula/res/faperror_h.png b/ooo_custom_images/hicontrast/formula/res/faperror.png
index c9a854f79f62..c9a854f79f62 100644
--- a/default_images/formula/res/faperror_h.png
+++ b/ooo_custom_images/hicontrast/formula/res/faperror.png
diff --git a/default_images/formula/res/fapok_h.png b/ooo_custom_images/hicontrast/formula/res/fapok.png
index acb448ca9d25..acb448ca9d25 100644
--- a/default_images/formula/res/fapok_h.png
+++ b/ooo_custom_images/hicontrast/formula/res/fapok.png
diff --git a/default_images/formula/res/fapopen_h.png b/ooo_custom_images/hicontrast/formula/res/fapopen.png
index e76cdcea19ea..e76cdcea19ea 100644
--- a/default_images/formula/res/fapopen_h.png
+++ b/ooo_custom_images/hicontrast/formula/res/fapopen.png
diff --git a/default_images/formula/res/fx_h.png b/ooo_custom_images/hicontrast/formula/res/fx.png
index 16761616d67c..16761616d67c 100644
--- a/default_images/formula/res/fx_h.png
+++ b/ooo_custom_images/hicontrast/formula/res/fx.png
diff --git a/default_images/formula/res/refinp1_h.png b/ooo_custom_images/hicontrast/formula/res/refinp1.png
index cf4145b3cf72..cf4145b3cf72 100644
--- a/default_images/formula/res/refinp1_h.png
+++ b/ooo_custom_images/hicontrast/formula/res/refinp1.png
diff --git a/default_images/formula/res/refinp2_h.png b/ooo_custom_images/hicontrast/formula/res/refinp2.png
index 0bfcdacf820f..0bfcdacf820f 100644
--- a/default_images/formula/res/refinp2_h.png
+++ b/ooo_custom_images/hicontrast/formula/res/refinp2.png
diff --git a/default_images/fpicker/res/fph011.png b/ooo_custom_images/hicontrast/fpicker/res/fp011.png
index 5ca40188c7bf..5ca40188c7bf 100644
--- a/default_images/fpicker/res/fph011.png
+++ b/ooo_custom_images/hicontrast/fpicker/res/fp011.png
diff --git a/default_images/fpicker/res/fph014.png b/ooo_custom_images/hicontrast/fpicker/res/fp014.png
index c17d1f867bb3..c17d1f867bb3 100644
--- a/default_images/fpicker/res/fph014.png
+++ b/ooo_custom_images/hicontrast/fpicker/res/fp014.png
diff --git a/default_images/framework/res/extension_hc.png b/ooo_custom_images/hicontrast/framework/res/extension.png
index f822e74a0e16..f822e74a0e16 100644
--- a/default_images/framework/res/extension_hc.png
+++ b/ooo_custom_images/hicontrast/framework/res/extension.png
diff --git a/default_images/framework/res/folder_32_hc.png b/ooo_custom_images/hicontrast/framework/res/folder_32.png
index 5c23d6197e1b..5c23d6197e1b 100644
--- a/default_images/framework/res/folder_32_hc.png
+++ b/ooo_custom_images/hicontrast/framework/res/folder_32.png
diff --git a/default_images/framework/res/info_hc.png b/ooo_custom_images/hicontrast/framework/res/info.png
index c22d3ad04fed..c22d3ad04fed 100644
--- a/default_images/framework/res/info_hc.png
+++ b/ooo_custom_images/hicontrast/framework/res/info.png
diff --git a/default_images/framework/res/register_hc.png b/ooo_custom_images/hicontrast/framework/res/register.png
index 2bdf2e8b7502..2bdf2e8b7502 100644
--- a/default_images/framework/res/register_hc.png
+++ b/ooo_custom_images/hicontrast/framework/res/register.png
diff --git a/default_images/framework/res/template_hc.png b/ooo_custom_images/hicontrast/framework/res/template.png
index 1563a936ebc5..1563a936ebc5 100644
--- a/default_images/framework/res/template_hc.png
+++ b/ooo_custom_images/hicontrast/framework/res/template.png
diff --git a/default_images/framework/res/templates_32_hc.png b/ooo_custom_images/hicontrast/framework/res/templates_32.png
index b8be693e17a8..b8be693e17a8 100644
--- a/default_images/framework/res/templates_32_hc.png
+++ b/ooo_custom_images/hicontrast/framework/res/templates_32.png
diff --git a/default_images/minimizer/minimizepresi_80_h.png b/ooo_custom_images/hicontrast/minimizer/minimizepresi_80.png
index fecc7fa5e6c2..fecc7fa5e6c2 100644
--- a/default_images/minimizer/minimizepresi_80_h.png
+++ b/ooo_custom_images/hicontrast/minimizer/minimizepresi_80.png
diff --git a/default_images/minimizer/opt_16_h.png b/ooo_custom_images/hicontrast/minimizer/opt_16.png
index 7b7e85083c19..7b7e85083c19 100644
--- a/default_images/minimizer/opt_16_h.png
+++ b/ooo_custom_images/hicontrast/minimizer/opt_16.png
diff --git a/default_images/minimizer/opt_26_h.png b/ooo_custom_images/hicontrast/minimizer/opt_26.png
index 924ad50b71ee..924ad50b71ee 100644
--- a/default_images/minimizer/opt_26_h.png
+++ b/ooo_custom_images/hicontrast/minimizer/opt_26.png
diff --git a/default_images/padmin/source/fax_16_h.png b/ooo_custom_images/hicontrast/padmin/source/fax_16.png
index 1af40ce0d25e..1af40ce0d25e 100644
--- a/default_images/padmin/source/fax_16_h.png
+++ b/ooo_custom_images/hicontrast/padmin/source/fax_16.png
diff --git a/default_images/padmin/source/printer_16_h.png b/ooo_custom_images/hicontrast/padmin/source/printer_16.png
index 83f4fe50cd75..83f4fe50cd75 100644
--- a/default_images/padmin/source/printer_16_h.png
+++ b/ooo_custom_images/hicontrast/padmin/source/printer_16.png
diff --git a/default_images/padmin/source/printer_40x48_h.png b/ooo_custom_images/hicontrast/padmin/source/printer_40x48.png
index 5e2ed4c7ea7c..5e2ed4c7ea7c 100644
--- a/default_images/padmin/source/printer_40x48_h.png
+++ b/ooo_custom_images/hicontrast/padmin/source/printer_40x48.png
diff --git a/default_images/padmin/source/printpdf_16_h.png b/ooo_custom_images/hicontrast/padmin/source/printpdf_16.png
index c5a73e04b37f..c5a73e04b37f 100644
--- a/default_images/padmin/source/printpdf_16_h.png
+++ b/ooo_custom_images/hicontrast/padmin/source/printpdf_16.png
diff --git a/default_images/reportdesign/res/sch30768.png b/ooo_custom_images/hicontrast/reportdesign/res/sc30768.png
index d1648bdb1b02..d1648bdb1b02 100644
--- a/default_images/reportdesign/res/sch30768.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sc30768.png
diff --git a/default_images/reportdesign/res/sch30769.png b/ooo_custom_images/hicontrast/reportdesign/res/sc30769.png
index ddf57d53f4f5..ddf57d53f4f5 100644
--- a/default_images/reportdesign/res/sch30769.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sc30769.png
diff --git a/default_images/reportdesign/res/sch30770.png b/ooo_custom_images/hicontrast/reportdesign/res/sc30770.png
index 4ad3729d1189..4ad3729d1189 100644
--- a/default_images/reportdesign/res/sch30770.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sc30770.png
diff --git a/default_images/reportdesign/res/sortdown_h.png b/ooo_custom_images/hicontrast/reportdesign/res/sortdown.png
index bff4033b2a5e..bff4033b2a5e 100644
--- a/default_images/reportdesign/res/sortdown_h.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sortdown.png
diff --git a/default_images/reportdesign/res/sortup_h.png b/ooo_custom_images/hicontrast/reportdesign/res/sortup.png
index 2199d7426513..2199d7426513 100644
--- a/default_images/reportdesign/res/sortup_h.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sortup.png
diff --git a/default_images/reportdesign/res/sxh10454.png b/ooo_custom_images/hicontrast/reportdesign/res/sx10454.png
index c9c012135317..c9c012135317 100644
--- a/default_images/reportdesign/res/sxh10454.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx10454.png
diff --git a/default_images/reportdesign/res/sxh10928.png b/ooo_custom_images/hicontrast/reportdesign/res/sx10928.png
index 9c36609e0280..9c36609e0280 100644
--- a/default_images/reportdesign/res/sxh10928.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx10928.png
diff --git a/default_images/reportdesign/res/sxh10929.png b/ooo_custom_images/hicontrast/reportdesign/res/sx10929.png
index 85d985f4b115..85d985f4b115 100644
--- a/default_images/reportdesign/res/sxh10929.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx10929.png
diff --git a/default_images/reportdesign/res/sxh11047.png b/ooo_custom_images/hicontrast/reportdesign/res/sx11047.png
index 130b1627676a..130b1627676a 100644
--- a/default_images/reportdesign/res/sxh11047.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx11047.png
diff --git a/default_images/reportdesign/res/sxh12452.png b/ooo_custom_images/hicontrast/reportdesign/res/sx12452.png
index 34fc869da494..34fc869da494 100644
--- a/default_images/reportdesign/res/sxh12452.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx12452.png
diff --git a/default_images/reportdesign/res/sxh12453.png b/ooo_custom_images/hicontrast/reportdesign/res/sx12453.png
index 34fc869da494..34fc869da494 100644
--- a/default_images/reportdesign/res/sxh12453.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx12453.png
diff --git a/default_images/reportdesign/res/sxh12454.png b/ooo_custom_images/hicontrast/reportdesign/res/sx12454.png
index abfab0cde149..abfab0cde149 100644
--- a/default_images/reportdesign/res/sxh12454.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx12454.png
diff --git a/default_images/reportdesign/res/sxh12464.png b/ooo_custom_images/hicontrast/reportdesign/res/sx12464.png
index f8a2d1581c45..f8a2d1581c45 100644
--- a/default_images/reportdesign/res/sxh12464.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx12464.png
diff --git a/default_images/reportdesign/res/sxh12466.png b/ooo_custom_images/hicontrast/reportdesign/res/sx12466.png
index c1bcd02b1725..c1bcd02b1725 100644
--- a/default_images/reportdesign/res/sxh12466.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx12466.png
diff --git a/default_images/reportdesign/res/sxh12468.png b/ooo_custom_images/hicontrast/reportdesign/res/sx12468.png
index 6360520d6096..6360520d6096 100644
--- a/default_images/reportdesign/res/sxh12468.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx12468.png
diff --git a/default_images/reportdesign/res/sxh12477.png b/ooo_custom_images/hicontrast/reportdesign/res/sx12477.png
index 45f01a28dcb2..45f01a28dcb2 100644
--- a/default_images/reportdesign/res/sxh12477.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx12477.png
diff --git a/default_images/reportdesign/res/sxh12594.png b/ooo_custom_images/hicontrast/reportdesign/res/sx12594.png
index 7881b8c2af1b..7881b8c2af1b 100644
--- a/default_images/reportdesign/res/sxh12594.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx12594.png
diff --git a/default_images/reportdesign/res/sxh12602.png b/ooo_custom_images/hicontrast/reportdesign/res/sx12602.png
index 40f48898951b..40f48898951b 100644
--- a/default_images/reportdesign/res/sxh12602.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx12602.png
diff --git a/default_images/reportdesign/res/sxh12603.png b/ooo_custom_images/hicontrast/reportdesign/res/sx12603.png
index e6fd9e2aaab5..e6fd9e2aaab5 100644
--- a/default_images/reportdesign/res/sxh12603.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx12603.png
diff --git a/default_images/res/adrbook_hc.png b/ooo_custom_images/hicontrast/res/adrbook.png
index aba8708aa560..aba8708aa560 100644
--- a/default_images/res/adrbook_hc.png
+++ b/ooo_custom_images/hicontrast/res/adrbook.png
diff --git a/default_images/res/arrow_move_down_hc.png b/ooo_custom_images/hicontrast/res/arrow_move_down.png
index e1537b0c9309..e1537b0c9309 100644
--- a/default_images/res/arrow_move_down_hc.png
+++ b/ooo_custom_images/hicontrast/res/arrow_move_down.png
diff --git a/default_images/res/arrow_move_up_hc.png b/ooo_custom_images/hicontrast/res/arrow_move_up.png
index f1803f7cc297..f1803f7cc297 100644
--- a/default_images/res/arrow_move_up_hc.png
+++ b/ooo_custom_images/hicontrast/res/arrow_move_up.png
diff --git a/default_images/res/baswatr_h.png b/ooo_custom_images/hicontrast/res/baswatr.png
index 604ae3afb311..604ae3afb311 100644
--- a/default_images/res/baswatr_h.png
+++ b/ooo_custom_images/hicontrast/res/baswatr.png
diff --git a/default_images/res/browse_hc.png b/ooo_custom_images/hicontrast/res/browse.png
index b98f12582239..b98f12582239 100644
--- a/default_images/res/browse_hc.png
+++ b/ooo_custom_images/hicontrast/res/browse.png
diff --git a/default_images/res/commandimagelist/ar/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/ar/lc_bold.png
index 01b82d00ce44..01b82d00ce44 100644
--- a/default_images/res/commandimagelist/ar/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ar/lc_bold.png
diff --git a/default_images/res/commandimagelist/ar/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/ar/lc_italic.png
index 3da9184f8981..3da9184f8981 100644
--- a/default_images/res/commandimagelist/ar/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ar/lc_italic.png
diff --git a/default_images/res/commandimagelist/ar/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/ar/lc_underline.png
index 86cb2b0348de..86cb2b0348de 100644
--- a/default_images/res/commandimagelist/ar/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ar/lc_underline.png
diff --git a/default_images/res/commandimagelist/ar/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/ar/sc_bold.png
index d4c74e2d467e..d4c74e2d467e 100644
--- a/default_images/res/commandimagelist/ar/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ar/sc_bold.png
diff --git a/default_images/res/commandimagelist/ar/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/ar/sc_italic.png
index d7c33542fc66..d7c33542fc66 100644
--- a/default_images/res/commandimagelist/ar/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ar/sc_italic.png
diff --git a/default_images/res/commandimagelist/ar/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/ar/sc_underline.png
index d1ec3ca5ad7c..d1ec3ca5ad7c 100644
--- a/default_images/res/commandimagelist/ar/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ar/sc_underline.png
diff --git a/default_images/res/commandimagelist/bg/lch_backcolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_backcolor.png
index c3d3f9f05c71..c3d3f9f05c71 100644
--- a/default_images/res/commandimagelist/bg/lch_backcolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_backcolor.png
diff --git a/default_images/res/commandimagelist/bg/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_bold.png
index 2f2e7226486f..2f2e7226486f 100644
--- a/default_images/res/commandimagelist/bg/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_bold.png
diff --git a/default_images/res/commandimagelist/bg/lch_doubleclicktextedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_doubleclicktextedit.png
index a06b630af605..a06b630af605 100644
--- a/default_images/res/commandimagelist/bg/lch_doubleclicktextedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_doubleclicktextedit.png
diff --git a/default_images/res/commandimagelist/bg/lch_edit.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_edit.png
index 4c8abf1c5149..4c8abf1c5149 100644
--- a/default_images/res/commandimagelist/bg/lch_edit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_edit.png
diff --git a/default_images/res/commandimagelist/bg/lch_editglossary.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_editglossary.png
index f9e4886cd71a..f9e4886cd71a 100644
--- a/default_images/res/commandimagelist/bg/lch_editglossary.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_editglossary.png
diff --git a/default_images/res/commandimagelist/bg/lch_hyphenate.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_hyphenate.png
index ca3c38d77b74..ca3c38d77b74 100644
--- a/default_images/res/commandimagelist/bg/lch_hyphenate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_hyphenate.png
diff --git a/default_images/res/commandimagelist/bg/lch_hyphenation.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_hyphenation.png
index 51058fd80f18..51058fd80f18 100644
--- a/default_images/res/commandimagelist/bg/lch_hyphenation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_hyphenation.png
diff --git a/default_images/res/commandimagelist/bg/lch_insertedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_insertedit.png
index 116d28a07650..116d28a07650 100644
--- a/default_images/res/commandimagelist/bg/lch_insertedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_insertedit.png
diff --git a/default_images/res/commandimagelist/bg/lch_insertfixedtext.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_insertfixedtext.png
index 4635f265cfa0..4635f265cfa0 100644
--- a/default_images/res/commandimagelist/bg/lch_insertfixedtext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_insertfixedtext.png
diff --git a/default_images/res/commandimagelist/bg/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_italic.png
index 2d634432cefe..2d634432cefe 100644
--- a/default_images/res/commandimagelist/bg/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_italic.png
diff --git a/default_images/res/commandimagelist/bg/lch_label.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_label.png
index 0fd2a61c49b1..0fd2a61c49b1 100644
--- a/default_images/res/commandimagelist/bg/lch_label.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_label.png
diff --git a/default_images/res/commandimagelist/bg/lch_ordercrit.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_ordercrit.png
index 327b986fbc1b..327b986fbc1b 100644
--- a/default_images/res/commandimagelist/bg/lch_ordercrit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_ordercrit.png
diff --git a/default_images/res/commandimagelist/bg/lch_pickthrough.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_pickthrough.png
index d52d0163eccc..d52d0163eccc 100644
--- a/default_images/res/commandimagelist/bg/lch_pickthrough.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_pickthrough.png
diff --git a/default_images/res/commandimagelist/bg/lch_quickedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_quickedit.png
index 3f5c9459b4fb..3f5c9459b4fb 100644
--- a/default_images/res/commandimagelist/bg/lch_quickedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_quickedit.png
diff --git a/default_images/res/commandimagelist/bg/lch_sortascending.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_sortascending.png
index 8f5af46059ac..8f5af46059ac 100644
--- a/default_images/res/commandimagelist/bg/lch_sortascending.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_sortascending.png
diff --git a/default_images/res/commandimagelist/bg/lch_sortdescending.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_sortdescending.png
index 3834a9bb6b09..3834a9bb6b09 100644
--- a/default_images/res/commandimagelist/bg/lch_sortdescending.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_sortdescending.png
diff --git a/default_images/res/commandimagelist/bg/lch_sortdown.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_sortdown.png
index afa5bae1c96b..afa5bae1c96b 100644
--- a/default_images/res/commandimagelist/bg/lch_sortdown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_sortdown.png
diff --git a/default_images/res/commandimagelist/bg/lch_sortup.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_sortup.png
index 76be1d446e03..76be1d446e03 100644
--- a/default_images/res/commandimagelist/bg/lch_sortup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_sortup.png
diff --git a/default_images/res/commandimagelist/bg/lch_spelldialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_spelldialog.png
index 10521aec12be..10521aec12be 100644
--- a/default_images/res/commandimagelist/bg/lch_spelldialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_spelldialog.png
diff --git a/default_images/res/commandimagelist/bg/lch_spelling.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_spelling.png
index d016977bdd17..d016977bdd17 100644
--- a/default_images/res/commandimagelist/bg/lch_spelling.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_spelling.png
diff --git a/default_images/res/commandimagelist/bg/lch_spellonline.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_spellonline.png
index 06f772ca14cc..06f772ca14cc 100644
--- a/default_images/res/commandimagelist/bg/lch_spellonline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_spellonline.png
diff --git a/default_images/res/commandimagelist/bg/lch_strikeout.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_strikeout.png
index 7ea761bdb99c..7ea761bdb99c 100644
--- a/default_images/res/commandimagelist/bg/lch_strikeout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_strikeout.png
diff --git a/default_images/res/commandimagelist/bg/lch_tablesort.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_tablesort.png
index 4ce94ce855d2..4ce94ce855d2 100644
--- a/default_images/res/commandimagelist/bg/lch_tablesort.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_tablesort.png
diff --git a/default_images/res/commandimagelist/bg/lch_thesaurus.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_thesaurus.png
index f0f23e844a9e..f0f23e844a9e 100644
--- a/default_images/res/commandimagelist/bg/lch_thesaurus.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_thesaurus.png
diff --git a/default_images/res/commandimagelist/bg/lch_thesaurusdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_thesaurusdialog.png
index ab760039caac..ab760039caac 100644
--- a/default_images/res/commandimagelist/bg/lch_thesaurusdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_thesaurusdialog.png
diff --git a/default_images/res/commandimagelist/bg/lch_toggleaxistitle.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_toggleaxistitle.png
index 44c42640bd4e..44c42640bd4e 100644
--- a/default_images/res/commandimagelist/bg/lch_toggleaxistitle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_toggleaxistitle.png
diff --git a/default_images/res/commandimagelist/bg/lch_toggletitle.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_toggletitle.png
index aee3caa5e386..aee3caa5e386 100644
--- a/default_images/res/commandimagelist/bg/lch_toggletitle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_toggletitle.png
diff --git a/default_images/res/commandimagelist/bg/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_underline.png
index 46e6906b9f91..46e6906b9f91 100644
--- a/default_images/res/commandimagelist/bg/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_underline.png
diff --git a/default_images/res/commandimagelist/bg/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_underlinedouble.png
index 50fc4b0b6ac5..50fc4b0b6ac5 100644
--- a/default_images/res/commandimagelist/bg/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/bg/sch_backcolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_backcolor.png
index 66771691b1b0..66771691b1b0 100644
--- a/default_images/res/commandimagelist/bg/sch_backcolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_backcolor.png
diff --git a/default_images/res/commandimagelist/bg/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_bold.png
index a9a5a5999d6e..a9a5a5999d6e 100644
--- a/default_images/res/commandimagelist/bg/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_bold.png
diff --git a/default_images/res/commandimagelist/bg/sch_editglossary.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_editglossary.png
index 4b8334be6a02..4b8334be6a02 100644
--- a/default_images/res/commandimagelist/bg/sch_editglossary.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_editglossary.png
diff --git a/default_images/res/commandimagelist/bg/sch_hyphenate.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_hyphenate.png
index 205f9e4f12dc..205f9e4f12dc 100644
--- a/default_images/res/commandimagelist/bg/sch_hyphenate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_hyphenate.png
diff --git a/default_images/res/commandimagelist/bg/sch_hyphenation.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_hyphenation.png
index 205f9e4f12dc..205f9e4f12dc 100644
--- a/default_images/res/commandimagelist/bg/sch_hyphenation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_hyphenation.png
diff --git a/default_images/res/commandimagelist/bg/sch_insertedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_insertedit.png
index 82c4b5565984..82c4b5565984 100644
--- a/default_images/res/commandimagelist/bg/sch_insertedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_insertedit.png
diff --git a/default_images/res/commandimagelist/bg/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_italic.png
index d8bc8978d6be..d8bc8978d6be 100644
--- a/default_images/res/commandimagelist/bg/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_italic.png
diff --git a/default_images/res/commandimagelist/bg/sch_label.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_label.png
index 2bcead1a26c4..2bcead1a26c4 100644
--- a/default_images/res/commandimagelist/bg/sch_label.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_label.png
diff --git a/default_images/res/commandimagelist/bg/sch_ordercrit.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_ordercrit.png
index 982280ae64bf..982280ae64bf 100644
--- a/default_images/res/commandimagelist/bg/sch_ordercrit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_ordercrit.png
diff --git a/default_images/res/commandimagelist/bg/sch_pickthrough.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_pickthrough.png
index f1fe74adb402..f1fe74adb402 100644
--- a/default_images/res/commandimagelist/bg/sch_pickthrough.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_pickthrough.png
diff --git a/default_images/res/commandimagelist/bg/sch_sortascending.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_sortascending.png
index 6a8640f06204..6a8640f06204 100644
--- a/default_images/res/commandimagelist/bg/sch_sortascending.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_sortascending.png
diff --git a/default_images/res/commandimagelist/bg/sch_sortdescending.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_sortdescending.png
index 44379b818732..44379b818732 100644
--- a/default_images/res/commandimagelist/bg/sch_sortdescending.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_sortdescending.png
diff --git a/default_images/res/commandimagelist/bg/sch_sortdown.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_sortdown.png
index 44379b818732..44379b818732 100644
--- a/default_images/res/commandimagelist/bg/sch_sortdown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_sortdown.png
diff --git a/default_images/res/commandimagelist/bg/sch_sortup.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_sortup.png
index 885d9a1523fa..885d9a1523fa 100644
--- a/default_images/res/commandimagelist/bg/sch_sortup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_sortup.png
diff --git a/default_images/res/commandimagelist/bg/sch_spelldialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_spelldialog.png
index 6c679eeb2dba..6c679eeb2dba 100644
--- a/default_images/res/commandimagelist/bg/sch_spelldialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_spelldialog.png
diff --git a/default_images/res/commandimagelist/bg/sch_spelling.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_spelling.png
index eca9e9bde8fb..eca9e9bde8fb 100644
--- a/default_images/res/commandimagelist/bg/sch_spelling.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_spelling.png
diff --git a/default_images/res/commandimagelist/bg/sch_spellonline.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_spellonline.png
index 300baee017e5..300baee017e5 100644
--- a/default_images/res/commandimagelist/bg/sch_spellonline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_spellonline.png
diff --git a/default_images/res/commandimagelist/bg/sch_strikeout.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_strikeout.png
index 2630af1ca38d..2630af1ca38d 100644
--- a/default_images/res/commandimagelist/bg/sch_strikeout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_strikeout.png
diff --git a/default_images/res/commandimagelist/bg/sch_tablesort.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_tablesort.png
index 982280ae64bf..982280ae64bf 100644
--- a/default_images/res/commandimagelist/bg/sch_tablesort.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_tablesort.png
diff --git a/default_images/res/commandimagelist/bg/sch_thesaurus.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_thesaurus.png
index 6a6153e058e8..6a6153e058e8 100644
--- a/default_images/res/commandimagelist/bg/sch_thesaurus.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_thesaurus.png
diff --git a/default_images/res/commandimagelist/bg/sch_thesaurusdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_thesaurusdialog.png
index 6a6153e058e8..6a6153e058e8 100644
--- a/default_images/res/commandimagelist/bg/sch_thesaurusdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_thesaurusdialog.png
diff --git a/default_images/res/commandimagelist/bg/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_underline.png
index 4439cca5a97e..4439cca5a97e 100644
--- a/default_images/res/commandimagelist/bg/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_underline.png
diff --git a/default_images/res/commandimagelist/bg/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_underlinedouble.png
index 2e9e1117ab7b..2e9e1117ab7b 100644
--- a/default_images/res/commandimagelist/bg/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/ca/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/ca/lc_bold.png
index 2fc3fcb763c5..2fc3fcb763c5 100644
--- a/default_images/res/commandimagelist/ca/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ca/lc_bold.png
diff --git a/default_images/res/commandimagelist/ca/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/ca/lc_italic.png
index fdac4232a904..fdac4232a904 100644
--- a/default_images/res/commandimagelist/ca/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ca/lc_italic.png
diff --git a/default_images/res/commandimagelist/ca/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/ca/lc_underline.png
index 6e3f0a888de3..6e3f0a888de3 100644
--- a/default_images/res/commandimagelist/ca/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ca/lc_underline.png
diff --git a/default_images/res/commandimagelist/ca/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/ca/lc_underlinedouble.png
index 3d73d9ace800..3d73d9ace800 100644
--- a/default_images/res/commandimagelist/ca/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ca/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/ca/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/ca/sc_bold.png
index 66d0f0f8ed19..66d0f0f8ed19 100644
--- a/default_images/res/commandimagelist/ca/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ca/sc_bold.png
diff --git a/default_images/res/commandimagelist/ca/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/ca/sc_italic.png
index 319658ff4366..319658ff4366 100644
--- a/default_images/res/commandimagelist/ca/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ca/sc_italic.png
diff --git a/default_images/res/commandimagelist/ca/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/ca/sc_underline.png
index e0f886dc31b3..e0f886dc31b3 100644
--- a/default_images/res/commandimagelist/ca/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ca/sc_underline.png
diff --git a/default_images/res/commandimagelist/ca/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/ca/sc_underlinedouble.png
index f9e9ae49d21b..f9e9ae49d21b 100644
--- a/default_images/res/commandimagelist/ca/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ca/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/cs/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/cs/lc_bold.png
index aa4385764f93..aa4385764f93 100644
--- a/default_images/res/commandimagelist/cs/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/cs/lc_bold.png
diff --git a/default_images/res/commandimagelist/cs/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/cs/lc_italic.png
index 0387f58cb164..0387f58cb164 100644
--- a/default_images/res/commandimagelist/cs/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/cs/lc_italic.png
diff --git a/default_images/res/commandimagelist/cs/lch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/cs/lc_numberformatdecimal.png
index 2d1ff510c0b3..2d1ff510c0b3 100644
--- a/default_images/res/commandimagelist/cs/lch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/cs/lc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/cs/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/cs/lc_underline.png
index 86cb2b0348de..86cb2b0348de 100644
--- a/default_images/res/commandimagelist/cs/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/cs/lc_underline.png
diff --git a/default_images/res/commandimagelist/cs/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/cs/lc_underlinedouble.png
index f27304864369..f27304864369 100644
--- a/default_images/res/commandimagelist/cs/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/cs/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/cs/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/cs/sc_bold.png
index d4c74e2d467e..d4c74e2d467e 100644
--- a/default_images/res/commandimagelist/cs/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/cs/sc_bold.png
diff --git a/default_images/res/commandimagelist/cs/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/cs/sc_italic.png
index f28583757725..f28583757725 100644
--- a/default_images/res/commandimagelist/cs/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/cs/sc_italic.png
diff --git a/default_images/res/commandimagelist/cs/sch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/cs/sc_numberformatdecimal.png
index 3a247754b915..3a247754b915 100644
--- a/default_images/res/commandimagelist/cs/sch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/cs/sc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/cs/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/cs/sc_underline.png
index ed5562d1b20a..ed5562d1b20a 100644
--- a/default_images/res/commandimagelist/cs/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/cs/sc_underline.png
diff --git a/default_images/res/commandimagelist/cs/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/cs/sc_underlinedouble.png
index fcebadf2a5b0..fcebadf2a5b0 100644
--- a/default_images/res/commandimagelist/cs/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/cs/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/de/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/de/lc_bold.png
index 21a8ec70058f..21a8ec70058f 100644
--- a/default_images/res/commandimagelist/de/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/de/lc_bold.png
diff --git a/default_images/res/commandimagelist/de/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/de/lc_italic.png
index 437beae30dde..437beae30dde 100644
--- a/default_images/res/commandimagelist/de/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/de/lc_italic.png
diff --git a/default_images/res/commandimagelist/de/lch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/de/lc_numberformatdecimal.png
index 19c0c5345b46..19c0c5345b46 100644
--- a/default_images/res/commandimagelist/de/lch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/de/lc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/de/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/de/lc_underline.png
index 86cb2b0348de..86cb2b0348de 100644
--- a/default_images/res/commandimagelist/de/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/de/lc_underline.png
diff --git a/default_images/res/commandimagelist/de/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/de/lc_underlinedouble.png
index 12970a163d35..12970a163d35 100644
--- a/default_images/res/commandimagelist/de/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/de/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/de/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/de/sc_bold.png
index 874cfba4e7a9..874cfba4e7a9 100644
--- a/default_images/res/commandimagelist/de/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/de/sc_bold.png
diff --git a/default_images/res/commandimagelist/de/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/de/sc_italic.png
index 1bb15c11b894..1bb15c11b894 100644
--- a/default_images/res/commandimagelist/de/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/de/sc_italic.png
diff --git a/default_images/res/commandimagelist/de/sch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/de/sc_numberformatdecimal.png
index fbda15d0a004..fbda15d0a004 100644
--- a/default_images/res/commandimagelist/de/sch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/de/sc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/de/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/de/sc_underline.png
index 34038e4e8759..34038e4e8759 100644
--- a/default_images/res/commandimagelist/de/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/de/sc_underline.png
diff --git a/default_images/res/commandimagelist/de/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/de/sc_underlinedouble.png
index aca967ec1cdc..aca967ec1cdc 100644
--- a/default_images/res/commandimagelist/de/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/de/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/en-GB/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/lc_bold.png
index 490c31e7bd1a..490c31e7bd1a 100644
--- a/default_images/res/commandimagelist/en-GB/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/lc_bold.png
diff --git a/default_images/res/commandimagelist/en-GB/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/lc_italic.png
index 10d43acdb631..10d43acdb631 100644
--- a/default_images/res/commandimagelist/en-GB/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/lc_italic.png
diff --git a/default_images/res/commandimagelist/en-GB/lch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/lc_numberformatdecimal.png
index 105afb0d5471..105afb0d5471 100644
--- a/default_images/res/commandimagelist/en-GB/lch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/lc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/en-GB/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/lc_underline.png
index 54e6da7bf3e9..54e6da7bf3e9 100644
--- a/default_images/res/commandimagelist/en-GB/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/lc_underline.png
diff --git a/default_images/res/commandimagelist/en-GB/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/lc_underlinedouble.png
index a40405e5ae58..a40405e5ae58 100644
--- a/default_images/res/commandimagelist/en-GB/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/en-GB/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/sc_bold.png
index d4c74e2d467e..d4c74e2d467e 100644
--- a/default_images/res/commandimagelist/en-GB/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/sc_bold.png
diff --git a/default_images/res/commandimagelist/en-GB/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/sc_italic.png
index fa9e3aad5825..fa9e3aad5825 100644
--- a/default_images/res/commandimagelist/en-GB/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/sc_italic.png
diff --git a/default_images/res/commandimagelist/en-GB/sch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/sc_numberformatdecimal.png
index 3a247754b915..3a247754b915 100644
--- a/default_images/res/commandimagelist/en-GB/sch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/sc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/en-GB/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/sc_underline.png
index 5d22c8ec9838..5d22c8ec9838 100644
--- a/default_images/res/commandimagelist/en-GB/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/sc_underline.png
diff --git a/default_images/res/commandimagelist/en-GB/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/sc_underlinedouble.png
index aca967ec1cdc..aca967ec1cdc 100644
--- a/default_images/res/commandimagelist/en-GB/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/es/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/es/lc_bold.png
index 2fc3fcb763c5..2fc3fcb763c5 100644
--- a/default_images/res/commandimagelist/es/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/es/lc_bold.png
diff --git a/default_images/res/commandimagelist/es/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/es/lc_italic.png
index fdac4232a904..fdac4232a904 100644
--- a/default_images/res/commandimagelist/es/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/es/lc_italic.png
diff --git a/default_images/res/commandimagelist/es/lch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/es/lc_numberformatdecimal.png
index c216244a1bfc..c216244a1bfc 100644
--- a/default_images/res/commandimagelist/es/lch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/es/lc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/es/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/es/lc_underline.png
index 22380aa8140d..22380aa8140d 100644
--- a/default_images/res/commandimagelist/es/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/es/lc_underline.png
diff --git a/default_images/res/commandimagelist/es/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/es/lc_underlinedouble.png
index 3d73d9ace800..3d73d9ace800 100644
--- a/default_images/res/commandimagelist/es/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/es/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/es/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/es/sc_bold.png
index 66d0f0f8ed19..66d0f0f8ed19 100644
--- a/default_images/res/commandimagelist/es/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/es/sc_bold.png
diff --git a/default_images/res/commandimagelist/es/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/es/sc_italic.png
index 221e37f23251..221e37f23251 100644
--- a/default_images/res/commandimagelist/es/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/es/sc_italic.png
diff --git a/default_images/res/commandimagelist/es/sch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/es/sc_numberformatdecimal.png
index 9e73e1231076..9e73e1231076 100644
--- a/default_images/res/commandimagelist/es/sch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/es/sc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/es/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/es/sc_underline.png
index be355a85731a..be355a85731a 100644
--- a/default_images/res/commandimagelist/es/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/es/sc_underline.png
diff --git a/default_images/res/commandimagelist/es/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/es/sc_underlinedouble.png
index f9e9ae49d21b..f9e9ae49d21b 100644
--- a/default_images/res/commandimagelist/es/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/es/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/et/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/et/lc_bold.png
index 1800f69f2a61..1800f69f2a61 100644
--- a/default_images/res/commandimagelist/et/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/et/lc_bold.png
diff --git a/default_images/res/commandimagelist/et/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/et/lc_italic.png
index 0387f58cb164..0387f58cb164 100644
--- a/default_images/res/commandimagelist/et/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/et/lc_italic.png
diff --git a/default_images/res/commandimagelist/et/lch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/et/lc_numberformatdecimal.png
index b493e7cc387c..b493e7cc387c 100644
--- a/default_images/res/commandimagelist/et/lch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/et/lc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/et/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/et/lc_underline.png
index 635a8c4ca20f..635a8c4ca20f 100644
--- a/default_images/res/commandimagelist/et/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/et/lc_underline.png
diff --git a/default_images/res/commandimagelist/et/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/et/lc_underlinedouble.png
index f27304864369..f27304864369 100644
--- a/default_images/res/commandimagelist/et/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/et/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/et/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/et/sc_bold.png
index d4c74e2d467e..d4c74e2d467e 100644
--- a/default_images/res/commandimagelist/et/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/et/sc_bold.png
diff --git a/default_images/res/commandimagelist/et/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/et/sc_italic.png
index f28583757725..f28583757725 100644
--- a/default_images/res/commandimagelist/et/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/et/sc_italic.png
diff --git a/default_images/res/commandimagelist/et/sch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/et/sc_numberformatdecimal.png
index 3a247754b915..3a247754b915 100644
--- a/default_images/res/commandimagelist/et/sch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/et/sc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/et/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/et/sc_underline.png
index c243963a1e73..c243963a1e73 100644
--- a/default_images/res/commandimagelist/et/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/et/sc_underline.png
diff --git a/default_images/res/commandimagelist/et/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/et/sc_underlinedouble.png
index fcebadf2a5b0..fcebadf2a5b0 100644
--- a/default_images/res/commandimagelist/et/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/et/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/fr/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/fr/lc_bold.png
index 5dd271636f9f..5dd271636f9f 100644
--- a/default_images/res/commandimagelist/fr/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/fr/lc_bold.png
diff --git a/default_images/res/commandimagelist/fr/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/fr/lc_italic.png
index 84fd9c032347..84fd9c032347 100644
--- a/default_images/res/commandimagelist/fr/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/fr/lc_italic.png
diff --git a/default_images/res/commandimagelist/fr/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/fr/lc_underline.png
index 0421ef64f8ec..0421ef64f8ec 100644
--- a/default_images/res/commandimagelist/fr/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/fr/lc_underline.png
diff --git a/default_images/res/commandimagelist/fr/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/fr/lc_underlinedouble.png
index 3b988d605d2e..3b988d605d2e 100644
--- a/default_images/res/commandimagelist/fr/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/fr/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/fr/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/fr/sc_bold.png
index 2e1ca2e2cd2c..2e1ca2e2cd2c 100644
--- a/default_images/res/commandimagelist/fr/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/fr/sc_bold.png
diff --git a/default_images/res/commandimagelist/fr/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/fr/sc_italic.png
index b77320ac40df..b77320ac40df 100644
--- a/default_images/res/commandimagelist/fr/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/fr/sc_italic.png
diff --git a/default_images/res/commandimagelist/fr/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/fr/sc_underline.png
index b74305a8889c..b74305a8889c 100644
--- a/default_images/res/commandimagelist/fr/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/fr/sc_underline.png
diff --git a/default_images/res/commandimagelist/fr/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/fr/sc_underlinedouble.png
index 72d6a2871439..72d6a2871439 100644
--- a/default_images/res/commandimagelist/fr/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/fr/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/hu/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/hu/lc_bold.png
index 21a8ec70058f..21a8ec70058f 100644
--- a/default_images/res/commandimagelist/hu/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/hu/lc_bold.png
diff --git a/default_images/res/commandimagelist/hu/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/hu/lc_italic.png
index 4c3e3d1dbd3c..4c3e3d1dbd3c 100644
--- a/default_images/res/commandimagelist/hu/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/hu/lc_italic.png
diff --git a/default_images/res/commandimagelist/hu/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/hu/lc_underline.png
index 39a2bcb34154..39a2bcb34154 100644
--- a/default_images/res/commandimagelist/hu/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/hu/lc_underline.png
diff --git a/default_images/res/commandimagelist/hu/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/hu/lc_underlinedouble.png
index 998f4c9808a8..998f4c9808a8 100644
--- a/default_images/res/commandimagelist/hu/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/hu/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/hu/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/hu/sc_bold.png
index 874cfba4e7a9..874cfba4e7a9 100644
--- a/default_images/res/commandimagelist/hu/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/hu/sc_bold.png
diff --git a/default_images/res/commandimagelist/hu/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/hu/sc_italic.png
index 47963d183a73..47963d183a73 100644
--- a/default_images/res/commandimagelist/hu/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/hu/sc_italic.png
diff --git a/default_images/res/commandimagelist/hu/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/hu/sc_underline.png
index ed0bb3dfc280..ed0bb3dfc280 100644
--- a/default_images/res/commandimagelist/hu/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/hu/sc_underline.png
diff --git a/default_images/res/commandimagelist/hu/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/hu/sc_underlinedouble.png
index 3d142bc3bc5a..3d142bc3bc5a 100644
--- a/default_images/res/commandimagelist/hu/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/hu/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/it/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/it/lc_bold.png
index 846408113dc7..846408113dc7 100644
--- a/default_images/res/commandimagelist/it/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/it/lc_bold.png
diff --git a/default_images/res/commandimagelist/it/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/it/lc_italic.png
index 4cafe4753201..4cafe4753201 100644
--- a/default_images/res/commandimagelist/it/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/it/lc_italic.png
diff --git a/default_images/res/commandimagelist/it/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/it/lc_underline.png
index 22380aa8140d..22380aa8140d 100644
--- a/default_images/res/commandimagelist/it/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/it/lc_underline.png
diff --git a/default_images/res/commandimagelist/it/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/it/lc_underlinedouble.png
index 187cdae1747c..187cdae1747c 100644
--- a/default_images/res/commandimagelist/it/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/it/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/it/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/it/sc_bold.png
index cdb24fa5e585..cdb24fa5e585 100644
--- a/default_images/res/commandimagelist/it/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/it/sc_bold.png
diff --git a/default_images/res/commandimagelist/it/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/it/sc_italic.png
index 221e37f23251..221e37f23251 100644
--- a/default_images/res/commandimagelist/it/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/it/sc_italic.png
diff --git a/default_images/res/commandimagelist/it/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/it/sc_underline.png
index be355a85731a..be355a85731a 100644
--- a/default_images/res/commandimagelist/it/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/it/sc_underline.png
diff --git a/default_images/res/commandimagelist/it/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/it/sc_underlinedouble.png
index f9e9ae49d21b..f9e9ae49d21b 100644
--- a/default_images/res/commandimagelist/it/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/it/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/ja/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/ja/lc_bold.png
index e28c927efcf7..e28c927efcf7 100644
--- a/default_images/res/commandimagelist/ja/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ja/lc_bold.png
diff --git a/default_images/res/commandimagelist/ja/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/ja/lc_italic.png
index 0387f58cb164..0387f58cb164 100644
--- a/default_images/res/commandimagelist/ja/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ja/lc_italic.png
diff --git a/default_images/res/commandimagelist/ja/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/ja/lc_underline.png
index 1cb66a0c1179..1cb66a0c1179 100644
--- a/default_images/res/commandimagelist/ja/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ja/lc_underline.png
diff --git a/default_images/res/commandimagelist/ja/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/ja/lc_underlinedouble.png
index 0eb4c2c0bb2f..0eb4c2c0bb2f 100644
--- a/default_images/res/commandimagelist/ja/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ja/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/ja/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/ja/sc_bold.png
index d4c74e2d467e..d4c74e2d467e 100644
--- a/default_images/res/commandimagelist/ja/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ja/sc_bold.png
diff --git a/default_images/res/commandimagelist/ja/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/ja/sc_italic.png
index d7c33542fc66..d7c33542fc66 100644
--- a/default_images/res/commandimagelist/ja/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ja/sc_italic.png
diff --git a/default_images/res/commandimagelist/ja/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/ja/sc_underline.png
index 159907e0bd8f..159907e0bd8f 100644
--- a/default_images/res/commandimagelist/ja/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ja/sc_underline.png
diff --git a/default_images/res/commandimagelist/ja/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/ja/sc_underlinedouble.png
index 76aeb78a859d..76aeb78a859d 100644
--- a/default_images/res/commandimagelist/ja/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ja/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/km/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/km/lc_bold.png
index 75eb8bac1fea..75eb8bac1fea 100644
--- a/default_images/res/commandimagelist/km/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/km/lc_bold.png
diff --git a/default_images/res/commandimagelist/km/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/km/lc_italic.png
index 8655a31f2278..8655a31f2278 100644
--- a/default_images/res/commandimagelist/km/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/km/lc_italic.png
diff --git a/default_images/res/commandimagelist/km/lch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/km/lc_numberformatdecimal.png
index b040fa766858..b040fa766858 100644
--- a/default_images/res/commandimagelist/km/lch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/km/lc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/km/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/km/lc_underline.png
index ae58a0135aa0..ae58a0135aa0 100644
--- a/default_images/res/commandimagelist/km/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/km/lc_underline.png
diff --git a/default_images/res/commandimagelist/km/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/km/lc_underlinedouble.png
index f1bef3f25374..f1bef3f25374 100644
--- a/default_images/res/commandimagelist/km/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/km/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/km/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/km/sc_bold.png
index aa227b508ba2..aa227b508ba2 100644
--- a/default_images/res/commandimagelist/km/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/km/sc_bold.png
diff --git a/default_images/res/commandimagelist/km/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/km/sc_italic.png
index 642bd4e8706a..642bd4e8706a 100644
--- a/default_images/res/commandimagelist/km/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/km/sc_italic.png
diff --git a/default_images/res/commandimagelist/km/sch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/km/sc_numberformatdecimal.png
index 3a247754b915..3a247754b915 100644
--- a/default_images/res/commandimagelist/km/sch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/km/sc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/km/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/km/sc_underline.png
index da04f08d3f39..da04f08d3f39 100644
--- a/default_images/res/commandimagelist/km/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/km/sc_underline.png
diff --git a/default_images/res/commandimagelist/km/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/km/sc_underlinedouble.png
index d6ee5e79a3b7..d6ee5e79a3b7 100644
--- a/default_images/res/commandimagelist/km/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/km/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/ko/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_bold.png
index 59b72b41cd6a..59b72b41cd6a 100644
--- a/default_images/res/commandimagelist/ko/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_bold.png
diff --git a/default_images/res/commandimagelist/ko/lch_charfontname.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_charfontname.png
index d872dbb4d501..d872dbb4d501 100644
--- a/default_images/res/commandimagelist/ko/lch_charfontname.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_charfontname.png
diff --git a/default_images/res/commandimagelist/ko/lch_color.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_color.png
index 6610d06b7fad..6610d06b7fad 100644
--- a/default_images/res/commandimagelist/ko/lch_color.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_color.png
diff --git a/default_images/res/commandimagelist/ko/lch_drawtext.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_drawtext.png
index 531f1219d273..531f1219d273 100644
--- a/default_images/res/commandimagelist/ko/lch_drawtext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_drawtext.png
diff --git a/default_images/res/commandimagelist/ko/lch_fontcolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_fontcolor.png
index 8d2b985eb162..8d2b985eb162 100644
--- a/default_images/res/commandimagelist/ko/lch_fontcolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_fontcolor.png
diff --git a/default_images/res/commandimagelist/ko/lch_fontheight.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_fontheight.png
index 7c296bbebaf0..7c296bbebaf0 100644
--- a/default_images/res/commandimagelist/ko/lch_fontheight.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_fontheight.png
diff --git a/default_images/res/commandimagelist/ko/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_italic.png
index f24bef2478c7..f24bef2478c7 100644
--- a/default_images/res/commandimagelist/ko/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_italic.png
diff --git a/default_images/res/commandimagelist/ko/lch_ordercrit.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_ordercrit.png
index 4e5f2261d8c9..4e5f2261d8c9 100644
--- a/default_images/res/commandimagelist/ko/lch_ordercrit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_ordercrit.png
diff --git a/default_images/res/commandimagelist/ko/lch_outlinefont.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_outlinefont.png
index ce28e9812974..ce28e9812974 100644
--- a/default_images/res/commandimagelist/ko/lch_outlinefont.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_outlinefont.png
diff --git a/default_images/res/commandimagelist/ko/lch_shadowed.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_shadowed.png
index 6d333b146c0a..6d333b146c0a 100644
--- a/default_images/res/commandimagelist/ko/lch_shadowed.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_shadowed.png
diff --git a/default_images/res/commandimagelist/ko/lch_sortdown.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_sortdown.png
index 2ac47b53f403..2ac47b53f403 100644
--- a/default_images/res/commandimagelist/ko/lch_sortdown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_sortdown.png
diff --git a/default_images/res/commandimagelist/ko/lch_sortup.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_sortup.png
index 9df0e88f9606..9df0e88f9606 100644
--- a/default_images/res/commandimagelist/ko/lch_sortup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_sortup.png
diff --git a/default_images/res/commandimagelist/ko/lch_strikeout.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_strikeout.png
index dc48a9a3ec38..dc48a9a3ec38 100644
--- a/default_images/res/commandimagelist/ko/lch_strikeout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_strikeout.png
diff --git a/default_images/res/commandimagelist/ko/lch_tablesort.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_tablesort.png
index 7cdfa59d9658..7cdfa59d9658 100644
--- a/default_images/res/commandimagelist/ko/lch_tablesort.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_tablesort.png
diff --git a/default_images/res/commandimagelist/ko/lch_text.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_text.png
index 531f1219d273..531f1219d273 100644
--- a/default_images/res/commandimagelist/ko/lch_text.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_text.png
diff --git a/default_images/res/commandimagelist/ko/lch_text_marquee.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_text_marquee.png
index 111df1e9b355..111df1e9b355 100644
--- a/default_images/res/commandimagelist/ko/lch_text_marquee.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_text_marquee.png
diff --git a/default_images/res/commandimagelist/ko/lch_textdirectionlefttoright.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_textdirectionlefttoright.png
index fb6d82f74ce5..fb6d82f74ce5 100644
--- a/default_images/res/commandimagelist/ko/lch_textdirectionlefttoright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_textdirectionlefttoright.png
diff --git a/default_images/res/commandimagelist/ko/lch_textdirectiontoptobottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_textdirectiontoptobottom.png
index 8ac04fd0052e..8ac04fd0052e 100644
--- a/default_images/res/commandimagelist/ko/lch_textdirectiontoptobottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_textdirectiontoptobottom.png
diff --git a/default_images/res/commandimagelist/ko/lch_texttoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_texttoolbox.png
index a996a7fa1a37..a996a7fa1a37 100644
--- a/default_images/res/commandimagelist/ko/lch_texttoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_texttoolbox.png
diff --git a/default_images/res/commandimagelist/ko/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_underline.png
index 7c549b819fd1..7c549b819fd1 100644
--- a/default_images/res/commandimagelist/ko/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_underline.png
diff --git a/default_images/res/commandimagelist/ko/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_underlinedouble.png
index d71907701e6e..d71907701e6e 100644
--- a/default_images/res/commandimagelist/ko/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/ko/lch_verticaltext.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_verticaltext.png
index 4622f33c5059..4622f33c5059 100644
--- a/default_images/res/commandimagelist/ko/lch_verticaltext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_verticaltext.png
diff --git a/default_images/res/commandimagelist/ko/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_bold.png
index dc298860bd0d..dc298860bd0d 100644
--- a/default_images/res/commandimagelist/ko/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_bold.png
diff --git a/default_images/res/commandimagelist/ko/sch_charfontname.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_charfontname.png
index b0ebdd57603d..b0ebdd57603d 100644
--- a/default_images/res/commandimagelist/ko/sch_charfontname.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_charfontname.png
diff --git a/default_images/res/commandimagelist/ko/sch_color.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_color.png
index f0e4da02899b..f0e4da02899b 100644
--- a/default_images/res/commandimagelist/ko/sch_color.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_color.png
diff --git a/default_images/res/commandimagelist/ko/sch_drawtext.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_drawtext.png
index 0645fab5d7b2..0645fab5d7b2 100644
--- a/default_images/res/commandimagelist/ko/sch_drawtext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_drawtext.png
diff --git a/default_images/res/commandimagelist/ko/sch_fontcolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_fontcolor.png
index f0e4da02899b..f0e4da02899b 100644
--- a/default_images/res/commandimagelist/ko/sch_fontcolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_fontcolor.png
diff --git a/default_images/res/commandimagelist/ko/sch_fontheight.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_fontheight.png
index 25f253f00e6c..25f253f00e6c 100644
--- a/default_images/res/commandimagelist/ko/sch_fontheight.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_fontheight.png
diff --git a/default_images/res/commandimagelist/ko/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_italic.png
index c0857ad9488b..c0857ad9488b 100644
--- a/default_images/res/commandimagelist/ko/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_italic.png
diff --git a/default_images/res/commandimagelist/ko/sch_ordercrit.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_ordercrit.png
index 89b53117c003..89b53117c003 100644
--- a/default_images/res/commandimagelist/ko/sch_ordercrit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_ordercrit.png
diff --git a/default_images/res/commandimagelist/ko/sch_outlinefont.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_outlinefont.png
index db7c393c7465..db7c393c7465 100644
--- a/default_images/res/commandimagelist/ko/sch_outlinefont.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_outlinefont.png
diff --git a/default_images/res/commandimagelist/ko/sch_shadowed.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_shadowed.png
index 5c7312951f6f..5c7312951f6f 100644
--- a/default_images/res/commandimagelist/ko/sch_shadowed.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_shadowed.png
diff --git a/default_images/res/commandimagelist/ko/sch_sortdown.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_sortdown.png
index 0b868f65f371..0b868f65f371 100644
--- a/default_images/res/commandimagelist/ko/sch_sortdown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_sortdown.png
diff --git a/default_images/res/commandimagelist/ko/sch_sortup.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_sortup.png
index 734833afa4b9..734833afa4b9 100644
--- a/default_images/res/commandimagelist/ko/sch_sortup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_sortup.png
diff --git a/default_images/res/commandimagelist/ko/sch_strikeout.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_strikeout.png
index 81c260edc30f..81c260edc30f 100644
--- a/default_images/res/commandimagelist/ko/sch_strikeout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_strikeout.png
diff --git a/default_images/res/commandimagelist/ko/sch_tablesort.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_tablesort.png
index 89b53117c003..89b53117c003 100644
--- a/default_images/res/commandimagelist/ko/sch_tablesort.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_tablesort.png
diff --git a/default_images/res/commandimagelist/ko/sch_text.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_text.png
index 0645fab5d7b2..0645fab5d7b2 100644
--- a/default_images/res/commandimagelist/ko/sch_text.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_text.png
diff --git a/default_images/res/commandimagelist/ko/sch_text_marquee.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_text_marquee.png
index 600ea8a7b36c..600ea8a7b36c 100644
--- a/default_images/res/commandimagelist/ko/sch_text_marquee.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_text_marquee.png
diff --git a/default_images/res/commandimagelist/ko/sch_textdirectionlefttoright.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_textdirectionlefttoright.png
index 5bb84d7f8f53..5bb84d7f8f53 100644
--- a/default_images/res/commandimagelist/ko/sch_textdirectionlefttoright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_textdirectionlefttoright.png
diff --git a/default_images/res/commandimagelist/ko/sch_textdirectiontoptobottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_textdirectiontoptobottom.png
index 35bf576af2e4..35bf576af2e4 100644
--- a/default_images/res/commandimagelist/ko/sch_textdirectiontoptobottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_textdirectiontoptobottom.png
diff --git a/default_images/res/commandimagelist/ko/sch_texttoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_texttoolbox.png
index 0645fab5d7b2..0645fab5d7b2 100644
--- a/default_images/res/commandimagelist/ko/sch_texttoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_texttoolbox.png
diff --git a/default_images/res/commandimagelist/ko/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_underline.png
index 37b3bb181b41..37b3bb181b41 100644
--- a/default_images/res/commandimagelist/ko/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_underline.png
diff --git a/default_images/res/commandimagelist/ko/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_underlinedouble.png
index 64f543197154..64f543197154 100644
--- a/default_images/res/commandimagelist/ko/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/ko/sch_verticaltext.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_verticaltext.png
index aacf4b3c874f..aacf4b3c874f 100644
--- a/default_images/res/commandimagelist/ko/sch_verticaltext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_verticaltext.png
diff --git a/default_images/res/commandimagelist/lch_absoluterecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_absoluterecord.png
index d5e0d3467ec3..d5e0d3467ec3 100644
--- a/default_images/res/commandimagelist/lch_absoluterecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_absoluterecord.png
diff --git a/default_images/res/commandimagelist/lch_actionmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_actionmode.png
index fcff704d0662..fcff704d0662 100644
--- a/default_images/res/commandimagelist/lch_actionmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_actionmode.png
diff --git a/default_images/res/commandimagelist/lch_addbookmark.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_addbookmark.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_addbookmark.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_addbookmark.png
diff --git a/default_images/res/commandimagelist/lch_adddatefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_adddatefield.png
index c1ce2f1e6c24..c1ce2f1e6c24 100644
--- a/default_images/res/commandimagelist/lch_adddatefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_adddatefield.png
diff --git a/default_images/res/commandimagelist/lch_adddirect.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_adddirect.png
index 3a4eac5273b2..3a4eac5273b2 100644
--- a/default_images/res/commandimagelist/lch_adddirect.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_adddirect.png
diff --git a/default_images/res/commandimagelist/lch_addfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_addfield.png
index b61bef308486..b61bef308486 100644
--- a/default_images/res/commandimagelist/lch_addfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_addfield.png
diff --git a/default_images/res/commandimagelist/lch_addons.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_addons.png
index b796aa87bffb..b796aa87bffb 100644
--- a/default_images/res/commandimagelist/lch_addons.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_addons.png
diff --git a/default_images/res/commandimagelist/lch_addprintarea.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_addprintarea.png
index b3f18f429214..b3f18f429214 100644
--- a/default_images/res/commandimagelist/lch_addprintarea.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_addprintarea.png
diff --git a/default_images/res/commandimagelist/lch_addtable.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_addtable.png
index ab7db8767a89..ab7db8767a89 100644
--- a/default_images/res/commandimagelist/lch_addtable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_addtable.png
diff --git a/default_images/res/commandimagelist/lch_addwatch.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_addwatch.png
index 9168ddadfe32..9168ddadfe32 100644
--- a/default_images/res/commandimagelist/lch_addwatch.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_addwatch.png
diff --git a/default_images/res/commandimagelist/lch_adjust.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_adjust.png
index 60765d62a11f..60765d62a11f 100644
--- a/default_images/res/commandimagelist/lch_adjust.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_adjust.png
diff --git a/default_images/res/commandimagelist/lch_advancedmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_advancedmode.png
index 5e744d549201..5e744d549201 100644
--- a/default_images/res/commandimagelist/lch_advancedmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_advancedmode.png
diff --git a/default_images/res/commandimagelist/lch_alignblock.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignblock.png
index b2e95db780c3..b2e95db780c3 100644
--- a/default_images/res/commandimagelist/lch_alignblock.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignblock.png
diff --git a/default_images/res/commandimagelist/lch_alignbottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignbottom.png
index dc4c062aee9a..dc4c062aee9a 100644
--- a/default_images/res/commandimagelist/lch_alignbottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignbottom.png
diff --git a/default_images/res/commandimagelist/lch_aligncenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_aligncenter.png
index d704fbc78a1b..d704fbc78a1b 100644
--- a/default_images/res/commandimagelist/lch_aligncenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_aligncenter.png
diff --git a/default_images/res/commandimagelist/lch_aligndown.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_aligndown.png
index e335da71668f..e335da71668f 100644
--- a/default_images/res/commandimagelist/lch_aligndown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_aligndown.png
diff --git a/default_images/res/commandimagelist/lch_alignhorizontalcenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignhorizontalcenter.png
index e80b3b532ce6..e80b3b532ce6 100644
--- a/default_images/res/commandimagelist/lch_alignhorizontalcenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignhorizontalcenter.png
diff --git a/default_images/res/commandimagelist/lch_alignleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignleft.png
index 3255d27d9f5d..3255d27d9f5d 100644
--- a/default_images/res/commandimagelist/lch_alignleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignleft.png
diff --git a/default_images/res/commandimagelist/lch_alignmiddle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignmiddle.png
index 09c8ee66fb23..09c8ee66fb23 100644
--- a/default_images/res/commandimagelist/lch_alignmiddle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignmiddle.png
diff --git a/default_images/res/commandimagelist/lch_alignright.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignright.png
index 073da720a0c4..073da720a0c4 100644
--- a/default_images/res/commandimagelist/lch_alignright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignright.png
diff --git a/default_images/res/commandimagelist/lch_aligntop.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_aligntop.png
index 0f42ed488d5a..0f42ed488d5a 100644
--- a/default_images/res/commandimagelist/lch_aligntop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_aligntop.png
diff --git a/default_images/res/commandimagelist/lch_alignup.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignup.png
index 18a41643bb8a..18a41643bb8a 100644
--- a/default_images/res/commandimagelist/lch_alignup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignup.png
diff --git a/default_images/res/commandimagelist/lch_alignvcenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignvcenter.png
index 8819a2f600c3..8819a2f600c3 100644
--- a/default_images/res/commandimagelist/lch_alignvcenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignvcenter.png
diff --git a/default_images/res/commandimagelist/lch_alignverticalcenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignverticalcenter.png
index bdb0aec78e35..bdb0aec78e35 100644
--- a/default_images/res/commandimagelist/lch_alignverticalcenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignverticalcenter.png
diff --git a/default_images/res/commandimagelist/lch_animationeffects.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_animationeffects.png
index a648ffe39f03..a648ffe39f03 100644
--- a/default_images/res/commandimagelist/lch_animationeffects.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_animationeffects.png
diff --git a/default_images/res/commandimagelist/lch_animationmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_animationmode.png
index 80c00f64eb2c..80c00f64eb2c 100644
--- a/default_images/res/commandimagelist/lch_animationmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_animationmode.png
diff --git a/default_images/res/commandimagelist/lch_animationobjects.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_animationobjects.png
index 7bd9a1e00749..7bd9a1e00749 100644
--- a/default_images/res/commandimagelist/lch_animationobjects.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_animationobjects.png
diff --git a/default_images/res/commandimagelist/lch_arc.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arc.png
index df72303ba3fc..df72303ba3fc 100644
--- a/default_images/res/commandimagelist/lch_arc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arc.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.chevron.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.chevron.png
index 65da92af332a..65da92af332a 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.chevron.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.chevron.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.circular-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.circular-arrow.png
index 1d379f47089e..1d379f47089e 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.circular-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.circular-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.corner-right-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.corner-right-arrow.png
index a7998944d547..a7998944d547 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.corner-right-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.corner-right-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.down-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.down-arrow-callout.png
index f734924103f1..f734924103f1 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.down-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.down-arrow-callout.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.down-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.down-arrow.png
index 9f7ffd65e45b..9f7ffd65e45b 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.down-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.down-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.left-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.left-arrow-callout.png
index c6c0bc2e321a..c6c0bc2e321a 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.left-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.left-arrow-callout.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.left-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.left-arrow.png
index e5505a3cdd3c..e5505a3cdd3c 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.left-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.left-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.left-right-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.left-right-arrow-callout.png
index 3bb9f0924c6d..3bb9f0924c6d 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.left-right-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.left-right-arrow-callout.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.left-right-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.left-right-arrow.png
index 9256767ca060..9256767ca060 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.left-right-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.left-right-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.notched-right-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.notched-right-arrow.png
index ffbf31646588..ffbf31646588 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.notched-right-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.notched-right-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.pentagon-right.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.pentagon-right.png
index 9d660a292664..9d660a292664 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.pentagon-right.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.pentagon-right.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.png
index 292afd3aa9bc..292afd3aa9bc 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.quad-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.quad-arrow-callout.png
index 0bedf016fabb..0bedf016fabb 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.quad-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.quad-arrow-callout.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.quad-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.quad-arrow.png
index 3ad11ffd7dd3..3ad11ffd7dd3 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.quad-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.quad-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.right-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.right-arrow-callout.png
index 1c42e39b533b..1c42e39b533b 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.right-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.right-arrow-callout.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.right-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.right-arrow.png
index 28c09945d0c8..28c09945d0c8 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.right-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.right-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.s-sharped-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.s-sharped-arrow.png
index 336f92143dc2..336f92143dc2 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.s-sharped-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.s-sharped-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.split-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.split-arrow.png
index 636cb324d252..636cb324d252 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.split-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.split-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.split-round-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.split-round-arrow.png
index 7d643da899a5..7d643da899a5 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.split-round-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.split-round-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.striped-right-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.striped-right-arrow.png
index d3e639892ab2..d3e639892ab2 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.striped-right-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.striped-right-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.up-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-arrow-callout.png
index d2ebdc5316b6..d2ebdc5316b6 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.up-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-arrow-callout.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.up-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-arrow.png
index d5748e2c3ffb..d5748e2c3ffb 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.up-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.up-down-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-down-arrow-callout.png
index 875963d82ce6..875963d82ce6 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.up-down-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-down-arrow-callout.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.up-down-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-down-arrow.png
index a60ba6b1ad25..a60ba6b1ad25 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.up-down-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-down-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.up-right-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-right-arrow-callout.png
index 59853e04413f..59853e04413f 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.up-right-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-right-arrow-callout.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.up-right-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-right-arrow.png
index 7c64cff3a611..7c64cff3a611 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.up-right-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-right-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.up-right-down-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-right-down-arrow.png
index 00d68f9505c4..00d68f9505c4 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.up-right-down-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-right-down-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowstoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowstoolbox.png
index a888e9ffece5..a888e9ffece5 100644
--- a/default_images/res/commandimagelist/lch_arrowstoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowstoolbox.png
diff --git a/default_images/res/commandimagelist/lch_assignlayout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_assignlayout.png
index 7d44d073fb7f..7d44d073fb7f 100644
--- a/default_images/res/commandimagelist/lch_assignlayout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_assignlayout.png
diff --git a/default_images/res/commandimagelist/lch_autocontrolfocus.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_autocontrolfocus.png
index c54d2c9cc67b..c54d2c9cc67b 100644
--- a/default_images/res/commandimagelist/lch_autocontrolfocus.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_autocontrolfocus.png
diff --git a/default_images/res/commandimagelist/lch_autofilter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_autofilter.png
index ff537b8f29bc..ff537b8f29bc 100644
--- a/default_images/res/commandimagelist/lch_autofilter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_autofilter.png
diff --git a/default_images/res/commandimagelist/lch_autoformat.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_autoformat.png
index d0f74d1ca7b1..d0f74d1ca7b1 100644
--- a/default_images/res/commandimagelist/lch_autoformat.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_autoformat.png
diff --git a/default_images/res/commandimagelist/lch_autosum.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_autosum.png
index 8221b0fe5c10..8221b0fe5c10 100644
--- a/default_images/res/commandimagelist/lch_autosum.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_autosum.png
diff --git a/default_images/res/commandimagelist/lch_avmediaplayer.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_avmediaplayer.png
index ba5dba91e5f2..ba5dba91e5f2 100644
--- a/default_images/res/commandimagelist/lch_avmediaplayer.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_avmediaplayer.png
diff --git a/default_images/res/commandimagelist/lch_backcolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_backcolor.png
index db7d70e49a8a..db7d70e49a8a 100644
--- a/default_images/res/commandimagelist/lch_backcolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_backcolor.png
diff --git a/default_images/res/commandimagelist/lch_backgroundcolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_backgroundcolor.png
index 4c2a060edf9d..4c2a060edf9d 100644
--- a/default_images/res/commandimagelist/lch_backgroundcolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_backgroundcolor.png
diff --git a/default_images/res/commandimagelist/lch_backgroundpatterncontroller.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_backgroundpatterncontroller.png
index dac8d103c718..dac8d103c718 100644
--- a/default_images/res/commandimagelist/lch_backgroundpatterncontroller.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_backgroundpatterncontroller.png
diff --git a/default_images/res/commandimagelist/lch_backward.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_backward.png
index dc258a06cf03..dc258a06cf03 100644
--- a/default_images/res/commandimagelist/lch_backward.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_backward.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.block-arc.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.block-arc.png
index 21246d203356..21246d203356 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.block-arc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.block-arc.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.can.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.can.png
index 049dfe53e5cc..049dfe53e5cc 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.can.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.can.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.circle-pie.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.circle-pie.png
index f05d5e1fa7da..f05d5e1fa7da 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.circle-pie.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.circle-pie.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.circle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.circle.png
index fd45d89c97b1..fd45d89c97b1 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.circle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.circle.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.cross.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.cross.png
index babf252ae07e..babf252ae07e 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.cross.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.cross.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.cube.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.cube.png
index a52e949d13ec..a52e949d13ec 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.cube.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.cube.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.diamond.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.diamond.png
index 8d98f158ad58..8d98f158ad58 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.diamond.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.diamond.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.ellipse.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.ellipse.png
index 339022f0266d..339022f0266d 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.ellipse.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.ellipse.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.frame.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.frame.png
index dcb68144e2d0..dcb68144e2d0 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.frame.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.frame.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.hexagon.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.hexagon.png
index 1ae3b43e66b7..1ae3b43e66b7 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.hexagon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.hexagon.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.isosceles-triangle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.isosceles-triangle.png
index d81d97275dea..d81d97275dea 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.isosceles-triangle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.isosceles-triangle.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.octagon.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.octagon.png
index 2e16ce014052..2e16ce014052 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.octagon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.octagon.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.paper.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.paper.png
index 6996258d5631..6996258d5631 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.paper.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.paper.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.parallelogram.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.parallelogram.png
index a4f4df01ca51..a4f4df01ca51 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.parallelogram.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.parallelogram.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.pentagon.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.pentagon.png
index 88a7f996e0c9..88a7f996e0c9 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.pentagon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.pentagon.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.png
index 745cea617c9c..745cea617c9c 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.quadrat.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.quadrat.png
index 57b939d774cb..57b939d774cb 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.quadrat.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.quadrat.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.rectangle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.rectangle.png
index 6c4541bb8158..6c4541bb8158 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.rectangle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.rectangle.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.right-triangle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.right-triangle.png
index db7f3881ab43..db7f3881ab43 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.right-triangle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.right-triangle.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.ring.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.ring.png
index 29446916708c..29446916708c 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.ring.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.ring.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.round-quadrat.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.round-quadrat.png
index a47fece69185..a47fece69185 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.round-quadrat.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.round-quadrat.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.round-rectangle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.round-rectangle.png
index 936f6870bfbd..936f6870bfbd 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.round-rectangle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.round-rectangle.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.trapezoid.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.trapezoid.png
index 506f0b57fae8..506f0b57fae8 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.trapezoid.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.trapezoid.png
diff --git a/default_images/res/commandimagelist/lch_basicstepinto.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicstepinto.png
index 3b7a9147362d..3b7a9147362d 100644
--- a/default_images/res/commandimagelist/lch_basicstepinto.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicstepinto.png
diff --git a/default_images/res/commandimagelist/lch_basicstepout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicstepout.png
index c8287ae2a57a..c8287ae2a57a 100644
--- a/default_images/res/commandimagelist/lch_basicstepout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicstepout.png
diff --git a/default_images/res/commandimagelist/lch_basicstepover.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicstepover.png
index d114c8efb980..d114c8efb980 100644
--- a/default_images/res/commandimagelist/lch_basicstepover.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicstepover.png
diff --git a/default_images/res/commandimagelist/lch_basicstop.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicstop.png
index b3bb2ee303ce..b3bb2ee303ce 100644
--- a/default_images/res/commandimagelist/lch_basicstop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicstop.png
diff --git a/default_images/res/commandimagelist/lch_beamer.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beamer.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_beamer.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beamer.png
diff --git a/default_images/res/commandimagelist/lch_beforeobject.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beforeobject.png
index a9d59209b654..a9d59209b654 100644
--- a/default_images/res/commandimagelist/lch_beforeobject.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beforeobject.png
diff --git a/default_images/res/commandimagelist/lch_behindobject.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_behindobject.png
index 509e88deb0e1..509e88deb0e1 100644
--- a/default_images/res/commandimagelist/lch_behindobject.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_behindobject.png
diff --git a/default_images/res/commandimagelist/lch_bezier_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezier_unfilled.png
index c17481720c0d..c17481720c0d 100644
--- a/default_images/res/commandimagelist/lch_bezier_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezier_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_bezierappend.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezierappend.png
index 29f081ad3b15..29f081ad3b15 100644
--- a/default_images/res/commandimagelist/lch_bezierappend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezierappend.png
diff --git a/default_images/res/commandimagelist/lch_bezierclose.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezierclose.png
index d5a5ae46a803..d5a5ae46a803 100644
--- a/default_images/res/commandimagelist/lch_bezierclose.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezierclose.png
diff --git a/default_images/res/commandimagelist/lch_bezierconvert.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezierconvert.png
index 83362daff6ea..83362daff6ea 100644
--- a/default_images/res/commandimagelist/lch_bezierconvert.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezierconvert.png
diff --git a/default_images/res/commandimagelist/lch_beziercutline.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beziercutline.png
index 89e3d5d708ef..89e3d5d708ef 100644
--- a/default_images/res/commandimagelist/lch_beziercutline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beziercutline.png
diff --git a/default_images/res/commandimagelist/lch_bezierdelete.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezierdelete.png
index 1ad2cce4cb1d..1ad2cce4cb1d 100644
--- a/default_images/res/commandimagelist/lch_bezierdelete.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezierdelete.png
diff --git a/default_images/res/commandimagelist/lch_bezieredge.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezieredge.png
index a88c28485436..a88c28485436 100644
--- a/default_images/res/commandimagelist/lch_bezieredge.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezieredge.png
diff --git a/default_images/res/commandimagelist/lch_beziereliminatepoints.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beziereliminatepoints.png
index e00a7bd80e0a..e00a7bd80e0a 100644
--- a/default_images/res/commandimagelist/lch_beziereliminatepoints.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beziereliminatepoints.png
diff --git a/default_images/res/commandimagelist/lch_bezierfill.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezierfill.png
index 351ea223c506..351ea223c506 100644
--- a/default_images/res/commandimagelist/lch_bezierfill.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezierfill.png
diff --git a/default_images/res/commandimagelist/lch_bezierinsert.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezierinsert.png
index 771f08e74c1e..771f08e74c1e 100644
--- a/default_images/res/commandimagelist/lch_bezierinsert.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezierinsert.png
diff --git a/default_images/res/commandimagelist/lch_beziermove.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beziermove.png
index 90f812966a75..90f812966a75 100644
--- a/default_images/res/commandimagelist/lch_beziermove.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beziermove.png
diff --git a/default_images/res/commandimagelist/lch_beziersmooth.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beziersmooth.png
index 2d6ae4a05c8c..2d6ae4a05c8c 100644
--- a/default_images/res/commandimagelist/lch_beziersmooth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beziersmooth.png
diff --git a/default_images/res/commandimagelist/lch_beziersymmetric.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beziersymmetric.png
index c0468acf36da..c0468acf36da 100644
--- a/default_images/res/commandimagelist/lch_beziersymmetric.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beziersymmetric.png
diff --git a/default_images/res/commandimagelist/lch_bighandles.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bighandles.png
index 5878ddf58108..5878ddf58108 100644
--- a/default_images/res/commandimagelist/lch_bighandles.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bighandles.png
diff --git a/default_images/res/commandimagelist/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bold.png
index 92ef42be506e..92ef42be506e 100644
--- a/default_images/res/commandimagelist/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bold.png
diff --git a/default_images/res/commandimagelist/lch_borderdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_borderdialog.png
index a61a1a6c31a1..a61a1a6c31a1 100644
--- a/default_images/res/commandimagelist/lch_borderdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_borderdialog.png
diff --git a/default_images/res/commandimagelist/lch_bringtofront.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bringtofront.png
index f85c8b0fc09c..f85c8b0fc09c 100644
--- a/default_images/res/commandimagelist/lch_bringtofront.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bringtofront.png
diff --git a/default_images/res/commandimagelist/lch_browsebackward.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_browsebackward.png
index cad310a8f935..cad310a8f935 100644
--- a/default_images/res/commandimagelist/lch_browsebackward.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_browsebackward.png
diff --git a/default_images/res/commandimagelist/lch_browseforward.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_browseforward.png
index 864d2eca03e1..864d2eca03e1 100644
--- a/default_images/res/commandimagelist/lch_browseforward.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_browseforward.png
diff --git a/default_images/res/commandimagelist/lch_browseview.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_browseview.png
index a31c6f55ccd7..a31c6f55ccd7 100644
--- a/default_images/res/commandimagelist/lch_browseview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_browseview.png
diff --git a/default_images/res/commandimagelist/lch_bullet.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bullet.png
index b623084be13b..b623084be13b 100644
--- a/default_images/res/commandimagelist/lch_bullet.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bullet.png
diff --git a/default_images/res/commandimagelist/lch_bulletsandnumberingdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bulletsandnumberingdialog.png
index 9c494e085a12..9c494e085a12 100644
--- a/default_images/res/commandimagelist/lch_bulletsandnumberingdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bulletsandnumberingdialog.png
diff --git a/default_images/res/commandimagelist/lch_calloutshapes.cloud-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.cloud-callout.png
index 10ea55d4986c..10ea55d4986c 100644
--- a/default_images/res/commandimagelist/lch_calloutshapes.cloud-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.cloud-callout.png
diff --git a/default_images/res/commandimagelist/lch_calloutshapes.line-callout-1.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.line-callout-1.png
index 71119ae4a29d..71119ae4a29d 100644
--- a/default_images/res/commandimagelist/lch_calloutshapes.line-callout-1.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.line-callout-1.png
diff --git a/default_images/res/commandimagelist/lch_calloutshapes.line-callout-2.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.line-callout-2.png
index 68994751c3a2..68994751c3a2 100644
--- a/default_images/res/commandimagelist/lch_calloutshapes.line-callout-2.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.line-callout-2.png
diff --git a/default_images/res/commandimagelist/lch_calloutshapes.line-callout-3.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.line-callout-3.png
index f6e2c8c657ba..f6e2c8c657ba 100644
--- a/default_images/res/commandimagelist/lch_calloutshapes.line-callout-3.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.line-callout-3.png
diff --git a/default_images/res/commandimagelist/lch_calloutshapes.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.png
index c867739ff35a..c867739ff35a 100644
--- a/default_images/res/commandimagelist/lch_calloutshapes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.png
diff --git a/default_images/res/commandimagelist/lch_calloutshapes.rectangular-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.rectangular-callout.png
index 4fc62cf9a003..4fc62cf9a003 100644
--- a/default_images/res/commandimagelist/lch_calloutshapes.rectangular-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.rectangular-callout.png
diff --git a/default_images/res/commandimagelist/lch_calloutshapes.round-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.round-callout.png
index 9be7405247a6..9be7405247a6 100644
--- a/default_images/res/commandimagelist/lch_calloutshapes.round-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.round-callout.png
diff --git a/default_images/res/commandimagelist/lch_calloutshapes.round-rectangular-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.round-rectangular-callout.png
index 3d052a208be7..3d052a208be7 100644
--- a/default_images/res/commandimagelist/lch_calloutshapes.round-rectangular-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.round-rectangular-callout.png
diff --git a/default_images/res/commandimagelist/lch_cellvertbottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cellvertbottom.png
index c65a0c27f92f..c65a0c27f92f 100644
--- a/default_images/res/commandimagelist/lch_cellvertbottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cellvertbottom.png
diff --git a/default_images/res/commandimagelist/lch_cellvertcenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cellvertcenter.png
index 97cc840234ad..97cc840234ad 100644
--- a/default_images/res/commandimagelist/lch_cellvertcenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cellvertcenter.png
diff --git a/default_images/res/commandimagelist/lch_cellverttop.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cellverttop.png
index 09c227ab214c..09c227ab214c 100644
--- a/default_images/res/commandimagelist/lch_cellverttop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cellverttop.png
diff --git a/default_images/res/commandimagelist/lch_centerpara.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_centerpara.png
index e80b3b532ce6..e80b3b532ce6 100644
--- a/default_images/res/commandimagelist/lch_centerpara.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_centerpara.png
diff --git a/default_images/res/commandimagelist/lch_chainframes.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_chainframes.png
index f3187ac313aa..f3187ac313aa 100644
--- a/default_images/res/commandimagelist/lch_chainframes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_chainframes.png
diff --git a/default_images/res/commandimagelist/lch_changebezier.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_changebezier.png
index c6b53aa17713..c6b53aa17713 100644
--- a/default_images/res/commandimagelist/lch_changebezier.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_changebezier.png
diff --git a/default_images/res/commandimagelist/lch_changepolygon.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_changepolygon.png
index fc0c1c3d2b09..fc0c1c3d2b09 100644
--- a/default_images/res/commandimagelist/lch_changepolygon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_changepolygon.png
diff --git a/default_images/res/commandimagelist/lch_charfontname.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_charfontname.png
index 1e03a937e2fd..1e03a937e2fd 100644
--- a/default_images/res/commandimagelist/lch_charfontname.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_charfontname.png
diff --git a/default_images/res/commandimagelist/lch_checkbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_checkbox.png
index 3181e294fcbb..3181e294fcbb 100644
--- a/default_images/res/commandimagelist/lch_checkbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_checkbox.png
diff --git a/default_images/res/commandimagelist/lch_choosecontrols.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_choosecontrols.png
index 5d048b2f7760..5d048b2f7760 100644
--- a/default_images/res/commandimagelist/lch_choosecontrols.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_choosecontrols.png
diff --git a/default_images/res/commandimagelist/lch_choosedesign.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_choosedesign.png
index a03ec5b33d64..a03ec5b33d64 100644
--- a/default_images/res/commandimagelist/lch_choosedesign.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_choosedesign.png
diff --git a/default_images/res/commandimagelist/lch_choosemacro.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_choosemacro.png
index fe2ddee47d4e..fe2ddee47d4e 100644
--- a/default_images/res/commandimagelist/lch_choosemacro.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_choosemacro.png
diff --git a/default_images/res/commandimagelist/lch_choosepolygon.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_choosepolygon.png
index adb6a521cfb3..adb6a521cfb3 100644
--- a/default_images/res/commandimagelist/lch_choosepolygon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_choosepolygon.png
diff --git a/default_images/res/commandimagelist/lch_circle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circle.png
index fd45d89c97b1..fd45d89c97b1 100644
--- a/default_images/res/commandimagelist/lch_circle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circle.png
diff --git a/default_images/res/commandimagelist/lch_circle_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circle_unfilled.png
index 45b2ba1a131e..45b2ba1a131e 100644
--- a/default_images/res/commandimagelist/lch_circle_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circle_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_circlearc.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circlearc.png
index 9eef7cdc4dcd..9eef7cdc4dcd 100644
--- a/default_images/res/commandimagelist/lch_circlearc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circlearc.png
diff --git a/default_images/res/commandimagelist/lch_circlecut.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circlecut.png
index d1851fe3722f..d1851fe3722f 100644
--- a/default_images/res/commandimagelist/lch_circlecut.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circlecut.png
diff --git a/default_images/res/commandimagelist/lch_circlecut_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circlecut_unfilled.png
index 90f80a6b548c..90f80a6b548c 100644
--- a/default_images/res/commandimagelist/lch_circlecut_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circlecut_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_circlepie.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circlepie.png
index 82c756f7fbe8..82c756f7fbe8 100644
--- a/default_images/res/commandimagelist/lch_circlepie.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circlepie.png
diff --git a/default_images/res/commandimagelist/lch_circlepie_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circlepie_unfilled.png
index a931bebdfee4..a931bebdfee4 100644
--- a/default_images/res/commandimagelist/lch_circlepie_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circlepie_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_clickchangerotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_clickchangerotation.png
index b4f6cc0ab933..b4f6cc0ab933 100644
--- a/default_images/res/commandimagelist/lch_clickchangerotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_clickchangerotation.png
diff --git a/default_images/res/commandimagelist/lch_closedoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_closedoc.png
index d77a1a5dd715..d77a1a5dd715 100644
--- a/default_images/res/commandimagelist/lch_closedoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_closedoc.png
diff --git a/default_images/res/commandimagelist/lch_closedocs.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_closedocs.png
index 8d2034ac9807..8d2034ac9807 100644
--- a/default_images/res/commandimagelist/lch_closedocs.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_closedocs.png
diff --git a/default_images/res/commandimagelist/lch_closemasterview.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_closemasterview.png
index 1ee2960e4905..1ee2960e4905 100644
--- a/default_images/res/commandimagelist/lch_closemasterview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_closemasterview.png
diff --git a/default_images/res/commandimagelist/lch_closewin.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_closewin.png
index 729f4b8a27af..729f4b8a27af 100644
--- a/default_images/res/commandimagelist/lch_closewin.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_closewin.png
diff --git a/default_images/res/commandimagelist/lch_color.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_color.png
index eef3cac46a78..eef3cac46a78 100644
--- a/default_images/res/commandimagelist/lch_color.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_color.png
diff --git a/default_images/res/commandimagelist/lch_colorsettings.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_colorsettings.png
index 03cacfecac9d..03cacfecac9d 100644
--- a/default_images/res/commandimagelist/lch_colorsettings.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_colorsettings.png
diff --git a/default_images/res/commandimagelist/lch_colorview.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_colorview.png
index e03250e07ca7..e03250e07ca7 100644
--- a/default_images/res/commandimagelist/lch_colorview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_colorview.png
diff --git a/default_images/res/commandimagelist/lch_combobox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_combobox.png
index 43170c65296b..43170c65296b 100644
--- a/default_images/res/commandimagelist/lch_combobox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_combobox.png
diff --git a/default_images/res/commandimagelist/lch_commontaskbarvisible.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_commontaskbarvisible.png
index d4b679eb70bd..d4b679eb70bd 100644
--- a/default_images/res/commandimagelist/lch_commontaskbarvisible.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_commontaskbarvisible.png
diff --git a/default_images/res/commandimagelist/lch_compilebasic.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_compilebasic.png
index 76232e45cc19..76232e45cc19 100644
--- a/default_images/res/commandimagelist/lch_compilebasic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_compilebasic.png
diff --git a/default_images/res/commandimagelist/lch_cone.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cone.png
index 56a38fb2b40b..56a38fb2b40b 100644
--- a/default_images/res/commandimagelist/lch_cone.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cone.png
diff --git a/default_images/res/commandimagelist/lch_config.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_config.png
index f6b7b1c8d1c9..f6b7b1c8d1c9 100644
--- a/default_images/res/commandimagelist/lch_config.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_config.png
diff --git a/default_images/res/commandimagelist/lch_connector.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connector.png
index ba27f51d4dea..ba27f51d4dea 100644
--- a/default_images/res/commandimagelist/lch_connector.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connector.png
diff --git a/default_images/res/commandimagelist/lch_connectorarrowend.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorarrowend.png
index 8954d6bf3c78..8954d6bf3c78 100644
--- a/default_images/res/commandimagelist/lch_connectorarrowend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorarrowend.png
diff --git a/default_images/res/commandimagelist/lch_connectorarrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorarrows.png
index 4daa1da43c55..4daa1da43c55 100644
--- a/default_images/res/commandimagelist/lch_connectorarrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorarrows.png
diff --git a/default_images/res/commandimagelist/lch_connectorarrowstart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorarrowstart.png
index 887690ebfea7..887690ebfea7 100644
--- a/default_images/res/commandimagelist/lch_connectorarrowstart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorarrowstart.png
diff --git a/default_images/res/commandimagelist/lch_connectorcircleend.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcircleend.png
index 602dc3cefadb..602dc3cefadb 100644
--- a/default_images/res/commandimagelist/lch_connectorcircleend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcircleend.png
diff --git a/default_images/res/commandimagelist/lch_connectorcircles.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcircles.png
index fbd84ac513c2..fbd84ac513c2 100644
--- a/default_images/res/commandimagelist/lch_connectorcircles.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcircles.png
diff --git a/default_images/res/commandimagelist/lch_connectorcirclestart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcirclestart.png
index daba21b2b827..daba21b2b827 100644
--- a/default_images/res/commandimagelist/lch_connectorcirclestart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcirclestart.png
diff --git a/default_images/res/commandimagelist/lch_connectorcurve.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurve.png
index e8a3136016e5..e8a3136016e5 100644
--- a/default_images/res/commandimagelist/lch_connectorcurve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurve.png
diff --git a/default_images/res/commandimagelist/lch_connectorcurvearrowend.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurvearrowend.png
index b718b01084ba..b718b01084ba 100644
--- a/default_images/res/commandimagelist/lch_connectorcurvearrowend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurvearrowend.png
diff --git a/default_images/res/commandimagelist/lch_connectorcurvearrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurvearrows.png
index d8408015f2c3..d8408015f2c3 100644
--- a/default_images/res/commandimagelist/lch_connectorcurvearrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurvearrows.png
diff --git a/default_images/res/commandimagelist/lch_connectorcurvearrowstart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurvearrowstart.png
index 27ca6e6a135d..27ca6e6a135d 100644
--- a/default_images/res/commandimagelist/lch_connectorcurvearrowstart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurvearrowstart.png
diff --git a/default_images/res/commandimagelist/lch_connectorcurvecircleend.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurvecircleend.png
index 8f0bbd85b266..8f0bbd85b266 100644
--- a/default_images/res/commandimagelist/lch_connectorcurvecircleend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurvecircleend.png
diff --git a/default_images/res/commandimagelist/lch_connectorcurvecircles.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurvecircles.png
index b35ab306ff9d..b35ab306ff9d 100644
--- a/default_images/res/commandimagelist/lch_connectorcurvecircles.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurvecircles.png
diff --git a/default_images/res/commandimagelist/lch_connectorcurvecirclestart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurvecirclestart.png
index 965d2feca920..965d2feca920 100644
--- a/default_images/res/commandimagelist/lch_connectorcurvecirclestart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurvecirclestart.png
diff --git a/default_images/res/commandimagelist/lch_connectorline.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorline.png
index c98111ce9ef0..c98111ce9ef0 100644
--- a/default_images/res/commandimagelist/lch_connectorline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorline.png
diff --git a/default_images/res/commandimagelist/lch_connectorlinearrowend.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinearrowend.png
index b306c62e140e..b306c62e140e 100644
--- a/default_images/res/commandimagelist/lch_connectorlinearrowend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinearrowend.png
diff --git a/default_images/res/commandimagelist/lch_connectorlinearrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinearrows.png
index c3d35e90a31b..c3d35e90a31b 100644
--- a/default_images/res/commandimagelist/lch_connectorlinearrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinearrows.png
diff --git a/default_images/res/commandimagelist/lch_connectorlinearrowstart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinearrowstart.png
index e2523c86adeb..e2523c86adeb 100644
--- a/default_images/res/commandimagelist/lch_connectorlinearrowstart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinearrowstart.png
diff --git a/default_images/res/commandimagelist/lch_connectorlinecircleend.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinecircleend.png
index 481a784f04a5..481a784f04a5 100644
--- a/default_images/res/commandimagelist/lch_connectorlinecircleend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinecircleend.png
diff --git a/default_images/res/commandimagelist/lch_connectorlinecircles.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinecircles.png
index 7d631133b200..7d631133b200 100644
--- a/default_images/res/commandimagelist/lch_connectorlinecircles.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinecircles.png
diff --git a/default_images/res/commandimagelist/lch_connectorlinecirclestart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinecirclestart.png
index 9f6a6955b8f6..9f6a6955b8f6 100644
--- a/default_images/res/commandimagelist/lch_connectorlinecirclestart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinecirclestart.png
diff --git a/default_images/res/commandimagelist/lch_connectorlines.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlines.png
index 74269f4be36f..74269f4be36f 100644
--- a/default_images/res/commandimagelist/lch_connectorlines.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlines.png
diff --git a/default_images/res/commandimagelist/lch_connectorlinesarrowend.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinesarrowend.png
index fd3b01a5067a..fd3b01a5067a 100644
--- a/default_images/res/commandimagelist/lch_connectorlinesarrowend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinesarrowend.png
diff --git a/default_images/res/commandimagelist/lch_connectorlinesarrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinesarrows.png
index 6255d030c5b1..6255d030c5b1 100644
--- a/default_images/res/commandimagelist/lch_connectorlinesarrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinesarrows.png
diff --git a/default_images/res/commandimagelist/lch_connectorlinesarrowstart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinesarrowstart.png
index c64c67c145ca..c64c67c145ca 100644
--- a/default_images/res/commandimagelist/lch_connectorlinesarrowstart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinesarrowstart.png
diff --git a/default_images/res/commandimagelist/lch_connectorlinescircleend.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinescircleend.png
index 593fdf3e9b33..593fdf3e9b33 100644
--- a/default_images/res/commandimagelist/lch_connectorlinescircleend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinescircleend.png
diff --git a/default_images/res/commandimagelist/lch_connectorlinescircles.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinescircles.png
index 270deb51a29f..270deb51a29f 100644
--- a/default_images/res/commandimagelist/lch_connectorlinescircles.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinescircles.png
diff --git a/default_images/res/commandimagelist/lch_connectorlinescirclestart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinescirclestart.png
index 181000d9c1d8..181000d9c1d8 100644
--- a/default_images/res/commandimagelist/lch_connectorlinescirclestart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinescirclestart.png
diff --git a/default_images/res/commandimagelist/lch_connectortoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectortoolbox.png
index 89a61220f8a1..89a61220f8a1 100644
--- a/default_images/res/commandimagelist/lch_connectortoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectortoolbox.png
diff --git a/default_images/res/commandimagelist/lch_contourdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_contourdialog.png
index 12002e9bd0cf..12002e9bd0cf 100644
--- a/default_images/res/commandimagelist/lch_contourdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_contourdialog.png
diff --git a/default_images/res/commandimagelist/lch_controlcodes.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_controlcodes.png
index 0b22d94f6a3d..0b22d94f6a3d 100644
--- a/default_images/res/commandimagelist/lch_controlcodes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_controlcodes.png
diff --git a/default_images/res/commandimagelist/lch_controlproperties.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_controlproperties.png
index 60f59cfa22e3..60f59cfa22e3 100644
--- a/default_images/res/commandimagelist/lch_controlproperties.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_controlproperties.png
diff --git a/default_images/res/commandimagelist/lch_convertinto3d.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_convertinto3d.png
index cc207f7159d4..cc207f7159d4 100644
--- a/default_images/res/commandimagelist/lch_convertinto3d.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_convertinto3d.png
diff --git a/default_images/res/commandimagelist/lch_convertinto3dlathe.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_convertinto3dlathe.png
index bf35697ac4cf..bf35697ac4cf 100644
--- a/default_images/res/commandimagelist/lch_convertinto3dlathe.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_convertinto3dlathe.png
diff --git a/default_images/res/commandimagelist/lch_convertinto3dlathefast.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_convertinto3dlathefast.png
index 77ea553af9ed..77ea553af9ed 100644
--- a/default_images/res/commandimagelist/lch_convertinto3dlathefast.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_convertinto3dlathefast.png
diff --git a/default_images/res/commandimagelist/lch_copy.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_copy.png
index bc8d1125b7a9..bc8d1125b7a9 100644
--- a/default_images/res/commandimagelist/lch_copy.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_copy.png
diff --git a/default_images/res/commandimagelist/lch_countall.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_countall.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_countall.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_countall.png
diff --git a/default_images/res/commandimagelist/lch_crookrotate.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_crookrotate.png
index 0c9bda38f234..0c9bda38f234 100644
--- a/default_images/res/commandimagelist/lch_crookrotate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_crookrotate.png
diff --git a/default_images/res/commandimagelist/lch_crookslant.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_crookslant.png
index 3b40fbee4385..3b40fbee4385 100644
--- a/default_images/res/commandimagelist/lch_crookslant.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_crookslant.png
diff --git a/default_images/res/commandimagelist/lch_crop.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_crop.png
index 371e995fedd9..371e995fedd9 100644
--- a/default_images/res/commandimagelist/lch_crop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_crop.png
diff --git a/default_images/res/commandimagelist/lch_cube.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cube.png
index 87fc3c0717e4..87fc3c0717e4 100644
--- a/default_images/res/commandimagelist/lch_cube.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cube.png
diff --git a/default_images/res/commandimagelist/lch_currencyfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_currencyfield.png
index 3d6e2d82ff28..3d6e2d82ff28 100644
--- a/default_images/res/commandimagelist/lch_currencyfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_currencyfield.png
diff --git a/default_images/res/commandimagelist/lch_customanimation.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_customanimation.png
index 72b51b625068..72b51b625068 100644
--- a/default_images/res/commandimagelist/lch_customanimation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_customanimation.png
diff --git a/default_images/res/commandimagelist/lch_cut.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cut.png
index 371f078d4d95..371f078d4d95 100644
--- a/default_images/res/commandimagelist/lch_cut.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cut.png
diff --git a/default_images/res/commandimagelist/lch_cylinder.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cylinder.png
index 93f15bea4090..93f15bea4090 100644
--- a/default_images/res/commandimagelist/lch_cylinder.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cylinder.png
diff --git a/default_images/res/commandimagelist/lch_cyramid.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cyramid.png
index c7067c277794..c7067c277794 100644
--- a/default_images/res/commandimagelist/lch_cyramid.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cyramid.png
diff --git a/default_images/res/commandimagelist/lch_datadatapilotrun.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_datadatapilotrun.png
index 187a465a1419..187a465a1419 100644
--- a/default_images/res/commandimagelist/lch_datadatapilotrun.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_datadatapilotrun.png
diff --git a/default_images/res/commandimagelist/lch_datafilterautofilter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_datafilterautofilter.png
index 5016b2619f5d..5016b2619f5d 100644
--- a/default_images/res/commandimagelist/lch_datafilterautofilter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_datafilterautofilter.png
diff --git a/default_images/res/commandimagelist/lch_datafilterspecialfilter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_datafilterspecialfilter.png
index a26bfac24edc..a26bfac24edc 100644
--- a/default_images/res/commandimagelist/lch_datafilterspecialfilter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_datafilterspecialfilter.png
diff --git a/default_images/res/commandimagelist/lch_datafilterstandardfilter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_datafilterstandardfilter.png
index 7fd4a23b55fd..7fd4a23b55fd 100644
--- a/default_images/res/commandimagelist/lch_datafilterstandardfilter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_datafilterstandardfilter.png
diff --git a/default_images/res/commandimagelist/lch_dataimport.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dataimport.png
index 84ad2e7a9209..84ad2e7a9209 100644
--- a/default_images/res/commandimagelist/lch_dataimport.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dataimport.png
diff --git a/default_images/res/commandimagelist/lch_dataincolumns.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dataincolumns.png
index 40c53d75a207..40c53d75a207 100644
--- a/default_images/res/commandimagelist/lch_dataincolumns.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dataincolumns.png
diff --git a/default_images/res/commandimagelist/lch_datainrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_datainrows.png
index 8d2cecbf6a45..8d2cecbf6a45 100644
--- a/default_images/res/commandimagelist/lch_datainrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_datainrows.png
diff --git a/default_images/res/commandimagelist/lch_datefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_datefield.png
index 22b29e58eabb..22b29e58eabb 100644
--- a/default_images/res/commandimagelist/lch_datefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_datefield.png
diff --git a/default_images/res/commandimagelist/lch_dbaddrelation.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbaddrelation.png
index 50f6d8887729..50f6d8887729 100644
--- a/default_images/res/commandimagelist/lch_dbaddrelation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbaddrelation.png
diff --git a/default_images/res/commandimagelist/lch_dbchangedesignmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbchangedesignmode.png
index 47ed9b103d80..47ed9b103d80 100644
--- a/default_images/res/commandimagelist/lch_dbchangedesignmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbchangedesignmode.png
diff --git a/default_images/res/commandimagelist/lch_dbclearquery.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbclearquery.png
index b71d22fe52d1..b71d22fe52d1 100644
--- a/default_images/res/commandimagelist/lch_dbclearquery.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbclearquery.png
diff --git a/default_images/res/commandimagelist/lch_dbdistinctvalues.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbdistinctvalues.png
index 749727d71392..749727d71392 100644
--- a/default_images/res/commandimagelist/lch_dbdistinctvalues.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbdistinctvalues.png
diff --git a/default_images/res/commandimagelist/lch_dbformdelete.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbformdelete.png
index 0dc90e6c6615..0dc90e6c6615 100644
--- a/default_images/res/commandimagelist/lch_dbformdelete.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbformdelete.png
diff --git a/default_images/res/commandimagelist/lch_dbformedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbformedit.png
index 7217a43f7d70..7217a43f7d70 100644
--- a/default_images/res/commandimagelist/lch_dbformedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbformedit.png
diff --git a/default_images/res/commandimagelist/lch_dbformopen.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbformopen.png
index d3a80c4dfc67..d3a80c4dfc67 100644
--- a/default_images/res/commandimagelist/lch_dbformopen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbformopen.png
diff --git a/default_images/res/commandimagelist/lch_dbformrename.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbformrename.png
index d7d679882db0..d7d679882db0 100644
--- a/default_images/res/commandimagelist/lch_dbformrename.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbformrename.png
diff --git a/default_images/res/commandimagelist/lch_dbindexdesign.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbindexdesign.png
index 7d5bf64f3b80..7d5bf64f3b80 100644
--- a/default_images/res/commandimagelist/lch_dbindexdesign.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbindexdesign.png
diff --git a/default_images/res/commandimagelist/lch_dbnewform.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewform.png
index 06ef2579fb80..06ef2579fb80 100644
--- a/default_images/res/commandimagelist/lch_dbnewform.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewform.png
diff --git a/default_images/res/commandimagelist/lch_dbnewformautopilot.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewformautopilot.png
index a3f5c7824ae2..a3f5c7824ae2 100644
--- a/default_images/res/commandimagelist/lch_dbnewformautopilot.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewformautopilot.png
diff --git a/default_images/res/commandimagelist/lch_dbnewquery.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewquery.png
index b42f9f144ae0..b42f9f144ae0 100644
--- a/default_images/res/commandimagelist/lch_dbnewquery.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewquery.png
diff --git a/default_images/res/commandimagelist/lch_dbnewqueryautopilot.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewqueryautopilot.png
index 6c38c3b56248..6c38c3b56248 100644
--- a/default_images/res/commandimagelist/lch_dbnewqueryautopilot.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewqueryautopilot.png
diff --git a/default_images/res/commandimagelist/lch_dbnewquerysql.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewquerysql.png
index cc9e2b5c217f..cc9e2b5c217f 100644
--- a/default_images/res/commandimagelist/lch_dbnewquerysql.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewquerysql.png
diff --git a/default_images/res/commandimagelist/lch_dbnewreport.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewreport.png
index 1fbb86e67cd6..1fbb86e67cd6 100644
--- a/default_images/res/commandimagelist/lch_dbnewreport.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewreport.png
diff --git a/default_images/res/commandimagelist/lch_dbnewreportautopilot.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewreportautopilot.png
index b0fbb1a7b6d1..b0fbb1a7b6d1 100644
--- a/default_images/res/commandimagelist/lch_dbnewreportautopilot.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewreportautopilot.png
diff --git a/default_images/res/commandimagelist/lch_dbnewtable.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewtable.png
index d2baa8ae2e27..d2baa8ae2e27 100644
--- a/default_images/res/commandimagelist/lch_dbnewtable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewtable.png
diff --git a/default_images/res/commandimagelist/lch_dbnewtableautopilot.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewtableautopilot.png
index f1f1a400c849..f1f1a400c849 100644
--- a/default_images/res/commandimagelist/lch_dbnewtableautopilot.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewtableautopilot.png
diff --git a/default_images/res/commandimagelist/lch_dbnewview.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewview.png
index ad19e9e2db12..ad19e9e2db12 100644
--- a/default_images/res/commandimagelist/lch_dbnewview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewview.png
diff --git a/default_images/res/commandimagelist/lch_dbnewviewsql.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewviewsql.png
index 554856004c50..554856004c50 100644
--- a/default_images/res/commandimagelist/lch_dbnewviewsql.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewviewsql.png
diff --git a/default_images/res/commandimagelist/lch_dbquerydelete.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbquerydelete.png
index de0640410c2b..de0640410c2b 100644
--- a/default_images/res/commandimagelist/lch_dbquerydelete.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbquerydelete.png
diff --git a/default_images/res/commandimagelist/lch_dbqueryedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbqueryedit.png
index 67516e48708f..67516e48708f 100644
--- a/default_images/res/commandimagelist/lch_dbqueryedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbqueryedit.png
diff --git a/default_images/res/commandimagelist/lch_dbqueryopen.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbqueryopen.png
index 9aabafeb0d42..9aabafeb0d42 100644
--- a/default_images/res/commandimagelist/lch_dbqueryopen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbqueryopen.png
diff --git a/default_images/res/commandimagelist/lch_dbqueryrename.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbqueryrename.png
index 92befa836b7d..92befa836b7d 100644
--- a/default_images/res/commandimagelist/lch_dbqueryrename.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbqueryrename.png
diff --git a/default_images/res/commandimagelist/lch_dbreportdelete.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbreportdelete.png
index ddd03cecbfc1..ddd03cecbfc1 100644
--- a/default_images/res/commandimagelist/lch_dbreportdelete.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbreportdelete.png
diff --git a/default_images/res/commandimagelist/lch_dbreportedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbreportedit.png
index add76b8d809b..add76b8d809b 100644
--- a/default_images/res/commandimagelist/lch_dbreportedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbreportedit.png
diff --git a/default_images/res/commandimagelist/lch_dbreportopen.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbreportopen.png
index 66ae12f142a9..66ae12f142a9 100644
--- a/default_images/res/commandimagelist/lch_dbreportopen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbreportopen.png
diff --git a/default_images/res/commandimagelist/lch_dbreportrename.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbreportrename.png
index 3b8066eb8143..3b8066eb8143 100644
--- a/default_images/res/commandimagelist/lch_dbreportrename.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbreportrename.png
diff --git a/default_images/res/commandimagelist/lch_dbsortingandgrouping.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbsortingandgrouping.png
index c0a046315f7d..c0a046315f7d 100644
--- a/default_images/res/commandimagelist/lch_dbsortingandgrouping.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbsortingandgrouping.png
diff --git a/default_images/res/commandimagelist/lch_dbtabledelete.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbtabledelete.png
index 17846d3fd1c3..17846d3fd1c3 100644
--- a/default_images/res/commandimagelist/lch_dbtabledelete.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbtabledelete.png
diff --git a/default_images/res/commandimagelist/lch_dbtableedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbtableedit.png
index b70fbcf2c3da..b70fbcf2c3da 100644
--- a/default_images/res/commandimagelist/lch_dbtableedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbtableedit.png
diff --git a/default_images/res/commandimagelist/lch_dbtableopen.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbtableopen.png
index b7fa2cdd38f7..b7fa2cdd38f7 100644
--- a/default_images/res/commandimagelist/lch_dbtableopen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbtableopen.png
diff --git a/default_images/res/commandimagelist/lch_dbtablerename.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbtablerename.png
index 3199adecd451..3199adecd451 100644
--- a/default_images/res/commandimagelist/lch_dbtablerename.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbtablerename.png
diff --git a/default_images/res/commandimagelist/lch_dbviewaliases.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbviewaliases.png
index 834c58547da0..834c58547da0 100644
--- a/default_images/res/commandimagelist/lch_dbviewaliases.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbviewaliases.png
diff --git a/default_images/res/commandimagelist/lch_dbviewfunctions.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbviewfunctions.png
index b7e6c2486928..b7e6c2486928 100644
--- a/default_images/res/commandimagelist/lch_dbviewfunctions.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbviewfunctions.png
diff --git a/default_images/res/commandimagelist/lch_dbviewtablenames.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbviewtablenames.png
index 8f4695ff1c35..8f4695ff1c35 100644
--- a/default_images/res/commandimagelist/lch_dbviewtablenames.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbviewtablenames.png
diff --git a/default_images/res/commandimagelist/lch_decrementindent.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_decrementindent.png
index ed68849c3231..ed68849c3231 100644
--- a/default_images/res/commandimagelist/lch_decrementindent.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_decrementindent.png
diff --git a/default_images/res/commandimagelist/lch_decrementlevel.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_decrementlevel.png
index c76b0ac6f1d2..c76b0ac6f1d2 100644
--- a/default_images/res/commandimagelist/lch_decrementlevel.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_decrementlevel.png
diff --git a/default_images/res/commandimagelist/lch_decrementsublevels.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_decrementsublevels.png
index e5b9134413ff..e5b9134413ff 100644
--- a/default_images/res/commandimagelist/lch_decrementsublevels.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_decrementsublevels.png
diff --git a/default_images/res/commandimagelist/lch_defaultbullet.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_defaultbullet.png
index 76e830f46927..76e830f46927 100644
--- a/default_images/res/commandimagelist/lch_defaultbullet.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_defaultbullet.png
diff --git a/default_images/res/commandimagelist/lch_defaultnumbering.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_defaultnumbering.png
index 50e37b50dc57..50e37b50dc57 100644
--- a/default_images/res/commandimagelist/lch_defaultnumbering.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_defaultnumbering.png
diff --git a/default_images/res/commandimagelist/lch_definename.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_definename.png
index 73787f834f3c..73787f834f3c 100644
--- a/default_images/res/commandimagelist/lch_definename.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_definename.png
diff --git a/default_images/res/commandimagelist/lch_defineprintarea.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_defineprintarea.png
index 84c4874807d7..84c4874807d7 100644
--- a/default_images/res/commandimagelist/lch_defineprintarea.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_defineprintarea.png
diff --git a/default_images/res/commandimagelist/lch_delete.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_delete.png
index 3d54090e162b..3d54090e162b 100644
--- a/default_images/res/commandimagelist/lch_delete.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_delete.png
diff --git a/default_images/res/commandimagelist/lch_deleteallannotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deleteallannotation.png
index 304788e8276c..304788e8276c 100644
--- a/default_images/res/commandimagelist/lch_deleteallannotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deleteallannotation.png
diff --git a/default_images/res/commandimagelist/lch_deleteannotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deleteannotation.png
index 83fe46f9f24f..83fe46f9f24f 100644
--- a/default_images/res/commandimagelist/lch_deleteannotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deleteannotation.png
diff --git a/default_images/res/commandimagelist/lch_deletecolumns.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deletecolumns.png
index 4f4d8904f690..4f4d8904f690 100644
--- a/default_images/res/commandimagelist/lch_deletecolumns.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deletecolumns.png
diff --git a/default_images/res/commandimagelist/lch_deletemasterpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deletemasterpage.png
index d7c872e2da72..d7c872e2da72 100644
--- a/default_images/res/commandimagelist/lch_deletemasterpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deletemasterpage.png
diff --git a/default_images/res/commandimagelist/lch_deleteprintarea.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deleteprintarea.png
index 2d39b874f9c7..2d39b874f9c7 100644
--- a/default_images/res/commandimagelist/lch_deleteprintarea.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deleteprintarea.png
diff --git a/default_images/res/commandimagelist/lch_deleterecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deleterecord.png
index a01f0d265056..a01f0d265056 100644
--- a/default_images/res/commandimagelist/lch_deleterecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deleterecord.png
diff --git a/default_images/res/commandimagelist/lch_deleterows.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deleterows.png
index 30f391679e7e..30f391679e7e 100644
--- a/default_images/res/commandimagelist/lch_deleterows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deleterows.png
diff --git a/default_images/res/commandimagelist/lch_designerdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_designerdialog.png
index 6ad322e4ae7d..6ad322e4ae7d 100644
--- a/default_images/res/commandimagelist/lch_designerdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_designerdialog.png
diff --git a/default_images/res/commandimagelist/lch_dia.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dia.png
index a7881199bd0b..a7881199bd0b 100644
--- a/default_images/res/commandimagelist/lch_dia.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dia.png
diff --git a/default_images/res/commandimagelist/lch_diaauto.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_diaauto.png
index b3668c77bb30..b3668c77bb30 100644
--- a/default_images/res/commandimagelist/lch_diaauto.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_diaauto.png
diff --git a/default_images/res/commandimagelist/lch_diaeffect.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_diaeffect.png
index f35aa0ab6a4e..f35aa0ab6a4e 100644
--- a/default_images/res/commandimagelist/lch_diaeffect.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_diaeffect.png
diff --git a/default_images/res/commandimagelist/lch_diagramdata.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_diagramdata.png
index 38cf6834897e..38cf6834897e 100644
--- a/default_images/res/commandimagelist/lch_diagramdata.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_diagramdata.png
diff --git a/default_images/res/commandimagelist/lch_diagramtype.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_diagramtype.png
index 77950fb1d1ec..77950fb1d1ec 100644
--- a/default_images/res/commandimagelist/lch_diagramtype.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_diagramtype.png
diff --git a/default_images/res/commandimagelist/lch_diaspeed.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_diaspeed.png
index 7fd9729c2158..7fd9729c2158 100644
--- a/default_images/res/commandimagelist/lch_diaspeed.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_diaspeed.png
diff --git a/default_images/res/commandimagelist/lch_diatime.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_diatime.png
index 8a1db34fe87a..8a1db34fe87a 100644
--- a/default_images/res/commandimagelist/lch_diatime.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_diatime.png
diff --git a/default_images/res/commandimagelist/lch_distributecolumns.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_distributecolumns.png
index 5d191e2a5e15..5d191e2a5e15 100644
--- a/default_images/res/commandimagelist/lch_distributecolumns.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_distributecolumns.png
diff --git a/default_images/res/commandimagelist/lch_distributerows.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_distributerows.png
index 22e0f2fdc105..22e0f2fdc105 100644
--- a/default_images/res/commandimagelist/lch_distributerows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_distributerows.png
diff --git a/default_images/res/commandimagelist/lch_doubleclicktextedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_doubleclicktextedit.png
index 8c0ad581558b..8c0ad581558b 100644
--- a/default_images/res/commandimagelist/lch_doubleclicktextedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_doubleclicktextedit.png
diff --git a/default_images/res/commandimagelist/lch_downsearch.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_downsearch.png
index 4b46e46d4c63..4b46e46d4c63 100644
--- a/default_images/res/commandimagelist/lch_downsearch.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_downsearch.png
diff --git a/default_images/res/commandimagelist/lch_draw.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_draw.png
index 5e991f6d5511..5e991f6d5511 100644
--- a/default_images/res/commandimagelist/lch_draw.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_draw.png
diff --git a/default_images/res/commandimagelist/lch_drawcaption.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_drawcaption.png
index 2fc77a14f7ca..2fc77a14f7ca 100644
--- a/default_images/res/commandimagelist/lch_drawcaption.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_drawcaption.png
diff --git a/default_images/res/commandimagelist/lch_drawchart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_drawchart.png
index d4d11140c074..d4d11140c074 100644
--- a/default_images/res/commandimagelist/lch_drawchart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_drawchart.png
diff --git a/default_images/res/commandimagelist/lch_drawselect.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_drawselect.png
index ddf8517faaa4..ddf8517faaa4 100644
--- a/default_images/res/commandimagelist/lch_drawselect.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_drawselect.png
diff --git a/default_images/res/commandimagelist/lch_drawtext.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_drawtext.png
index 501d2c95ffd5..501d2c95ffd5 100644
--- a/default_images/res/commandimagelist/lch_drawtext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_drawtext.png
diff --git a/default_images/res/commandimagelist/lch_dsbdocumentdatasource.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dsbdocumentdatasource.png
index 5da04610a409..5da04610a409 100644
--- a/default_images/res/commandimagelist/lch_dsbdocumentdatasource.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dsbdocumentdatasource.png
diff --git a/default_images/res/commandimagelist/lch_dsbeditdoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dsbeditdoc.png
index 572dc216d391..572dc216d391 100644
--- a/default_images/res/commandimagelist/lch_dsbeditdoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dsbeditdoc.png
diff --git a/default_images/res/commandimagelist/lch_dsbformletter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dsbformletter.png
index 2142572e3d8b..2142572e3d8b 100644
--- a/default_images/res/commandimagelist/lch_dsbformletter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dsbformletter.png
diff --git a/default_images/res/commandimagelist/lch_dsbinsertcolumns.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dsbinsertcolumns.png
index 972c1e9c88bd..972c1e9c88bd 100644
--- a/default_images/res/commandimagelist/lch_dsbinsertcolumns.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dsbinsertcolumns.png
diff --git a/default_images/res/commandimagelist/lch_dsbinsertcontent.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dsbinsertcontent.png
index c514fc300df4..c514fc300df4 100644
--- a/default_images/res/commandimagelist/lch_dsbinsertcontent.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dsbinsertcontent.png
diff --git a/default_images/res/commandimagelist/lch_dsbrowserexplorer.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dsbrowserexplorer.png
index fc96e00927ca..fc96e00927ca 100644
--- a/default_images/res/commandimagelist/lch_dsbrowserexplorer.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dsbrowserexplorer.png
diff --git a/default_images/res/commandimagelist/lch_duplicatepage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_duplicatepage.png
index 887f4ffa9e4b..887f4ffa9e4b 100644
--- a/default_images/res/commandimagelist/lch_duplicatepage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_duplicatepage.png
diff --git a/default_images/res/commandimagelist/lch_edit.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_edit.png
index baa0b8ee8d9b..baa0b8ee8d9b 100644
--- a/default_images/res/commandimagelist/lch_edit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_edit.png
diff --git a/default_images/res/commandimagelist/lch_editdoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_editdoc.png
index ef6d2b8cc390..ef6d2b8cc390 100644
--- a/default_images/res/commandimagelist/lch_editdoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_editdoc.png
diff --git a/default_images/res/commandimagelist/lch_editframeset.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_editframeset.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_editframeset.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_editframeset.png
diff --git a/default_images/res/commandimagelist/lch_editglossary.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_editglossary.png
index 2cde7330a425..2cde7330a425 100644
--- a/default_images/res/commandimagelist/lch_editglossary.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_editglossary.png
diff --git a/default_images/res/commandimagelist/lch_editheaderandfooter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_editheaderandfooter.png
index e107ed82f941..e107ed82f941 100644
--- a/default_images/res/commandimagelist/lch_editheaderandfooter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_editheaderandfooter.png
diff --git a/default_images/res/commandimagelist/lch_editprintarea.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_editprintarea.png
index 22791f079d0d..22791f079d0d 100644
--- a/default_images/res/commandimagelist/lch_editprintarea.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_editprintarea.png
diff --git a/default_images/res/commandimagelist/lch_ellipse.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ellipse.png
index dde3af395c7d..dde3af395c7d 100644
--- a/default_images/res/commandimagelist/lch_ellipse.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ellipse.png
diff --git a/default_images/res/commandimagelist/lch_ellipse_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ellipse_unfilled.png
index f4579166e747..f4579166e747 100644
--- a/default_images/res/commandimagelist/lch_ellipse_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ellipse_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_ellipsecut.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ellipsecut.png
index 4695ef2ffd42..4695ef2ffd42 100644
--- a/default_images/res/commandimagelist/lch_ellipsecut.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ellipsecut.png
diff --git a/default_images/res/commandimagelist/lch_ellipsecut_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ellipsecut_unfilled.png
index e047a8112a32..e047a8112a32 100644
--- a/default_images/res/commandimagelist/lch_ellipsecut_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ellipsecut_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_ellipsetoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ellipsetoolbox.png
index c74f6d40098b..c74f6d40098b 100644
--- a/default_images/res/commandimagelist/lch_ellipsetoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ellipsetoolbox.png
diff --git a/default_images/res/commandimagelist/lch_entergroup.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_entergroup.png
index 52f3d0ec6302..52f3d0ec6302 100644
--- a/default_images/res/commandimagelist/lch_entergroup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_entergroup.png
diff --git a/default_images/res/commandimagelist/lch_entirecolumn.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_entirecolumn.png
index 00feadc47f3c..00feadc47f3c 100644
--- a/default_images/res/commandimagelist/lch_entirecolumn.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_entirecolumn.png
diff --git a/default_images/res/commandimagelist/lch_entirerow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_entirerow.png
index b63eb9c1e144..b63eb9c1e144 100644
--- a/default_images/res/commandimagelist/lch_entirerow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_entirerow.png
diff --git a/default_images/res/commandimagelist/lch_euroconverter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_euroconverter.png
index f7e4835df042..f7e4835df042 100644
--- a/default_images/res/commandimagelist/lch_euroconverter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_euroconverter.png
diff --git a/default_images/res/commandimagelist/lch_executereport.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_executereport.png
index e7f7369ff8aa..e7f7369ff8aa 100644
--- a/default_images/res/commandimagelist/lch_executereport.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_executereport.png
diff --git a/default_images/res/commandimagelist/lch_expandpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_expandpage.png
index 0ec4f1be8779..0ec4f1be8779 100644
--- a/default_images/res/commandimagelist/lch_expandpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_expandpage.png
diff --git a/default_images/res/commandimagelist/lch_exportdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_exportdialog.png
index 5e1beefab41e..5e1beefab41e 100644
--- a/default_images/res/commandimagelist/lch_exportdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_exportdialog.png
diff --git a/default_images/res/commandimagelist/lch_exportdirecttopdf.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_exportdirecttopdf.png
index cd5c77dd6dc7..cd5c77dd6dc7 100644
--- a/default_images/res/commandimagelist/lch_exportdirecttopdf.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_exportdirecttopdf.png
diff --git a/default_images/res/commandimagelist/lch_exportto.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_exportto.png
index 028cd7021d6f..028cd7021d6f 100644
--- a/default_images/res/commandimagelist/lch_exportto.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_exportto.png
diff --git a/default_images/res/commandimagelist/lch_extendedhelp.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extendedhelp.png
index 1996c72e3b7e..1996c72e3b7e 100644
--- a/default_images/res/commandimagelist/lch_extendedhelp.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extendedhelp.png
diff --git a/default_images/res/commandimagelist/lch_extrusion3dcolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusion3dcolor.png
index 380b0ca56202..380b0ca56202 100644
--- a/default_images/res/commandimagelist/lch_extrusion3dcolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusion3dcolor.png
diff --git a/default_images/res/commandimagelist/lch_extrusiondepthfloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiondepthfloater.png
index 2a19a1cc1412..2a19a1cc1412 100644
--- a/default_images/res/commandimagelist/lch_extrusiondepthfloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiondepthfloater.png
diff --git a/default_images/res/commandimagelist/lch_extrusiondirectionfloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiondirectionfloater.png
index 9a3ea121e4fb..9a3ea121e4fb 100644
--- a/default_images/res/commandimagelist/lch_extrusiondirectionfloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiondirectionfloater.png
diff --git a/default_images/res/commandimagelist/lch_extrusionlightingfloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusionlightingfloater.png
index db2f46be77f7..db2f46be77f7 100644
--- a/default_images/res/commandimagelist/lch_extrusionlightingfloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusionlightingfloater.png
diff --git a/default_images/res/commandimagelist/lch_extrusionsurfacefloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusionsurfacefloater.png
index 4a3d00908fc4..4a3d00908fc4 100644
--- a/default_images/res/commandimagelist/lch_extrusionsurfacefloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusionsurfacefloater.png
diff --git a/default_images/res/commandimagelist/lch_extrusiontiltdown.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiontiltdown.png
index 5e27c352dd41..5e27c352dd41 100644
--- a/default_images/res/commandimagelist/lch_extrusiontiltdown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiontiltdown.png
diff --git a/default_images/res/commandimagelist/lch_extrusiontiltleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiontiltleft.png
index 9c198f8f6ef6..9c198f8f6ef6 100644
--- a/default_images/res/commandimagelist/lch_extrusiontiltleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiontiltleft.png
diff --git a/default_images/res/commandimagelist/lch_extrusiontiltright.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiontiltright.png
index 6ef237e04d13..6ef237e04d13 100644
--- a/default_images/res/commandimagelist/lch_extrusiontiltright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiontiltright.png
diff --git a/default_images/res/commandimagelist/lch_extrusiontiltup.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiontiltup.png
index 1dca21ddfcac..1dca21ddfcac 100644
--- a/default_images/res/commandimagelist/lch_extrusiontiltup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiontiltup.png
diff --git a/default_images/res/commandimagelist/lch_extrusiontoggle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiontoggle.png
index 8d3b836091d2..8d3b836091d2 100644
--- a/default_images/res/commandimagelist/lch_extrusiontoggle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiontoggle.png
diff --git a/default_images/res/commandimagelist/lch_fieldnames.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fieldnames.png
index 1e384053393a..1e384053393a 100644
--- a/default_images/res/commandimagelist/lch_fieldnames.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fieldnames.png
diff --git a/default_images/res/commandimagelist/lch_fields.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fields.png
index 1e384053393a..1e384053393a 100644
--- a/default_images/res/commandimagelist/lch_fields.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fields.png
diff --git a/default_images/res/commandimagelist/lch_filecontrol.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_filecontrol.png
index 2ba9f4a9a72a..2ba9f4a9a72a 100644
--- a/default_images/res/commandimagelist/lch_filecontrol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_filecontrol.png
diff --git a/default_images/res/commandimagelist/lch_filedocument.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_filedocument.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_filedocument.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_filedocument.png
diff --git a/default_images/res/commandimagelist/lch_fillshadow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fillshadow.png
index 6dcf618cc0f2..6dcf618cc0f2 100644
--- a/default_images/res/commandimagelist/lch_fillshadow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fillshadow.png
diff --git a/default_images/res/commandimagelist/lch_fillstyle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fillstyle.png
index bcce6fb79fac..bcce6fb79fac 100644
--- a/default_images/res/commandimagelist/lch_fillstyle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fillstyle.png
diff --git a/default_images/res/commandimagelist/lch_filtercrit.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_filtercrit.png
index 19dd3f7aaef2..19dd3f7aaef2 100644
--- a/default_images/res/commandimagelist/lch_filtercrit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_filtercrit.png
diff --git a/default_images/res/commandimagelist/lch_firstpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_firstpage.png
index 319e61edd17d..319e61edd17d 100644
--- a/default_images/res/commandimagelist/lch_firstpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_firstpage.png
diff --git a/default_images/res/commandimagelist/lch_firstrecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_firstrecord.png
index a33de8c1474f..a33de8c1474f 100644
--- a/default_images/res/commandimagelist/lch_firstrecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_firstrecord.png
diff --git a/default_images/res/commandimagelist/lch_fliphorizontal.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fliphorizontal.png
index e6e1de0befc5..e6e1de0befc5 100644
--- a/default_images/res/commandimagelist/lch_fliphorizontal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fliphorizontal.png
diff --git a/default_images/res/commandimagelist/lch_flipvertical.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flipvertical.png
index 0fe554636660..0fe554636660 100644
--- a/default_images/res/commandimagelist/lch_flipvertical.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flipvertical.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-alternate-process.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-alternate-process.png
index 2ab92cabfa77..2ab92cabfa77 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-alternate-process.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-alternate-process.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-card.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-card.png
index 3a7049449acb..3a7049449acb 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-card.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-card.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-collate.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-collate.png
index 1c28e2c3cd09..1c28e2c3cd09 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-collate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-collate.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-connector.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-connector.png
index fd45d89c97b1..fd45d89c97b1 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-connector.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-connector.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-data.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-data.png
index a4f4df01ca51..a4f4df01ca51 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-data.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-data.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-decision.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-decision.png
index 8eceabb7d712..8eceabb7d712 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-decision.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-decision.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-delay.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-delay.png
index 6a20a4084bbf..6a20a4084bbf 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-delay.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-delay.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-direct-access-storage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-direct-access-storage.png
index 55a22439e1f1..55a22439e1f1 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-direct-access-storage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-direct-access-storage.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-display.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-display.png
index dcf8bf0350c9..dcf8bf0350c9 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-display.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-display.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-document.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-document.png
index 38bad68e8603..38bad68e8603 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-document.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-document.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-extract.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-extract.png
index d81d97275dea..d81d97275dea 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-extract.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-extract.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-internal-storage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-internal-storage.png
index 28a03e0ba5e8..28a03e0ba5e8 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-internal-storage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-internal-storage.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-magnetic-disk.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-magnetic-disk.png
index 96b923c7e039..96b923c7e039 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-magnetic-disk.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-magnetic-disk.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-manual-input.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-manual-input.png
index f872c2443f79..f872c2443f79 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-manual-input.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-manual-input.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-manual-operation.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-manual-operation.png
index 506f0b57fae8..506f0b57fae8 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-manual-operation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-manual-operation.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-merge.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-merge.png
index c895e92d0700..c895e92d0700 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-merge.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-merge.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-multidocument.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-multidocument.png
index dc1dec802ed6..dc1dec802ed6 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-multidocument.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-multidocument.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-off-page-connector.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-off-page-connector.png
index 343f59972929..343f59972929 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-off-page-connector.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-off-page-connector.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-or.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-or.png
index 031d7f3268f9..031d7f3268f9 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-or.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-or.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-predefined-process.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-predefined-process.png
index eb3c9873d527..eb3c9873d527 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-predefined-process.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-predefined-process.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-preparation.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-preparation.png
index 3b121a1b1e08..3b121a1b1e08 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-preparation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-preparation.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-process.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-process.png
index 57b939d774cb..57b939d774cb 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-process.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-process.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-punched-tape.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-punched-tape.png
index 10f5dd99b25b..10f5dd99b25b 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-punched-tape.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-punched-tape.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-sequential-access.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-sequential-access.png
index 78c9fa63f082..78c9fa63f082 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-sequential-access.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-sequential-access.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-sort.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-sort.png
index b60727229e4f..b60727229e4f 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-sort.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-sort.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-stored-data.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-stored-data.png
index 54d76366cb8a..54d76366cb8a 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-stored-data.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-stored-data.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-summing-junction.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-summing-junction.png
index af85b2f61c72..af85b2f61c72 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-summing-junction.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-summing-junction.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-terminator.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-terminator.png
index 1eba0cc5f964..1eba0cc5f964 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-terminator.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-terminator.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.png
index 28a03e0ba5e8..28a03e0ba5e8 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.png
diff --git a/default_images/res/commandimagelist/lch_fontcolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontcolor.png
index 08e9e9ded4ee..08e9e9ded4ee 100644
--- a/default_images/res/commandimagelist/lch_fontcolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontcolor.png
diff --git a/default_images/res/commandimagelist/lch_fontdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontdialog.png
index 795384d6fccb..795384d6fccb 100644
--- a/default_images/res/commandimagelist/lch_fontdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontdialog.png
diff --git a/default_images/res/commandimagelist/lch_fontheight.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontheight.png
index 2448ef95f722..2448ef95f722 100644
--- a/default_images/res/commandimagelist/lch_fontheight.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontheight.png
diff --git a/default_images/res/commandimagelist/lch_fontwork.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontwork.png
index 4439542a895d..4439542a895d 100644
--- a/default_images/res/commandimagelist/lch_fontwork.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontwork.png
diff --git a/default_images/res/commandimagelist/lch_fontworkalignmentfloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkalignmentfloater.png
index e80b3b532ce6..e80b3b532ce6 100644
--- a/default_images/res/commandimagelist/lch_fontworkalignmentfloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkalignmentfloater.png
diff --git a/default_images/res/commandimagelist/lch_fontworkcharacterspacingfloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkcharacterspacingfloater.png
index 8fd680e52f87..8fd680e52f87 100644
--- a/default_images/res/commandimagelist/lch_fontworkcharacterspacingfloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkcharacterspacingfloater.png
diff --git a/default_images/res/commandimagelist/lch_fontworkgalleryfloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkgalleryfloater.png
index 0a3add8fd8a2..0a3add8fd8a2 100644
--- a/default_images/res/commandimagelist/lch_fontworkgalleryfloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkgalleryfloater.png
diff --git a/default_images/res/commandimagelist/lch_fontworksameletterheights.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworksameletterheights.png
index dcdbcf315f2a..dcdbcf315f2a 100644
--- a/default_images/res/commandimagelist/lch_fontworksameletterheights.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworksameletterheights.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-down-curve.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-down-curve.png
index 7bcf1c86577a..7bcf1c86577a 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-down-curve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-down-curve.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-down-pour.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-down-pour.png
index 6ef4f865cbf6..6ef4f865cbf6 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-down-pour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-down-pour.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-left-curve.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-left-curve.png
index 55b07a1fc688..55b07a1fc688 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-left-curve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-left-curve.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-left-pour.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-left-pour.png
index 1a17239d4233..1a17239d4233 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-left-pour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-left-pour.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-right-curve.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-right-curve.png
index a139dcfc94ad..a139dcfc94ad 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-right-curve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-right-curve.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-right-pour.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-right-pour.png
index 9d8eb1aa8a94..9d8eb1aa8a94 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-right-pour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-right-pour.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-up-curve.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-up-curve.png
index 560ac3d52f6b..560ac3d52f6b 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-up-curve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-up-curve.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-up-pour.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-up-pour.png
index 7e20e45e3054..7e20e45e3054 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-up-pour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-up-pour.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-chevron-down.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-chevron-down.png
index 40aaa51b8fca..40aaa51b8fca 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-chevron-down.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-chevron-down.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-chevron-up.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-chevron-up.png
index 748692fbff88..748692fbff88 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-chevron-up.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-chevron-up.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-circle-curve.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-circle-curve.png
index 66751822b974..66751822b974 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-circle-curve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-circle-curve.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-circle-pour.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-circle-pour.png
index 68d1e08952a8..68d1e08952a8 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-circle-pour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-circle-pour.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-curve-down.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-curve-down.png
index d68ae7c2b5d9..d68ae7c2b5d9 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-curve-down.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-curve-down.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-curve-up.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-curve-up.png
index 9da8d33d011a..9da8d33d011a 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-curve-up.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-curve-up.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-fade-down.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-fade-down.png
index 8b602c315c15..8b602c315c15 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-fade-down.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-fade-down.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-fade-left.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-fade-left.png
index c43b695909ce..c43b695909ce 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-fade-left.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-fade-left.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-fade-right.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-fade-right.png
index 62e1c751616f..62e1c751616f 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-fade-right.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-fade-right.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-fade-up-and-left.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-fade-up-and-left.png
index 732e46c88a35..732e46c88a35 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-fade-up-and-left.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-fade-up-and-left.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-fade-up-and-right.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-fade-up-and-right.png
index ca570d54b304..ca570d54b304 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-fade-up-and-right.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-fade-up-and-right.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-fade-up.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-fade-up.png
index 43ced8e52bcc..43ced8e52bcc 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-fade-up.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-fade-up.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-inflate.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-inflate.png
index 9010620aa459..9010620aa459 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-inflate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-inflate.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-open-circle-curve.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-open-circle-curve.png
index 78aaf1a3a4ff..78aaf1a3a4ff 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-open-circle-curve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-open-circle-curve.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-open-circle-pour.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-open-circle-pour.png
index 014e521c71f0..014e521c71f0 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-open-circle-pour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-open-circle-pour.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-plain-text.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-plain-text.png
index 9df579ff7f1e..9df579ff7f1e 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-plain-text.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-plain-text.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-slant-down.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-slant-down.png
index bc434b4d8323..bc434b4d8323 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-slant-down.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-slant-down.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-slant-up.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-slant-up.png
index 07db6d705b4d..07db6d705b4d 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-slant-up.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-slant-up.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-stop.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-stop.png
index 30527e4323b6..30527e4323b6 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-stop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-stop.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-triangle-down.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-triangle-down.png
index 26471a18cc9e..26471a18cc9e 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-triangle-down.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-triangle-down.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-triangle-up.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-triangle-up.png
index b33cb0f4c1c9..b33cb0f4c1c9 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-triangle-up.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-triangle-up.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-wave.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-wave.png
index ae886501278b..ae886501278b 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-wave.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-wave.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.png
index 4439542a895d..4439542a895d 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.png
diff --git a/default_images/res/commandimagelist/lch_formatarea.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formatarea.png
index 98d6f8c4309f..98d6f8c4309f 100644
--- a/default_images/res/commandimagelist/lch_formatarea.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formatarea.png
diff --git a/default_images/res/commandimagelist/lch_formatgroup.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formatgroup.png
index 9bbac1a2e049..9bbac1a2e049 100644
--- a/default_images/res/commandimagelist/lch_formatgroup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formatgroup.png
diff --git a/default_images/res/commandimagelist/lch_formatline.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formatline.png
index c1b70b706c6f..c1b70b706c6f 100644
--- a/default_images/res/commandimagelist/lch_formatline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formatline.png
diff --git a/default_images/res/commandimagelist/lch_formatpaintbrush.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formatpaintbrush.png
index 7316e14b5331..7316e14b5331 100644
--- a/default_images/res/commandimagelist/lch_formatpaintbrush.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formatpaintbrush.png
diff --git a/default_images/res/commandimagelist/lch_formattedfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formattedfield.png
index 9917842f782b..9917842f782b 100644
--- a/default_images/res/commandimagelist/lch_formattedfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formattedfield.png
diff --git a/default_images/res/commandimagelist/lch_formatungroup.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formatungroup.png
index d77f18339b2f..d77f18339b2f 100644
--- a/default_images/res/commandimagelist/lch_formatungroup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formatungroup.png
diff --git a/default_images/res/commandimagelist/lch_formdesigntools.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formdesigntools.png
index c471f017e542..c471f017e542 100644
--- a/default_images/res/commandimagelist/lch_formdesigntools.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formdesigntools.png
diff --git a/default_images/res/commandimagelist/lch_formelcursor.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formelcursor.png
index 518ff3eb788c..518ff3eb788c 100644
--- a/default_images/res/commandimagelist/lch_formelcursor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formelcursor.png
diff --git a/default_images/res/commandimagelist/lch_formfilter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formfilter.png
index 03b2a98e4ab8..03b2a98e4ab8 100644
--- a/default_images/res/commandimagelist/lch_formfilter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formfilter.png
diff --git a/default_images/res/commandimagelist/lch_formfiltered.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formfiltered.png
index f8dd6b5d0b95..f8dd6b5d0b95 100644
--- a/default_images/res/commandimagelist/lch_formfiltered.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formfiltered.png
diff --git a/default_images/res/commandimagelist/lch_formfilterexecute.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formfilterexecute.png
index a9bf6772d691..a9bf6772d691 100644
--- a/default_images/res/commandimagelist/lch_formfilterexecute.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formfilterexecute.png
diff --git a/default_images/res/commandimagelist/lch_formfilternavigator.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formfilternavigator.png
index d39b165fd230..d39b165fd230 100644
--- a/default_images/res/commandimagelist/lch_formfilternavigator.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formfilternavigator.png
diff --git a/default_images/res/commandimagelist/lch_formproperties.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formproperties.png
index b97152a3fdcb..b97152a3fdcb 100644
--- a/default_images/res/commandimagelist/lch_formproperties.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formproperties.png
diff --git a/default_images/res/commandimagelist/lch_forward.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_forward.png
index 28ff785f35c3..28ff785f35c3 100644
--- a/default_images/res/commandimagelist/lch_forward.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_forward.png
diff --git a/default_images/res/commandimagelist/lch_framedialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_framedialog.png
index a997d658ad4f..a997d658ad4f 100644
--- a/default_images/res/commandimagelist/lch_framedialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_framedialog.png
diff --git a/default_images/res/commandimagelist/lch_framelinecolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_framelinecolor.png
index d5c614df66f1..d5c614df66f1 100644
--- a/default_images/res/commandimagelist/lch_framelinecolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_framelinecolor.png
diff --git a/default_images/res/commandimagelist/lch_freeline.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_freeline.png
index 7957ae706d69..7957ae706d69 100644
--- a/default_images/res/commandimagelist/lch_freeline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_freeline.png
diff --git a/default_images/res/commandimagelist/lch_freeline_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_freeline_unfilled.png
index b475c5717437..b475c5717437 100644
--- a/default_images/res/commandimagelist/lch_freeline_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_freeline_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_fullscreen.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fullscreen.png
index fe2052359417..fe2052359417 100644
--- a/default_images/res/commandimagelist/lch_fullscreen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fullscreen.png
diff --git a/default_images/res/commandimagelist/lch_gallery.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gallery.png
index 0c40385aaf93..0c40385aaf93 100644
--- a/default_images/res/commandimagelist/lch_gallery.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gallery.png
diff --git a/default_images/res/commandimagelist/lch_getactivetask.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_getactivetask.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_getactivetask.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_getactivetask.png
diff --git a/default_images/res/commandimagelist/lch_glueeditmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_glueeditmode.png
index 7ce8113cd553..7ce8113cd553 100644
--- a/default_images/res/commandimagelist/lch_glueeditmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_glueeditmode.png
diff --git a/default_images/res/commandimagelist/lch_glueescapedirectionbottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_glueescapedirectionbottom.png
index 8ef27a2ce409..8ef27a2ce409 100644
--- a/default_images/res/commandimagelist/lch_glueescapedirectionbottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_glueescapedirectionbottom.png
diff --git a/default_images/res/commandimagelist/lch_glueescapedirectionleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_glueescapedirectionleft.png
index dc32db97e38a..dc32db97e38a 100644
--- a/default_images/res/commandimagelist/lch_glueescapedirectionleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_glueescapedirectionleft.png
diff --git a/default_images/res/commandimagelist/lch_glueescapedirectionright.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_glueescapedirectionright.png
index 2f91d8d343d6..2f91d8d343d6 100644
--- a/default_images/res/commandimagelist/lch_glueescapedirectionright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_glueescapedirectionright.png
diff --git a/default_images/res/commandimagelist/lch_glueescapedirectiontop.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_glueescapedirectiontop.png
index 66772855d671..66772855d671 100644
--- a/default_images/res/commandimagelist/lch_glueescapedirectiontop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_glueescapedirectiontop.png
diff --git a/default_images/res/commandimagelist/lch_gluehorzaligncenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluehorzaligncenter.png
index 9bff830c7521..9bff830c7521 100644
--- a/default_images/res/commandimagelist/lch_gluehorzaligncenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluehorzaligncenter.png
diff --git a/default_images/res/commandimagelist/lch_gluehorzalignleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluehorzalignleft.png
index e6c552c6a744..e6c552c6a744 100644
--- a/default_images/res/commandimagelist/lch_gluehorzalignleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluehorzalignleft.png
diff --git a/default_images/res/commandimagelist/lch_gluehorzalignright.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluehorzalignright.png
index fb5c739cfd2f..fb5c739cfd2f 100644
--- a/default_images/res/commandimagelist/lch_gluehorzalignright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluehorzalignright.png
diff --git a/default_images/res/commandimagelist/lch_glueinsertpoint.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_glueinsertpoint.png
index 5a535ebd0410..5a535ebd0410 100644
--- a/default_images/res/commandimagelist/lch_glueinsertpoint.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_glueinsertpoint.png
diff --git a/default_images/res/commandimagelist/lch_gluepercent.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluepercent.png
index bbe4c0e52bf0..bbe4c0e52bf0 100644
--- a/default_images/res/commandimagelist/lch_gluepercent.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluepercent.png
diff --git a/default_images/res/commandimagelist/lch_gluevertalignbottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluevertalignbottom.png
index b0884d2b035e..b0884d2b035e 100644
--- a/default_images/res/commandimagelist/lch_gluevertalignbottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluevertalignbottom.png
diff --git a/default_images/res/commandimagelist/lch_gluevertaligncenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluevertaligncenter.png
index 2e31fc8c5a16..2e31fc8c5a16 100644
--- a/default_images/res/commandimagelist/lch_gluevertaligncenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluevertaligncenter.png
diff --git a/default_images/res/commandimagelist/lch_gluevertaligntop.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluevertaligntop.png
index 01471bc5edc7..01471bc5edc7 100644
--- a/default_images/res/commandimagelist/lch_gluevertaligntop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluevertaligntop.png
diff --git a/default_images/res/commandimagelist/lch_goalseekdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_goalseekdialog.png
index 2716af9825fa..2716af9825fa 100644
--- a/default_images/res/commandimagelist/lch_goalseekdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_goalseekdialog.png
diff --git a/default_images/res/commandimagelist/lch_gotoend.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gotoend.png
index 1216b9381d39..1216b9381d39 100644
--- a/default_images/res/commandimagelist/lch_gotoend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gotoend.png
diff --git a/default_images/res/commandimagelist/lch_gotoendofdoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gotoendofdoc.png
index b8a273f6d78e..b8a273f6d78e 100644
--- a/default_images/res/commandimagelist/lch_gotoendofdoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gotoendofdoc.png
diff --git a/default_images/res/commandimagelist/lch_gotostartofdoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gotostartofdoc.png
index 6c57b0b4346e..6c57b0b4346e 100644
--- a/default_images/res/commandimagelist/lch_gotostartofdoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gotostartofdoc.png
diff --git a/default_images/res/commandimagelist/lch_gotostartoftable.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gotostartoftable.png
index 3203541890c5..3203541890c5 100644
--- a/default_images/res/commandimagelist/lch_gotostartoftable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gotostartoftable.png
diff --git a/default_images/res/commandimagelist/lch_grafattrcrop.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafattrcrop.png
index c1f0992402a2..c1f0992402a2 100644
--- a/default_images/res/commandimagelist/lch_grafattrcrop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafattrcrop.png
diff --git a/default_images/res/commandimagelist/lch_grafblue.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafblue.png
index 7ce95d2d79a8..7ce95d2d79a8 100644
--- a/default_images/res/commandimagelist/lch_grafblue.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafblue.png
diff --git a/default_images/res/commandimagelist/lch_grafcontrast.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafcontrast.png
index 9608a5203fb2..9608a5203fb2 100644
--- a/default_images/res/commandimagelist/lch_grafcontrast.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafcontrast.png
diff --git a/default_images/res/commandimagelist/lch_grafgamma.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafgamma.png
index 7c8c41261684..7c8c41261684 100644
--- a/default_images/res/commandimagelist/lch_grafgamma.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafgamma.png
diff --git a/default_images/res/commandimagelist/lch_grafgreen.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafgreen.png
index d41de651d15e..d41de651d15e 100644
--- a/default_images/res/commandimagelist/lch_grafgreen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafgreen.png
diff --git a/default_images/res/commandimagelist/lch_grafinvert.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafinvert.png
index a2b28bf14eea..a2b28bf14eea 100644
--- a/default_images/res/commandimagelist/lch_grafinvert.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafinvert.png
diff --git a/default_images/res/commandimagelist/lch_grafluminance.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafluminance.png
index 98b3864307d2..98b3864307d2 100644
--- a/default_images/res/commandimagelist/lch_grafluminance.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafluminance.png
diff --git a/default_images/res/commandimagelist/lch_grafmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafmode.png
index e569acc0951a..e569acc0951a 100644
--- a/default_images/res/commandimagelist/lch_grafmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafmode.png
diff --git a/default_images/res/commandimagelist/lch_grafred.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafred.png
index 928edf656143..928edf656143 100644
--- a/default_images/res/commandimagelist/lch_grafred.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafred.png
diff --git a/default_images/res/commandimagelist/lch_graftransparence.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graftransparence.png
index a9ebe2198c41..a9ebe2198c41 100644
--- a/default_images/res/commandimagelist/lch_graftransparence.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graftransparence.png
diff --git a/default_images/res/commandimagelist/lch_graphic.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphic.png
index 687822059884..687822059884 100644
--- a/default_images/res/commandimagelist/lch_graphic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphic.png
diff --git a/default_images/res/commandimagelist/lch_graphicfilterinvert.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfilterinvert.png
index a2b28bf14eea..a2b28bf14eea 100644
--- a/default_images/res/commandimagelist/lch_graphicfilterinvert.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfilterinvert.png
diff --git a/default_images/res/commandimagelist/lch_graphicfiltermosaic.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltermosaic.png
index ea3bd175f0e7..ea3bd175f0e7 100644
--- a/default_images/res/commandimagelist/lch_graphicfiltermosaic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltermosaic.png
diff --git a/default_images/res/commandimagelist/lch_graphicfilterpopart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfilterpopart.png
index 87f1a3eb99d4..87f1a3eb99d4 100644
--- a/default_images/res/commandimagelist/lch_graphicfilterpopart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfilterpopart.png
diff --git a/default_images/res/commandimagelist/lch_graphicfilterposter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfilterposter.png
index 27bfc6ba6e83..27bfc6ba6e83 100644
--- a/default_images/res/commandimagelist/lch_graphicfilterposter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfilterposter.png
diff --git a/default_images/res/commandimagelist/lch_graphicfilterrelief.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfilterrelief.png
index f0daa58e2d19..f0daa58e2d19 100644
--- a/default_images/res/commandimagelist/lch_graphicfilterrelief.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfilterrelief.png
diff --git a/default_images/res/commandimagelist/lch_graphicfilterremovenoise.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfilterremovenoise.png
index ba1961bfc607..ba1961bfc607 100644
--- a/default_images/res/commandimagelist/lch_graphicfilterremovenoise.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfilterremovenoise.png
diff --git a/default_images/res/commandimagelist/lch_graphicfiltersepia.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltersepia.png
index a4a2a6054512..a4a2a6054512 100644
--- a/default_images/res/commandimagelist/lch_graphicfiltersepia.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltersepia.png
diff --git a/default_images/res/commandimagelist/lch_graphicfiltersharpen.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltersharpen.png
index eb229b14be0a..eb229b14be0a 100644
--- a/default_images/res/commandimagelist/lch_graphicfiltersharpen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltersharpen.png
diff --git a/default_images/res/commandimagelist/lch_graphicfiltersmooth.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltersmooth.png
index 00869b42c0fb..00869b42c0fb 100644
--- a/default_images/res/commandimagelist/lch_graphicfiltersmooth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltersmooth.png
diff --git a/default_images/res/commandimagelist/lch_graphicfiltersobel.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltersobel.png
index a22d25c7a845..a22d25c7a845 100644
--- a/default_images/res/commandimagelist/lch_graphicfiltersobel.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltersobel.png
diff --git a/default_images/res/commandimagelist/lch_graphicfiltersolarize.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltersolarize.png
index 9efd250ba717..9efd250ba717 100644
--- a/default_images/res/commandimagelist/lch_graphicfiltersolarize.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltersolarize.png
diff --git a/default_images/res/commandimagelist/lch_graphicfiltertoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltertoolbox.png
index 5875ddcae7b9..5875ddcae7b9 100644
--- a/default_images/res/commandimagelist/lch_graphicfiltertoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltertoolbox.png
diff --git a/default_images/res/commandimagelist/lch_greatestheight.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_greatestheight.png
index dcb3977354a0..dcb3977354a0 100644
--- a/default_images/res/commandimagelist/lch_greatestheight.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_greatestheight.png
diff --git a/default_images/res/commandimagelist/lch_greatestwidth.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_greatestwidth.png
index fb01c3d7ce4a..fb01c3d7ce4a 100644
--- a/default_images/res/commandimagelist/lch_greatestwidth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_greatestwidth.png
diff --git a/default_images/res/commandimagelist/lch_grid.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grid.png
index 38cf6834897e..38cf6834897e 100644
--- a/default_images/res/commandimagelist/lch_grid.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grid.png
diff --git a/default_images/res/commandimagelist/lch_griduse.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_griduse.png
index fb0f6b5883a3..fb0f6b5883a3 100644
--- a/default_images/res/commandimagelist/lch_griduse.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_griduse.png
diff --git a/default_images/res/commandimagelist/lch_gridvisible.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gridvisible.png
index 08964d11e138..08964d11e138 100644
--- a/default_images/res/commandimagelist/lch_gridvisible.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gridvisible.png
diff --git a/default_images/res/commandimagelist/lch_group.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_group.png
index 84ad2e7a9209..84ad2e7a9209 100644
--- a/default_images/res/commandimagelist/lch_group.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_group.png
diff --git a/default_images/res/commandimagelist/lch_groupbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_groupbox.png
index 7302cfc494d3..7302cfc494d3 100644
--- a/default_images/res/commandimagelist/lch_groupbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_groupbox.png
diff --git a/default_images/res/commandimagelist/lch_grow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grow.png
index 86f0cff36062..86f0cff36062 100644
--- a/default_images/res/commandimagelist/lch_grow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grow.png
diff --git a/default_images/res/commandimagelist/lch_halfsphere.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_halfsphere.png
index 81b6121105c3..81b6121105c3 100644
--- a/default_images/res/commandimagelist/lch_halfsphere.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_halfsphere.png
diff --git a/default_images/res/commandimagelist/lch_handlesdraft.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_handlesdraft.png
index 7d5411a94e4a..7d5411a94e4a 100644
--- a/default_images/res/commandimagelist/lch_handlesdraft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_handlesdraft.png
diff --git a/default_images/res/commandimagelist/lch_helpannotate.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpannotate.png
index 165c2b1a7fe3..165c2b1a7fe3 100644
--- a/default_images/res/commandimagelist/lch_helpannotate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpannotate.png
diff --git a/default_images/res/commandimagelist/lch_helpbookmark.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpbookmark.png
index ce40be534c58..ce40be534c58 100644
--- a/default_images/res/commandimagelist/lch_helpbookmark.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpbookmark.png
diff --git a/default_images/res/commandimagelist/lch_helpdownload.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpdownload.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_helpdownload.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpdownload.png
diff --git a/default_images/res/commandimagelist/lch_helperdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helperdialog.png
index 8aaca82bd130..8aaca82bd130 100644
--- a/default_images/res/commandimagelist/lch_helperdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helperdialog.png
diff --git a/default_images/res/commandimagelist/lch_helpindex.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpindex.png
index 227dbc74f5a3..227dbc74f5a3 100644
--- a/default_images/res/commandimagelist/lch_helpindex.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpindex.png
diff --git a/default_images/res/commandimagelist/lch_helplinesmove.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helplinesmove.png
index 833baf11d75b..833baf11d75b 100644
--- a/default_images/res/commandimagelist/lch_helplinesmove.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helplinesmove.png
diff --git a/default_images/res/commandimagelist/lch_helplinesuse.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helplinesuse.png
index 7aa293e8aefe..7aa293e8aefe 100644
--- a/default_images/res/commandimagelist/lch_helplinesuse.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helplinesuse.png
diff --git a/default_images/res/commandimagelist/lch_helplinesvisible.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helplinesvisible.png
index 781c6791b770..781c6791b770 100644
--- a/default_images/res/commandimagelist/lch_helplinesvisible.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helplinesvisible.png
diff --git a/default_images/res/commandimagelist/lch_helpmenu.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpmenu.png
index 1ff252c57581..1ff252c57581 100644
--- a/default_images/res/commandimagelist/lch_helpmenu.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpmenu.png
diff --git a/default_images/res/commandimagelist/lch_helpsearch.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpsearch.png
index 6392a834ce94..6392a834ce94 100644
--- a/default_images/res/commandimagelist/lch_helpsearch.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpsearch.png
diff --git a/default_images/res/commandimagelist/lch_helpzoomin.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpzoomin.png
index 21e4e78cc541..21e4e78cc541 100644
--- a/default_images/res/commandimagelist/lch_helpzoomin.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpzoomin.png
diff --git a/default_images/res/commandimagelist/lch_helpzoomout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpzoomout.png
index ee427ddf6d46..ee427ddf6d46 100644
--- a/default_images/res/commandimagelist/lch_helpzoomout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpzoomout.png
diff --git a/default_images/res/commandimagelist/lch_hfixedline.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_hfixedline.png
index 9d9e9b05e3a8..9d9e9b05e3a8 100644
--- a/default_images/res/commandimagelist/lch_hfixedline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_hfixedline.png
diff --git a/default_images/res/commandimagelist/lch_hideslide.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_hideslide.png
index 80b6e4a51927..80b6e4a51927 100644
--- a/default_images/res/commandimagelist/lch_hideslide.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_hideslide.png
diff --git a/default_images/res/commandimagelist/lch_hscrollbar.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_hscrollbar.png
index 705191c09153..705191c09153 100644
--- a/default_images/res/commandimagelist/lch_hscrollbar.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_hscrollbar.png
diff --git a/default_images/res/commandimagelist/lch_hyperlinkdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_hyperlinkdialog.png
index 62c4e6046be4..62c4e6046be4 100644
--- a/default_images/res/commandimagelist/lch_hyperlinkdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_hyperlinkdialog.png
diff --git a/default_images/res/commandimagelist/lch_hyphenate.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_hyphenate.png
index 8431fbbe567b..8431fbbe567b 100644
--- a/default_images/res/commandimagelist/lch_hyphenate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_hyphenate.png
diff --git a/default_images/res/commandimagelist/lch_hyphenation.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_hyphenation.png
index 01f819dbf298..01f819dbf298 100644
--- a/default_images/res/commandimagelist/lch_hyphenation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_hyphenation.png
diff --git a/default_images/res/commandimagelist/lch_imagebutton.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_imagebutton.png
index fdebd5bdf8e5..fdebd5bdf8e5 100644
--- a/default_images/res/commandimagelist/lch_imagebutton.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_imagebutton.png
diff --git a/default_images/res/commandimagelist/lch_imagecontrol.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_imagecontrol.png
index 1a46412d36f7..1a46412d36f7 100644
--- a/default_images/res/commandimagelist/lch_imagecontrol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_imagecontrol.png
diff --git a/default_images/res/commandimagelist/lch_imagemapdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_imagemapdialog.png
index 967da9955454..967da9955454 100644
--- a/default_images/res/commandimagelist/lch_imagemapdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_imagemapdialog.png
diff --git a/default_images/res/commandimagelist/lch_importdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_importdialog.png
index 068755d9b6fa..068755d9b6fa 100644
--- a/default_images/res/commandimagelist/lch_importdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_importdialog.png
diff --git a/default_images/res/commandimagelist/lch_importfromfile.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_importfromfile.png
index 226f44e31836..226f44e31836 100644
--- a/default_images/res/commandimagelist/lch_importfromfile.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_importfromfile.png
diff --git a/default_images/res/commandimagelist/lch_incrementindent.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_incrementindent.png
index ba24d3b3d95a..ba24d3b3d95a 100644
--- a/default_images/res/commandimagelist/lch_incrementindent.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_incrementindent.png
diff --git a/default_images/res/commandimagelist/lch_incrementlevel.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_incrementlevel.png
index 617254be3926..617254be3926 100644
--- a/default_images/res/commandimagelist/lch_incrementlevel.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_incrementlevel.png
diff --git a/default_images/res/commandimagelist/lch_incrementsublevels.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_incrementsublevels.png
index 38eba8aa8114..38eba8aa8114 100644
--- a/default_images/res/commandimagelist/lch_incrementsublevels.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_incrementsublevels.png
diff --git a/default_images/res/commandimagelist/lch_inscellsctrl.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inscellsctrl.png
index abf18d4ee67a..abf18d4ee67a 100644
--- a/default_images/res/commandimagelist/lch_inscellsctrl.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inscellsctrl.png
diff --git a/default_images/res/commandimagelist/lch_insertannotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertannotation.png
index 29b3e472a450..29b3e472a450 100644
--- a/default_images/res/commandimagelist/lch_insertannotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertannotation.png
diff --git a/default_images/res/commandimagelist/lch_insertauthorfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertauthorfield.png
index ea575d597b01..ea575d597b01 100644
--- a/default_images/res/commandimagelist/lch_insertauthorfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertauthorfield.png
diff --git a/default_images/res/commandimagelist/lch_insertavmedia.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertavmedia.png
index e702867df362..e702867df362 100644
--- a/default_images/res/commandimagelist/lch_insertavmedia.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertavmedia.png
diff --git a/default_images/res/commandimagelist/lch_insertbookmark.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertbookmark.png
index a63fcf93087f..a63fcf93087f 100644
--- a/default_images/res/commandimagelist/lch_insertbookmark.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertbookmark.png
diff --git a/default_images/res/commandimagelist/lch_insertcaptiondialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertcaptiondialog.png
index e090fe23af9c..e090fe23af9c 100644
--- a/default_images/res/commandimagelist/lch_insertcaptiondialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertcaptiondialog.png
diff --git a/default_images/res/commandimagelist/lch_insertcellsdown.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertcellsdown.png
index 92f7e4fab08d..92f7e4fab08d 100644
--- a/default_images/res/commandimagelist/lch_insertcellsdown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertcellsdown.png
diff --git a/default_images/res/commandimagelist/lch_insertcellsright.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertcellsright.png
index f3e4c8b5b97d..f3e4c8b5b97d 100644
--- a/default_images/res/commandimagelist/lch_insertcellsright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertcellsright.png
diff --git a/default_images/res/commandimagelist/lch_insertcolumns.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertcolumns.png
index f0d7b9dcaf53..f0d7b9dcaf53 100644
--- a/default_images/res/commandimagelist/lch_insertcolumns.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertcolumns.png
diff --git a/default_images/res/commandimagelist/lch_insertctrl.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertctrl.png
index 07994d2a5af6..07994d2a5af6 100644
--- a/default_images/res/commandimagelist/lch_insertctrl.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertctrl.png
diff --git a/default_images/res/commandimagelist/lch_insertcurrencyfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertcurrencyfield.png
index 3c030ca8ae4d..3c030ca8ae4d 100644
--- a/default_images/res/commandimagelist/lch_insertcurrencyfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertcurrencyfield.png
diff --git a/default_images/res/commandimagelist/lch_insertdatefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertdatefield.png
index 22b29e58eabb..22b29e58eabb 100644
--- a/default_images/res/commandimagelist/lch_insertdatefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertdatefield.png
diff --git a/default_images/res/commandimagelist/lch_insertdoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertdoc.png
index f2ce1a11c761..f2ce1a11c761 100644
--- a/default_images/res/commandimagelist/lch_insertdoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertdoc.png
diff --git a/default_images/res/commandimagelist/lch_insertdraw.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertdraw.png
index 4cd45611abf8..4cd45611abf8 100644
--- a/default_images/res/commandimagelist/lch_insertdraw.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertdraw.png
diff --git a/default_images/res/commandimagelist/lch_insertedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertedit.png
index 78ca07f7acff..78ca07f7acff 100644
--- a/default_images/res/commandimagelist/lch_insertedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertedit.png
diff --git a/default_images/res/commandimagelist/lch_insertendnote.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertendnote.png
index dcae9bb35905..dcae9bb35905 100644
--- a/default_images/res/commandimagelist/lch_insertendnote.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertendnote.png
diff --git a/default_images/res/commandimagelist/lch_insertfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertfield.png
index 972c1e9c88bd..972c1e9c88bd 100644
--- a/default_images/res/commandimagelist/lch_insertfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertfield.png
diff --git a/default_images/res/commandimagelist/lch_insertfieldctrl.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertfieldctrl.png
index 972c1e9c88bd..972c1e9c88bd 100644
--- a/default_images/res/commandimagelist/lch_insertfieldctrl.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertfieldctrl.png
diff --git a/default_images/res/commandimagelist/lch_insertfilecontrol.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertfilecontrol.png
index 2ecba0bdaf7d..2ecba0bdaf7d 100644
--- a/default_images/res/commandimagelist/lch_insertfilecontrol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertfilecontrol.png
diff --git a/default_images/res/commandimagelist/lch_insertfixedtext.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertfixedtext.png
index b1be8dc3bb66..b1be8dc3bb66 100644
--- a/default_images/res/commandimagelist/lch_insertfixedtext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertfixedtext.png
diff --git a/default_images/res/commandimagelist/lch_insertfootnote.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertfootnote.png
index 980e8a40cab8..980e8a40cab8 100644
--- a/default_images/res/commandimagelist/lch_insertfootnote.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertfootnote.png
diff --git a/default_images/res/commandimagelist/lch_insertformattedfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertformattedfield.png
index 9917842f782b..9917842f782b 100644
--- a/default_images/res/commandimagelist/lch_insertformattedfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertformattedfield.png
diff --git a/default_images/res/commandimagelist/lch_insertformula.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertformula.png
index 6856aaabc434..6856aaabc434 100644
--- a/default_images/res/commandimagelist/lch_insertformula.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertformula.png
diff --git a/default_images/res/commandimagelist/lch_insertframe.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertframe.png
index 9732156e640a..9732156e640a 100644
--- a/default_images/res/commandimagelist/lch_insertframe.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertframe.png
diff --git a/default_images/res/commandimagelist/lch_insertframeinteract.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertframeinteract.png
index 9732156e640a..9732156e640a 100644
--- a/default_images/res/commandimagelist/lch_insertframeinteract.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertframeinteract.png
diff --git a/default_images/res/commandimagelist/lch_insertframeinteractnocolumns.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertframeinteractnocolumns.png
index 9732156e640a..9732156e640a 100644
--- a/default_images/res/commandimagelist/lch_insertframeinteractnocolumns.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertframeinteractnocolumns.png
diff --git a/default_images/res/commandimagelist/lch_insertgraphic.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertgraphic.png
index 0c9474dc2170..0c9474dc2170 100644
--- a/default_images/res/commandimagelist/lch_insertgraphic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertgraphic.png
diff --git a/default_images/res/commandimagelist/lch_inserthyperlink.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserthyperlink.png
index 0145da28005f..0145da28005f 100644
--- a/default_images/res/commandimagelist/lch_inserthyperlink.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserthyperlink.png
diff --git a/default_images/res/commandimagelist/lch_insertimagecontrol.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertimagecontrol.png
index b295b34cc785..b295b34cc785 100644
--- a/default_images/res/commandimagelist/lch_insertimagecontrol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertimagecontrol.png
diff --git a/default_images/res/commandimagelist/lch_insertindexesentry.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertindexesentry.png
index c1c9a35f2f60..c1c9a35f2f60 100644
--- a/default_images/res/commandimagelist/lch_insertindexesentry.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertindexesentry.png
diff --git a/default_images/res/commandimagelist/lch_insertlistbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertlistbox.png
index dbc038bf66a2..dbc038bf66a2 100644
--- a/default_images/res/commandimagelist/lch_insertlistbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertlistbox.png
diff --git a/default_images/res/commandimagelist/lch_insertmasterpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertmasterpage.png
index e1cc5c3d19e1..e1cc5c3d19e1 100644
--- a/default_images/res/commandimagelist/lch_insertmasterpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertmasterpage.png
diff --git a/default_images/res/commandimagelist/lch_insertmath.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertmath.png
index 88369d31b753..88369d31b753 100644
--- a/default_images/res/commandimagelist/lch_insertmath.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertmath.png
diff --git a/default_images/res/commandimagelist/lch_insertneutralparagraph.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertneutralparagraph.png
index f94c478e3f48..f94c478e3f48 100644
--- a/default_images/res/commandimagelist/lch_insertneutralparagraph.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertneutralparagraph.png
diff --git a/default_images/res/commandimagelist/lch_insertnumericfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertnumericfield.png
index 87103f498aea..87103f498aea 100644
--- a/default_images/res/commandimagelist/lch_insertnumericfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertnumericfield.png
diff --git a/default_images/res/commandimagelist/lch_insertobjctrl.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertobjctrl.png
index cae18a1bde90..cae18a1bde90 100644
--- a/default_images/res/commandimagelist/lch_insertobjctrl.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertobjctrl.png
diff --git a/default_images/res/commandimagelist/lch_insertobject.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertobject.png
index a9967513deae..a9967513deae 100644
--- a/default_images/res/commandimagelist/lch_insertobject.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertobject.png
diff --git a/default_images/res/commandimagelist/lch_insertobjectchart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertobjectchart.png
index d4d11140c074..d4d11140c074 100644
--- a/default_images/res/commandimagelist/lch_insertobjectchart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertobjectchart.png
diff --git a/default_images/res/commandimagelist/lch_insertobjectdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertobjectdialog.png
index 036a2d7ac527..036a2d7ac527 100644
--- a/default_images/res/commandimagelist/lch_insertobjectdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertobjectdialog.png
diff --git a/default_images/res/commandimagelist/lch_insertobjectfloatingframe.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertobjectfloatingframe.png
index 1fe282df7bcf..1fe282df7bcf 100644
--- a/default_images/res/commandimagelist/lch_insertobjectfloatingframe.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertobjectfloatingframe.png
diff --git a/default_images/res/commandimagelist/lch_insertobjectstarmath.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertobjectstarmath.png
index 2dfb6c559de8..2dfb6c559de8 100644
--- a/default_images/res/commandimagelist/lch_insertobjectstarmath.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertobjectstarmath.png
diff --git a/default_images/res/commandimagelist/lch_insertpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertpage.png
index ed84fc9cb5df..ed84fc9cb5df 100644
--- a/default_images/res/commandimagelist/lch_insertpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertpage.png
diff --git a/default_images/res/commandimagelist/lch_insertpagecountfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertpagecountfield.png
index 6054b3cb9532..6054b3cb9532 100644
--- a/default_images/res/commandimagelist/lch_insertpagecountfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertpagecountfield.png
diff --git a/default_images/res/commandimagelist/lch_insertpagenumberfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertpagenumberfield.png
index e3de60c7e4da..e3de60c7e4da 100644
--- a/default_images/res/commandimagelist/lch_insertpagenumberfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertpagenumberfield.png
diff --git a/default_images/res/commandimagelist/lch_insertpatternfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertpatternfield.png
index 358b89a5f7b6..358b89a5f7b6 100644
--- a/default_images/res/commandimagelist/lch_insertpatternfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertpatternfield.png
diff --git a/default_images/res/commandimagelist/lch_insertplugin.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertplugin.png
index 19e367c8d76e..19e367c8d76e 100644
--- a/default_images/res/commandimagelist/lch_insertplugin.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertplugin.png
diff --git a/default_images/res/commandimagelist/lch_insertpushbutton.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertpushbutton.png
index 46454486eb2a..46454486eb2a 100644
--- a/default_images/res/commandimagelist/lch_insertpushbutton.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertpushbutton.png
diff --git a/default_images/res/commandimagelist/lch_insertreferencefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertreferencefield.png
index 589c75767335..589c75767335 100644
--- a/default_images/res/commandimagelist/lch_insertreferencefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertreferencefield.png
diff --git a/default_images/res/commandimagelist/lch_insertrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertrows.png
index 784530c4a28c..784530c4a28c 100644
--- a/default_images/res/commandimagelist/lch_insertrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertrows.png
diff --git a/default_images/res/commandimagelist/lch_insertsection.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertsection.png
index 1cb2c20941c8..1cb2c20941c8 100644
--- a/default_images/res/commandimagelist/lch_insertsection.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertsection.png
diff --git a/default_images/res/commandimagelist/lch_insertsound.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertsound.png
index 8fb43f4c3fdd..8fb43f4c3fdd 100644
--- a/default_images/res/commandimagelist/lch_insertsound.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertsound.png
diff --git a/default_images/res/commandimagelist/lch_insertspreadsheet.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertspreadsheet.png
index 38cf6834897e..38cf6834897e 100644
--- a/default_images/res/commandimagelist/lch_insertspreadsheet.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertspreadsheet.png
diff --git a/default_images/res/commandimagelist/lch_insertsymbol.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertsymbol.png
index a9166d91225a..a9166d91225a 100644
--- a/default_images/res/commandimagelist/lch_insertsymbol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertsymbol.png
diff --git a/default_images/res/commandimagelist/lch_inserttable.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttable.png
index 38cf6834897e..38cf6834897e 100644
--- a/default_images/res/commandimagelist/lch_inserttable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttable.png
diff --git a/default_images/res/commandimagelist/lch_inserttextframe.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttextframe.png
index 9732156e640a..9732156e640a 100644
--- a/default_images/res/commandimagelist/lch_inserttextframe.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttextframe.png
diff --git a/default_images/res/commandimagelist/lch_inserttimefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttimefield.png
index 296cc9aae5ef..296cc9aae5ef 100644
--- a/default_images/res/commandimagelist/lch_inserttimefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttimefield.png
diff --git a/default_images/res/commandimagelist/lch_inserttitlefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttitlefield.png
index 5c96190e3469..5c96190e3469 100644
--- a/default_images/res/commandimagelist/lch_inserttitlefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttitlefield.png
diff --git a/default_images/res/commandimagelist/lch_inserttoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttoolbox.png
index 226f44e31836..226f44e31836 100644
--- a/default_images/res/commandimagelist/lch_inserttoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttoolbox.png
diff --git a/default_images/res/commandimagelist/lch_inserttopicfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttopicfield.png
index 1d8c9c08d354..1d8c9c08d354 100644
--- a/default_images/res/commandimagelist/lch_inserttopicfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttopicfield.png
diff --git a/default_images/res/commandimagelist/lch_inserttreecontrol.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttreecontrol.png
index 151761941036..151761941036 100644
--- a/default_images/res/commandimagelist/lch_inserttreecontrol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttreecontrol.png
diff --git a/default_images/res/commandimagelist/lch_insertvideo.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertvideo.png
index 7bd9a1e00749..7bd9a1e00749 100644
--- a/default_images/res/commandimagelist/lch_insertvideo.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertvideo.png
diff --git a/default_images/res/commandimagelist/lch_insobjctrl.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insobjctrl.png
index 9909e0380cbf..9909e0380cbf 100644
--- a/default_images/res/commandimagelist/lch_insobjctrl.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insobjctrl.png
diff --git a/default_images/res/commandimagelist/lch_interactivegradient.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_interactivegradient.png
index c590b83ee4cb..c590b83ee4cb 100644
--- a/default_images/res/commandimagelist/lch_interactivegradient.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_interactivegradient.png
diff --git a/default_images/res/commandimagelist/lch_interactivetransparence.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_interactivetransparence.png
index 6068521b768b..6068521b768b 100644
--- a/default_images/res/commandimagelist/lch_interactivetransparence.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_interactivetransparence.png
diff --git a/default_images/res/commandimagelist/lch_internetonline.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_internetonline.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_internetonline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_internetonline.png
diff --git a/default_images/res/commandimagelist/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_italic.png
index 76481b6c9f83..76481b6c9f83 100644
--- a/default_images/res/commandimagelist/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_italic.png
diff --git a/default_images/res/commandimagelist/lch_justifypara.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_justifypara.png
index b2e95db780c3..b2e95db780c3 100644
--- a/default_images/res/commandimagelist/lch_justifypara.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_justifypara.png
diff --git a/default_images/res/commandimagelist/lch_label.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_label.png
index 805c1b01ad11..805c1b01ad11 100644
--- a/default_images/res/commandimagelist/lch_label.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_label.png
diff --git a/default_images/res/commandimagelist/lch_lastpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_lastpage.png
index 66f841cbf50c..66f841cbf50c 100644
--- a/default_images/res/commandimagelist/lch_lastpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_lastpage.png
diff --git a/default_images/res/commandimagelist/lch_lastrecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_lastrecord.png
index 0f57ffddf595..0f57ffddf595 100644
--- a/default_images/res/commandimagelist/lch_lastrecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_lastrecord.png
diff --git a/default_images/res/commandimagelist/lch_leaveallgroups.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_leaveallgroups.png
index 92c080bef67d..92c080bef67d 100644
--- a/default_images/res/commandimagelist/lch_leaveallgroups.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_leaveallgroups.png
diff --git a/default_images/res/commandimagelist/lch_leavegroup.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_leavegroup.png
index 21612be206c7..21612be206c7 100644
--- a/default_images/res/commandimagelist/lch_leavegroup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_leavegroup.png
diff --git a/default_images/res/commandimagelist/lch_leftpara.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_leftpara.png
index 3255d27d9f5d..3255d27d9f5d 100644
--- a/default_images/res/commandimagelist/lch_leftpara.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_leftpara.png
diff --git a/default_images/res/commandimagelist/lch_line.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_line.png
index 8165a9a30656..8165a9a30656 100644
--- a/default_images/res/commandimagelist/lch_line.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_line.png
diff --git a/default_images/res/commandimagelist/lch_line_diagonal.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_line_diagonal.png
index 77f5bae15507..77f5bae15507 100644
--- a/default_images/res/commandimagelist/lch_line_diagonal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_line_diagonal.png
diff --git a/default_images/res/commandimagelist/lch_linearrowcircle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linearrowcircle.png
index 0d990ffe3c2f..0d990ffe3c2f 100644
--- a/default_images/res/commandimagelist/lch_linearrowcircle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linearrowcircle.png
diff --git a/default_images/res/commandimagelist/lch_linearrowend.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linearrowend.png
index a888e9ffece5..a888e9ffece5 100644
--- a/default_images/res/commandimagelist/lch_linearrowend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linearrowend.png
diff --git a/default_images/res/commandimagelist/lch_linearrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linearrows.png
index 3c21a3936da4..3c21a3936da4 100644
--- a/default_images/res/commandimagelist/lch_linearrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linearrows.png
diff --git a/default_images/res/commandimagelist/lch_linearrowsquare.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linearrowsquare.png
index 508e2ea273b2..508e2ea273b2 100644
--- a/default_images/res/commandimagelist/lch_linearrowsquare.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linearrowsquare.png
diff --git a/default_images/res/commandimagelist/lch_linearrowstart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linearrowstart.png
index 8efa836a1bd4..8efa836a1bd4 100644
--- a/default_images/res/commandimagelist/lch_linearrowstart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linearrowstart.png
diff --git a/default_images/res/commandimagelist/lch_linecirclearrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linecirclearrow.png
index fa25c4ed2006..fa25c4ed2006 100644
--- a/default_images/res/commandimagelist/lch_linecirclearrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linecirclearrow.png
diff --git a/default_images/res/commandimagelist/lch_lineendstyle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_lineendstyle.png
index fce55452e992..fce55452e992 100644
--- a/default_images/res/commandimagelist/lch_lineendstyle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_lineendstyle.png
diff --git a/default_images/res/commandimagelist/lch_linesquarearrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linesquarearrow.png
index cde37ebed995..cde37ebed995 100644
--- a/default_images/res/commandimagelist/lch_linesquarearrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linesquarearrow.png
diff --git a/default_images/res/commandimagelist/lch_linestyle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linestyle.png
index a61a1a6c31a1..a61a1a6c31a1 100644
--- a/default_images/res/commandimagelist/lch_linestyle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linestyle.png
diff --git a/default_images/res/commandimagelist/lch_linetoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linetoolbox.png
index 34a68e479613..34a68e479613 100644
--- a/default_images/res/commandimagelist/lch_linetoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linetoolbox.png
diff --git a/default_images/res/commandimagelist/lch_linewidth.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linewidth.png
index 64fd27c27d5f..64fd27c27d5f 100644
--- a/default_images/res/commandimagelist/lch_linewidth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linewidth.png
diff --git a/default_images/res/commandimagelist/lch_listbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_listbox.png
index dbc038bf66a2..dbc038bf66a2 100644
--- a/default_images/res/commandimagelist/lch_listbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_listbox.png
diff --git a/default_images/res/commandimagelist/lch_loadbasic.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_loadbasic.png
index a7964383484e..a7964383484e 100644
--- a/default_images/res/commandimagelist/lch_loadbasic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_loadbasic.png
diff --git a/default_images/res/commandimagelist/lch_macrorecorder.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_macrorecorder.png
index 16ef57e0b0fc..16ef57e0b0fc 100644
--- a/default_images/res/commandimagelist/lch_macrorecorder.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_macrorecorder.png
diff --git a/default_images/res/commandimagelist/lch_macrorecordingfloat.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_macrorecordingfloat.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_macrorecordingfloat.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_macrorecordingfloat.png
diff --git a/default_images/res/commandimagelist/lch_mailwindow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_mailwindow.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_mailwindow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_mailwindow.png
diff --git a/default_images/res/commandimagelist/lch_managebreakpoints.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_managebreakpoints.png
index 4599ec7cf082..4599ec7cf082 100644
--- a/default_images/res/commandimagelist/lch_managebreakpoints.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_managebreakpoints.png
diff --git a/default_images/res/commandimagelist/lch_managelanguage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_managelanguage.png
index 77f006398a60..77f006398a60 100644
--- a/default_images/res/commandimagelist/lch_managelanguage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_managelanguage.png
diff --git a/default_images/res/commandimagelist/lch_marks.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_marks.png
index c1b284d40859..c1b284d40859 100644
--- a/default_images/res/commandimagelist/lch_marks.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_marks.png
diff --git a/default_images/res/commandimagelist/lch_matchgroup.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_matchgroup.png
index 6769c00fba19..6769c00fba19 100644
--- a/default_images/res/commandimagelist/lch_matchgroup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_matchgroup.png
diff --git a/default_images/res/commandimagelist/lch_measureline.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_measureline.png
index bf7cd92747c0..bf7cd92747c0 100644
--- a/default_images/res/commandimagelist/lch_measureline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_measureline.png
diff --git a/default_images/res/commandimagelist/lch_mergecells.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_mergecells.png
index 1003d3c39f8b..1003d3c39f8b 100644
--- a/default_images/res/commandimagelist/lch_mergecells.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_mergecells.png
diff --git a/default_images/res/commandimagelist/lch_mergedialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_mergedialog.png
index 32a48130f3b8..32a48130f3b8 100644
--- a/default_images/res/commandimagelist/lch_mergedialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_mergedialog.png
diff --git a/default_images/res/commandimagelist/lch_mirror.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_mirror.png
index 6db1e0e0f956..6db1e0e0f956 100644
--- a/default_images/res/commandimagelist/lch_mirror.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_mirror.png
diff --git a/default_images/res/commandimagelist/lch_modifyframe.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_modifyframe.png
index c4bfcaf9f954..c4bfcaf9f954 100644
--- a/default_images/res/commandimagelist/lch_modifyframe.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_modifyframe.png
diff --git a/default_images/res/commandimagelist/lch_modifypage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_modifypage.png
index 09d09d26828f..09d09d26828f 100644
--- a/default_images/res/commandimagelist/lch_modifypage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_modifypage.png
diff --git a/default_images/res/commandimagelist/lch_moduledialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_moduledialog.png
index 81cc653ce925..81cc653ce925 100644
--- a/default_images/res/commandimagelist/lch_moduledialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_moduledialog.png
diff --git a/default_images/res/commandimagelist/lch_morecontrols.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_morecontrols.png
index 0822a8159a9b..0822a8159a9b 100644
--- a/default_images/res/commandimagelist/lch_morecontrols.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_morecontrols.png
diff --git a/default_images/res/commandimagelist/lch_movedown.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_movedown.png
index 0a04b3544984..0a04b3544984 100644
--- a/default_images/res/commandimagelist/lch_movedown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_movedown.png
diff --git a/default_images/res/commandimagelist/lch_movedownsubitems.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_movedownsubitems.png
index a86e5c677027..a86e5c677027 100644
--- a/default_images/res/commandimagelist/lch_movedownsubitems.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_movedownsubitems.png
diff --git a/default_images/res/commandimagelist/lch_moveup.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_moveup.png
index bcf47ed9918c..bcf47ed9918c 100644
--- a/default_images/res/commandimagelist/lch_moveup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_moveup.png
diff --git a/default_images/res/commandimagelist/lch_moveupsubitems.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_moveupsubitems.png
index 66fc3e6f81a6..66fc3e6f81a6 100644
--- a/default_images/res/commandimagelist/lch_moveupsubitems.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_moveupsubitems.png
diff --git a/default_images/res/commandimagelist/lch_navigationbar.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_navigationbar.png
index e5463c52443e..e5463c52443e 100644
--- a/default_images/res/commandimagelist/lch_navigationbar.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_navigationbar.png
diff --git a/default_images/res/commandimagelist/lch_navigator.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_navigator.png
index 142ca8cf0b27..142ca8cf0b27 100644
--- a/default_images/res/commandimagelist/lch_navigator.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_navigator.png
diff --git a/default_images/res/commandimagelist/lch_newarrangement.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_newarrangement.png
index bb6d6bf42cc1..bb6d6bf42cc1 100644
--- a/default_images/res/commandimagelist/lch_newarrangement.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_newarrangement.png
diff --git a/default_images/res/commandimagelist/lch_newdoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_newdoc.png
index 3b4ed8743002..3b4ed8743002 100644
--- a/default_images/res/commandimagelist/lch_newdoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_newdoc.png
diff --git a/default_images/res/commandimagelist/lch_newrecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_newrecord.png
index f8c399d4d3d5..f8c399d4d3d5 100644
--- a/default_images/res/commandimagelist/lch_newrecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_newrecord.png
diff --git a/default_images/res/commandimagelist/lch_nextannotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_nextannotation.png
index 4bc858a55bdc..4bc858a55bdc 100644
--- a/default_images/res/commandimagelist/lch_nextannotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_nextannotation.png
diff --git a/default_images/res/commandimagelist/lch_nextpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_nextpage.png
index 7aba8a131267..7aba8a131267 100644
--- a/default_images/res/commandimagelist/lch_nextpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_nextpage.png
diff --git a/default_images/res/commandimagelist/lch_nextrecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_nextrecord.png
index 4c537b9952b1..4c537b9952b1 100644
--- a/default_images/res/commandimagelist/lch_nextrecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_nextrecord.png
diff --git a/default_images/res/commandimagelist/lch_numberformatcurrency.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatcurrency.png
index 4e49f237994a..4e49f237994a 100644
--- a/default_images/res/commandimagelist/lch_numberformatcurrency.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatcurrency.png
diff --git a/default_images/res/commandimagelist/lch_numberformatdate.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatdate.png
index 48307be09e81..48307be09e81 100644
--- a/default_images/res/commandimagelist/lch_numberformatdate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatdate.png
diff --git a/default_images/res/commandimagelist/lch_numberformatdecdecimals.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatdecdecimals.png
index 0ff41c48b005..0ff41c48b005 100644
--- a/default_images/res/commandimagelist/lch_numberformatdecdecimals.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatdecdecimals.png
diff --git a/default_images/res/commandimagelist/lch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatdecimal.png
index e02228dd02dc..e02228dd02dc 100644
--- a/default_images/res/commandimagelist/lch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/lch_numberformatincdecimals.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatincdecimals.png
index 7c7ac1dbe453..7c7ac1dbe453 100644
--- a/default_images/res/commandimagelist/lch_numberformatincdecimals.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatincdecimals.png
diff --git a/default_images/res/commandimagelist/lch_numberformatpercent.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatpercent.png
index 20c46a5963f9..20c46a5963f9 100644
--- a/default_images/res/commandimagelist/lch_numberformatpercent.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatpercent.png
diff --git a/default_images/res/commandimagelist/lch_numberformatscientific.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatscientific.png
index c37bae9fabf8..c37bae9fabf8 100644
--- a/default_images/res/commandimagelist/lch_numberformatscientific.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatscientific.png
diff --git a/default_images/res/commandimagelist/lch_numberformatstandard.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatstandard.png
index 04ccf33a52d4..04ccf33a52d4 100644
--- a/default_images/res/commandimagelist/lch_numberformatstandard.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatstandard.png
diff --git a/default_images/res/commandimagelist/lch_numberingstart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberingstart.png
index 9a0e081a7508..9a0e081a7508 100644
--- a/default_images/res/commandimagelist/lch_numberingstart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberingstart.png
diff --git a/default_images/res/commandimagelist/lch_numericfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numericfield.png
index 87103f498aea..87103f498aea 100644
--- a/default_images/res/commandimagelist/lch_numericfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numericfield.png
diff --git a/default_images/res/commandimagelist/lch_objectalign.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_objectalign.png
index 2946cda99455..2946cda99455 100644
--- a/default_images/res/commandimagelist/lch_objectalign.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_objectalign.png
diff --git a/default_images/res/commandimagelist/lch_objectalignleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_objectalignleft.png
index 2946cda99455..2946cda99455 100644
--- a/default_images/res/commandimagelist/lch_objectalignleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_objectalignleft.png
diff --git a/default_images/res/commandimagelist/lch_objectalignright.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_objectalignright.png
index e0fe825d91bd..e0fe825d91bd 100644
--- a/default_images/res/commandimagelist/lch_objectalignright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_objectalignright.png
diff --git a/default_images/res/commandimagelist/lch_objectcatalog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_objectcatalog.png
index d97ac5b5b634..d97ac5b5b634 100644
--- a/default_images/res/commandimagelist/lch_objectcatalog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_objectcatalog.png
diff --git a/default_images/res/commandimagelist/lch_objectposition.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_objectposition.png
index b635afc71812..b635afc71812 100644
--- a/default_images/res/commandimagelist/lch_objectposition.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_objectposition.png
diff --git a/default_images/res/commandimagelist/lch_objects3dtoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_objects3dtoolbox.png
index d1338bb7ad2e..d1338bb7ad2e 100644
--- a/default_images/res/commandimagelist/lch_objects3dtoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_objects3dtoolbox.png
diff --git a/default_images/res/commandimagelist/lch_open.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_open.png
index ab22bf9486dd..ab22bf9486dd 100644
--- a/default_images/res/commandimagelist/lch_open.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_open.png
diff --git a/default_images/res/commandimagelist/lch_openreadonly.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_openreadonly.png
index df7ae519b71b..df7ae519b71b 100644
--- a/default_images/res/commandimagelist/lch_openreadonly.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_openreadonly.png
diff --git a/default_images/res/commandimagelist/lch_openurl.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_openurl.png
index fbb0d3d844e0..fbb0d3d844e0 100644
--- a/default_images/res/commandimagelist/lch_openurl.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_openurl.png
diff --git a/default_images/res/commandimagelist/lch_optimizetable.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_optimizetable.png
index 44944c55e8ec..44944c55e8ec 100644
--- a/default_images/res/commandimagelist/lch_optimizetable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_optimizetable.png
diff --git a/default_images/res/commandimagelist/lch_ordercrit.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ordercrit.png
index e54d5a57f1c4..e54d5a57f1c4 100644
--- a/default_images/res/commandimagelist/lch_ordercrit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ordercrit.png
diff --git a/default_images/res/commandimagelist/lch_outlinebullet.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlinebullet.png
index 148e5fdc752b..148e5fdc752b 100644
--- a/default_images/res/commandimagelist/lch_outlinebullet.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlinebullet.png
diff --git a/default_images/res/commandimagelist/lch_outlinecollapse.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlinecollapse.png
index 505963375397..505963375397 100644
--- a/default_images/res/commandimagelist/lch_outlinecollapse.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlinecollapse.png
diff --git a/default_images/res/commandimagelist/lch_outlinecollapseall.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlinecollapseall.png
index 8b6dab11bb07..8b6dab11bb07 100644
--- a/default_images/res/commandimagelist/lch_outlinecollapseall.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlinecollapseall.png
diff --git a/default_images/res/commandimagelist/lch_outlinedown.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlinedown.png
index 0a04b3544984..0a04b3544984 100644
--- a/default_images/res/commandimagelist/lch_outlinedown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlinedown.png
diff --git a/default_images/res/commandimagelist/lch_outlineexpand.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlineexpand.png
index d8ff4d007f91..d8ff4d007f91 100644
--- a/default_images/res/commandimagelist/lch_outlineexpand.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlineexpand.png
diff --git a/default_images/res/commandimagelist/lch_outlineexpandall.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlineexpandall.png
index dcf2783108b0..dcf2783108b0 100644
--- a/default_images/res/commandimagelist/lch_outlineexpandall.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlineexpandall.png
diff --git a/default_images/res/commandimagelist/lch_outlinefont.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlinefont.png
index 9e3979228b8c..9e3979228b8c 100644
--- a/default_images/res/commandimagelist/lch_outlinefont.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlinefont.png
diff --git a/default_images/res/commandimagelist/lch_outlineformat.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlineformat.png
index 795384d6fccb..795384d6fccb 100644
--- a/default_images/res/commandimagelist/lch_outlineformat.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlineformat.png
diff --git a/default_images/res/commandimagelist/lch_outlineleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlineleft.png
index 8da4b49266e6..8da4b49266e6 100644
--- a/default_images/res/commandimagelist/lch_outlineleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlineleft.png
diff --git a/default_images/res/commandimagelist/lch_outlineright.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlineright.png
index c76b0ac6f1d2..c76b0ac6f1d2 100644
--- a/default_images/res/commandimagelist/lch_outlineright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlineright.png
diff --git a/default_images/res/commandimagelist/lch_outlineup.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlineup.png
index 1f8c58d508aa..1f8c58d508aa 100644
--- a/default_images/res/commandimagelist/lch_outlineup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlineup.png
diff --git a/default_images/res/commandimagelist/lch_overline.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_overline.png
index f9a253069780..f9a253069780 100644
--- a/default_images/res/commandimagelist/lch_overline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_overline.png
diff --git a/default_images/res/commandimagelist/lch_pagedown.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pagedown.png
index 2ede714197bc..2ede714197bc 100644
--- a/default_images/res/commandimagelist/lch_pagedown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pagedown.png
diff --git a/default_images/res/commandimagelist/lch_pageup.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pageup.png
index 508b7d5ddb18..508b7d5ddb18 100644
--- a/default_images/res/commandimagelist/lch_pageup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pageup.png
diff --git a/default_images/res/commandimagelist/lch_paragraphdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_paragraphdialog.png
index 5aeb4f0c6bdc..5aeb4f0c6bdc 100644
--- a/default_images/res/commandimagelist/lch_paragraphdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_paragraphdialog.png
diff --git a/default_images/res/commandimagelist/lch_paralefttoright.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_paralefttoright.png
index a4b58d8d0749..a4b58d8d0749 100644
--- a/default_images/res/commandimagelist/lch_paralefttoright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_paralefttoright.png
diff --git a/default_images/res/commandimagelist/lch_pararighttoleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pararighttoleft.png
index b55becf1b995..b55becf1b995 100644
--- a/default_images/res/commandimagelist/lch_pararighttoleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pararighttoleft.png
diff --git a/default_images/res/commandimagelist/lch_paraspacedecrease.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_paraspacedecrease.png
index 674d12f4f81f..674d12f4f81f 100644
--- a/default_images/res/commandimagelist/lch_paraspacedecrease.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_paraspacedecrease.png
diff --git a/default_images/res/commandimagelist/lch_paraspaceincrease.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_paraspaceincrease.png
index 76deb2176fb9..76deb2176fb9 100644
--- a/default_images/res/commandimagelist/lch_paraspaceincrease.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_paraspaceincrease.png
diff --git a/default_images/res/commandimagelist/lch_paste.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_paste.png
index 6d1894023f38..6d1894023f38 100644
--- a/default_images/res/commandimagelist/lch_paste.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_paste.png
diff --git a/default_images/res/commandimagelist/lch_patternfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_patternfield.png
index 358b89a5f7b6..358b89a5f7b6 100644
--- a/default_images/res/commandimagelist/lch_patternfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_patternfield.png
diff --git a/default_images/res/commandimagelist/lch_pickthrough.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pickthrough.png
index 0e38ae956967..0e38ae956967 100644
--- a/default_images/res/commandimagelist/lch_pickthrough.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pickthrough.png
diff --git a/default_images/res/commandimagelist/lch_pie.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pie.png
index 7e8eb6efa2b8..7e8eb6efa2b8 100644
--- a/default_images/res/commandimagelist/lch_pie.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pie.png
diff --git a/default_images/res/commandimagelist/lch_pie_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pie_unfilled.png
index 390895c9ff7b..390895c9ff7b 100644
--- a/default_images/res/commandimagelist/lch_pie_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pie_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_playmacro.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_playmacro.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_playmacro.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_playmacro.png
diff --git a/default_images/res/commandimagelist/lch_pluginsactive.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pluginsactive.png
index d19efdd77a9b..d19efdd77a9b 100644
--- a/default_images/res/commandimagelist/lch_pluginsactive.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pluginsactive.png
diff --git a/default_images/res/commandimagelist/lch_polygon.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_polygon.png
index fb63b0c50bfa..fb63b0c50bfa 100644
--- a/default_images/res/commandimagelist/lch_polygon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_polygon.png
diff --git a/default_images/res/commandimagelist/lch_polygon_diagonal.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_polygon_diagonal.png
index adc640508435..adc640508435 100644
--- a/default_images/res/commandimagelist/lch_polygon_diagonal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_polygon_diagonal.png
diff --git a/default_images/res/commandimagelist/lch_polygon_diagonal_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_polygon_diagonal_unfilled.png
index cf18983c218c..cf18983c218c 100644
--- a/default_images/res/commandimagelist/lch_polygon_diagonal_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_polygon_diagonal_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_polygon_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_polygon_unfilled.png
index 3fdea258b5e0..3fdea258b5e0 100644
--- a/default_images/res/commandimagelist/lch_polygon_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_polygon_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_presentation.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_presentation.png
index eeac9ddf4e8c..eeac9ddf4e8c 100644
--- a/default_images/res/commandimagelist/lch_presentation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_presentation.png
diff --git a/default_images/res/commandimagelist/lch_presentationlayout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_presentationlayout.png
index 9013c9e7e7f3..9013c9e7e7f3 100644
--- a/default_images/res/commandimagelist/lch_presentationlayout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_presentationlayout.png
diff --git a/default_images/res/commandimagelist/lch_preview.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_preview.png
index fdebd5bdf8e5..fdebd5bdf8e5 100644
--- a/default_images/res/commandimagelist/lch_preview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_preview.png
diff --git a/default_images/res/commandimagelist/lch_previewprintoptions.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_previewprintoptions.png
index e4bb819967e1..e4bb819967e1 100644
--- a/default_images/res/commandimagelist/lch_previewprintoptions.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_previewprintoptions.png
diff --git a/default_images/res/commandimagelist/lch_previewzoom.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_previewzoom.png
index 435846e077ff..435846e077ff 100644
--- a/default_images/res/commandimagelist/lch_previewzoom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_previewzoom.png
diff --git a/default_images/res/commandimagelist/lch_previousannotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_previousannotation.png
index cfc6b8f021d6..cfc6b8f021d6 100644
--- a/default_images/res/commandimagelist/lch_previousannotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_previousannotation.png
diff --git a/default_images/res/commandimagelist/lch_previouspage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_previouspage.png
index 508b7d5ddb18..508b7d5ddb18 100644
--- a/default_images/res/commandimagelist/lch_previouspage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_previouspage.png
diff --git a/default_images/res/commandimagelist/lch_prevrecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_prevrecord.png
index 940212f66abd..940212f66abd 100644
--- a/default_images/res/commandimagelist/lch_prevrecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_prevrecord.png
diff --git a/default_images/res/commandimagelist/lch_print.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_print.png
index 9950dfb640f6..9950dfb640f6 100644
--- a/default_images/res/commandimagelist/lch_print.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_print.png
diff --git a/default_images/res/commandimagelist/lch_printdefault.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_printdefault.png
index 21e2aa663dcf..21e2aa663dcf 100644
--- a/default_images/res/commandimagelist/lch_printdefault.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_printdefault.png
diff --git a/default_images/res/commandimagelist/lch_printersetup.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_printersetup.png
index d4a7c5400b26..d4a7c5400b26 100644
--- a/default_images/res/commandimagelist/lch_printersetup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_printersetup.png
diff --git a/default_images/res/commandimagelist/lch_printlayout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_printlayout.png
index 8e7f16b1d0d6..8e7f16b1d0d6 100644
--- a/default_images/res/commandimagelist/lch_printlayout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_printlayout.png
diff --git a/default_images/res/commandimagelist/lch_printpagepreview.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_printpagepreview.png
index 51578f054cdf..51578f054cdf 100644
--- a/default_images/res/commandimagelist/lch_printpagepreview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_printpagepreview.png
diff --git a/default_images/res/commandimagelist/lch_printpreview.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_printpreview.png
index a95a92c60e12..a95a92c60e12 100644
--- a/default_images/res/commandimagelist/lch_printpreview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_printpreview.png
diff --git a/default_images/res/commandimagelist/lch_progressbar.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_progressbar.png
index 70492efcd095..70492efcd095 100644
--- a/default_images/res/commandimagelist/lch_progressbar.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_progressbar.png
diff --git a/default_images/res/commandimagelist/lch_pushbutton.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pushbutton.png
index 46454486eb2a..46454486eb2a 100644
--- a/default_images/res/commandimagelist/lch_pushbutton.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pushbutton.png
diff --git a/default_images/res/commandimagelist/lch_quickedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_quickedit.png
index 6dc4293e83ff..6dc4293e83ff 100644
--- a/default_images/res/commandimagelist/lch_quickedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_quickedit.png
diff --git a/default_images/res/commandimagelist/lch_quit.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_quit.png
index 7da933da25cc..7da933da25cc 100644
--- a/default_images/res/commandimagelist/lch_quit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_quit.png
diff --git a/default_images/res/commandimagelist/lch_radiobutton.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_radiobutton.png
index 16488054c1f2..16488054c1f2 100644
--- a/default_images/res/commandimagelist/lch_radiobutton.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_radiobutton.png
diff --git a/default_images/res/commandimagelist/lch_recsave.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_recsave.png
index 42239f157116..42239f157116 100644
--- a/default_images/res/commandimagelist/lch_recsave.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_recsave.png
diff --git a/default_images/res/commandimagelist/lch_recsearch.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_recsearch.png
index 6392a834ce94..6392a834ce94 100644
--- a/default_images/res/commandimagelist/lch_recsearch.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_recsearch.png
diff --git a/default_images/res/commandimagelist/lch_rect.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rect.png
index 6c4541bb8158..6c4541bb8158 100644
--- a/default_images/res/commandimagelist/lch_rect.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rect.png
diff --git a/default_images/res/commandimagelist/lch_rect_rounded.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rect_rounded.png
index 21ebbb9b5e2f..21ebbb9b5e2f 100644
--- a/default_images/res/commandimagelist/lch_rect_rounded.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rect_rounded.png
diff --git a/default_images/res/commandimagelist/lch_rect_rounded_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rect_rounded_unfilled.png
index 6d28c0239033..6d28c0239033 100644
--- a/default_images/res/commandimagelist/lch_rect_rounded_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rect_rounded_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_rect_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rect_unfilled.png
index 8c0360b27720..8c0360b27720 100644
--- a/default_images/res/commandimagelist/lch_rect_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rect_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_rectangletoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rectangletoolbox.png
index 6c4541bb8158..6c4541bb8158 100644
--- a/default_images/res/commandimagelist/lch_rectangletoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rectangletoolbox.png
diff --git a/default_images/res/commandimagelist/lch_recundo.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_recundo.png
index 83b7f6057455..83b7f6057455 100644
--- a/default_images/res/commandimagelist/lch_recundo.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_recundo.png
diff --git a/default_images/res/commandimagelist/lch_redo.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_redo.png
index ebae5235e862..ebae5235e862 100644
--- a/default_images/res/commandimagelist/lch_redo.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_redo.png
diff --git a/default_images/res/commandimagelist/lch_refresh.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_refresh.png
index 5e991f6d5511..5e991f6d5511 100644
--- a/default_images/res/commandimagelist/lch_refresh.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_refresh.png
diff --git a/default_images/res/commandimagelist/lch_refreshformcontrol.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_refreshformcontrol.png
index 15f9b7f4d969..15f9b7f4d969 100644
--- a/default_images/res/commandimagelist/lch_refreshformcontrol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_refreshformcontrol.png
diff --git a/default_images/res/commandimagelist/lch_rehearsetimings.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rehearsetimings.png
index 3818d395ea69..3818d395ea69 100644
--- a/default_images/res/commandimagelist/lch_rehearsetimings.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rehearsetimings.png
diff --git a/default_images/res/commandimagelist/lch_reload.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_reload.png
index 6cbb51e3265e..6cbb51e3265e 100644
--- a/default_images/res/commandimagelist/lch_reload.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_reload.png
diff --git a/default_images/res/commandimagelist/lch_removebullets.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_removebullets.png
index 3b51ceaaae66..3b51ceaaae66 100644
--- a/default_images/res/commandimagelist/lch_removebullets.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_removebullets.png
diff --git a/default_images/res/commandimagelist/lch_removefilter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_removefilter.png
index a973dad9a1aa..a973dad9a1aa 100644
--- a/default_images/res/commandimagelist/lch_removefilter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_removefilter.png
diff --git a/default_images/res/commandimagelist/lch_removefiltersort.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_removefiltersort.png
index a973dad9a1aa..a973dad9a1aa 100644
--- a/default_images/res/commandimagelist/lch_removefiltersort.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_removefiltersort.png
diff --git a/default_images/res/commandimagelist/lch_renamemasterpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_renamemasterpage.png
index 2cf5bf55a990..2cf5bf55a990 100644
--- a/default_images/res/commandimagelist/lch_renamemasterpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_renamemasterpage.png
diff --git a/default_images/res/commandimagelist/lch_repeat.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_repeat.png
index c27027fa4cb8..c27027fa4cb8 100644
--- a/default_images/res/commandimagelist/lch_repeat.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_repeat.png
diff --git a/default_images/res/commandimagelist/lch_reportnavigator.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_reportnavigator.png
index 4667bda7fe37..4667bda7fe37 100644
--- a/default_images/res/commandimagelist/lch_reportnavigator.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_reportnavigator.png
diff --git a/default_images/res/commandimagelist/lch_reverseorder.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_reverseorder.png
index aef4c4b4513a..aef4c4b4513a 100644
--- a/default_images/res/commandimagelist/lch_reverseorder.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_reverseorder.png
diff --git a/default_images/res/commandimagelist/lch_rightpara.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rightpara.png
index 073da720a0c4..073da720a0c4 100644
--- a/default_images/res/commandimagelist/lch_rightpara.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rightpara.png
diff --git a/default_images/res/commandimagelist/lch_rulerrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rulerrows.png
index f3fe93f1e3ab..f3fe93f1e3ab 100644
--- a/default_images/res/commandimagelist/lch_rulerrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rulerrows.png
diff --git a/default_images/res/commandimagelist/lch_rulerrowsvertical.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rulerrowsvertical.png
index a72ced771770..a72ced771770 100644
--- a/default_images/res/commandimagelist/lch_rulerrowsvertical.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rulerrowsvertical.png
diff --git a/default_images/res/commandimagelist/lch_runbasic.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_runbasic.png
index dd4a8b337f21..dd4a8b337f21 100644
--- a/default_images/res/commandimagelist/lch_runbasic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_runbasic.png
diff --git a/default_images/res/commandimagelist/lch_save.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_save.png
index d40dc75a0e9c..d40dc75a0e9c 100644
--- a/default_images/res/commandimagelist/lch_save.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_save.png
diff --git a/default_images/res/commandimagelist/lch_saveas.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_saveas.png
index 763cd6b2d9f7..763cd6b2d9f7 100644
--- a/default_images/res/commandimagelist/lch_saveas.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_saveas.png
diff --git a/default_images/res/commandimagelist/lch_saveastemplate.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_saveastemplate.png
index f15f0c19af9a..f15f0c19af9a 100644
--- a/default_images/res/commandimagelist/lch_saveastemplate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_saveastemplate.png
diff --git a/default_images/res/commandimagelist/lch_savebasicas.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_savebasicas.png
index 3d87be88b5ab..3d87be88b5ab 100644
--- a/default_images/res/commandimagelist/lch_savebasicas.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_savebasicas.png
diff --git a/default_images/res/commandimagelist/lch_sbabrwinsert.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sbabrwinsert.png
index 972c1e9c88bd..972c1e9c88bd 100644
--- a/default_images/res/commandimagelist/lch_sbabrwinsert.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sbabrwinsert.png
diff --git a/default_images/res/commandimagelist/lch_sbaexecutesql.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sbaexecutesql.png
index 829fd179325d..829fd179325d 100644
--- a/default_images/res/commandimagelist/lch_sbaexecutesql.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sbaexecutesql.png
diff --git a/default_images/res/commandimagelist/lch_sbanativesql.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sbanativesql.png
index 24f7b7dcb222..24f7b7dcb222 100644
--- a/default_images/res/commandimagelist/lch_sbanativesql.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sbanativesql.png
diff --git a/default_images/res/commandimagelist/lch_scaletext.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_scaletext.png
index 9e3bca535c39..9e3bca535c39 100644
--- a/default_images/res/commandimagelist/lch_scaletext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_scaletext.png
diff --git a/default_images/res/commandimagelist/lch_scrollbar.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_scrollbar.png
index ffba6ae86c00..ffba6ae86c00 100644
--- a/default_images/res/commandimagelist/lch_scrollbar.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_scrollbar.png
diff --git a/default_images/res/commandimagelist/lch_searchdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_searchdialog.png
index 6392a834ce94..6392a834ce94 100644
--- a/default_images/res/commandimagelist/lch_searchdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_searchdialog.png
diff --git a/default_images/res/commandimagelist/lch_sectionalignbottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionalignbottom.png
index 4f3a375090f2..4f3a375090f2 100644
--- a/default_images/res/commandimagelist/lch_sectionalignbottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionalignbottom.png
diff --git a/default_images/res/commandimagelist/lch_sectionalignleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionalignleft.png
index ea05965cf840..ea05965cf840 100644
--- a/default_images/res/commandimagelist/lch_sectionalignleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionalignleft.png
diff --git a/default_images/res/commandimagelist/lch_sectionalignright.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionalignright.png
index c73689b46daf..c73689b46daf 100644
--- a/default_images/res/commandimagelist/lch_sectionalignright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionalignright.png
diff --git a/default_images/res/commandimagelist/lch_sectionaligntop.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionaligntop.png
index 1e33a0dd2229..1e33a0dd2229 100644
--- a/default_images/res/commandimagelist/lch_sectionaligntop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionaligntop.png
diff --git a/default_images/res/commandimagelist/lch_sectionshrink.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionshrink.png
index 19affdf918f6..19affdf918f6 100644
--- a/default_images/res/commandimagelist/lch_sectionshrink.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionshrink.png
diff --git a/default_images/res/commandimagelist/lch_sectionshrinkbottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionshrinkbottom.png
index 2f468938fdf0..2f468938fdf0 100644
--- a/default_images/res/commandimagelist/lch_sectionshrinkbottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionshrinkbottom.png
diff --git a/default_images/res/commandimagelist/lch_sectionshrinktop.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionshrinktop.png
index 8ea155b2ddbc..8ea155b2ddbc 100644
--- a/default_images/res/commandimagelist/lch_sectionshrinktop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionshrinktop.png
diff --git a/default_images/res/commandimagelist/lch_selectall.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_selectall.png
index b4ec2fa8171d..b4ec2fa8171d 100644
--- a/default_images/res/commandimagelist/lch_selectall.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_selectall.png
diff --git a/default_images/res/commandimagelist/lch_selectmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_selectmode.png
index f04e1c79aed8..f04e1c79aed8 100644
--- a/default_images/res/commandimagelist/lch_selectmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_selectmode.png
diff --git a/default_images/res/commandimagelist/lch_selectobject.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_selectobject.png
index eb965188f8a0..eb965188f8a0 100644
--- a/default_images/res/commandimagelist/lch_selectobject.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_selectobject.png
diff --git a/default_images/res/commandimagelist/lch_selecttable.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_selecttable.png
index bf9d3f0896ea..bf9d3f0896ea 100644
--- a/default_images/res/commandimagelist/lch_selecttable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_selecttable.png
diff --git a/default_images/res/commandimagelist/lch_sendfax.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sendfax.png
index c5a25f1bf070..c5a25f1bf070 100644
--- a/default_images/res/commandimagelist/lch_sendfax.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sendfax.png
diff --git a/default_images/res/commandimagelist/lch_sendmail.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sendmail.png
index a8db064523b1..a8db064523b1 100644
--- a/default_images/res/commandimagelist/lch_sendmail.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sendmail.png
diff --git a/default_images/res/commandimagelist/lch_sendtoback.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sendtoback.png
index f0c5a60f9647..f0c5a60f9647 100644
--- a/default_images/res/commandimagelist/lch_sendtoback.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sendtoback.png
diff --git a/default_images/res/commandimagelist/lch_setborderstyle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setborderstyle.png
index 16e46170710f..16e46170710f 100644
--- a/default_images/res/commandimagelist/lch_setborderstyle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setborderstyle.png
diff --git a/default_images/res/commandimagelist/lch_setdocumentproperties.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setdocumentproperties.png
index 6fc57645c46c..6fc57645c46c 100644
--- a/default_images/res/commandimagelist/lch_setdocumentproperties.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setdocumentproperties.png
diff --git a/default_images/res/commandimagelist/lch_setobjecttobackground.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setobjecttobackground.png
index 1513994a7b43..1513994a7b43 100644
--- a/default_images/res/commandimagelist/lch_setobjecttobackground.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setobjecttobackground.png
diff --git a/default_images/res/commandimagelist/lch_setobjecttoforeground.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setobjecttoforeground.png
index 9964b1e0877b..9964b1e0877b 100644
--- a/default_images/res/commandimagelist/lch_setobjecttoforeground.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setobjecttoforeground.png
diff --git a/default_images/res/commandimagelist/lch_setoptimalcolumnwidth.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setoptimalcolumnwidth.png
index f7a8c17b75fc..f7a8c17b75fc 100644
--- a/default_images/res/commandimagelist/lch_setoptimalcolumnwidth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setoptimalcolumnwidth.png
diff --git a/default_images/res/commandimagelist/lch_setoptimalcolumnwidthdirect.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setoptimalcolumnwidthdirect.png
index 7f8a585061bd..7f8a585061bd 100644
--- a/default_images/res/commandimagelist/lch_setoptimalcolumnwidthdirect.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setoptimalcolumnwidthdirect.png
diff --git a/default_images/res/commandimagelist/lch_setoptimalrowheight.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setoptimalrowheight.png
index d4ef90e61997..d4ef90e61997 100644
--- a/default_images/res/commandimagelist/lch_setoptimalrowheight.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setoptimalrowheight.png
diff --git a/default_images/res/commandimagelist/lch_shadowcursor.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_shadowcursor.png
index 24d77cf14855..24d77cf14855 100644
--- a/default_images/res/commandimagelist/lch_shadowcursor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_shadowcursor.png
diff --git a/default_images/res/commandimagelist/lch_shadowed.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_shadowed.png
index 1bb802ddfc69..1bb802ddfc69 100644
--- a/default_images/res/commandimagelist/lch_shadowed.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_shadowed.png
diff --git a/default_images/res/commandimagelist/lch_shear.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_shear.png
index 94c82aba07d3..94c82aba07d3 100644
--- a/default_images/res/commandimagelist/lch_shear.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_shear.png
diff --git a/default_images/res/commandimagelist/lch_shell3d.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_shell3d.png
index e82dd27be38b..e82dd27be38b 100644
--- a/default_images/res/commandimagelist/lch_shell3d.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_shell3d.png
diff --git a/default_images/res/commandimagelist/lch_showannotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showannotation.png
index 7c12bb0decf7..7c12bb0decf7 100644
--- a/default_images/res/commandimagelist/lch_showannotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showannotation.png
diff --git a/default_images/res/commandimagelist/lch_showbookview.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showbookview.png
index 7b00e601b170..7b00e601b170 100644
--- a/default_images/res/commandimagelist/lch_showbookview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showbookview.png
diff --git a/default_images/res/commandimagelist/lch_showbrowser.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showbrowser.png
index 2e3f431ae631..2e3f431ae631 100644
--- a/default_images/res/commandimagelist/lch_showbrowser.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showbrowser.png
diff --git a/default_images/res/commandimagelist/lch_showdatanavigator.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showdatanavigator.png
index 3e705d147da0..3e705d147da0 100644
--- a/default_images/res/commandimagelist/lch_showdatanavigator.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showdatanavigator.png
diff --git a/default_images/res/commandimagelist/lch_showfmexplorer.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showfmexplorer.png
index 3e8dae47e01f..3e8dae47e01f 100644
--- a/default_images/res/commandimagelist/lch_showfmexplorer.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showfmexplorer.png
diff --git a/default_images/res/commandimagelist/lch_showmultiplepages.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showmultiplepages.png
index 7226eeaba4af..7226eeaba4af 100644
--- a/default_images/res/commandimagelist/lch_showmultiplepages.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showmultiplepages.png
diff --git a/default_images/res/commandimagelist/lch_showpropbrowser.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showpropbrowser.png
index 84271204703f..84271204703f 100644
--- a/default_images/res/commandimagelist/lch_showpropbrowser.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showpropbrowser.png
diff --git a/default_images/res/commandimagelist/lch_showslide.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showslide.png
index c0b2decb4718..c0b2decb4718 100644
--- a/default_images/res/commandimagelist/lch_showslide.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showslide.png
diff --git a/default_images/res/commandimagelist/lch_showtwopages.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showtwopages.png
index 474b0d4d756e..474b0d4d756e 100644
--- a/default_images/res/commandimagelist/lch_showtwopages.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showtwopages.png
diff --git a/default_images/res/commandimagelist/lch_shrink.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_shrink.png
index 73de1b5a7ae6..73de1b5a7ae6 100644
--- a/default_images/res/commandimagelist/lch_shrink.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_shrink.png
diff --git a/default_images/res/commandimagelist/lch_smallestheight.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_smallestheight.png
index 0beb459fa8a8..0beb459fa8a8 100644
--- a/default_images/res/commandimagelist/lch_smallestheight.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_smallestheight.png
diff --git a/default_images/res/commandimagelist/lch_smallestwidth.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_smallestwidth.png
index 793d24c027a5..793d24c027a5 100644
--- a/default_images/res/commandimagelist/lch_smallestwidth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_smallestwidth.png
diff --git a/default_images/res/commandimagelist/lch_snapborder.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_snapborder.png
index e93977f60ae0..e93977f60ae0 100644
--- a/default_images/res/commandimagelist/lch_snapborder.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_snapborder.png
diff --git a/default_images/res/commandimagelist/lch_snapframe.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_snapframe.png
index cb2559f10e3c..cb2559f10e3c 100644
--- a/default_images/res/commandimagelist/lch_snapframe.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_snapframe.png
diff --git a/default_images/res/commandimagelist/lch_snappoints.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_snappoints.png
index 384c36c204f9..384c36c204f9 100644
--- a/default_images/res/commandimagelist/lch_snappoints.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_snappoints.png
diff --git a/default_images/res/commandimagelist/lch_solidcreate.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_solidcreate.png
index 1b8bbb7ac76b..1b8bbb7ac76b 100644
--- a/default_images/res/commandimagelist/lch_solidcreate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_solidcreate.png
diff --git a/default_images/res/commandimagelist/lch_sortascending.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sortascending.png
index e831f90cecb7..e831f90cecb7 100644
--- a/default_images/res/commandimagelist/lch_sortascending.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sortascending.png
diff --git a/default_images/res/commandimagelist/lch_sortdescending.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sortdescending.png
index 4359b34c8b96..4359b34c8b96 100644
--- a/default_images/res/commandimagelist/lch_sortdescending.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sortdescending.png
diff --git a/default_images/res/commandimagelist/lch_sortdown.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sortdown.png
index c4402ef7737c..c4402ef7737c 100644
--- a/default_images/res/commandimagelist/lch_sortdown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sortdown.png
diff --git a/default_images/res/commandimagelist/lch_sortup.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sortup.png
index 2b95a2600027..2b95a2600027 100644
--- a/default_images/res/commandimagelist/lch_sortup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sortup.png
diff --git a/default_images/res/commandimagelist/lch_sourceview.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sourceview.png
index 7a207fd42d7a..7a207fd42d7a 100644
--- a/default_images/res/commandimagelist/lch_sourceview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sourceview.png
diff --git a/default_images/res/commandimagelist/lch_spacepara1.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spacepara1.png
index b2e95db780c3..b2e95db780c3 100644
--- a/default_images/res/commandimagelist/lch_spacepara1.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spacepara1.png
diff --git a/default_images/res/commandimagelist/lch_spacepara15.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spacepara15.png
index f45eaeb8badc..f45eaeb8badc 100644
--- a/default_images/res/commandimagelist/lch_spacepara15.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spacepara15.png
diff --git a/default_images/res/commandimagelist/lch_spacepara2.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spacepara2.png
index 191cf44563d5..191cf44563d5 100644
--- a/default_images/res/commandimagelist/lch_spacepara2.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spacepara2.png
diff --git a/default_images/res/commandimagelist/lch_spelldialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spelldialog.png
index ab0f02b22d14..ab0f02b22d14 100644
--- a/default_images/res/commandimagelist/lch_spelldialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spelldialog.png
diff --git a/default_images/res/commandimagelist/lch_spelling.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spelling.png
index ab0f02b22d14..ab0f02b22d14 100644
--- a/default_images/res/commandimagelist/lch_spelling.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spelling.png
diff --git a/default_images/res/commandimagelist/lch_spellingandgrammardialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spellingandgrammardialog.png
index ab0f02b22d14..ab0f02b22d14 100644
--- a/default_images/res/commandimagelist/lch_spellingandgrammardialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spellingandgrammardialog.png
diff --git a/default_images/res/commandimagelist/lch_spellonline.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spellonline.png
index 3804f77e343a..3804f77e343a 100644
--- a/default_images/res/commandimagelist/lch_spellonline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spellonline.png
diff --git a/default_images/res/commandimagelist/lch_sphere.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sphere.png
index 0b3af098ff6b..0b3af098ff6b 100644
--- a/default_images/res/commandimagelist/lch_sphere.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sphere.png
diff --git a/default_images/res/commandimagelist/lch_spinbutton.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spinbutton.png
index 363ebb19c1b2..363ebb19c1b2 100644
--- a/default_images/res/commandimagelist/lch_spinbutton.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spinbutton.png
diff --git a/default_images/res/commandimagelist/lch_splitcell.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_splitcell.png
index 7a25f88119ff..7a25f88119ff 100644
--- a/default_images/res/commandimagelist/lch_splitcell.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_splitcell.png
diff --git a/default_images/res/commandimagelist/lch_splithorizontal.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_splithorizontal.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_splithorizontal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_splithorizontal.png
diff --git a/default_images/res/commandimagelist/lch_splitparenthorizontal.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_splitparenthorizontal.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_splitparenthorizontal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_splitparenthorizontal.png
diff --git a/default_images/res/commandimagelist/lch_splitparentvertical.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_splitparentvertical.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_splitparentvertical.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_splitparentvertical.png
diff --git a/default_images/res/commandimagelist/lch_splitvertical.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_splitvertical.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_splitvertical.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_splitvertical.png
diff --git a/default_images/res/commandimagelist/lch_square.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_square.png
index 57b939d774cb..57b939d774cb 100644
--- a/default_images/res/commandimagelist/lch_square.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_square.png
diff --git a/default_images/res/commandimagelist/lch_square_rounded.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_square_rounded.png
index 429f9bbfe20b..429f9bbfe20b 100644
--- a/default_images/res/commandimagelist/lch_square_rounded.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_square_rounded.png
diff --git a/default_images/res/commandimagelist/lch_square_rounded_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_square_rounded_unfilled.png
index 317d7c9992b2..317d7c9992b2 100644
--- a/default_images/res/commandimagelist/lch_square_rounded_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_square_rounded_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_square_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_square_unfilled.png
index 8ee3fe7a4cce..8ee3fe7a4cce 100644
--- a/default_images/res/commandimagelist/lch_square_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_square_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_starchartdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starchartdialog.png
index d5ca8ff8e96c..d5ca8ff8e96c 100644
--- a/default_images/res/commandimagelist/lch_starchartdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starchartdialog.png
diff --git a/default_images/res/commandimagelist/lch_starshapes.bang.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.bang.png
index 9f51f683f09e..9f51f683f09e 100644
--- a/default_images/res/commandimagelist/lch_starshapes.bang.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.bang.png
diff --git a/default_images/res/commandimagelist/lch_starshapes.concave-star6.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.concave-star6.png
index 98ca635d2fb1..98ca635d2fb1 100644
--- a/default_images/res/commandimagelist/lch_starshapes.concave-star6.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.concave-star6.png
diff --git a/default_images/res/commandimagelist/lch_starshapes.doorplate.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.doorplate.png
index f4ad37768e04..f4ad37768e04 100644
--- a/default_images/res/commandimagelist/lch_starshapes.doorplate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.doorplate.png
diff --git a/default_images/res/commandimagelist/lch_starshapes.horizontal-scroll.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.horizontal-scroll.png
index d2ec842d0116..d2ec842d0116 100644
--- a/default_images/res/commandimagelist/lch_starshapes.horizontal-scroll.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.horizontal-scroll.png
diff --git a/default_images/res/commandimagelist/lch_starshapes.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.png
index 17df0ea360d0..17df0ea360d0 100644
--- a/default_images/res/commandimagelist/lch_starshapes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.png
diff --git a/default_images/res/commandimagelist/lch_starshapes.signet.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.signet.png
index 9c1ef05a9a26..9c1ef05a9a26 100644
--- a/default_images/res/commandimagelist/lch_starshapes.signet.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.signet.png
diff --git a/default_images/res/commandimagelist/lch_starshapes.star12.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.star12.png
index b31b5b317d81..b31b5b317d81 100644
--- a/default_images/res/commandimagelist/lch_starshapes.star12.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.star12.png
diff --git a/default_images/res/commandimagelist/lch_starshapes.star24.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.star24.png
index f8120b1bb136..f8120b1bb136 100644
--- a/default_images/res/commandimagelist/lch_starshapes.star24.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.star24.png
diff --git a/default_images/res/commandimagelist/lch_starshapes.star4.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.star4.png
index 42cdbac8b47f..42cdbac8b47f 100644
--- a/default_images/res/commandimagelist/lch_starshapes.star4.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.star4.png
diff --git a/default_images/res/commandimagelist/lch_starshapes.star5.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.star5.png
index 3fffaefc699c..3fffaefc699c 100644
--- a/default_images/res/commandimagelist/lch_starshapes.star5.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.star5.png
diff --git a/default_images/res/commandimagelist/lch_starshapes.star6.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.star6.png
index 8f1e5987019d..8f1e5987019d 100644
--- a/default_images/res/commandimagelist/lch_starshapes.star6.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.star6.png
diff --git a/default_images/res/commandimagelist/lch_starshapes.star8.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.star8.png
index b4e1b157d04e..b4e1b157d04e 100644
--- a/default_images/res/commandimagelist/lch_starshapes.star8.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.star8.png
diff --git a/default_images/res/commandimagelist/lch_starshapes.vertical-scroll.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.vertical-scroll.png
index c57cc2927b34..c57cc2927b34 100644
--- a/default_images/res/commandimagelist/lch_starshapes.vertical-scroll.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.vertical-scroll.png
diff --git a/default_images/res/commandimagelist/lch_strikeout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_strikeout.png
index 1a6468db23cf..1a6468db23cf 100644
--- a/default_images/res/commandimagelist/lch_strikeout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_strikeout.png
diff --git a/default_images/res/commandimagelist/lch_styleapply.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_styleapply.png
index 2feb2b0b85cf..2feb2b0b85cf 100644
--- a/default_images/res/commandimagelist/lch_styleapply.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_styleapply.png
diff --git a/default_images/res/commandimagelist/lch_stylenewbyexample.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_stylenewbyexample.png
index c55e3112d07c..c55e3112d07c 100644
--- a/default_images/res/commandimagelist/lch_stylenewbyexample.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_stylenewbyexample.png
diff --git a/default_images/res/commandimagelist/lch_styleupdatebyexample.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_styleupdatebyexample.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_styleupdatebyexample.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_styleupdatebyexample.png
diff --git a/default_images/res/commandimagelist/lch_subscript.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_subscript.png
index 7c5b66468331..7c5b66468331 100644
--- a/default_images/res/commandimagelist/lch_subscript.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_subscript.png
diff --git a/default_images/res/commandimagelist/lch_superscript.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_superscript.png
index 46920237b587..46920237b587 100644
--- a/default_images/res/commandimagelist/lch_superscript.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_superscript.png
diff --git a/default_images/res/commandimagelist/lch_switchcontroldesignmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_switchcontroldesignmode.png
index fd8864cc579c..fd8864cc579c 100644
--- a/default_images/res/commandimagelist/lch_switchcontroldesignmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_switchcontroldesignmode.png
diff --git a/default_images/res/commandimagelist/lch_switchxformsdesignmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_switchxformsdesignmode.png
index fd8864cc579c..fd8864cc579c 100644
--- a/default_images/res/commandimagelist/lch_switchxformsdesignmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_switchxformsdesignmode.png
diff --git a/default_images/res/commandimagelist/lch_symbolcatalogue.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolcatalogue.png
index 8221b0fe5c10..8221b0fe5c10 100644
--- a/default_images/res/commandimagelist/lch_symbolcatalogue.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolcatalogue.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.brace-pair.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.brace-pair.png
index accae4d96318..accae4d96318 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.brace-pair.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.brace-pair.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.bracket-pair.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.bracket-pair.png
index 40f62798c26a..40f62798c26a 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.bracket-pair.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.bracket-pair.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.cloud.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.cloud.png
index 767dd84a975b..767dd84a975b 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.cloud.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.cloud.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.diamond-bevel.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.diamond-bevel.png
index e9f66bd1de7e..e9f66bd1de7e 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.diamond-bevel.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.diamond-bevel.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.flower.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.flower.png
index 3b2f50f67505..3b2f50f67505 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.flower.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.flower.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.forbidden.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.forbidden.png
index 4087574739e2..4087574739e2 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.forbidden.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.forbidden.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.heart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.heart.png
index 56096a3c3476..56096a3c3476 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.heart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.heart.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.left-brace.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.left-brace.png
index 7404d0ed8930..7404d0ed8930 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.left-brace.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.left-brace.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.left-bracket.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.left-bracket.png
index 6efc2e029b6f..6efc2e029b6f 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.left-bracket.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.left-bracket.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.lightning.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.lightning.png
index 41367d3206b0..41367d3206b0 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.lightning.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.lightning.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.moon.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.moon.png
index 3675ee1aad30..3675ee1aad30 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.moon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.moon.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.octagon-bevel.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.octagon-bevel.png
index 07c012602e60..07c012602e60 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.octagon-bevel.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.octagon-bevel.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.png
index f9e7c599adc6..f9e7c599adc6 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.puzzle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.puzzle.png
index b5116a124315..b5116a124315 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.puzzle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.puzzle.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.quad-bevel.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.quad-bevel.png
index cd57d069f14f..cd57d069f14f 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.quad-bevel.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.quad-bevel.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.right-brace.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.right-brace.png
index 96b0b4e3f2de..96b0b4e3f2de 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.right-brace.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.right-brace.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.right-bracket.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.right-bracket.png
index 1a421de7f51d..1a421de7f51d 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.right-bracket.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.right-bracket.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.smiley.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.smiley.png
index 565340220474..565340220474 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.smiley.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.smiley.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.sun.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.sun.png
index d2f3f7418634..d2f3f7418634 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.sun.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.sun.png
diff --git a/default_images/res/commandimagelist/lch_tabdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tabdialog.png
index 8f28d9730890..8f28d9730890 100644
--- a/default_images/res/commandimagelist/lch_tabdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tabdialog.png
diff --git a/default_images/res/commandimagelist/lch_tabledesign.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tabledesign.png
index 5ff782358614..5ff782358614 100644
--- a/default_images/res/commandimagelist/lch_tabledesign.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tabledesign.png
diff --git a/default_images/res/commandimagelist/lch_tabledialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tabledialog.png
index e5bf420f6101..e5bf420f6101 100644
--- a/default_images/res/commandimagelist/lch_tabledialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tabledialog.png
diff --git a/default_images/res/commandimagelist/lch_tablemodefix.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tablemodefix.png
index 3c60b16c1fa9..3c60b16c1fa9 100644
--- a/default_images/res/commandimagelist/lch_tablemodefix.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tablemodefix.png
diff --git a/default_images/res/commandimagelist/lch_tablemodefixprop.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tablemodefixprop.png
index 51927f7d3cc9..51927f7d3cc9 100644
--- a/default_images/res/commandimagelist/lch_tablemodefixprop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tablemodefixprop.png
diff --git a/default_images/res/commandimagelist/lch_tablemodevariable.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tablemodevariable.png
index a6a349c55ea3..a6a349c55ea3 100644
--- a/default_images/res/commandimagelist/lch_tablemodevariable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tablemodevariable.png
diff --git a/default_images/res/commandimagelist/lch_tablesort.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tablesort.png
index e54d5a57f1c4..e54d5a57f1c4 100644
--- a/default_images/res/commandimagelist/lch_tablesort.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tablesort.png
diff --git a/default_images/res/commandimagelist/lch_testmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_testmode.png
index fd8864cc579c..fd8864cc579c 100644
--- a/default_images/res/commandimagelist/lch_testmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_testmode.png
diff --git a/default_images/res/commandimagelist/lch_text.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_text.png
index 501d2c95ffd5..501d2c95ffd5 100644
--- a/default_images/res/commandimagelist/lch_text.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_text.png
diff --git a/default_images/res/commandimagelist/lch_text_marquee.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_text_marquee.png
index 1fbfacbfd370..1fbfacbfd370 100644
--- a/default_images/res/commandimagelist/lch_text_marquee.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_text_marquee.png
diff --git a/default_images/res/commandimagelist/lch_textdirectionlefttoright.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_textdirectionlefttoright.png
index a081fc68e710..a081fc68e710 100644
--- a/default_images/res/commandimagelist/lch_textdirectionlefttoright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_textdirectionlefttoright.png
diff --git a/default_images/res/commandimagelist/lch_textdirectiontoptobottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_textdirectiontoptobottom.png
index d2d9a0a3d170..d2d9a0a3d170 100644
--- a/default_images/res/commandimagelist/lch_textdirectiontoptobottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_textdirectiontoptobottom.png
diff --git a/default_images/res/commandimagelist/lch_textfittosizetool.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_textfittosizetool.png
index 7ad4323c1a02..7ad4323c1a02 100644
--- a/default_images/res/commandimagelist/lch_textfittosizetool.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_textfittosizetool.png
diff --git a/default_images/res/commandimagelist/lch_texttoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_texttoolbox.png
index 501d2c95ffd5..501d2c95ffd5 100644
--- a/default_images/res/commandimagelist/lch_texttoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_texttoolbox.png
diff --git a/default_images/res/commandimagelist/lch_thesaurus.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_thesaurus.png
index b1a0be3bbe14..b1a0be3bbe14 100644
--- a/default_images/res/commandimagelist/lch_thesaurus.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_thesaurus.png
diff --git a/default_images/res/commandimagelist/lch_thesaurusdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_thesaurusdialog.png
index 53c6f894e219..53c6f894e219 100644
--- a/default_images/res/commandimagelist/lch_thesaurusdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_thesaurusdialog.png
diff --git a/default_images/res/commandimagelist/lch_timefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_timefield.png
index edc4dd6dd285..edc4dd6dd285 100644
--- a/default_images/res/commandimagelist/lch_timefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_timefield.png
diff --git a/default_images/res/commandimagelist/lch_toggleanchortype.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toggleanchortype.png
index d197c59b13f6..d197c59b13f6 100644
--- a/default_images/res/commandimagelist/lch_toggleanchortype.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toggleanchortype.png
diff --git a/default_images/res/commandimagelist/lch_toggleaxisdescr.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toggleaxisdescr.png
index a14420796089..a14420796089 100644
--- a/default_images/res/commandimagelist/lch_toggleaxisdescr.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toggleaxisdescr.png
diff --git a/default_images/res/commandimagelist/lch_toggleaxistitle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toggleaxistitle.png
index 32315ab3de66..32315ab3de66 100644
--- a/default_images/res/commandimagelist/lch_toggleaxistitle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toggleaxistitle.png
diff --git a/default_images/res/commandimagelist/lch_togglebreakpoint.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_togglebreakpoint.png
index 799d3803ea13..799d3803ea13 100644
--- a/default_images/res/commandimagelist/lch_togglebreakpoint.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_togglebreakpoint.png
diff --git a/default_images/res/commandimagelist/lch_togglegridhorizontal.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_togglegridhorizontal.png
index bf70d699653c..bf70d699653c 100644
--- a/default_images/res/commandimagelist/lch_togglegridhorizontal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_togglegridhorizontal.png
diff --git a/default_images/res/commandimagelist/lch_togglegridvertical.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_togglegridvertical.png
index 9684a5911bfe..9684a5911bfe 100644
--- a/default_images/res/commandimagelist/lch_togglegridvertical.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_togglegridvertical.png
diff --git a/default_images/res/commandimagelist/lch_togglelegend.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_togglelegend.png
index 619b07779ce8..619b07779ce8 100644
--- a/default_images/res/commandimagelist/lch_togglelegend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_togglelegend.png
diff --git a/default_images/res/commandimagelist/lch_togglemergecells.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_togglemergecells.png
index 1003d3c39f8b..1003d3c39f8b 100644
--- a/default_images/res/commandimagelist/lch_togglemergecells.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_togglemergecells.png
diff --git a/default_images/res/commandimagelist/lch_toggleobjectbeziermode.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toggleobjectbeziermode.png
index 2256033c5d73..2256033c5d73 100644
--- a/default_images/res/commandimagelist/lch_toggleobjectbeziermode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toggleobjectbeziermode.png
diff --git a/default_images/res/commandimagelist/lch_toggleobjectrotatemode.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toggleobjectrotatemode.png
index 61c9ce4fd14c..61c9ce4fd14c 100644
--- a/default_images/res/commandimagelist/lch_toggleobjectrotatemode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toggleobjectrotatemode.png
diff --git a/default_images/res/commandimagelist/lch_togglesheetgrid.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_togglesheetgrid.png
index 85ab79189176..85ab79189176 100644
--- a/default_images/res/commandimagelist/lch_togglesheetgrid.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_togglesheetgrid.png
diff --git a/default_images/res/commandimagelist/lch_toggletitle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toggletitle.png
index d0ece01e6bee..d0ece01e6bee 100644
--- a/default_images/res/commandimagelist/lch_toggletitle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toggletitle.png
diff --git a/default_images/res/commandimagelist/lch_toolsmacroedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toolsmacroedit.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_toolsmacroedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toolsmacroedit.png
diff --git a/default_images/res/commandimagelist/lch_toolsoptions.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toolsoptions.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_toolsoptions.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toolsoptions.png
diff --git a/default_images/res/commandimagelist/lch_torus.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_torus.png
index 48b09f3b7f0f..48b09f3b7f0f 100644
--- a/default_images/res/commandimagelist/lch_torus.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_torus.png
diff --git a/default_images/res/commandimagelist/lch_transformdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_transformdialog.png
index 870f26eab8c1..870f26eab8c1 100644
--- a/default_images/res/commandimagelist/lch_transformdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_transformdialog.png
diff --git a/default_images/res/commandimagelist/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_underline.png
index 4a6b12fa433b..4a6b12fa433b 100644
--- a/default_images/res/commandimagelist/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_underline.png
diff --git a/default_images/res/commandimagelist/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_underlinedouble.png
index 5bcacbf9fa64..5bcacbf9fa64 100644
--- a/default_images/res/commandimagelist/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/lch_undo.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_undo.png
index 19043e9f6cc7..19043e9f6cc7 100644
--- a/default_images/res/commandimagelist/lch_undo.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_undo.png
diff --git a/default_images/res/commandimagelist/lch_ungroup.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ungroup.png
index 5151aca6c0b7..5151aca6c0b7 100644
--- a/default_images/res/commandimagelist/lch_ungroup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ungroup.png
diff --git a/default_images/res/commandimagelist/lch_unhainframes.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_unhainframes.png
index 2cf3cc4de408..2cf3cc4de408 100644
--- a/default_images/res/commandimagelist/lch_unhainframes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_unhainframes.png
diff --git a/default_images/res/commandimagelist/lch_upsearch.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_upsearch.png
index d15f2fa9d7c9..d15f2fa9d7c9 100644
--- a/default_images/res/commandimagelist/lch_upsearch.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_upsearch.png
diff --git a/default_images/res/commandimagelist/lch_urlbutton.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_urlbutton.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_urlbutton.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_urlbutton.png
diff --git a/default_images/res/commandimagelist/lch_usewizards.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_usewizards.png
index ef183ad55ace..ef183ad55ace 100644
--- a/default_images/res/commandimagelist/lch_usewizards.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_usewizards.png
diff --git a/default_images/res/commandimagelist/lch_verticalcaption.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_verticalcaption.png
index 4dbd366aabbe..4dbd366aabbe 100644
--- a/default_images/res/commandimagelist/lch_verticalcaption.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_verticalcaption.png
diff --git a/default_images/res/commandimagelist/lch_verticaltext.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_verticaltext.png
index d4fa48558d62..d4fa48558d62 100644
--- a/default_images/res/commandimagelist/lch_verticaltext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_verticaltext.png
diff --git a/default_images/res/commandimagelist/lch_verticaltextfittosizetool.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_verticaltextfittosizetool.png
index 2791e6e7f83b..2791e6e7f83b 100644
--- a/default_images/res/commandimagelist/lch_verticaltextfittosizetool.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_verticaltextfittosizetool.png
diff --git a/default_images/res/commandimagelist/lch_vfixedline.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_vfixedline.png
index aea0f339ef5c..aea0f339ef5c 100644
--- a/default_images/res/commandimagelist/lch_vfixedline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_vfixedline.png
diff --git a/default_images/res/commandimagelist/lch_view100.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_view100.png
index 33af72d31e51..33af72d31e51 100644
--- a/default_images/res/commandimagelist/lch_view100.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_view100.png
diff --git a/default_images/res/commandimagelist/lch_viewdatasourcebrowser.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_viewdatasourcebrowser.png
index 73115f94ef51..73115f94ef51 100644
--- a/default_images/res/commandimagelist/lch_viewdatasourcebrowser.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_viewdatasourcebrowser.png
diff --git a/default_images/res/commandimagelist/lch_viewformasgrid.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_viewformasgrid.png
index 889664bc1971..889664bc1971 100644
--- a/default_images/res/commandimagelist/lch_viewformasgrid.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_viewformasgrid.png
diff --git a/default_images/res/commandimagelist/lch_vscrollbar.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_vscrollbar.png
index ffba6ae86c00..ffba6ae86c00 100644
--- a/default_images/res/commandimagelist/lch_vscrollbar.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_vscrollbar.png
diff --git a/default_images/res/commandimagelist/lch_window3d.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_window3d.png
index 80f6752e8a22..80f6752e8a22 100644
--- a/default_images/res/commandimagelist/lch_window3d.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_window3d.png
diff --git a/default_images/res/commandimagelist/lch_wrapcontour.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapcontour.png
index f0d2aca5846e..f0d2aca5846e 100644
--- a/default_images/res/commandimagelist/lch_wrapcontour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapcontour.png
diff --git a/default_images/res/commandimagelist/lch_wrapideal.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapideal.png
index c0fa0f02c1a8..c0fa0f02c1a8 100644
--- a/default_images/res/commandimagelist/lch_wrapideal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapideal.png
diff --git a/default_images/res/commandimagelist/lch_wrapleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapleft.png
index 23d985b67be7..23d985b67be7 100644
--- a/default_images/res/commandimagelist/lch_wrapleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapleft.png
diff --git a/default_images/res/commandimagelist/lch_wrapoff.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapoff.png
index 59a2c67a46ea..59a2c67a46ea 100644
--- a/default_images/res/commandimagelist/lch_wrapoff.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapoff.png
diff --git a/default_images/res/commandimagelist/lch_wrapon.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapon.png
index c3c8ada7a569..c3c8ada7a569 100644
--- a/default_images/res/commandimagelist/lch_wrapon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapon.png
diff --git a/default_images/res/commandimagelist/lch_wrapright.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapright.png
index 564cf68f6fe2..564cf68f6fe2 100644
--- a/default_images/res/commandimagelist/lch_wrapright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapright.png
diff --git a/default_images/res/commandimagelist/lch_wrapthrough.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapthrough.png
index 55f9ab93c643..55f9ab93c643 100644
--- a/default_images/res/commandimagelist/lch_wrapthrough.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapthrough.png
diff --git a/default_images/res/commandimagelist/lch_xlinecolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_xlinecolor.png
index 1c8c05439184..1c8c05439184 100644
--- a/default_images/res/commandimagelist/lch_xlinecolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_xlinecolor.png
diff --git a/default_images/res/commandimagelist/lch_xlinestyle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_xlinestyle.png
index 98d6f8c4309f..98d6f8c4309f 100644
--- a/default_images/res/commandimagelist/lch_xlinestyle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_xlinestyle.png
diff --git a/default_images/res/commandimagelist/lch_zoom.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoom.png
index 67e7675cb166..67e7675cb166 100644
--- a/default_images/res/commandimagelist/lch_zoom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoom.png
diff --git a/default_images/res/commandimagelist/lch_zoom100percent.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoom100percent.png
index 37b82c84193a..37b82c84193a 100644
--- a/default_images/res/commandimagelist/lch_zoom100percent.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoom100percent.png
diff --git a/default_images/res/commandimagelist/lch_zoomin.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomin.png
index 6fe2a729cf64..6fe2a729cf64 100644
--- a/default_images/res/commandimagelist/lch_zoomin.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomin.png
diff --git a/default_images/res/commandimagelist/lch_zoomminus.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomminus.png
index ee427ddf6d46..ee427ddf6d46 100644
--- a/default_images/res/commandimagelist/lch_zoomminus.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomminus.png
diff --git a/default_images/res/commandimagelist/lch_zoomnext.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomnext.png
index 3bf3ad4534e4..3bf3ad4534e4 100644
--- a/default_images/res/commandimagelist/lch_zoomnext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomnext.png
diff --git a/default_images/res/commandimagelist/lch_zoomobjects.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomobjects.png
index 54cb6d8279b5..54cb6d8279b5 100644
--- a/default_images/res/commandimagelist/lch_zoomobjects.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomobjects.png
diff --git a/default_images/res/commandimagelist/lch_zoomoptimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomoptimal.png
index d0d6f41217ea..d0d6f41217ea 100644
--- a/default_images/res/commandimagelist/lch_zoomoptimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomoptimal.png
diff --git a/default_images/res/commandimagelist/lch_zoomout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomout.png
index 81ae2b2037af..81ae2b2037af 100644
--- a/default_images/res/commandimagelist/lch_zoomout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomout.png
diff --git a/default_images/res/commandimagelist/lch_zoompage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoompage.png
index a95a92c60e12..a95a92c60e12 100644
--- a/default_images/res/commandimagelist/lch_zoompage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoompage.png
diff --git a/default_images/res/commandimagelist/lch_zoompagewidth.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoompagewidth.png
index e693bfbbf700..e693bfbbf700 100644
--- a/default_images/res/commandimagelist/lch_zoompagewidth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoompagewidth.png
diff --git a/default_images/res/commandimagelist/lch_zoompanning.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoompanning.png
index 88e6a88530af..88e6a88530af 100644
--- a/default_images/res/commandimagelist/lch_zoompanning.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoompanning.png
diff --git a/default_images/res/commandimagelist/lch_zoomplus.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomplus.png
index 37e71dca7fd3..37e71dca7fd3 100644
--- a/default_images/res/commandimagelist/lch_zoomplus.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomplus.png
diff --git a/default_images/res/commandimagelist/lch_zoomprevious.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomprevious.png
index c0d522306b53..c0d522306b53 100644
--- a/default_images/res/commandimagelist/lch_zoomprevious.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomprevious.png
diff --git a/default_images/res/commandimagelist/lch_zoomtoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomtoolbox.png
index fa8e09684b80..fa8e09684b80 100644
--- a/default_images/res/commandimagelist/lch_zoomtoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomtoolbox.png
diff --git a/default_images/res/commandimagelist/nl/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/nl/lc_bold.png
index 7ef4f83c691f..7ef4f83c691f 100644
--- a/default_images/res/commandimagelist/nl/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/nl/lc_bold.png
diff --git a/default_images/res/commandimagelist/nl/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/nl/lc_italic.png
index fdac4232a904..fdac4232a904 100644
--- a/default_images/res/commandimagelist/nl/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/nl/lc_italic.png
diff --git a/default_images/res/commandimagelist/nl/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/nl/lc_underline.png
index 7f6098403980..7f6098403980 100644
--- a/default_images/res/commandimagelist/nl/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/nl/lc_underline.png
diff --git a/default_images/res/commandimagelist/nl/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/nl/lc_underlinedouble.png
index 2a7906c13a3a..2a7906c13a3a 100644
--- a/default_images/res/commandimagelist/nl/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/nl/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/nl/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/nl/sc_bold.png
index d953cb67ca15..d953cb67ca15 100644
--- a/default_images/res/commandimagelist/nl/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/nl/sc_bold.png
diff --git a/default_images/res/commandimagelist/nl/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/nl/sc_italic.png
index 221e37f23251..221e37f23251 100644
--- a/default_images/res/commandimagelist/nl/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/nl/sc_italic.png
diff --git a/default_images/res/commandimagelist/nl/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/nl/sc_underline.png
index 97baeae91af4..97baeae91af4 100644
--- a/default_images/res/commandimagelist/nl/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/nl/sc_underline.png
diff --git a/default_images/res/commandimagelist/nl/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/nl/sc_underlinedouble.png
index 051561c76f8f..051561c76f8f 100644
--- a/default_images/res/commandimagelist/nl/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/nl/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/pl/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/pl/lc_bold.png
index 4e30037a0ff1..4e30037a0ff1 100644
--- a/default_images/res/commandimagelist/pl/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pl/lc_bold.png
diff --git a/default_images/res/commandimagelist/pl/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/pl/lc_italic.png
index 71108004b9f3..71108004b9f3 100644
--- a/default_images/res/commandimagelist/pl/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pl/lc_italic.png
diff --git a/default_images/res/commandimagelist/pl/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/pl/lc_underline.png
index c05c2d7ae69c..c05c2d7ae69c 100644
--- a/default_images/res/commandimagelist/pl/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pl/lc_underline.png
diff --git a/default_images/res/commandimagelist/pl/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/pl/lc_underlinedouble.png
index 1042f6539ffa..1042f6539ffa 100644
--- a/default_images/res/commandimagelist/pl/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pl/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/pl/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/pl/sc_bold.png
index 421dbda38d6a..421dbda38d6a 100644
--- a/default_images/res/commandimagelist/pl/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pl/sc_bold.png
diff --git a/default_images/res/commandimagelist/pl/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/pl/sc_italic.png
index 7c9e9374adca..7c9e9374adca 100644
--- a/default_images/res/commandimagelist/pl/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pl/sc_italic.png
diff --git a/default_images/res/commandimagelist/pl/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/pl/sc_underline.png
index d6c46520d2e5..d6c46520d2e5 100644
--- a/default_images/res/commandimagelist/pl/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pl/sc_underline.png
diff --git a/default_images/res/commandimagelist/pl/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/pl/sc_underlinedouble.png
index 38e97651aea2..38e97651aea2 100644
--- a/default_images/res/commandimagelist/pl/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pl/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/pt-BR/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/lc_bold.png
index 2fc3fcb763c5..2fc3fcb763c5 100644
--- a/default_images/res/commandimagelist/pt-BR/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/lc_bold.png
diff --git a/default_images/res/commandimagelist/pt-BR/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/lc_italic.png
index 0387f58cb164..0387f58cb164 100644
--- a/default_images/res/commandimagelist/pt-BR/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/lc_italic.png
diff --git a/default_images/res/commandimagelist/pt-BR/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/lc_underline.png
index 22380aa8140d..22380aa8140d 100644
--- a/default_images/res/commandimagelist/pt-BR/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/lc_underline.png
diff --git a/default_images/res/commandimagelist/pt-BR/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/lc_underlinedouble.png
index 3d73d9ace800..3d73d9ace800 100644
--- a/default_images/res/commandimagelist/pt-BR/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/pt-BR/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/sc_bold.png
index 66d0f0f8ed19..66d0f0f8ed19 100644
--- a/default_images/res/commandimagelist/pt-BR/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/sc_bold.png
diff --git a/default_images/res/commandimagelist/pt-BR/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/sc_italic.png
index f28583757725..f28583757725 100644
--- a/default_images/res/commandimagelist/pt-BR/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/sc_italic.png
diff --git a/default_images/res/commandimagelist/pt-BR/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/sc_underline.png
index be355a85731a..be355a85731a 100644
--- a/default_images/res/commandimagelist/pt-BR/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/sc_underline.png
diff --git a/default_images/res/commandimagelist/pt-BR/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/sc_underlinedouble.png
index e6ca7151c21a..e6ca7151c21a 100644
--- a/default_images/res/commandimagelist/pt-BR/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/pt/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt/lc_bold.png
index a02adca8d132..a02adca8d132 100644
--- a/default_images/res/commandimagelist/pt/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt/lc_bold.png
diff --git a/default_images/res/commandimagelist/pt/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt/lc_italic.png
index 0387f58cb164..0387f58cb164 100644
--- a/default_images/res/commandimagelist/pt/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt/lc_italic.png
diff --git a/default_images/res/commandimagelist/pt/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt/lc_underline.png
index cf70275afa8f..cf70275afa8f 100644
--- a/default_images/res/commandimagelist/pt/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt/lc_underline.png
diff --git a/default_images/res/commandimagelist/pt/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt/lc_underlinedouble.png
index 187cdae1747c..187cdae1747c 100644
--- a/default_images/res/commandimagelist/pt/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/pt/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt/sc_bold.png
index 66d0f0f8ed19..66d0f0f8ed19 100644
--- a/default_images/res/commandimagelist/pt/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt/sc_bold.png
diff --git a/default_images/res/commandimagelist/pt/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt/sc_italic.png
index d7c33542fc66..d7c33542fc66 100644
--- a/default_images/res/commandimagelist/pt/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt/sc_italic.png
diff --git a/default_images/res/commandimagelist/pt/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt/sc_underline.png
index be355a85731a..be355a85731a 100644
--- a/default_images/res/commandimagelist/pt/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt/sc_underline.png
diff --git a/default_images/res/commandimagelist/pt/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt/sc_underlinedouble.png
index f9e9ae49d21b..f9e9ae49d21b 100644
--- a/default_images/res/commandimagelist/pt/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/ru/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/ru/lc_bold.png
index 540131c41f5b..540131c41f5b 100644
--- a/default_images/res/commandimagelist/ru/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ru/lc_bold.png
diff --git a/default_images/res/commandimagelist/ru/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/ru/lc_italic.png
index 89e29ab49a23..89e29ab49a23 100644
--- a/default_images/res/commandimagelist/ru/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ru/lc_italic.png
diff --git a/default_images/res/commandimagelist/ru/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/ru/lc_underline.png
index 1803b52c19c2..1803b52c19c2 100644
--- a/default_images/res/commandimagelist/ru/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ru/lc_underline.png
diff --git a/default_images/res/commandimagelist/ru/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/ru/lc_underlinedouble.png
index 12aa4698dd4a..12aa4698dd4a 100644
--- a/default_images/res/commandimagelist/ru/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ru/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/ru/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/ru/sc_bold.png
index a66c42419251..a66c42419251 100644
--- a/default_images/res/commandimagelist/ru/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ru/sc_bold.png
diff --git a/default_images/res/commandimagelist/ru/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/ru/sc_italic.png
index 4e118592f355..4e118592f355 100644
--- a/default_images/res/commandimagelist/ru/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ru/sc_italic.png
diff --git a/default_images/res/commandimagelist/ru/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/ru/sc_underline.png
index 958a30b6d969..958a30b6d969 100644
--- a/default_images/res/commandimagelist/ru/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ru/sc_underline.png
diff --git a/default_images/res/commandimagelist/ru/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/ru/sc_underlinedouble.png
index 22b717e0f9c9..22b717e0f9c9 100644
--- a/default_images/res/commandimagelist/ru/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ru/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/sch_absoluterecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_absoluterecord.png
index 50cad4630ced..50cad4630ced 100644
--- a/default_images/res/commandimagelist/sch_absoluterecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_absoluterecord.png
diff --git a/default_images/res/commandimagelist/sch_actionmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_actionmode.png
index dd5b34c304b4..dd5b34c304b4 100644
--- a/default_images/res/commandimagelist/sch_actionmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_actionmode.png
diff --git a/default_images/res/commandimagelist/sch_addbookmark.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_addbookmark.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_addbookmark.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_addbookmark.png
diff --git a/default_images/res/commandimagelist/sch_adddatefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_adddatefield.png
index 12a8235c7d95..12a8235c7d95 100644
--- a/default_images/res/commandimagelist/sch_adddatefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_adddatefield.png
diff --git a/default_images/res/commandimagelist/sch_adddirect.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_adddirect.png
index e1802f421387..e1802f421387 100644
--- a/default_images/res/commandimagelist/sch_adddirect.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_adddirect.png
diff --git a/default_images/res/commandimagelist/sch_addfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_addfield.png
index 87e5f0ab1b5b..87e5f0ab1b5b 100644
--- a/default_images/res/commandimagelist/sch_addfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_addfield.png
diff --git a/default_images/res/commandimagelist/sch_addons.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_addons.png
index 6e2fae41cc62..6e2fae41cc62 100644
--- a/default_images/res/commandimagelist/sch_addons.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_addons.png
diff --git a/default_images/res/commandimagelist/sch_addprintarea.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_addprintarea.png
index 2ba16a01b51b..2ba16a01b51b 100644
--- a/default_images/res/commandimagelist/sch_addprintarea.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_addprintarea.png
diff --git a/default_images/res/commandimagelist/sch_addtable.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_addtable.png
index 432bbe32407c..432bbe32407c 100644
--- a/default_images/res/commandimagelist/sch_addtable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_addtable.png
diff --git a/default_images/res/commandimagelist/sch_addwatch.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_addwatch.png
index 99ea25d27e21..99ea25d27e21 100644
--- a/default_images/res/commandimagelist/sch_addwatch.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_addwatch.png
diff --git a/default_images/res/commandimagelist/sch_adjust.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_adjust.png
index fdaabf5f84f6..fdaabf5f84f6 100644
--- a/default_images/res/commandimagelist/sch_adjust.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_adjust.png
diff --git a/default_images/res/commandimagelist/sch_advancedmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_advancedmode.png
index c8e150f4830e..c8e150f4830e 100644
--- a/default_images/res/commandimagelist/sch_advancedmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_advancedmode.png
diff --git a/default_images/res/commandimagelist/sch_alignblock.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignblock.png
index 503bddbbd10c..503bddbbd10c 100644
--- a/default_images/res/commandimagelist/sch_alignblock.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignblock.png
diff --git a/default_images/res/commandimagelist/sch_alignbottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignbottom.png
index 85331353dea1..85331353dea1 100644
--- a/default_images/res/commandimagelist/sch_alignbottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignbottom.png
diff --git a/default_images/res/commandimagelist/sch_aligncenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_aligncenter.png
index 97bb71d9e94f..97bb71d9e94f 100644
--- a/default_images/res/commandimagelist/sch_aligncenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_aligncenter.png
diff --git a/default_images/res/commandimagelist/sch_aligndown.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_aligndown.png
index 82090bbd4750..82090bbd4750 100644
--- a/default_images/res/commandimagelist/sch_aligndown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_aligndown.png
diff --git a/default_images/res/commandimagelist/sch_alignhorizontalcenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignhorizontalcenter.png
index 6cf6ba71cef7..6cf6ba71cef7 100644
--- a/default_images/res/commandimagelist/sch_alignhorizontalcenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignhorizontalcenter.png
diff --git a/default_images/res/commandimagelist/sch_alignleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignleft.png
index 32cbbf9f5d2b..32cbbf9f5d2b 100644
--- a/default_images/res/commandimagelist/sch_alignleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignleft.png
diff --git a/default_images/res/commandimagelist/sch_alignmiddle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignmiddle.png
index 98abb5b47b19..98abb5b47b19 100644
--- a/default_images/res/commandimagelist/sch_alignmiddle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignmiddle.png
diff --git a/default_images/res/commandimagelist/sch_alignright.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignright.png
index 89cdc084247b..89cdc084247b 100644
--- a/default_images/res/commandimagelist/sch_alignright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignright.png
diff --git a/default_images/res/commandimagelist/sch_aligntop.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_aligntop.png
index 3959925b9832..3959925b9832 100644
--- a/default_images/res/commandimagelist/sch_aligntop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_aligntop.png
diff --git a/default_images/res/commandimagelist/sch_alignup.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignup.png
index 6a45c5dabf0d..6a45c5dabf0d 100644
--- a/default_images/res/commandimagelist/sch_alignup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignup.png
diff --git a/default_images/res/commandimagelist/sch_alignvcenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignvcenter.png
index 16a01eefcef2..16a01eefcef2 100644
--- a/default_images/res/commandimagelist/sch_alignvcenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignvcenter.png
diff --git a/default_images/res/commandimagelist/sch_alignverticalcenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignverticalcenter.png
index 16a01eefcef2..16a01eefcef2 100644
--- a/default_images/res/commandimagelist/sch_alignverticalcenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignverticalcenter.png
diff --git a/default_images/res/commandimagelist/sch_animationeffects.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_animationeffects.png
index 68738546fa93..68738546fa93 100644
--- a/default_images/res/commandimagelist/sch_animationeffects.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_animationeffects.png
diff --git a/default_images/res/commandimagelist/sch_animationmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_animationmode.png
index 190088629707..190088629707 100644
--- a/default_images/res/commandimagelist/sch_animationmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_animationmode.png
diff --git a/default_images/res/commandimagelist/sch_animationobjects.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_animationobjects.png
index ba586fdd40b9..ba586fdd40b9 100644
--- a/default_images/res/commandimagelist/sch_animationobjects.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_animationobjects.png
diff --git a/default_images/res/commandimagelist/sch_arc.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arc.png
index 675ac11043f3..675ac11043f3 100644
--- a/default_images/res/commandimagelist/sch_arc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arc.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.chevron.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.chevron.png
index b5757d34ae55..b5757d34ae55 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.chevron.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.chevron.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.circular-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.circular-arrow.png
index 22a52931e77b..22a52931e77b 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.circular-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.circular-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.corner-right-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.corner-right-arrow.png
index 6abcdd4acc90..6abcdd4acc90 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.corner-right-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.corner-right-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.down-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.down-arrow-callout.png
index bd701c61ec98..bd701c61ec98 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.down-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.down-arrow-callout.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.down-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.down-arrow.png
index 54547d455c3d..54547d455c3d 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.down-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.down-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.left-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.left-arrow-callout.png
index b6a39f344a18..b6a39f344a18 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.left-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.left-arrow-callout.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.left-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.left-arrow.png
index 786f321f9ece..786f321f9ece 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.left-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.left-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.left-right-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.left-right-arrow-callout.png
index 26062a03d1f2..26062a03d1f2 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.left-right-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.left-right-arrow-callout.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.left-right-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.left-right-arrow.png
index 20ae1974f73a..20ae1974f73a 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.left-right-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.left-right-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.notched-right-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.notched-right-arrow.png
index 84ae8492cada..84ae8492cada 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.notched-right-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.notched-right-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.pentagon-right.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.pentagon-right.png
index e919a5964574..e919a5964574 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.pentagon-right.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.pentagon-right.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.png
index 41fedf4ca9ee..41fedf4ca9ee 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.quad-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.quad-arrow-callout.png
index ec9ddce7b565..ec9ddce7b565 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.quad-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.quad-arrow-callout.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.quad-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.quad-arrow.png
index 36c952f1f491..36c952f1f491 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.quad-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.quad-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.right-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.right-arrow-callout.png
index 0b3dc00f9929..0b3dc00f9929 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.right-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.right-arrow-callout.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.right-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.right-arrow.png
index 9c0691ec94e5..9c0691ec94e5 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.right-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.right-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.s-sharped-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.s-sharped-arrow.png
index f381c3abc40d..f381c3abc40d 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.s-sharped-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.s-sharped-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.split-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.split-arrow.png
index 39830048509f..39830048509f 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.split-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.split-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.split-round-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.split-round-arrow.png
index 45447c1bdadc..45447c1bdadc 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.split-round-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.split-round-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.striped-right-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.striped-right-arrow.png
index d87ac8118dbc..d87ac8118dbc 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.striped-right-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.striped-right-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.up-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-arrow-callout.png
index d3cfc99de188..d3cfc99de188 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.up-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-arrow-callout.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.up-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-arrow.png
index 90d68d9070b3..90d68d9070b3 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.up-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.up-down-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-down-arrow-callout.png
index 12b50e959eab..12b50e959eab 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.up-down-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-down-arrow-callout.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.up-down-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-down-arrow.png
index c85c03460c31..c85c03460c31 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.up-down-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-down-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.up-right-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-right-arrow-callout.png
index 345d36cdcc3c..345d36cdcc3c 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.up-right-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-right-arrow-callout.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.up-right-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-right-arrow.png
index df1bc1f7bf02..df1bc1f7bf02 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.up-right-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-right-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.up-right-down-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-right-down-arrow.png
index 980bc65a415c..980bc65a415c 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.up-right-down-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-right-down-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowstoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowstoolbox.png
index 42339021bec1..42339021bec1 100644
--- a/default_images/res/commandimagelist/sch_arrowstoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowstoolbox.png
diff --git a/default_images/res/commandimagelist/sch_assignlayout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_assignlayout.png
index e62be6a81a9b..e62be6a81a9b 100644
--- a/default_images/res/commandimagelist/sch_assignlayout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_assignlayout.png
diff --git a/default_images/res/commandimagelist/sch_autocontrolfocus.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_autocontrolfocus.png
index 66c48a9cae14..66c48a9cae14 100644
--- a/default_images/res/commandimagelist/sch_autocontrolfocus.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_autocontrolfocus.png
diff --git a/default_images/res/commandimagelist/sch_autofilter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_autofilter.png
index 5eed21603dcf..5eed21603dcf 100644
--- a/default_images/res/commandimagelist/sch_autofilter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_autofilter.png
diff --git a/default_images/res/commandimagelist/sch_autoformat.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_autoformat.png
index 1f3aac168232..1f3aac168232 100644
--- a/default_images/res/commandimagelist/sch_autoformat.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_autoformat.png
diff --git a/default_images/res/commandimagelist/sch_autosum.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_autosum.png
index c0f6360cdc8c..c0f6360cdc8c 100644
--- a/default_images/res/commandimagelist/sch_autosum.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_autosum.png
diff --git a/default_images/res/commandimagelist/sch_avmediaplayer.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_avmediaplayer.png
index f111edc3afe6..f111edc3afe6 100644
--- a/default_images/res/commandimagelist/sch_avmediaplayer.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_avmediaplayer.png
diff --git a/default_images/res/commandimagelist/sch_backcolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_backcolor.png
index bec1316d0739..bec1316d0739 100644
--- a/default_images/res/commandimagelist/sch_backcolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_backcolor.png
diff --git a/default_images/res/commandimagelist/sch_backgroundcolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_backgroundcolor.png
index af10bb66c9fe..af10bb66c9fe 100644
--- a/default_images/res/commandimagelist/sch_backgroundcolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_backgroundcolor.png
diff --git a/default_images/res/commandimagelist/sch_backgroundpatterncontroller.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_backgroundpatterncontroller.png
index 82728549e649..82728549e649 100644
--- a/default_images/res/commandimagelist/sch_backgroundpatterncontroller.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_backgroundpatterncontroller.png
diff --git a/default_images/res/commandimagelist/sch_backward.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_backward.png
index 0b4277fda77a..0b4277fda77a 100644
--- a/default_images/res/commandimagelist/sch_backward.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_backward.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.block-arc.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.block-arc.png
index cb2409184af0..cb2409184af0 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.block-arc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.block-arc.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.can.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.can.png
index 8f9d536f0b47..8f9d536f0b47 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.can.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.can.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.circle-pie.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.circle-pie.png
index 03dfb12df364..03dfb12df364 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.circle-pie.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.circle-pie.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.circle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.circle.png
index 5958503263f9..5958503263f9 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.circle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.circle.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.cross.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.cross.png
index 64a4817f392e..64a4817f392e 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.cross.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.cross.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.cube.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.cube.png
index 0bd5595bd730..0bd5595bd730 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.cube.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.cube.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.diamond.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.diamond.png
index 130b1627676a..130b1627676a 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.diamond.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.diamond.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.ellipse.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.ellipse.png
index 9184f1ab3493..9184f1ab3493 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.ellipse.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.ellipse.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.frame.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.frame.png
index 2645d075ce37..2645d075ce37 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.frame.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.frame.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.hexagon.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.hexagon.png
index 75ad5b561769..75ad5b561769 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.hexagon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.hexagon.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.isosceles-triangle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.isosceles-triangle.png
index c171a23dccf1..c171a23dccf1 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.isosceles-triangle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.isosceles-triangle.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.octagon.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.octagon.png
index dc87d8098d39..dc87d8098d39 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.octagon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.octagon.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.paper.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.paper.png
index ccceb9be83fa..ccceb9be83fa 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.paper.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.paper.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.parallelogram.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.parallelogram.png
index 086e39604151..086e39604151 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.parallelogram.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.parallelogram.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.pentagon.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.pentagon.png
index abb369944852..abb369944852 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.pentagon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.pentagon.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.png
index 130b1627676a..130b1627676a 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.quadrat.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.quadrat.png
index 409e91d061bf..409e91d061bf 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.quadrat.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.quadrat.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.rectangle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.rectangle.png
index 05498575b823..05498575b823 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.rectangle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.rectangle.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.right-triangle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.right-triangle.png
index 16c7ea4226f3..16c7ea4226f3 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.right-triangle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.right-triangle.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.ring.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.ring.png
index e7ae14d5afc3..e7ae14d5afc3 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.ring.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.ring.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.round-quadrat.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.round-quadrat.png
index afc0127f13cd..afc0127f13cd 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.round-quadrat.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.round-quadrat.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.round-rectangle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.round-rectangle.png
index b8d9fa717421..b8d9fa717421 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.round-rectangle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.round-rectangle.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.trapezoid.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.trapezoid.png
index e38a7229a856..e38a7229a856 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.trapezoid.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.trapezoid.png
diff --git a/default_images/res/commandimagelist/sch_basicstepinto.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicstepinto.png
index 6efdfd465911..6efdfd465911 100644
--- a/default_images/res/commandimagelist/sch_basicstepinto.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicstepinto.png
diff --git a/default_images/res/commandimagelist/sch_basicstepout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicstepout.png
index 310da3d78e0d..310da3d78e0d 100644
--- a/default_images/res/commandimagelist/sch_basicstepout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicstepout.png
diff --git a/default_images/res/commandimagelist/sch_basicstepover.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicstepover.png
index 7b8dfdf7bab8..7b8dfdf7bab8 100644
--- a/default_images/res/commandimagelist/sch_basicstepover.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicstepover.png
diff --git a/default_images/res/commandimagelist/sch_basicstop.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicstop.png
index 16c76c8fb180..16c76c8fb180 100644
--- a/default_images/res/commandimagelist/sch_basicstop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicstop.png
diff --git a/default_images/res/commandimagelist/sch_beamer.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beamer.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_beamer.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beamer.png
diff --git a/default_images/res/commandimagelist/sch_beforeobject.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beforeobject.png
index db2a152c8415..db2a152c8415 100644
--- a/default_images/res/commandimagelist/sch_beforeobject.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beforeobject.png
diff --git a/default_images/res/commandimagelist/sch_behindobject.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_behindobject.png
index 1ddd47160989..1ddd47160989 100644
--- a/default_images/res/commandimagelist/sch_behindobject.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_behindobject.png
diff --git a/default_images/res/commandimagelist/sch_bezier_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezier_unfilled.png
index a2acf0b153de..a2acf0b153de 100644
--- a/default_images/res/commandimagelist/sch_bezier_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezier_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_bezierappend.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezierappend.png
index 274a659e6c7b..274a659e6c7b 100644
--- a/default_images/res/commandimagelist/sch_bezierappend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezierappend.png
diff --git a/default_images/res/commandimagelist/sch_bezierclose.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezierclose.png
index 40a779e41f27..40a779e41f27 100644
--- a/default_images/res/commandimagelist/sch_bezierclose.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezierclose.png
diff --git a/default_images/res/commandimagelist/sch_bezierconvert.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezierconvert.png
index d6e378bfe663..d6e378bfe663 100644
--- a/default_images/res/commandimagelist/sch_bezierconvert.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezierconvert.png
diff --git a/default_images/res/commandimagelist/sch_beziercutline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beziercutline.png
index e14e5d0e6544..e14e5d0e6544 100644
--- a/default_images/res/commandimagelist/sch_beziercutline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beziercutline.png
diff --git a/default_images/res/commandimagelist/sch_bezierdelete.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezierdelete.png
index 8215b8fd15b5..8215b8fd15b5 100644
--- a/default_images/res/commandimagelist/sch_bezierdelete.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezierdelete.png
diff --git a/default_images/res/commandimagelist/sch_bezieredge.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezieredge.png
index 00a26f095984..00a26f095984 100644
--- a/default_images/res/commandimagelist/sch_bezieredge.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezieredge.png
diff --git a/default_images/res/commandimagelist/sch_beziereliminatepoints.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beziereliminatepoints.png
index ad2b76a7b28c..ad2b76a7b28c 100644
--- a/default_images/res/commandimagelist/sch_beziereliminatepoints.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beziereliminatepoints.png
diff --git a/default_images/res/commandimagelist/sch_bezierfill.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezierfill.png
index d75ce1351880..d75ce1351880 100644
--- a/default_images/res/commandimagelist/sch_bezierfill.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezierfill.png
diff --git a/default_images/res/commandimagelist/sch_bezierinsert.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezierinsert.png
index dbfa12e95495..dbfa12e95495 100644
--- a/default_images/res/commandimagelist/sch_bezierinsert.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezierinsert.png
diff --git a/default_images/res/commandimagelist/sch_beziermove.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beziermove.png
index b46e90d2fc9d..b46e90d2fc9d 100644
--- a/default_images/res/commandimagelist/sch_beziermove.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beziermove.png
diff --git a/default_images/res/commandimagelist/sch_beziersmooth.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beziersmooth.png
index a977c7688759..a977c7688759 100644
--- a/default_images/res/commandimagelist/sch_beziersmooth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beziersmooth.png
diff --git a/default_images/res/commandimagelist/sch_beziersymmetric.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beziersymmetric.png
index 01a2bb87e562..01a2bb87e562 100644
--- a/default_images/res/commandimagelist/sch_beziersymmetric.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beziersymmetric.png
diff --git a/default_images/res/commandimagelist/sch_bighandles.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bighandles.png
index 879e51c5d898..879e51c5d898 100644
--- a/default_images/res/commandimagelist/sch_bighandles.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bighandles.png
diff --git a/default_images/res/commandimagelist/sc_bmpmask_h.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bmpmask.png
index 4821b98b5683..4821b98b5683 100644
--- a/default_images/res/commandimagelist/sc_bmpmask_h.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bmpmask.png
diff --git a/default_images/res/commandimagelist/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bold.png
index 5e5a6efc5b88..5e5a6efc5b88 100644
--- a/default_images/res/commandimagelist/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bold.png
diff --git a/default_images/res/commandimagelist/sch_borderdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_borderdialog.png
index 6c65b3646dd9..6c65b3646dd9 100644
--- a/default_images/res/commandimagelist/sch_borderdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_borderdialog.png
diff --git a/default_images/res/commandimagelist/sch_bringtofront.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bringtofront.png
index 20ddff45a587..20ddff45a587 100644
--- a/default_images/res/commandimagelist/sch_bringtofront.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bringtofront.png
diff --git a/default_images/res/commandimagelist/sch_browsebackward.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_browsebackward.png
index 62f6fe9b45ad..62f6fe9b45ad 100644
--- a/default_images/res/commandimagelist/sch_browsebackward.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_browsebackward.png
diff --git a/default_images/res/commandimagelist/sch_browseforward.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_browseforward.png
index 2aa913553c1d..2aa913553c1d 100644
--- a/default_images/res/commandimagelist/sch_browseforward.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_browseforward.png
diff --git a/default_images/res/commandimagelist/sch_browseview.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_browseview.png
index e5ff2f82ad49..e5ff2f82ad49 100644
--- a/default_images/res/commandimagelist/sch_browseview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_browseview.png
diff --git a/default_images/res/commandimagelist/sch_bullet.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bullet.png
index 21b62e77e951..21b62e77e951 100644
--- a/default_images/res/commandimagelist/sch_bullet.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bullet.png
diff --git a/default_images/res/commandimagelist/sch_bulletsandnumberingdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bulletsandnumberingdialog.png
index e988b15a1c01..e988b15a1c01 100644
--- a/default_images/res/commandimagelist/sch_bulletsandnumberingdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bulletsandnumberingdialog.png
diff --git a/default_images/res/commandimagelist/sch_calloutshapes.cloud-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.cloud-callout.png
index 7c5accae3688..7c5accae3688 100644
--- a/default_images/res/commandimagelist/sch_calloutshapes.cloud-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.cloud-callout.png
diff --git a/default_images/res/commandimagelist/sch_calloutshapes.line-callout-1.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.line-callout-1.png
index a97ca6b90891..a97ca6b90891 100644
--- a/default_images/res/commandimagelist/sch_calloutshapes.line-callout-1.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.line-callout-1.png
diff --git a/default_images/res/commandimagelist/sch_calloutshapes.line-callout-2.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.line-callout-2.png
index bb22c46d4923..bb22c46d4923 100644
--- a/default_images/res/commandimagelist/sch_calloutshapes.line-callout-2.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.line-callout-2.png
diff --git a/default_images/res/commandimagelist/sch_calloutshapes.line-callout-3.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.line-callout-3.png
index 1be3f4ce5a75..1be3f4ce5a75 100644
--- a/default_images/res/commandimagelist/sch_calloutshapes.line-callout-3.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.line-callout-3.png
diff --git a/default_images/res/commandimagelist/sch_calloutshapes.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.png
index 2e636beb3735..2e636beb3735 100644
--- a/default_images/res/commandimagelist/sch_calloutshapes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.png
diff --git a/default_images/res/commandimagelist/sch_calloutshapes.rectangular-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.rectangular-callout.png
index 4ba537e9f9cd..4ba537e9f9cd 100644
--- a/default_images/res/commandimagelist/sch_calloutshapes.rectangular-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.rectangular-callout.png
diff --git a/default_images/res/commandimagelist/sch_calloutshapes.round-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.round-callout.png
index a5a0d13e1c2c..a5a0d13e1c2c 100644
--- a/default_images/res/commandimagelist/sch_calloutshapes.round-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.round-callout.png
diff --git a/default_images/res/commandimagelist/sch_calloutshapes.round-rectangular-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.round-rectangular-callout.png
index 58de773621a6..58de773621a6 100644
--- a/default_images/res/commandimagelist/sch_calloutshapes.round-rectangular-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.round-rectangular-callout.png
diff --git a/default_images/res/commandimagelist/sch_cellvertbottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cellvertbottom.png
index f4e09722f89a..f4e09722f89a 100644
--- a/default_images/res/commandimagelist/sch_cellvertbottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cellvertbottom.png
diff --git a/default_images/res/commandimagelist/sch_cellvertcenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cellvertcenter.png
index 16a01eefcef2..16a01eefcef2 100644
--- a/default_images/res/commandimagelist/sch_cellvertcenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cellvertcenter.png
diff --git a/default_images/res/commandimagelist/sch_cellverttop.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cellverttop.png
index c61ca4c35211..c61ca4c35211 100644
--- a/default_images/res/commandimagelist/sch_cellverttop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cellverttop.png
diff --git a/default_images/res/commandimagelist/sch_centerpara.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_centerpara.png
index 6cf6ba71cef7..6cf6ba71cef7 100644
--- a/default_images/res/commandimagelist/sch_centerpara.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_centerpara.png
diff --git a/default_images/res/commandimagelist/sch_chainframes.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_chainframes.png
index 09cb8575c291..09cb8575c291 100644
--- a/default_images/res/commandimagelist/sch_chainframes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_chainframes.png
diff --git a/default_images/res/commandimagelist/sch_changebezier.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_changebezier.png
index e4fe74e64027..e4fe74e64027 100644
--- a/default_images/res/commandimagelist/sch_changebezier.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_changebezier.png
diff --git a/default_images/res/commandimagelist/sch_changecasetolower.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_changecasetolower.png
index 67c2850d0d1d..67c2850d0d1d 100644
--- a/default_images/res/commandimagelist/sch_changecasetolower.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_changecasetolower.png
diff --git a/default_images/res/commandimagelist/sch_changecasetoupper.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_changecasetoupper.png
index 88a27a4355cb..88a27a4355cb 100644
--- a/default_images/res/commandimagelist/sch_changecasetoupper.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_changecasetoupper.png
diff --git a/default_images/res/commandimagelist/sch_changedatabasefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_changedatabasefield.png
index 40c7157b58e1..40c7157b58e1 100644
--- a/default_images/res/commandimagelist/sch_changedatabasefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_changedatabasefield.png
diff --git a/default_images/res/commandimagelist/sch_changepolygon.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_changepolygon.png
index 9e3d4cd74f00..9e3d4cd74f00 100644
--- a/default_images/res/commandimagelist/sch_changepolygon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_changepolygon.png
diff --git a/default_images/res/commandimagelist/sch_charfontname.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_charfontname.png
index 4ab8187fd3a2..4ab8187fd3a2 100644
--- a/default_images/res/commandimagelist/sch_charfontname.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_charfontname.png
diff --git a/default_images/res/commandimagelist/sch_checkbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_checkbox.png
index 47f1e58b7089..47f1e58b7089 100644
--- a/default_images/res/commandimagelist/sch_checkbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_checkbox.png
diff --git a/default_images/res/commandimagelist/sch_choosecontrols.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_choosecontrols.png
index 0847ecf3f1b7..0847ecf3f1b7 100644
--- a/default_images/res/commandimagelist/sch_choosecontrols.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_choosecontrols.png
diff --git a/default_images/res/commandimagelist/sch_choosedesign.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_choosedesign.png
index 7b2e7bb53f63..7b2e7bb53f63 100644
--- a/default_images/res/commandimagelist/sch_choosedesign.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_choosedesign.png
diff --git a/default_images/res/commandimagelist/sch_choosemacro.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_choosemacro.png
index ee521dd3dcba..ee521dd3dcba 100644
--- a/default_images/res/commandimagelist/sch_choosemacro.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_choosemacro.png
diff --git a/default_images/res/commandimagelist/sch_choosepolygon.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_choosepolygon.png
index d705fc47b9d2..d705fc47b9d2 100644
--- a/default_images/res/commandimagelist/sch_choosepolygon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_choosepolygon.png
diff --git a/default_images/res/commandimagelist/sch_circle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circle.png
index 5958503263f9..5958503263f9 100644
--- a/default_images/res/commandimagelist/sch_circle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circle.png
diff --git a/default_images/res/commandimagelist/sch_circle_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circle_unfilled.png
index 3673205da08d..3673205da08d 100644
--- a/default_images/res/commandimagelist/sch_circle_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circle_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_circlearc.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circlearc.png
index 67b08c7896e5..67b08c7896e5 100644
--- a/default_images/res/commandimagelist/sch_circlearc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circlearc.png
diff --git a/default_images/res/commandimagelist/sch_circlecut.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circlecut.png
index 74aeb29c8121..74aeb29c8121 100644
--- a/default_images/res/commandimagelist/sch_circlecut.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circlecut.png
diff --git a/default_images/res/commandimagelist/sch_circlecut_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circlecut_unfilled.png
index 8a4db2f92dc7..8a4db2f92dc7 100644
--- a/default_images/res/commandimagelist/sch_circlecut_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circlecut_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_circlepie.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circlepie.png
index 6e93cfaa57e3..6e93cfaa57e3 100644
--- a/default_images/res/commandimagelist/sch_circlepie.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circlepie.png
diff --git a/default_images/res/commandimagelist/sch_circlepie_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circlepie_unfilled.png
index 1708421a34a4..1708421a34a4 100644
--- a/default_images/res/commandimagelist/sch_circlepie_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circlepie_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_clickchangerotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_clickchangerotation.png
index abe523344f94..abe523344f94 100644
--- a/default_images/res/commandimagelist/sch_clickchangerotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_clickchangerotation.png
diff --git a/default_images/res/commandimagelist/sch_closedoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_closedoc.png
index 75fe03d80cae..75fe03d80cae 100644
--- a/default_images/res/commandimagelist/sch_closedoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_closedoc.png
diff --git a/default_images/res/commandimagelist/sch_closedocs.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_closedocs.png
index e654592864c5..e654592864c5 100644
--- a/default_images/res/commandimagelist/sch_closedocs.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_closedocs.png
diff --git a/default_images/res/commandimagelist/sch_closemasterview.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_closemasterview.png
index cd71390e2b5e..cd71390e2b5e 100644
--- a/default_images/res/commandimagelist/sch_closemasterview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_closemasterview.png
diff --git a/default_images/res/commandimagelist/sch_closewin.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_closewin.png
index c65043c7777c..c65043c7777c 100644
--- a/default_images/res/commandimagelist/sch_closewin.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_closewin.png
diff --git a/default_images/res/commandimagelist/sch_color.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_color.png
index f6baeed08643..f6baeed08643 100644
--- a/default_images/res/commandimagelist/sch_color.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_color.png
diff --git a/default_images/res/commandimagelist/sch_colorsettings.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_colorsettings.png
index 0d9c76eb2784..0d9c76eb2784 100644
--- a/default_images/res/commandimagelist/sch_colorsettings.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_colorsettings.png
diff --git a/default_images/res/commandimagelist/sch_colorview.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_colorview.png
index 4376c3b52e3a..4376c3b52e3a 100644
--- a/default_images/res/commandimagelist/sch_colorview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_colorview.png
diff --git a/default_images/res/commandimagelist/sch_combobox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_combobox.png
index 08e5c1013760..08e5c1013760 100644
--- a/default_images/res/commandimagelist/sch_combobox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_combobox.png
diff --git a/default_images/res/commandimagelist/sch_commontaskbarvisible.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_commontaskbarvisible.png
index fb6b34927a2c..fb6b34927a2c 100644
--- a/default_images/res/commandimagelist/sch_commontaskbarvisible.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_commontaskbarvisible.png
diff --git a/default_images/res/commandimagelist/sch_compilebasic.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_compilebasic.png
index 79a7ed7f4035..79a7ed7f4035 100644
--- a/default_images/res/commandimagelist/sch_compilebasic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_compilebasic.png
diff --git a/default_images/res/commandimagelist/sch_cone.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cone.png
index 41e102178147..41e102178147 100644
--- a/default_images/res/commandimagelist/sch_cone.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cone.png
diff --git a/default_images/res/commandimagelist/sch_config.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_config.png
index 550b12970009..550b12970009 100644
--- a/default_images/res/commandimagelist/sch_config.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_config.png
diff --git a/default_images/res/commandimagelist/sch_connector.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connector.png
index ddf5128e7439..ddf5128e7439 100644
--- a/default_images/res/commandimagelist/sch_connector.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connector.png
diff --git a/default_images/res/commandimagelist/sch_connectorarrowend.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorarrowend.png
index 230d63e5f944..230d63e5f944 100644
--- a/default_images/res/commandimagelist/sch_connectorarrowend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorarrowend.png
diff --git a/default_images/res/commandimagelist/sch_connectorarrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorarrows.png
index fa63eea54990..fa63eea54990 100644
--- a/default_images/res/commandimagelist/sch_connectorarrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorarrows.png
diff --git a/default_images/res/commandimagelist/sch_connectorarrowstart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorarrowstart.png
index b8bd90ebfc6e..b8bd90ebfc6e 100644
--- a/default_images/res/commandimagelist/sch_connectorarrowstart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorarrowstart.png
diff --git a/default_images/res/commandimagelist/sch_connectorcircleend.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcircleend.png
index 2d3f3538a82a..2d3f3538a82a 100644
--- a/default_images/res/commandimagelist/sch_connectorcircleend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcircleend.png
diff --git a/default_images/res/commandimagelist/sch_connectorcircles.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcircles.png
index fab8cb3b9675..fab8cb3b9675 100644
--- a/default_images/res/commandimagelist/sch_connectorcircles.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcircles.png
diff --git a/default_images/res/commandimagelist/sch_connectorcirclestart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcirclestart.png
index 25e96b332ca1..25e96b332ca1 100644
--- a/default_images/res/commandimagelist/sch_connectorcirclestart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcirclestart.png
diff --git a/default_images/res/commandimagelist/sch_connectorcurve.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurve.png
index fb66741a5f75..fb66741a5f75 100644
--- a/default_images/res/commandimagelist/sch_connectorcurve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurve.png
diff --git a/default_images/res/commandimagelist/sch_connectorcurvearrowend.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurvearrowend.png
index 0fcc5fff4a76..0fcc5fff4a76 100644
--- a/default_images/res/commandimagelist/sch_connectorcurvearrowend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurvearrowend.png
diff --git a/default_images/res/commandimagelist/sch_connectorcurvearrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurvearrows.png
index 781405c59b80..781405c59b80 100644
--- a/default_images/res/commandimagelist/sch_connectorcurvearrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurvearrows.png
diff --git a/default_images/res/commandimagelist/sch_connectorcurvearrowstart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurvearrowstart.png
index f748f49b1e38..f748f49b1e38 100644
--- a/default_images/res/commandimagelist/sch_connectorcurvearrowstart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurvearrowstart.png
diff --git a/default_images/res/commandimagelist/sch_connectorcurvecircleend.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurvecircleend.png
index 13246c6d9c03..13246c6d9c03 100644
--- a/default_images/res/commandimagelist/sch_connectorcurvecircleend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurvecircleend.png
diff --git a/default_images/res/commandimagelist/sch_connectorcurvecircles.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurvecircles.png
index 4f5fb862f5be..4f5fb862f5be 100644
--- a/default_images/res/commandimagelist/sch_connectorcurvecircles.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurvecircles.png
diff --git a/default_images/res/commandimagelist/sch_connectorcurvecirclestart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurvecirclestart.png
index 8ff408f07f75..8ff408f07f75 100644
--- a/default_images/res/commandimagelist/sch_connectorcurvecirclestart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurvecirclestart.png
diff --git a/default_images/res/commandimagelist/sch_connectorline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorline.png
index 65750f3fe5c3..65750f3fe5c3 100644
--- a/default_images/res/commandimagelist/sch_connectorline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorline.png
diff --git a/default_images/res/commandimagelist/sch_connectorlinearrowend.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinearrowend.png
index 93d742b50835..93d742b50835 100644
--- a/default_images/res/commandimagelist/sch_connectorlinearrowend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinearrowend.png
diff --git a/default_images/res/commandimagelist/sch_connectorlinearrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinearrows.png
index 7f0311014edd..7f0311014edd 100644
--- a/default_images/res/commandimagelist/sch_connectorlinearrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinearrows.png
diff --git a/default_images/res/commandimagelist/sch_connectorlinearrowstart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinearrowstart.png
index 8ca31b61f58d..8ca31b61f58d 100644
--- a/default_images/res/commandimagelist/sch_connectorlinearrowstart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinearrowstart.png
diff --git a/default_images/res/commandimagelist/sch_connectorlinecircleend.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinecircleend.png
index 89b93c5d5a58..89b93c5d5a58 100644
--- a/default_images/res/commandimagelist/sch_connectorlinecircleend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinecircleend.png
diff --git a/default_images/res/commandimagelist/sch_connectorlinecircles.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinecircles.png
index 8df6dc5b9423..8df6dc5b9423 100644
--- a/default_images/res/commandimagelist/sch_connectorlinecircles.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinecircles.png
diff --git a/default_images/res/commandimagelist/sch_connectorlinecirclestart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinecirclestart.png
index 841e99970e48..841e99970e48 100644
--- a/default_images/res/commandimagelist/sch_connectorlinecirclestart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinecirclestart.png
diff --git a/default_images/res/commandimagelist/sch_connectorlines.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlines.png
index 5fa1604982fb..5fa1604982fb 100644
--- a/default_images/res/commandimagelist/sch_connectorlines.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlines.png
diff --git a/default_images/res/commandimagelist/sch_connectorlinesarrowend.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinesarrowend.png
index 28428ac515a9..28428ac515a9 100644
--- a/default_images/res/commandimagelist/sch_connectorlinesarrowend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinesarrowend.png
diff --git a/default_images/res/commandimagelist/sch_connectorlinesarrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinesarrows.png
index 16e3feda5573..16e3feda5573 100644
--- a/default_images/res/commandimagelist/sch_connectorlinesarrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinesarrows.png
diff --git a/default_images/res/commandimagelist/sch_connectorlinesarrowstart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinesarrowstart.png
index 6ef1fe168382..6ef1fe168382 100644
--- a/default_images/res/commandimagelist/sch_connectorlinesarrowstart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinesarrowstart.png
diff --git a/default_images/res/commandimagelist/sch_connectorlinescircleend.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinescircleend.png
index e1b4ec622857..e1b4ec622857 100644
--- a/default_images/res/commandimagelist/sch_connectorlinescircleend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinescircleend.png
diff --git a/default_images/res/commandimagelist/sch_connectorlinescircles.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinescircles.png
index 8adc7f20d605..8adc7f20d605 100644
--- a/default_images/res/commandimagelist/sch_connectorlinescircles.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinescircles.png
diff --git a/default_images/res/commandimagelist/sch_connectorlinescirclestart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinescirclestart.png
index 221d32f23e49..221d32f23e49 100644
--- a/default_images/res/commandimagelist/sch_connectorlinescirclestart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinescirclestart.png
diff --git a/default_images/res/commandimagelist/sch_connectortoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectortoolbox.png
index fab8cb3b9675..fab8cb3b9675 100644
--- a/default_images/res/commandimagelist/sch_connectortoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectortoolbox.png
diff --git a/default_images/res/commandimagelist/sch_contourdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_contourdialog.png
index 173f3bceb4c1..173f3bceb4c1 100644
--- a/default_images/res/commandimagelist/sch_contourdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_contourdialog.png
diff --git a/default_images/res/commandimagelist/sch_controlcodes.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_controlcodes.png
index ba31845f6a4b..ba31845f6a4b 100644
--- a/default_images/res/commandimagelist/sch_controlcodes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_controlcodes.png
diff --git a/default_images/res/commandimagelist/sch_controlproperties.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_controlproperties.png
index fb40afb1f4db..fb40afb1f4db 100644
--- a/default_images/res/commandimagelist/sch_controlproperties.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_controlproperties.png
diff --git a/default_images/res/commandimagelist/sch_convertinto3d.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_convertinto3d.png
index a2a8852d04e2..a2a8852d04e2 100644
--- a/default_images/res/commandimagelist/sch_convertinto3d.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_convertinto3d.png
diff --git a/default_images/res/commandimagelist/sch_convertinto3dlathe.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_convertinto3dlathe.png
index f1ba0ce08468..f1ba0ce08468 100644
--- a/default_images/res/commandimagelist/sch_convertinto3dlathe.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_convertinto3dlathe.png
diff --git a/default_images/res/commandimagelist/sch_convertinto3dlathefast.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_convertinto3dlathefast.png
index 4b96c05279fd..4b96c05279fd 100644
--- a/default_images/res/commandimagelist/sch_convertinto3dlathefast.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_convertinto3dlathefast.png
diff --git a/default_images/res/commandimagelist/sch_copy.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_copy.png
index 6f3eaf1138f3..6f3eaf1138f3 100644
--- a/default_images/res/commandimagelist/sch_copy.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_copy.png
diff --git a/default_images/res/commandimagelist/sch_countall.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_countall.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_countall.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_countall.png
diff --git a/default_images/res/commandimagelist/sch_crookrotate.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_crookrotate.png
index e5e9bccd7045..e5e9bccd7045 100644
--- a/default_images/res/commandimagelist/sch_crookrotate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_crookrotate.png
diff --git a/default_images/res/commandimagelist/sch_crookslant.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_crookslant.png
index c72e0185809b..c72e0185809b 100644
--- a/default_images/res/commandimagelist/sch_crookslant.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_crookslant.png
diff --git a/default_images/res/commandimagelist/sch_crop.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_crop.png
index aff300909548..aff300909548 100644
--- a/default_images/res/commandimagelist/sch_crop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_crop.png
diff --git a/default_images/res/commandimagelist/sch_cube.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cube.png
index 3d0f14fa2bb0..3d0f14fa2bb0 100644
--- a/default_images/res/commandimagelist/sch_cube.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cube.png
diff --git a/default_images/res/commandimagelist/sch_currencyfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_currencyfield.png
index 3b599c2c8a0d..3b599c2c8a0d 100644
--- a/default_images/res/commandimagelist/sch_currencyfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_currencyfield.png
diff --git a/default_images/res/commandimagelist/sch_customanimation.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_customanimation.png
index 35382393cc2d..35382393cc2d 100644
--- a/default_images/res/commandimagelist/sch_customanimation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_customanimation.png
diff --git a/default_images/res/commandimagelist/sch_cut.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cut.png
index 6ca14bc6e3b3..6ca14bc6e3b3 100644
--- a/default_images/res/commandimagelist/sch_cut.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cut.png
diff --git a/default_images/res/commandimagelist/sch_cylinder.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cylinder.png
index b52e134e06a8..b52e134e06a8 100644
--- a/default_images/res/commandimagelist/sch_cylinder.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cylinder.png
diff --git a/default_images/res/commandimagelist/sch_cyramid.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cyramid.png
index 9786a4387980..9786a4387980 100644
--- a/default_images/res/commandimagelist/sch_cyramid.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cyramid.png
diff --git a/default_images/res/commandimagelist/sch_datadatapilotrun.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_datadatapilotrun.png
index 00b6144460aa..00b6144460aa 100644
--- a/default_images/res/commandimagelist/sch_datadatapilotrun.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_datadatapilotrun.png
diff --git a/default_images/res/commandimagelist/sch_datafilterautofilter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_datafilterautofilter.png
index 591b6ab0dffb..591b6ab0dffb 100644
--- a/default_images/res/commandimagelist/sch_datafilterautofilter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_datafilterautofilter.png
diff --git a/default_images/res/commandimagelist/sch_datafilterspecialfilter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_datafilterspecialfilter.png
index 0aa85cc9624c..0aa85cc9624c 100644
--- a/default_images/res/commandimagelist/sch_datafilterspecialfilter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_datafilterspecialfilter.png
diff --git a/default_images/res/commandimagelist/sch_datafilterstandardfilter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_datafilterstandardfilter.png
index c815bd93ae83..c815bd93ae83 100644
--- a/default_images/res/commandimagelist/sch_datafilterstandardfilter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_datafilterstandardfilter.png
diff --git a/default_images/res/commandimagelist/sch_dataimport.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dataimport.png
index 971b3c0bca57..971b3c0bca57 100644
--- a/default_images/res/commandimagelist/sch_dataimport.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dataimport.png
diff --git a/default_images/res/commandimagelist/sch_dataincolumns.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dataincolumns.png
index a2be5faaee2f..a2be5faaee2f 100644
--- a/default_images/res/commandimagelist/sch_dataincolumns.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dataincolumns.png
diff --git a/default_images/res/commandimagelist/sch_datainrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_datainrows.png
index 718aec92fe3e..718aec92fe3e 100644
--- a/default_images/res/commandimagelist/sch_datainrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_datainrows.png
diff --git a/default_images/res/commandimagelist/sch_datefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_datefield.png
index 720550d4a9db..720550d4a9db 100644
--- a/default_images/res/commandimagelist/sch_datefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_datefield.png
diff --git a/default_images/res/commandimagelist/sch_dbaddrelation.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbaddrelation.png
index ae8980c31324..ae8980c31324 100644
--- a/default_images/res/commandimagelist/sch_dbaddrelation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbaddrelation.png
diff --git a/default_images/res/commandimagelist/sch_dbchangedesignmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbchangedesignmode.png
index 90e2b8d05cbb..90e2b8d05cbb 100644
--- a/default_images/res/commandimagelist/sch_dbchangedesignmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbchangedesignmode.png
diff --git a/default_images/res/commandimagelist/sch_dbclearquery.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbclearquery.png
index 96bd9d89bef7..96bd9d89bef7 100644
--- a/default_images/res/commandimagelist/sch_dbclearquery.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbclearquery.png
diff --git a/default_images/res/commandimagelist/sch_dbdistinctvalues.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbdistinctvalues.png
index 3aeea3fd066c..3aeea3fd066c 100644
--- a/default_images/res/commandimagelist/sch_dbdistinctvalues.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbdistinctvalues.png
diff --git a/default_images/res/commandimagelist/sch_dbformdelete.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbformdelete.png
index dfc359a6403f..dfc359a6403f 100644
--- a/default_images/res/commandimagelist/sch_dbformdelete.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbformdelete.png
diff --git a/default_images/res/commandimagelist/sch_dbformedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbformedit.png
index 35c2d38f045d..35c2d38f045d 100644
--- a/default_images/res/commandimagelist/sch_dbformedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbformedit.png
diff --git a/default_images/res/commandimagelist/sch_dbformopen.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbformopen.png
index 546830a49d02..546830a49d02 100644
--- a/default_images/res/commandimagelist/sch_dbformopen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbformopen.png
diff --git a/default_images/res/commandimagelist/sch_dbformrename.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbformrename.png
index b137d7fb85d2..b137d7fb85d2 100644
--- a/default_images/res/commandimagelist/sch_dbformrename.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbformrename.png
diff --git a/default_images/res/commandimagelist/sch_dbindexdesign.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbindexdesign.png
index 7564c96b0ea9..7564c96b0ea9 100644
--- a/default_images/res/commandimagelist/sch_dbindexdesign.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbindexdesign.png
diff --git a/default_images/res/commandimagelist/sch_dbnewform.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewform.png
index 7cb6f3571773..7cb6f3571773 100644
--- a/default_images/res/commandimagelist/sch_dbnewform.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewform.png
diff --git a/default_images/res/commandimagelist/sch_dbnewformautopilot.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewformautopilot.png
index b6561f1a81f0..b6561f1a81f0 100644
--- a/default_images/res/commandimagelist/sch_dbnewformautopilot.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewformautopilot.png
diff --git a/default_images/res/commandimagelist/sch_dbnewquery.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewquery.png
index 1f0b5c621783..1f0b5c621783 100644
--- a/default_images/res/commandimagelist/sch_dbnewquery.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewquery.png
diff --git a/default_images/res/commandimagelist/sch_dbnewqueryautopilot.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewqueryautopilot.png
index bf498241c5e9..bf498241c5e9 100644
--- a/default_images/res/commandimagelist/sch_dbnewqueryautopilot.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewqueryautopilot.png
diff --git a/default_images/res/commandimagelist/sch_dbnewquerysql.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewquerysql.png
index 732b2a5bb6d3..732b2a5bb6d3 100644
--- a/default_images/res/commandimagelist/sch_dbnewquerysql.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewquerysql.png
diff --git a/default_images/res/commandimagelist/sch_dbnewreport.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewreport.png
index b23533aca72c..b23533aca72c 100644
--- a/default_images/res/commandimagelist/sch_dbnewreport.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewreport.png
diff --git a/default_images/res/commandimagelist/sch_dbnewreportautopilot.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewreportautopilot.png
index 83a7331393e3..83a7331393e3 100644
--- a/default_images/res/commandimagelist/sch_dbnewreportautopilot.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewreportautopilot.png
diff --git a/default_images/res/commandimagelist/sch_dbnewtable.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewtable.png
index cfb45bd15477..cfb45bd15477 100644
--- a/default_images/res/commandimagelist/sch_dbnewtable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewtable.png
diff --git a/default_images/res/commandimagelist/sch_dbnewtableautopilot.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewtableautopilot.png
index 46251a915ed6..46251a915ed6 100644
--- a/default_images/res/commandimagelist/sch_dbnewtableautopilot.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewtableautopilot.png
diff --git a/default_images/res/commandimagelist/sch_dbnewview.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewview.png
index b1af2b81931f..b1af2b81931f 100644
--- a/default_images/res/commandimagelist/sch_dbnewview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewview.png
diff --git a/default_images/res/commandimagelist/sch_dbnewviewsql.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewviewsql.png
index c4f6fb9f25cc..c4f6fb9f25cc 100644
--- a/default_images/res/commandimagelist/sch_dbnewviewsql.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewviewsql.png
diff --git a/default_images/res/commandimagelist/sch_dbquerydelete.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbquerydelete.png
index c8da800ad431..c8da800ad431 100644
--- a/default_images/res/commandimagelist/sch_dbquerydelete.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbquerydelete.png
diff --git a/default_images/res/commandimagelist/sch_dbqueryedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbqueryedit.png
index e23ae708a990..e23ae708a990 100644
--- a/default_images/res/commandimagelist/sch_dbqueryedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbqueryedit.png
diff --git a/default_images/res/commandimagelist/sch_dbqueryopen.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbqueryopen.png
index 437473da1b5c..437473da1b5c 100644
--- a/default_images/res/commandimagelist/sch_dbqueryopen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbqueryopen.png
diff --git a/default_images/res/commandimagelist/sch_dbqueryrename.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbqueryrename.png
index 05cf9c98ae40..05cf9c98ae40 100644
--- a/default_images/res/commandimagelist/sch_dbqueryrename.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbqueryrename.png
diff --git a/default_images/res/commandimagelist/sch_dbreportdelete.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbreportdelete.png
index 2056640746a3..2056640746a3 100644
--- a/default_images/res/commandimagelist/sch_dbreportdelete.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbreportdelete.png
diff --git a/default_images/res/commandimagelist/sch_dbreportedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbreportedit.png
index 8752c3a3ad34..8752c3a3ad34 100644
--- a/default_images/res/commandimagelist/sch_dbreportedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbreportedit.png
diff --git a/default_images/res/commandimagelist/sch_dbreportopen.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbreportopen.png
index 55362273fbc4..55362273fbc4 100644
--- a/default_images/res/commandimagelist/sch_dbreportopen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbreportopen.png
diff --git a/default_images/res/commandimagelist/sch_dbreportrename.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbreportrename.png
index 50f66a12e4f8..50f66a12e4f8 100644
--- a/default_images/res/commandimagelist/sch_dbreportrename.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbreportrename.png
diff --git a/default_images/res/commandimagelist/sch_dbsortingandgrouping.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbsortingandgrouping.png
index abfab0cde149..abfab0cde149 100644
--- a/default_images/res/commandimagelist/sch_dbsortingandgrouping.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbsortingandgrouping.png
diff --git a/default_images/res/commandimagelist/sch_dbtabledelete.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbtabledelete.png
index 9e5853b52f09..9e5853b52f09 100644
--- a/default_images/res/commandimagelist/sch_dbtabledelete.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbtabledelete.png
diff --git a/default_images/res/commandimagelist/sch_dbtableedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbtableedit.png
index 04a7a85671bc..04a7a85671bc 100644
--- a/default_images/res/commandimagelist/sch_dbtableedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbtableedit.png
diff --git a/default_images/res/commandimagelist/sch_dbtableopen.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbtableopen.png
index 76fd1e8c5ec4..76fd1e8c5ec4 100644
--- a/default_images/res/commandimagelist/sch_dbtableopen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbtableopen.png
diff --git a/default_images/res/commandimagelist/sch_dbtablerename.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbtablerename.png
index 8da47f932034..8da47f932034 100644
--- a/default_images/res/commandimagelist/sch_dbtablerename.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbtablerename.png
diff --git a/default_images/res/commandimagelist/sch_dbviewaliases.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbviewaliases.png
index 1f761216842d..1f761216842d 100644
--- a/default_images/res/commandimagelist/sch_dbviewaliases.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbviewaliases.png
diff --git a/default_images/res/commandimagelist/sch_dbviewfunctions.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbviewfunctions.png
index 9f115c406f78..9f115c406f78 100644
--- a/default_images/res/commandimagelist/sch_dbviewfunctions.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbviewfunctions.png
diff --git a/default_images/res/commandimagelist/sch_dbviewtablenames.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbviewtablenames.png
index 252b2e890cfd..252b2e890cfd 100644
--- a/default_images/res/commandimagelist/sch_dbviewtablenames.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbviewtablenames.png
diff --git a/default_images/res/commandimagelist/sch_decrementindent.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_decrementindent.png
index 1b1126da90a9..1b1126da90a9 100644
--- a/default_images/res/commandimagelist/sch_decrementindent.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_decrementindent.png
diff --git a/default_images/res/commandimagelist/sch_decrementlevel.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_decrementlevel.png
index 0ed6d39bd2d4..0ed6d39bd2d4 100644
--- a/default_images/res/commandimagelist/sch_decrementlevel.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_decrementlevel.png
diff --git a/default_images/res/commandimagelist/sch_decrementsublevels.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_decrementsublevels.png
index c5a0b19bbbcf..c5a0b19bbbcf 100644
--- a/default_images/res/commandimagelist/sch_decrementsublevels.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_decrementsublevels.png
diff --git a/default_images/res/commandimagelist/sch_defaultbullet.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_defaultbullet.png
index 8e6e8b554b94..8e6e8b554b94 100644
--- a/default_images/res/commandimagelist/sch_defaultbullet.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_defaultbullet.png
diff --git a/default_images/res/commandimagelist/sch_defaultnumbering.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_defaultnumbering.png
index 97acde164ab7..97acde164ab7 100644
--- a/default_images/res/commandimagelist/sch_defaultnumbering.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_defaultnumbering.png
diff --git a/default_images/res/commandimagelist/sch_definename.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_definename.png
index 4b3d4555147d..4b3d4555147d 100644
--- a/default_images/res/commandimagelist/sch_definename.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_definename.png
diff --git a/default_images/res/commandimagelist/sch_defineprintarea.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_defineprintarea.png
index 0e9db1050ac6..0e9db1050ac6 100644
--- a/default_images/res/commandimagelist/sch_defineprintarea.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_defineprintarea.png
diff --git a/default_images/res/commandimagelist/sch_delete.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_delete.png
index deedf75daa1b..deedf75daa1b 100644
--- a/default_images/res/commandimagelist/sch_delete.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_delete.png
diff --git a/default_images/res/commandimagelist/sch_deleteallannotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deleteallannotation.png
index d09be10e3a94..d09be10e3a94 100644
--- a/default_images/res/commandimagelist/sch_deleteallannotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deleteallannotation.png
diff --git a/default_images/res/commandimagelist/sch_deleteannotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deleteannotation.png
index f3c9c0d5315f..f3c9c0d5315f 100644
--- a/default_images/res/commandimagelist/sch_deleteannotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deleteannotation.png
diff --git a/default_images/res/commandimagelist/sch_deletecolumns.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deletecolumns.png
index 264a83ad5b28..264a83ad5b28 100644
--- a/default_images/res/commandimagelist/sch_deletecolumns.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deletecolumns.png
diff --git a/default_images/res/commandimagelist/sch_deletemasterpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deletemasterpage.png
index bf8e98f2e0b0..bf8e98f2e0b0 100644
--- a/default_images/res/commandimagelist/sch_deletemasterpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deletemasterpage.png
diff --git a/default_images/res/commandimagelist/sch_deleteprintarea.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deleteprintarea.png
index 85cdc69f997d..85cdc69f997d 100644
--- a/default_images/res/commandimagelist/sch_deleteprintarea.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deleteprintarea.png
diff --git a/default_images/res/commandimagelist/sch_deleterecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deleterecord.png
index e67b18e0f768..e67b18e0f768 100644
--- a/default_images/res/commandimagelist/sch_deleterecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deleterecord.png
diff --git a/default_images/res/commandimagelist/sch_deleterows.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deleterows.png
index d72592d15bb2..d72592d15bb2 100644
--- a/default_images/res/commandimagelist/sch_deleterows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deleterows.png
diff --git a/default_images/res/commandimagelist/sch_designerdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_designerdialog.png
index 80178396c8c1..80178396c8c1 100644
--- a/default_images/res/commandimagelist/sch_designerdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_designerdialog.png
diff --git a/default_images/res/commandimagelist/sch_dia.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dia.png
index 867eda5e2d05..867eda5e2d05 100644
--- a/default_images/res/commandimagelist/sch_dia.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dia.png
diff --git a/default_images/res/commandimagelist/sch_diaauto.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_diaauto.png
index 4e766476d4bf..4e766476d4bf 100644
--- a/default_images/res/commandimagelist/sch_diaauto.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_diaauto.png
diff --git a/default_images/res/commandimagelist/sch_diaeffect.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_diaeffect.png
index 33a9e4365ec3..33a9e4365ec3 100644
--- a/default_images/res/commandimagelist/sch_diaeffect.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_diaeffect.png
diff --git a/default_images/res/commandimagelist/sch_diagramdata.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_diagramdata.png
index d8955c4c2341..d8955c4c2341 100644
--- a/default_images/res/commandimagelist/sch_diagramdata.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_diagramdata.png
diff --git a/default_images/res/commandimagelist/sch_diagramtype.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_diagramtype.png
index dd67b0c006a0..dd67b0c006a0 100644
--- a/default_images/res/commandimagelist/sch_diagramtype.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_diagramtype.png
diff --git a/default_images/res/commandimagelist/sch_diaspeed.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_diaspeed.png
index 7a450e1b7153..7a450e1b7153 100644
--- a/default_images/res/commandimagelist/sch_diaspeed.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_diaspeed.png
diff --git a/default_images/res/commandimagelist/sch_diatime.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_diatime.png
index f04c3ce18ff6..f04c3ce18ff6 100644
--- a/default_images/res/commandimagelist/sch_diatime.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_diatime.png
diff --git a/default_images/res/commandimagelist/sch_distributecolumns.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_distributecolumns.png
index 0fdc0f2dc42b..0fdc0f2dc42b 100644
--- a/default_images/res/commandimagelist/sch_distributecolumns.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_distributecolumns.png
diff --git a/default_images/res/commandimagelist/sch_distributerows.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_distributerows.png
index 3ecde0921c2f..3ecde0921c2f 100644
--- a/default_images/res/commandimagelist/sch_distributerows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_distributerows.png
diff --git a/default_images/res/commandimagelist/sch_doubleclicktextedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_doubleclicktextedit.png
index d51d52a5dc58..d51d52a5dc58 100644
--- a/default_images/res/commandimagelist/sch_doubleclicktextedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_doubleclicktextedit.png
diff --git a/default_images/res/commandimagelist/sch_downsearch.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_downsearch.png
index 6781fbb1344e..6781fbb1344e 100644
--- a/default_images/res/commandimagelist/sch_downsearch.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_downsearch.png
diff --git a/default_images/res/commandimagelist/sch_draw.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_draw.png
index 7c3d649a211e..7c3d649a211e 100644
--- a/default_images/res/commandimagelist/sch_draw.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_draw.png
diff --git a/default_images/res/commandimagelist/sch_drawcaption.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_drawcaption.png
index 6753d4d1e1d4..6753d4d1e1d4 100644
--- a/default_images/res/commandimagelist/sch_drawcaption.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_drawcaption.png
diff --git a/default_images/res/commandimagelist/sch_drawchart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_drawchart.png
index 2169a8e39ad6..2169a8e39ad6 100644
--- a/default_images/res/commandimagelist/sch_drawchart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_drawchart.png
diff --git a/default_images/res/commandimagelist/sch_drawselect.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_drawselect.png
index fd37063dbf57..fd37063dbf57 100644
--- a/default_images/res/commandimagelist/sch_drawselect.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_drawselect.png
diff --git a/default_images/res/commandimagelist/sch_drawtext.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_drawtext.png
index 4066acea5ce4..4066acea5ce4 100644
--- a/default_images/res/commandimagelist/sch_drawtext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_drawtext.png
diff --git a/default_images/res/commandimagelist/sch_dsbdocumentdatasource.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dsbdocumentdatasource.png
index 93956b232e59..93956b232e59 100644
--- a/default_images/res/commandimagelist/sch_dsbdocumentdatasource.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dsbdocumentdatasource.png
diff --git a/default_images/res/commandimagelist/sch_dsbeditdoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dsbeditdoc.png
index ea0ac07e7239..ea0ac07e7239 100644
--- a/default_images/res/commandimagelist/sch_dsbeditdoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dsbeditdoc.png
diff --git a/default_images/res/commandimagelist/sch_dsbformletter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dsbformletter.png
index d28fb499104a..d28fb499104a 100644
--- a/default_images/res/commandimagelist/sch_dsbformletter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dsbformletter.png
diff --git a/default_images/res/commandimagelist/sch_dsbinsertcolumns.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dsbinsertcolumns.png
index 140cdc15f484..140cdc15f484 100644
--- a/default_images/res/commandimagelist/sch_dsbinsertcolumns.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dsbinsertcolumns.png
diff --git a/default_images/res/commandimagelist/sch_dsbinsertcontent.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dsbinsertcontent.png
index 63232c592e9f..63232c592e9f 100644
--- a/default_images/res/commandimagelist/sch_dsbinsertcontent.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dsbinsertcontent.png
diff --git a/default_images/res/commandimagelist/sch_dsbrowserexplorer.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dsbrowserexplorer.png
index d2b0263d4671..d2b0263d4671 100644
--- a/default_images/res/commandimagelist/sch_dsbrowserexplorer.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dsbrowserexplorer.png
diff --git a/default_images/res/commandimagelist/sch_duplicatepage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_duplicatepage.png
index d69afca72bc0..d69afca72bc0 100644
--- a/default_images/res/commandimagelist/sch_duplicatepage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_duplicatepage.png
diff --git a/default_images/res/commandimagelist/sch_edit.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_edit.png
index 6245ac512b79..6245ac512b79 100644
--- a/default_images/res/commandimagelist/sch_edit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_edit.png
diff --git a/default_images/res/commandimagelist/sch_editdoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_editdoc.png
index ea0ac07e7239..ea0ac07e7239 100644
--- a/default_images/res/commandimagelist/sch_editdoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_editdoc.png
diff --git a/default_images/res/commandimagelist/sch_editframeset.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_editframeset.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_editframeset.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_editframeset.png
diff --git a/default_images/res/commandimagelist/sch_editglossary.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_editglossary.png
index c64d8eb36109..c64d8eb36109 100644
--- a/default_images/res/commandimagelist/sch_editglossary.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_editglossary.png
diff --git a/default_images/res/commandimagelist/sch_editheaderandfooter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_editheaderandfooter.png
index 5893d454caae..5893d454caae 100644
--- a/default_images/res/commandimagelist/sch_editheaderandfooter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_editheaderandfooter.png
diff --git a/default_images/res/commandimagelist/sch_editprintarea.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_editprintarea.png
index c7372f93b221..c7372f93b221 100644
--- a/default_images/res/commandimagelist/sch_editprintarea.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_editprintarea.png
diff --git a/default_images/res/commandimagelist/sch_ellipse.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ellipse.png
index 9184f1ab3493..9184f1ab3493 100644
--- a/default_images/res/commandimagelist/sch_ellipse.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ellipse.png
diff --git a/default_images/res/commandimagelist/sch_ellipse_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ellipse_unfilled.png
index 0d7f6acd038c..0d7f6acd038c 100644
--- a/default_images/res/commandimagelist/sch_ellipse_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ellipse_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_ellipsecut.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ellipsecut.png
index 2e664c150015..2e664c150015 100644
--- a/default_images/res/commandimagelist/sch_ellipsecut.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ellipsecut.png
diff --git a/default_images/res/commandimagelist/sch_ellipsecut_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ellipsecut_unfilled.png
index 2cd950502210..2cd950502210 100644
--- a/default_images/res/commandimagelist/sch_ellipsecut_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ellipsecut_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_ellipsetoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ellipsetoolbox.png
index 9184f1ab3493..9184f1ab3493 100644
--- a/default_images/res/commandimagelist/sch_ellipsetoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ellipsetoolbox.png
diff --git a/default_images/res/commandimagelist/sch_entergroup.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_entergroup.png
index d5d36f5c32b4..d5d36f5c32b4 100644
--- a/default_images/res/commandimagelist/sch_entergroup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_entergroup.png
diff --git a/default_images/res/commandimagelist/sch_entirecolumn.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_entirecolumn.png
index d7fd197a56af..d7fd197a56af 100644
--- a/default_images/res/commandimagelist/sch_entirecolumn.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_entirecolumn.png
diff --git a/default_images/res/commandimagelist/sch_entirerow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_entirerow.png
index 5ce7f577f879..5ce7f577f879 100644
--- a/default_images/res/commandimagelist/sch_entirerow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_entirerow.png
diff --git a/default_images/res/commandimagelist/sch_euroconverter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_euroconverter.png
index 3e53e0e50963..3e53e0e50963 100644
--- a/default_images/res/commandimagelist/sch_euroconverter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_euroconverter.png
diff --git a/default_images/res/commandimagelist/sch_executereport.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_executereport.png
index 1e3733596b88..1e3733596b88 100644
--- a/default_images/res/commandimagelist/sch_executereport.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_executereport.png
diff --git a/default_images/res/commandimagelist/sch_expandpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_expandpage.png
index 8d9900edda64..8d9900edda64 100644
--- a/default_images/res/commandimagelist/sch_expandpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_expandpage.png
diff --git a/default_images/res/commandimagelist/sch_exportdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_exportdialog.png
index 01113531e2f8..01113531e2f8 100644
--- a/default_images/res/commandimagelist/sch_exportdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_exportdialog.png
diff --git a/default_images/res/commandimagelist/sch_exportdirecttopdf.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_exportdirecttopdf.png
index b2e44c4aaad7..b2e44c4aaad7 100644
--- a/default_images/res/commandimagelist/sch_exportdirecttopdf.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_exportdirecttopdf.png
diff --git a/default_images/res/commandimagelist/sch_exportto.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_exportto.png
index 817875393a6a..817875393a6a 100644
--- a/default_images/res/commandimagelist/sch_exportto.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_exportto.png
diff --git a/default_images/res/commandimagelist/sch_extendedhelp.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extendedhelp.png
index d33cc8837392..d33cc8837392 100644
--- a/default_images/res/commandimagelist/sch_extendedhelp.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extendedhelp.png
diff --git a/default_images/res/commandimagelist/sch_extrusion3dcolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusion3dcolor.png
index 5e147488d3c5..5e147488d3c5 100644
--- a/default_images/res/commandimagelist/sch_extrusion3dcolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusion3dcolor.png
diff --git a/default_images/res/commandimagelist/sch_extrusiondepthfloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiondepthfloater.png
index b30f113d2387..b30f113d2387 100644
--- a/default_images/res/commandimagelist/sch_extrusiondepthfloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiondepthfloater.png
diff --git a/default_images/res/commandimagelist/sch_extrusiondirectionfloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiondirectionfloater.png
index c0891d770c02..c0891d770c02 100644
--- a/default_images/res/commandimagelist/sch_extrusiondirectionfloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiondirectionfloater.png
diff --git a/default_images/res/commandimagelist/sch_extrusionlightingfloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusionlightingfloater.png
index 9ed48cdf30a7..9ed48cdf30a7 100644
--- a/default_images/res/commandimagelist/sch_extrusionlightingfloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusionlightingfloater.png
diff --git a/default_images/res/commandimagelist/sch_extrusionsurfacefloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusionsurfacefloater.png
index ba9e6fc6a462..ba9e6fc6a462 100644
--- a/default_images/res/commandimagelist/sch_extrusionsurfacefloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusionsurfacefloater.png
diff --git a/default_images/res/commandimagelist/sch_extrusiontiltdown.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiontiltdown.png
index ac7453ca5486..ac7453ca5486 100644
--- a/default_images/res/commandimagelist/sch_extrusiontiltdown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiontiltdown.png
diff --git a/default_images/res/commandimagelist/sch_extrusiontiltleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiontiltleft.png
index 3d5252958cb9..3d5252958cb9 100644
--- a/default_images/res/commandimagelist/sch_extrusiontiltleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiontiltleft.png
diff --git a/default_images/res/commandimagelist/sch_extrusiontiltright.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiontiltright.png
index ebe9f7a1f2e6..ebe9f7a1f2e6 100644
--- a/default_images/res/commandimagelist/sch_extrusiontiltright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiontiltright.png
diff --git a/default_images/res/commandimagelist/sch_extrusiontiltup.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiontiltup.png
index b68ca2bc261c..b68ca2bc261c 100644
--- a/default_images/res/commandimagelist/sch_extrusiontiltup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiontiltup.png
diff --git a/default_images/res/commandimagelist/sch_extrusiontoggle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiontoggle.png
index 3938e908f8d3..3938e908f8d3 100644
--- a/default_images/res/commandimagelist/sch_extrusiontoggle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiontoggle.png
diff --git a/default_images/res/commandimagelist/sch_fieldnames.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fieldnames.png
index 5b95655cfa90..5b95655cfa90 100644
--- a/default_images/res/commandimagelist/sch_fieldnames.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fieldnames.png
diff --git a/default_images/res/commandimagelist/sch_fields.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fields.png
index 5b95655cfa90..5b95655cfa90 100644
--- a/default_images/res/commandimagelist/sch_fields.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fields.png
diff --git a/default_images/res/commandimagelist/sch_filecontrol.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_filecontrol.png
index 724eb1248921..724eb1248921 100644
--- a/default_images/res/commandimagelist/sch_filecontrol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_filecontrol.png
diff --git a/default_images/res/commandimagelist/sch_filedocument.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_filedocument.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_filedocument.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_filedocument.png
diff --git a/default_images/res/commandimagelist/sch_fillshadow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fillshadow.png
index f38c4583a2de..f38c4583a2de 100644
--- a/default_images/res/commandimagelist/sch_fillshadow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fillshadow.png
diff --git a/default_images/res/commandimagelist/sch_fillstyle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fillstyle.png
index 7530e245db62..7530e245db62 100644
--- a/default_images/res/commandimagelist/sch_fillstyle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fillstyle.png
diff --git a/default_images/res/commandimagelist/sch_filtercrit.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_filtercrit.png
index c815bd93ae83..c815bd93ae83 100644
--- a/default_images/res/commandimagelist/sch_filtercrit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_filtercrit.png
diff --git a/default_images/res/commandimagelist/sch_firstpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_firstpage.png
index b1296765d04f..b1296765d04f 100644
--- a/default_images/res/commandimagelist/sch_firstpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_firstpage.png
diff --git a/default_images/res/commandimagelist/sch_firstrecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_firstrecord.png
index 80c6152c0e02..80c6152c0e02 100644
--- a/default_images/res/commandimagelist/sch_firstrecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_firstrecord.png
diff --git a/default_images/res/commandimagelist/sch_fliphorizontal.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fliphorizontal.png
index 13513090b973..13513090b973 100644
--- a/default_images/res/commandimagelist/sch_fliphorizontal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fliphorizontal.png
diff --git a/default_images/res/commandimagelist/sch_flipvertical.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flipvertical.png
index b4e7252daa1f..b4e7252daa1f 100644
--- a/default_images/res/commandimagelist/sch_flipvertical.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flipvertical.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-alternate-process.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-alternate-process.png
index afc0127f13cd..afc0127f13cd 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-alternate-process.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-alternate-process.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-card.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-card.png
index cfa0941f8319..cfa0941f8319 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-card.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-card.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-collate.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-collate.png
index 7edab658ff3f..7edab658ff3f 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-collate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-collate.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-connector.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-connector.png
index 5958503263f9..5958503263f9 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-connector.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-connector.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-data.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-data.png
index 086e39604151..086e39604151 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-data.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-data.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-decision.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-decision.png
index 130b1627676a..130b1627676a 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-decision.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-decision.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-delay.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-delay.png
index 6c85bfdfcabb..6c85bfdfcabb 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-delay.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-delay.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-direct-access-storage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-direct-access-storage.png
index f0487710018a..f0487710018a 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-direct-access-storage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-direct-access-storage.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-display.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-display.png
index 2cc424f61aa7..2cc424f61aa7 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-display.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-display.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-document.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-document.png
index 767e09a79f10..767e09a79f10 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-document.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-document.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-extract.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-extract.png
index c171a23dccf1..c171a23dccf1 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-extract.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-extract.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-internal-storage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-internal-storage.png
index 6e44ca69f7f6..6e44ca69f7f6 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-internal-storage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-internal-storage.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-magnetic-disk.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-magnetic-disk.png
index 369c8972af29..369c8972af29 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-magnetic-disk.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-magnetic-disk.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-manual-input.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-manual-input.png
index 8be5654a94f2..8be5654a94f2 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-manual-input.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-manual-input.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-manual-operation.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-manual-operation.png
index e38a7229a856..e38a7229a856 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-manual-operation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-manual-operation.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-merge.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-merge.png
index 619eb614549b..619eb614549b 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-merge.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-merge.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-multidocument.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-multidocument.png
index 9c0c7e7d9897..9c0c7e7d9897 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-multidocument.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-multidocument.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-off-page-connector.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-off-page-connector.png
index 5f645d4b4ec7..5f645d4b4ec7 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-off-page-connector.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-off-page-connector.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-or.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-or.png
index 513846e0bdc7..513846e0bdc7 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-or.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-or.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-predefined-process.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-predefined-process.png
index 14157b473827..14157b473827 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-predefined-process.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-predefined-process.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-preparation.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-preparation.png
index 75ad5b561769..75ad5b561769 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-preparation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-preparation.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-process.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-process.png
index 409e91d061bf..409e91d061bf 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-process.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-process.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-punched-tape.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-punched-tape.png
index 97f37fa46e07..97f37fa46e07 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-punched-tape.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-punched-tape.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-sequential-access.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-sequential-access.png
index 31b713c90314..31b713c90314 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-sequential-access.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-sequential-access.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-sort.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-sort.png
index b37ad09fabb8..b37ad09fabb8 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-sort.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-sort.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-stored-data.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-stored-data.png
index 08929be93545..08929be93545 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-stored-data.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-stored-data.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-summing-junction.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-summing-junction.png
index 1ffc8aaf0d50..1ffc8aaf0d50 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-summing-junction.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-summing-junction.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-terminator.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-terminator.png
index 84aaf48e193c..84aaf48e193c 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-terminator.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-terminator.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.png
index 6e44ca69f7f6..6e44ca69f7f6 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.png
diff --git a/default_images/res/commandimagelist/sch_fontcolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontcolor.png
index 04549c95ecda..04549c95ecda 100644
--- a/default_images/res/commandimagelist/sch_fontcolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontcolor.png
diff --git a/default_images/res/commandimagelist/sch_fontdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontdialog.png
index fb25a2275ab5..fb25a2275ab5 100644
--- a/default_images/res/commandimagelist/sch_fontdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontdialog.png
diff --git a/default_images/res/commandimagelist/sch_fontheight.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontheight.png
index f01894fa92c9..f01894fa92c9 100644
--- a/default_images/res/commandimagelist/sch_fontheight.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontheight.png
diff --git a/default_images/res/commandimagelist/sch_fontwork.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontwork.png
index a02602c0766e..a02602c0766e 100644
--- a/default_images/res/commandimagelist/sch_fontwork.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontwork.png
diff --git a/default_images/res/commandimagelist/sch_fontworkalignmentfloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkalignmentfloater.png
index 6cf6ba71cef7..6cf6ba71cef7 100644
--- a/default_images/res/commandimagelist/sch_fontworkalignmentfloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkalignmentfloater.png
diff --git a/default_images/res/commandimagelist/sch_fontworkcharacterspacingfloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkcharacterspacingfloater.png
index 226e18cb1823..226e18cb1823 100644
--- a/default_images/res/commandimagelist/sch_fontworkcharacterspacingfloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkcharacterspacingfloater.png
diff --git a/default_images/res/commandimagelist/sch_fontworkgalleryfloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkgalleryfloater.png
index 0125fa695ca7..0125fa695ca7 100644
--- a/default_images/res/commandimagelist/sch_fontworkgalleryfloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkgalleryfloater.png
diff --git a/default_images/res/commandimagelist/sch_fontworksameletterheights.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworksameletterheights.png
index ef8a7e97d159..ef8a7e97d159 100644
--- a/default_images/res/commandimagelist/sch_fontworksameletterheights.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworksameletterheights.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-down-curve.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-down-curve.png
index a1be35c91044..a1be35c91044 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-down-curve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-down-curve.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-down-pour.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-down-pour.png
index 9f63003ba025..9f63003ba025 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-down-pour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-down-pour.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-left-curve.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-left-curve.png
index 5254082f127a..5254082f127a 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-left-curve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-left-curve.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-left-pour.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-left-pour.png
index ef4ec1a80878..ef4ec1a80878 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-left-pour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-left-pour.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-right-curve.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-right-curve.png
index f9a3c10cfef5..f9a3c10cfef5 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-right-curve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-right-curve.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-right-pour.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-right-pour.png
index d58de8e4e394..d58de8e4e394 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-right-pour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-right-pour.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-up-curve.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-up-curve.png
index 0036f747d0b8..0036f747d0b8 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-up-curve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-up-curve.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-up-pour.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-up-pour.png
index 64a795884d7e..64a795884d7e 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-up-pour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-up-pour.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-chevron-down.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-chevron-down.png
index 67940af3fff9..67940af3fff9 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-chevron-down.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-chevron-down.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-chevron-up.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-chevron-up.png
index 74de2b10f34d..74de2b10f34d 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-chevron-up.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-chevron-up.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-circle-curve.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-circle-curve.png
index c2646d6f35c3..c2646d6f35c3 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-circle-curve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-circle-curve.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-circle-pour.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-circle-pour.png
index 03ec7b1ce4fc..03ec7b1ce4fc 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-circle-pour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-circle-pour.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-curve-down.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-curve-down.png
index 90e37c4a7c74..90e37c4a7c74 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-curve-down.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-curve-down.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-curve-up.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-curve-up.png
index 75fb39baf33d..75fb39baf33d 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-curve-up.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-curve-up.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-fade-down.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-fade-down.png
index 5624d8d21544..5624d8d21544 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-fade-down.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-fade-down.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-fade-left.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-fade-left.png
index f513482d7a69..f513482d7a69 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-fade-left.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-fade-left.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-fade-right.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-fade-right.png
index 7d6e9a682d68..7d6e9a682d68 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-fade-right.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-fade-right.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-fade-up-and-left.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-fade-up-and-left.png
index 4ad6f88965aa..4ad6f88965aa 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-fade-up-and-left.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-fade-up-and-left.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-fade-up-and-right.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-fade-up-and-right.png
index 590da8ff91ae..590da8ff91ae 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-fade-up-and-right.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-fade-up-and-right.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-fade-up.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-fade-up.png
index e73aaf79faa6..e73aaf79faa6 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-fade-up.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-fade-up.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-inflate.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-inflate.png
index 3a33283322fc..3a33283322fc 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-inflate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-inflate.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-open-circle-curve.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-open-circle-curve.png
index 4ddd53ea4437..4ddd53ea4437 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-open-circle-curve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-open-circle-curve.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-open-circle-pour.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-open-circle-pour.png
index 042ac23771c5..042ac23771c5 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-open-circle-pour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-open-circle-pour.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-plain-text.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-plain-text.png
index 614b00469aa6..614b00469aa6 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-plain-text.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-plain-text.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-slant-down.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-slant-down.png
index 67774d2d6dcd..67774d2d6dcd 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-slant-down.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-slant-down.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-slant-up.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-slant-up.png
index 5d3f6cbd5b84..5d3f6cbd5b84 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-slant-up.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-slant-up.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-stop.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-stop.png
index b9ebee0f2f1a..b9ebee0f2f1a 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-stop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-stop.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-triangle-down.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-triangle-down.png
index bc9aa4bf9d0d..bc9aa4bf9d0d 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-triangle-down.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-triangle-down.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-triangle-up.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-triangle-up.png
index a6cf281d501f..a6cf281d501f 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-triangle-up.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-triangle-up.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-wave.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-wave.png
index 7d58e8f937ad..7d58e8f937ad 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-wave.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-wave.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.png
index 82c396a384d9..82c396a384d9 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.png
diff --git a/default_images/res/commandimagelist/sch_formatarea.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formatarea.png
index 14b38a7d511a..14b38a7d511a 100644
--- a/default_images/res/commandimagelist/sch_formatarea.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formatarea.png
diff --git a/default_images/res/commandimagelist/sch_formatgroup.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formatgroup.png
index 77519875a076..77519875a076 100644
--- a/default_images/res/commandimagelist/sch_formatgroup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formatgroup.png
diff --git a/default_images/res/commandimagelist/sch_formatline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formatline.png
index d254b10caf2f..d254b10caf2f 100644
--- a/default_images/res/commandimagelist/sch_formatline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formatline.png
diff --git a/default_images/res/commandimagelist/sch_formatpaintbrush.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formatpaintbrush.png
index 8fc342475371..8fc342475371 100644
--- a/default_images/res/commandimagelist/sch_formatpaintbrush.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formatpaintbrush.png
diff --git a/default_images/res/commandimagelist/sch_formattedfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formattedfield.png
index d546a44014a7..d546a44014a7 100644
--- a/default_images/res/commandimagelist/sch_formattedfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formattedfield.png
diff --git a/default_images/res/commandimagelist/sch_formatungroup.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formatungroup.png
index 1f9de64442ee..1f9de64442ee 100644
--- a/default_images/res/commandimagelist/sch_formatungroup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formatungroup.png
diff --git a/default_images/res/commandimagelist/sch_formdesigntools.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formdesigntools.png
index ed6bb73ad064..ed6bb73ad064 100644
--- a/default_images/res/commandimagelist/sch_formdesigntools.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formdesigntools.png
diff --git a/default_images/res/commandimagelist/sch_formelcursor.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formelcursor.png
index 9725a7e5136f..9725a7e5136f 100644
--- a/default_images/res/commandimagelist/sch_formelcursor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formelcursor.png
diff --git a/default_images/res/commandimagelist/sch_formfilter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formfilter.png
index c3560ba43a2e..c3560ba43a2e 100644
--- a/default_images/res/commandimagelist/sch_formfilter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formfilter.png
diff --git a/default_images/res/commandimagelist/sch_formfiltered.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formfiltered.png
index c9f9cafcf849..c9f9cafcf849 100644
--- a/default_images/res/commandimagelist/sch_formfiltered.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formfiltered.png
diff --git a/default_images/res/commandimagelist/sch_formfilterexecute.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formfilterexecute.png
index c815bd93ae83..c815bd93ae83 100644
--- a/default_images/res/commandimagelist/sch_formfilterexecute.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formfilterexecute.png
diff --git a/default_images/res/commandimagelist/sch_formfilternavigator.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formfilternavigator.png
index 95b34ad869ce..95b34ad869ce 100644
--- a/default_images/res/commandimagelist/sch_formfilternavigator.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formfilternavigator.png
diff --git a/default_images/res/commandimagelist/sch_formproperties.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formproperties.png
index 5855c8d8d62e..5855c8d8d62e 100644
--- a/default_images/res/commandimagelist/sch_formproperties.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formproperties.png
diff --git a/default_images/res/commandimagelist/sch_forward.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_forward.png
index a6047cac06df..a6047cac06df 100644
--- a/default_images/res/commandimagelist/sch_forward.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_forward.png
diff --git a/default_images/res/commandimagelist/sch_framedialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_framedialog.png
index e2ac78504a3d..e2ac78504a3d 100644
--- a/default_images/res/commandimagelist/sch_framedialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_framedialog.png
diff --git a/default_images/res/commandimagelist/sch_framelinecolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_framelinecolor.png
index 0daf9423c892..0daf9423c892 100644
--- a/default_images/res/commandimagelist/sch_framelinecolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_framelinecolor.png
diff --git a/default_images/res/commandimagelist/sch_freeline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_freeline.png
index b582370d10ca..b582370d10ca 100644
--- a/default_images/res/commandimagelist/sch_freeline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_freeline.png
diff --git a/default_images/res/commandimagelist/sch_freeline_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_freeline_unfilled.png
index ca56144b6731..ca56144b6731 100644
--- a/default_images/res/commandimagelist/sch_freeline_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_freeline_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_fullscreen.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fullscreen.png
index 65229c2a25b5..65229c2a25b5 100644
--- a/default_images/res/commandimagelist/sch_fullscreen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fullscreen.png
diff --git a/default_images/res/commandimagelist/sch_gallery.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gallery.png
index 70c23eeea9ba..70c23eeea9ba 100644
--- a/default_images/res/commandimagelist/sch_gallery.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gallery.png
diff --git a/default_images/res/commandimagelist/sch_getactivetask.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_getactivetask.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_getactivetask.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_getactivetask.png
diff --git a/default_images/res/commandimagelist/sch_glueeditmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_glueeditmode.png
index c356ac580e75..c356ac580e75 100644
--- a/default_images/res/commandimagelist/sch_glueeditmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_glueeditmode.png
diff --git a/default_images/res/commandimagelist/sch_glueescapedirectionbottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_glueescapedirectionbottom.png
index ef731d00e1b4..ef731d00e1b4 100644
--- a/default_images/res/commandimagelist/sch_glueescapedirectionbottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_glueescapedirectionbottom.png
diff --git a/default_images/res/commandimagelist/sch_glueescapedirectionleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_glueescapedirectionleft.png
index 9ff0197125b2..9ff0197125b2 100644
--- a/default_images/res/commandimagelist/sch_glueescapedirectionleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_glueescapedirectionleft.png
diff --git a/default_images/res/commandimagelist/sch_glueescapedirectionright.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_glueescapedirectionright.png
index 9ae0e0b9133d..9ae0e0b9133d 100644
--- a/default_images/res/commandimagelist/sch_glueescapedirectionright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_glueescapedirectionright.png
diff --git a/default_images/res/commandimagelist/sch_glueescapedirectiontop.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_glueescapedirectiontop.png
index 568ec5f8bf40..568ec5f8bf40 100644
--- a/default_images/res/commandimagelist/sch_glueescapedirectiontop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_glueescapedirectiontop.png
diff --git a/default_images/res/commandimagelist/sch_gluehorzaligncenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluehorzaligncenter.png
index 32e134fcf1e6..32e134fcf1e6 100644
--- a/default_images/res/commandimagelist/sch_gluehorzaligncenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluehorzaligncenter.png
diff --git a/default_images/res/commandimagelist/sch_gluehorzalignleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluehorzalignleft.png
index 73c0f80f2338..73c0f80f2338 100644
--- a/default_images/res/commandimagelist/sch_gluehorzalignleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluehorzalignleft.png
diff --git a/default_images/res/commandimagelist/sch_gluehorzalignright.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluehorzalignright.png
index f3fd62448c1b..f3fd62448c1b 100644
--- a/default_images/res/commandimagelist/sch_gluehorzalignright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluehorzalignright.png
diff --git a/default_images/res/commandimagelist/sch_glueinsertpoint.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_glueinsertpoint.png
index b5c1358f292b..b5c1358f292b 100644
--- a/default_images/res/commandimagelist/sch_glueinsertpoint.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_glueinsertpoint.png
diff --git a/default_images/res/commandimagelist/sch_gluepercent.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluepercent.png
index cbf28c949bd9..cbf28c949bd9 100644
--- a/default_images/res/commandimagelist/sch_gluepercent.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluepercent.png
diff --git a/default_images/res/commandimagelist/sch_gluevertalignbottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluevertalignbottom.png
index 01f9b410654a..01f9b410654a 100644
--- a/default_images/res/commandimagelist/sch_gluevertalignbottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluevertalignbottom.png
diff --git a/default_images/res/commandimagelist/sch_gluevertaligncenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluevertaligncenter.png
index cd285bd874b0..cd285bd874b0 100644
--- a/default_images/res/commandimagelist/sch_gluevertaligncenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluevertaligncenter.png
diff --git a/default_images/res/commandimagelist/sch_gluevertaligntop.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluevertaligntop.png
index 474097659cda..474097659cda 100644
--- a/default_images/res/commandimagelist/sch_gluevertaligntop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluevertaligntop.png
diff --git a/default_images/res/commandimagelist/sch_goalseekdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_goalseekdialog.png
index b062dc8bb580..b062dc8bb580 100644
--- a/default_images/res/commandimagelist/sch_goalseekdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_goalseekdialog.png
diff --git a/default_images/res/commandimagelist/sch_gotoend.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gotoend.png
index eb05f9ccd025..eb05f9ccd025 100644
--- a/default_images/res/commandimagelist/sch_gotoend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gotoend.png
diff --git a/default_images/res/commandimagelist/sch_gotoendofdoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gotoendofdoc.png
index 00018f39c79b..00018f39c79b 100644
--- a/default_images/res/commandimagelist/sch_gotoendofdoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gotoendofdoc.png
diff --git a/default_images/res/commandimagelist/sch_gotostartofdoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gotostartofdoc.png
index 3cf107c55d4e..3cf107c55d4e 100644
--- a/default_images/res/commandimagelist/sch_gotostartofdoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gotostartofdoc.png
diff --git a/default_images/res/commandimagelist/sch_gotostartoftable.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gotostartoftable.png
index f09685edbe73..f09685edbe73 100644
--- a/default_images/res/commandimagelist/sch_gotostartoftable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gotostartoftable.png
diff --git a/default_images/res/commandimagelist/sch_grafattrcrop.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafattrcrop.png
index 755c46c95042..755c46c95042 100644
--- a/default_images/res/commandimagelist/sch_grafattrcrop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafattrcrop.png
diff --git a/default_images/res/commandimagelist/sch_grafblue.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafblue.png
index 0ad1d7bc808f..0ad1d7bc808f 100644
--- a/default_images/res/commandimagelist/sch_grafblue.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafblue.png
diff --git a/default_images/res/commandimagelist/sch_grafcontrast.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafcontrast.png
index 1eb671c10ac2..1eb671c10ac2 100644
--- a/default_images/res/commandimagelist/sch_grafcontrast.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafcontrast.png
diff --git a/default_images/res/commandimagelist/sch_grafgamma.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafgamma.png
index 6963c334275c..6963c334275c 100644
--- a/default_images/res/commandimagelist/sch_grafgamma.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafgamma.png
diff --git a/default_images/res/commandimagelist/sch_grafgreen.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafgreen.png
index aa464cab2a7a..aa464cab2a7a 100644
--- a/default_images/res/commandimagelist/sch_grafgreen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafgreen.png
diff --git a/default_images/res/commandimagelist/sch_grafinvert.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafinvert.png
index 977d84a0f596..977d84a0f596 100644
--- a/default_images/res/commandimagelist/sch_grafinvert.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafinvert.png
diff --git a/default_images/res/commandimagelist/sch_grafluminance.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafluminance.png
index a6d8a4e84e79..a6d8a4e84e79 100644
--- a/default_images/res/commandimagelist/sch_grafluminance.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafluminance.png
diff --git a/default_images/res/commandimagelist/sch_grafmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafmode.png
index 3bd4fd4a0c5d..3bd4fd4a0c5d 100644
--- a/default_images/res/commandimagelist/sch_grafmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafmode.png
diff --git a/default_images/res/commandimagelist/sch_grafred.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafred.png
index 31d9ee5668cd..31d9ee5668cd 100644
--- a/default_images/res/commandimagelist/sch_grafred.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafred.png
diff --git a/default_images/res/commandimagelist/sch_graftransparence.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graftransparence.png
index c4fbda3baf9b..c4fbda3baf9b 100644
--- a/default_images/res/commandimagelist/sch_graftransparence.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graftransparence.png
diff --git a/default_images/res/commandimagelist/sch_graphic.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphic.png
index ac2edafb68db..ac2edafb68db 100644
--- a/default_images/res/commandimagelist/sch_graphic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphic.png
diff --git a/default_images/res/commandimagelist/sch_graphicfilterinvert.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfilterinvert.png
index 977d84a0f596..977d84a0f596 100644
--- a/default_images/res/commandimagelist/sch_graphicfilterinvert.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfilterinvert.png
diff --git a/default_images/res/commandimagelist/sch_graphicfiltermosaic.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltermosaic.png
index 7790f0f149af..7790f0f149af 100644
--- a/default_images/res/commandimagelist/sch_graphicfiltermosaic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltermosaic.png
diff --git a/default_images/res/commandimagelist/sch_graphicfilterpopart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfilterpopart.png
index e063da211b9f..e063da211b9f 100644
--- a/default_images/res/commandimagelist/sch_graphicfilterpopart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfilterpopart.png
diff --git a/default_images/res/commandimagelist/sch_graphicfilterposter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfilterposter.png
index ce4b19941f0a..ce4b19941f0a 100644
--- a/default_images/res/commandimagelist/sch_graphicfilterposter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfilterposter.png
diff --git a/default_images/res/commandimagelist/sch_graphicfilterrelief.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfilterrelief.png
index a1c002e4eaae..a1c002e4eaae 100644
--- a/default_images/res/commandimagelist/sch_graphicfilterrelief.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfilterrelief.png
diff --git a/default_images/res/commandimagelist/sch_graphicfilterremovenoise.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfilterremovenoise.png
index fbdc97b808f0..fbdc97b808f0 100644
--- a/default_images/res/commandimagelist/sch_graphicfilterremovenoise.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfilterremovenoise.png
diff --git a/default_images/res/commandimagelist/sch_graphicfiltersepia.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltersepia.png
index f28472457178..f28472457178 100644
--- a/default_images/res/commandimagelist/sch_graphicfiltersepia.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltersepia.png
diff --git a/default_images/res/commandimagelist/sch_graphicfiltersharpen.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltersharpen.png
index 7a799eeac764..7a799eeac764 100644
--- a/default_images/res/commandimagelist/sch_graphicfiltersharpen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltersharpen.png
diff --git a/default_images/res/commandimagelist/sch_graphicfiltersmooth.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltersmooth.png
index 13331baf59cd..13331baf59cd 100644
--- a/default_images/res/commandimagelist/sch_graphicfiltersmooth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltersmooth.png
diff --git a/default_images/res/commandimagelist/sch_graphicfiltersobel.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltersobel.png
index aa129b46d4a8..aa129b46d4a8 100644
--- a/default_images/res/commandimagelist/sch_graphicfiltersobel.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltersobel.png
diff --git a/default_images/res/commandimagelist/sch_graphicfiltersolarize.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltersolarize.png
index b6e22bb74527..b6e22bb74527 100644
--- a/default_images/res/commandimagelist/sch_graphicfiltersolarize.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltersolarize.png
diff --git a/default_images/res/commandimagelist/sch_graphicfiltertoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltertoolbox.png
index 0d3484dccedb..0d3484dccedb 100644
--- a/default_images/res/commandimagelist/sch_graphicfiltertoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltertoolbox.png
diff --git a/default_images/res/commandimagelist/sch_greatestheight.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_greatestheight.png
index ea55b8ea693c..ea55b8ea693c 100644
--- a/default_images/res/commandimagelist/sch_greatestheight.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_greatestheight.png
diff --git a/default_images/res/commandimagelist/sch_greatestwidth.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_greatestwidth.png
index 243832750869..243832750869 100644
--- a/default_images/res/commandimagelist/sch_greatestwidth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_greatestwidth.png
diff --git a/default_images/res/commandimagelist/sch_grid.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grid.png
index d8955c4c2341..d8955c4c2341 100644
--- a/default_images/res/commandimagelist/sch_grid.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grid.png
diff --git a/default_images/res/commandimagelist/sch_griduse.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_griduse.png
index 43804a5a7790..43804a5a7790 100644
--- a/default_images/res/commandimagelist/sch_griduse.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_griduse.png
diff --git a/default_images/res/commandimagelist/sch_gridvisible.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gridvisible.png
index 47db19b13c08..47db19b13c08 100644
--- a/default_images/res/commandimagelist/sch_gridvisible.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gridvisible.png
diff --git a/default_images/res/commandimagelist/sch_group.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_group.png
index 971b3c0bca57..971b3c0bca57 100644
--- a/default_images/res/commandimagelist/sch_group.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_group.png
diff --git a/default_images/res/commandimagelist/sch_groupbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_groupbox.png
index d8ffe4b9fa09..d8ffe4b9fa09 100644
--- a/default_images/res/commandimagelist/sch_groupbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_groupbox.png
diff --git a/default_images/res/commandimagelist/sch_grow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grow.png
index b1058bb03353..b1058bb03353 100644
--- a/default_images/res/commandimagelist/sch_grow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grow.png
diff --git a/default_images/res/commandimagelist/sch_halfsphere.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_halfsphere.png
index 528d6a53ca15..528d6a53ca15 100644
--- a/default_images/res/commandimagelist/sch_halfsphere.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_halfsphere.png
diff --git a/default_images/res/commandimagelist/sch_handlesdraft.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_handlesdraft.png
index 19c36c5e7955..19c36c5e7955 100644
--- a/default_images/res/commandimagelist/sch_handlesdraft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_handlesdraft.png
diff --git a/default_images/res/commandimagelist/sch_helpannotate.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpannotate.png
index e284986fec4d..e284986fec4d 100644
--- a/default_images/res/commandimagelist/sch_helpannotate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpannotate.png
diff --git a/default_images/res/commandimagelist/sch_helpbookmark.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpbookmark.png
index 501468e1ab10..501468e1ab10 100644
--- a/default_images/res/commandimagelist/sch_helpbookmark.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpbookmark.png
diff --git a/default_images/res/commandimagelist/sch_helpdownload.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpdownload.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_helpdownload.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpdownload.png
diff --git a/default_images/res/commandimagelist/sch_helperdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helperdialog.png
index 706c336e9a55..706c336e9a55 100644
--- a/default_images/res/commandimagelist/sch_helperdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helperdialog.png
diff --git a/default_images/res/commandimagelist/sch_helpindex.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpindex.png
index 7d8635e8d8d3..7d8635e8d8d3 100644
--- a/default_images/res/commandimagelist/sch_helpindex.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpindex.png
diff --git a/default_images/res/commandimagelist/sch_helplinesmove.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helplinesmove.png
index f4f6c2dbc3c9..f4f6c2dbc3c9 100644
--- a/default_images/res/commandimagelist/sch_helplinesmove.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helplinesmove.png
diff --git a/default_images/res/commandimagelist/sch_helplinesuse.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helplinesuse.png
index 05421a329625..05421a329625 100644
--- a/default_images/res/commandimagelist/sch_helplinesuse.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helplinesuse.png
diff --git a/default_images/res/commandimagelist/sch_helplinesvisible.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helplinesvisible.png
index 76abe21038e5..76abe21038e5 100644
--- a/default_images/res/commandimagelist/sch_helplinesvisible.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helplinesvisible.png
diff --git a/default_images/res/commandimagelist/sch_helpmenu.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpmenu.png
index 0706e1691e4c..0706e1691e4c 100644
--- a/default_images/res/commandimagelist/sch_helpmenu.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpmenu.png
diff --git a/default_images/res/commandimagelist/sch_helpsearch.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpsearch.png
index b2cd5ae2ef14..b2cd5ae2ef14 100644
--- a/default_images/res/commandimagelist/sch_helpsearch.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpsearch.png
diff --git a/default_images/res/commandimagelist/sch_helpzoomin.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpzoomin.png
index 0dfac21e94ff..0dfac21e94ff 100644
--- a/default_images/res/commandimagelist/sch_helpzoomin.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpzoomin.png
diff --git a/default_images/res/commandimagelist/sch_helpzoomout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpzoomout.png
index d5ea657c387a..d5ea657c387a 100644
--- a/default_images/res/commandimagelist/sch_helpzoomout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpzoomout.png
diff --git a/default_images/res/commandimagelist/sch_hfixedline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_hfixedline.png
index 9c36609e0280..9c36609e0280 100644
--- a/default_images/res/commandimagelist/sch_hfixedline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_hfixedline.png
diff --git a/default_images/res/commandimagelist/sch_hideslide.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_hideslide.png
index 5516e0455a62..5516e0455a62 100644
--- a/default_images/res/commandimagelist/sch_hideslide.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_hideslide.png
diff --git a/default_images/res/commandimagelist/sch_hscrollbar.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_hscrollbar.png
index ee3372263881..ee3372263881 100644
--- a/default_images/res/commandimagelist/sch_hscrollbar.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_hscrollbar.png
diff --git a/default_images/res/commandimagelist/sch_hyperlinkdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_hyperlinkdialog.png
index 84ac8c1721f3..84ac8c1721f3 100644
--- a/default_images/res/commandimagelist/sch_hyperlinkdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_hyperlinkdialog.png
diff --git a/default_images/res/commandimagelist/sch_hyphenate.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_hyphenate.png
index 59bdcaa9ebd6..59bdcaa9ebd6 100644
--- a/default_images/res/commandimagelist/sch_hyphenate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_hyphenate.png
diff --git a/default_images/res/commandimagelist/sch_hyphenation.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_hyphenation.png
index 41af30eeb250..41af30eeb250 100644
--- a/default_images/res/commandimagelist/sch_hyphenation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_hyphenation.png
diff --git a/default_images/res/commandimagelist/sch_imagebutton.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_imagebutton.png
index 0635d2be3491..0635d2be3491 100644
--- a/default_images/res/commandimagelist/sch_imagebutton.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_imagebutton.png
diff --git a/default_images/res/commandimagelist/sch_imagecontrol.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_imagecontrol.png
index d7c7f22a5390..d7c7f22a5390 100644
--- a/default_images/res/commandimagelist/sch_imagecontrol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_imagecontrol.png
diff --git a/default_images/res/commandimagelist/sch_imagemapdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_imagemapdialog.png
index bc8cbfb764bc..bc8cbfb764bc 100644
--- a/default_images/res/commandimagelist/sch_imagemapdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_imagemapdialog.png
diff --git a/default_images/res/commandimagelist/sch_importdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_importdialog.png
index e8961ea6c198..e8961ea6c198 100644
--- a/default_images/res/commandimagelist/sch_importdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_importdialog.png
diff --git a/default_images/res/commandimagelist/sch_importfromfile.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_importfromfile.png
index 11b15809b6aa..11b15809b6aa 100644
--- a/default_images/res/commandimagelist/sch_importfromfile.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_importfromfile.png
diff --git a/default_images/res/commandimagelist/sch_incrementindent.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_incrementindent.png
index ec9579f41460..ec9579f41460 100644
--- a/default_images/res/commandimagelist/sch_incrementindent.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_incrementindent.png
diff --git a/default_images/res/commandimagelist/sch_incrementlevel.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_incrementlevel.png
index 3214cbc65203..3214cbc65203 100644
--- a/default_images/res/commandimagelist/sch_incrementlevel.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_incrementlevel.png
diff --git a/default_images/res/commandimagelist/sch_incrementsublevels.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_incrementsublevels.png
index 0e5f8d8fd7f5..0e5f8d8fd7f5 100644
--- a/default_images/res/commandimagelist/sch_incrementsublevels.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_incrementsublevels.png
diff --git a/default_images/res/commandimagelist/sch_inscellsctrl.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inscellsctrl.png
index a842e4547e61..a842e4547e61 100644
--- a/default_images/res/commandimagelist/sch_inscellsctrl.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inscellsctrl.png
diff --git a/default_images/res/commandimagelist/sch_insertannotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertannotation.png
index 75a0c8721d62..75a0c8721d62 100644
--- a/default_images/res/commandimagelist/sch_insertannotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertannotation.png
diff --git a/default_images/res/commandimagelist/sch_insertauthorfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertauthorfield.png
index 0ede7bd22e85..0ede7bd22e85 100644
--- a/default_images/res/commandimagelist/sch_insertauthorfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertauthorfield.png
diff --git a/default_images/res/commandimagelist/sch_insertavmedia.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertavmedia.png
index 1265009e7cc6..1265009e7cc6 100644
--- a/default_images/res/commandimagelist/sch_insertavmedia.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertavmedia.png
diff --git a/default_images/res/commandimagelist/sch_insertbookmark.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertbookmark.png
index 12c09f3d38dd..12c09f3d38dd 100644
--- a/default_images/res/commandimagelist/sch_insertbookmark.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertbookmark.png
diff --git a/default_images/res/commandimagelist/sch_insertcaptiondialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertcaptiondialog.png
index ebd4201127fa..ebd4201127fa 100644
--- a/default_images/res/commandimagelist/sch_insertcaptiondialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertcaptiondialog.png
diff --git a/default_images/res/commandimagelist/sch_insertcellsdown.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertcellsdown.png
index 2281133484f2..2281133484f2 100644
--- a/default_images/res/commandimagelist/sch_insertcellsdown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertcellsdown.png
diff --git a/default_images/res/commandimagelist/sch_insertcellsright.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertcellsright.png
index b998a0d5db2b..b998a0d5db2b 100644
--- a/default_images/res/commandimagelist/sch_insertcellsright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertcellsright.png
diff --git a/default_images/res/commandimagelist/sch_insertcolumns.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertcolumns.png
index badc08eed41d..badc08eed41d 100644
--- a/default_images/res/commandimagelist/sch_insertcolumns.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertcolumns.png
diff --git a/default_images/res/commandimagelist/sch_insertctrl.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertctrl.png
index 41467754f389..41467754f389 100644
--- a/default_images/res/commandimagelist/sch_insertctrl.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertctrl.png
diff --git a/default_images/res/commandimagelist/sch_insertcurrencyfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertcurrencyfield.png
index 314d60cb92ab..314d60cb92ab 100644
--- a/default_images/res/commandimagelist/sch_insertcurrencyfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertcurrencyfield.png
diff --git a/default_images/res/commandimagelist/sch_insertdatefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertdatefield.png
index 720550d4a9db..720550d4a9db 100644
--- a/default_images/res/commandimagelist/sch_insertdatefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertdatefield.png
diff --git a/default_images/res/commandimagelist/sch_insertdoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertdoc.png
index 5e50dc3dd6ca..5e50dc3dd6ca 100644
--- a/default_images/res/commandimagelist/sch_insertdoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertdoc.png
diff --git a/default_images/res/commandimagelist/sch_insertdraw.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertdraw.png
index c25570e93495..c25570e93495 100644
--- a/default_images/res/commandimagelist/sch_insertdraw.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertdraw.png
diff --git a/default_images/res/commandimagelist/sch_insertedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertedit.png
index 6245ac512b79..6245ac512b79 100644
--- a/default_images/res/commandimagelist/sch_insertedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertedit.png
diff --git a/default_images/res/commandimagelist/sch_insertendnote.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertendnote.png
index abc8ccff0ec4..abc8ccff0ec4 100644
--- a/default_images/res/commandimagelist/sch_insertendnote.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertendnote.png
diff --git a/default_images/res/commandimagelist/sch_insertfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertfield.png
index 140cdc15f484..140cdc15f484 100644
--- a/default_images/res/commandimagelist/sch_insertfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertfield.png
diff --git a/default_images/res/commandimagelist/sch_insertfieldctrl.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertfieldctrl.png
index 140cdc15f484..140cdc15f484 100644
--- a/default_images/res/commandimagelist/sch_insertfieldctrl.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertfieldctrl.png
diff --git a/default_images/res/commandimagelist/sch_insertfilecontrol.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertfilecontrol.png
index 724eb1248921..724eb1248921 100644
--- a/default_images/res/commandimagelist/sch_insertfilecontrol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertfilecontrol.png
diff --git a/default_images/res/commandimagelist/sch_insertfixedtext.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertfixedtext.png
index c84f1dcebfc6..c84f1dcebfc6 100644
--- a/default_images/res/commandimagelist/sch_insertfixedtext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertfixedtext.png
diff --git a/default_images/res/commandimagelist/sch_insertfootnote.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertfootnote.png
index e7c18c91a85b..e7c18c91a85b 100644
--- a/default_images/res/commandimagelist/sch_insertfootnote.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertfootnote.png
diff --git a/default_images/res/commandimagelist/sch_insertformattedfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertformattedfield.png
index d546a44014a7..d546a44014a7 100644
--- a/default_images/res/commandimagelist/sch_insertformattedfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertformattedfield.png
diff --git a/default_images/res/commandimagelist/sch_insertformula.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertformula.png
index f623a6037a96..f623a6037a96 100644
--- a/default_images/res/commandimagelist/sch_insertformula.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertformula.png
diff --git a/default_images/res/commandimagelist/sch_insertframe.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertframe.png
index f273c9b73788..f273c9b73788 100644
--- a/default_images/res/commandimagelist/sch_insertframe.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertframe.png
diff --git a/default_images/res/commandimagelist/sch_insertframeinteract.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertframeinteract.png
index f273c9b73788..f273c9b73788 100644
--- a/default_images/res/commandimagelist/sch_insertframeinteract.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertframeinteract.png
diff --git a/default_images/res/commandimagelist/sch_insertframeinteractnocolumns.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertframeinteractnocolumns.png
index f273c9b73788..f273c9b73788 100644
--- a/default_images/res/commandimagelist/sch_insertframeinteractnocolumns.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertframeinteractnocolumns.png
diff --git a/default_images/res/commandimagelist/sch_insertgraphic.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertgraphic.png
index 0c8a02a306dd..0c8a02a306dd 100644
--- a/default_images/res/commandimagelist/sch_insertgraphic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertgraphic.png
diff --git a/default_images/res/commandimagelist/sch_inserthyperlink.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserthyperlink.png
index 83f07138b498..83f07138b498 100644
--- a/default_images/res/commandimagelist/sch_inserthyperlink.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserthyperlink.png
diff --git a/default_images/res/commandimagelist/sch_insertimagecontrol.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertimagecontrol.png
index c4d8d0d62553..c4d8d0d62553 100644
--- a/default_images/res/commandimagelist/sch_insertimagecontrol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertimagecontrol.png
diff --git a/default_images/res/commandimagelist/sch_insertindexesentry.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertindexesentry.png
index 4392542b80b7..4392542b80b7 100644
--- a/default_images/res/commandimagelist/sch_insertindexesentry.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertindexesentry.png
diff --git a/default_images/res/commandimagelist/sch_insertlistbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertlistbox.png
index 31d3858cfca1..31d3858cfca1 100644
--- a/default_images/res/commandimagelist/sch_insertlistbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertlistbox.png
diff --git a/default_images/res/commandimagelist/sch_insertmasterpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertmasterpage.png
index 8c110b8da687..8c110b8da687 100644
--- a/default_images/res/commandimagelist/sch_insertmasterpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertmasterpage.png
diff --git a/default_images/res/commandimagelist/sch_insertmath.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertmath.png
index e7befa3be7e1..e7befa3be7e1 100644
--- a/default_images/res/commandimagelist/sch_insertmath.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertmath.png
diff --git a/default_images/res/commandimagelist/sch_insertneutralparagraph.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertneutralparagraph.png
index e790779620db..e790779620db 100644
--- a/default_images/res/commandimagelist/sch_insertneutralparagraph.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertneutralparagraph.png
diff --git a/default_images/res/commandimagelist/sch_insertnumericfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertnumericfield.png
index 4384a6e50bc0..4384a6e50bc0 100644
--- a/default_images/res/commandimagelist/sch_insertnumericfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertnumericfield.png
diff --git a/default_images/res/commandimagelist/sch_insertobjctrl.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertobjctrl.png
index eb81341f06d2..eb81341f06d2 100644
--- a/default_images/res/commandimagelist/sch_insertobjctrl.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertobjctrl.png
diff --git a/default_images/res/commandimagelist/sch_insertobject.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertobject.png
index dc1afe126a89..dc1afe126a89 100644
--- a/default_images/res/commandimagelist/sch_insertobject.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertobject.png
diff --git a/default_images/res/commandimagelist/sch_insertobjectchart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertobjectchart.png
index 2169a8e39ad6..2169a8e39ad6 100644
--- a/default_images/res/commandimagelist/sch_insertobjectchart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertobjectchart.png
diff --git a/default_images/res/commandimagelist/sch_insertobjectdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertobjectdialog.png
index 34469342810c..34469342810c 100644
--- a/default_images/res/commandimagelist/sch_insertobjectdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertobjectdialog.png
diff --git a/default_images/res/commandimagelist/sch_insertobjectfloatingframe.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertobjectfloatingframe.png
index ac067364111d..ac067364111d 100644
--- a/default_images/res/commandimagelist/sch_insertobjectfloatingframe.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertobjectfloatingframe.png
diff --git a/default_images/res/commandimagelist/sch_insertobjectstarmath.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertobjectstarmath.png
index e7befa3be7e1..e7befa3be7e1 100644
--- a/default_images/res/commandimagelist/sch_insertobjectstarmath.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertobjectstarmath.png
diff --git a/default_images/res/commandimagelist/sch_insertpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertpage.png
index 0be6bcb2e846..0be6bcb2e846 100644
--- a/default_images/res/commandimagelist/sch_insertpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertpage.png
diff --git a/default_images/res/commandimagelist/sch_insertpagecountfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertpagecountfield.png
index 5226be6f3920..5226be6f3920 100644
--- a/default_images/res/commandimagelist/sch_insertpagecountfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertpagecountfield.png
diff --git a/default_images/res/commandimagelist/sch_insertpagenumberfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertpagenumberfield.png
index 68fe826ca897..68fe826ca897 100644
--- a/default_images/res/commandimagelist/sch_insertpagenumberfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertpagenumberfield.png
diff --git a/default_images/res/commandimagelist/sch_insertpatternfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertpatternfield.png
index 90da08b232d6..90da08b232d6 100644
--- a/default_images/res/commandimagelist/sch_insertpatternfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertpatternfield.png
diff --git a/default_images/res/commandimagelist/sch_insertplugin.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertplugin.png
index 2bdc304b2c95..2bdc304b2c95 100644
--- a/default_images/res/commandimagelist/sch_insertplugin.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertplugin.png
diff --git a/default_images/res/commandimagelist/sch_insertpushbutton.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertpushbutton.png
index aa4bbb676cb3..aa4bbb676cb3 100644
--- a/default_images/res/commandimagelist/sch_insertpushbutton.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertpushbutton.png
diff --git a/default_images/res/commandimagelist/sch_insertreferencefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertreferencefield.png
index 4dafb9fcb802..4dafb9fcb802 100644
--- a/default_images/res/commandimagelist/sch_insertreferencefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertreferencefield.png
diff --git a/default_images/res/commandimagelist/sch_insertrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertrows.png
index a7d562eebb82..a7d562eebb82 100644
--- a/default_images/res/commandimagelist/sch_insertrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertrows.png
diff --git a/default_images/res/commandimagelist/sch_insertsection.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertsection.png
index 77726a87acc8..77726a87acc8 100644
--- a/default_images/res/commandimagelist/sch_insertsection.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertsection.png
diff --git a/default_images/res/commandimagelist/sch_insertsound.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertsound.png
index 7f61f661992f..7f61f661992f 100644
--- a/default_images/res/commandimagelist/sch_insertsound.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertsound.png
diff --git a/default_images/res/commandimagelist/sch_insertspreadsheet.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertspreadsheet.png
index d8955c4c2341..d8955c4c2341 100644
--- a/default_images/res/commandimagelist/sch_insertspreadsheet.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertspreadsheet.png
diff --git a/default_images/res/commandimagelist/sch_insertsymbol.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertsymbol.png
index c0f7f5ce03c3..c0f7f5ce03c3 100644
--- a/default_images/res/commandimagelist/sch_insertsymbol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertsymbol.png
diff --git a/default_images/res/commandimagelist/sch_inserttable.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttable.png
index d8955c4c2341..d8955c4c2341 100644
--- a/default_images/res/commandimagelist/sch_inserttable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttable.png
diff --git a/default_images/res/commandimagelist/sch_inserttextframe.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttextframe.png
index f273c9b73788..f273c9b73788 100644
--- a/default_images/res/commandimagelist/sch_inserttextframe.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttextframe.png
diff --git a/default_images/res/commandimagelist/sch_inserttimefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttimefield.png
index 708642e6d7aa..708642e6d7aa 100644
--- a/default_images/res/commandimagelist/sch_inserttimefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttimefield.png
diff --git a/default_images/res/commandimagelist/sch_inserttitlefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttitlefield.png
index 70c804ebf96d..70c804ebf96d 100644
--- a/default_images/res/commandimagelist/sch_inserttitlefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttitlefield.png
diff --git a/default_images/res/commandimagelist/sch_inserttoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttoolbox.png
index 5d7a4668ebb6..5d7a4668ebb6 100644
--- a/default_images/res/commandimagelist/sch_inserttoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttoolbox.png
diff --git a/default_images/res/commandimagelist/sch_inserttopicfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttopicfield.png
index e0931cd7d307..e0931cd7d307 100644
--- a/default_images/res/commandimagelist/sch_inserttopicfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttopicfield.png
diff --git a/default_images/res/commandimagelist/sch_inserttreecontrol.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttreecontrol.png
index 3ef32310502d..3ef32310502d 100644
--- a/default_images/res/commandimagelist/sch_inserttreecontrol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttreecontrol.png
diff --git a/default_images/res/commandimagelist/sch_insertvideo.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertvideo.png
index ba586fdd40b9..ba586fdd40b9 100644
--- a/default_images/res/commandimagelist/sch_insertvideo.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertvideo.png
diff --git a/default_images/res/commandimagelist/sch_insobjctrl.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insobjctrl.png
index ab65e9bdd9e8..ab65e9bdd9e8 100644
--- a/default_images/res/commandimagelist/sch_insobjctrl.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insobjctrl.png
diff --git a/default_images/res/commandimagelist/sch_interactivegradient.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_interactivegradient.png
index 641a9a446331..641a9a446331 100644
--- a/default_images/res/commandimagelist/sch_interactivegradient.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_interactivegradient.png
diff --git a/default_images/res/commandimagelist/sch_interactivetransparence.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_interactivetransparence.png
index 264d3977380a..264d3977380a 100644
--- a/default_images/res/commandimagelist/sch_interactivetransparence.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_interactivetransparence.png
diff --git a/default_images/res/commandimagelist/sch_internetonline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_internetonline.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_internetonline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_internetonline.png
diff --git a/default_images/res/commandimagelist/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_italic.png
index 1e0bbddad047..1e0bbddad047 100644
--- a/default_images/res/commandimagelist/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_italic.png
diff --git a/default_images/res/commandimagelist/sch_justifypara.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_justifypara.png
index 503bddbbd10c..503bddbbd10c 100644
--- a/default_images/res/commandimagelist/sch_justifypara.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_justifypara.png
diff --git a/default_images/res/commandimagelist/sch_label.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_label.png
index c84f1dcebfc6..c84f1dcebfc6 100644
--- a/default_images/res/commandimagelist/sch_label.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_label.png
diff --git a/default_images/res/commandimagelist/sch_lastpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_lastpage.png
index cd980e40a1aa..cd980e40a1aa 100644
--- a/default_images/res/commandimagelist/sch_lastpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_lastpage.png
diff --git a/default_images/res/commandimagelist/sch_lastrecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_lastrecord.png
index 844e697e87a3..844e697e87a3 100644
--- a/default_images/res/commandimagelist/sch_lastrecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_lastrecord.png
diff --git a/default_images/res/commandimagelist/sch_leaveallgroups.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_leaveallgroups.png
index a0d753c4049f..a0d753c4049f 100644
--- a/default_images/res/commandimagelist/sch_leaveallgroups.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_leaveallgroups.png
diff --git a/default_images/res/commandimagelist/sch_leavegroup.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_leavegroup.png
index 776864f3e73f..776864f3e73f 100644
--- a/default_images/res/commandimagelist/sch_leavegroup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_leavegroup.png
diff --git a/default_images/res/commandimagelist/sch_leftpara.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_leftpara.png
index 32cbbf9f5d2b..32cbbf9f5d2b 100644
--- a/default_images/res/commandimagelist/sch_leftpara.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_leftpara.png
diff --git a/default_images/res/commandimagelist/sch_line.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_line.png
index fe13e8cb882f..fe13e8cb882f 100644
--- a/default_images/res/commandimagelist/sch_line.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_line.png
diff --git a/default_images/res/commandimagelist/sch_line_diagonal.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_line_diagonal.png
index 78ab014e7733..78ab014e7733 100644
--- a/default_images/res/commandimagelist/sch_line_diagonal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_line_diagonal.png
diff --git a/default_images/res/commandimagelist/sch_linearrowcircle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linearrowcircle.png
index 0a11b9b36bf6..0a11b9b36bf6 100644
--- a/default_images/res/commandimagelist/sch_linearrowcircle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linearrowcircle.png
diff --git a/default_images/res/commandimagelist/sch_linearrowend.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linearrowend.png
index 42339021bec1..42339021bec1 100644
--- a/default_images/res/commandimagelist/sch_linearrowend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linearrowend.png
diff --git a/default_images/res/commandimagelist/sch_linearrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linearrows.png
index d8725b5dbcaf..d8725b5dbcaf 100644
--- a/default_images/res/commandimagelist/sch_linearrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linearrows.png
diff --git a/default_images/res/commandimagelist/sch_linearrowsquare.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linearrowsquare.png
index 80470715316d..80470715316d 100644
--- a/default_images/res/commandimagelist/sch_linearrowsquare.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linearrowsquare.png
diff --git a/default_images/res/commandimagelist/sch_linearrowstart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linearrowstart.png
index 46c4b54aeeb6..46c4b54aeeb6 100644
--- a/default_images/res/commandimagelist/sch_linearrowstart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linearrowstart.png
diff --git a/default_images/res/commandimagelist/sch_linecirclearrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linecirclearrow.png
index 27c6d567c037..27c6d567c037 100644
--- a/default_images/res/commandimagelist/sch_linecirclearrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linecirclearrow.png
diff --git a/default_images/res/commandimagelist/sch_lineendstyle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_lineendstyle.png
index 4f3fa869dfb0..4f3fa869dfb0 100644
--- a/default_images/res/commandimagelist/sch_lineendstyle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_lineendstyle.png
diff --git a/default_images/res/commandimagelist/sch_linesquarearrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linesquarearrow.png
index eda9c2dec10d..eda9c2dec10d 100644
--- a/default_images/res/commandimagelist/sch_linesquarearrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linesquarearrow.png
diff --git a/default_images/res/commandimagelist/sch_linestyle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linestyle.png
index 6c65b3646dd9..6c65b3646dd9 100644
--- a/default_images/res/commandimagelist/sch_linestyle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linestyle.png
diff --git a/default_images/res/commandimagelist/sch_linetoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linetoolbox.png
index d73f193424a6..d73f193424a6 100644
--- a/default_images/res/commandimagelist/sch_linetoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linetoolbox.png
diff --git a/default_images/res/commandimagelist/sch_linewidth.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linewidth.png
index b79a42cd1cf3..b79a42cd1cf3 100644
--- a/default_images/res/commandimagelist/sch_linewidth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linewidth.png
diff --git a/default_images/res/commandimagelist/sch_listbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_listbox.png
index 71f92a898bdb..71f92a898bdb 100644
--- a/default_images/res/commandimagelist/sch_listbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_listbox.png
diff --git a/default_images/res/commandimagelist/sch_loadbasic.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_loadbasic.png
index e6f9e0232614..e6f9e0232614 100644
--- a/default_images/res/commandimagelist/sch_loadbasic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_loadbasic.png
diff --git a/default_images/res/commandimagelist/sch_macrorecorder.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_macrorecorder.png
index a258d5165a47..a258d5165a47 100644
--- a/default_images/res/commandimagelist/sch_macrorecorder.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_macrorecorder.png
diff --git a/default_images/res/commandimagelist/sch_macrorecordingfloat.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_macrorecordingfloat.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_macrorecordingfloat.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_macrorecordingfloat.png
diff --git a/default_images/res/commandimagelist/sch_mailwindow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_mailwindow.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_mailwindow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_mailwindow.png
diff --git a/default_images/res/commandimagelist/sch_managebreakpoints.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_managebreakpoints.png
index 801dd1de5dec..801dd1de5dec 100644
--- a/default_images/res/commandimagelist/sch_managebreakpoints.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_managebreakpoints.png
diff --git a/default_images/res/commandimagelist/sch_managelanguage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_managelanguage.png
index 51446e6b14ee..51446e6b14ee 100644
--- a/default_images/res/commandimagelist/sch_managelanguage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_managelanguage.png
diff --git a/default_images/res/commandimagelist/sch_marks.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_marks.png
index b443a39349c7..b443a39349c7 100644
--- a/default_images/res/commandimagelist/sch_marks.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_marks.png
diff --git a/default_images/res/commandimagelist/sch_matchgroup.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_matchgroup.png
index 5d78b2688d67..5d78b2688d67 100644
--- a/default_images/res/commandimagelist/sch_matchgroup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_matchgroup.png
diff --git a/default_images/res/commandimagelist/sch_measureline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_measureline.png
index c2161e85c047..c2161e85c047 100644
--- a/default_images/res/commandimagelist/sch_measureline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_measureline.png
diff --git a/default_images/res/commandimagelist/sch_mergecells.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_mergecells.png
index a36508ebf299..a36508ebf299 100644
--- a/default_images/res/commandimagelist/sch_mergecells.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_mergecells.png
diff --git a/default_images/res/commandimagelist/sch_mergedialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_mergedialog.png
index 428bcadc6d41..428bcadc6d41 100644
--- a/default_images/res/commandimagelist/sch_mergedialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_mergedialog.png
diff --git a/default_images/res/commandimagelist/sch_mirror.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_mirror.png
index 9a4d2d550169..9a4d2d550169 100644
--- a/default_images/res/commandimagelist/sch_mirror.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_mirror.png
diff --git a/default_images/res/commandimagelist/sch_modifyframe.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_modifyframe.png
index 5625d8491938..5625d8491938 100644
--- a/default_images/res/commandimagelist/sch_modifyframe.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_modifyframe.png
diff --git a/default_images/res/commandimagelist/sch_modifypage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_modifypage.png
index 5005f3958ba8..5005f3958ba8 100644
--- a/default_images/res/commandimagelist/sch_modifypage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_modifypage.png
diff --git a/default_images/res/commandimagelist/sch_moduledialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_moduledialog.png
index 7e39aad8f559..7e39aad8f559 100644
--- a/default_images/res/commandimagelist/sch_moduledialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_moduledialog.png
diff --git a/default_images/res/commandimagelist/sch_morecontrols.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_morecontrols.png
index 5b2ad25a9e19..5b2ad25a9e19 100644
--- a/default_images/res/commandimagelist/sch_morecontrols.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_morecontrols.png
diff --git a/default_images/res/commandimagelist/sch_movedown.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_movedown.png
index 6c71a8166a46..6c71a8166a46 100644
--- a/default_images/res/commandimagelist/sch_movedown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_movedown.png
diff --git a/default_images/res/commandimagelist/sch_movedownsubitems.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_movedownsubitems.png
index bcdbbd8e231e..bcdbbd8e231e 100644
--- a/default_images/res/commandimagelist/sch_movedownsubitems.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_movedownsubitems.png
diff --git a/default_images/res/commandimagelist/sch_moveup.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_moveup.png
index 588901138dd6..588901138dd6 100644
--- a/default_images/res/commandimagelist/sch_moveup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_moveup.png
diff --git a/default_images/res/commandimagelist/sch_moveupsubitems.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_moveupsubitems.png
index 34724f187bb6..34724f187bb6 100644
--- a/default_images/res/commandimagelist/sch_moveupsubitems.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_moveupsubitems.png
diff --git a/default_images/res/commandimagelist/sch_navigationbar.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_navigationbar.png
index 1a1e3ae314e0..1a1e3ae314e0 100644
--- a/default_images/res/commandimagelist/sch_navigationbar.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_navigationbar.png
diff --git a/default_images/res/commandimagelist/sch_navigator.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_navigator.png
index 5b5e9864858d..5b5e9864858d 100644
--- a/default_images/res/commandimagelist/sch_navigator.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_navigator.png
diff --git a/default_images/res/commandimagelist/sch_newarrangement.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_newarrangement.png
index 4b2ce893077c..4b2ce893077c 100644
--- a/default_images/res/commandimagelist/sch_newarrangement.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_newarrangement.png
diff --git a/default_images/res/commandimagelist/sch_newdoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_newdoc.png
index 8a0a8580c03e..8a0a8580c03e 100644
--- a/default_images/res/commandimagelist/sch_newdoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_newdoc.png
diff --git a/default_images/res/commandimagelist/sch_newrecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_newrecord.png
index 03678b506e1e..03678b506e1e 100644
--- a/default_images/res/commandimagelist/sch_newrecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_newrecord.png
diff --git a/default_images/res/commandimagelist/sch_nextannotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_nextannotation.png
index bf24d42f9b50..bf24d42f9b50 100644
--- a/default_images/res/commandimagelist/sch_nextannotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_nextannotation.png
diff --git a/default_images/res/commandimagelist/sch_nextpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_nextpage.png
index 7518d18b259f..7518d18b259f 100644
--- a/default_images/res/commandimagelist/sch_nextpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_nextpage.png
diff --git a/default_images/res/commandimagelist/sch_nextrecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_nextrecord.png
index 54ed7861b0f2..54ed7861b0f2 100644
--- a/default_images/res/commandimagelist/sch_nextrecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_nextrecord.png
diff --git a/default_images/res/commandimagelist/sch_numberformatcurrency.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatcurrency.png
index b847dfbe0afe..b847dfbe0afe 100644
--- a/default_images/res/commandimagelist/sch_numberformatcurrency.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatcurrency.png
diff --git a/default_images/res/commandimagelist/sch_numberformatdate.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatdate.png
index 720550d4a9db..720550d4a9db 100644
--- a/default_images/res/commandimagelist/sch_numberformatdate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatdate.png
diff --git a/default_images/res/commandimagelist/sch_numberformatdecdecimals.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatdecdecimals.png
index dfae989b07bf..dfae989b07bf 100644
--- a/default_images/res/commandimagelist/sch_numberformatdecdecimals.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatdecdecimals.png
diff --git a/default_images/res/commandimagelist/sch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatdecimal.png
index b5c8c6fb25d3..b5c8c6fb25d3 100644
--- a/default_images/res/commandimagelist/sch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/sch_numberformatincdecimals.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatincdecimals.png
index be0430885269..be0430885269 100644
--- a/default_images/res/commandimagelist/sch_numberformatincdecimals.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatincdecimals.png
diff --git a/default_images/res/commandimagelist/sch_numberformatpercent.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatpercent.png
index 3bc719e43b39..3bc719e43b39 100644
--- a/default_images/res/commandimagelist/sch_numberformatpercent.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatpercent.png
diff --git a/default_images/res/commandimagelist/sch_numberformatscientific.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatscientific.png
index 95cb555e985a..95cb555e985a 100644
--- a/default_images/res/commandimagelist/sch_numberformatscientific.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatscientific.png
diff --git a/default_images/res/commandimagelist/sch_numberformatstandard.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatstandard.png
index a3f5e58c5f1b..a3f5e58c5f1b 100644
--- a/default_images/res/commandimagelist/sch_numberformatstandard.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatstandard.png
diff --git a/default_images/res/commandimagelist/sch_numberingstart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberingstart.png
index c6d4517e10a0..c6d4517e10a0 100644
--- a/default_images/res/commandimagelist/sch_numberingstart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberingstart.png
diff --git a/default_images/res/commandimagelist/sch_numericfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numericfield.png
index 4384a6e50bc0..4384a6e50bc0 100644
--- a/default_images/res/commandimagelist/sch_numericfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numericfield.png
diff --git a/default_images/res/commandimagelist/sch_objectalign.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_objectalign.png
index ef297105e756..ef297105e756 100644
--- a/default_images/res/commandimagelist/sch_objectalign.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_objectalign.png
diff --git a/default_images/res/commandimagelist/sch_objectalignleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_objectalignleft.png
index ef297105e756..ef297105e756 100644
--- a/default_images/res/commandimagelist/sch_objectalignleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_objectalignleft.png
diff --git a/default_images/res/commandimagelist/sch_objectalignright.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_objectalignright.png
index 6d85642d28f0..6d85642d28f0 100644
--- a/default_images/res/commandimagelist/sch_objectalignright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_objectalignright.png
diff --git a/default_images/res/commandimagelist/sch_objectcatalog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_objectcatalog.png
index 0c8a02a306dd..0c8a02a306dd 100644
--- a/default_images/res/commandimagelist/sch_objectcatalog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_objectcatalog.png
diff --git a/default_images/res/commandimagelist/sch_objectposition.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_objectposition.png
index 5abc00f69507..5abc00f69507 100644
--- a/default_images/res/commandimagelist/sch_objectposition.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_objectposition.png
diff --git a/default_images/res/commandimagelist/sch_objects3dtoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_objects3dtoolbox.png
index 3d0f14fa2bb0..3d0f14fa2bb0 100644
--- a/default_images/res/commandimagelist/sch_objects3dtoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_objects3dtoolbox.png
diff --git a/default_images/res/commandimagelist/sch_open.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_open.png
index da6aa8418910..da6aa8418910 100644
--- a/default_images/res/commandimagelist/sch_open.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_open.png
diff --git a/default_images/res/commandimagelist/sch_openreadonly.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_openreadonly.png
index 10b469f12d48..10b469f12d48 100644
--- a/default_images/res/commandimagelist/sch_openreadonly.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_openreadonly.png
diff --git a/default_images/res/commandimagelist/sch_openurl.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_openurl.png
index 3020653d793a..3020653d793a 100644
--- a/default_images/res/commandimagelist/sch_openurl.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_openurl.png
diff --git a/default_images/res/commandimagelist/sch_optimizetable.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_optimizetable.png
index 130bafceff23..130bafceff23 100644
--- a/default_images/res/commandimagelist/sch_optimizetable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_optimizetable.png
diff --git a/default_images/res/commandimagelist/sch_ordercrit.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ordercrit.png
index 50bf5911ce98..50bf5911ce98 100644
--- a/default_images/res/commandimagelist/sch_ordercrit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ordercrit.png
diff --git a/default_images/res/commandimagelist/sch_outlinebullet.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlinebullet.png
index d055b4e28bb0..d055b4e28bb0 100644
--- a/default_images/res/commandimagelist/sch_outlinebullet.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlinebullet.png
diff --git a/default_images/res/commandimagelist/sch_outlinecollapse.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlinecollapse.png
index d9921d2a7762..d9921d2a7762 100644
--- a/default_images/res/commandimagelist/sch_outlinecollapse.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlinecollapse.png
diff --git a/default_images/res/commandimagelist/sch_outlinecollapseall.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlinecollapseall.png
index e106f41145d3..e106f41145d3 100644
--- a/default_images/res/commandimagelist/sch_outlinecollapseall.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlinecollapseall.png
diff --git a/default_images/res/commandimagelist/sch_outlinedown.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlinedown.png
index 6e60c875f9bd..6e60c875f9bd 100644
--- a/default_images/res/commandimagelist/sch_outlinedown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlinedown.png
diff --git a/default_images/res/commandimagelist/sch_outlineexpand.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlineexpand.png
index f2662e8ef155..f2662e8ef155 100644
--- a/default_images/res/commandimagelist/sch_outlineexpand.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlineexpand.png
diff --git a/default_images/res/commandimagelist/sch_outlineexpandall.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlineexpandall.png
index d1d2e834045d..d1d2e834045d 100644
--- a/default_images/res/commandimagelist/sch_outlineexpandall.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlineexpandall.png
diff --git a/default_images/res/commandimagelist/sch_outlinefont.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlinefont.png
index c36e5c7ea6d3..c36e5c7ea6d3 100644
--- a/default_images/res/commandimagelist/sch_outlinefont.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlinefont.png
diff --git a/default_images/res/commandimagelist/sch_outlineformat.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlineformat.png
index 06762c45842a..06762c45842a 100644
--- a/default_images/res/commandimagelist/sch_outlineformat.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlineformat.png
diff --git a/default_images/res/commandimagelist/sch_outlineleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlineleft.png
index 3214cbc65203..3214cbc65203 100644
--- a/default_images/res/commandimagelist/sch_outlineleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlineleft.png
diff --git a/default_images/res/commandimagelist/sch_outlineright.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlineright.png
index 0ed6d39bd2d4..0ed6d39bd2d4 100644
--- a/default_images/res/commandimagelist/sch_outlineright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlineright.png
diff --git a/default_images/res/commandimagelist/sch_outlineup.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlineup.png
index 588901138dd6..588901138dd6 100644
--- a/default_images/res/commandimagelist/sch_outlineup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlineup.png
diff --git a/default_images/res/commandimagelist/sch_overline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_overline.png
index f5681ee913a7..f5681ee913a7 100644
--- a/default_images/res/commandimagelist/sch_overline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_overline.png
diff --git a/default_images/res/commandimagelist/sch_pagedown.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pagedown.png
index 0d6d2ff72d07..0d6d2ff72d07 100644
--- a/default_images/res/commandimagelist/sch_pagedown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pagedown.png
diff --git a/default_images/res/commandimagelist/sch_pageup.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pageup.png
index 5fcd461ce669..5fcd461ce669 100644
--- a/default_images/res/commandimagelist/sch_pageup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pageup.png
diff --git a/default_images/res/commandimagelist/sch_paragraphdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_paragraphdialog.png
index 7ad56af76d65..7ad56af76d65 100644
--- a/default_images/res/commandimagelist/sch_paragraphdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_paragraphdialog.png
diff --git a/default_images/res/commandimagelist/sch_paralefttoright.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_paralefttoright.png
index 743789daa1d9..743789daa1d9 100644
--- a/default_images/res/commandimagelist/sch_paralefttoright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_paralefttoright.png
diff --git a/default_images/res/commandimagelist/sch_pararighttoleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pararighttoleft.png
index 0ab0e20d3520..0ab0e20d3520 100644
--- a/default_images/res/commandimagelist/sch_pararighttoleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pararighttoleft.png
diff --git a/default_images/res/commandimagelist/sch_paraspacedecrease.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_paraspacedecrease.png
index 22059c3246ab..22059c3246ab 100644
--- a/default_images/res/commandimagelist/sch_paraspacedecrease.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_paraspacedecrease.png
diff --git a/default_images/res/commandimagelist/sch_paraspaceincrease.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_paraspaceincrease.png
index 69c05df90663..69c05df90663 100644
--- a/default_images/res/commandimagelist/sch_paraspaceincrease.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_paraspaceincrease.png
diff --git a/default_images/res/commandimagelist/sch_paste.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_paste.png
index 26059505adb2..26059505adb2 100644
--- a/default_images/res/commandimagelist/sch_paste.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_paste.png
diff --git a/default_images/res/commandimagelist/sch_patternfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_patternfield.png
index 90da08b232d6..90da08b232d6 100644
--- a/default_images/res/commandimagelist/sch_patternfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_patternfield.png
diff --git a/default_images/res/commandimagelist/sch_pickthrough.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pickthrough.png
index b1f3958967d4..b1f3958967d4 100644
--- a/default_images/res/commandimagelist/sch_pickthrough.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pickthrough.png
diff --git a/default_images/res/commandimagelist/sch_pie.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pie.png
index 74c04e4a359c..74c04e4a359c 100644
--- a/default_images/res/commandimagelist/sch_pie.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pie.png
diff --git a/default_images/res/commandimagelist/sch_pie_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pie_unfilled.png
index 35fa968bf476..35fa968bf476 100644
--- a/default_images/res/commandimagelist/sch_pie_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pie_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_playmacro.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_playmacro.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_playmacro.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_playmacro.png
diff --git a/default_images/res/commandimagelist/sch_pluginsactive.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pluginsactive.png
index 2bdc304b2c95..2bdc304b2c95 100644
--- a/default_images/res/commandimagelist/sch_pluginsactive.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pluginsactive.png
diff --git a/default_images/res/commandimagelist/sch_polygon.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_polygon.png
index 3b426e062a3f..3b426e062a3f 100644
--- a/default_images/res/commandimagelist/sch_polygon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_polygon.png
diff --git a/default_images/res/commandimagelist/sch_polygon_diagonal.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_polygon_diagonal.png
index dc4767f64407..dc4767f64407 100644
--- a/default_images/res/commandimagelist/sch_polygon_diagonal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_polygon_diagonal.png
diff --git a/default_images/res/commandimagelist/sch_polygon_diagonal_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_polygon_diagonal_unfilled.png
index c559e02f1e62..c559e02f1e62 100644
--- a/default_images/res/commandimagelist/sch_polygon_diagonal_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_polygon_diagonal_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_polygon_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_polygon_unfilled.png
index b33ade0f148e..b33ade0f148e 100644
--- a/default_images/res/commandimagelist/sch_polygon_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_polygon_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_presentation.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_presentation.png
index 9d4fd34985e4..9d4fd34985e4 100644
--- a/default_images/res/commandimagelist/sch_presentation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_presentation.png
diff --git a/default_images/res/commandimagelist/sch_presentationlayout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_presentationlayout.png
index 2b91dbb16b24..2b91dbb16b24 100644
--- a/default_images/res/commandimagelist/sch_presentationlayout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_presentationlayout.png
diff --git a/default_images/res/commandimagelist/sch_preview.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_preview.png
index 23e5126a30ab..23e5126a30ab 100644
--- a/default_images/res/commandimagelist/sch_preview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_preview.png
diff --git a/default_images/res/commandimagelist/sch_previewprintoptions.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_previewprintoptions.png
index b0277e6decba..b0277e6decba 100644
--- a/default_images/res/commandimagelist/sch_previewprintoptions.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_previewprintoptions.png
diff --git a/default_images/res/commandimagelist/sch_previewzoom.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_previewzoom.png
index 58b8c6c2ec5b..58b8c6c2ec5b 100644
--- a/default_images/res/commandimagelist/sch_previewzoom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_previewzoom.png
diff --git a/default_images/res/commandimagelist/sch_previousannotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_previousannotation.png
index d314f18c4517..d314f18c4517 100644
--- a/default_images/res/commandimagelist/sch_previousannotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_previousannotation.png
diff --git a/default_images/res/commandimagelist/sch_previouspage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_previouspage.png
index 42753ec8bd77..42753ec8bd77 100644
--- a/default_images/res/commandimagelist/sch_previouspage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_previouspage.png
diff --git a/default_images/res/commandimagelist/sch_prevrecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_prevrecord.png
index 348efed0f0f3..348efed0f0f3 100644
--- a/default_images/res/commandimagelist/sch_prevrecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_prevrecord.png
diff --git a/default_images/res/commandimagelist/sch_print.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_print.png
index 67cb5d1ff186..67cb5d1ff186 100644
--- a/default_images/res/commandimagelist/sch_print.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_print.png
diff --git a/default_images/res/commandimagelist/sch_printdefault.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_printdefault.png
index 3bb245a71008..3bb245a71008 100644
--- a/default_images/res/commandimagelist/sch_printdefault.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_printdefault.png
diff --git a/default_images/res/commandimagelist/sch_printersetup.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_printersetup.png
index a83089ebbc12..a83089ebbc12 100644
--- a/default_images/res/commandimagelist/sch_printersetup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_printersetup.png
diff --git a/default_images/res/commandimagelist/sch_printlayout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_printlayout.png
index c261664599ef..c261664599ef 100644
--- a/default_images/res/commandimagelist/sch_printlayout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_printlayout.png
diff --git a/default_images/res/commandimagelist/sch_printpagepreview.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_printpagepreview.png
index cb1f07735691..cb1f07735691 100644
--- a/default_images/res/commandimagelist/sch_printpagepreview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_printpagepreview.png
diff --git a/default_images/res/commandimagelist/sch_printpreview.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_printpreview.png
index a705f64a0dc5..a705f64a0dc5 100644
--- a/default_images/res/commandimagelist/sch_printpreview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_printpreview.png
diff --git a/default_images/res/commandimagelist/sch_progressbar.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_progressbar.png
index 0342fdd21f72..0342fdd21f72 100644
--- a/default_images/res/commandimagelist/sch_progressbar.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_progressbar.png
diff --git a/default_images/res/commandimagelist/sch_pushbutton.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pushbutton.png
index aa4bbb676cb3..aa4bbb676cb3 100644
--- a/default_images/res/commandimagelist/sch_pushbutton.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pushbutton.png
diff --git a/default_images/res/commandimagelist/sch_quickedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_quickedit.png
index 07843b37fa9c..07843b37fa9c 100644
--- a/default_images/res/commandimagelist/sch_quickedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_quickedit.png
diff --git a/default_images/res/commandimagelist/sch_quit.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_quit.png
index e9eadb62f6e3..e9eadb62f6e3 100644
--- a/default_images/res/commandimagelist/sch_quit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_quit.png
diff --git a/default_images/res/commandimagelist/sch_radiobutton.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_radiobutton.png
index f4b7641df677..f4b7641df677 100644
--- a/default_images/res/commandimagelist/sch_radiobutton.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_radiobutton.png
diff --git a/default_images/res/commandimagelist/sch_recsave.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_recsave.png
index 33692f73cf62..33692f73cf62 100644
--- a/default_images/res/commandimagelist/sch_recsave.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_recsave.png
diff --git a/default_images/res/commandimagelist/sch_recsearch.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_recsearch.png
index 3f24a7a5af19..3f24a7a5af19 100644
--- a/default_images/res/commandimagelist/sch_recsearch.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_recsearch.png
diff --git a/default_images/res/commandimagelist/sch_rect.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rect.png
index 05498575b823..05498575b823 100644
--- a/default_images/res/commandimagelist/sch_rect.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rect.png
diff --git a/default_images/res/commandimagelist/sch_rect_rounded.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rect_rounded.png
index b8d9fa717421..b8d9fa717421 100644
--- a/default_images/res/commandimagelist/sch_rect_rounded.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rect_rounded.png
diff --git a/default_images/res/commandimagelist/sch_rect_rounded_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rect_rounded_unfilled.png
index 7621ad42a247..7621ad42a247 100644
--- a/default_images/res/commandimagelist/sch_rect_rounded_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rect_rounded_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_rect_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rect_unfilled.png
index 4420d7c31907..4420d7c31907 100644
--- a/default_images/res/commandimagelist/sch_rect_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rect_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_rectangletoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rectangletoolbox.png
index 05498575b823..05498575b823 100644
--- a/default_images/res/commandimagelist/sch_rectangletoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rectangletoolbox.png
diff --git a/default_images/res/commandimagelist/sch_recundo.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_recundo.png
index 948dc8ba3ece..948dc8ba3ece 100644
--- a/default_images/res/commandimagelist/sch_recundo.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_recundo.png
diff --git a/default_images/res/commandimagelist/sch_redo.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_redo.png
index ec12483664f5..ec12483664f5 100644
--- a/default_images/res/commandimagelist/sch_redo.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_redo.png
diff --git a/default_images/res/commandimagelist/sch_refresh.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_refresh.png
index c8c62db27805..c8c62db27805 100644
--- a/default_images/res/commandimagelist/sch_refresh.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_refresh.png
diff --git a/default_images/res/commandimagelist/sch_refreshformcontrol.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_refreshformcontrol.png
index e5aa4f6ca076..e5aa4f6ca076 100644
--- a/default_images/res/commandimagelist/sch_refreshformcontrol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_refreshformcontrol.png
diff --git a/default_images/res/commandimagelist/sch_rehearsetimings.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rehearsetimings.png
index 4ea821c93769..4ea821c93769 100644
--- a/default_images/res/commandimagelist/sch_rehearsetimings.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rehearsetimings.png
diff --git a/default_images/res/commandimagelist/sch_reload.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_reload.png
index 2b2bf3264732..2b2bf3264732 100644
--- a/default_images/res/commandimagelist/sch_reload.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_reload.png
diff --git a/default_images/res/commandimagelist/sch_removebullets.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_removebullets.png
index f240167773d1..f240167773d1 100644
--- a/default_images/res/commandimagelist/sch_removebullets.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_removebullets.png
diff --git a/default_images/res/commandimagelist/sch_removefilter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_removefilter.png
index 0e04871779e5..0e04871779e5 100644
--- a/default_images/res/commandimagelist/sch_removefilter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_removefilter.png
diff --git a/default_images/res/commandimagelist/sch_removefiltersort.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_removefiltersort.png
index d80f2f32f42b..d80f2f32f42b 100644
--- a/default_images/res/commandimagelist/sch_removefiltersort.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_removefiltersort.png
diff --git a/default_images/res/commandimagelist/sch_renamemasterpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_renamemasterpage.png
index d3c874fca47f..d3c874fca47f 100644
--- a/default_images/res/commandimagelist/sch_renamemasterpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_renamemasterpage.png
diff --git a/default_images/res/commandimagelist/sch_repeat.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_repeat.png
index 5101a6e85593..5101a6e85593 100644
--- a/default_images/res/commandimagelist/sch_repeat.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_repeat.png
diff --git a/default_images/res/commandimagelist/sch_reportnavigator.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_reportnavigator.png
index bd247a9f25ce..bd247a9f25ce 100644
--- a/default_images/res/commandimagelist/sch_reportnavigator.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_reportnavigator.png
diff --git a/default_images/res/commandimagelist/sch_reverseorder.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_reverseorder.png
index e7e9f13284ad..e7e9f13284ad 100644
--- a/default_images/res/commandimagelist/sch_reverseorder.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_reverseorder.png
diff --git a/default_images/res/commandimagelist/sch_rightpara.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rightpara.png
index 89cdc084247b..89cdc084247b 100644
--- a/default_images/res/commandimagelist/sch_rightpara.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rightpara.png
diff --git a/default_images/res/commandimagelist/sch_rulerrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rulerrows.png
index 89b6cb002bbe..89b6cb002bbe 100644
--- a/default_images/res/commandimagelist/sch_rulerrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rulerrows.png
diff --git a/default_images/res/commandimagelist/sch_rulerrowsvertical.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rulerrowsvertical.png
index e52e2371344a..e52e2371344a 100644
--- a/default_images/res/commandimagelist/sch_rulerrowsvertical.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rulerrowsvertical.png
diff --git a/default_images/res/commandimagelist/sch_runbasic.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_runbasic.png
index f5e8de8f94cc..f5e8de8f94cc 100644
--- a/default_images/res/commandimagelist/sch_runbasic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_runbasic.png
diff --git a/default_images/res/commandimagelist/sch_save.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_save.png
index b5add43c0596..b5add43c0596 100644
--- a/default_images/res/commandimagelist/sch_save.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_save.png
diff --git a/default_images/res/commandimagelist/sch_saveas.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_saveas.png
index b8914b52f420..b8914b52f420 100644
--- a/default_images/res/commandimagelist/sch_saveas.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_saveas.png
diff --git a/default_images/res/commandimagelist/sch_saveastemplate.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_saveastemplate.png
index 776319cac4ec..776319cac4ec 100644
--- a/default_images/res/commandimagelist/sch_saveastemplate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_saveastemplate.png
diff --git a/default_images/res/commandimagelist/sch_savebasicas.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_savebasicas.png
index 5aade5f46ed0..5aade5f46ed0 100644
--- a/default_images/res/commandimagelist/sch_savebasicas.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_savebasicas.png
diff --git a/default_images/res/commandimagelist/sch_sbabrwinsert.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sbabrwinsert.png
index b116ca53d5c8..b116ca53d5c8 100644
--- a/default_images/res/commandimagelist/sch_sbabrwinsert.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sbabrwinsert.png
diff --git a/default_images/res/commandimagelist/sch_sbaexecutesql.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sbaexecutesql.png
index 3943408dac30..3943408dac30 100644
--- a/default_images/res/commandimagelist/sch_sbaexecutesql.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sbaexecutesql.png
diff --git a/default_images/res/commandimagelist/sch_sbanativesql.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sbanativesql.png
index b7e9607a619b..b7e9607a619b 100644
--- a/default_images/res/commandimagelist/sch_sbanativesql.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sbanativesql.png
diff --git a/default_images/res/commandimagelist/sch_scaletext.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_scaletext.png
index 1f12e6bbba96..1f12e6bbba96 100644
--- a/default_images/res/commandimagelist/sch_scaletext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_scaletext.png
diff --git a/default_images/res/commandimagelist/sch_scrollbar.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_scrollbar.png
index 79b3148cfd1c..79b3148cfd1c 100644
--- a/default_images/res/commandimagelist/sch_scrollbar.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_scrollbar.png
diff --git a/default_images/res/commandimagelist/sch_searchdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_searchdialog.png
index 0901cc237f6d..0901cc237f6d 100644
--- a/default_images/res/commandimagelist/sch_searchdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_searchdialog.png
diff --git a/default_images/res/commandimagelist/sch_sectionalignbottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionalignbottom.png
index 7201672783d1..7201672783d1 100644
--- a/default_images/res/commandimagelist/sch_sectionalignbottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionalignbottom.png
diff --git a/default_images/res/commandimagelist/sch_sectionalignleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionalignleft.png
index d8e591690358..d8e591690358 100644
--- a/default_images/res/commandimagelist/sch_sectionalignleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionalignleft.png
diff --git a/default_images/res/commandimagelist/sch_sectionalignright.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionalignright.png
index e9c32766047d..e9c32766047d 100644
--- a/default_images/res/commandimagelist/sch_sectionalignright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionalignright.png
diff --git a/default_images/res/commandimagelist/sch_sectionaligntop.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionaligntop.png
index 66f82c4c3641..66f82c4c3641 100644
--- a/default_images/res/commandimagelist/sch_sectionaligntop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionaligntop.png
diff --git a/default_images/res/commandimagelist/sch_sectionshrink.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionshrink.png
index 9daa3dc30ed7..9daa3dc30ed7 100644
--- a/default_images/res/commandimagelist/sch_sectionshrink.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionshrink.png
diff --git a/default_images/res/commandimagelist/sch_sectionshrinkbottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionshrinkbottom.png
index f01836f55163..f01836f55163 100644
--- a/default_images/res/commandimagelist/sch_sectionshrinkbottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionshrinkbottom.png
diff --git a/default_images/res/commandimagelist/sch_sectionshrinktop.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionshrinktop.png
index f2de4c747e3e..f2de4c747e3e 100644
--- a/default_images/res/commandimagelist/sch_sectionshrinktop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionshrinktop.png
diff --git a/default_images/res/commandimagelist/sch_selectall.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_selectall.png
index cac437f00146..cac437f00146 100644
--- a/default_images/res/commandimagelist/sch_selectall.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_selectall.png
diff --git a/default_images/res/commandimagelist/sch_selectmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_selectmode.png
index f8d2ff0a175e..f8d2ff0a175e 100644
--- a/default_images/res/commandimagelist/sch_selectmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_selectmode.png
diff --git a/default_images/res/commandimagelist/sch_selectobject.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_selectobject.png
index 206ab1534e90..206ab1534e90 100644
--- a/default_images/res/commandimagelist/sch_selectobject.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_selectobject.png
diff --git a/default_images/res/commandimagelist/sch_selecttable.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_selecttable.png
index 5b4798ef8e26..5b4798ef8e26 100644
--- a/default_images/res/commandimagelist/sch_selecttable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_selecttable.png
diff --git a/default_images/res/commandimagelist/sch_sendfax.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sendfax.png
index 1af40ce0d25e..1af40ce0d25e 100644
--- a/default_images/res/commandimagelist/sch_sendfax.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sendfax.png
diff --git a/default_images/res/commandimagelist/sch_sendmail.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sendmail.png
index eb0e2705085c..eb0e2705085c 100644
--- a/default_images/res/commandimagelist/sch_sendmail.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sendmail.png
diff --git a/default_images/res/commandimagelist/sch_sendtoback.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sendtoback.png
index 64c6f61eff24..64c6f61eff24 100644
--- a/default_images/res/commandimagelist/sch_sendtoback.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sendtoback.png
diff --git a/default_images/res/commandimagelist/sch_setborderstyle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setborderstyle.png
index e94aff18c5a9..e94aff18c5a9 100644
--- a/default_images/res/commandimagelist/sch_setborderstyle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setborderstyle.png
diff --git a/default_images/res/commandimagelist/sch_setdocumentproperties.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setdocumentproperties.png
index e9a94d606362..e9a94d606362 100644
--- a/default_images/res/commandimagelist/sch_setdocumentproperties.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setdocumentproperties.png
diff --git a/default_images/res/commandimagelist/sch_setobjecttobackground.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setobjecttobackground.png
index f629237f485f..f629237f485f 100644
--- a/default_images/res/commandimagelist/sch_setobjecttobackground.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setobjecttobackground.png
diff --git a/default_images/res/commandimagelist/sch_setobjecttoforeground.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setobjecttoforeground.png
index 2efc600092e6..2efc600092e6 100644
--- a/default_images/res/commandimagelist/sch_setobjecttoforeground.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setobjecttoforeground.png
diff --git a/default_images/res/commandimagelist/sch_setoptimalcolumnwidth.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setoptimalcolumnwidth.png
index bd7188f3a9f8..bd7188f3a9f8 100644
--- a/default_images/res/commandimagelist/sch_setoptimalcolumnwidth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setoptimalcolumnwidth.png
diff --git a/default_images/res/commandimagelist/sch_setoptimalcolumnwidthdirect.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setoptimalcolumnwidthdirect.png
index 72f347c2a4d7..72f347c2a4d7 100644
--- a/default_images/res/commandimagelist/sch_setoptimalcolumnwidthdirect.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setoptimalcolumnwidthdirect.png
diff --git a/default_images/res/commandimagelist/sch_setoptimalrowheight.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setoptimalrowheight.png
index 15b3506c6fbc..15b3506c6fbc 100644
--- a/default_images/res/commandimagelist/sch_setoptimalrowheight.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setoptimalrowheight.png
diff --git a/default_images/res/commandimagelist/sch_shadowcursor.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_shadowcursor.png
index 75cc3ab656bb..75cc3ab656bb 100644
--- a/default_images/res/commandimagelist/sch_shadowcursor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_shadowcursor.png
diff --git a/default_images/res/commandimagelist/sch_shadowed.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_shadowed.png
index c2c23ab411ec..c2c23ab411ec 100644
--- a/default_images/res/commandimagelist/sch_shadowed.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_shadowed.png
diff --git a/default_images/res/commandimagelist/sch_shear.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_shear.png
index 0cb9ce0ed165..0cb9ce0ed165 100644
--- a/default_images/res/commandimagelist/sch_shear.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_shear.png
diff --git a/default_images/res/commandimagelist/sch_shell3d.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_shell3d.png
index b2017d563fa9..b2017d563fa9 100644
--- a/default_images/res/commandimagelist/sch_shell3d.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_shell3d.png
diff --git a/default_images/res/commandimagelist/sch_showannotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showannotation.png
index 55de1a69d16e..55de1a69d16e 100644
--- a/default_images/res/commandimagelist/sch_showannotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showannotation.png
diff --git a/default_images/res/commandimagelist/sch_showbookview.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showbookview.png
index 964957d35693..964957d35693 100644
--- a/default_images/res/commandimagelist/sch_showbookview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showbookview.png
diff --git a/default_images/res/commandimagelist/sch_showbrowser.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showbrowser.png
index 12e0be1ab5cf..12e0be1ab5cf 100644
--- a/default_images/res/commandimagelist/sch_showbrowser.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showbrowser.png
diff --git a/default_images/res/commandimagelist/sch_showdatanavigator.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showdatanavigator.png
index 76c0a0ac22f5..76c0a0ac22f5 100644
--- a/default_images/res/commandimagelist/sch_showdatanavigator.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showdatanavigator.png
diff --git a/default_images/res/commandimagelist/sch_showfmexplorer.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showfmexplorer.png
index 94191ffbecf7..94191ffbecf7 100644
--- a/default_images/res/commandimagelist/sch_showfmexplorer.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showfmexplorer.png
diff --git a/default_images/res/commandimagelist/sch_showmultiplepages.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showmultiplepages.png
index a6bda4395e1c..a6bda4395e1c 100644
--- a/default_images/res/commandimagelist/sch_showmultiplepages.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showmultiplepages.png
diff --git a/default_images/res/commandimagelist/sch_showpropbrowser.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showpropbrowser.png
index fb40afb1f4db..fb40afb1f4db 100644
--- a/default_images/res/commandimagelist/sch_showpropbrowser.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showpropbrowser.png
diff --git a/default_images/res/commandimagelist/sch_showslide.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showslide.png
index 78086efdb73d..78086efdb73d 100644
--- a/default_images/res/commandimagelist/sch_showslide.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showslide.png
diff --git a/default_images/res/commandimagelist/sch_showtwopages.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showtwopages.png
index e0ccf6be8274..e0ccf6be8274 100644
--- a/default_images/res/commandimagelist/sch_showtwopages.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showtwopages.png
diff --git a/default_images/res/commandimagelist/sch_shrink.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_shrink.png
index a5bd3c8222ac..a5bd3c8222ac 100644
--- a/default_images/res/commandimagelist/sch_shrink.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_shrink.png
diff --git a/default_images/res/commandimagelist/sch_smallestheight.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_smallestheight.png
index 411e4aac7b13..411e4aac7b13 100644
--- a/default_images/res/commandimagelist/sch_smallestheight.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_smallestheight.png
diff --git a/default_images/res/commandimagelist/sch_smallestwidth.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_smallestwidth.png
index 5973e2c97bf1..5973e2c97bf1 100644
--- a/default_images/res/commandimagelist/sch_smallestwidth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_smallestwidth.png
diff --git a/default_images/res/commandimagelist/sch_snapborder.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_snapborder.png
index 6197d556c69a..6197d556c69a 100644
--- a/default_images/res/commandimagelist/sch_snapborder.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_snapborder.png
diff --git a/default_images/res/commandimagelist/sch_snapframe.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_snapframe.png
index 9afc70641844..9afc70641844 100644
--- a/default_images/res/commandimagelist/sch_snapframe.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_snapframe.png
diff --git a/default_images/res/commandimagelist/sch_snappoints.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_snappoints.png
index f2949438a55a..f2949438a55a 100644
--- a/default_images/res/commandimagelist/sch_snappoints.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_snappoints.png
diff --git a/default_images/res/commandimagelist/sch_solidcreate.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_solidcreate.png
index a644b4ac15ca..a644b4ac15ca 100644
--- a/default_images/res/commandimagelist/sch_solidcreate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_solidcreate.png
diff --git a/default_images/res/commandimagelist/sch_sortascending.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sortascending.png
index 8f3ceada0efe..8f3ceada0efe 100644
--- a/default_images/res/commandimagelist/sch_sortascending.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sortascending.png
diff --git a/default_images/res/commandimagelist/sch_sortdescending.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sortdescending.png
index 03c3f9146ae2..03c3f9146ae2 100644
--- a/default_images/res/commandimagelist/sch_sortdescending.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sortdescending.png
diff --git a/default_images/res/commandimagelist/sch_sortdown.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sortdown.png
index 041274d08227..041274d08227 100644
--- a/default_images/res/commandimagelist/sch_sortdown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sortdown.png
diff --git a/default_images/res/commandimagelist/sch_sortup.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sortup.png
index 70f7f8e37ca9..70f7f8e37ca9 100644
--- a/default_images/res/commandimagelist/sch_sortup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sortup.png
diff --git a/default_images/res/commandimagelist/sch_sourceview.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sourceview.png
index 2149d66fcd7e..2149d66fcd7e 100644
--- a/default_images/res/commandimagelist/sch_sourceview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sourceview.png
diff --git a/default_images/res/commandimagelist/sch_spacepara1.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spacepara1.png
index 503bddbbd10c..503bddbbd10c 100644
--- a/default_images/res/commandimagelist/sch_spacepara1.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spacepara1.png
diff --git a/default_images/res/commandimagelist/sch_spacepara15.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spacepara15.png
index b0e9aa9d55a7..b0e9aa9d55a7 100644
--- a/default_images/res/commandimagelist/sch_spacepara15.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spacepara15.png
diff --git a/default_images/res/commandimagelist/sch_spacepara2.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spacepara2.png
index 1c7ad82bf048..1c7ad82bf048 100644
--- a/default_images/res/commandimagelist/sch_spacepara2.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spacepara2.png
diff --git a/default_images/res/commandimagelist/sch_spelldialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spelldialog.png
index ee12cb00b554..ee12cb00b554 100644
--- a/default_images/res/commandimagelist/sch_spelldialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spelldialog.png
diff --git a/default_images/res/commandimagelist/sch_spelling.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spelling.png
index ef6d27b312d9..ef6d27b312d9 100644
--- a/default_images/res/commandimagelist/sch_spelling.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spelling.png
diff --git a/default_images/res/commandimagelist/sch_spellingandgrammardialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spellingandgrammardialog.png
index ee12cb00b554..ee12cb00b554 100644
--- a/default_images/res/commandimagelist/sch_spellingandgrammardialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spellingandgrammardialog.png
diff --git a/default_images/res/commandimagelist/sch_spellonline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spellonline.png
index 579a4f0749da..579a4f0749da 100644
--- a/default_images/res/commandimagelist/sch_spellonline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spellonline.png
diff --git a/default_images/res/commandimagelist/sch_sphere.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sphere.png
index b2a703c9dc3e..b2a703c9dc3e 100644
--- a/default_images/res/commandimagelist/sch_sphere.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sphere.png
diff --git a/default_images/res/commandimagelist/sch_spinbutton.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spinbutton.png
index 0c66e0d5d9be..0c66e0d5d9be 100644
--- a/default_images/res/commandimagelist/sch_spinbutton.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spinbutton.png
diff --git a/default_images/res/commandimagelist/sch_splitcell.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_splitcell.png
index 6b59a11744ff..6b59a11744ff 100644
--- a/default_images/res/commandimagelist/sch_splitcell.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_splitcell.png
diff --git a/default_images/res/commandimagelist/sch_splithorizontal.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_splithorizontal.png
index 31fd771fc749..31fd771fc749 100644
--- a/default_images/res/commandimagelist/sch_splithorizontal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_splithorizontal.png
diff --git a/default_images/res/commandimagelist/sch_splitparenthorizontal.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_splitparenthorizontal.png
index 31fd771fc749..31fd771fc749 100644
--- a/default_images/res/commandimagelist/sch_splitparenthorizontal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_splitparenthorizontal.png
diff --git a/default_images/res/commandimagelist/sch_splitparentvertical.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_splitparentvertical.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_splitparentvertical.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_splitparentvertical.png
diff --git a/default_images/res/commandimagelist/sch_splitvertical.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_splitvertical.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_splitvertical.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_splitvertical.png
diff --git a/default_images/res/commandimagelist/sch_square.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_square.png
index 409e91d061bf..409e91d061bf 100644
--- a/default_images/res/commandimagelist/sch_square.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_square.png
diff --git a/default_images/res/commandimagelist/sch_square_rounded.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_square_rounded.png
index afc0127f13cd..afc0127f13cd 100644
--- a/default_images/res/commandimagelist/sch_square_rounded.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_square_rounded.png
diff --git a/default_images/res/commandimagelist/sch_square_rounded_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_square_rounded_unfilled.png
index 32dfb1b91be9..32dfb1b91be9 100644
--- a/default_images/res/commandimagelist/sch_square_rounded_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_square_rounded_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_square_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_square_unfilled.png
index 766af567301e..766af567301e 100644
--- a/default_images/res/commandimagelist/sch_square_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_square_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_starchartdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starchartdialog.png
index 2169a8e39ad6..2169a8e39ad6 100644
--- a/default_images/res/commandimagelist/sch_starchartdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starchartdialog.png
diff --git a/default_images/res/commandimagelist/sch_starshapes.bang.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.bang.png
index 1b1b56f5a91b..1b1b56f5a91b 100644
--- a/default_images/res/commandimagelist/sch_starshapes.bang.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.bang.png
diff --git a/default_images/res/commandimagelist/sch_starshapes.concave-star6.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.concave-star6.png
index aa3b1f0c2e4d..aa3b1f0c2e4d 100644
--- a/default_images/res/commandimagelist/sch_starshapes.concave-star6.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.concave-star6.png
diff --git a/default_images/res/commandimagelist/sch_starshapes.doorplate.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.doorplate.png
index 01b4cf4be264..01b4cf4be264 100644
--- a/default_images/res/commandimagelist/sch_starshapes.doorplate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.doorplate.png
diff --git a/default_images/res/commandimagelist/sch_starshapes.horizontal-scroll.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.horizontal-scroll.png
index 99bd71e797d9..99bd71e797d9 100644
--- a/default_images/res/commandimagelist/sch_starshapes.horizontal-scroll.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.horizontal-scroll.png
diff --git a/default_images/res/commandimagelist/sch_starshapes.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.png
index f2f45a94cb4d..f2f45a94cb4d 100644
--- a/default_images/res/commandimagelist/sch_starshapes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.png
diff --git a/default_images/res/commandimagelist/sch_starshapes.signet.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.signet.png
index a78b1d23775c..a78b1d23775c 100644
--- a/default_images/res/commandimagelist/sch_starshapes.signet.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.signet.png
diff --git a/default_images/res/commandimagelist/sch_starshapes.star12.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.star12.png
index 6e063f999d3f..6e063f999d3f 100644
--- a/default_images/res/commandimagelist/sch_starshapes.star12.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.star12.png
diff --git a/default_images/res/commandimagelist/sch_starshapes.star24.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.star24.png
index f7cd23edb919..f7cd23edb919 100644
--- a/default_images/res/commandimagelist/sch_starshapes.star24.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.star24.png
diff --git a/default_images/res/commandimagelist/sch_starshapes.star4.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.star4.png
index 9a8437ae79eb..9a8437ae79eb 100644
--- a/default_images/res/commandimagelist/sch_starshapes.star4.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.star4.png
diff --git a/default_images/res/commandimagelist/sch_starshapes.star5.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.star5.png
index 201aa5fe7913..201aa5fe7913 100644
--- a/default_images/res/commandimagelist/sch_starshapes.star5.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.star5.png
diff --git a/default_images/res/commandimagelist/sch_starshapes.star6.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.star6.png
index 4bd91e172846..4bd91e172846 100644
--- a/default_images/res/commandimagelist/sch_starshapes.star6.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.star6.png
diff --git a/default_images/res/commandimagelist/sch_starshapes.star8.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.star8.png
index cb57b50c15ff..cb57b50c15ff 100644
--- a/default_images/res/commandimagelist/sch_starshapes.star8.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.star8.png
diff --git a/default_images/res/commandimagelist/sch_starshapes.vertical-scroll.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.vertical-scroll.png
index d326c946e45f..d326c946e45f 100644
--- a/default_images/res/commandimagelist/sch_starshapes.vertical-scroll.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.vertical-scroll.png
diff --git a/default_images/res/commandimagelist/sch_strikeout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_strikeout.png
index cd2076f20913..cd2076f20913 100644
--- a/default_images/res/commandimagelist/sch_strikeout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_strikeout.png
diff --git a/default_images/res/commandimagelist/sch_styleapply.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_styleapply.png
index 4270ab7ad34c..4270ab7ad34c 100644
--- a/default_images/res/commandimagelist/sch_styleapply.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_styleapply.png
diff --git a/default_images/res/commandimagelist/sch_stylenewbyexample.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_stylenewbyexample.png
index 0f8ccee50cf0..0f8ccee50cf0 100644
--- a/default_images/res/commandimagelist/sch_stylenewbyexample.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_stylenewbyexample.png
diff --git a/default_images/res/commandimagelist/sch_styleupdatebyexample.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_styleupdatebyexample.png
index 25b70311b3b8..25b70311b3b8 100644
--- a/default_images/res/commandimagelist/sch_styleupdatebyexample.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_styleupdatebyexample.png
diff --git a/default_images/res/commandimagelist/sch_stylewatercanmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_stylewatercanmode.png
index 4b87f07ff683..4b87f07ff683 100644
--- a/default_images/res/commandimagelist/sch_stylewatercanmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_stylewatercanmode.png
diff --git a/default_images/res/commandimagelist/sch_subscript.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_subscript.png
index 6b9d77705d6b..6b9d77705d6b 100644
--- a/default_images/res/commandimagelist/sch_subscript.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_subscript.png
diff --git a/default_images/res/commandimagelist/sch_superscript.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_superscript.png
index 86767f3e3d9a..86767f3e3d9a 100644
--- a/default_images/res/commandimagelist/sch_superscript.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_superscript.png
diff --git a/default_images/res/commandimagelist/sch_switchcontroldesignmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_switchcontroldesignmode.png
index 6ab001253a18..6ab001253a18 100644
--- a/default_images/res/commandimagelist/sch_switchcontroldesignmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_switchcontroldesignmode.png
diff --git a/default_images/res/commandimagelist/sch_switchxformsdesignmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_switchxformsdesignmode.png
index 94c705c5f122..94c705c5f122 100644
--- a/default_images/res/commandimagelist/sch_switchxformsdesignmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_switchxformsdesignmode.png
diff --git a/default_images/res/commandimagelist/sch_symbolcatalogue.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolcatalogue.png
index c0f6360cdc8c..c0f6360cdc8c 100644
--- a/default_images/res/commandimagelist/sch_symbolcatalogue.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolcatalogue.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.brace-pair.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.brace-pair.png
index ede6a204ab49..ede6a204ab49 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.brace-pair.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.brace-pair.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.bracket-pair.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.bracket-pair.png
index 3b32a49e2b8f..3b32a49e2b8f 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.bracket-pair.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.bracket-pair.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.cloud.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.cloud.png
index e7ed198e4b2a..e7ed198e4b2a 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.cloud.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.cloud.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.diamond-bevel.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.diamond-bevel.png
index ba240f2e90ec..ba240f2e90ec 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.diamond-bevel.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.diamond-bevel.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.flower.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.flower.png
index a6a1956963e2..a6a1956963e2 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.flower.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.flower.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.forbidden.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.forbidden.png
index 3f3c22760f3d..3f3c22760f3d 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.forbidden.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.forbidden.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.heart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.heart.png
index 6d82375660d4..6d82375660d4 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.heart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.heart.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.left-brace.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.left-brace.png
index 023663e7563f..023663e7563f 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.left-brace.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.left-brace.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.left-bracket.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.left-bracket.png
index 06c55c6bea83..06c55c6bea83 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.left-bracket.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.left-bracket.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.lightning.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.lightning.png
index 0454db470427..0454db470427 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.lightning.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.lightning.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.moon.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.moon.png
index d96a691c635f..d96a691c635f 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.moon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.moon.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.octagon-bevel.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.octagon-bevel.png
index 0a0b67a42b7f..0a0b67a42b7f 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.octagon-bevel.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.octagon-bevel.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.png
index 35bcea8f03ee..35bcea8f03ee 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.puzzle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.puzzle.png
index d69422c8626f..d69422c8626f 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.puzzle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.puzzle.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.quad-bevel.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.quad-bevel.png
index 6776173cd2c4..6776173cd2c4 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.quad-bevel.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.quad-bevel.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.right-brace.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.right-brace.png
index 6504c45f5cc0..6504c45f5cc0 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.right-brace.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.right-brace.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.right-bracket.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.right-bracket.png
index ee8d5cf00b4e..ee8d5cf00b4e 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.right-bracket.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.right-bracket.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.smiley.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.smiley.png
index a0773bac2f8c..a0773bac2f8c 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.smiley.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.smiley.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.sun.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.sun.png
index 13d1efa4aed4..13d1efa4aed4 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.sun.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.sun.png
diff --git a/default_images/res/commandimagelist/sch_tabdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tabdialog.png
index 544a317c7f2c..544a317c7f2c 100644
--- a/default_images/res/commandimagelist/sch_tabdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tabdialog.png
diff --git a/default_images/res/commandimagelist/sch_tabledesign.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tabledesign.png
index 3a6c79344c10..3a6c79344c10 100644
--- a/default_images/res/commandimagelist/sch_tabledesign.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tabledesign.png
diff --git a/default_images/res/commandimagelist/sch_tabledialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tabledialog.png
index 8c875cde558a..8c875cde558a 100644
--- a/default_images/res/commandimagelist/sch_tabledialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tabledialog.png
diff --git a/default_images/res/commandimagelist/sch_tablemodefix.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tablemodefix.png
index 1eb61ad13ed6..1eb61ad13ed6 100644
--- a/default_images/res/commandimagelist/sch_tablemodefix.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tablemodefix.png
diff --git a/default_images/res/commandimagelist/sch_tablemodefixprop.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tablemodefixprop.png
index e92b28f3f6a2..e92b28f3f6a2 100644
--- a/default_images/res/commandimagelist/sch_tablemodefixprop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tablemodefixprop.png
diff --git a/default_images/res/commandimagelist/sch_tablemodevariable.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tablemodevariable.png
index bd435100f296..bd435100f296 100644
--- a/default_images/res/commandimagelist/sch_tablemodevariable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tablemodevariable.png
diff --git a/default_images/res/commandimagelist/sch_tablesort.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tablesort.png
index 50bf5911ce98..50bf5911ce98 100644
--- a/default_images/res/commandimagelist/sch_tablesort.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tablesort.png
diff --git a/default_images/res/commandimagelist/sch_testmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_testmode.png
index 25581fd448e4..25581fd448e4 100644
--- a/default_images/res/commandimagelist/sch_testmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_testmode.png
diff --git a/default_images/res/commandimagelist/sch_text.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_text.png
index 4066acea5ce4..4066acea5ce4 100644
--- a/default_images/res/commandimagelist/sch_text.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_text.png
diff --git a/default_images/res/commandimagelist/sch_text_marquee.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_text_marquee.png
index 2aeb5d4b6a5b..2aeb5d4b6a5b 100644
--- a/default_images/res/commandimagelist/sch_text_marquee.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_text_marquee.png
diff --git a/default_images/res/commandimagelist/sch_textdirectionlefttoright.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_textdirectionlefttoright.png
index 0e15f5a6b56b..0e15f5a6b56b 100644
--- a/default_images/res/commandimagelist/sch_textdirectionlefttoright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_textdirectionlefttoright.png
diff --git a/default_images/res/commandimagelist/sch_textdirectiontoptobottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_textdirectiontoptobottom.png
index dad485e2b9f9..dad485e2b9f9 100644
--- a/default_images/res/commandimagelist/sch_textdirectiontoptobottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_textdirectiontoptobottom.png
diff --git a/default_images/res/commandimagelist/sch_textfittosizetool.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_textfittosizetool.png
index 4b233f1f2a06..4b233f1f2a06 100644
--- a/default_images/res/commandimagelist/sch_textfittosizetool.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_textfittosizetool.png
diff --git a/default_images/res/commandimagelist/sch_texttoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_texttoolbox.png
index 4066acea5ce4..4066acea5ce4 100644
--- a/default_images/res/commandimagelist/sch_texttoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_texttoolbox.png
diff --git a/default_images/res/commandimagelist/sch_thesaurus.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_thesaurus.png
index 44a989f8296b..44a989f8296b 100644
--- a/default_images/res/commandimagelist/sch_thesaurus.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_thesaurus.png
diff --git a/default_images/res/commandimagelist/sch_thesaurusdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_thesaurusdialog.png
index 40563f2b880e..40563f2b880e 100644
--- a/default_images/res/commandimagelist/sch_thesaurusdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_thesaurusdialog.png
diff --git a/default_images/res/commandimagelist/sch_timefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_timefield.png
index 708642e6d7aa..708642e6d7aa 100644
--- a/default_images/res/commandimagelist/sch_timefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_timefield.png
diff --git a/default_images/res/commandimagelist/sch_toggleanchortype.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toggleanchortype.png
index 5cd7a8cce0ae..5cd7a8cce0ae 100644
--- a/default_images/res/commandimagelist/sch_toggleanchortype.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toggleanchortype.png
diff --git a/default_images/res/commandimagelist/sch_toggleaxisdescr.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toggleaxisdescr.png
index 4b98f99795c1..4b98f99795c1 100644
--- a/default_images/res/commandimagelist/sch_toggleaxisdescr.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toggleaxisdescr.png
diff --git a/default_images/res/commandimagelist/sch_toggleaxistitle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toggleaxistitle.png
index 0be8f485c534..0be8f485c534 100644
--- a/default_images/res/commandimagelist/sch_toggleaxistitle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toggleaxistitle.png
diff --git a/default_images/res/commandimagelist/sch_togglebreakpoint.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_togglebreakpoint.png
index a2660af865fb..a2660af865fb 100644
--- a/default_images/res/commandimagelist/sch_togglebreakpoint.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_togglebreakpoint.png
diff --git a/default_images/res/commandimagelist/sch_togglegridhorizontal.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_togglegridhorizontal.png
index 56f50cc53485..56f50cc53485 100644
--- a/default_images/res/commandimagelist/sch_togglegridhorizontal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_togglegridhorizontal.png
diff --git a/default_images/res/commandimagelist/sch_togglegridvertical.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_togglegridvertical.png
index d39f3c002d9d..d39f3c002d9d 100644
--- a/default_images/res/commandimagelist/sch_togglegridvertical.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_togglegridvertical.png
diff --git a/default_images/res/commandimagelist/sch_togglelegend.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_togglelegend.png
index e2a502f8e384..e2a502f8e384 100644
--- a/default_images/res/commandimagelist/sch_togglelegend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_togglelegend.png
diff --git a/default_images/res/commandimagelist/sch_togglemergecells.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_togglemergecells.png
index a36508ebf299..a36508ebf299 100644
--- a/default_images/res/commandimagelist/sch_togglemergecells.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_togglemergecells.png
diff --git a/default_images/res/commandimagelist/sch_toggleobjectbeziermode.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toggleobjectbeziermode.png
index 778af89bd345..778af89bd345 100644
--- a/default_images/res/commandimagelist/sch_toggleobjectbeziermode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toggleobjectbeziermode.png
diff --git a/default_images/res/commandimagelist/sch_toggleobjectrotatemode.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toggleobjectrotatemode.png
index c8e150f4830e..c8e150f4830e 100644
--- a/default_images/res/commandimagelist/sch_toggleobjectrotatemode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toggleobjectrotatemode.png
diff --git a/default_images/res/commandimagelist/sch_togglesheetgrid.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_togglesheetgrid.png
index 971b3c0bca57..971b3c0bca57 100644
--- a/default_images/res/commandimagelist/sch_togglesheetgrid.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_togglesheetgrid.png
diff --git a/default_images/res/commandimagelist/sch_toggletitle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toggletitle.png
index 1ddb475ca71e..1ddb475ca71e 100644
--- a/default_images/res/commandimagelist/sch_toggletitle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toggletitle.png
diff --git a/default_images/res/commandimagelist/sch_toolsmacroedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toolsmacroedit.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_toolsmacroedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toolsmacroedit.png
diff --git a/default_images/res/commandimagelist/sch_toolsoptions.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toolsoptions.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_toolsoptions.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toolsoptions.png
diff --git a/default_images/res/commandimagelist/sch_torus.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_torus.png
index a65c61037e90..a65c61037e90 100644
--- a/default_images/res/commandimagelist/sch_torus.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_torus.png
diff --git a/default_images/res/commandimagelist/sch_transformdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_transformdialog.png
index ec7c85e2cc35..ec7c85e2cc35 100644
--- a/default_images/res/commandimagelist/sch_transformdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_transformdialog.png
diff --git a/default_images/res/commandimagelist/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_underline.png
index 24c12507996a..24c12507996a 100644
--- a/default_images/res/commandimagelist/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_underline.png
diff --git a/default_images/res/commandimagelist/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_underlinedouble.png
index d51f41526fe1..d51f41526fe1 100644
--- a/default_images/res/commandimagelist/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/sch_undo.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_undo.png
index 4da4ad791ef5..4da4ad791ef5 100644
--- a/default_images/res/commandimagelist/sch_undo.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_undo.png
diff --git a/default_images/res/commandimagelist/sch_ungroup.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ungroup.png
index 11c9cfe7b588..11c9cfe7b588 100644
--- a/default_images/res/commandimagelist/sch_ungroup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ungroup.png
diff --git a/default_images/res/commandimagelist/sch_unhainframes.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_unhainframes.png
index b1a8a54f307b..b1a8a54f307b 100644
--- a/default_images/res/commandimagelist/sch_unhainframes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_unhainframes.png
diff --git a/default_images/res/commandimagelist/sch_upsearch.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_upsearch.png
index 02c5e4ff51ba..02c5e4ff51ba 100644
--- a/default_images/res/commandimagelist/sch_upsearch.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_upsearch.png
diff --git a/default_images/res/commandimagelist/sch_urlbutton.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_urlbutton.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_urlbutton.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_urlbutton.png
diff --git a/default_images/res/commandimagelist/sch_usewizards.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_usewizards.png
index 02493cf9a4e1..02493cf9a4e1 100644
--- a/default_images/res/commandimagelist/sch_usewizards.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_usewizards.png
diff --git a/default_images/res/commandimagelist/sch_verticalcaption.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_verticalcaption.png
index c9a6c78db09f..c9a6c78db09f 100644
--- a/default_images/res/commandimagelist/sch_verticalcaption.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_verticalcaption.png
diff --git a/default_images/res/commandimagelist/sch_verticaltext.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_verticaltext.png
index 63252bb46595..63252bb46595 100644
--- a/default_images/res/commandimagelist/sch_verticaltext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_verticaltext.png
diff --git a/default_images/res/commandimagelist/sch_verticaltextfittosizetool.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_verticaltextfittosizetool.png
index 425838acc958..425838acc958 100644
--- a/default_images/res/commandimagelist/sch_verticaltextfittosizetool.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_verticaltextfittosizetool.png
diff --git a/default_images/res/commandimagelist/sch_vfixedline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_vfixedline.png
index 85d985f4b115..85d985f4b115 100644
--- a/default_images/res/commandimagelist/sch_vfixedline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_vfixedline.png
diff --git a/default_images/res/commandimagelist/sch_view100.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_view100.png
index 2254149657b0..2254149657b0 100644
--- a/default_images/res/commandimagelist/sch_view100.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_view100.png
diff --git a/default_images/res/commandimagelist/sch_viewdatasourcebrowser.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_viewdatasourcebrowser.png
index 366943153ea2..366943153ea2 100644
--- a/default_images/res/commandimagelist/sch_viewdatasourcebrowser.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_viewdatasourcebrowser.png
diff --git a/default_images/res/commandimagelist/sch_viewformasgrid.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_viewformasgrid.png
index 8f6a1b481912..8f6a1b481912 100644
--- a/default_images/res/commandimagelist/sch_viewformasgrid.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_viewformasgrid.png
diff --git a/default_images/res/commandimagelist/sch_vscrollbar.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_vscrollbar.png
index 79b3148cfd1c..79b3148cfd1c 100644
--- a/default_images/res/commandimagelist/sch_vscrollbar.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_vscrollbar.png
diff --git a/default_images/res/commandimagelist/sch_window3d.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_window3d.png
index b64c98604dbe..b64c98604dbe 100644
--- a/default_images/res/commandimagelist/sch_window3d.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_window3d.png
diff --git a/default_images/res/commandimagelist/sch_wrapcontour.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapcontour.png
index 549b59c63420..549b59c63420 100644
--- a/default_images/res/commandimagelist/sch_wrapcontour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapcontour.png
diff --git a/default_images/res/commandimagelist/sch_wrapideal.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapideal.png
index 126ceac4b969..126ceac4b969 100644
--- a/default_images/res/commandimagelist/sch_wrapideal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapideal.png
diff --git a/default_images/res/commandimagelist/sch_wrapleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapleft.png
index f7f22669878d..f7f22669878d 100644
--- a/default_images/res/commandimagelist/sch_wrapleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapleft.png
diff --git a/default_images/res/commandimagelist/sch_wrapoff.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapoff.png
index dcc9f4563b32..dcc9f4563b32 100644
--- a/default_images/res/commandimagelist/sch_wrapoff.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapoff.png
diff --git a/default_images/res/commandimagelist/sch_wrapon.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapon.png
index 47f48d5d1b1f..47f48d5d1b1f 100644
--- a/default_images/res/commandimagelist/sch_wrapon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapon.png
diff --git a/default_images/res/commandimagelist/sch_wrapright.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapright.png
index 0178a33b8a2e..0178a33b8a2e 100644
--- a/default_images/res/commandimagelist/sch_wrapright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapright.png
diff --git a/default_images/res/commandimagelist/sch_wrapthrough.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapthrough.png
index a65dec5a5d78..a65dec5a5d78 100644
--- a/default_images/res/commandimagelist/sch_wrapthrough.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapthrough.png
diff --git a/default_images/res/commandimagelist/sch_xlinecolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_xlinecolor.png
index 007166f95b84..007166f95b84 100644
--- a/default_images/res/commandimagelist/sch_xlinecolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_xlinecolor.png
diff --git a/default_images/res/commandimagelist/sch_xlinestyle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_xlinestyle.png
index 0318bcc06dfb..0318bcc06dfb 100644
--- a/default_images/res/commandimagelist/sch_xlinestyle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_xlinestyle.png
diff --git a/default_images/res/commandimagelist/sch_zoom.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoom.png
index b024e89336ad..b024e89336ad 100644
--- a/default_images/res/commandimagelist/sch_zoom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoom.png
diff --git a/default_images/res/commandimagelist/sch_zoom100percent.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoom100percent.png
index fcda6ac58267..fcda6ac58267 100644
--- a/default_images/res/commandimagelist/sch_zoom100percent.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoom100percent.png
diff --git a/default_images/res/commandimagelist/sch_zoomin.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomin.png
index 6518edae0ee9..6518edae0ee9 100644
--- a/default_images/res/commandimagelist/sch_zoomin.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomin.png
diff --git a/default_images/res/commandimagelist/sch_zoomminus.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomminus.png
index 765e231cdcc8..765e231cdcc8 100644
--- a/default_images/res/commandimagelist/sch_zoomminus.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomminus.png
diff --git a/default_images/res/commandimagelist/sch_zoomnext.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomnext.png
index b7bcf5023ce4..b7bcf5023ce4 100644
--- a/default_images/res/commandimagelist/sch_zoomnext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomnext.png
diff --git a/default_images/res/commandimagelist/sch_zoomobjects.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomobjects.png
index 21b61681772b..21b61681772b 100644
--- a/default_images/res/commandimagelist/sch_zoomobjects.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomobjects.png
diff --git a/default_images/res/commandimagelist/sch_zoomoptimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomoptimal.png
index bdfe9add9a92..bdfe9add9a92 100644
--- a/default_images/res/commandimagelist/sch_zoomoptimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomoptimal.png
diff --git a/default_images/res/commandimagelist/sch_zoomout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomout.png
index 765e231cdcc8..765e231cdcc8 100644
--- a/default_images/res/commandimagelist/sch_zoomout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomout.png
diff --git a/default_images/res/commandimagelist/sch_zoompage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoompage.png
index 06ffc94eed5c..06ffc94eed5c 100644
--- a/default_images/res/commandimagelist/sch_zoompage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoompage.png
diff --git a/default_images/res/commandimagelist/sch_zoompagewidth.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoompagewidth.png
index 92b2d3b24cde..92b2d3b24cde 100644
--- a/default_images/res/commandimagelist/sch_zoompagewidth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoompagewidth.png
diff --git a/default_images/res/commandimagelist/sch_zoompanning.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoompanning.png
index d32cf3af0ccb..d32cf3af0ccb 100644
--- a/default_images/res/commandimagelist/sch_zoompanning.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoompanning.png
diff --git a/default_images/res/commandimagelist/sch_zoomplus.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomplus.png
index d0773683ff6a..d0773683ff6a 100644
--- a/default_images/res/commandimagelist/sch_zoomplus.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomplus.png
diff --git a/default_images/res/commandimagelist/sch_zoomprevious.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomprevious.png
index 33d94a883c56..33d94a883c56 100644
--- a/default_images/res/commandimagelist/sch_zoomprevious.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomprevious.png
diff --git a/default_images/res/commandimagelist/sch_zoomtoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomtoolbox.png
index b6d88256e0d2..b6d88256e0d2 100644
--- a/default_images/res/commandimagelist/sch_zoomtoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomtoolbox.png
diff --git a/default_images/res/commandimagelist/sk/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/sk/lc_bold.png
index 490c31e7bd1a..490c31e7bd1a 100644
--- a/default_images/res/commandimagelist/sk/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sk/lc_bold.png
diff --git a/default_images/res/commandimagelist/sk/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/sk/lc_italic.png
index 0387f58cb164..0387f58cb164 100644
--- a/default_images/res/commandimagelist/sk/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sk/lc_italic.png
diff --git a/default_images/res/commandimagelist/sk/lch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/sk/lc_numberformatdecimal.png
index beffd59f0e56..beffd59f0e56 100644
--- a/default_images/res/commandimagelist/sk/lch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sk/lc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/sk/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sk/lc_underline.png
index 1cb66a0c1179..1cb66a0c1179 100644
--- a/default_images/res/commandimagelist/sk/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sk/lc_underline.png
diff --git a/default_images/res/commandimagelist/sk/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/sk/lc_underlinedouble.png
index 2125c5551829..2125c5551829 100644
--- a/default_images/res/commandimagelist/sk/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sk/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/sk/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/sk/sc_bold.png
index d4c74e2d467e..d4c74e2d467e 100644
--- a/default_images/res/commandimagelist/sk/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sk/sc_bold.png
diff --git a/default_images/res/commandimagelist/sk/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/sk/sc_italic.png
index d7c33542fc66..d7c33542fc66 100644
--- a/default_images/res/commandimagelist/sk/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sk/sc_italic.png
diff --git a/default_images/res/commandimagelist/sk/sch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/sk/sc_numberformatdecimal.png
index 3a247754b915..3a247754b915 100644
--- a/default_images/res/commandimagelist/sk/sch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sk/sc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/sk/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sk/sc_underline.png
index f289df3eb6e2..f289df3eb6e2 100644
--- a/default_images/res/commandimagelist/sk/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sk/sc_underline.png
diff --git a/default_images/res/commandimagelist/sk/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/sk/sc_underlinedouble.png
index aca967ec1cdc..aca967ec1cdc 100644
--- a/default_images/res/commandimagelist/sk/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sk/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/sl/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/sl/lc_bold.png
index 280605d9b811..280605d9b811 100644
--- a/default_images/res/commandimagelist/sl/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sl/lc_bold.png
diff --git a/default_images/res/commandimagelist/sl/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/sl/lc_italic.png
index 7cdd004e0854..7cdd004e0854 100644
--- a/default_images/res/commandimagelist/sl/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sl/lc_italic.png
diff --git a/default_images/res/commandimagelist/sl/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sl/lc_underline.png
index 1f0b1e8ea165..1f0b1e8ea165 100644
--- a/default_images/res/commandimagelist/sl/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sl/lc_underline.png
diff --git a/default_images/res/commandimagelist/sl/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/sl/lc_underlinedouble.png
index e72e565189c4..e72e565189c4 100644
--- a/default_images/res/commandimagelist/sl/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sl/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/sl/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/sl/sc_bold.png
index a7fef09e6a97..a7fef09e6a97 100644
--- a/default_images/res/commandimagelist/sl/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sl/sc_bold.png
diff --git a/default_images/res/commandimagelist/sl/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/sl/sc_italic.png
index f3f9ef17e45c..f3f9ef17e45c 100644
--- a/default_images/res/commandimagelist/sl/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sl/sc_italic.png
diff --git a/default_images/res/commandimagelist/sl/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sl/sc_underline.png
index 23a5db1f4a62..23a5db1f4a62 100644
--- a/default_images/res/commandimagelist/sl/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sl/sc_underline.png
diff --git a/default_images/res/commandimagelist/sl/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/sl/sc_underlinedouble.png
index bdc019987582..bdc019987582 100644
--- a/default_images/res/commandimagelist/sl/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sl/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/sv/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/sv/lc_bold.png
index 21a8ec70058f..21a8ec70058f 100644
--- a/default_images/res/commandimagelist/sv/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sv/lc_bold.png
diff --git a/default_images/res/commandimagelist/sv/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/sv/lc_italic.png
index 71108004b9f3..71108004b9f3 100644
--- a/default_images/res/commandimagelist/sv/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sv/lc_italic.png
diff --git a/default_images/res/commandimagelist/sv/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sv/lc_underline.png
index 86cb2b0348de..86cb2b0348de 100644
--- a/default_images/res/commandimagelist/sv/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sv/lc_underline.png
diff --git a/default_images/res/commandimagelist/sv/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/sv/lc_underlinedouble.png
index 88887f5a0011..88887f5a0011 100644
--- a/default_images/res/commandimagelist/sv/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sv/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/sv/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/sv/sc_bold.png
index 874cfba4e7a9..874cfba4e7a9 100644
--- a/default_images/res/commandimagelist/sv/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sv/sc_bold.png
diff --git a/default_images/res/commandimagelist/sv/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/sv/sc_italic.png
index 7c9e9374adca..7c9e9374adca 100644
--- a/default_images/res/commandimagelist/sv/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sv/sc_italic.png
diff --git a/default_images/res/commandimagelist/sv/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sv/sc_underline.png
index ed5562d1b20a..ed5562d1b20a 100644
--- a/default_images/res/commandimagelist/sv/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sv/sc_underline.png
diff --git a/default_images/res/commandimagelist/sv/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/sv/sc_underlinedouble.png
index 9a8cf9bdc4ab..9a8cf9bdc4ab 100644
--- a/default_images/res/commandimagelist/sv/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sv/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/tr/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/tr/lc_bold.png
index c0a2632d510f..c0a2632d510f 100644
--- a/default_images/res/commandimagelist/tr/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/tr/lc_bold.png
diff --git a/default_images/res/commandimagelist/tr/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/tr/lc_italic.png
index 13aaeea54849..13aaeea54849 100644
--- a/default_images/res/commandimagelist/tr/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/tr/lc_italic.png
diff --git a/default_images/res/commandimagelist/tr/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/tr/lc_underline.png
index 267a096dd17f..267a096dd17f 100644
--- a/default_images/res/commandimagelist/tr/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/tr/lc_underline.png
diff --git a/default_images/res/commandimagelist/tr/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/tr/lc_underlinedouble.png
index 3661cae19a20..3661cae19a20 100644
--- a/default_images/res/commandimagelist/tr/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/tr/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/tr/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/tr/sc_bold.png
index 530f13b8da44..530f13b8da44 100644
--- a/default_images/res/commandimagelist/tr/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/tr/sc_bold.png
diff --git a/default_images/res/commandimagelist/tr/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/tr/sc_italic.png
index ca25f8d0c52e..ca25f8d0c52e 100644
--- a/default_images/res/commandimagelist/tr/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/tr/sc_italic.png
diff --git a/default_images/res/commandimagelist/tr/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/tr/sc_underline.png
index ed0bb3dfc280..ed0bb3dfc280 100644
--- a/default_images/res/commandimagelist/tr/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/tr/sc_underline.png
diff --git a/default_images/res/commandimagelist/tr/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/tr/sc_underlinedouble.png
index 3d142bc3bc5a..3d142bc3bc5a 100644
--- a/default_images/res/commandimagelist/tr/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/tr/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/zh-CN/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/lc_bold.png
index 173b45148021..173b45148021 100644
--- a/default_images/res/commandimagelist/zh-CN/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/lc_bold.png
diff --git a/default_images/res/commandimagelist/zh-CN/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/lc_italic.png
index 0387f58cb164..0387f58cb164 100644
--- a/default_images/res/commandimagelist/zh-CN/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/lc_italic.png
diff --git a/default_images/res/commandimagelist/zh-CN/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/lc_underline.png
index 3bc2b5fa8efd..3bc2b5fa8efd 100644
--- a/default_images/res/commandimagelist/zh-CN/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/lc_underline.png
diff --git a/default_images/res/commandimagelist/zh-CN/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/lc_underlinedouble.png
index f27304864369..f27304864369 100644
--- a/default_images/res/commandimagelist/zh-CN/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/zh-CN/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/sc_bold.png
index d4c74e2d467e..d4c74e2d467e 100644
--- a/default_images/res/commandimagelist/zh-CN/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/sc_bold.png
diff --git a/default_images/res/commandimagelist/zh-CN/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/sc_italic.png
index f28583757725..f28583757725 100644
--- a/default_images/res/commandimagelist/zh-CN/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/sc_italic.png
diff --git a/default_images/res/commandimagelist/zh-CN/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/sc_underline.png
index c243963a1e73..c243963a1e73 100644
--- a/default_images/res/commandimagelist/zh-CN/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/sc_underline.png
diff --git a/default_images/res/commandimagelist/zh-CN/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/sc_underlinedouble.png
index aca967ec1cdc..aca967ec1cdc 100644
--- a/default_images/res/commandimagelist/zh-CN/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/zh-TW/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/lc_bold.png
index 01b82d00ce44..01b82d00ce44 100644
--- a/default_images/res/commandimagelist/zh-TW/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/lc_bold.png
diff --git a/default_images/res/commandimagelist/zh-TW/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/lc_italic.png
index 0387f58cb164..0387f58cb164 100644
--- a/default_images/res/commandimagelist/zh-TW/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/lc_italic.png
diff --git a/default_images/res/commandimagelist/zh-TW/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/lc_underline.png
index 4833f557b0cd..4833f557b0cd 100644
--- a/default_images/res/commandimagelist/zh-TW/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/lc_underline.png
diff --git a/default_images/res/commandimagelist/zh-TW/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/lc_underlinedouble.png
index 3b58602819bb..3b58602819bb 100644
--- a/default_images/res/commandimagelist/zh-TW/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/zh-TW/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/sc_bold.png
index d4c74e2d467e..d4c74e2d467e 100644
--- a/default_images/res/commandimagelist/zh-TW/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/sc_bold.png
diff --git a/default_images/res/commandimagelist/zh-TW/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/sc_underline.png
index 34038e4e8759..34038e4e8759 100644
--- a/default_images/res/commandimagelist/zh-TW/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/sc_underline.png
diff --git a/default_images/res/commandimagelist/zh-TW/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/sc_underlinedouble.png
index aca967ec1cdc..aca967ec1cdc 100644
--- a/default_images/res/commandimagelist/zh-TW/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/sc_underlinedouble.png
diff --git a/default_images/res/component_16_h.png b/ooo_custom_images/hicontrast/res/component_16.png
index 84fb17fbfdd6..84fb17fbfdd6 100644
--- a/default_images/res/component_16_h.png
+++ b/ooo_custom_images/hicontrast/res/component_16.png
diff --git a/default_images/res/cs/sch10008.png b/ooo_custom_images/hicontrast/res/cs/sc10008.png
index 3d9d71ddaca8..3d9d71ddaca8 100644
--- a/default_images/res/cs/sch10008.png
+++ b/ooo_custom_images/hicontrast/res/cs/sc10008.png
diff --git a/default_images/res/dah01.png b/ooo_custom_images/hicontrast/res/da01.png
index 567b956e5f1a..567b956e5f1a 100644
--- a/default_images/res/dah01.png
+++ b/ooo_custom_images/hicontrast/res/da01.png
diff --git a/default_images/res/dah02.png b/ooo_custom_images/hicontrast/res/da02.png
index 567b956e5f1a..567b956e5f1a 100644
--- a/default_images/res/dah02.png
+++ b/ooo_custom_images/hicontrast/res/da02.png
diff --git a/default_images/res/dah03.png b/ooo_custom_images/hicontrast/res/da03.png
index 4d6d4137caea..4d6d4137caea 100644
--- a/default_images/res/dah03.png
+++ b/ooo_custom_images/hicontrast/res/da03.png
diff --git a/default_images/res/dah04.png b/ooo_custom_images/hicontrast/res/da04.png
index 43bd5d355013..43bd5d355013 100644
--- a/default_images/res/dah04.png
+++ b/ooo_custom_images/hicontrast/res/da04.png
diff --git a/default_images/res/dah05.png b/ooo_custom_images/hicontrast/res/da05.png
index 8d8cc9e603b9..8d8cc9e603b9 100644
--- a/default_images/res/dah05.png
+++ b/ooo_custom_images/hicontrast/res/da05.png
diff --git a/default_images/res/dah06.png b/ooo_custom_images/hicontrast/res/da06.png
index f930a39df9c8..f930a39df9c8 100644
--- a/default_images/res/dah06.png
+++ b/ooo_custom_images/hicontrast/res/da06.png
diff --git a/default_images/res/de/lch10014.png b/ooo_custom_images/hicontrast/res/de/lc10014.png
index d76dd6d48adb..d76dd6d48adb 100644
--- a/default_images/res/de/lch10014.png
+++ b/ooo_custom_images/hicontrast/res/de/lc10014.png
diff --git a/default_images/res/de/sch10014.png b/ooo_custom_images/hicontrast/res/de/sc10014.png
index e0a90e44743c..e0a90e44743c 100644
--- a/default_images/res/de/sch10014.png
+++ b/ooo_custom_images/hicontrast/res/de/sc10014.png
diff --git a/default_images/res/de/sch26648.png b/ooo_custom_images/hicontrast/res/de/sc26648.png
index 4c5e0590bc9f..4c5e0590bc9f 100644
--- a/default_images/res/de/sch26648.png
+++ b/ooo_custom_images/hicontrast/res/de/sc26648.png
diff --git a/default_images/res/dialogfolder_16_h.png b/ooo_custom_images/hicontrast/res/dialogfolder_16.png
index 691b23bcc9a0..691b23bcc9a0 100644
--- a/default_images/res/dialogfolder_16_h.png
+++ b/ooo_custom_images/hicontrast/res/dialogfolder_16.png
diff --git a/default_images/res/dialogfoldernot_16_h.png b/ooo_custom_images/hicontrast/res/dialogfoldernot_16.png
index 1296a7a85667..1296a7a85667 100644
--- a/default_images/res/dialogfoldernot_16_h.png
+++ b/ooo_custom_images/hicontrast/res/dialogfoldernot_16.png
diff --git a/default_images/res/es/lch10008.png b/ooo_custom_images/hicontrast/res/es/lc10008.png
index 319395c32806..319395c32806 100644
--- a/default_images/res/es/lch10008.png
+++ b/ooo_custom_images/hicontrast/res/es/lc10008.png
diff --git a/default_images/res/es/lch10009.png b/ooo_custom_images/hicontrast/res/es/lc10009.png
index 2fc3fcb763c5..2fc3fcb763c5 100644
--- a/default_images/res/es/lch10009.png
+++ b/ooo_custom_images/hicontrast/res/es/lc10009.png
diff --git a/default_images/res/es/lch10014.png b/ooo_custom_images/hicontrast/res/es/lc10014.png
index d4264c23f456..d4264c23f456 100644
--- a/default_images/res/es/lch10014.png
+++ b/ooo_custom_images/hicontrast/res/es/lc10014.png
diff --git a/default_images/res/es/lch26648.png b/ooo_custom_images/hicontrast/res/es/lc26648.png
index 3d73d9ace800..3d73d9ace800 100644
--- a/default_images/res/es/lch26648.png
+++ b/ooo_custom_images/hicontrast/res/es/lc26648.png
diff --git a/default_images/res/es/sch10008.png b/ooo_custom_images/hicontrast/res/es/sc10008.png
index 80ecdcf55ba9..80ecdcf55ba9 100644
--- a/default_images/res/es/sch10008.png
+++ b/ooo_custom_images/hicontrast/res/es/sc10008.png
diff --git a/default_images/res/es/sch10009.png b/ooo_custom_images/hicontrast/res/es/sc10009.png
index 66d0f0f8ed19..66d0f0f8ed19 100644
--- a/default_images/res/es/sch10009.png
+++ b/ooo_custom_images/hicontrast/res/es/sc10009.png
diff --git a/default_images/res/es/sch10014.png b/ooo_custom_images/hicontrast/res/es/sc10014.png
index 8bf3248ef70f..8bf3248ef70f 100644
--- a/default_images/res/es/sch10014.png
+++ b/ooo_custom_images/hicontrast/res/es/sc10014.png
diff --git a/default_images/res/es/sch26648.png b/ooo_custom_images/hicontrast/res/es/sc26648.png
index 6a83797bd970..6a83797bd970 100644
--- a/default_images/res/es/sch26648.png
+++ b/ooo_custom_images/hicontrast/res/es/sc26648.png
diff --git a/default_images/res/fileopen_hc.png b/ooo_custom_images/hicontrast/res/fileopen.png
index e654592864c5..e654592864c5 100644
--- a/default_images/res/fileopen_hc.png
+++ b/ooo_custom_images/hicontrast/res/fileopen.png
diff --git a/default_images/res/foldercl_h.png b/ooo_custom_images/hicontrast/res/foldercl.png
index b1866960ed51..b1866960ed51 100644
--- a/default_images/res/foldercl_h.png
+++ b/ooo_custom_images/hicontrast/res/foldercl.png
diff --git a/default_images/res/folderop_h.png b/ooo_custom_images/hicontrast/res/folderop.png
index a91282f6f9fb..a91282f6f9fb 100644
--- a/default_images/res/folderop_h.png
+++ b/ooo_custom_images/hicontrast/res/folderop.png
diff --git a/default_images/res/fph010.png b/ooo_custom_images/hicontrast/res/fp010.png
index e8122b21845a..e8122b21845a 100644
--- a/default_images/res/fph010.png
+++ b/ooo_custom_images/hicontrast/res/fp010.png
diff --git a/default_images/res/fph015.png b/ooo_custom_images/hicontrast/res/fp015.png
index c17d1f867bb3..c17d1f867bb3 100644
--- a/default_images/res/fph015.png
+++ b/ooo_custom_images/hicontrast/res/fp015.png
diff --git a/default_images/res/fr/lch10008.png b/ooo_custom_images/hicontrast/res/fr/lc10008.png
index 83225eb94773..83225eb94773 100644
--- a/default_images/res/fr/lch10008.png
+++ b/ooo_custom_images/hicontrast/res/fr/lc10008.png
diff --git a/default_images/res/fr/lch10009.png b/ooo_custom_images/hicontrast/res/fr/lc10009.png
index 9c9c214e06b3..9c9c214e06b3 100644
--- a/default_images/res/fr/lch10009.png
+++ b/ooo_custom_images/hicontrast/res/fr/lc10009.png
diff --git a/default_images/res/fr/lch10014.png b/ooo_custom_images/hicontrast/res/fr/lc10014.png
index d4264c23f456..d4264c23f456 100644
--- a/default_images/res/fr/lch10014.png
+++ b/ooo_custom_images/hicontrast/res/fr/lc10014.png
diff --git a/default_images/res/fr/lch26648.png b/ooo_custom_images/hicontrast/res/fr/lc26648.png
index 3d73d9ace800..3d73d9ace800 100644
--- a/default_images/res/fr/lch26648.png
+++ b/ooo_custom_images/hicontrast/res/fr/lc26648.png
diff --git a/default_images/res/fr/sch10008.png b/ooo_custom_images/hicontrast/res/fr/sc10008.png
index 3d9d71ddaca8..3d9d71ddaca8 100644
--- a/default_images/res/fr/sch10008.png
+++ b/ooo_custom_images/hicontrast/res/fr/sc10008.png
diff --git a/default_images/res/fr/sch10009.png b/ooo_custom_images/hicontrast/res/fr/sc10009.png
index 24462f319627..24462f319627 100644
--- a/default_images/res/fr/sch10009.png
+++ b/ooo_custom_images/hicontrast/res/fr/sc10009.png
diff --git a/default_images/res/fr/sch10014.png b/ooo_custom_images/hicontrast/res/fr/sc10014.png
index 8bf3248ef70f..8bf3248ef70f 100644
--- a/default_images/res/fr/sch10014.png
+++ b/ooo_custom_images/hicontrast/res/fr/sc10014.png
diff --git a/default_images/res/fr/sch26648.png b/ooo_custom_images/hicontrast/res/fr/sc26648.png
index 6a83797bd970..6a83797bd970 100644
--- a/default_images/res/fr/sch26648.png
+++ b/ooo_custom_images/hicontrast/res/fr/sc26648.png
diff --git a/default_images/res/fwthcirc_h.png b/ooo_custom_images/hicontrast/res/fwthcirc.png
index 350e10100fd8..350e10100fd8 100644
--- a/default_images/res/fwthcirc_h.png
+++ b/ooo_custom_images/hicontrast/res/fwthcirc.png
diff --git a/default_images/res/grafikde_h.png b/ooo_custom_images/hicontrast/res/grafikde.png
index 6c8fd91df099..6c8fd91df099 100644
--- a/default_images/res/grafikde_h.png
+++ b/ooo_custom_images/hicontrast/res/grafikde.png
diff --git a/default_images/res/grafikei_h.png b/ooo_custom_images/hicontrast/res/grafikei.png
index 56ff7e946524..56ff7e946524 100644
--- a/default_images/res/grafikei_h.png
+++ b/ooo_custom_images/hicontrast/res/grafikei.png
diff --git a/default_images/res/harddisk_16_h.png b/ooo_custom_images/hicontrast/res/harddisk_16.png
index 324def54b850..324def54b850 100644
--- a/default_images/res/harddisk_16_h.png
+++ b/ooo_custom_images/hicontrast/res/harddisk_16.png
diff --git a/default_images/res/hldocntp_h.png b/ooo_custom_images/hicontrast/res/hldocntp.png
index 02cbad3ed0ee..02cbad3ed0ee 100644
--- a/default_images/res/hldocntp_h.png
+++ b/ooo_custom_images/hicontrast/res/hldocntp.png
diff --git a/default_images/res/hldoctp_h.png b/ooo_custom_images/hicontrast/res/hldoctp.png
index ba5800eb228f..ba5800eb228f 100644
--- a/default_images/res/hldoctp_h.png
+++ b/ooo_custom_images/hicontrast/res/hldoctp.png
diff --git a/default_images/res/hlinettp_h.png b/ooo_custom_images/hicontrast/res/hlinettp.png
index 51ddf38bc863..51ddf38bc863 100644
--- a/default_images/res/hlinettp_h.png
+++ b/ooo_custom_images/hicontrast/res/hlinettp.png
diff --git a/default_images/res/hlmailtp_h.png b/ooo_custom_images/hicontrast/res/hlmailtp.png
index e9887bc83647..e9887bc83647 100644
--- a/default_images/res/hlmailtp_h.png
+++ b/ooo_custom_images/hicontrast/res/hlmailtp.png
diff --git a/default_images/res/hu/lch10008.png b/ooo_custom_images/hicontrast/res/hu/lc10008.png
index 3d461523d619..3d461523d619 100644
--- a/default_images/res/hu/lch10008.png
+++ b/ooo_custom_images/hicontrast/res/hu/lc10008.png
diff --git a/default_images/res/hu/lch10009.png b/ooo_custom_images/hicontrast/res/hu/lc10009.png
index 8b069695f2b4..8b069695f2b4 100644
--- a/default_images/res/hu/lch10009.png
+++ b/ooo_custom_images/hicontrast/res/hu/lc10009.png
diff --git a/default_images/res/hu/lch10014.png b/ooo_custom_images/hicontrast/res/hu/lc10014.png
index 1727ddc34e92..1727ddc34e92 100644
--- a/default_images/res/hu/lch10014.png
+++ b/ooo_custom_images/hicontrast/res/hu/lc10014.png
diff --git a/default_images/res/hu/lch26648.png b/ooo_custom_images/hicontrast/res/hu/lc26648.png
index adc4e7dcc23e..adc4e7dcc23e 100644
--- a/default_images/res/hu/lch26648.png
+++ b/ooo_custom_images/hicontrast/res/hu/lc26648.png
diff --git a/default_images/res/hu/sch10008.png b/ooo_custom_images/hicontrast/res/hu/sc10008.png
index 3629b30a528c..3629b30a528c 100644
--- a/default_images/res/hu/sch10008.png
+++ b/ooo_custom_images/hicontrast/res/hu/sc10008.png
diff --git a/default_images/res/hu/sch10009.png b/ooo_custom_images/hicontrast/res/hu/sc10009.png
index dd4ba05d5b91..dd4ba05d5b91 100644
--- a/default_images/res/hu/sch10009.png
+++ b/ooo_custom_images/hicontrast/res/hu/sc10009.png
diff --git a/default_images/res/hu/sch10014.png b/ooo_custom_images/hicontrast/res/hu/sc10014.png
index 0a4b95614db5..0a4b95614db5 100644
--- a/default_images/res/hu/sch10014.png
+++ b/ooo_custom_images/hicontrast/res/hu/sc10014.png
diff --git a/default_images/res/hu/sch26648.png b/ooo_custom_images/hicontrast/res/hu/sc26648.png
index c50dd9e3b76a..c50dd9e3b76a 100644
--- a/default_images/res/hu/sch26648.png
+++ b/ooo_custom_images/hicontrast/res/hu/sc26648.png
diff --git a/default_images/res/imh30820.png b/ooo_custom_images/hicontrast/res/im30820.png
index ce96781568d8..ce96781568d8 100644
--- a/default_images/res/imh30820.png
+++ b/ooo_custom_images/hicontrast/res/im30820.png
diff --git a/default_images/res/imh30821.png b/ooo_custom_images/hicontrast/res/im30821.png
index 6fafa72cae93..6fafa72cae93 100644
--- a/default_images/res/imh30821.png
+++ b/ooo_custom_images/hicontrast/res/im30821.png
diff --git a/default_images/res/imh30822.png b/ooo_custom_images/hicontrast/res/im30822.png
index 4ffd2159dd21..4ffd2159dd21 100644
--- a/default_images/res/imh30822.png
+++ b/ooo_custom_images/hicontrast/res/im30822.png
diff --git a/default_images/res/imh30823.png b/ooo_custom_images/hicontrast/res/im30823.png
index b3f308d4ab2c..b3f308d4ab2c 100644
--- a/default_images/res/imh30823.png
+++ b/ooo_custom_images/hicontrast/res/im30823.png
diff --git a/default_images/res/imh30826.png b/ooo_custom_images/hicontrast/res/im30826.png
index 7f8a03c6d57a..7f8a03c6d57a 100644
--- a/default_images/res/imh30826.png
+++ b/ooo_custom_images/hicontrast/res/im30826.png
diff --git a/default_images/res/imh30827.png b/ooo_custom_images/hicontrast/res/im30827.png
index 4eddb25e5edb..4eddb25e5edb 100644
--- a/default_images/res/imh30827.png
+++ b/ooo_custom_images/hicontrast/res/im30827.png
diff --git a/default_images/res/imh30838.png b/ooo_custom_images/hicontrast/res/im30838.png
index 4f2708f1c12e..4f2708f1c12e 100644
--- a/default_images/res/imh30838.png
+++ b/ooo_custom_images/hicontrast/res/im30838.png
diff --git a/default_images/res/imh30839.png b/ooo_custom_images/hicontrast/res/im30839.png
index e67129333610..e67129333610 100644
--- a/default_images/res/imh30839.png
+++ b/ooo_custom_images/hicontrast/res/im30839.png
diff --git a/default_images/res/imh30840.png b/ooo_custom_images/hicontrast/res/im30840.png
index 2bc1d2099cc4..2bc1d2099cc4 100644
--- a/default_images/res/imh30840.png
+++ b/ooo_custom_images/hicontrast/res/im30840.png
diff --git a/default_images/res/imh30841.png b/ooo_custom_images/hicontrast/res/im30841.png
index 349be5554584..349be5554584 100644
--- a/default_images/res/imh30841.png
+++ b/ooo_custom_images/hicontrast/res/im30841.png
diff --git a/default_images/res/it/lch10008.png b/ooo_custom_images/hicontrast/res/it/lc10008.png
index 319395c32806..319395c32806 100644
--- a/default_images/res/it/lch10008.png
+++ b/ooo_custom_images/hicontrast/res/it/lc10008.png
diff --git a/default_images/res/it/lch26648.png b/ooo_custom_images/hicontrast/res/it/lc26648.png
index 3d73d9ace800..3d73d9ace800 100644
--- a/default_images/res/it/lch26648.png
+++ b/ooo_custom_images/hicontrast/res/it/lc26648.png
diff --git a/default_images/res/it/sch10009.png b/ooo_custom_images/hicontrast/res/it/sc10009.png
index 24462f319627..24462f319627 100644
--- a/default_images/res/it/sch10009.png
+++ b/ooo_custom_images/hicontrast/res/it/sc10009.png
diff --git a/default_images/res/javacomponent_16_h.png b/ooo_custom_images/hicontrast/res/javacomponent_16.png
index d14413061603..d14413061603 100644
--- a/default_images/res/javacomponent_16_h.png
+++ b/ooo_custom_images/hicontrast/res/javacomponent_16.png
diff --git a/default_images/res/javalibrary_16_h.png b/ooo_custom_images/hicontrast/res/javalibrary_16.png
index f7919a0f58e4..f7919a0f58e4 100644
--- a/default_images/res/javalibrary_16_h.png
+++ b/ooo_custom_images/hicontrast/res/javalibrary_16.png
diff --git a/default_images/res/ko/lch10712.png b/ooo_custom_images/hicontrast/res/ko/lc10712.png
index 252928026cfa..252928026cfa 100644
--- a/default_images/res/ko/lch10712.png
+++ b/ooo_custom_images/hicontrast/res/ko/lc10712.png
diff --git a/default_images/res/ko/lch10713.png b/ooo_custom_images/hicontrast/res/ko/lc10713.png
index 47d84ef0a001..47d84ef0a001 100644
--- a/default_images/res/ko/lch10713.png
+++ b/ooo_custom_images/hicontrast/res/ko/lc10713.png
diff --git a/default_images/res/ko/sch10712.png b/ooo_custom_images/hicontrast/res/ko/sc10712.png
index 734833afa4b9..734833afa4b9 100644
--- a/default_images/res/ko/sch10712.png
+++ b/ooo_custom_images/hicontrast/res/ko/sc10712.png
diff --git a/default_images/res/ko/sch10713.png b/ooo_custom_images/hicontrast/res/ko/sc10713.png
index 0b868f65f371..0b868f65f371 100644
--- a/default_images/res/ko/sch10713.png
+++ b/ooo_custom_images/hicontrast/res/ko/sc10713.png
diff --git a/default_images/res/lch05504.png b/ooo_custom_images/hicontrast/res/lc05504.png
index 5b7721642a5f..5b7721642a5f 100644
--- a/default_images/res/lch05504.png
+++ b/ooo_custom_images/hicontrast/res/lc05504.png
diff --git a/default_images/res/lch05509.png b/ooo_custom_images/hicontrast/res/lc05509.png
index 21e2aa663dcf..21e2aa663dcf 100644
--- a/default_images/res/lch05509.png
+++ b/ooo_custom_images/hicontrast/res/lc05509.png
diff --git a/default_images/res/lch05678.png b/ooo_custom_images/hicontrast/res/lc05678.png
index 55bbffacd588..55bbffacd588 100644
--- a/default_images/res/lch05678.png
+++ b/ooo_custom_images/hicontrast/res/lc05678.png
diff --git a/default_images/res/lch05711.png b/ooo_custom_images/hicontrast/res/lc05711.png
index bc8d1125b7a9..bc8d1125b7a9 100644
--- a/default_images/res/lch05711.png
+++ b/ooo_custom_images/hicontrast/res/lc05711.png
diff --git a/default_images/res/lch05961.png b/ooo_custom_images/hicontrast/res/lc05961.png
index 6392a834ce94..6392a834ce94 100644
--- a/default_images/res/lch05961.png
+++ b/ooo_custom_images/hicontrast/res/lc05961.png
diff --git a/default_images/res/lch06300.png b/ooo_custom_images/hicontrast/res/lc06300.png
index 629711fe1ba4..629711fe1ba4 100644
--- a/default_images/res/lch06300.png
+++ b/ooo_custom_images/hicontrast/res/lc06300.png
diff --git a/default_images/res/lch06301.png b/ooo_custom_images/hicontrast/res/lc06301.png
index 682a8d0391da..682a8d0391da 100644
--- a/default_images/res/lch06301.png
+++ b/ooo_custom_images/hicontrast/res/lc06301.png
diff --git a/default_images/res/lch06303.png b/ooo_custom_images/hicontrast/res/lc06303.png
index 06ac2bf427f1..06ac2bf427f1 100644
--- a/default_images/res/lch06303.png
+++ b/ooo_custom_images/hicontrast/res/lc06303.png
diff --git a/default_images/res/lch06308.png b/ooo_custom_images/hicontrast/res/lc06308.png
index 0ee9e2f1b66a..0ee9e2f1b66a 100644
--- a/default_images/res/lch06308.png
+++ b/ooo_custom_images/hicontrast/res/lc06308.png
diff --git a/default_images/res/lch10711.png b/ooo_custom_images/hicontrast/res/lc10711.png
index a973dad9a1aa..a973dad9a1aa 100644
--- a/default_images/res/lch10711.png
+++ b/ooo_custom_images/hicontrast/res/lc10711.png
diff --git a/default_images/res/lch10712.png b/ooo_custom_images/hicontrast/res/lc10712.png
index b7f9d0550f23..b7f9d0550f23 100644
--- a/default_images/res/lch10712.png
+++ b/ooo_custom_images/hicontrast/res/lc10712.png
diff --git a/default_images/res/lch10713.png b/ooo_custom_images/hicontrast/res/lc10713.png
index ff5c40c5d9bf..ff5c40c5d9bf 100644
--- a/default_images/res/lch10713.png
+++ b/ooo_custom_images/hicontrast/res/lc10713.png
diff --git a/default_images/res/lch10715.png b/ooo_custom_images/hicontrast/res/lc10715.png
index 125eabb6f10b..125eabb6f10b 100644
--- a/default_images/res/lch10715.png
+++ b/ooo_custom_images/hicontrast/res/lc10715.png
diff --git a/default_images/res/lch10716.png b/ooo_custom_images/hicontrast/res/lc10716.png
index 013be2e4af9d..013be2e4af9d 100644
--- a/default_images/res/lch10716.png
+++ b/ooo_custom_images/hicontrast/res/lc10716.png
diff --git a/default_images/res/lch10851.png b/ooo_custom_images/hicontrast/res/lc10851.png
index a2dccd7a1033..a2dccd7a1033 100644
--- a/default_images/res/lch10851.png
+++ b/ooo_custom_images/hicontrast/res/lc10851.png
diff --git a/default_images/res/lch10853.png b/ooo_custom_images/hicontrast/res/lc10853.png
index 6392a834ce94..6392a834ce94 100644
--- a/default_images/res/lch10853.png
+++ b/ooo_custom_images/hicontrast/res/lc10853.png
diff --git a/default_images/res/lch10854.png b/ooo_custom_images/hicontrast/res/lc10854.png
index 08d5ad00302e..08d5ad00302e 100644
--- a/default_images/res/lch10854.png
+++ b/ooo_custom_images/hicontrast/res/lc10854.png
diff --git a/default_images/res/library_16_h.png b/ooo_custom_images/hicontrast/res/library_16.png
index 0e5c2ba30500..0e5c2ba30500 100644
--- a/default_images/res/library_16_h.png
+++ b/ooo_custom_images/hicontrast/res/library_16.png
diff --git a/default_images/res/lock_hc.png b/ooo_custom_images/hicontrast/res/lock.png
index 5bbcb24e6f3c..5bbcb24e6f3c 100644
--- a/default_images/res/lock_hc.png
+++ b/ooo_custom_images/hicontrast/res/lock.png
diff --git a/default_images/res/lxh03123.png b/ooo_custom_images/hicontrast/res/lx03123.png
index 6e447ae9b2f9..6e447ae9b2f9 100644
--- a/default_images/res/lxh03123.png
+++ b/ooo_custom_images/hicontrast/res/lx03123.png
diff --git a/default_images/res/lxh03124.png b/ooo_custom_images/hicontrast/res/lx03124.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03124.png
+++ b/ooo_custom_images/hicontrast/res/lx03124.png
diff --git a/default_images/res/lxh03125.png b/ooo_custom_images/hicontrast/res/lx03125.png
index 6fc2c18a86ba..6fc2c18a86ba 100644
--- a/default_images/res/lxh03125.png
+++ b/ooo_custom_images/hicontrast/res/lx03125.png
diff --git a/default_images/res/lxh03126.png b/ooo_custom_images/hicontrast/res/lx03126.png
index 013ac0c1b60b..013ac0c1b60b 100644
--- a/default_images/res/lxh03126.png
+++ b/ooo_custom_images/hicontrast/res/lx03126.png
diff --git a/default_images/res/lxh03127.png b/ooo_custom_images/hicontrast/res/lx03127.png
index f304cc7b44b9..f304cc7b44b9 100644
--- a/default_images/res/lxh03127.png
+++ b/ooo_custom_images/hicontrast/res/lx03127.png
diff --git a/default_images/res/lxh03128.png b/ooo_custom_images/hicontrast/res/lx03128.png
index 0156d75247b3..0156d75247b3 100644
--- a/default_images/res/lxh03128.png
+++ b/ooo_custom_images/hicontrast/res/lx03128.png
diff --git a/default_images/res/lxh03129.png b/ooo_custom_images/hicontrast/res/lx03129.png
index 4d9bab9e2bd6..4d9bab9e2bd6 100644
--- a/default_images/res/lxh03129.png
+++ b/ooo_custom_images/hicontrast/res/lx03129.png
diff --git a/default_images/res/lxh03130.png b/ooo_custom_images/hicontrast/res/lx03130.png
index 0aca19a7730a..0aca19a7730a 100644
--- a/default_images/res/lxh03130.png
+++ b/ooo_custom_images/hicontrast/res/lx03130.png
diff --git a/default_images/res/lxh03131.png b/ooo_custom_images/hicontrast/res/lx03131.png
index 1ee0fd1f7c6d..1ee0fd1f7c6d 100644
--- a/default_images/res/lxh03131.png
+++ b/ooo_custom_images/hicontrast/res/lx03131.png
diff --git a/default_images/res/lxh03132.png b/ooo_custom_images/hicontrast/res/lx03132.png
index 099861730493..099861730493 100644
--- a/default_images/res/lxh03132.png
+++ b/ooo_custom_images/hicontrast/res/lx03132.png
diff --git a/default_images/res/lxh03134.png b/ooo_custom_images/hicontrast/res/lx03134.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03134.png
+++ b/ooo_custom_images/hicontrast/res/lx03134.png
diff --git a/default_images/res/lxh03135.png b/ooo_custom_images/hicontrast/res/lx03135.png
index b92f098467f3..b92f098467f3 100644
--- a/default_images/res/lxh03135.png
+++ b/ooo_custom_images/hicontrast/res/lx03135.png
diff --git a/default_images/res/lxh03136.png b/ooo_custom_images/hicontrast/res/lx03136.png
index 4e2afe040289..4e2afe040289 100644
--- a/default_images/res/lxh03136.png
+++ b/ooo_custom_images/hicontrast/res/lx03136.png
diff --git a/default_images/res/lxh03137.png b/ooo_custom_images/hicontrast/res/lx03137.png
index 710c902afc11..710c902afc11 100644
--- a/default_images/res/lxh03137.png
+++ b/ooo_custom_images/hicontrast/res/lx03137.png
diff --git a/default_images/res/lxh03138.png b/ooo_custom_images/hicontrast/res/lx03138.png
index 94b31b332beb..94b31b332beb 100644
--- a/default_images/res/lxh03138.png
+++ b/ooo_custom_images/hicontrast/res/lx03138.png
diff --git a/default_images/res/lxh03139.png b/ooo_custom_images/hicontrast/res/lx03139.png
index 6f3a85a9fea0..6f3a85a9fea0 100644
--- a/default_images/res/lxh03139.png
+++ b/ooo_custom_images/hicontrast/res/lx03139.png
diff --git a/default_images/res/lxh03140.png b/ooo_custom_images/hicontrast/res/lx03140.png
index 87bd8e8167b6..87bd8e8167b6 100644
--- a/default_images/res/lxh03140.png
+++ b/ooo_custom_images/hicontrast/res/lx03140.png
diff --git a/default_images/res/lxh03141.png b/ooo_custom_images/hicontrast/res/lx03141.png
index 2a1cb243e771..2a1cb243e771 100644
--- a/default_images/res/lxh03141.png
+++ b/ooo_custom_images/hicontrast/res/lx03141.png
diff --git a/default_images/res/lxh03142.png b/ooo_custom_images/hicontrast/res/lx03142.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03142.png
+++ b/ooo_custom_images/hicontrast/res/lx03142.png
diff --git a/default_images/res/lxh03144.png b/ooo_custom_images/hicontrast/res/lx03144.png
index 472997d46133..472997d46133 100644
--- a/default_images/res/lxh03144.png
+++ b/ooo_custom_images/hicontrast/res/lx03144.png
diff --git a/default_images/res/lxh03145.png b/ooo_custom_images/hicontrast/res/lx03145.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03145.png
+++ b/ooo_custom_images/hicontrast/res/lx03145.png
diff --git a/default_images/res/lxh03150.png b/ooo_custom_images/hicontrast/res/lx03150.png
index a2a72c2063ba..a2a72c2063ba 100644
--- a/default_images/res/lxh03150.png
+++ b/ooo_custom_images/hicontrast/res/lx03150.png
diff --git a/default_images/res/lxh03151.png b/ooo_custom_images/hicontrast/res/lx03151.png
index e27feb604c7d..e27feb604c7d 100644
--- a/default_images/res/lxh03151.png
+++ b/ooo_custom_images/hicontrast/res/lx03151.png
diff --git a/default_images/res/lxh03152.png b/ooo_custom_images/hicontrast/res/lx03152.png
index 7c3d40ebc846..7c3d40ebc846 100644
--- a/default_images/res/lxh03152.png
+++ b/ooo_custom_images/hicontrast/res/lx03152.png
diff --git a/default_images/res/lxh03153.png b/ooo_custom_images/hicontrast/res/lx03153.png
index 88680d02548a..88680d02548a 100644
--- a/default_images/res/lxh03153.png
+++ b/ooo_custom_images/hicontrast/res/lx03153.png
diff --git a/default_images/res/lxh03154.png b/ooo_custom_images/hicontrast/res/lx03154.png
index 73ea21014d4a..73ea21014d4a 100644
--- a/default_images/res/lxh03154.png
+++ b/ooo_custom_images/hicontrast/res/lx03154.png
diff --git a/default_images/res/lxh03155.png b/ooo_custom_images/hicontrast/res/lx03155.png
index 8a8f666177f0..8a8f666177f0 100644
--- a/default_images/res/lxh03155.png
+++ b/ooo_custom_images/hicontrast/res/lx03155.png
diff --git a/default_images/res/lxh03156.png b/ooo_custom_images/hicontrast/res/lx03156.png
index d5319b80b17a..d5319b80b17a 100644
--- a/default_images/res/lxh03156.png
+++ b/ooo_custom_images/hicontrast/res/lx03156.png
diff --git a/default_images/res/lxh03157.png b/ooo_custom_images/hicontrast/res/lx03157.png
index c7dc53d444dc..c7dc53d444dc 100644
--- a/default_images/res/lxh03157.png
+++ b/ooo_custom_images/hicontrast/res/lx03157.png
diff --git a/default_images/res/lxh03158.png b/ooo_custom_images/hicontrast/res/lx03158.png
index bfdcebc5616d..bfdcebc5616d 100644
--- a/default_images/res/lxh03158.png
+++ b/ooo_custom_images/hicontrast/res/lx03158.png
diff --git a/default_images/res/lxh03159.png b/ooo_custom_images/hicontrast/res/lx03159.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03159.png
+++ b/ooo_custom_images/hicontrast/res/lx03159.png
diff --git a/default_images/res/lxh03160.png b/ooo_custom_images/hicontrast/res/lx03160.png
index 2991a9e05d87..2991a9e05d87 100644
--- a/default_images/res/lxh03160.png
+++ b/ooo_custom_images/hicontrast/res/lx03160.png
diff --git a/default_images/res/lxh03161.png b/ooo_custom_images/hicontrast/res/lx03161.png
index 68cb092efdb8..68cb092efdb8 100644
--- a/default_images/res/lxh03161.png
+++ b/ooo_custom_images/hicontrast/res/lx03161.png
diff --git a/default_images/res/lxh03162.png b/ooo_custom_images/hicontrast/res/lx03162.png
index 99f927c6f4db..99f927c6f4db 100644
--- a/default_images/res/lxh03162.png
+++ b/ooo_custom_images/hicontrast/res/lx03162.png
diff --git a/default_images/res/lxh03163.png b/ooo_custom_images/hicontrast/res/lx03163.png
index 9442e1ce7980..9442e1ce7980 100644
--- a/default_images/res/lxh03163.png
+++ b/ooo_custom_images/hicontrast/res/lx03163.png
diff --git a/default_images/res/lxh03164.png b/ooo_custom_images/hicontrast/res/lx03164.png
index e35d77ad5a60..e35d77ad5a60 100644
--- a/default_images/res/lxh03164.png
+++ b/ooo_custom_images/hicontrast/res/lx03164.png
diff --git a/default_images/res/lxh03165.png b/ooo_custom_images/hicontrast/res/lx03165.png
index 8631b5d69439..8631b5d69439 100644
--- a/default_images/res/lxh03165.png
+++ b/ooo_custom_images/hicontrast/res/lx03165.png
diff --git a/default_images/res/lxh03166.png b/ooo_custom_images/hicontrast/res/lx03166.png
index 994ef6704dbf..994ef6704dbf 100644
--- a/default_images/res/lxh03166.png
+++ b/ooo_custom_images/hicontrast/res/lx03166.png
diff --git a/default_images/res/lxh03167.png b/ooo_custom_images/hicontrast/res/lx03167.png
index db4c5cee0776..db4c5cee0776 100644
--- a/default_images/res/lxh03167.png
+++ b/ooo_custom_images/hicontrast/res/lx03167.png
diff --git a/default_images/res/lxh03168.png b/ooo_custom_images/hicontrast/res/lx03168.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03168.png
+++ b/ooo_custom_images/hicontrast/res/lx03168.png
diff --git a/default_images/res/lxh03187.png b/ooo_custom_images/hicontrast/res/lx03187.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03187.png
+++ b/ooo_custom_images/hicontrast/res/lx03187.png
diff --git a/default_images/res/lxh03188.png b/ooo_custom_images/hicontrast/res/lx03188.png
index c26ab88dcaa4..c26ab88dcaa4 100644
--- a/default_images/res/lxh03188.png
+++ b/ooo_custom_images/hicontrast/res/lx03188.png
diff --git a/default_images/res/lxh03189.png b/ooo_custom_images/hicontrast/res/lx03189.png
index fb1d21e46971..fb1d21e46971 100644
--- a/default_images/res/lxh03189.png
+++ b/ooo_custom_images/hicontrast/res/lx03189.png
diff --git a/default_images/res/lxh03190.png b/ooo_custom_images/hicontrast/res/lx03190.png
index 6ffc58a70172..6ffc58a70172 100644
--- a/default_images/res/lxh03190.png
+++ b/ooo_custom_images/hicontrast/res/lx03190.png
diff --git a/default_images/res/lxh03193.png b/ooo_custom_images/hicontrast/res/lx03193.png
index 6ffc58a70172..6ffc58a70172 100644
--- a/default_images/res/lxh03193.png
+++ b/ooo_custom_images/hicontrast/res/lx03193.png
diff --git a/default_images/res/lxh03198.png b/ooo_custom_images/hicontrast/res/lx03198.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03198.png
+++ b/ooo_custom_images/hicontrast/res/lx03198.png
diff --git a/default_images/res/lxh03201.png b/ooo_custom_images/hicontrast/res/lx03201.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03201.png
+++ b/ooo_custom_images/hicontrast/res/lx03201.png
diff --git a/default_images/res/lxh03202.png b/ooo_custom_images/hicontrast/res/lx03202.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03202.png
+++ b/ooo_custom_images/hicontrast/res/lx03202.png
diff --git a/default_images/res/lxh03203.png b/ooo_custom_images/hicontrast/res/lx03203.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03203.png
+++ b/ooo_custom_images/hicontrast/res/lx03203.png
diff --git a/default_images/res/lxh03204.png b/ooo_custom_images/hicontrast/res/lx03204.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03204.png
+++ b/ooo_custom_images/hicontrast/res/lx03204.png
diff --git a/default_images/res/lxh03205.png b/ooo_custom_images/hicontrast/res/lx03205.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03205.png
+++ b/ooo_custom_images/hicontrast/res/lx03205.png
diff --git a/default_images/res/lxh03206.png b/ooo_custom_images/hicontrast/res/lx03206.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03206.png
+++ b/ooo_custom_images/hicontrast/res/lx03206.png
diff --git a/default_images/res/lxh03214.png b/ooo_custom_images/hicontrast/res/lx03214.png
index b794fd882004..b794fd882004 100644
--- a/default_images/res/lxh03214.png
+++ b/ooo_custom_images/hicontrast/res/lx03214.png
diff --git a/default_images/res/lxh03216.png b/ooo_custom_images/hicontrast/res/lx03216.png
index 58180abe41fe..58180abe41fe 100644
--- a/default_images/res/lxh03216.png
+++ b/ooo_custom_images/hicontrast/res/lx03216.png
diff --git a/default_images/res/lxh03217.png b/ooo_custom_images/hicontrast/res/lx03217.png
index 19dbaf313555..19dbaf313555 100644
--- a/default_images/res/lxh03217.png
+++ b/ooo_custom_images/hicontrast/res/lx03217.png
diff --git a/default_images/res/lxh03218.png b/ooo_custom_images/hicontrast/res/lx03218.png
index 7a942b953b16..7a942b953b16 100644
--- a/default_images/res/lxh03218.png
+++ b/ooo_custom_images/hicontrast/res/lx03218.png
diff --git a/default_images/res/lxh03219.png b/ooo_custom_images/hicontrast/res/lx03219.png
index 7919ac3c4c53..7919ac3c4c53 100644
--- a/default_images/res/lxh03219.png
+++ b/ooo_custom_images/hicontrast/res/lx03219.png
diff --git a/default_images/res/lxh03220.png b/ooo_custom_images/hicontrast/res/lx03220.png
index da28333e5367..da28333e5367 100644
--- a/default_images/res/lxh03220.png
+++ b/ooo_custom_images/hicontrast/res/lx03220.png
diff --git a/default_images/res/lxh03221.png b/ooo_custom_images/hicontrast/res/lx03221.png
index 99491b0d6c00..99491b0d6c00 100644
--- a/default_images/res/lxh03221.png
+++ b/ooo_custom_images/hicontrast/res/lx03221.png
diff --git a/default_images/res/lxh03222.png b/ooo_custom_images/hicontrast/res/lx03222.png
index dec73f475f8f..dec73f475f8f 100644
--- a/default_images/res/lxh03222.png
+++ b/ooo_custom_images/hicontrast/res/lx03222.png
diff --git a/default_images/res/lxh03226.png b/ooo_custom_images/hicontrast/res/lx03226.png
index db16956adf16..db16956adf16 100644
--- a/default_images/res/lxh03226.png
+++ b/ooo_custom_images/hicontrast/res/lx03226.png
diff --git a/default_images/res/lxh03227.png b/ooo_custom_images/hicontrast/res/lx03227.png
index f1498dc5d0d9..f1498dc5d0d9 100644
--- a/default_images/res/lxh03227.png
+++ b/ooo_custom_images/hicontrast/res/lx03227.png
diff --git a/default_images/res/lxh03228.png b/ooo_custom_images/hicontrast/res/lx03228.png
index 9238184268b4..9238184268b4 100644
--- a/default_images/res/lxh03228.png
+++ b/ooo_custom_images/hicontrast/res/lx03228.png
diff --git a/default_images/res/lxh03236.png b/ooo_custom_images/hicontrast/res/lx03236.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03236.png
+++ b/ooo_custom_images/hicontrast/res/lx03236.png
diff --git a/default_images/res/lxh03237.png b/ooo_custom_images/hicontrast/res/lx03237.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03237.png
+++ b/ooo_custom_images/hicontrast/res/lx03237.png
diff --git a/default_images/res/lxh03239.png b/ooo_custom_images/hicontrast/res/lx03239.png
index 5c4c415c44b9..5c4c415c44b9 100644
--- a/default_images/res/lxh03239.png
+++ b/ooo_custom_images/hicontrast/res/lx03239.png
diff --git a/default_images/res/lxh03241.png b/ooo_custom_images/hicontrast/res/lx03241.png
index 6795eee8dd0f..6795eee8dd0f 100644
--- a/default_images/res/lxh03241.png
+++ b/ooo_custom_images/hicontrast/res/lx03241.png
diff --git a/default_images/res/lxh03242.png b/ooo_custom_images/hicontrast/res/lx03242.png
index a6c8bb645ca6..a6c8bb645ca6 100644
--- a/default_images/res/lxh03242.png
+++ b/ooo_custom_images/hicontrast/res/lx03242.png
diff --git a/default_images/res/lxh03243.png b/ooo_custom_images/hicontrast/res/lx03243.png
index 6e447ae9b2f9..6e447ae9b2f9 100644
--- a/default_images/res/lxh03243.png
+++ b/ooo_custom_images/hicontrast/res/lx03243.png
diff --git a/default_images/res/lxh03244.png b/ooo_custom_images/hicontrast/res/lx03244.png
index 5b7625c855c7..5b7625c855c7 100644
--- a/default_images/res/lxh03244.png
+++ b/ooo_custom_images/hicontrast/res/lx03244.png
diff --git a/default_images/res/lxh03245.png b/ooo_custom_images/hicontrast/res/lx03245.png
index 8b58b0694dc8..8b58b0694dc8 100644
--- a/default_images/res/lxh03245.png
+++ b/ooo_custom_images/hicontrast/res/lx03245.png
diff --git a/default_images/res/lxh03246.png b/ooo_custom_images/hicontrast/res/lx03246.png
index a1c970d06c03..a1c970d06c03 100644
--- a/default_images/res/lxh03246.png
+++ b/ooo_custom_images/hicontrast/res/lx03246.png
diff --git a/default_images/res/lxh03247.png b/ooo_custom_images/hicontrast/res/lx03247.png
index 7ed24c92c6b9..7ed24c92c6b9 100644
--- a/default_images/res/lxh03247.png
+++ b/ooo_custom_images/hicontrast/res/lx03247.png
diff --git a/default_images/res/lxh03248.png b/ooo_custom_images/hicontrast/res/lx03248.png
index 094141626cb3..094141626cb3 100644
--- a/default_images/res/lxh03248.png
+++ b/ooo_custom_images/hicontrast/res/lx03248.png
diff --git a/default_images/res/lxh03249.png b/ooo_custom_images/hicontrast/res/lx03249.png
index 7b5b405da531..7b5b405da531 100644
--- a/default_images/res/lxh03249.png
+++ b/ooo_custom_images/hicontrast/res/lx03249.png
diff --git a/default_images/res/lxh03250.png b/ooo_custom_images/hicontrast/res/lx03250.png
index 51f8f41b02e8..51f8f41b02e8 100644
--- a/default_images/res/lxh03250.png
+++ b/ooo_custom_images/hicontrast/res/lx03250.png
diff --git a/default_images/res/lxh03251.png b/ooo_custom_images/hicontrast/res/lx03251.png
index d3172e389e9e..d3172e389e9e 100644
--- a/default_images/res/lxh03251.png
+++ b/ooo_custom_images/hicontrast/res/lx03251.png
diff --git a/default_images/res/lxh03252.png b/ooo_custom_images/hicontrast/res/lx03252.png
index b9a4537e6e38..b9a4537e6e38 100644
--- a/default_images/res/lxh03252.png
+++ b/ooo_custom_images/hicontrast/res/lx03252.png
diff --git a/default_images/res/lxh03253.png b/ooo_custom_images/hicontrast/res/lx03253.png
index ac03af3dcb75..ac03af3dcb75 100644
--- a/default_images/res/lxh03253.png
+++ b/ooo_custom_images/hicontrast/res/lx03253.png
diff --git a/default_images/res/lxh03254.png b/ooo_custom_images/hicontrast/res/lx03254.png
index b0b631430966..b0b631430966 100644
--- a/default_images/res/lxh03254.png
+++ b/ooo_custom_images/hicontrast/res/lx03254.png
diff --git a/default_images/res/lxh03255.png b/ooo_custom_images/hicontrast/res/lx03255.png
index 12313d75cf40..12313d75cf40 100644
--- a/default_images/res/lxh03255.png
+++ b/ooo_custom_images/hicontrast/res/lx03255.png
diff --git a/default_images/res/lxh03256.png b/ooo_custom_images/hicontrast/res/lx03256.png
index 9cc0dbd34631..9cc0dbd34631 100644
--- a/default_images/res/lxh03256.png
+++ b/ooo_custom_images/hicontrast/res/lx03256.png
diff --git a/default_images/res/mainapp_16_h.png b/ooo_custom_images/hicontrast/res/mainapp_16.png
index 5484fe9bf009..5484fe9bf009 100644
--- a/default_images/res/mainapp_16_h.png
+++ b/ooo_custom_images/hicontrast/res/mainapp_16.png
diff --git a/default_images/res/mainapp_32_h.png b/ooo_custom_images/hicontrast/res/mainapp_32.png
index 3dc3057f7d0c..3dc3057f7d0c 100644
--- a/default_images/res/mainapp_32_h.png
+++ b/ooo_custom_images/hicontrast/res/mainapp_32.png
diff --git a/default_images/res/minus_sch.png b/ooo_custom_images/hicontrast/res/minus.png
index a20fa183ab01..a20fa183ab01 100644
--- a/default_images/res/minus_sch.png
+++ b/ooo_custom_images/hicontrast/res/minus.png
diff --git a/default_images/res/newdoc_hc.png b/ooo_custom_images/hicontrast/res/newdoc.png
index e654592864c5..e654592864c5 100644
--- a/default_images/res/newdoc_hc.png
+++ b/ooo_custom_images/hicontrast/res/newdoc.png
diff --git a/default_images/res/plus_sch.png b/ooo_custom_images/hicontrast/res/plus.png
index d4a66c91a2cc..d4a66c91a2cc 100644
--- a/default_images/res/plus_sch.png
+++ b/ooo_custom_images/hicontrast/res/plus.png
diff --git a/default_images/res/printeradmin_16_h.png b/ooo_custom_images/hicontrast/res/printeradmin_16.png
index 4d56118df34c..4d56118df34c 100644
--- a/default_images/res/printeradmin_16_h.png
+++ b/ooo_custom_images/hicontrast/res/printeradmin_16.png
diff --git a/default_images/res/printeradmin_32_h.png b/ooo_custom_images/hicontrast/res/printeradmin_32.png
index 101c035397ee..101c035397ee 100644
--- a/default_images/res/printeradmin_32_h.png
+++ b/ooo_custom_images/hicontrast/res/printeradmin_32.png
diff --git a/default_images/res/puzzlefolder_16_h.png b/ooo_custom_images/hicontrast/res/puzzlefolder_16.png
index bd3e94190d8c..bd3e94190d8c 100644
--- a/default_images/res/puzzlefolder_16_h.png
+++ b/ooo_custom_images/hicontrast/res/puzzlefolder_16.png
diff --git a/default_images/res/puzzleslice_16_h.png b/ooo_custom_images/hicontrast/res/puzzleslice_16.png
index 016e02b57e31..016e02b57e31 100644
--- a/default_images/res/puzzleslice_16_h.png
+++ b/ooo_custom_images/hicontrast/res/puzzleslice_16.png
diff --git a/default_images/res/sch05500.png b/ooo_custom_images/hicontrast/res/sc05500.png
index 5bfbfbab68a5..5bfbfbab68a5 100644
--- a/default_images/res/sch05500.png
+++ b/ooo_custom_images/hicontrast/res/sc05500.png
diff --git a/default_images/res/sch05501.png b/ooo_custom_images/hicontrast/res/sc05501.png
index 892919bfea2a..892919bfea2a 100644
--- a/default_images/res/sch05501.png
+++ b/ooo_custom_images/hicontrast/res/sc05501.png
diff --git a/default_images/res/sch05502.png b/ooo_custom_images/hicontrast/res/sc05502.png
index b8914b52f420..b8914b52f420 100644
--- a/default_images/res/sch05502.png
+++ b/ooo_custom_images/hicontrast/res/sc05502.png
diff --git a/default_images/res/sch05504.png b/ooo_custom_images/hicontrast/res/sc05504.png
index 5cce110f5b2d..5cce110f5b2d 100644
--- a/default_images/res/sch05504.png
+++ b/ooo_custom_images/hicontrast/res/sc05504.png
diff --git a/default_images/res/sch05509.png b/ooo_custom_images/hicontrast/res/sc05509.png
index b1f09113b22d..b1f09113b22d 100644
--- a/default_images/res/sch05509.png
+++ b/ooo_custom_images/hicontrast/res/sc05509.png
diff --git a/default_images/res/sch05554.png b/ooo_custom_images/hicontrast/res/sc05554.png
index a906bf051dfc..a906bf051dfc 100644
--- a/default_images/res/sch05554.png
+++ b/ooo_custom_images/hicontrast/res/sc05554.png
diff --git a/default_images/res/sch05555.png b/ooo_custom_images/hicontrast/res/sc05555.png
index abeee403b0e4..abeee403b0e4 100644
--- a/default_images/res/sch05555.png
+++ b/ooo_custom_images/hicontrast/res/sc05555.png
diff --git a/default_images/res/sch05556.png b/ooo_custom_images/hicontrast/res/sc05556.png
index f45b67dac599..f45b67dac599 100644
--- a/default_images/res/sch05556.png
+++ b/ooo_custom_images/hicontrast/res/sc05556.png
diff --git a/default_images/res/sch05678.png b/ooo_custom_images/hicontrast/res/sc05678.png
index 6fa73f9a1e4a..6fa73f9a1e4a 100644
--- a/default_images/res/sch05678.png
+++ b/ooo_custom_images/hicontrast/res/sc05678.png
diff --git a/default_images/res/sch05711.png b/ooo_custom_images/hicontrast/res/sc05711.png
index 82f4de6aff44..82f4de6aff44 100644
--- a/default_images/res/sch05711.png
+++ b/ooo_custom_images/hicontrast/res/sc05711.png
diff --git a/default_images/res/sch05961.png b/ooo_custom_images/hicontrast/res/sc05961.png
index c2fe0194c2c4..c2fe0194c2c4 100644
--- a/default_images/res/sch05961.png
+++ b/ooo_custom_images/hicontrast/res/sc05961.png
diff --git a/default_images/res/sch06300.png b/ooo_custom_images/hicontrast/res/sc06300.png
index 2aa913553c1d..2aa913553c1d 100644
--- a/default_images/res/sch06300.png
+++ b/ooo_custom_images/hicontrast/res/sc06300.png
diff --git a/default_images/res/sch06301.png b/ooo_custom_images/hicontrast/res/sc06301.png
index db2aa7073722..db2aa7073722 100644
--- a/default_images/res/sch06301.png
+++ b/ooo_custom_images/hicontrast/res/sc06301.png
diff --git a/default_images/res/sch06303.png b/ooo_custom_images/hicontrast/res/sc06303.png
index 5ca40188c7bf..5ca40188c7bf 100644
--- a/default_images/res/sch06303.png
+++ b/ooo_custom_images/hicontrast/res/sc06303.png
diff --git a/default_images/res/sch06308.png b/ooo_custom_images/hicontrast/res/sc06308.png
index dcedb85cce8f..dcedb85cce8f 100644
--- a/default_images/res/sch06308.png
+++ b/ooo_custom_images/hicontrast/res/sc06308.png
diff --git a/default_images/res/sch10243.png b/ooo_custom_images/hicontrast/res/sc10243.png
index fcec57ac8b23..fcec57ac8b23 100644
--- a/default_images/res/sch10243.png
+++ b/ooo_custom_images/hicontrast/res/sc10243.png
diff --git a/default_images/res/sch10711.png b/ooo_custom_images/hicontrast/res/sc10711.png
index 556ab0a797e5..556ab0a797e5 100644
--- a/default_images/res/sch10711.png
+++ b/ooo_custom_images/hicontrast/res/sc10711.png
diff --git a/default_images/res/sch10712.png b/ooo_custom_images/hicontrast/res/sc10712.png
index 073c0211776e..073c0211776e 100644
--- a/default_images/res/sch10712.png
+++ b/ooo_custom_images/hicontrast/res/sc10712.png
diff --git a/default_images/res/sch10713.png b/ooo_custom_images/hicontrast/res/sc10713.png
index a17572d8bbc2..a17572d8bbc2 100644
--- a/default_images/res/sch10713.png
+++ b/ooo_custom_images/hicontrast/res/sc10713.png
diff --git a/default_images/res/sch10715.png b/ooo_custom_images/hicontrast/res/sc10715.png
index c815bd93ae83..c815bd93ae83 100644
--- a/default_images/res/sch10715.png
+++ b/ooo_custom_images/hicontrast/res/sc10715.png
diff --git a/default_images/res/sch10716.png b/ooo_custom_images/hicontrast/res/sc10716.png
index 3ce7fb050f27..3ce7fb050f27 100644
--- a/default_images/res/sch10716.png
+++ b/ooo_custom_images/hicontrast/res/sc10716.png
diff --git a/default_images/res/sch10851.png b/ooo_custom_images/hicontrast/res/sc10851.png
index 09cb8575c291..09cb8575c291 100644
--- a/default_images/res/sch10851.png
+++ b/ooo_custom_images/hicontrast/res/sc10851.png
diff --git a/default_images/res/sch10853.png b/ooo_custom_images/hicontrast/res/sc10853.png
index 0daef3676afb..0daef3676afb 100644
--- a/default_images/res/sch10853.png
+++ b/ooo_custom_images/hicontrast/res/sc10853.png
diff --git a/default_images/res/sch10854.png b/ooo_custom_images/hicontrast/res/sc10854.png
index af74230d313b..af74230d313b 100644
--- a/default_images/res/sch10854.png
+++ b/ooo_custom_images/hicontrast/res/sc10854.png
diff --git a/default_images/res/sch10863.png b/ooo_custom_images/hicontrast/res/sc10863.png
index 7ab7fae22af5..7ab7fae22af5 100644
--- a/default_images/res/sch10863.png
+++ b/ooo_custom_images/hicontrast/res/sc10863.png
diff --git a/default_images/res/sch10864.png b/ooo_custom_images/hicontrast/res/sc10864.png
index f5ba83f51d5b..f5ba83f51d5b 100644
--- a/default_images/res/sch10864.png
+++ b/ooo_custom_images/hicontrast/res/sc10864.png
diff --git a/default_images/res/sch10865.png b/ooo_custom_images/hicontrast/res/sc10865.png
index 9ce2ecd5ed18..9ce2ecd5ed18 100644
--- a/default_images/res/sch10865.png
+++ b/ooo_custom_images/hicontrast/res/sc10865.png
diff --git a/default_images/res/sch10866.png b/ooo_custom_images/hicontrast/res/sc10866.png
index f92832a860f0..f92832a860f0 100644
--- a/default_images/res/sch10866.png
+++ b/ooo_custom_images/hicontrast/res/sc10866.png
diff --git a/default_images/res/sch10867.png b/ooo_custom_images/hicontrast/res/sc10867.png
index f47fb44406b7..f47fb44406b7 100644
--- a/default_images/res/sch10867.png
+++ b/ooo_custom_images/hicontrast/res/sc10867.png
diff --git a/default_images/res/sch10868.png b/ooo_custom_images/hicontrast/res/sc10868.png
index 6963c334275c..6963c334275c 100644
--- a/default_images/res/sch10868.png
+++ b/ooo_custom_images/hicontrast/res/sc10868.png
diff --git a/default_images/res/sch10869.png b/ooo_custom_images/hicontrast/res/sc10869.png
index 838ac1be530b..838ac1be530b 100644
--- a/default_images/res/sch10869.png
+++ b/ooo_custom_images/hicontrast/res/sc10869.png
diff --git a/default_images/res/script_hc.png b/ooo_custom_images/hicontrast/res/script.png
index 8568c06a0c53..8568c06a0c53 100644
--- a/default_images/res/script_hc.png
+++ b/ooo_custom_images/hicontrast/res/script.png
diff --git a/default_images/res/sxh03123.png b/ooo_custom_images/hicontrast/res/sx03123.png
index 16da0e46ae28..16da0e46ae28 100644
--- a/default_images/res/sxh03123.png
+++ b/ooo_custom_images/hicontrast/res/sx03123.png
diff --git a/default_images/res/sxh03124.png b/ooo_custom_images/hicontrast/res/sx03124.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03124.png
+++ b/ooo_custom_images/hicontrast/res/sx03124.png
diff --git a/default_images/res/sxh03125.png b/ooo_custom_images/hicontrast/res/sx03125.png
index 7bc8dc757f24..7bc8dc757f24 100644
--- a/default_images/res/sxh03125.png
+++ b/ooo_custom_images/hicontrast/res/sx03125.png
diff --git a/default_images/res/sxh03126.png b/ooo_custom_images/hicontrast/res/sx03126.png
index a35bf77dd73b..a35bf77dd73b 100644
--- a/default_images/res/sxh03126.png
+++ b/ooo_custom_images/hicontrast/res/sx03126.png
diff --git a/default_images/res/sxh03127.png b/ooo_custom_images/hicontrast/res/sx03127.png
index 7f9e73b1a407..7f9e73b1a407 100644
--- a/default_images/res/sxh03127.png
+++ b/ooo_custom_images/hicontrast/res/sx03127.png
diff --git a/default_images/res/sxh03128.png b/ooo_custom_images/hicontrast/res/sx03128.png
index 7e6ecb41db6f..7e6ecb41db6f 100644
--- a/default_images/res/sxh03128.png
+++ b/ooo_custom_images/hicontrast/res/sx03128.png
diff --git a/default_images/res/sxh03129.png b/ooo_custom_images/hicontrast/res/sx03129.png
index 54bcfc3a5043..54bcfc3a5043 100644
--- a/default_images/res/sxh03129.png
+++ b/ooo_custom_images/hicontrast/res/sx03129.png
diff --git a/default_images/res/sxh03130.png b/ooo_custom_images/hicontrast/res/sx03130.png
index ec0da4bf920e..ec0da4bf920e 100644
--- a/default_images/res/sxh03130.png
+++ b/ooo_custom_images/hicontrast/res/sx03130.png
diff --git a/default_images/res/sxh03131.png b/ooo_custom_images/hicontrast/res/sx03131.png
index 7f9e73b1a407..7f9e73b1a407 100644
--- a/default_images/res/sxh03131.png
+++ b/ooo_custom_images/hicontrast/res/sx03131.png
diff --git a/default_images/res/sxh03132.png b/ooo_custom_images/hicontrast/res/sx03132.png
index 7f9e73b1a407..7f9e73b1a407 100644
--- a/default_images/res/sxh03132.png
+++ b/ooo_custom_images/hicontrast/res/sx03132.png
diff --git a/default_images/res/sxh03134.png b/ooo_custom_images/hicontrast/res/sx03134.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03134.png
+++ b/ooo_custom_images/hicontrast/res/sx03134.png
diff --git a/default_images/res/sxh03135.png b/ooo_custom_images/hicontrast/res/sx03135.png
index 08bac2452829..08bac2452829 100644
--- a/default_images/res/sxh03135.png
+++ b/ooo_custom_images/hicontrast/res/sx03135.png
diff --git a/default_images/res/sxh03136.png b/ooo_custom_images/hicontrast/res/sx03136.png
index 898f239854c7..898f239854c7 100644
--- a/default_images/res/sxh03136.png
+++ b/ooo_custom_images/hicontrast/res/sx03136.png
diff --git a/default_images/res/sxh03137.png b/ooo_custom_images/hicontrast/res/sx03137.png
index aadd7e1507c6..aadd7e1507c6 100644
--- a/default_images/res/sxh03137.png
+++ b/ooo_custom_images/hicontrast/res/sx03137.png
diff --git a/default_images/res/sxh03138.png b/ooo_custom_images/hicontrast/res/sx03138.png
index 2103c7b100f7..2103c7b100f7 100644
--- a/default_images/res/sxh03138.png
+++ b/ooo_custom_images/hicontrast/res/sx03138.png
diff --git a/default_images/res/sxh03139.png b/ooo_custom_images/hicontrast/res/sx03139.png
index e205d578eb87..e205d578eb87 100644
--- a/default_images/res/sxh03139.png
+++ b/ooo_custom_images/hicontrast/res/sx03139.png
diff --git a/default_images/res/sxh03140.png b/ooo_custom_images/hicontrast/res/sx03140.png
index 2d59aca65a81..2d59aca65a81 100644
--- a/default_images/res/sxh03140.png
+++ b/ooo_custom_images/hicontrast/res/sx03140.png
diff --git a/default_images/res/sxh03141.png b/ooo_custom_images/hicontrast/res/sx03141.png
index e654592864c5..e654592864c5 100644
--- a/default_images/res/sxh03141.png
+++ b/ooo_custom_images/hicontrast/res/sx03141.png
diff --git a/default_images/res/sxh03142.png b/ooo_custom_images/hicontrast/res/sx03142.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03142.png
+++ b/ooo_custom_images/hicontrast/res/sx03142.png
diff --git a/default_images/res/sxh03144.png b/ooo_custom_images/hicontrast/res/sx03144.png
index 06fd33d4a1a2..06fd33d4a1a2 100644
--- a/default_images/res/sxh03144.png
+++ b/ooo_custom_images/hicontrast/res/sx03144.png
diff --git a/default_images/res/sxh03145.png b/ooo_custom_images/hicontrast/res/sx03145.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03145.png
+++ b/ooo_custom_images/hicontrast/res/sx03145.png
diff --git a/default_images/res/sxh03150.png b/ooo_custom_images/hicontrast/res/sx03150.png
index 7e6ecb41db6f..7e6ecb41db6f 100644
--- a/default_images/res/sxh03150.png
+++ b/ooo_custom_images/hicontrast/res/sx03150.png
diff --git a/default_images/res/sxh03151.png b/ooo_custom_images/hicontrast/res/sx03151.png
index 91189012500c..91189012500c 100644
--- a/default_images/res/sxh03151.png
+++ b/ooo_custom_images/hicontrast/res/sx03151.png
diff --git a/default_images/res/sxh03152.png b/ooo_custom_images/hicontrast/res/sx03152.png
index abaa93fe64cf..abaa93fe64cf 100644
--- a/default_images/res/sxh03152.png
+++ b/ooo_custom_images/hicontrast/res/sx03152.png
diff --git a/default_images/res/sxh03153.png b/ooo_custom_images/hicontrast/res/sx03153.png
index f9a52c2fb1b7..f9a52c2fb1b7 100644
--- a/default_images/res/sxh03153.png
+++ b/ooo_custom_images/hicontrast/res/sx03153.png
diff --git a/default_images/res/sxh03154.png b/ooo_custom_images/hicontrast/res/sx03154.png
index 79c74739139b..79c74739139b 100644
--- a/default_images/res/sxh03154.png
+++ b/ooo_custom_images/hicontrast/res/sx03154.png
diff --git a/default_images/res/sxh03155.png b/ooo_custom_images/hicontrast/res/sx03155.png
index c5eb49696af6..c5eb49696af6 100644
--- a/default_images/res/sxh03155.png
+++ b/ooo_custom_images/hicontrast/res/sx03155.png
diff --git a/default_images/res/sxh03156.png b/ooo_custom_images/hicontrast/res/sx03156.png
index 8467c77eeef9..8467c77eeef9 100644
--- a/default_images/res/sxh03156.png
+++ b/ooo_custom_images/hicontrast/res/sx03156.png
diff --git a/default_images/res/sxh03157.png b/ooo_custom_images/hicontrast/res/sx03157.png
index 90cb102945e6..90cb102945e6 100644
--- a/default_images/res/sxh03157.png
+++ b/ooo_custom_images/hicontrast/res/sx03157.png
diff --git a/default_images/res/sxh03158.png b/ooo_custom_images/hicontrast/res/sx03158.png
index d82fba78f187..d82fba78f187 100644
--- a/default_images/res/sxh03158.png
+++ b/ooo_custom_images/hicontrast/res/sx03158.png
diff --git a/default_images/res/sxh03159.png b/ooo_custom_images/hicontrast/res/sx03159.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03159.png
+++ b/ooo_custom_images/hicontrast/res/sx03159.png
diff --git a/default_images/res/sxh03160.png b/ooo_custom_images/hicontrast/res/sx03160.png
index 3996bb6beeb3..3996bb6beeb3 100644
--- a/default_images/res/sxh03160.png
+++ b/ooo_custom_images/hicontrast/res/sx03160.png
diff --git a/default_images/res/sxh03161.png b/ooo_custom_images/hicontrast/res/sx03161.png
index 38c433e65845..38c433e65845 100644
--- a/default_images/res/sxh03161.png
+++ b/ooo_custom_images/hicontrast/res/sx03161.png
diff --git a/default_images/res/sxh03162.png b/ooo_custom_images/hicontrast/res/sx03162.png
index 148a3e35b9a1..148a3e35b9a1 100644
--- a/default_images/res/sxh03162.png
+++ b/ooo_custom_images/hicontrast/res/sx03162.png
diff --git a/default_images/res/sxh03163.png b/ooo_custom_images/hicontrast/res/sx03163.png
index 6685e61d0134..6685e61d0134 100644
--- a/default_images/res/sxh03163.png
+++ b/ooo_custom_images/hicontrast/res/sx03163.png
diff --git a/default_images/res/sxh03164.png b/ooo_custom_images/hicontrast/res/sx03164.png
index 324def54b850..324def54b850 100644
--- a/default_images/res/sxh03164.png
+++ b/ooo_custom_images/hicontrast/res/sx03164.png
diff --git a/default_images/res/sxh03165.png b/ooo_custom_images/hicontrast/res/sx03165.png
index 61ed67048848..61ed67048848 100644
--- a/default_images/res/sxh03165.png
+++ b/ooo_custom_images/hicontrast/res/sx03165.png
diff --git a/default_images/res/sxh03166.png b/ooo_custom_images/hicontrast/res/sx03166.png
index 5c4752a2c4c6..5c4752a2c4c6 100644
--- a/default_images/res/sxh03166.png
+++ b/ooo_custom_images/hicontrast/res/sx03166.png
diff --git a/default_images/res/sxh03167.png b/ooo_custom_images/hicontrast/res/sx03167.png
index 4e764ea901f7..4e764ea901f7 100644
--- a/default_images/res/sxh03167.png
+++ b/ooo_custom_images/hicontrast/res/sx03167.png
diff --git a/default_images/res/sxh03168.png b/ooo_custom_images/hicontrast/res/sx03168.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03168.png
+++ b/ooo_custom_images/hicontrast/res/sx03168.png
diff --git a/default_images/res/sxh03187.png b/ooo_custom_images/hicontrast/res/sx03187.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03187.png
+++ b/ooo_custom_images/hicontrast/res/sx03187.png
diff --git a/default_images/res/sxh03188.png b/ooo_custom_images/hicontrast/res/sx03188.png
index 251e01464227..251e01464227 100644
--- a/default_images/res/sxh03188.png
+++ b/ooo_custom_images/hicontrast/res/sx03188.png
diff --git a/default_images/res/sxh03189.png b/ooo_custom_images/hicontrast/res/sx03189.png
index e654592864c5..e654592864c5 100644
--- a/default_images/res/sxh03189.png
+++ b/ooo_custom_images/hicontrast/res/sx03189.png
diff --git a/default_images/res/sxh03190.png b/ooo_custom_images/hicontrast/res/sx03190.png
index 20f79134336e..20f79134336e 100644
--- a/default_images/res/sxh03190.png
+++ b/ooo_custom_images/hicontrast/res/sx03190.png
diff --git a/default_images/res/sxh03193.png b/ooo_custom_images/hicontrast/res/sx03193.png
index fb9cec699e3d..fb9cec699e3d 100644
--- a/default_images/res/sxh03193.png
+++ b/ooo_custom_images/hicontrast/res/sx03193.png
diff --git a/default_images/res/sxh03198.png b/ooo_custom_images/hicontrast/res/sx03198.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03198.png
+++ b/ooo_custom_images/hicontrast/res/sx03198.png
diff --git a/default_images/res/sxh03201.png b/ooo_custom_images/hicontrast/res/sx03201.png
index c0de7947d437..c0de7947d437 100644
--- a/default_images/res/sxh03201.png
+++ b/ooo_custom_images/hicontrast/res/sx03201.png
diff --git a/default_images/res/sxh03202.png b/ooo_custom_images/hicontrast/res/sx03202.png
index 136ea6088fb0..136ea6088fb0 100644
--- a/default_images/res/sxh03202.png
+++ b/ooo_custom_images/hicontrast/res/sx03202.png
diff --git a/default_images/res/sxh03203.png b/ooo_custom_images/hicontrast/res/sx03203.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03203.png
+++ b/ooo_custom_images/hicontrast/res/sx03203.png
diff --git a/default_images/res/sxh03204.png b/ooo_custom_images/hicontrast/res/sx03204.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03204.png
+++ b/ooo_custom_images/hicontrast/res/sx03204.png
diff --git a/default_images/res/sxh03205.png b/ooo_custom_images/hicontrast/res/sx03205.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03205.png
+++ b/ooo_custom_images/hicontrast/res/sx03205.png
diff --git a/default_images/res/sxh03206.png b/ooo_custom_images/hicontrast/res/sx03206.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03206.png
+++ b/ooo_custom_images/hicontrast/res/sx03206.png
diff --git a/default_images/res/sxh03214.png b/ooo_custom_images/hicontrast/res/sx03214.png
index d08470ac6c0e..d08470ac6c0e 100644
--- a/default_images/res/sxh03214.png
+++ b/ooo_custom_images/hicontrast/res/sx03214.png
diff --git a/default_images/res/sxh03216.png b/ooo_custom_images/hicontrast/res/sx03216.png
index 6a2689d03ff4..6a2689d03ff4 100644
--- a/default_images/res/sxh03216.png
+++ b/ooo_custom_images/hicontrast/res/sx03216.png
diff --git a/default_images/res/sxh03217.png b/ooo_custom_images/hicontrast/res/sx03217.png
index d961aa76b7ff..d961aa76b7ff 100644
--- a/default_images/res/sxh03217.png
+++ b/ooo_custom_images/hicontrast/res/sx03217.png
diff --git a/default_images/res/sxh03218.png b/ooo_custom_images/hicontrast/res/sx03218.png
index 52a74031a2f4..52a74031a2f4 100644
--- a/default_images/res/sxh03218.png
+++ b/ooo_custom_images/hicontrast/res/sx03218.png
diff --git a/default_images/res/sxh03219.png b/ooo_custom_images/hicontrast/res/sx03219.png
index ffcdb941afc4..ffcdb941afc4 100644
--- a/default_images/res/sxh03219.png
+++ b/ooo_custom_images/hicontrast/res/sx03219.png
diff --git a/default_images/res/sxh03220.png b/ooo_custom_images/hicontrast/res/sx03220.png
index 0c253d383b4e..0c253d383b4e 100644
--- a/default_images/res/sxh03220.png
+++ b/ooo_custom_images/hicontrast/res/sx03220.png
diff --git a/default_images/res/sxh03221.png b/ooo_custom_images/hicontrast/res/sx03221.png
index 52a74031a2f4..52a74031a2f4 100644
--- a/default_images/res/sxh03221.png
+++ b/ooo_custom_images/hicontrast/res/sx03221.png
diff --git a/default_images/res/sxh03222.png b/ooo_custom_images/hicontrast/res/sx03222.png
index 52a74031a2f4..52a74031a2f4 100644
--- a/default_images/res/sxh03222.png
+++ b/ooo_custom_images/hicontrast/res/sx03222.png
diff --git a/default_images/res/sxh03226.png b/ooo_custom_images/hicontrast/res/sx03226.png
index b1ccfd9f6d47..b1ccfd9f6d47 100644
--- a/default_images/res/sxh03226.png
+++ b/ooo_custom_images/hicontrast/res/sx03226.png
diff --git a/default_images/res/sxh03227.png b/ooo_custom_images/hicontrast/res/sx03227.png
index 4f1830cae959..4f1830cae959 100644
--- a/default_images/res/sxh03227.png
+++ b/ooo_custom_images/hicontrast/res/sx03227.png
diff --git a/default_images/res/sxh03228.png b/ooo_custom_images/hicontrast/res/sx03228.png
index 4a85093c8428..4a85093c8428 100644
--- a/default_images/res/sxh03228.png
+++ b/ooo_custom_images/hicontrast/res/sx03228.png
diff --git a/default_images/res/sxh03236.png b/ooo_custom_images/hicontrast/res/sx03236.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03236.png
+++ b/ooo_custom_images/hicontrast/res/sx03236.png
diff --git a/default_images/res/sxh03237.png b/ooo_custom_images/hicontrast/res/sx03237.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03237.png
+++ b/ooo_custom_images/hicontrast/res/sx03237.png
diff --git a/default_images/res/sxh03239.png b/ooo_custom_images/hicontrast/res/sx03239.png
index 4ef2e585ec38..4ef2e585ec38 100644
--- a/default_images/res/sxh03239.png
+++ b/ooo_custom_images/hicontrast/res/sx03239.png
diff --git a/default_images/res/sxh03241.png b/ooo_custom_images/hicontrast/res/sx03241.png
index c32d26971bbc..c32d26971bbc 100644
--- a/default_images/res/sxh03241.png
+++ b/ooo_custom_images/hicontrast/res/sx03241.png
diff --git a/default_images/res/sxh03242.png b/ooo_custom_images/hicontrast/res/sx03242.png
index e39095e7c572..e39095e7c572 100644
--- a/default_images/res/sxh03242.png
+++ b/ooo_custom_images/hicontrast/res/sx03242.png
diff --git a/default_images/res/sxh03243.png b/ooo_custom_images/hicontrast/res/sx03243.png
index 40cb18e02e31..40cb18e02e31 100644
--- a/default_images/res/sxh03243.png
+++ b/ooo_custom_images/hicontrast/res/sx03243.png
diff --git a/default_images/res/sxh03244.png b/ooo_custom_images/hicontrast/res/sx03244.png
index ec0da4bf920e..ec0da4bf920e 100644
--- a/default_images/res/sxh03244.png
+++ b/ooo_custom_images/hicontrast/res/sx03244.png
diff --git a/default_images/res/sxh03245.png b/ooo_custom_images/hicontrast/res/sx03245.png
index 71891164e16a..71891164e16a 100644
--- a/default_images/res/sxh03245.png
+++ b/ooo_custom_images/hicontrast/res/sx03245.png
diff --git a/default_images/res/sxh03246.png b/ooo_custom_images/hicontrast/res/sx03246.png
index 301f66df8344..301f66df8344 100644
--- a/default_images/res/sxh03246.png
+++ b/ooo_custom_images/hicontrast/res/sx03246.png
diff --git a/default_images/res/sxh03247.png b/ooo_custom_images/hicontrast/res/sx03247.png
index e9ab1ae12d31..e9ab1ae12d31 100644
--- a/default_images/res/sxh03247.png
+++ b/ooo_custom_images/hicontrast/res/sx03247.png
diff --git a/default_images/res/sxh03248.png b/ooo_custom_images/hicontrast/res/sx03248.png
index 1d242c98b1b4..1d242c98b1b4 100644
--- a/default_images/res/sxh03248.png
+++ b/ooo_custom_images/hicontrast/res/sx03248.png
diff --git a/default_images/res/sxh03249.png b/ooo_custom_images/hicontrast/res/sx03249.png
index a52d19c0e0d7..a52d19c0e0d7 100644
--- a/default_images/res/sxh03249.png
+++ b/ooo_custom_images/hicontrast/res/sx03249.png
diff --git a/default_images/res/sxh03250.png b/ooo_custom_images/hicontrast/res/sx03250.png
index 43bc76a45334..43bc76a45334 100644
--- a/default_images/res/sxh03250.png
+++ b/ooo_custom_images/hicontrast/res/sx03250.png
diff --git a/default_images/res/sxh03251.png b/ooo_custom_images/hicontrast/res/sx03251.png
index da481549fb97..da481549fb97 100644
--- a/default_images/res/sxh03251.png
+++ b/ooo_custom_images/hicontrast/res/sx03251.png
diff --git a/default_images/res/sxh03252.png b/ooo_custom_images/hicontrast/res/sx03252.png
index 7ac05d5d894d..7ac05d5d894d 100644
--- a/default_images/res/sxh03252.png
+++ b/ooo_custom_images/hicontrast/res/sx03252.png
diff --git a/default_images/res/sxh03253.png b/ooo_custom_images/hicontrast/res/sx03253.png
index 046f224cea0f..046f224cea0f 100644
--- a/default_images/res/sxh03253.png
+++ b/ooo_custom_images/hicontrast/res/sx03253.png
diff --git a/default_images/res/sxh03254.png b/ooo_custom_images/hicontrast/res/sx03254.png
index abebaa1ba92c..abebaa1ba92c 100644
--- a/default_images/res/sxh03254.png
+++ b/ooo_custom_images/hicontrast/res/sx03254.png
diff --git a/default_images/res/sxh03255.png b/ooo_custom_images/hicontrast/res/sx03255.png
index 808603278c55..808603278c55 100644
--- a/default_images/res/sxh03255.png
+++ b/ooo_custom_images/hicontrast/res/sx03255.png
diff --git a/default_images/res/sxh03256.png b/ooo_custom_images/hicontrast/res/sx03256.png
index f3482407569b..f3482407569b 100644
--- a/default_images/res/sxh03256.png
+++ b/ooo_custom_images/hicontrast/res/sx03256.png
diff --git a/default_images/res/sxh10144.png b/ooo_custom_images/hicontrast/res/sx10144.png
index 3ebfee988b89..3ebfee988b89 100644
--- a/default_images/res/sxh10144.png
+++ b/ooo_custom_images/hicontrast/res/sx10144.png
diff --git a/default_images/res/sxh10593.png b/ooo_custom_images/hicontrast/res/sx10593.png
index e6715d0d98de..e6715d0d98de 100644
--- a/default_images/res/sxh10593.png
+++ b/ooo_custom_images/hicontrast/res/sx10593.png
diff --git a/default_images/res/sxh10594.png b/ooo_custom_images/hicontrast/res/sx10594.png
index aa4bbb676cb3..aa4bbb676cb3 100644
--- a/default_images/res/sxh10594.png
+++ b/ooo_custom_images/hicontrast/res/sx10594.png
diff --git a/default_images/res/sxh10595.png b/ooo_custom_images/hicontrast/res/sx10595.png
index 99f93e556a22..99f93e556a22 100644
--- a/default_images/res/sxh10595.png
+++ b/ooo_custom_images/hicontrast/res/sx10595.png
diff --git a/default_images/res/sxh10596.png b/ooo_custom_images/hicontrast/res/sx10596.png
index 01be728c42da..01be728c42da 100644
--- a/default_images/res/sxh10596.png
+++ b/ooo_custom_images/hicontrast/res/sx10596.png
diff --git a/default_images/res/sxh10597.png b/ooo_custom_images/hicontrast/res/sx10597.png
index c84f1dcebfc6..c84f1dcebfc6 100644
--- a/default_images/res/sxh10597.png
+++ b/ooo_custom_images/hicontrast/res/sx10597.png
diff --git a/default_images/res/sxh10598.png b/ooo_custom_images/hicontrast/res/sx10598.png
index d8ffe4b9fa09..d8ffe4b9fa09 100644
--- a/default_images/res/sxh10598.png
+++ b/ooo_custom_images/hicontrast/res/sx10598.png
diff --git a/default_images/res/sxh10599.png b/ooo_custom_images/hicontrast/res/sx10599.png
index 6245ac512b79..6245ac512b79 100644
--- a/default_images/res/sxh10599.png
+++ b/ooo_custom_images/hicontrast/res/sx10599.png
diff --git a/default_images/res/sxh10600.png b/ooo_custom_images/hicontrast/res/sx10600.png
index 452f4a37056e..452f4a37056e 100644
--- a/default_images/res/sxh10600.png
+++ b/ooo_custom_images/hicontrast/res/sx10600.png
diff --git a/default_images/res/sxh10601.png b/ooo_custom_images/hicontrast/res/sx10601.png
index c1e49973f383..c1e49973f383 100644
--- a/default_images/res/sxh10601.png
+++ b/ooo_custom_images/hicontrast/res/sx10601.png
diff --git a/default_images/res/sxh10602.png b/ooo_custom_images/hicontrast/res/sx10602.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh10602.png
+++ b/ooo_custom_images/hicontrast/res/sx10602.png
diff --git a/default_images/res/sxh10603.png b/ooo_custom_images/hicontrast/res/sx10603.png
index d8955c4c2341..d8955c4c2341 100644
--- a/default_images/res/sxh10603.png
+++ b/ooo_custom_images/hicontrast/res/sx10603.png
diff --git a/default_images/res/sxh10604.png b/ooo_custom_images/hicontrast/res/sx10604.png
index 916f303d262b..916f303d262b 100644
--- a/default_images/res/sxh10604.png
+++ b/ooo_custom_images/hicontrast/res/sx10604.png
diff --git a/default_images/res/sxh10605.png b/ooo_custom_images/hicontrast/res/sx10605.png
index 724eb1248921..724eb1248921 100644
--- a/default_images/res/sxh10605.png
+++ b/ooo_custom_images/hicontrast/res/sx10605.png
diff --git a/default_images/res/sxh10607.png b/ooo_custom_images/hicontrast/res/sx10607.png
index 1a1e3ae314e0..1a1e3ae314e0 100644
--- a/default_images/res/sxh10607.png
+++ b/ooo_custom_images/hicontrast/res/sx10607.png
diff --git a/default_images/res/sxh10704.png b/ooo_custom_images/hicontrast/res/sx10704.png
index 510472b26937..510472b26937 100644
--- a/default_images/res/sxh10704.png
+++ b/ooo_custom_images/hicontrast/res/sx10704.png
diff --git a/default_images/res/sxh10705.png b/ooo_custom_images/hicontrast/res/sx10705.png
index 708642e6d7aa..708642e6d7aa 100644
--- a/default_images/res/sxh10705.png
+++ b/ooo_custom_images/hicontrast/res/sx10705.png
diff --git a/default_images/res/sxh10706.png b/ooo_custom_images/hicontrast/res/sx10706.png
index 4384a6e50bc0..4384a6e50bc0 100644
--- a/default_images/res/sxh10706.png
+++ b/ooo_custom_images/hicontrast/res/sx10706.png
diff --git a/default_images/res/sxh10707.png b/ooo_custom_images/hicontrast/res/sx10707.png
index 2dba4e459cc2..2dba4e459cc2 100644
--- a/default_images/res/sxh10707.png
+++ b/ooo_custom_images/hicontrast/res/sx10707.png
diff --git a/default_images/res/sxh10708.png b/ooo_custom_images/hicontrast/res/sx10708.png
index 90da08b232d6..90da08b232d6 100644
--- a/default_images/res/sxh10708.png
+++ b/ooo_custom_images/hicontrast/res/sx10708.png
diff --git a/default_images/res/sxh10710.png b/ooo_custom_images/hicontrast/res/sx10710.png
index 2ff8d27e41d2..2ff8d27e41d2 100644
--- a/default_images/res/sxh10710.png
+++ b/ooo_custom_images/hicontrast/res/sx10710.png
diff --git a/default_images/res/sxh10715.png b/ooo_custom_images/hicontrast/res/sx10715.png
index c815bd93ae83..c815bd93ae83 100644
--- a/default_images/res/sxh10715.png
+++ b/ooo_custom_images/hicontrast/res/sx10715.png
diff --git a/default_images/res/sxh10728.png b/ooo_custom_images/hicontrast/res/sx10728.png
index d546a44014a7..d546a44014a7 100644
--- a/default_images/res/sxh10728.png
+++ b/ooo_custom_images/hicontrast/res/sx10728.png
diff --git a/default_images/res/sxh10757.png b/ooo_custom_images/hicontrast/res/sx10757.png
index c4fb367d3a96..c4fb367d3a96 100644
--- a/default_images/res/sxh10757.png
+++ b/ooo_custom_images/hicontrast/res/sx10757.png
diff --git a/default_images/res/sxh10768.png b/ooo_custom_images/hicontrast/res/sx10768.png
index 79b3148cfd1c..79b3148cfd1c 100644
--- a/default_images/res/sxh10768.png
+++ b/ooo_custom_images/hicontrast/res/sx10768.png
diff --git a/default_images/res/sxh10769.png b/ooo_custom_images/hicontrast/res/sx10769.png
index 0c66e0d5d9be..0c66e0d5d9be 100644
--- a/default_images/res/sxh10769.png
+++ b/ooo_custom_images/hicontrast/res/sx10769.png
diff --git a/default_images/res/sxh18002.png b/ooo_custom_images/hicontrast/res/sx18002.png
index 32f5af831e0c..32f5af831e0c 100644
--- a/default_images/res/sxh18002.png
+++ b/ooo_custom_images/hicontrast/res/sx18002.png
diff --git a/default_images/res/sxh18003.png b/ooo_custom_images/hicontrast/res/sx18003.png
index cf0a8dcdcd40..cf0a8dcdcd40 100644
--- a/default_images/res/sxh18003.png
+++ b/ooo_custom_images/hicontrast/res/sx18003.png
diff --git a/default_images/res/sxh18013.png b/ooo_custom_images/hicontrast/res/sx18013.png
index a5a568c92ead..a5a568c92ead 100644
--- a/default_images/res/sxh18013.png
+++ b/ooo_custom_images/hicontrast/res/sx18013.png
diff --git a/default_images/res/sxh18022.png b/ooo_custom_images/hicontrast/res/sx18022.png
index 67019acccd76..67019acccd76 100644
--- a/default_images/res/sxh18022.png
+++ b/ooo_custom_images/hicontrast/res/sx18022.png
diff --git a/default_images/res/sxh18027.png b/ooo_custom_images/hicontrast/res/sx18027.png
index 0e35d8cb2279..0e35d8cb2279 100644
--- a/default_images/res/sxh18027.png
+++ b/ooo_custom_images/hicontrast/res/sx18027.png
diff --git a/default_images/res/target_hc.png b/ooo_custom_images/hicontrast/res/target.png
index 969566ad443d..969566ad443d 100644
--- a/default_images/res/target_hc.png
+++ b/ooo_custom_images/hicontrast/res/target.png
diff --git a/default_images/res/tbh01.png b/ooo_custom_images/hicontrast/res/tb01.png
index 850bdbaf5340..850bdbaf5340 100644
--- a/default_images/res/tbh01.png
+++ b/ooo_custom_images/hicontrast/res/tb01.png
diff --git a/default_images/res/tbh02.png b/ooo_custom_images/hicontrast/res/tb02.png
index f4854f2693fa..f4854f2693fa 100644
--- a/default_images/res/tbh02.png
+++ b/ooo_custom_images/hicontrast/res/tb02.png
diff --git a/default_images/res/tbh03.png b/ooo_custom_images/hicontrast/res/tb03.png
index 6b552364e341..6b552364e341 100644
--- a/default_images/res/tbh03.png
+++ b/ooo_custom_images/hicontrast/res/tb03.png
diff --git a/default_images/res/tbh04.png b/ooo_custom_images/hicontrast/res/tb04.png
index 327d364aaec1..327d364aaec1 100644
--- a/default_images/res/tbh04.png
+++ b/ooo_custom_images/hicontrast/res/tb04.png
diff --git a/default_images/res/tbh05.png b/ooo_custom_images/hicontrast/res/tb05.png
index b1109af26294..b1109af26294 100644
--- a/default_images/res/tbh05.png
+++ b/ooo_custom_images/hicontrast/res/tb05.png
diff --git a/default_images/res/xml_16_h.png b/ooo_custom_images/hicontrast/res/xml_16.png
index a68095ea0930..a68095ea0930 100644
--- a/default_images/res/xml_16_h.png
+++ b/ooo_custom_images/hicontrast/res/xml_16.png
diff --git a/default_images/sc/res/date_h.png b/ooo_custom_images/hicontrast/sc/res/date.png
index 6ec777afb886..6ec777afb886 100644
--- a/default_images/sc/res/date_h.png
+++ b/ooo_custom_images/hicontrast/sc/res/date.png
diff --git a/default_images/sc/res/dropcopy_h.png b/ooo_custom_images/hicontrast/sc/res/dropcopy.png
index fcb9996b7ab5..fcb9996b7ab5 100644
--- a/default_images/sc/res/dropcopy_h.png
+++ b/ooo_custom_images/hicontrast/sc/res/dropcopy.png
diff --git a/default_images/sc/res/droplink_h.png b/ooo_custom_images/hicontrast/sc/res/droplink.png
index 936eba564fa3..936eba564fa3 100644
--- a/default_images/sc/res/droplink_h.png
+++ b/ooo_custom_images/hicontrast/sc/res/droplink.png
diff --git a/default_images/sc/res/dropurl_h.png b/ooo_custom_images/hicontrast/sc/res/dropurl.png
index 09cb8575c291..09cb8575c291 100644
--- a/default_images/sc/res/dropurl_h.png
+++ b/ooo_custom_images/hicontrast/sc/res/dropurl.png
diff --git a/default_images/sc/res/file_h.png b/ooo_custom_images/hicontrast/sc/res/file.png
index a9449999cdc1..a9449999cdc1 100644
--- a/default_images/sc/res/file_h.png
+++ b/ooo_custom_images/hicontrast/sc/res/file.png
diff --git a/default_images/sc/res/imglst/apptbx/lch26047.png b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/lc26047.png
index 66e77d2a86b3..66e77d2a86b3 100644
--- a/default_images/sc/res/imglst/apptbx/lch26047.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/lc26047.png
diff --git a/default_images/sc/res/imglst/apptbx/lch26048.png b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/lc26048.png
index 8221b0fe5c10..8221b0fe5c10 100644
--- a/default_images/sc/res/imglst/apptbx/lch26048.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/lc26048.png
diff --git a/default_images/sc/res/imglst/apptbx/lch26049.png b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/lc26049.png
index fb7b27eccd59..fb7b27eccd59 100644
--- a/default_images/sc/res/imglst/apptbx/lch26049.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/lc26049.png
diff --git a/default_images/sc/res/imglst/apptbx/lch26050.png b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/lc26050.png
index ebc30c863090..ebc30c863090 100644
--- a/default_images/sc/res/imglst/apptbx/lch26050.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/lc26050.png
diff --git a/default_images/sc/res/imglst/apptbx/lch26051.png b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/lc26051.png
index a92a0a378a41..a92a0a378a41 100644
--- a/default_images/sc/res/imglst/apptbx/lch26051.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/lc26051.png
diff --git a/default_images/sc/res/imglst/apptbx/sch26047.png b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/sc26047.png
index 290af7ffc8b0..290af7ffc8b0 100644
--- a/default_images/sc/res/imglst/apptbx/sch26047.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/sc26047.png
diff --git a/default_images/sc/res/imglst/apptbx/sch26048.png b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/sc26048.png
index c0f6360cdc8c..c0f6360cdc8c 100644
--- a/default_images/sc/res/imglst/apptbx/sch26048.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/sc26048.png
diff --git a/default_images/sc/res/imglst/apptbx/sch26049.png b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/sc26049.png
index 1532063a0d1b..1532063a0d1b 100644
--- a/default_images/sc/res/imglst/apptbx/sch26049.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/sc26049.png
diff --git a/default_images/sc/res/imglst/apptbx/sch26050.png b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/sc26050.png
index 1f5682a2f133..1f5682a2f133 100644
--- a/default_images/sc/res/imglst/apptbx/sch26050.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/sc26050.png
diff --git a/default_images/sc/res/imglst/apptbx/sch26051.png b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/sc26051.png
index 7b42f0a62b9f..7b42f0a62b9f 100644
--- a/default_images/sc/res/imglst/apptbx/sch26051.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/sc26051.png
diff --git a/default_images/sc/res/imglst/dbgui/ouh01.png b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou01.png
index 828e0876d892..828e0876d892 100644
--- a/default_images/sc/res/imglst/dbgui/ouh01.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou01.png
diff --git a/default_images/sc/res/imglst/dbgui/ouh010.png b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou010.png
index 2429662b75dc..2429662b75dc 100644
--- a/default_images/sc/res/imglst/dbgui/ouh010.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou010.png
diff --git a/default_images/sc/res/imglst/dbgui/ouh011.png b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou011.png
index bb26e4ed4a30..bb26e4ed4a30 100644
--- a/default_images/sc/res/imglst/dbgui/ouh011.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou011.png
diff --git a/default_images/sc/res/imglst/dbgui/ouh012.png b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou012.png
index bb1a4037f545..bb1a4037f545 100644
--- a/default_images/sc/res/imglst/dbgui/ouh012.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou012.png
diff --git a/default_images/sc/res/imglst/dbgui/ouh02.png b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou02.png
index e090266bca9e..e090266bca9e 100644
--- a/default_images/sc/res/imglst/dbgui/ouh02.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou02.png
diff --git a/default_images/sc/res/imglst/dbgui/ouh03.png b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou03.png
index 2e7742e26ed7..2e7742e26ed7 100644
--- a/default_images/sc/res/imglst/dbgui/ouh03.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou03.png
diff --git a/default_images/sc/res/imglst/dbgui/ouh04.png b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou04.png
index af3e313feae3..af3e313feae3 100644
--- a/default_images/sc/res/imglst/dbgui/ouh04.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou04.png
diff --git a/default_images/sc/res/imglst/dbgui/ouh05.png b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou05.png
index 52500c8293f8..52500c8293f8 100644
--- a/default_images/sc/res/imglst/dbgui/ouh05.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou05.png
diff --git a/default_images/sc/res/imglst/dbgui/ouh06.png b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou06.png
index f1cd41a40a6b..f1cd41a40a6b 100644
--- a/default_images/sc/res/imglst/dbgui/ouh06.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou06.png
diff --git a/default_images/sc/res/imglst/dbgui/ouh07.png b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou07.png
index d4f3de17bad3..d4f3de17bad3 100644
--- a/default_images/sc/res/imglst/dbgui/ouh07.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou07.png
diff --git a/default_images/sc/res/imglst/dbgui/ouh08.png b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou08.png
index 565bf55de3b1..565bf55de3b1 100644
--- a/default_images/sc/res/imglst/dbgui/ouh08.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou08.png
diff --git a/default_images/sc/res/imglst/dbgui/ouh09.png b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou09.png
index fd5b7f2e1d5f..fd5b7f2e1d5f 100644
--- a/default_images/sc/res/imglst/dbgui/ouh09.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou09.png
diff --git a/default_images/sc/res/imglst/navipi/nah010.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na010.png
index 39536c030f77..39536c030f77 100644
--- a/default_images/sc/res/imglst/navipi/nah010.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na010.png
diff --git a/default_images/sc/res/imglst/navipi/nah011.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na011.png
index beff20a9a2e4..beff20a9a2e4 100644
--- a/default_images/sc/res/imglst/navipi/nah011.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na011.png
diff --git a/default_images/sc/res/imglst/navipi/nah03.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na03.png
index 544fe41fbbfc..544fe41fbbfc 100644
--- a/default_images/sc/res/imglst/navipi/nah03.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na03.png
diff --git a/default_images/sc/res/imglst/navipi/nah05.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na05.png
index a3fd98dc2a86..a3fd98dc2a86 100644
--- a/default_images/sc/res/imglst/navipi/nah05.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na05.png
diff --git a/default_images/sc/res/imglst/navipi/nah06.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na06.png
index 56ed07db53e8..56ed07db53e8 100644
--- a/default_images/sc/res/imglst/navipi/nah06.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na06.png
diff --git a/default_images/sc/res/imglst/navipi/nah07.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na07.png
index b496203797a4..b496203797a4 100644
--- a/default_images/sc/res/imglst/navipi/nah07.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na07.png
diff --git a/default_images/sc/res/imglst/navipi/nah09.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na09.png
index 41467754f389..41467754f389 100644
--- a/default_images/sc/res/imglst/navipi/nah09.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na09.png
diff --git a/default_images/sc/res/imglst/navipi/nch01.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc01.png
index d8955c4c2341..d8955c4c2341 100644
--- a/default_images/sc/res/imglst/navipi/nch01.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc01.png
diff --git a/default_images/sc/res/imglst/navipi/nch02.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc02.png
index 4b3d4555147d..4b3d4555147d 100644
--- a/default_images/sc/res/imglst/navipi/nch02.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc02.png
diff --git a/default_images/sc/res/imglst/navipi/nch03.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc03.png
index 262a2edd0aa8..262a2edd0aa8 100644
--- a/default_images/sc/res/imglst/navipi/nch03.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc03.png
diff --git a/default_images/sc/res/imglst/navipi/nch04.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc04.png
index 0c8a02a306dd..0c8a02a306dd 100644
--- a/default_images/sc/res/imglst/navipi/nch04.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc04.png
diff --git a/default_images/sc/res/imglst/navipi/nch05.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc05.png
index 2169a8e39ad6..2169a8e39ad6 100644
--- a/default_images/sc/res/imglst/navipi/nch05.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc05.png
diff --git a/default_images/sc/res/imglst/navipi/nch06.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc06.png
index 75a0c8721d62..75a0c8721d62 100644
--- a/default_images/sc/res/imglst/navipi/nch06.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc06.png
diff --git a/default_images/sc/res/imglst/navipi/nch07.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc07.png
index 936eba564fa3..936eba564fa3 100644
--- a/default_images/sc/res/imglst/navipi/nch07.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc07.png
diff --git a/default_images/sc/res/imglst/navipi/nch08.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc08.png
index 0c8a02a306dd..0c8a02a306dd 100644
--- a/default_images/sc/res/imglst/navipi/nch08.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc08.png
diff --git a/default_images/sc/res/lftrgt_h.png b/ooo_custom_images/hicontrast/sc/res/lftrgt.png
index 3ab5ccefbdeb..3ab5ccefbdeb 100644
--- a/default_images/sc/res/lftrgt_h.png
+++ b/ooo_custom_images/hicontrast/sc/res/lftrgt.png
diff --git a/default_images/sc/res/page_h.png b/ooo_custom_images/hicontrast/sc/res/page.png
index a7813fae900f..a7813fae900f 100644
--- a/default_images/sc/res/page_h.png
+++ b/ooo_custom_images/hicontrast/sc/res/page.png
diff --git a/default_images/sc/res/pages_h.png b/ooo_custom_images/hicontrast/sc/res/pages.png
index ac0a649c359f..ac0a649c359f 100644
--- a/default_images/sc/res/pages_h.png
+++ b/ooo_custom_images/hicontrast/sc/res/pages.png
diff --git a/default_images/sc/res/sfh01.png b/ooo_custom_images/hicontrast/sc/res/sf01.png
index 96c007578caa..96c007578caa 100644
--- a/default_images/sc/res/sfh01.png
+++ b/ooo_custom_images/hicontrast/sc/res/sf01.png
diff --git a/default_images/sc/res/sfh02.png b/ooo_custom_images/hicontrast/sc/res/sf02.png
index ed255cd5e2b7..ed255cd5e2b7 100644
--- a/default_images/sc/res/sfh02.png
+++ b/ooo_custom_images/hicontrast/sc/res/sf02.png
diff --git a/default_images/sc/res/table_h.png b/ooo_custom_images/hicontrast/sc/res/table.png
index f68f7ec2ca33..f68f7ec2ca33 100644
--- a/default_images/sc/res/table_h.png
+++ b/ooo_custom_images/hicontrast/sc/res/table.png
diff --git a/default_images/sc/res/text_h.png b/ooo_custom_images/hicontrast/sc/res/text.png
index e3f522f6f288..e3f522f6f288 100644
--- a/default_images/sc/res/text_h.png
+++ b/ooo_custom_images/hicontrast/sc/res/text.png
diff --git a/default_images/sc/res/time_h.png b/ooo_custom_images/hicontrast/sc/res/time.png
index d77324af0da1..d77324af0da1 100644
--- a/default_images/sc/res/time_h.png
+++ b/ooo_custom_images/hicontrast/sc/res/time.png
diff --git a/default_images/sc/res/topdown_h.png b/ooo_custom_images/hicontrast/sc/res/topdown.png
index 6fa91592d3a7..6fa91592d3a7 100644
--- a/default_images/sc/res/topdown_h.png
+++ b/ooo_custom_images/hicontrast/sc/res/topdown.png
diff --git a/default_images/sd/res/breakplayingblue_16_h.png b/ooo_custom_images/hicontrast/sd/res/breakplayingblue_16.png
index d69978151d69..d69978151d69 100644
--- a/default_images/sd/res/breakplayingblue_16_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/breakplayingblue_16.png
diff --git a/default_images/sd/res/chkpage0_h.png b/ooo_custom_images/hicontrast/sd/res/chkpage0.png
index 8710e4c60a50..8710e4c60a50 100644
--- a/default_images/sd/res/chkpage0_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/chkpage0.png
diff --git a/default_images/sd/res/chkpage1_h.png b/ooo_custom_images/hicontrast/sd/res/chkpage1.png
index 04a4ee904644..04a4ee904644 100644
--- a/default_images/sd/res/chkpage1_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/chkpage1.png
diff --git a/default_images/sd/res/click_16_h.png b/ooo_custom_images/hicontrast/sd/res/click_16.png
index 24d6e8ec0831..24d6e8ec0831 100644
--- a/default_images/sd/res/click_16_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/click_16.png
diff --git a/default_images/sd/res/comments_indicator_hc.png b/ooo_custom_images/hicontrast/sd/res/comments_indicator.png
index 0467d1a47929..0467d1a47929 100644
--- a/default_images/sd/res/comments_indicator_hc.png
+++ b/ooo_custom_images/hicontrast/sd/res/comments_indicator.png
diff --git a/default_images/sd/res/del1bmp_h.png b/ooo_custom_images/hicontrast/sd/res/del1bmp.png
index 9322c9c2aadd..9322c9c2aadd 100644
--- a/default_images/sd/res/del1bmp_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/del1bmp.png
diff --git a/default_images/sd/res/delall_h.png b/ooo_custom_images/hicontrast/sd/res/delall.png
index 098bca92b8c9..098bca92b8c9 100644
--- a/default_images/sd/res/delall_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/delall.png
diff --git a/default_images/sd/res/docclose_h.png b/ooo_custom_images/hicontrast/sd/res/docclose.png
index b27e52476d2d..b27e52476d2d 100644
--- a/default_images/sd/res/docclose_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/docclose.png
diff --git a/default_images/sd/res/docopen_h.png b/ooo_custom_images/hicontrast/sd/res/docopen.png
index 5ddd51ea08dd..5ddd51ea08dd 100644
--- a/default_images/sd/res/docopen_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/docopen.png
diff --git a/default_images/sd/res/doctext_h.png b/ooo_custom_images/hicontrast/sd/res/doctext.png
index d454ed1e6a2b..d454ed1e6a2b 100644
--- a/default_images/sd/res/doctext_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/doctext.png
diff --git a/default_images/sd/res/effect_16_h.png b/ooo_custom_images/hicontrast/sd/res/effect_16.png
index 06a2f74a6a48..06a2f74a6a48 100644
--- a/default_images/sd/res/effect_16_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/effect_16.png
diff --git a/default_images/sd/res/effectfade_16_h.png b/ooo_custom_images/hicontrast/sd/res/effectfade_16.png
index a3d0ec186f32..a3d0ec186f32 100644
--- a/default_images/sd/res/effectfade_16_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/effectfade_16.png
diff --git a/default_images/sd/res/effectole_16_h.png b/ooo_custom_images/hicontrast/sd/res/effectole_16.png
index a8342fb3edcb..a8342fb3edcb 100644
--- a/default_images/sd/res/effectole_16_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/effectole_16.png
diff --git a/default_images/sd/res/effectpath_16_h.png b/ooo_custom_images/hicontrast/sd/res/effectpath_16.png
index 8b51aeea337c..8b51aeea337c 100644
--- a/default_images/sd/res/effectpath_16_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/effectpath_16.png
diff --git a/default_images/sd/res/effectshape_16_h.png b/ooo_custom_images/hicontrast/sd/res/effectshape_16.png
index 22833a3c1c77..22833a3c1c77 100644
--- a/default_images/sd/res/effectshape_16_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/effectshape_16.png
diff --git a/default_images/sd/res/fade_effect_indicator_hc.png b/ooo_custom_images/hicontrast/sd/res/fade_effect_indicator.png
index 9e0ba4f8782b..9e0ba4f8782b 100644
--- a/default_images/sd/res/fade_effect_indicator_hc.png
+++ b/ooo_custom_images/hicontrast/sd/res/fade_effect_indicator.png
diff --git a/default_images/sd/res/foilh01_h.png b/ooo_custom_images/hicontrast/sd/res/foilh01.png
index ea5dcb9711ed..ea5dcb9711ed 100644
--- a/default_images/sd/res/foilh01_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/foilh01.png
diff --git a/default_images/sd/res/foilh02_h.png b/ooo_custom_images/hicontrast/sd/res/foilh02.png
index 7ba79b77a728..7ba79b77a728 100644
--- a/default_images/sd/res/foilh02_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/foilh02.png
diff --git a/default_images/sd/res/foilh03_h.png b/ooo_custom_images/hicontrast/sd/res/foilh03.png
index a67facb7d463..a67facb7d463 100644
--- a/default_images/sd/res/foilh03_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/foilh03.png
diff --git a/default_images/sd/res/foilh04_h.png b/ooo_custom_images/hicontrast/sd/res/foilh04.png
index a73665d3164a..a73665d3164a 100644
--- a/default_images/sd/res/foilh04_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/foilh04.png
diff --git a/default_images/sd/res/foilh06_h.png b/ooo_custom_images/hicontrast/sd/res/foilh06.png
index be98eea737f4..be98eea737f4 100644
--- a/default_images/sd/res/foilh06_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/foilh06.png
diff --git a/default_images/sd/res/foilh09_h.png b/ooo_custom_images/hicontrast/sd/res/foilh09.png
index 9aa769cbb217..9aa769cbb217 100644
--- a/default_images/sd/res/foilh09_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/foilh09.png
diff --git a/default_images/sd/res/foiln01_h.png b/ooo_custom_images/hicontrast/sd/res/foiln01.png
index fbac3c40e737..fbac3c40e737 100644
--- a/default_images/sd/res/foiln01_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/foiln01.png
diff --git a/default_images/sd/res/get1obj_h.png b/ooo_custom_images/hicontrast/sd/res/get1obj.png
index 5f917cb33848..5f917cb33848 100644
--- a/default_images/sd/res/get1obj_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/get1obj.png
diff --git a/default_images/sd/res/getallob_h.png b/ooo_custom_images/hicontrast/sd/res/getallob.png
index b487caad6d0a..b487caad6d0a 100644
--- a/default_images/sd/res/getallob_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/getallob.png
diff --git a/default_images/sd/res/graphic_h.png b/ooo_custom_images/hicontrast/sd/res/graphic.png
index c309b9f7c5b4..c309b9f7c5b4 100644
--- a/default_images/sd/res/graphic_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/graphic.png
diff --git a/default_images/sd/res/group_h.png b/ooo_custom_images/hicontrast/sd/res/group.png
index 98e4ccfb28ea..98e4ccfb28ea 100644
--- a/default_images/sd/res/group_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/group.png
diff --git a/default_images/sd/res/hlplhorz_h.png b/ooo_custom_images/hicontrast/sd/res/hlplhorz.png
index 36ca5c70377a..36ca5c70377a 100644
--- a/default_images/sd/res/hlplhorz_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/hlplhorz.png
diff --git a/default_images/sd/res/hlplvert_h.png b/ooo_custom_images/hicontrast/sd/res/hlplvert.png
index deb560864e32..deb560864e32 100644
--- a/default_images/sd/res/hlplvert_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/hlplvert.png
diff --git a/default_images/sd/res/hlppoint_h.png b/ooo_custom_images/hicontrast/sd/res/hlppoint.png
index 3574edb44ef9..3574edb44ef9 100644
--- a/default_images/sd/res/hlppoint_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/hlppoint.png
diff --git a/default_images/sd/res/imagelst/nvh010.png b/ooo_custom_images/hicontrast/sd/res/imagelst/nv010.png
index 16775078e3d2..16775078e3d2 100644
--- a/default_images/sd/res/imagelst/nvh010.png
+++ b/ooo_custom_images/hicontrast/sd/res/imagelst/nv010.png
diff --git a/default_images/sd/res/imagelst/nvh02.png b/ooo_custom_images/hicontrast/sd/res/imagelst/nv02.png
index 4ba5c9a0754a..4ba5c9a0754a 100644
--- a/default_images/sd/res/imagelst/nvh02.png
+++ b/ooo_custom_images/hicontrast/sd/res/imagelst/nv02.png
diff --git a/default_images/sd/res/imagelst/nvh03.png b/ooo_custom_images/hicontrast/sd/res/imagelst/nv03.png
index 238986ea95c1..238986ea95c1 100644
--- a/default_images/sd/res/imagelst/nvh03.png
+++ b/ooo_custom_images/hicontrast/sd/res/imagelst/nv03.png
diff --git a/default_images/sd/res/imagelst/nvh04.png b/ooo_custom_images/hicontrast/sd/res/imagelst/nv04.png
index c55713f35b30..c55713f35b30 100644
--- a/default_images/sd/res/imagelst/nvh04.png
+++ b/ooo_custom_images/hicontrast/sd/res/imagelst/nv04.png
diff --git a/default_images/sd/res/imagelst/nvh05.png b/ooo_custom_images/hicontrast/sd/res/imagelst/nv05.png
index 4ccbf095ce6a..4ccbf095ce6a 100644
--- a/default_images/sd/res/imagelst/nvh05.png
+++ b/ooo_custom_images/hicontrast/sd/res/imagelst/nv05.png
diff --git a/default_images/sd/res/imagelst/nvh06.png b/ooo_custom_images/hicontrast/sd/res/imagelst/nv06.png
index 8ac3ad2970f8..8ac3ad2970f8 100644
--- a/default_images/sd/res/imagelst/nvh06.png
+++ b/ooo_custom_images/hicontrast/sd/res/imagelst/nv06.png
diff --git a/default_images/sd/res/imagelst/nvh08.png b/ooo_custom_images/hicontrast/sd/res/imagelst/nv08.png
index bd5bfdbf6975..bd5bfdbf6975 100644
--- a/default_images/sd/res/imagelst/nvh08.png
+++ b/ooo_custom_images/hicontrast/sd/res/imagelst/nv08.png
diff --git a/default_images/sd/res/imagelst/nvh09.png b/ooo_custom_images/hicontrast/sd/res/imagelst/nv09.png
index 8b30eb75e4b6..8b30eb75e4b6 100644
--- a/default_images/sd/res/imagelst/nvh09.png
+++ b/ooo_custom_images/hicontrast/sd/res/imagelst/nv09.png
diff --git a/default_images/sd/res/imagelst/sfh01.png b/ooo_custom_images/hicontrast/sd/res/imagelst/sf01.png
index 3d3c180aef52..3d3c180aef52 100644
--- a/default_images/sd/res/imagelst/sfh01.png
+++ b/ooo_custom_images/hicontrast/sd/res/imagelst/sf01.png
diff --git a/default_images/sd/res/imagelst/sfh02.png b/ooo_custom_images/hicontrast/sd/res/imagelst/sf02.png
index 2c992a49ed2d..2c992a49ed2d 100644
--- a/default_images/sd/res/imagelst/sfh02.png
+++ b/ooo_custom_images/hicontrast/sd/res/imagelst/sf02.png
diff --git a/default_images/sd/res/layout_empty_h.png b/ooo_custom_images/hicontrast/sd/res/layout_empty.png
index 5d6202c56a28..5d6202c56a28 100644
--- a/default_images/sd/res/layout_empty_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_empty.png
diff --git a/default_images/sd/res/layout_head01_h.png b/ooo_custom_images/hicontrast/sd/res/layout_head01.png
index 30c292eef9d4..30c292eef9d4 100644
--- a/default_images/sd/res/layout_head01_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_head01.png
diff --git a/default_images/sd/res/layout_head02_h.png b/ooo_custom_images/hicontrast/sd/res/layout_head02.png
index b7ee7213434d..b7ee7213434d 100644
--- a/default_images/sd/res/layout_head02_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_head02.png
diff --git a/default_images/sd/res/layout_head02a_h.png b/ooo_custom_images/hicontrast/sd/res/layout_head02a.png
index e82e6801b28a..e82e6801b28a 100644
--- a/default_images/sd/res/layout_head02a_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_head02a.png
diff --git a/default_images/sd/res/layout_head02b_h.png b/ooo_custom_images/hicontrast/sd/res/layout_head02b.png
index 0e23f9f2f670..0e23f9f2f670 100644
--- a/default_images/sd/res/layout_head02b_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_head02b.png
diff --git a/default_images/sd/res/layout_head03_h.png b/ooo_custom_images/hicontrast/sd/res/layout_head03.png
index 499024a03db6..499024a03db6 100644
--- a/default_images/sd/res/layout_head03_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_head03.png
diff --git a/default_images/sd/res/layout_head03a_h.png b/ooo_custom_images/hicontrast/sd/res/layout_head03a.png
index ec06628cc77e..ec06628cc77e 100644
--- a/default_images/sd/res/layout_head03a_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_head03a.png
diff --git a/default_images/sd/res/layout_head03b_h.png b/ooo_custom_images/hicontrast/sd/res/layout_head03b.png
index 43a410a89b3b..43a410a89b3b 100644
--- a/default_images/sd/res/layout_head03b_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_head03b.png
diff --git a/default_images/sd/res/layout_head03c_h.png b/ooo_custom_images/hicontrast/sd/res/layout_head03c.png
index 275f437796be..275f437796be 100644
--- a/default_images/sd/res/layout_head03c_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_head03c.png
diff --git a/default_images/sd/res/layout_head04_h.png b/ooo_custom_images/hicontrast/sd/res/layout_head04.png
index fe619c15c8a4..fe619c15c8a4 100644
--- a/default_images/sd/res/layout_head04_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_head04.png
diff --git a/default_images/sd/res/layout_head06_h.png b/ooo_custom_images/hicontrast/sd/res/layout_head06.png
index 59a241865ba3..59a241865ba3 100644
--- a/default_images/sd/res/layout_head06_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_head06.png
diff --git a/default_images/sd/res/layout_textonly_h.png b/ooo_custom_images/hicontrast/sd/res/layout_textonly.png
index 0e7a3e0f8639..0e7a3e0f8639 100644
--- a/default_images/sd/res/layout_textonly_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_textonly.png
diff --git a/default_images/sd/res/layout_vertical01_h.png b/ooo_custom_images/hicontrast/sd/res/layout_vertical01.png
index 4d137cf6b062..4d137cf6b062 100644
--- a/default_images/sd/res/layout_vertical01_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_vertical01.png
diff --git a/default_images/sd/res/layout_vertical02_h.png b/ooo_custom_images/hicontrast/sd/res/layout_vertical02.png
index cec7162e0441..cec7162e0441 100644
--- a/default_images/sd/res/layout_vertical02_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_vertical02.png
diff --git a/default_images/sd/res/minus_h.png b/ooo_custom_images/hicontrast/sd/res/minus.png
index a20fa183ab01..a20fa183ab01 100644
--- a/default_images/sd/res/minus_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/minus.png
diff --git a/default_images/sd/res/mspgmode_h.png b/ooo_custom_images/hicontrast/sd/res/mspgmode.png
index 31d02183d688..31d02183d688 100644
--- a/default_images/sd/res/mspgmode_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/mspgmode.png
diff --git a/default_images/sd/res/objects_h.png b/ooo_custom_images/hicontrast/sd/res/objects.png
index 631a7ad209a8..631a7ad209a8 100644
--- a/default_images/sd/res/objects_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/objects.png
diff --git a/default_images/sd/res/objekt_h.png b/ooo_custom_images/hicontrast/sd/res/objekt.png
index bf067d7b77e2..bf067d7b77e2 100644
--- a/default_images/sd/res/objekt_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/objekt.png
diff --git a/default_images/sd/res/ole_h.png b/ooo_custom_images/hicontrast/sd/res/ole.png
index 1c16f8feb540..1c16f8feb540 100644
--- a/default_images/sd/res/ole_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/ole.png
diff --git a/default_images/sd/res/page_h.png b/ooo_custom_images/hicontrast/sd/res/page.png
index 9228c1b06eaa..9228c1b06eaa 100644
--- a/default_images/sd/res/page_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/page.png
diff --git a/default_images/sd/res/pageexcl_h.png b/ooo_custom_images/hicontrast/sd/res/pageexcl.png
index c7b60fd63f7f..c7b60fd63f7f 100644
--- a/default_images/sd/res/pageexcl_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/pageexcl.png
diff --git a/default_images/sd/res/pagemode_h.png b/ooo_custom_images/hicontrast/sd/res/pagemode.png
index 3861c3853197..3861c3853197 100644
--- a/default_images/sd/res/pagemode_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/pagemode.png
diff --git a/default_images/sd/res/pageobjs_h.png b/ooo_custom_images/hicontrast/sd/res/pageobjs.png
index 602fb34e4827..602fb34e4827 100644
--- a/default_images/sd/res/pageobjs_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/pageobjs.png
diff --git a/default_images/sd/res/pagobjex_h.png b/ooo_custom_images/hicontrast/sd/res/pagobjex.png
index c2ffb41ae647..c2ffb41ae647 100644
--- a/default_images/sd/res/pagobjex_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/pagobjex.png
diff --git a/default_images/sd/res/pipette_h.png b/ooo_custom_images/hicontrast/sd/res/pipette.png
index 40547fbbe12e..40547fbbe12e 100644
--- a/default_images/sd/res/pipette_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/pipette.png
diff --git a/default_images/sd/res/playblue_16_h.png b/ooo_custom_images/hicontrast/sd/res/playblue_16.png
index 4fb393863e7d..4fb393863e7d 100644
--- a/default_images/sd/res/playblue_16_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/playblue_16.png
diff --git a/default_images/sd/res/plus_h.png b/ooo_custom_images/hicontrast/sd/res/plus.png
index d4a66c91a2cc..d4a66c91a2cc 100644
--- a/default_images/sd/res/plus_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/plus.png
diff --git a/default_images/sd/res/stopplayingblue_16_h.png b/ooo_custom_images/hicontrast/sd/res/stopplayingblue_16.png
index 7d51cff77c01..7d51cff77c01 100644
--- a/default_images/sd/res/stopplayingblue_16_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/stopplayingblue_16.png
diff --git a/default_images/sd/res/time_16_h.png b/ooo_custom_images/hicontrast/sd/res/time_16.png
index 15768dd38fce..15768dd38fce 100644
--- a/default_images/sd/res/time_16_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/time_16.png
diff --git a/default_images/sfx2/res/closedochc.png b/ooo_custom_images/hicontrast/sfx2/res/closedoc.png
index e5b96dad7047..e5b96dad7047 100644
--- a/default_images/sfx2/res/closedochc.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/closedoc.png
diff --git a/default_images/sfx2/res/deleterow_h.png b/ooo_custom_images/hicontrast/sfx2/res/deleterow.png
index d1eab10294a7..d1eab10294a7 100644
--- a/default_images/sfx2/res/deleterow_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/deleterow.png
diff --git a/default_images/sfx2/res/doccl_h.png b/ooo_custom_images/hicontrast/sfx2/res/doccl.png
index 4f149f170543..4f149f170543 100644
--- a/default_images/sfx2/res/doccl_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/doccl.png
diff --git a/default_images/sfx2/res/favourite_h.png b/ooo_custom_images/hicontrast/sfx2/res/favourite.png
index 47219ed03831..47219ed03831 100644
--- a/default_images/sfx2/res/favourite_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/favourite.png
diff --git a/default_images/sfx2/res/favourite_big_h.png b/ooo_custom_images/hicontrast/sfx2/res/favourite_big.png
index e4c89dc90297..e4c89dc90297 100644
--- a/default_images/sfx2/res/favourite_big_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/favourite_big.png
diff --git a/default_images/sfx2/res/hlpbookclosed_h.png b/ooo_custom_images/hicontrast/sfx2/res/hlpbookclosed.png
index 5f761571321b..5f761571321b 100644
--- a/default_images/sfx2/res/hlpbookclosed_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/hlpbookclosed.png
diff --git a/default_images/sfx2/res/hlpbookopen_h.png b/ooo_custom_images/hicontrast/sfx2/res/hlpbookopen.png
index 5d04f6261460..5d04f6261460 100644
--- a/default_images/sfx2/res/hlpbookopen_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/hlpbookopen.png
diff --git a/default_images/sfx2/res/hlpdoc_h.png b/ooo_custom_images/hicontrast/sfx2/res/hlpdoc.png
index 879f149b1c6a..879f149b1c6a 100644
--- a/default_images/sfx2/res/hlpdoc_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/hlpdoc.png
diff --git a/default_images/sfx2/res/indexoff_big_h.png b/ooo_custom_images/hicontrast/sfx2/res/indexoff_big.png
index a497fed45abf..a497fed45abf 100644
--- a/default_images/sfx2/res/indexoff_big_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/indexoff_big.png
diff --git a/default_images/sfx2/res/indexoff_small_h.png b/ooo_custom_images/hicontrast/sfx2/res/indexoff_small.png
index 9e6487d873ed..9e6487d873ed 100644
--- a/default_images/sfx2/res/indexoff_small_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/indexoff_small.png
diff --git a/default_images/sfx2/res/indexon_big_h.png b/ooo_custom_images/hicontrast/sfx2/res/indexon_big.png
index ab6c44d8eeaf..ab6c44d8eeaf 100644
--- a/default_images/sfx2/res/indexon_big_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/indexon_big.png
diff --git a/default_images/sfx2/res/indexon_small_h.png b/ooo_custom_images/hicontrast/sfx2/res/indexon_small.png
index c964f39b6def..c964f39b6def 100644
--- a/default_images/sfx2/res/indexon_small_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/indexon_small.png
diff --git a/default_images/sfx2/res/newex_h.png b/ooo_custom_images/hicontrast/sfx2/res/newex.png
index 244dda449db2..244dda449db2 100644
--- a/default_images/sfx2/res/newex_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/newex.png
diff --git a/default_images/sfx2/res/styfam1_h.png b/ooo_custom_images/hicontrast/sfx2/res/styfam1.png
index 4662b79b2f46..4662b79b2f46 100644
--- a/default_images/sfx2/res/styfam1_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/styfam1.png
diff --git a/default_images/sfx2/res/styfam2_h.png b/ooo_custom_images/hicontrast/sfx2/res/styfam2.png
index e5bfb2d69f3a..e5bfb2d69f3a 100644
--- a/default_images/sfx2/res/styfam2_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/styfam2.png
diff --git a/default_images/sfx2/res/styfam3_h.png b/ooo_custom_images/hicontrast/sfx2/res/styfam3.png
index 6c65b3646dd9..6c65b3646dd9 100644
--- a/default_images/sfx2/res/styfam3_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/styfam3.png
diff --git a/default_images/sfx2/res/styfam4_h.png b/ooo_custom_images/hicontrast/sfx2/res/styfam4.png
index ed255cd5e2b7..ed255cd5e2b7 100644
--- a/default_images/sfx2/res/styfam4_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/styfam4.png
diff --git a/default_images/starmath/res/alh21801.png b/ooo_custom_images/hicontrast/starmath/res/al21801.png
index ea176db9c2ff..ea176db9c2ff 100644
--- a/default_images/starmath/res/alh21801.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21801.png
diff --git a/default_images/starmath/res/alh21802.png b/ooo_custom_images/hicontrast/starmath/res/al21802.png
index 0b4f3b6319cd..0b4f3b6319cd 100644
--- a/default_images/starmath/res/alh21802.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21802.png
diff --git a/default_images/starmath/res/alh21803.png b/ooo_custom_images/hicontrast/starmath/res/al21803.png
index 25f2e6b0c41f..25f2e6b0c41f 100644
--- a/default_images/starmath/res/alh21803.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21803.png
diff --git a/default_images/starmath/res/alh21804.png b/ooo_custom_images/hicontrast/starmath/res/al21804.png
index 0c3ada7935f9..0c3ada7935f9 100644
--- a/default_images/starmath/res/alh21804.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21804.png
diff --git a/default_images/starmath/res/alh21805.png b/ooo_custom_images/hicontrast/starmath/res/al21805.png
index 7eadd4d22692..7eadd4d22692 100644
--- a/default_images/starmath/res/alh21805.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21805.png
diff --git a/default_images/starmath/res/alh21806.png b/ooo_custom_images/hicontrast/starmath/res/al21806.png
index ed9b53bc73b8..ed9b53bc73b8 100644
--- a/default_images/starmath/res/alh21806.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21806.png
diff --git a/default_images/starmath/res/alh21808.png b/ooo_custom_images/hicontrast/starmath/res/al21808.png
index d22a6e11f5ee..d22a6e11f5ee 100644
--- a/default_images/starmath/res/alh21808.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21808.png
diff --git a/default_images/starmath/res/alh21809.png b/ooo_custom_images/hicontrast/starmath/res/al21809.png
index 7b6b38e10887..7b6b38e10887 100644
--- a/default_images/starmath/res/alh21809.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21809.png
diff --git a/default_images/starmath/res/alh21810.png b/ooo_custom_images/hicontrast/starmath/res/al21810.png
index c82e4dd13899..c82e4dd13899 100644
--- a/default_images/starmath/res/alh21810.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21810.png
diff --git a/default_images/starmath/res/alh21811.png b/ooo_custom_images/hicontrast/starmath/res/al21811.png
index 74c1c89abbd4..74c1c89abbd4 100644
--- a/default_images/starmath/res/alh21811.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21811.png
diff --git a/default_images/starmath/res/alh21812.png b/ooo_custom_images/hicontrast/starmath/res/al21812.png
index 5b985dec49e4..5b985dec49e4 100644
--- a/default_images/starmath/res/alh21812.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21812.png
diff --git a/default_images/starmath/res/alh21813.png b/ooo_custom_images/hicontrast/starmath/res/al21813.png
index b6d01cfacf5c..b6d01cfacf5c 100644
--- a/default_images/starmath/res/alh21813.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21813.png
diff --git a/default_images/starmath/res/alh21814.png b/ooo_custom_images/hicontrast/starmath/res/al21814.png
index 78d81a32d8ad..78d81a32d8ad 100644
--- a/default_images/starmath/res/alh21814.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21814.png
diff --git a/default_images/starmath/res/alh21821.png b/ooo_custom_images/hicontrast/starmath/res/al21821.png
index 4496c1fd1b69..4496c1fd1b69 100644
--- a/default_images/starmath/res/alh21821.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21821.png
diff --git a/default_images/starmath/res/alh21822.png b/ooo_custom_images/hicontrast/starmath/res/al21822.png
index 587cbe7b4942..587cbe7b4942 100644
--- a/default_images/starmath/res/alh21822.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21822.png
diff --git a/default_images/starmath/res/alh21823.png b/ooo_custom_images/hicontrast/starmath/res/al21823.png
index 059d9494054f..059d9494054f 100644
--- a/default_images/starmath/res/alh21823.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21823.png
diff --git a/default_images/starmath/res/alh21824.png b/ooo_custom_images/hicontrast/starmath/res/al21824.png
index 6d6cc45213e4..6d6cc45213e4 100644
--- a/default_images/starmath/res/alh21824.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21824.png
diff --git a/default_images/starmath/res/alh21825.png b/ooo_custom_images/hicontrast/starmath/res/al21825.png
index 8793dbf0fd2b..8793dbf0fd2b 100644
--- a/default_images/starmath/res/alh21825.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21825.png
diff --git a/default_images/starmath/res/alh21826.png b/ooo_custom_images/hicontrast/starmath/res/al21826.png
index 8e7fd94c9a54..8e7fd94c9a54 100644
--- a/default_images/starmath/res/alh21826.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21826.png
diff --git a/default_images/starmath/res/ar_right_h.png b/ooo_custom_images/hicontrast/starmath/res/ar_right.png
index 6d8108c8e41b..6d8108c8e41b 100644
--- a/default_images/starmath/res/ar_right_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/ar_right.png
diff --git a/default_images/starmath/res/ath21701.png b/ooo_custom_images/hicontrast/starmath/res/at21701.png
index 35b9c5eff030..35b9c5eff030 100644
--- a/default_images/starmath/res/ath21701.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21701.png
diff --git a/default_images/starmath/res/ath21702.png b/ooo_custom_images/hicontrast/starmath/res/at21702.png
index a71bc93f400d..a71bc93f400d 100644
--- a/default_images/starmath/res/ath21702.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21702.png
diff --git a/default_images/starmath/res/ath21703.png b/ooo_custom_images/hicontrast/starmath/res/at21703.png
index ea10aa9b8401..ea10aa9b8401 100644
--- a/default_images/starmath/res/ath21703.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21703.png
diff --git a/default_images/starmath/res/ath21704.png b/ooo_custom_images/hicontrast/starmath/res/at21704.png
index 0992ca7717dc..0992ca7717dc 100644
--- a/default_images/starmath/res/ath21704.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21704.png
diff --git a/default_images/starmath/res/ath21705.png b/ooo_custom_images/hicontrast/starmath/res/at21705.png
index 75172cd425f1..75172cd425f1 100644
--- a/default_images/starmath/res/ath21705.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21705.png
diff --git a/default_images/starmath/res/ath21706.png b/ooo_custom_images/hicontrast/starmath/res/at21706.png
index 7c34b14211a2..7c34b14211a2 100644
--- a/default_images/starmath/res/ath21706.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21706.png
diff --git a/default_images/starmath/res/ath21707.png b/ooo_custom_images/hicontrast/starmath/res/at21707.png
index fd09899c5eb6..fd09899c5eb6 100644
--- a/default_images/starmath/res/ath21707.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21707.png
diff --git a/default_images/starmath/res/ath21708.png b/ooo_custom_images/hicontrast/starmath/res/at21708.png
index 72d5e2f49dde..72d5e2f49dde 100644
--- a/default_images/starmath/res/ath21708.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21708.png
diff --git a/default_images/starmath/res/ath21709.png b/ooo_custom_images/hicontrast/starmath/res/at21709.png
index 8ef171b66641..8ef171b66641 100644
--- a/default_images/starmath/res/ath21709.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21709.png
diff --git a/default_images/starmath/res/ath21710.png b/ooo_custom_images/hicontrast/starmath/res/at21710.png
index 7f42dd2e23bd..7f42dd2e23bd 100644
--- a/default_images/starmath/res/ath21710.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21710.png
diff --git a/default_images/starmath/res/ath21711.png b/ooo_custom_images/hicontrast/starmath/res/at21711.png
index 3224113a8adc..3224113a8adc 100644
--- a/default_images/starmath/res/ath21711.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21711.png
diff --git a/default_images/starmath/res/ath21712.png b/ooo_custom_images/hicontrast/starmath/res/at21712.png
index e2e40a6d70f9..e2e40a6d70f9 100644
--- a/default_images/starmath/res/ath21712.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21712.png
diff --git a/default_images/starmath/res/ath21713.png b/ooo_custom_images/hicontrast/starmath/res/at21713.png
index b7fcdc3563c0..b7fcdc3563c0 100644
--- a/default_images/starmath/res/ath21713.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21713.png
diff --git a/default_images/starmath/res/ath21714.png b/ooo_custom_images/hicontrast/starmath/res/at21714.png
index 8eebba9978b4..8eebba9978b4 100644
--- a/default_images/starmath/res/ath21714.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21714.png
diff --git a/default_images/starmath/res/ath21715.png b/ooo_custom_images/hicontrast/starmath/res/at21715.png
index d16fc953d19d..d16fc953d19d 100644
--- a/default_images/starmath/res/ath21715.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21715.png
diff --git a/default_images/starmath/res/ath21716.png b/ooo_custom_images/hicontrast/starmath/res/at21716.png
index 65063e7e848b..65063e7e848b 100644
--- a/default_images/starmath/res/ath21716.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21716.png
diff --git a/default_images/starmath/res/ath21717.png b/ooo_custom_images/hicontrast/starmath/res/at21717.png
index 1ef04cbcf99d..1ef04cbcf99d 100644
--- a/default_images/starmath/res/ath21717.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21717.png
diff --git a/default_images/starmath/res/ath21718.png b/ooo_custom_images/hicontrast/starmath/res/at21718.png
index f8ddfe8a7708..f8ddfe8a7708 100644
--- a/default_images/starmath/res/ath21718.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21718.png
diff --git a/default_images/starmath/res/ath21719.png b/ooo_custom_images/hicontrast/starmath/res/at21719.png
index b5950ec6c9fe..b5950ec6c9fe 100644
--- a/default_images/starmath/res/ath21719.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21719.png
diff --git a/default_images/starmath/res/ath21720.png b/ooo_custom_images/hicontrast/starmath/res/at21720.png
index c03633251938..c03633251938 100644
--- a/default_images/starmath/res/ath21720.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21720.png
diff --git a/default_images/starmath/res/ath21722.png b/ooo_custom_images/hicontrast/starmath/res/at21722.png
index f48935982726..f48935982726 100644
--- a/default_images/starmath/res/ath21722.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21722.png
diff --git a/default_images/starmath/res/ath21723.png b/ooo_custom_images/hicontrast/starmath/res/at21723.png
index e71114fecc88..e71114fecc88 100644
--- a/default_images/starmath/res/ath21723.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21723.png
diff --git a/default_images/starmath/res/ath21724.png b/ooo_custom_images/hicontrast/starmath/res/at21724.png
index 0dc5f9dba1ed..0dc5f9dba1ed 100644
--- a/default_images/starmath/res/ath21724.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21724.png
diff --git a/default_images/starmath/res/bih21301.png b/ooo_custom_images/hicontrast/starmath/res/bi21301.png
index dbc586873a2e..dbc586873a2e 100644
--- a/default_images/starmath/res/bih21301.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21301.png
diff --git a/default_images/starmath/res/bih21302.png b/ooo_custom_images/hicontrast/starmath/res/bi21302.png
index 1678126180b7..1678126180b7 100644
--- a/default_images/starmath/res/bih21302.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21302.png
diff --git a/default_images/starmath/res/bih21303.png b/ooo_custom_images/hicontrast/starmath/res/bi21303.png
index f05a0079f6f9..f05a0079f6f9 100644
--- a/default_images/starmath/res/bih21303.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21303.png
diff --git a/default_images/starmath/res/bih21304.png b/ooo_custom_images/hicontrast/starmath/res/bi21304.png
index 506da70d27e1..506da70d27e1 100644
--- a/default_images/starmath/res/bih21304.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21304.png
diff --git a/default_images/starmath/res/bih21305.png b/ooo_custom_images/hicontrast/starmath/res/bi21305.png
index 5b5ef6a6342d..5b5ef6a6342d 100644
--- a/default_images/starmath/res/bih21305.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21305.png
diff --git a/default_images/starmath/res/bih21306.png b/ooo_custom_images/hicontrast/starmath/res/bi21306.png
index 378afd090c9c..378afd090c9c 100644
--- a/default_images/starmath/res/bih21306.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21306.png
diff --git a/default_images/starmath/res/bih21307.png b/ooo_custom_images/hicontrast/starmath/res/bi21307.png
index 2b369f9f2e90..2b369f9f2e90 100644
--- a/default_images/starmath/res/bih21307.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21307.png
diff --git a/default_images/starmath/res/bih21308.png b/ooo_custom_images/hicontrast/starmath/res/bi21308.png
index 12a3c861337b..12a3c861337b 100644
--- a/default_images/starmath/res/bih21308.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21308.png
diff --git a/default_images/starmath/res/bih21309.png b/ooo_custom_images/hicontrast/starmath/res/bi21309.png
index 64bd8091005d..64bd8091005d 100644
--- a/default_images/starmath/res/bih21309.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21309.png
diff --git a/default_images/starmath/res/bih21310.png b/ooo_custom_images/hicontrast/starmath/res/bi21310.png
index aa2593aff11c..aa2593aff11c 100644
--- a/default_images/starmath/res/bih21310.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21310.png
diff --git a/default_images/starmath/res/bih21311.png b/ooo_custom_images/hicontrast/starmath/res/bi21311.png
index 70f7f790342b..70f7f790342b 100644
--- a/default_images/starmath/res/bih21311.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21311.png
diff --git a/default_images/starmath/res/bih21312.png b/ooo_custom_images/hicontrast/starmath/res/bi21312.png
index 6910f725f896..6910f725f896 100644
--- a/default_images/starmath/res/bih21312.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21312.png
diff --git a/default_images/starmath/res/bih21313.png b/ooo_custom_images/hicontrast/starmath/res/bi21313.png
index cdc24da80a42..cdc24da80a42 100644
--- a/default_images/starmath/res/bih21313.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21313.png
diff --git a/default_images/starmath/res/bih21314.png b/ooo_custom_images/hicontrast/starmath/res/bi21314.png
index a3d9c1934069..a3d9c1934069 100644
--- a/default_images/starmath/res/bih21314.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21314.png
diff --git a/default_images/starmath/res/bih21315.png b/ooo_custom_images/hicontrast/starmath/res/bi21315.png
index c2bb1619b4f3..c2bb1619b4f3 100644
--- a/default_images/starmath/res/bih21315.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21315.png
diff --git a/default_images/starmath/res/bih21316.png b/ooo_custom_images/hicontrast/starmath/res/bi21316.png
index 8d313f06c02c..8d313f06c02c 100644
--- a/default_images/starmath/res/bih21316.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21316.png
diff --git a/default_images/starmath/res/bih21322.png b/ooo_custom_images/hicontrast/starmath/res/bi21322.png
index d8c113d75f2a..d8c113d75f2a 100644
--- a/default_images/starmath/res/bih21322.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21322.png
diff --git a/default_images/starmath/res/bih21323.png b/ooo_custom_images/hicontrast/starmath/res/bi21323.png
index 66a94b922b72..66a94b922b72 100644
--- a/default_images/starmath/res/bih21323.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21323.png
diff --git a/default_images/starmath/res/bih21324.png b/ooo_custom_images/hicontrast/starmath/res/bi21324.png
index 94b1cc383e5c..94b1cc383e5c 100644
--- a/default_images/starmath/res/bih21324.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21324.png
diff --git a/default_images/starmath/res/bih21325.png b/ooo_custom_images/hicontrast/starmath/res/bi21325.png
index ac439d8d1115..ac439d8d1115 100644
--- a/default_images/starmath/res/bih21325.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21325.png
diff --git a/default_images/starmath/res/bih21326.png b/ooo_custom_images/hicontrast/starmath/res/bi21326.png
index 32fe2650ddd5..32fe2650ddd5 100644
--- a/default_images/starmath/res/bih21326.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21326.png
diff --git a/default_images/starmath/res/coh21901.png b/ooo_custom_images/hicontrast/starmath/res/co21901.png
index eb76568f0df8..eb76568f0df8 100644
--- a/default_images/starmath/res/coh21901.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21901.png
diff --git a/default_images/starmath/res/coh21902.png b/ooo_custom_images/hicontrast/starmath/res/co21902.png
index d5a21eb0e57f..d5a21eb0e57f 100644
--- a/default_images/starmath/res/coh21902.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21902.png
diff --git a/default_images/starmath/res/coh21903.png b/ooo_custom_images/hicontrast/starmath/res/co21903.png
index b4fff99be88f..b4fff99be88f 100644
--- a/default_images/starmath/res/coh21903.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21903.png
diff --git a/default_images/starmath/res/coh21904.png b/ooo_custom_images/hicontrast/starmath/res/co21904.png
index 66193cc3139a..66193cc3139a 100644
--- a/default_images/starmath/res/coh21904.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21904.png
diff --git a/default_images/starmath/res/coh21905.png b/ooo_custom_images/hicontrast/starmath/res/co21905.png
index 320fe69337be..320fe69337be 100644
--- a/default_images/starmath/res/coh21905.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21905.png
diff --git a/default_images/starmath/res/coh21906.png b/ooo_custom_images/hicontrast/starmath/res/co21906.png
index 234e87baa8a4..234e87baa8a4 100644
--- a/default_images/starmath/res/coh21906.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21906.png
diff --git a/default_images/starmath/res/coh21907.png b/ooo_custom_images/hicontrast/starmath/res/co21907.png
index d377a5d90c8e..d377a5d90c8e 100644
--- a/default_images/starmath/res/coh21907.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21907.png
diff --git a/default_images/starmath/res/coh21908.png b/ooo_custom_images/hicontrast/starmath/res/co21908.png
index a60c4db87d6a..a60c4db87d6a 100644
--- a/default_images/starmath/res/coh21908.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21908.png
diff --git a/default_images/starmath/res/coh21909.png b/ooo_custom_images/hicontrast/starmath/res/co21909.png
index 5f727c0e5a13..5f727c0e5a13 100644
--- a/default_images/starmath/res/coh21909.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21909.png
diff --git a/default_images/starmath/res/coh21910.png b/ooo_custom_images/hicontrast/starmath/res/co21910.png
index 0e2c2421d463..0e2c2421d463 100644
--- a/default_images/starmath/res/coh21910.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21910.png
diff --git a/default_images/starmath/res/coh21911.png b/ooo_custom_images/hicontrast/starmath/res/co21911.png
index 4b0c7a1d5389..4b0c7a1d5389 100644
--- a/default_images/starmath/res/coh21911.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21911.png
diff --git a/default_images/starmath/res/coh21912.png b/ooo_custom_images/hicontrast/starmath/res/co21912.png
index c2b94059969a..c2b94059969a 100644
--- a/default_images/starmath/res/coh21912.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21912.png
diff --git a/default_images/starmath/res/coh21916.png b/ooo_custom_images/hicontrast/starmath/res/co21916.png
index 05ecf84cdbce..05ecf84cdbce 100644
--- a/default_images/starmath/res/coh21916.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21916.png
diff --git a/default_images/starmath/res/coh21917.png b/ooo_custom_images/hicontrast/starmath/res/co21917.png
index 33d515c97401..33d515c97401 100644
--- a/default_images/starmath/res/coh21917.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21917.png
diff --git a/default_images/starmath/res/coh21918.png b/ooo_custom_images/hicontrast/starmath/res/co21918.png
index 6133cab15a03..6133cab15a03 100644
--- a/default_images/starmath/res/coh21918.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21918.png
diff --git a/default_images/starmath/res/dist101_h.png b/ooo_custom_images/hicontrast/starmath/res/dist101.png
index f86ae2db334c..f86ae2db334c 100644
--- a/default_images/starmath/res/dist101_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist101.png
diff --git a/default_images/starmath/res/dist102_h.png b/ooo_custom_images/hicontrast/starmath/res/dist102.png
index b4a968b1d6cd..b4a968b1d6cd 100644
--- a/default_images/starmath/res/dist102_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist102.png
diff --git a/default_images/starmath/res/dist103_h.png b/ooo_custom_images/hicontrast/starmath/res/dist103.png
index 2b086c2727f4..2b086c2727f4 100644
--- a/default_images/starmath/res/dist103_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist103.png
diff --git a/default_images/starmath/res/dist104_h.png b/ooo_custom_images/hicontrast/starmath/res/dist104.png
index 29888e0e8c07..29888e0e8c07 100644
--- a/default_images/starmath/res/dist104_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist104.png
diff --git a/default_images/starmath/res/dist11_h.png b/ooo_custom_images/hicontrast/starmath/res/dist11.png
index 605875b076af..605875b076af 100644
--- a/default_images/starmath/res/dist11_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist11.png
diff --git a/default_images/starmath/res/dist12_h.png b/ooo_custom_images/hicontrast/starmath/res/dist12.png
index 661dd2f69513..661dd2f69513 100644
--- a/default_images/starmath/res/dist12_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist12.png
diff --git a/default_images/starmath/res/dist13_h.png b/ooo_custom_images/hicontrast/starmath/res/dist13.png
index 4f0253af5ae2..4f0253af5ae2 100644
--- a/default_images/starmath/res/dist13_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist13.png
diff --git a/default_images/starmath/res/dist21_h.png b/ooo_custom_images/hicontrast/starmath/res/dist21.png
index fb6d0ceaf3bd..fb6d0ceaf3bd 100644
--- a/default_images/starmath/res/dist21_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist21.png
diff --git a/default_images/starmath/res/dist22_h.png b/ooo_custom_images/hicontrast/starmath/res/dist22.png
index e1bc5cd1a7f0..e1bc5cd1a7f0 100644
--- a/default_images/starmath/res/dist22_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist22.png
diff --git a/default_images/starmath/res/dist31_h.png b/ooo_custom_images/hicontrast/starmath/res/dist31.png
index 54734095e24f..54734095e24f 100644
--- a/default_images/starmath/res/dist31_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist31.png
diff --git a/default_images/starmath/res/dist32_h.png b/ooo_custom_images/hicontrast/starmath/res/dist32.png
index 796ee2cc726a..796ee2cc726a 100644
--- a/default_images/starmath/res/dist32_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist32.png
diff --git a/default_images/starmath/res/dist41_h.png b/ooo_custom_images/hicontrast/starmath/res/dist41.png
index 248359be6959..248359be6959 100644
--- a/default_images/starmath/res/dist41_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist41.png
diff --git a/default_images/starmath/res/dist42_h.png b/ooo_custom_images/hicontrast/starmath/res/dist42.png
index 917651eabf59..917651eabf59 100644
--- a/default_images/starmath/res/dist42_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist42.png
diff --git a/default_images/starmath/res/dist51_h.png b/ooo_custom_images/hicontrast/starmath/res/dist51.png
index fea2e99bd85d..fea2e99bd85d 100644
--- a/default_images/starmath/res/dist51_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist51.png
diff --git a/default_images/starmath/res/dist52_h.png b/ooo_custom_images/hicontrast/starmath/res/dist52.png
index 90439997be22..90439997be22 100644
--- a/default_images/starmath/res/dist52_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist52.png
diff --git a/default_images/starmath/res/dist61_h.png b/ooo_custom_images/hicontrast/starmath/res/dist61.png
index a66a67fedebc..a66a67fedebc 100644
--- a/default_images/starmath/res/dist61_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist61.png
diff --git a/default_images/starmath/res/dist62_h.png b/ooo_custom_images/hicontrast/starmath/res/dist62.png
index 1ed1cc16c7ad..1ed1cc16c7ad 100644
--- a/default_images/starmath/res/dist62_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist62.png
diff --git a/default_images/starmath/res/dist71_h.png b/ooo_custom_images/hicontrast/starmath/res/dist71.png
index 00b46b814da1..00b46b814da1 100644
--- a/default_images/starmath/res/dist71_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist71.png
diff --git a/default_images/starmath/res/dist72_h.png b/ooo_custom_images/hicontrast/starmath/res/dist72.png
index 5f928ba3cfd7..5f928ba3cfd7 100644
--- a/default_images/starmath/res/dist72_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist72.png
diff --git a/default_images/starmath/res/dist81_h.png b/ooo_custom_images/hicontrast/starmath/res/dist81.png
index 70a8db262263..70a8db262263 100644
--- a/default_images/starmath/res/dist81_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist81.png
diff --git a/default_images/starmath/res/dist82_h.png b/ooo_custom_images/hicontrast/starmath/res/dist82.png
index a37f3e7c291b..a37f3e7c291b 100644
--- a/default_images/starmath/res/dist82_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist82.png
diff --git a/default_images/starmath/res/dist91_h.png b/ooo_custom_images/hicontrast/starmath/res/dist91.png
index 40793ab49835..40793ab49835 100644
--- a/default_images/starmath/res/dist91_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist91.png
diff --git a/default_images/starmath/res/dist92_h.png b/ooo_custom_images/hicontrast/starmath/res/dist92.png
index 9030118b607f..9030118b607f 100644
--- a/default_images/starmath/res/dist92_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist92.png
diff --git a/default_images/starmath/res/foh21601.png b/ooo_custom_images/hicontrast/starmath/res/fo21601.png
index 622e2bc5c606..622e2bc5c606 100644
--- a/default_images/starmath/res/foh21601.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fo21601.png
diff --git a/default_images/starmath/res/foh21602.png b/ooo_custom_images/hicontrast/starmath/res/fo21602.png
index 83a944524880..83a944524880 100644
--- a/default_images/starmath/res/foh21602.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fo21602.png
diff --git a/default_images/starmath/res/foh21603.png b/ooo_custom_images/hicontrast/starmath/res/fo21603.png
index 9b18dc1e24e5..9b18dc1e24e5 100644
--- a/default_images/starmath/res/foh21603.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fo21603.png
diff --git a/default_images/starmath/res/foh21604.png b/ooo_custom_images/hicontrast/starmath/res/fo21604.png
index 9ab934e90de6..9ab934e90de6 100644
--- a/default_images/starmath/res/foh21604.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fo21604.png
diff --git a/default_images/starmath/res/foh21605.png b/ooo_custom_images/hicontrast/starmath/res/fo21605.png
index 0bc82977b57a..0bc82977b57a 100644
--- a/default_images/starmath/res/foh21605.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fo21605.png
diff --git a/default_images/starmath/res/foh21606.png b/ooo_custom_images/hicontrast/starmath/res/fo21606.png
index 995f511b93af..995f511b93af 100644
--- a/default_images/starmath/res/foh21606.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fo21606.png
diff --git a/default_images/starmath/res/foh21607.png b/ooo_custom_images/hicontrast/starmath/res/fo21607.png
index 85534472e36e..85534472e36e 100644
--- a/default_images/starmath/res/foh21607.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fo21607.png
diff --git a/default_images/starmath/res/foh21609.png b/ooo_custom_images/hicontrast/starmath/res/fo21609.png
index ab0137310629..ab0137310629 100644
--- a/default_images/starmath/res/foh21609.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fo21609.png
diff --git a/default_images/starmath/res/foh21610.png b/ooo_custom_images/hicontrast/starmath/res/fo21610.png
index a9e8db779d99..a9e8db779d99 100644
--- a/default_images/starmath/res/foh21610.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fo21610.png
diff --git a/default_images/starmath/res/foh21611.png b/ooo_custom_images/hicontrast/starmath/res/fo21611.png
index b214a9f124a0..b214a9f124a0 100644
--- a/default_images/starmath/res/foh21611.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fo21611.png
diff --git a/default_images/starmath/res/foh21613.png b/ooo_custom_images/hicontrast/starmath/res/fo21613.png
index de4250096323..de4250096323 100644
--- a/default_images/starmath/res/foh21613.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fo21613.png
diff --git a/default_images/starmath/res/foh21614.png b/ooo_custom_images/hicontrast/starmath/res/fo21614.png
index c3505406f5ce..c3505406f5ce 100644
--- a/default_images/starmath/res/foh21614.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fo21614.png
diff --git a/default_images/starmath/res/foh21615.png b/ooo_custom_images/hicontrast/starmath/res/fo21615.png
index ea3ef08d8a7e..ea3ef08d8a7e 100644
--- a/default_images/starmath/res/foh21615.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fo21615.png
diff --git a/default_images/starmath/res/fuh21501.png b/ooo_custom_images/hicontrast/starmath/res/fu21501.png
index a6b99e49d686..a6b99e49d686 100644
--- a/default_images/starmath/res/fuh21501.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21501.png
diff --git a/default_images/starmath/res/fuh21502.png b/ooo_custom_images/hicontrast/starmath/res/fu21502.png
index 1434a96ebe18..1434a96ebe18 100644
--- a/default_images/starmath/res/fuh21502.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21502.png
diff --git a/default_images/starmath/res/fuh21503.png b/ooo_custom_images/hicontrast/starmath/res/fu21503.png
index 2da483801360..2da483801360 100644
--- a/default_images/starmath/res/fuh21503.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21503.png
diff --git a/default_images/starmath/res/fuh21504.png b/ooo_custom_images/hicontrast/starmath/res/fu21504.png
index e32098139dd0..e32098139dd0 100644
--- a/default_images/starmath/res/fuh21504.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21504.png
diff --git a/default_images/starmath/res/fuh21505.png b/ooo_custom_images/hicontrast/starmath/res/fu21505.png
index 15b17c32c38c..15b17c32c38c 100644
--- a/default_images/starmath/res/fuh21505.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21505.png
diff --git a/default_images/starmath/res/fuh21506.png b/ooo_custom_images/hicontrast/starmath/res/fu21506.png
index d23a835df017..d23a835df017 100644
--- a/default_images/starmath/res/fuh21506.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21506.png
diff --git a/default_images/starmath/res/fuh21507.png b/ooo_custom_images/hicontrast/starmath/res/fu21507.png
index bfe959cb8941..bfe959cb8941 100644
--- a/default_images/starmath/res/fuh21507.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21507.png
diff --git a/default_images/starmath/res/fuh21508.png b/ooo_custom_images/hicontrast/starmath/res/fu21508.png
index fca022a1ae6a..fca022a1ae6a 100644
--- a/default_images/starmath/res/fuh21508.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21508.png
diff --git a/default_images/starmath/res/fuh21509.png b/ooo_custom_images/hicontrast/starmath/res/fu21509.png
index deee40a15187..deee40a15187 100644
--- a/default_images/starmath/res/fuh21509.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21509.png
diff --git a/default_images/starmath/res/fuh21510.png b/ooo_custom_images/hicontrast/starmath/res/fu21510.png
index 01bc6c354bd1..01bc6c354bd1 100644
--- a/default_images/starmath/res/fuh21510.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21510.png
diff --git a/default_images/starmath/res/fuh21511.png b/ooo_custom_images/hicontrast/starmath/res/fu21511.png
index b5492980283b..b5492980283b 100644
--- a/default_images/starmath/res/fuh21511.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21511.png
diff --git a/default_images/starmath/res/fuh21512.png b/ooo_custom_images/hicontrast/starmath/res/fu21512.png
index 63894349d377..63894349d377 100644
--- a/default_images/starmath/res/fuh21512.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21512.png
diff --git a/default_images/starmath/res/fuh21513.png b/ooo_custom_images/hicontrast/starmath/res/fu21513.png
index 58273acd2251..58273acd2251 100644
--- a/default_images/starmath/res/fuh21513.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21513.png
diff --git a/default_images/starmath/res/fuh21514.png b/ooo_custom_images/hicontrast/starmath/res/fu21514.png
index 304bbd5795fe..304bbd5795fe 100644
--- a/default_images/starmath/res/fuh21514.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21514.png
diff --git a/default_images/starmath/res/fuh21515.png b/ooo_custom_images/hicontrast/starmath/res/fu21515.png
index f76eb82a72c1..f76eb82a72c1 100644
--- a/default_images/starmath/res/fuh21515.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21515.png
diff --git a/default_images/starmath/res/fuh21516.png b/ooo_custom_images/hicontrast/starmath/res/fu21516.png
index 19185804a239..19185804a239 100644
--- a/default_images/starmath/res/fuh21516.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21516.png
diff --git a/default_images/starmath/res/fuh21517.png b/ooo_custom_images/hicontrast/starmath/res/fu21517.png
index 35d07f68df57..35d07f68df57 100644
--- a/default_images/starmath/res/fuh21517.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21517.png
diff --git a/default_images/starmath/res/fuh21518.png b/ooo_custom_images/hicontrast/starmath/res/fu21518.png
index 4c2d617486e2..4c2d617486e2 100644
--- a/default_images/starmath/res/fuh21518.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21518.png
diff --git a/default_images/starmath/res/fuh21519.png b/ooo_custom_images/hicontrast/starmath/res/fu21519.png
index bc4b5b0560ed..bc4b5b0560ed 100644
--- a/default_images/starmath/res/fuh21519.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21519.png
diff --git a/default_images/starmath/res/fuh21520.png b/ooo_custom_images/hicontrast/starmath/res/fu21520.png
index 67f10fdc85a5..67f10fdc85a5 100644
--- a/default_images/starmath/res/fuh21520.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21520.png
diff --git a/default_images/starmath/res/fuh21521.png b/ooo_custom_images/hicontrast/starmath/res/fu21521.png
index 2caa306876c8..2caa306876c8 100644
--- a/default_images/starmath/res/fuh21521.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21521.png
diff --git a/default_images/starmath/res/fuh21522.png b/ooo_custom_images/hicontrast/starmath/res/fu21522.png
index fddbdd83d2d2..fddbdd83d2d2 100644
--- a/default_images/starmath/res/fuh21522.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21522.png
diff --git a/default_images/starmath/res/fuh21523.png b/ooo_custom_images/hicontrast/starmath/res/fu21523.png
index 94d8b2f00aee..94d8b2f00aee 100644
--- a/default_images/starmath/res/fuh21523.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21523.png
diff --git a/default_images/starmath/res/fuh21524.png b/ooo_custom_images/hicontrast/starmath/res/fu21524.png
index ede479111781..ede479111781 100644
--- a/default_images/starmath/res/fuh21524.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21524.png
diff --git a/default_images/starmath/res/fuh21908.png b/ooo_custom_images/hicontrast/starmath/res/fu21908.png
index 7d39725cd456..7d39725cd456 100644
--- a/default_images/starmath/res/fuh21908.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21908.png
diff --git a/default_images/starmath/res/imh21101.png b/ooo_custom_images/hicontrast/starmath/res/im21101.png
index 74a08df0df6a..74a08df0df6a 100644
--- a/default_images/starmath/res/imh21101.png
+++ b/ooo_custom_images/hicontrast/starmath/res/im21101.png
diff --git a/default_images/starmath/res/imh21102.png b/ooo_custom_images/hicontrast/starmath/res/im21102.png
index 99678e665292..99678e665292 100644
--- a/default_images/starmath/res/imh21102.png
+++ b/ooo_custom_images/hicontrast/starmath/res/im21102.png
diff --git a/default_images/starmath/res/imh21103.png b/ooo_custom_images/hicontrast/starmath/res/im21103.png
index 0f1564d60059..0f1564d60059 100644
--- a/default_images/starmath/res/imh21103.png
+++ b/ooo_custom_images/hicontrast/starmath/res/im21103.png
diff --git a/default_images/starmath/res/imh21104.png b/ooo_custom_images/hicontrast/starmath/res/im21104.png
index 947f88b278a8..947f88b278a8 100644
--- a/default_images/starmath/res/imh21104.png
+++ b/ooo_custom_images/hicontrast/starmath/res/im21104.png
diff --git a/default_images/starmath/res/imh21105.png b/ooo_custom_images/hicontrast/starmath/res/im21105.png
index d30145b85995..d30145b85995 100644
--- a/default_images/starmath/res/imh21105.png
+++ b/ooo_custom_images/hicontrast/starmath/res/im21105.png
diff --git a/default_images/starmath/res/imh21106.png b/ooo_custom_images/hicontrast/starmath/res/im21106.png
index 7c34b14211a2..7c34b14211a2 100644
--- a/default_images/starmath/res/imh21106.png
+++ b/ooo_custom_images/hicontrast/starmath/res/im21106.png
diff --git a/default_images/starmath/res/imh21107.png b/ooo_custom_images/hicontrast/starmath/res/im21107.png
index fd604c46e2e1..fd604c46e2e1 100644
--- a/default_images/starmath/res/imh21107.png
+++ b/ooo_custom_images/hicontrast/starmath/res/im21107.png
diff --git a/default_images/starmath/res/imh21108.png b/ooo_custom_images/hicontrast/starmath/res/im21108.png
index 5955124b962e..5955124b962e 100644
--- a/default_images/starmath/res/imh21108.png
+++ b/ooo_custom_images/hicontrast/starmath/res/im21108.png
diff --git a/default_images/starmath/res/imh21117.png b/ooo_custom_images/hicontrast/starmath/res/im21117.png
index d420e9131250..d420e9131250 100644
--- a/default_images/starmath/res/imh21117.png
+++ b/ooo_custom_images/hicontrast/starmath/res/im21117.png
diff --git a/default_images/starmath/res/mih21608.png b/ooo_custom_images/hicontrast/starmath/res/mi21608.png
index b2b043f5faa1..b2b043f5faa1 100644
--- a/default_images/starmath/res/mih21608.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi21608.png
diff --git a/default_images/starmath/res/mih21612.png b/ooo_custom_images/hicontrast/starmath/res/mi21612.png
index 41cdc2a8a82e..41cdc2a8a82e 100644
--- a/default_images/starmath/res/mih21612.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi21612.png
diff --git a/default_images/starmath/res/mih22003.png b/ooo_custom_images/hicontrast/starmath/res/mi22003.png
index 47b65da1585a..47b65da1585a 100644
--- a/default_images/starmath/res/mih22003.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22003.png
diff --git a/default_images/starmath/res/mih22004.png b/ooo_custom_images/hicontrast/starmath/res/mi22004.png
index b5d5d5509640..b5d5d5509640 100644
--- a/default_images/starmath/res/mih22004.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22004.png
diff --git a/default_images/starmath/res/mih22005.png b/ooo_custom_images/hicontrast/starmath/res/mi22005.png
index c0a5ad41d9ba..c0a5ad41d9ba 100644
--- a/default_images/starmath/res/mih22005.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22005.png
diff --git a/default_images/starmath/res/mih22006.png b/ooo_custom_images/hicontrast/starmath/res/mi22006.png
index a4d5c4307597..a4d5c4307597 100644
--- a/default_images/starmath/res/mih22006.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22006.png
diff --git a/default_images/starmath/res/mih22007.png b/ooo_custom_images/hicontrast/starmath/res/mi22007.png
index 272052d71076..272052d71076 100644
--- a/default_images/starmath/res/mih22007.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22007.png
diff --git a/default_images/starmath/res/mih22008.png b/ooo_custom_images/hicontrast/starmath/res/mi22008.png
index 4cb547a81332..4cb547a81332 100644
--- a/default_images/starmath/res/mih22008.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22008.png
diff --git a/default_images/starmath/res/mih22009.png b/ooo_custom_images/hicontrast/starmath/res/mi22009.png
index 675ea273de3b..675ea273de3b 100644
--- a/default_images/starmath/res/mih22009.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22009.png
diff --git a/default_images/starmath/res/mih22010.png b/ooo_custom_images/hicontrast/starmath/res/mi22010.png
index a75163e93990..a75163e93990 100644
--- a/default_images/starmath/res/mih22010.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22010.png
diff --git a/default_images/starmath/res/mih22011.png b/ooo_custom_images/hicontrast/starmath/res/mi22011.png
index 9df7dfd25f1a..9df7dfd25f1a 100644
--- a/default_images/starmath/res/mih22011.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22011.png
diff --git a/default_images/starmath/res/mih22012.png b/ooo_custom_images/hicontrast/starmath/res/mi22012.png
index 664423456d18..664423456d18 100644
--- a/default_images/starmath/res/mih22012.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22012.png
diff --git a/default_images/starmath/res/mih22013.png b/ooo_custom_images/hicontrast/starmath/res/mi22013.png
index cdd01da1d3b1..cdd01da1d3b1 100644
--- a/default_images/starmath/res/mih22013.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22013.png
diff --git a/default_images/starmath/res/mih22014.png b/ooo_custom_images/hicontrast/starmath/res/mi22014.png
index bab8fc821f40..bab8fc821f40 100644
--- a/default_images/starmath/res/mih22014.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22014.png
diff --git a/default_images/starmath/res/mih22015.png b/ooo_custom_images/hicontrast/starmath/res/mi22015.png
index 1585851aa444..1585851aa444 100644
--- a/default_images/starmath/res/mih22015.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22015.png
diff --git a/default_images/starmath/res/mih22016.png b/ooo_custom_images/hicontrast/starmath/res/mi22016.png
index cdf84f639fd0..cdf84f639fd0 100644
--- a/default_images/starmath/res/mih22016.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22016.png
diff --git a/default_images/starmath/res/mih22017.png b/ooo_custom_images/hicontrast/starmath/res/mi22017.png
index fb69b5239d47..fb69b5239d47 100644
--- a/default_images/starmath/res/mih22017.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22017.png
diff --git a/default_images/starmath/res/mih22018.png b/ooo_custom_images/hicontrast/starmath/res/mi22018.png
index 06dc3ab86d45..06dc3ab86d45 100644
--- a/default_images/starmath/res/mih22018.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22018.png
diff --git a/default_images/starmath/res/mih22019.png b/ooo_custom_images/hicontrast/starmath/res/mi22019.png
index 66216d835712..66216d835712 100644
--- a/default_images/starmath/res/mih22019.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22019.png
diff --git a/default_images/starmath/res/oph21401.png b/ooo_custom_images/hicontrast/starmath/res/op21401.png
index a0929500d3a9..a0929500d3a9 100644
--- a/default_images/starmath/res/oph21401.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21401.png
diff --git a/default_images/starmath/res/oph21402.png b/ooo_custom_images/hicontrast/starmath/res/op21402.png
index 55c81979844d..55c81979844d 100644
--- a/default_images/starmath/res/oph21402.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21402.png
diff --git a/default_images/starmath/res/oph21403.png b/ooo_custom_images/hicontrast/starmath/res/op21403.png
index 00296cbd35ee..00296cbd35ee 100644
--- a/default_images/starmath/res/oph21403.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21403.png
diff --git a/default_images/starmath/res/oph21405.png b/ooo_custom_images/hicontrast/starmath/res/op21405.png
index 60dbffd58dc6..60dbffd58dc6 100644
--- a/default_images/starmath/res/oph21405.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21405.png
diff --git a/default_images/starmath/res/oph21406.png b/ooo_custom_images/hicontrast/starmath/res/op21406.png
index 441f9814ccb4..441f9814ccb4 100644
--- a/default_images/starmath/res/oph21406.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21406.png
diff --git a/default_images/starmath/res/oph21407.png b/ooo_custom_images/hicontrast/starmath/res/op21407.png
index 579bce3eddbc..579bce3eddbc 100644
--- a/default_images/starmath/res/oph21407.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21407.png
diff --git a/default_images/starmath/res/oph21408.png b/ooo_custom_images/hicontrast/starmath/res/op21408.png
index 8be9d18f65bb..8be9d18f65bb 100644
--- a/default_images/starmath/res/oph21408.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21408.png
diff --git a/default_images/starmath/res/oph21409.png b/ooo_custom_images/hicontrast/starmath/res/op21409.png
index a0e399fbdfc8..a0e399fbdfc8 100644
--- a/default_images/starmath/res/oph21409.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21409.png
diff --git a/default_images/starmath/res/oph21410.png b/ooo_custom_images/hicontrast/starmath/res/op21410.png
index 3ad8e1854191..3ad8e1854191 100644
--- a/default_images/starmath/res/oph21410.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21410.png
diff --git a/default_images/starmath/res/oph21411.png b/ooo_custom_images/hicontrast/starmath/res/op21411.png
index 20bf2aab2a9e..20bf2aab2a9e 100644
--- a/default_images/starmath/res/oph21411.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21411.png
diff --git a/default_images/starmath/res/oph21412.png b/ooo_custom_images/hicontrast/starmath/res/op21412.png
index 983714677b70..983714677b70 100644
--- a/default_images/starmath/res/oph21412.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21412.png
diff --git a/default_images/starmath/res/oph21413.png b/ooo_custom_images/hicontrast/starmath/res/op21413.png
index 00ab5b2d41f4..00ab5b2d41f4 100644
--- a/default_images/starmath/res/oph21413.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21413.png
diff --git a/default_images/starmath/res/oph21414.png b/ooo_custom_images/hicontrast/starmath/res/op21414.png
index d7df2438922c..d7df2438922c 100644
--- a/default_images/starmath/res/oph21414.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21414.png
diff --git a/default_images/starmath/res/oph21415.png b/ooo_custom_images/hicontrast/starmath/res/op21415.png
index a8cce1b08977..a8cce1b08977 100644
--- a/default_images/starmath/res/oph21415.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21415.png
diff --git a/default_images/starmath/res/oph21416.png b/ooo_custom_images/hicontrast/starmath/res/op21416.png
index b7fd8d020274..b7fd8d020274 100644
--- a/default_images/starmath/res/oph21416.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21416.png
diff --git a/default_images/starmath/res/oph21417.png b/ooo_custom_images/hicontrast/starmath/res/op21417.png
index 995b8b4ff7fd..995b8b4ff7fd 100644
--- a/default_images/starmath/res/oph21417.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21417.png
diff --git a/default_images/starmath/res/oph21418.png b/ooo_custom_images/hicontrast/starmath/res/op21418.png
index a5d360a03558..a5d360a03558 100644
--- a/default_images/starmath/res/oph21418.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21418.png
diff --git a/default_images/starmath/res/oph21419.png b/ooo_custom_images/hicontrast/starmath/res/op21419.png
index 6493064c2b0d..6493064c2b0d 100644
--- a/default_images/starmath/res/oph21419.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21419.png
diff --git a/default_images/starmath/res/oph21420.png b/ooo_custom_images/hicontrast/starmath/res/op21420.png
index 732a752283b4..732a752283b4 100644
--- a/default_images/starmath/res/oph21420.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21420.png
diff --git a/default_images/starmath/res/oph21421.png b/ooo_custom_images/hicontrast/starmath/res/op21421.png
index d0cb1277a034..d0cb1277a034 100644
--- a/default_images/starmath/res/oph21421.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21421.png
diff --git a/default_images/starmath/res/oph22001.png b/ooo_custom_images/hicontrast/starmath/res/op22001.png
index dc1023303e79..dc1023303e79 100644
--- a/default_images/starmath/res/oph22001.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op22001.png
diff --git a/default_images/starmath/res/oph22002.png b/ooo_custom_images/hicontrast/starmath/res/op22002.png
index 7cff9aeaf203..7cff9aeaf203 100644
--- a/default_images/starmath/res/oph22002.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op22002.png
diff --git a/default_images/starmath/res/unh21201.png b/ooo_custom_images/hicontrast/starmath/res/un21201.png
index 57d2b4020c31..57d2b4020c31 100644
--- a/default_images/starmath/res/unh21201.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21201.png
diff --git a/default_images/starmath/res/unh21202.png b/ooo_custom_images/hicontrast/starmath/res/un21202.png
index 4c8458a573bf..4c8458a573bf 100644
--- a/default_images/starmath/res/unh21202.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21202.png
diff --git a/default_images/starmath/res/unh21203.png b/ooo_custom_images/hicontrast/starmath/res/un21203.png
index 0c8f8f1c87b6..0c8f8f1c87b6 100644
--- a/default_images/starmath/res/unh21203.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21203.png
diff --git a/default_images/starmath/res/unh21204.png b/ooo_custom_images/hicontrast/starmath/res/un21204.png
index 2bde9f41d240..2bde9f41d240 100644
--- a/default_images/starmath/res/unh21204.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21204.png
diff --git a/default_images/starmath/res/unh21205.png b/ooo_custom_images/hicontrast/starmath/res/un21205.png
index b05c286f4c4c..b05c286f4c4c 100644
--- a/default_images/starmath/res/unh21205.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21205.png
diff --git a/default_images/starmath/res/unh21206.png b/ooo_custom_images/hicontrast/starmath/res/un21206.png
index 1f2c52f34f56..1f2c52f34f56 100644
--- a/default_images/starmath/res/unh21206.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21206.png
diff --git a/default_images/starmath/res/unh21207.png b/ooo_custom_images/hicontrast/starmath/res/un21207.png
index a68224a46e50..a68224a46e50 100644
--- a/default_images/starmath/res/unh21207.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21207.png
diff --git a/default_images/starmath/res/unh21208.png b/ooo_custom_images/hicontrast/starmath/res/un21208.png
index c46742a87334..c46742a87334 100644
--- a/default_images/starmath/res/unh21208.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21208.png
diff --git a/default_images/starmath/res/unh21209.png b/ooo_custom_images/hicontrast/starmath/res/un21209.png
index de42599e8473..de42599e8473 100644
--- a/default_images/starmath/res/unh21209.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21209.png
diff --git a/default_images/starmath/res/unh21210.png b/ooo_custom_images/hicontrast/starmath/res/un21210.png
index 0f92b581d5da..0f92b581d5da 100644
--- a/default_images/starmath/res/unh21210.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21210.png
diff --git a/default_images/starmath/res/unh21211.png b/ooo_custom_images/hicontrast/starmath/res/un21211.png
index 685a776648a1..685a776648a1 100644
--- a/default_images/starmath/res/unh21211.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21211.png
diff --git a/default_images/starmath/res/unh21212.png b/ooo_custom_images/hicontrast/starmath/res/un21212.png
index e8d376a6a263..e8d376a6a263 100644
--- a/default_images/starmath/res/unh21212.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21212.png
diff --git a/default_images/starmath/res/unh21213.png b/ooo_custom_images/hicontrast/starmath/res/un21213.png
index 3170f692e841..3170f692e841 100644
--- a/default_images/starmath/res/unh21213.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21213.png
diff --git a/default_images/starmath/res/unh21214.png b/ooo_custom_images/hicontrast/starmath/res/un21214.png
index 23d3fd1ed28b..23d3fd1ed28b 100644
--- a/default_images/starmath/res/unh21214.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21214.png
diff --git a/default_images/starmath/res/unh21215.png b/ooo_custom_images/hicontrast/starmath/res/un21215.png
index b40a2be4f8a0..b40a2be4f8a0 100644
--- a/default_images/starmath/res/unh21215.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21215.png
diff --git a/default_images/starmath/res/unh21221.png b/ooo_custom_images/hicontrast/starmath/res/un21221.png
index 7f1ec5bb41c8..7f1ec5bb41c8 100644
--- a/default_images/starmath/res/unh21221.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21221.png
diff --git a/default_images/svtools/res/back_large_h.png b/ooo_custom_images/hicontrast/svtools/res/back_large.png
index 5c69fc639dd0..5c69fc639dd0 100644
--- a/default_images/svtools/res/back_large_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/back_large.png
diff --git a/default_images/svtools/res/back_small_h.png b/ooo_custom_images/hicontrast/svtools/res/back_small.png
index 3e27d96201a7..3e27d96201a7 100644
--- a/default_images/svtools/res/back_small_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/back_small.png
diff --git a/default_images/svtools/res/bmpfont_h.png b/ooo_custom_images/hicontrast/svtools/res/bmpfont.png
index 78287005afbd..78287005afbd 100644
--- a/default_images/svtools/res/bmpfont_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/bmpfont.png
diff --git a/default_images/svtools/res/collate_h.png b/ooo_custom_images/hicontrast/svtools/res/collate.png
index 38353b700f72..38353b700f72 100644
--- a/default_images/svtools/res/collate_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/collate.png
diff --git a/default_images/svtools/res/edh01.png b/ooo_custom_images/hicontrast/svtools/res/ed01.png
index be29f7be1a2d..be29f7be1a2d 100644
--- a/default_images/svtools/res/edh01.png
+++ b/ooo_custom_images/hicontrast/svtools/res/ed01.png
diff --git a/default_images/svtools/res/edh02.png b/ooo_custom_images/hicontrast/svtools/res/ed02.png
index 9e64e2d020bf..9e64e2d020bf 100644
--- a/default_images/svtools/res/edh02.png
+++ b/ooo_custom_images/hicontrast/svtools/res/ed02.png
diff --git a/default_images/svtools/res/edh03.png b/ooo_custom_images/hicontrast/svtools/res/ed03.png
index c6365aedfb82..c6365aedfb82 100644
--- a/default_images/svtools/res/edh03.png
+++ b/ooo_custom_images/hicontrast/svtools/res/ed03.png
diff --git a/default_images/svtools/res/edh04.png b/ooo_custom_images/hicontrast/svtools/res/ed04.png
index 8590438ff155..8590438ff155 100644
--- a/default_images/svtools/res/edh04.png
+++ b/ooo_custom_images/hicontrast/svtools/res/ed04.png
diff --git a/default_images/svtools/res/edh05.png b/ooo_custom_images/hicontrast/svtools/res/ed05.png
index e6f19d7e8d24..e6f19d7e8d24 100644
--- a/default_images/svtools/res/edh05.png
+++ b/ooo_custom_images/hicontrast/svtools/res/ed05.png
diff --git a/default_images/svtools/res/edh06.png b/ooo_custom_images/hicontrast/svtools/res/ed06.png
index 8b3f7c3866aa..8b3f7c3866aa 100644
--- a/default_images/svtools/res/edh06.png
+++ b/ooo_custom_images/hicontrast/svtools/res/ed06.png
diff --git a/default_images/svtools/res/edh07.png b/ooo_custom_images/hicontrast/svtools/res/ed07.png
index 6ac60ad722e5..6ac60ad722e5 100644
--- a/default_images/svtools/res/edh07.png
+++ b/ooo_custom_images/hicontrast/svtools/res/ed07.png
diff --git a/default_images/svtools/res/edh08.png b/ooo_custom_images/hicontrast/svtools/res/ed08.png
index 320980800c62..320980800c62 100644
--- a/default_images/svtools/res/edh08.png
+++ b/ooo_custom_images/hicontrast/svtools/res/ed08.png
diff --git a/default_images/svtools/res/edh09.png b/ooo_custom_images/hicontrast/svtools/res/ed09.png
index 1a5176043730..1a5176043730 100644
--- a/default_images/svtools/res/edh09.png
+++ b/ooo_custom_images/hicontrast/svtools/res/ed09.png
diff --git a/default_images/svtools/res/info_large_h.png b/ooo_custom_images/hicontrast/svtools/res/info_large.png
index ef493d8b1d23..ef493d8b1d23 100644
--- a/default_images/svtools/res/info_large_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/info_large.png
diff --git a/default_images/svtools/res/info_small_h.png b/ooo_custom_images/hicontrast/svtools/res/info_small.png
index 0a01497b33e8..0a01497b33e8 100644
--- a/default_images/svtools/res/info_small_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/info_small.png
diff --git a/default_images/svtools/res/my_docs_h.png b/ooo_custom_images/hicontrast/svtools/res/my_docs.png
index 6b69a845d616..6b69a845d616 100644
--- a/default_images/svtools/res/my_docs_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/my_docs.png
diff --git a/default_images/svtools/res/ncollate_h.png b/ooo_custom_images/hicontrast/svtools/res/ncollate.png
index 91e066b9b09b..91e066b9b09b 100644
--- a/default_images/svtools/res/ncollate_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/ncollate.png
diff --git a/default_images/svtools/res/new_doc_h.png b/ooo_custom_images/hicontrast/svtools/res/new_doc.png
index de0e560247be..de0e560247be 100644
--- a/default_images/svtools/res/new_doc_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/new_doc.png
diff --git a/default_images/svtools/res/preview_large_h.png b/ooo_custom_images/hicontrast/svtools/res/preview_large.png
index a095c8ef0ddd..a095c8ef0ddd 100644
--- a/default_images/svtools/res/preview_large_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/preview_large.png
diff --git a/default_images/svtools/res/preview_small_h.png b/ooo_custom_images/hicontrast/svtools/res/preview_small.png
index c5653757d504..c5653757d504 100644
--- a/default_images/svtools/res/preview_small_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/preview_small.png
diff --git a/default_images/svtools/res/prnfont_h.png b/ooo_custom_images/hicontrast/svtools/res/prnfont.png
index 9f4e007ac9bc..9f4e007ac9bc 100644
--- a/default_images/svtools/res/prnfont_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/prnfont.png
diff --git a/default_images/svtools/res/samples_h.png b/ooo_custom_images/hicontrast/svtools/res/samples.png
index caa4efc20633..caa4efc20633 100644
--- a/default_images/svtools/res/samples_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/samples.png
diff --git a/default_images/svtools/res/scalfont_h.png b/ooo_custom_images/hicontrast/svtools/res/scalfont.png
index f316df53bebd..f316df53bebd 100644
--- a/default_images/svtools/res/scalfont_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/scalfont.png
diff --git a/default_images/svtools/res/template_h.png b/ooo_custom_images/hicontrast/svtools/res/template.png
index dd95c2900375..dd95c2900375 100644
--- a/default_images/svtools/res/template_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/template.png
diff --git a/default_images/svtools/res/triangle_down_hc.png b/ooo_custom_images/hicontrast/svtools/res/triangle_down.png
index 732a1e86b43c..732a1e86b43c 100644
--- a/default_images/svtools/res/triangle_down_hc.png
+++ b/ooo_custom_images/hicontrast/svtools/res/triangle_down.png
diff --git a/default_images/svtools/res/triangle_right_hc.png b/ooo_custom_images/hicontrast/svtools/res/triangle_right.png
index 33037a35fb55..33037a35fb55 100644
--- a/default_images/svtools/res/triangle_right_hc.png
+++ b/ooo_custom_images/hicontrast/svtools/res/triangle_right.png
diff --git a/default_images/svtools/res/up_large_h.png b/ooo_custom_images/hicontrast/svtools/res/up_large.png
index cc6ba7dce017..cc6ba7dce017 100644
--- a/default_images/svtools/res/up_large_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/up_large.png
diff --git a/default_images/svtools/res/up_small_h.png b/ooo_custom_images/hicontrast/svtools/res/up_small.png
index e8122b21845a..e8122b21845a 100644
--- a/default_images/svtools/res/up_small_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/up_small.png
diff --git a/default_images/svx/res/3dgeo_h.png b/ooo_custom_images/hicontrast/svx/res/3dgeo.png
index f21f22d3ac81..f21f22d3ac81 100644
--- a/default_images/svx/res/3dgeo_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/3dgeo.png
diff --git a/default_images/svx/res/3dlight_h.png b/ooo_custom_images/hicontrast/svx/res/3dlight.png
index 877cfe5c57c1..877cfe5c57c1 100644
--- a/default_images/svx/res/3dlight_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/3dlight.png
diff --git a/default_images/svx/res/3drepres_h.png b/ooo_custom_images/hicontrast/svx/res/3drepres.png
index 0cb9693c88f9..0cb9693c88f9 100644
--- a/default_images/svx/res/3drepres_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/3drepres.png
diff --git a/default_images/svx/res/3dtextur_h.png b/ooo_custom_images/hicontrast/svx/res/3dtextur.png
index 2f96edb6a2a0..2f96edb6a2a0 100644
--- a/default_images/svx/res/3dtextur_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/3dtextur.png
diff --git a/default_images/svx/res/apply_h.png b/ooo_custom_images/hicontrast/svx/res/apply.png
index 1f7df9c5f169..1f7df9c5f169 100644
--- a/default_images/svx/res/apply_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/apply.png
diff --git a/default_images/svx/res/blend3d_h.png b/ooo_custom_images/hicontrast/svx/res/blend3d.png
index 763d7ee1f37f..763d7ee1f37f 100644
--- a/default_images/svx/res/blend3d_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/blend3d.png
diff --git a/default_images/svx/res/brightlit_16_h.png b/ooo_custom_images/hicontrast/svx/res/brightlit_16.png
index 02d20fcfdb7f..02d20fcfdb7f 100644
--- a/default_images/svx/res/brightlit_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/brightlit_16.png
diff --git a/default_images/svx/res/caution_11x16_h.png b/ooo_custom_images/hicontrast/svx/res/caution_11x16.png
index 96c92542bced..96c92542bced 100644
--- a/default_images/svx/res/caution_11x16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/caution_11x16.png
diff --git a/default_images/svx/res/cdh01.png b/ooo_custom_images/hicontrast/svx/res/cd01.png
index 84a2174a3935..84a2174a3935 100644
--- a/default_images/svx/res/cdh01.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd01.png
diff --git a/default_images/svx/res/cdh015.png b/ooo_custom_images/hicontrast/svx/res/cd015.png
index 1321c42544af..1321c42544af 100644
--- a/default_images/svx/res/cdh015.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd015.png
diff --git a/default_images/svx/res/cdh016.png b/ooo_custom_images/hicontrast/svx/res/cd016.png
index 2fdd4c14f534..2fdd4c14f534 100644
--- a/default_images/svx/res/cdh016.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd016.png
diff --git a/default_images/svx/res/cdh017.png b/ooo_custom_images/hicontrast/svx/res/cd017.png
index 35f86a1976ca..35f86a1976ca 100644
--- a/default_images/svx/res/cdh017.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd017.png
diff --git a/default_images/svx/res/cdh018.png b/ooo_custom_images/hicontrast/svx/res/cd018.png
index 5a10792da5ab..5a10792da5ab 100644
--- a/default_images/svx/res/cdh018.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd018.png
diff --git a/default_images/svx/res/cdh02.png b/ooo_custom_images/hicontrast/svx/res/cd02.png
index 27ba1b103236..27ba1b103236 100644
--- a/default_images/svx/res/cdh02.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd02.png
diff --git a/default_images/svx/res/cdh020.png b/ooo_custom_images/hicontrast/svx/res/cd020.png
index 01ad92a6beb8..01ad92a6beb8 100644
--- a/default_images/svx/res/cdh020.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd020.png
diff --git a/default_images/svx/res/cdh021.png b/ooo_custom_images/hicontrast/svx/res/cd021.png
index b615045b0893..b615045b0893 100644
--- a/default_images/svx/res/cdh021.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd021.png
diff --git a/default_images/svx/res/cdh025.png b/ooo_custom_images/hicontrast/svx/res/cd025.png
index 058e894bbe36..058e894bbe36 100644
--- a/default_images/svx/res/cdh025.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd025.png
diff --git a/default_images/svx/res/cdh026.png b/ooo_custom_images/hicontrast/svx/res/cd026.png
index 8df38965b87c..8df38965b87c 100644
--- a/default_images/svx/res/cdh026.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd026.png
diff --git a/default_images/svx/res/cdh05.png b/ooo_custom_images/hicontrast/svx/res/cd05.png
index fc0efe9e7806..fc0efe9e7806 100644
--- a/default_images/svx/res/cdh05.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd05.png
diff --git a/default_images/svx/res/cdh06.png b/ooo_custom_images/hicontrast/svx/res/cd06.png
index 05498575b823..05498575b823 100644
--- a/default_images/svx/res/cdh06.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd06.png
diff --git a/default_images/svx/res/cdh07.png b/ooo_custom_images/hicontrast/svx/res/cd07.png
index 9184f1ab3493..9184f1ab3493 100644
--- a/default_images/svx/res/cdh07.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd07.png
diff --git a/default_images/svx/res/cdh08.png b/ooo_custom_images/hicontrast/svx/res/cd08.png
index 6208cdf370af..6208cdf370af 100644
--- a/default_images/svx/res/cdh08.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd08.png
diff --git a/default_images/svx/res/color_h.png b/ooo_custom_images/hicontrast/svx/res/color.png
index 170e7c17a3cd..170e7c17a3cd 100644
--- a/default_images/svx/res/color_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/color.png
diff --git a/default_images/svx/res/colordlg_h.png b/ooo_custom_images/hicontrast/svx/res/colordlg.png
index b2f5870e15f4..b2f5870e15f4 100644
--- a/default_images/svx/res/colordlg_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/colordlg.png
diff --git a/default_images/svx/res/convrt3d_h.png b/ooo_custom_images/hicontrast/svx/res/convrt3d.png
index a2a8852d04e2..a2a8852d04e2 100644
--- a/default_images/svx/res/convrt3d_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/convrt3d.png
diff --git a/default_images/svx/res/dimlit_16_h.png b/ooo_custom_images/hicontrast/svx/res/dimlit_16.png
index 14a444b1c428..14a444b1c428 100644
--- a/default_images/svx/res/dimlit_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/dimlit_16.png
diff --git a/default_images/svx/res/directioneast_22_h.png b/ooo_custom_images/hicontrast/svx/res/directioneast_22.png
index a1d294ab85bc..a1d294ab85bc 100644
--- a/default_images/svx/res/directioneast_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/directioneast_22.png
diff --git a/default_images/svx/res/directionnorth_22_h.png b/ooo_custom_images/hicontrast/svx/res/directionnorth_22.png
index ef81b673c31d..ef81b673c31d 100644
--- a/default_images/svx/res/directionnorth_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/directionnorth_22.png
diff --git a/default_images/svx/res/directionnortheast_22_h.png b/ooo_custom_images/hicontrast/svx/res/directionnortheast_22.png
index 1d553c5e30bc..1d553c5e30bc 100644
--- a/default_images/svx/res/directionnortheast_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/directionnortheast_22.png
diff --git a/default_images/svx/res/directionnorthwest_22_h.png b/ooo_custom_images/hicontrast/svx/res/directionnorthwest_22.png
index 0af0c04418c3..0af0c04418c3 100644
--- a/default_images/svx/res/directionnorthwest_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/directionnorthwest_22.png
diff --git a/default_images/svx/res/directionsouth_22_h.png b/ooo_custom_images/hicontrast/svx/res/directionsouth_22.png
index c938713f668f..c938713f668f 100644
--- a/default_images/svx/res/directionsouth_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/directionsouth_22.png
diff --git a/default_images/svx/res/directionsoutheast_22_h.png b/ooo_custom_images/hicontrast/svx/res/directionsoutheast_22.png
index afa1c1025970..afa1c1025970 100644
--- a/default_images/svx/res/directionsoutheast_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/directionsoutheast_22.png
diff --git a/default_images/svx/res/directionsouthwest_22_h.png b/ooo_custom_images/hicontrast/svx/res/directionsouthwest_22.png
index 36b93271b14d..36b93271b14d 100644
--- a/default_images/svx/res/directionsouthwest_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/directionsouthwest_22.png
diff --git a/default_images/svx/res/directionstraight_22_h.png b/ooo_custom_images/hicontrast/svx/res/directionstraight_22.png
index 162d232e2311..162d232e2311 100644
--- a/default_images/svx/res/directionstraight_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/directionstraight_22.png
diff --git a/default_images/svx/res/directionwest_22_h.png b/ooo_custom_images/hicontrast/svx/res/directionwest_22.png
index 1be63ebe92ac..1be63ebe92ac 100644
--- a/default_images/svx/res/directionwest_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/directionwest_22.png
diff --git a/default_images/svx/res/doublesi_h.png b/ooo_custom_images/hicontrast/svx/res/doublesi.png
index 5e83b519ff55..5e83b519ff55 100644
--- a/default_images/svx/res/doublesi_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/doublesi.png
diff --git a/default_images/svx/res/dsth_cen_h.png b/ooo_custom_images/hicontrast/svx/res/dsth_cen.png
index 566579e2ac03..566579e2ac03 100644
--- a/default_images/svx/res/dsth_cen_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/dsth_cen.png
diff --git a/default_images/svx/res/dsth_dst_h.png b/ooo_custom_images/hicontrast/svx/res/dsth_dst.png
index 8fdefa61011e..8fdefa61011e 100644
--- a/default_images/svx/res/dsth_dst_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/dsth_dst.png
diff --git a/default_images/svx/res/dsth_hig_h.png b/ooo_custom_images/hicontrast/svx/res/dsth_hig.png
index 7a95abba9c8d..7a95abba9c8d 100644
--- a/default_images/svx/res/dsth_hig_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/dsth_hig.png
diff --git a/default_images/svx/res/dsth_low_h.png b/ooo_custom_images/hicontrast/svx/res/dsth_low.png
index 4c48db45a817..4c48db45a817 100644
--- a/default_images/svx/res/dsth_low_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/dsth_low.png
diff --git a/default_images/svx/res/dstv_cen_h.png b/ooo_custom_images/hicontrast/svx/res/dstv_cen.png
index ec7e664d8b29..ec7e664d8b29 100644
--- a/default_images/svx/res/dstv_cen_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/dstv_cen.png
diff --git a/default_images/svx/res/dstv_dst_h.png b/ooo_custom_images/hicontrast/svx/res/dstv_dst.png
index 92f2917f4999..92f2917f4999 100644
--- a/default_images/svx/res/dstv_dst_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/dstv_dst.png
diff --git a/default_images/svx/res/dstv_hig_h.png b/ooo_custom_images/hicontrast/svx/res/dstv_hig.png
index 19f32b41a407..19f32b41a407 100644
--- a/default_images/svx/res/dstv_hig_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/dstv_hig.png
diff --git a/default_images/svx/res/dstv_low_h.png b/ooo_custom_images/hicontrast/svx/res/dstv_low.png
index 3abb40d926f0..3abb40d926f0 100644
--- a/default_images/svx/res/dstv_low_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/dstv_low.png
diff --git a/default_images/svx/res/extrusion05inch_16_h.png b/ooo_custom_images/hicontrast/svx/res/extrusion05inch_16.png
index 24da4c7910a9..24da4c7910a9 100644
--- a/default_images/svx/res/extrusion05inch_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/extrusion05inch_16.png
diff --git a/default_images/svx/res/extrusion0inch_16_h.png b/ooo_custom_images/hicontrast/svx/res/extrusion0inch_16.png
index 0ba962352ee2..0ba962352ee2 100644
--- a/default_images/svx/res/extrusion0inch_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/extrusion0inch_16.png
diff --git a/default_images/svx/res/extrusion1inch_16_h.png b/ooo_custom_images/hicontrast/svx/res/extrusion1inch_16.png
index 32086aaa354c..32086aaa354c 100644
--- a/default_images/svx/res/extrusion1inch_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/extrusion1inch_16.png
diff --git a/default_images/svx/res/extrusion2inch_16_h.png b/ooo_custom_images/hicontrast/svx/res/extrusion2inch_16.png
index 66063dfcbb22..66063dfcbb22 100644
--- a/default_images/svx/res/extrusion2inch_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/extrusion2inch_16.png
diff --git a/default_images/svx/res/extrusion4inch_16_h.png b/ooo_custom_images/hicontrast/svx/res/extrusion4inch_16.png
index 4e5c0bfde632..4e5c0bfde632 100644
--- a/default_images/svx/res/extrusion4inch_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/extrusion4inch_16.png
diff --git a/default_images/svx/res/extrusioninfinity_16_h.png b/ooo_custom_images/hicontrast/svx/res/extrusioninfinity_16.png
index 65b4c02f9685..65b4c02f9685 100644
--- a/default_images/svx/res/extrusioninfinity_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/extrusioninfinity_16.png
diff --git a/default_images/svx/res/filter3d_h.png b/ooo_custom_images/hicontrast/svx/res/filter3d.png
index c815bd93ae83..c815bd93ae83 100644
--- a/default_images/svx/res/filter3d_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/filter3d.png
diff --git a/default_images/svx/res/fontworkaligncentered_16_h.png b/ooo_custom_images/hicontrast/svx/res/fontworkaligncentered_16.png
index 6cf6ba71cef7..6cf6ba71cef7 100644
--- a/default_images/svx/res/fontworkaligncentered_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fontworkaligncentered_16.png
diff --git a/default_images/svx/res/fontworkaligncentered_26_h.png b/ooo_custom_images/hicontrast/svx/res/fontworkaligncentered_26.png
index e80b3b532ce6..e80b3b532ce6 100644
--- a/default_images/svx/res/fontworkaligncentered_26_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fontworkaligncentered_26.png
diff --git a/default_images/svx/res/fontworkalignjustified_16_h.png b/ooo_custom_images/hicontrast/svx/res/fontworkalignjustified_16.png
index 503bddbbd10c..503bddbbd10c 100644
--- a/default_images/svx/res/fontworkalignjustified_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fontworkalignjustified_16.png
diff --git a/default_images/svx/res/fontworkalignjustified_26_h.png b/ooo_custom_images/hicontrast/svx/res/fontworkalignjustified_26.png
index b2e95db780c3..b2e95db780c3 100644
--- a/default_images/svx/res/fontworkalignjustified_26_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fontworkalignjustified_26.png
diff --git a/default_images/svx/res/fontworkalignleft_16_h.png b/ooo_custom_images/hicontrast/svx/res/fontworkalignleft_16.png
index 32cbbf9f5d2b..32cbbf9f5d2b 100644
--- a/default_images/svx/res/fontworkalignleft_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fontworkalignleft_16.png
diff --git a/default_images/svx/res/fontworkalignleft_26_h.png b/ooo_custom_images/hicontrast/svx/res/fontworkalignleft_26.png
index 3255d27d9f5d..3255d27d9f5d 100644
--- a/default_images/svx/res/fontworkalignleft_26_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fontworkalignleft_26.png
diff --git a/default_images/svx/res/fontworkalignright_16_h.png b/ooo_custom_images/hicontrast/svx/res/fontworkalignright_16.png
index 89cdc084247b..89cdc084247b 100644
--- a/default_images/svx/res/fontworkalignright_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fontworkalignright_16.png
diff --git a/default_images/svx/res/fontworkalignright_26_h.png b/ooo_custom_images/hicontrast/svx/res/fontworkalignright_26.png
index 073da720a0c4..073da720a0c4 100644
--- a/default_images/svx/res/fontworkalignright_26_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fontworkalignright_26.png
diff --git a/default_images/svx/res/fontworkalignstretch_16_h.png b/ooo_custom_images/hicontrast/svx/res/fontworkalignstretch_16.png
index e670d0c3390b..e670d0c3390b 100644
--- a/default_images/svx/res/fontworkalignstretch_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fontworkalignstretch_16.png
diff --git a/default_images/svx/res/fontworkalignstretch_26_h.png b/ooo_custom_images/hicontrast/svx/res/fontworkalignstretch_26.png
index d31f5b90a064..d31f5b90a064 100644
--- a/default_images/svx/res/fontworkalignstretch_26_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fontworkalignstretch_26.png
diff --git a/default_images/svx/res/frh01.png b/ooo_custom_images/hicontrast/svx/res/fr01.png
index 6219cd704eee..6219cd704eee 100644
--- a/default_images/svx/res/frh01.png
+++ b/ooo_custom_images/hicontrast/svx/res/fr01.png
diff --git a/default_images/svx/res/frh010.png b/ooo_custom_images/hicontrast/svx/res/fr010.png
index 3e82afa1f068..3e82afa1f068 100644
--- a/default_images/svx/res/frh010.png
+++ b/ooo_custom_images/hicontrast/svx/res/fr010.png
diff --git a/default_images/svx/res/frh011.png b/ooo_custom_images/hicontrast/svx/res/fr011.png
index 4eb8dd02589f..4eb8dd02589f 100644
--- a/default_images/svx/res/frh011.png
+++ b/ooo_custom_images/hicontrast/svx/res/fr011.png
diff --git a/default_images/svx/res/frh012.png b/ooo_custom_images/hicontrast/svx/res/fr012.png
index 0a358a228649..0a358a228649 100644
--- a/default_images/svx/res/frh012.png
+++ b/ooo_custom_images/hicontrast/svx/res/fr012.png
diff --git a/default_images/svx/res/frh02.png b/ooo_custom_images/hicontrast/svx/res/fr02.png
index e22daed08de3..e22daed08de3 100644
--- a/default_images/svx/res/frh02.png
+++ b/ooo_custom_images/hicontrast/svx/res/fr02.png
diff --git a/default_images/svx/res/frh03.png b/ooo_custom_images/hicontrast/svx/res/fr03.png
index cf2e5ff6cc92..cf2e5ff6cc92 100644
--- a/default_images/svx/res/frh03.png
+++ b/ooo_custom_images/hicontrast/svx/res/fr03.png
diff --git a/default_images/svx/res/frh04.png b/ooo_custom_images/hicontrast/svx/res/fr04.png
index 678f886445e7..678f886445e7 100644
--- a/default_images/svx/res/frh04.png
+++ b/ooo_custom_images/hicontrast/svx/res/fr04.png
diff --git a/default_images/svx/res/frh05.png b/ooo_custom_images/hicontrast/svx/res/fr05.png
index f606dd3d7b30..f606dd3d7b30 100644
--- a/default_images/svx/res/frh05.png
+++ b/ooo_custom_images/hicontrast/svx/res/fr05.png
diff --git a/default_images/svx/res/frh06.png b/ooo_custom_images/hicontrast/svx/res/fr06.png
index a775d2969739..a775d2969739 100644
--- a/default_images/svx/res/frh06.png
+++ b/ooo_custom_images/hicontrast/svx/res/fr06.png
diff --git a/default_images/svx/res/frh07.png b/ooo_custom_images/hicontrast/svx/res/fr07.png
index 277ef7493865..277ef7493865 100644
--- a/default_images/svx/res/frh07.png
+++ b/ooo_custom_images/hicontrast/svx/res/fr07.png
diff --git a/default_images/svx/res/frh08.png b/ooo_custom_images/hicontrast/svx/res/fr08.png
index 9eac2c23b99f..9eac2c23b99f 100644
--- a/default_images/svx/res/frh08.png
+++ b/ooo_custom_images/hicontrast/svx/res/fr08.png
diff --git a/default_images/svx/res/frh09.png b/ooo_custom_images/hicontrast/svx/res/fr09.png
index 3941b586a9f8..3941b586a9f8 100644
--- a/default_images/svx/res/frh09.png
+++ b/ooo_custom_images/hicontrast/svx/res/fr09.png
diff --git a/default_images/svx/res/fwh01.png b/ooo_custom_images/hicontrast/svx/res/fw01.png
index 2ce6b9ad5329..2ce6b9ad5329 100644
--- a/default_images/svx/res/fwh01.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw01.png
diff --git a/default_images/svx/res/fwh010.png b/ooo_custom_images/hicontrast/svx/res/fw010.png
index 2a8fd784ecce..2a8fd784ecce 100644
--- a/default_images/svx/res/fwh010.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw010.png
diff --git a/default_images/svx/res/fwh011.png b/ooo_custom_images/hicontrast/svx/res/fw011.png
index fdeaa4eae1d4..fdeaa4eae1d4 100644
--- a/default_images/svx/res/fwh011.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw011.png
diff --git a/default_images/svx/res/fwh012.png b/ooo_custom_images/hicontrast/svx/res/fw012.png
index a294ae9f51c6..a294ae9f51c6 100644
--- a/default_images/svx/res/fwh012.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw012.png
diff --git a/default_images/svx/res/fwh013.png b/ooo_custom_images/hicontrast/svx/res/fw013.png
index 67dfcbe9d7fa..67dfcbe9d7fa 100644
--- a/default_images/svx/res/fwh013.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw013.png
diff --git a/default_images/svx/res/fwh014.png b/ooo_custom_images/hicontrast/svx/res/fw014.png
index 45197a5a9f6f..45197a5a9f6f 100644
--- a/default_images/svx/res/fwh014.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw014.png
diff --git a/default_images/svx/res/fwh015.png b/ooo_custom_images/hicontrast/svx/res/fw015.png
index 2ec39a2a1892..2ec39a2a1892 100644
--- a/default_images/svx/res/fwh015.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw015.png
diff --git a/default_images/svx/res/fwh016.png b/ooo_custom_images/hicontrast/svx/res/fw016.png
index 276fefa5e6ba..276fefa5e6ba 100644
--- a/default_images/svx/res/fwh016.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw016.png
diff --git a/default_images/svx/res/fwh017.png b/ooo_custom_images/hicontrast/svx/res/fw017.png
index 6dcdd3750c4d..6dcdd3750c4d 100644
--- a/default_images/svx/res/fwh017.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw017.png
diff --git a/default_images/svx/res/fwh018.png b/ooo_custom_images/hicontrast/svx/res/fw018.png
index aa76e92dae8d..aa76e92dae8d 100644
--- a/default_images/svx/res/fwh018.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw018.png
diff --git a/default_images/svx/res/fwh019.png b/ooo_custom_images/hicontrast/svx/res/fw019.png
index b696e0b0fdc9..b696e0b0fdc9 100644
--- a/default_images/svx/res/fwh019.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw019.png
diff --git a/default_images/svx/res/fwh02.png b/ooo_custom_images/hicontrast/svx/res/fw02.png
index 447c15043952..447c15043952 100644
--- a/default_images/svx/res/fwh02.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw02.png
diff --git a/default_images/svx/res/fwh020.png b/ooo_custom_images/hicontrast/svx/res/fw020.png
index cddaefb1ccf7..cddaefb1ccf7 100644
--- a/default_images/svx/res/fwh020.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw020.png
diff --git a/default_images/svx/res/fwh021.png b/ooo_custom_images/hicontrast/svx/res/fw021.png
index ca54848c415a..ca54848c415a 100644
--- a/default_images/svx/res/fwh021.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw021.png
diff --git a/default_images/svx/res/fwh03.png b/ooo_custom_images/hicontrast/svx/res/fw03.png
index d0242472ba2d..d0242472ba2d 100644
--- a/default_images/svx/res/fwh03.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw03.png
diff --git a/default_images/svx/res/fwh04.png b/ooo_custom_images/hicontrast/svx/res/fw04.png
index b72fdb5afaab..b72fdb5afaab 100644
--- a/default_images/svx/res/fwh04.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw04.png
diff --git a/default_images/svx/res/fwh05.png b/ooo_custom_images/hicontrast/svx/res/fw05.png
index 71d5a76bae4b..71d5a76bae4b 100644
--- a/default_images/svx/res/fwh05.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw05.png
diff --git a/default_images/svx/res/fwh06.png b/ooo_custom_images/hicontrast/svx/res/fw06.png
index ff9da0da3b53..ff9da0da3b53 100644
--- a/default_images/svx/res/fwh06.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw06.png
diff --git a/default_images/svx/res/fwh07.png b/ooo_custom_images/hicontrast/svx/res/fw07.png
index 5a08dda34bec..5a08dda34bec 100644
--- a/default_images/svx/res/fwh07.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw07.png
diff --git a/default_images/svx/res/fwh08.png b/ooo_custom_images/hicontrast/svx/res/fw08.png
index 43d3b35925c1..43d3b35925c1 100644
--- a/default_images/svx/res/fwh08.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw08.png
diff --git a/default_images/svx/res/fwh09.png b/ooo_custom_images/hicontrast/svx/res/fw09.png
index 7cac299dde81..7cac299dde81 100644
--- a/default_images/svx/res/fwh09.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw09.png
diff --git a/default_images/svx/res/fwbhcirc_h.png b/ooo_custom_images/hicontrast/svx/res/fwbhcirc.png
index be02c6745c6c..be02c6745c6c 100644
--- a/default_images/svx/res/fwbhcirc_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fwbhcirc.png
diff --git a/default_images/svx/res/fwbotarc_h.png b/ooo_custom_images/hicontrast/svx/res/fwbotarc.png
index 7e1adaa8ab3e..7e1adaa8ab3e 100644
--- a/default_images/svx/res/fwbotarc_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fwbotarc.png
diff --git a/default_images/svx/res/fwbuttn1_h.png b/ooo_custom_images/hicontrast/svx/res/fwbuttn1.png
index 009a9ea192e4..009a9ea192e4 100644
--- a/default_images/svx/res/fwbuttn1_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fwbuttn1.png
diff --git a/default_images/svx/res/fwbuttn2_h.png b/ooo_custom_images/hicontrast/svx/res/fwbuttn2.png
index 265716121c31..265716121c31 100644
--- a/default_images/svx/res/fwbuttn2_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fwbuttn2.png
diff --git a/default_images/svx/res/fwbuttn3_h.png b/ooo_custom_images/hicontrast/svx/res/fwbuttn3.png
index de1b25a6f8a4..de1b25a6f8a4 100644
--- a/default_images/svx/res/fwbuttn3_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fwbuttn3.png
diff --git a/default_images/svx/res/fwbuttn4_h.png b/ooo_custom_images/hicontrast/svx/res/fwbuttn4.png
index 4cb545a5a7b2..4cb545a5a7b2 100644
--- a/default_images/svx/res/fwbuttn4_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fwbuttn4.png
diff --git a/default_images/svx/res/fwlftarc_h.png b/ooo_custom_images/hicontrast/svx/res/fwlftarc.png
index e41ae4cf0bbe..e41ae4cf0bbe 100644
--- a/default_images/svx/res/fwlftarc_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fwlftarc.png
diff --git a/default_images/svx/res/fwlhcirc_h.png b/ooo_custom_images/hicontrast/svx/res/fwlhcirc.png
index fee3758dd326..fee3758dd326 100644
--- a/default_images/svx/res/fwlhcirc_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fwlhcirc.png
diff --git a/default_images/svx/res/fwrgtarc_h.png b/ooo_custom_images/hicontrast/svx/res/fwrgtarc.png
index 6109b1f8f8c9..6109b1f8f8c9 100644
--- a/default_images/svx/res/fwrgtarc_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fwrgtarc.png
diff --git a/default_images/svx/res/fwrhcirc_h.png b/ooo_custom_images/hicontrast/svx/res/fwrhcirc.png
index c0cac6a936da..c0cac6a936da 100644
--- a/default_images/svx/res/fwrhcirc_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fwrhcirc.png
diff --git a/default_images/svx/res/fwtoparc_h.png b/ooo_custom_images/hicontrast/svx/res/fwtoparc.png
index 77c4d6760e96..77c4d6760e96 100644
--- a/default_images/svx/res/fwtoparc_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fwtoparc.png
diff --git a/default_images/svx/res/galicon_h.png b/ooo_custom_images/hicontrast/svx/res/galicon.png
index 82a6196cb54e..82a6196cb54e 100644
--- a/default_images/svx/res/galicon_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/galicon.png
diff --git a/default_images/svx/res/gallist_h.png b/ooo_custom_images/hicontrast/svx/res/gallist.png
index 1ed927c3a420..1ed927c3a420 100644
--- a/default_images/svx/res/gallist_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/gallist.png
diff --git a/default_images/svx/res/idh01.png b/ooo_custom_images/hicontrast/svx/res/id01.png
index 8e8349020a11..8e8349020a11 100644
--- a/default_images/svx/res/idh01.png
+++ b/ooo_custom_images/hicontrast/svx/res/id01.png
diff --git a/default_images/svx/res/idh016.png b/ooo_custom_images/hicontrast/svx/res/id016.png
index 1f1649abaf61..1f1649abaf61 100644
--- a/default_images/svx/res/idh016.png
+++ b/ooo_custom_images/hicontrast/svx/res/id016.png
diff --git a/default_images/svx/res/idh018.png b/ooo_custom_images/hicontrast/svx/res/id018.png
index 6017e465ef49..6017e465ef49 100644
--- a/default_images/svx/res/idh018.png
+++ b/ooo_custom_images/hicontrast/svx/res/id018.png
diff --git a/default_images/svx/res/idh019.png b/ooo_custom_images/hicontrast/svx/res/id019.png
index 5fb1890f3a27..5fb1890f3a27 100644
--- a/default_images/svx/res/idh019.png
+++ b/ooo_custom_images/hicontrast/svx/res/id019.png
diff --git a/default_images/svx/res/idh02.png b/ooo_custom_images/hicontrast/svx/res/id02.png
index 892919bfea2a..892919bfea2a 100644
--- a/default_images/svx/res/idh02.png
+++ b/ooo_custom_images/hicontrast/svx/res/id02.png
diff --git a/default_images/svx/res/idh03.png b/ooo_custom_images/hicontrast/svx/res/id03.png
index b8914b52f420..b8914b52f420 100644
--- a/default_images/svx/res/idh03.png
+++ b/ooo_custom_images/hicontrast/svx/res/id03.png
diff --git a/default_images/svx/res/idh030.png b/ooo_custom_images/hicontrast/svx/res/id030.png
index 7c66ef255c96..7c66ef255c96 100644
--- a/default_images/svx/res/idh030.png
+++ b/ooo_custom_images/hicontrast/svx/res/id030.png
diff --git a/default_images/svx/res/idh031.png b/ooo_custom_images/hicontrast/svx/res/id031.png
index d238cf2a1528..d238cf2a1528 100644
--- a/default_images/svx/res/idh031.png
+++ b/ooo_custom_images/hicontrast/svx/res/id031.png
diff --git a/default_images/svx/res/idh032.png b/ooo_custom_images/hicontrast/svx/res/id032.png
index 8a4899be66f7..8a4899be66f7 100644
--- a/default_images/svx/res/idh032.png
+++ b/ooo_custom_images/hicontrast/svx/res/id032.png
diff --git a/default_images/svx/res/idh033.png b/ooo_custom_images/hicontrast/svx/res/id033.png
index 5a10792da5ab..5a10792da5ab 100644
--- a/default_images/svx/res/idh033.png
+++ b/ooo_custom_images/hicontrast/svx/res/id033.png
diff --git a/default_images/svx/res/idh04.png b/ooo_custom_images/hicontrast/svx/res/id04.png
index f8d2ff0a175e..f8d2ff0a175e 100644
--- a/default_images/svx/res/idh04.png
+++ b/ooo_custom_images/hicontrast/svx/res/id04.png
diff --git a/default_images/svx/res/idh040.png b/ooo_custom_images/hicontrast/svx/res/id040.png
index 01ad92a6beb8..01ad92a6beb8 100644
--- a/default_images/svx/res/idh040.png
+++ b/ooo_custom_images/hicontrast/svx/res/id040.png
diff --git a/default_images/svx/res/idh041.png b/ooo_custom_images/hicontrast/svx/res/id041.png
index b615045b0893..b615045b0893 100644
--- a/default_images/svx/res/idh041.png
+++ b/ooo_custom_images/hicontrast/svx/res/id041.png
diff --git a/default_images/svx/res/idh05.png b/ooo_custom_images/hicontrast/svx/res/id05.png
index 05498575b823..05498575b823 100644
--- a/default_images/svx/res/idh05.png
+++ b/ooo_custom_images/hicontrast/svx/res/id05.png
diff --git a/default_images/svx/res/idh06.png b/ooo_custom_images/hicontrast/svx/res/id06.png
index 9184f1ab3493..9184f1ab3493 100644
--- a/default_images/svx/res/idh06.png
+++ b/ooo_custom_images/hicontrast/svx/res/id06.png
diff --git a/default_images/svx/res/idh07.png b/ooo_custom_images/hicontrast/svx/res/id07.png
index 6fd579d69242..6fd579d69242 100644
--- a/default_images/svx/res/idh07.png
+++ b/ooo_custom_images/hicontrast/svx/res/id07.png
diff --git a/default_images/svx/res/idh08.png b/ooo_custom_images/hicontrast/svx/res/id08.png
index 257bdd3d0e4f..257bdd3d0e4f 100644
--- a/default_images/svx/res/idh08.png
+++ b/ooo_custom_images/hicontrast/svx/res/id08.png
diff --git a/default_images/svx/res/invert3d_h.png b/ooo_custom_images/hicontrast/svx/res/invert3d.png
index e6c21d9e17c5..e6c21d9e17c5 100644
--- a/default_images/svx/res/invert3d_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/invert3d.png
diff --git a/default_images/svx/res/legtyp1_hc.png b/ooo_custom_images/hicontrast/svx/res/legtyp1.png
index 34a38d466330..34a38d466330 100644
--- a/default_images/svx/res/legtyp1_hc.png
+++ b/ooo_custom_images/hicontrast/svx/res/legtyp1.png
diff --git a/default_images/svx/res/legtyp2_hc.png b/ooo_custom_images/hicontrast/svx/res/legtyp2.png
index 661509380615..661509380615 100644
--- a/default_images/svx/res/legtyp2_hc.png
+++ b/ooo_custom_images/hicontrast/svx/res/legtyp2.png
diff --git a/default_images/svx/res/legtyp3_hc.png b/ooo_custom_images/hicontrast/svx/res/legtyp3.png
index 9c1f28617ba3..9c1f28617ba3 100644
--- a/default_images/svx/res/legtyp3_hc.png
+++ b/ooo_custom_images/hicontrast/svx/res/legtyp3.png
diff --git a/default_images/svx/res/legtyp4_hc.png b/ooo_custom_images/hicontrast/svx/res/legtyp4.png
index e5b736f13995..e5b736f13995 100644
--- a/default_images/svx/res/legtyp4_hc.png
+++ b/ooo_custom_images/hicontrast/svx/res/legtyp4.png
diff --git a/default_images/svx/res/lght2sid_h.png b/ooo_custom_images/hicontrast/svx/res/lght2sid.png
index ad6a4bc467d4..ad6a4bc467d4 100644
--- a/default_images/svx/res/lght2sid_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lght2sid.png
diff --git a/default_images/svx/res/light_h.png b/ooo_custom_images/hicontrast/svx/res/light.png
index ea435a2467b3..ea435a2467b3 100644
--- a/default_images/svx/res/light_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/light.png
diff --git a/default_images/svx/res/lightfrombottom_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightfrombottom_22.png
index 4cf6656ba22d..4cf6656ba22d 100644
--- a/default_images/svx/res/lightfrombottom_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightfrombottom_22.png
diff --git a/default_images/svx/res/lightfrombottomleft_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightfrombottomleft_22.png
index 3e7d1426aaa6..3e7d1426aaa6 100644
--- a/default_images/svx/res/lightfrombottomleft_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightfrombottomleft_22.png
diff --git a/default_images/svx/res/lightfrombottomright_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightfrombottomright_22.png
index 96830b0b4030..96830b0b4030 100644
--- a/default_images/svx/res/lightfrombottomright_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightfrombottomright_22.png
diff --git a/default_images/svx/res/lightfromfront_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightfromfront_22.png
index 565886e450a0..565886e450a0 100644
--- a/default_images/svx/res/lightfromfront_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightfromfront_22.png
diff --git a/default_images/svx/res/lightfromleft_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightfromleft_22.png
index cb2f451435ac..cb2f451435ac 100644
--- a/default_images/svx/res/lightfromleft_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightfromleft_22.png
diff --git a/default_images/svx/res/lightfromright_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightfromright_22.png
index cffaf73854f2..cffaf73854f2 100644
--- a/default_images/svx/res/lightfromright_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightfromright_22.png
diff --git a/default_images/svx/res/lightfromtop_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightfromtop_22.png
index 5f5a6c18588a..5f5a6c18588a 100644
--- a/default_images/svx/res/lightfromtop_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightfromtop_22.png
diff --git a/default_images/svx/res/lightfromtopleft_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightfromtopleft_22.png
index e1de1e7697a9..e1de1e7697a9 100644
--- a/default_images/svx/res/lightfromtopleft_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightfromtopleft_22.png
diff --git a/default_images/svx/res/lightfromtopright_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightfromtopright_22.png
index 14e0ee993a0c..14e0ee993a0c 100644
--- a/default_images/svx/res/lightfromtopright_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightfromtopright_22.png
diff --git a/default_images/svx/res/lightofffrombottom_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightofffrombottom_22.png
index 1173a24e8cfb..1173a24e8cfb 100644
--- a/default_images/svx/res/lightofffrombottom_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightofffrombottom_22.png
diff --git a/default_images/svx/res/lightofffrombottomleft_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightofffrombottomleft_22.png
index 3640bad7e098..3640bad7e098 100644
--- a/default_images/svx/res/lightofffrombottomleft_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightofffrombottomleft_22.png
diff --git a/default_images/svx/res/lightofffrombottomright_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightofffrombottomright_22.png
index ea12a1de497f..ea12a1de497f 100644
--- a/default_images/svx/res/lightofffrombottomright_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightofffrombottomright_22.png
diff --git a/default_images/svx/res/lightofffromleft_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightofffromleft_22.png
index 259556796bf9..259556796bf9 100644
--- a/default_images/svx/res/lightofffromleft_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightofffromleft_22.png
diff --git a/default_images/svx/res/lightofffromright_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightofffromright_22.png
index 42976c0df495..42976c0df495 100644
--- a/default_images/svx/res/lightofffromright_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightofffromright_22.png
diff --git a/default_images/svx/res/lightofffromtop_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightofffromtop_22.png
index 2fc8f20bd7b9..2fc8f20bd7b9 100644
--- a/default_images/svx/res/lightofffromtop_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightofffromtop_22.png
diff --git a/default_images/svx/res/lightofffromtopleft_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightofffromtopleft_22.png
index a1b4460c3498..a1b4460c3498 100644
--- a/default_images/svx/res/lightofffromtopleft_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightofffromtopleft_22.png
diff --git a/default_images/svx/res/lightofffromtopright_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightofffromtopright_22.png
index 26664aff67a7..26664aff67a7 100644
--- a/default_images/svx/res/lightofffromtopright_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightofffromtopright_22.png
diff --git a/default_images/svx/res/lighton_h.png b/ooo_custom_images/hicontrast/svx/res/lighton.png
index cf44426be78e..cf44426be78e 100644
--- a/default_images/svx/res/lighton_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lighton.png
diff --git a/default_images/svx/res/lightonfrombottom_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightonfrombottom_22.png
index 184797cc51cd..184797cc51cd 100644
--- a/default_images/svx/res/lightonfrombottom_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightonfrombottom_22.png
diff --git a/default_images/svx/res/lightonfrombottomleft_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightonfrombottomleft_22.png
index 248b865b7687..248b865b7687 100644
--- a/default_images/svx/res/lightonfrombottomleft_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightonfrombottomleft_22.png
diff --git a/default_images/svx/res/lightonfrombottomright_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightonfrombottomright_22.png
index 08951bc4f73e..08951bc4f73e 100644
--- a/default_images/svx/res/lightonfrombottomright_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightonfrombottomright_22.png
diff --git a/default_images/svx/res/lightonfromleft_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightonfromleft_22.png
index 7b3af7158f6a..7b3af7158f6a 100644
--- a/default_images/svx/res/lightonfromleft_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightonfromleft_22.png
diff --git a/default_images/svx/res/lightonfromright_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightonfromright_22.png
index b450fe8408e8..b450fe8408e8 100644
--- a/default_images/svx/res/lightonfromright_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightonfromright_22.png
diff --git a/default_images/svx/res/lightonfromtop_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightonfromtop_22.png
index f75958c4d6f1..f75958c4d6f1 100644
--- a/default_images/svx/res/lightonfromtop_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightonfromtop_22.png
diff --git a/default_images/svx/res/lightonfromtopleft_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightonfromtopleft_22.png
index d36b1e49290e..d36b1e49290e 100644
--- a/default_images/svx/res/lightonfromtopleft_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightonfromtopleft_22.png
diff --git a/default_images/svx/res/lightonfromtopright_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightonfromtopright_22.png
index 702161c3610c..702161c3610c 100644
--- a/default_images/svx/res/lightonfromtopright_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightonfromtopright_22.png
diff --git a/default_images/svx/res/lngcheck_h.png b/ooo_custom_images/hicontrast/svx/res/lngcheck.png
index 0b24a24d7fcc..0b24a24d7fcc 100644
--- a/default_images/svx/res/lngcheck_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lngcheck.png
diff --git a/default_images/svx/res/loh01.png b/ooo_custom_images/hicontrast/svx/res/lo01.png
index 8a307f49d100..8a307f49d100 100644
--- a/default_images/svx/res/loh01.png
+++ b/ooo_custom_images/hicontrast/svx/res/lo01.png
diff --git a/default_images/svx/res/loh02.png b/ooo_custom_images/hicontrast/svx/res/lo02.png
index f68ef5a0c2cc..f68ef5a0c2cc 100644
--- a/default_images/svx/res/loh02.png
+++ b/ooo_custom_images/hicontrast/svx/res/lo02.png
diff --git a/default_images/svx/res/loh03.png b/ooo_custom_images/hicontrast/svx/res/lo03.png
index 3f1e0d88e682..3f1e0d88e682 100644
--- a/default_images/svx/res/loh03.png
+++ b/ooo_custom_images/hicontrast/svx/res/lo03.png
diff --git a/default_images/svx/res/luminanc_h.png b/ooo_custom_images/hicontrast/svx/res/luminanc.png
index 4376c3b52e3a..4376c3b52e3a 100644
--- a/default_images/svx/res/luminanc_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/luminanc.png
diff --git a/default_images/svx/res/material_h.png b/ooo_custom_images/hicontrast/svx/res/material.png
index 426d553d7551..426d553d7551 100644
--- a/default_images/svx/res/material_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/material.png
diff --git a/default_images/svx/res/matte_16_h.png b/ooo_custom_images/hicontrast/svx/res/matte_16.png
index 4fd39727f499..4fd39727f499 100644
--- a/default_images/svx/res/matte_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/matte_16.png
diff --git a/default_images/svx/res/metal_16_h.png b/ooo_custom_images/hicontrast/svx/res/metal_16.png
index 1c527189b747..1c527189b747 100644
--- a/default_images/svx/res/metal_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/metal_16.png
diff --git a/default_images/svx/res/minus_h.png b/ooo_custom_images/hicontrast/svx/res/minus.png
index a20fa183ab01..a20fa183ab01 100644
--- a/default_images/svx/res/minus_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/minus.png
diff --git a/default_images/svx/res/modula3d_h.png b/ooo_custom_images/hicontrast/svx/res/modula3d.png
index 4226bf1d784b..4226bf1d784b 100644
--- a/default_images/svx/res/modula3d_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/modula3d.png
diff --git a/default_images/svx/res/navigationball_10_h.png b/ooo_custom_images/hicontrast/svx/res/navigationball_10.png
index ccb8a537ed82..ccb8a537ed82 100644
--- a/default_images/svx/res/navigationball_10_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/navigationball_10.png
diff --git a/default_images/svx/res/normallit_16_h.png b/ooo_custom_images/hicontrast/svx/res/normallit_16.png
index dfee759b1180..dfee759b1180 100644
--- a/default_images/svx/res/normallit_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/normallit_16.png
diff --git a/default_images/svx/res/normflat_h.png b/ooo_custom_images/hicontrast/svx/res/normflat.png
index 1893a8f122fa..1893a8f122fa 100644
--- a/default_images/svx/res/normflat_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/normflat.png
diff --git a/default_images/svx/res/normobjs_h.png b/ooo_custom_images/hicontrast/svx/res/normobjs.png
index 3d7cf65ac2ee..3d7cf65ac2ee 100644
--- a/default_images/svx/res/normobjs_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/normobjs.png
diff --git a/default_images/svx/res/normsphe_h.png b/ooo_custom_images/hicontrast/svx/res/normsphe.png
index 8ff9f34c7ba2..8ff9f34c7ba2 100644
--- a/default_images/svx/res/normsphe_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/normsphe.png
diff --git a/default_images/svx/res/notcertificate_16_h.png b/ooo_custom_images/hicontrast/svx/res/notcertificate_16.png
index 1312a39df82f..1312a39df82f 100644
--- a/default_images/svx/res/notcertificate_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/notcertificate_16.png
diff --git a/default_images/svx/res/nuh01.png b/ooo_custom_images/hicontrast/svx/res/nu01.png
index 6a3fc1144739..6a3fc1144739 100644
--- a/default_images/svx/res/nuh01.png
+++ b/ooo_custom_images/hicontrast/svx/res/nu01.png
diff --git a/default_images/svx/res/nuh02.png b/ooo_custom_images/hicontrast/svx/res/nu02.png
index 7dee70d951b0..7dee70d951b0 100644
--- a/default_images/svx/res/nuh02.png
+++ b/ooo_custom_images/hicontrast/svx/res/nu02.png
diff --git a/default_images/svx/res/nuh03.png b/ooo_custom_images/hicontrast/svx/res/nu03.png
index e284986fec4d..e284986fec4d 100644
--- a/default_images/svx/res/nuh03.png
+++ b/ooo_custom_images/hicontrast/svx/res/nu03.png
diff --git a/default_images/svx/res/nuh04.png b/ooo_custom_images/hicontrast/svx/res/nu04.png
index 3f562c91166c..3f562c91166c 100644
--- a/default_images/svx/res/nuh04.png
+++ b/ooo_custom_images/hicontrast/svx/res/nu04.png
diff --git a/default_images/svx/res/objspc3d_h.png b/ooo_custom_images/hicontrast/svx/res/objspc3d.png
index b7d17157aede..b7d17157aede 100644
--- a/default_images/svx/res/objspc3d_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/objspc3d.png
diff --git a/default_images/svx/res/odfwarning_h.png b/ooo_custom_images/hicontrast/svx/res/odfwarning.png
index e0c029a84836..e0c029a84836 100644
--- a/default_images/svx/res/odfwarning_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/odfwarning.png
diff --git a/default_images/svx/res/parallel_h.png b/ooo_custom_images/hicontrast/svx/res/parallel.png
index 1532063a0d1b..1532063a0d1b 100644
--- a/default_images/svx/res/parallel_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/parallel.png
diff --git a/default_images/svx/res/parallel_16_h.png b/ooo_custom_images/hicontrast/svx/res/parallel_16.png
index fbbcc0e46a04..fbbcc0e46a04 100644
--- a/default_images/svx/res/parallel_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/parallel_16.png
diff --git a/default_images/svx/res/persp3d_h.png b/ooo_custom_images/hicontrast/svx/res/persp3d.png
index 8da70a0e20a4..8da70a0e20a4 100644
--- a/default_images/svx/res/persp3d_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/persp3d.png
diff --git a/default_images/svx/res/perspective_16_h.png b/ooo_custom_images/hicontrast/svx/res/perspective_16.png
index 3d80155f01ae..3d80155f01ae 100644
--- a/default_images/svx/res/perspective_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/perspective_16.png
diff --git a/default_images/svx/res/plastic_16_h.png b/ooo_custom_images/hicontrast/svx/res/plastic_16.png
index 7b712bb31752..7b712bb31752 100644
--- a/default_images/svx/res/plastic_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/plastic_16.png
diff --git a/default_images/svx/res/plus_h.png b/ooo_custom_images/hicontrast/svx/res/plus.png
index d4a66c91a2cc..d4a66c91a2cc 100644
--- a/default_images/svx/res/plus_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/plus.png
diff --git a/default_images/svx/res/prh01.png b/ooo_custom_images/hicontrast/svx/res/pr01.png
index 18121b2b9541..18121b2b9541 100644
--- a/default_images/svx/res/prh01.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr01.png
diff --git a/default_images/svx/res/prh010.png b/ooo_custom_images/hicontrast/svx/res/pr010.png
index f95c7cf53aa6..f95c7cf53aa6 100644
--- a/default_images/svx/res/prh010.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr010.png
diff --git a/default_images/svx/res/prh011.png b/ooo_custom_images/hicontrast/svx/res/pr011.png
index fef4c3a77495..fef4c3a77495 100644
--- a/default_images/svx/res/prh011.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr011.png
diff --git a/default_images/svx/res/prh012.png b/ooo_custom_images/hicontrast/svx/res/pr012.png
index bb1389b39272..bb1389b39272 100644
--- a/default_images/svx/res/prh012.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr012.png
diff --git a/default_images/svx/res/prh013.png b/ooo_custom_images/hicontrast/svx/res/pr013.png
index 36f627c86360..36f627c86360 100644
--- a/default_images/svx/res/prh013.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr013.png
diff --git a/default_images/svx/res/prh014.png b/ooo_custom_images/hicontrast/svx/res/pr014.png
index ab6f46b80f8b..ab6f46b80f8b 100644
--- a/default_images/svx/res/prh014.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr014.png
diff --git a/default_images/svx/res/prh015.png b/ooo_custom_images/hicontrast/svx/res/pr015.png
index 9abe5417e3ae..9abe5417e3ae 100644
--- a/default_images/svx/res/prh015.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr015.png
diff --git a/default_images/svx/res/prh016.png b/ooo_custom_images/hicontrast/svx/res/pr016.png
index d337ac7afd7e..d337ac7afd7e 100644
--- a/default_images/svx/res/prh016.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr016.png
diff --git a/default_images/svx/res/prh017.png b/ooo_custom_images/hicontrast/svx/res/pr017.png
index 326e0086a4f5..326e0086a4f5 100644
--- a/default_images/svx/res/prh017.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr017.png
diff --git a/default_images/svx/res/prh018.png b/ooo_custom_images/hicontrast/svx/res/pr018.png
index cbfdf8515351..cbfdf8515351 100644
--- a/default_images/svx/res/prh018.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr018.png
diff --git a/default_images/svx/res/prh019.png b/ooo_custom_images/hicontrast/svx/res/pr019.png
index 8ebb5c25dffc..8ebb5c25dffc 100644
--- a/default_images/svx/res/prh019.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr019.png
diff --git a/default_images/svx/res/prh02.png b/ooo_custom_images/hicontrast/svx/res/pr02.png
index f9cf727c897e..f9cf727c897e 100644
--- a/default_images/svx/res/prh02.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr02.png
diff --git a/default_images/svx/res/prh020.png b/ooo_custom_images/hicontrast/svx/res/pr020.png
index 11e031854ff5..11e031854ff5 100644
--- a/default_images/svx/res/prh020.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr020.png
diff --git a/default_images/svx/res/prh021.png b/ooo_custom_images/hicontrast/svx/res/pr021.png
index d5e757a1166a..d5e757a1166a 100644
--- a/default_images/svx/res/prh021.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr021.png
diff --git a/default_images/svx/res/prh03.png b/ooo_custom_images/hicontrast/svx/res/pr03.png
index 637217f5291e..637217f5291e 100644
--- a/default_images/svx/res/prh03.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr03.png
diff --git a/default_images/svx/res/prh04.png b/ooo_custom_images/hicontrast/svx/res/pr04.png
index 128f1aba0dda..128f1aba0dda 100644
--- a/default_images/svx/res/prh04.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr04.png
diff --git a/default_images/svx/res/prh05.png b/ooo_custom_images/hicontrast/svx/res/pr05.png
index 19eda99915e6..19eda99915e6 100644
--- a/default_images/svx/res/prh05.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr05.png
diff --git a/default_images/svx/res/prh06.png b/ooo_custom_images/hicontrast/svx/res/pr06.png
index 06221a78c14d..06221a78c14d 100644
--- a/default_images/svx/res/prh06.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr06.png
diff --git a/default_images/svx/res/prh07.png b/ooo_custom_images/hicontrast/svx/res/pr07.png
index 17f0889b21b7..17f0889b21b7 100644
--- a/default_images/svx/res/prh07.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr07.png
diff --git a/default_images/svx/res/prh08.png b/ooo_custom_images/hicontrast/svx/res/pr08.png
index bcd501a1059f..bcd501a1059f 100644
--- a/default_images/svx/res/prh08.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr08.png
diff --git a/default_images/svx/res/prh09.png b/ooo_custom_images/hicontrast/svx/res/pr09.png
index 22e7b5a3f0bd..22e7b5a3f0bd 100644
--- a/default_images/svx/res/prh09.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr09.png
diff --git a/default_images/svx/res/replac3d_h.png b/ooo_custom_images/hicontrast/svx/res/replac3d.png
index e682e178de49..e682e178de49 100644
--- a/default_images/svx/res/replac3d_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/replac3d.png
diff --git a/default_images/svx/res/rotate3d_h.png b/ooo_custom_images/hicontrast/svx/res/rotate3d.png
index 0e4857f74f75..0e4857f74f75 100644
--- a/default_images/svx/res/rotate3d_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/rotate3d.png
diff --git a/default_images/svx/res/sc10350_h.png b/ooo_custom_images/hicontrast/svx/res/sc10350.png
index 21623ab7ba59..21623ab7ba59 100644
--- a/default_images/svx/res/sc10350_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/sc10350.png
diff --git a/default_images/svx/res/shh01.png b/ooo_custom_images/hicontrast/svx/res/sh01.png
index a9ce630a0feb..a9ce630a0feb 100644
--- a/default_images/svx/res/shh01.png
+++ b/ooo_custom_images/hicontrast/svx/res/sh01.png
diff --git a/default_images/svx/res/shh02.png b/ooo_custom_images/hicontrast/svx/res/sh02.png
index c7f383a340a5..c7f383a340a5 100644
--- a/default_images/svx/res/shh02.png
+++ b/ooo_custom_images/hicontrast/svx/res/sh02.png
diff --git a/default_images/svx/res/shh03.png b/ooo_custom_images/hicontrast/svx/res/sh03.png
index 783370fc3baa..783370fc3baa 100644
--- a/default_images/svx/res/shh03.png
+++ b/ooo_custom_images/hicontrast/svx/res/sh03.png
diff --git a/default_images/svx/res/shh04.png b/ooo_custom_images/hicontrast/svx/res/sh04.png
index f32ae3a84d8a..f32ae3a84d8a 100644
--- a/default_images/svx/res/shh04.png
+++ b/ooo_custom_images/hicontrast/svx/res/sh04.png
diff --git a/default_images/svx/res/shh05.png b/ooo_custom_images/hicontrast/svx/res/sh05.png
index 80edcf5bd3a3..80edcf5bd3a3 100644
--- a/default_images/svx/res/shh05.png
+++ b/ooo_custom_images/hicontrast/svx/res/sh05.png
diff --git a/default_images/svx/res/shadow3d_h.png b/ooo_custom_images/hicontrast/svx/res/shadow3d.png
index f3e07c6f23ef..f3e07c6f23ef 100644
--- a/default_images/svx/res/shadow3d_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/shadow3d.png
diff --git a/default_images/svx/res/signet_11x16_h.png b/ooo_custom_images/hicontrast/svx/res/signet_11x16.png
index 677056800182..677056800182 100644
--- a/default_images/svx/res/signet_11x16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/signet_11x16.png
diff --git a/default_images/svx/res/slidezoomin_11_h.png b/ooo_custom_images/hicontrast/svx/res/slidezoomin_11.png
index 67a0bf12ffbe..67a0bf12ffbe 100644
--- a/default_images/svx/res/slidezoomin_11_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/slidezoomin_11.png
diff --git a/default_images/svx/res/slidezoomout_11_h.png b/ooo_custom_images/hicontrast/svx/res/slidezoomout_11.png
index b2dabbd9f2da..b2dabbd9f2da 100644
--- a/default_images/svx/res/slidezoomout_11_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/slidezoomout_11.png
diff --git a/default_images/svx/res/sphere3d_h.png b/ooo_custom_images/hicontrast/svx/res/sphere3d.png
index abe92eba9e9b..abe92eba9e9b 100644
--- a/default_images/svx/res/sphere3d_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/sphere3d.png
diff --git a/default_images/svx/res/time_h.png b/ooo_custom_images/hicontrast/svx/res/time.png
index 960272d313d6..960272d313d6 100644
--- a/default_images/svx/res/time_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/time.png
diff --git a/default_images/svx/res/trh10416.png b/ooo_custom_images/hicontrast/svx/res/tr10416.png
index 6d989683148d..6d989683148d 100644
--- a/default_images/svx/res/trh10416.png
+++ b/ooo_custom_images/hicontrast/svx/res/tr10416.png
diff --git a/default_images/svx/res/trh10432.png b/ooo_custom_images/hicontrast/svx/res/tr10432.png
index 29d6a16bd9b3..29d6a16bd9b3 100644
--- a/default_images/svx/res/trh10432.png
+++ b/ooo_custom_images/hicontrast/svx/res/tr10432.png
diff --git a/default_images/svx/res/trh10433.png b/ooo_custom_images/hicontrast/svx/res/tr10433.png
index 998e40ad5b4c..998e40ad5b4c 100644
--- a/default_images/svx/res/trh10433.png
+++ b/ooo_custom_images/hicontrast/svx/res/tr10433.png
diff --git a/default_images/svx/res/trh10434.png b/ooo_custom_images/hicontrast/svx/res/tr10434.png
index cd4cda358eea..cd4cda358eea 100644
--- a/default_images/svx/res/trh10434.png
+++ b/ooo_custom_images/hicontrast/svx/res/tr10434.png
diff --git a/default_images/svx/res/trh10435.png b/ooo_custom_images/hicontrast/svx/res/tr10435.png
index 7069197fb774..7069197fb774 100644
--- a/default_images/svx/res/trh10435.png
+++ b/ooo_custom_images/hicontrast/svx/res/tr10435.png
diff --git a/default_images/svx/res/trh10436.png b/ooo_custom_images/hicontrast/svx/res/tr10436.png
index 5d8010cc97e4..5d8010cc97e4 100644
--- a/default_images/svx/res/trh10436.png
+++ b/ooo_custom_images/hicontrast/svx/res/tr10436.png
diff --git a/default_images/svx/res/trh10437.png b/ooo_custom_images/hicontrast/svx/res/tr10437.png
index d88c4bdea292..d88c4bdea292 100644
--- a/default_images/svx/res/trh10437.png
+++ b/ooo_custom_images/hicontrast/svx/res/tr10437.png
diff --git a/default_images/svx/res/trh10439.png b/ooo_custom_images/hicontrast/svx/res/tr10439.png
index 945b3bffb616..945b3bffb616 100644
--- a/default_images/svx/res/trh10439.png
+++ b/ooo_custom_images/hicontrast/svx/res/tr10439.png
diff --git a/default_images/svx/res/trh10447.png b/ooo_custom_images/hicontrast/svx/res/tr10447.png
index c5fc94271f0f..c5fc94271f0f 100644
--- a/default_images/svx/res/trh10447.png
+++ b/ooo_custom_images/hicontrast/svx/res/tr10447.png
diff --git a/default_images/svx/res/trh10450.png b/ooo_custom_images/hicontrast/svx/res/tr10450.png
index 2aa3544ddc49..2aa3544ddc49 100644
--- a/default_images/svx/res/trh10450.png
+++ b/ooo_custom_images/hicontrast/svx/res/tr10450.png
diff --git a/default_images/svx/res/trh10452.png b/ooo_custom_images/hicontrast/svx/res/tr10452.png
index 6137a17e93c4..6137a17e93c4 100644
--- a/default_images/svx/res/trh10452.png
+++ b/ooo_custom_images/hicontrast/svx/res/tr10452.png
diff --git a/default_images/svx/res/trh10921.png b/ooo_custom_images/hicontrast/svx/res/tr10921.png
index 764a8422cbc2..764a8422cbc2 100644
--- a/default_images/svx/res/trh10921.png
+++ b/ooo_custom_images/hicontrast/svx/res/tr10921.png
diff --git a/default_images/svx/res/wireframe_16_h.png b/ooo_custom_images/hicontrast/svx/res/wireframe_16.png
index 2ae2ab181897..2ae2ab181897 100644
--- a/default_images/svx/res/wireframe_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/wireframe_16.png
diff --git a/default_images/svx/res/zetlhor2_h.png b/ooo_custom_images/hicontrast/svx/res/zetlhor2.png
index 8d1de8b31c80..8d1de8b31c80 100644
--- a/default_images/svx/res/zetlhor2_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/zetlhor2.png
diff --git a/default_images/svx/res/zetlver2_h.png b/ooo_custom_images/hicontrast/svx/res/zetlver2.png
index 8ede037a99b8..8ede037a99b8 100644
--- a/default_images/svx/res/zetlver2_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/zetlver2.png
diff --git a/default_images/svx/source/svdraw/cropmarkersACC.png b/ooo_custom_images/hicontrast/svx/source/svdraw/cropmarkers.png
index 21c3d32fd4a4..21c3d32fd4a4 100644
--- a/default_images/svx/source/svdraw/cropmarkersACC.png
+++ b/ooo_custom_images/hicontrast/svx/source/svdraw/cropmarkers.png
diff --git a/ooo_custom_images/hicontrast/svx/source/svdraw/cropmarkers2.png b/ooo_custom_images/hicontrast/svx/source/svdraw/cropmarkers2.png
new file mode 100644
index 000000000000..21c3d32fd4a4
--- /dev/null
+++ b/ooo_custom_images/hicontrast/svx/source/svdraw/cropmarkers2.png
diff --git a/default_images/svx/source/svdraw/markersACC.png b/ooo_custom_images/hicontrast/svx/source/svdraw/markers.png
index 4def978fb79b..4def978fb79b 100644
--- a/default_images/svx/source/svdraw/markersACC.png
+++ b/ooo_custom_images/hicontrast/svx/source/svdraw/markers.png
diff --git a/ooo_custom_images/hicontrast/svx/source/svdraw/markers2.png b/ooo_custom_images/hicontrast/svx/source/svdraw/markers2.png
new file mode 100644
index 000000000000..4def978fb79b
--- /dev/null
+++ b/ooo_custom_images/hicontrast/svx/source/svdraw/markers2.png
diff --git a/default_images/sw/imglst/lch20556.png b/ooo_custom_images/hicontrast/sw/imglst/lc20556.png
index 39cfeac7f396..39cfeac7f396 100644
--- a/default_images/sw/imglst/lch20556.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/lc20556.png
diff --git a/default_images/sw/imglst/lch20557.png b/ooo_custom_images/hicontrast/sw/imglst/lc20557.png
index ed3d8f3b68e3..ed3d8f3b68e3 100644
--- a/default_images/sw/imglst/lch20557.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/lc20557.png
diff --git a/default_images/sw/imglst/lch20558.png b/ooo_custom_images/hicontrast/sw/imglst/lc20558.png
index ac65e8fea6fa..ac65e8fea6fa 100644
--- a/default_images/sw/imglst/lch20558.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/lc20558.png
diff --git a/default_images/sw/imglst/nch20000.png b/ooo_custom_images/hicontrast/sw/imglst/nc20000.png
index 415cb797b8e3..415cb797b8e3 100644
--- a/default_images/sw/imglst/nch20000.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/nc20000.png
diff --git a/default_images/sw/imglst/nch20001.png b/ooo_custom_images/hicontrast/sw/imglst/nc20001.png
index d8955c4c2341..d8955c4c2341 100644
--- a/default_images/sw/imglst/nch20001.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/nc20001.png
diff --git a/default_images/sw/imglst/nch20002.png b/ooo_custom_images/hicontrast/sw/imglst/nc20002.png
index f273c9b73788..f273c9b73788 100644
--- a/default_images/sw/imglst/nch20002.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/nc20002.png
diff --git a/default_images/sw/imglst/nch20003.png b/ooo_custom_images/hicontrast/sw/imglst/nc20003.png
index 0c8a02a306dd..0c8a02a306dd 100644
--- a/default_images/sw/imglst/nch20003.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/nc20003.png
diff --git a/default_images/sw/imglst/nch20004.png b/ooo_custom_images/hicontrast/sw/imglst/nc20004.png
index 2169a8e39ad6..2169a8e39ad6 100644
--- a/default_images/sw/imglst/nch20004.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/nc20004.png
diff --git a/default_images/sw/imglst/nch20005.png b/ooo_custom_images/hicontrast/sw/imglst/nc20005.png
index bc6ad71bdb1c..bc6ad71bdb1c 100644
--- a/default_images/sw/imglst/nch20005.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/nc20005.png
diff --git a/default_images/sw/imglst/nch20006.png b/ooo_custom_images/hicontrast/sw/imglst/nc20006.png
index 42fbf06419fb..42fbf06419fb 100644
--- a/default_images/sw/imglst/nch20006.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/nc20006.png
diff --git a/default_images/sw/imglst/nch20007.png b/ooo_custom_images/hicontrast/sw/imglst/nc20007.png
index 09cb8575c291..09cb8575c291 100644
--- a/default_images/sw/imglst/nch20007.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/nc20007.png
diff --git a/default_images/sw/imglst/nch20008.png b/ooo_custom_images/hicontrast/sw/imglst/nc20008.png
index 168902609742..168902609742 100644
--- a/default_images/sw/imglst/nch20008.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/nc20008.png
diff --git a/default_images/sw/imglst/nch20009.png b/ooo_custom_images/hicontrast/sw/imglst/nc20009.png
index 4392542b80b7..4392542b80b7 100644
--- a/default_images/sw/imglst/nch20009.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/nc20009.png
diff --git a/default_images/sw/imglst/nch20010.png b/ooo_custom_images/hicontrast/sw/imglst/nc20010.png
index 7909511db015..7909511db015 100644
--- a/default_images/sw/imglst/nch20010.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/nc20010.png
diff --git a/default_images/sw/imglst/nch20011.png b/ooo_custom_images/hicontrast/sw/imglst/nc20011.png
index 0c8a02a306dd..0c8a02a306dd 100644
--- a/default_images/sw/imglst/nch20011.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/nc20011.png
diff --git a/default_images/sw/imglst/reh01.png b/ooo_custom_images/hicontrast/sw/imglst/re01.png
index c20474b9c461..c20474b9c461 100644
--- a/default_images/sw/imglst/reh01.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/re01.png
diff --git a/default_images/sw/imglst/reh02.png b/ooo_custom_images/hicontrast/sw/imglst/re02.png
index 2768589189a5..2768589189a5 100644
--- a/default_images/sw/imglst/reh02.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/re02.png
diff --git a/default_images/sw/imglst/reh03.png b/ooo_custom_images/hicontrast/sw/imglst/re03.png
index c85daadc7007..c85daadc7007 100644
--- a/default_images/sw/imglst/reh03.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/re03.png
diff --git a/default_images/sw/imglst/reh04.png b/ooo_custom_images/hicontrast/sw/imglst/re04.png
index f660803b40f2..f660803b40f2 100644
--- a/default_images/sw/imglst/reh04.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/re04.png
diff --git a/default_images/sw/imglst/sch20171.png b/ooo_custom_images/hicontrast/sw/imglst/sc20171.png
index 0e5bf90dab40..0e5bf90dab40 100644
--- a/default_images/sw/imglst/sch20171.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20171.png
diff --git a/default_images/sw/imglst/sch20172.png b/ooo_custom_images/hicontrast/sw/imglst/sc20172.png
index 8f2948b39bf5..8f2948b39bf5 100644
--- a/default_images/sw/imglst/sch20172.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20172.png
diff --git a/default_images/sw/imglst/sch20173.png b/ooo_custom_images/hicontrast/sw/imglst/sc20173.png
index 03b54589fcb5..03b54589fcb5 100644
--- a/default_images/sw/imglst/sch20173.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20173.png
diff --git a/default_images/sw/imglst/sch20174.png b/ooo_custom_images/hicontrast/sw/imglst/sc20174.png
index c12a2177e95b..c12a2177e95b 100644
--- a/default_images/sw/imglst/sch20174.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20174.png
diff --git a/default_images/sw/imglst/sch20175.png b/ooo_custom_images/hicontrast/sw/imglst/sc20175.png
index 56ed07db53e8..56ed07db53e8 100644
--- a/default_images/sw/imglst/sch20175.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20175.png
diff --git a/default_images/sw/imglst/sch20177.png b/ooo_custom_images/hicontrast/sw/imglst/sc20177.png
index d1371fdf51ae..d1371fdf51ae 100644
--- a/default_images/sw/imglst/sch20177.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20177.png
diff --git a/default_images/sw/imglst/sch20179.png b/ooo_custom_images/hicontrast/sw/imglst/sc20179.png
index 499f7eb9104e..499f7eb9104e 100644
--- a/default_images/sw/imglst/sch20179.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20179.png
diff --git a/default_images/sw/imglst/sch20182.png b/ooo_custom_images/hicontrast/sw/imglst/sc20182.png
index 833d8615d47e..833d8615d47e 100644
--- a/default_images/sw/imglst/sch20182.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20182.png
diff --git a/default_images/sw/imglst/sch20183.png b/ooo_custom_images/hicontrast/sw/imglst/sc20183.png
index 041070719639..041070719639 100644
--- a/default_images/sw/imglst/sch20183.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20183.png
diff --git a/default_images/sw/imglst/sch20186.png b/ooo_custom_images/hicontrast/sw/imglst/sc20186.png
index a3fd98dc2a86..a3fd98dc2a86 100644
--- a/default_images/sw/imglst/sch20186.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20186.png
diff --git a/default_images/sw/imglst/sch20233.png b/ooo_custom_images/hicontrast/sw/imglst/sc20233.png
index fb5de140e8ef..fb5de140e8ef 100644
--- a/default_images/sw/imglst/sch20233.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20233.png
diff --git a/default_images/sw/imglst/sch20234.png b/ooo_custom_images/hicontrast/sw/imglst/sc20234.png
index c944b9b42818..c944b9b42818 100644
--- a/default_images/sw/imglst/sch20234.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20234.png
diff --git a/default_images/sw/imglst/sch20235.png b/ooo_custom_images/hicontrast/sw/imglst/sc20235.png
index 09cb8575c291..09cb8575c291 100644
--- a/default_images/sw/imglst/sch20235.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20235.png
diff --git a/default_images/sw/imglst/sch20236.png b/ooo_custom_images/hicontrast/sw/imglst/sc20236.png
index 7e1517564b1b..7e1517564b1b 100644
--- a/default_images/sw/imglst/sch20236.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20236.png
diff --git a/default_images/sw/imglst/sch20238.png b/ooo_custom_images/hicontrast/sw/imglst/sc20238.png
index 936eba564fa3..936eba564fa3 100644
--- a/default_images/sw/imglst/sch20238.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20238.png
diff --git a/default_images/sw/imglst/sch20239.png b/ooo_custom_images/hicontrast/sw/imglst/sc20239.png
index 9839e588ad64..9839e588ad64 100644
--- a/default_images/sw/imglst/sch20239.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20239.png
diff --git a/default_images/sw/imglst/sch20244.png b/ooo_custom_images/hicontrast/sw/imglst/sc20244.png
index d71d9ad342d2..d71d9ad342d2 100644
--- a/default_images/sw/imglst/sch20244.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20244.png
diff --git a/default_images/sw/imglst/sch20245.png b/ooo_custom_images/hicontrast/sw/imglst/sc20245.png
index d9a739c5360e..d9a739c5360e 100644
--- a/default_images/sw/imglst/sch20245.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20245.png
diff --git a/default_images/sw/imglst/sch20246.png b/ooo_custom_images/hicontrast/sw/imglst/sc20246.png
index 9090e7c24f75..9090e7c24f75 100644
--- a/default_images/sw/imglst/sch20246.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20246.png
diff --git a/default_images/sw/imglst/sch20247.png b/ooo_custom_images/hicontrast/sw/imglst/sc20247.png
index 11cfa90f9574..11cfa90f9574 100644
--- a/default_images/sw/imglst/sch20247.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20247.png
diff --git a/default_images/sw/imglst/sch20248.png b/ooo_custom_images/hicontrast/sw/imglst/sc20248.png
index 8be24fc61949..8be24fc61949 100644
--- a/default_images/sw/imglst/sch20248.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20248.png
diff --git a/default_images/sw/imglst/sch20249.png b/ooo_custom_images/hicontrast/sw/imglst/sc20249.png
index f72a20ec8ff8..f72a20ec8ff8 100644
--- a/default_images/sw/imglst/sch20249.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20249.png
diff --git a/default_images/sw/imglst/sch20556.png b/ooo_custom_images/hicontrast/sw/imglst/sc20556.png
index bedf5a1cb1ab..bedf5a1cb1ab 100644
--- a/default_images/sw/imglst/sch20556.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20556.png
diff --git a/default_images/sw/imglst/sch20557.png b/ooo_custom_images/hicontrast/sw/imglst/sc20557.png
index aacdc837bdf2..aacdc837bdf2 100644
--- a/default_images/sw/imglst/sch20557.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20557.png
diff --git a/default_images/sw/imglst/sch20558.png b/ooo_custom_images/hicontrast/sw/imglst/sc20558.png
index 9d9c0489e4d7..9d9c0489e4d7 100644
--- a/default_images/sw/imglst/sch20558.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20558.png
diff --git a/default_images/sw/imglst/sfh01.png b/ooo_custom_images/hicontrast/sw/imglst/sf01.png
index 8de0d14439b2..8de0d14439b2 100644
--- a/default_images/sw/imglst/sfh01.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sf01.png
diff --git a/default_images/sw/imglst/sfh02.png b/ooo_custom_images/hicontrast/sw/imglst/sf02.png
index 478ab3ff08e4..478ab3ff08e4 100644
--- a/default_images/sw/imglst/sfh02.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sf02.png
diff --git a/default_images/sw/imglst/sfh03.png b/ooo_custom_images/hicontrast/sw/imglst/sf03.png
index 400d0c15ef4a..400d0c15ef4a 100644
--- a/default_images/sw/imglst/sfh03.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sf03.png
diff --git a/default_images/sw/imglst/sfh04.png b/ooo_custom_images/hicontrast/sw/imglst/sf04.png
index ed255cd5e2b7..ed255cd5e2b7 100644
--- a/default_images/sw/imglst/sfh04.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sf04.png
diff --git a/default_images/sw/imglst/sfh05.png b/ooo_custom_images/hicontrast/sw/imglst/sf05.png
index 81b682a01ab5..81b682a01ab5 100644
--- a/default_images/sw/imglst/sfh05.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sf05.png
diff --git a/default_images/sw/imglst/srh20000.png b/ooo_custom_images/hicontrast/sw/imglst/sr20000.png
index 13f7cb2e82a3..13f7cb2e82a3 100644
--- a/default_images/sw/imglst/srh20000.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20000.png
diff --git a/default_images/sw/imglst/srh20001.png b/ooo_custom_images/hicontrast/sw/imglst/sr20001.png
index 5dd99279b1c8..5dd99279b1c8 100644
--- a/default_images/sw/imglst/srh20001.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20001.png
diff --git a/default_images/sw/imglst/srh20002.png b/ooo_custom_images/hicontrast/sw/imglst/sr20002.png
index d8955c4c2341..d8955c4c2341 100644
--- a/default_images/sw/imglst/srh20002.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20002.png
diff --git a/default_images/sw/imglst/srh20003.png b/ooo_custom_images/hicontrast/sw/imglst/sr20003.png
index f273c9b73788..f273c9b73788 100644
--- a/default_images/sw/imglst/srh20003.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20003.png
diff --git a/default_images/sw/imglst/srh20004.png b/ooo_custom_images/hicontrast/sw/imglst/sr20004.png
index 7e6ecb41db6f..7e6ecb41db6f 100644
--- a/default_images/sw/imglst/srh20004.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20004.png
diff --git a/default_images/sw/imglst/srh20005.png b/ooo_custom_images/hicontrast/sw/imglst/sr20005.png
index 7d52ac28948f..7d52ac28948f 100644
--- a/default_images/sw/imglst/srh20005.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20005.png
diff --git a/default_images/sw/imglst/srh20006.png b/ooo_custom_images/hicontrast/sw/imglst/sr20006.png
index 3ebfee988b89..3ebfee988b89 100644
--- a/default_images/sw/imglst/srh20006.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20006.png
diff --git a/default_images/sw/imglst/srh20007.png b/ooo_custom_images/hicontrast/sw/imglst/sr20007.png
index 42fbf06419fb..42fbf06419fb 100644
--- a/default_images/sw/imglst/srh20007.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20007.png
diff --git a/default_images/sw/imglst/srh20008.png b/ooo_custom_images/hicontrast/sw/imglst/sr20008.png
index 4c3b276352ce..4c3b276352ce 100644
--- a/default_images/sw/imglst/srh20008.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20008.png
diff --git a/default_images/sw/imglst/srh20009.png b/ooo_custom_images/hicontrast/sw/imglst/sr20009.png
index 0c8a02a306dd..0c8a02a306dd 100644
--- a/default_images/sw/imglst/srh20009.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20009.png
diff --git a/default_images/sw/imglst/srh20010.png b/ooo_custom_images/hicontrast/sw/imglst/sr20010.png
index 2169a8e39ad6..2169a8e39ad6 100644
--- a/default_images/sw/imglst/srh20010.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20010.png
diff --git a/default_images/sw/imglst/srh20011.png b/ooo_custom_images/hicontrast/sw/imglst/sr20011.png
index 415cb797b8e3..415cb797b8e3 100644
--- a/default_images/sw/imglst/srh20011.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20011.png
diff --git a/default_images/sw/imglst/srh20012.png b/ooo_custom_images/hicontrast/sw/imglst/sr20012.png
index 99754baceefe..99754baceefe 100644
--- a/default_images/sw/imglst/srh20012.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20012.png
diff --git a/default_images/sw/imglst/srh20013.png b/ooo_custom_images/hicontrast/sw/imglst/sr20013.png
index d56cfa888ab8..d56cfa888ab8 100644
--- a/default_images/sw/imglst/srh20013.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20013.png
diff --git a/default_images/sw/imglst/srh20014.png b/ooo_custom_images/hicontrast/sw/imglst/sr20014.png
index d61a47303556..d61a47303556 100644
--- a/default_images/sw/imglst/srh20014.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20014.png
diff --git a/default_images/sw/imglst/srh20015.png b/ooo_custom_images/hicontrast/sw/imglst/sr20015.png
index e284986fec4d..e284986fec4d 100644
--- a/default_images/sw/imglst/srh20015.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20015.png
diff --git a/default_images/sw/imglst/srh20016.png b/ooo_custom_images/hicontrast/sw/imglst/sr20016.png
index abce025ee9dc..abce025ee9dc 100644
--- a/default_images/sw/imglst/srh20016.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20016.png
diff --git a/default_images/sw/imglst/srh20017.png b/ooo_custom_images/hicontrast/sw/imglst/sr20017.png
index 5ef6ccf10ac7..5ef6ccf10ac7 100644
--- a/default_images/sw/imglst/srh20017.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20017.png
diff --git a/default_images/sw/imglst/srh20018.png b/ooo_custom_images/hicontrast/sw/imglst/sr20018.png
index 77081f508b3c..77081f508b3c 100644
--- a/default_images/sw/imglst/srh20018.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20018.png
diff --git a/default_images/sw/imglst/srh20019.png b/ooo_custom_images/hicontrast/sw/imglst/sr20019.png
index 0f1a1bdf1bce..0f1a1bdf1bce 100644
--- a/default_images/sw/imglst/srh20019.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20019.png
diff --git a/default_images/sw/imglst/sxh01.png b/ooo_custom_images/hicontrast/sw/imglst/sx01.png
index cb6c503d6db6..cb6c503d6db6 100644
--- a/default_images/sw/imglst/sxh01.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sx01.png
diff --git a/default_images/sw/imglst/sxh02.png b/ooo_custom_images/hicontrast/sw/imglst/sx02.png
index a2be5faaee2f..a2be5faaee2f 100644
--- a/default_images/sw/imglst/sxh02.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sx02.png
diff --git a/default_images/sw/imglst/sxh03.png b/ooo_custom_images/hicontrast/sw/imglst/sx03.png
index 7479fc2b8d9c..7479fc2b8d9c 100644
--- a/default_images/sw/imglst/sxh03.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sx03.png
diff --git a/default_images/sw/imglst/wrh01.png b/ooo_custom_images/hicontrast/sw/imglst/wr01.png
index af3f3911c680..af3f3911c680 100644
--- a/default_images/sw/imglst/wrh01.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/wr01.png
diff --git a/default_images/sw/imglst/wrh010.png b/ooo_custom_images/hicontrast/sw/imglst/wr010.png
index e10258a230c0..e10258a230c0 100644
--- a/default_images/sw/imglst/wrh010.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/wr010.png
diff --git a/default_images/sw/imglst/wrh011.png b/ooo_custom_images/hicontrast/sw/imglst/wr011.png
index 8d07989e471f..8d07989e471f 100644
--- a/default_images/sw/imglst/wrh011.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/wr011.png
diff --git a/default_images/sw/imglst/wrh02.png b/ooo_custom_images/hicontrast/sw/imglst/wr02.png
index 110895b0f5e8..110895b0f5e8 100644
--- a/default_images/sw/imglst/wrh02.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/wr02.png
diff --git a/default_images/sw/imglst/wrh03.png b/ooo_custom_images/hicontrast/sw/imglst/wr03.png
index 0e8e05b9ecfe..0e8e05b9ecfe 100644
--- a/default_images/sw/imglst/wrh03.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/wr03.png
diff --git a/default_images/sw/imglst/wrh04.png b/ooo_custom_images/hicontrast/sw/imglst/wr04.png
index f949fe2ad0f9..f949fe2ad0f9 100644
--- a/default_images/sw/imglst/wrh04.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/wr04.png
diff --git a/default_images/sw/imglst/wrh05.png b/ooo_custom_images/hicontrast/sw/imglst/wr05.png
index 5bf95009a078..5bf95009a078 100644
--- a/default_images/sw/imglst/wrh05.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/wr05.png
diff --git a/default_images/sw/imglst/wrh06.png b/ooo_custom_images/hicontrast/sw/imglst/wr06.png
index c9fac9af824e..c9fac9af824e 100644
--- a/default_images/sw/imglst/wrh06.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/wr06.png
diff --git a/default_images/sw/imglst/wrh07.png b/ooo_custom_images/hicontrast/sw/imglst/wr07.png
index fa5a07cd9a9c..fa5a07cd9a9c 100644
--- a/default_images/sw/imglst/wrh07.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/wr07.png
diff --git a/default_images/sw/imglst/wrh08.png b/ooo_custom_images/hicontrast/sw/imglst/wr08.png
index 8edd985d54f1..8edd985d54f1 100644
--- a/default_images/sw/imglst/wrh08.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/wr08.png
diff --git a/default_images/sw/imglst/wrh09.png b/ooo_custom_images/hicontrast/sw/imglst/wr09.png
index 261379978ba4..261379978ba4 100644
--- a/default_images/sw/imglst/wrh09.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/wr09.png
diff --git a/default_images/sw/res/all_left_h.png b/ooo_custom_images/hicontrast/sw/res/all_left.png
index 434c8e78cfaf..434c8e78cfaf 100644
--- a/default_images/sw/res/all_left_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/all_left.png
diff --git a/default_images/sw/res/all_right_h.png b/ooo_custom_images/hicontrast/sw/res/all_right.png
index 96cc16ea0296..96cc16ea0296 100644
--- a/default_images/sw/res/all_right_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/all_right.png
diff --git a/default_images/sw/res/dog_h.png b/ooo_custom_images/hicontrast/sw/res/dog.png
index a6aaed866e5d..a6aaed866e5d 100644
--- a/default_images/sw/res/dog_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/dog.png
diff --git a/default_images/sw/res/doublepage_11x23_h.png b/ooo_custom_images/hicontrast/sw/res/doublepage_11x23.png
index f3a4954fb51c..f3a4954fb51c 100644
--- a/default_images/sw/res/doublepage_11x23_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/doublepage_11x23.png
diff --git a/default_images/sw/res/doublepage_a_11x23_h.png b/ooo_custom_images/hicontrast/sw/res/doublepage_a_11x23.png
index c4816f86b2fe..c4816f86b2fe 100644
--- a/default_images/sw/res/doublepage_a_11x23_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/doublepage_a_11x23.png
diff --git a/default_images/sw/res/emptypage_11x15_h.png b/ooo_custom_images/hicontrast/sw/res/emptypage_11x15.png
index 6ef313ce7252..6ef313ce7252 100644
--- a/default_images/sw/res/emptypage_11x15_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/emptypage_11x15.png
diff --git a/default_images/sw/res/emptypage_a_11x15_h.png b/ooo_custom_images/hicontrast/sw/res/emptypage_a_11x15.png
index 167eed35dab0..167eed35dab0 100644
--- a/default_images/sw/res/emptypage_a_11x15_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/emptypage_a_11x15.png
diff --git a/default_images/sw/res/envhc_l_h.png b/ooo_custom_images/hicontrast/sw/res/envhc_l.png
index 9f54500a7840..9f54500a7840 100644
--- a/default_images/sw/res/envhc_l_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/envhc_l.png
diff --git a/default_images/sw/res/envhc_u_h.png b/ooo_custom_images/hicontrast/sw/res/envhc_u.png
index c74d235d2abb..c74d235d2abb 100644
--- a/default_images/sw/res/envhc_u_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/envhc_u.png
diff --git a/default_images/sw/res/envhl_l_h.png b/ooo_custom_images/hicontrast/sw/res/envhl_l.png
index 1ac3caf8ade5..1ac3caf8ade5 100644
--- a/default_images/sw/res/envhl_l_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/envhl_l.png
diff --git a/default_images/sw/res/envhl_u_h.png b/ooo_custom_images/hicontrast/sw/res/envhl_u.png
index 4851b1a1914b..4851b1a1914b 100644
--- a/default_images/sw/res/envhl_u_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/envhl_u.png
diff --git a/default_images/sw/res/envhr_l_h.png b/ooo_custom_images/hicontrast/sw/res/envhr_l.png
index cebfa8603104..cebfa8603104 100644
--- a/default_images/sw/res/envhr_l_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/envhr_l.png
diff --git a/default_images/sw/res/envhr_u_h.png b/ooo_custom_images/hicontrast/sw/res/envhr_u.png
index a85ae4d7588c..a85ae4d7588c 100644
--- a/default_images/sw/res/envhr_u_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/envhr_u.png
diff --git a/default_images/sw/res/envvc_l_h.png b/ooo_custom_images/hicontrast/sw/res/envvc_l.png
index 80c61f8e4ca6..80c61f8e4ca6 100644
--- a/default_images/sw/res/envvc_l_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/envvc_l.png
diff --git a/default_images/sw/res/envvc_u_h.png b/ooo_custom_images/hicontrast/sw/res/envvc_u.png
index a5a972744aaa..a5a972744aaa 100644
--- a/default_images/sw/res/envvc_u_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/envvc_u.png
diff --git a/default_images/sw/res/envvl_l_h.png b/ooo_custom_images/hicontrast/sw/res/envvl_l.png
index a12e51f6bfde..a12e51f6bfde 100644
--- a/default_images/sw/res/envvl_l_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/envvl_l.png
diff --git a/default_images/sw/res/envvl_u_h.png b/ooo_custom_images/hicontrast/sw/res/envvl_u.png
index 6cc52a2d19cb..6cc52a2d19cb 100644
--- a/default_images/sw/res/envvl_u_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/envvl_u.png
diff --git a/default_images/sw/res/envvr_l_h.png b/ooo_custom_images/hicontrast/sw/res/envvr_l.png
index cc1d1df0677e..cc1d1df0677e 100644
--- a/default_images/sw/res/envvr_l_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/envvr_l.png
diff --git a/default_images/sw/res/envvr_u_h.png b/ooo_custom_images/hicontrast/sw/res/envvr_u.png
index 5679a75ddb11..5679a75ddb11 100644
--- a/default_images/sw/res/envvr_u_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/envvr_u.png
diff --git a/default_images/sw/res/one_left_h.png b/ooo_custom_images/hicontrast/sw/res/one_left.png
index 9438a2056498..9438a2056498 100644
--- a/default_images/sw/res/one_left_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/one_left.png
diff --git a/default_images/sw/res/one_right_h.png b/ooo_custom_images/hicontrast/sw/res/one_right.png
index 0fd15a34441e..0fd15a34441e 100644
--- a/default_images/sw/res/one_right_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/one_right.png
diff --git a/default_images/sw/res/punkt_h.png b/ooo_custom_images/hicontrast/sw/res/punkt.png
index ccb8a537ed82..ccb8a537ed82 100644
--- a/default_images/sw/res/punkt_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/punkt.png
diff --git a/default_images/sw/res/styfamnu_h.png b/ooo_custom_images/hicontrast/sw/res/styfamnu.png
index 81b682a01ab5..81b682a01ab5 100644
--- a/default_images/sw/res/styfamnu_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/styfamnu.png
diff --git a/default_images/sw/res/twopages_11x25_h.png b/ooo_custom_images/hicontrast/sw/res/twopages_11x25.png
index a139e36f0dd3..a139e36f0dd3 100644
--- a/default_images/sw/res/twopages_11x25_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/twopages_11x25.png
diff --git a/default_images/sw/res/twopages_a_11x25_h.png b/ooo_custom_images/hicontrast/sw/res/twopages_a_11x25.png
index 29d19e412fb8..29d19e412fb8 100644
--- a/default_images/sw/res/twopages_a_11x25_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/twopages_a_11x25.png
diff --git a/default_images/sw/res/zetlhor2_h.png b/ooo_custom_images/hicontrast/sw/res/zetlhor2.png
index cdc81ff0e02e..cdc81ff0e02e 100644
--- a/default_images/sw/res/zetlhor2_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/zetlhor2.png
diff --git a/default_images/sw/res/zetlver2_h.png b/ooo_custom_images/hicontrast/sw/res/zetlver2.png
index 690d2a23c68a..690d2a23c68a 100644
--- a/default_images/sw/res/zetlver2_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/zetlver2.png
diff --git a/default_images/vcl/source/src/closedochc.png b/ooo_custom_images/hicontrast/vcl/source/src/closedoc.png
index e5b96dad7047..e5b96dad7047 100644
--- a/default_images/vcl/source/src/closedochc.png
+++ b/ooo_custom_images/hicontrast/vcl/source/src/closedoc.png
diff --git a/default_images/vcl/source/src/collate_h.png b/ooo_custom_images/hicontrast/vcl/source/src/collate.png
index 407e56cd9bce..407e56cd9bce 100644
--- a/default_images/vcl/source/src/collate_h.png
+++ b/ooo_custom_images/hicontrast/vcl/source/src/collate.png
diff --git a/default_images/vcl/source/src/msgbox_hc.png b/ooo_custom_images/hicontrast/vcl/source/src/msgbox.png
index ba6d3b395794..ba6d3b395794 100644
--- a/default_images/vcl/source/src/msgbox_hc.png
+++ b/ooo_custom_images/hicontrast/vcl/source/src/msgbox.png
diff --git a/default_images/vcl/source/src/ncollate_h.png b/ooo_custom_images/hicontrast/vcl/source/src/ncollate.png
index 10ba6bca1aa7..10ba6bca1aa7 100644
--- a/default_images/vcl/source/src/ncollate_h.png
+++ b/ooo_custom_images/hicontrast/vcl/source/src/ncollate.png
diff --git a/default_images/toolkit/source/awt/spinner03-32-hc_01.png b/ooo_custom_images/hicontrast/vcl/source/src/spinner03-grey_01.png
index e1339ba9a5ea..e1339ba9a5ea 100644
--- a/default_images/toolkit/source/awt/spinner03-32-hc_01.png
+++ b/ooo_custom_images/hicontrast/vcl/source/src/spinner03-grey_01.png
diff --git a/default_images/toolkit/source/awt/spinner03-32-hc_02.png b/ooo_custom_images/hicontrast/vcl/source/src/spinner03-grey_02.png
index 19a2e5edffe5..19a2e5edffe5 100644
--- a/default_images/toolkit/source/awt/spinner03-32-hc_02.png
+++ b/ooo_custom_images/hicontrast/vcl/source/src/spinner03-grey_02.png
diff --git a/default_images/toolkit/source/awt/spinner03-32-hc_03.png b/ooo_custom_images/hicontrast/vcl/source/src/spinner03-grey_03.png
index f6d8f5a5b2bc..f6d8f5a5b2bc 100644
--- a/default_images/toolkit/source/awt/spinner03-32-hc_03.png
+++ b/ooo_custom_images/hicontrast/vcl/source/src/spinner03-grey_03.png
diff --git a/default_images/toolkit/source/awt/spinner03-32-hc_04.png b/ooo_custom_images/hicontrast/vcl/source/src/spinner03-grey_04.png
index a5f5b4e23ea9..a5f5b4e23ea9 100644
--- a/default_images/toolkit/source/awt/spinner03-32-hc_04.png
+++ b/ooo_custom_images/hicontrast/vcl/source/src/spinner03-grey_04.png
diff --git a/default_images/toolkit/source/awt/spinner03-32-hc_05.png b/ooo_custom_images/hicontrast/vcl/source/src/spinner03-grey_05.png
index b84b5c57da55..b84b5c57da55 100644
--- a/default_images/toolkit/source/awt/spinner03-32-hc_05.png
+++ b/ooo_custom_images/hicontrast/vcl/source/src/spinner03-grey_05.png
diff --git a/default_images/toolkit/source/awt/spinner03-32-hc_06.png b/ooo_custom_images/hicontrast/vcl/source/src/spinner03-grey_06.png
index 4d026afcd0bb..4d026afcd0bb 100644
--- a/default_images/toolkit/source/awt/spinner03-32-hc_06.png
+++ b/ooo_custom_images/hicontrast/vcl/source/src/spinner03-grey_06.png
diff --git a/default_images/toolkit/source/awt/spinner03-32-hc_07.png b/ooo_custom_images/hicontrast/vcl/source/src/spinner03-grey_07.png
index 2ae2937f128a..2ae2937f128a 100644
--- a/default_images/toolkit/source/awt/spinner03-32-hc_07.png
+++ b/ooo_custom_images/hicontrast/vcl/source/src/spinner03-grey_07.png
diff --git a/default_images/toolkit/source/awt/spinner03-32-hc_08.png b/ooo_custom_images/hicontrast/vcl/source/src/spinner03-grey_08.png
index b201fd0131bb..b201fd0131bb 100644
--- a/default_images/toolkit/source/awt/spinner03-32-hc_08.png
+++ b/ooo_custom_images/hicontrast/vcl/source/src/spinner03-grey_08.png
diff --git a/default_images/toolkit/source/awt/spinner03-32-hc_09.png b/ooo_custom_images/hicontrast/vcl/source/src/spinner03-grey_09.png
index 9dd1488efc70..9dd1488efc70 100644
--- a/default_images/toolkit/source/awt/spinner03-32-hc_09.png
+++ b/ooo_custom_images/hicontrast/vcl/source/src/spinner03-grey_09.png
diff --git a/default_images/toolkit/source/awt/spinner03-32-hc_10.png b/ooo_custom_images/hicontrast/vcl/source/src/spinner03-grey_10.png
index 5bdd9cab9140..5bdd9cab9140 100644
--- a/default_images/toolkit/source/awt/spinner03-32-hc_10.png
+++ b/ooo_custom_images/hicontrast/vcl/source/src/spinner03-grey_10.png
diff --git a/default_images/toolkit/source/awt/spinner03-32-hc_11.png b/ooo_custom_images/hicontrast/vcl/source/src/spinner03-grey_11.png
index 779097c9a454..779097c9a454 100644
--- a/default_images/toolkit/source/awt/spinner03-32-hc_11.png
+++ b/ooo_custom_images/hicontrast/vcl/source/src/spinner03-grey_11.png
diff --git a/default_images/toolkit/source/awt/spinner03-32-hc_12.png b/ooo_custom_images/hicontrast/vcl/source/src/spinner03-grey_12.png
index bf9ae65c4d33..bf9ae65c4d33 100644
--- a/default_images/toolkit/source/awt/spinner03-32-hc_12.png
+++ b/ooo_custom_images/hicontrast/vcl/source/src/spinner03-grey_12.png
diff --git a/default_images/wizards/res/diagonal_h.png b/ooo_custom_images/hicontrast/wizards/res/diagonal.png
index 3fe729dcf0b1..3fe729dcf0b1 100644
--- a/default_images/wizards/res/diagonal_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/diagonal.png
diff --git a/default_images/wizards/res/formarrangefree_42_h.png b/ooo_custom_images/hicontrast/wizards/res/formarrangefree_42.png
index c6fe16c73e00..c6fe16c73e00 100644
--- a/default_images/wizards/res/formarrangefree_42_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/formarrangefree_42.png
diff --git a/default_images/wizards/res/formarrangelistside_42_h.png b/ooo_custom_images/hicontrast/wizards/res/formarrangelistside_42.png
index f23085130277..f23085130277 100644
--- a/default_images/wizards/res/formarrangelistside_42_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/formarrangelistside_42.png
diff --git a/default_images/wizards/res/formarrangelisttop_42_h.png b/ooo_custom_images/hicontrast/wizards/res/formarrangelisttop_42.png
index 37eac460a0e7..37eac460a0e7 100644
--- a/default_images/wizards/res/formarrangelisttop_42_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/formarrangelisttop_42.png
diff --git a/default_images/wizards/res/formarrangetable_42_h.png b/ooo_custom_images/hicontrast/wizards/res/formarrangetable_42.png
index e82f5c9534bc..e82f5c9534bc 100644
--- a/default_images/wizards/res/formarrangetable_42_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/formarrangetable_42.png
diff --git a/default_images/wizards/res/frame_bottom_h.png b/ooo_custom_images/hicontrast/wizards/res/frame_bottom.png
index 3c2a55817d82..3c2a55817d82 100644
--- a/default_images/wizards/res/frame_bottom_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/frame_bottom.png
diff --git a/default_images/wizards/res/frame_left_h.png b/ooo_custom_images/hicontrast/wizards/res/frame_left.png
index a850ce4cb1f9..a850ce4cb1f9 100644
--- a/default_images/wizards/res/frame_left_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/frame_left.png
diff --git a/default_images/wizards/res/frame_right_h.png b/ooo_custom_images/hicontrast/wizards/res/frame_right.png
index 63781e8a3725..63781e8a3725 100644
--- a/default_images/wizards/res/frame_right_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/frame_right.png
diff --git a/default_images/wizards/res/frame_top_h.png b/ooo_custom_images/hicontrast/wizards/res/frame_top.png
index c3f6dfb79e79..c3f6dfb79e79 100644
--- a/default_images/wizards/res/frame_top_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/frame_top.png
diff --git a/default_images/wizards/res/landscape_32_h.png b/ooo_custom_images/hicontrast/wizards/res/landscape_32.png
index c750f2ffc65c..c750f2ffc65c 100644
--- a/default_images/wizards/res/landscape_32_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/landscape_32.png
diff --git a/default_images/wizards/res/portrait_32_h.png b/ooo_custom_images/hicontrast/wizards/res/portrait_32.png
index a2a72c2063ba..a2a72c2063ba 100644
--- a/default_images/wizards/res/portrait_32_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/portrait_32.png
diff --git a/default_images/wizards/res/simple_h.png b/ooo_custom_images/hicontrast/wizards/res/simple.png
index 9be9316a62a6..9be9316a62a6 100644
--- a/default_images/wizards/res/simple_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/simple.png
diff --git a/default_images/wizards/res/table_2_h.png b/ooo_custom_images/hicontrast/wizards/res/table_2.png
index 1cb205b4353f..1cb205b4353f 100644
--- a/default_images/wizards/res/table_2_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/table_2.png
diff --git a/default_images/wizards/res/table_3_h.png b/ooo_custom_images/hicontrast/wizards/res/table_3.png
index 36268a742e95..36268a742e95 100644
--- a/default_images/wizards/res/table_3_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/table_3.png
diff --git a/default_images/wizards/res/zigzag_h.png b/ooo_custom_images/hicontrast/wizards/res/zigzag.png
index 30e3c518b696..30e3c518b696 100644
--- a/default_images/wizards/res/zigzag_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/zigzag.png
diff --git a/default_images/xmlsecurity/res/caution_11x16_h.png b/ooo_custom_images/hicontrast/xmlsecurity/res/caution_11x16.png
index 8f16def12b54..8f16def12b54 100644
--- a/default_images/xmlsecurity/res/caution_11x16_h.png
+++ b/ooo_custom_images/hicontrast/xmlsecurity/res/caution_11x16.png
diff --git a/default_images/xmlsecurity/res/certificate_16_h.png b/ooo_custom_images/hicontrast/xmlsecurity/res/certificate_16.png
index 75edc326d401..75edc326d401 100644
--- a/default_images/xmlsecurity/res/certificate_16_h.png
+++ b/ooo_custom_images/hicontrast/xmlsecurity/res/certificate_16.png
diff --git a/default_images/xmlsecurity/res/certificate_40x56_h.png b/ooo_custom_images/hicontrast/xmlsecurity/res/certificate_40x56.png
index 14ce004eec82..14ce004eec82 100644
--- a/default_images/xmlsecurity/res/certificate_40x56_h.png
+++ b/ooo_custom_images/hicontrast/xmlsecurity/res/certificate_40x56.png
diff --git a/default_images/xmlsecurity/res/key_12_h.png b/ooo_custom_images/hicontrast/xmlsecurity/res/key_12.png
index ad95bebbba68..ad95bebbba68 100644
--- a/default_images/xmlsecurity/res/key_12_h.png
+++ b/ooo_custom_images/hicontrast/xmlsecurity/res/key_12.png
diff --git a/default_images/xmlsecurity/res/notcertificate_16_h.png b/ooo_custom_images/hicontrast/xmlsecurity/res/notcertificate_16.png
index 79c7dbff1a97..79c7dbff1a97 100644
--- a/default_images/xmlsecurity/res/notcertificate_16_h.png
+++ b/ooo_custom_images/hicontrast/xmlsecurity/res/notcertificate_16.png
diff --git a/default_images/xmlsecurity/res/notcertificate_40x56_h.png b/ooo_custom_images/hicontrast/xmlsecurity/res/notcertificate_40x56.png
index 859ec6f13cd4..859ec6f13cd4 100644
--- a/default_images/xmlsecurity/res/notcertificate_40x56_h.png
+++ b/ooo_custom_images/hicontrast/xmlsecurity/res/notcertificate_40x56.png
diff --git a/default_images/xmlsecurity/res/signet_11x16_h.png b/ooo_custom_images/hicontrast/xmlsecurity/res/signet_11x16.png
index b8ca0f52107f..b8ca0f52107f 100644
--- a/default_images/xmlsecurity/res/signet_11x16_h.png
+++ b/ooo_custom_images/hicontrast/xmlsecurity/res/signet_11x16.png
diff --git a/oox/inc/oox/drawingml/textcharacterproperties.hxx b/oox/inc/oox/drawingml/textcharacterproperties.hxx
index 78e812b2e487..ae4618c34305 100644
--- a/oox/inc/oox/drawingml/textcharacterproperties.hxx
+++ b/oox/inc/oox/drawingml/textcharacterproperties.hxx
@@ -73,12 +73,14 @@ struct TextCharacterProperties
     /** Writes the properties to the passed property map. */
     void                pushToPropMap(
                             PropertyMap& rPropMap,
-                            const ::oox::core::XmlFilterBase& rFilter ) const;
+                            const ::oox::core::XmlFilterBase& rFilter,
+                            bool bUseOptional = false ) const;
 
     /** Writes the properties to the passed property set. */
     void                pushToPropSet(
                             PropertySet& rPropSet,
-                            const ::oox::core::XmlFilterBase& rFilter ) const;
+                            const ::oox::core::XmlFilterBase& rFilter,
+                            bool bUseOptional = false ) const;
 };
 
 // ============================================================================
diff --git a/oox/inc/oox/drawingml/textliststyle.hxx b/oox/inc/oox/drawingml/textliststyle.hxx
index c10b59c1c698..04e9919275df 100644
--- a/oox/inc/oox/drawingml/textliststyle.hxx
+++ b/oox/inc/oox/drawingml/textliststyle.hxx
@@ -52,7 +52,7 @@ public:
     inline TextParagraphPropertiesVector&       getAggregationListStyle() { return maAggregationListStyle; };
 
 #if OSL_DEBUG_LEVEL > 0
-    void dump( int nLevels=9 );
+    void dump( int nLevels=9 ) const;
 #endif
 
 protected:
diff --git a/oox/inc/oox/drawingml/textparagraphproperties.hxx b/oox/inc/oox/drawingml/textparagraphproperties.hxx
index af1db86b6f9b..efa916b4dd6b 100644
--- a/oox/inc/oox/drawingml/textparagraphproperties.hxx
+++ b/oox/inc/oox/drawingml/textparagraphproperties.hxx
@@ -53,7 +53,7 @@ public:
     BulletList( );
     bool is() const;
     void apply( const BulletList& );
-    void pushToPropMap( const ::oox::core::XmlFilterBase& rFilterBase, PropertyMap& rPropMap ) const;
+    void pushToPropMap( const ::oox::core::XmlFilterBase* pFilterBase, PropertyMap& xPropMap ) const;
     void setBulletChar( const ::rtl::OUString & sChar );
     void setStartAt( sal_Int32 nStartAt ){ mnStartAt <<= static_cast< sal_Int16 >( nStartAt ); }
     void setType( sal_Int32 nType );
@@ -104,9 +104,10 @@ public:
     boost::optional< sal_Int32 >&       getFirstLineIndentation(){ return moFirstLineIndentation; }
 
     void                                apply( const TextParagraphProperties& rSourceProps );
-    void                                pushToPropSet( const ::oox::core::XmlFilterBase& rFilterBase,
+    void                                pushToPropSet( const ::oox::core::XmlFilterBase* pFilterBase,
                                             const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & xPropSet,
                                                 PropertyMap& rioBulletList, const BulletList* pMasterBuList, sal_Bool bApplyBulletList, float fFontSize ) const;
+    void                                pushToPropSet( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & xPropSet) const;
 
     /** Returns the largest character size of this paragraph. If possible the
         masterstyle should have been applied before, otherwise the character
@@ -114,7 +115,7 @@ public:
     float                               getCharHeightPoints( float fDefault ) const;
 
 #if OSL_DEBUG_LEVEL > 0
-    void dump() { maTextParagraphPropertyMap.dump(); OSL_TRACE("character height: %f", maTextCharacterProperties.getCharHeightPoints(-1)); }
+    void dump();
 #endif
 
 protected:
diff --git a/oox/inc/oox/export/drawingml.hxx b/oox/inc/oox/export/drawingml.hxx
index 0451f2c9cbb5..92603afc633e 100644
--- a/oox/inc/oox/export/drawingml.hxx
+++ b/oox/inc/oox/export/drawingml.hxx
@@ -21,6 +21,9 @@ namespace beans {
 namespace drawing {
     class XShape;
 }
+namespace style {
+    struct LineSpacing;
+}
 namespace text {
     class XTextContent;
     class XTextRange;
@@ -42,9 +45,6 @@ public:
     enum DocumentType { DOCUMENT_DOCX, DOCUMENT_PPTX, DOCUMENT_XLSX };
 
 private:
-    ::sax_fastparser::FSHelperPtr mpFS;
-    ::oox::core::XmlFilterBase* mpFB;
-
     static int mnImageCounter;
 
     /// To specify where write eg. the images to (like 'ppt', or 'word' - according to the OPC).
@@ -52,6 +52,8 @@ private:
 
 protected:
     ::com::sun::star::uno::Any mAny;
+    ::sax_fastparser::FSHelperPtr mpFS;
+    ::oox::core::XmlFilterBase* mpFB;
 
     bool GetProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, String aName );
     bool GetPropertyAndState( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet,
@@ -62,7 +64,7 @@ protected:
     rtl::OUString WriteImage( const rtl::OUString& rURL );
 
 public:
-    DrawingML( ::sax_fastparser::FSHelperPtr pFS, ::oox::core::XmlFilterBase* pFB = NULL, DocumentType eDocumentType = DOCUMENT_PPTX ) : mpFS( pFS ), mpFB( pFB ), meDocumentType( eDocumentType ) {}
+    DrawingML( ::sax_fastparser::FSHelperPtr pFS, ::oox::core::XmlFilterBase* pFB = NULL, DocumentType eDocumentType = DOCUMENT_PPTX ) : meDocumentType( eDocumentType ), mpFS( pFS ), mpFB( pFB ) {}
     void SetFS( ::sax_fastparser::FSHelperPtr pFS ) { mpFS = pFS; }
     ::sax_fastparser::FSHelperPtr GetFS() { return mpFS; }
     ::oox::core::XmlFilterBase* GetFB() { return mpFB; }
@@ -82,8 +84,9 @@ public:
     void WriteBlipFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, String sURLPropName );
     void WriteOutline( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
     void WriteStretch();
+    void WriteLinespacing( ::com::sun::star::style::LineSpacing& rLineSpacing );
 
-    ::rtl::OUString WriteBlip( ::rtl::OUString& rURL );
+    ::rtl::OUString WriteBlip( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, ::rtl::OUString& rURL );
     void WriteBlipMode( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
 
     void WriteShapeTransformation( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rXShape,
diff --git a/oox/inc/oox/export/shapes.hxx b/oox/inc/oox/export/shapes.hxx
index f2ea765383e0..89c4860c61ad 100644
--- a/oox/inc/oox/export/shapes.hxx
+++ b/oox/inc/oox/export/shapes.hxx
@@ -49,14 +49,8 @@ namespace drawing {
 namespace oox { namespace drawingml {
 
 class OOX_DLLPUBLIC ShapeExport : public DrawingML {
-private:
-    sal_Int32           mnXmlNamespace;
-    sal_Int32           mnShapeIdMax, mnPictureIdMax;
-    Fraction            maFraction;
-    MapMode             maMapModeSrc, maMapModeDest;
-
-    ::com::sun::star::awt::Size MapSize( const ::com::sun::star::awt::Size& ) const;
 
+private:
     struct ShapeCheck
     {
         bool operator()( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape> s1, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape> s2 ) const
@@ -72,11 +66,25 @@ private:
         size_t operator()( const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape > ) const;
     };
 
+public:
     typedef std::hash_map< const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>, sal_Int32, ShapeHash, ShapeCheck> ShapeHashMap;
+
+protected:
+    sal_Int32           mnShapeIdMax, mnPictureIdMax;
+
+private:
+    sal_Int32           mnXmlNamespace;
+    Fraction            maFraction;
+    MapMode             maMapModeSrc, maMapModeDest;
+
+    ::com::sun::star::awt::Size MapSize( const ::com::sun::star::awt::Size& ) const;
+
     ShapeHashMap maShapeMap;
+    ShapeHashMap* mpShapeMap;
 
 public:
-    ShapeExport( sal_Int32 nXmlNamespace, ::sax_fastparser::FSHelperPtr pFS, ::oox::core::XmlFilterBase* pFB = NULL, DocumentType eDocumentType = DOCUMENT_PPTX );
+
+    ShapeExport( sal_Int32 nXmlNamespace, ::sax_fastparser::FSHelperPtr pFS, ShapeHashMap* pShapeMap = NULL, ::oox::core::XmlFilterBase* pFB = NULL, DocumentType eDocumentType = DOCUMENT_PPTX );
     virtual ~ShapeExport() {}
 
     sal_Int32           GetXmlNamespace() const;
@@ -155,7 +163,9 @@ public:
                         WriteUnknownShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
 
     sal_Int32 GetNewShapeID( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rShape );
+    sal_Int32 GetNewShapeID( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rShape, ::oox::core::XmlFilterBase* pFB );
     sal_Int32 GetShapeID( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rShape );
+    static sal_Int32 GetShapeID( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rShape, ShapeHashMap* pShapeMap );
 };
 
 }}
diff --git a/oox/inc/oox/helper/containerhelper.hxx b/oox/inc/oox/helper/containerhelper.hxx
index 55c609924720..9a0a0774c43b 100644
--- a/oox/inc/oox/helper/containerhelper.hxx
+++ b/oox/inc/oox/helper/containerhelper.hxx
@@ -125,6 +125,13 @@ public:
                             forEach( ::boost::bind( pFunc, _1, aParam1, aParam2, aParam3 ) );
                         }
 
+    /** Calls the passed member function of ObjType on every contained object,
+        automatically skips all elements that are empty references. */
+    template< typename FuncType, typename ParamType1, typename ParamType2, typename ParamType3, typename ParamType4 >
+    inline void         forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3, ParamType4 aParam4 ) const
+                        {
+                            forEach( ::boost::bind( pFunc, _1, aParam1, aParam2, aParam3, aParam4 ) );
+                        }
     /** Calls the passed functor for every contained object. Passes the index as
         first argument and the object reference as second argument to rFunctor. */
     template< typename FunctorType >
@@ -282,6 +289,13 @@ public:
                         {
                             forEach( ::boost::bind( pFunc, _1, aParam1, aParam2, aParam3 ) );
                         }
+    /** Calls the passed member function of ObjType on every contained object,
+        automatically skips all elements that are empty references. */
+    template< typename FuncType, typename ParamType1, typename ParamType2, typename ParamType3, typename ParamType4 >
+    inline void         forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2 aParam2, ParamType3 aParam3, ParamType4 aParam4 ) const
+                        {
+                            forEach( ::boost::bind( pFunc, _1, aParam1, aParam2, aParam3, aParam4 ) );
+                        }
     /** Calls the passed functor for every contained object. Passes the key as
         first argument and the object reference as second argument to rFunctor. */
     template< typename FunctorType >
diff --git a/oox/inc/oox/ole/axcontrol.hxx b/oox/inc/oox/ole/axcontrol.hxx
index 4152857cad73..eccd5865cfa9 100644
--- a/oox/inc/oox/ole/axcontrol.hxx
+++ b/oox/inc/oox/ole/axcontrol.hxx
@@ -31,6 +31,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include "oox/helper/binarystreambase.hxx"
+#include "oox/helper/propertyset.hxx"
 #include "oox/ole/axbinaryreader.hxx"
 #include "oox/ole/olehelper.hxx"
 
@@ -38,6 +39,7 @@ namespace com { namespace sun { namespace star {
     namespace awt { class XControlModel; }
     namespace container { class XIndexContainer; }
     namespace drawing { class XDrawPage; }
+    namespace frame { class XModel; }
     namespace form { class XFormsSupplier; }
     namespace lang { class XMultiServiceFactory; }
 } } }
@@ -148,6 +150,7 @@ class ControlConverter
 {
 public:
     explicit            ControlConverter(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxDocModel,
                             const GraphicHelper& rGraphicHelper,
                             bool bDefaultColorBgr = true );
     virtual             ~ControlConverter();
@@ -186,6 +189,14 @@ public:
                             sal_Int32 nMin, sal_Int32 nMax, sal_Int32 nPosition,
                             sal_Int32 nSmallChange, sal_Int32 nLargeChange, bool bAwtModel ) const;
 
+    /** Binds the passed control model to the passed data sources. The
+        implementation will check which source types are supported. */
+    void                bindToSources(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxCtrlModel,
+                            const ::rtl::OUString& rCtrlSource,
+                            const ::rtl::OUString& rRowSource,
+                            sal_Int32 nRefSheet = 0 ) const;
+
     // ActiveX (Forms 2.0) specific conversion --------------------------------
 
     /** Converts the Forms 2.0 background formatting to UNO properties. */
@@ -239,7 +250,10 @@ public:
                             sal_Int32 nOrientation ) const;
 
 private:
+    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxDocModel;
     const GraphicHelper& mrGraphicHelper;
+    mutable PropertySet maAddressConverter;
+    mutable PropertySet maRangeConverter;
     bool                mbDefaultColorBgr;
 };
 
@@ -805,7 +819,7 @@ class EmbeddedForm : public ControlConverter
 {
 public:
     explicit            EmbeddedForm(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxModelFactory,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxDocModel,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& rxDrawPage,
                             const GraphicHelper& rGraphicHelper,
                             bool bDefaultColorBgr = true );
diff --git a/oox/inc/oox/ole/vbacontrol.hxx b/oox/inc/oox/ole/vbacontrol.hxx
index 8f419cd6290e..df25e746bc6d 100644
--- a/oox/inc/oox/ole/vbacontrol.hxx
+++ b/oox/inc/oox/ole/vbacontrol.hxx
@@ -84,12 +84,19 @@ public:
                             ApiControlType eCtrlType,
                             sal_Int32 nCtrlIndex ) const;
 
+    /** Binds the passed control model to the data sources. The implementation
+        will check which source types are supported. */
+    void                bindToSources(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxCtrlModel,
+                            const ControlConverter& rConv ) const;
+
 protected:
     ::rtl::OUString     maName;             /// Name of the control.
     ::rtl::OUString     maTag;              /// User defined tag.
     ::rtl::OUString     maToolTip;          /// Tool tip for the control.
-    ::rtl::OUString     maLinkedCell;       /// Linked cell for the control value in a spreadsheet.
-    ::rtl::OUString     maSourceRange;      /// Source data for the control in a spreadsheet.
+    ::rtl::OUString     maControlSource;    /// Linked cell for the control value in a spreadsheet.
+    ::rtl::OUString     maRowSource;        /// Source data for the control in a spreadsheet.
+
     AxPairData          maPos;              /// Position in parent container.
     sal_Int32           mnId;               /// Control identifier.
     sal_Int32           mnHelpContextId;    /// Help context identifier.
@@ -161,13 +168,7 @@ private:
     /** Imports the site models of all embedded controls from the 'f' stream. */
     bool                importEmbeddedSiteModels( BinaryInputStream& rInStrm );
     /*  Final processing of all embedded controls after import. */
-    void                finalizeEmbeddedControls();
-
-    /** Moves the control relative to its current position by the passed distance. */
-    void                moveRelative( const AxPairData& rDistance );
-    /** Moves all embedded controls from their relative position in this
-        control to an absolute position in the parent of this control. */
-    void                moveEmbeddedToAbsoluteParent();
+    void                finalizeEmbeddedControls( StorageBase& rStrg );
 
     /** Functor for comparing controls by their tab index. */
     static bool         compareByTabIndex( const VbaFormControlRef& rxLeft, const VbaFormControlRef& rxRight );
@@ -183,11 +184,12 @@ private:
 
 // ============================================================================
 
-class VbaUserForm : public VbaFormControl, public ControlConverter
+class VbaUserForm : public VbaFormControl
 {
 public:
     explicit            VbaUserForm(
                             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxGlobalFactory,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxDocModel,
                             const GraphicHelper& rGraphicHelper,
                             bool bDefaultColorBgr = true );
 
@@ -202,6 +204,8 @@ public:
 
 private:
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxGlobalFactory;
+    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxDocModel;
+    ControlConverter    maConverter;
 };
 
 // ============================================================================
diff --git a/oox/inc/oox/ole/vbahelper.hxx b/oox/inc/oox/ole/vbahelper.hxx
index 8ab2159f5be1..1f67a7759aa6 100644
--- a/oox/inc/oox/ole/vbahelper.hxx
+++ b/oox/inc/oox/ole/vbahelper.hxx
@@ -55,6 +55,7 @@ const sal_uInt16 VBA_ID_MODULETYPEPROCEDURAL    = 0x0021;
 const sal_uInt16 VBA_ID_PROJECTCODEPAGE         = 0x0003;
 const sal_uInt16 VBA_ID_PROJECTEND              = 0x0010;
 const sal_uInt16 VBA_ID_PROJECTMODULES          = 0x000F;
+const sal_uInt16 VBA_ID_PROJECTNAME             = 0x0004;
 const sal_uInt16 VBA_ID_PROJECTVERSION          = 0x0009;
 
 // ============================================================================
diff --git a/oox/inc/oox/ole/vbamodule.hxx b/oox/inc/oox/ole/vbamodule.hxx
index 521a5bf5907c..52d04c0e5d45 100644
--- a/oox/inc/oox/ole/vbamodule.hxx
+++ b/oox/inc/oox/ole/vbamodule.hxx
@@ -69,10 +69,31 @@ public:
 
     /** Imports all records for this module until the MODULEEND record. */
     void                importDirRecords( BinaryInputStream& rDirStrm );
-    /** Imports the Basic source code into the passed Basic library. */
-    void                importSourceCode(
+
+    /** Imports the VBA source code into the passed Basic library. */
+    void                createAndImportModule(
                             StorageBase& rVbaStrg,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxBasicLib,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& rxDocObjectNA,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxOleNameOverrides ) const;
+    /** Creates an empty Basic module in the passed Basic library. */
+    void                createEmptyModule(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxBasicLib,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& rxDocObjectNA ) const;
+
+private:
+    /** Reads and returns the VBA source code from the passed storage. */
+    ::rtl::OUString     readSourceCode(
+                            StorageBase& rVbaStrg,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxOleNameOverrides ) const;
+
+    void extractOleOverrideFromAttr( const rtl::OUString& rAttribute,
+                                     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxOleNameOverrides ) const;
+
+    /** Creates a new Basic module and inserts it into the passed Basic library. */
+    void                createModule(
+                            const ::rtl::OUString& rVBASourceCode,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxBasicLib,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& rxDocObjectNA ) const;
 
 private:
diff --git a/oox/inc/oox/ole/vbaproject.hxx b/oox/inc/oox/ole/vbaproject.hxx
index b5bb1dc766fd..fc10e1de3e62 100644
--- a/oox/inc/oox/ole/vbaproject.hxx
+++ b/oox/inc/oox/ole/vbaproject.hxx
@@ -29,9 +29,9 @@
 #ifndef OOX_OLE_VBAPROJECT_HXX
 #define OOX_OLE_VBAPROJECT_HXX
 
-#include "oox/helper/storagebase.hxx"
+#include <map>
 #include <com/sun/star/uno/XInterface.hpp>
-#include "oox/dllapi.h"
+#include "oox/helper/storagebase.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace container { class XNameContainer; }
@@ -48,7 +48,7 @@ namespace ole {
 
 // ============================================================================
 
-class OOX_DLLPUBLIC VbaFilterConfig
+class VbaFilterConfig
 {
 public:
     explicit            VbaFilterConfig(
@@ -70,7 +70,7 @@ private:
 
 // ============================================================================
 
-class OOX_DLLPUBLIC VbaProject : public VbaFilterConfig
+class VbaProject : public VbaFilterConfig
 {
 public:
     explicit            VbaProject(
@@ -98,6 +98,8 @@ public:
     /** Returns true, if the document contains the specified dialog. */
     bool                hasDialog( const ::rtl::OUString& rDialogName ) const;
 
+    void                setOleOverridesSink( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >&  rxOleOverridesSink ){ mxOleOverridesSink = rxOleOverridesSink; }
+
 private:
                         VbaProject( const VbaProject& );
     VbaProject&         operator=( const VbaProject& );
@@ -115,11 +117,26 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
                         createDialogLibrary();
     /** Imports the VBA code modules and forms. */
-    void                importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGraphicHelper, bool bDefaultColorBgr );
+    void                importVba(
+                            StorageBase& rVbaPrjStrg,
+                            const GraphicHelper& rGraphicHelper,
+                            bool bDefaultColorBgr );
+
     /** Copies the entire VBA project storage to the passed document model. */
     void                copyStorage( StorageBase& rVbaPrjStrg );
 
+
+protected:
+    /** Registers a dummy module that will be created when the VBA project is
+        imported. */
+    void                addDummyModule( const ::rtl::OUString& rName, sal_Int32 nType );
+
+    /** Called when the import process of the VBA code modules starts. */
+    virtual void        prepareModuleImport();
+
 private:
+    typedef ::std::map< ::rtl::OUString, sal_Int32 > DummyModuleMap;
+
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
                         mxGlobalFactory;    /// Global service factory.
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
@@ -128,7 +145,10 @@ private:
                         mxBasicLib;         /// The Basic library of the document used for import.
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
                         mxDialogLib;        /// The dialog library of the document used for import.
-    const ::rtl::OUString maLibName;        /// Name for Basic and dialog library used for import.
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
+                        mxOleOverridesSink;
+    DummyModuleMap      maDummyModules;     /// Additional empty modules created on import.
+    ::rtl::OUString     maPrjName;          /// Name of the VBA project.
 };
 
 // ============================================================================
diff --git a/oox/inc/oox/ole/vbaprojectfilter.hxx b/oox/inc/oox/ole/vbaprojectfilter.hxx
new file mode 100644
index 000000000000..6ccd49801be3
--- /dev/null
+++ b/oox/inc/oox/ole/vbaprojectfilter.hxx
@@ -0,0 +1,71 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef OOX_OLE_VBAPROJECTFILTER_HXX
+#define OOX_OLE_VBAPROJECTFILTER_HXX
+
+#include "oox/core/binaryfilterbase.hxx"
+
+namespace oox {
+namespace ole {
+
+// ============================================================================
+
+class VbaProjectFilterBase : public ::oox::core::BinaryFilterBase
+{
+public:
+    explicit            VbaProjectFilterBase(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxGlobalFactory,
+                            const ::rtl::OUString& rAppName,
+                            const ::rtl::OUString& rStorageName );
+
+    virtual bool        importDocument() throw();
+    virtual bool        exportDocument() throw();
+
+private:
+    ::rtl::OUString     maAppName;
+    ::rtl::OUString     maStorageName;
+};
+
+// ============================================================================
+
+class WordVbaProjectFilter : public VbaProjectFilterBase
+{
+public:
+    explicit            WordVbaProjectFilter(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxGlobalFactory );
+
+private:
+    virtual ::rtl::OUString implGetImplementationName() const;
+};
+
+// ============================================================================
+
+} // namespace ole
+} // namespace oox
+
+#endif
diff --git a/oox/source/ppt/customshowlistcontext.hxx b/oox/inc/oox/ppt/customshowlistcontext.hxx
index df5ca3a7a6fe..df5ca3a7a6fe 100644
--- a/oox/source/ppt/customshowlistcontext.hxx
+++ b/oox/inc/oox/ppt/customshowlistcontext.hxx
diff --git a/oox/inc/oox/ppt/pptimport.hxx b/oox/inc/oox/ppt/pptimport.hxx
index 6ca5cae5b1f3..9c87c66a97e4 100644
--- a/oox/inc/oox/ppt/pptimport.hxx
+++ b/oox/inc/oox/ppt/pptimport.hxx
@@ -65,8 +65,15 @@ public:
     std::vector< SlidePersistPtr >&                         getMasterPages(){ return maMasterPages; };
     std::vector< SlidePersistPtr >&                         getNotesPages(){ return maNotesPages; };
 
+    virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence<   ::com::sun::star::beans::PropertyValue >& rDescriptor )
+        throw( ::com::sun::star::uno::RuntimeException );
+
     sal_Int32 getSchemeColor( sal_Int32 nToken ) const;
 
+#if OSL_DEBUG_LEVEL > 0
+    static XmlFilterBase* mpDebugFilterBase;
+#endif
+
 private:
     virtual GraphicHelper* implCreateGraphicHelper() const;
     virtual ::rtl::OUString implGetImplementationName() const;
diff --git a/oox/inc/oox/ppt/presentationfragmenthandler.hxx b/oox/inc/oox/ppt/presentationfragmenthandler.hxx
index 9be2db40c8d8..f4d46dba9afc 100644
--- a/oox/inc/oox/ppt/presentationfragmenthandler.hxx
+++ b/oox/inc/oox/ppt/presentationfragmenthandler.hxx
@@ -35,7 +35,7 @@
 #include "oox/ppt/slidepersist.hxx"
 #include "oox/core/fragmenthandler.hxx"
 #include "oox/core/relations.hxx"
-#include "customshowlistcontext.hxx"
+#include "oox/ppt/customshowlistcontext.hxx"
 
 #include <stack>
 #include <vector>
diff --git a/oox/inc/oox/ppt/slidepersist.hxx b/oox/inc/oox/ppt/slidepersist.hxx
index dc8b03677040..0aa95dde5f5a 100644
--- a/oox/inc/oox/ppt/slidepersist.hxx
+++ b/oox/inc/oox/ppt/slidepersist.hxx
@@ -72,6 +72,10 @@ public:
 
     com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >    getPage() const { return mxPage; };
 
+#if OSL_DEBUG_LEVEL > 0
+    static com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > mxDebugPage;
+#endif
+
     void setMasterPersist( SlidePersistPtr pMasterPersistPtr ){ mpMasterPagePtr = pMasterPersistPtr; }
     SlidePersistPtr getMasterPersist() const { return mpMasterPagePtr; }
 
diff --git a/oox/inc/oox/xls/drawingfragment.hxx b/oox/inc/oox/xls/drawingfragment.hxx
index 7a6de04adca5..71d60433e4c6 100644
--- a/oox/inc/oox/xls/drawingfragment.hxx
+++ b/oox/inc/oox/xls/drawingfragment.hxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/awt/Size.hpp>
 #include "oox/drawingml/shape.hxx"
+#include "oox/ole/axcontrol.hxx"
 #include "oox/vml/vmldrawing.hxx"
 #include "oox/vml/vmldrawingfragment.hxx"
 #include "oox/xls/excelhandlers.hxx"
@@ -183,6 +184,10 @@ public:
     virtual void        notifyShapeInserted(
                             const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape,
                             const ::com::sun::star::awt::Rectangle& rShapeRect );
+
+private:
+    ::oox::ole::ControlConverter maControlConv;
+
 };
 
 // ============================================================================
diff --git a/oox/inc/oox/xls/excelfilter.hxx b/oox/inc/oox/xls/excelfilter.hxx
index 407533f80016..f3e4a571653c 100644
--- a/oox/inc/oox/xls/excelfilter.hxx
+++ b/oox/inc/oox/xls/excelfilter.hxx
@@ -31,6 +31,7 @@
 
 #include "oox/core/xmlfilterbase.hxx"
 #include "oox/core/binaryfilterbase.hxx"
+#include "oox/ole/vbaprojectfilter.hxx"
 
 namespace oox {
 namespace xls {
@@ -97,6 +98,20 @@ private:
 
 // ============================================================================
 
+class ExcelVbaProjectFilter : public ExcelBiffFilter
+{
+public:
+    explicit            ExcelVbaProjectFilter(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxGlobalFactory );
+
+    virtual bool        importDocument() throw();
+
+private:
+    virtual ::rtl::OUString implGetImplementationName() const;
+};
+
+// ============================================================================
+
 } // namespace xls
 } // namespace oox
 
diff --git a/oox/prj/d.lst b/oox/prj/d.lst
index 70c7c1ea52ef..e8a689b58908 100644
--- a/oox/prj/d.lst
+++ b/oox/prj/d.lst
@@ -26,6 +26,7 @@ mkdir: %_DEST%\inc%_EXT%\oox\xls
 ..\inc\oox\helper\binarystreambase.hxx %_DEST%\inc%_EXT%\oox\helper\binarystreambase.hxx
 ..\inc\oox\helper\helper.hxx %_DEST%\inc%_EXT%\oox\helper\helper.hxx
 ..\inc\oox\helper\containerhelper.hxx %_DEST%\inc%_EXT%\oox\helper\containerhelper.hxx
+..\inc\oox\helper\graphichelper.hxx %_DEST%\inc%_EXT%\oox\helper\graphichelper.hxx
 ..\inc\oox\helper\storagebase.hxx %_DEST%\inc%_EXT%\oox\helper\storagebase.hxx
 ..\inc\oox\helper\zipstorage.hxx %_DEST%\inc%_EXT%\oox\helper\zipstorage.hxx
 ..\inc\oox\core\filterbase.hxx %_DEST%\inc%_EXT%\oox\core\filterbase.hxx
@@ -39,6 +40,7 @@ mkdir: %_DEST%\inc%_EXT%\oox\xls
 ..\inc\oox\vml\vmldrawing.hxx %_DEST%\inc%_EXT%\oox\vml\vmldrawing.hxx
 ..\inc\oox\vml\vmlshape.hxx %_DEST%\inc%_EXT%\oox\vml\vmlshape.hxx
 ..\inc\oox\export\*.hxx %_DEST%\inc%_EXT%\oox\export\*.hxx
+..\inc\oox\ole\oleobjecthelper.hxx %_DEST%\inc%_EXT%\oox\ole\oleobjecthelper.hxx
 
 dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"
 
diff --git a/oox/source/core/facreg.cxx b/oox/source/core/facreg.cxx
index 590cdd876e93..36dbe9f8ce95 100644
--- a/oox/source/core/facreg.cxx
+++ b/oox/source/core/facreg.cxx
@@ -61,6 +61,8 @@ namespace oox {
     namespace xls { SERVICE( BiffDetector ); }
     namespace xls { SERVICE( ExcelFilter ); }
     namespace xls { SERVICE( ExcelBiffFilter ); }
+    namespace xls { SERVICE( ExcelVbaProjectFilter ); }
+    namespace ole { SERVICE( WordVbaProjectFilter ); }
     namespace shape { SERVICE( ShapeContextHandler ); }
     namespace shape { SERVICE( FastTokenHandlerService ); }
     namespace docprop { SERVICE2( OOXMLDocPropImportImpl ); }
@@ -104,6 +106,8 @@ OOX_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo( void * , void * pRegistryKe
             WRITEINFO( ::oox::xls::BiffDetector );
             WRITEINFO( ::oox::xls::ExcelFilter );
             WRITEINFO( ::oox::xls::ExcelBiffFilter );
+            WRITEINFO( ::oox::xls::ExcelVbaProjectFilter );
+            WRITEINFO( ::oox::ole::WordVbaProjectFilter );
             WRITEINFO( ::oox::shape::ShapeContextHandler );
             WRITEINFO( ::oox::shape::FastTokenHandlerService );
             WRITEINFO( ::oox::docprop::OOXMLDocPropImportImpl );
@@ -152,6 +156,8 @@ OOX_DLLPUBLIC void * SAL_CALL component_getFactory( const sal_Char * pImplName,
         else SINGLEFACTORY( ::oox::xls::BiffDetector )
         else SINGLEFACTORY( ::oox::xls::ExcelFilter )
         else SINGLEFACTORY( ::oox::xls::ExcelBiffFilter )
+        else SINGLEFACTORY( ::oox::xls::ExcelVbaProjectFilter )
+        else SINGLEFACTORY( ::oox::ole::WordVbaProjectFilter )
         else SINGLEFACTORY( ::oox::shape::ShapeContextHandler)
         else SINGLEFACTORY( ::oox::shape::FastTokenHandlerService)
         else SINGLEFACTORY2( ::oox::docprop::OOXMLDocPropImportImpl )
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 37e26f415ca4..c07e3dbf6725 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -142,7 +142,7 @@ static Reference< XComponentContext > lcl_getComponentContext(Reference< XMultiS
     {
         Reference< XPropertySet > xFactProp( aFactory, UNO_QUERY );
         if( xFactProp.is() )
-            xFactProp->getPropertyValue( OUString::createFromAscii("DefaultContext") ) >>= xContext;
+            xFactProp->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext;
     }
     catch( Exception& )
     {}
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index d7b2bc7b1bb2..86726ea1efae 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -246,7 +246,7 @@ Reference< XShape > Shape::createAndInsert(
     OUString aServiceName = rServiceName;
     if( mxCreateCallback.get() )
         aServiceName = mxCreateCallback->onCreateXShape( aServiceName, awt::Rectangle( aPosition.X / 360, aPosition.Y / 360, aSize.Width / 360, aSize.Height / 360 ) );
-    sal_Bool bIsCustomShape = aServiceName == OUString::createFromAscii( "com.sun.star.drawing.CustomShape" );
+    sal_Bool bIsCustomShape = aServiceName == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CustomShape"));
 
     basegfx::B2DHomMatrix aTransformation;
     if( aSize.Width != 1 || aSize.Height != 1)
@@ -289,7 +289,7 @@ Reference< XShape > Shape::createAndInsert(
     }
 
     // special for lineshape
-    if ( aServiceName == OUString::createFromAscii( "com.sun.star.drawing.LineShape" ) )
+    if ( aServiceName == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.LineShape")) )
     {
         ::basegfx::B2DPolygon aPoly;
         aPoly.insert( 0, ::basegfx::B2DPoint( 0, 0 ) );
@@ -310,7 +310,7 @@ Reference< XShape > Shape::createAndInsert(
 
         maShapeProperties[ PROP_PolyPolygon ] <<= aPolyPolySequence;
     }
-    else if ( aServiceName == OUString::createFromAscii( "com.sun.star.drawing.ConnectorShape" ) )
+    else if ( aServiceName == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ConnectorShape")) )
     {
         ::basegfx::B2DPolygon aPoly;
         aPoly.insert( 0, ::basegfx::B2DPoint( 0, 0 ) );
@@ -438,9 +438,9 @@ Reference< XShape > Shape::createAndInsert(
 
         // applying properties
         PropertySet aPropSet( xSet );
-        if ( aServiceName == OUString::createFromAscii( "com.sun.star.drawing.GraphicObjectShape" ) )
+        if ( aServiceName == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GraphicObjectShape")) )
             mpGraphicPropertiesPtr->pushToPropSet( aPropSet, rGraphicHelper );
-        if ( mpTablePropertiesPtr.get() && ( aServiceName == OUString::createFromAscii( "com.sun.star.drawing.TableShape" ) ) )
+        if ( mpTablePropertiesPtr.get() && ( aServiceName == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.TableShape")) ) )
             mpTablePropertiesPtr->pushToPropSet( rFilterBase, xSet, mpMasterTextListStyle );
         aFillProperties.pushToPropSet( aPropSet, rModelObjectHelper, rGraphicHelper, FillProperties::DEFAULT_IDS, mnRotation, nFillPhClr );
         aLineProperties.pushToPropSet( aPropSet, rModelObjectHelper, rGraphicHelper, LineProperties::DEFAULT_IDS, nLinePhClr );
@@ -455,7 +455,7 @@ Reference< XShape > Shape::createAndInsert(
                 xSet->setPropertyValue( rPropName, Any( false ) );
 
         // do not set properties at a group shape (this causes assertions from svx)
-        if( aServiceName != OUString::createFromAscii( "com.sun.star.drawing.GroupShape" ) )
+        if( aServiceName != OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GroupShape")) )
             aPropSet.setProperties( aShapeProperties );
 
         if( bIsCustomShape )
diff --git a/oox/source/drawingml/shapecontext.cxx b/oox/source/drawingml/shapecontext.cxx
index e7f3670ec467..6c9769bb8f72 100644
--- a/oox/source/drawingml/shapecontext.cxx
+++ b/oox/source/drawingml/shapecontext.cxx
@@ -41,6 +41,7 @@
 #include "oox/drawingml/drawingmltypes.hxx"
 #include "oox/drawingml/customshapegeometry.hxx"
 #include "oox/drawingml/textbodycontext.hxx"
+#include "hyperlinkcontext.hxx"
 #include "tokens.hxx"
 
 using rtl::OUString;
@@ -94,6 +95,10 @@ Reference< XFastContextHandler > ShapeContext::createFastChildContext( sal_Int32
         mpShapePtr->setName( xAttribs->getOptionalValue( XML_name ) );
         break;
     }
+    case XML_hlinkMouseOver:
+    case XML_hlinkClick:
+        xRet = new HyperLinkContext( *this, xAttribs,  getShape()->getShapeProperties() );
+        break;
     case XML_ph:
         mpShapePtr->setSubType( xAttribs->getOptionalValueToken( XML_type, XML_obj ) );
         if( xAttribs->hasAttribute( XML_idx ) )
diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx
index f851cdc31bb9..08d4f4d310a7 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -99,7 +99,7 @@ void applyBorder( TableStylePart& rTableStylePart, sal_Int32 nLineType, oox::dra
         rLineProperties.assignUsed( *aIter->second );
 }
 
-void applyTableStylePart( const ::oox::core::XmlFilterBase& rFilterBase, const Reference < ::com::sun::star::table::XCell >& rxCell, oox::drawingml::FillProperties& rFillProperties,
+void applyTableStylePart( const ::oox::core::XmlFilterBase& rFilterBase, const Reference < text::XTextRange >& rxStart, oox::drawingml::FillProperties& rFillProperties,
      oox::drawingml::LineProperties& rLeftBorder,
      oox::drawingml::LineProperties& rRightBorder,
      oox::drawingml::LineProperties& rTopBorder,
@@ -125,9 +125,13 @@ void applyTableStylePart( const ::oox::core::XmlFilterBase& rFilterBase, const R
     aTextCharProps.maComplexFont = rTableStylePart.getComplexFont();
     aTextCharProps.maSymbolFont = rTableStylePart.getSymbolFont();
     aTextCharProps.maCharColor = rTableStylePart.getTextColor();
+    if( rTableStylePart.getTextBoldStyle().is_initialized() )
+        aTextCharProps.moBold = rTableStylePart.getTextBoldStyle();
+    if( rTableStylePart.getTextItalicStyle().is_initialized() )
+        aTextCharProps.moItalic = rTableStylePart.getTextItalicStyle();
 
-    PropertySet aPropSet( rxCell );
-    aTextCharProps.pushToPropSet( aPropSet, rFilterBase );
+    PropertySet aPropSet( rxStart );
+    aTextCharProps.pushToPropSet( aPropSet, rFilterBase, true );
 }
 
 void applyTableCellProperties( const Reference < ::com::sun::star::table::XCell >& rxCell, const TableCell& rTableCell )
@@ -170,6 +174,9 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oo
     applyTableCellProperties( rxCell, *this );
     TextCharacterProperties aTextStyleProps;
     getTextBody()->insertAt( rFilterBase, xText, xAt, aTextStyleProps, pMasterTextListStyle );
+    xAt->gotoStart( sal_True );
+    Reference< text::XTextRange > xStart( xAt, UNO_QUERY );
+    xAt->gotoEnd( sal_True );
 
     Reference< XPropertySet > xPropSet( rxCell, UNO_QUERY_THROW );
     oox::drawingml::FillProperties aFillProperties;
@@ -184,7 +191,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oo
     if ( rBackgroundFillPropertiesPtr.get() )
         aFillProperties.assignUsed( *rBackgroundFillPropertiesPtr );
 
-    applyTableStylePart( rFilterBase, rxCell, aFillProperties,
+    applyTableStylePart( rFilterBase, xStart, aFillProperties,
         aLinePropertiesLeft,
         aLinePropertiesRight,
         aLinePropertiesTop,
@@ -195,7 +202,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oo
 
     if ( rProperties.isFirstRow() && ( nRow == 0 ) )
     {
-        applyTableStylePart( rFilterBase, rxCell, aFillProperties,
+        applyTableStylePart( rFilterBase, xStart, aFillProperties,
             aLinePropertiesLeft,
             aLinePropertiesRight,
             aLinePropertiesTop,
@@ -206,7 +213,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oo
     }
     if ( rProperties.isLastRow() && ( nRow == nMaxRow ) )
     {
-        applyTableStylePart( rFilterBase, rxCell, aFillProperties,
+        applyTableStylePart( rFilterBase, xStart, aFillProperties,
             aLinePropertiesLeft,
             aLinePropertiesRight,
             aLinePropertiesTop,
@@ -217,7 +224,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oo
     }
     if ( rProperties.isFirstCol() && ( nColumn == 0 ) )
     {
-        applyTableStylePart( rFilterBase, rxCell, aFillProperties,
+        applyTableStylePart( rFilterBase, xStart, aFillProperties,
             aLinePropertiesLeft,
             aLinePropertiesRight,
             aLinePropertiesTop,
@@ -228,7 +235,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oo
     }
     if ( rProperties.isLastCol() && ( nColumn == nMaxColumn ) )
     {
-        applyTableStylePart( rFilterBase, rxCell, aFillProperties,
+        applyTableStylePart( rFilterBase, xStart, aFillProperties,
             aLinePropertiesLeft,
             aLinePropertiesRight,
             aLinePropertiesTop,
@@ -247,7 +254,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oo
                 nBand++;
             if ( nBand & 1 )
             {
-                applyTableStylePart( rFilterBase, rxCell, aFillProperties,
+                applyTableStylePart( rFilterBase, xStart, aFillProperties,
                     aLinePropertiesLeft,
                     aLinePropertiesRight,
                     aLinePropertiesTop,
@@ -258,7 +265,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oo
             }
             else
             {
-                applyTableStylePart( rFilterBase, rxCell, aFillProperties,
+                applyTableStylePart( rFilterBase, xStart, aFillProperties,
                     aLinePropertiesLeft,
                     aLinePropertiesRight,
                     aLinePropertiesTop,
@@ -271,7 +278,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oo
     }
     if ( ( nRow == 0 ) && ( nColumn == 0 ) )
     {
-        applyTableStylePart( rFilterBase, rxCell, aFillProperties,
+        applyTableStylePart( rFilterBase, xStart, aFillProperties,
             aLinePropertiesLeft,
             aLinePropertiesRight,
             aLinePropertiesTop,
@@ -282,7 +289,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oo
     }
     if ( ( nRow == nMaxRow ) && ( nColumn == 0 ) )
     {
-        applyTableStylePart( rFilterBase, rxCell, aFillProperties,
+        applyTableStylePart( rFilterBase, xStart, aFillProperties,
             aLinePropertiesLeft,
             aLinePropertiesRight,
             aLinePropertiesTop,
@@ -293,7 +300,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oo
     }
     if ( ( nRow == 0 ) && ( nColumn == nMaxColumn ) )
     {
-        applyTableStylePart( rFilterBase, rxCell, aFillProperties,
+        applyTableStylePart( rFilterBase, xStart, aFillProperties,
             aLinePropertiesLeft,
             aLinePropertiesRight,
             aLinePropertiesTop,
@@ -304,7 +311,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oo
     }
     if ( ( nRow == nMaxColumn ) && ( nColumn == nMaxColumn ) )
     {
-        applyTableStylePart( rFilterBase, rxCell, aFillProperties,
+        applyTableStylePart( rFilterBase, xStart, aFillProperties,
             aLinePropertiesLeft,
             aLinePropertiesRight,
             aLinePropertiesTop,
@@ -323,7 +330,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oo
                 nBand++;
             if ( nBand & 1 )
             {
-                applyTableStylePart( rFilterBase, rxCell, aFillProperties,
+                applyTableStylePart( rFilterBase, xStart, aFillProperties,
                     aLinePropertiesLeft,
                     aLinePropertiesRight,
                     aLinePropertiesTop,
@@ -334,7 +341,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oo
             }
             else
             {
-                applyTableStylePart( rFilterBase, rxCell, aFillProperties,
+                applyTableStylePart( rFilterBase, xStart, aFillProperties,
                     aLinePropertiesLeft,
                     aLinePropertiesRight,
                     aLinePropertiesTop,
diff --git a/oox/source/drawingml/table/tablestyletextstylecontext.cxx b/oox/source/drawingml/table/tablestyletextstylecontext.cxx
index b591564989a7..2e94e57df66a 100644
--- a/oox/source/drawingml/table/tablestyletextstylecontext.cxx
+++ b/oox/source/drawingml/table/tablestyletextstylecontext.cxx
@@ -46,17 +46,21 @@ TableStyleTextStyleContext::TableStyleTextStyleContext( ContextHandler& rParent,
 : ContextHandler( rParent )
 , mrTableStylePart( rTableStylePart )
 {
-    sal_Int32 nB = xAttribs->getOptionalValueToken( XML_b, XML_def );
-    if ( nB == XML_on )
-        mrTableStylePart.getTextBoldStyle() = ::boost::optional< sal_Bool >( sal_True );
-    else if ( nB == XML_off )
-        mrTableStylePart.getTextBoldStyle() = ::boost::optional< sal_Bool >( sal_False );
+    if( xAttribs->hasAttribute( XML_b ) ) {
+        sal_Int32 nB = xAttribs->getOptionalValueToken( XML_b, XML_def );
+        if ( nB == XML_on )
+            mrTableStylePart.getTextBoldStyle() = ::boost::optional< sal_Bool >( sal_True );
+        else if ( nB == XML_off )
+            mrTableStylePart.getTextBoldStyle() = ::boost::optional< sal_Bool >( sal_False );
+    }
 
-    sal_Int32 nI = xAttribs->getOptionalValueToken( XML_i, XML_def );
-    if ( nI == XML_on )
-        mrTableStylePart.getTextItalicStyle() = ::boost::optional< sal_Bool >( sal_True );
-    else if ( nI == XML_off )
-        mrTableStylePart.getTextItalicStyle() = ::boost::optional< sal_Bool >( sal_False );
+    if( xAttribs->hasAttribute( XML_i ) ) {
+        sal_Int32 nI = xAttribs->getOptionalValueToken( XML_i, XML_def );
+        if ( nI == XML_on )
+            mrTableStylePart.getTextItalicStyle() = ::boost::optional< sal_Bool >( sal_True );
+        else if ( nI == XML_off )
+            mrTableStylePart.getTextItalicStyle() = ::boost::optional< sal_Bool >( sal_False );
+    }
 }
 
 TableStyleTextStyleContext::~TableStyleTextStyleContext()
diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx
index 52b8a112076e..feda383cf444 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -70,7 +70,7 @@ void TextCharacterProperties::assignUsed( const TextCharacterProperties& rSource
     moUnderlineFillFollowText.assignIfUsed( rSourceProps.moUnderlineFillFollowText );
 }
 
-void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFilterBase& rFilter ) const
+    void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFilterBase& rFilter, bool bUseOptional ) const
 {
     OUString aFontName;
     sal_Int16 nFontPitch = 0;
@@ -134,15 +134,19 @@ void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFil
     rPropMap[ PROP_CharStrikeout ] <<= GetFontStrikeout( moStrikeout.get( XML_noStrike ) );
     rPropMap[ PROP_CharCaseMap ] <<= GetCaseMap( moCaseMap.get( XML_none ) );
 
-    float fWeight = moBold.get( false ) ? awt::FontWeight::BOLD : awt::FontWeight::NORMAL;
-    rPropMap[ PROP_CharWeight ] <<= fWeight;
-    rPropMap[ PROP_CharWeightAsian ] <<= fWeight;
-    rPropMap[ PROP_CharWeightComplex ] <<= fWeight;
+    if( !bUseOptional || moBold.has() ) {
+        float fWeight = moBold.get( false ) ? awt::FontWeight::BOLD : awt::FontWeight::NORMAL;
+        rPropMap[ PROP_CharWeight ] <<= fWeight;
+        rPropMap[ PROP_CharWeightAsian ] <<= fWeight;
+        rPropMap[ PROP_CharWeightComplex ] <<= fWeight;
+    }
 
-    awt::FontSlant eSlant = moItalic.get( false ) ? awt::FontSlant_ITALIC : awt::FontSlant_NONE;
-    rPropMap[ PROP_CharPosture ] <<= eSlant;
-    rPropMap[ PROP_CharPostureAsian ] <<= eSlant;
-    rPropMap[ PROP_CharPostureComplex ] <<= eSlant;
+    if( !bUseOptional || moItalic.has() ) {
+        awt::FontSlant eSlant = moItalic.get( false ) ? awt::FontSlant_ITALIC : awt::FontSlant_NONE;
+        rPropMap[ PROP_CharPosture ] <<= eSlant;
+        rPropMap[ PROP_CharPostureAsian ] <<= eSlant;
+        rPropMap[ PROP_CharPostureComplex ] <<= eSlant;
+    }
 
     bool bUnderlineFillFollowText = moUnderlineFillFollowText.get( false );
     if( moUnderline.has() && maUnderlineColor.isUsed() && !bUnderlineFillFollowText )
@@ -152,10 +156,10 @@ void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFil
     }
 }
 
-void TextCharacterProperties::pushToPropSet( PropertySet& rPropSet, const XmlFilterBase& rFilter ) const
+    void TextCharacterProperties::pushToPropSet( PropertySet& rPropSet, const XmlFilterBase& rFilter, bool bUseOptional ) const
 {
     PropertyMap aPropMap;
-    pushToPropMap( aPropMap, rFilter );
+    pushToPropMap( aPropMap, rFilter, bUseOptional );
     rPropSet.setProperties( aPropMap );
 }
 
diff --git a/oox/source/drawingml/textfield.cxx b/oox/source/drawingml/textfield.cxx
index 875451386639..a02cebc7bf8a 100644
--- a/oox/source/drawingml/textfield.cxx
+++ b/oox/source/drawingml/textfield.cxx
@@ -152,7 +152,7 @@ void TextField::insertAt(
         Reference< XPropertySet > xProps( xStart, UNO_QUERY);
         PropertySet aPropSet( xProps );
 
-        maTextParagraphProperties.pushToPropSet( rFilterBase, xProps, aioBulletList, NULL, sal_True, 18 );
+        maTextParagraphProperties.pushToPropSet( &rFilterBase, xProps, aioBulletList, NULL, sal_True, 18 );
 
         TextCharacterProperties aTextCharacterProps( rTextCharacterStyle );
         aTextCharacterProps.assignUsed( maTextParagraphProperties.getTextCharacterProperties() );
diff --git a/oox/source/drawingml/textliststyle.cxx b/oox/source/drawingml/textliststyle.cxx
index 5d4504f52039..3fb3858495fe 100644
--- a/oox/source/drawingml/textliststyle.cxx
+++ b/oox/source/drawingml/textliststyle.cxx
@@ -67,7 +67,7 @@ void TextListStyle::apply( const TextListStyle& rTextListStyle )
 }
 
 #if OSL_DEBUG_LEVEL > 0
-void TextListStyle::dump( int nLevels )
+void TextListStyle::dump( int nLevels ) const
 {
     for ( int i = 0; i < nLevels; i++ )
     {
diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx
index feda8f2ac00d..9ca2650bc7ba 100644
--- a/oox/source/drawingml/textparagraph.cxx
+++ b/oox/source/drawingml/textparagraph.cxx
@@ -103,10 +103,10 @@ void TextParagraph::insertAt(
         float fCharacterSize = 18;
         if ( pTextParagraphStyle.get() )
         {
-            pTextParagraphStyle->pushToPropSet( rFilterBase, xProps, aioBulletList, NULL, sal_False, fCharacterSize );
+            pTextParagraphStyle->pushToPropSet( &rFilterBase, xProps, aioBulletList, NULL, sal_False, fCharacterSize );
             fCharacterSize = pTextParagraphStyle->getCharHeightPoints( 18 );
         }
-        maProperties.pushToPropSet( rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), sal_True, fCharacterSize );
+        maProperties.pushToPropSet( &rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), sal_True, fCharacterSize );
 
         // empty paragraphs do not have bullets in ppt
         if ( !nParagraphSize )
diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx
index 68aad1f3cf26..11c7abed964a 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -44,6 +44,17 @@
 #include "properties.hxx"
 #include "tokens.hxx"
 
+#if OSL_DEBUG_LEVEL > 0
+#include <vcl/unohelp.hxx>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/text/XText.hpp>
+#include <com/sun/star/drawing/XShape.hpp>
+#include <comphelper/genericpropertyset.hxx>
+#include <comphelper/processfactory.hxx>
+#include <oox/ppt/pptimport.hxx>
+#include <oox/ppt/slidepersist.hxx>
+#endif
+
 using rtl::OUString;
 using namespace ::oox::core;
 using namespace ::com::sun::star::uno;
@@ -280,7 +291,7 @@ void BulletList::apply( const BulletList& rSource )
         maGraphic = rSource.maGraphic;
 }
 
-void BulletList::pushToPropMap( const ::oox::core::XmlFilterBase& rFilterBase, PropertyMap& rPropMap ) const
+void BulletList::pushToPropMap( const ::oox::core::XmlFilterBase* pFilterBase, PropertyMap& rPropMap ) const
 {
     if( msNumberingPrefix.hasValue() )
         rPropMap[ PROP_Prefix ] = msNumberingPrefix;
@@ -296,19 +307,21 @@ void BulletList::pushToPropMap( const ::oox::core::XmlFilterBase& rFilterBase, P
     OUString aBulletFontName;
     sal_Int16 nBulletFontPitch = 0;
     sal_Int16 nBulletFontFamily = 0;
-    if( maBulletFont.getFontData( aBulletFontName, nBulletFontPitch, nBulletFontFamily, rFilterBase ) )
-    {
-        FontDescriptor aFontDesc;
-        sal_Int16 nFontSize = 0;
-        if( mnFontSize >>= nFontSize )
-            aFontDesc.Height = nFontSize;
-
-        // TODO move the to the TextFont struct.
-        aFontDesc.Name = aBulletFontName;
-        aFontDesc.Pitch = nBulletFontPitch;
-        aFontDesc.Family = nBulletFontFamily;
-        rPropMap[ PROP_BulletFont ] <<= aFontDesc;
-        rPropMap[ PROP_BulletFontName ] <<= aBulletFontName;
+    if( pFilterBase) {
+        if (maBulletFont.getFontData( aBulletFontName, nBulletFontPitch, nBulletFontFamily, *pFilterBase ) )
+        {
+            FontDescriptor aFontDesc;
+            sal_Int16 nFontSize = 0;
+            if( mnFontSize >>= nFontSize )
+                aFontDesc.Height = nFontSize;
+
+            // TODO move the to the TextFont struct.
+            aFontDesc.Name = aBulletFontName;
+            aFontDesc.Pitch = nBulletFontPitch;
+            aFontDesc.Family = nBulletFontFamily;
+            rPropMap[ PROP_BulletFont ] <<= aFontDesc;
+            rPropMap[ PROP_BulletFontName ] <<= aBulletFontName;
+        }
     }
     if ( msBulletChar.hasValue() )
         rPropMap[ PROP_BulletChar ] = msBulletChar;
@@ -322,8 +335,10 @@ void BulletList::pushToPropMap( const ::oox::core::XmlFilterBase& rFilterBase, P
         rPropMap[ PROP_BulletRelSize ] = mnSize;
     if ( maStyleName.hasValue() )
         rPropMap[ PROP_CharStyleName ] <<= maStyleName;
-    if ( maBulletColorPtr->isUsed() )
-        rPropMap[ PROP_BulletColor ] <<= maBulletColorPtr->getColor( rFilterBase.getGraphicHelper() );
+    if (pFilterBase ) {
+        if ( maBulletColorPtr->isUsed() )
+            rPropMap[ PROP_BulletColor ] <<= maBulletColorPtr->getColor( pFilterBase->getGraphicHelper() );
+    }
 }
 
 TextParagraphProperties::TextParagraphProperties()
@@ -350,7 +365,7 @@ void TextParagraphProperties::apply( const TextParagraphProperties& rSourceProps
         moFirstLineIndentation = rSourceProps.moFirstLineIndentation;
 }
 
-void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase& rFilterBase,
+void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* pFilterBase,
     const Reference < XPropertySet >& xPropSet, PropertyMap& rioBulletMap, const BulletList* pMasterBuList, sal_Bool bApplyBulletMap, float fCharacterSize ) const
 {
     PropertySet aPropSet( xPropSet );
@@ -364,7 +379,7 @@ void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase& r
     if ( nNumberingType == NumberingType::NUMBER_NONE )
         aPropSet.setProperty< sal_Int16 >( PROP_NumberingLevel, -1 );
 
-    maBulletList.pushToPropMap( rFilterBase, rioBulletMap );
+    maBulletList.pushToPropMap( pFilterBase, rioBulletMap );
 
     if ( maParaTopMargin.bHasValue )
         aPropSet.setProperty( PROP_ParaTopMargin, maParaTopMargin.toMargin( getCharHeightPoints( 18.0 ) ) );
@@ -414,7 +429,7 @@ void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase& r
         }
     }
     if ( noParaLeftMargin )
-        aPropSet.setProperty( PROP_ParaLeftMargin, *noParaLeftMargin );
+        aPropSet.setProperty( PROP_ParaLeftMargin, sal_Int32(0) /**noParaLeftMargin*/ );
     if ( noFirstLineIndentation )
         aPropSet.setProperty( PROP_ParaFirstLineIndent, *noFirstLineIndentation );
 }
@@ -424,6 +439,30 @@ float TextParagraphProperties::getCharHeightPoints( float fDefault ) const
     return maTextCharacterProperties.getCharHeightPoints( fDefault );
 }
 
+
+#if OSL_DEBUG_LEVEL > 0
+
+void TextParagraphProperties::dump()
+{
+    Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory();
+    Reference< ::com::sun::star::drawing::XShape > xShape( oox::ppt::PowerPointImport::mpDebugFilterBase->getModelFactory()->createInstance( CREATE_OUSTRING( "com.sun.star.presentation.TitleTextShape" ) ), UNO_QUERY );
+    Reference< ::com::sun::star::text::XText > xText( xShape, UNO_QUERY );
+
+    ppt::SlidePersist::mxDebugPage->add( xShape );
+
+    PropertyMap emptyMap;
+
+    const OUString sText = CREATE_OUSTRING("debug");
+    xText->setString( sText );
+    Reference< ::com::sun::star::text::XTextCursor > xStart( xText->createTextCursor(), UNO_QUERY );
+    Reference< ::com::sun::star::text::XTextRange > xRange( xStart, UNO_QUERY );
+    xStart->gotoEnd( sal_True );
+    Reference< XPropertySet > xPropSet( xRange, UNO_QUERY );
+    pushToPropSet( NULL, xPropSet, emptyMap, NULL, false, 0 );
+    PropertySet pSet( xPropSet );
+    pSet.dump();
+}
+#endif
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/export/SchXMLSeriesHelper.cxx b/oox/source/export/SchXMLSeriesHelper.cxx
index c755a5338892..83111ec6b0fc 100644
--- a/oox/source/export/SchXMLSeriesHelper.cxx
+++ b/oox/source/export/SchXMLSeriesHelper.cxx
@@ -207,7 +207,7 @@ Reference< chart2::XDataSeries > SchXMLSeriesHelper::getFirstCandleStickSeries(
             for( sal_Int32 nCTIdx=0; !xResult.is() && nCTIdx<aCTSeq.getLength(); ++nCTIdx )
             {
                 if( aCTSeq[nCTIdx]->getChartType().equals(
-                        ::rtl::OUString::createFromAscii("com.sun.star.chart2.CandleStickChartType")))
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.CandleStickChartType"))))
                 {
                     Reference< chart2::XDataSeriesContainer > xSeriesCnt( aCTSeq[nCTIdx], uno::UNO_QUERY_THROW );
                     Sequence< Reference< chart2::XDataSeries > > aSeriesSeq( xSeriesCnt->getDataSeries() );
@@ -240,7 +240,7 @@ uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPISeriesProp
             if( xFactory.is() )
             {
                 xRet = uno::Reference< beans::XPropertySet >( xFactory->createInstance(
-                    OUString::createFromAscii( "com.sun.star.comp.chart2.DataSeriesWrapper" ) ), uno::UNO_QUERY );
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.chart2.DataSeriesWrapper")) ), uno::UNO_QUERY );
                 Reference< lang::XInitialization > xInit( xRet, uno::UNO_QUERY );
                 if(xInit.is())
                 {
@@ -277,7 +277,7 @@ uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPIDataPointP
             if( xFactory.is() )
             {
                 xRet = uno::Reference< beans::XPropertySet >( xFactory->createInstance(
-                    OUString::createFromAscii( "com.sun.star.comp.chart2.DataSeriesWrapper" ) ), uno::UNO_QUERY );
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.chart2.DataSeriesWrapper")) ), uno::UNO_QUERY );
                 Reference< lang::XInitialization > xInit( xRet, uno::UNO_QUERY );
                 if(xInit.is())
                 {
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 524b728bc106..d5d3eab783d0 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -142,7 +142,7 @@ Reference< uno::XComponentContext > lcl_getComponentContext()
     {
         Reference< beans::XPropertySet > xFactProp( comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
         if( xFactProp.is())
-            xFactProp->getPropertyValue(OUString::createFromAscii("DefaultContext")) >>= xContext;
+            xFactProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))) >>= xContext;
     }
     catch( uno::Exception& )
     {}
@@ -231,7 +231,7 @@ Reference< chart2::data::XLabeledDataSequence > lcl_getCategories( const Referen
     {
         Sequence< Reference< chart2::data::XLabeledDataSequence > > aUnusedSequences( xDiagram->getUnusedData() );
 
-        lcl_MatchesRole aHasCategories( OUString::createFromAscii("categories" ) );
+        lcl_MatchesRole aHasCategories( OUString(RTL_CONSTASCII_USTRINGPARAM("categories")) );
         for( sal_Int32 nN=0; nN<aUnusedSequences.getLength(); nN++ )
         {
             if( aHasCategories( aUnusedSequences[nN] ) )
@@ -254,7 +254,7 @@ Reference< chart2::data::XDataSource > lcl_createDataSource(
     if( xContext.is() )
         xSink.set(
             xContext->getServiceManager()->createInstanceWithContext(
-                OUString::createFromAscii("com.sun.star.chart2.data.DataSource"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.data.DataSource")),
                 xContext ), uno::UNO_QUERY_THROW );
     if( xSink.is())
         xSink->setData( aData );
@@ -320,12 +320,12 @@ Reference< chart2::data::XDataSource > lcl_pressUsedDataIntoRectangularFormat( c
 
     //the first x-values is always the next sequence //todo ... other x-values get lost for old format
     Reference< chart2::data::XLabeledDataSequence > xXValues(
-        lcl_getDataSequenceByRole( aSeriesSeqVector, OUString::createFromAscii("values-x" ) ) );
+        lcl_getDataSequenceByRole( aSeriesSeqVector, OUString(RTL_CONSTASCII_USTRINGPARAM("values-x")) ) );
     if( xXValues.is() )
         aLabeledSeqVector.push_back( xXValues );
 
     //add all other sequences now without x-values
-    lcl_MatchesRole aHasXValues( OUString::createFromAscii("values-x" ) );
+    lcl_MatchesRole aHasXValues( OUString(RTL_CONSTASCII_USTRINGPARAM("values-x")) );
     for( sal_Int32 nN=0; nN<aSeriesSeqVector.getLength(); nN++ )
     {
         if( !aHasXValues( aSeriesSeqVector[nN] ) )
@@ -641,7 +641,7 @@ OUString ChartExport::parseFormula( const OUString& rRange )
     {
         try
         {
-            xParser.set( xSF->createInstance( OUString::createFromAscii( "com.sun.star.sheet.FormulaParser" ) ), UNO_QUERY );
+            xParser.set( xSF->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.FormulaParser")) ), UNO_QUERY );
         }
         catch( Exception& )
         {
@@ -653,12 +653,12 @@ OUString ChartExport::parseFormula( const OUString& rRange )
         Reference< XPropertySet > xParserProps( xParser, uno::UNO_QUERY );
         if( xParserProps.is() )
         {
-            xParserProps->setPropertyValue( OUString::createFromAscii("FormulaConvention"), uno::makeAny(::com::sun::star::sheet::AddressConvention::OOO) );
+            xParserProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("FormulaConvention")), uno::makeAny(::com::sun::star::sheet::AddressConvention::OOO) );
         }
         uno::Sequence<sheet::FormulaToken> aTokens = xParser->parseFormula( rRange, CellAddress( 0, 0, 0 ) );
         if( xParserProps.is() )
         {
-            xParserProps->setPropertyValue( OUString::createFromAscii("FormulaConvention"), uno::makeAny(::com::sun::star::sheet::AddressConvention::XL_OOX) );
+            xParserProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("FormulaConvention")), uno::makeAny(::com::sun::star::sheet::AddressConvention::XL_OOX) );
         }
         aResult = xParser->printFormula( aTokens, CellAddress( 0, 0, 0 ) );
     }
@@ -878,7 +878,7 @@ void ChartExport::_ExportContent()
             if( xServ.is())
             {
                 if( xServ->supportsService(
-                        OUString::createFromAscii( "com.sun.star.chart.ChartTableAddressSupplier" )))
+                        OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.ChartTableAddressSupplier"))))
                 {
                     Reference< beans::XPropertySet > xProp( xServ, uno::UNO_QUERY );
                     if( xProp.is())
@@ -888,13 +888,13 @@ void ChartExport::_ExportContent()
                         {
                             OUString sChartAddress;
                             aAny = xProp->getPropertyValue(
-                                OUString::createFromAscii( "ChartRangeAddress" ));
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("ChartRangeAddress")));
                             aAny >>= msChartAddress;
                             //maExportHelper.SetChartRangeAddress( sChartAddress );
 
                             OUString sTableNumberList;
                             aAny = xProp->getPropertyValue(
-                                OUString::createFromAscii( "TableNumberList" ));
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("TableNumberList")));
                             aAny >>= msTableNumberList;
                             //maExportHelper.SetTableNumberList( sTableNumberList );
 
@@ -1604,7 +1604,7 @@ void ChartExport::exportSeries( Reference< chart2::XChartType > xChartType, sal_
         sal_Bool bJapaneseCandleSticks = sal_False;
         Reference< beans::XPropertySet > xCTProp( xChartType, uno::UNO_QUERY );
         if( xCTProp.is())
-            xCTProp->getPropertyValue( OUString::createFromAscii("Japanese")) >>= bJapaneseCandleSticks;
+            xCTProp->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Japanese"))) >>= bJapaneseCandleSticks;
         exportCandleStickSeries(
             xDSCnt->getDataSeries(), bJapaneseCandleSticks, nAttachedAxis );
         return;
@@ -1636,7 +1636,7 @@ void ChartExport::exportSeries( Reference< chart2::XChartType > xChartType, sal_
                     {
                         Reference< beans::XPropertySet > xSeqProp( xTempValueSeq, uno::UNO_QUERY );
                         if( xSeqProp.is())
-                            xSeqProp->getPropertyValue(OUString::createFromAscii("Role")) >>= aRole;
+                            xSeqProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Role"))) >>= aRole;
                         // "main" sequence
                         if( aRole.equals( aLabelRole ))
                         {
@@ -1731,7 +1731,7 @@ void ChartExport::exportSeries( Reference< chart2::XChartType > xChartType, sal_
                         || (eChartType == chart::TYPEID_BUBBLE) )
                     {
                         // export xVal
-                        Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, OUString::createFromAscii("values-x" ) ) );
+                        Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM("values-x")) ) );
                         if( xSequence.is() )
                         {
                             Reference< chart2::data::XDataSequence > xValues( xSequence->getValues() );
@@ -1744,7 +1744,7 @@ void ChartExport::exportSeries( Reference< chart2::XChartType > xChartType, sal_
                     if( eChartType == chart::TYPEID_BUBBLE )
                     {
                         // export yVal
-                        Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, OUString::createFromAscii("values-y" ) ) );
+                        Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM("values-y")) ) );
                         if( xSequence.is() )
                         {
                             Reference< chart2::data::XDataSequence > xValues( xSequence->getValues() );
@@ -1791,7 +1791,7 @@ void ChartExport::exportCandleStickSeries(
                 xSource->getDataSequences());
 
             //sal_Int32 nSeriesLength =
-            //    lcl_getSequenceLengthByRole( aSeqCnt, OUString::createFromAscii("values-last"));
+            //    lcl_getSequenceLengthByRole( aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM("values-last")));
 
             Reference< chart2::XChartDocument > xNewDoc( getModel(), uno::UNO_QUERY );
             const char* sSeries[] = {"values-first","values-max","values-min","values-last",0};
@@ -2008,31 +2008,31 @@ void ChartExport::InitPlotArea( )
     if (xServiceInfo.is())
     {
         if (xServiceInfo->supportsService(
-            OUString::createFromAscii ("com.sun.star.chart.ChartAxisXSupplier")))
+            OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartAxisXSupplier"))))
         {
             xDiagramProperties->getPropertyValue(
                 OUString(RTL_CONSTASCII_USTRINGPARAM("HasXAxis"))) >>= mbHasXAxis;
         }
         if (xServiceInfo->supportsService(
-            OUString::createFromAscii ("com.sun.star.chart.ChartAxisYSupplier")))
+            OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartAxisYSupplier"))))
         {
             xDiagramProperties->getPropertyValue(
                 OUString(RTL_CONSTASCII_USTRINGPARAM("HasYAxis"))) >>= mbHasYAxis;
         }
         if (xServiceInfo->supportsService(
-            OUString::createFromAscii ("com.sun.star.chart.ChartAxisZSupplier")))
+            OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartAxisZSupplier"))))
         {
             xDiagramProperties->getPropertyValue(
                 OUString(RTL_CONSTASCII_USTRINGPARAM("HasZAxis"))) >>= mbHasZAxis;
         }
         if (xServiceInfo->supportsService(
-            OUString::createFromAscii ("com.sun.star.chart.ChartTwoAxisXSupplier")))
+            OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartTwoAxisXSupplier"))))
         {
             xDiagramProperties->getPropertyValue(
                 OUString(RTL_CONSTASCII_USTRINGPARAM("HasSecondaryXAxis"))) >>= mbHasSecondaryXAxis;
         }
         if (xServiceInfo->supportsService(
-            OUString::createFromAscii ("com.sun.star.chart.ChartTwoAxisYSupplier")))
+            OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartTwoAxisYSupplier"))))
         {
             xDiagramProperties->getPropertyValue(
                 OUString(RTL_CONSTASCII_USTRINGPARAM("HasSecondaryYAxis"))) >>= mbHasSecondaryYAxis;
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 240e31fb079d..d90ef29fb084 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -40,6 +40,8 @@
 #include <com/sun/star/awt/Gradient.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
+#include <com/sun/star/beans/Property.hpp>
+#include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/drawing/BitmapMode.hpp>
@@ -54,7 +56,10 @@
 #include <com/sun/star/drawing/BitmapMode.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
+#include <com/sun/star/style/LineSpacing.hpp>
+#include <com/sun/star/style/LineSpacingMode.hpp>
 #include <com/sun/star/style/ParagraphAdjust.hpp>
+#include <com/sun/star/text/WritingMode.hpp>
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/XTextContent.hpp>
 #include <com/sun/star/text/XTextField.hpp>
@@ -73,9 +78,12 @@
 #include <editeng/svxenum.hxx>
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::i18n;
+using namespace ::com::sun::star::style;
+using namespace ::com::sun::star::text;
+using namespace ::com::sun::star::uno;
 using ::com::sun::star::beans::PropertyState;
 using ::com::sun::star::beans::PropertyValue;
 using ::com::sun::star::beans::XPropertySet;
@@ -84,6 +92,7 @@ using ::com::sun::star::container::XEnumeration;
 using ::com::sun::star::container::XEnumerationAccess;
 using ::com::sun::star::container::XIndexAccess;
 using ::com::sun::star::io::XOutputStream;
+using ::com::sun::star::style::LineSpacing;
 using ::com::sun::star::text::XText;
 using ::com::sun::star::text::XTextContent;
 using ::com::sun::star::text::XTextField;
@@ -108,6 +117,44 @@ namespace drawingml {
 #define GET(variable, propName) \
     if ( GETA(propName) ) \
         mAny >>= variable;
+DBG(
+void lcl_dump_pset(Reference< XPropertySet > rXPropSet)
+{
+    Reference< XPropertySetInfo > info = rXPropSet->getPropertySetInfo ();
+    Sequence< beans::Property > props = info->getProperties ();
+
+    for (int i=0; i < props.getLength (); i++) {
+        OString name = OUStringToOString( props [i].Name, RTL_TEXTENCODING_UTF8);
+        fprintf (stderr,"%30s = ", name.getStr() );
+
+    try {
+        Any value = rXPropSet->getPropertyValue( props [i].Name );
+
+        OUString strValue;
+        sal_Int32 intValue;
+        bool boolValue;
+    LineSpacing spacing;
+//         RectanglePoint pointValue;
+
+        if( value >>= strValue )
+            fprintf (stderr,"\"%s\"\n", USS( strValue ) );
+        else if( value >>= intValue )
+            fprintf (stderr,"%d            (hex: %x)\n", intValue, intValue);
+        else if( value >>= boolValue )
+            fprintf (stderr,"%d            (bool)\n", boolValue);
+    else if( value >>= spacing ) {
+        fprintf (stderr, "mode: %d value: %d\n", spacing.Mode, spacing.Height);
+    }
+//         else if( value >>= pointValue )
+//             fprintf (stderr,"%d            (RectanglePoint)\n", pointValue);
+        else
+            fprintf (stderr,"???           <unhandled type>\n");
+    } catch(Exception e) {
+        fprintf (stderr,"unable to get '%s' value\n", USS(props [i].Name));
+    }
+    }
+}
+);
 
 // not thread safe
 int DrawingML::mnImageCounter = 1;
@@ -523,15 +570,27 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic )
     return sRelId;
 }
 
-OUString DrawingML::WriteBlip( OUString& rURL )
+OUString DrawingML::WriteBlip( Reference< XPropertySet > rXPropSet, OUString& rURL )
 {
         OUString sRelId = WriteImage( rURL );
+    sal_Int16 nBright = 0;
+    sal_Int32 nContrast = 0;
+
+    GET( nBright, AdjustLuminance );
+    GET( nContrast, AdjustContrast );
+
+        mpFS->startElementNS( XML_a, XML_blip,
+                  FSNS( XML_r, XML_embed), OUStringToOString( sRelId, RTL_TEXTENCODING_UTF8 ).getStr(),
+                  FSEND );
+    if( nBright || nContrast )
+        mpFS->singleElementNS( XML_a, XML_lum,
+                   XML_bright, nBright ? I32S( nBright*1000 ) : NULL,
+                   XML_contrast, nContrast ? I32S( nContrast*1000 ) : NULL,
+                   FSEND );
 
-        mpFS->singleElementNS( XML_a, XML_blip,
-                               FSNS( XML_r, XML_embed), OUStringToOString( sRelId, RTL_TEXTENCODING_UTF8 ).getStr(),
-                               FSEND );
+    mpFS->endElementNS( XML_a, XML_blip );
 
-        return sRelId;
+    return sRelId;
 }
 
 void DrawingML::WriteBlipMode( Reference< XPropertySet > rXPropSet )
@@ -569,7 +628,7 @@ void DrawingML::WriteBlipFill( Reference< XPropertySet > rXPropSet, String sURLP
 
         mpFS->startElementNS( nXmlNamespace , XML_blipFill, FSEND );
 
-        WriteBlip( aURL );
+        WriteBlip( rXPropSet, aURL );
 
         if( sURLPropName == S( "FillBitmapURL" ) )
             WriteBlipMode( rXPropSet );
@@ -753,8 +812,6 @@ void DrawingML::WriteRunProperties( Reference< XPropertySet > rRun, sal_Bool bIs
         else
             typeface = USS( usTypeface );
 
-
-
         mpFS->singleElementNS( XML_a, XML_latin,
                                XML_typeface, typeface,
                                XML_pitchFamily, pitch,
@@ -918,7 +975,6 @@ void DrawingML::WriteRun( Reference< XTextRange > rRun )
                         else if( bSDot ) \
                             pAutoNumType = #x "Period";
 
-
 inline static const char* GetAutoNumType( sal_Int16 nNumberingType, bool bSDot, bool bPBehind, bool bPBoth )
 {
     const char* pAutoNumType = NULL;
@@ -964,7 +1020,6 @@ void DrawingML::WriteParagraphNumbering( Reference< XPropertySet > rXPropSet, sa
             Sequence< PropertyValue > aPropertySequence;
             rXIndexAccess->getByIndex( nLevel ) >>= aPropertySequence;
 
-
             const PropertyValue* pPropValue = aPropertySequence.getArray();
 
             sal_Int32 nPropertyCount = aPropertySequence.getLength();
@@ -1086,14 +1141,30 @@ const char* DrawingML::GetAlignment( sal_Int32 nAlignment )
     return sAlignment;
 }
 
+void DrawingML::WriteLinespacing( LineSpacing& rSpacing )
+{
+    if( rSpacing.Mode == LineSpacingMode::PROP )
+        mpFS->singleElementNS( XML_a, XML_spcPct,
+                               XML_val, I32S( ((sal_Int32)rSpacing.Height)*1000 ),
+                               FSEND );
+    else
+        mpFS->singleElementNS( XML_a, XML_spcPts,
+                               XML_val, I32S( rSpacing.Height ),
+                               FSEND );
+}
+
 void DrawingML::WriteParagraphProperties( Reference< XTextContent > rParagraph )
 {
     Reference< XPropertySet > rXPropSet( rParagraph, UNO_QUERY );
     Reference< XPropertyState > rXPropState( rParagraph, UNO_QUERY );
+    PropertyState eState;
 
     if( !rXPropSet.is() || !rXPropState.is() )
         return;
 
+    //OSL_TRACE("write paragraph properties pset");
+    //DBG(lcl_dump_pset(rXPropSet));
+
     sal_Int16 nLevel = -1;
     GET( nLevel, NumberingLevel );
 
@@ -1104,15 +1175,27 @@ void DrawingML::WriteParagraphProperties( Reference< XTextContent > rParagraph )
     sal_Int16 nAlignment( style::ParagraphAdjust_LEFT );
     GET( nAlignment, ParaAdjust );
 
+    sal_Bool bHasLinespacing = sal_False;
+    LineSpacing aLineSpacing;
+    if( GETAD( ParaLineSpacing ) )
+        bHasLinespacing = ( mAny >>= aLineSpacing );
+
     if( nLevel != -1
-            || nLeftMargin > 0
-            || nAlignment != style::ParagraphAdjust_LEFT ) {
+        || nLeftMargin > 0
+        || nAlignment != style::ParagraphAdjust_LEFT
+        || bHasLinespacing ) {
         mpFS->startElementNS( XML_a, XML_pPr,
                               XML_lvl, nLevel > 0 ? I32S( nLevel ) : NULL,
                               XML_marL, nLeftMargin > 0 ? IS( nLeftMargin ) : NULL,
                               XML_algn, GetAlignment( nAlignment ),
                               FSEND );
 
+        if( bHasLinespacing ) {
+            mpFS->startElementNS( XML_a, XML_lnSpc, FSEND );
+            WriteLinespacing( aLineSpacing );
+            mpFS->endElementNS( XML_a, XML_lnSpc );
+        }
+
         WriteParagraphNumbering( rXPropSet, nLevel );
 
         mpFS->endElementNS( XML_a, XML_pPr );
@@ -1185,11 +1268,24 @@ void DrawingML::WriteText( Reference< XShape > rXShape  )
             ;
     }
 
+    const char* sWritingMode = NULL;
+    sal_Bool bVertical = sal_False;
+    if( GETA( TextWritingMode ) ) {
+        WritingMode eMode;
+
+        if( ( mAny >>= eMode ) && eMode == WritingMode_TB_RL ) {
+            sWritingMode = "vert";
+            bVertical = sal_True;
+        }
+    }
+
     TextHorizontalAdjust eHorizontalAlignment( TextHorizontalAdjust_CENTER );
     bool bHorizontalCenter = false;
     GET( eHorizontalAlignment, TextHorizontalAdjust );
     if( eHorizontalAlignment == TextHorizontalAdjust_CENTER )
         bHorizontalCenter = true;
+    else if( bVertical && eHorizontalAlignment == TextHorizontalAdjust_LEFT )
+        sVerticalAlignment = "b";
 
     sal_Bool bHasWrap = FALSE;
     sal_Bool bWrap = FALSE;
@@ -1207,6 +1303,7 @@ void DrawingML::WriteText( Reference< XShape > rXShape  )
                            XML_bIns, (nBottom != DEFTBINS) ? IS( MM100toEMU( nBottom ) ) : NULL,
                            XML_anchor, sVerticalAlignment,
                            XML_anchorCtr, bHorizontalCenter ? "1" : NULL,
+                           XML_vert, sWritingMode,
                            FSEND );
 
     Reference< XEnumerationAccess > access( xXText, UNO_QUERY );
@@ -1244,7 +1341,10 @@ void DrawingML::WritePresetShape( const char* pShape, MSO_SPT eShapeType, sal_Bo
     mpFS->startElementNS( XML_a, XML_avLst, FSEND );
 
     Sequence< drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentSeq;
-    if ( rProp.Value >>= aAdjustmentSeq ) {
+    if ( ( rProp.Value >>= aAdjustmentSeq )
+         && eShapeType != mso_sptActionButtonForwardNext  // we have adjustments values for these type of shape, but MSO doesn't like them
+         && eShapeType != mso_sptActionButtonBackPrevious // so they are now disabled
+        ) {
         DBG(printf("adj seq len: %d\n", int( aAdjustmentSeq.getLength() )));
         if ( bPredefinedHandlesUsed )
             EscherPropertyContainer::LookForPolarHandles( eShapeType, nAdjustmentsWhichNeedsToBeConverted );
@@ -1360,14 +1460,16 @@ void DrawingML::WritePolyPolygon( const PolyPolygon& rPolyPolygon )
 
 void DrawingML::WriteConnectorConnections( EscherConnectorListEntry& rConnectorEntry, sal_Int32 nStartID, sal_Int32 nEndID )
 {
-    mpFS->singleElementNS( XML_a, XML_stCxn,
-                           XML_id, I32S( nStartID ),
-                           XML_idx, I64S( rConnectorEntry.GetConnectorRule( TRUE ) ),
-                           FSEND );
-    mpFS->singleElementNS( XML_a, XML_endCxn,
-                           XML_id, I32S( nEndID ),
-                           XML_idx, I64S( rConnectorEntry.GetConnectorRule( FALSE ) ),
-                           FSEND );
+    if( nStartID != -1 )
+        mpFS->singleElementNS( XML_a, XML_stCxn,
+                               XML_id, I32S( nStartID ),
+                               XML_idx, I64S( rConnectorEntry.GetConnectorRule( TRUE ) ),
+                               FSEND );
+    if( nEndID != -1 )
+        mpFS->singleElementNS( XML_a, XML_endCxn,
+                               XML_id, I32S( nEndID ),
+                               XML_idx, I64S( rConnectorEntry.GetConnectorRule( FALSE ) ),
+                               FSEND );
 }
 
 // from sw/source/filter/ww8/wrtw8num.cxx for default bullets to export to MS intact
@@ -1481,8 +1583,6 @@ void DrawingML::WriteFill( Reference< XPropertySet > xPropSet )
     return;
 }
 
-
-
 }
 }
 
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index ac86ae488790..e818f7ed50ef 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -93,6 +93,7 @@ using ::com::sun::star::text::XText;
 using ::com::sun::star::text::XTextContent;
 using ::com::sun::star::text::XTextField;
 using ::com::sun::star::text::XTextRange;
+using ::oox::core::XmlFilterBase;
 using ::com::sun::star::chart2::XChartDocument;
 using ::com::sun::star::frame::XModel;
 using ::oox::core::XmlFilterBase;
@@ -364,14 +365,15 @@ namespace oox { namespace drawingml {
     if ( GETA(propName) ) \
         mAny >>= variable;
 
-ShapeExport::ShapeExport( sal_Int32 nXmlNamespace, FSHelperPtr pFS, ::oox::core::XmlFilterBase* pFB, DocumentType eDocumentType )
+ShapeExport::ShapeExport( sal_Int32 nXmlNamespace, FSHelperPtr pFS, ShapeHashMap* pShapeMap, XmlFilterBase* pFB, DocumentType eDocumentType )
     : DrawingML( pFS, pFB, eDocumentType )
-    , mnXmlNamespace( nXmlNamespace )
     , mnShapeIdMax( 1 )
     , mnPictureIdMax( 1 )
+    , mnXmlNamespace( nXmlNamespace )
     , maFraction( 1, 576 )
     , maMapModeSrc( MAP_100TH_MM )
     , maMapModeDest( MAP_INCH, Point(), maFraction, maFraction )
+    , mpShapeMap( pShapeMap ? pShapeMap : &maShapeMap )
 {
 }
 
@@ -621,7 +623,7 @@ ShapeExport& ShapeExport::WriteGraphicObjectShape( Reference< XShape > xShape )
 
     pFS->startElementNS( mnXmlNamespace, XML_blipFill, FSEND );
 
-    WriteBlip( sGraphicURL );
+    WriteBlip( xShapeProps, sGraphicURL );
 
     bool bStretch = false;
     if( ( xShapeProps->getPropertyValue( S( "FillBitmapStretch" ) ) >>= bStretch ) && bStretch )
@@ -969,18 +971,34 @@ size_t ShapeExport::ShapeHash::operator()( const ::com::sun::star::uno::Referenc
 
 sal_Int32 ShapeExport::GetNewShapeID( const Reference< XShape > rXShape )
 {
-    sal_Int32 nID = GetFB()->GetUniqueId();
+    return GetNewShapeID( rXShape, GetFB() );
+}
+
+sal_Int32 ShapeExport::GetNewShapeID( const Reference< XShape > rXShape, XmlFilterBase* pFB )
+{
+    if( !rXShape.is() )
+        return -1;
 
-    maShapeMap[ rXShape ] = nID;
+    sal_Int32 nID = pFB->GetUniqueId();
+
+    (*mpShapeMap)[ rXShape ] = nID;
 
     return nID;
 }
 
 sal_Int32 ShapeExport::GetShapeID( const Reference< XShape > rXShape )
 {
-    ShapeHashMap::const_iterator aIter = maShapeMap.find( rXShape );
+    return GetShapeID( rXShape, mpShapeMap );
+}
+
+sal_Int32 ShapeExport::GetShapeID( const Reference< XShape > rXShape, ShapeHashMap* pShapeMap )
+{
+    if( !rXShape.is() )
+        return -1;
+
+    ShapeHashMap::const_iterator aIter = pShapeMap->find( rXShape );
 
-    if( aIter == maShapeMap.end() )
+    if( aIter == pShapeMap->end() )
         return -1;
 
     return aIter->second;
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index b0b092e9a391..620dac30d840 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -267,6 +267,7 @@ void PropertyMap::dump( Reference< XPropertySet > rXPropSet )
         sal_uInt32 uintValue = 0;
         sal_Int16 int16Value = 0;
         sal_uInt16 uint16Value = 0;
+        float floatValue = 0;
         bool boolValue = false;
     LineSpacing spacing;
 //         RectanglePoint pointValue;
@@ -284,6 +285,8 @@ void PropertyMap::dump( Reference< XPropertySet > rXPropSet )
             fprintf (stderr,"%d            (hex: %x)\n", int16Value, int16Value);
         else if( value >>= uint16Value )
             fprintf (stderr,"%d            (hex: %x)\n", uint16Value, uint16Value);
+        else if( value >>= floatValue )
+            fprintf (stderr,"%f\n", floatValue);
         else if( value >>= boolValue )
             fprintf (stderr,"%d            (bool)\n", boolValue);
     else if( value >>= aWritingMode )
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 58f50cfab78d..bd484dc8d92b 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -27,7 +27,7 @@
  ************************************************************************/
 
 #include "oox/ole/axcontrol.hxx"
-#include <rtl/tencinfo.h>
+
 #include <com/sun/star/awt/FontSlant.hpp>
 #include <com/sun/star/awt/FontStrikeout.hpp>
 #include <com/sun/star/awt/FontUnderline.hpp>
@@ -40,42 +40,50 @@
 #include <com/sun/star/awt/TextAlign.hpp>
 #include <com/sun/star/awt/VisualEffect.hpp>
 #include <com/sun/star/awt/XControlModel.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/form/XForm.hpp>
 #include <com/sun/star/form/XFormComponent.hpp>
 #include <com/sun/star/form/XFormsSupplier.hpp>
+#include <com/sun/star/form/binding/XBindableValue.hpp>
+#include <com/sun/star/form/binding/XListEntrySink.hpp>
+#include <com/sun/star/form/binding/XListEntrySource.hpp>
+#include <com/sun/star/form/binding/XValueBinding.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/sheet/XCellRangeAddressable.hpp>
+#include <com/sun/star/sheet/XCellRangeReferrer.hpp>
 #include <com/sun/star/style/VerticalAlignment.hpp>
-#include "properties.hxx"
-#include "tokens.hxx"
+#include <com/sun/star/table/CellAddress.hpp>
+#include <com/sun/star/table/CellRangeAddress.hpp>
+#include <rtl/tencinfo.h>
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/binaryinputstream.hxx"
 #include "oox/helper/graphichelper.hxx"
 #include "oox/helper/propertymap.hxx"
-#include "oox/helper/propertyset.hxx"
-
-using ::rtl::OUString;
-using ::com::sun::star::awt::Point;
-using ::com::sun::star::awt::Size;
-using ::com::sun::star::awt::XControlModel;
-using ::com::sun::star::container::XIndexContainer;
-using ::com::sun::star::container::XNameContainer;
-using ::com::sun::star::drawing::XDrawPage;
-using ::com::sun::star::form::XForm;
-using ::com::sun::star::form::XFormComponent;
-using ::com::sun::star::lang::XMultiServiceFactory;
-using ::com::sun::star::uno::Any;
-using ::com::sun::star::uno::Exception;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::UNO_QUERY;
-using ::com::sun::star::uno::UNO_QUERY_THROW;
-using ::com::sun::star::uno::UNO_SET_THROW;
+#include "properties.hxx"
+#include "tokens.hxx"
 
 namespace oox {
 namespace ole {
 
 // ============================================================================
 
+using namespace ::com::sun::star::awt;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::drawing;
+using namespace ::com::sun::star::form;
+using namespace ::com::sun::star::form::binding;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::sheet;
+using namespace ::com::sun::star::table;
+using namespace ::com::sun::star::uno;
+
+using ::rtl::OUString;
+
+// ============================================================================
+
 namespace {
 
 const sal_uInt32 COMCTL_ID_SIZE             = 0x12344321;
@@ -221,14 +229,70 @@ const sal_Int16 API_STATE_UNCHECKED         = 0;
 const sal_Int16 API_STATE_CHECKED           = 1;
 const sal_Int16 API_STATE_DONTKNOW          = 2;
 
+// ----------------------------------------------------------------------------
+
+/** Tries to extract a range address from a defined name. */
+bool lclExtractRangeFromName( CellRangeAddress& orRangeAddr, const Reference< XModel >& rxDocModel, const OUString& rAddressString )
+{
+    try
+    {
+        PropertySet aPropSet( rxDocModel );
+        Reference< XNameAccess > xRangesNA( aPropSet.getAnyProperty( PROP_NamedRanges ), UNO_QUERY_THROW );
+        Reference< XCellRangeReferrer > xReferrer( xRangesNA->getByName( rAddressString ), UNO_QUERY_THROW );
+        Reference< XCellRangeAddressable > xAddressable( xReferrer->getReferredCells(), UNO_QUERY_THROW );
+        orRangeAddr = xAddressable->getRangeAddress();
+        return true;
+    }
+    catch( Exception& )
+    {
+    }
+    return false;
+}
+
+bool lclExtractAddressFromName( CellAddress& orAddress, const Reference< XModel >& rxDocModel, const OUString& rAddressString )
+{
+    CellRangeAddress aRangeAddr;
+    if( lclExtractRangeFromName( aRangeAddr, rxDocModel, rAddressString ) &&
+        (aRangeAddr.StartColumn == aRangeAddr.EndColumn) &&
+        (aRangeAddr.StartRow == aRangeAddr.EndRow) )
+    {
+        orAddress.Sheet = aRangeAddr.Sheet;
+        orAddress.Column = aRangeAddr.StartColumn;
+        orAddress.Row = aRangeAddr.StartRow;
+        return true;
+    }
+    return false;
+}
+
+void lclPrepareConverter( PropertySet& rConverter, const Reference< XModel >& rxDocModel,
+        const OUString& rAddressString, sal_Int32 nRefSheet, bool bRange )
+{
+    if( !rConverter.is() ) try
+    {
+        Reference< XMultiServiceFactory > xFactory( rxDocModel, UNO_QUERY_THROW );
+        OUString aServiceName = bRange ?
+            CREATE_OUSTRING( "com.sun.star.table.CellRangeAddressConversion" ) :
+            CREATE_OUSTRING( "com.sun.star.table.CellAddressConversion" );
+        rConverter.set( xFactory->createInstance( aServiceName ) );
+    }
+    catch( Exception& )
+    {
+    }
+    rConverter.setProperty( PROP_XLA1Representation, rAddressString );
+    rConverter.setProperty( PROP_ReferenceSheet, nRefSheet );
+}
+
 } // namespace
 
 // ============================================================================
 
-ControlConverter::ControlConverter( const GraphicHelper& rGraphicHelper, bool bDefaultColorBgr ) :
+ControlConverter::ControlConverter( const Reference< XModel >& rxDocModel,
+        const GraphicHelper& rGraphicHelper, bool bDefaultColorBgr ) :
+    mxDocModel( rxDocModel ),
     mrGraphicHelper( rGraphicHelper ),
     mbDefaultColorBgr( bDefaultColorBgr )
 {
+    OSL_ENSURE( mxDocModel.is(), "ControlConverter::ControlConverter - missing document model" );
 }
 
 ControlConverter::~ControlConverter()
@@ -286,6 +350,74 @@ void ControlConverter::convertScrollBar( PropertyMap& rPropMap,
     rPropMap.setProperty( bAwtModel ? PROP_ScrollValue : PROP_DefaultScrollValue, nPosition );
 }
 
+void ControlConverter::bindToSources( const Reference< XControlModel >& rxCtrlModel,
+        const OUString& rCtrlSource, const OUString& rRowSource, sal_Int32 nRefSheet ) const
+{
+    // value binding
+    if( rCtrlSource.getLength() > 0 ) try
+    {
+        // first check if the XBindableValue interface is supported
+        Reference< XBindableValue > xBindable( rxCtrlModel, UNO_QUERY_THROW );
+
+        // convert address string to cell address struct
+        CellAddress aAddress;
+        if( !lclExtractAddressFromName( aAddress, mxDocModel, rCtrlSource ) )
+        {
+            lclPrepareConverter( maAddressConverter, mxDocModel, rCtrlSource, nRefSheet, false );
+            if( !maAddressConverter.getProperty( aAddress, PROP_Address ) )
+                throw RuntimeException();
+        }
+
+        // create argument sequence
+        NamedValue aValue;
+        aValue.Name = CREATE_OUSTRING( "BoundCell" );
+        aValue.Value <<= aAddress;
+        Sequence< Any > aArgs( 1 );
+        aArgs[ 0 ] <<= aValue;
+
+        // create the CellValueBinding instance and set at the control model
+        Reference< XMultiServiceFactory > xFactory( mxDocModel, UNO_QUERY_THROW );
+        Reference< XValueBinding > xBinding( xFactory->createInstanceWithArguments(
+            CREATE_OUSTRING( "com.sun.star.table.CellValueBinding" ), aArgs ), UNO_QUERY_THROW );
+        xBindable->setValueBinding( xBinding );
+    }
+    catch( Exception& )
+    {
+    }
+
+    // list entry source
+    if( rRowSource.getLength() > 0 ) try
+    {
+        // first check if the XListEntrySink interface is supported
+        Reference< XListEntrySink > xEntrySink( rxCtrlModel, UNO_QUERY_THROW );
+
+        // convert address string to cell range address struct
+        CellRangeAddress aRangeAddr;
+        if( !lclExtractRangeFromName( aRangeAddr, mxDocModel, rRowSource ) )
+        {
+            lclPrepareConverter( maRangeConverter, mxDocModel, rRowSource, nRefSheet, true );
+            if( !maRangeConverter.getProperty( aRangeAddr, PROP_Address ) )
+                throw RuntimeException();
+        }
+
+        // create argument sequence
+        NamedValue aValue;
+        aValue.Name = CREATE_OUSTRING( "CellRange" );
+        aValue.Value <<= aRangeAddr;
+        Sequence< Any > aArgs( 1 );
+        aArgs[ 0 ] <<= aValue;
+
+        // create the EntrySource instance and set at the control model
+        Reference< XMultiServiceFactory > xFactory( mxDocModel, UNO_QUERY_THROW );
+        Reference< XListEntrySource > xEntrySource( xFactory->createInstanceWithArguments(
+            CREATE_OUSTRING( "com.sun.star.table.CellRangeListSource"  ), aArgs ), UNO_QUERY_THROW );
+        xEntrySink->setListEntrySource( xEntrySource );
+    }
+    catch( Exception& )
+    {
+    }
+}
+
 // ActiveX (Forms 2.0) specific conversion ------------------------------------
 
 void ControlConverter::convertAxBackground( PropertyMap& rPropMap,
@@ -432,14 +564,16 @@ OUString ControlModelBase::getServiceName() const
         case API_CONTROL_FIXEDTEXT:     return CREATE_OUSTRING( "com.sun.star.awt.UnoControlFixedTextModel" );
         case API_CONTROL_IMAGE:         return CREATE_OUSTRING( "com.sun.star.awt.UnoControlImageControlModel" );
         case API_CONTROL_CHECKBOX:      return CREATE_OUSTRING( "com.sun.star.awt.UnoControlCheckBoxModel" );
-        case API_CONTROL_RADIOBUTTON:   return CREATE_OUSTRING( "com.sun.star.awt.UnoControlRadioButtonModel" );
+        case API_CONTROL_RADIOBUTTON:   return CREATE_OUSTRING( "com.sun.star.form.component.RadioButton" );
         case API_CONTROL_EDIT:          return CREATE_OUSTRING( "com.sun.star.awt.UnoControlEditModel" );
-        case API_CONTROL_LISTBOX:       return CREATE_OUSTRING( "com.sun.star.awt.UnoControlListBoxModel" );
-        case API_CONTROL_COMBOBOX:      return CREATE_OUSTRING( "com.sun.star.awt.UnoControlComboBoxModel" );
-        case API_CONTROL_SPINBUTTON:    return CREATE_OUSTRING( "com.sun.star.awt.UnoControlSpinButtonModel" );
-        case API_CONTROL_SCROLLBAR:     return CREATE_OUSTRING( "com.sun.star.awt.UnoControlScrollBarModel" );
+        case API_CONTROL_LISTBOX:       return CREATE_OUSTRING( "com.sun.star.form.component.ListBox" );
+        case API_CONTROL_COMBOBOX:      return CREATE_OUSTRING( "com.sun.star.form.component.ComboBox" );
+        case API_CONTROL_SPINBUTTON:    return CREATE_OUSTRING( "com.sun.star.form.component.SpinButton" );
+        case API_CONTROL_SCROLLBAR:     return CREATE_OUSTRING( "com.sun.star.form.component.ScrollBar" );
         case API_CONTROL_PROGRESSBAR:   return CREATE_OUSTRING( "com.sun.star.awt.UnoControlProgressBarModel" );
-        case API_CONTROL_GROUPBOX:      return CREATE_OUSTRING( "com.sun.star.awt.UnoControlGroupBoxModel" );
+        case API_CONTROL_FRAME:         return CREATE_OUSTRING( "com.sun.star.awt.UnoFrameModel" );
+        case API_CONTROL_PAGE:          return CREATE_OUSTRING( "com.sun.star.awt.UnoPageModel" );
+        case API_CONTROL_MULTIPAGE:     return CREATE_OUSTRING( "com.sun.star.awt.UnoMultiPageModel" );
         case API_CONTROL_DIALOG:        return CREATE_OUSTRING( "com.sun.star.awt.UnoControlDialogModel" );
         default:    OSL_ENSURE( false, "ControlModelBase::getServiceName - no AWT model service supported" );
     }
@@ -1418,7 +1552,8 @@ ApiControlType AxTabStripModel::getControlType() const
 void AxTabStripModel::convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const
 {
     rPropMap.setProperty( PROP_Decoration, mnTabStyle != AX_TABSTRIP_NONE );
-    rPropMap.setProperty( PROP_MultiPageValue, mnSelectedTab );
+    // adjust for openoffice ( 1 based )
+    rPropMap.setProperty( PROP_MultiPageValue, mnSelectedTab + 1);
     rConv.convertColor( rPropMap, PROP_BackgroundColor, mnBackColor );
     AxFontDataModel::convertProperties( rPropMap, rConv );
 }
@@ -1542,7 +1677,7 @@ AxFrameModel::AxFrameModel() :
 
 ApiControlType AxFrameModel::getControlType() const
 {
-    return API_CONTROL_GROUPBOX;
+    return mbAwtModel ? API_CONTROL_FRAME : API_CONTROL_GROUPBOX;
 }
 
 void AxFrameModel::convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const
@@ -1684,10 +1819,10 @@ bool EmbeddedControl::convertProperties( const Reference< XControlModel >& rxCtr
 
 // ============================================================================
 
-EmbeddedForm::EmbeddedForm( const Reference< XMultiServiceFactory >& rxModelFactory,
+EmbeddedForm::EmbeddedForm( const Reference< XModel >& rxDocModel,
         const Reference< XDrawPage >& rxDrawPage, const GraphicHelper& rGraphicHelper, bool bDefaultColorBgr ) :
-    ControlConverter( rGraphicHelper, bDefaultColorBgr ),
-    mxModelFactory( rxModelFactory ),
+    ControlConverter( rxDocModel, rGraphicHelper, bDefaultColorBgr ),
+    mxModelFactory( rxDocModel, UNO_QUERY ),
     mxFormsSupp( rxDrawPage, UNO_QUERY )
 {
     OSL_ENSURE( mxModelFactory.is(), "EmbeddedForm::EmbeddedForm - missing service factory" );
diff --git a/oox/source/ole/makefile.mk b/oox/source/ole/makefile.mk
index 4e01392d4a57..a5232247cfa5 100644
--- a/oox/source/ole/makefile.mk
+++ b/oox/source/ole/makefile.mk
@@ -51,7 +51,8 @@ SLOFILES =	\
         $(SLO)$/vbahelper.obj           \
         $(SLO)$/vbainputstream.obj      \
         $(SLO)$/vbamodule.obj           \
-        $(SLO)$/vbaproject.obj
+        $(SLO)$/vbaproject.obj          \
+        $(SLO)$/vbaprojectfilter.obj
 
 # --- Targets -------------------------------------------------------
 
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index 386c1a034641..4a42f7043aaf 100755
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -27,17 +27,16 @@
  ************************************************************************/
 
 #include "oox/ole/vbacontrol.hxx"
+
 #include <algorithm>
 #include <set>
-#include <rtl/ustrbuf.hxx>
 #include <com/sun/star/awt/XControlModel.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/io/XInputStreamProvider.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <rtl/ustrbuf.hxx>
 #include <xmlscript/xmldlg_imexp.hxx>
-#include "properties.hxx"
-#include "tokens.hxx"
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/binaryinputstream.hxx"
 #include "oox/helper/propertymap.hxx"
@@ -45,26 +44,26 @@
 #include "oox/helper/storagebase.hxx"
 #include "oox/helper/textinputstream.hxx"
 #include "oox/ole/vbahelper.hxx"
-
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-using ::com::sun::star::awt::XControlModel;
-using ::com::sun::star::container::XNameContainer;
-using ::com::sun::star::io::XInputStreamProvider;
-using ::com::sun::star::lang::XMultiServiceFactory;
-using ::com::sun::star::uno::Any;
-using ::com::sun::star::uno::Exception;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::UNO_QUERY_THROW;
-using ::com::sun::star::uno::UNO_SET_THROW;
-using ::com::sun::star::uno::XComponentContext;
-using ::com::sun::star::frame::XModel;
+#include "properties.hxx"
+#include "tokens.hxx"
 
 namespace oox {
 namespace ole {
 
 // ============================================================================
 
+using namespace ::com::sun::star::awt;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::io;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+
+// ============================================================================
+
 namespace {
 
 const sal_uInt16 VBA_SITE_CLASSIDINDEX          = 0x8000;
@@ -222,17 +221,11 @@ bool VbaSiteModel::importBinaryModel( BinaryInputStream& rInStrm )
     aReader.skipUndefinedProperty();
     aReader.readStringProperty( maToolTip );
     aReader.skipStringProperty();   // license key
-    aReader.readStringProperty( maLinkedCell );
-    aReader.readStringProperty( maSourceRange );
+    aReader.readStringProperty( maControlSource );
+    aReader.readStringProperty( maRowSource );
     return aReader.finalizeImport();
 }
 
-void VbaSiteModel::moveRelative( const AxPairData& rDistance )
-{
-    maPos.first += rDistance.first;
-    maPos.second += rDistance.second;
-}
-
 bool VbaSiteModel::isVisible() const
 {
     return getFlag( mnFlags, VBA_SITE_VISIBLE );
@@ -280,12 +273,12 @@ ControlModelRef VbaSiteModel::createControlModel( const AxClassTable& rClassTabl
             case VBA_SITE_TEXTBOX:          xCtrlModel.reset( new AxTextBoxModel );         break;
             case VBA_SITE_LISTBOX:          xCtrlModel.reset( new AxListBoxModel );         break;
             case VBA_SITE_COMBOBOX:         xCtrlModel.reset( new AxComboBoxModel );        break;
-            case VBA_SITE_SPINBUTTON:       /*xCtrlModel.reset( new AxSpinButtonModel );*/  break;  // not supported (?)
+            case VBA_SITE_SPINBUTTON:       xCtrlModel.reset( new AxSpinButtonModel );      break;
             case VBA_SITE_SCROLLBAR:        xCtrlModel.reset( new AxScrollBarModel );       break;
-            case VBA_SITE_TABSTRIP:                                                         break;  // not supported
+            case VBA_SITE_TABSTRIP:         xCtrlModel.reset( new AxTabStripModel );        break;
             case VBA_SITE_FRAME:            xCtrlModel.reset( new AxFrameModel );           break;
-            case VBA_SITE_MULTIPAGE:                                                        break;  // not supported
-            case VBA_SITE_FORM:                                                             break;  // not supported
+            case VBA_SITE_MULTIPAGE:        xCtrlModel.reset( new AxMultiPageModel );       break;
+            case VBA_SITE_FORM:             xCtrlModel.reset( new AxFormPageModel );        break;
             default:    OSL_ENSURE( false, "VbaSiteModel::createControlModel - unknown type index" );
         }
     }
@@ -339,6 +332,11 @@ void VbaSiteModel::convertProperties( PropertyMap& rPropMap,
     }
 }
 
+void VbaSiteModel::bindToSources( const Reference< XControlModel >& rxCtrlModel, const ControlConverter& rConv ) const
+{
+    rConv.bindToSources( rxCtrlModel, maControlSource, maRowSource );
+}
+
 // ============================================================================
 
 VbaFormControl::VbaFormControl()
@@ -445,11 +443,9 @@ void VbaFormControl::importStorage( StorageBase& rStrg, const AxClassTable& rCla
             maControls.forEachMem( &VbaFormControl::importModelOrStorage,
                 ::boost::ref( aOStrm ), ::boost::ref( rStrg ), ::boost::cref( maClassTable ) );
 
-            /*  Reorder the controls (sorts all option buttons of an option
-                group together), and move all children of all embedded frames
-                (group boxes) to this control (UNO group boxes cannot contain
-                other controls). */
-            finalizeEmbeddedControls();
+            /** Final processing on the control and all embedded controls,
+                depending on the type of this control. */
+            finalizeEmbeddedControls( rStrg );
         }
     }
 }
@@ -471,6 +467,9 @@ bool VbaFormControl::convertProperties( const Reference< XControlModel >& rxCtrl
             PropertySet aPropSet( rxCtrlModel );
             aPropSet.setProperties( aPropMap );
 
+            // bind to control source and row source range
+            mxSiteModel->bindToSources( rxCtrlModel, rConv );
+
             // create and convert all embedded controls
             if( !maControls.empty() ) try
             {
@@ -553,138 +552,182 @@ bool VbaFormControl::importEmbeddedSiteModels( BinaryInputStream& rInStrm )
     return bValid;
 }
 
-void VbaFormControl::finalizeEmbeddedControls()
-{
-    /*  This function performs two tasks:
-
-        1)  Reorder the controls appropriately (sort all option buttons of an
-            option group together to make grouping work).
-        2)  Move all children of all embedded frames (group boxes) to this
-            control (UNO group boxes cannot contain other controls).
-     */
-
-    // first, sort all controls by original tab index
-    ::std::sort( maControls.begin(), maControls.end(), &compareByTabIndex );
-
-    /*  Collect the programmatical names of all embedded controls (needed to be
-        able to set unused names to new dummy controls created below). Also
-        collect the names of all children of embedded frames (group boxes).
-        Luckily, names of controls must be unique in the entire form, not just
-        in the current container. */
-    VbaControlNamesSet aControlNames;
-    VbaControlNameInserter aInserter( aControlNames );
-    maControls.forEach( aInserter );
-    for( VbaFormControlVector::iterator aIt = maControls.begin(), aEnd = maControls.end(); aIt != aEnd; ++aIt )
-        if( (*aIt)->mxCtrlModel.get() && ((*aIt)->mxCtrlModel->getControlType() == API_CONTROL_GROUPBOX) )
-            (*aIt)->maControls.forEach( aInserter );
-
-    /*  Reprocess the sorted list and collect all option button controls that
-        are part of the same option group (determined by group name). All
-        controls will be stored in a vector of vectors, that collects every
-        option button group in one vector element, and other controls between
-        these option groups (or leading or trailing controls) in other vector
-        elements. If an option button group follows another group, a dummy
-        separator control has to be inserted. */
-    typedef RefVector< VbaFormControlVector > VbaFormControlVectorVector;
-    VbaFormControlVectorVector aControlGroups;
-
-    typedef RefMap< OUString, VbaFormControlVector > VbaFormControlVectorMap;
-    VbaFormControlVectorMap aOptionGroups;
-
-    typedef VbaFormControlVectorMap::mapped_type VbaFormControlVectorRef;
-    bool bLastWasOptionButton = false;
-    for( VbaFormControlVector::iterator aIt = maControls.begin(), aEnd = maControls.end(); aIt != aEnd; ++aIt )
+void VbaFormControl::finalizeEmbeddedControls( StorageBase& rStrg )
+{
+    /*  Store all embedded controls in a temporary vector, so "exit on error"
+        will leave this control empty. */
+    VbaFormControlVector aControls;
+    aControls.swap( maControls );
+
+    /*  If this is a multipage control, it stores additional data in the 'x'
+        stream of its storage. It contains the control identifiers of the form
+        page controls that contain the embedded controls of each page.
+        Additionally, the order of these pages is stored there (they are not
+        nessecarily in the order they are persisted in). */
+    if( AxMultiPageModel* pMultiPageModel = dynamic_cast< AxMultiPageModel* >( mxCtrlModel.get() ) )
     {
-        VbaFormControlRef xControl = *aIt;
-        const ControlModelBase* pCtrlModel = xControl->mxCtrlModel.get();
+        // read additional attributes from the 'x' stream
+        BinaryXInputStream aXStrm( rStrg.openInputStream( CREATE_OUSTRING( "x" ) ), true );
+        OSL_ENSURE( !aXStrm.isEof(), "VbaFormControl::finalizeEmbeddedControls - missing 'x' stream" );
+        if( aXStrm.isEof() ) return;
 
-        if( const AxOptionButtonModel* pOptButtonModel = dynamic_cast< const AxOptionButtonModel* >( pCtrlModel ) )
+        // skip the page property structures related to all controls
+        for( size_t nSiteIdx = 0, nSiteCount = aControls.size(); nSiteIdx < nSiteCount; ++nSiteIdx )
         {
-            // check if a new option group needs to be created
-            const OUString& rGroupName = pOptButtonModel->getGroupName();
-            VbaFormControlVectorRef& rxOptionGroup = aOptionGroups[ rGroupName ];
-            if( !rxOptionGroup )
-            {
-                /*  If last control was an option button too, we have two
-                    option groups following each other, so a dummy separator
-                    control is needed. */
-                if( bLastWasOptionButton )
-                {
-                    VbaFormControlVectorRef xDummyGroup( new VbaFormControlVector );
-                    aControlGroups.push_back( xDummyGroup );
-                    OUString aName = aControlNames.generateDummyName();
-                    VbaFormControlRef xDummyControl( new VbaDummyFormControl( aName ) );
-                    xDummyGroup->push_back( xDummyControl );
-                }
-                rxOptionGroup.reset( new VbaFormControlVector );
-                aControlGroups.push_back( rxOptionGroup );
-            }
-            /*  Append the option button to the control group (which is now
-                referred by the vector aControlGroups and by the map
-                aOptionGroups). */
-            rxOptionGroup->push_back( xControl );
-            bLastWasOptionButton = true;
+            AxBinaryPropertyReader aReader( aXStrm );
+            aReader.skipUndefinedProperty();
+            aReader.skipIntProperty< sal_uInt32 >(); // transition effect
+            aReader.skipIntProperty< sal_uInt32 >(); // transition period
+            if( !aReader.finalizeImport() ) return;
         }
-        else
-        {
-            // open a new control group, if the last group is an option group
-            if( bLastWasOptionButton || aControlGroups.empty() )
-            {
-                VbaFormControlVectorRef xControlGroup( new VbaFormControlVector );
-                aControlGroups.push_back( xControlGroup );
-            }
-            // append the control to the last control group
-            VbaFormControlVector& rLastGroup = *aControlGroups.back();
-            rLastGroup.push_back( xControl );
-            bLastWasOptionButton = false;
 
-            // if control is a group box, move all its children to this control
-            if( pCtrlModel && (pCtrlModel->getControlType() == API_CONTROL_GROUPBOX) )
+        // read the multipage property structure containing a list of page IDs
+        sal_Int32 nPageCount = 0;
+        sal_Int32 nTabStripId = 0;
+        AxBinaryPropertyReader aReader( aXStrm );
+        aReader.skipUndefinedProperty();
+        aReader.readIntProperty< sal_Int32 >( nPageCount );
+        aReader.readIntProperty< sal_Int32 >( nTabStripId );
+        if( !aReader.finalizeImport() ) return;
+        // read the array containing all page identifiers in current order
+        typedef ::std::vector< sal_Int32 > AxPageIdVector;
+        AxPageIdVector aPageIds;
+        for( sal_Int32 nPage = 0; !aXStrm.isEof() && (nPage < nPageCount); ++nPage )
+            aPageIds.push_back( aXStrm.readInt32() );
+        if( aXStrm.isEof() ) return;
+
+        // check the page count value
+        bool bValidPageCount = (0 < nPageCount) && (static_cast< size_t >( nPageCount + 1 ) == aControls.size());
+        OSL_ENSURE( bValidPageCount, "VbaFormControl::finalizeEmbeddedControls - invalid number of pages" );
+        if( !bValidPageCount ) return;
+
+        /*  Check that this multipage contains the expected controls:
+            - a tabstrip control, specified by nTabStripId,
+            - form page controls (containing the embedded controls of each page). */
+
+        // the controls may be in arbitrary order, first map them by ID
+        RefMap< sal_Int32, VbaFormControl > aControlsById;
+        for( VbaFormControlVector::iterator aIt = aControls.begin(), aEnd = aControls.end(); aIt != aEnd; ++aIt )
+        {
+            VbaFormControlRef xControl = *aIt;
+            sal_Int32 nId = xControl->getControlId();
+            OSL_ENSURE( (nId > 0) && !aControlsById.has( nId ), "VbaFormControl::finalizeEmbeddedControls - invalid control ID" );
+            aControlsById[ nId ] = xControl;
+        }
+        // store tabstrip in the multipage, it will care about property conversion
+        AxTabStripModelRef xTabStripModel;
+        VbaFormControlRef xControl = aControlsById.get( nTabStripId );
+        if( xControl.get() )
+            xTabStripModel = ::boost::dynamic_pointer_cast< AxTabStripModel >( xControl->mxCtrlModel );
+        OSL_ENSURE( xTabStripModel.get(), "VbaFormControl::finalizeEmbeddedControls - missing tabstrip control" );
+        if( !xTabStripModel ) return;
+        pMultiPageModel->setTabStripModel( xTabStripModel );
+        aControlsById.erase( nTabStripId );
+        // store all pages in maControls in the correct order specified by aPageIds
+        sal_Int32 nTabIndex = 0;
+        for( AxPageIdVector::iterator aIt = aPageIds.begin(), aEnd = aPageIds.end(); aIt != aEnd; ++aIt, ++nTabIndex )
+        {
+            VbaFormControlRef rControl = aControlsById.get( *aIt );
+            AxFormPageModel* pFormPageModel = rControl.get() ? dynamic_cast< AxFormPageModel* >( rControl->mxCtrlModel.get() ) : 0;
+            OSL_ENSURE( pFormPageModel, "VbaFormControl::finalizeEmbeddedControls - missing formpage control" );
+            // do not exit on error but try to collect as much pages as possible
+            if( pFormPageModel )
             {
-                /*  Move all embedded controls of the group box relative to the
-                    position of the group box. */
-                xControl->moveEmbeddedToAbsoluteParent();
-                /*  Insert all children of the group box into the last control
-                    group (following the group box). */
-                rLastGroup.insert( rLastGroup.end(), xControl->maControls.begin(), xControl->maControls.end() );
-                xControl->maControls.clear();
-                // check if last control of the group box is an option button
-                bLastWasOptionButton = dynamic_cast< const AxOptionButtonModel* >( rLastGroup.back()->mxCtrlModel.get() ) != 0;
+                // get the tab caption from tabstrip control and set it at the formpage
+                OUString aCaption = xTabStripModel->getCaption( nTabIndex );
+                pFormPageModel->importProperty( XML_Caption, aCaption );
+                // store the control in maControls
+                maControls.push_back( rControl );
+                aControlsById.erase( *aIt );
             }
         }
     }
-
-    // flatten the vector of vectors of form controls to a single vector
-    maControls.clear();
-    for( VbaFormControlVectorVector::iterator aIt = aControlGroups.begin(), aEnd = aControlGroups.end(); aIt != aEnd; ++aIt )
-        maControls.insert( maControls.end(), (*aIt)->begin(), (*aIt)->end() );
-}
-
-void VbaFormControl::moveRelative( const AxPairData& rDistance )
-{
-    if( mxSiteModel.get() )
-        mxSiteModel->moveRelative( rDistance );
-}
-
-void VbaFormControl::moveEmbeddedToAbsoluteParent()
-{
-    if( mxSiteModel.get() && !maControls.empty() )
+    else
     {
-        // distance to move is equal to position of this control in its parent
-        AxPairData aDistance = mxSiteModel->getPosition();
-
-        /*  For group boxes: add half of the font height to Y position (VBA
-            positions relative to frame border line, not to 'top' of frame). */
-        const AxFontDataModel* pFontModel = dynamic_cast< const AxFontDataModel* >( mxCtrlModel.get() );
-        if( pFontModel && (pFontModel->getControlType() == API_CONTROL_GROUPBOX) )
+        /*  Reorder the controls appropriately (sort all option buttons of an
+            option group together to make grouping work), and erase all plain
+            tabstrip controls (currently not supported in UNO dialogs). */
+
+        // first, sort all controls by original tab index
+        ::std::sort( aControls.begin(), aControls.end(), &compareByTabIndex );
+
+        /*  Collect the programmatical names of all embedded controls (needed to be
+            able to set unused names to new dummy controls created below). */
+        VbaControlNamesSet aControlNames;
+        VbaControlNameInserter aInserter( aControlNames );
+        aControls.forEach( aInserter );
+
+        /*  Reprocess the sorted list and collect all option button controls that
+            are part of the same option group (determined by group name). All
+            controls will be stored in a vector of vectors, that collects every
+            option button group in one vector element, and other controls between
+            these option groups (or leading or trailing controls) in other vector
+            elements. If an option button group follows another group, a dummy
+            separator control has to be inserted. */
+        typedef RefVector< VbaFormControlVector > VbaFormControlVectorVector;
+        VbaFormControlVectorVector aControlGroups;
+
+        typedef RefMap< OUString, VbaFormControlVector > VbaFormControlVectorMap;
+        VbaFormControlVectorMap aOptionGroups;
+
+        typedef VbaFormControlVectorMap::mapped_type VbaFormControlVectorRef;
+        bool bLastWasOptionButton = false;
+        for( VbaFormControlVector::iterator aIt = aControls.begin(), aEnd = aControls.end(); aIt != aEnd; ++aIt )
         {
-            // convert points to 1/100 mm (1 pt = 1/72 inch = 2.54/72 cm = 2540/72 1/100 mm)
-            sal_Int32 nFontHeight = static_cast< sal_Int32 >( pFontModel->getFontHeight() * 2540 / 72 );
-            aDistance.second += nFontHeight / 2;
+            VbaFormControlRef xControl = *aIt;
+            const ControlModelBase* pCtrlModel = xControl->mxCtrlModel.get();
+            if ( !pCtrlModel ) // skip unsupported controls
+                continue;
+            if( const AxOptionButtonModel* pOptButtonModel = dynamic_cast< const AxOptionButtonModel* >( pCtrlModel ) )
+            {
+                // check if a new option group needs to be created
+                const OUString& rGroupName = pOptButtonModel->getGroupName();
+                VbaFormControlVectorRef& rxOptionGroup = aOptionGroups[ rGroupName ];
+                if( !rxOptionGroup )
+                {
+                    /*  If last control was an option button too, we have two
+                        option groups following each other, so a dummy separator
+                        control is needed. */
+                    if( bLastWasOptionButton )
+                    {
+                        VbaFormControlVectorRef xDummyGroup( new VbaFormControlVector );
+                        aControlGroups.push_back( xDummyGroup );
+                        OUString aName = aControlNames.generateDummyName();
+                        VbaFormControlRef xDummyControl( new VbaDummyFormControl( aName ) );
+                        xDummyGroup->push_back( xDummyControl );
+                    }
+                    rxOptionGroup.reset( new VbaFormControlVector );
+                    aControlGroups.push_back( rxOptionGroup );
+                }
+                /*  Append the option button to the control group (which is now
+                    referred by the vector aControlGroups and by the map
+                    aOptionGroups). */
+                rxOptionGroup->push_back( xControl );
+                bLastWasOptionButton = true;
+            }
+            else
+            {
+                // skip unsupported controls (tabstrips and page controls)
+                ApiControlType eCtrlType = pCtrlModel->getControlType();
+                if( (eCtrlType != API_CONTROL_TABSTRIP) && (eCtrlType != API_CONTROL_PAGE) )
+                {
+                    // open a new control group, if the last group is an option group
+                    if( bLastWasOptionButton || aControlGroups.empty() )
+                    {
+                        VbaFormControlVectorRef xControlGroup( new VbaFormControlVector );
+                        aControlGroups.push_back( xControlGroup );
+                    }
+                    // append the control to the last control group
+                    VbaFormControlVector& rLastGroup = *aControlGroups.back();
+                    rLastGroup.push_back( xControl );
+                    bLastWasOptionButton = false;
+                }
+            }
         }
 
-        // move the embedded controls
-        maControls.forEachMem( &VbaFormControl::moveRelative, ::boost::cref( aDistance ) );
+        // flatten the vector of vectors of form controls to a single vector
+        for( VbaFormControlVectorVector::iterator aIt = aControlGroups.begin(), aEnd = aControlGroups.end(); aIt != aEnd; ++aIt )
+            maControls.insert( maControls.end(), (*aIt)->begin(), (*aIt)->end() );
     }
 }
 
@@ -753,9 +796,10 @@ bool lclEatKeyword( OUString& rCodeLine, const OUString& rKeyword )
 // ----------------------------------------------------------------------------
 
 VbaUserForm::VbaUserForm( const Reference< XMultiServiceFactory >& rxGlobalFactory,
-        const GraphicHelper& rGraphicHelper, bool bDefaultColorBgr ) :
-    ControlConverter( rGraphicHelper, bDefaultColorBgr ),
-    mxGlobalFactory( rxGlobalFactory )
+        const Reference< XModel >& rxDocModel, const GraphicHelper& rGraphicHelper, bool bDefaultColorBgr ) :
+    mxGlobalFactory( rxGlobalFactory ),
+    mxDocModel( rxDocModel ),
+    maConverter( rxDocModel, rGraphicHelper, bDefaultColorBgr )
 {
     OSL_ENSURE( mxGlobalFactory.is(), "VbaUserForm::VbaUserForm - missing service factory" );
 }
@@ -764,7 +808,7 @@ void VbaUserForm::importForm( const Reference< XModel >& rxDocModel, const Refer
         StorageBase& rVbaFormStrg, const OUString& rModuleName, rtl_TextEncoding eTextEnc )
 {
     OSL_ENSURE( rxDialogLib.is(), "VbaUserForm::importForm - missing dialog library" );
-    if( !mxGlobalFactory.is() || !rxDialogLib.is() )
+    if( !mxGlobalFactory.is() || !mxDocModel.is() || !rxDialogLib.is() )
         return;
 
     // check that the '03VBFrame' stream exists, this is required for forms
@@ -826,7 +870,7 @@ void VbaUserForm::importForm( const Reference< XModel >& rxDocModel, const Refer
         Reference< XNameContainer > xDialogNC( xDialogModel, UNO_QUERY_THROW );
 
         // convert properties and embedded controls
-        if( convertProperties( xDialogModel, *this, 0 ) )
+        if( convertProperties( xDialogModel, maConverter, 0 ) )
         {
             // export the dialog to XML and insert it into the dialog library
             PropertySet aFactoryProps( mxGlobalFactory );
diff --git a/oox/source/ole/vbamodule.cxx b/oox/source/ole/vbamodule.cxx
index d8c528b1bfc0..310f86572ce8 100644
--- a/oox/source/ole/vbamodule.cxx
+++ b/oox/source/ole/vbamodule.cxx
@@ -27,29 +27,101 @@
  ************************************************************************/
 
 #include "oox/ole/vbamodule.hxx"
+#include <hash_map>
 #include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/script/ModuleInfo.hpp>
 #include <com/sun/star/script/ModuleType.hpp>
 #include <com/sun/star/script/vba/XVBAModuleInfo.hpp>
+#include <cppuhelper/implbase1.hxx>
 #include "oox/helper/binaryinputstream.hxx"
 #include "oox/helper/storagebase.hxx"
 #include "oox/helper/textinputstream.hxx"
 #include "oox/ole/vbahelper.hxx"
 #include "oox/ole/vbainputstream.hxx"
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
+namespace oox {
+namespace ole {
+
+// ============================================================================
 
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::script;
 using namespace ::com::sun::star::script::vba;
 using namespace ::com::sun::star::uno;
 
-namespace oox {
-namespace ole {
-
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
 // ============================================================================
+typedef ::cppu::WeakImplHelper1< XIndexContainer > OleIdToNameContainer_BASE;
+typedef std::hash_map< sal_Int32, rtl::OUString >  ObjIdToName;
+
+class OleIdToNameContainer : public OleIdToNameContainer_BASE
+{
+    ObjIdToName ObjIdToNameHash;
+    ::osl::Mutex m_aMutex;
+    bool hasByIndex( ::sal_Int32 Index )
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        return ( ObjIdToNameHash.find( Index ) != ObjIdToNameHash.end() );
+    }
+public:
+    OleIdToNameContainer() {}
+    // XIndexContainer Methods
+    virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const Any& Element ) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        rtl::OUString sOleName;
+        if ( !( Element >>= sOleName ) )
+            throw IllegalArgumentException();
+        ObjIdToNameHash[ Index ] = sOleName;
+    }
+    virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        if ( !hasByIndex( Index ) )
+            throw IndexOutOfBoundsException();
+        ObjIdToNameHash.erase( ObjIdToNameHash.find( Index ) );
+    }
+    // XIndexReplace Methods
+    virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const Any& Element ) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        if ( !hasByIndex( Index ) )
+            throw IndexOutOfBoundsException();
+        rtl::OUString sOleName;
+        if ( !( Element >>= sOleName ) )
+            throw IllegalArgumentException();
+        ObjIdToNameHash[ Index ] = sOleName;
+    }
+    // XIndexAccess Methods
+    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        return ObjIdToNameHash.size();
+    }
+    virtual Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        if ( !hasByIndex( Index ) )
+            throw IndexOutOfBoundsException();
+        return makeAny( ObjIdToNameHash[ Index ] );
+    }
+    // XElementAccess Methods
+    virtual Type SAL_CALL getElementType(  ) throw (RuntimeException)
+    {
+        return ::getCppuType( static_cast< const ::rtl::OUString* >( 0 ) );
+    }
+    virtual ::sal_Bool SAL_CALL hasElements(  ) throw (RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        return ( getCount() > 0 );
+    }
+};
+
+ // ============================================================================
 
 VbaModule::VbaModule( const Reference< XModel >& rxDocModel, const OUString& rName, rtl_TextEncoding eTextEnc, bool bExecutable ) :
     mxDocModel( rxDocModel ),
@@ -129,18 +201,86 @@ void VbaModule::importDirRecords( BinaryInputStream& rDirStrm )
     OSL_ENSURE( mnOffset < SAL_MAX_UINT32, "VbaModule::importDirRecords - missing module stream offset" );
 }
 
-void VbaModule::importSourceCode( StorageBase& rVbaStrg,
-        const Reference< XNameContainer >& rxBasicLib, const Reference< XNameAccess >& rxDocObjectNA ) const
+void VbaModule::createAndImportModule( StorageBase& rVbaStrg, const Reference< XNameContainer >& rxBasicLib,
+        const Reference< XNameAccess >& rxDocObjectNA, const Reference< XNameContainer >& rxOleNameOverrides ) const
 {
-    if( (maName.getLength() == 0) || (maStreamName.getLength() == 0) || (mnOffset == SAL_MAX_UINT32) )
-        return;
+    OUString aVBASourceCode = readSourceCode( rVbaStrg, rxOleNameOverrides );
+    createModule( aVBASourceCode, rxBasicLib, rxDocObjectNA );
+}
+
+void VbaModule::createEmptyModule( const Reference< XNameContainer >& rxBasicLib, const Reference< XNameAccess >& rxDocObjectNA ) const
+{
+    createModule( OUString(), rxBasicLib, rxDocObjectNA );
+}
 
-    BinaryXInputStream aInStrm( rVbaStrg.openInputStream( maStreamName ), true );
-    OSL_ENSURE( !aInStrm.isEof(), "VbaModule::importSourceCode - cannot open module stream" );
-    // skip the 'performance cache' stored before the actual source code
-    aInStrm.seek( mnOffset );
-    // if stream is still valid, load the source code
-    if( aInStrm.isEof() )
+// private --------------------------------------------------------------------
+
+OUString VbaModule::readSourceCode( StorageBase& rVbaStrg, const Reference< XNameContainer >& rxOleNameOverrides ) const
+{
+    OUStringBuffer aSourceCode;
+    if( (maStreamName.getLength() > 0) && (mnOffset != SAL_MAX_UINT32) )
+    {
+        BinaryXInputStream aInStrm( rVbaStrg.openInputStream( maStreamName ), true );
+        OSL_ENSURE( !aInStrm.isEof(), "VbaModule::readSourceCode - cannot open module stream" );
+        // skip the 'performance cache' stored before the actual source code
+        aInStrm.seek( mnOffset );
+        // if stream is still valid, load the source code
+        if( !aInStrm.isEof() )
+        {
+            // decompression starts at current stream position of aInStrm
+            VbaInputStream aVbaStrm( aInStrm );
+            // load the source code line-by-line, with some more processing
+            TextInputStream aVbaTextStrm( aVbaStrm, meTextEnc );
+            while( !aVbaTextStrm.isEof() )
+            {
+                OUString aCodeLine = aVbaTextStrm.readLine();
+                if( aCodeLine.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "Attribute " ) ) )
+                {
+                    // attribute
+                    extractOleOverrideFromAttr( aCodeLine, rxOleNameOverrides );
+                }
+                else
+                {
+                    // normal source code line
+                    if( !mbExecutable )
+                        aSourceCode.appendAscii( RTL_CONSTASCII_STRINGPARAM( "Rem " ) );
+                    aSourceCode.append( aCodeLine ).append( sal_Unicode( '\n' ) );
+                }
+            }
+        }
+    }
+    return aSourceCode.makeStringAndClear();
+}
+
+void VbaModule::extractOleOverrideFromAttr( const OUString& rAttribute, const Reference< XNameContainer >& rxOleNameOverrides ) const
+{
+    // format of the attribute we are interested in is
+    // Attribute VB_Control = "ControlName", intString, MSForms, ControlTypeAsString
+    // e.g.
+    // Attribute VB_Control = "CommandButton1, 201, 19, MSForms, CommandButton"
+    OUString sControlAttribute = CREATE_OUSTRING( "Attribute VB_Control = \"" );
+    if ( rxOleNameOverrides.is() && rAttribute.indexOf( sControlAttribute ) !=  -1 )
+    {
+        OUString sRest = rAttribute.copy( sControlAttribute.getLength() );
+        sal_Int32 nPos = sRest.indexOf( ',' );
+        OUString sCntrlName = sRest.copy( 0, nPos );
+
+        sal_Int32 nCntrlId = sRest.copy( nPos + 1 ).copy( 0, sRest.indexOf( ',', nPos + 1) ).toInt32();
+        OSL_TRACE("In module %s, assiging %d controlname %s",
+            rtl::OUStringToOString( maName, RTL_TEXTENCODING_UTF8 ).getStr(), nCntrlId,
+            rtl::OUStringToOString( sCntrlName, RTL_TEXTENCODING_UTF8 ).getStr() );
+        if ( !rxOleNameOverrides->hasByName( maName ) )
+            rxOleNameOverrides->insertByName( maName, Any( Reference< XIndexContainer> ( new OleIdToNameContainer ) ) );
+        Reference< XIndexContainer > xIdToOleName;
+        if ( rxOleNameOverrides->getByName( maName ) >>= xIdToOleName )
+            xIdToOleName->insertByIndex( nCntrlId, makeAny( sCntrlName ) );
+    }
+}
+
+void VbaModule::createModule( const OUString& rVBASourceCode,
+        const Reference< XNameContainer >& rxBasicLib, const Reference< XNameAccess >& rxDocObjectNA ) const
+{
+    if( maName.getLength() == 0 )
         return;
 
     // prepare the Basic module
@@ -189,21 +329,8 @@ void VbaModule::importSourceCode( StorageBase& rVbaStrg,
             append( maName.replace( ' ', '_' ) ).append( sal_Unicode( '\n' ) );
     }
 
-    // decompression starts at current stream position of aInStrm
-    VbaInputStream aVbaStrm( aInStrm );
-    // load the source code line-by-line, with some more processing
-    TextInputStream aVbaTextStrm( aVbaStrm, meTextEnc );
-    while( !aVbaTextStrm.isEof() )
-    {
-        OUString aCodeLine = aVbaTextStrm.readLine();
-        // skip all 'Attribute' statements
-        if( !aCodeLine.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "Attribute " ) ) )
-        {
-            if( !mbExecutable )
-                aSourceCode.appendAscii( RTL_CONSTASCII_STRINGPARAM( "Rem " ) );
-            aSourceCode.append( aCodeLine ).append( sal_Unicode( '\n' ) );
-        }
-    }
+    // append passed VBA source code
+    aSourceCode.append( rVBASourceCode );
 
     // close the subroutine named after the module
     if( !mbExecutable )
@@ -226,7 +353,7 @@ void VbaModule::importSourceCode( StorageBase& rVbaStrg,
     }
     catch( Exception& )
     {
-        OSL_ENSURE( false, "VbaModule::importSourceCode - cannot insert module into library" );
+        OSL_ENSURE( false, "VbaModule::createModule - cannot insert module into library" );
     }
 }
 
diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx
index fad2dba04ffa..f8acf017135b 100755
--- a/oox/source/ole/vbaproject.cxx
+++ b/oox/source/ole/vbaproject.cxx
@@ -130,11 +130,9 @@ VbaProject::VbaProject( const Reference< XMultiServiceFactory >& rxGlobalFactory
     VbaFilterConfig( rxGlobalFactory, rConfigCompName ),
     mxGlobalFactory( rxGlobalFactory ),
     mxDocModel( rxDocModel ),
-    maLibName( CREATE_OUSTRING( "Standard" ) )
+    maPrjName( CREATE_OUSTRING( "Standard" ) )
 {
     OSL_ENSURE( mxDocModel.is(), "VbaProject::VbaProject - missing document model" );
-    mxBasicLib = openLibrary( PROP_BasicLibraries, false );
-    mxDialogLib = openLibrary( PROP_DialogLibraries, false );
 }
 
 VbaProject::~VbaProject()
@@ -174,6 +172,18 @@ bool VbaProject::hasDialog( const OUString& rDialogName ) const
     return mxDialogLib.is() && mxDialogLib->hasByName( rDialogName );
 }
 
+// protected ------------------------------------------------------------------
+
+void VbaProject::addDummyModule( const OUString& rName, sal_Int32 nType )
+{
+    OSL_ENSURE( rName.getLength() > 0, "VbaProject::addDummyModule - missing module name" );
+    maDummyModules[ rName ] = nType;
+}
+
+void VbaProject::prepareModuleImport()
+{
+}
+
 // private --------------------------------------------------------------------
 
 Reference< XLibraryContainer > VbaProject::getLibraryContainer( sal_Int32 nPropId )
@@ -189,9 +199,9 @@ Reference< XNameContainer > VbaProject::openLibrary( sal_Int32 nPropId, bool bCr
     try
     {
         Reference< XLibraryContainer > xLibContainer( getLibraryContainer( nPropId ), UNO_SET_THROW );
-        if( bCreateMissing && !xLibContainer->hasByName( maLibName ) )
-            xLibContainer->createLibrary( maLibName );
-        xLibrary.set( xLibContainer->getByName( maLibName ), UNO_QUERY_THROW );
+        if( bCreateMissing && !xLibContainer->hasByName( maPrjName ) )
+            xLibContainer->createLibrary( maPrjName );
+        xLibrary.set( xLibContainer->getByName( maPrjName ), UNO_QUERY_THROW );
     }
     catch( Exception& )
     {
@@ -232,6 +242,9 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap
     if( aDirStrm.isEof() )
         return;
 
+    // virtual call, derived classes may do some preparations
+    prepareModuleImport();
+
     // read all records of the directory
     rtl_TextEncoding eTextEnc = RTL_TEXTENCODING_MS_1252;
     sal_uInt16 nModuleCount = 0;
@@ -260,6 +273,14 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap
                     eTextEnc = eNewTextEnc;
             }
             break;
+            case VBA_ID_PROJECTNAME:
+            {
+                OUString aPrjName = aRecStrm.readCharArrayUC( nRecSize, eTextEnc );
+                OSL_ENSURE( aPrjName.getLength() > 0, "VbaProject::importVba - invalid project name" );
+                if( aPrjName.getLength() > 0 )
+                    maPrjName = aPrjName;
+            }
+            break;
             case VBA_ID_PROJECTMODULES:
                 OOX_ENSURE_RECORDSIZE( nRecSize == 2 );
                 OSL_ENSURE( aModules.empty(), "VbaProject::importVba - unexpected PROJECTMODULES record" );
@@ -346,11 +367,21 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap
         }
     }
 
+    // create empty dummy modules
+    VbaModuleMap aDummyModules;
+    for( DummyModuleMap::iterator aIt = maDummyModules.begin(), aEnd = maDummyModules.end(); aIt != aEnd; ++aIt )
+    {
+        OSL_ENSURE( !aModules.has( aIt->first ) && !aDummyModules.has( aIt->first ), "VbaProject::importVba - multiple modules with the same name" );
+        VbaModuleMap::mapped_type& rxModule = aDummyModules[ aIt->first ];
+        rxModule.reset( new VbaModule( mxDocModel, aIt->first, eTextEnc, bExecutable ) );
+        rxModule->setType( aIt->second );
+    }
+
     /*  Now it is time to load the source code. All modules will be inserted
-        into the Basic library of the document specified by the 'maLibName'
+        into the Basic library of the document specified by the 'maPrjName'
         member. Do not create the Basic library, if there are no modules
         specified. */
-    if( !aModules.empty() ) try
+    if( !aModules.empty() || !aDummyModules.empty() ) try
     {
         // get the model factory and the basic library
         Reference< XMultiServiceFactory > xModelFactory( mxDocModel, UNO_QUERY_THROW );
@@ -359,7 +390,10 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap
         // set library container to VBA compatibility mode
         try
         {
-            Reference< XVBACompatibility >( getLibraryContainer( PROP_BasicLibraries ), UNO_QUERY_THROW )->setVBACompatibilityMode( sal_True );
+            Reference< XVBACompatibility > xVBACompat( getLibraryContainer( PROP_BasicLibraries ), UNO_QUERY_THROW );
+            xVBACompat->setVBACompatibilityMode( sal_True );
+            xVBACompat->setProjectName( maPrjName );
+
         }
         catch( Exception& )
         {
@@ -385,10 +419,17 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap
             // not all documents support this
         }
 
-        // call Basic source code import for each module, boost::[c]ref enforces pass-by-ref
         if( xBasicLib.is() )
-            aModules.forEachMem( &VbaModule::importSourceCode,
-                ::boost::ref( *xVbaStrg ), ::boost::cref( xBasicLib ), ::boost::cref( xDocObjectNA ) );
+        {
+            // call Basic source code import for each module, boost::[c]ref enforces pass-by-ref
+            aModules.forEachMem( &VbaModule::createAndImportModule,
+                ::boost::ref( *xVbaStrg ), ::boost::cref( xBasicLib ),
+                ::boost::cref( xDocObjectNA ), ::boost::cref( mxOleOverridesSink ) );
+
+            // create empty dummy modules
+            aDummyModules.forEachMem( &VbaModule::createEmptyModule,
+                ::boost::cref( xBasicLib ), ::boost::cref( xDocObjectNA ) );
+        }
     }
     catch( Exception& )
     {
@@ -418,7 +459,7 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap
 
                 // create and import the form
                 Reference< XNameContainer > xDialogLib( createDialogLibrary(), UNO_SET_THROW );
-                VbaUserForm aForm( mxGlobalFactory, rGraphicHelper, bDefaultColorBgr );
+                VbaUserForm aForm( mxGlobalFactory, mxDocModel, rGraphicHelper, bDefaultColorBgr );
                 aForm.importForm( mxDocModel, xDialogLib, *xSubStrg, aModuleName, eTextEnc );
             }
             catch( Exception& )
diff --git a/oox/source/ole/vbaprojectfilter.cxx b/oox/source/ole/vbaprojectfilter.cxx
new file mode 100644
index 000000000000..82cba31781b2
--- /dev/null
+++ b/oox/source/ole/vbaprojectfilter.cxx
@@ -0,0 +1,104 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "oox/ole/vbaprojectfilter.hxx"
+
+#include "oox/ole/vbaproject.hxx"
+
+namespace oox {
+namespace ole {
+
+// ============================================================================
+
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+
+using ::rtl::OUString;
+
+// ============================================================================
+
+VbaProjectFilterBase::VbaProjectFilterBase( const Reference< XMultiServiceFactory >& rxGlobalFactory,
+        const OUString& rAppName, const OUString& rStorageName ) :
+    BinaryFilterBase( rxGlobalFactory ),
+    maAppName( rAppName ),
+    maStorageName( rStorageName )
+{
+}
+
+bool VbaProjectFilterBase::importDocument() throw()
+{
+    StorageRef xVbaPrjStrg = openSubStorage( maStorageName, false );
+    if( xVbaPrjStrg.get() && xVbaPrjStrg->isStorage() )
+    {
+        VbaProject aVbaProject( getGlobalFactory(), getModel(), maAppName );
+        aVbaProject.importVbaProject( *xVbaPrjStrg, getGraphicHelper() );
+        return true;
+    }
+    return false;
+}
+
+bool VbaProjectFilterBase::exportDocument() throw()
+{
+    return false;
+}
+
+// ============================================================================
+
+OUString SAL_CALL WordVbaProjectFilter_getImplementationName() throw()
+{
+    return CREATE_OUSTRING( "com.sun.star.comp.oox.WordVbaProjectFilter" );
+}
+
+Sequence< OUString > SAL_CALL WordVbaProjectFilter_getSupportedServiceNames() throw()
+{
+    Sequence< OUString > aSeq( 1 );
+    aSeq[ 0 ] = CREATE_OUSTRING( "com.sun.star.comp.oox.WordVBAProjectFilter" );
+    return aSeq;
+}
+
+Reference< XInterface > SAL_CALL WordVbaProjectFilter_createInstance(
+        const Reference< XMultiServiceFactory >& rxGlobalFactory ) throw( Exception )
+{
+    return static_cast< ::cppu::OWeakObject* >( new WordVbaProjectFilter( rxGlobalFactory ) );
+}
+
+// ----------------------------------------------------------------------------
+
+WordVbaProjectFilter::WordVbaProjectFilter( const Reference< XMultiServiceFactory >& rxGlobalFactory ) :
+    VbaProjectFilterBase( rxGlobalFactory, CREATE_OUSTRING( "Writer" ), CREATE_OUSTRING( "Macros" ) )
+{
+}
+
+OUString WordVbaProjectFilter::implGetImplementationName() const
+{
+    return WordVbaProjectFilter_getImplementationName();
+}
+
+// ============================================================================
+
+} // namespace ole
+} // namespace oox
diff --git a/oox/source/ppt/customshowlistcontext.cxx b/oox/source/ppt/customshowlistcontext.cxx
index 04863c1f5e94..e243b18607bf 100644
--- a/oox/source/ppt/customshowlistcontext.cxx
+++ b/oox/source/ppt/customshowlistcontext.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "customshowlistcontext.hxx"
+#include "oox/ppt/customshowlistcontext.hxx"
 #include "oox/core/namespaces.hxx"
 #include "tokens.hxx"
 
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index cc458d0f5cc2..67c4ba1aff22 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -38,6 +38,9 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::xml::sax;
 using namespace oox::core;
 
+using ::com::sun::star::beans::PropertyValue;
+using ::com::sun::star::lang::XComponent;
+
 namespace oox { namespace ppt {
 
 OUString SAL_CALL PowerPointImport_getImplementationName() throw()
@@ -57,10 +60,17 @@ uno::Reference< uno::XInterface > SAL_CALL PowerPointImport_createInstance(const
     return (cppu::OWeakObject*)new PowerPointImport( rSMgr );
 }
 
+#if OSL_DEBUG_LEVEL > 0
+XmlFilterBase* PowerPointImport::mpDebugFilterBase = NULL;
+#endif
+
 PowerPointImport::PowerPointImport( const uno::Reference< lang::XMultiServiceFactory > & rSMgr  )
     : XmlFilterBase( rSMgr )
     , mxChartConv( new ::oox::drawingml::chart::ChartConverter )
 {
+#if OSL_DEBUG_LEVEL > 0
+    mpDebugFilterBase = this;
+#endif
 }
 
 PowerPointImport::~PowerPointImport()
@@ -131,6 +141,29 @@ const ::oox::drawingml::Theme* PowerPointImport::getCurrentTheme() const
     return mpActualSlidePersist ? mpActualSlidePersist->getTheme().get() : 0;
 }
 
+sal_Bool SAL_CALL PowerPointImport::filter( const Sequence< PropertyValue >& rDescriptor ) throw( RuntimeException )
+{
+    if( XmlFilterBase::filter( rDescriptor ) )
+        return true;
+
+    if( isExportFilter() ) {
+        Reference< XExporter > xExporter( getGlobalFactory()->createInstance( CREATE_OUSTRING( "com.sun.star.comp.Impress.oox.PowerPointExport" ) ), UNO_QUERY );
+
+        if( xExporter.is() ) {
+            Reference< XComponent > xDocument( getModel(), UNO_QUERY );
+            Reference< XFilter > xFilter( xExporter, UNO_QUERY );
+
+            if( xFilter.is() ) {
+                xExporter->setSourceDocument( xDocument );
+                if( xFilter->filter( rDescriptor ) )
+                    return true;
+            }
+        }
+    }
+
+    return false;
+}
+
 ::oox::vml::Drawing* PowerPointImport::getVmlDrawing()
 {
     return mpActualSlidePersist ? mpActualSlidePersist->getDrawing() : 0;
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 2542a372ce61..2c6b383a2489 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -84,8 +84,8 @@ void PPTShape::addShape(
             Reference< lang::XMultiServiceFactory > xServiceFact( rFilterBase.getModel(), UNO_QUERY_THROW );
             sal_Bool bClearText = sal_False;
 
-            if ( sServiceName != OUString::createFromAscii( "com.sun.star.drawing.GraphicObjectShape" ) &&
-                 sServiceName != OUString::createFromAscii( "com.sun.star.drawing.OLE2Shape" ) )
+            if ( sServiceName != OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GraphicObjectShape")) &&
+                 sServiceName != OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OLE2Shape")) )
             {
                 switch( mnSubType )
                 {
diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx
index c4ab81e51a0b..1bcbed7d8f29 100644
--- a/oox/source/ppt/slidepersist.cxx
+++ b/oox/source/ppt/slidepersist.cxx
@@ -75,8 +75,15 @@ SlidePersist::SlidePersist( XmlFilterBase& rFilter, sal_Bool bMaster, sal_Bool b
     */
         maOtherTextStylePtr->apply( *pDefaultTextStyle.get() );
     }
+#if OSL_DEBUG_LEVEL > 0
+    mxDebugPage = mxPage;
+#endif
 }
 
+#if OSL_DEBUG_LEVEL > 0
+        ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SlidePersist::mxDebugPage;
+#endif
+
 SlidePersist::~SlidePersist()
 {
 
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index 98f712fbedc6..e8c33b4fc71a 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -6,6 +6,7 @@ Adjust
 AdjustContrast
 AdjustLuminance
 AdjustmentValues
+Address
 Align
 AnchorPosition
 ArrangeOrder
@@ -334,6 +335,7 @@ RefX
 RefY
 Reference
 ReferenceDevice
+ReferenceSheet
 RegularExpressions
 RelId
 RelativeHorizontalTabbarWidth
@@ -463,5 +465,6 @@ Weight
 WhiteDay
 Width
 WritingMode
+XLA1Representation
 ZoomType
 ZoomValue
diff --git a/oox/source/token/tokenmap.cxx b/oox/source/token/tokenmap.cxx
index d02a74807ec1..c62fe2277b52 100644
--- a/oox/source/token/tokenmap.cxx
+++ b/oox/source/token/tokenmap.cxx
@@ -33,8 +33,6 @@
 #include "tokens.hxx"
 #include "oox/helper/containerhelper.hxx"
 
-#include <string.h>
-
 using ::rtl::OString;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Sequence;
diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx
index 1e3bd0135b5e..61dfd4b6c362 100644
--- a/oox/source/vml/vmldrawing.cxx
+++ b/oox/source/vml/vmldrawing.cxx
@@ -103,7 +103,7 @@ Drawing::~Drawing()
 {
     if( !mxCtrlForm.get() )
         mxCtrlForm.reset( new ::oox::ole::EmbeddedForm(
-            mrFilter.getModelFactory(), mxDrawPage, mrFilter.getGraphicHelper() ) );
+            mrFilter.getModel(), mxDrawPage, mrFilter.getGraphicHelper() ) );
     return *mxCtrlForm;
 }
 
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 3f5bc4d00f41..adbf9db205fa 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -171,22 +171,22 @@ void lclSetXShapeRect( const Reference< XShape >& rxShape, const Rectangle& rSha
             try
             {
                 // The size
-                xProps->setPropertyValue( OUString::createFromAscii( "SizeType" ), Any( SizeType::FIX ) );
-                xProps->setPropertyValue( OUString::createFromAscii( "FrameIsAutomaticHeight" ), Any( sal_False ) );
-                xProps->setPropertyValue( OUString::createFromAscii( "Height" ), Any( rShapeRect.Height ) );
-                xProps->setPropertyValue( OUString::createFromAscii( "Width" ), Any( rShapeRect.Width ) );
+                xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("SizeType")), Any( SizeType::FIX ) );
+                xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutomaticHeight")), Any( sal_False ) );
+                xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Height")), Any( rShapeRect.Height ) );
+                xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Width")), Any( rShapeRect.Width ) );
 
                 // The position
-                xProps->setPropertyValue( OUString::createFromAscii( "HoriOrientPosition" ), Any( rShapeRect.X ) );
-                xProps->setPropertyValue( OUString::createFromAscii( "HoriOrientRelation" ),
+                xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("HoriOrientPosition")), Any( rShapeRect.X ) );
+                xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("HoriOrientRelation")),
                         Any( RelOrientation::FRAME ) );
-                xProps->setPropertyValue( OUString::createFromAscii( "HoriOrient" ),
+                xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("HoriOrient")),
                         Any( HoriOrientation::NONE ) );
 
-                xProps->setPropertyValue( OUString::createFromAscii( "VertOrientPosition" ), Any( rShapeRect.Y ) );
-                xProps->setPropertyValue( OUString::createFromAscii( "VertOrientRelation" ),
+                xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("VertOrientPosition")), Any( rShapeRect.Y ) );
+                xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("VertOrientRelation")),
                         Any( RelOrientation::FRAME ) );
-                xProps->setPropertyValue( OUString::createFromAscii( "VertOrient" ),
+                xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("VertOrient")),
                         Any( VertOrientation::NONE ) );
             }
             catch ( Exception& )
diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx
index ac7ede61f161..9a20ab40151c 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -241,7 +241,7 @@ ContextHandlerRef ShapeTypeContext::onCreateContext( sal_Int32 nElement, const A
             mrTypeModel.maFillModel.moRotate = lclDecodeBool( rAttribs, XML_rotate );
         break;
         case VML_TOKEN( imagedata ):
-            mrTypeModel.moGraphicPath = decodeFragmentPath( rAttribs, O_TOKEN( relid ) );
+            mrTypeModel.moGraphicPath = decodeFragmentPath( rAttribs, R_TOKEN( id ) );
             mrTypeModel.moGraphicTitle = rAttribs.getString( O_TOKEN( title ) );
         break;
     }
@@ -294,7 +294,7 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 nElement, const Attri
     // Custom shape in Writer with a textbox are transformed into a frame
     if ( nElement == ( NMSP_VML + XML_textbox ) )
         dynamic_cast<SimpleShape&>( mrShape ).setService(
-            OUString::createFromAscii( "com.sun.star.text.TextFrame" ) );
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFrame")) );
 
     // Excel specific shape client data
     if( isRootElement() && (nElement == VMLX_TOKEN( ClientData )) )
@@ -342,7 +342,7 @@ ContextHandlerRef RectangleShapeContext::onCreateContext( sal_Int32 nElement, co
 {
     if ( nElement == ( NMSP_VML + XML_textbox ) )
         dynamic_cast< SimpleShape &>( mrShape ).setService(
-            OUString::createFromAscii( "com.sun.star.text.TextFrame" ) );
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFrame")) );
 
     // The parent class's context is fine
     return ShapeContext::onCreateContext( nElement, rAttribs );
diff --git a/oox/source/xls/commentsbuffer.cxx b/oox/source/xls/commentsbuffer.cxx
index 159bde83b22c..035c14a606ec 100644
--- a/oox/source/xls/commentsbuffer.cxx
+++ b/oox/source/xls/commentsbuffer.cxx
@@ -211,7 +211,7 @@ void Comment::finalizeImport()
             Reference< XShape > xAnnoShape( xAnnoShapeSupp->getAnnotationShape(), UNO_SET_THROW );
             Reference <XText> xText( xAnnoShape, UNO_QUERY_THROW );
             Reference <XTextRange> xTextRange( xText, UNO_QUERY_THROW );
-            xTextRange->setString( OUString::createFromAscii("") ); // Clear contents
+            xTextRange->setString( OUString() ); // Clear contents
             maModel.mxText->convert( xText, -1 );
 
             // Add shape formatting properties (autoFill, colHidden and rowHidden are dropped)
diff --git a/oox/source/xls/drawingfragment.cxx b/oox/source/xls/drawingfragment.cxx
index ad6bb97cdea9..4a32fe5d42e1 100644
--- a/oox/source/xls/drawingfragment.cxx
+++ b/oox/source/xls/drawingfragment.cxx
@@ -28,44 +28,30 @@
 
 #include "oox/xls/drawingfragment.hxx"
 #include <com/sun/star/awt/Point.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/form/binding/XBindableValue.hpp>
-#include <com/sun/star/form/binding/XListEntrySink.hpp>
-#include <com/sun/star/form/binding/XListEntrySource.hpp>
-#include <com/sun/star/form/binding/XValueBinding.hpp>
-#include "properties.hxx"
-#include "oox/helper/attributelist.hxx"
-#include "oox/helper/propertyset.hxx"
 #include "oox/drawingml/connectorshapecontext.hxx"
 #include "oox/drawingml/graphicshapecontext.hxx"
 #include "oox/drawingml/shapecontext.hxx"
 #include "oox/drawingml/shapegroupcontext.hxx"
+#include "oox/helper/attributelist.hxx"
+#include "oox/helper/propertyset.hxx"
 #include "oox/vml/vmlshape.hxx"
 #include "oox/vml/vmlshapecontainer.hxx"
 #include "oox/xls/formulaparser.hxx"
 #include "oox/xls/stylesbuffer.hxx"
 #include "oox/xls/themebuffer.hxx"
 #include "oox/xls/unitconverter.hxx"
+#include "properties.hxx"
+
+namespace oox {
+namespace xls {
+
+// ============================================================================
+
+using namespace ::com::sun::star::awt;
+using namespace ::com::sun::star::table;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::drawing;
 
-using ::rtl::OUString;
-using ::com::sun::star::uno::Any;
-using ::com::sun::star::uno::Exception;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::uno::UNO_QUERY;
-using ::com::sun::star::uno::UNO_QUERY_THROW;
-using ::com::sun::star::beans::NamedValue;
-using ::com::sun::star::awt::Point;
-using ::com::sun::star::awt::Rectangle;
-using ::com::sun::star::awt::Size;
-using ::com::sun::star::awt::XControlModel;
-using ::com::sun::star::form::binding::XBindableValue;
-using ::com::sun::star::form::binding::XListEntrySink;
-using ::com::sun::star::form::binding::XListEntrySource;
-using ::com::sun::star::form::binding::XValueBinding;
-using ::com::sun::star::drawing::XShape;
-using ::com::sun::star::table::CellAddress;
-using ::com::sun::star::table::CellRangeAddress;
 using ::oox::core::ContextHandlerRef;
 using ::oox::drawingml::ConnectorShapeContext;
 using ::oox::drawingml::GraphicalObjectFrameContext;
@@ -74,10 +60,10 @@ using ::oox::drawingml::Shape;
 using ::oox::drawingml::ShapePtr;
 using ::oox::drawingml::ShapeContext;
 using ::oox::drawingml::ShapeGroupContext;
-// no using's for ::oox::vml, that may clash with ::oox::drawingml types
+using ::rtl::OUString;
 
-namespace oox {
-namespace xls {
+
+// no using's for ::oox::vml, that may clash with ::oox::drawingml types
 
 // ============================================================================
 
@@ -557,7 +543,8 @@ bool VmlFindNoteFunc::operator()( const ::oox::vml::ShapeBase& rShape ) const
 
 VmlDrawing::VmlDrawing( const WorksheetHelper& rHelper ) :
     ::oox::vml::Drawing( rHelper.getOoxFilter(), rHelper.getDrawPage(), ::oox::vml::VMLDRAWING_EXCEL ),
-    WorksheetHelper( rHelper )
+    WorksheetHelper( rHelper ),
+    maControlConv( rHelper.getBaseFilter().getModel(), rHelper.getBaseFilter().getGraphicHelper() )
 {
 }
 
@@ -592,65 +579,9 @@ void VmlDrawing::convertControlClientData( const Reference< XControlModel >& rxC
         // printable
         aPropSet.setProperty( PROP_Printable, rClientData.mbPrintObject );
 
-        // linked cell
-        if( rClientData.maLinkedCell.getLength() > 0 ) try
-        {
-            Reference< XBindableValue > xBindable( rxCtrlModel, UNO_QUERY_THROW );
-
-            // convert formula string to cell address
-            FormulaParser& rParser = getFormulaParser();
-            TokensFormulaContext aContext( true, false );
-            aContext.setBaseAddress( CellAddress( getSheetIndex(), 0, 0 ) );
-            rParser.importFormula( aContext, rClientData.maLinkedCell );
-            CellAddress aAddress;
-            if( rParser.extractCellAddress( aAddress, aContext.getTokens(), true ) )
-            {
-                // create argument sequence for createInstanceWithArguments()
-                NamedValue aValue;
-                aValue.Name = CREATE_OUSTRING( "BoundCell" );
-                aValue.Value <<= aAddress;
-                Sequence< Any > aArgs( 1 );
-                aArgs[ 0 ] <<= aValue;
-
-                // create the CellValueBinding instance and set at the control model
-                Reference< XValueBinding > xBinding( getDocumentFactory()->createInstanceWithArguments(
-                    CREATE_OUSTRING( "com.sun.star.table.CellValueBinding" ), aArgs ), UNO_QUERY_THROW );
-                xBindable->setValueBinding( xBinding );
-            }
-        }
-        catch( Exception& )
-        {
-        }
-
-        // source range
-        if( rClientData.maSourceRange.getLength() > 0 ) try
-        {
-            Reference< XListEntrySink > xEntrySink( rxCtrlModel, UNO_QUERY_THROW );
-
-            // convert formula string to cell range
-            FormulaParser& rParser = getFormulaParser();
-            TokensFormulaContext aContext( true, false );
-            aContext.setBaseAddress( CellAddress( getSheetIndex(), 0, 0 ) );
-            rParser.importFormula( aContext, rClientData.maSourceRange );
-            CellRangeAddress aRange;
-            if( rParser.extractCellRange( aRange, aContext.getTokens(), true ) )
-            {
-                // create argument sequence for createInstanceWithArguments()
-                NamedValue aValue;
-                aValue.Name = CREATE_OUSTRING( "CellRange" );
-                aValue.Value <<= aRange;
-                Sequence< Any > aArgs( 1 );
-                aArgs[ 0 ] <<= aValue;
-
-                // create the EntrySource instance and set at the control model
-                Reference< XListEntrySource > xEntrySource( getDocumentFactory()->createInstanceWithArguments(
-                    CREATE_OUSTRING( "com.sun.star.table.CellRangeListSource"  ), aArgs ), UNO_QUERY_THROW );
-                xEntrySink->setListEntrySource( xEntrySource );
-            }
-        }
-        catch( Exception& )
-        {
-        }
+        // control sources
+        if( (rClientData.maLinkedCell.getLength() > 0) || (rClientData.maSourceRange.getLength() > 0) )
+            maControlConv.bindToSources( rxCtrlModel, rClientData.maLinkedCell, rClientData.maSourceRange, getSheetIndex() );
     }
 }
 
diff --git a/oox/source/xls/excelfilter.cxx b/oox/source/xls/excelfilter.cxx
index 1093b5cc7bfe..f598a64bf366 100644
--- a/oox/source/xls/excelfilter.cxx
+++ b/oox/source/xls/excelfilter.cxx
@@ -27,35 +27,37 @@
  ************************************************************************/
 
 #include "oox/xls/excelfilter.hxx"
+#include <com/sun/star/container/XNameContainer.hpp>
+#include "oox/dump/biffdumper.hxx"
+#include "oox/dump/xlsbdumper.hxx"
 #include "oox/helper/binaryinputstream.hxx"
 #include "oox/xls/biffdetector.hxx"
 #include "oox/xls/biffinputstream.hxx"
 #include "oox/xls/excelchartconverter.hxx"
+#include "oox/ole/vbaproject.hxx"
 #include "oox/xls/stylesbuffer.hxx"
 #include "oox/xls/themebuffer.hxx"
 #include "oox/xls/workbookfragment.hxx"
 #include "oox/dump/biffdumper.hxx"
 #include "oox/dump/xlsbdumper.hxx"
 
-using ::rtl::OUString;
-using ::com::sun::star::uno::Any;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::uno::Exception;
-using ::com::sun::star::uno::UNO_QUERY;
-using ::com::sun::star::uno::XInterface;
-using ::com::sun::star::lang::XComponent;
-using ::com::sun::star::lang::XMultiServiceFactory;
-using ::com::sun::star::xml::sax::XFastDocumentHandler;
+namespace oox {
+namespace xls {
+
+// ============================================================================
+
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::xml::sax;
+using namespace ::com::sun::star::uno;
+
 using ::oox::core::BinaryFilterBase;
 using ::oox::core::FragmentHandlerRef;
 using ::oox::core::Relation;
 using ::oox::core::Relations;
 using ::oox::core::XmlFilterBase;
 using ::oox::drawingml::table::TableStyleListPtr;
-
-namespace oox {
-namespace xls {
+using ::rtl::OUString;
 
 // ============================================================================
 
@@ -94,8 +96,8 @@ OUString SAL_CALL ExcelFilter_getImplementationName() throw()
 
 Sequence< OUString > SAL_CALL ExcelFilter_getSupportedServiceNames() throw()
 {
-    OUString aServiceName = CREATE_OUSTRING( "com.sun.star.comp.oox.ExcelFilter" );
-    Sequence< OUString > aSeq( &aServiceName, 1 );
+    Sequence< OUString > aSeq( 1 );
+    aSeq[ 0 ] = CREATE_OUSTRING( "com.sun.star.comp.oox.ExcelFilter" );
     return aSeq;
 }
 
@@ -129,7 +131,12 @@ bool ExcelFilter::importDocument() throw()
         return false;
 
     WorkbookHelperRoot aHelper( *this );
-    return aHelper.isValid() && importFragment( new OoxWorkbookFragment( aHelper, aWorkbookPath ) );
+    if( aHelper.isValid() && importFragment( new OoxWorkbookFragment( aHelper, aWorkbookPath ) ) )
+    {
+        importDocumentProperties();
+        return true;
+    }
+    return false;
 }
 
 bool ExcelFilter::exportDocument() throw()
@@ -202,8 +209,8 @@ OUString SAL_CALL ExcelBiffFilter_getImplementationName() throw()
 
 Sequence< OUString > SAL_CALL ExcelBiffFilter_getSupportedServiceNames() throw()
 {
-    OUString aServiceName = CREATE_OUSTRING( "com.sun.star.comp.oox.ExcelBiffFilter" );
-    Sequence< OUString > aSeq( &aServiceName, 1 );
+    Sequence< OUString > aSeq( 1 );
+    aSeq[ 0 ] = CREATE_OUSTRING( "com.sun.star.comp.oox.ExcelBiffFilter" );
     return aSeq;
 }
 
@@ -269,6 +276,62 @@ OUString ExcelBiffFilter::implGetImplementationName() const
 
 // ============================================================================
 
+OUString SAL_CALL ExcelVbaProjectFilter_getImplementationName() throw()
+{
+    return CREATE_OUSTRING( "com.sun.star.comp.oox.ExcelVbaProjectFilter" );
+}
+
+Sequence< OUString > SAL_CALL ExcelVbaProjectFilter_getSupportedServiceNames() throw()
+{
+    Sequence< OUString > aSeq( 1 );
+    aSeq[ 0 ] = CREATE_OUSTRING( "com.sun.star.comp.oox.ExcelVBAProjectFilter" );
+    return aSeq;
+}
+
+Reference< XInterface > SAL_CALL ExcelVbaProjectFilter_createInstance(
+        const Reference< XMultiServiceFactory >& rxGlobalFactory ) throw( Exception )
+{
+    return static_cast< ::cppu::OWeakObject* >( new ExcelVbaProjectFilter( rxGlobalFactory ) );
+}
+
+// ----------------------------------------------------------------------------
+
+ExcelVbaProjectFilter::ExcelVbaProjectFilter( const Reference< XMultiServiceFactory >& rxGlobalFactory ) :
+    ExcelBiffFilter( rxGlobalFactory )
+{
+}
+
+bool ExcelVbaProjectFilter::importDocument() throw()
+{
+    bool bRet = false;
+
+    // detect BIFF version and workbook stream name
+    OUString aWorkbookName;
+    BiffType eBiff = BiffDetector::detectStorageBiffVersion( aWorkbookName, getStorage() );
+    OSL_ENSURE( eBiff == BIFF8, "ExcelVbaProjectFilter::ExcelVbaProjectFilter - invalid file format" );
+    if( eBiff == BIFF8 )
+    {
+        Reference< XNameContainer > xOleNameOverrideSink;
+        getArgument( CREATE_OUSTRING( "OleNameOverrideInfo" ) ) >>= xOleNameOverrideSink;
+        WorkbookHelperRoot aHelper( *this, eBiff );
+        StorageRef xVbaPrjStrg = openSubStorage( CREATE_OUSTRING( "_VBA_PROJECT_CUR" ), false );
+        if( xVbaPrjStrg.get() && xVbaPrjStrg->isStorage() )
+        {
+            ole::VbaProject aVbaProject(  getGlobalFactory(), Reference< com::sun::star::frame::XModel >( aHelper.getDocument(), UNO_QUERY ), CREATE_OUSTRING( "Calc" ) );
+            aVbaProject.setOleOverridesSink( xOleNameOverrideSink );
+            aVbaProject.importVbaProject( *xVbaPrjStrg, getGraphicHelper() );
+            bRet = true;
+        }
+    }
+    return bRet;
+}
+
+OUString ExcelVbaProjectFilter::implGetImplementationName() const
+{
+    return ExcelVbaProjectFilter_getImplementationName();
+}
+// ============================================================================
+
 } // namespace xls
 } // namespace oox
 
diff --git a/oox/source/xls/stylesbuffer.cxx b/oox/source/xls/stylesbuffer.cxx
index 6c06b6a37dfe..91ed3f966f71 100644
--- a/oox/source/xls/stylesbuffer.cxx
+++ b/oox/source/xls/stylesbuffer.cxx
@@ -1161,10 +1161,11 @@ void Font::writeToPropertyMap( PropertyMap& rPropMap, FontPropertyType ePropType
     if( maUsedFlags.mbShadowUsed )
         rPropMap[ PROP_CharShadowed ] <<= maApiData.mbShadow;
     // escapement
-    if( maUsedFlags.mbEscapementUsed && (ePropType == FONT_PROPTYPE_TEXT) )
+    if( maUsedFlags.mbEscapementUsed )
     {
         rPropMap[ PROP_CharEscapement ] <<= maApiData.mnEscapement;
-        rPropMap[ PROP_CharEscapementHeight ] <<= maApiData.mnEscapeHeight;
+        if( ePropType == FONT_PROPTYPE_TEXT )
+            rPropMap[ PROP_CharEscapementHeight ] <<= maApiData.mnEscapeHeight;
     }
 }
 
diff --git a/oox/source/xls/workbookhelper.cxx b/oox/source/xls/workbookhelper.cxx
index f8a49c435244..6033601fb2d2 100644
--- a/oox/source/xls/workbookhelper.cxx
+++ b/oox/source/xls/workbookhelper.cxx
@@ -72,6 +72,7 @@ using ::rtl::OUString;
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Exception;
+using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::UNO_QUERY;
 using ::com::sun::star::uno::UNO_QUERY_THROW;
 using ::com::sun::star::uno::UNO_SET_THROW;
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx
index be0e540a11da..543a290b5857 100644
--- a/package/source/manifest/ManifestImport.cxx
+++ b/package/source/manifest/ManifestImport.cxx
@@ -135,7 +135,7 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re
     else if ( aStack.size() > 1 )
     {
         ManifestStack::reverse_iterator aIter = aStack.rbegin();
-        aIter++;
+        ++aIter;
 
         if ( aIter->m_aConvertedName.equals( sFileEntryElement ) )
         {
@@ -317,7 +317,7 @@ void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax
 ::rtl::OUString ManifestImport::ConvertName( const ::rtl::OUString& aName )
 {
     ::rtl::OUString aConvertedName;
-    for ( ManifestStack::reverse_iterator aIter = aStack.rbegin(); !aConvertedName.getLength() && aIter != aStack.rend(); aIter++ )
+    for ( ManifestStack::reverse_iterator aIter = aStack.rbegin(); !aConvertedName.getLength() && aIter != aStack.rend(); ++aIter )
     {
         if ( !aIter->m_aNamespaces.empty() )
             aConvertedName = ConvertNameWithNamespace( aName, aIter->m_aNamespaces );
diff --git a/package/source/manifest/UnoRegister.cxx b/package/source/manifest/UnoRegister.cxx
index 8a234a750d8b..51b7ea431de5 100644
--- a/package/source/manifest/UnoRegister.cxx
+++ b/package/source/manifest/UnoRegister.cxx
@@ -50,9 +50,9 @@ static sal_Bool writeInfo( void * pRegistryKey,
                            const OUString & rImplementationName,
                               Sequence< OUString > const & rServiceNames )
 {
-    OUString aKeyName( OUString::createFromAscii( "/" ) );
+    OUString aKeyName( OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )) );
     aKeyName += rImplementationName;
-    aKeyName += OUString::createFromAscii( "/UNO/SERVICES" );
+    aKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
 
     Reference< XRegistryKey > xKey;
     try
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index 7e45f6574355..54394eacce76 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -121,14 +121,14 @@ void SetEncryptionKeyProperty_Impl( const uno::Reference< beans::XPropertySet >&
     if ( !xPropertySet.is() )
         throw uno::RuntimeException();
 
-    ::rtl::OUString aString_EncryptionKey = ::rtl::OUString::createFromAscii( "EncryptionKey" );
+    ::rtl::OUString aString_EncryptionKey (RTL_CONSTASCII_USTRINGPARAM("EncryptionKey") );
     try {
         xPropertySet->setPropertyValue( aString_EncryptionKey, uno::makeAny( aKey ) );
     }
     catch ( uno::Exception& aException )
     {
         ::package::StaticAddLog( aException.Message );
-        ::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Can't set encryption" ) ) );
+        ::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Can't set encryption") ) );
         OSL_ENSURE( sal_False, "Can't write encryption related properties!\n" );
         throw io::IOException(); // TODO
     }
@@ -141,7 +141,7 @@ uno::Any GetEncryptionKeyProperty_Impl( const uno::Reference< beans::XPropertySe
     if ( !xPropertySet.is() )
         throw uno::RuntimeException();
 
-    ::rtl::OUString aString_EncryptionKey = ::rtl::OUString::createFromAscii( "EncryptionKey" );
+    ::rtl::OUString aString_EncryptionKey (RTL_CONSTASCII_USTRINGPARAM("EncryptionKey") );
     try {
         return xPropertySet->getPropertyValue( aString_EncryptionKey );
     }
@@ -180,7 +180,7 @@ sal_Bool KillFile( const ::rtl::OUString& aURL, const uno::Reference< lang::XMul
     {
         uno::Reference < ucb::XSimpleFileAccess > xAccess(
                 xFactory->createInstance (
-                        ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess" ) ) ),
                 uno::UNO_QUERY );
 
         if ( xAccess.is() )
@@ -192,7 +192,7 @@ sal_Bool KillFile( const ::rtl::OUString& aURL, const uno::Reference< lang::XMul
     catch( uno::Exception& aException )
     {
         ::package::StaticAddLog( aException.Message );
-        ::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Quiet exception" ) ) );
+        ::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Quiet exception") ) );
     }
 
     return bRet;
@@ -206,21 +206,21 @@ const sal_Int32 n_ConstBufferSize = 32000;
     ::rtl::OUString aTempURL;
 
     uno::Reference < beans::XPropertySet > xTempFile(
-            xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ),
+            xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile") ) ),
             uno::UNO_QUERY );
 
     if ( !xTempFile.is() )
         throw uno::RuntimeException(); // TODO
 
     try {
-        xTempFile->setPropertyValue( ::rtl::OUString::createFromAscii( "RemoveFile" ), uno::makeAny( sal_False ) );
-        uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString::createFromAscii( "Uri" ) );
+        xTempFile->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RemoveFile") ), uno::makeAny( sal_False ) );
+        uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Uri") ) );
         aUrl >>= aTempURL;
     }
     catch ( uno::Exception& aException )
     {
         ::package::StaticAddLog( aException.Message );
-        ::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Quiet exception" ) ) );
+        ::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Quiet exception") ) );
     }
 
     if ( !aTempURL.getLength() )
@@ -235,7 +235,7 @@ uno::Reference< io::XStream > CreateMemoryStream( const uno::Reference< lang::XM
     if ( !xFactory.is() )
         throw uno::RuntimeException();
 
-    return uno::Reference< io::XStream >( xFactory->createInstance ( ::rtl::OUString::createFromAscii( "com.sun.star.comp.MemoryStream" ) ), uno::UNO_QUERY_THROW );
+    return uno::Reference< io::XStream >( xFactory->createInstance (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.MemoryStream") ) ), uno::UNO_QUERY_THROW);
 }
 
 } // anonymous namespace
@@ -378,7 +378,7 @@ sal_Bool OWriteStream_Impl::IsEncrypted()
     uno::Reference< beans::XPropertySet > xPropSet( m_xPackageStream, uno::UNO_QUERY );
     if ( xPropSet.is() )
     {
-        uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString::createFromAscii( "WasEncrypted" ) );
+        uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WasEncrypted") ) );
         if ( !( aValue >>= bWasEncr ) )
         {
             OSL_ENSURE( sal_False, "The property WasEncrypted has wrong type!\n" );
@@ -482,7 +482,7 @@ void OWriteStream_Impl::DisposeWrappers()
         catch ( uno::RuntimeException& aRuntimeException )
         {
             AddLog( aRuntimeException.Message );
-            AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Quiet exception" ) ) );
+            AddLog( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(OSL_LOG_PREFIX "Quiet exception") ) );
         }
 
         m_pAntiImpl = NULL;
@@ -526,7 +526,7 @@ uno::Reference< lang::XMultiServiceFactory > OWriteStream_Impl::GetServiceFactor
             {
                 uno::Reference < ucb::XSimpleFileAccess > xTempAccess(
                                 GetServiceFactory()->createInstance (
-                                        ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ),
+                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess") ) ),
                                 uno::UNO_QUERY );
 
                 if ( !xTempAccess.is() )
@@ -547,7 +547,7 @@ uno::Reference< lang::XMultiServiceFactory > OWriteStream_Impl::GetServiceFactor
         catch( packages::WrongPasswordException& aWrongPasswordException )
         {
             AddLog( aWrongPasswordException.Message );
-            AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
+            AddLog( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow") ) );
 
             KillFile( aTempURL, GetServiceFactory() );
             throw;
@@ -555,7 +555,7 @@ uno::Reference< lang::XMultiServiceFactory > OWriteStream_Impl::GetServiceFactor
         catch( uno::Exception& aException )
         {
             AddLog( aException.Message );
-            AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
+            AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow") ) );
 
             KillFile( aTempURL, GetServiceFactory() );
         throw;
@@ -616,7 +616,7 @@ uno::Reference< lang::XMultiServiceFactory > OWriteStream_Impl::GetServiceFactor
                     {
                         uno::Reference < ucb::XSimpleFileAccess > xTempAccess(
                                         GetServiceFactory()->createInstance (
-                                                ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ),
+                                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess") ) ),
                                         uno::UNO_QUERY );
 
                         if ( !xTempAccess.is() )
@@ -672,7 +672,7 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetTempFileAsStream()
             // the temporary file is not used if the cache is used
             uno::Reference < ucb::XSimpleFileAccess > xTempAccess(
                             GetServiceFactory()->createInstance (
-                                    ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ),
+                                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess") ) ),
                             uno::UNO_QUERY );
 
             if ( !xTempAccess.is() )
@@ -717,7 +717,7 @@ uno::Reference< io::XInputStream > OWriteStream_Impl::GetTempFileAsInputStream()
             // the temporary file is not used if the cache is used
             uno::Reference < ucb::XSimpleFileAccess > xTempAccess(
                             GetServiceFactory()->createInstance (
-                                    ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ),
+                                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess") ) ),
                             uno::UNO_QUERY );
 
             if ( !xTempAccess.is() )
@@ -823,9 +823,9 @@ void OWriteStream_Impl::InsertStreamDirectly( const uno::Reference< io::XInputSt
             throw uno::RuntimeException();
 
         // set to be encrypted but do not use encryption key
-        xPropertySet->setPropertyValue( ::rtl::OUString::createFromAscii( "EncryptionKey" ),
+        xPropertySet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EncryptionKey") ),
                                         uno::makeAny( uno::Sequence< sal_Int8 >() ) );
-        xPropertySet->setPropertyValue( ::rtl::OUString::createFromAscii( "Encrypted" ),
+        xPropertySet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Encrypted") ),
                                         uno::makeAny( sal_True ) );
     }
 
@@ -922,9 +922,9 @@ void OWriteStream_Impl::Commit()
             throw uno::RuntimeException();
 
         // set to be encrypted but do not use encryption key
-        xPropertySet->setPropertyValue( ::rtl::OUString::createFromAscii( "EncryptionKey" ),
+        xPropertySet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EncryptionKey") ),
                                         uno::makeAny( uno::Sequence< sal_Int8 >() ) );
-        xPropertySet->setPropertyValue( ::rtl::OUString::createFromAscii( "Encrypted" ),
+        xPropertySet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Encrypted") ),
                                         uno::makeAny( sal_True ) );
     }
     else if ( m_bHasCachedPassword )
@@ -932,7 +932,7 @@ void OWriteStream_Impl::Commit()
         if ( m_nStorageType != embed::StorageFormats::PACKAGE )
             throw uno::RuntimeException();
 
-        xPropertySet->setPropertyValue( ::rtl::OUString::createFromAscii( "EncryptionKey" ),
+        xPropertySet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EncryptionKey") ),
                                         uno::makeAny( ::package::MakeKeyFromPass( m_aPass, sal_True ) ) );
     }
 
@@ -1024,7 +1024,7 @@ uno::Sequence< beans::PropertyValue > OWriteStream_Impl::InsertOwnProps(
             }
 
         aResult.realloc( ++nLen );
-        aResult[nLen - 1].Name = ::rtl::OUString::createFromAscii( "UseCommonStoragePasswordEncryption" );
+        aResult[nLen - 1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseCommonStoragePasswordEncryption") );
         aResult[nLen - 1].Value <<= bUseCommonPass;
     }
     else if ( m_nStorageType == embed::StorageFormats::OFOPXML )
@@ -1048,7 +1048,7 @@ uno::Sequence< beans::PropertyValue > OWriteStream_Impl::InsertOwnProps(
             }
 
         aResult.realloc( ++nLen );
-        aResult[nLen - 1].Name = ::rtl::OUString::createFromAscii( "RelationsInfo" );
+        aResult[nLen - 1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RelationsInfo") );
         aResult[nLen - 1].Value = aValue;
     }
 
@@ -1130,17 +1130,17 @@ uno::Sequence< beans::PropertyValue > OWriteStream_Impl::ReadPackageStreamProper
 
     if ( m_nStorageType == embed::StorageFormats::OFOPXML || m_nStorageType == embed::StorageFormats::PACKAGE )
     {
-        aResult[0].Name = ::rtl::OUString::createFromAscii("MediaType");
-        aResult[1].Name = ::rtl::OUString::createFromAscii("Compressed");
-        aResult[2].Name = ::rtl::OUString::createFromAscii("Size");
+        aResult[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType") );
+        aResult[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Compressed") );
+        aResult[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size") );
 
         if ( m_nStorageType == embed::StorageFormats::PACKAGE )
-            aResult[3].Name = ::rtl::OUString::createFromAscii("Encrypted");
+            aResult[3].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Encrypted") );
     }
     else
     {
-        aResult[0].Name = ::rtl::OUString::createFromAscii("Compressed");
-        aResult[1].Name = ::rtl::OUString::createFromAscii("Size");
+        aResult[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Compressed") );
+        aResult[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size") );
 
     }
 
@@ -1538,7 +1538,7 @@ void OWriteStream_Impl::CreateReadonlyCopyBasedOnData( const uno::Reference< io:
     uno::Reference < io::XStream > xTempFile;
     if ( !xTargetStream.is() )
         xTempFile = uno::Reference < io::XStream >(
-            m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ),
+            m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile") ) ),
             uno::UNO_QUERY );
     else
         xTempFile = xTargetStream;
@@ -1634,12 +1634,12 @@ void OWriteStream_Impl::GetCopyOfLastCommit( uno::Reference< io::XStream >& xTar
             throw uno::RuntimeException();
 
         sal_Bool bEncr = sal_False;
-        xProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Encrypted" ) ) >>= bEncr;
+        xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Encrypted") ) ) >>= bEncr;
         if ( !bEncr )
             throw packages::NoEncryptionException();
 
         uno::Sequence< sal_Int8 > aEncrKey;
-        xProps->getPropertyValue( ::rtl::OUString::createFromAscii( "EncryptionKey" ) ) >>= aEncrKey;
+        xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EncryptionKey") ) ) >>= aEncrKey;
         if ( !SequencesEqual( aNewKey, aEncrKey ) && !SequencesEqual( aOldKey, aEncrKey ) )
             throw packages::WrongPasswordException();
 
@@ -1973,16 +1973,16 @@ void OWriteStream::CopyToStreamInternally_Impl( const uno::Reference< io::XStrea
 
     // now the properties can be copied
     // the order of the properties setting is not important for StorageStream API
-    ::rtl::OUString aPropName = ::rtl::OUString::createFromAscii( "Compressed" );
+    ::rtl::OUString aPropName (RTL_CONSTASCII_USTRINGPARAM("Compressed") );
     xDestProps->setPropertyValue( aPropName, getPropertyValue( aPropName ) );
     if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE || m_pData->m_nStorageType == embed::StorageFormats::OFOPXML )
     {
-        aPropName = ::rtl::OUString::createFromAscii( "MediaType" );
+        aPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType" ) );
         xDestProps->setPropertyValue( aPropName, getPropertyValue( aPropName ) );
 
         if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE )
         {
-            aPropName = ::rtl::OUString::createFromAscii( "UseCommonStoragePasswordEncryption" );
+            aPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseCommonStoragePasswordEncryption") );
             xDestProps->setPropertyValue( aPropName, getPropertyValue( aPropName ) );
         }
     }
@@ -2635,7 +2635,7 @@ void SAL_CALL OWriteStream::dispose()
 
                 uno::Any aCaught( ::cppu::getCaughtException() );
                 throw lang::WrappedTargetRuntimeException(
-                                                ::rtl::OUString::createFromAscii( "Can not commit/revert the storage!\n" ),
+                                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can not commit/revert the storage!\n") ),
                                                 uno::Reference< uno::XInterface >(  static_cast< OWeakObject* >( this ),
                                                                                     uno::UNO_QUERY ),
                                                 aCaught );
@@ -3485,7 +3485,7 @@ void SAL_CALL OWriteStream::commit()
         m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
 
         uno::Any aCaught( ::cppu::getCaughtException() );
-        throw embed::StorageWrappedTargetException( ::rtl::OUString::createFromAscii( "Problems on commit!" ),
+        throw embed::StorageWrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Problems on commit!") ),
                                   uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >( this ) ),
                                   aCaught );
     }
@@ -3549,7 +3549,7 @@ void SAL_CALL OWriteStream::revert()
         m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
 
         uno::Any aCaught( ::cppu::getCaughtException() );
-        throw embed::StorageWrappedTargetException( ::rtl::OUString::createFromAscii( "Problems on revert!" ),
+        throw embed::StorageWrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Problems on revert!") ),
                                   uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >( this ) ),
                                   aCaught );
     }
diff --git a/package/source/xstor/owriteablestream.hxx b/package/source/xstor/owriteablestream.hxx
index d3c15f00d44c..6bc90f7f3a3e 100644
--- a/package/source/xstor/owriteablestream.hxx
+++ b/package/source/xstor/owriteablestream.hxx
@@ -187,11 +187,11 @@ public:
 
     void AddLog( const ::rtl::OUString& aMessage );
 
-    sal_Bool UsesCommonPass_Impl() { return m_bUseCommonPass; }
-    sal_Bool HasTempFile_Impl() { return ( m_aTempURL.getLength() != 0 ); }
+    sal_Bool UsesCommonPass_Impl() const { return m_bUseCommonPass; }
+    sal_Bool HasTempFile_Impl() const { return ( m_aTempURL.getLength() != 0 ); }
     sal_Bool IsTransacted();
 
-    sal_Bool HasWriteOwner_Impl() { return ( m_pAntiImpl != NULL ); }
+    sal_Bool HasWriteOwner_Impl() const { return ( m_pAntiImpl != NULL ); }
 
     void InsertIntoPackageFolder(
             const ::rtl::OUString& aName,
@@ -199,9 +199,9 @@ public:
 
     void SetToBeCommited() { m_bFlushed = sal_True; }
 
-    sal_Bool HasCachedPassword() { return m_bHasCachedPassword; }
-    ::rtl::OUString GetCachedPassword() { return m_aPass; }
-    sal_Bool IsModified() { return m_bHasDataToFlush || m_bFlushed; }
+    sal_Bool HasCachedPassword() const { return m_bHasCachedPassword; }
+    ::rtl::OUString GetCachedPassword() const { return m_aPass; }
+    sal_Bool IsModified() const { return m_bHasDataToFlush || m_bFlushed; }
 
     sal_Bool IsEncrypted();
     void SetDecrypted();
diff --git a/package/source/xstor/selfterminatefilestream.cxx b/package/source/xstor/selfterminatefilestream.cxx
index b69170a57791..bb4cde077011 100644
--- a/package/source/xstor/selfterminatefilestream.cxx
+++ b/package/source/xstor/selfterminatefilestream.cxx
@@ -48,7 +48,7 @@ OSelfTerminateFileStream::OSelfTerminateFileStream( const uno::Reference< lang::
     // otherwise an exception is thrown in constructor
 
     m_xFileAccess.set( xOwnFactory->createInstance (
-                            ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ),
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess") ) ),
                        uno::UNO_QUERY_THROW );
 
     m_xInputStream.set( m_xFileAccess->openFileRead( aURL ), uno::UNO_SET_THROW );
diff --git a/package/source/xstor/switchpersistencestream.cxx b/package/source/xstor/switchpersistencestream.cxx
index 84dc04e0ed95..f43f96dd5744 100644
--- a/package/source/xstor/switchpersistencestream.cxx
+++ b/package/source/xstor/switchpersistencestream.cxx
@@ -185,7 +185,7 @@ void SwitchablePersistenceStream::CopyAndSwitchPersistenceTo( const uno::Referen
     if ( !xTargetStream.is() )
     {
         xTargetStream = uno::Reference < io::XStream >(
-            m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ),
+            m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile") ) ),
             uno::UNO_QUERY_THROW );
 
         xTargetSeek = uno::Reference< io::XSeekable >( xTargetStream, uno::UNO_QUERY_THROW );
diff --git a/package/source/xstor/xfactory.cxx b/package/source/xstor/xfactory.cxx
index 160162e47267..c7bc364ec674 100644
--- a/package/source/xstor/xfactory.cxx
+++ b/package/source/xstor/xfactory.cxx
@@ -68,15 +68,15 @@ sal_Bool CheckPackageSignature_Impl( const uno::Reference< io::XInputStream >& x
 uno::Sequence< ::rtl::OUString > SAL_CALL OStorageFactory::impl_staticGetSupportedServiceNames()
 {
     uno::Sequence< ::rtl::OUString > aRet(2);
-    aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.embed.StorageFactory");
-    aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.StorageFactory");
+    aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.StorageFactory") );
+    aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.StorageFactory") );
     return aRet;
 }
 
 //-------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OStorageFactory::impl_staticGetImplementationName()
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.StorageFactory");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.StorageFactory") );
 }
 
 //-------------------------------------------------------------------------
@@ -93,7 +93,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstance()
 {
     // TODO: reimplement TempStream service to support XStream interface
     uno::Reference < io::XStream > xTempStream(
-                        m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ),
+                        m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile") ) ),
                         uno::UNO_QUERY );
 
     if ( !xTempStream.is() )
@@ -166,7 +166,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
 
         uno::Reference < ::com::sun::star::ucb::XSimpleFileAccess > xTempAccess(
                 m_xFactory->createInstance (
-                        ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess") ) ),
                 uno::UNO_QUERY );
 
         if ( !xTempAccess.is() )
@@ -196,7 +196,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
             if ( aURL.getLength() )
             {
                 aPropsToSet.realloc(1);
-                aPropsToSet[0].Name = ::rtl::OUString::createFromAscii( "URL" );
+                aPropsToSet[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL") );
                 aPropsToSet[0].Value <<= aURL;
             }
 
diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx
index de2a69f646f3..35e9dfe6bdb1 100644
--- a/package/source/zipapi/XUnbufferedStream.cxx
+++ b/package/source/zipapi/XUnbufferedStream.cxx
@@ -301,8 +301,8 @@ sal_Int32 SAL_CALL XUnbufferedStream::readBytes( Sequence< sal_Int8 >& aData, sa
                 if ( 0 )
                 {
                     uno::Reference< lang::XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory();
-                    uno::Reference< ucb::XSimpleFileAccess > xAccess( xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), uno::UNO_QUERY );
-                    uno::Reference< io::XOutputStream > xOut = xAccess->openFileWrite( ::rtl::OUString::createFromAscii( "file:///d:/777/Encrypted/picture" ) );
+                    uno::Reference< ucb::XSimpleFileAccess > xAccess( xFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess") ) ), uno::UNO_QUERY );
+                    uno::Reference< io::XOutputStream > xOut = xAccess->openFileWrite(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "file:///d:/777/Encrypted/picture") ) );
                     xOut->writeBytes( aData );
                     xOut->closeOutput();
                 }
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index 969fa64d1720..22e88553e0e2 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -291,7 +291,7 @@ Reference< XInputStream > ZipFile::StaticGetDataFromRawStream(  const Reference<
         throw ( packages::WrongPasswordException, ZipIOException, RuntimeException )
 {
     if ( !rData.is() )
-        throw ZipIOException( OUString::createFromAscii( "Encrypted stream without encryption data!\n" ),
+        throw ZipIOException( OUString(RTL_CONSTASCII_USTRINGPARAM( "Encrypted stream without encryption data!\n" )),
                             Reference< XInterface >() );
 
     if ( !rData->aKey.getLength() )
@@ -299,7 +299,7 @@ Reference< XInputStream > ZipFile::StaticGetDataFromRawStream(  const Reference<
 
     Reference< XSeekable > xSeek( xStream, UNO_QUERY );
     if ( !xSeek.is() )
-        throw ZipIOException( OUString::createFromAscii( "The stream must be seekable!\n" ),
+        throw ZipIOException( OUString(RTL_CONSTASCII_USTRINGPARAM( "The stream must be seekable!\n" )),
                             Reference< XInterface >() );
 
 
@@ -559,7 +559,7 @@ Reference< XInputStream > SAL_CALL ZipFile::getDataStream( ZipEntry& rEntry,
         // in case no digest is provided there is no way
         // to detect password correctness
         if ( !rData.is() )
-            throw ZipException( OUString::createFromAscii( "Encrypted stream without encryption data!\n" ),
+            throw ZipException( OUString(RTL_CONSTASCII_USTRINGPARAM( "Encrypted stream without encryption data!\n" )),
                                 Reference< XInterface >() );
 
         // if we have a digest, then this file is an encrypted one and we should
@@ -638,29 +638,38 @@ sal_Bool ZipFile::readLOC( ZipEntry &rEntry )
     aGrabber >> nExtraLen;
     rEntry.nOffset = static_cast < sal_Int32 > (aGrabber.getPosition()) + nPathLen + nExtraLen;
 
-    // read always in UTF8, some tools seem not to set UTF8 bit
-    uno::Sequence < sal_Int8 > aNameBuffer( nPathLen );
-    sal_Int32 nRead = aGrabber.readBytes( aNameBuffer, nPathLen );
-    if ( nRead < aNameBuffer.getLength() )
-            aNameBuffer.realloc( nRead );
+    sal_Bool bBroken = sal_False;
 
-    ::rtl::OUString sLOCPath = rtl::OUString::intern( (sal_Char *) aNameBuffer.getArray(),
-                                                        aNameBuffer.getLength(),
-                                                        RTL_TEXTENCODING_UTF8 );
+    try
+    {
+        // read always in UTF8, some tools seem not to set UTF8 bit
+        uno::Sequence < sal_Int8 > aNameBuffer( nPathLen );
+        sal_Int32 nRead = aGrabber.readBytes( aNameBuffer, nPathLen );
+        if ( nRead < aNameBuffer.getLength() )
+                aNameBuffer.realloc( nRead );
+
+        ::rtl::OUString sLOCPath = rtl::OUString::intern( (sal_Char *) aNameBuffer.getArray(),
+                                                            aNameBuffer.getLength(),
+                                                            RTL_TEXTENCODING_UTF8 );
+
+        if ( rEntry.nPathLen == -1 ) // the file was created
+        {
+            rEntry.nPathLen = nPathLen;
+            rEntry.sPath = sLOCPath;
+        }
 
-    if ( rEntry.nPathLen == -1 ) // the file was created
+        // the method can be reset for internal use so it is not checked
+        bBroken = rEntry.nVersion != nVersion
+                        || rEntry.nFlag != nFlag
+                        || rEntry.nTime != nTime
+                        || rEntry.nPathLen != nPathLen
+                        || !rEntry.sPath.equals( sLOCPath );
+    }
+    catch(::std::bad_alloc &)
     {
-        rEntry.nPathLen = nPathLen;
-        rEntry.sPath = sLOCPath;
+        bBroken = sal_True;
     }
 
-    // the method can be reset for internal use so it is not checked
-    sal_Bool bBroken = rEntry.nVersion != nVersion
-                    || rEntry.nFlag != nFlag
-                    || rEntry.nTime != nTime
-                    || rEntry.nPathLen != nPathLen
-                    || !rEntry.sPath.equals( sLOCPath );
-
     if ( bBroken && !bRecoveryMode )
         throw ZipIOException( OUString( RTL_CONSTASCII_USTRINGPARAM( "The stream seems to be broken!" ) ),
                             Reference< XInterface >() );
@@ -921,7 +930,7 @@ sal_Int32 ZipFile::recover()
                     aMemGrabber >> nCompressedSize;
                     aMemGrabber >> nSize;
 
-                    for( EntryHash::iterator aIter = aEntries.begin(); aIter != aEntries.end(); aIter++ )
+                    for( EntryHash::iterator aIter = aEntries.begin(); aIter != aEntries.end(); ++aIter )
                     {
                         ZipEntry aTmp = (*aIter).second;
 
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index fbfb575d9dfb..b8072bf12bba 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -596,18 +596,18 @@ void SAL_CALL ZipPackage::initialize( const Sequence< Any >& aArguments )
                         do
                         {
                             ::rtl::OUString aCommand = aParam.getToken( 0, '&', nIndex );
-                            if ( aCommand.equals( OUString::createFromAscii( "repairpackage" ) ) )
+                            if ( aCommand.equals( OUString(RTL_CONSTASCII_USTRINGPARAM( "repairpackage" )) ) )
                             {
                                 m_bForceRecovery = sal_True;
                                 break;
                             }
-                            else if ( aCommand.equals( OUString::createFromAscii( "purezip" ) ) )
+                            else if ( aCommand.equals( OUString(RTL_CONSTASCII_USTRINGPARAM( "purezip" )) ) )
                             {
                                 m_nFormat = embed::StorageFormats::ZIP;
                                 m_pRootFolder->setPackageFormat_Impl( m_nFormat );
                                 break;
                             }
-                            else if ( aCommand.equals( OUString::createFromAscii( "ofopxml" ) ) )
+                            else if ( aCommand.equals( OUString(RTL_CONSTASCII_USTRINGPARAM( "ofopxml" )) ) )
                             {
                                 m_nFormat = embed::StorageFormats::OFOPXML;
                                 m_pRootFolder->setPackageFormat_Impl( m_nFormat );
@@ -620,7 +620,7 @@ void SAL_CALL ZipPackage::initialize( const Sequence< Any >& aArguments )
                         m_aURL = aParamUrl;
 
                     Content aContent ( m_aURL, uno::Reference < XCommandEnvironment >() );
-                    Any aAny = aContent.getPropertyValue( OUString::createFromAscii( "Size" ) );
+                    Any aAny = aContent.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "Size" )) );
                     sal_uInt64 aSize = 0;
                     // kind of optimisation: treat empty files as nonexistent files
                     // and write to such files directly. Note that "Size" property is optional.
@@ -1017,7 +1017,7 @@ void ZipPackage::WriteManifest( ZipOutputStream& aZipOut, const vector< Sequence
         Sequence < PropertyValue > * pSequence = aManifestSequence.getArray();
         for (vector < Sequence < PropertyValue > >::const_iterator aIter = aManList.begin(), aEnd = aManList.end();
              aIter != aEnd;
-             aIter++, pSequence++)
+             ++aIter, ++pSequence)
             *pSequence= (*aIter);
         xWriter->writeManifestSequence ( xManOutStream,  aManifestSequence );
 
@@ -1063,7 +1063,7 @@ void ZipPackage::WriteContentTypes( ZipOutputStream& aZipOut, const vector< Sequ
     for ( vector< uno::Sequence< beans::PropertyValue > >::const_iterator aIter = aManList.begin(),
             aEnd = aManList.end();
          aIter != aEnd;
-         aIter++)
+         ++aIter)
     {
         ::rtl::OUString aPath;
         ::rtl::OUString aType;
@@ -1313,7 +1313,7 @@ uno::Reference< XActiveDataStreamer > ZipPackage::openOriginalForOutput()
             {
                 Exception aDetect;
                 sal_Int64 aSize = 0;
-                Any aAny = aOriginalContent.setPropertyValue( OUString::createFromAscii( "Size" ), makeAny( aSize ) );
+                Any aAny = aOriginalContent.setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "Size" )), makeAny( aSize ) );
                 if( !( aAny >>= aDetect ) )
                     bTruncSuccess = sal_True;
             }
@@ -1336,7 +1336,7 @@ uno::Reference< XActiveDataStreamer > ZipPackage::openOriginalForOutput()
                aArg.Sink       = xSink;
                aArg.Properties = Sequence< Property >( 0 ); // unused
 
-            aOriginalContent.executeCommand( OUString::createFromAscii( "open" ), makeAny( aArg ) );
+            aOriginalContent.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM( "open" )), makeAny( aArg ) );
         }
         catch( Exception& )
         {
@@ -1435,7 +1435,7 @@ void SAL_CALL ZipPackage::commitChanges()
             {
                 // write directly in case of local file
                 uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess > xSimpleAccess(
-                    m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ),
+                    m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess") ) ),
                     uno::UNO_QUERY );
                 OSL_ENSURE( xSimpleAccess.is(), "Can't instatiate SimpleFileAccess service!\n" );
                 uno::Reference< io::XTruncate > xOrigTruncate;
@@ -1531,9 +1531,9 @@ void ZipPackage::DisconnectFromTargetAndThrowException_Impl( const uno::Referenc
     ::rtl::OUString aTempURL;
     try {
         uno::Reference< beans::XPropertySet > xTempFile( xTempStream, uno::UNO_QUERY_THROW );
-        uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString::createFromAscii( "Uri" ) );
+        uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Uri") ) );
         aUrl >>= aTempURL;
-        xTempFile->setPropertyValue( ::rtl::OUString::createFromAscii( "RemoveFile" ),
+        xTempFile->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RemoveFile") ),
                                      uno::makeAny( sal_False ) );
     }
     catch ( uno::Exception& )
diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx
index 3690b636df68..cb5996aa3c8e 100644
--- a/package/source/zippackage/zipfileaccess.cxx
+++ b/package/source/zippackage/zipfileaccess.cxx
@@ -277,7 +277,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OZipFileAccess::getElementNames()
     uno::Sequence< ::rtl::OUString > aNames( m_pZipFile->GetEntryHash().size() );
     sal_Int32 nLen = 0;
 
-    for ( EntryHash::iterator aIter = m_pZipFile->GetEntryHash().begin(); aIter != m_pZipFile->GetEntryHash().end(); aIter++ )
+    for ( EntryHash::iterator aIter = m_pZipFile->GetEntryHash().begin(); aIter != m_pZipFile->GetEntryHash().end(); ++aIter )
     {
         if ( aNames.getLength() < ++nLen )
         {
@@ -362,7 +362,7 @@ uno::Reference< io::XInputStream > SAL_CALL OZipFileAccess::getStreamByPattern(
     // Code to compare strings by patterns
     uno::Sequence< ::rtl::OUString > aPattern = GetPatternsFromString_Impl( aPatternString );
 
-    for ( EntryHash::iterator aIter = m_pZipFile->GetEntryHash().begin(); aIter != m_pZipFile->GetEntryHash().end(); aIter++ )
+    for ( EntryHash::iterator aIter = m_pZipFile->GetEntryHash().begin(); aIter != m_pZipFile->GetEntryHash().end(); ++aIter )
     {
         if ( StringGoodForPattern_Impl( (*aIter).second.sPath, aPattern ) )
         {
@@ -444,15 +444,15 @@ void SAL_CALL OZipFileAccess::removeEventListener( const uno::Reference< lang::X
 uno::Sequence< ::rtl::OUString > SAL_CALL OZipFileAccess::impl_staticGetSupportedServiceNames()
 {
     uno::Sequence< ::rtl::OUString > aRet(2);
-    aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.packages.zip.ZipFileAccess");
-    aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.comp.packages.zip.ZipFileAccess");
+    aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.packages.zip.ZipFileAccess") );
+    aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.packages.zip.ZipFileAccess") );
     return aRet;
 }
 
 //-------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OZipFileAccess::impl_staticGetImplementationName()
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.package.zip.ZipFileAccess");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.package.zip.ZipFileAccess") );
 }
 
 //-------------------------------------------------------------------------
diff --git a/packimages/pack/makefile.mk b/packimages/pack/makefile.mk
index 59611774b750..addce4f4792c 100644
--- a/packimages/pack/makefile.mk
+++ b/packimages/pack/makefile.mk
@@ -38,14 +38,13 @@ IMAGES := $(COMMONBIN)$/images.zip
 SORTED_LIST=$(RES)$/img$/sorted.lst
 # Custom sets, at 24x24 & 16x16 fall-back to Tango preferentially
 # (Tango fallbacks to Industrial for the missing icons)
-CUSTOM_IMAGE_SETS=hicontrast crystal oxygen tango classic
+CUSTOM_IMAGE_SETS=hicontrast crystal oxygen tango
 CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i)
 CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/ooo_custom_images$/tango
 CUSTOM_PREFERRED_FALLBACK_2*=-c $(SOLARSRC)$/ooo_custom_images$/industrial
 
 CRYSTAL_TARBALL=$(SOLARSRC)$/external_images$/ooo_crystal_images-1.tar.gz
 OXYGEN_TARBALL=$(SOLARSRC)$/external_images$/ooo_oxygen_images-2009-06-17.tar.gz
-CLASSIC_TARBALL=$(SOLARSRC)$/ooo_custom_images$/classic/classic_images.tar.gz
 
 ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip
 
@@ -71,10 +70,6 @@ images_% : $(RES)$/img$/commandimagelist.ilst
 $(COMMONBIN)$/images_brand.zip:
     @$(TOUCH) $@
 
-# generate the HiContrast icon set
-$(MISC)$/hicontrast.flag .PHONY :
-    $(PERL) $(SOLARENV)$/bin$/hicontrast-to-theme.pl $(SOLARSRC)$/default_images $(MISC)$/hicontrast && $(TOUCH) $@
-
 # unpack the Crystal icon set
 $(MISC)$/crystal.flag : $(CRYSTAL_TARBALL)
     cd $(MISC) && gzip -d -c $(CRYSTAL_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
@@ -91,20 +86,7 @@ $(MISC)$/oxygen.flag : $(OXYGEN_TARBALL)
 .ENDIF
     @$(TYPE) $@ || echo "ERROR: unpacking $(CRYSTAL_TARBALL) failed"
 
-# unpack the classic icon set
-$(MISC)$/classic.flag : $(CLASSIC_TARBALL)
-    cd $(MISC) && gzip -d -c $(CLASSIC_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
-.IF "$(GUI)"=="UNX"
-    chmod -R g+w $(MISC)$/classic
-.ENDIF
-    @$(TYPE) $@ || echo "ERROR: unpacking $(CLASSIC_TARBALL) failed"
-
 # dependencies
-images_hicontrast : $(MISC)$/hicontrast.flag $(RES)$/img$/commandimagelist.ilst
-
 images_crystal : $(MISC)$/crystal.flag $(RES)$/img$/commandimagelist.ilst
 
 images_oxygen : $(MISC)$/oxygen.flag $(RES)$/img$/commandimagelist.ilst
-
-images_classic : $(MISC)$/classic.flag $(RES)$/img$/commandimagelist.ilst
-
diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index 453a7668b772..a2d845704e26 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -90,11 +90,11 @@ void APChooseDevicePage::fill( PrinterInfo& rInfo )
 {
     if( m_aPDFBtn.IsChecked() )
     {
-        rInfo.m_aFeatures = OUString::createFromAscii( "pdf=" );
+        rInfo.m_aFeatures = OUString(RTL_CONSTASCII_USTRINGPARAM("pdf="));
     }
     else if( m_aFaxBtn.IsChecked() )
     {
-        rInfo.m_aFeatures = OUString::createFromAscii( "fax" );
+        rInfo.m_aFeatures = OUString(RTL_CONSTASCII_USTRINGPARAM("fax"));
     }
     else
         rInfo.m_aFeatures = OUString();
@@ -694,7 +694,7 @@ void APFaxDriverPage::fill( PrinterInfo& rInfo )
 {
     if( isDefault() )
     {
-        rInfo.m_aDriverName = OUString::createFromAscii( "SGENPRT" );
+        rInfo.m_aDriverName = OUString(RTL_CONSTASCII_USTRINGPARAM("SGENPRT"));
     }
 }
 
@@ -727,9 +727,9 @@ bool APPdfDriverPage::check()
 void APPdfDriverPage::fill( PrinterInfo& rInfo )
 {
     if( isDefault() )
-        rInfo.m_aDriverName = OUString::createFromAscii( "SGENPRT" );
+        rInfo.m_aDriverName = OUString(RTL_CONSTASCII_USTRINGPARAM("SGENPRT"));
     else if( isDist() )
-        rInfo.m_aDriverName = OUString::createFromAscii( "ADISTILL" );
+        rInfo.m_aDriverName = OUString(RTL_CONSTASCII_USTRINGPARAM("ADISTILL"));
 }
 
 //--------------------------------------------------------------------
@@ -805,10 +805,7 @@ AddPrinterDialog::~AddPrinterDialog()
 
 void AddPrinterDialog::updateSettings()
 {
-    if( ! GetSettings().GetStyleSettings().GetHighContrastMode() )
-        m_aTitleImage.SetImage( Image( BitmapEx( PaResId( RID_BMP_PRINTER ) ) ) );
-    else
-        m_aTitleImage.SetImage( Image( BitmapEx( PaResId( RID_BMP_PRINTER_HC ) ) ) );
+    m_aTitleImage.SetImage( Image( BitmapEx( PaResId( RID_BMP_PRINTER ) ) ) );
 }
 
 void AddPrinterDialog::DataChanged( const DataChangedEvent& rEv )
@@ -1018,13 +1015,13 @@ void AddPrinterDialog::addPrinter()
             }
             else if( m_pChooseDevicePage->isFax() )
             {
-                aInfo.m_aFeatures = OUString::createFromAscii( "fax=" );
+                aInfo.m_aFeatures = OUString(RTL_CONSTASCII_USTRINGPARAM("fax="));
                 if( m_pFaxNamePage->isFaxSwallow() )
-                    aInfo.m_aFeatures += OUString::createFromAscii( "swallow" );
+                    aInfo.m_aFeatures += OUString(RTL_CONSTASCII_USTRINGPARAM("swallow"));
             }
             else if( m_pChooseDevicePage->isPDF() )
             {
-                OUString aPdf( OUString::createFromAscii( "pdf=" ) );
+                OUString aPdf( RTL_CONSTASCII_USTRINGPARAM("pdf=") );
                 aPdf += m_pPdfCommandPage->getPdfDir();
                 aInfo.m_aFeatures = aPdf;
             }
diff --git a/padmin/source/helper.cxx b/padmin/source/helper.cxx
index 3d5d18c596be..fb5ce09ad355 100644
--- a/padmin/source/helper.cxx
+++ b/padmin/source/helper.cxx
@@ -70,11 +70,11 @@ ResId padmin::PaResId( sal_uInt32 nId )
         utl::OConfigurationNode aNode =
             utl::OConfigurationTreeRoot::tryCreateWithServiceFactory(
                     vcl::unohelper::GetMultiServiceFactory(),
-                    OUString::createFromAscii( "org.openoffice.Setup/L10N" ) );
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/L10N")) );
         if ( aNode.isValid() )
         {
             rtl::OUString aLoc;
-            Any aValue = aNode.getNodeValue( OUString::createFromAscii( "ooLocale" ) );
+            Any aValue = aNode.getNodeValue( OUString(RTL_CONSTASCII_USTRINGPARAM("ooLocale")) );
             if( aValue >>= aLoc )
             {
 //                LanguageType nTmpLang = MsLangId::convertIsoStringToLanguage( aLoc );
diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx
index 4eb51b4b0b45..85a1d52c5875 100644
--- a/padmin/source/padialog.cxx
+++ b/padmin/source/padialog.cxx
@@ -109,18 +109,9 @@ PADialog::PADialog( Window* pParent, BOOL /*bAdmin*/ ) :
 
 void PADialog::updateSettings()
 {
-    if( ! GetSettings().GetStyleSettings().GetHighContrastMode() )
-    {
-        m_aPrinterImg = Image( BitmapEx( PaResId( RID_BMP_SMALL_PRINTER ) ) );
-        m_aFaxImg = Image( BitmapEx( PaResId( RID_BMP_SMALL_FAX ) ) );
-        m_aPdfImg = Image( BitmapEx( PaResId( RID_BMP_SMALL_PDF ) ) );
-    }
-    else
-    {
-        m_aPrinterImg = Image( BitmapEx( PaResId( RID_BMP_SMALL_PRINTER_HC ) ) );
-        m_aFaxImg = Image( BitmapEx( PaResId( RID_BMP_SMALL_FAX_HC ) ) );
-        m_aPdfImg = Image( BitmapEx( PaResId( RID_BMP_SMALL_PDF_HC ) ) );
-    }
+    m_aPrinterImg = Image( BitmapEx( PaResId( RID_BMP_SMALL_PRINTER ) ) );
+    m_aFaxImg     = Image( BitmapEx( PaResId( RID_BMP_SMALL_FAX     ) ) );
+    m_aPdfImg     = Image( BitmapEx( PaResId( RID_BMP_SMALL_PDF     ) ) );
 }
 
 void PADialog::Init()
diff --git a/padmin/source/padialog.hrc b/padmin/source/padialog.hrc
index 2f238592231a..69e12428ddab 100644
--- a/padmin/source/padialog.hrc
+++ b/padmin/source/padialog.hrc
@@ -190,13 +190,9 @@
 #define RID_TXT_FONT_REGULAR                     1095
 
 #define RID_BMP_SMALL_PRINTER                    1096
-#define RID_BMP_SMALL_PRINTER_HC                 1097
 #define RID_BMP_SMALL_FAX                        1098
-#define RID_BMP_SMALL_FAX_HC                     1099
 #define RID_BMP_SMALL_PDF                        1100
-#define RID_BMP_SMALL_PDF_HC                     1101
 #define RID_BMP_PRINTER                          1102
-#define RID_BMP_PRINTER_HC                       1103
 
 #define RID_AFMERROR_OK                         1300
 #define RID_AFMERROR_NO_FONT_NAME               1301
diff --git a/padmin/source/padialog.src b/padmin/source/padialog.src
index 8834bba3226c..620411d72ddf 100644
--- a/padmin/source/padialog.src
+++ b/padmin/source/padialog.src
@@ -437,10 +437,12 @@ ModalDialog RID_FONTNAMEDIALOG
     };
     Text [ en-US ] = "Fonts";
 };
+
 String RID_BXT_TESTPAGE
 {
     Text [ en-US ] = "Test page";
 };
+
 String RID_BXT_ENVIRONMENT
 {
     Text [ en-US ] = "Wrong environment";
@@ -476,59 +478,46 @@ Bitmap RID_BMP_PRINTER
     File = "printer_large.png";
 };
 
-Bitmap RID_BMP_SMALL_PRINTER_HC
-{
-    File = "printer_16_h.png";
-};
-
-Bitmap RID_BMP_SMALL_FAX_HC
-{
-    File = "fax_16_h.png";
-};
-
-Bitmap RID_BMP_SMALL_PDF_HC
-{
-    File = "printpdf_16_h.png";
-};
-
-Bitmap RID_BMP_PRINTER_HC
-{
-    File = "printer_40x48_h.png";
-};
-
-
 String RID_AFMERROR_OK
 {
     Text [ en-US ] = "No error";
 };
+
 String RID_AFMERROR_NO_FONT_NAME
 {
     Text [ en-US ] = "The metric does not contain a 'FontName' entry.";
 };
+
 String RID_AFMERROR_NO_FULL_NAME
 {
     Text [ en-US ] = "The metric does not contain a 'FullName' entry.";
 };
+
 String RID_AFMERROR_NO_FAMILY_NAME
 {
     Text [ en-US ] = "The metric does not contain a 'FamilyName' entry.";
 };
+
 String RID_AFMERROR_MOVETO_FAILED
 {
     Text [ en-US ] = "The converted metric could not be written.";
 };
+
 String RID_AFMERROR_STREAM_READ_FAILED
 {
     Text [ en-US ] = "The metric could not be read.";
 };
+
 String RID_AFMERROR_STREAM_WRITE_FAILED
 {
     Text [ en-US ] = "A temporary file could not be created.";
 };
+
 STRING RID_AFMERROR_NOT_A_METRIC
 {
     Text [ en-US ] = "The file does not contain a metric.";
 };
+
 String RID_AFMERROR_BOX_TXT
 {
     Text [ en-US ] = "The metric\n\n%s\n\ncould not be converted for the following reason:\n\n";
diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx
index 16968a843a83..7bf9afd2d718 100644
--- a/padmin/source/pamain.cxx
+++ b/padmin/source/pamain.cxx
@@ -129,8 +129,8 @@ void MyApp::Main()
      *  Create UCB.
      */
     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 ));
 #if OSL_DEBUG_LEVEL > 1
     sal_Bool bSuccess =
 #endif
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index c7601293a273..cfef0b3e0746 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po      postprocess     ::      accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver NULL
+po      postprocess     ::      accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries pyuno readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL
diff --git a/python/Python-2.6.1-urllib.patch b/python/Python-2.6.1-urllib.patch
new file mode 100644
index 000000000000..6e20390860a4
--- /dev/null
+++ b/python/Python-2.6.1-urllib.patch
@@ -0,0 +1,93 @@
+--- misc/Python-2.6.1/Lib/urllib.py	2008-09-21 23:27:51.000000000 +0200
++++ misc/build/Python-2.6.1/Lib/urllib.py	2010-11-23 15:41:08.000000000 +0100
+@@ -176,6 +176,9 @@ class URLopener:
+     def open(self, fullurl, data=None):
+         """Use URLopener().open(file) instead of open(file, 'r')."""
+         fullurl = unwrap(toBytes(fullurl))
++         # percent encode url. fixing lame server errors like space within url
++        # parts
++        fullurl = quote(fullurl, safe="%/:=&?~#+!$,;'@()*[]|")       
+         if self.tempcache and fullurl in self.tempcache:
+             filename, headers = self.tempcache[fullurl]
+             fp = open(filename, 'rb')
+@@ -233,41 +236,45 @@ class URLopener:
+             except IOError, msg:
+                 pass
+         fp = self.open(url, data)
+-        headers = fp.info()
+-        if filename:
+-            tfp = open(filename, 'wb')
+-        else:
+-            import tempfile
+-            garbage, path = splittype(url)
+-            garbage, path = splithost(path or "")
+-            path, garbage = splitquery(path or "")
+-            path, garbage = splitattr(path or "")
+-            suffix = os.path.splitext(path)[1]
+-            (fd, filename) = tempfile.mkstemp(suffix)
+-            self.__tempfiles.append(filename)
+-            tfp = os.fdopen(fd, 'wb')
+-        result = filename, headers
+-        if self.tempcache is not None:
+-            self.tempcache[url] = result
+-        bs = 1024*8
+-        size = -1
+-        read = 0
+-        blocknum = 0
+-        if reporthook:
+-            if "content-length" in headers:
+-                size = int(headers["Content-Length"])
+-            reporthook(blocknum, bs, size)
+-        while 1:
+-            block = fp.read(bs)
+-            if block == "":
+-                break
+-            read += len(block)
+-            tfp.write(block)
+-            blocknum += 1
+-            if reporthook:
+-                reporthook(blocknum, bs, size)
+-        fp.close()
+-        tfp.close()
++        try:
++            headers = fp.info()
++            if filename:
++                tfp = open(filename, 'wb')
++            else:
++                import tempfile
++                garbage, path = splittype(url)
++                garbage, path = splithost(path or "")
++                path, garbage = splitquery(path or "")
++                path, garbage = splitattr(path or "")
++                suffix = os.path.splitext(path)[1]
++                (fd, filename) = tempfile.mkstemp(suffix)
++                self.__tempfiles.append(filename)
++                tfp = os.fdopen(fd, 'wb')
++            try:
++                result = filename, headers
++                if self.tempcache is not None:
++                    self.tempcache[url] = result
++                bs = 1024*8
++                size = -1
++                read = 0
++                blocknum = 0
++                if reporthook:
++                    if "content-length" in headers:
++                        size = int(headers["Content-Length"])
++                    reporthook(blocknum, bs, size)
++                while 1:
++                    block = fp.read(bs)
++                    if block == "":
++                        break
++                    read += len(block)
++                    tfp.write(block)
++                    blocknum += 1
++                    if reporthook:
++                        reporthook(blocknum, bs, size)
++            finally:
++                tfp.close()
++        finally:
++            fp.close()
+         del fp
+         del tfp
+ 
diff --git a/python/makefile.mk b/python/makefile.mk
index 6f4b7ee5623c..d090cdc3932a 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -50,7 +50,8 @@ TARFILE_MD5=e81c2f0953aa60f8062c05a4673f2be0
 PATCH_FILES=\
     Python-$(PYVERSION).patch \
     Python-ssl.patch \
-    Python-aix.patch
+    Python-aix.patch \
+    Python-2.6.1-urllib.patch
 
 CONFIGURE_DIR=
 
diff --git a/python/prj/build.lst b/python/prj/build.lst
index f5ea98adcd4e..d79a8f7cf00d 100644
--- a/python/prj/build.lst
+++ b/python/prj/build.lst
@@ -1,3 +1,3 @@
-py	python	:	SO:so_prereq solenv OPENSSL:openssl NULL
+py	python	:	solenv OPENSSL:openssl NULL
 py	python			nmake	-	w,vc7	py_mkout NULL
 py	python			nmake	-	u	py_mkout NULL
diff --git a/readlicense_oo/docs/readme/readme.xrm b/readlicense_oo/docs/readme/readme.xrm
index 78716869e822..f11445015ed9 100755
--- a/readlicense_oo/docs/readme/readme.xrm
+++ b/readlicense_oo/docs/readme/readme.xrm
@@ -18,15 +18,15 @@
 	<body>
 		<div id="Intro">
 			<h1 id="Welcome" xml:lang="en-US">${PRODUCTNAME} ${PRODUCTVERSION} ReadMe</h1>
-			<p id="LatestUpdates" xml:lang="en-US">For latest updates to this readme file, see <a href="http://www.openoffice.org/welcome/readme.html">http://www.openoffice.org/welcome/readme.html</a></p>
+			<p id="LatestUpdates" xml:lang="en-US">For latest updates to this readme file, see <a href="http://www.libreoffice.org/welcome/readme/">http://www.libreoffice.org/welcome/readme/</a></p>
 			<p id="A6" xml:lang="en-US">This file contains important information about this program. Please read this information very carefully before starting work.</p>
-			<p id="A7" xml:lang="en-US">The OpenOffice.org Community, responsible for the development of this product, would like to invite you to participate as a community member. As a new user, you can check out the ${PRODUCTNAME} site with helpful user information at <a href="http://www.openoffice.org/about_us/introduction.html">http://www.openoffice.org/about_us/introduction.html</a></p>
-			<p id="A9" xml:lang="en-US">Also read the sections below about getting involved in the OpenOffice.org project.</p>
+			<p id="A7" xml:lang="en-US">The LibreOffice Community, responsible for the development of this product, would like to invite you to participate as a community member. As a new user, you can check out the ${PRODUCTNAME} site with helpful user information at <a href="http://www.libreoffice.org/welcome/introduction/">http://www.libreoffice.org/welcome/introduction/</a></p>
+			<p id="A9" xml:lang="en-US">Also read the sections below about getting involved in the LibreOffice project.</p>
 			<h3 id="A10" xml:lang="en-US">Is ${PRODUCTNAME} really free for any user? </h3>
-			<p id="A11" xml:lang="en-US">${PRODUCTNAME} is free for use by everybody. You may take this copy of ${PRODUCTNAME} and install it on as many computers as you like, and use it for any purpose you like (including commercial, government, public administration and educational use). For further details see the license text delivered together with ${PRODUCTNAME} or <a href="http://www.openoffice.org/license.html">http://www.openoffice.org/license.html</a></p>
+			<p id="A11" xml:lang="en-US">${PRODUCTNAME} is free for use by everybody. You may take this copy of ${PRODUCTNAME} and install it on as many computers as you like, and use it for any purpose you like (including commercial, government, public administration and educational use). For further details see the license text delivered together with ${PRODUCTNAME} or <a href="http://www.libreoffice.org/license/">http://www.libreoffice.org/license/</a></p>
 			<h3 id="A12" xml:lang="en-US">Why is ${PRODUCTNAME} free for any user?</h3>
 			<p id="A13" xml:lang="en-US">You can use this copy of ${PRODUCTNAME} today free of charge because individual contributors and corporate sponsors have designed, developed, tested, translated, documented, supported, marketed, and helped in many other ways to make ${PRODUCTNAME} what it is today - the world's leading open-source office software.</p>
-			<p id="A13b" xml:lang="en-US">If you appreciate their efforts, and would like to ensure OpenOffice.org continues into the future, please consider contributing to the project - see <a href="http://contributing.openoffice.org">http://contributing.openoffice.org</a> for details. Everyone has a contribution to make.</p>
+			<p id="A13b" xml:lang="en-US">If you appreciate their efforts, and would like to ensure LibreOffice continues into the future, please consider contributing to the project - see <a href="http://www.libreoffice.org/contribution/">http://www.libreoffice.org/contribution/</a> for details. Everyone has a contribution to make.</p>
 		</div>
 
 		<div id="Installation">
@@ -39,7 +39,7 @@
 					</li>
 
 					<li>
-						<p id="macxicpu" xml:lang="en-US">Intel processor</p>
+						<p id="macxicpu" xml:lang="en-US">Intel or PowerPC processor</p>
 					</li>
 
 					<li>
@@ -47,7 +47,7 @@
 					</li>
 
 					<li>
-						<p id="macxHardDiksSpace" xml:lang="en-US">Up to 1.5 GB available hard disk space</p>
+						<p id="macxHardDiksSpace" xml:lang="en-US">Up to 800 MB available hard disk space</p>
 					</li>
 
 					<li>
@@ -189,18 +189,8 @@
 			<p id="Precautions" xml:lang="en-US">Please make sure you have enough free memory in the temporary directory on your system and that read, write and run access rights have been granted. Close all other programs before starting the installation.</p>
 		</div>
 
-		<div id="BerkeleyDB">
-			<h2 id="BDB11" xml:lang="en-US">Extension Database Incompatibility</h2>
-			<p id="BDB2a" xml:lang="en-US">The Berkeley database engine has been upgraded in this version of ${PRODUCTNAME}. The database engine upgrade introduces an incompatibility with user data for installed extensions for ${PRODUCTNAME} versions prior to 3.2 that may require your action if you downgrade your version of ${PRODUCTNAME}.</p>
-			<p id="BDB3a" xml:lang="en-US">This version of ${PRODUCTNAME} will convert your extension database to the new Berkeley database format when extensions are installed or removed. After this conversion, the database can no longer be read by earlier versions of ${PRODUCTNAME}. Downgrading to an earlier version may result in a dysfunctional installation.</p>
-			<p id="BDB4a" xml:lang="en-US">If you downgrade to an earlier version of ${PRODUCTNAME}, you must remove the user data directory <tt>{user data}/uno_packages</tt>, for example <tt>~/.openoffice.org/3/user/uno_packages</tt>, and reinstall all extensions.</p>
-		</div>
-
 		<div class="LINUX WIN" id="StartupProblems">
 			<h2 id="naso01" xml:lang="en-US">Problems During Program Startup</h2>
-			<div class="LINUX" id="GnomeStartupProblems">
-				<p id="naso02" xml:lang="en-US">If you experience ${PRODUCTNAME} startup problems (most notably while using Gnome) please 'unset' the <tt>SESSION_MANAGER</tt> environment variable inside the shell you use to start ${PRODUCTNAME}. This can be done by adding the line "<tt>unset SESSION_MANAGER</tt>" to the beginning of the soffice shell script found in the "<tt>[office folder]/program</tt>" directory.</p>
-			</div>
 			<p id="abcdef" xml:lang="en-US">Difficulties starting ${PRODUCTNAME} (e.g. applications hang) as well as problems with the screen display are often caused by the graphics card driver. If these problems occur, please update your graphics card driver or try using the graphics driver delivered with your operating system. Difficulties displaying 3D objects can often be solved by deactivating the option "Use OpenGL" under 'Tools - Options - ${PRODUCTNAME} - View - 3D view'.</p>
 		</div>
 
@@ -234,6 +224,11 @@
 			<p class="note" id="pji76wsdf" xml:lang="en-US">Warning: The activated file locking feature can cause problems with Solaris 2.5.1 and 2.7 used in conjunction with Linux NFS 2.0. If your system environment has these parameters, we strongly recommend that you avoid using the file locking feature. Otherwise, ${PRODUCTNAME} will hang when you try to open a file from a NFS mounted directory from a Linux computer.</p>
 		</div>
 
+		<div class="LINUX" id="Graphic Performance">
+			<h2 id="gfh6w" xml:lang="en-US">Graphic Performance</h2>
+			<p id="pji76w" xml:lang="en-US">By default, ${PRODUCTNAME} favours nice-looking graphics over speed. If you experience slow graphics, switching off 'Tools - Options - ${PRODUCTNAME} - View - Use Anti-Aliasing' may help.</p>
+		</div>
+
 		<div class="WIN" id="Mapi">
 			<h2 id="gfh6w1" xml:lang="en-US">Problems When Sending Documents as E-mails From ${PRODUCTNAME}</h2>
 			<p id="pji76w1" xml:lang="en-US">When sending a document via 'File - Send - Document as E-mail' or 'Document as PDF Attachment' problems might occur (program crashes or hangs). This is due to the Windows system file "Mapi" (Messaging Application Programming Interface) which causes problems in some file versions. Unfortunately, the problem cannot be narrowed down to a certain version number. For more information visit <a href="http://www.microsoft.com">http://www.microsoft.com</a> to search the Microsoft Knowledge Base for "mapi dll".</p>
@@ -241,64 +236,52 @@
 
 		<div id="A11y">
 			<h2 id="aw22" xml:lang="en-US">Important Accessibility Notes</h2>
-			<p id="access7" xml:lang="en-US">For more information on the accessibility features in ${PRODUCTNAME}, see <a href="http://www.openoffice.org/access/">http://www.openoffice.org/access/</a></p>
-		</div>
-
-		<div id="Registration">
-			<h2 id="reg1" xml:lang="en-US">Registration </h2>
-			<p id="reg2" xml:lang="en-US">Please take a little time to complete the minimal Product Registration process when you install the software. While registration is optional, we encourage you to register, since the information enables the community to make an even better software suite and address user needs directly. Through its Privacy Policy, the ${PRODUCTNAME} Community takes every precaution to safeguard your personal data. If you missed the registration at installation, you can return and register at any time at by choosing "Help - Registration" from the main menu.</p>
-		</div>
-
-		<div id="UserSurvey">
-			<h2 id="survey" xml:lang="en-US">User Survey</h2>
-			<p id="survey1" xml:lang="en-US">There is also a User Survey located online which we encourage you to fill out. The User Survey results will help ${PRODUCTNAME} move more rapidly in setting new standards for the creation of the next-generation office suite. Through its Privacy Policy, the ${PRODUCTNAME} Community takes every precaution to safeguard your personal data.</p>
+			<p id="access7" xml:lang="en-US">For more information on the accessibility features in ${PRODUCTNAME}, see <a href="http://www.libreoffice.org/accessibility/">http://www.libreoffice.org/accessibility/</a></p>
 		</div>
 
 		<div id="UserSupport">
 			<h2 id="support" xml:lang="en-US">User Support</h2>
-			<p id="support1" xml:lang="en-US">The main support page <a href="http://support.openoffice.org/">http://support.openoffice.org/</a> offers various possibilities for help with ${PRODUCTNAME}. Your question may have already been answered - check the Community Forum at <a href="http://user.services.openoffice.org">http://user.services.openoffice.org</a> or search the archives of the 'users@openoffice.org' mailing list at <a href="http://www.openoffice.org/mail_list.html">http://www.openoffice.org/mail_list.html</a>. Alternatively, you can send in your questions to <a href="mailto:users@openoffice.org">users@openoffice.org</a>. How to subscribe to the list (to get an email response) is explained on this page: <a href="http://wiki.services.openoffice.org/wiki/Website/Content/help/mailinglists">http://wiki.services.openoffice.org/wiki/Website/Content/help/mailinglists</a>.</p>
-			<p id="faq" url="ahead" xml:lang="en-US">Also check the FAQ section at <a href="http://wiki.services.openoffice.org/wiki/Documentation/FAQ">http://wiki.services.openoffice.org/wiki/Documentation/FAQ.</a></p>
+			<p id="support1" xml:lang="en-US">The main support page <a href="http://www.libreoffice.org/support/">http://www.libreoffice.org/support/</a> offers various possibilities for help with ${PRODUCTNAME}. Your question may have already been answered - check the Community Forum at <a href="http://www.documentfoundation.org/nabble/">http://www.documentfoundation.org/nabble/</a> or search the archives of the 'users@libreoffice.org' mailing list at <a href="http://www.libreoffice.org/lists/users/">http://www.libreoffice.org/lists/users/</a>. Alternatively, you can send in your questions to <a href="mailto:users@libreoffice.org">users@libreoffice.org</a>. If you like to subscribe to the list (to get email responses), send an empty mail to: <a href="mailto:users+subscribe@libreoffice.org">users+subscribe@libreoffice.org</a>.</p>
+			<p id="faq" url="ahead" xml:lang="en-US">Also check the FAQ section at <a href="http://www.libreoffice.org/faq/">http://www.libreoffice.org/faq/.</a></p>
 		</div>
 
 		<div id="ReportBugsIssues">
 			<h2 id="reportbugs" xml:lang="en-US">Reporting Bugs &amp; Issues</h2>
-			<p id="reportbugs1" xml:lang="en-US">The ${PRODUCTNAME} Web site hosts IssueZilla, our mechanism for reporting, tracking and solving bugs and issues. We encourage all users to feel entitled and welcome to report issues that may arise on your particular platform. Energetic reporting of issues is one of the most important contributions that the user community can make to the ongoing development and improvement of the suite.</p>
+			<p id="reportbugs1" xml:lang="en-US">Our system for reporting, tracking and solving bugs is currently BugZilla, kindly hosted at <a href="https://bugs.freedesktop.org/">https://bugs.freedesktop.org/</a>. We encourage all users to feel entitled and welcome to report bugs that may arise on your particular platform. Energetic reporting of bugs is one of the most important contributions that the user community can make to the ongoing development and improvement of ${PRODUCTNAME}.</p>
 		</div>
 
 		<div id="GettingInvolved">
 			<h2 id="gettinginvolved1" xml:lang="en-US">Getting Involved</h2>
 			<p id="gettinginvolved2" xml:lang="en-US">The ${PRODUCTNAME} Community would very much benefit from your active participation in the development of this important open source project.</p>
-			<p id="gettingimvolved3" xml:lang="en-US">As a user, you are already a valuable part of the suite's development process and we would like to encourage you to take an even more active role with a view to being a long-term contributor to the community. Please join and check out the user page at <a href="http://www.openoffice.org">http://www.openoffice.org</a></p>
+			<p id="gettingimvolved3" xml:lang="en-US">As a user, you are already a valuable part of the suite's development process and we would like to encourage you to take an even more active role with a view to being a long-term contributor to the community. Please join and check out the contributing page at <a href="http://www.libreoffice.org/contribution/">http://www.libreoffice.org/contribution/</a></p>
 			<h3 id="howtostart" xml:lang="en-US">How to Start</h3>
-			<p id="howtostart1" xml:lang="en-US">The best way to start contributing is to subscribe to one or more of the mailing lists, lurk for a while, and gradually use the mail archives to familiarize yourself with many of the topics covered since the ${PRODUCTNAME} source code was released back in October 2000. When you're comfortable, all you need to do is send an email self-introduction and jump right in. If you are familiar with Open Source Projects, check out our To-Dos list and see if there is anything you would like to help with at <a href="http://development.openoffice.org/todo.html">http://development.openoffice.org/todo.html</a>.</p>
+			<p id="howtostart1" xml:lang="en-US">The best way to start contributing is to subscribe to one or more of the mailing lists, lurk for a while, and gradually use the mail archives to familiarize yourself with many of the topics covered since the ${PRODUCTNAME} source code was released back in October 2000. When you're comfortable, all you need to do is send an email self-introduction and jump right in. If you are familiar with Open Source Projects, check out our To-Dos list and see if there is anything you would like to help with at <a href="http://www.libreoffice.org/develop/">http://www.libreoffice.org/develop/</a>.</p>
 			<h3 id="subscribe" xml:lang="en-US">Subscribe</h3>
-			<p id="subscribe1" xml:lang="en-US">Here are a few of the Project mailing lists to which you can subscribe at <a href="http://www.openoffice.org/mail_list.html">http://www.openoffice.org/mail_list.html</a></p>
+			<p id="subscribe1" xml:lang="en-US">Here are a few of the mailing lists to which you can subscribe at <a href="http://www.libreoffice.org/contribution/">http://www.libreoffice.org/contribution/</a></p>
 			<ul>
 				<li>
-					<p id="subscribelist1" xml:lang="en-US">News: announce@openoffice.org *recommended to all users* (light traffic)</p>
+					<p id="subscribelist1" xml:lang="en-US">News: announce@documentfoundation.org *recommended to all users* (light traffic)</p>
 				</li>
 
 				<li>
-					<p id="subscribelist2" xml:lang="en-US">Main user forum: user@openoffice.org *easy way to lurk on discussions* (heavy traffic)</p>
+					<p id="subscribelist2" xml:lang="en-US">Main user list: users@libreoffice.org *easy way to lurk on discussions* (heavy traffic)</p>
 				</li>
 
 				<li>
-					<p id="subscribelist3" xml:lang="en-US">Marketing project: dev@marketing.openoffice.org *beyond development* (getting heavy)</p>
+					<p id="subscribelist3" xml:lang="en-US">Marketing project: marketing@libreoffice.org *beyond development* (getting heavy)</p>
 				</li>
 
 				<li>
-					<p id="subscribelist4" xml:lang="en-US">General code contributor list: dev@openoffice.org (moderate/heavy)</p>
+					<p id="subscribelist4" xml:lang="en-US">General developer list: libreoffice@lists.freedesktop.org (heavy traffic)</p>
 				</li>
 			</ul>
 			<h3 xml:lang="en-US">Joining one or more Projects</h3>
 			<p id="joining" xml:lang="en-US">You can make major contributions to this important open source project even if you have limited software design or coding experience. Yes, you!</p>
-			<p id="joining1" url="ahead" xml:lang="en-US">At <a href="http://projects.openoffice.org/index.html">http://projects.openoffice.org/index.html</a> you will find projects ranging from Localization, Porting and Groupware to some real core coding projects. If you are not a developer, try the Documentation or the Marketing Project. The OpenOffice.org Marketing Project is applying both guerilla and traditional commercial techniques to marketing open source software, and we are doing it across language and cultural barriers, so you can help just by spreading the word and telling a friend about this office suite.</p>
-			<p id="joining3" xml:lang="en-US">You can help by joining the Marketing Communications &amp; Information Network on <a href="http://marketing.openoffice.org/contacts.html">http://marketing.openoffice.org/contacts.html</a> where you can provide point communication contact with press, media, government agencies, consultants, schools, Linux Users Groups and developers in your country and local community.</p>
 		</div>
 
 		<div id="Credits">
 			<p id="credits" xml:lang="en-US">We hope you enjoy working with the new ${PRODUCTNAME} ${PRODUCTVERSION} and will join us online.</p>
-			<p id="credits2" xml:lang="en-US">The OpenOffice.org Community</p>
+			<p id="credits2" xml:lang="en-US">The LibreOffice Community</p>
 		</div>
 
 		<div id="ModifiedSourceCode">
diff --git a/readlicense_oo/odt/CREDITS.odt b/readlicense_oo/odt/CREDITS.odt
new file mode 100644
index 000000000000..a6223b7ce7c2
--- /dev/null
+++ b/readlicense_oo/odt/CREDITS.odt
diff --git a/readlicense_oo/odt/makefile.mk b/readlicense_oo/odt/makefile.mk
index 1e68a1722ef5..6c7a6116da9d 100644
--- a/readlicense_oo/odt/makefile.mk
+++ b/readlicense_oo/odt/makefile.mk
@@ -36,7 +36,7 @@ TARGET=odt
 
 # --- Files --------------------------------------------------------
 
-all: $(MISC)$/LICENSE.odt
+all: $(MISC)$/LICENSE.odt $(MISC)$/CREDITS.odt
 
 # --- Targets ------------------------------------------------------
 
@@ -44,3 +44,6 @@ all: $(MISC)$/LICENSE.odt
 
 $(MISC)$/LICENSE.odt: LICENSE.odt
     $(COPY) LICENSE.odt $@
+
+$(MISC)$/CREDITS.odt: CREDITS.odt
+    $(COPY) CREDITS.odt $@
diff --git a/readlicense_oo/prj/d.lst b/readlicense_oo/prj/d.lst
index 2a368beb7888..aa771c50111f 100644
--- a/readlicense_oo/prj/d.lst
+++ b/readlicense_oo/prj/d.lst
@@ -27,6 +27,7 @@ mkdir: %_DEST%\bin%_EXT%\ure
 ..\%__SRC%\misc\THIRDPARTYLICENSEREADME.html %_DEST%\bin%_EXT%\THIRDPARTYLICENSEREADME.html
 
 ..\%__SRC%\misc\LICENSE.odt %_DEST%\bin%_EXT%\LICENSE.odt
+..\%__SRC%\misc\CREDITS.odt %_DEST%\bin%_EXT%\CREDITS.odt
 
 dos: echo =====================================================================
 dos: echo Delivering README files
diff --git a/readlicense_oo/source/license/license_en-US.html b/readlicense_oo/source/license/license_en-US.html
index d11c348ee9a9..3064ab14183b 100644
--- a/readlicense_oo/source/license/license_en-US.html
+++ b/readlicense_oo/source/license/license_en-US.html
@@ -1,875 +1,109 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<html>
-<head>
-  <meta http-equiv="CONTENT-TYPE"
- content="text/html; charset=iso-8859-1">
-  <title></title>
-</head>
-<body lang="en-US">
-<h1>(License text)</h1>
-<p>This product is made available subject to the terms of GNU Lesser
-General Public License Version 3. A copy of the LGPL license can be
-found at http://www.openoffice.org/license.html<br>
-</p>
-<hr>
-<p>Third Party Code Additional copyright notices and license
-terms applicable to portions of the Software are set forth
-in the THIRDPARTYLICENSEREADME.html file.</p>
-<hr>
-<p>All trademarks and registered trademarks mentioned herein are the
-property of their respective owners.</p>
-<hr>
-<p>Copyright (c) 2000, 2010 Oracle and/or its affiliates. All rights reserved.</p>
-<p>This product has been created with contributions from the
-OpenOffice.org community, of which Oracle is a
-principal member. OpenOffice.org acknowledges all community members,
-especially those mentioned at
-http://www.openoffice.org/welcome/credits.html.</p>
-<hr>
-<pre>
-
-		   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions. 
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version. 
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
-
-
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-
-</pre>
-</body>
-</html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN" "http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><!--This file was converted to xhtml by OpenOffice.org - see http://xml.openoffice.org/odf2xhtml for more info.--><head profile="http://dublincore.org/documents/dcmi-terms/"><meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8"/><title xml:lang="en-US">- no title specified</title><meta name="DCTERMS.title" content="" xml:lang="en-US"/><meta name="DCTERMS.language" content="en-US" scheme="DCTERMS.RFC4646"/><meta name="DCTERMS.source" content="http://xml.openoffice.org/odf2xhtml"/><meta name="DCTERMS.issued" content="2010-09-23T20:59:05" scheme="DCTERMS.W3CDTF"/><meta name="DCTERMS.contributor" content="Cédric Bosdonnat"/><meta name="DCTERMS.modified" content="2010-10-13T20:07:34" scheme="DCTERMS.W3CDTF"/><meta name="DCTERMS.provenance" content="" xml:lang="en-US"/><meta name="DCTERMS.subject" content="," xml:lang="en-US"/><link rel="schema.DC" href="http://purl.org/dc/elements/1.1/" hreflang="en"/><link rel="schema.DCTERMS" href="http://purl.org/dc/terms/" hreflang="en"/><link rel="schema.DCTYPE" href="http://purl.org/dc/dcmitype/" hreflang="en"/><link rel="schema.DCAM" href="http://purl.org/dc/dcam/" hreflang="en"/><base href="."/><style type="text/css">
+	@page {  }
+	table { border-collapse:collapse; border-spacing:0; empty-cells:show }
+	td, th { vertical-align:top; font-size:12pt;}
+	h1, h2, h3, h4, h5, h6 { clear:both }
+	ol, ul { margin:0; padding:0;}
+	li { list-style: none; margin:0; padding:0;}
+	<!-- "li span.odfLiEnd" - IE 7 issue-->
+	li span. { clear: both; line-height:0; width:0; height:0; margin:0; padding:0; }
+	span.footnodeNumber { padding-right:1em; }
+	span.annotation_style_by_filter { font-size:95%; font-family:Arial; background-color:#fff000;  margin:0; border:0; padding:0;  }
+	* { margin:0;}
+	.Heading_20_1 { font-size:24pt; margin-bottom:0.0835in; margin-top:0.1665in; font-family:Thorndale; writing-mode:page; font-weight:bold; }
+	.Heading_20_2 { font-size:18pt; margin-bottom:0.0835in; margin-top:0.1665in; font-family:Thorndale AMT; writing-mode:page; font-weight:bold; }
+	.Heading_20_3 { font-size:14pt; margin-bottom:0.0835in; margin-top:0.1665in; font-family:Thorndale AMT; writing-mode:page; font-weight:bold; }
+	.Heading_20_4 { font-size:12pt; margin-bottom:0.0835in; margin-top:0.1665in; font-family:Thorndale AMT; writing-mode:page; font-weight:bold; }
+	.Horizontal_20_Line_borderStart { font-size:6pt; font-family:Thorndale AMT; writing-mode:page; margin-top:0in; padding:0in; border-left-style:none; border-right-style:none; border-top-style:none; padding-bottom:0.1965in;  border-bottom-style:none; }
+	.Horizontal_20_Line { font-size:6pt; font-family:Thorndale AMT; writing-mode:page; padding:0in; border-left-style:none; border-right-style:none; padding-top:0in; padding-bottom:0.1965in;  border-top-style:none; border-bottom-style:none; }
+	.Horizontal_20_Line_borderEnd { font-size:6pt; font-family:Thorndale AMT; writing-mode:page; margin-bottom:0.1965in; padding:0in; border-left-style:none; border-right-style:none; border-bottom-width:0.0399cm; border-bottom-style:double; border-bottom-color:#808080; padding-top:0in;  border-top-style:none;}
+	.List_20_Contents { font-size:12pt; font-family:Thorndale AMT; writing-mode:page; margin-left:0.3937in; margin-right:0in; text-indent:0in; }
+	.P1 { font-size:12pt; font-weight:bold; margin-bottom:0.0835in; margin-top:0.1665in; font-family:Thorndale AMT; writing-mode:page; text-align:left ! important; }
+	.P10 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; text-align:center ! important; font-weight:bold; }
+	.P11 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P12 { font-size:24pt; font-weight:bold; margin-bottom:0.0835in; margin-top:0.1665in; font-family:Thorndale; writing-mode:page; }
+	.P13 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P14 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P15 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P16 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P17 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P18 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P19 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P2 { font-size:10pt; margin-bottom:0.1965in; margin-top:0in; font-family:Cumberland AMT; writing-mode:page; }
+	.P20 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P21 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P22 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P23 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P24 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P25 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P26 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P27 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P28 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P29 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P3 { font-size:12pt; margin-left:0.3937in; margin-right:0in; text-indent:0in; font-family:Thorndale AMT; writing-mode:page; margin-top:0in; margin-bottom:0.1965in; }
+	.P30 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P31 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P32 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P33 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P34 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P35 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P36 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P37 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P38 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P39 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P4 { font-size:10pt; margin-bottom:0in; margin-top:0in; font-family:Cumberland AMT; writing-mode:page; font-weight:bold; }
+	.P40 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P41 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P42 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P43 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P44 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P45 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P46 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P47 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P48 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P49 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P5_borderStart { border-left-style:none; border-right-style:none; border-top-style:none; font-size:6pt; margin-top:0in; padding:0in; font-family:Thorndale AMT; writing-mode:page; margin-left:2.928in; margin-right:2.928in; text-align:center ! important; text-indent:0in; padding-bottom:0.1965in;  border-bottom-style:none; }
+	.P5 { border-left-style:none; border-right-style:none; font-size:6pt; padding:0in; font-family:Thorndale AMT; writing-mode:page; margin-left:2.928in; margin-right:2.928in; text-align:center ! important; text-indent:0in; padding-bottom:0.1965in; padding-top:0in;  border-top-style:none; border-bottom-style:none; }
+	.P5_borderEnd { border-bottom-width:0.0399cm; border-bottom-style:double; border-bottom-color:#808080; border-left-style:none; border-right-style:none; font-size:6pt; margin-bottom:0.1965in; padding:0in; font-family:Thorndale AMT; writing-mode:page; margin-left:2.928in; margin-right:2.928in; text-align:center ! important; text-indent:0in; padding-top:0in;  border-top-style:none;}
+	.P50 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P51 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P52 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P53 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P54 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P55 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P56 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P57 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P58 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P59 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P6 { font-size:10pt; margin-bottom:0.1965in; margin-left:0.3937in; margin-right:0.3937in; margin-top:0in; text-indent:0in; font-family:Thorndale AMT; writing-mode:page; font-style:italic; }
+	.P60 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P61 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P62 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P63 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P64 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P65 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P66 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P67 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P68 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P69 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
+	.P7 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; text-align:left ! important; }
+	.P8 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; text-align:center ! important; }
+	.P9 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; font-style:italic; font-weight:bold; }
+	.Preformatted_20_Text { font-size:10pt; font-family:Cumberland AMT; writing-mode:page; margin-top:0in; margin-bottom:0in; }
+	.Quotations { font-size:12pt; font-family:Thorndale AMT; writing-mode:page; margin-left:0.3937in; margin-right:0.3937in; margin-top:0in; margin-bottom:0.1965in; text-indent:0in; }
+	.Text_20_body { font-size:12pt; font-family:Thorndale AMT; writing-mode:page; margin-top:0in; margin-bottom:0.0835in; }
+	.Bullet_20_Symbols { font-family:OpenSymbol; }
+	.Emphasis { font-style:italic; }
+	.Strong_20_Emphasis { font-weight:bold; }
+	.T1 { font-style:italic; }
+	.T2 { font-style:italic; }
+	.T4 { font-weight:bold; }
+	.T5 { font-size:18pt; font-weight:bold; }
+	.T6 { color:#000000; }
+	.T7 { font-size:10pt; font-style:italic; }
+	<!-- ODF styles with no properties representable as CSS -->
+	.Numbering_20_Symbols .T3 { }
+	</style></head><body dir="ltr" style="max-width:8.5in;margin-top:0.3937in; margin-bottom:0.3937in; margin-left:0.7874in; margin-right:0.3937in; background-color:transparent; "><p class="P12">Licensing and Legal information</p><p class="Text_20_body"> </p><p class="Text_20_body">This product is made available subject to the terms of GNU Lesser General Public License Version 3. A copy of the LGPL license can be found at <a href="http://www.gnu.org/licenses/lgpl-3.0.html">http://www.gnu.org/licenses/lgpl-3.0.html</a></p><p class="Text_20_body">Third Party Code Additional copyright notices and license terms applicable to portions of the Software are set forth in the THIRDPARTYLICENSEREADME.html file, and can be found at the bottom of this document.</p><p class="Text_20_body">All trademarks and registered trademarks mentioned herein are the property of their respective owners.</p><p class="Text_20_body">Copyright (c) 2000, 2010 Oracle, and/or its affiliates. All rights reserved.</p><p class="Text_20_body">This product has been created by <span class="T2">The Document Foundation</span>, incorporating many modifications from different contributors, see <a href="http://www.libreoffice.org/">http://www.libreoffice.org/</a> for more details.</p><p class="Text_20_body"> </p><p class="P10">- DO NOT TRANSLATE OR LOCALIZE THIS DOCUMENT -</p><h3 class="Heading_20_3"><a id="a__GNU_LESSER_GENERAL_PUBLIC_LICENSE"><span/></a>                   GNU LESSER GENERAL PUBLIC LICENSE</h3><p class="P4">                       Version 3, 29 June 2007</p><p class="P4"> </p><p class="Preformatted_20_Text"> Copyright (C) 2007 Free Software Foundation, Inc. </p><p class="Preformatted_20_Text"> Everyone is permitted to copy and distribute verbatim copies</p><p class="Preformatted_20_Text"> of this license document, but changing it is not allowed.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  This version of the GNU Lesser General Public License incorporates</p><p class="Preformatted_20_Text">the terms and conditions of version 3 of the GNU General Public</p><p class="Preformatted_20_Text">License, supplemented by the additional permissions listed below.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  0. Additional Definitions. </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  As used herein, "this License" refers to version 3 of the GNU Lesser</p><p class="Preformatted_20_Text">General Public License, and the "GNU GPL" refers to version 3 of the GNU</p><p class="Preformatted_20_Text">General Public License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  "The Library" refers to a covered work governed by this License,</p><p class="Preformatted_20_Text">other than an Application or a Combined Work as defined below.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  An "Application" is any work that makes use of an interface provided</p><p class="Preformatted_20_Text">by the Library, but which is not otherwise based on the Library.</p><p class="Preformatted_20_Text">Defining a subclass of a class defined by the Library is deemed a mode</p><p class="Preformatted_20_Text">of using an interface provided by the Library.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  A "Combined Work" is a work produced by combining or linking an</p><p class="Preformatted_20_Text">Application with the Library.  The particular version of the Library</p><p class="Preformatted_20_Text">with which the Combined Work was made is also called the "Linked</p><p class="Preformatted_20_Text">Version".</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  The "Minimal Corresponding Source" for a Combined Work means the</p><p class="Preformatted_20_Text">Corresponding Source for the Combined Work, excluding any source code</p><p class="Preformatted_20_Text">for portions of the Combined Work that, considered in isolation, are</p><p class="Preformatted_20_Text">based on the Application, and not on the Linked Version.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  The "Corresponding Application Code" for a Combined Work means the</p><p class="Preformatted_20_Text">object code and/or source code for the Application, including any data</p><p class="Preformatted_20_Text">and utility programs needed for reproducing the Combined Work from the</p><p class="Preformatted_20_Text">Application, but excluding the System Libraries of the Combined Work.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  1. Exception to Section 3 of the GNU GPL.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  You may convey a covered work under sections 3 and 4 of this License</p><p class="Preformatted_20_Text">without being bound by section 3 of the GNU GPL.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  2. Conveying Modified Versions.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  If you modify a copy of the Library, and, in your modifications, a</p><p class="Preformatted_20_Text">facility refers to a function or data to be supplied by an Application</p><p class="Preformatted_20_Text">that uses the facility (other than as an argument passed when the</p><p class="Preformatted_20_Text">facility is invoked), then you may convey a copy of the modified</p><p class="Preformatted_20_Text">version:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   a) under this License, provided that you make a good faith effort to</p><p class="Preformatted_20_Text">   ensure that, in the event an Application does not supply the</p><p class="Preformatted_20_Text">   function or data, the facility still operates, and performs</p><p class="Preformatted_20_Text">   whatever part of its purpose remains meaningful, or</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   b) under the GNU GPL, with none of the additional permissions of</p><p class="Preformatted_20_Text">   this License applicable to that copy.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  3. Object Code Incorporating Material from Library Header Files.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  The object code form of an Application may incorporate material from</p><p class="Preformatted_20_Text">a header file that is part of the Library.  You may convey such object</p><p class="Preformatted_20_Text">code under terms of your choice, provided that, if the incorporated</p><p class="Preformatted_20_Text">material is not limited to numerical parameters, data structure</p><p class="Preformatted_20_Text">layouts and accessors, or small macros, inline functions and templates</p><p class="Preformatted_20_Text">(ten or fewer lines in length), you do both of the following:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   a) Give prominent notice with each copy of the object code that the</p><p class="Preformatted_20_Text">   Library is used in it and that the Library and its use are</p><p class="Preformatted_20_Text">   covered by this License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   b) Accompany the object code with a copy of the GNU GPL and this license</p><p class="Preformatted_20_Text">   document.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  4. Combined Works.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  You may convey a Combined Work under terms of your choice that,</p><p class="Preformatted_20_Text">taken together, effectively do not restrict modification of the</p><p class="Preformatted_20_Text">portions of the Library contained in the Combined Work and reverse</p><p class="Preformatted_20_Text">engineering for debugging such modifications, if you also do each of</p><p class="Preformatted_20_Text">the following:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   a) Give prominent notice with each copy of the Combined Work that</p><p class="Preformatted_20_Text">   the Library is used in it and that the Library and its use are</p><p class="Preformatted_20_Text">   covered by this License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   b) Accompany the Combined Work with a copy of the GNU GPL and this license</p><p class="Preformatted_20_Text">   document.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   c) For a Combined Work that displays copyright notices during</p><p class="Preformatted_20_Text">   execution, include the copyright notice for the Library among</p><p class="Preformatted_20_Text">   these notices, as well as a reference directing the user to the</p><p class="Preformatted_20_Text">   copies of the GNU GPL and this license document.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   d) Do one of the following:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">       0) Convey the Minimal Corresponding Source under the terms of this</p><p class="Preformatted_20_Text">       License, and the Corresponding Application Code in a form</p><p class="Preformatted_20_Text">       suitable for, and under terms that permit, the user to</p><p class="Preformatted_20_Text">       recombine or relink the Application with a modified version of</p><p class="Preformatted_20_Text">       the Linked Version to produce a modified Combined Work, in the</p><p class="Preformatted_20_Text">       manner specified by section 6 of the GNU GPL for conveying</p><p class="Preformatted_20_Text">       Corresponding Source.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">       1) Use a suitable shared library mechanism for linking with the</p><p class="Preformatted_20_Text">       Library.  A suitable mechanism is one that (a) uses at run time</p><p class="Preformatted_20_Text">       a copy of the Library already present on the user's computer</p><p class="Preformatted_20_Text">       system, and (b) will operate properly with a modified version</p><p class="Preformatted_20_Text">       of the Library that is interface-compatible with the Linked</p><p class="Preformatted_20_Text">       Version. </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   e) Provide Installation Information, but only if you would otherwise</p><p class="Preformatted_20_Text">   be required to provide such information under section 6 of the</p><p class="Preformatted_20_Text">   GNU GPL, and only to the extent that such information is</p><p class="Preformatted_20_Text">   necessary to install and execute a modified version of the</p><p class="Preformatted_20_Text">   Combined Work produced by recombining or relinking the</p><p class="Preformatted_20_Text">   Application with a modified version of the Linked Version. (If</p><p class="Preformatted_20_Text">   you use option 4d0, the Installation Information must accompany</p><p class="Preformatted_20_Text">   the Minimal Corresponding Source and Corresponding Application</p><p class="Preformatted_20_Text">   Code. If you use option 4d1, you must provide the Installation</p><p class="Preformatted_20_Text">   Information in the manner specified by section 6 of the GNU GPL</p><p class="Preformatted_20_Text">   for conveying Corresponding Source.)</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  5. Combined Libraries.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  You may place library facilities that are a work based on the</p><p class="Preformatted_20_Text">Library side by side in a single library together with other library</p><p class="Preformatted_20_Text">facilities that are not Applications and are not covered by this</p><p class="Preformatted_20_Text">License, and convey such a combined library under terms of your</p><p class="Preformatted_20_Text">choice, if you do both of the following:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   a) Accompany the combined library with a copy of the same work based</p><p class="Preformatted_20_Text">   on the Library, uncombined with any other library facilities,</p><p class="Preformatted_20_Text">   conveyed under the terms of this License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   b) Give prominent notice with the combined library that part of it</p><p class="Preformatted_20_Text">   is a work based on the Library, and explaining where to find the</p><p class="Preformatted_20_Text">   accompanying uncombined form of the same work.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  6. Revised Versions of the GNU Lesser General Public License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  The Free Software Foundation may publish revised and/or new versions</p><p class="Preformatted_20_Text">of the GNU Lesser General Public License from time to time. Such new</p><p class="Preformatted_20_Text">versions will be similar in spirit to the present version, but may</p><p class="Preformatted_20_Text">differ in detail to address new problems or concerns.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  Each version is given a distinguishing version number. If the</p><p class="Preformatted_20_Text">Library as you received it specifies that a certain numbered version</p><p class="Preformatted_20_Text">of the GNU Lesser General Public License "or any later version"</p><p class="Preformatted_20_Text">applies to it, you have the option of following the terms and</p><p class="Preformatted_20_Text">conditions either of that published version or of any later version</p><p class="Preformatted_20_Text">published by the Free Software Foundation. If the Library as you</p><p class="Preformatted_20_Text">received it does not specify a version number of the GNU Lesser</p><p class="Preformatted_20_Text">General Public License, you may choose any version of the GNU Lesser</p><p class="Preformatted_20_Text">General Public License ever published by the Free Software Foundation.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  If the Library as you received it specifies that a proxy can decide</p><p class="Preformatted_20_Text">whether future versions of the GNU Lesser General Public License shall</p><p class="Preformatted_20_Text">apply, that proxy's public statement of acceptance of any version is</p><p class="Preformatted_20_Text">permanent authorization for you to choose that version for the</p><p class="Preformatted_20_Text">Library.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text"> </p><h3 class="Heading_20_3"><a id="a__GNU_GENERAL_PUBLIC_LICENSE"><span/></a>                    GNU GENERAL PUBLIC LICENSE</h3><p class="P4">                       Version 3, 29 June 2007</p><p class="P4"> </p><p class="Preformatted_20_Text"> Copyright (C) 2007 Free Software Foundation, Inc. </p><p class="Preformatted_20_Text"> Everyone is permitted to copy and distribute verbatim copies</p><p class="Preformatted_20_Text"> of this license document, but changing it is not allowed.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">                            Preamble</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  The GNU General Public License is a free, copyleft license for</p><p class="Preformatted_20_Text">software and other kinds of works.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  The licenses for most software and other practical works are designed</p><p class="Preformatted_20_Text">to take away your freedom to share and change the works.  By contrast,</p><p class="Preformatted_20_Text">the GNU General Public License is intended to guarantee your freedom to</p><p class="Preformatted_20_Text">share and change all versions of a program--to make sure it remains free</p><p class="Preformatted_20_Text">software for all its users.  We, the Free Software Foundation, use the</p><p class="Preformatted_20_Text">GNU General Public License for most of our software; it applies also to</p><p class="Preformatted_20_Text">any other work released this way by its authors.  You can apply it to</p><p class="Preformatted_20_Text">your programs, too.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  When we speak of free software, we are referring to freedom, not</p><p class="Preformatted_20_Text">price.  Our General Public Licenses are designed to make sure that you</p><p class="Preformatted_20_Text">have the freedom to distribute copies of free software (and charge for</p><p class="Preformatted_20_Text">them if you wish), that you receive source code or can get it if you</p><p class="Preformatted_20_Text">want it, that you can change the software or use pieces of it in new</p><p class="Preformatted_20_Text">free programs, and that you know you can do these things.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  To protect your rights, we need to prevent others from denying you</p><p class="Preformatted_20_Text">these rights or asking you to surrender the rights.  Therefore, you have</p><p class="Preformatted_20_Text">certain responsibilities if you distribute copies of the software, or if</p><p class="Preformatted_20_Text">you modify it: responsibilities to respect the freedom of others.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  For example, if you distribute copies of such a program, whether</p><p class="Preformatted_20_Text">gratis or for a fee, you must pass on to the recipients the same</p><p class="Preformatted_20_Text">freedoms that you received.  You must make sure that they, too, receive</p><p class="Preformatted_20_Text">or can get the source code.  And you must show them these terms so they</p><p class="Preformatted_20_Text">know their rights.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  Developers that use the GNU GPL protect your rights with two steps:</p><p class="Preformatted_20_Text">(1) assert copyright on the software, and (2) offer you this License</p><p class="Preformatted_20_Text">giving you legal permission to copy, distribute and/or modify it.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  For the developers' and authors' protection, the GPL clearly explains</p><p class="Preformatted_20_Text">that there is no warranty for this free software.  For both users' and</p><p class="Preformatted_20_Text">authors' sake, the GPL requires that modified versions be marked as</p><p class="Preformatted_20_Text">changed, so that their problems will not be attributed erroneously to</p><p class="Preformatted_20_Text">authors of previous versions.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  Some devices are designed to deny users access to install or run</p><p class="Preformatted_20_Text">modified versions of the software inside them, although the manufacturer</p><p class="Preformatted_20_Text">can do so.  This is fundamentally incompatible with the aim of</p><p class="Preformatted_20_Text">protecting users' freedom to change the software.  The systematic</p><p class="Preformatted_20_Text">pattern of such abuse occurs in the area of products for individuals to</p><p class="Preformatted_20_Text">use, which is precisely where it is most unacceptable.  Therefore, we</p><p class="Preformatted_20_Text">have designed this version of the GPL to prohibit the practice for those</p><p class="Preformatted_20_Text">products.  If such problems arise substantially in other domains, we</p><p class="Preformatted_20_Text">stand ready to extend this provision to those domains in future versions</p><p class="Preformatted_20_Text">of the GPL, as needed to protect the freedom of users.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  Finally, every program is threatened constantly by software patents.</p><p class="Preformatted_20_Text">States should not allow patents to restrict development and use of</p><p class="Preformatted_20_Text">software on general-purpose computers, but in those that do, we wish to</p><p class="Preformatted_20_Text">avoid the special danger that patents applied to a free program could</p><p class="Preformatted_20_Text">make it effectively proprietary.  To prevent this, the GPL assures that</p><p class="Preformatted_20_Text">patents cannot be used to render the program non-free.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  The precise terms and conditions for copying, distribution and</p><p class="Preformatted_20_Text">modification follow.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">                       TERMS AND CONDITIONS</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  0. Definitions.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  "This License" refers to version 3 of the GNU General Public License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  "Copyright" also means copyright-like laws that apply to other kinds of</p><p class="Preformatted_20_Text">works, such as semiconductor masks.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  "The Program" refers to any copyrightable work licensed under this</p><p class="Preformatted_20_Text">License.  Each licensee is addressed as "you".  "Licensees" and</p><p class="Preformatted_20_Text">"recipients" may be individuals or organizations.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  To "modify" a work means to copy from or adapt all or part of the work</p><p class="Preformatted_20_Text">in a fashion requiring copyright permission, other than the making of an</p><p class="Preformatted_20_Text">exact copy.  The resulting work is called a "modified version" of the</p><p class="Preformatted_20_Text">earlier work or a work "based on" the earlier work.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  A "covered work" means either the unmodified Program or a work based</p><p class="Preformatted_20_Text">on the Program.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  To "propagate" a work means to do anything with it that, without</p><p class="Preformatted_20_Text">permission, would make you directly or secondarily liable for</p><p class="Preformatted_20_Text">infringement under applicable copyright law, except executing it on a</p><p class="Preformatted_20_Text">computer or modifying a private copy.  Propagation includes copying,</p><p class="Preformatted_20_Text">distribution (with or without modification), making available to the</p><p class="Preformatted_20_Text">public, and in some countries other activities as well.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  To "convey" a work means any kind of propagation that enables other</p><p class="Preformatted_20_Text">parties to make or receive copies.  Mere interaction with a user through</p><p class="Preformatted_20_Text">a computer network, with no transfer of a copy, is not conveying.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  An interactive user interface displays "Appropriate Legal Notices"</p><p class="Preformatted_20_Text">to the extent that it includes a convenient and prominently visible</p><p class="Preformatted_20_Text">feature that (1) displays an appropriate copyright notice, and (2)</p><p class="Preformatted_20_Text">tells the user that there is no warranty for the work (except to the</p><p class="Preformatted_20_Text">extent that warranties are provided), that licensees may convey the</p><p class="Preformatted_20_Text">work under this License, and how to view a copy of this License.  If</p><p class="Preformatted_20_Text">the interface presents a list of user commands or options, such as a</p><p class="Preformatted_20_Text">menu, a prominent item in the list meets this criterion.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  1. Source Code.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  The "source code" for a work means the preferred form of the work</p><p class="Preformatted_20_Text">for making modifications to it.  "Object code" means any non-source</p><p class="Preformatted_20_Text">form of a work.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  A "Standard Interface" means an interface that either is an official</p><p class="Preformatted_20_Text">standard defined by a recognized standards body, or, in the case of</p><p class="Preformatted_20_Text">interfaces specified for a particular programming language, one that</p><p class="Preformatted_20_Text">is widely used among developers working in that language.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  The "System Libraries" of an executable work include anything, other</p><p class="Preformatted_20_Text">than the work as a whole, that (a) is included in the normal form of</p><p class="Preformatted_20_Text">packaging a Major Component, but which is not part of that Major</p><p class="Preformatted_20_Text">Component, and (b) serves only to enable use of the work with that</p><p class="Preformatted_20_Text">Major Component, or to implement a Standard Interface for which an</p><p class="Preformatted_20_Text">implementation is available to the public in source code form.  A</p><p class="Preformatted_20_Text">"Major Component", in this context, means a major essential component</p><p class="Preformatted_20_Text">(kernel, window system, and so on) of the specific operating system</p><p class="Preformatted_20_Text">(if any) on which the executable work runs, or a compiler used to</p><p class="Preformatted_20_Text">produce the work, or an object code interpreter used to run it.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  The "Corresponding Source" for a work in object code form means all</p><p class="Preformatted_20_Text">the source code needed to generate, install, and (for an executable</p><p class="Preformatted_20_Text">work) run the object code and to modify the work, including scripts to</p><p class="Preformatted_20_Text">control those activities.  However, it does not include the work's</p><p class="Preformatted_20_Text">System Libraries, or general-purpose tools or generally available free</p><p class="Preformatted_20_Text">programs which are used unmodified in performing those activities but</p><p class="Preformatted_20_Text">which are not part of the work.  For example, Corresponding Source</p><p class="Preformatted_20_Text">includes interface definition files associated with source files for</p><p class="Preformatted_20_Text">the work, and the source code for shared libraries and dynamically</p><p class="Preformatted_20_Text">linked subprograms that the work is specifically designed to require,</p><p class="Preformatted_20_Text">such as by intimate data communication or control flow between those</p><p class="Preformatted_20_Text">subprograms and other parts of the work.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  The Corresponding Source need not include anything that users</p><p class="Preformatted_20_Text">can regenerate automatically from other parts of the Corresponding</p><p class="Preformatted_20_Text">Source.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  The Corresponding Source for a work in source code form is that</p><p class="Preformatted_20_Text">same work.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  2. Basic Permissions.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  All rights granted under this License are granted for the term of</p><p class="Preformatted_20_Text">copyright on the Program, and are irrevocable provided the stated</p><p class="Preformatted_20_Text">conditions are met.  This License explicitly affirms your unlimited</p><p class="Preformatted_20_Text">permission to run the unmodified Program.  The output from running a</p><p class="Preformatted_20_Text">covered work is covered by this License only if the output, given its</p><p class="Preformatted_20_Text">content, constitutes a covered work.  This License acknowledges your</p><p class="Preformatted_20_Text">rights of fair use or other equivalent, as provided by copyright law.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  You may make, run and propagate covered works that you do not</p><p class="Preformatted_20_Text">convey, without conditions so long as your license otherwise remains</p><p class="Preformatted_20_Text">in force.  You may convey covered works to others for the sole purpose</p><p class="Preformatted_20_Text">of having them make modifications exclusively for you, or provide you</p><p class="Preformatted_20_Text">with facilities for running those works, provided that you comply with</p><p class="Preformatted_20_Text">the terms of this License in conveying all material for which you do</p><p class="Preformatted_20_Text">not control copyright.  Those thus making or running the covered works</p><p class="Preformatted_20_Text">for you must do so exclusively on your behalf, under your direction</p><p class="Preformatted_20_Text">and control, on terms that prohibit them from making any copies of</p><p class="Preformatted_20_Text">your copyrighted material outside their relationship with you.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  Conveying under any other circumstances is permitted solely under</p><p class="Preformatted_20_Text">the conditions stated below.  Sublicensing is not allowed; section 10</p><p class="Preformatted_20_Text">makes it unnecessary.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  3. Protecting Users' Legal Rights From Anti-Circumvention Law.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  No covered work shall be deemed part of an effective technological</p><p class="Preformatted_20_Text">measure under any applicable law fulfilling obligations under article</p><p class="Preformatted_20_Text">11 of the WIPO copyright treaty adopted on 20 December 1996, or</p><p class="Preformatted_20_Text">similar laws prohibiting or restricting circumvention of such</p><p class="Preformatted_20_Text">measures.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  When you convey a covered work, you waive any legal power to forbid</p><p class="Preformatted_20_Text">circumvention of technological measures to the extent such circumvention</p><p class="Preformatted_20_Text">is effected by exercising rights under this License with respect to</p><p class="Preformatted_20_Text">the covered work, and you disclaim any intention to limit operation or</p><p class="Preformatted_20_Text">modification of the work as a means of enforcing, against the work's</p><p class="Preformatted_20_Text">users, your or third parties' legal rights to forbid circumvention of</p><p class="Preformatted_20_Text">technological measures.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  4. Conveying Verbatim Copies.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  You may convey verbatim copies of the Program's source code as you</p><p class="Preformatted_20_Text">receive it, in any medium, provided that you conspicuously and</p><p class="Preformatted_20_Text">appropriately publish on each copy an appropriate copyright notice;</p><p class="Preformatted_20_Text">keep intact all notices stating that this License and any</p><p class="Preformatted_20_Text">non-permissive terms added in accord with section 7 apply to the code;</p><p class="Preformatted_20_Text">keep intact all notices of the absence of any warranty; and give all</p><p class="Preformatted_20_Text">recipients a copy of this License along with the Program.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  You may charge any price or no price for each copy that you convey,</p><p class="Preformatted_20_Text">and you may offer support or warranty protection for a fee.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  5. Conveying Modified Source Versions.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  You may convey a work based on the Program, or the modifications to</p><p class="Preformatted_20_Text">produce it from the Program, in the form of source code under the</p><p class="Preformatted_20_Text">terms of section 4, provided that you also meet all of these conditions:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    a) The work must carry prominent notices stating that you modified</p><p class="Preformatted_20_Text">    it, and giving a relevant date.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    b) The work must carry prominent notices stating that it is</p><p class="Preformatted_20_Text">    released under this License and any conditions added under section</p><p class="Preformatted_20_Text">    7.  This requirement modifies the requirement in section 4 to</p><p class="Preformatted_20_Text">    "keep intact all notices".</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    c) You must license the entire work, as a whole, under this</p><p class="Preformatted_20_Text">    License to anyone who comes into possession of a copy.  This</p><p class="Preformatted_20_Text">    License will therefore apply, along with any applicable section 7</p><p class="Preformatted_20_Text">    additional terms, to the whole of the work, and all its parts,</p><p class="Preformatted_20_Text">    regardless of how they are packaged.  This License gives no</p><p class="Preformatted_20_Text">    permission to license the work in any other way, but it does not</p><p class="Preformatted_20_Text">    invalidate such permission if you have separately received it.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    d) If the work has interactive user interfaces, each must display</p><p class="Preformatted_20_Text">    Appropriate Legal Notices; however, if the Program has interactive</p><p class="Preformatted_20_Text">    interfaces that do not display Appropriate Legal Notices, your</p><p class="Preformatted_20_Text">    work need not make them do so.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  A compilation of a covered work with other separate and independent</p><p class="Preformatted_20_Text">works, which are not by their nature extensions of the covered work,</p><p class="Preformatted_20_Text">and which are not combined with it such as to form a larger program,</p><p class="Preformatted_20_Text">in or on a volume of a storage or distribution medium, is called an</p><p class="Preformatted_20_Text">"aggregate" if the compilation and its resulting copyright are not</p><p class="Preformatted_20_Text">used to limit the access or legal rights of the compilation's users</p><p class="Preformatted_20_Text">beyond what the individual works permit.  Inclusion of a covered work</p><p class="Preformatted_20_Text">in an aggregate does not cause this License to apply to the other</p><p class="Preformatted_20_Text">parts of the aggregate.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  6. Conveying Non-Source Forms.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  You may convey a covered work in object code form under the terms</p><p class="Preformatted_20_Text">of sections 4 and 5, provided that you also convey the</p><p class="Preformatted_20_Text">machine-readable Corresponding Source under the terms of this License,</p><p class="Preformatted_20_Text">in one of these ways:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    a) Convey the object code in, or embodied in, a physical product</p><p class="Preformatted_20_Text">    (including a physical distribution medium), accompanied by the</p><p class="Preformatted_20_Text">    Corresponding Source fixed on a durable physical medium</p><p class="Preformatted_20_Text">    customarily used for software interchange.</p><p class="Preformatted_20_Text"/><p class="Preformatted_20_Text">    b) Convey the object code in, or embodied in, a physical product</p><p class="Preformatted_20_Text">    (including a physical distribution medium), accompanied by a</p><p class="Preformatted_20_Text">    written offer, valid for at least three years and valid for as</p><p class="Preformatted_20_Text">    long as you offer spare parts or customer support for that product</p><p class="Preformatted_20_Text">    model, to give anyone who possesses the object code either (1) a</p><p class="Preformatted_20_Text">    copy of the Corresponding Source for all the software in the</p><p class="Preformatted_20_Text">    product that is covered by this License, on a durable physical</p><p class="Preformatted_20_Text">    medium customarily used for software interchange, for a price no</p><p class="Preformatted_20_Text">    more than your reasonable cost of physically performing this</p><p class="Preformatted_20_Text">    conveying of source, or (2) access to copy the</p><p class="Preformatted_20_Text">    Corresponding Source from a network server at no charge.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    c) Convey individual copies of the object code with a copy of the</p><p class="Preformatted_20_Text">    written offer to provide the Corresponding Source.  This</p><p class="Preformatted_20_Text">    alternative is allowed only occasionally and noncommercially, and</p><p class="Preformatted_20_Text">    only if you received the object code with such an offer, in accord</p><p class="Preformatted_20_Text">    with subsection 6b.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    d) Convey the object code by offering access from a designated</p><p class="Preformatted_20_Text">    place (gratis or for a charge), and offer equivalent access to the</p><p class="Preformatted_20_Text">    Corresponding Source in the same way through the same place at no</p><p class="Preformatted_20_Text">    further charge.  You need not require recipients to copy the</p><p class="Preformatted_20_Text">    Corresponding Source along with the object code.  If the place to</p><p class="Preformatted_20_Text">    copy the object code is a network server, the Corresponding Source</p><p class="Preformatted_20_Text">    may be on a different server (operated by you or a third party)</p><p class="Preformatted_20_Text">    that supports equivalent copying facilities, provided you maintain</p><p class="Preformatted_20_Text">    clear directions next to the object code saying where to find the</p><p class="Preformatted_20_Text">    Corresponding Source.  Regardless of what server hosts the</p><p class="Preformatted_20_Text">    Corresponding Source, you remain obligated to ensure that it is</p><p class="Preformatted_20_Text">    available for as long as needed to satisfy these requirements.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    e) Convey the object code using peer-to-peer transmission, provided</p><p class="Preformatted_20_Text">    you inform other peers where the object code and Corresponding</p><p class="Preformatted_20_Text">    Source of the work are being offered to the general public at no</p><p class="Preformatted_20_Text">    charge under subsection 6d.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  A separable portion of the object code, whose source code is excluded</p><p class="Preformatted_20_Text">from the Corresponding Source as a System Library, need not be</p><p class="Preformatted_20_Text">included in conveying the object code work.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  A "User Product" is either (1) a "consumer product", which means any</p><p class="Preformatted_20_Text">tangible personal property which is normally used for personal, family,</p><p class="Preformatted_20_Text">or household purposes, or (2) anything designed or sold for incorporation</p><p class="Preformatted_20_Text">into a dwelling.  In determining whether a product is a consumer product,</p><p class="Preformatted_20_Text">doubtful cases shall be resolved in favor of coverage.  For a particular</p><p class="Preformatted_20_Text">product received by a particular user, "normally used" refers to a</p><p class="Preformatted_20_Text">typical or common use of that class of product, regardless of the status</p><p class="Preformatted_20_Text">of the particular user or of the way in which the particular user</p><p class="Preformatted_20_Text">actually uses, or expects or is expected to use, the product.  A product</p><p class="Preformatted_20_Text">is a consumer product regardless of whether the product has substantial</p><p class="Preformatted_20_Text">commercial, industrial or non-consumer uses, unless such uses represent</p><p class="Preformatted_20_Text">the only significant mode of use of the product.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  "Installation Information" for a User Product means any methods,</p><p class="Preformatted_20_Text">procedures, authorization keys, or other information required to install</p><p class="Preformatted_20_Text">and execute modified versions of a covered work in that User Product from</p><p class="Preformatted_20_Text">a modified version of its Corresponding Source.  The information must</p><p class="Preformatted_20_Text">suffice to ensure that the continued functioning of the modified object</p><p class="Preformatted_20_Text">code is in no case prevented or interfered with solely because</p><p class="Preformatted_20_Text">modification has been made.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  If you convey an object code work under this section in, or with, or</p><p class="Preformatted_20_Text">specifically for use in, a User Product, and the conveying occurs as</p><p class="Preformatted_20_Text">part of a transaction in which the right of possession and use of the</p><p class="Preformatted_20_Text">User Product is transferred to the recipient in perpetuity or for a</p><p class="Preformatted_20_Text">fixed term (regardless of how the transaction is characterized), the</p><p class="Preformatted_20_Text">Corresponding Source conveyed under this section must be accompanied</p><p class="Preformatted_20_Text">by the Installation Information.  But this requirement does not apply</p><p class="Preformatted_20_Text">if neither you nor any third party retains the ability to install</p><p class="Preformatted_20_Text">modified object code on the User Product (for example, the work has</p><p class="Preformatted_20_Text">been installed in ROM).</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  The requirement to provide Installation Information does not include a</p><p class="Preformatted_20_Text">requirement to continue to provide support service, warranty, or updates</p><p class="Preformatted_20_Text">for a work that has been modified or installed by the recipient, or for</p><p class="Preformatted_20_Text">the User Product in which it has been modified or installed.  Access to a</p><p class="Preformatted_20_Text">network may be denied when the modification itself materially and</p><p class="Preformatted_20_Text">adversely affects the operation of the network or violates the rules and</p><p class="Preformatted_20_Text">protocols for communication across the network.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  Corresponding Source conveyed, and Installation Information provided,</p><p class="Preformatted_20_Text">in accord with this section must be in a format that is publicly</p><p class="Preformatted_20_Text">documented (and with an implementation available to the public in</p><p class="Preformatted_20_Text">source code form), and must require no special password or key for</p><p class="Preformatted_20_Text">unpacking, reading or copying.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  7. Additional Terms.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  "Additional permissions" are terms that supplement the terms of this</p><p class="Preformatted_20_Text">License by making exceptions from one or more of its conditions.</p><p class="Preformatted_20_Text">Additional permissions that are applicable to the entire Program shall</p><p class="Preformatted_20_Text">be treated as though they were included in this License, to the extent</p><p class="Preformatted_20_Text">that they are valid under applicable law.  If additional permissions</p><p class="Preformatted_20_Text">apply only to part of the Program, that part may be used separately</p><p class="Preformatted_20_Text">under those permissions, but the entire Program remains governed by</p><p class="Preformatted_20_Text">this License without regard to the additional permissions.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  When you convey a copy of a covered work, you may at your option</p><p class="Preformatted_20_Text">remove any additional permissions from that copy, or from any part of</p><p class="Preformatted_20_Text">it.  (Additional permissions may be written to require their own</p><p class="Preformatted_20_Text">removal in certain cases when you modify the work.)  You may place</p><p class="Preformatted_20_Text">additional permissions on material, added by you to a covered work,</p><p class="Preformatted_20_Text">for which you have or can give appropriate copyright permission.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  Notwithstanding any other provision of this License, for material you</p><p class="Preformatted_20_Text">add to a covered work, you may (if authorized by the copyright holders of</p><p class="Preformatted_20_Text">that material) supplement the terms of this License with terms:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    a) Disclaiming warranty or limiting liability differently from the</p><p class="Preformatted_20_Text">    terms of sections 15 and 16 of this License; or</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    b) Requiring preservation of specified reasonable legal notices or</p><p class="Preformatted_20_Text">    author attributions in that material or in the Appropriate Legal</p><p class="Preformatted_20_Text">    Notices displayed by works containing it; or</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    c) Prohibiting misrepresentation of the origin of that material, or</p><p class="Preformatted_20_Text">    requiring that modified versions of such material be marked in</p><p class="Preformatted_20_Text">    reasonable ways as different from the original version; or</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    d) Limiting the use for publicity purposes of names of licensors or</p><p class="Preformatted_20_Text">    authors of the material; or</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    e) Declining to grant rights under trademark law for use of some</p><p class="Preformatted_20_Text">    trade names, trademarks, or service marks; or</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    f) Requiring indemnification of licensors and authors of that</p><p class="Preformatted_20_Text">    material by anyone who conveys the material (or modified versions of</p><p class="Preformatted_20_Text">    it) with contractual assumptions of liability to the recipient, for</p><p class="Preformatted_20_Text">    any liability that these contractual assumptions directly impose on</p><p class="Preformatted_20_Text">    those licensors and authors.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  All other non-permissive additional terms are considered "further</p><p class="Preformatted_20_Text">restrictions" within the meaning of section 10.  If the Program as you</p><p class="Preformatted_20_Text">received it, or any part of it, contains a notice stating that it is</p><p class="Preformatted_20_Text">governed by this License along with a term that is a further</p><p class="Preformatted_20_Text">restriction, you may remove that term.  If a license document contains</p><p class="Preformatted_20_Text">a further restriction but permits relicensing or conveying under this</p><p class="Preformatted_20_Text">License, you may add to a covered work material governed by the terms</p><p class="Preformatted_20_Text">of that license document, provided that the further restriction does</p><p class="Preformatted_20_Text">not survive such relicensing or conveying.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  If you add terms to a covered work in accord with this section, you</p><p class="Preformatted_20_Text">must place, in the relevant source files, a statement of the</p><p class="Preformatted_20_Text">additional terms that apply to those files, or a notice indicating</p><p class="Preformatted_20_Text">where to find the applicable terms.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  Additional terms, permissive or non-permissive, may be stated in the</p><p class="Preformatted_20_Text">form of a separately written license, or stated as exceptions;</p><p class="Preformatted_20_Text">the above requirements apply either way.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  8. Termination.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  You may not propagate or modify a covered work except as expressly</p><p class="Preformatted_20_Text">provided under this License.  Any attempt otherwise to propagate or</p><p class="Preformatted_20_Text">modify it is void, and will automatically terminate your rights under</p><p class="Preformatted_20_Text">this License (including any patent licenses granted under the third</p><p class="Preformatted_20_Text">paragraph of section 11).</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  However, if you cease all violation of this License, then your</p><p class="Preformatted_20_Text">license from a particular copyright holder is reinstated (a)</p><p class="Preformatted_20_Text">provisionally, unless and until the copyright holder explicitly and</p><p class="Preformatted_20_Text">finally terminates your license, and (b) permanently, if the copyright</p><p class="Preformatted_20_Text">holder fails to notify you of the violation by some reasonable means</p><p class="Preformatted_20_Text">prior to 60 days after the cessation.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  Moreover, your license from a particular copyright holder is</p><p class="Preformatted_20_Text">reinstated permanently if the copyright holder notifies you of the</p><p class="Preformatted_20_Text">violation by some reasonable means, this is the first time you have</p><p class="Preformatted_20_Text">received notice of violation of this License (for any work) from that</p><p class="Preformatted_20_Text">copyright holder, and you cure the violation prior to 30 days after</p><p class="Preformatted_20_Text">your receipt of the notice.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  Termination of your rights under this section does not terminate the</p><p class="Preformatted_20_Text">licenses of parties who have received copies or rights from you under</p><p class="Preformatted_20_Text">this License.  If your rights have been terminated and not permanently</p><p class="Preformatted_20_Text">reinstated, you do not qualify to receive new licenses for the same</p><p class="Preformatted_20_Text">material under section 10.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  9. Acceptance Not Required for Having Copies.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  You are not required to accept this License in order to receive or</p><p class="Preformatted_20_Text">run a copy of the Program.  Ancillary propagation of a covered work</p><p class="Preformatted_20_Text">occurring solely as a consequence of using peer-to-peer transmission</p><p class="Preformatted_20_Text">to receive a copy likewise does not require acceptance.  However,</p><p class="Preformatted_20_Text">nothing other than this License grants you permission to propagate or</p><p class="Preformatted_20_Text">modify any covered work.  These actions infringe copyright if you do</p><p class="Preformatted_20_Text">not accept this License.  Therefore, by modifying or propagating a</p><p class="Preformatted_20_Text">covered work, you indicate your acceptance of this License to do so.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  10. Automatic Licensing of Downstream Recipients.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  Each time you convey a covered work, the recipient automatically</p><p class="Preformatted_20_Text">receives a license from the original licensors, to run, modify and</p><p class="Preformatted_20_Text">propagate that work, subject to this License.  You are not responsible</p><p class="Preformatted_20_Text">for enforcing compliance by third parties with this License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  An "entity transaction" is a transaction transferring control of an</p><p class="Preformatted_20_Text">organization, or substantially all assets of one, or subdividing an</p><p class="Preformatted_20_Text">organization, or merging organizations.  If propagation of a covered</p><p class="Preformatted_20_Text">work results from an entity transaction, each party to that</p><p class="Preformatted_20_Text">transaction who receives a copy of the work also receives whatever</p><p class="Preformatted_20_Text">licenses to the work the party's predecessor in interest had or could</p><p class="Preformatted_20_Text">give under the previous paragraph, plus a right to possession of the</p><p class="Preformatted_20_Text">Corresponding Source of the work from the predecessor in interest, if</p><p class="Preformatted_20_Text">the predecessor has it or can get it with reasonable efforts.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  You may not impose any further restrictions on the exercise of the</p><p class="Preformatted_20_Text">rights granted or affirmed under this License.  For example, you may</p><p class="Preformatted_20_Text">not impose a license fee, royalty, or other charge for exercise of</p><p class="Preformatted_20_Text">rights granted under this License, and you may not initiate litigation</p><p class="Preformatted_20_Text">(including a cross-claim or counterclaim in a lawsuit) alleging that</p><p class="Preformatted_20_Text">any patent claim is infringed by making, using, selling, offering for</p><p class="Preformatted_20_Text">sale, or importing the Program or any portion of it.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  11. Patents.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  A "contributor" is a copyright holder who authorizes use under this</p><p class="Preformatted_20_Text">License of the Program or a work on which the Program is based.  The</p><p class="Preformatted_20_Text">work thus licensed is called the contributor's "contributor version".</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  A contributor's "essential patent claims" are all patent claims</p><p class="Preformatted_20_Text">owned or controlled by the contributor, whether already acquired or</p><p class="Preformatted_20_Text">hereafter acquired, that would be infringed by some manner, permitted</p><p class="Preformatted_20_Text">by this License, of making, using, or selling its contributor version,</p><p class="Preformatted_20_Text">but do not include claims that would be infringed only as a</p><p class="Preformatted_20_Text">consequence of further modification of the contributor version.  For</p><p class="Preformatted_20_Text">purposes of this definition, "control" includes the right to grant</p><p class="Preformatted_20_Text">patent sublicenses in a manner consistent with the requirements of</p><p class="Preformatted_20_Text">this License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  Each contributor grants you a non-exclusive, worldwide, royalty-free</p><p class="Preformatted_20_Text">patent license under the contributor's essential patent claims, to</p><p class="Preformatted_20_Text">make, use, sell, offer for sale, import and otherwise run, modify and</p><p class="Preformatted_20_Text">propagate the contents of its contributor version.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  In the following three paragraphs, a "patent license" is any express</p><p class="Preformatted_20_Text">agreement or commitment, however denominated, not to enforce a patent</p><p class="Preformatted_20_Text">(such as an express permission to practice a patent or covenant not to</p><p class="Preformatted_20_Text">sue for patent infringement).  To "grant" such a patent license to a</p><p class="Preformatted_20_Text">party means to make such an agreement or commitment not to enforce a</p><p class="Preformatted_20_Text">patent against the party.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  If you convey a covered work, knowingly relying on a patent license,</p><p class="Preformatted_20_Text">and the Corresponding Source of the work is not available for anyone</p><p class="Preformatted_20_Text">to copy, free of charge and under the terms of this License, through a</p><p class="Preformatted_20_Text">publicly available network server or other readily accessible means,</p><p class="Preformatted_20_Text">then you must either (1) cause the Corresponding Source to be so</p><p class="Preformatted_20_Text">available, or (2) arrange to deprive yourself of the benefit of the</p><p class="Preformatted_20_Text">patent license for this particular work, or (3) arrange, in a manner</p><p class="Preformatted_20_Text">consistent with the requirements of this License, to extend the patent</p><p class="Preformatted_20_Text">license to downstream recipients.  "Knowingly relying" means you have</p><p class="Preformatted_20_Text">actual knowledge that, but for the patent license, your conveying the</p><p class="Preformatted_20_Text">covered work in a country, or your recipient's use of the covered work</p><p class="Preformatted_20_Text">in a country, would infringe one or more identifiable patents in that</p><p class="Preformatted_20_Text">country that you have reason to believe are valid.</p><p class="Preformatted_20_Text"/><p class="Preformatted_20_Text">  If, pursuant to or in connection with a single transaction or</p><p class="Preformatted_20_Text">arrangement, you convey, or propagate by procuring conveyance of, a</p><p class="Preformatted_20_Text">covered work, and grant a patent license to some of the parties</p><p class="Preformatted_20_Text">receiving the covered work authorizing them to use, propagate, modify</p><p class="Preformatted_20_Text">or convey a specific copy of the covered work, then the patent license</p><p class="Preformatted_20_Text">you grant is automatically extended to all recipients of the covered</p><p class="Preformatted_20_Text">work and works based on it.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  A patent license is "discriminatory" if it does not include within</p><p class="Preformatted_20_Text">the scope of its coverage, prohibits the exercise of, or is</p><p class="Preformatted_20_Text">conditioned on the non-exercise of one or more of the rights that are</p><p class="Preformatted_20_Text">specifically granted under this License.  You may not convey a covered</p><p class="Preformatted_20_Text">work if you are a party to an arrangement with a third party that is</p><p class="Preformatted_20_Text">in the business of distributing software, under which you make payment</p><p class="Preformatted_20_Text">to the third party based on the extent of your activity of conveying</p><p class="Preformatted_20_Text">the work, and under which the third party grants, to any of the</p><p class="Preformatted_20_Text">parties who would receive the covered work from you, a discriminatory</p><p class="Preformatted_20_Text">patent license (a) in connection with copies of the covered work</p><p class="Preformatted_20_Text">conveyed by you (or copies made from those copies), or (b) primarily</p><p class="Preformatted_20_Text">for and in connection with specific products or compilations that</p><p class="Preformatted_20_Text">contain the covered work, unless you entered into that arrangement,</p><p class="Preformatted_20_Text">or that patent license was granted, prior to 28 March 2007.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  Nothing in this License shall be construed as excluding or limiting</p><p class="Preformatted_20_Text">any implied license or other defenses to infringement that may</p><p class="Preformatted_20_Text">otherwise be available to you under applicable patent law.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  12. No Surrender of Others' Freedom.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  If conditions are imposed on you (whether by court order, agreement or</p><p class="Preformatted_20_Text">otherwise) that contradict the conditions of this License, they do not</p><p class="Preformatted_20_Text">excuse you from the conditions of this License.  If you cannot convey a</p><p class="Preformatted_20_Text">covered work so as to satisfy simultaneously your obligations under this</p><p class="Preformatted_20_Text">License and any other pertinent obligations, then as a consequence you may</p><p class="Preformatted_20_Text">not convey it at all.  For example, if you agree to terms that obligate you</p><p class="Preformatted_20_Text">to collect a royalty for further conveying from those to whom you convey</p><p class="Preformatted_20_Text">the Program, the only way you could satisfy both those terms and this</p><p class="Preformatted_20_Text">License would be to refrain entirely from conveying the Program.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  13. Use with the GNU Affero General Public License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  Notwithstanding any other provision of this License, you have</p><p class="Preformatted_20_Text">permission to link or combine any covered work with a work licensed</p><p class="Preformatted_20_Text">under version 3 of the GNU Affero General Public License into a single</p><p class="Preformatted_20_Text">combined work, and to convey the resulting work.  The terms of this</p><p class="Preformatted_20_Text">License will continue to apply to the part which is the covered work,</p><p class="Preformatted_20_Text">but the special requirements of the GNU Affero General Public License,</p><p class="Preformatted_20_Text">section 13, concerning interaction through a network will apply to the</p><p class="Preformatted_20_Text">combination as such.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  14. Revised Versions of this License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  The Free Software Foundation may publish revised and/or new versions of</p><p class="Preformatted_20_Text">the GNU General Public License from time to time.  Such new versions will</p><p class="Preformatted_20_Text">be similar in spirit to the present version, but may differ in detail to</p><p class="Preformatted_20_Text">address new problems or concerns.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  Each version is given a distinguishing version number.  If the</p><p class="Preformatted_20_Text">Program specifies that a certain numbered version of the GNU General</p><p class="Preformatted_20_Text">Public License "or any later version" applies to it, you have the</p><p class="Preformatted_20_Text">option of following the terms and conditions either of that numbered</p><p class="Preformatted_20_Text">version or of any later version published by the Free Software</p><p class="Preformatted_20_Text">Foundation.  If the Program does not specify a version number of the</p><p class="Preformatted_20_Text">GNU General Public License, you may choose any version ever published</p><p class="Preformatted_20_Text">by the Free Software Foundation.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  If the Program specifies that a proxy can decide which future</p><p class="Preformatted_20_Text">versions of the GNU General Public License can be used, that proxy's</p><p class="Preformatted_20_Text">public statement of acceptance of a version permanently authorizes you</p><p class="Preformatted_20_Text">to choose that version for the Program.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  Later license versions may give you additional or different</p><p class="Preformatted_20_Text">permissions.  However, no additional obligations are imposed on any</p><p class="Preformatted_20_Text">author or copyright holder as a result of your choosing to follow a</p><p class="Preformatted_20_Text">later version.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  15. Disclaimer of Warranty.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY</p><p class="Preformatted_20_Text">APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT</p><p class="Preformatted_20_Text">HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY</p><p class="Preformatted_20_Text">OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,</p><p class="Preformatted_20_Text">THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR</p><p class="Preformatted_20_Text">PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM</p><p class="Preformatted_20_Text">IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF</p><p class="Preformatted_20_Text">ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  16. Limitation of Liability.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING</p><p class="Preformatted_20_Text">WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS</p><p class="Preformatted_20_Text">THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY</p><p class="Preformatted_20_Text">GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE</p><p class="Preformatted_20_Text">USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF</p><p class="Preformatted_20_Text">DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD</p><p class="Preformatted_20_Text">PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),</p><p class="Preformatted_20_Text">EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF</p><p class="Preformatted_20_Text">SUCH DAMAGES.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  17. Interpretation of Sections 15 and 16.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  If the disclaimer of warranty and limitation of liability provided</p><p class="Preformatted_20_Text">above cannot be given local legal effect according to their terms,</p><p class="Preformatted_20_Text">reviewing courts shall apply local law that most closely approximates</p><p class="Preformatted_20_Text">an absolute waiver of all civil liability in connection with the</p><p class="Preformatted_20_Text">Program, unless a warranty or assumption of liability accompanies a</p><p class="Preformatted_20_Text">copy of the Program in return for a fee.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">                     END OF TERMS AND CONDITIONS</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">            How to Apply These Terms to Your New Programs</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  If you develop a new program, and you want it to be of the greatest</p><p class="Preformatted_20_Text">possible use to the public, the best way to achieve this is to make it</p><p class="Preformatted_20_Text">free software which everyone can redistribute and change under these terms.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  To do so, attach the following notices to the program.  It is safest</p><p class="Preformatted_20_Text">to attach them to the start of each source file to most effectively</p><p class="Preformatted_20_Text">state the exclusion of warranty; and each file should have at least</p><p class="Preformatted_20_Text">the "copyright" line and a pointer to where the full notice is found.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    </p><p class="Preformatted_20_Text">    Copyright (C)   </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    This program is free software: you can redistribute it and/or modify</p><p class="Preformatted_20_Text">    it under the terms of the GNU General Public License as published by</p><p class="Preformatted_20_Text">    the Free Software Foundation, either version 3 of the License, or</p><p class="Preformatted_20_Text">    (at your option) any later version.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    This program is distributed in the hope that it will be useful,</p><p class="Preformatted_20_Text">    but WITHOUT ANY WARRANTY; without even the implied warranty of</p><p class="Preformatted_20_Text">    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</p><p class="Preformatted_20_Text">    GNU General Public License for more details.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    You should have received a copy of the GNU General Public License</p><p class="Preformatted_20_Text">    along with this program.  If not, see .</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Also add information on how to contact you by electronic and paper mail.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  If the program does terminal interaction, make it output a short</p><p class="Preformatted_20_Text">notice like this when it starts in an interactive mode:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      Copyright (C)   </p><p class="Preformatted_20_Text">    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.</p><p class="Preformatted_20_Text">    This is free software, and you are welcome to redistribute it</p><p class="Preformatted_20_Text">    under certain conditions; type `show c' for details.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">The hypothetical commands `show w' and `show c' should show the appropriate</p><p class="Preformatted_20_Text">parts of the General Public License.  Of course, your program's commands</p><p class="Preformatted_20_Text">might be different; for a GUI interface, you would use an "about box".</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  You should also get your employer (if you work as a programmer) or school,</p><p class="Preformatted_20_Text">if any, to sign a "copyright disclaimer" for the program, if necessary.</p><p class="Preformatted_20_Text">For more information on this, and how to apply and follow the GNU GPL, see</p><p class="Preformatted_20_Text">.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  The GNU General Public License does not permit incorporating your program</p><p class="Preformatted_20_Text">into proprietary programs.  If your program is a subroutine library, you</p><p class="Preformatted_20_Text">may consider it more useful to permit linking proprietary applications with</p><p class="Preformatted_20_Text">the library.  If this is what you want to do, use the GNU Lesser General</p><p class="Preformatted_20_Text">Public License instead of this License.  But first, please read</p><p class="Preformatted_20_Text">.</p><p class="P2"> </p><p class="Horizontal_20_Line"/><p class="P2"> </p><p class="P13">DO NOT TRANSLATE OR LOCALIZE THIS DOCUMENT </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product:Bitstram Vera Fonts; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Bitstream__Inc_"><span/></a>Bitstream, Inc. </h2><h3 class="Heading_20_3"><a id="a__Bitstream_Vera_Fonts"><span/></a>Bitstream Vera Fonts</h3><p class="P11"><span class="Emphasis">Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc. <br/><br/>Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license (“Fontsâ€�) and associated documentation files (the “Font Softwareâ€�), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions: <br/><br/>The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces.<br/><br/>The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words “Bitstreamâ€� or the word “Veraâ€�.<br/><br/>This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the “Bitstream Veraâ€� names. <br/><br/>The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself. <br/><br/>THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. <br/><br/>Except as contained in this notice, the names of Gnome, the Gnome Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org. </span></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product:BerkeleyDB; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Sleepycat_Software"><span/></a>Sleepycat Software </h2><h3 class="Heading_20_3"><a id="a__BerkeleyDB"><span/></a>BerkeleyDB</h3><p class="Text_20_body">&gt; </p><p class="Preformatted_20_Text">=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=</p><p class="Preformatted_20_Text">/*</p><p class="Preformatted_20_Text"> * Copyright (c) 1990-2004</p><p class="Preformatted_20_Text"> *      Sleepycat Software.  All rights reserved.</p><p class="Preformatted_20_Text"> *</p><p class="Preformatted_20_Text"> * Redistribution and use in source and binary forms, with or without</p><p class="Preformatted_20_Text"> * modification, are permitted provided that the following conditions</p><p class="Preformatted_20_Text"> * are met:</p><p class="Preformatted_20_Text"> * 1. Redistributions of source code must retain the above copyright</p><p class="Preformatted_20_Text"> *    notice, this list of conditions and the following disclaimer.</p><p class="Preformatted_20_Text"> * 2. Redistributions in binary form must reproduce the above copyright</p><p class="Preformatted_20_Text"> *    notice, this list of conditions and the following disclaimer in the</p><p class="Preformatted_20_Text"> *    documentation and/or other materials provided with the distribution.</p><p class="Preformatted_20_Text"> * 3. Redistributions in any form must be accompanied by information on</p><p class="Preformatted_20_Text"> *    how to obtain complete source code for the DB software and any</p><p class="Preformatted_20_Text"> *    accompanying software that uses the DB software.  The source code</p><p class="Preformatted_20_Text"> *    must either be included in the distribution or be available for no</p><p class="Preformatted_20_Text"> *    more than the cost of distribution plus a nominal fee, and must be</p><p class="Preformatted_20_Text"> *    freely redistributable under reasonable conditions.  For an</p><p class="Preformatted_20_Text"> *    executable file, complete source code means the source code for all</p><p class="Preformatted_20_Text"> *    modules it contains.  It does not include source code for modules or</p><p class="Preformatted_20_Text"> *    files that typically accompany the major components of the operating</p><p class="Preformatted_20_Text"> *    system on which the executable file runs.</p><p class="Preformatted_20_Text"> *</p><p class="Preformatted_20_Text"> * THIS SOFTWARE IS PROVIDED BY SLEEPYCAT SOFTWARE ``AS IS'' AND ANY EXPRESS</p><p class="Preformatted_20_Text"> * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</p><p class="Preformatted_20_Text"> * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR</p><p class="Preformatted_20_Text"> * NON-INFRINGEMENT, ARE DISCLAIMED.  IN NO EVENT SHALL SLEEPYCAT SOFTWARE</p><p class="Preformatted_20_Text"> * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</p><p class="Preformatted_20_Text"> * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</p><p class="Preformatted_20_Text"> * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</p><p class="Preformatted_20_Text"> * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</p><p class="Preformatted_20_Text"> * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</p><p class="Preformatted_20_Text"> * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</p><p class="Preformatted_20_Text"> * THE POSSIBILITY OF SUCH DAMAGE.</p><p class="Preformatted_20_Text"> */</p><p class="Preformatted_20_Text">/*</p><p class="Preformatted_20_Text"> * Copyright (c) 1990, 1993, 1994, 1995</p><p class="Preformatted_20_Text"> *      The Regents of the University of California.  All rights reserved.</p><p class="Preformatted_20_Text"> *</p><p class="Preformatted_20_Text"> * Redistribution and use in source and binary forms, with or without</p><p class="Preformatted_20_Text"> * modification, are permitted provided that the following conditions</p><p class="Preformatted_20_Text"> * are met:</p><p class="Preformatted_20_Text"> * 1. Redistributions of source code must retain the above copyright</p><p class="Preformatted_20_Text"> *    notice, this list of conditions and the following disclaimer.</p><p class="Preformatted_20_Text"> * 2. Redistributions in binary form must reproduce the above copyright</p><p class="Preformatted_20_Text"> *    notice, this list of conditions and the following disclaimer in the</p><p class="Preformatted_20_Text"> *    documentation and/or other materials provided with the distribution.</p><p class="Preformatted_20_Text"> * 3. Neither the name of the University nor the names of its contributors</p><p class="Preformatted_20_Text"> *    may be used to endorse or promote products derived from this software</p><p class="Preformatted_20_Text"> *    without specific prior written permission.</p><p class="Preformatted_20_Text"> *</p><p class="Preformatted_20_Text"> * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND</p><p class="Preformatted_20_Text"> * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</p><p class="Preformatted_20_Text"> * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</p><p class="Preformatted_20_Text"> * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE</p><p class="Preformatted_20_Text"> * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL</p><p class="Preformatted_20_Text"> * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS</p><p class="Preformatted_20_Text"> * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)</p><p class="Preformatted_20_Text"> * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT</p><p class="Preformatted_20_Text"> * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY</p><p class="Preformatted_20_Text"> * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF</p><p class="Preformatted_20_Text"> * SUCH DAMAGE.</p><p class="Preformatted_20_Text"> */</p><p class="Preformatted_20_Text">/*</p><p class="Preformatted_20_Text"> * Copyright (c) 1995, 1996</p><p class="Preformatted_20_Text"> *      The President and Fellows of Harvard University.  All rights reserved.</p><p class="Preformatted_20_Text"> *</p><p class="Preformatted_20_Text"> * Redistribution and use in source and binary forms, with or without</p><p class="Preformatted_20_Text"> * modification, are permitted provided that the following conditions</p><p class="Preformatted_20_Text"> * are met:</p><p class="Preformatted_20_Text"> * 1. Redistributions of source code must retain the above copyright</p><p class="Preformatted_20_Text"> *    notice, this list of conditions and the following disclaimer.</p><p class="Preformatted_20_Text"> * 2. Redistributions in binary form must reproduce the above copyright</p><p class="Preformatted_20_Text"> *    notice, this list of conditions and the following disclaimer in the</p><p class="Preformatted_20_Text"> *    documentation and/or other materials provided with the distribution.</p><p class="Preformatted_20_Text"> * 3. Neither the name of the University nor the names of its contributors</p><p class="Preformatted_20_Text"> *    may be used to endorse or promote products derived from this software</p><p class="Preformatted_20_Text"> *    without specific prior written permission.</p><p class="Preformatted_20_Text"> *</p><p class="Preformatted_20_Text"> * THIS SOFTWARE IS PROVIDED BY HARVARD AND ITS CONTRIBUTORS ``AS IS'' AND</p><p class="Preformatted_20_Text"> * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</p><p class="Preformatted_20_Text"> * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</p><p class="Preformatted_20_Text"> * ARE DISCLAIMED.  IN NO EVENT SHALL HARVARD OR ITS CONTRIBUTORS BE LIABLE</p><p class="Preformatted_20_Text"> * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL</p><p class="Preformatted_20_Text"> * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS</p><p class="Preformatted_20_Text"> * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)</p><p class="Preformatted_20_Text"> * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT</p><p class="Preformatted_20_Text"> * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY</p><p class="Preformatted_20_Text"> * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF</p><p class="Preformatted_20_Text"> * SUCH DAMAGE.</p><p class="Preformatted_20_Text"> */</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text"> </p><p class="P2"> </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product:Czech thesaurus database; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Pavel_Rychly__Pavel_Smrz__{pary_smrz}@fi_muni_cz__NLPlab__Faculty_of_Informatics__Masaryk_University"><span/></a>Pavel Rychly, Pavel Smrz, {pary,smrz}@fi.muni.cz, NLPlab, Faculty of Informatics, Masaryk University </h2><h3 class="Heading_20_3"><a id="a__Czech_Thesaurus_Database"><span/></a>Czech Thesaurus Database</h3><p class="P11">Copyright (c) 2002 Pavel Rychly, Pavel Smrz, {pary,smrz}@fi.muni.cz, NLPlab, Faculty of Informatics, Masaryk University <br/>Permission is hereby granted, free of charge, to any person obtaining a copy of this data (the "Data"), to deal in the Data without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Data, and to permit persons to whom the Data is furnished to do so, subject to the following conditions: <br/>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Data. <br/>THE DATA ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE DATA OR THE USE OR OTHER DEALINGS IN THE DATA. </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product:Generic Polygon Clipper (GPC); Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Alan_Murta"><span/></a>Alan Murta </h2><h3 class="Heading_20_3"><a id="a__GPC"><span/></a>GPC</h3><p class="P11">Copyright: (C) 1997-1999, Advanced Interfaces Group, University of Manchester. <br/>This software is free for non-commercial use. It may be copied, modified, and redistributed provided that this copyright notice is preserved on all copies. The intellectual property rights of the algorithms used reside with the University of Manchester Advanced Interfaces Group. <br/>You may not use this software, in whole or in part, in support of any commercial product without the express consent of the author. <br/>There is no warranty or other guarantee of fitness of this software for any purpose. It is provided solely "as is". </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: LaTeX dictinary data; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__LaTeX3_Project"><span/></a>LaTeX3 Project </h2><h3 class="Heading_20_3"><a id="a__LPPL_version_1_3b"><span/></a>LPPL version 1.3b</h3><p class="P11">The LaTeX Project Public License <br/>=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- <br/><br/>LPPL Version 1.3b 2006-01-07 <br/><br/>Copyright 1999 2002-2006 LaTeX3 Project <br/>Everyone is allowed to distribute verbatim copies of this license document, but modification of it is not allowed. <br/>PREAMBLE <br/>======== <br/>The LaTeX Project Public License (LPPL) is the primary license under which the the LaTeX kernel and the base LaTeX packages are distributed. <br/>You may use this license for any work of which you hold the copyright and which you wish to distribute. This license may be particularly suitable if your work is TeX-related (such as a LaTeX package), but you may use it with small modifications even if your work is unrelated to TeX. <br/>The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE', below, gives instructions, examples, and recommendations for authors who are considering distributing their works under this license. <br/>This license gives conditions under which a work may be distributed and modified, as well as conditions under which modified versions of that work may be distributed. <br/>We, the LaTeX3 Project, believe that the conditions below give you the freedom to make and distribute modified versions of your work that conform with whatever technical specifications you wish while maintaining the availability, integrity, and reliability of that work. If you do not see how to achieve your goal while meeting these conditions, then read the document `cfgguide.tex' and `modguide.tex' in the base LaTeX distribution for suggestions. <br/><br/>DEFINITIONS <br/>=========== <br/><br/>In this license document the following terms are used: <br/>`Work' Any work being distributed under this License. <br/>`Derived Work' Any work that under any applicable law is derived from the Work. <br/>`Modification' Any procedure that produces a Derived Work under any applicable law -- for example, the production of a file containing an original file associated with the Work or a significant portion of such a file, either verbatim or with modifications and/or translated into another language. <br/>`Modify' To apply any procedure that produces a Derived Work under any applicable law. <br/>`Distribution' Making copies of the Work available from one person to another, in whole or in part. Distribution includes (but is not limited to) making any electronic components of the Work accessible by file transfer protocols such as FTP or HTTP or by shared file systems such as Sun's Network File System (NFS). <br/>`Compiled Work' A version of the Work that has been processed into a form where it is directly usable on a computer system. This processing may include using installation facilities provided by the Work, transformations of the Work, copying of components of the Work, or other activities. Note that modification of any installation facilities provided by the Work constitutes modification of the Work. <br/>`Current Maintainer' A person or persons nominated as such within the Work. If there is no such explicit nomination then it is the `Copyright Holder' under any applicable law. <br/>`Base Interpreter' A program or process that is normally needed for running or interpreting a part or the whole of the Work. <br/>A Base Interpreter may depend on external components but these are not considered part of the Base Interpreter provided that each external component clearly identifies itself whenever it is used interactively. Unless explicitly specified when applying the license to the Work, the only applicable Base Interpreter is a `LaTeX-Format' or in the case of files belonging to the `LaTeX-format' a program implementing the `TeX language'. <br/><br/>CONDITIONS ON DISTRIBUTION AND MODIFICATION <br/>=========================================== <br/><br/>1. Activities other than distribution and/or modification of the Work are not covered by this license; they are outside its scope. In particular, the act of running the Work is not restricted and no requirements are made concerning any offers of support for the Work. <br/>2. You may distribute a complete, unmodified copy of the Work as you received it. Distribution of only part of the Work is considered modification of the Work, and no right to distribute such a Derived Work may be assumed under the terms of this clause. <br/>3. You may distribute a Compiled Work that has been generated from a complete, unmodified copy of the Work as distributed under Clause 2 above, as long as that Compiled Work is distributed in such a way that the recipients may install the Compiled Work on their system exactly as it would have been installed if they generated a Compiled Work directly from the Work. <br/>4. If you are the Current Maintainer of the Work, you may, without restriction, modify the Work, thus creating a Derived Work. You may also distribute the Derived Work without restriction, including Compiled Works generated from the Derived Work. Derived Works distributed in this manner by the Current Maintainer are considered to be updated versions of the Work. <br/>5. If you are not the Current Maintainer of the Work, you may modify your copy of the Work, thus creating a Derived Work based on the Work, and compile this Derived Work, thus creating a Compiled Work based on the Derived Work. <br/>6. If you are not the Current Maintainer of the Work, you may distribute a Derived Work provided the following conditions are met for every component of the Work unless that component clearly states in the copyright notice that it is exempt from that condition. Only the Current Maintainer is allowed to add such statements of exemption to a component of the Work. <br/>a. If a component of this Derived Work can be a direct replacement for a component of the Work when that component is used with the Base Interpreter, then, wherever this component of the Work identifies itself to the user when used interactively with that Base Interpreter, the replacement component of this Derived Work clearly and unambiguously identifies itself as a modified version of this component to the user when used interactively with that Base Interpreter. <br/>b. Every component of the Derived Work contains prominent notices detailing the nature of the changes to that component, or a prominent reference to another file that is distributed as part of the Derived Work and that contains a complete and accurate log of the changes. <br/>c. No information in the Derived Work implies that any persons, including (but not limited to) the authors of the original version of the Work, provide any support, including (but not limited to) the reporting and handling of errors, to recipients of the Derived Work unless those persons have stated explicitly that they do provide such support for the Derived Work. <br/>d. You distribute at least one of the following with the Derived Work: <br/>1. A complete, unmodified copy of the Work; if your distribution of a modified component is made by offering access to copy the modified component from a designated place, then offering equivalent access to copy the Work from the same or some similar place meets this condition, even though third parties are not compelled to copy the Work along with the modified component; <br/>2. Information that is sufficient to obtain a complete, unmodified copy of the Work. <br/>7. If you are not the Current Maintainer of the Work, you may distribute a Compiled Work generated from a Derived Work, as long as the Derived Work is distributed to all recipients of the Compiled Work, and as long as the conditions of Clause 6, above, are met with regard to the Derived Work. <br/>8. The conditions above are not intended to prohibit, and hence do not apply to, the modification, by any method, of any component so that it becomes identical to an updated version of that component of the Work as it is distributed by the Current Maintainer under Clause 4, above. <br/>9. Distribution of the Work or any Derived Work in an alternative format, where the Work or that Derived Work (in whole or in part) is then produced by applying some process to that format, does not relax or nullify any sections of this license as they pertain to the results of applying that process. <br/>10. a. A Derived Work may be distributed under a different license provided that license itself honors the conditions listed in Clause 6 above, in regard to the Work, though it does not have to honor the rest of the conditions in this license. <br/>b. If a Derived Work is distributed under a different license, that Derived Work must provide sufficient documentation as part of itself to allow each recipient of that Derived Work to honor the restrictions in Clause 6 above, concerning changes from the Work. <br/>11. This license places no restrictions on works that are unrelated to the Work, nor does this license place any restrictions on aggregating such works with the Work by any means. <br/>12. Nothing in this license is intended to, or may be used to, prevent complete compliance by all parties with all applicable laws. <br/>NO WARRANTY <br/>=========== <br/><br/>There is no warranty for the Work. Except when otherwise stated in writing, the Copyright Holder provides the Work `as is', without warranty of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose. The entire risk as to the quality and performance of the Work is with you. Should the Work prove defective, you assume the cost of all necessary servicing, repair, or correction. <br/>In no event unless required by applicable law or agreed to in writing will The Copyright Holder, or any author named in the components of the Work, or any other party who may distribute and/or modify the Work as permitted above, be liable to you for damages, including any general, special, incidental or consequential damages arising out of any use of the Work or out of inability to use the Work (including, but not limited to, loss of data, data being rendered inaccurate, or losses sustained by anyone as a result of any failure of the Work to operate with any other programs), even if the Copyright Holder or said author or said other party has been advised of the possibility of such damages. <br/><br/>MAINTENANCE OF THE WORK <br/>======================= <br/><br/>The Work has the status `author-maintained' if the Copyright Holder explicitly and prominently states near the primary copyright notice in the Work that the Work can only be maintained by the Copyright Holder or simply that it is `author-maintained'. <br/>The Work has the status `maintained' if there is a Current Maintainer who has indicated in the Work that they are willing to receive error reports for the Work (for example, by supplying a valid e-mail address). It is not required for the Current Maintainer to acknowledge or act upon these error reports. <br/>The Work changes from status `maintained' to `unmaintained' if there is no Current Maintainer, or the person stated to be Current Maintainer of the work cannot be reached through the indicated means of communication for a period of six months, and there are no other significant signs of active maintenance. <br/>You can become the Current Maintainer of the Work by agreement with any existing Current Maintainer to take over this role. <br/>If the Work is unmaintained, you can become the Current Maintainer of the Work through the following steps: <br/>1. Make a reasonable attempt to trace the Current Maintainer (and the Copyright Holder, if the two differ) through the means of an Internet or similar search. <br/>2. If this search is successful, then enquire whether the Work is still maintained. <br/>a. If it is being maintained, then ask the Current Maintainer to update their communication data within one month. <br/>b. If the search is unsuccessful or no action to resume active maintenance is taken by the Current Maintainer, then announce within the pertinent community your intention to take over maintenance. (If the Work is a LaTeX work, this could be done, for example, by posting to comp.text.tex.) <br/>3a. If the Current Maintainer is reachable and agrees to pass maintenance of the Work to you, then this takes effect immediately upon announcement. <br/>b. If the Current Maintainer is not reachable and the Copyright Holder agrees that maintenance of the Work be passed to you, then this takes effect immediately upon announcement. <br/>4. If you make an `intention announcement' as described in 2b. above and after three months your intention is challenged neither by the Current Maintainer nor by the Copyright Holder nor by other people, then you may arrange for the Work to be changed so as to name you as the (new) Current Maintainer. <br/>5. If the previously unreachable Current Maintainer becomes reachable once more within three months of a change completed under the terms of 3b) or 4), then that Current Maintainer must become or remain the Current Maintainer upon request provided they then update their communication data within one month. <br/>A change in the Current Maintainer does not, of itself, alter the fact that the Work is distributed under the LPPL license. <br/>If you become the Current Maintainer of the Work, you should immediately provide, within the Work, a prominent and unambiguous statement of your status as Current Maintainer. You should also announce your new status to the same pertinent community as in 2b) above. <br/><br/>WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE <br/>====================================================== <br/><br/>This section contains important instructions, examples, and recommendations for authors who are considering distributing their works under this license. These authors are addressed as `you' in this section. <br/>Choosing This License or Another License <br/>---------------------------------------- <br/><br/>If for any part of your work you want or need to use *distribution* conditions that differ significantly from those in this license, then do not refer to this license anywhere in your work but, instead, distribute your work under a different license. You may use the text of this license as a model for your own license, but your license should not refer to the LPPL or otherwise give the impression that your work is distributed under the LPPL. <br/>The document `modguide.tex' in the base LaTeX distribution explains the motivation behind the conditions of this license. It explains, for example, why distributing LaTeX under the GNU General Public License (GPL) was considered inappropriate. Even if your work is unrelated to LaTeX, the discussion in `modguide.tex' may still be relevant, and authors intending to distribute their works under any license are encouraged to read it. <br/><br/>A Recommendation on Modification Without Distribution <br/>----------------------------------------------------- <br/><br/>It is wise never to modify a component of the Work, even for your own personal use, without also meeting the above conditions for distributing the modified component. While you might intend that such modifications will never be distributed, often this will happen by accident -- you may forget that you have modified that component; or it may not occur to you when allowing others to access the modified version that you are thus distributing it and violating the conditions of this license in ways that could have legal implications and, worse, cause problems for the community. It is therefore usually in your best interest to keep your copy of the Work identical with the public one. Many works provide ways to control the behavior of that work without altering any of its licensed components. <br/><br/>How to Use This License <br/>----------------------- <br/><br/>To use this license, place in each of the components of your work both an explicit copyright notice including your name and the year the work was authored and/or last substantially modified. Include also a statement that the distribution and/or modification of that component is constrained by the conditions in this license. <br/>Here is an example of such a notice and statement: <br/>%% pig.dtx %% Copyright 2005 M. Y. Name % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt % and version 1.3 or later is part of all distributions of LaTeX % version 2005/12/01 or later. % % This work has the LPPL maintenance status `maintained'. % % The Current Maintainer of this work is M. Y. Name. % % This work consists of the files pig.dtx and pig.ins % and the derived file pig.sty. <br/>Given such a notice and statement in a file, the conditions given in this license document would apply, with the `Work' referring to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being generated from `pig.dtx' using `pig.ins'), the `Base Interpreter' referring to any `LaTeX-Format', and both `Copyright Holder' and `Current Maintainer' referring to the person `M. Y. Name'. <br/>If you do not want the Maintenance section of LPPL to apply to your Work, change `maintained' above into `author-maintained'. However, we recommend that you use `maintained', as the Maintenance section was added in order to ensure that your Work remains useful to the community even when you can no longer maintain and support it yourself. <br/><br/>Derived Works That Are Not Replacements <br/>--------------------------------------- <br/><br/>Several clauses of the LPPL specify means to provide reliability and stability for the user community. They therefore concern themselves with the case that a Derived Work is intended to be used as a (compatible or incompatible) replacement of the original Work. If this is not the case (e.g., if a few lines of code are reused for a completely different task), then clauses 6b and 6d shall not apply. <br/><br/>Important Recommendations <br/>------------------------- <br/><br/>Defining What Constitutes the Work <br/>The LPPL requires that distributions of the Work contain all the files of the Work. It is therefore important that you provide a way for the licensee to determine which files constitute the Work. This could, for example, be achieved by explicitly listing all the files of the Work near the copyright notice of each file or by using a line such as: <br/>% This work consists of all files listed in manifest.txt. <br/>in that place. In the absence of an unequivocal list it might be impossible for the licensee to determine what is considered by you to comprise the Work and, in such a case, the licensee would be entitled to make reasonable conjectures as to which files comprise the Work. </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product:MS Runtime Libraries; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Microsoft_Corporation"><span/></a>Microsoft Corporation </h2><h3 class="Heading_20_3"><a id="a__Runtime_Libraries"><span/></a>Runtime Libraries</h3><p class="P11">Microsoft .NET Framework Redistributable EULA <br/>SUPPLEMENTAL END-USER LICENSE AGREEMENT FOR MICROSOFT SOFTWARE <br/>IMPORTANT: <br/>READ CAREFULLY— <br/>These Microsoft Corporation ("Microsoft")<br/>operating system components, including any "online" or electronic<br/>documentation ("OS Components") are subject to the terms and <br/>conditions of the agreement under which you have licensed the <br/>applicable Microsoft operating system product ("OS Product") <br/>described below (each an "End User License Agreement" or "EULA") <br/>and the terms and conditions of this Supplemental EULA. BY INSTALLING, <br/>COPYING OR OTHERWISE USING THE OS COMPONENTS, YOU AGREE TO BE BOUND <br/>BY THE TERMS AND CONDITIONS OF THE APPLICABLE OS PRODUCT EULA AND <br/>THIS SUPPLEMENTAL EULA. IF YOU DO NOT AGREE TO THESE TERMS AND <br/>CONDITIONS, DO NOT INSTALL, COPY OR USE THE OS COMPONENTS. <br/>NOTE: IF YOU DO NOT HAVE A VALID EULA FOR ANY "OS PRODUCT" <br/>(MICROSOFT WINDOWS 98, WINDOWS ME, WINDOWS NT 4.0 (DESKTOP <br/>EDITION), WINDOWS 2000 OPERATING SYSTEM, WINDOWS XP PROFESSIONAL <br/>AND/OR WINDOWS XP HOME EDITION), YOU ARE NOT AUTHORIZED TO INSTALL, <br/>COPY OR OTHERWISE USE THE OS COMPONENTS AND YOU HAVE NO RIGHTS UNDER <br/>THIS SUPPLEMENTAL EULA. <br/>Capitalized terms used in this Supplemental EULA and not otherwise <br/>defined herein shall have the meanings assigned to them in the <br/>applicable OS Product EULA. <br/>General. The OS Components are provided to you by Microsoft to update, <br/>supplement, or replace existing functionality of the applicable OS <br/>Product Microsoft grants you a license to use the OS Components <br/>under the terms and conditions of the OS Product EULA for the applicable <br/>OS Product (which are hereby incorporated by reference) and the terms <br/>and conditions set forth in this Supplemental EULA, provided that you <br/>comply with all such terms and conditions. To the extent that any terms <br/>in this Supplemental EULA conflict with terms in the applicable OS <br/>Product EULA, the terms of this Supplemental EULA control solely with <br/>respect to the OS Components. <br/>Additional Rights and Limitations. <br/>*If you have multiple validly licensed copies of the applicable OS <br/>Product(s), you may reproduce, install and use one copy of the OS <br/>Components as part of such applicable OS Product(s) on all of your <br/>computers running validly licensed copies of the OS Product(s) <br/>provided that you use such additional copies of the OS Components <br/>in accordance with the terms and conditions above. You may not <br/>disclose the results of any benchmark test of the .NET Framework <br/>component of the OS Components to any third party without Microsoft's <br/>prior written approval. Microsoft retains all right, title and<br/>interest in and to the OS Components. All rights not expressly granted <br/>are reserved by Microsoft. <br/>IF THE APPLICABLE OS PRODUCT WAS LICENSED TO YOU BY MICROSOFT OR ANY <br/>OF ITS WHOLLY OWNED SUBSIDIARIES, THE LIMITED WARRANTY (IF ANY) <br/>INCLUDED IN THE APPLICABLE OS PRODUCT EULA APPLIES TO THE OS COMPONENTS <br/>PROVIDED THE OS COMPONENTS HAVE BEEN LICENSED BY YOU WITHIN THE TERM OF <br/>THE LIMITED WARRANTY IN THE APPLICABLE OS PRODUCT EULA. HOWEVER, THIS <br/>SUPPLEMENTAL EULA DOES NOT EXTEND THE TIME PERIOD FOR WHICH THE LIMITED <br/>WARRANTY IS PROVIDED. <br/>IF THE APPLICABLE OS PRODUCT WAS LICENSED TO YOU BY AN ENTITY OTHER THAN <br/>MICROSOFT OR ANY OF ITS WHOLLY OWNED SUBSIDIARIES, MICROSOFT DISCLAIMS <br/>ALL WARRANTIES WITH RESPECT TO THE OS COMPONENTS AS FOLLOWS: <br/>DISCLAIMER OF WARRANTIES. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE <br/>LAW, MICROSOFT AND ITS SUPPLIERS PROVIDE TO YOU THE OS COMPONENTS, AND <br/>ANY (IF ANY) SUPPORT SERVICES RELATED TO THE OS COMPONENTS ("SUPPORT <br/>SERVICES") <span class="T1">AS IS AND WITH ALL FAULTS;</span> and Microsoft and its suppliers <br/>hereby disclaim with respect to THE os COMPONENTS AND SUPPORT SERVICES <br/>all warranties and conditions, whether express, implied or statutory, <br/>including, but not limited to, any (if any) warranties or conditions <br/>of OR RELATED TO: TITLE, NON-INFRINGEMENT, merchantability, fitness <br/>for a particular purpose, lack of viruses, accuracy or completeness <br/>of responses, results, lack of negligence or lack of workmanlike effort, <br/>QUIET ENJOYMENT, QUIET POSSESSION, AND CORRESPONDENCE TO DESCRIPTION. <br/>The entire risk arising out of use or performance of the OS Components <br/>AND ANY SUPPORT SERVICES remains with you. <br/>EXCLUSION OF INCIDENTAL, CONSEQUENTIAL AND CERTAIN OTHER DAMAGES. To <br/>the maximum extent permitted by applicable law, in no event shall <br/>Microsoft or its suppliers be liable for any special, incidental, <br/>indirect, or consequential damages whatsoever (including, but not <br/>limited to, damages for: loss of profits, LOSS OF confidential or <br/>other information, business interruption, personal injury, loss of <br/>privacy, failure to meet any duty (including of good faith or of <br/>reasonable care), negligence, and any other pecuniary or other loss <br/>whatsoever) arising out of or in any way related to the use of or <br/>inability to use the OS Components OR THE SUPPORT SERVICES, OR the <br/>provision of or failure to provide Support Services, or otherwise <br/>under or in connection with any provision of this Supplemental EULA, <br/>even if Microsoft or any supplier has been advised of the possibility <br/>of such damages. <br/>LIMITATION OF LIABILITY AND REMEDIES. NOTWITHSTANDING ANY DAMAGES THAT <br/>YOU MIGHT INCUR FOR ANY REASON WHATSOEVER (INCLUDING, WITHOUT <br/>LIMITATION, ALL DAMAGES REFERENCED ABOVE AND ALL DIRECT OR GENERAL <br/>DAMAGES), THE ENTIRE LIABILITY OF MICROSOFT AND ANY OF ITS SUPPLIERS <br/>UNDER ANY PROVISION OF THIS SUPPLEMENTAL EULA AND YOUR EXCLUSIVE <br/>REMEDY FOR ALL OF THE FOREGOING SHALL BE LIMITED TO THE GREATER OF <br/>THE AMOUNT ACTUALLY PAID BY YOU FOR THE OS COMPONENTS OR U.S.$5.00. <br/>THE FOREGOING LIMITATIONS, EXCLUSIONS AND DISCLAIMERS SHALL APPLY <br/>TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, EVEN IF ANY REMEDY <br/>FAILS ITS ESSENTIAL PURPOSE. <br/><br/>Si vous avez acquis votre produit Microsoft au CANADA, le texte suivant <br/>vous concerne : <br/>SI LE PRODUIT OS APPLICABLE VOUS A ÉTÉ CONCÉDÉ SOUS LICENCE PAR <br/>MICROSOFT OU PAR L'UNE QUELCONQUE DE SES FILIALES À 100%, LA GARANTIE <br/>LIMITÉE (SI ELLE EXISTE) APPLICABLE EN VERTU DU CONTRAT DE LICENCE <br/>UTILISATEUR FINAL (« CLUF ») RELATIF À CE PRODUIT OS S'APPLIQUE AUX <br/>COMPOSANTS SYSTÈME D'EXPLOITATION DE MICROSOFT Y COMPRIS TOUTE <br/>DOCUMENTATION « EN LIGNE » OU SOUS FORME ÉLECTRONIQUE (LES « <br/>COMPOSANTS OS »), À CONDITION QUE CEUX-CI VOUS AIENT ÉTÉ CONCÉDÉS <br/>SOUS LICENCE PENDANT LA DURÉE DE LA GARANTIE LIMITÉE DU CLUF RELATIF <br/>AU PRODUIT OS APPLICABLE. LE PRÉSENT CLUF SUPPLÉMENTAIRE N'A PAS POUR <br/>EFFET DE PROROGER LA DURÉE DE CETTE GARANTIE LIMITÉE. <br/>SI LE PRODUIT OS VOUS A ÉTÉ CONCÉDÉ SOUS LICENCE PAR UNE ENTITÉ AUTRE <br/>QUE MICROSOFT OU QUE L'UNE QUELCONQUE DE SES FILIALES À 100%, <br/>MICROSOFT EXCLUT TOUTE GARANTIE RELATIVE AUX COMPOSANTS OS COMME <br/>CELA EST STIPULÉ CI-APRÈS : <br/>EXCLUSION DE GARANTIE. DANS TOUTE LA MESURE PERMISE PAR LE DROIT <br/>APPLICABLE, MICROSOFT ET SES FOURNISSEURS VOUS FOURNISSENT LES <br/>COMPOSANTS OS, AINSI QUE, LE CAS ÉCHÉANT, TOUT SERVICE D'ASSISTANCE <br/>RELATIF À CES COMPOSANTS OS (LES "SERVICES D'ASSISTANCE"), « COMME <br/>TELS ET AVEC TOUS LEURS DEFAUTS ». EN OUTRE, MICROSOFT ET SES <br/>FOURNISSEURS EXCLUENT PAR LES PRÉSENTES TOUTE AUTRE GARANTIE LÉGALE, <br/>EXPRESSE OU IMPLICITE, RELATIVE AUX COMPOSANTS OS ET AUX SERVICES <br/>D'ASSISTANCE, NOTAMMENT (LE CAS ÉCHÉANT), TOUTE GARANTIE : DE PROPRIÉTÉ, <br/>D'ABSENCE DE CONTREFAÇON, DE QUALITÉ, D'ADAPTATION À UN USAGE <br/>PARTICULIER, D'ABSENCE DE VIRUS, DE PRÉCISION, D'EXHAUSTIVITÉ DES <br/>RÉPONSES, DES RÉSULTATS OBTENUS, D'ABSENCE DE NÉGLIGENCE, OU DE <br/>DÉFAUT DE FABRICATION, DE JOUISSANCE PAISIBLE, D'ABSENCE DE TROUBLE <br/>DE POSSESSION ET DE CONFORMITÉ À LA DESCRIPTION. VOUS ASSUMEZ <br/>L'ENSEMBLE DES RISQUES DÉCOULANT DE L'UTILISATION OU DU FONCTIONNEMENT <br/>DES COMPOSANTS OS ET DES SERVICES D'ASSISTANCE. <br/>EXCLUSION DE RESPONSABILITÉ POUR LES DOMMAGES ACCESSOIRES, INDIRECTS <br/>ET CERTAINS AUTRES TYPES DE DOMMAGES. DANS TOUTE LA MESURE PERMISE <br/>PAR LE DROIT APPLICABLE, MICROSOFT OU SES FOURNISSEURS NE POURRONT EN <br/>AUCUN CAS ÊTRE TENUS RESPONSABLES DE TOUT DOMMAGE SPÉCIAL, ACCESSOIRE, <br/>INCIDENT OU INDIRECT DE QUELQUE NATURE QUE CE SOIT (Y COMPRIS, MAIS <br/>NON DE FACON LIMITATIVE, LES PERTES DE BÉNÉFICES, PERTES D'INFORMATIONS <br/>CONFIDENTIELLES OU AUTRES INFORMATIONS, INTERRUPTIONS D'ACTIVITÉ, <br/>PRÉJUDICES CORPORELS, ATTEINTES À LA VIE PRIVÉE, MANQUEMENT À TOUTE <br/>OBLIGATION (NOTAMMENT L'OBLIGATION DE BONNE FOI ET DE DILIGENCE), <br/>NÉGLIGENCE, ET POUR TOUTE PERTE PÉCUNIAIRE OU AUTRE DE QUELQUE NATURE <br/>QUE CE SOIT), RÉSULTANT DE, OU RELATIFS A, L'UTILISATION OU <br/>L'IMPOSSIBILITÉ D'UTILISER LES COMPOSANTS OS OU LES SERVICES D'ASSISTANCE, <br/>OU LA FOURNITURE OU LE DÉFAUT DE FOURNITURE DES SERVICES D'ASSISTANCE, OU <br/>AUTREMENT EN VERTU DE, OU RELATIVEMENT A, TOUTE DISPOSITION DE CE CLUF <br/>SUPPLÉMENTAIRE, MÊME SI LA SOCIÉTÉ MICROSOFT OU UN QUELCONQUE FOURNISSEUR <br/>A ÉTÉ PRÉVENU DE L'ÉVENTUALITÉ DE TELS DOMMAGES. <br/>LIMITATION DE RESPONSABILITÉ ET RECOURS. NONOBSTANT TOUT DOMMAGE QUE VOUS <br/>POURRIEZ SUBIR POUR QUELQUE MOTIF QUE CE SOIT (NOTAMMENT TOUS LES DOMMAGES <br/>ÉNUMÉRÉS CI-DESSUS ET TOUS LES DOMMAGES DIRECTS OU GÉNÉRAUX), L'ENTIÈRE <br/>RESPONSABILITÉ DE MICROSOFT ET DE L'UN QUELCONQUE DE SES FOURNISSEURS AU <br/>TITRE DE TOUTE STIPULATION DE CE CLUF SUPPLÉMENTAIRE ET VOTRE SEUL RECOURS <br/>EN CE QUI CONCERNE TOUS LES DOMMAGES PRÉCITÉS NE SAURAIENT EXCÉDER LE <br/>MONTANT QUE VOUS AVEZ EFFECTIVEMENT PAYÉ POUR LES COMPOSANTS OS OU 5 DOLLARS <br/>US (US$ 5,00), SELON LE PLUS ÉLEVÉ DES DEUX MONTANTS. LES PRÉSENTES <br/>LIMITATIONS ET EXCLUSIONS DEMEURERONT APPLICABLES DANS TOUTE LA MESURE <br/>PERMISE PAR LE DROIT APPLICABLE QUAND BIEN MÊME UN QUELCONQUE REMÈDE À UN <br/>QUELCONQUE MANQUEMENT NE PRODUIRAIT PAS D'EFFET. <br/>La présente Convention est régie par les lois de la province d'Ontario, <br/>Canada. Chacune des parties à la présente reconnaît irrévocablement la <br/>compétence des tribunaux de la province d'Ontario et consent à instituer <br/>tout litige qui pourrait découler de la présente auprès des tribunaux <br/>situés dans le district judiciaire de York, province d'Ontario. <br/>Au cas où vous auriez des questions concernant cette licence ou que vous <br/>désiriez vous mettre en rapport avec Microsoft pour quelque raison que <br/>ce soit, veuillez contacter la succursale Microsoft desservant votre <br/>pays, ou écrire à : Microsoft Sales Information Center, One Microsoft <br/>Way, Redmond, Washington 98052-6399. </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Ispell W?rterbuch igerman98; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Bjoern_Jacke"><span/></a>Bjoern Jacke </h2><h3 class="Heading_20_3"><a id="a__German_Dictionaries_igerman98"><span/></a>German Dictionaries igerman98</h3><p class="P11">OASIS distribution license agreement 0.1 from 2005-11-10 <br/>Without any modifications this dictionary may be distributed with programs that support the OASIS Open Document Format for Office Applications and whose PRIMARY format for saving documents is the Open Document Format. <br/>This requires that all licenses and copyright files are also distributed together with the package the dictionary is shipped with. <br/>Any modifications of the dictionary files are not allowed for this agreement, modifications require the use of the GNU GENERAL PUBLIC LICENSE. <br/>If you have questions or don't get along with this, send me your comments/questions/ideas to Bjoern Jacke </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: WordNet Release 2.1; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Princeton_University"><span/></a>Princeton University </h2><h3 class="Heading_20_3"><a id="a__WordNet_2_1"><span/></a>WordNet 2.1</h3><p class="P11">WordNet 2.1 Copyright 2005 by Princeton University. <br/>This software and database is being provided to you, the LICENSEE, by Princeton University under the following license. By obtaining, using and/or copying this software and database, you agree that you have read, understood, and will comply with these terms and conditions.: <br/>Permission to use, copy, modify and distribute this software and database and its documentation for any purpose and without fee or royalty is hereby granted, provided that you agree to comply with the following copyright notice and statements, including the disclaimer, and that the same appear on ALL copies of the software, database and documentation, including modifications that you make for internal use or for distribution. <br/>WordNet 2.1 Copyright 2005 by Princeton University. All rights reserved. <br/>THIS SOFTWARE AND DATABASE IS PROVIDED "AS IS" AND PRINCETON UNIVERSITY MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PRINCETON UNIVERSITY MAKES NO REPRESENTATIONS OR WARRANTIES OF MERCHANT- ABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE, DATABASE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. <br/>The name of Princeton University or Princeton may not be used in advertising or publicity pertaining to distribution of the software and/or database. Title to copyright in this software, database and any associated documentation shall at all times remain with Princeton University and LICENSEE agrees to preserve same. </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product:Bitstram Vera Fonts; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Bitstream__Inc_"><span/></a>Bitstream, Inc. </h2><h3 class="Heading_20_3"><a id="a__Bitstream_Vera_Fonts"><span/></a>Bitstream Vera Fonts</h3><p class="P11"><span class="Emphasis">Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc. <br/><br/>Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license (“Fontsâ€�) and associated documentation files (the “Font Softwareâ€�), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions: <br/><br/>The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces.<br/><br/>The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words “Bitstreamâ€� or the word “Veraâ€�.<br/><br/>This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the “Bitstream Veraâ€� names. <br/><br/>The Font Software may be sold as part of a larger software package but no copy of one or more of the Font </span><span class="Emphasis">Software typefaces may be sold by itself. <br/><br/>THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS </span><span class="Emphasis">FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. <br/><br/>Except as contained in this notice, the names of Gnome, the Gnome Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org. </span><br/>Arev Fonts Copyright <br/>Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. <br/>Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license ("Fonts") and associated documentation files (the "Font Software"), to reproduce and distribute the modifications to the Bitstream Vera Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions: <br/>The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces. <br/>The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words "Tavmjong Bah" or the word "Arev". <br/>This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the "Tavmjong Bah Arev" names. <br/>The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself. <br/>THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. <br/>Except as contained in this notice, the name of Tavmjong Bah shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from Tavmjong Bah. For further information, contact: tavmjong @ free . fr. </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Liberation Fonts; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__RedHat__Inc_"><span/></a>RedHat, Inc.</h2><h3 class="Heading_20_3"><a id="a__Liberation_Fonts"><span/></a>Liberation Fonts</h3><p class="Text_20_body"><a href="./#gpl">refer to GNU General Public License</a> and the following terms: <br/>LICENSE AGREEMENT AND LIMITED PRODUCT WARRANTY LIBERATION FONT SOFTWARE <br/>This agreement governs the use of the Software and any updates to the Software, regardless of the delivery mechanism. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to the user ("Client") a license to this collective work pursuant to the GNU General Public License v.2 with the exceptions set forth below and such other terms as our set forth in this End User License Agreement. <br/>1. The Software and License Exception. LIBERATION font software (the "Software") consists of TrueType-OpenType formatted font software for rendering LIBERATION typefaces in sans serif, serif, and monospaced character styles. You are licensed to use, modify, copy, and distribute the Software pursuant to the GNU General Public License v.2 with the following exceptions: <br/>1) As a special exception, if you create a document which uses this font, and embed this font or unaltered portions of this font into the document, this font does not by itself cause the resulting document to be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the document might be covered by the GNU General Public License. If you modify this font, you may extend this exception to your version of the font, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. <br/>2) As a further exception, any distribution of the object code of the Software in a physical product must provide you the right to access and modify the source code for the Software and to reinstall that modified version of the Software in object code form on the same physical product on which you received it. <br/>2. Intellectual Property Rights. The Software and each of its components, including the source code, documentation, appearance, structure and organization are owned by Red Hat and others and are protected under copyright and other laws. Title to the Software and any component, or to any copy, modification, or merged portion shall remain with the aforementioned, subject to the applicable license. The "LIBERATION" trademark is a trademark of Red Hat, Inc. in the U.S. and other countries. This agreement does not permit Client to distribute modified versions of the Software using Red Hat's trademarks. If Client makes a redistribution of a modified version of the Software, then Client must modify the files names to remove any reference to the Red Hat trademarks and must not use the Red Hat trademarks in any way to reference or promote the modified Software. <br/>3. Limited Warranty. To the maximum extent permitted under applicable law, the Software is provided and licensed "as is" without warranty of any kind, expressed or implied, including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. Red Hat does not warrant that the functions contained in the Software will meet Client's requirements or that the operation of the Software will be entirely error free or appear precisely as described in the accompanying documentation. <br/>4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential damages, including lost profits or lost savings arising out of the use or inability to use the Software, even if Red Hat or such dealer has been advised of the possibility of such damages. <br/>5. Export Control. As required by U.S. law, Client represents and warrants that it: (a) understands that the Software is subject to export controls under the U.S. Commerce Department's Export Administration Regulations ("EAR"); (b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations (currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria); (c) will not export, re-export, or transfer the Software to any prohibited destination, entity, or individual without the necessary export license(s) or authorizations(s) from the U.S. Government; (d) will not use or transfer the Software for use in any sensitive nuclear, chemical or biological weapons, or missile technology end-uses unless authorized by the U.S. Government by regulation or specific license; (e) understands and agrees that if it is in the United States and exports or transfers the Software to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual reports to the Commerce Department's Bureau of Industry &amp; Security (BIS), which include the name and address (including country) of each transferee; and (f) understands that countries other than the United States may restrict the import, use, or export of encryption products and that it shall be solely responsible for compliance with any such import, use, or export restrictions. <br/>6. General. If any provision of this agreement is held to be unenforceable, that shall not affect the enforceability of the remaining provisions. This agreement shall be governed by the laws of the State of North Carolina and of the United States, without regard to any conflict of laws provisions, except that the United Nations Convention on the International Sale of Goods shall not apply. <br/>Copyright © 2007 Red Hat, Inc. All rights reserved. LIBERATION is a trademark of Red Hat, Inc. </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: MathML DTD; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__World_Wide_Web_Consortium__W3C_"><span/></a>World Wide Web Consortium (W3C)</h2><h3 class="Heading_20_3"><a id="a__MathML_DTD"><span/></a>MathML DTD</h3><p class="Heading_20_1">W3C<span class="T3">®</span> SOFTWARE NOTICE AND LICENSE</p><h4 class="Heading_20_4"><a id="a__Copyright_©_1994-2001_World_Wide_Web_Consortium___Massachusetts_Institute_of_Technology__Institut_National_de_Recherche_en_Informatique_et_en_Automatique__Keio_University___All_Rights_Reserved__http___www_w3_org_Consortium_Legal_"><span/></a>Copyright © 1994-2001 <a href="http://www.w3.org/">World Wide Web Consortium</a>, (<a href="http://www.lcs.mit.edu/">Massachusetts Institute of Technology</a>, <a href="http://www.inria.fr/">Institut National de Recherche en Informatique et en Automatique</a>, <a href="http://www.keio.ac.jp/">Keio University</a>). All Rights Reserved. http://www.w3.org/Consortium/Legal/</h4><p class="Text_20_body">This W3C work (including software, documents, or other related items) is being provided by the copyright holders under the following license. By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions:</p><p class="Text_20_body">Permission to use, copy, modify, and distribute this software and its documentation, with or without modification,  for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications, that you make:</p><ol><li><p class="P14" style="margin-left:0.748cm;"><span class="Numbering_20_Symbols" style="display:block;float:left;min-width:0.4991cm">1.</span>The full text of this NOTICE in a location viewable to users of the redistributed or derivative work. <span class="odfLiEnd"/> </p></li><li><p class="P14" style="margin-left:0.748cm;"><span class="Numbering_20_Symbols" style="display:block;float:left;min-width:0.4991cm">2.</span>Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, a short notice of the following form (hypertext is preferred, text is permitted) should be used within the body of any redistributed or derivative code: "Copyright © [$date-of-software] <a href="http://www.w3.org/">World Wide Web Consortium</a>, (<a href="http://www.lcs.mit.edu/">Massachusetts Institute of Technology</a>, <a href="http://www.inria.fr/">Institut National de Recherche en Informatique et en Automatique</a>, <a href="http://www.keio.ac.jp/">Keio University</a>). All Rights Reserved. http://www.w3.org/Consortium/Legal/" <span class="odfLiEnd"/> </p></li><li><p class="P24" style="margin-left:0.748cm;"><span class="Numbering_20_Symbols" style="display:block;float:left;min-width:0.4991cm">3.</span>Notice of any changes or modifications to the W3C files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.) <span class="odfLiEnd"/> </p></li></ol><p class="Text_20_body">THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</p><p class="Text_20_body">COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.</p><p class="Text_20_body">The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.</p><p class="P11"> </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: NSIS; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Nullsoft__Inc_"><span/></a>Nullsoft, Inc.</h2><h3 class="Heading_20_3"><a id="a__NSIS"><span/></a>NSIS</h3><p class="P11">Copyright (C) 1999-2003 Nullsoft, Inc. <br/>This license applies to everything in the NSIS package, except where otherwise noted. <br/>This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. <br/>Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: <br/>1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. <br/>2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. <br/>3. This notice may not be removed or altered from any source distribution. </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: PostScript(R) AFM Files; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Adobe"><span/></a>Adobe</h2><h3 class="Heading_20_3"><a id="a__PostScript_R__AFM_files"><span/></a>PostScript(R) AFM files</h3><p class="P11"><br/>Adobe Core 35 AFM Files with 314 Glyph Entries <br/>This file and the 35 PostScript(R) AFM files it accompanies may be used, copied, and distributed for any purpose and without charge, with or without modification, provided that all copyright notices are retained; that the AFM files are not distributed without this file; that all modifications to this file or any of the AFM files are prominently noted in the modified file(s); and that this paragraph is not modified. Adobe Systems has no responsibility or obligation to support the use of the AFM files. </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Antigrain; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Axim_Shemanarev"><span/></a>Axim Shemanarev</h2><h3 class="Heading_20_3"><a id="a__Antigrain"><span/></a>Antigrain</h3><p class="P11"><br/>Anti-Grain Geometry - Version 2.0 <br/>Copyright (C) 2002-2004 Maxim Shemanarev (McSeem) <br/>Permission to copy, use, modify, sell and distribute this software is granted provided this copyright notice appears in all copies. This software is provided "as is" without express or implied warranty, and with no claim as to its suitability for any purpose. </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: beanshell; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Pat_Niemeyer"><span/></a>Pat Niemeyer</h2><h3 class="Heading_20_3"><a id="a__beanshell"><span/></a>beanshell</h3><p class="Text_20_body"><a href="./#lgpl">jump to LGPL</a></p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">/*****************************************************************************</p><p class="Preformatted_20_Text"> *                                                                           *</p><p class="Preformatted_20_Text"> *  This file is part of the BeanShell Java Scripting distribution.          *</p><p class="Preformatted_20_Text"> *  Documentation and updates may be found at http://www.beanshell.org/      *</p><p class="Preformatted_20_Text"> *                                                                           *</p><p class="Preformatted_20_Text"> *  Sun Public License Notice:                                               *</p><p class="Preformatted_20_Text"> *                                                                           *</p><p class="Preformatted_20_Text"> *  The contents of this file are subject to the Sun Public License Version  *</p><p class="Preformatted_20_Text"> *  1.0 (the "License"); you may not use this file except in compliance with *</p><p class="Preformatted_20_Text"> *  the License. A copy of the License is available at http://www.sun.com    *</p><p class="Preformatted_20_Text"> *                                                                           *</p><p class="Preformatted_20_Text"> *  The Original Code is BeanShell. The Initial Developer of the Original    *</p><p class="Preformatted_20_Text"> *  Code is Pat Niemeyer. Portions created by Pat Niemeyer are Copyright     *</p><p class="Preformatted_20_Text"> *  (C) 2000.  All Rights Reserved.                                          *</p><p class="Preformatted_20_Text"> *                                                                           *</p><p class="Preformatted_20_Text"> *  GNU Public License Notice:                                               *</p><p class="Preformatted_20_Text"> *                                                                           *</p><p class="Preformatted_20_Text"> *  Alternatively, the contents of this file may be used under the terms of  *</p><p class="Preformatted_20_Text"> *  the GNU Lesser General Public License (the "LGPL"), in which case the    *</p><p class="Preformatted_20_Text"> *  provisions of LGPL are applicable instead of those above. If you wish to *</p><p class="Preformatted_20_Text"> *  allow use of your version of this file only under the  terms of the LGPL *</p><p class="Preformatted_20_Text"> *  and not to allow others to use your version of this file under the SPL,  *</p><p class="Preformatted_20_Text"> *  indicate your decision by deleting the provisions above and replace      *</p><p class="Preformatted_20_Text"> *  them with the notice and other provisions required by the LGPL.  If you  *</p><p class="Preformatted_20_Text"> *  do not delete the provisions above, a recipient may use your version of  *</p><p class="Preformatted_20_Text"> *  this file under either the SPL or the LGPL.                              *</p><p class="Preformatted_20_Text"> *                                                                           *</p><p class="Preformatted_20_Text"> *  Patrick Niemeyer (pat@pat.net)                                           *</p><p class="Preformatted_20_Text"> *  Author of Learning Java, O'Reilly &amp; Associates                           *</p><p class="Preformatted_20_Text"> *  http://www.pat.net/~pat/                                                 *</p><p class="Preformatted_20_Text"> *                                                                           *</p><p class="P2"> *****************************************************************************/</p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: C++ Boost Library; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Boost_org"><span/></a>Boost.org</h2><h3 class="Heading_20_3"><a id="a__C___Boost_Library"><span/></a>C++ Boost Library</h3><p class="P11">Boost Software License - Version 1.0 - August 17th, 2003 <br/>Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by this license (the "Software") to use, reproduce, display, distribute, execute, and transmit the Software, and to prepare derivative works of the Software, and to permit third-parties to whom the Software is furnished to do so, all subject to the following: <br/>The copyright notices in the Software and this entire statement, including the above license grant, this restriction and the following disclaimer, must be included in all copies of the Software, in whole or in part, and all derivative works of the Software, unless such copies or derivative works are solely in the form of machine-executable object code generated by a source language processor. <br/>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Cairo; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Cairographics_org"><span/></a>Cairographics.org</h2><h3 class="Heading_20_3"><a id="a__Cairo__B_"><span/></a>Cairo (B)</h3><p class="P11"><a href="./#mpllic">jump to MPL 1.1</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product:Charis SIL v4; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__SIL_International"><span/></a>SIL International</h2><h3 class="Heading_20_3"><a id="a__Charis_SIL_v_4"><span/></a>Charis SIL v.4</h3><p class="P11"><br/>This Font Software is Copyright (c) 1997-2006, SIL International (http://scripts.sil.org/). <br/>All Rights Reserved. <br/>"Charis SIL" is a Reserved Font Name for this Font Software. <br/>"SIL" is a Reserved Font Name for this Font Software. <br/>This Font Software is licensed under the SIL Open Font License, Version 1.0. <br/>No modification of the license is permitted, only verbatim copy is allowed. <br/>This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL <br/>----------------------------------------------------------- <br/>SIL OPEN FONT LICENSE Version 1.0 - 22 November 2005 <br/>----------------------------------------------------------- <br/>PREAMBLE <br/>The goals of the Open Font License (OFL) are to stimulate worldwide development of cooperative font projects, to support the font creation efforts of academic and linguistic communities, and to provide an open framework in which fonts may be shared and improved in partnership with others. <br/>The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and sold with any software provided that the font names of derivative works are changed. The fonts and derivatives, however, cannot be released under any other type of license. <br/>DEFINITIONS <br/>"Font Software" refers to any and all of the following: <br/>- font files <br/>- data files <br/>- source code <br/>- build scripts <br/>- documentation <br/>"Reserved Font Name" refers to the Font Software name as seen by users and any other names as specified after the copyright statement. <br/>"Standard Version" refers to the collection of Font Software components as distributed by the Copyright Holder. <br/>"Modified Version" refers to any derivative font software made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Standard Version, by changing formats or by porting the Font Software to a new environment. <br/>"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software. <br/>PERMISSION &amp; CONDITIONS <br/>Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions: <br/>1) Neither the Font Software nor any of its individual components, in Standard or Modified Versions, may be sold by itself. <br/>2) Standard or Modified Versions of the Font Software may be bundled, redistributed and sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user. <br/>3) No Modified Version of the Font Software may use the Reserved Font Name(s), in part or in whole, unless explicit written permission is granted by the Copyright Holder. This restriction applies to all references stored in the Font Software, such as the font menu name and other font description fields, which are used to differentiate the font from others. <br/>4) The name(s) of the Copyright Holder or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder and the Author(s) or with their explicit written permission. <br/>5) The Font Software, modified or unmodified, in part or in whole, must be distributed using this license, and may not be distributed under any other license. <br/>TERMINATION <br/>This license becomes null and void if any of the above conditions are not met. <br/>DISCLAIMER THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product:KDE Crystal theme icons; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__KDE_Artists_"><span/></a>KDE Artists: </h2><h3 class="Heading_20_3"><a id="a__KDE_Crystal_theme_icons"><span/></a>KDE Crystal theme icons</h3><p class="Text_20_body">KDE Crystal theme icons. <br/>Copyright (C) 2002 and following years KDE Artists This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, version 2.1 of the License. </p><p class="Preformatted_20_Text">License</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">The Crystal Project are released under LGPL.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">GNU General Public License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   0.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      This License Agreement applies to any software library or other program</p><p class="Preformatted_20_Text">which contains a notice placed by the copyright holder or other authorized party</p><p class="Preformatted_20_Text">saying it may be distributed under the terms of this Lesser General Public</p><p class="Preformatted_20_Text">License (also called "this License"). Each licensee is addressed as "you".</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      A "library" means a collection of software functions and/or data prepared</p><p class="Preformatted_20_Text">so as to be conveniently linked with application programs (which use some of</p><p class="Preformatted_20_Text">those functions and data) to form executables.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      The "Library", below, refers to any such software library or work which</p><p class="Preformatted_20_Text">has been distributed under these terms. A "work based on the Library" means</p><p class="Preformatted_20_Text">either the Library or any derivative work under copyright law: that is to say, a</p><p class="Preformatted_20_Text">work containing the Library or a portion of it, either verbatim or with</p><p class="Preformatted_20_Text">modifications and/or translated straightforwardly into another language.</p><p class="Preformatted_20_Text">(Hereinafter, translation is included without limitation in the term</p><p class="Preformatted_20_Text">"modification".)</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      "Source code" for a work means the preferred form of the work for making</p><p class="Preformatted_20_Text">modifications to it. For a library, complete source code means all the source</p><p class="Preformatted_20_Text">code for all modules it contains, plus any associated interface definition</p><p class="Preformatted_20_Text">files, plus the scripts used to control compilation and installation of the library.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      Activities other than copying, distribution and modification are not</p><p class="Preformatted_20_Text">covered by this License; they are outside its scope. The act of running a</p><p class="Preformatted_20_Text">program using the Library is not restricted, and output from such a program is</p><p class="Preformatted_20_Text">covered only if its contents constitute a work based on the Library (independent</p><p class="Preformatted_20_Text">of the use of the Library in a tool for writing it). Whether that is true</p><p class="Preformatted_20_Text">depends on what the Library does and what the program that uses the Library does.</p><p class="Preformatted_20_Text">   1.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      You may copy and distribute verbatim copies of the Library's complete</p><p class="Preformatted_20_Text">source code as you receive it, in any medium, provided that you conspicuously</p><p class="Preformatted_20_Text">and appropriately publish on each copy an appropriate copyright notice and</p><p class="Preformatted_20_Text">disclaimer of warranty; keep intact all the notices that refer to this License</p><p class="Preformatted_20_Text">and to the absence of any warranty; and distribute a copy of this License along</p><p class="Preformatted_20_Text">with the Library.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      You may charge a fee for the physical act of transferring a copy, and you</p><p class="Preformatted_20_Text">may at your option offer warranty protection in exchange for a fee.</p><p class="Preformatted_20_Text">   2.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      You may modify your copy or copies of the Library or any portion of it,</p><p class="Preformatted_20_Text">thus forming a work based on the Library, and copy and distribute such</p><p class="Preformatted_20_Text">modifications or work under the terms of Section 1 above, provided that you also</p><p class="Preformatted_20_Text">meet all of these conditions:</p><p class="Preformatted_20_Text">         1. The modified work must itself be a software library.</p><p class="Preformatted_20_Text">         2. You must cause the files modified to carry prominent notices stating</p><p class="Preformatted_20_Text">that you changed the files and the date of any change.</p><p class="Preformatted_20_Text">         3. You must cause the whole of the work to be licensed at no charge to</p><p class="Preformatted_20_Text">all third parties under the terms of this License.</p><p class="Preformatted_20_Text">         4. If a facility in the modified Library refers to a function or a</p><p class="Preformatted_20_Text">table of data to be supplied by an application program that uses the facility,</p><p class="Preformatted_20_Text">other than as an argument passed when the facility is invoked, then you must</p><p class="Preformatted_20_Text">make a good faith effort to ensure that, in the event an application does not</p><p class="Preformatted_20_Text">supply such function or table, the facility still operates, and performs</p><p class="Preformatted_20_Text">whatever part of its purpose remains meaningful.</p><p class="Preformatted_20_Text"/><p class="Preformatted_20_Text">      (For example, a function in a library to compute square roots has a</p><p class="Preformatted_20_Text">purpose that is entirely well-defined independent of the application. Therefore,</p><p class="Preformatted_20_Text">Subsection 2d requires that any application-supplied function or table used by</p><p class="Preformatted_20_Text">this function must be optional: if the application does not supply it, the</p><p class="Preformatted_20_Text">square root function must still compute square roots.)</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      These requirements apply to the modified work as a whole. If identifiable</p><p class="Preformatted_20_Text">sections of that work are not derived from the Library, and can be reasonably</p><p class="Preformatted_20_Text">considered independent and separate works in themselves, then this License, and</p><p class="Preformatted_20_Text">its terms, do not apply to those sections when you distribute them as separate</p><p class="Preformatted_20_Text">works. But when you distribute the same sections as part of a whole which is a</p><p class="Preformatted_20_Text">work based on the Library, the distribution of the whole must be on the terms of</p><p class="Preformatted_20_Text">this License, whose permissions for other licensees extend to the entire whole,</p><p class="Preformatted_20_Text">and thus to each and every part regardless of who wrote it.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      Thus, it is not the intent of this section to claim rights or contest your</p><p class="Preformatted_20_Text">rights to work written entirely by you; rather, the intent is to exercise the</p><p class="Preformatted_20_Text">right to control the distribution of derivative or collective works based on the</p><p class="Preformatted_20_Text">Library.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      In addition, mere aggregation of another work not based on the Library</p><p class="Preformatted_20_Text">with the Library (or with a work based on the Library) on a volume of a storage</p><p class="Preformatted_20_Text">or distribution medium does not bring the other work under the scope of this</p><p class="Preformatted_20_Text">License.</p><p class="Preformatted_20_Text">   3.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      You may opt to apply the terms of the ordinary GNU General Public License</p><p class="Preformatted_20_Text">instead of this License to a given copy of the Library. To do this, you must</p><p class="Preformatted_20_Text">alter all the notices that refer to this License, so that they refer to the</p><p class="Preformatted_20_Text">ordinary GNU General Public License, version 2, instead of to this License. (If</p><p class="Preformatted_20_Text">a newer version than version 2 of the ordinary GNU General Public License has</p><p class="Preformatted_20_Text">appeared, then you can specify that version instead if you wish.) Do not make</p><p class="Preformatted_20_Text">any other change in these notices.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      Once this change is made in a given copy, it is irreversible for that</p><p class="Preformatted_20_Text">copy, so the ordinary GNU General Public License applies to all subsequent</p><p class="Preformatted_20_Text">copies and derivative works made from that copy.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      This option is useful when you wish to copy part of the code of the</p><p class="Preformatted_20_Text">Library into a program that is not a library.</p><p class="Preformatted_20_Text">   4.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      You may copy and distribute the Library (or a portion or derivative of it,</p><p class="Preformatted_20_Text">under Section 2) in object code or executable form under the terms of Sections 1</p><p class="Preformatted_20_Text">and 2 above provided that you accompany it with the complete corresponding</p><p class="Preformatted_20_Text">machine-readable source code, which must be distributed under the terms of</p><p class="Preformatted_20_Text">Sections 1 and 2 above on a medium customarily used for software interchange.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      If distribution of object code is made by offering access to copy from a</p><p class="Preformatted_20_Text">designated place, then offering equivalent access to copy the source code from</p><p class="Preformatted_20_Text">the same place satisfies the requirement to distribute the source code, even</p><p class="Preformatted_20_Text">though third parties are not compelled to copy the source along with the object</p><p class="Preformatted_20_Text">code.</p><p class="Preformatted_20_Text">   5.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      A program that contains no derivative of any portion of the Library, but</p><p class="Preformatted_20_Text">is designed to work with the Library by being compiled or linked with it, is</p><p class="Preformatted_20_Text">called a "work that uses the Library". Such a work, in isolation, is not a</p><p class="Preformatted_20_Text">derivative work of the Library, and therefore falls outside the scope of this</p><p class="Preformatted_20_Text">License.</p><p class="Preformatted_20_Text">      However, linking a "work that uses the Library" with the Library creates</p><p class="Preformatted_20_Text">an executable that is a derivative of the Library (because it contains portions</p><p class="Preformatted_20_Text">of the Library), rather than a "work that uses the library". The executable is</p><p class="Preformatted_20_Text">therefore covered by this License. Section 6 states terms for distribution of</p><p class="Preformatted_20_Text">such executables.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      When a "work that uses the Library" uses material from a header file that</p><p class="Preformatted_20_Text">is part of the Library, the object code for the work may be a derivative work of</p><p class="Preformatted_20_Text">the Library even though the source code is not. Whether this is true is</p><p class="Preformatted_20_Text">especially significant if the work can be linked without the Library, or if the</p><p class="Preformatted_20_Text">work is itself a library. The threshold for this to be true is not precisely</p><p class="Preformatted_20_Text">defined by law.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      If such an object file uses only numerical parameters, data structure</p><p class="Preformatted_20_Text">layouts and accessors, and small macros and small inline functions (ten lines or</p><p class="Preformatted_20_Text">less in length), then the use of the object file is unrestricted, regardless of</p><p class="Preformatted_20_Text">whether it is legally a derivative work. (Executables containing this object</p><p class="Preformatted_20_Text">code plus portions of the Library will still fall under Section 6.)</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      Otherwise, if the work is a derivative of the Library, you may distribute</p><p class="Preformatted_20_Text">the object code for the work under the terms of Section 6. Any executables</p><p class="Preformatted_20_Text">containing that work also fall under Section 6, whether or not they are linked</p><p class="Preformatted_20_Text">directly with the Library itself.</p><p class="Preformatted_20_Text">   6.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      As an exception to the Sections above, you may also combine or link a</p><p class="Preformatted_20_Text">"work that uses the Library" with the Library to produce a work containing</p><p class="Preformatted_20_Text">portions of the Library, and distribute that work under terms of your choice,</p><p class="Preformatted_20_Text">provided that the terms permit modification of the work for the customer's own</p><p class="Preformatted_20_Text">use and reverse engineering for debugging such modifications.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      You must give prominent notice with each copy of the work that the Library</p><p class="Preformatted_20_Text">is used in it and that the Library and its use are covered by this License. You</p><p class="Preformatted_20_Text">must supply a copy of this License. If the work during execution displays</p><p class="Preformatted_20_Text">copyright notices, you must include the copyright notice for the Library among</p><p class="Preformatted_20_Text">them, as well as a reference directing the user to the copy of this License.</p><p class="Preformatted_20_Text">Also, you must do one of these things:</p><p class="Preformatted_20_Text">         1. Accompany the work with the complete corresponding machine-readable</p><p class="Preformatted_20_Text">source code for the Library including whatever changes were used in the work</p><p class="Preformatted_20_Text">(which must be distributed under Sections 1 and 2 above); and, if the work is an</p><p class="Preformatted_20_Text">executable linked with the Library, with the complete machine-readable "work</p><p class="Preformatted_20_Text">that uses the Library", as object code and/or source code, so that the user can</p><p class="Preformatted_20_Text">modify the Library and then relink to produce a modified executable containing</p><p class="Preformatted_20_Text">the modified Library. (It is understood that the user who changes the contents</p><p class="Preformatted_20_Text">of definitions files in the Library will not necessarily be able to recompile</p><p class="Preformatted_20_Text">the application to use the modified definitions.) .</p><p class="Preformatted_20_Text">         2. Use a suitable shared library mechanism for linking with the</p><p class="Preformatted_20_Text">Library. A suitable mechanism is one that (1) uses at run time a copy of the</p><p class="Preformatted_20_Text">library already present on the user's computer system, rather than copying</p><p class="Preformatted_20_Text">library functions into the executable, and (2) will operate properly with a</p><p class="Preformatted_20_Text">modified version of the library, if the user installs one, as long as the</p><p class="Preformatted_20_Text">modified version is interface-compatible with the version that the work was made</p><p class="Preformatted_20_Text">with.</p><p class="Preformatted_20_Text">         3. Accompany the work with a written offer, valid for at least three</p><p class="Preformatted_20_Text">years, to give the same user the materials specified in Subsection 6a, above,</p><p class="Preformatted_20_Text">for a charge no more than the cost of performing this distribution.</p><p class="Preformatted_20_Text">         4. If distribution of the work is made by offering access to copy from</p><p class="Preformatted_20_Text">a designated place, offer equivalent access to copy the above specified</p><p class="Preformatted_20_Text">materials from the same place.</p><p class="Preformatted_20_Text">         5. Verify that the user has already received a copy of these materials</p><p class="Preformatted_20_Text">or that you have already sent this user a copy.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      For an executable, the required form of the "work that uses the Library"</p><p class="Preformatted_20_Text">must include any data and utility programs needed for reproducing the executable</p><p class="Preformatted_20_Text">from it. However, as a special exception, the materials to be distributed need</p><p class="Preformatted_20_Text">not include anything that is normally distributed (in either source or binary</p><p class="Preformatted_20_Text">form) with the major components (compiler, kernel, and so on) of the operating</p><p class="Preformatted_20_Text">system on which the executable runs, unless that component itself accompanies</p><p class="Preformatted_20_Text">the executable.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      It may happen that this requirement contradicts the license restrictions</p><p class="Preformatted_20_Text">of other proprietary libraries that do not normally accompany the operating</p><p class="Preformatted_20_Text">system. Such a contradiction means you cannot use both them and the Library</p><p class="Preformatted_20_Text">together in an executable that you distribute.</p><p class="Preformatted_20_Text">   7.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      You may place library facilities that are a work based on the Library</p><p class="Preformatted_20_Text">side-by-side in a single library together with other library facilities not</p><p class="Preformatted_20_Text">covered by this License, and distribute such a combined library, provided that</p><p class="Preformatted_20_Text">the separate distribution of the work based on the Library and of the other</p><p class="Preformatted_20_Text">library facilities is otherwise permitted, and provided that you do these two</p><p class="Preformatted_20_Text">things:</p><p class="Preformatted_20_Text">         1.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">            Accompany the combined library with a copy of the same work based on</p><p class="Preformatted_20_Text">the Library, uncombined with any other library facilities. This must be</p><p class="Preformatted_20_Text">distributed under the terms of the Sections above.</p><p class="Preformatted_20_Text">         2.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">            Give prominent notice with the combined library of the fact that</p><p class="Preformatted_20_Text">part of it is a work based on the Library, and explaining where to find the</p><p class="Preformatted_20_Text">accompanying uncombined form of the same work.</p><p class="Preformatted_20_Text">   8.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      You may not copy, modify, sublicense, link with, or distribute the Library</p><p class="Preformatted_20_Text">except as expressly provided under this License. Any attempt otherwise to copy,</p><p class="Preformatted_20_Text">modify, sublicense, link with, or distribute the Library is void, and will</p><p class="Preformatted_20_Text">automatically terminate your rights under this License. However, parties who</p><p class="Preformatted_20_Text">have received copies, or rights, from you under this License will not have their</p><p class="Preformatted_20_Text">licenses terminated so long as such parties remain in full compliance.</p><p class="Preformatted_20_Text">   9.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      You are not required to accept this License, since you have not signed it.</p><p class="Preformatted_20_Text">However, nothing else grants you permission to modify or distribute the Library</p><p class="Preformatted_20_Text">or its derivative works. These actions are prohibited by law if you do not</p><p class="Preformatted_20_Text">accept this License. Therefore, by modifying or distributing the Library (or any</p><p class="Preformatted_20_Text">work based on the Library), you indicate your acceptance of this License to do</p><p class="Preformatted_20_Text">so, and all its terms and conditions for copying, distributing or modifying the</p><p class="Preformatted_20_Text">Library or works based on it.</p><p class="Preformatted_20_Text">  10.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      Each time you redistribute the Library (or any work based on the Library),</p><p class="Preformatted_20_Text">the recipient automatically receives a license from the original licensor to</p><p class="Preformatted_20_Text">copy, distribute, link with or modify the Library subject to these terms and</p><p class="Preformatted_20_Text">conditions. You may not impose any further restrictions on the recipients'</p><p class="Preformatted_20_Text">exercise of the rights granted herein. You are not responsible for enforcing</p><p class="Preformatted_20_Text">compliance by third parties with this License.</p><p class="Preformatted_20_Text">  11.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      If, as a consequence of a court judgment or allegation of patent</p><p class="Preformatted_20_Text">infringement or for any other reason (not limited to patent issues), conditions</p><p class="Preformatted_20_Text">are imposed on you (whether by court order, agreement or otherwise) that</p><p class="Preformatted_20_Text">contradict the conditions of this License, they do not excuse you from the</p><p class="Preformatted_20_Text">conditions of this License. If you cannot distribute so as to satisfy</p><p class="Preformatted_20_Text">simultaneously your obligations under this License and any other pertinent</p><p class="Preformatted_20_Text">obligations, then as a consequence you may not distribute the Library at all.</p><p class="Preformatted_20_Text">For example, if a patent license would not permit royalty-free redistribution of</p><p class="Preformatted_20_Text">the Library by all those who receive copies directly or indirectly through you,</p><p class="Preformatted_20_Text">then the only way you could satisfy both it and this License would be to refrain</p><p class="Preformatted_20_Text">entirely from distribution of the Library.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      If any portion of this section is held invalid or unenforceable under any</p><p class="Preformatted_20_Text">particular circumstance, the balance of the section is intended to apply, and</p><p class="Preformatted_20_Text">the section as a whole is intended to apply in other circumstances.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      It is not the purpose of this section to induce you to infringe any</p><p class="Preformatted_20_Text">patents or other property right claims or to contest validity of any such</p><p class="Preformatted_20_Text">claims; this section has the sole purpose of protecting the integrity of the</p><p class="Preformatted_20_Text">free software distribution system which is implemented by public license</p><p class="Preformatted_20_Text">practices. Many people have made generous contributions to the wide range of</p><p class="Preformatted_20_Text">software distributed through that system in reliance on consistent application</p><p class="Preformatted_20_Text">of that system; it is up to the author/donor to decide if he or she is willing</p><p class="Preformatted_20_Text">to distribute software through any other system and a licensee cannot impose</p><p class="Preformatted_20_Text">that choice.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      This section is intended to make thoroughly clear what is believed to be a</p><p class="Preformatted_20_Text">consequence of the rest of this License.</p><p class="Preformatted_20_Text">  12.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      If the distribution and/or use of the Library is restricted in certain</p><p class="Preformatted_20_Text">countries either by patents or by copyrighted interfaces, the original copyright</p><p class="Preformatted_20_Text">holder who places the Library under this License may add an explicit</p><p class="Preformatted_20_Text">geographical distribution limitation excluding those countries, so that</p><p class="Preformatted_20_Text">distribution is permitted only in or among countries not thus excluded. In such</p><p class="Preformatted_20_Text">case, this License incorporates the limitation as if written in the body of this</p><p class="Preformatted_20_Text">License.</p><p class="Preformatted_20_Text">  13.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      The Free Software Foundation may publish revised and/or new versions of</p><p class="Preformatted_20_Text">the Lesser General Public License from time to time. Such new versions will be</p><p class="Preformatted_20_Text">similar in spirit to the present version, but may differ in detail to address</p><p class="Preformatted_20_Text">new problems or concerns.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      Each version is given a distinguishing version number. If the Library</p><p class="Preformatted_20_Text">specifies a version number of this License which applies to it and "any later</p><p class="Preformatted_20_Text">version", you have the option of following the terms and conditions either of</p><p class="Preformatted_20_Text">that version or of any later version published by the Free Software Foundation.</p><p class="Preformatted_20_Text">If the Library does not specify a license version number, you may choose any</p><p class="Preformatted_20_Text">version ever published by the Free Software Foundation.</p><p class="Preformatted_20_Text">  14.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      If you wish to incorporate parts of the Library into other free programs</p><p class="Preformatted_20_Text">whose distribution conditions are incompatible with these, write to the author</p><p class="Preformatted_20_Text">to ask for permission. For software which is copyrighted by the Free Software</p><p class="Preformatted_20_Text">Foundation, write to the Free Software Foundation; we sometimes make exceptions</p><p class="Preformatted_20_Text">for this. Our decision will be guided by the two goals of preserving the free</p><p class="Preformatted_20_Text">status of all derivatives of our free software and of promoting the sharing and</p><p class="Preformatted_20_Text">reuse of software generally.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">No Warranty</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  15.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      Because the library is licensed free of charge, there is no warranty for</p><p class="Preformatted_20_Text">the library, to the extent permitted by applicable law. Except when otherwise</p><p class="Preformatted_20_Text">stated in writing the copyright holders and/or other parties provide the library</p><p class="Preformatted_20_Text">"as is" without warranty of any kind, either expressed or implied, including,</p><p class="Preformatted_20_Text">but not limited to, the implied warranties of merchantability and fitness for a</p><p class="Preformatted_20_Text">particular purpose. The entire risk as to the quality and performance of the</p><p class="Preformatted_20_Text">library is with you. Should the library prove defective, you assume the cost of</p><p class="Preformatted_20_Text">all necessary servicing, repair or correction.</p><p class="Preformatted_20_Text">  16.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      In no event unless required by applicable law or agreed to in writing will</p><p class="Preformatted_20_Text">any copyright holder, or any other party who may modify and/or redistribute the</p><p class="Preformatted_20_Text">library as permitted above, be liable to you for damages, including any general,</p><p class="Preformatted_20_Text">special, incidental or consequential damages arising out of the use or inability</p><p class="Preformatted_20_Text">to use the library (including but not limited to loss of data or data being</p><p class="Preformatted_20_Text">rendered inaccurate or losses sustained by you or third parties or a failure of</p><p class="Preformatted_20_Text">the library to operate with any other software), even if such holder or other</p><p class="Preformatted_20_Text">party has been advised of the possibility of such damages.</p><p class="P2"> </p><p class="P11"> </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: libcurl; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Daniel_Stenberg"><span/></a>Daniel Stenberg</h2><h3 class="Heading_20_3"><a id="a__libcurl"><span/></a>libcurl</h3><p class="P11">Copyright (C) 1998-2001, Daniel Stenberg, , et al. <br/>Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. <br/>In order to be useful for every potential user, the curl and libcurl are dual-licensed under the MPL and the MIT/X-derivate licenses. <br/>You may opt to use, copy, modify, merge, publish, distribute and/or sell copies of the Software, and permit persons to whom the Software is furnished to do so, under the terms of the MPL or the MIT/X-derivate licenses. You may pick one of these licenses. The files MITX.txt and MPL-1.1.txt contain the license texts. <br/>As a courtesy to the open-source and free software community, we ask you to dual-license any modifications that you make as well, under the terms of this document. <br/>Please remember to always keep the licensing information included in individual source files up-to-date, so as to avoid misleading anyone as to the status of these files. <br/>I will use a submission policy according to which I will only enter contributions into the CVS tree if the contributor agrees to both licenses and this dual-license approach. </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Afrikaans dictionary; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Friedel_Wolff"><span/></a>Friedel Wolff</h2><h3 class="Heading_20_3"><a id="a__Afrikaans_dictionary"><span/></a>Afrikaans dictionary</h3><p class="P11"><br/><a href="./#lgpl">Jump to LGPL</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Stavekontrolden (Danish Spellchecker); Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Finn_Gruwier_Larsen"><span/></a>Finn Gruwier Larsen</h2><h3 class="Heading_20_3"><a id="a__Stavekontrolden__Danish_Spellchecker___LGPL_v2_1_"><span/></a>Stavekontrolden (Danish Spellchecker) (LGPL v2.1)</h3><p class="P11"><br/><a href="./#lgpl">jump to GNU Lesser General Public License</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Slovenian spellcheck dictionary; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Jaak_Pruulmann"><span/></a>Jaak Pruulmann</h2><h3 class="Heading_20_3"><a id="a__Estonian_dictionaries"><span/></a>Estonian dictionaries</h3><p class="P11"><br/><a href="./#lgpl">Gnu Lesser General Public License</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: French dictionary; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__dico_savant@free_fr"><span/></a>dico.savant@free.fr</h2><h3 class="Heading_20_3"><a id="a__French_dictionary"><span/></a>French dictionary</h3><p class="P11"><br/><a href="./#mpllic">jump to Mozilla Public License</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Italian dictionary; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Davide_Prina"><span/></a>Davide Prina</h2><h3 class="Heading_20_3"><a id="a__Italian_dictionary"><span/></a>Italian dictionary</h3><p class="P11"><br/><a href="./#gpl">Jump to GPL</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: MySpell-ku (Kurdish Spellchecker); Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Erdal_Ronahi"><span/></a>Erdal Ronahi</h2><h3 class="Heading_20_3"><a id="a__MySpell-ku__Kurdish_Spellchecker___LGPL_v2_1_"><span/></a>MySpell-ku (Kurdish Spellchecker) (LGPL v2.1)</h3><p class="P11"><br/><a href="./#lgpl">jump to GNU Lesser General Public License</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Lithuanian spelling dictionary; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Albertas_Agejevas"><span/></a>Albertas Agejevas</h2><h3 class="Heading_20_3"><a id="a__Lithuaninian_spelling_dictionary"><span/></a>Lithuaninian spelling dictionary</h3><p class="P11"><br/>Copyright (c) Albertas Agejevas , 2000, 2001 <br/>All rights reserved. <br/>Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: <br/>1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. <br/>2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. <br/>3. Neither the name of the Albertas Agejevas nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. <br/>THIS SOFTWARE IS PROVIDED BY ALBERTAS AGEJEVAS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ALBERTAS AGEJEVAS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: 'Nepali dictionares; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Madan_Puraskar_Pustkalaya"><span/></a>Madan Puraskar Pustkalaya</h2><h3 class="Heading_20_3"><a id="a__Nepali_dictionaries"><span/></a>Nepali dictionaries</h3><p class="P11"><br/><a href="./#lgpl">jump to GNU Lesser General Public License</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Polish spelling dictionary; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Marek_Futrega"><span/></a>Marek Futrega</h2><h3 class="Heading_20_3"><a id="a__Polish_spelling_dictionary"><span/></a>Polish spelling dictionary</h3><p class="P11"><br/><a href="./#mpllic">jump to Mozilla Public License</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Slovak dictionary; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Zdenko_Podobny"><span/></a>Zdenko Podobny</h2><h3 class="Heading_20_3"><a id="a__Slovak_dictionary"><span/></a>Slovak dictionary</h3><p class="P11"><br/><a href="./#mpllic">jump to Mozilla Public License</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Slovenian spellcheck dictionary; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Ales_Kosir"><span/></a>Ales Kosir</h2><h3 class="Heading_20_3"><a id="a__Slovenian_spellcheck_dictionary"><span/></a>Slovenian spellcheck dictionary</h3><p class="P11"><br/><a href="./#lgpl">Gnu Lesser General Public License</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: dictionaries for South African English; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__David_Bartlett_and_Andrew_Brown"><span/></a>David Bartlett and Andrew Brown</h2><h3 class="Heading_20_3"><a id="a__dictionaries_for_South_African_English"><span/></a>dictionaries for South African English</h3><p class="P11"><br/><a href="./#lgpl">jump to GNU Lesser General Public License</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Swedish dictionary; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Göran_Anderson"><span/></a>Göran Anderson</h2><h3 class="Heading_20_3"><a id="a__Swedish_dictionary"><span/></a>Swedish dictionary</h3><p class="P11"><br/><a href="./#lgpl">jump to GNU Lesser General Public License</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: expat XML Parser Toolkit; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__James_Clark"><span/></a>James Clark</h2><h3 class="Heading_20_3"><a id="a__expat_XML_Parser_Toolkit"><span/></a>expat XML Parser Toolkit</h3><p class="P11">Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper <br/>Copyright (c) 2001, 2002, 2003 Expat maintainers. <br/>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: <br/>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. <br/>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Freetype; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Freetype_Project"><span/></a>Freetype Project</h2><h3 class="Heading_20_3"><a id="a__Freetype_Library"><span/></a>Freetype Library</h3><p class="P11"><br/>Legal Terms <br/>=========== <br/><br/>0. Definitions <br/>-------------- <br/>Throughout this license, the terms `package', `FreeType Project', and `FreeType archive' refer to the set of files originally distributed by the authors (David Turner, Robert Wilhelm, and Werner Lemberg) as the `FreeType Project', be they named as alpha, beta or final release. <br/>`You' refers to the licensee, or person using the project, where `using' is a generic term including compiling the project's source code as well as linking it to form a `program' or `executable'. This program is referred to as `a program using the FreeType engine'. <br/>This license applies to all files distributed in the original FreeType Project, including all source code, binaries and documentation, unless otherwise stated in the file in its original, unmodified form as distributed in the original archive. If you are unsure whether or not a particular file is covered by this license, you must contact us to verify this. <br/>The FreeType Project is copyright (C) 1996-2000 by David Turner, Robert Wilhelm, and Werner Lemberg. All rights reserved except as specified below. <br/><br/>1. No Warranty <br/>-------------- <br/>THE FREETYPE PROJECT IS PROVIDED `AS IS' WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT WILL ANY OF THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY DAMAGES CAUSED BY THE USE OR THE INABILITY TO USE, OF THE FREETYPE PROJECT. <br/><br/>2. Redistribution <br/>----------------- <br/>This license grants a worldwide, royalty-free, perpetual and irrevocable right and license to use, execute, perform, compile, display, copy, create derivative works of, distribute and sublicense the FreeType Project (in both source and object code forms) and derivative works thereof for any purpose; and to authorize others to exercise some or all of the rights granted herein, subject to the following conditions: <br/>o Redistribution of source code must retain this license file (`FTL.TXT') unaltered; any additions, deletions or changes to the original files must be clearly indicated in accompanying documentation. The copyright notices of the unaltered, original files must be preserved in all copies of source files. <br/>o Redistribution in binary form must provide a disclaimer that states that the software is based in part of the work of the FreeType Team, in the distribution documentation. We also encourage you to put an URL to the FreeType web page in your documentation, though this isn't mandatory. <br/><br/>These conditions apply to any software derived from or based on the FreeType Project, not just the unmodified files. If you use our work, you must acknowledge us. However, no fee need be paid to us. <br/><br/>3. Advertising <br/>-------------- <br/>Neither the FreeType authors and contributors nor you shall use the name of the other for commercial, advertising, or promotional purposes without specific prior written permission. <br/>We suggest, but do not require, that you use one or more of the following phrases to refer to this software in your documentation or advertising materials: `FreeType Project', `FreeType Engine', `FreeType library', or `FreeType Distribution'. <br/>As you have not signed this license, you are not required to accept it. However, as the FreeType Project is copyrighted material, only this license, or another one contracted with the authors, grants you the right to use, distribute, and modify it. Therefore, by using, distributing, or modifying the FreeType Project, you indicate that you understand and accept all the terms of this license. <br/><br/>4. Contacts <br/>----------- <br/>There are two mailing lists related to FreeType: <br/>o freetype@freetype.org <br/>Discusses general use and applications of FreeType, as well as future and wanted additions to the library and distribution. If you are looking for support, start in this list if you haven't found anything to help you in the documentation. <br/>o devel@freetype.org <br/>Discusses bugs, as well as engine internals, design issues, specific licenses, porting, etc. <br/>o http://www.freetype.org <br/>Holds the current FreeType web page, which will allow you to download our latest development version and read online documentation. <br/><br/>You can also contact us individually at: <br/><br/>David Turner <br/>Robert Wilhelm <br/>Werner Lemberg </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: GTK+ (The Gimp Toolkit); Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__gimp_org"><span/></a>gimp.org</h2><h3 class="Heading_20_3"><a id="a__The_Gimp_Toolkit__GTK__"><span/></a>The Gimp Toolkit (GTK+)</h3><p class="P11"><a href="./#lgpl">jump to LGPL</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product:HSQL Database Engine; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Thomas_Mueller_and_the_Hypersonic_SQL_Group_"><span/></a>Thomas Mueller and the Hypersonic SQL Group: </h2><h3 class="Heading_20_3"><a id="a__HSQLDB"><span/></a>HSQLDB</h3><p class="P7"><br/><span class="T4">ORIGINAL LICENSE (a.k.a. "hypersonic_lic.txt")</span></p><p class="P7"><span class="T4">For content, code, and products originally developed by Thomas Mueller and the Hypersonic SQL Group:</span><br/><br/>Copyright (c) 1995-2000 by the Hypersonic SQL Group.<br/>All rights reserved. </p><p class="Text_20_body">Redistribution and use in source and binary forms, with or without<br/>modification, are permitted provided that the following conditions are met:<br/><br/>Redistributions of source code must retain the above copyright notice, this<br/>list of conditions and the following disclaimer.<br/><br/>Redistributions in binary form must reproduce the above copyright notice,<br/>this list of conditions and the following disclaimer in the documentation<br/>and/or other materials provided with the distribution.<br/><br/>Neither the name of the Hypersonic SQL Group nor the names of its<br/>contributors may be used to endorse or promote products derived from this<br/>software without specific prior written permission.<br/><br/>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"<br/>AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE<br/>IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE<br/>ARE DISCLAIMED. IN NO EVENT SHALL THE HYPERSONIC SQL GROUP, <br/>OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, <br/>EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, <br/>PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;<br/>LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND<br/>ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT<br/>(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS<br/>SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p><p class="P7">This software consists of voluntary contributions made by many individuals on behalf of the<br/>Hypersonic SQL Group.</p><h4 class="P1"><a id="a__For_work_added_by_the_HSQL_Development_Group__a_k_a__hsqldb_lic_txt__"><span/></a>For work added by the HSQL Development Group (a.k.a. hsqldb_lic.txt):</h4><p class="Text_20_body">Copyright (c) 2001-2004, The HSQL Development Group<br/>All rights reserved.<br/><br/>Redistribution and use in source and binary forms, with or without<br/>modification, are permitted provided that the following conditions are met:<br/><br/>Redistributions of source code must retain the above copyright notice, this<br/>list of conditions and the following disclaimer.<br/><br/>Redistributions in binary form must reproduce the above copyright notice,<br/>this list of conditions and the following disclaimer in the documentation<br/>and/or other materials provided with the distribution.<br/><br/>Neither the name of the HSQL Development Group nor the names of its<br/>contributors may be used to endorse or promote products derived from this<br/>software without specific prior written permission.<br/><br/>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"<br/>AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE<br/>IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE<br/>ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, <br/>OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, <br/>EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, <br/>PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;<br/>LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND<br/>ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT<br/>(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS<br/>SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p><p class="P11"> </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Polish hyphenation dictionary; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Bence_Nagy"><span/></a>Bence Nagy</h2><h3 class="Heading_20_3"><a id="a__Hungarian_hyphenation_dictionary"><span/></a>Hungarian hyphenation dictionary</h3><p class="P11"><br/><a href="./#gpl">Lesser Gnu Library License</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Lithuanian pattern for hyphenation; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__n_a"><span/></a>n/a</h2><h3 class="Heading_20_3"><a id="a__Lithuanian_pattern_for_hyphenation"><span/></a>Lithuanian pattern for hyphenation</h3><p class="P11"><br/><a href="./#lppl">jump to the LaTeX Project Public License</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Polish hyphenation dictionary; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Adam_Polaczynski"><span/></a>Adam Polaczynski</h2><h3 class="Heading_20_3"><a id="a__Polish_hyphenation_dictionary"><span/></a>Polish hyphenation dictionary</h3><p class="P11"><br/><a href="./#lgpl">Lesser Gnu Library License</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Slovenian pattern for hyphenation; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Matjaz_Vrecko"><span/></a>Matjaz Vrecko</h2><h3 class="Heading_20_3"><a id="a__Slovenian_pattern_for_hyphenation"><span/></a>Slovenian pattern for hyphenation</h3><p class="P11"><br/><a href="./#lgpl">Lesser Gnu Library License</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Zulu hyphenation dictionary; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Friedel_Wolff"><span/></a>Friedel Wolff</h2><h3 class="Heading_20_3"><a id="a__Zulu_hyphenation_dictionary"><span/></a>Zulu hyphenation dictionary</h3><p class="P11"><br/><a href="./#lgpl">Lesser Gnu Library License</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: ICU; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__International_Business_Machine_Corporation__IBM_"><span/></a>International Business Machine Corporation (IBM)</h2><h3 class="Heading_20_3"><a id="a__ICU"><span/></a>ICU</h3><h4 class="Heading_20_4"><a id="a__ICU_License_-_ICU_1_8_1_and_later"><span/></a>ICU License - ICU 1.8.1 and later</h4><p class="Preformatted_20_Text">COPYRIGHT AND PERMISSION NOTICE</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Copyright (c) 1995-2002 International Business Machines Corporation and others</p><p class="Preformatted_20_Text">All rights reserved.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Permission is hereby granted, free of charge, to any person obtaining a</p><p class="Preformatted_20_Text">copy of this software and associated documentation files (the</p><p class="Preformatted_20_Text">"Software"), to deal in the Software without restriction, including</p><p class="Preformatted_20_Text">without limitation the rights to use, copy, modify, merge, publish,</p><p class="Preformatted_20_Text">distribute, and/or sell copies of the Software, and to permit persons</p><p class="Preformatted_20_Text">to whom the Software is furnished to do so, provided that the above</p><p class="Preformatted_20_Text">copyright notice(s) and this permission notice appear in all copies of</p><p class="Preformatted_20_Text">the Software and that both the above copyright notice(s) and this</p><p class="Preformatted_20_Text">permission notice appear in supporting documentation.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS</p><p class="Preformatted_20_Text">OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</p><p class="Preformatted_20_Text">MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT</p><p class="Preformatted_20_Text">OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR</p><p class="Preformatted_20_Text">HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL</p><p class="Preformatted_20_Text">INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING</p><p class="Preformatted_20_Text">FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,</p><p class="Preformatted_20_Text">NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION</p><p class="Preformatted_20_Text">WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Except as contained in this notice, the name of a copyright holder</p><p class="Preformatted_20_Text">shall not be used in advertising or otherwise to promote the sale, use</p><p class="Preformatted_20_Text">or other dealings in this Software without prior written authorization</p><p class="Preformatted_20_Text">of the copyright holder.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">--------------------------------------------------------------------------------</p><p class="P2">All trademarks and registered trademarks mentioned herein are the property of their respective owners.</p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: JDOM; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Jason_Hunter__Brett_McLaughlin"><span/></a>Jason Hunter, Brett McLaughlin</h2><h3 class="Heading_20_3"><a id="a__JDOM"><span/></a>JDOM</h3><p class="P11">Copyright (C) 2000-2004 Jason Hunter &amp; Brett McLaughlin. All rights reserved. <br/>Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: <br/>1. Redistributions of source code must retain the above copyright notice, this list of conditions, and the following disclaimer. <br/>2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions, and the disclaimer that follows these conditions in the documentation and/or other materials provided with the distribution. <br/>3. The name "JDOM" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact . <br/>4. Products derived from this software may not be called "JDOM", nor may "JDOM" appear in their name, without prior written permission from the JDOM Project Management . <br/>In addition, we request (but do not require) that you include in the end-user documentation provided with the redistribution and/or in the software itself an acknowledgement equivalent to the following: <br/>"This product includes software developed by the JDOM Project (http://www.jdom.org/)." <br/>Alternatively, the acknowledgment may be graphical using the logos available at http://www.jdom.org/images/logos. <br/>THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <br/>This software consists of voluntary contributions made by many individuals on behalf of the JDOM Project and was originally created by Jason Hunter and Brett McLaughlin . For more information on the JDOM Project, please see . </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: IJG JPEG Library; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Independent_JPEG_Group__IJG_"><span/></a>Independent JPEG Group (IJG)</h2><h3 class="Heading_20_3"><a id="a__IJG_JPEG_Library"><span/></a>IJG JPEG Library</h3><p class="Preformatted_20_Text">LEGAL ISSUES</p><p class="Preformatted_20_Text">============</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">In plain English:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">1. We don't promise that this software works.  (But if you find any bugs,</p><p class="Preformatted_20_Text">   please let us know!)</p><p class="Preformatted_20_Text">2. You can use this software for whatever you want.  You don't have to pay us.</p><p class="Preformatted_20_Text">3. You may not pretend that you wrote this software.  If you use it in a</p><p class="Preformatted_20_Text">   program, you must acknowledge somewhere in your documentation that</p><p class="Preformatted_20_Text">   you've used the IJG code.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">In legalese:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">The authors make NO WARRANTY or representation, either express or implied,</p><p class="Preformatted_20_Text">with respect to this software, its quality, accuracy, merchantability, or</p><p class="Preformatted_20_Text">fitness for a particular purpose.  This software is provided "AS IS", and you,</p><p class="Preformatted_20_Text">its user, assume the entire risk as to its quality and accuracy.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">This software is copyright (C) 1991-1998, Thomas G. Lane.</p><p class="Preformatted_20_Text">All Rights Reserved except as specified below.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Permission is hereby granted to use, copy, modify, and distribute this</p><p class="Preformatted_20_Text">software (or portions thereof) for any purpose, without fee, subject to these</p><p class="Preformatted_20_Text">conditions:</p><p class="Preformatted_20_Text">(1) If any part of the source code for this software is distributed, then this</p><p class="Preformatted_20_Text">README file must be included, with this copyright and no-warranty notice</p><p class="Preformatted_20_Text">unaltered; and any additions, deletions, or changes to the original files</p><p class="Preformatted_20_Text">must be clearly indicated in accompanying documentation.</p><p class="Preformatted_20_Text">(2) If only executable code is distributed, then the accompanying</p><p class="Preformatted_20_Text">documentation must state that "this software is based in part on the work of</p><p class="Preformatted_20_Text">the Independent JPEG Group".</p><p class="Preformatted_20_Text">(3) Permission for use of this software is granted only if the user accepts</p><p class="Preformatted_20_Text">full responsibility for any undesirable consequences; the authors accept</p><p class="Preformatted_20_Text">NO LIABILITY for damages of any kind.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">These conditions apply to any software derived from or based on the IJG code,</p><p class="Preformatted_20_Text">not just to the unmodified library.  If you use our work, you ought to</p><p class="Preformatted_20_Text">acknowledge us.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Permission is NOT granted for the use of any IJG author's name or company name</p><p class="Preformatted_20_Text">in advertising or publicity relating to this software or products derived from</p><p class="Preformatted_20_Text">it.  This software may be referred to only as "the Independent JPEG Group's</p><p class="Preformatted_20_Text">software".</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">We specifically permit and encourage the use of this software as the basis of</p><p class="Preformatted_20_Text">commercial products, provided that all warranty or liability claims are</p><p class="Preformatted_20_Text">assumed by the product vendor.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">ansi2knr.c is included in this distribution by permission of L. Peter Deutsch,</p><p class="Preformatted_20_Text">sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA.</p><p class="Preformatted_20_Text">ansi2knr.c is NOT covered by the above copyright and conditions, but instead</p><p class="Preformatted_20_Text">by the usual distribution terms of the Free Software Foundation; principally,</p><p class="Preformatted_20_Text">that you must include source code if you redistribute it.  (See the file</p><p class="Preformatted_20_Text">ansi2knr.c for full details.)  However, since ansi2knr.c is not needed as part</p><p class="Preformatted_20_Text">of any program generated from the IJG code, this does not limit you more than</p><p class="Preformatted_20_Text">the foregoing paragraphs do.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">The Unix configuration script "configure" was produced with GNU Autoconf.</p><p class="Preformatted_20_Text">It is copyright by the Free Software Foundation but is freely distributable.</p><p class="Preformatted_20_Text">The same holds for its supporting scripts (config.guess, config.sub,</p><p class="Preformatted_20_Text">ltconfig, ltmain.sh).  Another support script, install-sh, is copyright</p><p class="Preformatted_20_Text">by M.I.T. but is also freely distributable.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">It appears that the arithmetic coding option of the JPEG spec is covered by</p><p class="Preformatted_20_Text">patents owned by IBM, AT&amp;T, and Mitsubishi.  Hence arithmetic coding cannot</p><p class="Preformatted_20_Text">legally be used without obtaining one or more licenses.  For this reason,</p><p class="Preformatted_20_Text">support for arithmetic coding has been removed from the free JPEG software.</p><p class="Preformatted_20_Text">(Since arithmetic coding provides only a marginal gain over the unpatented</p><p class="Preformatted_20_Text">Huffman mode, it is unlikely that very many implementations will support it.)</p><p class="Preformatted_20_Text">So far as we are aware, there are no patent restrictions on the remaining</p><p class="Preformatted_20_Text">code.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">The IJG distribution formerly included code to read and write GIF files.</p><p class="Preformatted_20_Text">To avoid entanglement with the Unisys LZW patent, GIF reading support has</p><p class="Preformatted_20_Text">been removed altogether, and the GIF writer has been simplified to produce</p><p class="Preformatted_20_Text">"uncompressed GIFs".  This technique does not use the LZW algorithm; the</p><p class="Preformatted_20_Text">resulting GIF files are larger than usual, but are readable by all standard</p><p class="Preformatted_20_Text">GIF decoders.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">We are required to state that</p><p class="Preformatted_20_Text">    "The Graphics Interchange Format(c) is the Copyright property of</p><p class="Preformatted_20_Text">    CompuServe Incorporated.  GIF(sm) is a Service Mark property of</p><p class="Preformatted_20_Text">    CompuServe Incorporated."</p><p class="P2"> </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: libegg; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Anders_Carlson"><span/></a>Anders Carlson </h2><h3 class="Heading_20_3"><a id="a__libegg"><span/></a>libegg</h3><p class="P11"><a href="./#lgpl">jump to LGPL</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: libmspack; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Stuart_Caie"><span/></a>Stuart Caie </h2><h3 class="Heading_20_3"><a id="a__libmspack"><span/></a>libmspack</h3><p class="P11"><a href="./#lgpl">jump to LGPL</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Redland RDF Library librdf; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Dave_Beckett"><span/></a>Dave Beckett</h2><h3 class="Heading_20_3"><a id="a__librdf"><span/></a>librdf</h3><p class="P11"><a href="./#lgpl">jump to LGPL</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: GNU ISO C++ Library; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Free_Software_Foundation__Inc_"><span/></a>Free Software Foundation, Inc.</h2><h3 class="Heading_20_3"><a id="a__GNU_ISO_C___Library"><span/></a>GNU ISO C++ Library</h3><p class="Text_20_body"><br/><a href="./#gpl">Jump to GPL</a></p><p class="Preformatted_20_Text">GNU GENERAL PUBLIC LICENSE</p><p class="Preformatted_20_Text">                       Version 2, June 1991</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text"> Copyright (C) 1989, 1991 Free Software Foundation, Inc.</p><p class="Preformatted_20_Text">     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA</p><p class="Preformatted_20_Text"> Everyone is permitted to copy and distribute verbatim copies</p><p class="Preformatted_20_Text"> of this license document, but changing it is not allowed.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">                            Preamble</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  The licenses for most software are designed to take away your</p><p class="Preformatted_20_Text">freedom to share and change it.  By contrast, the GNU General Public</p><p class="Preformatted_20_Text">License is intended to guarantee your freedom to share and change free</p><p class="Preformatted_20_Text">software--to make sure the software is free for all its users.  This</p><p class="Preformatted_20_Text">General Public License applies to most of the Free Software</p><p class="Preformatted_20_Text">Foundation's software and to any other program whose authors commit to</p><p class="Preformatted_20_Text">using it.  (Some other Free Software Foundation software is covered by</p><p class="Preformatted_20_Text">the GNU Library General Public License instead.)  You can apply it to</p><p class="Preformatted_20_Text">your programs, too.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  When we speak of free software, we are referring to freedom, not</p><p class="Preformatted_20_Text">price.  Our General Public Licenses are designed to make sure that you</p><p class="Preformatted_20_Text">have the freedom to distribute copies of free software (and charge for</p><p class="Preformatted_20_Text">this service if you wish), that you receive source code or can get it</p><p class="Preformatted_20_Text">if you want it, that you can change the software or use pieces of it</p><p class="Preformatted_20_Text">in new free programs; and that you know you can do these things.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  To protect your rights, we need to make restrictions that forbid</p><p class="Preformatted_20_Text">anyone to deny you these rights or to ask you to surrender the rights.</p><p class="Preformatted_20_Text">These restrictions translate to certain responsibilities for you if you</p><p class="Preformatted_20_Text">distribute copies of the software, or if you modify it.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  For example, if you distribute copies of such a program, whether</p><p class="Preformatted_20_Text">gratis or for a fee, you must give the recipients all the rights that</p><p class="Preformatted_20_Text">you have.  You must make sure that they, too, receive or can get the</p><p class="Preformatted_20_Text">source code.  And you must show them these terms so they know their</p><p class="Preformatted_20_Text">rights.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  We protect your rights with two steps: (1) copyright the software, and</p><p class="Preformatted_20_Text">(2) offer you this license which gives you legal permission to copy,</p><p class="Preformatted_20_Text">distribute and/or modify the software.</p><p class="Preformatted_20_Text"/><p class="Preformatted_20_Text">  Also, for each author's protection and ours, we want to make certain</p><p class="Preformatted_20_Text">that everyone understands that there is no warranty for this free</p><p class="Preformatted_20_Text">software.  If the software is modified by someone else and passed on, we</p><p class="Preformatted_20_Text">want its recipients to know that what they have is not the original, so</p><p class="Preformatted_20_Text">that any problems introduced by others will not reflect on the original</p><p class="Preformatted_20_Text">authors' reputations.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  Finally, any free program is threatened constantly by software</p><p class="Preformatted_20_Text">patents.  We wish to avoid the danger that redistributors of a free</p><p class="Preformatted_20_Text">program will individually obtain patent licenses, in effect making the</p><p class="Preformatted_20_Text">program proprietary.  To prevent this, we have made it clear that any</p><p class="Preformatted_20_Text">patent must be licensed for everyone's free use or not licensed at all.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  The precise terms and conditions for copying, distribution and</p><p class="Preformatted_20_Text">modification follow.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">                    GNU GENERAL PUBLIC LICENSE</p><p class="Preformatted_20_Text">   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  0. This License applies to any program or other work which contains</p><p class="Preformatted_20_Text">a notice placed by the copyright holder saying it may be distributed</p><p class="Preformatted_20_Text">under the terms of this General Public License.  The "Program", below,</p><p class="Preformatted_20_Text">refers to any such program or work, and a "work based on the Program"</p><p class="Preformatted_20_Text">means either the Program or any derivative work under copyright law:</p><p class="Preformatted_20_Text">that is to say, a work containing the Program or a portion of it,</p><p class="Preformatted_20_Text">either verbatim or with modifications and/or translated into another</p><p class="Preformatted_20_Text">language.  (Hereinafter, translation is included without limitation in</p><p class="Preformatted_20_Text">the term "modification".)  Each licensee is addressed as "you".</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Activities other than copying, distribution and modification are not</p><p class="Preformatted_20_Text">covered by this License; they are outside its scope.  The act of</p><p class="Preformatted_20_Text">running the Program is not restricted, and the output from the Program</p><p class="Preformatted_20_Text">is covered only if its contents constitute a work based on the</p><p class="Preformatted_20_Text">Program (independent of having been made by running the Program).</p><p class="Preformatted_20_Text">Whether that is true depends on what the Program does.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  1. You may copy and distribute verbatim copies of the Program's</p><p class="Preformatted_20_Text">source code as you receive it, in any medium, provided that you</p><p class="Preformatted_20_Text">conspicuously and appropriately publish on each copy an appropriate</p><p class="Preformatted_20_Text">copyright notice and disclaimer of warranty; keep intact all the</p><p class="Preformatted_20_Text">notices that refer to this License and to the absence of any warranty;</p><p class="Preformatted_20_Text">and give any other recipients of the Program a copy of this License</p><p class="Preformatted_20_Text">along with the Program.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">You may charge a fee for the physical act of transferring a copy, and</p><p class="Preformatted_20_Text">you may at your option offer warranty protection in exchange for a fee.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  2. You may modify your copy or copies of the Program or any portion</p><p class="Preformatted_20_Text">of it, thus forming a work based on the Program, and copy and</p><p class="Preformatted_20_Text">distribute such modifications or work under the terms of Section 1</p><p class="Preformatted_20_Text">above, provided that you also meet all of these conditions:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    a) You must cause the modified files to carry prominent notices</p><p class="Preformatted_20_Text">    stating that you changed the files and the date of any change.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    b) You must cause any work that you distribute or publish, that in</p><p class="Preformatted_20_Text">    whole or in part contains or is derived from the Program or any</p><p class="Preformatted_20_Text">    part thereof, to be licensed as a whole at no charge to all third</p><p class="Preformatted_20_Text">    parties under the terms of this License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    c) If the modified program normally reads commands interactively</p><p class="Preformatted_20_Text">    when run, you must cause it, when started running for such</p><p class="Preformatted_20_Text">    interactive use in the most ordinary way, to print or display an</p><p class="Preformatted_20_Text">    announcement including an appropriate copyright notice and a</p><p class="Preformatted_20_Text">    notice that there is no warranty (or else, saying that you provide</p><p class="Preformatted_20_Text">    a warranty) and that users may redistribute the program under</p><p class="Preformatted_20_Text">    these conditions, and telling the user how to view a copy of this</p><p class="Preformatted_20_Text">    License.  (Exception: if the Program itself is interactive but</p><p class="Preformatted_20_Text">    does not normally print such an announcement, your work based on</p><p class="Preformatted_20_Text">    the Program is not required to print an announcement.)</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">These requirements apply to the modified work as a whole.  If</p><p class="Preformatted_20_Text">identifiable sections of that work are not derived from the Program,</p><p class="Preformatted_20_Text">and can be reasonably considered independent and separate works in</p><p class="Preformatted_20_Text">themselves, then this License, and its terms, do not apply to those</p><p class="Preformatted_20_Text">sections when you distribute them as separate works.  But when you</p><p class="Preformatted_20_Text">distribute the same sections as part of a whole which is a work based</p><p class="Preformatted_20_Text">on the Program, the distribution of the whole must be on the terms of</p><p class="Preformatted_20_Text">this License, whose permissions for other licensees extend to the</p><p class="Preformatted_20_Text">entire whole, and thus to each and every part regardless of who wrote it.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Thus, it is not the intent of this section to claim rights or contest</p><p class="Preformatted_20_Text">your rights to work written entirely by you; rather, the intent is to</p><p class="Preformatted_20_Text">exercise the right to control the distribution of derivative or</p><p class="Preformatted_20_Text">collective works based on the Program.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">In addition, mere aggregation of another work not based on the Program</p><p class="Preformatted_20_Text">with the Program (or with a work based on the Program) on a volume of</p><p class="Preformatted_20_Text">a storage or distribution medium does not bring the other work under</p><p class="Preformatted_20_Text">the scope of this License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  3. You may copy and distribute the Program (or a work based on it,</p><p class="Preformatted_20_Text">under Section 2) in object code or executable form under the terms of</p><p class="Preformatted_20_Text">Sections 1 and 2 above provided that you also do one of the following:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    a) Accompany it with the complete corresponding machine-readable</p><p class="Preformatted_20_Text">    source code, which must be distributed under the terms of Sections</p><p class="Preformatted_20_Text">    1 and 2 above on a medium customarily used for software interchange; or,</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    b) Accompany it with a written offer, valid for at least three</p><p class="Preformatted_20_Text">    years, to give any third party, for a charge no more than your</p><p class="Preformatted_20_Text">    cost of physically performing source distribution, a complete</p><p class="Preformatted_20_Text">    machine-readable copy of the corresponding source code, to be</p><p class="Preformatted_20_Text">    distributed under the terms of Sections 1 and 2 above on a medium</p><p class="Preformatted_20_Text">    customarily used for software interchange; or,</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    c) Accompany it with the information you received as to the offer</p><p class="Preformatted_20_Text">    to distribute corresponding source code.  (This alternative is</p><p class="Preformatted_20_Text">    allowed only for noncommercial distribution and only if you</p><p class="Preformatted_20_Text">    received the program in object code or executable form with such</p><p class="Preformatted_20_Text">    an offer, in accord with Subsection b above.)</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">The source code for a work means the preferred form of the work for</p><p class="Preformatted_20_Text">making modifications to it.  For an executable work, complete source</p><p class="Preformatted_20_Text">code means all the source code for all modules it contains, plus any</p><p class="Preformatted_20_Text">associated interface definition files, plus the scripts used to</p><p class="Preformatted_20_Text">control compilation and installation of the executable.  However, as a</p><p class="Preformatted_20_Text">special exception, the source code distributed need not include</p><p class="Preformatted_20_Text">anything that is normally distributed (in either source or binary</p><p class="Preformatted_20_Text">form) with the major components (compiler, kernel, and so on) of the</p><p class="Preformatted_20_Text">operating system on which the executable runs, unless that component</p><p class="Preformatted_20_Text">itself accompanies the executable.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">If distribution of executable or object code is made by offering</p><p class="Preformatted_20_Text">access to copy from a designated place, then offering equivalent</p><p class="Preformatted_20_Text">access to copy the source code from the same place counts as</p><p class="Preformatted_20_Text">distribution of the source code, even though third parties are not</p><p class="Preformatted_20_Text">compelled to copy the source along with the object code.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  4. You may not copy, modify, sublicense, or distribute the Program</p><p class="Preformatted_20_Text">except as expressly provided under this License.  Any attempt</p><p class="Preformatted_20_Text">otherwise to copy, modify, sublicense or distribute the Program is</p><p class="Preformatted_20_Text">void, and will automatically terminate your rights under this License.</p><p class="Preformatted_20_Text">However, parties who have received copies, or rights, from you under</p><p class="Preformatted_20_Text">this License will not have their licenses terminated so long as such</p><p class="Preformatted_20_Text">parties remain in full compliance.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  5. You are not required to accept this License, since you have not</p><p class="Preformatted_20_Text">signed it.  However, nothing else grants you permission to modify or</p><p class="Preformatted_20_Text">distribute the Program or its derivative works.  These actions are</p><p class="Preformatted_20_Text">prohibited by law if you do not accept this License.  Therefore, by</p><p class="Preformatted_20_Text">modifying or distributing the Program (or any work based on the</p><p class="Preformatted_20_Text">Program), you indicate your acceptance of this License to do so, and</p><p class="Preformatted_20_Text">all its terms and conditions for copying, distributing or modifying</p><p class="Preformatted_20_Text">the Program or works based on it.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  6. Each time you redistribute the Program (or any work based on the</p><p class="Preformatted_20_Text">Program), the recipient automatically receives a license from the</p><p class="Preformatted_20_Text">original licensor to copy, distribute or modify the Program subject to</p><p class="Preformatted_20_Text">these terms and conditions.  You may not impose any further</p><p class="Preformatted_20_Text">restrictions on the recipients' exercise of the rights granted herein.</p><p class="Preformatted_20_Text">You are not responsible for enforcing compliance by third parties to</p><p class="Preformatted_20_Text">this License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  7. If, as a consequence of a court judgment or allegation of patent</p><p class="Preformatted_20_Text">infringement or for any other reason (not limited to patent issues),</p><p class="Preformatted_20_Text">conditions are imposed on you (whether by court order, agreement or</p><p class="Preformatted_20_Text">otherwise) that contradict the conditions of this License, they do not</p><p class="Preformatted_20_Text">excuse you from the conditions of this License.  If you cannot</p><p class="Preformatted_20_Text">distribute so as to satisfy simultaneously your obligations under this</p><p class="Preformatted_20_Text">License and any other pertinent obligations, then as a consequence you</p><p class="Preformatted_20_Text">may not distribute the Program at all.  For example, if a patent</p><p class="Preformatted_20_Text">license would not permit royalty-free redistribution of the Program by</p><p class="Preformatted_20_Text">all those who receive copies directly or indirectly through you, then</p><p class="Preformatted_20_Text">the only way you could satisfy both it and this License would be to</p><p class="Preformatted_20_Text">refrain entirely from distribution of the Program.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">If any portion of this section is held invalid or unenforceable under</p><p class="Preformatted_20_Text">any particular circumstance, the balance of the section is intended to</p><p class="Preformatted_20_Text">apply and the section as a whole is intended to apply in other</p><p class="Preformatted_20_Text">circumstances.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">It is not the purpose of this section to induce you to infringe any</p><p class="Preformatted_20_Text">patents or other property right claims or to contest validity of any</p><p class="Preformatted_20_Text">such claims; this section has the sole purpose of protecting the</p><p class="Preformatted_20_Text">integrity of the free software distribution system, which is</p><p class="Preformatted_20_Text">implemented by public license practices.  Many people have made</p><p class="Preformatted_20_Text">generous contributions to the wide range of software distributed</p><p class="Preformatted_20_Text">through that system in reliance on consistent application of that</p><p class="Preformatted_20_Text">system; it is up to the author/donor to decide if he or she is willing</p><p class="Preformatted_20_Text">to distribute software through any other system and a licensee cannot</p><p class="Preformatted_20_Text">impose that choice.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">This section is intended to make thoroughly clear what is believed to</p><p class="Preformatted_20_Text">be a consequence of the rest of this License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  8. If the distribution and/or use of the Program is restricted in</p><p class="Preformatted_20_Text">certain countries either by patents or by copyrighted interfaces, the</p><p class="Preformatted_20_Text">original copyright holder who places the Program under this License</p><p class="Preformatted_20_Text">may add an explicit geographical distribution limitation excluding</p><p class="Preformatted_20_Text">those countries, so that distribution is permitted only in or among</p><p class="Preformatted_20_Text">countries not thus excluded.  In such case, this License incorporates</p><p class="Preformatted_20_Text">the limitation as if written in the body of this License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  9. The Free Software Foundation may publish revised and/or new versions</p><p class="Preformatted_20_Text">of the General Public License from time to time.  Such new versions will</p><p class="Preformatted_20_Text">be similar in spirit to the present version, but may differ in detail to</p><p class="Preformatted_20_Text">address new problems or concerns.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Each version is given a distinguishing version number.  If the Program</p><p class="Preformatted_20_Text">specifies a version number of this License which applies to it and "any</p><p class="Preformatted_20_Text">later version", you have the option of following the terms and conditions</p><p class="Preformatted_20_Text">either of that version or of any later version published by the Free</p><p class="Preformatted_20_Text">Software Foundation.  If the Program does not specify a version number of</p><p class="Preformatted_20_Text">this License, you may choose any version ever published by the Free Software</p><p class="Preformatted_20_Text">Foundation.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  10. If you wish to incorporate parts of the Program into other free</p><p class="Preformatted_20_Text">programs whose distribution conditions are different, write to the author</p><p class="Preformatted_20_Text">to ask for permission.  For software which is copyrighted by the Free</p><p class="Preformatted_20_Text">Software Foundation, write to the Free Software Foundation; we sometimes</p><p class="Preformatted_20_Text">make exceptions for this.  Our decision will be guided by the two goals</p><p class="Preformatted_20_Text">of preserving the free status of all derivatives of our free software and</p><p class="Preformatted_20_Text">of promoting the sharing and reuse of software generally.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">                            NO WARRANTY</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY</p><p class="Preformatted_20_Text">FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN</p><p class="Preformatted_20_Text">OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES</p><p class="Preformatted_20_Text">PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED</p><p class="Preformatted_20_Text">OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF</p><p class="Preformatted_20_Text">MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS</p><p class="Preformatted_20_Text">TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE</p><p class="Preformatted_20_Text">PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,</p><p class="Preformatted_20_Text">REPAIR OR CORRECTION.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING</p><p class="Preformatted_20_Text">WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR</p><p class="Preformatted_20_Text">REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,</p><p class="Preformatted_20_Text">INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING</p><p class="Preformatted_20_Text">OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED</p><p class="Preformatted_20_Text">TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY</p><p class="Preformatted_20_Text">YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER</p><p class="Preformatted_20_Text">PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE</p><p class="Preformatted_20_Text">POSSIBILITY OF SUCH DAMAGES.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">                     END OF TERMS AND CONDITIONS</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">            How to Apply These Terms to Your New Programs</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  If you develop a new program, and you want it to be of the greatest</p><p class="Preformatted_20_Text">possible use to the public, the best way to achieve this is to make it</p><p class="Preformatted_20_Text">free software which everyone can redistribute and change under these terms.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  To do so, attach the following notices to the program.  It is safest</p><p class="Preformatted_20_Text">to attach them to the start of each source file to most effectively</p><p class="Preformatted_20_Text">convey the exclusion of warranty; and each file should have at least</p><p class="Preformatted_20_Text">the "copyright" line and a pointer to where the full notice is found.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    </p><p class="Preformatted_20_Text">    Copyright (C)   </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    This program is free software; you can redistribute it and/or modify</p><p class="Preformatted_20_Text">    it under the terms of the GNU General Public License as published by</p><p class="Preformatted_20_Text">    the Free Software Foundation; either version 2 of the License, or</p><p class="Preformatted_20_Text">    (at your option) any later version.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    This program is distributed in the hope that it will be useful,</p><p class="Preformatted_20_Text">    but WITHOUT ANY WARRANTY; without even the implied warranty of</p><p class="Preformatted_20_Text">    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</p><p class="Preformatted_20_Text">    GNU General Public License for more details.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    You should have received a copy of the GNU General Public License</p><p class="Preformatted_20_Text">    along with this program; if not, write to the Free Software</p><p class="Preformatted_20_Text">    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Also add information on how to contact you by electronic and paper mail.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">If the program is interactive, make it output a short notice like this</p><p class="Preformatted_20_Text">when it starts in an interactive mode:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    Gnomovision version 69, Copyright (C) year  name of author</p><p class="Preformatted_20_Text">    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.</p><p class="Preformatted_20_Text">    This is free software, and you are welcome to redistribute it</p><p class="Preformatted_20_Text">    under certain conditions; type `show c' for details.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">The hypothetical commands `show w' and `show c' should show the appropriate</p><p class="Preformatted_20_Text">parts of the General Public License.  Of course, the commands you use may</p><p class="Preformatted_20_Text">be called something other than `show w' and `show c'; they could even be</p><p class="Preformatted_20_Text">mouse-clicks or menu items--whatever suits your program.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">You should also get your employer (if you work as a programmer) or your</p><p class="Preformatted_20_Text">school, if any, to sign a "copyright disclaimer" for the program, if</p><p class="Preformatted_20_Text">necessary.  Here is a sample; alter the names:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  Yoyodyne, Inc., hereby disclaims all copyright interest in the program</p><p class="Preformatted_20_Text">  `Gnomovision' (which makes passes at compilers) written by James Hacker.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  , 1 April 1989</p><p class="Preformatted_20_Text">  Ty Coon, President of Vice</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">This General Public License does not permit incorporating your program into</p><p class="Preformatted_20_Text">proprietary programs.  If your program is a subroutine library, you may</p><p class="Preformatted_20_Text">consider it more useful to permit linking proprietary applications with the</p><p class="Preformatted_20_Text">library.  If this is what you want to do, use the GNU Library General</p><p class="Preformatted_20_Text">Public License instead of this License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Additional License(s)</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">libstdc++:</p><p class="Preformatted_20_Text">// Explicit instantiation file.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002</p><p class="Preformatted_20_Text">// Free Software Foundation, Inc.</p><p class="Preformatted_20_Text">//</p><p class="Preformatted_20_Text">// This file is part of the GNU ISO C++ Library.  This library is free</p><p class="Preformatted_20_Text">// software; you can redistribute it and/or modify it under the</p><p class="Preformatted_20_Text">// terms of the GNU General Public License as published by the</p><p class="Preformatted_20_Text">// Free Software Foundation; either version 2, or (at your option)</p><p class="Preformatted_20_Text">// any later version.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">// This library is distributed in the hope that it will be useful,</p><p class="Preformatted_20_Text">// but WITHOUT ANY WARRANTY; without even the implied warranty of</p><p class="Preformatted_20_Text">// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</p><p class="Preformatted_20_Text">// GNU General Public License for more details.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">// You should have received a copy of the GNU General Public License along</p><p class="Preformatted_20_Text">// with this library; see the file COPYING.  If not, write to the Free</p><p class="Preformatted_20_Text">// Software Foundation, 59 Temple Place - Suite 330, Boston, MA</p><p class="Preformatted_20_Text">02111-1307,</p><p class="Preformatted_20_Text">// USA.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">// As a special exception, you may use this file as part of a free</p><p class="Preformatted_20_Text">software</p><p class="Preformatted_20_Text">// library without restriction.  Specifically, if other files instantiate</p><p class="Preformatted_20_Text">// templates or use macros or inline functions from this file, or you</p><p class="Preformatted_20_Text">compile</p><p class="Preformatted_20_Text">// this file and link it with other files to produce an executable, this</p><p class="Preformatted_20_Text">// file does not by itself cause the resulting executable to be covered by</p><p class="Preformatted_20_Text">// the GNU General Public License.  This exception does not however</p><p class="Preformatted_20_Text">// invalidate any other reasons why the executable file might be</p><p class="Preformatted_20_Text">covered by</p><p class="Preformatted_20_Text">// the GNU General Public License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">libgcc:</p><p class="Preformatted_20_Text">//</p><p class="Preformatted_20_Text">// ISO C++ 14882:</p><p class="Preformatted_20_Text">//</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">/* Copyright (C) 2001, 2002 Free Software Foundation, Inc.</p><p class="Preformatted_20_Text">   Contributed by Jakub Jelinek .</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   This file is part of GNU CC.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   GNU CC is free software; you can redistribute it and/or modify</p><p class="Preformatted_20_Text">   it under the terms of the GNU General Public License as published by</p><p class="Preformatted_20_Text">   the Free Software Foundation; either version 2, or (at your option)</p><p class="Preformatted_20_Text">   any later version.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   GNU CC is distributed in the hope that it will be useful,</p><p class="Preformatted_20_Text">   but WITHOUT ANY WARRANTY; without even the implied warranty of</p><p class="Preformatted_20_Text">   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</p><p class="Preformatted_20_Text">   GNU General Public License for more details.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   You should have received a copy of the GNU General Public License</p><p class="Preformatted_20_Text">   along with GNU CC; see the file COPYING.  If not, write to</p><p class="Preformatted_20_Text">   the Free Software Foundation, 59 Temple Place - Suite 330,</p><p class="Preformatted_20_Text">   Boston, MA 02111-1307, USA.  */</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">/* As a special exception, if you link this library with other files,</p><p class="Preformatted_20_Text">   some of which are compiled with GCC, to produce an executable,</p><p class="Preformatted_20_Text">   this library does not by itself cause the resulting executable</p><p class="Preformatted_20_Text">   to be covered by the GNU General Public License.</p><p class="Preformatted_20_Text">   This exception does not however invalidate any other reasons why</p><p class="Preformatted_20_Text">   the executable file might be covered by the GNU General Public</p><p class="Preformatted_20_Text">License.  */</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">/* Locate the FDE entry for a given address, using PT_GNU_EH_FRAME ELF</p><p class="Preformatted_20_Text">   segment and dl_iterate_phdr to avoid register/deregister calls at</p><p class="Preformatted_20_Text">   DSO load/unload.  */</p><p class="P2"> </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: libtextcat; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__WiseGuys_Internet_B_V_"><span/></a>WiseGuys Internet B.V.</h2><h3 class="Heading_20_3"><a id="a__libtextcat"><span/></a>libtextcat</h3><p class="P11"><br/>Copyright (c) 2003, WiseGuys Internet B.V. <br/>All rights reserved. <br/>Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: <br/>- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. <br/>- Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. <br/>- Neither the name of the WiseGuys Internet B.V. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. <br/>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: libwpd; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__William_LaChance"><span/></a>William LaChance</h2><h3 class="Heading_20_3"><a id="a__libwpd"><span/></a>libwpd</h3><p class="P11"><a href="./#lgpl">jump to LGPL</a><br/>Except where otherwise noted in the source code (trio files, hash.c and list.c) </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: libxml2; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Daniel_Veillard"><span/></a>Daniel Veillard</h2><h3 class="Heading_20_3"><a id="a__libxml2"><span/></a>libxml2</h3><p class="P11">Copyright (C) 1998-2002 Daniel Veillard. All Rights Reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is fur- nished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Except as contained in this notice, the name of Daniel Veillard shall not be used in advertising or otherwise to promote the sale, use or other deal- ings in this Software without prior written authorization from him. </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: XML Security Library; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Aleksey_Sanin"><span/></a>Aleksey Sanin</h2><h3 class="Heading_20_3"><a id="a__XML_Security_Library"><span/></a>XML Security Library</h3><p class="Text_20_body"> </p><p class="Preformatted_20_Text">XML Security Library</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Use of any of this software is governed by the terms of the license below:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Please note: We do not use all libraries of the project, but only:</p><p class="Preformatted_20_Text">- xmlsec-core; License: MIT</p><p class="Preformatted_20_Text">- xmlsec-nss; License: GPL + MPL </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">-------------------------------------------------</p><p class="Preformatted_20_Text">The MIT License</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Copyright (c)  </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Permission is hereby granted, free of charge, to any person obtaining a copy of</p><p class="Preformatted_20_Text">this software and associated documentation files (the "Software"), to deal in</p><p class="Preformatted_20_Text">the Software without restriction, including without limitation the rights to</p><p class="Preformatted_20_Text">use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of</p><p class="Preformatted_20_Text">the Software, and to permit persons to whom the Software is furnished to do so,</p><p class="Preformatted_20_Text">subject to the following conditions:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">The above copyright notice and this permission notice shall be included in all</p><p class="Preformatted_20_Text">copies or substantial portions of the Software.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</p><p class="Preformatted_20_Text">IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS</p><p class="Preformatted_20_Text">FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR</p><p class="Preformatted_20_Text">COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER</p><p class="Preformatted_20_Text">IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</p><p class="Preformatted_20_Text">CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p><p class="Preformatted_20_Text">-------------------------------------------------------------------</p><p class="Preformatted_20_Text">The GNU General Public License (GPL)</p><p class="Preformatted_20_Text">Version 2, June 1991</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Copyright (C) 1989, 1991 Free Software Foundation, Inc.</p><p class="Preformatted_20_Text">59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Everyone is permitted to copy and distribute verbatim copies</p><p class="Preformatted_20_Text">of this license document, but changing it is not allowed.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Preamble</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">The licenses for most software are designed to take away your freedom to share</p><p class="Preformatted_20_Text">and change it. By contrast, the GNU General Public License is intended to</p><p class="Preformatted_20_Text">guarantee your freedom to share and change free software--to make sure the</p><p class="Preformatted_20_Text">software is free for all its users. This General Public License applies to most</p><p class="Preformatted_20_Text">of the Free Software Foundation's software and to any other program whose</p><p class="Preformatted_20_Text">authors commit to using it. (Some other Free Software Foundation software is</p><p class="Preformatted_20_Text">covered by the GNU Library General Public License instead.) You can apply it to</p><p class="Preformatted_20_Text">your programs, too.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">When we speak of free software, we are referring to freedom, not price. Our</p><p class="Preformatted_20_Text">General Public Licenses are designed to make sure that you have the freedom to</p><p class="Preformatted_20_Text">distribute copies of free software (and charge for this service if you wish),</p><p class="Preformatted_20_Text">that you receive source code or can get it if you want it, that you can change</p><p class="Preformatted_20_Text">the software or use pieces of it in new free programs; and that you know you can</p><p class="Preformatted_20_Text">do these things.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">To protect your rights, we need to make restrictions that forbid anyone to deny</p><p class="Preformatted_20_Text">you these rights or to ask you to surrender the rights. These restrictions</p><p class="Preformatted_20_Text">translate to certain responsibilities for you if you distribute copies of the</p><p class="Preformatted_20_Text">software, or if you modify it.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">For example, if you distribute copies of such a program, whether gratis or for a</p><p class="Preformatted_20_Text">fee, you must give the recipients all the rights that you have. You must make</p><p class="Preformatted_20_Text">sure that they, too, receive or can get the source code. And you must show them</p><p class="Preformatted_20_Text">these terms so they know their rights.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">We protect your rights with two steps: (1) copyright the software, and (2) offer</p><p class="Preformatted_20_Text">you this license which gives you legal permission to copy, distribute and/or</p><p class="Preformatted_20_Text">modify the software.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Also, for each author's protection and ours, we want to make certain that</p><p class="Preformatted_20_Text">everyone understands that there is no warranty for this free software. If the</p><p class="Preformatted_20_Text">software is modified by someone else and passed on, we want its recipients to</p><p class="Preformatted_20_Text">know that what they have is not the original, so that any problems introduced by</p><p class="Preformatted_20_Text">others will not reflect on the original authors' reputations.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Finally, any free program is threatened constantly by software patents. We wish</p><p class="Preformatted_20_Text">to avoid the danger that redistributors of a free program will individually</p><p class="Preformatted_20_Text">obtain patent licenses, in effect making the program proprietary. To prevent</p><p class="Preformatted_20_Text">this, we have made it clear that any patent must be licensed for everyone's free</p><p class="Preformatted_20_Text">use or not licensed at all.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">The precise terms and conditions for copying, distribution and modification follow.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">0. This License applies to any program or other work which contains a notice</p><p class="Preformatted_20_Text">placed by the copyright holder saying it may be distributed under the terms of</p><p class="Preformatted_20_Text">this General Public License. The "Program", below, refers to any such program or</p><p class="Preformatted_20_Text">work, and a "work based on the Program" means either the Program or any</p><p class="Preformatted_20_Text">derivative work under copyright law: that is to say, a work containing the</p><p class="Preformatted_20_Text">Program or a portion of it, either verbatim or with modifications and/or</p><p class="Preformatted_20_Text">translated into another language. (Hereinafter, translation is included without</p><p class="Preformatted_20_Text">limitation in the term "modification".) Each licensee is addressed as "you".</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Activities other than copying, distribution and modification are not covered by</p><p class="Preformatted_20_Text">this License; they are outside its scope. The act of running the Program is not</p><p class="Preformatted_20_Text">restricted, and the output from the Program is covered only if its contents</p><p class="Preformatted_20_Text">constitute a work based on the Program (independent of having been made by</p><p class="Preformatted_20_Text">running the Program). Whether that is true depends on what the Program does.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">1. You may copy and distribute verbatim copies of the Program's source code as</p><p class="Preformatted_20_Text">you receive it, in any medium, provided that you conspicuously and appropriately</p><p class="Preformatted_20_Text">publish on each copy an appropriate copyright notice and disclaimer of warranty;</p><p class="Preformatted_20_Text">keep intact all the notices that refer to this License and to the absence of any</p><p class="Preformatted_20_Text">warranty; and give any other recipients of the Program a copy of this License</p><p class="Preformatted_20_Text">along with the Program.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">You may charge a fee for the physical act of transferring a copy, and you may at</p><p class="Preformatted_20_Text">your option offer warranty protection in exchange for a fee.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">2. You may modify your copy or copies of the Program or any portion of it, thus</p><p class="Preformatted_20_Text">forming a work based on the Program, and copy and distribute such modifications</p><p class="Preformatted_20_Text">or work under the terms of Section 1 above, provided that you also meet all of</p><p class="Preformatted_20_Text">these conditions:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    a) You must cause the modified files to carry prominent notices stating that</p><p class="Preformatted_20_Text">you changed the files and the date of any change.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    b) You must cause any work that you distribute or publish, that in whole or</p><p class="Preformatted_20_Text">in part contains or is derived from the Program or any part thereof, to be</p><p class="Preformatted_20_Text">licensed as a whole at no charge to all third parties under the terms of this</p><p class="Preformatted_20_Text">License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    c) If the modified program normally reads commands interactively when run,</p><p class="Preformatted_20_Text">you must cause it, when started running for such interactive use in the most</p><p class="Preformatted_20_Text">ordinary way, to print or display an announcement including an appropriate</p><p class="Preformatted_20_Text">copyright notice and a notice that there is no warranty (or else, saying that</p><p class="Preformatted_20_Text">you provide a warranty) and that users may redistribute the program under these</p><p class="Preformatted_20_Text">conditions, and telling the user how to view a copy of this License. (Exception:</p><p class="Preformatted_20_Text">if the Program itself is interactive but does not normally print such an</p><p class="Preformatted_20_Text">announcement, your work based on the Program is not required to print an</p><p class="Preformatted_20_Text">announcement.)</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">These requirements apply to the modified work as a whole. If identifiable</p><p class="Preformatted_20_Text">sections of that work are not derived from the Program, and can be reasonably</p><p class="Preformatted_20_Text">considered independent and separate works in themselves, then this License, and</p><p class="Preformatted_20_Text">its terms, do not apply to those sections when you distribute them as separate</p><p class="Preformatted_20_Text">works. But when you distribute the same sections as part of a whole which is a</p><p class="Preformatted_20_Text">work based on the Program, the distribution of the whole must be on the terms of</p><p class="Preformatted_20_Text">this License, whose permissions for other licensees extend to the entire whole,</p><p class="Preformatted_20_Text">and thus to each and every part regardless of who wrote it.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Thus, it is not the intent of this section to claim rights or contest your</p><p class="Preformatted_20_Text">rights to work written entirely by you; rather, the intent is to exercise the</p><p class="Preformatted_20_Text">right to control the distribution of derivative or collective works based on the</p><p class="Preformatted_20_Text">Program.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">In addition, mere aggregation of another work not based on the Program with the</p><p class="Preformatted_20_Text">Program (or with a work based on the Program) on a volume of a storage or</p><p class="Preformatted_20_Text">distribution medium does not bring the other work under the scope of this License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">3. You may copy and distribute the Program (or a work based on it, under Section</p><p class="Preformatted_20_Text">2) in object code or executable form under the terms of Sections 1 and 2 above</p><p class="Preformatted_20_Text">provided that you also do one of the following:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    a) Accompany it with the complete corresponding machine-readable source</p><p class="Preformatted_20_Text">code, which must be distributed under the terms of Sections 1 and 2 above on a</p><p class="Preformatted_20_Text">medium customarily used for software interchange; or,</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    b) Accompany it with a written offer, valid for at least three years, to</p><p class="Preformatted_20_Text">give any third party, for a charge no more than your cost of physically</p><p class="Preformatted_20_Text">performing source distribution, a complete machine-readable copy of the</p><p class="Preformatted_20_Text">corresponding source code, to be distributed under the terms of Sections 1 and 2</p><p class="Preformatted_20_Text">above on a medium customarily used for software interchange; or,</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    c) Accompany it with the information you received as to the offer to</p><p class="Preformatted_20_Text">distribute corresponding source code. (This alternative is allowed only for</p><p class="Preformatted_20_Text">noncommercial distribution and only if you received the program in object code</p><p class="Preformatted_20_Text">or executable form with such an offer, in accord with Subsection b above.)</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">The source code for a work means the preferred form of the work for making</p><p class="Preformatted_20_Text">modifications to it. For an executable work, complete source code means all the</p><p class="Preformatted_20_Text">source code for all modules it contains, plus any associated interface</p><p class="Preformatted_20_Text">definition files, plus the scripts used to control compilation and installation</p><p class="Preformatted_20_Text">of the executable. However, as a special exception, the source code distributed</p><p class="Preformatted_20_Text">need not include anything that is normally distributed (in either source or</p><p class="Preformatted_20_Text">binary form) with the major components (compiler, kernel, and so on) of the</p><p class="Preformatted_20_Text">operating system on which the executable runs, unless that component itself</p><p class="Preformatted_20_Text">accompanies the executable.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">If distribution of executable or object code is made by offering access to copy</p><p class="Preformatted_20_Text">from a designated place, then offering equivalent access to copy the source code</p><p class="Preformatted_20_Text">from the same place counts as distribution of the source code, even though third</p><p class="Preformatted_20_Text">parties are not compelled to copy the source along with the object code.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">4. You may not copy, modify, sublicense, or distribute the Program except as</p><p class="Preformatted_20_Text">expressly provided under this License. Any attempt otherwise to copy, modify,</p><p class="Preformatted_20_Text">sublicense or distribute the Program is void, and will automatically terminate</p><p class="Preformatted_20_Text">your rights under this License. However, parties who have received copies, or</p><p class="Preformatted_20_Text">rights, from you under this License will not have their licenses terminated so</p><p class="Preformatted_20_Text">long as such parties remain in full compliance.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">5. You are not required to accept this License, since you have not signed it.</p><p class="Preformatted_20_Text">However, nothing else grants you permission to modify or distribute the Program</p><p class="Preformatted_20_Text">or its derivative works. These actions are prohibited by law if you do not</p><p class="Preformatted_20_Text">accept this License. Therefore, by modifying or distributing the Program (or any</p><p class="Preformatted_20_Text">work based on the Program), you indicate your acceptance of this License to do</p><p class="Preformatted_20_Text">so, and all its terms and conditions for copying, distributing or modifying the</p><p class="Preformatted_20_Text">Program or works based on it.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">6. Each time you redistribute the Program (or any work based on the Program),</p><p class="Preformatted_20_Text">the recipient automatically receives a license from the original licensor to</p><p class="Preformatted_20_Text">copy, distribute or modify the Program subject to these terms and conditions.</p><p class="Preformatted_20_Text">You may not impose any further restrictions on the recipients' exercise of the</p><p class="Preformatted_20_Text">rights granted herein. You are not responsible for enforcing compliance by third</p><p class="Preformatted_20_Text">parties to this License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">7. If, as a consequence of a court judgment or allegation of patent infringement</p><p class="Preformatted_20_Text">or for any other reason (not limited to patent issues), conditions are imposed</p><p class="Preformatted_20_Text">on you (whether by court order, agreement or otherwise) that contradict the</p><p class="Preformatted_20_Text">conditions of this License, they do not excuse you from the conditions of this</p><p class="Preformatted_20_Text">License. If you cannot distribute so as to satisfy simultaneously your</p><p class="Preformatted_20_Text">obligations under this License and any other pertinent obligations, then as a</p><p class="Preformatted_20_Text">consequence you may not distribute the Program at all. For example, if a patent</p><p class="Preformatted_20_Text">license would not permit royalty-free redistribution of the Program by all those</p><p class="Preformatted_20_Text">who receive copies directly or indirectly through you, then the only way you</p><p class="Preformatted_20_Text">could satisfy both it and this License would be to refrain entirely from</p><p class="Preformatted_20_Text">distribution of the Program.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">If any portion of this section is held invalid or unenforceable under any</p><p class="Preformatted_20_Text">particular circumstance, the balance of the section is intended to apply and the</p><p class="Preformatted_20_Text">section as a whole is intended to apply in other circumstances.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">It is not the purpose of this section to induce you to infringe any patents or</p><p class="Preformatted_20_Text">other property right claims or to contest validity of any such claims; this</p><p class="Preformatted_20_Text">section has the sole purpose of protecting the integrity of the free software</p><p class="Preformatted_20_Text">distribution system, which is implemented by public license practices. Many</p><p class="Preformatted_20_Text">people have made generous contributions to the wide range of software</p><p class="Preformatted_20_Text">distributed through that system in reliance on consistent application of that</p><p class="Preformatted_20_Text">system; it is up to the author/donor to decide if he or she is willing to</p><p class="Preformatted_20_Text">distribute software through any other system and a licensee cannot impose that</p><p class="Preformatted_20_Text">choice.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">This section is intended to make thoroughly clear what is believed to be a</p><p class="Preformatted_20_Text">consequence of the rest of this License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">8. If the distribution and/or use of the Program is restricted in certain</p><p class="Preformatted_20_Text">countries either by patents or by copyrighted interfaces, the original copyright</p><p class="Preformatted_20_Text">holder who places the Program under this License may add an explicit</p><p class="Preformatted_20_Text">geographical distribution limitation excluding those countries, so that</p><p class="Preformatted_20_Text">distribution is permitted only in or among countries not thus excluded. In such</p><p class="Preformatted_20_Text">case, this License incorporates the limitation as if written in the body of this</p><p class="Preformatted_20_Text">License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">9. The Free Software Foundation may publish revised and/or new versions of the</p><p class="Preformatted_20_Text">General Public License from time to time. Such new versions will be similar in</p><p class="Preformatted_20_Text">spirit to the present version, but may differ in detail to address new problems</p><p class="Preformatted_20_Text">or concerns.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Each version is given a distinguishing version number. If the Program specifies</p><p class="Preformatted_20_Text">a version number of this License which applies to it and "any later version",</p><p class="Preformatted_20_Text">you have the option of following the terms and conditions either of that version</p><p class="Preformatted_20_Text">or of any later version published by the Free Software Foundation. If the</p><p class="Preformatted_20_Text">Program does not specify a version number of this License, you may choose any</p><p class="Preformatted_20_Text">version ever published by the Free Software Foundation.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">10. If you wish to incorporate parts of the Program into other free programs</p><p class="Preformatted_20_Text">whose distribution conditions are different, write to the author to ask for</p><p class="Preformatted_20_Text">permission. For software which is copyrighted by the Free Software Foundation,</p><p class="Preformatted_20_Text">write to the Free Software Foundation; we sometimes make exceptions for this.</p><p class="Preformatted_20_Text">Our decision will be guided by the two goals of preserving the free status of</p><p class="Preformatted_20_Text">all derivatives of our free software and of promoting the sharing and reuse of</p><p class="Preformatted_20_Text">software generally.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">NO WARRANTY</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE</p><p class="Preformatted_20_Text">PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED</p><p class="Preformatted_20_Text">IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS</p><p class="Preformatted_20_Text">IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT</p><p class="Preformatted_20_Text">NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</p><p class="Preformatted_20_Text">PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE</p><p class="Preformatted_20_Text">PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF</p><p class="Preformatted_20_Text">ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL</p><p class="Preformatted_20_Text">ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE</p><p class="Preformatted_20_Text">PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,</p><p class="Preformatted_20_Text">SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY</p><p class="Preformatted_20_Text">TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING</p><p class="Preformatted_20_Text">RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF</p><p class="Preformatted_20_Text">THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER</p><p class="Preformatted_20_Text">PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">END OF TERMS AND CONDITIONS</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">How to Apply These Terms to Your New Programs</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">If you develop a new program, and you want it to be of the greatest possible use</p><p class="Preformatted_20_Text">to the public, the best way to achieve this is to make it free software which</p><p class="Preformatted_20_Text">everyone can redistribute and change under these terms.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">To do so, attach the following notices to the program. It is safest to attach</p><p class="Preformatted_20_Text">them to the start of each source file to most effectively convey the exclusion</p><p class="Preformatted_20_Text">of warranty; and each file should have at least the "copyright" line and a</p><p class="Preformatted_20_Text">pointer to where the full notice is found.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    one line to give the program's name and a brief idea of what it does.</p><p class="Preformatted_20_Text">    Copyright (C)</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    This program is free software; you can redistribute it and/or modify it</p><p class="Preformatted_20_Text">under the terms of the GNU General Public License as published by the Free</p><p class="Preformatted_20_Text">Software Foundation; either version 2 of the License, or (at your option) any</p><p class="Preformatted_20_Text">later version.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    This program is distributed in the hope that it will be useful, but WITHOUT</p><p class="Preformatted_20_Text">ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS</p><p class="Preformatted_20_Text">FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    You should have received a copy of the GNU General Public License along with</p><p class="Preformatted_20_Text">this program; if not, write to the Free Software Foundation, Inc., 59 Temple</p><p class="Preformatted_20_Text">Place, Suite 330, Boston, MA 02111-1307 USA</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Also add information on how to contact you by electronic and paper mail.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">If the program is interactive, make it output a short notice like this when it</p><p class="Preformatted_20_Text">starts in an interactive mode:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    Gnomovision version 69, Copyright (C) year name of author Gnomovision comes</p><p class="Preformatted_20_Text">with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software,</p><p class="Preformatted_20_Text">and you are welcome to redistribute it under certain conditions; type `show c'</p><p class="Preformatted_20_Text">for details.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">The hypothetical commands `show w' and `show c' should show the appropriate</p><p class="Preformatted_20_Text">parts of the General Public License. Of course, the commands you use may be</p><p class="Preformatted_20_Text">called something other than `show w' and `show c'; they could even be</p><p class="Preformatted_20_Text">mouse-clicks or menu items--whatever suits your program.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">You should also get your employer (if you work as a programmer) or your school,</p><p class="Preformatted_20_Text">if any, to sign a "copyright disclaimer" for the program, if necessary. Here is</p><p class="Preformatted_20_Text">a sample; alter the names:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    Yoyodyne, Inc., hereby disclaims all copyright interest</p><p class="Preformatted_20_Text">    in the program `Gnomovision' (which makes passes at compilers)</p><p class="Preformatted_20_Text">    written by James Hacker.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    signature of Ty Coon, 1 April 1989</p><p class="Preformatted_20_Text">    Ty Coon, President of Vice</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">This General Public License does not permit incorporating your program into</p><p class="Preformatted_20_Text">proprietary programs. If your program is a subroutine library, you may consider</p><p class="Preformatted_20_Text">it more useful to permit linking proprietary applications with the library. If</p><p class="Preformatted_20_Text">this is what you want to do, use the GNU Library General Public License instead</p><p class="Preformatted_20_Text">of this License.</p><p class="Preformatted_20_Text">----------------------------------------------------------</p><p class="Preformatted_20_Text">Mozilla Public License Version 1.0</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">1. Definitions.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      1.1. "Contributor" means each entity that creates or contributes to the</p><p class="Preformatted_20_Text">creation of Modifications.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      1.2. "Contributor Version" means the combination of the Original Code,</p><p class="Preformatted_20_Text">prior Modifications used by a Contributor, and the Modifications made by that</p><p class="Preformatted_20_Text">particular Contributor.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      1.3. "Covered Code" means the Original Code or Modifications or the</p><p class="Preformatted_20_Text">combination of the Original Code and Modifications, in each case including</p><p class="Preformatted_20_Text">portions thereof.</p><p class="Preformatted_20_Text"/><p class="Preformatted_20_Text">      1.4. "Electronic Distribution Mechanism" means a mechanism generally</p><p class="Preformatted_20_Text">accepted in the software development community for the electronic transfer of data.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      1.5. "Executable" means Covered Code in any form other than Source Code.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      1.6. "Initial Developer" means the individual or entity identified as the</p><p class="Preformatted_20_Text">Initial Developer in the Source Code notice required by Exhibit A.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      1.7. "Larger Work" means a work which combines Covered Code or portions</p><p class="Preformatted_20_Text">thereof with code not governed by the terms of this License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      1.8. "License" means this document.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      1.9. "Modifications" means any addition to or deletion from the substance</p><p class="Preformatted_20_Text">or structure of either the Original Code or any previous Modifications. When</p><p class="Preformatted_20_Text">Covered Code is released as a series of files, a Modification is:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">            A. Any addition to or deletion from the contents of a file</p><p class="Preformatted_20_Text">containing Original Code or previous Modifications.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">            B. Any new file that contains any part of the Original Code or</p><p class="Preformatted_20_Text">previous Modifications. </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      1.10. "Original Code" means Source Code of computer software code which is</p><p class="Preformatted_20_Text">described in the Source Code notice required by Exhibit A as Original Code, and</p><p class="Preformatted_20_Text">which, at the time of its release under this License is not already Covered Code</p><p class="Preformatted_20_Text">governed by this License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      1.11. "Source Code" means the preferred form of the Covered Code for</p><p class="Preformatted_20_Text">making modifications to it, including all modules it contains, plus any</p><p class="Preformatted_20_Text">associated interface definition files, scripts used to control compilation and</p><p class="Preformatted_20_Text">installation of an Executable, or a list of source code differential comparisons</p><p class="Preformatted_20_Text">against either the Original Code or another well known, available Covered Code</p><p class="Preformatted_20_Text">of the Contributor's choice. The Source Code can be in a compressed or archival</p><p class="Preformatted_20_Text">form, provided the appropriate decompression or de-archiving software is widely</p><p class="Preformatted_20_Text">available for no charge.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      1.12. "You" means an individual or a legal entity exercising rights under,</p><p class="Preformatted_20_Text">and complying with all of the terms of, this License or a future version of this</p><p class="Preformatted_20_Text">License issued under Section 6.1. For legal entities, "You" includes any entity</p><p class="Preformatted_20_Text">which controls, is controlled by, or is under common control with You. For</p><p class="Preformatted_20_Text">purposes of this definition, "control" means (a) the power, direct or indirect,</p><p class="Preformatted_20_Text">to cause the direction or management of such entity, whether by contract or</p><p class="Preformatted_20_Text">otherwise, or (b) ownership of fifty percent (50%) or more of the outstanding</p><p class="Preformatted_20_Text">shares or beneficial ownership of such entity. </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">2. Source Code License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      2.1. The Initial Developer Grant.</p><p class="Preformatted_20_Text">      The Initial Developer hereby grants You a world-wide, royalty-free,</p><p class="Preformatted_20_Text">non-exclusive license, subject to third party intellectual property claims:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">            (a) to use, reproduce, modify, display, perform, sublicense and</p><p class="Preformatted_20_Text">distribute the Original Code (or portions thereof) with or without</p><p class="Preformatted_20_Text">Modifications, or as part of a Larger Work; and</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">            (b) under patents now or hereafter owned or controlled by Initial</p><p class="Preformatted_20_Text">Developer, to make, have made, use and sell ("Utilize") the Original Code (or</p><p class="Preformatted_20_Text">portions thereof), but solely to the extent that any such patent is reasonably</p><p class="Preformatted_20_Text">necessary to enable You to Utilize the Original Code (or portions thereof) and</p><p class="Preformatted_20_Text">not to any greater extent that may be necessary to Utilize further Modifications</p><p class="Preformatted_20_Text">or combinations. </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      2.2. Contributor Grant.</p><p class="Preformatted_20_Text">      Each Contributor hereby grants You a world-wide, royalty-free,</p><p class="Preformatted_20_Text">non-exclusive license, subject to third party intellectual property claims:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">            (a) to use, reproduce, modify, display, perform, sublicense and</p><p class="Preformatted_20_Text">distribute the Modifications created by such Contributor (or portions thereof)</p><p class="Preformatted_20_Text">either on an unmodified basis, with other Modifications, as Covered Code or as</p><p class="Preformatted_20_Text">part of a Larger Work; and</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">            (b) under patents now or hereafter owned or controlled by</p><p class="Preformatted_20_Text">Contributor, to Utilize the Contributor Version (or portions thereof), but</p><p class="Preformatted_20_Text">solely to the extent that any such patent is reasonably necessary to enable You</p><p class="Preformatted_20_Text">to Utilize the Contributor Version (or portions thereof), and not to any greater</p><p class="Preformatted_20_Text">extent that may be necessary to Utilize further Modifications or combinations. </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">3. Distribution Obligations.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      3.1. Application of License.</p><p class="Preformatted_20_Text">      The Modifications which You create or to which You contribute are governed</p><p class="Preformatted_20_Text">by the terms of this License, including without limitation Section 2.2. The</p><p class="Preformatted_20_Text">Source Code version of Covered Code may be distributed only under the terms of</p><p class="Preformatted_20_Text">this License or a future version of this License released under Section 6.1, and</p><p class="Preformatted_20_Text">You must include a copy of this License with every copy of the Source Code You</p><p class="Preformatted_20_Text">distribute. You may not offer or impose any terms on any Source Code version</p><p class="Preformatted_20_Text">that alters or restricts the applicable version of this License or the</p><p class="Preformatted_20_Text">recipients' rights hereunder. However, You may include an additional document</p><p class="Preformatted_20_Text">offering the additional rights described in Section 3.5.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      3.2. Availability of Source Code.</p><p class="Preformatted_20_Text">      Any Modification which You create or to which You contribute must be made</p><p class="Preformatted_20_Text">available in Source Code form under the terms of this License either on the same</p><p class="Preformatted_20_Text">media as an Executable version or via an accepted Electronic Distribution</p><p class="Preformatted_20_Text">Mechanism to anyone to whom you made an Executable version available; and if</p><p class="Preformatted_20_Text">made available via Electronic Distribution Mechanism, must remain available for</p><p class="Preformatted_20_Text">at least twelve (12) months after the date it initially became available, or at</p><p class="Preformatted_20_Text">least six (6) months after a subsequent version of that particular Modification</p><p class="Preformatted_20_Text">has been made available to such recipients. You are responsible for ensuring</p><p class="Preformatted_20_Text">that the Source Code version remains available even if the Electronic</p><p class="Preformatted_20_Text">Distribution Mechanism is maintained by a third party.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      3.3. Description of Modifications.</p><p class="Preformatted_20_Text">      You must cause all Covered Code to which you contribute to contain a file</p><p class="Preformatted_20_Text">documenting the changes You made to create that Covered Code and the date of any</p><p class="Preformatted_20_Text">change. You must include a prominent statement that the Modification is derived,</p><p class="Preformatted_20_Text">directly or indirectly, from Original Code provided by the Initial Developer and</p><p class="Preformatted_20_Text">including the name of the Initial Developer in (a) the Source Code, and (b) in</p><p class="Preformatted_20_Text">any notice in an Executable version or related documentation in which You</p><p class="Preformatted_20_Text">describe the origin or ownership of the Covered Code.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      3.4. Intellectual Property Matters</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">            (a) Third Party Claims.</p><p class="Preformatted_20_Text">            If You have knowledge that a party claims an intellectual property</p><p class="Preformatted_20_Text">right in particular functionality or code (or its utilization under this</p><p class="Preformatted_20_Text">License), you must include a text file with the source code distribution titled</p><p class="Preformatted_20_Text">"LEGAL" which describes the claim and the party making the claim in sufficient</p><p class="Preformatted_20_Text">detail that a recipient will know whom to contact. If you obtain such knowledge</p><p class="Preformatted_20_Text">after You make Your Modification available as described in Section 3.2, You</p><p class="Preformatted_20_Text">shall promptly modify the LEGAL file in all copies You make available thereafter</p><p class="Preformatted_20_Text">and shall take other steps (such as notifying appropriate mailing lists or</p><p class="Preformatted_20_Text">newsgroups) reasonably calculated to inform those who received the Covered Code</p><p class="Preformatted_20_Text">that new knowledge has been obtained.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">            (b) Contributor APIs.</p><p class="Preformatted_20_Text">            If Your Modification is an application programming interface and You</p><p class="Preformatted_20_Text">own or control patents which are reasonably necessary to implement that API, you</p><p class="Preformatted_20_Text">must also include this information in the LEGAL file. </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      3.5. Required Notices.</p><p class="Preformatted_20_Text">      You must duplicate the notice in Exhibit A in each file of the Source</p><p class="Preformatted_20_Text">Code, and this License in any documentation for the Source Code, where You</p><p class="Preformatted_20_Text">describe recipients' rights relating to Covered Code. If You created one or more</p><p class="Preformatted_20_Text">Modification(s), You may add your name as a Contributor to the notice described</p><p class="Preformatted_20_Text">in Exhibit A. If it is not possible to put such notice in a particular Source</p><p class="Preformatted_20_Text">Code file due to its structure, then you must include such notice in a location</p><p class="Preformatted_20_Text">(such as a relevant directory file) where a user would be likely to look for</p><p class="Preformatted_20_Text">such a notice. You may choose to offer, and to charge a fee for, warranty,</p><p class="Preformatted_20_Text">support, indemnity or liability obligations to one or more recipients of Covered</p><p class="Preformatted_20_Text">Code. However, You may do so only on Your own behalf, and not on behalf of the</p><p class="Preformatted_20_Text">Initial Developer or any Contributor. You must make it absolutely clear than any</p><p class="Preformatted_20_Text">such warranty, support, indemnity or liability obligation is offered by You</p><p class="Preformatted_20_Text">alone, and You hereby agree to indemnify the Initial Developer and every</p><p class="Preformatted_20_Text">Contributor for any liability incurred by the Initial Developer or such</p><p class="Preformatted_20_Text">Contributor as a result of warranty, support, indemnity or liability terms You</p><p class="Preformatted_20_Text">offer.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      3.6. Distribution of Executable Versions.</p><p class="Preformatted_20_Text">      You may distribute Covered Code in Executable form only if the</p><p class="Preformatted_20_Text">requirements of Section 3.1-3.5 have been met for that Covered Code, and if You</p><p class="Preformatted_20_Text">include a notice stating that the Source Code version of the Covered Code is</p><p class="Preformatted_20_Text">available under the terms of this License, including a description of how and</p><p class="Preformatted_20_Text">where You have fulfilled the obligations of Section 3.2. The notice must be</p><p class="Preformatted_20_Text">conspicuously included in any notice in an Executable version, related</p><p class="Preformatted_20_Text">documentation or collateral in which You describe recipients' rights relating to</p><p class="Preformatted_20_Text">the Covered Code. You may distribute the Executable version of Covered Code</p><p class="Preformatted_20_Text">under a license of Your choice, which may contain terms different from this</p><p class="Preformatted_20_Text">License, provided that You are in compliance with the terms of this License and</p><p class="Preformatted_20_Text">that the license for the Executable version does not attempt to limit or alter</p><p class="Preformatted_20_Text">the recipient's rights in the Source Code version from the rights set forth in</p><p class="Preformatted_20_Text">this License. If You distribute the Executable version under a different license</p><p class="Preformatted_20_Text">You must make it absolutely clear that any terms which differ from this License</p><p class="Preformatted_20_Text">are offered by You alone, not by the Initial Developer or any Contributor. You</p><p class="Preformatted_20_Text">hereby agree to indemnify the Initial Developer and every Contributor for any</p><p class="Preformatted_20_Text">liability incurred by the Initial Developer or such Contributor as a result of</p><p class="Preformatted_20_Text">any such terms You offer.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      3.7. Larger Works.</p><p class="Preformatted_20_Text">      You may create a Larger Work by combining Covered Code with other code not</p><p class="Preformatted_20_Text">governed by the terms of this License and distribute the Larger Work as a single</p><p class="Preformatted_20_Text">product. In such a case, You must make sure the requirements of this License are</p><p class="Preformatted_20_Text">fulfilled for the Covered Code. </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">4. Inability to Comply Due to Statute or Regulation.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      If it is impossible for You to comply with any of the terms of this</p><p class="Preformatted_20_Text">License with respect to some or all of the Covered Code due to statute or</p><p class="Preformatted_20_Text">regulation then You must: (a) comply with the terms of this License to the</p><p class="Preformatted_20_Text">maximum extent possible; and (b) describe the limitations and the code they</p><p class="Preformatted_20_Text">affect. Such description must be included in the LEGAL file described in Section</p><p class="Preformatted_20_Text">3.4 and must be included with all distributions of the Source Code. Except to</p><p class="Preformatted_20_Text">the extent prohibited by statute or regulation, such description must be</p><p class="Preformatted_20_Text">sufficiently detailed for a recipient of ordinary skill to be able to understand</p><p class="Preformatted_20_Text">it. </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">5. Application of this License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      This License applies to code to which the Initial Developer has attached</p><p class="Preformatted_20_Text">the notice in Exhibit A, and to related Covered Code. </p><p class="Preformatted_20_Text"/><p class="Preformatted_20_Text">6. Versions of the License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      6.1. New Versions.</p><p class="Preformatted_20_Text">      Netscape Communications Corporation ("Netscape") may publish revised</p><p class="Preformatted_20_Text">and/or new versions of the License from time to time. Each version will be given</p><p class="Preformatted_20_Text">a distinguishing version number.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      6.2. Effect of New Versions.</p><p class="Preformatted_20_Text">      Once Covered Code has been published under a particular version of the</p><p class="Preformatted_20_Text">License, You may always continue to use it under the terms of that version. You</p><p class="Preformatted_20_Text">may also choose to use such Covered Code under the terms of any subsequent</p><p class="Preformatted_20_Text">version of the License published by Netscape. No one other than Netscape has the</p><p class="Preformatted_20_Text">right to modify the terms applicable to Covered Code created under this License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      6.3. Derivative Works.</p><p class="Preformatted_20_Text">      If you create or use a modified version of this License (which you may</p><p class="Preformatted_20_Text">only do in order to apply it to code which is not already Covered Code governed</p><p class="Preformatted_20_Text">by this License), you must (a) rename Your license so that the phrases</p><p class="Preformatted_20_Text">"Mozilla", "MOZILLAPL", "MOZPL", "Netscape", "NPL" or any confusingly similar</p><p class="Preformatted_20_Text">phrase do not appear anywhere in your license and (b) otherwise make it clear</p><p class="Preformatted_20_Text">that your version of the license contains terms which differ from the Mozilla</p><p class="Preformatted_20_Text">Public License and Netscape Public License. (Filling in the name of the Initial</p><p class="Preformatted_20_Text">Developer, Original Code or Contributor in the notice described in Exhibit A</p><p class="Preformatted_20_Text">shall not of themselves be deemed to be modifications of this License.) </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">7. DISCLAIMER OF WARRANTY.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT</p><p class="Preformatted_20_Text">WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT</p><p class="Preformatted_20_Text">LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE,</p><p class="Preformatted_20_Text">FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE</p><p class="Preformatted_20_Text">QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE</p><p class="Preformatted_20_Text">PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER</p><p class="Preformatted_20_Text">CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION.</p><p class="Preformatted_20_Text">THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO</p><p class="Preformatted_20_Text">USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">8. TERMINATION.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      This License and the rights granted hereunder will terminate automatically</p><p class="Preformatted_20_Text">if You fail to comply with terms herein and fail to cure such breach within 30</p><p class="Preformatted_20_Text">days of becoming aware of the breach. All sublicenses to the Covered Code which</p><p class="Preformatted_20_Text">are properly granted shall survive any termination of this License. Provisions</p><p class="Preformatted_20_Text">which, by their nature, must remain in effect beyond the termination of this</p><p class="Preformatted_20_Text">License shall survive. </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">9. LIMITATION OF LIABILITY.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING</p><p class="Preformatted_20_Text">NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL DEVELOPER, ANY OTHER</p><p class="Preformatted_20_Text">CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH</p><p class="Preformatted_20_Text">PARTIES, BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL,</p><p class="Preformatted_20_Text">INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT</p><p class="Preformatted_20_Text">LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR</p><p class="Preformatted_20_Text">MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH</p><p class="Preformatted_20_Text">PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS</p><p class="Preformatted_20_Text">LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL</p><p class="Preformatted_20_Text">INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW</p><p class="Preformatted_20_Text">PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR</p><p class="Preformatted_20_Text">LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND</p><p class="Preformatted_20_Text">LIMITATION MAY NOT APPLY TO YOU. </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">10. U.S. GOVERNMENT END USERS.</p><p class="Preformatted_20_Text"/><p class="Preformatted_20_Text">      The Covered Code is a "commercial item," as that term is defined in 48</p><p class="Preformatted_20_Text">C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software" and</p><p class="Preformatted_20_Text">"commercial computer software documentation," as such terms are used in 48</p><p class="Preformatted_20_Text">C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R.</p><p class="Preformatted_20_Text">227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire</p><p class="Preformatted_20_Text">Covered Code with only those rights set forth herein. </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">11. MISCELLANEOUS.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      This License represents the complete agreement concerning subject matter</p><p class="Preformatted_20_Text">hereof. If any provision of this License is held to be unenforceable, such</p><p class="Preformatted_20_Text">provision shall be reformed only to the extent necessary to make it enforceable.</p><p class="Preformatted_20_Text">This License shall be governed by California law provisions (except to the</p><p class="Preformatted_20_Text">extent applicable law, if any, provides otherwise), excluding its</p><p class="Preformatted_20_Text">conflict-of-law provisions. With respect to disputes in which at least one party</p><p class="Preformatted_20_Text">is a citizen of, or an entity chartered or registered to do business in, the</p><p class="Preformatted_20_Text">United States of America: (a) unless otherwise agreed in writing, all disputes</p><p class="Preformatted_20_Text">relating to this License (excepting any dispute relating to intellectual</p><p class="Preformatted_20_Text">property rights) shall be subject to final and binding arbitration, with the</p><p class="Preformatted_20_Text">losing party paying all costs of arbitration; (b) any arbitration relating to</p><p class="Preformatted_20_Text">this Agreement shall be held in Santa Clara County, California, under the</p><p class="Preformatted_20_Text">auspices of JAMS/EndDispute; and (c) any litigation relating to this Agreement</p><p class="Preformatted_20_Text">shall be subject to the jurisdiction of the Federal Courts of the Northern</p><p class="Preformatted_20_Text">District of California, with venue lying in Santa Clara County, California, with</p><p class="Preformatted_20_Text">the losing party responsible for costs, including without limitation, court</p><p class="Preformatted_20_Text">costs and reasonable attorneys fees and expenses. The application of the United</p><p class="Preformatted_20_Text">Nations Convention on Contracts for the International Sale of Goods is expressly</p><p class="Preformatted_20_Text">excluded. Any law or regulation which provides that the language of a contract</p><p class="Preformatted_20_Text">shall be construed against the drafter shall not apply to this License. </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">12. RESPONSIBILITY FOR CLAIMS.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      Except in cases where another Contributor has failed to comply with</p><p class="Preformatted_20_Text">Section 3.4, You are responsible for damages arising, directly or indirectly,</p><p class="Preformatted_20_Text">out of Your utilization of rights under this License, based on the number of</p><p class="Preformatted_20_Text">copies of Covered Code you made available, the revenues you received from</p><p class="Preformatted_20_Text">utilizing such rights, and other relevant factors. You agree to work with</p><p class="Preformatted_20_Text">affected parties to distribute responsibility on an equitable basis. </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">EXHIBIT A.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      "The contents of this file are subject to the Mozilla Public License</p><p class="Preformatted_20_Text">Version 1.0 (the "License"); you may not use this file except in compliance with</p><p class="Preformatted_20_Text">the License. You may obtain a copy of the License at http://www.mozilla.org/MPL/</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      Software distributed under the License is distributed on an "AS IS" basis,</p><p class="Preformatted_20_Text">WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the</p><p class="Preformatted_20_Text">specific language governing rights and limitations under the License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      The Original Code is ______________________________________.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      The Initial Developer of the Original Code is ________________________.</p><p class="Preformatted_20_Text">Portions created by ______________________ are Copyright (C) ______</p><p class="Preformatted_20_Text">_______________________. All Rights Reserved.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      Contributor(s): ______________________________________." </p><p class="P2"> </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: libxslt; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__www_xmlsoft_org"><span/></a>www.xmlsoft.org</h2><h3 class="Heading_20_3"><a id="a__libxslt"><span/></a>libxslt</h3><p class="P11">Copyright (C) 2001-2002 Daniel Veillard. All Rights Reserved. <br/>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is fur- nished to do so, subject to the following conditions: <br/>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. <br/>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. <br/>Except as contained in this notice, the name of Daniel Veillard shall not be used in advertising or otherwise to promote the sale, use or other deal- ings in this Software without prior written authorization from him. </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: lpsolve; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Kjell_Eikland_and_Peter_Notebaert"><span/></a>Kjell Eikland and Peter Notebaert </h2><h3 class="Heading_20_3"><a id="a__lpsolve"><span/></a>lpsolve</h3><p class="P11"><a href="./#lgpl">jump to LGPL</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Network Audio System; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Network_Computer_Devices__Inc_"><span/></a>Network Computer Devices, Inc.</h2><h3 class="Heading_20_3"><a id="a__Network_Audio_System__NAS_"><span/></a>Network Audio System (NAS)</h3><p class="P11">Copyright 1995 Network Computing Devices, Inc. Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name Network Computing Devices, Inc. not be used in advertising or publicity pertaining to distribution of this software without specific, written prior permission. <br/><br/>THIS SOFTWARE IS PROVIDED `AS-IS'. NETWORK COMPUTING DEVICES, INC., DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT LIMITATION ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NONINFRINGEMENT. IN NO EVENT SHALL NETWORK COMPUTING DEVICES, INC., BE LIABLE FOR ANY DAMAGES WHATSOEVER, INCLUDING SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES, INCLUDING LOSS OF USE, DATA, OR PROFITS, EVEN IF ADVISED OF THE POSSIBILITY THEREOF, AND REGARDLESS OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: NeoLight 1.1.x; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Planamesa__Inc_"><span/></a>Planamesa, Inc.</h2><h3 class="Heading_20_3"><a id="a__NeoLight"><span/></a>NeoLight</h3><p class="P11"><br/><a href="./#lgpl">jump to GNU Lesser General Public License</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: neon; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Joe_Orton"><span/></a>Joe Orton</h2><h3 class="Heading_20_3"><a id="a__neon"><span/></a>neon</h3><p class="P11"><a href="./#lgpl">jump to LGPL</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Network Security Services; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__The_Mozilla_Foundation"><span/></a>The Mozilla Foundation</h2><h3 class="Heading_20_3"><a id="a__Network_Security_Services__NSS_"><span/></a>Network Security Services (NSS)</h3><p class="P8"><span class="T5">MOZILLA PUBLIC LICENSE</span> <br/><span class="T4">Version 1.1</span> </p><p class="P5"/><p class="Text_20_body"><span class="T4">1. Definitions.</span> </p><ul><li><p class="P25" style="margin-left:0.748cm;"><span class="T4">1.0.1. "Commercial Use" </span>means distribution or otherwise making the Covered Code available to a third party. <span class="odfLiEnd"/> </p><p class="P25" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.1. ''Contributor''</span> means each entity that creates or contributes to the creation of Modifications. <span class="odfLiEnd"/> </p><p class="P25" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.2. ''Contributor Version''</span> means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor. <span class="odfLiEnd"/> </p><p class="P25" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.3. ''Covered Code''</span> means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof<span class="T4">.</span> <span class="odfLiEnd"/> </p><p class="P25" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.4. ''Electronic Distribution Mechanism''</span> means a mechanism generally accepted in the software development community for the electronic transfer of data. <span class="odfLiEnd"/> </p><p class="P25" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.5. ''Executable''</span> means Covered Code in any form other than Source Code. <span class="odfLiEnd"/> </p><p class="P25" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.6. ''Initial Developer''</span> means the individual or entity identified as the Initial Developer in the Source Code notice required by <span class="T4">Exhibit A</span>. <span class="odfLiEnd"/> </p><p class="P25" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.7. ''Larger Work''</span> means a work which combines Covered Code or portions thereof with code not governed by the terms of this License. <span class="odfLiEnd"/> </p><p class="P25" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.8. ''License''</span> means this document. <span class="odfLiEnd"/> </p><p class="P25" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.8.1. "Licensable"</span> means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. <span class="odfLiEnd"/> </p><p class="P25" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.9. ''Modifications''</span> means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is: <span class="odfLiEnd"/> </p><ul><li><p class="P25" style="margin-left:1.9949cm;"><span class="T4">A.</span> Any addition to or deletion from the contents of a file containing Original Code or previous Modifications. <span class="odfLiEnd"/> </p><p class="P25" style="margin-left:1.9949cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">B.</span> Any new file that contains any part of the Original Code or previous Modifications. <br/><span style="margin-left:0.4991cm"/> <span class="odfLiEnd"/> </p></li></ul><p class="P25" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.10. ''Original Code''</span> means Source Code of computer software code which is described in the Source Code notice required by <span class="T4">Exhibit A</span> as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License. <span class="odfLiEnd"/> </p><p class="P25" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.10.1. "Patent Claims"</span> means any patent claim(s), now owned or hereafter acquired, including without limitation,  method, process, and apparatus claims, in any patent Licensable by grantor. <span class="odfLiEnd"/> </p><p class="P25" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.11. ''Source Code''</span> means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge. <span class="odfLiEnd"/> </p><p class="P25" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.12. "You'' (or "Your") </span> means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You'' includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control'' means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.<span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">2. Source Code License.</span> </p><ul><li><p class="P15" style="margin-left:0.748cm;"><span class="T4">2.1. The Initial Developer Grant.</span> <br/><span style="margin-left:0.4991cm"/>The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims: <span class="odfLiEnd"/> </p><ul><li><p class="P26" style="margin-left:1.9949cm;"><span class="T4">(a)</span>  under intellectual property rights (other than patent or trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, and/or as part of a Larger Work; and <span class="odfLiEnd"/> </p><p class="P26" style="margin-left:1.9949cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">(b)</span> under Patents Claims infringed by the making, using or selling of Original Code, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Code (or portions thereof). <span class="odfLiEnd"/> </p><ul><li><ul><li><p class="P15" style="margin-left:4.4889cm;"> <span class="odfLiEnd"/> </p></li></ul></li></ul><p class="P26" style="margin-left:1.9949cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">(c) </span>the licenses granted in this Section 2.1(a) and (b) are effective on the date Initial Developer first distributes Original Code under the terms of this License. <span class="odfLiEnd"/> </p><p class="P26" style="margin-left:1.9949cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">(d) </span>Notwithstanding Section 2.1(b) above, no patent license is granted: 1) for code that You delete from the Original Code; 2) separate from the Original Code;  or 3) for infringements caused by: i) the modification of the Original Code or ii) the combination of the Original Code with other software or devices. <br/><span style="margin-left:0.4991cm"/> <span class="odfLiEnd"/> </p></li></ul><p class="P15" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">2.2. Contributor Grant.</span> <br/><span style="margin-left:0.4991cm"/>Subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license <span class="odfLiEnd"/> </p><ul><li><p class="P26" style="margin-left:1.9949cm;">  <br/><span style="margin-left:0.4991cm"/><span class="T4">(a)</span>  under intellectual property rights (other than patent or trademark) Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger Work; and <span class="odfLiEnd"/> </p><p class="P26" style="margin-left:1.9949cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">(b)</span> under Patent Claims infringed by the making, using, or selling of  Modifications made by that Contributor either alone and/or in<span class="T6"> combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: 1) Modifications made by that Contributor (or portions thereof); and 2) the combination of  Modifications made by that Contributor with its Contributor Version (or portions of such combination).</span> <span class="odfLiEnd"/> </p><p class="P26" style="margin-left:1.9949cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">(c) </span>the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first makes Commercial Use of the Covered Code. <span class="odfLiEnd"/> </p><p class="P26" style="margin-left:1.9949cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">(d) </span>   Notwithstanding Section 2.2(b) above, no patent license is granted: 1) for any code that Contributor has deleted from the Contributor Version; 2)  separate from the Contributor Version;  3)  for infringements caused by: i) third party modifications of Contributor Version or ii)  the combination of Modifications made by that Contributor with other software  (except as part of the Contributor Version) or other devices; or 4) under Patent Claims infringed by Covered Code in the absence of Modifications made by that Contributor.<span class="odfLiEnd"/> </p></li></ul></li></ul><p class="Text_20_body"><br/><span class="T4">3. Distribution Obligations.</span> </p><ul><li><p class="P27" style="margin-left:0.748cm;"><span class="T4">3.1. Application of License.</span> <br/><span style="margin-left:0.4991cm"/>The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section <span class="T4">2.2</span>. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section <span class="T4">6.1</span>, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section <span class="T4">3.5</span>. <span class="odfLiEnd"/> </p><p class="P27" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">3.2. Availability of Source Code.</span> <br/><span style="margin-left:0.4991cm"/>Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party. <span class="odfLiEnd"/> </p><p class="P27" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">3.3. Description of Modifications.</span> <br/><span style="margin-left:0.4991cm"/>You must cause all Covered Code to which You contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code. <span class="odfLiEnd"/> </p><p class="P27" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">3.4. Intellectual Property Matters</span> <span class="odfLiEnd"/> </p><ul><li><p class="P27" style="margin-left:1.9949cm;"><span class="T4">(a) Third Party Claims</span>. <br/><span style="margin-left:0.4991cm"/>If Contributor has knowledge that a license under a third party's intellectual property rights is required to exercise the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor must include a text file with the Source Code distribution titled "LEGAL'' which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If Contributor obtains such knowledge after the Modification is made available as described in Section 3.2, Contributor shall promptly modify the LEGAL file in all copies Contributor makes available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained. <span class="odfLiEnd"/> </p><p class="P27" style="margin-left:1.9949cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">(b) Contributor APIs</span>. <br/><span style="margin-left:0.4991cm"/>If Contributor's Modifications include an application programming interface and Contributor has knowledge of patent licenses which are reasonably necessary to implement that API, Contributor must also include this information in the LEGAL file. <br/><span style="margin-left:0.4991cm"/> <span class="odfLiEnd"/> </p></li></ul><p class="P16" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span>          <span class="T4">(c)    Representations.</span> <span class="odfLiEnd"/> </p><ul><li><p class="P27" style="margin-left:1.9949cm;">Contributor represents that, except as disclosed pursuant to Section 3.4(a) above, Contributor believes that Contributor's Modifications are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the rights conveyed by this License.<span class="odfLiEnd"/> </p></li></ul><p class="P27" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><br/><span style="margin-left:0.4991cm"/><span class="T4">3.5. Required Notices.</span> <br/><span style="margin-left:0.4991cm"/>You must duplicate the notice in <span class="T4">Exhibit A</span> in each file of the Source Code.  If it is not possible to put such notice in a particular Source Code file due to its structure, then You must include such notice in a location (such as a relevant directory) where a user would be likely to look for such a notice.  If You created one or more Modification(s) You may add your name as a Contributor to the notice described in <span class="T4">Exhibit A</span>.  You must also duplicate this License in any documentation for the Source Code where You describe recipients' rights or ownership rights relating to Covered Code.  You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer. <span class="odfLiEnd"/> </p><p class="P27" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">3.6. Distribution of Executable Versions.</span> <br/><span style="margin-left:0.4991cm"/>You may distribute Covered Code in Executable form only if the requirements of Section <span class="T4">3.1-3.5</span> have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section <span class="T4">3.2</span>. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code or ownership rights under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer. <span class="odfLiEnd"/> </p><p class="P27" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">3.7. Larger Works.</span> <br/><span style="margin-left:0.4991cm"/>You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code.<span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">4. Inability to Comply Due to Statute or Regulation.</span> </p><ul><li><p class="P28" style="margin-left:0.748cm;">If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section <span class="T4">3.4</span> and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it.<span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">5. Application of this License.</span> </p><ul><li><p class="P29" style="margin-left:0.748cm;">This License applies to code to which the Initial Developer has attached the notice in <span class="T4">Exhibit A</span> and to related Covered Code.<span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">6. Versions of the License.</span> </p><ul><li><p class="P30" style="margin-left:0.748cm;"><span class="T4">6.1. New Versions</span>. <br/><span style="margin-left:0.4991cm"/>Netscape Communications Corporation (''Netscape'') may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number. <span class="odfLiEnd"/> </p><p class="P30" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">6.2. Effect of New Versions</span>. <br/><span style="margin-left:0.4991cm"/>Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Netscape. No one other than Netscape has the right to modify the terms applicable to Covered Code created under this License. <span class="odfLiEnd"/> </p><p class="P30" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">6.3. Derivative Works</span>. <br/><span style="margin-left:0.4991cm"/>If You create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), You must (a) rename Your license so that the phrases ''Mozilla'', ''MOZILLAPL'', ''MOZPL'', ''Netscape'', "MPL", ''NPL'' or any confusingly similar phrase do not appear in your license (except to note that your license differs from this License) and (b) otherwise make it clear that Your version of the license contains terms which differ from the Mozilla Public License and Netscape Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in <span class="T4">Exhibit A</span> shall not of themselves be deemed to be modifications of this License.)<span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">7. DISCLAIMER OF WARRANTY.</span> </p><ul><li><p class="P31" style="margin-left:0.748cm;">COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.<span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">8. TERMINATION.</span> </p><ul><li><p class="P32" style="margin-left:0.748cm;"><span class="T4">8.1.  </span>This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. <span class="odfLiEnd"/> </p><p class="P32" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">8.2.  </span>If You initiate litigation by asserting a patent infringement claim (excluding declatory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You file such action is referred to as "Participant")  alleging that: <span class="odfLiEnd"/> </p><p class="P32" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">(a)  </span>such Participant's Contributor Version directly or indirectly infringes any patent, then any and all rights granted by such Participant to You under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively, unless if within 60 days after receipt of notice You either: (i)  agree in writing to pay Participant a mutually agreeable reasonable royalty for Your past and future use of Modifications made by such Participant, or (ii) withdraw Your litigation claim with respect to the Contributor Version against such Participant.  If within 60 days of notice, a reasonable royalty and payment arrangement are not mutually agreed upon in writing by the parties or the litigation claim is not withdrawn, the rights granted by Participant to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration of the 60 day notice period specified above. <span class="odfLiEnd"/> </p><p class="P32" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">(b)</span>  any software, hardware, or device, other than such Participant's Contributor Version, directly or indirectly infringes any patent, then any rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are revoked effective as of the date You first made, used, sold, distributed, or had made, Modifications made by that Participant. <span class="odfLiEnd"/> </p><p class="P32" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">8.3.  </span>If You assert a patent infringement claim against Participant alleging that such Participant's Contributor Version directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license. <span class="odfLiEnd"/> </p><p class="P32" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">8.4.</span>  In the event of termination under Sections 8.1 or 8.2 above,  all end user license agreements (excluding distributors and resellers) which have been validly granted by You or any distributor hereunder prior to termination shall survive termination.<span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">9. LIMITATION OF LIABILITY.</span> </p><ul><li><p class="P33" style="margin-left:0.748cm;">UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.<span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">10. U.S. GOVERNMENT END USERS.</span> </p><ul><li><p class="P34" style="margin-left:0.748cm;">The Covered Code is a ''commercial item,'' as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of ''commercial computer software'' and ''commercial computer software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein.<span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">11. MISCELLANEOUS.</span> </p><ul><li><p class="P35" style="margin-left:0.748cm;">This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in the United States of America, any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License.<span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">12. RESPONSIBILITY FOR CLAIMS.</span> </p><ul><li><p class="P36" style="margin-left:0.748cm;">As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.<span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">13. MULTIPLE-LICENSED CODE.</span> </p><ul><li><p class="P37" style="margin-left:0.748cm;">Initial Developer may designate portions of the Covered Code as “Multiple-Licensed�.  “Multiple-Licensed� means that the Initial Developer permits you to utilize portions of the Covered Code under Your choice of the MPL or the alternative licenses, if any, specified by the Initial Developer in the file described in Exhibit A.<span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><br/><span class="T4">EXHIBIT A -Mozilla Public License.</span> </p><ul><li><p class="P38" style="margin-left:0.748cm;">``The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at <br/><span style="margin-left:0.4991cm"/>http://www.mozilla.org/MPL/ <span class="odfLiEnd"/> </p><p class="P38" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span>Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF <br/><span style="margin-left:0.4991cm"/>ANY KIND, either express or implied. See the License for the specific language governing rights and <br/><span style="margin-left:0.4991cm"/>limitations under the License. <span class="odfLiEnd"/> </p><p class="P38" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span>The Original Code is ______________________________________. <span class="odfLiEnd"/> </p><p class="P38" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span>The Initial Developer of the Original Code is ________________________. Portions created by <br/><span style="margin-left:0.4991cm"/> ______________________ are Copyright (C) ______ _______________________. All Rights <br/><span style="margin-left:0.4991cm"/>Reserved. <span class="odfLiEnd"/> </p><p class="P38" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span>Contributor(s): ______________________________________. <span class="odfLiEnd"/> </p><p class="P38" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span>Alternatively, the contents of this file may be used under the terms of the _____ license (the  “[___] License�), in which case the provisions of [______] License are applicable  instead of those above.  If you wish to allow use of your version of this file only under the terms of the [____] License and not to allow others to use your version of this file under the MPL, indicate your decision by deleting  the provisions above and replace  them with the notice and other provisions required by the [___] License.  If you do not delete the provisions above, a recipient may use your version of this file under either the MPL or the [___] License." <span class="odfLiEnd"/> </p><p class="P38" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span>[NOTE: The text of this Exhibit A may differ slightly from the text of the notices in the Source Code files of the Original Code. You should use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.] <span class="odfLiEnd"/> </p></li></ul><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: OpenSSL; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__OpenSSL_Project"><span/></a>OpenSSL Project</h2><h3 class="Heading_20_3"><a id="a__OpenSSL"><span/></a>OpenSSL</h3><p class="Preformatted_20_Text">  LICENSE ISSUES</p><p class="Preformatted_20_Text">  ==============</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  The OpenSSL toolkit stays under a dual license, i.e. both the conditions of</p><p class="Preformatted_20_Text">  the OpenSSL License and the original SSLeay license apply to the toolkit.</p><p class="Preformatted_20_Text">  See below for the actual license texts. Actually both licenses are BSD-style</p><p class="Preformatted_20_Text">  Open Source licenses. In case of any license issues related to OpenSSL</p><p class="Preformatted_20_Text">  please contact openssl-core@openssl.org.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  OpenSSL License</p><p class="Preformatted_20_Text">  ---------------</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">/* ====================================================================</p><p class="Preformatted_20_Text"> * Copyright (c) 1998-2007 The OpenSSL Project.  All rights reserved.</p><p class="Preformatted_20_Text"> *</p><p class="Preformatted_20_Text"> * Redistribution and use in source and binary forms, with or without</p><p class="Preformatted_20_Text"> * modification, are permitted provided that the following conditions</p><p class="Preformatted_20_Text"> * are met:</p><p class="Preformatted_20_Text"> *</p><p class="Preformatted_20_Text"> * 1. Redistributions of source code must retain the above copyright</p><p class="Preformatted_20_Text"> *    notice, this list of conditions and the following disclaimer. </p><p class="Preformatted_20_Text"> *</p><p class="Preformatted_20_Text"> * 2. Redistributions in binary form must reproduce the above copyright</p><p class="Preformatted_20_Text"> *    notice, this list of conditions and the following disclaimer in</p><p class="Preformatted_20_Text"> *    the documentation and/or other materials provided with the</p><p class="Preformatted_20_Text"> *    distribution.</p><p class="Preformatted_20_Text"> *</p><p class="Preformatted_20_Text"> * 3. All advertising materials mentioning features or use of this</p><p class="Preformatted_20_Text"> *    software must display the following acknowledgment:</p><p class="Preformatted_20_Text"> *    "This product includes software developed by the OpenSSL Project</p><p class="Preformatted_20_Text"> *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"</p><p class="Preformatted_20_Text"> *</p><p class="Preformatted_20_Text"> * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to</p><p class="Preformatted_20_Text"> *    endorse or promote products derived from this software without</p><p class="Preformatted_20_Text"> *    prior written permission. For written permission, please contact</p><p class="Preformatted_20_Text"> *    openssl-core@openssl.org.</p><p class="Preformatted_20_Text"> *</p><p class="Preformatted_20_Text"> * 5. Products derived from this software may not be called "OpenSSL"</p><p class="Preformatted_20_Text"> *    nor may "OpenSSL" appear in their names without prior written</p><p class="Preformatted_20_Text"> *    permission of the OpenSSL Project.</p><p class="Preformatted_20_Text"> *</p><p class="Preformatted_20_Text"> * 6. Redistributions of any form whatsoever must retain the following</p><p class="Preformatted_20_Text"> *    acknowledgment:</p><p class="Preformatted_20_Text"> *    "This product includes software developed by the OpenSSL Project</p><p class="Preformatted_20_Text"> *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"</p><p class="Preformatted_20_Text"> *</p><p class="Preformatted_20_Text"> * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY</p><p class="Preformatted_20_Text"> * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</p><p class="Preformatted_20_Text"> * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR</p><p class="Preformatted_20_Text"> * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR</p><p class="Preformatted_20_Text"> * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,</p><p class="Preformatted_20_Text"> * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</p><p class="Preformatted_20_Text"> * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</p><p class="Preformatted_20_Text"> * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)</p><p class="Preformatted_20_Text"> * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,</p><p class="Preformatted_20_Text"> * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</p><p class="Preformatted_20_Text"> * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED</p><p class="Preformatted_20_Text"> * OF THE POSSIBILITY OF SUCH DAMAGE.</p><p class="Preformatted_20_Text"> * ====================================================================</p><p class="Preformatted_20_Text"> *</p><p class="Preformatted_20_Text"> * This product includes cryptographic software written by Eric Young</p><p class="Preformatted_20_Text"> * (eay@cryptsoft.com).  This product includes software written by Tim</p><p class="Preformatted_20_Text"> * Hudson (tjh@cryptsoft.com).</p><p class="Preformatted_20_Text"> *</p><p class="Preformatted_20_Text"> */</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text"> Original SSLeay License</p><p class="Preformatted_20_Text"> -----------------------</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)</p><p class="Preformatted_20_Text"> * All rights reserved.</p><p class="Preformatted_20_Text"> *</p><p class="Preformatted_20_Text"> * This package is an SSL implementation written</p><p class="Preformatted_20_Text"> * by Eric Young (eay@cryptsoft.com).</p><p class="Preformatted_20_Text"> * The implementation was written so as to conform with Netscapes SSL.</p><p class="Preformatted_20_Text"> * </p><p class="Preformatted_20_Text"> * This library is free for commercial and non-commercial use as long as</p><p class="Preformatted_20_Text"> * the following conditions are aheared to.  The following conditions</p><p class="Preformatted_20_Text"> * apply to all code found in this distribution, be it the RC4, RSA,</p><p class="Preformatted_20_Text"> * lhash, DES, etc., code; not just the SSL code.  The SSL documentation</p><p class="Preformatted_20_Text"> * included with this distribution is covered by the same copyright terms</p><p class="Preformatted_20_Text"> * except that the holder is Tim Hudson (tjh@cryptsoft.com).</p><p class="Preformatted_20_Text"> * </p><p class="Preformatted_20_Text"> * Copyright remains Eric Young's, and as such any Copyright notices in</p><p class="Preformatted_20_Text"> * the code are not to be removed.</p><p class="Preformatted_20_Text"> * If this package is used in a product, Eric Young should be given attribution</p><p class="Preformatted_20_Text"> * as the author of the parts of the library used.</p><p class="Preformatted_20_Text"> * This can be in the form of a textual message at program startup or</p><p class="Preformatted_20_Text"> * in documentation (online or textual) provided with the package.</p><p class="Preformatted_20_Text"> * </p><p class="Preformatted_20_Text"> * Redistribution and use in source and binary forms, with or without</p><p class="Preformatted_20_Text"> * modification, are permitted provided that the following conditions</p><p class="Preformatted_20_Text"> * are met:</p><p class="Preformatted_20_Text"> * 1. Redistributions of source code must retain the copyright</p><p class="Preformatted_20_Text"> *    notice, this list of conditions and the following disclaimer.</p><p class="Preformatted_20_Text"> * 2. Redistributions in binary form must reproduce the above copyright</p><p class="Preformatted_20_Text"> *    notice, this list of conditions and the following disclaimer in the</p><p class="Preformatted_20_Text"> *    documentation and/or other materials provided with the distribution.</p><p class="Preformatted_20_Text"> * 3. All advertising materials mentioning features or use of this software</p><p class="Preformatted_20_Text"> *    must display the following acknowledgement:</p><p class="Preformatted_20_Text"> *    "This product includes cryptographic software written by</p><p class="Preformatted_20_Text"> *     Eric Young (eay@cryptsoft.com)"</p><p class="Preformatted_20_Text"> *    The word 'cryptographic' can be left out if the rouines from the library</p><p class="Preformatted_20_Text"> *    being used are not cryptographic related :-).</p><p class="Preformatted_20_Text"> * 4. If you include any Windows specific code (or a derivative thereof) from </p><p class="Preformatted_20_Text"> *    the apps directory (application code) you must include an acknowledgement:</p><p class="Preformatted_20_Text"> *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"</p><p class="Preformatted_20_Text"> * </p><p class="Preformatted_20_Text"> * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND</p><p class="Preformatted_20_Text"> * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</p><p class="Preformatted_20_Text"> * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</p><p class="Preformatted_20_Text"> * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE</p><p class="Preformatted_20_Text"> * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL</p><p class="Preformatted_20_Text"> * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS</p><p class="Preformatted_20_Text"> * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)</p><p class="Preformatted_20_Text"> * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT</p><p class="Preformatted_20_Text"> * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY</p><p class="Preformatted_20_Text"> * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF</p><p class="Preformatted_20_Text"> * SUCH DAMAGE.</p><p class="Preformatted_20_Text"> * </p><p class="Preformatted_20_Text"> * The licence and distribution terms for any publically available version or</p><p class="Preformatted_20_Text"> * derivative of this code cannot be changed.  i.e. this code cannot simply be</p><p class="Preformatted_20_Text"> * copied and put under another distribution licence</p><p class="Preformatted_20_Text"> * [including the GNU Public Licence.]</p><p class="Preformatted_20_Text"> */</p><p class="P2"> </p><p class="P11"> </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product:PortAudio - Portable Real-Time Audio Library; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Ross_Bencina_and_Phil_Burk"><span/></a>Ross Bencina and Phil Burk </h2><h3 class="Heading_20_3"><a id="a__PortAudio"><span/></a>PortAudio</h3><p class="Text_20_body">PortAudio Portable Real-Time Audio Library <br/>Copyright (c) 1999-2000 Ross Bencina and Phil Burk </p><p class="Text_20_body">Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: </p><ul><li><p class="P17" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm">•.</span>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. <span class="odfLiEnd"/> </p></li><li><p class="P39" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm">•.</span>Any person wishing to distribute modifications to the Software is requested to send the modifications to the original developer so that they can be incorporated into the canonical version. <span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body">THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ON INFRINGEMENT. <br/>IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. <br/>  </p><h4 class="Heading_20_4"><a id="a__Plain_English_Interpretation_of_the_License"><span/></a>Plain English Interpretation of the License</h4><p class="Text_20_body">The following is a plain English interpretation of the license. This interpretation is not part of the license and has no legal significance. To understand the full legal implications of the license you should consult the license itself. </p><ul><li><p class="P18" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm">•.</span>You <span class="T4">can</span> use PortAudio for free in your projects or applications, even commercial applications. <span class="odfLiEnd"/> </p></li><li><p class="P18" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm">•.</span>You do <span class="T4">not</span> have to make your own source available as open-source code just because you used PortAudio. <span class="odfLiEnd"/> </p></li><li><p class="P18" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm">•.</span>Do <span class="T4">not</span> take our copyright information out of the PortAudio source code. <span class="odfLiEnd"/> </p></li><li><p class="P18" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm">•.</span>If you fix a bug in PortAudio, please send us the fix. <span class="odfLiEnd"/> </p></li><li><p class="P40" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm">•.</span>You <span class="T4">cannot</span> sue us if your program fails because of PortAudio. <span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"> </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: XT; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__James_Clark__Bill_Lindsey"><span/></a>James Clark, Bill Lindsey</h2><h3 class="Heading_20_3"><a id="a__PostgreSQL_Database_Management_System"><span/></a>PostgreSQL Database Management System </h3><p class="P11"><br/>(formerly known as Postgres, then as Postgres95) <br/>Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group <br/>Portions Copyright (c) 1994, The Regents of the University of California <br/>Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies. <br/>IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <br/>THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: PostScript(R) AFM Files; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Adobe"><span/></a>Adobe</h2><h3 class="Heading_20_3"><a id="a__Printer_Description_Files"><span/></a>Printer Description Files</h3><p class="Text_20_body"> </p><p class="Preformatted_20_Text"> Copyright 1987-1995 Adobe Systems Incorporated.</p><p class="Preformatted_20_Text"> All Rights Reserved.</p><p class="Preformatted_20_Text"> Permission is granted for redistribution of this file as</p><p class="Preformatted_20_Text"> long as this copyright notice is intact and the contents</p><p class="Preformatted_20_Text"> of the file is not altered in any way from its original form.</p><p class="P2"> End of Copyright statement</p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Python; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Python_Software_Foundation"><span/></a>Python Software Foundation</h2><h3 class="Heading_20_3"><a id="a__Python"><span/></a>Python</h3><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON</p><p class="Preformatted_20_Text">===============================================================</p><p class="Preformatted_20_Text"/><p class="Preformatted_20_Text">PSF LICENSE AGREEMENT FOR PYTHON 2.3</p><p class="Preformatted_20_Text">------------------------------------</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">1. This LICENSE AGREEMENT is between the Python Software Foundation</p><p class="Preformatted_20_Text">("PSF"), and the Individual or Organization ("Licensee") accessing and</p><p class="Preformatted_20_Text">otherwise using Python 2.3 software in source or binary form and its</p><p class="Preformatted_20_Text">associated documentation.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">2. Subject to the terms and conditions of this License Agreement, PSF</p><p class="Preformatted_20_Text">hereby grants Licensee a nonexclusive, royalty-free, world-wide</p><p class="Preformatted_20_Text">license to reproduce, analyze, test, perform and/or display publicly,</p><p class="Preformatted_20_Text">prepare derivative works, distribute, and otherwise use Python 2.3</p><p class="Preformatted_20_Text">alone or in any derivative version, provided, however, that PSF's</p><p class="Preformatted_20_Text">License Agreement and PSF's notice of copyright, i.e., "Copyright (c)</p><p class="Preformatted_20_Text">2001, 2002, 2003, 2004 Python Software Foundation; All Rights Reserved" are</p><p class="Preformatted_20_Text">retained in Python 2.3 alone or in any derivative version prepared by</p><p class="Preformatted_20_Text">Licensee.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">3. In the event Licensee prepares a derivative work that is based on</p><p class="Preformatted_20_Text">or incorporates Python 2.3 or any part thereof, and wants to make</p><p class="Preformatted_20_Text">the derivative work available to others as provided herein, then</p><p class="Preformatted_20_Text">Licensee hereby agrees to include in any such work a brief summary of</p><p class="Preformatted_20_Text">the changes made to Python 2.3.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">4. PSF is making Python 2.3 available to Licensee on an "AS IS"</p><p class="Preformatted_20_Text">basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR</p><p class="Preformatted_20_Text">IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND</p><p class="Preformatted_20_Text">DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS</p><p class="Preformatted_20_Text">FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.3 WILL NOT</p><p class="Preformatted_20_Text">INFRINGE ANY THIRD PARTY RIGHTS.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON</p><p class="Preformatted_20_Text">2.3 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS</p><p class="Preformatted_20_Text">A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.3,</p><p class="Preformatted_20_Text">OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">6. This License Agreement will automatically terminate upon a material</p><p class="Preformatted_20_Text">breach of its terms and conditions.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">7. Nothing in this License Agreement shall be deemed to create any</p><p class="Preformatted_20_Text">relationship of agency, partnership, or joint venture between PSF and</p><p class="Preformatted_20_Text">Licensee.  This License Agreement does not grant permission to use PSF</p><p class="Preformatted_20_Text">trademarks or trade name in a trademark sense to endorse or promote</p><p class="Preformatted_20_Text">products or services of Licensee, or any third party.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">8. By copying, installing or otherwise using Python 2.3, Licensee</p><p class="Preformatted_20_Text">agrees to be bound by the terms and conditions of this License</p><p class="Preformatted_20_Text">Agreement.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0</p><p class="Preformatted_20_Text">-------------------------------------------</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an</p><p class="Preformatted_20_Text">office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the</p><p class="Preformatted_20_Text">Individual or Organization ("Licensee") accessing and otherwise using</p><p class="Preformatted_20_Text">this software in source or binary form and its associated</p><p class="Preformatted_20_Text">documentation ("the Software").</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">2. Subject to the terms and conditions of this BeOpen Python License</p><p class="Preformatted_20_Text">Agreement, BeOpen hereby grants Licensee a non-exclusive,</p><p class="Preformatted_20_Text">royalty-free, world-wide license to reproduce, analyze, test, perform</p><p class="Preformatted_20_Text">and/or display publicly, prepare derivative works, distribute, and</p><p class="Preformatted_20_Text">otherwise use the Software alone or in any derivative version,</p><p class="Preformatted_20_Text">provided, however, that the BeOpen Python License is retained in the</p><p class="Preformatted_20_Text">Software, alone or in any derivative version prepared by Licensee.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">3. BeOpen is making the Software available to Licensee on an "AS IS"</p><p class="Preformatted_20_Text">basis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR</p><p class="Preformatted_20_Text">IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND</p><p class="Preformatted_20_Text">DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS</p><p class="Preformatted_20_Text">FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT</p><p class="Preformatted_20_Text">INFRINGE ANY THIRD PARTY RIGHTS.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE</p><p class="Preformatted_20_Text">SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS</p><p class="Preformatted_20_Text">AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY</p><p class="Preformatted_20_Text">DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">5. This License Agreement will automatically terminate upon a material</p><p class="Preformatted_20_Text">breach of its terms and conditions.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">6. This License Agreement shall be governed by and interpreted in all</p><p class="Preformatted_20_Text">respects by the law of the State of California, excluding conflict of</p><p class="Preformatted_20_Text">law provisions.  Nothing in this License Agreement shall be deemed to</p><p class="Preformatted_20_Text">create any relationship of agency, partnership, or joint venture</p><p class="Preformatted_20_Text">between BeOpen and Licensee.  This License Agreement does not grant</p><p class="Preformatted_20_Text">permission to use BeOpen trademarks or trade names in a trademark</p><p class="Preformatted_20_Text">sense to endorse or promote products or services of Licensee, or any</p><p class="Preformatted_20_Text">third party.  As an exception, the "BeOpen Python" logos available at</p><p class="Preformatted_20_Text">http://www.pythonlabs.com/logos.html may be used according to the</p><p class="Preformatted_20_Text">permissions granted on that web page.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">7. By copying, installing or otherwise using the software, Licensee</p><p class="Preformatted_20_Text">agrees to be bound by the terms and conditions of this License</p><p class="Preformatted_20_Text">Agreement.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1</p><p class="Preformatted_20_Text">---------------------------------------</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">1. This LICENSE AGREEMENT is between the Corporation for National</p><p class="Preformatted_20_Text">Research Initiatives, having an office at 1895 Preston White Drive,</p><p class="Preformatted_20_Text">Reston, VA 20191 ("CNRI"), and the Individual or Organization</p><p class="Preformatted_20_Text">("Licensee") accessing and otherwise using Python 1.6.1 software in</p><p class="Preformatted_20_Text">source or binary form and its associated documentation.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">2. Subject to the terms and conditions of this License Agreement, CNRI</p><p class="Preformatted_20_Text">hereby grants Licensee a nonexclusive, royalty-free, world-wide</p><p class="Preformatted_20_Text">license to reproduce, analyze, test, perform and/or display publicly,</p><p class="Preformatted_20_Text">prepare derivative works, distribute, and otherwise use Python 1.6.1</p><p class="Preformatted_20_Text">alone or in any derivative version, provided, however, that CNRI's</p><p class="Preformatted_20_Text">License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)</p><p class="Preformatted_20_Text">1995-2001 Corporation for National Research Initiatives; All Rights</p><p class="Preformatted_20_Text">Reserved" are retained in Python 1.6.1 alone or in any derivative</p><p class="Preformatted_20_Text">version prepared by Licensee.  Alternately, in lieu of CNRI's License</p><p class="Preformatted_20_Text">Agreement, Licensee may substitute the following text (omitting the</p><p class="Preformatted_20_Text">quotes): "Python 1.6.1 is made available subject to the terms and</p><p class="Preformatted_20_Text">conditions in CNRI's License Agreement.  This Agreement together with</p><p class="Preformatted_20_Text">Python 1.6.1 may be located on the Internet using the following</p><p class="Preformatted_20_Text">unique, persistent identifier (known as a handle): 1895.22/1013.  This</p><p class="Preformatted_20_Text">Agreement may also be obtained from a proxy server on the Internet</p><p class="Preformatted_20_Text">using the following URL: http://hdl.handle.net/1895.22/1013".</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">3. In the event Licensee prepares a derivative work that is based on</p><p class="Preformatted_20_Text">or incorporates Python 1.6.1 or any part thereof, and wants to make</p><p class="Preformatted_20_Text">the derivative work available to others as provided herein, then</p><p class="Preformatted_20_Text">Licensee hereby agrees to include in any such work a brief summary of</p><p class="Preformatted_20_Text">the changes made to Python 1.6.1.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"</p><p class="Preformatted_20_Text">basis.  CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR</p><p class="Preformatted_20_Text">IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND</p><p class="Preformatted_20_Text">DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS</p><p class="Preformatted_20_Text">FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT</p><p class="Preformatted_20_Text">INFRINGE ANY THIRD PARTY RIGHTS.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON</p><p class="Preformatted_20_Text">1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS</p><p class="Preformatted_20_Text">A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,</p><p class="Preformatted_20_Text">OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">6. This License Agreement will automatically terminate upon a material</p><p class="Preformatted_20_Text">breach of its terms and conditions.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">7. This License Agreement shall be governed by the federal</p><p class="Preformatted_20_Text">intellectual property law of the United States, including without</p><p class="Preformatted_20_Text">limitation the federal copyright law, and, to the extent such</p><p class="Preformatted_20_Text">U.S. federal law does not apply, by the law of the Commonwealth of</p><p class="Preformatted_20_Text">Virginia, excluding Virginia's conflict of law provisions.</p><p class="Preformatted_20_Text">Notwithstanding the foregoing, with regard to derivative works based</p><p class="Preformatted_20_Text">on Python 1.6.1 that incorporate non-separable material that was</p><p class="Preformatted_20_Text">previously distributed under the GNU General Public License (GPL), the</p><p class="Preformatted_20_Text">law of the Commonwealth of Virginia shall govern this License</p><p class="Preformatted_20_Text">Agreement only as to issues arising under or with respect to</p><p class="Preformatted_20_Text">Paragraphs 4, 5, and 7 of this License Agreement.  Nothing in this</p><p class="Preformatted_20_Text">License Agreement shall be deemed to create any relationship of</p><p class="Preformatted_20_Text">agency, partnership, or joint venture between CNRI and Licensee.  This</p><p class="Preformatted_20_Text">License Agreement does not grant permission to use CNRI trademarks or</p><p class="Preformatted_20_Text">trade name in a trademark sense to endorse or promote products or</p><p class="Preformatted_20_Text">services of Licensee, or any third party.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">8. By clicking on the "ACCEPT" button where indicated, or by copying,</p><p class="Preformatted_20_Text">installing or otherwise using Python 1.6.1, Licensee agrees to be</p><p class="Preformatted_20_Text">bound by the terms and conditions of this License Agreement.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">        ACCEPT</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2</p><p class="Preformatted_20_Text">--------------------------------------------------</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,</p><p class="Preformatted_20_Text">The Netherlands.  All rights reserved.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Permission to use, copy, modify, and distribute this software and its</p><p class="Preformatted_20_Text">documentation for any purpose and without fee is hereby granted,</p><p class="Preformatted_20_Text">provided that the above copyright notice appear in all copies and that</p><p class="Preformatted_20_Text">both that copyright notice and this permission notice appear in</p><p class="Preformatted_20_Text">supporting documentation, and that the name of Stichting Mathematisch</p><p class="Preformatted_20_Text">Centrum or CWI not be used in advertising or publicity pertaining to</p><p class="Preformatted_20_Text">distribution of the software without specific, written prior</p><p class="Preformatted_20_Text">permission.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO</p><p class="Preformatted_20_Text">THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND</p><p class="Preformatted_20_Text">FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE</p><p class="Preformatted_20_Text">FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES</p><p class="Preformatted_20_Text">WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN</p><p class="Preformatted_20_Text">ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT</p><p class="P2">OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</p><p class="P11"> </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Redland RDF Library librdf; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__librdf_org"><span/></a>librdf.org </h2><h3 class="Heading_20_3"><a id="a__librdf"><span/></a>librdf</h3><p class="P11"><a href="./#lgpl">jump to LGPL</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: regexp; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Free_Software_Foundation__Inc_"><span/></a>Free Software Foundation, Inc. </h2><h3 class="Heading_20_3"><a id="a__regexp"><span/></a>regexp</h3><p class="P11"><a href="./#lgpl">jump to LGPL</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Remote Control Wrapper; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Martin_Kahr"><span/></a>Martin Kahr</h2><h3 class="Heading_20_3"><a id="a__Remote_Control_Wrapper"><span/></a>Remote Control Wrapper</h3><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Created by Martin Kahr under a MIT-style license. </p><p class="Preformatted_20_Text">Copyright (c) 2006/2007 martinkahr.com. All rights reserved.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Permission is hereby granted, free of charge, to any person obtaining a </p><p class="Preformatted_20_Text">copy of this software and associated documentation files (the "Software"),</p><p class="Preformatted_20_Text">to deal in the Software without restriction, including without limitation</p><p class="Preformatted_20_Text">the rights to use, copy, modify, merge, publish, distribute, sublicense,</p><p class="Preformatted_20_Text">and/or sell copies of the Software, and to permit persons to whom the</p><p class="Preformatted_20_Text">Software is furnished to do so, subject to the following conditions:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">The above copyright notice and this permission notice shall be included</p><p class="Preformatted_20_Text">in all copies or substantial portions of the Software.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</p><p class="Preformatted_20_Text">IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</p><p class="Preformatted_20_Text">FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL </p><p class="Preformatted_20_Text">THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER</p><p class="Preformatted_20_Text">LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,</p><p class="Preformatted_20_Text">OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN</p><p class="Preformatted_20_Text">THE SOFTWARE.</p><p class="P2"> </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Rhino; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Norris_Boyd__Patrick_Beard"><span/></a>Norris Boyd, Patrick Beard</h2><h3 class="Heading_20_3"><a id="a__Rhino"><span/></a>Rhino</h3><p class="P8"><span class="T5">MOZILLA PUBLIC LICENSE</span> <br/><span class="T4">Version 1.1</span> </p><p class="P5"/><p class="Text_20_body"><span class="T4">1. Definitions.</span> </p><ul><li><p class="P41" style="margin-left:0.748cm;"><span class="T4">1.0.1. "Commercial Use" </span>means distribution or otherwise making the Covered Code available to a third party. <span class="odfLiEnd"/> </p><p class="P41" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.1. ''Contributor''</span> means each entity that creates or contributes to the creation of Modifications. <span class="odfLiEnd"/> </p><p class="P41" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.2. ''Contributor Version''</span> means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor. <span class="odfLiEnd"/> </p><p class="P41" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.3. ''Covered Code''</span> means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof<span class="T4">.</span> <span class="odfLiEnd"/> </p><p class="P41" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.4. ''Electronic Distribution Mechanism''</span> means a mechanism generally accepted in the software development community for the electronic transfer of data. <span class="odfLiEnd"/> </p><p class="P41" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.5. ''Executable''</span> means Covered Code in any form other than Source Code. <span class="odfLiEnd"/> </p><p class="P41" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.6. ''Initial Developer''</span> means the individual or entity identified as the Initial Developer in the Source Code notice required by <span class="T4">Exhibit A</span>. <span class="odfLiEnd"/> </p><p class="P41" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.7. ''Larger Work''</span> means a work which combines Covered Code or portions thereof with code not governed by the terms of this License. <span class="odfLiEnd"/> </p><p class="P41" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.8. ''License''</span> means this document. <span class="odfLiEnd"/> </p><p class="P41" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.8.1. "Licensable"</span> means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. <span class="odfLiEnd"/> </p><p class="P41" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.9. ''Modifications''</span> means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is: <span class="odfLiEnd"/> </p><ul><li><p class="P41" style="margin-left:1.9949cm;"><span class="T4">A.</span> Any addition to or deletion from the contents of a file containing Original Code or previous Modifications. <span class="odfLiEnd"/> </p><p class="P41" style="margin-left:1.9949cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">B.</span> Any new file that contains any part of the Original Code or previous Modifications. <br/><span style="margin-left:0.4991cm"/> <span class="odfLiEnd"/> </p></li></ul><p class="P41" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.10. ''Original Code''</span> means Source Code of computer software code which is described in the Source Code notice required by <span class="T4">Exhibit A</span> as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License. <span class="odfLiEnd"/> </p><p class="P41" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.10.1. "Patent Claims"</span> means any patent claim(s), now owned or hereafter acquired, including without limitation,  method, process, and apparatus claims, in any patent Licensable by grantor. <span class="odfLiEnd"/> </p><p class="P41" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.11. ''Source Code''</span> means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge. <span class="odfLiEnd"/> </p><p class="P41" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.12. "You'' (or "Your") </span> means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You'' includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control'' means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.<span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">2. Source Code License.</span> </p><ul><li><p class="P19" style="margin-left:0.748cm;"><span class="T4">2.1. The Initial Developer Grant.</span> <br/><span style="margin-left:0.4991cm"/>The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims: <span class="odfLiEnd"/> </p><ul><li><p class="P42" style="margin-left:1.9949cm;"><span class="T4">(a)</span>  under intellectual property rights (other than patent or trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, and/or as part of a Larger Work; and <span class="odfLiEnd"/> </p><p class="P42" style="margin-left:1.9949cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">(b)</span> under Patents Claims infringed by the making, using or selling of Original Code, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Code (or portions thereof). <span class="odfLiEnd"/> </p><ul><li><ul><li><p class="P19" style="margin-left:4.4889cm;">  <span class="odfLiEnd"/> </p></li></ul></li></ul><p class="P42" style="margin-left:1.9949cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">(c) </span>the licenses granted in this Section 2.1(a) and (b) are effective on the date Initial Developer first distributes Original Code under the terms of this License. <span class="odfLiEnd"/> </p><p class="P42" style="margin-left:1.9949cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">(d) </span>Notwithstanding Section 2.1(b) above, no patent license is granted: 1) for code that You delete from the Original Code; 2) separate from the Original Code;  or 3) for infringements caused by: i) the modification of the Original Code or ii) the combination of the Original Code with other software or devices. <br/><span style="margin-left:0.4991cm"/> <span class="odfLiEnd"/> </p></li></ul><p class="P19" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">2.2. Contributor Grant.</span> <br/><span style="margin-left:0.4991cm"/>Subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license <span class="odfLiEnd"/> </p><ul><li><p class="P42" style="margin-left:1.9949cm;">  <br/><span style="margin-left:0.4991cm"/><span class="T4">(a)</span>  under intellectual property rights (other than patent or trademark) Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger Work; and <span class="odfLiEnd"/> </p><p class="P42" style="margin-left:1.9949cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">(b)</span> under Patent Claims infringed by the making, using, or selling of  Modifications made by that Contributor either alone and/or in<span class="T6"> combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: 1) Modifications made by that Contributor (or portions thereof); and 2) the combination of  Modifications made by that Contributor with its Contributor Version (or portions of such combination).</span> <span class="odfLiEnd"/> </p><p class="P42" style="margin-left:1.9949cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">(c) </span>the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first makes Commercial Use of the Covered Code. <span class="odfLiEnd"/> </p><p class="P42" style="margin-left:1.9949cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">(d) </span>   Notwithstanding Section 2.2(b) above, no patent license is granted: 1) for any code that Contributor has deleted from the Contributor Version; 2)  separate from the Contributor Version;  3)  for infringements caused by: i) third party modifications of Contributor Version or ii)  the combination of Modifications made by that Contributor with other software  (except as part of the Contributor Version) or other devices; or 4) under Patent Claims infringed by Covered Code in the absence of Modifications made by that Contributor.<span class="odfLiEnd"/> </p></li></ul></li></ul><p class="Text_20_body"><br/><span class="T4">3. Distribution Obligations.</span> </p><ul><li><p class="P43" style="margin-left:0.748cm;"><span class="T4">3.1. Application of License.</span> <br/><span style="margin-left:0.4991cm"/>The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section <span class="T4">2.2</span>. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section <span class="T4">6.1</span>, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section <span class="T4">3.5</span>. <span class="odfLiEnd"/> </p><p class="P43" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">3.2. Availability of Source Code.</span> <br/><span style="margin-left:0.4991cm"/>Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party. <span class="odfLiEnd"/> </p><p class="P43" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">3.3. Description of Modifications.</span> <br/><span style="margin-left:0.4991cm"/>You must cause all Covered Code to which You contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code. <span class="odfLiEnd"/> </p><p class="P43" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">3.4. Intellectual Property Matters</span> <span class="odfLiEnd"/> </p><ul><li><p class="P43" style="margin-left:1.9949cm;"><span class="T4">(a) Third Party Claims</span>. <br/><span style="margin-left:0.4991cm"/>If Contributor has knowledge that a license under a third party's intellectual property rights is required to exercise the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor must include a text file with the Source Code distribution titled "LEGAL'' which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If Contributor obtains such knowledge after the Modification is made available as described in Section 3.2, Contributor shall promptly modify the LEGAL file in all copies Contributor makes available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained. <span class="odfLiEnd"/> </p><p class="P43" style="margin-left:1.9949cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">(b) Contributor APIs</span>. <br/><span style="margin-left:0.4991cm"/>If Contributor's Modifications include an application programming interface and Contributor has knowledge of patent licenses which are reasonably necessary to implement that API, Contributor must also include this information in the LEGAL file. <br/><span style="margin-left:0.4991cm"/> <span class="odfLiEnd"/> </p></li></ul><p class="P20" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span>          <span class="T4">(c)    Representations.</span> <span class="odfLiEnd"/> </p><ul><li><p class="P43" style="margin-left:1.9949cm;">Contributor represents that, except as disclosed pursuant to Section 3.4(a) above, Contributor believes that Contributor's Modifications are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the rights conveyed by this License. <span class="odfLiEnd"/> </p></li></ul><p class="P43" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><br/><span style="margin-left:0.4991cm"/><span class="T4">3.5. Required Notices.</span> <br/><span style="margin-left:0.4991cm"/>You must duplicate the notice in <span class="T4">Exhibit A</span> in each file of the Source Code.  If it is not possible to put such notice in a particular Source Code file due to its structure, then You must include such notice in a location (such as a relevant directory) where a user would be likely to look for such a notice.  If You created one or more Modification(s) You may add your name as a Contributor to the notice described in <span class="T4">Exhibit A</span>.  You must also duplicate this License in any documentation for the Source Code where You describe recipients' rights or ownership rights relating to Covered Code.  You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer. <span class="odfLiEnd"/> </p><p class="P43" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">3.6. Distribution of Executable Versions.</span> <br/><span style="margin-left:0.4991cm"/>You may distribute Covered Code in Executable form only if the requirements of Section <span class="T4">3.1-3.5</span> have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section <span class="T4">3.2</span>. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code or ownership rights under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer. <span class="odfLiEnd"/> </p><p class="P43" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">3.7. Larger Works.</span> <br/><span style="margin-left:0.4991cm"/>You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code.<span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">4. Inability to Comply Due to Statute or Regulation.</span> </p><ul><li><p class="P44" style="margin-left:0.748cm;">If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section <span class="T4">3.4</span> and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it. <span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">5. Application of this License.</span> </p><ul><li><p class="P45" style="margin-left:0.748cm;">This License applies to code to which the Initial Developer has attached the notice in <span class="T4">Exhibit A</span> and to related Covered Code. <span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">6. Versions of the License.</span> </p><ul><li><p class="P46" style="margin-left:0.748cm;"><span class="T4">6.1. New Versions</span>. <br/><span style="margin-left:0.4991cm"/>Netscape Communications Corporation (''Netscape'') may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number. <span class="odfLiEnd"/> </p><p class="P46" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">6.2. Effect of New Versions</span>. <br/><span style="margin-left:0.4991cm"/>Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Netscape. No one other than Netscape has the right to modify the terms applicable to Covered Code created under this License. <span class="odfLiEnd"/> </p><p class="P46" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">6.3. Derivative Works</span>. <br/><span style="margin-left:0.4991cm"/>If You create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), You must (a) rename Your license so that the phrases ''Mozilla'', ''MOZILLAPL'', ''MOZPL'', ''Netscape'', "MPL", ''NPL'' or any confusingly similar phrase do not appear in your license (except to note that your license differs from this License) and (b) otherwise make it clear that Your version of the license contains terms which differ from the Mozilla Public License and Netscape Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in <span class="T4">Exhibit A</span> shall not of themselves be deemed to be modifications of this License.)<span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">7. DISCLAIMER OF WARRANTY.</span> </p><ul><li><p class="P47" style="margin-left:0.748cm;">COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. <span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">8. TERMINATION.</span> </p><ul><li><p class="P48" style="margin-left:0.748cm;"><span class="T4">8.1.  </span>This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. <span class="odfLiEnd"/> </p><p class="P48" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">8.2.  </span>If You initiate litigation by asserting a patent infringement claim (excluding declatory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You file such action is referred to as "Participant")  alleging that: <span class="odfLiEnd"/> </p><p class="P48" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">(a)  </span>such Participant's Contributor Version directly or indirectly infringes any patent, then any and all rights granted by such Participant to You under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively, unless if within 60 days after receipt of notice You either: (i)  agree in writing to pay Participant a mutually agreeable reasonable royalty for Your past and future use of Modifications made by such Participant, or (ii) withdraw Your litigation claim with respect to the Contributor Version against such Participant.  If within 60 days of notice, a reasonable royalty and payment arrangement are not mutually agreed upon in writing by the parties or the litigation claim is not withdrawn, the rights granted by Participant to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration of the 60 day notice period specified above. <span class="odfLiEnd"/> </p><p class="P48" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">(b)</span>  any software, hardware, or device, other than such Participant's Contributor Version, directly or indirectly infringes any patent, then any rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are revoked effective as of the date You first made, used, sold, distributed, or had made, Modifications made by that Participant. <span class="odfLiEnd"/> </p><p class="P48" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">8.3.  </span>If You assert a patent infringement claim against Participant alleging that such Participant's Contributor Version directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license. <span class="odfLiEnd"/> </p><p class="P48" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">8.4.</span>  In the event of termination under Sections 8.1 or 8.2 above,  all end user license agreements (excluding distributors and resellers) which have been validly granted by You or any distributor hereunder prior to termination shall survive termination.<span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">9. LIMITATION OF LIABILITY.</span> </p><ul><li><p class="P49" style="margin-left:0.748cm;">UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. <span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">10. U.S. GOVERNMENT END USERS.</span> </p><ul><li><p class="P50" style="margin-left:0.748cm;">The Covered Code is a ''commercial item,'' as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of ''commercial computer software'' and ''commercial computer software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein. <span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">11. MISCELLANEOUS.</span> </p><ul><li><p class="P51" style="margin-left:0.748cm;">This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in the United States of America, any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. <span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">12. RESPONSIBILITY FOR CLAIMS.</span> </p><ul><li><p class="P52" style="margin-left:0.748cm;">As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability. <span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">13. MULTIPLE-LICENSED CODE.</span> </p><ul><li><p class="P53" style="margin-left:0.748cm;">Initial Developer may designate portions of the Covered Code as “Multiple-Licensed�.  “Multiple-Licensed� means that the Initial Developer permits you to utilize portions of the Covered Code under Your choice of the MPL or the alternative licenses, if any, specified by the Initial Developer in the file described in Exhibit A. <span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><br/><span class="T4">EXHIBIT A -Mozilla Public License.</span> </p><ul><li><p class="P54" style="margin-left:0.748cm;">``The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at <br/><span style="margin-left:0.4991cm"/>http://www.mozilla.org/MPL/ <span class="odfLiEnd"/> </p><p class="P54" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span>Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF <br/><span style="margin-left:0.4991cm"/>ANY KIND, either express or implied. See the License for the specific language governing rights and <br/><span style="margin-left:0.4991cm"/>limitations under the License. <span class="odfLiEnd"/> </p><p class="P54" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span>The Original Code is ______________________________________. <span class="odfLiEnd"/> </p><p class="P54" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span>The Initial Developer of the Original Code is ________________________. Portions created by <br/><span style="margin-left:0.4991cm"/> ______________________ are Copyright (C) ______ _______________________. All Rights <br/><span style="margin-left:0.4991cm"/>Reserved. <span class="odfLiEnd"/> </p><p class="P54" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span>Contributor(s): ______________________________________. <span class="odfLiEnd"/> </p><p class="P54" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span>Alternatively, the contents of this file may be used under the terms of the _____ license (the  “[___] License�), in which case the provisions of [______] License are applicable  instead of those above.  If you wish to allow use of your version of this file only under the terms of the [____] License and not to allow others to use your version of this file under the MPL, indicate your decision by deleting  the provisions above and replace  them with the notice and other provisions required by the [___] License.  If you do not delete the provisions above, a recipient may use your version of this file under either the MPL or the [___] License." <span class="odfLiEnd"/> </p><p class="P54" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span>[NOTE: The text of this Exhibit A may differ slightly from the text of the notices in the Source Code files of the Original Code. You should use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.] <span class="odfLiEnd"/> </p></li></ul><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: sRGB Profiles; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__International_Color_Consortium"><span/></a>International Color Consortium</h2><h3 class="Heading_20_3"><a id="a__sRGB_Profiles"><span/></a>sRGB Profiles</h3><p class="Text_20_body"><br/>To anyone who acknowledges that the files "sRGB_IEC61966-2-1_noBPC.icc" and "sRGB_IEC61966-2-1_withBPC.icc" are provided "AS IS" WITH NO EXPRESS OR IMPLIED WARRANTY, permission to use, copy and distribute these file for any purpose is hereby granted without fee, provided that the files are not changed including the HP copyright notice tag, and that the name of Hewlett-Packard Company shall not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. Hewlett-Packard Company makes no representations about the suitability of this software for any purpose. </p><p class="P11"> </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Sablotron; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Ginger_Alliance"><span/></a>Ginger Alliance</h2><h3 class="Heading_20_3"><a id="a__Sablotron"><span/></a>Sablotron</h3><p class="P11"><a href="./#lgpl">jump to LGPL</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: SANE; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__David_Mosberger-Tang__Andreas_Beck"><span/></a>David Mosberger-Tang, Andreas Beck</h2><h3 class="Heading_20_3"><a id="a__SANE"><span/></a>SANE</h3><p class="Preformatted_20_Text">/* sane - Scanner Access Now Easy.</p><p class="Preformatted_20_Text">   Copyright (C) 1997-1999 David Mosberger-Tang and Andreas Beck</p><p class="Preformatted_20_Text">   This file is part of the SANE package.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   This file is in the public domain.  You may use and modify it as</p><p class="Preformatted_20_Text">   you see fit, as long as this copyright message is included and</p><p class="Preformatted_20_Text">   that there is an indication as to what modifications have been</p><p class="Preformatted_20_Text">   made (if any).</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   SANE is distributed in the hope that it will be useful, but WITHOUT</p><p class="Preformatted_20_Text">   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</p><p class="Preformatted_20_Text">   FITNESS FOR A PARTICULAR PURPOSE.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   This file declares SANE application interface.  See the SANE</p><p class="P2">   standard for a detailed explanation of the interface.  */</p><p class="P11"> </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Saxon (B); Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Michael_Kay"><span/></a>Michael Kay</h2><h3 class="Heading_20_3"><a id="a__Saxon__B_"><span/></a>Saxon (B)</h3><p class="P11"><a href="./#mpllic">jump to MPL 1.1</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Stax API; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__stax_codehouse_org"><span/></a>stax.codehouse.org</h2><h3 class="Heading_20_3"><a id="a__Stax"><span/></a>Stax</h3><p class="Preformatted_20_Text">                                 Apache License</p><p class="Preformatted_20_Text">                           Version 2.0, January 2004</p><p class="Preformatted_20_Text">                        http://www.apache.org/licenses/</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</p><p class="Preformatted_20_Text"/><p class="Preformatted_20_Text">   1. Definitions.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      "License" shall mean the terms and conditions for use, reproduction,</p><p class="Preformatted_20_Text">      and distribution as defined by Sections 1 through 9 of this document.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      "Licensor" shall mean the copyright owner or entity authorized by</p><p class="Preformatted_20_Text">      the copyright owner that is granting the License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      "Legal Entity" shall mean the union of the acting entity and all</p><p class="Preformatted_20_Text">      other entities that control, are controlled by, or are under common</p><p class="Preformatted_20_Text">      control with that entity. For the purposes of this definition,</p><p class="Preformatted_20_Text">      "control" means (i) the power, direct or indirect, to cause the</p><p class="Preformatted_20_Text">      direction or management of such entity, whether by contract or</p><p class="Preformatted_20_Text">      otherwise, or (ii) ownership of fifty percent (50%) or more of the</p><p class="Preformatted_20_Text">      outstanding shares, or (iii) beneficial ownership of such entity.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      "You" (or "Your") shall mean an individual or Legal Entity</p><p class="Preformatted_20_Text">      exercising permissions granted by this License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      "Source" form shall mean the preferred form for making modifications,</p><p class="Preformatted_20_Text">      including but not limited to software source code, documentation</p><p class="Preformatted_20_Text">      source, and configuration files.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      "Object" form shall mean any form resulting from mechanical</p><p class="Preformatted_20_Text">      transformation or translation of a Source form, including but</p><p class="Preformatted_20_Text">      not limited to compiled object code, generated documentation,</p><p class="Preformatted_20_Text">      and conversions to other media types.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      "Work" shall mean the work of authorship, whether in Source or</p><p class="Preformatted_20_Text">      Object form, made available under the License, as indicated by a</p><p class="Preformatted_20_Text">      copyright notice that is included in or attached to the work</p><p class="Preformatted_20_Text">      (an example is provided in the Appendix below).</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      "Derivative Works" shall mean any work, whether in Source or Object</p><p class="Preformatted_20_Text">      form, that is based on (or derived from) the Work and for which the</p><p class="Preformatted_20_Text">      editorial revisions, annotations, elaborations, or other modifications</p><p class="Preformatted_20_Text">      represent, as a whole, an original work of authorship. For the purposes</p><p class="Preformatted_20_Text">      of this License, Derivative Works shall not include works that remain</p><p class="Preformatted_20_Text">      separable from, or merely link (or bind by name) to the interfaces of,</p><p class="Preformatted_20_Text">      the Work and Derivative Works thereof.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      "Contribution" shall mean any work of authorship, including</p><p class="Preformatted_20_Text">      the original version of the Work and any modifications or additions</p><p class="Preformatted_20_Text">      to that Work or Derivative Works thereof, that is intentionally</p><p class="Preformatted_20_Text">      submitted to Licensor for inclusion in the Work by the copyright owner</p><p class="Preformatted_20_Text">      or by an individual or Legal Entity authorized to submit on behalf of</p><p class="Preformatted_20_Text">      the copyright owner. For the purposes of this definition, "submitted"</p><p class="Preformatted_20_Text">      means any form of electronic, verbal, or written communication sent</p><p class="Preformatted_20_Text">      to the Licensor or its representatives, including but not limited to</p><p class="Preformatted_20_Text">      communication on electronic mailing lists, source code control systems,</p><p class="Preformatted_20_Text">      and issue tracking systems that are managed by, or on behalf of, the</p><p class="Preformatted_20_Text">      Licensor for the purpose of discussing and improving the Work, but</p><p class="Preformatted_20_Text">      excluding communication that is conspicuously marked or otherwise</p><p class="Preformatted_20_Text">      designated in writing by the copyright owner as "Not a Contribution."</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      "Contributor" shall mean Licensor and any individual or Legal Entity</p><p class="Preformatted_20_Text">      on behalf of whom a Contribution has been received by Licensor and</p><p class="Preformatted_20_Text">      subsequently incorporated within the Work.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   2. Grant of Copyright License. Subject to the terms and conditions of</p><p class="Preformatted_20_Text">      this License, each Contributor hereby grants to You a perpetual,</p><p class="Preformatted_20_Text">      worldwide, non-exclusive, no-charge, royalty-free, irrevocable</p><p class="Preformatted_20_Text">      copyright license to reproduce, prepare Derivative Works of,</p><p class="Preformatted_20_Text">      publicly display, publicly perform, sublicense, and distribute the</p><p class="Preformatted_20_Text">      Work and such Derivative Works in Source or Object form.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   3. Grant of Patent License. Subject to the terms and conditions of</p><p class="Preformatted_20_Text">      this License, each Contributor hereby grants to You a perpetual,</p><p class="Preformatted_20_Text">      worldwide, non-exclusive, no-charge, royalty-free, irrevocable</p><p class="Preformatted_20_Text">      (except as stated in this section) patent license to make, have made,</p><p class="Preformatted_20_Text">      use, offer to sell, sell, import, and otherwise transfer the Work,</p><p class="Preformatted_20_Text">      where such license applies only to those patent claims licensable</p><p class="Preformatted_20_Text">      by such Contributor that are necessarily infringed by their</p><p class="Preformatted_20_Text">      Contribution(s) alone or by combination of their Contribution(s)</p><p class="Preformatted_20_Text">      with the Work to which such Contribution(s) was submitted. If You</p><p class="Preformatted_20_Text">      institute patent litigation against any entity (including a</p><p class="Preformatted_20_Text">      cross-claim or counterclaim in a lawsuit) alleging that the Work</p><p class="Preformatted_20_Text">      or a Contribution incorporated within the Work constitutes direct</p><p class="Preformatted_20_Text">      or contributory patent infringement, then any patent licenses</p><p class="Preformatted_20_Text">      granted to You under this License for that Work shall terminate</p><p class="Preformatted_20_Text">      as of the date such litigation is filed.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   4. Redistribution. You may reproduce and distribute copies of the</p><p class="Preformatted_20_Text">      Work or Derivative Works thereof in any medium, with or without</p><p class="Preformatted_20_Text">      modifications, and in Source or Object form, provided that You</p><p class="Preformatted_20_Text">      meet the following conditions:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      (a) You must give any other recipients of the Work or</p><p class="Preformatted_20_Text">          Derivative Works a copy of this License; and</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      (b) You must cause any modified files to carry prominent notices</p><p class="Preformatted_20_Text">          stating that You changed the files; and</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      (c) You must retain, in the Source form of any Derivative Works</p><p class="Preformatted_20_Text">          that You distribute, all copyright, patent, trademark, and</p><p class="Preformatted_20_Text">          attribution notices from the Source form of the Work,</p><p class="Preformatted_20_Text">          excluding those notices that do not pertain to any part of</p><p class="Preformatted_20_Text">          the Derivative Works; and</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      (d) If the Work includes a "NOTICE" text file as part of its</p><p class="Preformatted_20_Text">          distribution, then any Derivative Works that You distribute must</p><p class="Preformatted_20_Text">          include a readable copy of the attribution notices contained</p><p class="Preformatted_20_Text">          within such NOTICE file, excluding those notices that do not</p><p class="Preformatted_20_Text">          pertain to any part of the Derivative Works, in at least one</p><p class="Preformatted_20_Text">          of the following places: within a NOTICE text file distributed</p><p class="Preformatted_20_Text">          as part of the Derivative Works; within the Source form or</p><p class="Preformatted_20_Text">          documentation, if provided along with the Derivative Works; or,</p><p class="Preformatted_20_Text">          within a display generated by the Derivative Works, if and</p><p class="Preformatted_20_Text">          wherever such third-party notices normally appear. The contents</p><p class="Preformatted_20_Text">          of the NOTICE file are for informational purposes only and</p><p class="Preformatted_20_Text">          do not modify the License. You may add Your own attribution</p><p class="Preformatted_20_Text">          notices within Derivative Works that You distribute, alongside</p><p class="Preformatted_20_Text">          or as an addendum to the NOTICE text from the Work, provided</p><p class="Preformatted_20_Text">          that such additional attribution notices cannot be construed</p><p class="Preformatted_20_Text">          as modifying the License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      You may add Your own copyright statement to Your modifications and</p><p class="Preformatted_20_Text">      may provide additional or different license terms and conditions</p><p class="Preformatted_20_Text">      for use, reproduction, or distribution of Your modifications, or</p><p class="Preformatted_20_Text">      for any such Derivative Works as a whole, provided Your use,</p><p class="Preformatted_20_Text">      reproduction, and distribution of the Work otherwise complies with</p><p class="Preformatted_20_Text">      the conditions stated in this License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   5. Submission of Contributions. Unless You explicitly state otherwise,</p><p class="Preformatted_20_Text">      any Contribution intentionally submitted for inclusion in the Work</p><p class="Preformatted_20_Text">      by You to the Licensor shall be under the terms and conditions of</p><p class="Preformatted_20_Text">      this License, without any additional terms or conditions.</p><p class="Preformatted_20_Text">      Notwithstanding the above, nothing herein shall supersede or modify</p><p class="Preformatted_20_Text">      the terms of any separate license agreement you may have executed</p><p class="Preformatted_20_Text">      with Licensor regarding such Contributions.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   6. Trademarks. This License does not grant permission to use the trade</p><p class="Preformatted_20_Text">      names, trademarks, service marks, or product names of the Licensor,</p><p class="Preformatted_20_Text">      except as required for reasonable and customary use in describing the</p><p class="Preformatted_20_Text">      origin of the Work and reproducing the content of the NOTICE file.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   7. Disclaimer of Warranty. Unless required by applicable law or</p><p class="Preformatted_20_Text">      agreed to in writing, Licensor provides the Work (and each</p><p class="Preformatted_20_Text">      Contributor provides its Contributions) on an "AS IS" BASIS,</p><p class="Preformatted_20_Text">      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or</p><p class="Preformatted_20_Text">      implied, including, without limitation, any warranties or conditions</p><p class="Preformatted_20_Text">      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A</p><p class="Preformatted_20_Text">      PARTICULAR PURPOSE. You are solely responsible for determining the</p><p class="Preformatted_20_Text">      appropriateness of using or redistributing the Work and assume any</p><p class="Preformatted_20_Text">      risks associated with Your exercise of permissions under this License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   8. Limitation of Liability. In no event and under no legal theory,</p><p class="Preformatted_20_Text">      whether in tort (including negligence), contract, or otherwise,</p><p class="Preformatted_20_Text">      unless required by applicable law (such as deliberate and grossly</p><p class="Preformatted_20_Text">      negligent acts) or agreed to in writing, shall any Contributor be</p><p class="Preformatted_20_Text">      liable to You for damages, including any direct, indirect, special,</p><p class="Preformatted_20_Text">      incidental, or consequential damages of any character arising as a</p><p class="Preformatted_20_Text">      result of this License or out of the use or inability to use the</p><p class="Preformatted_20_Text">      Work (including but not limited to damages for loss of goodwill,</p><p class="Preformatted_20_Text">      work stoppage, computer failure or malfunction, or any and all</p><p class="Preformatted_20_Text">      other commercial damages or losses), even if such Contributor</p><p class="Preformatted_20_Text">      has been advised of the possibility of such damages.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   9. Accepting Warranty or Additional Liability. While redistributing</p><p class="Preformatted_20_Text">      the Work or Derivative Works thereof, You may choose to offer,</p><p class="Preformatted_20_Text">      and charge a fee for, acceptance of support, warranty, indemnity,</p><p class="Preformatted_20_Text">      or other liability obligations and/or rights consistent with this</p><p class="Preformatted_20_Text">      License. However, in accepting such obligations, You may act only</p><p class="Preformatted_20_Text">      on Your own behalf and on Your sole responsibility, not on behalf</p><p class="Preformatted_20_Text">      of any other Contributor, and only if You agree to indemnify,</p><p class="Preformatted_20_Text">      defend, and hold each Contributor harmless for any liability</p><p class="Preformatted_20_Text">      incurred by, or claims asserted against, such Contributor by reason</p><p class="Preformatted_20_Text">      of your accepting any such warranty or additional liability.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   END OF TERMS AND CONDITIONS</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   APPENDIX: How to apply the Apache License to your work.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      To apply the Apache License to your work, attach the following</p><p class="Preformatted_20_Text">      boilerplate notice, with the fields enclosed by brackets "[]"</p><p class="Preformatted_20_Text">      replaced with your own identifying information. (Don't include</p><p class="Preformatted_20_Text">      the brackets!)  The text should be enclosed in the appropriate</p><p class="Preformatted_20_Text">      comment syntax for the file format. We also recommend that a</p><p class="Preformatted_20_Text">      file or class name and description of purpose be included on the</p><p class="Preformatted_20_Text">      same "printed page" as the copyright notice for easier</p><p class="Preformatted_20_Text">      identification within third-party archives.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   Copyright [yyyy] [name of copyright owner]</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   Licensed under the Apache License, Version 2.0 (the "License");</p><p class="Preformatted_20_Text">   you may not use this file except in compliance with the License.</p><p class="Preformatted_20_Text">   You may obtain a copy of the License at</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">       http://www.apache.org/licenses/LICENSE-2.0</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   Unless required by applicable law or agreed to in writing, software</p><p class="Preformatted_20_Text">   distributed under the License is distributed on an "AS IS" BASIS,</p><p class="Preformatted_20_Text">   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.</p><p class="Preformatted_20_Text">   See the License for the specific language governing permissions and</p><p class="Preformatted_20_Text">   limitations under the License.</p><p class="P2"> </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product:STLport; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Boris_Fomitchev"><span/></a>Boris Fomitchev</h2><h3 class="Heading_20_3"><a id="a__STLport"><span/></a>STLport</h3><h4 class="Heading_20_4"><a id="a__License_Agreement"><span/></a>License Agreement</h4><p class="Text_20_body"><span class="T4">Boris Fomitchev</span> grants <span class="T4">Licensee</span> a non-exclusive, non-transferable, royalty-free license to use <span class="T4">STLport</span> and its documentation without fee.<br/><br/>By downloading, using, or copying <span class="T4">STLport</span> or any portion thereof,  <span class="T4">Licensee</span> agrees to abide by the intellectual property laws and all other applicable laws of the United States of America, and to all of the terms and conditions of this Agreement.<br/><br/><span class="T4">Licensee</span> shall maintain the following copyright and permission  notices on <span class="T4">STLport </span>sources and its documentation unchanged :</p><p class="Text_20_body"><span class="T4">Copyright 1999,2000 Boris Fomitchev</span><br/><br/>This material is provided "as is", with absolutely no warranty expressed or implied. Any use is at your own risk.<br/>Permission to use or copy this software for any purpose is hereby granted without fee, provided the above notices are retained on all copies. Permission to modify the code and to distribute modified code is granted, provided the above notices are retained, and a notice that the code was modified is included with the above copyright notice. </p><p class="Text_20_body">The <span class="T4">Licensee</span> may distribute binaries compiled with <span class="T4">STLport</span> (whether original or modified) without any royalties or restrictions.</p><p class="Text_20_body">The <span class="T4">Licensee</span> may distribute original or modified <span class="T4">STLport</span> sources, provided that:</p><ul><li><p class="P21" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm">•.</span>The conditions indicated in the above permission notice are met; <span class="odfLiEnd"/> </p></li><li><p class="P55" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm">•.</span>The following copyright notices are retained when present, and conditions provided in accompanying permission notices are met : <span class="odfLiEnd"/> </p></li></ul><p class="P9">Copyright 1994 Hewlett-Packard Company</p><p class="P9">Copyright 1996,97 Silicon Graphics Computer Systems, Inc.</p><p class="P9">Copyright 1997 Moscow Center for SPARC Technology.</p><p class="P6">Permission to use, copy, modify, distribute and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation. Hewlett-Packard Company makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty.</p><p class="P6">Permission to use, copy, modify, distribute and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation. Silicon Graphics makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty.</p><p class="Quotations"><span class="T7">Permission to use, copy, modify, distribute and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation. Moscow Center for SPARC Technology  makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty.</span> </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Italian Thesaurus; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Daniela_Volta__Davide_Prina"><span/></a>Daniela Volta, Davide Prina</h2><h3 class="Heading_20_3"><a id="a__Italian_Thesaurus"><span/></a>Italian Thesaurus</h3><p class="P11"><br/><a href="./#gpl">Jump to GPL</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Nepali thesaurus dictionary; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__NepaLinux_org"><span/></a>NepaLinux.org</h2><h3 class="Heading_20_3"><a id="a__Nepali_thesaurus_dictionary__LGPL_v2_1_"><span/></a>Nepali thesaurus dictionary (LGPL v2.1)</h3><p class="P11"><br/><a href="./#lgpl">jump to GNU Lesser General Public License</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Italian Thesaurus; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Daniela_Volta__Davide_Prina"><span/></a>Daniela Volta, Davide Prina</h2><h3 class="Heading_20_3"><a id="a__Sownik_synonimw_v__1___Polish_Thesaurus_"><span/></a>Sownik synonimw v. 1, (Polish Thesaurus)</h3><p class="P11"><br/>Open Software License v. 2.1 <br/>This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following notice immediately following the copyright notice for the Original Work: <br/>Licensed under the Open Software License version 2.1 <br/>1) Grant of Copyright License. Licensor hereby grants You a world-wide, royalty-free, non-exclusive, perpetual, sublicenseable license to do the following: <br/>* to reproduce the Original Work in copies; <br/>* to prepare derivative works ("Derivative Works") based upon the Original Work; <br/>* to distribute copies of the Original Work and Derivative Works to the <br/>public, with the proviso that copies of Original Work or Derivative Works that You distribute shall be licensed under the Open Software License; * to perform the Original Work publicly; and <br/>* to display the Original Work publicly. <br/>2) Grant of Patent License. Licensor hereby grants You a world-wide, royalty-free, non-exclusive, perpetual, sublicenseable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, to make, use, sell and offer for sale the Original Work and Derivative Works. <br/>3) Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor hereby agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work, and by publishing the address of that information repository in a notice immediately following the copyright notice that applies to the Original Work. <br/>4) Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior written permission of the Licensor. Nothing in this License shall be deemed to grant any rights to trademarks, copyrights, patents, trade secrets or any other intellectual property of Licensor except as expressly stated herein. No patent license is granted to make, use, sell or offer to sell embodiments of any patent claims other than the licensed claims defined in Section 2. No right is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under different terms from this License any Original Work that Licensor otherwise would have a right to license. <br/>5) External Deployment. The term "External Deployment" means the use or distribution of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether the Original Work or Derivative Works are distributed to those persons or made available as an application intended for use over a computer network. As an express condition for the grants of license hereunder, You agree that any External Deployment by You of a Derivative Work shall be deemed a distribution and shall be licensed to all under the terms of this License, as prescribed in section 1(c) herein. <br/>6) Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. <br/>7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately proceeding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to Original Work is granted hereunder except under this disclaimer. <br/>8) Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to any person for any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to liability for death or personal injury resulting from Licensor's negligence to the extent applicable law prohibits such limitation. Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so this exclusion and limitation may not apply to You. <br/>9) Acceptance and Termination. If You distribute copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. Nothing else but this License (or another written agreement between Licensor and You) grants You permission to create Derivative Works based upon the Original Work or to exercise any of the rights granted in Section 1 herein, and any attempt to do so except under the terms of this License (or another written agreement between Licensor and You) is expressly prohibited by U.S. copyright law, the equivalent laws of other countries, and by international treaty. Therefore, by exercising any of the rights granted to You in Section 1 herein, You indicate Your acceptance of this License and all of its terms and conditions. This License shall terminate immediately and you may no longer exercise any of the rights granted to You by this License upon Your failure to honor the proviso in Section 1(c) herein. <br/>10) Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. <br/>11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of the U.S. Copyright Act, 17 U.S.C. § 101 et seq., the equivalent laws of other countries, and international treaty. This section shall survive the termination of this License. <br/>12) Attorneys Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. <br/>13) Miscellaneous. This License represents the complete agreement concerning the subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. <br/>14) Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. <br/>15) Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. <br/>This license is Copyright (C) 2003-2004 Lawrence E. Rosen. All rights reserved. Permission is hereby granted to copy and distribute this license without modification. This license may not be modified without the express written permission of its copyright owner. </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Russian thesaurus; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Mikhail_Korolyov"><span/></a>Mikhail Korolyov</h2><h3 class="Heading_20_3"><a id="a__Russian_thesaurus"><span/></a>Russian thesaurus</h3><p class="P11"><br/><a href="./#lgpl">jump to GNU Lesser General Public License</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: TWAIN; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__TWAIN_Working_Group"><span/></a>TWAIN Working Group</h2><h3 class="Heading_20_3"><a id="a__TWAIN"><span/></a>TWAIN</h3><p class="P11"><br/>The TWAIN License <br/>The TWAIN Working Group grants customer ("Customer") the worldwide, royalty-free, non-exclusive license to reproduce and distribute the software and documentation of the TWAIN toolkit ("TWAIN Toolkit"). The TWAIN Toolkit was designed to be used by third parties to assist them in becoming compliant with the TWAIN standard, but it has not been developed to the standards of a commercial product. Consequently, the TWAIN toolkit is provided AS IS without any warranty. THE TWAIN Working Group disclaims all warranties in the TWAIN toolkit whether implied, express or statutory, including, without limitation, the implied warranties of merchantability, noninfringement of third party rights and fitness for a particular purpose. The TWAIN Working Group disclaims all liability for damages, whether direct, indirect, special, incidental, or consequential, arising from the reproduction, distribution, modification, or other use of the TWAIN Toolkit. <br/>As a condition of this license, Customer agrees to include in software programs based in whole or in part on the TWAIN Toolkit the following providions in (i) the header or similar file in such software and (ii) prominently in its documentation and to require its sublicensees to include these provisions in similar locations: The TWAIN Toolkit is distributed as is. The developer and distributors of the TWAIN Toolkit expressly disclaim all implied, express or statutory warranties including, without limitation, the implied warranties of merchantability, noninfringement of third party rights and fitness for a particular purpose. Neither the developers nor the distributors will be liable for damages, whether direct, indirect, special, incidental, or consequential, as a result of the reproduction, modification, distribution or other use of the TWAIN Toolkit. </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Unicode's CLDR data repository; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Unicode__Inc_"><span/></a>Unicode, Inc.</h2><h3 class="Heading_20_3"><a id="a__Unicode_CLDR_data_repository"><span/></a>Unicode CLDR data repository</h3><p class="P11"><br/>Copyright 1991-2005 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html. <br/>Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified. <br/>THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE. <br/>Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder. </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: unixODBC; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__unixODBC_org"><span/></a>unixODBC.org</h2><h3 class="Heading_20_3"><a id="a__unixODBC"><span/></a>unixODBC</h3><p class="P11"><a href="./#lgpl">jump to LGPL</a></p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: vigra; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Ullrich_Koethe"><span/></a>Ullrich Koethe</h2><h3 class="Heading_20_3"><a id="a__vigra"><span/></a>vigra</h3><p class="P11"><br/>The VIGRA Artistic License <br/>========================== <br/>(modeled after the Perl Artistic License) <br/><br/>Preamble <br/>-------- <br/><br/>The intent of this document is to state the conditions under which VIGRA may be copied, such that the author maintains some semblance of artistic control over the development of the library, while giving the users of the library the right to use and distribute VIGRA in a more-or-less customary fashion, plus the right to make reasonable modifications. <br/>Definitions <br/>----------- <br/>"Copyright Holder" of the VIGRA library is Ullrich Koethe, Cognitive Systems Group, University of Hamburg, Germany. <br/>"Library" refers to the collection of files distributed by the Copyright Holder under the name "VIGRA" (including this LICENSE file and all accompanying documentation), and derivatives of that collection of files created through textual modification. <br/>"Standard Version" refers to the Library if it has not been modified, or has been modified in accordance with the wishes of the Copyright Holder as specified below. <br/>"You" is you, if you're thinking about using, copying, modifying or distributing this Library. <br/>"Freely Available" means that no fee is charged for the item. It also means that recipients of the item may redistribute it under the same conditions they received it. <br/>"Reasonable copying fee" is whatever you can justify on the basis of media cost, duplication charges, time of people involved, and so on. (You will not be required to justify it to the Copyright Holder, but only to the computing community at large as a market that must bear the fee.) <br/>License terms <br/>------------- <br/>1. You may make and give away verbatim copies of the Standard Version of this Library without restriction, provided that you duplicate all of the original copyright notices, this license, and associated disclaimers. <br/>2. The Standard Version of the Library may be distributed as part of a collection of software, provided no more than a reasonable copying fee is charged for the software collection. <br/>3. You may apply bug fixes and portability fixes derived from the Public Domain or from the Copyright Holder. A Library modified in such a way shall still be considered the Standard Version. <br/>4. You may otherwise modify your copy of this Library in any way, provided that you insert a prominent notice in each changed file stating how and when you changed that file, and provided that you do at least ONE of the following: <br/>a. place your modifications in the Public Domain or otherwise make them Freely Available, for example by allowing the Copyright Holder to include your modifications in the Standard Version of the Library. <br/>b. use the modified Library only within your corporation or organization. <br/>c. make other distribution arrangements with the Copyright Holder. <br/>5. You may distribute programs which use this Library in object code or executable form without restriction. <br/>6. Any object code generated as a result of using this Library does not fall under the copyright of this Library, but belongs to whomever generated it, and may be sold commercially. <br/>7. The name of the Copyright Holder or the Library may not be used to endorse or promote products derived from this software without specific prior written permission. <br/>8. THIS LIBRARY IS PROVIDED AS IS AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. <br/>IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR ON ANY THEORY OF LIABILITY ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS LIBRARY. </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Xalan; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__The_Apache_Software_Foundation"><span/></a>The Apache Software Foundation</h2><h3 class="Heading_20_3"><a id="a__Xalan"><span/></a>Xalan</h3><p class="Preformatted_20_Text">                                 Apache License</p><p class="Preformatted_20_Text">                           Version 2.0, January 2004</p><p class="Preformatted_20_Text">                        http://www.apache.org/licenses/</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   1. Definitions.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      "License" shall mean the terms and conditions for use, reproduction,</p><p class="Preformatted_20_Text">      and distribution as defined by Sections 1 through 9 of this document.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      "Licensor" shall mean the copyright owner or entity authorized by</p><p class="Preformatted_20_Text">      the copyright owner that is granting the License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      "Legal Entity" shall mean the union of the acting entity and all</p><p class="Preformatted_20_Text">      other entities that control, are controlled by, or are under common</p><p class="Preformatted_20_Text">      control with that entity. For the purposes of this definition,</p><p class="Preformatted_20_Text">      "control" means (i) the power, direct or indirect, to cause the</p><p class="Preformatted_20_Text">      direction or management of such entity, whether by contract or</p><p class="Preformatted_20_Text">      otherwise, or (ii) ownership of fifty percent (50%) or more of the</p><p class="Preformatted_20_Text">      outstanding shares, or (iii) beneficial ownership of such entity.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      "You" (or "Your") shall mean an individual or Legal Entity</p><p class="Preformatted_20_Text">      exercising permissions granted by this License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      "Source" form shall mean the preferred form for making modifications,</p><p class="Preformatted_20_Text">      including but not limited to software source code, documentation</p><p class="Preformatted_20_Text">      source, and configuration files.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      "Object" form shall mean any form resulting from mechanical</p><p class="Preformatted_20_Text">      transformation or translation of a Source form, including but</p><p class="Preformatted_20_Text">      not limited to compiled object code, generated documentation,</p><p class="Preformatted_20_Text">      and conversions to other media types.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      "Work" shall mean the work of authorship, whether in Source or</p><p class="Preformatted_20_Text">      Object form, made available under the License, as indicated by a</p><p class="Preformatted_20_Text">      copyright notice that is included in or attached to the work</p><p class="Preformatted_20_Text">      (an example is provided in the Appendix below).</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      "Derivative Works" shall mean any work, whether in Source or Object</p><p class="Preformatted_20_Text">      form, that is based on (or derived from) the Work and for which the</p><p class="Preformatted_20_Text">      editorial revisions, annotations, elaborations, or other modifications</p><p class="Preformatted_20_Text">      represent, as a whole, an original work of authorship. For the purposes</p><p class="Preformatted_20_Text">      of this License, Derivative Works shall not include works that remain</p><p class="Preformatted_20_Text">      separable from, or merely link (or bind by name) to the interfaces of,</p><p class="Preformatted_20_Text">      the Work and Derivative Works thereof.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      "Contribution" shall mean any work of authorship, including</p><p class="Preformatted_20_Text">      the original version of the Work and any modifications or additions</p><p class="Preformatted_20_Text">      to that Work or Derivative Works thereof, that is intentionally</p><p class="Preformatted_20_Text">      submitted to Licensor for inclusion in the Work by the copyright owner</p><p class="Preformatted_20_Text">      or by an individual or Legal Entity authorized to submit on behalf of</p><p class="Preformatted_20_Text">      the copyright owner. For the purposes of this definition, "submitted"</p><p class="Preformatted_20_Text">      means any form of electronic, verbal, or written communication sent</p><p class="Preformatted_20_Text">      to the Licensor or its representatives, including but not limited to</p><p class="Preformatted_20_Text">      communication on electronic mailing lists, source code control systems,</p><p class="Preformatted_20_Text">      and issue tracking systems that are managed by, or on behalf of, the</p><p class="Preformatted_20_Text">      Licensor for the purpose of discussing and improving the Work, but</p><p class="Preformatted_20_Text">      excluding communication that is conspicuously marked or otherwise</p><p class="Preformatted_20_Text">      designated in writing by the copyright owner as "Not a Contribution."</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      "Contributor" shall mean Licensor and any individual or Legal Entity</p><p class="Preformatted_20_Text">      on behalf of whom a Contribution has been received by Licensor and</p><p class="Preformatted_20_Text">      subsequently incorporated within the Work.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   2. Grant of Copyright License. Subject to the terms and conditions of</p><p class="Preformatted_20_Text">      this License, each Contributor hereby grants to You a perpetual,</p><p class="Preformatted_20_Text">      worldwide, non-exclusive, no-charge, royalty-free, irrevocable</p><p class="Preformatted_20_Text">      copyright license to reproduce, prepare Derivative Works of,</p><p class="Preformatted_20_Text">      publicly display, publicly perform, sublicense, and distribute the</p><p class="Preformatted_20_Text">      Work and such Derivative Works in Source or Object form.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   3. Grant of Patent License. Subject to the terms and conditions of</p><p class="Preformatted_20_Text">      this License, each Contributor hereby grants to You a perpetual,</p><p class="Preformatted_20_Text">      worldwide, non-exclusive, no-charge, royalty-free, irrevocable</p><p class="Preformatted_20_Text">      (except as stated in this section) patent license to make, have made,</p><p class="Preformatted_20_Text">      use, offer to sell, sell, import, and otherwise transfer the Work,</p><p class="Preformatted_20_Text">      where such license applies only to those patent claims licensable</p><p class="Preformatted_20_Text">      by such Contributor that are necessarily infringed by their</p><p class="Preformatted_20_Text">      Contribution(s) alone or by combination of their Contribution(s)</p><p class="Preformatted_20_Text">      with the Work to which such Contribution(s) was submitted. If You</p><p class="Preformatted_20_Text">      institute patent litigation against any entity (including a</p><p class="Preformatted_20_Text">      cross-claim or counterclaim in a lawsuit) alleging that the Work</p><p class="Preformatted_20_Text">      or a Contribution incorporated within the Work constitutes direct</p><p class="Preformatted_20_Text">      or contributory patent infringement, then any patent licenses</p><p class="Preformatted_20_Text">      granted to You under this License for that Work shall terminate</p><p class="Preformatted_20_Text">      as of the date such litigation is filed.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   4. Redistribution. You may reproduce and distribute copies of the</p><p class="Preformatted_20_Text">      Work or Derivative Works thereof in any medium, with or without</p><p class="Preformatted_20_Text">      modifications, and in Source or Object form, provided that You</p><p class="Preformatted_20_Text">      meet the following conditions:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      (a) You must give any other recipients of the Work or</p><p class="Preformatted_20_Text">          Derivative Works a copy of this License; and</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      (b) You must cause any modified files to carry prominent notices</p><p class="Preformatted_20_Text">          stating that You changed the files; and</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      (c) You must retain, in the Source form of any Derivative Works</p><p class="Preformatted_20_Text">          that You distribute, all copyright, patent, trademark, and</p><p class="Preformatted_20_Text">          attribution notices from the Source form of the Work,</p><p class="Preformatted_20_Text">          excluding those notices that do not pertain to any part of</p><p class="Preformatted_20_Text">          the Derivative Works; and</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      (d) If the Work includes a "NOTICE" text file as part of its</p><p class="Preformatted_20_Text">          distribution, then any Derivative Works that You distribute must</p><p class="Preformatted_20_Text">          include a readable copy of the attribution notices contained</p><p class="Preformatted_20_Text">          within such NOTICE file, excluding those notices that do not</p><p class="Preformatted_20_Text">          pertain to any part of the Derivative Works, in at least one</p><p class="Preformatted_20_Text">          of the following places: within a NOTICE text file distributed</p><p class="Preformatted_20_Text">          as part of the Derivative Works; within the Source form or</p><p class="Preformatted_20_Text">          documentation, if provided along with the Derivative Works; or,</p><p class="Preformatted_20_Text">          within a display generated by the Derivative Works, if and</p><p class="Preformatted_20_Text">          wherever such third-party notices normally appear. The contents</p><p class="Preformatted_20_Text">          of the NOTICE file are for informational purposes only and</p><p class="Preformatted_20_Text">          do not modify the License. You may add Your own attribution</p><p class="Preformatted_20_Text">          notices within Derivative Works that You distribute, alongside</p><p class="Preformatted_20_Text">          or as an addendum to the NOTICE text from the Work, provided</p><p class="Preformatted_20_Text">          that such additional attribution notices cannot be construed</p><p class="Preformatted_20_Text">          as modifying the License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      You may add Your own copyright statement to Your modifications and</p><p class="Preformatted_20_Text">      may provide additional or different license terms and conditions</p><p class="Preformatted_20_Text">      for use, reproduction, or distribution of Your modifications, or</p><p class="Preformatted_20_Text">      for any such Derivative Works as a whole, provided Your use,</p><p class="Preformatted_20_Text">      reproduction, and distribution of the Work otherwise complies with</p><p class="Preformatted_20_Text">      the conditions stated in this License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   5. Submission of Contributions. Unless You explicitly state otherwise,</p><p class="Preformatted_20_Text">      any Contribution intentionally submitted for inclusion in the Work</p><p class="Preformatted_20_Text">      by You to the Licensor shall be under the terms and conditions of</p><p class="Preformatted_20_Text">      this License, without any additional terms or conditions.</p><p class="Preformatted_20_Text">      Notwithstanding the above, nothing herein shall supersede or modify</p><p class="Preformatted_20_Text">      the terms of any separate license agreement you may have executed</p><p class="Preformatted_20_Text">      with Licensor regarding such Contributions.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   6. Trademarks. This License does not grant permission to use the trade</p><p class="Preformatted_20_Text">      names, trademarks, service marks, or product names of the Licensor,</p><p class="Preformatted_20_Text">      except as required for reasonable and customary use in describing the</p><p class="Preformatted_20_Text">      origin of the Work and reproducing the content of the NOTICE file.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   7. Disclaimer of Warranty. Unless required by applicable law or</p><p class="Preformatted_20_Text">      agreed to in writing, Licensor provides the Work (and each</p><p class="Preformatted_20_Text">      Contributor provides its Contributions) on an "AS IS" BASIS,</p><p class="Preformatted_20_Text">      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or</p><p class="Preformatted_20_Text">      implied, including, without limitation, any warranties or conditions</p><p class="Preformatted_20_Text">      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A</p><p class="Preformatted_20_Text">      PARTICULAR PURPOSE. You are solely responsible for determining the</p><p class="Preformatted_20_Text">      appropriateness of using or redistributing the Work and assume any</p><p class="Preformatted_20_Text">      risks associated with Your exercise of permissions under this License.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   8. Limitation of Liability. In no event and under no legal theory,</p><p class="Preformatted_20_Text">      whether in tort (including negligence), contract, or otherwise,</p><p class="Preformatted_20_Text">      unless required by applicable law (such as deliberate and grossly</p><p class="Preformatted_20_Text">      negligent acts) or agreed to in writing, shall any Contributor be</p><p class="Preformatted_20_Text">      liable to You for damages, including any direct, indirect, special,</p><p class="Preformatted_20_Text">      incidental, or consequential damages of any character arising as a</p><p class="Preformatted_20_Text">      result of this License or out of the use or inability to use the</p><p class="Preformatted_20_Text">      Work (including but not limited to damages for loss of goodwill,</p><p class="Preformatted_20_Text">      work stoppage, computer failure or malfunction, or any and all</p><p class="Preformatted_20_Text">      other commercial damages or losses), even if such Contributor</p><p class="Preformatted_20_Text">      has been advised of the possibility of such damages.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   9. Accepting Warranty or Additional Liability. While redistributing</p><p class="Preformatted_20_Text">      the Work or Derivative Works thereof, You may choose to offer,</p><p class="Preformatted_20_Text">      and charge a fee for, acceptance of support, warranty, indemnity,</p><p class="Preformatted_20_Text">      or other liability obligations and/or rights consistent with this</p><p class="Preformatted_20_Text">      License. However, in accepting such obligations, You may act only</p><p class="Preformatted_20_Text">      on Your own behalf and on Your sole responsibility, not on behalf</p><p class="Preformatted_20_Text">      of any other Contributor, and only if You agree to indemnify,</p><p class="Preformatted_20_Text">      defend, and hold each Contributor harmless for any liability</p><p class="Preformatted_20_Text">      incurred by, or claims asserted against, such Contributor by reason</p><p class="Preformatted_20_Text">      of your accepting any such warranty or additional liability.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   END OF TERMS AND CONDITIONS</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   APPENDIX: How to apply the Apache License to your work.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">      To apply the Apache License to your work, attach the following</p><p class="Preformatted_20_Text">      boilerplate notice, with the fields enclosed by brackets "[]"</p><p class="Preformatted_20_Text">      replaced with your own identifying information. (Don't include</p><p class="Preformatted_20_Text">      the brackets!)  The text should be enclosed in the appropriate</p><p class="Preformatted_20_Text">      comment syntax for the file format. We also recommend that a</p><p class="Preformatted_20_Text">      file or class name and description of purpose be included on the</p><p class="Preformatted_20_Text">      same "printed page" as the copyright notice for easier</p><p class="Preformatted_20_Text">      identification within third-party archives.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   Copyright [yyyy] [name of copyright owner]</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   Licensed under the Apache License, Version 2.0 (the "License");</p><p class="Preformatted_20_Text">   you may not use this file except in compliance with the License.</p><p class="Preformatted_20_Text">   You may obtain a copy of the License at</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">       http://www.apache.org/licenses/LICENSE-2.0</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   Unless required by applicable law or agreed to in writing, software</p><p class="Preformatted_20_Text">   distributed under the License is distributed on an "AS IS" BASIS,</p><p class="Preformatted_20_Text">   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.</p><p class="Preformatted_20_Text">   See the License for the specific language governing permissions and</p><p class="Preformatted_20_Text">   limitations under the License.</p><p class="P2"> </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: XML Security Library (xmlsec); Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Aleksey_Sanin"><span/></a>Aleksey Sanin</h2><h3 class="Heading_20_3"><a id="a__XML_Security_Library__xmlsec_"><span/></a>XML Security Library (xmlsec)</h3><p class="P11">xmlsec, xmlsec-openssl, xmlsec-gnutls libraries <br/>------------------------------------------------------------------------------ <br/>Copyright (C) 2002-2003 Aleksey Sanin. All Rights Reserved. <br/>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is fur- nished to do so, subject to the following conditions: <br/>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. <br/>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ALEKSEY SANIN BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. <br/>Except as contained in this notice, the name of Aleksey Sanin shall not be used in advertising or otherwise to promote the sale, use or other deal- ings in this Software without prior written authorization from him. <br/><br/>xmlsec-nss library <br/>------------------------------------------------------------------------------ <br/>Copyright (C) 2002-2003 Aleksey Sanin. All Rights Reserved. <br/>Copyright (c) 2003 America Online, Inc. All rights reserved. <br/>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is fur- nished to do so, subject to the following conditions: <br/>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. <br/>Portions of the Software were created using source code and/or APIs governed by the Mozilla Public License (MPL). The MPL is available at http://www.mozilla.org/MPL/MPL-1.1.html. The MPL permits such portions to be distributed with code not governed by MPL, as long as the requirements of MPL are fulfilled for such portions. <br/>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ALEKSEY SANIN BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. <br/>Except as contained in this notice, the name of Aleksey Sanin shall not be used in advertising or otherwise to promote the sale, use or other deal- ings in this Software without prior written authorization from him. </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: X11 XRender Extension; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Keith_Packard__SuSE__Inc_"><span/></a>Keith Packard, SuSE, Inc.</h2><h3 class="Heading_20_3"><a id="a__X11_XRender_Extension"><span/></a>X11 XRender Extension</h3><p class="P11">Copyright © 2000 SuSE, Inc. <br/>Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of SuSE not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. SuSE makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. <br/>SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: XT; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__James_Clark__Bill_Lindsey"><span/></a>James Clark, Bill Lindsey</h2><h3 class="Heading_20_3"><a id="a__XT"><span/></a>XT </h3><p class="P11">Copyright (c) 1998, 1999 James Clark <br/>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ``Software''), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: <br/>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. <br/>THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL JAMES CLARK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. <br/>Except as contained in this notice, the name of James Clark shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from James Clark. <br/><br/>Copyright (c) 2002 Bill Lindsey <br/>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ``Software''), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: <br/>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. Substantial portions of the Software are copyrighted by James Clark. Copying permissions and restrictions for those portions are covered in the file "copyingjc.txt" <br/>THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL BILL LINDSEY BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. <br/>Except as contained in this notice, the name of Bill Lindsey shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Bill Lindsey. </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product:zlib; Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__Jean-Loup_Gailly__Mark_Adler"><span/></a>Jean-Loup Gailly, Mark Adler</h2><h3 class="Heading_20_3"><a id="a__zlib"><span/></a>zlib</h3><p class="P11">(C) 1995-2002 Jean-loup Gailly and Mark Adler <br/>This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. <br/>Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: <br/><br/>1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. <br/>2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. <br/>3. This notice may not be removed or altered from any source distribution. </p><p class="Horizontal_20_Line"/><p class="Text_20_body">The following software may be included in this product: Mozilla, Mozilla Address Book, NP SDK: Use of any of this software is governed by the terms of the license below:</p><h2 class="Heading_20_2"><a id="a__The_Mozilla_Foundation"><span/></a>The Mozilla Foundation</h2><h3 class="Heading_20_3"><a id="a__Mozilla_Address_Book"><span/></a>Mozilla Address Book</h3><p class="P8"><span class="T5">MOZILLA PUBLIC LICENSE</span> <br/><span class="T4">Version 1.1</span> </p><p class="P5"/><p class="Text_20_body"><span class="T4">1. Definitions.</span> </p><ul><li><p class="P56" style="margin-left:0.748cm;"><span class="T4">1.0.1. "Commercial Use" </span>means distribution or otherwise making the Covered Code available to a third party. <span class="odfLiEnd"/> </p><p class="P56" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.1. ''Contributor''</span> means each entity that creates or contributes to the creation of Modifications. <span class="odfLiEnd"/> </p><p class="P56" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.2. ''Contributor Version''</span> means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor. <span class="odfLiEnd"/> </p><p class="P56" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.3. ''Covered Code''</span> means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof<span class="T4">.</span> <span class="odfLiEnd"/> </p><p class="P56" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.4. ''Electronic Distribution Mechanism''</span> means a mechanism generally accepted in the software development community for the electronic transfer of data. <span class="odfLiEnd"/> </p><p class="P56" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.5. ''Executable''</span> means Covered Code in any form other than Source Code. <span class="odfLiEnd"/> </p><p class="P56" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.6. ''Initial Developer''</span> means the individual or entity identified as the Initial Developer in the Source Code notice required by <span class="T4">Exhibit A</span>. <span class="odfLiEnd"/> </p><p class="P56" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.7. ''Larger Work''</span> means a work which combines Covered Code or portions thereof with code not governed by the terms of this License. <span class="odfLiEnd"/> </p><p class="P56" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.8. ''License''</span> means this document. <span class="odfLiEnd"/> </p><p class="P56" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.8.1. "Licensable"</span> means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. <span class="odfLiEnd"/> </p><p class="P56" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.9. ''Modifications''</span> means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is: <span class="odfLiEnd"/> </p><ul><li><p class="P56" style="margin-left:1.9949cm;"><span class="T4">A.</span> Any addition to or deletion from the contents of a file containing Original Code or previous Modifications. <span class="odfLiEnd"/> </p><p class="P56" style="margin-left:1.9949cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">B.</span> Any new file that contains any part of the Original Code or previous Modifications. <br/><span style="margin-left:0.4991cm"/> <span class="odfLiEnd"/> </p></li></ul><p class="P56" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.10. ''Original Code''</span> means Source Code of computer software code which is described in the Source Code notice required by <span class="T4">Exhibit A</span> as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License. <span class="odfLiEnd"/> </p><p class="P56" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.10.1. "Patent Claims"</span> means any patent claim(s), now owned or hereafter acquired, including without limitation,  method, process, and apparatus claims, in any patent Licensable by grantor. <span class="odfLiEnd"/> </p><p class="P56" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.11. ''Source Code''</span> means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge. <span class="odfLiEnd"/> </p><p class="P56" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">1.12. "You'' (or "Your") </span> means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You'' includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control'' means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.<span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">2. Source Code License.</span> </p><ul><li><p class="P22" style="margin-left:0.748cm;"><span class="T4">2.1. The Initial Developer Grant.</span> <br/><span style="margin-left:0.4991cm"/>The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims: <span class="odfLiEnd"/> </p><ul><li><p class="P57" style="margin-left:1.9949cm;"><span class="T4">(a)</span>  under intellectual property rights (other than patent or trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, and/or as part of a Larger Work; and <span class="odfLiEnd"/> </p><p class="P57" style="margin-left:1.9949cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">(b)</span> under Patents Claims infringed by the making, using or selling of Original Code, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Code (or portions thereof). <span class="odfLiEnd"/> </p><ul><li><ul><li><p class="P22" style="margin-left:4.4889cm;">  <span class="odfLiEnd"/> </p></li></ul></li></ul><p class="P57" style="margin-left:1.9949cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">(c) </span>the licenses granted in this Section 2.1(a) and (b) are effective on the date Initial Developer first distributes Original Code under the terms of this License. <span class="odfLiEnd"/> </p><p class="P57" style="margin-left:1.9949cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">(d) </span>Notwithstanding Section 2.1(b) above, no patent license is granted: 1) for code that You delete from the Original Code; 2) separate from the Original Code;  or 3) for infringements caused by: i) the modification of the Original Code or ii) the combination of the Original Code with other software or devices. <br/><span style="margin-left:0.4991cm"/> <span class="odfLiEnd"/> </p></li></ul><p class="P22" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">2.2. Contributor Grant.</span> <br/><span style="margin-left:0.4991cm"/>Subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license <span class="odfLiEnd"/> </p><ul><li><p class="P57" style="margin-left:1.9949cm;">  <br/><span style="margin-left:0.4991cm"/><span class="T4">(a)</span>  under intellectual property rights (other than patent or trademark) Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger Work; and <span class="odfLiEnd"/> </p><p class="P57" style="margin-left:1.9949cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">(b)</span> under Patent Claims infringed by the making, using, or selling of  Modifications made by that Contributor either alone and/or in<span class="T6"> combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: 1) Modifications made by that Contributor (or portions thereof); and 2) the combination of  Modifications made by that Contributor with its Contributor Version (or portions of such combination).</span> <span class="odfLiEnd"/> </p><p class="P57" style="margin-left:1.9949cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">(c) </span>the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first makes Commercial Use of the Covered Code. <span class="odfLiEnd"/> </p><p class="P57" style="margin-left:1.9949cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">(d) </span>   Notwithstanding Section 2.2(b) above, no patent license is granted: 1) for any code that Contributor has deleted from the Contributor Version; 2)  separate from the Contributor Version;  3)  for infringements caused by: i) third party modifications of Contributor Version or ii)  the combination of Modifications made by that Contributor with other software  (except as part of the Contributor Version) or other devices; or 4) under Patent Claims infringed by Covered Code in the absence of Modifications made by that Contributor.<span class="odfLiEnd"/> </p></li></ul></li></ul><p class="Text_20_body"><br/><span class="T4">3. Distribution Obligations.</span> </p><ul><li><p class="P58" style="margin-left:0.748cm;"><span class="T4">3.1. Application of License.</span> <br/><span style="margin-left:0.4991cm"/>The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section <span class="T4">2.2</span>. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section <span class="T4">6.1</span>, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section <span class="T4">3.5</span>. <span class="odfLiEnd"/> </p><p class="P58" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">3.2. Availability of Source Code.</span> <br/><span style="margin-left:0.4991cm"/>Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party. <span class="odfLiEnd"/> </p><p class="P58" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">3.3. Description of Modifications.</span> <br/><span style="margin-left:0.4991cm"/>You must cause all Covered Code to which You contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code. <span class="odfLiEnd"/> </p><p class="P58" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">3.4. Intellectual Property Matters</span> <span class="odfLiEnd"/> </p><ul><li><p class="P58" style="margin-left:1.9949cm;"><span class="T4">(a) Third Party Claims</span>. <br/><span style="margin-left:0.4991cm"/>If Contributor has knowledge that a license under a third party's intellectual property rights is required to exercise the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor must include a text file with the Source Code distribution titled "LEGAL'' which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If Contributor obtains such knowledge after the Modification is made available as described in Section 3.2, Contributor shall promptly modify the LEGAL file in all copies Contributor makes available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained. <span class="odfLiEnd"/> </p><p class="P58" style="margin-left:1.9949cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">(b) Contributor APIs</span>. <br/><span style="margin-left:0.4991cm"/>If Contributor's Modifications include an application programming interface and Contributor has knowledge of patent licenses which are reasonably necessary to implement that API, Contributor must also include this information in the LEGAL file. <br/><span style="margin-left:0.4991cm"/> <span class="odfLiEnd"/> </p></li></ul><p class="P23" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span>          <span class="T4">(c)    Representations.</span> <span class="odfLiEnd"/> </p><ul><li><p class="P58" style="margin-left:1.9949cm;">Contributor represents that, except as disclosed pursuant to Section 3.4(a) above, Contributor believes that Contributor's Modifications are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the rights conveyed by this License. <span class="odfLiEnd"/> </p></li></ul><p class="P58" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><br/><span style="margin-left:0.4991cm"/><span class="T4">3.5. Required Notices.</span> <br/><span style="margin-left:0.4991cm"/>You must duplicate the notice in <span class="T4">Exhibit A</span> in each file of the Source Code.  If it is not possible to put such notice in a particular Source Code file due to its structure, then You must include such notice in a location (such as a relevant directory) where a user would be likely to look for such a notice.  If You created one or more Modification(s) You may add your name as a Contributor to the notice described in <span class="T4">Exhibit A</span>.  You must also duplicate this License in any documentation for the Source Code where You describe recipients' rights or ownership rights relating to Covered Code.  You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer. <span class="odfLiEnd"/> </p><p class="P58" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">3.6. Distribution of Executable Versions.</span> <br/><span style="margin-left:0.4991cm"/>You may distribute Covered Code in Executable form only if the requirements of Section <span class="T4">3.1-3.5</span> have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section <span class="T4">3.2</span>. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code or ownership rights under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer. <span class="odfLiEnd"/> </p><p class="P58" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">3.7. Larger Works.</span> <br/><span style="margin-left:0.4991cm"/>You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code.<span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">4. Inability to Comply Due to Statute or Regulation.</span> </p><ul><li><p class="P59" style="margin-left:0.748cm;">If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section <span class="T4">3.4</span> and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it. <span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">5. Application of this License.</span> </p><ul><li><p class="P60" style="margin-left:0.748cm;">This License applies to code to which the Initial Developer has attached the notice in <span class="T4">Exhibit A</span> and to related Covered Code. <span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">6. Versions of the License.</span> </p><ul><li><p class="P61" style="margin-left:0.748cm;"><span class="T4">6.1. New Versions</span>. <br/><span style="margin-left:0.4991cm"/>Netscape Communications Corporation (''Netscape'') may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number. <span class="odfLiEnd"/> </p><p class="P61" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">6.2. Effect of New Versions</span>. <br/><span style="margin-left:0.4991cm"/>Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Netscape. No one other than Netscape has the right to modify the terms applicable to Covered Code created under this License. <span class="odfLiEnd"/> </p><p class="P61" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">6.3. Derivative Works</span>. <br/><span style="margin-left:0.4991cm"/>If You create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), You must (a) rename Your license so that the phrases ''Mozilla'', ''MOZILLAPL'', ''MOZPL'', ''Netscape'', "MPL", ''NPL'' or any confusingly similar phrase do not appear in your license (except to note that your license differs from this License) and (b) otherwise make it clear that Your version of the license contains terms which differ from the Mozilla Public License and Netscape Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in <span class="T4">Exhibit A</span> shall not of themselves be deemed to be modifications of this License.)<span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">7. DISCLAIMER OF WARRANTY.</span> </p><ul><li><p class="P62" style="margin-left:0.748cm;">COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. <span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">8. TERMINATION.</span> </p><ul><li><p class="P63" style="margin-left:0.748cm;"><span class="T4">8.1.  </span>This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. <span class="odfLiEnd"/> </p><p class="P63" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">8.2.  </span>If You initiate litigation by asserting a patent infringement claim (excluding declatory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You file such action is referred to as "Participant")  alleging that: <span class="odfLiEnd"/> </p><p class="P63" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">(a)  </span>such Participant's Contributor Version directly or indirectly infringes any patent, then any and all rights granted by such Participant to You under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively, unless if within 60 days after receipt of notice You either: (i)  agree in writing to pay Participant a mutually agreeable reasonable royalty for Your past and future use of Modifications made by such Participant, or (ii) withdraw Your litigation claim with respect to the Contributor Version against such Participant.  If within 60 days of notice, a reasonable royalty and payment arrangement are not mutually agreed upon in writing by the parties or the litigation claim is not withdrawn, the rights granted by Participant to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration of the 60 day notice period specified above. <span class="odfLiEnd"/> </p><p class="P63" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">(b)</span>  any software, hardware, or device, other than such Participant's Contributor Version, directly or indirectly infringes any patent, then any rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are revoked effective as of the date You first made, used, sold, distributed, or had made, Modifications made by that Participant. <span class="odfLiEnd"/> </p><p class="P63" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">8.3.  </span>If You assert a patent infringement claim against Participant alleging that such Participant's Contributor Version directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license. <span class="odfLiEnd"/> </p><p class="P63" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span><span class="T4">8.4.</span>  In the event of termination under Sections 8.1 or 8.2 above,  all end user license agreements (excluding distributors and resellers) which have been validly granted by You or any distributor hereunder prior to termination shall survive termination.<span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">9. LIMITATION OF LIABILITY.</span> </p><ul><li><p class="P64" style="margin-left:0.748cm;">UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. <span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">10. U.S. GOVERNMENT END USERS.</span> </p><ul><li><p class="P65" style="margin-left:0.748cm;">The Covered Code is a ''commercial item,'' as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of ''commercial computer software'' and ''commercial computer software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein. <span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">11. MISCELLANEOUS.</span> </p><ul><li><p class="P66" style="margin-left:0.748cm;">This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in the United States of America, any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. <span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">12. RESPONSIBILITY FOR CLAIMS.</span> </p><ul><li><p class="P67" style="margin-left:0.748cm;">As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability. <span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><span class="T4">13. MULTIPLE-LICENSED CODE.</span> </p><ul><li><p class="P68" style="margin-left:0.748cm;">Initial Developer may designate portions of the Covered Code as “Multiple-Licensed�.  “Multiple-Licensed� means that the Initial Developer permits you to utilize portions of the Covered Code under Your choice of the MPL or the alternative licenses, if any, specified by the Initial Developer in the file described in Exhibit A. <span class="odfLiEnd"/> </p></li></ul><p class="Text_20_body"><br/><span class="T4">EXHIBIT A -Mozilla Public License.</span> </p><ul><li><p class="P69" style="margin-left:0.748cm;">``The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at <br/><span style="margin-left:0.4991cm"/>http://www.mozilla.org/MPL/ <span class="odfLiEnd"/> </p><p class="P69" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span>Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF <br/><span style="margin-left:0.4991cm"/>ANY KIND, either express or implied. See the License for the specific language governing rights and <br/><span style="margin-left:0.4991cm"/>limitations under the License. <span class="odfLiEnd"/> </p><p class="P69" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span>The Original Code is ______________________________________. <span class="odfLiEnd"/> </p><p class="P69" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span>The Initial Developer of the Original Code is ________________________. Portions created by <br/><span style="margin-left:0.4991cm"/> ______________________ are Copyright (C) ______ _______________________. All Rights <br/><span style="margin-left:0.4991cm"/>Reserved. <span class="odfLiEnd"/> </p><p class="P69" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span>Contributor(s): ______________________________________. <span class="odfLiEnd"/> </p><p class="P69" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span>Alternatively, the contents of this file may be used under the terms of the _____ license (the  “[___] License�), in which case the provisions of [______] License are applicable  instead of those above.  If you wish to allow use of your version of this file only under the terms of the [____] License and not to allow others to use your version of this file under the MPL, indicate your decision by deleting  the provisions above and replace  them with the notice and other provisions required by the [___] License.  If you do not delete the provisions above, a recipient may use your version of this file under either the MPL or the [___] License." <span class="odfLiEnd"/> </p><p class="P69" style="margin-left:0.748cm;"><span class="Bullet_20_Symbols" style="display:block;float:left;min-width:0.4991cm"><!-- --></span>[NOTE: The text of this Exhibit A may differ slightly from the text of the notices in the Source Code files of the Original Code. You should use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.] <span class="odfLiEnd"/> </p></li></ul><p class="Horizontal_20_Line"> </p><h2 class="Heading_20_2"><a id="a__FSF"><span/></a>FSF</h2><h3 class="Heading_20_3"><a id="a__GNU_General_Public_License"><span/></a>GNU General Public License</h3><p class="Horizontal_20_Line"/><p class="Text_20_body"> </p><h4 class="Heading_20_4"><a id="a__GNU_GENERAL_PUBLIC_LICENSE"><span/></a>GNU GENERAL PUBLIC LICENSE</h4><p class="Text_20_body">Version 2, June 1991 </p><p class="Preformatted_20_Text">Copyright (C) 1989, 1991 Free Software Foundation, Inc.  </p><p class="Preformatted_20_Text">51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Everyone is permitted to copy and distribute verbatim copies</p><p class="P2">of this license document, but changing it is not allowed.</p><h4 class="Heading_20_4"><a id="a__Preamble"><span/></a>Preamble</h4><p class="Text_20_body">The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. </p><p class="Text_20_body">When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. </p><p class="Text_20_body">To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. </p><p class="Text_20_body">For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. </p><p class="Text_20_body">We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. </p><p class="Text_20_body">Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. </p><p class="Text_20_body">Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. </p><p class="Text_20_body">The precise terms and conditions for copying, distribution and modification follow. </p><h4 class="Heading_20_4"><a id="a__TERMS_AND_CONDITIONS_FOR_COPYING__DISTRIBUTION_AND_MODIFICATION"><span/></a>TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</h4><p class="Text_20_body"><span class="Strong_20_Emphasis">0.</span> This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". </p><p class="Text_20_body">Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. </p><p class="Text_20_body"><span class="Strong_20_Emphasis">1.</span> You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. </p><p class="Text_20_body">You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. </p><p class="Text_20_body"><span class="Strong_20_Emphasis">2.</span> You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: </p><p class="List_20_Contents"><span class="Strong_20_Emphasis">a)</span> You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. </p><p class="List_20_Contents"><span class="Strong_20_Emphasis">b)</span> You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. </p><p class="P3"><span class="Strong_20_Emphasis">c)</span> If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) </p><p class="Text_20_body">These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. </p><p class="Text_20_body">Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. </p><p class="Text_20_body">In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. </p><p class="Text_20_body"><span class="Strong_20_Emphasis">3.</span> You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: </p><p class="List_20_Contents"><span class="Strong_20_Emphasis">a)</span> Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, </p><p class="List_20_Contents"><span class="Strong_20_Emphasis">b)</span> Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, </p><p class="P3"><span class="Strong_20_Emphasis">c)</span> Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) </p><p class="Text_20_body">The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. </p><p class="Text_20_body">If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. </p><p class="Text_20_body"><span class="Strong_20_Emphasis">4.</span> You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. </p><p class="Text_20_body"><span class="Strong_20_Emphasis">5.</span> You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. </p><p class="Text_20_body"><span class="Strong_20_Emphasis">6.</span> Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. </p><p class="Text_20_body"><span class="Strong_20_Emphasis">7.</span> If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. </p><p class="Text_20_body">If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. </p><p class="Text_20_body">It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. </p><p class="Text_20_body">This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. </p><p class="Text_20_body"><span class="Strong_20_Emphasis">8.</span> If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. </p><p class="Text_20_body"><span class="Strong_20_Emphasis">9.</span> The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. </p><p class="Text_20_body">Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. </p><p class="Text_20_body"><span class="Strong_20_Emphasis">10.</span> If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. </p><p class="Text_20_body"><span class="Strong_20_Emphasis">NO WARRANTY</span></p><p class="Text_20_body"><span class="Strong_20_Emphasis">11.</span> BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. </p><p class="Text_20_body"><span class="Strong_20_Emphasis">12.</span> IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. </p><h4 class="Heading_20_4"><a id="a__END_OF_TERMS_AND_CONDITIONS"><span/></a>END OF TERMS AND CONDITIONS</h4><p class="Horizontal_20_Line"> </p><h2 class="Heading_20_2"><a id="a__FSF"><span/></a>FSF</h2><h3 class="Heading_20_3"><a id="a__GNU_Lesser_General_Public_License"><span/></a>GNU Lesser General Public License</h3><p class="Horizontal_20_Line"/><p class="P11"><br/>GNU LESSER GENERAL PUBLIC LICENSE <br/>Version 2.1, February 1999 <br/><br/>Copyright (C) 1991, 1999 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. <br/>[This is the first released version of the Lesser GPL. It also counts as the successor of the GNU Library Public License, version 2, hence the version number 2.1.] <br/><br/>Preamble <br/><br/>The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. <br/>This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. <br/>When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things. <br/>To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. <br/>For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. <br/>We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. <br/>To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. <br/><br/>Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. <br/>Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. <br/>When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. <br/>We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. <br/>For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. <br/>In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. <br/>Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. <br/>The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. <br/><br/>GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION <br/>0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". <br/>A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. <br/>The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) <br/>"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. <br/>Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. <br/>1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. <br/>You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. <br/><br/>2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: <br/>a) The modified work must itself be a software library. <br/>b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. <br/>c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. <br/>d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. (For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) <br/>These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. <br/>Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. <br/>In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. <br/>3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. <br/><br/>Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. <br/>This option is useful when you wish to copy part of the code of the Library into a program that is not a library. <br/>4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. <br/>If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. <br/>5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. <br/>However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. <br/>When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. <br/>If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) <br/>Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. <br/><br/>6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. <br/>You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: <br/>a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) <br/>b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. <br/>c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. <br/>d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. <br/>e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. <br/>For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. <br/>It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. <br/><br/>7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: <br/>a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. <br/>b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. <br/>8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. <br/>9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. <br/>10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. <br/><br/>11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. <br/>If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. <br/>It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. <br/>This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. <br/>12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. <br/>13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. <br/>Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. <br/><br/>14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. <br/><br/>NO WARRANTY <br/>15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. <br/>16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. <br/>END OF TERMS AND CONDITIONS </p><p class="Horizontal_20_Line"/><h2 class="Heading_20_2"><a id="a__LaTeX3_Project"><span/></a>LaTeX3 Project</h2><h3 class="Heading_20_3"><a id="a__The_LaTeX_Project_Public_License"><span/></a>The LaTeX Project Public License</h3><p class="Text_20_body">The LaTeX Project Public License </p><p class="Preformatted_20_Text">=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">LPPL Version 1.3c  2006-05-20</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Copyright 1999 2002-2006 LaTeX3 Project</p><p class="Preformatted_20_Text">    Everyone is allowed to distribute verbatim copies of this</p><p class="Preformatted_20_Text">    license document, but modification of it is not allowed.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">PREAMBLE</p><p class="Preformatted_20_Text">========</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">The LaTeX Project Public License (LPPL) is the primary license under</p><p class="Preformatted_20_Text">which the the LaTeX kernel and the base LaTeX packages are distributed.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">You may use this license for any work of which you hold the copyright</p><p class="Preformatted_20_Text">and which you wish to distribute.  This license may be particularly</p><p class="Preformatted_20_Text">suitable if your work is TeX-related (such as a LaTeX package), but </p><p class="Preformatted_20_Text">it is written in such a way that you can use it even if your work is </p><p class="Preformatted_20_Text">unrelated to TeX.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE',</p><p class="Preformatted_20_Text">below, gives instructions, examples, and recommendations for authors</p><p class="Preformatted_20_Text">who are considering distributing their works under this license.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">This license gives conditions under which a work may be distributed</p><p class="Preformatted_20_Text">and modified, as well as conditions under which modified versions of</p><p class="Preformatted_20_Text">that work may be distributed.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">We, the LaTeX3 Project, believe that the conditions below give you</p><p class="Preformatted_20_Text">the freedom to make and distribute modified versions of your work</p><p class="Preformatted_20_Text">that conform with whatever technical specifications you wish while</p><p class="Preformatted_20_Text">maintaining the availability, integrity, and reliability of</p><p class="Preformatted_20_Text">that work.  If you do not see how to achieve your goal while</p><p class="Preformatted_20_Text">meeting these conditions, then read the document `cfgguide.tex'</p><p class="Preformatted_20_Text">and `modguide.tex' in the base LaTeX distribution for suggestions.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">DEFINITIONS</p><p class="Preformatted_20_Text">===========</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">In this license document the following terms are used:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   `Work'</p><p class="Preformatted_20_Text">    Any work being distributed under this License.</p><p class="Preformatted_20_Text">    </p><p class="Preformatted_20_Text">   `Derived Work'</p><p class="Preformatted_20_Text">    Any work that under any applicable law is derived from the Work.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   `Modification' </p><p class="Preformatted_20_Text">    Any procedure that produces a Derived Work under any applicable</p><p class="Preformatted_20_Text">    law -- for example, the production of a file containing an</p><p class="Preformatted_20_Text">    original file associated with the Work or a significant portion of</p><p class="Preformatted_20_Text">    such a file, either verbatim or with modifications and/or</p><p class="Preformatted_20_Text">    translated into another language.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   `Modify'</p><p class="Preformatted_20_Text">    To apply any procedure that produces a Derived Work under any</p><p class="Preformatted_20_Text">    applicable law.</p><p class="Preformatted_20_Text">    </p><p class="Preformatted_20_Text">   `Distribution'</p><p class="Preformatted_20_Text">    Making copies of the Work available from one person to another, in</p><p class="Preformatted_20_Text">    whole or in part.  Distribution includes (but is not limited to)</p><p class="Preformatted_20_Text">    making any electronic components of the Work accessible by</p><p class="Preformatted_20_Text">    file transfer protocols such as FTP or HTTP or by shared file</p><p class="Preformatted_20_Text">    systems such as Sun's Network File System (NFS).</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   `Compiled Work'</p><p class="Preformatted_20_Text">    A version of the Work that has been processed into a form where it</p><p class="Preformatted_20_Text">    is directly usable on a computer system.  This processing may</p><p class="Preformatted_20_Text">    include using installation facilities provided by the Work,</p><p class="Preformatted_20_Text">    transformations of the Work, copying of components of the Work, or</p><p class="Preformatted_20_Text">    other activities.  Note that modification of any installation</p><p class="Preformatted_20_Text">    facilities provided by the Work constitutes modification of the Work.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   `Current Maintainer'</p><p class="Preformatted_20_Text">    A person or persons nominated as such within the Work.  If there is</p><p class="Preformatted_20_Text">    no such explicit nomination then it is the `Copyright Holder' under</p><p class="Preformatted_20_Text">    any applicable law.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   `Base Interpreter' </p><p class="Preformatted_20_Text">    A program or process that is normally needed for running or</p><p class="Preformatted_20_Text">    interpreting a part or the whole of the Work.    </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    A Base Interpreter may depend on external components but these</p><p class="Preformatted_20_Text">    are not considered part of the Base Interpreter provided that each</p><p class="Preformatted_20_Text">    external component clearly identifies itself whenever it is used</p><p class="Preformatted_20_Text">    interactively.  Unless explicitly specified when applying the</p><p class="Preformatted_20_Text">    license to the Work, the only applicable Base Interpreter is a</p><p class="Preformatted_20_Text">    `LaTeX-Format' or in the case of files belonging to the </p><p class="Preformatted_20_Text">    `LaTeX-format' a program implementing the `TeX language'.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">CONDITIONS ON DISTRIBUTION AND MODIFICATION</p><p class="Preformatted_20_Text">===========================================</p><p class="Preformatted_20_Text"/><p class="Preformatted_20_Text">1.  Activities other than distribution and/or modification of the Work</p><p class="Preformatted_20_Text">are not covered by this license; they are outside its scope.  In</p><p class="Preformatted_20_Text">particular, the act of running the Work is not restricted and no</p><p class="Preformatted_20_Text">requirements are made concerning any offers of support for the Work.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">2.  You may distribute a complete, unmodified copy of the Work as you</p><p class="Preformatted_20_Text">received it.  Distribution of only part of the Work is considered</p><p class="Preformatted_20_Text">modification of the Work, and no right to distribute such a Derived</p><p class="Preformatted_20_Text">Work may be assumed under the terms of this clause.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">3.  You may distribute a Compiled Work that has been generated from a</p><p class="Preformatted_20_Text">complete, unmodified copy of the Work as distributed under Clause 2</p><p class="Preformatted_20_Text">above, as long as that Compiled Work is distributed in such a way that</p><p class="Preformatted_20_Text">the recipients may install the Compiled Work on their system exactly</p><p class="Preformatted_20_Text">as it would have been installed if they generated a Compiled Work</p><p class="Preformatted_20_Text">directly from the Work.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">4.  If you are the Current Maintainer of the Work, you may, without</p><p class="Preformatted_20_Text">restriction, modify the Work, thus creating a Derived Work.  You may</p><p class="Preformatted_20_Text">also distribute the Derived Work without restriction, including</p><p class="Preformatted_20_Text">Compiled Works generated from the Derived Work.  Derived Works</p><p class="Preformatted_20_Text">distributed in this manner by the Current Maintainer are considered to</p><p class="Preformatted_20_Text">be updated versions of the Work.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">5.  If you are not the Current Maintainer of the Work, you may modify</p><p class="Preformatted_20_Text">your copy of the Work, thus creating a Derived Work based on the Work,</p><p class="Preformatted_20_Text">and compile this Derived Work, thus creating a Compiled Work based on</p><p class="Preformatted_20_Text">the Derived Work.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">6.  If you are not the Current Maintainer of the Work, you may</p><p class="Preformatted_20_Text">distribute a Derived Work provided the following conditions are met</p><p class="Preformatted_20_Text">for every component of the Work unless that component clearly states</p><p class="Preformatted_20_Text">in the copyright notice that it is exempt from that condition.  Only</p><p class="Preformatted_20_Text">the Current Maintainer is allowed to add such statements of exemption </p><p class="Preformatted_20_Text">to a component of the Work. </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  a. If a component of this Derived Work can be a direct replacement</p><p class="Preformatted_20_Text">     for a component of the Work when that component is used with the</p><p class="Preformatted_20_Text">     Base Interpreter, then, wherever this component of the Work</p><p class="Preformatted_20_Text">     identifies itself to the user when used interactively with that</p><p class="Preformatted_20_Text">     Base Interpreter, the replacement component of this Derived Work</p><p class="Preformatted_20_Text">     clearly and unambiguously identifies itself as a modified version</p><p class="Preformatted_20_Text">     of this component to the user when used interactively with that</p><p class="Preformatted_20_Text">     Base Interpreter.</p><p class="Preformatted_20_Text">     </p><p class="Preformatted_20_Text">  b. Every component of the Derived Work contains prominent notices</p><p class="Preformatted_20_Text">     detailing the nature of the changes to that component, or a</p><p class="Preformatted_20_Text">     prominent reference to another file that is distributed as part</p><p class="Preformatted_20_Text">     of the Derived Work and that contains a complete and accurate log</p><p class="Preformatted_20_Text">     of the changes.</p><p class="Preformatted_20_Text">  </p><p class="Preformatted_20_Text">  c. No information in the Derived Work implies that any persons,</p><p class="Preformatted_20_Text">     including (but not limited to) the authors of the original version</p><p class="Preformatted_20_Text">     of the Work, provide any support, including (but not limited to)</p><p class="Preformatted_20_Text">     the reporting and handling of errors, to recipients of the</p><p class="Preformatted_20_Text">     Derived Work unless those persons have stated explicitly that</p><p class="Preformatted_20_Text">     they do provide such support for the Derived Work.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  d. You distribute at least one of the following with the Derived Work:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">       1. A complete, unmodified copy of the Work; </p><p class="Preformatted_20_Text">          if your distribution of a modified component is made by</p><p class="Preformatted_20_Text">          offering access to copy the modified component from a</p><p class="Preformatted_20_Text">          designated place, then offering equivalent access to copy</p><p class="Preformatted_20_Text">          the Work from the same or some similar place meets this</p><p class="Preformatted_20_Text">          condition, even though third parties are not compelled to</p><p class="Preformatted_20_Text">          copy the Work along with the modified component;</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">       2. Information that is sufficient to obtain a complete,</p><p class="Preformatted_20_Text">          unmodified copy of the Work.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">7.  If you are not the Current Maintainer of the Work, you may</p><p class="Preformatted_20_Text">distribute a Compiled Work generated from a Derived Work, as long as</p><p class="Preformatted_20_Text">the Derived Work is distributed to all recipients of the Compiled</p><p class="Preformatted_20_Text">Work, and as long as the conditions of Clause 6, above, are met with</p><p class="Preformatted_20_Text">regard to the Derived Work.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">8.  The conditions above are not intended to prohibit, and hence do not</p><p class="Preformatted_20_Text">apply to, the modification, by any method, of any component so that it</p><p class="Preformatted_20_Text">becomes identical to an updated version of that component of the Work as</p><p class="Preformatted_20_Text">it is distributed by the Current Maintainer under Clause 4, above.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">9.  Distribution of the Work or any Derived Work in an alternative</p><p class="Preformatted_20_Text">format, where the Work or that Derived Work (in whole or in part) is</p><p class="Preformatted_20_Text">then produced by applying some process to that format, does not relax or</p><p class="Preformatted_20_Text">nullify any sections of this license as they pertain to the results of</p><p class="Preformatted_20_Text">applying that process.</p><p class="Preformatted_20_Text">     </p><p class="Preformatted_20_Text">10. a. A Derived Work may be distributed under a different license</p><p class="Preformatted_20_Text">       provided that license itself honors the conditions listed in</p><p class="Preformatted_20_Text">       Clause 6 above, in regard to the Work, though it does not have</p><p class="Preformatted_20_Text">       to honor the rest of the conditions in this license.</p><p class="Preformatted_20_Text">      </p><p class="Preformatted_20_Text">    b. If a Derived Work is distributed under a different license, that</p><p class="Preformatted_20_Text">       Derived Work must provide sufficient documentation as part of</p><p class="Preformatted_20_Text">       itself to allow each recipient of that Derived Work to honor the </p><p class="Preformatted_20_Text">       restrictions in Clause 6 above, concerning changes from the Work.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">11. This license places no restrictions on works that are unrelated to</p><p class="Preformatted_20_Text">the Work, nor does this license place any restrictions on aggregating</p><p class="Preformatted_20_Text">such works with the Work by any means.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">12.  Nothing in this license is intended to, or may be used to, prevent</p><p class="Preformatted_20_Text">complete compliance by all parties with all applicable laws.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">NO WARRANTY</p><p class="Preformatted_20_Text">===========</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">There is no warranty for the Work.  Except when otherwise stated in</p><p class="Preformatted_20_Text">writing, the Copyright Holder provides the Work `as is', without</p><p class="Preformatted_20_Text">warranty of any kind, either expressed or implied, including, but not</p><p class="Preformatted_20_Text">limited to, the implied warranties of merchantability and fitness for a</p><p class="Preformatted_20_Text">particular purpose.  The entire risk as to the quality and performance</p><p class="Preformatted_20_Text">of the Work is with you.  Should the Work prove defective, you assume</p><p class="Preformatted_20_Text">the cost of all necessary servicing, repair, or correction.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">In no event unless required by applicable law or agreed to in writing</p><p class="Preformatted_20_Text">will The Copyright Holder, or any author named in the components of the</p><p class="Preformatted_20_Text">Work, or any other party who may distribute and/or modify the Work as</p><p class="Preformatted_20_Text">permitted above, be liable to you for damages, including any general,</p><p class="Preformatted_20_Text">special, incidental or consequential damages arising out of any use of</p><p class="Preformatted_20_Text">the Work or out of inability to use the Work (including, but not limited</p><p class="Preformatted_20_Text">to, loss of data, data being rendered inaccurate, or losses sustained by</p><p class="Preformatted_20_Text">anyone as a result of any failure of the Work to operate with any other</p><p class="Preformatted_20_Text">programs), even if the Copyright Holder or said author or said other</p><p class="Preformatted_20_Text">party has been advised of the possibility of such damages.</p><p class="Preformatted_20_Text"/><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">MAINTENANCE OF THE WORK</p><p class="Preformatted_20_Text">=======================</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">The Work has the status `author-maintained' if the Copyright Holder</p><p class="Preformatted_20_Text">explicitly and prominently states near the primary copyright notice in</p><p class="Preformatted_20_Text">the Work that the Work can only be maintained by the Copyright Holder</p><p class="Preformatted_20_Text">or simply that it is `author-maintained'.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">The Work has the status `maintained' if there is a Current Maintainer</p><p class="Preformatted_20_Text">who has indicated in the Work that they are willing to receive error</p><p class="Preformatted_20_Text">reports for the Work (for example, by supplying a valid e-mail</p><p class="Preformatted_20_Text">address). It is not required for the Current Maintainer to acknowledge</p><p class="Preformatted_20_Text">or act upon these error reports.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">The Work changes from status `maintained' to `unmaintained' if there</p><p class="Preformatted_20_Text">is no Current Maintainer, or the person stated to be Current</p><p class="Preformatted_20_Text">Maintainer of the work cannot be reached through the indicated means</p><p class="Preformatted_20_Text">of communication for a period of six months, and there are no other</p><p class="Preformatted_20_Text">significant signs of active maintenance.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">You can become the Current Maintainer of the Work by agreement with</p><p class="Preformatted_20_Text">any existing Current Maintainer to take over this role.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">If the Work is unmaintained, you can become the Current Maintainer of</p><p class="Preformatted_20_Text">the Work through the following steps:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text"> 1.  Make a reasonable attempt to trace the Current Maintainer (and</p><p class="Preformatted_20_Text">     the Copyright Holder, if the two differ) through the means of</p><p class="Preformatted_20_Text">     an Internet or similar search.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text"> 2.  If this search is successful, then enquire whether the Work</p><p class="Preformatted_20_Text">     is still maintained.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  a. If it is being maintained, then ask the Current Maintainer</p><p class="Preformatted_20_Text">     to update their communication data within one month.</p><p class="Preformatted_20_Text">     </p><p class="Preformatted_20_Text">  b. If the search is unsuccessful or no action to resume active</p><p class="Preformatted_20_Text">     maintenance is taken by the Current Maintainer, then announce</p><p class="Preformatted_20_Text">     within the pertinent community your intention to take over</p><p class="Preformatted_20_Text">     maintenance.  (If the Work is a LaTeX work, this could be</p><p class="Preformatted_20_Text">     done, for example, by posting to comp.text.tex.)</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text"> 3a. If the Current Maintainer is reachable and agrees to pass</p><p class="Preformatted_20_Text">     maintenance of the Work to you, then this takes effect</p><p class="Preformatted_20_Text">     immediately upon announcement.</p><p class="Preformatted_20_Text">     </p><p class="Preformatted_20_Text">  b. If the Current Maintainer is not reachable and the Copyright</p><p class="Preformatted_20_Text">     Holder agrees that maintenance of the Work be passed to you,</p><p class="Preformatted_20_Text">     then this takes effect immediately upon announcement.  </p><p class="Preformatted_20_Text">    </p><p class="Preformatted_20_Text"> 4.  If you make an `intention announcement' as described in 2b. above</p><p class="Preformatted_20_Text">     and after three months your intention is challenged neither by</p><p class="Preformatted_20_Text">     the Current Maintainer nor by the Copyright Holder nor by other</p><p class="Preformatted_20_Text">     people, then you may arrange for the Work to be changed so as</p><p class="Preformatted_20_Text">     to name you as the (new) Current Maintainer.</p><p class="Preformatted_20_Text">     </p><p class="Preformatted_20_Text"> 5.  If the previously unreachable Current Maintainer becomes</p><p class="Preformatted_20_Text">     reachable once more within three months of a change completed</p><p class="Preformatted_20_Text">     under the terms of 3b) or 4), then that Current Maintainer must</p><p class="Preformatted_20_Text">     become or remain the Current Maintainer upon request provided</p><p class="Preformatted_20_Text">     they then update their communication data within one month.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">A change in the Current Maintainer does not, of itself, alter the fact</p><p class="Preformatted_20_Text">that the Work is distributed under the LPPL license.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">If you become the Current Maintainer of the Work, you should</p><p class="Preformatted_20_Text">immediately provide, within the Work, a prominent and unambiguous</p><p class="Preformatted_20_Text">statement of your status as Current Maintainer.  You should also</p><p class="Preformatted_20_Text">announce your new status to the same pertinent community as</p><p class="Preformatted_20_Text">in 2b) above.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE</p><p class="Preformatted_20_Text">======================================================</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">This section contains important instructions, examples, and</p><p class="Preformatted_20_Text">recommendations for authors who are considering distributing their</p><p class="Preformatted_20_Text">works under this license.  These authors are addressed as `you' in</p><p class="Preformatted_20_Text">this section.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Choosing This License or Another License</p><p class="Preformatted_20_Text">----------------------------------------</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">If for any part of your work you want or need to use *distribution*</p><p class="Preformatted_20_Text">conditions that differ significantly from those in this license, then</p><p class="Preformatted_20_Text">do not refer to this license anywhere in your work but, instead,</p><p class="Preformatted_20_Text">distribute your work under a different license.  You may use the text</p><p class="Preformatted_20_Text">of this license as a model for your own license, but your license</p><p class="Preformatted_20_Text">should not refer to the LPPL or otherwise give the impression that</p><p class="Preformatted_20_Text">your work is distributed under the LPPL.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">The document `modguide.tex' in the base LaTeX distribution explains</p><p class="Preformatted_20_Text">the motivation behind the conditions of this license.  It explains,</p><p class="Preformatted_20_Text">for example, why distributing LaTeX under the GNU General Public</p><p class="Preformatted_20_Text">License (GPL) was considered inappropriate.  Even if your work is</p><p class="Preformatted_20_Text">unrelated to LaTeX, the discussion in `modguide.tex' may still be</p><p class="Preformatted_20_Text">relevant, and authors intending to distribute their works under any</p><p class="Preformatted_20_Text">license are encouraged to read it.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">A Recommendation on Modification Without Distribution</p><p class="Preformatted_20_Text">-----------------------------------------------------</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">It is wise never to modify a component of the Work, even for your own</p><p class="Preformatted_20_Text">personal use, without also meeting the above conditions for</p><p class="Preformatted_20_Text">distributing the modified component.  While you might intend that such</p><p class="Preformatted_20_Text">modifications will never be distributed, often this will happen by</p><p class="Preformatted_20_Text">accident -- you may forget that you have modified that component; or</p><p class="Preformatted_20_Text">it may not occur to you when allowing others to access the modified</p><p class="Preformatted_20_Text">version that you are thus distributing it and violating the conditions</p><p class="Preformatted_20_Text">of this license in ways that could have legal implications and, worse,</p><p class="Preformatted_20_Text">cause problems for the community.  It is therefore usually in your</p><p class="Preformatted_20_Text">best interest to keep your copy of the Work identical with the public</p><p class="Preformatted_20_Text">one.  Many works provide ways to control the behavior of that work</p><p class="Preformatted_20_Text">without altering any of its licensed components.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">How to Use This License</p><p class="Preformatted_20_Text">-----------------------</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">To use this license, place in each of the components of your work both</p><p class="Preformatted_20_Text">an explicit copyright notice including your name and the year the work</p><p class="Preformatted_20_Text">was authored and/or last substantially modified.  Include also a</p><p class="Preformatted_20_Text">statement that the distribution and/or modification of that</p><p class="Preformatted_20_Text">component is constrained by the conditions in this license.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Here is an example of such a notice and statement:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">  %% pig.dtx</p><p class="Preformatted_20_Text">  %% Copyright 2005 M. Y. Name</p><p class="Preformatted_20_Text">  %</p><p class="Preformatted_20_Text">  % This work may be distributed and/or modified under the</p><p class="Preformatted_20_Text">  % conditions of the LaTeX Project Public License, either version 1.3</p><p class="Preformatted_20_Text">  % of this license or (at your option) any later version.</p><p class="Preformatted_20_Text">  % The latest version of this license is in</p><p class="Preformatted_20_Text">  %   http://www.latex-project.org/lppl.txt</p><p class="Preformatted_20_Text">  % and version 1.3 or later is part of all distributions of LaTeX</p><p class="Preformatted_20_Text">  % version 2005/12/01 or later.</p><p class="Preformatted_20_Text">  %</p><p class="Preformatted_20_Text">  % This work has the LPPL maintenance status `maintained'.</p><p class="Preformatted_20_Text">  % </p><p class="Preformatted_20_Text">  % The Current Maintainer of this work is M. Y. Name.</p><p class="Preformatted_20_Text">  %</p><p class="Preformatted_20_Text">  % This work consists of the files pig.dtx and pig.ins</p><p class="Preformatted_20_Text">  % and the derived file pig.sty.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Given such a notice and statement in a file, the conditions</p><p class="Preformatted_20_Text">given in this license document would apply, with the `Work' referring</p><p class="Preformatted_20_Text">to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being</p><p class="Preformatted_20_Text">generated from `pig.dtx' using `pig.ins'), the `Base Interpreter'</p><p class="Preformatted_20_Text">referring to any `LaTeX-Format', and both `Copyright Holder' and</p><p class="Preformatted_20_Text">`Current Maintainer' referring to the person `M. Y. Name'.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">If you do not want the Maintenance section of LPPL to apply to your</p><p class="Preformatted_20_Text">Work, change `maintained' above into `author-maintained'.  </p><p class="Preformatted_20_Text">However, we recommend that you use `maintained', as the Maintenance</p><p class="Preformatted_20_Text">section was added in order to ensure that your Work remains useful to</p><p class="Preformatted_20_Text">the community even when you can no longer maintain and support it</p><p class="Preformatted_20_Text">yourself.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Derived Works That Are Not Replacements</p><p class="Preformatted_20_Text">---------------------------------------</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Several clauses of the LPPL specify means to provide reliability and</p><p class="Preformatted_20_Text">stability for the user community. They therefore concern themselves</p><p class="Preformatted_20_Text">with the case that a Derived Work is intended to be used as a</p><p class="Preformatted_20_Text">(compatible or incompatible) replacement of the original Work. If</p><p class="Preformatted_20_Text">this is not the case (e.g., if a few lines of code are reused for a</p><p class="Preformatted_20_Text">completely different task), then clauses 6b and 6d shall not apply.</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">Important Recommendations</p><p class="Preformatted_20_Text">-------------------------</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text"> Defining What Constitutes the Work</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">   The LPPL requires that distributions of the Work contain all the</p><p class="Preformatted_20_Text">   files of the Work.  It is therefore important that you provide a</p><p class="Preformatted_20_Text">   way for the licensee to determine which files constitute the Work.</p><p class="Preformatted_20_Text">   This could, for example, be achieved by explicitly listing all the</p><p class="Preformatted_20_Text">   files of the Work near the copyright notice of each file or by</p><p class="Preformatted_20_Text">   using a line such as:</p><p class="Preformatted_20_Text"> </p><p class="Preformatted_20_Text">    % This work consists of all files listed in manifest.txt.</p><p class="Preformatted_20_Text">   </p><p class="Preformatted_20_Text">   in that place.  In the absence of an unequivocal list it might be</p><p class="Preformatted_20_Text">   impossible for the licensee to determine what is considered by you</p><p class="Preformatted_20_Text">   to comprise the Work and, in such a case, the licensee would be</p><p class="Preformatted_20_Text">   entitled to make reasonable conjectures as to which files comprise</p><p class="Preformatted_20_Text">   the Work.</p><p class="Preformatted_20_Text"> </p><p class="P2"> </p></body></html>
\ No newline at end of file
diff --git a/readlicense_oo/source/license/license_en-US.rtf b/readlicense_oo/source/license/license_en-US.rtf
index 56792a79cd5f..7fe1eabf1ae0 100644
--- a/readlicense_oo/source/license/license_en-US.rtf
+++ b/readlicense_oo/source/license/license_en-US.rtf
@@ -1,374 +1,11122 @@
-{\rtf1\ansi\deff1\adeflang1025
-{\fonttbl{\f0\froman\fprq2\fcharset0 Times New Roman;}{\f1\fswiss\fprq2\fcharset0 Tahoma;}{\f2\fswiss\fprq2\fcharset0 Arial;}{\f3\fswiss\fprq2\fcharset0 Tahoma;}{\f4\froman\fprq2\fcharset0 Thorndale{\*\falt Times New Roman};}{\f5\fnil\fprq2\fcharset0 HG Mincho Light J{\*\falt msmincho};}{\f6\fnil\fprq2\fcharset0 LucidaSans;}{\f7\fnil\fprq0\fcharset0 LucidaSans;}}
+{\rtf1\ansi\deff4\adeflang1025
+{\fonttbl{\f0\froman\fprq2\fcharset0 Times New Roman;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\fswiss\fprq2\fcharset0 Arial;}{\f3\froman\fprq2\fcharset128 Times New Roman;}{\f4\froman\fprq2\fcharset128 Thorndale AMT{\*\falt Times New Roman};}{\f5\fswiss\fprq2\fcharset128 Albany AMT{\*\falt Arial};}{\f6\fmodern\fprq1\fcharset128 Cumberland AMT{\*\falt Courier New};}{\f7\froman\fprq2\fcharset128 Thorndale{\*\falt Times New Roman};}{\f8\fnil\fprq0\fcharset128 OpenSymbol{\*\falt Arial Unicode MS};}{\f9\fnil\fprq2\fcharset128 Droid Sans Fallback;}{\f10\fmodern\fprq1\fcharset128 Droid Sans Fallback;}{\f11\fnil\fprq2\fcharset128 HG Mincho Light J{\*\falt msmincho};}{\f12\fnil\fprq2\fcharset128 FreeSans;}{\f13\fnil\fprq0\fcharset128 FreeSans;}{\f14\fnil\fprq2\fcharset128 Arial Unicode MS;}}
 {\colortbl;\red0\green0\blue0;\red0\green0\blue128;\red128\green128\blue128;}
-{\stylesheet{\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033\snext1 Normal;}
-{\s2\sb240\sa120\keepn\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af6\afs28\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs28\lang1033\loch\f2\fs28\lang1033\sbasedon1\snext3 Heading;}
-{\s3\sa120\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033\sbasedon1\snext3 Body Text;}
-{\s4\sa120\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af7\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033\sbasedon3\snext4 List;}
-{\s5\sb120\sa120\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af7\afs24\lang255\ai\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\i\loch\f1\fs24\lang1033\i\sbasedon1\snext5 caption;}
-{\s6\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af7\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033\sbasedon1\snext6 Index;}
-}
-{\info{\creatim\yr0\mo0\dy0\hr0\min0}{\revtim\yr0\mo0\dy0\hr0\min0}{\printim\yr0\mo0\dy0\hr0\min0}{\comment StarWriter}{\vern3100}}\deftab709
+{\stylesheet{\s0\snext0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\aspalpha\ltrpar\cf0\kerning1\hich\af9\langfe2052\dbch\af12\afs24\lang1081\loch\f4\fs24\lang1033 Normal;}
+{\s1\sbasedon20\snext21\b\hich\af11\dbch\af14\afs48\ab\loch\f7\fs48 Heading 1;}
+{\s2\sbasedon20\snext21\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36 Heading 2;}
+{\s3\sbasedon20\snext21\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28 Heading 3;}
+{\s4\sbasedon20\snext21\b\hich\af9\dbch\af12\afs24\ab\loch\f4\fs24 Heading 4;}
+{\*\cs15\snext15\cf2\ul\ulc0\langfe255\lang255\lang255 Internet Link;}
+{\*\cs16\snext16\i\ai Emphasis;}
+{\*\cs17\snext17 Numbering Symbols;}
+{\*\cs18\snext18\hich\af8\dbch\af8\loch\f8 Bullets;}
+{\*\cs19\snext19\b\ab Strong Emphasis;}
+{\s20\sbasedon0\snext21\sb240\sa120\keepn\hich\af9\dbch\af12\afs28\loch\f5\fs28 Heading;}
+{\s21\sbasedon0\snext21\sb0\sa120 Text body;}
+{\s22\sbasedon21\snext22\dbch\af13 List;}
+{\s23\sbasedon0\snext23\sb120\sa120\noline\i\dbch\af13\afs24\ai\fs24 Caption;}
+{\s24\sbasedon0\snext24\noline\dbch\af13 Index;}
+{\s25\sbasedon0\snext25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20 Preformatted Text;}
+{\s26\sbasedon0\snext21\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12 Horizontal Line;}
+{\s27\sbasedon0\snext27\li567\ri567\lin567\rin567\fi0\sb0\sa283 Quotations;}
+{\s28\sbasedon0\snext28\li567\ri0\lin567\rin0\fi0 List Contents;}
+}{\*\listtable{\list\listtemplateid1
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'00;}{\levelnumbers;}\fi-432\li432}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'00;}{\levelnumbers;}\fi-576\li576}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'00;}{\levelnumbers;}\fi-720\li720}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'00;}{\levelnumbers;}\fi-864\li864}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'00;}{\levelnumbers;}\fi-1008\li1008}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'00;}{\levelnumbers;}\fi-1152\li1152}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'00;}{\levelnumbers;}\fi-1296\li1296}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'00;}{\levelnumbers;}\fi-1440\li1440}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'00;}{\levelnumbers;}\fi-1584\li1584}\listid1}
+{\list\listtemplateid2
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'02\'00.;}{\levelnumbers\'01;}\fi-283\li707}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'02\'01.;}{\levelnumbers\'01;}\fi-283\li1414}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'02\'02.;}{\levelnumbers\'01;}\fi-283\li2121}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'02\'03.;}{\levelnumbers\'01;}\fi-283\li2828}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'02\'04.;}{\levelnumbers\'01;}\fi-283\li3535}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'02\'05.;}{\levelnumbers\'01;}\fi-283\li4242}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'02\'06.;}{\levelnumbers\'01;}\fi-283\li4949}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'02\'07.;}{\levelnumbers\'01;}\fi-283\li5656}
+{\listlevel\levelnfc0\leveljc0\levelstartat1\levelfollow0{\leveltext \'02\'08.;}{\levelnumbers\'01;}\fi-283\li6363}\listid2}
+{\list\listtemplateid3
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid3}
+{\list\listtemplateid4
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid4}
+{\list\listtemplateid5
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid5}
+{\list\listtemplateid6
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid6}
+{\list\listtemplateid7
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid7}
+{\list\listtemplateid8
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid8}
+{\list\listtemplateid9
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid9}
+{\list\listtemplateid10
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid10}
+{\list\listtemplateid11
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid11}
+{\list\listtemplateid12
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid12}
+{\list\listtemplateid13
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid13}
+{\list\listtemplateid14
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid14}
+{\list\listtemplateid15
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid15}
+{\list\listtemplateid16
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid16}
+{\list\listtemplateid17
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid17}
+{\list\listtemplateid18
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid18}
+{\list\listtemplateid19
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid19}
+{\list\listtemplateid20
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid20}
+{\list\listtemplateid21
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid21}
+{\list\listtemplateid22
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid22}
+{\list\listtemplateid23
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid23}
+{\list\listtemplateid24
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid24}
+{\list\listtemplateid25
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid25}
+{\list\listtemplateid26
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid26}
+{\list\listtemplateid27
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid27}
+{\list\listtemplateid28
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid28}
+{\list\listtemplateid29
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid29}
+{\list\listtemplateid30
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid30}
+{\list\listtemplateid31
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid31}
+{\list\listtemplateid32
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid32}
+{\list\listtemplateid33
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid33}
+{\list\listtemplateid34
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid34}
+{\list\listtemplateid35
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid35}
+{\list\listtemplateid36
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid36}
+{\list\listtemplateid37
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid37}
+{\list\listtemplateid38
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid38}
+{\list\listtemplateid39
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid39}
+{\list\listtemplateid40
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid40}
+{\list\listtemplateid41
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid41}
+{\list\listtemplateid42
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid42}
+{\list\listtemplateid43
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid43}
+{\list\listtemplateid44
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid44}
+{\list\listtemplateid45
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid45}
+{\list\listtemplateid46
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid46}
+{\list\listtemplateid47
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li707}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li1414}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2121}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li2828}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li3535}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4242}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li4949}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li5656}
+{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u8226 ?;}{\levelnumbers;}\f8\dbch\af8\fi-283\li6363}\listid47}
+}{\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}{\listoverride\listid4\listoverridecount0\ls4}{\listoverride\listid5\listoverridecount0\ls5}{\listoverride\listid6\listoverridecount0\ls6}{\listoverride\listid7\listoverridecount0\ls7}{\listoverride\listid8\listoverridecount0\ls8}{\listoverride\listid9\listoverridecount0\ls9}{\listoverride\listid10\listoverridecount0\ls10}{\listoverride\listid11\listoverridecount0\ls11}{\listoverride\listid12\listoverridecount0\ls12}{\listoverride\listid13\listoverridecount0\ls13}{\listoverride\listid14\listoverridecount0\ls14}{\listoverride\listid15\listoverridecount0\ls15}{\listoverride\listid16\listoverridecount0\ls16}{\listoverride\listid17\listoverridecount0\ls17}{\listoverride\listid18\listoverridecount0\ls18}{\listoverride\listid19\listoverridecount0\ls19}{\listoverride\listid20\listoverridecount0\ls20}{\listoverride\listid21\listoverridecount0\ls21}{\listoverride\listid22\listoverridecount0\ls22}{\listoverride\listid23\listoverridecount0\ls23}{\listoverride\listid24\listoverridecount0\ls24}{\listoverride\listid25\listoverridecount0\ls25}{\listoverride\listid26\listoverridecount0\ls26}{\listoverride\listid27\listoverridecount0\ls27}{\listoverride\listid28\listoverridecount0\ls28}{\listoverride\listid29\listoverridecount0\ls29}{\listoverride\listid30\listoverridecount0\ls30}{\listoverride\listid31\listoverridecount0\ls31}{\listoverride\listid32\listoverridecount0\ls32}{\listoverride\listid33\listoverridecount0\ls33}{\listoverride\listid34\listoverridecount0\ls34}{\listoverride\listid35\listoverridecount0\ls35}{\listoverride\listid36\listoverridecount0\ls36}{\listoverride\listid37\listoverridecount0\ls37}{\listoverride\listid38\listoverridecount0\ls38}{\listoverride\listid39\listoverridecount0\ls39}{\listoverride\listid40\listoverridecount0\ls40}{\listoverride\listid41\listoverridecount0\ls41}{\listoverride\listid42\listoverridecount0\ls42}{\listoverride\listid43\listoverridecount0\ls43}{\listoverride\listid44\listoverridecount0\ls44}{\listoverride\listid45\listoverridecount0\ls45}{\listoverride\listid46\listoverridecount0\ls46}{\listoverride\listid47\listoverridecount0\ls47}}{\info{\creatim\yr2010\mo9\dy23\hr20\min59}{\author C\u233\'3fdric Bosdonnat}{\revtim\yr2010\mo10\dy13\hr20\min7}{\printim\yr0\mo0\dy0\hr0\min0}{\comment LibreOffice}{\vern3300}}\deftab709
+
 {\*\pgdsctbl
-{\pgdsc0\pgdscuse195\pgwsxn12240\pghsxn15840\marglsxn1800\margrsxn1800\margtsxn1440\margbsxn1440\pgdscnxt0 Standard;}}
-{\*\pgdscno0}\paperh15840\paperw12240\margl1800\margr1800\margt1440\margb1440\sectd\sbknone\pgwsxn12240\pghsxn15840\marglsxn1800\margrsxn1800\margtsxn1440\margbsxn1440\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
-\pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ai\ab\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\i\b\loch\f1\fs24\lang1033\i\b {\rtlch \ltrch\loch\f1\fs24\lang1033\i\b License}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\sa283\rtlch\af4\afs24\lang255\ltrch\dbch\af4\langfe255\hich\f4\fs24\lang1033\loch\f4\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 This product is made available subject to the terms of GNU Lesser General Public License Version 3. A copy of the LGPL license can be found at http://www.openoffice.org/license.html}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\rtlch\af4\afs12\lang255\ltrch\dbch\af4\langfe255\hich\f4\fs12\lang1033\loch\f4\fs12\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\sa283\rtlch\af4\afs24\lang255\ltrch\dbch\af4\langfe255\hich\f4\fs24\lang1033\loch\f4\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Third Party Code. Additional copyright notices and license terms applicable to portions of the Software are set forth in the THIRDPARTYLICENSEREADME.html file.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\rtlch\af4\afs12\lang255\ltrch\dbch\af4\langfe255\hich\f4\fs12\lang1033\loch\f4\fs12\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\sa283\rtlch\af4\afs24\lang255\ltrch\dbch\af4\langfe255\hich\f4\fs24\lang1033\loch\f4\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 All trademarks and registered trademarks mentioned herein are the property of their respective owners.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\rtlch\af4\afs12\lang255\ltrch\dbch\af4\langfe255\hich\f4\fs12\lang1033\loch\f4\fs12\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\sa283\rtlch\af4\afs24\lang255\ltrch\dbch\af4\langfe255\hich\f4\fs24\lang1033\loch\f4\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Copyright \'a9 2000,2010 Oracle and/or its affiliates.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\sa283\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033{\rtlch \ltrch\loch\f1\fs24\lang1033\i0\b0{\cf1\rtlch\ltrch\dbch\hich\f4\loch\f4 This product has been created with contributions from the OpenOffice.org community, of which Oracle is a principal member. OpenOffice.org acknowledges all community members, especially those mentioned at}}{\rtlch \ltrch\loch\f1\fs24\lang1033\i0\b0{\cf2\ul\ulc0\rtlch\ltrch\dbch\hich\f4\loch\f4  }{\rtlch\ltrch\dbch\hich\f4\loch\f4 http://www.openoffice.org/welcome/credits.html}}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\sa283\rtlch\af4\afs24\lang255\ltrch\dbch\af4\langfe255\hich\f4\fs24\lang1033\loch\f4\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 GNU LESSER GENERAL PUBLIC LICENSE}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Version 3, 29 June 2007}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 This version of the GNU Lesser General Public License incorporates the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 0. Additional Definitions.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 As used herein, \'93this License\'94 refers to version 3 of the GNU Lesser General Public License, and the \'93GNU GPL\'94 refers to version 3 of the GNU General Public License.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch \'93}{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 The Library\'94 refers to a covered work governed by this License, other than an Application or a Combined Work as defined below.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 An \'93Application\'94 is any work that makes use of an interface provided by the Library, but which is not otherwise based on the Library. Defining a subclass of a class defined by the Library is deemed a mode of using an interface provided by the Library.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 A \'93Combined Work\'94 is a work produced by combining or linking an Application with the Library. The particular version of the Library with which the Combined Work was made is also called the \'93Linked Version\'94.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 The \'93Minimal Corresponding Source\'94 for a Combined Work means the Corresponding Source for the Combined Work, excluding any source code for portions of the Combined Work that, considered in isolation, are based on the Application, and not on the Linked Vers
-ion.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 The \'93Corresponding Application Code\'94 for a Combined Work means the object code and/or source code for the Application, including any data and utility programs needed for reproducing the Combined Work from the Application, but excluding the System Libraries
- of the Combined Work.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 1. Exception to Section 3 of the GNU GPL.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 You may convey a covered work under sections 3 and 4 of this License without being bound by section 3 of the GNU GPL.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 2. Conveying Modified Versions.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 If you modify a copy of the Library, and, in your modifications, a facility refers to a function or data to be supplied by an Application that uses the facility (other than as an argument passed when the facility is invoked), then you may convey a copy of 
-the modified version:}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 * a) under this License, provided that you make a good faith effort to ensure that, in the event an Application does not supply the function or data, the facility still operates, and performs whatever part of its purpose remains meaningful, or}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 * b) under the GNU GPL, with none of the additional permissions of this License applicable to that copy.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 3. Object Code Incorporating Material from Library Header Files.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 The object code form of an Application may incorporate material from a header file that is part of the Library. You may convey such object code under terms of your choice, provided that, if the incorporated material is not limited to numerical parameters, 
-data structure layouts and accessors, or small macros, inline functions and templates (ten or fewer lines in length), you do both of the following:}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 * a) Give prominent notice with each copy of the object code that the Library is used in it and that the Library and its use are covered by this License.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 * b) Accompany the object code with a copy of the GNU GPL and this license document.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 4. Combined Works.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 You may convey a Combined Work under terms of your choice that, taken together, effectively do not restrict modification of the portions of the Library contained in the Combined Work and reverse engineering for debugging such modifications, if you also do 
-each of the following:}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 * a) Give prominent notice with each copy of the Combined Work that the Library is used in it and that the Library and its use are covered by this License.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 * b) Accompany the Combined Work with a copy of the GNU GPL and this license document.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 * c) For a Combined Work that displays copyright notices during execution, include the copyright notice for the Library among these notices, as well as a reference directing the user to the copies of the GNU GPL and this license document.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 * d) Do one of the following:}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch           }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 o 0) Convey the Minimal Corresponding Source under the terms of this License, and the Corresponding Application Code in a form suitable for, and under terms that permit, the user to recombine or relink the Application with a modified version of t
-he Linked Version to produce a modified Combined Work, in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch           }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 o 1) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (a) uses at run time a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified ve
-rsion of the Library that is interface-compatible with the Linked Version.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 * e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the GNU GPL, and only to the extent that such information is necessary to install and execute a modified version of the Co
-mbined Work produced by recombining or relinking the Application with a modified version of the Linked Version. (If you use option 4d0, the Installation Information must accompany the Minimal Corresponding Source and Corresponding Application Code. If you 
-use option 4d1, you must provide the Installation Information in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.)}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 5. Combined Libraries.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 You may place library facilities that are a work based on the Library side by side in a single library together with other library facilities that are not Applications and are not covered by this License, and convey such a combined library under terms of y
-our choice, if you do both of the following:}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 * a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities, conveyed under the terms of this License.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 * b) Give prominent notice with the combined library that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 6. Revised Versions of the GNU Lesser General Public License.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 The Free Software Foundation may publish revised and/or new versions of the GNU Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concern
-s.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Each version is given a distinguishing version number. If the Library as you received it specifies that a certain numbered version of the GNU Lesser General Public License \'93or any later version\'94 applies to it, you have the option of following the terms and
- conditions either of that published version or of any later version published by the Free Software Foundation. If the Library as you received it does not specify a version number of the GNU Lesser General Public License, you may choose any version of the 
-GNU Lesser General Public License ever published by the Free Software Foundation.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 If the Library as you received it specifies that a proxy can decide whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that v
-ersion for the Library.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 GNU GENERAL PUBLIC LICENSE}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Version 3, 29 June 2007}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Copyright \'a9 2007 Free Software Foundation, Inc. <http://fsf.org/>}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Preamble}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 The GNU General Public License is a free, copyleft license for software and other kinds of works.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--
-to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, t
-oo.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or
- can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect t
-he freedom of others.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them thes
-e terms so they know their rights.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attr
-ibuted erroneously to authors of previous versions.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The sy
-stematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise 
-substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to
- a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 The precise terms and conditions for copying, distribution and modification follow.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 TERMS AND CONDITIONS}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 0. Definitions.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch \'93}{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 This License\'94 refers to version 3 of the GNU General Public License.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch \'93}{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Copyright\'94 also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch \'93}{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 The Program\'94 refers to any copyrightable work licensed under this License. Each licensee is addressed as \'93you\'94. \'93Licensees\'94 and \'93recipients\'94 may be individuals or organizations.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 To \'93modify\'94 a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a \'93modified version\'94 of the earlier work or a work \'93based on\'94 the earli
-er work.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 A \'93covered work\'94 means either the unmodified Program or a work based on the Program.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 To \'93propagate\'94 a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes 
-copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 To \'93convey\'94 a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 An interactive user interface displays \'93Appropriate Legal Notices\'94 to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work 
-(except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list m
-eets this criterion.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 1. Source Code.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 The \'93source code\'94 for a work means the preferred form of the work for making modifications to it. \'93Object code\'94 means any non-source form of a work.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 A \'93Standard Interface\'94 means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that la
-nguage.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 The \'93System Libraries\'94 of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the w
-ork with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A \'93Major Component\'94, in this context, means a major essential component (kernel, window system, and so on) of th
-e specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 The \'93Corresponding Source\'94 for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not in
-clude the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition fi
-les associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms a
-nd other parts of the work.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 The Corresponding Source for a work in source code form is that same work.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 2. Basic Permissions.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from
- running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, 
-or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively 
-on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 3. Protecting Users' Legal Rights From Anti-Circumvention Law.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention o
-f such measures.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intentio
-n to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 4. Conveying Verbatim Copies.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any 
-non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 5. Conveying Modified Source Versions.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 * a) The work must carry prominent notices stating that you modified it, and giving a relevant date.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 * b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to \'93keep intact all notices\'94.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 * c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, r
-egardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 * d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution med
-ium, is called an \'93aggregate\'94 if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause thi
-s License to apply to the other parts of the aggregate.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 6. Conveying Non-Source Forms.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 * a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 * b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that pr
-oduct model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price
- no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 * c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in ac
-cord with subsection 6b.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 * d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to cop
-y the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided 
-you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requir
-ements.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 * e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 A \'93User Product\'94 is either (1) a \'93consumer product\'94, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a
- product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, \'93normally used\'94 refers to a typical or common use of that class of product, regardless of the status of the parti
-cular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such u
-ses represent the only significant mode of use of the product.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch \'93}{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Installation Information\'94 for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Sour
-ce. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in 
-perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third 
-party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been mo
-dified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password
- or key for unpacking, reading or copying.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 7. Additional Terms.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch \'93}{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Additional permissions\'94 are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this Lic
-ense, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to t
-he additional permissions.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You m
-ay place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 * a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 * b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 * c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 * d) Limiting the use for publicity purposes of names of licensors or authors of the material; or}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 * e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 * f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions di
-rectly impose on those licensors and authors.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 All other non-permissive additional terms are considered \'93further restrictions\'94 within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is 
-a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided t
-hat the further restriction does not survive such relicensing or conveying.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 8. Termination.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted 
-under the third paragraph of section 11).}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the cop
-yright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) 
-from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new l
-icenses for the same material under section 10.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 9. Acceptance Not Required for Having Copies.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptanc
-e. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptan
-ce of this License to do so.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 10. Automatic Licensing of Downstream Recipients.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this Li
-cense.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 An \'93entity transaction\'94 is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party 
-to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the 
-predecessor in interest, if the predecessor has it or can get it with reasonable efforts.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not ini
-tiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 11. Patents.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 A \'93contributor\'94 is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's \'93contributor version\'94.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 A contributor's \'93essential patent claims\'94 are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its cont
-ributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, \'93control\'94 includes the right to grant patent sublicenses in a manner consistent wi
-th the requirements of this License.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.
-}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 In the following three paragraphs, a \'93patent license\'94 is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To \'93grant\'94 such 
-a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other read
-ily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements
- of this License, to extend the patent license to downstream recipients. \'93Knowingly relying\'94 means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a co
-untry, would infringe one or more identifiable patents in that country that you have reason to believe are valid.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate,
- modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 A patent license is \'93discriminatory\'94 if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey
- a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third 
-party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection wi
-th specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 12. No Surrender of Others' Freedom.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneousl
-y your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the
- Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 13. Use with the GNU Affero General Public License.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The te
-rms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 14. Revised Versions of this License.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License \'93or any later version\'94 applies to it, you have the option of following the terms and conditions either of that
- numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 15. Disclaimer of Warranty.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \'93AS IS\'94 WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLU
-DING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY
- SERVICING, REPAIR OR CORRECTION.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 16. Limitation of Liability.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONS
-EQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS
-), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 17. Interpretation of Sections 15 and 16.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connect
-ion with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 {\rtlch \ltrch\loch\f4\fs24\lang1033\i0\b0 END OF TERMS AND CONDITIONS}
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\rtlch\af4\afs12\lang255\ltrch\dbch\af4\langfe255\hich\f4\fs12\lang1033\loch\f4\fs12\lang1033 
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs24\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs24\lang1033\loch\f1\fs24\lang1033 
+{\pgdsc0\pgdscuse195\pgwsxn12240\pghsxn15840\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\pgdscnxt0 Default;}
+{\pgdsc1\pgdscuse195\pgndec\pgwsxn12240\pghsxn15840\marglsxn1134\margrsxn567\margtsxn567\margbsxn567\pgdscnxt1 HTML;}}
+\formshade{\*\pgdscno1}\paperh15840\paperw12240\margl1134\margr567\margt567\margb567\sectd\sbknone\sectunlocked1\pgndec\pgwsxn12240\pghsxn15840\marglsxn1134\margrsxn567\margtsxn567\margbsxn567\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
+\pgndec\pard\plain \s1\b\hich\af11\dbch\af14\afs48\ab\loch\f7\fs48\sb240\sa120{\rtlch \ltrch\loch
+Licensing and Legal information}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+This product is made available subject to the terms of GNU Lesser General Public License Version 3. A copy of the LGPL license can be found at }{{\field{\*\fldinst HYPERLINK "http://www.gnu.org/licenses/lgpl-3.0.html" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+http://www.gnu.org/licenses/lgpl-3.0.html}}}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+Third Party Code Additional copyright notices and license terms applicable to portions of the Software are set forth in the THIRDPARTYLICENSEREADME.html file, and can be found at the bottom of this document.}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+All trademarks and registered trademarks mentioned herein are the property of their respective owners.}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+Copyright (c) 2000, 2010 Oracle, and/or its affiliates. All rights reserved.}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+This product has been created by }{\i\ai\rtlch \ltrch\loch
+The Document Foundation}{\rtlch \ltrch\loch
+, }{{\*\bkmkstart __DdeLink__10004_1789331624}\rtlch \ltrch\loch
+incorporating many modifications from different contributors, see }{{\field{\*\fldinst HYPERLINK "http://www.libreoffice.org/" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+http://www.libreoffice.org/}{{\*\bkmkend __DdeLink__10004_1789331624}\rtlch \ltrch\loch
+}} for more details.}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120\qc{\b\ab\rtlch \ltrch\loch
+- DO NOT TRANSLATE OR LOCALIZE THIS DOCUMENT -}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch
+                   }{\rtlch \ltrch\loch
+GNU LESSER GENERAL PUBLIC LICENSE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\b\ab\rtlch \ltrch
+                       }{\b\ab\rtlch \ltrch\loch
+Version 3, 29 June 2007}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\b\ab\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+Copyright (C) 2007 Free Software Foundation, Inc. }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+Everyone is permitted to copy and distribute verbatim copies}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+of this license document, but changing it is not allowed.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+This version of the GNU Lesser General Public License incorporates}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the terms and conditions of version 3 of the GNU General Public}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License, supplemented by the additional permissions listed below.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+0. Additional Definitions. }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+As used herein, "this License" refers to version 3 of the GNU Lesser}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+General Public License, and the "GNU GPL" refers to version 3 of the GNU}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+General Public License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+"The Library" refers to a covered work governed by this License,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+other than an Application or a Combined Work as defined below.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+An "Application" is any work that makes use of an interface provided}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+by the Library, but which is not otherwise based on the Library.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Defining a subclass of a class defined by the Library is deemed a mode}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of using an interface provided by the Library.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+A "Combined Work" is a work produced by combining or linking an}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Application with the Library.  The particular version of the Library}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+with which the Combined Work was made is also called the "Linked}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Version".}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+The "Minimal Corresponding Source" for a Combined Work means the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Corresponding Source for the Combined Work, excluding any source code}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+for portions of the Combined Work that, considered in isolation, are}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+based on the Application, and not on the Linked Version.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+The "Corresponding Application Code" for a Combined Work means the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+object code and/or source code for the Application, including any data}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+and utility programs needed for reproducing the Combined Work from the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Application, but excluding the System Libraries of the Combined Work.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+1. Exception to Section 3 of the GNU GPL.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+You may convey a covered work under sections 3 and 4 of this License}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+without being bound by section 3 of the GNU GPL.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+2. Conveying Modified Versions.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+If you modify a copy of the Library, and, in your modifications, a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+facility refers to a function or data to be supplied by an Application}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+that uses the facility (other than as an argument passed when the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+facility is invoked), then you may convey a copy of the modified}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+version:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+a) under this License, provided that you make a good faith effort to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+ensure that, in the event an Application does not supply the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+function or data, the facility still operates, and performs}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+whatever part of its purpose remains meaningful, or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+b) under the GNU GPL, with none of the additional permissions of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+this License applicable to that copy.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+3. Object Code Incorporating Material from Library Header Files.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+The object code form of an Application may incorporate material from}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+a header file that is part of the Library.  You may convey such object}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+code under terms of your choice, provided that, if the incorporated}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+material is not limited to numerical parameters, data structure}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+layouts and accessors, or small macros, inline functions and templates}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+(ten or fewer lines in length), you do both of the following:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+a) Give prominent notice with each copy of the object code that the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+Library is used in it and that the Library and its use are}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+covered by this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+b) Accompany the object code with a copy of the GNU GPL and this license}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+document.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+4. Combined Works.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+You may convey a Combined Work under terms of your choice that,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+taken together, effectively do not restrict modification of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+portions of the Library contained in the Combined Work and reverse}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+engineering for debugging such modifications, if you also do each of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the following:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+a) Give prominent notice with each copy of the Combined Work that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+the Library is used in it and that the Library and its use are}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+covered by this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+b) Accompany the Combined Work with a copy of the GNU GPL and this license}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+document.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+c) For a Combined Work that displays copyright notices during}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+execution, include the copyright notice for the Library among}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+these notices, as well as a reference directing the user to the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+copies of the GNU GPL and this license document.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+d) Do one of the following:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+       }{\rtlch \ltrch\loch
+0) Convey the Minimal Corresponding Source under the terms of this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+       }{\rtlch \ltrch\loch
+License, and the Corresponding Application Code in a form}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+       }{\rtlch \ltrch\loch
+suitable for, and under terms that permit, the user to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+       }{\rtlch \ltrch\loch
+recombine or relink the Application with a modified version of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+       }{\rtlch \ltrch\loch
+the Linked Version to produce a modified Combined Work, in the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+       }{\rtlch \ltrch\loch
+manner specified by section 6 of the GNU GPL for conveying}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+       }{\rtlch \ltrch\loch
+Corresponding Source.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+       }{\rtlch \ltrch\loch
+1) Use a suitable shared library mechanism for linking with the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+       }{\rtlch \ltrch\loch
+Library.  A suitable mechanism is one that (a) uses at run time}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+       }{\rtlch \ltrch\loch
+a copy of the Library already present on the user's computer}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+       }{\rtlch \ltrch\loch
+system, and (b) will operate properly with a modified version}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+       }{\rtlch \ltrch\loch
+of the Library that is interface-compatible with the Linked}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+       }{\rtlch \ltrch\loch
+Version. }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+e) Provide Installation Information, but only if you would otherwise}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+be required to provide such information under section 6 of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+GNU GPL, and only to the extent that such information is}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+necessary to install and execute a modified version of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+Combined Work produced by recombining or relinking the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+Application with a modified version of the Linked Version. (If}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+you use option 4d0, the Installation Information must accompany}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+the Minimal Corresponding Source and Corresponding Application}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+Code. If you use option 4d1, you must provide the Installation}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+Information in the manner specified by section 6 of the GNU GPL}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+for conveying Corresponding Source.)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+5. Combined Libraries.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+You may place library facilities that are a work based on the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Library side by side in a single library together with other library}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+facilities that are not Applications and are not covered by this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License, and convey such a combined library under terms of your}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+choice, if you do both of the following:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+a) Accompany the combined library with a copy of the same work based}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+on the Library, uncombined with any other library facilities,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+conveyed under the terms of this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+b) Give prominent notice with the combined library that part of it}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+is a work based on the Library, and explaining where to find the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+accompanying uncombined form of the same work.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+6. Revised Versions of the GNU Lesser General Public License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+The Free Software Foundation may publish revised and/or new versions}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of the GNU Lesser General Public License from time to time. Such new}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+versions will be similar in spirit to the present version, but may}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+differ in detail to address new problems or concerns.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+Each version is given a distinguishing version number. If the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Library as you received it specifies that a certain numbered version}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of the GNU Lesser General Public License "or any later version"}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+applies to it, you have the option of following the terms and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+conditions either of that published version or of any later version}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+published by the Free Software Foundation. If the Library as you}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+received it does not specify a version number of the GNU Lesser}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+General Public License, you may choose any version of the GNU Lesser}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+General Public License ever published by the Free Software Foundation.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+If the Library as you received it specifies that a proxy can decide}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+whether future versions of the GNU Lesser General Public License shall}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+apply, that proxy's public statement of acceptance of any version is}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+permanent authorization for you to choose that version for the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Library.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch
+                    }{\rtlch \ltrch\loch
+GNU GENERAL PUBLIC LICENSE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\b\ab\rtlch \ltrch
+                       }{\b\ab\rtlch \ltrch\loch
+Version 3, 29 June 2007}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\b\ab\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+Copyright (C) 2007 Free Software Foundation, Inc. }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+Everyone is permitted to copy and distribute verbatim copies}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+of this license document, but changing it is not allowed.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+                            }{\rtlch \ltrch\loch
+Preamble}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+The GNU General Public License is a free, copyleft license for}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+software and other kinds of works.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+The licenses for most software and other practical works are designed}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+to take away your freedom to share and change the works.  By contrast,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the GNU General Public License is intended to guarantee your freedom to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+share and change all versions of a program--to make sure it remains free}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+software for all its users.  We, the Free Software Foundation, use the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+GNU General Public License for most of our software; it applies also to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+any other work released this way by its authors.  You can apply it to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+your programs, too.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+When we speak of free software, we are referring to freedom, not}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+price.  Our General Public Licenses are designed to make sure that you}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+have the freedom to distribute copies of free software (and charge for}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+them if you wish), that you receive source code or can get it if you}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+want it, that you can change the software or use pieces of it in new}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+free programs, and that you know you can do these things.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+To protect your rights, we need to prevent others from denying you}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+these rights or asking you to surrender the rights.  Therefore, you have}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+certain responsibilities if you distribute copies of the software, or if}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+you modify it: responsibilities to respect the freedom of others.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+For example, if you distribute copies of such a program, whether}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+gratis or for a fee, you must pass on to the recipients the same}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+freedoms that you received.  You must make sure that they, too, receive}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+or can get the source code.  And you must show them these terms so they}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+know their rights.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+Developers that use the GNU GPL protect your rights with two steps:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+(1) assert copyright on the software, and (2) offer you this License}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+giving you legal permission to copy, distribute and/or modify it.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+For the developers' and authors' protection, the GPL clearly explains}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+that there is no warranty for this free software.  For both users' and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+authors' sake, the GPL requires that modified versions be marked as}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+changed, so that their problems will not be attributed erroneously to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+authors of previous versions.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+Some devices are designed to deny users access to install or run}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+modified versions of the software inside them, although the manufacturer}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+can do so.  This is fundamentally incompatible with the aim of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+protecting users' freedom to change the software.  The systematic}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+pattern of such abuse occurs in the area of products for individuals to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+use, which is precisely where it is most unacceptable.  Therefore, we}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+have designed this version of the GPL to prohibit the practice for those}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+products.  If such problems arise substantially in other domains, we}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+stand ready to extend this provision to those domains in future versions}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of the GPL, as needed to protect the freedom of users.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+Finally, every program is threatened constantly by software patents.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+States should not allow patents to restrict development and use of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+software on general-purpose computers, but in those that do, we wish to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+avoid the special danger that patents applied to a free program could}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+make it effectively proprietary.  To prevent this, the GPL assures that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+patents cannot be used to render the program non-free.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+The precise terms and conditions for copying, distribution and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+modification follow.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+                       }{\rtlch \ltrch\loch
+TERMS AND CONDITIONS}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+0. Definitions.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+"This License" refers to version 3 of the GNU General Public License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+"Copyright" also means copyright-like laws that apply to other kinds of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+works, such as semiconductor masks.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+"The Program" refers to any copyrightable work licensed under this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License.  Each licensee is addressed as "you".  "Licensees" and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+"recipients" may be individuals or organizations.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+To "modify" a work means to copy from or adapt all or part of the work}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+in a fashion requiring copyright permission, other than the making of an}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+exact copy.  The resulting work is called a "modified version" of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+earlier work or a work "based on" the earlier work.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+A "covered work" means either the unmodified Program or a work based}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+on the Program.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+To "propagate" a work means to do anything with it that, without}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+permission, would make you directly or secondarily liable for}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+infringement under applicable copyright law, except executing it on a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+computer or modifying a private copy.  Propagation includes copying,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distribution (with or without modification), making available to the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+public, and in some countries other activities as well.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+To "convey" a work means any kind of propagation that enables other}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+parties to make or receive copies.  Mere interaction with a user through}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+a computer network, with no transfer of a copy, is not conveying.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+An interactive user interface displays "Appropriate Legal Notices"}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+to the extent that it includes a convenient and prominently visible}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+feature that (1) displays an appropriate copyright notice, and (2)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+tells the user that there is no warranty for the work (except to the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+extent that warranties are provided), that licensees may convey the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+work under this License, and how to view a copy of this License.  If}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the interface presents a list of user commands or options, such as a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+menu, a prominent item in the list meets this criterion.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+1. Source Code.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+The "source code" for a work means the preferred form of the work}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+for making modifications to it.  "Object code" means any non-source}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+form of a work.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+A "Standard Interface" means an interface that either is an official}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+standard defined by a recognized standards body, or, in the case of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+interfaces specified for a particular programming language, one that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+is widely used among developers working in that language.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+The "System Libraries" of an executable work include anything, other}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+than the work as a whole, that (a) is included in the normal form of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+packaging a Major Component, but which is not part of that Major}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Component, and (b) serves only to enable use of the work with that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Major Component, or to implement a Standard Interface for which an}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+implementation is available to the public in source code form.  A}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+"Major Component", in this context, means a major essential component}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+(kernel, window system, and so on) of the specific operating system}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+(if any) on which the executable work runs, or a compiler used to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+produce the work, or an object code interpreter used to run it.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+The "Corresponding Source" for a work in object code form means all}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the source code needed to generate, install, and (for an executable}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+work) run the object code and to modify the work, including scripts to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+control those activities.  However, it does not include the work's}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+System Libraries, or general-purpose tools or generally available free}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+programs which are used unmodified in performing those activities but}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+which are not part of the work.  For example, Corresponding Source}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+includes interface definition files associated with source files for}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the work, and the source code for shared libraries and dynamically}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+linked subprograms that the work is specifically designed to require,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+such as by intimate data communication or control flow between those}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+subprograms and other parts of the work.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+The Corresponding Source need not include anything that users}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+can regenerate automatically from other parts of the Corresponding}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Source.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+The Corresponding Source for a work in source code form is that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+same work.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+2. Basic Permissions.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+All rights granted under this License are granted for the term of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+copyright on the Program, and are irrevocable provided the stated}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+conditions are met.  This License explicitly affirms your unlimited}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+permission to run the unmodified Program.  The output from running a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+covered work is covered by this License only if the output, given its}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+content, constitutes a covered work.  This License acknowledges your}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+rights of fair use or other equivalent, as provided by copyright law.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+You may make, run and propagate covered works that you do not}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+convey, without conditions so long as your license otherwise remains}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+in force.  You may convey covered works to others for the sole purpose}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of having them make modifications exclusively for you, or provide you}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+with facilities for running those works, provided that you comply with}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the terms of this License in conveying all material for which you do}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+not control copyright.  Those thus making or running the covered works}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+for you must do so exclusively on your behalf, under your direction}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+and control, on terms that prohibit them from making any copies of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+your copyrighted material outside their relationship with you.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+Conveying under any other circumstances is permitted solely under}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the conditions stated below.  Sublicensing is not allowed; section 10}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+makes it unnecessary.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+No covered work shall be deemed part of an effective technological}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+measure under any applicable law fulfilling obligations under article}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+11 of the WIPO copyright treaty adopted on 20 December 1996, or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+similar laws prohibiting or restricting circumvention of such}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+measures.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+When you convey a covered work, you waive any legal power to forbid}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+circumvention of technological measures to the extent such circumvention}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+is effected by exercising rights under this License with respect to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the covered work, and you disclaim any intention to limit operation or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+modification of the work as a means of enforcing, against the work's}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+users, your or third parties' legal rights to forbid circumvention of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+technological measures.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+4. Conveying Verbatim Copies.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+You may convey verbatim copies of the Program's source code as you}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+receive it, in any medium, provided that you conspicuously and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+appropriately publish on each copy an appropriate copyright notice;}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+keep intact all notices stating that this License and any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+non-permissive terms added in accord with section 7 apply to the code;}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+keep intact all notices of the absence of any warranty; and give all}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+recipients a copy of this License along with the Program.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+You may charge any price or no price for each copy that you convey,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+and you may offer support or warranty protection for a fee.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+5. Conveying Modified Source Versions.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+You may convey a work based on the Program, or the modifications to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+produce it from the Program, in the form of source code under the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+terms of section 4, provided that you also meet all of these conditions:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+a) The work must carry prominent notices stating that you modified}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+it, and giving a relevant date.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+b) The work must carry prominent notices stating that it is}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+released under this License and any conditions added under section}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+7.  This requirement modifies the requirement in section 4 to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+"keep intact all notices".}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+c) You must license the entire work, as a whole, under this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+License to anyone who comes into possession of a copy.  This}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+License will therefore apply, along with any applicable section 7}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+additional terms, to the whole of the work, and all its parts,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+regardless of how they are packaged.  This License gives no}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+permission to license the work in any other way, but it does not}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+invalidate such permission if you have separately received it.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+d) If the work has interactive user interfaces, each must display}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+Appropriate Legal Notices; however, if the Program has interactive}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+interfaces that do not display Appropriate Legal Notices, your}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+work need not make them do so.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+A compilation of a covered work with other separate and independent}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+works, which are not by their nature extensions of the covered work,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+and which are not combined with it such as to form a larger program,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+in or on a volume of a storage or distribution medium, is called an}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+"aggregate" if the compilation and its resulting copyright are not}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+used to limit the access or legal rights of the compilation's users}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+beyond what the individual works permit.  Inclusion of a covered work}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+in an aggregate does not cause this License to apply to the other}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+parts of the aggregate.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+6. Conveying Non-Source Forms.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+You may convey a covered work in object code form under the terms}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of sections 4 and 5, provided that you also convey the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+machine-readable Corresponding Source under the terms of this License,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+in one of these ways:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+a) Convey the object code in, or embodied in, a physical product}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+(including a physical distribution medium), accompanied by the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+Corresponding Source fixed on a durable physical medium}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+customarily used for software interchange.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+b) Convey the object code in, or embodied in, a physical product}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+(including a physical distribution medium), accompanied by a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+written offer, valid for at least three years and valid for as}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+long as you offer spare parts or customer support for that product}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+model, to give anyone who possesses the object code either (1) a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+copy of the Corresponding Source for all the software in the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+product that is covered by this License, on a durable physical}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+medium customarily used for software interchange, for a price no}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+more than your reasonable cost of physically performing this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+conveying of source, or (2) access to copy the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+Corresponding Source from a network server at no charge.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+c) Convey individual copies of the object code with a copy of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+written offer to provide the Corresponding Source.  This}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+alternative is allowed only occasionally and noncommercially, and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+only if you received the object code with such an offer, in accord}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+with subsection 6b.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+d) Convey the object code by offering access from a designated}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+place (gratis or for a charge), and offer equivalent access to the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+Corresponding Source in the same way through the same place at no}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+further charge.  You need not require recipients to copy the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+Corresponding Source along with the object code.  If the place to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+copy the object code is a network server, the Corresponding Source}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+may be on a different server (operated by you or a third party)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+that supports equivalent copying facilities, provided you maintain}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+clear directions next to the object code saying where to find the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+Corresponding Source.  Regardless of what server hosts the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+Corresponding Source, you remain obligated to ensure that it is}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+available for as long as needed to satisfy these requirements.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+e) Convey the object code using peer-to-peer transmission, provided}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+you inform other peers where the object code and Corresponding}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+Source of the work are being offered to the general public at no}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+charge under subsection 6d.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+A separable portion of the object code, whose source code is excluded}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+from the Corresponding Source as a System Library, need not be}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+included in conveying the object code work.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+A "User Product" is either (1) a "consumer product", which means any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+tangible personal property which is normally used for personal, family,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+or household purposes, or (2) anything designed or sold for incorporation}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+into a dwelling.  In determining whether a product is a consumer product,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+doubtful cases shall be resolved in favor of coverage.  For a particular}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+product received by a particular user, "normally used" refers to a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+typical or common use of that class of product, regardless of the status}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of the particular user or of the way in which the particular user}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+actually uses, or expects or is expected to use, the product.  A product}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+is a consumer product regardless of whether the product has substantial}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+commercial, industrial or non-consumer uses, unless such uses represent}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the only significant mode of use of the product.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+"Installation Information" for a User Product means any methods,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+procedures, authorization keys, or other information required to install}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+and execute modified versions of a covered work in that User Product from}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+a modified version of its Corresponding Source.  The information must}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+suffice to ensure that the continued functioning of the modified object}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+code is in no case prevented or interfered with solely because}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+modification has been made.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+If you convey an object code work under this section in, or with, or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+specifically for use in, a User Product, and the conveying occurs as}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+part of a transaction in which the right of possession and use of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+User Product is transferred to the recipient in perpetuity or for a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+fixed term (regardless of how the transaction is characterized), the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Corresponding Source conveyed under this section must be accompanied}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+by the Installation Information.  But this requirement does not apply}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+if neither you nor any third party retains the ability to install}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+modified object code on the User Product (for example, the work has}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+been installed in ROM).}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+The requirement to provide Installation Information does not include a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+requirement to continue to provide support service, warranty, or updates}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+for a work that has been modified or installed by the recipient, or for}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the User Product in which it has been modified or installed.  Access to a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+network may be denied when the modification itself materially and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+adversely affects the operation of the network or violates the rules and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+protocols for communication across the network.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+Corresponding Source conveyed, and Installation Information provided,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+in accord with this section must be in a format that is publicly}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+documented (and with an implementation available to the public in}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+source code form), and must require no special password or key for}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+unpacking, reading or copying.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+7. Additional Terms.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+"Additional permissions" are terms that supplement the terms of this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License by making exceptions from one or more of its conditions.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Additional permissions that are applicable to the entire Program shall}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+be treated as though they were included in this License, to the extent}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+that they are valid under applicable law.  If additional permissions}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+apply only to part of the Program, that part may be used separately}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+under those permissions, but the entire Program remains governed by}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+this License without regard to the additional permissions.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+When you convey a copy of a covered work, you may at your option}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+remove any additional permissions from that copy, or from any part of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+it.  (Additional permissions may be written to require their own}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+removal in certain cases when you modify the work.)  You may place}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+additional permissions on material, added by you to a covered work,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+for which you have or can give appropriate copyright permission.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+Notwithstanding any other provision of this License, for material you}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+add to a covered work, you may (if authorized by the copyright holders of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+that material) supplement the terms of this License with terms:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+a) Disclaiming warranty or limiting liability differently from the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+terms of sections 15 and 16 of this License; or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+b) Requiring preservation of specified reasonable legal notices or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+author attributions in that material or in the Appropriate Legal}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+Notices displayed by works containing it; or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+c) Prohibiting misrepresentation of the origin of that material, or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+requiring that modified versions of such material be marked in}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+reasonable ways as different from the original version; or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+d) Limiting the use for publicity purposes of names of licensors or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+authors of the material; or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+e) Declining to grant rights under trademark law for use of some}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+trade names, trademarks, or service marks; or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+f) Requiring indemnification of licensors and authors of that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+material by anyone who conveys the material (or modified versions of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+it) with contractual assumptions of liability to the recipient, for}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+any liability that these contractual assumptions directly impose on}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+those licensors and authors.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+All other non-permissive additional terms are considered "further}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+restrictions" within the meaning of section 10.  If the Program as you}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+received it, or any part of it, contains a notice stating that it is}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+governed by this License along with a term that is a further}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+restriction, you may remove that term.  If a license document contains}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+a further restriction but permits relicensing or conveying under this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License, you may add to a covered work material governed by the terms}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of that license document, provided that the further restriction does}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+not survive such relicensing or conveying.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+If you add terms to a covered work in accord with this section, you}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+must place, in the relevant source files, a statement of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+additional terms that apply to those files, or a notice indicating}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+where to find the applicable terms.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+Additional terms, permissive or non-permissive, may be stated in the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+form of a separately written license, or stated as exceptions;}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the above requirements apply either way.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+8. Termination.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+You may not propagate or modify a covered work except as expressly}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+provided under this License.  Any attempt otherwise to propagate or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+modify it is void, and will automatically terminate your rights under}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+this License (including any patent licenses granted under the third}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+paragraph of section 11).}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+However, if you cease all violation of this License, then your}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+license from a particular copyright holder is reinstated (a)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+provisionally, unless and until the copyright holder explicitly and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+finally terminates your license, and (b) permanently, if the copyright}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+holder fails to notify you of the violation by some reasonable means}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+prior to 60 days after the cessation.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+Moreover, your license from a particular copyright holder is}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+reinstated permanently if the copyright holder notifies you of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+violation by some reasonable means, this is the first time you have}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+received notice of violation of this License (for any work) from that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+copyright holder, and you cure the violation prior to 30 days after}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+your receipt of the notice.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+Termination of your rights under this section does not terminate the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+licenses of parties who have received copies or rights from you under}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+this License.  If your rights have been terminated and not permanently}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+reinstated, you do not qualify to receive new licenses for the same}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+material under section 10.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+9. Acceptance Not Required for Having Copies.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+You are not required to accept this License in order to receive or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+run a copy of the Program.  Ancillary propagation of a covered work}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+occurring solely as a consequence of using peer-to-peer transmission}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+to receive a copy likewise does not require acceptance.  However,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+nothing other than this License grants you permission to propagate or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+modify any covered work.  These actions infringe copyright if you do}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+not accept this License.  Therefore, by modifying or propagating a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+covered work, you indicate your acceptance of this License to do so.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+10. Automatic Licensing of Downstream Recipients.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+Each time you convey a covered work, the recipient automatically}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+receives a license from the original licensors, to run, modify and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+propagate that work, subject to this License.  You are not responsible}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+for enforcing compliance by third parties with this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+An "entity transaction" is a transaction transferring control of an}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+organization, or substantially all assets of one, or subdividing an}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+organization, or merging organizations.  If propagation of a covered}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+work results from an entity transaction, each party to that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+transaction who receives a copy of the work also receives whatever}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+licenses to the work the party's predecessor in interest had or could}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+give under the previous paragraph, plus a right to possession of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Corresponding Source of the work from the predecessor in interest, if}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the predecessor has it or can get it with reasonable efforts.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+You may not impose any further restrictions on the exercise of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+rights granted or affirmed under this License.  For example, you may}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+not impose a license fee, royalty, or other charge for exercise of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+rights granted under this License, and you may not initiate litigation}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+(including a cross-claim or counterclaim in a lawsuit) alleging that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+any patent claim is infringed by making, using, selling, offering for}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+sale, or importing the Program or any portion of it.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+11. Patents.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+A "contributor" is a copyright holder who authorizes use under this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License of the Program or a work on which the Program is based.  The}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+work thus licensed is called the contributor's "contributor version".}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+A contributor's "essential patent claims" are all patent claims}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+owned or controlled by the contributor, whether already acquired or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+hereafter acquired, that would be infringed by some manner, permitted}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+by this License, of making, using, or selling its contributor version,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+but do not include claims that would be infringed only as a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+consequence of further modification of the contributor version.  For}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+purposes of this definition, "control" includes the right to grant}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+patent sublicenses in a manner consistent with the requirements of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+Each contributor grants you a non-exclusive, worldwide, royalty-free}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+patent license under the contributor's essential patent claims, to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+make, use, sell, offer for sale, import and otherwise run, modify and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+propagate the contents of its contributor version.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+In the following three paragraphs, a "patent license" is any express}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+agreement or commitment, however denominated, not to enforce a patent}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+(such as an express permission to practice a patent or covenant not to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+sue for patent infringement).  To "grant" such a patent license to a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+party means to make such an agreement or commitment not to enforce a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+patent against the party.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+If you convey a covered work, knowingly relying on a patent license,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+and the Corresponding Source of the work is not available for anyone}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+to copy, free of charge and under the terms of this License, through a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+publicly available network server or other readily accessible means,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+then you must either (1) cause the Corresponding Source to be so}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+available, or (2) arrange to deprive yourself of the benefit of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+patent license for this particular work, or (3) arrange, in a manner}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+consistent with the requirements of this License, to extend the patent}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+license to downstream recipients.  "Knowingly relying" means you have}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+actual knowledge that, but for the patent license, your conveying the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+covered work in a country, or your recipient's use of the covered work}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+in a country, would infringe one or more identifiable patents in that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+country that you have reason to believe are valid.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+If, pursuant to or in connection with a single transaction or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+arrangement, you convey, or propagate by procuring conveyance of, a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+covered work, and grant a patent license to some of the parties}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+receiving the covered work authorizing them to use, propagate, modify}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+or convey a specific copy of the covered work, then the patent license}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+you grant is automatically extended to all recipients of the covered}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+work and works based on it.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+A patent license is "discriminatory" if it does not include within}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the scope of its coverage, prohibits the exercise of, or is}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+conditioned on the non-exercise of one or more of the rights that are}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+specifically granted under this License.  You may not convey a covered}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+work if you are a party to an arrangement with a third party that is}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+in the business of distributing software, under which you make payment}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+to the third party based on the extent of your activity of conveying}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the work, and under which the third party grants, to any of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+parties who would receive the covered work from you, a discriminatory}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+patent license (a) in connection with copies of the covered work}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+conveyed by you (or copies made from those copies), or (b) primarily}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+for and in connection with specific products or compilations that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+contain the covered work, unless you entered into that arrangement,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+or that patent license was granted, prior to 28 March 2007.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+Nothing in this License shall be construed as excluding or limiting}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+any implied license or other defenses to infringement that may}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+otherwise be available to you under applicable patent law.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+12. No Surrender of Others' Freedom.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+If conditions are imposed on you (whether by court order, agreement or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+otherwise) that contradict the conditions of this License, they do not}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+excuse you from the conditions of this License.  If you cannot convey a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+covered work so as to satisfy simultaneously your obligations under this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License and any other pertinent obligations, then as a consequence you may}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+not convey it at all.  For example, if you agree to terms that obligate you}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+to collect a royalty for further conveying from those to whom you convey}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the Program, the only way you could satisfy both those terms and this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License would be to refrain entirely from conveying the Program.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+13. Use with the GNU Affero General Public License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+Notwithstanding any other provision of this License, you have}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+permission to link or combine any covered work with a work licensed}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+under version 3 of the GNU Affero General Public License into a single}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+combined work, and to convey the resulting work.  The terms of this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License will continue to apply to the part which is the covered work,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+but the special requirements of the GNU Affero General Public License,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+section 13, concerning interaction through a network will apply to the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+combination as such.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+14. Revised Versions of this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+The Free Software Foundation may publish revised and/or new versions of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the GNU General Public License from time to time.  Such new versions will}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+be similar in spirit to the present version, but may differ in detail to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+address new problems or concerns.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+Each version is given a distinguishing version number.  If the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Program specifies that a certain numbered version of the GNU General}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Public License "or any later version" applies to it, you have the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+option of following the terms and conditions either of that numbered}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+version or of any later version published by the Free Software}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Foundation.  If the Program does not specify a version number of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+GNU General Public License, you may choose any version ever published}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+by the Free Software Foundation.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+If the Program specifies that a proxy can decide which future}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+versions of the GNU General Public License can be used, that proxy's}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+public statement of acceptance of a version permanently authorizes you}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+to choose that version for the Program.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+Later license versions may give you additional or different}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+permissions.  However, no additional obligations are imposed on any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+author or copyright holder as a result of your choosing to follow a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+later version.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+15. Disclaimer of Warranty.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+16. Limitation of Liability.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+SUCH DAMAGES.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+17. Interpretation of Sections 15 and 16.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+If the disclaimer of warranty and limitation of liability provided}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+above cannot be given local legal effect according to their terms,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+reviewing courts shall apply local law that most closely approximates}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+an absolute waiver of all civil liability in connection with the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Program, unless a warranty or assumption of liability accompanies a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+copy of the Program in return for a fee.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+                     }{\rtlch \ltrch\loch
+END OF TERMS AND CONDITIONS}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+            }{\rtlch \ltrch\loch
+How to Apply These Terms to Your New Programs}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+If you develop a new program, and you want it to be of the greatest}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+possible use to the public, the best way to achieve this is to make it}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+free software which everyone can redistribute and change under these terms.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+To do so, attach the following notices to the program.  It is safest}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+to attach them to the start of each source file to most effectively}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+state the exclusion of warranty; and each file should have at least}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the "copyright" line and a pointer to where the full notice is found.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+Copyright (C)   }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+This program is free software: you can redistribute it and/or modify}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+it under the terms of the GNU General Public License as published by}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+the Free Software Foundation, either version 3 of the License, or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+(at your option) any later version.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+This program is distributed in the hope that it will be useful,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+but WITHOUT ANY WARRANTY; without even the implied warranty of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+GNU General Public License for more details.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+You should have received a copy of the GNU General Public License}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+along with this program.  If not, see .}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Also add information on how to contact you by electronic and paper mail.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+If the program does terminal interaction, make it output a short}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+notice like this when it starts in an interactive mode:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Copyright (C)   }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+This is free software, and you are welcome to redistribute it}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+under certain conditions; type `show c' for details.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+The hypothetical commands `show w' and `show c' should show the appropriate}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+parts of the General Public License.  Of course, your program's commands}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+might be different; for a GUI interface, you would use an "about box".}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+You should also get your employer (if you work as a programmer) or school,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+if any, to sign a "copyright disclaimer" for the program, if necessary.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+For more information on this, and how to apply and follow the GNU GPL, see}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+The GNU General Public License does not permit incorporating your program}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+into proprietary programs.  If your program is a subroutine library, you}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+may consider it more useful to permit linking proprietary applications with}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the library.  If this is what you want to do, use the GNU Lesser General}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Public License instead of this License.  But first, please read}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20\sb0\sa283{\rtlch \ltrch\loch
+}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20\sb0\sa283{\rtlch \ltrch\loch
+}
+\par \sect\sectd\sectunlocked1\pgwsxn12240\pghsxn15840\marglsxn1134\margrsxn567\margtsxn567\margbsxn567\pgndec\sbkpage\pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+DO NOT TRANSLATE OR LOCALIZE THIS DOCUMENT }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product:Bitstram Vera Fonts; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Bitstream, Inc. }
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Bitstream Vera Fonts}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\*\cs16\i\ai\rtlch \ltrch\loch
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc. \line \line Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license (\uc2 \u226\'c3\'a2\uc3 \u8364\'e2\'82\'ac\uc2 \u339\'c5\'93Fonts\u226\'c3\'a2\uc3 \u8364\'e2\'82\'ac\uc1 }{\*\cs16\i\ai\rtlch \ltrch\dbch
+\uc3 \u65437\'ef\'be\'9d\uc1 }{\*\cs16\i\ai\rtlch \ltrch\loch
+) and associated documentation files (the \uc2 \u226\'c3\'a2\uc3 \u8364\'e2\'82\'ac\uc2 \u339\'c5\'93Font Software\u226\'c3\'a2\uc3 \u8364\'e2\'82\'ac\uc1 }{\*\cs16\i\ai\rtlch \ltrch\dbch
+\uc3 \u65437\'ef\'be\'9d\uc1 }{\*\cs16\i\ai\rtlch \ltrch\loch
+), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions: \line \line The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces.\line \line The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words \uc2 \u226\'c3\'a2\uc3 \u8364\'e2\'82\'ac\uc2 \u339\'c5\'93Bitstream\u226\'c3\'a2\uc3 \u8364\'e2\'82\'ac\uc1 }{\*\cs16\i\ai\rtlch \ltrch\dbch
+\uc3 \u65437\'ef\'be\'9d \uc1 }{\*\cs16\i\ai\rtlch \ltrch\loch
+or the word \uc2 \u226\'c3\'a2\uc3 \u8364\'e2\'82\'ac\uc2 \u339\'c5\'93Vera\u226\'c3\'a2\uc3 \u8364\'e2\'82\'ac\uc1 }{\*\cs16\i\ai\rtlch \ltrch\dbch
+\uc3 \u65437\'ef\'be\'9d\uc1 }{\*\cs16\i\ai\rtlch \ltrch\loch
+.\line \line This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the \uc2 \u226\'c3\'a2\uc3 \u8364\'e2\'82\'ac\uc2 \u339\'c5\'93Bitstream Vera\u226\'c3\'a2\uc3 \u8364\'e2\'82\'ac\uc1 }{\*\cs16\i\ai\rtlch \ltrch\dbch
+\uc3 \u65437\'ef\'be\'9d \uc1 }{\*\cs16\i\ai\rtlch \ltrch\loch
+names. \line \line The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself. \line \line THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. \line \line Except as contained in this notice, the names of Gnome, the Gnome Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org. }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product:BerkeleyDB; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Sleepycat Software }
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+BerkeleyDB}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+> }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+/*}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* Copyright (c) 1990-2004}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*      Sleepycat Software.  All rights reserved.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* Redistribution and use in source and binary forms, with or without}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* modification, are permitted provided that the following conditions}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* are met:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* 1. Redistributions of source code must retain the above copyright}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    notice, this list of conditions and the following disclaimer.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* 2. Redistributions in binary form must reproduce the above copyright}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    notice, this list of conditions and the following disclaimer in the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    documentation and/or other materials provided with the distribution.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* 3. Redistributions in any form must be accompanied by information on}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    how to obtain complete source code for the DB software and any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    accompanying software that uses the DB software.  The source code}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    must either be included in the distribution or be available for no}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    more than the cost of distribution plus a nominal fee, and must be}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    freely redistributable under reasonable conditions.  For an}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    executable file, complete source code means the source code for all}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    modules it contains.  It does not include source code for modules or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    files that typically accompany the major components of the operating}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    system on which the executable file runs.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* THIS SOFTWARE IS PROVIDED BY SLEEPYCAT SOFTWARE ``AS IS'' AND ANY EXPRESS}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* NON-INFRINGEMENT, ARE DISCLAIMED.  IN NO EVENT SHALL SLEEPYCAT SOFTWARE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* THE POSSIBILITY OF SUCH DAMAGE.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*/}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+/*}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* Copyright (c) 1990, 1993, 1994, 1995}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*      The Regents of the University of California.  All rights reserved.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* Redistribution and use in source and binary forms, with or without}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* modification, are permitted provided that the following conditions}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* are met:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* 1. Redistributions of source code must retain the above copyright}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    notice, this list of conditions and the following disclaimer.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* 2. Redistributions in binary form must reproduce the above copyright}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    notice, this list of conditions and the following disclaimer in the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    documentation and/or other materials provided with the distribution.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* 3. Neither the name of the University nor the names of its contributors}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    may be used to endorse or promote products derived from this software}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    without specific prior written permission.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* SUCH DAMAGE.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*/}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+/*}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* Copyright (c) 1995, 1996}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*      The President and Fellows of Harvard University.  All rights reserved.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* Redistribution and use in source and binary forms, with or without}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* modification, are permitted provided that the following conditions}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* are met:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* 1. Redistributions of source code must retain the above copyright}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    notice, this list of conditions and the following disclaimer.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* 2. Redistributions in binary form must reproduce the above copyright}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    notice, this list of conditions and the following disclaimer in the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    documentation and/or other materials provided with the distribution.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* 3. Neither the name of the University nor the names of its contributors}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    may be used to endorse or promote products derived from this software}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    without specific prior written permission.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* THIS SOFTWARE IS PROVIDED BY HARVARD AND ITS CONTRIBUTORS ``AS IS'' AND}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* ARE DISCLAIMED.  IN NO EVENT SHALL HARVARD OR ITS CONTRIBUTORS BE LIABLE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* SUCH DAMAGE.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*/}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20\sb0\sa283{\rtlch \ltrch
+ }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product:Czech thesaurus database; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Pavel Rychly, Pavel Smrz, \{pary,smrz\}@fi.muni.cz, NLPlab, Faculty of Informatics, Masaryk University }
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Czech Thesaurus Database}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+Copyright (c) 2002 Pavel Rychly, Pavel Smrz, \{pary,smrz\}@fi.muni.cz, NLPlab, Faculty of Informatics, Masaryk University \line Permission is hereby granted, free of charge, to any person obtaining a copy of this data (the "Data"), to deal in the Data without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Data, and to permit persons to whom the Data is furnished to do so, subject to the following conditions: \line The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Data. \line THE DATA ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE DATA OR THE USE OR OTHER DEALINGS IN THE DATA. }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product:Generic Polygon Clipper (GPC); Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Alan Murta }
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+GPC}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+Copyright: (C) 1997-1999, Advanced Interfaces Group, University of Manchester. \line This software is free for non-commercial use. It may be copied, modified, and redistributed provided that this copyright notice is preserved on all copies. The intellectual property rights of the algorithms used reside with the University of Manchester Advanced Interfaces Group. \line You may not use this software, in whole or in part, in support of any commercial product without the express consent of the author. \line There is no warranty or other guarantee of fitness of this software for any purpose. It is provided solely "as is". }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: LaTeX dictinary data; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+LaTeX3 Project }
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+LPPL version 1.3b}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+The LaTeX Project Public License \line =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- \line \line LPPL Version 1.3b 2006-01-07 \line \line Copyright 1999 2002-2006 LaTeX3 Project \line Everyone is allowed to distribute verbatim copies of this license document, but modification of it is not allowed. \line PREAMBLE \line ======== \line The LaTeX Project Public License (LPPL) is the primary license under which the the LaTeX kernel and the base LaTeX packages are distributed. \line You may use this license for any work of which you hold the copyright and which you wish to distribute. This license may be particularly suitable if your work is TeX-related (such as a LaTeX package), but you may use it with small modifications even if your work is unrelated to TeX. \line The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE', below, gives instructions, examples, and recommendations for authors who are considering distributing their works under this license. \line This license gives conditions under which a work may be distributed and modified, as well as conditions under which modified versions of that work may be distributed. \line We, the LaTeX3 Project, believe that the conditions below give you the freedom to make and distribute modified versions of your work that conform with whatever technical specifications you wish while maintaining the availability, integrity, and reliability of that work. If you do not see how to achieve your goal while meeting these conditions, then read the document `cfgguide.tex' and `modguide.tex' in the base LaTeX distribution for suggestions. \line \line DEFINITIONS \line =========== \line \line In this license document the following terms are used: \line `Work' Any work being distributed under this License. \line `Derived Work' Any work that under any applicable law is derived from the Work. \line `Modification' Any procedure that produces a Derived Work under any applicable law -- for example, the production of a file containing an original file associated with the Work or a significant portion of such a file, either verbatim or with modifications and/or translated into another language. \line `Modify' To apply any procedure that produces a Derived Work under any applicable law. \line `Distribution' Making copies of the Work available from one person to another, in whole or in part. Distribution includes (but is not limited to) making any electronic components of the Work accessible by file transfer protocols such as FTP or HTTP or by shared file systems such as Sun's Network File System (NFS). \line `Compiled Work' A version of the Work that has been processed into a form where it is directly usable on a computer system. This processing may include using installation facilities provided by the Work, transformations of the Work, copying of components of the Work, or other activities. Note that modification of any installation facilities provided by the Work constitutes modification of the Work. \line `Current Maintainer' A person or persons nominated as such within the Work. If there is no such explicit nomination then it is the `Copyright Holder' under any applicable law. \line `Base Interpreter' A program or process that is normally needed for running or interpreting a part or the whole of the Work. \line A Base Interpreter may depend on external components but these are not considered part of the Base Interpreter provided that each external component clearly identifies itself whenever it is used interactively. Unless explicitly specified when applying the license to the Work, the only applicable Base Interpreter is a `LaTeX-Format' or in the case of files belonging to the `LaTeX-format' a program implementing the `TeX language'. \line \line CONDITIONS ON DISTRIBUTION AND MODIFICATION \line =========================================== \line \line 1. Activities other than distribution and/or modification of the Work are not covered by this license; they are outside its scope. In particular, the act of running the Work is not restricted and no requirements are made concerning any offers of support for the Work. \line 2. You may distribute a complete, unmodified copy of the Work as you received it. Distribution of only part of the Work is considered modification of the Work, and no right to distribute such a Derived Work may be assumed under the terms of this clause. \line 3. You may distribute a Compiled Work that has been generated from a complete, unmodified copy of the Work as distributed under Clause 2 above, as long as that Compiled Work is distributed in such a way that the recipients may install the Compiled Work on their system exactly as it would have been installed if they generated a Compiled Work directly from the Work. \line 4. If you are the Current Maintainer of the Work, you may, without restriction, modify the Work, thus creating a Derived Work. You may also distribute the Derived Work without restriction, including Compiled Works generated from the Derived Work. Derived Works distributed in this manner by the Current Maintainer are considered to be updated versions of the Work. \line 5. If you are not the Current Maintainer of the Work, you may modify your copy of the Work, thus creating a Derived Work based on the Work, and compile this Derived Work, thus creating a Compiled Work based on the Derived Work. \line 6. If you are not the Current Maintainer of the Work, you may distribute a Derived Work provided the following conditions are met for every component of the Work unless that component clearly states in the copyright notice that it is exempt from that condition. Only the Current Maintainer is allowed to add such statements of exemption to a component of the Work. \line a. If a component of this Derived Work can be a direct replacement for a component of the Work when that component is used with the Base Interpreter, then, wherever this component of the Work identifies itself to the user when used interactively with that Base Interpreter, the replacement component of this Derived Work clearly and unambiguously identifies itself as a modified version of this component to the user when used interactively with that Base Interpreter. \line b. Every component of the Derived Work contains prominent notices detailing the nature of the changes to that component, or a prominent reference to another file that is distributed as part of the Derived Work and that contains a complete and accurate log of the changes. \line c. No information in the Derived Work implies that any persons, including (but not limited to) the authors of the original version of the Work, provide any support, including (but not limited to) the reporting and handling of errors, to recipients of the Derived Work unless those persons have stated explicitly that they do provide such support for the Derived Work. \line d. You distribute at least one of the following with the Derived Work: \line 1. A complete, unmodified copy of the Work; if your distribution of a modified component is made by offering access to copy the modified component from a designated place, then offering equivalent access to copy the Work from the same or some similar place meets this condition, even though third parties are not compelled to copy the Work along with the modified component; \line 2. Information that is sufficient to obtain a complete, unmodified copy of the Work. \line 7. If you are not the Current Maintainer of the Work, you may distribute a Compiled Work generated from a Derived Work, as long as the Derived Work is distributed to all recipients of the Compiled Work, and as long as the conditions of Clause 6, above, are met with regard to the Derived Work. \line 8. The conditions above are not intended to prohibit, and hence do not apply to, the modification, by any method, of any component so that it becomes identical to an updated version of that component of the Work as it is distributed by the Current Maintainer under Clause 4, above. \line 9. Distribution of the Work or any Derived Work in an alternative format, where the Work or that Derived Work (in whole or in part) is then produced by applying some process to that format, does not relax or nullify any sections of this license as they pertain to the results of applying that process. \line 10. a. A Derived Work may be distributed under a different license provided that license itself honors the conditions listed in Clause 6 above, in regard to the Work, though it does not have to honor the rest of the conditions in this license. \line b. If a Derived Work is distributed under a different license, that Derived Work must provide sufficient documentation as part of itself to allow each recipient of that Derived Work to honor the restrictions in Clause 6 above, concerning changes from the Work. \line 11. This license places no restrictions on works that are unrelated to the Work, nor does this license place any restrictions on aggregating such works with the Work by any means. \line 12. Nothing in this license is intended to, or may be used to, prevent complete compliance by all parties with all applicable laws. \line NO WARRANTY \line =========== \line \line There is no warranty for the Work. Except when otherwise stated in writing, the Copyright Holder provides the Work `as is', without warranty of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose. The entire risk as to the quality and performance of the Work is with you. Should the Work prove defective, you assume the cost of all necessary servicing, repair, or correction. \line In no event unless required by applicable law or agreed to in writing will The Copyright Holder, or any author named in the components of the Work, or any other party who may distribute and/or modify the Work as permitted above, be liable to you for damages, including any general, special, incidental or consequential damages arising out of any use of the Work or out of inability to use the Work (including, but not limited to, loss of data, data being rendered inaccurate, or losses sustained by anyone as a result of any failure of the Work to operate with any other programs), even if the Copyright Holder or said author or said other party has been advised of the possibility of such damages. \line \line MAINTENANCE OF THE WORK \line ======================= \line \line The Work has the status `author-maintained' if the Copyright Holder explicitly and prominently states near the primary copyright notice in the Work that the Work can only be maintained by the Copyright Holder or simply that it is `author-maintained'. \line The Work has the status `maintained' if there is a Current Maintainer who has indicated in the Work that they are willing to receive error reports for the Work (for example, by supplying a valid e-mail address). It is not required for the Current Maintainer to acknowledge or act upon these error reports. \line The Work changes from status `maintained' to `unmaintained' if there is no Current Maintainer, or the person stated to be Current Maintainer of the work cannot be reached through the indicated means of communication for a period of six months, and there are no other significant signs of active maintenance. \line You can become the Current Maintainer of the Work by agreement with any existing Current Maintainer to take over this role. \line If the Work is unmaintained, you can become the Current Maintainer of the Work through the following steps: \line 1. Make a reasonable attempt to trace the Current Maintainer (and the Copyright Holder, if the two differ) through the means of an Internet or similar search. \line 2. If this search is successful, then enquire whether the Work is still maintained. \line a. If it is being maintained, then ask the Current Maintainer to update their communication data within one month. \line b. If the search is unsuccessful or no action to resume active maintenance is taken by the Current Maintainer, then announce within the pertinent community your intention to take over maintenance. (If the Work is a LaTeX work, this could be done, for example, by posting to comp.text.tex.) \line 3a. If the Current Maintainer is reachable and agrees to pass maintenance of the Work to you, then this takes effect immediately upon announcement. \line b. If the Current Maintainer is not reachable and the Copyright Holder agrees that maintenance of the Work be passed to you, then this takes effect immediately upon announcement. \line 4. If you make an `intention announcement' as described in 2b. above and after three months your intention is challenged neither by the Current Maintainer nor by the Copyright Holder nor by other people, then you may arrange for the Work to be changed so as to name you as the (new) Current Maintainer. \line 5. If the previously unreachable Current Maintainer becomes reachable once more within three months of a change completed under the terms of 3b) or 4), then that Current Maintainer must become or remain the Current Maintainer upon request provided they then update their communication data within one month. \line A change in the Current Maintainer does not, of itself, alter the fact that the Work is distributed under the LPPL license. \line If you become the Current Maintainer of the Work, you should immediately provide, within the Work, a prominent and unambiguous statement of your status as Current Maintainer. You should also announce your new status to the same pertinent community as in 2b) above. \line \line WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE \line ====================================================== \line \line This section contains important instructions, examples, and recommendations for authors who are considering distributing their works under this license. These authors are addressed as `you' in this section. \line Choosing This License or Another License \line ---------------------------------------- \line \line If for any part of your work you want or need to use *distribution* conditions that differ significantly from those in this license, then do not refer to this license anywhere in your work but, instead, distribute your work under a different license. You may use the text of this license as a model for your own license, but your license should not refer to the LPPL or otherwise give the impression that your work is distributed under the LPPL. \line The document `modguide.tex' in the base LaTeX distribution explains the motivation behind the conditions of this license. It explains, for example, why distributing LaTeX under the GNU General Public License (GPL) was considered inappropriate. Even if your work is unrelated to LaTeX, the discussion in `modguide.tex' may still be relevant, and authors intending to distribute their works under any license are encouraged to read it. \line \line A Recommendation on Modification Without Distribution \line ----------------------------------------------------- \line \line It is wise never to modify a component of the Work, even for your own personal use, without also meeting the above conditions for distributing the modified component. While you might intend that such modifications will never be distributed, often this will happen by accident -- you may forget that you have modified that component; or it may not occur to you when allowing others to access the modified version that you are thus distributing it and violating the conditions of this license in ways that could have legal implications and, worse, cause problems for the community. It is therefore usually in your best interest to keep your copy of the Work identical with the public one. Many works provide ways to control the behavior of that work without altering any of its licensed components. \line \line How to Use This License \line ----------------------- \line \line To use this license, place in each of the components of your work both an explicit copyright notice including your name and the year the work was authored and/or last substantially modified. Include also a statement that the distribution and/or modification of that component is constrained by the conditions in this license. \line Here is an example of such a notice and statement: \line %% pig.dtx %% Copyright 2005 M. Y. Name % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt % and version 1.3 or later is part of all distributions of LaTeX % version 2005/12/01 or later. % % This work has the LPPL maintenance status `maintained'. % % The Current Maintainer of this work is M. Y. Name. % % This work consists of the files pig.dtx and pig.ins % and the derived file pig.sty. \line Given such a notice and statement in a file, the conditions given in this license document would apply, with the `Work' referring to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being generated from `pig.dtx' using `pig.ins'), the `Base Interpreter' referring to any `LaTeX-Format', and both `Copyright Holder' and `Current Maintainer' referring to the person `M. Y. Name'. \line If you do not want the Maintenance section of LPPL to apply to your Work, change `maintained' above into `author-maintained'. However, we recommend that you use `maintained', as the Maintenance section was added in order to ensure that your Work remains useful to the community even when you can no longer maintain and support it yourself. \line \line Derived Works That Are Not Replacements \line --------------------------------------- \line \line Several clauses of the LPPL specify means to provide reliability and stability for the user community. They therefore concern themselves with the case that a Derived Work is intended to be used as a (compatible or incompatible) replacement of the original Work. If this is not the case (e.g., if a few lines of code are reused for a completely different task), then clauses 6b and 6d shall not apply. \line \line Important Recommendations \line ------------------------- \line \line Defining What Constitutes the Work \line The LPPL requires that distributions of the Work contain all the files of the Work. It is therefore important that you provide a way for the licensee to determine which files constitute the Work. This could, for example, be achieved by explicitly listing all the files of the Work near the copyright notice of each file or by using a line such as: \line % This work consists of all files listed in manifest.txt. \line in that place. In the absence of an unequivocal list it might be impossible for the licensee to determine what is considered by you to comprise the Work and, in such a case, the licensee would be entitled to make reasonable conjectures as to which files comprise the Work. }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product:MS Runtime Libraries; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Microsoft Corporation }
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Runtime Libraries}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+Microsoft .NET Framework Redistributable EULA \line SUPPLEMENTAL END-USER LICENSE AGREEMENT FOR MICROSOFT SOFTWARE \line IMPORTANT: \line READ CAREFULLY\uc3 \u8212\'e2\'80\'94 \line These Microsoft Corporation ("Microsoft")\line operating system components, including any "online" or electronic\line documentation ("OS Components") are subject to the terms and \line conditions of the agreement under which you have licensed the \line applicable Microsoft operating system product ("OS Product") \line described below (each an "End User License Agreement" or "EULA") \line and the terms and conditions of this Supplemental EULA. BY INSTALLING, \line COPYING OR OTHERWISE USING THE OS COMPONENTS, YOU AGREE TO BE BOUND \line BY THE TERMS AND CONDITIONS OF THE APPLICABLE OS PRODUCT EULA AND \line THIS SUPPLEMENTAL EULA. IF YOU DO NOT AGREE TO THESE TERMS AND \line CONDITIONS, DO NOT INSTALL, COPY OR USE THE OS COMPONENTS. \line NOTE: IF YOU DO NOT HAVE A VALID EULA FOR ANY "OS PRODUCT" \line (MICROSOFT WINDOWS 98, WINDOWS ME, WINDOWS NT 4.0 (DESKTOP \line EDITION), WINDOWS 2000 OPERATING SYSTEM, WINDOWS XP PROFESSIONAL \line AND/OR WINDOWS XP HOME EDITION), YOU ARE NOT AUTHORIZED TO INSTALL, \line COPY OR OTHERWISE USE THE OS COMPONENTS AND YOU HAVE NO RIGHTS UNDER \line THIS SUPPLEMENTAL EULA. \line Capitalized terms used in this Supplemental EULA and not otherwise \line defined herein shall have the meanings assigned to them in the \line applicable OS Product EULA. \line General. The OS Components are provided to you by Microsoft to update, \line supplement, or replace existing functionality of the applicable OS \line Product Microsoft grants you a license to use the OS Components \line under the terms and conditions of the OS Product EULA for the applicable \line OS Product (which are hereby incorporated by reference) and the terms \line and conditions set forth in this Supplemental EULA, provided that you \line comply with all such terms and conditions. To the extent that any terms \line in this Supplemental EULA conflict with terms in the applicable OS \line Product EULA, the terms of this Supplemental EULA control solely with \line respect to the OS Components. \line Additional Rights and Limitations. \line *If you have multiple validly licensed copies of the applicable OS \line Product(s), you may reproduce, install and use one copy of the OS \line Components as part of such applicable OS Product(s) on all of your \line computers running validly licensed copies of the OS Product(s) \line provided that you use such additional copies of the OS Components \line in accordance with the terms and conditions above. You may not \line disclose the results of any benchmark test of the .NET Framework \line component of the OS Components to any third party without Microsoft's \line prior written approval. Microsoft retains all right, title and\line interest in and to the OS Components. All rights not expressly granted \line are reserved by Microsoft. \line IF THE APPLICABLE OS PRODUCT WAS LICENSED TO YOU BY MICROSOFT OR ANY \line OF ITS WHOLLY OWNED SUBSIDIARIES, THE LIMITED WARRANTY (IF ANY) \line INCLUDED IN THE APPLICABLE OS PRODUCT EULA APPLIES TO THE OS COMPONENTS \line PROVIDED THE OS COMPONENTS HAVE BEEN LICENSED BY YOU WITHIN THE TERM OF \line THE LIMITED WARRANTY IN THE APPLICABLE OS PRODUCT EULA. HOWEVER, THIS \line SUPPLEMENTAL EULA DOES NOT EXTEND THE TIME PERIOD FOR WHICH THE LIMITED \line WARRANTY IS PROVIDED. \line IF THE APPLICABLE OS PRODUCT WAS LICENSED TO YOU BY AN ENTITY OTHER THAN \line MICROSOFT OR ANY OF ITS WHOLLY OWNED SUBSIDIARIES, MICROSOFT DISCLAIMS \line ALL WARRANTIES WITH RESPECT TO THE OS COMPONENTS AS FOLLOWS: \line DISCLAIMER OF WARRANTIES. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE \line LAW, MICROSOFT AND ITS SUPPLIERS PROVIDE TO YOU THE OS COMPONENTS, AND \line ANY (IF ANY) SUPPORT SERVICES RELATED TO THE OS COMPONENTS ("SUPPORT \line SERVICES") \uc1 }{\i\rtlch \ltrch\loch
+AS IS AND WITH ALL FAULTS;}{\rtlch \ltrch\loch
+ and Microsoft and its suppliers \line hereby disclaim with respect to THE os COMPONENTS AND SUPPORT SERVICES \line all warranties and conditions, whether express, implied or statutory, \line including, but not limited to, any (if any) warranties or conditions \line of OR RELATED TO: TITLE, NON-INFRINGEMENT, merchantability, fitness \line for a particular purpose, lack of viruses, accuracy or completeness \line of responses, results, lack of negligence or lack of workmanlike effort, \line QUIET ENJOYMENT, QUIET POSSESSION, AND CORRESPONDENCE TO DESCRIPTION. \line The entire risk arising out of use or performance of the OS Components \line AND ANY SUPPORT SERVICES remains with you. \line EXCLUSION OF INCIDENTAL, CONSEQUENTIAL AND CERTAIN OTHER DAMAGES. To \line the maximum extent permitted by applicable law, in no event shall \line Microsoft or its suppliers be liable for any special, incidental, \line indirect, or consequential damages whatsoever (including, but not \line limited to, damages for: loss of profits, LOSS OF confidential or \line other information, business interruption, personal injury, loss of \line privacy, failure to meet any duty (including of good faith or of \line reasonable care), negligence, and any other pecuniary or other loss \line whatsoever) arising out of or in any way related to the use of or \line inability to use the OS Components OR THE SUPPORT SERVICES, OR the \line provision of or failure to provide Support Services, or otherwise \line under or in connection with any provision of this Supplemental EULA, \line even if Microsoft or any supplier has been advised of the possibility \line of such damages. \line LIMITATION OF LIABILITY AND REMEDIES. NOTWITHSTANDING ANY DAMAGES THAT \line YOU MIGHT INCUR FOR ANY REASON WHATSOEVER (INCLUDING, WITHOUT \line LIMITATION, ALL DAMAGES REFERENCED ABOVE AND ALL DIRECT OR GENERAL \line DAMAGES), THE ENTIRE LIABILITY OF MICROSOFT AND ANY OF ITS SUPPLIERS \line UNDER ANY PROVISION OF THIS SUPPLEMENTAL EULA AND YOUR EXCLUSIVE \line REMEDY FOR ALL OF THE FOREGOING SHALL BE LIMITED TO THE GREATER OF \line THE AMOUNT ACTUALLY PAID BY YOU FOR THE OS COMPONENTS OR U.S.$5.00. \line THE FOREGOING LIMITATIONS, EXCLUSIONS AND DISCLAIMERS SHALL APPLY \line TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, EVEN IF ANY REMEDY \line FAILS ITS ESSENTIAL PURPOSE. \line \line Si vous avez acquis votre produit Microsoft au CANADA, le texte suivant \line vous concerne : \line SI LE PRODUIT OS APPLICABLE VOUS A \uc2 \u201\'c3\'89T\u201\'c3\'89 CONC\u201\'c3\'89D\u201\'c3\'89 SOUS LICENCE PAR \line MICROSOFT OU PAR L'UNE QUELCONQUE DE SES FILIALES \u192\'c3\'80 100%, LA GARANTIE \line LIMIT\u201\'c3\'89E (SI ELLE EXISTE) APPLICABLE EN VERTU DU CONTRAT DE LICENCE \line UTILISATEUR FINAL (\u171\'c2\'ab CLUF \u187\'c2\'bb) RELATIF \u192\'c3\'80 CE PRODUIT OS S'APPLIQUE AUX \line COMPOSANTS SYST\u200\'c3\'88ME D'EXPLOITATION DE MICROSOFT Y COMPRIS TOUTE \line DOCUMENTATION \u171\'c2\'ab EN LIGNE \u187\'c2\'bb OU SOUS FORME \u201\'c3\'89LECTRONIQUE (LES \u171\'c2\'ab \line COMPOSANTS OS \u187\'c2\'bb), \u192\'c3\'80 CONDITION QUE CEUX-CI VOUS AIENT \u201\'c3\'89T\u201\'c3\'89 CONC\u201\'c3\'89D\u201\'c3\'89S \line SOUS LICENCE PENDANT LA DUR\u201\'c3\'89E DE LA GARANTIE LIMIT\u201\'c3\'89E DU CLUF RELATIF \line AU PRODUIT OS APPLICABLE. LE PR\u201\'c3\'89SENT CLUF SUPPL\u201\'c3\'89MENTAIRE N'A PAS POUR \line EFFET DE PROROGER LA DUR\u201\'c3\'89E DE CETTE GARANTIE LIMIT\u201\'c3\'89E. \line SI LE PRODUIT OS VOUS A \u201\'c3\'89T\u201\'c3\'89 CONC\u201\'c3\'89D\u201\'c3\'89 SOUS LICENCE PAR UNE ENTIT\u201\'c3\'89 AUTRE \line QUE MICROSOFT OU QUE L'UNE QUELCONQUE DE SES FILIALES \u192\'c3\'80 100%, \line MICROSOFT EXCLUT TOUTE GARANTIE RELATIVE AUX COMPOSANTS OS COMME \line CELA EST STIPUL\u201\'c3\'89 CI-APR\u200\'c3\'88S : \line EXCLUSION DE GARANTIE. DANS TOUTE LA MESURE PERMISE PAR LE DROIT \line APPLICABLE, MICROSOFT ET SES FOURNISSEURS VOUS FOURNISSENT LES \line COMPOSANTS OS, AINSI QUE, LE CAS \u201\'c3\'89CH\u201\'c3\'89ANT, TOUT SERVICE D'ASSISTANCE \line RELATIF \u192\'c3\'80 CES COMPOSANTS OS (LES "SERVICES D'ASSISTANCE"), \u171\'c2\'ab COMME \line TELS ET AVEC TOUS LEURS DEFAUTS \u187\'c2\'bb. EN OUTRE, MICROSOFT ET SES \line FOURNISSEURS EXCLUENT PAR LES PR\u201\'c3\'89SENTES TOUTE AUTRE GARANTIE L\u201\'c3\'89GALE, \line EXPRESSE OU IMPLICITE, RELATIVE AUX COMPOSANTS OS ET AUX SERVICES \line D'ASSISTANCE, NOTAMMENT (LE CAS \u201\'c3\'89CH\u201\'c3\'89ANT), TOUTE GARANTIE : DE PROPRI\u201\'c3\'89T\u201\'c3\'89, \line D'ABSENCE DE CONTREFA\u199\'c3\'87ON, DE QUALIT\u201\'c3\'89, D'ADAPTATION \u192\'c3\'80 UN USAGE \line PARTICULIER, D'ABSENCE DE VIRUS, DE PR\u201\'c3\'89CISION, D'EXHAUSTIVIT\u201\'c3\'89 DES \line R\u201\'c3\'89PONSES, DES R\u201\'c3\'89SULTATS OBTENUS, D'ABSENCE DE N\u201\'c3\'89GLIGENCE, OU DE \line D\u201\'c3\'89FAUT DE FABRICATION, DE JOUISSANCE PAISIBLE, D'ABSENCE DE TROUBLE \line DE POSSESSION ET DE CONFORMIT\u201\'c3\'89 \u192\'c3\'80 LA DESCRIPTION. VOUS ASSUMEZ \line L'ENSEMBLE DES RISQUES D\u201\'c3\'89COULANT DE L'UTILISATION OU DU FONCTIONNEMENT \line DES COMPOSANTS OS ET DES SERVICES D'ASSISTANCE. \line EXCLUSION DE RESPONSABILIT\u201\'c3\'89 POUR LES DOMMAGES ACCESSOIRES, INDIRECTS \line ET CERTAINS AUTRES TYPES DE DOMMAGES. DANS TOUTE LA MESURE PERMISE \line PAR LE DROIT APPLICABLE, MICROSOFT OU SES FOURNISSEURS NE POURRONT EN \line AUCUN CAS \u202\'c3\'8aTRE TENUS RESPONSABLES DE TOUT DOMMAGE SP\u201\'c3\'89CIAL, ACCESSOIRE, \line INCIDENT OU INDIRECT DE QUELQUE NATURE QUE CE SOIT (Y COMPRIS, MAIS \line NON DE FACON LIMITATIVE, LES PERTES DE B\u201\'c3\'89N\u201\'c3\'89FICES, PERTES D'INFORMATIONS \line CONFIDENTIELLES OU AUTRES INFORMATIONS, INTERRUPTIONS D'ACTIVIT\u201\'c3\'89, \line PR\u201\'c3\'89JUDICES CORPORELS, ATTEINTES \u192\'c3\'80 LA VIE PRIV\u201\'c3\'89E, MANQUEMENT \u192\'c3\'80 TOUTE \line OBLIGATION (NOTAMMENT L'OBLIGATION DE BONNE FOI ET DE DILIGENCE), \line N\u201\'c3\'89GLIGENCE, ET POUR TOUTE PERTE P\u201\'c3\'89CUNIAIRE OU AUTRE DE QUELQUE NATURE \line QUE CE SOIT), R\u201\'c3\'89SULTANT DE, OU RELATIFS A, L'UTILISATION OU \line L'IMPOSSIBILIT\u201\'c3\'89 D'UTILISER LES COMPOSANTS OS OU LES SERVICES D'ASSISTANCE, \line OU LA FOURNITURE OU LE D\u201\'c3\'89FAUT DE FOURNITURE DES SERVICES D'ASSISTANCE, OU \line AUTREMENT EN VERTU DE, OU RELATIVEMENT A, TOUTE DISPOSITION DE CE CLUF \line SUPPL\u201\'c3\'89MENTAIRE, M\u202\'c3\'8aME SI LA SOCI\u201\'c3\'89T\u201\'c3\'89 MICROSOFT OU UN QUELCONQUE FOURNISSEUR \line A \u201\'c3\'89T\u201\'c3\'89 PR\u201\'c3\'89VENU DE L'\u201\'c3\'89VENTUALIT\u201\'c3\'89 DE TELS DOMMAGES. \line LIMITATION DE RESPONSABILIT\u201\'c3\'89 ET RECOURS. NONOBSTANT TOUT DOMMAGE QUE VOUS \line POURRIEZ SUBIR POUR QUELQUE MOTIF QUE CE SOIT (NOTAMMENT TOUS LES DOMMAGES \line \u201\'c3\'89NUM\u201\'c3\'89R\u201\'c3\'89S CI-DESSUS ET TOUS LES DOMMAGES DIRECTS OU G\u201\'c3\'89N\u201\'c3\'89RAUX), L'ENTI\u200\'c3\'88RE \line RESPONSABILIT\u201\'c3\'89 DE MICROSOFT ET DE L'UN QUELCONQUE DE SES FOURNISSEURS AU \line TITRE DE TOUTE STIPULATION DE CE CLUF SUPPL\u201\'c3\'89MENTAIRE ET VOTRE SEUL RECOURS \line EN CE QUI CONCERNE TOUS LES DOMMAGES PR\u201\'c3\'89CIT\u201\'c3\'89S NE SAURAIENT EXC\u201\'c3\'89DER LE \line MONTANT QUE VOUS AVEZ EFFECTIVEMENT PAY\u201\'c3\'89 POUR LES COMPOSANTS OS OU 5 DOLLARS \line US (US$ 5,00), SELON LE PLUS \u201\'c3\'89LEV\u201\'c3\'89 DES DEUX MONTANTS. LES PR\u201\'c3\'89SENTES \line LIMITATIONS ET EXCLUSIONS DEMEURERONT APPLICABLES DANS TOUTE LA MESURE \line PERMISE PAR LE DROIT APPLICABLE QUAND BIEN M\u202\'c3\'8aME UN QUELCONQUE REM\u200\'c3\'88DE \u192\'c3\'80 UN \line QUELCONQUE MANQUEMENT NE PRODUIRAIT PAS D'EFFET. \line La pr\u233\'c3\'a9sente Convention est r\u233\'c3\'a9gie par les lois de la province d'Ontario, \line Canada. Chacune des parties \u224\'c3\'a0 la pr\u233\'c3\'a9sente reconna\u238\'c3\'aet irr\u233\'c3\'a9vocablement la \line comp\u233\'c3\'a9tence des tribunaux de la province d'Ontario et consent \u224\'c3\'a0 instituer \line tout litige qui pourrait d\u233\'c3\'a9couler de la pr\u233\'c3\'a9sente aupr\u232\'c3\'a8s des tribunaux \line situ\u233\'c3\'a9s dans le district judiciaire de York, province d'Ontario. \line Au cas o\u249\'c3\'b9 vous auriez des questions concernant cette licence ou que vous \line d\u233\'c3\'a9siriez vous mettre en rapport avec Microsoft pour quelque raison que \line ce soit, veuillez contacter la succursale Microsoft desservant votre \line pays, ou \u233\'c3\'a9crire \u224\'c3\'a0 : Microsoft Sales Information Center, One Microsoft \line Way, Redmond, Washington 98052-6399. \uc1 }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Ispell W?rterbuch igerman98; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Bjoern Jacke }
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+German Dictionaries igerman98}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+OASIS distribution license agreement 0.1 from 2005-11-10 \line Without any modifications this dictionary may be distributed with programs that support the OASIS Open Document Format for Office Applications and whose PRIMARY format for saving documents is the Open Document Format. \line This requires that all licenses and copyright files are also distributed together with the package the dictionary is shipped with. \line Any modifications of the dictionary files are not allowed for this agreement, modifications require the use of the GNU GENERAL PUBLIC LICENSE. \line If you have questions or don't get along with this, send me your comments/questions/ideas to Bjoern Jacke }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: WordNet Release 2.1; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Princeton University }
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+WordNet 2.1}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+WordNet 2.1 Copyright 2005 by Princeton University. \line This software and database is being provided to you, the LICENSEE, by Princeton University under the following license. By obtaining, using and/or copying this software and database, you agree that you have read, understood, and will comply with these terms and conditions.: \line Permission to use, copy, modify and distribute this software and database and its documentation for any purpose and without fee or royalty is hereby granted, provided that you agree to comply with the following copyright notice and statements, including the disclaimer, and that the same appear on ALL copies of the software, database and documentation, including modifications that you make for internal use or for distribution. \line WordNet 2.1 Copyright 2005 by Princeton University. All rights reserved. \line THIS SOFTWARE AND DATABASE IS PROVIDED "AS IS" AND PRINCETON UNIVERSITY MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PRINCETON UNIVERSITY MAKES NO REPRESENTATIONS OR WARRANTIES OF MERCHANT- ABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE, DATABASE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. \line The name of Princeton University or Princeton may not be used in advertising or publicity pertaining to distribution of the software and/or database. Title to copyright in this software, database and any associated documentation shall at all times remain with Princeton University and LICENSEE agrees to preserve same. }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product:Bitstram Vera Fonts; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Bitstream, Inc. }
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Bitstream Vera Fonts}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\*\cs16\i\ai\rtlch \ltrch\loch
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc. \line \line Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license (\uc2 \u226\'c3\'a2\uc3 \u8364\'e2\'82\'ac\uc2 \u339\'c5\'93Fonts\u226\'c3\'a2\uc3 \u8364\'e2\'82\'ac\uc1 }{\*\cs16\i\ai\rtlch \ltrch\dbch
+\uc3 \u65437\'ef\'be\'9d\uc1 }{\*\cs16\i\ai\rtlch \ltrch\loch
+) and associated documentation files (the \uc2 \u226\'c3\'a2\uc3 \u8364\'e2\'82\'ac\uc2 \u339\'c5\'93Font Software\u226\'c3\'a2\uc3 \u8364\'e2\'82\'ac\uc1 }{\*\cs16\i\ai\rtlch \ltrch\dbch
+\uc3 \u65437\'ef\'be\'9d\uc1 }{\*\cs16\i\ai\rtlch \ltrch\loch
+), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions: \line \line The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces.\line \line The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words \uc2 \u226\'c3\'a2\uc3 \u8364\'e2\'82\'ac\uc2 \u339\'c5\'93Bitstream\u226\'c3\'a2\uc3 \u8364\'e2\'82\'ac\uc1 }{\*\cs16\i\ai\rtlch \ltrch\dbch
+\uc3 \u65437\'ef\'be\'9d \uc1 }{\*\cs16\i\ai\rtlch \ltrch\loch
+or the word \uc2 \u226\'c3\'a2\uc3 \u8364\'e2\'82\'ac\uc2 \u339\'c5\'93Vera\u226\'c3\'a2\uc3 \u8364\'e2\'82\'ac\uc1 }{\*\cs16\i\ai\rtlch \ltrch\dbch
+\uc3 \u65437\'ef\'be\'9d\uc1 }{\*\cs16\i\ai\rtlch \ltrch\loch
+.\line \line This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the \uc2 \u226\'c3\'a2\uc3 \u8364\'e2\'82\'ac\uc2 \u339\'c5\'93Bitstream Vera\u226\'c3\'a2\uc3 \u8364\'e2\'82\'ac\uc1 }{\*\cs16\i\ai\rtlch \ltrch\dbch
+\uc3 \u65437\'ef\'be\'9d \uc1 }{\*\cs16\i\ai\rtlch \ltrch\loch
+names. \line \line The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself. \line \line THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS }{\*\cs16\i\ai\rtlch \ltrch\loch
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. \line \line Except as contained in this notice, the names of Gnome, the Gnome Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org. }{\rtlch \ltrch\loch
+\line Arev Fonts Copyright \line Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. \line Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license ("Fonts") and associated documentation files (the "Font Software"), to reproduce and distribute the modifications to the Bitstream Vera Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions: \line The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces. \line The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words "Tavmjong Bah" or the word "Arev". \line This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the "Tavmjong Bah Arev" names. \line The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself. \line THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. \line Except as contained in this notice, the name of Tavmjong Bah shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from Tavmjong Bah. For further information, contact: tavmjong @ free . fr. }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Liberation Fonts; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+RedHat, Inc.}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Liberation Fonts}
+\par \pard\plain \s21\sb0\sa120{{\field{\*\fldinst HYPERLINK "#gpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+refer to GNU General Public License}{\rtlch \ltrch\loch
+}} and the following terms: \line LICENSE AGREEMENT AND LIMITED PRODUCT WARRANTY LIBERATION FONT SOFTWARE \line This agreement governs the use of the Software and any updates to the Software, regardless of the delivery mechanism. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to the user ("Client") a license to this collective work pursuant to the GNU General Public License v.2 with the exceptions set forth below and such other terms as our set forth in this End User License Agreement. \line 1. The Software and License Exception. LIBERATION font software (the "Software") consists of TrueType-OpenType formatted font software for rendering LIBERATION typefaces in sans serif, serif, and monospaced character styles. You are licensed to use, modify, copy, and distribute the Software pursuant to the GNU General Public License v.2 with the following exceptions: \line 1) As a special exception, if you create a document which uses this font, and embed this font or unaltered portions of this font into the document, this font does not by itself cause the resulting document to be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the document might be covered by the GNU General Public License. If you modify this font, you may extend this exception to your version of the font, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. \line 2) As a further exception, any distribution of the object code of the Software in a physical product must provide you the right to access and modify the source code for the Software and to reinstall that modified version of the Software in object code form on the same physical product on which you received it. \line 2. Intellectual Property Rights. The Software and each of its components, including the source code, documentation, appearance, structure and organization are owned by Red Hat and others and are protected under copyright and other laws. Title to the Software and any component, or to any copy, modification, or merged portion shall remain with the aforementioned, subject to the applicable license. The "LIBERATION" trademark is a trademark of Red Hat, Inc. in the U.S. and other countries. This agreement does not permit Client to distribute modified versions of the Software using Red Hat's trademarks. If Client makes a redistribution of a modified version of the Software, then Client must modify the files names to remove any reference to the Red Hat trademarks and must not use the Red Hat trademarks in any way to reference or promote the modified Software. \line 3. Limited Warranty. To the maximum extent permitted under applicable law, the Software is provided and licensed "as is" without warranty of any kind, expressed or implied, including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. Red Hat does not warrant that the functions contained in the Software will meet Client's requirements or that the operation of the Software will be entirely error free or appear precisely as described in the accompanying documentation. \line 4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential damages, including lost profits or lost savings arising out of the use or inability to use the Software, even if Red Hat or such dealer has been advised of the possibility of such damages. \line 5. Export Control. As required by U.S. law, Client represents and warrants that it: (a) understands that the Software is subject to export controls under the U.S. Commerce Department's Export Administration Regulations ("EAR"); (b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations (currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria); (c) will not export, re-export, or transfer the Software to any prohibited destination, entity, or individual without the necessary export license(s) or authorizations(s) from the U.S. Government; (d) will not use or transfer the Software for use in any sensitive nuclear, chemical or biological weapons, or missile technology end-uses unless authorized by the U.S. Government by regulation or specific license; (e) understands and agrees that if it is in the United States and exports or transfers the Software to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and address (including country) of each transferee; and (f) understands that countries other than the United States may restrict the import, use, or export of encryption products and that it shall be solely responsible for compliance with any such import, use, or export restrictions. \line 6. General. If any provision of this agreement is held to be unenforceable, that shall not affect the enforceability of the remaining provisions. This agreement shall be governed by the laws of the State of North Carolina and of the United States, without regard to any conflict of laws provisions, except that the United Nations Convention on the International Sale of Goods shall not apply. \line Copyright \uc2 \u169\'c2\'a9 2007 Red Hat, Inc. All rights reserved. LIBERATION is a trademark of Red Hat, Inc. \uc1 }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: MathML DTD; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+World Wide Web Consortium (W3C)}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+MathML DTD}
+\par \pard\plain \s1\b\hich\af11\dbch\af14\afs48\ab\loch\f7\fs48{\rtlch \ltrch\loch
+W3C}{{\*\updnprop8000}\up16\rtlch \ltrch\loch
+\uc2 \u174\'c2\'ae\uc1 }{\rtlch \ltrch\loch
+ SOFTWARE NOTICE AND LICENSE}
+\par \pard\plain \s4\b\hich\af9\dbch\af12\afs24\ab\loch\f4\fs24{\rtlch \ltrch\loch
+Copyright \uc2 \u169\'c2\'a9 1994-2001 \uc1 }{{\field{\*\fldinst HYPERLINK "http://www.w3.org/" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+World Wide Web Consortium}{\rtlch \ltrch\loch
+}}, (}{{\field{\*\fldinst HYPERLINK "http://www.lcs.mit.edu/" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+Massachusetts Institute of Technology}{\rtlch \ltrch\loch
+}}, }{{\field{\*\fldinst HYPERLINK "http://www.inria.fr/" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+Institut National de Recherche en Informatique et en Automatique}{\rtlch \ltrch\loch
+}}, }{{\field{\*\fldinst HYPERLINK "http://www.keio.ac.jp/" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+Keio University}{\rtlch \ltrch\loch
+}}). All Rights Reserved. http://www.w3.org/Consortium/Legal/}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+This W3C work (including software, documents, or other related items) is being provided by the copyright holders under the following license. By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions:}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+Permission to use, copy, modify, and distribute this software and its documentation, with or without modification,\~  for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications, that you make:}
+\par \pard\plain \s21\sb0\sa120{\listtext\pard\plain  1.\tab}\ilvl0\ls2 \li0\ri0\lin0\rin0\fi-283\tx707\li707\ri0\lin707\rin0\fi-283\sb0\sa0{\rtlch \ltrch\loch
+The full text of this NOTICE in a location viewable to users of the redistributed or derivative work. }
+\par \pard\plain \s21\sb0\sa120{\listtext\pard\plain  2.\tab}\ilvl0\ls2 \li0\ri0\lin0\rin0\fi-283\tx707\li707\ri0\lin707\rin0\fi-283\sb0\sa0{\rtlch \ltrch\loch
+Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, a short notice of the following form (hypertext is preferred, text is permitted) should be used within the body of any redistributed or derivative code: "Copyright \uc2 \u169\'c2\'a9 [$date-of-software] \uc1 }{{\field{\*\fldinst HYPERLINK "http://www.w3.org/" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+World Wide Web Consortium}{\rtlch \ltrch\loch
+}}, (}{{\field{\*\fldinst HYPERLINK "http://www.lcs.mit.edu/" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+Massachusetts Institute of Technology}{\rtlch \ltrch\loch
+}}, }{{\field{\*\fldinst HYPERLINK "http://www.inria.fr/" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+Institut National de Recherche en Informatique et en Automatique}{\rtlch \ltrch\loch
+}}, }{{\field{\*\fldinst HYPERLINK "http://www.keio.ac.jp/" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+Keio University}{\rtlch \ltrch\loch
+}}). All Rights Reserved. http://www.w3.org/Consortium/Legal/" }
+\par \pard\plain \s21\sb0\sa120{\listtext\pard\plain  3.\tab}\ilvl0\ls2 \li0\ri0\lin0\rin0\fi-283\tx707\li707\ri0\lin707\rin0\fi-283{\rtlch \ltrch\loch
+Notice of any changes or modifications to the W3C files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.) }
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: NSIS; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Nullsoft, Inc.}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+NSIS}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+Copyright (C) 1999-2003 Nullsoft, Inc. \line This license applies to everything in the NSIS package, except where otherwise noted. \line This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. \line Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: \line 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. \line 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. \line 3. This notice may not be removed or altered from any source distribution. }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: PostScript(R) AFM Files; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Adobe}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+PostScript(R) AFM files}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line Adobe Core 35 AFM Files with 314 Glyph Entries \line This file and the 35 PostScript(R) AFM files it accompanies may be used, copied, and distributed for any purpose and without charge, with or without modification, provided that all copyright notices are retained; that the AFM files are not distributed without this file; that all modifications to this file or any of the AFM files are prominently noted in the modified file(s); and that this paragraph is not modified. Adobe Systems has no responsibility or obligation to support the use of the AFM files. }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Antigrain; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Axim Shemanarev}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Antigrain}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line Anti-Grain Geometry - Version 2.0 \line Copyright (C) 2002-2004 Maxim Shemanarev (McSeem) \line Permission to copy, use, modify, sell and distribute this software is granted provided this copyright notice appears in all copies. This software is provided "as is" without express or implied warranty, and with no claim as to its suitability for any purpose. }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: beanshell; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Pat Niemeyer}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+beanshell}
+\par \pard\plain \s21\sb0\sa120{{\field{\*\fldinst HYPERLINK "#lgpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+jump to LGPL}}}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+/*****************************************************************************}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*                                                                           *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*  This file is part of the BeanShell Java Scripting distribution.          *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*  Documentation and updates may be found at http://www.beanshell.org/      *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*                                                                           *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*  Sun Public License Notice:                                               *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*                                                                           *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*  The contents of this file are subject to the Sun Public License Version  *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*  1.0 (the "License"); you may not use this file except in compliance with *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*  the License. A copy of the License is available at http://www.sun.com    *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*                                                                           *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*  The Original Code is BeanShell. The Initial Developer of the Original    *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*  Code is Pat Niemeyer. Portions created by Pat Niemeyer are Copyright     *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*  (C) 2000.  All Rights Reserved.                                          *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*                                                                           *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*  GNU Public License Notice:                                               *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*                                                                           *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*  Alternatively, the contents of this file may be used under the terms of  *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*  the GNU Lesser General Public License (the "LGPL"), in which case the    *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*  provisions of LGPL are applicable instead of those above. If you wish to *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*  allow use of your version of this file only under the  terms of the LGPL *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*  and not to allow others to use your version of this file under the SPL,  *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*  indicate your decision by deleting the provisions above and replace      *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*  them with the notice and other provisions required by the LGPL.  If you  *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*  do not delete the provisions above, a recipient may use your version of  *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*  this file under either the SPL or the LGPL.                              *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*                                                                           *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*  Patrick Niemeyer (pat@pat.net)                                           *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*  Author of Learning Java, O'Reilly & Associates                           *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*  http://www.pat.net/~pat/                                                 *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*                                                                           *}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20\sb0\sa283{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*****************************************************************************/}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: C++ Boost Library; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Boost.org}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+C++ Boost Library}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+Boost Software License - Version 1.0 - August 17th, 2003 \line Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by this license (the "Software") to use, reproduce, display, distribute, execute, and transmit the Software, and to prepare derivative works of the Software, and to permit third-parties to whom the Software is furnished to do so, all subject to the following: \line The copyright notices in the Software and this entire statement, including the above license grant, this restriction and the following disclaimer, must be included in all copies of the Software, in whole or in part, and all derivative works of the Software, unless such copies or derivative works are solely in the form of machine-executable object code generated by a source language processor. \line THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Cairo; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Cairographics.org}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Cairo (B)}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{{\field{\*\fldinst HYPERLINK "#mpllic" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+jump to MPL 1.1}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product:Charis SIL v4; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+SIL International}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Charis SIL v.4}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line This Font Software is Copyright (c) 1997-2006, SIL International (http://scripts.sil.org/). \line All Rights Reserved. \line "Charis SIL" is a Reserved Font Name for this Font Software. \line "SIL" is a Reserved Font Name for this Font Software. \line This Font Software is licensed under the SIL Open Font License, Version 1.0. \line No modification of the license is permitted, only verbatim copy is allowed. \line This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL \line ----------------------------------------------------------- \line SIL OPEN FONT LICENSE Version 1.0 - 22 November 2005 \line ----------------------------------------------------------- \line PREAMBLE \line The goals of the Open Font License (OFL) are to stimulate worldwide development of cooperative font projects, to support the font creation efforts of academic and linguistic communities, and to provide an open framework in which fonts may be shared and improved in partnership with others. \line The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and sold with any software provided that the font names of derivative works are changed. The fonts and derivatives, however, cannot be released under any other type of license. \line DEFINITIONS \line "Font Software" refers to any and all of the following: \line - font files \line - data files \line - source code \line - build scripts \line - documentation \line "Reserved Font Name" refers to the Font Software name as seen by users and any other names as specified after the copyright statement. \line "Standard Version" refers to the collection of Font Software components as distributed by the Copyright Holder. \line "Modified Version" refers to any derivative font software made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Standard Version, by changing formats or by porting the Font Software to a new environment. \line "Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software. \line PERMISSION & CONDITIONS \line Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions: \line 1) Neither the Font Software nor any of its individual components, in Standard or Modified Versions, may be sold by itself. \line 2) Standard or Modified Versions of the Font Software may be bundled, redistributed and sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user. \line 3) No Modified Version of the Font Software may use the Reserved Font Name(s), in part or in whole, unless explicit written permission is granted by the Copyright Holder. This restriction applies to all references stored in the Font Software, such as the font menu name and other font description fields, which are used to differentiate the font from others. \line 4) The name(s) of the Copyright Holder or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder and the Author(s) or with their explicit written permission. \line 5) The Font Software, modified or unmodified, in part or in whole, must be distributed using this license, and may not be distributed under any other license. \line TERMINATION \line This license becomes null and void if any of the above conditions are not met. \line DISCLAIMER THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product:KDE Crystal theme icons; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+KDE Artists: }
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+KDE Crystal theme icons}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+KDE Crystal theme icons. \line Copyright (C) 2002 and following years KDE Artists This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, version 2.1 of the License. }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+The Crystal Project are released under LGPL.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+GNU General Public License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+0.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+This License Agreement applies to any software library or other program}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+which contains a notice placed by the copyright holder or other authorized party}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+saying it may be distributed under the terms of this Lesser General Public}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License (also called "this License"). Each licensee is addressed as "you".}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+A "library" means a collection of software functions and/or data prepared}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+so as to be conveniently linked with application programs (which use some of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+those functions and data) to form executables.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+The "Library", below, refers to any such software library or work which}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+has been distributed under these terms. A "work based on the Library" means}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+either the Library or any derivative work under copyright law: that is to say, a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+work containing the Library or a portion of it, either verbatim or with}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+modifications and/or translated straightforwardly into another language.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+(Hereinafter, translation is included without limitation in the term}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+"modification".)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+"Source code" for a work means the preferred form of the work for making}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+modifications to it. For a library, complete source code means all the source}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+code for all modules it contains, plus any associated interface definition}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+files, plus the scripts used to control compilation and installation of the library.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Activities other than copying, distribution and modification are not}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+covered by this License; they are outside its scope. The act of running a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+program using the Library is not restricted, and output from such a program is}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+covered only if its contents constitute a work based on the Library (independent}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of the use of the Library in a tool for writing it). Whether that is true}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+depends on what the Library does and what the program that uses the Library does.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+1.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+You may copy and distribute verbatim copies of the Library's complete}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+source code as you receive it, in any medium, provided that you conspicuously}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+and appropriately publish on each copy an appropriate copyright notice and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+disclaimer of warranty; keep intact all the notices that refer to this License}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+and to the absence of any warranty; and distribute a copy of this License along}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+with the Library.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+You may charge a fee for the physical act of transferring a copy, and you}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+may at your option offer warranty protection in exchange for a fee.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+2.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+You may modify your copy or copies of the Library or any portion of it,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+thus forming a work based on the Library, and copy and distribute such}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+modifications or work under the terms of Section 1 above, provided that you also}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+meet all of these conditions:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+         }{\rtlch \ltrch\loch
+1. The modified work must itself be a software library.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+         }{\rtlch \ltrch\loch
+2. You must cause the files modified to carry prominent notices stating}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+that you changed the files and the date of any change.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+         }{\rtlch \ltrch\loch
+3. You must cause the whole of the work to be licensed at no charge to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+all third parties under the terms of this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+         }{\rtlch \ltrch\loch
+4. If a facility in the modified Library refers to a function or a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+table of data to be supplied by an application program that uses the facility,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+other than as an argument passed when the facility is invoked, then you must}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+make a good faith effort to ensure that, in the event an application does not}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+supply such function or table, the facility still operates, and performs}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+whatever part of its purpose remains meaningful.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+(For example, a function in a library to compute square roots has a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+purpose that is entirely well-defined independent of the application. Therefore,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Subsection 2d requires that any application-supplied function or table used by}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+this function must be optional: if the application does not supply it, the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+square root function must still compute square roots.)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+These requirements apply to the modified work as a whole. If identifiable}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+sections of that work are not derived from the Library, and can be reasonably}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+considered independent and separate works in themselves, then this License, and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+its terms, do not apply to those sections when you distribute them as separate}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+works. But when you distribute the same sections as part of a whole which is a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+work based on the Library, the distribution of the whole must be on the terms of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+this License, whose permissions for other licensees extend to the entire whole,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+and thus to each and every part regardless of who wrote it.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Thus, it is not the intent of this section to claim rights or contest your}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+rights to work written entirely by you; rather, the intent is to exercise the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+right to control the distribution of derivative or collective works based on the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Library.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+In addition, mere aggregation of another work not based on the Library}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+with the Library (or with a work based on the Library) on a volume of a storage}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+or distribution medium does not bring the other work under the scope of this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+3.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+You may opt to apply the terms of the ordinary GNU General Public License}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+instead of this License to a given copy of the Library. To do this, you must}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+alter all the notices that refer to this License, so that they refer to the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+ordinary GNU General Public License, version 2, instead of to this License. (If}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+a newer version than version 2 of the ordinary GNU General Public License has}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+appeared, then you can specify that version instead if you wish.) Do not make}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+any other change in these notices.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Once this change is made in a given copy, it is irreversible for that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+copy, so the ordinary GNU General Public License applies to all subsequent}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+copies and derivative works made from that copy.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+This option is useful when you wish to copy part of the code of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Library into a program that is not a library.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+4.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+You may copy and distribute the Library (or a portion or derivative of it,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+under Section 2) in object code or executable form under the terms of Sections 1}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+and 2 above provided that you accompany it with the complete corresponding}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+machine-readable source code, which must be distributed under the terms of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Sections 1 and 2 above on a medium customarily used for software interchange.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+If distribution of object code is made by offering access to copy from a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+designated place, then offering equivalent access to copy the source code from}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the same place satisfies the requirement to distribute the source code, even}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+though third parties are not compelled to copy the source along with the object}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+code.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+5.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+A program that contains no derivative of any portion of the Library, but}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+is designed to work with the Library by being compiled or linked with it, is}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+called a "work that uses the Library". Such a work, in isolation, is not a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+derivative work of the Library, and therefore falls outside the scope of this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+However, linking a "work that uses the Library" with the Library creates}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+an executable that is a derivative of the Library (because it contains portions}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of the Library), rather than a "work that uses the library". The executable is}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+therefore covered by this License. Section 6 states terms for distribution of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+such executables.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+When a "work that uses the Library" uses material from a header file that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+is part of the Library, the object code for the work may be a derivative work of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the Library even though the source code is not. Whether this is true is}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+especially significant if the work can be linked without the Library, or if the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+work is itself a library. The threshold for this to be true is not precisely}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+defined by law.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+If such an object file uses only numerical parameters, data structure}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+layouts and accessors, and small macros and small inline functions (ten lines or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+less in length), then the use of the object file is unrestricted, regardless of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+whether it is legally a derivative work. (Executables containing this object}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+code plus portions of the Library will still fall under Section 6.)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Otherwise, if the work is a derivative of the Library, you may distribute}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the object code for the work under the terms of Section 6. Any executables}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+containing that work also fall under Section 6, whether or not they are linked}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+directly with the Library itself.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+6.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+As an exception to the Sections above, you may also combine or link a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+"work that uses the Library" with the Library to produce a work containing}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+portions of the Library, and distribute that work under terms of your choice,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+provided that the terms permit modification of the work for the customer's own}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+use and reverse engineering for debugging such modifications.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+You must give prominent notice with each copy of the work that the Library}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+is used in it and that the Library and its use are covered by this License. You}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+must supply a copy of this License. If the work during execution displays}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+copyright notices, you must include the copyright notice for the Library among}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+them, as well as a reference directing the user to the copy of this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Also, you must do one of these things:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+         }{\rtlch \ltrch\loch
+1. Accompany the work with the complete corresponding machine-readable}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+source code for the Library including whatever changes were used in the work}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+(which must be distributed under Sections 1 and 2 above); and, if the work is an}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+executable linked with the Library, with the complete machine-readable "work}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+that uses the Library", as object code and/or source code, so that the user can}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+modify the Library and then relink to produce a modified executable containing}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the modified Library. (It is understood that the user who changes the contents}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of definitions files in the Library will not necessarily be able to recompile}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the application to use the modified definitions.) .}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+         }{\rtlch \ltrch\loch
+2. Use a suitable shared library mechanism for linking with the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Library. A suitable mechanism is one that (1) uses at run time a copy of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+library already present on the user's computer system, rather than copying}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+library functions into the executable, and (2) will operate properly with a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+modified version of the library, if the user installs one, as long as the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+modified version is interface-compatible with the version that the work was made}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+with.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+         }{\rtlch \ltrch\loch
+3. Accompany the work with a written offer, valid for at least three}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+years, to give the same user the materials specified in Subsection 6a, above,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+for a charge no more than the cost of performing this distribution.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+         }{\rtlch \ltrch\loch
+4. If distribution of the work is made by offering access to copy from}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+a designated place, offer equivalent access to copy the above specified}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+materials from the same place.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+         }{\rtlch \ltrch\loch
+5. Verify that the user has already received a copy of these materials}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+or that you have already sent this user a copy.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+For an executable, the required form of the "work that uses the Library"}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+must include any data and utility programs needed for reproducing the executable}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+from it. However, as a special exception, the materials to be distributed need}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+not include anything that is normally distributed (in either source or binary}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+form) with the major components (compiler, kernel, and so on) of the operating}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+system on which the executable runs, unless that component itself accompanies}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the executable.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+It may happen that this requirement contradicts the license restrictions}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of other proprietary libraries that do not normally accompany the operating}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+system. Such a contradiction means you cannot use both them and the Library}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+together in an executable that you distribute.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+7.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+You may place library facilities that are a work based on the Library}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+side-by-side in a single library together with other library facilities not}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+covered by this License, and distribute such a combined library, provided that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the separate distribution of the work based on the Library and of the other}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+library facilities is otherwise permitted, and provided that you do these two}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+things:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+         }{\rtlch \ltrch\loch
+1.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+            }{\rtlch \ltrch\loch
+Accompany the combined library with a copy of the same work based on}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the Library, uncombined with any other library facilities. This must be}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distributed under the terms of the Sections above.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+         }{\rtlch \ltrch\loch
+2.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+            }{\rtlch \ltrch\loch
+Give prominent notice with the combined library of the fact that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+part of it is a work based on the Library, and explaining where to find the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+accompanying uncombined form of the same work.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+8.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+You may not copy, modify, sublicense, link with, or distribute the Library}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+except as expressly provided under this License. Any attempt otherwise to copy,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+modify, sublicense, link with, or distribute the Library is void, and will}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+automatically terminate your rights under this License. However, parties who}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+have received copies, or rights, from you under this License will not have their}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+licenses terminated so long as such parties remain in full compliance.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+9.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+You are not required to accept this License, since you have not signed it.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+However, nothing else grants you permission to modify or distribute the Library}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+or its derivative works. These actions are prohibited by law if you do not}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+accept this License. Therefore, by modifying or distributing the Library (or any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+work based on the Library), you indicate your acceptance of this License to do}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+so, and all its terms and conditions for copying, distributing or modifying the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Library or works based on it.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+10.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Each time you redistribute the Library (or any work based on the Library),}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the recipient automatically receives a license from the original licensor to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+copy, distribute, link with or modify the Library subject to these terms and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+conditions. You may not impose any further restrictions on the recipients'}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+exercise of the rights granted herein. You are not responsible for enforcing}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+compliance by third parties with this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+11.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+If, as a consequence of a court judgment or allegation of patent}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+infringement or for any other reason (not limited to patent issues), conditions}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+are imposed on you (whether by court order, agreement or otherwise) that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+contradict the conditions of this License, they do not excuse you from the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+conditions of this License. If you cannot distribute so as to satisfy}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+simultaneously your obligations under this License and any other pertinent}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+obligations, then as a consequence you may not distribute the Library at all.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+For example, if a patent license would not permit royalty-free redistribution of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the Library by all those who receive copies directly or indirectly through you,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+then the only way you could satisfy both it and this License would be to refrain}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+entirely from distribution of the Library.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+If any portion of this section is held invalid or unenforceable under any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+particular circumstance, the balance of the section is intended to apply, and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the section as a whole is intended to apply in other circumstances.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+It is not the purpose of this section to induce you to infringe any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+patents or other property right claims or to contest validity of any such}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+claims; this section has the sole purpose of protecting the integrity of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+free software distribution system which is implemented by public license}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+practices. Many people have made generous contributions to the wide range of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+software distributed through that system in reliance on consistent application}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of that system; it is up to the author/donor to decide if he or she is willing}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+to distribute software through any other system and a licensee cannot impose}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+that choice.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+This section is intended to make thoroughly clear what is believed to be a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+consequence of the rest of this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+12.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+If the distribution and/or use of the Library is restricted in certain}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+countries either by patents or by copyrighted interfaces, the original copyright}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+holder who places the Library under this License may add an explicit}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+geographical distribution limitation excluding those countries, so that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distribution is permitted only in or among countries not thus excluded. In such}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+case, this License incorporates the limitation as if written in the body of this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+13.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+The Free Software Foundation may publish revised and/or new versions of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the Lesser General Public License from time to time. Such new versions will be}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+similar in spirit to the present version, but may differ in detail to address}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+new problems or concerns.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Each version is given a distinguishing version number. If the Library}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+specifies a version number of this License which applies to it and "any later}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+version", you have the option of following the terms and conditions either of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+that version or of any later version published by the Free Software Foundation.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+If the Library does not specify a license version number, you may choose any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+version ever published by the Free Software Foundation.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+14.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+If you wish to incorporate parts of the Library into other free programs}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+whose distribution conditions are incompatible with these, write to the author}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+to ask for permission. For software which is copyrighted by the Free Software}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Foundation, write to the Free Software Foundation; we sometimes make exceptions}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+for this. Our decision will be guided by the two goals of preserving the free}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+status of all derivatives of our free software and of promoting the sharing and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+reuse of software generally.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+No Warranty}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+15.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Because the library is licensed free of charge, there is no warranty for}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the library, to the extent permitted by applicable law. Except when otherwise}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+stated in writing the copyright holders and/or other parties provide the library}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+"as is" without warranty of any kind, either expressed or implied, including,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+but not limited to, the implied warranties of merchantability and fitness for a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+particular purpose. The entire risk as to the quality and performance of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+library is with you. Should the library prove defective, you assume the cost of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+all necessary servicing, repair or correction.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+16.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+In no event unless required by applicable law or agreed to in writing will}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+any copyright holder, or any other party who may modify and/or redistribute the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+library as permitted above, be liable to you for damages, including any general,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+special, incidental or consequential damages arising out of the use or inability}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+to use the library (including but not limited to loss of data or data being}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+rendered inaccurate or losses sustained by you or third parties or a failure of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the library to operate with any other software), even if such holder or other}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+party has been advised of the possibility of such damages.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20\sb0\sa283{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: libcurl; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Daniel Stenberg}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+libcurl}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+Copyright (C) 1998-2001, Daniel Stenberg, , et al. \line Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. \line In order to be useful for every potential user, the curl and libcurl are dual-licensed under the MPL and the MIT/X-derivate licenses. \line You may opt to use, copy, modify, merge, publish, distribute and/or sell copies of the Software, and permit persons to whom the Software is furnished to do so, under the terms of the MPL or the MIT/X-derivate licenses. You may pick one of these licenses. The files MITX.txt and MPL-1.1.txt contain the license texts. \line As a courtesy to the open-source and free software community, we ask you to dual-license any modifications that you make as well, under the terms of this document. \line Please remember to always keep the licensing information included in individual source files up-to-date, so as to avoid misleading anyone as to the status of these files. \line I will use a submission policy according to which I will only enter contributions into the CVS tree if the contributor agrees to both licenses and this dual-license approach. }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Afrikaans dictionary; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Friedel Wolff}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Afrikaans dictionary}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line }{{\field{\*\fldinst HYPERLINK "#lgpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+Jump to LGPL}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Stavekontrolden (Danish Spellchecker); Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Finn Gruwier Larsen}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Stavekontrolden (Danish Spellchecker) (LGPL v2.1)}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line }{{\field{\*\fldinst HYPERLINK "#lgpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+jump to GNU Lesser General Public License}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Slovenian spellcheck dictionary; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Jaak Pruulmann}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Estonian dictionaries}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line }{{\field{\*\fldinst HYPERLINK "#lgpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+Gnu Lesser General Public License}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: French dictionary; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+dico.savant@free.fr}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+French dictionary}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line }{{\field{\*\fldinst HYPERLINK "#mpllic" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+jump to Mozilla Public License}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Italian dictionary; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Davide Prina}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Italian dictionary}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line }{{\field{\*\fldinst HYPERLINK "#gpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+Jump to GPL}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: MySpell-ku (Kurdish Spellchecker); Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Erdal Ronahi}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+MySpell-ku (Kurdish Spellchecker) (LGPL v2.1)}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line }{{\field{\*\fldinst HYPERLINK "#lgpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+jump to GNU Lesser General Public License}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Lithuanian spelling dictionary; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Albertas Agejevas}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Lithuaninian spelling dictionary}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line Copyright (c) Albertas Agejevas , 2000, 2001 \line All rights reserved. \line Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: \line 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. \line 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. \line 3. Neither the name of the Albertas Agejevas nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. \line THIS SOFTWARE IS PROVIDED BY ALBERTAS AGEJEVAS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ALBERTAS AGEJEVAS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: 'Nepali dictionares; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Madan Puraskar Pustkalaya}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Nepali dictionaries}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line }{{\field{\*\fldinst HYPERLINK "#lgpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+jump to GNU Lesser General Public License}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Polish spelling dictionary; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Marek Futrega}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Polish spelling dictionary}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line }{{\field{\*\fldinst HYPERLINK "#mpllic" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+jump to Mozilla Public License}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Slovak dictionary; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Zdenko Podobny}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Slovak dictionary}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line }{{\field{\*\fldinst HYPERLINK "#mpllic" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+jump to Mozilla Public License}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Slovenian spellcheck dictionary; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Ales Kosir}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Slovenian spellcheck dictionary}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line }{{\field{\*\fldinst HYPERLINK "#lgpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+Gnu Lesser General Public License}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: dictionaries for South African English; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+David Bartlett and Andrew Brown}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+dictionaries for South African English}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line }{{\field{\*\fldinst HYPERLINK "#lgpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+jump to GNU Lesser General Public License}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Swedish dictionary; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+G\uc2 \u246\'c3\'b6ran Anderson\uc1 }
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Swedish dictionary}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line }{{\field{\*\fldinst HYPERLINK "#lgpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+jump to GNU Lesser General Public License}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: expat XML Parser Toolkit; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+James Clark}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+expat XML Parser Toolkit}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper \line Copyright (c) 2001, 2002, 2003 Expat maintainers. \line Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: \line The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. \line THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Freetype; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Freetype Project}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Freetype Library}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line Legal Terms \line =========== \line \line 0. Definitions \line -------------- \line Throughout this license, the terms `package', `FreeType Project', and `FreeType archive' refer to the set of files originally distributed by the authors (David Turner, Robert Wilhelm, and Werner Lemberg) as the `FreeType Project', be they named as alpha, beta or final release. \line `You' refers to the licensee, or person using the project, where `using' is a generic term including compiling the project's source code as well as linking it to form a `program' or `executable'. This program is referred to as `a program using the FreeType engine'. \line This license applies to all files distributed in the original FreeType Project, including all source code, binaries and documentation, unless otherwise stated in the file in its original, unmodified form as distributed in the original archive. If you are unsure whether or not a particular file is covered by this license, you must contact us to verify this. \line The FreeType Project is copyright (C) 1996-2000 by David Turner, Robert Wilhelm, and Werner Lemberg. All rights reserved except as specified below. \line \line 1. No Warranty \line -------------- \line THE FREETYPE PROJECT IS PROVIDED `AS IS' WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT WILL ANY OF THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY DAMAGES CAUSED BY THE USE OR THE INABILITY TO USE, OF THE FREETYPE PROJECT. \line \line 2. Redistribution \line ----------------- \line This license grants a worldwide, royalty-free, perpetual and irrevocable right and license to use, execute, perform, compile, display, copy, create derivative works of, distribute and sublicense the FreeType Project (in both source and object code forms) and derivative works thereof for any purpose; and to authorize others to exercise some or all of the rights granted herein, subject to the following conditions: \line o Redistribution of source code must retain this license file (`FTL.TXT') unaltered; any additions, deletions or changes to the original files must be clearly indicated in accompanying documentation. The copyright notices of the unaltered, original files must be preserved in all copies of source files. \line o Redistribution in binary form must provide a disclaimer that states that the software is based in part of the work of the FreeType Team, in the distribution documentation. We also encourage you to put an URL to the FreeType web page in your documentation, though this isn't mandatory. \line \line These conditions apply to any software derived from or based on the FreeType Project, not just the unmodified files. If you use our work, you must acknowledge us. However, no fee need be paid to us. \line \line 3. Advertising \line -------------- \line Neither the FreeType authors and contributors nor you shall use the name of the other for commercial, advertising, or promotional purposes without specific prior written permission. \line We suggest, but do not require, that you use one or more of the following phrases to refer to this software in your documentation or advertising materials: `FreeType Project', `FreeType Engine', `FreeType library', or `FreeType Distribution'. \line As you have not signed this license, you are not required to accept it. However, as the FreeType Project is copyrighted material, only this license, or another one contracted with the authors, grants you the right to use, distribute, and modify it. Therefore, by using, distributing, or modifying the FreeType Project, you indicate that you understand and accept all the terms of this license. \line \line 4. Contacts \line ----------- \line There are two mailing lists related to FreeType: \line o freetype@freetype.org \line Discusses general use and applications of FreeType, as well as future and wanted additions to the library and distribution. If you are looking for support, start in this list if you haven't found anything to help you in the documentation. \line o devel@freetype.org \line Discusses bugs, as well as engine internals, design issues, specific licenses, porting, etc. \line o http://www.freetype.org \line Holds the current FreeType web page, which will allow you to download our latest development version and read online documentation. \line \line You can also contact us individually at: \line \line David Turner \line Robert Wilhelm \line Werner Lemberg }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: GTK+ (The Gimp Toolkit); Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+gimp.org}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+The Gimp Toolkit (GTK+)}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{{\field{\*\fldinst HYPERLINK "#lgpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+jump to LGPL}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product:HSQL Database Engine; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Thomas Mueller and the Hypersonic SQL Group: }
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+HSQLDB}
+\par \pard\plain \s21\sb0\sa120\ql{\rtlch \ltrch\loch
+\line }{\b\rtlch \ltrch\loch
+ORIGINAL LICENSE (a.k.a. "hypersonic_lic.txt")}
+\par \pard\plain \s21\sb0\sa120\ql{\b\rtlch \ltrch\loch
+For content, code, and products originally developed by Thomas Mueller and the Hypersonic SQL Group:}{\rtlch \ltrch\loch
+\line \line Copyright (c) 1995-2000 by the Hypersonic SQL Group.\line All rights reserved. }
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+Redistribution and use in source and binary forms, with or without\line modification, are permitted provided that the following conditions are met:\line \line Redistributions of source code must retain the above copyright notice, this\line list of conditions and the following disclaimer.\line \line Redistributions in binary form must reproduce the above copyright notice,\line this list of conditions and the following disclaimer in the documentation\line and/or other materials provided with the distribution.\line \line Neither the name of the Hypersonic SQL Group nor the names of its\line contributors may be used to endorse or promote products derived from this\line software without specific prior written permission.\line \line THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"\line AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\line IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\line ARE DISCLAIMED. IN NO EVENT SHALL THE HYPERSONIC SQL GROUP, \line OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, \line EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, \line PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\line LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\line ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\line (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\line SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.}
+\par \pard\plain \s21\sb0\sa120\ql{\rtlch \ltrch\loch
+This software consists of voluntary contributions made by many individuals on behalf of the\line Hypersonic SQL Group.}
+\par \pard\plain \s4\b\hich\af9\dbch\af12\afs24\ab\loch\f4\fs24\ql{\rtlch \ltrch\loch
+For work added by the HSQL Development Group (a.k.a. hsqldb_lic.txt):}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+Copyright (c) 2001-2004, The HSQL Development Group\line All rights reserved.\line \line Redistribution and use in source and binary forms, with or without\line modification, are permitted provided that the following conditions are met:\line \line Redistributions of source code must retain the above copyright notice, this\line list of conditions and the following disclaimer.\line \line Redistributions in binary form must reproduce the above copyright notice,\line this list of conditions and the following disclaimer in the documentation\line and/or other materials provided with the distribution.\line \line Neither the name of the HSQL Development Group nor the names of its\line contributors may be used to endorse or promote products derived from this\line software without specific prior written permission.\line \line THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"\line AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\line IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\line ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, \line OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, \line EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, \line PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\line LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\line ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\line (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\line SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Polish hyphenation dictionary; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Bence Nagy}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Hungarian hyphenation dictionary}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line }{{\field{\*\fldinst HYPERLINK "#gpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+Lesser Gnu Library License}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Lithuanian pattern for hyphenation; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+n/a}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Lithuanian pattern for hyphenation}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line }{{\field{\*\fldinst HYPERLINK "#lppl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+jump to the LaTeX Project Public License}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Polish hyphenation dictionary; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Adam Polaczynski}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Polish hyphenation dictionary}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line }{{\field{\*\fldinst HYPERLINK "#lgpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+Lesser Gnu Library License}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Slovenian pattern for hyphenation; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Matjaz Vrecko}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Slovenian pattern for hyphenation}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line }{{\field{\*\fldinst HYPERLINK "#lgpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+Lesser Gnu Library License}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Zulu hyphenation dictionary; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Friedel Wolff}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Zulu hyphenation dictionary}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line }{{\field{\*\fldinst HYPERLINK "#lgpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+Lesser Gnu Library License}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: ICU; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+International Business Machine Corporation (IBM)}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+ICU}
+\par \pard\plain \s4\b\hich\af9\dbch\af12\afs24\ab\loch\f4\fs24{\rtlch \ltrch\loch
+ICU License - ICU 1.8.1 and later}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+COPYRIGHT AND PERMISSION NOTICE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Copyright (c) 1995-2002 International Business Machines Corporation and others}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+All rights reserved.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Permission is hereby granted, free of charge, to any person obtaining a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+copy of this software and associated documentation files (the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+"Software"), to deal in the Software without restriction, including}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+without limitation the rights to use, copy, modify, merge, publish,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distribute, and/or sell copies of the Software, and to permit persons}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+to whom the Software is furnished to do so, provided that the above}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+copyright notice(s) and this permission notice appear in all copies of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the Software and that both the above copyright notice(s) and this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+permission notice appear in supporting documentation.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Except as contained in this notice, the name of a copyright holder}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+shall not be used in advertising or otherwise to promote the sale, use}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+or other dealings in this Software without prior written authorization}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of the copyright holder.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+--------------------------------------------------------------------------------}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20\sb0\sa283{\rtlch \ltrch\loch
+All trademarks and registered trademarks mentioned herein are the property of their respective owners.}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: JDOM; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Jason Hunter, Brett McLaughlin}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+JDOM}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. All rights reserved. \line Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: \line 1. Redistributions of source code must retain the above copyright notice, this list of conditions, and the following disclaimer. \line 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions, and the disclaimer that follows these conditions in the documentation and/or other materials provided with the distribution. \line 3. The name "JDOM" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact . \line 4. Products derived from this software may not be called "JDOM", nor may "JDOM" appear in their name, without prior written permission from the JDOM Project Management . \line In addition, we request (but do not require) that you include in the end-user documentation provided with the redistribution and/or in the software itself an acknowledgement equivalent to the following: \line "This product includes software developed by the JDOM Project (http://www.jdom.org/)." \line Alternatively, the acknowledgment may be graphical using the logos available at http://www.jdom.org/images/logos. \line THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \line This software consists of voluntary contributions made by many individuals on behalf of the JDOM Project and was originally created by Jason Hunter and Brett McLaughlin . For more information on the JDOM Project, please see . }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: IJG JPEG Library; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Independent JPEG Group (IJG)}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+IJG JPEG Library}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+LEGAL ISSUES}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+============}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+In plain English:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+1. We don't promise that this software works.  (But if you find any bugs,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+please let us know!)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+2. You can use this software for whatever you want.  You don't have to pay us.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+3. You may not pretend that you wrote this software.  If you use it in a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+program, you must acknowledge somewhere in your documentation that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+you've used the IJG code.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+In legalese:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+The authors make NO WARRANTY or representation, either express or implied,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+with respect to this software, its quality, accuracy, merchantability, or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+fitness for a particular purpose.  This software is provided "AS IS", and you,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+its user, assume the entire risk as to its quality and accuracy.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+This software is copyright (C) 1991-1998, Thomas G. Lane.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+All Rights Reserved except as specified below.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Permission is hereby granted to use, copy, modify, and distribute this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+software (or portions thereof) for any purpose, without fee, subject to these}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+conditions:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+(1) If any part of the source code for this software is distributed, then this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+README file must be included, with this copyright and no-warranty notice}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+unaltered; and any additions, deletions, or changes to the original files}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+must be clearly indicated in accompanying documentation.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+(2) If only executable code is distributed, then the accompanying}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+documentation must state that "this software is based in part on the work of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the Independent JPEG Group".}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+(3) Permission for use of this software is granted only if the user accepts}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+full responsibility for any undesirable consequences; the authors accept}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+NO LIABILITY for damages of any kind.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+These conditions apply to any software derived from or based on the IJG code,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+not just to the unmodified library.  If you use our work, you ought to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+acknowledge us.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Permission is NOT granted for the use of any IJG author's name or company name}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+in advertising or publicity relating to this software or products derived from}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+it.  This software may be referred to only as "the Independent JPEG Group's}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+software".}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+We specifically permit and encourage the use of this software as the basis of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+commercial products, provided that all warranty or liability claims are}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+assumed by the product vendor.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+ansi2knr.c is included in this distribution by permission of L. Peter Deutsch,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+ansi2knr.c is NOT covered by the above copyright and conditions, but instead}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+by the usual distribution terms of the Free Software Foundation; principally,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+that you must include source code if you redistribute it.  (See the file}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+ansi2knr.c for full details.)  However, since ansi2knr.c is not needed as part}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of any program generated from the IJG code, this does not limit you more than}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the foregoing paragraphs do.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+The Unix configuration script "configure" was produced with GNU Autoconf.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+It is copyright by the Free Software Foundation but is freely distributable.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+The same holds for its supporting scripts (config.guess, config.sub,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+ltconfig, ltmain.sh).  Another support script, install-sh, is copyright}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+by M.I.T. but is also freely distributable.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+It appears that the arithmetic coding option of the JPEG spec is covered by}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+patents owned by IBM, AT&T, and Mitsubishi.  Hence arithmetic coding cannot}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+legally be used without obtaining one or more licenses.  For this reason,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+support for arithmetic coding has been removed from the free JPEG software.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+(Since arithmetic coding provides only a marginal gain over the unpatented}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Huffman mode, it is unlikely that very many implementations will support it.)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+So far as we are aware, there are no patent restrictions on the remaining}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+code.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+The IJG distribution formerly included code to read and write GIF files.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+To avoid entanglement with the Unisys LZW patent, GIF reading support has}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+been removed altogether, and the GIF writer has been simplified to produce}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+"uncompressed GIFs".  This technique does not use the LZW algorithm; the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+resulting GIF files are larger than usual, but are readable by all standard}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+GIF decoders.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+We are required to state that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+"The Graphics Interchange Format(c) is the Copyright property of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+CompuServe Incorporated.  GIF(sm) is a Service Mark property of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+CompuServe Incorporated."}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20\sb0\sa283{\rtlch \ltrch\loch
+}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: libegg; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Anders Carlson }
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+libegg}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{{\field{\*\fldinst HYPERLINK "#lgpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+jump to LGPL}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: libmspack; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Stuart Caie }
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+libmspack}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{{\field{\*\fldinst HYPERLINK "#lgpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+jump to LGPL}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Redland RDF Library librdf; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Dave Beckett}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+librdf}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{{\field{\*\fldinst HYPERLINK "#lgpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+jump to LGPL}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: GNU ISO C++ Library; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Free Software Foundation, Inc.}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+GNU ISO C++ Library}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+\line }{{\field{\*\fldinst HYPERLINK "#gpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+Jump to GPL}}}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+GNU GENERAL PUBLIC LICENSE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+                       }{\rtlch \ltrch\loch
+Version 2, June 1991}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+Everyone is permitted to copy and distribute verbatim copies}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+of this license document, but changing it is not allowed.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+                            }{\rtlch \ltrch\loch
+Preamble}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+The licenses for most software are designed to take away your}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+freedom to share and change it.  By contrast, the GNU General Public}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License is intended to guarantee your freedom to share and change free}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+software--to make sure the software is free for all its users.  This}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+General Public License applies to most of the Free Software}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Foundation's software and to any other program whose authors commit to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+using it.  (Some other Free Software Foundation software is covered by}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the GNU Library General Public License instead.)  You can apply it to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+your programs, too.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+When we speak of free software, we are referring to freedom, not}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+price.  Our General Public Licenses are designed to make sure that you}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+have the freedom to distribute copies of free software (and charge for}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+this service if you wish), that you receive source code or can get it}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+if you want it, that you can change the software or use pieces of it}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+in new free programs; and that you know you can do these things.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+To protect your rights, we need to make restrictions that forbid}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+anyone to deny you these rights or to ask you to surrender the rights.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+These restrictions translate to certain responsibilities for you if you}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distribute copies of the software, or if you modify it.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+For example, if you distribute copies of such a program, whether}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+gratis or for a fee, you must give the recipients all the rights that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+you have.  You must make sure that they, too, receive or can get the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+source code.  And you must show them these terms so they know their}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+rights.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+We protect your rights with two steps: (1) copyright the software, and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+(2) offer you this license which gives you legal permission to copy,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distribute and/or modify the software.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+Also, for each author's protection and ours, we want to make certain}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+that everyone understands that there is no warranty for this free}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+software.  If the software is modified by someone else and passed on, we}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+want its recipients to know that what they have is not the original, so}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+that any problems introduced by others will not reflect on the original}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+authors' reputations.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+Finally, any free program is threatened constantly by software}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+patents.  We wish to avoid the danger that redistributors of a free}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+program will individually obtain patent licenses, in effect making the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+program proprietary.  To prevent this, we have made it clear that any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+patent must be licensed for everyone's free use or not licensed at all.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+The precise terms and conditions for copying, distribution and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+modification follow.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+                    }{\rtlch \ltrch\loch
+GNU GENERAL PUBLIC LICENSE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+0. This License applies to any program or other work which contains}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+a notice placed by the copyright holder saying it may be distributed}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+under the terms of this General Public License.  The "Program", below,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+refers to any such program or work, and a "work based on the Program"}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+means either the Program or any derivative work under copyright law:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+that is to say, a work containing the Program or a portion of it,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+either verbatim or with modifications and/or translated into another}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+language.  (Hereinafter, translation is included without limitation in}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the term "modification".)  Each licensee is addressed as "you".}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Activities other than copying, distribution and modification are not}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+covered by this License; they are outside its scope.  The act of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+running the Program is not restricted, and the output from the Program}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+is covered only if its contents constitute a work based on the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Program (independent of having been made by running the Program).}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Whether that is true depends on what the Program does.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+1. You may copy and distribute verbatim copies of the Program's}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+source code as you receive it, in any medium, provided that you}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+conspicuously and appropriately publish on each copy an appropriate}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+copyright notice and disclaimer of warranty; keep intact all the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+notices that refer to this License and to the absence of any warranty;}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+and give any other recipients of the Program a copy of this License}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+along with the Program.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+You may charge a fee for the physical act of transferring a copy, and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+you may at your option offer warranty protection in exchange for a fee.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+2. You may modify your copy or copies of the Program or any portion}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of it, thus forming a work based on the Program, and copy and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distribute such modifications or work under the terms of Section 1}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+above, provided that you also meet all of these conditions:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+a) You must cause the modified files to carry prominent notices}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+stating that you changed the files and the date of any change.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+b) You must cause any work that you distribute or publish, that in}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+whole or in part contains or is derived from the Program or any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+part thereof, to be licensed as a whole at no charge to all third}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+parties under the terms of this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+c) If the modified program normally reads commands interactively}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+when run, you must cause it, when started running for such}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+interactive use in the most ordinary way, to print or display an}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+announcement including an appropriate copyright notice and a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+notice that there is no warranty (or else, saying that you provide}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+a warranty) and that users may redistribute the program under}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+these conditions, and telling the user how to view a copy of this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+License.  (Exception: if the Program itself is interactive but}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+does not normally print such an announcement, your work based on}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+the Program is not required to print an announcement.)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+These requirements apply to the modified work as a whole.  If}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+identifiable sections of that work are not derived from the Program,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+and can be reasonably considered independent and separate works in}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+themselves, then this License, and its terms, do not apply to those}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+sections when you distribute them as separate works.  But when you}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distribute the same sections as part of a whole which is a work based}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+on the Program, the distribution of the whole must be on the terms of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+this License, whose permissions for other licensees extend to the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+entire whole, and thus to each and every part regardless of who wrote it.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Thus, it is not the intent of this section to claim rights or contest}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+your rights to work written entirely by you; rather, the intent is to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+exercise the right to control the distribution of derivative or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+collective works based on the Program.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+In addition, mere aggregation of another work not based on the Program}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+with the Program (or with a work based on the Program) on a volume of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+a storage or distribution medium does not bring the other work under}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the scope of this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+3. You may copy and distribute the Program (or a work based on it,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+under Section 2) in object code or executable form under the terms of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Sections 1 and 2 above provided that you also do one of the following:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+a) Accompany it with the complete corresponding machine-readable}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+source code, which must be distributed under the terms of Sections}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+1 and 2 above on a medium customarily used for software interchange; or,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+b) Accompany it with a written offer, valid for at least three}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+years, to give any third party, for a charge no more than your}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+cost of physically performing source distribution, a complete}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+machine-readable copy of the corresponding source code, to be}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+distributed under the terms of Sections 1 and 2 above on a medium}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+customarily used for software interchange; or,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+c) Accompany it with the information you received as to the offer}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+to distribute corresponding source code.  (This alternative is}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+allowed only for noncommercial distribution and only if you}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+received the program in object code or executable form with such}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+an offer, in accord with Subsection b above.)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+The source code for a work means the preferred form of the work for}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+making modifications to it.  For an executable work, complete source}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+code means all the source code for all modules it contains, plus any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+associated interface definition files, plus the scripts used to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+control compilation and installation of the executable.  However, as a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+special exception, the source code distributed need not include}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+anything that is normally distributed (in either source or binary}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+form) with the major components (compiler, kernel, and so on) of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+operating system on which the executable runs, unless that component}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+itself accompanies the executable.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+If distribution of executable or object code is made by offering}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+access to copy from a designated place, then offering equivalent}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+access to copy the source code from the same place counts as}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distribution of the source code, even though third parties are not}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+compelled to copy the source along with the object code.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+4. You may not copy, modify, sublicense, or distribute the Program}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+except as expressly provided under this License.  Any attempt}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+otherwise to copy, modify, sublicense or distribute the Program is}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+void, and will automatically terminate your rights under this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+However, parties who have received copies, or rights, from you under}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+this License will not have their licenses terminated so long as such}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+parties remain in full compliance.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+5. You are not required to accept this License, since you have not}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+signed it.  However, nothing else grants you permission to modify or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distribute the Program or its derivative works.  These actions are}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+prohibited by law if you do not accept this License.  Therefore, by}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+modifying or distributing the Program (or any work based on the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Program), you indicate your acceptance of this License to do so, and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+all its terms and conditions for copying, distributing or modifying}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the Program or works based on it.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+6. Each time you redistribute the Program (or any work based on the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Program), the recipient automatically receives a license from the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+original licensor to copy, distribute or modify the Program subject to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+these terms and conditions.  You may not impose any further}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+restrictions on the recipients' exercise of the rights granted herein.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+You are not responsible for enforcing compliance by third parties to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+7. If, as a consequence of a court judgment or allegation of patent}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+infringement or for any other reason (not limited to patent issues),}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+conditions are imposed on you (whether by court order, agreement or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+otherwise) that contradict the conditions of this License, they do not}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+excuse you from the conditions of this License.  If you cannot}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distribute so as to satisfy simultaneously your obligations under this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License and any other pertinent obligations, then as a consequence you}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+may not distribute the Program at all.  For example, if a patent}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+license would not permit royalty-free redistribution of the Program by}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+all those who receive copies directly or indirectly through you, then}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the only way you could satisfy both it and this License would be to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+refrain entirely from distribution of the Program.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+If any portion of this section is held invalid or unenforceable under}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+any particular circumstance, the balance of the section is intended to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+apply and the section as a whole is intended to apply in other}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+circumstances.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+It is not the purpose of this section to induce you to infringe any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+patents or other property right claims or to contest validity of any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+such claims; this section has the sole purpose of protecting the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+integrity of the free software distribution system, which is}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+implemented by public license practices.  Many people have made}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+generous contributions to the wide range of software distributed}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+through that system in reliance on consistent application of that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+system; it is up to the author/donor to decide if he or she is willing}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+to distribute software through any other system and a licensee cannot}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+impose that choice.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+This section is intended to make thoroughly clear what is believed to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+be a consequence of the rest of this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+8. If the distribution and/or use of the Program is restricted in}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+certain countries either by patents or by copyrighted interfaces, the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+original copyright holder who places the Program under this License}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+may add an explicit geographical distribution limitation excluding}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+those countries, so that distribution is permitted only in or among}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+countries not thus excluded.  In such case, this License incorporates}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the limitation as if written in the body of this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+9. The Free Software Foundation may publish revised and/or new versions}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of the General Public License from time to time.  Such new versions will}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+be similar in spirit to the present version, but may differ in detail to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+address new problems or concerns.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Each version is given a distinguishing version number.  If the Program}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+specifies a version number of this License which applies to it and "any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+later version", you have the option of following the terms and conditions}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+either of that version or of any later version published by the Free}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Software Foundation.  If the Program does not specify a version number of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+this License, you may choose any version ever published by the Free Software}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Foundation.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+10. If you wish to incorporate parts of the Program into other free}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+programs whose distribution conditions are different, write to the author}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+to ask for permission.  For software which is copyrighted by the Free}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Software Foundation, write to the Free Software Foundation; we sometimes}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+make exceptions for this.  Our decision will be guided by the two goals}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of preserving the free status of all derivatives of our free software and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of promoting the sharing and reuse of software generally.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+                            }{\rtlch \ltrch\loch
+NO WARRANTY}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+REPAIR OR CORRECTION.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+POSSIBILITY OF SUCH DAMAGES.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+                     }{\rtlch \ltrch\loch
+END OF TERMS AND CONDITIONS}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+            }{\rtlch \ltrch\loch
+How to Apply These Terms to Your New Programs}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+If you develop a new program, and you want it to be of the greatest}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+possible use to the public, the best way to achieve this is to make it}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+free software which everyone can redistribute and change under these terms.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+To do so, attach the following notices to the program.  It is safest}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+to attach them to the start of each source file to most effectively}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+convey the exclusion of warranty; and each file should have at least}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the "copyright" line and a pointer to where the full notice is found.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+Copyright (C)   }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+This program is free software; you can redistribute it and/or modify}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+it under the terms of the GNU General Public License as published by}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+the Free Software Foundation; either version 2 of the License, or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+(at your option) any later version.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+This program is distributed in the hope that it will be useful,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+but WITHOUT ANY WARRANTY; without even the implied warranty of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+GNU General Public License for more details.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+You should have received a copy of the GNU General Public License}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+along with this program; if not, write to the Free Software}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Also add information on how to contact you by electronic and paper mail.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+If the program is interactive, make it output a short notice like this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+when it starts in an interactive mode:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+Gnomovision version 69, Copyright (C) year  name of author}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+This is free software, and you are welcome to redistribute it}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+under certain conditions; type `show c' for details.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+The hypothetical commands `show w' and `show c' should show the appropriate}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+parts of the General Public License.  Of course, the commands you use may}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+be called something other than `show w' and `show c'; they could even be}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+mouse-clicks or menu items--whatever suits your program.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+You should also get your employer (if you work as a programmer) or your}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+school, if any, to sign a "copyright disclaimer" for the program, if}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+necessary.  Here is a sample; alter the names:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+Yoyodyne, Inc., hereby disclaims all copyright interest in the program}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+`Gnomovision' (which makes passes at compilers) written by James Hacker.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+, 1 April 1989}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+Ty Coon, President of Vice}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+This General Public License does not permit incorporating your program into}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+proprietary programs.  If your program is a subroutine library, you may}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+consider it more useful to permit linking proprietary applications with the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+library.  If this is what you want to do, use the GNU Library General}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Public License instead of this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Additional License(s)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+libstdc++:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+// Explicit instantiation file.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+// Free Software Foundation, Inc.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+//}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+// This file is part of the GNU ISO C++ Library.  This library is free}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+// software; you can redistribute it and/or modify it under the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+// terms of the GNU General Public License as published by the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+// Free Software Foundation; either version 2, or (at your option)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+// any later version.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+// This library is distributed in the hope that it will be useful,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+// but WITHOUT ANY WARRANTY; without even the implied warranty of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+// GNU General Public License for more details.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+// You should have received a copy of the GNU General Public License along}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+// with this library; see the file COPYING.  If not, write to the Free}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+02111-1307,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+// USA.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+// As a special exception, you may use this file as part of a free}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+software}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+// library without restriction.  Specifically, if other files instantiate}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+// templates or use macros or inline functions from this file, or you}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+compile}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+// this file and link it with other files to produce an executable, this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+// file does not by itself cause the resulting executable to be covered by}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+// the GNU General Public License.  This exception does not however}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+// invalidate any other reasons why the executable file might be}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+covered by}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+// the GNU General Public License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+libgcc:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+//}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+// ISO C++ 14882:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+//}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+/* Copyright (C) 2001, 2002 Free Software Foundation, Inc.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+Contributed by Jakub Jelinek .}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+This file is part of GNU CC.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+GNU CC is free software; you can redistribute it and/or modify}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+it under the terms of the GNU General Public License as published by}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+the Free Software Foundation; either version 2, or (at your option)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+any later version.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+GNU CC is distributed in the hope that it will be useful,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+but WITHOUT ANY WARRANTY; without even the implied warranty of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+GNU General Public License for more details.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+You should have received a copy of the GNU General Public License}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+along with GNU CC; see the file COPYING.  If not, write to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+the Free Software Foundation, 59 Temple Place - Suite 330,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+Boston, MA 02111-1307, USA.  */}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+/* As a special exception, if you link this library with other files,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+some of which are compiled with GCC, to produce an executable,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+this library does not by itself cause the resulting executable}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+to be covered by the GNU General Public License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+This exception does not however invalidate any other reasons why}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+the executable file might be covered by the GNU General Public}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License.  */}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+/* Locate the FDE entry for a given address, using PT_GNU_EH_FRAME ELF}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+segment and dl_iterate_phdr to avoid register/deregister calls at}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+DSO load/unload.  */}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20\sb0\sa283{\rtlch \ltrch\loch
+}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: libtextcat; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+WiseGuys Internet B.V.}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+libtextcat}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line Copyright (c) 2003, WiseGuys Internet B.V. \line All rights reserved. \line Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: \line - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. \line - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. \line - Neither the name of the WiseGuys Internet B.V. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. \line THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: libwpd; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+William LaChance}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+libwpd}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{{\field{\*\fldinst HYPERLINK "#lgpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+jump to LGPL}{\rtlch \ltrch\loch
+}}\line Except where otherwise noted in the source code (trio files, hash.c and list.c) }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: libxml2; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Daniel Veillard}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+libxml2}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+Copyright (C) 1998-2002 Daniel Veillard. All Rights Reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is fur- nished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Except as contained in this notice, the name of Daniel Veillard shall not be used in advertising or otherwise to promote the sale, use or other deal- ings in this Software without prior written authorization from him. }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: XML Security Library; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Aleksey Sanin}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+XML Security Library}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+XML Security Library}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Please note: We do not use all libraries of the project, but only:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+- xmlsec-core; License: MIT}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+- xmlsec-nss; License: GPL + MPL }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+-------------------------------------------------}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+The MIT License}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Copyright (c)  }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Permission is hereby granted, free of charge, to any person obtaining a copy of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+this software and associated documentation files (the "Software"), to deal in}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the Software without restriction, including without limitation the rights to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the Software, and to permit persons to whom the Software is furnished to do so,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+subject to the following conditions:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+The above copyright notice and this permission notice shall be included in all}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+copies or substantial portions of the Software.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+-------------------------------------------------------------------}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+The GNU General Public License (GPL)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Version 2, June 1991}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+59 Temple Place, Suite 330, Boston, MA 02111-1307 USA}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Everyone is permitted to copy and distribute verbatim copies}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of this license document, but changing it is not allowed.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Preamble}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+The licenses for most software are designed to take away your freedom to share}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+and change it. By contrast, the GNU General Public License is intended to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+guarantee your freedom to share and change free software--to make sure the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+software is free for all its users. This General Public License applies to most}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of the Free Software Foundation's software and to any other program whose}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+authors commit to using it. (Some other Free Software Foundation software is}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+covered by the GNU Library General Public License instead.) You can apply it to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+your programs, too.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+When we speak of free software, we are referring to freedom, not price. Our}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+General Public Licenses are designed to make sure that you have the freedom to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distribute copies of free software (and charge for this service if you wish),}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+that you receive source code or can get it if you want it, that you can change}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the software or use pieces of it in new free programs; and that you know you can}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+do these things.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+To protect your rights, we need to make restrictions that forbid anyone to deny}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+you these rights or to ask you to surrender the rights. These restrictions}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+translate to certain responsibilities for you if you distribute copies of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+software, or if you modify it.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+For example, if you distribute copies of such a program, whether gratis or for a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+fee, you must give the recipients all the rights that you have. You must make}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+sure that they, too, receive or can get the source code. And you must show them}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+these terms so they know their rights.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+We protect your rights with two steps: (1) copyright the software, and (2) offer}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+you this license which gives you legal permission to copy, distribute and/or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+modify the software.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Also, for each author's protection and ours, we want to make certain that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+everyone understands that there is no warranty for this free software. If the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+software is modified by someone else and passed on, we want its recipients to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+know that what they have is not the original, so that any problems introduced by}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+others will not reflect on the original authors' reputations.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Finally, any free program is threatened constantly by software patents. We wish}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+to avoid the danger that redistributors of a free program will individually}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+obtain patent licenses, in effect making the program proprietary. To prevent}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+this, we have made it clear that any patent must be licensed for everyone's free}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+use or not licensed at all.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+The precise terms and conditions for copying, distribution and modification follow.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+0. This License applies to any program or other work which contains a notice}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+placed by the copyright holder saying it may be distributed under the terms of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+this General Public License. The "Program", below, refers to any such program or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+work, and a "work based on the Program" means either the Program or any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+derivative work under copyright law: that is to say, a work containing the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Program or a portion of it, either verbatim or with modifications and/or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+translated into another language. (Hereinafter, translation is included without}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+limitation in the term "modification".) Each licensee is addressed as "you".}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Activities other than copying, distribution and modification are not covered by}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+this License; they are outside its scope. The act of running the Program is not}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+restricted, and the output from the Program is covered only if its contents}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+constitute a work based on the Program (independent of having been made by}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+running the Program). Whether that is true depends on what the Program does.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+1. You may copy and distribute verbatim copies of the Program's source code as}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+you receive it, in any medium, provided that you conspicuously and appropriately}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+publish on each copy an appropriate copyright notice and disclaimer of warranty;}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+keep intact all the notices that refer to this License and to the absence of any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+warranty; and give any other recipients of the Program a copy of this License}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+along with the Program.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+You may charge a fee for the physical act of transferring a copy, and you may at}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+your option offer warranty protection in exchange for a fee.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+2. You may modify your copy or copies of the Program or any portion of it, thus}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+forming a work based on the Program, and copy and distribute such modifications}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+or work under the terms of Section 1 above, provided that you also meet all of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+these conditions:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+a) You must cause the modified files to carry prominent notices stating that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+you changed the files and the date of any change.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+b) You must cause any work that you distribute or publish, that in whole or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+in part contains or is derived from the Program or any part thereof, to be}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+licensed as a whole at no charge to all third parties under the terms of this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+c) If the modified program normally reads commands interactively when run,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+you must cause it, when started running for such interactive use in the most}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+ordinary way, to print or display an announcement including an appropriate}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+copyright notice and a notice that there is no warranty (or else, saying that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+you provide a warranty) and that users may redistribute the program under these}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+conditions, and telling the user how to view a copy of this License. (Exception:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+if the Program itself is interactive but does not normally print such an}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+announcement, your work based on the Program is not required to print an}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+announcement.)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+These requirements apply to the modified work as a whole. If identifiable}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+sections of that work are not derived from the Program, and can be reasonably}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+considered independent and separate works in themselves, then this License, and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+its terms, do not apply to those sections when you distribute them as separate}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+works. But when you distribute the same sections as part of a whole which is a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+work based on the Program, the distribution of the whole must be on the terms of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+this License, whose permissions for other licensees extend to the entire whole,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+and thus to each and every part regardless of who wrote it.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Thus, it is not the intent of this section to claim rights or contest your}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+rights to work written entirely by you; rather, the intent is to exercise the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+right to control the distribution of derivative or collective works based on the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Program.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+In addition, mere aggregation of another work not based on the Program with the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Program (or with a work based on the Program) on a volume of a storage or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distribution medium does not bring the other work under the scope of this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+3. You may copy and distribute the Program (or a work based on it, under Section}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+2) in object code or executable form under the terms of Sections 1 and 2 above}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+provided that you also do one of the following:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+a) Accompany it with the complete corresponding machine-readable source}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+code, which must be distributed under the terms of Sections 1 and 2 above on a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+medium customarily used for software interchange; or,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+b) Accompany it with a written offer, valid for at least three years, to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+give any third party, for a charge no more than your cost of physically}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+performing source distribution, a complete machine-readable copy of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+corresponding source code, to be distributed under the terms of Sections 1 and 2}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+above on a medium customarily used for software interchange; or,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+c) Accompany it with the information you received as to the offer to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distribute corresponding source code. (This alternative is allowed only for}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+noncommercial distribution and only if you received the program in object code}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+or executable form with such an offer, in accord with Subsection b above.)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+The source code for a work means the preferred form of the work for making}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+modifications to it. For an executable work, complete source code means all the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+source code for all modules it contains, plus any associated interface}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+definition files, plus the scripts used to control compilation and installation}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of the executable. However, as a special exception, the source code distributed}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+need not include anything that is normally distributed (in either source or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+binary form) with the major components (compiler, kernel, and so on) of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+operating system on which the executable runs, unless that component itself}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+accompanies the executable.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+If distribution of executable or object code is made by offering access to copy}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+from a designated place, then offering equivalent access to copy the source code}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+from the same place counts as distribution of the source code, even though third}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+parties are not compelled to copy the source along with the object code.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+4. You may not copy, modify, sublicense, or distribute the Program except as}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+expressly provided under this License. Any attempt otherwise to copy, modify,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+sublicense or distribute the Program is void, and will automatically terminate}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+your rights under this License. However, parties who have received copies, or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+rights, from you under this License will not have their licenses terminated so}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+long as such parties remain in full compliance.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+5. You are not required to accept this License, since you have not signed it.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+However, nothing else grants you permission to modify or distribute the Program}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+or its derivative works. These actions are prohibited by law if you do not}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+accept this License. Therefore, by modifying or distributing the Program (or any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+work based on the Program), you indicate your acceptance of this License to do}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+so, and all its terms and conditions for copying, distributing or modifying the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Program or works based on it.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+6. Each time you redistribute the Program (or any work based on the Program),}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the recipient automatically receives a license from the original licensor to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+copy, distribute or modify the Program subject to these terms and conditions.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+You may not impose any further restrictions on the recipients' exercise of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+rights granted herein. You are not responsible for enforcing compliance by third}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+parties to this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+7. If, as a consequence of a court judgment or allegation of patent infringement}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+or for any other reason (not limited to patent issues), conditions are imposed}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+on you (whether by court order, agreement or otherwise) that contradict the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+conditions of this License, they do not excuse you from the conditions of this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License. If you cannot distribute so as to satisfy simultaneously your}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+obligations under this License and any other pertinent obligations, then as a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+consequence you may not distribute the Program at all. For example, if a patent}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+license would not permit royalty-free redistribution of the Program by all those}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+who receive copies directly or indirectly through you, then the only way you}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+could satisfy both it and this License would be to refrain entirely from}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distribution of the Program.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+If any portion of this section is held invalid or unenforceable under any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+particular circumstance, the balance of the section is intended to apply and the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+section as a whole is intended to apply in other circumstances.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+It is not the purpose of this section to induce you to infringe any patents or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+other property right claims or to contest validity of any such claims; this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+section has the sole purpose of protecting the integrity of the free software}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distribution system, which is implemented by public license practices. Many}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+people have made generous contributions to the wide range of software}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distributed through that system in reliance on consistent application of that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+system; it is up to the author/donor to decide if he or she is willing to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distribute software through any other system and a licensee cannot impose that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+choice.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+This section is intended to make thoroughly clear what is believed to be a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+consequence of the rest of this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+8. If the distribution and/or use of the Program is restricted in certain}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+countries either by patents or by copyrighted interfaces, the original copyright}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+holder who places the Program under this License may add an explicit}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+geographical distribution limitation excluding those countries, so that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distribution is permitted only in or among countries not thus excluded. In such}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+case, this License incorporates the limitation as if written in the body of this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+9. The Free Software Foundation may publish revised and/or new versions of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+General Public License from time to time. Such new versions will be similar in}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+spirit to the present version, but may differ in detail to address new problems}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+or concerns.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Each version is given a distinguishing version number. If the Program specifies}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+a version number of this License which applies to it and "any later version",}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+you have the option of following the terms and conditions either of that version}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+or of any later version published by the Free Software Foundation. If the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Program does not specify a version number of this License, you may choose any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+version ever published by the Free Software Foundation.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+10. If you wish to incorporate parts of the Program into other free programs}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+whose distribution conditions are different, write to the author to ask for}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+permission. For software which is copyrighted by the Free Software Foundation,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+write to the Free Software Foundation; we sometimes make exceptions for this.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Our decision will be guided by the two goals of preserving the free status of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+all derivatives of our free software and of promoting the sharing and reuse of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+software generally.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+NO WARRANTY}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+END OF TERMS AND CONDITIONS}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+How to Apply These Terms to Your New Programs}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+If you develop a new program, and you want it to be of the greatest possible use}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+to the public, the best way to achieve this is to make it free software which}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+everyone can redistribute and change under these terms.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+To do so, attach the following notices to the program. It is safest to attach}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+them to the start of each source file to most effectively convey the exclusion}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of warranty; and each file should have at least the "copyright" line and a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+pointer to where the full notice is found.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+one line to give the program's name and a brief idea of what it does.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+Copyright (C)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+This program is free software; you can redistribute it and/or modify it}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+under the terms of the GNU General Public License as published by the Free}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Software Foundation; either version 2 of the License, or (at your option) any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+later version.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+This program is distributed in the hope that it will be useful, but WITHOUT}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+You should have received a copy of the GNU General Public License along with}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Place, Suite 330, Boston, MA 02111-1307 USA}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Also add information on how to contact you by electronic and paper mail.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+If the program is interactive, make it output a short notice like this when it}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+starts in an interactive mode:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+Gnomovision version 69, Copyright (C) year name of author Gnomovision comes}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+and you are welcome to redistribute it under certain conditions; type `show c'}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+for details.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+The hypothetical commands `show w' and `show c' should show the appropriate}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+parts of the General Public License. Of course, the commands you use may be}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+called something other than `show w' and `show c'; they could even be}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+mouse-clicks or menu items--whatever suits your program.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+You should also get your employer (if you work as a programmer) or your school,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+if any, to sign a "copyright disclaimer" for the program, if necessary. Here is}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+a sample; alter the names:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+Yoyodyne, Inc., hereby disclaims all copyright interest}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+in the program `Gnomovision' (which makes passes at compilers)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+written by James Hacker.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+signature of Ty Coon, 1 April 1989}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+Ty Coon, President of Vice}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+This General Public License does not permit incorporating your program into}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+proprietary programs. If your program is a subroutine library, you may consider}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+it more useful to permit linking proprietary applications with the library. If}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+this is what you want to do, use the GNU Library General Public License instead}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+----------------------------------------------------------}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Mozilla Public License Version 1.0}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+1. Definitions.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+1.1. "Contributor" means each entity that creates or contributes to the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+creation of Modifications.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+1.2. "Contributor Version" means the combination of the Original Code,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+prior Modifications used by a Contributor, and the Modifications made by that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+particular Contributor.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+1.3. "Covered Code" means the Original Code or Modifications or the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+combination of the Original Code and Modifications, in each case including}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+portions thereof.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+1.4. "Electronic Distribution Mechanism" means a mechanism generally}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+accepted in the software development community for the electronic transfer of data.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+1.5. "Executable" means Covered Code in any form other than Source Code.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+1.6. "Initial Developer" means the individual or entity identified as the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Initial Developer in the Source Code notice required by Exhibit A.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+1.7. "Larger Work" means a work which combines Covered Code or portions}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+thereof with code not governed by the terms of this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+1.8. "License" means this document.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+1.9. "Modifications" means any addition to or deletion from the substance}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+or structure of either the Original Code or any previous Modifications. When}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Covered Code is released as a series of files, a Modification is:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+            }{\rtlch \ltrch\loch
+A. Any addition to or deletion from the contents of a file}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+containing Original Code or previous Modifications.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+            }{\rtlch \ltrch\loch
+B. Any new file that contains any part of the Original Code or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+previous Modifications. }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+1.10. "Original Code" means Source Code of computer software code which is}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+described in the Source Code notice required by Exhibit A as Original Code, and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+which, at the time of its release under this License is not already Covered Code}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+governed by this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+1.11. "Source Code" means the preferred form of the Covered Code for}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+making modifications to it, including all modules it contains, plus any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+associated interface definition files, scripts used to control compilation and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+installation of an Executable, or a list of source code differential comparisons}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+against either the Original Code or another well known, available Covered Code}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of the Contributor's choice. The Source Code can be in a compressed or archival}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+form, provided the appropriate decompression or de-archiving software is widely}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+available for no charge.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+1.12. "You" means an individual or a legal entity exercising rights under,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+and complying with all of the terms of, this License or a future version of this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License issued under Section 6.1. For legal entities, "You" includes any entity}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+which controls, is controlled by, or is under common control with You. For}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+purposes of this definition, "control" means (a) the power, direct or indirect,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+to cause the direction or management of such entity, whether by contract or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+otherwise, or (b) ownership of fifty percent (50%) or more of the outstanding}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+shares or beneficial ownership of such entity. }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+2. Source Code License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+2.1. The Initial Developer Grant.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+The Initial Developer hereby grants You a world-wide, royalty-free,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+non-exclusive license, subject to third party intellectual property claims:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+            }{\rtlch \ltrch\loch
+(a) to use, reproduce, modify, display, perform, sublicense and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distribute the Original Code (or portions thereof) with or without}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Modifications, or as part of a Larger Work; and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+            }{\rtlch \ltrch\loch
+(b) under patents now or hereafter owned or controlled by Initial}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Developer, to make, have made, use and sell ("Utilize") the Original Code (or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+portions thereof), but solely to the extent that any such patent is reasonably}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+necessary to enable You to Utilize the Original Code (or portions thereof) and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+not to any greater extent that may be necessary to Utilize further Modifications}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+or combinations. }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+2.2. Contributor Grant.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Each Contributor hereby grants You a world-wide, royalty-free,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+non-exclusive license, subject to third party intellectual property claims:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+            }{\rtlch \ltrch\loch
+(a) to use, reproduce, modify, display, perform, sublicense and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distribute the Modifications created by such Contributor (or portions thereof)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+either on an unmodified basis, with other Modifications, as Covered Code or as}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+part of a Larger Work; and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+            }{\rtlch \ltrch\loch
+(b) under patents now or hereafter owned or controlled by}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Contributor, to Utilize the Contributor Version (or portions thereof), but}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+solely to the extent that any such patent is reasonably necessary to enable You}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+to Utilize the Contributor Version (or portions thereof), and not to any greater}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+extent that may be necessary to Utilize further Modifications or combinations. }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+3. Distribution Obligations.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+3.1. Application of License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+The Modifications which You create or to which You contribute are governed}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+by the terms of this License, including without limitation Section 2.2. The}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Source Code version of Covered Code may be distributed only under the terms of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+this License or a future version of this License released under Section 6.1, and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+You must include a copy of this License with every copy of the Source Code You}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distribute. You may not offer or impose any terms on any Source Code version}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+that alters or restricts the applicable version of this License or the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+recipients' rights hereunder. However, You may include an additional document}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+offering the additional rights described in Section 3.5.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+3.2. Availability of Source Code.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Any Modification which You create or to which You contribute must be made}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+available in Source Code form under the terms of this License either on the same}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+media as an Executable version or via an accepted Electronic Distribution}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Mechanism to anyone to whom you made an Executable version available; and if}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+made available via Electronic Distribution Mechanism, must remain available for}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+at least twelve (12) months after the date it initially became available, or at}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+least six (6) months after a subsequent version of that particular Modification}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+has been made available to such recipients. You are responsible for ensuring}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+that the Source Code version remains available even if the Electronic}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Distribution Mechanism is maintained by a third party.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+3.3. Description of Modifications.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+You must cause all Covered Code to which you contribute to contain a file}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+documenting the changes You made to create that Covered Code and the date of any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+change. You must include a prominent statement that the Modification is derived,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+directly or indirectly, from Original Code provided by the Initial Developer and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+including the name of the Initial Developer in (a) the Source Code, and (b) in}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+any notice in an Executable version or related documentation in which You}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+describe the origin or ownership of the Covered Code.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+3.4. Intellectual Property Matters}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+            }{\rtlch \ltrch\loch
+(a) Third Party Claims.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+            }{\rtlch \ltrch\loch
+If You have knowledge that a party claims an intellectual property}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+right in particular functionality or code (or its utilization under this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License), you must include a text file with the source code distribution titled}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+"LEGAL" which describes the claim and the party making the claim in sufficient}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+detail that a recipient will know whom to contact. If you obtain such knowledge}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+after You make Your Modification available as described in Section 3.2, You}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+shall promptly modify the LEGAL file in all copies You make available thereafter}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+and shall take other steps (such as notifying appropriate mailing lists or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+newsgroups) reasonably calculated to inform those who received the Covered Code}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+that new knowledge has been obtained.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+            }{\rtlch \ltrch\loch
+(b) Contributor APIs.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+            }{\rtlch \ltrch\loch
+If Your Modification is an application programming interface and You}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+own or control patents which are reasonably necessary to implement that API, you}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+must also include this information in the LEGAL file. }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+3.5. Required Notices.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+You must duplicate the notice in Exhibit A in each file of the Source}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Code, and this License in any documentation for the Source Code, where You}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+describe recipients' rights relating to Covered Code. If You created one or more}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Modification(s), You may add your name as a Contributor to the notice described}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+in Exhibit A. If it is not possible to put such notice in a particular Source}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Code file due to its structure, then you must include such notice in a location}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+(such as a relevant directory file) where a user would be likely to look for}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+such a notice. You may choose to offer, and to charge a fee for, warranty,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+support, indemnity or liability obligations to one or more recipients of Covered}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Code. However, You may do so only on Your own behalf, and not on behalf of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Initial Developer or any Contributor. You must make it absolutely clear than any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+such warranty, support, indemnity or liability obligation is offered by You}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+alone, and You hereby agree to indemnify the Initial Developer and every}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Contributor for any liability incurred by the Initial Developer or such}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Contributor as a result of warranty, support, indemnity or liability terms You}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+offer.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+3.6. Distribution of Executable Versions.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+You may distribute Covered Code in Executable form only if the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+requirements of Section 3.1-3.5 have been met for that Covered Code, and if You}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+include a notice stating that the Source Code version of the Covered Code is}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+available under the terms of this License, including a description of how and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+where You have fulfilled the obligations of Section 3.2. The notice must be}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+conspicuously included in any notice in an Executable version, related}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+documentation or collateral in which You describe recipients' rights relating to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the Covered Code. You may distribute the Executable version of Covered Code}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+under a license of Your choice, which may contain terms different from this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License, provided that You are in compliance with the terms of this License and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+that the license for the Executable version does not attempt to limit or alter}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the recipient's rights in the Source Code version from the rights set forth in}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+this License. If You distribute the Executable version under a different license}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+You must make it absolutely clear that any terms which differ from this License}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+are offered by You alone, not by the Initial Developer or any Contributor. You}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+hereby agree to indemnify the Initial Developer and every Contributor for any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+liability incurred by the Initial Developer or such Contributor as a result of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+any such terms You offer.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+3.7. Larger Works.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+You may create a Larger Work by combining Covered Code with other code not}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+governed by the terms of this License and distribute the Larger Work as a single}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+product. In such a case, You must make sure the requirements of this License are}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+fulfilled for the Covered Code. }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+4. Inability to Comply Due to Statute or Regulation.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+If it is impossible for You to comply with any of the terms of this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License with respect to some or all of the Covered Code due to statute or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+regulation then You must: (a) comply with the terms of this License to the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+maximum extent possible; and (b) describe the limitations and the code they}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+affect. Such description must be included in the LEGAL file described in Section}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+3.4 and must be included with all distributions of the Source Code. Except to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the extent prohibited by statute or regulation, such description must be}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+sufficiently detailed for a recipient of ordinary skill to be able to understand}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+it. }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+5. Application of this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+This License applies to code to which the Initial Developer has attached}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the notice in Exhibit A, and to related Covered Code. }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+6. Versions of the License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+6.1. New Versions.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Netscape Communications Corporation ("Netscape") may publish revised}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+and/or new versions of the License from time to time. Each version will be given}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+a distinguishing version number.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+6.2. Effect of New Versions.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Once Covered Code has been published under a particular version of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License, You may always continue to use it under the terms of that version. You}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+may also choose to use such Covered Code under the terms of any subsequent}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+version of the License published by Netscape. No one other than Netscape has the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+right to modify the terms applicable to Covered Code created under this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+6.3. Derivative Works.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+If you create or use a modified version of this License (which you may}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+only do in order to apply it to code which is not already Covered Code governed}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+by this License), you must (a) rename Your license so that the phrases}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+"Mozilla", "MOZILLAPL", "MOZPL", "Netscape", "NPL" or any confusingly similar}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+phrase do not appear anywhere in your license and (b) otherwise make it clear}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+that your version of the license contains terms which differ from the Mozilla}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Public License and Netscape Public License. (Filling in the name of the Initial}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Developer, Original Code or Contributor in the notice described in Exhibit A}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+shall not of themselves be deemed to be modifications of this License.) }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+7. DISCLAIMER OF WARRANTY.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+8. TERMINATION.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+This License and the rights granted hereunder will terminate automatically}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+if You fail to comply with terms herein and fail to cure such breach within 30}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+days of becoming aware of the breach. All sublicenses to the Covered Code which}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+are properly granted shall survive any termination of this License. Provisions}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+which, by their nature, must remain in effect beyond the termination of this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License shall survive. }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+9. LIMITATION OF LIABILITY.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL DEVELOPER, ANY OTHER}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+PARTIES, BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+LIMITATION MAY NOT APPLY TO YOU. }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+10. U.S. GOVERNMENT END USERS.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+The Covered Code is a "commercial item," as that term is defined in 48}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software" and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+"commercial computer software documentation," as such terms are used in 48}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Covered Code with only those rights set forth herein. }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+11. MISCELLANEOUS.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+This License represents the complete agreement concerning subject matter}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+hereof. If any provision of this License is held to be unenforceable, such}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+provision shall be reformed only to the extent necessary to make it enforceable.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+This License shall be governed by California law provisions (except to the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+extent applicable law, if any, provides otherwise), excluding its}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+conflict-of-law provisions. With respect to disputes in which at least one party}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+is a citizen of, or an entity chartered or registered to do business in, the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+United States of America: (a) unless otherwise agreed in writing, all disputes}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+relating to this License (excepting any dispute relating to intellectual}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+property rights) shall be subject to final and binding arbitration, with the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+losing party paying all costs of arbitration; (b) any arbitration relating to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+this Agreement shall be held in Santa Clara County, California, under the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+auspices of JAMS/EndDispute; and (c) any litigation relating to this Agreement}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+shall be subject to the jurisdiction of the Federal Courts of the Northern}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+District of California, with venue lying in Santa Clara County, California, with}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the losing party responsible for costs, including without limitation, court}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+costs and reasonable attorneys fees and expenses. The application of the United}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Nations Convention on Contracts for the International Sale of Goods is expressly}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+excluded. Any law or regulation which provides that the language of a contract}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+shall be construed against the drafter shall not apply to this License. }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+12. RESPONSIBILITY FOR CLAIMS.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Except in cases where another Contributor has failed to comply with}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Section 3.4, You are responsible for damages arising, directly or indirectly,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+out of Your utilization of rights under this License, based on the number of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+copies of Covered Code you made available, the revenues you received from}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+utilizing such rights, and other relevant factors. You agree to work with}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+affected parties to distribute responsibility on an equitable basis. }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+EXHIBIT A.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+"The contents of this file are subject to the Mozilla Public License}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Version 1.0 (the "License"); you may not use this file except in compliance with}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the License. You may obtain a copy of the License at http://www.mozilla.org/MPL/}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Software distributed under the License is distributed on an "AS IS" basis,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+specific language governing rights and limitations under the License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+The Original Code is ______________________________________.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+The Initial Developer of the Original Code is ________________________.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Portions created by ______________________ are Copyright (C) ______}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+_______________________. All Rights Reserved.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Contributor(s): ______________________________________." }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20\sb0\sa283{\rtlch \ltrch\loch
+}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: libxslt; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+www.xmlsoft.org}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+libxslt}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+Copyright (C) 2001-2002 Daniel Veillard. All Rights Reserved. \line Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is fur- nished to do so, subject to the following conditions: \line The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. \line THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \line Except as contained in this notice, the name of Daniel Veillard shall not be used in advertising or otherwise to promote the sale, use or other deal- ings in this Software without prior written authorization from him. }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: lpsolve; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Kjell Eikland and Peter Notebaert }
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+lpsolve}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{{\field{\*\fldinst HYPERLINK "#lgpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+jump to LGPL}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Network Audio System; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Network Computer Devices, Inc.}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Network Audio System (NAS)}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+Copyright 1995 Network Computing Devices, Inc. Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name Network Computing Devices, Inc. not be used in advertising or publicity pertaining to distribution of this software without specific, written prior permission. \line \line THIS SOFTWARE IS PROVIDED `AS-IS'. NETWORK COMPUTING DEVICES, INC., DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT LIMITATION ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NONINFRINGEMENT. IN NO EVENT SHALL NETWORK COMPUTING DEVICES, INC., BE LIABLE FOR ANY DAMAGES WHATSOEVER, INCLUDING SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES, INCLUDING LOSS OF USE, DATA, OR PROFITS, EVEN IF ADVISED OF THE POSSIBILITY THEREOF, AND REGARDLESS OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: NeoLight 1.1.x; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Planamesa, Inc.}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+NeoLight}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line }{{\field{\*\fldinst HYPERLINK "#lgpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+jump to GNU Lesser General Public License}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: neon; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Joe Orton}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+neon}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{{\field{\*\fldinst HYPERLINK "#lgpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+jump to LGPL}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Network Security Services; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+The Mozilla Foundation}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Network Security Services (NSS)}
+\par \pard\plain \s21\sb0\sa120\qc{\b\rtlch \ltrch\loch\fs36
+MOZILLA PUBLIC LICENSE}{\rtlch \ltrch\loch
+ \line }{\b\rtlch \ltrch\loch
+Version 1.1}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12\qc\li4216\ri4216\lin4216\rin4216\fi0{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 1}{\*\bkmkend 1}\b\rtlch \ltrch\loch
+1. Definitions.}{{\*\bkmkstart 1.0.1}{\*\bkmkend 1.0.1}\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.0.1. "Commercial Use" }{{\*\bkmkstart 1.1}{\*\bkmkend 1.1}\rtlch \ltrch\loch
+means distribution or otherwise making the Covered Code available to a third party. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.1. ''Contributor''}{{\*\bkmkstart 1.2}{\*\bkmkend 1.2}\rtlch \ltrch\loch
+ means each entity that creates or contributes to the creation of Modifications. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.2. ''Contributor Version''}{{\*\bkmkstart 1.3}{\*\bkmkend 1.3}\rtlch \ltrch\loch
+ means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.3. ''Covered Code''}{\rtlch \ltrch\loch
+ means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof}{\b\rtlch \ltrch\loch
+.}{{\*\bkmkstart 1.4}{\*\bkmkend 1.4}\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.4. ''Electronic Distribution Mechanism''}{{\*\bkmkstart 1.5}{\*\bkmkend 1.5}\rtlch \ltrch\loch
+ means a mechanism generally accepted in the software development community for the electronic transfer of data. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.5. ''Executable''}{{\*\bkmkstart 1.6}{\*\bkmkend 1.6}\rtlch \ltrch\loch
+ means Covered Code in any form other than Source Code. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.6. ''Initial Developer''}{\rtlch \ltrch\loch
+ means the individual or entity identified as the Initial Developer in the Source Code notice required by }{\b\rtlch \ltrch\loch
+Exhibit A}{{\*\bkmkstart 1.7}{\*\bkmkend 1.7}\rtlch \ltrch\loch
+. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.7. ''Larger Work''}{{\*\bkmkstart 1.8}{\*\bkmkend 1.8}\rtlch \ltrch\loch
+ means a work which combines Covered Code or portions thereof with code not governed by the terms of this License. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.8. ''License''}{{\*\bkmkstart 1.8.1}{\*\bkmkend 1.8.1}\rtlch \ltrch\loch
+ means this document. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.8.1. "Licensable"}{{\*\bkmkstart 1.9}{\*\bkmkend 1.9}\rtlch \ltrch\loch
+ means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.9. ''Modifications''}{\rtlch \ltrch\loch
+ means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is: }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+A.}{\rtlch \ltrch\loch
+ Any addition to or deletion from the contents of a file containing Original Code or previous Modifications. }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+B.}{\rtlch \ltrch\loch
+ Any new file that contains any part of the Original Code or previous Modifications. \line \~ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{{\*\bkmkstart 1.10}{\*\bkmkend 1.10}\b\rtlch \ltrch\loch
+1.10. ''Original Code''}{\rtlch \ltrch\loch
+ means Source Code of computer software code which is described in the Source Code notice required by }{\b\rtlch \ltrch\loch
+Exhibit A}{{\*\bkmkstart 1.10.1}{\*\bkmkend 1.10.1}\rtlch \ltrch\loch
+ as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.10.1. "Patent Claims"}{{\*\bkmkstart 1.11}{\*\bkmkend 1.11}\rtlch \ltrch\loch
+ means any patent claim(s), now owned or hereafter acquired, including without limitation,\~  method, process, and apparatus claims, in any patent Licensable by grantor. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.11. ''Source Code''}{{\*\bkmkstart 1.12}{\*\bkmkend 1.12}\rtlch \ltrch\loch
+ means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.12. "You'' (or "Your")\~ }{\rtlch \ltrch\loch
+ means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You'' includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control'' means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.}
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 2}{\*\bkmkend 2}\b\rtlch \ltrch\loch
+2. Source Code License.}{{\*\bkmkstart 2.1}{\*\bkmkend 2.1}\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0\sb0\sa0{\b\rtlch \ltrch\loch
+2.1. The Initial Developer Grant.}{\rtlch \ltrch\loch
+ \line The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims: }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+(a)}{\rtlch \ltrch\loch
+\~  under intellectual property rights (other than patent or trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, and/or as part of a Larger Work; and }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+(b)}{\rtlch \ltrch\loch
+ under Patents Claims infringed by the making, using or selling of Original Code, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Code (or portions thereof). }
+\par \pard\plain \s21\sb0\sa120\li2828\ri0\lin2828\rin0\fi0\sb0\sa0{\rtlch \ltrch
+\~ }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+(c) }{\rtlch \ltrch\loch
+the licenses granted in this Section 2.1(a) and (b) are effective on the date Initial Developer first distributes Original Code under the terms of this License. }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+(d) }{\rtlch \ltrch\loch
+Notwithstanding Section 2.1(b) above, no patent license is granted: 1) for code that You delete from the Original Code; 2) separate from the Original Code;\~  or 3) for infringements caused by: i) the modification of the Original Code or ii) the combination of the Original Code with other software or devices. \line \~ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0\sb0\sa0{{\*\bkmkstart 2.2}{\*\bkmkend 2.2}\b\rtlch \ltrch\loch
+2.2. Contributor Grant.}{\rtlch \ltrch\loch
+ \line Subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\rtlch \ltrch
+\~  }{\rtlch \ltrch\loch
+\line }{\b\rtlch \ltrch\loch
+(a)}{\rtlch \ltrch\loch
+\~  under intellectual property rights (other than patent or trademark) Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger Work; and }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+(b)}{\rtlch \ltrch\loch
+ under Patent Claims infringed by the making, using, or selling of\~  Modifications made by that Contributor either alone and/or in}{\cf1\rtlch \ltrch\loch
+ combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: 1) Modifications made by that Contributor (or portions thereof); and 2) the combination of\~  Modifications made by that Contributor with its Contributor Version (or portions of such combination).}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+(c) }{\rtlch \ltrch\loch
+the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first makes Commercial Use of the Covered Code. }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+(d)\~ }{\rtlch \ltrch\loch
+\~ \~  Notwithstanding Section 2.2(b) above, no patent license is granted: 1) for any code that Contributor has deleted from the Contributor Version; 2)\~  separate from the Contributor Version;\~  3)\~  for infringements caused by: i) third party modifications of Contributor Version or ii)\~  the combination of Modifications made by that Contributor with other software\~  (except as part of the Contributor Version) or other devices; or 4) under Patent Claims infringed by Covered Code in the absence of Modifications made by that Contributor.}
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 3}{\*\bkmkend 3}\rtlch \ltrch\loch
+\line }{\b\rtlch \ltrch\loch
+3. Distribution Obligations.}{{\*\bkmkstart 3.1}{\*\bkmkend 3.1}\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+3.1. Application of License.}{\rtlch \ltrch\loch
+ \line The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section }{\b\rtlch \ltrch\loch
+2.2}{\rtlch \ltrch\loch
+. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section }{\b\rtlch \ltrch\loch
+6.1}{\rtlch \ltrch\loch
+, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section }{\b\rtlch \ltrch\loch
+3.5}{{\*\bkmkstart 3.2}{\*\bkmkend 3.2}\rtlch \ltrch\loch
+. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+3.2. Availability of Source Code.}{{\*\bkmkstart 3.3}{\*\bkmkend 3.3}\rtlch \ltrch\loch
+ \line Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+3.3. Description of Modifications.}{{\*\bkmkstart 3.4}{\*\bkmkend 3.4}\rtlch \ltrch\loch
+ \line You must cause all Covered Code to which You contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+3.4. Intellectual Property Matters}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+(a) Third Party Claims}{\rtlch \ltrch\loch
+. \line If Contributor has knowledge that a license under a third party's intellectual property rights is required to exercise the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor must include a text file with the Source Code distribution titled "LEGAL'' which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If Contributor obtains such knowledge after the Modification is made available as described in Section 3.2, Contributor shall promptly modify the LEGAL file in all copies Contributor makes available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained. }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+(b) Contributor APIs}{\rtlch \ltrch\loch
+. \line If Contributor's Modifications include an application programming interface and Contributor has knowledge of patent licenses which are reasonably necessary to implement that API, Contributor must also include this information in the LEGAL file. \line \~ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0\sb0\sa0{\rtlch \ltrch
+\~ \~ \~ \~ \~ \~ \~ \~ \~  }{\b\rtlch \ltrch\loch
+(c)\~ \~ \~  Representations.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\rtlch \ltrch\loch
+Contributor represents that, except as disclosed pursuant to Section 3.4(a) above, Contributor believes that Contributor's Modifications are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the rights conveyed by this License.}
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{{\*\bkmkstart 3.5}{\*\bkmkend 3.5}\rtlch \ltrch\loch
+\line }{\b\rtlch \ltrch\loch
+3.5. Required Notices.}{\rtlch \ltrch\loch
+ \line You must duplicate the notice in }{\b\rtlch \ltrch\loch
+Exhibit A}{\rtlch \ltrch\loch
+ in each file of the Source Code.\~  If it is not possible to put such notice in a particular Source Code file due to its structure, then You must include such notice in a location (such as a relevant directory) where a user would be likely to look for such a notice.\~  If You created one or more Modification(s) You may add your name as a Contributor to the notice described in }{\b\rtlch \ltrch\loch
+Exhibit A}{{\*\bkmkstart 3.6}{\*\bkmkend 3.6}\rtlch \ltrch\loch
+.\~  You must also duplicate this License in any documentation for the Source Code where You describe recipients' rights or ownership rights relating to Covered Code.\~  You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+3.6. Distribution of Executable Versions.}{\rtlch \ltrch\loch
+ \line You may distribute Covered Code in Executable form only if the requirements of Section }{\b\rtlch \ltrch\loch
+3.1-3.5}{\rtlch \ltrch\loch
+ have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section }{\b\rtlch \ltrch\loch
+3.2}{{\*\bkmkstart 3.7}{\*\bkmkend 3.7}\rtlch \ltrch\loch
+. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code or ownership rights under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+3.7. Larger Works.}{\rtlch \ltrch\loch
+ \line You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code.}
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 4}{\*\bkmkend 4}\b\rtlch \ltrch\loch
+4. Inability to Comply Due to Statute or Regulation.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section }{\b\rtlch \ltrch\loch
+3.4}{\rtlch \ltrch\loch
+ and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it.}
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 5}{\*\bkmkend 5}\b\rtlch \ltrch\loch
+5. Application of this License.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+This License applies to code to which the Initial Developer has attached the notice in }{\b\rtlch \ltrch\loch
+Exhibit A}{\rtlch \ltrch\loch
+ and to related Covered Code.}
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 6}{\*\bkmkend 6}\b\rtlch \ltrch\loch
+6. Versions of the License.}{{\*\bkmkstart 6.1}{\*\bkmkend 6.1}\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+6.1. New Versions}{{\*\bkmkstart 6.2}{\*\bkmkend 6.2}\rtlch \ltrch\loch
+. \line Netscape Communications Corporation (''Netscape'') may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+6.2. Effect of New Versions}{{\*\bkmkstart 6.3}{\*\bkmkend 6.3}\rtlch \ltrch\loch
+. \line Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Netscape. No one other than Netscape has the right to modify the terms applicable to Covered Code created under this License. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+6.3. Derivative Works}{\rtlch \ltrch\loch
+. \line If You create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), You must (a) rename Your license so that the phrases ''Mozilla'', ''MOZILLAPL'', ''MOZPL'', ''Netscape'', "MPL", ''NPL'' or any confusingly similar phrase do not appear in your license (except to note that your license differs from this License) and (b) otherwise make it clear that Your version of the license contains terms which differ from the Mozilla Public License and Netscape Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in }{\b\rtlch \ltrch\loch
+Exhibit A}{\rtlch \ltrch\loch
+ shall not of themselves be deemed to be modifications of this License.)}
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 7}{\*\bkmkend 7}\b\rtlch \ltrch\loch
+7. DISCLAIMER OF WARRANTY.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.}
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 8}{\*\bkmkend 8}\b\rtlch \ltrch\loch
+8. TERMINATION.}{{\*\bkmkstart 8.1}{\*\bkmkend 8.1}\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+8.1.\~  }{{\*\bkmkstart 8.2}{\*\bkmkend 8.2}\rtlch \ltrch\loch
+This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+8.2.\~  }{\rtlch \ltrch\loch
+If You initiate litigation by asserting a patent infringement claim (excluding declatory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You file such action is referred to as "Participant")\~  alleging that: }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+(a)\~  }{\rtlch \ltrch\loch
+such Participant's Contributor Version directly or indirectly infringes any patent, then any and all rights granted by such Participant to You under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively, unless if within 60 days after receipt of notice You either: (i)\~  agree in writing to pay Participant a mutually agreeable reasonable royalty for Your past and future use of Modifications made by such Participant, or (ii) withdraw Your litigation claim with respect to the Contributor Version against such Participant.\~  If within 60 days of notice, a reasonable royalty and payment arrangement are not mutually agreed upon in writing by the parties or the litigation claim is not withdrawn, the rights granted by Participant to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration of the 60 day notice period specified above. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+(b)}{{\*\bkmkstart 8.3}{\*\bkmkend 8.3}\rtlch \ltrch\loch
+\~  any software, hardware, or device, other than such Participant's Contributor Version, directly or indirectly infringes any patent, then any rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are revoked effective as of the date You first made, used, sold, distributed, or had made, Modifications made by that Participant. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+8.3.\~  }{{\*\bkmkstart 8.4}{\*\bkmkend 8.4}\rtlch \ltrch\loch
+If You assert a patent infringement claim against Participant alleging that such Participant's Contributor Version directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+8.4.}{\rtlch \ltrch\loch
+\~  In the event of termination under Sections 8.1 or 8.2 above,\~  all end user license agreements (excluding distributors and resellers) which have been validly granted by You or any distributor hereunder prior to termination shall survive termination.}
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 9}{\*\bkmkend 9}\b\rtlch \ltrch\loch
+9. LIMITATION OF LIABILITY.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.}
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 10}{\*\bkmkend 10}\b\rtlch \ltrch\loch
+10. U.S. GOVERNMENT END USERS.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+The Covered Code is a ''commercial item,'' as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of ''commercial computer software'' and ''commercial computer software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein.}
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 11}{\*\bkmkend 11}\b\rtlch \ltrch\loch
+11. MISCELLANEOUS.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in the United States of America, any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License.}
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 12}{\*\bkmkend 12}\b\rtlch \ltrch\loch
+12. RESPONSIBILITY FOR CLAIMS.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.}
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 13}{\*\bkmkend 13}\b\rtlch \ltrch\loch
+13. MULTIPLE-LICENSED CODE.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+Initial Developer may designate portions of the Covered Code as \uc3 \u8220\'e2\'80\'9cMultiple-Licensed\u8221\'e2\'80\'9d.\~  \u8220\'e2\'80\'9cMultiple-Licensed\u8221\'e2\'80\'9d means that the Initial Developer permits you to utilize portions of the Covered Code under Your choice of the MPL or the alternative licenses, if any, specified by the Initial Developer in the file described in Exhibit A.\uc1 }
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart EXHIBIT-A}{\*\bkmkend EXHIBIT-A}\rtlch \ltrch\loch
+\line }{\b\rtlch \ltrch\loch
+EXHIBIT A -Mozilla Public License.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+``The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at \line http://www.mozilla.org/MPL/ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF \line ANY KIND, either express or implied. See the License for the specific language governing rights and \line limitations under the License. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+The Original Code is ______________________________________. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+The Initial Developer of the Original Code is ________________________. Portions created by \line \~ ______________________ are Copyright (C) ______ _______________________. All Rights \line Reserved. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+Contributor(s): ______________________________________. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+Alternatively, the contents of this file may be used under the terms of the _____ license (the\~  \uc3 \u8220\'e2\'80\'9c[___] License\u8221\'e2\'80\'9d), in which case the provisions of [______] License are applicable\~  instead of those above.\~  If you wish to allow use of your version of this file only under the terms of the [____] License and not to allow others to use your version of this file under the MPL, indicate your decision by deleting\~  the provisions above and replace\~  them with the notice and other provisions required by the [___] License.\~  If you do not delete the provisions above, a recipient may use your version of this file under either the MPL or the [___] License." \uc1 }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+[NOTE: The text of this Exhibit A may differ slightly from the text of the notices in the Source Code files of the Original Code. You should use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.] }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: OpenSSL; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+OpenSSL Project}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+OpenSSL}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+LICENSE ISSUES}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+==============}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+The OpenSSL toolkit stays under a dual license, i.e. both the conditions of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+the OpenSSL License and the original SSLeay license apply to the toolkit.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+See below for the actual license texts. Actually both licenses are BSD-style}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+Open Source licenses. In case of any license issues related to OpenSSL}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+please contact openssl-core@openssl.org.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+OpenSSL License}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+---------------}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+/* ====================================================================}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* Copyright (c) 1998-2007 The OpenSSL Project.  All rights reserved.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* Redistribution and use in source and binary forms, with or without}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* modification, are permitted provided that the following conditions}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* are met:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* 1. Redistributions of source code must retain the above copyright}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    notice, this list of conditions and the following disclaimer. }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* 2. Redistributions in binary form must reproduce the above copyright}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    notice, this list of conditions and the following disclaimer in}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    the documentation and/or other materials provided with the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    distribution.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* 3. All advertising materials mentioning features or use of this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    software must display the following acknowledgment:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    "This product includes software developed by the OpenSSL Project}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    endorse or promote products derived from this software without}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    prior written permission. For written permission, please contact}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    openssl-core@openssl.org.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* 5. Products derived from this software may not be called "OpenSSL"}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    nor may "OpenSSL" appear in their names without prior written}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    permission of the OpenSSL Project.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* 6. Redistributions of any form whatsoever must retain the following}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    acknowledgment:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    "This product includes software developed by the OpenSSL Project}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    for use in the OpenSSL Toolkit (http://www.openssl.org/)"}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* OF THE POSSIBILITY OF SUCH DAMAGE.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* ====================================================================}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* This product includes cryptographic software written by Eric Young}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* (eay@cryptsoft.com).  This product includes software written by Tim}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* Hudson (tjh@cryptsoft.com).}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*/}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+Original SSLeay License}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+-----------------------}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* All rights reserved.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* This package is an SSL implementation written}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* by Eric Young (eay@cryptsoft.com).}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* The implementation was written so as to conform with Netscapes SSL.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* This library is free for commercial and non-commercial use as long as}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* the following conditions are aheared to.  The following conditions}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* apply to all code found in this distribution, be it the RC4, RSA,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* lhash, DES, etc., code; not just the SSL code.  The SSL documentation}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* included with this distribution is covered by the same copyright terms}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* except that the holder is Tim Hudson (tjh@cryptsoft.com).}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* Copyright remains Eric Young's, and as such any Copyright notices in}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* the code are not to be removed.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* If this package is used in a product, Eric Young should be given attribution}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* as the author of the parts of the library used.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* This can be in the form of a textual message at program startup or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* in documentation (online or textual) provided with the package.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* Redistribution and use in source and binary forms, with or without}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* modification, are permitted provided that the following conditions}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* are met:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* 1. Redistributions of source code must retain the copyright}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    notice, this list of conditions and the following disclaimer.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* 2. Redistributions in binary form must reproduce the above copyright}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    notice, this list of conditions and the following disclaimer in the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    documentation and/or other materials provided with the distribution.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* 3. All advertising materials mentioning features or use of this software}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    must display the following acknowledgement:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    "This product includes cryptographic software written by}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*     Eric Young (eay@cryptsoft.com)"}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    The word 'cryptographic' can be left out if the rouines from the library}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    being used are not cryptographic related :-).}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* 4. If you include any Windows specific code (or a derivative thereof) from }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    the apps directory (application code) you must include an acknowledgement:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* SUCH DAMAGE.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* The licence and distribution terms for any publically available version or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* derivative of this code cannot be changed.  i.e. this code cannot simply be}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* copied and put under another distribution licence}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+* [including the GNU Public Licence.]}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+*/}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20\sb0\sa283{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product:PortAudio - Portable Real-Time Audio Library; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Ross Bencina and Phil Burk }
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+PortAudio}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+PortAudio Portable Real-Time Audio Library \line Copyright (c) 1999-2000 Ross Bencina and Phil Burk }
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: }
+\par \pard\plain \s21\sb0\sa120{\listtext\pard\plain \hich\af8\dbch\af8\loch\f8 \'95\tab}\ilvl0\ls17 \li0\ri0\lin0\rin0\fi-283\tx707\li707\ri0\lin707\rin0\fi-283\sb0\sa0{\rtlch \ltrch\loch
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. }
+\par \pard\plain \s21\sb0\sa120{\listtext\pard\plain \hich\af8\dbch\af8\loch\f8 \'95\tab}\ilvl0\ls17 \li0\ri0\lin0\rin0\fi-283\tx707\li707\ri0\lin707\rin0\fi-283{\rtlch \ltrch\loch
+Any person wishing to distribute modifications to the Software is requested to send the modifications to the original developer so that they can be incorporated into the canonical version. }
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ON INFRINGEMENT. \line IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \line \~  }
+\par \pard\plain \s4\b\hich\af9\dbch\af12\afs24\ab\loch\f4\fs24{\rtlch \ltrch\loch
+Plain English Interpretation of the License}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following is a plain English interpretation of the license. This interpretation is not part of the license and has no legal significance. To understand the full legal implications of the license you should consult the license itself. }
+\par \pard\plain \s21\sb0\sa120{\listtext\pard\plain \hich\af8\dbch\af8\loch\f8 \'95\tab}\ilvl0\ls18 \li0\ri0\lin0\rin0\fi-283\tx707\li707\ri0\lin707\rin0\fi-283\sb0\sa0{\rtlch \ltrch\loch
+You }{\b\rtlch \ltrch\loch
+can}{\rtlch \ltrch\loch
+ use PortAudio for free in your projects or applications, even commercial applications. }
+\par \pard\plain \s21\sb0\sa120{\listtext\pard\plain \hich\af8\dbch\af8\loch\f8 \'95\tab}\ilvl0\ls18 \li0\ri0\lin0\rin0\fi-283\tx707\li707\ri0\lin707\rin0\fi-283\sb0\sa0{\rtlch \ltrch\loch
+You do }{\b\rtlch \ltrch\loch
+not}{\rtlch \ltrch\loch
+ have to make your own source available as open-source code just because you used PortAudio. }
+\par \pard\plain \s21\sb0\sa120{\listtext\pard\plain \hich\af8\dbch\af8\loch\f8 \'95\tab}\ilvl0\ls18 \li0\ri0\lin0\rin0\fi-283\tx707\li707\ri0\lin707\rin0\fi-283\sb0\sa0{\rtlch \ltrch\loch
+Do }{\b\rtlch \ltrch\loch
+not}{\rtlch \ltrch\loch
+ take our copyright information out of the PortAudio source code. }
+\par \pard\plain \s21\sb0\sa120{\listtext\pard\plain \hich\af8\dbch\af8\loch\f8 \'95\tab}\ilvl0\ls18 \li0\ri0\lin0\rin0\fi-283\tx707\li707\ri0\lin707\rin0\fi-283\sb0\sa0{\rtlch \ltrch\loch
+If you fix a bug in PortAudio, please send us the fix. }
+\par \pard\plain \s21\sb0\sa120{\listtext\pard\plain \hich\af8\dbch\af8\loch\f8 \'95\tab}\ilvl0\ls18 \li0\ri0\lin0\rin0\fi-283\tx707\li707\ri0\lin707\rin0\fi-283{\rtlch \ltrch\loch
+You }{\b\rtlch \ltrch\loch
+cannot}{\rtlch \ltrch\loch
+ sue us if your program fails because of PortAudio. }
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: XT; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+James Clark, Bill Lindsey}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+PostgreSQL Database Management System }
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line (formerly known as Postgres, then as Postgres95) \line Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group \line Portions Copyright (c) 1994, The Regents of the University of California \line Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies. \line IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \line THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: PostScript(R) AFM Files; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Adobe}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Printer Description Files}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+Copyright 1987-1995 Adobe Systems Incorporated.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+All Rights Reserved.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+Permission is granted for redistribution of this file as}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+long as this copyright notice is intact and the contents}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+of the file is not altered in any way from its original form.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20\sb0\sa283{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+End of Copyright statement}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Python; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Python Software Foundation}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Python}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+===============================================================}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+PSF LICENSE AGREEMENT FOR PYTHON 2.3}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+------------------------------------}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+1. This LICENSE AGREEMENT is between the Python Software Foundation}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+("PSF"), and the Individual or Organization ("Licensee") accessing and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+otherwise using Python 2.3 software in source or binary form and its}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+associated documentation.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+2. Subject to the terms and conditions of this License Agreement, PSF}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+hereby grants Licensee a nonexclusive, royalty-free, world-wide}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+license to reproduce, analyze, test, perform and/or display publicly,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+prepare derivative works, distribute, and otherwise use Python 2.3}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+alone or in any derivative version, provided, however, that PSF's}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License Agreement and PSF's notice of copyright, i.e., "Copyright (c)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+2001, 2002, 2003, 2004 Python Software Foundation; All Rights Reserved" are}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+retained in Python 2.3 alone or in any derivative version prepared by}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Licensee.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+3. In the event Licensee prepares a derivative work that is based on}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+or incorporates Python 2.3 or any part thereof, and wants to make}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the derivative work available to others as provided herein, then}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Licensee hereby agrees to include in any such work a brief summary of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the changes made to Python 2.3.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+4. PSF is making Python 2.3 available to Licensee on an "AS IS"}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.3 WILL NOT}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+INFRINGE ANY THIRD PARTY RIGHTS.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+2.3 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.3,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+6. This License Agreement will automatically terminate upon a material}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+breach of its terms and conditions.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+7. Nothing in this License Agreement shall be deemed to create any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+relationship of agency, partnership, or joint venture between PSF and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Licensee.  This License Agreement does not grant permission to use PSF}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+trademarks or trade name in a trademark sense to endorse or promote}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+products or services of Licensee, or any third party.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+8. By copying, installing or otherwise using Python 2.3, Licensee}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+agrees to be bound by the terms and conditions of this License}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Agreement.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+-------------------------------------------}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Individual or Organization ("Licensee") accessing and otherwise using}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+this software in source or binary form and its associated}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+documentation ("the Software").}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+2. Subject to the terms and conditions of this BeOpen Python License}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Agreement, BeOpen hereby grants Licensee a non-exclusive,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+royalty-free, world-wide license to reproduce, analyze, test, perform}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+and/or display publicly, prepare derivative works, distribute, and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+otherwise use the Software alone or in any derivative version,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+provided, however, that the BeOpen Python License is retained in the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Software, alone or in any derivative version prepared by Licensee.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+3. BeOpen is making the Software available to Licensee on an "AS IS"}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+basis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+INFRINGE ANY THIRD PARTY RIGHTS.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+5. This License Agreement will automatically terminate upon a material}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+breach of its terms and conditions.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+6. This License Agreement shall be governed by and interpreted in all}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+respects by the law of the State of California, excluding conflict of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+law provisions.  Nothing in this License Agreement shall be deemed to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+create any relationship of agency, partnership, or joint venture}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+between BeOpen and Licensee.  This License Agreement does not grant}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+permission to use BeOpen trademarks or trade names in a trademark}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+sense to endorse or promote products or services of Licensee, or any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+third party.  As an exception, the "BeOpen Python" logos available at}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+http://www.pythonlabs.com/logos.html may be used according to the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+permissions granted on that web page.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+7. By copying, installing or otherwise using the software, Licensee}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+agrees to be bound by the terms and conditions of this License}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Agreement.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+---------------------------------------}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+1. This LICENSE AGREEMENT is between the Corporation for National}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Research Initiatives, having an office at 1895 Preston White Drive,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Reston, VA 20191 ("CNRI"), and the Individual or Organization}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+("Licensee") accessing and otherwise using Python 1.6.1 software in}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+source or binary form and its associated documentation.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+2. Subject to the terms and conditions of this License Agreement, CNRI}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+hereby grants Licensee a nonexclusive, royalty-free, world-wide}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+license to reproduce, analyze, test, perform and/or display publicly,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+prepare derivative works, distribute, and otherwise use Python 1.6.1}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+alone or in any derivative version, provided, however, that CNRI's}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+1995-2001 Corporation for National Research Initiatives; All Rights}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Reserved" are retained in Python 1.6.1 alone or in any derivative}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+version prepared by Licensee.  Alternately, in lieu of CNRI's License}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Agreement, Licensee may substitute the following text (omitting the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+quotes): "Python 1.6.1 is made available subject to the terms and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+conditions in CNRI's License Agreement.  This Agreement together with}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Python 1.6.1 may be located on the Internet using the following}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+unique, persistent identifier (known as a handle): 1895.22/1013.  This}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Agreement may also be obtained from a proxy server on the Internet}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+using the following URL: http://hdl.handle.net/1895.22/1013".}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+3. In the event Licensee prepares a derivative work that is based on}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+or incorporates Python 1.6.1 or any part thereof, and wants to make}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the derivative work available to others as provided herein, then}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Licensee hereby agrees to include in any such work a brief summary of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the changes made to Python 1.6.1.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+basis.  CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+INFRINGE ANY THIRD PARTY RIGHTS.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+6. This License Agreement will automatically terminate upon a material}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+breach of its terms and conditions.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+7. This License Agreement shall be governed by the federal}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+intellectual property law of the United States, including without}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+limitation the federal copyright law, and, to the extent such}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+U.S. federal law does not apply, by the law of the Commonwealth of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Virginia, excluding Virginia's conflict of law provisions.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Notwithstanding the foregoing, with regard to derivative works based}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+on Python 1.6.1 that incorporate non-separable material that was}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+previously distributed under the GNU General Public License (GPL), the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+law of the Commonwealth of Virginia shall govern this License}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Agreement only as to issues arising under or with respect to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Paragraphs 4, 5, and 7 of this License Agreement.  Nothing in this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License Agreement shall be deemed to create any relationship of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+agency, partnership, or joint venture between CNRI and Licensee.  This}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License Agreement does not grant permission to use CNRI trademarks or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+trade name in a trademark sense to endorse or promote products or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+services of Licensee, or any third party.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+8. By clicking on the "ACCEPT" button where indicated, or by copying,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+installing or otherwise using Python 1.6.1, Licensee agrees to be}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+bound by the terms and conditions of this License Agreement.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+        }{\rtlch \ltrch\loch
+ACCEPT}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+--------------------------------------------------}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+The Netherlands.  All rights reserved.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Permission to use, copy, modify, and distribute this software and its}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+documentation for any purpose and without fee is hereby granted,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+provided that the above copyright notice appear in all copies and that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+both that copyright notice and this permission notice appear in}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+supporting documentation, and that the name of Stichting Mathematisch}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Centrum or CWI not be used in advertising or publicity pertaining to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distribution of the software without specific, written prior}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+permission.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20\sb0\sa283{\rtlch \ltrch\loch
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Redland RDF Library librdf; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+librdf.org }
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+librdf}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{{\field{\*\fldinst HYPERLINK "#lgpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+jump to LGPL}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: regexp; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Free Software Foundation, Inc. }
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+regexp}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{{\field{\*\fldinst HYPERLINK "#lgpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+jump to LGPL}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Remote Control Wrapper; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Martin Kahr}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Remote Control Wrapper}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Created by Martin Kahr under a MIT-style license. }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Copyright (c) 2006/2007 martinkahr.com. All rights reserved.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Permission is hereby granted, free of charge, to any person obtaining a }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+copy of this software and associated documentation files (the "Software"),}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+to deal in the Software without restriction, including without limitation}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the rights to use, copy, modify, merge, publish, distribute, sublicense,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+and/or sell copies of the Software, and to permit persons to whom the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Software is furnished to do so, subject to the following conditions:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+The above copyright notice and this permission notice shall be included}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+in all copies or substantial portions of the Software.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+THE SOFTWARE.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20\sb0\sa283{\rtlch \ltrch\loch
+}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Rhino; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Norris Boyd, Patrick Beard}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Rhino}
+\par \pard\plain \s21\sb0\sa120\qc{\b\rtlch \ltrch\loch\fs36
+MOZILLA PUBLIC LICENSE}{\rtlch \ltrch\loch
+ \line }{\b\rtlch \ltrch\loch
+Version 1.1}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12\qc\li4216\ri4216\lin4216\rin4216\fi0{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 14}{\*\bkmkend 14}\b\rtlch \ltrch\loch
+1. Definitions.}{{\*\bkmkstart 1.0.11}{\*\bkmkend 1.0.11}\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.0.1. "Commercial Use" }{{\*\bkmkstart 1.13}{\*\bkmkend 1.13}\rtlch \ltrch\loch
+means distribution or otherwise making the Covered Code available to a third party. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.1. ''Contributor''}{{\*\bkmkstart 1.21}{\*\bkmkend 1.21}\rtlch \ltrch\loch
+ means each entity that creates or contributes to the creation of Modifications. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.2. ''Contributor Version''}{{\*\bkmkstart 1.31}{\*\bkmkend 1.31}\rtlch \ltrch\loch
+ means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.3. ''Covered Code''}{\rtlch \ltrch\loch
+ means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof}{\b\rtlch \ltrch\loch
+.}{{\*\bkmkstart 1.41}{\*\bkmkend 1.41}\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.4. ''Electronic Distribution Mechanism''}{{\*\bkmkstart 1.51}{\*\bkmkend 1.51}\rtlch \ltrch\loch
+ means a mechanism generally accepted in the software development community for the electronic transfer of data. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.5. ''Executable''}{{\*\bkmkstart 1.61}{\*\bkmkend 1.61}\rtlch \ltrch\loch
+ means Covered Code in any form other than Source Code. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.6. ''Initial Developer''}{\rtlch \ltrch\loch
+ means the individual or entity identified as the Initial Developer in the Source Code notice required by }{\b\rtlch \ltrch\loch
+Exhibit A}{{\*\bkmkstart 1.71}{\*\bkmkend 1.71}\rtlch \ltrch\loch
+. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.7. ''Larger Work''}{{\*\bkmkstart 1.81}{\*\bkmkend 1.81}\rtlch \ltrch\loch
+ means a work which combines Covered Code or portions thereof with code not governed by the terms of this License. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.8. ''License''}{{\*\bkmkstart 1.8.11}{\*\bkmkend 1.8.11}\rtlch \ltrch\loch
+ means this document. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.8.1. "Licensable"}{{\*\bkmkstart 1.91}{\*\bkmkend 1.91}\rtlch \ltrch\loch
+ means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.9. ''Modifications''}{\rtlch \ltrch\loch
+ means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is: }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+A.}{\rtlch \ltrch\loch
+ Any addition to or deletion from the contents of a file containing Original Code or previous Modifications. }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+B.}{\rtlch \ltrch\loch
+ Any new file that contains any part of the Original Code or previous Modifications. \line \~ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{{\*\bkmkstart 1.101}{\*\bkmkend 1.101}\b\rtlch \ltrch\loch
+1.10. ''Original Code''}{\rtlch \ltrch\loch
+ means Source Code of computer software code which is described in the Source Code notice required by }{\b\rtlch \ltrch\loch
+Exhibit A}{{\*\bkmkstart 1.10.11}{\*\bkmkend 1.10.11}\rtlch \ltrch\loch
+ as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.10.1. "Patent Claims"}{{\*\bkmkstart 1.111}{\*\bkmkend 1.111}\rtlch \ltrch\loch
+ means any patent claim(s), now owned or hereafter acquired, including without limitation,\~  method, process, and apparatus claims, in any patent Licensable by grantor. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.11. ''Source Code''}{{\*\bkmkstart 1.121}{\*\bkmkend 1.121}\rtlch \ltrch\loch
+ means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.12. "You'' (or "Your")\~ }{\rtlch \ltrch\loch
+ means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You'' includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control'' means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.}
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 21}{\*\bkmkend 21}\b\rtlch \ltrch\loch
+2. Source Code License.}{{\*\bkmkstart 2.11}{\*\bkmkend 2.11}\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0\sb0\sa0{\b\rtlch \ltrch\loch
+2.1. The Initial Developer Grant.}{\rtlch \ltrch\loch
+ \line The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims: }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+(a)}{\rtlch \ltrch\loch
+\~  under intellectual property rights (other than patent or trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, and/or as part of a Larger Work; and }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+(b)}{\rtlch \ltrch\loch
+ under Patents Claims infringed by the making, using or selling of Original Code, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Code (or portions thereof). }
+\par \pard\plain \s21\sb0\sa120\li2828\ri0\lin2828\rin0\fi0\sb0\sa0{\rtlch \ltrch
+\~  }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+(c) }{\rtlch \ltrch\loch
+the licenses granted in this Section 2.1(a) and (b) are effective on the date Initial Developer first distributes Original Code under the terms of this License. }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+(d) }{\rtlch \ltrch\loch
+Notwithstanding Section 2.1(b) above, no patent license is granted: 1) for code that You delete from the Original Code; 2) separate from the Original Code;\~  or 3) for infringements caused by: i) the modification of the Original Code or ii) the combination of the Original Code with other software or devices. \line \~ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0\sb0\sa0{{\*\bkmkstart 2.21}{\*\bkmkend 2.21}\b\rtlch \ltrch\loch
+2.2. Contributor Grant.}{\rtlch \ltrch\loch
+ \line Subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\rtlch \ltrch
+\~  }{\rtlch \ltrch\loch
+\line }{\b\rtlch \ltrch\loch
+(a)}{\rtlch \ltrch\loch
+\~  under intellectual property rights (other than patent or trademark) Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger Work; and }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+(b)}{\rtlch \ltrch\loch
+ under Patent Claims infringed by the making, using, or selling of\~  Modifications made by that Contributor either alone and/or in}{\cf1\rtlch \ltrch\loch
+ combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: 1) Modifications made by that Contributor (or portions thereof); and 2) the combination of\~  Modifications made by that Contributor with its Contributor Version (or portions of such combination).}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+(c) }{\rtlch \ltrch\loch
+the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first makes Commercial Use of the Covered Code. }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+(d)\~ }{\rtlch \ltrch\loch
+\~ \~  Notwithstanding Section 2.2(b) above, no patent license is granted: 1) for any code that Contributor has deleted from the Contributor Version; 2)\~  separate from the Contributor Version;\~  3)\~  for infringements caused by: i) third party modifications of Contributor Version or ii)\~  the combination of Modifications made by that Contributor with other software\~  (except as part of the Contributor Version) or other devices; or 4) under Patent Claims infringed by Covered Code in the absence of Modifications made by that Contributor.}
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 31}{\*\bkmkend 31}\rtlch \ltrch\loch
+\line }{\b\rtlch \ltrch\loch
+3. Distribution Obligations.}{{\*\bkmkstart 3.11}{\*\bkmkend 3.11}\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+3.1. Application of License.}{\rtlch \ltrch\loch
+ \line The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section }{\b\rtlch \ltrch\loch
+2.2}{\rtlch \ltrch\loch
+. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section }{\b\rtlch \ltrch\loch
+6.1}{\rtlch \ltrch\loch
+, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section }{\b\rtlch \ltrch\loch
+3.5}{{\*\bkmkstart 3.21}{\*\bkmkend 3.21}\rtlch \ltrch\loch
+. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+3.2. Availability of Source Code.}{{\*\bkmkstart 3.31}{\*\bkmkend 3.31}\rtlch \ltrch\loch
+ \line Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+3.3. Description of Modifications.}{{\*\bkmkstart 3.41}{\*\bkmkend 3.41}\rtlch \ltrch\loch
+ \line You must cause all Covered Code to which You contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+3.4. Intellectual Property Matters}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+(a) Third Party Claims}{\rtlch \ltrch\loch
+. \line If Contributor has knowledge that a license under a third party's intellectual property rights is required to exercise the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor must include a text file with the Source Code distribution titled "LEGAL'' which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If Contributor obtains such knowledge after the Modification is made available as described in Section 3.2, Contributor shall promptly modify the LEGAL file in all copies Contributor makes available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained. }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+(b) Contributor APIs}{\rtlch \ltrch\loch
+. \line If Contributor's Modifications include an application programming interface and Contributor has knowledge of patent licenses which are reasonably necessary to implement that API, Contributor must also include this information in the LEGAL file. \line \~ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0\sb0\sa0{\rtlch \ltrch
+\~ \~ \~ \~ \~ \~ \~ \~ \~  }{\b\rtlch \ltrch\loch
+(c)\~ \~ \~  Representations.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\rtlch \ltrch\loch
+Contributor represents that, except as disclosed pursuant to Section 3.4(a) above, Contributor believes that Contributor's Modifications are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the rights conveyed by this License. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{{\*\bkmkstart 3.51}{\*\bkmkend 3.51}\rtlch \ltrch\loch
+\line }{\b\rtlch \ltrch\loch
+3.5. Required Notices.}{\rtlch \ltrch\loch
+ \line You must duplicate the notice in }{\b\rtlch \ltrch\loch
+Exhibit A}{\rtlch \ltrch\loch
+ in each file of the Source Code.\~  If it is not possible to put such notice in a particular Source Code file due to its structure, then You must include such notice in a location (such as a relevant directory) where a user would be likely to look for such a notice.\~  If You created one or more Modification(s) You may add your name as a Contributor to the notice described in }{\b\rtlch \ltrch\loch
+Exhibit A}{{\*\bkmkstart 3.61}{\*\bkmkend 3.61}\rtlch \ltrch\loch
+.\~  You must also duplicate this License in any documentation for the Source Code where You describe recipients' rights or ownership rights relating to Covered Code.\~  You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+3.6. Distribution of Executable Versions.}{\rtlch \ltrch\loch
+ \line You may distribute Covered Code in Executable form only if the requirements of Section }{\b\rtlch \ltrch\loch
+3.1-3.5}{\rtlch \ltrch\loch
+ have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section }{\b\rtlch \ltrch\loch
+3.2}{{\*\bkmkstart 3.71}{\*\bkmkend 3.71}\rtlch \ltrch\loch
+. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code or ownership rights under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+3.7. Larger Works.}{\rtlch \ltrch\loch
+ \line You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code.}
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 41}{\*\bkmkend 41}\b\rtlch \ltrch\loch
+4. Inability to Comply Due to Statute or Regulation.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section }{\b\rtlch \ltrch\loch
+3.4}{\rtlch \ltrch\loch
+ and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it. }
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 51}{\*\bkmkend 51}\b\rtlch \ltrch\loch
+5. Application of this License.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+This License applies to code to which the Initial Developer has attached the notice in }{\b\rtlch \ltrch\loch
+Exhibit A}{\rtlch \ltrch\loch
+ and to related Covered Code. }
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 61}{\*\bkmkend 61}\b\rtlch \ltrch\loch
+6. Versions of the License.}{{\*\bkmkstart 6.11}{\*\bkmkend 6.11}\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+6.1. New Versions}{{\*\bkmkstart 6.21}{\*\bkmkend 6.21}\rtlch \ltrch\loch
+. \line Netscape Communications Corporation (''Netscape'') may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+6.2. Effect of New Versions}{{\*\bkmkstart 6.31}{\*\bkmkend 6.31}\rtlch \ltrch\loch
+. \line Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Netscape. No one other than Netscape has the right to modify the terms applicable to Covered Code created under this License. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+6.3. Derivative Works}{\rtlch \ltrch\loch
+. \line If You create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), You must (a) rename Your license so that the phrases ''Mozilla'', ''MOZILLAPL'', ''MOZPL'', ''Netscape'', "MPL", ''NPL'' or any confusingly similar phrase do not appear in your license (except to note that your license differs from this License) and (b) otherwise make it clear that Your version of the license contains terms which differ from the Mozilla Public License and Netscape Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in }{\b\rtlch \ltrch\loch
+Exhibit A}{\rtlch \ltrch\loch
+ shall not of themselves be deemed to be modifications of this License.)}
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 71}{\*\bkmkend 71}\b\rtlch \ltrch\loch
+7. DISCLAIMER OF WARRANTY.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. }
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 81}{\*\bkmkend 81}\b\rtlch \ltrch\loch
+8. TERMINATION.}{{\*\bkmkstart 8.11}{\*\bkmkend 8.11}\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+8.1.\~  }{{\*\bkmkstart 8.21}{\*\bkmkend 8.21}\rtlch \ltrch\loch
+This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+8.2.\~  }{\rtlch \ltrch\loch
+If You initiate litigation by asserting a patent infringement claim (excluding declatory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You file such action is referred to as "Participant")\~  alleging that: }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+(a)\~  }{\rtlch \ltrch\loch
+such Participant's Contributor Version directly or indirectly infringes any patent, then any and all rights granted by such Participant to You under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively, unless if within 60 days after receipt of notice You either: (i)\~  agree in writing to pay Participant a mutually agreeable reasonable royalty for Your past and future use of Modifications made by such Participant, or (ii) withdraw Your litigation claim with respect to the Contributor Version against such Participant.\~  If within 60 days of notice, a reasonable royalty and payment arrangement are not mutually agreed upon in writing by the parties or the litigation claim is not withdrawn, the rights granted by Participant to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration of the 60 day notice period specified above. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+(b)}{{\*\bkmkstart 8.31}{\*\bkmkend 8.31}\rtlch \ltrch\loch
+\~  any software, hardware, or device, other than such Participant's Contributor Version, directly or indirectly infringes any patent, then any rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are revoked effective as of the date You first made, used, sold, distributed, or had made, Modifications made by that Participant. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+8.3.\~  }{{\*\bkmkstart 8.41}{\*\bkmkend 8.41}\rtlch \ltrch\loch
+If You assert a patent infringement claim against Participant alleging that such Participant's Contributor Version directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+8.4.}{\rtlch \ltrch\loch
+\~  In the event of termination under Sections 8.1 or 8.2 above,\~  all end user license agreements (excluding distributors and resellers) which have been validly granted by You or any distributor hereunder prior to termination shall survive termination.}
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 91}{\*\bkmkend 91}\b\rtlch \ltrch\loch
+9. LIMITATION OF LIABILITY.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. }
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 101}{\*\bkmkend 101}\b\rtlch \ltrch\loch
+10. U.S. GOVERNMENT END USERS.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+The Covered Code is a ''commercial item,'' as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of ''commercial computer software'' and ''commercial computer software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein. }
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 111}{\*\bkmkend 111}\b\rtlch \ltrch\loch
+11. MISCELLANEOUS.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in the United States of America, any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. }
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 121}{\*\bkmkend 121}\b\rtlch \ltrch\loch
+12. RESPONSIBILITY FOR CLAIMS.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability. }
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 131}{\*\bkmkend 131}\b\rtlch \ltrch\loch
+13. MULTIPLE-LICENSED CODE.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+Initial Developer may designate portions of the Covered Code as \uc3 \u8220\'e2\'80\'9cMultiple-Licensed\u8221\'e2\'80\'9d.\~  \u8220\'e2\'80\'9cMultiple-Licensed\u8221\'e2\'80\'9d means that the Initial Developer permits you to utilize portions of the Covered Code under Your choice of the MPL or the alternative licenses, if any, specified by the Initial Developer in the file described in Exhibit A. \uc1 }
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart EXHIBIT-A1}{\*\bkmkend EXHIBIT-A1}\rtlch \ltrch\loch
+\line }{\b\rtlch \ltrch\loch
+EXHIBIT A -Mozilla Public License.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+``The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at \line http://www.mozilla.org/MPL/ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF \line ANY KIND, either express or implied. See the License for the specific language governing rights and \line limitations under the License. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+The Original Code is ______________________________________. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+The Initial Developer of the Original Code is ________________________. Portions created by \line \~ ______________________ are Copyright (C) ______ _______________________. All Rights \line Reserved. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+Contributor(s): ______________________________________. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+Alternatively, the contents of this file may be used under the terms of the _____ license (the\~  \uc3 \u8220\'e2\'80\'9c[___] License\u8221\'e2\'80\'9d), in which case the provisions of [______] License are applicable\~  instead of those above.\~  If you wish to allow use of your version of this file only under the terms of the [____] License and not to allow others to use your version of this file under the MPL, indicate your decision by deleting\~  the provisions above and replace\~  them with the notice and other provisions required by the [___] License.\~  If you do not delete the provisions above, a recipient may use your version of this file under either the MPL or the [___] License." \uc1 }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+[NOTE: The text of this Exhibit A may differ slightly from the text of the notices in the Source Code files of the Original Code. You should use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.] }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: sRGB Profiles; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+International Color Consortium}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+sRGB Profiles}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+\line To anyone who acknowledges that the files "sRGB_IEC61966-2-1_noBPC.icc" and "sRGB_IEC61966-2-1_withBPC.icc" are provided "AS IS" WITH NO EXPRESS OR IMPLIED WARRANTY, permission to use, copy and distribute these file for any purpose is hereby granted without fee, provided that the files are not changed including the HP copyright notice tag, and that the name of Hewlett-Packard Company shall not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. Hewlett-Packard Company makes no representations about the suitability of this software for any purpose. }
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Sablotron; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Ginger Alliance}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Sablotron}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{{\field{\*\fldinst HYPERLINK "#lgpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+jump to LGPL}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: SANE; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+David Mosberger-Tang, Andreas Beck}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+SANE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+/* sane - Scanner Access Now Easy.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+Copyright (C) 1997-1999 David Mosberger-Tang and Andreas Beck}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+This file is part of the SANE package.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+This file is in the public domain.  You may use and modify it as}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+you see fit, as long as this copyright message is included and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+that there is an indication as to what modifications have been}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+made (if any).}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+SANE is distributed in the hope that it will be useful, but WITHOUT}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+FITNESS FOR A PARTICULAR PURPOSE.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+This file declares SANE application interface.  See the SANE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20\sb0\sa283{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+standard for a detailed explanation of the interface.  */}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Saxon (B); Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Michael Kay}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Saxon (B)}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{{\field{\*\fldinst HYPERLINK "#mpllic" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+jump to MPL 1.1}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Stax API; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+stax.codehouse.org}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Stax}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+                                 }{\rtlch \ltrch\loch
+Apache License}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+                           }{\rtlch \ltrch\loch
+Version 2.0, January 2004}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+                        }{\rtlch \ltrch\loch
+http://www.apache.org/licenses/}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+1. Definitions.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+"License" shall mean the terms and conditions for use, reproduction,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+and distribution as defined by Sections 1 through 9 of this document.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+"Licensor" shall mean the copyright owner or entity authorized by}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+the copyright owner that is granting the License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+"Legal Entity" shall mean the union of the acting entity and all}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+other entities that control, are controlled by, or are under common}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+control with that entity. For the purposes of this definition,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+"control" means (i) the power, direct or indirect, to cause the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+direction or management of such entity, whether by contract or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+otherwise, or (ii) ownership of fifty percent (50%) or more of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+outstanding shares, or (iii) beneficial ownership of such entity.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+"You" (or "Your") shall mean an individual or Legal Entity}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+exercising permissions granted by this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+"Source" form shall mean the preferred form for making modifications,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+including but not limited to software source code, documentation}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+source, and configuration files.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+"Object" form shall mean any form resulting from mechanical}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+transformation or translation of a Source form, including but}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+not limited to compiled object code, generated documentation,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+and conversions to other media types.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+"Work" shall mean the work of authorship, whether in Source or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Object form, made available under the License, as indicated by a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+copyright notice that is included in or attached to the work}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+(an example is provided in the Appendix below).}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+"Derivative Works" shall mean any work, whether in Source or Object}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+form, that is based on (or derived from) the Work and for which the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+editorial revisions, annotations, elaborations, or other modifications}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+represent, as a whole, an original work of authorship. For the purposes}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+of this License, Derivative Works shall not include works that remain}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+separable from, or merely link (or bind by name) to the interfaces of,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+the Work and Derivative Works thereof.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+"Contribution" shall mean any work of authorship, including}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+the original version of the Work and any modifications or additions}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+to that Work or Derivative Works thereof, that is intentionally}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+submitted to Licensor for inclusion in the Work by the copyright owner}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+or by an individual or Legal Entity authorized to submit on behalf of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+the copyright owner. For the purposes of this definition, "submitted"}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+means any form of electronic, verbal, or written communication sent}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+to the Licensor or its representatives, including but not limited to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+communication on electronic mailing lists, source code control systems,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+and issue tracking systems that are managed by, or on behalf of, the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Licensor for the purpose of discussing and improving the Work, but}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+excluding communication that is conspicuously marked or otherwise}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+designated in writing by the copyright owner as "Not a Contribution."}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+"Contributor" shall mean Licensor and any individual or Legal Entity}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+on behalf of whom a Contribution has been received by Licensor and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+subsequently incorporated within the Work.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+2. Grant of Copyright License. Subject to the terms and conditions of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+this License, each Contributor hereby grants to You a perpetual,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+copyright license to reproduce, prepare Derivative Works of,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+publicly display, publicly perform, sublicense, and distribute the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Work and such Derivative Works in Source or Object form.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+3. Grant of Patent License. Subject to the terms and conditions of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+this License, each Contributor hereby grants to You a perpetual,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+(except as stated in this section) patent license to make, have made,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+use, offer to sell, sell, import, and otherwise transfer the Work,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+where such license applies only to those patent claims licensable}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+by such Contributor that are necessarily infringed by their}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Contribution(s) alone or by combination of their Contribution(s)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+with the Work to which such Contribution(s) was submitted. If You}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+institute patent litigation against any entity (including a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+cross-claim or counterclaim in a lawsuit) alleging that the Work}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+or a Contribution incorporated within the Work constitutes direct}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+or contributory patent infringement, then any patent licenses}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+granted to You under this License for that Work shall terminate}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+as of the date such litigation is filed.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+4. Redistribution. You may reproduce and distribute copies of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Work or Derivative Works thereof in any medium, with or without}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+modifications, and in Source or Object form, provided that You}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+meet the following conditions:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+(a) You must give any other recipients of the Work or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+Derivative Works a copy of this License; and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+(b) You must cause any modified files to carry prominent notices}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+stating that You changed the files; and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+(c) You must retain, in the Source form of any Derivative Works}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+that You distribute, all copyright, patent, trademark, and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+attribution notices from the Source form of the Work,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+excluding those notices that do not pertain to any part of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+the Derivative Works; and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+(d) If the Work includes a "NOTICE" text file as part of its}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+distribution, then any Derivative Works that You distribute must}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+include a readable copy of the attribution notices contained}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+within such NOTICE file, excluding those notices that do not}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+pertain to any part of the Derivative Works, in at least one}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+of the following places: within a NOTICE text file distributed}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+as part of the Derivative Works; within the Source form or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+documentation, if provided along with the Derivative Works; or,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+within a display generated by the Derivative Works, if and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+wherever such third-party notices normally appear. The contents}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+of the NOTICE file are for informational purposes only and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+do not modify the License. You may add Your own attribution}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+notices within Derivative Works that You distribute, alongside}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+or as an addendum to the NOTICE text from the Work, provided}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+that such additional attribution notices cannot be construed}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+as modifying the License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+You may add Your own copyright statement to Your modifications and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+may provide additional or different license terms and conditions}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+for use, reproduction, or distribution of Your modifications, or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+for any such Derivative Works as a whole, provided Your use,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+reproduction, and distribution of the Work otherwise complies with}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+the conditions stated in this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+5. Submission of Contributions. Unless You explicitly state otherwise,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+any Contribution intentionally submitted for inclusion in the Work}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+by You to the Licensor shall be under the terms and conditions of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+this License, without any additional terms or conditions.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Notwithstanding the above, nothing herein shall supersede or modify}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+the terms of any separate license agreement you may have executed}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+with Licensor regarding such Contributions.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+6. Trademarks. This License does not grant permission to use the trade}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+names, trademarks, service marks, or product names of the Licensor,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+except as required for reasonable and customary use in describing the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+origin of the Work and reproducing the content of the NOTICE file.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+7. Disclaimer of Warranty. Unless required by applicable law or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+agreed to in writing, Licensor provides the Work (and each}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Contributor provides its Contributions) on an "AS IS" BASIS,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+implied, including, without limitation, any warranties or conditions}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+PARTICULAR PURPOSE. You are solely responsible for determining the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+appropriateness of using or redistributing the Work and assume any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+risks associated with Your exercise of permissions under this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+8. Limitation of Liability. In no event and under no legal theory,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+whether in tort (including negligence), contract, or otherwise,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+unless required by applicable law (such as deliberate and grossly}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+negligent acts) or agreed to in writing, shall any Contributor be}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+liable to You for damages, including any direct, indirect, special,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+incidental, or consequential damages of any character arising as a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+result of this License or out of the use or inability to use the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Work (including but not limited to damages for loss of goodwill,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+work stoppage, computer failure or malfunction, or any and all}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+other commercial damages or losses), even if such Contributor}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+has been advised of the possibility of such damages.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+9. Accepting Warranty or Additional Liability. While redistributing}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+the Work or Derivative Works thereof, You may choose to offer,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+and charge a fee for, acceptance of support, warranty, indemnity,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+or other liability obligations and/or rights consistent with this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+License. However, in accepting such obligations, You may act only}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+on Your own behalf and on Your sole responsibility, not on behalf}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+of any other Contributor, and only if You agree to indemnify,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+defend, and hold each Contributor harmless for any liability}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+incurred by, or claims asserted against, such Contributor by reason}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+of your accepting any such warranty or additional liability.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+END OF TERMS AND CONDITIONS}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+APPENDIX: How to apply the Apache License to your work.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+To apply the Apache License to your work, attach the following}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+boilerplate notice, with the fields enclosed by brackets "[]"}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+replaced with your own identifying information. (Don't include}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+the brackets!)  The text should be enclosed in the appropriate}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+comment syntax for the file format. We also recommend that a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+file or class name and description of purpose be included on the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+same "printed page" as the copyright notice for easier}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+identification within third-party archives.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+Copyright [yyyy] [name of copyright owner]}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+Licensed under the Apache License, Version 2.0 (the "License");}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+you may not use this file except in compliance with the License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+You may obtain a copy of the License at}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+       }{\rtlch \ltrch\loch
+http://www.apache.org/licenses/LICENSE-2.0}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+Unless required by applicable law or agreed to in writing, software}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+distributed under the License is distributed on an "AS IS" BASIS,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+See the License for the specific language governing permissions and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+limitations under the License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20\sb0\sa283{\rtlch \ltrch\loch
+}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product:STLport; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Boris Fomitchev}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+STLport}
+\par \pard\plain \s4\b\hich\af9\dbch\af12\afs24\ab\loch\f4\fs24{\rtlch \ltrch\loch
+License Agreement}
+\par \pard\plain \s21\sb0\sa120{\b\rtlch \ltrch\loch
+Boris Fomitchev}{\rtlch \ltrch\loch
+ grants }{\b\rtlch \ltrch\loch
+Licensee}{\rtlch \ltrch\loch
+ a non-exclusive, non-transferable, royalty-free license to use }{\b\rtlch \ltrch\loch
+STLport}{\rtlch \ltrch\loch
+ and its documentation without fee.\line \line By downloading, using, or copying }{\b\rtlch \ltrch\loch
+STLport}{\rtlch \ltrch\loch
+ or any portion thereof,\~  }{\b\rtlch \ltrch\loch
+Licensee}{\rtlch \ltrch\loch
+ agrees to abide by the intellectual property laws and all other applicable laws of the United States of America, and to all of the terms and conditions of this Agreement.\line \line }{\b\rtlch \ltrch\loch
+Licensee}{\rtlch \ltrch\loch
+ shall maintain the following copyright and permission\~  notices on }{\b\rtlch \ltrch\loch
+STLport }{\rtlch \ltrch\loch
+sources and its documentation unchanged :}
+\par \pard\plain \s21\sb0\sa120{\b\rtlch \ltrch\loch
+Copyright 1999,2000 Boris Fomitchev}{\rtlch \ltrch\loch
+\line \line This material is provided "as is", with absolutely no warranty expressed or implied. Any use is at your own risk.\line Permission to use or copy this software for any purpose is hereby granted without fee, provided the above notices are retained on all copies. Permission to modify the code and to distribute modified code is granted, provided the above notices are retained, and a notice that the code was modified is included with the above copyright notice. }
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The }{\b\rtlch \ltrch\loch
+Licensee}{\rtlch \ltrch\loch
+ may distribute binaries compiled with }{\b\rtlch \ltrch\loch
+STLport}{\rtlch \ltrch\loch
+ (whether original or modified) without any royalties or restrictions.}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The }{\b\rtlch \ltrch\loch
+Licensee}{\rtlch \ltrch\loch
+ may distribute original or modified }{\b\rtlch \ltrch\loch
+STLport}{\rtlch \ltrch\loch
+ sources, provided that:}
+\par \pard\plain \s21\sb0\sa120{\listtext\pard\plain \hich\af8\dbch\af8\loch\f8 \'95\tab}\ilvl0\ls33 \li0\ri0\lin0\rin0\fi-283\tx707\li707\ri0\lin707\rin0\fi-283\sb0\sa0{\rtlch \ltrch\loch
+The conditions indicated in the above permission notice are met; }
+\par \pard\plain \s21\sb0\sa120{\listtext\pard\plain \hich\af8\dbch\af8\loch\f8 \'95\tab}\ilvl0\ls33 \li0\ri0\lin0\rin0\fi-283\tx707\li707\ri0\lin707\rin0\fi-283{\rtlch \ltrch\loch
+The following copyright notices are retained when present, and conditions provided in accompanying permission notices are met : }
+\par \pard\plain \s21\sb0\sa120{\i\b\rtlch \ltrch\loch
+Copyright 1994 Hewlett-Packard Company}
+\par \pard\plain \s21\sb0\sa120{\i\b\rtlch \ltrch\loch
+Copyright 1996,97 Silicon Graphics Computer Systems, Inc.}
+\par \pard\plain \s21\sb0\sa120{\i\b\rtlch \ltrch\loch
+Copyright 1997 Moscow Center for SPARC Technology.}
+\par \pard\plain \s27\li567\ri567\lin567\rin567\fi0\sb0\sa283{\i\rtlch \ltrch\loch\fs20
+Permission to use, copy, modify, distribute and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation. Hewlett-Packard Company makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty.}
+\par \pard\plain \s27\li567\ri567\lin567\rin567\fi0\sb0\sa283{\i\rtlch \ltrch\loch\fs20
+Permission to use, copy, modify, distribute and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation. Silicon Graphics makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty.}
+\par \pard\plain \s27\li567\ri567\lin567\rin567\fi0\sb0\sa283{\i\rtlch \ltrch\loch\fs20
+Permission to use, copy, modify, distribute and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation. Moscow Center for SPARC Technology\~  makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Italian Thesaurus; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Daniela Volta, Davide Prina}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Italian Thesaurus}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line }{{\field{\*\fldinst HYPERLINK "#gpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+Jump to GPL}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Nepali thesaurus dictionary; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+NepaLinux.org}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Nepali thesaurus dictionary (LGPL v2.1)}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line }{{\field{\*\fldinst HYPERLINK "#lgpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+jump to GNU Lesser General Public License}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Italian Thesaurus; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Daniela Volta, Davide Prina}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Sownik synonimw v. 1, (Polish Thesaurus)}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line Open Software License v. 2.1 \line This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following notice immediately following the copyright notice for the Original Work: \line Licensed under the Open Software License version 2.1 \line 1) Grant of Copyright License. Licensor hereby grants You a world-wide, royalty-free, non-exclusive, perpetual, sublicenseable license to do the following: \line * to reproduce the Original Work in copies; \line * to prepare derivative works ("Derivative Works") based upon the Original Work; \line * to distribute copies of the Original Work and Derivative Works to the \line public, with the proviso that copies of Original Work or Derivative Works that You distribute shall be licensed under the Open Software License; * to perform the Original Work publicly; and \line * to display the Original Work publicly. \line 2) Grant of Patent License. Licensor hereby grants You a world-wide, royalty-free, non-exclusive, perpetual, sublicenseable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, to make, use, sell and offer for sale the Original Work and Derivative Works. \line 3) Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor hereby agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work, and by publishing the address of that information repository in a notice immediately following the copyright notice that applies to the Original Work. \line 4) Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior written permission of the Licensor. Nothing in this License shall be deemed to grant any rights to trademarks, copyrights, patents, trade secrets or any other intellectual property of Licensor except as expressly stated herein. No patent license is granted to make, use, sell or offer to sell embodiments of any patent claims other than the licensed claims defined in Section 2. No right is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under different terms from this License any Original Work that Licensor otherwise would have a right to license. \line 5) External Deployment. The term "External Deployment" means the use or distribution of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether the Original Work or Derivative Works are distributed to those persons or made available as an application intended for use over a computer network. As an express condition for the grants of license hereunder, You agree that any External Deployment by You of a Derivative Work shall be deemed a distribution and shall be licensed to all under the terms of this License, as prescribed in section 1(c) herein. \line 6) Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. \line 7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately proceeding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to Original Work is granted hereunder except under this disclaimer. \line 8) Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to any person for any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to liability for death or personal injury resulting from Licensor's negligence to the extent applicable law prohibits such limitation. Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so this exclusion and limitation may not apply to You. \line 9) Acceptance and Termination. If You distribute copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. Nothing else but this License (or another written agreement between Licensor and You) grants You permission to create Derivative Works based upon the Original Work or to exercise any of the rights granted in Section 1 herein, and any attempt to do so except under the terms of this License (or another written agreement between Licensor and You) is expressly prohibited by U.S. copyright law, the equivalent laws of other countries, and by international treaty. Therefore, by exercising any of the rights granted to You in Section 1 herein, You indicate Your acceptance of this License and all of its terms and conditions. This License shall terminate immediately and you may no longer exercise any of the rights granted to You by this License upon Your failure to honor the proviso in Section 1(c) herein. \line 10) Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. \line 11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of the U.S. Copyright Act, 17 U.S.C. \uc2 \u167\'c2\'a7 101 et seq., the equivalent laws of other countries, and international treaty. This section shall survive the termination of this License. \line 12) Attorneys Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. \line 13) Miscellaneous. This License represents the complete agreement concerning the subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. \line 14) Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. \line 15) Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. \line This license is Copyright (C) 2003-2004 Lawrence E. Rosen. All rights reserved. Permission is hereby granted to copy and distribute this license without modification. This license may not be modified without the express written permission of its copyright owner. \uc1 }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Russian thesaurus; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Mikhail Korolyov}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Russian thesaurus}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line }{{\field{\*\fldinst HYPERLINK "#lgpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+jump to GNU Lesser General Public License}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: TWAIN; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+TWAIN Working Group}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+TWAIN}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line The TWAIN License \line The TWAIN Working Group grants customer ("Customer") the worldwide, royalty-free, non-exclusive license to reproduce and distribute the software and documentation of the TWAIN toolkit ("TWAIN Toolkit"). The TWAIN Toolkit was designed to be used by third parties to assist them in becoming compliant with the TWAIN standard, but it has not been developed to the standards of a commercial product. Consequently, the TWAIN toolkit is provided AS IS without any warranty. THE TWAIN Working Group disclaims all warranties in the TWAIN toolkit whether implied, express or statutory, including, without limitation, the implied warranties of merchantability, noninfringement of third party rights and fitness for a particular purpose. The TWAIN Working Group disclaims all liability for damages, whether direct, indirect, special, incidental, or consequential, arising from the reproduction, distribution, modification, or other use of the TWAIN Toolkit. \line As a condition of this license, Customer agrees to include in software programs based in whole or in part on the TWAIN Toolkit the following providions in (i) the header or similar file in such software and (ii) prominently in its documentation and to require its sublicensees to include these provisions in similar locations: The TWAIN Toolkit is distributed as is. The developer and distributors of the TWAIN Toolkit expressly disclaim all implied, express or statutory warranties including, without limitation, the implied warranties of merchantability, noninfringement of third party rights and fitness for a particular purpose. Neither the developers nor the distributors will be liable for damages, whether direct, indirect, special, incidental, or consequential, as a result of the reproduction, modification, distribution or other use of the TWAIN Toolkit. }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Unicode's CLDR data repository; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Unicode, Inc.}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Unicode CLDR data repository}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line Copyright 1991-2005 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html. \line Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified. \line THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE. \line Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder. }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: unixODBC; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+unixODBC.org}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+unixODBC}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{{\field{\*\fldinst HYPERLINK "#lgpl" }{\fldrslt \cf2\ul\ulc0\langfe255\lang255\lang255\rtlch \ltrch\loch
+jump to LGPL}}}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: vigra; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Ullrich Koethe}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+vigra}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line The VIGRA Artistic License \line ========================== \line (modeled after the Perl Artistic License) \line \line Preamble \line -------- \line \line The intent of this document is to state the conditions under which VIGRA may be copied, such that the author maintains some semblance of artistic control over the development of the library, while giving the users of the library the right to use and distribute VIGRA in a more-or-less customary fashion, plus the right to make reasonable modifications. \line Definitions \line ----------- \line "Copyright Holder" of the VIGRA library is Ullrich Koethe, Cognitive Systems Group, University of Hamburg, Germany. \line "Library" refers to the collection of files distributed by the Copyright Holder under the name "VIGRA" (including this LICENSE file and all accompanying documentation), and derivatives of that collection of files created through textual modification. \line "Standard Version" refers to the Library if it has not been modified, or has been modified in accordance with the wishes of the Copyright Holder as specified below. \line "You" is you, if you're thinking about using, copying, modifying or distributing this Library. \line "Freely Available" means that no fee is charged for the item. It also means that recipients of the item may redistribute it under the same conditions they received it. \line "Reasonable copying fee" is whatever you can justify on the basis of media cost, duplication charges, time of people involved, and so on. (You will not be required to justify it to the Copyright Holder, but only to the computing community at large as a market that must bear the fee.) \line License terms \line ------------- \line 1. You may make and give away verbatim copies of the Standard Version of this Library without restriction, provided that you duplicate all of the original copyright notices, this license, and associated disclaimers. \line 2. The Standard Version of the Library may be distributed as part of a collection of software, provided no more than a reasonable copying fee is charged for the software collection. \line 3. You may apply bug fixes and portability fixes derived from the Public Domain or from the Copyright Holder. A Library modified in such a way shall still be considered the Standard Version. \line 4. You may otherwise modify your copy of this Library in any way, provided that you insert a prominent notice in each changed file stating how and when you changed that file, and provided that you do at least ONE of the following: \line a. place your modifications in the Public Domain or otherwise make them Freely Available, for example by allowing the Copyright Holder to include your modifications in the Standard Version of the Library. \line b. use the modified Library only within your corporation or organization. \line c. make other distribution arrangements with the Copyright Holder. \line 5. You may distribute programs which use this Library in object code or executable form without restriction. \line 6. Any object code generated as a result of using this Library does not fall under the copyright of this Library, but belongs to whomever generated it, and may be sold commercially. \line 7. The name of the Copyright Holder or the Library may not be used to endorse or promote products derived from this software without specific prior written permission. \line 8. THIS LIBRARY IS PROVIDED AS IS AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. \line IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR ON ANY THEORY OF LIABILITY ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS LIBRARY. }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Xalan; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+The Apache Software Foundation}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Xalan}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+                                 }{\rtlch \ltrch\loch
+Apache License}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+                           }{\rtlch \ltrch\loch
+Version 2.0, January 2004}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+                        }{\rtlch \ltrch\loch
+http://www.apache.org/licenses/}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+1. Definitions.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+"License" shall mean the terms and conditions for use, reproduction,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+and distribution as defined by Sections 1 through 9 of this document.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+"Licensor" shall mean the copyright owner or entity authorized by}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+the copyright owner that is granting the License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+"Legal Entity" shall mean the union of the acting entity and all}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+other entities that control, are controlled by, or are under common}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+control with that entity. For the purposes of this definition,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+"control" means (i) the power, direct or indirect, to cause the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+direction or management of such entity, whether by contract or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+otherwise, or (ii) ownership of fifty percent (50%) or more of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+outstanding shares, or (iii) beneficial ownership of such entity.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+"You" (or "Your") shall mean an individual or Legal Entity}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+exercising permissions granted by this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+"Source" form shall mean the preferred form for making modifications,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+including but not limited to software source code, documentation}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+source, and configuration files.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+"Object" form shall mean any form resulting from mechanical}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+transformation or translation of a Source form, including but}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+not limited to compiled object code, generated documentation,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+and conversions to other media types.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+"Work" shall mean the work of authorship, whether in Source or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Object form, made available under the License, as indicated by a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+copyright notice that is included in or attached to the work}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+(an example is provided in the Appendix below).}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+"Derivative Works" shall mean any work, whether in Source or Object}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+form, that is based on (or derived from) the Work and for which the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+editorial revisions, annotations, elaborations, or other modifications}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+represent, as a whole, an original work of authorship. For the purposes}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+of this License, Derivative Works shall not include works that remain}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+separable from, or merely link (or bind by name) to the interfaces of,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+the Work and Derivative Works thereof.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+"Contribution" shall mean any work of authorship, including}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+the original version of the Work and any modifications or additions}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+to that Work or Derivative Works thereof, that is intentionally}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+submitted to Licensor for inclusion in the Work by the copyright owner}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+or by an individual or Legal Entity authorized to submit on behalf of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+the copyright owner. For the purposes of this definition, "submitted"}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+means any form of electronic, verbal, or written communication sent}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+to the Licensor or its representatives, including but not limited to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+communication on electronic mailing lists, source code control systems,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+and issue tracking systems that are managed by, or on behalf of, the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Licensor for the purpose of discussing and improving the Work, but}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+excluding communication that is conspicuously marked or otherwise}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+designated in writing by the copyright owner as "Not a Contribution."}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+"Contributor" shall mean Licensor and any individual or Legal Entity}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+on behalf of whom a Contribution has been received by Licensor and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+subsequently incorporated within the Work.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+2. Grant of Copyright License. Subject to the terms and conditions of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+this License, each Contributor hereby grants to You a perpetual,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+copyright license to reproduce, prepare Derivative Works of,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+publicly display, publicly perform, sublicense, and distribute the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Work and such Derivative Works in Source or Object form.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+3. Grant of Patent License. Subject to the terms and conditions of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+this License, each Contributor hereby grants to You a perpetual,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+(except as stated in this section) patent license to make, have made,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+use, offer to sell, sell, import, and otherwise transfer the Work,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+where such license applies only to those patent claims licensable}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+by such Contributor that are necessarily infringed by their}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Contribution(s) alone or by combination of their Contribution(s)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+with the Work to which such Contribution(s) was submitted. If You}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+institute patent litigation against any entity (including a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+cross-claim or counterclaim in a lawsuit) alleging that the Work}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+or a Contribution incorporated within the Work constitutes direct}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+or contributory patent infringement, then any patent licenses}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+granted to You under this License for that Work shall terminate}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+as of the date such litigation is filed.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+4. Redistribution. You may reproduce and distribute copies of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Work or Derivative Works thereof in any medium, with or without}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+modifications, and in Source or Object form, provided that You}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+meet the following conditions:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+(a) You must give any other recipients of the Work or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+Derivative Works a copy of this License; and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+(b) You must cause any modified files to carry prominent notices}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+stating that You changed the files; and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+(c) You must retain, in the Source form of any Derivative Works}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+that You distribute, all copyright, patent, trademark, and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+attribution notices from the Source form of the Work,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+excluding those notices that do not pertain to any part of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+the Derivative Works; and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+(d) If the Work includes a "NOTICE" text file as part of its}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+distribution, then any Derivative Works that You distribute must}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+include a readable copy of the attribution notices contained}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+within such NOTICE file, excluding those notices that do not}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+pertain to any part of the Derivative Works, in at least one}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+of the following places: within a NOTICE text file distributed}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+as part of the Derivative Works; within the Source form or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+documentation, if provided along with the Derivative Works; or,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+within a display generated by the Derivative Works, if and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+wherever such third-party notices normally appear. The contents}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+of the NOTICE file are for informational purposes only and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+do not modify the License. You may add Your own attribution}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+notices within Derivative Works that You distribute, alongside}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+or as an addendum to the NOTICE text from the Work, provided}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+that such additional attribution notices cannot be construed}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+as modifying the License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+You may add Your own copyright statement to Your modifications and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+may provide additional or different license terms and conditions}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+for use, reproduction, or distribution of Your modifications, or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+for any such Derivative Works as a whole, provided Your use,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+reproduction, and distribution of the Work otherwise complies with}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+the conditions stated in this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+5. Submission of Contributions. Unless You explicitly state otherwise,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+any Contribution intentionally submitted for inclusion in the Work}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+by You to the Licensor shall be under the terms and conditions of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+this License, without any additional terms or conditions.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Notwithstanding the above, nothing herein shall supersede or modify}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+the terms of any separate license agreement you may have executed}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+with Licensor regarding such Contributions.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+6. Trademarks. This License does not grant permission to use the trade}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+names, trademarks, service marks, or product names of the Licensor,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+except as required for reasonable and customary use in describing the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+origin of the Work and reproducing the content of the NOTICE file.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+7. Disclaimer of Warranty. Unless required by applicable law or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+agreed to in writing, Licensor provides the Work (and each}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Contributor provides its Contributions) on an "AS IS" BASIS,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+implied, including, without limitation, any warranties or conditions}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+PARTICULAR PURPOSE. You are solely responsible for determining the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+appropriateness of using or redistributing the Work and assume any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+risks associated with Your exercise of permissions under this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+8. Limitation of Liability. In no event and under no legal theory,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+whether in tort (including negligence), contract, or otherwise,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+unless required by applicable law (such as deliberate and grossly}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+negligent acts) or agreed to in writing, shall any Contributor be}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+liable to You for damages, including any direct, indirect, special,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+incidental, or consequential damages of any character arising as a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+result of this License or out of the use or inability to use the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+Work (including but not limited to damages for loss of goodwill,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+work stoppage, computer failure or malfunction, or any and all}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+other commercial damages or losses), even if such Contributor}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+has been advised of the possibility of such damages.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+9. Accepting Warranty or Additional Liability. While redistributing}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+the Work or Derivative Works thereof, You may choose to offer,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+and charge a fee for, acceptance of support, warranty, indemnity,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+or other liability obligations and/or rights consistent with this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+License. However, in accepting such obligations, You may act only}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+on Your own behalf and on Your sole responsibility, not on behalf}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+of any other Contributor, and only if You agree to indemnify,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+defend, and hold each Contributor harmless for any liability}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+incurred by, or claims asserted against, such Contributor by reason}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+of your accepting any such warranty or additional liability.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+END OF TERMS AND CONDITIONS}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+APPENDIX: How to apply the Apache License to your work.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+To apply the Apache License to your work, attach the following}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+boilerplate notice, with the fields enclosed by brackets "[]"}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+replaced with your own identifying information. (Don't include}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+the brackets!)  The text should be enclosed in the appropriate}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+comment syntax for the file format. We also recommend that a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+file or class name and description of purpose be included on the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+same "printed page" as the copyright notice for easier}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }{\rtlch \ltrch\loch
+identification within third-party archives.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+Copyright [yyyy] [name of copyright owner]}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+Licensed under the Apache License, Version 2.0 (the "License");}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+you may not use this file except in compliance with the License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+You may obtain a copy of the License at}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+       }{\rtlch \ltrch\loch
+http://www.apache.org/licenses/LICENSE-2.0}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+Unless required by applicable law or agreed to in writing, software}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+distributed under the License is distributed on an "AS IS" BASIS,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+See the License for the specific language governing permissions and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+limitations under the License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20\sb0\sa283{\rtlch \ltrch\loch
+}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: XML Security Library (xmlsec); Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Aleksey Sanin}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+XML Security Library (xmlsec)}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+xmlsec, xmlsec-openssl, xmlsec-gnutls libraries \line ------------------------------------------------------------------------------ \line Copyright (C) 2002-2003 Aleksey Sanin. All Rights Reserved. \line Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is fur- nished to do so, subject to the following conditions: \line The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. \line THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ALEKSEY SANIN BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \line Except as contained in this notice, the name of Aleksey Sanin shall not be used in advertising or otherwise to promote the sale, use or other deal- ings in this Software without prior written authorization from him. \line \line xmlsec-nss library \line ------------------------------------------------------------------------------ \line Copyright (C) 2002-2003 Aleksey Sanin. All Rights Reserved. \line Copyright (c) 2003 America Online, Inc. All rights reserved. \line Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is fur- nished to do so, subject to the following conditions: \line The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. \line Portions of the Software were created using source code and/or APIs governed by the Mozilla Public License (MPL). The MPL is available at http://www.mozilla.org/MPL/MPL-1.1.html. The MPL permits such portions to be distributed with code not governed by MPL, as long as the requirements of MPL are fulfilled for such portions. \line THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ALEKSEY SANIN BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \line Except as contained in this notice, the name of Aleksey Sanin shall not be used in advertising or otherwise to promote the sale, use or other deal- ings in this Software without prior written authorization from him. }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: X11 XRender Extension; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Keith Packard, SuSE, Inc.}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+X11 XRender Extension}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+Copyright \uc2 \u169\'c2\'a9 2000 SuSE, Inc. \line Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of SuSE not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. SuSE makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. \line SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. \uc1 }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: XT; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+James Clark, Bill Lindsey}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+XT }
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+Copyright (c) 1998, 1999 James Clark \line Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ``Software''), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: \line The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. \line THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL JAMES CLARK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \line Except as contained in this notice, the name of James Clark shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from James Clark. \line \line Copyright (c) 2002 Bill Lindsey \line Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ``Software''), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: \line The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. Substantial portions of the Software are copyrighted by James Clark. Copying permissions and restrictions for those portions are covered in the file "copyingjc.txt" \line THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL BILL LINDSEY BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \line Except as contained in this notice, the name of Bill Lindsey shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Bill Lindsey. }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product:zlib; Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+Jean-Loup Gailly, Mark Adler}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+zlib}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+(C) 1995-2002 Jean-loup Gailly and Mark Adler \line This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. \line Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: \line \line 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. \line 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. \line 3. This notice may not be removed or altered from any source distribution. }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The following software may be included in this product: Mozilla, Mozilla Address Book, NP SDK: Use of any of this software is governed by the terms of the license below:}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+The Mozilla Foundation}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+Mozilla Address Book}
+\par \pard\plain \s21\sb0\sa120\qc{{\*\bkmkstart mpllic}{\*\bkmkend mpllic}\b\rtlch \ltrch\loch\fs36
+MOZILLA PUBLIC LICENSE}{\rtlch \ltrch\loch
+ \line }{\b\rtlch \ltrch\loch
+Version 1.1}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12\qc\li4216\ri4216\lin4216\rin4216\fi0{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 15}{\*\bkmkend 15}\b\rtlch \ltrch\loch
+1. Definitions.}{{\*\bkmkstart 1.0.12}{\*\bkmkend 1.0.12}\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.0.1. "Commercial Use" }{{\*\bkmkstart 1.14}{\*\bkmkend 1.14}\rtlch \ltrch\loch
+means distribution or otherwise making the Covered Code available to a third party. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.1. ''Contributor''}{{\*\bkmkstart 1.22}{\*\bkmkend 1.22}\rtlch \ltrch\loch
+ means each entity that creates or contributes to the creation of Modifications. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.2. ''Contributor Version''}{{\*\bkmkstart 1.32}{\*\bkmkend 1.32}\rtlch \ltrch\loch
+ means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.3. ''Covered Code''}{\rtlch \ltrch\loch
+ means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof}{\b\rtlch \ltrch\loch
+.}{{\*\bkmkstart 1.42}{\*\bkmkend 1.42}\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.4. ''Electronic Distribution Mechanism''}{{\*\bkmkstart 1.52}{\*\bkmkend 1.52}\rtlch \ltrch\loch
+ means a mechanism generally accepted in the software development community for the electronic transfer of data. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.5. ''Executable''}{{\*\bkmkstart 1.62}{\*\bkmkend 1.62}\rtlch \ltrch\loch
+ means Covered Code in any form other than Source Code. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.6. ''Initial Developer''}{\rtlch \ltrch\loch
+ means the individual or entity identified as the Initial Developer in the Source Code notice required by }{\b\rtlch \ltrch\loch
+Exhibit A}{{\*\bkmkstart 1.72}{\*\bkmkend 1.72}\rtlch \ltrch\loch
+. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.7. ''Larger Work''}{{\*\bkmkstart 1.82}{\*\bkmkend 1.82}\rtlch \ltrch\loch
+ means a work which combines Covered Code or portions thereof with code not governed by the terms of this License. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.8. ''License''}{{\*\bkmkstart 1.8.12}{\*\bkmkend 1.8.12}\rtlch \ltrch\loch
+ means this document. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.8.1. "Licensable"}{{\*\bkmkstart 1.92}{\*\bkmkend 1.92}\rtlch \ltrch\loch
+ means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.9. ''Modifications''}{\rtlch \ltrch\loch
+ means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is: }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+A.}{\rtlch \ltrch\loch
+ Any addition to or deletion from the contents of a file containing Original Code or previous Modifications. }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+B.}{\rtlch \ltrch\loch
+ Any new file that contains any part of the Original Code or previous Modifications. \line \~ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{{\*\bkmkstart 1.102}{\*\bkmkend 1.102}\b\rtlch \ltrch\loch
+1.10. ''Original Code''}{\rtlch \ltrch\loch
+ means Source Code of computer software code which is described in the Source Code notice required by }{\b\rtlch \ltrch\loch
+Exhibit A}{{\*\bkmkstart 1.10.12}{\*\bkmkend 1.10.12}\rtlch \ltrch\loch
+ as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.10.1. "Patent Claims"}{{\*\bkmkstart 1.112}{\*\bkmkend 1.112}\rtlch \ltrch\loch
+ means any patent claim(s), now owned or hereafter acquired, including without limitation,\~  method, process, and apparatus claims, in any patent Licensable by grantor. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.11. ''Source Code''}{{\*\bkmkstart 1.122}{\*\bkmkend 1.122}\rtlch \ltrch\loch
+ means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+1.12. "You'' (or "Your")\~ }{\rtlch \ltrch\loch
+ means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You'' includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control'' means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.}
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 22}{\*\bkmkend 22}\b\rtlch \ltrch\loch
+2. Source Code License.}{{\*\bkmkstart 2.12}{\*\bkmkend 2.12}\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0\sb0\sa0{\b\rtlch \ltrch\loch
+2.1. The Initial Developer Grant.}{\rtlch \ltrch\loch
+ \line The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims: }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+(a)}{\rtlch \ltrch\loch
+\~  under intellectual property rights (other than patent or trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, and/or as part of a Larger Work; and }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+(b)}{\rtlch \ltrch\loch
+ under Patents Claims infringed by the making, using or selling of Original Code, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Code (or portions thereof). }
+\par \pard\plain \s21\sb0\sa120\li2828\ri0\lin2828\rin0\fi0\sb0\sa0{\rtlch \ltrch
+\~  }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+(c) }{\rtlch \ltrch\loch
+the licenses granted in this Section 2.1(a) and (b) are effective on the date Initial Developer first distributes Original Code under the terms of this License. }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+(d) }{\rtlch \ltrch\loch
+Notwithstanding Section 2.1(b) above, no patent license is granted: 1) for code that You delete from the Original Code; 2) separate from the Original Code;\~  or 3) for infringements caused by: i) the modification of the Original Code or ii) the combination of the Original Code with other software or devices. \line \~ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0\sb0\sa0{{\*\bkmkstart 2.22}{\*\bkmkend 2.22}\b\rtlch \ltrch\loch
+2.2. Contributor Grant.}{\rtlch \ltrch\loch
+ \line Subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\rtlch \ltrch
+\~  }{\rtlch \ltrch\loch
+\line }{\b\rtlch \ltrch\loch
+(a)}{\rtlch \ltrch\loch
+\~  under intellectual property rights (other than patent or trademark) Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger Work; and }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+(b)}{\rtlch \ltrch\loch
+ under Patent Claims infringed by the making, using, or selling of\~  Modifications made by that Contributor either alone and/or in}{\cf1\rtlch \ltrch\loch
+ combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: 1) Modifications made by that Contributor (or portions thereof); and 2) the combination of\~  Modifications made by that Contributor with its Contributor Version (or portions of such combination).}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+(c) }{\rtlch \ltrch\loch
+the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first makes Commercial Use of the Covered Code. }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+(d)\~ }{\rtlch \ltrch\loch
+\~ \~  Notwithstanding Section 2.2(b) above, no patent license is granted: 1) for any code that Contributor has deleted from the Contributor Version; 2)\~  separate from the Contributor Version;\~  3)\~  for infringements caused by: i) third party modifications of Contributor Version or ii)\~  the combination of Modifications made by that Contributor with other software\~  (except as part of the Contributor Version) or other devices; or 4) under Patent Claims infringed by Covered Code in the absence of Modifications made by that Contributor.}
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 32}{\*\bkmkend 32}\rtlch \ltrch\loch
+\line }{\b\rtlch \ltrch\loch
+3. Distribution Obligations.}{{\*\bkmkstart 3.12}{\*\bkmkend 3.12}\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+3.1. Application of License.}{\rtlch \ltrch\loch
+ \line The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section }{\b\rtlch \ltrch\loch
+2.2}{\rtlch \ltrch\loch
+. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section }{\b\rtlch \ltrch\loch
+6.1}{\rtlch \ltrch\loch
+, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section }{\b\rtlch \ltrch\loch
+3.5}{{\*\bkmkstart 3.22}{\*\bkmkend 3.22}\rtlch \ltrch\loch
+. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+3.2. Availability of Source Code.}{{\*\bkmkstart 3.32}{\*\bkmkend 3.32}\rtlch \ltrch\loch
+ \line Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+3.3. Description of Modifications.}{{\*\bkmkstart 3.42}{\*\bkmkend 3.42}\rtlch \ltrch\loch
+ \line You must cause all Covered Code to which You contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+3.4. Intellectual Property Matters}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+(a) Third Party Claims}{\rtlch \ltrch\loch
+. \line If Contributor has knowledge that a license under a third party's intellectual property rights is required to exercise the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor must include a text file with the Source Code distribution titled "LEGAL'' which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If Contributor obtains such knowledge after the Modification is made available as described in Section 3.2, Contributor shall promptly modify the LEGAL file in all copies Contributor makes available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained. }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\b\rtlch \ltrch\loch
+(b) Contributor APIs}{\rtlch \ltrch\loch
+. \line If Contributor's Modifications include an application programming interface and Contributor has knowledge of patent licenses which are reasonably necessary to implement that API, Contributor must also include this information in the LEGAL file. \line \~ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0\sb0\sa0{\rtlch \ltrch
+\~ \~ \~ \~ \~ \~ \~ \~ \~  }{\b\rtlch \ltrch\loch
+(c)\~ \~ \~  Representations.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li1414\ri0\lin1414\rin0\fi0{\rtlch \ltrch\loch
+Contributor represents that, except as disclosed pursuant to Section 3.4(a) above, Contributor believes that Contributor's Modifications are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the rights conveyed by this License. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{{\*\bkmkstart 3.52}{\*\bkmkend 3.52}\rtlch \ltrch\loch
+\line }{\b\rtlch \ltrch\loch
+3.5. Required Notices.}{\rtlch \ltrch\loch
+ \line You must duplicate the notice in }{\b\rtlch \ltrch\loch
+Exhibit A}{\rtlch \ltrch\loch
+ in each file of the Source Code.\~  If it is not possible to put such notice in a particular Source Code file due to its structure, then You must include such notice in a location (such as a relevant directory) where a user would be likely to look for such a notice.\~  If You created one or more Modification(s) You may add your name as a Contributor to the notice described in }{\b\rtlch \ltrch\loch
+Exhibit A}{{\*\bkmkstart 3.62}{\*\bkmkend 3.62}\rtlch \ltrch\loch
+.\~  You must also duplicate this License in any documentation for the Source Code where You describe recipients' rights or ownership rights relating to Covered Code.\~  You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+3.6. Distribution of Executable Versions.}{\rtlch \ltrch\loch
+ \line You may distribute Covered Code in Executable form only if the requirements of Section }{\b\rtlch \ltrch\loch
+3.1-3.5}{\rtlch \ltrch\loch
+ have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section }{\b\rtlch \ltrch\loch
+3.2}{{\*\bkmkstart 3.72}{\*\bkmkend 3.72}\rtlch \ltrch\loch
+. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code or ownership rights under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+3.7. Larger Works.}{\rtlch \ltrch\loch
+ \line You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code.}
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 42}{\*\bkmkend 42}\b\rtlch \ltrch\loch
+4. Inability to Comply Due to Statute or Regulation.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section }{\b\rtlch \ltrch\loch
+3.4}{\rtlch \ltrch\loch
+ and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it. }
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 52}{\*\bkmkend 52}\b\rtlch \ltrch\loch
+5. Application of this License.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+This License applies to code to which the Initial Developer has attached the notice in }{\b\rtlch \ltrch\loch
+Exhibit A}{\rtlch \ltrch\loch
+ and to related Covered Code. }
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 62}{\*\bkmkend 62}\b\rtlch \ltrch\loch
+6. Versions of the License.}{{\*\bkmkstart 6.12}{\*\bkmkend 6.12}\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+6.1. New Versions}{{\*\bkmkstart 6.22}{\*\bkmkend 6.22}\rtlch \ltrch\loch
+. \line Netscape Communications Corporation (''Netscape'') may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+6.2. Effect of New Versions}{{\*\bkmkstart 6.32}{\*\bkmkend 6.32}\rtlch \ltrch\loch
+. \line Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Netscape. No one other than Netscape has the right to modify the terms applicable to Covered Code created under this License. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+6.3. Derivative Works}{\rtlch \ltrch\loch
+. \line If You create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), You must (a) rename Your license so that the phrases ''Mozilla'', ''MOZILLAPL'', ''MOZPL'', ''Netscape'', "MPL", ''NPL'' or any confusingly similar phrase do not appear in your license (except to note that your license differs from this License) and (b) otherwise make it clear that Your version of the license contains terms which differ from the Mozilla Public License and Netscape Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in }{\b\rtlch \ltrch\loch
+Exhibit A}{\rtlch \ltrch\loch
+ shall not of themselves be deemed to be modifications of this License.)}
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 72}{\*\bkmkend 72}\b\rtlch \ltrch\loch
+7. DISCLAIMER OF WARRANTY.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. }
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 82}{\*\bkmkend 82}\b\rtlch \ltrch\loch
+8. TERMINATION.}{{\*\bkmkstart 8.12}{\*\bkmkend 8.12}\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+8.1.\~  }{{\*\bkmkstart 8.22}{\*\bkmkend 8.22}\rtlch \ltrch\loch
+This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+8.2.\~  }{\rtlch \ltrch\loch
+If You initiate litigation by asserting a patent infringement claim (excluding declatory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You file such action is referred to as "Participant")\~  alleging that: }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+(a)\~  }{\rtlch \ltrch\loch
+such Participant's Contributor Version directly or indirectly infringes any patent, then any and all rights granted by such Participant to You under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively, unless if within 60 days after receipt of notice You either: (i)\~  agree in writing to pay Participant a mutually agreeable reasonable royalty for Your past and future use of Modifications made by such Participant, or (ii) withdraw Your litigation claim with respect to the Contributor Version against such Participant.\~  If within 60 days of notice, a reasonable royalty and payment arrangement are not mutually agreed upon in writing by the parties or the litigation claim is not withdrawn, the rights granted by Participant to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration of the 60 day notice period specified above. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+(b)}{{\*\bkmkstart 8.32}{\*\bkmkend 8.32}\rtlch \ltrch\loch
+\~  any software, hardware, or device, other than such Participant's Contributor Version, directly or indirectly infringes any patent, then any rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are revoked effective as of the date You first made, used, sold, distributed, or had made, Modifications made by that Participant. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+8.3.\~  }{{\*\bkmkstart 8.42}{\*\bkmkend 8.42}\rtlch \ltrch\loch
+If You assert a patent infringement claim against Participant alleging that such Participant's Contributor Version directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\b\rtlch \ltrch\loch
+8.4.}{\rtlch \ltrch\loch
+\~  In the event of termination under Sections 8.1 or 8.2 above,\~  all end user license agreements (excluding distributors and resellers) which have been validly granted by You or any distributor hereunder prior to termination shall survive termination.}
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 92}{\*\bkmkend 92}\b\rtlch \ltrch\loch
+9. LIMITATION OF LIABILITY.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. }
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 102}{\*\bkmkend 102}\b\rtlch \ltrch\loch
+10. U.S. GOVERNMENT END USERS.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+The Covered Code is a ''commercial item,'' as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of ''commercial computer software'' and ''commercial computer software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein. }
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 112}{\*\bkmkend 112}\b\rtlch \ltrch\loch
+11. MISCELLANEOUS.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in the United States of America, any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. }
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 122}{\*\bkmkend 122}\b\rtlch \ltrch\loch
+12. RESPONSIBILITY FOR CLAIMS.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability. }
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart 132}{\*\bkmkend 132}\b\rtlch \ltrch\loch
+13. MULTIPLE-LICENSED CODE.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+Initial Developer may designate portions of the Covered Code as \uc3 \u8220\'e2\'80\'9cMultiple-Licensed\u8221\'e2\'80\'9d.\~  \u8220\'e2\'80\'9cMultiple-Licensed\u8221\'e2\'80\'9d means that the Initial Developer permits you to utilize portions of the Covered Code under Your choice of the MPL or the alternative licenses, if any, specified by the Initial Developer in the file described in Exhibit A. \uc1 }
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart EXHIBIT-A2}{\*\bkmkend EXHIBIT-A2}\rtlch \ltrch\loch
+\line }{\b\rtlch \ltrch\loch
+EXHIBIT A -Mozilla Public License.}{\rtlch \ltrch\loch
+ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+``The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at \line http://www.mozilla.org/MPL/ }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF \line ANY KIND, either express or implied. See the License for the specific language governing rights and \line limitations under the License. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+The Original Code is ______________________________________. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+The Initial Developer of the Original Code is ________________________. Portions created by \line \~ ______________________ are Copyright (C) ______ _______________________. All Rights \line Reserved. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+Contributor(s): ______________________________________. }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+Alternatively, the contents of this file may be used under the terms of the _____ license (the\~  \uc3 \u8220\'e2\'80\'9c[___] License\u8221\'e2\'80\'9d), in which case the provisions of [______] License are applicable\~  instead of those above.\~  If you wish to allow use of your version of this file only under the terms of the [____] License and not to allow others to use your version of this file under the MPL, indicate your decision by deleting\~  the provisions above and replace\~  them with the notice and other provisions required by the [___] License.\~  If you do not delete the provisions above, a recipient may use your version of this file under either the MPL or the [___] License." \uc1 }
+\par \pard\plain \s21\sb0\sa120\li707\ri0\lin707\rin0\fi0{\rtlch \ltrch\loch
+[NOTE: The text of this Exhibit A may differ slightly from the text of the notices in the Source Code files of the Original Code. You should use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.] }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+FSF}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+GNU General Public License}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+}
+\par \pard\plain \s4\b\hich\af9\dbch\af12\afs24\ab\loch\f4\fs24{{\*\bkmkstart gpl}{\*\bkmkend gpl}\rtlch \ltrch\loch
+GNU GENERAL PUBLIC LICENSE}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+Version 2, June 1991 }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.  }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Everyone is permitted to copy and distribute verbatim copies}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20\sb0\sa283{\rtlch \ltrch\loch
+of this license document, but changing it is not allowed.}
+\par \pard\plain \s4\b\hich\af9\dbch\af12\afs24\ab\loch\f4\fs24{\rtlch \ltrch\loch
+Preamble}
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. }
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. }
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. }
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. }
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. }
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. }
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. }
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The precise terms and conditions for copying, distribution and modification follow. }
+\par \pard\plain \s4\b\hich\af9\dbch\af12\afs24\ab\loch\f4\fs24{\rtlch \ltrch\loch
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION}
+\par \pard\plain \s21\sb0\sa120{\*\cs19\b\ab\rtlch \ltrch\loch
+0.}{\rtlch \ltrch\loch
+ This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". }
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. }
+\par \pard\plain \s21\sb0\sa120{\*\cs19\b\ab\rtlch \ltrch\loch
+1.}{\rtlch \ltrch\loch
+ You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. }
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. }
+\par \pard\plain \s21\sb0\sa120{\*\cs19\b\ab\rtlch \ltrch\loch
+2.}{\rtlch \ltrch\loch
+ You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: }
+\par \pard\plain \s28\li567\ri0\lin567\rin0\fi0{\*\cs19\b\ab\rtlch \ltrch\loch
+a)}{\rtlch \ltrch\loch
+ You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. }
+\par \pard\plain \s28\li567\ri0\lin567\rin0\fi0{\*\cs19\b\ab\rtlch \ltrch\loch
+b)}{\rtlch \ltrch\loch
+ You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. }
+\par \pard\plain \s28\li567\ri0\lin567\rin0\fi0\sb0\sa283{\*\cs19\b\ab\rtlch \ltrch\loch
+c)}{\rtlch \ltrch\loch
+ If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) }
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. }
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. }
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. }
+\par \pard\plain \s21\sb0\sa120{\*\cs19\b\ab\rtlch \ltrch\loch
+3.}{\rtlch \ltrch\loch
+ You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: }
+\par \pard\plain \s28\li567\ri0\lin567\rin0\fi0{\*\cs19\b\ab\rtlch \ltrch\loch
+a)}{\rtlch \ltrch\loch
+ Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, }
+\par \pard\plain \s28\li567\ri0\lin567\rin0\fi0{\*\cs19\b\ab\rtlch \ltrch\loch
+b)}{\rtlch \ltrch\loch
+ Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, }
+\par \pard\plain \s28\li567\ri0\lin567\rin0\fi0\sb0\sa283{\*\cs19\b\ab\rtlch \ltrch\loch
+c)}{\rtlch \ltrch\loch
+ Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) }
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. }
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. }
+\par \pard\plain \s21\sb0\sa120{\*\cs19\b\ab\rtlch \ltrch\loch
+4.}{\rtlch \ltrch\loch
+ You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. }
+\par \pard\plain \s21\sb0\sa120{\*\cs19\b\ab\rtlch \ltrch\loch
+5.}{\rtlch \ltrch\loch
+ You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. }
+\par \pard\plain \s21\sb0\sa120{\*\cs19\b\ab\rtlch \ltrch\loch
+6.}{\rtlch \ltrch\loch
+ Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. }
+\par \pard\plain \s21\sb0\sa120{\*\cs19\b\ab\rtlch \ltrch\loch
+7.}{\rtlch \ltrch\loch
+ If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. }
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. }
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. }
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. }
+\par \pard\plain \s21\sb0\sa120{\*\cs19\b\ab\rtlch \ltrch\loch
+8.}{\rtlch \ltrch\loch
+ If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. }
+\par \pard\plain \s21\sb0\sa120{\*\cs19\b\ab\rtlch \ltrch\loch
+9.}{\rtlch \ltrch\loch
+ The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. }
+\par \pard\plain \s21\sb0\sa120{\rtlch \ltrch\loch
+Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. }
+\par \pard\plain \s21\sb0\sa120{\*\cs19\b\ab\rtlch \ltrch\loch
+10.}{\rtlch \ltrch\loch
+ If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. }
+\par \pard\plain \s21\sb0\sa120{\*\cs19\b\ab\rtlch \ltrch\loch
+NO WARRANTY}
+\par \pard\plain \s21\sb0\sa120{\*\cs19\b\ab\rtlch \ltrch\loch
+11.}{\rtlch \ltrch\loch
+ BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. }
+\par \pard\plain \s21\sb0\sa120{\*\cs19\b\ab\rtlch \ltrch\loch
+12.}{\rtlch \ltrch\loch
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. }
+\par \pard\plain \s4\b\hich\af9\dbch\af12\afs24\ab\loch\f4\fs24{\rtlch \ltrch\loch
+END OF TERMS AND CONDITIONS}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+FSF}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+GNU Lesser General Public License}
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s21\sb0\sa120\sb0\sa0{\rtlch \ltrch\loch
+\line }{{\*\bkmkstart lgpl}{\*\bkmkend lgpl}\rtlch \ltrch\loch
+GNU LESSER GENERAL PUBLIC LICENSE \line Version 2.1, February 1999 \line \line Copyright (C) 1991, 1999 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. \line [This is the first released version of the Lesser GPL. It also counts as the successor of the GNU Library Public License, version 2, hence the version number 2.1.] \line \line Preamble \line \line The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. \line This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. \line When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things. \line To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. \line For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. \line We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. \line To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. \line \line Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. \line Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. \line When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. \line We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. \line For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. \line In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. \line Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. \line The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. \line \line GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION \line 0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". \line A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. \line The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) \line "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. \line Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. \line 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. \line You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. \line \line 2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: \line a) The modified work must itself be a software library. \line b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. \line c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. \line d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. (For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) \line These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. \line Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. \line In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. \line 3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. \line \line Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. \line This option is useful when you wish to copy part of the code of the Library into a program that is not a library. \line 4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. \line If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. \line 5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. \line However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. \line When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. \line If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) \line Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. \line \line 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. \line You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: \line a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) \line b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. \line c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. \line d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. \line e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. \line For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. \line It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. \line \line 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: \line a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. \line b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. \line 8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. \line 9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. \line 10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. \line \line 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. \line If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. \line It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. \line This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. \line 12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. \line 13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. \line Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. \line \line 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. \line \line NO WARRANTY \line 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. \line 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. \line END OF TERMS AND CONDITIONS }
+\par \pard\plain \s26\sb0\sa283\brdrb\brdrdb\brdrw15\brdrcf3\brsp0{\*\brdrb\brdlncol3\brdlnin1\brdlnout1\brdlndist20}\brsp0\fs12{\rtlch \ltrch\loch
+}
+\par \pard\plain \s2\b\hich\af9\dbch\af12\afs36\ab\loch\f4\fs36{\rtlch \ltrch\loch
+LaTeX3 Project}
+\par \pard\plain \s3\b\hich\af9\dbch\af12\afs28\ab\loch\f4\fs28{\rtlch \ltrch\loch
+The LaTeX Project Public License}
+\par \pard\plain \s21\sb0\sa120{{\*\bkmkstart lppl}{\*\bkmkend lppl}\rtlch \ltrch\loch
+The LaTeX Project Public License }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+LPPL Version 1.3c  2006-05-20}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Copyright 1999 2002-2006 LaTeX3 Project}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+Everyone is allowed to distribute verbatim copies of this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+license document, but modification of it is not allowed.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+PREAMBLE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+========}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+The LaTeX Project Public License (LPPL) is the primary license under}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+which the the LaTeX kernel and the base LaTeX packages are distributed.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+You may use this license for any work of which you hold the copyright}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+and which you wish to distribute.  This license may be particularly}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+suitable if your work is TeX-related (such as a LaTeX package), but }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+it is written in such a way that you can use it even if your work is }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+unrelated to TeX.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE',}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+below, gives instructions, examples, and recommendations for authors}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+who are considering distributing their works under this license.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+This license gives conditions under which a work may be distributed}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+and modified, as well as conditions under which modified versions of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+that work may be distributed.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+We, the LaTeX3 Project, believe that the conditions below give you}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the freedom to make and distribute modified versions of your work}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+that conform with whatever technical specifications you wish while}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+maintaining the availability, integrity, and reliability of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+that work.  If you do not see how to achieve your goal while}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+meeting these conditions, then read the document `cfgguide.tex'}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+and `modguide.tex' in the base LaTeX distribution for suggestions.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+DEFINITIONS}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+===========}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+In this license document the following terms are used:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+`Work'}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+Any work being distributed under this License.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+`Derived Work'}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+Any work that under any applicable law is derived from the Work.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+`Modification' }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+Any procedure that produces a Derived Work under any applicable}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+law -- for example, the production of a file containing an}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+original file associated with the Work or a significant portion of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+such a file, either verbatim or with modifications and/or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+translated into another language.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+`Modify'}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+To apply any procedure that produces a Derived Work under any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+applicable law.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+`Distribution'}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+Making copies of the Work available from one person to another, in}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+whole or in part.  Distribution includes (but is not limited to)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+making any electronic components of the Work accessible by}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+file transfer protocols such as FTP or HTTP or by shared file}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+systems such as Sun's Network File System (NFS).}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+`Compiled Work'}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+A version of the Work that has been processed into a form where it}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+is directly usable on a computer system.  This processing may}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+include using installation facilities provided by the Work,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+transformations of the Work, copying of components of the Work, or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+other activities.  Note that modification of any installation}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+facilities provided by the Work constitutes modification of the Work.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+`Current Maintainer'}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+A person or persons nominated as such within the Work.  If there is}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+no such explicit nomination then it is the `Copyright Holder' under}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+any applicable law.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+`Base Interpreter' }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+A program or process that is normally needed for running or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+interpreting a part or the whole of the Work.    }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+A Base Interpreter may depend on external components but these}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+are not considered part of the Base Interpreter provided that each}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+external component clearly identifies itself whenever it is used}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+interactively.  Unless explicitly specified when applying the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+license to the Work, the only applicable Base Interpreter is a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+`LaTeX-Format' or in the case of files belonging to the }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+`LaTeX-format' a program implementing the `TeX language'.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+CONDITIONS ON DISTRIBUTION AND MODIFICATION}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+===========================================}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+1.  Activities other than distribution and/or modification of the Work}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+are not covered by this license; they are outside its scope.  In}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+particular, the act of running the Work is not restricted and no}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+requirements are made concerning any offers of support for the Work.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+2.  You may distribute a complete, unmodified copy of the Work as you}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+received it.  Distribution of only part of the Work is considered}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+modification of the Work, and no right to distribute such a Derived}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Work may be assumed under the terms of this clause.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+3.  You may distribute a Compiled Work that has been generated from a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+complete, unmodified copy of the Work as distributed under Clause 2}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+above, as long as that Compiled Work is distributed in such a way that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the recipients may install the Compiled Work on their system exactly}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+as it would have been installed if they generated a Compiled Work}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+directly from the Work.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+4.  If you are the Current Maintainer of the Work, you may, without}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+restriction, modify the Work, thus creating a Derived Work.  You may}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+also distribute the Derived Work without restriction, including}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Compiled Works generated from the Derived Work.  Derived Works}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distributed in this manner by the Current Maintainer are considered to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+be updated versions of the Work.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+5.  If you are not the Current Maintainer of the Work, you may modify}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+your copy of the Work, thus creating a Derived Work based on the Work,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+and compile this Derived Work, thus creating a Compiled Work based on}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the Derived Work.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+6.  If you are not the Current Maintainer of the Work, you may}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distribute a Derived Work provided the following conditions are met}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+for every component of the Work unless that component clearly states}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+in the copyright notice that it is exempt from that condition.  Only}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the Current Maintainer is allowed to add such statements of exemption }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+to a component of the Work. }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+a. If a component of this Derived Work can be a direct replacement}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+for a component of the Work when that component is used with the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+Base Interpreter, then, wherever this component of the Work}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+identifies itself to the user when used interactively with that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+Base Interpreter, the replacement component of this Derived Work}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+clearly and unambiguously identifies itself as a modified version}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+of this component to the user when used interactively with that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+Base Interpreter.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+b. Every component of the Derived Work contains prominent notices}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+detailing the nature of the changes to that component, or a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+prominent reference to another file that is distributed as part}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+of the Derived Work and that contains a complete and accurate log}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+of the changes.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+c. No information in the Derived Work implies that any persons,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+including (but not limited to) the authors of the original version}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+of the Work, provide any support, including (but not limited to)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+the reporting and handling of errors, to recipients of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+Derived Work unless those persons have stated explicitly that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+they do provide such support for the Derived Work.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+d. You distribute at least one of the following with the Derived Work:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+       }{\rtlch \ltrch\loch
+1. A complete, unmodified copy of the Work; }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+if your distribution of a modified component is made by}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+offering access to copy the modified component from a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+designated place, then offering equivalent access to copy}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+the Work from the same or some similar place meets this}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+condition, even though third parties are not compelled to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+copy the Work along with the modified component;}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+       }{\rtlch \ltrch\loch
+2. Information that is sufficient to obtain a complete,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+          }{\rtlch \ltrch\loch
+unmodified copy of the Work.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+7.  If you are not the Current Maintainer of the Work, you may}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distribute a Compiled Work generated from a Derived Work, as long as}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the Derived Work is distributed to all recipients of the Compiled}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Work, and as long as the conditions of Clause 6, above, are met with}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+regard to the Derived Work.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+8.  The conditions above are not intended to prohibit, and hence do not}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+apply to, the modification, by any method, of any component so that it}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+becomes identical to an updated version of that component of the Work as}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+it is distributed by the Current Maintainer under Clause 4, above.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+9.  Distribution of the Work or any Derived Work in an alternative}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+format, where the Work or that Derived Work (in whole or in part) is}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+then produced by applying some process to that format, does not relax or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+nullify any sections of this license as they pertain to the results of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+applying that process.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+10. a. A Derived Work may be distributed under a different license}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+       }{\rtlch \ltrch\loch
+provided that license itself honors the conditions listed in}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+       }{\rtlch \ltrch\loch
+Clause 6 above, in regard to the Work, though it does not have}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+       }{\rtlch \ltrch\loch
+to honor the rest of the conditions in this license.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+      }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+b. If a Derived Work is distributed under a different license, that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+       }{\rtlch \ltrch\loch
+Derived Work must provide sufficient documentation as part of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+       }{\rtlch \ltrch\loch
+itself to allow each recipient of that Derived Work to honor the }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+       }{\rtlch \ltrch\loch
+restrictions in Clause 6 above, concerning changes from the Work.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+11. This license places no restrictions on works that are unrelated to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the Work, nor does this license place any restrictions on aggregating}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+such works with the Work by any means.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+12.  Nothing in this license is intended to, or may be used to, prevent}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+complete compliance by all parties with all applicable laws.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+NO WARRANTY}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+===========}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+There is no warranty for the Work.  Except when otherwise stated in}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+writing, the Copyright Holder provides the Work `as is', without}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+warranty of any kind, either expressed or implied, including, but not}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+limited to, the implied warranties of merchantability and fitness for a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+particular purpose.  The entire risk as to the quality and performance}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of the Work is with you.  Should the Work prove defective, you assume}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the cost of all necessary servicing, repair, or correction.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+In no event unless required by applicable law or agreed to in writing}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+will The Copyright Holder, or any author named in the components of the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Work, or any other party who may distribute and/or modify the Work as}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+permitted above, be liable to you for damages, including any general,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+special, incidental or consequential damages arising out of any use of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the Work or out of inability to use the Work (including, but not limited}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+to, loss of data, data being rendered inaccurate, or losses sustained by}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+anyone as a result of any failure of the Work to operate with any other}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+programs), even if the Copyright Holder or said author or said other}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+party has been advised of the possibility of such damages.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+MAINTENANCE OF THE WORK}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+=======================}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+The Work has the status `author-maintained' if the Copyright Holder}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+explicitly and prominently states near the primary copyright notice in}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the Work that the Work can only be maintained by the Copyright Holder}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+or simply that it is `author-maintained'.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+The Work has the status `maintained' if there is a Current Maintainer}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+who has indicated in the Work that they are willing to receive error}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+reports for the Work (for example, by supplying a valid e-mail}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+address). It is not required for the Current Maintainer to acknowledge}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+or act upon these error reports.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+The Work changes from status `maintained' to `unmaintained' if there}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+is no Current Maintainer, or the person stated to be Current}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Maintainer of the work cannot be reached through the indicated means}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of communication for a period of six months, and there are no other}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+significant signs of active maintenance.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+You can become the Current Maintainer of the Work by agreement with}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+any existing Current Maintainer to take over this role.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+If the Work is unmaintained, you can become the Current Maintainer of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the Work through the following steps:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+1.  Make a reasonable attempt to trace the Current Maintainer (and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+the Copyright Holder, if the two differ) through the means of}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+an Internet or similar search.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+2.  If this search is successful, then enquire whether the Work}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+is still maintained.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+a. If it is being maintained, then ask the Current Maintainer}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+to update their communication data within one month.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+b. If the search is unsuccessful or no action to resume active}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+maintenance is taken by the Current Maintainer, then announce}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+within the pertinent community your intention to take over}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+maintenance.  (If the Work is a LaTeX work, this could be}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+done, for example, by posting to comp.text.tex.)}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+3a. If the Current Maintainer is reachable and agrees to pass}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+maintenance of the Work to you, then this takes effect}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+immediately upon announcement.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+b. If the Current Maintainer is not reachable and the Copyright}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+Holder agrees that maintenance of the Work be passed to you,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+then this takes effect immediately upon announcement.  }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+4.  If you make an `intention announcement' as described in 2b. above}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+and after three months your intention is challenged neither by}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+the Current Maintainer nor by the Copyright Holder nor by other}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+people, then you may arrange for the Work to be changed so as}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+to name you as the (new) Current Maintainer.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+5.  If the previously unreachable Current Maintainer becomes}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+reachable once more within three months of a change completed}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+under the terms of 3b) or 4), then that Current Maintainer must}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+become or remain the Current Maintainer upon request provided}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+     }{\rtlch \ltrch\loch
+they then update their communication data within one month.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+A change in the Current Maintainer does not, of itself, alter the fact}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+that the Work is distributed under the LPPL license.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+If you become the Current Maintainer of the Work, you should}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+immediately provide, within the Work, a prominent and unambiguous}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+statement of your status as Current Maintainer.  You should also}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+announce your new status to the same pertinent community as}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+in 2b) above.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+======================================================}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+This section contains important instructions, examples, and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+recommendations for authors who are considering distributing their}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+works under this license.  These authors are addressed as `you' in}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+this section.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Choosing This License or Another License}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+----------------------------------------}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+If for any part of your work you want or need to use *distribution*}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+conditions that differ significantly from those in this license, then}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+do not refer to this license anywhere in your work but, instead,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distribute your work under a different license.  You may use the text}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of this license as a model for your own license, but your license}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+should not refer to the LPPL or otherwise give the impression that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+your work is distributed under the LPPL.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+The document `modguide.tex' in the base LaTeX distribution explains}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the motivation behind the conditions of this license.  It explains,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+for example, why distributing LaTeX under the GNU General Public}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+License (GPL) was considered inappropriate.  Even if your work is}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+unrelated to LaTeX, the discussion in `modguide.tex' may still be}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+relevant, and authors intending to distribute their works under any}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+license are encouraged to read it.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+A Recommendation on Modification Without Distribution}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+-----------------------------------------------------}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+It is wise never to modify a component of the Work, even for your own}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+personal use, without also meeting the above conditions for}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+distributing the modified component.  While you might intend that such}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+modifications will never be distributed, often this will happen by}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+accident -- you may forget that you have modified that component; or}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+it may not occur to you when allowing others to access the modified}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+version that you are thus distributing it and violating the conditions}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+of this license in ways that could have legal implications and, worse,}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+cause problems for the community.  It is therefore usually in your}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+best interest to keep your copy of the Work identical with the public}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+one.  Many works provide ways to control the behavior of that work}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+without altering any of its licensed components.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+How to Use This License}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+-----------------------}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+To use this license, place in each of the components of your work both}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+an explicit copyright notice including your name and the year the work}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+was authored and/or last substantially modified.  Include also a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+statement that the distribution and/or modification of that}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+component is constrained by the conditions in this license.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Here is an example of such a notice and statement:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+%% pig.dtx}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+%% Copyright 2005 M. Y. Name}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+%}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+% This work may be distributed and/or modified under the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+% conditions of the LaTeX Project Public License, either version 1.3}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+% of this license or (at your option) any later version.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+% The latest version of this license is in}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+%   http://www.latex-project.org/lppl.txt}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+% and version 1.3 or later is part of all distributions of LaTeX}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+% version 2005/12/01 or later.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+%}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+% This work has the LPPL maintenance status `maintained'.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+% }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+% The Current Maintainer of this work is M. Y. Name.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+%}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+% This work consists of the files pig.dtx and pig.ins}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+  }{\rtlch \ltrch\loch
+% and the derived file pig.sty.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Given such a notice and statement in a file, the conditions}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+given in this license document would apply, with the `Work' referring}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+generated from `pig.dtx' using `pig.ins'), the `Base Interpreter'}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+referring to any `LaTeX-Format', and both `Copyright Holder' and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+`Current Maintainer' referring to the person `M. Y. Name'.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+If you do not want the Maintenance section of LPPL to apply to your}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Work, change `maintained' above into `author-maintained'.  }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+However, we recommend that you use `maintained', as the Maintenance}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+section was added in order to ensure that your Work remains useful to}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+the community even when you can no longer maintain and support it}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+yourself.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Derived Works That Are Not Replacements}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+---------------------------------------}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Several clauses of the LPPL specify means to provide reliability and}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+stability for the user community. They therefore concern themselves}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+with the case that a Derived Work is intended to be used as a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+(compatible or incompatible) replacement of the original Work. If}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+this is not the case (e.g., if a few lines of code are reused for a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+completely different task), then clauses 6b and 6d shall not apply.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+Important Recommendations}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+-------------------------}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+ }{\rtlch \ltrch\loch
+Defining What Constitutes the Work}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+The LPPL requires that distributions of the Work contain all the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+files of the Work.  It is therefore important that you provide a}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+way for the licensee to determine which files constitute the Work.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+This could, for example, be achieved by explicitly listing all the}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+files of the Work near the copyright notice of each file or by}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+using a line such as:}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+    }{\rtlch \ltrch\loch
+% This work consists of all files listed in manifest.txt.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+in that place.  In the absence of an unequivocal list it might be}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+impossible for the licensee to determine what is considered by you}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+to comprise the Work and, in such a case, the licensee would be}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+entitled to make reasonable conjectures as to which files comprise}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch
+   }{\rtlch \ltrch\loch
+the Work.}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20{\rtlch \ltrch\loch
+}
+\par \pard\plain \s25\sb0\sa0\hich\af10\dbch\af6\afs20\loch\f6\fs20\sb0\sa283{\rtlch \ltrch\loch
+}
 \par }
\ No newline at end of file
diff --git a/readlicense_oo/source/license/license_en-US.txt b/readlicense_oo/source/license/license_en-US.txt
index 73b1ce4c50a9..57c48db996be 100644
--- a/readlicense_oo/source/license/license_en-US.txt
+++ b/readlicense_oo/source/license/license_en-US.txt
@@ -1,23 +1,22 @@
-This product is made available subject to the terms of GNU Lesser General Public License Version 3. A copy of the LGPL license can be found at http://www.gnu.org/licenses/lgpl-3.0-standalone.html
+Licensing and Legal information
 
-------------------------------------
-Third Party Code. Additional copyright notices and license terms applicable to portions of the Software are set forth in the THIRDPARTYLICENSEREADME.html file.
+This product is made available subject to the terms of GNU Lesser General Public License Version 3. A copy of the LGPL license can be found at http://www.gnu.org/licenses/lgpl-3.0.html
 
-------------------------------------
-All trademarks and registered trademarks mentioned herein are the property of their respective owners.  
+Third Party Code Additional copyright notices and license terms applicable to portions of the Software are set forth in the THIRDPARTYLICENSEREADME.html file, and can be found at the bottom of this document.
 
-------------------------------------
-Copyright (c) 2000,2010 Oracle and/or it affiliates. All rights reserved.
+All trademarks and registered trademarks mentioned herein are the property of their respective owners.
 
-This product has been created with contributions from the OpenOffice.org community. We acknowledge all community members, especially those mentioned at http://www.openoffice.org/welcome/credits.html.
+Copyright (c) 2000, 2010 Oracle, and/or its affiliates. All rights reserved.
+
+This product has been created by The Document Foundation, incorporating many modifications from different contributors, see http://www.libreoffice.org/ for more details.
 
-------------------------------------
 
+- DO NOT TRANSLATE OR LOCALIZE THIS DOCUMENT -
 
-		   GNU LESSER GENERAL PUBLIC LICENSE
+                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. 
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -181,11 +180,10 @@ permanent authorization for you to choose that version for the
 Library.
 
 
-
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. 
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -815,8 +813,8 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
+    
+    Copyright (C)   
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -829,14 +827,14 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see .
 
 Also add information on how to contact you by electronic and paper mail.
 
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    <program>  Copyright (C) <year>  <name of author>
+      Copyright (C)   
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -848,11 +846,4458 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+.
+
+
+
+DO NOT TRANSLATE OR LOCALIZE THIS DOCUMENT 
+
+The following software may be included in this product:Bitstram Vera Fonts; Use of any of this software is governed by the terms of the license below:
+Bitstream, Inc. 
+Bitstream Vera Fonts
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc. 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license (“Fonts�) and associated documentation files (the “Font Software�), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions: 
+
+The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces.
+
+The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words “Bitstream� or the word “Vera�.
+
+This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the “Bitstream Vera� names. 
+
+The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself. 
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. 
+
+Except as contained in this notice, the names of Gnome, the Gnome Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org. 
+
+The following software may be included in this product:BerkeleyDB; Use of any of this software is governed by the terms of the license below:
+Sleepycat Software 
+BerkeleyDB
+> 
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+/*
+ * Copyright (c) 1990-2004
+ *      Sleepycat Software.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Redistributions in any form must be accompanied by information on
+ *    how to obtain complete source code for the DB software and any
+ *    accompanying software that uses the DB software.  The source code
+ *    must either be included in the distribution or be available for no
+ *    more than the cost of distribution plus a nominal fee, and must be
+ *    freely redistributable under reasonable conditions.  For an
+ *    executable file, complete source code means the source code for all
+ *    modules it contains.  It does not include source code for modules or
+ *    files that typically accompany the major components of the operating
+ *    system on which the executable file runs.
+ *
+ * THIS SOFTWARE IS PROVIDED BY SLEEPYCAT SOFTWARE ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
+ * NON-INFRINGEMENT, ARE DISCLAIMED.  IN NO EVENT SHALL SLEEPYCAT SOFTWARE
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ * Copyright (c) 1990, 1993, 1994, 1995
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+/*
+ * Copyright (c) 1995, 1996
+ *      The President and Fellows of Harvard University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY HARVARD AND ITS CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL HARVARD OR ITS CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+
+ 
+
+The following software may be included in this product:Czech thesaurus database; Use of any of this software is governed by the terms of the license below:
+Pavel Rychly, Pavel Smrz, {pary,smrz}@fi.muni.cz, NLPlab, Faculty of Informatics, Masaryk University 
+Czech Thesaurus Database
+Copyright (c) 2002 Pavel Rychly, Pavel Smrz, {pary,smrz}@fi.muni.cz, NLPlab, Faculty of Informatics, Masaryk University 
+Permission is hereby granted, free of charge, to any person obtaining a copy of this data (the "Data"), to deal in the Data without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Data, and to permit persons to whom the Data is furnished to do so, subject to the following conditions: 
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Data. 
+THE DATA ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE DATA OR THE USE OR OTHER DEALINGS IN THE DATA. 
+
+The following software may be included in this product:Generic Polygon Clipper (GPC); Use of any of this software is governed by the terms of the license below:
+Alan Murta 
+GPC
+Copyright: (C) 1997-1999, Advanced Interfaces Group, University of Manchester. 
+This software is free for non-commercial use. It may be copied, modified, and redistributed provided that this copyright notice is preserved on all copies. The intellectual property rights of the algorithms used reside with the University of Manchester Advanced Interfaces Group. 
+You may not use this software, in whole or in part, in support of any commercial product without the express consent of the author. 
+There is no warranty or other guarantee of fitness of this software for any purpose. It is provided solely "as is". 
+
+The following software may be included in this product: LaTeX dictinary data; Use of any of this software is governed by the terms of the license below:
+LaTeX3 Project 
+LPPL version 1.3b
+The LaTeX Project Public License 
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- 
+
+LPPL Version 1.3b 2006-01-07 
+
+Copyright 1999 2002-2006 LaTeX3 Project 
+Everyone is allowed to distribute verbatim copies of this license document, but modification of it is not allowed. 
+PREAMBLE 
+======== 
+The LaTeX Project Public License (LPPL) is the primary license under which the the LaTeX kernel and the base LaTeX packages are distributed. 
+You may use this license for any work of which you hold the copyright and which you wish to distribute. This license may be particularly suitable if your work is TeX-related (such as a LaTeX package), but you may use it with small modifications even if your work is unrelated to TeX. 
+The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE', below, gives instructions, examples, and recommendations for authors who are considering distributing their works under this license. 
+This license gives conditions under which a work may be distributed and modified, as well as conditions under which modified versions of that work may be distributed. 
+We, the LaTeX3 Project, believe that the conditions below give you the freedom to make and distribute modified versions of your work that conform with whatever technical specifications you wish while maintaining the availability, integrity, and reliability of that work. If you do not see how to achieve your goal while meeting these conditions, then read the document `cfgguide.tex' and `modguide.tex' in the base LaTeX distribution for suggestions. 
+
+DEFINITIONS 
+=========== 
+
+In this license document the following terms are used: 
+`Work' Any work being distributed under this License. 
+`Derived Work' Any work that under any applicable law is derived from the Work. 
+`Modification' Any procedure that produces a Derived Work under any applicable law -- for example, the production of a file containing an original file associated with the Work or a significant portion of such a file, either verbatim or with modifications and/or translated into another language. 
+`Modify' To apply any procedure that produces a Derived Work under any applicable law. 
+`Distribution' Making copies of the Work available from one person to another, in whole or in part. Distribution includes (but is not limited to) making any electronic components of the Work accessible by file transfer protocols such as FTP or HTTP or by shared file systems such as Sun's Network File System (NFS). 
+`Compiled Work' A version of the Work that has been processed into a form where it is directly usable on a computer system. This processing may include using installation facilities provided by the Work, transformations of the Work, copying of components of the Work, or other activities. Note that modification of any installation facilities provided by the Work constitutes modification of the Work. 
+`Current Maintainer' A person or persons nominated as such within the Work. If there is no such explicit nomination then it is the `Copyright Holder' under any applicable law. 
+`Base Interpreter' A program or process that is normally needed for running or interpreting a part or the whole of the Work. 
+A Base Interpreter may depend on external components but these are not considered part of the Base Interpreter provided that each external component clearly identifies itself whenever it is used interactively. Unless explicitly specified when applying the license to the Work, the only applicable Base Interpreter is a `LaTeX-Format' or in the case of files belonging to the `LaTeX-format' a program implementing the `TeX language'. 
+
+CONDITIONS ON DISTRIBUTION AND MODIFICATION 
+=========================================== 
+
+1. Activities other than distribution and/or modification of the Work are not covered by this license; they are outside its scope. In particular, the act of running the Work is not restricted and no requirements are made concerning any offers of support for the Work. 
+2. You may distribute a complete, unmodified copy of the Work as you received it. Distribution of only part of the Work is considered modification of the Work, and no right to distribute such a Derived Work may be assumed under the terms of this clause. 
+3. You may distribute a Compiled Work that has been generated from a complete, unmodified copy of the Work as distributed under Clause 2 above, as long as that Compiled Work is distributed in such a way that the recipients may install the Compiled Work on their system exactly as it would have been installed if they generated a Compiled Work directly from the Work. 
+4. If you are the Current Maintainer of the Work, you may, without restriction, modify the Work, thus creating a Derived Work. You may also distribute the Derived Work without restriction, including Compiled Works generated from the Derived Work. Derived Works distributed in this manner by the Current Maintainer are considered to be updated versions of the Work. 
+5. If you are not the Current Maintainer of the Work, you may modify your copy of the Work, thus creating a Derived Work based on the Work, and compile this Derived Work, thus creating a Compiled Work based on the Derived Work. 
+6. If you are not the Current Maintainer of the Work, you may distribute a Derived Work provided the following conditions are met for every component of the Work unless that component clearly states in the copyright notice that it is exempt from that condition. Only the Current Maintainer is allowed to add such statements of exemption to a component of the Work. 
+a. If a component of this Derived Work can be a direct replacement for a component of the Work when that component is used with the Base Interpreter, then, wherever this component of the Work identifies itself to the user when used interactively with that Base Interpreter, the replacement component of this Derived Work clearly and unambiguously identifies itself as a modified version of this component to the user when used interactively with that Base Interpreter. 
+b. Every component of the Derived Work contains prominent notices detailing the nature of the changes to that component, or a prominent reference to another file that is distributed as part of the Derived Work and that contains a complete and accurate log of the changes. 
+c. No information in the Derived Work implies that any persons, including (but not limited to) the authors of the original version of the Work, provide any support, including (but not limited to) the reporting and handling of errors, to recipients of the Derived Work unless those persons have stated explicitly that they do provide such support for the Derived Work. 
+d. You distribute at least one of the following with the Derived Work: 
+1. A complete, unmodified copy of the Work; if your distribution of a modified component is made by offering access to copy the modified component from a designated place, then offering equivalent access to copy the Work from the same or some similar place meets this condition, even though third parties are not compelled to copy the Work along with the modified component; 
+2. Information that is sufficient to obtain a complete, unmodified copy of the Work. 
+7. If you are not the Current Maintainer of the Work, you may distribute a Compiled Work generated from a Derived Work, as long as the Derived Work is distributed to all recipients of the Compiled Work, and as long as the conditions of Clause 6, above, are met with regard to the Derived Work. 
+8. The conditions above are not intended to prohibit, and hence do not apply to, the modification, by any method, of any component so that it becomes identical to an updated version of that component of the Work as it is distributed by the Current Maintainer under Clause 4, above. 
+9. Distribution of the Work or any Derived Work in an alternative format, where the Work or that Derived Work (in whole or in part) is then produced by applying some process to that format, does not relax or nullify any sections of this license as they pertain to the results of applying that process. 
+10. a. A Derived Work may be distributed under a different license provided that license itself honors the conditions listed in Clause 6 above, in regard to the Work, though it does not have to honor the rest of the conditions in this license. 
+b. If a Derived Work is distributed under a different license, that Derived Work must provide sufficient documentation as part of itself to allow each recipient of that Derived Work to honor the restrictions in Clause 6 above, concerning changes from the Work. 
+11. This license places no restrictions on works that are unrelated to the Work, nor does this license place any restrictions on aggregating such works with the Work by any means. 
+12. Nothing in this license is intended to, or may be used to, prevent complete compliance by all parties with all applicable laws. 
+NO WARRANTY 
+=========== 
+
+There is no warranty for the Work. Except when otherwise stated in writing, the Copyright Holder provides the Work `as is', without warranty of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose. The entire risk as to the quality and performance of the Work is with you. Should the Work prove defective, you assume the cost of all necessary servicing, repair, or correction. 
+In no event unless required by applicable law or agreed to in writing will The Copyright Holder, or any author named in the components of the Work, or any other party who may distribute and/or modify the Work as permitted above, be liable to you for damages, including any general, special, incidental or consequential damages arising out of any use of the Work or out of inability to use the Work (including, but not limited to, loss of data, data being rendered inaccurate, or losses sustained by anyone as a result of any failure of the Work to operate with any other programs), even if the Copyright Holder or said author or said other party has been advised of the possibility of such damages. 
+
+MAINTENANCE OF THE WORK 
+======================= 
+
+The Work has the status `author-maintained' if the Copyright Holder explicitly and prominently states near the primary copyright notice in the Work that the Work can only be maintained by the Copyright Holder or simply that it is `author-maintained'. 
+The Work has the status `maintained' if there is a Current Maintainer who has indicated in the Work that they are willing to receive error reports for the Work (for example, by supplying a valid e-mail address). It is not required for the Current Maintainer to acknowledge or act upon these error reports. 
+The Work changes from status `maintained' to `unmaintained' if there is no Current Maintainer, or the person stated to be Current Maintainer of the work cannot be reached through the indicated means of communication for a period of six months, and there are no other significant signs of active maintenance. 
+You can become the Current Maintainer of the Work by agreement with any existing Current Maintainer to take over this role. 
+If the Work is unmaintained, you can become the Current Maintainer of the Work through the following steps: 
+1. Make a reasonable attempt to trace the Current Maintainer (and the Copyright Holder, if the two differ) through the means of an Internet or similar search. 
+2. If this search is successful, then enquire whether the Work is still maintained. 
+a. If it is being maintained, then ask the Current Maintainer to update their communication data within one month. 
+b. If the search is unsuccessful or no action to resume active maintenance is taken by the Current Maintainer, then announce within the pertinent community your intention to take over maintenance. (If the Work is a LaTeX work, this could be done, for example, by posting to comp.text.tex.) 
+3a. If the Current Maintainer is reachable and agrees to pass maintenance of the Work to you, then this takes effect immediately upon announcement. 
+b. If the Current Maintainer is not reachable and the Copyright Holder agrees that maintenance of the Work be passed to you, then this takes effect immediately upon announcement. 
+4. If you make an `intention announcement' as described in 2b. above and after three months your intention is challenged neither by the Current Maintainer nor by the Copyright Holder nor by other people, then you may arrange for the Work to be changed so as to name you as the (new) Current Maintainer. 
+5. If the previously unreachable Current Maintainer becomes reachable once more within three months of a change completed under the terms of 3b) or 4), then that Current Maintainer must become or remain the Current Maintainer upon request provided they then update their communication data within one month. 
+A change in the Current Maintainer does not, of itself, alter the fact that the Work is distributed under the LPPL license. 
+If you become the Current Maintainer of the Work, you should immediately provide, within the Work, a prominent and unambiguous statement of your status as Current Maintainer. You should also announce your new status to the same pertinent community as in 2b) above. 
+
+WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE 
+====================================================== 
+
+This section contains important instructions, examples, and recommendations for authors who are considering distributing their works under this license. These authors are addressed as `you' in this section. 
+Choosing This License or Another License 
+---------------------------------------- 
+
+If for any part of your work you want or need to use *distribution* conditions that differ significantly from those in this license, then do not refer to this license anywhere in your work but, instead, distribute your work under a different license. You may use the text of this license as a model for your own license, but your license should not refer to the LPPL or otherwise give the impression that your work is distributed under the LPPL. 
+The document `modguide.tex' in the base LaTeX distribution explains the motivation behind the conditions of this license. It explains, for example, why distributing LaTeX under the GNU General Public License (GPL) was considered inappropriate. Even if your work is unrelated to LaTeX, the discussion in `modguide.tex' may still be relevant, and authors intending to distribute their works under any license are encouraged to read it. 
+
+A Recommendation on Modification Without Distribution 
+----------------------------------------------------- 
+
+It is wise never to modify a component of the Work, even for your own personal use, without also meeting the above conditions for distributing the modified component. While you might intend that such modifications will never be distributed, often this will happen by accident -- you may forget that you have modified that component; or it may not occur to you when allowing others to access the modified version that you are thus distributing it and violating the conditions of this license in ways that could have legal implications and, worse, cause problems for the community. It is therefore usually in your best interest to keep your copy of the Work identical with the public one. Many works provide ways to control the behavior of that work without altering any of its licensed components. 
+
+How to Use This License 
+----------------------- 
+
+To use this license, place in each of the components of your work both an explicit copyright notice including your name and the year the work was authored and/or last substantially modified. Include also a statement that the distribution and/or modification of that component is constrained by the conditions in this license. 
+Here is an example of such a notice and statement: 
+%% pig.dtx %% Copyright 2005 M. Y. Name % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 % of this license or (at your option) any later version. % The latest version of this license is in % http://www.latex-project.org/lppl.txt % and version 1.3 or later is part of all distributions of LaTeX % version 2005/12/01 or later. % % This work has the LPPL maintenance status `maintained'. % % The Current Maintainer of this work is M. Y. Name. % % This work consists of the files pig.dtx and pig.ins % and the derived file pig.sty. 
+Given such a notice and statement in a file, the conditions given in this license document would apply, with the `Work' referring to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being generated from `pig.dtx' using `pig.ins'), the `Base Interpreter' referring to any `LaTeX-Format', and both `Copyright Holder' and `Current Maintainer' referring to the person `M. Y. Name'. 
+If you do not want the Maintenance section of LPPL to apply to your Work, change `maintained' above into `author-maintained'. However, we recommend that you use `maintained', as the Maintenance section was added in order to ensure that your Work remains useful to the community even when you can no longer maintain and support it yourself. 
+
+Derived Works That Are Not Replacements 
+--------------------------------------- 
+
+Several clauses of the LPPL specify means to provide reliability and stability for the user community. They therefore concern themselves with the case that a Derived Work is intended to be used as a (compatible or incompatible) replacement of the original Work. If this is not the case (e.g., if a few lines of code are reused for a completely different task), then clauses 6b and 6d shall not apply. 
+
+Important Recommendations 
+------------------------- 
+
+Defining What Constitutes the Work 
+The LPPL requires that distributions of the Work contain all the files of the Work. It is therefore important that you provide a way for the licensee to determine which files constitute the Work. This could, for example, be achieved by explicitly listing all the files of the Work near the copyright notice of each file or by using a line such as: 
+% This work consists of all files listed in manifest.txt. 
+in that place. In the absence of an unequivocal list it might be impossible for the licensee to determine what is considered by you to comprise the Work and, in such a case, the licensee would be entitled to make reasonable conjectures as to which files comprise the Work. 
+
+The following software may be included in this product:MS Runtime Libraries; Use of any of this software is governed by the terms of the license below:
+Microsoft Corporation 
+Runtime Libraries
+Microsoft .NET Framework Redistributable EULA 
+SUPPLEMENTAL END-USER LICENSE AGREEMENT FOR MICROSOFT SOFTWARE 
+IMPORTANT: 
+READ CAREFULLY— 
+These Microsoft Corporation ("Microsoft")
+operating system components, including any "online" or electronic
+documentation ("OS Components") are subject to the terms and 
+conditions of the agreement under which you have licensed the 
+applicable Microsoft operating system product ("OS Product") 
+described below (each an "End User License Agreement" or "EULA") 
+and the terms and conditions of this Supplemental EULA. BY INSTALLING, 
+COPYING OR OTHERWISE USING THE OS COMPONENTS, YOU AGREE TO BE BOUND 
+BY THE TERMS AND CONDITIONS OF THE APPLICABLE OS PRODUCT EULA AND 
+THIS SUPPLEMENTAL EULA. IF YOU DO NOT AGREE TO THESE TERMS AND 
+CONDITIONS, DO NOT INSTALL, COPY OR USE THE OS COMPONENTS. 
+NOTE: IF YOU DO NOT HAVE A VALID EULA FOR ANY "OS PRODUCT" 
+(MICROSOFT WINDOWS 98, WINDOWS ME, WINDOWS NT 4.0 (DESKTOP 
+EDITION), WINDOWS 2000 OPERATING SYSTEM, WINDOWS XP PROFESSIONAL 
+AND/OR WINDOWS XP HOME EDITION), YOU ARE NOT AUTHORIZED TO INSTALL, 
+COPY OR OTHERWISE USE THE OS COMPONENTS AND YOU HAVE NO RIGHTS UNDER 
+THIS SUPPLEMENTAL EULA. 
+Capitalized terms used in this Supplemental EULA and not otherwise 
+defined herein shall have the meanings assigned to them in the 
+applicable OS Product EULA. 
+General. The OS Components are provided to you by Microsoft to update, 
+supplement, or replace existing functionality of the applicable OS 
+Product Microsoft grants you a license to use the OS Components 
+under the terms and conditions of the OS Product EULA for the applicable 
+OS Product (which are hereby incorporated by reference) and the terms 
+and conditions set forth in this Supplemental EULA, provided that you 
+comply with all such terms and conditions. To the extent that any terms 
+in this Supplemental EULA conflict with terms in the applicable OS 
+Product EULA, the terms of this Supplemental EULA control solely with 
+respect to the OS Components. 
+Additional Rights and Limitations. 
+*If you have multiple validly licensed copies of the applicable OS 
+Product(s), you may reproduce, install and use one copy of the OS 
+Components as part of such applicable OS Product(s) on all of your 
+computers running validly licensed copies of the OS Product(s) 
+provided that you use such additional copies of the OS Components 
+in accordance with the terms and conditions above. You may not 
+disclose the results of any benchmark test of the .NET Framework 
+component of the OS Components to any third party without Microsoft's 
+prior written approval. Microsoft retains all right, title and
+interest in and to the OS Components. All rights not expressly granted 
+are reserved by Microsoft. 
+IF THE APPLICABLE OS PRODUCT WAS LICENSED TO YOU BY MICROSOFT OR ANY 
+OF ITS WHOLLY OWNED SUBSIDIARIES, THE LIMITED WARRANTY (IF ANY) 
+INCLUDED IN THE APPLICABLE OS PRODUCT EULA APPLIES TO THE OS COMPONENTS 
+PROVIDED THE OS COMPONENTS HAVE BEEN LICENSED BY YOU WITHIN THE TERM OF 
+THE LIMITED WARRANTY IN THE APPLICABLE OS PRODUCT EULA. HOWEVER, THIS 
+SUPPLEMENTAL EULA DOES NOT EXTEND THE TIME PERIOD FOR WHICH THE LIMITED 
+WARRANTY IS PROVIDED. 
+IF THE APPLICABLE OS PRODUCT WAS LICENSED TO YOU BY AN ENTITY OTHER THAN 
+MICROSOFT OR ANY OF ITS WHOLLY OWNED SUBSIDIARIES, MICROSOFT DISCLAIMS 
+ALL WARRANTIES WITH RESPECT TO THE OS COMPONENTS AS FOLLOWS: 
+DISCLAIMER OF WARRANTIES. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE 
+LAW, MICROSOFT AND ITS SUPPLIERS PROVIDE TO YOU THE OS COMPONENTS, AND 
+ANY (IF ANY) SUPPORT SERVICES RELATED TO THE OS COMPONENTS ("SUPPORT 
+SERVICES") AS IS AND WITH ALL FAULTS; and Microsoft and its suppliers 
+hereby disclaim with respect to THE os COMPONENTS AND SUPPORT SERVICES 
+all warranties and conditions, whether express, implied or statutory, 
+including, but not limited to, any (if any) warranties or conditions 
+of OR RELATED TO: TITLE, NON-INFRINGEMENT, merchantability, fitness 
+for a particular purpose, lack of viruses, accuracy or completeness 
+of responses, results, lack of negligence or lack of workmanlike effort, 
+QUIET ENJOYMENT, QUIET POSSESSION, AND CORRESPONDENCE TO DESCRIPTION. 
+The entire risk arising out of use or performance of the OS Components 
+AND ANY SUPPORT SERVICES remains with you. 
+EXCLUSION OF INCIDENTAL, CONSEQUENTIAL AND CERTAIN OTHER DAMAGES. To 
+the maximum extent permitted by applicable law, in no event shall 
+Microsoft or its suppliers be liable for any special, incidental, 
+indirect, or consequential damages whatsoever (including, but not 
+limited to, damages for: loss of profits, LOSS OF confidential or 
+other information, business interruption, personal injury, loss of 
+privacy, failure to meet any duty (including of good faith or of 
+reasonable care), negligence, and any other pecuniary or other loss 
+whatsoever) arising out of or in any way related to the use of or 
+inability to use the OS Components OR THE SUPPORT SERVICES, OR the 
+provision of or failure to provide Support Services, or otherwise 
+under or in connection with any provision of this Supplemental EULA, 
+even if Microsoft or any supplier has been advised of the possibility 
+of such damages. 
+LIMITATION OF LIABILITY AND REMEDIES. NOTWITHSTANDING ANY DAMAGES THAT 
+YOU MIGHT INCUR FOR ANY REASON WHATSOEVER (INCLUDING, WITHOUT 
+LIMITATION, ALL DAMAGES REFERENCED ABOVE AND ALL DIRECT OR GENERAL 
+DAMAGES), THE ENTIRE LIABILITY OF MICROSOFT AND ANY OF ITS SUPPLIERS 
+UNDER ANY PROVISION OF THIS SUPPLEMENTAL EULA AND YOUR EXCLUSIVE 
+REMEDY FOR ALL OF THE FOREGOING SHALL BE LIMITED TO THE GREATER OF 
+THE AMOUNT ACTUALLY PAID BY YOU FOR THE OS COMPONENTS OR U.S.$5.00. 
+THE FOREGOING LIMITATIONS, EXCLUSIONS AND DISCLAIMERS SHALL APPLY 
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, EVEN IF ANY REMEDY 
+FAILS ITS ESSENTIAL PURPOSE. 
+
+Si vous avez acquis votre produit Microsoft au CANADA, le texte suivant 
+vous concerne : 
+SI LE PRODUIT OS APPLICABLE VOUS A ÉTÉ CONCÉDÉ SOUS LICENCE PAR 
+MICROSOFT OU PAR L'UNE QUELCONQUE DE SES FILIALES À 100%, LA GARANTIE 
+LIMITÉE (SI ELLE EXISTE) APPLICABLE EN VERTU DU CONTRAT DE LICENCE 
+UTILISATEUR FINAL (« CLUF ») RELATIF À CE PRODUIT OS S'APPLIQUE AUX 
+COMPOSANTS SYSTÈME D'EXPLOITATION DE MICROSOFT Y COMPRIS TOUTE 
+DOCUMENTATION « EN LIGNE » OU SOUS FORME ÉLECTRONIQUE (LES « 
+COMPOSANTS OS »), À CONDITION QUE CEUX-CI VOUS AIENT ÉTÉ CONCÉDÉS 
+SOUS LICENCE PENDANT LA DURÉE DE LA GARANTIE LIMITÉE DU CLUF RELATIF 
+AU PRODUIT OS APPLICABLE. LE PRÉSENT CLUF SUPPLÉMENTAIRE N'A PAS POUR 
+EFFET DE PROROGER LA DURÉE DE CETTE GARANTIE LIMITÉE. 
+SI LE PRODUIT OS VOUS A ÉTÉ CONCÉDÉ SOUS LICENCE PAR UNE ENTITÉ AUTRE 
+QUE MICROSOFT OU QUE L'UNE QUELCONQUE DE SES FILIALES À 100%, 
+MICROSOFT EXCLUT TOUTE GARANTIE RELATIVE AUX COMPOSANTS OS COMME 
+CELA EST STIPULÉ CI-APRÈS : 
+EXCLUSION DE GARANTIE. DANS TOUTE LA MESURE PERMISE PAR LE DROIT 
+APPLICABLE, MICROSOFT ET SES FOURNISSEURS VOUS FOURNISSENT LES 
+COMPOSANTS OS, AINSI QUE, LE CAS ÉCHÉANT, TOUT SERVICE D'ASSISTANCE 
+RELATIF À CES COMPOSANTS OS (LES "SERVICES D'ASSISTANCE"), « COMME 
+TELS ET AVEC TOUS LEURS DEFAUTS ». EN OUTRE, MICROSOFT ET SES 
+FOURNISSEURS EXCLUENT PAR LES PRÉSENTES TOUTE AUTRE GARANTIE LÉGALE, 
+EXPRESSE OU IMPLICITE, RELATIVE AUX COMPOSANTS OS ET AUX SERVICES 
+D'ASSISTANCE, NOTAMMENT (LE CAS ÉCHÉANT), TOUTE GARANTIE : DE PROPRIÉTÉ, 
+D'ABSENCE DE CONTREFAÇON, DE QUALITÉ, D'ADAPTATION À UN USAGE 
+PARTICULIER, D'ABSENCE DE VIRUS, DE PRÉCISION, D'EXHAUSTIVITÉ DES 
+RÉPONSES, DES RÉSULTATS OBTENUS, D'ABSENCE DE NÉGLIGENCE, OU DE 
+DÉFAUT DE FABRICATION, DE JOUISSANCE PAISIBLE, D'ABSENCE DE TROUBLE 
+DE POSSESSION ET DE CONFORMITÉ À LA DESCRIPTION. VOUS ASSUMEZ 
+L'ENSEMBLE DES RISQUES DÉCOULANT DE L'UTILISATION OU DU FONCTIONNEMENT 
+DES COMPOSANTS OS ET DES SERVICES D'ASSISTANCE. 
+EXCLUSION DE RESPONSABILITÉ POUR LES DOMMAGES ACCESSOIRES, INDIRECTS 
+ET CERTAINS AUTRES TYPES DE DOMMAGES. DANS TOUTE LA MESURE PERMISE 
+PAR LE DROIT APPLICABLE, MICROSOFT OU SES FOURNISSEURS NE POURRONT EN 
+AUCUN CAS ÊTRE TENUS RESPONSABLES DE TOUT DOMMAGE SPÉCIAL, ACCESSOIRE, 
+INCIDENT OU INDIRECT DE QUELQUE NATURE QUE CE SOIT (Y COMPRIS, MAIS 
+NON DE FACON LIMITATIVE, LES PERTES DE BÉNÉFICES, PERTES D'INFORMATIONS 
+CONFIDENTIELLES OU AUTRES INFORMATIONS, INTERRUPTIONS D'ACTIVITÉ, 
+PRÉJUDICES CORPORELS, ATTEINTES À LA VIE PRIVÉE, MANQUEMENT À TOUTE 
+OBLIGATION (NOTAMMENT L'OBLIGATION DE BONNE FOI ET DE DILIGENCE), 
+NÉGLIGENCE, ET POUR TOUTE PERTE PÉCUNIAIRE OU AUTRE DE QUELQUE NATURE 
+QUE CE SOIT), RÉSULTANT DE, OU RELATIFS A, L'UTILISATION OU 
+L'IMPOSSIBILITÉ D'UTILISER LES COMPOSANTS OS OU LES SERVICES D'ASSISTANCE, 
+OU LA FOURNITURE OU LE DÉFAUT DE FOURNITURE DES SERVICES D'ASSISTANCE, OU 
+AUTREMENT EN VERTU DE, OU RELATIVEMENT A, TOUTE DISPOSITION DE CE CLUF 
+SUPPLÉMENTAIRE, MÊME SI LA SOCIÉTÉ MICROSOFT OU UN QUELCONQUE FOURNISSEUR 
+A ÉTÉ PRÉVENU DE L'ÉVENTUALITÉ DE TELS DOMMAGES. 
+LIMITATION DE RESPONSABILITÉ ET RECOURS. NONOBSTANT TOUT DOMMAGE QUE VOUS 
+POURRIEZ SUBIR POUR QUELQUE MOTIF QUE CE SOIT (NOTAMMENT TOUS LES DOMMAGES 
+ÉNUMÉRÉS CI-DESSUS ET TOUS LES DOMMAGES DIRECTS OU GÉNÉRAUX), L'ENTIÈRE 
+RESPONSABILITÉ DE MICROSOFT ET DE L'UN QUELCONQUE DE SES FOURNISSEURS AU 
+TITRE DE TOUTE STIPULATION DE CE CLUF SUPPLÉMENTAIRE ET VOTRE SEUL RECOURS 
+EN CE QUI CONCERNE TOUS LES DOMMAGES PRÉCITÉS NE SAURAIENT EXCÉDER LE 
+MONTANT QUE VOUS AVEZ EFFECTIVEMENT PAYÉ POUR LES COMPOSANTS OS OU 5 DOLLARS 
+US (US$ 5,00), SELON LE PLUS ÉLEVÉ DES DEUX MONTANTS. LES PRÉSENTES 
+LIMITATIONS ET EXCLUSIONS DEMEURERONT APPLICABLES DANS TOUTE LA MESURE 
+PERMISE PAR LE DROIT APPLICABLE QUAND BIEN MÊME UN QUELCONQUE REMÈDE À UN 
+QUELCONQUE MANQUEMENT NE PRODUIRAIT PAS D'EFFET. 
+La présente Convention est régie par les lois de la province d'Ontario, 
+Canada. Chacune des parties à la présente reconnaît irrévocablement la 
+compétence des tribunaux de la province d'Ontario et consent à instituer 
+tout litige qui pourrait découler de la présente auprès des tribunaux 
+situés dans le district judiciaire de York, province d'Ontario. 
+Au cas où vous auriez des questions concernant cette licence ou que vous 
+désiriez vous mettre en rapport avec Microsoft pour quelque raison que 
+ce soit, veuillez contacter la succursale Microsoft desservant votre 
+pays, ou écrire à : Microsoft Sales Information Center, One Microsoft 
+Way, Redmond, Washington 98052-6399. 
+
+The following software may be included in this product: Ispell W?rterbuch igerman98; Use of any of this software is governed by the terms of the license below:
+Bjoern Jacke 
+German Dictionaries igerman98
+OASIS distribution license agreement 0.1 from 2005-11-10 
+Without any modifications this dictionary may be distributed with programs that support the OASIS Open Document Format for Office Applications and whose PRIMARY format for saving documents is the Open Document Format. 
+This requires that all licenses and copyright files are also distributed together with the package the dictionary is shipped with. 
+Any modifications of the dictionary files are not allowed for this agreement, modifications require the use of the GNU GENERAL PUBLIC LICENSE. 
+If you have questions or don't get along with this, send me your comments/questions/ideas to Bjoern Jacke 
+
+The following software may be included in this product: WordNet Release 2.1; Use of any of this software is governed by the terms of the license below:
+Princeton University 
+WordNet 2.1
+WordNet 2.1 Copyright 2005 by Princeton University. 
+This software and database is being provided to you, the LICENSEE, by Princeton University under the following license. By obtaining, using and/or copying this software and database, you agree that you have read, understood, and will comply with these terms and conditions.: 
+Permission to use, copy, modify and distribute this software and database and its documentation for any purpose and without fee or royalty is hereby granted, provided that you agree to comply with the following copyright notice and statements, including the disclaimer, and that the same appear on ALL copies of the software, database and documentation, including modifications that you make for internal use or for distribution. 
+WordNet 2.1 Copyright 2005 by Princeton University. All rights reserved. 
+THIS SOFTWARE AND DATABASE IS PROVIDED "AS IS" AND PRINCETON UNIVERSITY MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PRINCETON UNIVERSITY MAKES NO REPRESENTATIONS OR WARRANTIES OF MERCHANT- ABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE, DATABASE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. 
+The name of Princeton University or Princeton may not be used in advertising or publicity pertaining to distribution of the software and/or database. Title to copyright in this software, database and any associated documentation shall at all times remain with Princeton University and LICENSEE agrees to preserve same. 
+
+The following software may be included in this product:Bitstram Vera Fonts; Use of any of this software is governed by the terms of the license below:
+Bitstream, Inc. 
+Bitstream Vera Fonts
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc. 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license (“Fonts�) and associated documentation files (the “Font Software�), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions: 
+
+The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces.
+
+The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words “Bitstream� or the word “Vera�.
+
+This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the “Bitstream Vera� names. 
+
+The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself. 
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. 
+
+Except as contained in this notice, the names of Gnome, the Gnome Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org. 
+Arev Fonts Copyright 
+Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. 
+Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license ("Fonts") and associated documentation files (the "Font Software"), to reproduce and distribute the modifications to the Bitstream Vera Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions: 
+The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces. 
+The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words "Tavmjong Bah" or the word "Arev". 
+This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the "Tavmjong Bah Arev" names. 
+The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself. 
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. 
+Except as contained in this notice, the name of Tavmjong Bah shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from Tavmjong Bah. For further information, contact: tavmjong @ free . fr. 
+
+The following software may be included in this product: Liberation Fonts; Use of any of this software is governed by the terms of the license below:
+RedHat, Inc.
+Liberation Fonts
+refer to GNU General Public License and the following terms: 
+LICENSE AGREEMENT AND LIMITED PRODUCT WARRANTY LIBERATION FONT SOFTWARE 
+This agreement governs the use of the Software and any updates to the Software, regardless of the delivery mechanism. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to the user ("Client") a license to this collective work pursuant to the GNU General Public License v.2 with the exceptions set forth below and such other terms as our set forth in this End User License Agreement. 
+1. The Software and License Exception. LIBERATION font software (the "Software") consists of TrueType-OpenType formatted font software for rendering LIBERATION typefaces in sans serif, serif, and monospaced character styles. You are licensed to use, modify, copy, and distribute the Software pursuant to the GNU General Public License v.2 with the following exceptions: 
+1) As a special exception, if you create a document which uses this font, and embed this font or unaltered portions of this font into the document, this font does not by itself cause the resulting document to be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the document might be covered by the GNU General Public License. If you modify this font, you may extend this exception to your version of the font, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. 
+2) As a further exception, any distribution of the object code of the Software in a physical product must provide you the right to access and modify the source code for the Software and to reinstall that modified version of the Software in object code form on the same physical product on which you received it. 
+2. Intellectual Property Rights. The Software and each of its components, including the source code, documentation, appearance, structure and organization are owned by Red Hat and others and are protected under copyright and other laws. Title to the Software and any component, or to any copy, modification, or merged portion shall remain with the aforementioned, subject to the applicable license. The "LIBERATION" trademark is a trademark of Red Hat, Inc. in the U.S. and other countries. This agreement does not permit Client to distribute modified versions of the Software using Red Hat's trademarks. If Client makes a redistribution of a modified version of the Software, then Client must modify the files names to remove any reference to the Red Hat trademarks and must not use the Red Hat trademarks in any way to reference or promote the modified Software. 
+3. Limited Warranty. To the maximum extent permitted under applicable law, the Software is provided and licensed "as is" without warranty of any kind, expressed or implied, including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. Red Hat does not warrant that the functions contained in the Software will meet Client's requirements or that the operation of the Software will be entirely error free or appear precisely as described in the accompanying documentation. 
+4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential damages, including lost profits or lost savings arising out of the use or inability to use the Software, even if Red Hat or such dealer has been advised of the possibility of such damages. 
+5. Export Control. As required by U.S. law, Client represents and warrants that it: (a) understands that the Software is subject to export controls under the U.S. Commerce Department's Export Administration Regulations ("EAR"); (b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations (currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria); (c) will not export, re-export, or transfer the Software to any prohibited destination, entity, or individual without the necessary export license(s) or authorizations(s) from the U.S. Government; (d) will not use or transfer the Software for use in any sensitive nuclear, chemical or biological weapons, or missile technology end-uses unless authorized by the U.S. Government by regulation or specific license; (e) understands and agrees that if it is in the United States and exports or transfers the Software to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and address (including country) of each transferee; and (f) understands that countries other than the United States may restrict the import, use, or export of encryption products and that it shall be solely responsible for compliance with any such import, use, or export restrictions. 
+6. General. If any provision of this agreement is held to be unenforceable, that shall not affect the enforceability of the remaining provisions. This agreement shall be governed by the laws of the State of North Carolina and of the United States, without regard to any conflict of laws provisions, except that the United Nations Convention on the International Sale of Goods shall not apply. 
+Copyright © 2007 Red Hat, Inc. All rights reserved. LIBERATION is a trademark of Red Hat, Inc. 
+
+The following software may be included in this product: MathML DTD; Use of any of this software is governed by the terms of the license below:
+World Wide Web Consortium (W3C)
+MathML DTD
+W3C® SOFTWARE NOTICE AND LICENSE
+Copyright © 1994-2001 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/
+This W3C work (including software, documents, or other related items) is being provided by the copyright holders under the following license. By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions:
+Permission to use, copy, modify, and distribute this software and its documentation, with or without modification,  for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications, that you make:
+1. The full text of this NOTICE in a location viewable to users of the redistributed or derivative work. 
+2. Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, a short notice of the following form (hypertext is preferred, text is permitted) should be used within the body of any redistributed or derivative code: "Copyright © [$date-of-software] World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/" 
+3. Notice of any changes or modifications to the W3C files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.) 
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
+
+
+The following software may be included in this product: NSIS; Use of any of this software is governed by the terms of the license below:
+Nullsoft, Inc.
+NSIS
+Copyright (C) 1999-2003 Nullsoft, Inc. 
+This license applies to everything in the NSIS package, except where otherwise noted. 
+This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. 
+Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: 
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 
+3. This notice may not be removed or altered from any source distribution. 
+
+The following software may be included in this product: PostScript(R) AFM Files; Use of any of this software is governed by the terms of the license below:
+Adobe
+PostScript(R) AFM files
+
+Adobe Core 35 AFM Files with 314 Glyph Entries 
+This file and the 35 PostScript(R) AFM files it accompanies may be used, copied, and distributed for any purpose and without charge, with or without modification, provided that all copyright notices are retained; that the AFM files are not distributed without this file; that all modifications to this file or any of the AFM files are prominently noted in the modified file(s); and that this paragraph is not modified. Adobe Systems has no responsibility or obligation to support the use of the AFM files. 
+
+The following software may be included in this product: Antigrain; Use of any of this software is governed by the terms of the license below:
+Axim Shemanarev
+Antigrain
+
+Anti-Grain Geometry - Version 2.0 
+Copyright (C) 2002-2004 Maxim Shemanarev (McSeem) 
+Permission to copy, use, modify, sell and distribute this software is granted provided this copyright notice appears in all copies. This software is provided "as is" without express or implied warranty, and with no claim as to its suitability for any purpose. 
+
+The following software may be included in this product: beanshell; Use of any of this software is governed by the terms of the license below:
+Pat Niemeyer
+beanshell
+jump to LGPL
+
+/*****************************************************************************
+ *                                                                           *
+ *  This file is part of the BeanShell Java Scripting distribution.          *
+ *  Documentation and updates may be found at http://www.beanshell.org/      *
+ *                                                                           *
+ *  Sun Public License Notice:                                               *
+ *                                                                           *
+ *  The contents of this file are subject to the Sun Public License Version  *
+ *  1.0 (the "License"); you may not use this file except in compliance with *
+ *  the License. A copy of the License is available at http://www.sun.com    *
+ *                                                                           *
+ *  The Original Code is BeanShell. The Initial Developer of the Original    *
+ *  Code is Pat Niemeyer. Portions created by Pat Niemeyer are Copyright     *
+ *  (C) 2000.  All Rights Reserved.                                          *
+ *                                                                           *
+ *  GNU Public License Notice:                                               *
+ *                                                                           *
+ *  Alternatively, the contents of this file may be used under the terms of  *
+ *  the GNU Lesser General Public License (the "LGPL"), in which case the    *
+ *  provisions of LGPL are applicable instead of those above. If you wish to *
+ *  allow use of your version of this file only under the  terms of the LGPL *
+ *  and not to allow others to use your version of this file under the SPL,  *
+ *  indicate your decision by deleting the provisions above and replace      *
+ *  them with the notice and other provisions required by the LGPL.  If you  *
+ *  do not delete the provisions above, a recipient may use your version of  *
+ *  this file under either the SPL or the LGPL.                              *
+ *                                                                           *
+ *  Patrick Niemeyer (pat@pat.net)                                           *
+ *  Author of Learning Java, O'Reilly & Associates                           *
+ *  http://www.pat.net/~pat/                                                 *
+ *                                                                           *
+ *****************************************************************************/
+
+The following software may be included in this product: C++ Boost Library; Use of any of this software is governed by the terms of the license below:
+Boost.org
+C++ Boost Library
+Boost Software License - Version 1.0 - August 17th, 2003 
+Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by this license (the "Software") to use, reproduce, display, distribute, execute, and transmit the Software, and to prepare derivative works of the Software, and to permit third-parties to whom the Software is furnished to do so, all subject to the following: 
+The copyright notices in the Software and this entire statement, including the above license grant, this restriction and the following disclaimer, must be included in all copies of the Software, in whole or in part, and all derivative works of the Software, unless such copies or derivative works are solely in the form of machine-executable object code generated by a source language processor. 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+
+The following software may be included in this product: Cairo; Use of any of this software is governed by the terms of the license below:
+Cairographics.org
+Cairo (B)
+jump to MPL 1.1
+
+The following software may be included in this product:Charis SIL v4; Use of any of this software is governed by the terms of the license below:
+SIL International
+Charis SIL v.4
+
+This Font Software is Copyright (c) 1997-2006, SIL International (http://scripts.sil.org/). 
+All Rights Reserved. 
+"Charis SIL" is a Reserved Font Name for this Font Software. 
+"SIL" is a Reserved Font Name for this Font Software. 
+This Font Software is licensed under the SIL Open Font License, Version 1.0. 
+No modification of the license is permitted, only verbatim copy is allowed. 
+This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL 
+----------------------------------------------------------- 
+SIL OPEN FONT LICENSE Version 1.0 - 22 November 2005 
+----------------------------------------------------------- 
+PREAMBLE 
+The goals of the Open Font License (OFL) are to stimulate worldwide development of cooperative font projects, to support the font creation efforts of academic and linguistic communities, and to provide an open framework in which fonts may be shared and improved in partnership with others. 
+The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and sold with any software provided that the font names of derivative works are changed. The fonts and derivatives, however, cannot be released under any other type of license. 
+DEFINITIONS 
+"Font Software" refers to any and all of the following: 
+- font files 
+- data files 
+- source code 
+- build scripts 
+- documentation 
+"Reserved Font Name" refers to the Font Software name as seen by users and any other names as specified after the copyright statement. 
+"Standard Version" refers to the collection of Font Software components as distributed by the Copyright Holder. 
+"Modified Version" refers to any derivative font software made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Standard Version, by changing formats or by porting the Font Software to a new environment. 
+"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software. 
+PERMISSION & CONDITIONS 
+Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions: 
+1) Neither the Font Software nor any of its individual components, in Standard or Modified Versions, may be sold by itself. 
+2) Standard or Modified Versions of the Font Software may be bundled, redistributed and sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user. 
+3) No Modified Version of the Font Software may use the Reserved Font Name(s), in part or in whole, unless explicit written permission is granted by the Copyright Holder. This restriction applies to all references stored in the Font Software, such as the font menu name and other font description fields, which are used to differentiate the font from others. 
+4) The name(s) of the Copyright Holder or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder and the Author(s) or with their explicit written permission. 
+5) The Font Software, modified or unmodified, in part or in whole, must be distributed using this license, and may not be distributed under any other license. 
+TERMINATION 
+This license becomes null and void if any of the above conditions are not met. 
+DISCLAIMER THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. 
+
+The following software may be included in this product:KDE Crystal theme icons; Use of any of this software is governed by the terms of the license below:
+KDE Artists: 
+KDE Crystal theme icons
+KDE Crystal theme icons. 
+Copyright (C) 2002 and following years KDE Artists This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, version 2.1 of the License. 
+License
+
+The Crystal Project are released under LGPL.
+
+GNU General Public License.
+
+   0.
+
+      This License Agreement applies to any software library or other program
+which contains a notice placed by the copyright holder or other authorized party
+saying it may be distributed under the terms of this Lesser General Public
+License (also called "this License"). Each licensee is addressed as "you".
+
+      A "library" means a collection of software functions and/or data prepared
+so as to be conveniently linked with application programs (which use some of
+those functions and data) to form executables.
+
+      The "Library", below, refers to any such software library or work which
+has been distributed under these terms. A "work based on the Library" means
+either the Library or any derivative work under copyright law: that is to say, a
+work containing the Library or a portion of it, either verbatim or with
+modifications and/or translated straightforwardly into another language.
+(Hereinafter, translation is included without limitation in the term
+"modification".)
+
+      "Source code" for a work means the preferred form of the work for making
+modifications to it. For a library, complete source code means all the source
+code for all modules it contains, plus any associated interface definition
+files, plus the scripts used to control compilation and installation of the library.
+
+      Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of running a
+program using the Library is not restricted, and output from such a program is
+covered only if its contents constitute a work based on the Library (independent
+of the use of the Library in a tool for writing it). Whether that is true
+depends on what the Library does and what the program that uses the Library does.
+   1.
+
+      You may copy and distribute verbatim copies of the Library's complete
+source code as you receive it, in any medium, provided that you conspicuously
+and appropriately publish on each copy an appropriate copyright notice and
+disclaimer of warranty; keep intact all the notices that refer to this License
+and to the absence of any warranty; and distribute a copy of this License along
+with the Library.
+
+      You may charge a fee for the physical act of transferring a copy, and you
+may at your option offer warranty protection in exchange for a fee.
+   2.
+
+      You may modify your copy or copies of the Library or any portion of it,
+thus forming a work based on the Library, and copy and distribute such
+modifications or work under the terms of Section 1 above, provided that you also
+meet all of these conditions:
+         1. The modified work must itself be a software library.
+         2. You must cause the files modified to carry prominent notices stating
+that you changed the files and the date of any change.
+         3. You must cause the whole of the work to be licensed at no charge to
+all third parties under the terms of this License.
+         4. If a facility in the modified Library refers to a function or a
+table of data to be supplied by an application program that uses the facility,
+other than as an argument passed when the facility is invoked, then you must
+make a good faith effort to ensure that, in the event an application does not
+supply such function or table, the facility still operates, and performs
+whatever part of its purpose remains meaningful.
+
+      (For example, a function in a library to compute square roots has a
+purpose that is entirely well-defined independent of the application. Therefore,
+Subsection 2d requires that any application-supplied function or table used by
+this function must be optional: if the application does not supply it, the
+square root function must still compute square roots.)
+
+      These requirements apply to the modified work as a whole. If identifiable
+sections of that work are not derived from the Library, and can be reasonably
+considered independent and separate works in themselves, then this License, and
+its terms, do not apply to those sections when you distribute them as separate
+works. But when you distribute the same sections as part of a whole which is a
+work based on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the entire whole,
+and thus to each and every part regardless of who wrote it.
+
+      Thus, it is not the intent of this section to claim rights or contest your
+rights to work written entirely by you; rather, the intent is to exercise the
+right to control the distribution of derivative or collective works based on the
+Library.
+
+      In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of a storage
+or distribution medium does not bring the other work under the scope of this
+License.
+   3.
+
+      You may opt to apply the terms of the ordinary GNU General Public License
+instead of this License to a given copy of the Library. To do this, you must
+alter all the notices that refer to this License, so that they refer to the
+ordinary GNU General Public License, version 2, instead of to this License. (If
+a newer version than version 2 of the ordinary GNU General Public License has
+appeared, then you can specify that version instead if you wish.) Do not make
+any other change in these notices.
+
+      Once this change is made in a given copy, it is irreversible for that
+copy, so the ordinary GNU General Public License applies to all subsequent
+copies and derivative works made from that copy.
+
+      This option is useful when you wish to copy part of the code of the
+Library into a program that is not a library.
+   4.
+
+      You may copy and distribute the Library (or a portion or derivative of it,
+under Section 2) in object code or executable form under the terms of Sections 1
+and 2 above provided that you accompany it with the complete corresponding
+machine-readable source code, which must be distributed under the terms of
+Sections 1 and 2 above on a medium customarily used for software interchange.
+
+      If distribution of object code is made by offering access to copy from a
+designated place, then offering equivalent access to copy the source code from
+the same place satisfies the requirement to distribute the source code, even
+though third parties are not compelled to copy the source along with the object
+code.
+   5.
+
+      A program that contains no derivative of any portion of the Library, but
+is designed to work with the Library by being compiled or linked with it, is
+called a "work that uses the Library". Such a work, in isolation, is not a
+derivative work of the Library, and therefore falls outside the scope of this
+License.
+      However, linking a "work that uses the Library" with the Library creates
+an executable that is a derivative of the Library (because it contains portions
+of the Library), rather than a "work that uses the library". The executable is
+therefore covered by this License. Section 6 states terms for distribution of
+such executables.
+
+      When a "work that uses the Library" uses material from a header file that
+is part of the Library, the object code for the work may be a derivative work of
+the Library even though the source code is not. Whether this is true is
+especially significant if the work can be linked without the Library, or if the
+work is itself a library. The threshold for this to be true is not precisely
+defined by law.
+
+      If such an object file uses only numerical parameters, data structure
+layouts and accessors, and small macros and small inline functions (ten lines or
+less in length), then the use of the object file is unrestricted, regardless of
+whether it is legally a derivative work. (Executables containing this object
+code plus portions of the Library will still fall under Section 6.)
+
+      Otherwise, if the work is a derivative of the Library, you may distribute
+the object code for the work under the terms of Section 6. Any executables
+containing that work also fall under Section 6, whether or not they are linked
+directly with the Library itself.
+   6.
+
+      As an exception to the Sections above, you may also combine or link a
+"work that uses the Library" with the Library to produce a work containing
+portions of the Library, and distribute that work under terms of your choice,
+provided that the terms permit modification of the work for the customer's own
+use and reverse engineering for debugging such modifications.
+
+      You must give prominent notice with each copy of the work that the Library
+is used in it and that the Library and its use are covered by this License. You
+must supply a copy of this License. If the work during execution displays
+copyright notices, you must include the copyright notice for the Library among
+them, as well as a reference directing the user to the copy of this License.
+Also, you must do one of these things:
+         1. Accompany the work with the complete corresponding machine-readable
+source code for the Library including whatever changes were used in the work
+(which must be distributed under Sections 1 and 2 above); and, if the work is an
+executable linked with the Library, with the complete machine-readable "work
+that uses the Library", as object code and/or source code, so that the user can
+modify the Library and then relink to produce a modified executable containing
+the modified Library. (It is understood that the user who changes the contents
+of definitions files in the Library will not necessarily be able to recompile
+the application to use the modified definitions.) .
+         2. Use a suitable shared library mechanism for linking with the
+Library. A suitable mechanism is one that (1) uses at run time a copy of the
+library already present on the user's computer system, rather than copying
+library functions into the executable, and (2) will operate properly with a
+modified version of the library, if the user installs one, as long as the
+modified version is interface-compatible with the version that the work was made
+with.
+         3. Accompany the work with a written offer, valid for at least three
+years, to give the same user the materials specified in Subsection 6a, above,
+for a charge no more than the cost of performing this distribution.
+         4. If distribution of the work is made by offering access to copy from
+a designated place, offer equivalent access to copy the above specified
+materials from the same place.
+         5. Verify that the user has already received a copy of these materials
+or that you have already sent this user a copy.
+
+      For an executable, the required form of the "work that uses the Library"
+must include any data and utility programs needed for reproducing the executable
+from it. However, as a special exception, the materials to be distributed need
+not include anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the operating
+system on which the executable runs, unless that component itself accompanies
+the executable.
+
+      It may happen that this requirement contradicts the license restrictions
+of other proprietary libraries that do not normally accompany the operating
+system. Such a contradiction means you cannot use both them and the Library
+together in an executable that you distribute.
+   7.
+
+      You may place library facilities that are a work based on the Library
+side-by-side in a single library together with other library facilities not
+covered by this License, and distribute such a combined library, provided that
+the separate distribution of the work based on the Library and of the other
+library facilities is otherwise permitted, and provided that you do these two
+things:
+         1.
+
+            Accompany the combined library with a copy of the same work based on
+the Library, uncombined with any other library facilities. This must be
+distributed under the terms of the Sections above.
+         2.
+
+            Give prominent notice with the combined library of the fact that
+part of it is a work based on the Library, and explaining where to find the
+accompanying uncombined form of the same work.
+   8.
+
+      You may not copy, modify, sublicense, link with, or distribute the Library
+except as expressly provided under this License. Any attempt otherwise to copy,
+modify, sublicense, link with, or distribute the Library is void, and will
+automatically terminate your rights under this License. However, parties who
+have received copies, or rights, from you under this License will not have their
+licenses terminated so long as such parties remain in full compliance.
+   9.
+
+      You are not required to accept this License, since you have not signed it.
+However, nothing else grants you permission to modify or distribute the Library
+or its derivative works. These actions are prohibited by law if you do not
+accept this License. Therefore, by modifying or distributing the Library (or any
+work based on the Library), you indicate your acceptance of this License to do
+so, and all its terms and conditions for copying, distributing or modifying the
+Library or works based on it.
+  10.
+
+      Each time you redistribute the Library (or any work based on the Library),
+the recipient automatically receives a license from the original licensor to
+copy, distribute, link with or modify the Library subject to these terms and
+conditions. You may not impose any further restrictions on the recipients'
+exercise of the rights granted herein. You are not responsible for enforcing
+compliance by third parties with this License.
+  11.
+
+      If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues), conditions
+are imposed on you (whether by court order, agreement or otherwise) that
+contradict the conditions of this License, they do not excuse you from the
+conditions of this License. If you cannot distribute so as to satisfy
+simultaneously your obligations under this License and any other pertinent
+obligations, then as a consequence you may not distribute the Library at all.
+For example, if a patent license would not permit royalty-free redistribution of
+the Library by all those who receive copies directly or indirectly through you,
+then the only way you could satisfy both it and this License would be to refrain
+entirely from distribution of the Library.
+
+      If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply, and
+the section as a whole is intended to apply in other circumstances.
+
+      It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any such
+claims; this section has the sole purpose of protecting the integrity of the
+free software distribution system which is implemented by public license
+practices. Many people have made generous contributions to the wide range of
+software distributed through that system in reliance on consistent application
+of that system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot impose
+that choice.
+
+      This section is intended to make thoroughly clear what is believed to be a
+consequence of the rest of this License.
+  12.
+
+      If the distribution and/or use of the Library is restricted in certain
+countries either by patents or by copyrighted interfaces, the original copyright
+holder who places the Library under this License may add an explicit
+geographical distribution limitation excluding those countries, so that
+distribution is permitted only in or among countries not thus excluded. In such
+case, this License incorporates the limitation as if written in the body of this
+License.
+  13.
+
+      The Free Software Foundation may publish revised and/or new versions of
+the Lesser General Public License from time to time. Such new versions will be
+similar in spirit to the present version, but may differ in detail to address
+new problems or concerns.
+
+      Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and "any later
+version", you have the option of following the terms and conditions either of
+that version or of any later version published by the Free Software Foundation.
+If the Library does not specify a license version number, you may choose any
+version ever published by the Free Software Foundation.
+  14.
+
+      If you wish to incorporate parts of the Library into other free programs
+whose distribution conditions are incompatible with these, write to the author
+to ask for permission. For software which is copyrighted by the Free Software
+Foundation, write to the Free Software Foundation; we sometimes make exceptions
+for this. Our decision will be guided by the two goals of preserving the free
+status of all derivatives of our free software and of promoting the sharing and
+reuse of software generally.
+
+No Warranty
+
+  15.
+
+      Because the library is licensed free of charge, there is no warranty for
+the library, to the extent permitted by applicable law. Except when otherwise
+stated in writing the copyright holders and/or other parties provide the library
+"as is" without warranty of any kind, either expressed or implied, including,
+but not limited to, the implied warranties of merchantability and fitness for a
+particular purpose. The entire risk as to the quality and performance of the
+library is with you. Should the library prove defective, you assume the cost of
+all necessary servicing, repair or correction.
+  16.
+
+      In no event unless required by applicable law or agreed to in writing will
+any copyright holder, or any other party who may modify and/or redistribute the
+library as permitted above, be liable to you for damages, including any general,
+special, incidental or consequential damages arising out of the use or inability
+to use the library (including but not limited to loss of data or data being
+rendered inaccurate or losses sustained by you or third parties or a failure of
+the library to operate with any other software), even if such holder or other
+party has been advised of the possibility of such damages.
+
+
+
+The following software may be included in this product: libcurl; Use of any of this software is governed by the terms of the license below:
+Daniel Stenberg
+libcurl
+Copyright (C) 1998-2001, Daniel Stenberg, , et al. 
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. 
+In order to be useful for every potential user, the curl and libcurl are dual-licensed under the MPL and the MIT/X-derivate licenses. 
+You may opt to use, copy, modify, merge, publish, distribute and/or sell copies of the Software, and permit persons to whom the Software is furnished to do so, under the terms of the MPL or the MIT/X-derivate licenses. You may pick one of these licenses. The files MITX.txt and MPL-1.1.txt contain the license texts. 
+As a courtesy to the open-source and free software community, we ask you to dual-license any modifications that you make as well, under the terms of this document. 
+Please remember to always keep the licensing information included in individual source files up-to-date, so as to avoid misleading anyone as to the status of these files. 
+I will use a submission policy according to which I will only enter contributions into the CVS tree if the contributor agrees to both licenses and this dual-license approach. 
+
+The following software may be included in this product: Afrikaans dictionary; Use of any of this software is governed by the terms of the license below:
+Friedel Wolff
+Afrikaans dictionary
+
+Jump to LGPL
+
+The following software may be included in this product: Stavekontrolden (Danish Spellchecker); Use of any of this software is governed by the terms of the license below:
+Finn Gruwier Larsen
+Stavekontrolden (Danish Spellchecker) (LGPL v2.1)
+
+jump to GNU Lesser General Public License
+
+The following software may be included in this product: Slovenian spellcheck dictionary; Use of any of this software is governed by the terms of the license below:
+Jaak Pruulmann
+Estonian dictionaries
+
+Gnu Lesser General Public License
+
+The following software may be included in this product: French dictionary; Use of any of this software is governed by the terms of the license below:
+dico.savant@free.fr
+French dictionary
+
+jump to Mozilla Public License
+
+The following software may be included in this product: Italian dictionary; Use of any of this software is governed by the terms of the license below:
+Davide Prina
+Italian dictionary
+
+Jump to GPL
+
+The following software may be included in this product: MySpell-ku (Kurdish Spellchecker); Use of any of this software is governed by the terms of the license below:
+Erdal Ronahi
+MySpell-ku (Kurdish Spellchecker) (LGPL v2.1)
+
+jump to GNU Lesser General Public License
+
+The following software may be included in this product: Lithuanian spelling dictionary; Use of any of this software is governed by the terms of the license below:
+Albertas Agejevas
+Lithuaninian spelling dictionary
+
+Copyright (c) Albertas Agejevas , 2000, 2001 
+All rights reserved. 
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 
+3. Neither the name of the Albertas Agejevas nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. 
+THIS SOFTWARE IS PROVIDED BY ALBERTAS AGEJEVAS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ALBERTAS AGEJEVAS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+
+The following software may be included in this product: 'Nepali dictionares; Use of any of this software is governed by the terms of the license below:
+Madan Puraskar Pustkalaya
+Nepali dictionaries
+
+jump to GNU Lesser General Public License
+
+The following software may be included in this product: Polish spelling dictionary; Use of any of this software is governed by the terms of the license below:
+Marek Futrega
+Polish spelling dictionary
+
+jump to Mozilla Public License
+
+The following software may be included in this product: Slovak dictionary; Use of any of this software is governed by the terms of the license below:
+Zdenko Podobny
+Slovak dictionary
+
+jump to Mozilla Public License
+
+The following software may be included in this product: Slovenian spellcheck dictionary; Use of any of this software is governed by the terms of the license below:
+Ales Kosir
+Slovenian spellcheck dictionary
+
+Gnu Lesser General Public License
+
+The following software may be included in this product: dictionaries for South African English; Use of any of this software is governed by the terms of the license below:
+David Bartlett and Andrew Brown
+dictionaries for South African English
+
+jump to GNU Lesser General Public License
+
+The following software may be included in this product: Swedish dictionary; Use of any of this software is governed by the terms of the license below:
+Göran Anderson
+Swedish dictionary
+
+jump to GNU Lesser General Public License
+
+The following software may be included in this product: expat XML Parser Toolkit; Use of any of this software is governed by the terms of the license below:
+James Clark
+expat XML Parser Toolkit
+Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper 
+Copyright (c) 2001, 2002, 2003 Expat maintainers. 
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: 
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+
+The following software may be included in this product: Freetype; Use of any of this software is governed by the terms of the license below:
+Freetype Project
+Freetype Library
+
+Legal Terms 
+=========== 
+
+0. Definitions 
+-------------- 
+Throughout this license, the terms `package', `FreeType Project', and `FreeType archive' refer to the set of files originally distributed by the authors (David Turner, Robert Wilhelm, and Werner Lemberg) as the `FreeType Project', be they named as alpha, beta or final release. 
+`You' refers to the licensee, or person using the project, where `using' is a generic term including compiling the project's source code as well as linking it to form a `program' or `executable'. This program is referred to as `a program using the FreeType engine'. 
+This license applies to all files distributed in the original FreeType Project, including all source code, binaries and documentation, unless otherwise stated in the file in its original, unmodified form as distributed in the original archive. If you are unsure whether or not a particular file is covered by this license, you must contact us to verify this. 
+The FreeType Project is copyright (C) 1996-2000 by David Turner, Robert Wilhelm, and Werner Lemberg. All rights reserved except as specified below. 
+
+1. No Warranty 
+-------------- 
+THE FREETYPE PROJECT IS PROVIDED `AS IS' WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT WILL ANY OF THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY DAMAGES CAUSED BY THE USE OR THE INABILITY TO USE, OF THE FREETYPE PROJECT. 
+
+2. Redistribution 
+----------------- 
+This license grants a worldwide, royalty-free, perpetual and irrevocable right and license to use, execute, perform, compile, display, copy, create derivative works of, distribute and sublicense the FreeType Project (in both source and object code forms) and derivative works thereof for any purpose; and to authorize others to exercise some or all of the rights granted herein, subject to the following conditions: 
+o Redistribution of source code must retain this license file (`FTL.TXT') unaltered; any additions, deletions or changes to the original files must be clearly indicated in accompanying documentation. The copyright notices of the unaltered, original files must be preserved in all copies of source files. 
+o Redistribution in binary form must provide a disclaimer that states that the software is based in part of the work of the FreeType Team, in the distribution documentation. We also encourage you to put an URL to the FreeType web page in your documentation, though this isn't mandatory. 
+
+These conditions apply to any software derived from or based on the FreeType Project, not just the unmodified files. If you use our work, you must acknowledge us. However, no fee need be paid to us. 
+
+3. Advertising 
+-------------- 
+Neither the FreeType authors and contributors nor you shall use the name of the other for commercial, advertising, or promotional purposes without specific prior written permission. 
+We suggest, but do not require, that you use one or more of the following phrases to refer to this software in your documentation or advertising materials: `FreeType Project', `FreeType Engine', `FreeType library', or `FreeType Distribution'. 
+As you have not signed this license, you are not required to accept it. However, as the FreeType Project is copyrighted material, only this license, or another one contracted with the authors, grants you the right to use, distribute, and modify it. Therefore, by using, distributing, or modifying the FreeType Project, you indicate that you understand and accept all the terms of this license. 
+
+4. Contacts 
+----------- 
+There are two mailing lists related to FreeType: 
+o freetype@freetype.org 
+Discusses general use and applications of FreeType, as well as future and wanted additions to the library and distribution. If you are looking for support, start in this list if you haven't found anything to help you in the documentation. 
+o devel@freetype.org 
+Discusses bugs, as well as engine internals, design issues, specific licenses, porting, etc. 
+o http://www.freetype.org 
+Holds the current FreeType web page, which will allow you to download our latest development version and read online documentation. 
+
+You can also contact us individually at: 
+
+David Turner 
+Robert Wilhelm 
+Werner Lemberg 
+
+The following software may be included in this product: GTK+ (The Gimp Toolkit); Use of any of this software is governed by the terms of the license below:
+gimp.org
+The Gimp Toolkit (GTK+)
+jump to LGPL
+
+The following software may be included in this product:HSQL Database Engine; Use of any of this software is governed by the terms of the license below:
+Thomas Mueller and the Hypersonic SQL Group: 
+HSQLDB
+
+ORIGINAL LICENSE (a.k.a. "hypersonic_lic.txt")
+For content, code, and products originally developed by Thomas Mueller and the Hypersonic SQL Group:
+
+Copyright (c) 1995-2000 by the Hypersonic SQL Group.
+All rights reserved. 
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+Neither the name of the Hypersonic SQL Group nor the names of its
+contributors may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE HYPERSONIC SQL GROUP, 
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+This software consists of voluntary contributions made by many individuals on behalf of the
+Hypersonic SQL Group.
+For work added by the HSQL Development Group (a.k.a. hsqldb_lic.txt):
+Copyright (c) 2001-2004, The HSQL Development Group
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+Neither the name of the HSQL Development Group nor the names of its
+contributors may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, 
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+The following software may be included in this product: Polish hyphenation dictionary; Use of any of this software is governed by the terms of the license below:
+Bence Nagy
+Hungarian hyphenation dictionary
+
+Lesser Gnu Library License
+
+The following software may be included in this product: Lithuanian pattern for hyphenation; Use of any of this software is governed by the terms of the license below:
+n/a
+Lithuanian pattern for hyphenation
+
+jump to the LaTeX Project Public License
+
+The following software may be included in this product: Polish hyphenation dictionary; Use of any of this software is governed by the terms of the license below:
+Adam Polaczynski
+Polish hyphenation dictionary
+
+Lesser Gnu Library License
+
+The following software may be included in this product: Slovenian pattern for hyphenation; Use of any of this software is governed by the terms of the license below:
+Matjaz Vrecko
+Slovenian pattern for hyphenation
+
+Lesser Gnu Library License
+
+The following software may be included in this product: Zulu hyphenation dictionary; Use of any of this software is governed by the terms of the license below:
+Friedel Wolff
+Zulu hyphenation dictionary
+
+Lesser Gnu Library License
+
+The following software may be included in this product: ICU; Use of any of this software is governed by the terms of the license below:
+International Business Machine Corporation (IBM)
+ICU
+ICU License - ICU 1.8.1 and later
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (c) 1995-2002 International Business Machines Corporation and others
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, provided that the above
+copyright notice(s) and this permission notice appear in all copies of
+the Software and that both the above copyright notice(s) and this
+permission notice appear in supporting documentation.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+of the copyright holder.
+
+--------------------------------------------------------------------------------
+All trademarks and registered trademarks mentioned herein are the property of their respective owners.
+
+The following software may be included in this product: JDOM; Use of any of this software is governed by the terms of the license below:
+Jason Hunter, Brett McLaughlin
+JDOM
+Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. All rights reserved. 
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 
+1. Redistributions of source code must retain the above copyright notice, this list of conditions, and the following disclaimer. 
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions, and the disclaimer that follows these conditions in the documentation and/or other materials provided with the distribution. 
+3. The name "JDOM" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact . 
+4. Products derived from this software may not be called "JDOM", nor may "JDOM" appear in their name, without prior written permission from the JDOM Project Management . 
+In addition, we request (but do not require) that you include in the end-user documentation provided with the redistribution and/or in the software itself an acknowledgement equivalent to the following: 
+"This product includes software developed by the JDOM Project (http://www.jdom.org/)." 
+Alternatively, the acknowledgment may be graphical using the logos available at http://www.jdom.org/images/logos. 
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+This software consists of voluntary contributions made by many individuals on behalf of the JDOM Project and was originally created by Jason Hunter and Brett McLaughlin . For more information on the JDOM Project, please see . 
+
+The following software may be included in this product: IJG JPEG Library; Use of any of this software is governed by the terms of the license below:
+Independent JPEG Group (IJG)
+IJG JPEG Library
+LEGAL ISSUES
+============
+
+In plain English:
+
+1. We don't promise that this software works.  (But if you find any bugs,
+   please let us know!)
+2. You can use this software for whatever you want.  You don't have to pay us.
+3. You may not pretend that you wrote this software.  If you use it in a
+   program, you must acknowledge somewhere in your documentation that
+   you've used the IJG code.
+
+In legalese:
+
+The authors make NO WARRANTY or representation, either express or implied,
+with respect to this software, its quality, accuracy, merchantability, or
+fitness for a particular purpose.  This software is provided "AS IS", and you,
+its user, assume the entire risk as to its quality and accuracy.
+
+This software is copyright (C) 1991-1998, Thomas G. Lane.
+All Rights Reserved except as specified below.
+
+Permission is hereby granted to use, copy, modify, and distribute this
+software (or portions thereof) for any purpose, without fee, subject to these
+conditions:
+(1) If any part of the source code for this software is distributed, then this
+README file must be included, with this copyright and no-warranty notice
+unaltered; and any additions, deletions, or changes to the original files
+must be clearly indicated in accompanying documentation.
+(2) If only executable code is distributed, then the accompanying
+documentation must state that "this software is based in part on the work of
+the Independent JPEG Group".
+(3) Permission for use of this software is granted only if the user accepts
+full responsibility for any undesirable consequences; the authors accept
+NO LIABILITY for damages of any kind.
+
+These conditions apply to any software derived from or based on the IJG code,
+not just to the unmodified library.  If you use our work, you ought to
+acknowledge us.
+
+Permission is NOT granted for the use of any IJG author's name or company name
+in advertising or publicity relating to this software or products derived from
+it.  This software may be referred to only as "the Independent JPEG Group's
+software".
+
+We specifically permit and encourage the use of this software as the basis of
+commercial products, provided that all warranty or liability claims are
+assumed by the product vendor.
+
+
+ansi2knr.c is included in this distribution by permission of L. Peter Deutsch,
+sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA.
+ansi2knr.c is NOT covered by the above copyright and conditions, but instead
+by the usual distribution terms of the Free Software Foundation; principally,
+that you must include source code if you redistribute it.  (See the file
+ansi2knr.c for full details.)  However, since ansi2knr.c is not needed as part
+of any program generated from the IJG code, this does not limit you more than
+the foregoing paragraphs do.
+
+The Unix configuration script "configure" was produced with GNU Autoconf.
+It is copyright by the Free Software Foundation but is freely distributable.
+The same holds for its supporting scripts (config.guess, config.sub,
+ltconfig, ltmain.sh).  Another support script, install-sh, is copyright
+by M.I.T. but is also freely distributable.
+
+It appears that the arithmetic coding option of the JPEG spec is covered by
+patents owned by IBM, AT&T, and Mitsubishi.  Hence arithmetic coding cannot
+legally be used without obtaining one or more licenses.  For this reason,
+support for arithmetic coding has been removed from the free JPEG software.
+(Since arithmetic coding provides only a marginal gain over the unpatented
+Huffman mode, it is unlikely that very many implementations will support it.)
+So far as we are aware, there are no patent restrictions on the remaining
+code.
+
+The IJG distribution formerly included code to read and write GIF files.
+To avoid entanglement with the Unisys LZW patent, GIF reading support has
+been removed altogether, and the GIF writer has been simplified to produce
+"uncompressed GIFs".  This technique does not use the LZW algorithm; the
+resulting GIF files are larger than usual, but are readable by all standard
+GIF decoders.
+
+We are required to state that
+    "The Graphics Interchange Format(c) is the Copyright property of
+    CompuServe Incorporated.  GIF(sm) is a Service Mark property of
+    CompuServe Incorporated."
+
+
+The following software may be included in this product: libegg; Use of any of this software is governed by the terms of the license below:
+Anders Carlson 
+libegg
+jump to LGPL
+
+The following software may be included in this product: libmspack; Use of any of this software is governed by the terms of the license below:
+Stuart Caie 
+libmspack
+jump to LGPL
+
+The following software may be included in this product: Redland RDF Library librdf; Use of any of this software is governed by the terms of the license below:
+Dave Beckett
+librdf
+jump to LGPL
+
+The following software may be included in this product: GNU ISO C++ Library; Use of any of this software is governed by the terms of the license below:
+Free Software Foundation, Inc.
+GNU ISO C++ Library
+
+Jump to GPL
+GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    
+    Copyright (C)   
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  , 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+
+Additional License(s)
+
+libstdc++:
+// Explicit instantiation file.
+
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
+// Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307,
+// USA.
+
+// As a special exception, you may use this file as part of a free
+software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you
+compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be
+covered by
+// the GNU General Public License.
+
+libgcc:
+//
+// ISO C++ 14882:
+//
+
+/* Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+   Contributed by Jakub Jelinek .
+
+   This file is part of GNU CC.
+
+   GNU CC is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   GNU CC is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GNU CC; see the file COPYING.  If not, write to
+   the Free Software Foundation, 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/* As a special exception, if you link this library with other files,
+   some of which are compiled with GCC, to produce an executable,
+   this library does not by itself cause the resulting executable
+   to be covered by the GNU General Public License.
+   This exception does not however invalidate any other reasons why
+   the executable file might be covered by the GNU General Public
+License.  */
+
+/* Locate the FDE entry for a given address, using PT_GNU_EH_FRAME ELF
+   segment and dl_iterate_phdr to avoid register/deregister calls at
+   DSO load/unload.  */
+
+
+The following software may be included in this product: libtextcat; Use of any of this software is governed by the terms of the license below:
+WiseGuys Internet B.V.
+libtextcat
+
+Copyright (c) 2003, WiseGuys Internet B.V. 
+All rights reserved. 
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 
+- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 
+- Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 
+- Neither the name of the WiseGuys Internet B.V. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+
+The following software may be included in this product: libwpd; Use of any of this software is governed by the terms of the license below:
+William LaChance
+libwpd
+jump to LGPL
+Except where otherwise noted in the source code (trio files, hash.c and list.c) 
+
+The following software may be included in this product: libxml2; Use of any of this software is governed by the terms of the license below:
+Daniel Veillard
+libxml2
+Copyright (C) 1998-2002 Daniel Veillard. All Rights Reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is fur- nished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Except as contained in this notice, the name of Daniel Veillard shall not be used in advertising or otherwise to promote the sale, use or other deal- ings in this Software without prior written authorization from him. 
+
+The following software may be included in this product: XML Security Library; Use of any of this software is governed by the terms of the license below:
+Aleksey Sanin
+XML Security Library
+
+XML Security Library
+
+Use of any of this software is governed by the terms of the license below:
+
+Please note: We do not use all libraries of the project, but only:
+- xmlsec-core; License: MIT
+- xmlsec-nss; License: GPL + MPL 
+
+-------------------------------------------------
+The MIT License
+
+Copyright (c)  
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-------------------------------------------------------------------
+The GNU General Public License (GPL)
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share
+and change it. By contrast, the GNU General Public License is intended to
+guarantee your freedom to share and change free software--to make sure the
+software is free for all its users. This General Public License applies to most
+of the Free Software Foundation's software and to any other program whose
+authors commit to using it. (Some other Free Software Foundation software is
+covered by the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our
+General Public Licenses are designed to make sure that you have the freedom to
+distribute copies of free software (and charge for this service if you wish),
+that you receive source code or can get it if you want it, that you can change
+the software or use pieces of it in new free programs; and that you know you can
+do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to deny
+you these rights or to ask you to surrender the rights. These restrictions
+translate to certain responsibilities for you if you distribute copies of the
+software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for a
+fee, you must give the recipients all the rights that you have. You must make
+sure that they, too, receive or can get the source code. And you must show them
+these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2) offer
+you this license which gives you legal permission to copy, distribute and/or
+modify the software.
+
+Also, for each author's protection and ours, we want to make certain that
+everyone understands that there is no warranty for this free software. If the
+software is modified by someone else and passed on, we want its recipients to
+know that what they have is not the original, so that any problems introduced by
+others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We wish
+to avoid the danger that redistributors of a free program will individually
+obtain patent licenses, in effect making the program proprietary. To prevent
+this, we have made it clear that any patent must be licensed for everyone's free
+use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification follow.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice
+placed by the copyright holder saying it may be distributed under the terms of
+this General Public License. The "Program", below, refers to any such program or
+work, and a "work based on the Program" means either the Program or any
+derivative work under copyright law: that is to say, a work containing the
+Program or a portion of it, either verbatim or with modifications and/or
+translated into another language. (Hereinafter, translation is included without
+limitation in the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not covered by
+this License; they are outside its scope. The act of running the Program is not
+restricted, and the output from the Program is covered only if its contents
+constitute a work based on the Program (independent of having been made by
+running the Program). Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as
+you receive it, in any medium, provided that you conspicuously and appropriately
+publish on each copy an appropriate copyright notice and disclaimer of warranty;
+keep intact all the notices that refer to this License and to the absence of any
+warranty; and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may at
+your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus
+forming a work based on the Program, and copy and distribute such modifications
+or work under the terms of Section 1 above, provided that you also meet all of
+these conditions:
+
+    a) You must cause the modified files to carry prominent notices stating that
+you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in whole or
+in part contains or is derived from the Program or any part thereof, to be
+licensed as a whole at no charge to all third parties under the terms of this
+License.
+
+    c) If the modified program normally reads commands interactively when run,
+you must cause it, when started running for such interactive use in the most
+ordinary way, to print or display an announcement including an appropriate
+copyright notice and a notice that there is no warranty (or else, saying that
+you provide a warranty) and that users may redistribute the program under these
+conditions, and telling the user how to view a copy of this License. (Exception:
+if the Program itself is interactive but does not normally print such an
+announcement, your work based on the Program is not required to print an
+announcement.)
+
+These requirements apply to the modified work as a whole. If identifiable
+sections of that work are not derived from the Program, and can be reasonably
+considered independent and separate works in themselves, then this License, and
+its terms, do not apply to those sections when you distribute them as separate
+works. But when you distribute the same sections as part of a whole which is a
+work based on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the entire whole,
+and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your
+rights to work written entirely by you; rather, the intent is to exercise the
+right to control the distribution of derivative or collective works based on the
+Program.
+
+In addition, mere aggregation of another work not based on the Program with the
+Program (or with a work based on the Program) on a volume of a storage or
+distribution medium does not bring the other work under the scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under Section
+2) in object code or executable form under the terms of Sections 1 and 2 above
+provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable source
+code, which must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three years, to
+give any third party, for a charge no more than your cost of physically
+performing source distribution, a complete machine-readable copy of the
+corresponding source code, to be distributed under the terms of Sections 1 and 2
+above on a medium customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer to
+distribute corresponding source code. (This alternative is allowed only for
+noncommercial distribution and only if you received the program in object code
+or executable form with such an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for making
+modifications to it. For an executable work, complete source code means all the
+source code for all modules it contains, plus any associated interface
+definition files, plus the scripts used to control compilation and installation
+of the executable. However, as a special exception, the source code distributed
+need not include anything that is normally distributed (in either source or
+binary form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component itself
+accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the source code
+from the same place counts as distribution of the source code, even though third
+parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as
+expressly provided under this License. Any attempt otherwise to copy, modify,
+sublicense or distribute the Program is void, and will automatically terminate
+your rights under this License. However, parties who have received copies, or
+rights, from you under this License will not have their licenses terminated so
+long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it.
+However, nothing else grants you permission to modify or distribute the Program
+or its derivative works. These actions are prohibited by law if you do not
+accept this License. Therefore, by modifying or distributing the Program (or any
+work based on the Program), you indicate your acceptance of this License to do
+so, and all its terms and conditions for copying, distributing or modifying the
+Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program),
+the recipient automatically receives a license from the original licensor to
+copy, distribute or modify the Program subject to these terms and conditions.
+You may not impose any further restrictions on the recipients' exercise of the
+rights granted herein. You are not responsible for enforcing compliance by third
+parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent infringement
+or for any other reason (not limited to patent issues), conditions are imposed
+on you (whether by court order, agreement or otherwise) that contradict the
+conditions of this License, they do not excuse you from the conditions of this
+License. If you cannot distribute so as to satisfy simultaneously your
+obligations under this License and any other pertinent obligations, then as a
+consequence you may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by all those
+who receive copies directly or indirectly through you, then the only way you
+could satisfy both it and this License would be to refrain entirely from
+distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply and the
+section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or
+other property right claims or to contest validity of any such claims; this
+section has the sole purpose of protecting the integrity of the free software
+distribution system, which is implemented by public license practices. Many
+people have made generous contributions to the wide range of software
+distributed through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing to
+distribute software through any other system and a licensee cannot impose that
+choice.
+
+This section is intended to make thoroughly clear what is believed to be a
+consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain
+countries either by patents or by copyrighted interfaces, the original copyright
+holder who places the Program under this License may add an explicit
+geographical distribution limitation excluding those countries, so that
+distribution is permitted only in or among countries not thus excluded. In such
+case, this License incorporates the limitation as if written in the body of this
+License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the
+General Public License from time to time. Such new versions will be similar in
+spirit to the present version, but may differ in detail to address new problems
+or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies
+a version number of this License which applies to it and "any later version",
+you have the option of following the terms and conditions either of that version
+or of any later version published by the Free Software Foundation. If the
+Program does not specify a version number of this License, you may choose any
+version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs
+whose distribution conditions are different, write to the author to ask for
+permission. For software which is copyrighted by the Free Software Foundation,
+write to the Free Software Foundation; we sometimes make exceptions for this.
+Our decision will be guided by the two goals of preserving the free status of
+all derivatives of our free software and of promoting the sharing and reuse of
+software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE
+PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED
+IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS
+IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
+ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE
+PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
+SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY
+TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
+THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible use
+to the public, the best way to achieve this is to make it free software which
+everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to attach
+them to the start of each source file to most effectively convey the exclusion
+of warranty; and each file should have at least the "copyright" line and a
+pointer to where the full notice is found.
+
+    one line to give the program's name and a brief idea of what it does.
+    Copyright (C)
+
+    This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2 of the License, or (at your option) any
+later version.
+
+    This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place, Suite 330, Boston, MA 02111-1307 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this when it
+starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author Gnomovision comes
+with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software,
+and you are welcome to redistribute it under certain conditions; type `show c'
+for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may be
+called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your school,
+if any, to sign a "copyright disclaimer" for the program, if necessary. Here is
+a sample; alter the names:
+
+    Yoyodyne, Inc., hereby disclaims all copyright interest
+    in the program `Gnomovision' (which makes passes at compilers)
+    written by James Hacker.
+
+    signature of Ty Coon, 1 April 1989
+    Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may consider
+it more useful to permit linking proprietary applications with the library. If
+this is what you want to do, use the GNU Library General Public License instead
+of this License.
+----------------------------------------------------------
+Mozilla Public License Version 1.0
+
+1. Definitions.
+
+      1.1. "Contributor" means each entity that creates or contributes to the
+creation of Modifications.
+
+      1.2. "Contributor Version" means the combination of the Original Code,
+prior Modifications used by a Contributor, and the Modifications made by that
+particular Contributor.
+
+      1.3. "Covered Code" means the Original Code or Modifications or the
+combination of the Original Code and Modifications, in each case including
+portions thereof.
+
+      1.4. "Electronic Distribution Mechanism" means a mechanism generally
+accepted in the software development community for the electronic transfer of data.
+
+      1.5. "Executable" means Covered Code in any form other than Source Code.
+
+      1.6. "Initial Developer" means the individual or entity identified as the
+Initial Developer in the Source Code notice required by Exhibit A.
+
+      1.7. "Larger Work" means a work which combines Covered Code or portions
+thereof with code not governed by the terms of this License.
+
+      1.8. "License" means this document.
+
+      1.9. "Modifications" means any addition to or deletion from the substance
+or structure of either the Original Code or any previous Modifications. When
+Covered Code is released as a series of files, a Modification is:
+
+            A. Any addition to or deletion from the contents of a file
+containing Original Code or previous Modifications.
+
+            B. Any new file that contains any part of the Original Code or
+previous Modifications. 
+
+      1.10. "Original Code" means Source Code of computer software code which is
+described in the Source Code notice required by Exhibit A as Original Code, and
+which, at the time of its release under this License is not already Covered Code
+governed by this License.
+
+      1.11. "Source Code" means the preferred form of the Covered Code for
+making modifications to it, including all modules it contains, plus any
+associated interface definition files, scripts used to control compilation and
+installation of an Executable, or a list of source code differential comparisons
+against either the Original Code or another well known, available Covered Code
+of the Contributor's choice. The Source Code can be in a compressed or archival
+form, provided the appropriate decompression or de-archiving software is widely
+available for no charge.
+
+      1.12. "You" means an individual or a legal entity exercising rights under,
+and complying with all of the terms of, this License or a future version of this
+License issued under Section 6.1. For legal entities, "You" includes any entity
+which controls, is controlled by, or is under common control with You. For
+purposes of this definition, "control" means (a) the power, direct or indirect,
+to cause the direction or management of such entity, whether by contract or
+otherwise, or (b) ownership of fifty percent (50%) or more of the outstanding
+shares or beneficial ownership of such entity. 
+
+2. Source Code License.
+
+      2.1. The Initial Developer Grant.
+      The Initial Developer hereby grants You a world-wide, royalty-free,
+non-exclusive license, subject to third party intellectual property claims:
+
+            (a) to use, reproduce, modify, display, perform, sublicense and
+distribute the Original Code (or portions thereof) with or without
+Modifications, or as part of a Larger Work; and
+
+            (b) under patents now or hereafter owned or controlled by Initial
+Developer, to make, have made, use and sell ("Utilize") the Original Code (or
+portions thereof), but solely to the extent that any such patent is reasonably
+necessary to enable You to Utilize the Original Code (or portions thereof) and
+not to any greater extent that may be necessary to Utilize further Modifications
+or combinations. 
+
+      2.2. Contributor Grant.
+      Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license, subject to third party intellectual property claims:
+
+            (a) to use, reproduce, modify, display, perform, sublicense and
+distribute the Modifications created by such Contributor (or portions thereof)
+either on an unmodified basis, with other Modifications, as Covered Code or as
+part of a Larger Work; and
+
+            (b) under patents now or hereafter owned or controlled by
+Contributor, to Utilize the Contributor Version (or portions thereof), but
+solely to the extent that any such patent is reasonably necessary to enable You
+to Utilize the Contributor Version (or portions thereof), and not to any greater
+extent that may be necessary to Utilize further Modifications or combinations. 
+
+3. Distribution Obligations.
+
+      3.1. Application of License.
+      The Modifications which You create or to which You contribute are governed
+by the terms of this License, including without limitation Section 2.2. The
+Source Code version of Covered Code may be distributed only under the terms of
+this License or a future version of this License released under Section 6.1, and
+You must include a copy of this License with every copy of the Source Code You
+distribute. You may not offer or impose any terms on any Source Code version
+that alters or restricts the applicable version of this License or the
+recipients' rights hereunder. However, You may include an additional document
+offering the additional rights described in Section 3.5.
+
+      3.2. Availability of Source Code.
+      Any Modification which You create or to which You contribute must be made
+available in Source Code form under the terms of this License either on the same
+media as an Executable version or via an accepted Electronic Distribution
+Mechanism to anyone to whom you made an Executable version available; and if
+made available via Electronic Distribution Mechanism, must remain available for
+at least twelve (12) months after the date it initially became available, or at
+least six (6) months after a subsequent version of that particular Modification
+has been made available to such recipients. You are responsible for ensuring
+that the Source Code version remains available even if the Electronic
+Distribution Mechanism is maintained by a third party.
+
+      3.3. Description of Modifications.
+      You must cause all Covered Code to which you contribute to contain a file
+documenting the changes You made to create that Covered Code and the date of any
+change. You must include a prominent statement that the Modification is derived,
+directly or indirectly, from Original Code provided by the Initial Developer and
+including the name of the Initial Developer in (a) the Source Code, and (b) in
+any notice in an Executable version or related documentation in which You
+describe the origin or ownership of the Covered Code.
+
+      3.4. Intellectual Property Matters
+
+            (a) Third Party Claims.
+            If You have knowledge that a party claims an intellectual property
+right in particular functionality or code (or its utilization under this
+License), you must include a text file with the source code distribution titled
+"LEGAL" which describes the claim and the party making the claim in sufficient
+detail that a recipient will know whom to contact. If you obtain such knowledge
+after You make Your Modification available as described in Section 3.2, You
+shall promptly modify the LEGAL file in all copies You make available thereafter
+and shall take other steps (such as notifying appropriate mailing lists or
+newsgroups) reasonably calculated to inform those who received the Covered Code
+that new knowledge has been obtained.
+
+            (b) Contributor APIs.
+            If Your Modification is an application programming interface and You
+own or control patents which are reasonably necessary to implement that API, you
+must also include this information in the LEGAL file. 
+
+      3.5. Required Notices.
+      You must duplicate the notice in Exhibit A in each file of the Source
+Code, and this License in any documentation for the Source Code, where You
+describe recipients' rights relating to Covered Code. If You created one or more
+Modification(s), You may add your name as a Contributor to the notice described
+in Exhibit A. If it is not possible to put such notice in a particular Source
+Code file due to its structure, then you must include such notice in a location
+(such as a relevant directory file) where a user would be likely to look for
+such a notice. You may choose to offer, and to charge a fee for, warranty,
+support, indemnity or liability obligations to one or more recipients of Covered
+Code. However, You may do so only on Your own behalf, and not on behalf of the
+Initial Developer or any Contributor. You must make it absolutely clear than any
+such warranty, support, indemnity or liability obligation is offered by You
+alone, and You hereby agree to indemnify the Initial Developer and every
+Contributor for any liability incurred by the Initial Developer or such
+Contributor as a result of warranty, support, indemnity or liability terms You
+offer.
+
+      3.6. Distribution of Executable Versions.
+      You may distribute Covered Code in Executable form only if the
+requirements of Section 3.1-3.5 have been met for that Covered Code, and if You
+include a notice stating that the Source Code version of the Covered Code is
+available under the terms of this License, including a description of how and
+where You have fulfilled the obligations of Section 3.2. The notice must be
+conspicuously included in any notice in an Executable version, related
+documentation or collateral in which You describe recipients' rights relating to
+the Covered Code. You may distribute the Executable version of Covered Code
+under a license of Your choice, which may contain terms different from this
+License, provided that You are in compliance with the terms of this License and
+that the license for the Executable version does not attempt to limit or alter
+the recipient's rights in the Source Code version from the rights set forth in
+this License. If You distribute the Executable version under a different license
+You must make it absolutely clear that any terms which differ from this License
+are offered by You alone, not by the Initial Developer or any Contributor. You
+hereby agree to indemnify the Initial Developer and every Contributor for any
+liability incurred by the Initial Developer or such Contributor as a result of
+any such terms You offer.
+
+      3.7. Larger Works.
+      You may create a Larger Work by combining Covered Code with other code not
+governed by the terms of this License and distribute the Larger Work as a single
+product. In such a case, You must make sure the requirements of this License are
+fulfilled for the Covered Code. 
+
+4. Inability to Comply Due to Statute or Regulation.
+
+      If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Code due to statute or
+regulation then You must: (a) comply with the terms of this License to the
+maximum extent possible; and (b) describe the limitations and the code they
+affect. Such description must be included in the LEGAL file described in Section
+3.4 and must be included with all distributions of the Source Code. Except to
+the extent prohibited by statute or regulation, such description must be
+sufficiently detailed for a recipient of ordinary skill to be able to understand
+it. 
+
+5. Application of this License.
+
+      This License applies to code to which the Initial Developer has attached
+the notice in Exhibit A, and to related Covered Code. 
+
+6. Versions of the License.
+
+      6.1. New Versions.
+      Netscape Communications Corporation ("Netscape") may publish revised
+and/or new versions of the License from time to time. Each version will be given
+a distinguishing version number.
+
+      6.2. Effect of New Versions.
+      Once Covered Code has been published under a particular version of the
+License, You may always continue to use it under the terms of that version. You
+may also choose to use such Covered Code under the terms of any subsequent
+version of the License published by Netscape. No one other than Netscape has the
+right to modify the terms applicable to Covered Code created under this License.
+
+      6.3. Derivative Works.
+      If you create or use a modified version of this License (which you may
+only do in order to apply it to code which is not already Covered Code governed
+by this License), you must (a) rename Your license so that the phrases
+"Mozilla", "MOZILLAPL", "MOZPL", "Netscape", "NPL" or any confusingly similar
+phrase do not appear anywhere in your license and (b) otherwise make it clear
+that your version of the license contains terms which differ from the Mozilla
+Public License and Netscape Public License. (Filling in the name of the Initial
+Developer, Original Code or Contributor in the notice described in Exhibit A
+shall not of themselves be deemed to be modifications of this License.) 
+
+7. DISCLAIMER OF WARRANTY.
+
+      COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
+LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE,
+FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE
+QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE
+PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER
+CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION.
+THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO
+USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. 
+
+8. TERMINATION.
+
+      This License and the rights granted hereunder will terminate automatically
+if You fail to comply with terms herein and fail to cure such breach within 30
+days of becoming aware of the breach. All sublicenses to the Covered Code which
+are properly granted shall survive any termination of this License. Provisions
+which, by their nature, must remain in effect beyond the termination of this
+License shall survive. 
+
+9. LIMITATION OF LIABILITY.
+
+      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
+NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL DEVELOPER, ANY OTHER
+CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH
+PARTIES, BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL,
+INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
+LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR
+MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH
+PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS
+LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
+INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR
+LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND
+LIMITATION MAY NOT APPLY TO YOU. 
+
+10. U.S. GOVERNMENT END USERS.
+
+      The Covered Code is a "commercial item," as that term is defined in 48
+C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software" and
+"commercial computer software documentation," as such terms are used in 48
+C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R.
+227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire
+Covered Code with only those rights set forth herein. 
+
+11. MISCELLANEOUS.
+
+      This License represents the complete agreement concerning subject matter
+hereof. If any provision of this License is held to be unenforceable, such
+provision shall be reformed only to the extent necessary to make it enforceable.
+This License shall be governed by California law provisions (except to the
+extent applicable law, if any, provides otherwise), excluding its
+conflict-of-law provisions. With respect to disputes in which at least one party
+is a citizen of, or an entity chartered or registered to do business in, the
+United States of America: (a) unless otherwise agreed in writing, all disputes
+relating to this License (excepting any dispute relating to intellectual
+property rights) shall be subject to final and binding arbitration, with the
+losing party paying all costs of arbitration; (b) any arbitration relating to
+this Agreement shall be held in Santa Clara County, California, under the
+auspices of JAMS/EndDispute; and (c) any litigation relating to this Agreement
+shall be subject to the jurisdiction of the Federal Courts of the Northern
+District of California, with venue lying in Santa Clara County, California, with
+the losing party responsible for costs, including without limitation, court
+costs and reasonable attorneys fees and expenses. The application of the United
+Nations Convention on Contracts for the International Sale of Goods is expressly
+excluded. Any law or regulation which provides that the language of a contract
+shall be construed against the drafter shall not apply to this License. 
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+      Except in cases where another Contributor has failed to comply with
+Section 3.4, You are responsible for damages arising, directly or indirectly,
+out of Your utilization of rights under this License, based on the number of
+copies of Covered Code you made available, the revenues you received from
+utilizing such rights, and other relevant factors. You agree to work with
+affected parties to distribute responsibility on an equitable basis. 
+
+EXHIBIT A.
+
+      "The contents of this file are subject to the Mozilla Public License
+Version 1.0 (the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
+
+      Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the
+specific language governing rights and limitations under the License.
+
+      The Original Code is ______________________________________.
+
+      The Initial Developer of the Original Code is ________________________.
+Portions created by ______________________ are Copyright (C) ______
+_______________________. All Rights Reserved.
+
+      Contributor(s): ______________________________________." 
+
+
+The following software may be included in this product: libxslt; Use of any of this software is governed by the terms of the license below:
+www.xmlsoft.org
+libxslt
+Copyright (C) 2001-2002 Daniel Veillard. All Rights Reserved. 
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is fur- nished to do so, subject to the following conditions: 
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+Except as contained in this notice, the name of Daniel Veillard shall not be used in advertising or otherwise to promote the sale, use or other deal- ings in this Software without prior written authorization from him. 
+
+The following software may be included in this product: lpsolve; Use of any of this software is governed by the terms of the license below:
+Kjell Eikland and Peter Notebaert 
+lpsolve
+jump to LGPL
+
+The following software may be included in this product: Network Audio System; Use of any of this software is governed by the terms of the license below:
+Network Computer Devices, Inc.
+Network Audio System (NAS)
+Copyright 1995 Network Computing Devices, Inc. Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name Network Computing Devices, Inc. not be used in advertising or publicity pertaining to distribution of this software without specific, written prior permission. 
+
+THIS SOFTWARE IS PROVIDED `AS-IS'. NETWORK COMPUTING DEVICES, INC., DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT LIMITATION ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NONINFRINGEMENT. IN NO EVENT SHALL NETWORK COMPUTING DEVICES, INC., BE LIABLE FOR ANY DAMAGES WHATSOEVER, INCLUDING SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES, INCLUDING LOSS OF USE, DATA, OR PROFITS, EVEN IF ADVISED OF THE POSSIBILITY THEREOF, AND REGARDLESS OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 
+
+The following software may be included in this product: NeoLight 1.1.x; Use of any of this software is governed by the terms of the license below:
+Planamesa, Inc.
+NeoLight
+
+jump to GNU Lesser General Public License
+
+The following software may be included in this product: neon; Use of any of this software is governed by the terms of the license below:
+Joe Orton
+neon
+jump to LGPL
+
+The following software may be included in this product: Network Security Services; Use of any of this software is governed by the terms of the license below:
+The Mozilla Foundation
+Network Security Services (NSS)
+MOZILLA PUBLIC LICENSE 
+Version 1.1 
+
+1. Definitions. 
+1.0.1. "Commercial Use" means distribution or otherwise making the Covered Code available to a third party. 
+1.1. ''Contributor'' means each entity that creates or contributes to the creation of Modifications. 
+1.2. ''Contributor Version'' means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor. 
+1.3. ''Covered Code'' means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof. 
+1.4. ''Electronic Distribution Mechanism'' means a mechanism generally accepted in the software development community for the electronic transfer of data. 
+1.5. ''Executable'' means Covered Code in any form other than Source Code. 
+1.6. ''Initial Developer'' means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A. 
+1.7. ''Larger Work'' means a work which combines Covered Code or portions thereof with code not governed by the terms of this License. 
+1.8. ''License'' means this document. 
+1.8.1. "Licensable" means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. 
+1.9. ''Modifications'' means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is: 
+A. Any addition to or deletion from the contents of a file containing Original Code or previous Modifications. 
+B. Any new file that contains any part of the Original Code or previous Modifications. 
+ 
+1.10. ''Original Code'' means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License. 
+1.10.1. "Patent Claims" means any patent claim(s), now owned or hereafter acquired, including without limitation,  method, process, and apparatus claims, in any patent Licensable by grantor. 
+1.11. ''Source Code'' means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge. 
+1.12. "You'' (or "Your")  means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You'' includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control'' means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
+2. Source Code License. 
+2.1. The Initial Developer Grant. 
+The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims: 
+(a)  under intellectual property rights (other than patent or trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, and/or as part of a Larger Work; and 
+(b) under Patents Claims infringed by the making, using or selling of Original Code, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Code (or portions thereof). 
+ 
+(c) the licenses granted in this Section 2.1(a) and (b) are effective on the date Initial Developer first distributes Original Code under the terms of this License. 
+(d) Notwithstanding Section 2.1(b) above, no patent license is granted: 1) for code that You delete from the Original Code; 2) separate from the Original Code;  or 3) for infringements caused by: i) the modification of the Original Code or ii) the combination of the Original Code with other software or devices. 
+ 
+2.2. Contributor Grant. 
+Subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license 
+  
+(a)  under intellectual property rights (other than patent or trademark) Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger Work; and 
+(b) under Patent Claims infringed by the making, using, or selling of  Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: 1) Modifications made by that Contributor (or portions thereof); and 2) the combination of  Modifications made by that Contributor with its Contributor Version (or portions of such combination). 
+(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first makes Commercial Use of the Covered Code. 
+(d)    Notwithstanding Section 2.2(b) above, no patent license is granted: 1) for any code that Contributor has deleted from the Contributor Version; 2)  separate from the Contributor Version;  3)  for infringements caused by: i) third party modifications of Contributor Version or ii)  the combination of Modifications made by that Contributor with other software  (except as part of the Contributor Version) or other devices; or 4) under Patent Claims infringed by Covered Code in the absence of Modifications made by that Contributor.
+
+3. Distribution Obligations. 
+3.1. Application of License. 
+The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5. 
+3.2. Availability of Source Code. 
+Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party. 
+3.3. Description of Modifications. 
+You must cause all Covered Code to which You contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code. 
+3.4. Intellectual Property Matters 
+(a) Third Party Claims. 
+If Contributor has knowledge that a license under a third party's intellectual property rights is required to exercise the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor must include a text file with the Source Code distribution titled "LEGAL'' which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If Contributor obtains such knowledge after the Modification is made available as described in Section 3.2, Contributor shall promptly modify the LEGAL file in all copies Contributor makes available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained. 
+(b) Contributor APIs. 
+If Contributor's Modifications include an application programming interface and Contributor has knowledge of patent licenses which are reasonably necessary to implement that API, Contributor must also include this information in the LEGAL file. 
+ 
+          (c)    Representations. 
+Contributor represents that, except as disclosed pursuant to Section 3.4(a) above, Contributor believes that Contributor's Modifications are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the rights conveyed by this License.
+
+3.5. Required Notices. 
+You must duplicate the notice in Exhibit A in each file of the Source Code.  If it is not possible to put such notice in a particular Source Code file due to its structure, then You must include such notice in a location (such as a relevant directory) where a user would be likely to look for such a notice.  If You created one or more Modification(s) You may add your name as a Contributor to the notice described in Exhibit A.  You must also duplicate this License in any documentation for the Source Code where You describe recipients' rights or ownership rights relating to Covered Code.  You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer. 
+3.6. Distribution of Executable Versions. 
+You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section 3.2. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code or ownership rights under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer. 
+3.7. Larger Works. 
+You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code.
+4. Inability to Comply Due to Statute or Regulation. 
+If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it.
+5. Application of this License. 
+This License applies to code to which the Initial Developer has attached the notice in Exhibit A and to related Covered Code.
+6. Versions of the License. 
+6.1. New Versions. 
+Netscape Communications Corporation (''Netscape'') may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number. 
+6.2. Effect of New Versions. 
+Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Netscape. No one other than Netscape has the right to modify the terms applicable to Covered Code created under this License. 
+6.3. Derivative Works. 
+If You create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), You must (a) rename Your license so that the phrases ''Mozilla'', ''MOZILLAPL'', ''MOZPL'', ''Netscape'', "MPL", ''NPL'' or any confusingly similar phrase do not appear in your license (except to note that your license differs from this License) and (b) otherwise make it clear that Your version of the license contains terms which differ from the Mozilla Public License and Netscape Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.)
+7. DISCLAIMER OF WARRANTY. 
+COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+8. TERMINATION. 
+8.1.  This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. 
+8.2.  If You initiate litigation by asserting a patent infringement claim (excluding declatory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You file such action is referred to as "Participant")  alleging that: 
+(a)  such Participant's Contributor Version directly or indirectly infringes any patent, then any and all rights granted by such Participant to You under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively, unless if within 60 days after receipt of notice You either: (i)  agree in writing to pay Participant a mutually agreeable reasonable royalty for Your past and future use of Modifications made by such Participant, or (ii) withdraw Your litigation claim with respect to the Contributor Version against such Participant.  If within 60 days of notice, a reasonable royalty and payment arrangement are not mutually agreed upon in writing by the parties or the litigation claim is not withdrawn, the rights granted by Participant to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration of the 60 day notice period specified above. 
+(b)  any software, hardware, or device, other than such Participant's Contributor Version, directly or indirectly infringes any patent, then any rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are revoked effective as of the date You first made, used, sold, distributed, or had made, Modifications made by that Participant. 
+8.3.  If You assert a patent infringement claim against Participant alleging that such Participant's Contributor Version directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license. 
+8.4.  In the event of termination under Sections 8.1 or 8.2 above,  all end user license agreements (excluding distributors and resellers) which have been validly granted by You or any distributor hereunder prior to termination shall survive termination.
+9. LIMITATION OF LIABILITY. 
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+10. U.S. GOVERNMENT END USERS. 
+The Covered Code is a ''commercial item,'' as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of ''commercial computer software'' and ''commercial computer software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein.
+11. MISCELLANEOUS. 
+This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in the United States of America, any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License.
+12. RESPONSIBILITY FOR CLAIMS. 
+As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
+13. MULTIPLE-LICENSED CODE. 
+Initial Developer may designate portions of the Covered Code as “Multiple-Licensed�.  “Multiple-Licensed� means that the Initial Developer permits you to utilize portions of the Covered Code under Your choice of the MPL or the alternative licenses, if any, specified by the Initial Developer in the file described in Exhibit A.
+
+EXHIBIT A -Mozilla Public License. 
+``The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at 
+http://www.mozilla.org/MPL/ 
+Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF 
+ANY KIND, either express or implied. See the License for the specific language governing rights and 
+limitations under the License. 
+The Original Code is ______________________________________. 
+The Initial Developer of the Original Code is ________________________. Portions created by 
+ ______________________ are Copyright (C) ______ _______________________. All Rights 
+Reserved. 
+Contributor(s): ______________________________________. 
+Alternatively, the contents of this file may be used under the terms of the _____ license (the  “[___] License�), in which case the provisions of [______] License are applicable  instead of those above.  If you wish to allow use of your version of this file only under the terms of the [____] License and not to allow others to use your version of this file under the MPL, indicate your decision by deleting  the provisions above and replace  them with the notice and other provisions required by the [___] License.  If you do not delete the provisions above, a recipient may use your version of this file under either the MPL or the [___] License." 
+[NOTE: The text of this Exhibit A may differ slightly from the text of the notices in the Source Code files of the Original Code. You should use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.] 
+
+The following software may be included in this product: OpenSSL; Use of any of this software is governed by the terms of the license below:
+OpenSSL Project
+OpenSSL
+  LICENSE ISSUES
+  ==============
+
+  The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
+  the OpenSSL License and the original SSLeay license apply to the toolkit.
+  See below for the actual license texts. Actually both licenses are BSD-style
+  Open Source licenses. In case of any license issues related to OpenSSL
+  please contact openssl-core@openssl.org.
+
+  OpenSSL License
+  ---------------
+
+/* ====================================================================
+ * Copyright (c) 1998-2007 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+ Original SSLeay License
+ -----------------------
+
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+
+
+The following software may be included in this product:PortAudio - Portable Real-Time Audio Library; Use of any of this software is governed by the terms of the license below:
+Ross Bencina and Phil Burk 
+PortAudio
+PortAudio Portable Real-Time Audio Library 
+Copyright (c) 1999-2000 Ross Bencina and Phil Burk 
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: 
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. 
+Any person wishing to distribute modifications to the Software is requested to send the modifications to the original developer so that they can be incorporated into the canonical version. 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ON INFRINGEMENT. 
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+  
+Plain English Interpretation of the License
+The following is a plain English interpretation of the license. This interpretation is not part of the license and has no legal significance. To understand the full legal implications of the license you should consult the license itself. 
+You can use PortAudio for free in your projects or applications, even commercial applications. 
+You do not have to make your own source available as open-source code just because you used PortAudio. 
+Do not take our copyright information out of the PortAudio source code. 
+If you fix a bug in PortAudio, please send us the fix. 
+You cannot sue us if your program fails because of PortAudio. 
+
+
+The following software may be included in this product: XT; Use of any of this software is governed by the terms of the license below:
+James Clark, Bill Lindsey
+PostgreSQL Database Management System 
+
+(formerly known as Postgres, then as Postgres95) 
+Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group 
+Portions Copyright (c) 1994, The Regents of the University of California 
+Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies. 
+IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. 
+
+The following software may be included in this product: PostScript(R) AFM Files; Use of any of this software is governed by the terms of the license below:
+Adobe
+Printer Description Files
+
+ Copyright 1987-1995 Adobe Systems Incorporated.
+ All Rights Reserved.
+ Permission is granted for redistribution of this file as
+ long as this copyright notice is intact and the contents
+ of the file is not altered in any way from its original form.
+ End of Copyright statement
+
+The following software may be included in this product: Python; Use of any of this software is governed by the terms of the license below:
+Python Software Foundation
+Python
+
+B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
+===============================================================
+
+PSF LICENSE AGREEMENT FOR PYTHON 2.3
+------------------------------------
+
+1. This LICENSE AGREEMENT is between the Python Software Foundation
+("PSF"), and the Individual or Organization ("Licensee") accessing and
+otherwise using Python 2.3 software in source or binary form and its
+associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, PSF
+hereby grants Licensee a nonexclusive, royalty-free, world-wide
+license to reproduce, analyze, test, perform and/or display publicly,
+prepare derivative works, distribute, and otherwise use Python 2.3
+alone or in any derivative version, provided, however, that PSF's
+License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
+2001, 2002, 2003, 2004 Python Software Foundation; All Rights Reserved" are
+retained in Python 2.3 alone or in any derivative version prepared by
+Licensee.
+
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python 2.3 or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python 2.3.
+
+4. PSF is making Python 2.3 available to Licensee on an "AS IS"
+basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.3 WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+2.3 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.3,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. Nothing in this License Agreement shall be deemed to create any
+relationship of agency, partnership, or joint venture between PSF and
+Licensee.  This License Agreement does not grant permission to use PSF
+trademarks or trade name in a trademark sense to endorse or promote
+products or services of Licensee, or any third party.
+
+8. By copying, installing or otherwise using Python 2.3, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
+
+
+BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
+-------------------------------------------
+
+BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
+
+1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
+office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
+Individual or Organization ("Licensee") accessing and otherwise using
+this software in source or binary form and its associated
+documentation ("the Software").
+
+2. Subject to the terms and conditions of this BeOpen Python License
+Agreement, BeOpen hereby grants Licensee a non-exclusive,
+royalty-free, world-wide license to reproduce, analyze, test, perform
+and/or display publicly, prepare derivative works, distribute, and
+otherwise use the Software alone or in any derivative version,
+provided, however, that the BeOpen Python License is retained in the
+Software, alone or in any derivative version prepared by Licensee.
+
+3. BeOpen is making the Software available to Licensee on an "AS IS"
+basis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
+SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
+AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
+DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+5. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+6. This License Agreement shall be governed by and interpreted in all
+respects by the law of the State of California, excluding conflict of
+law provisions.  Nothing in this License Agreement shall be deemed to
+create any relationship of agency, partnership, or joint venture
+between BeOpen and Licensee.  This License Agreement does not grant
+permission to use BeOpen trademarks or trade names in a trademark
+sense to endorse or promote products or services of Licensee, or any
+third party.  As an exception, the "BeOpen Python" logos available at
+http://www.pythonlabs.com/logos.html may be used according to the
+permissions granted on that web page.
+
+7. By copying, installing or otherwise using the software, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
+
+
+CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
+---------------------------------------
+
+1. This LICENSE AGREEMENT is between the Corporation for National
+Research Initiatives, having an office at 1895 Preston White Drive,
+Reston, VA 20191 ("CNRI"), and the Individual or Organization
+("Licensee") accessing and otherwise using Python 1.6.1 software in
+source or binary form and its associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, CNRI
+hereby grants Licensee a nonexclusive, royalty-free, world-wide
+license to reproduce, analyze, test, perform and/or display publicly,
+prepare derivative works, distribute, and otherwise use Python 1.6.1
+alone or in any derivative version, provided, however, that CNRI's
+License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
+1995-2001 Corporation for National Research Initiatives; All Rights
+Reserved" are retained in Python 1.6.1 alone or in any derivative
+version prepared by Licensee.  Alternately, in lieu of CNRI's License
+Agreement, Licensee may substitute the following text (omitting the
+quotes): "Python 1.6.1 is made available subject to the terms and
+conditions in CNRI's License Agreement.  This Agreement together with
+Python 1.6.1 may be located on the Internet using the following
+unique, persistent identifier (known as a handle): 1895.22/1013.  This
+Agreement may also be obtained from a proxy server on the Internet
+using the following URL: http://hdl.handle.net/1895.22/1013".
+
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python 1.6.1 or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python 1.6.1.
+
+4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"
+basis.  CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. This License Agreement shall be governed by the federal
+intellectual property law of the United States, including without
+limitation the federal copyright law, and, to the extent such
+U.S. federal law does not apply, by the law of the Commonwealth of
+Virginia, excluding Virginia's conflict of law provisions.
+Notwithstanding the foregoing, with regard to derivative works based
+on Python 1.6.1 that incorporate non-separable material that was
+previously distributed under the GNU General Public License (GPL), the
+law of the Commonwealth of Virginia shall govern this License
+Agreement only as to issues arising under or with respect to
+Paragraphs 4, 5, and 7 of this License Agreement.  Nothing in this
+License Agreement shall be deemed to create any relationship of
+agency, partnership, or joint venture between CNRI and Licensee.  This
+License Agreement does not grant permission to use CNRI trademarks or
+trade name in a trademark sense to endorse or promote products or
+services of Licensee, or any third party.
+
+8. By clicking on the "ACCEPT" button where indicated, or by copying,
+installing or otherwise using Python 1.6.1, Licensee agrees to be
+bound by the terms and conditions of this License Agreement.
+
+        ACCEPT
+
+
+CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
+--------------------------------------------------
+
+Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
+The Netherlands.  All rights reserved.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Stichting Mathematisch
+Centrum or CWI not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.
+
+STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+The following software may be included in this product: Redland RDF Library librdf; Use of any of this software is governed by the terms of the license below:
+librdf.org 
+librdf
+jump to LGPL
+
+The following software may be included in this product: regexp; Use of any of this software is governed by the terms of the license below:
+Free Software Foundation, Inc. 
+regexp
+jump to LGPL
+
+The following software may be included in this product: Remote Control Wrapper; Use of any of this software is governed by the terms of the license below:
+Martin Kahr
+Remote Control Wrapper
+
+Created by Martin Kahr under a MIT-style license. 
+Copyright (c) 2006/2007 martinkahr.com. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a 
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+The following software may be included in this product: Rhino; Use of any of this software is governed by the terms of the license below:
+Norris Boyd, Patrick Beard
+Rhino
+MOZILLA PUBLIC LICENSE 
+Version 1.1 
+
+1. Definitions. 
+1.0.1. "Commercial Use" means distribution or otherwise making the Covered Code available to a third party. 
+1.1. ''Contributor'' means each entity that creates or contributes to the creation of Modifications. 
+1.2. ''Contributor Version'' means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor. 
+1.3. ''Covered Code'' means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof. 
+1.4. ''Electronic Distribution Mechanism'' means a mechanism generally accepted in the software development community for the electronic transfer of data. 
+1.5. ''Executable'' means Covered Code in any form other than Source Code. 
+1.6. ''Initial Developer'' means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A. 
+1.7. ''Larger Work'' means a work which combines Covered Code or portions thereof with code not governed by the terms of this License. 
+1.8. ''License'' means this document. 
+1.8.1. "Licensable" means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. 
+1.9. ''Modifications'' means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is: 
+A. Any addition to or deletion from the contents of a file containing Original Code or previous Modifications. 
+B. Any new file that contains any part of the Original Code or previous Modifications. 
+ 
+1.10. ''Original Code'' means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License. 
+1.10.1. "Patent Claims" means any patent claim(s), now owned or hereafter acquired, including without limitation,  method, process, and apparatus claims, in any patent Licensable by grantor. 
+1.11. ''Source Code'' means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge. 
+1.12. "You'' (or "Your")  means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You'' includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control'' means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
+2. Source Code License. 
+2.1. The Initial Developer Grant. 
+The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims: 
+(a)  under intellectual property rights (other than patent or trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, and/or as part of a Larger Work; and 
+(b) under Patents Claims infringed by the making, using or selling of Original Code, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Code (or portions thereof). 
+  
+(c) the licenses granted in this Section 2.1(a) and (b) are effective on the date Initial Developer first distributes Original Code under the terms of this License. 
+(d) Notwithstanding Section 2.1(b) above, no patent license is granted: 1) for code that You delete from the Original Code; 2) separate from the Original Code;  or 3) for infringements caused by: i) the modification of the Original Code or ii) the combination of the Original Code with other software or devices. 
+ 
+2.2. Contributor Grant. 
+Subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license 
+  
+(a)  under intellectual property rights (other than patent or trademark) Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger Work; and 
+(b) under Patent Claims infringed by the making, using, or selling of  Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: 1) Modifications made by that Contributor (or portions thereof); and 2) the combination of  Modifications made by that Contributor with its Contributor Version (or portions of such combination). 
+(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first makes Commercial Use of the Covered Code. 
+(d)    Notwithstanding Section 2.2(b) above, no patent license is granted: 1) for any code that Contributor has deleted from the Contributor Version; 2)  separate from the Contributor Version;  3)  for infringements caused by: i) third party modifications of Contributor Version or ii)  the combination of Modifications made by that Contributor with other software  (except as part of the Contributor Version) or other devices; or 4) under Patent Claims infringed by Covered Code in the absence of Modifications made by that Contributor.
+
+3. Distribution Obligations. 
+3.1. Application of License. 
+The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5. 
+3.2. Availability of Source Code. 
+Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party. 
+3.3. Description of Modifications. 
+You must cause all Covered Code to which You contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code. 
+3.4. Intellectual Property Matters 
+(a) Third Party Claims. 
+If Contributor has knowledge that a license under a third party's intellectual property rights is required to exercise the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor must include a text file with the Source Code distribution titled "LEGAL'' which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If Contributor obtains such knowledge after the Modification is made available as described in Section 3.2, Contributor shall promptly modify the LEGAL file in all copies Contributor makes available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained. 
+(b) Contributor APIs. 
+If Contributor's Modifications include an application programming interface and Contributor has knowledge of patent licenses which are reasonably necessary to implement that API, Contributor must also include this information in the LEGAL file. 
+ 
+          (c)    Representations. 
+Contributor represents that, except as disclosed pursuant to Section 3.4(a) above, Contributor believes that Contributor's Modifications are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the rights conveyed by this License. 
+
+3.5. Required Notices. 
+You must duplicate the notice in Exhibit A in each file of the Source Code.  If it is not possible to put such notice in a particular Source Code file due to its structure, then You must include such notice in a location (such as a relevant directory) where a user would be likely to look for such a notice.  If You created one or more Modification(s) You may add your name as a Contributor to the notice described in Exhibit A.  You must also duplicate this License in any documentation for the Source Code where You describe recipients' rights or ownership rights relating to Covered Code.  You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer. 
+3.6. Distribution of Executable Versions. 
+You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section 3.2. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code or ownership rights under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer. 
+3.7. Larger Works. 
+You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code.
+4. Inability to Comply Due to Statute or Regulation. 
+If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it. 
+5. Application of this License. 
+This License applies to code to which the Initial Developer has attached the notice in Exhibit A and to related Covered Code. 
+6. Versions of the License. 
+6.1. New Versions. 
+Netscape Communications Corporation (''Netscape'') may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number. 
+6.2. Effect of New Versions. 
+Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Netscape. No one other than Netscape has the right to modify the terms applicable to Covered Code created under this License. 
+6.3. Derivative Works. 
+If You create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), You must (a) rename Your license so that the phrases ''Mozilla'', ''MOZILLAPL'', ''MOZPL'', ''Netscape'', "MPL", ''NPL'' or any confusingly similar phrase do not appear in your license (except to note that your license differs from this License) and (b) otherwise make it clear that Your version of the license contains terms which differ from the Mozilla Public License and Netscape Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.)
+7. DISCLAIMER OF WARRANTY. 
+COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. 
+8. TERMINATION. 
+8.1.  This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. 
+8.2.  If You initiate litigation by asserting a patent infringement claim (excluding declatory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You file such action is referred to as "Participant")  alleging that: 
+(a)  such Participant's Contributor Version directly or indirectly infringes any patent, then any and all rights granted by such Participant to You under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively, unless if within 60 days after receipt of notice You either: (i)  agree in writing to pay Participant a mutually agreeable reasonable royalty for Your past and future use of Modifications made by such Participant, or (ii) withdraw Your litigation claim with respect to the Contributor Version against such Participant.  If within 60 days of notice, a reasonable royalty and payment arrangement are not mutually agreed upon in writing by the parties or the litigation claim is not withdrawn, the rights granted by Participant to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration of the 60 day notice period specified above. 
+(b)  any software, hardware, or device, other than such Participant's Contributor Version, directly or indirectly infringes any patent, then any rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are revoked effective as of the date You first made, used, sold, distributed, or had made, Modifications made by that Participant. 
+8.3.  If You assert a patent infringement claim against Participant alleging that such Participant's Contributor Version directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license. 
+8.4.  In the event of termination under Sections 8.1 or 8.2 above,  all end user license agreements (excluding distributors and resellers) which have been validly granted by You or any distributor hereunder prior to termination shall survive termination.
+9. LIMITATION OF LIABILITY. 
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. 
+10. U.S. GOVERNMENT END USERS. 
+The Covered Code is a ''commercial item,'' as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of ''commercial computer software'' and ''commercial computer software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein. 
+11. MISCELLANEOUS. 
+This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in the United States of America, any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. 
+12. RESPONSIBILITY FOR CLAIMS. 
+As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability. 
+13. MULTIPLE-LICENSED CODE. 
+Initial Developer may designate portions of the Covered Code as “Multiple-Licensed�.  “Multiple-Licensed� means that the Initial Developer permits you to utilize portions of the Covered Code under Your choice of the MPL or the alternative licenses, if any, specified by the Initial Developer in the file described in Exhibit A. 
+
+EXHIBIT A -Mozilla Public License. 
+``The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at 
+http://www.mozilla.org/MPL/ 
+Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF 
+ANY KIND, either express or implied. See the License for the specific language governing rights and 
+limitations under the License. 
+The Original Code is ______________________________________. 
+The Initial Developer of the Original Code is ________________________. Portions created by 
+ ______________________ are Copyright (C) ______ _______________________. All Rights 
+Reserved. 
+Contributor(s): ______________________________________. 
+Alternatively, the contents of this file may be used under the terms of the _____ license (the  “[___] License�), in which case the provisions of [______] License are applicable  instead of those above.  If you wish to allow use of your version of this file only under the terms of the [____] License and not to allow others to use your version of this file under the MPL, indicate your decision by deleting  the provisions above and replace  them with the notice and other provisions required by the [___] License.  If you do not delete the provisions above, a recipient may use your version of this file under either the MPL or the [___] License." 
+[NOTE: The text of this Exhibit A may differ slightly from the text of the notices in the Source Code files of the Original Code. You should use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.] 
+
+The following software may be included in this product: sRGB Profiles; Use of any of this software is governed by the terms of the license below:
+International Color Consortium
+sRGB Profiles
+
+To anyone who acknowledges that the files "sRGB_IEC61966-2-1_noBPC.icc" and "sRGB_IEC61966-2-1_withBPC.icc" are provided "AS IS" WITH NO EXPRESS OR IMPLIED WARRANTY, permission to use, copy and distribute these file for any purpose is hereby granted without fee, provided that the files are not changed including the HP copyright notice tag, and that the name of Hewlett-Packard Company shall not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. Hewlett-Packard Company makes no representations about the suitability of this software for any purpose. 
+
+
+The following software may be included in this product: Sablotron; Use of any of this software is governed by the terms of the license below:
+Ginger Alliance
+Sablotron
+jump to LGPL
+
+The following software may be included in this product: SANE; Use of any of this software is governed by the terms of the license below:
+David Mosberger-Tang, Andreas Beck
+SANE
+/* sane - Scanner Access Now Easy.
+   Copyright (C) 1997-1999 David Mosberger-Tang and Andreas Beck
+   This file is part of the SANE package.
+
+   This file is in the public domain.  You may use and modify it as
+   you see fit, as long as this copyright message is included and
+   that there is an indication as to what modifications have been
+   made (if any).
+
+   SANE is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+   FITNESS FOR A PARTICULAR PURPOSE.
+
+   This file declares SANE application interface.  See the SANE
+   standard for a detailed explanation of the interface.  */
+
+
+The following software may be included in this product: Saxon (B); Use of any of this software is governed by the terms of the license below:
+Michael Kay
+Saxon (B)
+jump to MPL 1.1
+
+The following software may be included in this product: Stax API; Use of any of this software is governed by the terms of the license below:
+stax.codehouse.org
+Stax
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+The following software may be included in this product:STLport; Use of any of this software is governed by the terms of the license below:
+Boris Fomitchev
+STLport
+License Agreement
+Boris Fomitchev grants Licensee a non-exclusive, non-transferable, royalty-free license to use STLport and its documentation without fee.
+
+By downloading, using, or copying STLport or any portion thereof,  Licensee agrees to abide by the intellectual property laws and all other applicable laws of the United States of America, and to all of the terms and conditions of this Agreement.
+
+Licensee shall maintain the following copyright and permission  notices on STLport sources and its documentation unchanged :
+Copyright 1999,2000 Boris Fomitchev
+
+This material is provided "as is", with absolutely no warranty expressed or implied. Any use is at your own risk.
+Permission to use or copy this software for any purpose is hereby granted without fee, provided the above notices are retained on all copies. Permission to modify the code and to distribute modified code is granted, provided the above notices are retained, and a notice that the code was modified is included with the above copyright notice. 
+The Licensee may distribute binaries compiled with STLport (whether original or modified) without any royalties or restrictions.
+The Licensee may distribute original or modified STLport sources, provided that:
+The conditions indicated in the above permission notice are met; 
+The following copyright notices are retained when present, and conditions provided in accompanying permission notices are met : 
+Copyright 1994 Hewlett-Packard Company
+Copyright 1996,97 Silicon Graphics Computer Systems, Inc.
+Copyright 1997 Moscow Center for SPARC Technology.
+Permission to use, copy, modify, distribute and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation. Hewlett-Packard Company makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty.
+Permission to use, copy, modify, distribute and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation. Silicon Graphics makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty.
+Permission to use, copy, modify, distribute and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation. Moscow Center for SPARC Technology  makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. 
+
+The following software may be included in this product: Italian Thesaurus; Use of any of this software is governed by the terms of the license below:
+Daniela Volta, Davide Prina
+Italian Thesaurus
+
+Jump to GPL
+
+The following software may be included in this product: Nepali thesaurus dictionary; Use of any of this software is governed by the terms of the license below:
+NepaLinux.org
+Nepali thesaurus dictionary (LGPL v2.1)
+
+jump to GNU Lesser General Public License
+
+The following software may be included in this product: Italian Thesaurus; Use of any of this software is governed by the terms of the license below:
+Daniela Volta, Davide Prina
+Sownik synonimw v. 1, (Polish Thesaurus)
+
+Open Software License v. 2.1 
+This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following notice immediately following the copyright notice for the Original Work: 
+Licensed under the Open Software License version 2.1 
+1) Grant of Copyright License. Licensor hereby grants You a world-wide, royalty-free, non-exclusive, perpetual, sublicenseable license to do the following: 
+* to reproduce the Original Work in copies; 
+* to prepare derivative works ("Derivative Works") based upon the Original Work; 
+* to distribute copies of the Original Work and Derivative Works to the 
+public, with the proviso that copies of Original Work or Derivative Works that You distribute shall be licensed under the Open Software License; * to perform the Original Work publicly; and 
+* to display the Original Work publicly. 
+2) Grant of Patent License. Licensor hereby grants You a world-wide, royalty-free, non-exclusive, perpetual, sublicenseable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, to make, use, sell and offer for sale the Original Work and Derivative Works. 
+3) Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor hereby agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work, and by publishing the address of that information repository in a notice immediately following the copyright notice that applies to the Original Work. 
+4) Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior written permission of the Licensor. Nothing in this License shall be deemed to grant any rights to trademarks, copyrights, patents, trade secrets or any other intellectual property of Licensor except as expressly stated herein. No patent license is granted to make, use, sell or offer to sell embodiments of any patent claims other than the licensed claims defined in Section 2. No right is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under different terms from this License any Original Work that Licensor otherwise would have a right to license. 
+5) External Deployment. The term "External Deployment" means the use or distribution of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether the Original Work or Derivative Works are distributed to those persons or made available as an application intended for use over a computer network. As an express condition for the grants of license hereunder, You agree that any External Deployment by You of a Derivative Work shall be deemed a distribution and shall be licensed to all under the terms of this License, as prescribed in section 1(c) herein. 
+6) Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. 
+7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately proceeding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to Original Work is granted hereunder except under this disclaimer. 
+8) Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to any person for any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to liability for death or personal injury resulting from Licensor's negligence to the extent applicable law prohibits such limitation. Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so this exclusion and limitation may not apply to You. 
+9) Acceptance and Termination. If You distribute copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. Nothing else but this License (or another written agreement between Licensor and You) grants You permission to create Derivative Works based upon the Original Work or to exercise any of the rights granted in Section 1 herein, and any attempt to do so except under the terms of this License (or another written agreement between Licensor and You) is expressly prohibited by U.S. copyright law, the equivalent laws of other countries, and by international treaty. Therefore, by exercising any of the rights granted to You in Section 1 herein, You indicate Your acceptance of this License and all of its terms and conditions. This License shall terminate immediately and you may no longer exercise any of the rights granted to You by this License upon Your failure to honor the proviso in Section 1(c) herein. 
+10) Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. 
+11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of the U.S. Copyright Act, 17 U.S.C. § 101 et seq., the equivalent laws of other countries, and international treaty. This section shall survive the termination of this License. 
+12) Attorneys Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. 
+13) Miscellaneous. This License represents the complete agreement concerning the subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. 
+14) Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. 
+15) Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. 
+This license is Copyright (C) 2003-2004 Lawrence E. Rosen. All rights reserved. Permission is hereby granted to copy and distribute this license without modification. This license may not be modified without the express written permission of its copyright owner. 
+
+The following software may be included in this product: Russian thesaurus; Use of any of this software is governed by the terms of the license below:
+Mikhail Korolyov
+Russian thesaurus
+
+jump to GNU Lesser General Public License
+
+The following software may be included in this product: TWAIN; Use of any of this software is governed by the terms of the license below:
+TWAIN Working Group
+TWAIN
+
+The TWAIN License 
+The TWAIN Working Group grants customer ("Customer") the worldwide, royalty-free, non-exclusive license to reproduce and distribute the software and documentation of the TWAIN toolkit ("TWAIN Toolkit"). The TWAIN Toolkit was designed to be used by third parties to assist them in becoming compliant with the TWAIN standard, but it has not been developed to the standards of a commercial product. Consequently, the TWAIN toolkit is provided AS IS without any warranty. THE TWAIN Working Group disclaims all warranties in the TWAIN toolkit whether implied, express or statutory, including, without limitation, the implied warranties of merchantability, noninfringement of third party rights and fitness for a particular purpose. The TWAIN Working Group disclaims all liability for damages, whether direct, indirect, special, incidental, or consequential, arising from the reproduction, distribution, modification, or other use of the TWAIN Toolkit. 
+As a condition of this license, Customer agrees to include in software programs based in whole or in part on the TWAIN Toolkit the following providions in (i) the header or similar file in such software and (ii) prominently in its documentation and to require its sublicensees to include these provisions in similar locations: The TWAIN Toolkit is distributed as is. The developer and distributors of the TWAIN Toolkit expressly disclaim all implied, express or statutory warranties including, without limitation, the implied warranties of merchantability, noninfringement of third party rights and fitness for a particular purpose. Neither the developers nor the distributors will be liable for damages, whether direct, indirect, special, incidental, or consequential, as a result of the reproduction, modification, distribution or other use of the TWAIN Toolkit. 
+
+The following software may be included in this product: Unicode's CLDR data repository; Use of any of this software is governed by the terms of the license below:
+Unicode, Inc.
+Unicode CLDR data repository
+
+Copyright 1991-2005 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html. 
+Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified. 
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE. 
+Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder. 
+
+The following software may be included in this product: unixODBC; Use of any of this software is governed by the terms of the license below:
+unixODBC.org
+unixODBC
+jump to LGPL
+
+The following software may be included in this product: vigra; Use of any of this software is governed by the terms of the license below:
+Ullrich Koethe
+vigra
+
+The VIGRA Artistic License 
+========================== 
+(modeled after the Perl Artistic License) 
+
+Preamble 
+-------- 
+
+The intent of this document is to state the conditions under which VIGRA may be copied, such that the author maintains some semblance of artistic control over the development of the library, while giving the users of the library the right to use and distribute VIGRA in a more-or-less customary fashion, plus the right to make reasonable modifications. 
+Definitions 
+----------- 
+"Copyright Holder" of the VIGRA library is Ullrich Koethe, Cognitive Systems Group, University of Hamburg, Germany. 
+"Library" refers to the collection of files distributed by the Copyright Holder under the name "VIGRA" (including this LICENSE file and all accompanying documentation), and derivatives of that collection of files created through textual modification. 
+"Standard Version" refers to the Library if it has not been modified, or has been modified in accordance with the wishes of the Copyright Holder as specified below. 
+"You" is you, if you're thinking about using, copying, modifying or distributing this Library. 
+"Freely Available" means that no fee is charged for the item. It also means that recipients of the item may redistribute it under the same conditions they received it. 
+"Reasonable copying fee" is whatever you can justify on the basis of media cost, duplication charges, time of people involved, and so on. (You will not be required to justify it to the Copyright Holder, but only to the computing community at large as a market that must bear the fee.) 
+License terms 
+------------- 
+1. You may make and give away verbatim copies of the Standard Version of this Library without restriction, provided that you duplicate all of the original copyright notices, this license, and associated disclaimers. 
+2. The Standard Version of the Library may be distributed as part of a collection of software, provided no more than a reasonable copying fee is charged for the software collection. 
+3. You may apply bug fixes and portability fixes derived from the Public Domain or from the Copyright Holder. A Library modified in such a way shall still be considered the Standard Version. 
+4. You may otherwise modify your copy of this Library in any way, provided that you insert a prominent notice in each changed file stating how and when you changed that file, and provided that you do at least ONE of the following: 
+a. place your modifications in the Public Domain or otherwise make them Freely Available, for example by allowing the Copyright Holder to include your modifications in the Standard Version of the Library. 
+b. use the modified Library only within your corporation or organization. 
+c. make other distribution arrangements with the Copyright Holder. 
+5. You may distribute programs which use this Library in object code or executable form without restriction. 
+6. Any object code generated as a result of using this Library does not fall under the copyright of this Library, but belongs to whomever generated it, and may be sold commercially. 
+7. The name of the Copyright Holder or the Library may not be used to endorse or promote products derived from this software without specific prior written permission. 
+8. THIS LIBRARY IS PROVIDED AS IS AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 
+IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR ON ANY THEORY OF LIABILITY ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS LIBRARY. 
+
+The following software may be included in this product: Xalan; Use of any of this software is governed by the terms of the license below:
+The Apache Software Foundation
+Xalan
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+The following software may be included in this product: XML Security Library (xmlsec); Use of any of this software is governed by the terms of the license below:
+Aleksey Sanin
+XML Security Library (xmlsec)
+xmlsec, xmlsec-openssl, xmlsec-gnutls libraries 
+------------------------------------------------------------------------------ 
+Copyright (C) 2002-2003 Aleksey Sanin. All Rights Reserved. 
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is fur- nished to do so, subject to the following conditions: 
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ALEKSEY SANIN BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+Except as contained in this notice, the name of Aleksey Sanin shall not be used in advertising or otherwise to promote the sale, use or other deal- ings in this Software without prior written authorization from him. 
+
+xmlsec-nss library 
+------------------------------------------------------------------------------ 
+Copyright (C) 2002-2003 Aleksey Sanin. All Rights Reserved. 
+Copyright (c) 2003 America Online, Inc. All rights reserved. 
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is fur- nished to do so, subject to the following conditions: 
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. 
+Portions of the Software were created using source code and/or APIs governed by the Mozilla Public License (MPL). The MPL is available at http://www.mozilla.org/MPL/MPL-1.1.html. The MPL permits such portions to be distributed with code not governed by MPL, as long as the requirements of MPL are fulfilled for such portions. 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ALEKSEY SANIN BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+Except as contained in this notice, the name of Aleksey Sanin shall not be used in advertising or otherwise to promote the sale, use or other deal- ings in this Software without prior written authorization from him. 
+
+The following software may be included in this product: X11 XRender Extension; Use of any of this software is governed by the terms of the license below:
+Keith Packard, SuSE, Inc.
+X11 XRender Extension
+Copyright © 2000 SuSE, Inc. 
+Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of SuSE not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. SuSE makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. 
+SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 
+
+The following software may be included in this product: XT; Use of any of this software is governed by the terms of the license below:
+James Clark, Bill Lindsey
+XT 
+Copyright (c) 1998, 1999 James Clark 
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ``Software''), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: 
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. 
+THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL JAMES CLARK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+Except as contained in this notice, the name of James Clark shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from James Clark. 
+
+Copyright (c) 2002 Bill Lindsey 
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ``Software''), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: 
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. Substantial portions of the Software are copyrighted by James Clark. Copying permissions and restrictions for those portions are covered in the file "copyingjc.txt" 
+THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL BILL LINDSEY BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+Except as contained in this notice, the name of Bill Lindsey shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Bill Lindsey. 
+
+The following software may be included in this product:zlib; Use of any of this software is governed by the terms of the license below:
+Jean-Loup Gailly, Mark Adler
+zlib
+(C) 1995-2002 Jean-loup Gailly and Mark Adler 
+This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. 
+Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: 
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 
+3. This notice may not be removed or altered from any source distribution. 
+
+The following software may be included in this product: Mozilla, Mozilla Address Book, NP SDK: Use of any of this software is governed by the terms of the license below:
+The Mozilla Foundation
+Mozilla Address Book
+MOZILLA PUBLIC LICENSE 
+Version 1.1 
+
+1. Definitions. 
+1.0.1. "Commercial Use" means distribution or otherwise making the Covered Code available to a third party. 
+1.1. ''Contributor'' means each entity that creates or contributes to the creation of Modifications. 
+1.2. ''Contributor Version'' means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor. 
+1.3. ''Covered Code'' means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof. 
+1.4. ''Electronic Distribution Mechanism'' means a mechanism generally accepted in the software development community for the electronic transfer of data. 
+1.5. ''Executable'' means Covered Code in any form other than Source Code. 
+1.6. ''Initial Developer'' means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A. 
+1.7. ''Larger Work'' means a work which combines Covered Code or portions thereof with code not governed by the terms of this License. 
+1.8. ''License'' means this document. 
+1.8.1. "Licensable" means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. 
+1.9. ''Modifications'' means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is: 
+A. Any addition to or deletion from the contents of a file containing Original Code or previous Modifications. 
+B. Any new file that contains any part of the Original Code or previous Modifications. 
+ 
+1.10. ''Original Code'' means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License. 
+1.10.1. "Patent Claims" means any patent claim(s), now owned or hereafter acquired, including without limitation,  method, process, and apparatus claims, in any patent Licensable by grantor. 
+1.11. ''Source Code'' means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge. 
+1.12. "You'' (or "Your")  means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You'' includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control'' means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
+2. Source Code License. 
+2.1. The Initial Developer Grant. 
+The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims: 
+(a)  under intellectual property rights (other than patent or trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, and/or as part of a Larger Work; and 
+(b) under Patents Claims infringed by the making, using or selling of Original Code, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Code (or portions thereof). 
+  
+(c) the licenses granted in this Section 2.1(a) and (b) are effective on the date Initial Developer first distributes Original Code under the terms of this License. 
+(d) Notwithstanding Section 2.1(b) above, no patent license is granted: 1) for code that You delete from the Original Code; 2) separate from the Original Code;  or 3) for infringements caused by: i) the modification of the Original Code or ii) the combination of the Original Code with other software or devices. 
+ 
+2.2. Contributor Grant. 
+Subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license 
+  
+(a)  under intellectual property rights (other than patent or trademark) Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger Work; and 
+(b) under Patent Claims infringed by the making, using, or selling of  Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: 1) Modifications made by that Contributor (or portions thereof); and 2) the combination of  Modifications made by that Contributor with its Contributor Version (or portions of such combination). 
+(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first makes Commercial Use of the Covered Code. 
+(d)    Notwithstanding Section 2.2(b) above, no patent license is granted: 1) for any code that Contributor has deleted from the Contributor Version; 2)  separate from the Contributor Version;  3)  for infringements caused by: i) third party modifications of Contributor Version or ii)  the combination of Modifications made by that Contributor with other software  (except as part of the Contributor Version) or other devices; or 4) under Patent Claims infringed by Covered Code in the absence of Modifications made by that Contributor.
+
+3. Distribution Obligations. 
+3.1. Application of License. 
+The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5. 
+3.2. Availability of Source Code. 
+Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party. 
+3.3. Description of Modifications. 
+You must cause all Covered Code to which You contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code. 
+3.4. Intellectual Property Matters 
+(a) Third Party Claims. 
+If Contributor has knowledge that a license under a third party's intellectual property rights is required to exercise the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor must include a text file with the Source Code distribution titled "LEGAL'' which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If Contributor obtains such knowledge after the Modification is made available as described in Section 3.2, Contributor shall promptly modify the LEGAL file in all copies Contributor makes available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained. 
+(b) Contributor APIs. 
+If Contributor's Modifications include an application programming interface and Contributor has knowledge of patent licenses which are reasonably necessary to implement that API, Contributor must also include this information in the LEGAL file. 
+ 
+          (c)    Representations. 
+Contributor represents that, except as disclosed pursuant to Section 3.4(a) above, Contributor believes that Contributor's Modifications are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the rights conveyed by this License. 
+
+3.5. Required Notices. 
+You must duplicate the notice in Exhibit A in each file of the Source Code.  If it is not possible to put such notice in a particular Source Code file due to its structure, then You must include such notice in a location (such as a relevant directory) where a user would be likely to look for such a notice.  If You created one or more Modification(s) You may add your name as a Contributor to the notice described in Exhibit A.  You must also duplicate this License in any documentation for the Source Code where You describe recipients' rights or ownership rights relating to Covered Code.  You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer. 
+3.6. Distribution of Executable Versions. 
+You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section 3.2. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code or ownership rights under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer. 
+3.7. Larger Works. 
+You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code.
+4. Inability to Comply Due to Statute or Regulation. 
+If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it. 
+5. Application of this License. 
+This License applies to code to which the Initial Developer has attached the notice in Exhibit A and to related Covered Code. 
+6. Versions of the License. 
+6.1. New Versions. 
+Netscape Communications Corporation (''Netscape'') may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number. 
+6.2. Effect of New Versions. 
+Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Netscape. No one other than Netscape has the right to modify the terms applicable to Covered Code created under this License. 
+6.3. Derivative Works. 
+If You create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), You must (a) rename Your license so that the phrases ''Mozilla'', ''MOZILLAPL'', ''MOZPL'', ''Netscape'', "MPL", ''NPL'' or any confusingly similar phrase do not appear in your license (except to note that your license differs from this License) and (b) otherwise make it clear that Your version of the license contains terms which differ from the Mozilla Public License and Netscape Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.)
+7. DISCLAIMER OF WARRANTY. 
+COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. 
+8. TERMINATION. 
+8.1.  This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. 
+8.2.  If You initiate litigation by asserting a patent infringement claim (excluding declatory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You file such action is referred to as "Participant")  alleging that: 
+(a)  such Participant's Contributor Version directly or indirectly infringes any patent, then any and all rights granted by such Participant to You under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively, unless if within 60 days after receipt of notice You either: (i)  agree in writing to pay Participant a mutually agreeable reasonable royalty for Your past and future use of Modifications made by such Participant, or (ii) withdraw Your litigation claim with respect to the Contributor Version against such Participant.  If within 60 days of notice, a reasonable royalty and payment arrangement are not mutually agreed upon in writing by the parties or the litigation claim is not withdrawn, the rights granted by Participant to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration of the 60 day notice period specified above. 
+(b)  any software, hardware, or device, other than such Participant's Contributor Version, directly or indirectly infringes any patent, then any rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are revoked effective as of the date You first made, used, sold, distributed, or had made, Modifications made by that Participant. 
+8.3.  If You assert a patent infringement claim against Participant alleging that such Participant's Contributor Version directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license. 
+8.4.  In the event of termination under Sections 8.1 or 8.2 above,  all end user license agreements (excluding distributors and resellers) which have been validly granted by You or any distributor hereunder prior to termination shall survive termination.
+9. LIMITATION OF LIABILITY. 
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. 
+10. U.S. GOVERNMENT END USERS. 
+The Covered Code is a ''commercial item,'' as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of ''commercial computer software'' and ''commercial computer software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein. 
+11. MISCELLANEOUS. 
+This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in the United States of America, any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. 
+12. RESPONSIBILITY FOR CLAIMS. 
+As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability. 
+13. MULTIPLE-LICENSED CODE. 
+Initial Developer may designate portions of the Covered Code as “Multiple-Licensed�.  “Multiple-Licensed� means that the Initial Developer permits you to utilize portions of the Covered Code under Your choice of the MPL or the alternative licenses, if any, specified by the Initial Developer in the file described in Exhibit A. 
+
+EXHIBIT A -Mozilla Public License. 
+``The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at 
+http://www.mozilla.org/MPL/ 
+Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF 
+ANY KIND, either express or implied. See the License for the specific language governing rights and 
+limitations under the License. 
+The Original Code is ______________________________________. 
+The Initial Developer of the Original Code is ________________________. Portions created by 
+ ______________________ are Copyright (C) ______ _______________________. All Rights 
+Reserved. 
+Contributor(s): ______________________________________. 
+Alternatively, the contents of this file may be used under the terms of the _____ license (the  “[___] License�), in which case the provisions of [______] License are applicable  instead of those above.  If you wish to allow use of your version of this file only under the terms of the [____] License and not to allow others to use your version of this file under the MPL, indicate your decision by deleting  the provisions above and replace  them with the notice and other provisions required by the [___] License.  If you do not delete the provisions above, a recipient may use your version of this file under either the MPL or the [___] License." 
+[NOTE: The text of this Exhibit A may differ slightly from the text of the notices in the Source Code files of the Original Code. You should use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.] 
+
+FSF
+GNU General Public License
+
+
+GNU GENERAL PUBLIC LICENSE
+Version 2, June 1991 
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+Preamble
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. 
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. 
+To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. 
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. 
+We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. 
+Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. 
+Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. 
+The precise terms and conditions for copying, distribution and modification follow. 
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". 
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 
+1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. 
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 
+2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: 
+a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. 
+b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. 
+c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) 
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. 
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. 
+In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 
+3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: 
+a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, 
+b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, 
+c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) 
+The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. 
+If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. 
+4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 
+5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. 
+6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. 
+7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. 
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. 
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. 
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 
+8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 
+9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. 
+Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. 
+10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. 
+NO WARRANTY
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
+END OF TERMS AND CONDITIONS
+
+FSF
+GNU Lesser General Public License
+
+
+GNU LESSER GENERAL PUBLIC LICENSE 
+Version 2.1, February 1999 
+
+Copyright (C) 1991, 1999 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. 
+[This is the first released version of the Lesser GPL. It also counts as the successor of the GNU Library Public License, version 2, hence the version number 2.1.] 
+
+Preamble 
+
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. 
+This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. 
+When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things. 
+To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. 
+For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. 
+We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. 
+To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. 
+
+Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. 
+Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. 
+When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. 
+We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. 
+For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. 
+In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. 
+Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. 
+The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. 
+
+GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 
+0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". 
+A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. 
+The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) 
+"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. 
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. 
+1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. 
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 
+
+2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: 
+a) The modified work must itself be a software library. 
+b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. 
+c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. 
+d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. (For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) 
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. 
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. 
+In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 
+3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. 
+
+Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. 
+This option is useful when you wish to copy part of the code of the Library into a program that is not a library. 
+4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. 
+If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. 
+5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. 
+However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. 
+When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. 
+If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) 
+Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. 
+
+6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. 
+You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: 
+a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) 
+b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. 
+c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. 
+d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. 
+e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. 
+For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. 
+It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. 
+
+7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: 
+a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. 
+b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. 
+8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 
+9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. 
+10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. 
+
+11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. 
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. 
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. 
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 
+12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 
+13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. 
+Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. 
+
+14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. 
+
+NO WARRANTY 
+15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 
+16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
+END OF TERMS AND CONDITIONS 
+
+LaTeX3 Project
+The LaTeX Project Public License
+The LaTeX Project Public License 
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+LPPL Version 1.3c  2006-05-20
+
+Copyright 1999 2002-2006 LaTeX3 Project
+    Everyone is allowed to distribute verbatim copies of this
+    license document, but modification of it is not allowed.
+
+
+PREAMBLE
+========
+
+The LaTeX Project Public License (LPPL) is the primary license under
+which the the LaTeX kernel and the base LaTeX packages are distributed.
+
+You may use this license for any work of which you hold the copyright
+and which you wish to distribute.  This license may be particularly
+suitable if your work is TeX-related (such as a LaTeX package), but 
+it is written in such a way that you can use it even if your work is 
+unrelated to TeX.
+
+The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE',
+below, gives instructions, examples, and recommendations for authors
+who are considering distributing their works under this license.
+
+This license gives conditions under which a work may be distributed
+and modified, as well as conditions under which modified versions of
+that work may be distributed.
+
+We, the LaTeX3 Project, believe that the conditions below give you
+the freedom to make and distribute modified versions of your work
+that conform with whatever technical specifications you wish while
+maintaining the availability, integrity, and reliability of
+that work.  If you do not see how to achieve your goal while
+meeting these conditions, then read the document `cfgguide.tex'
+and `modguide.tex' in the base LaTeX distribution for suggestions.
+
+
+DEFINITIONS
+===========
+
+In this license document the following terms are used:
+
+   `Work'
+    Any work being distributed under this License.
+    
+   `Derived Work'
+    Any work that under any applicable law is derived from the Work.
+
+   `Modification' 
+    Any procedure that produces a Derived Work under any applicable
+    law -- for example, the production of a file containing an
+    original file associated with the Work or a significant portion of
+    such a file, either verbatim or with modifications and/or
+    translated into another language.
+
+   `Modify'
+    To apply any procedure that produces a Derived Work under any
+    applicable law.
+    
+   `Distribution'
+    Making copies of the Work available from one person to another, in
+    whole or in part.  Distribution includes (but is not limited to)
+    making any electronic components of the Work accessible by
+    file transfer protocols such as FTP or HTTP or by shared file
+    systems such as Sun's Network File System (NFS).
+
+   `Compiled Work'
+    A version of the Work that has been processed into a form where it
+    is directly usable on a computer system.  This processing may
+    include using installation facilities provided by the Work,
+    transformations of the Work, copying of components of the Work, or
+    other activities.  Note that modification of any installation
+    facilities provided by the Work constitutes modification of the Work.
+
+   `Current Maintainer'
+    A person or persons nominated as such within the Work.  If there is
+    no such explicit nomination then it is the `Copyright Holder' under
+    any applicable law.
+
+   `Base Interpreter' 
+    A program or process that is normally needed for running or
+    interpreting a part or the whole of the Work.    
+
+    A Base Interpreter may depend on external components but these
+    are not considered part of the Base Interpreter provided that each
+    external component clearly identifies itself whenever it is used
+    interactively.  Unless explicitly specified when applying the
+    license to the Work, the only applicable Base Interpreter is a
+    `LaTeX-Format' or in the case of files belonging to the 
+    `LaTeX-format' a program implementing the `TeX language'.
+
+
+
+CONDITIONS ON DISTRIBUTION AND MODIFICATION
+===========================================
+
+1.  Activities other than distribution and/or modification of the Work
+are not covered by this license; they are outside its scope.  In
+particular, the act of running the Work is not restricted and no
+requirements are made concerning any offers of support for the Work.
+
+2.  You may distribute a complete, unmodified copy of the Work as you
+received it.  Distribution of only part of the Work is considered
+modification of the Work, and no right to distribute such a Derived
+Work may be assumed under the terms of this clause.
+
+3.  You may distribute a Compiled Work that has been generated from a
+complete, unmodified copy of the Work as distributed under Clause 2
+above, as long as that Compiled Work is distributed in such a way that
+the recipients may install the Compiled Work on their system exactly
+as it would have been installed if they generated a Compiled Work
+directly from the Work.
+
+4.  If you are the Current Maintainer of the Work, you may, without
+restriction, modify the Work, thus creating a Derived Work.  You may
+also distribute the Derived Work without restriction, including
+Compiled Works generated from the Derived Work.  Derived Works
+distributed in this manner by the Current Maintainer are considered to
+be updated versions of the Work.
+
+5.  If you are not the Current Maintainer of the Work, you may modify
+your copy of the Work, thus creating a Derived Work based on the Work,
+and compile this Derived Work, thus creating a Compiled Work based on
+the Derived Work.
+
+6.  If you are not the Current Maintainer of the Work, you may
+distribute a Derived Work provided the following conditions are met
+for every component of the Work unless that component clearly states
+in the copyright notice that it is exempt from that condition.  Only
+the Current Maintainer is allowed to add such statements of exemption 
+to a component of the Work. 
+
+  a. If a component of this Derived Work can be a direct replacement
+     for a component of the Work when that component is used with the
+     Base Interpreter, then, wherever this component of the Work
+     identifies itself to the user when used interactively with that
+     Base Interpreter, the replacement component of this Derived Work
+     clearly and unambiguously identifies itself as a modified version
+     of this component to the user when used interactively with that
+     Base Interpreter.
+     
+  b. Every component of the Derived Work contains prominent notices
+     detailing the nature of the changes to that component, or a
+     prominent reference to another file that is distributed as part
+     of the Derived Work and that contains a complete and accurate log
+     of the changes.
+  
+  c. No information in the Derived Work implies that any persons,
+     including (but not limited to) the authors of the original version
+     of the Work, provide any support, including (but not limited to)
+     the reporting and handling of errors, to recipients of the
+     Derived Work unless those persons have stated explicitly that
+     they do provide such support for the Derived Work.
+
+  d. You distribute at least one of the following with the Derived Work:
+
+       1. A complete, unmodified copy of the Work; 
+          if your distribution of a modified component is made by
+          offering access to copy the modified component from a
+          designated place, then offering equivalent access to copy
+          the Work from the same or some similar place meets this
+          condition, even though third parties are not compelled to
+          copy the Work along with the modified component;
+
+       2. Information that is sufficient to obtain a complete,
+          unmodified copy of the Work.
+
+7.  If you are not the Current Maintainer of the Work, you may
+distribute a Compiled Work generated from a Derived Work, as long as
+the Derived Work is distributed to all recipients of the Compiled
+Work, and as long as the conditions of Clause 6, above, are met with
+regard to the Derived Work.
+
+8.  The conditions above are not intended to prohibit, and hence do not
+apply to, the modification, by any method, of any component so that it
+becomes identical to an updated version of that component of the Work as
+it is distributed by the Current Maintainer under Clause 4, above.
+
+9.  Distribution of the Work or any Derived Work in an alternative
+format, where the Work or that Derived Work (in whole or in part) is
+then produced by applying some process to that format, does not relax or
+nullify any sections of this license as they pertain to the results of
+applying that process.
+     
+10. a. A Derived Work may be distributed under a different license
+       provided that license itself honors the conditions listed in
+       Clause 6 above, in regard to the Work, though it does not have
+       to honor the rest of the conditions in this license.
+      
+    b. If a Derived Work is distributed under a different license, that
+       Derived Work must provide sufficient documentation as part of
+       itself to allow each recipient of that Derived Work to honor the 
+       restrictions in Clause 6 above, concerning changes from the Work.
+
+11. This license places no restrictions on works that are unrelated to
+the Work, nor does this license place any restrictions on aggregating
+such works with the Work by any means.
+
+12.  Nothing in this license is intended to, or may be used to, prevent
+complete compliance by all parties with all applicable laws.
+
+
+NO WARRANTY
+===========
+
+There is no warranty for the Work.  Except when otherwise stated in
+writing, the Copyright Holder provides the Work `as is', without
+warranty of any kind, either expressed or implied, including, but not
+limited to, the implied warranties of merchantability and fitness for a
+particular purpose.  The entire risk as to the quality and performance
+of the Work is with you.  Should the Work prove defective, you assume
+the cost of all necessary servicing, repair, or correction.
+
+In no event unless required by applicable law or agreed to in writing
+will The Copyright Holder, or any author named in the components of the
+Work, or any other party who may distribute and/or modify the Work as
+permitted above, be liable to you for damages, including any general,
+special, incidental or consequential damages arising out of any use of
+the Work or out of inability to use the Work (including, but not limited
+to, loss of data, data being rendered inaccurate, or losses sustained by
+anyone as a result of any failure of the Work to operate with any other
+programs), even if the Copyright Holder or said author or said other
+party has been advised of the possibility of such damages.
+
+
+MAINTENANCE OF THE WORK
+=======================
+
+The Work has the status `author-maintained' if the Copyright Holder
+explicitly and prominently states near the primary copyright notice in
+the Work that the Work can only be maintained by the Copyright Holder
+or simply that it is `author-maintained'.
+
+The Work has the status `maintained' if there is a Current Maintainer
+who has indicated in the Work that they are willing to receive error
+reports for the Work (for example, by supplying a valid e-mail
+address). It is not required for the Current Maintainer to acknowledge
+or act upon these error reports.
+
+The Work changes from status `maintained' to `unmaintained' if there
+is no Current Maintainer, or the person stated to be Current
+Maintainer of the work cannot be reached through the indicated means
+of communication for a period of six months, and there are no other
+significant signs of active maintenance.
+
+You can become the Current Maintainer of the Work by agreement with
+any existing Current Maintainer to take over this role.
+
+If the Work is unmaintained, you can become the Current Maintainer of
+the Work through the following steps:
+
+ 1.  Make a reasonable attempt to trace the Current Maintainer (and
+     the Copyright Holder, if the two differ) through the means of
+     an Internet or similar search.
+
+ 2.  If this search is successful, then enquire whether the Work
+     is still maintained.
+
+  a. If it is being maintained, then ask the Current Maintainer
+     to update their communication data within one month.
+     
+  b. If the search is unsuccessful or no action to resume active
+     maintenance is taken by the Current Maintainer, then announce
+     within the pertinent community your intention to take over
+     maintenance.  (If the Work is a LaTeX work, this could be
+     done, for example, by posting to comp.text.tex.)
+
+ 3a. If the Current Maintainer is reachable and agrees to pass
+     maintenance of the Work to you, then this takes effect
+     immediately upon announcement.
+     
+  b. If the Current Maintainer is not reachable and the Copyright
+     Holder agrees that maintenance of the Work be passed to you,
+     then this takes effect immediately upon announcement.  
+    
+ 4.  If you make an `intention announcement' as described in 2b. above
+     and after three months your intention is challenged neither by
+     the Current Maintainer nor by the Copyright Holder nor by other
+     people, then you may arrange for the Work to be changed so as
+     to name you as the (new) Current Maintainer.
+     
+ 5.  If the previously unreachable Current Maintainer becomes
+     reachable once more within three months of a change completed
+     under the terms of 3b) or 4), then that Current Maintainer must
+     become or remain the Current Maintainer upon request provided
+     they then update their communication data within one month.
+
+A change in the Current Maintainer does not, of itself, alter the fact
+that the Work is distributed under the LPPL license.
+
+If you become the Current Maintainer of the Work, you should
+immediately provide, within the Work, a prominent and unambiguous
+statement of your status as Current Maintainer.  You should also
+announce your new status to the same pertinent community as
+in 2b) above.
+
+
+WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE
+======================================================
+
+This section contains important instructions, examples, and
+recommendations for authors who are considering distributing their
+works under this license.  These authors are addressed as `you' in
+this section.
+
+Choosing This License or Another License
+----------------------------------------
+
+If for any part of your work you want or need to use *distribution*
+conditions that differ significantly from those in this license, then
+do not refer to this license anywhere in your work but, instead,
+distribute your work under a different license.  You may use the text
+of this license as a model for your own license, but your license
+should not refer to the LPPL or otherwise give the impression that
+your work is distributed under the LPPL.
+
+The document `modguide.tex' in the base LaTeX distribution explains
+the motivation behind the conditions of this license.  It explains,
+for example, why distributing LaTeX under the GNU General Public
+License (GPL) was considered inappropriate.  Even if your work is
+unrelated to LaTeX, the discussion in `modguide.tex' may still be
+relevant, and authors intending to distribute their works under any
+license are encouraged to read it.
+
+A Recommendation on Modification Without Distribution
+-----------------------------------------------------
+
+It is wise never to modify a component of the Work, even for your own
+personal use, without also meeting the above conditions for
+distributing the modified component.  While you might intend that such
+modifications will never be distributed, often this will happen by
+accident -- you may forget that you have modified that component; or
+it may not occur to you when allowing others to access the modified
+version that you are thus distributing it and violating the conditions
+of this license in ways that could have legal implications and, worse,
+cause problems for the community.  It is therefore usually in your
+best interest to keep your copy of the Work identical with the public
+one.  Many works provide ways to control the behavior of that work
+without altering any of its licensed components.
+
+How to Use This License
+-----------------------
+
+To use this license, place in each of the components of your work both
+an explicit copyright notice including your name and the year the work
+was authored and/or last substantially modified.  Include also a
+statement that the distribution and/or modification of that
+component is constrained by the conditions in this license.
+
+Here is an example of such a notice and statement:
+
+  %% pig.dtx
+  %% Copyright 2005 M. Y. Name
+  %
+  % This work may be distributed and/or modified under the
+  % conditions of the LaTeX Project Public License, either version 1.3
+  % of this license or (at your option) any later version.
+  % The latest version of this license is in
+  %   http://www.latex-project.org/lppl.txt
+  % and version 1.3 or later is part of all distributions of LaTeX
+  % version 2005/12/01 or later.
+  %
+  % This work has the LPPL maintenance status `maintained'.
+  % 
+  % The Current Maintainer of this work is M. Y. Name.
+  %
+  % This work consists of the files pig.dtx and pig.ins
+  % and the derived file pig.sty.
+
+Given such a notice and statement in a file, the conditions
+given in this license document would apply, with the `Work' referring
+to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being
+generated from `pig.dtx' using `pig.ins'), the `Base Interpreter'
+referring to any `LaTeX-Format', and both `Copyright Holder' and
+`Current Maintainer' referring to the person `M. Y. Name'.
+
+If you do not want the Maintenance section of LPPL to apply to your
+Work, change `maintained' above into `author-maintained'.  
+However, we recommend that you use `maintained', as the Maintenance
+section was added in order to ensure that your Work remains useful to
+the community even when you can no longer maintain and support it
+yourself.
+
+Derived Works That Are Not Replacements
+---------------------------------------
+
+Several clauses of the LPPL specify means to provide reliability and
+stability for the user community. They therefore concern themselves
+with the case that a Derived Work is intended to be used as a
+(compatible or incompatible) replacement of the original Work. If
+this is not the case (e.g., if a few lines of code are reused for a
+completely different task), then clauses 6b and 6d shall not apply.
+
+
+Important Recommendations
+-------------------------
+
+ Defining What Constitutes the Work
+
+   The LPPL requires that distributions of the Work contain all the
+   files of the Work.  It is therefore important that you provide a
+   way for the licensee to determine which files constitute the Work.
+   This could, for example, be achieved by explicitly listing all the
+   files of the Work near the copyright notice of each file or by
+   using a line such as:
+
+    % This work consists of all files listed in manifest.txt.
+   
+   in that place.  In the absence of an unequivocal list it might be
+   impossible for the licensee to determine what is considered by you
+   to comprise the Work and, in such a case, the licensee would be
+   entitled to make reasonable conjectures as to which files comprise
+   the Work.
diff --git a/readlicense_oo/util/makefile.pmk b/readlicense_oo/util/makefile.pmk
index 0efd9712f11d..2e072f1b7430 100755
--- a/readlicense_oo/util/makefile.pmk
+++ b/readlicense_oo/util/makefile.pmk
@@ -30,10 +30,8 @@
 .IF "$(GUI)"=="UNX"
 # uppercase and no filename extension for txt
 SYSTEXTDOCS=$(foreach,i,$(alllangiso) $(MISC)$/$(GUI)$/README_$i)
-SYSHTMLDOCS=$(SYSTEXTDOCS:+".html")
 .ELSE		# "$(GUI)"=="UNX"
 SYSTEXTDOCS=$(foreach,i,$(alllangiso) $(MISC)$/$(GUI)$/readme_$i.txt)
-SYSHTMLDOCS=$(SYSTEXTDOCS:s/.txt/.html/)
 .ENDIF		# "$(GUI)"=="UNX"
 
 .IF "$(WITH_LANG)"!=""
@@ -44,7 +42,7 @@ MERGEDXRM=.$/readme.xrm
 
 .INCLUDE : target.mk
 
-ALLTAR : $(SYSTEXTDOCS) $(SYSHTMLDOCS)
+ALLTAR : $(SYSTEXTDOCS)
 
 $(COMMONMISC)$/readme.dtd : ..$/readme.dtd  
     $(MKDIRHIER) $(MISC)$/$(GUI)
@@ -55,24 +53,6 @@ virtual : $(MERGEDXRM) $(COMMONMISC)$/readme.dtd $(PRJ)$/docs/readme.xsl
 $(MISC)$/readme_text.xsl : virtual
      $(SED) '' < ..$/readme.xsl > $@
 
-$(MISC)$/$(GUI)$/$(eq,$(GUI),WNT readme README)_%.html : 'virtual'
-    @@-$(MKDIRHIER) $(@:d)
-    $(XSLTPROC) --nonet --novalid -o $@ \
-    --stringparam os1 $(OS)	--stringparam gui1 $(GUI)	--stringparam com1  $(COM) \
-    --stringparam cp1 $(CPUNAME)	--stringparam type html	--stringparam lang1 $* \
-    ..$/readme.xsl	$(MERGEDXRM)
-.IF "$(GUI)"=="UNX"
-    chmod g+w $(MISC)$/$(GUI)
-.ENDIF			# "$(GUI)"=="UNX"
-
-$(MISC)$/$(GUI)$/$(eq,$(GUI),OS2 readme README)_%.html : 'virtual'
-    @@-$(MKDIRHIER) $(@:d)
-    $(XSLTPROC) --nonet --novalid -o $@ \
-    --stringparam os1 $(OS)	--stringparam gui1 $(GUI)	--stringparam com1  $(COM) \
-    --stringparam cp1 $(CPUNAME)	--stringparam type html	--stringparam lang1 $* \
-    ..$/readme.xsl	$(MERGEDXRM)
-
-# no percent-rule to avoid ambiguous inference chains for README_<lang>.html 
 $(SYSTEXTDOCS) : $(MISC)$/readme_text.xsl
     @@-$(MKDIRHIER) $(@:d)
     $(XSLTPROC) --nonet --novalid -o $@ \
diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx
index bbb4a5b2016d..c08721ee84d4 100644
--- a/registry/source/regimpl.hxx
+++ b/registry/source/regimpl.hxx
@@ -123,7 +123,7 @@ public:
 
     ORegKey*    getRootKey();
 
-    const store::OStoreFile& getStoreFile()
+    const store::OStoreFile& getStoreFile() const
         { return m_file; }
 
     const rtl::OUString&    getName() const
diff --git a/reportbuilder/util/description.xml b/reportbuilder/util/description.xml
index 4b0372d53de9..17f894e35e31 100755
--- a/reportbuilder/util/description.xml
+++ b/reportbuilder/util/description.xml
@@ -16,7 +16,6 @@
   </publisher>
   <icon>
     <default xlink:href="images/extension_32.png" />
-    <high-contrast xlink:href="images/extension_32_h.png" />
   </icon>
   <extension-description>
     <src xlink:href="help/component.txt" lang="en" />
diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk
index c52e85841f68..c299ce5c62ff 100755
--- a/reportbuilder/util/makefile.mk
+++ b/reportbuilder/util/makefile.mk
@@ -76,8 +76,7 @@ COMPONENT_OTR_FILES= \
     $(EXTENSIONDIR)$/template$/en-US$/wizard$/report$/default.otr
     
 COMPONENT_IMAGES= \
-    $(EXTENSIONDIR)$/images$/extension_32.png \
-    $(EXTENSIONDIR)$/images$/extension_32_h.png
+    $(EXTENSIONDIR)$/images$/extension_32.png
 
 COMPONENT_HTMLFILES = $(EXTENSIONDIR)$/THIRDPARTYREADMELICENSE.html \
             $(EXTENSIONDIR)$/readme_en-US.html \
diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx
index ca90ae3b2521..6f0abc6de953 100644
--- a/reportdesign/inc/RptPage.hxx
+++ b/reportdesign/inc/RptPage.hxx
@@ -40,7 +40,6 @@ namespace rptui
 //============================================================================
 
 class OReportModel;
-//class OReportSection;
 
 class REPORTDESIGN_DLLPUBLIC OReportPage : public SdrPage
 {
diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc
index 3c5920f37a59..013cafdd8b3e 100644
--- a/reportdesign/inc/RptResId.hrc
+++ b/reportdesign/inc/RptResId.hrc
@@ -234,7 +234,6 @@
 #define RID_STR_PARAADJUST                  (RID_STRING_START + 161)
 
 
-// #define RID_STR_                     (RID_STRING_START + 130)
 // -----------------------------------------------------------------------
 #define RID_PAGEDIALOG_PAGE                 ( RID_PAGE_START +  1 )
 #define RID_PAGEDIALOG_BACKGROUND           ( RID_PAGE_START +  2 )
@@ -251,8 +250,6 @@
 // -----------------------------------------------------------------------
 #define RID_IMG_TREENODE_COLLAPSED          ( RID_IMAGE_START +   1 )
 #define RID_IMG_TREENODE_EXPANDED           ( RID_IMAGE_START +   2 )
-#define RID_IMG_TREENODE_COLLAPSED_HC       ( RID_IMAGE_START +   3 )
-#define RID_IMG_TREENODE_EXPANDED_HC        ( RID_IMAGE_START +   4 )
 #define REPORT_TREE_ICON                    ( RID_IMAGE_START +   5 )
 // menu -----------------------------------------------------------------------
 #define RID_MENU_REPORT                     ( RID_MENU_START + 0 )
@@ -262,17 +259,16 @@
 
 // image lists -----------------------------------------------------------------------
 #define IMG_CONDFORMAT_DLG_SC               (RID_IMAGELIST_START + 0)
-#define IMG_CONDFORMAT_DLG_SCH              (RID_IMAGELIST_START + 1)
+// free
 #define IMG_CONDFORMAT_DLG_LC               (RID_IMAGELIST_START + 2)
-#define IMG_CONDFORMAT_DLG_LCH              (RID_IMAGELIST_START + 3)
+// free
 #define RID_SVXIMGLIST_RPTEXPL              (RID_IMAGELIST_START + 4)
-#define RID_SVXIMGLIST_RPTEXPL_HC           (RID_IMAGELIST_START + 5)
 #define IMGLST_GROUPSORT_DLG_SC             (RID_IMAGELIST_START + 6)
-#define IMGLST_GROUPSORT_DLG_SCH            (RID_IMAGELIST_START + 7)
+// free
 #define IMG_ADDFIELD_DLG_SC                 (RID_IMAGELIST_START + 8)
-#define IMG_ADDFIELD_DLG_SCH                (RID_IMAGELIST_START + 9)
+// free
 #define IMG_ADDFIELD_DLG_LC                 (RID_IMAGELIST_START + 10)
-#define IMG_ADDFIELD_DLG_LCH                (RID_IMAGELIST_START + 11)
+// free
 
 #define ADDFIELD_FL_HELP_SEPARATOR          (RID_IMAGELIST_START +  12)
 #define ADDFIELD_HELP_FIELD                 (RID_IMAGELIST_START +  13)
diff --git a/reportdesign/qa/complex/ReportDesignerTest.java b/reportdesign/qa/complex/ReportDesignerTest.java
index 3bbb9a42fe26..cf03362cfa17 100755
--- a/reportdesign/qa/complex/ReportDesignerTest.java
+++ b/reportdesign/qa/complex/ReportDesignerTest.java
@@ -47,9 +47,6 @@ import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.util.XCloseable;
 
-// import util.BasicMacroTools;
-// import util.DesktopTools;
-// import util.dbg;
 import complexlib.ComplexTestCase;
 import util.utils;
 import helper.OfficeProvider;
@@ -58,26 +55,6 @@ import helper.OfficeWatcher;
 
 import convwatch.DB;
 
-// import java.util.Date;
-// import java.text.SimpleDateFormat;
-// import java.text.ParsePosition;
-// import java.sql.Time;
-//
-// import java.io.BufferedReader;
-// import java.io.File;
-// import java.io.FileReader;
-// import java.io.IOException;
-// import java.io.FilenameFilter;
-//
-// import java.util.Vector;
-//
-// import helper.AppProvider;
-// import java.text.DecimalFormat;
-// import util.DynamicClassLoader;
-// import java.util.StringTokenizer;
-
-
-
 
 class PropertySetHelper
 {
@@ -327,15 +304,6 @@ public class ReportDesignerTest extends ComplexTestCase {
 
             XComponent xDocComponent = loadComponent(sFileURL, getXDesktop(), null);
             log.println("Load done");
-//  context = createUnoService("com.sun.star.sdb.DatabaseContext")
-//     oDataBase = context.getByName("hh")
-//     oDBDoc = oDataBase.DatabaseDocument
-//
-//  dim args(1) as new com.sun.star.beans.PropertyValue
-//  args(0).Name = "ActiveConnection"
-//  args(0).Value = oDBDoc.getCurrentController().getPropertyValue("ActiveConnection")
-//  reportContainer = oDBDoc.getReportDocuments()
-//     report = reportContainer.loadComponentFromURL("Report40","",0,args)
 
             try
             {
@@ -346,45 +314,24 @@ public class ReportDesignerTest extends ComplexTestCase {
                 XNameAccess xNameAccess = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, x);
                 showElements(xNameAccess);
                 Object aObj = xNameAccess.getByName(sFileURL);
-//                    log.println("1");
 
-                    // PropertySetHelper aHelper = new PropertySetHelper(aObj);
                 XDocumentDataSource xDataSource = (XDocumentDataSource)UnoRuntime.queryInterface(XDocumentDataSource.class, aObj);
-//                    Object aDatabaseDocmuent = aHelper.getPropertyValueAsObject("DatabaseDocument");
                 XOfficeDatabaseDocument xOfficeDBDoc = xDataSource.getDatabaseDocument();
 
-                // XOfficeDatabaseDocument xOfficeDBDoc = (XOfficeDatabaseDocument)UnoRuntime.queryInterface(XOfficeDatabaseDocument.class, aDatabaseDocument);
                 assure("can't access DatabaseDocument", xOfficeDBDoc != null);
-//                    log.println("2");
 
                 XModel xDBSource = (XModel)UnoRuntime.queryInterface(XModel.class, xOfficeDBDoc);
                 Object aController = xDBSource.getCurrentController();
                 assure("Controller of xOfficeDatabaseDocument is empty!", aController != null);
-//                     log.println("3");
 
                 XDatabaseDocumentUI aDBDocUI = (XDatabaseDocumentUI)UnoRuntime.queryInterface(XDatabaseDocumentUI.class, aController);
                 boolean isConnect = aDBDocUI.connect();
-//                     if (isConnect)
-//                     {
-//                         System.out.println("true");
-//                     }
-//                     else
-//                     {
-//                         System.out.println("false");
-//                     }
-//                     log.println("4");
-
-                // aHelper = new PropertySetHelper(aController);
-
-                // Object aActiveConnectionObj = aHelper.getPropertyValueAsObject("ActiveConnection");
                 Object aActiveConnectionObj = aDBDocUI.getActiveConnection();
                 assure("ActiveConnection is empty", aActiveConnectionObj != null);
-//                     log.println("5");
 
                 XReportDocumentsSupplier xSupplier = (XReportDocumentsSupplier)UnoRuntime.queryInterface(XReportDocumentsSupplier.class, xOfficeDBDoc);
                 xNameAccess = xSupplier.getReportDocuments();
                 assure("xOfficeDatabaseDocument returns no Report Document", xNameAccess != null);
-//                     log.println("5");
 
                 showElements(xNameAccess);
 
@@ -403,11 +350,6 @@ public class ReportDesignerTest extends ComplexTestCase {
                 log.println("ERROR: Exception caught");
             }
 
-                // String mTestDocumentPath = (String) param.get("TestDocumentPath");
-                // System.out.println("mTestDocumentPath: '" + mTestDocumentPath + "'");
-                // // workaround for issue using deprecated "DOCPTH" prop
-                // System.setProperty("DOCPTH", mTestDocumentPath);
-
                 // Close the document
                 closeComponent(xDocComponent);
         }
@@ -440,8 +382,6 @@ public class ReportDesignerTest extends ComplexTestCase {
                                           sDestinationVersion, sDestinationName, sDestinationCreatorType,
                                           sDocumentPoolDir, sDocumentPoolName, m_sMailAddress,
                                           sSpecial);
-            // DB.test();
-            // System.exit(1);
         }
 
     private void loadAndStoreReports(XNameAccess _xNameAccess, ArrayList _aPropertyList, int _nType)
@@ -505,9 +445,6 @@ public class ReportDesignerTest extends ComplexTestCase {
             sOutputPath += "tmp_123";
             sOutputPath += System.getProperty("file.separator");
 
-            // sOutputPath += getFileFormat(_nType);
-            // sOutputPath += System.getProperty("file.separator");
-
             File aOutputFile = new File(sOutputPath); // create the directory of the given output path
             aOutputFile.mkdirs();
 
diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx
index 4b5f26f9cd96..a409f13bdf43 100644
--- a/reportdesign/source/core/api/FixedLine.cxx
+++ b/reportdesign/source/core/api/FixedLine.cxx
@@ -198,7 +198,6 @@ OFixedLine::~OFixedLine()
     DBG_DTOR(rpt_OFixedLine,NULL);
 }
 // -----------------------------------------------------------------------------
-//IMPLEMENT_FORWARD_XINTERFACE2(OFixedLine,FixedLineBase,FixedLinePropertySet)
 IMPLEMENT_FORWARD_REFCOUNT( OFixedLine, FixedLineBase )
 // --------------------------------------------------------------------------------
 uno::Any SAL_CALL OFixedLine::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException)
diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx
index 4414508dcd04..7225803034d5 100644
--- a/reportdesign/source/core/api/FixedText.cxx
+++ b/reportdesign/source/core/api/FixedText.cxx
@@ -97,7 +97,6 @@ uno::Any SAL_CALL OFixedText::queryInterface( const uno::Type& _rType ) throw (u
     return aReturn.hasValue() ? aReturn : (m_aProps.aComponent.m_xProxy.is() ? m_aProps.aComponent.m_xProxy->queryAggregation(_rType) : aReturn);
 }
 
-//IMPLEMENT_FORWARD_XINTERFACE2(OFixedText,FixedTextBase,FixedTextPropertySet)
 // -----------------------------------------------------------------------------
 void SAL_CALL OFixedText::dispose() throw(uno::RuntimeException)
 {
@@ -119,9 +118,8 @@ void SAL_CALL OFixedText::dispose() throw(uno::RuntimeException)
 //--------------------------------------------------------------------------
 uno::Sequence< ::rtl::OUString > OFixedText::getSupportedServiceNames_Static(  ) throw(uno::RuntimeException)
 {
-    uno::Sequence< ::rtl::OUString > aServices(1);//2);
+    uno::Sequence< ::rtl::OUString > aServices(1);
     aServices.getArray()[0] = SERVICE_FIXEDTEXT;
-    //aServices.getArray()[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText"));
 
     return aServices;
 }
diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx
index 100ded84e8ab..237822575de6 100644
--- a/reportdesign/source/core/api/FormattedField.cxx
+++ b/reportdesign/source/core/api/FormattedField.cxx
@@ -91,7 +91,6 @@ OFormattedField::~OFormattedField()
     DBG_DTOR( rpt_OFormattedField,NULL);
 }
 // -----------------------------------------------------------------------------
-//IMPLEMENT_FORWARD_XINTERFACE2(OFormattedField,FormattedFieldBase,FormattedFieldPropertySet)
 IMPLEMENT_FORWARD_REFCOUNT( OFormattedField, FormattedFieldBase )
 // --------------------------------------------------------------------------------
 uno::Any SAL_CALL OFormattedField::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException)
diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx
index d7c208c98634..fbcad5aeb276 100644
--- a/reportdesign/source/core/api/Group.cxx
+++ b/reportdesign/source/core/api/Group.cxx
@@ -76,13 +76,13 @@ void OGroup::copyGroup(const uno::Reference< report::XGroup >& _xSource)
     {
         setHeaderOn(sal_True);
         OSection::lcl_copySection(_xSource->getHeader(),m_xHeader);
-    } // if ( _xSource->getHeaderOn() )
+    }
 
     if ( _xSource->getFooterOn() )
     {
         setFooterOn(sal_True);
         OSection::lcl_copySection(_xSource->getFooter(),m_xFooter);
-    } // if ( _xSource->getFooterOn() )
+    }
 }
 //--------------------------------------------------------------------------
 IMPLEMENT_FORWARD_XINTERFACE2(OGroup,GroupBase,GroupPropertySet)
@@ -121,8 +121,6 @@ void SAL_CALL OGroup::disposing()
 {
     m_xHeader.clear();
     m_xFooter.clear();
-    //::comphelper::disposeComponent(m_xHeader);
-    //::comphelper::disposeComponent(m_xFooter);
     ::comphelper::disposeComponent(m_xFunctions);
     m_xContext.clear();
 }
@@ -150,8 +148,6 @@ void SAL_CALL OGroup::setHeaderOn( ::sal_Bool _headeron ) throw (uno::RuntimeExc
     if ( _headeron != m_xHeader.is() )
     {
         ::rtl::OUString sName(RPT_RESSTRING(RID_STR_GROUP_HEADER,m_xContext->getServiceManager()));
-        /*const ::rtl::OUString sPlaceHolder(RTL_CONSTASCII_USTRINGPARAM("%1"));
-        sName = sName.replaceAt(sName.indexOf(sPlaceHolder),sPlaceHolder.getLength(),m_aProps.m_sExpression);*/
         setSection(PROPERTY_HEADERON,_headeron,sName,m_xHeader);
     }
 }
@@ -167,8 +163,6 @@ void SAL_CALL OGroup::setFooterOn( ::sal_Bool _footeron ) throw (uno::RuntimeExc
     if ( _footeron != m_xFooter.is() )
     {
         ::rtl::OUString sName(RPT_RESSTRING(RID_STR_GROUP_FOOTER,m_xContext->getServiceManager()));
-        /*const ::rtl::OUString sPlaceHolder(RTL_CONSTASCII_USTRINGPARAM("%1"));
-        sName = sName.replaceAt(sName.indexOf(sPlaceHolder),sPlaceHolder.getLength(),m_aProps.m_sExpression);*/
         setSection(PROPERTY_FOOTERON,_footeron,sName,m_xFooter);
     }
 }
@@ -294,7 +288,6 @@ void SAL_CALL OGroup::setParent( const uno::Reference< uno::XInterface >& /*Pare
 // -----------------------------------------------------------------------------
 uno::Reference< beans::XPropertySetInfo > SAL_CALL OGroup::getPropertySetInfo(  ) throw(uno::RuntimeException)
 {
-    //  return uno::Reference< beans::XPropertySetInfo >();
     return GroupPropertySet::getPropertySetInfo();
 }
 // -----------------------------------------------------------------------------
diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx
index 60498b766b12..f1b18970bd22 100644
--- a/reportdesign/source/core/api/ImageControl.cxx
+++ b/reportdesign/source/core/api/ImageControl.cxx
@@ -218,7 +218,6 @@ sal_Bool SAL_CALL OImageControl::supportsService(const ::rtl::OUString& ServiceN
 REPORTCOMPONENT_IMPL(OImageControl,m_aProps.aComponent)
 REPORTCOMPONENT_IMPL2(OImageControl,m_aProps.aComponent)
 REPORTCOMPONENT_NOMASTERDETAIL(OImageControl)
-//REPORTCONTROLFORMAT_IMPL(OImageControl,m_aProps.aFormatProperties)
 NO_REPORTCONTROLFORMAT_IMPL(OImageControl)
 ::rtl::OUString SAL_CALL OImageControl::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException)
 {
diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx
index 78361152a82d..f358c252743f 100644
--- a/reportdesign/source/core/api/ReportComponent.cxx
+++ b/reportdesign/source/core/api/ReportComponent.cxx
@@ -115,7 +115,6 @@ OFormatProperties::OFormatProperties()
     }
     aFontDescriptor.Weight = awt::FontWeight::NORMAL;
     aFontDescriptor.CharacterWidth = awt::FontWidth::NORMAL;
-    // aCharLocale = SvtSysLocale().GetLocaleData().getLocale();
 }
 // -----------------------------------------------------------------------------
 void OReportComponentProperties::setShape(uno::Reference< drawing::XShape >& _xShape,const uno::Reference< report::XReportComponent>& _xTunnel,oslInterlockedCount& _rRefCount)
diff --git a/reportdesign/source/core/api/ReportControlModel.cxx b/reportdesign/source/core/api/ReportControlModel.cxx
index c247742d9870..a1617d75d86f 100644
--- a/reportdesign/source/core/api/ReportControlModel.cxx
+++ b/reportdesign/source/core/api/ReportControlModel.cxx
@@ -85,7 +85,6 @@ void OReportControlModel::insertByIndex( ::sal_Int32 Index, const uno::Any& Elem
         if ( Index > static_cast<sal_Int32>(m_aFormatConditions.size()) )
             throw lang::IndexOutOfBoundsException();
 
-        //m_aFormatConditions.resize(m_aFormatConditions.size() + 1);
         m_aFormatConditions.insert(m_aFormatConditions.begin() + Index,xElement);
     }
 
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index fd9360e30b3c..716996232dbc 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -239,7 +239,6 @@ void lcl_extractAndStartStatusIndicator( const ::comphelper::MediaDescriptor& _r
     catch( const uno::Exception& )
     {
         OSL_ENSURE( sal_False, "lcl_extractAndStartStatusIndicator: caught an exception!" );
-//         DBG_UNHANDLED_EXCEPTION();
     }
 }
 // -----------------------------------------------------------------------------
@@ -318,30 +317,23 @@ OStyle::OStyle()
     registerPropertyNoMember( PROPERTY_NAME, ++i,nBound,::getCppuType( static_cast< ::rtl::OUString *>(NULL) ), &sName );
 
     registerPropertyNoMember(PROPERTY_BACKCOLOR,                    ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nTransparent);
-    //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICFILT),   ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty);
 
     registerPropertyNoMember(PROPERTY_BACKGRAPHICLOCATION,  ++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation);
-    //registerPropertyNoMember(PROPERTY_BACKGRAPHICURL, ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty);
     registerPropertyNoMember(PROPERTY_BACKTRANSPARENT,  ++i,nBound,::getBooleanCppuType() ,&bTrue);
-    //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_BACKCOLOR),    ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BORDERDIST),  ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBORDER),  ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBRDDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
     registerPropertyNoMember(PROPERTY_BOTTOMMARGIN, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nMargin);
     registerPropertyNoMember(MAP_CHAR_LEN("DisplayName"),       ++i,nBound,::getCppuType((rtl::OUString*)0) ,&sEmpty);
-    //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FIRSTPAGE), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero);
-    //
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL),  ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nTransparent);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT),  ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC),   ++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL),   ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), ++i,nBound,::getBooleanCppuType() ,&bTrue);
-    //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKCOL),   ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBRDDIST),  ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBOR),  ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBDIS), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
-    //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRDYNAMIC),   ++i,nBound,::getBooleanCppuType() ,&bFalse);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRHEIGHT),   ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRDYNAMIC),  ++i,nBound,::getBooleanCppuType() ,&bFalse);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRON),       ++i,nBound,::getBooleanCppuType() ,&bFalse);
@@ -349,12 +341,10 @@ OStyle::OStyle()
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBOR),  ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBDIS), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTMAR),  ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
-    //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRON),        ++i,nBound,::getBooleanCppuType() ,&bFalse);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBOR), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBDIS),++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTMAR), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHADOW),   ++i,nBound,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat);
-    //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRSHARED),    ++i,nBound,::getBooleanCppuType() ,&bFalse);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBOR),   ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBDIS),  ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
     //
@@ -363,12 +353,10 @@ OStyle::OStyle()
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC),   ++i,nBound|nMayBeVoid,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL),   ++i,nBound|nMayBeVoid,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN), ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bTrue);
-    //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKCOL),   ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBRDDIST),  ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBOR),  ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBDIS), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
-    //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRDYNAMIC),   ++i,nBound,::getBooleanCppuType() ,&bFalse);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRHEIGHT),   ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRDYNAMIC),  ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRON),       ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse);
@@ -376,23 +364,18 @@ OStyle::OStyle()
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBOR),  ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBDIS), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTMAR),  ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
-    //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRON),        ++i,nBound,::getBooleanCppuType() ,&bFalse);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBOR), ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBDIS),++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTMAR), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHADOW),   ++i,nBound|nMayBeVoid,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat);
-    //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRSHARED),    ++i,nBound,::getBooleanCppuType() ,&bFalse);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBOR),   ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBDIS),  ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
     //
     registerProperty(PROPERTY_HEIGHT,       ++i,nBound,&m_aSize.Height,     ::getCppuType((const sal_Int32*)0) );
-    //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_BACKTRANS),    ++i,nBound, ::getBooleanCppuType() ,&bFalse);
     registerPropertyNoMember(PROPERTY_ISLANDSCAPE,                  ++i,nBound,         ::getBooleanCppuType() ,&bFalse);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBORDER),  ++i,nBound,     ::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBRDDIST), ++i,nBound,     ::getCppuType((const sal_Int32*)0) ,&nZero);
     registerPropertyNoMember(PROPERTY_LEFTMARGIN,   ++i,beans::PropertyAttribute::BOUND,        ::getCppuType((const sal_Int32*)0) ,&nMargin);
-    //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTFTRCONT),   ++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL);
-    //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTHDRCONT),   ++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL);
     registerPropertyNoMember(PROPERTY_NUMBERINGTYPE,                ++i,nBound,::getCppuType((const sal_Int16*)0) ,&nNummeringType);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALEVAL),    ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero);
     registerPropertyNoMember(PROPERTY_PAGESTYLELAYOUT,              ++i,nBound,::getCppuType((const style::PageStyleLayout*)0) ,&ePageStyleLayout);
@@ -401,8 +384,6 @@ OStyle::OStyle()
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBORDER), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBRDDIST),++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
     registerPropertyNoMember(PROPERTY_RIGHTMARGIN,  ++i,beans::PropertyAttribute::BOUND,::getCppuType((const sal_Int32*)0) ,&nMargin);
-    //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTFTRCON),   ++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL);
-    //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTHDRCON),   ++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOPAG),  ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOX),    ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOY),    ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero);
@@ -411,12 +392,9 @@ OStyle::OStyle()
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_TOPBORDER),   ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
     registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_TOPBRDDIST),  ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
     registerPropertyNoMember(PROPERTY_TOPMARGIN,    ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nMargin);
-    //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKTRAN),++i,nBound,::getBooleanCppuType() ,&bFalse);
-    //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKTRAN),++i,nBound,::getBooleanCppuType() ,&bFalse);
     uno::Reference< container::XNameContainer> xAttribs = ::comphelper::NameContainer_createInstance(::getCppuType(static_cast< xml::AttributeData* >(NULL)));
     registerPropertyNoMember(MAP_CHAR_LEN("UserDefinedAttributes"),     ++i,nBound,::getCppuType((uno::Reference<container::XNameContainer>*)0) ,&xAttribs);
     registerProperty(PROPERTY_WIDTH,        ++i,nBound,&m_aSize.Width,::getCppuType((const sal_Int32*)0) );
-    //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNONAME_WRITING),        ++i,nBound,:.getCppuType((sal_Int16*)0) ,&n16Zero);
     registerPropertyNoMember(MAP_CHAR_LEN("PrinterName"),               ++i,nBound,::getCppuType((const ::rtl::OUString*)0),&sEmpty);
     uno::Sequence<sal_Int8> aSe;
     registerPropertyNoMember(MAP_CHAR_LEN("PrinterSetup"),              ++i,nBound,::getCppuType((const uno::Sequence<sal_Int8>*)0),&aSe);
@@ -747,7 +725,6 @@ OReportDefinition::~OReportDefinition()
 }
 // -----------------------------------------------------------------------------
 IMPLEMENT_FORWARD_REFCOUNT( OReportDefinition, ReportDefinitionBase )
-//IMPLEMENT_FORWARD_XINTERFACE2(OReportDefinition,ReportDefinitionBase,ReportDefinitionPropertySet)
 void OReportDefinition::init()
 {
     try
@@ -765,7 +742,7 @@ void OReportDefinition::init()
                 pCreatorThread->createSuspended();
                 pCreatorThread->setPriority(osl_Thread_PriorityBelowNormal);
                 pCreatorThread->resume();
-            } // for ( ; pIter != pEnd; ++pIter )
+            }
         }
 
         m_pImpl->m_pReportModel.reset(new OReportModel(this));
@@ -826,11 +803,6 @@ void SAL_CALL OReportDefinition::disposing()
     m_pImpl->m_xPageHeader.clear();
     m_pImpl->m_xPageFooter.clear();
     m_pImpl->m_xDetail.clear();
-    //::comphelper::disposeComponent(m_pImpl->m_xReportHeader);
-    //::comphelper::disposeComponent(m_pImpl->m_xReportFooter);
-    //::comphelper::disposeComponent(m_pImpl->m_xPageHeader);
-    //::comphelper::disposeComponent(m_pImpl->m_xPageFooter);
-    //::comphelper::disposeComponent(m_pImpl->m_xDetail);
     ::comphelper::disposeComponent(m_pImpl->m_xFunctions);
 
     //::comphelper::disposeComponent(m_pImpl->m_xStorage);
@@ -1409,10 +1381,6 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::getCurrentSelectio
 void OReportDefinition::impl_loadFromStorage_nolck_throw( const uno::Reference< embed::XStorage >& _xStorageToLoadFrom,
         const uno::Sequence< beans::PropertyValue >& _aMediaDescriptor )
 {
-//  ::osl::MutexGuard aGuard(m_aMutex);
-//  ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
-//
-
     m_pImpl->m_xStorage = _xStorageToLoadFrom;
 
     ::comphelper::MediaDescriptor aDescriptor( _aMediaDescriptor );
@@ -1512,7 +1480,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
     {
         const ::rtl::OUString sVal( aDescriptor.getUnpackedValueOrDefault(aDescriptor.PROP_DOCUMENTBASEURL(),::rtl::OUString()) );
         xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseURI")), uno::makeAny(sVal));
-    } // if ( aSaveOpt.IsSaveRelFSys() )
+    }
     const ::rtl::OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HierarchicalDocumentName")),::rtl::OUString()) );
     xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamRelPath")), uno::makeAny(sHierarchicalDocumentName));
 
@@ -1565,7 +1533,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
                 sWarnFile = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("meta.xml"));
             }
         }
-    } // if( !bErr )
+    }
 
     if( !bErr )
     {
@@ -1594,7 +1562,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
             bErr = sal_True;
             sErrFile = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml"));
         }
-    } // if ( !bErr )
+    }
 
     uno::Any aImage;
     uno::Reference< embed::XVisualObject > xCurrentController(getCurrentController(),uno::UNO_QUERY);
@@ -1909,15 +1877,12 @@ void SAL_CALL OReportDefinition::setVisualAreaSize( ::sal_Int64 _nAspect, const
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
-    //if( nAspect == embed::Aspects::MSOLE_CONTENT )
-    {
         bool bChanged =
             (m_pImpl->m_aVisualAreaSize.Width != _aSize.Width ||
              m_pImpl->m_aVisualAreaSize.Height != _aSize.Height);
         m_pImpl->m_aVisualAreaSize = _aSize;
         if( bChanged )
             setModified( sal_True );
-    }
     m_pImpl->m_nAspect = _nAspect;
 }
 // -----------------------------------------------------------------------------
@@ -2081,8 +2046,6 @@ uno::Reference< container::XIndexAccess > SAL_CALL OReportDefinition::getViewDat
     {
         m_pImpl->m_xViewData.set(m_aProps->m_xContext->getServiceManager()->createInstanceWithContext(
                 ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.IndexedPropertyValues")),m_aProps->m_xContext ),uno::UNO_QUERY);
-        //uno::Sequence< beans::PropertyValue > aProps;
-        //m_pImpl->m_xViewData->insertByIndex(m_pImpl->m_xViewData->getCount(),uno::makeAny(aProps));
         uno::Reference< container::XIndexContainer > xContainer(m_pImpl->m_xViewData,uno::UNO_QUERY);
         ::std::vector< uno::Reference< frame::XController> >::iterator aIter = m_pImpl->m_aControllers.begin();
         ::std::vector< uno::Reference< frame::XController> >::iterator aEnd = m_pImpl->m_aControllers.end();
@@ -2097,7 +2060,7 @@ uno::Reference< container::XIndexAccess > SAL_CALL OReportDefinition::getViewDat
                 catch(uno::Exception&)
                 {
                 }
-            } // if ( aIter->is() )
+            }
         }
 
     }
@@ -2271,7 +2234,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstanceWith
             *pIter >>= aValue;
             if( aValue.Name.equalsAscii( "Storage" ) )
                 aValue.Value >>= xStorage;
-        } // for(;pIter != pEnd ;++pIter)
+        }
         m_pImpl->m_pObjectContainer->SwitchPersistence(xStorage);
         xRet = static_cast< ::cppu::OWeakObject* >(SvXMLEmbeddedObjectHelper::Create( xStorage,*this, EMBEDDEDOBJECTHELPER_MODE_READ ));
     }
@@ -2283,7 +2246,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
     uno::Reference< drawing::XShape > xShape;
-    if ( aServiceSpecifier.indexOf( ::rtl::OUString::createFromAscii("com.sun.star.report.") ) == 0 )
+    if ( aServiceSpecifier.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.")) ) == 0 )
     {
         if ( aServiceSpecifier == SERVICE_SHAPE )
             xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CustomShape")) ),uno::UNO_QUERY_THROW);
@@ -2295,7 +2258,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co
         else
             xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OLE2Shape")) ),uno::UNO_QUERY_THROW);
     }
-    else if ( aServiceSpecifier.indexOf( ::rtl::OUString::createFromAscii("com.sun.star.form.component.") ) == 0 )
+    else if ( aServiceSpecifier.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.")) ) == 0 )
     {
         xShape.set(m_aProps->m_xContext->getServiceManager()->createInstanceWithContext(aServiceSpecifier,m_aProps->m_xContext),uno::UNO_QUERY);
     }
@@ -2327,35 +2290,30 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co
     {
         if ( !m_pImpl->m_xGradientTable.is() )
             m_pImpl->m_xGradientTable.set(SvxUnoGradientTable_createInstance(m_pImpl->m_pReportModel.get()),uno::UNO_QUERY);
-            //comphelper::NameContainer_createInstance( ::getCppuType( (const awt::Gradient*) 0 ) ).get();
         return m_pImpl->m_xGradientTable;
     }
     else if ( aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.HatchTable") ) == 0 )
     {
         if ( !m_pImpl->m_xHatchTable.is() )
             m_pImpl->m_xHatchTable.set(SvxUnoHatchTable_createInstance(m_pImpl->m_pReportModel.get()),uno::UNO_QUERY);
-            //comphelper::NameContainer_createInstance( ::getCppuType( (const drawing::Hatch*) 0 ) ).get();
         return m_pImpl->m_xHatchTable;
     }
     else if ( aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.BitmapTable") ) == 0 )
     {
         if ( !m_pImpl->m_xBitmapTable.is() )
             m_pImpl->m_xBitmapTable.set(SvxUnoBitmapTable_createInstance(m_pImpl->m_pReportModel.get()),uno::UNO_QUERY);
-            //comphelper::NameContainer_createInstance( ::getCppuType( (const ::rtl::OUString*) 0 ) ).get();
         return m_pImpl->m_xBitmapTable;
     }
     else if ( aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.TransparencyGradientTable") ) == 0 )
     {
         if ( !m_pImpl->m_xTransparencyGradientTable.is() )
             m_pImpl->m_xTransparencyGradientTable.set(SvxUnoTransGradientTable_createInstance(m_pImpl->m_pReportModel.get()),uno::UNO_QUERY);
-            //comphelper::NameContainer_createInstance( ::getCppuType( (const awt::Gradient*) 0 ) ).get();
         return m_pImpl->m_xTransparencyGradientTable;
     }
     else if ( aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DashTable") ) == 0 )
     {
         if ( !m_pImpl->m_xDashTable.is() )
             m_pImpl->m_xDashTable.set(SvxUnoDashTable_createInstance(m_pImpl->m_pReportModel.get()),uno::UNO_QUERY);
-            //comphelper::NameContainer_createInstance( ::getCppuType( (const drawing::LineDash*) 0 ) ).get();
         return m_pImpl->m_xDashTable;
     }
     else if( 0 == aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.MarkerTable") ) )
@@ -2761,7 +2719,7 @@ uno::Reference< frame::XUntitledNumbers > OReportDefinition::impl_getUntitledHel
         m_pImpl->m_xNumberedControllers = uno::Reference< frame::XUntitledNumbers >(static_cast< ::cppu::OWeakObject* >(pHelper), uno::UNO_QUERY_THROW);
 
         pHelper->setOwner          (xThis);
-        pHelper->setUntitledPrefix (::rtl::OUString::createFromAscii(" : "));
+        pHelper->setUntitledPrefix (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" : ")));
     }
 
     return m_pImpl->m_xNumberedControllers;
diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx
index feb94419f337..87d9982b57fe 100644
--- a/reportdesign/source/core/api/ReportEngineJFree.cxx
+++ b/reportdesign/source/core/api/ReportEngineJFree.cxx
@@ -198,7 +198,7 @@ void SAL_CALL OReportEngineJFree::setStatusIndicator( const uno::Reference< task
             {
                 xStorageProp->setPropertyValue( s_sMediaType, uno::makeAny(sMimeType));
             }
-            m_xReport->storeToStorage(xTemp,aEmpty); // store to temp file because it may contain information which aren't in the database yet.
+            m_xReport->storeToStorage(xTemp,aEmpty); // store to temp file because it may contain information which isn't in the database yet.
 
             uno::Sequence< beans::NamedValue > aConvertedProperties(8);
             sal_Int32 nPos = 0;
@@ -262,7 +262,6 @@ void SAL_CALL OReportEngineJFree::setStatusIndicator( const uno::Reference< task
                 xJob->execute(aConvertedProperties);
                 if ( xStorageProp.is() )
                 {
-                    //xStorageProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"))) >>= sOutputName;
                     sOutputName = sFileURL;
                 }
             }
@@ -333,7 +332,6 @@ uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive
             }
 
             uno::Reference< lang::XMultiServiceFactory > xFac(m_xContext->getServiceManager(),uno::UNO_QUERY);
-            /*::comphelper::MimeConfigurationHelper aHelper(xFac);*/
             xModel.set( xFrameLoad->loadComponentFromURL(
                 sOutputName,
                 ::rtl::OUString(), // empty frame name
diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx
index 54e5cd8847ca..6c6aba20a81b 100644
--- a/reportdesign/source/core/api/Section.cxx
+++ b/reportdesign/source/core/api/Section.cxx
@@ -136,7 +136,6 @@ OSection::OSection(const uno::Reference< report::XReportDefinition >& _xParent
 {
     DBG_CTOR( rpt_OSection,NULL);
     init();
-    //.getSdrModel()->createNewPage(m_xSection);
 }
 //--------------------------------------------------------------------------
 // TODO: VirtualFunctionFinder: This is virtual function!
@@ -179,28 +178,6 @@ void SAL_CALL OSection::disposing()
     lang::EventObject aDisposeEvent( static_cast< ::cppu::OWeakObject* >( this ) );
     m_aContainerListeners.disposeAndClear( aDisposeEvent );
     m_xContext.clear();
-    //m_xDrawPage.clear();
-
-    /*uno::Reference< report::XReportDefinition> xReport = getReportDefinition();
-    ::boost::shared_ptr<rptui::OReportModel> pModel = OReportDefinition::getSdrModel(xReport);
-    osl_incrementInterlockedCount( &m_refCount );
-    while( m_xDrawPage.is() && m_xDrawPage->hasElements() )
-    {
-        try
-        {
-            uno::Reference< drawing::XShape> xShape(m_xDrawPage->getByIndex(0),uno::UNO_QUERY);
-            m_xDrawPage->remove(xShape);
-            ::comphelper::disposeComponent(xShape);
-        }
-        catch(const uno::Exception&)
-        {}
-    }
-    if ( pModel )
-    {
-        uno::Reference< report::XSection> xSection = this;
-        pModel->DeletePage(pModel->getPage(xSection)->GetPageNum());
-    }
-    osl_decrementInterlockedCount( &m_refCount );*/
 }
 //--------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OSection::getImplementationName(  ) throw(uno::RuntimeException)
@@ -471,7 +448,7 @@ const ::std::vector< ::rtl::OUString >& lcl_getControlModelMap()
         s_sControlModels.push_back( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageControl")) );
         s_sControlModels.push_back( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormattedField")) );
         s_sControlModels.push_back( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Shape")) );
-    } // if ( s_sMap.empty() )
+    }
     return s_sControlModels;
 
 }
@@ -504,9 +481,8 @@ uno::Reference< report::XReportComponent > SAL_CALL OSection::createReportCompon
             xRet.set(xFac->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape"))),uno::UNO_QUERY);
             break;
         default:
-            //xRet = new OShape(m_xContext);
             break;
-    } // switch( aRet.begin() - aFind  )
+    }
     return xRet;
 }
 // -----------------------------------------------------------------------------
diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx
index 4ed2b8aabb9d..2fa28cd0f81d 100644
--- a/reportdesign/source/core/api/Shape.cxx
+++ b/reportdesign/source/core/api/Shape.cxx
@@ -322,11 +322,9 @@ uno::Reference< util::XCloneable > SAL_CALL OShape::createClone(  ) throw (uno::
                 if ( pClone )
                 {
                     xSet.set(pClone->getUnoShape(),uno::UNO_QUERY_THROW );
-
-                    // ::comphelper::copyProperties(xSource.get(),xSet.get());
                 }
             }
-        } // if ( pShape )
+        }
     }
     catch(const uno::Exception&)
     {
@@ -345,11 +343,6 @@ void SAL_CALL OShape::setParent( const uno::Reference< uno::XInterface >& Parent
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     m_aProps.aComponent.m_xParent = uno::Reference< container::XChild >(Parent,uno::UNO_QUERY);
-    // not supported by the shape
-    //uno::Reference< container::XChild > xChild;
-    //comphelper::query_aggregation(m_aProps.aComponent.m_xProxy,xChild);
-    //if ( xChild.is() )
-       // xChild->setParent(Parent);
 }
 uno::Reference< report::XFormatCondition > SAL_CALL OShape::createFormatCondition(  ) throw (uno::Exception, uno::RuntimeException)
 {
diff --git a/reportdesign/source/core/inc/Tools.hxx b/reportdesign/source/core/inc/Tools.hxx
index 343acfbdf859..f61bd095ff2a 100644
--- a/reportdesign/source/core/inc/Tools.hxx
+++ b/reportdesign/source/core/inc/Tools.hxx
@@ -50,7 +50,6 @@ namespace reportdesign
         if ( _bOn && !_xSection.is() )
             _xSection = new OSection(_xParent,_xParent->getContext(),_bPageSection);
         else if ( !_bOn )
-            //_xSection.clear();
             ::comphelper::disposeComponent(_xSection);
     }
 
@@ -96,7 +95,7 @@ namespace reportdesign
     public:
         template<typename T> static void setSize(const ::com::sun::star::awt::Size& aSize,T* _pShape)
         {
-            OSL_ENSURE(aSize.Width >= 0 && aSize.Height >= 0,"Illegal with or height!");
+            OSL_ENSURE(aSize.Width >= 0 && aSize.Height >= 0,"Illegal width or height!");
 
             ::osl::MutexGuard aGuard(_pShape->m_aMutex);
             if ( _pShape->m_aProps.aComponent.m_xShape.is() )
@@ -118,7 +117,7 @@ namespace reportdesign
             if ( _pShape->m_aProps.aComponent.m_xShape.is() )
             {
                 ::com::sun::star::awt::Size aSize = _pShape->m_aProps.aComponent.m_xShape->getSize();
-                OSL_ENSURE(aSize.Width >= 0 && aSize.Height >= 0,"Illegal with or height!");
+                OSL_ENSURE(aSize.Width >= 0 && aSize.Height >= 0,"Illegal width or height!");
                 return aSize;
             }
             return ::com::sun::star::awt::Size(_pShape->m_aProps.aComponent.m_nWidth,_pShape->m_aProps.aComponent.m_nHeight);
@@ -154,7 +153,6 @@ namespace reportdesign
             if ( _pShape->m_aProps.aComponent.m_xShape.is() )
             {
                 ::com::sun::star::awt::Point aPosition = _pShape->m_aProps.aComponent.m_xShape->getPosition();
-//                OSL_ENSURE(aPosition.X >= 0 && aPosition.Y >= 0,"Illegal position!");
                 return aPosition;
             }
             return ::com::sun::star::awt::Point(_pShape->m_aProps.aComponent.m_nPosX,_pShape->m_aProps.aComponent.m_nPosY);
diff --git a/reportdesign/source/core/resource/strings.src b/reportdesign/source/core/resource/strings.src
index d6191e2f381e..bdc63648633a 100644
--- a/reportdesign/source/core/resource/strings.src
+++ b/reportdesign/source/core/resource/strings.src
@@ -31,26 +31,32 @@ String RID_STR_DETAIL
 {
     Text [ en-US ] = "Detail";
 };
+
 String RID_STR_PAGE_HEADER
 {
     Text [ en-US ] = "Page Header";
 };
+
 String RID_STR_PAGE_FOOTER
 {
     Text [ en-US ] = "Page Footer";
 };
+
 String RID_STR_GROUP_HEADER
 {
     Text [ en-US ] = "Group Header";
 };
+
 String RID_STR_GROUP_FOOTER
 {
     Text [ en-US ] = "Group Footer";
 };
+
 String RID_STR_REPORT_HEADER
 {
     Text [ en-US ] = "Report Header";
 };
+
 String RID_STR_REPORT_FOOTER
 {
     Text [ en-US ] = "Report Footer";
@@ -65,30 +71,37 @@ String RID_STR_ERROR_WRONG_ARGUMENT
 {
     Text [ en-US ] = "You tried to set an illegal argument. Please have a look at '#1' for valid arguments.";
 };
+
 String RID_STR_ARGUMENT_IS_NULL
 {
     Text [ en-US ] = "The element is invalid.";
 };
+
 String RID_STR_FIXEDTEXT
 {
     Text [ en-US ] = "Label field" ;
 };
+
 String RID_STR_FORMATTEDFIELD
 {
     Text [ en-US ] = "Formatted field";
 };
+
 String RID_STR_IMAGECONTROL
 {
     Text [ en-US ] = "Image control" ;
 };
+
 String RID_STR_REPORT
 {
     Text [ en-US ] = "Report";
 };
+
 String RID_STR_SHAPE
 {
     Text [ en-US ] = "Shape";
 };
+
 String RID_STR_FIXEDLINE
 {
     Text [ en-US ] = "Fixed line";
diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx
index 307b6f26c390..d03473b5042d 100644
--- a/reportdesign/source/core/sdr/PropertyForward.cxx
+++ b/reportdesign/source/core/sdr/PropertyForward.cxx
@@ -94,7 +94,7 @@ OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource
             DBG_UNHANDLED_EXCEPTION();
             (void)e;
         }
-    } // if ( m_xDest.is() && m_xSource.is() )
+    }
     osl_decrementInterlockedCount(&m_refCount);
 }
 // -----------------------------------------------------------------------------
diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx
index 2aa9cca9d187..90c27177ca7f 100644
--- a/reportdesign/source/core/sdr/ReportDrawPage.cxx
+++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx
@@ -134,7 +134,6 @@ uno::Reference< drawing::XShape >  OReportDrawPage::_CreateShape( SdrObject *pOb
             SvxOle2Shape* pShape = new SvxOle2Shape( pObj );
             xShape.set(*pShape,uno::UNO_QUERY);
             pShape->setShapeKind(pObj->GetObjIdentifier());
-            //xShape = new SvxOle2Shape( pOle2Obj );
         }
 
         if ( !xShape.is() )
diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx b/reportdesign/source/core/sdr/ReportUndoFactory.cxx
index a16963c95573..a469248f7cb5 100644
--- a/reportdesign/source/core/sdr/ReportUndoFactory.cxx
+++ b/reportdesign/source/core/sdr/ReportUndoFactory.cxx
@@ -96,7 +96,6 @@ SdrUndoAction* OReportUndoFactory::CreateUndoInsertObject( SdrObject& rObject, b
 SdrUndoAction* OReportUndoFactory::CreateUndoDeleteObject( SdrObject& rObject, bool /*bOrdNumDirect*/ )
 {
     return lcl_createUndo(rObject,rptui::Removed,RID_STR_UNDO_DELETE_CONTROL);
-    //return m_pUndoFactory->CreateUndoDeleteObject( rObject, bOrdNumDirect ? TRUE : FALSE );
 }
 
 SdrUndoAction* OReportUndoFactory::CreateUndoNewObject( SdrObject& rObject, bool /*bOrdNumDirect*/ )
diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx
index 7b98042f9aeb..5fd634c61264 100644
--- a/reportdesign/source/core/sdr/RptModel.cxx
+++ b/reportdesign/source/core/sdr/RptModel.cxx
@@ -71,13 +71,6 @@ OReportModel::OReportModel(::reportdesign::OReportDefinition* _pReportDefinition
     m_pUndoEnv = new OXUndoEnvironment(*this);
     m_pUndoEnv->acquire();
     SetSdrUndoFactory(new OReportUndoFactory);
-
- //   SvxFontNameToolBoxControl::RegisterControl(SID_ATTR_CHAR_FONT);
-    //SvxFontHeightToolBoxControl::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT);
-    //SvxFontColorToolBoxControl::RegisterControl(SID_ATTR_CHAR_COLOR);
-    //SvxFontColorExtToolBoxControl::RegisterControl(SID_ATTR_CHAR_COLOR2);
-    //SvxFontColorExtToolBoxControl::RegisterControl(SID_ATTR_CHAR_COLOR_BACKGROUND);
-    //SvxColorToolBoxControl::RegisterControl(SID_BACKGROUND_COLOR);
 }
 
 //----------------------------------------------------------------------------
@@ -134,10 +127,6 @@ void OReportModel::SetModified(sal_Bool _bModified)
 SdrPage* OReportModel::RemovePage(USHORT nPgNum)
 {
     OReportPage* pPage = dynamic_cast<OReportPage*>(SdrModel::RemovePage(nPgNum));
-    //if ( pPage )
-    //{
-    //    m_pUndoEnv->RemoveSection(pPage);
-    //}
     return pPage;
 }
 // -----------------------------------------------------------------------------
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index 9e7a83a5b557..9410c75019e6 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -207,7 +207,7 @@ namespace
                     default:
                         OSL_ENSURE(0,"Illegal text alignment value!");
                         break;
-                } // switch(nTextAlign)
+                }
                 aRet <<= (style::ParagraphAdjust)nTextAlign;
             }
             else
@@ -230,7 +230,7 @@ namespace
                     default:
                         OSL_ENSURE(0,"Illegal text alignment value!");
                         break;
-                } // switch(eParagraphAdjust)
+                }
                 aRet <<= nTextAlign;
             }
             return aRet;
@@ -251,7 +251,6 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId)
                     s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBACKGROUND,TPropertyConverter(PROPERTY_BACKGROUNDCOLOR,aNoConverter)));
                     s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBORDER,TPropertyConverter(PROPERTY_BORDER,aNoConverter)));
                     s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBORDERCOLOR,TPropertyConverter(PROPERTY_BORDERCOLOR,aNoConverter)));
-                    //s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_PARAADJUST,PROPERTY_ALIGN));
                 }
                 return s_aNameMap;
             }
@@ -292,7 +291,6 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId)
                     s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLTEXTEMPHASISMARK,TPropertyConverter(PROPERTY_FONTEMPHASISMARK,aNoConverter)));
                     s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBORDER,TPropertyConverter(PROPERTY_BORDER,aNoConverter)));
                     s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_CONTROLBORDERCOLOR,TPropertyConverter(PROPERTY_BORDERCOLOR,aNoConverter)));
-                    //s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_PARAADJUST,TPropertyConverter(PROPERTY_ALIGN,aNoConverter)));
                     ::boost::shared_ptr<AnyConverter> aParaAdjust(new ParaAdjust());
                     s_aNameMap.insert(TPropertyNamePair::value_type(PROPERTY_PARAADJUST,TPropertyConverter(PROPERTY_ALIGN,aParaAdjust)));
                 }
@@ -749,11 +747,6 @@ void OUnoObject::NbcMove( const Size& rSize )
 
             // LLA: why there exists getPositionX and getPositionY and NOT getPosition() which return a Point?
             int nNewX = m_xReportComponent->getPositionX() + rSize.A();
-            // can this hinder us to set components outside the area?
-            // if (nNewX < 0)
-            // {
-            //     nNewX = 0;
-            // }
             m_xReportComponent->setPositionX(nNewX);
             int nNewY = m_xReportComponent->getPositionY() + rSize.B();
             if (nNewY < 0 && !bUndoMode)
@@ -766,14 +759,7 @@ void OUnoObject::NbcMove( const Size& rSize )
         }
         if (bPositionFixed)
         {
-            // OReportModel* pRptModel = static_cast<OReportModel*>(GetModel());
-            // if ( pRptModel )
-            // {
-            //    if (! pRptModel->GetUndoEnv().IsLocked())
-            //    {
-                    GetModel()->AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoMoveObject(*this, aUndoSize));
-            //    }
-            // }
+            GetModel()->AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoMoveObject(*this, aUndoSize));
         }
         // set geometry properties
         SetPropsFromRect(GetLogicRect());
@@ -965,7 +951,7 @@ SdrObject* OUnoObject::Clone() const
         Reference<XPropertySet> xDest(pClone->getUnoShape(),uno::UNO_QUERY);
         if ( xSource.is() && xDest.is() )
             comphelper::copyProperties(xSource.get(),xDest.get());
-    } // if ( pClone )
+    }
     return pClone;
 }
 //----------------------------------------------------------------------------
@@ -1139,7 +1125,7 @@ uno::Reference< chart2::data::XDatabaseDataProvider > lcl_getDataProvider(const
         {
             xSource.set(xChartDoc->getDataProvider(),uno::UNO_QUERY);
         }
-    } // if( xCompSupp.is())
+    }
     return xSource;
 }
 // -----------------------------------------------------------------------------
@@ -1175,7 +1161,7 @@ void OOle2Obj::impl_createDataProvider_nothrow(const uno::Reference< frame::XMod
             uno::Reference< lang::XMultiServiceFactory> xFac(_xModel,uno::UNO_QUERY);
             uno::Reference< chart2::data::XDatabaseDataProvider > xDataProvider( xFac->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.data.DataProvider"))),uno::UNO_QUERY);
             xReceiver->attachDataProvider( xDataProvider.get() );
-        } // if( xReceiver.is() )
+        }
     }
     catch(uno::Exception)
     {
diff --git a/reportdesign/source/core/sdr/RptObjectListener.cxx b/reportdesign/source/core/sdr/RptObjectListener.cxx
index 01ba228ffb96..693e76028faf 100644
--- a/reportdesign/source/core/sdr/RptObjectListener.cxx
+++ b/reportdesign/source/core/sdr/RptObjectListener.cxx
@@ -56,13 +56,6 @@ OObjectListener::~OObjectListener()
 
 void SAL_CALL OObjectListener::disposing( const  ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException)
 {
-    /*
-    // disconnect the listener
-    if (m_pObject)
-    {
-        (m_pObject->m_xPropertyChangeListener).clear();
-    }
-    */
 }
 
 // XPropertyChangeListener
diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx
index fe9ae18cdb52..5ed073d3fff6 100644
--- a/reportdesign/source/core/sdr/RptPage.cxx
+++ b/reportdesign/source/core/sdr/RptPage.cxx
@@ -92,7 +92,7 @@ ULONG OReportPage::getIndexOf(const uno::Reference< report::XReportComponent >&
         {
             break;
         }
-    } // for (; i < nCount; ++i)
+    }
     return i;
 }
 //----------------------------------------------------------------------------
@@ -106,7 +106,7 @@ void OReportPage::removeSdrObject(const uno::Reference< report::XReportComponent
         OSL_ENSURE(pBase,"Why is this not a OObjectBase?");
         if ( pBase )
             pBase->EndListening();
-        /*delete */RemoveObject(nPos);
+        RemoveObject(nPos);
     }
 }
 // -----------------------------------------------------------------------------
@@ -132,26 +132,11 @@ SdrObject* OReportPage::RemoveObject(ULONG nObjNum)
     return pObj;
 }
 //----------------------------------------------------------------------------
-//namespace
-//{
-//  ::rtl::OUString lcl_getControlName(const uno::Reference< lang::XServiceInfo >& _xServiceInfo)
-//  {
-//      if ( _xServiceInfo->supportsService( SERVICE_FIXEDTEXT ))
-//          return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText"));
-//        if ( _xServiceInfo->supportsService( SERVICE_FORMATTEDFIELD ))
-//          return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField"));
-//      if ( _xServiceInfo->supportsService( SERVICE_IMAGECONTROL))
-//          return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl"));
-//
-//      return ::rtl::OUString();
-//  }
-//}
-//----------------------------------------------------------------------------
 void OReportPage::insertObject(const uno::Reference< report::XReportComponent >& _xObject)
 {
     DBG_CHKTHIS( rpt_OReportPage,NULL);
     OSL_ENSURE(_xObject.is(),"Object is not valid to create a SdrObject!");
-    if ( !_xObject.is() ) // || !m_pView )
+    if ( !_xObject.is() )
         return;
     ULONG nPos = getIndexOf(_xObject);
     if ( nPos < GetObjCount() )
@@ -232,14 +217,6 @@ void OReportPage::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertRe
     uno::Reference< drawing::XShape> xShape(pObj->getUnoShape(),uno::UNO_QUERY);
     pSection->notifyElementAdded(xShape);
 
-    //// check if we are a shape
-    //uno::Reference<beans::XPropertySet> xProp(xShape,uno::UNO_QUERY);
-    //if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID"))) )
-    //{
-    //    // use MimeConfigurationHelper::GetStringClassIDRepresentation(MimeConfigurationHelper::GetSequenceClassID(SO3_SCH_OLE_EMBED_CLASSID_8))
-    //    xProp->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID")),uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12dcae26-281f-416f-a234-c3086127382e"))));
-    //}
-
     // now that the shape is inserted into its structures, we can allow the OObjectBase
     // to release the reference to it
     OObjectBase* pObjectBase = dynamic_cast< OObjectBase* >( pObj );
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx
index 780113958495..ae3a1447df21 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -213,8 +213,6 @@ void SAL_CALL OXUndoEnvironment::disposing(const EventObject& e) throw( RuntimeE
             RemoveSection(xSection);
         else
             RemoveElement(xSourceSet);
-        /*if (!m_pImpl->m_aPropertySetCache.empty())
-            m_pImpl->m_aPropertySetCache.erase(xSourceSet);*/
     }
 }
 
@@ -383,7 +381,6 @@ void SAL_CALL OXUndoEnvironment::elementInserted(const ContainerEvent& evt) thro
 //------------------------------------------------------------------------------
 void OXUndoEnvironment::implSetModified()
 {
-    //if ( !IsLocked() )
     m_pImpl->m_rModel.SetModified( sal_True );
 }
 
diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx
index fae4e234bdb3..8b7e420de60a 100644
--- a/reportdesign/source/filter/xml/dbloader2.cxx
+++ b/reportdesign/source/filter/xml/dbloader2.cxx
@@ -77,7 +77,7 @@ ORptTypeDetection::ORptTypeDetection(Reference< XComponentContext > const & xCon
                     if ( sMediaType.equalsAscii(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII) )
                         return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StarBaseReport"));
                     ::comphelper::disposeComponent(xProp);
-                } // if ( xProp.is() )
+                }
             }
             catch(Exception&)
             {
@@ -116,7 +116,7 @@ Sequence< ::rtl::OUString > SAL_CALL ORptTypeDetection::getSupportedServiceNames
 Sequence< ::rtl::OUString > ORptTypeDetection::getSupportedServiceNames_Static(void) throw( RuntimeException )
 {
     Sequence< ::rtl::OUString > aSNS( 1 );
-    aSNS.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExtendedTypeDetection");
+    aSNS.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExtendedTypeDetection"));
     return aSNS;
 }
 // -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx
index 442017d9a940..b58309ecda91 100644
--- a/reportdesign/source/filter/xml/dbloader2.hxx
+++ b/reportdesign/source/filter/xml/dbloader2.hxx
@@ -91,7 +91,7 @@ public:
     // static methods
     static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException )
     {
-        return ::rtl::OUString::createFromAscii("com.sun.star.comp.report.ORptTypeDetection");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.ORptTypeDetection"));
     }
     static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException );
     static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index a8fdacf51e9e..5794e46a9886 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -88,13 +88,13 @@ namespace rptxml
     //---------------------------------------------------------------------
     ::rtl::OUString ORptExportHelper::getImplementationName_Static(  ) throw (RuntimeException)
     {
-        return ::rtl::OUString::createFromAscii("com.sun.star.comp.report.XMLSettingsExporter");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.XMLSettingsExporter"));
     }
     //---------------------------------------------------------------------
     Sequence< ::rtl::OUString > ORptExportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
     {
         Sequence< ::rtl::OUString > aSupported(1);
-        aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExportFilter");
+        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter"));
         return aSupported;
     }
     //---------------------------------------------------------------------
@@ -105,13 +105,13 @@ namespace rptxml
     //---------------------------------------------------------------------
     ::rtl::OUString ORptContentExportHelper::getImplementationName_Static(  ) throw (RuntimeException)
     {
-        return ::rtl::OUString::createFromAscii("com.sun.star.comp.report.XMLContentExporter");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.XMLContentExporter"));
     }
     //---------------------------------------------------------------------
     Sequence< ::rtl::OUString > ORptContentExportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
     {
         Sequence< ::rtl::OUString > aSupported(1);
-        aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExportFilter");
+        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter"));
         return aSupported;
     }
 
@@ -124,13 +124,13 @@ namespace rptxml
     //---------------------------------------------------------------------
     ::rtl::OUString ORptStylesExportHelper::getImplementationName_Static(  ) throw (RuntimeException)
     {
-        return ::rtl::OUString::createFromAscii("com.sun.star.comp.report.XMLStylesExporter");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.XMLStylesExporter"));
     }
     //---------------------------------------------------------------------
     Sequence< ::rtl::OUString > ORptStylesExportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
     {
         Sequence< ::rtl::OUString > aSupported(1);
-        aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExportFilter");
+        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter"));
         return aSupported;
     }
 
@@ -142,13 +142,13 @@ namespace rptxml
     //---------------------------------------------------------------------
     ::rtl::OUString ORptMetaExportHelper::getImplementationName_Static(  ) throw (RuntimeException)
     {
-        return ::rtl::OUString::createFromAscii("com.sun.star.comp.report.XMLMetaExporter");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.XMLMetaExporter"));
     }
     //---------------------------------------------------------------------
     Sequence< ::rtl::OUString > ORptMetaExportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
     {
         Sequence< ::rtl::OUString > aSupported(1);
-        aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExportFilter");
+        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter"));
         return aSupported;
     }
 
@@ -160,13 +160,13 @@ namespace rptxml
     //---------------------------------------------------------------------
     ::rtl::OUString ODBFullExportHelper::getImplementationName_Static(  ) throw (RuntimeException)
     {
-        return ::rtl::OUString::createFromAscii("com.sun.star.comp.report.XMLFullExporter");
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.XMLFullExporter"));
     }
     //---------------------------------------------------------------------
     Sequence< ::rtl::OUString > ODBFullExportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
     {
         Sequence< ::rtl::OUString > aSupported(1);
-        aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExportFilter");
+        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter"));
         return aSupported;
     }
 
@@ -284,7 +284,6 @@ ORptExport::ORptExport(const Reference< XMultiServiceFactory >& _rxMSF,sal_uInt1
     xTableStylesPropertySetMapper1->AddMapperEntry(xTableStylesPropertySetMapper2);
 
     m_xTableStylesExportPropertySetMapper = new SvXMLExportPropertyMapper(xTableStylesPropertySetMapper1);
-    //m_xTableStylesExportPropertySetMapper->ChainExportMapper(xTableStylesPropertySetMapper2);
 
     m_xCellStylesPropertySetMapper = OXMLHelper::GetCellStylePropertyMap();
     m_xCellStylesExportPropertySetMapper = new OSpecialHanldeXMLExportPropertyMapper(m_xCellStylesPropertySetMapper);
@@ -298,7 +297,6 @@ ORptExport::ORptExport(const Reference< XMultiServiceFactory >& _rxMSF,sal_uInt1
 
     UniReference < XMLPropertySetMapper > xPropMapper(new XMLTextPropertySetMapper( TEXT_PROP_MAP_PARA ));
     m_xParaPropMapper = new OSpecialHanldeXMLExportPropertyMapper( xPropMapper);
-    // m_xParaPropMapper->ChainExportMapper(XMLTextParagraphExport::CreateParaExtPropMapper(*this));
 
     ::rtl::OUString sFamily( GetXMLToken(XML_PARAGRAPH) );
     ::rtl::OUString aPrefix( String( 'P' ) );
@@ -405,13 +403,12 @@ void ORptExport::exportReport(const Reference<XReportDefinition>& _xReportDefini
     {
         exportFunctions(_xReportDefinition->getFunctions().get());
         exportGroupsExpressionAsFunction(_xReportDefinition->getGroups());
-        //exportMasterDetailFields(_xReportDefinition.get());
 
         if ( _xReportDefinition->getReportHeaderOn() )
         {
             SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_REPORT_HEADER, sal_True, sal_True);
             exportSection(_xReportDefinition->getReportHeader());
-        } // if ( _xReportDefinition->getReportHeaderOn() )
+        }
         if ( _xReportDefinition->getPageHeaderOn() )
         {
             ::rtl::OUStringBuffer sValue;
@@ -422,7 +419,7 @@ void ORptExport::exportReport(const Reference<XReportDefinition>& _xReportDefini
 
             SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_PAGE_HEADER, sal_True, sal_True);
             exportSection(_xReportDefinition->getPageHeader(),true);
-        } // if ( _xReportDefinition->getPageHeaderOn() )
+        }
 
         exportGroup(_xReportDefinition,0);
 
@@ -435,12 +432,12 @@ void ORptExport::exportReport(const Reference<XReportDefinition>& _xReportDefini
                 AddAttribute(XML_NAMESPACE_REPORT, XML_PAGE_PRINT_OPTION,sValue.makeStringAndClear());
             SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_PAGE_FOOTER, sal_True, sal_True);
             exportSection(_xReportDefinition->getPageFooter(),true);
-        } // if ( _xReportDefinition->getPageFooterOn() )
+        }
         if ( _xReportDefinition->getReportFooterOn() )
         {
             SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_REPORT_FOOTER, sal_True, sal_True);
             exportSection(_xReportDefinition->getReportFooter());
-        } // if ( _xReportDefinition->getReportFooterOn() )
+        }
     }
 }
 // -----------------------------------------------------------------------------
@@ -472,7 +469,7 @@ void ORptExport::exportFormatConditions(const Reference<XReportControlModel>& _x
 
             exportStyleName(xCond.get(),GetAttrList(),m_sCellStyle);
             SvXMLElementExport aElem(*this,XML_NAMESPACE_REPORT, XML_FORMAT_CONDITION, sal_True, sal_True);
-        } // for (sal_Int32 i = 0; i < nCount ; ++i)
+        }
     }
     catch(uno::Exception&)
     {
@@ -500,7 +497,7 @@ void ORptExport::exportReportElement(const Reference<XReportControlModel>& _xRep
     {
         exportFormula(XML_FORMULA,sExpr);
         SvXMLElementExport aPrintExpr(*this,XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION, sal_True, sal_True);
-    } // if ( sExpr.getLength() )
+    }
 
     // only export when parent exists
     uno::Reference< report::XSection> xParent(_xReportElement->getParent(),uno::UNO_QUERY);
@@ -719,7 +716,7 @@ void ORptExport::exportReportComponentAutoStyles(const Reference<XSection>& _xPr
                     {
                         uno::Reference< report::XFormatCondition > xCond(xFormattedField->getByIndex(j),uno::UNO_QUERY);
                         exportAutoStyle(xCond.get(),xFormattedField);
-                    } // for (sal_Int32 j = 0; j < nCount ; ++j)
+                    }
                 }
                 catch(uno::Exception&)
                 {
@@ -971,7 +968,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection)
                                     exportSection(xSection);
                             }
                         }
-                    } // if ( aColIter->xElement.is() )
+                    }
                     else if ( !bShapeHandled )
                     {
                         bShapeHandled = true;
@@ -989,7 +986,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection)
                     }
 
                 }
-            } // for (sal_Int32 i = 0 ; i< nCount ; ++i)
+            }
             if ( nEmptyCellColSpan )
             {
                 {
@@ -1037,21 +1034,6 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection)
     ::rtl::OUString sFormula = _sFormula;
     if ( _sFormula.equalsAsciiL("rpt:",4) )
         sFormula = ::rtl::OUString();
-    //sal_Int32 nLength = _sFormula.getLength();
-    //if ( nLength )
-    //{
-    //    sal_Int32 nPos = 0;
-    //    if ( _sFormula.matchAsciiL("=",1) != 0 )
-    //    {
-    //        nPos = 1;
-    //        --nLength;
-    //    }
-    //    bool bFormula = _sFormula.indexOf('[') != -1 || _sFormula.indexOf('(') != -1;
-    //    if ( bFormula )
-    //        sFormula = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:")) + _sFormula.copy(nPos,nLength);
-    //    else
-    //        sFormula = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("field:[")) + _sFormula.copy(nPos,nLength) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("]"));;
-    //}
     return sFormula;
 }
 // -----------------------------------------------------------------------------
@@ -1157,7 +1139,7 @@ sal_Bool ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDef
                             AddAttribute(XML_NAMESPACE_REPORT, XML_REPEAT_SECTION,XML_TRUE );
                         SvXMLElementExport aGroupSection(*this,XML_NAMESPACE_REPORT, XML_GROUP_FOOTER, sal_True, sal_True);
                         exportSection(xSection);
-                    } // if ( xGroup->getFooterOn() )
+                    }
                 }
             }
             else if ( _bExportAutoStyle )
@@ -1259,37 +1241,6 @@ void ORptExport::exportAutoStyle(XPropertySet* _xProp,const Reference<XFormatted
     }
     else
     {
-        //sal_Int32 nTextAlignIndex = m_xCellStylesExportPropertySetMapper->getPropertySetMapper()->FindEntryIndex( CTF_SD_SHAPE_PARA_ADJUST );
-        //if ( nTextAlignIndex != -1 )
-        //{
-        //    ::std::vector< XMLPropertyState >::iterator aIter = aPropertyStates.begin();
-        //    ::std::vector< XMLPropertyState >::iterator aEnd = aPropertyStates.end();
-        //    for (; aIter != aEnd; ++aIter)
-        //    {
-        //        if ( aIter->mnIndex == nTextAlignIndex )
-        //        {
-        //            sal_Int16 nTextAlign = 0;
-        //            aIter->maValue >>= nTextAlign;
-        //            switch(nTextAlign)
-        //            {
-        //                case awt::TextAlign::LEFT:
-        //                    nTextAlign = style::ParagraphAdjust_LEFT;
-        //                    break;
-        //                case awt::TextAlign::CENTER:
-        //                    nTextAlign = style::ParagraphAdjust_CENTER;
-        //                    break;
-        //                case awt::TextAlign::RIGHT:
-        //                    nTextAlign = style::ParagraphAdjust_RIGHT;
-        //                    break;
-        //                default:
-        //                    OSL_ENSURE(0,"Illegal text alignment value!");
-        //                    break;
-        //            }
-        //            aIter->maValue <<= nTextAlign;
-        //            break;
-        //        }
-        //    }
-        //}
         const Reference<XFormattedField> xFormattedField(_xProp,uno::UNO_QUERY);
         if ( (_xParentFormattedField.is() || xFormattedField.is()) && !aPropertyStates.empty() )
         {
@@ -1307,7 +1258,6 @@ void ORptExport::exportAutoStyle(XPropertySet* _xProp,const Reference<XFormatted
         }
     }
 
-
     if ( !aPropertyStates.empty() )
         m_aAutoStyleNames.insert( TPropertyStyleMap::value_type(_xProp,GetAutoStylePool()->Add( XML_STYLE_FAMILY_TABLE_CELL, aPropertyStates )));
 }
@@ -1422,12 +1372,6 @@ void ORptExport::_ExportAutoStyles()
                                         ,GetNamespaceMap()
         );
 
-
-        /*GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_REPORT_ID
-                                        ,GetDocHandler()
-                                        ,GetMM100UnitConverter()
-                                        ,GetNamespaceMap()
-        );*/
         exportDataStyles();
         GetShapeExport()->exportAutoStyles();
     }
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
index 9abb4056108b..d02795d61123 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
@@ -168,7 +168,6 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName
         {
             { XML_TABLE, sdb::CommandType::TABLE },
             { XML_QUERY, sdb::CommandType::QUERY },
-            // { XML_COMMAND, CommandType::COMMAND }, // default
             { XML_TOKEN_INVALID, 0 }
         };
         if ( SvXMLUnitConverter::convertEnum( sValue, static_cast<sal_uInt16>(m_xDatabaseDataProvider->getCommandType()),aXML_CommnadTypeEnumMap ) )
@@ -415,7 +414,7 @@ void ExportDocumentHandler::exportTableRows()
                 bRemoveString = false;
                 pCellAtt->RemoveAttribute(sValueType);
                 pCellAtt->AddAttribute(sValueType,s_sFloat);
-            } // if ( i == 0 )
+            }
             m_xDelegatee->startElement(sP,NULL);
             m_xDelegatee->endElement(sP);
             m_xDelegatee->endElement(sCell);
@@ -447,7 +446,7 @@ void ExportDocumentHandler::exportTableRows()
         m_xDelegatee->endElement(sFtext);
         m_xDelegatee->endElement(sP);
         m_xDelegatee->endElement(sCell);
-    } // for(sal_Int32 i = 0; i < nCount ; ++i)
+    }
 
     m_xDelegatee->endElement(sRow);
 }
diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx
index 9e4569704d9c..392c9469060e 100644
--- a/reportdesign/source/filter/xml/xmlHelper.cxx
+++ b/reportdesign/source/filter/xml/xmlHelper.cxx
@@ -179,7 +179,6 @@ const XMLPropertyMapEntry* OXMLHelper::GetTableStyleProps()
     {
         MAP_CONST_T(  PROPERTY_BACKCOLOR,      FO,     BACKGROUND_COLOR,        XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ),
         MAP_CONST_T(  PROPERTY_BACKTRANSPARENT,FO,     BACKGROUND_COLOR,        XML_TYPE_ISTRANSPARENT | MID_FLAG_MERGE_ATTRIBUTE, 0 ),
-        // MAP_CONST_T(  PROPERTY_KEEPTOGETHER,   STYLE,  MAY_BREAK_BETWEEN_ROWS,  XML_TYPE_BOOL     , 0 ),
         MAP_END()
     };
     return aXMLTableStylesProperties;
@@ -199,10 +198,7 @@ const XMLPropertyMapEntry* OXMLHelper::GetColumnStyleProps()
 {
     static const XMLPropertyMapEntry aXMLColumnStylesProperties[] =
     {
-        //MAP( "IsManualPageBreak", XML_NAMESPACE_FO, XML_BREAK_BEFORE, XML_TYPE_PROP_TABLE_COLUMN|XML_SC_TYPE_BREAKBEFORE, 0),
-        //MAP( "IsVisible", XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TYPE_PROP_TABLE_COLUMN|XML_SC_TYPE_EQUAL|MID_FLAG_SPECIAL_ITEM, CTF_SC_ISVISIBLE ),
         MAP_CONST_S(    "Width",                 STYLE,     COLUMN_WIDTH,           XML_TYPE_PROP_TABLE_COLUMN|XML_TYPE_MEASURE, 0 ),
-    //  MAP( "OptimalWidth", XML_NAMESPACE_STYLE, XML_USE_OPTIMAL_COLUMN_WIDTH, XML_TYPE_PROP_TABLE_COLUMN|XML_TYPE_BOOL, 0),
         MAP_END()
     };
     return aXMLColumnStylesProperties;
@@ -212,7 +208,6 @@ const SvXMLEnumMapEntry* OXMLHelper::GetReportPrintOptions()
 {
     static SvXMLEnumMapEntry s_aXML_EnumMap[] =
     {
-         // { XML_ALL_PAGES,                            report::ReportPrintOption::ALL_PAGES }, // default
         { XML_NOT_WITH_REPORT_HEADER,               report::ReportPrintOption::NOT_WITH_REPORT_HEADER },
         { XML_NOT_WITH_REPORT_FOOTER,               report::ReportPrintOption::NOT_WITH_REPORT_FOOTER },
         { XML_NOT_WITH_REPORT_HEADER_NOR_FOOTER,    report::ReportPrintOption::NOT_WITH_REPORT_HEADER_FOOTER },
@@ -225,7 +220,6 @@ const SvXMLEnumMapEntry* OXMLHelper::GetForceNewPageOptions()
 {
     static SvXMLEnumMapEntry s_aXML_EnumMap[] =
     {
-        // { XML_NONE,                  report::ForceNewPage::NONE }, // default
         { XML_BEFORE_SECTION,       report::ForceNewPage::BEFORE_SECTION },
         { XML_AFTER_SECTION,        report::ForceNewPage::AFTER_SECTION },
         { XML_BEFORE_AFTER_SECTION, report::ForceNewPage::BEFORE_AFTER_SECTION },
@@ -238,7 +232,6 @@ const SvXMLEnumMapEntry* OXMLHelper::GetKeepTogetherOptions()
 {
     static SvXMLEnumMapEntry s_aXML_EnumMap[] =
     {
-        // { XML_NO,                    report::KeepTogether::NO }, // default
         { XML_WHOLE_GROUP,          report::KeepTogether::WHOLE_GROUP },
         { XML_WITH_FIRST_DETAIL,    report::KeepTogether::WITH_FIRST_DETAIL },
         { XML_TOKEN_INVALID, 0 }
@@ -252,7 +245,6 @@ const SvXMLEnumMapEntry* OXMLHelper::GetCommandTypeOptions()
     {
         { XML_TABLE, CommandType::TABLE },
         { XML_QUERY, CommandType::QUERY },
-        // { XML_COMMAND, CommandType::COMMAND }, // default
         { XML_TOKEN_INVALID, 0 }
     };
     return s_aXML_EnumMap;
@@ -300,13 +292,6 @@ void OXMLHelper::copyStyleElements(const bool _bOld,const ::rtl::OUString& _sSty
             {PROPERTY_FONTKERNING,      static_cast<sal_uInt16>(PROPERTY_FONTKERNING.length),       PROPERTY_ID_FONTKERNING,        &::getCppuType(&aFont.Kerning)      ,PropertyAttribute::BOUND,0},
             {PROPERTY_CHARWORDMODE,     static_cast<sal_uInt16>(PROPERTY_CHARWORDMODE.length),      PROPERTY_ID_FONTWORDLINEMODE,   &::getCppuType(&aFont.WordLineMode) ,PropertyAttribute::BOUND,0},
             {PROPERTY_FONTTYPE,         static_cast<sal_uInt16>(PROPERTY_FONTTYPE.length),          PROPERTY_ID_FONTTYPE,           &::getCppuType(&aFont.Type)         ,PropertyAttribute::BOUND,0},
-            //{PROPERTY_BACKGROUNDCOLOR,    static_cast<sal_uInt16>(PROPERTY_BACKGROUNDCOLOR.length),   PROPERTY_ID_BACKGROUNDCOLOR,    &::getCppuType(&nBackgroundColor)   ,PropertyAttribute::BOUND,0},,
-            //{PROPERTY_PARAADJUST,         static_cast<sal_uInt16>(PROPERTY_PARAADJUST.length),                PROPERTY_ID_ALIGN,              &::getCppuType(&nAlign)             ,PropertyAttribute::BOUND,0},,
-            //{PROPERTY_CONTROLBORDER,          static_cast<sal_uInt16>(PROPERTY_CONTROLBORDER.length),         PROPERTY_ID_BORDER,             &::getCppuType(&aFont.Type)         ,PropertyAttribute::BOUND,0},,
-            //{PROPERTY_CONTROLBORDERCOLOR,     static_cast<sal_uInt16>(PROPERTY_CONTROLBORDERCOLOR.length),        PROPERTY_ID_BORDERCOLOR,        &::getCppuType(&aFont.Type)         ,PropertyAttribute::BOUND,0},,
-            //{PROPERTY_CHARCOLOR,      static_cast<sal_uInt16>(PROPERTY_TEXTCOLOR.length),         PROPERTY_ID_TEXTCOLOR,          &::getCppuType(&aFont.Type)         ,PropertyAttribute::BOUND,0},,
-            //{PROPERTY_FORMATKEY,      static_cast<sal_uInt16>(PROPERTY_FORMATKEY.length),         PROPERTY_ID_FORMATKEY,          &::getCppuType(&aFont.Type)         ,PropertyAttribute::BOUND,0},,
-            //{PROPERTY_CHARUNDERLINECOLOR, static_cast<sal_uInt16>(PROPERTY_CHARUNDERLINECOLOR.length),        PROPERTY_ID_TEXTLINECOLOR,      &::getCppuType(&aFont.Type)         ,PropertyAttribute::BOUND,0},,
             { NULL, 0, 0, NULL, 0, 0 }
         };
         try
@@ -406,7 +391,6 @@ const SvXMLEnumMapEntry* OXMLHelper::GetImageScaleOptions()
 {
        static SvXMLEnumMapEntry s_aXML_EnumMap[] =
        {
-               // { XML_NONE,          awt::ImageScaleMode::None }, // default
                { XML_ISOTROPIC,        awt::ImageScaleMode::Isotropic },
                { XML_ANISOTROPIC,      awt::ImageScaleMode::Anisotropic },
                { XML_TOKEN_INVALID, 0 }
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index a61c4b21928b..6d7237b60b6d 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -192,7 +192,6 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
         }
         catch(uno::Exception&)
         {
-            // OSL_ENSURE(0,"Exception catched while filling the report definition props");
         }
         m_xDelegatee->startElement(lcl_createAttribute(XML_NP_OFFICE,XML_CHART),NULL);
         bExport = false;
@@ -264,7 +263,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
                 bHasCategories = sValue.equalsAscii("both");
                 break;
             }
-        } // for(sal_Int16 i = 0; i < nLength; ++i)
+        }
         beans::PropertyValue* pArgIter = m_aArguments.getArray();
         beans::PropertyValue* pArgEnd  = pArgIter + m_aArguments.getLength();
         for(;pArgIter != pArgEnd;++pArgIter)
@@ -274,8 +273,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName
                 pArgIter->Value <<= bHasCategories;
                 break;
             }
-        } // for(;pArgIter != pArgEnd;++pArgIter)
-
+        }
 
         SvXMLAttributeList* pList = new SvXMLAttributeList();
         xNewAttribs = pList;
@@ -358,7 +356,7 @@ void SAL_CALL ImportDocumentHandler::initialize( const uno::Sequence< uno::Any >
 
         uno::Reference< chart2::data::XDataReceiver > xReceiver(m_xModel,uno::UNO_QUERY_THROW);
         xReceiver->attachDataProvider(m_xDatabaseDataProvider.get());
-    } // if ( !m_xDatabaseDataProvider.is() )
+    }
 
     m_aArguments = m_xDatabaseDataProvider->detectArguments(NULL);
 
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index afb2ceff5431..414ad1c87e15 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -257,7 +257,6 @@ UniReference < SvXMLImportPropertyMapper >
                 {
                     UniReference < XMLPropertyHandlerFactory> xFac = new ::xmloff::OControlPropertyHandlerFactory();
                     m_xTableImpPropMapper = new SvXMLImportPropertyMapper( new XMLPropertySetMapper(OXMLHelper::GetTableStyleProps(), xFac), m_rImport );
-                    //m_xTableImpPropMapper = new SvXMLImportPropertyMapper( rImport.GetTableStylesPropertySetMapper(), m_rImport );
                 }
                 xMapper = m_xTableImpPropMapper;
             }
diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx b/reportdesign/source/filter/xml/xmlSubDocument.cxx
index 623eceaa849f..63ed9b92f77e 100644
--- a/reportdesign/source/filter/xml/xmlSubDocument.cxx
+++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx
@@ -120,9 +120,6 @@ void OXMLSubDocument::EndElement()
         m_xComponent.set(m_pContainer->getSection()->getByIndex(m_nCurrentCount),uno::UNO_QUERY);
         if ( m_xComponent.is() )
         {
-            // #i94115# this is no longer need.
-            // m_pContainer->addCell(m_xComponent.get());
-
             if ( !m_aMasterFields.empty() )
                 m_xComponent->setMasterFields(Sequence< ::rtl::OUString>(&*m_aMasterFields.begin(),m_aMasterFields.size()));
             if ( !m_aDetailFields.empty() )
@@ -143,7 +140,7 @@ void OXMLSubDocument::EndElement()
                         uno::Reference< report::XFormatCondition > xNewCond = xComponentModel->createFormatCondition();
                         ::comphelper::copyProperties(xCond.get(),xNewCond.get());
                         xComponentModel->insertByIndex(xComponentModel->getCount(),uno::makeAny(xNewCond));
-                    } // for (sal_Int32 i = 0; i < nCount ; ++i)
+                    }
                 }
                 catch(uno::Exception&)
                 {
diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx
index f70a65d98bcc..78ff08494a5e 100644
--- a/reportdesign/source/filter/xml/xmlTable.cxx
+++ b/reportdesign/source/filter/xml/xmlTable.cxx
@@ -192,7 +192,7 @@ void OXMLTable::EndElement()
                         pAutoStyle->FillPropertySet(m_xSection.get());
                     }
                 }
-            } // if ( m_sStyleName.getLength() )
+            }
             // set height
             ::std::vector<sal_Int32>::iterator aIter = m_aHeight.begin();
             ::std::vector<sal_Int32>::iterator aEnd = m_aHeight.end();
@@ -278,7 +278,7 @@ void OXMLTable::EndElement()
                 }
                 nPosY += m_aHeight[i];
             }
-        } // if ( m_xComponent.is() )
+        }
     }
     catch(Exception&)
     {
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 1e1f2ba71305..232917ad6e36 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -151,7 +151,7 @@ sal_Int32 ReadThroughComponent(
     // get parser
     uno::Reference< XParser > xParser(
         rFactory->createInstance(
-            ::rtl::OUString::createFromAscii("com.sun.star.xml.sax.Parser") ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser"))),
         UNO_QUERY );
     DBG_ASSERT( xParser.is(), "Can't create parser" );
     if( !xParser.is() )
@@ -516,13 +516,12 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
             try
             {
                 xStorage = pMedium->GetStorage();
-                //  nError = pMedium->GetError();
             }
             catch(const Exception&)
             {
             }
-        } // if( pMedium )
-    } // if ( bRet = (sFileName.getLength() != 0) )
+        }
+    }
     sal_Bool bRet = xStorage.is();
     if ( bRet )
     {
@@ -745,17 +744,13 @@ const SvXMLTokenMap& ORptFilter::GetDocElemTokenMap() const
         static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
         {
             { XML_NAMESPACE_OFFICE, XML_SETTINGS,           XML_TOK_DOC_SETTINGS    },
-            //{ XML_NAMESPACE_OOO,    XML_SETTINGS,         XML_TOK_DOC_SETTINGS    },
             { XML_NAMESPACE_OFFICE, XML_STYLES,             XML_TOK_DOC_STYLES      },
-            //{ XML_NAMESPACE_OOO,    XML_STYLES,               XML_TOK_DOC_STYLES      },
             { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES,   XML_TOK_DOC_AUTOSTYLES  },
-            //{ XML_NAMESPACE_OOO,    XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES  },
             { XML_NAMESPACE_OFFICE, XML_REPORT,             XML_TOK_DOC_REPORT      },
             { XML_NAMESPACE_OOO,    XML_REPORT,             XML_TOK_DOC_REPORT      },
             { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS,    XML_TOK_DOC_FONTDECLS   },
             { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES,      XML_TOK_DOC_MASTERSTYLES    },
             { XML_NAMESPACE_OFFICE, XML_DOCUMENT_META,      XML_TOK_DOC_META        },
-            //{ XML_NAMESPACE_OOO,    XML_FONT_FACE_DECLS,  XML_TOK_DOC_FONTDECLS   },
             XML_TOKEN_MAP_END
         };
         m_pDocElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));
@@ -801,9 +796,9 @@ const SvXMLTokenMap& ORptFilter::GetFormatElemTokenMap() const
     {
         static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
         {
-            { XML_NAMESPACE_REPORT, XML_ENABLED                     ,   XML_TOK_ENABLED                     },
-            { XML_NAMESPACE_REPORT, XML_FORMULA                     ,   XML_TOK_FORMULA                     },
-            { XML_NAMESPACE_REPORT, XML_STYLE_NAME                  ,   XML_TOK_FORMAT_STYLE_NAME           },
+            { XML_NAMESPACE_REPORT, XML_ENABLED     , XML_TOK_ENABLED           },
+            { XML_NAMESPACE_REPORT, XML_FORMULA     , XML_TOK_FORMULA           },
+            { XML_NAMESPACE_REPORT, XML_STYLE_NAME  , XML_TOK_FORMAT_STYLE_NAME },
             XML_TOKEN_MAP_END
         };
         m_pFormatElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));
@@ -829,7 +824,6 @@ const SvXMLTokenMap& ORptFilter::GetGroupElemTokenMap() const
             { XML_NAMESPACE_REPORT, XML_SORT_ASCENDING              ,   XML_TOK_SORT_ASCENDING              },
             { XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER               ,   XML_TOK_GROUP_KEEP_TOGETHER         },
             { XML_NAMESPACE_REPORT, XML_FUNCTION                    ,   XML_TOK_GROUP_FUNCTION              },
-            //{ XML_NAMESPACE_REPORT,   XML_            ,   XML_TOK_            },
             XML_TOKEN_MAP_END
         };
         m_pGroupElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));
@@ -995,10 +989,8 @@ SvXMLImportContext* ORptFilter::CreateStylesContext(const ::rtl::OUString& rLoca
     {
         pContext = new OReportStylesContext(*this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList, bIsAutoStyle);
         if (bIsAutoStyle)
-            //xAutoStyles = pContext;
             SetAutoStyles((SvXMLStylesContext*)pContext);
         else
-            //xStyles = pContext;
             SetStyles((SvXMLStylesContext*)pContext);
     }
     return pContext;
@@ -1042,20 +1034,6 @@ void ORptFilter::FinishStyles()
 // -----------------------------------------------------------------------------
 ::rtl::OUString ORptFilter::convertFormula(const ::rtl::OUString& _sFormula)
 {
-    //sal_Int32 nLen = _sFormula.getLength();
-    //if ( nLen )
-    //{
-    //    const static ::rtl::OUString s_sField(RTL_CONSTASCII_USTRINGPARAM("field:["));
-    //    sal_Int32 nPos = _sFormula.indexOf(s_sField);
-    //    if ( nPos == -1 )
-    //        nPos = 4; // "rpt:"
-    //    else
-    //    {
-    //        nPos = s_sField.getLength();
-    //        --nLen; // eat "]"
-    //    }
-    //    return _sFormula.copy(nPos,nLen-nPos);
-    //}
     return _sFormula;
 }
 // -----------------------------------------------------------------------------
@@ -1109,8 +1087,8 @@ SvXMLImportContext* ORptFilter::CreateMetaContext(const ::rtl::OUString& rLocalN
     if ( (getImportFlags() & IMPORT_META) )
     {
         uno::Reference<xml::sax::XDocumentHandler> xDocBuilder(
-            getServiceFactory()->createInstance(::rtl::OUString::createFromAscii(
-                "com.sun.star.xml.dom.SAXDocumentBuilder")),
+            getServiceFactory()->createInstance(::rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.dom.SAXDocumentBuilder"))),
                 uno::UNO_QUERY_THROW);
         uno::Reference<document::XDocumentPropertiesSupplier> xDPS(GetModel(), uno::UNO_QUERY_THROW);
         pContext = new SvXMLMetaDocumentContext(*this,XML_NAMESPACE_OFFICE, rLocalName,xDPS->getDocumentProperties(), xDocBuilder);
@@ -1129,7 +1107,7 @@ sal_Bool ORptFilter::isOldFormat() const
         {
             xProp->getPropertyValue(s_sOld) >>= bOldFormat;
         }
-    } // if ( xProp.is() )
+    }
     return bOldFormat;
 }
 
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index 43ad175d827d..431e72e5bccc 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -76,8 +76,6 @@ class OAddFieldWindowListBox    : public SvTreeListBox
 
     OAddFieldWindowListBox(const OAddFieldWindowListBox&);
     void operator =(const OAddFieldWindowListBox&);
-protected:
-//  virtual void Command( const CommandEvent& rEvt );
 
 public:
     OAddFieldWindowListBox( OAddFieldWindow* _pParent );
@@ -207,7 +205,6 @@ OAddFieldWindow::OAddFieldWindow(Window* pParent
     m_aHelpText.SetControlBackground( GetSettings().GetStyleSettings().GetFaceColor() );
 
     SetSizePixel(Size(STD_WIN_SIZE_X,STD_WIN_SIZE_Y));
-    //Show();
 
     if ( m_xRowSet.is() )
     {
@@ -448,7 +445,7 @@ void OAddFieldWindow::fillDescriptor(SvLBoxEntry* _pSelected,::svx::ODataAccessD
                 uno::Reference<frame::XModel> xModel(xDocument->getDatabaseDocument(),uno::UNO_QUERY);
                 if ( xModel.is() )
                     _rDescriptor[ daDatabaseLocation ] <<= xModel->getURL();
-            } // if ( xDocument.is() )
+            }
         }
 
         _rDescriptor[ ::svx::daCommand ]            <<= GetCommand();
@@ -457,7 +454,6 @@ void OAddFieldWindow::fillDescriptor(SvLBoxEntry* _pSelected,::svx::ODataAccessD
         _rDescriptor[ ::svx::daConnection ]         <<= getConnection();
 
         ColumnInfo* pInfo = static_cast<ColumnInfo*>(_pSelected->GetUserData());
-        // ::rtl::OUString sColumnName = m_pListBox->GetEntryText( _pSelected );
         _rDescriptor[ ::svx::daColumnName ]         <<= pInfo->sColumnName;
         if ( m_xColumns->hasByName( pInfo->sColumnName ) )
             _rDescriptor[ ::svx::daColumnObject ] <<= m_xColumns->getByName(pInfo->sColumnName);
@@ -512,16 +508,12 @@ IMPL_LINK( OAddFieldWindow, OnDoubleClickHdl, void* ,/*_pAddFieldDlg*/)
     return 0L;
 }
 //------------------------------------------------------------------------------
-ImageList OAddFieldWindow::getImageList(sal_Int16 _eBitmapSet,sal_Bool _bHiContast) const
+ImageList OAddFieldWindow::getImageList(sal_Int16 _eBitmapSet) const
 {
     sal_Int16 nN = IMG_ADDFIELD_DLG_SC;
-    sal_Int16 nH = IMG_ADDFIELD_DLG_SCH;
     if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE )
-    {
         nN = IMG_ADDFIELD_DLG_LC;
-        nH = IMG_ADDFIELD_DLG_LCH;
-    }
-    return ImageList(ModuleRes( _bHiContast ? nH : nN ));
+    return ImageList(ModuleRes(nN));
 }
 //------------------------------------------------------------------
 void OAddFieldWindow::resizeControls(const Size& _rDiff)
@@ -557,7 +549,7 @@ IMPL_LINK( OAddFieldWindow, OnSortAction, ToolBox*, /*NOTINTERESTEDIN*/ )
                     eSortMode = SortAscending;
                 else if ( m_aActions.IsItemChecked(SID_FM_SORTDOWN) )
                     eSortMode = SortDescending;
-            } // if ( SID_FM_REMOVE_FILTER_SORT != nCurItem )
+            }
 
             m_pListBox->GetModel()->SetSortMode(eSortMode);
             if ( SID_FM_REMOVE_FILTER_SORT == nCurItem )
diff --git a/reportdesign/source/ui/dlg/CondFormat.hrc b/reportdesign/source/ui/dlg/CondFormat.hrc
index 89e0e1b88246..47091374dec8 100644
--- a/reportdesign/source/ui/dlg/CondFormat.hrc
+++ b/reportdesign/source/ui/dlg/CondFormat.hrc
@@ -67,8 +67,6 @@
 #define BTN_MOVE_DOWN               21
 #define BTN_ADD_CONDITION           22
 #define BTN_REMOVE_CONDITION        23
-#define IMG_MOVE_UP_HC              24
-#define IMG_MOVE_DOWN_HC            25
 
 #define ROW_0_POS       ( RELATED_CONTROLS )
 #define ROW_0_HEIGTH    ( FIXEDTEXT_HEIGHT )
diff --git a/reportdesign/source/ui/dlg/CondFormat.src b/reportdesign/source/ui/dlg/CondFormat.src
index 14fe6649aff1..2e5e352bcbde 100644
--- a/reportdesign/source/ui/dlg/CondFormat.src
+++ b/reportdesign/source/ui/dlg/CondFormat.src
@@ -190,16 +190,6 @@ Control WIN_CONDITION
         Size = MAP_APPFONT( IMAGE_BUTTON_WIDTH, IMAGE_BUTTON_HEIGHT );
         Text = "-";
     };
-
-    Image IMG_MOVE_UP_HC
-    {
-        ImageBitmap = Bitmap { File = "arrow_move_up_hc" ; };
-    };
-
-    Image IMG_MOVE_DOWN_HC
-    {
-        ImageBitmap = Bitmap { File = "arrow_move_down_hc" ; };
-    };
 };
 
 ModalDialog RID_CONDFORMAT
@@ -286,57 +276,29 @@ ImageList IMG_CONDFORMAT_DLG_SC
     MASKCOLOR;
     FileList =
     {
-        < "res/commandimagelist/sc_bold.png" ; SID_ATTR_CHAR_WEIGHT ; > ;
-        < "res/commandimagelist/sc_italic.png" ; SID_ATTR_CHAR_POSTURE ; > ;
-        < "res/commandimagelist/sc_underline.png" ; SID_ATTR_CHAR_UNDERLINE ; > ;
-        < "res/commandimagelist/sc_backgroundcolor.png" ; SID_BACKGROUND_COLOR ; > ;
-        < "res/commandimagelist/sc_fontcolor.png" ; SID_ATTR_CHAR_COLOR2 ; > ;
-        < "res/commandimagelist/sc_fontdialog.png" ; SID_CHAR_DLG ; > ;
+        < "res/commandimagelist/sc_bold.png" ;              SID_ATTR_CHAR_WEIGHT ; > ;
+        < "res/commandimagelist/sc_italic.png" ;            SID_ATTR_CHAR_POSTURE ; > ;
+        < "res/commandimagelist/sc_underline.png" ;         SID_ATTR_CHAR_UNDERLINE ; > ;
+        < "res/commandimagelist/sc_backgroundcolor.png" ;   SID_BACKGROUND_COLOR ; > ;
+        < "res/commandimagelist/sc_fontcolor.png" ;         SID_ATTR_CHAR_COLOR2 ; > ;
+        < "res/commandimagelist/sc_fontdialog.png" ;        SID_CHAR_DLG ; > ;
     };
 };
 
-ImageList IMG_CONDFORMAT_DLG_SCH
-{
-    MASKCOLOR;
-    FileList =
-    {
-        < "res/commandimagelist/sch_bold.png" ; SID_ATTR_CHAR_WEIGHT ; > ;
-        < "res/commandimagelist/sch_italic.png" ; SID_ATTR_CHAR_POSTURE ; > ;
-        < "res/commandimagelist/sch_underline.png" ; SID_ATTR_CHAR_UNDERLINE ; > ;
-        < "res/commandimagelist/sch_backgroundcolor.png" ; SID_BACKGROUND_COLOR ; > ;
-        < "res/commandimagelist/sch_fontcolor.png" ; SID_ATTR_CHAR_COLOR2 ; > ;
-        < "res/commandimagelist/sch_fontdialog.png" ; SID_CHAR_DLG ; > ;
-    };
-};
 ImageList IMG_CONDFORMAT_DLG_LC
 {
     MASKCOLOR;
     FileList =
     {
-        < "res/commandimagelist/lc_bold.png" ; SID_ATTR_CHAR_WEIGHT ; > ;
-        < "res/commandimagelist/lc_italic.png" ; SID_ATTR_CHAR_POSTURE ; > ;
-        < "res/commandimagelist/lc_underline.png" ; SID_ATTR_CHAR_UNDERLINE ; > ;
-        < "res/commandimagelist/lc_backgroundcolor.png" ; SID_BACKGROUND_COLOR ; > ;
-        < "res/commandimagelist/lc_fontcolor.png" ; SID_ATTR_CHAR_COLOR2 ; > ;
-        < "res/commandimagelist/lc_fontdialog.png" ; SID_CHAR_DLG ; > ;
-    };
-};
-ImageList IMG_CONDFORMAT_DLG_LCH
-{
-    MASKCOLOR;
-    FileList =
-    {
-        < "res/commandimagelist/lch_bold.png" ; SID_ATTR_CHAR_WEIGHT ; > ;
-        < "res/commandimagelist/lch_italic.png" ; SID_ATTR_CHAR_POSTURE ; > ;
-        < "res/commandimagelist/lch_underline.png" ; SID_ATTR_CHAR_UNDERLINE ; > ;
-        < "res/commandimagelist/lch_backgroundcolor.png" ; SID_BACKGROUND_COLOR ; > ;
-        < "res/commandimagelist/lch_fontcolor.png" ; SID_ATTR_CHAR_COLOR2 ; > ;
-        < "res/commandimagelist/lch_fontdialog.png" ; SID_CHAR_DLG ; > ;
+        < "res/commandimagelist/lc_bold.png" ;              SID_ATTR_CHAR_WEIGHT ; > ;
+        < "res/commandimagelist/lc_italic.png" ;            SID_ATTR_CHAR_POSTURE ; > ;
+        < "res/commandimagelist/lc_underline.png" ;         SID_ATTR_CHAR_UNDERLINE ; > ;
+        < "res/commandimagelist/lc_backgroundcolor.png" ;   SID_BACKGROUND_COLOR ; > ;
+        < "res/commandimagelist/lc_fontcolor.png" ;         SID_ATTR_CHAR_COLOR2 ; > ;
+        < "res/commandimagelist/lc_fontdialog.png" ;        SID_CHAR_DLG ; > ;
     };
 };
 
-
-
 ImageList 31000
 {
     MASKCOLOR;
@@ -388,20 +350,9 @@ ImageList IMG_ADDFIELD_DLG_SC
     MASKCOLOR;
     FileList =
     {
-        < "res/commandimagelist/sc_sortup.png" ; SID_FM_SORTUP ; > ;
-        < "res/commandimagelist/sc_sortdown.png" ; SID_FM_SORTDOWN ; > ;
-        < "res/commandimagelist/sc_removefiltersort.png" ; SID_FM_REMOVE_FILTER_SORT ; > ;
-    };
-};
-
-ImageList IMG_ADDFIELD_DLG_SCH
-{
-    MASKCOLOR;
-    FileList =
-    {
-        < "res/commandimagelist/sch_sortup.png" ; SID_FM_SORTUP ; > ;
-        < "res/commandimagelist/sch_sortdown.png" ; SID_FM_SORTDOWN ; > ;
-        < "res/commandimagelist/sch_removefiltersort.png" ; SID_FM_REMOVE_FILTER_SORT ; > ;
+        < "res/commandimagelist/sc_sortup.png" ;            SID_FM_SORTUP ; > ;
+        < "res/commandimagelist/sc_sortdown.png" ;          SID_FM_SORTDOWN ; > ;
+        < "res/commandimagelist/sc_removefiltersort.png" ;  SID_FM_REMOVE_FILTER_SORT ; > ;
     };
 };
 
@@ -410,20 +361,9 @@ ImageList IMG_ADDFIELD_DLG_LC
     MASKCOLOR;
     FileList =
     {
-        < "res/commandimagelist/lc_sortup.png" ; SID_FM_SORTUP ; > ;
-        < "res/commandimagelist/lc_sortdown.png" ; SID_FM_SORTDOWN ; > ;
-        < "res/commandimagelist/lc_removefiltersort.png" ; SID_FM_REMOVE_FILTER_SORT ; > ;
-    };
-};
-
-ImageList IMG_ADDFIELD_DLG_LCH
-{
-    MASKCOLOR;
-    FileList =
-    {
-        < "res/commandimagelist/lch_sortup.png" ; SID_FM_SORTUP ; > ;
-        < "res/commandimagelist/lch_sortdown.png" ; SID_FM_SORTDOWN ; > ;
-        < "res/commandimagelist/lch_removefiltersort.png" ; SID_FM_REMOVE_FILTER_SORT ; > ;
+        < "res/commandimagelist/lc_sortup.png" ;            SID_FM_SORTUP ; > ;
+        < "res/commandimagelist/lc_sortdown.png" ;          SID_FM_SORTDOWN ; > ;
+        < "res/commandimagelist/lc_removefiltersort.png" ;  SID_FM_REMOVE_FILTER_SORT ; > ;
     };
 };
 
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index a61b2fdb08cb..b52d8d8b7add 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -106,7 +106,7 @@ IMPL_LINK( ConditionField, OnFormula, Button*, /*_pClickedButton*/ )
     {
         ReportFormula aFormula( sFormula );
         sFormula = aFormula.getCompleteFormula();
-    } // if ( nLen )
+    }
     uno::Reference< awt::XWindow> xInspectorWindow = VCLUnoHelper::GetInterface(this);
     uno::Reference< beans::XPropertySet> xProp(m_pParent->getController().getRowSet(),uno::UNO_QUERY);
     if ( rptui::openDialogFormula_nothrow( sFormula, m_pParent->getController().getContext(),xInspectorWindow,xProp ) )
@@ -212,7 +212,7 @@ void OColorPopup::SetSlotId(USHORT _nSlotId)
     {
         m_aColorSet.SetStyle( m_aColorSet.GetStyle() | WB_NONEFIELD );
         m_aColorSet.SetText( String(ModuleRes( STR_TRANSPARENT )) );
-    } // if ( SID_ATTR_CHAR_COLOR_BACKGROUND == theSlotId || SID_BACKGROUND_COLOR == theSlotId )
+    }
 }
 // -----------------------------------------------------------------------------
 IMPL_LINK( OColorPopup, SelectHdl, void *, EMPTYARG )
@@ -259,9 +259,6 @@ Condition::Condition( Window* _pParent, IConditionalFormatAction& _rAction, ::rp
     ,m_nLastKnownWindowWidth( -1 )
     ,m_bInDestruction( false )
 {
-    m_aMoveUp.SetModeImage( ModuleRes( IMG_MOVE_UP_HC ), BMP_COLOR_HIGHCONTRAST );
-    m_aMoveDown.SetModeImage( ModuleRes( IMG_MOVE_DOWN_HC ), BMP_COLOR_HIGHCONTRAST );
-
     FreeResource();
     m_aActions.SetStyle(m_aActions.GetStyle()|WB_LINESPACING);
     m_aCondLHS.GrabFocus();
@@ -346,7 +343,7 @@ IMPL_LINK( Condition, DropdownClick, ToolBox*, /*pToolBar*/ )
             break;
         default:
             break;
-    } // switch(nId)
+    }
     if ( nTextId )
         m_pColorFloat->SetText(String(ModuleRes(nTextId)));
     m_pColorFloat->SetSlotId(nId);
@@ -389,16 +386,12 @@ void Condition::ApplyCommand( USHORT _nCommandId, const ::Color& _rColor)
     m_rAction.applyCommand( m_nCondIndex, _nCommandId, _rColor );
 }
 //------------------------------------------------------------------------------
-ImageList Condition::getImageList(sal_Int16 _eBitmapSet,sal_Bool _bHiContast) const
+ImageList Condition::getImageList(sal_Int16 _eBitmapSet) const
 {
     sal_Int16 nN = IMG_CONDFORMAT_DLG_SC;
-    sal_Int16 nH = IMG_CONDFORMAT_DLG_SCH;
     if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE )
-    {
         nN = IMG_CONDFORMAT_DLG_LC;
-        nH = IMG_CONDFORMAT_DLG_LCH;
-    }
-    return ImageList(ModuleRes( _bHiContast ? nH : nN ));
+    return ImageList(ModuleRes(nN));
 }
 //------------------------------------------------------------------
 void Condition::resizeControls(const Size& _rDiff)
@@ -434,7 +427,6 @@ void Condition::StateChanged( StateChangedType nType )
     {
         // The physical toolbar changed its outlook and shows another logical toolbar!
         // We have to set the correct high contrast mode on the new tbx manager.
-        //  pMgr->SetHiContrast( IsHiContrastMode() );
         checkImageList();
     }
 }
diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx
index d382722ba818..e2c473177e7a 100644
--- a/reportdesign/source/ui/dlg/Condition.hxx
+++ b/reportdesign/source/ui/dlg/Condition.hxx
@@ -113,10 +113,8 @@ namespace rptui
         /** will be called when the id of the image list is needed.
             @param  _eBitmapSet
                 <svtools/imgdef.hxx>
-            @param  _bHiContast
-                <TRUE/> when in high contrast mode.
         */
-        virtual ImageList getImageList(sal_Int16 _eBitmapSet,sal_Bool _bHiContast) const;
+        virtual ImageList getImageList(sal_Int16 _eBitmapSet) const;
 
         /** will be called when the controls need to be resized.
         */
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx
index b70e49140d2e..4a817deab842 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -241,12 +241,10 @@ sal_Int32 ODateTimeDialog::getFormatKey(sal_Bool _bDate) const
     sal_Int32 nFormatKey;
     if ( _bDate )
     {
-         //     nFormat = m_aDateF1.IsChecked() ? i18n::NumberFormatIndex::DATE_SYSTEM_LONG : (m_aDateF2.IsChecked() ? i18n::NumberFormatIndex::DATE_SYS_DMMMYYYY : i18n::NumberFormatIndex::DATE_SYSTEM_SHORT);
          nFormatKey = static_cast<sal_Int32>(reinterpret_cast<sal_IntPtr>(m_aDateListBox.GetEntryData( m_aDateListBox.GetSelectEntryPos() )));
     }
     else
     {
-        //  nFormat = m_aTimeF1.IsChecked() ? i18n::NumberFormatIndex::TIME_HHMMSS : (m_aTimeF2.IsChecked() ? i18n::NumberFormatIndex::TIME_HHMMSSAMPM : i18n::NumberFormatIndex::TIME_HHMM);
          nFormatKey = static_cast<sal_Int32>(reinterpret_cast<sal_IntPtr>(m_aTimeListBox.GetEntryData( m_aTimeListBox.GetSelectEntryPos() )));
     }
     return nFormatKey;
diff --git a/reportdesign/source/ui/dlg/DateTime.src b/reportdesign/source/ui/dlg/DateTime.src
index 0e30747fb78c..4324db909568 100644
--- a/reportdesign/source/ui/dlg/DateTime.src
+++ b/reportdesign/source/ui/dlg/DateTime.src
@@ -74,8 +74,8 @@ ModalDialog RID_DATETIME_DLG
     {
         Pos = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS + 2*UNRELATED_CONTROLS + CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ;
         Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , 1 ) ;
-        //      Text [ en-US ] = "Time";
     };
+
     CheckBox CB_TIME
     {
         Pos = MAP_APPFONT ( UNRELATED_CONTROLS, RELATED_CONTROLS + 3*UNRELATED_CONTROLS + CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ;
@@ -100,11 +100,13 @@ ModalDialog RID_DATETIME_DLG
         TabStop = TRUE;
         Sort = FALSE;
     };
+
     FixedLine FL_SEPARATOR1
     {
         Pos = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS + 5*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT) ;
         Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , 1 ) ;
     };
+
     OKButton PB_OK
     {
         Pos = MAP_APPFONT ( UNRELATED_CONTROLS, RELATED_CONTROLS + 6*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT +1) ;
@@ -112,12 +114,14 @@ ModalDialog RID_DATETIME_DLG
         TabStop = TRUE ;
         DefButton = TRUE ;
     };
+
     CancelButton PB_CANCEL
     {
         Pos = MAP_APPFONT ( RELATED_CONTROLS + UNRELATED_CONTROLS + BUTTON_WIDTH , RELATED_CONTROLS + 6*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT +1) ;
         Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
         TabStop = TRUE ;
     };
+
     HelpButton PB_HELP
     {
         TabStop = TRUE ;
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index c199f8c3f7c3..a1199abf7849 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -218,7 +218,7 @@ void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, RefButton* _pButton)
         }
 
         m_pAddField->Update();
-    } // if ( !m_pAddField )
+    }
     RefInputStartAfter( aPair.second, aPair.first );
     m_pAddField->Show();
 
@@ -240,7 +240,7 @@ IMPL_LINK( FormulaDialog, OnClickHdl, OAddFieldWindow* ,_pAddFieldDlg)
             sName = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("[")) + sName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("]"));
             m_pEdit->SetText(sName);
         }
-    } // if ( m_pEdit && aArgs.getLength() )
+    }
     m_pEdit = NULL;
     _pAddFieldDlg->Hide();
     RefInputDoneAfter( TRUE );
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index f2334687e4f3..566b85fa8c5b 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -108,7 +108,6 @@ class OFieldExpressionControl : public TContainerListenerBase
     OGroupsSortingDialog*           m_pParent;
     bool                            m_bIgnoreEvent;
 
-
     void fillListBox(const uno::Reference< beans::XPropertySet>& _xDest,long nRow,USHORT nColumnId);
     BOOL SaveModified(bool _bAppend);
 
@@ -137,7 +136,6 @@ public:
 
     inline ::svt::ComboBoxControl*  getExpressionControl() const { return m_pComboCell; }
 
-
     /** returns the sequence with the selected groups
     */
     uno::Sequence<uno::Any> fillSelectedGroups();
@@ -151,7 +149,6 @@ public:
 protected:
     virtual BOOL IsTabAllowed(BOOL bForward) const;
 
-
     virtual void InitController( ::svt::CellControllerRef& rController, long nRow, USHORT nCol );
     virtual ::svt::CellController* GetController( long nRow, USHORT nCol );
     virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, USHORT nColId ) const;
@@ -251,7 +248,7 @@ uno::Sequence<uno::Any> OFieldExpressionControl::fillSelectedGroups()
         }
         if ( !vClipboardList.empty() )
             aList = uno::Sequence< uno::Any >(&vClipboardList[0], vClipboardList.size());
-    } // if ( nCount > 1 )
+    }
     return aList;
 }
 //------------------------------------------------------------------------------
@@ -267,7 +264,7 @@ void OFieldExpressionControl::StartDrag( sal_Int8 /*_nAction*/ , const Point& /*
             OGroupExchange* pData = new OGroupExchange(aClipboardList);
             uno::Reference< ::com::sun::star::datatransfer::XTransferable> xRef = pData;
             pData->StartDrag(this, DND_ACTION_MOVE );
-        } // if(!vClipboardList.empty())
+        }
     }
 }
 //------------------------------------------------------------------------------
@@ -344,11 +341,11 @@ void OFieldExpressionControl::moveGroups(const uno::Sequence<uno::Any>& _aGroups
                     m_pParent->m_pController->executeChecked(SID_GROUP_APPEND,aArgs);
                     ++nRow;
                 }
-            } // for(;pIter != pEnd;++pIter)
+            }
         }
         m_bIgnoreEvent = false;
         Invalidate();
-    } // if ( _aGroups.getLength() )
+    }
 }
 // -----------------------------------------------------------------------------
 void OFieldExpressionControl::fillColumns(const uno::Reference< container::XNameAccess>& _xColumns)
@@ -550,7 +547,7 @@ String OFieldExpressionControl::GetCellText( long nRow, USHORT /*nColId*/ ) cons
         {
             OSL_ENSURE(0,"Exception caught while getting expression value from the group");
         }
-    } // if ( nRow != BROWSER_ENDOFSELECTION && nRow < m_pParent->getGroups()->getCount() )
+    }
     return sText;
 }
 
@@ -676,13 +673,6 @@ void SAL_CALL OFieldExpressionControl::elementInserted(const container::Containe
                 for(++aFind;aFind != aEnd;++aFind)
                     if ( *aFind != NO_GROUP )
                         ++*aFind;
-
-                //::std::vector<sal_Int32>::reverse_iterator aRIter = m_aGroupPositions.rbegin();
-                //::std::vector<sal_Int32>::reverse_iterator aREnd = m_aGroupPositions.rend();
-                //for (; aRIter != aREnd && *aRIter != NO_GROUP; ++aRIter)
-                //    continue;
-                //if ( aRIter != aREnd )
-                //    m_aGroupPositions.erase(m_aGroupPositions.begin() + (m_aGroupPositions.size() - 1 - (aRIter - m_aGroupPositions.rbegin())));
             }
         }
         Invalidate();
@@ -712,7 +702,6 @@ void SAL_CALL OFieldExpressionControl::elementRemoved(const container::Container
             for(++aFind;aFind != aEnd;++aFind)
                 if ( *aFind != NO_GROUP )
                     --*aFind;
-            //PaintCell(*this,GetFieldRect(FIELD_EXPRESSION),FIELD_EXPRESSION);
             Invalidate();
         }
     }
@@ -754,7 +743,6 @@ void OFieldExpressionControl::Command(const CommandEvent& rEvt)
 
             if ( nColId == HANDLE_ID )
             {
-                //long   nRow = GetRowAtYPosPixel(rEvt.GetMousePosPixel().Y());
                 PopupMenu aContextMenu(ModuleRes(RID_GROUPSROWPOPUPMENU));
                 sal_Bool bEnable = sal_False;
                 long nIndex = FirstSelectedRow();
@@ -764,10 +752,6 @@ void OFieldExpressionControl::Command(const CommandEvent& rEvt)
                         bEnable = sal_True;
                     nIndex = NextSelectedRow();
                 }
-                //aContextMenu.EnableItem( SID_CUT, IsDeleteAllowed() && bEnable);
-                //aContextMenu.EnableItem( SID_COPY, bEnable);
-                //TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(GetParent()));
-                //aContextMenu.EnableItem( SID_PASTE, aTransferData.HasFormat(SOT_FORMATSTR_ID_RPT_GRPED) );
                 aContextMenu.EnableItem( SID_DELETE, IsDeleteAllowed() && bEnable );
                 switch (aContextMenu.Execute(this, rEvt.GetMousePosPixel()))
                 {
@@ -789,7 +773,7 @@ void OFieldExpressionControl::Command(const CommandEvent& rEvt)
                     default:
                         break;
                 }
-            } // if ( nColId == HANDLE_ID )
+            }
             // run through
         }
         default:
@@ -843,7 +827,7 @@ void OFieldExpressionControl::DeleteRows()
                     --*aFind;
         }
         nIndex = NextSelectedRow();
-    } // while( nIndex >= 0 )
+    }
 
     if ( !bFirstTime )
         m_pParent->m_pController->getUndoMgr()->LeaveListAction();
@@ -985,11 +969,6 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent
     ,OPropertyChangeListener(m_aMutex)
     ,m_aFL2(this, ModuleRes(FL_SEPARATOR2) )
     ,m_aMove(this, ModuleRes(FT_MOVELABEL) )
-/*
-    ,m_aPB_Up(this, ModuleRes(PB_UP) )
-    ,m_aPB_Down(this, ModuleRes(PB_DOWN) )
-    ,m_aPB_Delete(this, ModuleRes(PB_DELETE) )
-*/
     ,m_aToolBox(this, ModuleRes(TB_TOOLBOX) )
 
     ,m_aFL3(this, ModuleRes(FL_SEPARATOR3) )
@@ -1015,14 +994,13 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent
 {
     DBG_CTOR( rpt_OGroupsSortingDialog,NULL);
 
-
     Control* pControlsLst[] = { &m_aHeaderLst, &m_aFooterLst, &m_aGroupOnLst, &m_aKeepTogetherLst, &m_aOrderLst, &m_aGroupIntervalEd};
     for (size_t i = 0; i < SAL_N_ELEMENTS(pControlsLst); ++i)
     {
         pControlsLst[i]->SetGetFocusHdl(LINK(this, OGroupsSortingDialog, OnControlFocusGot));
         pControlsLst[i]->SetLoseFocusHdl(LINK(this, OGroupsSortingDialog, OnControlFocusLost));
         pControlsLst[i]->Show(TRUE);
-    } // for (int i = 0; i < SAL_N_ELEMENTS(pControls); ++i)
+    }
 
     for (size_t i = 0; i < (SAL_N_ELEMENTS(pControlsLst))-1; ++i)
         static_cast<ListBox*>(pControlsLst[i])->SetSelectHdl(LINK(this,OGroupsSortingDialog,LBChangeHdl));
@@ -1049,7 +1027,6 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent
     Size aOutSize(nMaxTextWidth + m_aHeader.GetSizePixel().Width() + 3*aSpace.Width(),aSpace.Height());
     SetMinOutputSizePixel(aOutSize);
     SetOutputSizePixel(aOutSize);
-//  Resize();
 
     m_pReportListener = new OPropertyChangeMultiplexer(this,m_pController->getReportDefinition().get());
     m_pReportListener->addProperty(PROPERTY_COMMAND);
@@ -1059,20 +1036,11 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent
     fillColumns();
     m_pFieldExpression->Show();
 
-    //m_aHelpWindow.SetReadOnly();
     m_aHelpWindow.SetControlBackground( GetSettings().GetStyleSettings().GetFaceColor() );
-    //BTN m_aPB_Up.SetClickHdl(LINK(this,OGroupsSortingDialog,ClickHdl));
-    //BTN m_aPB_Down.SetClickHdl(LINK(this,OGroupsSortingDialog,ClickHdl));
-    //BTN m_aPB_Delete.SetClickHdl(LINK(this,OGroupsSortingDialog,ClickHdl));
 
     m_pFieldExpression->SetZOrder(&m_aFL2, WINDOW_ZORDER_BEHIND);
 
     m_aMove.SetZOrder(m_pFieldExpression, WINDOW_ZORDER_BEHIND);
-    //BTN m_aPB_Up.SetZOrder(&m_aMove, WINDOW_ZORDER_BEHIND);
-    //BTN m_aPB_Down.SetZOrder(&m_aPB_Up, WINDOW_ZORDER_BEHIND);
-    // set Hi contrast bitmaps
-    //BTN m_aPB_Up.SetModeImage(        ModuleRes(IMG_UP_H),BMP_COLOR_HIGHCONTRAST);
-    //BTN m_aPB_Down.SetModeImage(  ModuleRes(IMG_DOWN_H),BMP_COLOR_HIGHCONTRAST);
     m_aToolBox.SetStyle(m_aToolBox.GetStyle()|WB_LINESPACING);
     m_aToolBox.SetSelectHdl(LINK(this, OGroupsSortingDialog, OnFormatAction));
     m_aToolBox.SetImageListProvider(this);
@@ -1235,7 +1203,6 @@ IMPL_LINK(OGroupsSortingDialog, OnControlFocusLost, Control*, pControl )
 }
 // -----------------------------------------------------------------------------
 IMPL_LINK( OGroupsSortingDialog, OnFormatAction, ToolBox*, /*NOTINTERESTEDIN*/ )
-// IMPL_LINK( OGroupsSortingDialog, ClickHdl, ImageButton*, _pButton )
 {
     DBG_CHKTHIS( rpt_OGroupsSortingDialog,NULL);
 
@@ -1251,22 +1218,17 @@ IMPL_LINK( OGroupsSortingDialog, OnFormatAction, ToolBox*, /*NOTINTERESTEDIN*/ )
             aClipboardList.realloc(1);
             aClipboardList[0] = m_xGroups->getByIndex(nGroupPos);
         }
-        //BTN if ( _pButton == &m_aPB_Up )
         if ( nCommand == SID_RPT_GROUPSORT_MOVE_UP )
         {
             --nIndex;
         }
-        //BTN if ( _pButton == &m_aPB_Down )
         if ( nCommand == SID_RPT_GROUPSORT_MOVE_DOWN )
         {
             ++nIndex;
         }
-        //BTN if ( _pButton == &m_aPB_Delete )
         if ( nCommand == SID_RPT_GROUPSORT_DELETE )
         {
-            // m_pFieldExpression->DeleteCurrentRow();
             Application::PostUserEvent( LINK(m_pFieldExpression, OFieldExpressionControl, DelayedDelete) );
-            // UpdateData( );
         }
         else
         {
@@ -1276,7 +1238,6 @@ IMPL_LINK( OGroupsSortingDialog, OnFormatAction, ToolBox*, /*NOTINTERESTEDIN*/ )
                 m_pFieldExpression->moveGroups(aClipboardList,nIndex,sal_False);
                 m_pFieldExpression->DeactivateCell();
                 m_pFieldExpression->GoToRow(nIndex);
-                //long nCurRow = m_pFieldExpression->GetCurRow();
                 m_pFieldExpression->ActivateCell(nIndex, m_pFieldExpression->GetCurColumnId());
                 DisplayData(nIndex);
             }
@@ -1376,7 +1337,8 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference<report::XGroup>& _x
             m_aGroupOnLst.InsertEntry(String(ModuleRes(STR_RPT_INTERVAL)));
             m_aGroupOnLst.SetEntryData(1,reinterpret_cast<void*>(report::GroupOn::INTERVAL));
             break;
-    } // switch(nDataType)
+    }
+
     USHORT nPos = 0;
     switch(_xGroup->getGroupOn())
     {
@@ -1444,9 +1406,8 @@ void OGroupsSortingDialog::Resize()
     for (size_t i = 0; i < SAL_N_ELEMENTS(pControls); ++i)
     {
         nMaxTextWidth = ::std::max<sal_Int32>(static_cast<sal_Int32>(GetTextWidth(pControls[i]->GetText())),nMaxTextWidth);
-    } // for (int i = 0; i < SAL_N_ELEMENTS(pControls); ++i)
+    }
 
-    // aTotalOutputSize.Width() - m_aHeaderLst.GetSizePixel().Width() - 3*aSpace.Width()
     for (size_t i = 0; i < SAL_N_ELEMENTS(pControls); ++i)
     {
         pControls[i]->SetSizePixel(Size(nMaxTextWidth,pControls[i]->GetSizePixel().Height()));
@@ -1455,20 +1416,11 @@ void OGroupsSortingDialog::Resize()
         aPos.Y() = pControlsLst[i]->GetPosPixel().Y();
 
         pControlsLst[i]->SetPosSizePixel(aPos,Size(aTotalOutputSize.Width() - aPos.X() - aSpace.Width(),pControlsLst[i]->GetSizePixel().Height()));
-    } // for (int i = 0; i < SAL_N_ELEMENTS(pControls); ++i)
+    }
 
     m_aFL.SetSizePixel(Size(aTotalOutputSize.Width() - aSpace.Width(),m_aFL.GetSizePixel().Height()));
     m_aFL2.SetSizePixel(Size(aTotalOutputSize.Width() - aSpace.Width(),m_aFL2.GetSizePixel().Height()));
     m_aFL3.SetSizePixel(Size(aTotalOutputSize.Width() - aSpace.Width(),m_aFL3.GetSizePixel().Height()));
-
-//BTN   sal_Int32 nPos = aTotalOutputSize.Width() - aSpace.Width() - m_aPB_Up.GetSizePixel().Width();
-//BTN   m_aPB_Delete.SetPosPixel(Point(nPos,m_aPB_Delete.GetPosPixel().Y()));
-//BTN
-//BTN   nPos -= (m_aPB_Up.GetSizePixel().Width() + LogicToPixel( Size( UNRELATED_CONTROLS, 0 ), MAP_APPFONT ).Width());
-//BTN   m_aPB_Down.SetPosPixel(Point(nPos,m_aPB_Down.GetPosPixel().Y()));
-//BTN
-//BTN   nPos -= (m_aPB_Up.GetSizePixel().Width() + LogicToPixel( Size( RELATED_CONTROLS, 0 ), MAP_APPFONT ).Width());
-//BTN   m_aPB_Up.SetPosPixel(Point(nPos,m_aPB_Up.GetPosPixel().Y()));
     sal_Int32 nPos = aTotalOutputSize.Width() - aSpace.Width() - m_aToolBox.GetSizePixel().Width();
     m_aToolBox.SetPosPixel(Point(nPos,m_aToolBox.GetPosPixel().Y()));
 
@@ -1482,7 +1434,7 @@ void OGroupsSortingDialog::checkButtons(sal_Int32 _nRow)
     sal_Int32 nRowCount = m_pFieldExpression->GetRowCount();
     sal_Bool bEnabled = nGroupCount > 1;
 
-    if (bEnabled && _nRow > 0 /* && _nRow < nGroupCount */ )
+    if (bEnabled && _nRow > 0 )
     {
         m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_UP, sal_True);
     }
@@ -1490,7 +1442,7 @@ void OGroupsSortingDialog::checkButtons(sal_Int32 _nRow)
     {
         m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_UP, sal_False);
     }
-    if (bEnabled && _nRow < (nRowCount - 1) /* && _nRow < (nGroupCount - 1) */ )
+    if (bEnabled && _nRow < (nRowCount - 1) )
     {
         m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_DOWN, sal_True);
     }
@@ -1498,34 +1450,25 @@ void OGroupsSortingDialog::checkButtons(sal_Int32 _nRow)
     {
         m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_DOWN, sal_False);
     }
-    //BTN m_aPB_Up.Enable(bEnable && _nRow > 0 );
-    //BTN m_aPB_Down.Enable(bEnable && _nRow < (m_pFieldExpression->GetRowCount()-1) );
-    // m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_DOWN, bEnable && _nRow < (-1) );
 
     sal_Int32 nGroupPos = m_pFieldExpression->getGroupPosition(_nRow);
     if ( nGroupPos != NO_GROUP )
     {
         sal_Bool bEnableDelete = nGroupCount > 0;
-        //BTN m_aPB_Delete.Enable(bEnableDelete );
         m_aToolBox.EnableItem(SID_RPT_GROUPSORT_DELETE, bEnableDelete);
     }
     else
     {
-        //BTN m_aPB_Delete.Enable( sal_False );
         m_aToolBox.EnableItem(SID_RPT_GROUPSORT_DELETE, sal_False);
     }
 }
 
-ImageList OGroupsSortingDialog::getImageList(sal_Int16 _eBitmapSet,sal_Bool _bHiContast) const
+ImageList OGroupsSortingDialog::getImageList(sal_Int16 _eBitmapSet) const
 {
     sal_Int16 nN = IMG_CONDFORMAT_DLG_SC;
-    sal_Int16 nH = IMG_CONDFORMAT_DLG_SCH;
     if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE )
-    {
         nN = IMG_CONDFORMAT_DLG_LC;
-        nH = IMG_CONDFORMAT_DLG_LCH;
-    }
-    return ImageList(ModuleRes( _bHiContast ? nH : nN ));
+    return ImageList(ModuleRes( nN ));
 }
 
 //------------------------------------------------------------------
@@ -1541,24 +1484,11 @@ void OGroupsSortingDialog::resizeControls(const Size& _rDiff)
 
 //------------------------------------------------------------------
 // load the images
-ImageList OGroupsSortingDialog::getImageList(vcl::ImageListType _eType) SAL_THROW (( com::sun::star::lang::IllegalArgumentException ))
+ImageList OGroupsSortingDialog::getImageList(vcl::ImageListType) SAL_THROW (( com::sun::star::lang::IllegalArgumentException ))
 {
-    if (_eType == vcl::HIGHCONTRAST_NO)
-    {
-        return ImageList(ModuleRes(IMGLST_GROUPSORT_DLG_SC));
-    }
-    else if (_eType == vcl::HIGHCONTRAST_YES)
-    {
-        return ImageList(ModuleRes(IMGLST_GROUPSORT_DLG_SCH));
-    }
-    else
-    {
-        throw com::sun::star::lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("High contrast parameter is wrong.")), NULL, 0);
-    }
+    return ImageList(ModuleRes(IMGLST_GROUPSORT_DLG_SC));
 }
 
-
-
 // =============================================================================
 } // rptui
 // =============================================================================
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.hrc b/reportdesign/source/ui/dlg/GroupsSorting.hrc
index 8dfbfd3224a4..049afa79d37b 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.hrc
+++ b/reportdesign/source/ui/dlg/GroupsSorting.hrc
@@ -50,18 +50,8 @@
 #define PB_DOWN             (21)
 #define FL_SEPARATOR2       (22)
 #define FL_SEPARATOR3       (23)
-//BTN #define IMG_UP_H          (24)
-//BTN #define IMG_DOWN_H            (25)
-//BTN #define PB_DELETE         (26)
 #define TB_TOOLBOX                      (27)
 
-// #define IMG_GROUPSORT_MOVE_DOWN     (28)
-// #define IMG_GROUPSORT_MOVE_UP       (29)
-// #define IMG_GROUPSORT_DELETE        (30)
-// #define IMG_GROUPSORT_MOVE_DOWN_H   (31)
-// #define IMG_GROUPSORT_MOVE_UP_H     (32)
-// #define IMG_GROUPSORT_DELETE_H      (33)
-
 
 #define CHECKBOX_HEIGHT      8
 #define FIXEDTEXT_HEIGHT     8
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.src b/reportdesign/source/ui/dlg/GroupsSorting.src
index 2c73fff07de4..159a457011ce 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.src
+++ b/reportdesign/source/ui/dlg/GroupsSorting.src
@@ -66,57 +66,13 @@ FloatingWindow RID_GROUPS_SORTING
     {
         Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 3*UNRELATED_CONTROLS + BROWSER_HEIGHT ) ;
         Size = MAP_APPFONT ( FIXEDTEXT_WIDTH , FIXEDTEXT_HEIGHT ) ;
-//      Text [ en-US ] = "Move group" ;
         Text [ en-US ] = "Group actions" ;
     };
 
-//     /*
-//       |                                  PAGE_WIDTH                                            |
-//       |                         /-----\            {-------\            /---------\            |
-//       | unreleated FT_MOVELABEL |PB_UP| unreleated |PB_DOWN| unreleated |PD_DELETE| unreleated |
-//       |                         \_____/            \_______/            \_________/            |
-//
-//       Don't set any position here, it will be done in OGroupsSortingDialog::Resize()
-//
-//       Find possible IMAGEBUTTON_* in rscicpx.cxx
-//       Symbol is vclrsc.hxx
-//      */
-//  ImageButton PB_UP
-//  {
-//      Pos = MAP_APPFONT ( PAGE_WIDTH - 3*UNRELATED_CONTROLS - 3*14 - 2*RELATED_CONTROLS, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT -1 ) ;
-//      Size = MAP_APPFONT ( 14 , 14 ) ;
-//      TabStop = TRUE;
-// //        Symbol = IMAGEBUTTON_ARROW_UP ; // arrow up
-//         Symbol = IMAGEBUTTON_SPIN_UP ; // triangle up
-// //        Symbol = IMAGEBUTTON_FLOAT;
-//  };
-//
-//  ImageButton PB_DOWN
-//  {
-//      Pos = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS - 2*14 - 2*RELATED_CONTROLS, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT - 1 ) ;
-//      Size                = MAP_APPFONT ( 14 , 14 ) ;
-//      TabStop = TRUE;
-// //        Symbol = IMAGEBUTTON_ARROW_DOWN ; // arrow down
-// //        Symbol = IMAGEBUTTON_FIRST ;
-//         Symbol = IMAGEBUTTON_SPIN_DOWN;
-//
-//  };
-//
-//  ImageButton PB_DELETE
-//  {
-//      Pos = MAP_APPFONT ( PAGE_WIDTH - UNRELATED_CONTROLS - 14, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT - 1 ) ;
-//      Size                = MAP_APPFONT ( 14 , 14 ) ;
-//      TabStop = TRUE;
-//         Symbol = IMAGEBUTTON_CLOSE ;
-//  };
-
-
     ToolBox TB_TOOLBOX
     {
         Pos = MAP_APPFONT ( PAGE_WIDTH - 4*14 - UNRELATED_CONTROLS, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT - 1 ) ;
         ButtonType = BUTTON_SYMBOL;
-//      Align = BOXALIGN_TOP;
-//      HelpId = HID_RPT_CONDFORMAT_TB;
         Customize = FALSE;
         ItemList =
         {
@@ -127,7 +83,6 @@ FloatingWindow RID_GROUPS_SORTING
                 HelpID = HID_RPT_GROUPSORT_MOVE_UP ;
                 Text [ en-US ] = "Move up" ;
                 Checkable = TRUE;
-//                Disable              = TRUE;
             };
             ToolBoxItem
             {
@@ -136,7 +91,6 @@ FloatingWindow RID_GROUPS_SORTING
                 HelpID = HID_RPT_GROUPSORT_MOVE_DOWN ;
                 Text [ en-US ] = "Move down" ;
                 Checkable = TRUE;
-//                Disable              = TRUE;
             };
             ToolBoxItem
             {
@@ -145,7 +99,6 @@ FloatingWindow RID_GROUPS_SORTING
                 HelpID = HID_RPT_GROUPSORT_DELETE ;
                 Text [ en-US ] = "~Delete" ;
                 Checkable = TRUE;
-//                Disable              = TRUE;
             };
         };
     };
@@ -164,6 +117,7 @@ FloatingWindow RID_GROUPS_SORTING
         Hide = TRUE;
         Text [ en-US ] = "Sorting" ;
     };
+
     ListBox LST_ORDER
     {
         Border = TRUE;
@@ -180,6 +134,7 @@ FloatingWindow RID_GROUPS_SORTING
         };
 
     };
+
     FixedText FT_HEADER
     {
         Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 5*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 2*FIXEDTEXT_HEIGHT) ;
@@ -188,6 +143,7 @@ FloatingWindow RID_GROUPS_SORTING
         Text [ en-US ] = "Group Header" ;
 
     };
+
     ListBox LST_HEADERLST
     {
         Border = TRUE;
@@ -203,6 +159,7 @@ FloatingWindow RID_GROUPS_SORTING
             < "Not present" ; Default ; > ;
         };
     };
+
     FixedText FT_FOOTER
     {
         Pos = MAP_APPFONT (  UNRELATED_CONTROLS, 6*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 3*FIXEDTEXT_HEIGHT) ;
@@ -211,6 +168,7 @@ FloatingWindow RID_GROUPS_SORTING
         Text [ en-US ] = "Group Footer" ;
 
     };
+
     ListBox LST_FOOTERLST
     {
         Border = TRUE;
@@ -226,6 +184,7 @@ FloatingWindow RID_GROUPS_SORTING
             < "Not present" ; Default ; > ;
         };
     };
+
     FixedText FT_GROUPON
     {
         Pos = MAP_APPFONT (  UNRELATED_CONTROLS, 7*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 4*FIXEDTEXT_HEIGHT) ;
@@ -234,6 +193,7 @@ FloatingWindow RID_GROUPS_SORTING
         Text [ en-US ] = "Group On" ;
 
     };
+
     ListBox LST_GROUPONLST
     {
         Border = TRUE;
@@ -248,6 +208,7 @@ FloatingWindow RID_GROUPS_SORTING
             < "Each Value" ; Default ; > ;
         };
     };
+
     FixedText FT_GROUPINTERVAL
     {
         Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 8*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 5*FIXEDTEXT_HEIGHT) ;
@@ -255,6 +216,7 @@ FloatingWindow RID_GROUPS_SORTING
         Hide = TRUE;
         Text [ en-US ] = "Group Interval" ;
     };
+
     NumericField ED_GROUPINTERVALLST
     {
         Border = TRUE;
@@ -302,58 +264,58 @@ FloatingWindow RID_GROUPS_SORTING
         WordBreak = TRUE;
     };
 
-//BTN   Image IMG_UP_H
-//BTN   {
-//BTN       ImageBitmap = Bitmap { File = "arrow_move_up_hc" ; };
-//BTN   };
-//BTN   Image IMG_DOWN_H
-//BTN   {
-//BTN       ImageBitmap = Bitmap { File = "arrow_move_down_hc" ; };
-//BTN   };
-
-
 };
 
 String STR_RPT_EXPRESSION
 {
     Text [ en-US ] = "Field/Expression" ;
 };
+
 String STR_RPT_SORTING
 {
     Text [ en-US ] = "Sort Order" ;
 };
+
 String STR_RPT_PREFIXCHARS
 {
     Text [ en-US ] = "Prefix Characters" ;
 };
+
 String STR_RPT_YEAR
 {
     Text [ en-US ] = "Year" ;
 };
+
 String STR_RPT_QUARTER
 {
     Text [ en-US ] = "Quarter" ;
 };
+
 String STR_RPT_MONTH
 {
     Text [ en-US ] = "Month" ;
 };
+
 String STR_RPT_WEEK
 {
     Text [ en-US ] = "Week" ;
 };
+
 String STR_RPT_DAY
 {
     Text [ en-US ] = "Day" ;
 };
+
 String STR_RPT_HOUR
 {
     Text [ en-US ] = "Hour" ;
 };
+
 String STR_RPT_MINUTE
 {
     Text [ en-US ] = "Minute" ;
 };
+
 String STR_RPT_INTERVAL
 {
     Text [ en-US ] = "Interval" ;
@@ -373,42 +335,31 @@ String STR_RPT_HELP_FOOTER
 {
     Text [ en-US ] = "Display a footer for this group?" ;
 };
+
 String STR_RPT_HELP_GROUPON
 {
     Text [ en-US ] = "Select the value or range of values that starts a new group." ;
 };
+
 String STR_RPT_HELP_INTERVAL
 {
     Text [ en-US ] = "Interval or number of characters to group on." ;
 };
+
 String STR_RPT_HELP_KEEP
 {
     Text [ en-US ] = "Keep group together on one page?" ;
 };
+
 String STR_RPT_HELP_SORT
 {
     Text [ en-US ] = "Select ascending or descending sort order. Ascending means from A to Z or 0 to 9" ;
 };
 
-
 Menu RID_GROUPSROWPOPUPMENU
 {
     ItemList =
     {
-/*
-        MenuItem
-        {
-            ITEM_EDIT_CUT
-        };
-        MenuItem
-        {
-            ITEM_EDIT_COPY
-        };
-        MenuItem
-        {
-            ITEM_EDIT_PASTE
-        };
-*/
         MenuItem
         {
             ITEM_EDIT_DELETE
@@ -436,61 +387,3 @@ ImageList IMGLST_GROUPSORT_DLG_SC
     prefix = "sc";
     DEF_IL_GROUPSORT ;
 };
-
-ImageList IMGLST_GROUPSORT_DLG_SCH
-{
-    DEF_MASKCOLOR;
-    prefix = "sch";
-    DEF_IL_GROUPSORT ;
-};
-
-
-// Image IMG_GROUPSORT_MOVEUP
-// {
-//     ImageBitmap = Bitmap
-//     {
-//         File = "reportgroupmoveup"; // reportdesign/res/...
-//     };
-//     DEF_MASKCOLOR;
-// };
-// Image IMG_GROUPSORT_MOVEDOWN
-// {
-//     ImageBitmap = Bitmap
-//     {
-//         File = "reportgroupmovedown";
-//     };
-//     DEF_MASKCOLOR;
-// };
-// Image IMG_GROUPSORT_DELETE
-// {
-//     ImageBitmap = Bitmap
-//     {
-//         File = "reportgroupdelete";
-//     };
-//     DEF_MASKCOLOR;
-// };
-//
-// Image IMG_GROUPSORT_MOVEUP_H
-// {
-//     ImageBitmap = Bitmap
-//     {
-//         File = "reportgroupmoveup_h"; // reportdesign/res/...
-//     };
-//     DEF_MASKCOLOR;
-// };
-// Image IMG_GROUPSORT_MOVEDOWN_H
-// {
-//     ImageBitmap = Bitmap
-//     {
-//         File = "reportgroupmovedown_h";
-//     };
-//     DEF_MASKCOLOR;
-// };
-// Image IMG_GROUPSORT_DELETE_H
-// {
-//     ImageBitmap = Bitmap
-//     {
-//         File = "reportgroupdelete_h";
-//     };
-//     DEF_MASKCOLOR;
-// };
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index cca1a5a2fbdb..c264a3e41bec 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -154,7 +154,6 @@ class NavigatorTree :   public ::cppu::BaseMutex
     AutoTimer                                                                   m_aDropActionTimer;
     Timer                                                                       m_aSynchronizeTimer;
     ImageList                                                                   m_aNavigatorImages;
-    ImageList                                                                   m_aNavigatorImagesHC;
     Point                                                                       m_aTimerTriggered;      // die Position, an der der DropTimer angeschaltet wurde
     DROP_ACTION                                                                 m_aDropActionType;
     OReportController&                                                          m_rController;
@@ -244,17 +243,10 @@ NavigatorTree::NavigatorTree( Window* pParent,OReportController& _rController )
     SetHelpId( HID_REPORT_NAVIGATOR_TREE );
 
     m_aNavigatorImages = ImageList( ModuleRes( RID_SVXIMGLIST_RPTEXPL ) );
-    m_aNavigatorImagesHC = ImageList( ModuleRes( RID_SVXIMGLIST_RPTEXPL_HC ) );
 
     SetNodeBitmaps(
         m_aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ),
-        m_aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ),
-        BMP_COLOR_NORMAL
-    );
-    SetNodeBitmaps(
-        m_aNavigatorImagesHC.GetImage( RID_SVXIMG_COLLAPSEDNODE ),
-        m_aNavigatorImagesHC.GetImage( RID_SVXIMG_EXPANDEDNODE ),
-        BMP_COLOR_HIGHCONTRAST
+        m_aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE )
     );
 
     SetDragDropMode(0xFFFF);
@@ -335,7 +327,7 @@ void NavigatorTree::Command( const CommandEvent& rEvt )
                     else
                         aContextMenu.EnableItem(nId,bEnabled);
                 }
-            } // for (USHORT i = 0; i < nCount; ++i)
+            }
             USHORT nId = aContextMenu.Execute(this, aWhere);
             if ( nId )
             {
@@ -419,7 +411,6 @@ sal_Int8 NavigatorTree::AcceptDrop( const AcceptDropEvent& _rEvt )
 // -------------------------------------------------------------------------
 sal_Int8 NavigatorTree::ExecuteDrop( const ExecuteDropEvent& /*_rEvt*/ )
 {
-    // _rEvt.mnAction;
     return DND_ACTION_NONE;
 }
 // -------------------------------------------------------------------------
@@ -528,12 +519,6 @@ SvLBoxEntry* NavigatorTree::insertEntry(const ::rtl::OUString& _sName,SvLBoxEntr
     {
         const Image aImage( m_aNavigatorImages.GetImage( _nImageId ) );
         pEntry = InsertEntry(_sName,aImage,aImage,_pParent,FALSE,_nPosition,_pData);
-        if ( pEntry )
-        {
-            const Image aImageHC( m_aNavigatorImagesHC.GetImage( _nImageId ) );
-            SetExpandedEntryBmp( pEntry, aImageHC, BMP_COLOR_HIGHCONTRAST );
-            SetCollapsedEntryBmp( pEntry, aImageHC, BMP_COLOR_HIGHCONTRAST );
-        }
     }
     else
         pEntry = InsertEntry(_sName,_pParent,FALSE,_nPosition,_pData);
@@ -852,8 +837,6 @@ void NavigatorTree::UserData::_propertyChanged(const beans::PropertyChangeEvent&
                     ++nPos;
                 m_pTree->traverseSection(pMemFunSection(&aGroupHelper),pEntry,bFooterOn ? SID_GROUPFOOTER : SID_GROUPHEADER,nPos);
             }
-            //else
-            //    m_pTree->removeEntry(m_pTree->GetEntry(pEntry,nPos));
         }
         else if ( PROPERTY_EXPRESSION == _rEvent.PropertyName)
         {
@@ -937,10 +920,6 @@ ONavigator::ONavigator( Window* _pParent
 
     m_pImpl.reset(new ONavigatorImpl(_rController,this));
 
-    //Size aSpace = LogicToPixel( Size( 7, 120), MAP_APPFONT );
-    //Size aOutSize(nMaxTextWidth + m_aHeader.GetSizePixel().Width() + 3*aSpace.Width(),aSpace.Height());
-    //SetMinOutputSizePixel(aOutSize);
-    //SetOutputSizePixel(aOutSize);
     FreeResource();
     m_pImpl->m_pNavigatorTree->Show();
     m_pImpl->m_pNavigatorTree->GrabFocus();
diff --git a/reportdesign/source/ui/dlg/Navigator.src b/reportdesign/source/ui/dlg/Navigator.src
index 496bae3b0ab7..af6ec90b2e7f 100644
--- a/reportdesign/source/ui/dlg/Navigator.src
+++ b/reportdesign/source/ui/dlg/Navigator.src
@@ -88,13 +88,6 @@ ImageList RID_SVXIMGLIST_RPTEXPL
     NAVIGATOR_IMAGEIDS;
 };
 
-ImageList RID_SVXIMGLIST_RPTEXPL_HC
-{
-    Prefix = "sxh";
-    MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
-    NAVIGATOR_IMAGEIDS;
-};
-
 String RID_STR_FUNCTIONS
 {
     Text [ en-US ] = "Functions" ;
diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx
index 383078a377f5..86e73e266a41 100644
--- a/reportdesign/source/ui/dlg/dlgpage.cxx
+++ b/reportdesign/source/ui/dlg/dlgpage.cxx
@@ -60,8 +60,6 @@ SfxTabDialog ( pParent, ModuleRes( _nPageId ), pAttr ),
             AddTabPage( RID_SVXPAGE_BACKGROUND,String(ModuleRes(1)));
             break;
         case RID_PAGEDIALOG_PAGE:
-            //AddTabPage( RID_SVXPAGE_PAGE,String(ModuleRes(1)));
-   //         AddTabPage( RID_SVXPAGE_BACKGROUND,String(ModuleRes(1)));
             AddTabPage(RID_SVXPAGE_PAGE, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), 0 );
             AddTabPage(RID_SVXPAGE_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 );
             break;
@@ -76,8 +74,6 @@ SfxTabDialog ( pParent, ModuleRes( _nPageId ), pAttr ),
             break;
         case RID_PAGEDIALOG_LINE:
             AddTabPage( RID_SVXPAGE_LINE,pFact->GetTabPageCreatorFunc( RID_SVXPAGE_LINE ), 0 );
-            //AddTabPage( RID_SVXPAGE_LINE_DEF,pFact->GetTabPageCreatorFunc( RID_SVXPAGE_LINE_DEF ), 0 );
-            //AddTabPage( RID_SVXPAGE_LINEEND_DEF,pFact->GetTabPageCreatorFunc( RID_SVXPAGE_LINEEND_DEF ), 0 );
             break;
         default:
             OSL_ENSURE(0,"Unknown page id");
diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx
index cbfc8608d1bb..374ec169a055 100644
--- a/reportdesign/source/ui/inc/AddField.hxx
+++ b/reportdesign/source/ui/inc/AddField.hxx
@@ -110,10 +110,8 @@ public:
     /** will be called when the id of the image list is needed.
         @param  _eBitmapSet
             <svtools/imgdef.hxx>
-        @param  _bHiContast
-            <TRUE/> when in high contrast mode.
     */
-    virtual ImageList getImageList(sal_Int16 _eBitmapSet,sal_Bool _bHiContast) const;
+    virtual ImageList getImageList(sal_Int16 _eBitmapSet) const;
 
     /** will be called when the controls need to be resized.
     */
diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx
index 84178a76feaa..5bd349b1d52d 100644
--- a/reportdesign/source/ui/inc/GroupsSorting.hxx
+++ b/reportdesign/source/ui/inc/GroupsSorting.hxx
@@ -65,18 +65,15 @@ class OReportController;
 \************************************************************************/
 
 class OGroupsSortingDialog :    public FloatingWindow
-                            ,   public ::cppu::BaseMutex
-                                ,   public ::comphelper::OPropertyChangeListener
-                           ,public dbaui::OToolBoxHelper
-                           ,public vcl::IImageListProvider
+                           ,    public ::cppu::BaseMutex
+                           ,    public ::comphelper::OPropertyChangeListener
+                           ,    public dbaui::OToolBoxHelper
+                           ,    public vcl::IImageListProvider
 {
     friend class OFieldExpressionControl;
 
     FixedLine                               m_aFL2;
     FixedText                               m_aMove;
-//BTN   ImageButton                             m_aPB_Up;
-//BTN   ImageButton                             m_aPB_Down;
-//BTN   ImageButton                             m_aPB_Delete;
     ToolBox                                 m_aToolBox;
 
     FixedLine                               m_aFL3;
@@ -106,7 +103,6 @@ private:
     DECL_LINK( OnControlFocusLost, Control* );
     DECL_LINK( OnControlFocusGot, Control* );
     DECL_LINK( LBChangeHdl, ListBox* );
-//BTN   DECL_LINK( ClickHdl, ImageButton* );
     DECL_LINK( OnFormatAction,      ToolBox* );
 
     /** returns the groups
@@ -188,10 +184,8 @@ public:
         /** will be called when the image list is needed.
             @param  _eSymbolsSize
                 <svtools/imgdef.hxx>
-            @param  _bHiContast
-                <TRUE/> when in high contrast mode.
         */
-    virtual ImageList getImageList(sal_Int16 _eSymbolsSize,sal_Bool _bHiContast) const;
+    virtual ImageList getImageList(sal_Int16 _eSymbolsSize) const;
 
     // ImageListProvider interface
     virtual ImageList getImageList(vcl::ImageListType) SAL_THROW ((com::sun::star::lang::IllegalArgumentException ));
diff --git a/reportdesign/source/ui/inc/StartMarker.hxx b/reportdesign/source/ui/inc/StartMarker.hxx
index 50d4311d9ed4..2ae45214b44b 100644
--- a/reportdesign/source/ui/inc/StartMarker.hxx
+++ b/reportdesign/source/ui/inc/StartMarker.hxx
@@ -46,8 +46,6 @@ namespace rptui
         OSectionWindow*             m_pParent;
         static Image*               s_pDefCollapsed;
         static Image*               s_pDefExpanded;
-        static Image*               s_pDefCollapsedHC;
-        static Image*               s_pDefExpandedHC;
         static oslInterlockedCount  s_nImageRefCount; /// When 0 all static images will be destroyed
 
         sal_Bool                    m_bShowRuler;
diff --git a/reportdesign/source/ui/inc/UITools.hxx b/reportdesign/source/ui/inc/UITools.hxx
index 6e600c4307da..6cf3ef141b86 100644
--- a/reportdesign/source/ui/inc/UITools.hxx
+++ b/reportdesign/source/ui/inc/UITools.hxx
@@ -69,7 +69,7 @@ namespace rptui
             ::com::sun::star::uno::Reference< T > xObject(_xCollection->getByIndex(i),::com::sun::star::uno::UNO_QUERY);
             if ( xObject == _xSearch )
                 break;
-        } // for (;i<nCount ; ++i)
+        }
         return i;
     }
 
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index f2a87ea06bde..c14b1db3f278 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -169,13 +169,6 @@ void SAL_CALL DataProviderHandler::inspect(const uno::Reference< uno::XInterface
 
             m_xMasterDetails = new OPropertyMediator( m_xDataProvider.get(), m_xReportComponent.get(), aPropertyMediation,sal_True );
         }
-
-        //const ::rtl::OUString sRowSet(RTL_CONSTASCII_USTRINGPARAM("RowSet"));
-        //if ( xNameCont->hasByName(sRowSet) )
-        //{
-        //    uno::Reference<beans::XPropertySet> xProp(m_xFormComponentHandler,uno::UNO_QUERY);
-        //    xProp->setPropertyValue(sRowSet,xNameCont->getByName(sRowSet));
-        //}
     }
     catch(uno::Exception)
     {
@@ -271,7 +264,7 @@ void DataProviderHandler::impl_updateChartTitle_throw(const uno::Any& _aValue)
             aArgs[0] = xFormatted;
             xTitle->setText(aArgs);
         }
-    } // if ( xTitled.is() )
+    }
 }
 
 beans::PropertyState SAL_CALL DataProviderHandler::getPropertyState(const ::rtl::OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException)
@@ -396,7 +389,6 @@ uno::Sequence< beans::Property > SAL_CALL DataProviderHandler::getSupportedPrope
             ,PROPERTY_MASTERFIELDS
             ,PROPERTY_DETAILFIELDS
             ,PROPERTY_PREVIEW_COUNT
-            //,PROPERTY_TITLE
         };
 
         for (size_t nPos = 0; nPos < SAL_N_ELEMENTS(s_pProperties) ;++nPos )
@@ -480,9 +472,9 @@ void SAL_CALL DataProviderHandler::actuatingPropertyChanged(const ::rtl::OUStrin
             xReceiver->setArguments( aArgs.getPropertyValues() );
             if ( !bModified )
                 xReport->setModified(sal_False);
-        } // if ( NewValue != OldValue )
+        }
         m_xFormComponentHandler->actuatingPropertyChanged(ActuatingPropertyName, NewValue, OldValue, InspectorUI, FirstTimeInit);
-    } // if ( ActuatingPropertyName == PROPERTY_COMMAND )
+    }
     else if ( ActuatingPropertyName == PROPERTY_TITLE )
     {
         if ( NewValue != OldValue )
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index a90a80a26f65..99f6d76936f6 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -127,18 +127,17 @@ namespace rptui
 {
 //........................................................................
 using namespace ::com::sun::star;
-//using namespace formula;
 
 // comparing two property instances
 struct PropertyCompare : public ::std::binary_function< beans::Property, ::rtl::OUString , bool >
 {
     bool operator() (const beans::Property& x, const ::rtl::OUString& y) const
     {
-        return x.Name.equals(y);// ? true : false;
+        return x.Name.equals(y);
     }
     bool operator() (const ::rtl::OUString& x,const beans::Property& y) const
     {
-        return x.equals(y.Name);// ? true : false;
+        return x.equals(y.Name);
     }
 };
 
@@ -1329,7 +1328,7 @@ uno::Sequence< beans::Property > SAL_CALL GeometryHandler::getSupportedPropertie
             }
             aNewProps.push_back(*pFind);
         }
-    } // for (size_t i = 0; i < SAL_N_ELEMENTS(pIncludeProperties) ;++i )
+    }
 
     // special property for shapes
 //    if ( uno::Reference< report::XShape>(m_xReportComponent,uno::UNO_QUERY).is() )
@@ -1450,7 +1449,6 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr
             eResult = inspection::InteractiveSelectionResult_ObtainedValue;
             beans::PropertyChangeEvent aScopeEvent;
             aScopeEvent.PropertyName = PROPERTY_FILLCOLOR;
-            // aScopeEvent.OldValue <<= _nOldDataFieldType;
             aScopeEvent.NewValue <<= xShape->getPropertyValue(PROPERTY_FILLCOLOR);
             m_aPropertyListeners.notify( aScopeEvent, &beans::XPropertyChangeListener::propertyChange );
         }
@@ -1519,7 +1517,7 @@ void SAL_CALL GeometryHandler::actuatingPropertyChanged(const ::rtl::OUString &
                 {
                     _rxInspectorUI->rebuildPropertyUI(PROPERTY_DATAFIELD);
                     _rxInspectorUI->rebuildPropertyUI(PROPERTY_FORMULALIST);
-                } // if ( bEnable )
+                }
                 m_xFormComponentHandler->actuatingPropertyChanged(ActuatingPropertyName, NewValue, OldValue, _rxInspectorUI, _bFirstTimeInit);
             }
             break;
@@ -1669,7 +1667,7 @@ void GeometryHandler::impl_fillFormulaList_nothrow(::std::vector< ::rtl::OUStrin
             const uno::Sequence< ::rtl::OUString > aMimeTypes( xReportDefinition->getAvailableMimeTypes() );
             sRet = aMimeTypes[nPos];
         }
-    } // if ( aFind != aList.end() )
+    }
     return sRet;
 }
 // -----------------------------------------------------------------------------
@@ -1916,13 +1914,6 @@ void GeometryHandler::loadDefaultFunctions()
         DefaultFunction aDefault;
         aDefault.m_bDeepTraversing = sal_False;
 
-        //aDefault.m_sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Counter"));
-        //aDefault.m_sFormula = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:[%FunctionName] + 1"));
-        //aDefault.m_sSearchString = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:\\[[:alpha:]+[:alnum:]*\\][:space:]*\\+[:space:]*1"));
-        //aDefault.m_sInitialFormula.IsPresent = sal_True;
-        //aDefault.m_sInitialFormula.Value = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:1"));
-        //m_aDefaultFunctions.push_back(aDefault);
-
         aDefault.m_bPreEvaluated = sal_True;
 
         aDefault.m_sName = String(ModuleRes(RID_STR_F_ACCUMULATION));
diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx
index 1de40751f9c1..d666fd3ce144 100644
--- a/reportdesign/source/ui/misc/FunctionHelper.cxx
+++ b/reportdesign/source/ui/misc/FunctionHelper.cxx
@@ -58,7 +58,7 @@ sal_Unicode FunctionManager::getSingleToken(const formula::IFunctionManager::ETo
             return sal_Unicode('{');
         case eArrayClose:
             return sal_Unicode('}');
-    } // switch(_eToken)
+    }
     return 0;
 }
 // -----------------------------------------------------------------------------
@@ -93,11 +93,6 @@ const formula::IFunctionDescription* FunctionManager::getFunctionByName(const ::
 // -----------------------------------------------------------------------------
 void FunctionManager::fillLastRecentlyUsedFunctions(::std::vector< const formula::IFunctionDescription*>& /*_rLastRUFunctions*/) const
 {
-    //const sal_uInt32 nCount = getCount();
-    //for(sal_uInt32 i = 0 ; i < nCount ; ++i)
-    //{
-    //    const formula::IFunctionCategory* pCategory = getCategory(
-    //}
 }
 // -----------------------------------------------------------------------------
 ::boost::shared_ptr< FunctionDescription > FunctionManager::get(const uno::Reference< report::meta::XFunctionDescription>& _xFunctionDescription) const
@@ -118,9 +113,9 @@ void FunctionManager::fillLastRecentlyUsedFunctions(::std::vector< const formula
                 m_aCategoryIndex.push_back( aCategoryFind );
             }
             aFunctionFind = m_aFunctions.insert(TFunctionsMap::value_type(sFunctionName,::boost::shared_ptr<FunctionDescription>(new FunctionDescription(aCategoryFind->second.get(),_xFunctionDescription)))).first;
-        } // if ( aFind == m_aFunctions.end() )
+        }
         pDesc = aFunctionFind->second;
-    } // if ( _xFunctionDescription.is() )
+    }
     return pDesc;
 }
 // -----------------------------------------------------------------------------
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 6e1ed17c4e2e..492eb8d345a6 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -175,14 +175,14 @@ void adjustSectionName(const uno::Reference< report::XGroup >& _xGroup,sal_Int32
         ::rtl::OUString sName = String(ModuleRes(RID_STR_GROUPHEADER));
         sName += ::rtl::OUString::valueOf(_nPos);
         _xGroup->getHeader()->setName(sName);
-    } // if ( _xGroup->getHeaderOn() )
+    }
 
     if ( _xGroup->getFooterOn() && !_xGroup->getFooter()->getName().getLength()  )
     {
         ::rtl::OUString sName = String(ModuleRes(RID_STR_GROUPFOOTER));
         sName += ::rtl::OUString::valueOf(_nPos);
         _xGroup->getFooter()->setName(sName);
-    } // if ( _xGroup->getHeaderOn() )
+    }
 }
 // -----------------------------------------------------------------------------
 ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> addStyleListener(const uno::Reference< report::XReportDefinition >& _xReportDefinition,::comphelper::OPropertyChangeListener* _pListener)
@@ -261,7 +261,7 @@ namespace
             case COMPLEX:
                 aLocale = _rxReportControlFormat->getCharLocaleComplex();
                 break;
-        } // switch(_nWhich)
+        }
 
         _rItemSet.Put(SvxLanguageItem(MsLangId::convertLocaleToLanguageWithFallback(aLocale),_nLanguage));
 
@@ -288,7 +288,7 @@ namespace
                     pClone->PutValue(_xShape->getPropertyValue(aIt->sName), aIt->nMemberId);
                     _rItemSet.Put(*pClone, aIt->nWID);
                 }
-            } // if ( xInfo->hasPropertyByName(sPropertyName) )
+            }
             ++aIt;
         }
     }
@@ -319,11 +319,11 @@ namespace
                         catch(uno::Exception&)
                         { // shapes have a bug so we ignore this one.
                         }
-                    } // if ( pItem )
+                    }
                 }
             }
             ++aIt;
-        } // while ( pPropertyMap->pName )
+        }
     }
     // -------------------------------------------------------------------------
     void lcl_CharPropertiesToItems( const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat,
@@ -353,7 +353,6 @@ namespace
         _rItemSet.Put(aUnderLineItem);
         _rItemSet.Put(SvxKerningItem(_rxReportControlFormat->getCharKerning(),ITEMID_KERNING));
         _rItemSet.Put(SvxEmphasisMarkItem(static_cast<FontEmphasisMark>(_rxReportControlFormat->getCharEmphasis()),ITEMID_EMPHASISMARK));
-        //_rItemSet.Put(SvxTwoLinesItem());
         _rItemSet.Put(SvxCharReliefItem(static_cast<FontRelief>(_rxReportControlFormat->getCharRelief()),ITEMID_CHARRELIEF));
         _rItemSet.Put(SvxColorItem(::Color(_rxReportControlFormat->getCharColor()),ITEMID_COLOR));
         _rItemSet.Put(SvxCharRotateItem(_rxReportControlFormat->getCharRotation(),sal_False,ITEMID_CHARROTATE));
@@ -362,11 +361,9 @@ namespace
         SvxHorJustifyItem aHorJustifyItem(ITEMID_HORJUSTIFY);
         aHorJustifyItem.PutValue(xSet->getPropertyValue(PROPERTY_PARAADJUST),MID_HORJUST_ADJUST);
         _rItemSet.Put(aHorJustifyItem);
-        //_rItemSet.Put(SfxInt32Item(ITEMID_DEGREES,_rxReportControlFormat->getCharRotation()));
         SvxVerJustifyItem aVerJustifyItem(ITEMID_VERJUSTIFY);
         aVerJustifyItem.PutValue(xSet->getPropertyValue(PROPERTY_VERTICALALIGN),MID_HORJUST_ADJUST);
         _rItemSet.Put(aVerJustifyItem);
-        //_rItemSet.Put(SfxInt32Item(ITEMID_IDENT,_rxReportControlFormat->getCharRotation()));
 
         uno::Reference< report::XShape> xShape(_rxReportControlFormat,uno::UNO_QUERY);
         if ( !xShape.is() )
@@ -398,7 +395,7 @@ namespace
             aNewFont.SetFamily(pFontItem->GetFamily());
             aNewFont.SetPitch(pFontItem->GetPitch());
             aNewFont.SetCharSet(pFontItem->GetCharSet());
-        } // if ( SFX_ITEM_SET == _rItemSet.GetItemState( ITEMID_FONT,sal_True,&pItem) && pItem->ISA(SvxFontItem))
+        }
         if ( SFX_ITEM_SET == _rItemSet.GetItemState( _nFontHeight,sal_True,&pItem) && pItem->ISA(SvxFontHeightItem))
         {
             const SvxFontHeightItem* pFontItem = static_cast<const SvxFontHeightItem*>(pItem);
@@ -544,7 +541,7 @@ namespace
         {
             const SvxCaseMapItem* pFontItem = static_cast<const SvxCaseMapItem*>(pItem);
             lcl_pushBack( _out_rProperties, PROPERTY_CHARCASEMAP, uno::makeAny( pFontItem->GetValue() ) );
-        } // if ( SFX_ITEM_SET == _rItemSet.GetItemState( ITEMID_CASEMAP,sal_True,&pItem) && pItem->ISA(SvxCaseMapItem))
+        }
         struct Items {
                 USHORT nWhich;
                 ::rtl::OUString sPropertyName;
@@ -561,7 +558,7 @@ namespace
                 lang::Locale aCharLocale;
                 MsLangId::convertLanguageToLocale( pFontItem->GetLanguage(), aCharLocale );
                 lcl_pushBack( _out_rProperties, pItems[k].sPropertyName, uno::makeAny( aCharLocale ) );
-            } // if ( SFX_ITEM_SET == _rItemSet.GetItemState( ITEMID_LANGUAGE,sal_True,&pItem) && pItem->ISA(SvxLanguageItem))
+            }
         }
         if ( SFX_ITEM_SET == _rItemSet.GetItemState( ITEMID_ESCAPEMENT,sal_True,&pItem) && pItem->ISA(SvxEscapementItem))
         {
@@ -641,7 +638,6 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep
         { SID_ATTR_CHAR_SCALEWIDTH, SFX_ITEM_POOLABLE },
         { SID_ATTR_CHAR_RELIEF, SFX_ITEM_POOLABLE },
         { SID_ATTR_CHAR_HIDDEN, SFX_ITEM_POOLABLE },
-        //{ SID_ATTR_BRUSH_CHAR, SFX_ITEM_POOLABLE },
         { SID_ATTR_BRUSH, SFX_ITEM_POOLABLE },
         { SID_ATTR_ALIGN_HOR_JUSTIFY, SFX_ITEM_POOLABLE },
         { SID_ATTR_ALIGN_VER_JUSTIFY, SFX_ITEM_POOLABLE },
@@ -761,12 +757,6 @@ bool openAreaDialog( const uno::Reference<report::XShape >& _xShape,const uno::R
 
     Window* pParent = VCLUnoHelper::GetWindow( _rxParentWindow );
 
-    //static USHORT pRanges[] =
-    //{
-    //  XATTR_START,XATTR_END,
- //       0
-    //};
-
     bool bSuccess = false;
     try
     {
@@ -813,14 +803,14 @@ void applyCharacterSettings( const uno::Reference< report::XReportControlFormat
             aAwtFont.Name = ::rtl::OUString(); // hack to
             _rxReportControlFormat->setFontDescriptor( aAwtFont );
             _rxReportControlFormat->setCharFontName( sTemp );
-        } // if ( aSettings.get( "Font" ) >>= aAwtFont )
+        }
         if ( aSettings.get( "FontAsian" ) >>= aAwtFont )
         {
             ::rtl::OUString sTemp = aAwtFont.Name;
             aAwtFont.Name = ::rtl::OUString(); // hack to
             _rxReportControlFormat->setFontDescriptorAsian( aAwtFont );
             _rxReportControlFormat->setCharFontNameAsian( sTemp );
-        } // if ( aSettings.get( "Font" ) >>= aAwtFont )
+        }
         if ( aSettings.get( "FontComplex" ) >>= aAwtFont )
         {
             ::rtl::OUString sTemp = aAwtFont.Name;
@@ -1002,9 +992,6 @@ void correctOverlapping(SdrObject* _pControl,OReportSection& _aReportSection,boo
 {
     OSectionView& rSectionView = _aReportSection.getSectionView();
     uno::Reference< report::XReportComponent> xComponent(_pControl->getUnoShape(),uno::UNO_QUERY);
-    // Rectangle aRet(VCLPoint(xComponent->getPosition()),VCLSize(xComponent->getSize()));
-    // aRet.setHeight(aRet.getHeight() + 1);
-    // aRet.setWidth(aRet.getWidth() + 1);
     Rectangle aRect = getRectangleFromControl(_pControl);
 
     bool bOverlapping = true;
@@ -1040,7 +1027,6 @@ bool openDialogFormula_nothrow( ::rtl::OUString& _in_out_rFormula
     OSL_PRECOND( _xInspectorWindow.is(), "openDialogFormula_nothrow: invalid parameters!" );
     if ( !_xInspectorWindow.is() )
         return false;
-    // _out_rFormula = ::rtl::OUString();
     bool bSuccess = false;
     ::dbtools::SQLExceptionInfo aErrorInfo;
     uno::Reference< awt::XWindow > xInspectorWindow;
diff --git a/reportdesign/source/ui/misc/Undo.cxx b/reportdesign/source/ui/misc/Undo.cxx
index 3a434d179985..249bac85b1b0 100644
--- a/reportdesign/source/ui/misc/Undo.cxx
+++ b/reportdesign/source/ui/misc/Undo.cxx
@@ -70,7 +70,7 @@ namespace
                 _xSection->remove(xShape);
                 --nCount;
             }
-        } // if ( _xSection.is() )
+        }
     }
     //----------------------------------------------------------------------------
     void lcl_insertElements(const uno::Reference< report::XSection >& _xSection,const ::std::vector< uno::Reference< drawing::XShape> >& _aControls)
diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx
index a169c8279026..6891d5dcd5dc 100644
--- a/reportdesign/source/ui/misc/statusbarcontroller.cxx
+++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx
@@ -113,7 +113,7 @@ void SAL_CALL OStatusbarController::initialize( const Sequence< Any >& _rArgumen
         if ( m_aCommandURL.equalsAscii(".uno:ZoomSlider") )
         {
             m_pController = TStatusbarHelper::createFromQuery(new SvxZoomSliderControl(m_nSlotId = SID_ATTR_ZOOMSLIDER,m_nId,*pStatusBar));
-        } // if ( m_aCommandURL.equalsAscii(".uno:ZoomSlider") )
+        }
         else if ( m_aCommandURL.equalsAscii(".uno:Zoom") )
         {
             m_pController = TStatusbarHelper::createFromQuery(new SvxZoomStatusBarControl(m_nSlotId = SID_ATTR_ZOOM,m_nId,*pStatusBar));
@@ -146,7 +146,7 @@ void SAL_CALL OStatusbarController::statusChanged( const FeatureStateEvent& _aEv
                 aZoomSlider.PutValue(_aEvent.State);
                 static_cast<SvxZoomSliderControl*>(m_pController.get())->StateChanged(m_nSlotId,SFX_ITEM_AVAILABLE,&aZoomSlider);
             }
-        } // if ( m_aCommandURL.equalsAscii(".uno:ZoomSlider") )
+        }
         else if ( m_aCommandURL.equalsAscii(".uno:Zoom") )
         {
             Sequence< PropertyValue > aSeq;
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index 3e97c4e0f002..e5745382053a 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -171,14 +171,11 @@ ODesignView::ODesignView(   Window* pParent,
 
     // now create the task pane on the right side :-)
     m_pTaskPane = new OTaskWindow(this);
-    //m_pTaskPane->Show();
 
     m_aSplitWin.InsertItem( COLSET_ID,100,SPLITWINDOW_APPEND, 0, SWIB_PERCENTSIZE | SWIB_COLSET );
-    m_aSplitWin.InsertItem( REPORT_ID, &m_aScrollWindow, 100/*m_aScrollWindow.getMaxMarkerWidth(sal_False)*/, SPLITWINDOW_APPEND, COLSET_ID, SWIB_PERCENTSIZE  /*SWIB_COLSET*/);
-    //m_aSplitWin.InsertItem( TASKPANE_ID, m_pTaskPane, 50, SPLITWINDOW_APPEND, 0, SWIB_PERCENTSIZE );
+    m_aSplitWin.InsertItem( REPORT_ID, &m_aScrollWindow, 100, SPLITWINDOW_APPEND, COLSET_ID, SWIB_PERCENTSIZE);
 
     // Splitter einrichten
-    //m_aSplitter.SetSplitHdl(LINK(this, ODesignView,SplitHdl));
     m_aSplitWin.SetSplitHdl(LINK(this, ODesignView,SplitHdl));
     m_aSplitWin.ShowAutoHideButton();
     m_aSplitWin.SetAlign(WINDOWALIGN_LEFT);
@@ -249,7 +246,6 @@ long ODesignView::PreNotify( NotifyEvent& rNEvt )
     switch(rNEvt.GetType())
     {
         case EVENT_KEYINPUT:
-            //if ( nRet != 1L )
             {
                 const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent();
                 if ( handleKeyEvent(*pKeyEvent) )
@@ -291,7 +287,7 @@ void ODesignView::resizeDocumentView(Rectangle& _rPlayground)
                 nSplitPos = static_cast<sal_Int32>(_rPlayground.Right() - nMinWidth);
                 getController().setSplitPos(nSplitPos);
             }
-        } // if ( 0 != _rPlaygroundSize.Width() )
+        }
 
         Size aReportWindowSize(aPlaygroundSize);
         if ( m_aSplitWin.IsItemValid(TASKPANE_ID) )
@@ -470,11 +466,7 @@ void ODesignView::GetFocus()
 // -----------------------------------------------------------------------------
 void ODesignView::ImplInitSettings()
 {
-//#if OSL_DEBUG_LEVEL > 0
-//    SetBackground( Wallpaper( COL_RED ));
-//#else
     SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor() ));
-//#endif
     SetFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() );
     SetTextFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() );
 }
@@ -530,12 +522,10 @@ void ODesignView::togglePropertyBrowser(sal_Bool _bToogleOn)
         m_pTaskPane->Invalidate();
 
         if ( bWillBeVisible )
-            m_aSplitWin.InsertItem( TASKPANE_ID, m_pTaskPane,START_SIZE_TASKPANE, SPLITWINDOW_APPEND, COLSET_ID, SWIB_PERCENTSIZE/*|SWIB_COLSET */);
+            m_aSplitWin.InsertItem( TASKPANE_ID, m_pTaskPane,START_SIZE_TASKPANE, SPLITWINDOW_APPEND, COLSET_ID, SWIB_PERCENTSIZE);
         else
             m_aSplitWin.RemoveItem(TASKPANE_ID);
 
-        // TRY
-        // Invalidate(/*INVALIDATE_NOCHILDREN|INVALIDATE_NOERASE*/);
         if ( bWillBeVisible )
             m_aMarkTimer.Start();
     }
@@ -619,12 +609,6 @@ uno::Reference< report::XSection > ODesignView::getCurrentSection() const
     if ( m_pCurrentView )
         xSection = m_pCurrentView->getReportSection()->getSection();
 
-    // why do we need the code below?
-    //else
- //   {
- //       OReportController& rReportController = getController();
- //       xSection = rReportController.getReportDefinition()->getDetail();
- //   }
     return xSection;
 }
 // -----------------------------------------------------------------------------
diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx
index 67c6829b75ec..d493d06c1ead 100644
--- a/reportdesign/source/ui/report/FixedTextColor.cxx
+++ b/reportdesign/source/ui/report/FixedTextColor.cxx
@@ -69,69 +69,6 @@ namespace rptui
     }
 
     //--------------------------------------------------------------------
-    // sal_Int32 FixedTextColor::getTextColor()
-    // {
-    //     const StyleSettings& aStyleSettings = Application::GetSettings().GetStyleSettings();
-    //     BOOL bHighContrast = aStyleSettings.GetHighContrastMode();
-    //
-    //     Color aGetFaceColor = aStyleSettings.GetFaceColor();
-    //     Color aGetCheckedColor = aStyleSettings.GetCheckedColor();
-    //     Color aGetLightColor = aStyleSettings.GetLightColor();
-    //     Color aGetLightBorderColor = aStyleSettings.GetLightBorderColor();
-    //     Color aGetShadowColor = aStyleSettings.GetShadowColor();
-    //     Color aGetDarkShadowColor = aStyleSettings.GetDarkShadowColor();
-    //     Color aGetButtonTextColor = aStyleSettings.GetButtonTextColor();
-    //     Color aGetButtonRolloverTextColor = aStyleSettings.GetButtonRolloverTextColor();
-    //     Color aGetRadioCheckTextColor = aStyleSettings.GetRadioCheckTextColor();
-    //     Color aGetGroupTextColor = aStyleSettings.GetGroupTextColor();
-    //     Color aGetLabelTextColor = aStyleSettings.GetLabelTextColor();
-    //     Color aGetInfoTextColor = aStyleSettings.GetInfoTextColor();
-    //     Color aGetWindowColor = aStyleSettings.GetWindowColor();
-    //     Color aGetWindowTextColor = aStyleSettings.GetWindowTextColor();
-    //     Color aGetDialogColor = aStyleSettings.GetDialogColor();
-    //     Color aGetDialogTextColor = aStyleSettings.GetDialogTextColor();
-    //     Color aGetWorkspaceColor = aStyleSettings.GetWorkspaceColor();
-    //     Color aGetFieldColor = aStyleSettings.GetFieldColor();
-    //     Color aGetFieldTextColor = aStyleSettings.GetFieldTextColor();
-    //     Color aGetFieldRolloverTextColor = aStyleSettings.GetFieldRolloverTextColor();
-    //     Color aGetActiveColor = aStyleSettings.GetActiveColor();
-    //     Color aGetActiveColor2 = aStyleSettings.GetActiveColor2();
-    //     Color aGetActiveTextColor = aStyleSettings.GetActiveTextColor();
-    //     Color aGetActiveBorderColor = aStyleSettings.GetActiveBorderColor();
-    //     Color aGetDeactiveColor = aStyleSettings.GetDeactiveColor();
-    //     Color aGetDeactiveColor2 = aStyleSettings.GetDeactiveColor2();
-    //     Color aGetDeactiveTextColor = aStyleSettings.GetDeactiveTextColor();
-    //     Color aGetDeactiveBorderColor = aStyleSettings.GetDeactiveBorderColor();
-    //     Color aGetHighlightColor = aStyleSettings.GetHighlightColor();
-    //     Color aGetHighlightTextColor = aStyleSettings.GetHighlightTextColor();
-    //     Color aGetDisableColor = aStyleSettings.GetDisableColor();
-    //     Color aGetHelpColor = aStyleSettings.GetHelpColor();
-    //     Color aGetHelpTextColor = aStyleSettings.GetHelpTextColor();
-    //     Color aGetMenuColor = aStyleSettings.GetMenuColor();
-    //     Color aGetMenuBarColor = aStyleSettings.GetMenuBarColor();
-    //     Color aGetMenuBorderColor = aStyleSettings.GetMenuBorderColor();
-    //     Color aGetMenuTextColor = aStyleSettings.GetMenuTextColor();
-    //     Color aGetMenuHighlightColor = aStyleSettings.GetMenuHighlightColor();
-    //     Color aGetMenuHighlightTextColor = aStyleSettings.GetMenuHighlightTextColor();
-    //     Color aGetLinkColor = aStyleSettings.GetLinkColor();
-    //     Color aGetVisitedLinkColor = aStyleSettings.GetVisitedLinkColor();
-    //     Color aGetHighlightLinkColor = aStyleSettings.GetHighlightLinkColor();
-    //     Color aGetMonoColor = aStyleSettings.GetMonoColor();
-    //     Color aGetActiveTabColor = aStyleSettings.GetActiveTabColor();
-    //     Color aGetInactiveTabColor = aStyleSettings.GetInactiveTabColor();
-    //
-    //     Color aWindowColor = aStyleSettings.GetWindowColor();
-    //     Color aLabelColor  = aStyleSettings.GetLabelTextColor();
-    //
-    //     // if (m_nTextColor == -1)
-    //     // {
-    //     //    svtools::ExtendedColorConfig aConfig;
-    //     //    m_nTextColor = aConfig.GetColorValue(CFG_REPORTDESIGNER, DBTEXTBOXBOUNDCONTENT).getColor();
-    //     // }
-    //     return aLabelColor.GetColor();
-    // }
-
-    //--------------------------------------------------------------------
     FixedTextColor::~FixedTextColor()
     {
         DBG_DTOR(rpt_FixedTextColor,NULL);
@@ -140,7 +77,6 @@ namespace rptui
 
     void FixedTextColor::notifyPropertyChange( const beans::PropertyChangeEvent& _rEvent )
     {
-        // (void)_rEvent;
         uno::Reference< report::XFixedText > xFixedText( _rEvent.Source, uno::UNO_QUERY );
         if ( ! xFixedText.is() )
         {
@@ -151,11 +87,8 @@ namespace rptui
         {
             uno::Reference< lang::XComponent > xComponent( xFixedText, uno::UNO_QUERY_THROW );
             handle(xComponent);
-            // uno::Reference<awt::XVclWindowPeer> xVclWindowPeer = getVclWindowPeer(xComponent);
-
-            //     setPropertyTextColor(xVclWindowPeer, getTextColor());
         }
-        catch (uno::Exception e)
+        catch (uno::Exception const&)
         {
             DBG_UNHANDLED_EXCEPTION();
         }
@@ -176,7 +109,6 @@ namespace rptui
 // -----------------------------------------------------------------------------
     void FixedTextColor::handle( const uno::Reference< uno::XInterface >& _rxElement )
     {
-        // (void) _rxElement;
         uno::Reference< report::XFixedText > xFixedText( _rxElement, uno::UNO_QUERY );
         if ( ! xFixedText.is() )
         {
diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
index 4cb76497d7f8..6abe034897b6 100644
--- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
+++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
@@ -187,7 +187,6 @@ namespace rptui
                 OUnoObject* pUnoObj = dynamic_cast<OUnoObject*>(pObject);
                 if ( pUnoObj ) // this doesn't need to be done for shapes
                 {
-                    // Rectangle aRect = pUnoObj->GetCurrentBoundRect();
                     ::boost::shared_ptr<OSectionWindow> pSectionWindow = m_rReportController.getSectionWindow(xSection);
                     if (pSectionWindow != NULL)
                     {
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 2f7fc8997d16..059e021a9498 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -194,11 +194,11 @@ namespace
     {
         bool operator() (const beans::PropertyValue& x, const ::rtl::OUString& y) const
         {
-            return x.Name.equals(y);// ? true : false;
+            return x.Name.equals(y);
         }
         bool operator() (const ::rtl::OUString& x,const beans::PropertyValue& y) const
         {
-            return x.equals(y.Name);// ? true : false;
+            return x.equals(y.Name);
         }
     };
 
@@ -230,7 +230,7 @@ namespace
             catch(beans::UnknownPropertyException&)
             {
             }
-        } // if ( xReportControlFormat.is() )
+        }
     }
 }
 
@@ -246,12 +246,11 @@ void lcl_getReportControlFormat(const Sequence< PropertyValue >& aArgs,
         SequenceAsHashMap aMap(aArgs);
         xReportControlFormat = aMap.getUnpackedValueOrDefault(REPORTCONTROLFORMAT,uno::Reference< report::XReportControlFormat>());
         _xWindow = aMap.getUnpackedValueOrDefault(CURRENT_WINDOW,uno::Reference< awt::XWindow>());
-    } // if ( aArgs.getLength() )
+    }
     if ( !xReportControlFormat.is() )
     {
         _pView->fillControlModelSelection(_rControlsFormats);
-        //xReportControlFormat.set( _pView->getCurrentControlModel(),uno::UNO_QUERY);
-    } // if ( !xReportControlFormat.is() )
+    }
     else
         _rControlsFormats.push_back(xReportControlFormat);
 
@@ -340,7 +339,7 @@ void OReportController::disposing()
         m_pClipbordNotifier->AddRemoveListener( getView(), sal_False );
         m_pClipbordNotifier->release();
         m_pClipbordNotifier = NULL;
-    } // if ( getView() && m_pClipbordNotifier )
+    }
     if ( m_pGroupsFloater )
     {
         SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( RID_GROUPS_SORTING ) );
@@ -392,7 +391,6 @@ void OReportController::disposing()
     OReportController_BASE::disposing();
 
 
-    // disconnect();
     try
     {
         m_xReportDefinition.clear();
@@ -466,7 +464,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
         case SID_OBJECT_SMALLESTHEIGHT:
         case SID_OBJECT_GREATESTWIDTH:
         case SID_OBJECT_GREATESTHEIGHT:
-            aReturn.bEnabled = isEditable() && getDesignView()->HasSelection();// && getDesignView()->isAlignPossible();
+            aReturn.bEnabled = isEditable() && getDesignView()->HasSelection();
             if ( aReturn.bEnabled )
                 aReturn.bEnabled = m_nSelectionCount > 1;
             break;
@@ -528,7 +526,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
         case SID_SECTION_ALIGN_UP:
         case SID_SECTION_ALIGN_MIDDLE:
         case SID_SECTION_ALIGN_DOWN:
-            aReturn.bEnabled = isEditable() && getDesignView()->HasSelection();// && getDesignView()->isAlignPossible();
+            aReturn.bEnabled = isEditable() && getDesignView()->HasSelection();
             break;
         case SID_CUT:
             aReturn.bEnabled = isEditable() && getDesignView()->HasSelection() && !getDesignView()->isHandleEvent(_nId);
@@ -843,7 +841,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
                         break;
                     default:
                         ;
-                    } // switch(_nCommand)
+                    }
             }
             break;
         case SID_ATTR_CHAR_COLOR:
@@ -888,7 +886,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
                             aReturn.bChecked = _nId == SID_ATTR_PARA_ADJUST_CENTER;
                             break;
                     }
-                } // if ( aReturn.aValue >>= nParaAdjust )
+                }
                 aReturn.aValue.clear();
             }
             break;
@@ -898,7 +896,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
             break;
         case SID_CHAR_DLG:
         case SID_SETCONTROLDEFAULTS:
-            aReturn.bEnabled = m_xReportDefinition.is() && isEditable();// && getDesignView()->getCurrentControlModel().is();
+            aReturn.bEnabled = m_xReportDefinition.is() && isEditable();
             if ( aReturn.bEnabled )
             {
                 ::std::vector< uno::Reference< uno::XInterface > > aSelection;
@@ -935,7 +933,6 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
                 SvxZoomItem aZoom(m_eZoomType,m_nZoomValue);
                 aZoom.SetValueSet(SVX_ZOOM_ENABLE_50|SVX_ZOOM_ENABLE_75|SVX_ZOOM_ENABLE_100|SVX_ZOOM_ENABLE_200);
                 aZoom.QueryValue(aReturn.aValue);
-                //aReturn.sTitle = ::rtl::OUString::valueOf((sal_Int32)m_nZoomValue);
             }
             break;
         case SID_ATTR_ZOOMSLIDER:
@@ -947,7 +944,6 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
                 aZoomSlider.AddSnappingPoint(100);
                 aZoomSlider.AddSnappingPoint(200);
                 aZoomSlider.QueryValue(aReturn.aValue);
-                //aReturn.sTitle = ::rtl::OUString::valueOf((sal_Int32)m_nZoomValue);
             }
             break;
         default:
@@ -1055,7 +1051,6 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
         case SID_REDO:
         case SID_UNDO:
         {
-            // const OXUndoEnvironment::OUndoEnvLock aLock( m_aReportModel->GetUndoEnv() );
             // We would like to know if we are in undo mode
             const OXUndoEnvironment::OUndoMode aLock( m_aReportModel->GetUndoEnv() );
             OReportController_BASE::Execute( _nId, aArgs );
@@ -1169,7 +1164,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
             select(uno::makeAny(m_xReportDefinition));
             break;
         case SID_EXECUTE_REPORT:
-            /*m_nExecuteReportEvent = */getView()->PostUserEvent(LINK(this, OReportController,OnExecuteReport));
+            getView()->PostUserEvent(LINK(this, OReportController,OnExecuteReport));
             break;
         case SID_RPT_NEW_FUNCTION:
             createNewFunction(aArgs[0].Value);
@@ -1223,14 +1218,6 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
             InvalidateAll();
             break;
         case SID_INSERT_DIAGRAM:
-            /*{
-                OSectionView* pView = getCurrentSectionView();
-                if ( pView )
-                {
-                    Reference< awt::XWindow> xWindow = VCLUnoHelper::GetInterface(getView()->Window::GetParent());
-                    InsertChart(m_xContext,m_xReportDefinition.get(),xWindow,pView,getSdrModel().get());
-                }
-            }*/
             getDesignView()->SetMode( RPTUI_INSERT );
             getDesignView()->SetInsertObj( OBJ_OLE2);
             createDefaultControl(aArgs);
@@ -1409,7 +1396,6 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
                         case SID_DRAWTBX_CS_STAR:
                             sType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("star5"));
                             break;
-                        case SID_DRAWTBX_CS_BASIC:
                         default:
                             sType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("diamond"));
                     }
@@ -1495,7 +1481,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
                     {
                         const String sUndoAction(ModuleRes(RID_STR_UNDO_CHANGEFONT));
                         pListAction.reset(new UndoManagerListAction(m_aUndoManager,sUndoAction));
-                    } // if ( !pListAction.get() )
+                    }
                     uno::Reference< report::XReportControlFormat> xReportControlFormat(*aIter,uno::UNO_QUERY);
                     lcl_setFontWPU_nothrow(xReportControlFormat,_nId);
                 }
@@ -1517,7 +1503,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
                 if ( aArgs[0].Value >>= aFont )
                 {
                     impl_setPropertyAtControls_throw(RID_STR_UNDO_CHANGEFONT,PROPERTY_CHARFONTNAME,uno::makeAny(aFont.Name),aArgs);
-                } // if ( aArgs[0].Value >>= aFont )
+                }
             }
             break;
         case SID_ATTR_CHAR_FONTHEIGHT:
@@ -1548,7 +1534,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
                     case SID_ATTR_PARA_ADJUST_BLOCK:
                         eParagraphAdjust = style::ParagraphAdjust_BLOCK;
                         break;
-                } // switch(_nId)
+                }
                 impl_setPropertyAtControls_throw(RID_STR_UNDO_ALIGNMENT,PROPERTY_PARAADJUST,uno::makeAny(eParagraphAdjust),aArgs);
 
                 InvalidateFeature(SID_ATTR_PARA_ADJUST_LEFT);
@@ -1575,16 +1561,14 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
                             const String sUndoAction(ModuleRes(RID_STR_UNDO_CHANGEFONT));
                             pListAction.reset(new UndoManagerListAction(m_aUndoManager,sUndoAction));
                             rptui::openCharDialog(xFormat,xWindow,aSettings);
-                        } // if ( !pListAction.get() )
+                        }
                         applyCharacterSettings( xFormat, aSettings );
                     }
-                } // for(; aIter != aControlsFormats.end();++aIter)
+                }
                 if ( !aControlsFormats.empty() )
                     InvalidateAll();
             }
             break;
-        //case SID_FM_DESIGN_MODE:
-  //          break;
         case SID_INSERT_GRAPHIC:
             insertGraphic();
             break;
@@ -1610,7 +1594,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
                 }
                 else
                     createDateTime(aArgs);
-            } // if ( m_xReportDefinition.is() )
+            }
             break;
         case SID_INSERT_FLD_PGNUMBER:
             if ( m_xReportDefinition.is() )
@@ -1622,7 +1606,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
                 }
                 else
                     createPageNumber(aArgs);
-            } // if ( m_xReportDefinition.is() )
+            }
             break;
         case SID_EXPORTDOC:
         case SID_EXPORTDOCASPDF:
@@ -1648,7 +1632,6 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
                 }
             }
             setEditable(!isEditable());
-            //getJoinView()->setReadOnly(!isEditable());
             InvalidateAll();
             return;
         case SID_GROUP:
@@ -1665,7 +1648,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
                 m_nZoomValue = aZoomItem.GetValue();
                 m_eZoomType = aZoomItem.GetType();
                 impl_zoom_nothrow();
-            } // if ( aArgs.getLength() == 1 && aArgs[0].Name.equalsAscii("Zoom") )
+            }
             break;
         case SID_ATTR_ZOOMSLIDER:
             if ( aArgs.getLength() == 1 && aArgs[0].Name.equalsAscii("ZoomSlider") )
@@ -1702,7 +1685,6 @@ void OReportController::impl_initialize( )
     {
         if ( m_xReportDefinition.is() )
         {
-            //m_sName = m_xReportDefinition->getName();
             getView()->initialize();    // show the windows and fill with our informations
             getUndoMgr()->Clear();      // clear all undo redo things
             getSdrModel();
@@ -1710,7 +1692,7 @@ void OReportController::impl_initialize( )
                 throw Exception();
 
             ::comphelper::NamedValueCollection aArgs(getModel()->getArgs());
-            setMode(aArgs.getOrDefault("Mode", rtl::OUString::createFromAscii("normal")));
+            setMode(aArgs.getOrDefault("Mode", ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("normal"))));
 
             listen(true);
             setEditable( !m_aReportModel->IsReadOnly() );
@@ -1732,11 +1714,11 @@ void OReportController::impl_initialize( )
                     m_xReportDefinition->setCommand(aNames[0]);
                     m_xReportDefinition->setCommandType(sdb::CommandType::TABLE);
                 }
-            } // if ( !sHierarchicalDocumentName.getLength() && getConnection().is() )
+            }
 
             m_aVisualAreaSize = m_xReportDefinition->getVisualAreaSize(0);
 
-        } // if ( m_xReportDefinition.is() )
+        }
 
         // check if chart is supported by the engine
         checkChartEnabled();
@@ -1774,7 +1756,7 @@ void OReportController::impl_initialize( )
             getDesignView()->setCurrentPage(m_sLastActivePage);
             uno::Sequence< beans::PropertyValue> aArgs;
             executeUnChecked(SID_SELECT_REPORT,aArgs);
-        } // if ( m_bShowProperties && m_nPageNum == -1 )
+        }
 
         setModified(sal_False);     // and we are not modified yet
 
@@ -1790,7 +1772,6 @@ void OReportController::impl_initialize( )
 // -----------------------------------------------------------------------------
 IMPL_LINK( OReportController, OnOpenHelpAgent, void* ,/*_pMemfun*/)
 {
-    //m_nExecuteReportEvent = 0;
     doOpenHelpAgent();
     return 0L;
 }
@@ -1812,10 +1793,8 @@ void OReportController::doOpenHelpAgent()
 {
     if (getFrame().is())
     {
-        rtl::OUString suURL = rtl::OUString::createFromAscii("vnd.sun.star.help://shared/text/shared/explorer/database/rep_main.xhp?UseDB=no&DbPAR=swriter");
+        rtl::OUString suURL(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.help://shared/text/shared/explorer/database/rep_main.xhp?UseDB=no&DbPAR=swriter"));
         openHelpAgent(suURL);
-        // openHelpAgent(68245 /* HID_REPORT_DESIGN... UNKNOWN */ );
-        // HID_APP_REPORT_TREE
     }
     else
     {
@@ -1838,7 +1817,6 @@ sal_Bool OReportController::Construct(Window* pParent)
     m_pClipbordNotifier->AddRemoveListener( getView(), sal_True );
 
     OReportController_BASE::Construct(pParent);
-    //getView()->Show();
     return sal_True;
 }
 // -----------------------------------------------------------------------------
@@ -1866,7 +1844,6 @@ void OReportController::describeSupportedFeatures()
 
     implDescribeSupportedFeature( ".uno:Redo",                      SID_REDO,                       CommandGroup::EDIT );
     implDescribeSupportedFeature( ".uno:Undo",                      SID_UNDO,                       CommandGroup::EDIT );
-    //implDescribeSupportedFeature( ".uno:PasteSpecial",              SID_PASTE,                    CommandGroup::EDIT );
     implDescribeSupportedFeature( ".uno:SelectAll",                 SID_SELECTALL,                  CommandGroup::EDIT );
     implDescribeSupportedFeature( ".uno:SelectAllInSection",        SID_SELECTALL_IN_SECTION,       CommandGroup::EDIT );
     implDescribeSupportedFeature( ".uno:Delete",                    SID_DELETE,                     CommandGroup::EDIT );
@@ -1880,13 +1857,11 @@ void OReportController::describeSupportedFeatures()
     implDescribeSupportedFeature( ".uno:AddField",                  SID_FM_ADD_FIELD,               CommandGroup::VIEW );
     implDescribeSupportedFeature( ".uno:ReportNavigator",           SID_RPT_SHOWREPORTEXPLORER,     CommandGroup::VIEW );
     implDescribeSupportedFeature( ".uno:ControlProperties",         SID_SHOW_PROPERTYBROWSER,       CommandGroup::VIEW );
-    //implDescribeSupportedFeature( ".uno:SwitchControlDesignMode", SID_FM_DESIGN_MODE,             CommandGroup::VIEW );
     implDescribeSupportedFeature( ".uno:DbSortingAndGrouping",      SID_SORTINGANDGROUPING,         CommandGroup::VIEW );
     implDescribeSupportedFeature( ".uno:PageHeaderFooter",          SID_PAGEHEADERFOOTER,           CommandGroup::VIEW );
     implDescribeSupportedFeature( ".uno:ReportHeaderFooter",        SID_REPORTHEADERFOOTER,         CommandGroup::VIEW );
     implDescribeSupportedFeature( ".uno:ZoomSlider",                SID_ATTR_ZOOMSLIDER,            CommandGroup::VIEW );
     implDescribeSupportedFeature( ".uno:Zoom",                      SID_ATTR_ZOOM,                  CommandGroup::VIEW );
-    //implDescribeSupportedFeature( ".uno:SwitchControlDesignMode", SID_FM_DESIGN_MODE,             CommandGroup::VIEW );
 
     implDescribeSupportedFeature( ".uno:ConditionalFormatting",     SID_CONDITIONALFORMATTING,      CommandGroup::FORMAT );
     implDescribeSupportedFeature( ".uno:PageDialog",                SID_PAGEDIALOG,                 CommandGroup::FORMAT );
@@ -2168,7 +2143,7 @@ void OReportController::onLoadedMenu(const Reference< frame::XLayoutManager >& _
             _xLayoutManager->createElement( s_sMenu[i] );
             _xLayoutManager->requestElement( s_sMenu[i] );
         }
-    } // if ( _xLayoutManager.is() )
+    }
 }
 // -----------------------------------------------------------------------------
 void OReportController::notifyGroupSections(const ContainerEvent& _rEvent,bool _bShow)
@@ -2314,7 +2289,7 @@ void SAL_CALL OReportController::propertyChange( const beans::PropertyChangeEven
             /// TODO: check what we need to notify here TitleHelper
             /*else if (   evt.PropertyName.equals( PROPERTY_CAPTION ) )
                 updateTitle();*/
-        } // if ( evt.Source == m_xReportDefinition )
+        }
         else
         {
             uno::Reference< report::XGroup> xGroup(evt.Source,uno::UNO_QUERY);
@@ -2359,7 +2334,6 @@ USHORT lcl_getNonVisbleGroupsBefore( const uno::Reference< report::XGroups>& _xG
 // -----------------------------------------------------------------------------
 void OReportController::groupChange( const uno::Reference< report::XGroup>& _xGroup,const ::rtl::OUString& _sPropName,sal_Int32 _nGroupPos,bool _bShow)
 {
-    //adjustSectionName(_xGroup,_nGroupPos);
     ::std::mem_fun_t<sal_Bool,OGroupHelper> pMemFun = ::std::mem_fun(&OGroupHelper::getHeaderOn);
     ::std::mem_fun_t<uno::Reference<report::XSection> , OGroupHelper> pMemFunSection = ::std::mem_fun(&OGroupHelper::getHeader);
     ::rtl::OUString sColor(DBGROUPHEADER);
@@ -2651,7 +2625,6 @@ void OReportController::shrinkSectionBottom(uno::Reference<report::XSection> _xS
         return;
     }
     const sal_Int32 nSectionHeight = _xSection->getHeight();
-    // sal_Int32 nMinPositionY = nSectionHeight;
     sal_Int32 nMaxPositionY = 0;
     uno::Reference< report::XReportComponent> xReportComponent;
 
@@ -2662,7 +2635,6 @@ void OReportController::shrinkSectionBottom(uno::Reference<report::XSection> _xS
         const sal_Int32 nReportComponentPositionY = xReportComponent->getPositionY();
         const sal_Int32 nReportComponentHeight = xReportComponent->getHeight();
         const sal_Int32 nReportComponentPositionYAndHeight = nReportComponentPositionY + nReportComponentHeight;
-        // nMinPositionY = std::min(nReportComponentPositionY, nMinPositionY);
         nMaxPositionY = std::max(nReportComponentPositionYAndHeight, nMaxPositionY);
     }
     // now we know the minimal Y-Position and maximal Y-Position
@@ -2686,7 +2658,6 @@ void OReportController::shrinkSectionTop(uno::Reference<report::XSection> _xSect
 
     const sal_Int32 nSectionHeight = _xSection->getHeight();
     sal_Int32 nMinPositionY = nSectionHeight;
-    // sal_Int32 nMaxPositionY = 0;
     uno::Reference< report::XReportComponent> xReportComponent;
 
     // for every component get it's Y-position and compare it to the current Y-position
@@ -2694,10 +2665,7 @@ void OReportController::shrinkSectionTop(uno::Reference<report::XSection> _xSect
     {
         xReportComponent.set(_xSection->getByIndex(i), uno::UNO_QUERY);
         const sal_Int32 nReportComponentPositionY = xReportComponent->getPositionY();
-        // const sal_Int32 nReportComponentHeight = xReportComponent->getHeight();
-        // const sal_Int32 nReportComponentPositionYAndHeight = nReportComponentPositionY + nReportComponentHeight;
         nMinPositionY = std::min(nReportComponentPositionY, nMinPositionY);
-        // nMaxPositionY = std::max(nReportComponentPositionYAndHeight, nMaxPositionY);
     }
     // now we know the minimal Y-Position and maximal Y-Position
     if (nMinPositionY == 0)
@@ -2770,7 +2738,7 @@ uno::Any SAL_CALL OReportController::getViewData(void) throw( uno::RuntimeExcept
         else if ( aFeatureState.aValue.hasValue() )
             pIter->Value = aFeatureState.aValue;
 
-    } // for (; pIter != pEnd; ++pIter)
+    }
 
     uno::Sequence<beans::PropertyValue> aProps(1);
     aProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CommandProperties"));
@@ -2804,8 +2772,8 @@ uno::Any SAL_CALL OReportController::getViewData(void) throw( uno::RuntimeExcept
             aProps.realloc( nCount + 1 );
             aProps[nCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MarkedSection"));
             aProps[nCount].Value <<= (sal_Int32)pSectionWindow->getReportSection().getPage()->GetPageNum();
-        } // if ( pSectionWindow.get() )
-    } // if ( getDesignView() )
+        }
+    }
     const sal_Int32 nCount = aProps.getLength();
     aProps.realloc( nCount + 1 );
     aProps[nCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZoomFactor"));
@@ -2979,7 +2947,7 @@ uno::Reference<frame::XModel> OReportController::executeReport()
             {
                 const String suSQLContext = String( ModuleRes( RID_STR_COULD_NOT_CREATE_REPORT ) );
                 aInfo.prepend(suSQLContext);
-            } // if (aInfo.isValid())
+            }
             m_bInGeneratePreview = false;
         }
 
@@ -3152,7 +3120,6 @@ void OReportController::createNewFunction(const uno::Any& _aValue)
 // -----------------------------------------------------------------------------
 IMPL_LINK( OReportController, OnExecuteReport, void* ,/*_pMemfun*/)
 {
-    //m_nExecuteReportEvent = 0;
     executeReport();
     return 0L;
 }
@@ -3185,7 +3152,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co
             sCustomShapeType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("diamond"));
         pSectionWindow->getReportSection().createDefault(sCustomShapeType,pNewControl);
         pNewControl->SetLogicRect(Rectangle(3000,500,6000,3500)); // switch height and width
-    } // if ( _nObjectId == OBJ_CUSTOMSHAPE )
+    }
     else if ( _nObjectId == OBJ_OLE2 || OBJ_DLG_SUBREPORT == _nObjectId  )
     {
         pNewControl = SdrObjFactory::MakeNewObject( ReportInventor, _nObjectId, pSectionWindow->getReportSection().getPage(),m_aReportModel.get() );
@@ -3229,7 +3196,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co
         {
             if ( xInfo->hasPropertyByName(sProps[i]) && xShapeInfo->hasPropertyByName(sProps[i]) )
                 xUnoProp->setPropertyValue(sProps[i],xShapeProp->getPropertyValue(sProps[i]));
-        } // for(size_t i = 0; i < SAL_N_ELEMENTS(sProps);++i)
+        }
 
         if ( xInfo->hasPropertyByName(PROPERTY_BORDER) && xShapeInfo->hasPropertyByName(PROPERTY_CONTROLBORDER) )
             xUnoProp->setPropertyValue(PROPERTY_BORDER,xShapeProp->getPropertyValue(PROPERTY_CONTROLBORDER));
@@ -3311,7 +3278,7 @@ void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs
     {
         uno::Sequence< beans::PropertyValue > aArgs;
         executeChecked(SID_PAGEHEADERFOOTER,aArgs);
-    } // if ( !m_xHoldAlive->getPageHeaderOn() )
+    }
 
     SequenceAsHashMap aMap(_aArgs);
     sal_Bool bStateOfPage = aMap.getUnpackedValueOrDefault(PROPERTY_STATE,sal_False);
@@ -3380,7 +3347,6 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
             // LLA: new feature, add the Label in dependency of the given DND_ACTION one section up, normal or one section down
             sal_Int8 nDNDAction = aMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DNDAction")), sal_Int8(0));
             pSectionWindow[1] = pSectionWindow[0];
-            // ::boost::shared_ptr<OReportSection> pReportSectionPost;
             sal_Bool bLabelAboveTextField = nDNDAction == DND_ACTION_COPY;
             if ( bLabelAboveTextField || nDNDAction == DND_ACTION_LINK )
             {
@@ -3414,7 +3380,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
                     {
                         xReportDefinition->setCommand(sCommand);
                         xReportDefinition->setCommandType(nCommandType);
-                    } // if ( !xReportDefinition->getCommand().getLength() )
+                    }
 
                     xColumns = dbtools::getFieldsByCommandDescriptor(xConnection,nCommandType,sCommand,xHoldAlive);
                     if ( xColumns.is() && xColumns->hasByName(sColumnName) )
@@ -3490,7 +3456,6 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
             SdrUnoObj* pControl[2];
             pControl[0] = NULL;
             pControl[1] = NULL;
-            //getDesignView()->GetModel()->GetUndoEnv().Lock();
             const sal_Int32 nRightMargin = getStyleProperty<sal_Int32>(m_xReportDefinition,PROPERTY_RIGHTMARGIN);
             const sal_Int32 nPaperWidth = getStyleProperty<awt::Size>(m_xReportDefinition,PROPERTY_PAPERSIZE).Width - nRightMargin;
             OSectionView* pSectionViews[2];
@@ -3502,7 +3467,6 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
                 ,xField,xNumberFormats,nOBJID,::rtl::OUString(),ReportInventor,OBJ_DLG_FIXEDTEXT,
                 pSectionWindow[1]->getReportSection().getPage(),pSectionWindow[0]->getReportSection().getPage(),m_aReportModel.get(),
                 pControl[0],pControl[1]);
-            //getDesignView()->GetModel()->GetUndoEnv().UnLock();
             if ( pControl[0] && pControl[1] )
             {
                 SdrPageView* pPgViews[2];
@@ -3542,15 +3506,12 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
 
                             ReportFormula aFormula( ReportFormula::Field, sName );
                             xUnoProp->setPropertyValue( PROPERTY_DATAFIELD, uno::makeAny( aFormula.getCompleteFormula() ) );
-                        } // if ( xInfo->hasPropertyByName(PROPERTY_DATAFIELD) )
+                        }
 
                         if ( xInfo->hasPropertyByName(PROPERTY_BORDER) && xShapeInfo->hasPropertyByName(PROPERTY_CONTROLBORDER) )
                             xUnoProp->setPropertyValue(PROPERTY_BORDER,xShapeProp->getPropertyValue(PROPERTY_CONTROLBORDER));
 
                         pObjs[i]->CreateMediator(sal_True);
-                        // need SectionView from the above or follow Section
-                        // (getMarkedSection) returns the current Section
-                        //pSectionViews[i]->InsertObjectAtView(pControl[i],*pPgViews[i],SDRINSERT_ADDMARK);
 
                         const sal_Int32 nShapeWidth = xShapeProp->getWidth();
                         const bool bChangedPos = (aPos.X + nShapeWidth) > nPaperWidth;
@@ -3568,8 +3529,6 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
                     if (pSectionViews[0] != pSectionViews[1] &&
                         nOBJID == OBJ_DLG_FORMATTEDFIELD) // we want this nice feature only at FORMATTEDFIELD
                     {
-                        // we have two different Views, so set the position x new.
-                        // pSectionViews[1].position.x = pSectionViews[0].position.x
                         uno::Reference< report::XReportComponent> xShapePropLabel(pObjs[0]->getUnoShape(),uno::UNO_QUERY_THROW);
                         uno::Reference< report::XReportComponent> xShapePropTextField(pObjs[1]->getUnoShape(),uno::UNO_QUERY_THROW);
                         if ( sLabel.getLength() )
@@ -3639,11 +3598,6 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
                                 xTextfield->setPositionY(aTextfield.Top());
                         }
                     }
-                        // this should never happen.
-                        // else
-                        // {
-                        //  DBG_ERROR("unhandled case.");
-                        // }
                     }
                 }
             }
@@ -3735,11 +3689,6 @@ void OReportController::listen(const bool _bAdd)
 
     // Add Listeners to ReportControllerObserver
     OXReportControllerObserver& rObserver = *m_pReportControllerObserver;
-    // void (OXReportControllerObserver::*pObserverFunction)( const uno::Reference< uno::XInterface >& ) =
-    //     _bAdd ? &OXReportControllerObserver::AddElement : &OXReportControllerObserver::RemoveElement;
-
-    // (rObserver.*pObserverFunction)( m_xReportDefinition->getStyleFamilies() );
-    // (rObserver.*pObserverFunction)( m_xReportDefinition->getFunctions() );
 
     if ( m_xReportDefinition->getPageHeaderOn() && _bAdd )
     {
@@ -3770,7 +3719,7 @@ void OReportController::listen(const bool _bAdd)
             getDesignView()->addSection(xGroup->getHeader(),DBGROUPHEADER);
             rObserver.AddSection(xGroup->getHeader());
         }
-    } // for (sal_Int32 i=0;i<nCount ; ++i)
+    }
 
     if ( _bAdd )
     {
@@ -3885,7 +3834,7 @@ void OReportController::switchPageSection(const sal_Int16 _nId)
                                                             ,bSwitchOn ? Inserted : Removed
                                                             ,0
                                                             ));
-        } // if ( SID_PAGEHEADERFOOTER == _nId )
+        }
         switch( _nId )
         {
             case SID_PAGEHEADER_WITHOUT_UNDO:
@@ -4164,11 +4113,11 @@ void OReportController::impl_fillState_nothrow(const ::rtl::OUString& _sProperty
                 {
                     _rState.bEnabled = sal_False;
                 }
-            } // for(; aIter != aSelection.end();++aIter)
+            }
             if ( aIter == aSelection.end() )
                 _rState.aValue = aTemp;
         }
-    } // if ( _rState.bEnabled )
+    }
 }
 // -----------------------------------------------------------------------------
 void OReportController::impl_zoom_nothrow()
@@ -4176,8 +4125,6 @@ void OReportController::impl_zoom_nothrow()
     Fraction aZoom(m_nZoomValue,100);
     setZoomFactor( aZoom,*getDesignView() );
     getDesignView()->zoom(aZoom);
-    // TRY
-    /*getDesignView()->Invalidate(INVALIDATE_NOCHILDREN);*/
     InvalidateFeature(SID_ATTR_ZOOM,Reference< XStatusListener >(),sal_True);
     InvalidateFeature(SID_ATTR_ZOOMSLIDER,Reference< XStatusListener >(),sal_True);
 }
@@ -4204,7 +4151,7 @@ sal_Bool OReportController::isFormatCommandEnabled(sal_uInt16 _nCommand,const un
                     break;
                 default:
                     ;
-            } // switch(_nCommand)
+            }
         }
         catch(uno::Exception&)
         {
@@ -4227,11 +4174,11 @@ bool OReportController::impl_setPropertyAtControls_throw(const sal_uInt16 _nUndo
         {
             const String sUndoAction = String(ModuleRes(_nUndoResId));
             pListAction.reset(new UndoManagerListAction(m_aUndoManager,sUndoAction));
-        } // if ( !pListAction.get() )
+        }
         const uno::Reference< beans::XPropertySet > xControlModel(*aIter,uno::UNO_QUERY);
         if ( xControlModel.is() )
             xControlModel->setPropertyValue(_sProperty,_aValue);
-    } // for(;  aIter != aSelection.end();++aIter)
+    }
     return !aSelection.empty();
 }
 // -----------------------------------------------------------------------------
@@ -4298,7 +4245,7 @@ void OReportController::openZoomDialog()
                     m_nZoomValue = getDesignView()->getZoomFactor( m_eZoomType );
 
                 impl_zoom_nothrow();
-            } // if ( !bCancel )
+            }
         }
         catch(uno::Exception&)
         {
@@ -4308,7 +4255,7 @@ void OReportController::openZoomDialog()
 
         for (sal_uInt16 i=0; i < SAL_N_ELEMENTS(pDefaults); ++i)
             delete pDefaults[i];
-    } // if(pFact)
+    }
 }
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
@@ -4316,15 +4263,12 @@ void OReportController::openZoomDialog()
 void SAL_CALL OReportController::setVisualAreaSize( ::sal_Int64 _nAspect, const awt::Size& _aSize ) throw (lang::IllegalArgumentException, embed::WrongStateException, uno::Exception, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard( getMutex() );
-    //if( nAspect == embed::Aspects::MSOLE_CONTENT )
-    {
         bool bChanged =
             (m_aVisualAreaSize.Width != _aSize.Width ||
              m_aVisualAreaSize.Height != _aSize.Height);
         m_aVisualAreaSize = _aSize;
         if( bChanged )
             setModified( sal_True );
-    }
     m_nAspect = _nAspect;
 }
 // -----------------------------------------------------------------------------
@@ -4357,7 +4301,7 @@ embed::VisualRepresentation SAL_CALL OReportController::getPreferredVisualRepres
                 {
                     xTransfer->setVisualAreaSize(m_nAspect,m_aVisualAreaSize);
                     aResult = xTransfer->getPreferredVisualRepresentation( _nAspect );
-                } // if ( xTransfer.is() )
+                }
             }
             catch( uno::Exception & ex )
             {
diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx
index 45c389f94bef..ce0427728d20 100644
--- a/reportdesign/source/ui/report/ReportControllerObserver.cxx
+++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx
@@ -50,8 +50,6 @@ namespace rptui
 
     using namespace ::com::sun::star;
 
-    // const OReportController *& m_pReportController;
-
 DECLARE_STL_USTRINGACCESS_MAP(bool, AllProperties);
 DECLARE_STL_STDKEY_MAP(uno::Reference< beans::XPropertySet >, AllProperties, PropertySetInfoCache);
 
@@ -111,31 +109,6 @@ public:
         if ( _pEvt )
         {
             sal_Int32 nEvent = _pEvt->GetId();
-            /*
-              // just for debug
-            if (nEvent == VCLEVENT_WINDOW_CHILDCREATED ||
-                nEvent == VCLEVENT_WINDOW_PAINT ||
-                nEvent == VCLEVENT_WINDOW_MOVE ||
-                nEvent == VCLEVENT_WINDOW_RESIZE ||
-                nEvent == VCLEVENT_WINDOW_SHOW ||
-                nEvent == VCLEVENT_WINDOW_MOUSEMOVE ||
-                nEvent == VCLEVENT_WINDOW_FRAMETITLECHANGED ||
-                nEvent == VCLEVENT_WINDOW_HIDE ||
-                nEvent == VCLEVENT_EDIT_MODIFY ||
-                nEvent == VCLEVENT_SCROLLBAR_ENDSCROLL ||
-                nEvent == VCLEVENT_EDIT_SELECTIONCHANGED ||
-                nEvent == VCLEVENT_TABPAGE_INSERTED ||
-                nEvent == VCLEVENT_TABPAGE_REMOVED ||
-                nEvent == VCLEVENT_TOOLBOX_FORMATCHANGED ||
-                nEvent == VCLEVENT_TOOLBOX_ITEMADDED ||
-                nEvent == VCLEVENT_TOOLBOX_ALLITEMCHANGED ||
-                nEvent == VCLEVENT_MENUBARADDED ||
-                nEvent == 1
-                )
-            {
-                return 0L;
-            }
-            */
 
             if (nEvent == VCLEVENT_APPLICATION_DATACHANGED )
             {
@@ -146,8 +119,6 @@ public:
                 {
                     OEnvLock aLock(*this);
 
-                    // sal_uInt32 nCount = m_pImpl->m_aSections.size();
-
                     // send all Section Objects a 'tingle'
                     // maybe they need a change in format, color, etc
                     ::std::vector< uno::Reference< container::XChild > >::const_iterator aIter = m_pImpl->m_aSections.begin();
@@ -200,7 +171,6 @@ public:
     void OXReportControllerObserver::Clear()
     {
         OEnvLock aLock(*this);
-        // sal_uInt32 nDebugValue = m_pImpl->m_aSections.size();
         m_pImpl->m_aSections.clear();
     }
 
@@ -316,7 +286,6 @@ void OXReportControllerObserver::switchListening( const uno::Reference< containe
 
         // be notified of any changes in the container elements
         uno::Reference< container::XContainer > xSimpleContainer( _rxContainer, uno::UNO_QUERY );
-        // OSL_ENSURE( xSimpleContainer.is(), "OXReportControllerObserver::switchListening: how are we expected to be notified of changes in the container?" );
         if ( xSimpleContainer.is() )
         {
             if ( _bStartListening )
@@ -368,17 +337,13 @@ void OXReportControllerObserver::switchListening( const uno::Reference< uno::XIn
 //------------------------------------------------------------------------------
 void SAL_CALL OXReportControllerObserver::modified( const lang::EventObject& /*aEvent*/ ) throw (uno::RuntimeException)
 {
-    // implSetModified();
 }
 
 //------------------------------------------------------------------------------
 void OXReportControllerObserver::AddElement(const uno::Reference< uno::XInterface >& _rxElement )
 {
-    // if ( !IsLocked() )
-    // {
     m_aFormattedFieldBeautifier.notifyElementInserted(_rxElement);
     m_aFixedTextColor.notifyElementInserted(_rxElement);
-    // }
 
     // if it's a container, start listening at all elements
     uno::Reference< container::XIndexAccess > xContainer( _rxElement, uno::UNO_QUERY );
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index 875adf1118e3..f2a09d924a64 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -122,7 +122,6 @@ OReportSection::~OReportSection()
 {
     DBG_DTOR( rpt_OReportSection,NULL);
     m_pPage = NULL;
-    //m_pModel->GetUndoEnv().RemoveSection(m_xSection.get());
     if ( m_pMulti.is() )
         m_pMulti->dispose();
 
@@ -136,7 +135,6 @@ OReportSection::~OReportSection()
             m_pView->EndListening( *m_pModel );
         m_pView = NULL;
     }
-    /*m_pModel->DeletePage(m_pPage->GetPageNum());*/
 }
 //------------------------------------------------------------------------------
 void OReportSection::Paint( const Rectangle& rRect )
@@ -247,7 +245,6 @@ void OReportSection::fill()
     m_pView->SetDesignMode( TRUE );
 
     m_pView->StartListening( *m_pModel  );
-    /*Resize();*/
     if ( m_xSection.is() && m_pPage && m_pView )
     {
         uno::Reference<report::XReportDefinition> xReportDefinition = m_xSection->getReportDefinition();
@@ -256,9 +253,7 @@ void OReportSection::fill()
         const sal_Int32 nWorkAreaLeftMargin = getStyleProperty<sal_Int32>(xReportDefinition,PROPERTY_LEFTMARGIN);
         const sal_Int32 nWorkAreaRightMargin = getStyleProperty<sal_Int32>(xReportDefinition,PROPERTY_RIGHTMARGIN);
         m_pView->SetWorkArea( Rectangle( Point( nWorkAreaLeftMargin, 0), Size(aPageSize.Width() - nWorkAreaLeftMargin - nWorkAreaRightMargin,aPageSize.Height()) ) );
-    } // if ( m_xSection.is() && m_pPage && m_pView )
-
-    //SetBackground( Wallpaper( COL_BLUE ));
+    }
 }
 // -----------------------------------------------------------------------------
 void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyCopiedObjects,bool _bForce)
@@ -309,7 +304,6 @@ void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyC
                                 {
                                     aRet.Move(0,aRet.getHeight()+1);
                                     pNeuObj->SetLogicRect(aRet);
-                                    //(*pCopiesIter)->setPositionY(aRet.Top());
                                 }
                             }
                             m_pView->AddUndo( m_pView->GetModel()->GetSdrUndoFactory().CreateUndoNewObject( *pNeuObj ) );
@@ -368,9 +362,6 @@ void OReportSection::Copy(uno::Sequence< beans::NamedValue >& _rAllreadyCopiedOb
     if( !m_pView->AreObjectsMarked() || !m_xSection.is() )
         return;
 
-    // stop all drawing actions
-    //m_pView->BrkAction();
-
     // insert control models of marked objects into clipboard dialog model
     const SdrMarkList& rMarkedList = m_pView->GetMarkedObjectList();
     const ULONG nMark = rMarkedList.GetMarkCount();
@@ -403,7 +394,7 @@ void OReportSection::Copy(uno::Sequence< beans::NamedValue >& _rAllreadyCopiedOb
                 OSL_ENSURE(0,"Can't copy report elements!");
             }
         }
-    } // for( ULONG i = 0; i < nMark; i++ )
+    }
 
     if ( !aCopies.empty() )
     {
@@ -461,7 +452,11 @@ void OReportSection::SelectAll(const sal_uInt16 _nObjectType)
         }
     }
 }
-void lcl_insertMenuItemImages(PopupMenu& rContextMenu,OReportController& rController,const uno::Reference< report::XReportDefinition>& _xReportDefinition,uno::Reference<frame::XFrame>& _rFrame,BOOL _bHiContrast)
+void lcl_insertMenuItemImages(
+    PopupMenu& rContextMenu,
+    OReportController& rController,
+    const uno::Reference< report::XReportDefinition>& _xReportDefinition,uno::Reference<frame::XFrame>& _rFrame
+)
 {
     const USHORT nCount = rContextMenu.GetItemCount();
     for (USHORT i = 0; i < nCount; ++i)
@@ -472,12 +467,12 @@ void lcl_insertMenuItemImages(PopupMenu& rContextMenu,OReportController& rContro
             PopupMenu* pPopupMenu = rContextMenu.GetPopupMenu( nId );
             if ( pPopupMenu )
             {
-                lcl_insertMenuItemImages(*pPopupMenu,rController,_xReportDefinition,_rFrame,_bHiContrast);
+                lcl_insertMenuItemImages(*pPopupMenu,rController,_xReportDefinition,_rFrame);
             }
             else
             {
                 const ::rtl::OUString sCommand = rContextMenu.GetItemCommand(nId);
-                rContextMenu.SetItemImage(nId,framework::GetImageFromURL(_rFrame,sCommand,FALSE,_bHiContrast));
+                rContextMenu.SetItemImage(nId,framework::GetImageFromURL(_rFrame,sCommand,FALSE));
                 if ( nId == SID_PAGEHEADERFOOTER )
                 {
                     String sText = String(ModuleRes((_xReportDefinition.is() && _xReportDefinition->getPageHeaderOn()) ? RID_STR_PAGEHEADERFOOTER_DELETE : RID_STR_PAGEHEADERFOOTER_INSERT));
@@ -492,7 +487,7 @@ void lcl_insertMenuItemImages(PopupMenu& rContextMenu,OReportController& rContro
             rContextMenu.CheckItem(nId,rController.isCommandChecked(nId));
             rContextMenu.EnableItem(nId,rController.isCommandEnabled(nId));
         }
-    } // for (USHORT i = 0; i < nCount; ++i)
+    }
 }
 //----------------------------------------------------------------------------
 void OReportSection::Command( const CommandEvent& _rCEvt )
@@ -502,14 +497,12 @@ void OReportSection::Command( const CommandEvent& _rCEvt )
     {
         case COMMAND_CONTEXTMENU:
         {
-            const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-            BOOL bHiContrast = rSettings.GetHighContrastMode();
             OReportController& rController = m_pParent->getViewsWindow()->getView()->getReportView()->getController();
             uno::Reference<frame::XFrame> xFrame = rController.getFrame();
             PopupMenu aContextMenu( ModuleRes( RID_MENU_REPORT ) );
             uno::Reference< report::XReportDefinition> xReportDefinition = getSection()->getReportDefinition();
 
-            lcl_insertMenuItemImages(aContextMenu,rController,xReportDefinition,xFrame,bHiContrast);
+            lcl_insertMenuItemImages(aContextMenu,rController,xReportDefinition,xFrame);
 
             Point aPos = _rCEvt.GetMousePosPixel();
             m_pView->EndAction();
@@ -607,7 +600,7 @@ void OReportSection::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
                         }
                         pBase->StartListening();
                     }
-                } // for (sal_Int32 i = 0; i < nCount; ++i)
+                }
             }
             catch(uno::Exception)
             {
@@ -632,7 +625,7 @@ void OReportSection::deactivateOle()
 // -----------------------------------------------------------------------------
 void OReportSection::createDefault(const ::rtl::OUString& _sType)
 {
-    SdrObject* pObj = m_pView->GetCreateObj();//rMarkList.GetMark(0)->GetObj();
+    SdrObject* pObj = m_pView->GetCreateObj();
     if ( !pObj )
         return;
     createDefault(_sType,pObj);
@@ -807,8 +800,7 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt )
         nDropOption = DND_ACTION_COPYMOVE;
         m_pParent->getViewsWindow()->BrkAction();
         m_pParent->getViewsWindow()->unmarkAllObjects(m_pView);
-        //m_pParent->getViewsWindow()->getView()->setMarked(m_pView,sal_True);
-    } // if ( OReportExchange::canExtract(rFlavors) )
+    }
     else if ( bMultipleFormat
         || ::svx::OColumnTransferable::canExtractColumnDescriptor(rFlavors, CTF_FIELD_DESCRIPTOR | CTF_CONTROL_EXCHANGE | CTF_COLUMN_DESCRIPTOR) )
     {
@@ -830,7 +822,7 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt )
 
             aValues.realloc(1);
             aValues[0].Value <<= aDescriptor.createPropertyValueSequence();
-        } // if ( !bMultipleFormat )
+        }
         else
             aValues = ::svx::OMultiColumnTransferable::extractDescriptor(aDropped);
 
diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx
index cd9363e05d57..d3b2dfeb2afb 100644
--- a/reportdesign/source/ui/report/ReportWindow.cxx
+++ b/reportdesign/source/ui/report/ReportWindow.cxx
@@ -122,7 +122,6 @@ void OReportWindow::removeSection(USHORT _nPosition)
     m_aViewsWindow.removeSection(_nPosition);
     m_pParent->setTotalSize(GetTotalWidth(),GetTotalHeight());
     m_aViewsWindow.Invalidate(INVALIDATE_TRANSPARENT);
-    //Resize();
 }
 //----------------------------------------------------------------------------
 void OReportWindow::addSection(const uno::Reference< report::XSection >& _xSection,const ::rtl::OUString& _sColorEntry,USHORT _nPosition)
@@ -163,7 +162,7 @@ sal_Int32 OReportWindow::GetTotalWidth() const
     {
         Fraction aStartWidth(long(REPORT_ENDMARKER_WIDTH + REPORT_STARTMARKER_WIDTH ));
         const Fraction aZoom(m_pView->getController().getZoomValue(),100);
-        aStartWidth *= aZoom; // m_aViewsWindow.GetMapMode().GetScaleX();;
+        aStartWidth *= aZoom;
         const sal_Int32 nPaperWidth = getStyleProperty<awt::Size>(m_pView->getController().getReportDefinition(),PROPERTY_PAPERSIZE).Width;
         Fraction aPaperWidth(nPaperWidth,1);
         aPaperWidth *= aZoom;
@@ -248,7 +247,6 @@ void OReportWindow::ScrollChildren(const Point& _aThumbPos)
         m_aHRuler.Scroll(-(aOrg.X() + _aThumbPos.X()),0);
     }
 
-    /*const Point aPos(PixelToLogic(_aThumbPos));*/
     m_aViewsWindow.scrollChildren(_aThumbPos);
 }
 //----------------------------------------------------------------------------
@@ -386,7 +384,6 @@ void OReportWindow::zoom(const Fraction& _aZoom)
     m_aHRuler.SetZoom(_aZoom);
     m_aHRuler.Invalidate();
 
-    //setZoomFactor(_aZoom,*this); // if this will be include the H - ruler has the wrong size
     m_aViewsWindow.zoom(_aZoom);
 
     notifySizeChanged();
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index 82988a764f99..98a48bf1c5eb 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -93,7 +93,6 @@ void OScrollWindowHelper::impl_initScrollBar( ScrollBar& _rScrollBar ) const
     aStyle.SetDragFullOptions( aStyle.GetDragFullOptions() | DRAGFULL_OPTION_SCROLL ); // live scrolling
     aSettings.SetStyleSettings( aStyle );
     _rScrollBar.SetSettings( aSettings );
-    //_rScrollBar.SetMapMode( MapMode( MAP_100TH_MM ) );
 
     _rScrollBar.SetScrollHdl( LINK( this, OScrollWindowHelper, ScrollHdl ) );
     _rScrollBar.SetLineSize( SCR_LINE_SIZE );
@@ -359,7 +358,6 @@ void OScrollWindowHelper::alignMarkedObjects(sal_Int32 _nControlModification,boo
 void OScrollWindowHelper::ImplInitSettings()
 {
     SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor() ));
-    // SetBackground( Wallpaper( COL_LIGHTRED ));
     SetFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() );
     SetTextFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() );
 }
diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx
index b0c9a080ea3a..fd7bc528d55d 100644
--- a/reportdesign/source/ui/report/SectionView.cxx
+++ b/reportdesign/source/ui/report/SectionView.cxx
@@ -76,7 +76,6 @@ void OSectionView::MarkListHasChanged()
 
     if ( m_pReportWindow && m_pSectionWindow && !m_pSectionWindow->getPage()->getSpecialMode() )
     {
-        //m_pReportWindow->unmarkAllObjects(this); // WHY
         DlgEdHint aHint( RPTUI_HINT_SELECTIONCHANGED );
         m_pReportWindow->getReportView()->Broadcast( aHint );
         m_pReportWindow->getReportView()->UpdatePropertyBrowserDelayed(*this);
@@ -230,7 +229,7 @@ bool OSectionView::OnlyShapesMarked() const
         {
             break;
         }
-    } // for (ULONG i=0; i<nCount; i++)
+    }
     return i == nCount;
 }
 
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx
index 0a829c73f01e..8ea1240b3bae 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -145,9 +145,6 @@ void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
             m_aEndMarker.Invalidate(INVALIDATE_NOERASE);
             m_aReportSection.Invalidate(/*INVALIDATE_NOERASE*/);
             getViewsWindow()->getView()->getReportView()->getController().resetZoomType();
-            // Invalidate(INVALIDATE_NOCHILDREN | INVALIDATE_TRANSPARENT);
-            // m_pParent->Invalidate(INVALIDATE_NOCHILDREN|INVALIDATE_NOERASE|INVALIDATE_TRANSPARENT);
-            // m_pParent->Invalidate(/*INVALIDATE_NOCHILDREN | INVALIDATE_NOERASE |*/ INVALIDATE_NOCHILDREN | INVALIDATE_TRANSPARENT);
         }
         else if ( _rEvent.PropertyName.equals(PROPERTY_NAME) && !xSection->getGroup().is() )
         {
@@ -164,7 +161,7 @@ void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
                 m_aStartMarker.Invalidate(INVALIDATE_CHILDREN);
             }
         }
-    } // if ( xSection.is() )
+    }
     else if ( _rEvent.PropertyName.equals(PROPERTY_EXPRESSION) )
     {
         uno::Reference< report::XGroup > xGroup(_rEvent.Source,uno::UNO_QUERY);
@@ -185,7 +182,7 @@ bool OSectionWindow::setReportSectionTitle(const uno::Reference< report::XReport
         String sTitle = String(ModuleRes(_nResId));
         m_aStartMarker.setTitle(sTitle);
         m_aStartMarker.Invalidate(INVALIDATE_CHILDREN);
-    } // if ( bRet )
+    }
     return bRet;
 }
 // -----------------------------------------------------------------------------
@@ -206,14 +203,13 @@ bool OSectionWindow::setGroupSectionTitle(const uno::Reference< report::XGroup>&
         sTitle.SearchAndReplace('#',sExpression);
         m_aStartMarker.setTitle(sTitle);
         m_aStartMarker.Invalidate(INVALIDATE_CHILDREN);
-    } // if ( _pIsSectionOn(&aGroupHelper) )
+    }
     return bRet;
 }
 //------------------------------------------------------------------------------
 void OSectionWindow::ImplInitSettings()
 {
     SetBackground( );
-    //SetBackground( Wallpaper( COL_RED ));
 }
 //-----------------------------------------------------------------------------
 void OSectionWindow::DataChanged( const DataChangedEvent& rDCEvt )
@@ -309,8 +305,6 @@ IMPL_LINK( OSectionWindow, Collapsed, OColorListener *, _pMarker )
 
         m_pParent->resize(*this);
         Resize();
-        // TRY
-        // m_pParent->Invalidate(INVALIDATE_TRANSPARENT | INVALIDATE_NOCHILDREN);
         Invalidate();
     }
     return 0L;
@@ -324,8 +318,7 @@ void OSectionWindow::zoom(const Fraction& _aZoom)
     setZoomFactor(_aZoom,m_aReportSection);
     setZoomFactor(_aZoom,m_aSplitter);
     setZoomFactor(_aZoom,m_aEndMarker);
-    //Resize();
-    Invalidate(/*INVALIDATE_UPDATE |*/ /* | INVALIDATE_TRANSPARENT *//*INVALIDATE_NOCHILDREN*/);
+    Invalidate();
 }
 //-----------------------------------------------------------------------------
 IMPL_LINK( OSectionWindow, StartSplitHdl, Splitter*,  )
@@ -338,7 +331,6 @@ IMPL_LINK( OSectionWindow, StartSplitHdl, Splitter*,  )
 IMPL_LINK( OSectionWindow, EndSplitHdl, Splitter*,  )
 {
     getViewsWindow()->getView()->getReportView()->getController().getUndoMgr()->LeaveListAction();
-    /*getViewsWindow()->Resize();*/
     return 0L;
 }
 //-----------------------------------------------------------------------------
@@ -355,17 +347,16 @@ IMPL_LINK( OSectionWindow, SplitHdl, Splitter*, _pSplitter )
 
     const uno::Reference< report::XSection> xSection = m_aReportSection.getSection();
     nSplitPos = m_aSplitter.PixelToLogic(Size(0,nSplitPos)).Height();
-    // nSplitPos = xSection->getHeight() + m_aSplitter.PixelToLogic(Size(0,nSplitPos - aPos.Y() )).Height();
 
     const sal_Int32 nCount = xSection->getCount();
     for (sal_Int32 i = 0; i < nCount; ++i)
     {
         uno::Reference<report::XReportComponent> xReportComponent(xSection->getByIndex(i),uno::UNO_QUERY);
-        if ( xReportComponent.is() /*&& nSplitPos < (xReportComponent->getPositionY() + xReportComponent->getHeight())*/ )
+        if ( xReportComponent.is() )
         {
             nSplitPos = ::std::max(nSplitPos,xReportComponent->getPositionY() + xReportComponent->getHeight());
         }
-    } // for (sal_Int32 i = 0; i < nCount; ++i)
+    }
 
     if ( nSplitPos < 0 )
         nSplitPos = 0;
@@ -378,7 +369,7 @@ IMPL_LINK( OSectionWindow, SplitHdl, Splitter*, _pSplitter )
 // -----------------------------------------------------------------------------
 void lcl_scroll(Window& _rWindow,const Point& _aDelta)
 {
-    _rWindow.Scroll(-_aDelta.X(),-_aDelta.Y()/*,SCROLL_CHILDREN*//*|SCROLL_CLIP*/);
+    _rWindow.Scroll(-_aDelta.X(),-_aDelta.Y());
     _rWindow.Invalidate(INVALIDATE_TRANSPARENT);
 }
 // -----------------------------------------------------------------------------
@@ -401,11 +392,9 @@ void OSectionWindow::scrollChildren(long _nX)
     const Point aNew = aMapMode.GetOrigin();
     const Point aDiff = aOld - aNew;
     {
-        //OWindowPositionCorrector aCorrector(&m_aReportSection,-aDelta.Width(),0);
         lcl_scroll(m_aReportSection,aDiff);
     }
 
-    //lcl_setOrigin(m_aEndMarker,_nDeltaX, 0);
     lcl_scroll(m_aEndMarker,m_aEndMarker.PixelToLogic(Point(_nX,0)));
 
     lcl_setOrigin(m_aSplitter,_nX, 0);
diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx
index da2e56a178e8..d3bee52d4970 100644
--- a/reportdesign/source/ui/report/StartMarker.cxx
+++ b/reportdesign/source/ui/report/StartMarker.cxx
@@ -51,8 +51,6 @@ namespace rptui
 
 Image*  OStartMarker::s_pDefCollapsed       = NULL;
 Image*  OStartMarker::s_pDefExpanded        = NULL;
-Image*  OStartMarker::s_pDefCollapsedHC = NULL;
-Image*  OStartMarker::s_pDefExpandedHC  = NULL;
 oslInterlockedCount OStartMarker::s_nImageRefCount  = 0;
 
 DBG_NAME( rpt_OStartMarker )
@@ -94,9 +92,7 @@ OStartMarker::~OStartMarker()
     {
         DELETEZ(s_pDefCollapsed);
         DELETEZ(s_pDefExpanded);
-        DELETEZ(s_pDefCollapsedHC);
-        DELETEZ(s_pDefExpandedHC);
-    } // if ( osl_decrementInterlockedCount(&s_nImageRefCount) == 0 )
+    }
 }
 // -----------------------------------------------------------------------------
 sal_Int32 OStartMarker::getMinHeight() const
@@ -109,7 +105,6 @@ sal_Int32 OStartMarker::getMinHeight() const
 void OStartMarker::Paint( const Rectangle& rRect )
 {
     Window::Paint( rRect );
-    //SetUpdateMode(FALSE);
     Size aSize = GetOutputSizePixel();
     long nSize = aSize.Width();
     const long nCornerWidth = long(CORNER_SPACE * (double)GetMapMode().GetScaleX());
@@ -117,10 +112,10 @@ void OStartMarker::Paint( const Rectangle& rRect )
     if ( !isCollapsed() )
     {
         const long nVRulerWidth = m_aVRuler.GetSizePixel().Width();
-        nSize = aSize.Width() - nVRulerWidth/* - m_nCornerSize*/;
+        nSize = aSize.Width() - nVRulerWidth;
         SetClipRegion(Region(PixelToLogic(Rectangle(Point(),Size( nSize,aSize.Height())))));
         aSize.Width() += nCornerWidth;
-    } // if ( !isCollapsed() )
+    }
     else
         SetClipRegion();
 
@@ -191,11 +186,7 @@ void OStartMarker::MouseButtonUp( const MouseEvent& rMEvt )
 // -----------------------------------------------------------------------------
 void OStartMarker::changeImage()
 {
-    Image* pImage = NULL;
-    if ( GetSettings().GetStyleSettings().GetHighContrastMode() )
-        pImage = m_bCollapsed ? s_pDefCollapsedHC : s_pDefExpandedHC;
-    else
-        pImage = m_bCollapsed ? s_pDefCollapsed : s_pDefExpanded;
+    Image* pImage = m_bCollapsed ? s_pDefCollapsed : s_pDefExpanded;
     m_aImage.SetImage(*pImage);
 }
 // -----------------------------------------------------------------------
@@ -204,20 +195,10 @@ void OStartMarker::initDefaultNodeImages()
     if ( !s_pDefCollapsed )
     {
         s_pDefCollapsed     = new Image( ModuleRes( RID_IMG_TREENODE_COLLAPSED      ) );
-        s_pDefCollapsedHC   = new Image( ModuleRes( RID_IMG_TREENODE_COLLAPSED_HC   ) );
         s_pDefExpanded      = new Image( ModuleRes( RID_IMG_TREENODE_EXPANDED       ) );
-        s_pDefExpandedHC    = new Image( ModuleRes( RID_IMG_TREENODE_EXPANDED_HC    ) );
     }
 
-    Image* pImage = NULL;
-    if ( GetSettings().GetStyleSettings().GetHighContrastMode() )
-    {
-        pImage = m_bCollapsed ? s_pDefCollapsedHC : s_pDefExpandedHC;
-    }
-    else
-    {
-        pImage = m_bCollapsed ? s_pDefCollapsed : s_pDefExpanded;
-    }
+    Image* pImage = m_bCollapsed ? s_pDefCollapsed : s_pDefExpanded;
     m_aImage.SetImage(*pImage);
     m_aImage.SetMouseTransparent(TRUE);
     m_aImage.SetBackground();
@@ -227,7 +208,6 @@ void OStartMarker::initDefaultNodeImages()
 // -----------------------------------------------------------------------
 void OStartMarker::ImplInitSettings()
 {
-    // SetBackground( Wallpaper( COL_YELLOW ));
     SetBackground( );
     SetFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() );
     setColor();
@@ -273,7 +253,6 @@ void OStartMarker::Notify(SfxBroadcaster & rBc, SfxHint const & rHint)
             == SFX_HINT_COLORS_CHANGED))
     {
         setColor();
-        //m_aText.Invalidate();
         Invalidate(INVALIDATE_CHILDREN);
     }
 }
@@ -290,7 +269,6 @@ void OStartMarker::RequestHelp( const HelpEvent& rHEvt )
     {
         // Hilfe anzeigen
         Rectangle aItemRect(rHEvt.GetMousePosPixel(),Size(GetSizePixel().Width(),getMinHeight()));
-        //aItemRect = LogicToPixel( aItemRect );
         Point aPt = OutputToScreenPixel( aItemRect.TopLeft() );
         aItemRect.Left()   = aPt.X();
         aItemRect.Top()    = aPt.Y();
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 8571adceb816..e27a806740e4 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -240,7 +240,7 @@ void OViewsWindow::resize(const OSectionWindow& _rSectionWindow)
         {
             aStartPoint = pSectionWindow->GetPosPixel();
             bSet = true;
-        } // if ( pSectionWindow.get() == &_rSectionWindow )
+        }
 
         if ( bSet )
         {
@@ -248,7 +248,7 @@ void OViewsWindow::resize(const OSectionWindow& _rSectionWindow)
             pSectionWindow->Invalidate(INVALIDATE_NOERASE | INVALIDATE_NOCHILDREN | INVALIDATE_TRANSPARENT);
             pSectionWindow->getStartMarker().Invalidate(INVALIDATE_NOERASE | INVALIDATE_NOCHILDREN | INVALIDATE_TRANSPARENT );
         }
-    } // for (;aIter != aEnd ; ++aIter,++nPos)
+    }
     Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH));
     aStartWidth *= GetMapMode().GetScaleX();
     Size aOut = GetOutputSizePixel();
@@ -269,11 +269,11 @@ void OViewsWindow::Resize()
         Point aStartPoint(0,-aOffset.Y());
         TSectionsMap::iterator aIter = m_aSections.begin();
         TSectionsMap::iterator aEnd = m_aSections.end();
-        for (USHORT nPos=0;aIter != aEnd ; ++aIter,++nPos)
+        for (;aIter != aEnd ; ++aIter)
         {
             const ::boost::shared_ptr<OSectionWindow> pSectionWindow = (*aIter);
             impl_resizeSectionWindow(*pSectionWindow.get(),aStartPoint,true);
-        } // for (;aIter != aEnd ; ++aIter)
+        }
     }
 }
 // -----------------------------------------------------------------------------
@@ -295,7 +295,6 @@ void OViewsWindow::Paint( const Rectangle& rRect )
 //------------------------------------------------------------------------------
 void OViewsWindow::ImplInitSettings()
 {
-    // SetBackground( Wallpaper( COL_LIGHTBLUE ));
     SetBackground( );
     SetFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() );
     SetTextFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() );
@@ -333,7 +332,7 @@ void OViewsWindow::removeSection(USHORT _nPosition)
 
         m_aSections.erase(aPos);
         Resize();
-    } // if ( _nPosition < m_aSections.size() )
+    }
 }
 //------------------------------------------------------------------------------
 void OViewsWindow::toggleGrid(BOOL _bVisible)
@@ -406,10 +405,6 @@ void OViewsWindow::Copy()
     ::std::for_each(m_aSections.begin(),m_aSections.end(),
         ::std::compose1(::boost::bind(&OReportSection::Copy,_1,::boost::ref(aAllreadyCopiedObjects)),TReportPairHelper()));
 
-    //TSectionsMap::iterator aIter = m_aSections.begin();
-    //TSectionsMap::iterator aEnd = m_aSections.end();
-    //for (; aIter != aEnd; ++aIter)
-    //    (*aIter)->getReportSection().Copy(aAllreadyCopiedObjects);
     OReportExchange* pCopy = new OReportExchange(aAllreadyCopiedObjects);
     uno::Reference< datatransfer::XTransferable> aEnsureDelete = pCopy;
     pCopy->CopyToClipboard(this);
@@ -500,9 +495,9 @@ void OViewsWindow::Paste()
                 }
                 break;
             }
-        } // ( (*aIter).second->isMarked() )
+        }
         ++nCurrentPosition;
-    } // for (; aIter != aEnd ; ++aIter)
+    }
 
     return pRet;
 }
@@ -541,29 +536,10 @@ void OViewsWindow::unmarkAllObjects(OSectionView* _pSectionView)
                 (*aIter)->getReportSection().deactivateOle();
                 (*aIter)->getReportSection().getSectionView().UnmarkAllObj();
             }
-        } // for (; aIter != aEnd ; ++aIter)
+        }
         m_bInUnmark = sal_False;
     }
 }
-//-----------------------------------------------------------------------------
-/*
-::boost::shared_ptr<OSectionWindow> OViewsWindow::getReportSection(const uno::Reference< report::XSection >& _xSection)
-{
-    OSL_ENSURE(_xSection.is(),"Section is NULL!");
-    ::boost::shared_ptr<OSectionWindow> pRet;
-    TSectionsMap::iterator aIter = m_aSections.begin();
-    TSectionsMap::iterator aEnd = m_aSections.end();
-    for (; aIter != aEnd ; ++aIter)
-    {
-        if ( (*aIter)->getReportSection().getSection() == _xSection )
-        {
-            pRet = (*aIter);
-            break;
-        } // if ( (*aIter)->getSection() == _xSection )
-    } // for (; aIter != aEnd ; ++aIter)
-    return pRet;
-}
-*/
 // -----------------------------------------------------------------------
 void OViewsWindow::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32)
 {
@@ -620,7 +596,6 @@ sal_Bool OViewsWindow::handleKeyEvent(const KeyEvent& _rEvent)
     TSectionsMap::iterator aEnd = m_aSections.end();
     for (;aIter != aEnd ; ++aIter)
     {
-        //if ( (*aIter).getReportSection().getSectionView().->AreObjectsMarked() )
         if ( (*aIter)->getStartMarker().isMarked() )
         {
             bRet = (*aIter)->getReportSection().handleKeyEvent(_rEvent);
@@ -917,10 +892,8 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli
                             {
                                 if ( _nControlModification == ControlModification::WIDTH_SMALLEST || _nControlModification == ControlModification::WIDTH_GREATEST )
                                     pObjBase->getReportComponent()->setSize(awt::Size(nXMov,aObjRect.getHeight()));
-                                    //pObj->Resize(aObjRect.TopLeft(),Fraction(nXMov,aObjRect.getWidth()),Fraction(1,1));
                                 else if ( _nControlModification == ControlModification::HEIGHT_GREATEST || _nControlModification == ControlModification::HEIGHT_SMALLEST )
                                     pObjBase->getReportComponent()->setSize(awt::Size(aObjRect.getWidth(),nYMov));
-                                    //pObj->Resize(aObjRect.TopLeft(),Fraction(1,1),Fraction(nYMov,aObjRect.getHeight()));
                             }
                         }
                         break;
@@ -1060,14 +1033,10 @@ void OViewsWindow::BegDragObj_createInvisibleObjectAtPosition(const Rectangle& _
 
         if ( &rView != &_rSection )
         {
-//            SdrRectObj *pNewObj = new SdrRectObj(OBJ_RECT, _aRect);
-//          SdrObject *pNewObj = new SdrUnoObj(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Temp Label")));
             SdrObject *pNewObj = new SdrUnoObj(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")));
             if (pNewObj)
             {
                 pNewObj->SetLogicRect(_aRect);
-                // pNewObj->SetSize(_aRect.GetSize());
-                // pNewObj->Move(Size(_aRect.Left(), _aRect.Top()));
 
                 pNewObj->Move(Size(0, aNewPos.Y()));
                 BOOL bChanged = rView.GetModel()->IsChanged();
@@ -1076,13 +1045,11 @@ void OViewsWindow::BegDragObj_createInvisibleObjectAtPosition(const Rectangle& _
                 m_aBegDragTempList.push_back(pNewObj);
                 Rectangle aRect = pNewObj->GetLogicRect();
 
-                // pNewObj->SetText(String::CreateFromAscii("Drag helper"));
                 rView.MarkObj( pNewObj, rView.GetSdrPageView() );
             }
         }
         const long nSectionHeight = rReportSection.PixelToLogic(rReportSection.GetOutputSizePixel()).Height();
         aNewPos.Y() -= nSectionHeight;
-//        aNewPos.Y() -= PixelToLogic(aIter->second.second->GetSizePixel()).Height();
     }
 }
 // -----------------------------------------------------------------------------
@@ -1147,14 +1114,6 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi
                     OSL_TRACE("BegDragObj createInvisible X:%d Y:%d on View #%d\n", aRect.Left(), aRect.Top(), nViewCount );
 
                     BegDragObj_createInvisibleObjectAtPosition(aRect, rView);
-
-                    // calculate the clickpoint
-//                    const sal_Int32 nDeltaX = abs(aRect.Left() - aAbsolutePnt.X());
-//                    const sal_Int32 nDeltaY = abs(aRect.Top() - aAbsolutePnt.Y());
-//                    if (m_aDragDelta.X() > nDeltaX)
-//                        m_aDragDelta.X() = nDeltaX;
-//                    if (m_aDragDelta.Y() > nDeltaY)
-//                        m_aDragDelta.Y() = nDeltaY;
                 }
             }
         }
@@ -1165,9 +1124,6 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi
 
         const long nSectionHeight = rReportSection.PixelToLogic(rReportSection.GetOutputSizePixel()).Height();
         aNewObjPos.Y() += nSectionHeight;
-
-        // don't subtract the height of the lines between the views
-        // aNewObjPos.Y() -= PixelToLogic(aIter->second.second->GetSizePixel()).Height();
     }
 
     const sal_Int32 nDeltaX = abs(aLeftTop.X() - aAbsolutePnt.X());
@@ -1176,38 +1132,13 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi
     m_aDragDelta.Y() = nDeltaY;
 
     Point aNewPos = aAbsolutePnt;
-    // for (aIter = m_aSections.begin(); aIter != aEnd; ++aIter)
-    // {
-    //     OReportSection& rReportSection = (*aIter)->getReportSection();
-    //     if ( &rReportSection.getSectionView() == _pSection )
-    //         break;
-    //     aNewPos.Y() += rReportSection.PixelToLogic(rReportSection.GetOutputSizePixel()).Height();
-    // }
 
     const short nDrgLog = static_cast<short>(PixelToLogic(Size(3,0)).Width());
-    // long nLastSectionHeight = 0;
-    // bool bAdd = true;
     nViewCount = 0;
     for (aIter = m_aSections.begin(); aIter != aEnd; ++aIter)
     {
         OReportSection& rReportSection = (*aIter)->getReportSection();
 
-        // if ( &rReportSection.getSectionView() == _pSection )
-        // {
-        //     bAdd = false;
-        //     aNewPos = _aPnt;
-        // }
-        // else if ( bAdd )
-        // {
-        //     const long nSectionHeight = rReportSection.PixelToLogic(rReportSection.GetOutputSizePixel()).Height();
-        //     aNewPos.Y() += nSectionHeight;
-        // }
-        // else
-        // {
-        //     aNewPos.Y() -= nLastSectionHeight;
-        // }
-
-        //?
         SdrHdl* pHdl = _pHdl;
         if ( pHdl )
         {
@@ -1222,8 +1153,6 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi
 
         const long nSectionHeight = rReportSection.PixelToLogic(rReportSection.GetOutputSizePixel()).Height();
         aNewPos.Y() -= nSectionHeight;
-        // subtract the height between the views, because they are visible but not from interest here.
-        // aNewPos.Y() -= PixelToLogic(aIter->second.second->GetSizePixel()).Height();
     }
 }
 
@@ -1260,10 +1189,7 @@ void OViewsWindow::BegMarkObj(const Point& _aPnt,const OSectionView* _pSection)
         }
         rReportSection.getSectionView().BegMarkObj ( aNewPos );
         nLastSectionHeight = rReportSection.PixelToLogic(rReportSection.GetOutputSizePixel()).Height();
-
-        // aNewPos.Y() -= PixelToLogic(aIter->second.second->GetSizePixel()).Height();
     }
-    //::std::for_each( m_aSections.begin(), m_aSections.end(), ApplySectionViewAction( _aPnt , eMarkAction) );
 }
 // -----------------------------------------------------------------------------
 OSectionView* OViewsWindow::getSectionRelativeToPosition(const OSectionView* _pSection,Point& _rPnt)
@@ -1341,9 +1267,6 @@ void OViewsWindow::EndDragObj(BOOL _bControlKeyPressed, const OSectionView* _pSe
         EndDragObj_removeInvisibleObjects();
 
         // we need to manipulate the current clickpoint, we substract the old delta from BeginDrag
-        // OSectionView* pInSection = getSectionRelativeToPosition(_pSection, aPnt);
-        // aNewPos.X() -= m_aDragDelta.X();
-        // aNewPos.Y() -= m_aDragDelta.Y();
         aNewPos -= m_aDragDelta;
 
         uno::Sequence< beans::NamedValue > aAllreadyCopiedObjects;
@@ -1359,7 +1282,7 @@ void OViewsWindow::EndDragObj(BOOL _bControlKeyPressed, const OSectionView* _pSe
             }
             else
                 pInSection->EndDragObj(FALSE);
-        } // for (; aIter != aEnd; ++aIter)
+        }
 
         if ( aAllreadyCopiedObjects.getLength() )
         {
@@ -1455,11 +1378,9 @@ void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection,bo
         aHdlPos = pHdl->GetPos();
     }
 
-    TSectionsMap::iterator aIter/*  = m_aSections.begin() */;
+    TSectionsMap::iterator aIter;
     TSectionsMap::iterator aEnd = m_aSections.end();
 
-    //if ( _bMove )
-    //{
     for (aIter = m_aSections.begin(); aIter != aEnd; ++aIter)
     {
         OReportSection& rReportSection = (*aIter)->getReportSection();
@@ -1467,8 +1388,7 @@ void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection,bo
             break;
         const long nSectionHeight = (*aIter)->PixelToLogic(rReportSection.GetOutputSizePixel()).Height();
         aCurrentSectionPos.Y() += nSectionHeight;
-    } // for (aIter = m_aSections.begin(); aIter != aEnd; ++aIter)
-    //}
+    }
     aRealMousePos += aCurrentSectionPos;
 
     // If control key is pressed the work area is limited to the section with the current selection.
@@ -1483,7 +1403,6 @@ void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection,bo
         {
             Rectangle aClipRect = rView.GetWorkArea();
             aClipRect.Top() = aCurrentSectionPos.Y() - aPosForWorkArea.Y();
-            // if (aClipRect.Top() < 0) aClipRect.Top() = 0;
             aClipRect.Bottom() = aClipRect.Top() + nSectionHeight;
             rView.SetWorkArea( aClipRect );
         }
@@ -1494,7 +1413,6 @@ void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection,bo
             rView.SetWorkArea( aClipRect );
         }
         aPosForWorkArea.Y() += nSectionHeight;
-        // aNewPos.Y() += PixelToLogic(aIter->second.second->GetSizePixel()).Height();
     }
 
 
@@ -1762,7 +1680,7 @@ void OViewsWindow::zoom(const Fraction& _aZoom)
     for (;aIter != aEnd ; ++aIter)
     {
         (*aIter)->zoom(_aZoom);
-    } // for (;aIter != aEnd ; ++aIter)
+    }
 
     Resize();
 
@@ -1771,7 +1689,7 @@ void OViewsWindow::zoom(const Fraction& _aZoom)
     aOut = PixelToLogic(aOut);
 
     Rectangle aRect(PixelToLogic(Point(0,0)),aOut);
-    Invalidate(aRect,/*INVALIDATE_NOERASE | */INVALIDATE_NOCHILDREN /*| INVALIDATE_TRANSPARENT*/);
+    Invalidate(aRect,INVALIDATE_NOCHILDREN);
 }
 //----------------------------------------------------------------------------
 void OViewsWindow::scrollChildren(const Point& _aThumbPos)
@@ -1786,7 +1704,6 @@ void OViewsWindow::scrollChildren(const Point& _aThumbPos)
 
         aMapMode.SetOrigin( Point(aOld.X() , - aPosY.Y()));
         SetMapMode( aMapMode );
-        //OWindowPositionCorrector aCorrector(this,0,-( aOld.Y() + aPosY.Y()));
         Scroll(0, -( aOld.Y() + aPosY.Y()),SCROLL_CHILDREN);
         Resize();
         Invalidate(INVALIDATE_NOCHILDREN|INVALIDATE_TRANSPARENT);
@@ -1797,7 +1714,7 @@ void OViewsWindow::scrollChildren(const Point& _aThumbPos)
     for (;aIter != aEnd ; ++aIter)
     {
         (*aIter)->scrollChildren(aPos.X());
-    } // for (;aIter != aEnd ; ++aIter)
+    }
 }
 // -----------------------------------------------------------------------------
 void OViewsWindow::fillControlModelSelection(::std::vector< uno::Reference< uno::XInterface > >& _rSelection) const
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx
index 10fdbce9a06e..ca5cdc3eb844 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -96,7 +96,6 @@ void DlgEdFunc::ForceScroll( const Point& rPos )
 
     Rectangle aOutRect( pScrollWindow->getThumbPos(), aOut );
     aOutRect = m_pParent->PixelToLogic( aOutRect );
-    //Rectangle aWorkArea = m_pParent->getView()->GetWorkArea();
     Point aGcc3WorkaroundTemporary;
     Rectangle aWorkArea(aGcc3WorkaroundTemporary,pScrollWindow->getTotalSize());
     aWorkArea.Right() -= (long)aStartWidth;
@@ -134,7 +133,6 @@ DlgEdFunc::DlgEdFunc( OReportSection* _pParent )
  m_bUiActive(false),
  m_bShowPropertyBrowser(false)
 {
-    // m_pParent = _pParent;
     aScrollTimer.SetTimeoutHdl( LINK( this, DlgEdFunc, ScrollTimeout ) );
     m_rView.SetActualWin( m_pParent);
     aScrollTimer.SetTimeout( SELENG_AUTOREPEAT_INTERVAL );
@@ -152,14 +150,7 @@ sal_Int32 lcl_setColorOfObject(uno::Reference< uno::XInterface > _xObj, long _nC
     try
     {
         uno::Reference<report::XReportComponent> xComponent(_xObj, uno::UNO_QUERY_THROW);
-        // NOT NEED if UNO_QUERY_THROW:
-        // if (xComponent.is())
-        // {
         uno::Reference< beans::XPropertySet > xProp(xComponent, uno::UNO_QUERY_THROW);
-        // if (xProp.is())
-        // {
-        // ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlBackground"))
-        // is PROPERTY_CONTROLBACKGROUND
         uno::Any aAny = xProp->getPropertyValue(PROPERTY_CONTROLBACKGROUND);
         if (aAny.hasValue())
         {
@@ -168,12 +159,9 @@ sal_Int32 lcl_setColorOfObject(uno::Reference< uno::XInterface > _xObj, long _nC
             uno::Any aBlackColorAny = uno::makeAny(_nColorTRGB);
             xProp->setPropertyValue(PROPERTY_CONTROLBACKGROUND, aBlackColorAny);
         }
-        // aCopies.push_back(xComponent->createClone());
     }
     catch(uno::Exception&)
     {
-        // bit my shiny metal as!
-        // OSL_ENSURE(0,"Can't copy report elements!");
     }
     return nBackColor;
 }
@@ -214,7 +202,6 @@ BOOL DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt )
         else
         {
             SdrHdl* pHdl = m_rView.PickHandle(m_aMDPos);
-            //m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(m_pView);
 
             // if selected object was hit, drag object
             if ( pHdl!=NULL || m_rView.IsMarkedHit(m_aMDPos) )
@@ -269,8 +256,8 @@ void DlgEdFunc::checkTwoCklicks(const MouseEvent& rMEvt)
                 const SdrMark* pMark = rMarkList.GetMark(0);
                 SdrObject* pObj = pMark->GetMarkedSdrObj();
                 activateOle(pObj);
-            } // if (rMarkList.GetMarkCount() == 1)
-        } // if ( pView->AreObjectsMarked() )
+            }
+        }
     }
 }
 // -----------------------------------------------------------------------------
@@ -319,7 +306,6 @@ sal_Bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent)
                         ((SdrHdlList&)rHdlList).ResetFocusHdl();
                     else
                         m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(NULL);
-                        //m_rView.UnmarkAll();
 
                     deactivateOle(true);
                     bReturn = FALSE;
@@ -391,7 +377,7 @@ sal_Bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent)
                 {
                     bReturn = TRUE;
                     break;
-                } // if ( !rCode.IsMod1() && !rCode.IsMod2() )
+                }
                 // run through
             default:
             {
@@ -445,8 +431,8 @@ void DlgEdFunc::activateOle(SdrObject* _pObj)
                     }
                 }
             }
-        } // if (nSdrObjKind == OBJ_OLE2)
-    } // if ( _pObj )
+        }
+    }
 }
 // -----------------------------------------------------------------------------
 void DlgEdFunc::deactivateOle(bool _bSelect)
@@ -474,9 +460,9 @@ void DlgEdFunc::deactivateOle(bool _bSelect)
                     SdrPageView* pPV = m_rView.GetSdrPageView();
                     m_rView.MarkObj(pObj, pPV);
                 }
-            } // if ( xObj.is() && xObj->getCurrentState() == embed::EmbedStates::UI_ACTIVE )
+            }
         }
-    } // for(ULONG i = 0 ; i< nCount;++i)
+    }
 }
 // -----------------------------------------------------------------------------
 void DlgEdFunc::colorizeOverlappedObject(SdrObject* _pOverlappedObj)
@@ -584,7 +570,6 @@ bool DlgEdFunc::isOnlyCustomShapeMarked()
     for (sal_uInt32 i =  0; i < rMarkList.GetMarkCount();++i )
     {
         SdrMark* pMark = rMarkList.GetMark(i);
-        // bCheck = dynamic_cast<OUnoObject*>(pMark->GetMarkedSdrObj()) != NULL;
         SdrObject* pObj = pMark->GetMarkedSdrObj();
         if (pObj->GetObjIdentifier() != OBJ_CUSTOMSHAPE)
         {
@@ -609,7 +594,6 @@ bool DlgEdFunc::isRectangleHit(const MouseEvent& rMEvt)
     if ( !bIsSetPoint )
     {
         // no drag rect, we have to check every single select rect
-        //const Rectangle& rRect = m_rView.GetDragStat().GetActionRect();
         const SdrDragStat& rDragStat = m_rView.GetDragStat();
         if (rDragStat.GetDragMethod() != NULL)
         {
@@ -696,15 +680,10 @@ BOOL DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt )
 
     const SdrHitKind eHit = m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
 
-// eHit == SDRHIT_UNMARKEDOBJECT under the mouse cursor is a unmarked object
-
     if (eHit == SDRHIT_UNMARKEDOBJECT &&
         nId != OBJ_CUSTOMSHAPE)
     {
         // there is an object under the mouse cursor, but not a customshape
-        // rtl::OUString suWasN = m_rView.getInsertObjString();
-        // rtl::OUString suWasN2 = m_pParent->getSectionWindow()->getViewsWindow()->GetInsertObjString();
-
         m_pParent->getSectionWindow()->getViewsWindow()->BrkAction();
         return FALSE;
     }
@@ -770,7 +749,6 @@ BOOL DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt )
             for (sal_uInt32 i =  0; i < rMarkList.GetMarkCount();++i )
             {
                 SdrMark* pMark = rMarkList.GetMark(i);
-                // bCheck = dynamic_cast<OUnoObject*>(pMark->GetMarkedSdrObj()) != NULL;
                 OOle2Obj* pObj = dynamic_cast<OOle2Obj*>(pMark->GetMarkedSdrObj());
                 if ( pObj && !pObj->IsEmpty() )
                 {
@@ -791,7 +769,7 @@ BOOL DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt )
         SdrViewEvent aVEvt;
         m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
         m_rView.MarkObj(aVEvt.pRootObj, pPV);
-    } // ift() && !rMEvt.IsMod2() )
+    }
     checkTwoCklicks(rMEvt);
     m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->UpdatePropertyBrowserDelayed(m_rView);
     return bReturn;
@@ -827,9 +805,6 @@ BOOL DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt )
         m_pParent->getSectionWindow()->getViewsWindow()->MovAction(aPos,&m_rView, m_rView.GetDragMethod() == NULL, false);
     }
 
-    //if ( isOver(m_rView.GetCreateObj(),*m_pParent->getPage(),*m_pView) )
-    //    m_pParent->SetPointer( Pointer(POINTER_NOTALLOWED));
-    //else
     if ( !bIsSetPoint )
         m_pParent->SetPointer( m_rView.GetPreferedPointer( aPos, m_pParent) );
 
@@ -880,7 +855,6 @@ BOOL DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt )
     {
         if( !rMEvt.IsShift() )
             m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(NULL);
-            //m_rView.UnmarkAll();
 
         if ( rMEvt.GetClicks() == 1 )
         {
@@ -948,15 +922,6 @@ BOOL DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt )
                 {
                     aPnt.Y() = 0;
                 }
-                // grow section if it is under the current section
-//                else
-//                {
-//                    const Size& aSectionSize = m_rView->GetSizePixel();
-//                    if ( aPnt.Y() > aSectionSize.Height() )
-//                    {
-//                        aPnt.Y() = aSectionSize.Height();
-//                    }
-//                }
             }
             // drag or resize an object
             bool bControlKey = rMEvt.IsMod1();
@@ -974,147 +939,6 @@ BOOL DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt )
 
     return TRUE;
 }
-// -----------------------------------------------------------------------------
-//void DlgEdFuncSelect::SetInEditMode(SdrTextObj* _pTextObj,const MouseEvent& rMEvt, BOOL bQuickDrag)
-//{
-//
-//  SdrPageView* pPV = m_rView.GetSdrPageView();
-//  if( _pTextObj && _pTextObj->GetPage() == pPV->GetPage() )
-//  {
-//      m_rView.SetCurrentObj(OBJ_TEXT);
-//      m_rView.SetEditMode(SDREDITMODE_EDIT);
-//
-//      BOOL bEmptyOutliner = FALSE;
-//
-//      if (!_pTextObj->GetOutlinerParaObject() && m_rView.GetTextEditOutliner())
-//      {
-//          ::SdrOutliner* pOutl = m_rView.GetTextEditOutliner();
-//          ULONG nParaAnz = pOutl->GetParagraphCount();
-//          Paragraph* p1stPara = pOutl->GetParagraph( 0 );
-//
-//          if (nParaAnz==1 && p1stPara)
-//          {
-//              // Bei nur einem Pararaph
-//              if (pOutl->GetText(p1stPara).Len() == 0)
-//              {
-//                  bEmptyOutliner = TRUE;
-//              }
-//          }
-//      }
-//
-//      if (_pTextObj != m_rView.GetTextEditObject() || bEmptyOutliner)
-//      {
-//          UINT32 nInv = _pTextObj->GetObjInventor();
-//          UINT16 nSdrObjKind = _pTextObj->GetObjIdentifier();
-//
-//          if (nInv == SdrInventor && _pTextObj->HasTextEdit() &&
-//              (nSdrObjKind == OBJ_TEXT ||
-//              nSdrObjKind == OBJ_TITLETEXT ||
-//              nSdrObjKind == OBJ_OUTLINETEXT ||
-//              (_pTextObj->ISA(SdrTextObj) && !_pTextObj->IsEmptyPresObj())))
-//          {
-//              // Neuen Outliner machen (gehoert der SdrObjEditView)
-//                SdrModel* pModel = _pTextObj->GetModel();
-//                SdrOutliner* pOutl = SdrMakeOutliner( OUTLINERMODE_OUTLINEOBJECT, pModel );
-//              pOutl->SetMinDepth(0);
-//              pOutl->SetStyleSheetPool((SfxStyleSheetPool*) pModel->GetStyleSheetPool());
-//              //pOutl->SetCalcFieldValueHdl(LINK(SD_MOD(), SdModule, CalcFieldValueHdl));
-//              ULONG nCntrl = pOutl->GetControlWord();
-//              nCntrl |= EE_CNTRL_ALLOWBIGOBJS;
-//              nCntrl |= EE_CNTRL_URLSFXEXECUTE;
-//              nCntrl |= EE_CNTRL_MARKFIELDS;
-//              nCntrl |= EE_CNTRL_AUTOCORRECT;
-//
-//              nCntrl &= ~EE_CNTRL_ULSPACESUMMATION;
-//              //if ( pModel->IsSummationOfParagraphs() )
-//              //    nCntrl |= EE_CNTRL_ULSPACESUMMATION;
-//
-//              //SetSpellOptions( nCntrl );
-//
-//              pOutl->SetControlWord(nCntrl);
-//
-//                uno::Reference< linguistic2::XSpellChecker1 > xSpellChecker( LinguMgr::GetSpellChecker() );
-//              if ( xSpellChecker.is() )
-//                  pOutl->SetSpeller( xSpellChecker );
-//
-//                uno::Reference< linguistic2::XHyphenator > xHyphenator( LinguMgr::GetHyphenator() );
-//              if( xHyphenator.is() )
-//                  pOutl->SetHyphenator( xHyphenator );
-//
-//              pOutl->SetDefaultLanguage( Application::GetSettings().GetLanguage() );
-//
-//              // in einem Gliederungstext darf nicht auf die 0-te
-//              // Ebene ausgerueckt werden
-//              if (_pTextObj->GetObjInventor() == SdrInventor &&
-//                  _pTextObj->GetObjIdentifier() == OBJ_OUTLINETEXT)
-//              {
-//                  pOutl->SetMinDepth(1);
-//              }
-//
-//              if (bEmptyOutliner)
-//              {
-//                  m_rView.SdrEndTextEdit(sal_True);
-//              }
-//
-//              if( _pTextObj )
-//              {
-//                  OutlinerParaObject* pOPO = _pTextObj->GetOutlinerParaObject();
-//                  if( ( pOPO && pOPO->IsVertical() ) /*||
-//                      nSlotId == SID_ATTR_CHAR_VERTICAL ||
-//                      nSlotId == SID_TEXT_FITTOSIZE_VERTICAL */)
-//                      pOutl->SetVertical( TRUE );
-//
-//
-//                  if (m_rView.SdrBeginTextEdit(_pTextObj, pPV, pParent, sal_True, pOutl) && _pTextObj->GetObjInventor() == SdrInventor)
-//                  {
-//                      //bFirstObjCreated = TRUE;
-//                      //DeleteDefaultText();
-//
-//                      OutlinerView* pOLV = m_rView.GetTextEditOutlinerView();
-//
-//                      nSdrObjKind = _pTextObj->GetObjIdentifier();
-//
-//                      SdrViewEvent aVEvt;
-//                      SdrHitKind eHit = m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
-//
-//                      if (eHit == SDRHIT_TEXTEDIT)
-//                      {
-//                          // Text getroffen
-//                          if (nSdrObjKind == OBJ_TEXT ||
-//                              nSdrObjKind == OBJ_TITLETEXT ||
-//                              nSdrObjKind == OBJ_OUTLINETEXT ||
-//                              //nSlotId == SID_TEXTEDIT ||
-//                              !bQuickDrag)
-//                          {
-//                              pOLV->MouseButtonDown(rMEvt);
-//                              pOLV->MouseMove(rMEvt);
-//                              pOLV->MouseButtonUp(rMEvt);
-//                          }
-//
-//                          if ( bQuickDrag && _pTextObj->GetOutlinerParaObject())
-//                          {
-//                              pOLV->MouseButtonDown(rMEvt);
-//                          }
-//                      }
-//                      else
-//                      {
-//                          // #98198# Move cursor to end of text
-//                          ESelection aNewSelection(EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND, EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND);
-//                          pOLV->SetSelection(aNewSelection);
-//                      }
-//                  }
-//                  else
-//                  {
-//                      //RestoreDefaultText();
-//                  }
-//              }
-//          }
-//      }
-//  }
-//  else
-//      _pTextObj = NULL;
-//}
-
 
 //----------------------------------------------------------------------------
 }
diff --git a/reportdesign/source/ui/report/makefile.mk b/reportdesign/source/ui/report/makefile.mk
index 3c19923f4c19..0383a98be4a8 100644
--- a/reportdesign/source/ui/report/makefile.mk
+++ b/reportdesign/source/ui/report/makefile.mk
@@ -36,7 +36,6 @@ VISIBILITY_HIDDEN=TRUE
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-# .INCLUDE : $(PRJ)$/util$/dll.pmk
 
 IMGLST_SRS=$(SRS)$/$(TARGET).srs
 # --- Files --------------------------------------------------------
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index ac36078ff3cf..82f0af585963 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -121,7 +121,7 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >&   _xORB,Window* pParen
         if (m_xMeAsFrame.is())
         {
             m_xMeAsFrame->initialize( VCLUnoHelper::GetInterface ( this ) );
-            m_xMeAsFrame->setName(::rtl::OUString::createFromAscii("report property browser"));  // change name!
+            m_xMeAsFrame->setName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("report property browser")));  // change name!
         }
     }
     catch (Exception&)
@@ -141,9 +141,6 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >&   _xORB,Window* pParen
                 xFactoryProperties->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ),
                 UNO_QUERY_THROW );
 
-            /*uno::Reference< XComponent> xModel = new OContextHelper(m_xORB,uno::Reference< XComponent>(m_pDesignView->getController().getModel(),uno::UNO_QUERY) );
-            uno::Reference< XComponent> xDialogParentWindow = new OContextHelper(m_xORB,uno::Reference< XComponent>(VCLUnoHelper::GetInterface ( this ),uno::UNO_QUERY) );
-            uno::Reference< XComponent> xConnection = new OContextHelper(m_xORB,uno::Reference< XComponent>(m_pDesignView->getController().getConnection(),uno::UNO_QUERY) );*/
             // a ComponentContext for the
             ::cppu::ContextEntry_Init aHandlerContextInfo[] =
             {
@@ -351,8 +348,6 @@ void PropBrw::implSetNewObject( const uno::Sequence< Reference<uno::XInterface>
         {
             OSL_ENSURE( sal_False, "FmPropBrw::StateChanged: caught an exception while setting the initial page!" );
         }
-
-        //Resize();
     }
     SetText( GetHeadlineName(_aObjects) );
 }
@@ -582,7 +577,7 @@ void PropBrw::Update( const uno::Reference< uno::XInterface>& _xReportComponent)
             {
                 EndListening( *(m_pView->GetModel()) );
                 m_pView = NULL;
-            } // if ( m_pView )
+            }
 
             uno::Reference< uno::XInterface> xTemp(CreateComponentPair(_xReportComponent,_xReportComponent));
             implSetNewObject( uno::Sequence< uno::Reference< uno::XInterface> >(&xTemp,1) );
diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src
index 4a84f7bd034d..52f5fe402c79 100644
--- a/reportdesign/source/ui/report/report.src
+++ b/reportdesign/source/ui/report/report.src
@@ -112,25 +112,13 @@ String RID_STR_PROPTITLE_GROUP
 
 Image RID_IMG_TREENODE_COLLAPSED
 {
-    ImageBitmap = Bitmap { File = "plus.bmp"; } ;
+    ImageBitmap = Bitmap { File = "plus.png"; } ;
     MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; };
 };
 
 Image RID_IMG_TREENODE_EXPANDED
 {
-    ImageBitmap = Bitmap { File = "minus.bmp"; } ;
-    MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; };
-};
-
-Image RID_IMG_TREENODE_COLLAPSED_HC
-{
-    ImageBitmap = Bitmap { File = "plus_sch.bmp"; } ;
-    MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; };
-};
-
-Image RID_IMG_TREENODE_EXPANDED_HC
-{
-    ImageBitmap = Bitmap { File = "minus_sch.bmp"; } ;
+    ImageBitmap = Bitmap { File = "minus.png"; } ;
     MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; };
 };
 
diff --git a/reportdesign/uiconfig/dbreport/menubar/menubar.xml b/reportdesign/uiconfig/dbreport/menubar/menubar.xml
index 005f7274ae62..9993288d8601 100644
--- a/reportdesign/uiconfig/dbreport/menubar/menubar.xml
+++ b/reportdesign/uiconfig/dbreport/menubar/menubar.xml
@@ -415,6 +415,7 @@
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:ShowLicense"/>
             <menu:menuseparator/>
+            <menu:menuitem menu:id=".uno:ShowCredits"/>
             <menu:menuitem menu:id=".uno:About"/>
         </menu:menupopup>
     </menu:menu>
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index b0bc9e0ef59d..72a980462cb8 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -1320,7 +1320,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
                                 aBaseFileName += ByteString::CreateFromInt32( 0 );
 
                             if( GetImageFilePath( rOutputFile, rContext, aBaseFileName += aLine , aFilePath, pSysListFile ) )
-                                aEntryVector.push_back( ::std::make_pair< ByteString, sal_Int32 >( aFilePath, nNumber ) );
+                                aEntryVector.push_back( ::std::pair< ByteString, sal_Int32 >( aFilePath, nNumber ) );
                             else
                                 aMissingImages.push_back( aBaseFileName );
                         }
diff --git a/sal/inc/osl/diagnose.h b/sal/inc/osl/diagnose.h
index 699703b73f1b..a848e0900e16 100644
--- a/sal/inc/osl/diagnose.h
+++ b/sal/inc/osl/diagnose.h
@@ -78,23 +78,6 @@ pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc( pf
 
 #define OSL_THIS_FILE       __FILE__
 
-/* the macro OSL_THIS_FUNC is intended to be an office internal macro for now */
-/* as documented in http://www.openoffice.org/issues/show_bug.cgi?id=114290 ,
-   this cannot work, so disable it for now */
-#if 1
-#define OSL_THIS_FUNC " "
-#else
-#ifdef __func__
-#define OSL_THIS_FUNC __func__
-#elif defined (__PRETTY_FUNCTION__)
-#define OSL_THIS_FUNC __PRETTY_FUNCTION__
-#elif defined (__FUNCTION__)
-#define OSL_THIS_FUNC __FUNCTION__
-#else
-#define OSL_THIS_FUNC " "
-#endif
-#endif /* 1 */
-
 /* the macro OSL_TO_STRING is intended to be an office internal macro for now */
 #define OSL_TO_STRING( x ) #x
 
@@ -102,7 +85,7 @@ pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc( pf
 #define OSL_MACRO_VALUE_TO_STRING( x ) OSL_TO_STRING( x )
 
 /* the macro OSL_LOG_PREFIX is intended to be an office internal macro for now */
-#define OSL_LOG_PREFIX OSL_THIS_FILE ":" OSL_THIS_FUNC ":" OSL_MACRO_VALUE_TO_STRING( __LINE__ ) "; "
+#define OSL_LOG_PREFIX OSL_THIS_FILE ":" OSL_MACRO_VALUE_TO_STRING( __LINE__ ) "; "
 
 #define OSL_DEBUG_ONLY(s)   _OSL_DEBUG_ONLY(s)
 #define OSL_TRACE           _OSL_TRACE
@@ -164,6 +147,31 @@ pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc( pf
 
 #endif /* OSL_DEBUG_LEVEL */
 
+/* the macro OSL_THIS_FUNC is intended to be an office internal macro for now */
+/* copied from boost/current_function.hpp to make it usable from C
+ * sources as well
+ *
+ * Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See
+ * accompanying file LICENSE_1_0.txt or copy at
+ * http://www.boost.org/LICENSE_1_0.txt) */
+#if defined(__GNUC__) || (defined(__MWERKS__) && (__MWERKS__ >= 0x3000)) || (defined(__ICC) && (__ICC >= 600))
+#define OSL_THIS_FUNC __PRETTY_FUNCTION__
+#elif defined(__DMC__) && (__DMC__ >= 0x810)
+#define OSL_THIS_FUNC __PRETTY_FUNCTION__
+#elif defined(__FUNCSIG__)
+#define OSL_THIS_FUNC __FUNCSIG__
+#elif (defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 600)) || (defined(__IBMCPP__) && (__IBMCPP__ >= 500))
+#define OSL_THIS_FUNC __FUNCTION__
+#elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x550)
+#define OSL_THIS_FUNC __FUNC__
+#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901)
+#define OSL_THIS_FUNC __func__
+#else
+#define OSL_THIS_FUNC ""
+#endif
+
 #endif /* _OSL_DIAGNOSE_H_ */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/util.c b/sal/osl/unx/util.c
index c687e6ce7e76..cea560d44ef9 100644
--- a/sal/osl/unx/util.c
+++ b/sal/osl/unx/util.c
@@ -40,7 +40,7 @@
 #endif
 
 #include "osl/util.h"
-
+#include "osl/diagnose.h"
 
 
 /*****************************************************************************/
@@ -57,6 +57,10 @@ static int   osl_checkAddr(const char* addr);
 
 sal_Bool SAL_CALL osl_getEthernetAddress( sal_uInt8 * pAddr )
 {
+#ifdef SOLARIS
+    /** algorithm doesn't work on solaris */
+    return sal_False;
+#else
     char buff[1024];
     char hard_addr[64];
     struct ifconf ifc;
@@ -64,11 +68,6 @@ sal_Bool SAL_CALL osl_getEthernetAddress( sal_uInt8 * pAddr )
     int i;
     int so;
 
-#ifdef SOLARIS
-    /** algorithm doesn't work on solaris */
-    return sal_False;
-#else
-
     if ( pAddr == 0 )
     {
         return sal_False;
@@ -92,7 +91,7 @@ sal_Bool SAL_CALL osl_getEthernetAddress( sal_uInt8 * pAddr )
     ifc.ifc_buf = buff;
     if ( ioctl(so, SIOCGIFCONF, &ifc) < 0 )
     {
-/*      fprintf(stderr, "SIOCGIFCONF: %s\n", strerror(errno));*/
+        OSL_TRACE( "SIOCGIFCONF: %s\n", strerror(errno) );
         close(so);
         return sal_False;
     }
@@ -141,7 +140,7 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
 
     if ( ret < 0 )
     {
-/*      fprintf(stderr, "SIOCGIFFLAGS: %s\n", strerror(errno)); */
+        OSL_TRACE( "SIOCGIFFLAGS: %s\n", strerror(errno) );
         close(so);
         return ret;
     }
@@ -153,7 +152,7 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
 
     if (ifr.ifr_flags & IFF_LOOPBACK)
     {
-/*      fprintf(stderr, "SIOCGIFFLAGS : is LOOPBACK : %s\n", strerror(errno));*/
+        OSL_TRACE( "SIOCGIFFLAGS : is LOOPBACK : %s\n", strerror(errno) );
         close(so);
         return 0;
     }
@@ -170,7 +169,7 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
 #endif
 
     if (ret < 0) {
-/*      fprintf(stderr, "SIOCGIFADDR: %s\n", strerror(errno));*/
+        OSL_TRACE( "SIOCGIFADDR: %s\n", strerror(errno) );
         memset(hard_addr, 0, 32);
         close(so);
         return ret;
@@ -193,13 +192,10 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr)
     ret=osl_checkAddr(hard_addr);
 
     if (ret < 0) {
-/*      fprintf(stderr, "SIOCGIFADDR got '00:00:00:00:00:00'\n"); */
+        OSL_TRACE( "SIOCGIFADDR got '00:00:00:00:00:00'\n" );
         return ret;
     }
 
-/*  fprintf(stderr,"interface : %s -- ",ifname);*/
-/*  fprintf(stderr,"HWaddr : %s\n", print_ether(hard_addr));*/
-
     return 1;
 }
 
diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index 09253ef932b2..3b0529f1e713 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -691,7 +691,7 @@ static int path_make_parent(sal_Unicode* path)
     If there are no more parents 0 will be returned,
     e.g. 'c:\' or '\\Share' have no more parents */
 
-    OSL_PRECOND(rtl_ustr_indexOfChar(path, SLASH) != -1, "Path must not contain slashes");
+    OSL_PRECOND(rtl_ustr_indexOfChar(path, SLASH) == -1, "Path must not contain slashes");
     OSL_PRECOND(has_path_parent(path), "Path must have a parent");
 
     sal_Unicode* pos_last_backslash = path + rtl_ustr_lastIndexOfChar(path, BACKSLASH);
diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
index 68d07d3433ff..8beb523ccdf6 100644
--- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
+++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
@@ -29,37 +29,26 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 
-// -----------------------------------------------------------------------------
 #include <rtl/string.hxx>
 #include <rtl_String_Const.h>
 #include <rtl_String_Utils.hxx>
-
 #include <rtl/strbuf.hxx>
 
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
 #include "cppunit/plugin/TestPlugIn.h"
-
 #include <string.h>
 
 using namespace rtl;
 
-//------------------------------------------------------------------------
-// test classes
-//------------------------------------------------------------------------
-// const MAXBUFLENGTH = 255;
-//------------------------------------------------------------------------
-// helper functions
-//------------------------------------------------------------------------
+// This file contains cppunit tests for the
+// OString and OStringBuffer classes
 
 //------------------------------------------------------------------------
 // testing constructors
 //------------------------------------------------------------------------
 
-// LLA: there exist some #if WITH_CORE #endif envelopes, which contain test code, which will core dump
-//      due to the fact, that we can't handle MAXINT32 right.
-
 namespace rtl_OStringBuffer
 {
     class  ctors : public CppUnit::TestFixture
@@ -104,29 +93,11 @@ namespace rtl_OStringBuffer
         void ctor_003()
         {
             ::rtl::OStringBuffer aStrBuf1(kTestStr2Len);
-#ifdef WITH_CORE
-            ::rtl::OStringBuffer aStrBuf2(kSInt32Max);     //will core dump
-            // LLA: will core, due to the fact, that ksint32max is too big, the max length can't
-            //      use, because there are some internal bytes, which we can't calculate.
-
-#else
             ::rtl::OStringBuffer aStrBuf2(0);
-#endif
 
             const sal_Char* pStr1 = aStrBuf1.getStr();
             const sal_Char* pStr2 = aStrBuf2.getStr();
 
-#ifdef WITH_CORE
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "New OStringBuffer containing no characters and contain assigned capacity",
-                aStrBuf1.getLength() == 0 &&
-                ! *(aStrBuf1.getStr()) && aStrBuf1.getCapacity() == kTestStr2Len &&
-                aStrBuf2.getLength() == 0 &&
-                ! *(aStrBuf2.getStr()) && aStrBuf2.getCapacity() == kSInt32Max
-
-            );
-#else
             CPPUNIT_ASSERT_MESSAGE
             (
                 "New OStringBuffer containing no characters and contain assigned capacity",
@@ -137,13 +108,13 @@ namespace rtl_OStringBuffer
                 *pStr2 == '\0' &&
                 aStrBuf2.getCapacity() == 0
             );
-#endif
 
         }
 
         void ctor_003_1()
         {
-            // LLA: StringBuffer with created negativ size are the same as empty StringBuffers
+            // StringBuffer with created negative size are the
+            // same as empty StringBuffers
             ::rtl::OStringBuffer aStrBuf3(kNonSInt32Max);
 
             const sal_Char* pStr = aStrBuf3.getStr();
@@ -189,8 +160,6 @@ namespace rtl_OStringBuffer
         CPPUNIT_TEST_SUITE_END();
     };
 
-
-
 // -----------------------------------------------------------------------------
 
     class  makeStringAndClear : public CppUnit::TestFixture
@@ -591,19 +560,7 @@ namespace rtl_OStringBuffer
                 aStrBuf.getCapacity() == expVal
             );
         }
-#ifdef WITH_CORE
-        void getCapacity_008()
-        {
-            ::rtl::OStringBuffer   aStrBuf ( kSInt32Max );
-            sal_Int32              expVal = kSInt32Max;
 
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "capacity of empty string (with capacity 2147483647)(code will core dump)",
-                aStrBuf.getCapacity() == expVal
-            );
-        }
-#endif
         void getCapacity_009()
         {
             ::rtl::OStringBuffer   aStrBuf( kNonSInt32Max );
@@ -672,9 +629,6 @@ namespace rtl_OStringBuffer
         CPPUNIT_TEST( getCapacity_005 );
         CPPUNIT_TEST( getCapacity_006 );
         CPPUNIT_TEST( getCapacity_007 );
-#ifdef WITH_CORE
-        CPPUNIT_TEST( getCapacity_008 );
-#endif
         CPPUNIT_TEST( getCapacity_009 );
         CPPUNIT_TEST( getCapacity_010 );
         CPPUNIT_TEST( getCapacity_011 );
@@ -877,87 +831,7 @@ namespace rtl_OStringBuffer
             );
 
         }
-#ifdef WITH_CORE
-        void ensureCapacity_013()             //will core dump
-        {
-            sal_Int32          expVal = kSInt32Max;
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            sal_Int32              input = 65535;
-
-            aStrBuf.ensureCapacity( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "capacity equal to 2147483647, minimum is 65535",
-                aStrBuf.getCapacity() == expVal
-            );
-
-        }
-
-        void ensureCapacity_014()             //will core dump
-        {
-            sal_Int32          expVal = kSInt32Max;
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            sal_Int32              input = kSInt32Max;
-
-            aStrBuf.ensureCapacity( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "capacity equal to 2147483647, minimum is 2147483647",
-                aStrBuf.getCapacity() == expVal
-            );
-
-        }
-
-        void ensureCapacity_015()             //will core dump
-        {
-            sal_Int32          expVal = kSInt32Max;
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            sal_Int32              input = -1;
-
-            aStrBuf.ensureCapacity( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "capacity equal to 2147483647, minimum is -1",
-                aStrBuf.getCapacity() == expVal
-            );
-
-        }
-
-        void ensureCapacity_016()             //will core dump
-        {
-            sal_Int32          expVal = kSInt32Max;
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            sal_Int32              input = 0;
-
-            aStrBuf.ensureCapacity( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "capacity equal to 2147483647, minimum is 0",
-                aStrBuf.getCapacity() == expVal
-            );
-
-        }
 
-        void ensureCapacity_017()             //will core dump
-        {
-            sal_Int32          expVal = kSInt32Max;
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            sal_Int32              input = kNonSInt32Max;
-
-            aStrBuf.ensureCapacity( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "capacity equal to 2147483647, minimum is -2147483648",
-                aStrBuf.getCapacity() == expVal
-            );
-
-        }
-#endif
         void ensureCapacity_018()
         {
             sal_Int32          expVal = 65535;
@@ -973,23 +847,7 @@ namespace rtl_OStringBuffer
             );
 
         }
-#ifdef WITH_CORE
-        void ensureCapacity_019()               //will core dump
-        {
-            sal_Int32          expVal = 2147483647;
-            ::rtl::OStringBuffer   aStrBuf( kNonSInt32Max );
-            sal_Int32              input = 2147483647;
 
-            aStrBuf.ensureCapacity( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "capacity equal to -2147483648, minimum is 2147483647",
-                aStrBuf.getCapacity() == expVal
-            );
-
-        }
-#endif
         void ensureCapacity_020()
         {
             sal_Int32          expVal = 2;
@@ -1051,17 +909,7 @@ namespace rtl_OStringBuffer
         CPPUNIT_TEST( ensureCapacity_010 );
         CPPUNIT_TEST( ensureCapacity_011 );
         CPPUNIT_TEST( ensureCapacity_012 );
-#ifdef WITH_CORE
-        CPPUNIT_TEST( ensureCapacity_013 );
-        CPPUNIT_TEST( ensureCapacity_014 );
-        CPPUNIT_TEST( ensureCapacity_015 );
-        CPPUNIT_TEST( ensureCapacity_016 );
-        CPPUNIT_TEST( ensureCapacity_017 );
-#endif
         CPPUNIT_TEST( ensureCapacity_018 );
-#ifdef WITH_CORE
-        CPPUNIT_TEST( ensureCapacity_019 );
-#endif
         CPPUNIT_TEST( ensureCapacity_020 );
         CPPUNIT_TEST( ensureCapacity_021 );
         CPPUNIT_TEST( ensureCapacity_022 );
@@ -1532,8 +1380,6 @@ namespace rtl_OStringBuffer
 
         }
 
-
-
         CPPUNIT_TEST_SUITE( setLength );
         CPPUNIT_TEST( setLength_001 );
         CPPUNIT_TEST( setLength_002 );
@@ -1703,7 +1549,6 @@ namespace rtl_OStringBuffer
     };
 // -----------------------------------------------------------------------------
 
-
     class  csuc : public CppUnit::TestFixture
     {
         void csuc_001()
@@ -1742,14 +1587,12 @@ namespace rtl_OStringBuffer
 
         }
 
-
         CPPUNIT_TEST_SUITE( csuc );
         CPPUNIT_TEST( csuc_001 );
         CPPUNIT_TEST( csuc_002 );
         CPPUNIT_TEST_SUITE_END();
     };
 
-
 // -----------------------------------------------------------------------------
 
     class  getStr : public CppUnit::TestFixture
@@ -1790,7 +1633,6 @@ namespace rtl_OStringBuffer
 
         }
 
-
         CPPUNIT_TEST_SUITE( getStr );
         CPPUNIT_TEST( getStr_001 );
         CPPUNIT_TEST( getStr_002 );
@@ -1864,7 +1706,6 @@ namespace rtl_OStringBuffer
 
         }
 
-
         void setCharAt_004()
         {
             OString                expVal( kTestStr33 );
@@ -1880,7 +1721,6 @@ namespace rtl_OStringBuffer
 
         }
 
-
         void setCharAt_005()
         {
             OString                expVal( kTestStr34 );
@@ -2863,24 +2703,6 @@ namespace rtl_OStringBuffer
 
         }
 
-        void append_003_005()
-        {
-            // LLA: this is an illegal test, the input2 value must non-negative
-            // LLA: OString                expVal( kTestStr41 );
-            // LLA: ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: const sal_Char*        input1 = kTestStr2;
-            // LLA: sal_Int32              input2 = -1;
-            // LLA:
-            // LLA: aStrBuf.append( input1, input2 );
-            // LLA:
-            // LLA: CPPUNIT_ASSERT_MESSAGE
-            // LLA: (
-            // LLA:     "Appends the string(length less than 0) to the string buffer arrOUS[0]",
-            // LLA:     ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() )
-            // LLA: );
-
-        }
-
         void append_003_006()
         {
             OString                expVal( kTestStr7 );
@@ -2949,23 +2771,6 @@ namespace rtl_OStringBuffer
 
         }
 
-        void append_003_010()
-        {
-            // LLA: this is an illegal test, the input2 value must non-negative
-            // LLA: OString                expVal;
-            // LLA: ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: const sal_Char*        input1 = kTestStr2;
-            // LLA: sal_Int32              input2 = -1;
-            // LLA:
-            // LLA: aStrBuf.append( input1, input2 );
-            // LLA:
-            // LLA: CPPUNIT_ASSERT_MESSAGE
-            // LLA: (
-            // LLA:     "Appends the string(length less than 0) to the string buffer arrOUS[1]",
-            // LLA:     ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() )
-            // LLA: );
-        }
-
         void append_003_011()
         {
             OString                expVal( kTestStr7 );
@@ -3034,24 +2839,6 @@ namespace rtl_OStringBuffer
 
         }
 
-        void append_003_015()
-        {
-            // LLA: this is an illegal test, the input2 value must non-negative
-            // LLA: OString                expVal;
-            // LLA: ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: const sal_Char*        input1 = kTestStr2;
-            // LLA: sal_Int32              input2 = -1;
-            // LLA:
-            // LLA: aStrBuf.append( input1, input2 );
-            // LLA:
-            // LLA: CPPUNIT_ASSERT_MESSAGE
-            // LLA: (
-            // LLA:     "Appends the string(length less than 0) to the string buffer arrOUS[2]",
-            // LLA:     ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() )
-            // LLA: );
-
-        }
-
         void append_003_016()
         {
             OString                expVal( kTestStr7 );
@@ -3120,24 +2907,6 @@ namespace rtl_OStringBuffer
 
         }
 
-        void append_003_020()
-        {
-            // LLA: this is an illegal test, the input2 value must non-negative
-            // LLA: OString                expVal;
-            // LLA: ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: const sal_Char*        input1 = kTestStr2;
-            // LLA: sal_Int32              input2 = -1;
-            // LLA:
-            // LLA: aStrBuf.append( input1, input2 );
-            // LLA:
-            // LLA: CPPUNIT_ASSERT_MESSAGE
-            // LLA: (
-            // LLA:     "Appends the string(length less than 0) to the string buffer arrOUS[3]",
-            // LLA:     ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() )
-            // LLA: );
-
-        }
-
         void append_003_021()
         {
             OString                expVal( kTestStr29 );
@@ -3206,75 +2975,30 @@ namespace rtl_OStringBuffer
 
         }
 
-        void append_003_025()
-        {
-            // LLA: this is an illegal test, the input2 value must non-negative
-            // LLA: OString                expVal( kTestStr42 );
-            // LLA: ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: const sal_Char*        input1 = kTestStr2;
-            // LLA: sal_Int32              input2 = -1;
-            // LLA:
-            // LLA: aStrBuf.append( input1, input2 );
-            // LLA:
-            // LLA: CPPUNIT_ASSERT_MESSAGE
-            // LLA: (
-            // LLA:     "Appends the string(length less than 0) to the string buffer arrOUS[4]",
-            // LLA:     ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() )
-            // LLA: );
-
-        }
-
-#ifdef WITH_CORE
-        void append_003_026()
-        {
-            OString                expVal;
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            const sal_Char*        input1 = kTestStr25;
-            sal_Int32              input2 = 0;
-
-            aStrBuf.append( input1, input2 );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "Appends the string(length equal to 0) to the string buffer(with INT_MAX)",
-                ( aStrBuf.getStr()== expVal) &&( aStrBuf.getLength() == expVal.getLength() )
-            );
-
-        }
-#endif
-
         CPPUNIT_TEST_SUITE( append_003 );
         CPPUNIT_TEST( append_003_001 );
         CPPUNIT_TEST( append_003_002 );
         CPPUNIT_TEST( append_003_003 );
         CPPUNIT_TEST( append_003_004 );
-        CPPUNIT_TEST( append_003_005 );
         CPPUNIT_TEST( append_003_006 );
         CPPUNIT_TEST( append_003_007 );
         CPPUNIT_TEST( append_003_008 );
         CPPUNIT_TEST( append_003_009 );
-        CPPUNIT_TEST( append_003_010 );
         CPPUNIT_TEST( append_003_011 );
         CPPUNIT_TEST( append_003_012 );
         CPPUNIT_TEST( append_003_013 );
         CPPUNIT_TEST( append_003_014 );
-        CPPUNIT_TEST( append_003_015 );
         CPPUNIT_TEST( append_003_016 );
         CPPUNIT_TEST( append_003_017 );
         CPPUNIT_TEST( append_003_018 );
         CPPUNIT_TEST( append_003_019 );
-        CPPUNIT_TEST( append_003_020 );
         CPPUNIT_TEST( append_003_021 );
         CPPUNIT_TEST( append_003_022 );
         CPPUNIT_TEST( append_003_023 );
         CPPUNIT_TEST( append_003_024 );
-        CPPUNIT_TEST( append_003_025 );
-#ifdef WITH_CORE
-        CPPUNIT_TEST( append_003_026 );
-#endif
         CPPUNIT_TEST_SUITE_END();
     };
-// -----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 
     class  append_004 : public CppUnit::TestFixture
     {
@@ -3743,82 +3467,7 @@ namespace rtl_OStringBuffer
 #endif
         CPPUNIT_TEST_SUITE_END();
     };
-/**
- * Calls the method append(T, radix) and compares
- * returned OUString with OUString that passed in the array resArray.
- *
- * @param T, type of argument, passed to append
- * @param resArray, array of result ustrings to compare to
- * @param n the number of elements in the array resArray (testcases)
- * @param pTestResult the instance of the class TestResult
- * @param inArray [optional], array of value that is passed as first argument
- *                            to append
- *
- * @return true, if all returned OUString are equal to corresponding OUString in
- *               resArray else, false.
- */
-/*template <class T>
-sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
-                            const T *inArray, OStringBuffer &aStr1 )
-{
-    sal_Bool    bRes = sal_True;
-
-    //sal_Char    methName[MAXBUFLENGTH];
-    //sal_Char*   pMeth = methName;
-    sal_Int32   i;
-//    static sal_Unicode aUchar[80]={0x12};
-
-    for (i = 0; i < n; i++)
-    {
-
-    OSL_ENSURE( i < 80, "ERROR: leave aUchar bound");
-
-//        AStringToUStringCopy(aUchar,resArray[i]);
-
-        ::rtl::OString aStr2(aStr1.getStr());
-        ::rtl::OString aStr3( "-" );
-
-        if (inArray == 0)
-    {
-            aStr2 += OString(resArray[i]);
-            aStr1.append((T)i, radix);
-    }
-        else
-        {
- //           sal_Unicode   aStr4[100];
-            if ( inArray[i] < 0 )
-            {
-                aStr2 += aStr3;
-
-            }
-//          if(AStringToUStringCopy(aStr4,resArray[i]))
-//            {
-                aStr2 += OString(resArray[i]);
-//            }
-            aStr1.append((T)inArray[i], radix);
-        }
 
-        CPPUNIT_ASSERT_MESSAGE
-            (
-                "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[0]",
-                aStr1.getStr()== aStr2 &&
-                    aStr1.getLength() == aStr2.getLength()
-            );
-    }
-
-    return (bRes);
-}
-#define test_append_Int32      test_append<sal_Int32>
-#define test_append_Int64      test_append<sal_Int64>
-#define test_append_float      test_append<float>
-#define test_append_double     test_append<double>*/
-//------------------------------------------------------------------------
-// testing the method append( sal_Int32 i, sal_Int16 radix=2 )
-// testing the method append( sal_Int32 i, sal_Int16 radix=8 )
-// testing the method append( sal_Int32 i, sal_Int16 radix=10 )
-// testing the method append( sal_Int32 i, sal_Int16 radix=16 )
-// testing the method append( sal_Int32 i, sal_Int16 radix=36 )
-//------------------------------------------------------------------------
     class  append_006_Int32 : public CppUnit::TestFixture
     {
         OString* arrOUS[5];
@@ -3850,10 +3499,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
             expVal += OString( "0" );
             aStrBuf.append( input, radix );
 
-            /*test_append_Int32((const char**)kBinaryNumsStr,
-                                kBinaryNumsCount, kRadixBinary,
-                                0, aStrBuf );*/
-
             CPPUNIT_ASSERT_MESSAGE
             (
                 "append(sal_Int32, radix 2)_006_kRadixBinary for arrOUS[0]",
@@ -15315,7 +14960,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_001()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr74 );
             float                  input = (float)atof("3.0");
 
             // LLA:
@@ -15336,7 +14980,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_002()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr75 );
             float                  input = (float)atof("3.5");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15353,7 +14996,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_003()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr76 );
             float                  input = (float)atof("3.0625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15370,7 +15012,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_004()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr77 );
             float                  input = (float)atof("3.502525");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15387,7 +15028,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_005()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr78 );
             float                  input = (float)atof("3.141592");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15404,7 +15044,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_006()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr79 );
             float                  input = (float)atof("3.5025255");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15421,7 +15060,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_007()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr80 );
             float                  input = (float)atof("3.00390625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15438,7 +15076,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_008()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr81 );
             float                  input = (float)atof("3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15455,7 +15092,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_009()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr82 );
             float                  input = (float)atof("3.5");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15472,7 +15108,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_010()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr83 );
             float                  input = (float)atof("3.0625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15489,7 +15124,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_011()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr84 );
             float                  input = (float)atof("3.502525");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15506,7 +15140,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_012()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr85 );
             float                  input = (float)atof("3.141592");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15523,7 +15156,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_013()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr86 );
             float                  input = (float)atof("3.5025255");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15540,7 +15172,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_014()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr87 );
             float                  input = (float)atof("3.00390625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15557,7 +15188,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_015()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr81 );
             float                  input = (float)atof("3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15574,7 +15204,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_016()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr82 );
             float                  input = (float)atof("3.5");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15591,7 +15220,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_017()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr83 );
             float                  input = (float)atof("3.0625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15608,7 +15236,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_018()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr84 );
             float                  input = (float)atof("3.502525");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15625,7 +15252,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_019()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr85 );
             float                  input = (float)atof("3.141592");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15642,7 +15268,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_020()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr86 );
             float                  input = (float)atof("3.5025255");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15659,7 +15284,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_021()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr87 );
             float                  input = (float)atof("3.00390625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15676,7 +15300,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_022()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr81 );
             float                  input = (float)atof("3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15693,7 +15316,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_023()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr82 );
             float                  input = (float)atof("3.5");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15710,7 +15332,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_024()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr83 );
             float                  input = (float)atof("3.0625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15727,7 +15348,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_025()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr84 );
             float                  input = (float)atof("3.502525");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15744,7 +15364,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_026()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr85 );
             float                  input = (float)atof("3.141592");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15761,7 +15380,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_027()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr86 );
             float                  input = (float)atof("3.5025255");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15778,7 +15396,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_028()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr87 );
             float                  input = (float)atof("3.00390625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15795,7 +15412,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_029()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr88 );
             float                  input = (float)atof("3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15812,7 +15428,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_030()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr89 );
             float                  input = (float)atof("3.5");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15829,7 +15444,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_031()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr90 );
             float                  input = (float)atof("3.0625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15846,7 +15460,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_032()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr91 );
             float                  input = (float)atof("3.502525");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15863,7 +15476,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_033()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr92 );
             float                  input = (float)atof("3.141592");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15880,7 +15492,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_034()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr93 );
             float                  input = (float)atof("3.5025255");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15897,7 +15508,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_035()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr94 );
             float                  input = (float)atof("3.00390625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15914,7 +15524,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_036()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr81 );
             float                  input = (float)atof("3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15931,7 +15540,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_037()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr82 );
             float                  input = (float)atof("3.5");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15948,7 +15556,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_038()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr83 );
             float                  input = (float)atof("3.0625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15965,7 +15572,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_039()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr84 );
             float                  input = (float)atof("3.502525");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15982,7 +15588,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_040()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr85 );
             float                  input = (float)atof("3.141592");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -15999,7 +15604,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_041()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr86 );
             float                  input = (float)atof("3.5025255");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16016,7 +15620,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_042()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr87 );
             float                  input = (float)atof("3.00390625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16093,7 +15696,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_001()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr95 );
             float                  input = (float)atof("-3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16110,7 +15712,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_002()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr96 );
             float                  input = (float)atof("-3.5");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16127,7 +15728,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_003()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr97 );
             float                  input = (float)atof("-3.0625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16144,7 +15744,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_004()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr98 );
             float                  input = (float)atof("-3.502525");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16161,7 +15760,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_005()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr99 );
             float                  input = (float)atof("-3.141592");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16178,7 +15776,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_006()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr100 );
             float                  input = (float)atof("-3.5025255");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16195,7 +15792,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_007()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr101 );
             float                  input = (float)atof("-3.00390625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16212,7 +15808,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_008()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr102 );
             float                  input = (float)atof("-3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16229,7 +15824,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_009()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr103 );
             float                  input = (float)atof("-3.5");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16246,7 +15840,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_010()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr104 );
             float                  input = (float)atof("-3.0625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16263,7 +15856,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_011()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr105 );
             float                  input = (float)atof("-3.502525");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16280,7 +15872,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_012()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr106 );
             float                  input = (float)atof("-3.141592");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16297,7 +15888,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_013()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr107 );
             float                  input = (float)atof("-3.5025255");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16314,7 +15904,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_014()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            // LLA: OString                expVal( kTestStr108 );
             float                  input = (float)atof("-3.00390625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16331,7 +15920,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_015()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr102 );
             float                  input = (float)atof("-3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16348,7 +15936,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_016()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr103 );
             float                  input = (float)atof("-3.5");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16365,7 +15952,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_017()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr104 );
             float                  input = (float)atof("-3.0625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16382,7 +15968,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_018()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr105 );
             float                  input = (float)atof("-3.502525");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16399,7 +15984,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_019()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr106 );
             float                  input = (float)atof("-3.141592");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16416,7 +16000,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_020()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr107 );
             float                  input = (float)atof("-3.5025255");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16433,7 +16016,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_021()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            // LLA: OString                expVal( kTestStr108 );
             float                  input = (float)atof("-3.00390625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16450,7 +16032,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_022()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr102 );
             float                  input = (float)atof("-3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16467,7 +16048,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_023()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr103 );
             float                  input = (float)atof("-3.5");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16484,7 +16064,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_024()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr104 );
             float                  input = (float)atof("-3.0625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16501,7 +16080,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_025()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr105 );
             float                  input = (float)atof("-3.502525");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16518,7 +16096,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_026()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr106 );
             float                  input = (float)atof("-3.141592");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16535,7 +16112,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_027()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr107 );
             float                  input = (float)atof("-3.5025255");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16552,7 +16128,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_028()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            // LLA: OString                expVal( kTestStr108 );
             float                  input = (float)atof("-3.00390625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16569,7 +16144,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_029()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr109 );
             float                  input = (float)atof("-3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16586,7 +16160,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_030()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr110 );
             float                  input = (float)atof("-3.5");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16603,7 +16176,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_031()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr111 );
             float                  input = (float)atof("-3.0625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16620,7 +16192,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_032()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr112 );
             float                  input = (float)atof("-3.502525");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16637,7 +16208,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_033()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr113 );
             float                  input = (float)atof("-3.141592");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16654,7 +16224,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_034()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr114 );
             float                  input = (float)atof("-3.5025255");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16671,7 +16240,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_035()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr115 );
             float                  input = (float)atof("-3.00390625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16688,7 +16256,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_036()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr102 );
             float                  input = (float)atof("-3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16705,7 +16272,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_037()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr103 );
             float                  input = (float)atof("-3.5");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16722,7 +16288,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_038()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr104 );
             float                  input = (float)atof("-3.0625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16739,7 +16304,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_039()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr105 );
             float                  input = (float)atof("-3.502525");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16756,7 +16320,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_040()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr106 );
             float                  input = (float)atof("-3.141592");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16773,7 +16336,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_041()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr107 );
             float                  input = (float)atof("-3.5025255");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16790,7 +16352,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_042()
         {
             ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            // LLA: OString                expVal( kTestStr108 );
             float                  input = (float)atof("-3.00390625");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16886,7 +16447,6 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
         void append_001()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr74 );
             double                 input = atof("3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -16900,562 +16460,9 @@ sal_Bool test_append( const char** resArray, int n, sal_Int16 radix,
 
         }
 
-/*
-        void append_002()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            OString                expVal( kTestStr75 );
-            double                 input = atof("3.5");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[0] append 3.5",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_003()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            OString                expVal( kTestStr76 );
-            double                 input = atof("3.0625");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[0] append 3.0625",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_004()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            OString                expVal( kTestStr122 );
-            double                 input = atof("3.1415926535");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[0] append 3.1415926535",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_005()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            OString                expVal( kTestStr123 );
-            double                 input = atof("3.141592653589793");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[0] append 3.141592653589793",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_006()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            OString                expVal( kTestStr124 );
-            double                  input = atof("3.14159265358979323");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[0] append 3.14159265358979323",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_007()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            OString                expVal( kTestStr125 );
-            double                 input = atof("3.141592653589793238462643");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[0] append 3.141592653589793238462643",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_008()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr81 );
-            double                 input = atof("3.0");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append 3.0",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_009()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr82 );
-            double                 input = atof("3.5");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append 3.5",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_010()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr83 );
-            double                 input = atof("3.0625");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append 3.0625",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_011()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr126 );
-            double                 input = atof("3.1415926535");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append 3.1415926535",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_012()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr127 );
-            double                 input = atof("3.141592653589793");
-
-            aStrBuf.append( input );
-            OString     *result = new OString( aStrBuf.getStr());
-            double      output = result->toDouble();
-            OString     *final = new OString();
-            *final = final->valueOf(output);
-t_print("the OStringvalus is:");
-for(int m=0;m<final->getLength();m++)
-{
-    t_print("%c",final->pData->buffer[m]);
-}
-t_print("\n");
-t_print("the OStringBuffer is %d\n", aStrBuf.getLength());
-t_print("the expVal is %d\n", expVal.getLength());
-t_print("the OStringbuffervalus is:");
-for(int j=0;j<aStrBuf.getLength();j++)
-{
-    t_print("%c",*(aStrBuf.getStr()+j));
-}
-t_print("\n");
-t_print("the expVlavalus is:");
-for(int k=0;k<expVal.getLength();k++)
-{
-    t_print("%c",expVal.pData->buffer[k]);
-}
-t_print("\n");
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append 3.141592653589793",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_013()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr128 );
-            double                  input = atof("3.14159265358979323");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append 3.14159265358979323",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_014()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr129 );
-            double                 input = atof("3.141592653589793238462643");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append 3.141592653589793238462643",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_015()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr81 );
-            double                 input = atof("3.0");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append 3.0",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_016()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr82 );
-            double                 input = atof("3.5");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append 3.5",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_017()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr83 );
-            double                 input = atof("3.0625");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append 3.0625",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_018()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr126 );
-            double                 input = atof("3.1415926535");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append 3.1415926535",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_019()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr127 );
-            double                 input = atof("3.141592653589793");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append 3.141592653589793",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_020()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr128 );
-            double                  input = atof("3.14159265358979323");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append 3.14159265358979323",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_021()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr129 );
-            double                 input = atof("3.141592653589793238462643");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append 3.141592653589793238462643",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_022()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr81 );
-            double                 input = atof("3.0");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[3] append 3.0",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_023()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr82 );
-            double                 input = atof("3.5");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[3] append 3.5",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_024()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr83 );
-            double                 input = atof("3.0625");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[3] append 3.0625",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_025()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr126 );
-            double                 input = atof("3.1415926535");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[3] append 3.1415926535",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_026()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr127 );
-            double                 input = atof("3.141592653589793");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[3] append 3.141592653589793",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_027()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr128 );
-            double                  input = atof("3.14159265358979323");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append 3.14159265358979323",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_028()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr129 );
-            double                 input = atof("3.141592653589793238462643");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[3] append 3.141592653589793238462643",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_029()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            OString                expVal( kTestStr88 );
-            double                 input = atof("3.0");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[4] append 3.0",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_030()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            OString                expVal( kTestStr89 );
-            double                 input = atof("3.5");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[4] append 3.5",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_031()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            OString                expVal( kTestStr90 );
-            double                 input = atof("3.0625");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[4] append 3.0625",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_032()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            OString                expVal( kTestStr130 );
-            double                 input = atof("3.1415926535");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[4] append 3.1415926535",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_033()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            OString                expVal( kTestStr131 );
-            double                 input = atof("3.141592653589793");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[4] append 3.141592653589793",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_034()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            OString                expVal( kTestStr132 );
-            double                  input = atof("3.14159265358979323");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[4] append 3.14159265358979323",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-*/
         void append_035()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr133 );
             double                 input = atof("3.141592653589793238462643");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -17468,159 +16475,13 @@ t_print("\n");
             );
 
         }
-/*
-#ifdef WITH_CORE
-        void append_036()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr81 );
-            double                 input = atof("3.0");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append 3.0",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_037()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr82 );
-            double                 input = atof("3.5");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append 3.5",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_038()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr83 );
-            double                 input = atof("3.0625");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append 3.0625",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_039()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr126 );
-            double                 input = atof("3.1415926535");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append 3.1415926535",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_040()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr127 );
-            double                 input = atof("3.141592653589793";
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append 3.141592653589793",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_041()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr128 );
-            double                 input = atof("3.14159265358979323");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append 3.14159265358979323",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_042()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr129 );
-            double                 input = atof("3.141592653589793238462643");
-
-            aStrBuf.append( input );
 
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append 3.141592653589793238462643",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-#endif
-*/
         CPPUNIT_TEST_SUITE( append_009_double );
         CPPUNIT_TEST( append_001 );
-/*
-        CPPUNIT_TEST( append_002 );
-        CPPUNIT_TEST( append_003 );
-        CPPUNIT_TEST( append_004 );
-        CPPUNIT_TEST( append_005 );
-        CPPUNIT_TEST( append_006 );
-        CPPUNIT_TEST( append_007 );
-        CPPUNIT_TEST( append_008 );
-        CPPUNIT_TEST( append_009 );
-        CPPUNIT_TEST( append_010 );
-        CPPUNIT_TEST( append_011 );
-        CPPUNIT_TEST( append_012 );
-        CPPUNIT_TEST( append_013 );
-        CPPUNIT_TEST( append_014 );
-        CPPUNIT_TEST( append_015 );
-        CPPUNIT_TEST( append_016 );
-        CPPUNIT_TEST( append_017 );
-        CPPUNIT_TEST( append_018 );
-        CPPUNIT_TEST( append_019 );
-        CPPUNIT_TEST( append_020 );
-        CPPUNIT_TEST( append_021 );
-        CPPUNIT_TEST( append_022 );
-        CPPUNIT_TEST( append_023 );
-        CPPUNIT_TEST( append_024 );
-        CPPUNIT_TEST( append_025 );
-#ifdef WITH_CORE
-        CPPUNIT_TEST( append_026 );
-        CPPUNIT_TEST( append_027 );
-        CPPUNIT_TEST( append_028 );
-        CPPUNIT_TEST( append_029 );
-        CPPUNIT_TEST( append_030 );
-#endif
-*/
         CPPUNIT_TEST( append_035 );
         CPPUNIT_TEST_SUITE_END();
     };
+
 //------------------------------------------------------------------------
 // testing the method append( double f ) for negative value
 //------------------------------------------------------------------------
@@ -17648,7 +16509,6 @@ t_print("\n");
         void append_001()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            // LLA: OString                expVal( kTestStr95 );
             double                 input = atof("-3.0");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -17661,586 +16521,10 @@ t_print("\n");
             );
 
         }
-/*
-        void append_002()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            OString                expVal( kTestStr96 );
-            double                 input = atof("-3.5");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[0] append -3.5",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_003()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            OString                expVal( kTestStr97 );
-            double                 input = atof("-3.0625");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[0] append -3.0625",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_004()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            OString                expVal( kTestStr98 );
-            double                 input = atof("-3.502525");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[0] append -3.502525",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_005()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            OString                expVal( kTestStr134 );
-            double                 input = atof("-3.141592653589793");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[0] append -3.141592653589793",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
 
-        void append_006()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            OString                expVal( kTestStr135 );
-            double                  input = atof("-3.14159265358979323");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[0] append -3.14159265358979323",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_007()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[0] );
-            OString                expVal( kTestStr136 );
-            double                 input = atof("-3.141592653589793238462643");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[0] append -3.141592653589793238462643",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_008()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr102 );
-            double                 input = atof("-3.0");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append -3.0",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_009()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr103 );
-            double                 input = atof("-3.5");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append -3.5",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_010()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr104 );
-            double                 input = atof("-3.0625");
-
-            aStrBuf.append( input );
-            OString     *result = new OString( aStrBuf.getStr());
-            double      output = result->toDouble();
-            OString     *final = new OString();
-            *final = final->valueOf(output);
-t_print("the OStringvalus is:");
-for(int m=0;m<final->getLength();m++)
-{
-    t_print("%c",final->pData->buffer[m]);
-}
-t_print("\n");
-t_print("the OStringBuffer is %d\n", aStrBuf.getLength());
-t_print("the expVal is %d\n", expVal.getLength());
-t_print("the OStringbuffervalus is:");
-for(int j=0;j<aStrBuf.getLength();j++)
-{
-    t_print("%c",*(aStrBuf.getStr()+j));
-}
-t_print("\n");
-t_print("the expVlavalus is:");
-for(int k=0;k<expVal.getLength();k++)
-{
-    t_print("%c",expVal.pData->buffer[k]);
-}
-t_print("\n");
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append -3.0625",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_011()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr105 );
-            double                 input = atof("-3.502525");
-
-            aStrBuf.append( input );
-
-            double      output = atof("-3.50252");
-            OString     *final = new OString();
-            *final = final->valueOf(output);
-t_print("the OStringvalus is:");
-for(int m=0;m<final->getLength();m++)
-{
-    t_print("%c",final->pData->buffer[m]);
-}
-t_print("\n");
-t_print("the OStringBuffer is %d\n", aStrBuf.getLength());
-t_print("the expVal is %d\n", expVal.getLength());
-t_print("the OStringbuffervalus is:");
-for(int j=0;j<aStrBuf.getLength();j++)
-{
-    t_print("%c",*(aStrBuf.getStr()+j));
-}
-t_print("\n");
-t_print("the expVlavalus is:");
-for(int k=0;k<expVal.getLength();k++)
-{
-    t_print("%c",expVal.pData->buffer[k]);
-}
-t_print("\n");
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append -3.502525",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_012()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr137 );
-            double                 input = atof("-3.141592653589793");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append -3.141592653589793",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_013()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr138 );
-            double                  input = atof("-3.14159265358979323");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append -3.14159265358979323",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_014()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[1] );
-            OString                expVal( kTestStr139 );
-            double                 input = atof("-3.141592653589793238462643");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append -3.141592653589793238462643",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_015()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr102 );
-            double                 input = atof("-3.0");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append -3.0",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_016()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr103 );
-            double                 input = atof("-3.5");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append -3.5",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_017()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr104 );
-            double                 input = atof("-3.0625");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append -3.0625",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_018()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr105 );
-            double                 input = atof("-3.502525");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append -3.502525",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_019()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr137 );
-            double                 input = atof("-3.141592653589793");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append -3.141592653589793",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_020()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr138 );
-            double                  input = atof("-3.14159265358979323");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append -3.14159265358979323",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_021()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[2] );
-            OString                expVal( kTestStr139 );
-            double                 input = atof("-3.141592653589793238462643");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[2] append -3.141592653589793238462643",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_022()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr102 );
-            double                 input = atof("-3.0");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[3] append -3.0",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_023()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr103 );
-            double                 input = atof("-3.5");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[3] append -3.5",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_024()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr104 );
-            double                 input = atof("-3.0625");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[3] append -3.0625",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_025()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr105 );
-            double                 input = atof("-3.502525");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[3] append -3.502525",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_026()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr137 );
-            double                 input = atof("-3.141592653589793");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[3] append -3.141592653589793",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_027()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr138 );
-            double                  input = atof("-3.14159265358979323");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[1] append -3.14159265358979323",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_028()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[3] );
-            OString                expVal( kTestStr139 );
-            double                 input = atof("-3.141592653589793238462643");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[3] append -3.141592653589793238462643",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_029()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            OString                expVal( kTestStr109 );
-            double                 input = atof("-3.0");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[4] append -3.0",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_030()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            OString                expVal( kTestStr110 );
-            double                 input = atof("-3.5");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[4] append -3.5",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_031()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            OString                expVal( kTestStr111 );
-            double                 input = atof("-3.0625");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[4] append -3.0625",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_032()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            OString                expVal( kTestStr112 );
-            double                 input = atof("-3.502525");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[4] append -3.502525",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_033()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            OString                expVal( kTestStr140 );
-            double                 input = atof("-3.141592653589793");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[4] append -3.141592653589793",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_034()
-        {
-            ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            OString                expVal( kTestStr141 );
-            double                  input = atof("-3.14159265358979323");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "arrOUS[4] append -3.14159265358979323",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-*/
         void append_035()
         {
             ::rtl::OStringBuffer   aStrBuf( *arrOUS[4] );
-            // LLA: OString                expVal( kTestStr142 );
             double                 input = atof("-3.141592653589793238462643");
 
             sal_Int32 nLen = aStrBuf.getLength();
@@ -18253,162 +16537,14 @@ t_print("\n");
             );
 
         }
-/*
-#ifdef WITH_CORE
-        void append_036()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr102 );
-            double                 input = atof("-3.0");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append -3.0",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
 
-        void append_037()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr103 );
-            double                 input = atof("-3.5");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append -3.5",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_038()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr104 );
-            double                 input = atof("-3.0625");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append -3.0625",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_039()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr105 );
-            double                 input = atof("-3.502525");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append -3.502525",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_040()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr137 );
-            double                 input = atof("-3.141592653589793");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append -3.141592653589793",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_041()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr138 );
-            double                 input = atof("-3.14159265358979323");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append -3.14159265358979323",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-
-        void append_042()
-        {
-            ::rtl::OStringBuffer   aStrBuf( kSInt32Max );
-            OString                expVal( kTestStr139 );
-            double                 input = atof("-3.141592653589793238462643");
-
-            aStrBuf.append( input );
-
-            CPPUNIT_ASSERT_MESSAGE
-            (
-                "OStringBuffer( kSInt32Max ) append -3.141592653589793238462643",
-                aStrBuf == expVal && aStrBuf.getLength() == expVal.getLength()
-            );
-
-        }
-#endif
-*/
         CPPUNIT_TEST_SUITE( append_009_Double_Negative );
         CPPUNIT_TEST( append_001 );
-/*
-        CPPUNIT_TEST( append_002 );
-        CPPUNIT_TEST( append_003 );
-        CPPUNIT_TEST( append_004 );
-        CPPUNIT_TEST( append_005 );
-        CPPUNIT_TEST( append_006 );
-        CPPUNIT_TEST( append_007 );
-        CPPUNIT_TEST( append_008 );
-        CPPUNIT_TEST( append_009 );
-        CPPUNIT_TEST( append_010 );
-        CPPUNIT_TEST( append_011 );
-        CPPUNIT_TEST( append_012 );
-        CPPUNIT_TEST( append_013 );
-        CPPUNIT_TEST( append_014 );
-        CPPUNIT_TEST( append_015 );
-        CPPUNIT_TEST( append_016 );
-        CPPUNIT_TEST( append_017 );
-        CPPUNIT_TEST( append_018 );
-        CPPUNIT_TEST( append_019 );
-        CPPUNIT_TEST( append_020 );
-        CPPUNIT_TEST( append_021 );
-        CPPUNIT_TEST( append_022 );
-        CPPUNIT_TEST( append_023 );
-        CPPUNIT_TEST( append_024 );
-        CPPUNIT_TEST( append_025 );
-#ifdef WITH_CORE
-        CPPUNIT_TEST( append_026 );
-        CPPUNIT_TEST( append_027 );
-        CPPUNIT_TEST( append_028 );
-        CPPUNIT_TEST( append_029 );
-        CPPUNIT_TEST( append_030 );
-#endif
-*/
         CPPUNIT_TEST( append_035 );
         CPPUNIT_TEST_SUITE_END();
     };
 } // namespace rtl_OStringBuffer
 
-
 // -----------------------------------------------------------------------------
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::ctors);
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::makeStringAndClear);
diff --git a/sal/qa/rtl/digest/makefile.mk b/sal/qa/rtl/digest/makefile.mk
index 415183b7e9a0..feb76ffe2d40 100644
--- a/sal/qa/rtl/digest/makefile.mk
+++ b/sal/qa/rtl/digest/makefile.mk
@@ -29,8 +29,6 @@ INCPRE+= $(PRJ)$/qa$/inc
 
 PRJNAME=sal
 TARGET=rtl_digest
-# this is removed at the moment because we need some enhancements
-# TESTDIR=TRUE
 
 ENABLE_EXCEPTIONS=TRUE
 
@@ -38,10 +36,15 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
-CFLAGS+= $(LFS_CFLAGS)
-CXXFLAGS+= $(LFS_CFLAGS)
+#building with stlport, but cppunit was not built with stlport
+.IF "$(USE_SYSTEM_STL)"!="YES"
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGSCXX+=-DADAPT_EXT_STL
+.ENDIF
+.ENDIF
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
+DLLPRE = # no leading "lib" on .so files
 
 #----------------------------------- OStringBuffer -----------------------------------
 
@@ -56,8 +59,8 @@ DEF1NAME=    $(SHL1TARGET)
 SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 
 #------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
+SLOFILES= \
+    $(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------
 
diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx
index 8a5c0a5e8465..e8da82fd9ef8 100644
--- a/sal/qa/rtl/digest/rtl_digest.cxx
+++ b/sal/qa/rtl/digest/rtl_digest.cxx
@@ -29,13 +29,21 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
-#include <testshl/simpleheader.hxx>
+
+#include "preextstl.h"
+#include <cppunit/TestAssert.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+#include "postextstl.h"
 
 #include <rtl/digest.h>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/strbuf.hxx>
 
+#include <string.h>
+
 // sample, how to use digest
 
 rtl::OUString CreateMD5FromString( const rtl::OUString& aMsg )
@@ -58,7 +66,7 @@ rtl::OUString CreateMD5FromString( const rtl::OUString& aMsg )
 
         // Create hex-value string from the MD5 value to keep the string size minimal
         rtl::OUStringBuffer aBuffer( nMD5KeyLen * 2 + 1 );
-        for ( sal_uInt32 i = 0; i < nMD5KeyLen; i++ )
+        for ( sal_uInt32 i = 0; i < nMD5KeyLen; ++i )
             aBuffer.append( (sal_Int32)pMD5KeyBuffer[i], 16 );
 
         delete [] pMD5KeyBuffer;
@@ -134,7 +142,7 @@ public:
     void create_007()
         {
             rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmInvalid );
-            t_print("Handle is %x\n", handle);
+            printf("Handle is %p\n", handle);
             CPPUNIT_ASSERT_MESSAGE("create with NULL", handle == 0);
             rtl_digest_destroy( handle );
         }
@@ -437,7 +445,7 @@ public:
             rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmMD5 );
 
             sal_uInt32 nAlgoLength = rtl_digest_queryLength(handle);
-            // t_print("nAlgoLength:=%d\n", nAlgoLength);
+            // printf("nAlgoLength:=%d\n", nAlgoLength);
             CPPUNIT_ASSERT_MESSAGE("query Length", RTL_DIGEST_LENGTH_MD5 == nAlgoLength);
 
             rtl_digest_destroy( handle );
@@ -447,7 +455,7 @@ public:
             rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmMD2 );
 
             sal_uInt32 nAlgoLength = rtl_digest_queryLength(handle);
-            // t_print("nAlgoLength:=%d\n", nAlgoLength);
+            // printf("nAlgoLength:=%d\n", nAlgoLength);
             CPPUNIT_ASSERT_MESSAGE("query length", RTL_DIGEST_LENGTH_MD2 == nAlgoLength);
 
             rtl_digest_destroy( handle );
@@ -457,7 +465,7 @@ public:
             rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmSHA );
 
             sal_uInt32 nAlgoLength = rtl_digest_queryLength(handle);
-            // t_print("nAlgoLength:=%d\n", nAlgoLength);
+            // printf("nAlgoLength:=%d\n", nAlgoLength);
             CPPUNIT_ASSERT_MESSAGE("query length", RTL_DIGEST_LENGTH_SHA == nAlgoLength);
 
             rtl_digest_destroy( handle );
@@ -467,7 +475,7 @@ public:
             rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmSHA1 );
 
             sal_uInt32 nAlgoLength = rtl_digest_queryLength(handle);
-            // t_print("nAlgoLength:=%d\n", nAlgoLength);
+            // printf("nAlgoLength:=%d\n", nAlgoLength);
             CPPUNIT_ASSERT_MESSAGE("query length", RTL_DIGEST_LENGTH_SHA1 == nAlgoLength);
 
             rtl_digest_destroy( handle );
@@ -477,7 +485,7 @@ public:
             rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmHMAC_MD5 );
 
             sal_uInt32 nAlgoLength = rtl_digest_queryLength(handle);
-            // t_print("nAlgoLength:=%d\n", nAlgoLength);
+            // printf("nAlgoLength:=%d\n", nAlgoLength);
             CPPUNIT_ASSERT_MESSAGE("query length", RTL_DIGEST_LENGTH_HMAC_MD5 == nAlgoLength);
 
             rtl_digest_destroy( handle );
@@ -487,7 +495,7 @@ public:
             rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmHMAC_SHA1 );
 
             sal_uInt32 nAlgoLength = rtl_digest_queryLength(handle);
-            // t_print("nAlgoLength:=%d\n", nAlgoLength);
+            // printf("nAlgoLength:=%d\n", nAlgoLength);
             CPPUNIT_ASSERT_MESSAGE("query length", RTL_DIGEST_LENGTH_HMAC_SHA1 == nAlgoLength);
 
             rtl_digest_destroy( handle );
@@ -498,7 +506,7 @@ public:
             rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmInvalid );
 
             sal_uInt32 nAlgoLength = rtl_digest_queryLength(handle);
-            // t_print("nAlgoLength:=%d\n", nAlgoLength);
+            // printf("nAlgoLength:=%d\n", nAlgoLength);
             CPPUNIT_ASSERT_MESSAGE("query length", 0 == nAlgoLength);
 
             rtl_digest_destroy( handle );
@@ -525,13 +533,11 @@ rtl::OString createHex(sal_uInt8 *_pMD5KeyBuffer, sal_uInt32 _nMD5KeyLen)
 {
     // Create hex-value string from the MD5 value to keep the string size minimal
     rtl::OStringBuffer aBuffer( _nMD5KeyLen * 2 + 1 );
-    for ( sal_uInt32 i = 0; i < _nMD5KeyLen; i++ )
+    for ( sal_uInt32 i = 0; i < _nMD5KeyLen; ++i )
     {
         sal_Int32 nValue = (sal_Int32)_pMD5KeyBuffer[i];
         if (nValue < 16)                         // maximul hex value for 1 byte
-        {
-            aBuffer.append( sal_Int32(0), 16 /* radix */ );
-        }
+            aBuffer.append( static_cast<sal_Int32>(0), static_cast<sal_Int16>(16) /* radix */ );
         aBuffer.append( nValue, 16 /* radix */ );
     }
 
@@ -594,7 +600,7 @@ public:
             rtl::OString aSum = createHex(pKeyBuffer, nKeyLen);
             delete [] pKeyBuffer;
 
-            t_print("MD2 Sum: %s\n", aSum.getStr());
+            printf("MD2 Sum: %s\n", aSum.getStr());
             // LLA: how to check right values
             // samples?
 
@@ -622,7 +628,7 @@ public:
             rtl::OString aSum = createHex(pKeyBuffer, nKeyLen);
             delete [] pKeyBuffer;
 
-            t_print("MD5 Sum: %s\n", aSum.getStr());
+            printf("MD5 Sum: %s\n", aSum.getStr());
             // LLA: how to check right values
             // samples?
 
@@ -650,7 +656,7 @@ public:
             rtl::OString aSum = createHex(pKeyBuffer, nKeyLen);
             delete [] pKeyBuffer;
 
-            t_print("SHA Sum: %s\n", aSum.getStr());
+            printf("SHA Sum: %s\n", aSum.getStr());
             // LLA: how to check right values
             // samples?
 
@@ -677,7 +683,7 @@ public:
             rtl::OString aSum = createHex(pKeyBuffer, nKeyLen);
             delete [] pKeyBuffer;
 
-            t_print("SHA1 Sum: %s\n", aSum.getStr());
+            printf("SHA1 Sum: %s\n", aSum.getStr());
             // LLA: how to check right values
             // samples?
 
@@ -708,7 +714,7 @@ public:
             rtl::OString aSum = createHex(pKeyBuffer, nKeyLen);
             delete [] pKeyBuffer;
 
-            t_print("HMAC_MD5 Sum: %s\n", aSum.getStr());
+            printf("HMAC_MD5 Sum: %s\n", aSum.getStr());
             // LLA: how to check right values
             // samples?
 
@@ -739,7 +745,7 @@ public:
             rtl::OString aSum = createHex(pKeyBuffer, nKeyLen);
             delete [] pKeyBuffer;
 
-            t_print("HMAC_SHA1 Sum: %s\n", aSum.getStr());
+            printf("HMAC_SHA1 Sum: %s\n", aSum.getStr());
             // LLA: how to check right values
             // samples?
 
@@ -866,7 +872,7 @@ public:
             CPPUNIT_ASSERT(aError == rtl_Digest_E_None );
 
             rtl::OString aStr = createHex(pBuffer, RTL_DIGEST_LENGTH_MD2);
-            t_print("Decrypt MD2: %s\n", aStr.getStr());
+            printf("Decrypt MD2: %s\n", aStr.getStr());
             CPPUNIT_ASSERT_MESSAGE("checksum of sample string is wrong. Code changes or sample problems, please check.", aStr.equals(sSampleString_MD2) );
 
             delete [] pBuffer;
@@ -909,7 +915,7 @@ public:
             CPPUNIT_ASSERT(aError == rtl_Digest_E_None );
 
             rtl::OString aStr = createHex(pBuffer, RTL_DIGEST_LENGTH_MD5);
-            t_print("Decrypt MD5: %s\n", aStr.getStr());
+            printf("Decrypt MD5: %s\n", aStr.getStr());
             CPPUNIT_ASSERT_MESSAGE("checksum of sample string is wrong. Code changes or sample problems, please check.", aStr.equals(sSampleString_MD5) );
 
             delete [] pBuffer;
@@ -954,7 +960,7 @@ public:
             CPPUNIT_ASSERT(aError == rtl_Digest_E_None );
 
             rtl::OString aStr = createHex(pBuffer, RTL_DIGEST_LENGTH_SHA);
-            t_print("Decrypt SHA: %s\n", aStr.getStr());
+            printf("Decrypt SHA: %s\n", aStr.getStr());
             CPPUNIT_ASSERT_MESSAGE("checksum of sample string is wrong. Code changes or sample problems, please check.", aStr.equals(sSampleString_SHA) );
 
             delete [] pBuffer;
@@ -999,7 +1005,7 @@ public:
             CPPUNIT_ASSERT(aError == rtl_Digest_E_None );
 
             rtl::OString aStr = createHex(pBuffer, RTL_DIGEST_LENGTH_SHA1);
-            t_print("Decrypt SHA1: %s\n", aStr.getStr());
+            printf("Decrypt SHA1: %s\n", aStr.getStr());
             CPPUNIT_ASSERT_MESSAGE("checksum of sample string is wrong. Code changes or sample problems, please check.", aStr.equals(sSampleString_SHA1) );
 
             delete [] pBuffer;
@@ -1046,7 +1052,7 @@ public:
             CPPUNIT_ASSERT(aError == rtl_Digest_E_None );
 
             rtl::OString aStr = createHex(pBuffer, RTL_DIGEST_LENGTH_HMAC_MD5);
-            t_print("Decrypt HMAC_MD5: %s\n", aStr.getStr());
+            printf("Decrypt HMAC_MD5: %s\n", aStr.getStr());
             CPPUNIT_ASSERT_MESSAGE("md5sum of sample string is wrong. Code changes or sample problems, please check.", aStr.equals(sSampleString_HMAC_MD5) );
 
             delete [] pBuffer;
@@ -1093,7 +1099,7 @@ public:
             CPPUNIT_ASSERT(aError == rtl_Digest_E_None );
 
             rtl::OString aStr = createHex(pBuffer, RTL_DIGEST_LENGTH_HMAC_SHA1);
-            t_print("Decrypt HMAC_SHA1: %s\n", aStr.getStr());
+            printf("Decrypt HMAC_SHA1: %s\n", aStr.getStr());
             CPPUNIT_ASSERT_MESSAGE("md5sum of sample string is wrong. Code changes or sample problems, please check.", aStr.equals(sSampleString_HMAC_SHA1) );
 
             delete [] pBuffer;
@@ -1147,10 +1153,10 @@ public:
             CPPUNIT_ASSERT(aError == rtl_Digest_E_None );
 
             rtl::OString aKey = createHex(pKeyBuffer, nKeyLen);
-            t_print("Key: %s\n", aKey.getStr());
+            printf("Key: %s\n", aKey.getStr());
 
             // rtl::OString sSalt = createHex(pSaltData, nSaltDataLen);
-            // t_print("Salt: %s\n", sSalt.getStr());
+            // printf("Salt: %s\n", sSalt.getStr());
 
             // CPPUNIT_ASSERT_MESSAGE("md5sum of sample string is wrong. Code changes or sample problems, please check.", aStr.equals(sSampleString_PBKDF2) );
 
@@ -1416,39 +1422,34 @@ public:
 }; // class create
 // -----------------------------------------------------------------------------
 
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::create, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::createMD2, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::createMD5, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::createSHA, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::createSHA1, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::createHMAC_MD5, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::createHMAC_SHA1, "rtl_digest");
-
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::destroy, "rtl_digest");
-
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::queryAlgorithm, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::queryLength, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::init, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::equalTests, "rtl_digest");
-
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::digest_MD2, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::digest_MD5, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::digest_SHA, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::digest_SHA1, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::digest_HMAC_MD5, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::digest_HMAC_SHA1, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::digest_PBKDF2, "rtl_digest");
-
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::update, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::get, "rtl_digest");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_digest::destroy, "rtl_digest");
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::create);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::createMD2);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::createMD5);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::createSHA);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::createSHA1);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::createHMAC_MD5);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::createHMAC_SHA1);
+
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::destroy);
+
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::queryAlgorithm);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::queryLength);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::init);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::equalTests);
+
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::digest_MD2);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::digest_MD5);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::digest_SHA);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::digest_SHA1);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::digest_HMAC_MD5);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::digest_HMAC_SHA1);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::digest_PBKDF2);
+
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::update);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::get);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::destroy);
 } // namespace rtl_digest
 
-
-// -----------------------------------------------------------------------------
-
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/random/makefile.mk b/sal/qa/rtl/random/makefile.mk
index cd57ec9bcc13..cb79ff90a770 100644
--- a/sal/qa/rtl/random/makefile.mk
+++ b/sal/qa/rtl/random/makefile.mk
@@ -28,8 +28,6 @@ PRJ=..$/..$/..
 
 PRJNAME=sal
 TARGET=qa_rtl_random
-# this is removed at the moment because we need some enhancements
-# TESTDIR=TRUE
 
 ENABLE_EXCEPTIONS=TRUE
 
@@ -37,13 +35,16 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
-CFLAGS+= $(LFS_CFLAGS)
-CXXFLAGS+= $(LFS_CFLAGS)
+#building with stlport, but cppunit was not built with stlport
+.IF "$(USE_SYSTEM_STL)"!="YES"
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGSCXX+=-DADAPT_EXT_STL
+.ENDIF
+.ENDIF
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
+DLLPRE = # no leading "lib" on .so files
 
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:job by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/rtl_random.obj
 
@@ -53,12 +54,10 @@ SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
 SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
-# auto generated Target:job
-# END ------------------------------------------------------------------
 
 #------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
+SLOFILES= \
+    $(SHL1OBJS)
 
 # --- Targets ------------------------------------------------------
 
diff --git a/sal/qa/rtl/random/rtl_random.cxx b/sal/qa/rtl/random/rtl_random.cxx
index 3b9442bea115..9a4690543599 100644
--- a/sal/qa/rtl/random/rtl_random.cxx
+++ b/sal/qa/rtl/random/rtl_random.cxx
@@ -29,13 +29,21 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
-// autogenerated file with codegen.pl
 
-#include <algorithm> // STL
+#include <algorithm>
 
-#include <testshl/simpleheader.hxx>
+#include "preextstl.h"
+#include <cppunit/TestAssert.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+#include "postextstl.h"
+
+#include <osl/diagnose.h>
 #include <rtl/random.h>
 
+#include <string.h>
+
 namespace rtl_random
 {
 
@@ -161,7 +169,7 @@ public:
 
             rtl_random_addBytes(aPool, pBuffer, nBufLen);
 
-            t_print("%2x %2x %2x %2x\n", pBuffer[0], pBuffer[1], pBuffer[2], pBuffer[3]);
+            printf("%2x %2x %2x %2x\n", pBuffer[0], pBuffer[1], pBuffer[2], pBuffer[3]);
 
             rtl_random_destroyPool(aPool);
             delete [] pBuffer;
@@ -191,57 +199,62 @@ class Statistics
 
 public:
     void clearDispensation()
+    {
+        for (int i = 0;i < 256;++i)                        // clear array
         {
-            for (int i = 0;i < 256;i ++)                        // clear array
-            {
-                m_nDispensation[i] = 0;
-            }
+            m_nDispensation[i] = 0;
         }
+    }
     Statistics()
-        {
-            clearDispensation();
-        }
+    : m_nMin(0)
+    , m_nMax(0)
+    , m_nAverage(0)
+    , m_nMinDeviation(0)
+    , m_nMaxDeviation(0)
+    {
+        clearDispensation();
+    }
     ~Statistics(){}
 
     void addValue(sal_Int16 _nIndex, sal_Int32 _nValue)
-        {
-            OSL_ASSERT(_nIndex >= 0 && _nIndex < 256);
-            m_nDispensation[_nIndex] += _nValue;
-        }
+    {
+        OSL_ASSERT(_nIndex >= 0 && _nIndex < 256);
+        m_nDispensation[_nIndex] += _nValue;
+    }
 
     void build(sal_Int32 _nCountMax)
-        {
-            m_nMin = _nCountMax;
-            m_nMax = 0;
+    {
+        m_nMin = _nCountMax;
+        m_nMax = 0;
 
-            m_nAverage = _nCountMax / 256;
+        m_nAverage = _nCountMax / 256;
 
-            m_nMinDeviation = _nCountMax;
-            m_nMaxDeviation = 0;
+        m_nMinDeviation = _nCountMax;
+        m_nMaxDeviation = 0;
 
-            for (int i = 0;i < 256;i ++)                        // show dispensation
-            {
-                m_nMin = std::min(m_nMin, m_nDispensation[i]);
-                m_nMax = std::max(m_nMax, m_nDispensation[i]);
+        for (int i = 0;i < 256;++i)                        // show dispensation
+        {
+            m_nMin = std::min(m_nMin, m_nDispensation[i]);
+            m_nMax = std::max(m_nMax, m_nDispensation[i]);
 
-                m_nMinDeviation = std::min(m_nMinDeviation, abs(m_nAverage - m_nDispensation[i]));
-                m_nMaxDeviation = std::max(m_nMaxDeviation, abs(m_nAverage - m_nDispensation[i]));
-            }
+            m_nMinDeviation = std::min(m_nMinDeviation, abs(m_nAverage - m_nDispensation[i]));
+            m_nMaxDeviation = std::max(m_nMaxDeviation, abs(m_nAverage - m_nDispensation[i]));
         }
+    }
 
     void print()
-        {
-            // LLA: these are only info values
-            t_print("\nSome statistics\n");
-            t_print("Min: %d\n", m_nMin);
-            t_print("Max: %d\n", m_nMax);
-            t_print("Average: %d\n", m_nAverage);
-            t_print("Min abs deviation: %d\n", m_nMinDeviation);
-            t_print("Max abs deviation: %d\n", m_nMaxDeviation);
-        }
+    {
+        // LLA: these are only info values
+        printf("\nSome statistics\n");
+        printf("Min: %d\n", m_nMin);
+        printf("Max: %d\n", m_nMax);
+        printf("Average: %d\n", m_nAverage);
+        printf("Min abs deviation: %d\n", m_nMinDeviation);
+        printf("Max abs deviation: %d\n", m_nMaxDeviation);
+    }
 
-    sal_Int32 getAverage() {return m_nAverage;}
-    sal_Int32 getMaxDeviation() {return m_nMaxDeviation;}
+    sal_Int32 getAverage() const {return m_nAverage;}
+    sal_Int32 getMaxDeviation() const {return m_nMaxDeviation;}
 
 };
 
@@ -290,7 +303,7 @@ public:
         rtlRandomError aError = rtl_random_getBytes(aPool, pBuffer, nBufLen);
         CPPUNIT_ASSERT_MESSAGE("wrong parameter", aError == rtl_Random_E_None);
 
-        t_print("%2x %2x %2x %2x\n", pBuffer[0], pBuffer[1], pBuffer[2], pBuffer[3]);
+        printf("%2x %2x %2x %2x\n", pBuffer[0], pBuffer[1], pBuffer[2], pBuffer[3]);
 
         rtl_random_destroyPool(aPool);
         delete [] pBuffer;
@@ -309,7 +322,7 @@ public:
         rtlRandomError aError = rtl_random_getBytes(aPool, pBuffer, nBufLen);
         CPPUNIT_ASSERT_MESSAGE("wrong parameter", aError == rtl_Random_E_None);
 
-        t_print("%2x %2x %2x %2x %2x %2x %2x %2x\n", pBuffer[0], pBuffer[1], pBuffer[2], pBuffer[3], pBuffer[4], pBuffer[5], pBuffer[6], pBuffer[7]);
+        printf("%2x %2x %2x %2x %2x %2x %2x %2x\n", pBuffer[0], pBuffer[1], pBuffer[2], pBuffer[3], pBuffer[4], pBuffer[5], pBuffer[6], pBuffer[7]);
 
         CPPUNIT_ASSERT_MESSAGE("internal memory overwrite", pBuffer[4] == 0 && pBuffer[5] == 0 && pBuffer[6] == 0 && pBuffer[7] == 0);
 
@@ -332,7 +345,7 @@ public:
         int nCount = 0;
 
         int nCountMax = 1000000;
-        for(nCount = 0;nCount < nCountMax; nCount ++)                  // run 100000000 through getBytes(...)
+        for(nCount = 0;nCount < nCountMax; ++nCount)                  // run 100000000 through getBytes(...)
         {
             /* rtlRandomError aError = */ rtl_random_getBytes(aPool, pBuffer, nBufLen);
             /* CPPUNIT_ASSERT_MESSAGE("wrong parameter", aError == rtl_Random_E_None); */
@@ -364,15 +377,13 @@ public:
         int nCount = 0;
 
         int nCountMax = 10000;
-        for(nCount = 0;nCount < nCountMax; nCount ++)                  // run 100000000 through getBytes(...)
+        for(nCount = 0;nCount < nCountMax; ++nCount)                  // run 100000000 through getBytes(...)
         {
             /* rtlRandomError aError = */ rtl_random_getBytes(aPool, pBuffer, nBufLen);
             // CPPUNIT_ASSERT_MESSAGE("wrong parameter", aError == rtl_Random_E_None);
 
-            for (sal_uInt32 i=0;i<nBufLen;i++)
-            {
+            for (sal_uInt32 i=0;i<nBufLen;++i)
                 aStat.addValue(pBuffer[i], 1);
-            }
         }
 
         aStat.build(nCountMax * nBufLen);
@@ -398,17 +409,12 @@ public:
 }; // class getBytes
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_random::createPool, "rtl_random");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_random::destroyPool, "rtl_random");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_random::addBytes, "rtl_random");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_random::getBytes, "rtl_random");
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_random::createPool);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_random::destroyPool);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_random::addBytes);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_random::getBytes);
 } // namespace rtl_random
 
-
-// -----------------------------------------------------------------------------
-
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx b/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
index 147604bb7cf7..17a364744745 100644
--- a/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
+++ b/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
@@ -33,7 +33,6 @@
     #include <sal/types.h>
 #endif
 
-//     #include <rtl/tres.h>
 #include <testshl/tresstatewrapper.hxx>
 
 #ifndef _RTL_STRING_HXX_
@@ -55,8 +54,7 @@
 #ifndef _RTL_USTRBUF_HXX
         #include <rtl/ustrbuf.hxx>
 #endif
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
+
 #ifndef _OSL_THREAD_H_
     #include <osl/thread.h>
 #endif
@@ -151,11 +149,7 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_ctor_003(
                                                hTestResult hRtlTestResult )
 {
     ::rtl::OUStringBuffer aUStrBuf1(kTestStr2Len);
-#ifdef WITH_CORE
-    ::rtl::OUStringBuffer aUStrBuf2(kSInt32Max);     //will core dump
-#else
     ::rtl::OUStringBuffer aUStrBuf2(0);
-#endif
     ::rtl::OUStringBuffer aUStrBuf3(kNonSInt32Max);
 
 
@@ -164,13 +158,9 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_ctor_003(
         ! *(aUStrBuf1.getStr()) && aUStrBuf1.getCapacity() == kTestStr2Len ;
 
     bool b2 =
-#ifdef WITH_CORE
-        aUStrBuf2.getLength() == 0 &&
-        ! *(aUStrBuf2.getStr()) && aUStrBuf2.getCapacity() == kSInt32Max ;
-#else
         aUStrBuf2.getLength() == 0 &&
             ! *(aUStrBuf2.getStr()) && aUStrBuf2.getCapacity() == /* LLA: ??? 16 */ 0;
-#endif
+
     bool b3 =
         aUStrBuf3.getLength() == 0 &&
         ! *(aUStrBuf3.getStr()) && aUStrBuf3.getCapacity() == kNonSInt32Max;
@@ -443,10 +433,6 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_getCapacity(
             new OUStringBuffer(arrOUS[5]) },
         {"capacity of empty string (default constructor)", 16,
                         new OUStringBuffer() },
-#ifdef WITH_CORE
-        {"capacity of empty string (with capacity 2147483647)(code will core dump)", kSInt32Max,
-                        new OUStringBuffer(kSInt32Max) },// will core dump
-#endif
         {"capacity of empty string (with capacity -2147483648)", kNonSInt32Max,
                         new OUStringBuffer(kNonSInt32Max) },
         {"capacity of empty string (with capacity 16)", 16,
@@ -528,24 +514,8 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_ensureCapacity(
       {"capacity equal to 0, minimum is -1", 0,
                         new OUStringBuffer(0), -1},
     */
-#ifdef WITH_CORE
-        {"capacity equal to 2147483647, minimum is 65535", kSInt32Max,//will core dump
-                        new OUStringBuffer(kSInt32Max), 65535},
-        {"capacity equal to 2147483647, minimum is 2147483647", kSInt32Max,//will core dump
-                        new OUStringBuffer(kSInt32Max), kSInt32Max},
-        {"capacity equal to 2147483647, minimum is -1", kSInt32Max,//will core dump
-                        new OUStringBuffer(kSInt32Max), -1},
-        {"capacity equal to 2147483647, minimum is 0", kSInt32Max,//will core dump
-                        new OUStringBuffer(kSInt32Max), 0},
-        {"capacity equal to 2147483647, minimum is -2147483648", kSInt32Max,//will core dump
-                        new OUStringBuffer(kSInt32Max), kNonSInt32Max},
-#endif
         {"capacity equal to -2147483648, minimum is 65535", 65535,
                         new OUStringBuffer(kNonSInt32Max), 65535},
-#ifdef WITH_CORE
-        {"capacity equal to -2147483648, minimum is 2147483647", 2147483647,//will core dump
-                        new OUStringBuffer(kNonSInt32Max), 2147483647},
-#endif
         {"capacity equal to -2147483648, minimum is -1", 2,
                         new OUStringBuffer(kNonSInt32Max), -1},
         {"capacity equal to -2147483648, minimum is 0", 2,
@@ -951,23 +921,6 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUStringBuffer_setCharAt(
     {"set the only of OUStringBuffer(aUStr28) with special character",
                 new OUString(aUStr34),
                 new OUStringBuffer(arrOUS[2]), 1, 5},
-/*
-        {"set the only of OUStringBuffer(aUStr28) with special character",
-                new OUString(aUStr35),
-                new OUStringBuffer(arrOUS[2]), 1, -5}
-*/
-#ifdef WITH_CORE
-    ,{"invalid character of OUStringBuffer()",
-                0,
-                new OUStringBuffer(arrOUS[3]), 0, 5},
-        {"invalid character of OUStringBuffer()",
-                0,
-                new OUStringBuffer(arrOUS[3]), -2, 5},
-        {"invalid character of OUStringBuffer()",
-                0,
-                new OUStringBuffer(arrOUS[3]), 3, 5}
-#endif
-
     };
 
 
@@ -1096,11 +1049,6 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_001(
         {"Appends the string(length equal to 0) to the string buffer arrOUS[4]",
                 new OUString(aUStr28),
                 new OUStringBuffer(arrOUS[4]), new OUString()}
-#ifdef WITH_CORE
-        ,{"Appends the string(length equal to 0) to the string buffer(with INT_MAX) ",
-                new OUString(),
-                new OUStringBuffer(kSInt32Max), new OUString()}
-#endif
     };
 
 
@@ -1218,11 +1166,6 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_002(
         {"Appends the string(length equal to 0) to the string buffer arrOUS[4]",
                 new OUString(aUStr28),
                 new OUStringBuffer(arrOUS[4]), aUStr25 }
-#ifdef WITH_CORE
-        ,{"Appends the string(length equal to 0) to the string buffer(with INT_MAX) ",
-                new OUString(),
-                new OUStringBuffer(kSInt32Max), aUStr25 }
-#endif
     };
 
 
@@ -1361,16 +1304,6 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_003(
         {"Appends the string(length equal to 0) to the string buffer arrOUS[4]",
                 new OUString(aUStr28),
                 new OUStringBuffer(arrOUS[4]), aUStr2, 0 },
-    /* LLA: input3 must null < 0
-      {"Appends the string(length less than 0) to the string buffer arrOUS[4]",
-                new OUString(aUStr42),
-                new OUStringBuffer(arrOUS[4]), aUStr2, -1 }
-    */
-#ifdef WITH_CORE
-        ,{"Appends the string(length equal to 0) to the string buffer(with INT_MAX) ",
-                new OUString(),
-                new OUStringBuffer(kSInt32Max), aUStr25 }
-#endif
     };
 
 
@@ -1459,14 +1392,6 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_004(
         {"Appends the sal_Bool(sal_False) to the string buffer arrOUS[4]",
                 new OUString(aUStr50),
                 new OUStringBuffer(arrOUS[4]), sal_False }
-#ifdef WITH_CORE
-        ,{"Appends the sal_Bool(sal_True) to the string buffer(with INT_MAX) ",
-                new OUString(aUStr47),
-                new OUStringBuffer(kSInt32Max), sal_True },
-        {"Appends the sal_Bool(sal_False) to the string buffer(with INT_MAX) ",
-                new OUString(aUStr48),
-                new OUStringBuffer(kSInt32Max), sal_False }
-#endif
     };
 
 
@@ -1598,15 +1523,6 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_appendAscii_001(
         {"Appends the string(length equal to 0) to the string buffer arrOUS[4]",
                 new OUString(aUStr28),
                 new OUStringBuffer(arrOUS[4]), kTestStr25 }
-        /*{"Appends the string(with special characters) to the string buffer arrOUS[4]",
-                new OUString(aUStr43),
-                new OUStringBuffer(arrOUS[4]), kTestStr44 }*/
-#ifdef WITH_CORE
-        ,{"Appends the string(length equal to 0) to the string buffer(with INT_MAX) ",
-                new OUString(),
-                new OUStringBuffer(kSInt32Max), kTestStr25 }
-#endif
-
     };
 
 
@@ -1743,16 +1659,6 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_appendAscii_002(
         {"Appends the string(length equal to 0) to the string buffer arrOUS[4]",
                 new OUString(aUStr28),
                 new OUStringBuffer(arrOUS[4]), kTestStr2, 0 },
-    /* LLA: input3 must null < 0
-        {"Appends the string(length less than 0) to the string buffer arrOUS[4]",
-                new OUString(aUStr42),
-                new OUStringBuffer(arrOUS[4]), kTestStr2, -1 }
-    */
-#ifdef WITH_CORE
-        ,{"Appends the string(length equal to 0) to the string buffer(with INT_MAX) ",
-                new OUString(),
-                new OUStringBuffer(kSInt32Max), kTestStr25 }
-#endif
     };
 
 
diff --git a/sal/rtl/source/uri.cxx b/sal/rtl/source/uri.cxx
index 5044df311080..928614eb32ce 100644
--- a/sal/rtl/source/uri.cxx
+++ b/sal/rtl/source/uri.cxx
@@ -362,7 +362,7 @@ struct Component
     sal_Unicode const * pBegin;
     sal_Unicode const * pEnd;
 
-    inline Component(): pBegin(0) {}
+    inline Component(): pBegin(0), pEnd(0) {}
 
     inline bool isPresent() const { return pBegin != 0; }
 
diff --git a/sal/systools/win32/kill/kill.cxx b/sal/systools/win32/kill/kill.cxx
index 7c2122d3a32b..81732ae8fb07 100644
--- a/sal/systools/win32/kill/kill.cxx
+++ b/sal/systools/win32/kill/kill.cxx
@@ -73,57 +73,7 @@ static inline bool IsValidHandle( HANDLE handle )
 // Retrieves function adress in another process
 /////////////////////////////////////////////////////////////////////////////
 
-#if 1
 #define GetProcAddressEx( hProcess, hModule, lpProcName ) GetProcAddress( hModule, lpProcName )
-#else
-FARPROC WINAPI GetProcAddressEx( HANDLE hProcess, HMODULE hModule, LPCSTR lpProcName )
-{
-    FARPROC lpfnProcAddress = GetProcAddress( hModule, lpProcName );
-
-    if ( lpfnProcAddress )
-    {
-        DWORD   dwProcessId = GetProcessId( hProcess );
-
-        if ( GetCurrentProcessId() != dwProcessId )
-        {
-            FARPROC lpfnRemoteProcAddress = NULL;
-            TCHAR   szBaseName[MAX_PATH];
-
-            if ( GetModuleBaseName( GetCurrentProcess(), hModule, szBaseName, SAL_N_ELEMENTS(szBaseName) ) )
-            {
-                HMODULE ahModules[MAX_MODULES];
-                DWORD   cbNeeded = 0;
-
-                if ( EnumProcessModules( hProcess, ahModules, sizeof(ahModules), &cbNeeded ) )
-                {
-                    ULONG   nModules = cbNeeded / sizeof(ahModules[0]);
-
-                    for ( ULONG n = 0; n < nModules; n++ )
-                    {
-                        TCHAR   szRemoteBaseName[MAX_PATH];
-
-                        if ( GetModuleBaseName(
-                            hProcess, ahModules[n], szRemoteBaseName, SAL_N_ELEMENTS(szRemoteBaseName) ) &&
-                            0 == lstrcmpi( szRemoteBaseName, szBaseName )
-                            )
-                        {
-                            lpfnRemoteProcAddress = lpfnProcAddress;
-
-                            if ( ahModules[n] != hModule )
-                                *(LPBYTE*)&lpfnRemoteProcAddress += (LPBYTE)ahModules[n] - (LPBYTE)hModule;
-                            break;
-                        }
-                    }
-                }
-            }
-
-            lpfnProcAddress = lpfnRemoteProcAddress;
-        }
-    }
-
-    return lpfnProcAddress;
-}
-#endif
 
 /////////////////////////////////////////////////////////////////////////////
 // Raises a signal in an other process
diff --git a/sal/workben/makefile.mk b/sal/workben/makefile.mk
index 99795f6fbe16..9275a2bcd1c6 100644
--- a/sal/workben/makefile.mk
+++ b/sal/workben/makefile.mk
@@ -31,357 +31,241 @@ PRJNAME=sal
 TARGET=workben
 LIBTARGET=NO
 TARGETTYPE=CUI
-#ENABLE_EXCEPTIONS=TRUE
 NO_DEFAULT_STL=YES
 
-#TESTAPP=test_osl_getVolInfo
-#TESTAPP=test_osl_joinProcess
-#TESTAPP=getlocaleinfotest
-#TESTAPP=test_osl_joinProcess
-#TESTAPP=getlocaleinfotest
-#TESTAPP=salstattest
-#TESTAPP=saldyntest
-
-TESTAPP=t_readline
-#TESTAPP=t_cipher
-#TESTAPP=t_digest
-#TESTAPP=t_random
-#TESTAPP=t_layer
-#TESTAPP=t_tls
-#TESTAPP=t_zip
-
-#TESTAPP=testfile
-#TESTAPP=testpipe
-#TESTAPP=testpip2
-#TESTAPP=testproc
-#TESTAPP=tgetpwnam
-#TESTAPP=salstattest
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
 
-CFLAGS+= $(LFS_CFLAGS)
-CXXFLAGS+= $(LFS_CFLAGS)
+CFLAGS+=$(LFS_CFLAGS)
+CXXFLAGS+=$(LFS_CFLAGS)
 
 # --- Files --------------------------------------------------------
 
-.IF "$(TESTAPP)" == "test_osl_getVolInfo"    
-
-SHL1OBJS=$(SLO)$/t_osl_getVolInfo.obj
-SHL1TARGET=togvi
-
-.IF "$(GUI)" == "WNT"
-APP1STDLIBS=$(KERNEL32LIB)
-SHL1STDLIBS=$(LB)$/isal.lib
-SHL1STDLIBS+=$(SOLARLIBDIR)$/cppunit.lib
-.ENDIF
-
-.IF "$(GUI)" == "UNX"
-SHL1STDLIBS=$(LB)$/libsal.so
-SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
-.ENDIF
-    
-SHL1IMPLIB=i$(SHL1TARGET) 
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET) 
-DEF1EXPORTFILE=export.exp
-.ENDIF
-
-.IF "$(TESTAPP)" == "test_osl_joinProcess"    
-OBJFILES=$(OBJ)$/t_ojp_exe.obj 
-APP1TARGET=ojpx
-APP1OBJS=$(OBJFILES)
-
-.IF "$(GUI)" == "UNX"
-APP1STDLIBS=$(LB)$/libsal.so
-.ENDIF
-
-SHL1OBJS=$(SLO)$/t_osl_joinProcess.obj
-SHL1TARGET=tojp
-
-.IF "$(GUI)" == "WNT"
-APP1STDLIBS=$(KERNEL32LIB)
-SHL1STDLIBS=$(LB)$/isal.lib
-SHL1STDLIBS+=$(SOLARLIBDIR)$/cppunit.lib
-.ENDIF
-
-.IF "$(GUI)" == "UNX"
-SHL1STDLIBS=$(LB)$/libsal.so
-SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
-.ENDIF
-    
-SHL1IMPLIB=i$(SHL1TARGET) 
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET) 
-DEF1EXPORTFILE=export.exp
-.ENDIF
-
-.IF "$(TESTAPP)" == "getlocaleinfotest"
-
-    OBJFILES=$(OBJ)$/getlocaleinfotest.obj
-
-    APP1TARGET=	getlitest
-    APP1OBJS=$(OBJFILES)
-
-    APP1STDLIBS=\
-                $(KERNEL32LIB)
-
-    APP1LIBS=\
-            $(LB)$/kernel9x.lib\
-            $(LB)$/isal.lib
-
-    APP1DEPN=$(LB)$/isal.lib
-
-.ENDIF
-
-.IF "$(TESTAPP)" == "salstattest"
-
-    CFLAGS+= -DUSE_SAL_STATIC
-
-    OBJFILES=	$(OBJ)$/salstattest.obj
-
-    APP1TARGET=	salstattest
-    APP1OBJS=	$(OBJFILES)
-    APP1STDLIBS=\
-                $(LB)$/asal.lib\
-                $(SHELL32LIB)\
-                $(USER32LIB)\
-                $(COMDLG32LIB)\
-                $(ADVAPI32LIB)
-
-    APP1DEPN=	$(LB)$/asal.lib	
-
-.ENDIF # salstattest
-
-.IF "$(TESTAPP)" == "saldyntest"
-
-    OBJFILES=	$(OBJ)$/saldyntest.obj
-
-    APP1TARGET=	saldyntest
-    APP1OBJS=	$(OBJFILES)
-    APP1STDLIBS=\
-                $(LB)$/isal.lib\
-                $(SHELL32LIB)\
-                $(USER32LIB)\
-                $(COMDLG32LIB)\
-                $(ADVAPI32LIB)
-
-    APP1DEPN=	$(LB)$/isal.lib
-
-.ENDIF # salstattest
-
 #
 # t_readline
 #
-.IF "$(TESTAPP)" == "t_readline"
-
-CFILES=		t_readline.c
-OBJFILES=	$(OBJ)$/t_readline.obj
+OBJFILES+=\
+    $(OBJ)$/t_readline.obj
 
-APP1TARGET=	t_readline
-APP1OBJS=	$(OBJFILES)
+APP1TARGET=t_readline
+APP1OBJS=$(OBJ)$/t_readline.obj
 APP1STDLIBS=$(SALLIB)
-APP1DEPN=	$(SLB)$/sal.lib
-
+APP1DEPN=$(SLB)$/sal.lib
 APP1RPATH=UREBIN
 
-.ENDIF # t_readline
-
 #
-# t_cipher
+# testfile
 #
-.IF "$(TESTAPP)" == "t_cipher"
-
-CFILES=		t_cipher.c
-OBJFILES=	$(OBJ)$/t_cipher.obj
+OBJFILES+=\
+    $(OBJ)$/testfile.obj
 
-APP1TARGET=	t_cipher
-APP1OBJS=	$(OBJFILES)
+APP1TARGET=testfile
+APP1OBJS=$(OBJ)$/testfile.obj
 APP1STDLIBS=$(SALLIB)
-APP1DEPN=	$(SLB)$/sal.lib
-
-.ENDIF # t_cipher
+APP1DEPN=$(SLB)$/sal.lib
 
 #
-# t_digest.
+# testpipe
 #
-.IF "$(TESTAPP)" == "t_digest"
-
-CFILES=		t_digest.c
-OBJFILES=	$(OBJ)$/t_digest.obj
+OBJFILES+=\
+    $(OBJ)$/testpipe.obj
 
-APP2TARGET=	t_digest
-APP2OBJS=	$(OBJFILES)
+APP2TARGET=testpipe
+APP2OBJS=$(OBJ)$/testpipe.obj
 APP2STDLIBS=$(SALLIB)
-APP2DEPN=	$(SLB)$/sal.lib
-
-.ENDIF # t_digest
+APP2DEPN=$(SLB)$/sal.lib
 
 #
-# t_random.
+# testpip2
 #
-.IF "$(TESTAPP)" == "t_random"
+OBJFILES+=\
+    $(OBJ)$/testpip2.obj
 
-CFILES=		t_random.c
-OBJFILES=	$(OBJ)$/t_random.obj
-
-APP3TARGET=	t_random
-APP3OBJS=	$(OBJFILES)
+APP3TARGET=testpip2
+APP3OBJS=$(OBJ)$/testpip2.obj
 APP3STDLIBS=$(SALLIB)
-APP3DEPN=	$(SLB)$/sal.lib
-
-.ENDIF # t_random
+APP3DEPN=$(SLB)$/sal.lib
 
 #
-# t_layer.
+# testproc
 #
-.IF "$(TESTAPP)" == "t_layer"
-
-CFILES=		t_layer.c
-OBJFILES=	$(OBJ)$/t_layer.obj
+OBJFILES+=\
+    $(OBJ)$/testproc.obj
 
-APP4TARGET=	t_layer
-APP4OBJS=	$(OBJFILES)
+APP4TARGET=testproc
+APP4OBJS=$(OBJ)$/testproc.obj
 APP4STDLIBS=$(SALLIB)
-APP4DEPN=	$(SLB)$/sal.lib
+APP4DEPN=$(SLB)$/sal.lib
 
-.ENDIF # t_layer
+#
+# tgetpwnam
+#
+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" || "$(OS)"=="OPENBSD"
+OBJFILES+=\
+    $(OBJ)$/tgetpwnam.obj
+
+APP5TARGET=tgetpwnam
+APP5OBJS=$(OBJ)$/tgetpwnam.obj
+APP5STDLIBS=$(SALLIB)
+APP5DEPN=$(SLB)$/sal.lib
+.ENDIF # (sco | netbsd | freebsd)
 
 #
-# t_tls.
+# measure_oustrings
 #
-.IF "$(TESTAPP)" == "t_tls"
+OBJFILES+=\
+    $(OBJ)$/measure_oustrings.obj
 
-CFILES=		t_tls.c
-OBJFILES=	$(OBJ)$/t_tls.obj
+APP6TARGET=measure_oustrings
+APP6OBJS=$(OBJ)$/measure_oustrings.obj
+APP6STDLIBS=$(SALLIB)
+APP6DEPN=$(SLB)$/sal.lib
 
-.IF "$(SALTLSLIB)" == ""
+#
+# t_random.
+#
+OBJFILES+=\
+    $(OBJ)$/t_random.obj
 
-.IF "$(GUI)" == "UNX"
-SALTLSLIB=		-lsaltls2
-.ENDIF # unx
+APP7TARGET=t_random
+APP7OBJS=$(OBJ)$/t_random.obj
+APP7STDLIBS=$(SALLIB)
+APP7DEPN=$(SLB)$/sal.lib
 
-.IF "$(GUI)" == "WNT"
-SALTLSLIB=		$(SALTLSLIB)
-.ENDIF # wnt
+#
+# t_cipher
+#
+OBJFILES+=\
+    $(OBJ)$/t_cipher.obj
 
-.ENDIF # saltlslib
+APP8TARGET=t_cipher
+APP8OBJS=$(OBJ)$/t_cipher.obj
+APP8STDLIBS=$(SALLIB)
+APP8DEPN=$(SLB)$/sal.lib
 
-APP5TARGET=	t_tls
-APP5OBJS=	$(OBJFILES)
-APP5STDLIBS=$(SALTLSLIB) $(SALLIB)
-APP5DEPN=	$(SLB)$/sal.lib
+#
+# t_digest.
+#
+OBJFILES+=\
+    $(OBJ)$/t_digest.obj
 
-.ENDIF # t_tls
+APP9TARGET=t_digest
+APP9OBJS=$(OBJ)$/t_digest.obj
+APP9STDLIBS=$(SALLIB)
+APP9DEPN=$(SLB)$/sal.lib
 
 #
-# t_zip.
+# getlitest
 #
-.IF "$(TESTAPP)" == "t_zip"
+.IF "$(TESTAPP)" == "getlocaleinfotest"
+OBJFILES+=\
+    $(OBJ)$/getlocaleinfotest.obj
 
-CFILES=		t_zip.c
-OBJFILES=	$(OBJ)$/t_zip.obj
+APP10TARGET=getlitest
+APP10OBJS=$(OBJ)$/getlocaleinfotest.obj
 
-.IF "$(SALZIPLIB)" == ""
+APP10STDLIBS=\
+    $(KERNEL32LIB)
 
-.IF "$(GUI)" == "UNX"
-SALZIPLIB=	-lsalzip2
-.ENDIF # unx
+APP10LIBS=\
+    $(LB)$/kernel9x.lib\
+    $(LB)$/isal.lib
 
-.IF "$(GUI)" == "WNT"
-SALZIPLIB=	$(SALZIPLIB)
-.ENDIF # wnt
+APP10DEPN=$(LB)$/isal.lib
+.ENDIF
 
-.ENDIF # salziplib
+.IF "$(TESTAPP)" == "test_osl_getVolInfo"
 
-APP6TARGET=	t_zip
-APP6OBJS=	$(OBJFILES)
-APP6STDLIBS=$(SALZIPLIB) $(SALLIB)
-APP6DEPN=	$(SLB)$/sal.lib
+SHL10OBJS=$(SLO)$/t_osl_getVolInfo.obj
+SHL10TARGET=togvi
 
-.ENDIF # t_zip
+.IF "$(GUI)" == "WNT"
+APP10STDLIBS=$(KERNEL32LIB)
+SHL10STDLIBS=$(LB)$/isal.lib
+SHL10STDLIBS+=$(SOLARLIBDIR)$/cppunit.lib
+.ENDIF
 
-#
-# testfile
-#
-.IF "$(TESTAPP)" == "testfile"
+.IF "$(GUI)" == "UNX"
+SHL10STDLIBS=$(LB)$/libsal.so
+SHL10STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
+.ENDIF
 
-CXXFILES=	testfile.cxx
-OBJFILES=	$(OBJ)$/testfile.obj
+SHL10IMPLIB=i$(SHL1TARGET)
+SHL10DEF=$(MISC)$/$(SHL1TARGET).def
+DEF10NAME=$(SHL1TARGET)
+DEF10EXPORTFILE=export.exp
+.ENDIF
 
-APP1TARGET=	testfile
-APP1OBJS=	$(OBJFILES)
-APP1STDLIBS=$(SALLIB)
-APP1DEPN=	$(SLB)$/sal.lib
+.IF "$(TESTAPP)" == "test_osl_joinProcess"
+OBJFILES+=\
+    $(OBJ)$/t_ojp_exe.obj
+APP10TARGET=ojpx
+APP10OBJS=$(OBJ)$/t_ojp_exe.obj
 
-.ENDIF # testfile
+.IF "$(GUI)" == "UNX"
+APP10STDLIBS=$(LB)$/libsal.so
+.ENDIF
 
-#
-# testpipe
-#
-.IF "$(TESTAPP)" == "testpipe"
+SHL10OBJS=$(SLO)$/t_osl_joinProcess.obj
+SHL10TARGET=tojp
+
+.IF "$(GUI)" == "WNT"
+APP10STDLIBS=$(KERNEL32LIB)
+SHL10STDLIBS=$(LB)$/isal.lib
+SHL10STDLIBS+=$(SOLARLIBDIR)$/cppunit.lib
+.ENDIF
 
-CXXFILES=	testpipe.cxx
-OBJFILES=	$(OBJ)$/testpipe.obj
+.IF "$(GUI)" == "UNX"
+SHL10STDLIBS=$(LB)$/libsal.so
+SHL10STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
+.ENDIF
 
-APP2TARGET= testpipe
-APP2OBJS=   $(OBJFILES)
-APP2STDLIBS=$(SALLIB)
-APP2DEPN=	$(SLB)$/sal.lib
+SHL10IMPLIB=i$(SHL1TARGET)
+SHL10DEF=$(MISC)$/$(SHL1TARGET).def
+DEF10NAME=$(SHL1TARGET)
+DEF10EXPORTFILE=export.exp
+.ENDIF
 
-.ENDIF # testpipe
+.IF "$(TESTAPP)" == "salstattest"
 
-#
-# testpip2
-#
-.IF "$(TESTAPP)" == "testpip2"
+    CFLAGS+= -DUSE_SAL_STATIC
 
-CXXFILES=	testpip2.cxx
-OBJFILES=	$(OBJ)$/testpip2.obj
+    OBJFILES+=$(OBJ)$/salstattest.obj
 
-APP3TARGET=	testpip2
-APP3OBJS=	$(OBJFILES)
-APP3STDLIBS=$(SALLIB)
-APP3DEPN=	$(SLB)$/sal.lib
+    APP10TARGET=salstattest
+    APP10OBJS=$(OBJ)$/salstattest.obj
+    APP10STDLIBS=\
+                $(LB)$/asal.lib\
+                $(SHELL32LIB)\
+                $(USER32LIB)\
+                $(COMDLG32LIB)\
+                $(ADVAPI32LIB)
 
-.ENDIF # testpip2
+    APP10DEPN=$(LB)$/asal.lib
 
-#
-# testproc
-#
-.IF "$(TESTAPP)" == "testproc"
+.ENDIF # salstattest
 
-CXXFILES=	testproc.cxx
-OBJFILES=	$(OBJ)$/testproc.obj
+.IF "$(TESTAPP)" == "saldyntest"
 
-APP4TARGET= testproc
-APP4OBJS=	$(OBJFILES)
-APP4STDLIBS=$(SALLIB)
-APP4DEPN=	$(SLB)$/sal.lib
+    OBJFILES+=$(OBJ)$/saldyntest.obj
 
-.ENDIF # testproc
+    APP10TARGET=saldyntest
+    APP10OBJS=$(OBJ)$/saldyntest.obj
+    APP10STDLIBS=\
+                $(LB)$/isal.lib\
+                $(SHELL32LIB)\
+                $(USER32LIB)\
+                $(COMDLG32LIB)\
+                $(ADVAPI32LIB)
 
-#
-# tgetpwnam
-#
-.IF "$(TESTAPP)" == "tgetpwnam"
-.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" || \
-	"$(OS)"=="OPENBSD"
+    APP10DEPN=$(LB)$/isal.lib
 
-CXXFILES=	tgetpwnam.cxx
-OBJFILES=	$(OBJ)$/tgetpwnam.obj
+.ENDIF # salstattest
 
-APP5TARGET= tgetpwnam
-APP5OBJS=	$(OBJFILES)
-APP5STDLIBS=$(SALLIB)
-APP5DEPN=	$(SLB)$/sal.lib
 
-.ENDIF # (sco | netbsd | freebsd)
-.ENDIF # tgetpwname
 
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-
diff --git a/sal/workben/measure_oustrings.cxx b/sal/workben/measure_oustrings.cxx
new file mode 100644
index 000000000000..bff7d6dea096
--- /dev/null
+++ b/sal/workben/measure_oustrings.cxx
@@ -0,0 +1,149 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       [ Caolán McNamara <caolanm:redhat.com> ]
+ * Portions created by Caolán McNamara are Copyright (C) 2010 * Red Hat, Inc.
+ * All Rights Reserved.
+ *
+ * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+#include <sal/main.h>
+#include <rtl/ustring.hxx>
+#include <osl/time.h>
+
+#include <iostream>
+
+#if defined __GXX_EXPERIMENTAL_CXX0X__
+#   define HAVE_CXX_Ox 1
+#endif
+
+#ifdef HAVE_CXX_Ox
+#  define SAL_DECLARE_UTF16(str) u ## str
+#elif (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x550)
+#  define SAL_DECLARE_UTF16(str) U ## str
+#elif __SIZEOF_WCHAR_T__ == 2
+#  define SAL_DECLARE_UTF16(str) L ## str
+#endif
+
+#ifdef SAL_DECLARE_UTF16
+#  define RTL_CONSTASCII_USTRINGPARAM_WIDE(str) \
+     reinterpret_cast<const sal_Unicode*>(SAL_DECLARE_UTF16(str)), SAL_N_ELEMENTS(str)
+#endif
+
+SAL_IMPLEMENT_MAIN()
+{
+    //get my cpu fan up to speed :-)
+    for (int i = 0; i < 10000000; ++i)
+    {
+        rtl::OUString sFoo(rtl::OUString::createFromAscii("X"));
+        rtl::OUString sBar(RTL_CONSTASCII_USTRINGPARAM("X"));
+#ifdef SAL_DECLARE_UTF16
+        rtl::OUString sBoo(RTL_CONSTASCII_USTRINGPARAM_WIDE("X"));
+#endif
+        rtl::OUString sBaz(static_cast<sal_Unicode>('X'));
+        rtl::OUString sNone;
+    }
+
+    std::cout << "--Empty Strings--" << std::endl;
+
+    {
+    sal_uInt32 nStartTime = osl_getGlobalTimer();
+    for (int i = 0; i < 100000000; ++i)
+        rtl::OUString sFoo;
+    sal_uInt32 nEndTime = osl_getGlobalTimer();
+    std::cout << "rtl::OUString() " << nEndTime - nStartTime << "ms" << std::endl;
+    }
+
+    {
+    sal_uInt32 nStartTime = osl_getGlobalTimer();
+    for (int i = 0; i < 100000000; ++i)
+        rtl::OUString sFoo(rtl::OUString::createFromAscii(""));
+    sal_uInt32 nEndTime = osl_getGlobalTimer();
+    std::cout << "rtl::OUString::createFromAscii() " << nEndTime - nStartTime << "ms" << std::endl;
+    }
+
+    std::cout << "--Single Chars--" << std::endl;
+
+    {
+    sal_uInt32 nStartTime = osl_getGlobalTimer();
+    for (int i = 0; i < 100000000; ++i)
+        rtl::OUString sFoo(rtl::OUString::createFromAscii("X"));
+    sal_uInt32 nEndTime = osl_getGlobalTimer();
+    std::cout << "rtl::OUString::createFromAscii(\"X\") " << nEndTime - nStartTime << "ms" << std::endl;
+    }
+
+    {
+    sal_uInt32 nStartTime = osl_getGlobalTimer();
+    for (int i = 0; i < 100000000; ++i)
+        rtl::OUString sBar(RTL_CONSTASCII_USTRINGPARAM("X"));
+    sal_uInt32 nEndTime = osl_getGlobalTimer();
+    std::cout << "rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\"X\")) " << nEndTime - nStartTime << "ms" << std::endl;
+    }
+
+#ifdef SAL_DECLARE_UTF16
+    {
+    sal_uInt32 nStartTime = osl_getGlobalTimer();
+    for (int i = 0; i < 100000000; ++i)
+        rtl::OUString sBar(RTL_CONSTASCII_USTRINGPARAM_WIDE("X"));
+    sal_uInt32 nEndTime = osl_getGlobalTimer();
+    std::cout << "rtl::OUString(RTL_CONSTASCII_USTRINGPARAM_WIDE(\"X\")) " << nEndTime - nStartTime<< "ms" << std::endl;
+    }
+#endif
+
+    {
+    sal_uInt32 nStartTime = osl_getGlobalTimer();
+    for (int i = 0; i < 100000000; ++i)
+        rtl::OUString sBaz(static_cast<sal_Unicode>('X'));
+    sal_uInt32 nEndTime = osl_getGlobalTimer();
+    std::cout << "rtl::OUString(static_cast<sal_Unicode>('X') " << nEndTime - nStartTime << "ms" << std::endl;
+    }
+
+    std::cout << "--MultiChar Strings--" << std::endl;
+    {
+    sal_uInt32 nStartTime = osl_getGlobalTimer();
+    for (int i = 0; i < 100000000; ++i)
+        rtl::OUString sFoo(rtl::OUString::createFromAscii("XXXXXXXXXXXXXXX"));
+    sal_uInt32 nEndTime = osl_getGlobalTimer();
+    std::cout << "rtl::OUString::createFromAscii(\"XXXXXXXX\") " << nEndTime - nStartTime << "ms" << std::endl;
+    }
+
+    {
+    sal_uInt32 nStartTime = osl_getGlobalTimer();
+    for (int i = 0; i < 100000000; ++i)
+        rtl::OUString sBar(RTL_CONSTASCII_USTRINGPARAM("XXXXXXXXXXXXXXX"));
+    sal_uInt32 nEndTime = osl_getGlobalTimer();
+    std::cout << "rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\"XXXXXXXX\")) " << nEndTime - nStartTime << "ms" << std::endl;
+    }
+
+#ifdef SAL_DECLARE_UTF16
+    {
+    sal_uInt32 nStartTime = osl_getGlobalTimer();
+    for (int i = 0; i < 100000000; ++i)
+        rtl::OUString sBar(RTL_CONSTASCII_USTRINGPARAM_WIDE("XXXXXXXXXXXXXXX"));
+    sal_uInt32 nEndTime = osl_getGlobalTimer();
+    std::cout << "rtl::OUString(RTL_CONSTASCII_USTRINGPARAM_WIDE(\"XXXXXXXX\")) " << nEndTime - nStartTime << "ms" << std::endl;
+    }
+#endif
+
+    return 0;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/t_cipher.c b/sal/workben/t_cipher.c
index 38ba0b20f51f..d6c456463f7a 100644
--- a/sal/workben/t_cipher.c
+++ b/sal/workben/t_cipher.c
@@ -152,28 +152,6 @@ static sal_uInt8 cbc_iv[8] =
 
 static sal_Char cbc_data[40] = "7654321 Now is the time for ";
 
-static sal_uInt8 ecb_ok[32] =
-{
-    0x2A, 0xFD, 0x7D, 0xAA, 0x60, 0x62, 0x6B, 0xA3,
-    0x86, 0x16, 0x46, 0x8C, 0xC2, 0x9C, 0xF6, 0xE1,
-    0x29, 0x1E, 0x81, 0x7C, 0xC7, 0x40, 0x98, 0x2D,
-    0x6F, 0x87, 0xAC, 0x5F, 0x17, 0x1A, 0xAB, 0xEA
-};
-static sal_uInt8 cbc_ok[32] =
-{
-    0x6B, 0x77, 0xB4, 0xD6, 0x30, 0x06, 0xDE, 0xE6,
-    0x05, 0xB1, 0x56, 0xE2, 0x74, 0x03, 0x97, 0x93,
-    0x58, 0xDE, 0xB9, 0xE7, 0x15, 0x46, 0x16, 0xD9,
-    0x59, 0xF1, 0x65, 0x2B, 0xD5, 0xFF, 0x92, 0xCC
-};
-static sal_uInt8 cfb_ok[] =
-{
-    0xE7, 0x32, 0x14, 0xA2, 0x82, 0x21, 0x39, 0xCA,
-    0xF2, 0x6E, 0xCF, 0x6D, 0x2E, 0xB9, 0xE7, 0x6E,
-    0x3D, 0xA3, 0xDE, 0x04, 0xD1, 0x51, 0x72, 0x00,
-    0x51, 0x9D, 0x57, 0xA6, 0xC3
-};
-
 static sal_uInt8 arcfour_key[6][30] =
 {
     { 8, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
@@ -202,6 +180,29 @@ static sal_uInt8 arcfour_data[6][30] =
     { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
       0x00, 0x00, 0xff }
 };
+
+#if OSL_DEBUG_LEVEL > 0
+static sal_uInt8 ecb_ok[32] =
+{
+    0x2A, 0xFD, 0x7D, 0xAA, 0x60, 0x62, 0x6B, 0xA3,
+    0x86, 0x16, 0x46, 0x8C, 0xC2, 0x9C, 0xF6, 0xE1,
+    0x29, 0x1E, 0x81, 0x7C, 0xC7, 0x40, 0x98, 0x2D,
+    0x6F, 0x87, 0xAC, 0x5F, 0x17, 0x1A, 0xAB, 0xEA
+};
+static sal_uInt8 cbc_ok[32] =
+{
+    0x6B, 0x77, 0xB4, 0xD6, 0x30, 0x06, 0xDE, 0xE6,
+    0x05, 0xB1, 0x56, 0xE2, 0x74, 0x03, 0x97, 0x93,
+    0x58, 0xDE, 0xB9, 0xE7, 0x15, 0x46, 0x16, 0xD9,
+    0x59, 0xF1, 0x65, 0x2B, 0xD5, 0xFF, 0x92, 0xCC
+};
+static sal_uInt8 cfb_ok[] =
+{
+    0xE7, 0x32, 0x14, 0xA2, 0x82, 0x21, 0x39, 0xCA,
+    0xF2, 0x6E, 0xCF, 0x6D, 0x2E, 0xB9, 0xE7, 0x6E,
+    0x3D, 0xA3, 0xDE, 0x04, 0xD1, 0x51, 0x72, 0x00,
+    0x51, 0x9D, 0x57, 0xA6, 0xC3
+};
 static sal_uInt8 arcfour_ok[6][30] =
 {
     { 0x75, 0xb7, 0x87, 0x80, 0x99, 0xe0, 0xc5, 0x96, 0x00},
@@ -217,8 +218,9 @@ static sal_uInt8 arcfour_ok[6][30] =
     { 0xd6, 0xa1, 0x41, 0xa7, 0xec, 0x3c, 0x38, 0xdf,
       0xbd, 0x61, 0x00}
 };
+#endif
 
-int SAL_CALL main (int argc, char *argv)
+int SAL_CALL main (void)
 {
     rtlCipher cipher;
 
diff --git a/sal/workben/t_digest.c b/sal/workben/t_digest.c
index 71f3733dac84..7d947ba253e7 100644
--- a/sal/workben/t_digest.c
+++ b/sal/workben/t_digest.c
@@ -165,7 +165,7 @@ static char *pt (unsigned char *md, int length)
     return(buf);
 }
 
-int SAL_CALL main (int argc, char **argv)
+int SAL_CALL main (void)
 {
     const char **P,**R, **Q;
     char *p;
@@ -308,7 +308,7 @@ int SAL_CALL main (int argc, char **argv)
     i = 1;
     while (*P)
     {
-        rtl_digest_initHMAC_MD5 (Digest, *Q, strlen(*Q));
+        rtl_digest_initHMAC_MD5 (Digest, (const sal_uInt8*)(*Q), strlen(*Q));
         rtl_digest_updateHMAC_MD5 (Digest, *P, strlen(*P));
         rtl_digest_getHMAC_MD5 (Digest, md, sizeof(md));
 
@@ -336,8 +336,8 @@ int SAL_CALL main (int argc, char **argv)
     i = 1;
     while (*P)
     {
-        rtl_digest_initHMAC_SHA1 (Digest, *Q, strlen(*Q));
-        rtl_digest_updateHMAC_SHA1 (Digest, *P, strlen(*P));
+        rtl_digest_initHMAC_SHA1 (Digest, (const sal_uInt8*)(*Q), strlen(*Q));
+        rtl_digest_updateHMAC_SHA1 (Digest, (const sal_uInt8*)(*P), strlen(*P));
         rtl_digest_getHMAC_SHA1 (Digest, md, sizeof(md));
 
         p=pt (md, RTL_DIGEST_LENGTH_HMAC_SHA1);
@@ -361,8 +361,8 @@ int SAL_CALL main (int argc, char **argv)
     Q=digest_key_HMAC_MD5;
     rtl_digest_PBKDF2 (
         md, RTL_DIGEST_LENGTH_MD5, /* [out] derived key     */
-        Q[1], strlen(Q[1]),        /* [in]  password        */
-        P[1], strlen(P[1]),        /* [in]  salt            */
+        (const sal_uInt8*)(Q[1]), strlen(Q[1]),        /* [in]  password        */
+        (const sal_uInt8*)(P[1]), strlen(P[1]),        /* [in]  salt            */
         1000);                     /* [in]  iteration count */
 
     p=pt (md, RTL_DIGEST_LENGTH_MD5);
diff --git a/sal/workben/t_random.c b/sal/workben/t_random.c
index 474442b81590..130326f796a1 100644
--- a/sal/workben/t_random.c
+++ b/sal/workben/t_random.c
@@ -46,9 +46,9 @@ static char *pt (unsigned char *md, int length)
  * main.
  */
 #ifdef WIN32
-int __cdecl main (int argc, char **argv)
+int __cdecl main (void)
 #else
-int main (int argc, char **argv)
+int main (void)
 #endif
 {
     rtlRandomPool pool;
diff --git a/sal/workben/testfile.cxx b/sal/workben/testfile.cxx
index 10c48b4f0994..d92522fa07ca 100644
--- a/sal/workben/testfile.cxx
+++ b/sal/workben/testfile.cxx
@@ -72,17 +72,17 @@ rtl::OUString   file_not_exist;
 
 
 
-void print_error(::rtl::OString& str, FileBase::RC rc);
+void print_error(const ::rtl::OString& str, FileBase::RC rc);
 
 void PressKey()
 {
     printf("\nPress Return !\n");
-    int i=getchar();
+    getchar();
 }
 
-void printFileName(::rtl::OUString& str)
+void printFileName(const ::rtl::OUString& str)
 {
-    rtl::OString        aString;
+    rtl::OString aString;
 
     aString = rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
 
@@ -208,13 +208,13 @@ sal_Bool Initialize( void )
     for ( int i=0 ; i<12 ; i++ )
     {
         sal_uInt32      cLineBrake=0;
-        while ( (pCount-pBuffer < uBytesRead) && *pCount!='=')
+        while ( (static_cast<sal_uInt64>(pCount-pBuffer) < uBytesRead) && *pCount!='=')
             pCount++;
 
         pCount++;
         pBegin=pCount;
 
-        while ( (pCount-pBuffer < uBytesRead) && !testLineBreak(pCount,uBytesRead-(pCount-pBuffer), &cLineBrake))
+        while ( (static_cast<sal_uInt64>(pCount-pBuffer) < uBytesRead) && !testLineBreak(pCount,uBytesRead-(pCount-pBuffer), &cLineBrake))
             pCount++;
 
         dir[i]=rtl::OUString(pBegin, pCount-pBegin, RTL_TEXTENCODING_ASCII_US);
@@ -460,7 +460,6 @@ TimeValue getSystemTime()
 void DirectoryOpenAndCloseTest( void )
 {
     FileBase::RC    rc;
-    int i=0;
     Directory   *pDir;
 
     printf( "--------------------------------------------\n");
@@ -585,7 +584,6 @@ void DirectoryOpenAndCloseTest( void )
 void DirectoryCreateAndRemoveTest( void )
 {
     FileBase::RC    rc,rc1;
-    int i=0;
     Directory   *pDir;
 
     printf( "--------------------------------------------\n" );
@@ -673,7 +671,6 @@ void DirectoryCreateAndRemoveTest( void )
 static void FileOpenAndCloseTest( void )
 {
     FileBase::RC    rc;
-    int i=0;
 
     printf( "--------------------------------------------\n" );
     printf( "File-Open-And-Close-Test\n" );
@@ -806,7 +803,7 @@ void FileWriteAndReadTest( void )
 
     sal_uInt64 uWritten;
     sal_uInt64 uRead;
-    sal_Char    *pWriteBuffer="Hier kommt der Osterhase !";
+    const sal_Char *pWriteBuffer="Hier kommt der Osterhase !";
     sal_uInt64  nLen=strlen( pWriteBuffer );
     sal_Char *pReadBuffer;
 
@@ -947,7 +944,9 @@ void FileCopyAndMoveTest( void )
     destPath+=file3;
 
     printf( "Copy a file to a not existing directory \n");
-    printf( "Copy the file  %s to %s\n", file1.getStr(), destPath.getStr() );
+    printf( "Copy the file %s to %s\n",
+        rtl::OUStringToOString( file1, RTL_TEXTENCODING_ASCII_US ).getStr(),
+        rtl::OUStringToOString( destPath, RTL_TEXTENCODING_ASCII_US ).getStr() );
 
     rc=File::copy( file1, destPath );
     print_error( rtl::OString( "FileCopy" ), rc );
@@ -1120,9 +1119,9 @@ void FileSizeTest( void )
                 filesize=rStatus.getFileSize();
 
                 if ( filesize == 5000 )
-                    printf( "\nOK : FileSize: %i\n", filesize );
+                    printf( "\nOK : FileSize: %" SAL_PRIuUINT64 "\n", filesize );
                 else
-                    printf( "\nError : FileSize: %i\n", filesize );
+                    printf( "\nError : FileSize: %" SAL_PRIuUINT64 "\n", filesize );
             }
         }
 
@@ -1186,7 +1185,7 @@ void FilePointerTest( void )
 
         rc =rFile.getPos( filepointer );
         print_error( rtl::OString( "GetPos" ), rc );
-        printf( "Position of the FilePointer: %i\n", filepointer );
+        printf( "Position of the FilePointer: %" SAL_PRIuUINT64 "\n", filepointer );
 
         printf( "\n" );
 
@@ -1207,13 +1206,13 @@ void FilePointerTest( void )
         {
             print_error( rtl::OString( "GetPos" ), rc );
             printf( "\nVerify: OK !\n" );
-            printf( "Filepointer-Position: %llu\n",filepointer );
+            printf( "Filepointer-Position: %" SAL_PRIuUINT64 "\n",filepointer );
         }
         else
         {
             print_error( rtl::OString( "GetPos" ), rc );
             printf( "\nFilePointer-Test: Error\n" );
-            printf( "Filepointer-Position: %i != 5000 \n",filepointer );
+            printf( "Filepointer-Position: %" SAL_PRIuUINT64 " != 5000 \n",filepointer );
         }
 
         printf( "\n" );
@@ -1432,9 +1431,29 @@ void FileTimeTest( void )
 
     DirectoryItem   aItem;
 
-    struct tm sSysCreationTime = { 0, 20, 12, 4, 9, 100 };
-    struct tm sSysAccessTime = { 0, 40, 1, 6, 5, 98 };
-    struct tm sSysModifyTime = { 0, 1, 24, 13, 11, 95 };
+    struct tm sSysCreationTime;
+    sSysCreationTime.tm_sec = 0;
+    sSysCreationTime.tm_min = 20;
+    sSysCreationTime.tm_hour = 12;
+    sSysCreationTime.tm_mday = 4;
+    sSysCreationTime.tm_mon = 9;
+    sSysCreationTime.tm_year = 99;
+
+    struct tm sSysAccessTime;
+    sSysAccessTime.tm_sec = 0;
+    sSysAccessTime.tm_min = 40;
+    sSysAccessTime.tm_hour = 1;
+    sSysAccessTime.tm_mday = 6;
+    sSysAccessTime.tm_mon = 5;
+    sSysAccessTime.tm_year = 98;
+
+    struct tm sSysModifyTime;
+    sSysModifyTime.tm_sec = 0;
+    sSysModifyTime.tm_min = 1;
+    sSysModifyTime.tm_hour = 24;
+    sSysModifyTime.tm_mday = 13;
+    sSysModifyTime.tm_mon = 11;
+    sSysModifyTime.tm_year = 95;
 
     time_t aSysCreationTime =  mktime( &sSysCreationTime );
     time_t aSysAccessTime =  mktime( &sSysAccessTime );
@@ -1660,7 +1679,7 @@ void DirectoryItemTest( void )
         printFileName( file1 );
         printf( "\n" );
 
-        rc=DirectoryItem::get( *pFile , aItem );
+        rc=DirectoryItem::get( file1 , aItem );
         print_error( rtl::OString( "GetDirectoryItem" ), rc );
 
         pStatus=new FileStatus( FileStatusMask_All );
@@ -1683,17 +1702,13 @@ void DirectoryItemTest( void )
     printf( "\n" );
 
     //---------------------------------------------------
-    // get DirectoryItem from an empty file-handle
+    // get DirectoryItem
     //--------------------------------------------------
 
-    pFile=new File( file1 );
-
     printf( "Get DirectoryItem from an empty File-Handle\n" );
-    rc=DirectoryItem::get( *pFile , aItem );
+    rc=DirectoryItem::get( file1 , aItem );
     print_error( rtl::OString( "GetDirectoryItem" ), rc );
 
-    delete pFile;
-
     printf( "\n" );
 
     //--------------------------------------------------
@@ -1861,7 +1876,7 @@ void FileStatusTest( FileStatus *pStatus )
     printf( "\ngetFileSize:\n" );
 
     FileSize=pStatus->getFileSize();
-    printf( "FileSize: %i\n", FileSize);
+    printf( "FileSize: %" SAL_PRIuUINT64 "\n", FileSize);
 
     //--------------------------------------------------
     // GetFileName
@@ -2070,7 +2085,7 @@ void VolumeInfoTest( void )
 
     sal_uInt64  TotalSpace;
     TotalSpace=rInfo.getTotalSpace();
-    printf( "Total Space: %i\n",TotalSpace );
+    printf( "Total Space: %" SAL_PRIuUINT64 "\n",TotalSpace );
 
     //--------------------------------------------------
     // getFreeSpace
@@ -2078,7 +2093,7 @@ void VolumeInfoTest( void )
 
     sal_uInt64  FreeSpace;
     FreeSpace=rInfo.getFreeSpace();
-    printf( "Free Space: %i\n",FreeSpace );
+    printf( "Free Space: %" SAL_PRIuUINT64 "\n",FreeSpace );
 
     //--------------------------------------------------
     // getUsedSpace
@@ -2086,7 +2101,7 @@ void VolumeInfoTest( void )
 
     sal_uInt64  UsedSpace;
     UsedSpace=rInfo.getUsedSpace();
-    printf( "Used Space: %i\n",UsedSpace );
+    printf( "Used Space: %" SAL_PRIuUINT64 "\n",UsedSpace );
 
     //--------------------------------------------------
     // getMaxNameLength
@@ -2094,7 +2109,7 @@ void VolumeInfoTest( void )
 
     sal_uInt32  MaxNameLength;
     MaxNameLength=rInfo.getMaxNameLength();
-    printf( "MaxNameLength: %i\n",MaxNameLength );
+    printf( "MaxNameLength: %" SAL_PRIuUINT32 "\n",MaxNameLength );
 
     //--------------------------------------------------
     // getMaxPathLength
@@ -2102,7 +2117,7 @@ void VolumeInfoTest( void )
 
     sal_uInt32  MaxPathLength;
     MaxPathLength=rInfo.getMaxPathLength();
-    printf( "MaxPathLength: %i\n",MaxPathLength );
+    printf( "MaxPathLength: %" SAL_PRIuUINT32 "\n",MaxPathLength );
 
     //--------------------------------------------------
     // getFileSystemName
@@ -2533,10 +2548,10 @@ void CanonicalNameTest(void)
 // print_error
 //--------------------------------------------------
 
-void print_error( ::rtl::OString& str, FileBase::RC rc )
+void print_error( const ::rtl::OString& str, FileBase::RC rc )
 {
 
-    printf( "%s : ",str.getStr() );
+    printf( "%s : ", str.getStr() );
     switch(rc)
     {
     case FileBase::E_None:
diff --git a/sal/workben/testpip2.cxx b/sal/workben/testpip2.cxx
index 9199099c86a2..53f8dd3ba040 100644
--- a/sal/workben/testpip2.cxx
+++ b/sal/workben/testpip2.cxx
@@ -32,9 +32,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#define INCL_DOSPROCESS
 #include <osl/pipe.h>
-#include <os2.h>
 
 // eindeutiger Name f�r die Pipe
 const char pszPipeName[] = "TestPipe";
@@ -58,13 +56,13 @@ void fail( const char * pszText, int retval )
 int main (void)
 {
     char    szBuffer[ 256 ];
-    sSize_t nChars;
+    rtl_uString* ustrPipeName=0;
+    sal_Int32 nChars;
 
-    // gib dem Server die Chance, die Pipe zu ”ffnen
-    DosSleep( 1000 );
+    rtl_uString_newFromAscii(&ustrPipeName,pszPipeName);
 
     // erzeuge die Pipe
-    Pipe = osl_createPipe( pszPipeName, osl_Pipe_OPEN, 0 );
+    Pipe = osl_createPipe( ustrPipeName, osl_Pipe_OPEN, 0 );
 
     if( !Pipe )
         fail( "unable to open pipe.\n",
@@ -88,7 +86,7 @@ int main (void)
               osl_getLastPipeError( Pipe ) );
 
     // schliesse die Pipe
-    osl_destroyPipe( Pipe );
+    osl_releasePipe( Pipe );
 
     printf( "TestPipe Client: test passed.\n" );
     return 0;
diff --git a/sal/workben/testpipe.cxx b/sal/workben/testpipe.cxx
index cd4671da714c..ed4b653dcf2a 100644
--- a/sal/workben/testpipe.cxx
+++ b/sal/workben/testpipe.cxx
@@ -44,8 +44,8 @@ const char szTestString[] = "This is a test";
 char       szBuffer[256];
 
 const char *  cp;
-Size_t  n;
-sSize_t nChars;
+size_t  n;
+sal_Int32 nChars;
 
 // osl specific variables
 oslPipe          Pipe;
@@ -91,10 +91,9 @@ int main (int argc, const char *argv[])
                                        0,
                                         osl_Process_NORMAL,
                                         0,
-                                        NULL,
                                        NULL,
-                                       0,
-                                        NULL,
+                                       NULL,
+                                        0,
                                         &Process );
 
     if( ProcessError != osl_Process_E_None )
@@ -158,8 +157,8 @@ int main (int argc, const char *argv[])
     osl_freeProcessHandle( Process );
 
     // schliesse die Pipes
-    osl_destroyPipe( C1Pipe );
-    osl_destroyPipe( Pipe );
+    osl_releasePipe( C1Pipe );
+    osl_releasePipe( Pipe );
 
     printf( "TestPipe Server: test passed.\n" );
     return 0;
diff --git a/sal/workben/testproc.cxx b/sal/workben/testproc.cxx
index f02af116c36f..ed515ef2e9ea 100644
--- a/sal/workben/testproc.cxx
+++ b/sal/workben/testproc.cxx
@@ -40,9 +40,9 @@
     #define MAIN main
 #endif
 
-void MAIN (void)
+int MAIN (void)
 {
-    oslProcess Process;
+    //oslProcess Process;
     oslProcessError  ProcessError;
     sal_uInt32 nArgCount;
     sal_uInt32 index;
@@ -59,7 +59,7 @@ void MAIN (void)
 
         osl_getCommandArg(index,&ustrArg);
 
-        fprintf(stderr,"done ...\n\n",index);
+        fprintf(stderr,"done ...\n\n");
     }
 
     ProcessError = osl_getExecutableFile(&ustrExeFile);
@@ -73,6 +73,7 @@ void MAIN (void)
                         NULL,
                         NULL,
                         &Process );*/
+    return 0;
 }
 
 
diff --git a/salhelper/test/rtti/exports.dxp b/salhelper/test/rtti/exports.dxp
index 41a9804fdbeb..beafa6a1c40f 100644
--- a/salhelper/test/rtti/exports.dxp
+++ b/salhelper/test/rtti/exports.dxp
@@ -1,8 +1,6 @@
 ?funcA@MyClassA@@UAEXXZ
 ?funcB@MyClassA@@UAEXXZ
 ?funcC@MyClassA@@MAEXXZ
-?funcD@MyClassA@@EAEXXZ
 ?funcA@MyClassB@@UAEXXZ
 ?funcB@MyClassB@@UAEXXZ
 ?funcC@MyClassB@@MAEXXZ
-?funcD@MyClassB@@EAEXXZ
\ No newline at end of file
diff --git a/salhelper/test/rtti/rttitest.cxx b/salhelper/test/rtti/rttitest.cxx
index a39a7e1760f8..c44cb9ead34a 100644
--- a/salhelper/test/rtti/rttitest.cxx
+++ b/salhelper/test/rtti/rttitest.cxx
@@ -1,31 +1,20 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#include <rtl/ustring>
 #include <stdio.h>
 #include <typeinfo>
 #include "samplelibrtti.hxx"
 
-
-//using namespace salhelper;
-using namespace rtl;
-
-
-
-int main( int argc, char *argv[ ], char *envp[ ] )
+int main( void )
 {
     MyClassB b;
     MyClassA* pA= &b;
     // test the virtual function
     pA->funcA();
 
-//  const type_info& i1= typeid ( b);
-//  const type_info& i2= typeid( pA);
-
     if( typeid( b) == typeid( pA))
         printf("\nsame types");
 
-
     MyClassB* pB= dynamic_cast<MyClassB* >( pA);
-        pB->funcA();
+    pB->funcA();
     return 0;
 }
 
diff --git a/salhelper/test/rtti/samplelibrtti.cxx b/salhelper/test/rtti/samplelibrtti.cxx
index 26b4a68e1561..e3cec911865e 100644
--- a/salhelper/test/rtti/samplelibrtti.cxx
+++ b/salhelper/test/rtti/samplelibrtti.cxx
@@ -16,10 +16,6 @@ void MyClassA::funcC()
 {
 }
 
-void MyClassA::funcD()
-{
-}
-
 // MyClassB ===============================================================
 void MyClassB::funcA()
 {
@@ -35,8 +31,4 @@ void MyClassB::funcC()
 {
 }
 
-void MyClassB::funcD()
-{
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/salhelper/test/rtti/samplelibrtti.hxx b/salhelper/test/rtti/samplelibrtti.hxx
index 8e94355a4499..dd6a87052c6d 100644
--- a/salhelper/test/rtti/samplelibrtti.hxx
+++ b/salhelper/test/rtti/samplelibrtti.hxx
@@ -9,8 +9,6 @@ public:
     virtual void  funcB();
 protected:
     virtual void  funcC();
-private:
-    virtual void  funcD();
 };
 
 
@@ -21,9 +19,6 @@ public:
     virtual void  funcB();
 protected:
     virtual void  funcC();
-private:
-    virtual void  funcD();
-
 };
 
 #endif
diff --git a/salhelper/test/rtti/sols.map b/salhelper/test/rtti/sols.map
index babf2c901585..aa778d405666 100644
--- a/salhelper/test/rtti/sols.map
+++ b/salhelper/test/rtti/sols.map
@@ -7,12 +7,10 @@ _init;
 __1cIMyClassAFfuncA6M_v_;
 __1cIMyClassAFfuncB6M_v_;
 __1cIMyClassAFfuncC6M_v_;
-__1cIMyClassAFfuncD6M_v_;
 __1cIMyClassAG__vtbl_;
 __1cIMyClassBFfuncA6M_v_;
 __1cIMyClassBFfuncB6M_v_;
 __1cIMyClassBFfuncC6M_v_;
-__1cIMyClassBFfuncD6M_v_;
 __1cIMyClassBG__vtbl_;
 __RTTI__1CpknIMyClassA_;
 __RTTI__1CpknIMyClassB_;
diff --git a/sax/inc/sax/fshelper.hxx b/sax/inc/sax/fshelper.hxx
index f34576022378..5d5668a8f9f5 100644
--- a/sax/inc/sax/fshelper.hxx
+++ b/sax/inc/sax/fshelper.hxx
@@ -102,7 +102,8 @@ public:
 
     FastAttributeList *createAttrList();
 
-    void mark();
+    void mark( ::com::sun::star::uno::Sequence< sal_Int32 > aOrder =
+            ::com::sun::star::uno::Sequence< sal_Int32 >() );
     void mergeTopMarks( MergeMarksEnum eMergeType = MERGE_MARKS_APPEND );
 
 private:
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index 704b51f5cceb..f1e5470da9bd 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -467,7 +467,7 @@ void SaxExpatParser::parseStream(   const InputSource& structSource)
 
     if( ! entity.structSource.aInputStream.is() )
     {
-        throw SAXException( OUString::createFromAscii( "No input source" ) ,
+        throw SAXException( OUString(RTL_CONSTASCII_USTRINGPARAM("No input source")) ,
                             Reference< XInterface > () , Any() );
     }
 
@@ -482,7 +482,7 @@ void SaxExpatParser::parseStream(   const InputSource& structSource)
     entity.pParser = XML_ParserCreate( 0 );
     if( ! entity.pParser )
     {
-        throw SAXException( OUString::createFromAscii( "Couldn't create parser" ) ,
+        throw SAXException( OUString(RTL_CONSTASCII_USTRINGPARAM("Couldn't create parser")) ,
                             Reference< XInterface > (), Any() );
     }
 
@@ -596,7 +596,7 @@ void SaxExpatParser::setLocale( const Locale & locale ) throw (RuntimeException)
 // XServiceInfo
 OUString SaxExpatParser::getImplementationName() throw ()
 {
-    return OUString::createFromAscii( IMPLEMENTATION_NAME );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATION_NAME ));
 }
 
 // XServiceInfo
@@ -617,7 +617,7 @@ Sequence< OUString > SaxExpatParser::getSupportedServiceNames(void) throw ()
 {
 
     Sequence<OUString> seq(1);
-    seq.getArray()[0] = OUString::createFromAscii( SERVICE_NAME );
+    seq.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ));
     return seq;
 }
 
@@ -632,82 +632,82 @@ OUString getErrorMessage( XML_Error xmlE, OUString sSystemId , sal_Int32 nLine )
 {
     OUString Message;
     if( XML_ERROR_NONE == xmlE ) {
-        Message = OUString::createFromAscii( "No" );
+        Message = OUString(RTL_CONSTASCII_USTRINGPARAM("No"));
     }
     else if( XML_ERROR_NO_MEMORY == xmlE ) {
-        Message = OUString::createFromAscii( "no memory" );
+        Message = OUString(RTL_CONSTASCII_USTRINGPARAM("no memory"));
     }
     else if( XML_ERROR_SYNTAX == xmlE ) {
-        Message = OUString::createFromAscii( "syntax" );
+        Message = OUString(RTL_CONSTASCII_USTRINGPARAM("syntax"));
     }
     else if( XML_ERROR_NO_ELEMENTS == xmlE ) {
-        Message = OUString::createFromAscii( "no elements" );
+        Message = OUString(RTL_CONSTASCII_USTRINGPARAM("no elements"));
     }
     else if( XML_ERROR_INVALID_TOKEN == xmlE ) {
-        Message = OUString::createFromAscii( "invalid token" );
+        Message = OUString(RTL_CONSTASCII_USTRINGPARAM("invalid token"));
     }
     else if( XML_ERROR_UNCLOSED_TOKEN == xmlE ) {
-        Message = OUString::createFromAscii( "unclosed token" );
+        Message = OUString(RTL_CONSTASCII_USTRINGPARAM("unclosed token"));
     }
     else if( XML_ERROR_PARTIAL_CHAR == xmlE ) {
-        Message = OUString::createFromAscii( "partial char" );
+        Message = OUString(RTL_CONSTASCII_USTRINGPARAM("partial char"));
     }
     else if( XML_ERROR_TAG_MISMATCH == xmlE ) {
-        Message = OUString::createFromAscii( "tag mismatch" );
+        Message = OUString(RTL_CONSTASCII_USTRINGPARAM("tag mismatch"));
     }
     else if( XML_ERROR_DUPLICATE_ATTRIBUTE == xmlE ) {
-        Message = OUString::createFromAscii( "duplicate attribute" );
+        Message = OUString(RTL_CONSTASCII_USTRINGPARAM("duplicate attribute"));
     }
     else if( XML_ERROR_JUNK_AFTER_DOC_ELEMENT == xmlE ) {
-        Message = OUString::createFromAscii( "junk after doc element" );
+        Message = OUString(RTL_CONSTASCII_USTRINGPARAM("junk after doc element"));
     }
     else if( XML_ERROR_PARAM_ENTITY_REF == xmlE ) {
-        Message = OUString::createFromAscii( "parameter entity reference" );
+        Message = OUString(RTL_CONSTASCII_USTRINGPARAM("parameter entity reference"));
     }
     else if( XML_ERROR_UNDEFINED_ENTITY == xmlE ) {
-        Message = OUString::createFromAscii( "undefined entity" );
+        Message = OUString(RTL_CONSTASCII_USTRINGPARAM("undefined entity"));
     }
     else if( XML_ERROR_RECURSIVE_ENTITY_REF == xmlE ) {
-        Message = OUString::createFromAscii( "recursive entity reference" );
+        Message = OUString(RTL_CONSTASCII_USTRINGPARAM("recursive entity reference"));
     }
     else if( XML_ERROR_ASYNC_ENTITY == xmlE ) {
-        Message = OUString::createFromAscii( "async entity" );
+        Message = OUString(RTL_CONSTASCII_USTRINGPARAM("async entity"));
     }
     else if( XML_ERROR_BAD_CHAR_REF == xmlE ) {
-        Message = OUString::createFromAscii( "bad char reference" );
+        Message = OUString(RTL_CONSTASCII_USTRINGPARAM("bad char reference"));
     }
     else if( XML_ERROR_BINARY_ENTITY_REF == xmlE ) {
-        Message = OUString::createFromAscii( "binary entity reference" );
+        Message = OUString(RTL_CONSTASCII_USTRINGPARAM("binary entity reference"));
     }
     else if( XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF == xmlE ) {
-        Message = OUString::createFromAscii( "attribute external entity reference" );
+        Message = OUString(RTL_CONSTASCII_USTRINGPARAM("attribute external entity reference"));
     }
     else if( XML_ERROR_MISPLACED_XML_PI == xmlE ) {
-        Message = OUString::createFromAscii( "misplaced xml processing instruction" );
+        Message = OUString(RTL_CONSTASCII_USTRINGPARAM("misplaced xml processing instruction"));
     }
     else if( XML_ERROR_UNKNOWN_ENCODING == xmlE ) {
-        Message = OUString::createFromAscii( "unknown encoding" );
+        Message = OUString(RTL_CONSTASCII_USTRINGPARAM("unknown encoding"));
     }
     else if( XML_ERROR_INCORRECT_ENCODING == xmlE ) {
-        Message = OUString::createFromAscii( "incorrect encoding" );
+        Message = OUString(RTL_CONSTASCII_USTRINGPARAM("incorrect encoding"));
     }
     else if( XML_ERROR_UNCLOSED_CDATA_SECTION == xmlE ) {
-        Message = OUString::createFromAscii( "unclosed cdata section" );
+        Message = OUString(RTL_CONSTASCII_USTRINGPARAM("unclosed cdata section"));
     }
     else if( XML_ERROR_EXTERNAL_ENTITY_HANDLING == xmlE ) {
-        Message = OUString::createFromAscii( "external entity reference" );
+        Message = OUString(RTL_CONSTASCII_USTRINGPARAM("external entity reference"));
     }
     else if( XML_ERROR_NOT_STANDALONE == xmlE ) {
-        Message = OUString::createFromAscii( "not standalone" );
+        Message = OUString(RTL_CONSTASCII_USTRINGPARAM("not standalone"));
     }
 
-    OUString str = OUString::createFromAscii( "[" );
+    OUString str(RTL_CONSTASCII_USTRINGPARAM("["));
     str += sSystemId;
-    str += OUString::createFromAscii( " line " );
+    str += OUString(RTL_CONSTASCII_USTRINGPARAM(" line "));
     str += OUString::valueOf( nLine );
-    str += OUString::createFromAscii( "]: " );
+    str += OUString(RTL_CONSTASCII_USTRINGPARAM("]: "));
     str += Message;
-    str += OUString::createFromAscii( "error" );
+    str += OUString(RTL_CONSTASCII_USTRINGPARAM("error"));
 
     return str;
 }
@@ -1047,12 +1047,12 @@ sal_Bool SAL_CALL component_writeInfo(
                 reinterpret_cast< XRegistryKey * >( pRegistryKey ) );
 
             Reference< XRegistryKey > xNewKey = xKey->createKey(
-                OUString::createFromAscii( "/" IMPLEMENTATION_NAME "/UNO/SERVICES" ) );
-            xNewKey->createKey( OUString::createFromAscii( SERVICE_NAME ) );
+                OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLEMENTATION_NAME "/UNO/SERVICES" )) );
+            xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME )) );
 
-            xNewKey = xKey->createKey( OUString::createFromAscii("/") +
+            xNewKey = xKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/")) +
                                        SaxWriter_getImplementationName()+
-                                       OUString::createFromAscii( "/UNO/SERVICES" ) );
+                                       OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
             xNewKey->createKey( SaxWriter_getServiceName() );
 
             return sal_True;
diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx
index d947a50b0ff9..2f6cfccadc30 100644
--- a/sax/source/expatwrap/saxwriter.cxx
+++ b/sax/source/expatwrap/saxwriter.cxx
@@ -179,7 +179,8 @@ public:
                         sal_Bool bDoNormalization,
                         sal_Bool bNormalizeWhitespace) throw( SAXException );
 
-    sal_uInt32 GetLastColumnCount() { return (sal_uInt32)(nCurrentPos - nLastLineFeedPos); }
+    sal_uInt32 GetLastColumnCount() const
+        { return (sal_uInt32)(nCurrentPos - nLastLineFeedPos); }
 
     inline void startDocument() throw( SAXException );
 
@@ -245,7 +246,7 @@ inline sal_uInt32 SaxWriterHelper::writeSequence() throw( SAXException )
         Any a;
         a <<= e;
         throw SAXException(
-            OUString::createFromAscii( "io exception during writing" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("io exception during writing")),
             Reference< XInterface > (),
             a );
     }
@@ -1030,12 +1031,12 @@ Reference < XInterface > SAL_CALL SaxWriter_CreateInstance(
 
 OUString SaxWriter_getServiceName() throw()
 {
-    return OUString::createFromAscii( "com.sun.star.xml.sax.Writer" );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer"));
 }
 
 OUString SaxWriter_getImplementationName() throw()
 {
-    return OUString::createFromAscii( "com.sun.star.extensions.xml.sax.Writer" );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.extensions.xml.sax.Writer"));
 }
 
 Sequence< OUString >    SaxWriter_getSupportedServiceNames(void) throw()
@@ -1111,12 +1112,12 @@ void SAXWriter::endDocument(void)                   throw(SAXException, RuntimeE
     if( ! m_bDocStarted )
     {
         throw SAXException(
-            OUString::createFromAscii( "endDocument called before startDocument" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("endDocument called before startDocument")),
             Reference< XInterface >() , Any() );
     }
     if( m_nLevel ) {
         throw SAXException(
-            OUString::createFromAscii( "unexpected end of document" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("unexpected end of document")),
             Reference< XInterface >() , Any() );
     }
     mp_SaxWriterHelper->endDocument();
@@ -1129,7 +1130,7 @@ void SAXWriter::endDocument(void)                   throw(SAXException, RuntimeE
         Any a;
         a <<= e;
         throw SAXException(
-            OUString::createFromAscii( "IO exception during closing the IO Stream" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("IO exception during closing the IO Stream")),
             Reference< XInterface > (),
             a );
     }
diff --git a/sax/source/fastparser/facreg.cxx b/sax/source/fastparser/facreg.cxx
index 7d968ad1b219..bd66ab30c79e 100644
--- a/sax/source/fastparser/facreg.cxx
+++ b/sax/source/fastparser/facreg.cxx
@@ -52,12 +52,12 @@ sal_Bool SAL_CALL component_writeInfo(
             Reference< XRegistryKey > xKey( reinterpret_cast< XRegistryKey * >( pRegistryKey ) );
 
             Reference< XRegistryKey > xNewKey( xKey->createKey(
-                OUString::createFromAscii( "/" PARSER_IMPLEMENTATION_NAME "/UNO/SERVICES" ) ) );
-            xNewKey->createKey( OUString::createFromAscii( PARSER_SERVICE_NAME ) );
+                OUString(RTL_CONSTASCII_USTRINGPARAM( "/" PARSER_IMPLEMENTATION_NAME "/UNO/SERVICES" )) ) );
+            xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( PARSER_SERVICE_NAME )) );
 
             Reference< XRegistryKey > xNewKey1( xKey->createKey(
-                OUString::createFromAscii( "/" SERIALIZER_IMPLEMENTATION_NAME "/UNO/SERVICES" ) ) );
-            xNewKey1->createKey( OUString::createFromAscii( SERIALIZER_SERVICE_NAME ) );
+                OUString(RTL_CONSTASCII_USTRINGPARAM( "/" SERIALIZER_IMPLEMENTATION_NAME "/UNO/SERVICES" )) ) );
+            xNewKey1->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( SERIALIZER_SERVICE_NAME )) );
 
             return sal_True;
         }
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 90596009c617..9fdd0117599e 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -551,7 +551,7 @@ Sequence< OUString > FastSaxParser::getSupportedServiceNames_Static(void)
 // XServiceInfo
 OUString FastSaxParser::getImplementationName() throw (RuntimeException)
 {
-    return OUString::createFromAscii( PARSER_IMPLEMENTATION_NAME );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( PARSER_IMPLEMENTATION_NAME ));
 }
 
 // XServiceInfo
@@ -572,7 +572,7 @@ Sequence< OUString > FastSaxParser::getSupportedServiceNames(void) throw (Runtim
 {
 
     Sequence<OUString> seq(1);
-    seq.getArray()[0] = OUString::createFromAscii( PARSER_SERVICE_NAME );
+    seq.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( PARSER_SERVICE_NAME ));
     return seq;
 }
 
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 5dee77ea41d5..40e8f5009d10 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -1179,11 +1179,10 @@ bool Converter::convertDateOrDateTime(
 
     const ::rtl::OUString string = rString.trim().toAsciiUpperCase();
     sal_Int32 nPos(0);
-    bool bNegative(false);
     if ((string.getLength() > nPos) && (sal_Unicode('-') == string[nPos]))
     {
+        //Negative Number
         ++nPos;
-        bNegative = true;
     }
 
     sal_Int32 nYear(0);
diff --git a/sax/source/tools/fastattribs.cxx b/sax/source/tools/fastattribs.cxx
index ba9ee4dce7d3..53fc40350022 100644
--- a/sax/source/tools/fastattribs.cxx
+++ b/sax/source/tools/fastattribs.cxx
@@ -148,7 +148,7 @@ Sequence< Attribute > FastAttributeList::getUnknownAttributes(  ) throw (Runtime
 {
     Sequence< Attribute > aSeq( maUnknownAttributes.size() );
     Attribute* pAttr = aSeq.getArray();
-    for( UnknownAttributeList::iterator attrIter = maUnknownAttributes.begin(); attrIter != maUnknownAttributes.end(); attrIter++ )
+    for( UnknownAttributeList::iterator attrIter = maUnknownAttributes.begin(); attrIter != maUnknownAttributes.end(); ++attrIter )
         (*attrIter).FillAttribute( pAttr++ );
     return aSeq;
 }
@@ -157,7 +157,7 @@ Sequence< FastAttribute > FastAttributeList::getFastAttributes(  ) throw (Runtim
     Sequence< FastAttribute > aSeq( maAttributes.size() );
     FastAttribute* pAttr = aSeq.getArray();
     FastAttributeMap::iterator fastAttrIter = maAttributes.begin();
-    for(; fastAttrIter != maAttributes.end(); fastAttrIter++ )
+    for(; fastAttrIter != maAttributes.end(); ++fastAttrIter )
     {
         pAttr->Token = fastAttrIter->first;
         pAttr->Value = OStringToOUString( fastAttrIter->second, RTL_TEXTENCODING_UTF8 );
diff --git a/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx
index b475f6d2342c..47e865c25785 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -30,6 +30,8 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/byteseq.hxx>
 
+#include <comphelper/sequenceasvector.hxx>
+
 #include <com/sun/star/xml/Attribute.hpp>
 #include <com/sun/star/xml/FastAttribute.hpp>
 #include <com/sun/star/xml/sax/XFastAttributeList.hpp>
@@ -40,6 +42,7 @@
 #include <cstdio>
 #endif
 
+using ::comphelper::SequenceAsVector;
 using ::rtl::OString;
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
@@ -135,6 +138,9 @@ namespace sax_fastparser {
         if (!mxOutputStream.is())
             return;
 
+        if ( !maMarkStack.empty() )
+            maMarkStack.top()->setCurrentElement( Element );
+
         writeBytes(toUnoSequence(aOpeningBracket));
 
         writeId(Element);
@@ -202,6 +208,9 @@ namespace sax_fastparser {
         if (!mxOutputStream.is())
             return;
 
+        if ( !maMarkStack.empty() )
+            maMarkStack.top()->setCurrentElement( Element );
+
         writeBytes(toUnoSequence(aOpeningBracket));
 
         writeId(Element);
@@ -287,7 +296,7 @@ namespace sax_fastparser {
     // XServiceInfo
     OUString FastSaxSerializer::getImplementationName() throw (RuntimeException)
     {
-        return OUString::createFromAscii( SERIALIZER_IMPLEMENTATION_NAME );
+        return OUString(RTL_CONSTASCII_USTRINGPARAM( SERIALIZER_IMPLEMENTATION_NAME ));
     }
 
     // XServiceInfo
@@ -307,13 +316,13 @@ namespace sax_fastparser {
     Sequence< OUString > FastSaxSerializer::getSupportedServiceNames(void) throw (RuntimeException)
     {
         Sequence<OUString> seq(1);
-        seq.getArray()[0] = OUString::createFromAscii( SERIALIZER_SERVICE_NAME );
+        seq.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SERIALIZER_SERVICE_NAME ));
         return seq;
     }
 
     OUString FastSaxSerializer::getImplementationName_Static()
     {
-        return OUString::createFromAscii( SERIALIZER_IMPLEMENTATION_NAME );
+        return OUString(RTL_CONSTASCII_USTRINGPARAM( SERIALIZER_IMPLEMENTATION_NAME ));
     }
 
     Sequence< OUString > FastSaxSerializer::getSupportedServiceNames_Static(void)
@@ -323,24 +332,31 @@ namespace sax_fastparser {
         return aRet;
     }
 
-    void FastSaxSerializer::mark()
+    void FastSaxSerializer::mark( Int32Sequence aOrder )
     {
-        maMarkStack.push( ForMerge() );
+        if ( aOrder.hasElements() )
+        {
+            boost::shared_ptr< ForMerge > pSort( new ForSort( aOrder ) );
+            maMarkStack.push( pSort );
+        }
+        else
+        {
+            boost::shared_ptr< ForMerge > pMerge( new ForMerge( ) );
+            maMarkStack.push( pMerge );
+        }
     }
 
 #if DEBUG
     void FastSaxSerializer::printMarkStack( )
     {
-        ::std::stack< ForMerge > aCopy( maMarkStack );
+        ::std::stack< boost::shared_ptr< ForMerge > > aCopy( maMarkStack );
         int nSize = aCopy.size();
         int i = 0;
         while ( !aCopy.empty() )
         {
             fprintf( stderr, "%d\n", nSize - i );
 
-            ForMerge aMarks = aCopy.top( );
-            aMarks.print();
-
+            aCopy.top( )->print( );
 
             fprintf( stderr, "\n" );
 
@@ -357,19 +373,19 @@ namespace sax_fastparser {
 
         if ( maMarkStack.size() == 1 )
         {
-            mxOutputStream->writeBytes( maMarkStack.top().getData() );
+            mxOutputStream->writeBytes( maMarkStack.top()->getData() );
             maMarkStack.pop();
             return;
         }
 
-        const Int8Sequence aMerge( maMarkStack.top().getData() );
+        const Int8Sequence aMerge( maMarkStack.top()->getData() );
         maMarkStack.pop();
 
         switch ( eMergeType )
         {
-            case MERGE_MARKS_APPEND:   maMarkStack.top().append( aMerge );   break;
-            case MERGE_MARKS_PREPEND:  maMarkStack.top().prepend( aMerge );  break;
-            case MERGE_MARKS_POSTPONE: maMarkStack.top().postpone( aMerge ); break;
+            case MERGE_MARKS_APPEND:   maMarkStack.top()->append( aMerge );   break;
+            case MERGE_MARKS_PREPEND:  maMarkStack.top()->prepend( aMerge );  break;
+            case MERGE_MARKS_POSTPONE: maMarkStack.top()->postpone( aMerge ); break;
         }
     }
 
@@ -378,7 +394,7 @@ namespace sax_fastparser {
         if ( maMarkStack.empty() )
             mxOutputStream->writeBytes( aData );
         else
-            maMarkStack.top().append( aData );
+            maMarkStack.top()->append( aData );
     }
 
     FastSaxSerializer::Int8Sequence& FastSaxSerializer::ForMerge::getData()
@@ -445,6 +461,71 @@ namespace sax_fastparser {
         }
     }
 
+    void FastSaxSerializer::ForMerge::resetData( )
+    {
+        maData = Int8Sequence();
+    }
+
+    void FastSaxSerializer::ForSort::setCurrentElement( sal_Int32 nElement )
+    {
+        SequenceAsVector< sal_Int32 > aOrder( maOrder );
+        if( std::find( aOrder.begin(), aOrder.end(), nElement ) != aOrder.end() )
+        {
+            mnCurrentElement = nElement;
+            if ( maData.find( nElement ) == maData.end() )
+                maData[ nElement ] = Int8Sequence();
+        }
+    }
+
+    void FastSaxSerializer::ForSort::prepend( const Int8Sequence &rWhat )
+    {
+        append( rWhat );
+    }
+
+    void FastSaxSerializer::ForSort::append( const Int8Sequence &rWhat )
+    {
+        merge( maData[mnCurrentElement], rWhat, true );
+    }
+
+    void FastSaxSerializer::ForSort::sort()
+    {
+        // Clear the ForMerge data to avoid duplicate items
+        resetData();
+
+        // Sort it all
+        std::map< sal_Int32, Int8Sequence >::iterator iter;
+        for ( sal_Int32 i=0, len=maOrder.getLength(); i < len; i++ )
+        {
+            iter = maData.find( maOrder[i] );
+            if ( iter != maData.end() )
+                ForMerge::append( iter->second );
+        }
+    }
+
+    FastSaxSerializer::Int8Sequence& FastSaxSerializer::ForSort::getData()
+    {
+        sort( );
+        return ForMerge::getData();
+    }
+
+#if DEBUG
+    void FastSaxSerializer::ForSort::print( )
+    {
+        std::map< sal_Int32, Int8Sequence >::iterator iter = maData.begin();
+        while ( iter != maData.end( ) )
+        {
+            fprintf( stderr, "pair: %d, ", iter->first );
+            for ( sal_Int32 i=0, len=iter->second.getLength(); i < len; i++ )
+                fprintf( stderr, "%c", iter->second[i] );
+            fprintf( stderr, "\n" );
+            iter++;
+        }
+
+        sort( );
+        ForMerge::print();
+    }
+#endif
+
 } // namespace sax_fastparser
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sax/source/tools/fastserializer.hxx b/sax/source/tools/fastserializer.hxx
index cb57be1f61fb..493ef5cb3c92 100644
--- a/sax/source/tools/fastserializer.hxx
+++ b/sax/source/tools/fastserializer.hxx
@@ -36,6 +36,9 @@
 #include <cppuhelper/implbase2.hxx>
 
 #include <stack>
+#include <map>
+
+#include <boost/shared_ptr.hpp>
 
 #include "sax/dllapi.h"
 #include "sax/fshelper.hxx"
@@ -47,6 +50,9 @@ namespace sax_fastparser {
 
 class SAX_DLLPUBLIC FastSaxSerializer : public ::cppu::WeakImplHelper2< ::com::sun::star::xml::sax::XFastSerializer, ::com::sun::star::lang::XServiceInfo >
 {
+    typedef ::com::sun::star::uno::Sequence< ::sal_Int8 > Int8Sequence;
+    typedef ::com::sun::star::uno::Sequence< ::sal_Int32 > Int32Sequence;
+
 public:
     explicit            FastSaxSerializer(  );
     virtual             ~FastSaxSerializer();
@@ -102,7 +108,7 @@ public:
           mergeTopMarks( true ), mergeTopMarks(), /r, /p
         and you are done.
      */
-    void mark();
+    void mark( Int32Sequence aOrder = Int32Sequence() );
 
     /** Merge 2 topmost marks.
 
@@ -125,7 +131,6 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > mxOutputStream;
     ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastTokenHandler > mxFastTokenHandler;
 
-    typedef ::com::sun::star::uno::Sequence< ::sal_Int8 > Int8Sequence;
     class ForMerge
     {
         Int8Sequence maData;
@@ -134,24 +139,54 @@ private:
     public:
         ForMerge() : maData(), maPostponed() {}
 
-        Int8Sequence& getData();
+        virtual void setCurrentElement( ::sal_Int32 /*nToken*/ ) {}
+        virtual Int8Sequence& getData();
 #if DEBUG
-        void print();
+        virtual void print();
 #endif
 
-        void prepend( const Int8Sequence &rWhat );
-        void append( const Int8Sequence &rWhat );
+        virtual void prepend( const Int8Sequence &rWhat );
+        virtual void append( const Int8Sequence &rWhat );
         void postpone( const Int8Sequence &rWhat );
 
-    private:
+    protected:
+        void resetData( );
         static void merge( Int8Sequence &rTop, const Int8Sequence &rMerge, bool bAppend );
     };
 
+    class ForSort : public ForMerge
+    {
+        std::map< ::sal_Int32, Int8Sequence > maData;
+        sal_Int32 mnCurrentElement;
+
+        Int32Sequence maOrder;
+
+    public:
+        ForSort( Int32Sequence aOrder ) :
+            ForMerge(),
+            maData(),
+            mnCurrentElement( 0 ),
+            maOrder( aOrder ) {}
+
+        void setCurrentElement( ::sal_Int32 nToken );
+
+        virtual Int8Sequence& getData();
+
+#if DEBUG
+        virtual void print();
+#endif
+
+        virtual void prepend( const Int8Sequence &rWhat );
+        virtual void append( const Int8Sequence &rWhat );
+    private:
+        void sort();
+    };
+
 #if DEBUG
         void printMarkStack( );
 #endif
 
-    ::std::stack< ForMerge > maMarkStack;
+    ::std::stack< boost::shared_ptr< ForMerge > > maMarkStack;
 
     void writeFastAttributeList( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs );
     void write( const ::rtl::OUString& s );
diff --git a/sax/source/tools/fshelper.cxx b/sax/source/tools/fshelper.cxx
index 16b3acb3e021..3096dc6a3ee2 100644
--- a/sax/source/tools/fshelper.cxx
+++ b/sax/source/tools/fshelper.cxx
@@ -183,9 +183,9 @@ FastSerializerHelper* FastSerializerHelper::writeId(sal_Int32 tokenId)
     return mpSerializer->getOutputStream();
 }
 
-void FastSerializerHelper::mark()
+void FastSerializerHelper::mark( Sequence< sal_Int32 > aOrder )
 {
-    mpSerializer->mark();
+    mpSerializer->mark( aOrder );
 }
 
 void FastSerializerHelper::mergeTopMarks( MergeMarksEnum eMergeType )
diff --git a/sax/test/sax/testsax.cxx b/sax/test/sax/testsax.cxx
index fcc083e4fda4..ece7d7327129 100644
--- a/sax/test/sax/testsax.cxx
+++ b/sax/test/sax/testsax.cxx
@@ -237,7 +237,7 @@ Reference < XInputStream > createStreamFromSequence(
     const Reference < XMultiServiceFactory > &xSMgr )
 {
     Reference < XInterface > xOutStreamService =
-        xSMgr->createInstance( OUString::createFromAscii("com.sun.star.io.Pipe") );
+        xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe")) );
     OSL_ASSERT( xOutStreamService.is() );
     Reference< XOutputStream >  rOutStream( xOutStreamService , UNO_QUERY );
     OSL_ASSERT( rOutStream.is() );
diff --git a/sax/test/sax/testwriter.cxx b/sax/test/sax/testwriter.cxx
index 68df101bde23..33ee9fa97073 100644
--- a/sax/test/sax/testwriter.cxx
+++ b/sax/test/sax/testwriter.cxx
@@ -348,7 +348,7 @@ void OSaxWriterTest::testInvariant( const OUString& TestName,
                                     const Reference < XInterface >& TestObject )
     throw  (    IllegalArgumentException, RuntimeException)
 {
-    if( OUString::createFromAscii("com.sun.star.xml.sax.Writer") == TestName ) {
+    if( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer")) == TestName ) {
         Reference< XDocumentHandler > doc( TestObject , UNO_QUERY );
         Reference< XExtendedDocumentHandler > ext( TestObject , UNO_QUERY );
         Reference< XActiveDataSource > source( TestObject , UNO_QUERY );
diff --git a/sax/test/saxdemo.cxx b/sax/test/saxdemo.cxx
index 18715609a4c0..2c145b999683 100644
--- a/sax/test/saxdemo.cxx
+++ b/sax/test/saxdemo.cxx
@@ -509,7 +509,7 @@ int main (int argc, char **argv)
     {
         // Create registration service
         Reference < XInterface > x = xSMgr->createInstance(
-            OUString::createFromAscii( "com.sun.star.registry.ImplementationRegistration" ) );
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration")) );
         xReg = Reference<  XImplementationRegistration > ( x , UNO_QUERY );
     }
     catch( Exception & ) {
@@ -521,10 +521,9 @@ int main (int argc, char **argv)
     try
     {
         // Load dll for the tested component
-        OUString aDllName =
-            OUString::createFromAscii( "sax.uno" SAL_DLLEXTENSION );
+        OUString aDllName(RTL_CONSTASCII_USTRINGPARAM( "sax.uno" SAL_DLLEXTENSION ));
         xReg->registerImplementation(
-            OUString::createFromAscii( "com.sun.star.loader.SharedLibrary" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")),
             aDllName,
             Reference< XSimpleRegistry > ()  );
     }
@@ -541,7 +540,7 @@ int main (int argc, char **argv)
     // read xml from a file and count elements
     //--------------------------------
     Reference< XInterface > x = xSMgr->createInstance(
-        OUString::createFromAscii( "com.sun.star.xml.sax.Parser" ) );
+        OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) );
     if( x.is() )
     {
         Reference< XParser > rParser( x , UNO_QUERY );
@@ -581,7 +580,7 @@ int main (int argc, char **argv)
     //----------------------
     // The SAX-Writer demo
     //----------------------
-    x= xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.xml.sax.Writer" ) );
+    x= xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer")) );
     if( x.is() )
     {
         printf( "start writing to %s\n" , argv[2] );
diff --git a/sax/test/testcomponent.cxx b/sax/test/testcomponent.cxx
index c92e416fc791..e395add9f662 100644
--- a/sax/test/testcomponent.cxx
+++ b/sax/test/testcomponent.cxx
@@ -79,7 +79,7 @@ int main (int argc, char **argv)
     {
         // Create registration service
         Reference < XInterface > x = xSMgr->createInstance(
-            OUString::createFromAscii( "com.sun.star.registry.ImplementationRegistration" ) );
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration")) );
         xReg = Reference<  XImplementationRegistration > ( x , UNO_QUERY );
     }
     catch( Exception & ) {
@@ -102,7 +102,7 @@ int main (int argc, char **argv)
             aDllName += OUString( RTL_CONSTASCII_USTRINGPARAM(".so"));
 #endif
             xReg->registerImplementation(
-                OUString::createFromAscii( "com.sun.star.loader.SharedLibrary" ),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")),
                 aDllName,
                 xSimpleReg );
         }
@@ -130,7 +130,7 @@ int main (int argc, char **argv)
 #endif
 
         xReg->registerImplementation(
-            OUString::createFromAscii( "com.sun.star.loader.SharedLibrary" ) ,
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")) ,
             aDllName,
             xSimpleReg );
     }
diff --git a/sc/addin/inc/rot13.hrc b/sc/addin/inc/rot13.hrc
index a610c9cc6663..dba43401537f 100644
--- a/sc/addin/inc/rot13.hrc
+++ b/sc/addin/inc/rot13.hrc
@@ -32,4 +32,3 @@
 #define ROT13_PAR1_DESC 3
 
 #endif
-
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index c5bf78960c65..23e2bee184ad 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -92,7 +92,7 @@ const SCSIZE   SCSIZE_MAX   = ::std::numeric_limits<SCSIZE>::max();
 // Count values
 const SCROW       MAXROWCOUNT    = MAXROWCOUNT_DEFINE;
 const SCCOL       MAXCOLCOUNT    = MAXCOLCOUNT_DEFINE;
-const SCTAB       MAXTABCOUNT    = 256;
+const SCTAB       MAXTABCOUNT    = 1024;
 const SCCOLROW    MAXCOLROWCOUNT = MAXROWCOUNT;
 // Maximum values
 const SCROW       MAXROW         = MAXROWCOUNT - 1;
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 1229042f5ff0..405f2a26d6e1 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -533,8 +533,6 @@ private:
         { return c < 128 ? pConv->getCharTableFlags(c, cLast) : 0; }
 };
 
-SC_DLLPUBLIC String GetScCompilerNativeSymbol( OpCode eOp ); //CHINA001
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 117ae0be99ca..f1a7aecd77cd 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -46,13 +46,7 @@
 #include <memory>
 #include <map>
 #include <set>
-
-// Wang Xu Ming -- 2009-8-17
-// DataPilot Migration - Cache&&Performance
 #include <list>
-#include "dpobject.hxx"
-#include "dptabdat.hxx"
-// End Comments
 
 class KeyEvent;
 class OutputDevice;
@@ -152,6 +146,8 @@ class ScRowBreakIterator;
 struct ScSetStringParam;
 class ScDocRowHeightUpdater;
 struct ScColWidthParam;
+class ScDPTableDataCache;
+struct ScCopyBlockFromClipParams;
 
 namespace com { namespace sun { namespace star {
     namespace lang {
@@ -176,14 +172,6 @@ namespace com { namespace sun { namespace star {
 } } }
 
 #include <svl/zforlist.hxx>
-/*
-#ifdef _ZFORLIST_DECLARE_TABLE
-class SvNumberFormatterIndexTable;
-#else
-class Table;
-typedef Table SvNumberFormatterIndexTable;
-#endif
-*/
 
 #define SC_DOC_NEW          0xFFFF
 
@@ -211,27 +199,6 @@ struct ScDocStat
     USHORT  nPageCount;
 };
 
-// The constant parameters to CopyBlockFromClip
-struct ScCopyBlockFromClipParams
-{
-    ScDocument* pRefUndoDoc;
-    ScDocument* pClipDoc;
-    USHORT      nInsFlag;
-    SCTAB       nTabStart;
-    SCTAB       nTabEnd;
-    BOOL        bAsLink;
-    BOOL        bSkipAttrForEmpty;
-};
-
-
-// for loading of binary file format symbol string cells which need font conversion
-struct ScSymbolStringCellEntry
-{
-    ScStringCell*   pCell;
-    SCROW           nRow;
-};
-
-
 // -----------------------------------------------------------------------
 
 // DDE link modes
@@ -240,7 +207,6 @@ const BYTE SC_DDE_ENGLISH       = 1;
 const BYTE SC_DDE_TEXT          = 2;
 const BYTE SC_DDE_IGNOREMODE    = 255;       /// For usage in FindDdeLink() only!
 
-
 // -----------------------------------------------------------------------
 
 class ScDocument
@@ -280,7 +246,6 @@ private:
     ScDPCollection*     pDPCollection;
     // Wang Xu Ming -- 2009-8-17
     // DataPilot Migration - Cache&&Performance
-    std::list<ScDPObject>        m_listDPObjectsInClip;
     std::list<ScDPTableDataCache*>   m_listDPObjectsCaches;
     // End Comments
     ScChartCollection*  pChartCollection;
@@ -469,7 +434,7 @@ public:
     SC_DLLPUBLIC const String&  GetName() const { return aDocName; }
     void            SetName( const String& r ) { aDocName = r; }
     const String&   GetCodeName() const { return aDocCodeName; }
-    void            SetCodeName( const String& r ) { aDocCodeName = r; }
+    void                SetCodeName( const String& r ) { aDocCodeName = r; }
 
     SC_DLLPUBLIC NameToNameMap*              GetLocalNameMap( SCTAB& rTab );
 
@@ -567,7 +532,7 @@ public:
     SC_DLLPUBLIC BOOL           HasTable( SCTAB nTab ) const;
     SC_DLLPUBLIC BOOL           GetName( SCTAB nTab, String& rName ) const;
     SC_DLLPUBLIC BOOL           GetCodeName( SCTAB nTab, String& rName ) const;
-    SC_DLLPUBLIC BOOL           SetCodeName( SCTAB nTab, String& rName );
+    SC_DLLPUBLIC BOOL                   SetCodeName( SCTAB nTab, const String& rName );
     SC_DLLPUBLIC BOOL           GetTable( const String& rName, SCTAB& rTab ) const;
     SC_DLLPUBLIC inline SCTAB   GetTableCount() const { return nMaxTableNumber; }
     SvNumberFormatterIndexTable* GetFormatExchangeList() const { return pFormatExchangeList; }
@@ -1561,6 +1526,7 @@ public:
     BOOL            GetNoSetDirty() const { return bNoSetDirty; }
     void            SetInsertingFromOtherDoc( BOOL bVal ) { bInsertingFromOtherDoc = bVal; }
     BOOL            IsInsertingFromOtherDoc() const { return bInsertingFromOtherDoc; }
+    bool            IsLoadingMedium() const;
     void            SetLoadingMedium( bool bVal );
     void            SetImportingXML( bool bVal );
     bool            IsImportingXML() const { return bImportingXML; }
diff --git a/sc/inc/dpcachetable.hxx b/sc/inc/dpcachetable.hxx
index 98ead38d114d..22e57a2ac495 100644
--- a/sc/inc/dpcachetable.hxx
+++ b/sc/inc/dpcachetable.hxx
@@ -57,17 +57,11 @@ class ScDPDimension;
 class ScDPCollection;
 struct ScDPCacheCell;
 struct ScQueryParam;
-// Wang Xu Ming -- 2009-8-17
-// DataPilot Migration - Cache&&Performance
 class ScDPItemData;
-// End Comments
 class Date;
 
-// Wang Xu Ming -- 2009-8-17
-// DataPilot Migration - Cache&&Performance
 class ScDPTableDataCache;
 struct ScDPValueData;
-// End Comments
 // ----------------------------------------------------------------------------
 
 class SC_DLLPUBLIC ScDPCacheTable
@@ -76,18 +70,12 @@ public:
     /** individual filter item used in SingleFilter and GroupFilter. */
     struct FilterItem
     {
-        // Wang Xu Ming -- 2009-8-17
-        // DataPilot Migration - Cache&&Performance
-        String       maString;
-        // End Comments
+        String      maString;
         double      mfValue;
         bool        mbHasValue;
 
         FilterItem();
-// Wang Xu Ming -- 2009-8-17
-// DataPilot Migration - Cache&&Performance
-    bool  match( const  ScDPItemData& rCellData ) const;
-// End Comments
+        bool match( const  ScDPItemData& rCellData ) const;
     };
 
     /** interface class used for filtering of rows. */
@@ -96,27 +84,19 @@ public:
     public:
         /** returns true if the matching condition is met for a single cell
             value, or false otherwise. */
-// Wang Xu Ming -- 2009-8-17
-// DataPilot Migration - Cache&&Performance
         virtual bool match( const  ScDPItemData& rCellData ) const = 0;
-// End Comments
     };
 
     /** ordinary single-item filter. */
     class SingleFilter : public FilterBase
     {
     public:
-        // Wang Xu Ming -- 2009-8-17
-        // DataPilot Migration - Cache&&Performance
         explicit SingleFilter(String aString, double fValue, bool bHasValue);
-        // End Comments
-        virtual ~SingleFilter(){}
-
-       // Wang Xu Ming -- 2009-8-17
-        // DataPilot Migration - Cache&&Performance
-         virtual bool match(const ScDPItemData& rCellData) const;
-         // End Comments
-        const String    getMatchString();
+        virtual ~SingleFilter() {}
+
+        virtual bool match(const ScDPItemData& rCellData) const;
+
+        const String&   getMatchString();
         double          getMatchValue() const;
         bool            hasValue() const;
 
@@ -130,20 +110,13 @@ public:
     class GroupFilter : public FilterBase
     {
     public:
-        // Wang Xu Ming -- 2009-8-17
-        // DataPilot Migration - Cache&&Performance
         GroupFilter();
-        // End Comments
-        virtual ~GroupFilter(){}
-        // Wang Xu Ming -- 2009-8-17
-        // DataPilot Migration - Cache&&Performance
+        virtual ~GroupFilter() {}
         virtual bool match(  const  ScDPItemData& rCellData ) const;
-        // End Comments
         void addMatchItem(const String& rStr, double fVal, bool bHasValue);
         size_t getMatchItemCount() const;
 
     private:
-
         ::std::vector<FilterItem> maItems;
     };
 
@@ -155,26 +128,23 @@ public:
 
         Criterion();
     };
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
-    ScDPCacheTable( ScDocument* pDoc,long nId );
-    // End Comments
+
+    ScDPCacheTable( ScDocument* pDoc, long nId );
     ~ScDPCacheTable();
 
     sal_Int32 getRowSize() const;
     sal_Int32 getColSize() const;
 
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
-    ScDPTableDataCache* GetCache() const;
+    ScDPTableDataCache* getCache() const;
+
     /** Fill the internal table from the cell range provided.  This function
-    assumes that the first row is the column header. */
-    void fillTable( const ScQueryParam& rQuery, BOOL* pSpecial,
+        assumes that the first row is the column header. */
+    void fillTable( const ScQueryParam& rQuery, bool* pSpecial,
         bool bIgnoreEmptyRows, bool bRepeatIfEmpty );
+
     /** Fill the internal table from database connection object.  This function
         assumes that the first row is the column header. */
     void fillTable();
-    // End Comments
 
     /** Check whether a specified row is active or not.  When a row is active,
         it is used in calculation of the results data.  A row becomes inactive
@@ -191,20 +161,17 @@ public:
     const ScDPItemData* getCell(SCCOL nCol, SCROW nRow, bool bRepeatIfEmpty) const;
     void  getValue( ScDPValueData& rVal, SCCOL nCol, SCROW nRow, bool bRepeatIfEmpty) const;
     String getFieldName( SCCOL  nIndex) const;
-    //End Comments
 
     /** Get the field index (i.e. column ID in the original data source) based
         on the string value that corresponds with the column title.  It returns
         -1 if no field matching the string value exists. */
     sal_Int32 getFieldIndex(const String& rStr) const;
 
-  // Wang Xu Ming -- 2009-8-17
-  // DataPilot Migration - Cache&&Performance
    /** Get the unique entries for a field specified by index.  The caller must
-        make sure that the table is filled before calling function, or it will
-        get an empty collection. */
+       make sure that the table is filled before calling function, or it will
+       get an empty collection. */
     const ::std::vector<SCROW>& getFieldEntries( sal_Int32 nColumn ) const;
-    // End Comments
+
     /** Filter the table based on the specified criteria, and copy the
         result to rTabData.  This method is used, for example, to generate
         a drill-down data table. */
@@ -228,24 +195,18 @@ private:
      */
     bool isRowQualified(sal_Int32 nRow, const ::std::vector<Criterion>& rCriteria, const ::std::hash_set<sal_Int32>& rRepeatIfEmptyDims) const;
     void getValueData(ScDocument* pDoc, const ScAddress& rPos, ScDPCacheCell& rCell);
-   // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
-   void InitNoneCache( ScDocument* pDoc );
-    // End Comments
+    void initNoneCache( ScDocument* pDoc );
+
 private:
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     /** unique field entires for each field (column). */
     ::std::vector< ::std::vector<SCROW> > maFieldEntries;
-    // End Comments
+
     /** used to track visibility of rows.  The first row below the header row
         has the index of 0. */
     ::std::vector<bool> maRowsVisible;
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
+
     ScDPTableDataCache* mpCache;
     ScDPTableDataCache* mpNoneCache;
-    // End Comments
 };
 #endif
 
diff --git a/sc/inc/dpglobal.hxx b/sc/inc/dpglobal.hxx
index 73da14d17642..253f478cbf2b 100644
--- a/sc/inc/dpglobal.hxx
+++ b/sc/inc/dpglobal.hxx
@@ -29,9 +29,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-// Wang Xu Ming - DataPilot migration
-// Buffer&&Performance
-//
+
 #ifndef _SC_DPGLOBAL_HXX
 #define _SC_DPGLOBAL_HXX
 
@@ -107,6 +105,9 @@
 
 class TypedStrData;
 class ScDPObject;
+class ScDPInfoWnd;
+class ScDocShell;
+class ScTabViewShell;
 
 class SC_DLLPUBLIC ScDPItemData
 {
@@ -122,25 +123,25 @@ private:
     String  aString;
     double  fValue;
     BYTE    mbFlag;
-    //BOOL  bHasValue: 1 ;
-    //BOOL  bHasData: 1;
-    //BOOL  bErr: 1;
+    //bool  bHasValue: 1 ;
+    //bool  bHasData: 1;
+    //bool  bErr: 1;
 
     friend class ScDPTableDataCache;
 public:
     ScDPItemData() : nNumFormat( 0 ), fValue(0.0), mbFlag( 0 ){}
     ScDPItemData( ULONG nNF, const String & rS, double fV, BYTE bF ):nNumFormat(nNF), aString(rS), fValue(fV), mbFlag( bF ){}
-    ScDPItemData( const String& rS, double fV = 0.0, BOOL bHV = FALSE, const ULONG nNumFormat = 0 , BOOL bData = TRUE) ;
+    ScDPItemData( const String& rS, double fV = 0.0, bool bHV = FALSE, const ULONG nNumFormat = 0 , bool bData = TRUE) ;
     ScDPItemData( ScDocument* pDoc, SCROW nRow, USHORT nCol, USHORT nDocTab );
 
     void        SetString( const String& rS ) { aString = rS; mbFlag &= ~(MK_VAL|MK_DATE); nNumFormat = 0; mbFlag |= MK_DATA; }
 //  void        SetValue ( double value , ULONG nNumFormat = 0 ) { bHasValue = TRUE; nNumFormat = 0;bHasData = TRUE; bDate = FALSE; fValue = value ;}
-    BOOL        IsCaseInsEqual( const ScDPItemData& r ) const;
+    bool        IsCaseInsEqual( const ScDPItemData& r ) const;
 
     size_t      Hash() const;
 
     // exact equality
-    BOOL        operator==( const ScDPItemData& r ) const;
+    bool        operator==( const ScDPItemData& r ) const;
     // case insensitive equality
     static sal_Int32    Compare( const ScDPItemData& rA, const ScDPItemData& rB );
 
@@ -149,16 +150,16 @@ public:
 #endif
 
 public:
-    BOOL IsHasData() const ;
-    BOOL IsHasErr() const ;
-    BOOL IsValue() const;
+    bool IsHasData() const ;
+    bool IsHasErr() const ;
+    bool IsValue() const;
     String  GetString() const ;
     double  GetValue() const ;
     ULONG    GetNumFormat() const ;
-    BOOL HasStringData() const ;
-    BOOL IsDate() const;
-    BOOL HasDatePart() const;
-    void SetDate( BOOL b ) ;
+    bool HasStringData() const ;
+    bool IsDate() const;
+    bool HasDatePart() const;
+    void SetDate( bool b ) ;
 
     TypedStrData*  CreateTypeString( );
     sal_uInt8    GetType() const;
@@ -169,11 +170,10 @@ public:
 class SC_DLLPUBLIC ScDPItemDataPool
 {
 public:
-    // construct
-    ScDPItemDataPool(void);
+    ScDPItemDataPool();
     ScDPItemDataPool(const ScDPItemDataPool& r);
 
-    virtual ~ScDPItemDataPool(void);
+    virtual ~ScDPItemDataPool();
     virtual const ScDPItemData* getData( sal_Int32 nId  );
     virtual sal_Int32 getDataId( const ScDPItemData& aData );
     virtual sal_Int32 insertData( const ScDPItemData& aData );
@@ -189,13 +189,10 @@ protected:
     DataHash  maItemIds;
 };
 
-class ScDPInfoWnd;
-class ScDocShell;
-class ScTabViewShell;
 namespace ScDPGlobal
 {
 // used for core data
-    String GetFieldFuncString( const String& rSourceName, USHORT &rFuncMask, BOOL bIsValue );
+    String GetFieldFuncString( const String& rSourceName, USHORT &rFuncMask, bool bIsValue );
     String GetFuncString( const String &rString, const USHORT nIndex );
     com::sun::star::uno::Reference<com::sun::star::container::XNameAccess> DP_GetMembers( const com::sun::star::uno::Reference<
                                                                                       com::sun::star::sheet::XDimensionsSupplier>&rSrc, long nField );
@@ -204,7 +201,7 @@ namespace ScDPGlobal
     Rectangle operator *( const Rectangle &rLeft, const std::pair<double,double> & rRight );
 // used for  DataPilot Panel
     ScDPInfoWnd* GetDPInfoWnd( ScTabViewShell *pViewShell );
-   bool ChkDPTableOverlap( ScDocument *pDestDoc, std::list<ScDPObject> & rClipboard, SCCOL nClipStartCol, SCROW nClipStartRow, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab, USHORT nEndTab, BOOL bExcludeClip = FALSE );
+   bool ChkDPTableOverlap( ScDocument *pDestDoc, std::list<ScDPObject> & rClipboard, SCCOL nClipStartCol, SCROW nClipStartRow, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab, USHORT nEndTab, bool bExcludeClip = FALSE );
 
 }
 #endif
diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx
index 13a201c0020e..5143125d637f 100644
--- a/sc/inc/dpshttab.hxx
+++ b/sc/inc/dpshttab.hxx
@@ -42,10 +42,8 @@ namespace com { namespace sun { namespace star { namespace sheet {
 }}}}
 
 class ScDPDimension;
-// Wang Xu Ming -- 2009-8-17
-// DataPilot Migration - Cache&&Performance
 class ScDPItemData;
-// End Comments
+
 // --------------------------------------------------------------------
 //
 //  implementation of ScDPTableData with sheet data
@@ -59,33 +57,27 @@ struct ScSheetSourceDesc
     BOOL operator== ( const ScSheetSourceDesc& rOther ) const
         { return aSourceRange == rOther.aSourceRange &&
                  aQueryParam  == rOther.aQueryParam; }
-// Wang Xu Ming - DataPilot migration
-// Buffer&&Performance
     ScDPTableDataCache* CreateCache( ScDocument* pDoc, long nID = -1) const;
     ULONG CheckValidate( ScDocument* pDoc  ) const;
     ScDPTableDataCache* GetCache( ScDocument* pDoc, long nID ) const;
     ScDPTableDataCache*  GetExistDPObjectCache ( ScDocument* pDoc  ) const;
     long    GetCacheId( ScDocument* pDoc, long nID ) const;
-
-// End Comments
 };
 
 class SC_DLLPUBLIC ScSheetDPData : public ScDPTableData
 {
 private:
     ScQueryParam    aQuery;
-    BOOL*                pSpecial;
-    BOOL            bIgnoreEmptyRows;
-    BOOL            bRepeatIfEmpty;
+    bool*           pSpecial;
+    bool            bIgnoreEmptyRows;
+    bool            bRepeatIfEmpty;
 
        ScDPCacheTable  aCacheTable;
 
 public:
-    // Wang Xu Ming -- 2009-8-17
-    // DataPilot Migration - Cache&&Performance
     ScSheetDPData( ScDocument* pD, const ScSheetSourceDesc& rDesc, long nCacheId = -1 );
-    virtual         ~ScSheetDPData();
-    // End Comments
+    virtual ~ScSheetDPData();
+
     virtual long                    GetColumnCount();
     virtual String                  getDimensionName(long nColumn);
     virtual BOOL                    getIsDataLayoutDimension(long nColumn);
diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx
index 89a9deb8efd3..11217f631cf0 100644
--- a/sc/inc/dptabdat.hxx
+++ b/sc/inc/dptabdat.hxx
@@ -93,7 +93,7 @@ class ScDPInitState;
 class ScDPResultMember;
 class ScDocument;
 
- class SC_DLLPUBLIC ScDPTableData
+class SC_DLLPUBLIC ScDPTableData
 {
     //  cached data for GetDatePart
     long    nLastDateVal;
diff --git a/sc/inc/dptablecache.hxx b/sc/inc/dptablecache.hxx
index a662795809f4..9a32729fa71b 100644
--- a/sc/inc/dptablecache.hxx
+++ b/sc/inc/dptablecache.hxx
@@ -29,14 +29,11 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef DPTABLECACHE_HXX
-#define DPTABLECACHE_HXX
-// Wang Xu Ming -- 12/21/2008
-// Add Data Cache Support.
+#ifndef SC_DPTABLECACHE_HXX
+#define SC_DPTABLECACHE_HXX
+
 #include "global.hxx"
-//Added by PengYunQuan for SODC_16015
 #include <svl/zforlist.hxx>
-//end
 #include <vector>
 #include "dpglobal.hxx"
 
@@ -44,30 +41,24 @@
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XRowSet.hpp>
 
-class ScDPTableDataCache;
-class TypedStrData;
 struct ScQueryParam;
 
-// --------------------------------------------------------------------
-//
-//  base class ScDPTableData to allow implementation with tabular data
-//  by deriving only of this
-//
-
 class SC_DLLPUBLIC ScDPTableDataCache
 {
-    long    mnID;
     ScDocument* mpDoc;
 
-    long                         mnColumnCount;     // Column count
+    long    mnID;
+    long    mnColumnCount;
+
+    std::vector<ScDPItemData*>* mpTableDataValues; //Data Pilot Table's index - value map
+    std::vector<SCROW>*         mpSourceData;      //Data Pilot Table's Source data
+    std::vector<SCROW>*         mpGlobalOrder;     //Sorted members index
+    std::vector<SCROW>*         mpIndexOrder;      //Index the sorted number
+    std::vector<ScDPItemData*>  mrLabelNames;      //Source Label data
+    std::vector<bool>           mbEmptyRow;        //If empty row?
+
+    mutable ScDPItemDataPool    maAdditionalDatas;
 
-    std::vector<ScDPItemData*>*      mpTableDataValues; //Data Pilot Table's index - value map
-    std::vector<SCROW>*          mpSourceData;      //Data Pilot Table's Source data
-    std::vector<SCROW>*          mpGlobalOrder;     //Sorted members index
-    std::vector<SCROW>*          mpIndexOrder;      //Index the sorted number
-    std::vector<ScDPItemData*>   mrLabelNames;      //Source Label data
-    std::vector<BOOL>            mbEmptyRow;        //If empty row?
-    mutable ScDPItemDataPool                 maAdditionalDatas;
 public:
     SCROW GetOrder( long nDim, SCROW nIndex ) const;
     SCROW GetIdByItemData( long nDim,  String sItemData  ) const;
@@ -80,7 +71,7 @@ public:
     const ScDPItemData* GetSortedItemData( SCCOL nDim, SCROW nOrder ) const;
     ULONG GetNumType ( ULONG nFormat ) const;
     ULONG GetNumberFormat( long nDim ) const;
-    BOOL  IsDateDimension( long nDim ) const ;
+    bool  IsDateDimension( long nDim ) const ;
     ULONG GetDimNumType( SCCOL nDim) const;
     SCROW GetDimMemberCount( SCCOL nDim ) const;
 
@@ -92,12 +83,12 @@ public:
     bool InitFromDataBase (const  ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& xRowSet, const Date& rNullDate);
 
     SCROW   GetRowCount() const;
-    SCROW   GetItemDataId( USHORT nDim, SCROW nRow, BOOL bRepeatIfEmpty ) const;
+    SCROW   GetItemDataId( USHORT nDim, SCROW nRow, bool bRepeatIfEmpty ) const;
     String  GetDimensionName( USHORT nColumn ) const;
     bool    IsEmptyMember( SCROW nRow, USHORT nColumn ) const;
     bool    IsRowEmpty( SCROW nRow ) const;
     bool    IsValid() const;
-    bool    ValidQuery( SCROW nRow, const ScQueryParam& rQueryParam, BOOL* pSpecial );
+    bool    ValidQuery( SCROW nRow, const ScQueryParam& rQueryParam, bool* pSpecial );
 
     ScDocument* GetDoc() const;//ms-cache-core
     long GetColumnCount() const;
@@ -105,19 +96,16 @@ public:
 
     const ScDPItemData* GetItemDataById( long nDim, SCROW nId ) const;
 
-    BOOL operator== ( const ScDPTableDataCache& r ) const;
+    bool operator== ( const ScDPTableDataCache& r ) const;
 
-//construction
     ScDPTableDataCache( ScDocument* pDoc );
-//deconstruction
     virtual ~ScDPTableDataCache();
 
-protected:
 private:
-    void        AddLabel( ScDPItemData* pData);
-    BOOL    AddData( long nDim, ScDPItemData* itemData );
+    void    AddLabel( ScDPItemData* pData);
+    bool    AddData( long nDim, ScDPItemData* itemData );
 };
 
-#endif //DPTABLECACHE_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index d84044a5da32..4ac4384358f4 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -99,7 +99,6 @@ public:
 class SC_DLLPUBLIC ScDrawLayer : public FmFormModel
 {
 private:
-//REMOVE        SotStorageRef   xPictureStorage;
     String          aName;
     ScDocument*     pDoc;
     SdrUndoGroup*   pUndoGroup;
@@ -128,8 +127,6 @@ public:
 
     virtual SdrLayerID GetControlExportLayerId( const SdrObject & ) const;
 
-//REMOVE        void            ReleasePictureStorage();
-
     BOOL            HasObjects() const;
 
     BOOL            ScAddPage( SCTAB nTab );
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 49ab758b7d0b..862726468d33 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -58,31 +58,12 @@ extern "C" {
 
 #endif
 
-#if 0
-// I18N doesn't get this right, can't specify more than one to ignore
-#define SC_COLLATOR_IGNORES ( \
-    ::com::sun::star::i18n::CollatorOptions::CollatorOptions_IGNORE_CASE | \
-    ::com::sun::star::i18n::CollatorOptions::CollatorOptions_IGNORE_KANA | \
-    ::com::sun::star::i18n::CollatorOptions::CollatorOptions_IGNORE_WIDTH )
-#else
 #define SC_COLLATOR_IGNORES ( \
     ::com::sun::star::i18n::CollatorOptions::CollatorOptions_IGNORE_CASE )
-#endif
-#if 0
-// #107998# Don't ignore Width and Kana. The issue was mainly with AutoInput,
-// but affects also comparison of names in general.
-#define SC_TRANSLITERATION_IGNORECASE ( \
-    ::com::sun::star::i18n::TransliterationModules_IGNORE_CASE | \
-    ::com::sun::star::i18n::TransliterationModules_IGNORE_KANA | \
-    ::com::sun::star::i18n::TransliterationModules_IGNORE_WIDTH )
-#define SC_TRANSLITERATION_CASESENSE ( \
-    ::com::sun::star::i18n::TransliterationModules_IGNORE_KANA | \
-    ::com::sun::star::i18n::TransliterationModules_IGNORE_WIDTH )
-#else
+
 #define SC_TRANSLITERATION_IGNORECASE ( \
     ::com::sun::star::i18n::TransliterationModules_IGNORE_CASE )
 #define SC_TRANSLITERATION_CASESENSE 0
-#endif
 
 //------------------------------------------------------------------------
 
@@ -132,14 +113,6 @@ const SCSIZE PIVOT_MAXPAGEFIELD = 10;
                                         // Oberhalb dieser Grenze liegen
                                         // die Indizes fuer DBBereiche
 
-/*
-#ifdef OS2
-#define PIXEL_PER_INCH      72.0
-#else
-#define PIXEL_PER_INCH      96.0
-#endif
-*/
-
 #define PIXEL_PER_INCH      96.0
 
 #define CM_PER_INCH         2.54
@@ -549,10 +522,6 @@ class ScGlobal
     static SvxBrushItem*    pProtectedBrushItem;
 
     static ImageList*       pOutlineBitmaps;
-    static ImageList*       pOutlineBitmapsHC;
-
-//  static Bitmap*          pAnchorBitmap;
-//  static Bitmap*          pGrayAnchorBitmap;
 
     static ScFunctionList*  pStarCalcFunctionList;
     static ScFunctionMgr*   pStarCalcFunctionMgr;
@@ -584,7 +553,7 @@ public:
     static IntlWrapper*         GetScIntlWrapper();
     static ::com::sun::star::lang::Locale*      GetLocale();
 
-    SC_DLLPUBLIC static ::utl::TransliterationWrapper* GetpTransliteration(); //CHINA001
+    SC_DLLPUBLIC static ::utl::TransliterationWrapper* GetpTransliteration();
     static ::utl::TransliterationWrapper* GetCaseTransliteration();
 
     SC_DLLPUBLIC static LanguageType            eLnge;
@@ -636,12 +605,8 @@ public:
     SC_DLLPUBLIC    static const String&    GetEmptyString();
     static const String&    GetScDocString();
 
-    /** Returns the specified image list with outline symbols.
-        @param bHC  false = standard symbols; true = high contrast symbols. */
-    static ImageList*       GetOutlineSymbols( bool bHC );
-
-//  static const Bitmap&    GetAnchorBitmap();
-//  static const Bitmap&    GetGrayAnchorBitmap();
+    /** Returns the specified image list with outline symbols. */
+    static ImageList*       GetOutlineSymbols();
 
     static bool             HasStarCalcFunctionList();
     static ScFunctionList*  GetStarCalcFunctionList();
@@ -887,10 +852,6 @@ struct ScConsolidateParam
     void                SetAreas        ( ScArea* const* ppAreas, USHORT nCount );
 };
 
-// -----------------------------------------------------------------------
-extern ::utl::TransliterationWrapper* GetScGlobalpTransliteration();//CHINA001
-extern const LocaleDataWrapper* GetScGlobalpLocaleData();
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 3182be9d4e21..d69b34c73dc0 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -28,7 +28,6 @@
 #ifndef __GLOBSTR_HRC_
 #define __GLOBSTR_HRC_
 
-
 #define STR_UNDO_DELETECELLS        1
 #define STR_UNDO_CUT                2
 #define STR_UNDO_PASTE              3
@@ -92,7 +91,6 @@
 #define STR_MSSG_SOLVE_4            60
 #define STR_MSSG_SOLVE_5            61
 #define STR_MSSG_SOLVE_6            62
-// unused: 63
 
 #define STR_TABLE_GESAMTERGEBNIS    64
 #define STR_TABLE_ERGEBNIS          65
@@ -101,7 +99,6 @@
 #define STR_TABLE_ODER              68
 #define STR_UNDO_INSERTCELLS        69
 #define STR_TABLE_DEF               70
-//#define STR_STYLENAME_STANDARD      71 s.u.
 #define STR_MOVE_TO_END             72
 #define STR_BOX_YNI                 73
 #define STR_NO_REF_TABLE            74
@@ -166,8 +163,6 @@
 #define STR_FUN_TEXT_VAR            131
 #define STR_DOC_STAT                132
 
-//#define STR_STYLENAME_RESULT        133 s.u.
-
 #define STR_DBNAME_IMPORT           134
 
 #define STR_NOCHARTATCURSOR         135
@@ -352,7 +347,6 @@
 #define STR_SCATTR_PAGE_SCALETOPAGES 277
 
 #define STR_NOREF_STR               278     /* moved to compiler.src, keep define! */
-// unused: 279
 
 #define STR_UNDO_CHARTDATA          280
 #define STR_UNDO_ORIGINALSIZE       281
@@ -408,7 +402,6 @@
 #define STR_DETINVALID_OVERFLOW     315
 #define STR_GRAPHICNAME             316
 #define STR_INVALIDNAME             317
-//  318 ist oben
 #define STR_ERR_LINKOVERLAP         319
 
 #define STR_VALID_MACRONOTFOUND     320
@@ -597,6 +590,6 @@
 
 #define STR_PGNUM                    457
 
-#define STR_COUNT                       458
+#define STR_COUNT                    458
 
 #endif
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx
index 27d149b3d816..2583546e463e 100644
--- a/sc/inc/nameuno.hxx
+++ b/sc/inc/nameuno.hxx
@@ -52,7 +52,7 @@
 class ScDocShell;
 class ScRangeData;
 class ScTokenArray;
-
+class ScNamedRangesObj;
 
 class ScNamedRangeObj : public ::cppu::WeakImplHelper6<
                             ::com::sun::star::sheet::XNamedRange,
@@ -64,6 +64,7 @@ class ScNamedRangeObj : public ::cppu::WeakImplHelper6<
                         public SfxListener
 {
 private:
+    ScNamedRangesObj*       mpParent;
     ScDocShell*             pDocShell;
     String                  aName;
 
@@ -75,7 +76,7 @@ private:
                                         const formula::FormulaGrammar::Grammar eGrammar );
 
 public:
-                            ScNamedRangeObj(ScDocShell* pDocSh, const String& rNm);
+                            ScNamedRangeObj(ScNamedRangesObj* pParent, ScDocShell* pDocSh, const String& rNm);
     virtual                 ~ScNamedRangeObj();
 
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
@@ -173,10 +174,11 @@ public:
 };
 
 
-class ScNamedRangesObj : public ::cppu::WeakImplHelper5<
+class ScNamedRangesObj : public ::cppu::WeakImplHelper6<
                             ::com::sun::star::sheet::XNamedRanges,
                             ::com::sun::star::container::XEnumerationAccess,
                             ::com::sun::star::container::XIndexAccess,
+                            ::com::sun::star::beans::XPropertySet,
                             ::com::sun::star::document::XActionLockable,
                             ::com::sun::star::lang::XServiceInfo >,
                         public SfxListener
@@ -184,6 +186,11 @@ class ScNamedRangesObj : public ::cppu::WeakImplHelper5<
 private:
     ScDocShell*             pDocShell;
 
+     // if true, adding new name or modifying existing one will set the
+     // document 'modified' and broadcast the change.  We turn this off during
+     // import.
+    sal_Bool                mbModifyAndBroadcast;
+
     ScNamedRangeObj*        GetObjectByIndex_Impl(sal_uInt16 nIndex);
     ScNamedRangeObj*        GetObjectByName_Impl(const ::rtl::OUString& aName);
 
@@ -200,6 +207,8 @@ public:
 
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
+    bool                    IsModifyAndBroadcast() const;
+
                             // XNamedRanges
     virtual void SAL_CALL   addNewByName( const ::rtl::OUString& aName, const ::rtl::OUString& aContent,
                                 const ::com::sun::star::table::CellAddress& aPosition, sal_Int32 nType )
@@ -238,6 +247,47 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException);
     virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException);
 
+                            // XPropertySet
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
+                            SAL_CALL getPropertySetInfo()
+                                throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL   setPropertyValue( const ::rtl::OUString& aPropertyName,
+                                    const ::com::sun::star::uno::Any& aValue )
+                                throw(::com::sun::star::beans::UnknownPropertyException,
+                                    ::com::sun::star::beans::PropertyVetoException,
+                                    ::com::sun::star::lang::IllegalArgumentException,
+                                    ::com::sun::star::lang::WrappedTargetException,
+                                    ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
+                                    const ::rtl::OUString& PropertyName )
+                                throw(::com::sun::star::beans::UnknownPropertyException,
+                                    ::com::sun::star::lang::WrappedTargetException,
+                                    ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL   addPropertyChangeListener( const ::rtl::OUString& aPropertyName,
+                                    const ::com::sun::star::uno::Reference<
+                                        ::com::sun::star::beans::XPropertyChangeListener >& xListener )
+                                throw(::com::sun::star::beans::UnknownPropertyException,
+                                    ::com::sun::star::lang::WrappedTargetException,
+                                    ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL   removePropertyChangeListener( const ::rtl::OUString& aPropertyName,
+                                    const ::com::sun::star::uno::Reference<
+                                        ::com::sun::star::beans::XPropertyChangeListener >& aListener )
+                                throw(::com::sun::star::beans::UnknownPropertyException,
+                                    ::com::sun::star::lang::WrappedTargetException,
+                                    ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL   addVetoableChangeListener( const ::rtl::OUString& PropertyName,
+                                    const ::com::sun::star::uno::Reference<
+                                        ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+                                throw(::com::sun::star::beans::UnknownPropertyException,
+                                    ::com::sun::star::lang::WrappedTargetException,
+                                    ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL   removeVetoableChangeListener( const ::rtl::OUString& PropertyName,
+                                    const ::com::sun::star::uno::Reference<
+                                        ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+                                throw(::com::sun::star::beans::UnknownPropertyException,
+                                    ::com::sun::star::lang::WrappedTargetException,
+                                    ::com::sun::star::uno::RuntimeException);
+
                             // XActionLockable
     virtual sal_Bool SAL_CALL isActionLocked() throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL addActionLock() throw(::com::sun::star::uno::RuntimeException);
diff --git a/sc/inc/refreshtimer.hxx b/sc/inc/refreshtimer.hxx
index b9964300ab85..bbaa90f7cc20 100644
--- a/sc/inc/refreshtimer.hxx
+++ b/sc/inc/refreshtimer.hxx
@@ -34,12 +34,7 @@
 #include <osl/mutex.hxx>
 #include <scdllapi.h>
 
-#define SC_REFRESHTIMER_CONTROL_LIST 0
-#if SC_REFRESHTIMER_CONTROL_LIST
-class ScRefreshTimer;
-DECLARE_LIST( ScRefreshTimerList, ScRefreshTimer* )
-#endif
-
+//=============================================================================
 class ScRefreshTimerControl
 {
 private:
@@ -47,113 +42,99 @@ private:
     USHORT         nBlockRefresh;
 
 public:
-#if SC_REFRESHTIMER_CONTROL_LIST
-            ScRefreshTimerList  aList;
-#endif
-
-                                ScRefreshTimerControl() : nBlockRefresh(0) {}
-
-            void                SetAllowRefresh( BOOL b )
-                                    {
-                                        if ( b && nBlockRefresh )
-                                            --nBlockRefresh;
-                                        else if ( !b && nBlockRefresh < (USHORT)(~0) )
-                                            ++nBlockRefresh;
-                                    }
-            BOOL                IsRefreshAllowed() const    { return !nBlockRefresh; }
-            ::osl::Mutex&       GetMutex()                  { return aMutex; }
-};
+    ScRefreshTimerControl() : nBlockRefresh(0) {}
+
+    void SetAllowRefresh( BOOL b )
+    {
+        if ( b && nBlockRefresh )
+            --nBlockRefresh;
+        else if ( !b && nBlockRefresh < (USHORT)(~0) )
+            ++nBlockRefresh;
+    }
 
+    BOOL IsRefreshAllowed() const { return !nBlockRefresh; }
 
+    ::osl::Mutex& GetMutex() { return aMutex; }
+};
+
+//=============================================================================
 class ScRefreshTimerProtector
 {
 private:
     ScRefreshTimerControl * const * ppControl;
+
 public:
-                                ScRefreshTimerProtector( ScRefreshTimerControl * const *     pp );
-                                ~ScRefreshTimerProtector()
-                                    {
-                                        if ( ppControl && *ppControl )
-                                            (*ppControl)->SetAllowRefresh( TRUE );
-                                    }
+    ScRefreshTimerProtector( ScRefreshTimerControl * const * pp );
+
+    ~ScRefreshTimerProtector()
+    {
+        if ( ppControl && *ppControl )
+            (*ppControl)->SetAllowRefresh( TRUE );
+    }
 };
 
 
+//=============================================================================
 class ScRefreshTimer : public AutoTimer
 {
 private:
     ScRefreshTimerControl * const * ppControl;
 
-            void                AppendToControl()
-                                    {
-#if SC_REFRESHTIMER_CONTROL_LIST
-                                        if ( ppControl && *ppControl )
-                                            (*ppControl)->aList.Insert( this, LIST_APPEND );
-#endif
-                                    }
-            void                RemoveFromControl()
-                                    {
-#if SC_REFRESHTIMER_CONTROL_LIST
-                                        if ( ppControl && *ppControl )
-                                            (*ppControl)->aList.Remove( this );
-#endif
-                                    }
-
-            void                Start()
-                                    {
-                                        if ( GetTimeout() )
-                                            AutoTimer::Start();
-                                    }
+    void AppendToControl() {}
+
+    void RemoveFromControl() {}
+
+    void Start()
+    {
+        if ( GetTimeout() )
+            AutoTimer::Start();
+    }
 
 public:
-                                ScRefreshTimer() : ppControl(0)
-                                    { SetTimeout( 0 ); }
-                                ScRefreshTimer( ULONG nSeconds ) : ppControl(0)
-                                    {
-                                        SetTimeout( nSeconds * 1000 );
-                                        Start();
-                                    }
-                                ScRefreshTimer( const ScRefreshTimer& r )
-                                    : AutoTimer( r ), ppControl(0)
-                                    {}
-    virtual                     ~ScRefreshTimer();
-
-            ScRefreshTimer&     operator=( const ScRefreshTimer& r )
-                                    {
-                                        SetRefreshControl(0);
-                                        AutoTimer::operator=( r );
-                                        return *this;
-                                    }
-
-            BOOL                operator==( const ScRefreshTimer& r ) const
-                                    { return GetTimeout() == r.GetTimeout(); }
-
-            BOOL                operator!=( const ScRefreshTimer& r ) const
-                                    { return !ScRefreshTimer::operator==( r ); }
-
-            void                StartRefreshTimer()
-                                    { Start(); }
-
-            void                SetRefreshControl( ScRefreshTimerControl * const * pp )
-                                    {
-                                        RemoveFromControl();
-                                        ppControl = pp;
-                                        AppendToControl();
-                                    }
-
-            void                SetRefreshHandler( const Link& rLink )
-                                    { SetTimeoutHdl( rLink ); }
-
-            ULONG               GetRefreshDelay() const
-                                    { return GetTimeout() / 1000; }
-
-            void                StopRefreshTimer()
-                                    { Stop(); }
-
-    SC_DLLPUBLIC virtual    void                SetRefreshDelay( ULONG nSeconds );
-    SC_DLLPUBLIC virtual    void                Timeout();
-};
+    ScRefreshTimer() : ppControl(0) { SetTimeout( 0 ); }
+
+    ScRefreshTimer( ULONG nSeconds ) : ppControl(0)
+    {
+        SetTimeout( nSeconds * 1000 );
+        Start();
+    }
+
+    ScRefreshTimer( const ScRefreshTimer& r ) : AutoTimer( r ), ppControl(0) {}
 
+    virtual ~ScRefreshTimer();
+
+    ScRefreshTimer& operator=( const ScRefreshTimer& r )
+    {
+        SetRefreshControl(0);
+        AutoTimer::operator=( r );
+        return *this;
+    }
+
+    BOOL operator==( const ScRefreshTimer& r ) const
+        { return GetTimeout() == r.GetTimeout(); }
+
+    BOOL operator!=( const ScRefreshTimer& r ) const
+        { return !ScRefreshTimer::operator==( r ); }
+
+    void StartRefreshTimer() { Start(); }
+
+    void SetRefreshControl( ScRefreshTimerControl * const * pp )
+    {
+        RemoveFromControl();
+        ppControl = pp;
+        AppendToControl();
+    }
+
+    void SetRefreshHandler( const Link& rLink ) { SetTimeoutHdl( rLink ); }
+
+    ULONG GetRefreshDelay() const { return GetTimeout() / 1000; }
+
+    void StopRefreshTimer() { Stop(); }
+
+    SC_DLLPUBLIC virtual void SetRefreshDelay( ULONG nSeconds );
+
+    SC_DLLPUBLIC virtual void Timeout();
+};
 
 #endif // SC_REFRESHTIMER_HXX
 
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 0720ca056309..c07b721aa04b 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -127,11 +127,6 @@
 #define HID_SC_HF_FRL           ( HID_SC_CONTROL_START + 9 )
 #define HID_SC_HF_FRC           ( HID_SC_CONTROL_START + 10 )
 #define HID_SC_HF_FRR           ( HID_SC_CONTROL_START + 11 )
-//  "Spalten" in Teilergebnissen: Gruppe 1/2/3 - nicht mehr!
-//#define HID_SC_SUBT_COLS_1        ( HID_SC_CONTROL_START + 12 )
-//#define HID_SC_SUBT_COLS_2        ( HID_SC_CONTROL_START + 13 )
-//#define HID_SC_SUBT_COLS_3        ( HID_SC_CONTROL_START + 14 )
-//  Eintraege im Navigator
 #define HID_SC_NAVIPI_ENTRIES   ( HID_SC_CONTROL_START + 15 )
 #define HID_SC_NAVIPI_ROW       ( HID_SC_CONTROL_START + 16 )
 #define HID_SC_NAVIPI_COL       ( HID_SC_CONTROL_START + 17 )
@@ -143,11 +138,12 @@
 #define HID_SC_NAVIPI_ROOT      ( HID_SC_CONTROL_START + 23 )
 #define HID_SC_NAVIPI_SCEN      ( HID_SC_CONTROL_START + 24 )
 #define HID_SC_NAVIPI_DROP      ( HID_SC_CONTROL_START + 25 )
+
 //  Teilergebnisse
 #define HID_SC_SUBT_GROUP       ( HID_SC_CONTROL_START + 26 )
 #define HID_SC_SUBT_COLS        ( HID_SC_CONTROL_START + 27 )
 #define HID_SC_SUBT_FUNC        ( HID_SC_CONTROL_START + 28 )
-//
+
 #define HID_SC_NAVIPI_TOOLBOX   ( HID_SC_CONTROL_START + 29 )
 //  Bereich ist voll!
 
@@ -482,7 +478,6 @@
 #define FID_TESTFUNC9           (SC_VIEW_START + 9)
 #define FID_SCALESTATUS         (SC_VIEW_START + 10)
 #define FID_COLOR               (SC_VIEW_START + 11)
-//aus sfx: #define SID_REPAINT              (SC_VIEW_START + 12)
 #define SID_UPDATECHART         (SC_VIEW_START + 13)
 #define FID_MARKLEFT            (SC_VIEW_START + 14)
 #define FID_MARKRIGHT           (SC_VIEW_START + 15)
@@ -566,7 +561,6 @@
 
 #define SID_CHOOSE_DESIGN       (SC_VIEW_START + 82)
 #define SID_EURO_CONVERTER      (SC_VIEW_START + 83)
-//#define SID_CHG_PROTECT         (SC_VIEW_START + 84)      -> moved to SVX
 #define SID_EXTERNAL_SOURCE     (SC_VIEW_START + 85)
 
 #define SID_SC_INPUT_TEXTWYSIWYG        (SC_VIEW_START + 86)
@@ -653,21 +647,16 @@
 #define SID_OPENDLG_FUNCTION        (SC_MESSAGE_START + 52)
 #define SID_OPENDLG_SOLVE           (SC_MESSAGE_START + 53)
 #define SID_OPENDLG_TABOP           (SC_MESSAGE_START + 54)
-//#define SID_OPENDLG_CHART         (SC_MESSAGE_START + 55)
 #define SID_OPENDLG_EDITFUNCTION    (SC_MESSAGE_START + 56)
 #define SID_OPENDLG_ARGUMENT        (SC_MESSAGE_START + 57)
-//#define SID_OPENDLG_MODCHART      (SC_MESSAGE_START + 58)
 #define SID_OPENDLG_CONDFRMT        (SC_MESSAGE_START + 59)
 #define SID_OPENDLG_OPTSOLVER       (SC_MESSAGE_START + 60)
-//<!--Added by PengYunQuan for Validity Cell Range Picker
 #define SID_VALIDITY_REFERENCE      (SC_MESSAGE_START + 61)
-//-->Added by PengYunQuan for Validity Cell Range Picker
 #define SC_HINT_NAVIGATOR_UPDATEALL  (SC_MESSAGE_START + 65)
 
 // Funktionen ------------------------------------------------------------
 
 
-//#define FID_PRINT_PREVIEW     (SC_FUNCTION_START)
 #define FID_DOC_MANAGER         (SC_FUNCTION_START + 1)
 #define FID_CURSOR_ENTER        (SC_FUNCTION_START + 2)
 #define SID_MAIL                (SC_FUNCTION_START + 3)
@@ -693,7 +682,6 @@
 #define SID_DEL_ROWS            (EDIT_MENU_START + 16)//JN
 #define SID_DEL_COLS            (EDIT_MENU_START + 17)//JN
 
-//#define   FID_CHG_RECORD          (EDIT_MENU_START + 18)  -> moved to SVX
 #define FID_CHG_SHOW            (EDIT_MENU_START + 19)
 
 #define EDIT_MENU_END           (EDIT_MENU_START + 20)
@@ -709,9 +697,7 @@
 #define FID_FUNCTION_BOX        (VIEW_MENU_START + 8)
 #define FID_NORMALVIEWMODE      (VIEW_MENU_START + 9)
 #define FID_TOGGLEFORMULA       (VIEW_MENU_START + 10)
-// Compare/Merge jetzt aus Sfx
-//#define FID_CHG_COMPARE       (VIEW_MENU_START + 16)// DANGER DIRTY ID
-//#define FID_CHG_MERGE         (VIEW_MENU_START + 17)// DANGER DIRTY ID
+
 #define FID_CHG_ACCEPT          (VIEW_MENU_START + 18)// DANGER DIRTY ID
 #define FID_CHG_COMMENT         (VIEW_MENU_START + 19)// DANGER DIRTY ID
 #define VIEW_MENU_END           (VIEW_MENU_START + 20)
@@ -733,8 +719,6 @@
 #define FID_USE_NAME            (INSERT_MENU_START + 13)
 #define FID_APPLY_NAME          (INSERT_MENU_START + 14)
 #define FID_INS_TABLE_EXT       (INSERT_MENU_START + 15)
-//#define SID_CHARMAP               (INSERT_MENU_START + 15)//!!! kommt von sfx
-//aus sfx: #define SID_INSERT_POSTIT       (INSERT_MENU_START + 16)
 #define SID_INSERT_CLIPART      (INSERT_MENU_START + 17) //!!! sollte vom Svx kommen
 #define FID_INS_CELLSDOWN       (INSERT_MENU_START + 18)
 #define FID_INS_CELLSRIGHT      (INSERT_MENU_START + 19)
@@ -799,12 +783,7 @@
 #define SID_UNFILTER            (DATA_MENU_START + 6)
 #define SID_QUERY               (DATA_MENU_START + 7)
 #define SID_SUBTOTALS           (DATA_MENU_START + 8)
-//aus sfx: #define SID_OUTLINE_HIDE        (DATA_MENU_START + 9)
-//aus sfx: #define SID_OUTLINE_SHOW        (DATA_MENU_START + 10)
-//aus sfx: #define SID_OUTLINE_MAKE        (DATA_MENU_START + 11)
-//aus sfx: #define SID_OUTLINE_REMOVE      (DATA_MENU_START + 12)
 #define SID_AUTO_OUTLINE        (DATA_MENU_START + 13)
-//aus sfx: #define SID_OUTLINE_DELETEALL   (DATA_MENU_START + 14)
 #define SID_IMPORT_DATA         (DATA_MENU_START + 15)
 #define SID_REIMPORT_DATA       (DATA_MENU_START + 16)
 #define SID_PIVOT_TABLE         (DATA_MENU_START + 17)
@@ -817,8 +796,7 @@
 
 #define SID_SORT_DESCENDING     (DATA_MENU_START + 23)
 #define SID_SORT_ASCENDING      (DATA_MENU_START + 24)
-//
-//
+
 #define DATA_MENU_END           (DATA_MENU_START + 25)
 
 #define TAB_POPUP_START         (DATA_MENU_END)
@@ -859,12 +837,8 @@
 #define DRAW_BAR_START          (RID_INPUTBAR_END)
 #define SID_DRAWTOABOVE         (DRAW_BAR_START+15)
 #define SID_DRAWTOBELOW         (DRAW_BAR_START+16)
-//#define SID_GROUP             (DRAW_BAR_START+17)
-//#define SID_UNGROUP               (DRAW_BAR_START+18)
 #define SID_FRAMETOTOP          (DRAW_BAR_START+19)
 #define SID_FRAMETOBOTTOM       (DRAW_BAR_START+20)
-//aus sfx: #define SID_FRAME_UP         (DRAW_BAR_START+21)
-//aus sfx: #define SID_FRAME_DOWN           (DRAW_BAR_START+22)
 #define SID_TOOL_TEXT           (DRAW_BAR_START+23)
 #define SID_ANCHOR_PAGE         (DRAW_BAR_START+24)
 #define SID_ANCHOR_CELL         (DRAW_BAR_START+25)
@@ -906,7 +880,6 @@
 #define DETECTIVE_END           (DETECTIVE_START+20)
 
 #define SID_API_SLOTS           (DETECTIVE_END)
-//aus sfx: #define SID_ENTER_STRING     (SID_API_SLOTS)
 #define SID_INSERT_MATRIX       (SID_API_SLOTS+1)
 
 #define SID_DELETE_NOTE         (SID_API_SLOTS+2)
@@ -994,7 +967,6 @@
 #define SID_FILL_COUNT          (SID_NEW_SLOTS+8)
 #define SID_WITH_UNDO           (SID_NEW_SLOTS+9)
 #define FID_MERGE_TOGGLE        (SID_NEW_SLOTS+10)
-//aus sfx: #define SID_ATTR_SECIALCHAR      (SID_NEW_SLOTS+10)
 #define SID_ATTR_ROWHEADERS     (SID_NEW_SLOTS+11)
 #define SID_ATTR_COLHEADERS     (SID_NEW_SLOTS+12)
 
@@ -1110,16 +1082,6 @@
 
 // idl Parameter ---------------------------------------------------------
 
-//aus sfx: #define FN_PARAM_1               (SC_PARAM_START)
-//aus sfx: #define FN_PARAM_2               (SC_PARAM_START+1)
-//aus sfx: #define FN_PARAM_3               (SC_PARAM_START+2)
-//aus sfx: #define FN_PARAM_4               (SC_PARAM_START+3)
-//aus sfx: #define FN_PARAM_5               (SC_PARAM_START+4)
-//aus sfx: #define FN_PARAM_6               (SC_PARAM_START+5)
-//aus sfx: #define FN_PARAM_7               (SC_PARAM_START+6)
-//aus sfx: #define FN_PARAM_8               (SC_PARAM_START+7)
-#define FN_PARAM_9              (FN_PARAM_8+1)
-
 #define SID_SORT_BYROW          (SC_PARAM_START)
 #define SID_SORT_HASHEADER      (SC_PARAM_START+1)
 #define SID_SORT_CASESENS       (SC_PARAM_START+2)
@@ -1139,8 +1101,6 @@
 #define RID_POPUP_PREVIEW       (SC_RESOURCE_START+7)
 #define RID_POPUP_OLE           (SC_RESOURCE_START+8)
 #define RID_POPUP_CHART         (SC_RESOURCE_START+9)
-//#define RID_ANCHORBITMAP      (SC_RESOURCE_START+10)
-//#define RID_GRAYANCHORBITMAP  (SC_RESOURCE_START+11)
 #define RID_OUTLINEBITMAPS      (SC_RESOURCE_START+12)
 #define RID_DRAW_WIN            (SC_RESOURCE_START+13)
 #define RID_CNTRLR_WIN          (SC_RESOURCE_START+14)
@@ -1158,28 +1118,19 @@
 #define RID_POPUP_EDIT          (SC_RESOURCE_START+33)
 #define RID_POPUP_AUDIT         (SC_RESOURCE_START+34)
 #define RID_OBJECTBAR_TOOLS     (SC_RESOURCE_START+35)
-// free
-// free
 #define RID_TBXCTL_INSERT       (SC_RESOURCE_START+38)
 #define RID_TBXCTL_INSCELLS     (SC_RESOURCE_START+39)
 #define RID_TBXCTL_INSOBJ       (SC_RESOURCE_START+40)
-// free
-// free
 #define RID_SC_FUNCTION_DESCRIPTIONS1   (SC_RESOURCE_START+43)
 #define RID_SC_FUNCTION_DESCRIPTIONS2   (SC_RESOURCE_START+44)
 #define RID_POPUP_CONTROL       (SC_RESOURCE_START+45)
 #define RID_POPUP_PAGEBREAK     (SC_RESOURCE_START+46)
-// free
 #define RID_POPUP_DRAWFORM      (SC_RESOURCE_START+48)
 #define RID_SC_ADDIN_ROT13      (SC_RESOURCE_START+50)
 #define RID_SC_ADDIN_DFA        (SC_RESOURCE_START+51)
 #define RID_IMAGELIST_NAVCONT   (SC_RESOURCE_START+52)
 #define RID_DRAW_OBJECTBAR      (SC_RESOURCE_START+53)
 #define RID_GRAPHIC_OBJECTBAR   (SC_RESOURCE_START+54)
-// free
-// free
-#define RID_IMAGELIST_H_NAVCONT (SC_RESOURCE_START+57)
-#define RID_OUTLINEBITMAPS_H    (SC_RESOURCE_START+58)
 #define RID_MEDIA_OBJECTBAR     (SC_RESOURCE_START+60)
 #define RID_POPUP_MEDIA         (SC_RESOURCE_START+61)
 #define RID_FUNCTION_CATEGORIES (SC_RESOURCE_START+62)
@@ -1215,7 +1166,6 @@
 #define SCSTR_APDTABLE          (STR_START + 27)
 #define SCSTR_RENAMETAB         (STR_START + 28)
 #define STR_INSERTGRAPHIC       (STR_START + 29)
-//#define STR_BASIC_IDE           (STR_START + 30)
 #define SCSTR_APPLICATION       (STR_START + 31)
 #define SCSTR_DOCSHELL          (STR_START + 32)
 #define SCSTR_TABVIEWSHELL      (STR_START + 33)
@@ -1303,7 +1253,7 @@
 #define STR_PRINT_NOTHING           (STR_START + 93)
 #define SCSTR_ALLFILTER             (STR_START + 94)
 #define SCSTR_MOREBTN_MOREOPTIONS   (STR_START + 95)
-#define SCSTR_MOREBTN_FEWEROPTIONS   (STR_START + 96)
+#define SCSTR_MOREBTN_FEWEROPTIONS  (STR_START + 96)
 
 // Items
 
@@ -1336,6 +1286,7 @@
 #define STR_ACC_TABLE_DESCR         (STR_START + 157)
 #define STR_ACC_CELL_NAME           (STR_START + 158)
 #define STR_ACC_CELL_DESCR          (STR_START + 159)
+
 // Preview
 #define STR_ACC_PREVIEWDOC_NAME     (STR_START + 160)
 #define STR_ACC_PREVIEWDOC_DESCR    (STR_START + 161)
@@ -1368,17 +1319,17 @@
 
 // --------------------------------------------------
 
-#define SCSTR_HUMAN_SCDOC_NAME      (STR_START + 210)
-#define SCSTR_SHORT_SCDOC_NAME      (STR_START + 211)
-#define SCSTR_LONG_SCDOC_NAME       (STR_START + 212)
+#define SCSTR_HUMAN_SCDOC_NAME          (STR_START + 210)
+#define SCSTR_SHORT_SCDOC_NAME          (STR_START + 211)
+#define SCSTR_LONG_SCDOC_NAME           (STR_START + 212)
 
-#define SCSTR_CLPBRD_CLEAR          (STR_START + 213)
+#define SCSTR_CLPBRD_CLEAR              (STR_START + 213)
 
 #define SCSTR_FORMULA_AUTOCORRECTION    (STR_START + 214)
 
-#define SCSTR_RENAMEOBJECT          (STR_START + 215)
-
-#define SCSTR_PRINT_OPTIONS     (STR_START+216)
+#define SCSTR_RENAMEOBJECT              (STR_START + 215)
+#define SCSTR_PRINT_OPTIONS             (STR_START + 216)
+#define SCSTR_WARN_ME_IN_FUTURE_CHECK   (STR_START + 217)
 
 // Navigator - in der Reihenfolge wie SC_CONTENT_...
 #define SCSTR_CONTENT_ROOT      (STR_START + 250)
@@ -1418,7 +1369,7 @@
 #define SCSTR_FUSTAT            (STR_START + 395)
 #define SCSTR_FUTAB             (STR_START + 396)
 #define SCSTR_FUTEXT            (STR_START + 397)
-//
+
 #define SCSTR_COMPILER_STRINGS  (STR_START + 398)
 #define SCSTR_FILTER_STRINGS    (STR_START + 399)
 #define SCSTR_COMPILER_INTL_STR (STR_START + 400)
@@ -1436,15 +1387,9 @@
 #define BMP_START               (STR_END)
 
 // Navigator
-// not used anymore: RID_BMP_EXPAND, RID_BMP_COLLAPSE
-//#define    RID_BMP_EXPAND          (BMP_START)
-//#define    RID_BMP_COLLAPSE        (BMP_START + 1)
 #define RID_IMG_DROP_URL        (BMP_START + 2)
 #define RID_IMG_DROP_LINK       (BMP_START + 3)
 #define RID_IMG_DROP_COPY       (BMP_START + 4)
-#define RID_IMG_H_DROP_URL      (BMP_START + 5)
-#define RID_IMG_H_DROP_LINK     (BMP_START + 6)
-#define RID_IMG_H_DROP_COPY     (BMP_START + 7)
 #define RID_IMG_SELECT_CURRENT   (BMP_START + 8)
 #define RID_IMG_UNSELECT_CURRENT (BMP_START + 9)
 
@@ -1538,7 +1483,6 @@
 
 #define RID_SCDLG_CHAR                  (SC_DIALOGS_START + 76)
 #define RID_SCDLG_PARAGRAPH             (SC_DIALOGS_START + 77)
-//#define RID_SCDLG_CHARTRANGE          (SC_DIALOGS_START + 78)
 
 #define RID_SCPAGE_STAT                 (SC_DIALOGS_START + 79)
 #define RID_SCDLG_CHARTCOLROW           (SC_DIALOGS_START + 80)
@@ -1546,7 +1490,7 @@
 
 #define RID_SCDLG_EDITCHAR              (SC_DIALOGS_START + 82)
 
-    //  Popup fuer Statusbar-Controller
+// Popup fuer Statusbar-Controller
 #define RID_POPUP_SUMCTL                (SC_DIALOGS_START + 83)
 #define RID_SUMCTL_SUM                  (SC_DIALOGS_START + 84)
 #define RID_SUMCTL_MIN                  (SC_DIALOGS_START + 85)
@@ -1558,7 +1502,7 @@
 
 #define RID_SCDLG_ASCII                 (SC_DIALOGS_START + 91)
 
-    //  Popup fuer Drop-Modus im Navigator
+// Popup fuer Drop-Modus im Navigator
 #define RID_POPUP_DROPMODE              (SC_DIALOGS_START + 92)
 #define RID_DROPMODE_URL                (SC_DIALOGS_START + 93)
 #define RID_DROPMODE_LINK               (SC_DIALOGS_START + 94)
@@ -1647,9 +1591,6 @@
 #define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }
 #endif
 
-// mask color for high contrast
-#define SC_HC_MASKCOLOR STD_MASKCOLOR
-
 #define MID_1   1
 #define MID_2   2
 #define MID_3   3
@@ -1682,4 +1623,3 @@
 
 #endif
 
-
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 36ddd81d98cb..c33b1459a28e 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -174,7 +174,7 @@ private:
     BOOL            bSharedNameInserted;
 
     ScRangeVec      aPrintRanges;
-    BOOL            bPrintEntireSheet;
+    bool            bPrintEntireSheet;
 
     ScRange*        pRepeatColRange;
     ScRange*        pRepeatRowRange;
@@ -587,7 +587,7 @@ public:
     USHORT          GetPrintRangeCount() const          { return static_cast< USHORT >( aPrintRanges.size() ); }
     const ScRange*  GetPrintRange(USHORT nPos) const;
     /** Returns true, if the sheet is always printed. */
-    BOOL            IsPrintEntireSheet() const          { return bPrintEntireSheet; }
+    bool            IsPrintEntireSheet() const          { return bPrintEntireSheet; }
 
     /** Removes all print ranges. */
     void            ClearPrintRanges();
diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx
index 2e27e604f68e..07b13a54f2b5 100644
--- a/sc/inc/tablink.hxx
+++ b/sc/inc/tablink.hxx
@@ -34,10 +34,6 @@
 #include <sfx2/lnkbase.hxx>
 
 #include <sfx2/objsh.hxx>
-//REMOVE    #ifndef SO2_DECL_SVEMBEDDEDOBJECT_DEFINED
-//REMOVE    #define SO2_DECL_SVEMBEDDEDOBJECT_DEFINED
-//REMOVE    SO2_DECL_REF(SvEmbeddedObject)
-//REMOVE    #endif
 
 class ScDocShell;
 struct TableLink_Impl;
diff --git a/sc/inc/tabprotection.hxx b/sc/inc/tabprotection.hxx
index 2d75aa79857f..5feab594719f 100644
--- a/sc/inc/tabprotection.hxx
+++ b/sc/inc/tabprotection.hxx
@@ -35,8 +35,6 @@
 #include "global.hxx"
 #include <boost/shared_ptr.hpp>
 
-#define ENABLE_SHEET_PROTECTION 1
-
 class ScDocument;
 class ScTableProtectionImpl;
 
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index 556c62416b62..d417f026b38f 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -619,12 +619,11 @@
 #define SC_UNONAME_ADDRESS          "Address"
 #define SC_UNONAME_UIREPR           "UserInterfaceRepresentation"
 #define SC_UNONAME_PERSREPR         "PersistentRepresentation"
-#define SC_UNONAME_XL_A1_REPR       "XL_A1_Representation"
+#define SC_UNONAME_XLA1REPR       "XLA1Representation"
 #define SC_UNONAME_REFSHEET         "ReferenceSheet"
 
-// --> PB 2004-08-23 #i33095# Security Options
+// Security options
 #define SC_UNO_LOADREADONLY         "LoadReadonly"
-// <--
 #define SC_UNO_MODIFYPASSWORDINFO   "ModifyPasswordInfo"
 
 // FormulaParser
@@ -643,14 +642,15 @@
 
 // Solver
 #define SC_UNONAME_TIMEOUT          "Timeout"
-
 #define SC_UNO_SHAREDOC             "IsDocumentShared"
 
 // EventDescriptor
-
 #define SC_UNO_EVENTTYPE            "EventType"
 #define SC_UNO_SCRIPT               "Script"
 
+// Named ranges
+#define SC_UNO_MODIFY_BROADCAST     "ModifyAndBroadcast"
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/qa/unit/makefile.mk b/sc/qa/unit/makefile.mk
index 169620b2c7d8..83be94ce9e65 100644
--- a/sc/qa/unit/makefile.mk
+++ b/sc/qa/unit/makefile.mk
@@ -83,6 +83,7 @@ SHL1STDLIBS=       \
 SHL1IMPLIB = i$(SHL1TARGET)
 SHL1LIBS=$(SLB)$/scalc3.lib $(SLB)$/scalc3c.lib 
 DEF1NAME = $(SHL1TARGET)
+SHL1VERSIONMAP=version.map
 
 .INCLUDE: target.mk
 
@@ -106,32 +107,19 @@ $(MISC)/$(TARGET)/udkapi.rdb .ERRREMOVE : $(SOLARBINDIR)$/udkapi.rdb
 $(MISC)/$(TARGET)/services.rdb .ERRREMOVE : $(MISC)/$(TARGET)/udkapi.rdb
     $(MKDIRHIER) $(@:d)
     $(REGCOMP) -register -br $(MISC)/$(TARGET)/udkapi.rdb -r $@ -wop \
-        -c configmgr.uno$(DLLPOST) \
         -c $(DLLPRE)fwk$(DLLPOSTFIX)$(DLLPOST)
 
-#Tweak things to that we use the .res files in the solver
-STAR_RESOURCEPATH:=$(PWD)/$(BIN):$(SOLARBINDIR)
+#Tweak things so that we use the .res files in the solver
+STAR_RESOURCEPATH:=$(PWD)/$(BIN)$(PATH_SEPERATOR)$(SOLARBINDIR)
 .EXPORT : STAR_RESOURCEPATH
 
-#.IF "$(OS)" == "LINUX"
-#
-#test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb $(MISC)$/$(TARGET)$/types.rdb $(MISC)/$(TARGET)/udkapi.rdb
-#    @echo ----------------------------------------------------------
-#    @echo - start unit test \#1 on library $(SHL1TARGETN)
-#    @echo ----------------------------------------------------------
-#    $(CPPUNITTESTER) $(SHL1TARGETN) -headless -invisible \
-#        -env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb \
-#        -env:UNO_TYPES="$(my_file)$(PWD)/$(MISC)/$(TARGET)/types.rdb $(my_file)$(PWD)/$(MISC)/$(TARGET)/udkapi.rdb" \
-#        -env:OOO_BASE_DIR="$(my_file)$(PWD)/$(MISC)/$(TARGET)" \
-#        -env:BRAND_BASE_DIR="$(my_file)$(PWD)/$(MISC)/$(TARGET)" \
-#        -env:UNO_USER_PACKAGES_CACHE="$(my_file)$(PWD)/$(MISC)/$(TARGET)"
-#
-#.ELSE
-#
-test .PHONY: $(SHL1TARGETN)
+test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb $(MISC)$/$(TARGET)$/types.rdb $(MISC)/$(TARGET)/udkapi.rdb
     @echo ----------------------------------------------------------
-    @echo - WARNING!!, test disabled due to regcomp failure on SUSE
-    @echo - boxes on configmgr.uno.so
+    @echo - start unit test \#1 on library $(SHL1TARGETN)
     @echo ----------------------------------------------------------
-
-#.ENDIF
+    $(CPPUNITTESTER) $(SHL1TARGETN) -headless -invisible \
+        -env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb \
+        -env:UNO_TYPES="$(my_file)$(PWD)/$(MISC)/$(TARGET)/types.rdb $(my_file)$(PWD)/$(MISC)/$(TARGET)/udkapi.rdb" \
+        -env:OOO_BASE_DIR="$(my_file)$(PWD)/$(MISC)/$(TARGET)" \
+        -env:BRAND_BASE_DIR="$(my_file)$(PWD)/$(MISC)/$(TARGET)" \
+        -env:UNO_USER_PACKAGES_CACHE="$(my_file)$(PWD)/$(MISC)/$(TARGET)"
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 7d42a218f854..fc8a20830ea3 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -87,13 +87,13 @@ void Test::createDocument()
 {
     ScDocument *doc = new ScDocument();
 
-    rtl::OUString aTabName = rtl::OUString::createFromAscii ("foo");
+    rtl::OUString aTabName(RTL_CONSTASCII_USTRINGPARAM("foo"));
     CPPUNIT_ASSERT_MESSAGE ("failed to insert sheet",
                             doc->InsertTab (0, aTabName));
     double val = 1;
     doc->SetValue (0, 0, 0, val);
     doc->SetValue (0, 1, 0, val);
-    doc->SetString (0, 2, 0, rtl::OUString::createFromAscii ("=SUM(A1:A2)"));
+    doc->SetString (0, 2, 0, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("=SUM(A1:A2)")));
     doc->CalcAll();
     double result;
     doc->GetValue (0, 2, 0, result);
diff --git a/sc/qa/unit/version.map b/sc/qa/unit/version.map
new file mode 100644
index 000000000000..3308588ef6f8
--- /dev/null
+++ b/sc/qa/unit/version.map
@@ -0,0 +1,34 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+UDK_3_0_0 {
+    global:
+        cppunitTestPlugIn;
+
+    local:
+        *;
+};
diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx
index 4e1823b97b6a..98ea9cad7748 100644
--- a/sc/source/core/data/cell2.cxx
+++ b/sc/source/core/data/cell2.cxx
@@ -553,7 +553,6 @@ BOOL ScFormulaCell::GetMatrixOrigin( ScAddress& rPos ) const
         case MM_FORMULA :
             rPos = aPos;
             return TRUE;
-//        break;
         case MM_REFERENCE :
         {
             pCode->Reset();
@@ -863,7 +862,6 @@ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
                 else if ( nCol > MAXCOL )
                     nCol = MAXCOL;
                 aPos.SetCol( nCol );
-//              bPosChanged = TRUE;
             }
         }
         if ( nDy && nCol >= nCol1 && nCol <= nCol2 &&
@@ -877,7 +875,6 @@ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
                 else if ( nRow > MAXROW )
                     nRow = MAXROW;
                 aPos.SetRow( nRow );
-//              bPosChanged = TRUE;
             }
         }
         if ( nDz && nCol >= nCol1 && nCol <= nCol2 &&
@@ -892,14 +889,12 @@ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
                 else if ( nTab > nMaxTab )
                     nTab = nMaxTab;
                 aPos.SetTab( nTab );
-//              bPosChanged = TRUE;
             }
         }
     }
     else if ( r.In( aPos ) )
     {
         aOldPos.Set( nCol - nDx, nRow - nDy, nTab - nDz );
-//      bPosChanged = TRUE;
     }
 
     BOOL bHasRefs = FALSE;
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 08e275f46833..5f72e0ba466b 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -29,8 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sc.hxx"
 
-
-
 #include "scitems.hxx"
 #include <tools/shl.hxx>
 #include <vcl/outdev.hxx>
@@ -77,7 +75,6 @@
 #include "globstr.hrc"
 #include "sc.hrc"           // Slot-IDs
 
-
 #define SC_MAX_POOLREF      (SFX_ITEMS_OLD_MAXREF - 39)
 #define SC_SAFE_POOLREF     (SC_MAX_POOLREF + 20)
 
@@ -340,7 +337,6 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, BOOL bLoadRefCounts )
     ppPoolDefaults[ ATTR_PAGE_FORMULAS   - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_FORMULAS, FALSE );
     ppPoolDefaults[ ATTR_PAGE_NULLVALS   - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_NULLVALS, TRUE );
     ppPoolDefaults[ ATTR_PAGE_SCALETO    - ATTR_STARTINDEX ] = new ScPageScaleToItem( 1, 1 );
-//  ppPoolDefaults[ ATTR_ITEM_DOUBLE     - ATTR_STARTINDEX ] = new ScDoubleItem( ATTR_ITEM_DOUBLE, 0 );
 
     SetDefaults( ppPoolDefaults );
 
@@ -1024,24 +1020,6 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation(
         }
         break;
 
-/*
-        case ATTR_PAGE_HEADERLEFT:
-        rText = "SID_SCATTR_PAGE_HEADERLEFT";
-        break;
-
-        case ATTR_PAGE_FOOTERLEFT:
-        rText = "SID_SCATTR_PAGE_FOOTERLEFT";
-        break;
-
-        case ATTR_PAGE_HEADERRIGHT:
-        rText = "SID_SCATTR_PAGE_HEADERRIGHT";
-        break;
-
-        case ATTR_PAGE_FOOTERRIGHT:
-        rText = "SID_SCATTR_PAGE_FOOTERRIGHT";
-        break;
-*/
-
         default:
             if ( !pIntl )
                 pIntl = ScGlobal::GetScIntlWrapper();
@@ -1062,8 +1040,4 @@ SfxMapUnit __EXPORT ScDocumentPool::GetMetric( USHORT nWhich ) const
         return SFX_MAPUNIT_100TH_MM;
 }
 
-
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index adb9cf49ed0a..98f165c2acaa 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -883,10 +883,7 @@ BOOL ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM
         pTab[nNewPos]->SetTabBgColor(pTab[nOldPos]->GetTabBgColor());
 
         SCsTAB nDz;
-/*      if (nNewPos < nOldPos)
-            nDz = ((short)nNewPos) - (short)nOldPos + 1;
-        else
-*/          nDz = ((short)nNewPos) - (short)nOldPos;
+        nDz = ((short)nNewPos) - (short)nOldPos;
         pTab[nNewPos]->UpdateReference(URM_COPY, 0, 0, nNewPos , MAXCOL, MAXROW,
                                         nNewPos, 0, 0, nDz, NULL);
 
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index cb022714fe93..43b48d2d481f 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -2048,7 +2048,7 @@ void ScDocument::DecSizeRecalcLevel( SCTAB nTab, bool bUpdateNoteCaptionPos )
 // DataPilot Migration - Cache&&Performance
 ScDPTableDataCache* ScDocument::GetDPObjectCache( long nID )
 {
-    for ( std::list<ScDPTableDataCache*>::iterator iter = m_listDPObjectsCaches.begin(); iter!=m_listDPObjectsCaches.end(); iter++ )
+    for ( std::list<ScDPTableDataCache*>::iterator iter = m_listDPObjectsCaches.begin(); iter!=m_listDPObjectsCaches.end(); ++iter )
     { //
         if ( nID == (*iter)->GetId() )
             return *iter;
@@ -2092,7 +2092,7 @@ long ScDocument::GetNewDPObjectCacheId()
     bool bFound = false;
     std::list<ScDPTableDataCache*>::iterator iter;
     do {
-        for ( iter = m_listDPObjectsCaches.begin(); iter!=m_listDPObjectsCaches.end(); iter++ )
+        for ( iter = m_listDPObjectsCaches.begin(); iter!=m_listDPObjectsCaches.end(); ++iter )
         { //Get a new Id
             if ( nID == (*iter)->GetId() )
             {
@@ -2110,7 +2110,7 @@ long ScDocument::GetNewDPObjectCacheId()
 
 void ScDocument::RemoveDPObjectCache( long nID )
 {
-    for ( std::list<ScDPTableDataCache*>::iterator iter = m_listDPObjectsCaches.begin(); iter!=m_listDPObjectsCaches.end(); iter++ )
+    for ( std::list<ScDPTableDataCache*>::iterator iter = m_listDPObjectsCaches.begin(); iter!=m_listDPObjectsCaches.end(); ++iter )
     {
         if ( nID == (*iter)->GetId() )
         {
@@ -2125,7 +2125,7 @@ void ScDocument::RemoveDPObjectCache( long nID )
 
 void ScDocument::RemoveUnusedDPObjectCaches()
 {
-    for ( std::list<ScDPTableDataCache*>::iterator iter = m_listDPObjectsCaches.begin(); iter!=m_listDPObjectsCaches.end(); iter++ )
+    for ( std::list<ScDPTableDataCache*>::iterator iter = m_listDPObjectsCaches.begin(); iter!=m_listDPObjectsCaches.end(); ++iter )
     {
         long  nID = (*iter)->GetId();
         USHORT nCount = GetDPCollection()->GetCount();
@@ -2147,7 +2147,7 @@ void ScDocument::RemoveUnusedDPObjectCaches()
 
 void ScDocument::GetUsedDPObjectCache( std::list<ScDPTableDataCache*>& usedlist )
 {
-    for ( std::list<ScDPTableDataCache*>::iterator iter = m_listDPObjectsCaches.begin(); iter!=m_listDPObjectsCaches.end(); iter++ )
+    for ( std::list<ScDPTableDataCache*>::iterator iter = m_listDPObjectsCaches.begin(); iter!=m_listDPObjectsCaches.end(); ++iter )
     {
         long  nID = (*iter)->GetId();
         USHORT nCount = GetDPCollection()->GetCount();
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index a803ba81e40f..47b8921e5fa6 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -506,7 +506,7 @@ double ScDocument::RoundValueAsShown( double fVal, ULONG nFormat )
       && nType != NUMBERFORMAT_TIME && nType != NUMBERFORMAT_DATETIME )
     {
         short nPrecision;
-        if ( nFormat )
+        if ((nFormat % SV_COUNTRY_LANGUAGE_OFFSET) != 0)
         {
             nPrecision = (short)GetFormatTable()->GetFormatPrecision( nFormat );
             switch ( nType )
@@ -525,7 +525,12 @@ double ScDocument::RoundValueAsShown( double fVal, ULONG nFormat )
             }
         }
         else
+        {
             nPrecision = (short)GetDocOptions().GetStdPrecision();
+            // #i115512# no rounding for automatic decimals
+            if (nPrecision == static_cast<short>(SvNumberFormatter::UNLIMITED_PRECISION))
+                return fVal;
+        }
         double fRound = ::rtl::math::round( fVal, nPrecision );
         if ( ::rtl::math::approxEqual( fVal, fRound ) )
             return fVal;        // durch Rundung hoechstens Fehler
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index 2732a6e3251f..a86640d297a0 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -49,11 +49,6 @@
 #include <svx/svdoole2.hxx>
 #include <svx/svdpage.hxx>
 
-//REMOVE    #ifndef SO2_DECL_SVINPLACEOBJECT_DEFINED
-//REMOVE    #define SO2_DECL_SVINPLACEOBJECT_DEFINED
-//REMOVE    SO2_DECL_REF(SvInPlaceObject)
-//REMOVE    #endif
-
 #include "document.hxx"
 #include "drwlayer.hxx"
 #include "chartarr.hxx"
@@ -113,16 +108,16 @@ void lcl_SetChartParameters( const uno::Reference< chart2::data::XDataReceiver >
     {
         uno::Sequence< beans::PropertyValue > aArgs( 4 );
         aArgs[0] = beans::PropertyValue(
-            ::rtl::OUString::createFromAscii("CellRangeRepresentation"), -1,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellRangeRepresentation")), -1,
             uno::makeAny( rRanges ), beans::PropertyState_DIRECT_VALUE );
         aArgs[1] = beans::PropertyValue(
-            ::rtl::OUString::createFromAscii("HasCategories"), -1,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasCategories")), -1,
             uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE );
         aArgs[2] = beans::PropertyValue(
-            ::rtl::OUString::createFromAscii("FirstCellAsLabel"), -1,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstCellAsLabel")), -1,
             uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE );
         aArgs[3] = beans::PropertyValue(
-            ::rtl::OUString::createFromAscii("DataRowSource"), -1,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataRowSource")), -1,
             uno::makeAny( eDataRowSource ), beans::PropertyState_DIRECT_VALUE );
         xReceiver->setArguments( aArgs );
     }
@@ -238,7 +233,7 @@ BOOL ScDocument::HasChartAtPoint( SCTAB nTab, const Point& rPos, String* pName )
 
     if (pName)
         pName->Erase();
-    return FALSE;                   // nix gefunden
+    return FALSE;                   // nothing found
 }
 
 void ScDocument::UpdateChartArea( const String& rChartName,
@@ -439,10 +434,7 @@ void ScDocument::UpdateChartArea( const String& rChartName,
 
                     pChartListenerCollection->ChangeListening( rChartName, aNewRanges );
 
-                    // ((SdrOle2Obj*)pObject)->GetNewReplacement();
-                    // pObject->ActionChanged();
-
-                    return;         // nicht weitersuchen
+                    return;         // do not search anymore
                 }
             }
             pObject = aIter.Next();
@@ -560,9 +552,6 @@ void ScDocument::UpdateChartRef( UpdateRefMode eUpdateRefMode,
         if ( bChanged )
         {
             {
-//              SetChartRangeList( pChartListener->GetString(), aNewRLR );
-//              pChartListener->ChangeListening( aNewRLR, bDataChanged );
-
                 // Force the chart to be loaded now, so it registers itself for UNO events.
                 // UNO broadcasts are done after UpdateChartRef, so the chart will get this
                 // reference change.
@@ -688,7 +677,7 @@ void ScDocument::UpdateChartListenerCollection()
     else
     {
         ScRange aRange;
-        // Range fuer Suche unwichtig
+        // Range for searching is not important
         ScChartListener aCLSearcher( EMPTY_STRING, this, aRange );
         for (SCTAB nTab=0; nTab<=MAXTAB; nTab++)
         {
@@ -737,20 +726,13 @@ void ScDocument::UpdateChartListenerCollection()
                                 // unable to set the data. So a chart from the
                                 // same document is treated like a chart with
                                 // own data for the time being.
-#if 0
+
                                 // data provider
-                                uno::Reference< chart2::data::XDataProvider > xDataProvider = new
-                                    ScChart2DataProvider( this );
-                                xReceiver->attachDataProvider( xDataProvider );
                                 // number formats supplier
-                                uno::Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier( pShell->GetModel(), uno::UNO_QUERY );
-                                xReceiver->attachNumberFormatsSupplier( xNumberFormatsSupplier );
+
                                 // data ?
                                 // how to set?? Defined in XML-file, which is already loaded!!!
                                 // => we have to do this stuff here, BEFORE the chart is actually loaded
-
-                                bIsChart = true;
-#endif
                             }
 
                             if (!bIsChart)
@@ -783,5 +765,4 @@ void ScDocument::AddOLEObjectToCollection(const String& rName)
 }
 
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/documen6.cxx b/sc/source/core/data/documen6.cxx
index de0105cb63af..9c19661dad8f 100644
--- a/sc/source/core/data/documen6.cxx
+++ b/sc/source/core/data/documen6.cxx
@@ -63,7 +63,7 @@ const uno::Reference< i18n::XBreakIterator >& ScDocument::GetBreakIterator()
     if ( !pScriptTypeData->xBreakIter.is() )
     {
         uno::Reference< uno::XInterface > xInterface = xServiceManager->createInstance(
-                            ::rtl::OUString::createFromAscii( SC_BREAKITER_SERVICE ) );
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_BREAKITER_SERVICE )) );
         pScriptTypeData->xBreakIter = uno::Reference< i18n::XBreakIterator >( xInterface, uno::UNO_QUERY );
         DBG_ASSERT( pScriptTypeData->xBreakIter.is(), "can't get BreakIterator" );
     }
@@ -182,5 +182,4 @@ BYTE ScDocument::GetScriptType( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell*
     return GetCellScriptType( pCell, nFormat );
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 039103e189f0..528db06b79e0 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -675,6 +675,11 @@ void ScDocument::UpdateFontCharSet()
     }
 }
 
+bool ScDocument::IsLoadingMedium() const
+{
+    return bLoadingMedium;
+}
+
 void ScDocument::SetLoadingMedium( bool bVal )
 {
     bLoadingMedium = bVal;
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index e9363978b1cb..357686f3d513 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -105,6 +105,18 @@ using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::sheet::TablePageBreakData;
 using ::std::set;
 
+// The constant parameters to CopyBlockFromClip
+struct ScCopyBlockFromClipParams
+{
+    ScDocument* pRefUndoDoc;
+    ScDocument* pClipDoc;
+    USHORT      nInsFlag;
+    SCTAB       nTabStart;
+    SCTAB       nTabEnd;
+    BOOL        bAsLink;
+    BOOL        bSkipAttrForEmpty;
+};
+
 struct ScDefaultAttr
 {
     const ScPatternAttr*    pAttr;
@@ -161,7 +173,7 @@ BOOL ScDocument::GetName( SCTAB nTab, String& rName ) const
     return FALSE;
 }
 
-BOOL ScDocument::SetCodeName( SCTAB nTab, String& rName )
+BOOL ScDocument::SetCodeName( SCTAB nTab, const String& rName )
 {
     if (VALIDTAB(nTab))
     {
@@ -1984,7 +1996,6 @@ void ScDocument::BroadcastFromClip( SCCOL nCol1, SCROW nRow1,
     }
 }
 
-
 void ScDocument::CopyBlockFromClip( SCCOL nCol1, SCROW nRow1,
                                     SCCOL nCol2, SCROW nRow2,
                                     const ScMarkData& rMark,
diff --git a/sc/source/core/data/dpcachetable.cxx b/sc/source/core/data/dpcachetable.cxx
index b371a30b7542..54556e4e55fb 100644
--- a/sc/source/core/data/dpcachetable.cxx
+++ b/sc/source/core/data/dpcachetable.cxx
@@ -80,6 +80,7 @@ ScDPCacheTable::FilterItem::FilterItem() :
     mbHasValue(false)
 {
 }
+
 bool  ScDPCacheTable::FilterItem::match( const  ScDPItemData& rCellData ) const
 {
     if (rCellData.GetString()!= maString &&
@@ -87,6 +88,7 @@ bool  ScDPCacheTable::FilterItem::match( const  ScDPItemData& rCellData ) const
             return false;
     return true;
 }
+
 // ----------------------------------------------------------------------------
 
 ScDPCacheTable::SingleFilter::SingleFilter(String aString, double fValue, bool bHasValue)
@@ -101,7 +103,7 @@ bool ScDPCacheTable::SingleFilter::match( const  ScDPItemData& rCellData ) const
       return maItem.match(rCellData);
 }
 
-const String ScDPCacheTable::SingleFilter::getMatchString()
+const String& ScDPCacheTable::SingleFilter::getMatchString()
 {
     return maItem.maString;
 }
@@ -158,15 +160,15 @@ ScDPCacheTable::Criterion::Criterion() :
 
 // ----------------------------------------------------------------------------
 
-ScDPCacheTable::ScDPCacheTable( ScDocument* pDoc,long nId ) :
+ScDPCacheTable::ScDPCacheTable( ScDocument* pDoc, long nId ) :
     mpCache( NULL ),
     mpNoneCache( NULL )
 {
-     if ( nId >= 0 )
+    if ( nId >= 0 )
         mpCache = pDoc->GetDPObjectCache( nId );
     else
     { //create a temp cache object
-        InitNoneCache( NULL );
+        initNoneCache( NULL );
     }
 }
 
@@ -176,20 +178,21 @@ ScDPCacheTable::~ScDPCacheTable()
 
 sal_Int32 ScDPCacheTable::getRowSize() const
 {
-    return GetCache()->GetRowCount();
+    return getCache()->GetRowCount();
 }
 
 sal_Int32 ScDPCacheTable::getColSize() const
 {
-    return GetCache()->GetColumnCount();
+    return getCache()->GetColumnCount();
 }
 
-void ScDPCacheTable::fillTable(  const ScQueryParam& rQuery, BOOL* pSpecial,
-                               bool bIgnoreEmptyRows, bool bRepeatIfEmpty )
+void ScDPCacheTable::fillTable(
+    const ScQueryParam& rQuery, bool* pSpecial, bool bIgnoreEmptyRows, bool bRepeatIfEmpty)
 {
+    // check cache
     if ( mpCache == NULL )
-        InitNoneCache( NULL );
-//check cache
+        initNoneCache( NULL );
+
    const SCROW  nRowCount = getRowSize();
    const SCCOL  nColCount = (SCCOL) getColSize();
    if ( nRowCount <= 0 || nColCount <= 0)
@@ -198,7 +201,6 @@ void ScDPCacheTable::fillTable(  const ScQueryParam& rQuery, BOOL* pSpecial,
     maRowsVisible.clear();
     maRowsVisible.reserve(nRowCount);
 
-
     // Initialize field entries container.
     maFieldEntries.clear();
     maFieldEntries.reserve(nColCount);
@@ -206,23 +208,23 @@ void ScDPCacheTable::fillTable(  const ScQueryParam& rQuery, BOOL* pSpecial,
     // Data rows
     for (SCCOL nCol = 0; nCol < nColCount; ++nCol)
     {
-        SCROW nMemCount = GetCache()->GetDimMemberCount( nCol );
+        SCROW nMemCount = getCache()->GetDimMemberCount( nCol );
         if ( nMemCount )
         {
             std::vector< SCROW > pAdded( nMemCount, -1 );
 
             for (SCROW nRow = 0; nRow < nRowCount; ++nRow )
             {
-                SCROW nIndex = GetCache()->GetItemDataId( nCol, nRow, bRepeatIfEmpty );
-                SCROW nOrder = GetCache()->GetOrder( nCol, nIndex );
+                SCROW nIndex = getCache()->GetItemDataId( nCol, nRow, bRepeatIfEmpty );
+                SCROW nOrder = getCache()->GetOrder( nCol, nIndex );
 
                 if ( nCol == 0 )
                          maRowsVisible.push_back(false);
 
                 if ( lcl_HasQueryEntry(rQuery) &&
-                    !GetCache()->ValidQuery( nRow , rQuery, pSpecial ) )
+                    !getCache()->ValidQuery( nRow , rQuery, pSpecial ) )
                     continue;
-                if ( bIgnoreEmptyRows &&  GetCache()->IsRowEmpty( nRow ) )
+                if ( bIgnoreEmptyRows &&  getCache()->IsRowEmpty( nRow ) )
                     continue;
                 // Insert a new row into cache table.
                 if ( nCol == 0 )
@@ -242,9 +244,10 @@ void ScDPCacheTable::fillTable(  const ScQueryParam& rQuery, BOOL* pSpecial,
 
 void ScDPCacheTable::fillTable()
 {
+    // check cache
     if ( mpCache == NULL )
-        InitNoneCache( NULL );
-//check cache
+        initNoneCache( NULL );
+
    const SCROW  nRowCount = getRowSize();
    const SCCOL  nColCount = (SCCOL) getColSize();
    if ( nRowCount <= 0 || nColCount <= 0)
@@ -261,15 +264,15 @@ void ScDPCacheTable::fillTable()
     // Data rows
     for (SCCOL nCol = 0; nCol < nColCount; ++nCol)
     {
-        SCROW nMemCount = GetCache()->GetDimMemberCount( nCol );
+        SCROW nMemCount = getCache()->GetDimMemberCount( nCol );
         if ( nMemCount )
         {
             std::vector< SCROW > pAdded( nMemCount, -1 );
 
             for (SCROW nRow = 0; nRow < nRowCount; ++nRow )
             {
-                SCROW nIndex = GetCache()->GetItemDataId( nCol, nRow, false );
-                SCROW nOrder = GetCache()->GetOrder( nCol, nIndex );
+                SCROW nIndex = getCache()->GetItemDataId( nCol, nRow, false );
+                SCROW nOrder = getCache()->GetOrder( nCol, nIndex );
 
                 if ( nCol == 0 )
                      maRowsVisible.push_back(true);
@@ -285,7 +288,6 @@ void ScDPCacheTable::fillTable()
             }
         }
     }
-        return;
 }
 
 bool ScDPCacheTable::isRowActive(sal_Int32 nRow) const
@@ -312,8 +314,8 @@ void ScDPCacheTable::filterByPageDimension(const vector<Criterion>& rCriteria, c
 
 const ScDPItemData* ScDPCacheTable::getCell(SCCOL nCol, SCROW nRow, bool bRepeatIfEmpty) const
 {
-   SCROW nId= GetCache()->GetItemDataId(nCol, nRow, bRepeatIfEmpty);
-   return GetCache()->GetItemDataById( nCol, nId );
+   SCROW nId= getCache()->GetItemDataId(nCol, nRow, bRepeatIfEmpty);
+   return getCache()->GetItemDataById( nCol, nId );
 }
 
 void  ScDPCacheTable::getValue( ScDPValueData& rVal, SCCOL nCol, SCROW nRow, bool bRepeatIfEmpty) const
@@ -330,23 +332,23 @@ void  ScDPCacheTable::getValue( ScDPValueData& rVal, SCCOL nCol, SCROW nRow, boo
 }
 String ScDPCacheTable::getFieldName(SCCOL  nIndex) const
 {
-    return (GetCache()->GetDimensionName( nIndex ));
+    return getCache()->GetDimensionName( nIndex );
 }
 
 sal_Int32 ScDPCacheTable::getFieldIndex(const String& rStr) const
 {
-    return GetCache()->GetDimensionIndex( rStr );
+    return getCache()->GetDimensionIndex( rStr );
 }
 
 const ::std::vector<SCROW>&  ScDPCacheTable::getFieldEntries( sal_Int32 nColumn ) const
 {
-     if (nColumn < 0 || static_cast<size_t>(nColumn) >= maFieldEntries.size())
+    if (nColumn < 0 || static_cast<size_t>(nColumn) >= maFieldEntries.size())
     {
         // index out of bound.  Hopefully this code will never be reached.
         static const ::std::vector<SCROW> emptyEntries;
         return emptyEntries;
     }
-     return maFieldEntries[nColumn];
+    return maFieldEntries[nColumn];
 }
 
 void ScDPCacheTable::filterTable(const vector<Criterion>& rCriteria, Sequence< Sequence<Any> >& rTabData,
@@ -452,7 +454,7 @@ bool ScDPCacheTable::isRowQualified(sal_Int32 nRow, const vector<Criterion>& rCr
 }
 
 
-void ScDPCacheTable::InitNoneCache( ScDocument* pDoc )
+void ScDPCacheTable::initNoneCache( ScDocument* pDoc )
 {
     mpCache = NULL;
     if ( mpNoneCache )
@@ -460,12 +462,11 @@ void ScDPCacheTable::InitNoneCache( ScDocument* pDoc )
     mpNoneCache = new ScDPTableDataCache( pDoc );
 }
 
-ScDPTableDataCache* ScDPCacheTable::GetCache() const
+ScDPTableDataCache* ScDPCacheTable::getCache() const
 {
     if ( mpCache )
         return mpCache;
     return mpNoneCache;
 }
-// End Comments
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/dpglobal.cxx b/sc/source/core/data/dpglobal.cxx
index 4ce715600a9c..60639173286b 100644
--- a/sc/source/core/data/dpglobal.cxx
+++ b/sc/source/core/data/dpglobal.cxx
@@ -35,6 +35,7 @@
 
 #include "dpglobal.hxx"
 #include "document.hxx"
+#include "dpobject.hxx"
 
 #include <stdio.h>
 
@@ -60,28 +61,28 @@ namespace ScDPGlobal
         return strRet;
     }
 
-   bool ChkDPTableOverlap( ScDocument *pDestDoc, std::list<ScDPObject> & rClipboard, SCCOL nClipStartCol, SCROW nClipStartRow, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab, USHORT nEndTab, BOOL bExcludeClip /*= FALSE*/ )
+    bool ChkDPTableOverlap( ScDocument *pDestDoc, std::list<ScDPObject> & rClipboard, SCCOL nClipStartCol, SCROW nClipStartRow, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab, USHORT nEndTab, BOOL bExcludeClip /*= FALSE*/ )
     {
-        if ( ScDPCollection* pDPCollection = pDestDoc->GetDPCollection() )
+        if (ScDPCollection* pDPCollection = pDestDoc->GetDPCollection())
         {
             USHORT nCount = pDPCollection->GetCount();
             SCsCOL nOffsetX = nStartCol - nClipStartCol;
             SCsROW nOffsetY = nStartRow - nClipStartRow;
 
-            for( std::list<ScDPObject>::iterator iter = rClipboard.begin(); iter!=rClipboard.end(); iter++ )
+            for (std::list<ScDPObject>::iterator iter = rClipboard.begin(); iter!=rClipboard.end(); iter++)
             {
                 ScRange aRange = iter->GetOutRange();
 
-                for( USHORT nCurrTab = nStartTab; nCurrTab<=nEndTab; nCurrTab++ )
+                for (USHORT nCurrTab = nStartTab; nCurrTab<=nEndTab; nCurrTab++)
                 {
                     SCsTAB nOffsetZ = nCurrTab - aRange.aStart.Tab();
                     aRange.Move( nOffsetX, nOffsetY, nOffsetZ );
 
-                    for ( USHORT i = 0; i<nCount; i++)
+                    for (USHORT i = 0; i<nCount; i++)
                     {
-                        if ( (*pDPCollection)[i] && aRange.Intersects( (*pDPCollection)[i]->GetOutRange()))
+                        if ((*pDPCollection)[i] && aRange.Intersects( (*pDPCollection)[i]->GetOutRange()))
                         {
-                            if ( bExcludeClip && iter->GetOutRange() == (*pDPCollection)[i]->GetOutRange() )
+                            if (bExcludeClip && iter->GetOutRange() == (*pDPCollection)[i]->GetOutRange())
                             {
                                 continue;
                             }
@@ -91,25 +92,22 @@ namespace ScDPGlobal
                 }
             }
         }
-    return true;
-}
-//end
+        return true;
+    }
 
 }
-// --------------------------------------------------------------------
-// ScDPItemDataPool
-// Construct
-ScDPItemDataPool::ScDPItemDataPool(void)
+
+ScDPItemDataPool::ScDPItemDataPool()
 {
 }
-//
+
 ScDPItemDataPool::ScDPItemDataPool(const ScDPItemDataPool& r):
     maItems(r.maItems),
     maItemIds(r.maItemIds)
 {
 }
 
-ScDPItemDataPool::~ScDPItemDataPool(void)
+ScDPItemDataPool::~ScDPItemDataPool()
 {
 }
 
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 216d90352c9d..dbec4b20fede 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -797,13 +797,13 @@ const std::vector< SCROW >&  ScDPGroupDimension::GetColumnEntries( const ScDPCac
     {
         if ( pDateHelper )
         {
-            pDateHelper->FillColumnEntries(  (SCCOL)GetSourceDim(), rCacheTable.GetCache(), maMemberEntries,  rOriginal  );
+            pDateHelper->FillColumnEntries(  (SCCOL)GetSourceDim(), rCacheTable.getCache(), maMemberEntries,  rOriginal  );
         }
         else
         {
             for (size_t  i =0; i < rOriginal.size( );  i ++)
             {
-                const  ScDPItemData* pItemData = rCacheTable.GetCache()->GetItemDataById( (SCCOL)GetSourceDim(), rOriginal[i] );
+                const  ScDPItemData* pItemData = rCacheTable.getCache()->GetItemDataById( (SCCOL)GetSourceDim(), rOriginal[i] );
                 if ( !pItemData || !GetGroupForData( *pItemData ) )
                 {
                     // not in any group -> add as its own group
@@ -814,8 +814,8 @@ const std::vector< SCROW >&  ScDPGroupDimension::GetColumnEntries( const ScDPCac
             long nCount = aItems.size();
             for (long i=0; i<nCount; i++)
             {
-                SCROW nNew = rCacheTable.GetCache()->GetAdditionalItemID(  aItems[i].GetName() );
-                lcl_Insert ( (SCCOL)GetSourceDim(), rCacheTable.GetCache(), maMemberEntries, nNew  );
+                SCROW nNew = rCacheTable.getCache()->GetAdditionalItemID(  aItems[i].GetName() );
+                lcl_Insert ( (SCCOL)GetSourceDim(), rCacheTable.getCache(), maMemberEntries, nNew  );
             }
         }
     }
@@ -1112,7 +1112,7 @@ const std::vector< SCROW >& ScDPGroupTableData::GetColumnEntries( long  nColumn
     {
         // dimension number is unchanged for numerical groups
         const  std::vector< SCROW >& rOriginal = pSourceData->GetColumnEntries( nColumn );
-        return pNumGroups[nColumn].GetNumEntries( (SCCOL)nColumn,  GetCacheTable().GetCache(), rOriginal );
+        return pNumGroups[nColumn].GetNumEntries( (SCCOL)nColumn,  GetCacheTable().getCache(), rOriginal );
     }
 
     return pSourceData->GetColumnEntries( nColumn );
@@ -1359,7 +1359,7 @@ void ScDPGroupTableData::FillGroupValues( /*ScDPItemData* pItemData*/ SCROW* pIt
 {
     long nGroupedColumns = aGroups.size();
 
-    ScDPTableDataCache* pCache = GetCacheTable().GetCache();
+    ScDPTableDataCache* pCache = GetCacheTable().getCache();
     for (long nDim=0; nDim<nCount; nDim++)
     {
         const ScDPDateGroupHelper* pDateHelper = NULL;
@@ -1402,7 +1402,7 @@ void ScDPGroupTableData::FillGroupValues( /*ScDPItemData* pItemData*/ SCROW* pIt
 
         if ( pDateHelper )
         {
-            const ScDPItemData* pData  = GetCacheTable().GetCache()->GetItemDataById( (SCCOL)nSourceDim, pItemDataIndex[nDim]);
+            const ScDPItemData* pData  = GetCacheTable().getCache()->GetItemDataById( (SCCOL)nSourceDim, pItemDataIndex[nDim]);
               if ( pData ->IsValue() )
             {
                 sal_Int32 nPartValue = lcl_GetDatePartValue(
@@ -1412,7 +1412,7 @@ void ScDPGroupTableData::FillGroupValues( /*ScDPItemData* pItemData*/ SCROW* pIt
 // DataPilot Migration - Cache&&Performance
                 //String aName = lcl_GetDateGroupName( pDateHelper, nPartValue, pDoc->GetFormatTable() );
                 ScDPItemData  aItemData( pDateHelper->GetDatePart(), String(), nPartValue, ScDPItemData::MK_DATA|ScDPItemData::MK_VAL|ScDPItemData::MK_DATEPART );
-                pItemDataIndex[nDim] = GetCacheTable().GetCache()->GetAdditionalItemID( aItemData );
+                pItemDataIndex[nDim] = GetCacheTable().getCache()->GetAdditionalItemID( aItemData );
 // End Comments
             }
         }
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index d8abd8d7dee3..97c1e9e52c6b 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -149,11 +149,11 @@ USHORT lcl_GetDataGetOrientation( const uno::Reference<sheet::XDimensionsSupplie
             if ( xDimProp.is() )
             {
                 bFound = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
-                    rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ISDATALAYOUT)) );
                 //! error checking -- is "IsDataLayoutDimension" property required??
                 if (bFound)
                     nRet = ScUnoHelpFunctions::GetEnumProperty(
-                            xDimProp, rtl::OUString::createFromAscii(DP_PROP_ORIENTATION),
+                            xDimProp, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ORIENTATION)),
                             sheet::DataPilotFieldOrientation_HIDDEN );
             }
         }
@@ -687,11 +687,11 @@ bool ScDPObject::GetMembers( sal_Int32 nDim, sal_Int32 nHier, vector<ScDPLabelDa
         Reference<beans::XPropertySet> xMemProp(xMember, UNO_QUERY);
         if (xMemProp.is())
         {
-            aMem.mbVisible     = ScUnoHelpFunctions::GetBoolProperty(xMemProp, OUString::createFromAscii(SC_UNO_ISVISIBL));
-            aMem.mbShowDetails = ScUnoHelpFunctions::GetBoolProperty(xMemProp, OUString::createFromAscii(SC_UNO_SHOWDETA));
+            aMem.mbVisible     = ScUnoHelpFunctions::GetBoolProperty(xMemProp, OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ISVISIBL)));
+            aMem.mbShowDetails = ScUnoHelpFunctions::GetBoolProperty(xMemProp, OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWDETA)));
 
             aMem.maLayoutName = ScUnoHelpFunctions::GetStringProperty(
-                xMemProp, OUString::createFromAscii(SC_UNO_LAYOUTNAME), OUString());
+                xMemProp, OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_LAYOUTNAME)), OUString());
         }
 
         aMembers.push_back(aMem);
@@ -841,7 +841,7 @@ bool ScDPObject::IsDimNameInUse(const OUString& rName) const
             continue;
 
         OUString aLayoutName = ScUnoHelpFunctions::GetStringProperty(
-            xPropSet, OUString::createFromAscii(SC_UNO_LAYOUTNAME), OUString());
+            xPropSet, OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_LAYOUTNAME)), OUString());
         if (aLayoutName.equalsIgnoreAsciiCase(rName))
             return true;
     }
@@ -867,7 +867,7 @@ String ScDPObject::GetDimName( long nDim, BOOL& rIsDataLayout, sal_Int32* pFlags
             if ( xDimName.is() && xDimProp.is() )
             {
                 BOOL bData = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
-                                rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) );
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ISDATALAYOUT)) );
                 //! error checking -- is "IsDataLayoutDimension" property required??
 
                 rtl::OUString aName;
@@ -885,7 +885,7 @@ String ScDPObject::GetDimName( long nDim, BOOL& rIsDataLayout, sal_Int32* pFlags
 
                 if (pFlags)
                     *pFlags = ScUnoHelpFunctions::GetLongProperty( xDimProp,
-                                rtl::OUString::createFromAscii(SC_UNO_FLAGS), 0 );
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_FLAGS)), 0 );
             }
         }
     }
@@ -911,7 +911,7 @@ BOOL ScDPObject::IsDuplicated( long nDim )
                 try
                 {
                     uno::Any aOrigAny = xDimProp->getPropertyValue(
-                                rtl::OUString::createFromAscii(DP_PROP_ORIGINAL) );
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ORIGINAL)) );
                     uno::Reference<uno::XInterface> xIntOrig;
                     if ( (aOrigAny >>= xIntOrig) && xIntOrig.is() )
                         bDuplicated = TRUE;
@@ -967,7 +967,7 @@ void ScDPObject::FillPageList( TypedScStrCollection& rStrings, long nField )
 
     uno::Reference<beans::XPropertySet> xDimProp( xDim, uno::UNO_QUERY );
     long nHierarchy = ScUnoHelpFunctions::GetLongProperty( xDimProp,
-                            rtl::OUString::createFromAscii(DP_PROP_USEDHIERARCHY) );
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_USEDHIERARCHY)) );
     long nLevel = 0;
 
     long nHierCount = 0;
@@ -1017,7 +1017,7 @@ void ScDPObject::FillPageList( TypedScStrCollection& rStrings, long nField )
         sal_Bool bVisible = false;
         if (xPropSet.is())
         {
-            Any any = xPropSet->getPropertyValue(OUString::createFromAscii(SC_UNO_ISVISIBL));
+            Any any = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ISVISIBL)));
             any >>= bVisible;
         }
 
@@ -1340,9 +1340,9 @@ BOOL ScDPObject::ParseFilters( ScDPGetPivotDataField& rTarget,
         uno::Reference<beans::XPropertySet> xDimProp( xDim, uno::UNO_QUERY );
         uno::Reference<sheet::XHierarchiesSupplier> xDimSupp( xDim, uno::UNO_QUERY );
         BOOL bDataLayout = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
-                            rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) );
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ISDATALAYOUT)) );
         sal_Int32 nOrient = ScUnoHelpFunctions::GetEnumProperty(
-                            xDimProp, rtl::OUString::createFromAscii(DP_PROP_ORIENTATION),
+                            xDimProp, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ORIENTATION)),
                             sheet::DataPilotFieldOrientation_HIDDEN );
         if ( !bDataLayout )
         {
@@ -1360,7 +1360,7 @@ BOOL ScDPObject::ParseFilters( ScDPGetPivotDataField& rTarget,
 
                 uno::Reference<container::XIndexAccess> xHiers = new ScNameToIndexAccess( xDimSupp->getHierarchies() );
                 sal_Int32 nHierarchy = ScUnoHelpFunctions::GetLongProperty( xDimProp,
-                                                    rtl::OUString::createFromAscii(DP_PROP_USEDHIERARCHY) );
+                                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_USEDHIERARCHY)) );
                 if ( nHierarchy >= xHiers->getCount() )
                     nHierarchy = 0;
 
@@ -1550,7 +1550,7 @@ void ScDPObject::ToggleDetails(const DataPilotTableHeaderData& rElemDesc, ScDPOb
 
     uno::Reference<beans::XPropertySet> xDimProp( xDim, uno::UNO_QUERY );
     BOOL bDataLayout = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
-                        rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) );
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ISDATALAYOUT)) );
     if (bDataLayout)
     {
         //  the elements of the data layout dimension can't be found by their names
@@ -1608,7 +1608,7 @@ void ScDPObject::ToggleDetails(const DataPilotTableHeaderData& rElemDesc, ScDPOb
             if ( xMbrProp.is() )
             {
                 bShowDetails = ScUnoHelpFunctions::GetBoolProperty( xMbrProp,
-                                    rtl::OUString::createFromAscii(DP_PROP_SHOWDETAILS) );
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_SHOWDETAILS)) );
                 //! don't set bFound if property is unknown?
                 bFound = TRUE;
             }
@@ -1656,7 +1656,7 @@ USHORT lcl_FirstSubTotal( const uno::Reference<beans::XPropertySet>& xDimProp )
     {
         uno::Reference<container::XIndexAccess> xHiers = new ScNameToIndexAccess( xDimSupp->getHierarchies() );
         long nHierarchy = ScUnoHelpFunctions::GetLongProperty( xDimProp,
-                                rtl::OUString::createFromAscii(DP_PROP_USEDHIERARCHY) );
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_USEDHIERARCHY)) );
         if ( nHierarchy >= xHiers->getCount() )
             nHierarchy = 0;
 
@@ -1675,7 +1675,7 @@ USHORT lcl_FirstSubTotal( const uno::Reference<beans::XPropertySet>& xDimProp )
                 try
                 {
                     aSubAny = xLevProp->getPropertyValue(
-                            rtl::OUString::createFromAscii(DP_PROP_SUBTOTALS) );
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_SUBTOTALS)) );
                 }
                 catch(uno::Exception&)
                 {
@@ -1736,7 +1736,7 @@ SCSIZE lcl_FillOldFields( PivotField* pFields,
             ScUnoHelpFunctions::AnyToInterface( xDims->getByIndex(nDim) );
         uno::Reference<beans::XPropertySet> xDimProp( xIntDim, uno::UNO_QUERY );
         long nDimOrient = ScUnoHelpFunctions::GetEnumProperty(
-                            xDimProp, rtl::OUString::createFromAscii(DP_PROP_ORIENTATION),
+                            xDimProp, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ORIENTATION)),
                             sheet::DataPilotFieldOrientation_HIDDEN );
         if ( xDimProp.is() && nDimOrient == nOrient )
         {
@@ -1744,7 +1744,7 @@ SCSIZE lcl_FillOldFields( PivotField* pFields,
             if ( nOrient == sheet::DataPilotFieldOrientation_DATA )
             {
                 sheet::GeneralFunction eFunc = (sheet::GeneralFunction)ScUnoHelpFunctions::GetEnumProperty(
-                                            xDimProp, rtl::OUString::createFromAscii(DP_PROP_FUNCTION),
+                                            xDimProp, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_FUNCTION)),
                                             sheet::GeneralFunction_NONE );
                 if ( eFunc == sheet::GeneralFunction_AUTO )
                 {
@@ -1756,13 +1756,16 @@ SCSIZE lcl_FillOldFields( PivotField* pFields,
             else
                 nMask = lcl_FirstSubTotal( xDimProp );      // from first hierarchy
 
-            BOOL bDataLayout = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
-                                    rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) );
+            // is this data layout dimension?
+            bool bDataLayout = ScUnoHelpFunctions::GetBoolProperty(
+                xDimProp, OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ISDATALAYOUT)));
+
+            // is this dimension cloned?
             uno::Any aOrigAny;
             try
             {
                 aOrigAny = xDimProp->getPropertyValue(
-                                rtl::OUString::createFromAscii(DP_PROP_ORIGINAL) );
+                    OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ORIGINAL)));
             }
             catch(uno::Exception&)
             {
@@ -1816,7 +1819,7 @@ SCSIZE lcl_FillOldFields( PivotField* pFields,
                 pFields[nOutCount].nFuncMask = nMask;
                 pFields[nOutCount].nFuncCount = lcl_CountBits( nMask );
                 aPos[nOutCount] = ScUnoHelpFunctions::GetLongProperty( xDimProp,
-                                    rtl::OUString::createFromAscii(DP_PROP_POSITION) );
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_POSITION)) );
 
                 try
                 {
@@ -1892,15 +1895,15 @@ BOOL ScDPObject::FillOldParam(ScPivotParam& rParam, BOOL bForFile) const
         try
         {
             rParam.bMakeTotalCol = ScUnoHelpFunctions::GetBoolProperty( xProp,
-                        rtl::OUString::createFromAscii(DP_PROP_COLUMNGRAND), TRUE );
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_COLUMNGRAND)), TRUE );
             rParam.bMakeTotalRow = ScUnoHelpFunctions::GetBoolProperty( xProp,
-                        rtl::OUString::createFromAscii(DP_PROP_ROWGRAND), TRUE );
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ROWGRAND)), TRUE );
 
             // following properties may be missing for external sources
             rParam.bIgnoreEmptyRows = ScUnoHelpFunctions::GetBoolProperty( xProp,
-                        rtl::OUString::createFromAscii(DP_PROP_IGNOREEMPTY) );
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_IGNOREEMPTY)) );
             rParam.bDetectCategories = ScUnoHelpFunctions::GetBoolProperty( xProp,
-                        rtl::OUString::createFromAscii(DP_PROP_REPEATIFEMPTY) );
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_REPEATIFEMPTY)) );
         }
         catch(uno::Exception&)
         {
@@ -1917,7 +1920,7 @@ void lcl_FillLabelData( ScDPLabelData& rData, const uno::Reference< beans::XProp
     {
         uno::Reference<container::XIndexAccess> xHiers = new ScNameToIndexAccess( xDimSupp->getHierarchies() );
         long nHierarchy = ScUnoHelpFunctions::GetLongProperty( xDimProp,
-                                rtl::OUString::createFromAscii(DP_PROP_USEDHIERARCHY) );
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_USEDHIERARCHY)) );
         if ( nHierarchy >= xHiers->getCount() )
             nHierarchy = 0;
         rData.mnUsedHier = nHierarchy;
@@ -1935,7 +1938,7 @@ void lcl_FillLabelData( ScDPLabelData& rData, const uno::Reference< beans::XProp
             if ( xLevProp.is() )
             {
                 rData.mbShowAll = ScUnoHelpFunctions::GetBoolProperty( xLevProp,
-                                    rtl::OUString::createFromAscii(DP_PROP_SHOWEMPTY) );
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_SHOWEMPTY)) );
 
                 try
                 {
@@ -1980,7 +1983,7 @@ BOOL ScDPObject::FillLabelData(ScPivotParam& rParam)
         {
             BOOL bDuplicated = FALSE;
             BOOL bData = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
-                            rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) );
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ISDATALAYOUT)) );
             //! error checking -- is "IsDataLayoutDimension" property required??
 
             try
@@ -1988,7 +1991,7 @@ BOOL ScDPObject::FillLabelData(ScPivotParam& rParam)
                 aFieldName = String( xDimName->getName() );
 
                 uno::Any aOrigAny = xDimProp->getPropertyValue(
-                            rtl::OUString::createFromAscii(DP_PROP_ORIGINAL) );
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ORIGINAL)) );
                 uno::Reference<uno::XInterface> xIntOrig;
                 if ( (aOrigAny >>= xIntOrig) && xIntOrig.is() )
                     bDuplicated = TRUE;
@@ -1998,7 +2001,7 @@ BOOL ScDPObject::FillLabelData(ScPivotParam& rParam)
             }
 
             OUString aLayoutName = ScUnoHelpFunctions::GetStringProperty(
-                xDimProp, OUString::createFromAscii(SC_UNO_LAYOUTNAME), OUString());
+                xDimProp, OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_LAYOUTNAME)), OUString());
 
             if ( aFieldName.Len() && !bData && !bDuplicated )
             {
@@ -2011,7 +2014,7 @@ BOOL ScDPObject::FillLabelData(ScPivotParam& rParam)
                 GetMembers(nDim, GetUsedHierarchy(nDim), pNewLabel->maMembers);
                 lcl_FillLabelData(*pNewLabel, xDimProp);
                 pNewLabel->mnFlags = ScUnoHelpFunctions::GetLongProperty( xDimProp,
-                                        rtl::OUString::createFromAscii(SC_UNO_FLAGS), 0 );
+                                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_FLAGS)), 0 );
                 rParam.maLabelArray.push_back(pNewLabel);
             }
         }
@@ -2278,7 +2281,7 @@ BOOL ScDPObject::HasRegisteredSources()
     if ( xEnAc.is() )
     {
         uno::Reference<container::XEnumeration> xEnum = xEnAc->createContentEnumeration(
-                                        rtl::OUString::createFromAscii( SCDPSOURCE_SERVICE ) );
+                                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDPSOURCE_SERVICE )) );
         if ( xEnum.is() && xEnum->hasMoreElements() )
             bFound = TRUE;
     }
@@ -2299,7 +2302,7 @@ uno::Sequence<rtl::OUString> ScDPObject::GetRegisteredSources()
     if ( xEnAc.is() )
     {
         uno::Reference<container::XEnumeration> xEnum = xEnAc->createContentEnumeration(
-                                        rtl::OUString::createFromAscii( SCDPSOURCE_SERVICE ) );
+                                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDPSOURCE_SERVICE )) );
         if ( xEnum.is() )
         {
             while ( xEnum->hasMoreElements() )
@@ -2343,7 +2346,7 @@ uno::Reference<sheet::XDimensionsSupplier> ScDPObject::CreateSource( const ScDPS
     if ( xEnAc.is() )
     {
         uno::Reference<container::XEnumeration> xEnum = xEnAc->createContentEnumeration(
-                                        rtl::OUString::createFromAscii( SCDPSOURCE_SERVICE ) );
+                                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDPSOURCE_SERVICE )) );
         if ( xEnum.is() )
         {
             while ( xEnum->hasMoreElements() && !xRet.is() )
@@ -2641,5 +2644,4 @@ bool ScDPCollection::HasDPTable(SCCOL nCol, SCROW nRow, SCTAB nTab) const
     return pMergeAttr->HasDPTable();
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index 43b2e91ff18f..fde458b8c6dc 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -215,14 +215,14 @@ void lcl_FillNumberFormats( UINT32*& rFormats, long& rCount,
             {
                 sheet::DataPilotFieldOrientation eDimOrient =
                     (sheet::DataPilotFieldOrientation) ScUnoHelpFunctions::GetEnumProperty(
-                        xDimProp, rtl::OUString::createFromAscii(DP_PROP_ORIENTATION),
+                        xDimProp, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ORIENTATION)),
                         sheet::DataPilotFieldOrientation_HIDDEN );
                 if ( eDimOrient == sheet::DataPilotFieldOrientation_DATA )
                 {
                     aDataNames[nDataCount] = String( xDimName->getName() );
                     long nFormat = ScUnoHelpFunctions::GetLongProperty(
                                             xDimProp,
-                                            rtl::OUString::createFromAscii(DP_PROP_NUMBERFORMAT) );
+                                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_NUMBERFORMAT)) );
                     nDataFormats[nDataCount] = nFormat;
                     if ( nFormat != 0 )
                         bAnySet = TRUE;
@@ -282,13 +282,13 @@ UINT32 lcl_GetFirstNumberFormat( const uno::Reference<container::XIndexAccess>&
         {
             sheet::DataPilotFieldOrientation eDimOrient =
                 (sheet::DataPilotFieldOrientation) ScUnoHelpFunctions::GetEnumProperty(
-                    xDimProp, rtl::OUString::createFromAscii(DP_PROP_ORIENTATION),
+                    xDimProp, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ORIENTATION)),
                     sheet::DataPilotFieldOrientation_HIDDEN );
             if ( eDimOrient == sheet::DataPilotFieldOrientation_DATA )
             {
                 long nFormat = ScUnoHelpFunctions::GetLongProperty(
                                         xDimProp,
-                                        rtl::OUString::createFromAscii(DP_PROP_NUMBERFORMAT) );
+                                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_NUMBERFORMAT)) );
 
                 return nFormat;     // use format from first found data dimension
             }
@@ -330,7 +330,7 @@ uno::Sequence<sheet::MemberResult> lcl_GetSelectedPageAsResult( const uno::Refer
         {
             //! merge with ScDPDimension::setPropertyValue?
 
-            uno::Any aValue = xDimProp->getPropertyValue( rtl::OUString::createFromAscii(DP_PROP_FILTER) );
+            uno::Any aValue = xDimProp->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_FILTER)) );
 
             uno::Sequence<sheet::TableFilterField> aSeq;
             if (aValue >>= aSeq)
@@ -402,15 +402,15 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
             {
                 sheet::DataPilotFieldOrientation eDimOrient =
                     (sheet::DataPilotFieldOrientation) ScUnoHelpFunctions::GetEnumProperty(
-                        xDimProp, rtl::OUString::createFromAscii(DP_PROP_ORIENTATION),
+                        xDimProp, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ORIENTATION)),
                         sheet::DataPilotFieldOrientation_HIDDEN );
                 long nDimPos = ScUnoHelpFunctions::GetLongProperty( xDimProp,
-                        rtl::OUString::createFromAscii(DP_PROP_POSITION) );
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_POSITION)) );
                 BOOL bIsDataLayout = ScUnoHelpFunctions::GetBoolProperty(
                                                 xDimProp,
-                                                rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) );
+                                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ISDATALAYOUT)) );
                 bool bHasHiddenMember = ScUnoHelpFunctions::GetBoolProperty(
-                    xDimProp, OUString::createFromAscii(SC_UNO_HAS_HIDDEN_MEMBER));
+                    xDimProp, OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_HAS_HIDDEN_MEMBER)));
 
                 if ( eDimOrient != sheet::DataPilotFieldOrientation_HIDDEN )
                 {
@@ -418,7 +418,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
                             new ScNameToIndexAccess( xDimSupp->getHierarchies() );
                     long nHierarchy = ScUnoHelpFunctions::GetLongProperty(
                                             xDimProp,
-                                            rtl::OUString::createFromAscii(DP_PROP_USEDHIERARCHY) );
+                                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_USEDHIERARCHY)) );
                     if ( nHierarchy >= xHiers->getCount() )
                         nHierarchy = 0;
 
@@ -447,7 +447,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
                                 // #i108948# use ScUnoHelpFunctions::GetStringProperty, because
                                 // LayoutName is new and may not be present in external implementation
                                 OUString aCaption = ScUnoHelpFunctions::GetStringProperty( xPropSet,
-                                    OUString::createFromAscii(SC_UNO_LAYOUTNAME), aName );
+                                    OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_LAYOUTNAME)), aName );
 
                                 bool bRowFieldHasMember = false;
                                 switch ( eDimOrient )
@@ -546,7 +546,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
         try
         {
             uno::Any aAny = xSrcProp->getPropertyValue(
-                    rtl::OUString::createFromAscii(SC_UNO_DATADESC) );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DATADESC)) );
             rtl::OUString aUStr;
             aAny >>= aUStr;
             aDataDescription = String( aUStr );
@@ -1101,12 +1101,12 @@ void lcl_GetTableVars( sal_Int32& rGrandTotalCols, sal_Int32& rGrandTotalRows, s
 
     uno::Reference<beans::XPropertySet> xSrcProp( xSource, uno::UNO_QUERY );
     BOOL bColGrand = ScUnoHelpFunctions::GetBoolProperty( xSrcProp,
-                                         rtl::OUString::createFromAscii(DP_PROP_COLUMNGRAND) );
+                                         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_COLUMNGRAND)) );
     if ( bColGrand )
         rGrandTotalCols = 1;    // default if data layout not in columns
 
     BOOL bRowGrand = ScUnoHelpFunctions::GetBoolProperty( xSrcProp,
-                                         rtl::OUString::createFromAscii(DP_PROP_ROWGRAND) );
+                                         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ROWGRAND)) );
     if ( bRowGrand )
         rGrandTotalRows = 1;    // default if data layout not in rows
 
@@ -1127,10 +1127,10 @@ void lcl_GetTableVars( sal_Int32& rGrandTotalCols, sal_Int32& rGrandTotalRows, s
             {
                 sheet::DataPilotFieldOrientation eDimOrient =
                     (sheet::DataPilotFieldOrientation) ScUnoHelpFunctions::GetEnumProperty(
-                        xDimProp, rtl::OUString::createFromAscii(DP_PROP_ORIENTATION),
+                        xDimProp, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ORIENTATION)),
                         sheet::DataPilotFieldOrientation_HIDDEN );
                 if ( ScUnoHelpFunctions::GetBoolProperty( xDimProp,
-                                         rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) ) )
+                                         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ISDATALAYOUT)) ) )
                 {
                     rDataLayoutIndex = nDim;
                     rDataOrient = eDimOrient;
@@ -1188,7 +1188,7 @@ void ScDPOutput::GetPositionData(const ScAddress& rPos, DataPilotTablePositionDa
             if (xPropSet.is())
             {
                 sal_Int32 nDataFieldCount = ScUnoHelpFunctions::GetLongProperty( xPropSet,
-                                            rtl::OUString::createFromAscii(SC_UNO_DATAFIELDCOUNT) );
+                                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DATAFIELDCOUNT)) );
                 if (nDataFieldCount > 0)
                     aResData.DataFieldIndex = (nRow - nDataStartRow) % nDataFieldCount;
             }
@@ -1270,7 +1270,7 @@ bool ScDPOutput::GetDataResultPositionData(vector<sheet::DataPilotFieldFilter>&
         return false;
 
     sal_Int32 nDataFieldCount = ScUnoHelpFunctions::GetLongProperty( xPropSet,
-                                rtl::OUString::createFromAscii(SC_UNO_DATAFIELDCOUNT) );
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DATAFIELDCOUNT)) );
     if (nDataFieldCount == 0)
         // No data field is present in this datapilot table.
         return false;
@@ -1450,7 +1450,7 @@ uno::Sequence<sheet::GeneralFunction> lcl_GetSubTotals(
     {
         try
         {
-            uno::Any aValue = xLevelProp->getPropertyValue( rtl::OUString::createFromAscii(DP_PROP_SUBTOTALS) );
+            uno::Any aValue = xLevelProp->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_SUBTOTALS)) );
             aValue >>= aSubTotals;
         }
         catch(uno::Exception&)
@@ -1707,7 +1707,7 @@ void ScDPOutput::GetDataDimensionNames( String& rSourceName, String& rGivenName,
         //! Should use a stored name when available
 
         sheet::GeneralFunction eFunc = (sheet::GeneralFunction)ScUnoHelpFunctions::GetEnumProperty(
-                                xDimProp, rtl::OUString::createFromAscii(DP_PROP_FUNCTION),
+                                xDimProp, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_FUNCTION)),
                                 sheet::GeneralFunction_NONE );
         rGivenName = lcl_GetDataFieldName( rSourceName, eFunc );
     }
@@ -2059,5 +2059,4 @@ BOOL ScDPOutput::GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMo
 }
 
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index f6f6cf216c76..19c4c95bc087 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -178,11 +178,11 @@ void ScDPSaveMember::WriteToSource( const uno::Reference<uno::XInterface>& xMemb
 
         if ( nVisibleMode != SC_DPSAVEMODE_DONTKNOW )
             lcl_SetBoolProperty( xMembProp,
-                    rtl::OUString::createFromAscii(DP_PROP_ISVISIBLE), (BOOL)nVisibleMode );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ISVISIBLE)), (BOOL)nVisibleMode );
 
         if ( nShowDetailsMode != SC_DPSAVEMODE_DONTKNOW )
             lcl_SetBoolProperty( xMembProp,
-                    rtl::OUString::createFromAscii(DP_PROP_SHOWDETAILS), (BOOL)nShowDetailsMode );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_SHOWDETAILS)), (BOOL)nShowDetailsMode );
 
         if (mpLayoutName.get())
             ScUnoHelpFunctions::SetOptionalPropertyValue(xMembProp, SC_UNO_LAYOUTNAME, *mpLayoutName);
@@ -569,22 +569,22 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference<uno::XInterface>& xD
 
         sheet::DataPilotFieldOrientation eOrient = (sheet::DataPilotFieldOrientation)nOrientation;
         aAny <<= eOrient;
-        xDimProp->setPropertyValue( rtl::OUString::createFromAscii(DP_PROP_ORIENTATION), aAny );
+        xDimProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ORIENTATION)), aAny );
 
         sheet::GeneralFunction eFunc = (sheet::GeneralFunction)nFunction;
         aAny <<= eFunc;
-        xDimProp->setPropertyValue( rtl::OUString::createFromAscii(DP_PROP_FUNCTION), aAny );
+        xDimProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_FUNCTION)), aAny );
 
         if ( nUsedHierarchy >= 0 )
         {
             aAny <<= (INT32)nUsedHierarchy;
-            xDimProp->setPropertyValue( rtl::OUString::createFromAscii(DP_PROP_USEDHIERARCHY), aAny );
+            xDimProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_USEDHIERARCHY)), aAny );
         }
 
         if ( pReferenceValue )
         {
             aAny <<= *pReferenceValue;
-            xDimProp->setPropertyValue( rtl::OUString::createFromAscii(SC_UNO_REFVALUE), aAny );
+            xDimProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_REFVALUE)), aAny );
         }
 
         uno::Sequence<sheet::TableFilterField> aFilter;
@@ -657,11 +657,11 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference<uno::XInterface>& xD
                     for (long i=0; i<nSubTotalCount; i++)
                         pArray[i] = (sheet::GeneralFunction)pSubTotalFuncs[i];
                     aAny <<= aSeq;
-                    xLevProp->setPropertyValue( rtl::OUString::createFromAscii(DP_PROP_SUBTOTALS), aAny );
+                    xLevProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_SUBTOTALS)), aAny );
                 }
                 if ( nShowEmptyMode != SC_DPSAVEMODE_DONTKNOW )
                     lcl_SetBoolProperty( xLevProp,
-                        rtl::OUString::createFromAscii(DP_PROP_SHOWEMPTY), (BOOL)nShowEmptyMode );
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_SHOWEMPTY)), (BOOL)nShowEmptyMode );
 
                 if ( pSortInfo )
                     ScUnoHelpFunctions::SetOptionalPropertyValue(xLevProp, SC_UNO_SORTING, *pSortInfo);
@@ -1066,7 +1066,7 @@ void lcl_ResetOrient( const uno::Reference<sheet::XDimensionsSupplier>& xSource
         {
             uno::Any aAny;
             aAny <<= eOrient;
-            xDimProp->setPropertyValue( rtl::OUString::createFromAscii(DP_PROP_ORIENTATION), aAny );
+            xDimProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ORIENTATION)), aAny );
         }
     }
 }
@@ -1089,10 +1089,10 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie
         {
             if ( nIgnoreEmptyMode != SC_DPSAVEMODE_DONTKNOW )
                 lcl_SetBoolProperty( xSourceProp,
-                    rtl::OUString::createFromAscii(DP_PROP_IGNOREEMPTY), (BOOL)nIgnoreEmptyMode );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_IGNOREEMPTY)), (BOOL)nIgnoreEmptyMode );
             if ( nRepeatEmptyMode != SC_DPSAVEMODE_DONTKNOW )
                 lcl_SetBoolProperty( xSourceProp,
-                    rtl::OUString::createFromAscii(DP_PROP_REPEATIFEMPTY), (BOOL)nRepeatEmptyMode );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_REPEATIFEMPTY)), (BOOL)nRepeatEmptyMode );
         }
         catch(uno::Exception&)
         {
@@ -1139,7 +1139,7 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie
                     if ( xDimProp.is() )
                     {
                         bFound = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
-                                    rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) );
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ISDATALAYOUT)) );
                         //! error checking -- is "IsDataLayoutDimension" property required??
                     }
                 }
@@ -1184,10 +1184,10 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie
         {
             if ( nColumnGrandMode != SC_DPSAVEMODE_DONTKNOW )
                 lcl_SetBoolProperty( xSourceProp,
-                    rtl::OUString::createFromAscii(DP_PROP_COLUMNGRAND), (BOOL)nColumnGrandMode );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_COLUMNGRAND)), (BOOL)nColumnGrandMode );
             if ( nRowGrandMode != SC_DPSAVEMODE_DONTKNOW )
                 lcl_SetBoolProperty( xSourceProp,
-                    rtl::OUString::createFromAscii(DP_PROP_ROWGRAND), (BOOL)nRowGrandMode );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ROWGRAND)), (BOOL)nRowGrandMode );
         }
     }
     catch(uno::Exception&)
diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx
index 6847b3aace87..748aeae52e6b 100644
--- a/sc/source/core/data/dpsdbtab.cxx
+++ b/sc/source/core/data/dpsdbtab.cxx
@@ -130,7 +130,7 @@ ScDPTableDataCache* ScImportSourceDesc::CreateCache( ScDocument* pDoc , long nID
     {
         xRowSet = uno::Reference<sdbc::XRowSet>(
             comphelper::getProcessServiceFactory()->createInstance(
-            rtl::OUString::createFromAscii( SC_SERVICE_ROWSET ) ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_ROWSET )) ),
             uno::UNO_QUERY);
         uno::Reference<beans::XPropertySet> xRowProp( xRowSet, uno::UNO_QUERY );
         DBG_ASSERT( xRowProp.is(), "can't get RowSet" );
@@ -142,22 +142,22 @@ ScDPTableDataCache* ScImportSourceDesc::CreateCache( ScDocument* pDoc , long nID
             uno::Any aAny;
             aAny <<= rtl::OUString( aDBName );
             xRowProp->setPropertyValue(
-                rtl::OUString::createFromAscii(SC_DBPROP_DATASOURCENAME), aAny );
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_DATASOURCENAME)), aAny );
 
             aAny <<= rtl::OUString( aObject );
             xRowProp->setPropertyValue(
-                rtl::OUString::createFromAscii(SC_DBPROP_COMMAND), aAny );
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMAND)), aAny );
 
             aAny <<= nSdbType;
             xRowProp->setPropertyValue(
-                rtl::OUString::createFromAscii(SC_DBPROP_COMMANDTYPE), aAny );
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMANDTYPE)), aAny );
 
             uno::Reference<sdb::XCompletedExecution> xExecute( xRowSet, uno::UNO_QUERY );
             if ( xExecute.is() )
             {
                 uno::Reference<task::XInteractionHandler> xHandler(
                     comphelper::getProcessServiceFactory()->createInstance(
-                    rtl::OUString::createFromAscii( SC_SERVICE_INTHANDLER ) ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_INTHANDLER )) ),
                     uno::UNO_QUERY);
                 xExecute->executeWithCompletion( xHandler );
             }
@@ -308,7 +308,4 @@ const ScDPCacheTable& ScDatabaseDPData::GetCacheTable() const
 // -----------------------------------------------------------------------
 
 
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index 7da7c956d26f..cb41716aff1c 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -71,7 +71,7 @@ ScSheetDPData::ScSheetDPData( ScDocument* pD, const ScSheetSourceDesc& rDesc , l
     aCacheTable( pD, rDesc.GetCacheId( pD, nCacheId))
 {
     SCSIZE nEntryCount( aQuery.GetEntryCount());
-    pSpecial = new BOOL[nEntryCount];
+    pSpecial = new bool[nEntryCount];
     for (SCSIZE j = 0; j < nEntryCount; ++j )
     {
         ScQueryEntry& rEntry = aQuery.GetEntry(j);
@@ -146,7 +146,7 @@ BOOL ScSheetDPData::IsDateDimension(long nDim)
     }
     else
     {
-        return aCacheTable.GetCache()->IsDateDimension( nDim);
+        return aCacheTable.getCache()->IsDateDimension( nDim);
     }
 }
 
@@ -164,7 +164,7 @@ ULONG ScSheetDPData::GetNumberFormat(long nDim)
     }
     else
     {
-        return GetCacheTable().GetCache()->GetNumberFormat( nDim );
+        return GetCacheTable().getCache()->GetNumberFormat( nDim );
     }
 }
 UINT32  ScDPTableData::GetNumberFormatByIdx( NfIndexTableOffset eIdx )
diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx
index c0c2d6d33122..85dc27eaae8b 100644
--- a/sc/source/core/data/dptabdat.cxx
+++ b/sc/source/core/data/dptabdat.cxx
@@ -170,7 +170,7 @@ void ScDPTableData::FillRowDataFromCacheTable(sal_Int32 nRow, const ScDPCacheTab
     // page dimensions
     GetItemData(rCacheTable, nRow, rInfo.aPageDims, rData.aPageData);
 
-    long nCacheColumnCount = rCacheTable.GetCache()->GetColumnCount();
+    long nCacheColumnCount = rCacheTable.getCache()->GetColumnCount();
     sal_Int32 n = rInfo.aDataSrcCols.size();
     for (sal_Int32 i = 0; i < n; ++i)
     {
@@ -255,10 +255,10 @@ void ScDPTableData::GetItemData(const ScDPCacheTable& rCacheTable, sal_Int32 nRo
         }
 
         nDim = GetSourceDim( nDim );
-        if ( nDim >= rCacheTable.GetCache()->GetColumnCount() )
+        if ( nDim >= rCacheTable.getCache()->GetColumnCount() )
            continue;
 
-        SCROW nId= rCacheTable.GetCache()->GetItemDataId( static_cast<SCCOL>(nDim), static_cast<SCROW>(nRow), IsRepeatIfEmpty());
+        SCROW nId= rCacheTable.getCache()->GetItemDataId( static_cast<SCCOL>(nDim), static_cast<SCROW>(nRow), IsRepeatIfEmpty());
         rItemData.push_back( nId );
 
     }
@@ -287,18 +287,18 @@ const ScDPItemData* ScDPTableData::GetMemberByIndex( long nDim, long nIndex )
 
     const ::std::vector<SCROW>& nMembers = GetCacheTable().getFieldEntries( nDim );
 
-    return GetCacheTable().GetCache()->GetItemDataById( (SCCOL) nDim, (SCROW)nMembers[nIndex] );
+    return GetCacheTable().getCache()->GetItemDataById( (SCCOL) nDim, (SCROW)nMembers[nIndex] );
 }
 
 const ScDPItemData* ScDPTableData::GetMemberById( long nDim, long nId)
 {
 
-    return GetCacheTable().GetCache()->GetItemDataById( (SCCOL) nDim, (SCROW)nId);
+    return GetCacheTable().getCache()->GetItemDataById( (SCCOL) nDim, (SCROW)nId);
 }
 
 SCROW   ScDPTableData::GetIdOfItemData( long  nDim, const ScDPItemData& rData )
 {
-        return GetCacheTable().GetCache()->GetIdByItemData((SCCOL) nDim, rData );
+        return GetCacheTable().getCache()->GetIdByItemData((SCCOL) nDim, rData );
  }
 
 const std::vector< SCROW >& ScDPTableData::GetColumnEntries( long nColumn )
@@ -317,8 +317,8 @@ long ScDPTableData::GetSourceDim( long nDim )
     if ( getIsDataLayoutDimension(nDim) )
         return 0;
 
-    long n1 = GetCacheTable().GetCache()->GetOrder( nDim, nDataId1);
-    long n2 = GetCacheTable().GetCache()->GetOrder( nDim, nDataId2);
+    long n1 = GetCacheTable().getCache()->GetOrder( nDim, nDataId1);
+    long n2 = GetCacheTable().getCache()->GetOrder( nDim, nDataId2);
     if ( n1 > n2 )
         return 1;
     else if ( n1 == n2 )
diff --git a/sc/source/core/data/dptablecache.cxx b/sc/source/core/data/dptablecache.cxx
index 3cf660b609e7..0a76955ae832 100644
--- a/sc/source/core/data/dptablecache.cxx
+++ b/sc/source/core/data/dptablecache.cxx
@@ -29,9 +29,9 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
- // MARKER(update_precomp.py): autogen include statement, do not remove
+// MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sc.hxx"
-// INCLUDE ---------------------------------------------------------------
+
 #include "dptablecache.hxx"
 #include "document.hxx"
 #include "cell.hxx"
@@ -40,15 +40,17 @@
 #include <rtl/math.hxx>
 #include "queryparam.hxx"
 #include "dpglobal.hxx"
+#include "dptabdat.hxx"
 
-#include "docoptio.hxx" //for ValidQuery
-#include <unotools/textsearch.hxx> //for ValidQuery
+#include "docoptio.hxx"
+#include <unotools/textsearch.hxx>
 
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XRowSet.hpp>
 #include <com/sun/star/sdbc/XResultSetMetaData.hpp>
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
+
 const double D_TIMEFACTOR = 86400.0;
 
 using namespace ::com::sun::star;
@@ -57,61 +59,59 @@ using ::com::sun::star::uno::Exception;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::UNO_QUERY;
 using ::com::sun::star::uno::UNO_QUERY_THROW;
-// -----------------------------------------------------------------------
-namespace
+
+namespace {
+
+bool lcl_isDate( ULONG nNumType )
 {
-    BOOL lcl_isDate( ULONG nNumType )
-    {
-        return ( (nNumType & NUMBERFORMAT_DATE) != 0 )? 1:0 ;
-    }
+    return ( (nNumType & NUMBERFORMAT_DATE) != 0 )? 1:0 ;
+}
 
-    BOOL lcl_Search( const std::vector<ScDPItemData*>& list, const ::std::vector<SCROW>& rOrder, const ScDPItemData& item, SCROW& rIndex)
+bool lcl_Search( const std::vector<ScDPItemData*>& list, const ::std::vector<SCROW>& rOrder, const ScDPItemData& item, SCROW& rIndex)
+{
+    rIndex = list.size();
+    bool bFound = false;
+    SCROW nLo = 0;
+    SCROW nHi = list.size() - 1;
+    SCROW nIndex;
+    long nCompare;
+    while (nLo <= nHi)
     {
-        rIndex = list.size();
-        BOOL bFound = FALSE;
-        SCROW nLo = 0;
-        SCROW nHi = list.size() - 1;
-        SCROW nIndex;
-        long nCompare;
-        while (nLo <= nHi)
+        nIndex = (nLo + nHi) / 2;
+        nCompare = ScDPItemData::Compare( *list[rOrder[nIndex]], item );
+        if (nCompare < 0)
+            nLo = nIndex + 1;
+        else
         {
-            nIndex = (nLo + nHi) / 2;
-            nCompare = ScDPItemData::Compare( *list[rOrder[nIndex]], item );
-            if (nCompare < 0)
-                nLo = nIndex + 1;
-            else
+            nHi = nIndex - 1;
+            if (nCompare == 0)
             {
-                nHi = nIndex - 1;
-                if (nCompare == 0)
-                {
-                    bFound = TRUE;
-                    nLo = nIndex;
-                }
+                bFound = true;
+                nLo = nIndex;
             }
         }
-        rIndex = nLo;
-        return bFound;
     }
+    rIndex = nLo;
+    return bFound;
+}
 
-    ScDPItemData*  lcl_GetItemValue(const Reference<sdbc::XRow>& xRow, sal_Int32 nType, long nCol,
-                  const Date& rNullDate )
+ScDPItemData*  lcl_GetItemValue(const Reference<sdbc::XRow>& xRow, sal_Int32 nType, long nCol,
+              const Date& rNullDate )
+{
+    short nNumType = NUMBERFORMAT_NUMBER;
+    try
     {
-        short nNumType = NUMBERFORMAT_NUMBER;
-        try
+        String rStr = xRow->getString(nCol);
+        double fValue = 0.0;
+        switch (nType)
         {
-            String rStr = xRow->getString(nCol);
-            double fValue = 0.0;
-            switch (nType)
-            {
             case sdbc::DataType::BIT:
             case sdbc::DataType::BOOLEAN:
-                {
-                    nNumType = NUMBERFORMAT_LOGICAL;
-                    fValue  = xRow->getBoolean(nCol) ? 1 : 0;
-                    return new ScDPItemData( rStr, fValue,TRUE,nNumType);
-                }
-                //break;
-
+            {
+                nNumType = NUMBERFORMAT_LOGICAL;
+                fValue  = xRow->getBoolean(nCol) ? 1 : 0;
+                return new ScDPItemData( rStr, fValue,true,nNumType);
+            }
             case sdbc::DataType::TINYINT:
             case sdbc::DataType::SMALLINT:
             case sdbc::DataType::INTEGER:
@@ -121,45 +121,38 @@ namespace
             case sdbc::DataType::DOUBLE:
             case sdbc::DataType::NUMERIC:
             case sdbc::DataType::DECIMAL:
-                {
-                    //! do the conversion here?
-                    fValue = xRow->getDouble(nCol);
-                    return new ScDPItemData( rStr, fValue,TRUE);
-                }
-                //break;
-
+            {
+                //! do the conversion here?
+                fValue = xRow->getDouble(nCol);
+                return new ScDPItemData( rStr, fValue,true);
+            }
             case sdbc::DataType::DATE:
-                {
-                    nNumType = NUMBERFORMAT_DATE;
-
-                    util::Date aDate = xRow->getDate(nCol);
-                    fValue = Date(aDate.Day, aDate.Month, aDate.Year) - rNullDate;
-                    return new ScDPItemData( rStr, fValue, TRUE, nNumType );
-                }
-                //break;
+            {
+                nNumType = NUMBERFORMAT_DATE;
 
+                util::Date aDate = xRow->getDate(nCol);
+                fValue = Date(aDate.Day, aDate.Month, aDate.Year) - rNullDate;
+                return new ScDPItemData( rStr, fValue, true, nNumType );
+            }
             case sdbc::DataType::TIME:
-                {
-                    nNumType = NUMBERFORMAT_TIME;
-
-                    util::Time aTime = xRow->getTime(nCol);
-                    fValue = ( aTime.Hours * 3600 + aTime.Minutes * 60 +
-                        aTime.Seconds + aTime.HundredthSeconds / 100.0 ) / D_TIMEFACTOR;
-                    return new ScDPItemData( rStr,fValue, TRUE, nNumType );
-                }
-                //break;
+            {
+                nNumType = NUMBERFORMAT_TIME;
 
+                util::Time aTime = xRow->getTime(nCol);
+                fValue = ( aTime.Hours * 3600 + aTime.Minutes * 60 +
+                           aTime.Seconds + aTime.HundredthSeconds / 100.0 ) / D_TIMEFACTOR;
+                return new ScDPItemData( rStr,fValue, true, nNumType );
+            }
             case sdbc::DataType::TIMESTAMP:
-                {
-                    nNumType = NUMBERFORMAT_DATETIME;
+            {
+                nNumType = NUMBERFORMAT_DATETIME;
 
-                    util::DateTime aStamp = xRow->getTimestamp(nCol);
-                    fValue = ( Date( aStamp.Day, aStamp.Month, aStamp.Year ) - rNullDate ) +
-                        ( aStamp.Hours * 3600 + aStamp.Minutes * 60 +
-                        aStamp.Seconds + aStamp.HundredthSeconds / 100.0 ) / D_TIMEFACTOR;
-                    return new ScDPItemData( rStr,fValue, TRUE, nNumType );
-                }
-                //break;
+                util::DateTime aStamp = xRow->getTimestamp(nCol);
+                fValue = ( Date( aStamp.Day, aStamp.Month, aStamp.Year ) - rNullDate ) +
+                         ( aStamp.Hours * 3600 + aStamp.Minutes * 60 +
+                           aStamp.Seconds + aStamp.HundredthSeconds / 100.0 ) / D_TIMEFACTOR;
+                return new ScDPItemData( rStr,fValue, true, nNumType );
+            }
             case sdbc::DataType::CHAR:
             case sdbc::DataType::VARCHAR:
             case sdbc::DataType::LONGVARCHAR:
@@ -169,29 +162,25 @@ namespace
             case sdbc::DataType::LONGVARBINARY:
             default:
                 return new ScDPItemData ( rStr );
-                //break;
-            }
-        }
-        catch (uno::Exception&)
-        {
         }
-        catch ( ... )
-        {
-
-        }
-      return NULL;
     }
+    catch (uno::Exception&)
+    {
+    }
+
+    return NULL;
+}
+
 }
-// Wang Xu Ming -- 12/23/2008
-//Refactor cache data
-ScDPItemData::ScDPItemData( const String& rS, double fV/* = 0.0*/, BOOL bHV/* = FALSE*/, const ULONG nNumFormatP /*= 0*/ , BOOL bData/* = TRUE*/) :
-nNumFormat( nNumFormatP ), aString(rS), fValue(fV),
-mbFlag( (MK_VAL*!!bHV) | (MK_DATA*!!bData) | (MK_ERR*!!FALSE) | (MK_DATE*!!lcl_isDate( nNumFormat ) ) )
+
+ScDPItemData::ScDPItemData( const String& rS, double fV/* = 0.0*/, bool bHV/* = false*/, const ULONG nNumFormatP /*= 0*/ , bool bData/* = true*/) :
+    nNumFormat( nNumFormatP ), aString(rS), fValue(fV),
+    mbFlag( (MK_VAL*!!bHV) | (MK_DATA*!!bData) | (MK_ERR*!!false) | (MK_DATE*!!lcl_isDate( nNumFormat ) ) )
 {
 }
 
-ScDPItemData::ScDPItemData( ScDocument* pDoc, SCROW nRow, USHORT nCol, USHORT nDocTab  ):
-        nNumFormat( 0 ), fValue(0.0), mbFlag( 0 )
+ScDPItemData::ScDPItemData( ScDocument* pDoc, SCROW nRow, USHORT nCol, USHORT nDocTab  ) :
+    nNumFormat( 0 ), fValue(0.0), mbFlag( 0 )
 {
     String aDocStr;
     pDoc->GetString( nCol, nRow, nDocTab, aDocStr );
@@ -202,8 +191,10 @@ ScDPItemData::ScDPItemData( ScDocument* pDoc, SCROW nRow, USHORT nCol, USHORT nD
     ScBaseCell* pCell = pDoc->GetCell( aPos );
 
     if ( pCell && pCell->GetCellType() == CELLTYPE_FORMULA && ((ScFormulaCell*)pCell)->GetErrCode() )
-        SetString ( aDocStr );      //[SODC_19347] add liyi
-        //bErr = TRUE;              //[SODC_19347] del liyi
+    {
+        SetString ( aDocStr );
+        mbFlag |= MK_ERR;
+    }
     else if ( pDoc->HasValueData( nCol, nRow, nDocTab ) )
     {
         double fVal = pDoc->GetValue(ScAddress(nCol, nRow, nDocTab));
@@ -219,10 +210,9 @@ ScDPItemData::ScDPItemData( ScDocument* pDoc, SCROW nRow, USHORT nCol, USHORT nD
     else if ( pDoc->HasData( nCol,nRow, nDocTab ) )
         SetString ( aDocStr );
 }
-// End Comments
 
-BOOL ScDPItemData::IsCaseInsEqual( const ScDPItemData& r ) const
-{ //TODO: indified Date?
+bool ScDPItemData::IsCaseInsEqual( const ScDPItemData& r ) const
+{
     //! pass Transliteration?
     //! inline?
     return IsValue() ? ( r.IsValue() && rtl::math::approxEqual( fValue, r.fValue ) ) :
@@ -240,27 +230,22 @@ size_t ScDPItemData::Hash() const
         return rtl_ustr_hashCode_WithLength( aString.GetBuffer(), aString.Len() );
 }
 
-BOOL ScDPItemData::operator==( const ScDPItemData& r ) const
+bool ScDPItemData::operator==( const ScDPItemData& r ) const
 {
     if ( IsValue() )
     {
         if( (HasDatePart() != r.HasDatePart())  || (HasDatePart() && mnDatePart != r.mnDatePart) )
-            return FALSE;
+            return false;
 
-// Wang Xu Ming -- 1/9/2009
-// Add Data Cache Support.
-// Identify date
         if ( IsDate() != r.IsDate() )
-            return FALSE;
-      else
-        if ( r.IsValue() )
+            return false;
+        else if ( r.IsValue() )
             return rtl::math::approxEqual( fValue, r.fValue );
         else
-            return FALSE;
-// End Comments
+            return false;
     }
     else if ( r.IsValue() )
-        return FALSE;
+        return false;
     else
         // need exact equality until we have a safe case insensitive string hash
         return aString == r.aString;
@@ -275,14 +260,10 @@ sal_Int32 ScDPItemData::Compare( const ScDPItemData& rA,
         {
             if ( rtl::math::approxEqual( rA.fValue, rB.fValue ) )
             {
-// Wang Xu Ming -- 1/9/2009
-// Add Data Cache Support.
-// Date > number
                 if ( rA.IsDate() == rB.IsDate() )
                     return 0;
                 else
                     return rA.IsDate() ? 1: -1;
-// End Comments
             }
             else if ( rA.fValue < rB.fValue )
                 return -1;
@@ -297,8 +278,7 @@ sal_Int32 ScDPItemData::Compare( const ScDPItemData& rA,
     else
         return ScGlobal::GetCollator()->compareString( rA.aString, rB.aString );
 }
-//
-//Wang Xu Ming SODC_17561
+
 #ifdef DEBUG
 void    ScDPItemData::dump() const
 {
@@ -308,7 +288,6 @@ void    ScDPItemData::dump() const
     DBG_TRACE1( "mbFlag= %d", mbFlag);
 }
 #endif
-//End
 
 TypedStrData*  ScDPItemData::CreateTypeString( )
 {
@@ -332,17 +311,17 @@ sal_uInt8 ScDPItemData::GetType() const
 
 }
 
-BOOL ScDPItemData::IsHasData() const
+bool ScDPItemData::IsHasData() const
 {
     return !!(mbFlag&MK_DATA);
 }
 
-BOOL ScDPItemData::IsHasErr() const
+bool ScDPItemData::IsHasErr() const
 {
     return !!(mbFlag&MK_ERR);
 }
 
-BOOL ScDPItemData::IsValue() const
+bool ScDPItemData::IsValue() const
 {
     return !!(mbFlag&MK_VAL);
 }
@@ -362,20 +341,20 @@ ULONG  ScDPItemData::GetNumFormat() const
     return nNumFormat;
 }
 
-BOOL ScDPItemData::HasStringData() const
+bool ScDPItemData::HasStringData() const
 
 {
     return IsHasData()&&!IsHasErr()&&!IsValue();
 }
-BOOL ScDPItemData::IsDate() const
+bool ScDPItemData::IsDate() const
 {
     return !!(mbFlag&MK_DATE);
 }
-BOOL ScDPItemData::HasDatePart() const
+bool ScDPItemData::HasDatePart() const
 {
     return !!(mbFlag&MK_DATEPART);
 }
-void ScDPItemData::SetDate( BOOL b )
+void ScDPItemData::SetDate( bool b )
 {
     b ? ( mbFlag |= MK_DATE ) : ( mbFlag &= ~MK_DATE );
 }
@@ -384,17 +363,17 @@ void ScDPItemData::SetDate( BOOL b )
 //class ScDPTableDataCache
 //To cache the pivot table data source
 
-BOOL ScDPTableDataCache::operator== ( const ScDPTableDataCache& r ) const
+bool ScDPTableDataCache::operator== ( const ScDPTableDataCache& r ) const
 {
     if ( GetColumnCount() == r.GetColumnCount() )
     {
         for ( SCCOL i = 0 ; i < GetColumnCount(); i++ )
         {   //check dim names
             if ( GetDimensionName( i ) != r.GetDimensionName( i ) )
-                return FALSE;
+                return false;
             //check rows count
             if ( GetRowCount() != r.GetRowCount() )
-                return FALSE;
+                return false;
             //check dim member values
             size_t nMembersCount = GetDimMemberValues( i ).size();
             if ( GetDimMemberValues( i ).size() == r. GetDimMemberValues( i ).size() )
@@ -404,41 +383,39 @@ BOOL ScDPTableDataCache::operator== ( const ScDPTableDataCache& r ) const
                     if ( *( GetDimMemberValues( i )[j] ) == *( r.GetDimMemberValues( i )[j] ) )
                         continue;
                     else
-                        return FALSE;
+                        return false;
                 }
             }
             else
-                return FALSE;
+                return false;
             //check source table index
             for ( SCROW k=0 ; k < GetRowCount(); k ++ )
             {
-                if ( GetItemDataId( i, k, FALSE ) == r.GetItemDataId( i,k,FALSE) )
+                if ( GetItemDataId( i, k, false ) == r.GetItemDataId( i,k,false) )
                     continue;
                 else
-                    return FALSE;
+                    return false;
             }
         }
     }
-    return TRUE;
+    return true;
 }
 
 ScDPTableDataCache::ScDPTableDataCache(  ScDocument* pDoc  ) :
-mpDoc( pDoc ),
-mnColumnCount ( 0 ),
-mpTableDataValues ( NULL ),
-mpSourceData ( NULL ),
-mpGlobalOrder( NULL ),
-mpIndexOrder( NULL)
+    mpDoc( pDoc ),
+    mnID(-1),
+    mnColumnCount ( 0 ),
+    mpTableDataValues ( NULL ),
+    mpSourceData ( NULL ),
+    mpGlobalOrder( NULL ),
+    mpIndexOrder( NULL)
 {
-    mnID = -1;
 }
 
 ScDPTableDataCache::~ScDPTableDataCache()
 {
     if ( IsValid() )
     {
-// Wang Xu Ming -- 2/17/2009
-// Performance issue
         USHORT nCol;
         for (  nCol=0; nCol < GetColumnCount() ; nCol++ )
         {
@@ -446,8 +423,7 @@ ScDPTableDataCache::~ScDPTableDataCache()
                 delete mpTableDataValues[nCol][row];
         }
         for ( nCol =0; nCol < mrLabelNames.size(); nCol++ )
-                delete mrLabelNames[nCol];
-// End Comments
+            delete mrLabelNames[nCol];
 
         mnColumnCount = 0;
         delete [] mpTableDataValues;
@@ -461,7 +437,6 @@ ScDPTableDataCache::~ScDPTableDataCache()
     }
 }
 
-// -----------------------------------------------------------------------
 void ScDPTableDataCache::AddRow( ScDPItemData* pRow, USHORT nCount )
 {
     DBG_ASSERT( pRow , " empty pointer" );
@@ -483,14 +458,11 @@ void ScDPTableDataCache::AddRow( ScDPItemData* pRow, USHORT nCount )
     }
 }
 
-// -----------------------------------------------------------------------
 bool  ScDPTableDataCache::IsValid() const
-{ //TODO: continue check valid
+{
     return mpTableDataValues!=NULL && mpSourceData!= NULL && mnColumnCount>0;
 }
 
-// -----------------------------------------------------------------------
-
 namespace {
 
 /**
@@ -515,7 +487,6 @@ private:
 
 }
 
-// -----------------------------------------------------------------------
 bool ScDPTableDataCache::InitFromDoc(  ScDocument* pDoc, const ScRange& rRange )
 {
     // Make sure the formula cells within the data range are interpreted
@@ -524,7 +495,6 @@ bool ScDPTableDataCache::InitFromDoc(  ScDocument* pDoc, const ScRange& rRange )
     // increasing the macro level.
     MacroInterpretIncrementer aMacroInc(pDoc);
 
-    //
     SCROW nStartRow = rRange.aStart.Row();  // start of data
     SCROW nEndRow = rRange.aEnd.Row();
     USHORT nStartCol = rRange.aStart.Col();
@@ -564,13 +534,12 @@ bool ScDPTableDataCache::InitFromDoc(  ScDocument* pDoc, const ScRange& rRange )
                 AddData( nCol - nStartCol, new ScDPItemData( pDoc, nRow, nCol, nDocTab  ) );
         }
     }
-    return TRUE;
+    return true;
 }
 
-// -----------------------------------------------------------------------
 bool ScDPTableDataCache::InitFromDataBase (const Reference<sdbc::XRowSet>& xRowSet, const Date& rNullDate)
 {
-  if (!xRowSet.is())
+    if (!xRowSet.is())
         // Dont' even waste time to go any further.
         return false;
     try
@@ -580,36 +549,36 @@ bool ScDPTableDataCache::InitFromDataBase (const Reference<sdbc::XRowSet>& xRowS
         if (!xMeta.is())
             return false;
 
-       long nOldColumCount = mnColumnCount;
-    mnColumnCount = xMeta->getColumnCount();
-    if ( IsValid() )
-    {
-        for ( USHORT nCol=0; nCol < nOldColumCount ; nCol++ )
+        long nOldColumCount = mnColumnCount;
+        mnColumnCount = xMeta->getColumnCount();
+        if (IsValid())
         {
-            for ( ULONG row = 0 ;  row < mpTableDataValues[nCol].size(); row++ )
-                delete mpTableDataValues[nCol][row];
-            delete mrLabelNames[nCol];
+            for (USHORT nCol=0; nCol < nOldColumCount ; nCol++)
+            {
+                for (ULONG row = 0 ;  row < mpTableDataValues[nCol].size(); row++)
+                    delete mpTableDataValues[nCol][row];
+                delete mrLabelNames[nCol];
+            }
+            delete [] mpTableDataValues;
+            delete [] mpSourceData;
+            delete [] mpGlobalOrder;
+            delete [] mpIndexOrder;
+            mrLabelNames.clear();
         }
-        delete [] mpTableDataValues;
-        delete [] mpSourceData;
-        delete [] mpGlobalOrder;
-        delete [] mpIndexOrder;
-        mrLabelNames.clear();
-    }
         // Get column titles and types.
-    mrLabelNames.reserve(mnColumnCount);
-    mpTableDataValues = new std::vector<ScDPItemData*>[ mnColumnCount ];
-    mpSourceData      = new std::vector<SCROW>[ mnColumnCount ];
-    mpGlobalOrder     = new std::vector<SCROW>[ mnColumnCount ];
-    mpIndexOrder      = new std::vector<SCROW>[ mnColumnCount ];
+        mrLabelNames.reserve(mnColumnCount);
+        mpTableDataValues = new std::vector<ScDPItemData*>[ mnColumnCount ];
+        mpSourceData      = new std::vector<SCROW>[ mnColumnCount ];
+        mpGlobalOrder     = new std::vector<SCROW>[ mnColumnCount ];
+        mpIndexOrder      = new std::vector<SCROW>[ mnColumnCount ];
 
-    std::vector<sal_Int32> aColTypes(mnColumnCount);
+        std::vector<sal_Int32> aColTypes(mnColumnCount);
 
         for (sal_Int32 nCol = 0; nCol < mnColumnCount; ++nCol)
         {
             String aColTitle = xMeta->getColumnLabel(nCol+1);
             aColTypes[nCol]  = xMeta->getColumnType(nCol+1);
-           AddLabel( new ScDPItemData( aColTitle) );
+            AddLabel( new ScDPItemData( aColTitle) );
         }
 
         // Now get the data rows.
@@ -619,23 +588,23 @@ bool ScDPTableDataCache::InitFromDataBase (const Reference<sdbc::XRowSet>& xRowS
         {
             for (sal_Int32 nCol = 0; nCol < mnColumnCount; ++nCol)
             {
-               ScDPItemData * pNew =  lcl_GetItemValue( xRow, aColTypes[nCol], nCol+1, rNullDate );
-                if ( pNew )
-                    AddData(  nCol , pNew );
+                ScDPItemData * pNew =  lcl_GetItemValue( xRow, aColTypes[nCol], nCol+1, rNullDate );
+                if (pNew)
+                    AddData(nCol , pNew);
             }
         }
         while (xRowSet->next());
 
-    xRowSet->beforeFirst();
+        xRowSet->beforeFirst();
 
-    return true;
+        return true;
     }
     catch (const Exception&)
     {
         return false;
     }
 }
-// -----------------------------------------------------------------------
+
 ULONG ScDPTableDataCache::GetDimNumType( SCCOL nDim) const
 {
     DBG_ASSERT( IsValid(), "  IsValid() == false " );
@@ -646,237 +615,240 @@ ULONG ScDPTableDataCache::GetDimNumType( SCCOL nDim) const
         return GetNumType(mpTableDataValues[nDim][0]->nNumFormat);
 }
 
-// -----------------------------------------------------------------------
-bool ScDPTableDataCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam, BOOL *pSpecial)
+bool ScDPTableDataCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam, bool *pSpecial)
 { //Copied and modified from ScTable::ValidQuery
-        if (!rParam.GetEntry(0).bDoQuery)
-            return TRUE;
-        BOOL    bMatchWholeCell = mpDoc->GetDocOptions().IsMatchWholeCell();
-
-        //---------------------------------------------------------------
-
-        const SCSIZE nFixedBools = 32;
-        BOOL aBool[nFixedBools];
-        BOOL aTest[nFixedBools];
-        SCSIZE nEntryCount = rParam.GetEntryCount();
-        BOOL* pPasst = ( nEntryCount <= nFixedBools ? &aBool[0] : new BOOL[nEntryCount] );
-        BOOL* pTest = ( nEntryCount <= nFixedBools ? &aTest[0] : new BOOL[nEntryCount] );
-
-        long    nPos = -1;
-        SCSIZE  i    = 0;
-        CollatorWrapper* pCollator = (rParam.bCaseSens ? ScGlobal::GetCaseCollator() :
-            ScGlobal::GetCollator() );
-        ::utl::TransliterationWrapper* pTransliteration = (rParam.bCaseSens ?
-            ScGlobal::GetCaseTransliteration() : ScGlobal::GetpTransliteration());
-
-        while ( (i < nEntryCount) && rParam.GetEntry(i).bDoQuery )
+    if (!rParam.GetEntry(0).bDoQuery)
+        return true;
+    bool bMatchWholeCell = mpDoc->GetDocOptions().IsMatchWholeCell();
+
+    //---------------------------------------------------------------
+
+    const SCSIZE nFixedBools = 32;
+    bool aBool[nFixedBools];
+    bool aTest[nFixedBools];
+    SCSIZE nEntryCount = rParam.GetEntryCount();
+    bool* pPasst = ( nEntryCount <= nFixedBools ? &aBool[0] : new bool[nEntryCount] );
+    bool* pTest = ( nEntryCount <= nFixedBools ? &aTest[0] : new bool[nEntryCount] );
+
+    long    nPos = -1;
+    SCSIZE  i    = 0;
+    CollatorWrapper* pCollator = (rParam.bCaseSens ? ScGlobal::GetCaseCollator() :
+                                  ScGlobal::GetCollator() );
+    ::utl::TransliterationWrapper* pTransliteration = (rParam.bCaseSens ?
+                                                       ScGlobal::GetCaseTransliteration() : ScGlobal::GetpTransliteration());
+
+    while ((i < nEntryCount) && rParam.GetEntry(i).bDoQuery)
+    {
+        ScQueryEntry& rEntry = rParam.GetEntry(i);
+        // we can only handle one single direct query
+        // #i115431# nField in QueryParam is the sheet column, not the field within the source range
+        SCCOL nQueryCol = (SCCOL)rEntry.nField;
+        if ( nQueryCol < rParam.nCol1 )
+            nQueryCol = rParam.nCol1;
+        if ( nQueryCol > rParam.nCol2 )
+            nQueryCol = rParam.nCol2;
+        SCCOL nSourceField = nQueryCol - rParam.nCol1;
+        SCROW nId = GetItemDataId( nSourceField, nRow, FALSE );
+        const ScDPItemData* pCellData = GetItemDataById( nSourceField, nId );
+
+        bool bOk = false;
+        bool bTestEqual = false;
+
+        if (pSpecial && pSpecial[i])
         {
-            ScQueryEntry& rEntry = rParam.GetEntry(i);
-            // we can only handle one single direct query
-            SCROW nId = GetItemDataId( (SCCOL)rEntry.nField, nRow, FALSE );
-            const ScDPItemData* pCellData = GetItemDataById(  (SCCOL)rEntry.nField, nId);
-
-            BOOL bOk = FALSE;
-            BOOL bTestEqual = FALSE;
+            if (rEntry.nVal == SC_EMPTYFIELDS)
+                bOk = ! pCellData->IsHasData();
+            else // if (rEntry.nVal == SC_NONEMPTYFIELDS)
+                bOk =  pCellData->IsHasData();
+        }
+        else if (!rEntry.bQueryByString && pCellData->IsValue())
+        {   // by Value
+            double nCellVal = pCellData->GetValue();
 
-            if ( pSpecial && pSpecial[i] )
+            switch (rEntry.eOp)
             {
-                if (rEntry.nVal == SC_EMPTYFIELDS)
-                    bOk = ! pCellData->IsHasData();
-                else // if (rEntry.nVal == SC_NONEMPTYFIELDS)
-                    bOk =  pCellData->IsHasData();
-            }
-            else if ( !rEntry.bQueryByString && pCellData->IsValue() )
-            {   // by Value
-                double nCellVal = pCellData->GetValue();
-
-                switch (rEntry.eOp)
-                {
-                    case SC_EQUAL :
-                        bOk = ::rtl::math::approxEqual( nCellVal, rEntry.nVal );
-                        break;
-                    case SC_LESS :
-                        bOk = (nCellVal < rEntry.nVal) && !::rtl::math::approxEqual( nCellVal, rEntry.nVal );
-                        break;
-                    case SC_GREATER :
-                        bOk = (nCellVal > rEntry.nVal) && !::rtl::math::approxEqual( nCellVal, rEntry.nVal );
-                        break;
-                    case SC_LESS_EQUAL :
-                        bOk = (nCellVal < rEntry.nVal) || ::rtl::math::approxEqual( nCellVal, rEntry.nVal );
-                        break;
-                    case SC_GREATER_EQUAL :
-                        bOk = (nCellVal > rEntry.nVal) || ::rtl::math::approxEqual( nCellVal, rEntry.nVal );
-                        break;
-                    case SC_NOT_EQUAL :
-                        bOk = !::rtl::math::approxEqual( nCellVal, rEntry.nVal );
-                        break;
-                                 default:
-                                    bOk= FALSE;
-                                    break;
-                }
+                case SC_EQUAL :
+                    bOk = ::rtl::math::approxEqual( nCellVal, rEntry.nVal );
+                    break;
+                case SC_LESS :
+                    bOk = (nCellVal < rEntry.nVal) && !::rtl::math::approxEqual( nCellVal, rEntry.nVal );
+                    break;
+                case SC_GREATER :
+                    bOk = (nCellVal > rEntry.nVal) && !::rtl::math::approxEqual( nCellVal, rEntry.nVal );
+                    break;
+                case SC_LESS_EQUAL :
+                    bOk = (nCellVal < rEntry.nVal) || ::rtl::math::approxEqual( nCellVal, rEntry.nVal );
+                    break;
+                case SC_GREATER_EQUAL :
+                    bOk = (nCellVal > rEntry.nVal) || ::rtl::math::approxEqual( nCellVal, rEntry.nVal );
+                    break;
+                case SC_NOT_EQUAL :
+                    bOk = !::rtl::math::approxEqual( nCellVal, rEntry.nVal );
+                    break;
+                default:
+                    bOk= false;
+                    break;
             }
-            else if ( (rEntry.eOp == SC_EQUAL || rEntry.eOp == SC_NOT_EQUAL)
-                    || (rEntry.bQueryByString
-                        && pCellData->HasStringData() )
+        }
+        else if ((rEntry.eOp == SC_EQUAL || rEntry.eOp == SC_NOT_EQUAL)
+                 || (rEntry.bQueryByString
+                     && pCellData->HasStringData() )
                 )
-            {   // by String
-                String  aCellStr = pCellData->GetString();
+        {   // by String
+            String  aCellStr = pCellData->GetString();
 
-                BOOL bRealRegExp = (rParam.bRegExp && ((rEntry.eOp == SC_EQUAL)
-                    || (rEntry.eOp == SC_NOT_EQUAL)));
-                BOOL bTestRegExp = FALSE;
-                if ( bRealRegExp || bTestRegExp )
-                {
-                    xub_StrLen nStart = 0;
-                    xub_StrLen nEnd   = aCellStr.Len();
-                    BOOL bMatch = (BOOL) rEntry.GetSearchTextPtr( rParam.bCaseSens )
-                        ->SearchFrwrd( aCellStr, &nStart, &nEnd );
-                    // from 614 on, nEnd is behind the found text
-                    if ( bMatch && bMatchWholeCell
-                            && (nStart != 0 || nEnd != aCellStr.Len()) )
-                        bMatch = FALSE;    // RegExp must match entire cell string
-                    if ( bRealRegExp )
-                        bOk = ((rEntry.eOp == SC_NOT_EQUAL) ? !bMatch : bMatch);
-                    else
-                        bTestEqual = bMatch;
-                }
-                if ( !bRealRegExp )
+            bool bRealRegExp = (rParam.bRegExp && ((rEntry.eOp == SC_EQUAL)
+                                                   || (rEntry.eOp == SC_NOT_EQUAL)));
+            bool bTestRegExp = false;
+            if (bRealRegExp || bTestRegExp)
+            {
+                xub_StrLen nStart = 0;
+                xub_StrLen nEnd   = aCellStr.Len();
+                bool bMatch = (bool) rEntry.GetSearchTextPtr( rParam.bCaseSens )
+                              ->SearchFrwrd( aCellStr, &nStart, &nEnd );
+                // from 614 on, nEnd is behind the found text
+                if (bMatch && bMatchWholeCell
+                    && (nStart != 0 || nEnd != aCellStr.Len()))
+                    bMatch = false;    // RegExp must match entire cell string
+                if (bRealRegExp)
+                    bOk = ((rEntry.eOp == SC_NOT_EQUAL) ? !bMatch : bMatch);
+                else
+                    bTestEqual = bMatch;
+            }
+            if (!bRealRegExp)
+            {
+                if (rEntry.eOp == SC_EQUAL || rEntry.eOp == SC_NOT_EQUAL)
                 {
-                    if ( rEntry.eOp == SC_EQUAL || rEntry.eOp == SC_NOT_EQUAL )
+                    if (bMatchWholeCell)
                     {
-                        if ( bMatchWholeCell )
+                        bOk = pTransliteration->isEqual( aCellStr, *rEntry.pStr );
+                        //Added by zhaosz,for sodc_2702,20060808
+                        String aStr = *rEntry.pStr;//"f*"
+                        //modified by weihuaw,for SODC_16698
+                        //use another way to find "*" in aStr
+                        sal_Bool bHasStar = sal_False;
+                        xub_StrLen nIndex;
+                        if (( nIndex = aStr.Search('*') ) != STRING_NOTFOUND)
+                            bHasStar = sal_True;
+                        if (bHasStar && (nIndex>0))
                         {
-                                        bOk = pTransliteration->isEqual( aCellStr, *rEntry.pStr );
-                            //Added by zhaosz,for sodc_2702,20060808
-                            String aStr = *rEntry.pStr;//"f*"
-                            //modified by weihuaw,for SODC_16698
-                            //use another way to find "*" in aStr
-                            sal_Bool bHasStar = sal_False;
-                            xub_StrLen nIndex;
-                            if( ( nIndex = aStr.Search('*') ) != STRING_NOTFOUND )
-                                bHasStar = sal_True;
-                            if(bHasStar && (nIndex>0))
+                            for (i=0;(i<nIndex) && (i< aCellStr.Len()) ; i++)
                             {
-                                for(i=0;(i<nIndex) && (i< aCellStr.Len()) ; i++)
+                                if (aCellStr.GetChar( (USHORT)i ) == aStr.GetChar((USHORT) i ))
+                                {
+                                    bOk=1;
+                                }
+                                else
                                 {
-                                    if(aCellStr.GetChar( (USHORT)i ) == aStr.GetChar((USHORT) i ))
-                                    {
-                                        bOk=1;
-                                    }
-                                    else
-                                    {
-                                        bOk=0;
-                                        break;
-                                    }
+                                    bOk=0;
+                                    break;
                                 }
                             }
-                            //end modified
-                            //Added end,20060808
                         }
-                        else
-                        {
-                            ::com::sun::star::uno::Sequence< sal_Int32 > xOff;
-                            String aCell( pTransliteration->transliterate(
-                                aCellStr, ScGlobal::eLnge, 0, aCellStr.Len(),
-                                &xOff ) );
-                            String aQuer( pTransliteration->transliterate(
-                                *rEntry.pStr, ScGlobal::eLnge, 0, rEntry.pStr->Len(),
-                                &xOff ) );
-                            bOk = (aCell.Search( aQuer ) != STRING_NOTFOUND);
-                        }
-                        if ( rEntry.eOp == SC_NOT_EQUAL )
-                            bOk = !bOk;
+                        //end modified
+                        //Added end,20060808
                     }
                     else
-                    {   // use collator here because data was probably sorted
-                        sal_Int32 nCompare = pCollator->compareString(
-                            aCellStr, *rEntry.pStr );
-                        switch (rEntry.eOp)
-                        {
-                            case SC_LESS :
-                                bOk = (nCompare < 0);
-                                break;
-                            case SC_GREATER :
-                                bOk = (nCompare > 0);
-                                break;
-                            case SC_LESS_EQUAL :
-                                bOk = (nCompare <= 0);
-                                break;
-                            case SC_GREATER_EQUAL :
-                                bOk = (nCompare >= 0);
-                                break;
-                            case SC_NOT_EQUAL:
-                                DBG_ASSERT( false , "SC_NOT_EQUAL");
-                                break;
-                            case SC_TOPVAL:
-                            case SC_BOTVAL:
-                            case SC_TOPPERC:
-                            case SC_BOTPERC:
-                            default:
-                                break;
-                        }
+                    {
+                        ::com::sun::star::uno::Sequence< sal_Int32 > xOff;
+                        String aCell( pTransliteration->transliterate(
+                                                                     aCellStr, ScGlobal::eLnge, 0, aCellStr.Len(),
+                                                                     &xOff ) );
+                        String aQuer( pTransliteration->transliterate(
+                                                                     *rEntry.pStr, ScGlobal::eLnge, 0, rEntry.pStr->Len(),
+                                                                     &xOff ) );
+                        bOk = (aCell.Search( aQuer ) != STRING_NOTFOUND);
+                    }
+                    if (rEntry.eOp == SC_NOT_EQUAL)
+                        bOk = !bOk;
+                }
+                else
+                {   // use collator here because data was probably sorted
+                    sal_Int32 nCompare = pCollator->compareString(
+                                                                 aCellStr, *rEntry.pStr );
+                    switch (rEntry.eOp)
+                    {
+                        case SC_LESS :
+                            bOk = (nCompare < 0);
+                            break;
+                        case SC_GREATER :
+                            bOk = (nCompare > 0);
+                            break;
+                        case SC_LESS_EQUAL :
+                            bOk = (nCompare <= 0);
+                            break;
+                        case SC_GREATER_EQUAL :
+                            bOk = (nCompare >= 0);
+                            break;
+                        case SC_NOT_EQUAL:
+                            DBG_ASSERT( false , "SC_NOT_EQUAL");
+                            break;
+                        case SC_TOPVAL:
+                        case SC_BOTVAL:
+                        case SC_TOPPERC:
+                        case SC_BOTPERC:
+                        default:
+                            break;
                     }
                 }
             }
+        }
 
-            if (nPos == -1)
+        if (nPos == -1)
+        {
+            nPos++;
+            pPasst[nPos] = bOk;
+            pTest[nPos] = bTestEqual;
+        }
+        else
+        {
+            if (rEntry.eConnect == SC_AND)
             {
-                nPos++;
-                pPasst[nPos] = bOk;
-                pTest[nPos] = bTestEqual;
+                pPasst[nPos] = pPasst[nPos] && bOk;
+                pTest[nPos] = pTest[nPos] && bTestEqual;
             }
             else
             {
-                if (rEntry.eConnect == SC_AND)
-                {
-                    pPasst[nPos] = pPasst[nPos] && bOk;
-                    pTest[nPos] = pTest[nPos] && bTestEqual;
-                }
-                else
-                {
-                    nPos++;
-                    pPasst[nPos] = bOk;
-                    pTest[nPos] = bTestEqual;
-                }
+                nPos++;
+                pPasst[nPos] = bOk;
+                pTest[nPos] = bTestEqual;
             }
-            i++;
         }
+        i++;
+    }
 
-        for ( long j=1; j <= nPos; j++ )
-        {
-            pPasst[0] = pPasst[0] || pPasst[j];
-            pTest[0] = pTest[0] || pTest[j];
-        }
+    for (long j=1; j <= nPos; j++)
+    {
+        pPasst[0] = pPasst[0] || pPasst[j];
+        pTest[0] = pTest[0] || pTest[j];
+    }
 
-        BOOL bRet = pPasst[0];
-        if ( pPasst != &aBool[0] )
-            delete [] pPasst;
-        if ( pTest != &aTest[0] )
-            delete [] pTest;
+    bool bRet = pPasst[0];
+    if (pPasst != &aBool[0])
+        delete [] pPasst;
+    if (pTest != &aTest[0])
+        delete [] pTest;
 
-        return bRet;
+    return bRet;
 }
 
-// -----------------------------------------------------------------------
 bool ScDPTableDataCache::IsRowEmpty( SCROW nRow ) const
 {
     return  mbEmptyRow[ nRow ];
-
 }
 
-// -----------------------------------------------------------------------
 bool ScDPTableDataCache::IsEmptyMember( SCROW nRow, USHORT nColumn ) const
 {
-    return !GetItemDataById( nColumn, GetItemDataId( nColumn, nRow, FALSE ) )->IsHasData();
+    return !GetItemDataById( nColumn, GetItemDataId( nColumn, nRow, false ) )->IsHasData();
 }
 
-BOOL ScDPTableDataCache::AddData(long nDim, ScDPItemData* pitemData)
+bool ScDPTableDataCache::AddData(long nDim, ScDPItemData* pitemData)
 {
     DBG_ASSERT( IsValid(), "  IsValid() == false " );
     DBG_ASSERT( nDim < mnColumnCount && nDim >=0 , "dimension out of bound" );
     SCROW nIndex = 0;
 
-    BOOL    bInserted = FALSE;
+    bool    bInserted = false;
 
     pitemData->SetDate( lcl_isDate( GetNumType( pitemData->nNumFormat ) ) );
 
@@ -886,7 +858,7 @@ BOOL ScDPTableDataCache::AddData(long nDim, ScDPItemData* pitemData)
         mpGlobalOrder[nDim].insert( mpGlobalOrder[nDim].begin()+nIndex, mpTableDataValues[nDim].size()-1  );
         DBG_ASSERT( (size_t) mpGlobalOrder[nDim][nIndex] == mpTableDataValues[nDim].size()-1 ,"ScDPTableDataCache::AddData ");
         mpSourceData[nDim].push_back( mpTableDataValues[nDim].size()-1 );
-        bInserted = TRUE;
+        bInserted = true;
     }
     else
         mpSourceData[nDim].push_back( mpGlobalOrder[nDim][nIndex] );
@@ -894,15 +866,15 @@ BOOL ScDPTableDataCache::AddData(long nDim, ScDPItemData* pitemData)
     size_t  nCurRow = mpSourceData[nDim].size() -1 ;
 
     while ( mbEmptyRow.size() <= nCurRow )
-        mbEmptyRow.push_back( TRUE );
+        mbEmptyRow.push_back( true );
 
     if ( pitemData->IsHasData() )
-        mbEmptyRow[ nCurRow ] = FALSE;
+        mbEmptyRow[ nCurRow ] = false;
 
     if ( !bInserted )
         delete pitemData;
 
-    return TRUE;
+    return true;
 }
 
 
@@ -925,10 +897,9 @@ void ScDPTableDataCache::AddLabel(ScDPItemData *pData)
     if ( mrLabelNames.size() == 0 )
         mrLabelNames.push_back( new ScDPItemData(  ScGlobal::GetRscString(STR_PIVOT_DATA) ) );
 
-
     //reset name if needed
     String strNewName = pData->aString;
-    BOOL bFound = FALSE;
+    bool bFound = false;
     long nIndex = 1;
     do
     {
@@ -939,7 +910,7 @@ void ScDPTableDataCache::AddLabel(ScDPItemData *pData)
                 strNewName  =  pData->aString;
                 strNewName += String::CreateFromInt32( nIndex );
                 nIndex ++ ;
-                bFound = TRUE;
+                bFound = true;
             }
         }
         bFound = !bFound;
@@ -950,8 +921,8 @@ void ScDPTableDataCache::AddLabel(ScDPItemData *pData)
     mrLabelNames.push_back( pData );
 }
 
-SCROW ScDPTableDataCache::GetItemDataId(USHORT nDim, SCROW nRow, BOOL bRepeatIfEmpty) const
-{ //
+SCROW ScDPTableDataCache::GetItemDataId(USHORT nDim, SCROW nRow, bool bRepeatIfEmpty) const
+{
     DBG_ASSERT( IsValid(), "  IsValid() == false " );
     DBG_ASSERT( /* nDim >= 0 && */ nDim < mnColumnCount, "ScDPTableDataCache::GetItemDataId " );
 
@@ -1017,7 +988,7 @@ ULONG ScDPTableDataCache::GetNumberFormat( long nDim ) const
         return mpTableDataValues[nDim][0]->nNumFormat;
 }
 
-BOOL ScDPTableDataCache::IsDateDimension( long nDim ) const
+bool ScDPTableDataCache::IsDateDimension( long nDim ) const
 {
     if ( nDim >= mnColumnCount )
         return false;
@@ -1042,7 +1013,7 @@ const ScDPItemData* ScDPTableDataCache::GetSortedItemData(SCCOL nDim, SCROW nOrd
 
 SCCOL ScDPTableDataCache::GetDimensionIndex(String sName) const
 {
-    for ( size_t n = 1; n < mrLabelNames.size(); n ++ ) //defects, label name map wrong SODC_17590, SODC_18932,SODC_18827,SODC_18960,SODC_18923
+    for ( size_t n = 1; n < mrLabelNames.size(); n ++ )
     {
         if ( mrLabelNames[n]->GetString() == sName )
             return (SCCOL)(n-1);
@@ -1119,6 +1090,7 @@ long ScDPTableDataCache::GetColumnCount() const
 {
     return mnColumnCount;
 }
+
 long    ScDPTableDataCache::GetId() const
 {
     return mnID;
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index cc7b986eeb16..dc466333d25c 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -4050,7 +4050,7 @@ ResultMembers::ResultMembers():
 }
 ResultMembers::~ResultMembers()
 {
-    for ( DimMemberHash::const_iterator iter = maMemberHash.begin(); iter != maMemberHash.end(); iter++ )
+    for ( DimMemberHash::const_iterator iter = maMemberHash.begin(); iter != maMemberHash.end(); ++iter )
         delete iter->second;
 }
 // -----------------------------------------------------------------------
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 4b9adca7e9c3..0c81e943bff1 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -301,7 +301,6 @@ void ScDPSource::SetOrientation(long nColumn, USHORT nNew)
         case sheet::DataPilotFieldOrientation_PAGE:
             nPageDims[nPageDimCount++] = nColumn;
             break;
-            // Wang Xu Ming -- 2009-9-1
             // DataPilot Migration - Cache&&Performance
         case sheet::DataPilotFieldOrientation_HIDDEN:
             break;
@@ -906,8 +905,8 @@ void ScDPSource::CreateRes_Impl()
                 aInitState.AddMember( nPageDims[i], GetMemberId( nPageDims[i],  pDim->GetSelectedData() ) );
         }
 
-        pColResRoot = new ScDPResultMember( pResData, /*NULL, NULL, NULL, */bColumnGrand );
-        pRowResRoot = new ScDPResultMember( pResData, /*NULL, NULL, NULL, */bRowGrand );
+        pColResRoot = new ScDPResultMember( pResData, bColumnGrand );
+        pRowResRoot = new ScDPResultMember( pResData, bRowGrand );
 
         FillCalcInfo(false, aInfo, bHasAutoShow);
         long nColLevelCount = aInfo.aColLevels.size();
@@ -1089,8 +1088,6 @@ void ScDPSource::FillMemberResults()
             for (long i=0; i<nColLevelCount; i++)
                 pColResults[i].realloc(nColDimSize);
 
-            // ScDPResultDimension* pColResDim = pColResRoot->GetChildDimension();
-            // pColResDim->FillMemberResults( pColResults, 0, pResData->GetColStartMeasure() );
             long nPos = 0;
             pColResRoot->FillMemberResults( pColResults, nPos, pResData->GetColStartMeasure(),
                                             TRUE, NULL, NULL );
@@ -1105,8 +1102,6 @@ void ScDPSource::FillMemberResults()
             for (long i=0; i<nRowLevelCount; i++)
                 pRowResults[i].realloc(nRowDimSize);
 
-            // ScDPResultDimension* pRowResDim = pRowResRoot->GetChildDimension();
-            // pRowResDim->FillMemberResults( pRowResults, 0, pResData->GetRowStartMeasure() );
             long nPos = 0;
             pRowResRoot->FillMemberResults( pRowResults, nPos, pResData->GetRowStartMeasure(),
                                             TRUE, NULL, NULL );
@@ -1466,7 +1461,6 @@ long ScDPDimension::getUsedHierarchy() const
 void ScDPDimension::setUsedHierarchy(long /* nNew */)
 {
     // #i52547# don't use the incomplete date hierarchy implementation - ignore the call
-    // nUsedHier = nNew;
 }
 
 ScDPDimension* ScDPDimension::CreateCloneObject()
@@ -1732,9 +1726,9 @@ uno::Any SAL_CALL ScDPDimension::getPropertyValue( const rtl::OUString& aPropert
             aRet <<= uno::Sequence<sheet::TableFilterField>(0);
     }
     else if (aNameStr.EqualsAscii(SC_UNO_LAYOUTNAME))
-        aRet <<= mpLayoutName.get() ? *mpLayoutName : OUString::createFromAscii("");
+        aRet <<= mpLayoutName.get() ? *mpLayoutName : OUString(RTL_CONSTASCII_USTRINGPARAM(""));
     else if (aNameStr.EqualsAscii(SC_UNO_FIELD_SUBTOTALNAME))
-        aRet <<= mpSubtotalName.get() ? *mpSubtotalName : OUString::createFromAscii("");
+        aRet <<= mpSubtotalName.get() ? *mpSubtotalName : OUString(RTL_CONSTASCII_USTRINGPARAM(""));
     else if (aNameStr.EqualsAscii(SC_UNO_HAS_HIDDEN_MEMBER))
         aRet <<= mbHasHiddenMember;
     else if (aNameStr.EqualsAscii(SC_UNO_FLAGS))
@@ -1761,14 +1755,7 @@ ScDPHierarchies::ScDPHierarchies( ScDPSource* pSrc, long nD ) :
 {
     //! hold pSource
 
-#if 0
     //  date columns have 3 hierarchies (flat/quarter/week), other columns only one
-    long nSrcDim = pSource->GetSourceDim( nDim );
-    if ( pSource->IsDateDimension( nSrcDim ) )
-        nHierCount = SC_DAPI_DATE_HIERARCHIES;
-    else
-        nHierCount = 1;
-#endif
 
     // #i52547# don't offer the incomplete date hierarchy implementation
     nHierCount = 1;
@@ -2866,7 +2853,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDPMember )
 ScDPTableDataCache* ScDPSource::GetCache()
 {
     DBG_ASSERT( GetData() , "empty ScDPTableData pointer");
-    return ( GetData()!=NULL) ? GetData()->GetCacheTable().GetCache() : NULL ;
+    return ( GetData()!=NULL) ? GetData()->GetCacheTable().getCache() : NULL ;
 }
 
 const ScDPItemData& ScDPMember::GetItemData() const
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 31b2291c1ef8..0c7f5257025b 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -107,7 +107,6 @@ static E3dObjFactory* pF3d = NULL;
 static USHORT nInst = 0;
 
 SfxObjectShell* ScDrawLayer::pGlobalDrawPersist = NULL;
-//REMOVE    SvPersist* ScDrawLayer::pGlobalDrawPersist = NULL;
 
 BOOL bDrawIsInUndo = FALSE;         //! Member
 
@@ -2042,30 +2041,12 @@ SvStream* __EXPORT ScDrawLayer::GetDocumentStream(SdrDocumentStreamInfo& rStream
                 }
             }
         }
-        // the following code seems to be related to binary format
-//REMOVE            else
-//REMOVE            {
-//REMOVE                pRet = pStor->OpenStream( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(STRING_SCSTREAM)),
-//REMOVE                                          STREAM_READ | STREAM_WRITE | STREAM_TRUNC );
-//REMOVE
-//REMOVE                if( pRet )
-//REMOVE                {
-//REMOVE                    pRet->SetVersion( pStor->GetVersion() );
-//REMOVE                    pRet->SetKey( pStor->GetKey() );
-//REMOVE                }
-//REMOVE            }
-
         rStreamInfo.mbDeleteAfterUse = ( pRet != NULL );
     }
 
     return pRet;
 }
 
-//REMOVE    void ScDrawLayer::ReleasePictureStorage()
-//REMOVE    {
-//REMOVE        xPictureStorage.Clear();
-//REMOVE    }
-
 SdrLayerID __EXPORT ScDrawLayer::GetControlExportLayerId( const SdrObject & ) const
 {
     //  Layer fuer Export von Form-Controls in Versionen vor 5.0 - immer SC_LAYER_FRONT
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 0ceb96f85c4d..faede3eb6482 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -125,7 +125,6 @@ SvxBrushItem*   ScGlobal::pEmbeddedBrushItem = NULL;
 SvxBrushItem*   ScGlobal::pProtectedBrushItem = NULL;
 
 ImageList*      ScGlobal::pOutlineBitmaps = NULL;
-ImageList*      ScGlobal::pOutlineBitmapsHC = NULL;
 
 ScFunctionList* ScGlobal::pStarCalcFunctionList = NULL;
 ScFunctionMgr*  ScGlobal::pStarCalcFunctionMgr  = NULL;
@@ -523,11 +522,11 @@ const String& ScGlobal::GetEmptyString()
     return *pEmptyString;
 }
 
-ImageList* ScGlobal::GetOutlineSymbols( bool bHC )
+ImageList* ScGlobal::GetOutlineSymbols()
 {
-    ImageList*& rpImageList = bHC ? pOutlineBitmapsHC : pOutlineBitmaps;
+    ImageList*& rpImageList = pOutlineBitmaps;
     if( !rpImageList )
-        rpImageList = new ImageList( ScResId( bHC ? RID_OUTLINEBITMAPS_H : RID_OUTLINEBITMAPS ) );
+        rpImageList = new ImageList( ScResId( RID_OUTLINEBITMAPS ) );
     return rpImageList;
 }
 
@@ -659,9 +658,6 @@ void ScGlobal::Clear()
     DELETEZ(pEmbeddedBrushItem);
     DELETEZ(pProtectedBrushItem);
     DELETEZ(pOutlineBitmaps);
-    DELETEZ(pOutlineBitmapsHC);
-//  DELETEZ(pAnchorBitmap);
-//  DELETEZ(pGrayAnchorBitmap);
     DELETEZ(pEnglishFormatter);
     DELETEZ(pCaseTransliteration);
     DELETEZ(pTransliteration);
@@ -707,7 +703,6 @@ CharSet ScGlobal::GetCharsetValue( const String& rCharSet )
     else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_861")) return RTL_TEXTENCODING_IBM_861;
     else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_863")) return RTL_TEXTENCODING_IBM_863;
     else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_865")) return RTL_TEXTENCODING_IBM_865;
-//  else if (rCharSet.EqualsIgnoreCaseAscii("SYSTEM")   ) return gsl_getSystemTextEncoding();
     else return gsl_getSystemTextEncoding();
 }
 
@@ -1266,18 +1261,18 @@ ScFunctionList::ScFunctionList() :
     USHORT nNextId = SC_OPCODE_LAST_OPCODE_ID + 1;      // FuncID for AddIn functions
 
     // Auswertung AddIn-Liste
-    String aDefArgNameValue(RTL_CONSTASCII_STRINGPARAM("value"));
-    String aDefArgNameString(RTL_CONSTASCII_STRINGPARAM("string"));
-    String aDefArgNameValues(RTL_CONSTASCII_STRINGPARAM("values"));
-    String aDefArgNameStrings(RTL_CONSTASCII_STRINGPARAM("strings"));
-    String aDefArgNameCells(RTL_CONSTASCII_STRINGPARAM("cells"));
-    String aDefArgNameNone(RTL_CONSTASCII_STRINGPARAM("none"));
-    String aDefArgDescValue(RTL_CONSTASCII_STRINGPARAM("a value"));
-    String aDefArgDescString(RTL_CONSTASCII_STRINGPARAM("a string"));
-    String aDefArgDescValues(RTL_CONSTASCII_STRINGPARAM("array of values"));
-    String aDefArgDescStrings(RTL_CONSTASCII_STRINGPARAM("array of strings"));
-    String aDefArgDescCells(RTL_CONSTASCII_STRINGPARAM("range of cells"));
-    String aDefArgDescNone(RTL_CONSTASCII_STRINGPARAM("none"));
+    String aDefArgNameValue(RTL_CONSTASCII_USTRINGPARAM("value"));
+    String aDefArgNameString(RTL_CONSTASCII_USTRINGPARAM("string"));
+    String aDefArgNameValues(RTL_CONSTASCII_USTRINGPARAM("values"));
+    String aDefArgNameStrings(RTL_CONSTASCII_USTRINGPARAM("strings"));
+    String aDefArgNameCells(RTL_CONSTASCII_USTRINGPARAM("cells"));
+    String aDefArgNameNone(RTL_CONSTASCII_USTRINGPARAM("none"));
+    String aDefArgDescValue(RTL_CONSTASCII_USTRINGPARAM("a value"));
+    String aDefArgDescString(RTL_CONSTASCII_USTRINGPARAM("a string"));
+    String aDefArgDescValues(RTL_CONSTASCII_USTRINGPARAM("array of values"));
+    String aDefArgDescStrings(RTL_CONSTASCII_USTRINGPARAM("array of strings"));
+    String aDefArgDescCells(RTL_CONSTASCII_USTRINGPARAM("range of cells"));
+    String aDefArgDescNone(RTL_CONSTASCII_USTRINGPARAM("none"));
     String aArgName, aArgDesc;
     pFuncColl = ScGlobal::GetFuncCollection();
     for (i = 0; i < pFuncColl->GetCount(); i++)
@@ -1360,7 +1355,6 @@ ScFunctionList::ScFunctionList() :
                 }
             }
         }
-//      pDesc->nHelpId    = 0;
 
         aFunctionList.Insert(pDesc, LIST_APPEND);
         nStrLen = (*(pDesc->pFuncName)).Len();
@@ -1858,7 +1852,7 @@ String ScFunctionMgr::GetCategoryName(sal_uInt32 _nCategoryNumber )
     {
         DBG_ERROR("Invalid category number!");
         return String();
-    } // if ( _nCategoryNumber >= SC_FUNCGROUP_COUNT )
+    }
 
     ::std::auto_ptr<ScResourcePublisher> pCategories( new ScResourcePublisher( ScResId( RID_FUNCTION_CATEGORIES ) ) );
     return String(ScResId((USHORT)_nCategoryNumber));
@@ -1877,7 +1871,7 @@ sal_Unicode ScFunctionMgr::getSingleToken(const formula::IFunctionManager::EToke
             return ScCompiler::GetNativeSymbol(ocArrayOpen).GetChar(0);
         case eArrayClose:
             return ScCompiler::GetNativeSymbol(ocArrayClose).GetChar(0);
-    } // switch(_eToken)
+    }
     return 0;
 }
 // -----------------------------------------------------------------------------
@@ -1952,7 +1946,7 @@ CollatorWrapper*        ScGlobal::GetCollator()
     {
         pCollator = new CollatorWrapper( ::comphelper::getProcessServiceFactory() );
         pCollator->loadDefaultCollator( *GetLocale(), SC_COLLATOR_IGNORES );
-    } // if ( !pCollator )
+    }
     return pCollator;
 }
 CollatorWrapper*        ScGlobal::GetCaseCollator()
@@ -1961,7 +1955,7 @@ CollatorWrapper*        ScGlobal::GetCaseCollator()
     {
         pCaseCollator = new CollatorWrapper( ::comphelper::getProcessServiceFactory() );
         pCaseCollator->loadDefaultCollator( *GetLocale(), 0 );
-    } // if ( !pCaseCollator )
+    }
     return pCaseCollator;
 }
 ::utl::TransliterationWrapper* ScGlobal::GetCaseTransliteration()
@@ -1971,7 +1965,7 @@ CollatorWrapper*        ScGlobal::GetCaseCollator()
         const LanguageType eOfficeLanguage = Application::GetSettings().GetLanguage();
         pCaseTransliteration = new ::utl::TransliterationWrapper(::comphelper::getProcessServiceFactory(), SC_TRANSLITERATION_CASESENSE );
         pCaseTransliteration->loadModuleIfNeeded( eOfficeLanguage );
-    } // if ( !pCaseTransliteration )
+    }
     return pCaseTransliteration;
 }
 IntlWrapper*         ScGlobal::GetScIntlWrapper()
diff --git a/sc/source/core/data/globalx.cxx b/sc/source/core/data/globalx.cxx
index be5cf810a967..43b14fab4687 100644
--- a/sc/source/core/data/globalx.cxx
+++ b/sc/source/core/data/globalx.cxx
@@ -146,7 +146,7 @@ String ScGlobal::GetOrdinalSuffix( sal_Int32 nNumber)
                 ::comphelper::getProcessServiceFactory();
             Reference< XInterface > xInterface =
                 xServiceManager->createInstance(
-                    ::rtl::OUString::createFromAscii("com.sun.star.i18n.OrdinalSuffix"));
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.OrdinalSuffix")));
             if  (xInterface.is())
                 xOrdinalSuffix = Reference< i18n::XOrdinalSuffix >( xInterface, UNO_QUERY);
         }
diff --git a/sc/source/core/data/makefile.mk b/sc/source/core/data/makefile.mk
index f3b3a357ade3..8ad87c34c1f8 100644
--- a/sc/source/core/data/makefile.mk
+++ b/sc/source/core/data/makefile.mk
@@ -44,35 +44,39 @@ AUTOSEG=true
 # --- Files --------------------------------------------------------
 
 SLOFILES =  \
-    $(SLO)$/attarray.obj \
+    $(EXCEPTIONSFILES) \
+    $(EXCEPTIONSNOOPTFILES) \
     $(SLO)$/attrib.obj \
+    $(SLO)$/compressedarray.obj \
+    $(SLO)$/docparam.obj \
+    $(SLO)$/markarr.obj \
+    $(SLO)$/markdata.obj \
+    $(SLO)$/pagepar.obj \
+    $(SLO)$/sheetevents.obj \
+    $(SLO)$/sortparam.obj
+
+EXCEPTIONSFILES= \
+    $(SLO)$/attarray.obj \
     $(SLO)$/autonamecache.obj \
     $(SLO)$/bcaslot.obj \
-    $(SLO)$/cell.obj \
     $(SLO)$/cell2.obj \
-        $(SLO)$/clipparam.obj \
+    $(SLO)$/clipparam.obj \
     $(SLO)$/column.obj \
-    $(SLO)$/column2.obj \
-    $(SLO)$/column3.obj \
-    $(SLO)$/compressedarray.obj \
-    $(SLO)$/conditio.obj \
     $(SLO)$/dbdocutl.obj \
     $(SLO)$/dociter.obj \
     $(SLO)$/docpool.obj \
     $(SLO)$/documen2.obj \
     $(SLO)$/documen3.obj \
-    $(SLO)$/documen4.obj \
     $(SLO)$/documen5.obj \
     $(SLO)$/documen6.obj \
     $(SLO)$/documen7.obj \
     $(SLO)$/documen8.obj \
     $(SLO)$/documen9.obj \
     $(SLO)$/document.obj \
-    $(SLO)$/docparam.obj \
-        $(SLO)$/dpcachetable.obj \
-        $(SLO)$/dpdimsave.obj \
+    $(SLO)$/dpcachetable.obj \
+    $(SLO)$/dpdimsave.obj \
     $(SLO)$/dpglobal.obj \
-        $(SLO)$/dpgroup.obj \
+    $(SLO)$/dpgroup.obj \
     $(SLO)$/dpobject.obj \
     $(SLO)$/dpoutput.obj \
     $(SLO)$/dpoutputgeometry.obj \
@@ -80,97 +84,53 @@ SLOFILES =  \
     $(SLO)$/dpsdbtab.obj \
     $(SLO)$/dpshttab.obj \
     $(SLO)$/dptabdat.obj \
+    $(SLO)$/dptablecache.obj \
     $(SLO)$/dptabres.obj \
     $(SLO)$/dptabsrc.obj \
-    $(SLO)$/dptablecache.obj\
-    $(SLO)$/scdpoutputimpl.obj\
     $(SLO)$/drawpage.obj \
     $(SLO)$/drwlayer.obj \
     $(SLO)$/fillinfo.obj \
     $(SLO)$/global.obj \
     $(SLO)$/global2.obj \
     $(SLO)$/globalx.obj \
-    $(SLO)$/markarr.obj \
-    $(SLO)$/markdata.obj \
     $(SLO)$/olinetab.obj \
-    $(SLO)$/pagepar.obj \
     $(SLO)$/patattr.obj \
     $(SLO)$/pivot2.obj \
     $(SLO)$/poolhelp.obj \
-    $(SLO)$/sheetevents.obj \
+    $(SLO)$/postit.obj \
+    $(SLO)$/scdpoutputimpl.obj \
     $(SLO)$/segmenttree.obj \
-    $(SLO)$/sortparam.obj \
     $(SLO)$/stlpool.obj \
     $(SLO)$/stlsheet.obj \
-        $(SLO)$/tabbgcolor.obj \
+    $(SLO)$/tabbgcolor.obj \
     $(SLO)$/table1.obj \
     $(SLO)$/table2.obj \
-    $(SLO)$/table3.obj \
-    $(SLO)$/table4.obj \
     $(SLO)$/table5.obj \
     $(SLO)$/table6.obj \
     $(SLO)$/tabprotection.obj \
-    $(SLO)$/userdat.obj \
-    $(SLO)$/validat.obj \
-    $(SLO)$/postit.obj
+    $(SLO)$/userdat.obj
 
-EXCEPTIONSFILES= \
-    $(SLO)$/autonamecache.obj \
-    $(SLO)$/bcaslot.obj \
-    $(SLO)$/cell2.obj \
-    $(SLO)$/clipparam.obj \
-    $(SLO)$/column.obj \
+.IF "$(OS)$(COM)$(CPUNAME)"=="LINUXGCCSPARC"
+EXCEPTIONSNOOPTFILES= \
+    $(SLO)$/cell.obj \
+    $(SLO)$/column2.obj \
     $(SLO)$/column3.obj \
-    $(SLO)$/dociter.obj \
-    $(SLO)$/documen2.obj \
-    $(SLO)$/document.obj \
-    $(SLO)$/dpdimsave.obj \
-    $(SLO)$/dpglobal.obj \
-    $(SLO)$/dpgroup.obj \
-    $(SLO)$/dpshttab.obj \
-    $(SLO)$/dptabres.obj \
-    $(SLO)$/dptabdat.obj \
-    $(SLO)$/global2.obj \
-    $(SLO)$/tabbgcolor.obj \
-    $(SLO)$/table1.obj \
-    $(SLO)$/table2.obj \
+    $(SLO)$/conditio.obj \
+    $(SLO)$/documen4.obj \
     $(SLO)$/table3.obj \
-    $(SLO)$/tabprotection.obj \
-    $(SLO)$/postit.obj \
-    $(SLO)$/documen3.obj \
-    $(SLO)$/documen5.obj \
-    $(SLO)$/documen6.obj \
-    $(SLO)$/documen9.obj \
-    $(SLO)$/dpcachetable.obj \
-    $(SLO)$/dptablecache.obj \
-    $(SLO)$/scdpoutputimpl.obj \
-    $(SLO)$/dpsdbtab.obj \
-    $(SLO)$/dpobject.obj \
-    $(SLO)$/dpoutput.obj \
-    $(SLO)$/dpoutputgeometry.obj \
-    $(SLO)$/dpsave.obj \
-    $(SLO)$/dbdocutl.obj \
-    $(SLO)$/dptabsrc.obj \
-    $(SLO)$/drwlayer.obj \
-    $(SLO)$/globalx.obj \
-    $(SLO)$/segmenttree.obj
+    $(SLO)$/table4.obj \
+    $(SLO)$/validat.obj
 
-.IF "$(OS)$(COM)$(CPUNAME)"=="LINUXGCCSPARC"
-NOOPTFILES= \
-        $(SLO)$/column2.obj \
-        $(SLO)$/column3.obj \
-        $(SLO)$/table3.obj \
-        $(SLO)$/table4.obj  \
-        $(SLO)$/documen4.obj \
-        $(SLO)$/conditio.obj \
-        $(SLO)$/validat.obj
-EXCEPTIONSNOOPTFILES= \
-        $(SLO)$/cell.obj
 .ELSE
 EXCEPTIONSFILES+= \
     $(SLO)$/cell.obj \
-    $(SLO)$/global.obj \
-    $(SLO)$/table5.obj
+    $(SLO)$/column2.obj \
+    $(SLO)$/column3.obj \
+    $(SLO)$/conditio.obj \
+    $(SLO)$/documen4.obj \
+    $(SLO)$/table3.obj \
+    $(SLO)$/table4.obj \
+    $(SLO)$/validat.obj
 .ENDIF
 
 # --- Tagets -------------------------------------------------------
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index d4dd2026a019..66972681dff1 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -261,7 +261,7 @@ ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName,
     pSearchParam( NULL ),
     pSearchText ( NULL ),
     pSortCollator( NULL ),
-    bPrintEntireSheet( FALSE ),
+    bPrintEntireSheet(true),
     pRepeatColRange( NULL ),
     pRepeatRowRange( NULL ),
     nLockCount( 0 ),
@@ -1664,7 +1664,7 @@ void ScTable::SetRepeatRowRange( const ScRange* pNew )
 void ScTable::ClearPrintRanges()
 {
     aPrintRanges.clear();
-    bPrintEntireSheet = FALSE;
+    bPrintEntireSheet = false;
 
     if (IsStreamValid())
         SetStreamValid(FALSE);
@@ -1672,7 +1672,7 @@ void ScTable::ClearPrintRanges()
 
 void ScTable::AddPrintRange( const ScRange& rNew )
 {
-    bPrintEntireSheet = FALSE;
+    bPrintEntireSheet = false;
     if( aPrintRanges.size() < 0xFFFF )
         aPrintRanges.push_back( rNew );
 
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 48035ec5b655..403c793cf9b0 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -93,7 +93,7 @@ bool SplitString( const rtl::OUString &sWhole,
     i18n::LocaleDataItem aLocaleItem = ScGlobal::pLocaleData->getLocaleItem();
 
     // Get prefix element
-    rtl::OUString sEmpty, sUser = rtl::OUString::createFromAscii( "-" );
+    rtl::OUString sEmpty, sUser = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-" ));
     ParseResult aPRPre = ScGlobal::pCharClass->parsePredefinedToken(
         KParseType::IDENTNAME, sWhole, 0,
         KParseTokens::ANY_LETTER, sUser, KParseTokens::ANY_LETTER, sUser );
diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx
index c53c74b6fa2d..1448c643a18c 100644
--- a/sc/source/core/data/tabprotection.cxx
+++ b/sc/source/core/data/tabprotection.cxx
@@ -81,9 +81,9 @@ OUString ScPassHashHelper::getHashURI(ScPasswordHash eHash)
     switch (eHash)
     {
         case PASSHASH_SHA1:
-            return OUString::createFromAscii(URI_SHA1);
+            return OUString(RTL_CONSTASCII_USTRINGPARAM(URI_SHA1));
         case PASSHASH_XL:
-            return OUString::createFromAscii(URI_XLS_LEGACY);
+            return OUString(RTL_CONSTASCII_USTRINGPARAM(URI_XLS_LEGACY));
         case PASSHASH_UNSPECIFIED:
         default:
             ;
@@ -522,5 +522,4 @@ void ScTableProtection::setOption(Option eOption, bool bEnabled)
 {
     mpImpl->setOption(eOption, bEnabled);
 }
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index f356dbeeec71..07f95bace0f2 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -664,7 +664,6 @@ void ScLCM();
 
 void ScMatValue();
 void MEMat(ScMatrix* mM, SCSIZE n);
-void MFastMult(ScMatrix* pA, ScMatrix* pB, ScMatrix* pR, SCSIZE n, SCSIZE m, SCSIZE l);
 void ScMatDet();
 void ScMatInv();
 void ScMatMult();
@@ -677,13 +676,6 @@ void ScSumX2MY2();
 void ScSumX2DY2();
 void ScSumXMY2();
 void ScGrowth();
-// multiple Regression: Varianzen der Koeffizienten
-BOOL RGetVariances( ScMatrix* pV, ScMatrix* pX, SCSIZE nC, SCSIZE nR,
-    BOOL bSwapColRow, BOOL bZeroConstant );
-void Calculate(ScMatrixRef& pResMat,ScMatrixRef& pE,ScMatrixRef& pQ,ScMatrixRef& pV,ScMatrixRef& pMatX,BOOL bConstant,SCSIZE N,SCSIZE M,BYTE nCase);
-ScMatrixRef Calculate2(const BOOL bConstant,const SCSIZE M ,const SCSIZE N,ScMatrixRef& pMatX,ScMatrixRef& pMatY,BYTE nCase);
-bool Calculate3(const SCSIZE M ,ScMatrixRef& pQ);
-bool Calculate4(BOOL _bExp,ScMatrixRef& pResMat,ScMatrixRef& pQ,BOOL bConstant,SCSIZE N,SCSIZE M);
 bool CalculateSkew(double& fSum,double& fCount,double& vSum,std::vector<double>& values);
 void CalculateSlopeIntercept(BOOL bSlope);
 void CalculateSmallLarge(BOOL bSmall);
@@ -695,12 +687,11 @@ bool CalculateTest( BOOL _bTemplin
 void CalculateLookup(BOOL HLookup);
 bool FillEntry(ScQueryEntry& rEntry);
 void CalculateAddSub(BOOL _bSub);
-void CalculateTrendGrowth(BOOL _bGrowth);
-void CalulateRGPRKP(BOOL _bRKP);
+void CalculateTrendGrowth(bool _bGrowth);
+void CalulateRGPRKP(bool _bRKP);
 void CalculateSumX2MY2SumX2DY2(BOOL _bSumX2DY2);
 void CalculateMatrixValue(const ScMatrix* pMat,SCSIZE nC,SCSIZE nR);
-bool CheckMatrix(BOOL _bLOG,BOOL _bTrendGrowth,BYTE& nCase,SCSIZE& nCX,SCSIZE& nCY,SCSIZE& nRX,SCSIZE& nRY,SCSIZE& M,SCSIZE& N,ScMatrixRef& pMatX,ScMatrixRef& pMatY);
-
+bool CheckMatrix(bool _bLOG,BYTE& nCase,SCSIZE& nCX,SCSIZE& nCY,SCSIZE& nRX,SCSIZE& nRY,SCSIZE& M,SCSIZE& N,ScMatrixRef& pMatX,ScMatrixRef& pMatY);
 void ScRGP();
 void ScRKP();
 void ScForecast();
diff --git a/sc/source/core/src/compiler.src b/sc/source/core/src/compiler.src
index a45c2b6aa458..a3740562b850 100644
--- a/sc/source/core/src/compiler.src
+++ b/sc/source/core/src/compiler.src
@@ -24,11 +24,10 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
 #include "sc.hrc" // Definition RID_XXX
 #include <formula/compiler.hrc> // Definition SC_OPCODE_XXX (interne OpCodes)
 
-
-
 Resource RID_FUNCTION_CATEGORIES
 {
     String 1
@@ -76,4 +75,3 @@ Resource RID_FUNCTION_CATEGORIES
         Text[ en-US ] =  "Add-in" ;
     };
 };
-
diff --git a/sc/source/core/tool/addincfg.cxx b/sc/source/core/tool/addincfg.cxx
index 92017aad9f82..b7b3adc22cf4 100644
--- a/sc/source/core/tool/addincfg.cxx
+++ b/sc/source/core/tool/addincfg.cxx
@@ -48,7 +48,7 @@ using namespace com::sun::star;
 #define CFGPATH_ADDINS  "Office.CalcAddIns/AddInInfo"
 
 ScAddInCfg::ScAddInCfg() :
-    ConfigItem( rtl::OUString::createFromAscii( CFGPATH_ADDINS ) )
+    ConfigItem( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_ADDINS )) )
 {
     uno::Sequence<rtl::OUString> aNames(1);     // one entry: empty string
     EnableNotification( aNames );
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index f7e39adfd72a..6e3e77d855d6 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -294,7 +294,7 @@ uno::Reference<uno::XComponentContext> getContext(uno::Reference<lang::XMultiSer
     try {
         uno::Reference<beans::XPropertySet> xPropset(xMSF, uno::UNO_QUERY);
         xPropset->getPropertyValue(
-            ::rtl::OUString::createFromAscii("DefaultContext")) >>= xCtx;
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext"))) >>= xCtx;
     }
     catch ( uno::Exception & ) {
     }
@@ -311,7 +311,7 @@ void ScUnoAddInCollection::Initialize()
     {
         uno::Reference<container::XEnumeration> xEnum =
                         xEnAc->createContentEnumeration(
-                            rtl::OUString::createFromAscii(SCADDINSUPPLIER_SERVICE) );
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SCADDINSUPPLIER_SERVICE)) );
         if ( xEnum.is() )
         {
             //  loop through all AddIns
@@ -411,7 +411,7 @@ void ScUnoAddInCollection::ReadConfiguration()
     ScAddInCfg& rAddInConfig = SC_MOD()->GetAddInCfg();
 
     // additional, temporary config item for the compatibility names
-    ScLinkConfigItem aAllLocalesConfig( rtl::OUString::createFromAscii( CFGPATH_ADDINS ), CONFIG_MODE_ALL_LOCALES );
+    ScLinkConfigItem aAllLocalesConfig( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_ADDINS )), CONFIG_MODE_ALL_LOCALES );
     // CommitLink is not used (only reading values)
 
     const rtl::OUString sSlash('/');
@@ -428,7 +428,7 @@ void ScUnoAddInCollection::ReadConfiguration()
 
         rtl::OUString aFunctionsPath = aServiceName;
         aFunctionsPath += sSlash;
-        aFunctionsPath += rtl::OUString::createFromAscii( CFGSTR_ADDINFUNCTIONS );
+        aFunctionsPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_ADDINFUNCTIONS) );
 
         uno::Sequence<rtl::OUString> aFunctionNames = rAddInConfig.GetNodeNames( aFunctionsPath );
         sal_Int32 nNewCount = aFunctionNames.getLength();
@@ -486,11 +486,11 @@ void ScUnoAddInCollection::ReadConfiguration()
                 uno::Sequence<rtl::OUString> aFuncPropNames(CFG_FUNCPROP_COUNT);
                 rtl::OUString* pNameArray = aFuncPropNames.getArray();
                 pNameArray[CFG_FUNCPROP_DISPLAYNAME] = aFuncPropPath;
-                pNameArray[CFG_FUNCPROP_DISPLAYNAME] += rtl::OUString::createFromAscii( CFGSTR_DISPLAYNAME );
+                pNameArray[CFG_FUNCPROP_DISPLAYNAME] += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_DISPLAYNAME) );
                 pNameArray[CFG_FUNCPROP_DESCRIPTION] = aFuncPropPath;
-                pNameArray[CFG_FUNCPROP_DESCRIPTION] += rtl::OUString::createFromAscii( CFGSTR_DESCRIPTION );
+                pNameArray[CFG_FUNCPROP_DESCRIPTION] += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_DESCRIPTION ));
                 pNameArray[CFG_FUNCPROP_CATEGORY] = aFuncPropPath;
-                pNameArray[CFG_FUNCPROP_CATEGORY] += rtl::OUString::createFromAscii( CFGSTR_CATEGORY );
+                pNameArray[CFG_FUNCPROP_CATEGORY] += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_CATEGORY) );
 
                 uno::Sequence<uno::Any> aFuncProperties = rAddInConfig.GetProperties( aFuncPropNames );
                 if ( aFuncProperties.getLength() == CFG_FUNCPROP_COUNT )
@@ -508,7 +508,7 @@ void ScUnoAddInCollection::ReadConfiguration()
                 uno::Sequence<sheet::LocalizedName> aCompNames;
 
                 rtl::OUString aCompPath = aFuncPropPath;
-                aCompPath += rtl::OUString::createFromAscii( CFGSTR_COMPATIBILITYNAME );
+                aCompPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_COMPATIBILITYNAME ));
                 uno::Sequence<rtl::OUString> aCompPropNames( &aCompPath, 1 );
 
                 uno::Sequence<uno::Any> aCompProperties = aAllLocalesConfig.GetProperties( aCompPropNames );
@@ -553,7 +553,7 @@ void ScUnoAddInCollection::ReadConfiguration()
                 long nCallerPos = SC_CALLERPOS_NONE;
 
                 rtl::OUString aArgumentsPath = aFuncPropPath;
-                aArgumentsPath += rtl::OUString::createFromAscii( CFGSTR_PARAMETERS );
+                aArgumentsPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_PARAMETERS) );
 
                 uno::Sequence<rtl::OUString> aArgumentNames = rAddInConfig.GetNodeNames( aArgumentsPath );
                 sal_Int32 nArgumentCount = aArgumentNames.getLength();
@@ -574,9 +574,9 @@ void ScUnoAddInCollection::ReadConfiguration()
                         aOneArgPath += sSlash;
 
                         pPropNameArray[nIndex] = aOneArgPath;
-                        pPropNameArray[nIndex++] += rtl::OUString::createFromAscii( CFGSTR_DISPLAYNAME );
+                        pPropNameArray[nIndex++] += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_DISPLAYNAME ));
                         pPropNameArray[nIndex] = aOneArgPath;
-                        pPropNameArray[nIndex++] += rtl::OUString::createFromAscii( CFGSTR_DESCRIPTION );
+                        pPropNameArray[nIndex++] += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_DESCRIPTION ));
                     }
 
                     uno::Sequence<uno::Any> aArgProperties = rAddInConfig.GetProperties( aArgPropNames );
@@ -826,8 +826,8 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>&
         if ( xManager.is() )
         {
             uno::Reference<beans::XIntrospection> xIntro(
-                                    xManager->createInstance(rtl::OUString::createFromAscii(
-                                        "com.sun.star.beans.Introspection" )),
+                                    xManager->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "com.sun.star.beans.Introspection" ))),
                                     uno::UNO_QUERY );
             if ( xIntro.is() )
             {
@@ -946,7 +946,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>&
                                         }
                                         catch(uno::Exception&)
                                         {
-                                            aLocalU = rtl::OUString::createFromAscii( "###" );
+                                            aLocalU = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "###" ));
                                         }
                                         String aLocalName = String( aLocalU );
 
@@ -958,7 +958,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>&
                                         }
                                         catch(uno::Exception&)
                                         {
-                                            aDescU = rtl::OUString::createFromAscii( "###" );
+                                            aDescU = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "###" ));
                                         }
                                         String aDescription = String( aDescU );
 
@@ -983,7 +983,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>&
                                                     }
                                                     catch(uno::Exception&)
                                                     {
-                                                        aArgName = rtl::OUString::createFromAscii( "###" );
+                                                        aArgName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "###" ));
                                                     }
                                                     rtl::OUString aArgDesc;
                                                     try
@@ -993,7 +993,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>&
                                                     }
                                                     catch(uno::Exception&)
                                                     {
-                                                        aArgName = rtl::OUString::createFromAscii( "###" );
+                                                        aArgName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "###" ));
                                                     }
 
                                                     BOOL bOptional =
@@ -1097,8 +1097,8 @@ void ScUnoAddInCollection::UpdateFromAddIn( const uno::Reference<uno::XInterface
     if ( xManager.is() )
     {
         uno::Reference<beans::XIntrospection> xIntro(
-                                xManager->createInstance(rtl::OUString::createFromAscii(
-                                    "com.sun.star.beans.Introspection" )),
+                                xManager->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "com.sun.star.beans.Introspection" ))),
                                 uno::UNO_QUERY );
         if ( xIntro.is() )
         {
@@ -1786,5 +1786,4 @@ void ScUnoAddInCall::SetResult( const uno::Any& rNewRes )
 //------------------------------------------------------------------------
 
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx
index be483c8bf574..ed667ea97d20 100644
--- a/sc/source/core/tool/appoptio.cxx
+++ b/sc/source/core/tool/appoptio.cxx
@@ -309,7 +309,7 @@ Sequence<OUString> ScAppCfg::GetLayoutPropertyNames()
 
     //  adjust for metric system
     if (ScOptionsUtil::IsMetricSystem())
-        pNames[SCLAYOUTOPT_MEASURE] = OUString::createFromAscii( "Other/MeasureUnit/Metric" );
+        pNames[SCLAYOUTOPT_MEASURE] = OUString(RTL_CONSTASCII_USTRINGPARAM( "Other/MeasureUnit/Metric") );
 
     return aNames;
 }
@@ -393,12 +393,12 @@ Sequence<OUString> ScAppCfg::GetMiscPropertyNames()
 
 
 ScAppCfg::ScAppCfg() :
-    aLayoutItem( OUString::createFromAscii( CFGPATH_LAYOUT ) ),
-    aInputItem( OUString::createFromAscii( CFGPATH_INPUT ) ),
-    aRevisionItem( OUString::createFromAscii( CFGPATH_REVISION ) ),
-    aContentItem( OUString::createFromAscii( CFGPATH_CONTENT ) ),
-    aSortListItem( OUString::createFromAscii( CFGPATH_SORTLIST ) ),
-    aMiscItem( OUString::createFromAscii( CFGPATH_MISC ) )
+    aLayoutItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_LAYOUT )) ),
+    aInputItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_INPUT )) ),
+    aRevisionItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_REVISION )) ),
+    aContentItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_CONTENT )) ),
+    aSortListItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_SORTLIST )) ),
+    aMiscItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_MISC )) )
 {
     sal_Int32 nIntVal = 0;
 
diff --git a/sc/source/core/tool/cellkeywords.inl b/sc/source/core/tool/cellkeywords.inl
index 9fb58c02797b..5060b366e554 100644
--- a/sc/source/core/tool/cellkeywords.inl
+++ b/sc/source/core/tool/cellkeywords.inl
@@ -3,7 +3,7 @@
 // ---------------------------------------------------------------------------
 // French language locale (automatically generated)
 // ---------------------------------------------------------------------------
-static const Locale aFr(OUString::createFromAscii("fr"), OUString(), OUString());
+static const Locale aFr(OUString(RTL_CONSTASCII_USTRINGPARAM("fr")), OUString(), OUString());
 
 // pre instantiations of localized function names
 static const sal_Unicode cell_address_fr[] = {
@@ -58,7 +58,7 @@ addToMap(pFr, aFr);
 // ---------------------------------------------------------------------------
 // Hungarian language locale (automatically generated)
 // ---------------------------------------------------------------------------
-static const Locale aHu(OUString::createFromAscii("hu"), OUString(), OUString());
+static const Locale aHu(OUString(RTL_CONSTASCII_USTRINGPARAM("hu")), OUString(), OUString());
 
 // pre instantiations of localized function names
 static const sal_Unicode cell_address_hu[] = {
@@ -128,7 +128,7 @@ addToMap(pHu, aHu);
 // ---------------------------------------------------------------------------
 // German language locale (automatically generated)
 // ---------------------------------------------------------------------------
-static const Locale aDe(OUString::createFromAscii("de"), OUString(), OUString());
+static const Locale aDe(OUString(RTL_CONSTASCII_USTRINGPARAM("de")), OUString(), OUString());
 
 // pre instantiations of localized function names
 static const sal_Unicode cell_row_de[] = {
diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx
index 19b9e4099be3..47ca0c1f8b54 100644
--- a/sc/source/core/tool/charthelper.cxx
+++ b/sc/source/core/tool/charthelper.cxx
@@ -244,7 +244,7 @@ void ScChartHelper::SetChartRanges( const uno::Reference< chart2::XChartDocument
 
     try
     {
-        rtl::OUString aPropertyNameRole( ::rtl::OUString::createFromAscii("Role") );
+        rtl::OUString aPropertyNameRole( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Role")) );
 
         uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > aLabeledDataSequences( xDataSource->getDataSequences() );
         sal_Int32 nRange=0;
diff --git a/sc/source/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx
index f8630df4a836..41351de0f2b6 100644
--- a/sc/source/core/tool/chartpos.cxx
+++ b/sc/source/core/tool/chartpos.cxx
@@ -125,7 +125,6 @@ void ScChartPositioner::GlueState()
         }
         return;
     }
-//  ULONG nOldPos = aRangeListRef->GetCurPos();
 
     pR = aRangeListRef->First();
     nStartCol = pR->aStart.Col();
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index ee578a82a32a..6b3372aec287 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -5475,10 +5475,6 @@ BOOL ScCompiler::HandleDbData()
     return TRUE;
 }
 
-String GetScCompilerNativeSymbol( OpCode eOp )
-{
-    return ScCompiler::GetNativeSymbol( eOp );
-}
 // -----------------------------------------------------------------------------
 FormulaTokenRef ScCompiler::ExtendRangeReference( FormulaToken & rTok1, FormulaToken & rTok2, bool bReuseDoubleRef )
 {
diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx
index 6c89ba675049..4842cc800cac 100644
--- a/sc/source/core/tool/docoptio.cxx
+++ b/sc/source/core/tool/docoptio.cxx
@@ -148,9 +148,9 @@ void ScDocOptions::ResetDocOptions()
 void ScDocOptions::ResetFormulaSeparators()
 {
     // Defaults to the old separator values.
-    aFormulaSepArg = OUString::createFromAscii(";");
-    aFormulaSepArrayCol = OUString::createFromAscii(";");
-    aFormulaSepArrayRow = OUString::createFromAscii("|");
+    aFormulaSepArg = OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
+    aFormulaSepArrayCol = OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
+    aFormulaSepArrayRow = OUString(RTL_CONSTASCII_USTRINGPARAM("|"));
 
     const Locale& rLocale = *ScGlobal::GetLocale();
     const OUString& rLang = rLocale.Language;
@@ -189,12 +189,12 @@ void ScDocOptions::ResetFormulaSeparators()
         // if the decimal and list separators are equal, set the
         // parameter separator to be ';', unless they are both
         // semicolon in which case don't change the decimal separator.
-        aFormulaSepArg = OUString::createFromAscii(";");
+        aFormulaSepArg = OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
 
-    aFormulaSepArrayCol = OUString::createFromAscii(",");
+    aFormulaSepArrayCol = OUString(RTL_CONSTASCII_USTRINGPARAM(","));
     if (cDecSep == sal_Unicode(','))
-        aFormulaSepArrayCol = OUString::createFromAscii(".");
-    aFormulaSepArrayRow = OUString::createFromAscii(";");
+        aFormulaSepArrayCol = OUString(RTL_CONSTASCII_USTRINGPARAM("."));
+    aFormulaSepArrayRow = OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
 }
 
 const LocaleDataWrapper& ScDocOptions::GetLocaleDataWrapper()
@@ -346,7 +346,7 @@ Sequence<OUString> ScDocCfg::GetLayoutPropertyNames()
 
     //  adjust for metric system
     if (ScOptionsUtil::IsMetricSystem())
-        pNames[SCDOCLAYOUTOPT_TABSTOP] = OUString::createFromAscii( "TabStop/Metric" );
+        pNames[SCDOCLAYOUTOPT_TABSTOP] = OUString(RTL_CONSTASCII_USTRINGPARAM( "TabStop/Metric") );
 
     return aNames;
 }
@@ -366,10 +366,10 @@ Sequence<OUString> ScDocCfg::GetCompatPropertyNames()
 }
 
 ScDocCfg::ScDocCfg() :
-    aCalcItem( OUString::createFromAscii( CFGPATH_CALC ) ),
-    aFormulaItem(OUString::createFromAscii(CFGPATH_FORMULA)),
-    aLayoutItem(OUString::createFromAscii(CFGPATH_DOCLAYOUT)),
-    aCompatItem(OUString::createFromAscii(CFGPATH_COMPAT))
+    aCalcItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_CALC )) ),
+    aFormulaItem(OUString(RTL_CONSTASCII_USTRINGPARAM(CFGPATH_FORMULA))),
+    aLayoutItem(OUString(RTL_CONSTASCII_USTRINGPARAM(CFGPATH_DOCLAYOUT))),
+    aCompatItem(OUString(RTL_CONSTASCII_USTRINGPARAM(CFGPATH_COMPAT)))
 {
     sal_Int32 nIntVal = 0;
     double fDoubleVal = 0;
@@ -385,7 +385,7 @@ ScDocCfg::ScDocCfg() :
     aValues = aCalcItem.GetProperties(aNames);
     aCalcItem.EnableNotification(aNames);
     pValues = aValues.getConstArray();
-    DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed");
+    OSL_ENSURE(aValues.getLength() == aNames.getLength(), "GetProperties failed");
     if(aValues.getLength() == aNames.getLength())
     {
         for(int nProp = 0; nProp < aNames.getLength(); nProp++)
@@ -634,6 +634,7 @@ IMPL_LINK( ScDocCfg, FormulaCommitHdl, void *, EMPTYARG )
                 {
                     case ::formula::FormulaGrammar::GRAM_NATIVE_XL_A1:    nVal = 1; break;
                     case ::formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1:  nVal = 2; break;
+                    default: break;
                 }
                 pValues[nProp] <<= nVal;
             }
diff --git a/sc/source/core/tool/filtopt.cxx b/sc/source/core/tool/filtopt.cxx
index b5c109b6602f..ff3dd2bdfdcf 100644
--- a/sc/source/core/tool/filtopt.cxx
+++ b/sc/source/core/tool/filtopt.cxx
@@ -71,7 +71,7 @@ Sequence<OUString> ScFilterOptions::GetPropertyNames()
 }
 
 ScFilterOptions::ScFilterOptions() :
-    ConfigItem( OUString::createFromAscii( CFGPATH_FILTER ) ),
+    ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_FILTER )) ),
     bWK3Flag( FALSE ),
     fExcelColScale( 0 ),
     fExcelRowScale( 0 )
diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx
index 449ec8355dc1..811182a57e3a 100644
--- a/sc/source/core/tool/inputopt.cxx
+++ b/sc/source/core/tool/inputopt.cxx
@@ -155,7 +155,7 @@ Sequence<OUString> ScInputCfg::GetPropertyNames()
 }
 
 ScInputCfg::ScInputCfg() :
-    ConfigItem( OUString::createFromAscii( CFGPATH_INPUT ) )
+    ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_INPUT )) )
 {
     sal_Int32 nIntVal = 0;
 
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index ee317f246466..21b7cd1e8cb5 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2759,7 +2759,7 @@ static ::rtl::OUString lcl_convertIntoHalfWidth( const ::rtl::OUString & rStr )
 
     if( bFirstASCCall )
     {
-        aTrans.loadModuleByImplName( ::rtl::OUString::createFromAscii( "FULLWIDTH_HALFWIDTH_LIKE_ASC" ), LANGUAGE_SYSTEM );
+        aTrans.loadModuleByImplName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FULLWIDTH_HALFWIDTH_LIKE_ASC" )), LANGUAGE_SYSTEM );
         bFirstASCCall = false;
     }
 
@@ -2774,7 +2774,7 @@ static ::rtl::OUString lcl_convertIntoFullWidth( const ::rtl::OUString & rStr )
 
     if( bFirstJISCall )
     {
-        aTrans.loadModuleByImplName( ::rtl::OUString::createFromAscii( "HALFWIDTH_FULLWIDTH_LIKE_JIS" ), LANGUAGE_SYSTEM );
+        aTrans.loadModuleByImplName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HALFWIDTH_FULLWIDTH_LIKE_JIS" )), LANGUAGE_SYSTEM );
         bFirstJISCall = false;
     }
 
@@ -5638,7 +5638,8 @@ void ScInterpreter::CalculateLookup(BOOL HLookup)
         SCCOL nCol2 = 0;
         SCROW nRow2 = 0;
         SCTAB nTab2;
-        if (GetStackType() == svDoubleRef)
+        StackVar eType = GetStackType();
+        if (eType == svDoubleRef)
         {
             PopDoubleRef(nCol1, nRow1, nTab1, nCol2, nRow2, nTab2);
             if (nTab1 != nTab2)
@@ -5647,9 +5648,13 @@ void ScInterpreter::CalculateLookup(BOOL HLookup)
                 return;
             }
         }
-        else if (GetStackType() == svMatrix)
+        else if (eType == svMatrix || eType == svExternalDoubleRef)
         {
-            pMat = PopMatrix();
+            if (eType == svMatrix)
+                pMat = PopMatrix();
+            else
+                PopExternalDoubleRef(pMat);
+
             if (pMat)
                 pMat->GetDimensions(nC, nR);
             else
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 0b702777d8e8..5cb5feb8213b 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -489,25 +489,11 @@ double ScInterpreter::BinomKoeff(double n, double k)
             k--;
             n--;
         }
-/*
-        double f1 = n;                      // Zaehler
-        double f2 = k;                      // Nenner
-        n--;
-        k--;
-        while (k > 0.0)
-        {
-            f2 *= k;
-            f1 *= n;
-            k--;
-            n--;
-        }
-        nVal = f1 / f2;
-*/
+
     }
     return nVal;
 }
 
-
 // The algorithm is based on lanczos13m53 in lanczos.hpp
 // in math library from http://www.boost.org
 /** you must ensure fZ>0
@@ -651,7 +637,6 @@ double ScInterpreter::GetGamma(double fZ)
     return exp( fLogPi - fLogDivisor) * ((::rtl::math::sin( F_PI*fZ) < 0.0) ? -1.0 : 1.0);
 }
 
-
 /** You must ensure fZ>0 */
 double ScInterpreter::GetLogGamma(double fZ)
 {
@@ -672,48 +657,12 @@ double ScInterpreter::GetFDist(double x, double fF1, double fF2)
     double alpha = fF2/2.0;
     double beta = fF1/2.0;
     return (GetBetaDist(arg, alpha, beta));
-/*
-    double Z = (pow(fF,1.0/3.0)*(1.0-2.0/(9.0*fF2)) - (1.0-2.0/(9.0*fF1))) /
-               sqrt(2.0/(9.0*fF1) + pow(fF,2.0/3.0)*2.0/(9.0*fF2));
-    return (0.5-gauss(Z));
-*/
 }
 
 double ScInterpreter::GetTDist(double T, double fDF)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetTDist" );
     return 0.5 * GetBetaDist(fDF/(fDF+T*T), fDF/2.0, 0.5);
-/*
-    USHORT DF = (USHORT) fDF;
-    double A = T / sqrt(DF);
-    double B = 1.0 + A*A;
-    double R;
-    if (DF == 1)
-        R = 0.5 + atan(A)/F_PI;
-    else if (DF % 2 == 0)
-    {
-        double S0 = A/(2.0 * sqrt(B));
-        double C0 = S0;
-        for (USHORT i = 2; i <= DF-2; i+=2)
-        {
-            C0 *= (1.0 - 1.0/(double)i)/B;
-            S0 += C0;
-        }
-        R = 0.5 + S0;
-    }
-    else
-    {
-        double S1 = A / (B * F_PI);
-        double C1 = S1;
-        for (USHORT i = 3; i <= DF-2; i+=2)
-        {
-            C1 *= (1.0 - 1.0/(double)i)/B;
-            S1 += C1;
-        }
-        R = 0.5 + atan(A)/F_PI + S1;
-    }
-    return 1.0 - R;
-*/
 }
 
 // for LEGACY.CHIDIST, returns right tail, fDF=degrees of freedom
@@ -821,7 +770,6 @@ void ScInterpreter::ScGamma()
     }
 }
 
-
 void ScInterpreter::ScLogGamma()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLogGamma" );
@@ -963,7 +911,6 @@ double ScInterpreter::GetBetaDistPDF(double fX, double fA, double fB)
         return exp((fA-1.0)*fLogX + (fB-1.0)* fLogY - fLogBeta);
 }
 
-
 /*
                 x^a * (1-x)^b
     I_x(a,b) = ----------------  * result of ContFrac
@@ -2250,7 +2197,6 @@ public:
     double  GetValue( double x ) const  { return fp - rInt.GetChiSqDistCDF(x, fDF); }
 };
 
-
 void ScInterpreter::ScChiSqInv()
 {
     if ( !MustHaveParamCount( GetByte(), 2 ) )
@@ -2271,7 +2217,6 @@ void ScInterpreter::ScChiSqInv()
     PushDouble(fVal);
 }
 
-
 void ScInterpreter::ScConfidence()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScConfidence" );
@@ -2629,11 +2574,6 @@ void ScInterpreter::ScFTest()
         fF2 = fCount1-1.0;
     }
     PushDouble(2.0*GetFDist(fF, fF1, fF2));
-/*
-    double Z = (pow(fF,1.0/3.0)*(1.0-2.0/(9.0*fF2)) - (1.0-2.0/(9.0*fF1))) /
-               sqrt(2.0/(9.0*fF1) + pow(fF,2.0/3.0)*2.0/(9.0*fF2));
-    PushDouble(1.0-2.0*gauss(Z));
-*/
 }
 
 void ScInterpreter::ScChiTest()
@@ -2688,25 +2628,6 @@ void ScInterpreter::ScChiTest()
     else
         fDF = (double)(nC1-1)*(double)(nR1-1);
     PushDouble(GetChiDist(fChi, fDF));
-/*
-    double fX, fS, fT, fG;
-    fX = 1.0;
-    for (double fi = fDF; fi >= 2.0; fi -= 2.0)
-        fX *= fChi/fi;
-    fX *= exp(-fChi/2.0);
-    if (fmod(fDF, 2.0) != 0.0)
-        fX *= sqrt(2.0*fChi/F_PI);
-    fS = 1.0;
-    fT = 1.0;
-    fG = fDF;
-    while (fT >= 1.0E-7)
-    {
-        fG += 2.0;
-        fT *= fChi/fG;
-        fS += fT;
-    }
-    PushDouble(1.0 - fX*fS);
-*/
 }
 
 void ScInterpreter::ScKurt()
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index a1be4455d31b..7b8f0e835be7 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1576,13 +1576,11 @@ BOOL ScInterpreter::PopDoubleRefOrSingleRef( ScAddress& rAdr )
             PopDoubleRef( aRange, TRUE );
             return DoubleRefToPosSingleRef( aRange, rAdr );
         }
-        //break;
         case svSingleRef :
         {
             PopSingleRef( rAdr );
             return TRUE;
         }
-        //break;
         default:
             PopError();
             SetError( errNoRef );
@@ -1623,7 +1621,7 @@ bool ScInterpreter::ConvertMatrixParameters()
     for ( USHORT i=1; i <= nParams && i <= sp; ++i )
     {
         FormulaToken* p = pStack[ sp - i ];
-        if ( p->GetOpCode() != ocPush )
+        if ( p->GetOpCode() != ocPush && p->GetOpCode() != ocMissing)
         {
             DBG_ERRORFILE( "ConvertMatrixParameters: not a push");
         }
@@ -2243,12 +2241,10 @@ const String& ScInterpreter::GetString()
         case svError:
             PopError();
             return EMPTY_STRING;
-        //break;
         case svMissing:
         case svEmptyCell:
             Pop();
             return EMPTY_STRING;
-        //break;
         case svDouble:
         {
             double fVal = PopDouble();
@@ -2258,10 +2254,8 @@ const String& ScInterpreter::GetString()
             pFormatter->GetInputLineString(fVal, nIndex, aTempStr);
             return aTempStr;
         }
-        //break;
         case svString:
             return PopString();
-        //break;
         case svSingleRef:
         {
             ScAddress aAdr;
@@ -2275,7 +2269,6 @@ const String& ScInterpreter::GetString()
             else
                 return EMPTY_STRING;
         }
-        //break;
         case svDoubleRef:
         {   // generate position dependent SingleRef
             ScRange aRange;
@@ -2302,7 +2295,6 @@ const String& ScInterpreter::GetString()
             PopExternalDoubleRef(pMat);
             return GetStringFromMatrix(pMat);
         }
-        //break;
         case svMatrix:
         {
             ScMatrixRef pMat = PopMatrix();
@@ -3451,17 +3443,6 @@ void ScInterpreter::ScTableOp()
     pDok->DecInterpreterTableOpLevel();
 }
 
-
-/*
-
-void ScInterpreter::ScErrCell()
-{
-RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScErrCell" );
-    double fErrNum = GetDouble();
-    PushError((USHORT) fErrNum);
-}
-*/
-
 void ScInterpreter::ScDBArea()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBArea" );
@@ -3597,7 +3578,6 @@ ScInterpreter::ScInterpreter( ScFormulaCell* pCell, ScDocument* pDoc,
     meVolaileType(NOT_VOLATILE)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScTTT" );
-//  pStack = new ScToken*[ MAXSTACK ];
 
     BYTE cMatFlag = pMyFormulaCell->GetMatrixFlag();
     bMatrixFormula = ( cMatFlag == MM_FORMULA || cMatFlag == MM_FAKE );
@@ -3638,7 +3618,6 @@ void ScInterpreter::GlobalExit()        // static
 
 StackVar ScInterpreter::Interpret()
 {
-//  StackPrinter __stack_printer__("ScInterpreter::Interpret");
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::Interpret" );
     short nRetTypeExpr = NUMBERFORMAT_UNDEFINED;
     ULONG nRetIndexExpr = 0;
@@ -3746,7 +3725,6 @@ StackVar ScInterpreter::Interpret()
                 case ocNeg              : ScNeg();                      break;
                 case ocPercentSign      : ScPercentSign();              break;
                 case ocPi               : ScPi();                       break;
-//              case ocDefPar           : ScDefPar();                   break;
                 case ocRandom           : ScRandom();                   break;
                 case ocTrue             : ScTrue();                     break;
                 case ocFalse            : ScFalse();                    break;
@@ -4007,7 +3985,6 @@ StackVar ScInterpreter::Interpret()
                 case ocBetaInv          : ScBetaInv();                  break;
                 case ocExternal         : ScExternal();                 break;
                 case ocTableOp          : ScTableOp();                  break;
-//              case ocErrCell          : ScErrCell();                  break;
                 case ocStop :                                           break;
                 case ocErrorType        : ScErrorType();                break;
                 case ocCurrent          : ScCurrent();                  break;
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index 049e7a235870..3cd7e1a6145f 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -100,6 +100,28 @@ const double fInvEpsilon = 1.0E-7;
         }
     };
 
+namespace
+{
+
+// Multiply n x m Mat A with m x l Mat B to n x l Mat R
+void lcl_MFastMult(ScMatrixRef pA, ScMatrixRef pB, ScMatrixRef pR,
+                   SCSIZE n, SCSIZE m, SCSIZE l)
+{
+    double sum;
+    for (SCSIZE row = 0; row < n; row++)
+    {
+        for (SCSIZE col = 0; col < l; col++)
+        {   // result element(col, row) =sum[ (row of A) * (column of B)]
+            sum = 0.0;
+            for (SCSIZE k = 0; k < m; k++)
+                sum += pA->GetDouble(k,row) * pB->GetDouble(col,k);
+            pR->PutDouble(sum, col, row);
+        }
+    }
+}
+
+}
+
 double ScInterpreter::ScGetGCD(double fx, double fy)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::div" );
@@ -660,25 +682,6 @@ void ScInterpreter::MEMat(ScMatrix* mM, SCSIZE n)
         mM->PutDouble(1.0, i, i);
 }
 
-void ScInterpreter::MFastMult(ScMatrix* pA, ScMatrix* pB, ScMatrix* pR,
-                              SCSIZE n, SCSIZE m, SCSIZE l)
-        // Multipliziert n x m Mat a mit m x l Mat b nach Mat r
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::MFastMult" );
-    double sum;
-    for (SCSIZE i = 0; i < n; i++)
-    {
-        for (SCSIZE j = 0; j < l; j++)
-        {
-            sum = 0.0;
-            for (SCSIZE k = 0; k < m; k++)
-                sum += pA->GetDouble(i,k)*pB->GetDouble(k,j);
-            pR->PutDouble(sum, i, j);
-        }
-    }
-}
-
-
 /* Matrix LUP decomposition according to the pseudocode of "Introduction to
  * Algorithms" by Cormen, Leiserson, Rivest, Stein.
  *
@@ -783,6 +786,13 @@ static int lcl_LUP_decompose( ScMatrix* mA, const SCSIZE n,
         fprintf( stderr, "%5u ", (unsigned)P[j]);
     fprintf( stderr, "\n%s\n", "");
 #endif
+
+    bool bSingular=false;
+    for (SCSIZE i=0; i<n && !bSingular; i++)
+        bSingular = bSingular || ((mA->GetDouble(i,i))==0.0);
+    if (bSingular)
+        nSign = 0;
+
     return nSign;
 }
 
@@ -928,7 +938,7 @@ void ScInterpreter::ScMatInv()
                         for (SCSIZE i=0; i < nR; ++i)
                             pY->PutDouble( X[i], j, i);
                     }
-#if 0
+#if OSL_DEBUG_LEVEL > 1
                     /* Possible checks for ill-condition:
                      * 1. Scale matrix, invert scaled matrix. If there are
                      *    elements of the inverted matrix that are several
@@ -950,10 +960,8 @@ void ScInterpreter::ScMatInv()
                     if (xR)
                     {
                         ScMatrix* pR = xR;
-                        MFastMult( pMat, pY, pR, nR, nR, nR);
-#if OSL_DEBUG_LEVEL > 1
+                        lcl_MFastMult( pMat, pY, pR, nR, nR, nR);
                         fprintf( stderr, "\n%s\n", "ScMatInv(): mult-identity");
-#endif
                         for (SCSIZE i=0; i < nR; ++i)
                         {
                             for (SCSIZE j=0; j < nR; ++j)
@@ -1856,212 +1864,386 @@ void ScInterpreter::ScFrequency()
     PushMatrix(pResMat);
 }
 
-BOOL ScInterpreter::RGetVariances( ScMatrix* pV, ScMatrix* pX,
-        SCSIZE nC, SCSIZE nR, BOOL bSwapColRow, BOOL bZeroConstant )
-{   // multiple Regression: Varianzen der Koeffizienten
-    // bSwapColRow==TRUE : Koeffizienten in Zeilen statt Spalten angeordnet
-    SCSIZE i, j, k;
-    double sum;
-    ScMatrixRef pC = GetNewMat(nC, nC);
-    if ( !pC )
-        return FALSE;
-    // X transformiert mit X multipziert, X'X Matrix
-    if ( !bZeroConstant )
-    {   // in der X-Designmatrix existiert ein gedachtes X0j==1
-        if ( bSwapColRow )
-        {
-            for ( i=0; i<nC; i++ )
-            {
-                for ( j=0; j<nC; j++ )
-                {
-                    sum = 0.0;
-                    for ( k=0; k<nR; k++ )
-                    {
-                        sum += (j==0 ? 1 : pX->GetDouble(k,j-1))
-                            * (i==0 ? 1 : pX->GetDouble(k,i-1));
-                    }
-                    pC->PutDouble(sum, i, j);
-                }
-            }
+namespace {
+
+// -----------------------------------------------------------------------------
+// Helper methods for LINEST/LOGEST and TREND/GROWTH
+// All matrices must already exist and have the needed size, no control tests
+// done. Those methodes, which names start with lcl_T, are adapted to case 3,
+// where Y (=observed values) is given as row.
+// Remember, ScMatrix matrices are zero based, index access (column,row).
+// -----------------------------------------------------------------------------
+
+// <A;B> over all elements; uses the matrices as vectors of length M
+double lcl_GetSumProduct(ScMatrixRef pMatA, ScMatrixRef pMatB, SCSIZE nM)
+{
+    double fSum = 0.0;
+    for (SCSIZE i=0; i<nM; i++)
+        fSum += pMatA->GetDouble(i) * pMatB->GetDouble(i);
+    return fSum;
+}
+
+// Special version for use within QR decomposition.
+// Euclidean norm of column index C starting in row index R;
+// matrix A has count N rows.
+double lcl_GetColumnEuclideanNorm(ScMatrixRef pMatA, SCSIZE nC, SCSIZE nR, SCSIZE nN)
+{
+    double fNorm = 0.0;
+    for (SCSIZE row=nR; row<nN; row++)
+        fNorm  += (pMatA->GetDouble(nC,row)) * (pMatA->GetDouble(nC,row));
+    return sqrt(fNorm);
+}
+
+// Euclidean norm of row index R starting in column index C;
+// matrix A has count N columns.
+double lcl_TGetColumnEuclideanNorm(ScMatrixRef pMatA, SCSIZE nR, SCSIZE nC, SCSIZE nN)
+{
+    double fNorm = 0.0;
+    for (SCSIZE col=nC; col<nN; col++)
+        fNorm  += (pMatA->GetDouble(col,nR)) * (pMatA->GetDouble(col,nR));
+    return sqrt(fNorm);
+}
+
+// Special version for use within QR decomposition.
+// Maximum norm of column index C starting in row index R;
+// matrix A has count N rows.
+double lcl_GetColumnMaximumNorm(ScMatrixRef pMatA, SCSIZE nC, SCSIZE nR, SCSIZE nN)
+{
+    double fNorm = 0.0;
+    for (SCSIZE row=nR; row<nN; row++)
+        if (fNorm < fabs(pMatA->GetDouble(nC,row)))
+            fNorm = fabs(pMatA->GetDouble(nC,row));
+    return fNorm;
+}
+
+// Maximum norm of row index R starting in col index C;
+// matrix A has count N columns.
+double lcl_TGetColumnMaximumNorm(ScMatrixRef pMatA, SCSIZE nR, SCSIZE nC, SCSIZE nN)
+{
+    double fNorm = 0.0;
+    for (SCSIZE col=nC; col<nN; col++)
+        if (fNorm < fabs(pMatA->GetDouble(col,nR)))
+            fNorm = fabs(pMatA->GetDouble(col,nR));
+    return fNorm;
+}
+
+// Special version for use within QR decomposition.
+// <A(Ca);B(Cb)> starting in row index R;
+// Ca and Cb are indices of columns, matrices A and B have count N rows.
+double lcl_GetColumnSumProduct(ScMatrixRef pMatA, SCSIZE nCa,
+                               ScMatrixRef pMatB, SCSIZE nCb, SCSIZE nR, SCSIZE nN)
+{
+    double fResult = 0.0;
+    for (SCSIZE row=nR; row<nN; row++)
+        fResult += pMatA->GetDouble(nCa,row) * pMatB->GetDouble(nCb,row);
+    return fResult;
+}
+
+// <A(Ra);B(Rb)> starting in column index C;
+// Ra and Rb are indices of rows, matrices A and B have count N columns.
+double lcl_TGetColumnSumProduct(ScMatrixRef pMatA, SCSIZE nRa,
+                                ScMatrixRef pMatB, SCSIZE nRb, SCSIZE nC, SCSIZE nN)
+{
+    double fResult = 0.0;
+    for (SCSIZE col=nC; col<nN; col++)
+        fResult += pMatA->GetDouble(col,nRa) * pMatB->GetDouble(col,nRb);
+    return fResult;
+}
+
+double lcl_GetSign(double fValue)
+{
+    if (fValue < 0.0)
+        return -1.0;
+    else if (fValue > 0.0)
+        return 1.0;
+    else
+        return 0.0;
+}
+
+/* Calculates a QR decomposition with Householder reflection.
+ * For each NxK matrix A exists a decomposition A=Q*R with an orthogonal
+ * NxN matrix Q and a NxK matrix R.
+ * Q=H1*H2*...*Hk with Householder matrices H. Such a householder matrix can
+ * be build from a vector u by H=I-(2/u'u)*(u u'). This vectors u are returned
+ * in the columns of matrix A, overwriting the old content.
+ * The matrix R has a quadric upper part KxK with values in the upper right
+ * triangle and zeros in all other elements. Here the diagonal elements of R
+ * are stored in the vector R and the other upper right elements in the upper
+ * right of the matrix A.
+ * The function returns false, if calculation breaks. But because of round-off
+ * errors singularity is often not detected.
+ */
+bool lcl_CalculateQRdecomposition(ScMatrixRef pMatA,
+                                  ::std::vector< double>& pVecR, SCSIZE nK, SCSIZE nN)
+{
+    double fScale ;
+    double fEuclid ;
+    double fFactor ;
+    double fSignum ;
+    double fSum ;
+    // ScMatrix matrices are zero based, index access (column,row)
+    for (SCSIZE col = 0; col <nK; col++)
+    {
+        // calculate vector u of the householder transformation
+        fScale = lcl_GetColumnMaximumNorm(pMatA, col, col, nN);
+        if (fScale == 0.0)
+        {
+            // A is singular
+            return false;
         }
-        else
+        for (SCSIZE row = col; row <nN; row++)
+            pMatA->PutDouble( pMatA->GetDouble(col,row)/fScale, col, row);
+
+        fEuclid = lcl_GetColumnEuclideanNorm(pMatA, col, col, nN);
+        fFactor = 1.0/fEuclid/(fEuclid + fabs(pMatA->GetDouble(col,col)));
+        fSignum = lcl_GetSign(pMatA->GetDouble(col,col));
+        pMatA->PutDouble( pMatA->GetDouble(col,col) + fSignum*fEuclid, col,col);
+        pVecR[col] = -fSignum * fScale * fEuclid;
+
+        // apply Householder transformation to A
+        for (SCSIZE c=col+1; c<nK; c++)
         {
-            for ( i=0; i<nC; i++ )
-            {
-                for ( j=0; j<nC; j++ )
-                {
-                    sum = 0.0;
-                    for ( k=0; k<nR; k++ )
-                    {
-                        sum += (j==0 ? 1 : pX->GetDouble(j-1,k))
-                            * (i==0 ? 1 : pX->GetDouble(i-1,k));
-                    }
-                    pC->PutDouble(sum, i, j);
-                }
-            }
+            fSum =lcl_GetColumnSumProduct(pMatA, col, pMatA, c, col, nN);
+            for (SCSIZE row = col; row <nN; row++)
+                pMatA->PutDouble( pMatA->GetDouble(c,row) - fSum * fFactor * pMatA->GetDouble(col,row), c, row);
         }
     }
-    else
-    {
-        if ( bSwapColRow )
-        {
-            for ( i=0; i<nC; i++ )
-            {
-                for ( j=0; j<nC; j++ )
-                {
-                    sum = 0.0;
-                    for ( k=0; k<nR; k++ )
-                    {
-                        sum += pX->GetDouble(k,j) * pX->GetDouble(k,i);
-                    }
-                    pC->PutDouble(sum, i, j);
-                }
-            }
+    return true;
+}
+
+// same with transposed matrix A, N is count of columns, K count of rows
+bool lcl_TCalculateQRdecomposition(ScMatrixRef pMatA,
+                                   ::std::vector< double>& pVecR, SCSIZE nK, SCSIZE nN)
+{
+    double fScale ;
+    double fEuclid ;
+    double fFactor ;
+    double fSignum ;
+    double fSum ;
+    // ScMatrix matrices are zero based, index access (column,row)
+    for (SCSIZE row = 0; row <nK; row++)
+    {
+        // calculate vector u of the householder transformation
+        fScale = lcl_TGetColumnMaximumNorm(pMatA, row, row, nN);
+        if (fScale == 0.0)
+        {
+            // A is singular
+            return false;
         }
-        else
+        for (SCSIZE col = row; col <nN; col++)
+            pMatA->PutDouble( pMatA->GetDouble(col,row)/fScale, col, row);
+
+        fEuclid = lcl_TGetColumnEuclideanNorm(pMatA, row, row, nN);
+        fFactor = 1.0/fEuclid/(fEuclid + fabs(pMatA->GetDouble(row,row)));
+        fSignum = lcl_GetSign(pMatA->GetDouble(row,row));
+        pMatA->PutDouble( pMatA->GetDouble(row,row) + fSignum*fEuclid, row,row);
+        pVecR[row] = -fSignum * fScale * fEuclid;
+
+        // apply Householder transformation to A
+        for (SCSIZE r=row+1; r<nK; r++)
         {
-            for ( i=0; i<nC; i++ )
-            {
-                for ( j=0; j<nC; j++ )
-                {
-                    sum = 0.0;
-                    for ( k=0; k<nR; k++ )
-                    {
-                        sum += pX->GetDouble(j,k) * pX->GetDouble(i,k);
-                    }
-                    pC->PutDouble(sum, i, j);
-                }
-            }
+            fSum =lcl_TGetColumnSumProduct(pMatA, row, pMatA, r, row, nN);
+            for (SCSIZE col = row; col <nN; col++)
+                pMatA->PutDouble(
+                    pMatA->GetDouble(col,r) - fSum * fFactor * pMatA->GetDouble(col,row), col, r);
         }
     }
-    // X'X Inverse
-    BOOL bOk = TRUE;
-    USHORT nErr = nGlobalError;
-    PushMatrix(pC);
-    BYTE nTmp = cPar;
-    cPar = 1;
-    ScMatInv();
-    cPar = nTmp;
-    if ( nGlobalError )
-    {
-        nGlobalError = nErr;
-        bOk = FALSE;
+    return true;
+}
+
+
+/* Applies a Householder transformation to a column vector Y with is given as
+ * Nx1 Matrix. The Vektor u, from which the Householder transformation is build,
+ * is the column part in matrix A, with column index C, starting with row
+ * index C. A is the result of the QR decomposition as obtained from
+ * lcl_CaluclateQRdecomposition.
+ */
+void lcl_ApplyHouseholderTransformation(ScMatrixRef pMatA, SCSIZE nC,
+                                        ScMatrixRef pMatY, SCSIZE nN)
+{
+    // ScMatrix matrices are zero based, index access (column,row)
+    double fDenominator = lcl_GetColumnSumProduct(pMatA, nC, pMatA, nC, nC, nN);
+    double fNumerator = lcl_GetColumnSumProduct(pMatA, nC, pMatY, 0, nC, nN);
+    double fFactor = 2.0 * (fNumerator/fDenominator);
+    for (SCSIZE row = nC; row < nN; row++)
+        pMatY->PutDouble(
+            pMatY->GetDouble(row) - fFactor * pMatA->GetDouble(nC,row), row);
+}
+
+// Same with transposed matrices A and Y.
+void lcl_TApplyHouseholderTransformation(ScMatrixRef pMatA, SCSIZE nR,
+                                          ScMatrixRef pMatY, SCSIZE nN)
+{
+    // ScMatrix matrices are zero based, index access (column,row)
+    double fDenominator = lcl_TGetColumnSumProduct(pMatA, nR, pMatA, nR, nR, nN);
+    double fNumerator = lcl_TGetColumnSumProduct(pMatA, nR, pMatY, 0, nR, nN);
+    double fFactor = 2.0 * (fNumerator/fDenominator);
+    for (SCSIZE col = nR; col < nN; col++)
+        pMatY->PutDouble(
+          pMatY->GetDouble(col) - fFactor * pMatA->GetDouble(col,nR), col);
+}
+
+/* Solve for X in R*X=S using back substitution. The solution X overwrites S.
+ * Uses R from the result of the QR decomposition of a NxK matrix A.
+ * S is a column vector given as matrix, with at least elements on index
+ * 0 to K-1; elements on index>=K are ignored. Vector R must not have zero
+ * elements, no check is done.
+ */
+void lcl_SolveWithUpperRightTriangle(ScMatrixRef pMatA,
+                        ::std::vector< double>& pVecR, ScMatrixRef pMatS,
+                        SCSIZE nK, bool bIsTransposed)
+{
+    // ScMatrix matrices are zero based, index access (column,row)
+    double fSum;
+    SCSIZE row;
+    // SCSIZE is never negative, therefore test with rowp1=row+1
+    for (SCSIZE rowp1 = nK; rowp1>0; rowp1--)
+    {
+        row = rowp1-1;
+        fSum = pMatS->GetDouble(row);
+        for (SCSIZE col = rowp1; col<nK ; col++)
+            if (bIsTransposed)
+                fSum -= pMatA->GetDouble(row,col) * pMatS->GetDouble(col);
+            else
+                fSum -= pMatA->GetDouble(col,row) * pMatS->GetDouble(col);
+        pMatS->PutDouble( fSum / pVecR[row] , row);
     }
-    else
+}
+
+/* Solve for X in R' * X= T using forward substitution. The solution X
+ * overwrites T. Uses R from the result of the QR decomposition of a NxK
+ * matrix A. T is a column vectors given as matrix, with at least elements on
+ * index 0 to K-1; elements on index>=K are ignored. Vector R must not have
+ * zero elements, no check is done.
+ */
+void lcl_SolveWithLowerLeftTriangle(ScMatrixRef pMatA,
+                                    ::std::vector< double>& pVecR, ScMatrixRef pMatT,
+                                    SCSIZE nK, bool bIsTransposed)
+{
+    // ScMatrix matrices are zero based, index access (column,row)
+    double fSum;
+    for (SCSIZE row = 0; row < nK; row++)
     {
-        // #i61216# ScMatInv no longer modifies the original matrix, so just calling Pop() doesn't work
-        pC = PopMatrix();
-        if ( pC.Is() )
+        fSum = pMatT -> GetDouble(row);
+        for (SCSIZE col=0; col < row; col++)
         {
-            // Varianzen auf der Diagonalen, andere sind Kovarianzen
-            for (i = 0; i < nC; i++)
-                pV->PutDouble(pC->GetDouble(i, i), i);
+            if (bIsTransposed)
+                fSum -= pMatA->GetDouble(col,row) * pMatT->GetDouble(col);
+            else
+                fSum -= pMatA->GetDouble(row,col) * pMatT->GetDouble(col);
         }
+        pMatT->PutDouble( fSum / pVecR[row] , row);
     }
-    return bOk;
 }
-// -----------------------------------------------------------------------------
-void ScInterpreter::Calculate(ScMatrixRef& pResMat,ScMatrixRef& pE,ScMatrixRef& pQ,ScMatrixRef& pV,ScMatrixRef& pMatX,BOOL bConstant,SCSIZE N,SCSIZE M,BYTE nCase)
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::RGetVariances" );
-    // pE[0]    := Sigma i=1...n (Yi)
-    // pE[k]    := Sigma i=1...n (Xki*Yi)
-    // pE[M+1]  := Sigma i=1...n (Yi**2)
-    // pQ[0,M+1]:= B
-    // pQ[k,M+1]:= Mk
-    double fSQR, fSQT, fSQE;
-    fSQT = pE->GetDouble(M+1)
-        - pE->GetDouble(0) * pE->GetDouble(0) / (double)N;
-    fSQR = pE->GetDouble(M+1);
-    SCSIZE i, j;
-    for (i = 0; i < M+1; i++)
-        fSQR -= pQ->GetDouble(i, M+1) * pE->GetDouble(i);
-    fSQE = fSQT-fSQR;
-    // r2 (Bestimmtheitsmass, 0...1)
-    if (fSQT == 0.0)
-        pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), 0, 2);
-    else
-        pResMat->PutDouble (fSQE/fSQT, 0, 2);
-    // ssReg (Regressions-Quadratsumme)
-    pResMat->PutDouble(fSQE, 0, 4);
-    // ssResid (Residual-Quadratsumme, Summe der Abweichungsquadrate)
-    pResMat->PutDouble(fSQR, 1, 4);
-    for (i = 2; i < 5; i++)
-        for (j = 2; j < M+1; j++)
-            pResMat->PutString(ScGlobal::GetRscString(STR_NV_STR), j, i);
-    if (bConstant)
-    {
-        if (N-M-1 == 0)
-        {
-            pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), 1, 2);
-            for (i = 0; i < M+1; i++)
-                pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i, 1);
-        }
-        else
-        {
-            double fSE2 = fSQR/(N-M-1);
-            // sey (Standardfehler des Schaetzwertes y)
-            pResMat->PutDouble(sqrt(fSE2), 1, 2);
-            // sen...se1 (Standardfehler der Koeffizienten mn...m1)
-            // seb (Standardfehler der Konstanten b)
-            if ( RGetVariances( pV, pMatX, M+1, N, nCase != 2, FALSE ) )
-            {
-                for (i = 0; i < M+1; i++)
-                    pResMat->PutDouble( sqrt(fSE2 * pV->GetDouble(i)), M-i, 1 );
-            }
+
+/* Calculates Z = R * B
+ * R is given in matrix A and vector VecR as obtained from the QR
+ * decompostion in lcl_CalculateQRdecomposition. B and Z are column vectors
+ * given as matrix with at least index 0 to K-1; elements on index>=K are
+ * not used.
+ */
+void lcl_ApplyUpperRightTriangle(ScMatrixRef pMatA,
+                                 ::std::vector< double>& pVecR, ScMatrixRef pMatB,
+                                 ScMatrixRef pMatZ, SCSIZE nK, bool bIsTransposed)
+{
+    // ScMatrix matrices are zero based, index access (column,row)
+    double fSum;
+    for (SCSIZE row = 0; row < nK; row++)
+    {
+        fSum = pVecR[row] * pMatB->GetDouble(row);
+        for (SCSIZE col = row+1; col < nK; col++)
+            if (bIsTransposed)
+                fSum += pMatA->GetDouble(row,col) * pMatB->GetDouble(col);
             else
-            {
-                for (i = 0; i < M+1; i++)
-                    pResMat->PutString(ScGlobal::GetRscString(STR_NV_STR), i, 1);
-            }
-        }
-        // F (F-Statistik)
-        if (fSQR == 0.0)
-            pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), 0, 3);
-        else
-            pResMat->PutDouble(((double)(N-M-1))*fSQE/fSQR/((double)M),0, 3);
-        // df (Freiheitsgrad)
-        pResMat->PutDouble(((double)(N-M-1)), 1, 3);
+                fSum += pMatA->GetDouble(col,row) * pMatB->GetDouble(col);
+        pMatZ->PutDouble( fSum, row);
     }
-    else
+}
+
+
+
+double lcl_GetMeanOverAll(ScMatrixRef pMat, SCSIZE nN)
+{
+    double fSum = 0.0;
+    for (SCSIZE i=0 ; i<nN; i++)
+        fSum += pMat->GetDouble(i);
+    return fSum/static_cast<double>(nN);
+}
+
+// Calculates means of the columns of matrix X. X is a RxC matrix;
+// ResMat is a 1xC matrix (=row).
+void lcl_CalculateColumnMeans(ScMatrixRef pX, ScMatrixRef pResMat,
+                              SCSIZE nC, SCSIZE nR)
+{
+    double fSum = 0.0;
+    for (SCSIZE i=0; i < nC; i++)
     {
-        if (N-M == 0)
-        {
-            pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), 1, 2);
-            for (i = 0; i < M+1; i++)
-                pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i, 1);
-        }
-        else
-        {
-            double fSE2 = fSQR/(N-M);
-            pResMat->PutDouble(sqrt(fSE2), 1, 2);
-            if ( RGetVariances( pV, pMatX, M, N, nCase != 2, TRUE ) )
-            {
-                for (i = 0; i < M; i++)
-                    pResMat->PutDouble( sqrt(fSE2 * pV->GetDouble(i)), M-i-1, 1 );
-                pResMat->PutString(ScGlobal::GetRscString(STR_NV_STR), M, 1);
-            }
-            else
-            {
-                for (i = 0; i < M+1; i++)
-                    pResMat->PutString(ScGlobal::GetRscString(STR_NV_STR), i, 1);
-            }
-        }
-        if (fSQR == 0.0)
-            pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), 0, 3);
-        else
-            pResMat->PutDouble(((double)(N-M))*fSQE/fSQR/((double)M),0, 3);
-        pResMat->PutDouble(((double)(N-M)), 1, 3);
+        fSum =0.0;
+        for (SCSIZE k=0; k < nR; k++)
+            fSum += pX->GetDouble(i,k);   // GetDouble(Column,Row)
+        pResMat ->PutDouble( fSum/static_cast<double>(nR),i);
     }
 }
 
-void ScInterpreter::ScRGP()
+// Calculates means of the rows of matrix X. X is a RxC matrix;
+// ResMat is a Rx1 matrix (=column).
+void lcl_CalculateRowMeans(ScMatrixRef pX, ScMatrixRef pResMat,
+                           SCSIZE nC, SCSIZE nR)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRGP" );
-    CalulateRGPRKP(FALSE);
+    double fSum = 0.0;
+    for (SCSIZE k=0; k < nR; k++)
+    {
+        fSum =0.0;
+        for (SCSIZE i=0; i < nC; i++)
+            fSum += pX->GetDouble(i,k);   // GetDouble(Column,Row)
+        pResMat ->PutDouble( fSum/static_cast<double>(nC),k);
+    }
 }
-bool ScInterpreter::CheckMatrix(BOOL _bLOG,BOOL _bTrendGrowth,BYTE& nCase,SCSIZE& nCX,SCSIZE& nCY,SCSIZE& nRX,SCSIZE& nRY,SCSIZE& M,SCSIZE& N,ScMatrixRef& pMatX,ScMatrixRef& pMatY)
+
+void lcl_CalculateColumnsDelta(ScMatrixRef pMat, ScMatrixRef pColumnMeans,
+                               SCSIZE nC, SCSIZE nR)
 {
+    for (SCSIZE i = 0; i < nC; i++)
+        for (SCSIZE k = 0; k < nR; k++)
+            pMat->PutDouble( ::rtl::math::approxSub
+                             (pMat->GetDouble(i,k) , pColumnMeans->GetDouble(i) ) , i, k);
+}
+
+void lcl_CalculateRowsDelta(ScMatrixRef pMat, ScMatrixRef pRowMeans,
+                            SCSIZE nC, SCSIZE nR)
+{
+    for (SCSIZE k = 0; k < nR; k++)
+        for (SCSIZE i = 0; i < nC; i++)
+            pMat->PutDouble( ::rtl::math::approxSub
+                             ( pMat->GetDouble(i,k) , pRowMeans->GetDouble(k) ) , i, k);
+}
+
+// Case1 = simple regression
+// MatX = X - MeanX, MatY = Y - MeanY, y - haty = (y - MeanY) - (haty - MeanY)
+// = (y-MeanY)-((slope*x+a)-(slope*MeanX+a)) = (y-MeanY)-slope*(x-MeanX)
+double lcl_GetSSresid(ScMatrixRef pMatX, ScMatrixRef pMatY, double fSlope,
+                      SCSIZE nN)
+{
+    double fSum = 0.0;
+    double fTemp = 0.0;
+    for (SCSIZE i=0; i<nN; i++)
+    {
+        fTemp = pMatY->GetDouble(i) - fSlope * pMatX->GetDouble(i);
+        fSum += fTemp * fTemp;
+    }
+    return fSum;
+}
+
+}
+
+// Fill default values in matrix X, transform Y to log(Y) in case LOGEST|GROWTH,
+// determine sizes of matrices X and Y, determine kind of regression, clone
+// Y in case LOGEST|GROWTH, if constant.
+bool ScInterpreter::CheckMatrix(bool _bLOG, BYTE& nCase, SCSIZE& nCX,
+                        SCSIZE& nCY, SCSIZE& nRX, SCSIZE& nRY, SCSIZE& M,
+                        SCSIZE& N, ScMatrixRef& pMatX, ScMatrixRef& pMatY)
+{
+
     nCX = 0;
     nCY = 0;
     nRX = 0;
@@ -2107,7 +2289,11 @@ bool ScInterpreter::CheckMatrix(BOOL _bLOG,BOOL _bTrendGrowth,BYTE& nCase,SCSIZE
                 return false;
             }
         if (nCX == nCY && nRX == nRY)
-            nCase = 1;                  // einfache Regression
+        {
+            nCase = 1;                  // simple regression
+            M = 1;
+            N = nCountY;
+        }
         else if (nCY != 1 && nRY != 1)
         {
             PushIllegalArgument();
@@ -2122,7 +2308,7 @@ bool ScInterpreter::CheckMatrix(BOOL _bLOG,BOOL _bTrendGrowth,BYTE& nCase,SCSIZE
             }
             else
             {
-                nCase = 2;              // zeilenweise
+                nCase = 2;              // Y is column
                 N = nRY;
                 M = nCX;
             }
@@ -2134,7 +2320,7 @@ bool ScInterpreter::CheckMatrix(BOOL _bLOG,BOOL _bTrendGrowth,BYTE& nCase,SCSIZE
         }
         else
         {
-            nCase = 3;                  // spaltenweise
+            nCase = 3;                  // Y is row
             N = nCY;
             M = nRX;
         }
@@ -2142,460 +2328,644 @@ bool ScInterpreter::CheckMatrix(BOOL _bLOG,BOOL _bTrendGrowth,BYTE& nCase,SCSIZE
     else
     {
         pMatX = GetNewMat(nCY, nRY);
-        if ( _bTrendGrowth )
-        {
             nCX = nCY;
             nRX = nRY;
-        }
         if (!pMatX)
         {
             PushIllegalArgument();
             return false;
         }
         for ( SCSIZE i = 1; i <= nCountY; i++ )
-            pMatX->PutDouble((double)i, i-1);
+            pMatX->PutDouble(static_cast<double>(i), i-1);
         nCase = 1;
+        N = nCountY;
+        M = 1;
     }
     return true;
 }
-void ScInterpreter::CalulateRGPRKP(BOOL _bRKP)
+
+// -----------------------------------------------------------------------------
+
+// LINEST
+void ScInterpreter::ScRGP()
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRGP" );
+    CalulateRGPRKP(false);
+}
+
+// LOGEST
+void ScInterpreter::ScRKP()
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRKP" );
+    CalulateRGPRKP(true);
+}
+
+void ScInterpreter::CalulateRGPRKP(bool _bRKP)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CheckMatrix" );
     BYTE nParamCount = GetByte();
-    if ( !MustHaveParamCount( nParamCount, 1, 4 ) )
+    if (!MustHaveParamCount( nParamCount, 1, 4 ))
         return;
-    BOOL bConstant, bStats;
+    bool bConstant, bStats;
+
+    // optional forth parameter
     if (nParamCount == 4)
         bStats = GetBool();
     else
-        bStats = FALSE;
+        bStats = false;
+
+    // The third parameter may not be missing in ODF, if the forth parameter
+    // is present. But Excel allows it with default true, we too.
     if (nParamCount >= 3)
-        bConstant = GetBool();
+    {
+        if (IsMissing())
+        {
+            Pop();
+            bConstant = true;
+//            PushIllegalParameter(); if ODF behavior is desired
+//            return;
+        }
+        else
+            bConstant = GetBool();
+    }
     else
-        bConstant = TRUE;
+        bConstant = true;
+
     ScMatrixRef pMatX;
-    ScMatrixRef pMatY;
     if (nParamCount >= 2)
-        pMatX = GetMatrix();
+    {
+        if (IsMissing())
+        { //In ODF1.2 empty second parameter (which is two ;; ) is allowed
+            Pop();
+            pMatX = NULL;
+        }
+        else
+        {
+            pMatX = GetMatrix();
+        }
+    }
     else
         pMatX = NULL;
+
+    ScMatrixRef pMatY;
     pMatY = GetMatrix();
     if (!pMatY)
     {
         PushIllegalParameter();
         return;
-    } // if (!pMatY)
-    BYTE nCase;                         // 1 = normal, 2,3 = mehrfach
-    SCSIZE nCX, nCY;
-    SCSIZE nRX, nRY;
-    SCSIZE M = 0, N = 0;
-    if ( !CheckMatrix(_bRKP,FALSE,nCase,nCX,nCY,nRX,nRY,M,N,pMatX,pMatY) )
+    }
+
+    // 1 = simple; 2 = multiple with Y as column; 3 = multiple with Y as row
+    BYTE nCase;
+
+    SCSIZE nCX, nCY; // number of columns
+    SCSIZE nRX, nRY;    //number of rows
+    SCSIZE K = 0, N = 0; // K=number of variables X, N=number of data samples
+    if (!CheckMatrix(_bRKP,nCase,nCX,nCY,nRX,nRY,K,N,pMatX,pMatY))
+    {
+        PushIllegalParameter();
+        return;
+    }
+
+    // Enough data samples?
+    if ((bConstant && (N<K+1)) || (!bConstant && (N<K)) || (N<1) || (K<1))
+    {
+        PushIllegalParameter();
         return;
+    }
 
     ScMatrixRef pResMat;
-    if (nCase == 1)
+    if (bStats)
+        pResMat = GetNewMat(K+1,5);
+    else
+        pResMat = GetNewMat(K+1,1);
+    if (!pResMat)
     {
-        if (!bStats)
-            pResMat = GetNewMat(2,1);
-        else
-            pResMat = GetNewMat(2,5);
-        if (!pResMat)
+        PushError(errCodeOverflow);
+        return;
+    }
+    // Fill unused cells in pResMat; order (column,row)
+    if (bStats)
+    {
+        for (SCSIZE i=2; i<K+1; i++)
         {
-            PushIllegalArgument();
+            pResMat->PutString(ScGlobal::GetRscString(STR_NV_STR), i, 2 );
+            pResMat->PutString(ScGlobal::GetRscString(STR_NV_STR), i, 3 );
+            pResMat->PutString(ScGlobal::GetRscString(STR_NV_STR), i, 4 );
+        }
+    }
+
+    // Uses sum(x-MeanX)^2 and not [sum x^2]-N * MeanX^2 in case bConstant.
+    // Clone constant matrices, so that Mat = Mat - Mean is possible.
+    double fMeanY = 0.0;
+    if (bConstant)
+    {
+        ScMatrixRef pNewX = pMatX->CloneIfConst();
+        ScMatrixRef pNewY = pMatY->CloneIfConst();
+        if (!pNewX || !pNewY)
+        {
+            PushError(errCodeOverflow);
             return;
         }
-        double fCount   = 0.0;
-        double fSumX    = 0.0;
-        double fSumSqrX = 0.0;
-        double fSumY    = 0.0;
-        double fSumSqrY = 0.0;
-        double fSumXY   = 0.0;
-        double fValX, fValY;
-        for (SCSIZE i = 0; i < nCY; i++)
-            for (SCSIZE j = 0; j < nRY; j++)
-            {
-                fValX = pMatX->GetDouble(i,j);
-                fValY = pMatY->GetDouble(i,j);
-                fSumX    += fValX;
-                fSumSqrX += fValX * fValX;
-                fSumY    += fValY;
-                fSumSqrY += fValY * fValY;
-                fSumXY   += fValX*fValY;
-                fCount++;
-            }
-        if (fCount < 1.0)
-            PushNoValue();
-        else
+        pMatX = pNewX;
+        pMatY = pNewY;
+        // DeltaY is possible here; DeltaX depends on nCase, so later
+        fMeanY = lcl_GetMeanOverAll(pMatY, N);
+        for (SCSIZE i=0; i<N; i++)
         {
-            double f1 = fCount*fSumXY-fSumX*fSumY;
-            double fX = fCount*fSumSqrX-fSumX*fSumX;
-            double b, m;
-            if (bConstant)
+            pMatY->PutDouble( ::rtl::math::approxSub(pMatY->GetDouble(i),fMeanY), i );
+        }
+    }
+
+    if (nCase==1)
+    {
+        // calculate simple regression
+        double fMeanX = 0.0;
+        if (bConstant)
+        {   // Mat = Mat - Mean
+            fMeanX = lcl_GetMeanOverAll(pMatX, N);
+            for (SCSIZE i=0; i<N; i++)
             {
-                b = fSumY/fCount - f1/fX*fSumX/fCount;
-                m = f1/fX;
+                pMatX->PutDouble( ::rtl::math::approxSub(pMatX->GetDouble(i),fMeanX), i );
             }
-            else
-            {
-                b = 0.0;
-                m = fSumXY/fSumSqrX;
+        }
+        double fSumXY = lcl_GetSumProduct(pMatX,pMatY,N);
+        double fSumX2 = lcl_GetSumProduct(pMatX,pMatX,N);
+        if (fSumX2==0.0)
+        {
+            PushNoValue(); // all x-values are identical
+            return;
+        }
+        double fSlope = fSumXY / fSumX2;
+        double fIntercept = 0.0;
+        if (bConstant)
+            fIntercept = fMeanY - fSlope * fMeanX;
+        pResMat->PutDouble(_bRKP ? exp(fIntercept) : fIntercept, 1, 0); //order (column,row)
+        pResMat->PutDouble(_bRKP ? exp(fSlope) : fSlope, 0, 0);
+
+        if (bStats)
+        {
+            double fSSreg = fSlope * fSlope * fSumX2;
+            pResMat->PutDouble(fSSreg, 0, 4);
+
+            double fDegreesFreedom =static_cast<double>( (bConstant) ? N-2 : N-1 );
+            pResMat->PutDouble(fDegreesFreedom, 1, 3);
+
+            double fSSresid = lcl_GetSSresid(pMatX,pMatY,fSlope,N);
+            pResMat->PutDouble(fSSresid, 1, 4);
+
+            if (fDegreesFreedom == 0.0 || fSSresid == 0.0 || fSSreg == 0.0)
+            {   // exact fit; test SSreg too, because SSresid might be
+                // unequal zero due to round of errors
+                pResMat->PutDouble(0.0, 1, 4); // SSresid
+                pResMat->PutString(ScGlobal::GetRscString(STR_NV_STR), 0, 3); // F
+                pResMat->PutDouble(0.0, 1, 2); // RMSE
+                pResMat->PutDouble(0.0, 0, 1); // SigmaSlope
+                if (bConstant)
+                    pResMat->PutDouble(0.0, 1, 1); //SigmaIntercept
+                else
+                    pResMat->PutString(ScGlobal::GetRscString(STR_NV_STR), 1, 1);
+                pResMat->PutDouble(1.0, 0, 2); // R^2
             }
-            pResMat->PutDouble(_bRKP ? exp(m) : m, 0, 0);
-            pResMat->PutDouble(_bRKP ? exp(b) : b, 1, 0);
-            if (bStats)
+            else
             {
-                double fY = fCount*fSumSqrY-fSumY*fSumY;
-                double fSyx = fSumSqrY-b*fSumY-m*fSumXY;
-                double fR2 = f1*f1/(fX*fY);
-                pResMat->PutDouble (fR2, 0, 2);
-                if (fCount < 3.0)
+                double fFstatistic = (fSSreg / static_cast<double>(K))
+                                     / (fSSresid / fDegreesFreedom);
+                pResMat->PutDouble(fFstatistic, 0, 3);
+
+                // standard error of estimate
+                double fRMSE = sqrt(fSSresid / fDegreesFreedom);
+                pResMat->PutDouble(fRMSE, 1, 2);
+
+                double fSigmaSlope = fRMSE / sqrt(fSumX2);
+                pResMat->PutDouble(fSigmaSlope, 0, 1);
+
+                if (bConstant)
                 {
-                    pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), 0, 1 );
-                    pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), 1, 1 );
-                    pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), 1, 2 );
-                    pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), 0, 3 );
+                    double fSigmaIntercept = fRMSE
+                                             * sqrt(fMeanX*fMeanX/fSumX2 + 1.0/static_cast<double>(N));
+                    pResMat->PutDouble(fSigmaIntercept, 1, 1);
                 }
                 else
                 {
-                    pResMat->PutDouble(sqrt(fSyx*fCount/(fX*(fCount-2.0))), 0, 1);
-                    pResMat->PutDouble(sqrt(fSyx*fSumSqrX/fX/(fCount-2.0)), 1, 1);
-                    pResMat->PutDouble(
-                        sqrt((fCount*fSumSqrY - fSumY*fSumY - f1*f1/fX)/
-                             (fCount*(fCount-2.0))), 1, 2);
-                    if (fR2 == 1.0)
-                        pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), 0, 3 );
-                    else
-                        pResMat->PutDouble(fR2*(fCount-2.0)/(1.0-fR2), 0, 3);
+                    pResMat->PutString(ScGlobal::GetRscString(STR_NV_STR), 1, 1);
                 }
-                pResMat->PutDouble(((double)(nCY*nRY))-2.0, 1, 3);
-                pResMat->PutDouble(fY/fCount-fSyx, 0, 4);
-                pResMat->PutDouble(fSyx, 1, 4);
+
+                double fR2 = fSSreg / (fSSreg + fSSresid);
+                pResMat->PutDouble(fR2, 0, 2);
             }
         }
-    } // if (nCase == 1)
-    if ( nCase != 1 )
+        PushMatrix(pResMat);
+    }
+    else // calculate multiple regression;
     {
-        SCSIZE i, j, k;
-        if (!bStats)
-            pResMat = GetNewMat(M+1,1);
-        else
-            pResMat = GetNewMat(M+1,5);
-        if (!pResMat)
+        // Uses a QR decomposition X = QR. The solution B = (X'X)^(-1) * X' * Y
+        // becomes B = R^(-1) * Q' * Y
+        if (nCase ==2) // Y is column
         {
-            PushIllegalArgument();
-            return;
-        }
-        ScMatrixRef pQ = GetNewMat(M+1, M+2);
-        ScMatrixRef pE = GetNewMat(M+2, 1);
-        ScMatrixRef pV = GetNewMat(M+1, 1);
-        pE->PutDouble(0.0, M+1);
-        pQ->FillDouble(0.0, 0, 0, M, M+1);
-        if (nCase == 2)
-        {
-            for (k = 0; k < N; k++)
-            {
-                double Yk = pMatY->GetDouble(k);
-                pE->PutDouble( pE->GetDouble(M+1)+Yk*Yk, M+1 );
-                double sumYk = pQ->GetDouble(0, M+1) + Yk;
-                pQ->PutDouble( sumYk, 0, M+1 );
-                pE->PutDouble( sumYk, 0 );
-                for (i = 0; i < M; i++)
-                {
-                    double Xik = pMatX->GetDouble(i,k);
-                    double sumXik = pQ->GetDouble(0, i+1) + Xik;
-                    pQ->PutDouble( sumXik, 0, i+1);
-                    pQ->PutDouble( sumXik, i+1, 0);
-                    double sumXikYk = pQ->GetDouble(i+1, M+1) + Xik * Yk;
-                    pQ->PutDouble( sumXikYk, i+1, M+1);
-                    pE->PutDouble( sumXikYk, i+1);
-                    for (j = i; j < M; j++)
-                    {
-                        const double fVal = pMatX->GetDouble(j,k);
-                        double sumXikXjk = pQ->GetDouble(j+1, i+1) +
-                             Xik * fVal;
-                        pQ->PutDouble( sumXikXjk, j+1, i+1);
-                        pQ->PutDouble( sumXikXjk, i+1, j+1);
-                    }
-                }
+            ::std::vector< double> aVecR(N); // for QR decomposition
+            // Enough memory for needed matrices?
+            ScMatrixRef pMeans = GetNewMat(K, 1); // mean of each column
+            ScMatrixRef pMatZ; // for Q' * Y , inter alia
+            if (bStats)
+                pMatZ = pMatY->Clone(); // Y is used in statistic, keep it
+            else
+                pMatZ = pMatY; // Y can be overwritten
+            ScMatrixRef pSlopes = GetNewMat(1,K); // from b1 to bK
+            if (!pMeans || !pMatZ || !pSlopes)
+            {
+                PushError(errCodeOverflow);
+                return;
             }
-        }
-        else
-        {
-            for (k = 0; k < N; k++)
+            if (bConstant)
             {
-                double Yk = pMatY->GetDouble(k);
-                pE->PutDouble( pE->GetDouble(M+1)+Yk*Yk, M+1 );
-                double sumYk = pQ->GetDouble(0, M+1) + Yk;
-                pQ->PutDouble( sumYk, 0, M+1 );
-                pE->PutDouble( sumYk, 0 );
-                for (i = 0; i < M; i++)
-                {
-                    double Xki = pMatX->GetDouble(k,i);
-                    double sumXki = pQ->GetDouble(0, i+1) + Xki;
-                    pQ->PutDouble( sumXki, 0, i+1);
-                    pQ->PutDouble( sumXki, i+1, 0);
-                    double sumXkiYk = pQ->GetDouble(i+1, M+1) + Xki * Yk;
-                    pQ->PutDouble( sumXkiYk, i+1, M+1);
-                    pE->PutDouble( sumXkiYk, i+1);
-                    for (j = i; j < M; j++)
-                    {
-                        const double fVal = pMatX->GetDouble(k,j);
-                        double sumXkiXkj = pQ->GetDouble(j+1, i+1) +
-                             Xki * fVal;
-                        pQ->PutDouble( sumXkiXkj, j+1, i+1);
-                        pQ->PutDouble( sumXkiXkj, i+1, j+1);
-                    }
-                }
+                lcl_CalculateColumnMeans(pMatX, pMeans, K, N);
+                lcl_CalculateColumnsDelta(pMatX, pMeans, K, N);
             }
-        }
-        if ( !Calculate4(_bRKP,pResMat,pQ,bConstant,N,M) )
-            return;
-
-        if (bStats)
-            Calculate(pResMat,pE,pQ,pV,pMatX,bConstant,N,M,nCase);
-    }
-    PushMatrix(pResMat);
-}
-
-void ScInterpreter::ScRKP()
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRKP" );
-    CalulateRGPRKP(TRUE);
-}
-// -----------------------------------------------------------------------------
-bool ScInterpreter::Calculate4(BOOL _bExp,ScMatrixRef& pResMat,ScMatrixRef& pQ,BOOL bConstant,SCSIZE N,SCSIZE M)
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::Calculate4" );
-    pQ->PutDouble((double)N, 0, 0);
-    if (bConstant)
-    {
-        SCSIZE S, L;
-        for (S = 0; S < M+1; S++)
-        {
-            SCSIZE i = S;
-            while (i < M+1 && pQ->GetDouble(i, S) == 0.0)
-                i++;
-            if (i >= M+1)
+            if (!lcl_CalculateQRdecomposition(pMatX, aVecR, K, N))
             {
                 PushNoValue();
-                return false;
+                return;
             }
-            double fVal;
-            for (L = 0; L < M+2; L++)
+            // Later on we will divide by elements of aVecR, so make sure
+            // that they aren't zero.
+            bool bIsSingular=false;
+            for (SCSIZE row=0; row < K && !bIsSingular; row++)
+                bIsSingular = bIsSingular || aVecR[row]==0.0;
+            if (bIsSingular)
             {
-                fVal = pQ->GetDouble(S, L);
-                pQ->PutDouble(pQ->GetDouble(i, L), S, L);
-                pQ->PutDouble(fVal, i, L);
+                PushNoValue();
+                return;
             }
-            fVal = 1.0/pQ->GetDouble(S, S);
-            for (L = 0; L < M+2; L++)
-                pQ->PutDouble(pQ->GetDouble(S, L)*fVal, S, L);
-            for (i = 0; i < M+1; i++)
+            // Z = Q' Y;
+            for (SCSIZE col = 0; col < K; col++)
             {
-                if (i != S)
-                {
-                    fVal = -pQ->GetDouble(i, S);
-                    for (L = 0; L < M+2; L++)
-                        pQ->PutDouble(
-                            pQ->GetDouble(i,L)+fVal*pQ->GetDouble(S,L),i,L);
-                }
+                lcl_ApplyHouseholderTransformation(pMatX, col, pMatZ, N);
             }
-        }
-    }
-    else
-    {
-        if ( !Calculate3(M,pQ) )
-            return false;
+            // B = R^(-1) * Q' * Y <=> B = R^(-1) * Z <=> R * B = Z
+            // result Z should have zeros for index>=K; if not, ignore values
+            for (SCSIZE col = 0; col < K ; col++)
+            {
+                pSlopes->PutDouble( pMatZ->GetDouble(col), col);
+            }
+            lcl_SolveWithUpperRightTriangle(pMatX, aVecR, pSlopes, K, false);
+            double fIntercept = 0.0;
+            if (bConstant)
+                fIntercept = fMeanY - lcl_GetSumProduct(pMeans,pSlopes,K);
+            // Fill first line in result matrix
+            pResMat->PutDouble(_bRKP ? exp(fIntercept) : fIntercept, K, 0 );
+            for (SCSIZE i = 0; i < K; i++)
+                pResMat->PutDouble(_bRKP ? exp(pSlopes->GetDouble(i))
+                                   : pSlopes->GetDouble(i) , K-1-i, 0);
 
-    }
-    for (SCSIZE i = 0; i < M+1; i++)
-    {
-        const double d = pQ->GetDouble(M-i,M+1);
-        pResMat->PutDouble(_bExp ? exp(d) : d, i, 0);
-    } // for (SCSIZE i = 0; i < M+1; i++)
-    return true;
-}
 
-ScMatrixRef ScInterpreter::Calculate2(const BOOL bConstant,const SCSIZE M ,const SCSIZE N,ScMatrixRef& pMatX,ScMatrixRef& pMatY,BYTE nCase)
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::Calculate2" );
-    SCSIZE i, j, k;
-    ScMatrixRef pQ = GetNewMat(M+1, M+2);
-    ScMatrixRef pE = GetNewMat(M+2, 1);
-    pE->PutDouble(0.0, M+1);
-    pQ->FillDouble(0.0, 0, 0, M, M+1);
-    if (nCase == 2)
-    {
-        for (k = 0; k < N; k++)
-        {
-            pE->PutDouble(
-                pE->GetDouble(M+1)+pMatY->GetDouble(k)*pMatY->GetDouble(k), M+1);
-            pQ->PutDouble(pQ->GetDouble(0, M+1) + pMatY->GetDouble(k), 0,   M+1);
-            pE->PutDouble(pQ->GetDouble(0, M+1), 0);
-            for (i = 0; i < M; i++)
+            if (bStats)
             {
-                pQ->PutDouble(pQ->GetDouble(0, i+1)+pMatX->GetDouble(i,k), 0, i+1);
-                pQ->PutDouble(pQ->GetDouble(0, i+1), i+1, 0);
-                pQ->PutDouble(pQ->GetDouble(i+1, M+1) +
-                         pMatX->GetDouble(i,k)*pMatY->GetDouble(k), i+1, M+1);
-                pE->PutDouble(pQ->GetDouble(i+1, M+1), i+1);
-                for (j = i; j < M; j++)
+                double fSSreg = 0.0;
+                double fSSresid = 0.0;
+                // re-use memory of Z;
+                pMatZ->FillDouble(0.0, 0, 0, 0, N-1);
+                // Z = R * Slopes
+                lcl_ApplyUpperRightTriangle(pMatX, aVecR, pSlopes, pMatZ, K, false);
+                // Z = Q * Z, that is Q * R * Slopes = X * Slopes
+                for (SCSIZE colp1 = K; colp1 > 0; colp1--)
                 {
-                    pQ->PutDouble(pQ->GetDouble(j+1, i+1) +
-                         pMatX->GetDouble(i,k)*pMatX->GetDouble(j,k), j+1, i+1);
-                    pQ->PutDouble(pQ->GetDouble(j+1, i+1), i+1, j+1);
+                    lcl_ApplyHouseholderTransformation(pMatX, colp1-1, pMatZ,N);
                 }
-            }
-        }
-    }
-    else
-    {
-        for (k = 0; k < N; k++)
-        {
-            pE->PutDouble(
-                pE->GetDouble(M+1)+pMatY->GetDouble(k)*pMatY->GetDouble(k), M+1);
-            pQ->PutDouble(pQ->GetDouble(0, M+1) + pMatY->GetDouble(k), 0,   M+1);
-            pE->PutDouble(pQ->GetDouble(0, M+1), 0);
-            for (i = 0; i < M; i++)
-            {
-                pQ->PutDouble(pQ->GetDouble(0, i+1)+pMatX->GetDouble(k,i), 0, i+1);
-                pQ->PutDouble(pQ->GetDouble(0, i+1), i+1, 0);
-                pQ->PutDouble(pQ->GetDouble(i+1, M+1) +
-                         pMatX->GetDouble(k,i)*pMatY->GetDouble(k), i+1, M+1);
-                pE->PutDouble(pQ->GetDouble(i+1, M+1), i+1);
-                for (j = i; j < M; j++)
+                fSSreg =lcl_GetSumProduct(pMatZ, pMatZ, N);
+                // re-use Y for residuals, Y = Y-Z
+                for (SCSIZE row = 0; row < N; row++)
+                    pMatY->PutDouble(pMatY->GetDouble(row) - pMatZ->GetDouble(row), row);
+                fSSresid = lcl_GetSumProduct(pMatY, pMatY, N);
+                pResMat->PutDouble(fSSreg, 0, 4);
+                pResMat->PutDouble(fSSresid, 1, 4);
+
+                double fDegreesFreedom =static_cast<double>( (bConstant) ? N-K-1 : N-K );
+                pResMat->PutDouble(fDegreesFreedom, 1, 3);
+
+                if (fDegreesFreedom == 0.0 || fSSresid == 0.0 || fSSreg == 0.0)
+                {   // exact fit; incl. observed values Y are identical
+                    pResMat->PutDouble(0.0, 1, 4); // SSresid
+                    // F = (SSreg/K) / (SSresid/df) = #DIV/0!
+                    pResMat->PutString(ScGlobal::GetRscString(STR_NV_STR), 0, 3); // F
+                    // RMSE = sqrt(SSresid / df) = sqrt(0 / df) = 0
+                    pResMat->PutDouble(0.0, 1, 2); // RMSE
+                    // SigmaSlope[i] = RMSE * sqrt(matrix[i,i]) = 0 * sqrt(...) = 0
+                    for (SCSIZE i=0; i<K; i++)
+                        pResMat->PutDouble(0.0, K-1-i, 1);
+
+                    // SigmaIntercept = RMSE * sqrt(...) = 0
+                    if (bConstant)
+                        pResMat->PutDouble(0.0, K, 1); //SigmaIntercept
+                    else
+                        pResMat->PutString(ScGlobal::GetRscString(STR_NV_STR), K, 1);
+
+                    //  R^2 = SSreg / (SSreg + SSresid) = 1.0
+                    pResMat->PutDouble(1.0, 0, 2); // R^2
+                }
+                else
                 {
-                    pQ->PutDouble(pQ->GetDouble(j+1, i+1) +
-                         pMatX->GetDouble(k, i)*pMatX->GetDouble(k, j), j+1, i+1);
-                    pQ->PutDouble(pQ->GetDouble(j+1, i+1), i+1, j+1);
+                    double fFstatistic = (fSSreg / static_cast<double>(K))
+                                         / (fSSresid / fDegreesFreedom);
+                    pResMat->PutDouble(fFstatistic, 0, 3);
+
+                    // standard error of estimate = root mean SSE
+                    double fRMSE = sqrt(fSSresid / fDegreesFreedom);
+                    pResMat->PutDouble(fRMSE, 1, 2);
+
+                    // standard error of slopes
+                    // = RMSE * sqrt(diagonal element of (R' R)^(-1) )
+                    // standard error of intercept
+                    // = RMSE * sqrt( Xmean * (R' R)^(-1) * Xmean' + 1/N)
+                    // (R' R)^(-1) = R^(-1) * (R')^(-1). Do not calculate it as
+                    // a whole matrix, but iterate over unit vectors.
+                    double fSigmaSlope = 0.0;
+                    double fSigmaIntercept = 0.0;
+                    double fPart; // for Xmean * single column of (R' R)^(-1)
+                    for (SCSIZE col = 0; col < K; col++)
+                    {
+                        //re-use memory of MatZ
+                        pMatZ->FillDouble(0.0,0,0,0,K-1); // Z = unit vector e
+                        pMatZ->PutDouble(1.0, col);
+                        //Solve R' * Z = e
+                        lcl_SolveWithLowerLeftTriangle(pMatX, aVecR, pMatZ, K, false);
+                        // Solve R * Znew = Zold
+                        lcl_SolveWithUpperRightTriangle(pMatX, aVecR, pMatZ, K, false);
+                        // now Z is column col in (R' R)^(-1)
+                        fSigmaSlope = fRMSE * sqrt(pMatZ->GetDouble(col));
+                        pResMat->PutDouble(fSigmaSlope, K-1-col, 1);
+                        // (R' R) ^(-1) is symmetric
+                        if (bConstant)
+                        {
+                            fPart = lcl_GetSumProduct(pMeans, pMatZ, K);
+                            fSigmaIntercept += fPart * pMeans->GetDouble(col);
+                        }
+                    }
+                    if (bConstant)
+                    {
+                        fSigmaIntercept = fRMSE
+                                          * sqrt(fSigmaIntercept + 1.0 / static_cast<double>(N));
+                        pResMat->PutDouble(fSigmaIntercept, K, 1);
+                    }
+                    else
+                    {
+                        pResMat->PutString(ScGlobal::GetRscString(STR_NV_STR), K, 1);
+                    }
+
+                    double fR2 = fSSreg / (fSSreg + fSSresid);
+                    pResMat->PutDouble(fR2, 0, 2);
                 }
             }
+            PushMatrix(pResMat);
         }
-    }
-    pQ->PutDouble((double)N, 0, 0);
-    if (bConstant)
-    {
-        SCSIZE S, L;
-        for (S = 0; S < M+1; S++)
+        else  // nCase == 3, Y is row, all matrices are transposed
         {
-            i = S;
-            while (i < M+1 && pQ->GetDouble(i, S) == 0.0)
-                i++;
-            if (i >= M+1)
+            ::std::vector< double> aVecR(N); // for QR decomposition
+            // Enough memory for needed matrices?
+            ScMatrixRef pMeans = GetNewMat(1, K); // mean of each row
+            ScMatrixRef pMatZ; // for Q' * Y , inter alia
+            if (bStats)
+                pMatZ = pMatY->Clone(); // Y is used in statistic, keep it
+            else
+                pMatZ = pMatY; // Y can be overwritten
+            ScMatrixRef pSlopes = GetNewMat(K,1); // from b1 to bK
+            if (!pMeans || !pMatZ || !pSlopes)
+            {
+                PushError(errCodeOverflow);
+                return;
+            }
+            if (bConstant)
+            {
+                lcl_CalculateRowMeans(pMatX, pMeans, N, K);
+                lcl_CalculateRowsDelta(pMatX, pMeans, N, K);
+            }
+
+            if (!lcl_TCalculateQRdecomposition(pMatX, aVecR, K, N))
             {
                 PushNoValue();
-                return ScMatrixRef();
+                return;
             }
-            double fVal;
-            for (L = 0; L < M+2; L++)
+
+            // Later on we will divide by elements of aVecR, so make sure
+            // that they aren't zero.
+            bool bIsSingular=false;
+            for (SCSIZE row=0; row < K && !bIsSingular; row++)
+                bIsSingular = bIsSingular || aVecR[row]==0.0;
+            if (bIsSingular)
             {
-                fVal = pQ->GetDouble(S, L);
-                pQ->PutDouble(pQ->GetDouble(i, L), S, L);
-                pQ->PutDouble(fVal, i, L);
+                PushNoValue();
+                return;
+            }
+            // Z = Q' Y
+            for (SCSIZE row = 0; row < K; row++)
+            {
+                lcl_TApplyHouseholderTransformation(pMatX, row, pMatZ, N);
             }
-            fVal = 1.0/pQ->GetDouble(S, S);
-            for (L = 0; L < M+2; L++)
-                pQ->PutDouble(pQ->GetDouble(S, L)*fVal, S, L);
-            for (i = 0; i < M+1; i++)
+            // B = R^(-1) * Q' * Y <=> B = R^(-1) * Z <=> R * B = Z
+            // result Z should have zeros for index>=K; if not, ignore values
+            for (SCSIZE col = 0; col < K ; col++)
             {
-                if (i != S)
+                pSlopes->PutDouble( pMatZ->GetDouble(col), col);
+            }
+            lcl_SolveWithUpperRightTriangle(pMatX, aVecR, pSlopes, K, true);
+            double fIntercept = 0.0;
+            if (bConstant)
+                fIntercept = fMeanY - lcl_GetSumProduct(pMeans,pSlopes,K);
+            // Fill first line in result matrix
+            pResMat->PutDouble(_bRKP ? exp(fIntercept) : fIntercept, K, 0 );
+            for (SCSIZE i = 0; i < K; i++)
+                pResMat->PutDouble(_bRKP ? exp(pSlopes->GetDouble(i))
+                                   : pSlopes->GetDouble(i) , K-1-i, 0);
+
+
+            if (bStats)
+            {
+                double fSSreg = 0.0;
+                double fSSresid = 0.0;
+                // re-use memory of Z;
+                pMatZ->FillDouble(0.0, 0, 0, N-1, 0);
+                // Z = R * Slopes
+                lcl_ApplyUpperRightTriangle(pMatX, aVecR, pSlopes, pMatZ, K, true);
+                // Z = Q * Z, that is Q * R * Slopes = X * Slopes
+                for (SCSIZE rowp1 = K; rowp1 > 0; rowp1--)
+                {
+                    lcl_TApplyHouseholderTransformation(pMatX, rowp1-1, pMatZ,N);
+                }
+                fSSreg =lcl_GetSumProduct(pMatZ, pMatZ, N);
+                // re-use Y for residuals, Y = Y-Z
+                for (SCSIZE col = 0; col < N; col++)
+                    pMatY->PutDouble(pMatY->GetDouble(col) - pMatZ->GetDouble(col), col);
+                fSSresid = lcl_GetSumProduct(pMatY, pMatY, N);
+                pResMat->PutDouble(fSSreg, 0, 4);
+                pResMat->PutDouble(fSSresid, 1, 4);
+
+                double fDegreesFreedom =static_cast<double>( (bConstant) ? N-K-1 : N-K );
+                pResMat->PutDouble(fDegreesFreedom, 1, 3);
+
+                if (fDegreesFreedom == 0.0 || fSSresid == 0.0 || fSSreg == 0.0)
+                {   // exact fit; incl. case observed values Y are identical
+                    pResMat->PutDouble(0.0, 1, 4); // SSresid
+                    // F = (SSreg/K) / (SSresid/df) = #DIV/0!
+                    pResMat->PutString(ScGlobal::GetRscString(STR_NV_STR), 0, 3); // F
+                    // RMSE = sqrt(SSresid / df) = sqrt(0 / df) = 0
+                    pResMat->PutDouble(0.0, 1, 2); // RMSE
+                    // SigmaSlope[i] = RMSE * sqrt(matrix[i,i]) = 0 * sqrt(...) = 0
+                    for (SCSIZE i=0; i<K; i++)
+                        pResMat->PutDouble(0.0, K-1-i, 1);
+
+                    // SigmaIntercept = RMSE * sqrt(...) = 0
+                    if (bConstant)
+                        pResMat->PutDouble(0.0, K, 1); //SigmaIntercept
+                    else
+                        pResMat->PutString(ScGlobal::GetRscString(STR_NV_STR), K, 1);
+
+                    //  R^2 = SSreg / (SSreg + SSresid) = 1.0
+                    pResMat->PutDouble(1.0, 0, 2); // R^2
+                }
+                else
                 {
-                    fVal = -pQ->GetDouble(i, S);
-                    for (L = 0; L < M+2; L++)
-                        pQ->PutDouble(
-                            pQ->GetDouble(i,L)+fVal*pQ->GetDouble(S,L),i,L);
+                    double fFstatistic = (fSSreg / static_cast<double>(K))
+                                         / (fSSresid / fDegreesFreedom);
+                    pResMat->PutDouble(fFstatistic, 0, 3);
+
+                    // standard error of estimate = root mean SSE
+                    double fRMSE = sqrt(fSSresid / fDegreesFreedom);
+                    pResMat->PutDouble(fRMSE, 1, 2);
+
+                    // standard error of slopes
+                    // = RMSE * sqrt(diagonal element of (R' R)^(-1) )
+                    // standard error of intercept
+                    // = RMSE * sqrt( Xmean * (R' R)^(-1) * Xmean' + 1/N)
+                    // (R' R)^(-1) = R^(-1) * (R')^(-1). Do not calculate it as
+                    // a whole matrix, but iterate over unit vectors.
+                    // (R' R) ^(-1) is symmetric
+                    double fSigmaSlope = 0.0;
+                    double fSigmaIntercept = 0.0;
+                    double fPart; // for Xmean * single col of (R' R)^(-1)
+                    for (SCSIZE row = 0; row < K; row++)
+                    {
+                        //re-use memory of MatZ
+                        pMatZ->FillDouble(0.0,0,0,K-1,0); // Z = unit vector e
+                        pMatZ->PutDouble(1.0, row);
+                        //Solve R' * Z = e
+                        lcl_SolveWithLowerLeftTriangle(pMatX, aVecR, pMatZ, K, true);
+                        // Solve R * Znew = Zold
+                        lcl_SolveWithUpperRightTriangle(pMatX, aVecR, pMatZ, K, true);
+                        // now Z is column col in (R' R)^(-1)
+                        fSigmaSlope = fRMSE * sqrt(pMatZ->GetDouble(row));
+                        pResMat->PutDouble(fSigmaSlope, K-1-row, 1);
+                        if (bConstant)
+                        {
+                            fPart = lcl_GetSumProduct(pMeans, pMatZ, K);
+                            fSigmaIntercept += fPart * pMeans->GetDouble(row);
+                        }
+                    }
+                    if (bConstant)
+                    {
+                        fSigmaIntercept = fRMSE
+                                          * sqrt(fSigmaIntercept + 1.0 / static_cast<double>(N));
+                        pResMat->PutDouble(fSigmaIntercept, K, 1);
+                    }
+                    else
+                    {
+                        pResMat->PutString(ScGlobal::GetRscString(STR_NV_STR), K, 1);
+                    }
+
+                    double fR2 = fSSreg / (fSSreg + fSSresid);
+                    pResMat->PutDouble(fR2, 0, 2);
                 }
             }
+            PushMatrix(pResMat);
         }
     }
-    else
-    {
-        if ( !Calculate3(M,pQ) )
-            return ScMatrixRef();
-    }
-    return pQ;
-}
-bool ScInterpreter::Calculate3(const SCSIZE M ,ScMatrixRef& pQ)
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::Calculate3" );
-    SCSIZE S, L;
-    for (S = 1; S < M+1; S++)
-    {
-        SCSIZE i = S;
-        while (i < M+1 && pQ->GetDouble(i, S) == 0.0)
-            i++;
-        if (i >= M+1)
-        {
-            PushNoValue();
-            return ScMatrixRef();
-        }
-        double fVal;
-        for (L = 1; L < M+2; L++)
-        {
-            fVal = pQ->GetDouble(S, L);
-            pQ->PutDouble(pQ->GetDouble(i, L), S, L);
-            pQ->PutDouble(fVal, i, L);
-        }
-        fVal = 1.0/pQ->GetDouble(S, S);
-        for (L = 1; L < M+2; L++)
-            pQ->PutDouble(pQ->GetDouble(S, L)*fVal, S, L);
-        for (i = 1; i < M+1; i++)
-        {
-            if (i != S)
-            {
-                fVal = -pQ->GetDouble(i, S);
-                for (L = 1; L < M+2; L++)
-                    pQ->PutDouble(
-                        pQ->GetDouble(i,L)+fVal*pQ->GetDouble(S,L),i,L);
-            }
-        }
-        pQ->PutDouble(0.0, 0, M+1);
-    } // for (S = 1; S < M+1; S++)
-    return true;
 }
 
 void ScInterpreter::ScTrend()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScTrend" );
-    CalculateTrendGrowth(FALSE);
+    CalculateTrendGrowth(false);
+}
+
+void ScInterpreter::ScGrowth()
+{
+    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGrowth" );
+    CalculateTrendGrowth(true);
 }
-void ScInterpreter::CalculateTrendGrowth(BOOL _bGrowth)
+
+void ScInterpreter::CalculateTrendGrowth(bool _bGrowth)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CalculateTrendGrowth" );
     BYTE nParamCount = GetByte();
-    if ( !MustHaveParamCount( nParamCount, 1, 4 ) )
+    if (!MustHaveParamCount( nParamCount, 1, 4 ))
         return;
-    BOOL bConstant;
+
+    // optional forth parameter
+    bool bConstant;
     if (nParamCount == 4)
         bConstant = GetBool();
     else
-        bConstant = TRUE;
-    ScMatrixRef pMatX;
-    ScMatrixRef pMatY;
+        bConstant = true;
+
+    // The third parameter may be missing in ODF, although the forth parameter
+    // is present. Default values depend on data not yet read.
     ScMatrixRef pMatNewX;
     if (nParamCount >= 3)
-        pMatNewX = GetMatrix();
+    {
+        if (IsMissing())
+        {
+            Pop();
+            pMatNewX = NULL;
+        }
+        else
+            pMatNewX = GetMatrix();
+    }
     else
         pMatNewX = NULL;
+
+    //In ODF1.2 empty second parameter (which is two ;; ) is allowed
+    //Defaults will be set in CheckMatrix
+    ScMatrixRef pMatX;
     if (nParamCount >= 2)
-        pMatX = GetMatrix();
+    {
+        if (IsMissing())
+        {
+            Pop();
+            pMatX = NULL;
+        }
+        else
+        {
+            pMatX = GetMatrix();
+        }
+    }
     else
         pMatX = NULL;
+
+    ScMatrixRef pMatY;
     pMatY = GetMatrix();
     if (!pMatY)
     {
         PushIllegalParameter();
         return;
-    } // if (!pMatY)
+    }
 
-    BYTE nCase;                         // 1 = normal, 2,3 = mehrfach
-    SCSIZE nCX, nCY;
-    SCSIZE nRX, nRY;
-    SCSIZE M = 0, N = 0;
-    if ( !CheckMatrix(_bGrowth,TRUE,nCase,nCX,nCY,nRX,nRY,M,N,pMatX,pMatY) )
+    // 1 = simple; 2 = multiple with Y as column; 3 = multiple with Y as row
+    BYTE nCase;
+
+    SCSIZE nCX, nCY; // number of columns
+    SCSIZE nRX, nRY; //number of rows
+    SCSIZE K = 0, N = 0; // K=number of variables X, N=number of data samples
+    if (!CheckMatrix(_bGrowth,nCase,nCX,nCY,nRX,nRY,K,N,pMatX,pMatY))
+    {
+        PushIllegalParameter();
         return;
+    }
 
+    // Enough data samples?
+    if ((bConstant && (N<K+1)) || (!bConstant && (N<K)) || (N<1) || (K<1))
+    {
+        PushIllegalParameter();
+        return;
+    }
 
+    // Set default pMatNewX if necessary
     SCSIZE nCXN, nRXN;
     SCSIZE nCountXN;
     if (!pMatNewX)
@@ -2603,128 +2973,224 @@ void ScInterpreter::CalculateTrendGrowth(BOOL _bGrowth)
         nCXN = nCX;
         nRXN = nRX;
         nCountXN = nCXN * nRXN;
-        pMatNewX = pMatX;
+        pMatNewX = pMatX->Clone(); // pMatX will be changed to X-meanX
     }
     else
     {
         pMatNewX->GetDimensions(nCXN, nRXN);
-        if ((nCase == 2 && nCX != nCXN) || (nCase == 3 && nRX != nRXN))
+        if ((nCase == 2 && K != nCXN) || (nCase == 3 && K != nRXN))
         {
             PushIllegalArgument();
             return;
         }
         nCountXN = nCXN * nRXN;
-        for ( SCSIZE i = 0; i < nCountXN; i++ )
+        for (SCSIZE i = 0; i < nCountXN; i++)
             if (!pMatNewX->IsValue(i))
             {
                 PushIllegalArgument();
                 return;
             }
     }
-    ScMatrixRef pResMat;
+    ScMatrixRef pResMat; // size depends on nCase
     if (nCase == 1)
+        pResMat = GetNewMat(nCXN,nRXN);
+    else
+    {
+        if (nCase==2)
+            pResMat = GetNewMat(1,nRXN);
+        else
+            pResMat = GetNewMat(nCXN,1);
+    }
+    if (!pResMat)
+    {
+        PushError(errCodeOverflow);
+        return;
+    }
+    // Uses sum(x-MeanX)^2 and not [sum x^2]-N * MeanX^2 in case bConstant.
+    // Clone constant matrices, so that Mat = Mat - Mean is possible.
+    double fMeanY = 0.0;
+    if (bConstant)
     {
-        double fCount   = 0.0;
-        double fSumX    = 0.0;
-        double fSumSqrX = 0.0;
-        double fSumY    = 0.0;
-        double fSumSqrY = 0.0;
-        double fSumXY   = 0.0;
-        double fValX, fValY;
-        SCSIZE i;
-        for (i = 0; i < nCY; i++)
-            for (SCSIZE j = 0; j < nRY; j++)
-            {
-                fValX = pMatX->GetDouble(i,j);
-                fValY = pMatY->GetDouble(i,j);
-                fSumX    += fValX;
-                fSumSqrX += fValX * fValX;
-                fSumY    += fValY;
-                fSumSqrY += fValY * fValY;
-                fSumXY   += fValX*fValY;
-                fCount++;
-            }
-        if (fCount < 1.0)
+        ScMatrixRef pCopyX = pMatX->CloneIfConst();
+        ScMatrixRef pCopyY = pMatY->CloneIfConst();
+        if (!pCopyX || !pCopyY)
         {
-            PushNoValue();
+            PushError(errStackOverflow);
             return;
         }
-        else
+        pMatX = pCopyX;
+        pMatY = pCopyY;
+        // DeltaY is possible here; DeltaX depends on nCase, so later
+        fMeanY = lcl_GetMeanOverAll(pMatY, N);
+        for (SCSIZE i=0; i<N; i++)
         {
-            double f1 = fCount*fSumXY-fSumX*fSumY;
-            double fX = fCount*fSumSqrX-fSumX*fSumX;
-            double b, m;
-            if (bConstant)
-            {
-                b = fSumY/fCount - f1/fX*fSumX/fCount;
-                m = f1/fX;
-            }
-            else
+            pMatY->PutDouble( ::rtl::math::approxSub(pMatY->GetDouble(i),fMeanY), i );
+        }
+    }
+
+    if (nCase==1)
+    {
+        // calculate simple regression
+        double fMeanX = 0.0;
+        if (bConstant)
+        {   // Mat = Mat - Mean
+            fMeanX = lcl_GetMeanOverAll(pMatX, N);
+            for (SCSIZE i=0; i<N; i++)
             {
-                b = 0.0;
-                m = fSumXY/fSumSqrX;
+                pMatX->PutDouble( ::rtl::math::approxSub(pMatX->GetDouble(i),fMeanX), i );
             }
-            pResMat = GetNewMat(nCXN, nRXN);
-            if (!pResMat)
+        }
+        double fSumXY = lcl_GetSumProduct(pMatX,pMatY,N);
+        double fSumX2 = lcl_GetSumProduct(pMatX,pMatX,N);
+        if (fSumX2==0.0)
+        {
+            PushNoValue(); // all x-values are identical
+            return;
+        }
+        double fSlope = fSumXY / fSumX2;
+        double fIntercept = 0.0;
+        double fHelp;
+        if (bConstant)
+        {
+            fIntercept = fMeanY - fSlope * fMeanX;
+            for (SCSIZE i = 0; i < nCountXN; i++)
             {
-                PushIllegalArgument();
-                return;
+                fHelp = pMatNewX->GetDouble(i)*fSlope + fIntercept;
+                pResMat->PutDouble(_bGrowth ? exp(fHelp) : fHelp, i);
             }
-            for (i = 0; i < nCountXN; i++)
+        }
+        else
+        {
+            for (SCSIZE i = 0; i < nCountXN; i++)
             {
-                const double d = pMatNewX->GetDouble(i)*m+b;
-                pResMat->PutDouble(_bGrowth ? exp(d) : d, i);
+                fHelp = pMatNewX->GetDouble(i)*fSlope;
+                pResMat->PutDouble(_bGrowth ? exp(fHelp) : fHelp, i);
             }
         }
     }
-    else
+    else // calculate multiple regression;
     {
-        ScMatrixRef pQ = Calculate2(bConstant,M ,N,pMatX,pMatY,nCase);
-        if ( !pQ.Is() )
-            return;
-        if (nCase == 2)
+        if (nCase ==2) // Y is column
         {
-            pResMat = GetNewMat(1, nRXN);
-            if (!pResMat)
+            ::std::vector< double> aVecR(N); // for QR decomposition
+            // Enough memory for needed matrices?
+            ScMatrixRef pMeans = GetNewMat(K, 1); // mean of each column
+            ScMatrixRef pSlopes = GetNewMat(1,K); // from b1 to bK
+            if (!pMeans || !pSlopes)
             {
-                PushIllegalArgument();
+                PushError(errCodeOverflow);
+                return;
+            }
+            if (bConstant)
+            {
+                lcl_CalculateColumnMeans(pMatX, pMeans, K, N);
+                lcl_CalculateColumnsDelta(pMatX, pMeans, K, N);
+            }
+            if (!lcl_CalculateQRdecomposition(pMatX, aVecR, K, N))
+            {
+                PushNoValue();
+                return;
+            }
+            // Later on we will divide by elements of aVecR, so make sure
+            // that they aren't zero.
+            bool bIsSingular=false;
+            for (SCSIZE row=0; row < K && !bIsSingular; row++)
+                bIsSingular = bIsSingular || aVecR[row]==0.0;
+            if (bIsSingular)
+            {
+                PushNoValue();
                 return;
             }
-            double fVal;
-            for (SCSIZE i = 0; i < nRXN; i++)
+            // Z := Q' Y; Y is overwritten with result Z
+            for (SCSIZE col = 0; col < K; col++)
+            {
+                lcl_ApplyHouseholderTransformation(pMatX, col, pMatY, N);
+            }
+            // B = R^(-1) * Q' * Y <=> B = R^(-1) * Z <=> R * B = Z
+            // result Z should have zeros for index>=K; if not, ignore values
+            for (SCSIZE col = 0; col < K ; col++)
+            {
+                pSlopes->PutDouble( pMatY->GetDouble(col), col);
+            }
+            lcl_SolveWithUpperRightTriangle(pMatX, aVecR, pSlopes, K, false);
+
+            // Fill result matrix
+            lcl_MFastMult(pMatNewX,pSlopes,pResMat,nRXN,K,1);
+            if (bConstant)
             {
-                fVal = pQ->GetDouble(0, M+1);
-                for (SCSIZE j = 0; j < M; j++)
-                    fVal += pQ->GetDouble(j+1, M+1)*pMatNewX->GetDouble(j, i);
-                pResMat->PutDouble(_bGrowth ? exp(fVal) : fVal, i);
+                double fIntercept = fMeanY - lcl_GetSumProduct(pMeans,pSlopes,K);
+                for (SCSIZE row = 0; row < nRXN; row++)
+                    pResMat->PutDouble(pResMat->GetDouble(row)+fIntercept, row);
+            }
+            if (_bGrowth)
+            {
+                for (SCSIZE i = 0; i < nRXN; i++)
+                    pResMat->PutDouble(exp(pResMat->GetDouble(i)), i);
             }
         }
         else
-        {
-            pResMat = GetNewMat(nCXN, 1);
-            if (!pResMat)
+        { // nCase == 3, Y is row, all matrices are transposed
+
+            ::std::vector< double> aVecR(N); // for QR decomposition
+            // Enough memory for needed matrices?
+            ScMatrixRef pMeans = GetNewMat(1, K); // mean of each row
+            ScMatrixRef pSlopes = GetNewMat(K,1); // row from b1 to bK
+            if (!pMeans || !pSlopes)
             {
-                PushIllegalArgument();
+                PushError(errCodeOverflow);
                 return;
             }
-            double fVal;
-            for (SCSIZE i = 0; i < nCXN; i++)
+            if (bConstant)
+            {
+                lcl_CalculateRowMeans(pMatX, pMeans, N, K);
+                lcl_CalculateRowsDelta(pMatX, pMeans, N, K);
+            }
+            if (!lcl_TCalculateQRdecomposition(pMatX, aVecR, K, N))
             {
-                fVal = pQ->GetDouble(0, M+1);
-                for (SCSIZE j = 0; j < M; j++)
-                    fVal += pQ->GetDouble(j+1, M+1)*pMatNewX->GetDouble(i, j);
-                pResMat->PutDouble(_bGrowth ? exp(fVal) : fVal, i);
+                PushNoValue();
+                return;
+            }
+            // Later on we will divide by elements of aVecR, so make sure
+            // that they aren't zero.
+            bool bIsSingular=false;
+            for (SCSIZE row=0; row < K && !bIsSingular; row++)
+                bIsSingular = bIsSingular || aVecR[row]==0.0;
+            if (bIsSingular)
+            {
+                PushNoValue();
+                return;
+            }
+            // Z := Q' Y; Y is overwritten with result Z
+            for (SCSIZE row = 0; row < K; row++)
+            {
+                lcl_TApplyHouseholderTransformation(pMatX, row, pMatY, N);
+            }
+            // B = R^(-1) * Q' * Y <=> B = R^(-1) * Z <=> R * B = Z
+            // result Z should have zeros for index>=K; if not, ignore values
+            for (SCSIZE col = 0; col < K ; col++)
+            {
+                pSlopes->PutDouble( pMatY->GetDouble(col), col);
+            }
+            lcl_SolveWithUpperRightTriangle(pMatX, aVecR, pSlopes, K, true);
+
+            // Fill result matrix
+            lcl_MFastMult(pSlopes,pMatNewX,pResMat,1,K,nCXN);
+            if (bConstant)
+            {
+                double fIntercept = fMeanY - lcl_GetSumProduct(pMeans,pSlopes,K);
+                for (SCSIZE col = 0; col < nCXN; col++)
+                    pResMat->PutDouble(pResMat->GetDouble(col)+fIntercept, col);
+            }
+            if (_bGrowth)
+            {
+                for (SCSIZE i = 0; i < nCXN; i++)
+                    pResMat->PutDouble(exp(pResMat->GetDouble(i)), i);
             }
         }
     }
     PushMatrix(pResMat);
 }
 
-void ScInterpreter::ScGrowth()
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScGrowth" );
-    CalculateTrendGrowth(TRUE);
-}
 
 void ScInterpreter::ScMatRef()
 {
diff --git a/sc/source/core/tool/makefile.mk b/sc/source/core/tool/makefile.mk
index b1cad5831a28..76f3b2c5a5b6 100644
--- a/sc/source/core/tool/makefile.mk
+++ b/sc/source/core/tool/makefile.mk
@@ -44,9 +44,21 @@ AUTOSEG=true
 # --- Files --------------------------------------------------------
 
 SLOFILES =  \
+        $(EXCEPTIONSFILES) \
+        $(SLO)$/addinhelpid.obj \
+        $(SLO)$/detdata.obj  \
+        $(SLO)$/filtopt.obj \
+        $(SLO)$/hints.obj \
+        $(SLO)$/inputopt.obj \
+        $(SLO)$/navicfg.obj \
+        $(SLO)$/printopt.obj \
+        $(SLO)$/rechead.obj  \
+        $(SLO)$/refdata.obj \
+        $(SLO)$/refreshtimer.obj
+
+EXCEPTIONSFILES= \
         $(SLO)$/addincfg.obj \
         $(SLO)$/addincol.obj \
-        $(SLO)$/addinhelpid.obj \
         $(SLO)$/addinlis.obj \
         $(SLO)$/address.obj \
         $(SLO)$/adiasync.obj \
@@ -55,11 +67,11 @@ SLOFILES =  \
         $(SLO)$/callform.obj \
         $(SLO)$/cellform.obj \
         $(SLO)$/cellkeytranslator.obj \
-        $(SLO)$/charthelper.obj \
         $(SLO)$/chartarr.obj \
-        $(SLO)$/chartpos.obj \
+        $(SLO)$/charthelper.obj \
         $(SLO)$/chartlis.obj \
         $(SLO)$/chartlock.obj \
+        $(SLO)$/chartpos.obj \
         $(SLO)$/chgtrack.obj \
         $(SLO)$/chgviset.obj \
         $(SLO)$/collect.obj  \
@@ -67,15 +79,11 @@ SLOFILES =  \
         $(SLO)$/consoli.obj  \
         $(SLO)$/dbcolect.obj \
         $(SLO)$/ddelink.obj \
-        $(SLO)$/detdata.obj  \
-        $(SLO)$/detfunc.obj  \
+        $(SLO)$/detfunc.obj \
         $(SLO)$/docoptio.obj \
         $(SLO)$/doubleref.obj \
         $(SLO)$/editutil.obj \
-        $(SLO)$/filtopt.obj \
         $(SLO)$/formulaparserpool.obj \
-        $(SLO)$/hints.obj \
-        $(SLO)$/inputopt.obj \
         $(SLO)$/interpr1.obj \
         $(SLO)$/interpr2.obj \
         $(SLO)$/interpr3.obj \
@@ -83,11 +91,9 @@ SLOFILES =  \
         $(SLO)$/interpr5.obj \
         $(SLO)$/interpr6.obj \
         $(SLO)$/lookupcache.obj \
-        $(SLO)$/navicfg.obj \
         $(SLO)$/odffmap.obj \
         $(SLO)$/optutil.obj \
         $(SLO)$/parclass.obj \
-        $(SLO)$/printopt.obj \
         $(SLO)$/prnsave.obj \
         $(SLO)$/progress.obj \
         $(SLO)$/queryparam.obj \
@@ -95,10 +101,7 @@ SLOFILES =  \
         $(SLO)$/rangenam.obj \
         $(SLO)$/rangeseq.obj \
         $(SLO)$/rangeutl.obj \
-        $(SLO)$/rechead.obj  \
-        $(SLO)$/refdata.obj \
         $(SLO)$/reffind.obj \
-        $(SLO)$/refreshtimer.obj \
         $(SLO)$/reftokenhelper.obj \
         $(SLO)$/refupdat.obj \
         $(SLO)$/scmatrix.obj \
@@ -111,31 +114,6 @@ SLOFILES =  \
         $(SLO)$/viewopti.obj \
         $(SLO)$/zforauto.obj
 
-EXCEPTIONSFILES= \
-        $(SLO)$/addincol.obj \
-        $(SLO)$/cellkeytranslator.obj \
-        $(SLO)$/charthelper.obj \
-        $(SLO)$/chartarr.obj \
-        $(SLO)$/chartlis.obj \
-        $(SLO)$/chartlock.obj \
-        $(SLO)$/chgtrack.obj \
-        $(SLO)$/compiler.obj \
-        $(SLO)$/detfunc.obj \
-        $(SLO)$/doubleref.obj \
-        $(SLO)$/formulaparserpool.obj \
-        $(SLO)$/interpr1.obj \
-        $(SLO)$/interpr2.obj \
-        $(SLO)$/interpr3.obj \
-        $(SLO)$/interpr4.obj \
-        $(SLO)$/interpr5.obj \
-        $(SLO)$/lookupcache.obj \
-        $(SLO)$/prnsave.obj \
-        $(SLO)$/queryparam.obj \
-        $(SLO)$/reftokenhelper.obj \
-        $(SLO)$/simplerangelist.obj \
-        $(SLO)$/stringutil.obj \
-        $(SLO)$/token.obj
-
 # [kh] POWERPC compiler problem
 .IF "$(OS)$(COM)$(CPUNAME)"=="LINUXGCCPOWERPC"
 NOOPTFILES= \
diff --git a/sc/source/core/tool/navicfg.cxx b/sc/source/core/tool/navicfg.cxx
index a0b9b629bc34..703c15175536 100644
--- a/sc/source/core/tool/navicfg.cxx
+++ b/sc/source/core/tool/navicfg.cxx
@@ -42,7 +42,7 @@
 //------------------------------------------------------------------
 
 ScNavipiCfg::ScNavipiCfg() :
-//! ConfigItem( OUString::createFromAscii( CFGPATH_NAVIPI ) ),
+//! ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_NAVIPI )) ),
     nListMode(0),
     nDragMode(0),
     nRootType(0)
diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx
index f895bbc0a6ca..98f1c01eb3f2 100644
--- a/sc/source/core/tool/printopt.cxx
+++ b/sc/source/core/tool/printopt.cxx
@@ -147,7 +147,7 @@ Sequence<OUString> ScPrintCfg::GetPropertyNames()
 }
 
 ScPrintCfg::ScPrintCfg() :
-    ConfigItem( OUString::createFromAscii( CFGPATH_PRINT ) )
+    ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_PRINT )) )
 {
     Sequence<OUString> aNames = GetPropertyNames();
     Sequence<Any> aValues = GetProperties(aNames);
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index 6cae0b6d2f24..f577be9b12bb 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -881,7 +881,7 @@ static void lcl_appendCellRangeAddress(
 void ScRangeStringConverter::GetStringFromXMLRangeString( OUString& rString, const OUString& rXMLRange, ScDocument* pDoc )
 {
     FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
-    const OUString aRangeSep = GetScCompilerNativeSymbol(ocSep);
+    const OUString aRangeSep = ScCompiler::GetNativeSymbol(ocSep);
     const sal_Unicode cSep = ' ';
     const sal_Unicode cQuote = '\'';
 
diff --git a/sc/source/core/tool/reftokenhelper.cxx b/sc/source/core/tool/reftokenhelper.cxx
index eaf4b8134490..f61b9dc2b626 100644
--- a/sc/source/core/tool/reftokenhelper.cxx
+++ b/sc/source/core/tool/reftokenhelper.cxx
@@ -49,7 +49,7 @@ using ::rtl::OUString;
 void ScRefTokenHelper::compileRangeRepresentation(
     vector<ScSharedTokenRef>& rRefTokens, const OUString& rRangeStr, ScDocument* pDoc, FormulaGrammar::Grammar eGrammar)
 {
-    const sal_Unicode cSep = GetScCompilerNativeSymbol(ocSep).GetChar(0);
+    const sal_Unicode cSep = ScCompiler::GetNativeSymbol(ocSep).GetChar(0);
     const sal_Unicode cQuote = '\'';
 
     // #i107275# ignore parentheses
diff --git a/sc/source/core/tool/unitconv.cxx b/sc/source/core/tool/unitconv.cxx
index 918060b12751..cd2cb0eb0496 100644
--- a/sc/source/core/tool/unitconv.cxx
+++ b/sc/source/core/tool/unitconv.cxx
@@ -109,7 +109,7 @@ ScUnitConverter::ScUnitConverter( USHORT nInit, USHORT nDeltaP ) :
     //  read from configuration - "convert.ini" is no longer used
     //! config item as member to allow change of values
 
-    ScLinkConfigItem aConfigItem( OUString::createFromAscii( CFGPATH_UNIT ) );
+    ScLinkConfigItem aConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_UNIT )) );
 
     // empty node name -> use the config item's path itself
     OUString aEmptyString;
@@ -130,11 +130,11 @@ ScUnitConverter::ScUnitConverter( USHORT nInit, USHORT nDeltaP ) :
             sPrefix += sSlash;
 
             pValNameArray[nIndex] = sPrefix;
-            pValNameArray[nIndex++] += OUString::createFromAscii( CFGSTR_UNIT_FROM );
+            pValNameArray[nIndex++] += OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_UNIT_FROM ));
             pValNameArray[nIndex] = sPrefix;
-            pValNameArray[nIndex++] += OUString::createFromAscii( CFGSTR_UNIT_TO );
+            pValNameArray[nIndex++] += OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_UNIT_TO ));
             pValNameArray[nIndex] = sPrefix;
-            pValNameArray[nIndex++] += OUString::createFromAscii( CFGSTR_UNIT_FACTOR );
+            pValNameArray[nIndex++] += OUString(RTL_CONSTASCII_USTRINGPARAM( CFGSTR_UNIT_FACTOR ));
         }
 
         Sequence<Any> aProperties = aConfigItem.GetProperties(aValNames);
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 4c01f443d0db..68feb2cca82b 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -406,10 +406,10 @@ Sequence<OUString> ScViewCfg::GetGridPropertyNames()
     //  adjust for metric system
     if (ScOptionsUtil::IsMetricSystem())
     {
-        pNames[SCGRIDOPT_RESOLU_X] = OUString::createFromAscii( "Resolution/XAxis/Metric" );
-        pNames[SCGRIDOPT_RESOLU_Y] = OUString::createFromAscii( "Resolution/YAxis/Metric" );
-        pNames[SCGRIDOPT_OPTION_X] = OUString::createFromAscii( "Option/XAxis/Metric" );
-        pNames[SCGRIDOPT_OPTION_Y] = OUString::createFromAscii( "Option/YAxis/Metric" );
+        pNames[SCGRIDOPT_RESOLU_X] = OUString(RTL_CONSTASCII_USTRINGPARAM( "Resolution/XAxis/Metric" ));
+        pNames[SCGRIDOPT_RESOLU_Y] = OUString(RTL_CONSTASCII_USTRINGPARAM( "Resolution/YAxis/Metric" ));
+        pNames[SCGRIDOPT_OPTION_X] = OUString(RTL_CONSTASCII_USTRINGPARAM( "Option/XAxis/Metric" ));
+        pNames[SCGRIDOPT_OPTION_Y] = OUString(RTL_CONSTASCII_USTRINGPARAM( "Option/YAxis/Metric" ));
     }
 
     return aNames;
@@ -417,9 +417,9 @@ Sequence<OUString> ScViewCfg::GetGridPropertyNames()
 
 
 ScViewCfg::ScViewCfg() :
-    aLayoutItem( OUString::createFromAscii( CFGPATH_LAYOUT ) ),
-    aDisplayItem( OUString::createFromAscii( CFGPATH_DISPLAY ) ),
-    aGridItem( OUString::createFromAscii( CFGPATH_GRID ) )
+    aLayoutItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_LAYOUT )) ),
+    aDisplayItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_DISPLAY )) ),
+    aGridItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFGPATH_GRID )) )
 {
     sal_Int32 nIntVal = 0;
 
diff --git a/sc/source/filter/dif/makefile.mk b/sc/source/filter/dif/makefile.mk
index 70944b9f9536..495a7ab5edf3 100644
--- a/sc/source/filter/dif/makefile.mk
+++ b/sc/source/filter/dif/makefile.mk
@@ -42,10 +42,14 @@ PROJECTPCHSOURCE=..\pch\filt_pch
 
 # --- Files --------------------------------------------------------
 
-SLOFILES =					\
+SLOFILES = \
+        $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
         $(SLO)$/difimp.obj	\
         $(SLO)$/difexp.obj
 
+
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx
index 085f38129c33..6bd9a1388513 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -88,6 +88,7 @@
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <oox/core/tokens.hxx>
+#include <boost/shared_ptr.hpp>
 
 using ::rtl::OString;
 
@@ -131,9 +132,7 @@ static void lcl_AddWorkbookProtection( XclExpRecordList<>& aRecList, ExcTable& s
     {
         aRecList.AppendNewRecord( new XclExpWindowProtection(pProtect->isOptionEnabled(ScDocProtection::WINDOWS)) );
         aRecList.AppendNewRecord( new XclExpProtection(pProtect->isOptionEnabled(ScDocProtection::STRUCTURE)) );
-#if ENABLE_SHEET_PROTECTION
         aRecList.AppendNewRecord( new XclExpPassHash(pProtect->getPasswordHash(PASSHASH_XL)) );
-#endif
     }
 
     aRecList.AppendNewRecord( new XclExpXmlEndSingleElementRecord() );   // XML_workbookProtection
@@ -439,7 +438,7 @@ void ExcTable::FillAsTable( SCTAB nCodeNameIdx )
 
 
     // WSBOOL needs data from page settings, create it here, add it later
-    ScfRef< XclExpPageSettings > xPageSett( new XclExpPageSettings( GetRoot() ) );
+    boost::shared_ptr< XclExpPageSettings > xPageSett( new XclExpPageSettings( GetRoot() ) );
     bool bFitToPages = xPageSett->GetPageData().mbFitToPages;
 
     if( eBiff <= EXC_BIFF5 )
@@ -473,9 +472,7 @@ void ExcTable::FillAsTable( SCTAB nCodeNameIdx )
         Add( new XclExpProtection(true) );
         Add( new XclExpBoolRecord(0x00DD, pTabProtect->isOptionEnabled(ScTableProtection::SCENARIOS)) );
         Add( new XclExpBoolRecord(0x0063, pTabProtect->isOptionEnabled(ScTableProtection::OBJECTS)) );
-#if ENABLE_SHEET_PROTECTION
         Add( new XclExpPassHash(pTabProtect->getPasswordHash(PASSHASH_XL)) );
-#endif
     }
 
     // local link table: EXTERNCOUNT, EXTERNSHEET
@@ -548,7 +545,7 @@ void ExcTable::FillAsXmlTable( SCTAB nCodeNameIdx )
     RootData& rR = GetOldRoot();
 
     // WSBOOL needs data from page settings, create it here, add it later
-    ScfRef< XclExpPageSettings > xPageSett( new XclExpPageSettings( GetRoot() ) );
+    boost::shared_ptr< XclExpPageSettings > xPageSett( new XclExpPageSettings( GetRoot() ) );
     bool bFitToPages = xPageSett->GetPageData().mbFitToPages;
 
     Add( new ExcBof8 );
@@ -760,7 +757,7 @@ void ExcDocument::Write( SvStream& rSvStrm )
 
         aHeader.Write( aXclStrm );
 
-        DBG_ASSERT( maTableList.GetSize() == maBoundsheetList.GetSize(),
+        OSL_ENSURE( maTableList.GetSize() == maBoundsheetList.GetSize(),
             "ExcDocument::Write - different number of sheets and BOUNDSHEET records" );
 
         for( size_t nTab = 0, nTabCount = maTableList.GetSize(); nTab < nTabCount; ++nTab )
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index 92eb3b565666..9c7634e443c1 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -105,13 +105,99 @@
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/script/ModuleInfo.hpp>
+#include <com/sun/star/container/XIndexContainer.hpp>
+#include <com/sun/star/document/XFilter.hpp>
+#include <com/sun/star/document/XImporter.hpp>
+#include <comphelper/mediadescriptor.hxx>
 #include <cppuhelper/component_context.hxx>
 #include <sfx2/app.hxx>
 #include "xltoolbar.hxx"
 
+
 using namespace com::sun::star;
+using namespace ::comphelper;
 using ::rtl::OUString;
 
+//OleNameOverrideContainer
+
+typedef ::cppu::WeakImplHelper1< container::XNameContainer > OleNameOverrideContainer_BASE;
+
+class OleNameOverrideContainer : public OleNameOverrideContainer_BASE
+{
+private:
+    typedef std::hash_map< rtl::OUString, uno::Reference< container::XIndexContainer >, ::rtl::OUStringHash,
+       ::std::equal_to< ::rtl::OUString > > NamedIndexToOleName;
+    NamedIndexToOleName  IdToOleNameHash;
+    ::osl::Mutex m_aMutex;
+public:
+    // XElementAccess
+    virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException) { return  container::XIndexContainer::static_type(0); }
+    virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        return ( IdToOleNameHash.size() > 0 );
+    }
+    // XNameAcess
+    virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        if ( !hasByName(aName) )
+            throw container::NoSuchElementException();
+        return uno::makeAny( IdToOleNameHash[ aName ] );
+    }
+    virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw (uno::RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        uno::Sequence< ::rtl::OUString > aResult( IdToOleNameHash.size() );
+        NamedIndexToOleName::iterator it = IdToOleNameHash.begin();
+        NamedIndexToOleName::iterator it_end = IdToOleNameHash.end();
+        rtl::OUString* pName = aResult.getArray();
+        for (; it != it_end; ++it, ++pName )
+            *pName = it->first;
+        return aResult;
+    }
+    virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        return ( IdToOleNameHash.find( aName ) != IdToOleNameHash.end() );
+    }
+
+    // XElementAccess
+    virtual ::sal_Int32 SAL_CALL getCount(  ) throw (uno::RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        return IdToOleNameHash.size();
+    }
+    // XNameContainer
+    virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        if ( hasByName( aName ) )
+            throw container::ElementExistException();
+        uno::Reference< container::XIndexContainer > xElement;
+        if ( ! ( aElement >>= xElement ) )
+            throw lang::IllegalArgumentException();
+       IdToOleNameHash[ aName ] = xElement;
+    }
+    virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        if ( !hasByName( aName ) )
+            throw container::NoSuchElementException();
+        IdToOleNameHash.erase( IdToOleNameHash.find( aName ) );
+    }
+    virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        if ( !hasByName( aName ) )
+            throw container::NoSuchElementException();
+        uno::Reference< container::XIndexContainer > xElement;
+        if ( ! ( aElement >>= xElement ) )
+            throw lang::IllegalArgumentException();
+        IdToOleNameHash[ aName ] = xElement;
+    }
+};
+
 // defined in docfunc.cxx ( really this needs a new name )
 script::ModuleInfo lcl_InitModuleInfo( SfxObjectShell& rDocSh, String& sModule );
 
@@ -244,9 +330,10 @@ void ImportExcel8::ReadBasic( void )
         bool bLoadCode = pFilterOpt->IsLoadExcelBasicCode();
         bool bLoadExecutable = pFilterOpt->IsLoadExcelBasicExecutable();
         bool bLoadStrg = pFilterOpt->IsLoadExcelBasicStorage();
+        // #FIXME need to get rid of this, we can also do this from within oox
+        // via the "ooo.vba.VBAGlobals" service
         if( bLoadCode || bLoadStrg )
         {
-            SvxImportMSVBasic aBasicImport( *pShell, *xRootStrg, bLoadCode, bLoadStrg );
             bool bAsComment = !bLoadExecutable;
 
             if ( !bAsComment )
@@ -268,9 +355,45 @@ void ImportExcel8::ReadBasic( void )
 #endif
 
             }
-            aBasicImport.Import( EXC_STORAGE_VBA_PROJECT, EXC_STORAGE_VBA, bAsComment );
-            if ( !bAsComment )
-                GetObjectManager().SetOleNameOverrideInfo( aBasicImport.ControlNameForObjectId() );
+        }
+        try
+        {
+            uno::Reference< lang::XComponent > xComponent( pShell->GetModel(), uno::UNO_QUERY_THROW );
+            uno::Sequence< beans::NamedValue > aArgSeq( 1 );
+
+            // collect names of embedded form controls, as specified in the VBA project
+            aArgSeq[ 0 ].Name = CREATE_OUSTRING( "OleNameOverrideInfo" );
+            uno::Reference< container::XNameContainer > xOleNameOverrideSink( new OleNameOverrideContainer );
+            aArgSeq[ 0 ].Value <<= xOleNameOverrideSink;
+
+            uno::Sequence< uno::Any > aArgs( 2 );
+            // framework calls filter objects with factory as first argument
+            aArgs[ 0 ] <<= getProcessServiceFactory();
+            aArgs[ 1 ] <<= aArgSeq;
+
+            uno::Reference< document::XImporter > xImporter( ScfApiHelper::CreateInstanceWithArgs( CREATE_OUSTRING( "com.sun.star.comp.oox.ExcelVBAProjectFilter" ), aArgs ), uno::UNO_QUERY_THROW );
+            xImporter->setTargetDocument( xComponent );
+
+            MediaDescriptor aMediaDesc;
+            SfxMedium& rMedium = GetMedium();
+            SfxItemSet* pItemSet = rMedium.GetItemSet();
+            if( pItemSet )
+            {
+                if( const SfxStringItem* pItem = static_cast< const SfxStringItem* >( pItemSet->GetItem( SID_FILE_NAME ) ) )
+                    aMediaDesc[ MediaDescriptor::PROP_URL() ] <<= ::rtl::OUString( pItem->GetValue() );
+                if( const SfxStringItem* pItem = static_cast< const SfxStringItem* >( pItemSet->GetItem( SID_PASSWORD ) ) )
+                    aMediaDesc[ MediaDescriptor::PROP_PASSWORD() ] <<= ::rtl::OUString( pItem->GetValue() );
+            }
+            aMediaDesc[ MediaDescriptor::PROP_INPUTSTREAM() ] <<= rMedium.GetInputStream();
+            aMediaDesc[ MediaDescriptor::PROP_INTERACTIONHANDLER() ] <<= rMedium.GetInteractionHandler();
+
+            // call the filter
+            uno::Reference< document::XFilter > xFilter( xImporter, uno::UNO_QUERY_THROW );
+            xFilter->filter( aMediaDesc.getAsConstPropertyValueList() );
+            GetObjectManager().SetOleNameOverrideInfo( xOleNameOverrideSink );
+        }
+        catch( uno::Exception& )
+        {
         }
     }
 }
diff --git a/sc/source/filter/excel/makefile.mk b/sc/source/filter/excel/makefile.mk
index c9618737a516..636181c66446 100644
--- a/sc/source/filter/excel/makefile.mk
+++ b/sc/source/filter/excel/makefile.mk
@@ -45,63 +45,7 @@ VISIBILITY_HIDDEN=TRUE
 # --- Files --------------------------------------------------------
 
 SLOFILES =	\
-        $(SLO)$/colrowst.obj				\
-        $(SLO)$/excdoc.obj					\
-        $(SLO)$/excel.obj					\
-        $(SLO)$/excform.obj					\
-        $(SLO)$/excform8.obj				\
-        $(SLO)$/excimp8.obj					\
-        $(SLO)$/excrecds.obj				\
-        $(SLO)$/exctools.obj				\
-        $(SLO)$/expop2.obj					\
-        $(SLO)$/fontbuff.obj				\
-        $(SLO)$/frmbase.obj					\
-        $(SLO)$/impop.obj					\
-        $(SLO)$/namebuff.obj				\
-        $(SLO)$/read.obj					\
-        $(SLO)$/tokstack.obj				\
-        $(SLO)$/xechart.obj					\
-        $(SLO)$/xecontent.obj				\
-        $(SLO)$/xeescher.obj				\
-        $(SLO)$/xeformula.obj				\
-        $(SLO)$/xehelper.obj				\
-        $(SLO)$/xelink.obj					\
-        $(SLO)$/xename.obj					\
-        $(SLO)$/xepage.obj					\
-        $(SLO)$/xepivot.obj					\
-        $(SLO)$/xerecord.obj				\
-        $(SLO)$/xeroot.obj					\
-        $(SLO)$/xestream.obj				\
-        $(SLO)$/xestring.obj				\
-        $(SLO)$/xestyle.obj					\
-        $(SLO)$/xetable.obj					\
-        $(SLO)$/xeview.obj					\
-        $(SLO)$/xichart.obj					\
-        $(SLO)$/xicontent.obj				\
-        $(SLO)$/xiescher.obj				\
-        $(SLO)$/xiformula.obj				\
-        $(SLO)$/xihelper.obj				\
-        $(SLO)$/xilink.obj					\
-        $(SLO)$/xiname.obj					\
-        $(SLO)$/xipage.obj					\
-        $(SLO)$/xipivot.obj					\
-        $(SLO)$/xiroot.obj					\
-        $(SLO)$/xistream.obj				\
-        $(SLO)$/xistring.obj				\
-        $(SLO)$/xistyle.obj					\
-        $(SLO)$/xiview.obj					\
-        $(SLO)$/xladdress.obj				\
-        $(SLO)$/xlchart.obj					\
-        $(SLO)$/xlescher.obj				\
-        $(SLO)$/xlformula.obj				\
-        $(SLO)$/xlpage.obj					\
-        $(SLO)$/xlpivot.obj					\
-        $(SLO)$/xlroot.obj					\
-        $(SLO)$/xlstyle.obj					\
-        $(SLO)$/xltools.obj					\
-        $(SLO)$/xltracer.obj				\
-        $(SLO)$/xlview.obj \
-        $(SLO)$/xltoolbar.obj \
+        $(EXCEPTIONSFILES)
 
 .IF "$(OS)$(COM)$(CPUNAME)"=="LINUXGCCSPARC"
 NOOPTFILES = \
@@ -109,49 +53,62 @@ NOOPTFILES = \
 .ENDIF
 
 EXCEPTIONSFILES = \
-        $(SLO)$/excdoc.obj					\
-        $(SLO)$/excel.obj					\
-        $(SLO)$/excform.obj					\
+        $(SLO)$/colrowst.obj				\
+        $(SLO)$/excdoc.obj				\
+        $(SLO)$/excel.obj				\
+        $(SLO)$/excform.obj				\
         $(SLO)$/excform8.obj				\
-        $(SLO)$/excimp8.obj					\
+        $(SLO)$/excimp8.obj				\
         $(SLO)$/excrecds.obj				\
-        $(SLO)$/expop2.obj					\
-        $(SLO)$/impop.obj					\
+        $(SLO)$/exctools.obj				\
+        $(SLO)$/expop2.obj				\
+        $(SLO)$/fontbuff.obj				\
+        $(SLO)$/frmbase.obj				\
+        $(SLO)$/impop.obj				\
         $(SLO)$/namebuff.obj				\
+        $(SLO)$/read.obj				\
         $(SLO)$/tokstack.obj				\
+        $(SLO)$/xechart.obj				\
         $(SLO)$/xecontent.obj				\
         $(SLO)$/xeescher.obj				\
         $(SLO)$/xeformula.obj				\
         $(SLO)$/xehelper.obj				\
-        $(SLO)$/xelink.obj					\
-        $(SLO)$/xename.obj					\
-        $(SLO)$/xepage.obj					\
-        $(SLO)$/xepivot.obj					\
-        $(SLO)$/xechart.obj					\
+        $(SLO)$/xelink.obj				\
+        $(SLO)$/xename.obj				\
+        $(SLO)$/xepage.obj				\
+        $(SLO)$/xepivot.obj				\
+        $(SLO)$/xerecord.obj				\
+        $(SLO)$/xeroot.obj				\
         $(SLO)$/xestream.obj				\
         $(SLO)$/xestring.obj				\
-        $(SLO)$/xestyle.obj					\
-        $(SLO)$/xetable.obj					\
-        $(SLO)$/xeview.obj					\
-        $(SLO)$/xichart.obj					\
+        $(SLO)$/xestyle.obj				\
+        $(SLO)$/xetable.obj				\
+        $(SLO)$/xeview.obj				\
+        $(SLO)$/xichart.obj				\
         $(SLO)$/xicontent.obj				\
         $(SLO)$/xiescher.obj				\
+        $(SLO)$/xiformula.obj				\
         $(SLO)$/xihelper.obj				\
-        $(SLO)$/xilink.obj					\
-        $(SLO)$/xipage.obj					\
-        $(SLO)$/xipivot.obj					\
+        $(SLO)$/xilink.obj				\
+        $(SLO)$/xiname.obj				\
+        $(SLO)$/xipage.obj				\
+        $(SLO)$/xipivot.obj				\
+        $(SLO)$/xiroot.obj				\
         $(SLO)$/xistream.obj				\
         $(SLO)$/xistring.obj				\
-        $(SLO)$/xistyle.obj					\
+        $(SLO)$/xistyle.obj				\
+        $(SLO)$/xiview.obj				\
         $(SLO)$/xladdress.obj				\
-        $(SLO)$/xiescher.obj				\
-        $(SLO)$/xlchart.obj					\
+        $(SLO)$/xlchart.obj				\
+        $(SLO)$/xlescher.obj				\
         $(SLO)$/xlformula.obj				\
-        $(SLO)$/xlpivot.obj					\
-        $(SLO)$/xlroot.obj					\
-        $(SLO)$/xlstyle.obj					\
-        $(SLO)$/xltoolbar.obj \
-        $(SLO)$/xltools.obj					\
+        $(SLO)$/xlpage.obj				\
+        $(SLO)$/xlpivot.obj				\
+        $(SLO)$/xlroot.obj				\
+        $(SLO)$/xlstyle.obj				\
+        $(SLO)$/xltoolbar.obj				\
+        $(SLO)$/xltools.obj				\
+        $(SLO)$/xltracer.obj				\
         $(SLO)$/xlview.obj
 
 # --- Targets -------------------------------------------------------
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index 706aa9318622..516fd65cc27b 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -865,7 +865,6 @@ FltError ImportExcel8::Read( void )
                     eAkt = EXC_STATE_SHEET;
                     aIn.SeekGlobalPosition();
                     continue;   // next iteration in while loop
-//                break;    // unxsols warning: statement unreachable
                 case EXC_STATE_SHEET:
                     Eof();
                     eAkt = EXC_STATE_END;
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index 26d42d6c353b..b670ec90f164 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -134,7 +134,7 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclChRectangle& rRect )
 
 inline void lclSaveRecord( XclExpStream& rStrm, XclExpRecordRef xRec )
 {
-    if( xRec.is() )
+    if( xRec )
         xRec->Save( rStrm );
 }
 
@@ -142,7 +142,7 @@ inline void lclSaveRecord( XclExpStream& rStrm, XclExpRecordRef xRec )
 template< typename Type >
 void lclSaveRecord( XclExpStream& rStrm, XclExpRecordRef xRec, sal_uInt16 nRecId, Type nValue )
 {
-    if( xRec.is() )
+    if( xRec )
     {
         XclExpValueRecord< Type >( nRecId, nValue ).Save( rStrm );
         xRec->Save( rStrm );
@@ -639,12 +639,12 @@ void XclExpChEscherFormat::Convert( const ScfPropertySet& rPropSet, XclChObjectT
 
 bool XclExpChEscherFormat::IsValid() const
 {
-    return maData.mxEscherSet.is();
+    return maData.mxEscherSet;
 }
 
 void XclExpChEscherFormat::Save( XclExpStream& rStrm )
 {
-    if( maData.mxEscherSet.is() )
+    if( maData.mxEscherSet )
     {
         // replace RGB colors with palette indexes in the Escher container
         const XclExpPalette& rPal = GetPalette();
@@ -672,7 +672,7 @@ void XclExpChEscherFormat::WriteSubRecords( XclExpStream& rStrm )
 sal_uInt32 XclExpChEscherFormat::RegisterColor( sal_uInt16 nPropId )
 {
     sal_uInt32 nBGRValue;
-    if( maData.mxEscherSet.is() && maData.mxEscherSet->GetOpt( nPropId, nBGRValue ) )
+    if( maData.mxEscherSet && maData.mxEscherSet->GetOpt( nPropId, nBGRValue ) )
     {
         // swap red and blue
         Color aColor( RGB_COLORDATA(
@@ -686,7 +686,7 @@ sal_uInt32 XclExpChEscherFormat::RegisterColor( sal_uInt16 nPropId )
 
 void XclExpChEscherFormat::WriteBody( XclExpStream& rStrm )
 {
-    DBG_ASSERT( maData.mxEscherSet.is(), "XclExpChEscherFormat::WriteBody - missing property container" );
+    DBG_ASSERT( maData.mxEscherSet, "XclExpChEscherFormat::WriteBody - missing property container" );
     // write Escher property container via temporary memory stream
     SvMemoryStream aMemStrm;
     maData.mxEscherSet->Commit( aMemStrm );
@@ -1020,7 +1020,7 @@ void XclExpChSourceLink::ConvertNumFmt( const ScfPropertySet& rPropSet, bool bPe
 
 void XclExpChSourceLink::AppendString( const String& rStr )
 {
-    if (!mxString.is())
+    if (!mxString)
         return;
     XclExpStringHelper::AppendString( *mxString, GetRoot(), rStr );
 }
@@ -1028,7 +1028,7 @@ void XclExpChSourceLink::AppendString( const String& rStr )
 void XclExpChSourceLink::Save( XclExpStream& rStrm )
 {
     // CHFORMATRUNS record
-    if( mxString.is() && mxString->IsRich() )
+    if( mxString && mxString->IsRich() )
     {
         sal_Size nRecSize = (1 + mxString->GetFormatsCount()) * ((GetBiff() == EXC_BIFF8) ? 2 : 1);
         rStrm.StartRecord( EXC_ID_CHFORMATRUNS, nRecSize );
@@ -1038,7 +1038,7 @@ void XclExpChSourceLink::Save( XclExpStream& rStrm )
     // CHSOURCELINK record
     XclExpRecord::Save( rStrm );
     // CHSTRING record
-    if( mxString.is() && !mxString->IsEmpty() )
+    if( mxString && !mxString->IsEmpty() )
     {
         rStrm.StartRecord( EXC_ID_CHSTRING, 2 + mxString->GetSize() );
         rStrm << sal_uInt16( 0 ) << *mxString;
@@ -1861,7 +1861,7 @@ bool XclExpChSeries::ConvertDataSeries(
             maData.mnCategCount = mxCategLink->ConvertDataSequence( xXValueSeq, false, maData.mnValueCount );
 
             // size values of bubble charts
-            if( mxBubbleLink.is() )
+            if( mxBubbleLink )
                 mxBubbleLink->ConvertDataSequence( xBubbleSeq, false, maData.mnValueCount );
 
             // series formatting
@@ -2042,7 +2042,7 @@ void XclExpChSeries::CreateTrendLines( XDataSeriesRef xDataSeries )
         for( const Reference< XRegressionCurve >* pIt = pBeg; pIt != pEnd; ++pIt )
         {
             XclExpChSeriesRef xSeries = GetChartData().CreateSeries();
-            if( xSeries.is() && !xSeries->ConvertTrendLine( *this, *pIt ) )
+            if( xSeries && !xSeries->ConvertTrendLine( *this, *pIt ) )
                 GetChartData().RemoveLastSeries();
         }
     }
@@ -2066,7 +2066,7 @@ void XclExpChSeries::CreateErrorBar( const ScfPropertySet& rPropSet,
     if( rPropSet.GetBoolProperty( rShowPropName ) )
     {
         XclExpChSeriesRef xSeries = GetChartData().CreateSeries();
-        if( xSeries.is() && !xSeries->ConvertErrorBar( *this, rPropSet, nBarId ) )
+        if( xSeries && !xSeries->ConvertErrorBar( *this, rPropSet, nBarId ) )
             GetChartData().RemoveLastSeries();
     }
 }
@@ -2486,7 +2486,7 @@ void XclExpChTypeGroup::CreateDataSeries(
 {
     // let chart create series object with correct series index
     XclExpChSeriesRef xSeries = GetChartData().CreateSeries();
-    if( xSeries.is() )
+    if( xSeries )
     {
         if( xSeries->ConvertDataSeries( xDiagram, xDataSeries, maTypeInfo, GetGroupIdx(), GetFreeFormatIdx() ) )
             maSeries.AppendRecord( xSeries );
@@ -2538,7 +2538,7 @@ bool XclExpChTypeGroup::CreateStockSeries( Reference< XDataSeries > xDataSeries,
     bool bOk = false;
     // let chart create series object with correct series index
     XclExpChSeriesRef xSeries = GetChartData().CreateSeries();
-    if( xSeries.is() )
+    if( xSeries )
     {
         bOk = xSeries->ConvertStockSeries( xDataSeries,
             rValueRole, GetGroupIdx(), GetFreeFormatIdx(), bCloseSymbol );
@@ -2794,13 +2794,13 @@ XclExpChAxis::XclExpChAxis( const XclExpChRoot& rRoot, sal_uInt16 nAxisType ) :
 void XclExpChAxis::SetFont( XclExpChFontRef xFont, const Color& rColor, sal_uInt32 nColorId )
 {
     mxFont = xFont;
-    if( mxTick.is() )
+    if( mxTick )
         mxTick->SetFontColor( rColor, nColorId );
 }
 
 void XclExpChAxis::SetRotation( sal_uInt16 nRotation )
 {
-    if( mxTick.is() )
+    if( mxTick )
         mxTick->SetRotation( nRotation );
 }
 
@@ -2986,7 +2986,7 @@ sal_uInt16 XclExpChAxesSet::Convert( Reference< XDiagram > xDiagram, sal_uInt16
                         chart with existing type groups, insert all series into last
                         contained chart type group instead of creating a new group. */
                     XclExpChTypeGroupRef xLastGroup = GetLastTypeGroup();
-                    if( xLastGroup.is() && !(xTypeGroup->IsCombinable2d() && xLastGroup->IsCombinable2d()) )
+                    if( xLastGroup && !(xTypeGroup->IsCombinable2d() && xLastGroup->IsCombinable2d()) )
                     {
                         xLastGroup->ConvertSeries( xDiagram, *pIt, nApiAxesSetIdx, bPercent, bConnectBars );
                     }
@@ -3041,12 +3041,12 @@ sal_uInt16 XclExpChAxesSet::Convert( Reference< XDiagram > xDiagram, sal_uInt16
     if( xDiagram.is() && (GetAxesSetId() == EXC_CHAXESSET_PRIMARY) )
     {
         XclExpChTypeGroupRef xTypeGroup = GetFirstTypeGroup();
-        if( xTypeGroup.is() && xTypeGroup->Is3dWallChart() )
+        if( xTypeGroup && xTypeGroup->Is3dWallChart() )
         {
             // wall/floor formatting (3D charts)
-            if( mxXAxis.is() )
+            if( mxXAxis )
                 mxXAxis->ConvertWall( xDiagram );
-            if( mxYAxis.is() )
+            if( mxYAxis )
                 mxYAxis->ConvertWall( xDiagram );
         }
         else
@@ -3086,7 +3086,7 @@ sal_uInt16 XclExpChAxesSet::Convert( Reference< XDiagram > xDiagram, sal_uInt16
 bool XclExpChAxesSet::Is3dChart() const
 {
     XclExpChTypeGroupRef xTypeGroup = GetFirstTypeGroup();
-    return xTypeGroup.is() && xTypeGroup->Is3dChart();
+    return xTypeGroup && xTypeGroup->Is3dChart();
 }
 
 void XclExpChAxesSet::WriteSubRecords( XclExpStream& rStrm )
@@ -3098,7 +3098,7 @@ void XclExpChAxesSet::WriteSubRecords( XclExpStream& rStrm )
     lclSaveRecord( rStrm, mxXAxisTitle );
     lclSaveRecord( rStrm, mxYAxisTitle );
     lclSaveRecord( rStrm, mxZAxisTitle );
-    if( mxPlotFrame.is() )
+    if( mxPlotFrame )
     {
         XclExpEmptyRecord( EXC_ID_CHPLOTFRAME ).Save( rStrm );
         mxPlotFrame->Save( rStrm );
@@ -3154,7 +3154,7 @@ static void lcl_getChartSubTitle(const Reference<XChartDocument>& xChartDoc,
         return;
 
     OUString aTitle;
-    Any any = xProp->getPropertyValue( OUString::createFromAscii("String") );
+    Any any = xProp->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("String")) );
     if (any >>= aTitle)
         rSubTitle = aTitle;
 }
@@ -3245,7 +3245,7 @@ void XclExpChChart::RemoveLastSeries()
 
 void XclExpChChart::SetDataLabel( XclExpChTextRef xText )
 {
-    if( xText.is() )
+    if( xText )
         maLabels.AppendRecord( xText );
 }
 
@@ -3318,7 +3318,7 @@ XclExpChartDrawing::~XclExpChartDrawing()
 
 void XclExpChartDrawing::Save( XclExpStream& rStrm )
 {
-    if( mxObjRecs.is() )
+    if( mxObjRecs )
         mxObjRecs->Save( rStrm );
 }
 
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 139f9c4e4af7..0ddbe3a191f5 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -263,8 +263,8 @@ void XclExpSstImpl::SaveXml( XclExpXmlStream& rStrm )
         return;
 
     sax_fastparser::FSHelperPtr pSst = rStrm.CreateOutputStream(
-            OUString::createFromAscii( "xl/sharedStrings.xml" ),
-            OUString::createFromAscii( "sharedStrings.xml" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM( "xl/sharedStrings.xml") ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM( "sharedStrings.xml" )),
             rStrm.GetCurrentStream()->getOutputStream(),
             "application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml",
             "http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings" );
@@ -410,12 +410,20 @@ XclExpHyperlink::XclExpHyperlink( const XclExpRoot& rRoot, const SvxURLField& rU
     }
 
     // file link or URL
-    if( eProtocol == INET_PROT_FILE )
+    if( eProtocol == INET_PROT_FILE || eProtocol == INET_PROT_SMB )
     {
         sal_uInt16 nLevel;
         bool bRel;
         String aFileName( BuildFileName( nLevel, bRel, rUrl, rRoot ) );
 
+        if( eProtocol == INET_PROT_SMB )
+        {
+            // #n382718# (and #n261623#) Convert smb notation to '\\'
+            aFileName = aUrlObj.GetMainURL( INetURLObject::NO_DECODE );
+            aFileName = String( aFileName.GetBuffer() + 4 ); // skip the 'smb:' part
+            aFileName.SearchAndReplaceAll( '/', '\\' );
+        }
+
         if( !bRel )
             mnFlags |= EXC_HLINK_ABS;
         mnFlags |= EXC_HLINK_BODY;
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index 43abdbec64b8..a915aea33b79 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -89,6 +89,7 @@
 #include <oox/export/drawingml.hxx>
 #include <oox/export/chartexport.hxx>
 #include <oox/export/utils.hxx>
+#include <boost/shared_ptr.hpp>
 
 using ::rtl::OString;
 using ::rtl::OUString;
@@ -117,6 +118,8 @@ using ::oox::drawingml::ChartExport;
 
 #define  HMM2XL(x)        ((x)/26.5)+0.5
 
+#ifdef XLSX_OOXML_FUTURE
+// these function are only used within that context
 // Static Function Helpers
 static const char *ToHorizAlign( SdrTextHorzAdjust eAdjust )
 {
@@ -167,6 +170,7 @@ static void lcl_WriteAnchorVertex( sax_fastparser::FSHelperPtr rComments, Rectan
     rComments->writeEscaped( OUString::valueOf( aRect.Bottom() ) );
     rComments->endElement( FSNS( XML_xdr, XML_rowOff ) );
 }
+#endif
 
 static void lcl_GetFromTo( const XclExpRoot& rRoot, const Rectangle &aRect, INT32 nTab, Rectangle &aFrom, Rectangle &aTo )
 {
@@ -873,17 +877,6 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference<
 bool XclExpTbxControlObj::SetMacroLink( const ScriptEventDescriptor& rEvent )
 {
     return XclMacroHelper::SetMacroLink( rEvent, meEventType );
-/*
-    String aMacroName = XclControlHelper::ExtractFromMacroDescriptor( rEvent, meEventType );
-    if( aMacroName.Len() )
-    {
-        sal_uInt16 nExtSheet = GetLocalLinkManager().FindExtSheet( EXC_EXTSH_OWNDOC );
-        sal_uInt16 nNameIdx = GetNameManager().InsertMacroCall( aMacroName, true, false );
-        mxMacroLink = GetFormulaCompiler().CreateNameXFormula( nExtSheet, nNameIdx );
-        return true;
-    }
-    return false;
-*/
 }
 
 void XclExpTbxControlObj::WriteSubRecs( XclExpStream& rStrm )
@@ -1126,7 +1119,6 @@ void XclExpChartObj::SaveXml( XclExpXmlStream& rStrm )
         nChartCount++;
         aChartExport.WriteChartObj( mxShape, nChartCount );
         // TODO: get the correcto chart number
-        //WriteChartObj( pDrawing, rStrm );
     }
 
     pDrawing->singleElement( FSNS( XML_xdr, XML_clientData),
@@ -1162,9 +1154,7 @@ void XclExpChartObj::WriteChartObj( sax_fastparser::FSHelperPtr pDrawing, XclExp
     pDrawing->endElement( FSNS( XML_xdr, XML_nvGraphicFramePr ) );
 
     // visual chart properties
-    //pDrawing->startElement( FSNS( XML_xdr, XML_xfrm ), FSEND );
     WriteShapeTransformation( pDrawing, mxShape );
-    //pDrawing->endElement( FSNS( XML_xdr, XML_xfrm ) );
 
     // writer chart object
     pDrawing->startElement( FSNS( XML_a, XML_graphic ), FSEND );
@@ -1267,13 +1257,6 @@ XclExpNote::XclExpNote( const XclExpRoot& rRoot, const ScAddress& rScPos,
                     // AutoFill style would change if Postit.cxx object creation values are changed
                     OUString aCol(((XFillColorItem &)GETITEM(aItemSet, XFillColorItem , XATTR_FILLCOLOR)).GetValue());
                     mbAutoFill  = !aCol.getLength() && (GETITEMVALUE(aItemSet, XFillStyleItem, XATTR_FILLSTYLE, ULONG) == XFILL_SOLID);
-#if 0
-                    // TODO: Get AutoLine bool
-                    aCol = OUString(((XLineStartItem &)GETITEM(aItemSet, XLineStartItem, XATTR_LINESTART)).GetValue());
-                    mbAutoLine = !aCol.getLength() &&
-                                 (GETITEMVALUE(aItemSet, XLineStartWidthItem, XATTR_LINESTARTWIDTH, ULONG) == 200) &&
-                                 (GETITEMBOOL(aItemSet, XATTR_LINESTARTCENTER) == FALSE);
-#endif
                     mbAutoLine  = true;
                     mbRowHidden = (rRoot.GetDoc().RowHidden(maScPos.Row(),maScPos.Tab()));
                     mbColHidden = (rRoot.GetDoc().ColHidden(maScPos.Col(),maScPos.Tab()));
@@ -1361,14 +1344,8 @@ void XclExpNote::WriteXml( sal_Int32 nAuthorId, XclExpXmlStream& rStrm )
             FSEND );
     rComments->startElement( XML_text, FSEND );
     // OOXTODO: phoneticPr, rPh, r
-#if 0
-    rComments->startElement( XML_t, FSEND );
-    rComments->writeEscaped( XclXmlUtils::ToOUString( maOrigNoteText ) );
-    rComments->endElement ( XML_t );
-#else
-    if( mpNoteContents.is() )
+    if( mpNoteContents )
         mpNoteContents->WriteXml( rStrm );
-#endif
     rComments->endElement( XML_text );
 
 /*
@@ -1381,9 +1358,7 @@ void XclExpNote::WriteXml( sal_Int32 nAuthorId, XclExpXmlStream& rStrm )
         rComments->startElement( XML_commentPr,
                 XML_autoFill,       XclXmlUtils::ToPsz( mbAutoFill ),
                 XML_autoScale,      XclXmlUtils::ToPsz( mbAutoScale ),
-                // XML_autoLine,       XclXmlUtils::ToPsz( mbAutoLine ),
                 XML_colHidden,      XclXmlUtils::ToPsz( mbColHidden ),
-                // XML_defaultSize,    "true",
                 XML_locked,         XclXmlUtils::ToPsz( mbLocked ),
                 XML_rowHidden,      XclXmlUtils::ToPsz( mbRowHidden ),
                 XML_textHAlign,     ToHorizAlign( meTHA ),
@@ -1419,7 +1394,7 @@ XclMacroHelper::~XclMacroHelper()
 
 void XclMacroHelper::WriteMacroSubRec( XclExpStream& rStrm )
 {
-    if( mxMacroLink.is() )
+    if( mxMacroLink )
         WriteFormulaSubRec( rStrm, EXC_ID_OBJMACRO, *mxMacroLink );
 }
 
@@ -1565,9 +1540,9 @@ XclExpDffAnchorBase* XclExpObjectManager::CreateDffAnchor() const
     return new XclExpDffSheetAnchor( GetRoot() );
 }
 
-ScfRef< XclExpRecordBase > XclExpObjectManager::CreateDrawingGroup()
+boost::shared_ptr< XclExpRecordBase > XclExpObjectManager::CreateDrawingGroup()
 {
-    return ScfRef< XclExpRecordBase >( new XclExpMsoDrawingGroup( *mxEscherEx ) );
+    return boost::shared_ptr< XclExpRecordBase >( new XclExpMsoDrawingGroup( *mxEscherEx ) );
 }
 
 void XclExpObjectManager::StartSheet()
@@ -1575,7 +1550,7 @@ void XclExpObjectManager::StartSheet()
     mxObjList.reset( new XclExpObjList( GetRoot(), *mxEscherEx ) );
 }
 
-ScfRef< XclExpRecordBase > XclExpObjectManager::ProcessDrawing( SdrPage* pSdrPage )
+boost::shared_ptr< XclExpRecordBase > XclExpObjectManager::ProcessDrawing( SdrPage* pSdrPage )
 {
     if( pSdrPage )
         mxEscherEx->AddSdrPage( *pSdrPage );
@@ -1587,7 +1562,7 @@ ScfRef< XclExpRecordBase > XclExpObjectManager::ProcessDrawing( SdrPage* pSdrPag
     return mxObjList;
 }
 
-ScfRef< XclExpRecordBase > XclExpObjectManager::ProcessDrawing( const Reference< XShapes >& rxShapes )
+boost::shared_ptr< XclExpRecordBase > XclExpObjectManager::ProcessDrawing( const Reference< XShapes >& rxShapes )
 {
     if( rxShapes.is() )
         mxEscherEx->AddUnoShapes( rxShapes );
diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index 9e2b69f33bb0..951e8e1c768a 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -117,7 +117,7 @@ void XclExpOperandList::AppendOperand( sal_uInt16 nTokPos, XclFuncParamConv eCon
     rConvInfo.mbValType = bValType;
 }
 
-typedef ScfRef< XclExpOperandList > XclExpOperandListRef;
+typedef boost::shared_ptr< XclExpOperandList > XclExpOperandListRef;
 typedef ::std::vector< XclExpOperandListRef > XclExpOperandListVector;
 
 // ----------------------------------------------------------------------------
@@ -279,7 +279,7 @@ static const XclExpCompConfig spConfigTable[] =
 /** Working data of the formula compiler. Used to push onto a stack for recursive calls. */
 struct XclExpCompData
 {
-    typedef ScfRef< ScTokenArray > ScTokenArrayRef;
+    typedef boost::shared_ptr< ScTokenArray > ScTokenArrayRef;
 
     const XclExpCompConfig& mrCfg;          /// Configuration for current formula type.
     ScTokenArrayRef     mxOwnScTokArr;      /// Own clone of a Calc token array.
@@ -479,7 +479,7 @@ private:
     // ------------------------------------------------------------------------
 private:
     typedef ::std::map< XclFormulaType, XclExpCompConfig >  XclExpCompConfigMap;
-    typedef ScfRef< XclExpCompData >                        XclExpCompDataRef;
+    typedef boost::shared_ptr< XclExpCompData >             XclExpCompDataRef;
     typedef ::std::vector< XclExpCompDataRef >              XclExpCompDataVector;
 
     XclExpCompConfigMap maCfgMap;       /// Compiler configuration map for all formula types.
@@ -635,7 +635,7 @@ void XclExpFmlaCompImpl::Init( XclFormulaType eType, const ScTokenArray& rScTokA
         mxData->mpLinkMgr = mxData->mrCfg.mbLocalLinkMgr ? &GetLocalLinkManager() : &GetGlobalLinkManager();
 
         // token array iterator (use cloned token array if present)
-        mxData->maTokArrIt.Init( mxData->mxOwnScTokArr.is() ? *mxData->mxOwnScTokArr : rScTokArr, false );
+        mxData->maTokArrIt.Init( mxData->mxOwnScTokArr ? *mxData->mxOwnScTokArr : rScTokArr, false );
         mxData->mpRefLog = pRefLog;
     }
 }
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index f715b781fa4a..3aeb080cb316 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -318,7 +318,7 @@ String XclExpHyperlinkHelper::ProcessUrlField( const SvxURLField& rUrlField )
     if( GetBiff() == EXC_BIFF8 )    // no HLINK records in BIFF2-BIFF7
     {
         // there was/is already a HLINK record
-        mbMultipleUrls = mxLinkRec.is();
+        mbMultipleUrls = mxLinkRec;
 
         mxLinkRec.reset( new XclExpHyperlink( GetRoot(), rUrlField, maScPos ) );
 
@@ -335,7 +335,7 @@ String XclExpHyperlinkHelper::ProcessUrlField( const SvxURLField& rUrlField )
 
 bool XclExpHyperlinkHelper::HasLinkRecord() const
 {
-    return !mbMultipleUrls && mxLinkRec.is();
+    return !mbMultipleUrls && mxLinkRec;
 }
 
 XclExpHyperlinkHelper::XclExpHyperlinkRef XclExpHyperlinkHelper::GetLinkRecord()
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index 49520c08e0de..e419955936e4 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -106,7 +106,7 @@ private:
     virtual void        WriteAddData( XclExpStream& rStrm );
 
 private:
-    typedef ScfRef< XclExpCachedMatrix > XclExpCachedMatRef;
+    typedef boost::shared_ptr< XclExpCachedMatrix > XclExpCachedMatRef;
     XclExpCachedMatRef  mxMatrix;       /// Cached results of the DDE link.
 };
 
@@ -247,7 +247,7 @@ protected:
     void                WriteExtNameBuffer( XclExpStream& rStrm );
 
 private:
-    typedef ScfRef< XclExpExtNameBuffer >   XclExpExtNameBfrRef;
+    typedef boost::shared_ptr< XclExpExtNameBuffer >   XclExpExtNameBfrRef;
     XclExpExtNameBfrRef mxExtNameBfr;   /// List of EXTERNNAME records.
 };
 
@@ -936,7 +936,7 @@ XclExpExtNameDde::XclExpExtNameDde( const XclExpRoot& rRoot,
 
 void XclExpExtNameDde::WriteAddData( XclExpStream& rStrm )
 {
-    if( mxMatrix.is() )
+    if( mxMatrix )
         mxMatrix->Save( rStrm );
 }
 
@@ -1232,7 +1232,7 @@ public:
 bool XclExpCrnList::InsertValue( SCCOL nScCol, SCROW nScRow, const Any& rValue )
 {
     RecordRefType xLastRec = GetLastRecord();
-    if( xLastRec.is() && xLastRec->InsertValue( nScCol, nScRow, rValue ) )
+    if( xLastRec && xLastRec->InsertValue( nScCol, nScRow, rValue ) )
         return true;
     if( GetSize() == SAL_MAX_UINT16 )
         return false;
@@ -1326,7 +1326,7 @@ XclExpExtNameBuffer& XclExpExternSheetBase::GetExtNameBuffer()
 
 void XclExpExternSheetBase::WriteExtNameBuffer( XclExpStream& rStrm )
 {
-    if( mxExtNameBfr.is() )
+    if( mxExtNameBfr )
         mxExtNameBfr->Save( rStrm );
 }
 
@@ -1530,7 +1530,7 @@ void XclExpSupbook::Save( XclExpStream& rStrm )
 const XclExpString* XclExpSupbook::GetTabName( sal_uInt16 nSBTab ) const
 {
     XclExpXctRef xXct = maXctList.GetRecord( nSBTab );
-    return xXct.is() ? &xXct->GetTabName() : 0;
+    return xXct ? &xXct->GetTabName() : 0;
 }
 
 void XclExpSupbook::WriteBody( XclExpStream& rStrm )
@@ -1611,7 +1611,7 @@ XclExpXti XclExpSupbookBuffer::GetXti( sal_uInt16 nFirstXclTab, sal_uInt16 nLast
             pRefLogEntry->mnFirstXclTab = nFirstXclTab;
             pRefLogEntry->mnLastXclTab = nLastXclTab;
             XclExpSupbookRef xSupbook = maSupbookList.GetRecord( aXti.mnSupbook );
-            if( xSupbook.is() )
+            if( xSupbook )
                 xSupbook->FillRefLogEntry( *pRefLogEntry, aXti.mnFirstSBTab, aXti.mnLastSBTab );
         }
     }
@@ -1633,8 +1633,8 @@ void XclExpSupbookBuffer::StoreCellRange( const ScRange& rRange )
     {
         const XclExpSBIndex& rSBIndex = maSBIndexVec[ nXclTab ];
         XclExpSupbookRef xSupbook = maSupbookList.GetRecord( rSBIndex.mnSupbook );
-        DBG_ASSERT( xSupbook.is(), "XclExpSupbookBuffer::StoreCellRange - missing SUPBOOK record" );
-        if( xSupbook.is() )
+        DBG_ASSERT( xSupbook , "XclExpSupbookBuffer::StoreCellRange - missing SUPBOOK record" );
+        if( xSupbook )
             xSupbook->StoreCellRange( rRange, rSBIndex.mnSBTab );
     }
 }
@@ -1775,7 +1775,7 @@ bool XclExpSupbookBuffer::InsertAddIn(
     }
     else
         xSupbook = maSupbookList.GetRecord( mnAddInSB );
-    DBG_ASSERT( xSupbook.is(), "XclExpSupbookBuffer::InsertAddin - missing add-in supbook" );
+    DBG_ASSERT( xSupbook, "XclExpSupbookBuffer::InsertAddin - missing add-in supbook" );
     rnSupbook = mnAddInSB;
     rnExtName = xSupbook->InsertAddIn( rName );
     return rnExtName > 0;
@@ -1874,7 +1874,7 @@ XclExpXti XclExpSupbookBuffer::GetXti( sal_uInt16 nFileId, const String& rTabNam
     {
         pRefLogEntry->mnFirstXclTab = 0;
         pRefLogEntry->mnLastXclTab  = 0;
-        if (xSupbook.is())
+        if (xSupbook)
             xSupbook->FillRefLogEntry(*pRefLogEntry, aXti.mnFirstSBTab, aXti.mnLastSBTab);
     }
 
@@ -1989,7 +1989,7 @@ bool XclExpLinkManagerImpl5::InsertAddIn(
         sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, const String& rName )
 {
     XclExpExtSheetRef xExtSheet = FindInternal( rnExtSheet, EXC_EXTSH_ADDIN );
-    if( xExtSheet.is() )
+    if( xExtSheet )
     {
         rnExtName = xExtSheet->InsertAddIn( rName );
         return rnExtName > 0;
diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx
index 0a244a2109a6..2598a3f83b28 100644
--- a/sc/source/filter/excel/xename.cxx
+++ b/sc/source/filter/excel/xename.cxx
@@ -293,7 +293,7 @@ void XclExpName::SetSymbol( String sSymbol )
 
 bool XclExpName::IsVolatile() const
 {
-    return mxTokArr.is() && mxTokArr->IsVolatile();
+    return mxTokArr && mxTokArr->IsVolatile();
 }
 
 bool XclExpName::IsHidden() const
@@ -310,9 +310,9 @@ bool XclExpName::IsMacroCall( bool bVBasic, bool bFunc ) const
 
 void XclExpName::Save( XclExpStream& rStrm )
 {
-    DBG_ASSERT( mxName.is() && (mxName->Len() > 0), "XclExpName::Save - missing name" );
+    DBG_ASSERT( mxName && (mxName->Len() > 0), "XclExpName::Save - missing name" );
     DBG_ASSERT( !(IsGlobal() && ::get_flag( mnFlags, EXC_NAME_BUILTIN )), "XclExpName::Save - global built-in name" );
-    SetRecSize( 11 + mxName->GetSize() + (mxTokArr.is() ? mxTokArr->GetSize() : 2) );
+    SetRecSize( 11 + mxName->GetSize() + (mxTokArr ? mxTokArr->GetSize() : 2) );
     XclExpRecord::Save( rStrm );
 }
 
@@ -346,7 +346,7 @@ void XclExpName::SaveXml( XclExpXmlStream& rStrm )
 
 void XclExpName::WriteBody( XclExpStream& rStrm )
 {
-    sal_uInt16 nFmlaSize = mxTokArr.is() ? mxTokArr->GetSize() : 0;
+    sal_uInt16 nFmlaSize = mxTokArr ? mxTokArr->GetSize() : 0;
 
     rStrm   << mnFlags                  // flags
             << sal_uInt8( 0 );          // keyboard shortcut
@@ -357,7 +357,7 @@ void XclExpName::WriteBody( XclExpStream& rStrm )
             << sal_uInt32( 0 );         // length of menu/descr/help/status text
     mxName->WriteFlagField( rStrm );    // BIFF8 flag field (no-op in <=BIFF7)
     mxName->WriteBuffer( rStrm );       // character array of the name
-    if( mxTokArr.is() )
+    if( mxTokArr )
         mxTokArr->WriteArray( rStrm );  // token array without size
 }
 
@@ -505,7 +505,7 @@ sal_uInt16 XclExpNameManagerImpl::FindBuiltInNameIdx(
             if( xName->GetBuiltInName() == cBuiltIn )
             {
                 XclTokenArrayRef xTokArr = xName->GetTokenArray();
-                if( xTokArr.is() && (*xTokArr == rTokArr) )
+                if( xTokArr && (*xTokArr == rTokArr) )
                     return static_cast< sal_uInt16 >( nPos + 1 );
             }
         }
diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx
index 6a37382d70fe..29e0e47ea312 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -546,7 +546,7 @@ void XclExpPCField::InsertNumDateGroupItems( const ScDPObject& rDPObj, const ScD
         ScDPNumGroupDimension aTmpDim( rNumInfo );
         if( nDatePart != 0 )
             aTmpDim.MakeDateHelper( rNumInfo, nDatePart );
-        const std::vector< SCROW > aMemberIds = aTmpDim.GetNumEntries(  static_cast< SCCOL >( GetBaseFieldIndex() ), aDPData.GetCacheTable().GetCache(), aOrignial );
+        const std::vector< SCROW > aMemberIds = aTmpDim.GetNumEntries(  static_cast< SCCOL >( GetBaseFieldIndex() ), aDPData.GetCacheTable().getCache(), aOrignial );
         for ( size_t  nIdx = 0 ; nIdx < aMemberIds.size(); nIdx++ )
         {
             const ScDPItemData* pData = aDPData.GetMemberById(  static_cast< long >( GetBaseFieldIndex() ) , aMemberIds[ nIdx] );
@@ -1685,7 +1685,7 @@ void XclExpPivotTable::WriteSxpi( XclExpStream& rStrm ) const
         for( ScfUInt16Vec::const_iterator aIt = maPageFields.begin(), aEnd = maPageFields.end(); aIt != aEnd; ++aIt )
         {
             XclExpPTFieldRef xField = maFieldList.GetRecord( *aIt );
-            if( xField.is() )
+            if( xField )
                 xField->WriteSxpiEntry( rStrm );
         }
         rStrm.EndRecord();
@@ -1697,7 +1697,7 @@ void XclExpPivotTable::WriteSxdiList( XclExpStream& rStrm ) const
     for( XclPTDataFieldPosVec::const_iterator aIt = maDataFields.begin(), aEnd = maDataFields.end(); aIt != aEnd; ++aIt )
     {
         XclExpPTFieldRef xField = maFieldList.GetRecord( aIt->first );
-        if( xField.is() )
+        if( xField )
             xField->WriteSxdi( rStrm, aIt->second );
     }
 }
diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx
index 27c844360f49..4b6169ceb20a 100644
--- a/sc/source/filter/excel/xeroot.cxx
+++ b/sc/source/filter/excel/xeroot.cxx
@@ -76,91 +76,91 @@ XclExpRoot::XclExpRoot( XclExpRootData& rExpRootData ) :
 
 XclExpTabInfo& XclExpRoot::GetTabInfo() const
 {
-    DBG_ASSERT( mrExpData.mxTabInfo.is(), "XclExpRoot::GetTabInfo - missing object (wrong BIFF?)" );
+    DBG_ASSERT( mrExpData.mxTabInfo, "XclExpRoot::GetTabInfo - missing object (wrong BIFF?)" );
     return *mrExpData.mxTabInfo;
 }
 
 XclExpAddressConverter& XclExpRoot::GetAddressConverter() const
 {
-    DBG_ASSERT( mrExpData.mxAddrConv.is(), "XclExpRoot::GetAddressConverter - missing object (wrong BIFF?)" );
+    DBG_ASSERT( mrExpData.mxAddrConv, "XclExpRoot::GetAddressConverter - missing object (wrong BIFF?)" );
     return *mrExpData.mxAddrConv;
 }
 
 XclExpFormulaCompiler& XclExpRoot::GetFormulaCompiler() const
 {
-    DBG_ASSERT( mrExpData.mxFmlaComp.is(), "XclExpRoot::GetFormulaCompiler - missing object (wrong BIFF?)" );
+    DBG_ASSERT( mrExpData.mxFmlaComp, "XclExpRoot::GetFormulaCompiler - missing object (wrong BIFF?)" );
     return *mrExpData.mxFmlaComp;
 }
 
 XclExpProgressBar& XclExpRoot::GetProgressBar() const
 {
-    DBG_ASSERT( mrExpData.mxProgress.is(), "XclExpRoot::GetProgressBar - missing object (wrong BIFF?)" );
+    DBG_ASSERT( mrExpData.mxProgress, "XclExpRoot::GetProgressBar - missing object (wrong BIFF?)" );
     return *mrExpData.mxProgress;
 }
 
 XclExpSst& XclExpRoot::GetSst() const
 {
-    DBG_ASSERT( mrExpData.mxSst.is(), "XclExpRoot::GetSst - missing object (wrong BIFF?)" );
+    DBG_ASSERT( mrExpData.mxSst, "XclExpRoot::GetSst - missing object (wrong BIFF?)" );
     return *mrExpData.mxSst;
 }
 
 XclExpPalette& XclExpRoot::GetPalette() const
 {
-    DBG_ASSERT( mrExpData.mxPalette.is(), "XclExpRoot::GetPalette - missing object (wrong BIFF?)" );
+    DBG_ASSERT( mrExpData.mxPalette, "XclExpRoot::GetPalette - missing object (wrong BIFF?)" );
     return *mrExpData.mxPalette;
 }
 
 XclExpFontBuffer& XclExpRoot::GetFontBuffer() const
 {
-    DBG_ASSERT( mrExpData.mxFontBfr.is(), "XclExpRoot::GetFontBuffer - missing object (wrong BIFF?)" );
+    DBG_ASSERT( mrExpData.mxFontBfr, "XclExpRoot::GetFontBuffer - missing object (wrong BIFF?)" );
     return *mrExpData.mxFontBfr;
 }
 
 XclExpNumFmtBuffer& XclExpRoot::GetNumFmtBuffer() const
 {
-    DBG_ASSERT( mrExpData.mxNumFmtBfr.is(), "XclExpRoot::GetNumFmtBuffer - missing object (wrong BIFF?)" );
+    DBG_ASSERT( mrExpData.mxNumFmtBfr, "XclExpRoot::GetNumFmtBuffer - missing object (wrong BIFF?)" );
     return *mrExpData.mxNumFmtBfr;
 }
 
 XclExpXFBuffer& XclExpRoot::GetXFBuffer() const
 {
-    DBG_ASSERT( mrExpData.mxXFBfr.is(), "XclExpRoot::GetXFBuffer - missing object (wrong BIFF?)" );
+    DBG_ASSERT( mrExpData.mxXFBfr, "XclExpRoot::GetXFBuffer - missing object (wrong BIFF?)" );
     return *mrExpData.mxXFBfr;
 }
 
 XclExpLinkManager& XclExpRoot::GetGlobalLinkManager() const
 {
-    DBG_ASSERT( mrExpData.mxGlobLinkMgr.is(), "XclExpRoot::GetGlobalLinkManager - missing object (wrong BIFF?)" );
+    DBG_ASSERT( mrExpData.mxGlobLinkMgr, "XclExpRoot::GetGlobalLinkManager - missing object (wrong BIFF?)" );
     return *mrExpData.mxGlobLinkMgr;
 }
 
 XclExpLinkManager& XclExpRoot::GetLocalLinkManager() const
 {
-    DBG_ASSERT( GetLocalLinkMgrRef().is(), "XclExpRoot::GetLocalLinkManager - missing object (wrong BIFF?)" );
+    DBG_ASSERT( GetLocalLinkMgrRef(), "XclExpRoot::GetLocalLinkManager - missing object (wrong BIFF?)" );
     return *GetLocalLinkMgrRef();
 }
 
 XclExpNameManager& XclExpRoot::GetNameManager() const
 {
-    DBG_ASSERT( mrExpData.mxNameMgr.is(), "XclExpRoot::GetNameManager - missing object (wrong BIFF?)" );
+    DBG_ASSERT( mrExpData.mxNameMgr, "XclExpRoot::GetNameManager - missing object (wrong BIFF?)" );
     return *mrExpData.mxNameMgr;
 }
 
 XclExpObjectManager& XclExpRoot::GetObjectManager() const
 {
-    DBG_ASSERT( mrExpData.mxObjMgr.is(), "XclExpRoot::GetObjectManager - missing object (wrong BIFF?)" );
+    DBG_ASSERT( mrExpData.mxObjMgr, "XclExpRoot::GetObjectManager - missing object (wrong BIFF?)" );
     return *mrExpData.mxObjMgr;
 }
 
 XclExpFilterManager& XclExpRoot::GetFilterManager() const
 {
-    DBG_ASSERT( mrExpData.mxFilterMgr.is(), "XclExpRoot::GetFilterManager - missing object (wrong BIFF?)" );
+    DBG_ASSERT( mrExpData.mxFilterMgr, "XclExpRoot::GetFilterManager - missing object (wrong BIFF?)" );
     return *mrExpData.mxFilterMgr;
 }
 
 XclExpPivotTableManager& XclExpRoot::GetPivotTableManager() const
 {
-    DBG_ASSERT( mrExpData.mxPTableMgr.is(), "XclExpRoot::GetPivotTableManager - missing object (wrong BIFF?)" );
+    DBG_ASSERT( mrExpData.mxPTableMgr, "XclExpRoot::GetPivotTableManager - missing object (wrong BIFF?)" );
     return *mrExpData.mxPTableMgr;
 }
 
@@ -231,7 +231,7 @@ XclExpRecordRef XclExpRoot::CreateRecord( sal_uInt16 nRecId ) const
         case EXC_ID_EXTERNSHEET:    xRec = GetLocalLinkMgrRef();    break;
         case EXC_ID_NAME:           xRec = mrExpData.mxNameMgr;     break;
     }
-    DBG_ASSERT( xRec.is(), "XclExpRoot::CreateRecord - unknown record ID or missing object" );
+    DBG_ASSERT( xRec, "XclExpRoot::CreateRecord - unknown record ID or missing object" );
     return xRec;
 }
 
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 660ddd48c014..219b1015aac5 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -369,7 +369,7 @@ void XclExpStream::SetEncrypter( XclExpEncrypterRef xEncrypter )
 
 bool XclExpStream::HasValidEncrypter() const
 {
-    return mxEncrypter.is() && mxEncrypter->IsValid();
+    return mxEncrypter && mxEncrypter->IsValid();
 }
 
 void XclExpStream::EnableEncryption( bool bEnable )
@@ -1110,18 +1110,6 @@ bool XclExpXmlStream::exportDocument() throw()
     mpRoot = &aRoot;
     aRoot.GetOldRoot().pER = &aRoot;
     aRoot.GetOldRoot().eDateiTyp = Biff8;
-#if 0 // FIXME: Re-write this block without using SotStorage.
-    if ( SvtFilterOptions* pOptions = SvtFilterOptions::Get() )
-        if ( pShell && pOptions->IsLoadExcelBasicStorage() )
-            if ( sal_uInt32 nError
-                 = SvxImportMSVBasic( *pShell, *rStorage,
-                                      pOptions->IsLoadExcelBasicCode(),
-                                      pOptions->IsLoadExcelBasicStorage() )
-                .SaveOrDelMSVBAStorage( true, EXC_STORAGE_VBA_PROJECT) )
-            {
-                pShell->SetError( nError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
-            }
-#endif
     // Get the viewsettings before processing
     if( pShell->GetViewData() )
         pShell->GetViewData()->WriteExtOptions( mpRoot->GetExtDocOptions() );
@@ -1200,7 +1188,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /* pServiceMan
         {
             Reference< XRegistryKey > xNewKey1(
                     static_cast< XRegistryKey* >( pRegistryKey )->createKey(
-                        OUString::createFromAscii( IMPL_NAME "/UNO/SERVICES/" ) ) );
+                        OUString(RTL_CONSTASCII_USTRINGPARAM( IMPL_NAME "/UNO/SERVICES/" )) ) );
             xNewKey1->createKey( XlsxExport_getSupportedServiceNames().getConstArray()[0] );
 
             bRet = sal_True;
@@ -1225,7 +1213,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplN
 
     if ( rtl_str_compare( pImplName, IMPL_NAME ) == 0 )
     {
-        const OUString aServiceName( OUString::createFromAscii( IMPL_NAME ) );
+        const OUString aServiceName(RTL_CONSTASCII_USTRINGPARAM(IMPL_NAME));
 
         xFactory = Reference< XSingleServiceFactory >( ::cppu::createSingleFactory(
                     reinterpret_cast< XMultiServiceFactory* >( pServiceManager ),
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index e4ec2131ba6e..49bc8c6eeb04 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -313,10 +313,10 @@ private:
                             const Color& rColor ) const;
 
 private:
-    typedef ScfDelList< XclListColor >          XclListColorList;
-    typedef ScfRef< XclListColorList >          XclListColorListRef;
-    typedef ::std::vector< XclColorIdData >     XclColorIdDataVec;
-    typedef ::std::vector< XclPaletteColor >    XclPaletteColorVec;
+    typedef ScfDelList< XclListColor >            XclListColorList;
+    typedef boost::shared_ptr< XclListColorList > XclListColorListRef;
+    typedef ::std::vector< XclColorIdData >       XclColorIdDataVec;
+    typedef ::std::vector< XclPaletteColor >      XclPaletteColorVec;
 
     const XclDefaultPalette& mrDefPal;      /// The default palette for the current BIFF version.
     XclListColorListRef mxColorList;        /// Working color list.
@@ -2819,8 +2819,8 @@ XclExpXmlStyleSheet::XclExpXmlStyleSheet( const XclExpRoot& rRoot )
 void XclExpXmlStyleSheet::SaveXml( XclExpXmlStream& rStrm )
 {
     sax_fastparser::FSHelperPtr aStyleSheet = rStrm.CreateOutputStream(
-            OUString::createFromAscii( "xl/styles.xml" ),
-            OUString::createFromAscii( "styles.xml" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM( "xl/styles.xml") ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM( "styles.xml" )),
             rStrm.GetCurrentStream()->getOutputStream(),
             "application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml",
             "http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" );
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index 05dbb579f385..74284b84086a 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -680,7 +680,7 @@ bool XclExpLabelCell::IsMultiLineText() const
 void XclExpLabelCell::Init( const XclExpRoot& rRoot,
         const ScPatternAttr* pPattern, XclExpStringRef xText )
 {
-    DBG_ASSERT( xText.is() && xText->Len(), "XclExpLabelCell::XclExpLabelCell - empty string passed" );
+    DBG_ASSERT( xText && xText->Len(), "XclExpLabelCell::XclExpLabelCell - empty string passed" );
     mxText = xText;
     mnSstIndex = 0;
 
@@ -846,7 +846,7 @@ XclExpFormulaCell::XclExpFormulaCell(
             // other formula cell covered by a matrix - find the ARRAY record
             mxAddRec = rArrayBfr.FindArray( rScTokArr );
             // should always be found, if Calc document is not broken
-            DBG_ASSERT( mxAddRec.is(), "XclExpFormulaCell::XclExpFormulaCell - no matrix found" );
+            DBG_ASSERT( mxAddRec, "XclExpFormulaCell::XclExpFormulaCell - no matrix found" );
         }
         break;
         default:;
@@ -864,22 +864,22 @@ XclExpFormulaCell::XclExpFormulaCell(
 void XclExpFormulaCell::Save( XclExpStream& rStrm )
 {
     // create token array for FORMULA cells with additional record
-    if( mxAddRec.is() )
+    if( mxAddRec )
         mxTokArr = mxAddRec->CreateCellTokenArray( rStrm.GetRoot() );
 
     // FORMULA record itself
-    DBG_ASSERT( mxTokArr.is(), "XclExpFormulaCell::Save - missing token array" );
+    DBG_ASSERT( mxTokArr, "XclExpFormulaCell::Save - missing token array" );
     if( !mxTokArr )
         mxTokArr = rStrm.GetRoot().GetFormulaCompiler().CreateErrorFormula( EXC_ERR_NA );
     SetContSize( 16 + mxTokArr->GetSize() );
     XclExpSingleCellBase::Save( rStrm );
 
     // additional record (ARRAY, SHRFMLA, or TABLEOP), only for first FORMULA record
-    if( mxAddRec.is() && mxAddRec->IsBasePos( GetXclCol(), GetXclRow() ) )
+    if( mxAddRec && mxAddRec->IsBasePos( GetXclCol(), GetXclRow() ) )
         mxAddRec->Save( rStrm );
 
     // STRING record for string result
-    if( mxStringRec.is() )
+    if( mxStringRec )
         mxStringRec->Save( rStrm );
 }
 
@@ -899,7 +899,7 @@ void XclExpFormulaCell::SaveXml( XclExpXmlStream& rStrm )
 
     rWorksheet->startElement( XML_f,
             // OOXTODO: XML_t,      ST_CellFormulaType
-            XML_aca,    XclXmlUtils::ToPsz( (mxTokArr.is() && mxTokArr->IsVolatile()) || (mxAddRec.is() && mxAddRec->IsVolatile()) ),
+            XML_aca,    XclXmlUtils::ToPsz( (mxTokArr && mxTokArr->IsVolatile()) || (mxAddRec && mxAddRec->IsVolatile()) ),
             // OOXTODO: XML_ref,    ST_Ref
             // OOXTODO: XML_dt2D,   bool
             // OOXTODO: XML_dtr,    bool
@@ -979,8 +979,8 @@ void XclExpFormulaCell::WriteContents( XclExpStream& rStrm )
 
     // flags and formula token array
     sal_uInt16 nFlags = EXC_FORMULA_DEFAULTFLAGS;
-    ::set_flag( nFlags, EXC_FORMULA_RECALC_ALWAYS, mxTokArr->IsVolatile() || (mxAddRec.is() && mxAddRec->IsVolatile()) );
-    ::set_flag( nFlags, EXC_FORMULA_SHARED, mxAddRec.is() && (mxAddRec->GetRecId() == EXC_ID_SHRFMLA) );
+    ::set_flag( nFlags, EXC_FORMULA_RECALC_ALWAYS, mxTokArr->IsVolatile() || (mxAddRec && mxAddRec->IsVolatile()) );
+    ::set_flag( nFlags, EXC_FORMULA_SHARED, mxAddRec && (mxAddRec->GetRecId() == EXC_ID_SHRFMLA) );
     rStrm << nFlags << sal_uInt32( 0 ) << *mxTokArr;
 }
 
@@ -1936,7 +1936,7 @@ void XclExpRow::Save( XclExpStream& rStrm )
 
 void XclExpRow::InsertCell( XclExpCellRef xCell, size_t nPos, bool bIsMergedBase )
 {
-    DBG_ASSERT( xCell.is(), "XclExpRow::InsertCell - missing cell" );
+    DBG_ASSERT( xCell, "XclExpRow::InsertCell - missing cell" );
 
     /*  #109751# If we have a multi-line text in a merged cell, and the resulting
         row height has not been confirmed, we need to force the EXC_ROW_UNSYNCED
@@ -1946,7 +1946,7 @@ void XclExpRow::InsertCell( XclExpCellRef xCell, size_t nPos, bool bIsMergedBase
 
     // try to merge with previous cell, insert the new cell if not successful
     XclExpCellRef xPrevCell = maCellList.GetRecord( nPos - 1 );
-    if( xPrevCell.is() && xPrevCell->TryMerge( *xCell ) )
+    if( xPrevCell && xPrevCell->TryMerge( *xCell ) )
         xCell = xPrevCell;
     else
         maCellList.InsertRecord( xCell, nPos++ );
@@ -1954,7 +1954,7 @@ void XclExpRow::InsertCell( XclExpCellRef xCell, size_t nPos, bool bIsMergedBase
 
     // try to merge with following cell, remove it if successful
     XclExpCellRef xNextCell = maCellList.GetRecord( nPos );
-    if( xNextCell.is() && xCell->TryMerge( *xNextCell ) )
+    if( xNextCell && xCell->TryMerge( *xNextCell ) )
         maCellList.RemoveRecord( nPos );
 }
 
@@ -2005,7 +2005,7 @@ XclExpRowBuffer::XclExpRowBuffer( const XclExpRoot& rRoot ) :
 
 void XclExpRowBuffer::AppendCell( XclExpCellRef xCell, bool bIsMergedBase )
 {
-    DBG_ASSERT( xCell.is(), "XclExpRowBuffer::AppendCell - missing cell" );
+    DBG_ASSERT( xCell, "XclExpRowBuffer::AppendCell - missing cell" );
     GetOrCreateRow( xCell->GetXclRow(), false ).AppendCell( xCell, bIsMergedBase );
 }
 
@@ -2105,7 +2105,6 @@ void XclExpRowBuffer::Save( XclExpStream& rStrm )
     for (itr = itrBeg; itr != itrEnd; ++itr)
     {
         // find end of row block
-        ++itrBlkEnd;
         while( (itrBlkEnd != itrEnd) && (itrBlkEnd->second->GetXclRow() - nStartXclRow < EXC_ROW_ROWBLOCKSIZE) )
             ++itrBlkEnd;
 
@@ -2118,7 +2117,7 @@ void XclExpRowBuffer::Save( XclExpStream& rStrm )
         for( itRow = itrBlkStart; itRow != itrBlkEnd; ++itRow )
              itRow->second->WriteCellList( rStrm );
 
-        itrBlkStart = itrBlkEnd;
+        itrBlkStart = (itrBlkEnd == itrEnd) ? itrBlkEnd : itrBlkEnd++;
         nStartXclRow += EXC_ROW_ROWBLOCKSIZE;
     }
 }
@@ -2339,7 +2338,7 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot& rRoot ) :
         }
 
         // insert the cell into the current row
-        if( xCell.is() )
+        if( xCell )
             maRowBfr.AppendCell( xCell, bIsMergedBase );
 
         // notes
@@ -2359,7 +2358,7 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot& rRoot ) :
                 ScRange aScRange( aScPos );
                 aScRange.aEnd.IncCol( rMergeItem.GetColMerge() - 1 );
                 aScRange.aEnd.IncRow( rMergeItem.GetRowMerge() - 1 );
-                sal_uInt32 nXFId = xCell.is() ? xCell->GetFirstXFId() : EXC_XFID_NOTFOUND;
+                sal_uInt32 nXFId = xCell ? xCell->GetFirstXFId() : EXC_XFID_NOTFOUND;
                 // #120156# blank cells merged vertically may occur repeatedly
                 DBG_ASSERT( (aScRange.aStart.Col() == aScRange.aEnd.Col()) || (nScCol == nLastScCol),
                     "XclExpCellTable::XclExpCellTable - invalid repeated blank merged cell" );
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index 41565381e137..8ffd71068321 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -559,7 +559,7 @@ void XclImpChFrameBase::ReadSubRecord( XclImpStream& rStrm )
 void XclImpChFrameBase::ConvertLineBase( const XclImpChRoot& rRoot,
         ScfPropertySet& rPropSet, XclChObjectType eObjType, sal_uInt16 nFormatIdx ) const
 {
-    if( mxLineFmt.is() )
+    if( mxLineFmt )
         mxLineFmt->Convert( rRoot, rPropSet, eObjType, nFormatIdx );
 }
 
@@ -569,9 +569,9 @@ void XclImpChFrameBase::ConvertAreaBase( const XclImpChRoot& rRoot,
     if( rRoot.GetFormatInfo( eObjType ).mbIsFrame )
     {
         // CHESCHERFORMAT overrides CHAREAFORMAT (even if it is auto)
-        if( mxEscherFmt.is() )
+        if( mxEscherFmt )
             mxEscherFmt->Convert( rRoot, rPropSet, eObjType );
-        else if( mxAreaFmt.is() )
+        else if( mxAreaFmt )
             mxAreaFmt->Convert( rRoot, rPropSet, eObjType, nFormatIdx );
     }
 }
@@ -659,7 +659,7 @@ Reference< XLabeledDataSequence > lclCreateLabeledDataSequence(
 {
     // create data sequence for values and title
     Reference< XDataSequence > xValueSeq;
-    if( xValueLink.is() )
+    if( xValueLink )
         xValueSeq = xValueLink->CreateDataSequence( rValueRole );
     Reference< XDataSequence > xTitleSeq;
     if( pTitleLink )
@@ -729,14 +729,14 @@ void XclImpChSourceLink::SetString( const String& rString )
 
 void XclImpChSourceLink::SetTextFormats( const XclFormatRunVec& rFormats )
 {
-    if( mxString.is() )
+    if( mxString )
         mxString->SetFormats( rFormats );
 }
 
 sal_uInt16 XclImpChSourceLink::GetCellCount() const
 {
     sal_uInt32 nCellCount = 0;
-    if( mxTokenArray.is() )
+    if( mxTokenArray )
     {
         mxTokenArray->Reset();
         for( const FormulaToken* pToken = mxTokenArray->First(); pToken; pToken = mxTokenArray->Next() )
@@ -784,7 +784,7 @@ Reference< XDataSequence > XclImpChSourceLink::CreateDataSequence( const OUStrin
 {
     Reference< XDataSequence > xDataSeq;
     Reference< XDataProvider > xDataProv = GetDataProvider();
-    if( xDataProv.is() && mxTokenArray.is() )
+    if( xDataProv.is() && mxTokenArray )
     {
         ScCompiler aComp( GetDocPtr(), ScAddress(), *mxTokenArray );
         aComp.SetGrammar( ::formula::FormulaGrammar::GRAM_ENGLISH );
@@ -809,7 +809,7 @@ Sequence< Reference< XFormattedString > > XclImpChSourceLink::CreateStringSequen
         const XclImpChRoot& rRoot, sal_uInt16 nLeadFontIdx, const Color& rLeadFontColor ) const
 {
     ::std::vector< Reference< XFormattedString > > aStringVec;
-    if( mxString.is() )
+    if( mxString )
     {
         for( XclImpStringIterator aIt( *mxString ); aIt.Is(); ++aIt )
         {
@@ -839,7 +839,7 @@ Sequence< Reference< XFormattedString > > XclImpChSourceLink::CreateStringSequen
 
 void XclImpChSourceLink::FillSourceLink( ::std::vector< ScSharedTokenRef >& rTokens ) const
 {
-    if( !mxTokenArray.is() )
+    if( !mxTokenArray )
         // no links to fill.
         return;
 
@@ -944,7 +944,7 @@ void XclImpChText::ReadSubRecord( XclImpStream& rStrm )
             ReadChFrLabelProps( rStrm );
         break;
         case EXC_ID_CHEND:
-            if( mxSrcLink.is() && !maFormats.empty() )
+            if( mxSrcLink && !maFormats.empty() )
                 mxSrcLink->SetTextFormats( maFormats );
         break;
     }
@@ -952,7 +952,7 @@ void XclImpChText::ReadSubRecord( XclImpStream& rStrm )
 
 sal_uInt16 XclImpChText::GetFontIndex() const
 {
-    return mxFont.is() ? mxFont->GetFontIndex() : EXC_FONT_NOTFOUND;
+    return mxFont ? mxFont->GetFontIndex() : EXC_FONT_NOTFOUND;
 }
 
 Color XclImpChText::GetFontColor() const
@@ -1010,24 +1010,24 @@ void XclImpChText::ConvertRotation( ScfPropertySet& rPropSet, bool bSupportsStac
 
 void XclImpChText::ConvertFrame( ScfPropertySet& rPropSet ) const
 {
-    if( mxFrame.is() )
+    if( mxFrame )
         mxFrame->Convert( rPropSet );
 }
 
 void XclImpChText::ConvertNumFmt( ScfPropertySet& rPropSet, bool bPercent ) const
 {
-    if( mxSrcLink.is() )
+    if( mxSrcLink )
         mxSrcLink->ConvertNumFmt( rPropSet, bPercent );
 }
 
 void XclImpChText::ConvertDataLabel( ScfPropertySet& rPropSet, const XclChTypeInfo& rTypeInfo ) const
 {
     // existing CHFRLABELPROPS record wins over flags from CHTEXT
-    sal_uInt16 nShowFlags = mxLabelProps.is() ? mxLabelProps->mnFlags : maData.mnFlags;
-    sal_uInt16 SHOWANYCATEG   = mxLabelProps.is() ? EXC_CHFRLABELPROPS_SHOWCATEG : (EXC_CHTEXT_SHOWCATEGPERC | EXC_CHTEXT_SHOWCATEG);
-    sal_uInt16 SHOWANYVALUE   = mxLabelProps.is() ? EXC_CHFRLABELPROPS_SHOWVALUE : EXC_CHTEXT_SHOWVALUE;
-    sal_uInt16 SHOWANYPERCENT = mxLabelProps.is() ? EXC_CHFRLABELPROPS_SHOWPERCENT : (EXC_CHTEXT_SHOWPERCENT | EXC_CHTEXT_SHOWCATEGPERC);
-    sal_uInt16 SHOWANYBUBBLE  = mxLabelProps.is() ? EXC_CHFRLABELPROPS_SHOWBUBBLE : EXC_CHTEXT_SHOWBUBBLE;
+    sal_uInt16 nShowFlags = mxLabelProps ? mxLabelProps->mnFlags : maData.mnFlags;
+    sal_uInt16 SHOWANYCATEG   = mxLabelProps ? EXC_CHFRLABELPROPS_SHOWCATEG : (EXC_CHTEXT_SHOWCATEGPERC | EXC_CHTEXT_SHOWCATEG);
+    sal_uInt16 SHOWANYVALUE   = mxLabelProps ? EXC_CHFRLABELPROPS_SHOWVALUE : EXC_CHTEXT_SHOWVALUE;
+    sal_uInt16 SHOWANYPERCENT = mxLabelProps ? EXC_CHFRLABELPROPS_SHOWPERCENT : (EXC_CHTEXT_SHOWPERCENT | EXC_CHTEXT_SHOWCATEGPERC);
+    sal_uInt16 SHOWANYBUBBLE  = mxLabelProps ? EXC_CHFRLABELPROPS_SHOWBUBBLE : EXC_CHTEXT_SHOWBUBBLE;
 
     // get raw flags for label values
     bool bShowNone    = IsDeleted();
@@ -1047,7 +1047,7 @@ void XclImpChText::ConvertDataLabel( ScfPropertySet& rPropSet, const XclChTypeIn
     // create API struct for label values, set API label separator
     cssc2::DataPointLabel aPointLabel( bShowValue, bShowPercent, bShowCateg, bShowSymbol );
     rPropSet.SetProperty( EXC_CHPROP_LABEL, aPointLabel );
-    String aSep = mxLabelProps.is() ? mxLabelProps->maSeparator : String( sal_Unicode( '\n' ) );
+    String aSep = mxLabelProps ? mxLabelProps->maSeparator : String( sal_Unicode( '\n' ) );
     if( aSep.Len() == 0 )
         aSep = CREATE_STRING( "; " );
     rPropSet.SetStringProperty( EXC_CHPROP_LABELSEPARATOR, aSep );
@@ -1083,7 +1083,7 @@ void XclImpChText::ConvertDataLabel( ScfPropertySet& rPropSet, const XclChTypeIn
 Reference< XTitle > XclImpChText::CreateTitle() const
 {
     Reference< XTitle > xTitle;
-    if( mxSrcLink.is() && mxSrcLink->HasString() )
+    if( mxSrcLink && mxSrcLink->HasString() )
     {
         // create the formatted strings
         Sequence< Reference< XFormattedString > > aStringSeq(
@@ -1179,7 +1179,7 @@ namespace {
 
 void lclUpdateText( XclImpChTextRef& rxText, XclImpChTextRef xDefText )
 {
-    if( rxText.is() )
+    if( rxText )
         rxText->UpdateText( xDefText.get() );
     else
         rxText = xDefText;
@@ -1189,7 +1189,7 @@ void lclFinalizeTitle( XclImpChTextRef& rxTitle, XclImpChTextRef xDefText, const
 {
     /*  Do not update a title, if it is not visible (if rxTitle is null).
         Existing reference indicates enabled title. */
-    if( rxTitle.is() )
+    if( rxTitle )
     {
         if( !rxTitle->HasString() )
             rxTitle->SetString( rAutoTitle );
@@ -1318,7 +1318,7 @@ XclImpChTextRef XclImpChAttachedLabel::CreateDataLabel( XclImpChTextRef xParent
     const sal_uInt16 EXC_CHATTLABEL_SHOWANYPERCENT = EXC_CHATTLABEL_SHOWPERCENT | EXC_CHATTLABEL_SHOWCATEGPERC;
     const sal_uInt16 EXC_CHATTLABEL_SHOWANYCATEG = EXC_CHATTLABEL_SHOWCATEG | EXC_CHATTLABEL_SHOWCATEGPERC;
 
-    XclImpChTextRef xLabel( xParent.is() ? new XclImpChText( *xParent ) : new XclImpChText( GetChRoot() ) );
+    XclImpChTextRef xLabel( xParent ? new XclImpChText( *xParent ) : new XclImpChText( GetChRoot() ) );
     xLabel->UpdateDataLabel(
         ::get_flag( mnFlags, EXC_CHATTLABEL_SHOWANYCATEG ),
         ::get_flag( mnFlags, EXC_CHATTLABEL_SHOWANYVALUE ),
@@ -1468,18 +1468,18 @@ void XclImpChDataFormat::Convert( ScfPropertySet& rPropSet, const XclChExtTypeIn
     ConvertFrameBase( GetChRoot(), rPropSet, rTypeInfo.GetSeriesObjectType(), maData.mnFormatIdx );
 #if EXC_CHART2_3DBAR_HAIRLINES_ONLY
     // #i83151# only hair lines in 3D charts with filled data points
-    if( rTypeInfo.mb3dChart && rTypeInfo.IsSeriesFrameFormat() && mxLineFmt.is() && mxLineFmt->HasLine() )
+    if( rTypeInfo.mb3dChart && rTypeInfo.IsSeriesFrameFormat() && mxLineFmt && mxLineFmt->HasLine() )
         rPropSet.SetProperty< sal_Int32 >( CREATE_OUSTRING( "BorderWidth" ), 0 );
 #endif
 
     // other formatting
-    if( mxMarkerFmt.is() )
+    if( mxMarkerFmt )
         mxMarkerFmt->Convert( GetChRoot(), rPropSet, maData.mnFormatIdx, GetLineWeight() );
-    if( mxPieFmt.is() )
+    if( mxPieFmt )
         mxPieFmt->Convert( rPropSet );
-    if( mx3dDataFmt.is() )
+    if( mx3dDataFmt )
         mx3dDataFmt->Convert( rPropSet );
-    if( mxLabel.is() )
+    if( mxLabel )
         mxLabel->ConvertDataLabel( rPropSet, rTypeInfo );
 
     // 3D settings
@@ -1488,7 +1488,7 @@ void XclImpChDataFormat::Convert( ScfPropertySet& rPropSet, const XclChExtTypeIn
     /*  Special case: set marker color as line color, if series line is not
         visible. This makes the color visible in the marker area.
         TODO: remove this if OOChart supports own colors in markers. */
-    if( !rTypeInfo.IsSeriesFrameFormat() && !HasLine() && mxMarkerFmt.is() )
+    if( !rTypeInfo.IsSeriesFrameFormat() && !HasLine() && mxMarkerFmt )
         mxMarkerFmt->ConvertColor( GetChRoot(), rPropSet, maData.mnFormatIdx );
 }
 
@@ -1527,9 +1527,9 @@ void XclImpChDataFormat::UpdateDataLabel( const XclImpChDataFormat* pParentFmt )
         xDefText = pParentFmt->GetDataLabel();
     if( !xDefText )
         xDefText = GetChartData().GetDefaultText( EXC_CHTEXTTYPE_DATALABEL );
-    if( mxLabel.is() )
+    if( mxLabel )
         mxLabel->UpdateText( xDefText.get() );
-    else if( mxAttLabel.is() )
+    else if( mxAttLabel )
         mxLabel = mxAttLabel->CreateDataLabel( xDefText );
 }
 
@@ -1577,7 +1577,7 @@ Reference< XRegressionCurve > XclImpChSerTrendLine::CreateRegressionCurve() cons
         xRegCurve.set( ScfApiHelper::CreateInstance( aService ), UNO_QUERY );
 
     // trend line formatting
-    if( xRegCurve.is() && mxDataFmt.is() )
+    if( xRegCurve.is() && mxDataFmt )
     {
         ScfPropertySet aPropSet( xRegCurve );
         mxDataFmt->ConvertLine( aPropSet, EXC_CHOBJTYPE_TRENDLINE );
@@ -1699,7 +1699,7 @@ Reference< XPropertySet > XclImpChSerErrorBar::CreateErrorBar( const XclImpChSer
         }
 
         // error bar formatting
-        if( pPrimaryBar->mxDataFmt.is() && xErrorBar.is() )
+        if( pPrimaryBar->mxDataFmt && xErrorBar.is() )
             pPrimaryBar->mxDataFmt->ConvertLine( aBarProp, EXC_CHOBJTYPE_ERRORBAR );
     }
 
@@ -1750,7 +1750,7 @@ void XclImpChSeries::ReadSubRecord( XclImpStream& rStrm )
 
 void XclImpChSeries::SetDataFormat( XclImpChDataFormatRef xDataFmt )
 {
-    if( xDataFmt.is() )
+    if( xDataFmt )
     {
         XclImpChDataFormatRef* pxDataFmt = GetDataFormatRef( xDataFmt->GetPointPos().mnPointIdx );
         // do not overwrite existing data format
@@ -1767,7 +1767,7 @@ void XclImpChSeries::SetDataFormat( XclImpChDataFormatRef xDataFmt )
 
 void XclImpChSeries::SetDataLabel( XclImpChTextRef xLabel )
 {
-    if( xLabel.is() )
+    if( xLabel )
     {
         XclImpChTextRef* pxLabel = GetDataLabelRef( xLabel->GetPointPos().mnPointIdx );
         if( pxLabel && !*pxLabel )
@@ -1796,7 +1796,7 @@ void XclImpChSeries::FinalizeDataFormats()
         if( !mxSeriesFmt )
             mxSeriesFmt = CreateDataFormat( EXC_CHDATAFORMAT_ALLPOINTS, 0 );
 
-        if( mxSeriesFmt.is() )
+        if( mxSeriesFmt )
         {
             // #i83100# set text label format, e.g. for trend line equations
             mxSeriesFmt->SetDataLabel( maLabels.get( EXC_CHDATAFORMAT_ALLPOINTS ) );
@@ -1834,7 +1834,7 @@ void XclImpChSeries::FinalizeDataFormats()
         }
 
         // update series format (copy missing formatting from group default format)
-        if( mxSeriesFmt.is() )
+        if( mxSeriesFmt )
             mxSeriesFmt->UpdateSeriesFormat( pTypeGroup->GetTypeInfo(), pTypeGroup->GetGroupFormat().get() );
 
         // update data point formats (removes unchanged automatic formatting)
@@ -1916,7 +1916,7 @@ Reference< XDataSeries > XclImpChSeries::CreateDataSeries() const
 
         // series formatting
         ScfPropertySet aSeriesProp( xDataSeries );
-        if( mxSeriesFmt.is() )
+        if( mxSeriesFmt )
             mxSeriesFmt->Convert( aSeriesProp, rTypeInfo );
 
         // trend lines
@@ -1938,7 +1938,7 @@ Reference< XDataSeries > XclImpChSeries::CreateDataSeries() const
         aSeriesProp.SetBoolProperty( EXC_CHPROP_VARYCOLORSBY, rTypeInfo.meTypeCateg == EXC_CHTYPECATEG_PIE );
 #endif
         // #i91271# always set area formatting for every point in pie/doughnut charts
-        if( mxSeriesFmt.is() && ((bVarPointFmt && mxSeriesFmt->IsAutoArea()) || (rTypeInfo.meTypeCateg == EXC_CHTYPECATEG_PIE)) )
+        if( mxSeriesFmt && ((bVarPointFmt && mxSeriesFmt->IsAutoArea()) || (rTypeInfo.meTypeCateg == EXC_CHTYPECATEG_PIE)) )
         {
             for( sal_uInt16 nPointIdx = 0, nPointCount = mxValueLink->GetCellCount(); nPointIdx < nPointCount; ++nPointIdx )
             {
@@ -1959,13 +1959,13 @@ Reference< XDataSeries > XclImpChSeries::CreateDataSeries() const
 
 void XclImpChSeries::FillAllSourceLinks( ::std::vector< ScSharedTokenRef >& rTokens ) const
 {
-    if( mxValueLink.is() )
+    if( mxValueLink )
         mxValueLink->FillSourceLink( rTokens );
-    if( mxCategLink.is() )
+    if( mxCategLink )
         mxCategLink->FillSourceLink( rTokens );
-    if( mxTitleLink.is() )
+    if( mxTitleLink )
         mxTitleLink->FillSourceLink( rTokens );
-    if( mxBubbleLink.is() )
+    if( mxBubbleLink )
         mxBubbleLink->FillSourceLink( rTokens );
 }
 
@@ -2413,10 +2413,10 @@ Reference< XLegend > XclImpChLegend::CreateLegend() const
         aLegendProp.SetBoolProperty( EXC_CHPROP_SHOW, true );
 
         // frame properties
-        if( mxFrame.is() )
+        if( mxFrame )
             mxFrame->Convert( aLegendProp );
         // text properties
-        if( mxText.is() )
+        if( mxText )
             mxText->ConvertFont( aLegendProp );
 
         /*  Legend position and size. Default positions are used only if the
@@ -2438,7 +2438,7 @@ Reference< XLegend > XclImpChLegend::CreateLegend() const
         // no automatic position: try to find the correct position and size
         if( eApiPos == cssc2::LegendPosition_CUSTOM )
         {
-            const XclChFramePos* pFramePos = mxFramePos.is() ? &mxFramePos->GetFramePosData() : 0;
+            const XclChFramePos* pFramePos = mxFramePos ? &mxFramePos->GetFramePosData() : 0;
 
             /*  Legend position. Only the settings from the CHFRAMEPOS record
                 are used by Excel, the position in the CHLEGEND record will be
@@ -2567,20 +2567,20 @@ void XclImpChTypeGroup::Finalize()
     maType.Finalize( bStockChart );
 
     // extended type info
-    maTypeInfo.Set( maType.GetTypeInfo(), mxChart3d.is(), false );
+    maTypeInfo.Set( maType.GetTypeInfo(), mxChart3d, false );
 
     // reverse series order for some unstacked 2D chart types
     if( maTypeInfo.mbReverseSeries && !Is3dChart() && !maType.IsStacked() && !maType.IsPercent() )
         ::std::reverse( maSeries.begin(), maSeries.end() );
 
     // update chart type group format, may depend on chart type finalized above
-    if( mxGroupFmt.is() )
+    if( mxGroupFmt )
         mxGroupFmt->UpdateGroupFormat( maTypeInfo );
 }
 
 void XclImpChTypeGroup::AddSeries( XclImpChSeriesRef xSeries )
 {
-    if( xSeries.is() )
+    if( xSeries )
         maSeries.push_back( xSeries );
     // store first inserted series separately, series order may be reversed later
     if( !mxFirstSeries )
@@ -2613,20 +2613,20 @@ bool XclImpChTypeGroup::HasConnectorLines() const
     // existence of connector lines (only in stacked bar charts)
     bool bAnyStacked = maType.IsStacked() || maType.IsPercent();
     XclImpChLineFormatRef xConnLine = maChartLines.get( EXC_CHCHARTLINE_CONNECT );
-    return bAnyStacked && (maTypeInfo.meTypeCateg == EXC_CHTYPECATEG_BAR) && xConnLine.is() && xConnLine->HasLine();
+    return bAnyStacked && (maTypeInfo.meTypeCateg == EXC_CHTYPECATEG_BAR) && xConnLine && xConnLine->HasLine();
 }
 
 const String& XclImpChTypeGroup::GetSingleSeriesTitle() const
 {
     // no automatic title for series with trendlines or error bars
     // pie charts always show an automatic title, even if more series exist
-    return (mxFirstSeries.is() && !mxFirstSeries->HasChildSeries() && (maTypeInfo.mbSingleSeriesVis || (maSeries.size() == 1))) ?
+    return (mxFirstSeries && !mxFirstSeries->HasChildSeries() && (maTypeInfo.mbSingleSeriesVis || (maSeries.size() == 1))) ?
         mxFirstSeries->GetTitle() : String::EmptyString();
 }
 
 void XclImpChTypeGroup::ConvertChart3d( ScfPropertySet& rPropSet ) const
 {
-    if( mxChart3d.is() )
+    if( mxChart3d )
         mxChart3d->Convert( rPropSet, Is3dWallChart() );
 }
 
@@ -2663,7 +2663,7 @@ Reference< XLabeledDataSequence > XclImpChTypeGroup::CreateCategSequence() const
 {
     Reference< XLabeledDataSequence > xLabeledSeq;
     // create category sequence from first visible series
-    if( mxFirstSeries.is() )
+    if( mxFirstSeries )
         xLabeledSeq = mxFirstSeries->CreateCategSequence( EXC_CHPROP_ROLE_CATEG );
     return xLabeledSeq;
 }
@@ -2793,7 +2793,7 @@ void XclImpChTypeGroup::CreateStockSeries( Reference< XChartType > xChartType, s
         aTypeProp.SetBoolProperty( EXC_CHPROP_SHOWHIGHLOW, true );
         // hi-lo line format
         XclImpChLineFormatRef xHiLoLine = maChartLines.get( EXC_CHCHARTLINE_HILO );
-        if( xHiLoLine.is() )
+        if( xHiLoLine )
         {
             ScfPropertySet aSeriesProp( xDataSeries );
             xHiLoLine->Convert( GetChRoot(), aSeriesProp, EXC_CHOBJTYPE_HILOLINE );
@@ -2801,7 +2801,7 @@ void XclImpChTypeGroup::CreateStockSeries( Reference< XChartType > xChartType, s
         // white dropbar format
         XclImpChDropBarRef xUpBar = maDropBars.get( EXC_CHDROPBAR_UP );
         Reference< XPropertySet > xWhitePropSet;
-        if( xUpBar.is() && aTypeProp.GetProperty( xWhitePropSet, EXC_CHPROP_WHITEDAY ) )
+        if( xUpBar && aTypeProp.GetProperty( xWhitePropSet, EXC_CHPROP_WHITEDAY ) )
         {
             ScfPropertySet aBarProp( xWhitePropSet );
             xUpBar->Convert( GetChRoot(), aBarProp );
@@ -2809,7 +2809,7 @@ void XclImpChTypeGroup::CreateStockSeries( Reference< XChartType > xChartType, s
         // black dropbar format
         XclImpChDropBarRef xDownBar = maDropBars.get( EXC_CHDROPBAR_DOWN );
         Reference< XPropertySet > xBlackPropSet;
-        if( xDownBar.is() && aTypeProp.GetProperty( xBlackPropSet, EXC_CHPROP_BLACKDAY ) )
+        if( xDownBar && aTypeProp.GetProperty( xBlackPropSet, EXC_CHPROP_BLACKDAY ) )
         {
             ScfPropertySet aBarProp( xBlackPropSet );
             xDownBar->Convert( GetChRoot(), aBarProp );
@@ -3065,9 +3065,9 @@ void XclImpChAxis::Finalize()
     if( !mxValueRange )
         mxValueRange.reset( new XclImpChValueRange( GetChRoot() ) );
     // remove invisible grid lines completely
-    if( mxMajorGrid.is() && !mxMajorGrid->HasLine() )
+    if( mxMajorGrid && !mxMajorGrid->HasLine() )
         mxMajorGrid.reset();
-    if( mxMinorGrid.is() && !mxMinorGrid->HasLine() )
+    if( mxMinorGrid && !mxMinorGrid->HasLine() )
         mxMinorGrid.reset();
     // default tick settings different in OOChart and Excel
     if( !mxTick )
@@ -3087,17 +3087,17 @@ void XclImpChAxis::Finalize()
 
 sal_uInt16 XclImpChAxis::GetFontIndex() const
 {
-    return mxFont.is() ? mxFont->GetFontIndex() : EXC_FONT_NOTFOUND;
+    return mxFont ? mxFont->GetFontIndex() : EXC_FONT_NOTFOUND;
 }
 
 Color XclImpChAxis::GetFontColor() const
 {
-    return mxTick.is() ? mxTick->GetFontColor() : GetFontAutoColor();
+    return mxTick ? mxTick->GetFontColor() : GetFontAutoColor();
 }
 
 sal_uInt16 XclImpChAxis::GetRotation() const
 {
-    return mxTick.is() ? mxTick->GetRotation() : EXC_CHART_AUTOROTATION;
+    return mxTick ? mxTick->GetRotation() : EXC_CHART_AUTOROTATION;
 }
 
 Reference< XAxis > XclImpChAxis::CreateAxis( const XclImpChTypeGroup& rTypeGroup, const XclImpChAxis* pCrossingAxis ) const
@@ -3111,10 +3111,10 @@ Reference< XAxis > XclImpChAxis::CreateAxis( const XclImpChTypeGroup& rTypeGroup
         aAxisProp.SetBoolProperty( EXC_CHPROP_SHOW, IsActivated() );
 
         // axis line properties
-        if( mxAxisLine.is() )
+        if( mxAxisLine )
             mxAxisLine->Convert( GetChRoot(), aAxisProp, EXC_CHOBJTYPE_AXISLINE );
         // axis ticks properties
-        if( mxTick.is() )
+        if( mxTick )
             mxTick->Convert( aAxisProp );
 
         // axis caption text --------------------------------------------------
@@ -3126,7 +3126,7 @@ Reference< XAxis > XclImpChAxis::CreateAxis( const XclImpChTypeGroup& rTypeGroup
         if( bHasLabels )
         {
             // font settings from CHFONT record or from default text
-            if( mxFont.is() )
+            if( mxFont )
                 ConvertFontBase( GetChRoot(), aAxisProp );
             else if( const XclImpChText* pDefText = GetChartData().GetDefaultText( EXC_CHTEXTTYPE_AXISLABEL ).get() )
                 pDefText->ConvertFont( aAxisProp );
@@ -3191,7 +3191,7 @@ Reference< XAxis > XclImpChAxis::CreateAxis( const XclImpChTypeGroup& rTypeGroup
         // main grid
         ScfPropertySet aGridProp( xAxis->getGridProperties() );
         aGridProp.SetBoolProperty( EXC_CHPROP_SHOW, HasMajorGrid() );
-        if( mxMajorGrid.is() )
+        if( mxMajorGrid )
             mxMajorGrid->Convert( GetChRoot(), aGridProp, EXC_CHOBJTYPE_GRIDLINE );
         // sub grid
         Sequence< Reference< XPropertySet > > aSubGridPropSeq = xAxis->getSubGridProperties();
@@ -3199,7 +3199,7 @@ Reference< XAxis > XclImpChAxis::CreateAxis( const XclImpChTypeGroup& rTypeGroup
         {
             ScfPropertySet aSubGridProp( aSubGridPropSeq[ 0 ] );
             aSubGridProp.SetBoolProperty( EXC_CHPROP_SHOW, HasMinorGrid() );
-            if( mxMinorGrid.is() )
+            if( mxMinorGrid )
                 mxMinorGrid->Convert( GetChRoot(), aSubGridProp, EXC_CHOBJTYPE_GRIDLINE );
         }
 
@@ -3213,7 +3213,7 @@ Reference< XAxis > XclImpChAxis::CreateAxis( const XclImpChTypeGroup& rTypeGroup
 
 void XclImpChAxis::ConvertWall( ScfPropertySet& rPropSet ) const
 {
-    if( mxWallFrame.is() )
+    if( mxWallFrame )
         mxWallFrame->Convert( rPropSet );
 }
 
@@ -3254,7 +3254,7 @@ void XclImpChAxis::ReadChAxisLine( XclImpStream& rStrm )
                 pxLineFmt->reset( new XclImpChLineFormat );
                 (*pxLineFmt)->ReadChLineFormat( rStrm );
             }
-            else if( bWallFrame && mxWallFrame.is() )
+            else if( bWallFrame && mxWallFrame )
             {
                 mxWallFrame->ReadSubRecord( rStrm );
             }
@@ -3341,9 +3341,9 @@ void XclImpChAxesSet::Finalize()
             mxZAxis.reset( new XclImpChAxis( GetChRoot(), EXC_CHAXIS_Z ) );
 
         // finalize axes
-        if( mxXAxis.is() ) mxXAxis->Finalize();
-        if( mxYAxis.is() ) mxYAxis->Finalize();
-        if( mxZAxis.is() ) mxZAxis->Finalize();
+        if( mxXAxis ) mxXAxis->Finalize();
+        if( mxYAxis ) mxYAxis->Finalize();
+        if( mxZAxis ) mxZAxis->Finalize();
 
         // finalize axis titles
         XclImpChTextRef xDefText = GetChartData().GetDefaultText( EXC_CHTEXTTYPE_AXISTITLE );
@@ -3414,11 +3414,11 @@ void XclImpChAxesSet::Convert( Reference< XDiagram > xDiagram ) const
 
 void XclImpChAxesSet::ConvertTitlePositions() const
 {
-    if( mxXAxisTitle.is() )
+    if( mxXAxisTitle )
         mxXAxisTitle->ConvertTitlePosition( XclChTextKey( EXC_CHTEXTTYPE_AXISTITLE, maData.mnAxesSetId, EXC_CHAXIS_X ) );
-    if( mxYAxisTitle.is() )
+    if( mxYAxisTitle )
         mxYAxisTitle->ConvertTitlePosition( XclChTextKey( EXC_CHTEXTTYPE_AXISTITLE, maData.mnAxesSetId, EXC_CHAXIS_Y ) );
-    if( mxZAxisTitle.is() )
+    if( mxZAxisTitle )
         mxZAxisTitle->ConvertTitlePosition( XclChTextKey( EXC_CHTEXTTYPE_AXISTITLE, maData.mnAxesSetId, EXC_CHAXIS_Z ) );
 }
 
@@ -3484,7 +3484,7 @@ Reference< XCoordinateSystem > XclImpChAxesSet::CreateCoordSystem( Reference< XD
     if( !xCoordSystem.is() )
     {
         XclImpChTypeGroupRef xTypeGroup = GetFirstTypeGroup();
-        if( xTypeGroup.is() )
+        if( xTypeGroup )
         {
             xCoordSystem = xTypeGroup->CreateCoordSystem();
             // convert 3d chart settings
@@ -3521,14 +3521,14 @@ void XclImpChAxesSet::ConvertAxis(
         XclImpChAxisRef xChAxis, XclImpChTextRef xChAxisTitle,
         Reference< XCoordinateSystem > xCoordSystem, const XclImpChAxis* pCrossingAxis ) const
 {
-    if( xChAxis.is() )
+    if( xChAxis )
     {
         // create and attach the axis object
         Reference< XAxis > xAxis = CreateAxis( *xChAxis, pCrossingAxis );
         if( xAxis.is() )
         {
             // create and attach the axis title
-            if( xChAxisTitle.is() ) try
+            if( xChAxisTitle ) try
             {
                 Reference< XTitled > xTitled( xAxis, UNO_QUERY_THROW );
                 Reference< XTitle > xTitle( xChAxisTitle->CreateTitle(), UNO_SET_THROW );
@@ -3565,21 +3565,21 @@ Reference< XAxis > XclImpChAxesSet::CreateAxis( const XclImpChAxis& rChAxis, con
 void XclImpChAxesSet::ConvertBackground( Reference< XDiagram > xDiagram ) const
 {
     XclImpChTypeGroupRef xTypeGroup = GetFirstTypeGroup();
-    if( xTypeGroup.is() && xTypeGroup->Is3dWallChart() )
+    if( xTypeGroup && xTypeGroup->Is3dWallChart() )
     {
         // wall/floor formatting (3D charts)
-        if( mxXAxis.is() )
+        if( mxXAxis )
         {
             ScfPropertySet aWallProp( xDiagram->getWall() );
             mxXAxis->ConvertWall( aWallProp );
         }
-        if( mxYAxis.is() )
+        if( mxYAxis )
         {
             ScfPropertySet aFloorProp( xDiagram->getFloor() );
             mxYAxis->ConvertWall( aFloorProp );
         }
     }
-    else if( mxPlotFrame.is() )
+    else if( mxPlotFrame )
     {
         // diagram background formatting
         ScfPropertySet aWallProp( xDiagram->getWall() );
@@ -3703,14 +3703,14 @@ void XclImpChChart::Convert( Reference< XChartDocument > xChartDoc,
     InitConversion( xChartDoc, rChartRect );
 
     // chart frame formatting
-    if( mxFrame.is() )
+    if( mxFrame )
     {
         ScfPropertySet aFrameProp( xChartDoc->getPageBackground() );
         mxFrame->Convert( aFrameProp );
     }
 
     // chart title
-    if( mxTitle.is() ) try
+    if( mxTitle ) try
     {
         Reference< XTitled > xTitled( xChartDoc, UNO_QUERY_THROW );
         Reference< XTitle > xTitle( mxTitle->CreateTitle(), UNO_SET_THROW );
@@ -3730,7 +3730,7 @@ void XclImpChChart::Convert( Reference< XChartDocument > xChartDoc,
     mxSecnAxesSet->Convert( xDiagram );
 
     // legend
-    if( xDiagram.is() && mxLegend.is() )
+    if( xDiagram.is() && mxLegend )
         xDiagram->setLegend( mxLegend->CreateLegend() );
 
     /*  Following all conversions needing the old Chart1 API that involves full
@@ -3749,7 +3749,7 @@ void XclImpChChart::Convert( Reference< XChartDocument > xChartDoc,
 
         // plot area position and size (there is no real automatic mode in BIFF5 charts)
         XclImpChFramePosRef xPlotAreaPos = mxPrimAxesSet->GetPlotAreaFramePos();
-        if( IsManualPlotArea() && xPlotAreaPos.is() ) try
+        if( IsManualPlotArea() && xPlotAreaPos ) try
         {
             const XclChFramePos& rFramePos = xPlotAreaPos->GetFramePosData();
             if( (rFramePos.mnTLMode == EXC_CHFRAMEPOS_PARENT) && (rFramePos.mnBRMode == EXC_CHFRAMEPOS_PARENT) )
@@ -3771,7 +3771,7 @@ void XclImpChChart::Convert( Reference< XChartDocument > xChartDoc,
         }
 
         // positions of all title objects
-        if( mxTitle.is() )
+        if( mxTitle )
             mxTitle->ConvertTitlePosition( XclChTextKey( EXC_CHTEXTTYPE_TITLE ) );
         mxPrimAxesSet->ConvertTitlePositions();
         mxSecnAxesSet->ConvertTitlePositions();
@@ -3848,7 +3848,7 @@ void XclImpChChart::Finalize()
     mxLegend = mxPrimAxesSet->GetLegend();
     if( !mxLegend )
         mxLegend = mxSecnAxesSet->GetLegend();
-    if( mxLegend.is() )
+    if( mxLegend )
         mxLegend->Finalize();
     // axes sets, updates chart type group default formats -> must be called before FinalizeDataFormats()
     mxPrimAxesSet->Finalize();
@@ -3916,7 +3916,7 @@ void XclImpChChart::FinalizeTitle()
         // automatic title from first series name (if there are no series on secondary axes set)
         if( !mxSecnAxesSet->IsValidAxesSet() )
             aAutoTitle = mxPrimAxesSet->GetSingleSeriesTitle();
-        if( mxTitle.is() || (aAutoTitle.Len() > 0) )
+        if( mxTitle || (aAutoTitle.Len() > 0) )
         {
             if( !mxTitle )
                 mxTitle.reset( new XclImpChText( GetChRoot() ) );
@@ -4115,8 +4115,8 @@ void XclImpChart::UpdateObjFrame( const XclObjLineData& rLineData, const XclObjF
 sal_Size XclImpChart::GetProgressSize() const
 {
     return
-        (mxChartData.is() ? mxChartData->GetProgressSize() : 0) +
-        (mxChartDrawing.is() ? mxChartDrawing->GetProgressSize() : 0);
+        (mxChartData ? mxChartData->GetProgressSize() : 0) +
+        (mxChartDrawing ? mxChartDrawing->GetProgressSize() : 0);
 }
 
 void XclImpChart::Convert( Reference< XModel > xModel, XclImpDffConverter& rDffConv, const OUString& rObjName, const Rectangle& rChartRect ) const
@@ -4124,9 +4124,9 @@ void XclImpChart::Convert( Reference< XModel > xModel, XclImpDffConverter& rDffC
     Reference< XChartDocument > xChartDoc( xModel, UNO_QUERY );
     if( xChartDoc.is() )
     {
-        if( mxChartData.is() )
+        if( mxChartData )
             mxChartData->Convert( xChartDoc, rDffConv, rObjName, rChartRect );
-        if( mxChartDrawing.is() )
+        if( mxChartDrawing )
             mxChartDrawing->ConvertObjects( rDffConv, xModel, rChartRect );
     }
 }
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index 3b7f3e0f29fd..90cf202de988 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -1124,11 +1124,11 @@ ErrCode XclImpDecryptHelper::ReadFilepass( XclImpStream& rStrm )
     rStrm.SetDecrypter( xDecr );
 
     // request and verify a password (decrypter implements IDocPasswordVerifier)
-    if( xDecr.is() )
+    if( xDecr )
         rStrm.GetRoot().RequestPassword( *xDecr );
 
     // return error code (success, wrong password, etc.)
-    return xDecr.is() ? xDecr->GetError() : EXC_ENCR_ERROR_UNSUPP_CRYPT;
+    return xDecr ? xDecr->GetError() : EXC_ENCR_ERROR_UNSUPP_CRYPT;
 }
 
 // Document protection ========================================================
@@ -1167,7 +1167,6 @@ void XclImpDocProtectBuffer::Apply() const
     auto_ptr<ScDocProtection> pProtect(new ScDocProtection);
     pProtect->setProtected(true);
 
-#if ENABLE_SHEET_PROTECTION
     if (mnPassHash)
     {
         // 16-bit password pash.
@@ -1176,7 +1175,6 @@ void XclImpDocProtectBuffer::Apply() const
         aPass[1] = mnPassHash & 0xFF;
         pProtect->setPasswordHash(aPass, PASSHASH_XL);
     }
-#endif
 
     // document protection options
     pProtect->setOption(ScDocProtection::STRUCTURE, mbDocProtect);
@@ -1272,7 +1270,6 @@ void XclImpSheetProtectBuffer::Apply() const
         auto_ptr<ScTableProtection> pProtect(new ScTableProtection);
         pProtect->setProtected(true);
 
-#if ENABLE_SHEET_PROTECTION
         // 16-bit hash password
         const sal_uInt16 nHash = itr->second.mnPasswordHash;
         if (nHash)
@@ -1282,7 +1279,6 @@ void XclImpSheetProtectBuffer::Apply() const
             aPass[1] = nHash & 0xFF;
             pProtect->setPasswordHash(aPass, PASSHASH_XL);
         }
-#endif
 
         // sheet protection options
         const sal_uInt16 nOptions = itr->second.mnOptions;
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index b96b8d6b5e87..968fd5e67edf 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -113,6 +113,7 @@
 #include "scextopt.hxx"
 
 #include "namebuff.hxx"
+#include <boost/shared_ptr.hpp>
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
@@ -1322,7 +1323,7 @@ void XclImpObjTextData::ReadByteString( XclImpStream& rStrm )
 
 void XclImpObjTextData::ReadFormats( XclImpStream& rStrm )
 {
-    if( mxString.is() )
+    if( mxString )
         mxString->ReadObjFormats( rStrm, maData.mnFormatSize );
     else
         rStrm.Ignore( maData.mnFormatSize );
@@ -1384,7 +1385,7 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject&
     // set text data
     if( SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( &rSdrObj ) )
     {
-        if( maTextData.mxString.is() )
+        if( maTextData.mxString )
         {
             if( maTextData.mxString->IsRich() )
             {
@@ -1569,7 +1570,7 @@ void XclImpChartObj::DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize )
     rStrm.Ignore( 18 );
     ReadMacro3( rStrm, nMacroSize );
     // set frame format from OBJ record, it is used if chart itself is transparent
-    if( mxChart.is() )
+    if( mxChart )
         mxChart->UpdateObjFrame( maLineData, maFillData );
 }
 
@@ -1580,7 +1581,7 @@ void XclImpChartObj::DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize )
     rStrm.Ignore( 18 );
     ReadMacro4( rStrm, nMacroSize );
     // set frame format from OBJ record, it is used if chart itself is transparent
-    if( mxChart.is() )
+    if( mxChart )
         mxChart->UpdateObjFrame( maLineData, maFillData );
 }
 
@@ -1593,7 +1594,7 @@ void XclImpChartObj::DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_u
     ReadMacro5( rStrm, nMacroSize );
     ReadChartSubStream( rStrm );
     // set frame format from OBJ record, it is used if chart itself is transparent
-    if( mxChart.is() )
+    if( mxChart )
         mxChart->UpdateObjFrame( maLineData, maFillData );
 }
 
@@ -1613,14 +1614,14 @@ void XclImpChartObj::DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId
 
 sal_Size XclImpChartObj::DoGetProgressSize() const
 {
-    return mxChart.is() ? mxChart->GetProgressSize() : 1;
+    return mxChart ? mxChart->GetProgressSize() : 1;
 }
 
 SdrObject* XclImpChartObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const
 {
     SdrObjectPtr xSdrObj;
     SfxObjectShell* pDocShell = GetDocShell();
-    if( rDffConv.SupportsOleObjects() && SvtModuleOptions().IsChart() && pDocShell && mxChart.is() && !mxChart->IsPivotChart() )
+    if( rDffConv.SupportsOleObjects() && SvtModuleOptions().IsChart() && pDocShell && mxChart && !mxChart->IsPivotChart() )
     {
         // create embedded chart object
         OUString aEmbObjName;
@@ -1646,7 +1647,7 @@ SdrObject* XclImpChartObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const R
 void XclImpChartObj::DoPostProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const
 {
     const SdrOle2Obj* pSdrOleObj = dynamic_cast< const SdrOle2Obj* >( &rSdrObj );
-    if( mxChart.is() && pSdrOleObj )
+    if( mxChart && pSdrOleObj )
     {
         Reference< XEmbeddedObject > xEmbObj = pSdrOleObj->GetObjRef();
         if( xEmbObj.is() && ::svt::EmbeddedObjectRef::TryRunningState( xEmbObj ) ) try
@@ -1773,7 +1774,7 @@ void XclImpControlHelper::ApplySheetLinkProps() const
         if( xFactory.is() )
         {
             // cell link
-            if( mxCellLink.is() ) try
+            if( mxCellLink ) try
             {
                 Reference< XBindableValue > xBindable( xCtrlModel, UNO_QUERY_THROW );
 
@@ -1804,7 +1805,7 @@ void XclImpControlHelper::ApplySheetLinkProps() const
             }
 
             // source range
-            if( mxSrcRange.is() ) try
+            if( mxSrcRange ) try
             {
                 Reference< XListEntrySink > xEntrySink( xCtrlModel, UNO_QUERY_THROW );
 
@@ -1947,7 +1948,7 @@ bool XclImpTbxObjBase::FillMacroDescriptor( ScriptEventDescriptor& rDescriptor )
 
 void XclImpTbxObjBase::ConvertFont( ScfPropertySet& rPropSet ) const
 {
-    if( maTextData.mxString.is() )
+    if( maTextData.mxString )
     {
         const XclFormatRunVec& rFormatRuns = maTextData.mxString->GetFormats();
         if( rFormatRuns.empty() )
@@ -1959,7 +1960,7 @@ void XclImpTbxObjBase::ConvertFont( ScfPropertySet& rPropSet ) const
 
 void XclImpTbxObjBase::ConvertLabel( ScfPropertySet& rPropSet ) const
 {
-    if( maTextData.mxString.is() )
+    if( maTextData.mxString )
     {
         String aLabel = maTextData.mxString->GetText();
         if( maTextData.maData.mnShortcut > 0 )
@@ -2377,7 +2378,7 @@ void XclImpEditObj::DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId,
 
 void XclImpEditObj::DoProcessControl( ScfPropertySet& rPropSet ) const
 {
-    if( maTextData.mxString.is() )
+    if( maTextData.mxString )
     {
         OUString aText = maTextData.mxString->GetText();
         if( IsNumeric() )
@@ -2711,7 +2712,7 @@ void XclImpDropDownObj::DoProcessControl( ScfPropertySet& rPropSet ) const
     if( GetDropDownType() == EXC_OBJ_DROPDOWN_COMBOBOX )
     {
         // text of editable combobox
-        if( maTextData.mxString.is() )
+        if( maTextData.mxString )
             rPropSet.SetStringProperty( CREATE_OUSTRING( "DefaultText" ), maTextData.mxString->GetText() );
     }
     else
@@ -3121,7 +3122,7 @@ XclImpSimpleDffConverter::~XclImpSimpleDffConverter()
 {
 }
 
-int XclImpSimpleDffConverter::GetColorFromPalette( USHORT nIndex, Color& rColor ) const
+bool XclImpSimpleDffConverter::GetColorFromPalette( USHORT nIndex, Color& rColor ) const
 {
     ColorData nColor = GetPalette().GetColorData( static_cast< sal_uInt16 >( nIndex ) );
 
@@ -3176,17 +3177,14 @@ XclImpDffConverter::~XclImpDffConverter()
 
 String XclImpObjectManager::GetOleNameOverride( SCTAB nTab, sal_uInt16 nObjId )
 {
-    String sOleName;
+    rtl::OUString sOleName;
     String sCodeName = GetExtDocOptions().GetCodeName( nTab );
 
-    CodeNameToCntrlObjIdInfo::iterator it = maOleCtrlNameOverride.find( sCodeName );
-    if ( it != maOleCtrlNameOverride.end() )
+    if (  mxOleCtrlNameOverride->hasByName( sCodeName ) )
     {
-        CntrlObjIdToName::iterator it_id = it->second.find( nObjId );
-        if ( it_id != it->second.end() )
-        {
-            sOleName = it_id->second;
-        }
+        Reference< XIndexContainer > xIdToOleName;
+        mxOleCtrlNameOverride->getByName( sCodeName ) >>= xIdToOleName;
+        xIdToOleName->getByIndex( nObjId ) >>= sOleName;
     }
     OSL_TRACE("XclImpObjectManager::GetOleNameOverride tab %d, ( module %s ) object id ( %d ) is %s", nTab,
         rtl::OUStringToOString( sCodeName, RTL_TEXTENCODING_UTF8 ).getStr(), nObjId,
@@ -3204,7 +3202,7 @@ void XclImpDffConverter::StartProgressBar( sal_Size nProgressSize )
 
 void XclImpDffConverter::Progress( sal_Size nDelta )
 {
-    DBG_ASSERT( mxProgress.is(), "XclImpDffConverter::Progress - invalid call, no progress bar" );
+    DBG_ASSERT( mxProgress, "XclImpDffConverter::Progress - invalid call, no progress bar" );
     mxProgress->Progress( nDelta );
 }
 
@@ -3741,7 +3739,7 @@ void XclImpDrawing::ReadObj( XclImpStream& rStrm )
             DBG_ERROR_BIFF();
     }
 
-    if( xDrawObj.is() )
+    if( xDrawObj )
     {
         // insert into maRawObjs or into the last open group object
         maRawObjs.InsertGrouped( xDrawObj );
@@ -3860,7 +3858,7 @@ void XclImpDrawing::ImplConvertObjects( XclImpDffConverter& rDffConv, SdrModel&
 
 void XclImpDrawing::AppendRawObject( const XclImpDrawObjRef& rxDrawObj )
 {
-    DBG_ASSERT( rxDrawObj.is(), "XclImpDrawing::AppendRawObject - unexpected empty reference" );
+    DBG_ASSERT( rxDrawObj, "XclImpDrawing::AppendRawObject - unexpected empty reference" );
     maRawObjs.push_back( rxDrawObj );
 }
 
@@ -3990,7 +3988,7 @@ void XclImpSheetDrawing::ReadNote( XclImpStream& rStrm )
 void XclImpSheetDrawing::ReadTabChart( XclImpStream& rStrm )
 {
     DBG_ASSERT_BIFF( GetBiff() >= EXC_BIFF5 );
-    ScfRef< XclImpChartObj > xChartObj( new XclImpChartObj( GetRoot(), true ) );
+    boost::shared_ptr< XclImpChartObj > xChartObj( new XclImpChartObj( GetRoot(), true ) );
     xChartObj->ReadChartSubStream( rStrm );
     // insert the chart as raw object without connected DFF data
     AppendRawObject( xChartObj );
diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx
index e94832e99597..111f9da97426 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -232,7 +232,7 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) :
                 // discard deleted ranges ( for the moment at least )
                 if ( pData->IsValidReference( aRange ) )
                 {
-                    ScExtTabSettings& rTabSett = GetExtDocOptions().GetOrCreateTabSettings( nXclTab );
+                    GetExtDocOptions().GetOrCreateTabSettings( nXclTab );
                     // create a mapping between the unmodified localname to
                     // the name in the global name container for named ranges
                     OSL_TRACE(" mapping local name to global name for tab %d which exists? %s", nXclTab, GetDoc().HasTable( mnScTab ) ? "true" : "false" );
diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx
index 3b30c7f84998..bd9509158a88 100644
--- a/sc/source/filter/excel/xipivot.cxx
+++ b/sc/source/filter/excel/xipivot.cxx
@@ -785,7 +785,7 @@ void XclImpPivotCache::ReadPivotCacheStream( XclImpStream& rStrm )
             case EXC_ID_SXSTRING:
             case EXC_ID_SXDATETIME:
             case EXC_ID_SXEMPTY:
-                if( xCurrField.is() )                   // inline items
+                if( xCurrField )                   // inline items
                 {
                     xCurrField->ReadItem( aPCStrm );
                 }
@@ -810,12 +810,12 @@ void XclImpPivotCache::ReadPivotCacheStream( XclImpStream& rStrm )
             break;
 
             case EXC_ID_SXNUMGROUP:
-                if( xCurrField.is() )
+                if( xCurrField )
                     xCurrField->ReadSxnumgroup( aPCStrm );
             break;
 
             case EXC_ID_SXGROUPINFO:
-                if( xCurrField.is() )
+                if( xCurrField )
                     xCurrField->ReadSxgroupinfo( aPCStrm );
             break;
 
@@ -909,7 +909,7 @@ XclImpPTField::XclImpPTField( const XclImpPivotTable& rPTable, sal_uInt16 nCache
 const XclImpPCField* XclImpPTField::GetCacheField() const
 {
     XclImpPivotCacheRef xPCache = mrPTable.GetPivotCache();
-    return xPCache.is() ? xPCache->GetField( maFieldInfo.mnCacheIdx ) : 0;
+    return xPCache ? xPCache->GetField( maFieldInfo.mnCacheIdx ) : 0;
 }
 
 const String& XclImpPTField::GetFieldName() const
@@ -1256,13 +1256,13 @@ void XclImpPivotTable::ReadSxvd( XclImpStream& rStrm )
 
 void XclImpPivotTable::ReadSxvi( XclImpStream& rStrm )
 {
-    if( mxCurrField.is() )
+    if( mxCurrField )
         mxCurrField->ReadSxvi( rStrm );
 }
 
 void XclImpPivotTable::ReadSxvdex( XclImpStream& rStrm )
 {
-    if( mxCurrField.is() )
+    if( mxCurrField )
         mxCurrField->ReadSxvdex( rStrm );
 }
 
diff --git a/sc/source/filter/excel/xiroot.cxx b/sc/source/filter/excel/xiroot.cxx
index 9a0b50e3a999..9180ed401b62 100644
--- a/sc/source/filter/excel/xiroot.cxx
+++ b/sc/source/filter/excel/xiroot.cxx
@@ -109,7 +109,7 @@ void XclImpRoot::SetAppFontEncoding( rtl_TextEncoding eAppFontEnc )
         SetTextEncoding( eAppFontEnc );
 }
 
-void XclImpRoot::InitializeTable( SCTAB /*nScTab*/ )
+void XclImpRoot::InitializeTable( SCTAB nScTab )
 {
     if( GetBiff() <= EXC_BIFF4 )
     {
@@ -121,6 +121,8 @@ void XclImpRoot::InitializeTable( SCTAB /*nScTab*/ )
     GetXFRangeBuffer().Initialize();
     GetPageSettings().Initialize();
     GetTabViewSettings().Initialize();
+    // delete the automatically generated codename
+    GetDoc().SetCodeName( nScTab, String::EmptyString() );
 }
 
 void XclImpRoot::FinalizeTable()
@@ -149,7 +151,7 @@ ExcelToSc& XclImpRoot::GetOldFmlaConverter() const
 
 XclImpSst& XclImpRoot::GetSst() const
 {
-    DBG_ASSERT( mrImpData.mxSst.is(), "XclImpRoot::GetSst - invalid call, wrong BIFF" );
+    DBG_ASSERT( mrImpData.mxSst, "XclImpRoot::GetSst - invalid call, wrong BIFF" );
     return *mrImpData.mxSst;
 }
 
@@ -202,7 +204,7 @@ XclImpNameManager& XclImpRoot::GetNameManager() const
 
 XclImpLinkManager& XclImpRoot::GetLinkManager() const
 {
-    DBG_ASSERT( mrImpData.mxLinkMgr.is(), "XclImpRoot::GetLinkManager - invalid call, wrong BIFF" );
+    DBG_ASSERT( mrImpData.mxLinkMgr, "XclImpRoot::GetLinkManager - invalid call, wrong BIFF" );
     return *mrImpData.mxLinkMgr;
 }
 
@@ -219,13 +221,13 @@ XclImpSheetDrawing& XclImpRoot::GetCurrSheetDrawing() const
 
 XclImpCondFormatManager& XclImpRoot::GetCondFormatManager() const
 {
-    DBG_ASSERT( mrImpData.mxCondFmtMgr.is(), "XclImpRoot::GetCondFormatManager - invalid call, wrong BIFF" );
+    DBG_ASSERT( mrImpData.mxCondFmtMgr, "XclImpRoot::GetCondFormatManager - invalid call, wrong BIFF" );
     return *mrImpData.mxCondFmtMgr;
 }
 
 XclImpValidationManager& XclImpRoot::GetValidationManager() const
 {
-    DBG_ASSERT( mrImpData.mxValidMgr.is(), "XclImpRoot::GetValidationManager - invalid call, wrong BIFF" );
+    DBG_ASSERT( mrImpData.mxValidMgr, "XclImpRoot::GetValidationManager - invalid call, wrong BIFF" );
     return *mrImpData.mxValidMgr;
 }
 
@@ -238,25 +240,25 @@ XclImpAutoFilterBuffer& XclImpRoot::GetFilterManager() const
 
 XclImpWebQueryBuffer& XclImpRoot::GetWebQueryBuffer() const
 {
-    DBG_ASSERT( mrImpData.mxWebQueryBfr.is(), "XclImpRoot::GetWebQueryBuffer - invalid call, wrong BIFF" );
+    DBG_ASSERT( mrImpData.mxWebQueryBfr, "XclImpRoot::GetWebQueryBuffer - invalid call, wrong BIFF" );
     return *mrImpData.mxWebQueryBfr;
 }
 
 XclImpPivotTableManager& XclImpRoot::GetPivotTableManager() const
 {
-    DBG_ASSERT( mrImpData.mxPTableMgr.is(), "XclImpRoot::GetPivotTableManager - invalid call, wrong BIFF" );
+    DBG_ASSERT( mrImpData.mxPTableMgr, "XclImpRoot::GetPivotTableManager - invalid call, wrong BIFF" );
     return *mrImpData.mxPTableMgr;
 }
 
 XclImpSheetProtectBuffer& XclImpRoot::GetSheetProtectBuffer() const
 {
-    DBG_ASSERT( mrImpData.mxTabProtect.is(), "XclImpRoot::GetSheetProtectBuffer - invalid call, wrong BIFF" );
+    DBG_ASSERT( mrImpData.mxTabProtect, "XclImpRoot::GetSheetProtectBuffer - invalid call, wrong BIFF" );
     return *mrImpData.mxTabProtect;
 }
 
 XclImpDocProtectBuffer& XclImpRoot::GetDocProtectBuffer() const
 {
-    DBG_ASSERT( mrImpData.mxDocProtect.is(), "XclImpRoot::GetDocProtectBuffer - invalid call, wrong BIFF" );
+    DBG_ASSERT( mrImpData.mxDocProtect, "XclImpRoot::GetDocProtectBuffer - invalid call, wrong BIFF" );
     return *mrImpData.mxDocProtect;
 }
 
diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx
index 86dec6126200..74428a0d4314 100644
--- a/sc/source/filter/excel/xistream.cxx
+++ b/sc/source/filter/excel/xistream.cxx
@@ -442,14 +442,14 @@ void XclImpStream::SetDecrypter( XclImpDecrypterRef xDecrypter )
 void XclImpStream::CopyDecrypterFrom( const XclImpStream& rStrm )
 {
     XclImpDecrypterRef xNewDecr;
-    if( rStrm.mxDecrypter.is() )
+    if( rStrm.mxDecrypter )
         xNewDecr = rStrm.mxDecrypter->Clone();
     SetDecrypter( xNewDecr );
 }
 
 bool XclImpStream::HasValidDecrypter() const
 {
-    return mxDecrypter.is() && mxDecrypter->IsValid();
+    return mxDecrypter && mxDecrypter->IsValid();
 }
 
 void XclImpStream::EnableDecryption( bool bEnable )
@@ -998,7 +998,7 @@ bool XclImpStream::ReadNextRawRecHeader()
 
 void XclImpStream::SetupDecrypter()
 {
-    if( mxDecrypter.is() )
+    if( mxDecrypter )
         mxDecrypter->Update( mrStrm, mnRawRecSize );
 }
 
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index 6693d6fe3936..f15a6dde0d14 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -1871,7 +1871,7 @@ void XclImpXFRangeBuffer::Finalize()
     for( XclImpXFRangeColumnVec::const_iterator aVBeg = maColumns.begin(), aVEnd = maColumns.end(), aVIt = aVBeg; aVIt != aVEnd; ++aVIt )
     {
         // apply all cell styles of an existing column
-        if( aVIt->is() )
+        if( aVIt->get() )
         {
             XclImpXFRangeColumn& rColumn = **aVIt;
             SCCOL nScCol = static_cast< SCCOL >( aVIt - aVBeg );
diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx
index 34d011ed3d6a..ae84e288f635 100644
--- a/sc/source/filter/excel/xlchart.cxx
+++ b/sc/source/filter/excel/xlchart.cxx
@@ -1054,7 +1054,7 @@ void XclChPropSetHelper::WriteEscherProperties( ScfPropertySet& rPropSet,
         const XclChEscherFormat& rEscherFmt, const XclChPicFormat& rPicFmt,
         XclChPropertyMode ePropMode )
 {
-    if( rEscherFmt.mxItemSet.is() )
+    if( rEscherFmt.mxItemSet )
     {
         if( const XFillStyleItem* pStyleItem = static_cast< const XFillStyleItem* >( rEscherFmt.mxItemSet->GetItem( XATTR_FILLSTYLE, FALSE ) ) )
         {
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index 04e428c3de7d..b5710123ebd8 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -563,7 +563,7 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclTokenArray& rTokArr )
 
 XclExpStream& operator<<( XclExpStream& rStrm, const XclTokenArrayRef& rxTokArr )
 {
-    if( rxTokArr.is() )
+    if( rxTokArr )
         rxTokArr->Write( rStrm );
     else
         rStrm << sal_uInt16( 0 );
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index fbca2c85918a..5d439a249bc1 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -178,8 +178,9 @@ XclRoot::XclRoot( XclRootData& rRootData ) :
 
     // filter tracer
     // do not use CREATE_OUSTRING for conditional expression
-    mrData.mxTracer.reset( new XclTracer( GetDocUrl(), OUString::createFromAscii(
-        IsExport() ? "Office.Tracing/Export/Excel" : "Office.Tracing/Import/Excel" ) ) );
+    mrData.mxTracer.reset( new XclTracer( GetDocUrl(), IsExport() ?
+                                                OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Tracing/Export/Excel"))
+                                              : OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Tracing/Import/Excel" )) ) );
 }
 
 XclRoot::XclRoot( const XclRoot& rRoot ) :
diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx
index 0f0d985a3cf6..ebb6dabd4a17 100644
--- a/sc/source/filter/excel/xltoolbar.cxx
+++ b/sc/source/filter/excel/xltoolbar.cxx
@@ -257,21 +257,6 @@ bool TBC::ImportToolBarControl( CTBWrapper& rWrapper, const css::uno::Reference<
     if ( tbcd.get() )
     {
         std::vector< css::beans::PropertyValue > props;
-/*
-        if ( bBuiltin )
-        {
-            rtl::OUString sCommand = helper.MSOCommandToOOCommand( cmdId );
-            if ( sCommand.getLength() > 0 )
-            {
-                beans::PropertyValue aProp;
-
-                aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") );
-                aProp.Value <<= sCommand;
-                props.push_back( aProp );
-            }
-
-        }
-*/
         bool bBeginGroup = false;
         if ( ! tbcd->ImportToolBarControl( helper, props, bBeginGroup, bIsMenuToolbar ) )
             return false;
diff --git a/sc/source/filter/ftools/makefile.mk b/sc/source/filter/ftools/makefile.mk
index d37e74a133a0..39c6984d5198 100644
--- a/sc/source/filter/ftools/makefile.mk
+++ b/sc/source/filter/ftools/makefile.mk
@@ -43,13 +43,13 @@ PROJECTPCHSOURCE=..\pch\filt_pch
 # --- Files --------------------------------------------------------
 
 SLOFILES =	\
+        $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
         $(SLO)$/fapihelper.obj				\
         $(SLO)$/fprogressbar.obj			\
         $(SLO)$/ftools.obj
 
-EXCEPTIONSFILES = \
-        $(SLO)$/fapihelper.obj
-
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/sc/source/filter/html/makefile.mk b/sc/source/filter/html/makefile.mk
index 41db4de9780f..cb6312b3601d 100644
--- a/sc/source/filter/html/makefile.mk
+++ b/sc/source/filter/html/makefile.mk
@@ -44,14 +44,13 @@ VISIBILITY_HIDDEN=TRUE
 
 # --- Files --------------------------------------------------------
 
-SLOFILES =						\
-        $(SLO)$/htmlexp.obj		\
-        $(SLO)$/htmlexp2.obj	\
-        $(SLO)$/htmlimp.obj		\
-        $(SLO)$/htmlpars.obj
+SLOFILES =				\
+        $(EXCEPTIONSFILES)
 
-EXCEPTIONSFILES =				\
+EXCEPTIONSFILES =			\
         $(SLO)$/htmlexp.obj		\
+        $(SLO)$/htmlexp2.obj		\
+        $(SLO)$/htmlimp.obj		\
         $(SLO)$/htmlpars.obj
 
 # --- Targets -------------------------------------------------------
diff --git a/sc/source/filter/inc/excdoc.hxx b/sc/source/filter/inc/excdoc.hxx
index 26b9a64ef89a..3ba8b5e65936 100644
--- a/sc/source/filter/inc/excdoc.hxx
+++ b/sc/source/filter/inc/excdoc.hxx
@@ -33,6 +33,7 @@
 #include "excrecds.hxx"
 #include "xeroot.hxx"
 #include "root.hxx"
+#include <boost/shared_ptr.hpp>
 
 //------------------------------------------------------------------ Forwards -
 
@@ -55,7 +56,7 @@ class ExcTable : public XclExpRecordBase, public XclExpRoot
 {
 private:
     typedef XclExpRecordList< ExcBundlesheetBase >  ExcBoundsheetList;
-    typedef ScfRef< XclExpCellTable >               XclExpCellTableRef;
+    typedef boost::shared_ptr< XclExpCellTable >    XclExpCellTableRef;
 
     XclExpRecordList<>          aRecList;
     XclExpCellTableRef          mxCellTable;
diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx
index a450fb00f368..7e1ce313c26b 100644
--- a/sc/source/filter/inc/excrecds.hxx
+++ b/sc/source/filter/inc/excrecds.hxx
@@ -47,6 +47,7 @@
 #include "root.hxx"
 #include "excdefs.hxx"
 #include "cell.hxx"
+#include <boost/shared_ptr.hpp>
 
 //------------------------------------------------------------------ Forwards -
 
@@ -500,7 +501,7 @@ public:
 private:
     using               XclExpRoot::CreateRecord;
 
-    typedef ScfRef< ExcAutoFilterRecs >             XclExpTabFilterRef;
+    typedef boost::shared_ptr< ExcAutoFilterRecs >  XclExpTabFilterRef;
     typedef ::std::map< SCTAB, XclExpTabFilterRef > XclExpTabFilterMap;
 
     XclExpTabFilterMap  maFilterMap;
diff --git a/sc/source/filter/inc/fprogressbar.hxx b/sc/source/filter/inc/fprogressbar.hxx
index b65b12d981f0..0a7d92594e02 100644
--- a/sc/source/filter/inc/fprogressbar.hxx
+++ b/sc/source/filter/inc/fprogressbar.hxx
@@ -29,6 +29,7 @@
 #ifndef SC_FPROGRESSBAR_HXX
 #define SC_FPROGRESSBAR_HXX
 
+#include <boost/noncopyable.hpp>
 #include "globstr.hrc"
 #include "ftools.hxx"
 #include "scdllapi.h"
@@ -111,7 +112,7 @@ const sal_Int32 SCF_INV_SEGMENT = -1;
         // not allowed (second segment active):   aProgress.Progress();
         // not allowed (first segment not empty): aProgress.GetSegmentProgressBar( nSeg1 );
  */
-class ScfProgressBar : ScfNoCopy
+class ScfProgressBar : private boost::noncopyable
 {
 public:
     explicit            ScfProgressBar( SfxObjectShell* pDocShell, const String& rText );
diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx
index d02cba498fcf..9e0c461ed058 100644
--- a/sc/source/filter/inc/ftools.hxx
+++ b/sc/source/filter/inc/ftools.hxx
@@ -37,6 +37,8 @@
 #include <tools/list.hxx>
 #include <tools/debug.hxx>
 #include <oox/helper/helper.hxx>
+#include <boost/noncopyable.hpp>
+#include <boost/shared_ptr.hpp>
 #include "filter.hxx"
 #include "scdllapi.h"
 
@@ -138,113 +140,20 @@ void insert_value( Type& rnBitField, InsertType nValue, sal_uInt8 nStartBit, sal
 
 // ============================================================================
 
-/** Deriving from this class prevents copy construction. */
-class ScfNoCopy
-{
-private:
-                        ScfNoCopy( const ScfNoCopy& );
-    ScfNoCopy&          operator=( const ScfNoCopy& );
-protected:
-    inline              ScfNoCopy() {}
-};
-
-// ----------------------------------------------------------------------------
-
-/** Deriving from this class prevents construction in general. */
-class ScfNoInstance : private ScfNoCopy {};
-
-// ============================================================================
-
-/** Simple shared pointer (NOT thread-save, but faster than boost::shared_ptr). */
-template< typename Type >
-class ScfRef
-{
-    template< typename > friend class ScfRef;
-
-public:
-    typedef Type        element_type;
-    typedef ScfRef      this_type;
-
-    inline explicit     ScfRef( element_type* pObj = 0 ) { eat( pObj ); }
-    inline /*implicit*/ ScfRef( const this_type& rRef ) { eat( rRef.mpObj, rRef.mpnCount ); }
-    template< typename Type2 >
-    inline /*implicit*/ ScfRef( const ScfRef< Type2 >& rRef ) { eat( rRef.mpObj, rRef.mpnCount ); }
-    inline              ~ScfRef() { rel(); }
-
-    inline void         reset( element_type* pObj = 0 ) { rel(); eat( pObj ); }
-    inline this_type&   operator=( const this_type& rRef ) { if( this != &rRef ) { rel(); eat( rRef.mpObj, rRef.mpnCount ); } return *this; }
-    template< typename Type2 >
-    inline this_type&   operator=( const ScfRef< Type2 >& rRef ) { rel(); eat( rRef.mpObj, rRef.mpnCount ); return *this; }
-
-    inline element_type* get() const { return mpObj; }
-    inline bool         is() const { return mpObj != 0; }
-
-    inline element_type* operator->() const { return mpObj; }
-    inline element_type& operator*() const { return *mpObj; }
-
-    inline bool         operator!() const { return mpObj == 0; }
-
-private:
-    inline void         eat( element_type* pObj, size_t* pnCount = 0 ) { mpObj = pObj; mpnCount = mpObj ? (pnCount ? pnCount : new size_t( 0 )) : 0; if( mpnCount ) ++*mpnCount; }
-    inline void         rel() { if( mpnCount && !--*mpnCount ) { DELETEZ( mpObj ); DELETEZ( mpnCount ); } }
-
-private:
-    Type*               mpObj;
-    size_t*             mpnCount;
-};
-
-template< typename Type >
-inline bool operator==( const ScfRef< Type >& rxRef1, const ScfRef< Type >& rxRef2 )
-{
-    return rxRef1.get() == rxRef2.get();
-}
-
-template< typename Type >
-inline bool operator!=( const ScfRef< Type >& rxRef1, const ScfRef< Type >& rxRef2 )
-{
-    return rxRef1.get() != rxRef2.get();
-}
-
-template< typename Type >
-inline bool operator<( const ScfRef< Type >& rxRef1, const ScfRef< Type >& rxRef2 )
-{
-    return rxRef1.get() < rxRef2.get();
-}
-
-template< typename Type >
-inline bool operator>( const ScfRef< Type >& rxRef1, const ScfRef< Type >& rxRef2 )
-{
-    return rxRef1.get() > rxRef2.get();
-}
-
-template< typename Type >
-inline bool operator<=( const ScfRef< Type >& rxRef1, const ScfRef< Type >& rxRef2 )
-{
-    return rxRef1.get() <= rxRef2.get();
-}
-
-template< typename Type >
-inline bool operator>=( const ScfRef< Type >& rxRef1, const ScfRef< Type >& rxRef2 )
-{
-    return rxRef1.get() >= rxRef2.get();
-}
-
-// ----------------------------------------------------------------------------
-
 /** Template for a map of ref-counted objects with additional accessor functions. */
 template< typename KeyType, typename ObjType >
-class ScfRefMap : public ::std::map< KeyType, ScfRef< ObjType > >
+class ScfRefMap : public ::std::map< KeyType, boost::shared_ptr< ObjType > >
 {
 public:
     typedef KeyType                             key_type;
-    typedef ScfRef< ObjType >                   ref_type;
+    typedef boost::shared_ptr< ObjType >        ref_type;
     typedef ::std::map< key_type, ref_type >    map_type;
 
     /** Returns true, if the object accossiated to the passed key exists. */
     inline bool         has( key_type nKey ) const
                         {
                             typename map_type::const_iterator aIt = find( nKey );
-                            return (aIt != this->end()) && aIt->second.is();
+                            return (aIt != this->end()) && aIt->second;
                         }
 
     /** Returns a reference to the object accossiated to the passed key, or 0 on error. */
@@ -269,7 +178,7 @@ class SotStorageStreamRef;
 class SvStream;
 
 /** Contains static methods used anywhere in the filters. */
-class ScfTools : ScfNoInstance
+class ScfTools : boost::noncopyable
 {
 public:
 
@@ -400,6 +309,10 @@ private:
     static const String& GetHTMLIndexPrefix();
     /** Returns the prefix for table names. */
     static const String& GetHTMLNamePrefix();
+    /** We don't want anybody to instantiate this class, since it is just a
+        collection of static items. To enforce this, the default constructor
+        is made private */
+    ScfTools();
 };
 
 // Containers =================================================================
diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx
index f5d85328afdf..130c54316da2 100644
--- a/sc/source/filter/inc/imp_op.hxx
+++ b/sc/source/filter/inc/imp_op.hxx
@@ -39,6 +39,7 @@
 #include "otlnbuff.hxx"
 #include "colrowst.hxx"
 #include "excdefs.hxx"
+#include <boost/shared_ptr.hpp>
 
 
 class SfxItemSet;
@@ -78,8 +79,8 @@ public:
     void                Convert();
 
 private:
-    typedef ScfRef< XclImpOutlineBuffer >  XclImpOutlineBfrRef;
-    typedef ScfRef< XclImpColRowSettings > XclImpColRowSettRef;
+    typedef boost::shared_ptr< XclImpOutlineBuffer >  XclImpOutlineBfrRef;
+    typedef boost::shared_ptr< XclImpColRowSettings > XclImpColRowSettRef;
 
     XclImpOutlineBfrRef mxColOutlineBuff;
     XclImpOutlineBfrRef mxRowOutlineBuff;
diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx
index bbf9c764539e..f1b3f9b03726 100644
--- a/sc/source/filter/inc/xechart.hxx
+++ b/sc/source/filter/inc/xechart.hxx
@@ -36,6 +36,7 @@
 #include "xlstyle.hxx"
 #include "xeroot.hxx"
 #include "xestring.hxx"
+#include <boost/shared_ptr.hpp>
 
 class Size;
 
@@ -158,7 +159,7 @@ protected:
     void                FinalizeFutureRecBlock( XclExpStream& rStrm );
 
 private:
-    typedef ScfRef< XclExpChRootData > XclExpChRootDataRef;
+    typedef boost::shared_ptr< XclExpChRootData > XclExpChRootDataRef;
     XclExpChRootDataRef mxChData;           /// Reference to the root data object.
 };
 
@@ -225,7 +226,7 @@ private:
     XclChFramePos       maData;             /// Position of the frame.
 };
 
-typedef ScfRef< XclExpChFramePos > XclExpChFramePosRef;
+typedef boost::shared_ptr< XclExpChFramePos > XclExpChFramePosRef;
 
 // ----------------------------------------------------------------------------
 
@@ -260,7 +261,7 @@ private:
     sal_uInt32          mnColorId;          /// Line color identifier.
 };
 
-typedef ScfRef< XclExpChLineFormat > XclExpChLineFormatRef;
+typedef boost::shared_ptr< XclExpChLineFormat > XclExpChLineFormatRef;
 
 // ----------------------------------------------------------------------------
 
@@ -294,7 +295,7 @@ private:
     sal_uInt32          mnBackColorId;      /// Pattern background color identifier.
 };
 
-typedef ScfRef< XclExpChAreaFormat > XclExpChAreaFormatRef;
+typedef boost::shared_ptr< XclExpChAreaFormat > XclExpChAreaFormatRef;
 
 // ----------------------------------------------------------------------------
 
@@ -329,7 +330,7 @@ private:
     sal_uInt32          mnColor2Id;         /// Second fill color identifier.
 };
 
-typedef ScfRef< XclExpChEscherFormat > XclExpChEscherFormatRef;
+typedef boost::shared_ptr< XclExpChEscherFormat > XclExpChEscherFormatRef;
 
 // ----------------------------------------------------------------------------
 
@@ -398,7 +399,7 @@ private:
     XclChObjectType     meObjType;          /// Type of the represented object.
 };
 
-typedef ScfRef< XclExpChFrame > XclExpChFrameRef;
+typedef boost::shared_ptr< XclExpChFrame > XclExpChFrameRef;
 
 // Source links ===============================================================
 
@@ -422,7 +423,7 @@ public:
     void                AppendString( const String& rStr );
 
     /** Returns true, if this source link contains explicit string data. */
-    inline bool         HasString() const { return mxString.is() && !mxString->IsEmpty(); }
+    inline bool         HasString() const { return mxString && !mxString->IsEmpty(); }
 
     /** Writes the CHSOURCELINK record and optionally a CHSTRING record with explicit string data. */
     virtual void        Save( XclExpStream& rStrm );
@@ -436,7 +437,7 @@ private:
     XclExpStringRef     mxString;           /// Text data (CHSTRING record).
 };
 
-typedef ScfRef< XclExpChSourceLink > XclExpChSourceLinkRef;
+typedef boost::shared_ptr< XclExpChSourceLink > XclExpChSourceLinkRef;
 
 // Text =======================================================================
 
@@ -447,7 +448,7 @@ public:
     explicit            XclExpChFont( sal_uInt16 nFontIdx );
 };
 
-typedef ScfRef< XclExpChFont > XclExpChFontRef;
+typedef boost::shared_ptr< XclExpChFont > XclExpChFontRef;
 
 // ----------------------------------------------------------------------------
 
@@ -464,7 +465,7 @@ private:
     XclChObjectLink     maData;             /// Contents of the CHOBJECTLINK record.
 };
 
-typedef ScfRef< XclExpChObjectLink > XclExpChObjectLinkRef;
+typedef boost::shared_ptr< XclExpChObjectLink > XclExpChObjectLinkRef;
 
 // ----------------------------------------------------------------------------
 
@@ -487,7 +488,7 @@ private:
     XclChFrLabelProps   maData;             /// Contents of the CHFRLABELPROPS record.
 };
 
-typedef ScfRef< XclExpChFrLabelProps > XclExpChFrLabelPropsRef;
+typedef boost::shared_ptr< XclExpChFrLabelProps > XclExpChFrLabelPropsRef;
 
 // ----------------------------------------------------------------------------
 
@@ -542,7 +543,7 @@ public:
     void                ConvertTrendLineEquation( const ScfPropertySet& rPropSet, const XclChDataPointPos& rPointPos );
 
     /** Returns true, if the string object does not contain any text data. */
-    inline bool         HasString() const { return mxSrcLink.is() && mxSrcLink->HasString(); }
+    inline bool         HasString() const { return mxSrcLink && mxSrcLink->HasString(); }
     /** Returns the flags needed for the CHATTACHEDLABEL record. */
     sal_uInt16          GetAttLabelFlags() const;
 
@@ -563,7 +564,7 @@ private:
     sal_uInt32          mnTextColorId;      /// Text color identifier.
 };
 
-typedef ScfRef< XclExpChText > XclExpChTextRef;
+typedef boost::shared_ptr< XclExpChText > XclExpChTextRef;
 
 // Data series ================================================================
 
@@ -599,7 +600,7 @@ private:
     sal_uInt32          mnFillColorId;      /// Fill color identifier.
 };
 
-typedef ScfRef< XclExpChMarkerFormat > XclExpChMarkerFormatRef;
+typedef boost::shared_ptr< XclExpChMarkerFormat > XclExpChMarkerFormatRef;
 
 // ----------------------------------------------------------------------------
 
@@ -613,7 +614,7 @@ public:
     void                Convert( const ScfPropertySet& rPropSet );
 };
 
-typedef ScfRef< XclExpChPieFormat > XclExpChPieFormatRef;
+typedef boost::shared_ptr< XclExpChPieFormat > XclExpChPieFormatRef;
 
 // ----------------------------------------------------------------------------
 
@@ -633,7 +634,7 @@ private:
     XclCh3dDataFormat   maData;             /// Contents of the CH3DDATAFORMAT record.
 };
 
-typedef ScfRef< XclExpCh3dDataFormat > XclExpCh3dDataFormatRef;
+typedef boost::shared_ptr< XclExpCh3dDataFormat > XclExpCh3dDataFormatRef;
 
 // ----------------------------------------------------------------------------
 
@@ -644,7 +645,7 @@ public:
     explicit            XclExpChAttachedLabel( sal_uInt16 nFlags );
 };
 
-typedef ScfRef< XclExpChAttachedLabel > XclExpChAttLabelRef;
+typedef boost::shared_ptr< XclExpChAttachedLabel > XclExpChAttLabelRef;
 
 // ----------------------------------------------------------------------------
 
@@ -685,7 +686,7 @@ private:
     XclExpChAttLabelRef mxAttLabel;         /// Data point label type (CHATTACHEDLABEL record).
 };
 
-typedef ScfRef< XclExpChDataFormat > XclExpChDataFormatRef;
+typedef boost::shared_ptr< XclExpChDataFormat > XclExpChDataFormatRef;
 
 // ----------------------------------------------------------------------------
 
@@ -715,7 +716,7 @@ private:
     XclExpChTextRef     mxLabel;            /// Formatting of the equation text box.
 };
 
-typedef ScfRef< XclExpChSerTrendLine > XclExpChSerTrendLineRef;
+typedef boost::shared_ptr< XclExpChSerTrendLine > XclExpChSerTrendLineRef;
 
 // ----------------------------------------------------------------------------
 
@@ -735,7 +736,7 @@ private:
     XclChSerErrorBar    maData;             /// Contents of the CHSERERRORBAR record.
 };
 
-typedef ScfRef< XclExpChSerErrorBar > XclExpChSerErrorBarRef;
+typedef boost::shared_ptr< XclExpChSerErrorBar > XclExpChSerErrorBarRef;
 
 // ----------------------------------------------------------------------------
 
@@ -809,7 +810,7 @@ private:
     sal_uInt16          mnParentIdx;        /// 0-based index of parent series (trend lines and error bars).
 };
 
-typedef ScfRef< XclExpChSeries > XclExpChSeriesRef;
+typedef boost::shared_ptr< XclExpChSeries > XclExpChSeriesRef;
 
 // Chart type groups ==========================================================
 
@@ -865,7 +866,7 @@ private:
     XclChChart3d        maData;             /// Contents of the CHCHART3D record.
 };
 
-typedef ScfRef< XclExpChChart3d > XclExpChChart3dRef;
+typedef boost::shared_ptr< XclExpChChart3d > XclExpChChart3dRef;
 
 // ----------------------------------------------------------------------------
 
@@ -895,7 +896,7 @@ private:
     XclExpChFrameRef    mxFrame;            /// Legend frame format (CHFRAME group).
 };
 
-typedef ScfRef< XclExpChLegend > XclExpChLegendRef;
+typedef boost::shared_ptr< XclExpChLegend > XclExpChLegendRef;
 
 // ----------------------------------------------------------------------------
 
@@ -923,7 +924,7 @@ private:
     sal_uInt16          mnBarDist;          /// Distance between bars (CHDROPBAR record).
 };
 
-typedef ScfRef< XclExpChDropBar > XclExpChDropBarRef;
+typedef boost::shared_ptr< XclExpChDropBar > XclExpChDropBarRef;
 
 // ----------------------------------------------------------------------------
 
@@ -967,7 +968,7 @@ public:
     /** Returns true, if chart type supports wall and floor format. */
     inline bool         Is3dWallChart() const { return Is3dChart() && (maTypeInfo.meTypeCateg != EXC_CHTYPECATEG_PIE); }
     /** Returns true, if the series in this chart type group are ordered on the Z axis. */
-    inline bool         Is3dDeepChart() const { return Is3dWallChart() && mxChart3d.is() && !mxChart3d->IsClustered(); }
+    inline bool         Is3dDeepChart() const { return Is3dWallChart() && mxChart3d && !mxChart3d->IsClustered(); }
     /** Returns true, if this chart type can be combined with other types. */
     inline bool         IsCombinable2d() const { return !Is3dChart() && maTypeInfo.mbCombinable2d; }
 
@@ -1004,7 +1005,7 @@ private:
     XclExpChLineFormatMap maChartLines;     /// Global line formats (CHCHARTLINE group).
 };
 
-typedef ScfRef< XclExpChTypeGroup > XclExpChTypeGroupRef;
+typedef boost::shared_ptr< XclExpChTypeGroup > XclExpChTypeGroupRef;
 
 // Axes =======================================================================
 
@@ -1028,7 +1029,7 @@ private:
     XclChLabelRange     maData;             /// Contents of the CHLABELRANGE record.
 };
 
-typedef ScfRef< XclExpChLabelRange > XclExpChLabelRangeRef;
+typedef boost::shared_ptr< XclExpChLabelRange > XclExpChLabelRangeRef;
 
 // ----------------------------------------------------------------------------
 
@@ -1049,7 +1050,7 @@ private:
     XclChValueRange     maData;             /// Contents of the CHVALUERANGE record.
 };
 
-typedef ScfRef< XclExpChValueRange > XclExpChValueRangeRef;
+typedef boost::shared_ptr< XclExpChValueRange > XclExpChValueRangeRef;
 
 // ----------------------------------------------------------------------------
 
@@ -1073,7 +1074,7 @@ private:
     sal_uInt32          mnTextColorId;      /// Axis labels text color identifier.
 };
 
-typedef ScfRef< XclExpChTick > XclExpChTickRef;
+typedef boost::shared_ptr< XclExpChTick > XclExpChTickRef;
 
 // ----------------------------------------------------------------------------
 
@@ -1126,7 +1127,7 @@ private:
     sal_uInt16          mnNumFmtIdx;        /// Index into number format buffer (CHFORMAT record).
 };
 
-typedef ScfRef< XclExpChAxis > XclExpChAxisRef;
+typedef boost::shared_ptr< XclExpChAxis > XclExpChAxisRef;
 
 // ----------------------------------------------------------------------------
 
@@ -1190,7 +1191,7 @@ private:
     XclExpChTypeGroupList maTypeGroups;     /// Chart type groups (CHTYPEGROUP group).
 };
 
-typedef ScfRef< XclExpChAxesSet > XclExpChAxesSetRef;
+typedef boost::shared_ptr< XclExpChAxesSet > XclExpChAxesSetRef;
 
 // The chart object ===========================================================
 
@@ -1255,8 +1256,8 @@ public:
     virtual void        Save( XclExpStream& rStrm );
 
 private:
-    ScfRef< XclExpObjectManager > mxObjMgr;
-    ScfRef< XclExpRecordBase > mxObjRecs;
+    boost::shared_ptr< XclExpObjectManager > mxObjMgr;
+    boost::shared_ptr< XclExpRecordBase > mxObjRecs;
 };
 
 // ----------------------------------------------------------------------------
diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx
index 1e6178ef6c62..34c80c4021ea 100644
--- a/sc/source/filter/inc/xeescher.hxx
+++ b/sc/source/filter/inc/xeescher.hxx
@@ -35,6 +35,7 @@
 #include "xlescher.hxx"
 #include <com/sun/star/chart/XChartDocument.hpp>
 #include "svx/sdtaitm.hxx"
+#include <boost/shared_ptr.hpp>
 
 
 namespace com { namespace sun { namespace star {
@@ -330,7 +331,7 @@ public:
     void WriteShapeTransformation( sax_fastparser::FSHelperPtr pFS, const XShapeRef& rXShape, sal_Bool bFlipH = false, sal_Bool bFlipV = false, sal_Int32 nRotation = 0 );
 
 private:
-    typedef ScfRef< XclExpChart > XclExpChartRef;
+    typedef boost::shared_ptr< XclExpChart > XclExpChartRef;
     XclExpChartRef      mxChart;        /// The chart itself (BOF/EOF substream data).
     XShapeRef mxShape;
     XChartDocRef mxChartDoc;
@@ -423,17 +424,17 @@ public:
 
     /** Creates and returns the MSODRAWINGGROUP record containing global DFF
         data in the DGGCONTAINER. */
-    ScfRef< XclExpRecordBase > CreateDrawingGroup();
+    boost::shared_ptr< XclExpRecordBase > CreateDrawingGroup();
 
     /** Initializes the object manager for a new sheet. */
     void                StartSheet();
 
     /** Processes a drawing page and returns the record block containing all
         related records (MSODRAWING, OBJ, TXO, charts, etc.). */
-    ScfRef< XclExpRecordBase > ProcessDrawing( SdrPage* pSdrPage );
+    boost::shared_ptr< XclExpRecordBase > ProcessDrawing( SdrPage* pSdrPage );
     /** Processes a collection of UNO shapes and returns the record block
         containing all related records (MSODRAWING, OBJ, TXO, charts, etc.). */
-    ScfRef< XclExpRecordBase > ProcessDrawing( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes );
+    boost::shared_ptr< XclExpRecordBase > ProcessDrawing( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes );
 
     /** Finalizes the object manager after conversion of all sheets. */
     void                EndDocument();
@@ -451,10 +452,10 @@ private:
     void                InitStream( bool bTempFile );
 
 private:
-    ScfRef< ::utl::TempFile > mxTempFile;
-    ScfRef< SvStream >  mxDffStrm;
-    ScfRef< XclEscherEx > mxEscherEx;
-    ScfRef< XclExpObjList > mxObjList;
+    boost::shared_ptr< ::utl::TempFile > mxTempFile;
+    boost::shared_ptr< SvStream >  mxDffStrm;
+    boost::shared_ptr< XclEscherEx > mxEscherEx;
+    boost::shared_ptr< XclExpObjList > mxObjList;
 };
 
 // ----------------------------------------------------------------------------
diff --git a/sc/source/filter/inc/xeformula.hxx b/sc/source/filter/inc/xeformula.hxx
index 5cc3107bd25d..698ca9b0f494 100644
--- a/sc/source/filter/inc/xeformula.hxx
+++ b/sc/source/filter/inc/xeformula.hxx
@@ -31,6 +31,7 @@
 
 #include "xlformula.hxx"
 #include "xeroot.hxx"
+#include <boost/shared_ptr.hpp>
 
 // External reference log =====================================================
 
@@ -88,7 +89,7 @@ public:
     XclTokenArrayRef    CreateNameXFormula( sal_uInt16 nExtSheet, sal_uInt16 nExtName );
 
 private:
-    typedef ScfRef< XclExpFmlaCompImpl > XclExpFmlaCompImplRef;
+    typedef boost::shared_ptr< XclExpFmlaCompImpl > XclExpFmlaCompImplRef;
     XclExpFmlaCompImplRef mxImpl;
 };
 
diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx
index 00d758dd1991..db556b310f03 100644
--- a/sc/source/filter/inc/xehelper.hxx
+++ b/sc/source/filter/inc/xehelper.hxx
@@ -29,6 +29,8 @@
 #ifndef SC_XEHELPER_HXX
 #define SC_XEHELPER_HXX
 
+#include <boost/noncopyable.hpp>
+#include <boost/shared_ptr.hpp>
 #include "xladdress.hxx"
 #include "xeroot.hxx"
 #include "xestring.hxx"
@@ -182,7 +184,7 @@ class XclExpHyperlink;
 class XclExpHyperlinkHelper : protected XclExpRoot
 {
 public:
-    typedef ScfRef< XclExpHyperlink > XclExpHyperlinkRef;
+    typedef boost::shared_ptr< XclExpHyperlink > XclExpHyperlinkRef;
 
     explicit            XclExpHyperlinkHelper( const XclExpRoot& rRoot, const ScAddress& rScPos );
                         ~XclExpHyperlinkHelper();
@@ -219,7 +221,7 @@ class ScPatternAttr;
 /** This class provides methods to create an XclExpString.
     @descr  The string can be created from an edit engine text object or
     directly from a Calc edit cell. */
-class XclExpStringHelper : ScfNoInstance
+class XclExpStringHelper : boost::noncopyable
 {
 public:
     /** Creates a new unformatted string from the passed string.
@@ -329,6 +331,12 @@ public:
     /** Returns the script type first text portion different to WEAK, or the system
         default script type, if there is only weak script in the passed string. */
     static sal_Int16    GetLeadingScriptType( const XclExpRoot& rRoot, const String& rString );
+
+private:
+    /** We don't want anybody to instantiate this class, since it is just a
+        collection of static methods. To enforce this, the default constructor
+        is made private */
+    XclExpStringHelper();
 };
 
 // Header/footer conversion ===================================================
@@ -364,7 +372,7 @@ class EditEngine;
     Known but unsupported control sequences:
     &G                      picture
  */
-class XclExpHFConverter : protected XclExpRoot, ScfNoCopy
+class XclExpHFConverter : protected XclExpRoot, private boost::noncopyable
 {
 public:
     explicit            XclExpHFConverter( const XclExpRoot& rRoot );
@@ -397,7 +405,7 @@ private:
 /** This class contains static methods to encode a file URL.
     @descr  Excel stores URLs in a format that contains special control characters,
     i.e. for directory separators or volume names. */
-class XclExpUrlHelper : ScfNoInstance
+class XclExpUrlHelper : boost::noncopyable
 {
 public:
     /** Encodes and returns the URL passed in rAbsUrl to an Excel like URL.
@@ -405,6 +413,12 @@ public:
     static String       EncodeUrl( const XclExpRoot& rRoot, const String& rAbsUrl, const String* pTableName = 0 );
     /** Encodes and returns the passed DDE link to an Excel like DDE link. */
     static String       EncodeDde( const String& rApplic, const String rTopic );
+
+private:
+    /** We don't want anybody to instantiate this class, since it is just a
+        collection of static methods. To enforce this, the default constructor
+        is made private */
+    XclExpUrlHelper();
 };
 
 // ----------------------------------------------------------------------------
diff --git a/sc/source/filter/inc/xelink.hxx b/sc/source/filter/inc/xelink.hxx
index ecdccae3172b..866151df28f5 100644
--- a/sc/source/filter/inc/xelink.hxx
+++ b/sc/source/filter/inc/xelink.hxx
@@ -35,6 +35,7 @@
 #include "xehelper.hxx"
 #include "xeformula.hxx"
 #include "externalrefmgr.hxx"
+#include <boost/shared_ptr.hpp>
 
 class ScRange;
 struct ScSingleRefData;
@@ -210,7 +211,7 @@ public:
     virtual void        Save( XclExpStream& rStrm );
 
 private:
-    typedef ScfRef< XclExpLinkManagerImpl > XclExpLinkMgrImplPtr;
+    typedef boost::shared_ptr< XclExpLinkManagerImpl > XclExpLinkMgrImplPtr;
     XclExpLinkMgrImplPtr mxImpl;
 };
 
diff --git a/sc/source/filter/inc/xename.hxx b/sc/source/filter/inc/xename.hxx
index 66e903553da8..24371e19b4dd 100644
--- a/sc/source/filter/inc/xename.hxx
+++ b/sc/source/filter/inc/xename.hxx
@@ -33,6 +33,7 @@
 #include "xlname.hxx"
 #include "xlformula.hxx"
 #include "xeroot.hxx"
+#include <boost/shared_ptr.hpp>
 
 // ============================================================================
 
@@ -80,7 +81,7 @@ public:
     virtual void        SaveXml( XclExpXmlStream& rStrm );
 
 private:
-    typedef ScfRef< XclExpNameManagerImpl > XclExpNameMgrImplRef;
+    typedef boost::shared_ptr< XclExpNameManagerImpl > XclExpNameMgrImplRef;
     XclExpNameMgrImplRef mxImpl;
 };
 
diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx
index 712da2b89d6e..17673e840d7b 100644
--- a/sc/source/filter/inc/xerecord.hxx
+++ b/sc/source/filter/inc/xerecord.hxx
@@ -31,6 +31,7 @@
 
 #include "xlconst.hxx"
 #include "xestream.hxx"
+#include <boost/shared_ptr.hpp>
 
 // Base classes to export Excel records =======================================
 
@@ -333,7 +334,7 @@ template< typename RecType = XclExpRecordBase >
 class XclExpRecordList : public XclExpRecordBase
 {
 public:
-    typedef ScfRef< RecType > RecordRefType;
+    typedef boost::shared_ptr< RecType > RecordRefType;
 
     /** Returns pointer to an existing record or 0 on error. */
     inline bool         IsEmpty() const { return maRecs.empty(); }
diff --git a/sc/source/filter/inc/xeroot.hxx b/sc/source/filter/inc/xeroot.hxx
index 0f8774489954..cac22f4101ae 100644
--- a/sc/source/filter/inc/xeroot.hxx
+++ b/sc/source/filter/inc/xeroot.hxx
@@ -30,6 +30,7 @@
 #define SC_XEROOT_HXX
 
 #include "xlroot.hxx"
+#include <boost/shared_ptr.hpp>
 
 // Forward declarations of objects in public use ==============================
 
@@ -37,8 +38,8 @@ class XclExpStream;
 class XclExpRecordBase;
 class XclExpString;
 
-typedef ScfRef< XclExpRecordBase >  XclExpRecordRef;
-typedef ScfRef< XclExpString >      XclExpStringRef;
+typedef boost::shared_ptr< XclExpRecordBase >  XclExpRecordRef;
+typedef boost::shared_ptr< XclExpString >      XclExpStringRef;
 
 // Global data ================================================================
 
@@ -60,21 +61,21 @@ class XclExpPivotTableManager;
 /** Stores global buffers and data needed for Excel export filter. */
 struct XclExpRootData : public XclRootData
 {
-    typedef ScfRef< XclExpTabInfo >             XclExpTabInfoRef;
-    typedef ScfRef< XclExpAddressConverter >    XclExpAddrConvRef;
-    typedef ScfRef< XclExpFormulaCompiler >     XclExpFmlaCompRef;
-    typedef ScfRef< XclExpProgressBar >         XclExpProgressRef;
-
-    typedef ScfRef< XclExpSst >                 XclExpSstRef;
-    typedef ScfRef< XclExpPalette >             XclExpPaletteRef;
-    typedef ScfRef< XclExpFontBuffer >          XclExpFontBfrRef;
-    typedef ScfRef< XclExpNumFmtBuffer >        XclExpNumFmtBfrRef;
-    typedef ScfRef< XclExpXFBuffer >            XclExpXFBfrRef;
-    typedef ScfRef< XclExpNameManager >         XclExpNameMgrRef;
-    typedef ScfRef< XclExpLinkManager >         XclExpLinkMgrRef;
-    typedef ScfRef< XclExpObjectManager >       XclExpObjectMgrRef;
-    typedef ScfRef< XclExpFilterManager >       XclExpFilterMgrRef;
-    typedef ScfRef< XclExpPivotTableManager >   XclExpPTableMgrRef;
+    typedef boost::shared_ptr< XclExpTabInfo >             XclExpTabInfoRef;
+    typedef boost::shared_ptr< XclExpAddressConverter >    XclExpAddrConvRef;
+    typedef boost::shared_ptr< XclExpFormulaCompiler >     XclExpFmlaCompRef;
+    typedef boost::shared_ptr< XclExpProgressBar >         XclExpProgressRef;
+
+    typedef boost::shared_ptr< XclExpSst >                 XclExpSstRef;
+    typedef boost::shared_ptr< XclExpPalette >             XclExpPaletteRef;
+    typedef boost::shared_ptr< XclExpFontBuffer >          XclExpFontBfrRef;
+    typedef boost::shared_ptr< XclExpNumFmtBuffer >        XclExpNumFmtBfrRef;
+    typedef boost::shared_ptr< XclExpXFBuffer >            XclExpXFBfrRef;
+    typedef boost::shared_ptr< XclExpNameManager >         XclExpNameMgrRef;
+    typedef boost::shared_ptr< XclExpLinkManager >         XclExpLinkMgrRef;
+    typedef boost::shared_ptr< XclExpObjectManager >       XclExpObjectMgrRef;
+    typedef boost::shared_ptr< XclExpFilterManager >       XclExpFilterMgrRef;
+    typedef boost::shared_ptr< XclExpPivotTableManager >   XclExpPTableMgrRef;
 
     XclExpTabInfoRef    mxTabInfo;          /// Calc->Excel sheet index conversion.
     XclExpAddrConvRef   mxAddrConv;         /// The address converter.
diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx
index d0e56961e812..16961e911a1b 100644
--- a/sc/source/filter/inc/xestream.hxx
+++ b/sc/source/filter/inc/xestream.hxx
@@ -52,7 +52,7 @@ Output stream class for Excel export
 
 class XclExpRoot;
 class XclExpBiff8Encrypter;
-typedef ScfRef< XclExpBiff8Encrypter > XclExpEncrypterRef;
+typedef boost::shared_ptr< XclExpBiff8Encrypter > XclExpEncrypterRef;
 
 /** This class is used to export Excel record streams.
     @descr  An instance is constructed with an SvStream and the maximum size of Excel
diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx
index fa2d3e8eb782..458c2bb1e5ec 100644
--- a/sc/source/filter/inc/xestyle.hxx
+++ b/sc/source/filter/inc/xestyle.hxx
@@ -38,6 +38,7 @@
 #include "xerecord.hxx"
 #include "xlstyle.hxx"
 #include "xeroot.hxx"
+#include <boost/shared_ptr.hpp>
 
 /* ============================================================================
 - Buffers for style records (PALETTE, FONT, FORMAT, XF, STYLE).
@@ -125,7 +126,7 @@ private:
     virtual void        WriteBody( XclExpStream& rStrm );
 
 private:
-    typedef ScfRef< XclExpPaletteImpl > XclExpPaletteImplRef;
+    typedef boost::shared_ptr< XclExpPaletteImpl > XclExpPaletteImplRef;
     XclExpPaletteImplRef mxImpl;
 };
 
diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx
index 2c18f14d91f0..bb3f182768f6 100644
--- a/sc/source/filter/inc/xetable.hxx
+++ b/sc/source/filter/inc/xetable.hxx
@@ -100,7 +100,7 @@ protected:
     XclAddress          maBaseXclPos;   /// Address of base cell (first FORMULA record).
 };
 
-typedef ScfRef< XclExpRangeFmlaBase > XclExpRangeFmlaRef;
+typedef boost::shared_ptr< XclExpRangeFmlaBase > XclExpRangeFmlaRef;
 
 // Array formulas =============================================================
 
@@ -130,7 +130,7 @@ private:
     XclTokenArrayRef    mxTokArr;       /// The token array of a matrix formula.
 };
 
-typedef ScfRef< XclExpArray > XclExpArrayRef;
+typedef boost::shared_ptr< XclExpArray > XclExpArrayRef;
 
 // ----------------------------------------------------------------------------
 
@@ -181,7 +181,7 @@ private:
     sal_uInt8           mnUsedCount;    /// Number of FORMULA records referring to this record.
 };
 
-typedef ScfRef< XclExpShrfmla > XclExpShrfmlaRef;
+typedef boost::shared_ptr< XclExpShrfmla > XclExpShrfmlaRef;
 
 // ----------------------------------------------------------------------------
 
@@ -248,7 +248,7 @@ private:
     bool                mbValid;        /// true = Contains valid references.
 };
 
-typedef ScfRef< XclExpTableop > XclExpTableopRef;
+typedef boost::shared_ptr< XclExpTableop > XclExpTableopRef;
 
 // ----------------------------------------------------------------------------
 
@@ -324,7 +324,7 @@ private:
     XclAddress          maXclPos;       /// Address of the cell.
 };
 
-typedef ScfRef< XclExpCellBase > XclExpCellRef;
+typedef boost::shared_ptr< XclExpCellBase > XclExpCellRef;
 
 // Single cell records ========================================================
 
@@ -1046,11 +1046,11 @@ private:
     typedef XclExpRecordList< XclExpNote >      XclExpNoteList;
     typedef XclExpRecordList< XclExpHyperlink > XclExpHyperlinkList;
 
-    typedef ScfRef< XclExpDefrowheight >        XclExpDefrowhRef;
-    typedef ScfRef< XclExpNoteList >            XclExpNoteListRef;
-    typedef ScfRef< XclExpMergedcells >         XclExpMergedcellsRef;
-    typedef ScfRef< XclExpHyperlinkList >       XclExpHyperlinkRef;
-    typedef ScfRef< XclExpDval >                XclExpDvalRef;
+    typedef boost::shared_ptr< XclExpDefrowheight >        XclExpDefrowhRef;
+    typedef boost::shared_ptr< XclExpNoteList >            XclExpNoteListRef;
+    typedef boost::shared_ptr< XclExpMergedcells >         XclExpMergedcellsRef;
+    typedef boost::shared_ptr< XclExpHyperlinkList >       XclExpHyperlinkRef;
+    typedef boost::shared_ptr< XclExpDval >                XclExpDvalRef;
 
     XclExpColinfoBuffer maColInfoBfr;       /// Buffer for column formatting.
     XclExpRowBuffer     maRowBfr;           /// Rows and cell records.
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
index 12b2e2d473b2..9ad4d7be91e9 100644
--- a/sc/source/filter/inc/xichart.hxx
+++ b/sc/source/filter/inc/xichart.hxx
@@ -42,6 +42,7 @@
 #include "xlstyle.hxx"
 #include "xiescher.hxx"
 #include "xistring.hxx"
+#include <boost/shared_ptr.hpp>
 
 namespace com { namespace sun { namespace star {
     namespace awt
@@ -168,7 +169,7 @@ public:
                             sal_uInt16 nAngle );
 
 private:
-    typedef ScfRef< XclImpChRootData > XclImpChRootDataRef;
+    typedef boost::shared_ptr< XclImpChRootData > XclImpChRootDataRef;
     XclImpChRootDataRef mxChData;           /// Reference to the root data object.
 };
 
@@ -215,7 +216,7 @@ private:
     XclChFramePos       maData;             /// Position of the frame.
 };
 
-typedef ScfRef< XclImpChFramePos > XclImpChFramePosRef;
+typedef boost::shared_ptr< XclImpChFramePos > XclImpChFramePosRef;
 
 // ----------------------------------------------------------------------------
 
@@ -249,7 +250,7 @@ private:
     XclChLineFormat     maData;             /// Contents of the CHLINEFORMAT record.
 };
 
-typedef ScfRef< XclImpChLineFormat > XclImpChLineFormatRef;
+typedef boost::shared_ptr< XclImpChLineFormat > XclImpChLineFormatRef;
 
 // ----------------------------------------------------------------------------
 
@@ -279,7 +280,7 @@ private:
     XclChAreaFormat     maData;             /// Contents of the CHAREAFORMAT record.
 };
 
-typedef ScfRef< XclImpChAreaFormat > XclImpChAreaFormatRef;
+typedef boost::shared_ptr< XclImpChAreaFormat > XclImpChAreaFormatRef;
 
 // ----------------------------------------------------------------------------
 
@@ -303,7 +304,7 @@ private:
     XclChPicFormat      maPicFmt;           /// Image options, e.g. stretched, stacked (CHPICFORMAT record).
 };
 
-typedef ScfRef< XclImpChEscherFormat > XclImpChEscherFormatRef;
+typedef boost::shared_ptr< XclImpChEscherFormat > XclImpChEscherFormatRef;
 
 // ----------------------------------------------------------------------------
 
@@ -329,12 +330,12 @@ public:
     /** Returns true, if the line style is set to something visible. */
     inline bool         HasLine() const { return IsAutoLine() || mxLineFmt->HasLine(); }
     /** Returns the line weight used for this frame. */
-    inline sal_Int16    GetLineWeight() const { return mxLineFmt.is() ? mxLineFmt->GetWeight() : EXC_CHLINEFORMAT_SINGLE; }
+    inline sal_Int16    GetLineWeight() const { return mxLineFmt ? mxLineFmt->GetWeight() : EXC_CHLINEFORMAT_SINGLE; }
 
     /** Returns true, if the area format is set to automatic. */
     inline bool         IsAutoArea() const { return !mxEscherFmt && (!mxAreaFmt || mxAreaFmt->IsAuto()); }
     /** Returns true, if the area style is set to something visible. */
-    inline bool         HasArea() const { return mxEscherFmt.is() || IsAutoArea() || mxAreaFmt->HasArea(); }
+    inline bool         HasArea() const { return mxEscherFmt || IsAutoArea() || mxAreaFmt->HasArea(); }
 
 protected:
     /** Converts and writes the contained line formatting to the passed property set. */
@@ -385,7 +386,7 @@ private:
     XclChObjectType     meObjType;          /// Type of the represented object.
 };
 
-typedef ScfRef< XclImpChFrame > XclImpChFrameRef;
+typedef boost::shared_ptr< XclImpChFrame > XclImpChFrameRef;
 
 // Source links ===============================================================
 
@@ -413,9 +414,9 @@ public:
     inline sal_uInt8    GetLinkType() const { return maData.mnLinkType; }
 
     /** Returns true, if the source link contains explicit string data. */
-    inline bool         HasString() const { return mxString.is() && !mxString->IsEmpty(); }
+    inline bool         HasString() const { return mxString && !mxString->IsEmpty(); }
     /** Returns explicit string data or an empty string. */
-    inline const String& GetString() const { return mxString.is() ? mxString->GetText() : String::EmptyString(); }
+    inline const String& GetString() const { return mxString ? mxString->GetText() : String::EmptyString(); }
     /** Returns the number of data points of this source link. */
     sal_uInt16          GetCellCount() const;
 
@@ -433,10 +434,10 @@ public:
 private:
     XclChSourceLink     maData;             /// Contents of the CHSOURCELINK record.
     XclImpStringRef     mxString;           /// Text data (CHSTRING record).
-    ScfRef< ScTokenArray> mxTokenArray;     /// Token array representing the data ranges.
+    boost::shared_ptr< ScTokenArray> mxTokenArray;     /// Token array representing the data ranges.
 };
 
-typedef ScfRef< XclImpChSourceLink > XclImpChSourceLinkRef;
+typedef boost::shared_ptr< XclImpChSourceLink > XclImpChSourceLinkRef;
 
 // Text =======================================================================
 
@@ -476,7 +477,7 @@ private:
     sal_uInt16          mnFontIdx;          /// Index into font buffer.
 };
 
-typedef ScfRef< XclImpChFont > XclImpChFontRef;
+typedef boost::shared_ptr< XclImpChFont > XclImpChFontRef;
 
 // ----------------------------------------------------------------------------
 
@@ -517,7 +518,7 @@ public:
     /** Returns the position of the data point label this text is linked to. */
     inline const XclChDataPointPos& GetPointPos() const { return maObjLink.maPointPos; }
     /** Returns true, if this text group contains string data. */
-    inline bool         HasString() const { return mxSrcLink.is() && mxSrcLink->HasString(); }
+    inline bool         HasString() const { return mxSrcLink && mxSrcLink->HasString(); }
     /** Returns true, if the text object is marked as deleted. */
     inline bool         IsDeleted() const { return ::get_flag( maData.mnFlags, EXC_CHTEXT_DELETED ); }
 
@@ -543,7 +544,7 @@ private:
     void                ReadChFrLabelProps( XclImpStream& rStrm );
 
 private:
-    typedef ScfRef< XclChFrLabelProps > XclChFrLabelPropsRef;
+    typedef boost::shared_ptr< XclChFrLabelProps > XclChFrLabelPropsRef;
 
     XclChText           maData;             /// Contents of the CHTEXT record.
     XclChObjectLink     maObjLink;          /// Link target for this text object.
@@ -555,7 +556,7 @@ private:
     XclChFrLabelPropsRef mxLabelProps;      /// Extended data label properties (CHFRLABELPROPS record).
 };
 
-typedef ScfRef< XclImpChText > XclImpChTextRef;
+typedef boost::shared_ptr< XclImpChText > XclImpChTextRef;
 
 // Data series ================================================================
 
@@ -580,7 +581,7 @@ private:
     XclChMarkerFormat   maData;             /// Contents of the CHMARKERFORMAT record.
 };
 
-typedef ScfRef< XclImpChMarkerFormat > XclImpChMarkerFormatRef;
+typedef boost::shared_ptr< XclImpChMarkerFormat > XclImpChMarkerFormatRef;
 
 // ----------------------------------------------------------------------------
 
@@ -598,7 +599,7 @@ private:
     sal_uInt16          mnPieDist;          /// Pie distance to diagram center.
 };
 
-typedef ScfRef< XclImpChPieFormat > XclImpChPieFormatRef;
+typedef boost::shared_ptr< XclImpChPieFormat > XclImpChPieFormatRef;
 
 // ----------------------------------------------------------------------------
 
@@ -616,7 +617,7 @@ private:
     sal_uInt16          mnFlags;            /// Additional flags.
 };
 
-typedef ScfRef< XclImpChSeriesFormat > XclImpChSeriesFormatRef;
+typedef boost::shared_ptr< XclImpChSeriesFormat > XclImpChSeriesFormatRef;
 
 // ----------------------------------------------------------------------------
 
@@ -633,7 +634,7 @@ private:
     XclCh3dDataFormat   maData;             /// Contents of the CH3DDATAFORMAT record.
 };
 
-typedef ScfRef< XclImpCh3dDataFormat > XclImpCh3dDataFormatRef;
+typedef boost::shared_ptr< XclImpCh3dDataFormat > XclImpCh3dDataFormatRef;
 
 // ----------------------------------------------------------------------------
 
@@ -651,7 +652,7 @@ private:
     sal_uInt16          mnFlags;            /// Additional flags.
 };
 
-typedef ScfRef< XclImpChAttachedLabel > XclImpChAttLabelRef;
+typedef boost::shared_ptr< XclImpChAttachedLabel > XclImpChAttLabelRef;
 
 // ----------------------------------------------------------------------------
 
@@ -692,7 +693,7 @@ public:
     /** Returns true, if markers are set to automatic format. */
     inline bool         IsAutoMarker() const { return !mxMarkerFmt || mxMarkerFmt->IsAuto(); }
     /** Returns true, if the series line is smoothed. */
-    inline bool         HasSpline() const { return mxSeriesFmt.is() && mxSeriesFmt->HasSpline(); }
+    inline bool         HasSpline() const { return mxSeriesFmt && mxSeriesFmt->HasSpline(); }
     /** Returns the data label text object. */
     inline XclImpChTextRef GetDataLabel() const { return mxLabel; }
 
@@ -719,7 +720,7 @@ private:
     XclImpChTextRef     mxLabel;            /// Data point label formatting (CHTEXT group).
 };
 
-typedef ScfRef< XclImpChDataFormat > XclImpChDataFormatRef;
+typedef boost::shared_ptr< XclImpChDataFormat > XclImpChDataFormatRef;
 
 // ----------------------------------------------------------------------------
 
@@ -745,7 +746,7 @@ private:
     XclImpChDataFormatRef mxDataFmt;        /// Formatting settings of the trend line.
 };
 
-typedef ScfRef< XclImpChSerTrendLine > XclImpChSerTrendLineRef;
+typedef boost::shared_ptr< XclImpChSerTrendLine > XclImpChSerTrendLineRef;
 
 // ----------------------------------------------------------------------------
 
@@ -782,7 +783,7 @@ private:
     XclImpChDataFormatRef mxDataFmt;        /// Formatting settings of the error bars.
 };
 
-typedef ScfRef< XclImpChSerErrorBar > XclImpChSerErrorBarRef;
+typedef boost::shared_ptr< XclImpChSerErrorBar > XclImpChSerErrorBarRef;
 
 // ----------------------------------------------------------------------------
 
@@ -823,16 +824,16 @@ public:
     /** Returns the 0-based index of the parent series (e.g. of a trend line). */
     inline sal_uInt16   GetParentIdx() const { return mnParentIdx; }
     /** Returns the format index of the series used for automatic line and area colors. */
-    inline sal_uInt16   GetFormatIdx() const { return mxSeriesFmt.is() ? mxSeriesFmt->GetFormatIdx() : EXC_CHDATAFORMAT_DEFAULT; }
+    inline sal_uInt16   GetFormatIdx() const { return mxSeriesFmt ? mxSeriesFmt->GetFormatIdx() : EXC_CHDATAFORMAT_DEFAULT; }
     /** Returns true, if the series is child of another series (e.g. trend line). */
     inline bool         HasParentSeries() const { return mnParentIdx != EXC_CHSERIES_INVALID; }
     /** Returns true, if the series contains child series (e.g. trend lines). */
     inline bool         HasChildSeries() const { return !maTrendLines.empty() || !maErrorBars.empty(); }
     /** Returns series title or an empty string, if the series does not contain a title. */
-    inline const String& GetTitle() const { return mxTitleLink.is() ? mxTitleLink->GetString() : String::EmptyString(); }
+    inline const String& GetTitle() const { return mxTitleLink ? mxTitleLink->GetString() : String::EmptyString(); }
 
     /** Returns true, if the series line is smoothed. */
-    inline bool         HasSpline() const { return mxSeriesFmt.is() && mxSeriesFmt->HasSpline(); }
+    inline bool         HasSpline() const { return mxSeriesFmt && mxSeriesFmt->HasSpline(); }
 
     /** Creates a labeled data sequence object from value data link. */
     XLabeledDataSeqRef  CreateValueSequence( const ::rtl::OUString& rValueRole ) const;
@@ -888,7 +889,7 @@ private:
     sal_uInt16          mnParentIdx;        /// 0-based index of parent series (trend lines and error bars).
 };
 
-typedef ScfRef< XclImpChSeries > XclImpChSeriesRef;
+typedef boost::shared_ptr< XclImpChSeries > XclImpChSeriesRef;
 
 // Chart type groups ==========================================================
 
@@ -946,7 +947,7 @@ private:
     XclChChart3d        maData;             /// Contents of the CHCHART3D record.
 };
 
-typedef ScfRef< XclImpChChart3d > XclImpChChart3dRef;
+typedef boost::shared_ptr< XclImpChChart3d > XclImpChChart3dRef;
 
 // ----------------------------------------------------------------------------
 
@@ -980,7 +981,7 @@ private:
     XclImpChFrameRef    mxFrame;            /// Legend frame format (CHFRAME group).
 };
 
-typedef ScfRef< XclImpChLegend > XclImpChLegendRef;
+typedef boost::shared_ptr< XclImpChLegend > XclImpChLegendRef;
 
 // ----------------------------------------------------------------------------
 
@@ -1005,7 +1006,7 @@ private:
     sal_uInt16          mnBarDist;          /// Distance between bars (CHDROPBAR record).
 };
 
-typedef ScfRef< XclImpChDropBar > XclImpChDropBarRef;
+typedef boost::shared_ptr< XclImpChDropBar > XclImpChDropBarRef;
 
 // ----------------------------------------------------------------------------
 
@@ -1054,11 +1055,11 @@ public:
     /** Returns true, if the series in this chart type group are stacked on each other as percentage. */
     inline bool         IsPercent() const { return maType.IsPercent(); }
     /** Returns true, if the chart is three-dimensional. */
-    inline bool         Is3dChart() const { return mxChart3d.is() && maTypeInfo.mbSupports3d; }
+    inline bool         Is3dChart() const { return mxChart3d && maTypeInfo.mbSupports3d; }
     /** Returns true, if chart type supports wall and floor format in 3d mode. */
     inline bool         Is3dWallChart() const { return Is3dChart() && (maTypeInfo.meTypeCateg != EXC_CHTYPECATEG_PIE); }
     /** Returns true, if the series in this chart type group are ordered on the Z axis. */
-    inline bool         Is3dDeepChart() const { return Is3dWallChart() && mxChart3d.is() && !mxChart3d->IsClustered(); }
+    inline bool         Is3dDeepChart() const { return Is3dWallChart() && mxChart3d && !mxChart3d->IsClustered(); }
     /** Returns true, if category (X axis) labels are enabled (may be disabled in radar charts). */
     inline bool         HasCategoryLabels() const { return maType.HasCategoryLabels(); }
     /** Returns true, if points of a series show varying automatic area format. */
@@ -1122,7 +1123,7 @@ private:
     UInt16Set           maUnusedFormats;    /// Contains unused format indexes for automatic colors.
 };
 
-typedef ScfRef< XclImpChTypeGroup > XclImpChTypeGroupRef;
+typedef boost::shared_ptr< XclImpChTypeGroup > XclImpChTypeGroupRef;
 
 // Axes =======================================================================
 
@@ -1144,7 +1145,7 @@ private:
     XclChLabelRange     maData;             /// Contents of the CHLABELRANGE record.
 };
 
-typedef ScfRef< XclImpChLabelRange > XclImpChLabelRangeRef;
+typedef boost::shared_ptr< XclImpChLabelRange > XclImpChLabelRangeRef;
 
 // ----------------------------------------------------------------------------
 
@@ -1166,7 +1167,7 @@ private:
     XclChValueRange     maData;             /// Contents of the CHVALUERANGE record.
 };
 
-typedef ScfRef< XclImpChValueRange > XclImpChValueRangeRef;
+typedef boost::shared_ptr< XclImpChValueRange > XclImpChValueRangeRef;
 
 // ----------------------------------------------------------------------------
 
@@ -1191,7 +1192,7 @@ private:
     XclChTick           maData;             /// Contents of the CHTICK record.
 };
 
-typedef ScfRef< XclImpChTick > XclImpChTickRef;
+typedef boost::shared_ptr< XclImpChTick > XclImpChTickRef;
 
 // ----------------------------------------------------------------------------
 
@@ -1232,9 +1233,9 @@ public:
     /** Returns true, if the axis contains caption labels. */
     inline bool         HasLabels() const { return !mxTick || mxTick->HasLabels(); }
     /** Returns true, if the axis shows its major grid lines. */
-    inline bool         HasMajorGrid() const { return mxMajorGrid.is(); }
+    inline bool         HasMajorGrid() const { return mxMajorGrid; }
     /** Returns true, if the axis shows its minor grid lines. */
-    inline bool         HasMinorGrid() const { return mxMinorGrid.is(); }
+    inline bool         HasMinorGrid() const { return mxMinorGrid; }
 
     /** Creates an API axis object. */
     XAxisRef            CreateAxis( const XclImpChTypeGroup& rTypeGroup, const XclImpChAxis* pCrossingAxis ) const;
@@ -1262,7 +1263,7 @@ private:
     sal_uInt16          mnNumFmtIdx;        /// Index into number format buffer (CHFORMAT record).
 };
 
-typedef ScfRef< XclImpChAxis > XclImpChAxisRef;
+typedef boost::shared_ptr< XclImpChAxis > XclImpChAxisRef;
 
 // ----------------------------------------------------------------------------
 
@@ -1350,7 +1351,7 @@ private:
     XclImpChTypeGroupMap maTypeGroups;      /// Chart type groups (CHTYPEGROUP group).
 };
 
-typedef ScfRef< XclImpChAxesSet > XclImpChAxesSetRef;
+typedef boost::shared_ptr< XclImpChAxesSet > XclImpChAxesSetRef;
 
 // The chart object ===========================================================
 
@@ -1436,7 +1437,7 @@ private:
     XclImpChLegendRef   mxLegend;           /// Chart legend (CHLEGEND group).
 };
 
-typedef ScfRef< XclImpChChart > XclImpChChartRef;
+typedef boost::shared_ptr< XclImpChChart > XclImpChChartRef;
 
 // ----------------------------------------------------------------------------
 
@@ -1501,7 +1502,7 @@ private:
     void                ReadChChart( XclImpStream& rStrm );
 
 private:
-    typedef ScfRef< XclImpChartDrawing > XclImpChartDrawingRef;
+    typedef boost::shared_ptr< XclImpChartDrawing > XclImpChartDrawingRef;
 
     XclImpChChartRef    mxChartData;        /// The chart data (CHCHART group).
     XclImpChartDrawingRef mxChartDrawing;   /// Drawing container for embedded shapes.
diff --git a/sc/source/filter/inc/xicontent.hxx b/sc/source/filter/inc/xicontent.hxx
index 6bd2e38355f6..5002e97faa61 100644
--- a/sc/source/filter/inc/xicontent.hxx
+++ b/sc/source/filter/inc/xicontent.hxx
@@ -38,6 +38,7 @@
 
 #include <map>
 #include <boost/ptr_container/ptr_vector.hpp>
+#include <boost/noncopyable.hpp>
 
 /* ============================================================================
 Classes to import the big Excel document contents (related to several cells or
@@ -84,7 +85,7 @@ private:
 // Hyperlinks =================================================================
 
 /** Provides importing hyperlinks and inserting them into a document. */
-class XclImpHyperlink : ScfNoInstance
+class XclImpHyperlink : private boost::noncopyable
 {
 public:
     /** Reads a HLINK record and inserts it into the document.
@@ -100,17 +101,29 @@ public:
     /** Convert the sheet name with invalid character(s) in URL when the URL is
         to a location within the same document (e.g. #'Sheet&Name'.A1). */
     static void         ConvertToValidTabName(String& rName);
+
+private:
+    /** We don't want anybody to instantiate this class, since it is just a
+        collection of static methods. To enforce this, the default constructor
+        is made private */
+    XclImpHyperlink();
 };
 
 // Label ranges ===============================================================
 
 /** Provides importing label ranges and inserting them into a document. */
-class XclImpLabelranges : ScfNoInstance
+class XclImpLabelranges : private  boost::noncopyable
 {
 public:
     /** Reads a LABELRANGES record and inserts the label ranges into the document.
         @descr  Import stream must be located at start of a LABELRANGES record. */
     static void         ReadLabelranges( XclImpStream& rStrm );
+
+private:
+    /** We don't want anybody to instantiate this class, since it is just a
+        collection of static methods. To enforce this, the default constructor
+        is made private */
+    XclImpLabelranges();
 };
 
 // Conditional formatting =====================================================
@@ -193,7 +206,7 @@ private:
 // Web queries ================================================================
 
 /** Stores the data of one web query. */
-class XclImpWebQuery : ScfNoCopy
+class XclImpWebQuery : private boost::noncopyable
 {
 public:
     explicit            XclImpWebQuery( const ScRange& rDestRange );
@@ -256,12 +269,18 @@ private:
 // Decryption =================================================================
 
 /** Provides static functions to import stream decryption settings. */
-class XclImpDecryptHelper : ScfNoInstance
+class XclImpDecryptHelper : private boost::noncopyable
 {
 public:
     /** Reads the FILEPASS record, queries a password and sets decryption algorihm.
         @return  Error code that may cause an error message after import. */
     static ErrCode      ReadFilepass( XclImpStream& rStrm );
+
+private:
+    /** We don't want anybody to instantiate this class, since it is just a
+        collection of static methods. To enforce this, the default constructor
+        is made private */
+    XclImpDecryptHelper();
 };
 
 // ============================================================================
@@ -322,7 +341,6 @@ private:
     ProtectedSheetMap   maProtectedSheets;
 };
 
-
 // ============================================================================
 
 #endif
diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx
index bf623b4a2da5..a41d39c1901b 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -38,6 +38,7 @@
 #include "xlescher.hxx"
 #include "xiroot.hxx"
 #include "xistring.hxx"
+#include <boost/shared_ptr.hpp>
 
 namespace com { namespace sun { namespace star {
     namespace drawing { class XShape; }
@@ -54,7 +55,7 @@ class XclImpDrawing;
 // Drawing objects ============================================================
 
 class XclImpDrawObjBase;
-typedef ScfRef< XclImpDrawObjBase > XclImpDrawObjRef;
+typedef boost::shared_ptr< XclImpDrawObjBase > XclImpDrawObjRef;
 
 /** Base class for drawing objects (OBJ records). */
 class XclImpDrawObjBase : protected XclImpRoot
@@ -448,7 +449,7 @@ private:
     void                FinalizeTabChart();
 
 private:
-    typedef ScfRef< XclImpChart > XclImpChartRef;
+    typedef boost::shared_ptr< XclImpChart > XclImpChartRef;
 
     XclImpChartRef      mxChart;        /// The chart itself (BOF/EOF substream data).
     bool                mbOwnTab;       /// true = own sheet; false = embedded object.
@@ -484,9 +485,9 @@ public:
     virtual             ~XclImpControlHelper();
 
     /** Returns true, if a linked cell address is present. */
-    inline bool         HasCellLink() const { return mxCellLink.is(); }
+    inline bool         HasCellLink() const { return mxCellLink != 0; }
     /** Returns true, if a linked source cell range is present. */
-    inline bool         HasSourceRange() const { return mxSrcRange.is(); }
+    inline bool         HasSourceRange() const { return mxSrcRange != 0; }
 
     /** Returns the SdrObject from the passed control shape and sets the bounding rectangle. */
     SdrObject*          CreateSdrObjectFromShape(
@@ -507,8 +508,8 @@ protected:
 
     void ApplySheetLinkProps() const;
     mutable ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
-                        mxShape;        /// The UNO wrapper of the control shape.
-    ScfRef< ScAddress > mxCellLink;     /// Linked cell in the Calc document.
+                                   mxShape;        /// The UNO wrapper of the control shape.
+    boost::shared_ptr< ScAddress > mxCellLink;     /// Linked cell in the Calc document.
 private:
     /** Reads a list of cell ranges from a formula at the current stream position. */
     void                ReadRangeList( ScRangeList& rScRanges, XclImpStream& rStrm );
@@ -516,9 +517,9 @@ private:
     void                ReadRangeList( ScRangeList& rScRanges, XclImpStream& rStrm, bool bWithBoundSize );
 
 private:
-    const XclImpRoot&   mrRoot;         /// Not derived from XclImpRoot to allow multiple inheritance.
-    ScfRef< ScRange >   mxSrcRange;     /// Source data range in the Calc document.
-    XclCtrlBindMode     meBindMode;     /// Value binding mode.
+    const XclImpRoot&            mrRoot;     /// Not derived from XclImpRoot to allow multiple inheritance.
+    boost::shared_ptr< ScRange > mxSrcRange; /// Source data range in the Calc document.
+    XclCtrlBindMode              meBindMode; /// Value binding mode.
 };
 
 // ----------------------------------------------------------------------------
@@ -977,7 +978,7 @@ public:
 
 protected:
     /** Returns a color from the Excel color palette. */
-    virtual int        GetColorFromPalette( USHORT nIndex, Color& rColor ) const;
+    virtual bool        GetColorFromPalette( USHORT nIndex, Color& rColor ) const;
 };
 
 // ----------------------------------------------------------------------------
@@ -1091,8 +1092,8 @@ private:
     void                InitControlForm();
 
 private:
-    typedef ScfRef< ScfProgressBar >                ScfProgressBarRef;
-    typedef ScfRef< XclImpDffConvData >             XclImpDffConvDataRef;
+    typedef boost::shared_ptr< ScfProgressBar >     ScfProgressBarRef;
+    typedef boost::shared_ptr< XclImpDffConvData >  XclImpDffConvDataRef;
     typedef ::std::vector< XclImpDffConvDataRef >   XclImpDffConvDataStack;
 
     const ::rtl::OUString maStdFormName;    /// Standard name of control forms.
@@ -1162,7 +1163,7 @@ private:
 private:
     typedef ::std::map< sal_Size, XclImpDrawObjRef >    XclImpObjMap;
     typedef ::std::map< sal_uInt16, XclImpDrawObjRef >  XclImpObjMapById;
-    typedef ScfRef< XclImpObjTextData >                 XclImpObjTextRef;
+    typedef boost::shared_ptr< XclImpObjTextData >      XclImpObjTextRef;
     typedef ::std::map< sal_Size, XclImpObjTextRef >    XclImpObjTextMap;
 
     XclImpDrawObjVector maRawObjs;          /// BIFF5 objects without DFF data.
@@ -1213,8 +1214,6 @@ private:
 /** Stores all drawing and OLE objects and additional data related to these objects. */
 class XclImpObjectManager : protected XclImpRoot
 {
-typedef std::hash_map< sal_Int32, String >  CntrlObjIdToName;
-typedef std::map< String, CntrlObjIdToName > CodeNameToCntrlObjIdInfo;
 public:
     explicit            XclImpObjectManager( const XclImpRoot& rRoot );
     virtual             ~XclImpObjectManager();
@@ -1231,13 +1230,15 @@ public:
     String              GetDefaultObjName( const XclImpDrawObjBase& rDrawObj ) const;
     /** Returns the used area in the sheet with the passed index. */
     ScRange             GetUsedArea( SCTAB nScTab ) const;
-    void SetOleNameOverrideInfo( const CodeNameToCntrlObjIdInfo& rOverrideInfo ) {  maOleCtrlNameOverride = rOverrideInfo; }
+    /** Sets the container to receive overridden shape/ctrl names from
+        the filter. */
+    void SetOleNameOverrideInfo( const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& rxOverrideInfo ) {  mxOleCtrlNameOverride = rxOverrideInfo; }
+    /** Returns the name of overridden name ( or zero length string ) for
+        associated object id. */
     String GetOleNameOverride( SCTAB nTab, sal_uInt16 nObjId );
     // ------------------------------------------------------------------------
 private:
 
-    CodeNameToCntrlObjIdInfo maOleCtrlNameOverride;
-
     /** Reads and returns a bitmap from WMF/PICT format. */
     static void         ReadWmf( Graphic& rGraphic, XclImpStream& rStrm );
     /** Reads and returns a bitmap from BMP format. */
@@ -1262,14 +1263,15 @@ private:
 private:
     typedef ::std::map< sal_Size, XclImpDrawObjRef >    XclImpObjMap;
     typedef ::std::map< XclObjId, XclImpDrawObjRef >    XclImpObjMapById;
-    typedef ScfRef< XclImpObjTextData >                 XclImpObjTextRef;
+    typedef boost::shared_ptr< XclImpObjTextData >      XclImpObjTextRef;
     typedef ::std::map< sal_Size, XclImpObjTextRef >    XclImpObjTextMap;
     typedef ::std::vector< XclObjId >                   XclObjIdVec;
 
     typedef ::std::map< sal_uInt16, String >            DefObjNameMap;
-    typedef ScfRef< XclImpSheetDrawing >                XclImpSheetDrawingRef;
+    typedef boost::shared_ptr< XclImpSheetDrawing >     XclImpSheetDrawingRef;
     typedef ::std::map< SCTAB, XclImpSheetDrawingRef >  XclImpSheetDrawingMap;
 
+    com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > mxOleCtrlNameOverride;
     DefObjNameMap       maDefObjNames;      /// Default base names for all object types.
     SvMemoryStream      maDggStrm;          /// Copy of global DFF data (DGG container) in memory.
     XclImpSheetDrawingMap maSheetDrawings;  /// Drawing managers of all sheets.
diff --git a/sc/source/filter/inc/xiformula.hxx b/sc/source/filter/inc/xiformula.hxx
index 5ed9d04b0ea9..b245fe92cee1 100644
--- a/sc/source/filter/inc/xiformula.hxx
+++ b/sc/source/filter/inc/xiformula.hxx
@@ -31,6 +31,7 @@
 
 #include "xlformula.hxx"
 #include "xiroot.hxx"
+#include <boost/shared_ptr.hpp>
 
 // Formula compiler ===========================================================
 
@@ -59,7 +60,7 @@ public:
     const ScTokenArray* CreateFormula( XclFormulaType eType, const XclTokenArray& rXclTokArr );
 
 private:
-    typedef ScfRef< XclImpFmlaCompImpl > XclImpFmlaCompImplRef;
+    typedef boost::shared_ptr< XclImpFmlaCompImpl > XclImpFmlaCompImplRef;
     XclImpFmlaCompImplRef mxImpl;
 };
 
diff --git a/sc/source/filter/inc/xihelper.hxx b/sc/source/filter/inc/xihelper.hxx
index 6ee969c6b0a0..06aac7dba70d 100644
--- a/sc/source/filter/inc/xihelper.hxx
+++ b/sc/source/filter/inc/xihelper.hxx
@@ -30,6 +30,8 @@
 #define SC_XIHELPER_HXX
 
 #include <editeng/editdata.hxx>
+#include <boost/noncopyable.hpp>
+#include <boost/shared_ptr.hpp>
 #include "scmatrix.hxx"
 #include "xladdress.hxx"
 #include "xiroot.hxx"
@@ -111,7 +113,7 @@ class EditTextObject;
 /** This class provides methods to convert an XclImpString.
     @The string can be converted to an edit engine text object or directly
     to a Calc edit cell. */
-class XclImpStringHelper : ScfNoInstance
+class XclImpStringHelper : boost::noncopyable
 {
 public:
     /** Returns a new edit engine text object.
@@ -126,6 +128,11 @@ public:
                             const XclImpRoot& rRoot,
                             const XclImpString& rString,
                             sal_uInt16 nXFIndex = 0 );
+private:
+    /** We don't want anybody to instantiate this class, since it is just a
+        collection of static methods. To enforce this, the default constructor
+        is made private */
+    XclImpStringHelper();
 };
 
 // Header/footer conversion ===================================================
@@ -165,7 +172,7 @@ struct XclFontData;
     Known but unsupported control sequences:
     &G                      picture
  */
-class XclImpHFConverter : protected XclImpRoot, ScfNoCopy
+class XclImpHFConverter : protected XclImpRoot, private boost::noncopyable
 {
 public:
     explicit            XclImpHFConverter( const XclImpRoot& rRoot );
@@ -188,7 +195,7 @@ private:    // types
     /** Contains all information about a header/footer portion. */
     struct XclImpHFPortionInfo
     {
-        typedef ScfRef< EditTextObject > EditTextObjectRef;
+        typedef boost::shared_ptr< EditTextObject > EditTextObjectRef;
         EditTextObjectRef   mxObj;          /// Edit engine text object.
         ESelection          maSel;          /// Edit engine selection.
         sal_Int32           mnHeight;       /// Height of previous lines in twips.
@@ -250,7 +257,7 @@ private:
 /** This class contains static methods to decode an URL stored in an Excel file.
     @descr  Excel URLs can contain a sheet name, for instance: path\[test.xls]Sheet1
     This sheet name will be extracted automatically. */
-class XclImpUrlHelper : ScfNoInstance
+class XclImpUrlHelper : boost::noncopyable
 {
 public:
     /** Decodes an encoded external document URL with optional sheet name.
@@ -280,6 +287,12 @@ public:
         For OLE object links: Decodes to class name and document URL.
         @return  true = decoding was successful, returned strings are valid (not empty). */
     static bool         DecodeLink( String& rApplic, String& rTopic, const String rEncUrl );
+
+private:
+    /** We don't want anybody to instantiate this class, since it is just a
+        collection of static methods. To enforce this, the default constructor
+        is made private */
+    XclImpUrlHelper();
 };
 
 // Cached values ==============================================================
@@ -288,7 +301,7 @@ class ScTokenArray;
 
 /** This class stores one cached value of a cached value list (used for instance in
     CRN, EXTERNNAME, tArray). */
-class XclImpCachedValue : ScfNoCopy
+class XclImpCachedValue : boost::noncopyable
 {
 public:
     /** Creates a cached value and reads contents from stream and stores it with its array address. */
diff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx
index 72bb174b8d62..5096ff97bc2b 100644
--- a/sc/source/filter/inc/xipivot.hxx
+++ b/sc/source/filter/inc/xipivot.hxx
@@ -32,6 +32,7 @@
 #include <list>
 #include "xlpivot.hxx"
 #include "xiroot.hxx"
+#include <boost/shared_ptr.hpp>
 
 class ScDPSaveData;
 class ScDPSaveDimension;
@@ -66,7 +67,7 @@ private:
     void                ReadSxempty( XclImpStream& rStrm );
 };
 
-typedef ScfRef< XclImpPCItem > XclImpPCItemRef;
+typedef boost::shared_ptr< XclImpPCItem > XclImpPCItemRef;
 
 // ============================================================================
 
@@ -153,7 +154,7 @@ private:
     bool                mbNumGroupInfoRead; /// true = Numeric grouping info read (SXNUMGROUP record).
 };
 
-typedef ScfRef< XclImpPCField > XclImpPCFieldRef;
+typedef boost::shared_ptr< XclImpPCField > XclImpPCFieldRef;
 
 // ============================================================================
 
@@ -199,7 +200,7 @@ private:
     bool                mbSelfRef;          /// true = Source data from own document.
 };
 
-typedef ScfRef< XclImpPivotCache > XclImpPivotCacheRef;
+typedef boost::shared_ptr< XclImpPivotCache > XclImpPivotCacheRef;
 
 // ============================================================================
 // Pivot table
@@ -230,7 +231,7 @@ private:
     const XclImpPCField* mpCacheField;      /// Corresponding pivot cache field.
 };
 
-typedef ScfRef< XclImpPTItem > XclImpPTItemRef;
+typedef boost::shared_ptr< XclImpPTItem > XclImpPTItemRef;
 
 // ============================================================================
 
@@ -309,7 +310,7 @@ private:
     XclImpPTItemVec     maItems;            /// List of all items of this field.
 };
 
-typedef ScfRef< XclImpPTField > XclImpPTFieldRef;
+typedef boost::shared_ptr< XclImpPTField > XclImpPTFieldRef;
 
 // ============================================================================
 
@@ -385,7 +386,7 @@ private:
     ScDPObject*         mpDPObj;
 };
 
-typedef ScfRef< XclImpPivotTable > XclImpPivotTableRef;
+typedef boost::shared_ptr< XclImpPivotTable > XclImpPivotTableRef;
 
 // ============================================================================
 // ============================================================================
diff --git a/sc/source/filter/inc/xiroot.hxx b/sc/source/filter/inc/xiroot.hxx
index c53c09029bdc..898f4eea4971 100644
--- a/sc/source/filter/inc/xiroot.hxx
+++ b/sc/source/filter/inc/xiroot.hxx
@@ -30,13 +30,14 @@
 #define SC_XIROOT_HXX
 
 #include "xlroot.hxx"
+#include <boost/shared_ptr.hpp>
 
 // Forward declarations of objects in public use ==============================
 
 class XclImpStream;
 class XclImpString;
 
-typedef ScfRef< XclImpString > XclImpStringRef;
+typedef boost::shared_ptr< XclImpString > XclImpStringRef;
 
 // Global data ================================================================
 
@@ -70,28 +71,28 @@ class ExcelToSc;
 /** Stores global buffers and data needed for Excel import filter. */
 struct XclImpRootData : public XclRootData
 {
-    typedef ScfRef< XclImpAddressConverter >    XclImpAddrConvRef;
-    typedef ScfRef< XclImpFormulaCompiler >     XclImpFmlaCompRef;
-
-    typedef ScfRef< XclImpSst >                 XclImpSstRef;
-    typedef ScfRef< XclImpPalette >             XclImpPaletteRef;
-    typedef ScfRef< XclImpFontBuffer >          XclImpFontBfrRef;
-    typedef ScfRef< XclImpNumFmtBuffer >        XclImpNumFmtBfrRef;
-    typedef ScfRef< XclImpXFBuffer >            XclImpXFBfrRef;
-    typedef ScfRef< XclImpXFRangeBuffer >       XclImpXFRangeBfrRef;
-    typedef ScfRef< XclImpTabInfo >             XclImpTabInfoRef;
-    typedef ScfRef< XclImpNameManager >         XclImpNameMgrRef;
-    typedef ScfRef< XclImpLinkManager >         XclImpLinkMgrRef;
-    typedef ScfRef< XclImpObjectManager >       XclImpObjectMgrRef;
-    typedef ScfRef< XclImpCondFormatManager >   XclImpCondFmtMgrRef;
-    typedef ScfRef< XclImpValidationManager >   XclImpValidationMgrRef;
-    typedef ScfRef< XclImpWebQueryBuffer >      XclImpWebQueryBfrRef;
-    typedef ScfRef< XclImpPivotTableManager >   XclImpPTableMgrRef;
-    typedef ScfRef< XclImpPageSettings >        XclImpPageSettRef;
-    typedef ScfRef< XclImpDocViewSettings >     XclImpDocViewSettRef;
-    typedef ScfRef< XclImpTabViewSettings >     XclImpTabViewSettRef;
-    typedef ScfRef< XclImpSheetProtectBuffer >  XclImpTabProtectRef;
-    typedef ScfRef< XclImpDocProtectBuffer >    XclImpDocProtectRef;
+    typedef boost::shared_ptr< XclImpAddressConverter >    XclImpAddrConvRef;
+    typedef boost::shared_ptr< XclImpFormulaCompiler >     XclImpFmlaCompRef;
+
+    typedef boost::shared_ptr< XclImpSst >                 XclImpSstRef;
+    typedef boost::shared_ptr< XclImpPalette >             XclImpPaletteRef;
+    typedef boost::shared_ptr< XclImpFontBuffer >          XclImpFontBfrRef;
+    typedef boost::shared_ptr< XclImpNumFmtBuffer >        XclImpNumFmtBfrRef;
+    typedef boost::shared_ptr< XclImpXFBuffer >            XclImpXFBfrRef;
+    typedef boost::shared_ptr< XclImpXFRangeBuffer >       XclImpXFRangeBfrRef;
+    typedef boost::shared_ptr< XclImpTabInfo >             XclImpTabInfoRef;
+    typedef boost::shared_ptr< XclImpNameManager >         XclImpNameMgrRef;
+    typedef boost::shared_ptr< XclImpLinkManager >         XclImpLinkMgrRef;
+    typedef boost::shared_ptr< XclImpObjectManager >       XclImpObjectMgrRef;
+    typedef boost::shared_ptr< XclImpCondFormatManager >   XclImpCondFmtMgrRef;
+    typedef boost::shared_ptr< XclImpValidationManager >   XclImpValidationMgrRef;
+    typedef boost::shared_ptr< XclImpWebQueryBuffer >      XclImpWebQueryBfrRef;
+    typedef boost::shared_ptr< XclImpPivotTableManager >   XclImpPTableMgrRef;
+    typedef boost::shared_ptr< XclImpPageSettings >        XclImpPageSettRef;
+    typedef boost::shared_ptr< XclImpDocViewSettings >     XclImpDocViewSettRef;
+    typedef boost::shared_ptr< XclImpTabViewSettings >     XclImpTabViewSettRef;
+    typedef boost::shared_ptr< XclImpSheetProtectBuffer >  XclImpTabProtectRef;
+    typedef boost::shared_ptr< XclImpDocProtectBuffer >    XclImpDocProtectRef;
 
     XclImpAddrConvRef   mxAddrConv;         /// The address converter.
     XclImpFmlaCompRef   mxFmlaComp;         /// The formula compiler.
diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx
index 6dff1a867f2e..86428c199639 100644
--- a/sc/source/filter/inc/xistream.hxx
+++ b/sc/source/filter/inc/xistream.hxx
@@ -31,6 +31,7 @@
 
 #include <comphelper/docpasswordhelper.hxx>
 #include <filter/msfilter/mscodec.hxx>
+#include <boost/shared_ptr.hpp>
 #include "xlstream.hxx"
 #include "xlconst.hxx"
 
@@ -48,7 +49,7 @@ Input stream class for Excel import
 // ============================================================================
 
 class XclImpDecrypter;
-typedef ScfRef< XclImpDecrypter > XclImpDecrypterRef;
+typedef boost::shared_ptr< XclImpDecrypter > XclImpDecrypterRef;
 
 /** Base class for BIFF stream decryption. */
 class XclImpDecrypter : public ::comphelper::IDocPasswordVerifier
diff --git a/sc/source/filter/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxx
index b4aa9e96d384..3b55445cecaf 100644
--- a/sc/source/filter/inc/xistyle.hxx
+++ b/sc/source/filter/inc/xistyle.hxx
@@ -31,6 +31,8 @@
 
 #include <list>
 #include <tools/mempool.hxx>
+#include <boost/noncopyable.hpp>
+#include <boost/shared_ptr.hpp>
 #include "rangelst.hxx"
 #include "patattr.hxx"
 #include "xladdress.hxx"
@@ -168,7 +170,7 @@ private:
 // ----------------------------------------------------------------------------
 
 /** Stores the data of all fonts occurred in an Excel file. */
-class XclImpFontBuffer : protected XclImpRoot, ScfNoCopy
+class XclImpFontBuffer : protected XclImpRoot, private boost::noncopyable
 {
 public:
     explicit            XclImpFontBuffer( const XclImpRoot& rRoot );
@@ -392,7 +394,7 @@ inline bool operator!=( const XclImpXFIndex& rLeft, const XclImpXFIndex& rRight
 // ----------------------------------------------------------------------------
 
 /** Contains all data of a XF record and a Calc item set. */
-class XclImpXF : public XclXFBase, protected XclImpRoot, ScfNoCopy
+class XclImpXF : public XclXFBase, protected XclImpRoot, private boost::noncopyable
 {
 public:
     explicit            XclImpXF( const XclImpRoot& rRoot );
@@ -480,7 +482,7 @@ private:
 
 /** Contains all XF records occured in the file.
     @descr  This class is able to read XF records (BIFF2 - BIFF8) and STYLE records (BIFF8). */
-class XclImpXFBuffer : protected XclImpRoot, ScfNoCopy
+class XclImpXFBuffer : protected XclImpRoot, private boost::noncopyable
 {
 public:
     explicit            XclImpXFBuffer( const XclImpRoot& rRoot );
@@ -564,7 +566,7 @@ inline bool XclImpXFRange::Contains( SCROW nScRow ) const
 // ----------------------------------------------------------------------------
 
 /** Contains the XF indexes for every used cell in a column. */
-class XclImpXFRangeColumn : ScfNoCopy
+class XclImpXFRangeColumn : private boost::noncopyable
 {
 public:
     inline explicit     XclImpXFRangeColumn() {}
@@ -601,7 +603,7 @@ private:
 // ----------------------------------------------------------------------------
 
 /** Contains the XF indexes for every used cell in a single sheet. */
-class XclImpXFRangeBuffer : protected XclImpRoot, ScfNoCopy
+class XclImpXFRangeBuffer : protected XclImpRoot, private boost::noncopyable
 {
 public:
     explicit            XclImpXFRangeBuffer( const XclImpRoot& rRoot );
@@ -654,10 +656,10 @@ private:
     void                SetBorderLine( const ScRange& rRange, SCTAB nScTab, USHORT nLine );
 
 private:
-    typedef ScfRef< XclImpXFRangeColumn >           XclImpXFRangeColumnRef;
-    typedef ::std::vector< XclImpXFRangeColumnRef > XclImpXFRangeColumnVec;
-    typedef ::std::pair< XclRange, String >         XclImpHyperlinkRange;
-    typedef ::std::list< XclImpHyperlinkRange >     XclImpHyperlinkList;
+    typedef boost::shared_ptr< XclImpXFRangeColumn > XclImpXFRangeColumnRef;
+    typedef ::std::vector< XclImpXFRangeColumnRef >  XclImpXFRangeColumnVec;
+    typedef ::std::pair< XclRange, String >          XclImpHyperlinkRange;
+    typedef ::std::list< XclImpHyperlinkRange >      XclImpHyperlinkList;
 
     XclImpXFRangeColumnVec maColumns;       /// Array of column XF index buffers.
     XclImpHyperlinkList maHyperlinks;       /// Maps URLs to hyperlink cells.
diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx
index c6ebe7382c7b..6c4ced698745 100644
--- a/sc/source/filter/inc/xlchart.hxx
+++ b/sc/source/filter/inc/xlchart.hxx
@@ -37,6 +37,7 @@
 #include <map>
 #include <tools/gen.hxx>
 #include "fapihelper.hxx"
+#include <boost/shared_ptr.hpp>
 
 namespace com { namespace sun { namespace star {
     namespace container { class XNameContainer; }
@@ -823,8 +824,8 @@ class EscherPropertyContainer;
 
 struct XclChEscherFormat
 {
-    typedef ScfRef< SfxItemSet >                SfxItemSetRef;
-    typedef ScfRef< EscherPropertyContainer >   EscherPropSetRef;
+    typedef boost::shared_ptr< SfxItemSet >                SfxItemSetRef;
+    typedef boost::shared_ptr< EscherPropertyContainer >   EscherPropSetRef;
 
     SfxItemSetRef       mxItemSet;          /// Item set for Escher properties import.
     EscherPropSetRef    mxEscherSet;        /// Container for Escher properties export.
@@ -1445,9 +1446,9 @@ private:
 /** Base struct for internal root data structs for import and export. */
 struct XclChRootData
 {
-    typedef ScfRef< XclChTypeInfoProvider >                 XclChTypeProvRef;
-    typedef ScfRef< XclChFormatInfoProvider >               XclChFmtInfoProvRef;
-    typedef ScfRef< XclChObjectTable >                      XclChObjectTableRef;
+    typedef boost::shared_ptr< XclChTypeInfoProvider >      XclChTypeProvRef;
+    typedef boost::shared_ptr< XclChFormatInfoProvider >    XclChFmtInfoProvRef;
+    typedef boost::shared_ptr< XclChObjectTable >           XclChObjectTableRef;
     typedef ::std::map< XclChTextKey, XclChGetShapeFunc >   XclChGetShapeFuncMap;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >
diff --git a/sc/source/filter/inc/xlformula.hxx b/sc/source/filter/inc/xlformula.hxx
index 5dfdb3ca1c12..520af6f1d69b 100644
--- a/sc/source/filter/inc/xlformula.hxx
+++ b/sc/source/filter/inc/xlformula.hxx
@@ -33,6 +33,7 @@
 #include <formula/opcode.hxx>
 #include "address.hxx"
 #include "ftools.hxx"
+#include <boost/shared_ptr.hpp>
 
 // Constants ==================================================================
 
@@ -409,7 +410,7 @@ private:
     bool                mbVolatile;     /// True = Formula contains volatile function.
 };
 
-typedef ScfRef< XclTokenArray > XclTokenArrayRef;
+typedef boost::shared_ptr< XclTokenArray > XclTokenArrayRef;
 
 /** Calls the Read() function at the passed token array. */
 XclImpStream& operator>>( XclImpStream& rStrm, XclTokenArray& rTokArr );
diff --git a/sc/source/filter/inc/xlpage.hxx b/sc/source/filter/inc/xlpage.hxx
index dfed44b91afd..f58f815edcbe 100644
--- a/sc/source/filter/inc/xlpage.hxx
+++ b/sc/source/filter/inc/xlpage.hxx
@@ -30,6 +30,7 @@
 #define SC_XLPAGE_HXX
 
 #include <tools/gen.hxx>
+#include <boost/noncopyable.hpp>
 #include "xltools.hxx"
 
 // Constants and Enumerations =================================================
@@ -100,7 +101,7 @@ class SvxBrushItem;
 class SfxPrinter;
 
 /** Contains all page (print) settings for a single sheet. */
-struct XclPageData : ScfNoCopy
+struct XclPageData : private boost::noncopyable
 {
     typedef ::std::auto_ptr< SvxBrushItem > SvxBrushItemPtr;
 
diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx
index e1261be05be0..9df1ccc04e44 100644
--- a/sc/source/filter/inc/xlroot.hxx
+++ b/sc/source/filter/inc/xlroot.hxx
@@ -33,6 +33,7 @@
 #include <sot/storage.hxx>
 #include "xlconst.hxx"
 #include "xltools.hxx"
+#include <boost/shared_ptr.hpp>
 
 namespace comphelper { class IDocPasswordVerifier; }
 
@@ -76,14 +77,14 @@ struct XclRootData
     : public XclDebugObjCounter
 #endif
 {
-    typedef ScfRef< ScEditEngineDefaulter > ScEEDefaulterRef;
-    typedef ScfRef< ScHeaderEditEngine >    ScHeaderEERef;
-    typedef ScfRef< EditEngine >            EditEngineRef;
-    typedef ScfRef< XclFontPropSetHelper >  XclFontPropSetHlpRef;
-    typedef ScfRef< XclChPropSetHelper >    XclChPropSetHlpRef;
-    typedef ScfRef< ScExtDocOptions >       ScExtDocOptRef;
-    typedef ScfRef< XclTracer >             XclTracerRef;
-    typedef ScfRef< RootData >              RootDataRef;
+    typedef boost::shared_ptr< ScEditEngineDefaulter > ScEEDefaulterRef;
+    typedef boost::shared_ptr< ScHeaderEditEngine >    ScHeaderEERef;
+    typedef boost::shared_ptr< EditEngine >            EditEngineRef;
+    typedef boost::shared_ptr< XclFontPropSetHelper >  XclFontPropSetHlpRef;
+    typedef boost::shared_ptr< XclChPropSetHelper >    XclChPropSetHlpRef;
+    typedef boost::shared_ptr< ScExtDocOptions >       ScExtDocOptRef;
+    typedef boost::shared_ptr< XclTracer >             XclTracerRef;
+    typedef boost::shared_ptr< RootData >              RootDataRef;
 
     XclBiff             meBiff;             /// Current BIFF version.
     XclOutput           meOutput;           /// Current Output format.
diff --git a/sc/source/filter/inc/xltools.hxx b/sc/source/filter/inc/xltools.hxx
index 7ae02d758151..b34cd4c3b8cf 100644
--- a/sc/source/filter/inc/xltools.hxx
+++ b/sc/source/filter/inc/xltools.hxx
@@ -31,6 +31,7 @@
 
 #include "address.hxx"
 #include "ftools.hxx"
+#include <boost/noncopyable.hpp>
 
 class SfxObjectShell;
 
@@ -89,7 +90,7 @@ class SvStream;
 class ScDocument;
 
 /** This class contains static helper methods for the Excel import and export filters. */
-class XclTools : ScfNoInstance
+class XclTools : boost::noncopyable
 {
 public:
     // GUID's -----------------------------------------------------------------
@@ -250,6 +251,11 @@ private:
     static const String maCFStyleNamePrefix2;       /// Prefix for cond. formatting style names from OOX filter.
     static const ::rtl::OUString maSbMacroPrefix;   /// Prefix for StarBasic macros.
     static const ::rtl::OUString maSbMacroSuffix;   /// Suffix for StarBasic macros.
+
+    /** We don't want anybody to instantiate this class, since it is just a
+        collection of static items. To enforce this, the default constructor
+        is made private */
+    XclTools();
 };
 
 // read/write colors ----------------------------------------------------------
diff --git a/sc/source/filter/inc/xlview.hxx b/sc/source/filter/inc/xlview.hxx
index 0b2f91ad6e21..be84506a6fe8 100644
--- a/sc/source/filter/inc/xlview.hxx
+++ b/sc/source/filter/inc/xlview.hxx
@@ -33,6 +33,7 @@
 #include <tools/color.hxx>
 #include "ftools.hxx"
 #include "xladdress.hxx"
+#include <boost/shared_ptr.hpp>
 
 // Constants and enumerations =================================================
 
@@ -122,7 +123,7 @@ struct XclSelectionData
     inline explicit     XclSelectionData() : mnCursorIdx( 0 ) {}
 };
 
-typedef ScfRef< XclSelectionData > XclSelectionDataRef;
+typedef boost::shared_ptr< XclSelectionData > XclSelectionDataRef;
 
 // ----------------------------------------------------------------------------
 
diff --git a/sc/source/filter/lotus/makefile.mk b/sc/source/filter/lotus/makefile.mk
index e4d18f8f9a7d..96e0133af309 100644
--- a/sc/source/filter/lotus/makefile.mk
+++ b/sc/source/filter/lotus/makefile.mk
@@ -44,22 +44,22 @@ VISIBILITY_HIDDEN=TRUE
 
 # --- Files --------------------------------------------------------
 
-SLOFILES =						\
+SLOFILES =				\
+        $(EXCEPTIONSFILES)		\
+        $(SLO)$/optab.obj
+
+EXCEPTIONSFILES =			\
+        $(SLO)$/expop.obj		\
+        $(SLO)$/export.obj		\
         $(SLO)$/filter.obj		\
-        $(SLO)$/lotus.obj		\
-        $(SLO)$/lotimpop.obj	\
-        $(SLO)$/lotread.obj		\
+        $(SLO)$/lotattr.obj		\
         $(SLO)$/lotform.obj		\
+        $(SLO)$/lotimpop.obj		\
+        $(SLO)$/lotread.obj		\
+        $(SLO)$/lotus.obj		\
         $(SLO)$/memory.obj		\
         $(SLO)$/op.obj			\
-        $(SLO)$/optab.obj		\
-        $(SLO)$/tool.obj		\
-        $(SLO)$/expop.obj		\
-        $(SLO)$/export.obj		\
-        $(SLO)$/lotattr.obj
-
-EXCEPTIONSFILES =				\
-        $(SLO)$/op.obj
+        $(SLO)$/tool.obj
 
 # --- Tagets -------------------------------------------------------
 
diff --git a/sc/source/filter/qpro/makefile.mk b/sc/source/filter/qpro/makefile.mk
index 7406f05e3308..f5e66ea0e514 100644
--- a/sc/source/filter/qpro/makefile.mk
+++ b/sc/source/filter/qpro/makefile.mk
@@ -43,11 +43,14 @@ AUTOSEG=true
 
 # --- Files --------------------------------------------------------
 
-SLOFILES =						\
-        $(SLO)$/qpro.obj		\
+SLOFILES =			\
+        $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
+        $(SLO)$/biff.obj	\
+        $(SLO)$/qpro.obj	\
         $(SLO)$/qproform.obj    \
-        $(SLO)$/qprostyle.obj	\
-        $(SLO)$/biff.obj
+        $(SLO)$/qprostyle.obj
 
 # --- Tagets -------------------------------------------------------
 
diff --git a/sc/source/filter/rtf/makefile.mk b/sc/source/filter/rtf/makefile.mk
index 651309fb454d..3aa6dbe8ad8d 100644
--- a/sc/source/filter/rtf/makefile.mk
+++ b/sc/source/filter/rtf/makefile.mk
@@ -44,8 +44,11 @@ VISIBILITY_HIDDEN=TRUE
 
 # --- Files --------------------------------------------------------
 
-SLOFILES =						\
-        $(SLO)$/eeimpars.obj	\
+SLOFILES =				\
+        $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
+        $(SLO)$/eeimpars.obj		\
         $(SLO)$/expbase.obj		\
         $(SLO)$/rtfexp.obj		\
         $(SLO)$/rtfimp.obj		\
diff --git a/sc/source/filter/starcalc/makefile.mk b/sc/source/filter/starcalc/makefile.mk
index 157059d433ec..a9c06eb14a4d 100644
--- a/sc/source/filter/starcalc/makefile.mk
+++ b/sc/source/filter/starcalc/makefile.mk
@@ -44,8 +44,11 @@ VISIBILITY_HIDDEN=TRUE
 
 # --- Files --------------------------------------------------------
 
-SLOFILES =						\
-        $(SLO)$/scflt.obj		\
+SLOFILES =			\
+        $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
+        $(SLO)$/scflt.obj	\
         $(SLO)$/scfobj.obj
 
 # --- Tagets -------------------------------------------------------
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index daab6245d730..dfb157653028 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -741,7 +741,7 @@ void XclExpChTrData::Clear()
 
 void XclExpChTrData::WriteFormula( XclExpStream& rStrm, const XclExpChTrTabIdBuffer& rTabIdBuffer )
 {
-    DBG_ASSERT( mxTokArr.is() && !mxTokArr->Empty(), "XclExpChTrData::Write - no formula" );
+    DBG_ASSERT( mxTokArr && !mxTokArr->Empty(), "XclExpChTrData::Write - no formula" );
     rStrm << *mxTokArr;
 
     for( XclExpRefLog::const_iterator aIt = maRefLog.begin(), aEnd = maRefLog.end(); aIt != aEnd; ++aIt )
@@ -1000,7 +1000,7 @@ static void lcl_WriteCell( XclExpXmlStream& rStrm, sal_Int32 nElement, const ScA
             break;
         case EXC_CHTR_TYPE_STRING:
             pStream->startElement( XML_is, FSEND );
-            if( pData->mpFormattedString.is() )
+            if( pData->mpFormattedString )
                 pData->mpFormattedString->WriteXml( rStrm );
             else
                 pData->pString->WriteXml( rStrm );
@@ -1661,8 +1661,8 @@ void XclExpChangeTrack::Write()
 static void lcl_WriteUserNamesXml( XclExpXmlStream& rWorkbookStrm )
 {
     sax_fastparser::FSHelperPtr pUserNames = rWorkbookStrm.CreateOutputStream(
-            OUString::createFromAscii( "xl/revisions/userNames.xml" ),
-            OUString::createFromAscii( "revisions/userNames.xml" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM( "xl/revisions/userNames.xml" )),
+            OUString(RTL_CONSTASCII_USTRINGPARAM( "revisions/userNames.xml" )),
             rWorkbookStrm.GetCurrentStream()->getOutputStream(),
             "application/vnd.openxmlformats-officedocument.spreadsheetml.userNames+xml",
             "http://schemas.openxmlformats.org/officeDocument/2006/relationships/usernames" );
@@ -1685,8 +1685,8 @@ void XclExpChangeTrack::WriteXml( XclExpXmlStream& rWorkbookStrm )
     lcl_WriteUserNamesXml( rWorkbookStrm );
 
     sax_fastparser::FSHelperPtr pRevisionHeaders = rWorkbookStrm.CreateOutputStream(
-            OUString::createFromAscii( "xl/revisions/revisionHeaders.xml" ),
-            OUString::createFromAscii( "revisions/revisionHeaders.xml" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM( "xl/revisions/revisionHeaders.xml" )),
+            OUString(RTL_CONSTASCII_USTRINGPARAM( "revisions/revisionHeaders.xml" )),
             rWorkbookStrm.GetCurrentStream()->getOutputStream(),
             "application/vnd.openxmlformats-officedocument.spreadsheetml.revisionHeaders+xml",
             "http://schemas.openxmlformats.org/officeDocument/2006/relationships/revisionHeaders" );
diff --git a/sc/source/filter/xcl97/makefile.mk b/sc/source/filter/xcl97/makefile.mk
index 04a028e04af3..0ce4670875b2 100644
--- a/sc/source/filter/xcl97/makefile.mk
+++ b/sc/source/filter/xcl97/makefile.mk
@@ -44,14 +44,13 @@ VISIBILITY_HIDDEN=TRUE
 
 # --- Files --------------------------------------------------------
 
-SLOFILES =									\
-        $(SLO)$/xcl97esc.obj				\
-        $(SLO)$/xcl97rec.obj				\
-        $(SLO)$/XclImpChangeTrack.obj		\
-        $(SLO)$/XclExpChangeTrack.obj
+SLOFILES =					\
+        $(EXCEPTIONSFILES)
 
-EXCEPTIONSFILES =							\
-        $(SLO)$/xcl97esc.obj				\
+EXCEPTIONSFILES =				\
+        $(SLO)$/XclImpChangeTrack.obj		\
+        $(SLO)$/XclExpChangeTrack.obj		\
+        $(SLO)$/xcl97esc.obj			\
         $(SLO)$/xcl97rec.obj
 
 # --- Targets -------------------------------------------------------
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index e369d8948be7..fbd640317dd2 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -103,9 +103,9 @@ sal_Int32 XclExpObjList::mnVmlCount;
 
 XclExpObjList::XclExpObjList( const XclExpRoot& rRoot, XclEscherEx& rEscherEx ) :
     XclExpRoot( rRoot ),
+    mnScTab( rRoot.GetCurrScTab() ),
     mrEscherEx( rEscherEx ),
-    pSolverContainer( 0 ),
-    mnScTab( rRoot.GetCurrScTab() )
+    pSolverContainer( 0 )
 {
     pMsodrawingPerSheet = new XclExpMsoDrawing( rEscherEx );
     // open the DGCONTAINER and the patriarch group shape
@@ -972,42 +972,6 @@ void XclObjAny::WriteFromTo( XclExpXmlStream& rStrm, const XclObjAny& rObj )
     WriteFromTo( rStrm, rObj.GetShape(), rObj.GetTab() );
 }
 
-static void
-WritePicPr( sax_fastparser::FSHelperPtr pDrawing, sal_Int32 nId, Reference< XPropertySet > xPropSet )
-{
-    pDrawing->startElement( FSNS( XML_xdr, XML_nvPicPr ),
-            FSEND );
-    OUString sName, sDescr;
-    xPropSet->getPropertyValue( XclXmlUtils::ToOUString( "Name" ) ) >>= sName;
-    xPropSet->getPropertyValue( XclXmlUtils::ToOUString( "Description" ) ) >>= sDescr;
-    pDrawing->singleElement( FSNS( XML_xdr, XML_cNvPr ),
-            XML_id,     OString::valueOf( nId ).getStr(),
-            XML_name,   XclXmlUtils::ToOString( sName ).getStr(),
-            XML_descr,  XclXmlUtils::ToOString( sDescr ).getStr(),
-            FSEND );
-    // OOXTODO: //xdr:cNvPr children: XML_extLst, XML_hlinkClick, XML_hlinkHover
-    pDrawing->startElement( FSNS( XML_xdr, XML_cNvPicPr ),
-            // OOXTODO: FSNS( XML_xdr, XML_preferRelativeSize )
-            FSEND );
-    // OOXTODO: XML_extLst
-    pDrawing->singleElement( FSNS( XML_a, XML_picLocks ),
-            // OOXTODO: XML_noGrp,
-            // OOXTODO: XML_noSelect,
-            // OOXTODO: XML_noRot,
-            // OOXTODO: XML_noChangeAspect,
-            // OOXTODO: XML_noMove,
-            // OOXTODO: XML_noResize,
-            // OOXTODO: XML_noEditPoints,
-            // OOXTODO: XML_noAdjustHandles,
-            // OOXTODO: XML_noChangeArrowheads,
-            // OOXTODO: XML_noChangeShapeType,
-            // OOXTODO: XML_noCrop,
-            FSEND );
-    pDrawing->endElement( FSNS( XML_xdr, XML_cNvPicPr ) );
-    pDrawing->endElement( FSNS( XML_xdr, XML_nvPicPr ) );
-}
-
-
 static const char*
 GetEditAs( XclObjAny& rObj )
 {
@@ -1031,7 +995,7 @@ void XclObjAny::SaveXml( XclExpXmlStream& rStrm )
 
     sax_fastparser::FSHelperPtr pDrawing = rStrm.GetCurrentStream();
 
-    ShapeExport aDML( XML_xdr, pDrawing, &rStrm, DrawingML::DOCUMENT_XLSX );
+    ShapeExport aDML( XML_xdr, pDrawing, NULL, &rStrm, DrawingML::DOCUMENT_XLSX );
 
     pDrawing->startElement( FSNS( XML_xdr, XML_twoCellAnchor ), // OOXTODO: oneCellAnchor, absoluteAnchor
             XML_editAs, GetEditAs( *this ),
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
index 98d7a41da7c7..cd4875a9079a 100644
--- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
+++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
@@ -157,11 +157,10 @@ void ScXMLCalculationSettingsContext::EndElement()
             xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_NULLDATE)), uno::makeAny(aNullDate) );
             if (GetScImport().GetDocument())
             {
-                GetScImport().LockSolarMutex();
+                ScXMLImport::MutexGuard aGuard(GetScImport());
                 ScDocOptions aDocOptions (GetScImport().GetDocument()->GetDocOptions());
                 aDocOptions.SetYear2000(nYear2000);
                 GetScImport().GetDocument()->SetDocOptions(aDocOptions);
-                GetScImport().UnlockSolarMutex();
             }
         }
     }
diff --git a/sc/source/filter/xml/XMLConsolidationContext.cxx b/sc/source/filter/xml/XMLConsolidationContext.cxx
index f075dfc68129..4be134c74f7d 100644
--- a/sc/source/filter/xml/XMLConsolidationContext.cxx
+++ b/sc/source/filter/xml/XMLConsolidationContext.cxx
@@ -57,7 +57,7 @@ ScXMLConsolidationContext::ScXMLConsolidationContext(
     bLinkToSource( sal_False ),
     bTargetAddr(sal_False)
 {
-    rImport.LockSolarMutex();
+    ScXMLImport::MutexGuard aGuard(GetScImport());
     if( !xAttrList.is() ) return;
 
     sal_Int16               nAttrCount      = xAttrList->getLength();
diff --git a/sc/source/filter/xml/XMLDetectiveContext.cxx b/sc/source/filter/xml/XMLDetectiveContext.cxx
index 131dea72379d..3c52f96b558a 100644
--- a/sc/source/filter/xml/XMLDetectiveContext.cxx
+++ b/sc/source/filter/xml/XMLDetectiveContext.cxx
@@ -154,9 +154,8 @@ ScXMLDetectiveHighlightedContext::ScXMLDetectiveHighlightedContext(
             case XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_CELL_RANGE:
             {
                 sal_Int32 nOffset(0);
-                GetScImport().LockSolarMutex();
+                ScXMLImport::MutexGuard aGuard(GetScImport());
                 bValid = ScRangeStringConverter::GetRangeFromString( aDetectiveObj.aSourceRange, sValue, GetScImport().GetDocument(), ::formula::FormulaGrammar::CONV_OOO, nOffset );
-                GetScImport().UnlockSolarMutex();
             }
             break;
             case XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_DIRECTION:
diff --git a/sc/source/filter/xml/XMLExportDDELinks.cxx b/sc/source/filter/xml/XMLExportDDELinks.cxx
index f0b80840098c..d6463f2256e9 100644
--- a/sc/source/filter/xml/XMLExportDDELinks.cxx
+++ b/sc/source/filter/xml/XMLExportDDELinks.cxx
@@ -58,7 +58,7 @@ ScXMLExportDDELinks::~ScXMLExportDDELinks()
 }
 
 sal_Bool ScXMLExportDDELinks::CellsEqual(const sal_Bool bPrevEmpty, const sal_Bool bPrevString, const String& sPrevValue, const double& fPrevValue,
-                     const sal_Bool bEmpty, const sal_Bool bString, const String& sValue, const double& fValue)
+                     const sal_Bool bEmpty, const sal_Bool bString, const String& sValue, const double& fValue) const
 {
     if (bEmpty == bPrevEmpty)
         if (bEmpty)
diff --git a/sc/source/filter/xml/XMLExportDDELinks.hxx b/sc/source/filter/xml/XMLExportDDELinks.hxx
index f7fd55574cf9..bf1c66a87f78 100644
--- a/sc/source/filter/xml/XMLExportDDELinks.hxx
+++ b/sc/source/filter/xml/XMLExportDDELinks.hxx
@@ -39,7 +39,7 @@ class ScXMLExportDDELinks
     ScXMLExport&        rExport;
 
     sal_Bool            CellsEqual(const sal_Bool bPrevEmpty, const sal_Bool bPrevString, const String& sPrevValue, const double& fPrevValue,
-                                    const sal_Bool bEmpty, const sal_Bool bString, const String& sValue, const double& fValue);
+                                    const sal_Bool bEmpty, const sal_Bool bString, const String& sValue, const double& fValue) const;
     void                WriteCell(const sal_Bool bEmpty, const sal_Bool bString, const String& sValue, const double& fValue, const sal_Int32 nRepeat);
     void                WriteTable(const sal_Int32 nPos);
 public:
diff --git a/sc/source/filter/xml/XMLExportIterator.cxx b/sc/source/filter/xml/XMLExportIterator.cxx
index 57b2534ed6ad..47ce7964ae77 100644
--- a/sc/source/filter/xml/XMLExportIterator.cxx
+++ b/sc/source/filter/xml/XMLExportIterator.cxx
@@ -614,6 +614,7 @@ void ScMyDetectiveOpContainer::Sort()
 ScMyCell::ScMyCell() :
     aShapeList(),
     aDetectiveObjVec(),
+    fValue(0.0),
     nValidationIndex(-1),
     pBaseCell(NULL),
     bIsAutoStyle( sal_False ),
diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx
index 1334e42c3e5c..767a6be681f5 100644
--- a/sc/source/filter/xml/XMLExportIterator.hxx
+++ b/sc/source/filter/xml/XMLExportIterator.hxx
@@ -91,7 +91,7 @@ public:
                                 using ScMyIteratorBase::UpdateAddress;
     void                        AddNewShape(const ScMyShape& aShape);
     sal_Bool                    HasShapes() { return !aShapeList.empty(); }
-    const ScMyShapeList*        GetShapes() { return &aShapeList; }
+    const ScMyShapeList*        GetShapes() const { return &aShapeList; }
     virtual void                SetCellData( ScMyCell& rMyCell );
     virtual void                Sort();
     void                        SkipTable(SCTAB nSkip);
@@ -120,7 +120,7 @@ public:
                                 using ScMyIteratorBase::UpdateAddress;
     void                        AddNewNote(const ScMyNoteShape& aNote);
     sal_Bool                    HasNotes() { return !aNoteShapeList.empty(); }
-    const ScMyNoteShapeList*    GetNotes() { return &aNoteShapeList; }
+    const ScMyNoteShapeList*    GetNotes() const { return &aNoteShapeList; }
     virtual void                SetCellData( ScMyCell& rMyCell );
     virtual void                Sort();
     void                        SkipTable(SCTAB nSkip);
diff --git a/sc/source/filter/xml/XMLExportSharedData.cxx b/sc/source/filter/xml/XMLExportSharedData.cxx
index a3e4d3ae80b5..1e7b3e506cc5 100644
--- a/sc/source/filter/xml/XMLExportSharedData.cxx
+++ b/sc/source/filter/xml/XMLExportSharedData.cxx
@@ -69,7 +69,7 @@ void ScMySharedData::SetLastColumn(const sal_Int32 nTable, const sal_Int32 nCol)
     if(nCol > nLastColumns[nTable]) nLastColumns[nTable] = nCol;
 }
 
-sal_Int32 ScMySharedData::GetLastColumn(const sal_Int32 nTable)
+sal_Int32 ScMySharedData::GetLastColumn(const sal_Int32 nTable) const
 {
     return nLastColumns[nTable];
 }
@@ -79,7 +79,7 @@ void ScMySharedData::SetLastRow(const sal_Int32 nTable, const sal_Int32 nRow)
     if(nRow > nLastRows[nTable]) nLastRows[nTable] = nRow;
 }
 
-sal_Int32 ScMySharedData::GetLastRow(const sal_Int32 nTable)
+sal_Int32 ScMySharedData::GetLastRow(const sal_Int32 nTable) const
 {
     return nLastRows[nTable];
 }
diff --git a/sc/source/filter/xml/XMLExportSharedData.hxx b/sc/source/filter/xml/XMLExportSharedData.hxx
index 7337cbbc27e7..e12a7111fd9e 100644
--- a/sc/source/filter/xml/XMLExportSharedData.hxx
+++ b/sc/source/filter/xml/XMLExportSharedData.hxx
@@ -68,12 +68,12 @@ public:
 
     void SetLastColumn(const sal_Int32 nTable, const sal_Int32 nCol);
     void SetLastRow(const sal_Int32 nTable, const sal_Int32 nRow);
-    sal_Int32 GetLastColumn(const sal_Int32 nTable);
-    sal_Int32 GetLastRow(const sal_Int32 nTable);
+    sal_Int32 GetLastColumn(const sal_Int32 nTable) const;
+    sal_Int32 GetLastRow(const sal_Int32 nTable) const;
     void AddDrawPage(const ScMyDrawPage& aDrawPage, const sal_Int32 nTable);
     void SetDrawPageHasForms(const sal_Int32 nTable, sal_Bool bHasForms);
     com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage> GetDrawPage(const sal_Int32 nTable);
-    sal_Bool HasDrawPage() { return pDrawPages != NULL; }
+    sal_Bool HasDrawPage() const { return pDrawPages != NULL; }
     sal_Bool HasForm(const sal_Int32 nTable, com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage>& xDrawPage);
     void AddNewShape(const ScMyShape& aMyShape);
     void SortShapesContainer();
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index 79c0d24eb1f8..436747afff91 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -746,18 +746,20 @@ sal_Bool ScRowFormatRanges::GetNext(ScMyRowFormatRange& aFormatRange)
     return sal_False;
 }
 
-sal_Int32 ScRowFormatRanges::GetMaxRows()
+sal_Int32 ScRowFormatRanges::GetMaxRows() const
 {
-    ScMyRowFormatRangesList::iterator aItr(aRowFormatRanges.begin());
-    ScMyRowFormatRangesList::iterator aEndItr(aRowFormatRanges.end());
+    ScMyRowFormatRangesList::const_iterator aItr(aRowFormatRanges.begin());
+    ScMyRowFormatRangesList::const_iterator aEndItr(aRowFormatRanges.end());
     sal_Int32 nMaxRows = MAXROW + 1;
     if (aItr != aEndItr)
+    {
         while (aItr != aEndItr)
         {
             if ((*aItr).nRepeatRows < nMaxRows)
                 nMaxRows = (*aItr).nRepeatRows;
             ++aItr;
         }
+    }
     else
     {
         DBG_ERROR("no ranges found");
@@ -765,7 +767,7 @@ sal_Int32 ScRowFormatRanges::GetMaxRows()
     return nMaxRows;
 }
 
-sal_Int32 ScRowFormatRanges::GetSize()
+sal_Int32 ScRowFormatRanges::GetSize() const
 {
     return nSize;
 }
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx
index 405dedf9f26b..c5d17f007b3f 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.hxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx
@@ -139,8 +139,8 @@ public:
         const sal_Int32 nLastRow, const sal_Int32 nLastCol,
         const ScFormatRangeStyles* pCellStyles, ScDocument* pDoc);
 
-    const ScMyDefaultStyleList* GetRowDefaults() { return pRowDefaults; }
-    const ScMyDefaultStyleList* GetColDefaults() { return pColDefaults; }
+    const ScMyDefaultStyleList* GetRowDefaults() const { return pRowDefaults; }
+    const ScMyDefaultStyleList* GetColDefaults() const { return pColDefaults; }
 };
 
 struct ScMyRowFormatRange
@@ -156,10 +156,9 @@ struct ScMyRowFormatRange
     sal_Bool operator<(const ScMyRowFormatRange& rRange) const;
 };
 
-typedef std::list<ScMyRowFormatRange> ScMyRowFormatRangesList;
-
 class ScRowFormatRanges
 {
+    typedef std::list<ScMyRowFormatRange> ScMyRowFormatRangesList;
     ScMyRowFormatRangesList     aRowFormatRanges;
     const ScMyDefaultStyleList* pRowDefaults;
     const ScMyDefaultStyleList* pColDefaults;
@@ -178,8 +177,8 @@ public:
     void Clear();
     void AddRange(ScMyRowFormatRange& rFormatRange, const sal_Int32 nStartRow);
     sal_Bool GetNext(ScMyRowFormatRange& rFormatRange);
-    sal_Int32 GetMaxRows();
-    sal_Int32 GetSize();
+    sal_Int32 GetMaxRows() const;
+    sal_Int32 GetSize() const;
     void Sort();
 };
 
@@ -197,11 +196,11 @@ struct ScMyFormatRange
     sal_Bool operator< (const ScMyFormatRange& rRange) const;
 };
 
-typedef std::list<ScMyFormatRange>          ScMyFormatRangeAddresses;
-typedef std::vector<ScMyFormatRangeAddresses*>  ScMyFormatRangeListVec;
-
 class ScFormatRangeStyles
 {
+    typedef std::list<ScMyFormatRange>          ScMyFormatRangeAddresses;
+    typedef std::vector<ScMyFormatRangeAddresses*>  ScMyFormatRangeListVec;
+
     ScMyFormatRangeListVec      aTables;
     ScMyOUStringVec             aStyleNames;
     ScMyOUStringVec             aAutoStyleNames;
@@ -254,12 +253,10 @@ struct ScColumnStyle
     ScColumnStyle() : nIndex(-1), bIsVisible(sal_True) {}
 };
 
-
-typedef std::vector<ScColumnStyle>  ScMyColumnStyleVec;
-typedef std::vector<ScMyColumnStyleVec> ScMyColumnVectorVec;
-
 class ScColumnStyles : public ScColumnRowStylesBase
 {
+    typedef std::vector<ScColumnStyle>  ScMyColumnStyleVec;
+    typedef std::vector<ScMyColumnStyleVec> ScMyColumnVectorVec;
     ScMyColumnVectorVec             aTables;
 
 public:
@@ -273,11 +270,10 @@ public:
     virtual rtl::OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField);
 };
 
-typedef std::vector<sal_Int32>  ScMysalInt32Vec;
-typedef std::vector<ScMysalInt32Vec>    ScMyRowVectorVec;
-
 class ScRowStyles : public ScColumnRowStylesBase
 {
+    typedef std::vector<sal_Int32>          ScMysalInt32Vec;
+    typedef std::vector<ScMysalInt32Vec>    ScMyRowVectorVec;
     ScMyRowVectorVec                aTables;
 
 public:
diff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx b/sc/source/filter/xml/XMLStylesImportHelper.cxx
index 3a4ea8384539..0906a2a016a8 100644
--- a/sc/source/filter/xml/XMLStylesImportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesImportHelper.cxx
@@ -578,7 +578,7 @@ void ScMyStylesImportHelper::AddCell(const com::sun::star::table::CellAddress& r
 
 void ScMyStylesImportHelper::InsertRow(const sal_Int32 nRow, const sal_Int32 nTab, ScDocument* pDoc)
 {
-    rImport.LockSolarMutex();
+    ScXMLImport::MutexGuard aGuard(rImport);
     ScMyStylesSet::iterator aItr(aCellStyles.begin());
     ScMyStylesSet::iterator aEndItr(aCellStyles.end());
     while (aItr != aEndItr)
@@ -586,12 +586,11 @@ void ScMyStylesImportHelper::InsertRow(const sal_Int32 nRow, const sal_Int32 nTa
         aItr->xRanges->InsertRow(nRow, nTab, pDoc);
         ++aItr;
     }
-    rImport.UnlockSolarMutex();
 }
 
 void ScMyStylesImportHelper::InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDocument* pDoc)
 {
-    rImport.LockSolarMutex();
+    ScXMLImport::MutexGuard aGuard(rImport);
     ScMyStylesSet::iterator aItr(aCellStyles.begin());
     ScMyStylesSet::iterator aEndItr(aCellStyles.end());
     while (aItr != aEndItr)
@@ -599,7 +598,6 @@ void ScMyStylesImportHelper::InsertCol(const sal_Int32 nCol, const sal_Int32 nTa
         aItr->xRanges->InsertCol(nCol, nTab, pDoc);
         ++aItr;
     }
-    rImport.UnlockSolarMutex();
 }
 
 void ScMyStylesImportHelper::EndTable()
diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
index ec79d21aba40..07c983e90180 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
@@ -57,10 +57,10 @@ XMLTableHeaderFooterContext::XMLTableHeaderFooterContext( SvXMLImport& rImport,
                        sal_Bool bFooter, sal_Bool bLft ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
     xPropSet( rPageStylePropSet ),
-    sOn( OUString::createFromAscii( bFooter ? SC_UNO_PAGE_FTRON : SC_UNO_PAGE_HDRON ) ),
-    sShareContent( OUString::createFromAscii( bFooter ? SC_UNO_PAGE_FTRSHARED : SC_UNO_PAGE_HDRSHARED ) ),
-    sContent( OUString::createFromAscii( bFooter ? SC_UNO_PAGE_RIGHTFTRCON : SC_UNO_PAGE_RIGHTHDRCON ) ),
-    sContentLeft( OUString::createFromAscii( bFooter ? SC_UNO_PAGE_LEFTFTRCONT : SC_UNO_PAGE_LEFTHDRCONT ) ),
+    sOn( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_FTRON)) : OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_HDRON)) ),
+    sShareContent( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_FTRSHARED)) : OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_HDRSHARED)) ),
+    sContent( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTFTRCON)) : OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTHDRCON)) ),
+    sContentLeft( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_LEFTFTRCONT)) : OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_LEFTHDRCONT)) ),
     bDisplay( sal_True ),
     bInsertContent( sal_True ),
     bLeft( bLft ),
diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx
index 23e72c369267..67d0736473c8 100644
--- a/sc/source/filter/xml/XMLTableShapeResizer.cxx
+++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx
@@ -201,7 +201,7 @@ void ScMyShapeResizer::ResizeShapes()
             ScDocument* pDoc(rImport.GetDocument());
             if ( pDoc && xIndex.is() )
             {
-                rImport.LockSolarMutex();
+                ScXMLImport::MutexGuard aGuard(rImport);
                 while (aItr != aEndItr)
                 {
                     // #i78086# invalid cell position is used to call CreateChartListener only
@@ -377,9 +377,6 @@ void ScMyShapeResizer::ResizeShapes()
                         delete aItr->pRangeList;
                     aItr = aShapes.erase(aItr);
                 }
-                rImport.UnlockSolarMutex();
-//              if (pCollection)
-//                  pDoc->SetChartListenerCollection(pCollection);
             }
         }
     }
diff --git a/sc/source/filter/xml/XMLTableSourceContext.cxx b/sc/source/filter/xml/XMLTableSourceContext.cxx
index 9cc6d9a7090a..d3607a2ab279 100644
--- a/sc/source/filter/xml/XMLTableSourceContext.cxx
+++ b/sc/source/filter/xml/XMLTableSourceContext.cxx
@@ -117,7 +117,7 @@ void ScXMLTableSourceContext::EndElement()
         ScDocument* pDoc(GetScImport().GetDocument());
         if (xLinkable.is() && pDoc)
         {
-            GetScImport().LockSolarMutex();
+            ScXMLImport::MutexGuard aGuard(GetScImport());
             if (pDoc->RenameTab( static_cast<SCTAB>(GetScImport().GetTables().GetCurrentSheet()),
                 GetScImport().GetTables().GetCurrentSheetName(), sal_False, sal_True))
             {
@@ -140,7 +140,6 @@ void ScXMLTableSourceContext::EndElement()
                     nLinkMode, aFileString, aFilterString, aOptString,
                     aSheetString, nRefresh );
             }
-            GetScImport().UnlockSolarMutex();
         }
     }
 }
diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx
index 7f92f82aa1a6..3f8539d9b37c 100644
--- a/sc/source/filter/xml/xmlbodyi.cxx
+++ b/sc/source/filter/xml/xmlbodyi.cxx
@@ -268,7 +268,9 @@ void ScXMLBodyContext::EndElement()
         SvXMLImportContext *pContext = new ScXMLCalculationSettingsContext( GetScImport(), XML_NAMESPACE_TABLE, GetXMLToken(XML_CALCULATION_SETTINGS), NULL );
         pContext->EndElement();
     }
-    GetScImport().LockSolarMutex();
+
+    ScXMLImport::MutexGuard aGuard(GetScImport());
+
     ScMyImpDetectiveOpArray*    pDetOpArray = GetScImport().GetDetectiveOpArray();
     ScDocument*                 pDoc        = GetScImport().GetDocument();
     ScMyImpDetectiveOp          aDetOp;
@@ -304,7 +306,6 @@ void ScXMLBodyContext::EndElement()
             pDoc->SetDocProtection(pProtection.get());
         }
     }
-    GetScImport().UnlockSolarMutex();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx
index 4b05c89dc4e2..fa2cc817fa7a 100644
--- a/sc/source/filter/xml/xmlcoli.cxx
+++ b/sc/source/filter/xml/xmlcoli.cxx
@@ -319,7 +319,7 @@ void ScXMLTableColsContext::EndElement()
             ScDocument* pDoc = GetScImport().GetDocument();
             if (pDoc)
             {
-                rXMLImport.LockSolarMutex();
+                ScXMLImport::MutexGuard aGuard(GetScImport());
                 ScOutlineTable* pOutlineTable = pDoc->GetOutlineTable(static_cast<SCTAB>(nSheet), sal_True);
                 ScOutlineArray* pColArray = pOutlineTable ? pOutlineTable->GetColArray() : NULL;
                 if (pColArray)
@@ -327,7 +327,6 @@ void ScXMLTableColsContext::EndElement()
                     sal_Bool bResized;
                     pColArray->Insert(static_cast<SCCOL>(nGroupStartCol), static_cast<SCCOL>(nGroupEndCol), bResized, !bGroupDisplay, sal_True);
                 }
-                rXMLImport.UnlockSolarMutex();
             }
         }
     }
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 2f31b209d375..48cc1e6bb6f5 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -161,11 +161,13 @@
 #define SC_SHOW_CHANGES_BY_RANGES                   11
 #define SC_SHOW_CHANGES_BY_RANGES_LIST              12
 
-using namespace rtl;
 using namespace formula;
 using namespace com::sun::star;
 using namespace xmloff::token;
 using ::std::vector;
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::UNO_QUERY;
 
 //----------------------------------------------------------------------------
@@ -527,7 +529,7 @@ ScXMLExport::ScXMLExport(
         // This name is reserved for the external ref cache tables.  This
         // should not conflict with user-defined styles since this name is
         // used for a table style which is not available in the UI.
-        sExternalRefTabStyleName = rtl::OUString::createFromAscii("ta_extref");
+        sExternalRefTabStyleName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ta_extref"));
         GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_TABLE, sExternalRefTabStyleName);
 
         sAttrName = GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TABLE, GetXMLToken(XML_NAME));
@@ -825,11 +827,11 @@ void ScXMLExport::_ExportMeta()
     CollectSharedData(nTableCount, nShapesCount, nCellCount);
 
     uno::Sequence<beans::NamedValue> stats(3);
-    stats[0] = beans::NamedValue(::rtl::OUString::createFromAscii("TableCount"),
+    stats[0] = beans::NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableCount")),
                 uno::makeAny(nTableCount));
-    stats[1] = beans::NamedValue(::rtl::OUString::createFromAscii("CellCount"),
+    stats[1] = beans::NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellCount")),
                 uno::makeAny(nCellCount));
-    stats[2] = beans::NamedValue(::rtl::OUString::createFromAscii("ObjectCount"),
+    stats[2] = beans::NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ObjectCount")),
                 uno::makeAny(nShapesCount));
 
     // update document statistics at the model
@@ -1089,7 +1091,7 @@ void ScXMLExport::ExportColumns(const sal_Int32 nTable, const table::CellRangeAd
 void ScXMLExport::ExportExternalRefCacheStyles()
 {
     sal_Int32 nEntryIndex = GetCellStylesPropertySetMapper()->FindEntryIndex(
-        "NumberFormat", XML_NAMESPACE_STYLE, OUString::createFromAscii("data-style-name"));
+        "NumberFormat", XML_NAMESPACE_STYLE, OUString(RTL_CONSTASCII_USTRINGPARAM("data-style-name")));
 
     if (nEntryIndex < 0)
         // No entry index for the number format is found.
@@ -1103,7 +1105,7 @@ void ScXMLExport::ExportExternalRefCacheStyles()
     // Export each unique number format used in the external ref cache.
     vector<sal_uInt32> aNumFmts;
     pRefMgr->getAllCachedNumberFormats(aNumFmts);
-    const OUString aDefaultStyle = OUString::createFromAscii("Default").intern();
+    const OUString aDefaultStyle = OUString(RTL_CONSTASCII_USTRINGPARAM("Default")).intern();
     for (vector<sal_uInt32>::const_iterator itr = aNumFmts.begin(), itrEnd = aNumFmts.end();
           itr != itrEnd; ++itr)
     {
@@ -1130,7 +1132,7 @@ void ScXMLExport::ExportExternalRefCacheStyles()
         {
             sal_Bool bIsAuto;
             nIndex = pCellStyles->GetIndexOfStyleName(
-                aName, OUString::createFromAscii(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX), bIsAuto);
+                aName, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX)), bIsAuto);
         }
 
         // store the number format to index mapping for later use.
@@ -1749,46 +1751,45 @@ void ScXMLExport::_ExportContent()
                         AddAttribute(sAttrStyleName, aTableStyles[nTable]);
 
                         uno::Reference<util::XProtectable> xProtectable (xTable, uno::UNO_QUERY);
-                    ScTableProtection* pProtect = NULL;
+                        ScTableProtection* pProtect = NULL;
                         if (xProtectable.is() && xProtectable->isProtected())
                         {
                             AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTED, XML_TRUE);
                             if (pDoc)
                             {
-                            pProtect = pDoc->GetTabProtection(static_cast<SCTAB>(nTable));
+                                pProtect = pDoc->GetTabProtection(static_cast<SCTAB>(nTable));
                                 if (pProtect)
-                            {
-                                rtl::OUStringBuffer aBuffer;
-                                ScPasswordHash eHashUsed = PASSHASH_UNSPECIFIED;
-                                if (pProtect->hasPasswordHash(PASSHASH_SHA1))
-                                {
-                                    SvXMLUnitConverter::encodeBase64(aBuffer, pProtect->getPasswordHash(PASSHASH_SHA1));
-                                    eHashUsed = PASSHASH_SHA1;
-                                }
-                                else if (pProtect->hasPasswordHash(PASSHASH_XL, PASSHASH_SHA1))
-                                {
-                                    // Double-hash this by SHA1 on top of the legacy xls hash.
-                                    uno::Sequence<sal_Int8> aHash = pProtect->getPasswordHash(PASSHASH_XL, PASSHASH_SHA1);
-                                    SvXMLUnitConverter::encodeBase64(aBuffer, aHash);
-                                    eHashUsed = PASSHASH_XL;
-                                }
-                                if (aBuffer.getLength())
                                 {
-                                    AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY, aBuffer.makeStringAndClear());
-                                    if (eHashUsed == PASSHASH_XL)
+                                    rtl::OUStringBuffer aBuffer;
+                                    ScPasswordHash eHashUsed = PASSHASH_UNSPECIFIED;
+                                    if (pProtect->hasPasswordHash(PASSHASH_SHA1))
                                     {
-                                        AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM,
-                                                     ScPassHashHelper::getHashURI(PASSHASH_XL));
-                                        AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2,
-                                                     ScPassHashHelper::getHashURI(PASSHASH_SHA1));
+                                        SvXMLUnitConverter::encodeBase64(aBuffer, pProtect->getPasswordHash(PASSHASH_SHA1));
+                                        eHashUsed = PASSHASH_SHA1;
+                                    }
+                                    else if (pProtect->hasPasswordHash(PASSHASH_XL, PASSHASH_SHA1))
+                                    {
+                                        // Double-hash this by SHA1 on top of the legacy xls hash.
+                                        uno::Sequence<sal_Int8> aHash = pProtect->getPasswordHash(PASSHASH_XL, PASSHASH_SHA1);
+                                        SvXMLUnitConverter::encodeBase64(aBuffer, aHash);
+                                        eHashUsed = PASSHASH_XL;
+                                    }
+                                    if (aBuffer.getLength())
+                                    {
+                                        AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY, aBuffer.makeStringAndClear());
+                                        if (eHashUsed == PASSHASH_XL)
+                                        {
+                                            AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM,
+                                                         ScPassHashHelper::getHashURI(PASSHASH_XL));
+                                            AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2,
+                                                         ScPassHashHelper::getHashURI(PASSHASH_SHA1));
+                                        }
+                                        else if (eHashUsed == PASSHASH_SHA1)
+                                            AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM,
+                                                         ScPassHashHelper::getHashURI(PASSHASH_SHA1));
                                     }
-                                    else if (eHashUsed == PASSHASH_SHA1)
-                                        AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM,
-                                                     ScPassHashHelper::getHashURI(PASSHASH_SHA1));
-
                                 }
                             }
-                            }
                         }
                         rtl::OUString sPrintRanges;
                         table::CellRangeAddress aColumnHeaderRange;
@@ -1800,18 +1801,18 @@ void ScXMLExport::_ExportContent()
                             AddAttribute( XML_NAMESPACE_TABLE, XML_PRINT, XML_FALSE);
                         SvXMLElementExport aElemT(*this, sElemTab, sal_True, sal_True);
 
-                    if (pProtect && pProtect->isProtected())
-                    {
-                        if (pProtect->isOptionEnabled(ScTableProtection::SELECT_LOCKED_CELLS))
-                            AddAttribute(XML_NAMESPACE_TABLE, XML_SELECT_PROTECTED_CELLS, XML_TRUE);
-                        if (pProtect->isOptionEnabled(ScTableProtection::SELECT_UNLOCKED_CELLS))
-                            AddAttribute(XML_NAMESPACE_TABLE, XML_SELECT_UNPROTECTED_CELLS, XML_TRUE);
+                        if (pProtect && pProtect->isProtected())
+                        {
+                            if (pProtect->isOptionEnabled(ScTableProtection::SELECT_LOCKED_CELLS))
+                                AddAttribute(XML_NAMESPACE_TABLE, XML_SELECT_PROTECTED_CELLS, XML_TRUE);
+                            if (pProtect->isOptionEnabled(ScTableProtection::SELECT_UNLOCKED_CELLS))
+                                AddAttribute(XML_NAMESPACE_TABLE, XML_SELECT_UNPROTECTED_CELLS, XML_TRUE);
 
-                        rtl::OUString aElemName = GetNamespaceMap().GetQNameByKey(
-                            XML_NAMESPACE_TABLE, GetXMLToken(XML_TABLE_PROTECTION));
+                            rtl::OUString aElemName = GetNamespaceMap().GetQNameByKey(
+                                XML_NAMESPACE_TABLE, GetXMLToken(XML_TABLE_PROTECTION));
 
-                        SvXMLElementExport aElemProtected(*this, aElemName, true, true);
-                    }
+                            SvXMLElementExport aElemProtected(*this, aElemName, true, true);
+                        }
 
                         CheckAttrList();
 
@@ -2231,11 +2232,11 @@ void ScXMLExport::_ExportAutoStyles()
     if (!GetModel().is())
         return;
 
-    uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( GetModel(), uno::UNO_QUERY );
+    Reference <sheet::XSpreadsheetDocument> xSpreadDoc( GetModel(), uno::UNO_QUERY );
     if (!xSpreadDoc.is())
         return;
 
-    uno::Reference<container::XIndexAccess> xIndex( xSpreadDoc->getSheets(), uno::UNO_QUERY );
+    Reference<container::XIndexAccess> xIndex( xSpreadDoc->getSheets(), uno::UNO_QUERY );
     if (!xIndex.is())
         return;
 
@@ -2272,8 +2273,8 @@ void ScXMLExport::_ExportAutoStyles()
                 bool bCopySheet = pDoc->IsStreamValid( static_cast<SCTAB>(nTable) );
                 if (bCopySheet)
                 {
-                    uno::Reference <sheet::XSpreadsheet> xTable(xIndex->getByIndex(nTable), uno::UNO_QUERY);
-                    uno::Reference <beans::XPropertySet> xProperties(
+                    Reference <sheet::XSpreadsheet> xTable(xIndex->getByIndex(nTable), uno::UNO_QUERY);
+                    Reference <beans::XPropertySet> xProperties(
                         xTable->getCellByPosition( aPos.Col(), aPos.Row() ), uno::UNO_QUERY );
 
                     AddStyleFromCells(xProperties, xTable, nTable, &aCellIter->maName);
@@ -2292,9 +2293,9 @@ void ScXMLExport::_ExportAutoStyles()
                 bool bCopySheet = pDoc->IsStreamValid( static_cast<SCTAB>(nTable) );
                 if (bCopySheet)
                 {
-                    uno::Reference<table::XColumnRowRange> xColumnRowRange(xIndex->getByIndex(nTable), uno::UNO_QUERY);
-                    uno::Reference<table::XTableColumns> xTableColumns(xColumnRowRange->getColumns());
-                    uno::Reference<beans::XPropertySet> xColumnProperties(xTableColumns->getByIndex( aPos.Col() ), uno::UNO_QUERY);
+                    Reference<table::XColumnRowRange> xColumnRowRange(xIndex->getByIndex(nTable), uno::UNO_QUERY);
+                    Reference<table::XTableColumns> xTableColumns(xColumnRowRange->getColumns());
+                    Reference<beans::XPropertySet> xColumnProperties(xTableColumns->getByIndex( aPos.Col() ), uno::UNO_QUERY);
 
                     sal_Int32 nIndex(-1);
                     sal_Bool bIsVisible(sal_True);
@@ -2314,9 +2315,9 @@ void ScXMLExport::_ExportAutoStyles()
                 bool bCopySheet = pDoc->IsStreamValid( static_cast<SCTAB>(nTable) );
                 if (bCopySheet)
                 {
-                    uno::Reference<table::XColumnRowRange> xColumnRowRange(xIndex->getByIndex(nTable), uno::UNO_QUERY);
-                    uno::Reference<table::XTableRows> xTableRows(xColumnRowRange->getRows());
-                    uno::Reference<beans::XPropertySet> xRowProperties(xTableRows->getByIndex( aPos.Row() ), uno::UNO_QUERY);
+                    Reference<table::XColumnRowRange> xColumnRowRange(xIndex->getByIndex(nTable), uno::UNO_QUERY);
+                    Reference<table::XTableRows> xTableRows(xColumnRowRange->getRows());
+                    Reference<beans::XPropertySet> xRowProperties(xTableRows->getByIndex( aPos.Row() ), uno::UNO_QUERY);
 
                     sal_Int32 nIndex(-1);
                     AddStyleFromRow( xRowProperties, &aRowIter->maName, nIndex );
@@ -2336,7 +2337,7 @@ void ScXMLExport::_ExportAutoStyles()
                 if (bCopySheet)
                 {
                     //! separate method AddStyleFromTable needed?
-                    uno::Reference<beans::XPropertySet> xTableProperties(xIndex->getByIndex(nTable), uno::UNO_QUERY);
+                    Reference<beans::XPropertySet> xTableProperties(xIndex->getByIndex(nTable), uno::UNO_QUERY);
                     if (xTableProperties.is())
                     {
                         std::vector<XMLPropertyState> xPropStates(xTableStylesExportPropertySetMapper->Filter(xTableProperties));
@@ -2372,7 +2373,7 @@ void ScXMLExport::_ExportAutoStyles()
                     {
                         SdrCaptionObj* pDrawObj = pNote->GetOrCreateCaption( aPos );
                         // all uno shapes are created anyway in CollectSharedData
-                        uno::Reference<beans::XPropertySet> xShapeProperties( pDrawObj->getUnoShape(), uno::UNO_QUERY );
+                        Reference<beans::XPropertySet> xShapeProperties( pDrawObj->getUnoShape(), uno::UNO_QUERY );
                         if (xShapeProperties.is())
                         {
                             if ( aNoteIter->maStyleName.getLength() )
@@ -2400,7 +2401,6 @@ void ScXMLExport::_ExportAutoStyles()
 
             // note paragraph styles
 
-            //UniReference<SvXMLExportPropertyMapper> xParaPropMapper = XMLTextParagraphExport::CreateParaExtPropMapper( *this );
             UniReference<SvXMLExportPropertyMapper> xParaPropMapper = GetTextParagraphExport()->GetParagraphPropertyMapper();
 
             const std::vector<ScTextStyleEntry>& rNoteParaEntries = pSheetData->GetNoteParaStyles();
@@ -2418,8 +2418,8 @@ void ScXMLExport::_ExportAutoStyles()
                     if (pNote)
                     {
                         SdrCaptionObj* pDrawObj = pNote->GetOrCreateCaption( aPos );
-                        uno::Reference<container::XEnumerationAccess> xCellText(pDrawObj->getUnoShape(), uno::UNO_QUERY);
-                        uno::Reference<beans::XPropertySet> xParaProp(
+                        Reference<container::XEnumerationAccess> xCellText(pDrawObj->getUnoShape(), uno::UNO_QUERY);
+                        Reference<beans::XPropertySet> xParaProp(
                             lcl_GetEnumerated( xCellText, aNoteParaIter->maSelection.nStartPara ), uno::UNO_QUERY );
                         if ( xParaProp.is() )
                         {
@@ -2453,8 +2453,8 @@ void ScXMLExport::_ExportAutoStyles()
                     if (pNote)
                     {
                         SdrCaptionObj* pDrawObj = pNote->GetOrCreateCaption( aPos );
-                        uno::Reference<text::XSimpleText> xCellText(pDrawObj->getUnoShape(), uno::UNO_QUERY);
-                        uno::Reference<beans::XPropertySet> xCursorProp(xCellText->createTextCursor(), uno::UNO_QUERY);
+                        Reference<text::XSimpleText> xCellText(pDrawObj->getUnoShape(), uno::UNO_QUERY);
+                        Reference<beans::XPropertySet> xCursorProp(xCellText->createTextCursor(), uno::UNO_QUERY);
                         ScDrawTextCursor* pCursor = ScDrawTextCursor::getImplementation( xCursorProp );
                         if (pCursor)
                         {
@@ -2473,8 +2473,6 @@ void ScXMLExport::_ExportAutoStyles()
 
             // stored text styles
 
-            //UniReference<SvXMLExportPropertyMapper> xTextPropMapper = XMLTextParagraphExport::CreateCharExtPropMapper( *this );
-
             const std::vector<ScTextStyleEntry>& rTextEntries = pSheetData->GetTextStyles();
             std::vector<ScTextStyleEntry>::const_iterator aTextIter = rTextEntries.begin();
             std::vector<ScTextStyleEntry>::const_iterator aTextEnd = rTextEntries.end();
@@ -2488,9 +2486,9 @@ void ScXMLExport::_ExportAutoStyles()
                     //! separate method AddStyleFromText needed?
                     //! cache sheet object
 
-                    uno::Reference<table::XCellRange> xCellRange(xIndex->getByIndex(nTable), uno::UNO_QUERY);
-                    uno::Reference<text::XSimpleText> xCellText(xCellRange->getCellByPosition(aPos.Col(), aPos.Row()), uno::UNO_QUERY);
-                    uno::Reference<beans::XPropertySet> xCursorProp(xCellText->createTextCursor(), uno::UNO_QUERY);
+                    Reference<table::XCellRange> xCellRange(xIndex->getByIndex(nTable), uno::UNO_QUERY);
+                    Reference<text::XSimpleText> xCellText(xCellRange->getCellByPosition(aPos.Col(), aPos.Row()), uno::UNO_QUERY);
+                    Reference<beans::XPropertySet> xCursorProp(xCellText->createTextCursor(), uno::UNO_QUERY);
                     ScCellTextCursor* pCursor = ScCellTextCursor::getImplementation( xCursorProp );
                     if (pCursor)
                     {
@@ -2515,176 +2513,169 @@ void ScXMLExport::_ExportAutoStyles()
             sal_Int32 nShapesCount(0);
             sal_Int32 nCellCount(pDoc ? pDoc->GetCellCount() : 0);
             CollectSharedData(nTableCount, nShapesCount, nCellCount);
-            //DBG_ERROR("no shared data setted");
         }
         sal_Int32 nTableCount(xIndex->getCount());
         pCellStyles->AddNewTable(nTableCount - 1);
         CollectShapesAutoStyles(nTableCount);
-        for (sal_Int32 nTable = 0; nTable < nTableCount; ++nTable)
+        for (sal_Int32 nTable = 0; nTable < nTableCount; ++nTable, IncrementProgressBar(sal_False))
         {
             bool bUseStream = pSheetData && pDoc && pDoc->IsStreamValid((SCTAB)nTable) &&
                               pSheetData->HasStreamPos(nTable) && xSourceStream.is();
 
-            uno::Reference <sheet::XSpreadsheet> xTable(xIndex->getByIndex(nTable), uno::UNO_QUERY);
-            if (xTable.is())
+            Reference <sheet::XSpreadsheet> xTable(xIndex->getByIndex(nTable), uno::UNO_QUERY);
+            if (!xTable.is())
+                continue;
+
+            // table styles array must be complete, including copied tables - Add should find the stored style
+            Reference<beans::XPropertySet> xTableProperties(xTable, uno::UNO_QUERY);
+            if (xTableProperties.is())
             {
-                // table styles array must be complete, including copied tables - Add should find the stored style
-                uno::Reference<beans::XPropertySet> xTableProperties(xTable, uno::UNO_QUERY);
-                if (xTableProperties.is())
+                std::vector<XMLPropertyState> xPropStates(xTableStylesExportPropertySetMapper->Filter(xTableProperties));
+                if(xPropStates.size())
                 {
-                    std::vector<XMLPropertyState> xPropStates(xTableStylesExportPropertySetMapper->Filter(xTableProperties));
-                    if(xPropStates.size())
-                    {
-                        rtl::OUString sParent;
-                        rtl::OUString sName;
-                        GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_TABLE, sParent, xPropStates);
-                        aTableStyles.push_back(sName);
-                    }
+                    rtl::OUString sParent;
+                    rtl::OUString sName;
+                    GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_TABLE, sParent, xPropStates);
+                    aTableStyles.push_back(sName);
                 }
             }
+
+            if (bUseStream)
+                continue;
+
             // collect other auto-styles only for non-copied sheets
-            if (xTable.is() && !bUseStream)
+            Reference<sheet::XUniqueCellFormatRangesSupplier> xCellFormatRanges ( xTable, uno::UNO_QUERY );
+            if ( xCellFormatRanges.is() )
             {
-                uno::Reference<sheet::XUniqueCellFormatRangesSupplier> xCellFormatRanges ( xTable, uno::UNO_QUERY );
-                if ( xCellFormatRanges.is() )
+                Reference<container::XIndexAccess> xFormatRangesIndex(xCellFormatRanges->getUniqueCellFormatRanges());
+                if (xFormatRangesIndex.is())
                 {
-                    uno::Reference<container::XIndexAccess> xFormatRangesIndex(xCellFormatRanges->getUniqueCellFormatRanges());
-                    if (xFormatRangesIndex.is())
+                    sal_Int32 nFormatRangesCount(xFormatRangesIndex->getCount());
+                    GetProgressBarHelper()->ChangeReference(GetProgressBarHelper()->GetReference() + nFormatRangesCount);
+                    for (sal_Int32 nFormatRange = 0; nFormatRange < nFormatRangesCount; ++nFormatRange)
                     {
-                        sal_Int32 nFormatRangesCount(xFormatRangesIndex->getCount());
-                        GetProgressBarHelper()->ChangeReference(GetProgressBarHelper()->GetReference() + nFormatRangesCount);
-                        for (sal_Int32 nFormatRange = 0; nFormatRange < nFormatRangesCount; ++nFormatRange)
+                        Reference< sheet::XSheetCellRanges> xCellRanges(xFormatRangesIndex->getByIndex(nFormatRange), uno::UNO_QUERY);
+                        if (xCellRanges.is())
                         {
-                            uno::Reference< sheet::XSheetCellRanges> xCellRanges(xFormatRangesIndex->getByIndex(nFormatRange), uno::UNO_QUERY);
-                            if (xCellRanges.is())
+                            Reference <beans::XPropertySet> xProperties (xCellRanges, uno::UNO_QUERY);
+                            if (xProperties.is())
                             {
-                                uno::Reference <beans::XPropertySet> xProperties (xCellRanges, uno::UNO_QUERY);
-                                if (xProperties.is())
-                                {
-                                    AddStyleFromCells(xProperties, xTable, nTable, NULL);
-                                    IncrementProgressBar(sal_False);
-                                }
+                                AddStyleFromCells(xProperties, xTable, nTable, NULL);
+                                IncrementProgressBar(sal_False);
                             }
                         }
                     }
                 }
-                uno::Reference<table::XColumnRowRange> xColumnRowRange (xTable, uno::UNO_QUERY);
-                if (xColumnRowRange.is())
+            }
+            Reference<table::XColumnRowRange> xColumnRowRange (xTable, uno::UNO_QUERY);
+            if (xColumnRowRange.is())
+            {
+                if (pDoc)
                 {
-                    if (pDoc)
+                    pDoc->SyncColRowFlags();
+                    Reference<table::XTableColumns> xTableColumns(xColumnRowRange->getColumns());
+                    if (xTableColumns.is())
                     {
-                        pDoc->SyncColRowFlags();
-                        uno::Reference<table::XTableColumns> xTableColumns(xColumnRowRange->getColumns());
-                        if (xTableColumns.is())
+                        sal_Int32 nColumns(pDoc->GetLastChangedCol(sal::static_int_cast<SCTAB>(nTable)));
+                        pSharedData->SetLastColumn(nTable, nColumns);
+                        table::CellRangeAddress aCellAddress(GetEndAddress(xTable, nTable));
+                        if (aCellAddress.EndColumn > nColumns)
                         {
-                            sal_Int32 nColumns(pDoc->GetLastChangedCol(sal::static_int_cast<SCTAB>(nTable)));
-                            pSharedData->SetLastColumn(nTable, nColumns);
-                            table::CellRangeAddress aCellAddress(GetEndAddress(xTable, nTable));
-                            if (aCellAddress.EndColumn > nColumns)
-                            {
-                                ++nColumns;
-                                pColumnStyles->AddNewTable(nTable, aCellAddress.EndColumn);
-                            }
-//                              else if (nColumns < MAXCOL)
-//                                  pColumnStyles->AddNewTable(nTable, ++nColumns);
-                            else
-                                pColumnStyles->AddNewTable(nTable, nColumns);
-                            sal_Int32 nColumn = 0;
-                            while (/*nColumn <= nColumns && */nColumn <= MAXCOL)
-                            {
-                                sal_Int32 nIndex(-1);
-                                sal_Bool bIsVisible(sal_True);
-                                uno::Reference <beans::XPropertySet> xColumnProperties(xTableColumns->getByIndex(nColumn), uno::UNO_QUERY);
-                                if (xColumnProperties.is())
-                                {
-                                    AddStyleFromColumn( xColumnProperties, NULL, nIndex, bIsVisible );
-                                    //if(xPropStates.size())
-                                    pColumnStyles->AddFieldStyleName(nTable, nColumn, nIndex, bIsVisible);
-                                }
-                                sal_Int32 nOld(nColumn);
-                                nColumn = pDoc->GetNextDifferentChangedCol(sal::static_int_cast<SCTAB>(nTable), static_cast<SCCOL>(nColumn));
-                                for (sal_Int32 i = nOld + 1; i < nColumn; ++i)
-                                    pColumnStyles->AddFieldStyleName(nTable, i, nIndex, bIsVisible);
-                            }
-                            if (aCellAddress.EndColumn > nColumns)
-                            {
-                                sal_Bool bIsVisible(sal_True);
-                                sal_Int32 nIndex(pColumnStyles->GetStyleNameIndex(nTable, nColumns, bIsVisible));
-                                for (sal_Int32 i = nColumns + 1; i <= aCellAddress.EndColumn; ++i)
-                                    pColumnStyles->AddFieldStyleName(nTable, i, nIndex, bIsVisible);
-                            }
+                            ++nColumns;
+                            pColumnStyles->AddNewTable(nTable, aCellAddress.EndColumn);
                         }
-                        uno::Reference<table::XTableRows> xTableRows(xColumnRowRange->getRows());
-                        if (xTableRows.is())
+                        else
+                            pColumnStyles->AddNewTable(nTable, nColumns);
+                        sal_Int32 nColumn = 0;
+                        while (nColumn <= MAXCOL)
                         {
-                            sal_Int32 nRows(pDoc->GetLastChangedRow(sal::static_int_cast<SCTAB>(nTable)));
-                            pSharedData->SetLastRow(nTable, nRows);
-                            table::CellRangeAddress aCellAddress(GetEndAddress(xTable, nTable));
-                            if (aCellAddress.EndRow > nRows)
-                            {
-                                ++nRows;
-                                pRowStyles->AddNewTable(nTable, aCellAddress.EndRow);
-                            }
-//                              else if (nRows < MAXROW)
-//                                  pRowStyles->AddNewTable(nTable, ++nRows);
-                            else
-                                pRowStyles->AddNewTable(nTable, nRows);
-                            sal_Int32 nRow = 0;
-                            while (nRow <= nRows && nRow <= MAXROW)
+                            sal_Int32 nIndex(-1);
+                            sal_Bool bIsVisible(sal_True);
+                            Reference <beans::XPropertySet> xColumnProperties(xTableColumns->getByIndex(nColumn), uno::UNO_QUERY);
+                            if (xColumnProperties.is())
                             {
-                                sal_Int32 nIndex = 0;
-                                uno::Reference <beans::XPropertySet> xRowProperties(xTableRows->getByIndex(nRow), uno::UNO_QUERY);
-                                if(xRowProperties.is())
-                                {
-                                    AddStyleFromRow( xRowProperties, NULL, nIndex );
-                                    //if(xPropStates.size())
-                                    pRowStyles->AddFieldStyleName(nTable, nRow, nIndex);
-                                }
-                                sal_Int32 nOld(nRow);
-                                nRow = pDoc->GetNextDifferentChangedRow(sal::static_int_cast<SCTAB>(nTable), static_cast<SCROW>(nRow), false);
-                                if (nRow > nOld + 1)
-                                    pRowStyles->AddFieldStyleName(nTable, nOld + 1, nIndex, nRow - 1);
+                                AddStyleFromColumn( xColumnProperties, NULL, nIndex, bIsVisible );
+                                pColumnStyles->AddFieldStyleName(nTable, nColumn, nIndex, bIsVisible);
                             }
-                            if (aCellAddress.EndRow > nRows)
+                            sal_Int32 nOld(nColumn);
+                            nColumn = pDoc->GetNextDifferentChangedCol(sal::static_int_cast<SCTAB>(nTable), static_cast<SCCOL>(nColumn));
+                            for (sal_Int32 i = nOld + 1; i < nColumn; ++i)
+                                pColumnStyles->AddFieldStyleName(nTable, i, nIndex, bIsVisible);
+                        }
+                        if (aCellAddress.EndColumn > nColumns)
+                        {
+                            sal_Bool bIsVisible(sal_True);
+                            sal_Int32 nIndex(pColumnStyles->GetStyleNameIndex(nTable, nColumns, bIsVisible));
+                            for (sal_Int32 i = nColumns + 1; i <= aCellAddress.EndColumn; ++i)
+                                pColumnStyles->AddFieldStyleName(nTable, i, nIndex, bIsVisible);
+                        }
+                    }
+                    Reference<table::XTableRows> xTableRows(xColumnRowRange->getRows());
+                    if (xTableRows.is())
+                    {
+                        sal_Int32 nRows(pDoc->GetLastChangedRow(sal::static_int_cast<SCTAB>(nTable)));
+                        pSharedData->SetLastRow(nTable, nRows);
+                        table::CellRangeAddress aCellAddress(GetEndAddress(xTable, nTable));
+                        if (aCellAddress.EndRow > nRows)
+                        {
+                            ++nRows;
+                            pRowStyles->AddNewTable(nTable, aCellAddress.EndRow);
+                        }
+                        else
+                            pRowStyles->AddNewTable(nTable, nRows);
+                        sal_Int32 nRow = 0;
+                        while (nRow <= nRows && nRow <= MAXROW)
+                        {
+                            sal_Int32 nIndex = 0;
+                            Reference <beans::XPropertySet> xRowProperties(xTableRows->getByIndex(nRow), uno::UNO_QUERY);
+                            if(xRowProperties.is())
                             {
-                                sal_Int32 nIndex(pRowStyles->GetStyleNameIndex(nTable, nRows));
-                                pRowStyles->AddFieldStyleName(nTable, nRows + 1, nIndex, aCellAddress.EndRow);
+                                AddStyleFromRow( xRowProperties, NULL, nIndex );
+                                pRowStyles->AddFieldStyleName(nTable, nRow, nIndex);
                             }
+                            sal_Int32 nOld(nRow);
+                            nRow = pDoc->GetNextDifferentChangedRow(sal::static_int_cast<SCTAB>(nTable), static_cast<SCROW>(nRow), false);
+                            if (nRow > nOld + 1)
+                                pRowStyles->AddFieldStyleName(nTable, nOld + 1, nIndex, nRow - 1);
+                        }
+                        if (aCellAddress.EndRow > nRows)
+                        {
+                            sal_Int32 nIndex(pRowStyles->GetStyleNameIndex(nTable, nRows));
+                            pRowStyles->AddFieldStyleName(nTable, nRows + 1, nIndex, aCellAddress.EndRow);
                         }
                     }
                 }
-                uno::Reference<sheet::XCellRangesQuery> xCellRangesQuery (xTable, uno::UNO_QUERY);
-                if (xCellRangesQuery.is())
+            }
+            Reference<sheet::XCellRangesQuery> xCellRangesQuery (xTable, uno::UNO_QUERY);
+            if (xCellRangesQuery.is())
+            {
+                Reference<sheet::XSheetCellRanges> xSheetCellRanges(xCellRangesQuery->queryContentCells(sheet::CellFlags::FORMATTED));
+                Reference<sheet::XSheetOperation> xSheetOperation(xSheetCellRanges, uno::UNO_QUERY);
+                if (xSheetCellRanges.is() && xSheetOperation.is())
                 {
-                    uno::Reference<sheet::XSheetCellRanges> xSheetCellRanges(xCellRangesQuery->queryContentCells(sheet::CellFlags::FORMATTED));
-                    uno::Reference<sheet::XSheetOperation> xSheetOperation(xSheetCellRanges, uno::UNO_QUERY);
-                    if (xSheetCellRanges.is() && xSheetOperation.is())
+                    sal_uInt32 nCount(sal_uInt32(xSheetOperation->computeFunction(sheet::GeneralFunction_COUNT)));
+                    Reference<container::XEnumerationAccess> xCellsAccess(xSheetCellRanges->getCells());
+                    if (xCellsAccess.is())
                     {
-                        sal_uInt32 nCount(sal_uInt32(xSheetOperation->computeFunction(sheet::GeneralFunction_COUNT)));
-                        uno::Reference<container::XEnumerationAccess> xCellsAccess(xSheetCellRanges->getCells());
-                        if (xCellsAccess.is())
+                        GetProgressBarHelper()->ChangeReference(GetProgressBarHelper()->GetReference() + nCount);
+                        Reference<container::XEnumeration> xCells(xCellsAccess->createEnumeration());
+                        if (xCells.is())
                         {
-                            GetProgressBarHelper()->ChangeReference(GetProgressBarHelper()->GetReference() + nCount);
-                            uno::Reference<container::XEnumeration> xCells(xCellsAccess->createEnumeration());
-                            if (xCells.is())
+                            sal_uInt32 nCount2(0);
+                            while (xCells->hasMoreElements())
                             {
-                                sal_uInt32 nCount2(0);
-                                while (xCells->hasMoreElements())
-                                {
-                                    uno::Reference<text::XText> xText(xCells->nextElement(), uno::UNO_QUERY);
-                                    if (xText.is())
-                                        GetTextParagraphExport()->collectTextAutoStyles(xText, sal_False, sal_False);
-                                    ++nCount2;
-                                    IncrementProgressBar(sal_False);
-                                }
-                                if(nCount2 > nCount)
-                                    GetProgressBarHelper()->SetReference(GetProgressBarHelper()->GetReference() + nCount2 - nCount);
+                                Reference<text::XText> xText(xCells->nextElement(), uno::UNO_QUERY);
+                                if (xText.is())
+                                    GetTextParagraphExport()->collectTextAutoStyles(xText, sal_False, sal_False);
+                                ++nCount2;
+                                IncrementProgressBar(sal_False);
                             }
+                            if(nCount2 > nCount)
+                                GetProgressBarHelper()->SetReference(GetProgressBarHelper()->GetReference() + nCount2 - nCount);
                         }
                     }
                 }
             }
-            IncrementProgressBar(sal_False);
         }
         pChangeTrackingExportHelper->CollectAutoStyles();
 
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index c1a984dbf080..ca4cbd67adeb 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -93,6 +93,7 @@
 #include <com/sun/star/sheet/XNamedRange.hpp>
 #include <com/sun/star/sheet/XLabelRanges.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 
 #define SC_LOCALE           "Locale"
 #define SC_STANDARDFORMAT   "StandardFormat"
@@ -106,9 +107,10 @@
 using namespace com::sun::star;
 using namespace ::xmloff::token;
 using namespace ::formula;
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::UNO_QUERY;
 using ::rtl::OUString;
-
-using rtl::OUString;
+using ::rtl::OUStringBuffer;
 
 OUString SAL_CALL ScXMLImport_getImplementationName() throw()
 {
@@ -1640,8 +1642,8 @@ SvXMLImportContext *ScXMLImport::CreateContext( USHORT nPrefix,
     } else if ( (XML_NAMESPACE_OFFICE == nPrefix) &&
         ( IsXMLToken(rLocalName, XML_DOCUMENT)) ) {
             uno::Reference<xml::sax::XDocumentHandler> xDocBuilder(
-                mxServiceFactory->createInstance(::rtl::OUString::createFromAscii(
-                "com.sun.star.xml.dom.SAXDocumentBuilder")),
+                mxServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.xml.dom.SAXDocumentBuilder"))),
                 uno::UNO_QUERY_THROW);
             uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
                 GetModel(), uno::UNO_QUERY_THROW);
@@ -1939,8 +1941,8 @@ SvXMLImportContext *ScXMLImport::CreateMetaContext(
     if( !IsStylesOnlyMode() && (getImportFlags() & IMPORT_META))
     {
         uno::Reference<xml::sax::XDocumentHandler> xDocBuilder(
-            mxServiceFactory->createInstance(::rtl::OUString::createFromAscii(
-            "com.sun.star.xml.dom.SAXDocumentBuilder")),
+            mxServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.xml.dom.SAXDocumentBuilder"))),
             uno::UNO_QUERY_THROW);
         uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
             GetModel(), uno::UNO_QUERY_THROW);
@@ -2107,7 +2109,7 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque
         sal_Int32 nCount(rChangeProps.getLength());
         if (nCount)
         {
-            LockSolarMutex();
+            ScXMLImport::MutexGuard aGuard(*this);
             sal_Int16 nTemp16(0);
             ScChangeViewSettings* pViewSettings(new ScChangeViewSettings());
             for (sal_Int32 i = 0; i < nCount; ++i)
@@ -2183,7 +2185,6 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque
                 }
             }
             pDoc->SetChangeViewSettings(*pViewSettings);
-            UnlockSolarMutex();
         }
     }
 }
@@ -2316,18 +2317,19 @@ sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const rtl::OUStri
                     lang::Locale aLocale;
                     if (GetDocument() && (xProperties->getPropertyValue(sLocale) >>= aLocale))
                     {
-                        LockSolarMutex();
-                        LocaleDataWrapper aLocaleData( GetDocument()->GetServiceManager(), aLocale );
-                        rtl::OUStringBuffer aBuffer(15);
-                        aBuffer.appendAscii("#");
-                        aBuffer.append( aLocaleData.getNumThousandSep() );
-                        aBuffer.appendAscii("##0");
-                        aBuffer.append( aLocaleData.getNumDecimalSep() );
-                        aBuffer.appendAscii("00 [$");
-                        aBuffer.append(rCurrency);
-                        aBuffer.appendAscii("]");
-                        UnlockSolarMutex();
-                        sFormatString = aBuffer.makeStringAndClear();
+                        {
+                            ScXMLImport::MutexGuard aGuard(*this);
+                            LocaleDataWrapper aLocaleData( GetDocument()->GetServiceManager(), aLocale );
+                            rtl::OUStringBuffer aBuffer(15);
+                            aBuffer.appendAscii("#");
+                            aBuffer.append( aLocaleData.getNumThousandSep() );
+                            aBuffer.appendAscii("##0");
+                            aBuffer.append( aLocaleData.getNumDecimalSep() );
+                            aBuffer.appendAscii("00 [$");
+                            aBuffer.append(rCurrency);
+                            aBuffer.appendAscii("]");
+                            sFormatString = aBuffer.makeStringAndClear();
+                        }
                         sal_Int32 nNewKey = xLocalNumberFormats->queryKey(sFormatString, aLocale, sal_True);
                         if (nNewKey == -1)
                             nNewKey = xLocalNumberFormats->addNew(sFormatString, aLocale);
@@ -2601,7 +2603,7 @@ void ScXMLImport::SetStylesToRangesFinished()
 void SAL_CALL ScXMLImport::setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc )
 throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
-    LockSolarMutex();
+    ScXMLImport::MutexGuard aGuard(*this);
     SvXMLImport::setTargetDocument( xDoc );
 
     uno::Reference<frame::XModel> xModel(xDoc, uno::UNO_QUERY);
@@ -2615,7 +2617,6 @@ throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::R
     uno::Reference<document::XActionLockable> xActionLockable(xDoc, uno::UNO_QUERY);
     if (xActionLockable.is())
         xActionLockable->addActionLock();
-    UnlockSolarMutex();
 }
 
 // XServiceInfo
@@ -2645,7 +2646,7 @@ throw(::com::sun::star::uno::RuntimeException)
 void SAL_CALL ScXMLImport::startDocument(void)
 throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException )
 {
-    LockSolarMutex();
+    ScXMLImport::MutexGuard aGuard(*this);
     SvXMLImport::startDocument();
     if (pDoc && !pDoc->IsImportingXML())
     {
@@ -2669,8 +2670,6 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE
             pSheetData->StoreInitialNamespaces(rNamespaces);
         }
     }
-
-    UnlockSolarMutex();
 }
 
 sal_Int32 ScXMLImport::GetRangeType(const rtl::OUString sRangeType) const
@@ -2742,96 +2741,143 @@ void ScXMLImport::SetLabelRanges()
     }
 }
 
+namespace {
+
+/**
+ * Used to switch off document modify and broadcast while populating named
+ * ranges during import.
+ */
+class NamedRangesSwitch
+{
+public:
+    NamedRangesSwitch(Reference<beans::XPropertySet>& xPropSet) :
+        mxPropSet(xPropSet), maPropName(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_MODIFY_BROADCAST))
+    {
+        uno::Any any;
+        any <<= sal_False;
+        mxPropSet->setPropertyValue(maPropName, any);
+    }
+
+    ~NamedRangesSwitch()
+    {
+        uno::Any any;
+        any <<= sal_True;
+        mxPropSet->setPropertyValue(maPropName, any);
+    }
+
+private:
+    Reference<beans::XPropertySet>& mxPropSet;
+    OUString maPropName;
+};
+
+}
+
 void ScXMLImport::SetNamedRanges()
 {
-    ScMyNamedExpressions* pNamedExpressions(GetNamedExpressions());
-    if (pNamedExpressions)
+    ScMyNamedExpressions* pNamedExpressions = GetNamedExpressions();
+    if (!pNamedExpressions)
+        return;
+
+    Reference <beans::XPropertySet> xPropertySet (GetModel(), UNO_QUERY);
+    if (!xPropertySet.is())
+        return;
+
+    Reference <sheet::XNamedRanges> xNamedRanges(
+        xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_NAMEDRANGES))), UNO_QUERY);
+
+    if (!xNamedRanges.is())
+        return;
+
+    Reference<beans::XPropertySet> xPropSet(xNamedRanges, UNO_QUERY);
+    if (!xPropSet.is())
+        return;
+
+    // Turn off broadcasting while adding imported range names.
+    NamedRangesSwitch aSwitch(xPropSet);
+
+    ScMyNamedExpressions::iterator aItr(pNamedExpressions->begin());
+    ScMyNamedExpressions::const_iterator aEndItr(pNamedExpressions->end());
+    table::CellAddress aCellAddress;
+    OUString sTempContent(RTL_CONSTASCII_USTRINGPARAM("0"));
+
+    for (; aItr != aEndItr; ++aItr)
     {
-        uno::Reference <beans::XPropertySet> xPropertySet (GetModel(), uno::UNO_QUERY);
-        if (xPropertySet.is())
+        sal_Int32 nOffset = 0;
+        bool bSuccess = ScRangeStringConverter::GetAddressFromString(
+            aCellAddress, (*aItr)->sBaseCellAddress, GetDocument(), FormulaGrammar::CONV_OOO, nOffset);
+
+        if (!bSuccess)
+            // Conversion of base cell address failed.  Skip this.
+            continue;
+
+        try
+        {
+            xNamedRanges->addNewByName(
+                (*aItr)->sName, sTempContent, aCellAddress, GetRangeType((*aItr)->sRangeType));
+        }
+        catch( uno::RuntimeException& )
         {
-            uno::Reference <sheet::XNamedRanges> xNamedRanges(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_NAMEDRANGES))), uno::UNO_QUERY);
-            if (xNamedRanges.is())
+            DBG_ERROR("here are some Named Ranges with the same name");
+            uno::Reference < container::XIndexAccess > xIndex(xNamedRanges, uno::UNO_QUERY);
+            if (xIndex.is())
             {
-                ScMyNamedExpressions::iterator aItr(pNamedExpressions->begin());
-                ScMyNamedExpressions::const_iterator aEndItr(pNamedExpressions->end());
-                table::CellAddress aCellAddress;
-                rtl::OUString sTempContent(RTL_CONSTASCII_USTRINGPARAM("0"));
-                while (aItr != aEndItr)
+                sal_Int32 nMax = xIndex->getCount();
+                bool bInserted = false;
+                sal_Int32 nCount = 1;
+                OUStringBuffer sName((*aItr)->sName);
+                sName.append(sal_Unicode('_'));
+                while (!bInserted && nCount <= nMax)
                 {
-                    sal_Int32 nOffset(0);
-                    if (ScRangeStringConverter::GetAddressFromString(
-                        aCellAddress, (*aItr)->sBaseCellAddress, GetDocument(), FormulaGrammar::CONV_OOO, nOffset ))
+                    OUStringBuffer sTemp(sName);
+                    sTemp.append(OUString::valueOf(nCount));
+                    try
                     {
-                        try
-                        {
-                            xNamedRanges->addNewByName((*aItr)->sName, sTempContent, aCellAddress, GetRangeType((*aItr)->sRangeType));
-                        }
-                        catch( uno::RuntimeException& )
-                        {
-                            DBG_ERROR("here are some Named Ranges with the same name");
-                            uno::Reference < container::XIndexAccess > xIndex(xNamedRanges, uno::UNO_QUERY);
-                            if (xIndex.is())
-                            {
-                                sal_Int32 nMax(xIndex->getCount());
-                                sal_Bool bInserted(sal_False);
-                                sal_Int32 nCount(1);
-                                rtl::OUStringBuffer sName((*aItr)->sName);
-                                sName.append(sal_Unicode('_'));
-                                while (!bInserted && nCount <= nMax)
-                                {
-                                    rtl::OUStringBuffer sTemp(sName);
-                                    sTemp.append(rtl::OUString::valueOf(nCount));
-                                    try
-                                    {
-                                        xNamedRanges->addNewByName(sTemp.makeStringAndClear(), sTempContent, aCellAddress, GetRangeType((*aItr)->sRangeType));
-                                        bInserted = sal_True;
-                                    }
-                                    catch( uno::RuntimeException& )
-                                    {
-                                        ++nCount;
-                                    }
-                                }
-                            }
-                        }
+                        xNamedRanges->addNewByName(
+                            sTemp.makeStringAndClear(), sTempContent, aCellAddress,
+                            GetRangeType((*aItr)->sRangeType));
+                        bInserted = true;
                     }
-                    ++aItr;
-                }
-                aItr = pNamedExpressions->begin();
-                while (aItr != aEndItr)
-                {
-                    sal_Int32 nOffset(0);
-                    if (ScRangeStringConverter::GetAddressFromString(
-                        aCellAddress, (*aItr)->sBaseCellAddress, GetDocument(), FormulaGrammar::CONV_OOO, nOffset ))
+                    catch( uno::RuntimeException& )
                     {
-                        uno::Reference <sheet::XNamedRange> xNamedRange(xNamedRanges->getByName((*aItr)->sName), uno::UNO_QUERY);
-                        if (xNamedRange.is())
-                        {
-                            LockSolarMutex();
-                            ScNamedRangeObj* pNamedRangeObj = ScNamedRangeObj::getImplementation( xNamedRange);
-                            if (pNamedRangeObj)
-                            {
-                                sTempContent = (*aItr)->sContent;
-                                // Get rid of leading sheet dots in simple ranges.
-                                if (!(*aItr)->bIsExpression)
-                                    ScXMLConverter::ParseFormula( sTempContent, false);
-                                pNamedRangeObj->SetContentWithGrammar( sTempContent, (*aItr)->eGrammar);
-                            }
-                            UnlockSolarMutex();
-                        }
+                        ++nCount;
                     }
-                    delete *aItr;
-                    aItr = pNamedExpressions->erase(aItr);
                 }
+                UnlockSolarMutex();
             }
         }
     }
+
+    aItr = pNamedExpressions->begin();
+    while (aItr != aEndItr)
+    {
+        sal_Int32 nOffset(0);
+        if (ScRangeStringConverter::GetAddressFromString(
+            aCellAddress, (*aItr)->sBaseCellAddress, GetDocument(), FormulaGrammar::CONV_OOO, nOffset ))
+        {
+            uno::Reference <sheet::XNamedRange> xNamedRange(xNamedRanges->getByName((*aItr)->sName), uno::UNO_QUERY);
+            if (xNamedRange.is())
+            {
+                ScXMLImport::MutexGuard aGuard(*this);
+                ScNamedRangeObj* pNamedRangeObj = ScNamedRangeObj::getImplementation( xNamedRange);
+                if (pNamedRangeObj)
+                {
+                    sTempContent = (*aItr)->sContent;
+                    // Get rid of leading sheet dots in simple ranges.
+                    if (!(*aItr)->bIsExpression)
+                        ScXMLConverter::ParseFormula( sTempContent, false);
+                    pNamedRangeObj->SetContentWithGrammar( sTempContent, (*aItr)->eGrammar);
+                }
+            }
+        }
+        delete *aItr;
+        aItr = pNamedExpressions->erase(aItr);
+    }
 }
 
 void SAL_CALL ScXMLImport::endDocument(void)
 throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException )
 {
-    LockSolarMutex();
+    ScXMLImport::MutexGuard aGuard(*this);
     if (getImportFlags() & IMPORT_CONTENT)
     {
         if (GetModel().is())
@@ -2901,8 +2947,6 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE
     {
         ScModelObj::getImplementation(GetModel())->AfterXMLLoading(sal_True);
     }
-
-    UnlockSolarMutex();
 }
 
 // XEventListener
@@ -2912,6 +2956,17 @@ void ScXMLImport::DisposingModel()
     pDoc = NULL;
 }
 
+ScXMLImport::MutexGuard::MutexGuard(ScXMLImport& rImport) :
+    mrImport(rImport)
+{
+    mrImport.LockSolarMutex();
+}
+
+ScXMLImport::MutexGuard::~MutexGuard()
+{
+    mrImport.UnlockSolarMutex();
+}
+
 void ScXMLImport::LockSolarMutex()
 {
     // #i62677# When called from DocShell/Wrapper, the SolarMutex is already locked,
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index 49e89406d8eb..a76e5d8fc50a 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -1003,6 +1003,18 @@ public:
 
     virtual void DisposingModel();
 
+    /**
+     * Use this class to manage solar mutex locking instead of calling
+     * LockSolarMutex() and UnlockSolarMutex() directly.
+     */
+    class MutexGuard
+    {
+    public:
+        explicit MutexGuard(ScXMLImport& rImport);
+        ~MutexGuard();
+    private:
+        ScXMLImport& mrImport;
+    };
     void LockSolarMutex();
     void UnlockSolarMutex();
 
diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx
index b1daf5d18575..aa0e0e367326 100644
--- a/sc/source/filter/xml/xmlrowi.cxx
+++ b/sc/source/filter/xml/xmlrowi.cxx
@@ -349,12 +349,11 @@ void ScXMLTableRowsContext::EndElement()
             ScDocument* pDoc(GetScImport().GetDocument());
             if (pDoc)
             {
-                GetScImport().LockSolarMutex();
+                ScXMLImport::MutexGuard aGuard(GetScImport());
                 ScOutlineTable* pOutlineTable(pDoc->GetOutlineTable(static_cast<SCTAB>(nSheet), sal_True));
                 ScOutlineArray* pRowArray(pOutlineTable->GetRowArray());
                 sal_Bool bResized;
                 pRowArray->Insert(static_cast<SCROW>(nGroupStartRow), static_cast<SCROW>(nGroupEndRow), bResized, !bGroupDisplay, sal_True);
-                GetScImport().UnlockSolarMutex();
             }
         }
     }
diff --git a/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxx
index bf1f0427854d..c71e4c38c40c 100644
--- a/sc/source/filter/xml/xmlsorti.cxx
+++ b/sc/source/filter/xml/xmlsorti.cxx
@@ -155,19 +155,19 @@ void ScXMLSortContext::EndElement()
     if (nAlgoLength)
         ++i;
     uno::Sequence <beans::PropertyValue> aSortDescriptor(7 + i);
-    aSortDescriptor[0].Name = rtl::OUString::createFromAscii(SC_UNONAME_BINDFMT);
+    aSortDescriptor[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_BINDFMT));
     aSortDescriptor[0].Value = ::cppu::bool2any(bBindFormatsToContent);
-    aSortDescriptor[1].Name = rtl::OUString::createFromAscii(SC_UNONAME_COPYOUT);
+    aSortDescriptor[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COPYOUT));
     aSortDescriptor[1].Value = ::cppu::bool2any(bCopyOutputData);
-    aSortDescriptor[2].Name = rtl::OUString::createFromAscii(SC_UNONAME_ISCASE);
+    aSortDescriptor[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISCASE));
     aSortDescriptor[2].Value = ::cppu::bool2any(bIsCaseSensitive);
-    aSortDescriptor[3].Name = rtl::OUString::createFromAscii(SC_UNONAME_ISULIST);
+    aSortDescriptor[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISULIST));
     aSortDescriptor[3].Value = ::cppu::bool2any(bEnabledUserList);
-    aSortDescriptor[4].Name = rtl::OUString::createFromAscii(SC_UNONAME_OUTPOS);
+    aSortDescriptor[4].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_OUTPOS));
     aSortDescriptor[4].Value <<= aOutputPosition;
-    aSortDescriptor[5].Name = rtl::OUString::createFromAscii(SC_UNONAME_UINDEX);
+    aSortDescriptor[5].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_UINDEX));
     aSortDescriptor[5].Value <<= nUserListIndex;
-    aSortDescriptor[6].Name = rtl::OUString::createFromAscii(SC_UNONAME_SORTFLD);
+    aSortDescriptor[6].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_SORTFLD));
     aSortDescriptor[6].Value <<= aSortFields;
     if (nLangLength || nCountryLength)
     {
diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx
index f686ed36bf9b..d3830fce5bd8 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -1176,7 +1176,7 @@ bool XmlScPropHdl_JustifyMethod::equals(
     const ::com::sun::star::uno::Any& r1,
     const ::com::sun::star::uno::Any& r2 ) const
 {
-    sal_Int32 nVal1, nVal2;
+    sal_Int32 nVal1(0), nVal2(0);
 
     if((r1 >>= nVal1) && (r2 >>= nVal2))
         return (nVal1 == nVal2);
@@ -1214,7 +1214,7 @@ sal_Bool XmlScPropHdl_JustifyMethod::exportXML(
     const ::com::sun::star::uno::Any& rValue,
     const SvXMLUnitConverter& /* rUnitConverter */ ) const
 {
-    sal_Int32 nVal;
+    sal_Int32 nVal(0);
     bool bRetval = false;
 
     if (rValue >>= nVal)
@@ -1597,7 +1597,7 @@ bool XmlScPropHdl_RotateReference::equals(
     const ::com::sun::star::uno::Any& r1,
     const ::com::sun::star::uno::Any& r2 ) const
 {
-    sal_Int32 aReference1, aReference2;
+    sal_Int32 aReference1(0), aReference2(0);
 
     if((r1 >>= aReference1) && (r2 >>= aReference2))
         return (aReference1 == aReference2);
@@ -1645,7 +1645,7 @@ sal_Bool XmlScPropHdl_RotateReference::exportXML(
     const ::com::sun::star::uno::Any& rValue,
     const SvXMLUnitConverter& /* rUnitConverter */ ) const
 {
-    sal_Int32 nVal;
+    sal_Int32 nVal(0);
     sal_Bool bRetval(sal_False);
 
     if(rValue >>= nVal)
@@ -1694,7 +1694,7 @@ bool XmlScPropHdl_VertJustify::equals(
     const ::com::sun::star::uno::Any& r1,
     const ::com::sun::star::uno::Any& r2 ) const
 {
-    sal_Int32 aReference1, aReference2;
+    sal_Int32 aReference1(0), aReference2(0);
 
     if((r1 >>= aReference1) && (r2 >>= aReference2))
         return (aReference1 == aReference2);
@@ -1748,7 +1748,7 @@ sal_Bool XmlScPropHdl_VertJustify::exportXML(
     const ::com::sun::star::uno::Any& rValue,
     const SvXMLUnitConverter& /* rUnitConverter */ ) const
 {
-    sal_Int32 nVal;
+    sal_Int32 nVal(0);
     sal_Bool bRetval(sal_False);
 
     if(rValue >>= nVal)
diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx
index d3e949acabd0..b46abe6480a5 100644
--- a/sc/source/filter/xml/xmlsubti.cxx
+++ b/sc/source/filter/xml/xmlsubti.cxx
@@ -29,7 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sc.hxx"
 
-
 // INCLUDE ---------------------------------------------------------------
 #include "xmlsubti.hxx"
 #include "global.hxx"
@@ -164,22 +163,12 @@ ScMyTables::ScMyTables(ScXMLImport& rTempImport)
     nCurrentColStylePos(0),
     nCurrentDrawPage( -1 ),
     nCurrentXShapes( -1 ),
-    nTableCount( 0 ),
     nCurrentSheet( -1 )
 {
-    aTableVec.resize(nDefaultTabCount, NULL);
 }
 
 ScMyTables::~ScMyTables()
 {
-    ScMyTableData* pTable;
-    while (nTableCount > 0)
-    {
-        pTable = aTableVec[nTableCount - 1];
-        delete pTable;
-        aTableVec[nTableCount - 1] = NULL;
-        --nTableCount;
-    }
 }
 
 void ScMyTables::NewSheet(const rtl::OUString& sTableName, const rtl::OUString& sStyleName,
@@ -189,14 +178,7 @@ void ScMyTables::NewSheet(const rtl::OUString& sTableName, const rtl::OUString&
     {
         nCurrentColStylePos = 0;
         sCurrentSheetName = sTableName;
-        ScMyTableData* aTable;
-        while (nTableCount > 0)
-        {
-            aTable = aTableVec[nTableCount - 1];
-            delete aTable;
-            aTableVec[nTableCount - 1] = NULL;
-            --nTableCount;
-        }
+        maTables.clear();
         ++nCurrentSheet;
 
         maProtectionData = rProtectData;
@@ -217,12 +199,11 @@ void ScMyTables::NewSheet(const rtl::OUString& sTableName, const rtl::OUString&
                         ScDocument *pDoc = ScXMLConverter::GetScDocument(rImport.GetModel());
                         if (pDoc)
                         {
-                            rImport.LockSolarMutex();
+                            ScXMLImport::MutexGuard aGuard(rImport);
                             String sTabName(String::CreateFromAscii("Table"));
                             pDoc->CreateValidTabName(sTabName);
                             rtl::OUString sOUTabName(sTabName);
                             xSheets->insertNewByName(sOUTabName, sal::static_int_cast<sal_Int16>(nCurrentSheet));
-                            rImport.UnlockSolarMutex();
                         }
                     }
                 }
@@ -246,12 +227,11 @@ void ScMyTables::NewSheet(const rtl::OUString& sTableName, const rtl::OUString&
                                     ScDocument *pDoc = ScXMLConverter::GetScDocument(rImport.GetModel());
                                     if (pDoc)
                                     {
-                                        rImport.LockSolarMutex();
+                                        ScXMLImport::MutexGuard aGuard(rImport);
                                         String sTabName(String::CreateFromAscii("Table"));
                                         pDoc->CreateValidTabName(sTabName);
                                         rtl::OUString sOUTabName(sTabName);
                                         xNamed->setName(sOUTabName);
-                                        rImport.UnlockSolarMutex();
                                     }
                                 }
                         }
@@ -355,16 +335,21 @@ void ScMyTables::DoMerge(sal_Int32 nCount)
         //merge
         uno::Reference <table::XCellRange> xMergeCellRange;
         if (nCount == -1)
-            xMergeCellRange.set(xCurrentCellRange->getCellRangeByPosition(aCellAddress.StartColumn, aCellAddress.StartRow,
-                                                    aCellAddress.EndColumn
-                                                    + aTableVec[nTableCount - 1]->GetColsPerCol(aTableVec[nTableCount - 1]->GetColumn()) - 1,
-                                                    aCellAddress.EndRow
-                                                    + aTableVec[nTableCount - 1]->GetRowsPerRow(aTableVec[nTableCount - 1]->GetRow()) - 1));
+        {
+            const ScMyTableData& r = maTables.back();
+            xMergeCellRange.set(
+                xCurrentCellRange->getCellRangeByPosition(
+                    aCellAddress.StartColumn, aCellAddress.StartRow,
+                    aCellAddress.EndColumn + r.GetColsPerCol(r.GetColumn()) - 1,
+                    aCellAddress.EndRow + r.GetRowsPerRow(r.GetRow()) - 1));
+        }
         else
-            xMergeCellRange.set(xCurrentCellRange->getCellRangeByPosition(aCellAddress.StartColumn, aCellAddress.StartRow,
-                                                    aCellAddress.StartColumn
-                                                    + nCount - 1,
-                                                    aCellAddress.EndRow));
+            xMergeCellRange.set(
+                xCurrentCellRange->getCellRangeByPosition(
+                    aCellAddress.StartColumn, aCellAddress.StartRow,
+                    aCellAddress.StartColumn + nCount - 1,
+                    aCellAddress.EndRow));
+
         uno::Reference <util::XMergeable> xMergeable (xMergeCellRange, uno::UNO_QUERY);
         if (xMergeable.is())
             xMergeable->merge(sal_True);
@@ -377,7 +362,8 @@ void ScMyTables::InsertRow()
     {
         table::CellRangeAddress aCellAddress;
         sal_Int32 nRow(GetRealCellPos().Row);
-        for (sal_Int32 j = 0; j < GetRealCellPos().Column - aTableVec[nTableCount - 1]->GetColumn() - 1; ++j)
+        const ScMyTableData& rTab = maTables.back();
+        for (sal_Int32 j = 0; j < GetRealCellPos().Column - rTab.GetColumn() - 1; ++j)
         {
             if (IsMerged(xCurrentCellRange, j, nRow - 1, aCellAddress))
             {
@@ -401,34 +387,41 @@ void ScMyTables::InsertRow()
 
 void ScMyTables::NewRow()
 {
-    if (nTableCount > 1)
-        if (aTableVec[nTableCount - 1]->GetRealRows(aTableVec[nTableCount - 1]->GetRow()) >
-            aTableVec[nTableCount - 2]->GetRowsPerRow(aTableVec[nTableCount - 2]->GetRow()) - 1)
+    size_t n = maTables.size();
+    if (n <= 1)
+        return;
+
+    if (maTables[n-1].GetRealRows(maTables[n-1].GetRow()) >
+        maTables[n-2].GetRowsPerRow(maTables[n-2].GetRow()) - 1)
+    {
+        if (GetRealCellPos().Column > 0)
+            InsertRow();
+
+        for (size_t i = n - 1; i > 0; --i)
         {
-            if (GetRealCellPos().Column > 0)
-                InsertRow();
-            for (sal_Int16 i = sal::static_int_cast<sal_Int16>(nTableCount - 1); i > 0; i--)
-            {
-                sal_Int32 nRow = aTableVec[i - 1]->GetRow();
-                aTableVec[i - 1]->SetRowsPerRow(nRow,
-                    aTableVec[i - 1]->GetRowsPerRow(nRow) + 1);
-                aTableVec[i - 1]->SetRealRows(nRow + 1,
-                    aTableVec[i - 1]->GetRealRows(nRow)
-                    + aTableVec[i - 1]->GetRowsPerRow(nRow));
-            }
+            sal_Int32 nRow = maTables[i-1].GetRow();
+            maTables[i-1].SetRowsPerRow(
+                nRow,
+                maTables[i-1].GetRowsPerRow(nRow) + 1);
+
+            maTables[i-1].SetRealRows(
+                nRow + 1,
+                maTables[i-1].GetRealRows(nRow) + maTables[i-1].GetRowsPerRow(nRow));
         }
+    }
 }
 
 void ScMyTables::AddRow()
 {
-    aTableVec[nTableCount - 1]->AddRow();
-    aTableVec[nTableCount - 1]->SetFirstColumn();
-    sal_Int32 nRow = aTableVec[nTableCount - 1]->GetRow();
+    ScMyTableData& rTab = maTables.back();
+    rTab.AddRow();
+    rTab.SetFirstColumn();
+    sal_Int32 nRow = rTab.GetRow();
     if (nRow > 0)
         NewRow();
-    aTableVec[nTableCount - 1]->SetRealRows(nRow + 1,
-        aTableVec[nTableCount - 1]->GetRealRows(nRow)
-        + aTableVec[nTableCount - 1]->GetRowsPerRow(nRow));
+
+    rTab.SetRealRows(
+        nRow + 1, rTab.GetRealRows(nRow) + rTab.GetRowsPerRow(nRow));
 }
 
 void ScMyTables::SetRowStyle(const rtl::OUString& rCellStyleName)
@@ -442,7 +435,8 @@ void ScMyTables::InsertColumn()
     {
         table::CellRangeAddress aCellAddress;
         sal_Int32 nCol(GetRealCellPos().Column);
-        for (sal_Int32 j = 0; j <= GetRealCellPos().Row - aTableVec[nTableCount - 1]->GetRow() - 1; ++j)
+        sal_Int32 n = GetRealCellPos().Row - maTables.back().GetRow() - 1;
+        for (sal_Int32 j = 0; j <= n; ++j)
         {
             table::CellRangeAddress aTempCellAddress;
             if (IsMerged(xCurrentCellRange, nCol - 1, j, aCellAddress))
@@ -481,49 +475,51 @@ void ScMyTables::InsertColumn()
 
 void ScMyTables::NewColumn(sal_Bool bIsCovered)
 {
-    if (!bIsCovered)
+    if (bIsCovered)
+        return;
+
+    ScMyTableData& rLastTab = maTables.back();
+    sal_Int32 nColCount = rLastTab.GetColCount();
+    sal_Int32 nSpannedCols = rLastTab.GetSpannedCols();
+    if ( (nSpannedCols > nColCount) &&
+        (rLastTab.GetRow() == 0) &&
+        (rLastTab.GetColumn() == 0) )
     {
-        sal_Int32 nColCount(aTableVec[nTableCount - 1]->GetColCount());
-        sal_Int32 nSpannedCols(aTableVec[nTableCount - 1]->GetSpannedCols());
-        if ( (nSpannedCols > nColCount) &&
-            (aTableVec[nTableCount - 1]->GetRow() == 0) &&
-            (aTableVec[nTableCount - 1]->GetColumn() == 0) )
+        if (nColCount > 0)
         {
-            if (nColCount > 0)
+            sal_Int32 FirstColsSpanned(nSpannedCols / nColCount);
+            sal_Int32 LastColSpanned(FirstColsSpanned
+                + (nSpannedCols % nColCount));
+            for (sal_Int32 i = 0; i < nColCount - 1; ++i)
             {
-                sal_Int32 FirstColsSpanned(nSpannedCols / nColCount);
-                sal_Int32 LastColSpanned(FirstColsSpanned
-                    + (nSpannedCols % nColCount));
-                for (sal_Int32 i = 0; i < nColCount - 1; ++i)
-                {
-                    aTableVec[nTableCount - 1]->SetColsPerCol(i, FirstColsSpanned);
-                    aTableVec[nTableCount - 1]->SetRealCols(i + 1,
-                        aTableVec[nTableCount - 1]->GetRealCols(i)
-                        + FirstColsSpanned);
-                }
-                aTableVec[nTableCount - 1]->SetColsPerCol(nColCount - 1, LastColSpanned);
-                aTableVec[nTableCount - 1]->SetRealCols(nColCount - 1 + 1,
-                    aTableVec[nTableCount - 1]->GetRealCols(nColCount - 1)
-                    + LastColSpanned);
+                rLastTab.SetColsPerCol(i, FirstColsSpanned);
+                rLastTab.SetRealCols(i + 1, rLastTab.GetRealCols(i) + FirstColsSpanned);
             }
+            rLastTab.SetColsPerCol(nColCount - 1, LastColSpanned);
+            rLastTab.SetRealCols(
+                nColCount, rLastTab.GetRealCols(nColCount - 1) + LastColSpanned);
         }
-        if (aTableVec[nTableCount - 1]->GetRealCols(aTableVec[nTableCount - 1]->GetColumn()) > nSpannedCols - 1)
+    }
+    if (rLastTab.GetRealCols(rLastTab.GetColumn()) > nSpannedCols - 1)
+    {
+        if (rLastTab.GetRow() == 0)
         {
-            if ( aTableVec[nTableCount - 1]->GetRow() == 0)
+            InsertColumn();
+            size_t n = maTables.size();
+            for (size_t i = n - 1; i > 0; --i)
             {
-                InsertColumn();
-                for (sal_Int16 i = sal::static_int_cast<sal_Int16>(nTableCount - 1); i > 0; i--)
-                {
-                    sal_Int32 nColPos = aTableVec[i - 1]->GetColumn() +
-                        aTableVec[i]->GetSpannedCols() - 1;
-                    aTableVec[i - 1]->SetColsPerCol(nColPos,
-                        aTableVec[i - 1]->GetColsPerCol(nColPos) +
-                        aTableVec[nTableCount - 1]->GetColsPerCol(aTableVec[nTableCount - 1]->GetColumn()));
-                    aTableVec[i - 1]->SetRealCols(nColPos + 1,
-                        aTableVec[i - 1]->GetRealCols(nColPos)
-                        + aTableVec[i - 1]->GetColsPerCol(nColPos));
-                    aTableVec[i - 1]->SetChangedCols(nColPos);
-                }
+                sal_Int32 nColPos =
+                    maTables[i-1].GetColumn() + maTables[i].GetSpannedCols() - 1;
+
+                maTables[i-1].SetColsPerCol(nColPos,
+                    maTables[i-1].GetColsPerCol(nColPos) +
+                    rLastTab.GetColsPerCol(rLastTab.GetColumn()));
+
+                maTables[i-1].SetRealCols(
+                    nColPos + 1,
+                    maTables[i-1].GetRealCols(nColPos) + maTables[i-1].GetColsPerCol(nColPos));
+
+                maTables[i-1].SetChangedCols(nColPos);
             }
         }
     }
@@ -531,21 +527,21 @@ void ScMyTables::NewColumn(sal_Bool bIsCovered)
 
 void ScMyTables::AddColumn(sal_Bool bIsCovered)
 {
-    aTableVec[nTableCount - 1]->AddColumn();
-    if (aTableVec[nTableCount - 1]->GetSubTableSpanned() > 1)
-        aTableVec[nTableCount - 1]->SetSubTableSpanned(aTableVec[nTableCount - 1]->GetSubTableSpanned() - 1);
+    ScMyTableData& rLastTab = maTables.back();
+    rLastTab.AddColumn();
+    if (rLastTab.GetSubTableSpanned() > 1)
+        rLastTab.SetSubTableSpanned(rLastTab.GetSubTableSpanned() - 1);
     else
     {
         NewColumn(bIsCovered);
-    //  if (!bIsCovered)
-            aTableVec[nTableCount - 1]->SetRealCols(aTableVec[nTableCount - 1]->GetColumn() + 1,
-                aTableVec[nTableCount - 1]->GetRealCols(aTableVec[nTableCount - 1]->GetColumn())
-                + aTableVec[nTableCount - 1]->GetColsPerCol(aTableVec[nTableCount - 1]->GetColumn()));
-        if ((!bIsCovered) || (bIsCovered &&
-            (aTableVec[nTableCount - 1]->GetColsPerCol(aTableVec[nTableCount - 1]->GetColumn()) > 1)))
+        sal_Int32 nCol = rLastTab.GetColumn();
+        sal_Int32 nRow = rLastTab.GetRow();
+        rLastTab.SetRealCols(
+            nCol + 1, rLastTab.GetRealCols(nCol) + rLastTab.GetColsPerCol(nCol));
+
+        if ((!bIsCovered) || (bIsCovered && (rLastTab.GetColsPerCol(nCol) > 1)))
         {
-            if ((aTableVec[nTableCount - 1]->GetRowsPerRow(aTableVec[nTableCount - 1]->GetRow()) > 1) ||
-                (aTableVec[nTableCount - 1]->GetColsPerCol(aTableVec[nTableCount - 1]->GetColumn()) > 1))
+            if ((rLastTab.GetRowsPerRow(nRow) > 1) || (rLastTab.GetColsPerCol(nCol) > 1))
                 DoMerge();
         }
     }
@@ -553,38 +549,41 @@ void ScMyTables::AddColumn(sal_Bool bIsCovered)
 
 void ScMyTables::NewTable(sal_Int32 nTempSpannedCols)
 {
-    ++nTableCount;
-    if (static_cast<sal_uInt32>(nTableCount) >= aTableVec.size())
-        aTableVec.resize(aTableVec.size() + nDefaultTabCount);
-    ScMyTableData* aTable(new ScMyTableData(nCurrentSheet));
-    if (nTableCount > 1)
+    maTables.push_back(new ScMyTableData(nCurrentSheet));
+
+    if (maTables.size() > 1)
     {
-        ScMyTableData* pTableData = aTableVec[nTableCount - 2];
-        const sal_Int32 nCol(pTableData->GetColumn());
-        const sal_Int32 nColCount(pTableData->GetColCount());
-        const sal_Int32 nColsPerCol(pTableData->GetColsPerCol(nCol));
-        sal_Int32 nSpannedCols(pTableData->GetSpannedCols());
-        sal_Int32 nTemp(nSpannedCols - nColCount);
-        sal_Int32 nTemp2(nCol - (nColCount - 1));
+        ScMyTableData& rFirstTab = maTables.front();
+
+        const sal_Int32 nCol = rFirstTab.GetColumn();
+        const sal_Int32 nColCount = rFirstTab.GetColCount();
+        const sal_Int32 nColsPerCol = rFirstTab.GetColsPerCol(nCol);
+
+        sal_Int32 nSpannedCols = rFirstTab.GetSpannedCols();
+        sal_Int32 nTemp = nSpannedCols - nColCount;
+        sal_Int32 nTemp2 = nCol - nColCount + 1;
         if ((nTemp > 0) && (nTemp2 == 0))
-            nTempSpannedCols *= (nTemp + 1);
+            nTempSpannedCols *= nTemp + 1;
         else
             if (nColsPerCol > 1)
                 nTempSpannedCols *= nColsPerCol;
 
         sal_Int32 nToMerge;
         if (nSpannedCols > nColCount)
-            nToMerge = pTableData->GetChangedCols(nCol, nCol + nColsPerCol + nSpannedCols - nColCount);
+            nToMerge = rFirstTab.GetChangedCols(nCol, nCol + nColsPerCol + nSpannedCols - nColCount);
         else
-            nToMerge = pTableData->GetChangedCols(nCol, nCol + nColsPerCol);
+            nToMerge = rFirstTab.GetChangedCols(nCol, nCol + nColsPerCol);
         if (nToMerge > nCol)
             nTempSpannedCols += nToMerge;
     }
-    aTable->SetSpannedCols(nTempSpannedCols);
-    aTableVec[nTableCount - 1] = aTable;
-    if (nTableCount > 1)
+
+    ScMyTableData& rNewTab = maTables.back();
+    rNewTab.SetSpannedCols(nTempSpannedCols);
+
+    size_t n = maTables.size();
+    if (n > 1)
     {
-        aTableVec[nTableCount - 2]->SetSubTableSpanned(aTable->GetSpannedCols());
+        maTables[n-2].SetSubTableSpanned(rNewTab.GetSpannedCols());
         UnMerge();
     }
 }
@@ -593,7 +592,8 @@ void ScMyTables::UpdateRowHeights()
 {
     if (rImport.GetModel().is())
     {
-        rImport.LockSolarMutex();
+        ScXMLImport::MutexGuard aGuard(rImport);
+
         // update automatic row heights
 
         // For sheets with any kind of shapes (including notes),
@@ -627,24 +627,18 @@ void ScMyTables::UpdateRowHeights()
                 pDoc->LockStreamValid( false );
             }
         }
-
-        rImport.UnlockSolarMutex();
     }
 }
 
 void ScMyTables::DeleteTable()
 {
-    rImport.LockSolarMutex();
+    ScXMLImport::MutexGuard aGuard(rImport);
 
     nCurrentColStylePos = 0;
-    if (nTableCount > 0)
-    {
-        ScMyTableData* aTable = aTableVec[nTableCount - 1];
-        delete aTable;
-        aTableVec[nTableCount - 1] = NULL;
-        nTableCount--;
-    }
-    if (nTableCount == 0) // only set the styles if all subtables are importet and the table is finished
+    if (!maTables.empty())
+        maTables.pop_back();
+
+    if (maTables.empty()) // only set the styles if all subtables are importet and the table is finished
     {
         rImport.GetStylesImportHelper()->SetStylesToRanges();
         rImport.SetStylesToRangesFinished();
@@ -676,8 +670,6 @@ void ScMyTables::DeleteTable()
         rImport.GetDocument()->SetTabProtection(static_cast<SCTAB>(nCurrentSheet), pProtect.get());
     }
 
-    rImport.UnlockSolarMutex();
-
     //#95582#; find out whether it was possible to set the sheet name
     // test it here, because if it is a linked table the name is changed by importing
     // the linking informations
@@ -704,14 +696,16 @@ void ScMyTables::DeleteTable()
 
 table::CellAddress ScMyTables::GetRealCellPos()
 {
-    sal_Int32 nRow(0);
-    sal_Int32 nCol(0);
-    for (sal_Int32 i = 0; i < nTableCount; ++i)
+    sal_Int32 nRow = 0;
+    sal_Int32 nCol = 0;
+    size_t n = maTables.size();
+    for (size_t i = 0; i < n; ++i)
     {
-        ScMyTableData* pTableData = aTableVec[i];
-        nCol += pTableData->GetRealCols(pTableData->GetColumn());
-        nRow += pTableData->GetRealRows(pTableData->GetRow());
+        const ScMyTableData& rTab = maTables[i];
+        nCol += rTab.GetRealCols(rTab.GetColumn());
+        nRow += rTab.GetRealRows(rTab.GetRow());
     }
+
     aRealCellPos.Row = nRow;
     aRealCellPos.Column = nCol;
     aRealCellPos.Sheet = sal::static_int_cast<sal_Int16>(nCurrentSheet);
@@ -720,12 +714,13 @@ table::CellAddress ScMyTables::GetRealCellPos()
 
 void ScMyTables::AddColCount(sal_Int32 nTempColCount)
 {
-    aTableVec[nTableCount - 1]->SetColCount(aTableVec[nTableCount - 1]->GetColCount() + nTempColCount);
+    ScMyTableData& rLastTab = maTables.back();
+    rLastTab.SetColCount(rLastTab.GetColCount() + nTempColCount);
 }
 
 void ScMyTables::AddColStyle(const sal_Int32 nRepeat, const rtl::OUString& rCellStyleName)
 {
-    DBG_ASSERT(nTableCount == 1, "not possible to use default styles on columns in subtables");
+    DBG_ASSERT(maTables.size() == 1, "not possible to use default styles on columns in subtables");
     rImport.GetStylesImportHelper()->AddColumnStyle(rCellStyleName, nCurrentColStylePos, nRepeat);
     nCurrentColStylePos += nRepeat;
 }
diff --git a/sc/source/filter/xml/xmlsubti.hxx b/sc/source/filter/xml/xmlsubti.hxx
index 6268a874d357..22301bce78ac 100644
--- a/sc/source/filter/xml/xmlsubti.hxx
+++ b/sc/source/filter/xml/xmlsubti.hxx
@@ -37,12 +37,14 @@
 #include <com/sun/star/table/CellRangeAddress.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 
-#include <vector>
-#include <list>
 #include "XMLTableShapeResizer.hxx"
 #include "formula/grammar.hxx"
 #include "tabprotection.hxx"
 
+#include <vector>
+#include <list>
+#include <boost/ptr_container/ptr_vector.hpp>
+
 class ScXMLImport;
 
 typedef std::vector<sal_Int32> ScMysalIntVec;
@@ -134,14 +136,13 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage;
     ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShapes > xShapes;
     rtl::OUString                       sCurrentSheetName;
-    std::vector<ScMyTableData*>         aTableVec;
+    ::boost::ptr_vector<ScMyTableData>  maTables;
     ScXMLTabProtectionData              maProtectionData;
     ScMyMatrixRangeList                 aMatrixRangeList;
     com::sun::star::table::CellAddress  aRealCellPos;
     sal_Int32                           nCurrentColStylePos;
     sal_Int16                           nCurrentDrawPage;
     sal_Int16                           nCurrentXShapes;
-    sal_Int32                           nTableCount;
     sal_Int32                           nCurrentSheet;
 
     sal_Bool                            IsMerged (const com::sun::star::uno::Reference <com::sun::star::table::XCellRange>& xCellRange,
@@ -171,12 +172,12 @@ public:
     ScXMLTabProtectionData&             GetCurrentProtectionData() { return maProtectionData; }
     rtl::OUString                       GetCurrentSheetName() const { return sCurrentSheetName; }
     sal_Int32                           GetCurrentSheet() const { return nCurrentSheet; }
-    sal_Int32                           GetCurrentColumn() const { return aTableVec[nTableCount - 1]->GetColCount(); }
-    sal_Int32                           GetCurrentRow() const { return aTableVec[nTableCount - 1]->GetRow(); }
+    sal_Int32                           GetCurrentColumn() const { return maTables.back().GetColCount(); }
+    sal_Int32                           GetCurrentRow() const { return maTables.back().GetRow(); }
     ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet >
-                                        GetCurrentXSheet()  { return xCurrentSheet; }
+                                        GetCurrentXSheet() const { return xCurrentSheet; }
     ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange >
-                                        GetCurrentXCellRange()  { return xCurrentCellRange; }
+                                        GetCurrentXCellRange() const { return xCurrentCellRange; }
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >
                                         GetCurrentXDrawPage();
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >
diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx
index 01e613b1ea74..a80093e5a0e0 100644
--- a/sc/source/filter/xml/xmltabi.cxx
+++ b/sc/source/filter/xml/xmltabi.cxx
@@ -65,6 +65,8 @@
 using namespace com::sun::star;
 using namespace xmloff::token;
 using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::uno::UNO_QUERY;
 using ::com::sun::star::xml::sax::XAttributeList;
 using ::rtl::OUString;
 
@@ -356,80 +358,81 @@ SvXMLImportContext *ScXMLTableContext::CreateChildContext( USHORT nPrefix,
 
 void ScXMLTableContext::EndElement()
 {
-    // get end offset in file (if available)
-//    sal_Int32 nEndOffset = GetScImport().GetByteOffset();
-
-    GetScImport().LockSolarMutex();
+    ScXMLImport::MutexGuard aMutexGuard(GetScImport());
     GetScImport().GetStylesImportHelper()->EndTable();
     ScDocument* pDoc(GetScImport().GetDocument());
-    if (pDoc)
+    if (!pDoc)
+        return;
+
+    SCTAB nCurTab = static_cast<SCTAB>(GetScImport().GetTables().GetCurrentSheet());
+    if (sPrintRanges.getLength())
     {
-        if (sPrintRanges.getLength())
+        Reference< sheet::XPrintAreas > xPrintAreas(
+            GetScImport().GetTables().GetCurrentXSheet(), UNO_QUERY);
+
+        if( xPrintAreas.is() )
         {
-            uno::Reference< sheet::XPrintAreas > xPrintAreas( GetScImport().GetTables().GetCurrentXSheet(), uno::UNO_QUERY );
-            if( xPrintAreas.is() )
-            {
-                uno::Sequence< table::CellRangeAddress > aRangeList;
-                ScRangeStringConverter::GetRangeListFromString( aRangeList, sPrintRanges, pDoc, ::formula::FormulaGrammar::CONV_OOO );
-                xPrintAreas->setPrintAreas( aRangeList );
-            }
+            Sequence< table::CellRangeAddress > aRangeList;
+            ScRangeStringConverter::GetRangeListFromString( aRangeList, sPrintRanges, pDoc, ::formula::FormulaGrammar::CONV_OOO );
+            xPrintAreas->setPrintAreas( aRangeList );
         }
-        else if (bPrintEntireSheet) pDoc->SetPrintEntireSheet(static_cast<SCTAB>(GetScImport().GetTables().GetCurrentSheet()));
+    }
+    else if (!bPrintEntireSheet)
+        // Sheet has "print entire sheet" option by default.  Remove it.
+        pDoc->ClearPrintRanges(nCurTab);
 
-        ScOutlineTable* pOutlineTable(pDoc->GetOutlineTable(static_cast<SCTAB>(GetScImport().GetTables().GetCurrentSheet()), sal_False));
-        if (pOutlineTable)
+    ScOutlineTable* pOutlineTable(pDoc->GetOutlineTable(nCurTab, sal_False));
+    if (pOutlineTable)
+    {
+        ScOutlineArray* pColArray(pOutlineTable->GetColArray());
+        sal_Int32 nDepth(pColArray->GetDepth());
+        sal_Int32 i;
+        for (i = 0; i < nDepth; ++i)
         {
-            ScOutlineArray* pColArray(pOutlineTable->GetColArray());
-            sal_Int32 nDepth(pColArray->GetDepth());
-            sal_Int32 i;
-            for (i = 0; i < nDepth; ++i)
-            {
-                sal_Int32 nCount(pColArray->GetCount(static_cast<USHORT>(i)));
-                for (sal_Int32 j = 0; j < nCount; ++j)
-                {
-                    ScOutlineEntry* pEntry(pColArray->GetEntry(static_cast<USHORT>(i), static_cast<USHORT>(j)));
-                    if (pEntry->IsHidden())
-                        pColArray->SetVisibleBelow(static_cast<USHORT>(i), static_cast<USHORT>(j), sal_False);
-                }
-            }
-            ScOutlineArray* pRowArray(pOutlineTable->GetRowArray());
-            nDepth = pRowArray->GetDepth();
-            for (i = 0; i < nDepth; ++i)
+            sal_Int32 nCount(pColArray->GetCount(static_cast<USHORT>(i)));
+            for (sal_Int32 j = 0; j < nCount; ++j)
             {
-                sal_Int32 nCount(pRowArray->GetCount(static_cast<USHORT>(i)));
-                for (sal_Int32 j = 0; j < nCount; ++j)
-                {
-                    ScOutlineEntry* pEntry(pRowArray->GetEntry(static_cast<USHORT>(i), static_cast<USHORT>(j)));
-                    if (pEntry->IsHidden())
-                        pRowArray->SetVisibleBelow(static_cast<USHORT>(i), static_cast<USHORT>(j), sal_False);
-                }
+                ScOutlineEntry* pEntry(pColArray->GetEntry(static_cast<USHORT>(i), static_cast<USHORT>(j)));
+                if (pEntry->IsHidden())
+                    pColArray->SetVisibleBelow(static_cast<USHORT>(i), static_cast<USHORT>(j), sal_False);
             }
         }
-        if (GetScImport().GetTables().HasDrawPage())
+        ScOutlineArray* pRowArray(pOutlineTable->GetRowArray());
+        nDepth = pRowArray->GetDepth();
+        for (i = 0; i < nDepth; ++i)
         {
-            if (GetScImport().GetTables().HasXShapes())
+            sal_Int32 nCount(pRowArray->GetCount(static_cast<USHORT>(i)));
+            for (sal_Int32 j = 0; j < nCount; ++j)
             {
-                GetScImport().GetShapeImport()->popGroupAndSort();
-                uno::Reference < drawing::XShapes > xTempShapes(GetScImport().GetTables().GetCurrentXShapes());
-                GetScImport().GetShapeImport()->endPage(xTempShapes);
+                ScOutlineEntry* pEntry(pRowArray->GetEntry(static_cast<USHORT>(i), static_cast<USHORT>(j)));
+                if (pEntry->IsHidden())
+                    pRowArray->SetVisibleBelow(static_cast<USHORT>(i), static_cast<USHORT>(j), sal_False);
             }
-            if (bStartFormPage)
-                GetScImport().GetFormImport()->endPage();
         }
-
-        GetScImport().GetTables().DeleteTable();
-        GetScImport().ProgressBarIncrement(sal_False);
-
-        // store stream positions
-        if (!pExternalRefInfo.get() && nStartOffset >= 0 /* && nEndOffset >= 0 */)
+    }
+    if (GetScImport().GetTables().HasDrawPage())
+    {
+        if (GetScImport().GetTables().HasXShapes())
         {
-            ScSheetSaveData* pSheetData = ScModelObj::getImplementation(GetScImport().GetModel())->GetSheetSaveData();
-            sal_Int32 nTab = GetScImport().GetTables().GetCurrentSheet();
-            // pSheetData->AddStreamPos( nTab, nStartOffset, nEndOffset );
-            pSheetData->StartStreamPos( nTab, nStartOffset );
+            GetScImport().GetShapeImport()->popGroupAndSort();
+            uno::Reference < drawing::XShapes > xTempShapes(GetScImport().GetTables().GetCurrentXShapes());
+            GetScImport().GetShapeImport()->endPage(xTempShapes);
         }
+        if (bStartFormPage)
+            GetScImport().GetFormImport()->endPage();
+    }
+
+    GetScImport().GetTables().DeleteTable();
+    GetScImport().ProgressBarIncrement(sal_False);
+
+    // store stream positions
+    if (!pExternalRefInfo.get() && nStartOffset >= 0 /* && nEndOffset >= 0 */)
+    {
+        ScSheetSaveData* pSheetData = ScModelObj::getImplementation(GetScImport().GetModel())->GetSheetSaveData();
+        sal_Int32 nTab = GetScImport().GetTables().GetCurrentSheet();
+        // pSheetData->AddStreamPos( nTab, nStartOffset, nEndOffset );
+        pSheetData->StartStreamPos( nTab, nStartOffset );
     }
-    GetScImport().UnlockSolarMutex();
 }
 
 // ============================================================================
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index e61cdb4927ef..6dc190374708 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -180,7 +180,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe
 
         // get a pipe for connecting the data source to the parser
         xPipe = xServiceFactory->createInstance(
-                OUString::createFromAscii("com.sun.star.io.Pipe") );
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe")) );
         DBG_ASSERT( xPipe.is(),
                 "XMLReader::Read: com.sun.star.io.Pipe service missing" );
         if( !xPipe.is() )
@@ -450,7 +450,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError)
                     aName = pDocHierarchItem->GetValue();
             }
             else
-                aName = ::rtl::OUString::createFromAscii( "dummyObjectName" );
+                aName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "dummyObjectName" ));
 
             if( aName.getLength() )
             {
@@ -842,7 +842,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly)
         // TODO/LATER: do not do it for embedded links
         if( SFX_CREATE_MODE_EMBEDDED == pObjSh->GetCreateMode() )
         {
-            OUString aName = ::rtl::OUString::createFromAscii( "dummyObjectName" );
+            OUString aName(RTL_CONSTASCII_USTRINGPARAM("dummyObjectName"));
             if ( pMedium && pMedium->GetItemSet() )
             {
                 const SfxStringItem* pDocHierarchItem = static_cast<const SfxStringItem*>(
@@ -994,5 +994,4 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly)
 }
 
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
index b4948460be42..ce7e7d4de919 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
@@ -173,7 +173,7 @@ Reference<XAccessibleStateSet> ScAccessibleFilterMenu::getAccessibleStateSet()
 OUString ScAccessibleFilterMenu::getImplementationName()
     throw (RuntimeException)
 {
-    return OUString::createFromAscii("ScAccessibleFilterMenu");
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("ScAccessibleFilterMenu"));
 }
 
 // XAccessibleEventBroadcaster
diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
index 1c70ee6ba5c5..bff9ad5bd88e 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
@@ -90,7 +90,7 @@ Reference<XAccessibleStateSet> ScAccessibleFilterMenuItem::getAccessibleStateSet
 OUString ScAccessibleFilterMenuItem::getImplementationName()
     throw (RuntimeException)
 {
-    return OUString::createFromAscii("ScAccessibleFilterMenuItem");
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("ScAccessibleFilterMenuItem"));
 }
 
 // XAccessibleAction
@@ -110,7 +110,7 @@ sal_Bool ScAccessibleFilterMenuItem::doAccessibleAction(sal_Int32 /*nIndex*/)
 OUString ScAccessibleFilterMenuItem::getAccessibleActionDescription(sal_Int32 /*nIndex*/)
     throw (IndexOutOfBoundsException, RuntimeException)
 {
-    return OUString::createFromAscii("click");
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("click"));
 }
 
 Reference<XAccessibleKeyBinding> ScAccessibleFilterMenuItem::getAccessibleActionKeyBinding(
diff --git a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx
index fb649eba5f4f..4e28e8bbb7cf 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx
@@ -97,7 +97,7 @@ Reference<XAccessible> ScAccessibleFilterTopWindow::getAccessibleChild(
 
 OUString ScAccessibleFilterTopWindow::getImplementationName() throw (RuntimeException)
 {
-    return OUString::createFromAscii("ScAccessibleFilterTopWindow");
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("ScAccessibleFilterTopWindow"));
 }
 
 void ScAccessibleFilterTopWindow::setAccessibleChild(
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index a4c470093398..aea8db6d8f5e 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -1109,9 +1109,8 @@ SvxViewForwarder* ScAccessibleEditObjectTextData::GetViewForwarder()
 {
     if (!mpViewForwarder)
     {
-        // --> OD 2005-12-21 #i49561#
+        // i#49561 Get right-aligned cell content to be read by screenreader.
         mpViewForwarder = new ScEditObjectViewForwarder( mpWindow, mpEditView );
-        // <--
     }
     return mpViewForwarder;
 }
diff --git a/sc/source/ui/Accessibility/makefile.mk b/sc/source/ui/Accessibility/makefile.mk
index f041ca095bdd..49f3fb1fb39c 100644
--- a/sc/source/ui/Accessibility/makefile.mk
+++ b/sc/source/ui/Accessibility/makefile.mk
@@ -37,53 +37,33 @@ TARGET=accessibility
 
 # --- Files --------------------------------------------------------
 
-SLOFILES =  										\
+SLOFILES =  							\
+        $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES=						\
+        $(SLO)$/AccessibleCell.obj				\
+        $(SLO)$/AccessibleCellBase.obj				\
         $(SLO)$/AccessibleContextBase.obj			\
-        $(SLO)$/AccessibleTableBase.obj				\
+        $(SLO)$/AccessibleCsvControl.obj			\
+        $(SLO)$/AccessibleDataPilotControl.obj			\
         $(SLO)$/AccessibleDocument.obj				\
-        $(SLO)$/AccessibleGlobal.obj				\
-        $(SLO)$/AccessibleSpreadsheet.obj			\
-        $(SLO)$/AccessibleCell.obj					\
-        $(SLO)$/AccessibilityHints.obj				\
         $(SLO)$/AccessibleDocumentBase.obj			\
-        $(SLO)$/AccessibleCellBase.obj				\
-        $(SLO)$/AccessibleDocumentPagePreview.obj	\
-        $(SLO)$/AccessibleFilterMenu.obj	\
-        $(SLO)$/AccessibleFilterMenuItem.obj	\
-        $(SLO)$/AccessibleFilterTopWindow.obj	\
-        $(SLO)$/AccessiblePreviewTable.obj			\
-        $(SLO)$/AccessiblePreviewCell.obj			\
-        $(SLO)$/AccessiblePreviewHeaderCell.obj		\
-        $(SLO)$/AccessiblePageHeader.obj			\
-        $(SLO)$/AccessibleText.obj					\
-        $(SLO)$/AccessiblePageHeaderArea.obj		\
-        $(SLO)$/DrawModelBroadcaster.obj			\
+        $(SLO)$/AccessibleDocumentPagePreview.obj		\
         $(SLO)$/AccessibleEditObject.obj			\
-        $(SLO)$/AccessibleDataPilotControl.obj		\
-        $(SLO)$/AccessibleCsvControl.obj
-
-EXCEPTIONSFILES=									\
-        $(SLO)$/AccessibleContextBase.obj			\
-        $(SLO)$/AccessibleTableBase.obj				\
-        $(SLO)$/AccessibleDocument.obj				\
+        $(SLO)$/AccessibleFilterMenu.obj			\
+        $(SLO)$/AccessibleFilterMenuItem.obj			\
+        $(SLO)$/AccessibleFilterTopWindow.obj			\
         $(SLO)$/AccessibleGlobal.obj				\
-        $(SLO)$/AccessibleSpreadsheet.obj			\
-        $(SLO)$/AccessibleCell.obj					\
-        $(SLO)$/AccessibleDocumentBase.obj			\
-        $(SLO)$/AccessibleCellBase.obj				\
-        $(SLO)$/AccessibleDocumentPagePreview.obj	\
-        $(SLO)$/AccessibleFilterMenu.obj	\
-        $(SLO)$/AccessibleFilterMenuItem.obj	\
-        $(SLO)$/AccessibleFilterTopWindow.obj	\
-        $(SLO)$/AccessiblePreviewTable.obj			\
-        $(SLO)$/AccessiblePreviewCell.obj			\
-        $(SLO)$/AccessiblePreviewHeaderCell.obj		\
+        $(SLO)$/AccessibilityHints.obj				\
         $(SLO)$/AccessiblePageHeader.obj			\
-        $(SLO)$/AccessiblePageHeaderArea.obj		\
+        $(SLO)$/AccessiblePageHeaderArea.obj			\
+        $(SLO)$/AccessiblePreviewCell.obj			\
+        $(SLO)$/AccessiblePreviewHeaderCell.obj			\
+        $(SLO)$/AccessiblePreviewTable.obj			\
+        $(SLO)$/AccessibleSpreadsheet.obj			\
+        $(SLO)$/AccessibleTableBase.obj				\
+        $(SLO)$/AccessibleText.obj				\
         $(SLO)$/DrawModelBroadcaster.obj			\
-        $(SLO)$/AccessibleEditObject.obj			\
-        $(SLO)$/AccessibleDataPilotControl.obj		\
-        $(SLO)$/AccessibleCsvControl.obj
 
 # --- Tagets -------------------------------------------------------
 
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index cba682688f1f..0c83daa50669 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -160,9 +160,9 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain
                     uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY );
                     uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo();
 
-                    rtl::OUString sPropButtonType = rtl::OUString::createFromAscii( "ButtonType" );
-                    rtl::OUString sPropTargetURL  = rtl::OUString::createFromAscii( "TargetURL" );
-                    rtl::OUString sPropLabel      = rtl::OUString::createFromAscii( "Label" );
+                    rtl::OUString sPropButtonType(RTL_CONSTASCII_USTRINGPARAM( "ButtonType" ));
+                    rtl::OUString sPropTargetURL(RTL_CONSTASCII_USTRINGPARAM( "TargetURL" ));
+                    rtl::OUString sPropLabel(RTL_CONSTASCII_USTRINGPARAM( "Label" ));
 
                     if(xInfo->hasPropertyByName( sPropButtonType ))
                     {
@@ -540,7 +540,7 @@ sal_Bool ScDrawTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUse
                     try
                     {
                         uno::Sequence < beans::PropertyValue > aSeq;
-                        ::rtl::OUString aDummyName = ::rtl::OUString::createFromAscii("Dummy");
+                        ::rtl::OUString aDummyName(RTL_CONSTASCII_USTRINGPARAM("Dummy"));
                         xPers->storeToEntry( xWorkStore, aDummyName, aSeq, aSeq );
                         if ( xWorkStore->isStreamElement( aDummyName ) )
                         {
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index e2c865e7d5b9..5b0b8cbcbca3 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -127,7 +127,7 @@ SfxChildWinInfo __EXPORT ScInputWindowWrapper::GetInfo() const
 
 //==================================================================
 
-#define IMAGE(id) pImgMgr->SeekImage(id, bHC)
+#define IMAGE(id) pImgMgr->SeekImage(id)
 
 //==================================================================
 //  class ScInputWindow
@@ -166,8 +166,6 @@ ScInputWindow::ScInputWindow( Window* pParent, SfxBindings* pBind ) :
     }
     DBG_ASSERT( pViewSh, "no view shell for input window" );
 
-    BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
-
     // Positionsfenster, 3 Buttons, Eingabefenster
     InsertWindow    ( 1, &aWndPos, 0,                                     0 );
     InsertSeparator (                                                     1 );
@@ -560,8 +558,6 @@ void ScInputWindow::SetOkCancelMode()
     SfxImageManager* pImgMgr = SfxImageManager::GetImageManager( pScMod );
     if (!bIsOkCancelMode)
     {
-        BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
-
         RemoveItem( 3 ); // SID_INPUT_SUM und SID_INPUT_EQUAL entfernen
         RemoveItem( 3 );
         InsertItem( SID_INPUT_CANCEL, IMAGE( SID_INPUT_CANCEL ), 0, 3 );
@@ -584,8 +580,6 @@ void ScInputWindow::SetSumAssignMode()
     SfxImageManager* pImgMgr = SfxImageManager::GetImageManager( pScMod );
     if (bIsOkCancelMode)
     {
-        BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
-
         // SID_INPUT_CANCEL, und SID_INPUT_OK entfernen
         RemoveItem( 3 );
         RemoveItem( 3 );
@@ -694,11 +688,9 @@ void ScInputWindow::DataChanged( const DataChangedEvent& rDCEvt )
     if ( rDCEvt.GetType() == DATACHANGED_SETTINGS && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
     {
         //  update item images
-
         ScModule*        pScMod  = SC_MOD();
         SfxImageManager* pImgMgr = SfxImageManager::GetImageManager( pScMod );
-        BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
-        // IMAGE macro uses pScMod, pImgMgr, bHC
+        // IMAGE macro uses pScMod, pImgMg
 
         SetItemImage( SID_INPUT_FUNCTION, IMAGE( SID_INPUT_FUNCTION ) );
         if ( bIsOkCancelMode )
@@ -1502,7 +1494,7 @@ void ScPosWnd::FillFunctions()
     SetText(aFirstName);
 }
 
-void __EXPORT ScPosWnd::Notify( SfxBroadcaster&, const SfxHint& rHint )
+void ScPosWnd::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
     if ( !bFormulaMode )
     {
@@ -1707,7 +1699,7 @@ void ScPosWnd::DoEnter()
                         if ( aNewRanges.Insert(pNew) )
                         {
                             ScDocFunc aFunc(*pDocShell);
-                            aFunc.ModifyRangeNames( aNewRanges, FALSE );
+                            aFunc.ModifyRangeNames( aNewRanges );
                             pViewSh->UpdateInputHandler(TRUE);
                         }
                         else
diff --git a/sc/source/ui/app/makefile.mk b/sc/source/ui/app/makefile.mk
index 9d487ba207fc..95b36b1e7323 100644
--- a/sc/source/ui/app/makefile.mk
+++ b/sc/source/ui/app/makefile.mk
@@ -38,29 +38,23 @@ TARGET=app
 # --- Files --------------------------------------------------------
 
 SLOFILES =  \
-    $(SLO)$/scmod.obj  \
-    $(SLO)$/scmod2.obj  \
-    $(SLO)$/scdll.obj  \
-    $(SLO)$/typemap.obj  \
-    $(SLO)$/transobj.obj \
-    $(SLO)$/drwtrans.obj \
-    $(SLO)$/lnktrans.obj \
-    $(SLO)$/seltrans.obj \
-    $(SLO)$/inputhdl.obj \
-    $(SLO)$/inputwin.obj \
-    $(SLO)$/rfindlst.obj \
-    $(SLO)$/uiitems.obj  \
+    $(EXCEPTIONSFILES) \
     $(SLO)$/msgpool.obj \
-    $(SLO)$/client.obj
+    $(SLO)$/rfindlst.obj \
+    $(SLO)$/uiitems.obj
 
 EXCEPTIONSFILES= \
+    $(SLO)$/client.obj \
     $(SLO)$/drwtrans.obj \
-    $(SLO)$/scdll.obj  \
-    $(SLO)$/scmod2.obj \
+    $(SLO)$/inputhdl.obj \
+    $(SLO)$/inputwin.obj \
+    $(SLO)$/lnktrans.obj \
+    $(SLO)$/scdll.obj \
     $(SLO)$/scmod.obj \
-    $(SLO)$/typemap.obj  \
-    $(SLO)$/client.obj \
-    $(SLO)$/inputwin.obj
+    $(SLO)$/scmod2.obj \
+    $(SLO)$/seltrans.obj \
+    $(SLO)$/typemap.obj \
+    $(SLO)$/transobj.obj
 
 #LIB3TARGET=$(SLB)$/ysclib.lib
 #LIB3OBJFILES=$(SLO)$/sclib.obj
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 8cd7a4e74686..d7a47f74d8eb 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -152,9 +152,7 @@ void ScDLL::Init()
     ScModule* pMod = new ScModule( &ScDocShell::Factory() );
     (*ppShlPtr) = pMod;
 
-//REMOVE        ScDocShell::RegisterFactory( SDT_SC_DOCFACTPRIO );
-
-    ScDocShell::Factory().SetDocumentServiceName( rtl::OUString::createFromAscii( "com.sun.star.sheet.SpreadsheetDocument" ) );
+    ScDocShell::Factory().SetDocumentServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" )) );
 
     ScGlobal::Init();       // erst wenn der ResManager initialisiert ist
                             //  erst nach ScGlobal::Init duerfen die App-Optionen
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 66b9fade4d8f..08776bc2b3b6 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -628,7 +628,7 @@ void ScModule::Execute( SfxRequest& rReq )
         {
             try
             {
-                com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString::createFromAscii("com.sun.star.comp.ui.XSLTFilterDialog")), com::sun::star::uno::UNO_QUERY);
+                com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ui.XSLTFilterDialog"))), com::sun::star::uno::UNO_QUERY);
                 if( xDialog.is() )
                 {
                     xDialog->execute();
diff --git a/sc/source/ui/app/scmod2.cxx b/sc/source/ui/app/scmod2.cxx
index 246d204038ae..d21255806fc4 100644
--- a/sc/source/ui/app/scmod2.cxx
+++ b/sc/source/ui/app/scmod2.cxx
@@ -76,7 +76,7 @@ void ScModule::SetAutoSpellProperty( BOOL bSet )
 
     uno::Any aAny;
     aAny <<= bSet;
-    aConfig.SetProperty( rtl::OUString::createFromAscii( LINGUPROP_AUTOSPELL ), aAny );
+    aConfig.SetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( LINGUPROP_AUTOSPELL )), aAny );
 }
 
 
diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx
index 1866008f6782..eb6b662c5c75 100644
--- a/sc/source/ui/app/seltrans.cxx
+++ b/sc/source/ui/app/seltrans.cxx
@@ -70,7 +70,7 @@ BOOL lcl_IsURLButton( SdrObject* pObject )
             uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY );
             uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo();
 
-            rtl::OUString sPropButtonType = rtl::OUString::createFromAscii( "ButtonType" );
+            rtl::OUString sPropButtonType(RTL_CONSTASCII_USTRINGPARAM( "ButtonType" ));
             if(xInfo->hasPropertyByName( sPropButtonType ))
             {
                 uno::Any aAny = xPropSet->getPropertyValue( sPropButtonType );
diff --git a/sc/source/ui/attrdlg/makefile.mk b/sc/source/ui/attrdlg/makefile.mk
index 9b4dc49dec57..a979840b6063 100644
--- a/sc/source/ui/attrdlg/makefile.mk
+++ b/sc/source/ui/attrdlg/makefile.mk
@@ -42,12 +42,16 @@ CXXFILES =  attrdlg.cxx		\
             tabpages.cxx	\
             condfrmt.cxx
 
-SLOFILES =  $(SLO)$/attrdlg.obj	\
-            $(SLO)$/tabpages.obj	\
+SLOFILES = \
+            $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
+            $(SLO)$/attrdlg.obj		\
             $(SLO)$/condfrmt.obj	\
             $(SLO)$/scabstdlg.obj	\
-        $(SLO)$/scuiexp.obj		\
-        $(SLO)$/scdlgfact.obj
+            $(SLO)$/scdlgfact.obj	\
+            $(SLO)$/scuiexp.obj		\
+            $(SLO)$/tabpages.obj
 
 LIB1TARGET = $(SLB)$/$(TARGET).lib
 
diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx
index 78c1871c1e1e..74333ef21a44 100644
--- a/sc/source/ui/cctrl/dpcontrol.cxx
+++ b/sc/source/ui/cctrl/dpcontrol.cxx
@@ -1040,14 +1040,14 @@ ScDPFieldPopupWindow::ScDPFieldPopupWindow(Window* pParent, ScDocument* pDoc) :
     getSectionPosSize(aPos, aSize, BTN_SINGLE_SELECT);
     maBtnSelectSingle.SetPosSizePixel(aPos, aSize);
     maBtnSelectSingle.SetQuickHelpText(ScRscStrLoader(RID_POPUP_FILTER, STR_BTN_SELECT_CURRENT).GetString());
-    maBtnSelectSingle.SetModeImage(Image(ScResId(RID_IMG_SELECT_CURRENT)), BMP_COLOR_NORMAL);
+    maBtnSelectSingle.SetModeImage(Image(ScResId(RID_IMG_SELECT_CURRENT)));
     maBtnSelectSingle.SetClickHdl( LINK(this, ScDPFieldPopupWindow, ButtonHdl) );
     maBtnSelectSingle.Show();
 
     getSectionPosSize(aPos, aSize, BTN_SINGLE_UNSELECT);
     maBtnUnselectSingle.SetPosSizePixel(aPos, aSize);
     maBtnUnselectSingle.SetQuickHelpText(ScRscStrLoader(RID_POPUP_FILTER, STR_BTN_UNSELECT_CURRENT).GetString());
-    maBtnUnselectSingle.SetModeImage(Image(ScResId(RID_IMG_UNSELECT_CURRENT)), BMP_COLOR_NORMAL);
+    maBtnUnselectSingle.SetModeImage(Image(ScResId(RID_IMG_UNSELECT_CURRENT)));
     maBtnUnselectSingle.SetClickHdl( LINK(this, ScDPFieldPopupWindow, ButtonHdl) );
     maBtnUnselectSingle.Show();
 }
diff --git a/sc/source/ui/cctrl/makefile.mk b/sc/source/ui/cctrl/makefile.mk
index 70b5490a9626..41598f7901c1 100644
--- a/sc/source/ui/cctrl/makefile.mk
+++ b/sc/source/ui/cctrl/makefile.mk
@@ -39,16 +39,15 @@ LIBTARGET=NO
 # --- Files --------------------------------------------------------
 
 EXCEPTIONSFILES= \
-    $(SLO)$/tbinsert.obj	\
-    $(SLO)$/tbzoomsliderctrl.obj \
-    $(SLO)$/dpcontrol.obj
+        $(SLO)$/cbuttonw.obj		\
+        $(SLO)$/dpcontrol.obj		\
+        $(SLO)$/editfield.obj		\
+        $(SLO)$/tbinsert.obj		\
+        $(SLO)$/tbzoomsliderctrl.obj
 
 SLOFILES =	\
+        $(SLO)$/dpcontrol.obj		\
         $(SLO)$/popmenu.obj		\
-        $(SLO)$/tbinsert.obj	\
-        $(SLO)$/cbuttonw.obj	\
-        $(SLO)$/dpcontrol.obj	\
-        $(SLO)$/editfield.obj	\
         $(EXCEPTIONSFILES)
 
 SRS1NAME=$(TARGET)
diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx
index 6c439fd94693..a66d58b32553 100644
--- a/sc/source/ui/cctrl/tbinsert.cxx
+++ b/sc/source/ui/cctrl/tbinsert.cxx
@@ -91,8 +91,8 @@ void __EXPORT ScTbxInsertCtrl::StateChanged( USHORT /* nSID */, SfxItemState eSt
             aSlotURL += rtl::OUString::valueOf( sal_Int32( nImageId ));
             Image aImage = GetImage( m_xFrame,
                                      aSlotURL,
-                                     hasBigImages(),
-                                     GetToolBox().GetSettings().GetStyleSettings().GetHighContrastMode() );
+                                     hasBigImages()
+                                     );
             GetToolBox().SetItemImage(GetId(), aImage);
         }
     }
@@ -100,38 +100,22 @@ void __EXPORT ScTbxInsertCtrl::StateChanged( USHORT /* nSID */, SfxItemState eSt
 
 SfxPopupWindow* __EXPORT ScTbxInsertCtrl::CreatePopupWindow()
 {
-//    USHORT nWinResId, nTbxResId;
     USHORT nSlotId = GetSlotId();
     if (nSlotId == SID_TBXCTL_INSERT)
     {
         rtl::OUString aInsertBarResStr( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertbar" ));
         createAndPositionSubToolBar( aInsertBarResStr );
-//      nWinResId = RID_TBXCTL_INSERT;
-//      nTbxResId = RID_TOOLBOX_INSERT;
     }
     else if (nSlotId == SID_TBXCTL_INSCELLS)
     {
         rtl::OUString aInsertCellsBarResStr( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertcellsbar" ));
         createAndPositionSubToolBar( aInsertCellsBarResStr );
-//      nWinResId = RID_TBXCTL_INSCELLS;
-//      nTbxResId = RID_TOOLBOX_INSCELLS;
     }
-    else /* SID_TBXCTL_INSOBJ */
+    else
     {
         rtl::OUString aInsertObjectBarResStr( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertobjectbar" ));
         createAndPositionSubToolBar( aInsertObjectBarResStr );
-//      nWinResId = RID_TBXCTL_INSOBJ;
-//      nTbxResId = RID_TOOLBOX_INSOBJ;
     }
-/*
-    WindowAlign eNewAlign = ( GetToolBox().IsHorizontal() ) ? WINDOWALIGN_LEFT : WINDOWALIGN_TOP;
-    ScTbxInsertPopup *pWin = new ScTbxInsertPopup( nSlotId, eNewAlign,
-                                    ScResId(nWinResId), ScResId(nTbxResId), GetBindings() );
-    pWin->StartPopupMode(&GetToolBox(), TRUE);
-    pWin->StartSelection();
-    pWin->Show();
-    return pWin;
-*/
     return NULL;
 }
 
@@ -155,80 +139,6 @@ void __EXPORT ScTbxInsertCtrl::Select( BOOL /* bMod1 */ )
     if ( pDispatch )
         pDispatch->Execute(nLastSlotId);
 }
-/*
-//------------------------------------------------------------------
-//
-//  Popup - Window
-//
-//------------------------------------------------------------------
-
-ScTbxInsertPopup::ScTbxInsertPopup( USHORT nId, WindowAlign eNewAlign,
-                        const ResId& rRIdWin, const ResId& rRIdTbx,
-                        SfxBindings& rBindings ) :
-                SfxPopupWindow  ( nId, rRIdWin, rBindings),
-                aTbx            ( this, GetBindings(), rRIdTbx ),
-                aRIdWinTemp(rRIdWin),
-                aRIdTbxTemp(rRIdTbx)
-{
-    aTbx.UseDefault();
-    FreeResource();
-
-    aTbx.GetToolBox().SetAlign( eNewAlign );
-    if (eNewAlign == WINDOWALIGN_LEFT || eNewAlign == WINDOWALIGN_RIGHT)
-        SetText( EMPTY_STRING );
-
-    Size aSize = aTbx.CalcWindowSizePixel();
-    aTbx.SetPosSizePixel( Point(), aSize );
-    SetOutputSizePixel( aSize );
-    aTbx.GetToolBox().SetSelectHdl( LINK(this, ScTbxInsertPopup, TbxSelectHdl));
-    aTbxClickHdl = aTbx.GetToolBox().GetClickHdl();
-    aTbx.GetToolBox().SetClickHdl(  LINK(this, ScTbxInsertPopup, TbxClickHdl));
-}
-
-ScTbxInsertPopup::~ScTbxInsertPopup()
-{
-}
-
-SfxPopupWindow* __EXPORT ScTbxInsertPopup::Clone() const
-{
-    return new ScTbxInsertPopup( GetId(), aTbx.GetToolBox().GetAlign(),
-                                    aRIdWinTemp, aRIdTbxTemp,
-                                    (SfxBindings&) GetBindings() );
-}
-
-void ScTbxInsertPopup::StartSelection()
-{
-    aTbx.GetToolBox().StartSelection();
-}
-
-IMPL_LINK(ScTbxInsertPopup, TbxSelectHdl, ToolBox*, pBox)
-{
-    EndPopupMode();
-
-    USHORT nLastSlotId = pBox->GetCurItemId();
-    SfxUInt16Item aItem( GetId(), nLastSlotId );
-    SfxDispatcher* pDisp = GetBindings().GetDispatcher();
-    pDisp->Execute( GetId(), SFX_CALLMODE_SYNCHRON, &aItem, 0L );
-    pDisp->Execute( nLastSlotId, SFX_CALLMODE_ASYNCHRON );
-    return 0;
-}
-
-IMPL_LINK(ScTbxInsertPopup, TbxClickHdl, ToolBox*, pBox)
-{
-    USHORT nLastSlotId = pBox->GetCurItemId();
-    SfxUInt16Item aItem( GetId(), nLastSlotId );
-    GetBindings().GetDispatcher()->Execute( GetId(), SFX_CALLMODE_SYNCHRON, &aItem, 0L );
-    if(aTbxClickHdl.IsSet())
-        aTbxClickHdl.Call(pBox);
-    return 0;
-}
-
-void __EXPORT ScTbxInsertPopup::PopupModeEnd()
-{
-    aTbx.GetToolBox().EndSelection();
-    SfxPopupWindow::PopupModeEnd();
-}
-*/
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
index 9fe3acc0af73..b5320398c959 100644
--- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
+++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
@@ -256,10 +256,9 @@ ScZoomSliderWnd::ScZoomSliderWnd( Window* pParent, const ::com::sun::star::uno::
                 m_xDispatchProvider( rDispatchProvider ),
                 m_xFrame( _xFrame )
 {
-    BOOL bIsHC                  = GetSettings().GetStyleSettings().GetHighContrastMode();
-    mpImpl->maSliderButton      = Image( SVX_RES( bIsHC ? RID_SVXBMP_SLIDERBUTTON_HC : RID_SVXBMP_SLIDERBUTTON ) );
-    mpImpl->maIncreaseButton    = Image( SVX_RES( bIsHC ? RID_SVXBMP_SLIDERINCREASE_HC : RID_SVXBMP_SLIDERINCREASE ) );
-    mpImpl->maDecreaseButton    = Image( SVX_RES( bIsHC ? RID_SVXBMP_SLIDERDECREASE_HC : RID_SVXBMP_SLIDERDECREASE ) );
+    mpImpl->maSliderButton      = Image( SVX_RES( RID_SVXBMP_SLIDERBUTTON   ) );
+    mpImpl->maIncreaseButton    = Image( SVX_RES( RID_SVXBMP_SLIDERINCREASE ) );
+    mpImpl->maDecreaseButton    = Image( SVX_RES( RID_SVXBMP_SLIDERDECREASE ) );
     Size  aSliderSize           = LogicToPixel( Size( aLogicalSize), MapMode( MAP_10TH_MM ) );
     SetSizePixel( Size( aSliderSize.Width() * nSliderWidth-1, aSliderSize.Height() + nSliderHeight ) );
 }
diff --git a/sc/source/ui/dbgui/asciiopt.hrc b/sc/source/ui/dbgui/asciiopt.hrc
index 7bf6d42d6e2f..6e1c9ae92877 100644
--- a/sc/source/ui/dbgui/asciiopt.hrc
+++ b/sc/source/ui/dbgui/asciiopt.hrc
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 #include "sc.hrc"
-//#define RID_SCDLG_ASCII 256
+
 #define BTN_OK                      1
 #define BTN_CANCEL                  2
 #define BTN_HELP                    3
@@ -60,12 +60,3 @@
 #define LB_TYPE1                    28
 #define CTR_TABLEBOX                29
 #define STR_TEXTTOCOLUMNS           30
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/dbgui/asciiopt.src b/sc/source/ui/dbgui/asciiopt.src
index 9efbfe0f557f..9396b862d2f3 100644
--- a/sc/source/ui/dbgui/asciiopt.src
+++ b/sc/source/ui/dbgui/asciiopt.src
@@ -258,48 +258,3 @@ ModalDialog RID_SCDLG_ASCII
         Text [ en-US ] = "Text to Columns" ;
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/dbgui/consdlg.hrc b/sc/source/ui/dbgui/consdlg.hrc
index 6f9f6708c388..0e52b94ce052 100644
--- a/sc/source/ui/dbgui/consdlg.hrc
+++ b/sc/source/ui/dbgui/consdlg.hrc
@@ -58,4 +58,3 @@
 
 #define FL_OPTIONS                  60
 #define BTN_REFS                    61
-
diff --git a/sc/source/ui/dbgui/consdlg.src b/sc/source/ui/dbgui/consdlg.src
index 5226c22629c6..9716b190c886 100644
--- a/sc/source/ui/dbgui/consdlg.src
+++ b/sc/source/ui/dbgui/consdlg.src
@@ -214,4 +214,3 @@ ModelessDialog RID_SCDLG_CONSOLIDATE
         TabStop = TRUE ;
     };
 };
-
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index a18bbb7e2607..ef21ef21b761 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -61,14 +61,16 @@ struct Func_SetType
 {
     sal_Int32                   mnType;
     inline                      Func_SetType( sal_Int32 nType ) : mnType( nType ) {}
-    inline void                 operator()( ScCsvColState& rState ) { rState.mnType = mnType; }
+    inline void                 operator()( ScCsvColState& rState ) const
+        { rState.mnType = mnType; }
 };
 
 struct Func_Select
 {
     bool                        mbSelect;
     inline                      Func_Select( bool bSelect ) : mbSelect( bSelect ) {}
-    inline void                 operator()( ScCsvColState& rState ) { rState.Select( mbSelect ); }
+    inline void                 operator()( ScCsvColState& rState ) const
+        { rState.Select( mbSelect ); }
 };
 
 
diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx
index 84d5ad6bee1b..2dd2ebc21faf 100644
--- a/sc/source/ui/dbgui/csvruler.cxx
+++ b/sc/source/ui/dbgui/csvruler.cxx
@@ -61,9 +61,9 @@ static void load_FixedWidthList(ScCsvSplits &aSplits)
     const Any *pProperties;
     Sequence<OUString> aNames(1);
     OUString* pNames = aNames.getArray();
-    ScLinkConfigItem aItem( OUString::createFromAscii( SEP_PATH ) );
+    ScLinkConfigItem aItem( OUString(RTL_CONSTASCII_USTRINGPARAM( SEP_PATH )) );
 
-    pNames[0] = OUString::createFromAscii( FIXED_WIDTH_LIST );
+    pNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( FIXED_WIDTH_LIST ));
     aValues = aItem.GetProperties( aNames );
     pProperties = aValues.getConstArray();
 
@@ -96,9 +96,9 @@ static void save_FixedWidthList(ScCsvSplits aSplits)
     Any *pProperties;
     Sequence<OUString> aNames(1);
     OUString* pNames = aNames.getArray();
-    ScLinkConfigItem aItem( OUString::createFromAscii( SEP_PATH ) );
+    ScLinkConfigItem aItem( OUString(RTL_CONSTASCII_USTRINGPARAM( SEP_PATH )) );
 
-    pNames[0] = OUString::createFromAscii( FIXED_WIDTH_LIST );
+    pNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( FIXED_WIDTH_LIST ));
     aValues = aItem.GetProperties( aNames );
     pProperties = aValues.getArray();
     pProperties[0] <<= sFixedWidthLists;
diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx
index ab2159af2f93..1be379894444 100644
--- a/sc/source/ui/dbgui/dapidata.cxx
+++ b/sc/source/ui/dbgui/dapidata.cxx
@@ -91,7 +91,7 @@ ScDataPilotDatabaseDlg::ScDataPilotDatabaseDlg( Window* pParent ) :
 
         uno::Reference<container::XNameAccess> xContext(
                 comphelper::getProcessServiceFactory()->createInstance(
-                    rtl::OUString::createFromAscii( DP_SERVICE_DBCONTEXT ) ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( DP_SERVICE_DBCONTEXT )) ),
                 uno::UNO_QUERY);
         if (xContext.is())
         {
@@ -166,7 +166,7 @@ void ScDataPilotDatabaseDlg::FillObjects()
 
         uno::Reference<container::XNameAccess> xContext(
                 comphelper::getProcessServiceFactory()->createInstance(
-                    rtl::OUString::createFromAscii( DP_SERVICE_DBCONTEXT ) ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( DP_SERVICE_DBCONTEXT )) ),
                 uno::UNO_QUERY);
         if ( !xContext.is() ) return;
 
@@ -177,7 +177,7 @@ void ScDataPilotDatabaseDlg::FillObjects()
 
         uno::Reference<task::XInteractionHandler> xHandler(
                 comphelper::getProcessServiceFactory()->createInstance(
-                    rtl::OUString::createFromAscii( SC_SERVICE_INTHANDLER ) ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_INTHANDLER )) ),
                 uno::UNO_QUERY);
 
         uno::Reference<sdbc::XConnection> xConnection = xSource->connectWithCompletion( xHandler );
diff --git a/sc/source/ui/dbgui/dapitype.hrc b/sc/source/ui/dbgui/dapitype.hrc
index efbabe64fa04..6358763d7fd1 100644
--- a/sc/source/ui/dbgui/dapitype.hrc
+++ b/sc/source/ui/dbgui/dapitype.hrc
@@ -50,4 +50,3 @@
 #define CB_OBJECT       21
 #define FT_OBJTYPE      22
 #define LB_OBJTYPE      23
-
diff --git a/sc/source/ui/dbgui/dapitype.src b/sc/source/ui/dbgui/dapitype.src
index 5cf1dacad819..3c03150e400b 100644
--- a/sc/source/ui/dbgui/dapitype.src
+++ b/sc/source/ui/dbgui/dapitype.src
@@ -285,24 +285,3 @@ ModalDialog RID_SCDLG_DAPIDATA
     };
     Text [ en-US ] = "Select Data Source";
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 1782e4245b1d..f2509e669902 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -219,14 +219,6 @@ void ScDbNameDlg::Init()
     aBtnMore.AddWindow( &aFTSource );
     aBtnMore.AddWindow( &aFTOperations );
 
-    String  theAreaStr;
-    SCCOL   nStartCol   = 0;
-    SCROW   nStartRow   = 0;
-    SCTAB   nStartTab   = 0;
-    SCCOL   nEndCol     = 0;
-    SCROW   nEndRow     = 0;
-    SCTAB   nEndTab     = 0;
-
     aBtnOk.SetClickHdl      ( LINK( this, ScDbNameDlg, OkBtnHdl ) );
     aBtnCancel.SetClickHdl  ( LINK( this, ScDbNameDlg, CancelBtnHdl ) );
     aBtnAdd.SetClickHdl     ( LINK( this, ScDbNameDlg, AddBtnHdl ) );
@@ -235,8 +227,17 @@ void ScDbNameDlg::Init()
     aEdAssign.SetModifyHdl  ( LINK( this, ScDbNameDlg, AssModifyHdl ) );
     UpdateNames();
 
+    String  theAreaStr;
+
     if ( pViewData && pDoc )
     {
+        SCCOL   nStartCol   = 0;
+        SCROW   nStartRow   = 0;
+        SCTAB   nStartTab   = 0;
+        SCCOL   nEndCol     = 0;
+        SCROW   nEndRow     = 0;
+        SCTAB   nEndTab     = 0;
+
         ScDBCollection* pDBColl = pDoc->GetDBCollection();
         ScDBData*       pDBData = NULL;
 
diff --git a/sc/source/ui/dbgui/dpgroupdlg.hrc b/sc/source/ui/dbgui/dpgroupdlg.hrc
index 5a4797489ddf..27adea32c4e1 100644
--- a/sc/source/ui/dbgui/dpgroupdlg.hrc
+++ b/sc/source/ui/dbgui/dpgroupdlg.hrc
@@ -61,4 +61,3 @@
 #define STR_UNITS       1
 
 #endif
-
diff --git a/sc/source/ui/dbgui/dpgroupdlg.src b/sc/source/ui/dbgui/dpgroupdlg.src
index f9a5ac589af5..6e6ba170f1b1 100644
--- a/sc/source/ui/dbgui/dpgroupdlg.src
+++ b/sc/source/ui/dbgui/dpgroupdlg.src
@@ -267,4 +267,3 @@ ModalDialog RID_SCDLG_DPDATEGROUP
 } ;
 
 // ----------------------------------------------------------------------------
-
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 02188e367f0c..b95535f91717 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -497,6 +497,7 @@ void ScFilterDlg::UpdateValueList( USHORT nList )
             }
         }
         pValList->SetText( aCurValue );
+        pValList->EnableDDAutoWidth(false);
     }
 
     UpdateHdrInValueList( nList );
diff --git a/sc/source/ui/dbgui/imoptdlg.hrc b/sc/source/ui/dbgui/imoptdlg.hrc
index 5fd9256e8009..6fab4c6db907 100644
--- a/sc/source/ui/dbgui/imoptdlg.hrc
+++ b/sc/source/ui/dbgui/imoptdlg.hrc
@@ -26,8 +26,6 @@
  ************************************************************************/
 #include "sc.hrc"
 
-//#define RID_SCDLG_IMPORTOPT 2256
-
 #define BTN_OK          1
 #define BTN_CANCEL      2
 #define BTN_HELP        3
@@ -41,4 +39,3 @@
 #define FL_FIELDOPT     11
 #define CB_FIXEDWIDTH   12
 #define CB_SAVESHOWN    13
-
diff --git a/sc/source/ui/dbgui/imoptdlg.src b/sc/source/ui/dbgui/imoptdlg.src
index 914f2d1fb027..b63d83210c00 100644
--- a/sc/source/ui/dbgui/imoptdlg.src
+++ b/sc/source/ui/dbgui/imoptdlg.src
@@ -25,7 +25,6 @@
  *
  ************************************************************************/
 
-
 #include "imoptdlg.hrc"
 
 ModalDialog RID_SCDLG_IMPORTOPT
@@ -121,21 +120,3 @@ ModalDialog RID_SCDLG_IMPORTOPT
         Size = MAP_APPFONT ( 50 , 14 ) ;
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/dbgui/makefile.mk b/sc/source/ui/dbgui/makefile.mk
index ab632bf1b1e7..33b8cdbfca7a 100644
--- a/sc/source/ui/dbgui/makefile.mk
+++ b/sc/source/ui/dbgui/makefile.mk
@@ -39,45 +39,37 @@ LIBTARGET=no
 # --- Files --------------------------------------------------------
 
 SLOFILES =	\
-    $(SLO)$/sortdlg.obj		\
-    $(SLO)$/tpsort.obj		\
-    $(SLO)$/filtdlg.obj		\
-    $(SLO)$/sfiltdlg.obj	\
-    $(SLO)$/foptmgr.obj		\
-    $(SLO)$/pfiltdlg.obj	\
-    $(SLO)$/dbnamdlg.obj	\
-    $(SLO)$/expftext.obj	\
-    $(SLO)$/textimportoptions.obj \
-    $(SLO)$/subtdlg.obj		\
-    $(SLO)$/tpsubt.obj		\
-    $(SLO)$/fieldwnd.obj	\
-    $(SLO)$/pvlaydlg.obj	\
-    $(SLO)$/pvfundlg.obj	\
-    $(SLO)$/dpgroupdlg.obj	\
-    $(SLO)$/dapitype.obj	\
-    $(SLO)$/dapidata.obj	\
+    $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES= \
+    $(SLO)$/asciiopt.obj	\
     $(SLO)$/consdlg.obj		\
-    $(SLO)$/scendlg.obj		\
-    $(SLO)$/imoptdlg.obj	\
-    $(SLO)$/validate.obj	\
-    $(SLO)$/csvsplits.obj	\
     $(SLO)$/csvcontrol.obj	\
-    $(SLO)$/csvruler.obj	\
     $(SLO)$/csvgrid.obj		\
+    $(SLO)$/csvruler.obj	\
+    $(SLO)$/csvsplits.obj	\
     $(SLO)$/csvtablebox.obj	\
-    $(SLO)$/asciiopt.obj	\
-    $(SLO)$/scuiasciiopt.obj	\
-     $(SLO)$/scuiimoptdlg.obj
-
-EXCEPTIONSFILES= \
-    $(SLO)$/csvgrid.obj \
-    $(SLO)$/csvruler.obj \
-    $(SLO)$/csvsplits.obj \
-    $(SLO)$/csvtablebox.obj \
-    $(SLO)$/fieldwnd.obj \
+    $(SLO)$/dapidata.obj	\
+    $(SLO)$/dapitype.obj	\
+    $(SLO)$/dbnamdlg.obj	\
+    $(SLO)$/dpgroupdlg.obj	\
+    $(SLO)$/expftext.obj	\
+    $(SLO)$/fieldwnd.obj	\
+    $(SLO)$/filtdlg.obj		\
+    $(SLO)$/foptmgr.obj		\
+    $(SLO)$/imoptdlg.obj	\
+    $(SLO)$/pfiltdlg.obj	\
     $(SLO)$/pvfundlg.obj	\
     $(SLO)$/pvlaydlg.obj	\
-    $(SLO)$/dapidata.obj	\
+    $(SLO)$/scendlg.obj		\
+    $(SLO)$/scuiasciiopt.obj	\
+    $(SLO)$/scuiimoptdlg.obj	\
+    $(SLO)$/sfiltdlg.obj	\
+    $(SLO)$/sortdlg.obj		\
+    $(SLO)$/subtdlg.obj		\
+    $(SLO)$/textimportoptions.obj \
+    $(SLO)$/tpsort.obj		\
+    $(SLO)$/tpsubt.obj		\
     $(SLO)$/validate.obj
 
 SRS1NAME=$(TARGET)
diff --git a/sc/source/ui/dbgui/outline.src b/sc/source/ui/dbgui/outline.src
index cd59bf3b099d..f1a895ddea23 100644
--- a/sc/source/ui/dbgui/outline.src
+++ b/sc/source/ui/dbgui/outline.src
@@ -27,7 +27,6 @@
 
 #include "sc.hrc"
 
-
 // Imageliste hier, damit sie nicht in ui.src beim Zusammenbauen der
 // "echten" Imagelisten stoert
 
@@ -41,11 +40,3 @@ ImageList RID_OUTLINEBITMAPS
     MaskColor = STD_MASKCOLOR;
     OUTLINE_ID_LIST
 };
-
-ImageList RID_OUTLINEBITMAPS_H
-{
-    Prefix = "ouh";
-    MaskColor = SC_HC_MASKCOLOR;
-    OUTLINE_ID_LIST
-};
-
diff --git a/sc/source/ui/dbgui/pivot.hrc b/sc/source/ui/dbgui/pivot.hrc
index 1a97d4c75b52..12c80a8b8420 100644
--- a/sc/source/ui/dbgui/pivot.hrc
+++ b/sc/source/ui/dbgui/pivot.hrc
@@ -78,4 +78,3 @@
 #define PIVOTSTR_DEV2           9
 #define PIVOTSTR_VAR            10
 #define PIVOTSTR_VAR2           11
-
diff --git a/sc/source/ui/dbgui/pvfundlg.hrc b/sc/source/ui/dbgui/pvfundlg.hrc
index c9b6f562a9e1..fdff335fd247 100644
--- a/sc/source/ui/dbgui/pvfundlg.hrc
+++ b/sc/source/ui/dbgui/pvfundlg.hrc
@@ -27,9 +27,6 @@
 
 #include "sc.hrc"
 
-// RID_SCDLG_DPDATAFIELD - DataPilot Data Field Function
-// RID_SCDLG_PIVOTSUBT - DataPilot Page/Row/Column Field Subtotals
-
 #define BTN_OK          1
 #define BTN_CANCEL      2
 #define BTN_HELP        3
@@ -80,4 +77,3 @@
 #define NF_SHOW         1
 
 #define CT_HIDE         1
-
diff --git a/sc/source/ui/dbgui/scendlg.hrc b/sc/source/ui/dbgui/scendlg.hrc
index 83818773bf5a..8fbf9a2d5b54 100644
--- a/sc/source/ui/dbgui/scendlg.hrc
+++ b/sc/source/ui/dbgui/scendlg.hrc
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 #include "sc.hrc"
-//#define RID_SCDLG_NEWSCENARIO 256
+
 #define BTN_OK                  1
 #define BTN_CANCEL              2
 #define BTN_HELP                3
diff --git a/sc/source/ui/dbgui/scendlg.src b/sc/source/ui/dbgui/scendlg.src
index 40cfeb01b8ff..eb8e18532531 100644
--- a/sc/source/ui/dbgui/scendlg.src
+++ b/sc/source/ui/dbgui/scendlg.src
@@ -155,41 +155,3 @@ ModalDialog RID_SCDLG_NEWSCENARIO
         Text [ en-US ] = "Settings";
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 67817a140af2..9da5ef51d62a 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -127,17 +127,17 @@ static void load_Separators( OUString &sFieldSeparators, OUString &sTextSeparato
     const Any *pProperties;
     Sequence<OUString> aNames(9);
     OUString* pNames = aNames.getArray();
-    ScLinkConfigItem aItem( OUString::createFromAscii( SEP_PATH ) );
-
-    pNames[0] = OUString::createFromAscii( MERGE_DELIMITERS );
-    pNames[1] = OUString::createFromAscii( SEPARATORS );
-    pNames[2] = OUString::createFromAscii( TEXT_SEPARATORS );
-    pNames[3] = OUString::createFromAscii( FIXED_WIDTH );
-    pNames[4] = OUString::createFromAscii( FROM_ROW );
-    pNames[5] = OUString::createFromAscii( CHAR_SET );
-    pNames[6] = OUString::createFromAscii( QUOTED_AS_TEXT );
-    pNames[7] = OUString::createFromAscii( DETECT_SPECIAL_NUM );
-    pNames[8] = OUString::createFromAscii( LANGUAGE );
+    ScLinkConfigItem aItem( OUString(RTL_CONSTASCII_USTRINGPARAM( SEP_PATH )) );
+
+    pNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( MERGE_DELIMITERS ));
+    pNames[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SEPARATORS ));
+    pNames[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( TEXT_SEPARATORS ));
+    pNames[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( FIXED_WIDTH ));
+    pNames[4] = OUString(RTL_CONSTASCII_USTRINGPARAM( FROM_ROW ));
+    pNames[5] = OUString(RTL_CONSTASCII_USTRINGPARAM( CHAR_SET ));
+    pNames[6] = OUString(RTL_CONSTASCII_USTRINGPARAM( QUOTED_AS_TEXT ));
+    pNames[7] = OUString(RTL_CONSTASCII_USTRINGPARAM( DETECT_SPECIAL_NUM ));
+    pNames[8] = OUString(RTL_CONSTASCII_USTRINGPARAM( LANGUAGE ));
     aValues = aItem.GetProperties( aNames );
     pProperties = aValues.getConstArray();
     if( pProperties[1].hasValue() )
@@ -178,17 +178,17 @@ static void save_Separators(
     Any *pProperties;
     Sequence<OUString> aNames(9);
     OUString* pNames = aNames.getArray();
-    ScLinkConfigItem aItem( OUString::createFromAscii( SEP_PATH ) );
-
-    pNames[0] = OUString::createFromAscii( MERGE_DELIMITERS );
-    pNames[1] = OUString::createFromAscii( SEPARATORS );
-    pNames[2] = OUString::createFromAscii( TEXT_SEPARATORS );
-    pNames[3] = OUString::createFromAscii( FIXED_WIDTH );
-    pNames[4] = OUString::createFromAscii( FROM_ROW );
-    pNames[5] = OUString::createFromAscii( CHAR_SET );
-    pNames[6] = OUString::createFromAscii( QUOTED_AS_TEXT );
-    pNames[7] = OUString::createFromAscii( DETECT_SPECIAL_NUM );
-    pNames[8] = OUString::createFromAscii( LANGUAGE );
+    ScLinkConfigItem aItem( OUString(RTL_CONSTASCII_USTRINGPARAM( SEP_PATH )) );
+
+    pNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( MERGE_DELIMITERS ));
+    pNames[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( SEPARATORS ));
+    pNames[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( TEXT_SEPARATORS ));
+    pNames[3] = OUString(RTL_CONSTASCII_USTRINGPARAM( FIXED_WIDTH ));
+    pNames[4] = OUString(RTL_CONSTASCII_USTRINGPARAM( FROM_ROW ));
+    pNames[5] = OUString(RTL_CONSTASCII_USTRINGPARAM( CHAR_SET ));
+    pNames[6] = OUString(RTL_CONSTASCII_USTRINGPARAM( QUOTED_AS_TEXT ));
+    pNames[7] = OUString(RTL_CONSTASCII_USTRINGPARAM( DETECT_SPECIAL_NUM ));
+    pNames[8] = OUString(RTL_CONSTASCII_USTRINGPARAM( LANGUAGE ));
     aValues = aItem.GetProperties( aNames );
     pProperties = aValues.getArray();
     pProperties[1] <<= sFieldSeparators;
diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx
index 0fbbe991e327..42b625f135af 100644
--- a/sc/source/ui/dbgui/sortdlg.cxx
+++ b/sc/source/ui/dbgui/sortdlg.cxx
@@ -55,9 +55,9 @@ ScSortDlg::ScSortDlg( Window*           pParent,
     AddTabPage( TP_FIELDS,  ScTabPageSortFields::Create,  0 );
     AddTabPage( TP_OPTIONS, ScTabPageSortOptions::Create, 0 );
 #else
-    String fields = rtl::OUString::createFromAscii ("fields");
+    String fields = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fields"));
     AddTabPage( TP_FIELDS, fields, ScTabPageSortFields::Create, 0, FALSE, TAB_APPEND);
-    String options = rtl::OUString::createFromAscii ("options");
+    String options = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("options"));
     AddTabPage( TP_OPTIONS, options, ScTabPageSortOptions::Create, 0, FALSE, TAB_APPEND);
 #endif
     FreeResource();
diff --git a/sc/source/ui/dbgui/textimportoptions.src b/sc/source/ui/dbgui/textimportoptions.src
index 69e2d69b3142..ad0a417c5519 100644
--- a/sc/source/ui/dbgui/textimportoptions.src
+++ b/sc/source/ui/dbgui/textimportoptions.src
@@ -107,4 +107,3 @@ ModalDialog RID_SCDLG_TEXT_IMPORT_OPTIONS
         Text [ en-US ] = "Detect special numbers (such as dates)." ;
     };
 };
-
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 6eed9ab7fee0..dfe5d58689de 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -339,7 +339,7 @@ ScTPValidationValue::ScTPValidationValue( Window* pParent, const SfxItemSet& rAr
     FreeResource();
 
     // list separator in formulas
-    String aListSep = ::GetScCompilerNativeSymbol( ocSep );
+    String aListSep = ::ScCompiler::GetNativeSymbol( ocSep );
     DBG_ASSERT( aListSep.Len() == 1, "ScTPValidationValue::ScTPValidationValue - list separator error" );
     mcFmlaSep = aListSep.Len() ? aListSep.GetChar( 0 ) : ';';
     m_btnRef.Hide(); // cell range picker
diff --git a/sc/source/ui/dbgui/validate.src b/sc/source/ui/dbgui/validate.src
index c861fbc200cb..0e1ea8403132 100644
--- a/sc/source/ui/dbgui/validate.src
+++ b/sc/source/ui/dbgui/validate.src
@@ -27,7 +27,6 @@
 
 #include "validate.hrc"
 
-
 TabDialog TAB_DLG_VALIDATION
 {
     OutputSize = TRUE ;
@@ -62,9 +61,9 @@ TabDialog TAB_DLG_VALIDATION
     };
     Text [ en-US ] = "Validity" ;
 };
-//<!--Added by PengYunQuan for Validity Cell Range Picker
+
 #define OFFSET_X    30
-//-->Added by PengYunQuan for Validity Cell Range Picker
+
 TabPage TP_VALIDATION_VALUES
 {
     Hide = TRUE ;
@@ -74,19 +73,13 @@ TabPage TP_VALIDATION_VALUES
     FixedText FT_ALLOW
     {
         Pos = MAP_APPFONT ( 6 , 16 ) ;
-        //<!--Modified by PengYunQuan for Validity Cell Range Picker
-        //Size = MAP_APPFONT ( 70 , 8 ) ;
         Size = MAP_APPFONT ( 70 - OFFSET_X , 8 ) ;
-        //-->Modified by PengYunQuan for Validity Cell Range Picker
         Text [ en-US ] = "~Allow" ;
     };
     ListBox LB_ALLOW
     {
         Border = TRUE ;
-        //<!--Modified by PengYunQuan for Validity Cell Range Picker
-        //Pos = MAP_APPFONT ( 80 , 14 ) ;
         Pos = MAP_APPFONT ( 80 - OFFSET_X , 14 ) ;
-        //-->Modified by PengYunQuan for Validity Cell Range Picker
         Size = MAP_APPFONT ( 90 , 80 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
@@ -105,19 +98,13 @@ TabPage TP_VALIDATION_VALUES
     FixedText FT_VALUE
     {
         Pos = MAP_APPFONT ( 6 , 58 ) ;
-        //<!--Modified by PengYunQuan for Validity Cell Range Picker
-        //Size = MAP_APPFONT ( 70 , 8 ) ;
         Size = MAP_APPFONT ( 70 - OFFSET_X , 8 ) ;
-        //-->Modified by PengYunQuan for Validity Cell Range Picker
         Text [ en-US ] = "~Data" ;
     };
     ListBox LB_VALUE
     {
         Border = TRUE ;
-        //<!--Modified by PengYunQuan for Validity Cell Range Picker
-        //Pos = MAP_APPFONT ( 80 , 56 ) ;
         Pos = MAP_APPFONT ( 80 - OFFSET_X , 56 ) ;
-        //-->Modified by PengYunQuan for Validity Cell Range Picker
         Size = MAP_APPFONT ( 90 , 90 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
@@ -137,81 +124,54 @@ TabPage TP_VALIDATION_VALUES
     FixedText FT_MIN
     {
         Pos = MAP_APPFONT ( 6 , 76 ) ;
-        //<!--Modified by PengYunQuan for Validity Cell Range Picker
-        //Size = MAP_APPFONT ( 70 , 8 ) ;
         Size = MAP_APPFONT ( 70 - OFFSET_X , 8 ) ;
-        //-->Modified by PengYunQuan for Validity Cell Range Picker
         Text [ en-US ] = "~Minimum" ;
     };
     Edit EDT_MIN
     {
         Border = TRUE ;
-        //<!--Modified by PengYunQuan for Validity Cell Range Picker
-        //Pos = MAP_APPFONT ( 80 , 74 ) ;
-        //Size = MAP_APPFONT ( 174 , 12 ) ;
         Pos = MAP_APPFONT ( 80 - OFFSET_X , 74 ) ;
         Size = MAP_APPFONT ( 90 , 12 ) ;
-        //-->Modified by PengYunQuan for Validity Cell Range Picker
         TabStop = TRUE ;
     };
     MultiLineEdit EDT_LIST
     {
         Border = TRUE ;
-        //<!--Modified by PengYunQuan for Validity Cell Range Picker
-        //Pos = MAP_APPFONT ( 80 , 74 ) ;
-        //Size = MAP_APPFONT ( 174 , 105 ) ;
         Pos = MAP_APPFONT ( 80 - OFFSET_X , 74 ) ;
         Size = MAP_APPFONT ( 174 + OFFSET_X , 105 ) ;
-        //-->Modified by PengYunQuan for Validity Cell Range Picker
         VScroll = TRUE ;
         IgnoreTab = TRUE ;
     };
     FixedText FT_MAX
     {
         Pos = MAP_APPFONT ( 6 , 92 ) ;
-        //<!--Modified by PengYunQuan for Validity Cell Range Picker
-        //Size = MAP_APPFONT ( 70 , 8 ) ;
         Size = MAP_APPFONT ( 70 - OFFSET_X , 8 ) ;
-        //-->Modified by PengYunQuan for Validity Cell Range Picker
         Text [ en-US ] = "Ma~ximum" ;
     };
     Edit EDT_MAX
     {
         Border = TRUE ;
-        //<!--Modified by PengYunQuan for Validity Cell Range Picker
-        //Pos = MAP_APPFONT ( 80 , 90 ) ;
-        //Size = MAP_APPFONT ( 174 , 12 ) ;
         Pos = MAP_APPFONT ( 80 - OFFSET_X , 90 ) ;
         Size = MAP_APPFONT ( 90 , 12 ) ;
-        //-->Modified by PengYunQuan for Validity Cell Range Picker
         TabStop = TRUE ;
     };
     CheckBox TSB_ALLOW_BLANKS
     {
-        //<!--Modified by PengYunQuan for Validity Cell Range Picker
-        //Pos = MAP_APPFONT ( 80 , 30 ) ;
         Pos = MAP_APPFONT ( 80 - OFFSET_X , 30 ) ;
-        //-->Modified by PengYunQuan for Validity Cell Range Picker
         Size = MAP_APPFONT ( 174 , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Allow ~blank cells" ;
     };
     CheckBox CB_SHOWLIST
     {
-        //<!--Modified by PengYunQuan for Validity Cell Range Picker
-        //Pos = MAP_APPFONT ( 80 , 44 ) ;
         Pos = MAP_APPFONT ( 80 - OFFSET_X , 44 ) ;
-        //-->Modified by PengYunQuan for Validity Cell Range Picker
         Size = MAP_APPFONT ( 174 , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Show selection ~list" ;
     };
     CheckBox CB_SORTLIST
     {
-        //<!--Modified by PengYunQuan for Validity Cell Range Picker
-        //Pos = MAP_APPFONT ( 90 , 58 ) ;
         Pos = MAP_APPFONT ( 90 - OFFSET_X , 58 ) ;
-        //-->Modified by PengYunQuan for Validity Cell Range Picker
         Size = MAP_APPFONT ( 164 , 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Sor~t entries ascending" ;
@@ -223,7 +183,6 @@ TabPage TP_VALIDATION_VALUES
         WordBreak = TRUE ;
         Text [ en-US ] = "A valid source can only consist of a contiguous selection of rows and columns, or a formula that results in an area or array.";
     };
-    //<!--Added by PengYunQuan for Validity Cell Range Picker
     ImageButton RB_VALIDITY_REF
     {
         Pos = MAP_APPFONT ( 142 , 73 ) ;
@@ -231,7 +190,6 @@ TabPage TP_VALIDATION_VALUES
         TabStop = TRUE ;
         QuickHelpText [ en-US ] = "Shrink" ;
     };
-    //-->Added by PengYunQuan for Validity Cell Range Picker
 };
 
 TabPage TP_VALIDATION_INPUTHELP
@@ -360,48 +318,3 @@ TabPage TP_VALIDATION_ERROR
     };
     Text [ en-US ] = "Error Alert" ;
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index 69a62985e02f..7b97056c0c88 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -271,7 +271,6 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
     SfxMedium* pMed = new SfxMedium(aNewUrl, STREAM_STD_READ, FALSE, pFilter);
 
     ScDocShell* pSrcShell = new ScDocShell(SFX_CREATE_MODE_INTERNAL);
-//REMOVE        SvEmbeddedObjectRef aRef = pSrcShell;
     SfxObjectShellRef aRef = pSrcShell;
     pSrcShell->DoLoad(pMed);
 
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index 4a5f68b3e658..22abe5f65a9a 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1043,13 +1043,12 @@ BOOL ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam,
         ScOutlineTable* pUndoTab = NULL;
         ScRangeName*    pUndoRange = NULL;
         ScDBCollection* pUndoDB = NULL;
-        SCTAB           nTabCount = 0;              // fuer Referenz-Undo
 
         if (bRecord)                                        // alte Daten sichern
         {
             BOOL bOldFilter = bDo && rParam.bDoSort;
 
-            nTabCount = pDoc->GetTableCount();
+            SCTAB nTabCount = pDoc->GetTableCount();
             pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
             ScOutlineTable* pTable = pDoc->GetOutlineTable( nTab );
             if (pTable)
diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx
index 8400f1ad8b6f..3524c8788e0c 100644
--- a/sc/source/ui/docshell/dbdocimp.cxx
+++ b/sc/source/ui/docshell/dbdocimp.cxx
@@ -92,7 +92,7 @@ void ScDBDocFunc::ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFram
     uno::Reference<frame::XDispatchProvider> xDP(xFrame, uno::UNO_QUERY);
 
     uno::Reference<frame::XFrame> xBeamerFrame = xFrame->findFrame(
-                                        rtl::OUString::createFromAscii("_beamer"),
+                                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_beamer")),
                                         frame::FrameSearchFlag::CHILDREN);
     if (xBeamerFrame.is())
     {
@@ -290,7 +290,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
             bDispose = sal_True;
             xRowSet = uno::Reference<sdbc::XRowSet>(
                     comphelper::getProcessServiceFactory()->createInstance(
-                        rtl::OUString::createFromAscii( SC_SERVICE_ROWSET ) ),
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_ROWSET )) ),
                     uno::UNO_QUERY);
             uno::Reference<beans::XPropertySet> xRowProp( xRowSet, uno::UNO_QUERY );
             DBG_ASSERT( xRowProp.is(), "can't get RowSet" );
@@ -307,22 +307,22 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
 
                 aAny <<= rtl::OUString( rParam.aDBName );
                 xRowProp->setPropertyValue(
-                            rtl::OUString::createFromAscii(SC_DBPROP_DATASOURCENAME), aAny );
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_DATASOURCENAME)), aAny );
 
                 aAny <<= rtl::OUString( rParam.aStatement );
                 xRowProp->setPropertyValue(
-                            rtl::OUString::createFromAscii(SC_DBPROP_COMMAND), aAny );
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMAND)), aAny );
 
                 aAny <<= nType;
                 xRowProp->setPropertyValue(
-                            rtl::OUString::createFromAscii(SC_DBPROP_COMMANDTYPE), aAny );
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMANDTYPE)), aAny );
 
                 uno::Reference<sdb::XCompletedExecution> xExecute( xRowSet, uno::UNO_QUERY );
                 if ( xExecute.is() )
                 {
                     uno::Reference<task::XInteractionHandler> xHandler(
                             comphelper::getProcessServiceFactory()->createInstance(
-                                rtl::OUString::createFromAscii( SC_SERVICE_INTHANDLER ) ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_INTHANDLER )) ),
                             uno::UNO_QUERY);
                     xExecute->executeWithCompletion( xHandler );
                 }
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index d4cff7090706..4738e60c67a0 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -2674,14 +2674,14 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, String& sModuleName, String
         sal_Int32 nNum = 0;
         String genModuleName;
         if ( sModuleName.Len() )
-            sModuleName = sModuleName;
+            genModuleName = sModuleName;
         else
         {
              genModuleName = String::CreateFromAscii( "Sheet1" );
              nNum = 1;
         }
-        while( xLib->hasByName( genModuleName  ) )
-            genModuleName = rtl::OUString::createFromAscii( "Sheet" ) + rtl::OUString::valueOf( ++nNum );
+        while( xLib->hasByName( genModuleName ) )
+            genModuleName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Sheet")) + rtl::OUString::valueOf( ++nNum );
 
         uno::Any aSourceAny;
         rtl::OUString sTmpSource = sSource;
@@ -2691,8 +2691,7 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, String& sModuleName, String
         uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY );
         if ( xVBAModuleInfo.is() )
         {
-            String sCodeName( genModuleName );
-            rDoc.SetCodeName( nTab, sCodeName );
+            rDoc.SetCodeName( nTab, genModuleName );
             script::ModuleInfo sModuleInfo = lcl_InitModuleInfo(  rDocSh, genModuleName );
             xVBAModuleInfo->insertModuleInfo( genModuleName, sModuleInfo );
             xLib->insertByName( genModuleName, aSourceAny );
@@ -3746,13 +3745,6 @@ BOOL ScDocFunc::AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark,
 
         if (bSize)
         {
-/*          SCCOL nCols[2];
-            nCols[0] = nStartCol;
-            nCols[1] = nEndCol;
-            SCROW nRows[2];
-            nRows[0] = nStartRow;
-            nRows[1] = nEndRow;
-*/
             SCCOLROW nCols[2] = { nStartCol, nEndCol };
             SCCOLROW nRows[2] = { nStartRow, nEndRow };
 
@@ -4506,12 +4498,12 @@ bool ScDocFunc::UnmergeCells( const ScCellMergeOption& rOption, BOOL bRecord, BO
 
 //------------------------------------------------------------------------
 
-BOOL ScDocFunc::ModifyRangeNames( const ScRangeName& rNewRanges, BOOL bApi )
+bool ScDocFunc::ModifyRangeNames( const ScRangeName& rNewRanges )
 {
-    return SetNewRangeNames( new ScRangeName( rNewRanges ), bApi );
+    return SetNewRangeNames( new ScRangeName(rNewRanges) );
 }
 
-BOOL ScDocFunc::SetNewRangeNames( ScRangeName* pNewRanges, BOOL /* bApi */ )     // takes ownership of pNewRanges
+bool ScDocFunc::SetNewRangeNames( ScRangeName* pNewRanges, bool bModifyDoc )     // takes ownership of pNewRanges
 {
     ScDocShellModificator aModificator( rDocShell );
 
@@ -4539,10 +4531,13 @@ BOOL ScDocFunc::SetNewRangeNames( ScRangeName* pNewRanges, BOOL /* bApi */ )
     if ( bCompile )
         pDoc->CompileNameFormula( FALSE );  // CompileFormulaString
 
-    aModificator.SetDocumentModified();
-    SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREAS_CHANGED ) );
+    if (bModifyDoc)
+    {
+        aModificator.SetDocumentModified();
+        SFX_APP()->Broadcast( SfxSimpleHint(SC_HINT_AREAS_CHANGED) );
+    }
 
-    return TRUE;
+    return true;
 }
 
 //------------------------------------------------------------------------
@@ -4691,7 +4686,7 @@ BOOL ScDocFunc::CreateNames( const ScRange& rRange, USHORT nFlags, BOOL bApi )
         if ( bBottom && bRight )
             CreateOneName( aNewRanges, nEndCol,nEndRow,nTab, nContX1,nContY1,nContX2,nContY2, bCancel, bApi );
 
-        bDone = ModifyRangeNames( aNewRanges, bApi );
+        bDone = ModifyRangeNames( aNewRanges );
 
         aModificator.SetDocumentModified();
         SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREAS_CHANGED ) );
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 902a1994f3b4..954307bac5af 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -137,7 +137,7 @@
 #include <comphelper/processfactory.hxx>
 #include "uiitems.hxx"
 #include "cellsuno.hxx"
-
+#include "dpobject.hxx"
 
 #include <vector>
 #include <boost/shared_ptr.hpp>
@@ -433,7 +433,7 @@ private:
 
 BOOL ScDocShell::LoadXML( SfxMedium* pLoadMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStor )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "sb99857", "ScDocShell::LoadXML" );
+    LoadMediumGuard aLoadGuard(&aDocument);
 
     //  MacroCallMode is no longer needed, state is kept in SfxObjectShell now
 
@@ -725,7 +725,7 @@ void __EXPORT ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
                                         SfxFrame* pFrame = ( pViewFrame ? &pViewFrame->GetFrame() : NULL );
                                         uno::Reference< frame::XController > xController = ( pFrame ? pFrame->GetController() : 0 );
                                         uno::Reference< sheet::XSpreadsheetView > xSpreadsheetView( xController, uno::UNO_QUERY_THROW );
-                                        aArgsForJob[0] = beans::NamedValue( ::rtl::OUString::createFromAscii( "SpreadsheetView" ),
+                                        aArgsForJob[0] = beans::NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SpreadsheetView" )),
                                             uno::makeAny( xSpreadsheetView ) );
                                         xJob->execute( aArgsForJob );
                                     }
@@ -854,14 +854,14 @@ void __EXPORT ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
                                             uno::Reference< frame::XStorable > xStor( GetModel(), uno::UNO_QUERY_THROW );
                                             // TODO/LATER: More entries from the MediaDescriptor might be interesting for the merge
                                             uno::Sequence< beans::PropertyValue > aValues(1);
-                                            aValues[0].Name = ::rtl::OUString::createFromAscii( "FilterName" );
+                                            aValues[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilterName"));
                                             aValues[0].Value <<= ::rtl::OUString( GetMedium()->GetFilter()->GetFilterName() );
 
                                             SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, sal_False);
                                             if ( pPasswordItem && pPasswordItem->GetValue().Len() )
                                             {
                                                 aValues.realloc( 2 );
-                                                aValues[1].Name = ::rtl::OUString::createFromAscii( "Password" );
+                                                aValues[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Password") );
                                                 aValues[1].Value <<= ::rtl::OUString( pPasswordItem->GetValue() );
                                             }
 
@@ -1577,7 +1577,6 @@ BOOL __EXPORT ScDocShell::SaveAs( SfxMedium& rMedium )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::SaveAs" );
 
-#if ENABLE_SHEET_PROTECTION
     ScTabViewShell* pViewShell = GetBestViewShell();
     bool bNeedsRehash = ScPassHashHelper::needsPassHashRegen(aDocument, PASSHASH_SHA1);
     if (bNeedsRehash)
@@ -1590,7 +1589,6 @@ BOOL __EXPORT ScDocShell::SaveAs( SfxMedium& rMedium )
             // password re-type cancelled.  Don't save the document.
             return false;
     }
-#endif
 
     ScRefreshTimerProtector( aDocument.GetRefreshTimerControlAddress() );
 
@@ -2125,13 +2123,11 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
                 }
             }
 
-#if ENABLE_SHEET_PROTECTION
             if( bDoSave )
             {
                 bool bNeedRetypePassDlg = ScPassHashHelper::needsPassHashRegen( aDocument, PASSHASH_XL );
                 bDoSave = !bNeedRetypePassDlg || pViewShell->ExecuteRetypePassDlg( PASSHASH_XL );
             }
-#endif
         }
 
         if( bDoSave )
@@ -2830,7 +2826,7 @@ void ScDocShell::ResetKeyBindings( ScOptionsUtil::KeyBindingType eType )
 
     Reference<XModuleUIConfigurationManagerSupplier> xModuleCfgSupplier(
         xServiceManager->createInstance(
-            OUString::createFromAscii("com.sun.star.ui.ModuleUIConfigurationManagerSupplier")), UNO_QUERY);
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"))), UNO_QUERY);
 
     if (!xModuleCfgSupplier.is())
         return;
@@ -2838,7 +2834,7 @@ void ScDocShell::ResetKeyBindings( ScOptionsUtil::KeyBindingType eType )
     // Grab the Calc configuration.
     Reference<XUIConfigurationManager> xConfigMgr =
         xModuleCfgSupplier->getUIConfigurationManager(
-            OUString::createFromAscii("com.sun.star.sheet.SpreadsheetDocument"));
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument")));
 
     if (!xConfigMgr.is())
         return;
@@ -2885,15 +2881,15 @@ void ScDocShell::ResetKeyBindings( ScOptionsUtil::KeyBindingType eType )
     switch (eType)
     {
         case ScOptionsUtil::KEY_DEFAULT:
-            xScAccel->setKeyEvent(aDelete, OUString::createFromAscii(".uno:ClearContents"));
-            xScAccel->setKeyEvent(aBackspace, OUString::createFromAscii(".uno:Delete"));
-            xScAccel->setKeyEvent(aCtrlD, OUString::createFromAscii(".uno:FillDown"));
-            xScAccel->setKeyEvent(aCtrlShiftD, OUString::createFromAscii(".uno:DataSelect"));
+            xScAccel->setKeyEvent(aDelete, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:ClearContents")));
+            xScAccel->setKeyEvent(aBackspace, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Delete")));
+            xScAccel->setKeyEvent(aCtrlD, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FillDown")));
+            xScAccel->setKeyEvent(aCtrlShiftD, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DataSelect")));
         break;
         case ScOptionsUtil::KEY_OOO_LEGACY:
-            xScAccel->setKeyEvent(aDelete, OUString::createFromAscii(".uno:Delete"));
-            xScAccel->setKeyEvent(aBackspace, OUString::createFromAscii(".uno:ClearContents"));
-            xScAccel->setKeyEvent(aCtrlD, OUString::createFromAscii(".uno:DataSelect"));
+            xScAccel->setKeyEvent(aDelete, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Delete")));
+            xScAccel->setKeyEvent(aBackspace, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:ClearContents")));
+            xScAccel->setKeyEvent(aCtrlD, OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DataSelect")));
         break;
         default:
             ;
diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx
index ab567f7d23df..a9bf1e2975f0 100644
--- a/sc/source/ui/docshell/docsh2.cxx
+++ b/sc/source/ui/docshell/docsh2.cxx
@@ -57,11 +57,6 @@
 #include <sfx2/app.hxx>
 
 // INCLUDE ---------------------------------------------------------------
-/*
-#include <svdrwetc.hxx>
-#include <svdrwobx.hxx>
-#include <sostor.hxx>
-*/
 #include "drwlayer.hxx"
 #include "stlpool.hxx"
 #include "docsh.hxx"
@@ -103,27 +98,6 @@ BOOL __EXPORT ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xSt
 
     InitItems();
     CalcOutputFactor();
-#if 0
-    uno::Any aGlobs;
-        uno::Sequence< uno::Any > aArgs(1);
-        aArgs[ 0 ] <<= GetModel();
-    aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.Globals" ) ), aArgs );
-    GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", aGlobs );
-        // Fake ThisComponent being setup by Activate ( which is a view
-        // related thing ),
-        //  a) if another document is opened then in theory  ThisComponent
-        //     will be reset as before,
-        //  b) when this document is  'really' Activated then ThisComponent
-        //     again will be set as before
-        // The only wrinkle seems if this document is loaded 'InVisible'
-        // but.. I don't see that this is possible from the vba API
-        // I could be wrong though
-        // There may be implications setting the current component
-        // too early :-/ so I will just manually set the Basic Variables
-        BasicManager* pAppMgr = SFX_APP()->GetBasicManager();
-        if ( pAppMgr )
-            pAppMgr->SetGlobalUNOConstant( "ThisExcelDoc", aArgs[ 0 ] );
-#endif
 
     return bRet;
 }
@@ -147,13 +121,8 @@ void ScDocShell::InitItems()
 {
     // AllItemSet fuer Controller mit benoetigten Items fuellen:
 
-    // if ( pImpl->pFontList )
-    //  delete pImpl->pFontList;
-
     //  Druck-Optionen werden beim Drucken und evtl. in GetPrinter gesetzt
 
-    // pImpl->pFontList = new FontList( GetPrinter(), Application::GetDefaultDevice() );
-    //PutItem( SvxFontListItem( pImpl->pFontList, SID_ATTR_CHAR_FONTLIST ) );
     UpdateFontList();
 
     ScDrawLayer* pDrawLayer = aDocument.GetDrawLayer();
@@ -170,7 +139,6 @@ void ScDocShell::InitItems()
 
         pDrawLayer->SetNotifyUndoActionHdl( LINK( pDocFunc, ScDocFunc, NotifyDrawUndo ) );
 
-        //if (SfxObjectShell::HasSbxObject())
         pDrawLayer->UpdateBasic();          // DocShell-Basic in DrawPages setzen
     }
     else
@@ -200,7 +168,6 @@ void ScDocShell::InitItems()
                     i18n::ForbiddenCharacters aForbidden;
                     aAsian.GetStartEndChars( pLocales[i], aForbidden.beginLine, aForbidden.endLine );
                     LanguageType eLang = SvxLocaleToLanguage(pLocales[i]);
-                    //pDoc->SetForbiddenCharacters( eLang, aForbidden );
 
                     xForbiddenTable->SetForbiddenCharacters( eLang, aForbidden );
                 }
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 8e0719ad328b..e12bc7dc8e9a 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -1221,7 +1221,7 @@ bool ScDocShell::MergeSharedDocument( ScDocShell* pSharedDocShell )
     }
 
 #if DEBUG_CHANGETRACK
-    ::rtl::OUString aMessage = ::rtl::OUString::createFromAscii( "\nbefore merge:\n" );
+    ::rtl::OUString aMessage(RTL_CONSTASCII_USTRINGPARAM( "\nbefore merge:\n" ));
     aMessage += pThisTrack->ToString();
     ::rtl::OString aMsg = ::rtl::OUStringToOString( aMessage, RTL_TEXTENCODING_UTF8 );
     OSL_ENSURE( false, aMsg.getStr() );
@@ -1398,7 +1398,7 @@ bool ScDocShell::MergeSharedDocument( ScDocShell* pSharedDocShell )
     }
 
 #if DEBUG_CHANGETRACK
-    aMessage = ::rtl::OUString::createFromAscii( "\nafter merge:\n" );
+    aMessage = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "\nafter merge:\n" ));
     aMessage += pThisTrack->ToString();
     aMsg = ::rtl::OUStringToOString( aMessage, RTL_TEXTENCODING_UTF8 );
     OSL_ENSURE( false, aMsg.getStr() );
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 6abc194aa105..5ca0e9e7dd1a 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -309,7 +309,6 @@ void ScDocShell::Execute( SfxRequest& rReq )
             if (pReqArgs)
             {
                 ScDocument* pDoc = GetDocument();
-//                BOOL bUndo (pDoc->IsUndoEnabled());
                 const   SfxPoolItem* pItem;
                 String  aChartName, aRangeName;
 
@@ -459,7 +458,6 @@ void ScDocShell::Execute( SfxRequest& rReq )
                 if (pBindings)
                 {
                     pBindings->Invalidate( FID_AUTO_CALC );
-//                  pBindings->Invalidate( FID_RECALC );        // jetzt immer enabled
                 }
                 rReq.AppendItem( SfxBoolItem( FID_AUTO_CALC, bNewVal ) );
                 rReq.Done();
@@ -2127,22 +2125,6 @@ void ScDocShell::Print( SfxProgress& rProgress, PrintDialog* pPrintDialog,
                     delete pDrawView;
                 }
             }
-
-#if 0
-            if ( n+1 < nCollateCopies &&
-                 (pPrinter->GetDuplexMode() == DUPLEX_SHORTEDGE || pPrinter->GetDuplexMode() == DUPLEX_LONGEDGE) &&
-                 ( nPrinted % 2 ) == 1 )
-            {
-                // #105584# when several collated copies are printed in duplex mode, and there is
-                // an odd number of pages, print an empty page between copies, so the first page of
-                // the second copy isn't printed on the back of the last page of the first copy.
-                // (same as in Writer ViewShell::Prt)
-
-                // FIXME: needs to be adapted to XRenderable interface
-                pPrinter->StartPage();
-                pPrinter->EndPage();
-            }
-#endif
         }
     }
 
@@ -2223,10 +2205,6 @@ void ScDocShell::GetState( SfxItemSet &rSet )
             //  Wenn eine Formel editiert wird, muss FID_RECALC auf jeden Fall enabled sein.
             //  Recalc fuer das Doc war mal wegen #29898# disabled, wenn AutoCalc an war,
             //  ist jetzt wegen #41540# aber auch immer enabled.
-//          case FID_RECALC:
-//              if ( aDocument.GetAutoCalc() )
-//                  rSet.DisableItem( nWhich );
-//              break;
 
             case SID_TABLES_COUNT:
                 rSet.Put( SfxInt16Item( nWhich, aDocument.GetTableCount() ) );
@@ -2276,7 +2254,6 @@ void ScDocShell::GetSbxState( SfxItemSet &rSet )
 
 void __EXPORT ScDocShell::Draw( OutputDevice* pDev, const JobSetup & /* rSetup */, USHORT nAspect )
 {
-//  bIsOle = TRUE;      // jetzt ueber den CreateMode
 
     SCTAB nVisTab = aDocument.GetVisibleTab();
     if (!aDocument.HasTable(nVisTab))
@@ -2319,7 +2296,6 @@ Rectangle __EXPORT ScDocShell::GetVisArea( USHORT nAspect ) const
 
     if( nAspect == ASPECT_THUMBNAIL )
     {
-//      Rectangle aArea( 0,0, 3175,3175 );                          //  120x120 Pixel in 1:1
         Rectangle aArea( 0,0, SC_PREVIEW_SIZE_X,SC_PREVIEW_SIZE_Y );
         BOOL bNegativePage = aDocument.IsNegativePage( aDocument.GetVisibleTab() );
         if ( bNegativePage )
@@ -2678,7 +2654,7 @@ uno::Reference< frame::XModel > ScDocShell::LoadSharedDocument()
             xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ) ) ),
             uno::UNO_QUERY_THROW );
         uno::Sequence < beans::PropertyValue > aArgs( 1 );
-        aArgs[0].Name = ::rtl::OUString::createFromAscii( "Hidden" );
+        aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Hidden" ));
         aArgs[0].Value <<= sal_True;
 
         if ( GetMedium() )
@@ -2687,7 +2663,7 @@ uno::Reference< frame::XModel > ScDocShell::LoadSharedDocument()
             if ( pPasswordItem && pPasswordItem->GetValue().Len() )
             {
                 aArgs.realloc( 2 );
-                aArgs[1].Name = ::rtl::OUString::createFromAscii( "Password" );
+                aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Password" ));
                 aArgs[1].Value <<= ::rtl::OUString( pPasswordItem->GetValue() );
             }
         }
diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx
index e852ca29a948..8a2c3e528fb0 100644
--- a/sc/source/ui/docshell/docsh5.cxx
+++ b/sc/source/ui/docshell/docsh5.cxx
@@ -43,6 +43,7 @@
 #include <svl/smplhint.hxx>
 
 #include <com/sun/star/sdbc/XResultSet.hpp>
+#include <com/sun/star/script/vba/XVBACompatibility.hpp>
 
 // INCLUDE ---------------------------------------------------------------
 
@@ -71,6 +72,12 @@
 // defined in docfunc.cxx
 void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, String& sModuleName, String& sModuleSource );
 
+using com::sun::star::script::XLibraryContainer;
+using com::sun::star::script::vba::XVBACompatibility;
+using com::sun::star::container::XNameContainer;
+using com::sun::star::uno::Reference;
+using com::sun::star::uno::UNO_QUERY;
+
 // ---------------------------------------------------------------------------
 
 //
@@ -940,18 +947,21 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
                         {
                 StarBASIC* pStarBASIC = GetBasic();
                             String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
-                            if ( GetBasicManager()->GetName().Len() > 0 )
+                            Reference< XLibraryContainer > xLibContainer = GetBasicContainer();
+                            Reference< XVBACompatibility > xVBACompat( xLibContainer, UNO_QUERY );
+
+                            if ( xVBACompat.is() )
                             {
-                                aLibName = GetBasicManager()->GetName();
+                                aLibName = xVBACompat->getProjectName();
                                 pStarBASIC = GetBasicManager()->GetLib( aLibName );
                             }
+
                             SCTAB nTabToUse = nDestTab;
                             if ( nDestTab == SC_TAB_APPEND )
                                 nTabToUse = aDocument.GetMaxTableNumber() - 1;
                             String sCodeName;
                             String sSource;
-                            com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer > xLibContainer = GetBasicContainer();
-                            com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > xLib;
+                            Reference< XNameContainer > xLib;
                             if( xLibContainer.is() )
                             {
                                 com::sun::star::uno::Any aLibAny = xLibContainer->getByName( aLibName );
@@ -1018,7 +1028,7 @@ IMPL_LINK( ScDocShell, RefreshDBDataHdl, ScRefreshTimer*, pRefreshTimer )
     {
         ScRange aRange;
         pDBData->GetArea( aRange );
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> xResultSet;
+                Reference< ::com::sun::star::sdbc::XResultSet> xResultSet;
         bContinue = aFunc.DoImport( aRange.aStart.Tab(), aImportParam, xResultSet, NULL, TRUE, FALSE ); //! Api-Flag as parameter
         // internal operations (sort, query, subtotal) only if no error
         if (bContinue)
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 1e94a7f3b2e4..676ed8bc8e5f 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -131,7 +131,7 @@ namespace
         if (!xFactory.is()) return SCERR_EXPORT_CONNECT;
 
         _rDrvMgr.set( xFactory->createInstance(
-                            rtl::OUString::createFromAscii( SC_SERVICE_DRVMAN ) ),
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_DRVMAN )) ),
                             uno::UNO_QUERY);
         DBG_ASSERT( _rDrvMgr.is(), "can't get DriverManager" );
         if (!_rDrvMgr.is()) return SCERR_EXPORT_CONNECT;
@@ -160,9 +160,9 @@ namespace
         }
 
         uno::Sequence<beans::PropertyValue> aProps(2);
-        aProps[0].Name = rtl::OUString::createFromAscii(SC_DBPROP_EXTENSION);
+        aProps[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_EXTENSION));
         aProps[0].Value <<= rtl::OUString( aExtension );
-        aProps[1].Name = rtl::OUString::createFromAscii(SC_DBPROP_CHARSET);
+        aProps[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_CHARSET));
         aProps[1].Value <<= aCharSetStr;
 
         _rConnection = _rDrvMgr->getConnectionWithInfo( aConnUrl, aProps );
@@ -192,7 +192,7 @@ BOOL ScDocShell::MoveFile( const INetURLObject& rSourceObj, const INetURLObject&
         ::ucbhelper::Content aDestPath( aDestPathObj.GetMainURL(INetURLObject::NO_DECODE),
                             uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > () );
         uno::Reference< ::com::sun::star::ucb::XCommandInfo > xInfo = aDestPath.getCommands();
-        rtl::OUString aTransferName = rtl::OUString::createFromAscii( "transfer" );
+        rtl::OUString aTransferName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "transfer" ));
         if ( xInfo->hasCommandByName( aTransferName ) )
         {
             aDestPath.executeCommand( aTransferName, uno::makeAny(
@@ -225,7 +225,7 @@ BOOL ScDocShell::KillFile( const INetURLObject& rURL )
     {
         ::ucbhelper::Content aCnt( rURL.GetMainURL(INetURLObject::NO_DECODE),
                         uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > () );
-        aCnt.executeCommand( rtl::OUString::createFromAscii( "delete" ),
+        aCnt.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "delete" )),
                                 comphelper::makeBoolAny( sal_True ) );
     }
     catch( uno::Exception& )
@@ -333,7 +333,7 @@ ULONG ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet,
         ScProgress aProgress( this, ScGlobal::GetRscString( STR_LOAD_DOC ), nRowCount );
         uno::Reference<lang::XMultiServiceFactory> xFactory = comphelper::getProcessServiceFactory();
         uno::Reference<sdbc::XRowSet> xRowSet( xFactory->createInstance(
-                            rtl::OUString::createFromAscii( SC_SERVICE_ROWSET ) ),
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_ROWSET )) ),
                             uno::UNO_QUERY);
         ::utl::DisposableComponent aRowSetHelper(xRowSet);
         uno::Reference<beans::XPropertySet> xRowProp( xRowSet, uno::UNO_QUERY );
@@ -345,19 +345,19 @@ ULONG ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet,
 
         aAny <<= xConnection;
         xRowProp->setPropertyValue(
-                    rtl::OUString::createFromAscii(SC_DBPROP_ACTIVECONNECTION), aAny );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_ACTIVECONNECTION)), aAny );
 
         aAny <<= nType;
         xRowProp->setPropertyValue(
-                    rtl::OUString::createFromAscii(SC_DBPROP_COMMANDTYPE), aAny );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMANDTYPE)), aAny );
 
         aAny <<= rtl::OUString( aTabName );
         xRowProp->setPropertyValue(
-                    rtl::OUString::createFromAscii(SC_DBPROP_COMMAND), aAny );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMAND)), aAny );
 
         aAny <<= sal_False;
         xRowProp->setPropertyValue(
-                    rtl::OUString::createFromAscii(SC_DBPROP_PROPCHANGE_NOTIFY), aAny );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_PROPCHANGE_NOTIFY)), aAny );
 
         xRowSet->execute();
 
@@ -877,7 +877,7 @@ ULONG ScDocShell::DBaseExport( const String& rFullFileName, CharSet eCharSet, BO
         if (!xTableDesc.is()) return SCERR_EXPORT_CONNECT;
 
         aAny <<= rtl::OUString( aTabName );
-        xTableDesc->setPropertyValue( rtl::OUString::createFromAscii(SC_DBPROP_NAME), aAny );
+        xTableDesc->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_NAME)), aAny );
 
         // create columns
 
@@ -910,31 +910,26 @@ ULONG ScDocShell::DBaseExport( const String& rFullFileName, CharSet eCharSet, BO
             if (!xColumnDesc.is()) return SCERR_EXPORT_CONNECT;
 
             aAny <<= pColNames[nCol];
-            xColumnDesc->setPropertyValue( rtl::OUString::createFromAscii(SC_DBPROP_NAME), aAny );
+            xColumnDesc->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_NAME)), aAny );
 
             aAny <<= pColTypes[nCol];
-            xColumnDesc->setPropertyValue( rtl::OUString::createFromAscii(SC_DBPROP_TYPE), aAny );
+            xColumnDesc->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_TYPE)), aAny );
 
             aAny <<= pColLengths[nCol];
-            xColumnDesc->setPropertyValue( rtl::OUString::createFromAscii(SC_DBPROP_PRECISION), aAny );
+            xColumnDesc->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_PRECISION)), aAny );
 
             aAny <<= pColScales[nCol];
-            xColumnDesc->setPropertyValue( rtl::OUString::createFromAscii(SC_DBPROP_SCALE), aAny );
+            xColumnDesc->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_SCALE)), aAny );
 
             xColumnsAppend->appendByDescriptor( xColumnDesc );
         }
 
         xTablesAppend->appendByDescriptor( xTableDesc );
 
-        // re-open connection
-//      xConnection = xDrvMan->getConnectionWithInfo( aConnUrl, aProps );
-//      DBG_ASSERT( xConnection.is(), "can't get Connection" );
-//      if (!xConnection.is()) return SCERR_EXPORT_CONNECT;
-
         // get row set for writing
         uno::Reference<lang::XMultiServiceFactory> xFactory = comphelper::getProcessServiceFactory();
         uno::Reference<sdbc::XRowSet> xRowSet( xFactory->createInstance(
-                            rtl::OUString::createFromAscii( SC_SERVICE_ROWSET ) ),
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_SERVICE_ROWSET )) ),
                             uno::UNO_QUERY);
         ::utl::DisposableComponent aRowSetHelper(xRowSet);
         uno::Reference<beans::XPropertySet> xRowProp( xRowSet, uno::UNO_QUERY );
@@ -943,15 +938,15 @@ ULONG ScDocShell::DBaseExport( const String& rFullFileName, CharSet eCharSet, BO
 
         aAny <<= xConnection;
         xRowProp->setPropertyValue(
-                    rtl::OUString::createFromAscii(SC_DBPROP_ACTIVECONNECTION), aAny );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_ACTIVECONNECTION)), aAny );
 
         aAny <<= (sal_Int32) sdb::CommandType::TABLE;
         xRowProp->setPropertyValue(
-                    rtl::OUString::createFromAscii(SC_DBPROP_COMMANDTYPE), aAny );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMANDTYPE)), aAny );
 
         aAny <<= rtl::OUString( aTabName );
         xRowProp->setPropertyValue(
-                    rtl::OUString::createFromAscii(SC_DBPROP_COMMAND), aAny );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_DBPROP_COMMAND)), aAny );
 
         xRowSet->execute();
 
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index c0fc2fbfa215..47e2378ca36f 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1323,20 +1323,17 @@ static FormulaToken* lcl_convertToToken(ScBaseCell* pCell)
             static_cast<ScEditCell*>(pCell)->GetString(aStr);
             return new formula::FormulaStringToken(aStr);
         }
-        //break;
         case CELLTYPE_STRING:
         {
             String aStr;
             static_cast<ScStringCell*>(pCell)->GetString(aStr);
             return new formula::FormulaStringToken(aStr);
         }
-        //break;
         case CELLTYPE_VALUE:
         {
             double fVal = static_cast<ScValueCell*>(pCell)->GetValue();
             return new formula::FormulaDoubleToken(fVal);
         }
-        //break;
         case CELLTYPE_FORMULA:
         {
             ScFormulaCell* pFCell = static_cast<ScFormulaCell*>(pCell);
@@ -1355,7 +1352,6 @@ static FormulaToken* lcl_convertToToken(ScBaseCell* pCell)
                 return new formula::FormulaStringToken(aStr);
             }
         }
-        //break;
         default:
             DBG_ERROR("attempted to convert an unknown cell type.");
     }
@@ -2131,7 +2127,7 @@ SfxObjectShellRef ScExternalRefManager::loadSrcDocument(sal_uInt16 nFileId, Stri
     {
         // Generate a relative file path.
         INetURLObject aBaseURL(getOwnDocumentName());
-        aBaseURL.insertName(OUString::createFromAscii("content.xml"));
+        aBaseURL.insertName(OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml")));
 
         String aStr = URIHelper::simpleNormalizedMakeRelative(
             aBaseURL.GetMainURL(INetURLObject::NO_DECODE), aFile);
@@ -2235,7 +2231,7 @@ void ScExternalRefManager::SrcFileData::maybeCreateRealFileName(const String& rO
     // Formulate the absolute file path from the relative path.
     const String& rRelPath = maRelativeName;
     INetURLObject aBaseURL(rOwnDocName);
-    aBaseURL.insertName(OUString::createFromAscii("content.xml"));
+    aBaseURL.insertName(OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml")));
     bool bWasAbs = false;
     maRealFileName = aBaseURL.smartRel2Abs(rRelPath, bWasAbs).GetMainURL(INetURLObject::NO_DECODE);
 }
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 1e85d17bd741..7dba164ed5bb 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -2058,7 +2058,7 @@ ScFormatFilterPlugin &ScFormatFilter::Get()
     if ( aModule.loadRelative( &thisModule,
                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "scfilt" ) ) ) ) )
     {
-    oslGenericFunction fn = aModule.getFunctionSymbol( ::rtl::OUString::createFromAscii( "ScFilterCreate" ) );
+    oslGenericFunction fn = aModule.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScFilterCreate" )) );
     if (fn != NULL)
         plugin = reinterpret_cast<FilterFn>(fn)();
     }
diff --git a/sc/source/ui/docshell/makefile.mk b/sc/source/ui/docshell/makefile.mk
index 6776a0b7efdd..6736362d9565 100644
--- a/sc/source/ui/docshell/makefile.mk
+++ b/sc/source/ui/docshell/makefile.mk
@@ -66,43 +66,35 @@ CXXFILES = \
 
 
 SLOFILES =  \
-        $(SLO)$/docsh.obj	\
-        $(SLO)$/docsh2.obj	\
-        $(SLO)$/docsh3.obj	\
-        $(SLO)$/docsh4.obj   	\
-        $(SLO)$/docsh5.obj   	\
-        $(SLO)$/docsh6.obj   	\
-        $(SLO)$/docsh7.obj   	\
-        $(SLO)$/docsh8.obj   	\
-        $(SLO)$/externalrefmgr.obj \
-        $(SLO)$/tablink.obj   	\
-        $(SLO)$/arealink.obj   	\
-        $(SLO)$/dbdocfun.obj 	\
-        $(SLO)$/dbdocimp.obj 	\
-        $(SLO)$/impex.obj	\
-        $(SLO)$/docfunc.obj	\
-        $(SLO)$/olinefun.obj	\
-        $(SLO)$/servobj.obj	\
-        $(SLO)$/tpstat.obj	\
-        $(SLO)$/autostyl.obj	\
-        $(SLO)$/pagedata.obj \
+        $(EXCEPTIONSFILES) \
         $(SLO)$/hiranges.obj \
-        $(SLO)$/pntlock.obj \
-        $(SLO)$/sizedev.obj \
-        $(SLO)$/editable.obj \
-    $(SLO)$/macromgr.obj
+        $(SLO)$/pagedata.obj \
+        $(SLO)$/pntlock.obj
 
 
 EXCEPTIONSFILES= \
+        $(SLO)$/arealink.obj \
+        $(SLO)$/autostyl.obj \
+        $(SLO)$/dbdocfun.obj \
+        $(SLO)$/dbdocimp.obj \
+        $(SLO)$/docfunc.obj \
         $(SLO)$/docsh.obj \
-        $(SLO)$/docsh3.obj	\
+        $(SLO)$/docsh2.obj \
+        $(SLO)$/docsh3.obj \
         $(SLO)$/docsh4.obj \
+        $(SLO)$/docsh5.obj \
         $(SLO)$/docsh6.obj \
+        $(SLO)$/docsh7.obj \
         $(SLO)$/docsh8.obj \
+        $(SLO)$/editable.obj \
         $(SLO)$/externalrefmgr.obj \
-        $(SLO)$/dbdocimp.obj \
-        $(SLO)$/docfunc.obj \
-    $(SLO)$/macromgr.obj
+        $(SLO)$/impex.obj \
+        $(SLO)$/macromgr.obj \
+        $(SLO)$/olinefun.obj \
+        $(SLO)$/servobj.obj \
+        $(SLO)$/sizedev.obj \
+        $(SLO)$/tablink.obj \
+        $(SLO)$/tpstat.obj
 
 SRS1NAME=$(TARGET)
 SRC1FILES =  tpstat.src
@@ -133,7 +125,7 @@ LIB1OBJFILES =  \
         $(SLO)$/pntlock.obj \
         $(SLO)$/sizedev.obj \
         $(SLO)$/editable.obj \
-    $(SLO)$/macromgr.obj
+        $(SLO)$/macromgr.obj
 
 # --- Tagets -------------------------------------------------------
 
diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index f949b3ffb45c..40b3678762fe 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -404,7 +404,6 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
 
     //  aufraeumen
 
-//  pSrcShell->DoClose();
     aRef->DoClose();
 
     //  Undo
@@ -577,9 +576,6 @@ ScDocumentLoader::ScDocumentLoader( const String& rFileName,
 
 ScDocumentLoader::~ScDocumentLoader()
 {
-/*  if ( pDocShell )
-        pDocShell->DoClose();
-*/
     if ( aRef.Is() )
         aRef->DoClose();
     else if ( pMedium )
diff --git a/sc/source/ui/docshell/tpstat.src b/sc/source/ui/docshell/tpstat.src
index 7226da4642c3..3ee5b91a7b2e 100644
--- a/sc/source/ui/docshell/tpstat.src
+++ b/sc/source/ui/docshell/tpstat.src
@@ -77,36 +77,3 @@ TabPage RID_SCPAGE_STAT
         Text [ en-US ] = "Document: " ;
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index 23270038e419..6db7faf051a5 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -108,10 +108,10 @@ void ScDrawShell::GetHLinkState( SfxItemSet& rSet )             //  Hyperlink
             uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY );
             uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo();
 
-            rtl::OUString sPropButtonType  = rtl::OUString::createFromAscii( "ButtonType" );
-            rtl::OUString sPropTargetURL   = rtl::OUString::createFromAscii( "TargetURL" );
-            rtl::OUString sPropTargetFrame = rtl::OUString::createFromAscii( "TargetFrame" );
-            rtl::OUString sPropLabel       = rtl::OUString::createFromAscii( "Label" );
+            rtl::OUString sPropButtonType(RTL_CONSTASCII_USTRINGPARAM( "ButtonType" ));
+            rtl::OUString sPropTargetURL(RTL_CONSTASCII_USTRINGPARAM( "TargetURL" ));
+            rtl::OUString sPropTargetFrame(RTL_CONSTASCII_USTRINGPARAM( "TargetFrame" ));
+            rtl::OUString sPropLabel(RTL_CONSTASCII_USTRINGPARAM( "Label" ));
 
             if(xInfo->hasPropertyByName( sPropButtonType ))
             {
@@ -195,20 +195,16 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq )
                                 uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY );
                                 uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo();
 
-                                rtl::OUString sPropTargetURL =
-                                    rtl::OUString::createFromAscii( "TargetURL" );
+                                rtl::OUString sPropTargetURL(RTL_CONSTASCII_USTRINGPARAM( "TargetURL" ));
 
                                 // Darf man eine URL an dem Objekt setzen?
                                 if (xInfo->hasPropertyByName( sPropTargetURL ))
                                 {
                                     // Ja!
 
-                                    rtl::OUString sPropButtonType =
-                                        rtl::OUString::createFromAscii( "ButtonType" );
-                                    rtl::OUString sPropTargetFrame =
-                                        rtl::OUString::createFromAscii( "TargetFrame" );
-                                    rtl::OUString sPropLabel =
-                                        rtl::OUString::createFromAscii( "Label" );
+                                    rtl::OUString sPropButtonType(RTL_CONSTASCII_USTRINGPARAM( "ButtonType") );
+                                    rtl::OUString sPropTargetFrame(RTL_CONSTASCII_USTRINGPARAM( "TargetFrame" ));
+                                    rtl::OUString sPropLabel(RTL_CONSTASCII_USTRINGPARAM( "Label" ));
 
                                     uno::Any aAny;
                                     if ( xInfo->hasPropertyByName( sPropLabel ) )
diff --git a/sc/source/ui/drawfunc/drformsh.src b/sc/source/ui/drawfunc/drformsh.src
index 65e98eea7b2c..751c2ea86db5 100644
--- a/sc/source/ui/drawfunc/drformsh.src
+++ b/sc/source/ui/drawfunc/drformsh.src
@@ -216,35 +216,3 @@ Menu RID_POPUP_DRAWFORM
         ITEM_GROUP_MENU
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index 70342cc10e24..db719ce4d901 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -249,25 +249,6 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
     switch ( rKEvt.GetKeyCode().GetCode() )
     {
         case KEY_ESCAPE:
-
-    /* 18.12.95: TextShell beibehalten nicht mehr gewuenscht...
-     *
-     *          if ( pView->IsAction() )
-     *          {
-     *              pView->BrkAction();
-     *              pWindow->ReleaseMouse();
-     *              bReturn = TRUE;
-     *          }
-     *          else if ( pView->IsTextEdit() )
-     *          {
-     *              pView->EndTextEdit();
-     *              pView->SetCreateMode();
-     *              pViewShell->GetScDrawView()->InvalidateDrawTextAttrs();
-     *              bReturn = TRUE;
-     *          }
-     *          else
-     */
-
             if ( pViewShell->IsDrawTextShell() || aSfxRequest.GetSlot() == SID_DRAW_NOTEEDIT )
             {
                 // in normale Draw-Shell, wenn Objekt selektiert, sonst Zeichnen aus
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 89a483d736d5..c45ae623912d 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -193,16 +193,16 @@ void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScVie
 
             uno::Sequence< beans::PropertyValue > aArgs( 4 );
             aArgs[0] = beans::PropertyValue(
-                ::rtl::OUString::createFromAscii("CellRangeRepresentation"), -1,
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellRangeRepresentation")), -1,
                 uno::makeAny( aRangeString ), beans::PropertyState_DIRECT_VALUE );
             aArgs[1] = beans::PropertyValue(
-                ::rtl::OUString::createFromAscii("HasCategories"), -1,
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasCategories")), -1,
                 uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE );
             aArgs[2] = beans::PropertyValue(
-                ::rtl::OUString::createFromAscii("FirstCellAsLabel"), -1,
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstCellAsLabel")), -1,
                 uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE );
             aArgs[3] = beans::PropertyValue(
-                ::rtl::OUString::createFromAscii("DataRowSource"), -1,
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataRowSource")), -1,
                 uno::makeAny( eDataRowSource ), beans::PropertyState_DIRECT_VALUE );
             xReceiver->setArguments( aArgs );
 
@@ -312,7 +312,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie
                             uno::Reference < beans::XPropertySet > xSet( xObj->getComponent(), uno::UNO_QUERY );
                             if ( xSet.is() )
                             {
-                                xSet->setPropertyValue( ::rtl::OUString::createFromAscii("PluginURL"),
+                                xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginURL")),
                                         uno::makeAny( ::rtl::OUString( aURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) );
                             }
                         }
@@ -716,7 +716,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
                 {
                     uno::Reference< ui::dialogs::XExecutableDialog > xDialog(
                         xMCF->createInstanceWithContext(
-                            rtl::OUString::createFromAscii("com.sun.star.comp.chart2.WizardDialog")
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.chart2.WizardDialog"))
                             , xContext), uno::UNO_QUERY);
                     uno::Reference< lang::XInitialization > xInit( xDialog, uno::UNO_QUERY );
                     if( xChartModel.is() && xInit.is() )
@@ -726,10 +726,10 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
                         uno::Sequence<uno::Any> aSeq(2);
                         uno::Any* pArray = aSeq.getArray();
                         beans::PropertyValue aParam1;
-                        aParam1.Name = rtl::OUString::createFromAscii("ParentWindow");
+                        aParam1.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow"));
                         aParam1.Value <<= uno::makeAny(xDialogParentWindow);
                         beans::PropertyValue aParam2;
-                        aParam2.Name = rtl::OUString::createFromAscii("ChartModel");
+                        aParam2.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ChartModel"));
                         aParam2.Value <<= uno::makeAny(xChartModel);
                         pArray[0] <<= uno::makeAny(aParam1);
                         pArray[1] <<= uno::makeAny(aParam2);
@@ -743,7 +743,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
                             {
                                 //get dialog size:
                                 awt::Size aDialogAWTSize;
-                                if( xDialogProps->getPropertyValue( ::rtl::OUString::createFromAscii("Size") )
+                                if( xDialogProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size")) )
                                     >>= aDialogAWTSize )
                                 {
                                     Size aDialogSize( aDialogAWTSize.Width, aDialogAWTSize.Height );
@@ -751,12 +751,12 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
                                     {
                                         //calculate and set new position
                                         Point aDialogPos = pViewShell->GetChartDialogPos( aDialogSize, aRect );
-                                        xDialogProps->setPropertyValue( ::rtl::OUString::createFromAscii("Position"),
+                                        xDialogProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Position")),
                                             uno::makeAny( awt::Point(aDialogPos.getX(),aDialogPos.getY()) ) );
                                     }
                                 }
                                 //tell the dialog to unlock controller
-                                xDialogProps->setPropertyValue( ::rtl::OUString::createFromAscii("UnlockControllersOnExecute"),
+                                xDialogProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UnlockControllersOnExecute")),
                                             uno::makeAny( sal_True ) );
 
                             }
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index 1fdf75eabc2f..27bce1f384e5 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -220,7 +220,7 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
                            {
                                try
                                {
-                                   aCaller = xProps->getPropertyValue( rtl::OUString::createFromAscii("Name") );
+                                   aCaller = xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")) );
                                }
                                catch( uno::Exception& ) {}
                            }
diff --git a/sc/source/ui/drawfunc/makefile.mk b/sc/source/ui/drawfunc/makefile.mk
index cf69944d3a1a..41aa76331df5 100644
--- a/sc/source/ui/drawfunc/makefile.mk
+++ b/sc/source/ui/drawfunc/makefile.mk
@@ -43,40 +43,37 @@ SRC1FILES =  \
         drformsh.src
 
 SLOFILES =  \
-        $(SLO)$/fupoor.obj \
-        $(SLO)$/fumark.obj \
-        $(SLO)$/fudraw.obj \
-        $(SLO)$/fusel.obj \
-        $(SLO)$/fusel2.obj \
-        $(SLO)$/fuconstr.obj \
-        $(SLO)$/fuconrec.obj \
-        $(SLO)$/fuconarc.obj \
-        $(SLO)$/fuconuno.obj \
-        $(SLO)$/fuconpol.obj \
-        $(SLO)$/fuconcustomshape.obj \
-        $(SLO)$/fuins1.obj \
-        $(SLO)$/fuins2.obj \
-        $(SLO)$/futext.obj \
-        $(SLO)$/futext2.obj \
-        $(SLO)$/futext3.obj \
+        $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES= \
+        $(SLO)$/chartsh.obj \
         $(SLO)$/drawsh.obj \
         $(SLO)$/drawsh2.obj \
         $(SLO)$/drawsh4.obj \
         $(SLO)$/drawsh5.obj \
+        $(SLO)$/drformsh.obj \
         $(SLO)$/drtxtob.obj \
         $(SLO)$/drtxtob1.obj \
         $(SLO)$/drtxtob2.obj \
-        $(SLO)$/drformsh.obj \
-        $(SLO)$/oleobjsh.obj \
-        $(SLO)$/chartsh.obj  \
-        $(SLO)$/graphsh.obj	\
-        $(SLO)$/mediash.obj
-
-EXCEPTIONSFILES= \
-        $(SLO)$/fusel.obj \
+        $(SLO)$/fuconarc.obj \
+        $(SLO)$/fuconcustomshape.obj \
+        $(SLO)$/fuconpol.obj \
+        $(SLO)$/fuconrec.obj \
+        $(SLO)$/fuconstr.obj \
+        $(SLO)$/fuconuno.obj \
+        $(SLO)$/fudraw.obj \
+        $(SLO)$/fuins1.obj \
         $(SLO)$/fuins2.obj \
-        $(SLO)$/graphsh.obj	\
-        $(SLO)$/mediash.obj
+        $(SLO)$/fumark.obj \
+        $(SLO)$/fupoor.obj \
+        $(SLO)$/fusel.obj \
+        $(SLO)$/fusel2.obj \
+        $(SLO)$/futext.obj \
+        $(SLO)$/futext2.obj \
+        $(SLO)$/futext3.obj \
+        $(SLO)$/graphsh.obj \
+        $(SLO)$/mediash.obj \
+        $(SLO)$/oleobjsh.obj
 
 NOOPTFILES=\
     $(SLO)$/fusel.obj
diff --git a/sc/source/ui/formdlg/dwfunctr.hrc b/sc/source/ui/formdlg/dwfunctr.hrc
index 388fea28b7ca..a53c884583d2 100644
--- a/sc/source/ui/formdlg/dwfunctr.hrc
+++ b/sc/source/ui/formdlg/dwfunctr.hrc
@@ -31,7 +31,3 @@
 #define IMB_INSERT  1
 #define FI_FUNCDESC 1
 #define FT_SPLIT    2
-
-
-// ********************************************************************** EOF
-
diff --git a/sc/source/ui/formdlg/dwfunctr.src b/sc/source/ui/formdlg/dwfunctr.src
index 6f8a054dd6ff..46061a512955 100644
--- a/sc/source/ui/formdlg/dwfunctr.src
+++ b/sc/source/ui/formdlg/dwfunctr.src
@@ -27,6 +27,7 @@
  // include ---------------------------------------------------------------
 #include "sc.hrc"
 #include "dwfunctr.hrc"
+
  // pragma ----------------------------------------------------------------
 
  // RID_SVXDLG_CALCFUNC --------------------------------------------------
@@ -110,7 +111,7 @@ DockingWindow FID_FUNCTION_BOX
         {
             ImageBitmap = Bitmap
             {
-                File = "fx.bmp" ;
+                File = "fx.png";
             };
             MaskColor = STD_MASKCOLOR;
         };
@@ -120,36 +121,3 @@ DockingWindow FID_FUNCTION_BOX
     Text [ en-US ] = "Functions" ;
 };
  // ********************************************************************** EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/formdlg/formdlgs.src b/sc/source/ui/formdlg/formdlgs.src
index e3550030c74e..3d09f22ef985 100644
--- a/sc/source/ui/formdlg/formdlgs.src
+++ b/sc/source/ui/formdlg/formdlgs.src
@@ -26,4 +26,5 @@
  ************************************************************************/
 
 #include "sc.hrc"
+
  //---------------------------------------------------------------------------
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 0510d503762b..61ecbe066ca4 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -97,7 +97,6 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
     // title has to be from the view that opened the dialog,
     // even if it's not the current view
 
-    SfxObjectShell* pParentDoc = NULL;
     if ( pB )
     {
         SfxDispatcher* pMyDisp = pB->GetDispatcher();
@@ -109,14 +108,9 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
                 pScViewShell = PTR_CAST( ScTabViewShell, pMyViewFrm->GetViewShell() );
                 if( pScViewShell )
                     pScViewShell->UpdateInputHandler(TRUE);
-                pParentDoc = pMyViewFrm->GetObjectShell();
             }
         }
     }
-    //if ( !pParentDoc && pScViewShell )                    // use current only if above fails
-    //  pParentDoc = pScViewShell->GetObjectShell();
-    //if ( pParentDoc )
-    //  aDocName = pParentDoc->GetTitle();
 
     if ( pDoc == NULL )
         pDoc = pViewData->GetDocument();
@@ -209,7 +203,7 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
         pCell = new ScFormulaCell( pDoc, aCursorPos, rStrExp );
 
         Update(rStrExp);
-    } // if (!pData)
+    }
 
 }
 
diff --git a/sc/source/ui/formdlg/makefile.mk b/sc/source/ui/formdlg/makefile.mk
index 2574ca48f348..4440abaf314d 100644
--- a/sc/source/ui/formdlg/makefile.mk
+++ b/sc/source/ui/formdlg/makefile.mk
@@ -38,10 +38,13 @@ TARGET=formdlgs
 # --- Files --------------------------------------------------------
 
 SLOFILES =	\
-        $(SLO)$/formula.obj  \
-        $(SLO)$/formdata.obj  \
-        $(SLO)$/privsplt.obj	\
-        $(SLO)$/dwfunctr.obj
+        $(EXCEPTIONSFILES) \
+        $(SLO)$/formdata.obj
+
+EXCEPTIONSFILES = \
+        $(SLO)$/dwfunctr.obj \
+        $(SLO)$/formula.obj \
+        $(SLO)$/privsplt.obj
 
 SRS1NAME=$(TARGET)
 SRC1FILES =	\
diff --git a/sc/source/ui/inc/acredlin.hrc b/sc/source/ui/inc/acredlin.hrc
index b21676ee6ae9..54ad490291af 100644
--- a/sc/source/ui/inc/acredlin.hrc
+++ b/sc/source/ui/inc/acredlin.hrc
@@ -30,17 +30,15 @@
 #define BTN_OK          1
 #define BTN_CANCEL      2
 #define BTN_HELP        5
-//
+
 #define CTR_REDLINING   10
 #define TP_FILTER       11
 #define TP_VIEW         12
 
-
 #define FT_ASSIGN       14
 #define ED_ASSIGN       15
 #define RB_ASSIGN       16
 
-
 #define STR_INSERT_COLS  20
 #define STR_INSERT_ROWS 21
 #define STR_INSERT_TABS 22
@@ -57,6 +55,7 @@
 #define STR_CHILD_CONTENT       33
 #define STR_CHILD_ORGCONTENT    34
 #define STR_EMPTY               35
+
 // Bitmaps
 #define BMP_STR_CLOSE       41
 #define BMP_STR_OPEN        42
@@ -70,6 +69,3 @@
 #define SC_SORT_AUTHOR      53
 #define SC_SORT_DATE        54
 #define SC_SORT_COMMENT     55
-
-//
-
diff --git a/sc/source/ui/inc/attrdlg.hrc b/sc/source/ui/inc/attrdlg.hrc
index f43c1cb30b86..d048e302f062 100644
--- a/sc/source/ui/inc/attrdlg.hrc
+++ b/sc/source/ui/inc/attrdlg.hrc
@@ -47,5 +47,3 @@
 #define BTN_HIDE_PRINT          6
 #define FT_HINT2                7
 #define FL_PRINT                8
-
-
diff --git a/sc/source/ui/inc/condfrmt.hrc b/sc/source/ui/inc/condfrmt.hrc
index 099d82b2fa85..223e2f8d3918 100644
--- a/sc/source/ui/inc/condfrmt.hrc
+++ b/sc/source/ui/inc/condfrmt.hrc
@@ -70,4 +70,3 @@
 #define BTN_COND1_NEW       34
 #define BTN_COND2_NEW       35
 #define BTN_COND3_NEW       36
-
diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx
index 952215ffbdd6..03924cc998cf 100644
--- a/sc/source/ui/inc/content.hxx
+++ b/sc/source/ui/inc/content.hxx
@@ -61,7 +61,6 @@ class ScContentTree : public SvTreeListBox
 {
     ScNavigatorDlg*     pParentWindow;
     ImageList           aEntryImages;
-    ImageList           aHCEntryImages;
     SvLBoxEntry*        pRootNodes[SC_CONTENT_COUNT];
     USHORT              nRootType;          // als Root eingestellt
     String              aManualDoc;         // im Navigator umgeschaltet (Title)
diff --git a/sc/source/ui/inc/crnrdlg.hrc b/sc/source/ui/inc/crnrdlg.hrc
index 1d27531f9bc1..7467b398d5fb 100644
--- a/sc/source/ui/inc/crnrdlg.hrc
+++ b/sc/source/ui/inc/crnrdlg.hrc
@@ -32,9 +32,9 @@
 #define BTN_ADD         3
 #define BTN_REMOVE      4
 #define BTN_HELP        5
-//
+
 #define LB_RANGE        11
-//
+
 #define FL_ASSIGN       12
 #define ED_AREA         13
 #define RB_AREA         14
@@ -43,4 +43,3 @@
 #define ED_DATA         17
 #define RB_DATA         18
 #define FT_DATA_LABEL   19
-//
diff --git a/sc/source/ui/inc/dbnamdlg.hrc b/sc/source/ui/inc/dbnamdlg.hrc
index fd0205e3bbed..ab3e51cbf1b2 100644
--- a/sc/source/ui/inc/dbnamdlg.hrc
+++ b/sc/source/ui/inc/dbnamdlg.hrc
@@ -48,4 +48,3 @@
 #define STR_MODIFY      31
 #define STR_DB_INVALID  32
 #define BTN_MORE        33
-
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index e36c521ee5b5..d360750f1bbb 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -180,8 +180,8 @@ public:
     BOOL            UnmergeCells( const ScRange& rRange, BOOL bRecord, BOOL bApi );
     bool            UnmergeCells( const ScCellMergeOption& rOption, BOOL bRecord, BOOL bApi );
 
-    BOOL            SetNewRangeNames( ScRangeName* pNewRanges, BOOL bApi );     // takes ownership of pNewRanges
-    BOOL            ModifyRangeNames( const ScRangeName& rNewRanges, BOOL bApi );
+    bool            SetNewRangeNames( ScRangeName* pNewRanges, bool bModifyDoc = true );     // takes ownership of pNewRanges
+    bool            ModifyRangeNames( const ScRangeName& rNewRanges );
 
     BOOL            CreateNames( const ScRange& rRange, USHORT nFlags, BOOL bApi );
     BOOL            InsertNameList( const ScAddress& rStartPos, BOOL bApi );
diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx
index 408cbe4668b2..570280743f04 100644
--- a/sc/source/ui/inc/drawview.hxx
+++ b/sc/source/ui/inc/drawview.hxx
@@ -42,15 +42,14 @@ class ScDrawObjData;
 class ScDrawView: public FmFormView
 {
     ScViewData*             pViewData;
-    OutputDevice*           pDev;                   //! noetig ?
+    OutputDevice*           pDev;                   //! needed ?
     ScDocument*             pDoc;
     SCTAB                   nTab;
-    Fraction                aScaleX;                // Faktor fuer Drawing-MapMode
+    Fraction                aScaleX;                // Factor for Drawing-MapMode
     Fraction                aScaleY;
     SdrDropMarkerOverlay*   pDropMarker;
     SdrObject*              pDropMarkObj;
     BOOL                    bInConstruct;
-    //HMHBOOL                   bDisableHdl;
 
     void            Construct();
     void            UpdateBrowser();
@@ -76,12 +75,8 @@ public:
 
     virtual void    DeleteMarked();
 
-    void            DrawMarks( OutputDevice* pOut ) const;
-
     void            MarkDropObj( SdrObject* pObj );
 
-    //HMHBOOL           IsDisableHdl() const    { return bDisableHdl; }
-
     void            SetMarkedToLayer( BYTE nLayerNo );
 
     void            InvalidateAttribs();
@@ -139,7 +134,7 @@ public:
     /** Unlocks the internal layer that contains caption objects of cell notes. */
     inline void     UnlockInternalLayer() { LockInternalLayer( false ); }
 
-    SdrEndTextEditKind  ScEndTextEdit();    // ruft SetDrawTextUndo(0)
+    SdrEndTextEditKind  ScEndTextEdit();    // calls SetDrawTextUndo(0)
     ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > CopyToTransferable();
 };
 
diff --git a/sc/source/ui/inc/drtxtob.hxx b/sc/source/ui/inc/drtxtob.hxx
index d159ab0ad669..4baea1857e55 100644
--- a/sc/source/ui/inc/drtxtob.hxx
+++ b/sc/source/ui/inc/drtxtob.hxx
@@ -29,9 +29,6 @@
 #ifndef SC_DRTXTOB_HXX
 #define SC_DRTXTOB_HXX
 
-#ifndef _SFX_HXX
-#endif
-
 #include <sfx2/shell.hxx>
 #include <sfx2/module.hxx>
 #include <tools/link.hxx>
diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx
index de256909fcf7..7690f860be41 100644
--- a/sc/source/ui/inc/drwtrans.hxx
+++ b/sc/source/ui/inc/drwtrans.hxx
@@ -51,8 +51,6 @@ private:
     SdrModel*                       pModel;
     TransferableDataHelper          aOleData;
     TransferableObjectDescriptor    aObjDesc;
-//REMOVE        SvEmbeddedObjectRef             aDocShellRef;
-//REMOVE        SvEmbeddedObjectRef             aDrawPersistRef;
     SfxObjectShellRef               aDocShellRef;
     SfxObjectShellRef               aDrawPersistRef;
 
@@ -72,7 +70,6 @@ private:
 
 
     void                InitDocShell();
-//REMOVE        SvInPlaceObjectRef  GetSingleObject();
     SdrOle2Obj* GetSingleObject();
 
 public:
diff --git a/sc/source/ui/inc/filter.hrc b/sc/source/ui/inc/filter.hrc
index 508c5af9aab5..d973bb15180b 100644
--- a/sc/source/ui/inc/filter.hrc
+++ b/sc/source/ui/inc/filter.hrc
@@ -79,4 +79,3 @@
 #define LB_CRITERIA_AREA    51
 #define ED_CRITERIA_AREA    52
 #define RB_CRITERIA_AREA    53
-
diff --git a/sc/source/ui/inc/fusel.hxx b/sc/source/ui/inc/fusel.hxx
index 20887a6d151a..7f0783537624 100644
--- a/sc/source/ui/inc/fusel.hxx
+++ b/sc/source/ui/inc/fusel.hxx
@@ -29,9 +29,6 @@
 #ifndef SC_FUSEL_HXX
 #define SC_FUSEL_HXX
 
-#ifndef _SV_HXX
-#endif
-
 #include "fudraw.hxx"
 
 //class Outliner;
diff --git a/sc/source/ui/inc/highred.hrc b/sc/source/ui/inc/highred.hrc
index 426c9ba29ee2..b6a4a1a4023c 100644
--- a/sc/source/ui/inc/highred.hrc
+++ b/sc/source/ui/inc/highred.hrc
@@ -34,7 +34,6 @@
 #define CB_HIGHLIGHT_ACCEPT 6
 #define CB_HIGHLIGHT_REJECT 7
 
-//
 #define FL_FILTER           10
 #define TP_FILTER           11
 #define TP_VIEW             12
@@ -44,12 +43,6 @@
 #define ED_ASSIGN           15
 #define RB_ASSIGN           16
 
-
-
-
-
-
-
 #define STR_INSERT_COLS  20
 #define STR_INSERT_ROWS 21
 #define STR_INSERT_TABS 22
@@ -65,7 +58,3 @@
 #define BMP_STR_OPEN        32
 #define BMP_STR_END         33
 #define BMP_STR_ERROR       34
-
-
-//
-
diff --git a/sc/source/ui/inc/instbdlg.hrc b/sc/source/ui/inc/instbdlg.hrc
index 08bff85388dd..dbe7e98e342a 100644
--- a/sc/source/ui/inc/instbdlg.hrc
+++ b/sc/source/ui/inc/instbdlg.hrc
@@ -27,8 +27,6 @@
 
 #include <sc.hrc> // -> RID_SCDLG_INSERT_TABLE
 
-//#define RID_SCDLG_INSERT_TABLE 300
-
 #define BTN_OK                  1
 #define BTN_CANCEL              2
 #define BTN_HELP                3
@@ -48,5 +46,3 @@
 #define BTN_BROWSE              28
 #define CB_LINK                 29
 #define FT_PATH                 30
-
-
diff --git a/sc/source/ui/inc/linkarea.hrc b/sc/source/ui/inc/linkarea.hrc
index bc906fdb14ad..401739474acb 100644
--- a/sc/source/ui/inc/linkarea.hrc
+++ b/sc/source/ui/inc/linkarea.hrc
@@ -39,4 +39,3 @@
 #define BTN_RELOAD              10
 #define NF_DELAY                11
 #define FT_SECONDS              12
-
diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx
index 513cd6d19175..8c37f0a5685d 100644
--- a/sc/source/ui/inc/linkarea.hxx
+++ b/sc/source/ui/inc/linkarea.hxx
@@ -39,11 +39,6 @@
 #include <svtools/stdctrl.hxx>
 #include <svtools/inettbc.hxx>
 
-//REMOVE    #ifndef SO2_DECL_SVEMBEDDEDOBJECT_DEFINED
-//REMOVE    #define SO2_DECL_SVEMBEDDEDOBJECT_DEFINED
-//REMOVE    SO2_DECL_REF(SvEmbeddedObject)
-//REMOVE    #endif
-
 namespace sfx2 { class DocumentInserter; }
 namespace sfx2 { class FileDialogHelper; }
 
diff --git a/sc/source/ui/inc/miscdlgs.hrc b/sc/source/ui/inc/miscdlgs.hrc
index 00b1658849d6..2873dffbb844 100644
--- a/sc/source/ui/inc/miscdlgs.hrc
+++ b/sc/source/ui/inc/miscdlgs.hrc
@@ -36,20 +36,6 @@
                     // -> RID_SCDLG_FILLSERIES
                     // -> RID_SCDLG_AUTOFORMAT
 
-// Fuer den DesignEditor:
-/*
-#define RID_SCDLG_DELCELL 1256
-#define RID_SCDLG_INSCELL 1257
-#define RID_SCDLG_DELCONT 1258
-#define RID_SCDLG_INSCONT 1259
-#define RID_SCDLG_MOVETAB 1260
-#define RID_SCDLG_STRINPUT 1261
-#define RID_SCDLG_MTRINPUT 1262
-#define RID_SCDLG_SELENTRY 1263
-#define RID_SCDLG_FILLSERIES 1264
-#define RID_SCDLG_AUTOFORMAT 1255
-*/
-
 // allgemein
 #define BTN_OK          100
 #define BTN_CANCEL      102
@@ -185,4 +171,3 @@
 // Tab Bg Color
 #define TAB_BG_COLOR_CT_BORDER 1
 #define TAB_BG_COLOR_SET_BGDCOLOR 2
-
diff --git a/sc/source/ui/inc/namedlg.hrc b/sc/source/ui/inc/namedlg.hrc
index b2eec6879ec3..0d49fe8c3f60 100644
--- a/sc/source/ui/inc/namedlg.hrc
+++ b/sc/source/ui/inc/namedlg.hrc
@@ -33,20 +33,19 @@
 #define BTN_REMOVE      4
 #define BTN_HELP        5
 #define BTN_MORE        6
-//
+
 #define FL_NAME         11
 #define ED_NAME         12
 #define FL_ASSIGN       13
 #define ED_ASSIGN       15
 #define RB_ASSIGN       16
-//
+
 #define STR_ADD         21
 #define STR_MODIFY      22
 #define STR_INVALIDSYMBOL 23
-//
+
 #define BTN_CRITERIA    31
 #define BTN_PRINTAREA   32
 #define BTN_COLHEADER   33
 #define BTN_ROWHEADER   34
 #define FL_TYPE         35
-
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index 6b804589e145..7d3559e3de9b 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -244,7 +244,6 @@ private:
     SfxBindings&        rBindings;      // must be first member
 
     ImageList           aCmdImageList;  // must be before aTbxCmd
-    ImageList           aCmdImageListH;
     FixedInfo           aFtCol;
     ColumnEdit          aEdCol;
     FixedInfo           aFtRow;
diff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrc
index e03f3e807037..9ac8213cf621 100644
--- a/sc/source/ui/inc/optdlg.hrc
+++ b/sc/source/ui/inc/optdlg.hrc
@@ -109,19 +109,19 @@
 
 // TP_LCONTENT
 
-#define GB_DISPLAY      20
-#define CB_FORMULA              21
-#define CB_NIL                  22
+#define GB_DISPLAY          20
+#define CB_FORMULA          21
+#define CB_NIL              22
 #define CB_ANNOT            23
 #define CB_VALUE            24
 #define CB_ANCHOR           25
 #define GB_OBJECT           26
 #define FT_OBJGRF           27
 #define LB_OBJGRF           28
-#define FT_DIAGRAM              29
-#define LB_DIAGRAM              30
-#define FT_DRAW                 31
-#define LB_DRAW                 32
+#define FT_DIAGRAM          29
+#define LB_DIAGRAM          30
+#define FT_DRAW             31
+#define LB_DRAW             32
 #define CB_CLIP             33
 #define GB_ZOOM             34
 #define CB_SYNCZOOM         35
@@ -162,9 +162,8 @@
 #define FL_SEPARATOR1   71
 #define FL_SEPARATOR2   72
 #define FL_SEPARATOR    73
-#define FL_H_SEPARATOR  74
-// TP_INPUT
 
+// TP_INPUT
 #define GB_OPTIONS      70
 #define CB_ALIGN        71
 #define LB_ALIGN        72
diff --git a/sc/source/ui/inc/optload.hrc b/sc/source/ui/inc/optload.hrc
index 992bb8c737e4..c090c64dc136 100644
--- a/sc/source/ui/inc/optload.hrc
+++ b/sc/source/ui/inc/optload.hrc
@@ -36,5 +36,3 @@
 #define CB_AUTO_UPDATE_FIELDS   8
 #define CB_AUTO_UPDATE_CHARTS   9
 #define FT_UPDATE_LINKS         10
-
-
diff --git a/sc/source/ui/inc/optsolver.hrc b/sc/source/ui/inc/optsolver.hrc
index 9df8eea1d7f4..5ed7b8560060 100644
--- a/sc/source/ui/inc/optsolver.hrc
+++ b/sc/source/ui/inc/optsolver.hrc
@@ -91,8 +91,5 @@
 #define BTN_OK                  5
 #define BTN_CANCEL              6
 
-#define IMG_DEL_H               1
-
 #define STR_INVALIDINPUT        1
 #define STR_INVALIDCONDITION    2
-
diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx
index 64df881086db..6a57c9229eea 100644
--- a/sc/source/ui/inc/pfiltdlg.hxx
+++ b/sc/source/ui/inc/pfiltdlg.hxx
@@ -29,9 +29,6 @@
 #ifndef SC_PFILTDLG_HXX
 #define SC_PFILTDLG_HXX
 
-#ifndef _SV_HXX
-#endif
-
 #include <vcl/morebtn.hxx>
 #include <svtools/stdctrl.hxx>
 #include <vcl/button.hxx>
diff --git a/sc/source/ui/inc/protectiondlg.hrc b/sc/source/ui/inc/protectiondlg.hrc
index 52e57040922c..2f7cc5ee21a8 100644
--- a/sc/source/ui/inc/protectiondlg.hrc
+++ b/sc/source/ui/inc/protectiondlg.hrc
@@ -40,5 +40,5 @@
 #define FT_OPTIONS             10
 #define CLB_OPTIONS            11
 
-#define ST_SELECT_LOCKED_CELLS          50
-#define ST_SELECT_UNLOCKED_CELLS        51
+#define ST_SELECT_PROTECTED_CELLS          50
+#define ST_SELECT_UNPROTECTED_CELLS        51
diff --git a/sc/source/ui/inc/simpref.hrc b/sc/source/ui/inc/simpref.hrc
index d6fb6d4412eb..c7dbb3ebdea9 100644
--- a/sc/source/ui/inc/simpref.hrc
+++ b/sc/source/ui/inc/simpref.hrc
@@ -34,4 +34,3 @@
 #define FT_ASSIGN       10
 #define ED_ASSIGN       11
 #define RB_ASSIGN       12
-
diff --git a/sc/source/ui/inc/solveroptions.hrc b/sc/source/ui/inc/solveroptions.hrc
index e3be150ccd1b..3c543e61a8f5 100644
--- a/sc/source/ui/inc/solveroptions.hrc
+++ b/sc/source/ui/inc/solveroptions.hrc
@@ -44,4 +44,3 @@
 #define NF_VALUE                1
 
 #define ED_VALUE                1
-
diff --git a/sc/source/ui/inc/solvrdlg.hrc b/sc/source/ui/inc/solvrdlg.hrc
index 7139abd2a5f6..ab40fd3f72a2 100644
--- a/sc/source/ui/inc/solvrdlg.hrc
+++ b/sc/source/ui/inc/solvrdlg.hrc
@@ -43,4 +43,3 @@
 #define STR_INVALIDVAR          2
 #define STR_INVALIDFORM         3
 #define STR_NOFORMULA           4
-
diff --git a/sc/source/ui/inc/sortdlg.hrc b/sc/source/ui/inc/sortdlg.hrc
index d079ea560779..04cff7374df5 100644
--- a/sc/source/ui/inc/sortdlg.hrc
+++ b/sc/source/ui/inc/sortdlg.hrc
@@ -34,13 +34,6 @@
                     // -> SCSTR_UNDEFINED
                     // -> SCSTR_FIELD
 
-/*
-#define RID_SCDLG_SORT          256
-#define RID_SCPAGE_SORT_FIELDS  257
-#define RID_SCPAGE_SORT_OPTIONS 258
-#define RID_SCDLG_SORT_WARNING
-*/
-
 #define TP_FIELDS           1
 #define TP_OPTIONS          2
 
@@ -63,8 +56,6 @@
 #define LB_SORT_USER        2
 #define LB_OUTAREA          3
 #define ED_OUTAREA          4
-//#define FT_AREA_LABEL       5
-//#define FT_AREA             6
 #define BTN_SORT_USER       7
 #define BTN_CASESENSITIVE   8
 #define BTN_LABEL           9
@@ -86,6 +77,3 @@
 #define BTN_EXTSORT         3
 #define BTN_CURSORT         4
 #define BTN_CANCEL          5
-
-
-
diff --git a/sc/source/ui/inc/styledlg.hxx b/sc/source/ui/inc/styledlg.hxx
index ed39fbf51b2b..6114da813f03 100644
--- a/sc/source/ui/inc/styledlg.hxx
+++ b/sc/source/ui/inc/styledlg.hxx
@@ -29,9 +29,6 @@
 #ifndef SC_STYLEDLG_HXX
 #define SC_STYLEDLG_HXX
 
-#ifndef _SFX_HXX
-#endif
-
 #include <sfx2/styledlg.hxx>
 
 //==================================================================
diff --git a/sc/source/ui/inc/subtdlg.hrc b/sc/source/ui/inc/subtdlg.hrc
index 66c63df48953..b0680ece924b 100644
--- a/sc/source/ui/inc/subtdlg.hrc
+++ b/sc/source/ui/inc/subtdlg.hrc
@@ -27,12 +27,6 @@
 
 #include "sc.hrc"
 
-/*
-#define RID_SCDLG_SUBTOTALS 256
-#define RID_SCPAGE_SUBT_GROUP 256
-#define RID_SCPAGE_SUBT_OPTIONS 257
-*/
-
 // TabDialog
 #define BTN_REMOVE          1
 #define PAGE_GROUP1         2
@@ -60,5 +54,3 @@
 #define BTN_FORMATS         33
 #define BTN_USERDEF         34
 #define LB_USERDEF          35
-
-
diff --git a/sc/source/ui/inc/subtdlg.hxx b/sc/source/ui/inc/subtdlg.hxx
index 8cff085ae0f0..d2ca8b9e8d37 100644
--- a/sc/source/ui/inc/subtdlg.hxx
+++ b/sc/source/ui/inc/subtdlg.hxx
@@ -29,9 +29,6 @@
 #ifndef SC_SUBTDLG_HXX
 #define SC_SUBTDLG_HXX
 
-#ifndef _SFX_HXX
-#endif
-
 #include <sfx2/tabdlg.hxx>
 
 #include "scui_def.hxx"
diff --git a/sc/source/ui/inc/tabopdlg.hrc b/sc/source/ui/inc/tabopdlg.hrc
index 5ae127b63e73..633c69881776 100644
--- a/sc/source/ui/inc/tabopdlg.hrc
+++ b/sc/source/ui/inc/tabopdlg.hrc
@@ -46,5 +46,3 @@
 #define STR_WRONGROWCOL         4
 #define STR_NOCOLFORMULA        5
 #define STR_NOROWFORMULA        6
-
-
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 3bfc8096c3a5..f727334953a4 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -30,11 +30,6 @@
 
 #include <vcl/scrbar.hxx>
 
-//REMOVE    #ifndef SO2_DECL_SVINPLACECLIENT_DEFINED
-//REMOVE    #define SO2_DECL_SVINPLACECLIENT_DEFINED
-//REMOVE    SO2_DECL_REF(SvInPlaceClient)
-//REMOVE    #endif
-
 #include <sfx2/ipclient.hxx>
 
 #include "viewutil.hxx"
diff --git a/sc/source/ui/inc/tbinsert.hrc b/sc/source/ui/inc/tbinsert.hrc
index 44c0d295cfc6..78ff1ca0ec84 100644
--- a/sc/source/ui/inc/tbinsert.hrc
+++ b/sc/source/ui/inc/tbinsert.hrc
@@ -28,5 +28,3 @@
 #define RID_TOOLBOX_INSERT      1
 #define RID_TOOLBOX_INSCELLS    2
 #define RID_TOOLBOX_INSOBJ      3
-
-
diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx
index 12e12c8750b8..608670181f46 100644
--- a/sc/source/ui/inc/tpcalc.hxx
+++ b/sc/source/ui/inc/tpcalc.hxx
@@ -71,7 +71,6 @@ private:
     RadioButton     aBtnDateSc10;
     RadioButton     aBtnDate1904;
 
-    FixedLine       aHSeparatorFL;
     CheckBox        aBtnCase;
     CheckBox        aBtnCalc;
     CheckBox        aBtnMatch;
diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx
index 007fb3f795c1..b1b988811d6e 100644
--- a/sc/source/ui/inc/tptable.hxx
+++ b/sc/source/ui/inc/tptable.hxx
@@ -78,8 +78,6 @@ private:
     FixedImage      aBmpPageDir;
     Image           aImgLeftRight;
     Image           aImgTopDown;
-    Image           aImgLeftRightHC;
-    Image           aImgTopDownHC;
     CheckBox        aBtnPageNo;
     NumericField    aEdPageNo;
 
diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx
index 04a2eac1df29..5940d806b43c 100644
--- a/sc/source/ui/inc/transobj.hxx
+++ b/sc/source/ui/inc/transobj.hxx
@@ -53,8 +53,6 @@ private:
     SCROW                           nNonFiltered;       // non-filtered rows
     TransferableDataHelper          aOleData;
     TransferableObjectDescriptor    aObjDesc;
-//REMOVE        SvEmbeddedObjectRef             aDocShellRef;
-//REMOVE        SvEmbeddedObjectRef             aDrawPersistRef;
     SfxObjectShellRef               aDocShellRef;
     SfxObjectShellRef               aDrawPersistRef;
     com::sun::star::uno::Reference<com::sun::star::sheet::XSheetCellRanges> xDragSourceRanges;
diff --git a/sc/source/ui/inc/validate.hrc b/sc/source/ui/inc/validate.hrc
index 45e5dda39c2d..bde827c84e00 100644
--- a/sc/source/ui/inc/validate.hrc
+++ b/sc/source/ui/inc/validate.hrc
@@ -58,9 +58,7 @@
 #define CB_SORTLIST             28
 #define EDT_LIST                29
 #define FT_SOURCEHINT           30
-//<!--Added by PengYunQuan for Validity Cell Range Picker
 #define RB_VALIDITY_REF         88
-//-->Added by PengYunQuan for Validity Cell Range Picker
 
 /*  Position indexes for "Allow" list box.
     They do not map directly to ScValidationMode and can safely be modified to
@@ -85,4 +83,3 @@
 #define SC_VALIDDLG_DATA_NOTEQUAL   5
 #define SC_VALIDDLG_DATA_BETWEEN    6
 #define SC_VALIDDLG_DATA_NOTBETWEEN 7
-
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index ce6473c2b068..768393dc7f46 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -142,7 +142,6 @@ ScAcceptChgDlg::ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP
         aStrEmpty               ( ScResId( STR_EMPTY        ))
 {
     FreeResource();
-//  bScAcceptChgDlgIsDead=FALSE;
     bNoSelection=FALSE;
     bNeedsUpdate=FALSE;
     bIgnoreMsg=FALSE;
@@ -202,7 +201,6 @@ ScAcceptChgDlg::ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP
 }
 ScAcceptChgDlg::~ScAcceptChgDlg()
 {
-//  bScAcceptChgDlgIsDead=TRUE;
     ClearView();
     ScChangeTrack* pChanges=pDoc->GetChangeTrack();
 
@@ -985,7 +983,6 @@ IMPL_LINK( ScAcceptChgDlg, RefHandle, SvxTPFilter*, EMPTYARG )
 
     if(pWnd!=NULL)
     {
-//      bSimpleRefDlgStarted=TRUE;
         USHORT nAcceptId=ScAcceptChgDlgWrapper::GetChildWindowId();
         pViewFrm->ShowChildWindow(nAcceptId,FALSE);
         pWnd->SetCloseHdl(LINK( this, ScAcceptChgDlg,RefInfoHandle));
@@ -1004,7 +1001,6 @@ IMPL_LINK( ScAcceptChgDlg, RefInfoHandle, String*, pResult)
 {
     USHORT nId;
 
-//  bSimpleRefDlgStarted=FALSE;
     ScSimpleRefDlgWrapper::SetAutoReOpen(TRUE);
 
     SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame();
@@ -1763,8 +1759,6 @@ void ScAcceptChgDlg::UpdateEntrys(ScChangeTrack* pChgTrack, ULONG nStartAction,U
 
 IMPL_LINK( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack*, pChgTrack)
 {
-//  if(bScAcceptChgDlgIsDead) return 0;
-
     ScChangeTrackMsgQueue& aMsgQueue= pChgTrack->GetMsgQueue();
 
     ScChangeTrackMsgInfo* pTrackInfo=aMsgQueue.Get();
diff --git a/sc/source/ui/miscdlgs/acredlin.src b/sc/source/ui/miscdlgs/acredlin.src
index 4baa9f3d388c..07ae0398134f 100644
--- a/sc/source/ui/miscdlgs/acredlin.src
+++ b/sc/source/ui/miscdlgs/acredlin.src
@@ -26,6 +26,7 @@
  ************************************************************************/
 
 #include "acredlin.hrc"
+
 ModelessDialog RID_SCDLG_CHANGES
 {
     OutputSize = TRUE ;
@@ -140,22 +141,23 @@ ModelessDialog RID_SCDLG_CHANGES
     };
     Bitmap BMP_STR_CLOSE
     {
-        File = "dir-clos.bmp" ;
+        File = "dir-clos.png" ;
     };
     Bitmap BMP_STR_OPEN
     {
-        File = "dir-open.bmp" ;
+        File = "dir-open.png" ;
     };
     Bitmap BMP_STR_END
     {
-        File = "basobj2.bmp" ;
+        File = "basobj2.png" ;
     };
     Bitmap BMP_STR_ERROR
     {
-        File = "basbrk.bmp" ;
+        File = "basbrk.png" ;
     };
     Text [ en-US ] = "Accept or Reject Changes" ;
 };
+
 Menu RID_POPUP_CHANGES
 {
     ItemList =
@@ -215,44 +217,3 @@ Menu RID_POPUP_CHANGES
         };
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 0c46284c77d7..5f2dea8b187a 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -304,8 +304,6 @@ void ScFormulaReferenceHelper::ReleaseFocus( formula::RefEdit* pEdit, formula::R
     if( !pRefEdit && pEdit )
     {
         m_pDlg->RefInputStart( pEdit, pButton );
-//        if( pRefEdit )
-//            pRefEdit->SilentGrabFocus();
     }
 
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
@@ -488,18 +486,15 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula::
         // Fenstertitel anpassen
         m_pWindow->SetText( MnemonicGenerator::EraseAllMnemonicChars( sNewDialogText ) );
 
-//        if ( pButton )      // ueber den Button: Enter und Escape abfangen
-//        {
-            if (!pAccel.get())
-            {
-                pAccel.reset( new Accelerator );
-                pAccel->InsertItem( 1, KeyCode( KEY_RETURN ) );
-                pAccel->InsertItem( 2, KeyCode( KEY_ESCAPE ) );
-                pAccel->SetSelectHdl( LINK( this, ScFormulaReferenceHelper, AccelSelectHdl ) );
-            }
-            Application::InsertAccel( pAccel.get() );
-            bAccInserted = TRUE;
-//        }
+        if (!pAccel.get())
+        {
+            pAccel.reset( new Accelerator );
+            pAccel->InsertItem( 1, KeyCode( KEY_RETURN ) );
+            pAccel->InsertItem( 2, KeyCode( KEY_ESCAPE ) );
+            pAccel->SetSelectHdl( LINK( this, ScFormulaReferenceHelper, AccelSelectHdl ) );
+        }
+        Application::InsertAccel( pAccel.get() );
+        bAccInserted = TRUE;
     }
 }
 // -----------------------------------------------------------------------------
@@ -706,7 +701,6 @@ bool ScRefHandler::EnterRefMode()
     if( m_bInRefMode ) return false;
 
     SC_MOD()->InputEnterHandler();
-//    ScTabViewShell* pScViewShell = ScTabViewShell::GetActiveViewShell();
 
     ScTabViewShell* pScViewShell = NULL;
 
@@ -784,15 +778,6 @@ bool ScRefHandler::LeaveRefMode()
 
 //----------------------------------------------------------------------------
 
-//SfxBindings& ScRefHandler::GetBindings()
-//{
-//  //! SfxModelessDialog should allow access to pBindings pointer
-//
-//  return *pMyBindings;
-//}
-
-//----------------------------------------------------------------------------
-
 void ScRefHandler::SwitchToDocument()
 {
     ScTabViewShell* pCurrent = ScTabViewShell::GetActiveViewShell();
@@ -895,38 +880,6 @@ void ScRefHandler::ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton*
     m_aHelper.ToggleCollapsed( pEdit, pButton );
 }
 
-//The two following function is commentted out by PengYunQuan for Validity Cell Range Picker
-//long ScAnyRefDlg::PreNotify( NotifyEvent& rNEvt )
-//{
-//  USHORT nSwitch=rNEvt.GetType();
-//  if(nSwitch==EVENT_GETFOCUS)
-//  {
-//      pActiveWin=rNEvt.GetWindow();
-//  }
-//  return SfxModelessDialog::PreNotify(rNEvt);
-//}
-//
-//void ScAnyRefDlg::StateChanged( StateChangedType nStateChange )
-//{
-//  SfxModelessDialog::StateChanged( nStateChange );
-//
-//  if(nStateChange == STATE_CHANGE_VISIBLE)
-//  {
-//      if(IsVisible())
-//      {
-//          m_aHelper.enableInput( FALSE );
-//          m_aHelper.EnableSpreadsheets();
-//          m_aHelper.SetDispatcherLock( TRUE );
-//          aTimer.Start();
-//      }
-//      else
-//      {
-//          m_aHelper.enableInput( TRUE );
-//          m_aHelper.SetDispatcherLock( FALSE );           //! here and in DoClose ?
-//      }
-//  }
-//}
-
 #if defined( _MSC_VER )
 #define INTRODUCE_TEMPLATE
 #else
diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx
index 18013a089306..b3eff6dde692 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -529,9 +529,6 @@ void ScAutoFmtPreview::NotifyChange( ScAutoFormatData* pNewData )
 void ScAutoFmtPreview::DoPaint( const Rectangle& /* rRect */ )
 {
     sal_uInt32 nOldDrawMode = aVD.GetDrawMode();
-    //  #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
-    if( GetSettings().GetStyleSettings().GetHighContrastMode() )
-        aVD.SetDrawMode( DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT );
 
     Size aWndSize( GetSizePixel() );
     Font aFont( aVD.GetFont() );
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index de40dd9d1868..34f03d3c1c21 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -344,25 +344,6 @@ void ScConflictsResolver::HandleAction( ScChangeAction* pAction, bool bIsSharedA
                     }
                 }
             }
-            else if ( eConflictAction == SC_CONFLICT_ACTION_KEEP_OTHER )
-            {
-                if ( pAction->GetType() == SC_CAT_CONTENT )
-                {
-                    if ( bHandleContentAction )
-                    {
-                        // do nothing
-                        //mpTrack->SelectContent( pAction );
-                    }
-                }
-                else
-                {
-                    if ( bHandleNonContentAction )
-                    {
-                        // do nothing
-                        //mpTrack->Accept( pAction );
-                    }
-                }
-            }
         }
     }
     else
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.src b/sc/source/ui/miscdlgs/conflictsdlg.src
index 1facf85da95b..2e7bb6b93503 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.src
+++ b/sc/source/ui/miscdlgs/conflictsdlg.src
@@ -106,4 +106,3 @@ ModalDialog RID_SCDLG_CONFLICTS
         Text [ en-US ] = "Unknown User" ;
     };
 };
-
diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx
index d2c2f2c7cf84..0d6932be8f33 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -106,7 +106,6 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Wind
     aFilterCtr.HideRange(FALSE);
     aFilterCtr.Show();
     SetDispatcherLock( TRUE );
-    //SFX_APPWINDOW->Disable(FALSE);
 
     Init();
 
@@ -114,7 +113,6 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Wind
 ScHighlightChgDlg::~ScHighlightChgDlg()
 {
     SetDispatcherLock( FALSE );
-    //SFX_APPWINDOW->Enable();
 }
 
 void __EXPORT ScHighlightChgDlg::Init()
@@ -214,17 +212,6 @@ void ScHighlightChgDlg::RefInputDone( BOOL bForced)
 
 void ScHighlightChgDlg::SetActive()
 {
-    /*
-    if(pTPFilter!=NULL)
-    {
-        aAcceptChgCtr.GetFilterPage()->SetFocusToRange();
-        aEdAssign.Hide();
-        aRbAssign.Hide();
-        SFX_APPWINDOW->Enable();
-        SetDispatcherLock( FALSE );
-    }
-    //RefInputDone();
-    */
 }
 
 BOOL ScHighlightChgDlg::IsRefInputMode() const
@@ -257,7 +244,6 @@ IMPL_LINK( ScHighlightChgDlg, RefHandle, SvxTPFilter*, pRef )
     if(pRef!=NULL)
     {
         SetDispatcherLock( TRUE );
-        //SFX_APPWINDOW->Disable(FALSE);
         aEdAssign.Show();
         aRbAssign.Show();
         aEdAssign.SetText(aFilterCtr.GetRange());
diff --git a/sc/source/ui/miscdlgs/highred.src b/sc/source/ui/miscdlgs/highred.src
index a244a3e2a44e..259afee9a5be 100644
--- a/sc/source/ui/miscdlgs/highred.src
+++ b/sc/source/ui/miscdlgs/highred.src
@@ -100,34 +100,3 @@ ModelessDialog RID_SCDLG_HIGHLIGHT_CHANGES
     };
     Text [ en-US ] = "Show Changes" ;
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/miscdlgs/instbdlg.src b/sc/source/ui/miscdlgs/instbdlg.src
index 6f64c0de1d62..d8432c0b505e 100644
--- a/sc/source/ui/miscdlgs/instbdlg.src
+++ b/sc/source/ui/miscdlgs/instbdlg.src
@@ -146,39 +146,3 @@ ModalDialog RID_SCDLG_INSERT_TABLE
         Size = MAP_APPFONT ( 192 , 8 ) ;
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx
index 26bc8cc56dad..d32ac1b4f7fb 100644
--- a/sc/source/ui/miscdlgs/linkarea.cxx
+++ b/sc/source/ui/miscdlgs/linkarea.cxx
@@ -263,7 +263,6 @@ IMPL_LINK( ScLinkedAreaDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg
 
         if ( !pSourceShell->GetError() )                    // only errors
         {
-            //aCbUrl.SetText( pSourceShell->GetTitle( SFX_TITLE_FULLNAME ) );
             aCbUrl.SetText( pMed->GetName() );
         }
         else
diff --git a/sc/source/ui/miscdlgs/makefile.mk b/sc/source/ui/miscdlgs/makefile.mk
index 115fc3aebe57..403c98237f81 100644
--- a/sc/source/ui/miscdlgs/makefile.mk
+++ b/sc/source/ui/miscdlgs/makefile.mk
@@ -39,54 +39,46 @@ LIBTARGET=no
 # --- Files --------------------------------------------------------
 
 SLOFILES =  \
+    $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
+    $(SLO)$/acredlin.obj		\
+    $(SLO)$/anyrefdg.obj		\
+    $(SLO)$/autofmt.obj			\
+    $(SLO)$/conflictsdlg.obj		\
+    $(SLO)$/crdlg.obj			\
+    $(SLO)$/crnrdlg.obj			\
     $(SLO)$/datafdlg.obj		\
     $(SLO)$/delcldlg.obj		\
-    $(SLO)$/inscldlg.obj		\
     $(SLO)$/delcodlg.obj		\
+    $(SLO)$/filldlg.obj			\
+    $(SLO)$/groupdlg.obj		\
+    $(SLO)$/highred.obj			\
+    $(SLO)$/inscldlg.obj		\
     $(SLO)$/inscodlg.obj		\
-    $(SLO)$/strindlg.obj		\
-    $(SLO)$/tabbgcolordlg.obj   \
-    $(SLO)$/mtrindlg.obj		\
+    $(SLO)$/instbdlg.obj		\
     $(SLO)$/lbseldlg.obj		\
-    $(SLO)$/filldlg.obj			\
-    $(SLO)$/autofmt.obj			\
-    $(SLO)$/solvrdlg.obj		\
-    $(SLO)$/optsolver.obj       \
-    $(SLO)$/solveroptions.obj   \
-    $(SLO)$/solverutil.obj      \
+    $(SLO)$/linkarea.obj		\
+    $(SLO)$/mtrindlg.obj		\
     $(SLO)$/mvtabdlg.obj		\
-    $(SLO)$/groupdlg.obj		\
-    $(SLO)$/tabopdlg.obj		\
-    $(SLO)$/crdlg.obj			\
     $(SLO)$/namecrea.obj		\
     $(SLO)$/namepast.obj		\
-    $(SLO)$/textdlgs.obj		\
-    $(SLO)$/anyrefdg.obj		\
-    $(SLO)$/crnrdlg.obj			\
-    $(SLO)$/shtabdlg.obj		\
-    $(SLO)$/instbdlg.obj		\
-    $(SLO)$/acredlin.obj		\
-    $(SLO)$/highred.obj			\
-    $(SLO)$/simpref.obj			\
+    $(SLO)$/optsolver.obj		\
+    $(SLO)$/protectiondlg.obj		\
     $(SLO)$/redcom.obj			\
-    $(SLO)$/linkarea.obj		\
-    $(SLO)$/warnbox.obj	\
-    $(SLO)$/scuiautofmt.obj     \
-    $(SLO)$/conflictsdlg.obj    \
-    $(SLO)$/sharedocdlg.obj \
-    $(SLO)$/protectiondlg.obj \
-    $(SLO)$/retypepassdlg.obj
-
-EXCEPTIONSFILES = \
-    $(SLO)$/acredlin.obj        \
-    $(SLO)$/conflictsdlg.obj    \
+    $(SLO)$/retypepassdlg.obj		\
+    $(SLO)$/scuiautofmt.obj		\
     $(SLO)$/sharedocdlg.obj		\
-    $(SLO)$/optsolver.obj       \
-    $(SLO)$/solveroptions.obj   \
-    $(SLO)$/crnrdlg.obj         \
-    $(SLO)$/solverutil.obj \
-    $(SLO)$/protectiondlg.obj \
-    $(SLO)$/retypepassdlg.obj
+    $(SLO)$/shtabdlg.obj		\
+    $(SLO)$/simpref.obj			\
+    $(SLO)$/solveroptions.obj		\
+    $(SLO)$/solverutil.obj		\
+    $(SLO)$/solvrdlg.obj		\
+    $(SLO)$/strindlg.obj		\
+    $(SLO)$/tabbgcolordlg.obj   	\
+    $(SLO)$/tabopdlg.obj		\
+    $(SLO)$/textdlgs.obj		\
+    $(SLO)$/warnbox.obj
 
 SRS1NAME=$(TARGET)
 SRC1FILES = \
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index 4f70376455b5..1293363ec6ee 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -290,13 +290,11 @@ void ScOptSolverDlg::Init(const ScAddress& rCursorPos)
     rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
     aSlotURL += rtl::OUString::valueOf( sal_Int32( SID_DEL_ROWS ) );
     uno::Reference<frame::XFrame> xFrame = GetBindings().GetActiveFrame();
-    Image aDelNm = ::GetImage( xFrame, aSlotURL, FALSE, FALSE );
-    Image aDelHC = ::GetImage( xFrame, aSlotURL, FALSE, TRUE );     // high contrast
+    Image aDelNm = ::GetImage( xFrame, aSlotURL, FALSE );
 
     for ( sal_uInt16 nRow = 0; nRow < EDIT_ROW_COUNT; ++nRow )
     {
-        mpDelButton[nRow]->SetModeImage( aDelNm, BMP_COLOR_NORMAL );
-        mpDelButton[nRow]->SetModeImage( aDelHC, BMP_COLOR_HIGHCONTRAST );
+        mpDelButton[nRow]->SetModeImage( aDelNm );
     }
 
     maBtnOpt.SetClickHdl( LINK( this, ScOptSolverDlg, BtnHdl ) );
diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx
index d66bd541a174..4a8fbc15b4e7 100644
--- a/sc/source/ui/miscdlgs/protectiondlg.cxx
+++ b/sc/source/ui/miscdlgs/protectiondlg.cxx
@@ -62,8 +62,8 @@ ScTableProtectionDlg::ScTableProtectionDlg(Window* pParent) :
     maBtnCancel (this, ScResId(BTN_CANCEL)),
     maBtnHelp   (this, ScResId(BTN_HELP)),
 
-    maSelectLockedCells(ScResId(ST_SELECT_LOCKED_CELLS)),
-    maSelectUnlockedCells(ScResId(ST_SELECT_UNLOCKED_CELLS))
+    maSelectLockedCells(ScResId(ST_SELECT_PROTECTED_CELLS)),
+    maSelectUnlockedCells(ScResId(ST_SELECT_UNPROTECTED_CELLS))
 {
     Init();
     FreeResource();
diff --git a/sc/source/ui/miscdlgs/protectiondlg.src b/sc/source/ui/miscdlgs/protectiondlg.src
index 6b62efb4c784..d009f824580b 100644
--- a/sc/source/ui/miscdlgs/protectiondlg.src
+++ b/sc/source/ui/miscdlgs/protectiondlg.src
@@ -56,7 +56,7 @@ ModalDialog RID_SCDLG_TABPROTECTION
         Pos = MAP_APPFONT ( 6 , 6 ) ;
         Size = MAP_APPFONT ( 150 , 10 );
 
-        Text [ en-US ] = "P~rotect this sheet and the contents of locked cells" ;
+        Text [ en-US ] = "P~rotect this sheet and the contents of protected cells" ;
     };
 
     FixedText FT_PASSWORD1
@@ -115,13 +115,13 @@ ModalDialog RID_SCDLG_TABPROTECTION
         TabStop = TRUE ;
     };
 
-    String ST_SELECT_LOCKED_CELLS
+    String ST_SELECT_PROTECTED_CELLS
     {
-        Text [ en-US ] = "Select locked cells";
+        Text [ en-US ] = "Select protected cells";
     };
 
-    String ST_SELECT_UNLOCKED_CELLS
+    String ST_SELECT_UNPROTECTED_CELLS
     {
-        Text [ en-US ] = "Select unlocked cells";
+        Text [ en-US ] = "Select unprotected cells";
     };
 };
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.src b/sc/source/ui/miscdlgs/retypepassdlg.src
index 794af9d43ebd..2c3f93a6d6a0 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.src
+++ b/sc/source/ui/miscdlgs/retypepassdlg.src
@@ -27,7 +27,6 @@
 
 #include "retypepassdlg.hrc"
 
-
 ModalDialog RID_SCDLG_RETYPEPASS
 {
     Text [ en-US ] = "Re-type Password" ;
@@ -309,5 +308,3 @@ ModalDialog RID_SCDLG_RETYPEPASS_INPUT
         Text [ en-US ] = "Remove password from this protected item." ;
     };
 };
-
-
diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxx
index acf12cf263b0..8fa78a0f1a1c 100644
--- a/sc/source/ui/miscdlgs/warnbox.cxx
+++ b/sc/source/ui/miscdlgs/warnbox.cxx
@@ -41,7 +41,10 @@
 ScCbWarningBox::ScCbWarningBox( Window* pParent, const String& rMsgStr, bool bDefYes ) :
     WarningBox( pParent, WB_YES_NO | (bDefYes ? WB_DEF_YES : WB_DEF_NO), rMsgStr )
 {
-    SetDefaultCheckBoxText();
+    // By default, the check box is ON, and the user needs to un-check it to
+    // disable all future warnings.
+    SetCheckBoxState(true);
+    SetCheckBoxText(String(ScResId(SCSTR_WARN_ME_IN_FUTURE_CHECK)));
 }
 
 sal_Int16 ScCbWarningBox::Execute()
@@ -50,7 +53,7 @@ sal_Int16 ScCbWarningBox::Execute()
     if( IsDialogEnabled() )
     {
         nRet = WarningBox::Execute();
-        if( GetCheckBoxState() )
+        if (!GetCheckBoxState())
             DisableDialog();
     }
     return nRet;
@@ -76,14 +79,14 @@ ScReplaceWarnBox::ScReplaceWarnBox( Window* pParent ) :
 
 bool ScReplaceWarnBox::IsDialogEnabled()
 {
-    return SC_MOD()->GetInputOptions().GetReplaceCellsWarn() == TRUE;
+    return SC_MOD()->GetInputOptions().GetReplaceCellsWarn() == true;
 }
 
 void ScReplaceWarnBox::DisableDialog()
 {
     ScModule* pScMod = SC_MOD();
     ScInputOptions aInputOpt( pScMod->GetInputOptions() );
-    aInputOpt.SetReplaceCellsWarn( FALSE );
+    aInputOpt.SetReplaceCellsWarn( false );
     pScMod->SetInputOptions( aInputOpt );
 }
 
diff --git a/sc/source/ui/namedlg/makefile.mk b/sc/source/ui/namedlg/makefile.mk
index 7bc7b2653b6a..f9cd60d008a4 100644
--- a/sc/source/ui/namedlg/makefile.mk
+++ b/sc/source/ui/namedlg/makefile.mk
@@ -41,6 +41,9 @@ CXXFILES = \
         namedlg.cxx
 
 SLOFILES =  \
+        $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
         $(SLO)$/namedlg.obj
 
 # --- Tagets -------------------------------------------------------
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 728fefae1443..f0eea3a665ed 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -389,7 +389,7 @@ IMPL_LINK( ScNameDlg, OkBtnHdl, void *, EMPTYARG )
     {
         ScDocShell* pDocSh = pViewData->GetDocShell();
         ScDocFunc aFunc(*pDocSh);
-        aFunc.ModifyRangeNames( aLocalRangeName, FALSE );
+        aFunc.ModifyRangeNames( aLocalRangeName );
         Close();
     }
     return 0;
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 5b55d47b70cd..f9ccc650a5a1 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -128,7 +128,6 @@ ScDocShell* ScContentTree::GetManualOrCurrent()
 ScContentTree::ScContentTree( Window* pParent, const ResId& rResId ) :
     SvTreeListBox   ( pParent, rResId ),
     aEntryImages    ( ScResId( RID_IMAGELIST_NAVCONT ) ),
-    aHCEntryImages  ( ScResId( RID_IMAGELIST_H_NAVCONT ) ),
     nRootType       ( SC_CONTENT_ROOT ),
     bHiddenDoc      ( FALSE ),
     pHiddenDocument ( NULL )
@@ -169,10 +168,6 @@ void ScContentTree::InitRoot( USHORT nType )
     USHORT nPos = nRootType ? 0 : pPosList[nType]-1;
     SvLBoxEntry* pNew = InsertEntry( aName, rImage, rImage, NULL, FALSE, nPos );
 
-    const Image& rHCImage = aHCEntryImages.GetImage( nType );
-    SetExpandedEntryBmp( pNew, rHCImage, BMP_COLOR_HIGHCONTRAST );
-    SetCollapsedEntryBmp( pNew, rHCImage, BMP_COLOR_HIGHCONTRAST );
-
     pRootNodes[nType] = pNew;
 }
 
diff --git a/sc/source/ui/navipi/makefile.mk b/sc/source/ui/navipi/makefile.mk
index 992aefcd4f45..1ce4df4b4927 100644
--- a/sc/source/ui/navipi/makefile.mk
+++ b/sc/source/ui/navipi/makefile.mk
@@ -37,13 +37,13 @@ TARGET=navipi
 
 # --- Files --------------------------------------------------------
 
-SLOFILES =					\
-    $(SLO)$/navipi.obj		\
-    $(SLO)$/navcitem.obj	\
-    $(SLO)$/scenwnd.obj		\
-    $(SLO)$/content.obj
+SLOFILES =			\
+    $(EXCEPTIONSFILES)
 
-EXCEPTIONSFILES =			\
+EXCEPTIONSFILES =		\
+    $(SLO)$/content.obj		\
+    $(SLO)$/navcitem.obj	\
+    $(SLO)$/navipi.obj		\
     $(SLO)$/scenwnd.obj
 
 SRS1NAME=$(TARGET)
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index f3b53f5818a6..e959211d10bb 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -397,8 +397,6 @@ CommandToolBox::CommandToolBox( ScNavigatorDlg* pParent, const ResId& rResId )
     SetSizePixel( CalcWindowSizePixel() );
     SetDropdownClickHdl( LINK(this, CommandToolBox, ToolBoxDropdownClickHdl) );
     SetItemBits( IID_DROPMODE, GetItemBits( IID_DROPMODE ) | TIB_DROPDOWNONLY );
-//  EnableItem( IID_UP, FALSE );
-//  EnableItem( IID_DOWN, FALSE );
 }
 
 //------------------------------------------------------------------------
@@ -447,7 +445,6 @@ void CommandToolBox::Select( USHORT nSelId )
             case IID_DOWN:
                 rDlg.EndOfDataArea();
                 break;
-            // IID_DROPMODE ist in Click
             case IID_CHANGEROOT:
                 rDlg.aLbEntries.ToggleRoot();
                 UpdateButtons();
@@ -515,23 +512,19 @@ void CommandToolBox::UpdateButtons()
         CheckItem( IID_CHANGEROOT, bRootSet );
     }
 
-    BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
-
     USHORT nImageId = 0;
     switch ( rDlg.nDropMode )
     {
-        case SC_DROPMODE_URL:   nImageId = bHC ? RID_IMG_H_DROP_URL  : RID_IMG_DROP_URL;  break;
-        case SC_DROPMODE_LINK:  nImageId = bHC ? RID_IMG_H_DROP_LINK : RID_IMG_DROP_LINK; break;
-        case SC_DROPMODE_COPY:  nImageId = bHC ? RID_IMG_H_DROP_COPY : RID_IMG_DROP_COPY; break;
+        case SC_DROPMODE_URL:   nImageId = RID_IMG_DROP_URL;  break;
+        case SC_DROPMODE_LINK:  nImageId = RID_IMG_DROP_LINK; break;
+        case SC_DROPMODE_COPY:  nImageId = RID_IMG_DROP_COPY; break;
     }
     SetItemImage( IID_DROPMODE, Image(ScResId(nImageId)) );
 }
 
 void CommandToolBox::InitImageList()
 {
-    BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
-
-    ImageList& rImgLst = bHC ? rDlg.aCmdImageListH : rDlg.aCmdImageList;
+    ImageList& rImgLst = rDlg.aCmdImageList;
 
     USHORT nCount = GetItemCount();
     for (USHORT i = 0; i < nCount; i++)
@@ -660,7 +653,6 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win
         Window( pParent, ScResId(RID_SCDLG_NAVIGATOR) ),
         rBindings   ( *pB ),                                // is used in CommandToolBox ctor
         aCmdImageList( ScResId( IL_CMD ) ),
-        aCmdImageListH( ScResId( ILH_CMD ) ),
         aFtCol      ( this, ScResId( FT_COL ) ),
         aEdCol      ( this, ScResId( ED_COL ) ),
         aFtRow      ( this, ScResId( FT_ROW ) ),
diff --git a/sc/source/ui/navipi/navipi.hrc b/sc/source/ui/navipi/navipi.hrc
index 0adb65a5a042..643435655a26 100644
--- a/sc/source/ui/navipi/navipi.hrc
+++ b/sc/source/ui/navipi/navipi.hrc
@@ -26,8 +26,6 @@
  ************************************************************************/
 #include "sc.hrc"
 
-//#define RID_SCDLG_NAVIGATOR   256
-
 #define FT_ROW                  1
 #define ED_ROW                  2
 #define FT_COL                  3
@@ -41,13 +39,9 @@
 #define STR_NOTACTIVE           11
 #define STR_HIDDEN              12
 #define STR_ACTIVEWIN           13
-//#define IMG_ENTRIES               14
 #define STR_QHLP_SCEN_LISTBOX   15
 #define STR_QHLP_SCEN_COMMENT   16
 #define IL_CMD                  17
-#define ILH_CMD                 18
-
-
 
 #define IID_AREAS       1
 #define IID_DBAREAS     2
@@ -59,5 +53,3 @@
 #define IID_DROPMODE    9
 #define IID_CHANGEROOT  10
 #define IID_ZOOMOUT     11
-
-
diff --git a/sc/source/ui/navipi/navipi.src b/sc/source/ui/navipi/navipi.src
index c2e9ecb6a4e6..08e57cf4bf3c 100644
--- a/sc/source/ui/navipi/navipi.src
+++ b/sc/source/ui/navipi/navipi.src
@@ -59,23 +59,13 @@ Window RID_SCDLG_NAVIGATOR
 {
     SVLook = TRUE ;
     HelpId = HID_SC_NAVIGATOR ;
-     //?    Pos = MAP_APPFONT( 0, 0 );
     Size = MAP_APPFONT ( 115 , 116 ) ;
     OutputSize = TRUE ;
     DialogControl = TRUE ;
     Hide = TRUE ;
     Text [ en-US ] = "Navigator" ;
-     //    Closeable = TRUE ;
-     //    Moveable = TRUE ;
-     //    Zoomable = TRUE ;
-     //    Sizeable = TRUE ;
-     //    EnableResizing = TRUE ;
-     //    HideWhenDeactivate = TRUE ;
-     //    Border = TRUE ;
-     //    Dockable = TRUE ;
     FixedText FT_ROW
     {
-         //         Pos = MAP_APPFONT( 2, 20 );
         Pos = MAP_APPFONT ( 2 , 19 ) ;
          // an kleinere Toolbox-Bitmaps angepasst
         Size = MAP_APPFONT ( 19 , 10 ) ;
@@ -85,7 +75,6 @@ Window RID_SCDLG_NAVIGATOR
     {
         HelpId = HID_SC_NAVIPI_ROW ;
         Border = TRUE ;
-         //         Pos = MAP_APPFONT( 31, 19 );
         Pos = MAP_APPFONT ( 31 , 18 ) ;
          // an kleinere Toolbox-Bitmaps angepasst
         Size = MAP_APPFONT ( 30 , 12 ) ;
@@ -119,7 +108,6 @@ Window RID_SCDLG_NAVIGATOR
          // "Control" braucht immer eigene HelpId
         HelpId = HID_SC_NAVIPI_ENTRIES ;
         Border = TRUE ;
-         //         Pos = MAP_APPFONT( 2, 52 );
         Pos = MAP_APPFONT ( 2 , 35 ) ;
         Size = MAP_APPFONT ( 110 , 100 ) ;
         TabStop = TRUE ;
@@ -128,7 +116,6 @@ Window RID_SCDLG_NAVIGATOR
     {
         HelpId = HID_SC_NAVIPI_DOC ;
         Border = TRUE ;
-         //         Pos = MAP_APPFONT( 2, 35 );
         Pos = MAP_APPFONT ( 2 , 89 ) ;
         Size = MAP_APPFONT ( 82 , 50 ) ;
         TabStop = TRUE ;
@@ -141,12 +128,6 @@ Window RID_SCDLG_NAVIGATOR
         MaskColor = STD_MASKCOLOR ;
         SC_NAVI_CMD_IDLIST
     };
-    ImageList ILH_CMD
-    {
-        Prefix = "nah";
-        MaskColor = SC_HC_MASKCOLOR ;
-        SC_NAVI_CMD_IDLIST
-    };
     ToolBox TBX_CMD
     {
         Pos = MAP_APPFONT ( 66 , 3 ) ;
@@ -244,50 +225,30 @@ Window RID_SCDLG_NAVIGATOR
 
 };
 
-
 ImageList RID_IMAGELIST_NAVCONT
 {
     Prefix = "nc";
     MaskColor = STD_MASKCOLOR ;
     SC_NAVI_CONT_IDLIST
 };
-ImageList RID_IMAGELIST_H_NAVCONT
-{
-    Prefix = "nch";
-    MaskColor = SC_HC_MASKCOLOR ;
-    SC_NAVI_CONT_IDLIST
-};
 
 Image RID_IMG_DROP_URL
 {
-    ImageBitmap = Bitmap { File = "dropurl.bmp" ; };
+    ImageBitmap = Bitmap { File = "dropurl.png" ; };
     MaskColor = STD_MASKCOLOR ;
 };
+
 Image RID_IMG_DROP_LINK
 {
-    ImageBitmap = Bitmap { File = "droplink.bmp" ; };
+    ImageBitmap = Bitmap { File = "droplink.png" ; };
     MaskColor = STD_MASKCOLOR ;
 };
+
 Image RID_IMG_DROP_COPY
 {
-    ImageBitmap = Bitmap { File = "dropcopy.bmp" ; };
+    ImageBitmap = Bitmap { File = "dropcopy.png" ; };
     MaskColor = STD_MASKCOLOR ;
 };
-Image RID_IMG_H_DROP_URL
-{
-    ImageBitmap = Bitmap { File = "dropurl_h.bmp" ; };
-    MaskColor = SC_HC_MASKCOLOR ;
-};
-Image RID_IMG_H_DROP_LINK
-{
-    ImageBitmap = Bitmap { File = "droplink_h.bmp" ; };
-    MaskColor = SC_HC_MASKCOLOR ;
-};
-Image RID_IMG_H_DROP_COPY
-{
-    ImageBitmap = Bitmap { File = "dropcopy_h.bmp" ; };
-    MaskColor = SC_HC_MASKCOLOR ;
-};
 
 //  content description strings are also used in ScLinkTargetsObj
 
@@ -295,38 +256,47 @@ String SCSTR_CONTENT_ROOT
 {
     Text [ en-US ] = "Contents" ;
 };
+
 String SCSTR_CONTENT_TABLE
 {
     Text [ en-US ] = "Sheets" ;
 };
+
 String SCSTR_CONTENT_RANGENAME
 {
     Text [ en-US ] = "Range names" ;
 };
+
 String SCSTR_CONTENT_DBAREA
 {
     Text [ en-US ] = "Database Ranges" ;
 };
+
 String SCSTR_CONTENT_GRAPHIC
 {
     Text [ en-US ] = "Graphics" ;
 };
+
 String SCSTR_CONTENT_OLEOBJECT
 {
     Text [ en-US ] = "OLE objects" ;
 };
+
 String SCSTR_CONTENT_NOTE
 {
     Text [ en-US ] = "Comments" ;
 };
+
 String SCSTR_CONTENT_AREALINK
 {
     Text [ en-US ] = "Linked areas" ;
 };
+
 String SCSTR_CONTENT_DRAWING
 {
     Text [ en-US ] = "Drawing objects";
 };
+
  // PopupMenu -------------------------------------------------------------
 Menu RID_POPUP_DROPMODE
 {
@@ -352,6 +322,7 @@ Menu RID_POPUP_DROPMODE
         };
     };
 };
+
 Menu RID_POPUP_NAVIPI_SCENARIO
 {
     ItemList =
@@ -370,45 +341,3 @@ Menu RID_POPUP_NAVIPI_SCENARIO
         };
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/optdlg/makefile.mk b/sc/source/ui/optdlg/makefile.mk
index 9c816f56f7b8..b2be3b5c02ad 100644
--- a/sc/source/ui/optdlg/makefile.mk
+++ b/sc/source/ui/optdlg/makefile.mk
@@ -45,20 +45,17 @@ CXXFILES = \
         tpprint.cxx     \
         opredlin.cxx
 
-EXCEPTIONSFILES= \
-        $(SLO)$/tpcompatibility.obj
-
 SLOFILES =  \
-        $(SLO)$/tpusrlst.obj \
-        $(SLO)$/tpview.obj   \
-        $(SLO)$/tpcalc.obj	\
-        $(SLO)$/tpformula.obj	\
-        $(SLO)$/tpcompatibility.obj \
-        $(SLO)$/tpprint.obj	\
-        $(SLO)$/opredlin.obj
+        $(EXCEPTIONSFILES)
 
 EXCEPTIONSFILES= \
-        $(SLO)$/tpcompatibility.obj	\
+        $(SLO)$/opredlin.obj \
+        $(SLO)$/tpcalc.obj \
+        $(SLO)$/tpcompatibility.obj \
+        $(SLO)$/tpformula.obj \
+        $(SLO)$/tpprint.obj \
+        $(SLO)$/tpusrlst.obj \
+        $(SLO)$/tpview.obj
 
 
 # --- Tagets -------------------------------------------------------
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx
index f438b3cdfcbc..65fa1808249d 100644
--- a/sc/source/ui/optdlg/opredlin.cxx
+++ b/sc/source/ui/optdlg/opredlin.cxx
@@ -81,27 +81,15 @@ ScRedlineOptionsTabPage::ScRedlineOptionsTabPage( Window* pParent,
     aRemoveColorLB.SetSelectHdl( aLk );
 }
 
-/*-----------------------------------------------------------------------
-    Beschreibung:
- -----------------------------------------------------------------------*/
-
 __EXPORT ScRedlineOptionsTabPage::~ScRedlineOptionsTabPage()
 {
 }
 
-/*-----------------------------------------------------------------------
-    Beschreibung:
- -----------------------------------------------------------------------*/
-
 SfxTabPage* __EXPORT ScRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet& rSet )
 {
     return new ScRedlineOptionsTabPage( pParent, rSet );
 }
 
-/*-----------------------------------------------------------------------
-    Beschreibung:
- -----------------------------------------------------------------------*/
-
 BOOL __EXPORT ScRedlineOptionsTabPage::FillItemSet( SfxItemSet& /* rSet */ )
 {
     ScAppOptions aAppOptions=SC_MOD()->GetAppOptions();
@@ -169,10 +157,6 @@ BOOL __EXPORT ScRedlineOptionsTabPage::FillItemSet( SfxItemSet& /* rSet */ )
     return FALSE;
 }
 
-/*-----------------------------------------------------------------------
-    Beschreibung:
- -----------------------------------------------------------------------*/
-
 void __EXPORT ScRedlineOptionsTabPage::Reset( const SfxItemSet& /* rSet */ )
 {
 
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index 7d56184d014e..b99c4777a3b0 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -83,7 +83,6 @@ ScTpCalcOptions::ScTpCalcOptions( Window*           pParent,
         aBtnDateStd     ( this, ScResId( BTN_DATESTD ) ),
         aBtnDateSc10    ( this, ScResId( BTN_DATESC10 ) ),
         aBtnDate1904    ( this, ScResId( BTN_DATE1904 ) ),
-        aHSeparatorFL   ( this, ScResId( FL_H_SEPARATOR ) ),
         aBtnCase        ( this, ScResId( BTN_CASE ) ),
         aBtnCalc        ( this, ScResId( BTN_CALC ) ),
         aBtnMatch       ( this, ScResId( BTN_MATCH ) ),
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 7c49d6d2d54c..d408fb093bc5 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -57,10 +57,6 @@
 
 
 
-/*-----------------11.01.97 10.52-------------------
-    Optionen Inhalte
---------------------------------------------------*/
-
 ScTpContentOptions::ScTpContentOptions( Window*         pParent,
                              const SfxItemSet&  rArgSet ) :
     SfxTabPage(pParent, ScResId( RID_SCPAGE_CONTENT ), rArgSet),
@@ -133,26 +129,18 @@ ScTpContentOptions::ScTpContentOptions( Window*         pParent,
 
     aGridCB     .SetClickHdl( LINK( this, ScTpContentOptions, GridHdl ) );
 }
-/*-----------------11.01.97 10.52-------------------
-
---------------------------------------------------*/
 
 ScTpContentOptions::~ScTpContentOptions()
 {
     delete pLocalOptions;
 }
-/*-----------------11.01.97 10.52-------------------
-
---------------------------------------------------*/
 
 SfxTabPage* ScTpContentOptions::Create( Window*     pParent,
                               const SfxItemSet&     rCoreSet )
 {
     return new ScTpContentOptions(pParent, rCoreSet);
 }
-/*-----------------11.01.97 10.52-------------------
 
---------------------------------------------------*/
 BOOL    ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet )
 {
     BOOL bRet = FALSE;
@@ -196,9 +184,6 @@ BOOL    ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet )
 
     return bRet;
 }
-/*-----------------11.01.97 10.53-------------------
-
---------------------------------------------------*/
 
 void    ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
 {
@@ -261,9 +246,6 @@ void    ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
     aHandleCB       .SaveValue();
     aBigHandleCB    .SaveValue();
 }
-/*-----------------11.01.97 12.45-------------------
-
---------------------------------------------------*/
 
 void ScTpContentOptions::ActivatePage( const SfxItemSet& rSet)
 {
@@ -271,9 +253,6 @@ void ScTpContentOptions::ActivatePage( const SfxItemSet& rSet)
     if(SFX_ITEM_SET == rSet.GetItemState(SID_SCVIEWOPTIONS, FALSE , &pItem))
         *pLocalOptions = ((const ScTpViewItem*)pItem)->GetViewOptions();
 }
-/*-----------------11.01.97 12.45-------------------
-
---------------------------------------------------*/
 
 int ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP )
 {
@@ -281,9 +260,6 @@ int ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP )
         FillItemSet(*pSetP);
     return SfxTabPage::LEAVE_PAGE;
 }
-/*-----------------11.01.97 13.43-------------------
-
---------------------------------------------------*/
 
 IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox*, pLb )
 {
@@ -301,10 +277,6 @@ IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox*, pLb )
     return 0;
 }
 
-/*-----------------11.01.97 14.25-------------------
-
---------------------------------------------------*/
-
 IMPL_LINK( ScTpContentOptions, CBHdl, CheckBox*, pBtn )
 {
     ScViewOption eOption = VOPT_FORMULAS;
@@ -335,9 +307,6 @@ IMPL_LINK( ScTpContentOptions, CBHdl, CheckBox*, pBtn )
 
     return 0;
 }
-/*-----------------11.01.97 13.13-------------------
-
---------------------------------------------------*/
 
 void ScTpContentOptions::InitGridOpt()
 {
@@ -407,9 +376,6 @@ void ScTpContentOptions::InitGridOpt()
     else
         aColorLB.SelectEntryPos( aColorLB.InsertEntry( aCol, aName ) );
 }
-/*-----------------11.01.97 13.40-------------------
-
---------------------------------------------------*/
 
 IMPL_LINK( ScTpContentOptions, GridHdl, CheckBox*, pBox )
 {
@@ -419,9 +385,6 @@ IMPL_LINK( ScTpContentOptions, GridHdl, CheckBox*, pBox )
     pLocalOptions->SetOption( VOPT_GRID, bChecked );
     return 0;
 }
-/*-----------------11.01.97 10.53-------------------
-
---------------------------------------------------*/
 
 ScTpLayoutOptions::ScTpLayoutOptions(   Window* pParent,
                                         const SfxItemSet&   rArgSet ) :
@@ -485,16 +448,10 @@ ScTpLayoutOptions::ScTpLayoutOptions(   Window* pParent,
     }
 
 }
-/*-----------------11.01.97 10.53-------------------
-
---------------------------------------------------*/
 
 ScTpLayoutOptions::~ScTpLayoutOptions()
 {
 }
-/*-----------------11.01.97 10.53-------------------
-
---------------------------------------------------*/
 
 SfxTabPage* ScTpLayoutOptions::Create( Window*          pParent,
                                     const SfxItemSet&   rCoreSet )
@@ -506,9 +463,6 @@ SfxTabPage* ScTpLayoutOptions::Create( Window*          pParent,
         pNew->SetDocument(pDocSh->GetDocument());
     return pNew;
 }
-/*-----------------11.01.97 10.53-------------------
-
---------------------------------------------------*/
 
 BOOL    ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet )
 {
@@ -601,9 +555,6 @@ BOOL    ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet )
 
     return bRet;
 }
-/*-----------------11.01.97 10.53-------------------
-
---------------------------------------------------*/
 
 void    ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet )
 {
@@ -697,16 +648,9 @@ void    ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet )
     aRequestRB.SaveValue();
 }
 
-/*-----------------11.01.97 12.46-------------------
-
---------------------------------------------------*/
-
 void    ScTpLayoutOptions::ActivatePage( const SfxItemSet& /* rCoreSet */ )
 {
 }
-/*-----------------11.01.97 12.46-------------------
-
---------------------------------------------------*/
 
 int ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP )
 {
@@ -715,11 +659,6 @@ int ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP )
     return SfxTabPage::LEAVE_PAGE;
 }
 
-
-/*-----------------13.01.97 14.44-------------------
-    Metric des Deftabstops umschalten
---------------------------------------------------*/
-
 IMPL_LINK(ScTpLayoutOptions, MetricHdl, ListBox*, EMPTYARG)
 {
     const USHORT nMPos = aUnitLB.GetSelectEntryPos();
@@ -734,9 +673,7 @@ IMPL_LINK(ScTpLayoutOptions, MetricHdl, ListBox*, EMPTYARG)
 
     return 0;
 }
-/*-----------------11.01.97 15.30-------------------
 
---------------------------------------------------*/
 IMPL_LINK( ScTpLayoutOptions, AlignHdl, CheckBox*, pBox )
 {
     aAlignLB.Enable(pBox->IsChecked());
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index d80e5062f2e9..95e669e091a2 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -211,9 +211,6 @@ void ScPrintAreasDlg::SetReference( const ScRange& rRef, ScDocument* /* pDoc */
         if ( &aEdPrintArea == pRefInputEdit )
         {
             rRef.Format( aStr, SCR_ABS, pDoc, eConv );
-
-//          aEdPrintArea.ReplaceSelected( aStr );
-
             String aVal = aEdPrintArea.GetText();
             Selection aSel = aEdPrintArea.GetSelection();
             aSel.Justify();
@@ -429,7 +426,11 @@ BOOL ScPrintAreasDlg::Impl_CheckRefStrings()
         else if ( !bRepeatColOk ) pEd = &aEdRepeatCol;
 
         ERRORBOX( STR_INVALID_TABREF );
-        pEd->GrabFocus();
+
+        OSL_ASSERT(pEd);
+
+        if (pEd)
+            pEd->GrabFocus();
     }
 
     return bOk;
@@ -473,7 +474,6 @@ void ScPrintAreasDlg::Impl_FillLists()
     {
         String          aName;
         String          aSymbol;
-//        ScRange         aRange;
         ScRangeData*    pData = NULL;
 
         for ( USHORT i=0; i<nCount; i++ )
diff --git a/sc/source/ui/pagedlg/hfedtdlg.hrc b/sc/source/ui/pagedlg/hfedtdlg.hrc
index 30e6f8ecae63..f18cc50ce7b4 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.hrc
+++ b/sc/source/ui/pagedlg/hfedtdlg.hrc
@@ -27,9 +27,6 @@
 
 #include "sc.hrc"
 
-//#define RID_SCPAGE_HFEDIT 256
-//#define RID_SCDLG_HFEDIT 256
-
 #define FT_LEFT 1
 #define FT_CENTER 2
 #define FT_RIGHT 3
@@ -52,13 +49,6 @@
 
 #define FL_INFO                 14
 
-#define IMG_TEXT_H              21
-#define IMG_PAGE_H              22
-#define IMG_PAGES_H             23
-#define IMG_DATE_H              24
-#define IMG_TIME_H              25
-#define IMG_FILE_H              26
-#define IMG_TABLE_H             27
 #define FT_HF_DEFINED           28
 #define LB_DEFINED              29
 #define FT_HF_CUSTOM            30
diff --git a/sc/source/ui/pagedlg/hfedtdlg.src b/sc/source/ui/pagedlg/hfedtdlg.src
index 1445636e8cc6..b82497877763 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.src
+++ b/sc/source/ui/pagedlg/hfedtdlg.src
@@ -81,6 +81,7 @@ TabDialog RID_SCDLG_HFED_HEADER
         };
     };
 };
+
 TabDialog RID_SCDLG_HFED_FOOTER
 {
     OutputSize = TRUE ;
@@ -112,6 +113,7 @@ TabDialog RID_SCDLG_HFED_FOOTER
         };
     };
 };
+
  //------------------------------------------------------------------------
  // Bearbeiten/Kopf-Fusszeile:
  //------------------------------------------------------------------------
@@ -158,6 +160,7 @@ TabDialog RID_SCDLG_HFEDIT_ALL
         };
     };
 };
+
 TabDialog RID_SCDLG_HFEDIT_SHDR
 {
     OutputSize = TRUE ;
@@ -195,6 +198,7 @@ TabDialog RID_SCDLG_HFEDIT_SHDR
         };
     };
 };
+
 TabDialog RID_SCDLG_HFEDIT_SFTR
 {
     OutputSize = TRUE ;
@@ -232,6 +236,7 @@ TabDialog RID_SCDLG_HFEDIT_SFTR
         };
     };
 };
+
 TabDialog RID_SCDLG_HFEDIT
 {
     OutputSize = TRUE ;
@@ -263,6 +268,7 @@ TabDialog RID_SCDLG_HFEDIT
         };
     };
 };
+
 TabDialog RID_SCDLG_HFEDIT_HEADER
 {
     OutputSize = TRUE ;
@@ -294,6 +300,7 @@ TabDialog RID_SCDLG_HFEDIT_HEADER
         };
     };
 };
+
 TabDialog RID_SCDLG_HFEDIT_FOOTER
 {
     OutputSize = TRUE ;
@@ -325,6 +332,7 @@ TabDialog RID_SCDLG_HFEDIT_FOOTER
         };
     };
 };
+
 TabDialog RID_SCDLG_HFEDIT_RIGHTHEADER
 {
     OutputSize = TRUE ;
@@ -350,6 +358,7 @@ TabDialog RID_SCDLG_HFEDIT_RIGHTHEADER
         };
     };
 };
+
 TabDialog RID_SCDLG_HFEDIT_LEFTHEADER
 {
     OutputSize = TRUE ;
@@ -375,6 +384,7 @@ TabDialog RID_SCDLG_HFEDIT_LEFTHEADER
         };
     };
 };
+
 TabDialog RID_SCDLG_HFEDIT_RIGHTFOOTER
 {
     OutputSize = TRUE ;
@@ -400,6 +410,7 @@ TabDialog RID_SCDLG_HFEDIT_RIGHTFOOTER
         };
     };
 };
+
 TabDialog RID_SCDLG_HFEDIT_LEFTFOOTER
 {
     OutputSize = TRUE ;
@@ -425,6 +436,7 @@ TabDialog RID_SCDLG_HFEDIT_LEFTFOOTER
         };
     };
 };
+
  //------------------------------------------------------------------------
  //  ScTpHFEdit
  //------------------------------------------------------------------------
@@ -440,45 +452,18 @@ TabPage RID_HFBASE
         Size = MAP_APPFONT ( 75 , 10 ) ;
         Text [ en-US ] = "~Left area" ;
     };
-    /*      "Control" braucht eigene HelpId, darum in der Ableitung:
-    Control WND_LEFT
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 18 ) ;
-        Size = MAP_APPFONT ( 80 , 72 ) ;
-        TabStop = TRUE ;
-    };
-*/
     FixedText FT_CENTER
     {
         Pos = MAP_APPFONT ( 90 , 6 ) ;
         Size = MAP_APPFONT ( 75 , 10 ) ;
         Text [ en-US ] = "~Center area" ;
     };
-    /*      "Control" braucht eigene HelpId, darum in der Ableitung:
-    Control WND_CENTER
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 90 , 18 ) ;
-        Size = MAP_APPFONT ( 80 , 72 ) ;
-        TabStop = TRUE ;
-    };
-*/
     FixedText FT_RIGHT
     {
         Pos = MAP_APPFONT ( 174 , 6 ) ;
         Size = MAP_APPFONT ( 75 , 10 ) ;
         Text [ en-US ] = "R~ight area" ;
     };
-    /*      "Control" braucht eigene HelpId, darum in der Ableitung:
-    Control WND_RIGHT
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 174 , 18 ) ;
-        Size = MAP_APPFONT ( 80 , 72 ) ;
-        TabStop = TRUE ;
-    };
-*/
     FixedText FT_HF_DEFINED
     {
         Pos = MAP_APPFONT ( 12 , 102 ) ;
@@ -486,17 +471,6 @@ TabPage RID_HFBASE
         Text [ en-US ] = "Hea~der" ;
     };
 
-    /* #i84123# list box needs own help id, which is set in the derived tab pages
-    ListBox LB_DEFINED
-    {
-        Border = TRUE ;
-                Pos = MAP_APPFONT ( 90 , 100 ) ;
-                Size = MAP_APPFONT ( 130 , 80 ) ;
-        DropDown = TRUE ;
-        TabStop = TRUE ;
-    };
-    */
-
     FixedText FT_HF_CUSTOM
     {
         Pos = MAP_APPFONT ( 12 , 124 ) ;
@@ -513,15 +487,11 @@ TabPage RID_HFBASE
         QuickHelpText [ en-US ] = "Text Attributes" ;
         ButtonImage = Image
         {
-            ImageBitmap = Bitmap { File = "text.bmp" ; };
+            ImageBitmap = Bitmap { File = "text.png" ; };
             MaskColor = STD_MASKCOLOR ;
         };
     };
-    Image IMG_TEXT_H
-    {
-        ImageBitmap = Bitmap { File = "text_h.bmp" ; };
-        MaskColor = SC_HC_MASKCOLOR;
-    };
+
     ImageButton BTN_FILE
     {
         HelpId = HID_SC_HF_FILE ;
@@ -531,15 +501,10 @@ TabPage RID_HFBASE
         QuickHelpText [ en-US ] = "Title" ;
         ButtonImage = Image
         {
-            ImageBitmap = Bitmap { File = "file.bmp" ; };
+            ImageBitmap = Bitmap { File = "file.png" ; };
             MaskColor = STD_MASKCOLOR ;
         };
     };
-    Image IMG_FILE_H
-    {
-        ImageBitmap = Bitmap { File = "file_h.bmp" ; };
-        MaskColor = SC_HC_MASKCOLOR;
-    };
 
     Menu RID_POPUP_FCOMMAND
     {
@@ -577,15 +542,11 @@ TabPage RID_HFBASE
         QuickHelpText [ en-US ] = "Sheet Name" ;
         ButtonImage = Image
         {
-            ImageBitmap = Bitmap { File = "table.bmp" ; };
+            ImageBitmap = Bitmap { File = "table.png" ; };
             MaskColor = STD_MASKCOLOR;
         };
     };
-    Image IMG_TABLE_H
-    {
-        ImageBitmap = Bitmap { File = "table_h.bmp" ; };
-        MaskColor = SC_HC_MASKCOLOR;
-    };
+
     ImageButton BTN_PAGE
     {
         HelpId = HID_SC_HF_PAGE ;
@@ -595,15 +556,11 @@ TabPage RID_HFBASE
         QuickHelpText [ en-US ] = "Page" ;
         ButtonImage = Image
         {
-            ImageBitmap = Bitmap { File = "page.bmp" ; };
+            ImageBitmap = Bitmap { File = "page.png" ; };
             MaskColor = STD_MASKCOLOR ;
         };
     };
-    Image IMG_PAGE_H
-    {
-        ImageBitmap = Bitmap { File = "page_h.bmp" ; };
-        MaskColor = SC_HC_MASKCOLOR;
-    };
+
     ImageButton BTN_PAGES
     {
         HelpId = HID_SC_HF_PAGES ;
@@ -613,15 +570,11 @@ TabPage RID_HFBASE
         QuickHelpText [ en-US ] = "Pages" ;
         ButtonImage = Image
         {
-            ImageBitmap = Bitmap { File = "pages.bmp" ; };
+            ImageBitmap = Bitmap { File = "pages.png" ; };
             MaskColor = STD_MASKCOLOR ;
         };
     };
-    Image IMG_PAGES_H
-    {
-        ImageBitmap = Bitmap { File = "pages_h.bmp" ; };
-        MaskColor = SC_HC_MASKCOLOR;
-    };
+
     ImageButton BTN_DATE
     {
         HelpId = HID_SC_HF_DATE ;
@@ -631,15 +584,11 @@ TabPage RID_HFBASE
         QuickHelpText [ en-US ] = "Date" ;
         ButtonImage = Image
         {
-            ImageBitmap = Bitmap { File = "date.bmp" ; };
+            ImageBitmap = Bitmap { File = "date.png" ; };
             MaskColor = STD_MASKCOLOR ;
         };
     };
-    Image IMG_DATE_H
-    {
-        ImageBitmap = Bitmap { File = "date_h.bmp" ; };
-        MaskColor = SC_HC_MASKCOLOR;
-    };
+
     ImageButton BTN_TIME
     {
         HelpId = HID_SC_HF_TIME ;
@@ -649,15 +598,11 @@ TabPage RID_HFBASE
         QuickHelpText [ en-US ] = "Time" ;
         ButtonImage = Image
         {
-            ImageBitmap = Bitmap { File = "time.bmp" ; };
+            ImageBitmap = Bitmap { File = "time.png" ; };
             MaskColor = STD_MASKCOLOR ;
         };
     };
-    Image IMG_TIME_H
-    {
-        ImageBitmap = Bitmap { File = "time_h.bmp" ; };
-        MaskColor = SC_HC_MASKCOLOR;
-    };
+
     FixedText FT_INFO
     {
         Pos = MAP_APPFONT ( 12 , 155 ) ;
@@ -672,6 +617,7 @@ TabPage RID_HFBASE
         Text [ en-US ] = "Note" ;
     };
 };
+
  // Kombinationen: Header/Footer links/rechts
  // die Eingabefenster jeweils mit eigener ID, sonst aus RID_HFBASE kopiert
 TabPage RID_SCPAGE_HFED_HL < RID_HFBASE
@@ -712,6 +658,7 @@ TabPage RID_SCPAGE_HFED_HL < RID_HFBASE
         TabStop = TRUE ;
     };
 };
+
 TabPage RID_SCPAGE_HFED_HR < RID_HFBASE
 {
     Hide = TRUE ;
@@ -750,6 +697,7 @@ TabPage RID_SCPAGE_HFED_HR < RID_HFBASE
         TabStop = TRUE ;
     };
 };
+
 TabPage RID_SCPAGE_HFED_FL < RID_HFBASE
 {
     Hide = TRUE ;
@@ -788,6 +736,7 @@ TabPage RID_SCPAGE_HFED_FL < RID_HFBASE
         TabStop = TRUE ;
     };
 };
+
 TabPage RID_SCPAGE_HFED_FR < RID_HFBASE
 {
     Hide = TRUE ;
@@ -826,4 +775,3 @@ TabPage RID_SCPAGE_HFED_FR < RID_HFBASE
         TabStop = TRUE ;
     };
 };
-
diff --git a/sc/source/ui/pagedlg/makefile.mk b/sc/source/ui/pagedlg/makefile.mk
index 93224ec7cb58..a7984f7d19af 100644
--- a/sc/source/ui/pagedlg/makefile.mk
+++ b/sc/source/ui/pagedlg/makefile.mk
@@ -39,8 +39,8 @@ LIBTARGET=no
 # --- Files --------------------------------------------------------
 
 CXXFILES = \
-    areasdlg.cxx	\
-    hfedtdlg.cxx	\
+        areasdlg.cxx	\
+        hfedtdlg.cxx	\
         tptable.cxx	\
         tphf.cxx 	\
         tphfedit.cxx
@@ -48,13 +48,15 @@ CXXFILES = \
             
 
 SLOFILES = \
-        $(SLO)$/areasdlg.obj	\
-    $(SLO)$/hfedtdlg.obj	\
-        $(SLO)$/tptable.obj	\
-        $(SLO)$/tphf.obj		\
-        $(SLO)$/tphfedit.obj	\
-        $(SLO)$/scuitphfedit.obj
+        $(EXCEPTIONSFILES)
 
+EXCEPTIONSFILES = \
+        $(SLO)$/areasdlg.obj		\
+        $(SLO)$/hfedtdlg.obj		\
+        $(SLO)$/scuitphfedit.obj	\
+        $(SLO)$/tphf.obj		\
+        $(SLO)$/tphfedit.obj		\
+        $(SLO)$/tptable.obj		\
 
 SRS1NAME=$(TARGET)
 SRC1FILES =  pagedlg.src     	\
@@ -65,7 +67,7 @@ LIB1TARGET = $(SLB)$/$(TARGET).lib
 
 LIB1OBJFILES = \
         $(SLO)$/areasdlg.obj	\
-    $(SLO)$/tphfedit.obj
+        $(SLO)$/tphfedit.obj
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/sc/source/ui/pagedlg/pagedlg.hrc b/sc/source/ui/pagedlg/pagedlg.hrc
index 2f3593c2f6d1..0c26340599a1 100644
--- a/sc/source/ui/pagedlg/pagedlg.hrc
+++ b/sc/source/ui/pagedlg/pagedlg.hrc
@@ -71,9 +71,6 @@
 #define FT_SCALEPAGEHEIGHT  53
 #define FT_SCALEPAGENUM     54
 
-#define IMG_LEFTRIGHT_H     41
-#define IMG_TOPDOWN_H       42
-
 // List box entries "Scaling mode"
 #define SC_TPTABLE_SCALE_PERCENT    0
 #define SC_TPTABLE_SCALE_TO         1
diff --git a/sc/source/ui/pagedlg/pagedlg.src b/sc/source/ui/pagedlg/pagedlg.src
index d0f95c3d9f6b..d02432d94cd9 100644
--- a/sc/source/ui/pagedlg/pagedlg.src
+++ b/sc/source/ui/pagedlg/pagedlg.src
@@ -25,6 +25,7 @@
  *
  ************************************************************************/
 #include "pagedlg.hrc"
+
 ModelessDialog RID_SCDLG_AREAS
 {
     HelpId = HID_SCPAGE_AREAS ;
@@ -147,6 +148,7 @@ ModelessDialog RID_SCDLG_AREAS
         QuickHelpText [ en-US ] = "Shrink" ;
     };
 };
+
 TabPage RID_SCPAGE_TABLE
 {
     Hide = TRUE ;
@@ -237,24 +239,14 @@ TabPage RID_SCPAGE_TABLE
     };
     Image IMG_LEFTRIGHT
     {
-        ImageBitmap = Bitmap { File = "lftrgt.bmp" ; };
+        ImageBitmap = Bitmap { File = "lftrgt.png" ; };
         MaskColor = STD_MASKCOLOR;
     };
-    Image IMG_LEFTRIGHT_H
-    {
-        ImageBitmap = Bitmap { File = "lftrgt_h.bmp" ; };
-        MaskColor = SC_HC_MASKCOLOR;
-    };
     Image IMG_TOPDOWN
     {
-        ImageBitmap = Bitmap { File = "topdown.bmp" ; };
+        ImageBitmap = Bitmap { File = "topdown.png" ; };
         MaskColor = STD_MASKCOLOR;
     };
-    Image IMG_TOPDOWN_H
-    {
-        ImageBitmap = Bitmap { File = "topdown_h.bmp" ; };
-        MaskColor = SC_HC_MASKCOLOR;
-    };
     CheckBox BTN_PAGENO
     {
         Pos = MAP_APPFONT ( 12 , 46 ) ;
@@ -389,28 +381,3 @@ TabPage RID_SCPAGE_TABLE
         Text [ en-US ] = "Scale" ;
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index 5ea90ef0d77d..3f22ab40772c 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -140,14 +140,6 @@ ScHFEditPage::ScHFEditPage( Window*             pParent,
     aBtnFile    .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
     aBtnTable   .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
 
-    aBtnText    .SetModeImage( Image( ScResId( IMG_TEXT_H  ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnFile    .SetModeImage( Image( ScResId( IMG_FILE_H  ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnTable   .SetModeImage( Image( ScResId( IMG_TABLE_H ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnPage    .SetModeImage( Image( ScResId( IMG_PAGE_H  ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnLastPage.SetModeImage( Image( ScResId( IMG_PAGES_H ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnDate    .SetModeImage( Image( ScResId( IMG_DATE_H  ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnTime    .SetModeImage( Image( ScResId( IMG_TIME_H  ) ), BMP_COLOR_HIGHCONTRAST );
-
     if(!bHeader)
     {
         maFtDefinedHF.SetText(ScGlobal::GetRscString( STR_FOOTER ));
@@ -708,7 +700,7 @@ void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling)
             ESelection aSel(0,0,0,0);
             aWndCenter.GetEditEngine()->QuickInsertField(SvxFieldItem( SvxFileField(), EE_FEATURE_FIELD ), aSel );
             ++aSel.nEndPos;
-            String aPageEntry(RTL_CONSTASCII_STRINGPARAM(", "));
+            String aPageEntry(RTL_CONSTASCII_USTRINGPARAM(", "));
             aPageEntry += ScGlobal::GetRscString( STR_PAGE ) ;
             aPageEntry += ' ';
             aWndCenter.GetEditEngine()->QuickInsertText(aPageEntry, ESelection(aSel.nEndPara,aSel.nEndPos, aSel.nEndPara, aSel.nEndPos));
@@ -741,7 +733,7 @@ void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling)
             aSel.nEndPos = aPageEntry.Len();
             aWndCenter.GetEditEngine()->QuickInsertField(SvxFieldItem(SvxPageField(), EE_FEATURE_FIELD), ESelection(aSel.nEndPara, aSel.nEndPos, aSel.nEndPara, aSel.nEndPos));
             ++aSel.nEndPos;
-            String aCommaSpace(RTL_CONSTASCII_STRINGPARAM(", "));
+            String aCommaSpace(RTL_CONSTASCII_USTRINGPARAM(", "));
             aWndCenter.GetEditEngine()->QuickInsertText(aCommaSpace,ESelection(aSel.nEndPara, aSel.nEndPos, aSel.nEndPara, aSel.nEndPos));
             aSel.nEndPos = sal::static_int_cast<xub_StrLen>( aSel.nEndPos + aCommaSpace.Len() );
             aWndCenter.GetEditEngine()->QuickInsertField( SvxFieldItem(SvxTableField(), EE_FEATURE_FIELD), ESelection(aSel.nEndPara, aSel.nEndPos, aSel.nEndPara, aSel.nEndPos));
@@ -762,7 +754,7 @@ void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling)
             aSel.nEndPos = aPageEntry.Len();
             aWndCenter.GetEditEngine()->QuickInsertField(SvxFieldItem(SvxPageField(), EE_FEATURE_FIELD), ESelection(aSel.nEndPara, aSel.nEndPos, aSel.nEndPara, aSel.nEndPos));
             ++aSel.nEndPos;
-            String aCommaSpace(RTL_CONSTASCII_STRINGPARAM(", "));
+            String aCommaSpace(RTL_CONSTASCII_USTRINGPARAM(", "));
             aWndCenter.GetEditEngine()->QuickInsertText(aCommaSpace,ESelection(aSel.nEndPara, aSel.nEndPos, aSel.nEndPara, aSel.nEndPos));
             aSel.nEndPos = sal::static_int_cast<xub_StrLen>( aSel.nEndPos + aCommaSpace.Len() );
             aWndCenter.GetEditEngine()->QuickInsertField( SvxFieldItem(SvxFileField(), EE_FEATURE_FIELD), ESelection(aSel.nEndPara, aSel.nEndPos, aSel.nEndPara, aSel.nEndPos));
diff --git a/sc/source/ui/pagedlg/tphf.src b/sc/source/ui/pagedlg/tphf.src
index b2f59e06da72..d6cda1047cc1 100644
--- a/sc/source/ui/pagedlg/tphf.src
+++ b/sc/source/ui/pagedlg/tphf.src
@@ -26,6 +26,7 @@
  ************************************************************************/
 
 #include "sc.hrc"
+
 PushButton RID_SCBTN_HFEDIT
 {
     TabStop = TRUE ;
@@ -34,31 +35,3 @@ PushButton RID_SCBTN_HFEDIT
     Size = MAP_APPFONT ( 50 , 14 ) ;
     Text [ en-US ] = "~Edit..." ;
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index 52d8d7cad040..d132339a3726 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -336,19 +336,16 @@ void __EXPORT ScEditWindow::LoseFocus()
     case Left:
         {
             sName = String(ScResId(STR_ACC_LEFTAREA_NAME));
-//            sDescription = String(ScResId(STR_ACC_LEFTAREA_DESCR));
         }
         break;
     case Center:
         {
             sName = String(ScResId(STR_ACC_CENTERAREA_NAME));
-//            sDescription = String(ScResId(STR_ACC_CENTERAREA_DESCR));
         }
         break;
     case Right:
         {
             sName = String(ScResId(STR_ACC_RIGHTAREA_NAME));
-//            sDescription = String(ScResId(STR_ACC_RIGHTAREA_DESCR));
         }
         break;
     }
@@ -359,38 +356,6 @@ void __EXPORT ScEditWindow::LoseFocus()
     return pAcc;
 }
 
-/*
-class ScExtIButton : public ImageButton
-{
-private:
-
-    Timer           aTimer;
-    ScPopupMenu*    pPopupMenu;
-
-    DECL_LINK( TimerHdl, Timer*);
-
-    void            DrawArrow();
-
-protected:
-
-    virtual void    MouseButtonDown( const MouseEvent& rMEvt );
-    virtual void    MouseButtonUp( const MouseEvent& rMEvt);
-
-    virtual void    StartPopup();
-
-public:
-
-    ScExtIButton(Window* pParent, const ResId& rResId );
-
-    void            SetPopupMenu(ScPopupMenu* pPopUp);
-
-    USHORT          GetSelected();
-
-    void            SetMenuHdl( const Link& rLink ) { aFxLink = rLink; }
-    const Link&     GetMenuHdl() const { return aFxLink; }
-
-}
-*/
 ScExtIButton::ScExtIButton(Window* pParent, const ResId& rResId )
 :   ImageButton(pParent,rResId),
     pPopupMenu(NULL)
@@ -398,8 +363,6 @@ ScExtIButton::ScExtIButton(Window* pParent, const ResId& rResId )
     nSelected=0;
     aTimer.SetTimeout(600);
     SetDropDown( TRUE);
-
-//  DrawArrow();
 }
 
 void ScExtIButton::SetPopupMenu(ScPopupMenu* pPopUp)
@@ -474,94 +437,5 @@ IMPL_LINK( ScExtIButton, TimerHdl, Timer*, EMPTYARG )
     return 0;
 }
 
-/*
-static void ImplDrawToolArrow( ToolBox* pBox, long nX, long nY, BOOL bBlack,
-                               BOOL bLeft = FALSE, BOOL bTop = FALSE )
-{
-    Color           aOldFillColor = pBox->GetFillColor();
-    WindowAlign     eAlign = pBox->meAlign;
-    if ( bLeft )
-        eAlign = WINDOWALIGN_RIGHT;
-    else if ( bTop )
-        eAlign = WINDOWALIGN_BOTTOM;
-
-    switch ( eAlign )
-    {
-        case WINDOWALIGN_LEFT:
-            if ( bBlack )
-                pBox->SetFillColor( Color( COL_BLACK ) );
-            pBox->DrawRect( Rectangle( nX+0, nY+0, nX+0, nY+6 ) );
-            pBox->DrawRect( Rectangle( nX+1, nY+1, nX+1, nY+5 ) );
-            pBox->DrawRect( Rectangle( nX+2, nY+2, nX+2, nY+4 ) );
-            pBox->DrawRect( Rectangle( nX+3, nY+3, nX+3, nY+3 ) );
-            if ( bBlack )
-            {
-                pBox->SetFillColor( aOldFillColor );
-                pBox->DrawRect( Rectangle( nX+1, nY+2, nX+1, nY+4 ) );
-                pBox->DrawRect( Rectangle( nX+2, nY+3, nX+2, nY+3 ) );
-            }
-            break;
-        case WINDOWALIGN_TOP:
-            if ( bBlack )
-                pBox->SetFillColor( Color( COL_BLACK ) );
-            pBox->DrawRect( Rectangle( nX+0, nY+0, nX+6, nY+0 ) );
-            pBox->DrawRect( Rectangle( nX+1, nY+1, nX+5, nY+1 ) );
-            pBox->DrawRect( Rectangle( nX+2, nY+2, nX+4, nY+2 ) );
-            pBox->DrawRect( Rectangle( nX+3, nY+3, nX+3, nY+3 ) );
-            if ( bBlack )
-            {
-                pBox->SetFillColor( aOldFillColor );
-                pBox->DrawRect( Rectangle( nX+2, nY+1, nX+4, nY+1 ) );
-                pBox->DrawRect( Rectangle( nX+3, nY+2, nX+3, nY+2 ) );
-            }
-            break;
-        case WINDOWALIGN_RIGHT:
-            if ( bBlack )
-                pBox->SetFillColor( Color( COL_BLACK ) );
-            pBox->DrawRect( Rectangle( nX+3, nY+0, nX+3, nY+6 ) );
-            pBox->DrawRect( Rectangle( nX+2, nY+1, nX+2, nY+5 ) );
-            pBox->DrawRect( Rectangle( nX+1, nY+2, nX+1, nY+4 ) );
-            pBox->DrawRect( Rectangle( nX+0, nY+3, nX+0, nY+3 ) );
-            if ( bBlack )
-            {
-                pBox->SetFillColor( aOldFillColor );
-                pBox->DrawRect( Rectangle( nX+2, nY+2, nX+2, nY+4 ) );
-                pBox->DrawRect( Rectangle( nX+1, nY+3, nX+1, nY+3 ) );
-            }
-            break;
-        case WINDOWALIGN_BOTTOM:
-            if ( bBlack )
-                pBox->SetFillColor( Color( COL_BLACK ) );
-            pBox->DrawRect( Rectangle( nX+0, nY+3, nX+6, nY+3 ) );
-            pBox->DrawRect( Rectangle( nX+1, nY+2, nX+5, nY+2 ) );
-            pBox->DrawRect( Rectangle( nX+2, nY+1, nX+4, nY+1 ) );
-            pBox->DrawRect( Rectangle( nX+3, nY+0, nX+3, nY+0 ) );
-            if ( bBlack )
-            {
-                pBox->SetFillColor( aOldFillColor );
-                pBox->DrawRect( Rectangle( nX+2, nY+2, nX+4, nY+2 ) );
-                pBox->DrawRect( Rectangle( nX+3, nY+1, nX+3, nY+1 ) );
-            }
-            break;
-    }
-}
-Down
-    - Timer starten
-
-Click
-    - Timer abbrechen
-
-Timer
-    if ( ??? )
-    {
-    - SetPressed( TRUE );
-    - EndSelection();
-    - Menu anzeigen
-    - SetPressed( FALSE );
-    }
-
-
-*/
-
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index a85ef657a3e1..56a37f438717 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -126,10 +126,8 @@ ScTablePage::ScTablePage( Window* pParent, const SfxItemSet& rCoreAttrs ) :
         aBtnTopDown         ( this, ScResId( BTN_TOPDOWN ) ),
         aBtnLeftRight       ( this, ScResId( BTN_LEFTRIGHT ) ),
         aBmpPageDir         ( this, ScResId( BMP_PAGEDIR ) ),
-        aImgLeftRight       ( ScResId( IMG_LEFTRIGHT ) ),
-        aImgTopDown         ( ScResId( IMG_TOPDOWN ) ),
-        aImgLeftRightHC     ( ScResId( IMG_LEFTRIGHT_H ) ),
-        aImgTopDownHC       ( ScResId( IMG_TOPDOWN_H ) ),
+        aImgLeftRight       (       ScResId( IMG_LEFTRIGHT ) ),
+        aImgTopDown         (       ScResId( IMG_TOPDOWN ) ),
         aBtnPageNo          ( this, ScResId( BTN_PAGENO ) ),
         aEdPageNo           ( this, ScResId( ED_PAGENO ) ),
         aFlPrint            ( this, ScResId( FL_PRINT ) ),
@@ -169,11 +167,8 @@ ScTablePage::ScTablePage( Window* pParent, const SfxItemSet& rCoreAttrs ) :
 
 void ScTablePage::ShowImage()
 {
-    bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
     bool bLeftRight = aBtnLeftRight.IsChecked();
-    aBmpPageDir.SetImage( bHC ?
-        (bLeftRight ? aImgLeftRightHC : aImgTopDownHC) :
-        (bLeftRight ? aImgLeftRight : aImgTopDown) );
+    aBmpPageDir.SetImage( (bLeftRight ? aImgLeftRight : aImgTopDown) );
 }
 
 // -----------------------------------------------------------------------
diff --git a/sc/source/ui/src/attrdlg.src b/sc/source/ui/src/attrdlg.src
index ae130f7e8a96..bcdf62261fc2 100644
--- a/sc/source/ui/src/attrdlg.src
+++ b/sc/source/ui/src/attrdlg.src
@@ -162,42 +162,3 @@ TabPage RID_SCPAGE_PROTECTION
         Text [ en-US ] = "Print" ;
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/src/autofmt.src b/sc/source/ui/src/autofmt.src
index cb56f6ac85a4..98261b94ef15 100644
--- a/sc/source/ui/src/autofmt.src
+++ b/sc/source/ui/src/autofmt.src
@@ -169,8 +169,6 @@ ModalDialog RID_SCDLG_AUTOFORMAT
     String STR_ADD_TITLE
     {
         /* ### ACHTUNG: Neuer Text in Resource? AutoFormat hinzufügen : Autoformat hinzufügen */
-        /* ### ACHTUNG: Neuer Text in Resource? AutoFormat hinzufügen : Autoformat hinzufügen */
-        /* ### ACHTUNG: Neuer Text in Resource? AutoFormat hinzufügen : AutoFormat hinzuf³gen */
         Text [ en-US ] = "Add AutoFormat" ;
     };
 
@@ -229,43 +227,3 @@ ModalDialog RID_SCDLG_AUTOFORMAT
         Text [ en-US ] = "Total" ;
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/src/condfrmt.src b/sc/source/ui/src/condfrmt.src
index 3018cc867e0d..8b73bd52e86b 100644
--- a/sc/source/ui/src/condfrmt.src
+++ b/sc/source/ui/src/condfrmt.src
@@ -26,6 +26,7 @@
  ************************************************************************/
 
 #include "condfrmt.hrc"
+
 ModelessDialog RID_SCDLG_CONDFORMAT
 {
     OutputSize = TRUE ;
@@ -357,42 +358,3 @@ ModelessDialog RID_SCDLG_CONDFORMAT
     };
     Text [ en-US ] = "Conditional Formatting" ;
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/src/crnrdlg.src b/sc/source/ui/src/crnrdlg.src
index b16a3506bf7b..f3560abede75 100644
--- a/sc/source/ui/src/crnrdlg.src
+++ b/sc/source/ui/src/crnrdlg.src
@@ -25,6 +25,7 @@
  *
  ************************************************************************/
 #include "crnrdlg.hrc"
+
 ModelessDialog RID_SCDLG_COLROWNAMERANGES
 {
     OutputSize = TRUE ;
@@ -131,36 +132,3 @@ ModelessDialog RID_SCDLG_COLROWNAMERANGES
     };
     Text [ en-US ] = "Define Label Range" ;
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/src/dbnamdlg.src b/sc/source/ui/src/dbnamdlg.src
index 50152d95d9d5..c88491341310 100644
--- a/sc/source/ui/src/dbnamdlg.src
+++ b/sc/source/ui/src/dbnamdlg.src
@@ -175,24 +175,3 @@ ModelessDialog RID_SCDLG_DBNAMES
         Text [ en-US ] = "Invalid range" ;
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index a3fd6d5b7116..9c5caaee81d1 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -27,8 +27,6 @@
 #include "globstr.hrc"
 #include "sc.hrc"
 
-
-
 Resource RID_GLOBSTR
 {
     String STR_UNDO_INSERTCELLS
diff --git a/sc/source/ui/src/hdrcont.src b/sc/source/ui/src/hdrcont.src
index e4a82d38ec98..91d83fb3aa13 100644
--- a/sc/source/ui/src/hdrcont.src
+++ b/sc/source/ui/src/hdrcont.src
@@ -217,40 +217,3 @@ Menu RID_POPUP_COLHEADER
         };
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/src/miscdlgs.src b/sc/source/ui/src/miscdlgs.src
index 6d4761c8589c..5793d4237790 100644
--- a/sc/source/ui/src/miscdlgs.src
+++ b/sc/source/ui/src/miscdlgs.src
@@ -90,6 +90,7 @@ ModalDialog RID_SCDLG_DELCELL
         Text [ en-US ] = "Selection" ;
     };
 };
+
 ModalDialog RID_SCDLG_INSCELL
 {
     OutputSize = TRUE ;
@@ -432,6 +433,7 @@ ModalDialog RID_SCDLG_INSCONT
         Size = MAP_APPFONT( 1 , 38 ) ;
     };
 };
+
 ModalDialog RID_SCDLG_MOVETAB
 {
     OutputSize = TRUE ;
@@ -499,6 +501,7 @@ ModalDialog RID_SCDLG_MOVETAB
         Text [ en-US ] = "- new document -" ;
     };
 };
+
 ModalDialog RID_SCDLG_STRINPUT
 {
     OutputSize = TRUE ;
@@ -538,6 +541,7 @@ ModalDialog RID_SCDLG_STRINPUT
         Size = MAP_APPFONT ( 110 , 8 ) ;
     };
 };
+
 ModalDialog RID_SCDLG_TAB_BG_COLOR
 {
     OutputSize = TRUE ;
@@ -582,105 +586,6 @@ ModalDialog RID_SCDLG_TAB_BG_COLOR
         DefButton = FALSE ;
     };
 };
-/*
-ModalDialog RID_SCDLG_TAB_BG_COLOR
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 180 , 150 ) ;
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    Control TAB_BG_COLOR_CT_BORDER
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 1 , 1 ) ; //12, 32
-        Size = MAP_APPFONT ( 116+2 , 145+2 ) ;
-        DialogControl = TRUE;
-    };
-    Control TAB_BG_COLOR_SET_BGDCOLOR
-    {
-        // * HelpId = HID_BACKGROUND_CTL_BGDCOLORSET ;
-        Hide = FALSE ;
-        Pos = MAP_APPFONT ( 0 , 0 ) ;
-        Size = MAP_APPFONT ( 116 , 145 ) ;
-        TabStop = TRUE ;
-    };
-    OKButton BTN_OK
-    {
-        Pos = MAP_APPFONT ( 125 , 50 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 125 , 67 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = FALSE ;
-    };
-    HelpButton BTN_HELP
-    {
-        Pos = MAP_APPFONT ( 125 , 84 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = FALSE ;
-    };
-};
-*/
-/*
-ModalDialog RID_SCDLG_MTRINPUT
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 190 , 63 ) ;
-    Moveable = TRUE ;
-    Closeable = FALSE ;
-    OKButton BTN_OK
-    {
-        Pos = MAP_APPFONT ( 136 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 136 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BTN_HELP
-    {
-        Pos = MAP_APPFONT ( 136 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    FixedText FT_LABEL
-    {
-        Pos = MAP_APPFONT ( 6 , 8 ) ;
-        Size = MAP_APPFONT ( 60 , 10 ) ;
-    };
-    MetricField ED_VALUE
-    {
-         // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen
-        HelpId = HID_SC_MTRIN_VAL ;
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 70 , 6 ) ;
-        Size = MAP_APPFONT ( 60 , 12 ) ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-    };
-    CheckBox BTN_DEFVAL
-    {
-         // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen
-        TabStop = TRUE ;
-        Pos = MAP_APPFONT ( 70 , 24 ) ;
-        Size = MAP_APPFONT ( 58 , 10 ) ;
-        Text [ en-US ] = "~Default value" ;
-    };
-};
-*/
 
 ModalDialog RID_SCDLG_COL_MAN
 {
@@ -1458,6 +1363,3 @@ ModalDialog RID_SCDLG_CHARTCOLROW
     };
     Text [ en-US ] = "Change Source Data Range" ;
 };
-
-
-
diff --git a/sc/source/ui/src/opredlin.src b/sc/source/ui/src/opredlin.src
index a8c2daf4892a..86a5fc6498d4 100644
--- a/sc/source/ui/src/opredlin.src
+++ b/sc/source/ui/src/opredlin.src
@@ -97,40 +97,3 @@ TabPage RID_SCPAGE_OPREDLINE
         Text [ en-US ] = "By author" ;
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
index 33aefbc2f5ba..9111205c0f13 100644
--- a/sc/source/ui/src/optdlg.src
+++ b/sc/source/ui/src/optdlg.src
@@ -114,11 +114,6 @@ TabPage RID_SCPAGE_CALC
         Size = MAP_APPFONT ( 121 , 8 ) ;
         Text [ en-US ] = "Date" ;
     };
-    FixedLine FL_H_SEPARATOR
-    {
-        Pos = MAP_APPFONT ( 6 , 64 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-    };
     CheckBox BTN_CASE
     {
         Pos = MAP_APPFONT ( 12 , 77 ) ;
diff --git a/sc/source/ui/src/optsolver.src b/sc/source/ui/src/optsolver.src
index 2fc5cf3a3c54..5ce6fa724475 100644
--- a/sc/source/ui/src/optsolver.src
+++ b/sc/source/ui/src/optsolver.src
@@ -402,8 +402,6 @@ ModelessDialog RID_SCDLG_OPTSOLVER
         DefButton = TRUE ;
     };
 
-    // IMG_DEL_H not used - image is set dynamically
-
     String STR_INVALIDINPUT
     {
         Text [ en-US ] = "Invalid input." ;
diff --git a/sc/source/ui/src/pseudo.src b/sc/source/ui/src/pseudo.src
index e3d27edf0ecb..73f78d1be0b8 100644
--- a/sc/source/ui/src/pseudo.src
+++ b/sc/source/ui/src/pseudo.src
@@ -25,38 +25,4 @@
  *
  ************************************************************************/
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 #include <svx/svxids.hrc>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/src/sc.src b/sc/source/ui/src/sc.src
index dae422e15cd0..62da4f53488b 100644
--- a/sc/source/ui/src/sc.src
+++ b/sc/source/ui/src/sc.src
@@ -27,8 +27,6 @@
 
 #include "sc.hrc" // -> #include <sfx.hrc>
 
-
-
 // App-Titel------------------------------------------------------
 
 String RID_APPTITLE
@@ -41,8 +39,6 @@ String RID_APPTITLE
 
  // Icons & Bitmaps: ----------------------------------------------------------
 
-
-
  // ???
 String 30001 { Text = "Dummy1" ; };
 String 30002 { Text = "Dummy2" ; };
diff --git a/sc/source/ui/src/scerrors.src b/sc/source/ui/src/scerrors.src
index bdb76b2b710c..2a2e2ad47169 100644
--- a/sc/source/ui/src/scerrors.src
+++ b/sc/source/ui/src/scerrors.src
@@ -132,7 +132,7 @@ Resource RID_ERRHDLSC
     };
     String SCWARN_IMPORT_SHEET_OVERFLOW & ERRCODE_RES_MASK
     {
-        Text [ en-US ] = "Some sheets could not be loaded because the maximum number of sheets was exceeded." ;
+        Text [ en-US ] = "Not all sheets have been loaded because the maximum number of sheets was exceeded.\n\nPlease be warned that re-saving this document will permanently delete those sheets that have not been loaded!" ;
     };
     String SCWARN_IMPORT_OPEN_FM3 & ERRCODE_RES_MASK
     {
@@ -167,4 +167,3 @@ Resource RID_ERRHDLSC
         Text [ en-US ] = "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col).";
     };
 };
-
diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src
index 9c47a42239cc..310364fdeb5f 100644
--- a/sc/source/ui/src/scstring.src
+++ b/sc/source/ui/src/scstring.src
@@ -24,6 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
 #include "sc.hrc" // -> #include <sfx.hrc>
 
  // Strings fuer Interface-Namen ------------------------------------------
@@ -32,38 +33,47 @@ String SCSTR_APPLICATION
 {
     Text [ en-US ] = "%PRODUCTNAME Calc 6.0";
 };
+
 String SCSTR_50_APPLICATION
 {
     Text [ en-US ] = "StarCalc  5.0" ;
 };
+
 String SCSTR_40_APPLICATION
 {
     Text [ en-US ] = "StarCalc 4.0" ;
 };
+
 String SCSTR_30_APPLICATION
 {
     Text [ en-US ] = "StarCalc 3.0" ;
 };
+
 String SCSTR_LONG_SCDOC_NAME
 {
     Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION Spreadsheet";
 };
+
 String SCSTR_50_LONG_DOCNAME
 {
     Text [ en-US ] = "%PRODUCTNAME 5.0 Spreadsheet" ;
 };
+
 String SCSTR_40_LONG_DOCNAME
 {
     Text [ en-US ] = "%PRODUCTNAME 4.0 Spreadsheet" ;
 };
+
 String SCSTR_30_LONG_DOCNAME
 {
     Text [ en-US ] = "StarCalc 3.0 Spreadsheet" ;
 };
+
 String SCSTR_SHORT_SCDOC_NAME
 {
     Text [ en-US ] = "Spreadsheet" ;
 };
+
 String SCSTR_HUMAN_SCDOC_NAME
 {
     Text [ en-US ] = "Spreadsheet" ;
@@ -89,7 +99,6 @@ String SCSTR_FORMATSHELL
     Text [ en-US ] = "Formats for Cells";
 };
 
-
 String SCSTR_DRAWSHELL
 {
     Text [ en-US ] = "Graphics objects" ;
@@ -119,6 +128,7 @@ String SCSTR_GRAPHICSHELL
 {
     Text [ en-US ] = "Graphics";
 };
+
 String SCSTR_PAGEBREAKSHELL
 {
     Text [ en-US ] = "Pagebreak";
@@ -150,148 +160,182 @@ String STR_ROWHEIGHT
 {
     Text [ en-US ] = "Height" ;
 };
+
 String STR_OPT_ROWHEIGHT
 {
     Text [ en-US ] = "Add" ;
 };
+
 String STR_ROWHEIGHT_TITLE
 {
     Text [ en-US ] = "Row Height" ;
 };
+
 String STR_OPT_ROWHEIGHT_TITLE
 {
     Text [ en-US ] = "Optimal Row Height" ;
 };
+
 String STR_COLWIDTH
 {
     Text [ en-US ] = "Width" ;
 };
+
 String STR_OPT_COLWIDTH
 {
     Text [ en-US ] = "Add" ;
 };
+
 String STR_COLWIDTH_TITLE
 {
     Text [ en-US ] = "Column Width" ;
 };
+
 String STR_OPT_COLWIDTH_TITLE
 {
     Text [ en-US ] = "Optimal Column Width" ;
 };
+
 String SCSTR_UNDEFINED
 {
     Text [ en-US ] = "- undefined -" ;
 };
+
 String SCSTR_NONE
 {
     Text [ en-US ] = "- none -" ;
 };
+
 String SCSTR_EMPTY
 {
     Text [ en-US ] = "- empty -" ;
 };
+
 String SCSTR_NOTEMPTY
 {
     Text [ en-US ] = "- not empty -" ;
 };
+
 String SCSTR_NEWTABLE
 {
     Text [ en-US ] = "- new sheet -" ;
 };
+
 String SCSTR_ALL
 {
     Text [ en-US ] = "- all -" ;
 };
+
 String SCSTR_STDFILTER
 {
     Text [ en-US ] = "Standard Filter..." ;
 };
+
 String SCSTR_TOP10FILTER
 {
     Text [ en-US ] = "Top 10" ;
 };
+
 String SCSTR_NONAME
 {
     Text [ en-US ] = "unnamed" ;
 };
+
 String SCSTR_COLUMN
 {
     Text [ en-US ] = "Column" ;
 };
+
 String SCSTR_ROW
 {
     Text [ en-US ] = "Row" ;
 };
+
 String SCSTR_NEW
 {
     Text [ en-US ] = "~New" ;
 };
+
 String SCSTR_ADD
 {
     Text [ en-US ] = "~Add" ;
 };
+
 String SCSTR_REMOVE
 {
     Text [ en-US ] = "~Delete" ;
 };
+
 String SCSTR_CANCEL
 {
     Text [ en-US ] = "Cance~l" ;
 };
+
 String SCSTR_MODIFY
 {
     Text [ en-US ] = "Modif~y" ;
 };
 
-
 String SCSTR_SHOWTABLE
 {
     Text [ en-US ] = "Show Sheet" ;
 };
+
 String SCSTR_HIDDENTABLES
 {
     Text [ en-US ] = "Hidden Sheets" ;
 };
+
 String SCSTR_SELECTDB
 {
     Text [ en-US ] = "Select Database Range" ;
 };
+
 String SCSTR_AREAS
 {
     Text [ en-US ] = "Ranges" ;
 };
+
 String SCSTR_TABLE
 {
     Text [ en-US ] = "Sheet" ;
 };
+
 String SCSTR_NAME
 {
     Text [ en-US ] = "Name" ;
 };
+
 String SCSTR_INSTABLE
 {
     Text [ en-US ] = "Insert Sheet" ;
 };
+
 String SCSTR_APDTABLE
 {
     Text [ en-US ] = "Append Sheet" ;
 };
+
 String SCSTR_RENAMETAB
 {
     Text [ en-US ] = "Rename Sheet" ;
 };
+
 String SCSTR_SET_TAB_BG_COLOR
 {
     Text [ en-US ] = "Tab Color" ;
 };
+
 String SCSTR_NO_TAB_BG_COLOR
 {
     Text [ en-US ] = "Default" ;
 };
+
 String SCSTR_RENAMEOBJECT
 {
     Text [ en-US ] = "Name Object";
 };
+
 String STR_INSERTGRAPHIC
 {
     Text [ en-US ] = "Insert Picture" ;
@@ -303,50 +347,62 @@ String SCSTR_HOR_JUSTIFY_LEFT
 {
     Text [ en-US ] = "Align left" ;
 };
+
 String SCSTR_HOR_JUSTIFY_CENTER
 {
     Text [ en-US ] = "Centered horizontally" ;
 };
+
 String SCSTR_HOR_JUSTIFY_RIGHT
 {
     Text [ en-US ] = "Align right" ;
 };
+
 String SCSTR_HOR_JUSTIFY_BLOCK
 {
     Text [ en-US ] = "Justify" ;
 };
+
 String SCSTR_HOR_JUSTIFY_REPEAT
 {
     Text [ en-US ] = "Repeat alignment" ;
 };
+
 String SCSTR_HOR_JUSTIFY_STANDARD
 {
     Text [ en-US ] = "Horizontal alignment default" ;
 };
+
 String SCSTR_VER_JUSTIFY_TOP
 {
     Text [ en-US ] = "Align to top" ;
 };
+
 String SCSTR_VER_JUSTIFY_CENTER
 {
     Text [ en-US ] = "Centered vertically" ;
 };
+
 String SCSTR_VER_JUSTIFY_BOTTOM
 {
     Text [ en-US ] = "Align to bottom" ;
 };
+
 String SCSTR_VER_JUSTIFY_STANDARD
 {
     Text [ en-US ] = "Vertical alignment default" ;
 };
+
 String SCSTR_ORIENTATION_TOPBOTTOM
 {
     Text [ en-US ] = "Top to bottom" ;
 };
+
 String SCSTR_ORIENTATION_BOTTOMTOP
 {
     Text [ en-US ] = "Bottom to Top" ;
 };
+
 String SCSTR_ORIENTATION_STANDARD
 {
     Text [ en-US ] = "Default orientation" ;
@@ -356,30 +412,37 @@ String SCSTR_PROTECTDOC
 {
     Text [ en-US ] = "Protect Document" ;
 };
+
 String SCSTR_UNPROTECTDOC
 {
     Text [ en-US ] = "Unprotect document" ;
 };
+
 String SCSTR_PROTECTTAB
 {
     Text [ en-US ] = "Protect Sheet" ;
 };
+
 String SCSTR_UNPROTECTTAB
 {
     Text [ en-US ] = "Unprotect sheet" ;
 };
+
 String SCSTR_CHG_PROTECT
 {
     Text [ en-US ] = "Protect Records" ;
 };
+
 String SCSTR_CHG_UNPROTECT
 {
     Text [ en-US ] = "Unprotect Records" ;
 };
+
 String SCSTR_PASSWORD
 {
     Text [ en-US ] = "Password:" ;
 };
+
 String SCSTR_PASSWORDOPT
 {
     Text [ en-US ] = "Password (optional):" ;
@@ -455,18 +518,22 @@ String SCSTR_VALID_MINIMUM
 {
     Text [ en-US ] = "~Minimum" ;
 };
+
 String SCSTR_VALID_MAXIMUM
 {
     Text [ en-US ] = "~Maximum" ;
 };
+
 String SCSTR_VALID_VALUE
 {
     Text [ en-US ] = "~Value" ;
 };
+
 String SCSTR_VALID_RANGE
 {
     Text [ en-US ] = "~Source" ;
 };
+
 String SCSTR_VALID_LIST
 {
     Text [ en-US ] = "~Entries" ;
@@ -505,26 +572,32 @@ String SCSTR_GRFILTER_OPENERROR
 {
     Text [ en-US ] = "Graphics file can not be opened" ;
 };
+
 String SCSTR_GRFILTER_IOERROR
 {
     Text [ en-US ] = "Graphics file can not be read" ;
 };
+
 String SCSTR_GRFILTER_FORMATERROR
 {
     Text [ en-US ] = "Unknown graphic format" ;
 };
+
 String SCSTR_GRFILTER_VERSIONERROR
 {
     Text [ en-US ] = "This graphic file version is not supported" ;
 };
+
 String SCSTR_GRFILTER_FILTERERROR
 {
     Text [ en-US ] = "Graphics filter not found" ;
 };
+
 String SCSTR_GRFILTER_TOOBIG
 {
     Text [ en-US ] = "Not enough memory available to insert graphics." ;
 };
+
 String SCSTR_UNDO_GRAFFILTER
 {
     Text [ en-US ] = "Graphics Filter" ;
@@ -769,3 +842,7 @@ StringArray SCSTR_PRINT_OPTIONS
     };
 };
 
+String SCSTR_WARN_ME_IN_FUTURE_CHECK
+{
+    Text [ en-US ] = "Warn me about this in the future.";
+};
diff --git a/sc/source/ui/src/scwarngs.src b/sc/source/ui/src/scwarngs.src
index 9cd22567d77c..15792a596e46 100644
--- a/sc/source/ui/src/scwarngs.src
+++ b/sc/source/ui/src/scwarngs.src
@@ -28,8 +28,6 @@
 #include "scwarngs.hxx"
 #include "sc.hrc"
 
-
-
 #define SH_MAX 0x7fff
 
 Resource RID_WRNHDLSC
@@ -43,41 +41,4 @@ Resource RID_WRNHDLSC
         /* ### ACHTUNG: Neuer Text in Resource? Die Maximalanzahl von Zeilen wurde überschritten. überzählige Zeilen wurden nicht mitimportiert! : Die Maximalanzahl von Zeilen wurde ³berschritten. ³berzõhlige Zeilen wurden nicht mitimportiert! */
         Text [ en-US ] = "The number of rows exceeded the maximum. Additional rows were not imported!" ;
     };
-    /*
-    String ERRCODE_SC_  & SH_MAX
-        {
-    Text = "";
-        };
-*/
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/src/simpref.src b/sc/source/ui/src/simpref.src
index 03f41c1a56aa..2c8dfd665fcb 100644
--- a/sc/source/ui/src/simpref.src
+++ b/sc/source/ui/src/simpref.src
@@ -26,16 +26,15 @@
  ************************************************************************/
 
 #include "simpref.hrc"
+
 ModelessDialog RID_SCDLG_SIMPLEREF
 {
     OutputSize = TRUE ;
-     //HelpId = SID_DEFINE_DBNAME ;
     Hide = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 222 , 60 ) ;
     Text = "Bereich festlegen" ;
     Moveable = TRUE ;
-     // Closeable = TRUE;   // Dieser Dialog hat einen Cancel-Button !
     FixedText FT_ASSIGN
     {
         Pos = MAP_APPFONT ( 6 , 6 ) ;
@@ -76,30 +75,3 @@ ModelessDialog RID_SCDLG_SIMPLEREF
         TabStop = TRUE ;
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/src/solveroptions.src b/sc/source/ui/src/solveroptions.src
index 0a3432344f35..87c75277f413 100644
--- a/sc/source/ui/src/solveroptions.src
+++ b/sc/source/ui/src/solveroptions.src
@@ -95,7 +95,6 @@ ModalDialog RID_SCDLG_SOLVEROPTIONS
     Text [ en-US ] = "Options" ;
 };
 
-
 ModalDialog RID_SCDLG_SOLVER_INTEGER
 {
     OutputSize = TRUE ;
@@ -186,4 +185,3 @@ ModalDialog RID_SCDLG_SOLVER_DOUBLE
     };
     Text [ en-US ] = "Edit Setting" ;
 };
-
diff --git a/sc/source/ui/src/solvrdlg.src b/sc/source/ui/src/solvrdlg.src
index 6a8a3d955644..2dc1a8ef01c1 100644
--- a/sc/source/ui/src/solvrdlg.src
+++ b/sc/source/ui/src/solvrdlg.src
@@ -26,6 +26,7 @@
  ************************************************************************/
 
 #include "solvrdlg.hrc"
+
 ModelessDialog RID_SCDLG_SOLVER
 {
     OutputSize = TRUE ;
diff --git a/sc/source/ui/src/sortdlg.src b/sc/source/ui/src/sortdlg.src
index 1062eb58e1dc..3eb7e43585d0 100644
--- a/sc/source/ui/src/sortdlg.src
+++ b/sc/source/ui/src/sortdlg.src
@@ -25,6 +25,7 @@
  *
  ************************************************************************/
 #include "sortdlg.hrc"
+
 TabPage RID_SCPAGE_SORT_FIELDS
 {
     Hide = TRUE ;
@@ -116,6 +117,7 @@ TabPage RID_SCPAGE_SORT_FIELDS
         Text [ en-US ] = "T~hen by" ;
     };
 };
+
 TabPage RID_SCPAGE_SORT_OPTIONS
 {
     Hide = TRUE ;
@@ -158,7 +160,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS
         Text [ de ] = "Enable ~natural sort" ;
         Text [ en-US ] = "Enable ~natural sort" ;
         Text [ cs ] = "Aktivovat přirozené třídění" ;
-       Text [ sk ] = "Aktivovať prirodzené triedenie" ;
+        Text [ sk ] = "Aktivovať prirodzené triedenie" ;
         TabStop = TRUE ;
         Text [ x-comment ] = " " ;
     };
@@ -250,15 +252,8 @@ TabPage RID_SCPAGE_SORT_OPTIONS
         Text [ en-US ] = "L~eft to right (sort columns)" ;
         TabStop = TRUE ;
     };
-/*
-    FixedText FT_AREA_LABEL
-    {
-        Pos = MAP_APPFONT ( 6 , 171 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Data area:" ;
-    };
-*/
 };
+
 TabDialog RID_SCDLG_SORT
 {
     OutputSize = TRUE ;
diff --git a/sc/source/ui/src/subtdlg.src b/sc/source/ui/src/subtdlg.src
index c0bcfba1b07b..1fe9bb0d777a 100644
--- a/sc/source/ui/src/subtdlg.src
+++ b/sc/source/ui/src/subtdlg.src
@@ -181,10 +181,12 @@ TabPage RID_SCPAGE_SUBT_GROUP1 < RID_SUBTBASE
 {
     HelpId = HID_SCPAGE_SUBT_GROUP1 ;
 };
+
 TabPage RID_SCPAGE_SUBT_GROUP2 < RID_SUBTBASE
 {
     HelpId = HID_SCPAGE_SUBT_GROUP2 ;
 };
+
 TabPage RID_SCPAGE_SUBT_GROUP3 < RID_SUBTBASE
 {
     HelpId = HID_SCPAGE_SUBT_GROUP3 ;
@@ -237,55 +239,3 @@ TabDialog RID_SCDLG_SUBTOTALS
         TabStop = TRUE ;
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/src/tabopdlg.src b/sc/source/ui/src/tabopdlg.src
index 25af654f4147..e4f99ab59596 100644
--- a/sc/source/ui/src/tabopdlg.src
+++ b/sc/source/ui/src/tabopdlg.src
@@ -26,6 +26,7 @@
  ************************************************************************/
 
 #include "tabopdlg.hrc"
+
 ModelessDialog RID_SCDLG_TABOP
 {
     OutputSize = TRUE ;
diff --git a/sc/source/ui/src/textdlgs.src b/sc/source/ui/src/textdlgs.src
index 2b0e408262ba..6b2321ad2017 100644
--- a/sc/source/ui/src/textdlgs.src
+++ b/sc/source/ui/src/textdlgs.src
@@ -25,8 +25,6 @@
  *
  ************************************************************************/
 
-
-
 #include <svx/dialogs.hrc>
 #include "sc.hrc"
 
@@ -112,13 +110,6 @@ TabDialog RID_SCDLG_PARAGRAPH
                 Text [ en-US ] = "Indents & Spacing" ;
                 PageResID = RID_SVXPAGE_STD_PARAGRAPH ;
             };
-            /*
-            PageItem  {
-                    Identifier = RID_SVXPAGE_EXT_PARAGRAPH;
-                    Text [ en-US ] = "Paragraph (Extensions)";
-                    PageResID = RID_SVXPAGE_EXT_PARAGRAPH;
-                };
-*/
             PageItem
             {
                 Identifier = RID_SVXPAGE_ALIGN_PARAGRAPH ;
@@ -165,33 +156,3 @@ TabDialog RID_SCDLG_PARAGRAPH
         TabStop = TRUE ;
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/src/toolbox.src b/sc/source/ui/src/toolbox.src
index 6e4b89e5faa0..2834917c4317 100644
--- a/sc/source/ui/src/toolbox.src
+++ b/sc/source/ui/src/toolbox.src
@@ -260,11 +260,11 @@ FloatingWindow RID_TBXCTL_INSOBJ
 #define DEFAULT_IDLIST \
     IdList = {                                          \
         /* Eingabezeile */                              \
-        SID_INPUT_FUNCTION;             /* 20047 */     \
-        SID_INPUT_SUM;                  /* 20048 */     \
-        SID_INPUT_EQUAL;                /* 20049 */     \
-        SID_INPUT_CANCEL;                               \
-        SID_INPUT_OK;                                   \
+        SID_INPUT_FUNCTION;             /* 26047 */     \
+        SID_INPUT_SUM;                  /* 26048 */     \
+        SID_INPUT_EQUAL;                /* 26049 */     \
+        SID_INPUT_CANCEL;               /* 26050 */     \
+        SID_INPUT_OK;                   /* 26051 */     \
     };                                                  \
     IdCount = {                                         \
         5;                                              \
@@ -283,17 +283,3 @@ ImageList RID_DEFAULTIMAGELIST_LC
     MaskColor = STD_MASKCOLOR ;
     DEFAULT_IDLIST
 };
-
-ImageList RID_DEFAULTIMAGELIST_SCH
-{
-    Prefix = "sch";
-    MaskColor = SC_HC_MASKCOLOR ;
-    DEFAULT_IDLIST
-};
-
-ImageList RID_DEFAULTIMAGELIST_LCH
-{
-    Prefix = "lch";
-    MaskColor = SC_HC_MASKCOLOR ;
-    DEFAULT_IDLIST
-};
diff --git a/sc/source/ui/styleui/makefile.mk b/sc/source/ui/styleui/makefile.mk
index ccbd2e14f34c..16cdb2e7b791 100644
--- a/sc/source/ui/styleui/makefile.mk
+++ b/sc/source/ui/styleui/makefile.mk
@@ -41,6 +41,9 @@ CXXFILES =  \
     styledlg.cxx
 
 SLOFILES =  \
+    $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
     $(SLO)$/styledlg.obj \
 
 SRS1NAME=$(TARGET)
diff --git a/sc/source/ui/styleui/scstyles.src b/sc/source/ui/styleui/scstyles.src
index 1968b6dca877..b70db0e615e2 100644
--- a/sc/source/ui/styleui/scstyles.src
+++ b/sc/source/ui/styleui/scstyles.src
@@ -27,6 +27,7 @@
 
 #include "sc.hrc"
 #include <svl/style.hrc>
+
 #define IMPL_FAMILY(family,filter) \
     StyleFamily = family;                       \
     FilterList = { filter }
@@ -43,14 +44,15 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
             < STR_STYLE_FILTER_USED ; SFXSTYLEBIT_USED ; > ;
             < STR_STYLE_FILTER_USERDEF ; SFXSTYLEBIT_USERDEF ; > ; ) ;
             Text [ en-US ] = "Cell Styles" ;
-};
+        };
+
         SfxStyleFamilyItem
         {
             IMPL_FAMILY ( SFX_STYLE_FAMILY_PAGE ,
             < STR_STYLE_FILTER_ALL ; SFXSTYLEBIT_ALL ; > ;
             < STR_STYLE_FILTER_USERDEF ; SFXSTYLEBIT_USERDEF ; > ; ) ;
             Text [ en-US ] = "Page Styles" ;
-};
+        };
     };
 
     //  style family images are now taken from an ImageList
@@ -60,11 +62,5 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
         Prefix = "sf";
         MaskColor = STD_MASKCOLOR ;
         IdList = { 1; 2; };
-};
-    ImageList 2 // == BMP_COLOR_HIGHCONTRAST + 1
-    {
-        Prefix = "sfh";
-        MaskColor = SC_HC_MASKCOLOR ;
-        IdList = { 1; 2; };
-};
+    };
 };
diff --git a/sc/source/ui/styleui/styledlg.src b/sc/source/ui/styleui/styledlg.src
index 4c862e21ebd0..5fac741b05cb 100644
--- a/sc/source/ui/styleui/styledlg.src
+++ b/sc/source/ui/styleui/styledlg.src
@@ -27,6 +27,7 @@
 
 #include "sc.hrc"
 #include "styledlg.hrc" // -> TP_xxx
+
 TabDialog RID_SCDLG_STYLES_PAR
 {
     OutputSize = TRUE ;
@@ -86,6 +87,7 @@ TabDialog RID_SCDLG_STYLES_PAR
         };
     };
 };
+
 TabDialog RID_SCDLG_STYLES_PAGE
 {
     OutputSize = TRUE ;
@@ -134,39 +136,3 @@ TabDialog RID_SCDLG_STYLES_PAGE
         };
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sc/source/ui/undo/makefile.mk b/sc/source/ui/undo/makefile.mk
index 2b8dd60df32d..12c94fd32cc9 100644
--- a/sc/source/ui/undo/makefile.mk
+++ b/sc/source/ui/undo/makefile.mk
@@ -56,26 +56,23 @@ CXXFILES = \
 
 
 SLOFILES =  \
-        $(SLO)$/target.obj \
-        $(SLO)$/refundo.obj \
+        $(EXCEPTIONSFILES) \
+        $(SLO)$/target.obj
+
+EXCEPTIONSFILES= \
         $(SLO)$/areasave.obj \
+        $(SLO)$/refundo.obj \
         $(SLO)$/undobase.obj \
-        $(SLO)$/undoutil.obj \
-        $(SLO)$/undocell.obj \
-        $(SLO)$/undostyl.obj \
-        $(SLO)$/undoolk.obj \
         $(SLO)$/undoblk.obj \
         $(SLO)$/undoblk2.obj \
         $(SLO)$/undoblk3.obj \
+        $(SLO)$/undocell.obj \
         $(SLO)$/undodat.obj \
         $(SLO)$/undodraw.obj \
-        $(SLO)$/undotab.obj
-
-EXCEPTIONSFILES= \
-    $(SLO)$/undoblk3.obj \
-    $(SLO)$/undocell.obj \
-    $(SLO)$/undostyl.obj \
-    $(SLO)$/undotab.obj
+        $(SLO)$/undoolk.obj \
+        $(SLO)$/undostyl.obj \
+        $(SLO)$/undotab.obj \
+        $(SLO)$/undoutil.obj
 
 # --- Tagets -------------------------------------------------------
 
diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx
index e9618d43210c..4b4a0381e18f 100644
--- a/sc/source/ui/unoobj/addruno.cxx
+++ b/sc/source/ui/unoobj/addruno.cxx
@@ -117,7 +117,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getProp
         {
             {MAP_CHAR_LEN(SC_UNONAME_ADDRESS),  0,  &getCppuType((table::CellRangeAddress*)0), 0, 0 },
             {MAP_CHAR_LEN(SC_UNONAME_PERSREPR), 0,  &getCppuType((rtl::OUString*)0),    0, 0 },
-            {MAP_CHAR_LEN(SC_UNONAME_XL_A1_REPR), 0,  &getCppuType((rtl::OUString*)0),    0, 0 },
+            {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0,  &getCppuType((rtl::OUString*)0),    0, 0 },
             {MAP_CHAR_LEN(SC_UNONAME_REFSHEET), 0,  &getCppuType((sal_Int32*)0),        0, 0 },
             {MAP_CHAR_LEN(SC_UNONAME_UIREPR),   0,  &getCppuType((rtl::OUString*)0),    0, 0 },
             {0,0,0,0,0,0}
@@ -131,7 +131,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getProp
         {
             {MAP_CHAR_LEN(SC_UNONAME_ADDRESS),  0,  &getCppuType((table::CellAddress*)0), 0, 0 },
             {MAP_CHAR_LEN(SC_UNONAME_PERSREPR), 0,  &getCppuType((rtl::OUString*)0),    0, 0 },
-            {MAP_CHAR_LEN(SC_UNONAME_XL_A1_REPR), 0,  &getCppuType((rtl::OUString*)0),    0, 0 },
+            {MAP_CHAR_LEN(SC_UNONAME_XLA1REPR), 0,  &getCppuType((rtl::OUString*)0),    0, 0 },
             {MAP_CHAR_LEN(SC_UNONAME_REFSHEET), 0,  &getCppuType((sal_Int32*)0),        0, 0 },
             {MAP_CHAR_LEN(SC_UNONAME_UIREPR),   0,  &getCppuType((rtl::OUString*)0),    0, 0 },
             {0,0,0,0,0,0}
@@ -193,11 +193,11 @@ void SAL_CALL ScAddressConversionObj::setPropertyValue( const rtl::OUString& aPr
             bSuccess = ParseUIString( aUIString );
         }
     }
-    else if ( aNameStr.EqualsAscii( SC_UNONAME_PERSREPR ) || aNameStr.EqualsAscii( SC_UNONAME_XL_A1_REPR ) )
+    else if ( aNameStr.EqualsAscii( SC_UNONAME_PERSREPR ) || aNameStr.EqualsAscii( SC_UNONAME_XLA1REPR ) )
     {
-        ::formula::FormulaGrammar::AddressConvention aConv = ::formula::FormulaGrammar::CONV_OOO;
-        if ( aNameStr.EqualsAscii( SC_UNONAME_XL_A1_REPR ) )
-            aConv = ::formula::FormulaGrammar::CONV_XL_A1;
+        ::formula::FormulaGrammar::AddressConvention aConv = aNameStr.EqualsAscii( SC_UNONAME_PERSREPR ) ?
+            ::formula::FormulaGrammar::CONV_OOO : ::formula::FormulaGrammar::CONV_XL_A1;
+
         //  parse the file format string
         rtl::OUString sRepresentation;
         if (aValue >>= sRepresentation)
@@ -271,24 +271,23 @@ uno::Any SAL_CALL ScAddressConversionObj::getPropertyValue( const rtl::OUString&
             aRange.aStart.Format( aFormatStr, nFlags, pDoc );
         aRet <<= rtl::OUString( aFormatStr );
     }
-    else if ( aNameStr.EqualsAscii( SC_UNONAME_PERSREPR ) || aNameStr.EqualsAscii( SC_UNONAME_XL_A1_REPR ) )
+    else if ( aNameStr.EqualsAscii( SC_UNONAME_PERSREPR ) || aNameStr.EqualsAscii( SC_UNONAME_XLA1REPR ) )
     {
-        ::formula::FormulaGrammar::AddressConvention aConv = ::formula::FormulaGrammar::CONV_OOO;
-        if ( aNameStr.EqualsAscii( SC_UNONAME_XL_A1_REPR ) )
-            aConv = ::formula::FormulaGrammar::CONV_XL_A1;
+        ::formula::FormulaGrammar::AddressConvention eConv = aNameStr.EqualsAscii( SC_UNONAME_PERSREPR ) ?
+            ::formula::FormulaGrammar::CONV_OOO : ::formula::FormulaGrammar::CONV_XL_A1;
 
         //  generate file format string - always include sheet
         String aFormatStr;
-        aRange.aStart.Format( aFormatStr, SCA_VALID | SCA_TAB_3D, pDoc, aConv );
+        aRange.aStart.Format( aFormatStr, SCA_VALID | SCA_TAB_3D, pDoc, eConv );
         if ( bIsRange )
         {
             //  manually concatenate range so both parts always have the sheet name
             aFormatStr.Append( (sal_Unicode) ':' );
             String aSecond;
             USHORT nFlags = SCA_VALID;
-            if( aConv != ::formula::FormulaGrammar::CONV_XL_A1 )
-        nFlags |= SCA_TAB_3D;
-            aRange.aEnd.Format( aSecond, SCA_VALID | SCA_TAB_3D, pDoc, aConv );
+            if( eConv != ::formula::FormulaGrammar::CONV_XL_A1 )
+                nFlags |= SCA_TAB_3D;
+            aRange.aEnd.Format( aSecond, SCA_VALID | SCA_TAB_3D, pDoc, eConv );
             aFormatStr.Append( aSecond );
         }
         aRet <<= rtl::OUString( aFormatStr );
@@ -305,7 +304,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScAddressConversionObj )
 
 rtl::OUString SAL_CALL ScAddressConversionObj::getImplementationName() throw(uno::RuntimeException)
 {
-    return rtl::OUString::createFromAscii( "ScAddressConversionObj" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScAddressConversionObj" ));
 }
 
 sal_Bool SAL_CALL ScAddressConversionObj::supportsService( const rtl::OUString& rServiceName )
@@ -321,8 +320,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScAddressConversionObj::getSupportedServic
 {
     uno::Sequence<rtl::OUString> aRet(1);
     rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = rtl::OUString::createFromAscii( bIsRange ? SC_SERVICENAME_RANGEADDRESS
-                                                         : SC_SERVICENAME_CELLADDRESS );
+    pArray[0] = bIsRange ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_SERVICENAME_RANGEADDRESS))
+                         : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_SERVICENAME_CELLADDRESS));
     return aRet;
 }
 
diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx
index bd1991203887..7cd6a99f922f 100644
--- a/sc/source/ui/unoobj/afmtuno.cxx
+++ b/sc/source/ui/unoobj/afmtuno.cxx
@@ -209,14 +209,14 @@ uno::Reference<uno::XInterface> SAL_CALL ScAutoFormatsObj_CreateInstance(
 
 rtl::OUString ScAutoFormatsObj::getImplementationName_Static()
 {
-    return rtl::OUString::createFromAscii( "stardiv.StarCalc.ScAutoFormatsObj" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScAutoFormatsObj" ));
 }
 
 uno::Sequence<rtl::OUString> ScAutoFormatsObj::getSupportedServiceNames_Static()
 {
     uno::Sequence<rtl::OUString> aRet(1);
     rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = rtl::OUString::createFromAscii( SCAUTOFORMATSOBJ_SERVICE );
+    pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCAUTOFORMATSOBJ_SERVICE ));
     return aRet;
 }
 
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 6db804e0bb9f..d25baa50e8a0 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -189,9 +189,9 @@ static void lcl_WriteInfo( registry::XRegistryKey* pRegistryKey,
                         const uno::Sequence< rtl::OUString >& rServices )
                     throw( registry::InvalidRegistryException )
 {
-    rtl::OUString aImpl(rtl::OUString::createFromAscii( "/" ));
+    rtl::OUString aImpl(RTL_CONSTASCII_USTRINGPARAM( "/" ));
     aImpl += rImplementationName;
-    aImpl += rtl::OUString::createFromAscii( "/UNO/SERVICES" );
+    aImpl += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
     uno::Reference<registry::XRegistryKey> xNewKey(pRegistryKey->createKey(aImpl));
 
     const rtl::OUString* pArray = rServices.getConstArray();
@@ -504,14 +504,14 @@ uno::Reference<uno::XInterface> SAL_CALL ScSpreadsheetSettings_CreateInstance(
 
 rtl::OUString ScSpreadsheetSettings::getImplementationName_Static()
 {
-    return rtl::OUString::createFromAscii( "stardiv.StarCalc.ScSpreadsheetSettings" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScSpreadsheetSettings" ));
 }
 
 uno::Sequence<rtl::OUString> ScSpreadsheetSettings::getSupportedServiceNames_Static()
 {
     uno::Sequence<rtl::OUString> aRet(1);
     rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = rtl::OUString::createFromAscii( SCSPREADSHEETSETTINGS_SERVICE );
+    pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSPREADSHEETSETTINGS_SERVICE ));
     return aRet;
 }
 
@@ -767,14 +767,14 @@ uno::Reference<uno::XInterface> SAL_CALL ScRecentFunctionsObj_CreateInstance(
 
 rtl::OUString ScRecentFunctionsObj::getImplementationName_Static()
 {
-    return rtl::OUString::createFromAscii( "stardiv.StarCalc.ScRecentFunctionsObj" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScRecentFunctionsObj" ));
 }
 
 uno::Sequence<rtl::OUString> ScRecentFunctionsObj::getSupportedServiceNames_Static()
 {
     uno::Sequence<rtl::OUString> aRet(1);
     rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = rtl::OUString::createFromAscii( SCRECENTFUNCTIONSOBJ_SERVICE );
+    pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCRECENTFUNCTIONSOBJ_SERVICE ));
     return aRet;
 }
 
@@ -848,14 +848,14 @@ uno::Reference<uno::XInterface> SAL_CALL ScFunctionListObj_CreateInstance(
 
 rtl::OUString ScFunctionListObj::getImplementationName_Static()
 {
-    return rtl::OUString::createFromAscii( "stardiv.StarCalc.ScFunctionListObj" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScFunctionListObj" ));
 }
 
 uno::Sequence<rtl::OUString> ScFunctionListObj::getSupportedServiceNames_Static()
 {
     uno::Sequence<rtl::OUString> aRet(1);
     rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = rtl::OUString::createFromAscii( SCFUNCTIONLISTOBJ_SERVICE );
+    pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONLISTOBJ_SERVICE ));
     return aRet;
 }
 
@@ -868,21 +868,21 @@ static void lcl_FillSequence( uno::Sequence<beans::PropertyValue>& rSequence, co
 
     beans::PropertyValue* pArray = rSequence.getArray();
 
-    pArray[0].Name = rtl::OUString::createFromAscii( SC_UNONAME_ID );
+    pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ID ));
     pArray[0].Value <<= (sal_Int32) rDesc.nFIndex;
 
-    pArray[1].Name = rtl::OUString::createFromAscii( SC_UNONAME_CATEGORY );
+    pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CATEGORY ));
     pArray[1].Value <<= (sal_Int32) rDesc.nCategory;
 
-    pArray[2].Name = rtl::OUString::createFromAscii( SC_UNONAME_NAME );
+    pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_NAME ));
     if (rDesc.pFuncName)
         pArray[2].Value <<= rtl::OUString( *rDesc.pFuncName );
 
-    pArray[3].Name = rtl::OUString::createFromAscii( SC_UNONAME_DESCRIPTION );
+    pArray[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_DESCRIPTION ));
     if (rDesc.pFuncDesc)
         pArray[3].Value <<= rtl::OUString( *rDesc.pFuncDesc );
 
-    pArray[4].Name = rtl::OUString::createFromAscii( SC_UNONAME_ARGUMENTS );
+    pArray[4].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ARGUMENTS ));
     if (rDesc.ppDefArgNames && rDesc.ppDefArgDescs && rDesc.pDefArgFlags )
     {
         USHORT nCount = rDesc.nArgCount;
diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx
index c10fadccea7c..cf058b3bb6da 100644
--- a/sc/source/ui/unoobj/celllistsource.cxx
+++ b/sc/source/ui/unoobj/celllistsource.cxx
@@ -90,7 +90,7 @@ namespace calc
         // register our property at the base class
         CellRangeAddress aInitialPropValue;
         registerPropertyNoMember(
-            ::rtl::OUString::createFromAscii( "CellRange" ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CellRange" )),
             PROP_HANDLE_RANGE_ADDRESS,
             PropertyAttribute::BOUND | PropertyAttribute::READONLY,
             ::getCppuType( &aInitialPropValue ),
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 8514810406df..f705e0ed249a 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -29,7 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sc.hxx"
 
-
 #include "scitems.hxx"
 #include <editeng/eeitem.hxx>
 #include <svx/svdpool.hxx>
@@ -126,6 +125,7 @@
 #include "formula/errorcodes.hxx"
 #include "unoreflist.hxx"
 #include "formula/grammar.hxx"
+#include "editeng/escpitem.hxx"
 
 #include <list>
 
@@ -133,7 +133,6 @@ using namespace com::sun::star;
 
 //------------------------------------------------------------------------
 
-
 class ScNamedEntry
 {
     String  aName;
@@ -147,7 +146,6 @@ public:
     const ScRange&  GetRange() const    { return aRange; }
 };
 
-
 //------------------------------------------------------------------------
 
 //  Die Namen in den Maps muessen (nach strcmp) sortiert sein!
@@ -456,6 +454,7 @@ const SfxItemPropertySet* lcl_GetCellPropertySet()
         {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY,   &getCppuType((sal_Int32*)0), 0, 0 },
         {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0),   0, 0 },
         {MAP_CHAR_LEN(SC_UNONAME_WRITING),  ATTR_WRITINGDIR,    &getCppuType((sal_Int16*)0),            0, 0 },
+        {MAP_CHAR_LEN(UNO_NAME_EDIT_CHAR_ESCAPEMENT),   EE_CHAR_ESCAPEMENT, &getCppuType((sal_Int32*)0),            0, 0 },
         {0,0,0,0,0,0}
     };
     static SfxItemPropertySet aCellPropertySet( aCellPropertyMap_Impl );
@@ -813,7 +812,6 @@ const SvxItemPropertySet* lcl_GetEditPropertySet()
     return &aEditPropertySet;
 }
 
-
 //------------------------------------------------------------------------
 
 //! diese Funktionen in einen allgemeinen Header verschieben
@@ -2090,7 +2088,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellRangesBase::getPropertySe
     return aRef;
 }
 
-
 void lcl_SetCellProperty( const SfxItemPropertySimpleEntry& rEntry, const uno::Any& rValue,
                             ScPatternAttr& rPattern, ScDocument* pDoc,
                             USHORT& rFirstItemId, USHORT& rSecondItemId )
@@ -2256,6 +2253,40 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
         else        // implemented here
             switch ( pEntry->nWID )
             {
+                case EE_CHAR_ESCAPEMENT:    // Specifically for xlsx import
+                    {
+                        sal_Int32 nValue(0);
+                        aValue >>= nValue;
+                        if( nValue )
+                        {
+                            int n = aRanges.Count();
+                            for(int i=0; i<n; i++ )
+                            {
+                                ScRange aRange( *aRanges.GetObject(i) );
+                                /* TODO: Iterate through the range */
+                                ScAddress  aAddr = aRange.aStart;
+                                ScDocument *pDoc = pDocShell->GetDocument();
+                                ScBaseCell *pCell = pDoc->GetCell( aAddr );
+                                String aStr( pCell->GetStringData() );
+                                EditEngine aEngine( pDoc->GetEnginePool() );
+                                /* EE_CHAR_ESCAPEMENT seems to be set on the cell _only_ when
+                                 * there are no other attribs for the cell.
+                                 * So, it is safe to overwrite the complete attribute set.
+                                 * If there is a need - getting CellType and processing
+                                 * the attributes could be considered.
+                                 */
+                                SfxItemSet aAttr = aEngine.GetEmptyItemSet();
+                                aEngine.SetText( aStr );
+                                if( nValue < 0 )    // Subscript
+                                    aAttr.Put( SvxEscapementItem( SVX_ESCAPEMENT_SUBSCRIPT, EE_CHAR_ESCAPEMENT ) );
+                                else                // Superscript
+                                    aAttr.Put( SvxEscapementItem( SVX_ESCAPEMENT_SUPERSCRIPT, EE_CHAR_ESCAPEMENT ) );
+                                aEngine.QuickSetAttribs( aAttr, ESelection( 0, 0, 0, aStr.Len()));
+                                pDoc->PutCell( (aRanges.GetObject(0))->aStart, new ScEditCell( aEngine.CreateTextObject(), pDoc, NULL ) );
+                            }
+                        }
+                    }
+                    break;
                 case SC_WID_UNO_CHCOLHDR:
                     // chart header flags are set for this object, not stored with document
                     bChartColAsHdr = ScUnoHelpFunctions::GetBoolFromAny( aValue );
@@ -4360,7 +4391,6 @@ void SAL_CALL ScCellRangesObj::removeRangeAddresses( const uno::Sequence<table::
     // with this implementation not needed
 //  SolarMutexGuard aGuard;
 
-
     // use sometimes a better/faster implementation
     sal_uInt32 nCount(rRangeSeq.getLength());
     if (nCount)
@@ -4715,7 +4745,7 @@ sal_Bool SAL_CALL ScCellRangesObj::hasElements() throw(uno::RuntimeException)
 
 rtl::OUString SAL_CALL ScCellRangesObj::getImplementationName() throw(uno::RuntimeException)
 {
-    return rtl::OUString::createFromAscii( "ScCellRangesObj" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScCellRangesObj" ));
 }
 
 sal_Bool SAL_CALL ScCellRangesObj::supportsService( const rtl::OUString& rServiceName )
@@ -4733,10 +4763,10 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellRangesObj::getSupportedServiceNames(
 {
     uno::Sequence<rtl::OUString> aRet(4);
     rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = rtl::OUString::createFromAscii( SCSHEETCELLRANGES_SERVICE );
-    pArray[1] = rtl::OUString::createFromAscii( SCCELLPROPERTIES_SERVICE );
-    pArray[2] = rtl::OUString::createFromAscii( SCCHARPROPERTIES_SERVICE );
-    pArray[3] = rtl::OUString::createFromAscii( SCPARAPROPERTIES_SERVICE );
+    pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGES_SERVICE ));
+    pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE ));
+    pArray[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE ));
+    pArray[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE ));
     return aRet;
 }
 
@@ -4930,7 +4960,6 @@ uno::Reference<table::XCellRange> SAL_CALL ScCellRangeObj::getCellRangeByPositio
 //    return NULL;
 }
 
-
 uno::Reference<table::XCellRange> SAL_CALL ScCellRangeObj::getCellRangeByName(
                         const rtl::OUString& aName ) throw(uno::RuntimeException)
 {
@@ -6027,7 +6056,7 @@ const SfxItemPropertyMap* ScCellRangeObj::GetItemPropertyMap()
 
 rtl::OUString SAL_CALL ScCellRangeObj::getImplementationName() throw(uno::RuntimeException)
 {
-    return rtl::OUString::createFromAscii( "ScCellRangeObj" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScCellRangeObj" ));
 }
 
 sal_Bool SAL_CALL ScCellRangeObj::supportsService( const rtl::OUString& rServiceName )
@@ -6046,11 +6075,11 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellRangeObj::getSupportedServiceNames()
 {
     uno::Sequence<rtl::OUString> aRet(5);
     rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = rtl::OUString::createFromAscii( SCSHEETCELLRANGE_SERVICE );
-    pArray[1] = rtl::OUString::createFromAscii( SCCELLRANGE_SERVICE );
-    pArray[2] = rtl::OUString::createFromAscii( SCCELLPROPERTIES_SERVICE );
-    pArray[3] = rtl::OUString::createFromAscii( SCCHARPROPERTIES_SERVICE );
-    pArray[4] = rtl::OUString::createFromAscii( SCPARAPROPERTIES_SERVICE );
+    pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE ));
+    pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE ));
+    pArray[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE ));
+    pArray[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE ));
+    pArray[4] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE ));
     return aRet;
 }
 
@@ -6704,7 +6733,7 @@ const SfxItemPropertyMap* ScCellObj::GetItemPropertyMap()
 
 rtl::OUString SAL_CALL ScCellObj::getImplementationName() throw(uno::RuntimeException)
 {
-    return rtl::OUString::createFromAscii( "ScCellObj" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScCellObj" ));
 }
 
 sal_Bool SAL_CALL ScCellObj::supportsService( const rtl::OUString& rServiceName )
@@ -6729,13 +6758,13 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellObj::getSupportedServiceNames()
 {
     uno::Sequence<rtl::OUString> aRet(7);
     rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = rtl::OUString::createFromAscii( SCSHEETCELL_SERVICE );
-    pArray[1] = rtl::OUString::createFromAscii( SCCELL_SERVICE );
-    pArray[2] = rtl::OUString::createFromAscii( SCCELLPROPERTIES_SERVICE );
-    pArray[3] = rtl::OUString::createFromAscii( SCCHARPROPERTIES_SERVICE );
-    pArray[4] = rtl::OUString::createFromAscii( SCPARAPROPERTIES_SERVICE );
-    pArray[5] = rtl::OUString::createFromAscii( SCSHEETCELLRANGE_SERVICE );
-    pArray[6] = rtl::OUString::createFromAscii( SCCELLRANGE_SERVICE );
+    pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELL_SERVICE ));
+    pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELL_SERVICE ));
+    pArray[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE ));
+    pArray[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE ));
+    pArray[4] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE ));
+    pArray[5] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE ));
+    pArray[6] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE ));
     return aRet;
 }
 
@@ -8494,8 +8523,7 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
             rtl::OUString aCodeName;
             if ( pDocSh && ( aValue >>= aCodeName ) )
             {
-                String sNewName( aCodeName );
-                pDocSh->GetDocument()->SetCodeName( GetTab_Impl(), sNewName );
+                pDocSh->GetDocument()->SetCodeName( GetTab_Impl(), aCodeName );
             }
         }
         else
@@ -8661,7 +8689,7 @@ const SfxItemPropertyMap* ScTableSheetObj::GetItemPropertyMap()
 
 rtl::OUString SAL_CALL ScTableSheetObj::getImplementationName() throw(uno::RuntimeException)
 {
-    return rtl::OUString::createFromAscii( "ScTableSheetObj" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScTableSheetObj" ));
 }
 
 sal_Bool SAL_CALL ScTableSheetObj::supportsService( const rtl::OUString& rServiceName )
@@ -8682,13 +8710,13 @@ uno::Sequence<rtl::OUString> SAL_CALL ScTableSheetObj::getSupportedServiceNames(
 {
     uno::Sequence<rtl::OUString> aRet(7);
     rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = rtl::OUString::createFromAscii( SCSPREADSHEET_SERVICE );
-    pArray[1] = rtl::OUString::createFromAscii( SCSHEETCELLRANGE_SERVICE );
-    pArray[2] = rtl::OUString::createFromAscii( SCCELLRANGE_SERVICE );
-    pArray[3] = rtl::OUString::createFromAscii( SCCELLPROPERTIES_SERVICE );
-    pArray[4] = rtl::OUString::createFromAscii( SCCHARPROPERTIES_SERVICE );
-    pArray[5] = rtl::OUString::createFromAscii( SCPARAPROPERTIES_SERVICE );
-    pArray[6] = rtl::OUString::createFromAscii( SCLINKTARGET_SERVICE );
+    pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSPREADSHEET_SERVICE ));
+    pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE ));
+    pArray[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE ));
+    pArray[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE ));
+    pArray[4] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE ));
+    pArray[5] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE ));
+    pArray[6] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE ));
     return aRet;
 }
 
@@ -9851,5 +9879,4 @@ uno::Any SAL_CALL ScUniqueCellFormatsEnumeration::nextElement() throw(container:
     return uno::makeAny(uno::Reference<sheet::XSheetCellRangeContainer>(new ScCellRangesObj(pDocShell, aRangeLists[nCurrentPosition++])));
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx
index 9e3cae0756c1..c2a5f6987166 100644
--- a/sc/source/ui/unoobj/cellvaluebinding.cxx
+++ b/sc/source/ui/unoobj/cellvaluebinding.cxx
@@ -96,7 +96,7 @@ namespace calc
         // register our property at the base class
         CellAddress aInitialPropValue;
         registerPropertyNoMember(
-            ::rtl::OUString::createFromAscii( "BoundCell" ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "BoundCell" )),
             PROP_HANDLE_BOUND_CELL,
             PropertyAttribute::BOUND | PropertyAttribute::READONLY,
             ::getCppuType( &aInitialPropValue ),
@@ -266,7 +266,7 @@ namespace calc
                         if ( xProp.is() )
                         {
                             CellContentType eResultType;
-                            if ( (xProp->getPropertyValue(::rtl::OUString::createFromAscii( "FormulaResultType" ) ) >>= eResultType) && eResultType == CellContentType_VALUE )
+                            if ( (xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FormulaResultType" )) ) >>= eResultType) && eResultType == CellContentType_VALUE )
                                 bHasValue = sal_True;
                         }
                     }
@@ -404,7 +404,7 @@ namespace calc
     {
         // set boolean number format if not already set
 
-        ::rtl::OUString sPropName( ::rtl::OUString::createFromAscii( "NumberFormat" ) );
+        ::rtl::OUString sPropName( RTL_CONSTASCII_USTRINGPARAM( "NumberFormat" ) );
         Reference<XPropertySet> xCellProp( m_xCell, UNO_QUERY );
         Reference<XNumberFormatsSupplier> xSupplier( m_xDocument, UNO_QUERY );
         if ( xSupplier.is() && xCellProp.is() )
@@ -429,10 +429,10 @@ namespace calc
                 if ( xOldFormat.is() )
                 {
                     // use the locale of the existing format
-                    xOldFormat->getPropertyValue( ::rtl::OUString::createFromAscii( "Locale" ) ) >>= aLocale;
+                    xOldFormat->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Locale" )) ) >>= aLocale;
 
                     sal_Int16 nOldType = ::comphelper::getINT16(
-                        xOldFormat->getPropertyValue( ::rtl::OUString::createFromAscii( "Type" ) ) );
+                        xOldFormat->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Type" )) ) );
                     if ( nOldType & NumberFormat::LOGICAL )
                         bWasBoolean = sal_True;
                 }
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 227869efe48e..de08f9671f3f 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -1810,7 +1810,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
         func = ::std::for_each(aAllTokens.begin(), aAllTokens.end(), func);
         func.getList(aTableNumList);
         aResult.push_back(
-            beans::PropertyValue( ::rtl::OUString::createFromAscii("TableNumberList"), -1,
+            beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableNumberList")), -1,
                                   uno::makeAny( lcl_createTableNumberList( aTableNumList ) ),
                                   beans::PropertyState_DIRECT_VALUE ));
     }
@@ -1819,7 +1819,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
     if( bRowSourceDetected )
     {
         aResult.push_back(
-            beans::PropertyValue( ::rtl::OUString::createFromAscii("DataRowSource"), -1,
+            beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataRowSource")), -1,
                                   uno::makeAny( eRowSource ), beans::PropertyState_DIRECT_VALUE ));
     }
 
@@ -1827,7 +1827,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
     if( bRowSourceDetected )
     {
         aResult.push_back(
-            beans::PropertyValue( ::rtl::OUString::createFromAscii("HasCategories"), -1,
+            beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasCategories")), -1,
                                   uno::makeAny( bHasCategories ), beans::PropertyState_DIRECT_VALUE ));
     }
 
@@ -1835,7 +1835,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
     if( bRowSourceDetected )
     {
         aResult.push_back(
-            beans::PropertyValue( ::rtl::OUString::createFromAscii("FirstCellAsLabel"), -1,
+            beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstCellAsLabel")), -1,
                                   uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE ));
     }
 
@@ -1861,7 +1861,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
 
     // add cell range property
     aResult.push_back(
-        beans::PropertyValue( ::rtl::OUString::createFromAscii("CellRangeRepresentation"), -1,
+        beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellRangeRepresentation")), -1,
                               uno::makeAny( sRangeRep ), beans::PropertyState_DIRECT_VALUE ));
 
     //Sequence Mapping
@@ -1931,7 +1931,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
         if( bDifferentIndexes && aSequenceMappingVector.size() )
         {
             aResult.push_back(
-                beans::PropertyValue( ::rtl::OUString::createFromAscii("SequenceMapping"), -1,
+                beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SequenceMapping")), -1,
                     uno::makeAny( lcl_VectorToSequence(aSequenceMappingVector) )
                     , beans::PropertyState_DIRECT_VALUE ));
         }
@@ -2438,7 +2438,7 @@ ScChart2DataSequence::ScChart2DataSequence( ScDocument* pDoc,
 //  rRangeList->Format( aStr, SCR_ABS_3D, m_pDocument );
 //    m_aIdentifier = ::rtl::OUString( aStr );
 
-//      m_aIdentifier = ::rtl::OUString::createFromAscii( "ID_");
+//      m_aIdentifier = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ID_"));
 //      static sal_Int32 nID = 0;
 //      m_aIdentifier += ::rtl::OUString::valueOf( ++nID);
 }
@@ -3572,7 +3572,7 @@ ScChart2EmptyDataSequence::ScChart2EmptyDataSequence( ScDocument* pDoc,
 //  rRangeList->Format( aStr, SCR_ABS_3D, m_pDocument );
 //    m_aIdentifier = ::rtl::OUString( aStr );
 
-//      m_aIdentifier = ::rtl::OUString::createFromAscii( "ID_");
+//      m_aIdentifier = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ID_"));
 //      static sal_Int32 nID = 0;
 //      m_aIdentifier += ::rtl::OUString::valueOf( ++nID);
 }
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index 0212ea15dff3..d50555029f0f 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -272,16 +272,16 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName,
                 // set arguments
                 uno::Sequence< beans::PropertyValue > aArgs( 4 );
                 aArgs[0] = beans::PropertyValue(
-                    ::rtl::OUString::createFromAscii("CellRangeRepresentation"), -1,
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellRangeRepresentation")), -1,
                     uno::makeAny( ::rtl::OUString( sRangeStr )), beans::PropertyState_DIRECT_VALUE );
                 aArgs[1] = beans::PropertyValue(
-                    ::rtl::OUString::createFromAscii("HasCategories"), -1,
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasCategories")), -1,
                     uno::makeAny( bRowHeaders ), beans::PropertyState_DIRECT_VALUE );
                 aArgs[2] = beans::PropertyValue(
-                    ::rtl::OUString::createFromAscii("FirstCellAsLabel"), -1,
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstCellAsLabel")), -1,
                     uno::makeAny( bColumnHeaders ), beans::PropertyState_DIRECT_VALUE );
                 aArgs[3] = beans::PropertyValue(
-                    ::rtl::OUString::createFromAscii("DataRowSource"), -1,
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataRowSource")), -1,
                     uno::makeAny( chart::ChartDataRowSource_COLUMNS ), beans::PropertyState_DIRECT_VALUE );
                 xReceiver->setArguments( aArgs );
             }
@@ -466,7 +466,7 @@ ScChartObj::ScChartObj(ScDocShell* pDocSh, SCTAB nT, const String& rN)
     pDocShell->GetDocument()->AddUnoObject(*this);
 
     uno::Sequence< table::CellRangeAddress > aInitialPropValue;
-    registerPropertyNoMember( ::rtl::OUString::createFromAscii( "RelatedCellRanges" ),
+    registerPropertyNoMember( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RelatedCellRanges" )),
         PROP_HANDLE_RELATED_CELLRANGES, beans::PropertyAttribute::MAYBEVOID,
         ::getCppuType( &aInitialPropValue ), &aInitialPropValue );
 }
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index a00d65061007..5fbbe2a007f5 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -85,9 +85,7 @@ const SfxItemPropertyMapEntry* lcl_GetConfigPropertyMap()
         {MAP_CHAR_LEN(SC_UNO_UPDTEMPL),     0,  &getBooleanCppuType(),              0, 0},
         /*Stampit enable/disable print cancel */
         {MAP_CHAR_LEN(SC_UNO_ALLOWPRINTJOBCANCEL), 0, &getBooleanCppuType(),        0, 0},
-        // --> PB 2004-08-25 #i33095# Security Options
         {MAP_CHAR_LEN(SC_UNO_LOADREADONLY), 0,  &getBooleanCppuType(),              0, 0},
-        // <--
         {MAP_CHAR_LEN(SC_UNO_SHAREDOC),     0,  &getBooleanCppuType(),              0, 0},
         {MAP_CHAR_LEN(SC_UNO_MODIFYPASSWORDINFO), 0,  &getCppuType((uno::Sequence< beans::PropertyValue >*)0),              0, 0},
         {0,0,0,0,0,0}
@@ -421,7 +419,6 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const rtl::OUString
                 aRet <<= pDocShell->IsQueryLoadTemplate();
             else if ( aPropertyName.compareToAscii( SC_UNO_LOADREADONLY ) == 0 )
                 aRet <<= pDocShell->IsLoadReadonly();
-            // <--
             else if ( aPropertyName.compareToAscii( SC_UNO_SHAREDOC ) == 0 )
             {
                 ScUnoHelpFunctions::SetBoolInAny( aRet, pDocShell->HasSharedXMLFlagSet() );
@@ -464,7 +461,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDocumentConfiguration )
 
 rtl::OUString SAL_CALL ScDocumentConfiguration::getImplementationName() throw(uno::RuntimeException)
 {
-    return rtl::OUString::createFromAscii( "ScDocumentConfiguration" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScDocumentConfiguration" ));
 }
 
 sal_Bool SAL_CALL ScDocumentConfiguration::supportsService( const rtl::OUString& rServiceName )
@@ -480,8 +477,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScDocumentConfiguration::getSupportedServi
 {
     uno::Sequence<rtl::OUString> aRet(2);
     rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = rtl::OUString::createFromAscii( SCCOMPSCPREADSHEETSETTINGS_SERVICE );
-    pArray[1] = rtl::OUString::createFromAscii( SCDOCUMENTSETTINGS_SERVICE );
+    pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCOMPSCPREADSHEETSETTINGS_SERVICE ));
+    pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCUMENTSETTINGS_SERVICE ));
     return aRet;
 }
 
diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx
index 4685a4137c15..96960bfabcac 100644
--- a/sc/source/ui/unoobj/cursuno.cxx
+++ b/sc/source/ui/unoobj/cursuno.cxx
@@ -473,7 +473,7 @@ uno::Reference<table::XCellRange> SAL_CALL ScCellCursorObj::getCellRangeByName(
 
 rtl::OUString SAL_CALL ScCellCursorObj::getImplementationName() throw(uno::RuntimeException)
 {
-    return rtl::OUString::createFromAscii( "ScCellCursorObj" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScCellCursorObj" ));
 }
 
 sal_Bool SAL_CALL ScCellCursorObj::supportsService( const rtl::OUString& rServiceName )
@@ -496,8 +496,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellCursorObj::getSupportedServiceNames(
     //  SheetCellCursor should be first (?)
     uno::Sequence<rtl::OUString> aTotalSeq( nParentLen + 2 );
     rtl::OUString* pTotalArr = aTotalSeq.getArray();
-    pTotalArr[0] = rtl::OUString::createFromAscii( SCSHEETCELLCURSOR_SERVICE );
-    pTotalArr[1] = rtl::OUString::createFromAscii( SCCELLCURSOR_SERVICE );
+    pTotalArr[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLCURSOR_SERVICE ));
+    pTotalArr[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLCURSOR_SERVICE ));
 
     //  append cell range services
     for (long i=0; i<nParentLen; i++)
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index fc3aa7583552..e704a4d0a7cd 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -1008,13 +1008,13 @@ Any SAL_CALL ScDataPilotDescriptorBase::getPropertyValue( const OUString& aPrope
                 {
                     uno::Sequence<beans::PropertyValue> aSeq( 4 );
                     beans::PropertyValue* pArray = aSeq.getArray();
-                    pArray[0].Name = rtl::OUString::createFromAscii( SC_UNO_SOURCENAME );
+                    pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SOURCENAME ));
                     pArray[0].Value <<= rtl::OUString( pServiceDesc->aParSource );
-                    pArray[1].Name = rtl::OUString::createFromAscii( SC_UNO_OBJECTNAME );
+                    pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_OBJECTNAME ));
                     pArray[1].Value <<= rtl::OUString( pServiceDesc->aParName );
-                    pArray[2].Name = rtl::OUString::createFromAscii( SC_UNO_USERNAME );
+                    pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_USERNAME ));
                     pArray[2].Value <<= rtl::OUString( pServiceDesc->aParUser );
-                    pArray[3].Name = rtl::OUString::createFromAscii( SC_UNO_PASSWORD );
+                    pArray[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PASSWORD ));
                     pArray[3].Value <<= rtl::OUString( pServiceDesc->aParPass );
                     aRet <<= aSeq;
                 }
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 8cc00f714eab..9866c038b485 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -233,22 +233,22 @@ void ScImportDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rS
     aDescriptor.setDataSource(rParam.aDBName);
     if (aDescriptor.has( svx::daDataSource ))
     {
-        pArray[0].Name = rtl::OUString::createFromAscii( SC_UNONAME_DBNAME );
+        pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_DBNAME ));
         pArray[0].Value <<= rtl::OUString( rParam.aDBName );
     }
     else if (aDescriptor.has( svx::daConnectionResource ))
     {
-        pArray[0].Name = rtl::OUString::createFromAscii( SC_UNONAME_CONRES );
+        pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CONRES ));
         pArray[0].Value <<= rtl::OUString( rParam.aDBName );
     }
 
-    pArray[1].Name = rtl::OUString::createFromAscii( SC_UNONAME_SRCTYPE );
+    pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SRCTYPE ));
     pArray[1].Value <<= eMode;
 
-    pArray[2].Name = rtl::OUString::createFromAscii( SC_UNONAME_SRCOBJ );
+    pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SRCOBJ ));
     pArray[2].Value <<= rtl::OUString( rParam.aStatement );
 
-    pArray[3].Name = rtl::OUString::createFromAscii( SC_UNONAME_ISNATIVE );
+    pArray[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISNATIVE ));
     ScUnoHelpFunctions::SetBoolInAny( pArray[3].Value, rParam.bNative );
 }
 
@@ -356,31 +356,31 @@ void ScSortDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq
 
     //  Sequence fuellen
 
-    pArray[0].Name = rtl::OUString::createFromAscii( SC_UNONAME_ISSORTCOLUMNS );
+    pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISSORTCOLUMNS ));
     pArray[0].Value = ::cppu::bool2any(!rParam.bByRow);
 
-    pArray[1].Name = rtl::OUString::createFromAscii( SC_UNONAME_CONTHDR );
+    pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CONTHDR ));
     ScUnoHelpFunctions::SetBoolInAny( pArray[1].Value, rParam.bHasHeader );
 
-    pArray[2].Name = rtl::OUString::createFromAscii( SC_UNONAME_MAXFLD );
+    pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_MAXFLD ));
     pArray[2].Value <<= (sal_Int32) MAXSORT;
 
-    pArray[3].Name = rtl::OUString::createFromAscii( SC_UNONAME_SORTFLD );
+    pArray[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SORTFLD ));
     pArray[3].Value <<= aFields;
 
-    pArray[4].Name = rtl::OUString::createFromAscii( SC_UNONAME_BINDFMT );
+    pArray[4].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_BINDFMT ));
     ScUnoHelpFunctions::SetBoolInAny( pArray[4].Value, rParam.bIncludePattern );
 
-    pArray[5].Name = rtl::OUString::createFromAscii( SC_UNONAME_COPYOUT );
+    pArray[5].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_COPYOUT ));
     ScUnoHelpFunctions::SetBoolInAny( pArray[5].Value, !rParam.bInplace );
 
-    pArray[6].Name = rtl::OUString::createFromAscii( SC_UNONAME_OUTPOS );
+    pArray[6].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_OUTPOS ));
     pArray[6].Value <<= aOutPos;
 
-    pArray[7].Name = rtl::OUString::createFromAscii( SC_UNONAME_ISULIST );
+    pArray[7].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ISULIST ));
     ScUnoHelpFunctions::SetBoolInAny( pArray[7].Value, rParam.bUserDef );
 
-    pArray[8].Name = rtl::OUString::createFromAscii( SC_UNONAME_UINDEX );
+    pArray[8].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_UINDEX ));
     pArray[8].Value <<= (sal_Int32) rParam.nUserIndex;
 }
 
@@ -2148,7 +2148,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDatabaseRangeObj )
 
 rtl::OUString SAL_CALL ScDatabaseRangeObj::getImplementationName() throw(uno::RuntimeException)
 {
-    return rtl::OUString::createFromAscii( "ScDatabaseRangeObj" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScDatabaseRangeObj" ));
 }
 
 sal_Bool SAL_CALL ScDatabaseRangeObj::supportsService( const rtl::OUString& rServiceName )
@@ -2164,8 +2164,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScDatabaseRangeObj::getSupportedServiceNam
 {
     uno::Sequence<rtl::OUString> aRet(2);
     rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = rtl::OUString::createFromAscii( SCDATABASERANGEOBJ_SERVICE );
-    pArray[1] = rtl::OUString::createFromAscii( SCLINKTARGET_SERVICE );
+    pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDATABASERANGEOBJ_SERVICE ));
+    pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE ));
     return aRet;
 }
 
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 41bf1a16859f..8da80e40f30c 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -998,7 +998,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32
 
             uno::Sequence<beans::PropertyValue> aSequence(1);
             beans::PropertyValue* pArray = aSequence.getArray();
-            pArray[0].Name = rtl::OUString::createFromAscii( SC_UNONAME_PAGESIZE );
+            pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PAGESIZE ));
             pArray[0].Value <<= aPageSize;
 
             if( ! pPrinterOptions )
@@ -1045,17 +1045,17 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32
     long nPropCount = bWasCellRange ? 3 : 2;
     uno::Sequence<beans::PropertyValue> aSequence(nPropCount);
     beans::PropertyValue* pArray = aSequence.getArray();
-    pArray[0].Name = rtl::OUString::createFromAscii( SC_UNONAME_PAGESIZE );
+    pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PAGESIZE ));
     pArray[0].Value <<= aPageSize;
     // #i111158# all positions are relative to the whole page, including non-printable area
-    pArray[1].Name = rtl::OUString::createFromAscii( SC_UNONAME_INC_NP_AREA );
+    pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_INC_NP_AREA ));
     pArray[1].Value = uno::makeAny( sal_True );
     if ( bWasCellRange )
     {
         table::CellRangeAddress aRangeAddress( nTab,
                         aCellRange.aStart.Col(), aCellRange.aStart.Row(),
                         aCellRange.aEnd.Col(), aCellRange.aEnd.Row() );
-        pArray[2].Name = rtl::OUString::createFromAscii( SC_UNONAME_SOURCERANGE );
+        pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SOURCERANGE ));
         pArray[2].Value <<= aRangeAddress;
     }
 
@@ -1997,7 +1997,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScModelObj::getAvailableServiceNames()
 
 rtl::OUString SAL_CALL ScModelObj::getImplementationName() throw(uno::RuntimeException)
 {
-    return rtl::OUString::createFromAscii( "ScModelObj" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScModelObj" ));
 }
 
 sal_Bool SAL_CALL ScModelObj::supportsService( const rtl::OUString& rServiceName )
@@ -2014,8 +2014,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScModelObj::getSupportedServiceNames()
 {
     uno::Sequence<rtl::OUString> aRet(2);
     rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = rtl::OUString::createFromAscii( SCMODELOBJ_SERVICE );
-    pArray[1] = rtl::OUString::createFromAscii( SCDOCSETTINGS_SERVICE );
+    pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCMODELOBJ_SERVICE ));
+    pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCSETTINGS_SERVICE ));
     return aRet;
 }
 
diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx
index 8f0b38c0eed9..4edd9b8fb801 100644
--- a/sc/source/ui/unoobj/eventuno.cxx
+++ b/sc/source/ui/unoobj/eventuno.cxx
@@ -155,10 +155,10 @@ uno::Any SAL_CALL ScSheetEventsObj::getByName( const rtl::OUString& aName )
     {
         uno::Sequence<beans::PropertyValue> aPropSeq( 2 );
         aPropSeq[0] = beans::PropertyValue(
-                        rtl::OUString::createFromAscii("EventType"), -1,
-                        uno::makeAny( rtl::OUString::createFromAscii("Script") ), beans::PropertyState_DIRECT_VALUE );
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EventType")), -1,
+                        uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Script")) ), beans::PropertyState_DIRECT_VALUE );
         aPropSeq[1] = beans::PropertyValue(
-                        rtl::OUString::createFromAscii("Script"), -1,
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Script")), -1,
                         uno::makeAny( *pScript ), beans::PropertyState_DIRECT_VALUE );
         aRet <<= aPropSeq;
     }
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index 3af71007dfcf..09155bb04f76 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -840,7 +840,7 @@ ScCellFieldObj* ScCellFieldObj::getImplementation(
 
 rtl::OUString SAL_CALL ScCellFieldObj::getImplementationName() throw(uno::RuntimeException)
 {
-    return rtl::OUString::createFromAscii( "ScCellFieldObj" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScCellFieldObj" ));
 }
 
 sal_Bool SAL_CALL ScCellFieldObj::supportsService( const rtl::OUString& rServiceName )
@@ -856,8 +856,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellFieldObj::getSupportedServiceNames()
 {
     uno::Sequence<rtl::OUString> aRet(2);
     rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = rtl::OUString::createFromAscii( SCTEXTFIELD_SERVICE );
-    pArray[1] = rtl::OUString::createFromAscii( SCTEXTCONTENT_SERVICE );
+    pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCTEXTFIELD_SERVICE ));
+    pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCTEXTCONTENT_SERVICE ));
     return aRet;
 }
 
@@ -1501,7 +1501,7 @@ ScHeaderFieldObj* ScHeaderFieldObj::getImplementation(
 
 rtl::OUString SAL_CALL ScHeaderFieldObj::getImplementationName() throw(uno::RuntimeException)
 {
-    return rtl::OUString::createFromAscii( "ScHeaderFieldObj" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScHeaderFieldObj" ));
 }
 
 sal_Bool SAL_CALL ScHeaderFieldObj::supportsService( const rtl::OUString& rServiceName )
@@ -1517,8 +1517,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScHeaderFieldObj::getSupportedServiceNames
 {
     uno::Sequence<rtl::OUString> aRet(2);
     rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = rtl::OUString::createFromAscii( SCTEXTFIELD_SERVICE );
-    pArray[1] = rtl::OUString::createFromAscii( SCTEXTCONTENT_SERVICE );
+    pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCTEXTFIELD_SERVICE ));
+    pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCTEXTCONTENT_SERVICE ));
     return aRet;
 }
 
diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index ed1880380089..257489993850 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -91,14 +91,14 @@ uno::Reference<uno::XInterface> SAL_CALL ScFilterOptionsObj_CreateInstance(
 
 rtl::OUString ScFilterOptionsObj::getImplementationName_Static()
 {
-    return rtl::OUString::createFromAscii( SCFILTEROPTIONSOBJ_IMPLNAME );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCFILTEROPTIONSOBJ_IMPLNAME ));
 }
 
 uno::Sequence<rtl::OUString> ScFilterOptionsObj::getSupportedServiceNames_Static()
 {
     uno::Sequence<rtl::OUString> aRet(1);
     rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = rtl::OUString::createFromAscii( SCFILTEROPTIONSOBJ_SERVICE );
+    pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCFILTEROPTIONSOBJ_SERVICE ));
     return aRet;
 }
 
@@ -109,7 +109,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScFilterOptionsObj::getPropertyValu
     uno::Sequence<beans::PropertyValue> aRet(1);
     beans::PropertyValue* pArray = aRet.getArray();
 
-    pArray[0].Name = rtl::OUString::createFromAscii( SC_UNONAME_FILTEROPTIONS );
+    pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_FILTEROPTIONS ));
     pArray[0].Value <<= aFilterOptions;
 
     return aRet;
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index 7b1efbd8e20f..7f9105837801 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -262,14 +262,14 @@ uno::Reference<uno::XInterface> SAL_CALL ScFunctionAccess_CreateInstance(
 
 rtl::OUString ScFunctionAccess::getImplementationName_Static()
 {
-    return rtl::OUString::createFromAscii( "stardiv.StarCalc.ScFunctionAccess" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScFunctionAccess" ));
 }
 
 uno::Sequence<rtl::OUString> ScFunctionAccess::getSupportedServiceNames_Static()
 {
     uno::Sequence<rtl::OUString> aRet(1);
     rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = rtl::OUString::createFromAscii( SCFUNCTIONACCESS_SERVICE );
+    pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONACCESS_SERVICE ));
     return aRet;
 }
 
@@ -277,7 +277,7 @@ uno::Sequence<rtl::OUString> ScFunctionAccess::getSupportedServiceNames_Static()
 
 rtl::OUString SAL_CALL ScFunctionAccess::getImplementationName() throw(uno::RuntimeException)
 {
-    return rtl::OUString::createFromAscii( "ScFunctionAccess" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScFunctionAccess") );
 }
 
 sal_Bool SAL_CALL ScFunctionAccess::supportsService( const rtl::OUString& rServiceName )
@@ -293,8 +293,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScFunctionAccess::getSupportedServiceNames
 {
     uno::Sequence<rtl::OUString> aRet(2);
     rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = rtl::OUString::createFromAscii( SCFUNCTIONACCESS_SERVICE );
-    pArray[1] = rtl::OUString::createFromAscii( SCDOCSETTINGS_SERVICE );
+    pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCFUNCTIONACCESS_SERVICE ));
+    pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDOCSETTINGS_SERVICE ));
     return aRet;
 }
 
@@ -467,7 +467,7 @@ public:
         else
             mbArgError = true;
     }
-    bool hasArgError() { return mbArgError; }
+    bool hasArgError() const { return mbArgError; }
 };
 
 template< class seq >
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index 9f5d7a5dd1c2..a2ee998d97ee 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -1687,8 +1687,8 @@ Reference< container::XEnumeration > SAL_CALL ScExternalDocLinkObj::createEnumer
 {
     SolarMutexGuard aGuard;
     Reference< container::XEnumeration > aRef(
-        new ScIndexEnumeration(this, OUString::createFromAscii(
-            "com.sun.star.sheet.ExternalDocLink")));
+        new ScIndexEnumeration(this, OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.sheet.ExternalDocLink"))));
     return aRef;
 }
 
@@ -1801,8 +1801,8 @@ Reference< container::XEnumeration > SAL_CALL ScExternalDocLinksObj::createEnume
 {
     SolarMutexGuard aGuard;
     Reference< container::XEnumeration > aRef(
-        new ScIndexEnumeration(this, OUString::createFromAscii(
-            "com.sun.star.sheet.ExternalDocLinks")));
+        new ScIndexEnumeration(this, OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.sheet.ExternalDocLinks"))));
     return aRef;
 }
 
diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx
index f0c1798e8c73..fc963f493bfe 100644
--- a/sc/source/ui/unoobj/miscuno.cxx
+++ b/sc/source/ui/unoobj/miscuno.cxx
@@ -251,7 +251,7 @@ uno::Any SAL_CALL ScIndexEnumeration::nextElement() throw(container::NoSuchEleme
 ::rtl::OUString SAL_CALL ScIndexEnumeration::getImplementationName()
     throw(::com::sun::star::uno::RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("ScIndexEnumeration");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScIndexEnumeration"));
 }
 
 sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const ::rtl::OUString& ServiceName )
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index 55f03a3bec4a..abc2eaef0514 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -39,6 +39,8 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
 using namespace ::com::sun::star;
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::Any;
 
 
 #include "nameuno.hxx"
@@ -70,6 +72,16 @@ const SfxItemPropertyMapEntry* lcl_GetNamedRangeMap()
     return aNamedRangeMap_Impl;
 }
 
+const SfxItemPropertyMapEntry* lcl_GetNamedRangesMap()
+{
+    static SfxItemPropertyMapEntry aNamedRangesMap_Impl[] =
+    {
+        {MAP_CHAR_LEN(SC_UNO_MODIFY_BROADCAST), 0,  &getBooleanCppuType(), 0, 0 },
+        {0,0,0,0,0,0}
+    };
+    return aNamedRangesMap_Impl;
+}
+
 //------------------------------------------------------------------------
 
 #define SCNAMEDRANGEOBJ_SERVICE     "com.sun.star.sheet.NamedRange"
@@ -89,7 +101,8 @@ sal_Bool lcl_UserVisibleName( const ScRangeData* pData )
 
 //------------------------------------------------------------------------
 
-ScNamedRangeObj::ScNamedRangeObj(ScDocShell* pDocSh, const String& rNm) :
+ScNamedRangeObj::ScNamedRangeObj(ScNamedRangesObj* pParent, ScDocShell* pDocSh, const String& rNm) :
+    mpParent(pParent),
     pDocShell( pDocSh ),
     aName( rNm )
 {
@@ -174,7 +187,7 @@ void ScNamedRangeObj::Modify_Impl( const String* pNewName, const ScTokenArray* p
                 if ( pNewRanges->Insert(pNew) )
                 {
                     ScDocFunc aFunc(*pDocShell);
-                    aFunc.SetNewRangeNames( pNewRanges, sal_True );
+                    aFunc.SetNewRangeNames( pNewRanges, mpParent->IsModifyAndBroadcast());
 
                     aName = aInsName;   //! broadcast?
                 }
@@ -478,7 +491,8 @@ ScNamedRangeObj* ScNamedRangeObj::getImplementation( const uno::Reference<uno::X
 //------------------------------------------------------------------------
 
 ScNamedRangesObj::ScNamedRangesObj(ScDocShell* pDocSh) :
-    pDocShell( pDocSh )
+    pDocShell( pDocSh ),
+    mbModifyAndBroadcast(true)
 {
     pDocShell->GetDocument()->AddUnoObject(*this);
 }
@@ -500,6 +514,11 @@ void ScNamedRangesObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
     }
 }
 
+bool ScNamedRangesObj::IsModifyAndBroadcast() const
+{
+    return mbModifyAndBroadcast;
+}
+
 // sheet::XNamedRanges
 
 ScNamedRangeObj* ScNamedRangesObj::GetObjectByIndex_Impl(sal_uInt16 nIndex)
@@ -517,7 +536,7 @@ ScNamedRangeObj* ScNamedRangesObj::GetObjectByIndex_Impl(sal_uInt16 nIndex)
                 if (lcl_UserVisibleName(pData))         // interne weglassen
                 {
                     if ( nPos == nIndex )
-                        return new ScNamedRangeObj( pDocShell, pData->GetName() );
+                        return new ScNamedRangeObj(this, pDocShell, pData->GetName());
                     ++nPos;
                 }
             }
@@ -529,7 +548,7 @@ ScNamedRangeObj* ScNamedRangesObj::GetObjectByIndex_Impl(sal_uInt16 nIndex)
 ScNamedRangeObj* ScNamedRangesObj::GetObjectByName_Impl(const rtl::OUString& aName)
 {
     if ( pDocShell && hasByName(aName) )
-        return new ScNamedRangeObj( pDocShell, String(aName) );
+        return new ScNamedRangeObj(this, pDocShell, String(aName));
     return NULL;
 }
 
@@ -563,7 +582,7 @@ void SAL_CALL ScNamedRangesObj::addNewByName( const rtl::OUString& aName,
             if ( pNewRanges->Insert(pNew) )
             {
                 ScDocFunc aFunc(*pDocShell);
-                aFunc.SetNewRangeNames( pNewRanges, sal_True );
+                aFunc.SetNewRangeNames(pNewRanges, mbModifyAndBroadcast);
                 bDone = TRUE;
             }
             else
@@ -623,7 +642,7 @@ void SAL_CALL ScNamedRangesObj::removeByName( const rtl::OUString& aName )
                     ScRangeName* pNewRanges = new ScRangeName(*pNames);
                     pNewRanges->AtFree(nPos);
                     ScDocFunc aFunc(*pDocShell);
-                    aFunc.SetNewRangeNames( pNewRanges, sal_True );
+                    aFunc.SetNewRangeNames( pNewRanges, mbModifyAndBroadcast);
                     bDone = TRUE;
                 }
         }
@@ -699,6 +718,41 @@ sal_Bool SAL_CALL ScNamedRangesObj::hasElements() throw(uno::RuntimeException)
     return ( getCount() != 0 );
 }
 
+Reference<beans::XPropertySetInfo> SAL_CALL ScNamedRangesObj::getPropertySetInfo()
+                                                        throw(uno::RuntimeException)
+{
+    static Reference<beans::XPropertySetInfo> aRef(
+        new SfxItemPropertySetInfo(lcl_GetNamedRangesMap()));
+    return aRef;
+}
+
+void SAL_CALL ScNamedRangesObj::setPropertyValue(
+                        const rtl::OUString& rPropertyName, const uno::Any& aValue )
+                throw(beans::UnknownPropertyException, beans::PropertyVetoException,
+                        lang::IllegalArgumentException, lang::WrappedTargetException,
+                        uno::RuntimeException)
+{
+    if (rPropertyName.equalsAscii(SC_UNO_MODIFY_BROADCAST))
+    {
+        aValue >>= mbModifyAndBroadcast;
+    }
+}
+
+Any SAL_CALL ScNamedRangesObj::getPropertyValue( const rtl::OUString& rPropertyName )
+                throw(beans::UnknownPropertyException, lang::WrappedTargetException,
+                        uno::RuntimeException)
+{
+    Any aRet;
+    if (rPropertyName.equalsAscii(SC_UNO_MODIFY_BROADCAST))
+    {
+        aRet <<= mbModifyAndBroadcast;
+    }
+
+    return aRet;
+}
+
+SC_IMPL_DUMMY_PROPERTY_LISTENER( ScNamedRangesObj )
+
 uno::Any SAL_CALL ScNamedRangesObj::getByName( const rtl::OUString& aName )
             throw(container::NoSuchElementException,
                     lang::WrappedTargetException, uno::RuntimeException)
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index d16edbbd9ea0..d921c83b6ce3 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -435,10 +435,10 @@ static BOOL lcl_MayBeDBase( SvStream& rStream )
                     {
                         // Excel-5: detect through contained streams
                         // there are some "excel" formats from 3rd party vendors that need to be distinguished
-                        String aStreamName(RTL_CONSTASCII_STRINGPARAM("Workbook"));
+                        String aStreamName(RTL_CONSTASCII_USTRINGPARAM("Workbook"));
                         BOOL bExcel97Stream = ( aStorage->IsStream( aStreamName ) );
 
-                        aStreamName = String(RTL_CONSTASCII_STRINGPARAM("Book"));
+                        aStreamName = String(RTL_CONSTASCII_USTRINGPARAM("Book"));
                         BOOL bExcel5Stream = ( aStorage->IsStream( aStreamName ) );
                         if ( bExcel97Stream || bExcel5Stream )
                         {
@@ -764,7 +764,7 @@ static BOOL lcl_MayBeDBase( SvStream& rStream )
     {
         // if input stream wasn't part of the descriptor, now it should be, otherwise the content would be opend twice
         lDescriptor.realloc( nPropertyCount + 1 );
-        lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("InputStream");
+        lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream"));
         lDescriptor[nPropertyCount].Value <<= xStream;
         nPropertyCount++;
     }
@@ -773,7 +773,7 @@ static BOOL lcl_MayBeDBase( SvStream& rStream )
     {
         // if input stream wasn't part of the descriptor, now it should be, otherwise the content would be opend twice
         lDescriptor.realloc( nPropertyCount + 1 );
-        lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("UCBContent");
+        lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UCBContent"));
         lDescriptor[nPropertyCount].Value <<= xContent;
         nPropertyCount++;
     }
@@ -783,7 +783,7 @@ static BOOL lcl_MayBeDBase( SvStream& rStream )
         if ( nIndexOfReadOnlyFlag == -1 )
         {
             lDescriptor.realloc( nPropertyCount + 1 );
-            lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("ReadOnly");
+            lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
             lDescriptor[nPropertyCount].Value <<= bReadOnly;
             nPropertyCount++;
         }
@@ -794,7 +794,7 @@ static BOOL lcl_MayBeDBase( SvStream& rStream )
     if ( !bRepairPackage && bRepairAllowed )
     {
         lDescriptor.realloc( nPropertyCount + 1 );
-        lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("RepairPackage");
+        lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RepairPackage"));
         lDescriptor[nPropertyCount].Value <<= bRepairAllowed;
         nPropertyCount++;
 
@@ -808,7 +808,7 @@ static BOOL lcl_MayBeDBase( SvStream& rStream )
         if ( nIndexOfTemplateFlag == -1 )
         {
             lDescriptor.realloc( nPropertyCount + 1 );
-            lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("AsTemplate");
+            lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AsTemplate"));
             lDescriptor[nPropertyCount].Value <<= bOpenAsTemplate;
             nPropertyCount++;
         }
@@ -822,7 +822,7 @@ static BOOL lcl_MayBeDBase( SvStream& rStream )
         if ( nIndexOfDocumentTitle == -1 )
         {
             lDescriptor.realloc( nPropertyCount + 1 );
-            lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("DocumentTitle");
+            lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentTitle"));
             lDescriptor[nPropertyCount].Value <<= aDocumentTitle;
             nPropertyCount++;
         }
@@ -835,7 +835,7 @@ static BOOL lcl_MayBeDBase( SvStream& rStream )
         if ( nIndexOfFilterName == -1 )
         {
             lDescriptor.realloc( nPropertyCount + 1 );
-            lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("FilterName");
+            lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName"));
             lDescriptor[nPropertyCount].Value <<= rtl::OUString(pFilter->GetName());
             nPropertyCount++;
         }
@@ -884,14 +884,14 @@ UNOSEQUENCE< UNOOUSTRING > ScFilterDetect::impl_getStaticSupportedServiceNames()
 {
     UNOMUTEXGUARD aGuard( UNOMUTEX::getGlobalMutex() );
     UNOSEQUENCE< UNOOUSTRING > seqServiceNames( 1 );
-    seqServiceNames.getArray() [0] = UNOOUSTRING::createFromAscii( "com.sun.star.frame.ExtendedTypeDetection"  );
+    seqServiceNames.getArray() [0] = UNOOUSTRING(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ExtendedTypeDetection"  ));
     return seqServiceNames ;
 }
 
 /* Helper for XServiceInfo */
 UNOOUSTRING ScFilterDetect::impl_getStaticImplementationName()
 {
-    return UNOOUSTRING::createFromAscii( "com.sun.star.comp.calc.FormatDetector" );
+    return UNOOUSTRING(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.calc.FormatDetector" ));
 }
 
 /* Helper for registry */
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index 3f9ea0aabcab..bd86f2964340 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -74,6 +74,8 @@ const SfxItemPropertyMapEntry* lcl_GetShapeMap()
         {MAP_CHAR_LEN(SC_UNONAME_MOVEPROTECT), 0, &getCppuType((sal_Bool*)0), 0, 0 },
         // #i66550 HLINK_FOR_SHAPES
         {MAP_CHAR_LEN(SC_UNONAME_HYPERLINK), 0, &getCppuType((rtl::OUString*)0), 0, 0 },
+        {MAP_CHAR_LEN(SC_UNONAME_URL), 0, &getCppuType((rtl::OUString*)0), 0, 0 },
+
         {0,0,0,0,0,0}
     };
     return aShapeMap_Impl;
@@ -647,7 +649,8 @@ void SAL_CALL ScShapeObj::setPropertyValue(
             }
         }
     }
-    else if  ( aNameString.EqualsAscii( SC_UNONAME_HYPERLINK ) )
+    else if  ( aNameString.EqualsAscii( SC_UNONAME_HYPERLINK ) ||
+               aNameString.EqualsAscii( SC_UNONAME_URL) )
     {
         rtl::OUString sHlink;
         ScMacroInfo* pInfo = lcl_getShapeHyperMacroInfo(this, TRUE);
@@ -844,7 +847,8 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const rtl::OUString& aPropertyNa
             }
         }
     }
-    else if ( aNameString.EqualsAscii( SC_UNONAME_HYPERLINK ) )
+    else if ( aNameString.EqualsAscii( SC_UNONAME_HYPERLINK ) ||
+              aNameString.EqualsAscii( SC_UNONAME_URL ) )
     {
         rtl::OUString sHlink;
         if ( ScMacroInfo* pInfo = lcl_getShapeHyperMacroInfo(this) )
diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx
index 6402f60d91aa..b6b6d907fe0b 100644
--- a/sc/source/ui/unoobj/srchuno.cxx
+++ b/sc/source/ui/unoobj/srchuno.cxx
@@ -207,7 +207,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScCellSearchObj )
 
 rtl::OUString SAL_CALL ScCellSearchObj::getImplementationName() throw(uno::RuntimeException)
 {
-    return rtl::OUString::createFromAscii( "ScCellSearchObj" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScCellSearchObj" ));
 }
 
 sal_Bool SAL_CALL ScCellSearchObj::supportsService( const rtl::OUString& rServiceName )
@@ -223,8 +223,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellSearchObj::getSupportedServiceNames(
 {
     uno::Sequence<rtl::OUString> aRet(2);
     rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = rtl::OUString::createFromAscii( SCSEARCHDESCRIPTOR_SERVICE );
-    pArray[1] = rtl::OUString::createFromAscii( SCREPLACEDESCRIPTOR_SERVICE );
+    pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSEARCHDESCRIPTOR_SERVICE ));
+    pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCREPLACEDESCRIPTOR_SERVICE ));
     return aRet;
 }
 
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 9383816528ab..85ea48a88b8f 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -671,8 +671,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScStyleFamiliesObj::getElementNames()
     SolarMutexGuard aGuard;
     uno::Sequence<rtl::OUString> aNames(SC_STYLE_FAMILY_COUNT);
     rtl::OUString* pNames = aNames.getArray();
-    pNames[0] = rtl::OUString::createFromAscii( SC_FAMILYNAME_CELL );
-    pNames[1] = rtl::OUString::createFromAscii( SC_FAMILYNAME_PAGE );
+    pNames[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_FAMILYNAME_CELL ));
+    pNames[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_FAMILYNAME_PAGE ));
     return aNames;
 }
 
@@ -734,13 +734,13 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScStyleFamiliesObj::getStyleLoaderO
     uno::Sequence<beans::PropertyValue> aSequence(3);
     beans::PropertyValue* pArray = aSequence.getArray();
 
-    pArray[0].Name = rtl::OUString::createFromAscii( SC_UNONAME_OVERWSTL );
+    pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_OVERWSTL ));
     ScUnoHelpFunctions::SetBoolInAny( pArray[0].Value, TRUE );
 
-    pArray[1].Name = rtl::OUString::createFromAscii( SC_UNONAME_LOADCELL );
+    pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_LOADCELL ));
     ScUnoHelpFunctions::SetBoolInAny( pArray[1].Value, TRUE );
 
-    pArray[2].Name = rtl::OUString::createFromAscii( SC_UNONAME_LOADPAGE );
+    pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_LOADPAGE ));
     ScUnoHelpFunctions::SetBoolInAny( pArray[2].Value, TRUE );
 
     return aSequence;
@@ -2039,7 +2039,7 @@ uno::Any SAL_CALL ScStyleObj::getPropertyValue( const rtl::OUString& aPropertyNa
                             BYTE nValue = ((const SvxPaperBinItem&)pItemSet->Get(nWhich)).GetValue();
                             rtl::OUString aName;
                             if ( nValue == PAPERBIN_PRINTER_SETTINGS )
-                                aName = rtl::OUString::createFromAscii( SC_PAPERBIN_DEFAULTNAME );
+                                aName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_PAPERBIN_DEFAULTNAME ));
                             else
                             {
                                 Printer* pPrinter = pDocShell->GetPrinter();
@@ -2107,7 +2107,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScStyleObj )
 
 rtl::OUString SAL_CALL ScStyleObj::getImplementationName() throw(uno::RuntimeException)
 {
-    return rtl::OUString::createFromAscii( "ScStyleObj" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScStyleObj" ));
 }
 
 sal_Bool SAL_CALL ScStyleObj::supportsService( const rtl::OUString& rServiceName )
@@ -2125,9 +2125,9 @@ uno::Sequence<rtl::OUString> SAL_CALL ScStyleObj::getSupportedServiceNames()
     BOOL bPage = ( eFamily == SFX_STYLE_FAMILY_PAGE );
     uno::Sequence<rtl::OUString> aRet(2);
     rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = rtl::OUString::createFromAscii( SCSTYLE_SERVICE );
-    pArray[1] = rtl::OUString::createFromAscii( bPage ? SCPAGESTYLE_SERVICE
-                                                      : SCCELLSTYLE_SERVICE );
+    pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSTYLE_SERVICE ));
+    pArray[1] = bPage ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SCPAGESTYLE_SERVICE))
+                      : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SCCELLSTYLE_SERVICE));
     return aRet;
 }
 
diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx
index 6509b03d864d..c239c489c5a2 100644
--- a/sc/source/ui/unoobj/targuno.cxx
+++ b/sc/source/ui/unoobj/targuno.cxx
@@ -243,8 +243,7 @@ void ScLinkTargetTypeObj::SetLinkTargetBitmap( uno::Any& rRet, sal_uInt16 nType
     }
     if (nImgId)
     {
-        BOOL bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
-        ImageList aEntryImages( ScResId( bHighContrast ? RID_IMAGELIST_H_NAVCONT : RID_IMAGELIST_NAVCONT ) );
+        ImageList aEntryImages( ScResId( RID_IMAGELIST_NAVCONT ) );
         const Image& rImage = aEntryImages.GetImage( nImgId );
         rRet <<= uno::Reference< awt::XBitmap > (VCLUnoHelper::CreateBitmap( rImage.GetBitmapEx() ));
     }
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 297ae74b5de1..2713ca9da83f 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -2255,7 +2255,7 @@ void ScTabViewObj::RangeSelChanged( const String& rText )
 
 rtl::OUString SAL_CALL ScTabViewObj::getImplementationName() throw(uno::RuntimeException)
 {
-    return rtl::OUString::createFromAscii( "ScTabViewObj" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScTabViewObj" ));
 }
 
 sal_Bool SAL_CALL ScTabViewObj::supportsService( const rtl::OUString& rServiceName )
@@ -2271,8 +2271,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScTabViewObj::getSupportedServiceNames()
 {
     uno::Sequence<rtl::OUString> aRet(2);
     rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = rtl::OUString::createFromAscii( SCTABVIEWOBJ_SERVICE );
-    pArray[1] = rtl::OUString::createFromAscii( SCVIEWSETTINGS_SERVICE );
+    pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCTABVIEWOBJ_SERVICE ));
+    pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCVIEWSETTINGS_SERVICE ));
     return aRet;
 }
 
diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx
index 3ca5ba861dc8..99fda2b57a81 100644
--- a/sc/source/ui/vba/excelvbahelper.cxx
+++ b/sc/source/ui/vba/excelvbahelper.cxx
@@ -377,7 +377,7 @@ void CompileExcelFormulaToODF( ScDocument* pDoc, const String& rOldFormula, Stri
     }
     ScCompiler aCompiler( pDoc, ScAddress() );
     aCompiler.SetGrammar( excel::GetFormulaGrammar( pDoc, ScAddress(), uno::Any( rtl::OUString( rOldFormula ) ) ) );
-    ScTokenArray* pCode = aCompiler.CompileString( rOldFormula );
+    aCompiler.CompileString( rOldFormula );
     aCompiler.SetGrammar( formula::FormulaGrammar::GRAM_PODF_A1 );
     aCompiler.CreateStringFromTokenArray( rNewFormula );
 }
diff --git a/sc/source/ui/vba/service.cxx b/sc/source/ui/vba/service.cxx
index e0ed82fbc0fd..05dc4ab91820 100644
--- a/sc/source/ui/vba/service.cxx
+++ b/sc/source/ui/vba/service.cxx
@@ -89,35 +89,10 @@ extern "C"
         lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey )
     {
         OSL_TRACE("In component_writeInfo");
-#if 0
-    // Component registration
-        if ( component_writeInfoHelper( pServiceManager, pRegistryKey,
-        range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl ) && component_writeInfoHelper( pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl ) )
-        {
-            // Singleton registration
-            try
-            {
-                registry::XRegistryKey * pKey =
-                    reinterpret_cast< registry::XRegistryKey * >(pRegistryKey);
 
-                Reference< registry::XRegistryKey >xKey = pKey->createKey(
-                    rtl::OUString::createFromAscii( ("ooo.vba.Globals/UNO/SINGLETONS/ooo.vba.theGlobals") ) );
-                xKey->setStringValue( ::rtl::OUString::createFromAscii(
-                    ("ooo.vba.Globals") ) );
-                return sal_True;
-            }
-            catch( uno::Exception& /*e*/ )
-            {
-                //recomp & friends will detect false returned and fail
-            }
-        }
-        return sal_False;
-#else
     // Component registration
         return component_writeInfoHelper( pServiceManager, pRegistryKey,
         range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl ) && component_writeInfoHelper( pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl, textframe::serviceDecl );
-#endif
-
     }
 
     SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
diff --git a/sc/source/ui/vba/testvba/testvba.cxx b/sc/source/ui/vba/testvba/testvba.cxx
index cf04d45250db..ee7b86269bc7 100644
--- a/sc/source/ui/vba/testvba/testvba.cxx
+++ b/sc/source/ui/vba/testvba/testvba.cxx
@@ -45,7 +45,7 @@ using ::rtl::OUString;
 
 using ::std::auto_ptr;
 
-const OUString EXTN = rtl::OUString::createFromAscii(".xls");
+const OUString EXTN(RTL_CONSTASCII_USTRINGPARAM(".xls"));
 
 OUString convertToURL( const OUString& rPath )
 {
@@ -59,7 +59,7 @@ OUString convertToURL( const OUString& rPath )
         {
                 osl::FileBase::getFileURLFromSystemPath( rPath, aURL );
                 if ( aURL.equals( rPath ) )
-                    throw uno::RuntimeException( rtl::OUString::createFromAscii( "could'nt convert " ).concat( rPath ).concat( rtl::OUString::createFromAscii( " to a URL, is it a fully qualified path name? " ) ), Reference< uno::XInterface >() );
+                    throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "could'nt convert " )).concat( rPath ).concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " to a URL, is it a fully qualified path name? " )) ), Reference< uno::XInterface >() );
         }
         return aURL;
 }
@@ -98,26 +98,25 @@ public:
         const rtl::OUString& _outDirPath ) : mxContext( _xContext ), mxMCF( _xMCF ),
 mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath  ) )
     {
-        mxSFA.set( mxMCF->createInstanceWithContext( rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ), mxContext), uno::UNO_QUERY_THROW );
+        mxSFA.set( mxMCF->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" )), mxContext), uno::UNO_QUERY_THROW );
     }
 
     rtl::OUString getLogLocation() throw (  beans::UnknownPropertyException,  lang::IllegalArgumentException, lang::WrappedTargetException,  uno::Exception )
     {
         rtl::OUString sLogLocation;
-        Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( rtl::OUString::createFromAscii( "com.sun.star.comp.framework.PathSettings" ), mxContext), uno::UNO_QUERY_THROW );
-        pathSettings->getPropertyValue( rtl::OUString::createFromAscii( "Work" ) ) >>= sLogLocation;
-        sLogLocation = sLogLocation.concat( rtl::OUString::createFromAscii( "/" ) ).concat( rtl::OUString::createFromAscii( "HelperAPI-test.log" ) );
+        Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.framework.PathSettings" )), mxContext), uno::UNO_QUERY_THROW );
+        pathSettings->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Work" )) ) >>= sLogLocation;
+        sLogLocation = sLogLocation.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )) ).concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HelperAPI-test.log" )) );
         return sLogLocation;
     }
     rtl::OUString getLogLocationWithName( OUString fileName ) throw (  beans::UnknownPropertyException,  lang::IllegalArgumentException, lang::WrappedTargetException,  uno::Exception )
     {
         printf("%s\n", getenv("HOME") );
         printf("file name %s\n", rtl::OUStringToOString( fileName, RTL_TEXTENCODING_UTF8 ).getStr() );
-        //rtl::OUString sLogLocation( rtl::OUString::createFromAscii( getenv("HOME") ) );
         rtl::OUString sLogLocation;
-        Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( rtl::OUString::createFromAscii( "com.sun.star.comp.framework.PathSettings" ), mxContext), uno::UNO_QUERY_THROW );
-        pathSettings->getPropertyValue( rtl::OUString::createFromAscii( "Work" ) ) >>= sLogLocation;
-        sLogLocation = sLogLocation.concat( rtl::OUString::createFromAscii( "/" ) ).concat( fileName.copy ( 0, fileName.lastIndexOf( EXTN )  ) + rtl::OUString::createFromAscii( ".log" ) );
+        Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.framework.PathSettings" )), mxContext), uno::UNO_QUERY_THROW );
+        pathSettings->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Work" )) ) >>= sLogLocation;
+        sLogLocation = sLogLocation.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )) ).concat( fileName.copy ( 0, fileName.lastIndexOf( EXTN )  ) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".log" )) );
         return sLogLocation;
     }
 
@@ -137,13 +136,13 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath  ) )
                     printf( "processing %s\n",  rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() );
                     // Loading the wanted document
                     Sequence< PropertyValue > propertyValues(1);
-                    propertyValues[0].Name = rtl::OUString::createFromAscii( "Hidden" );
+                    propertyValues[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Hidden" ));
                     propertyValues[0].Value <<= sal_False;
 
                     rtl::OUString sfileUrl = convertToURL( sUrl );
                     printf( "try to get xDoc %s\n", rtl::OUStringToOString( sfileUrl, RTL_TEXTENCODING_UTF8 ).getStr() );
                     Reference< uno::XInterface > xDoc =
-                        mxCompLoader->loadComponentFromURL( sfileUrl, rtl::OUString::createFromAscii( "_blank" ), 0, propertyValues);
+                        mxCompLoader->loadComponentFromURL( sfileUrl, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_blank" )), 0, propertyValues);
                     printf( "got xDoc\n" );
 
                     OUString logFileURL = convertToURL( getLogLocation() );
@@ -160,15 +159,15 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath  ) )
                         Reference< script::provider::XScript > xScript;
                         try
                         {
-                            xScript = xProv->getScript( rtl::OUString::createFromAscii( "vnd.sun.star.script:VBAProject.TestMacros.Main?language=Basic&location=document" ));
+                            xScript = xProv->getScript( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:VBAProject.TestMacros.Main?language=Basic&location=document") ));
                         } catch ( uno::Exception& e )
                         {
                             try
                             {
-                                xScript = xProv->getScript( rtl::OUString::createFromAscii( "vnd.sun.star.script:VBAProject.testMacro.Main?language=Basic&location=document" ));
+                                xScript = xProv->getScript( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:VBAProject.testMacro.Main?language=Basic&location=document" )));
                             } catch ( uno::Exception& e2 )
                             {
-                                xScript = xProv->getScript( rtl::OUString::createFromAscii( "vnd.sun.star.script:VBAProject.testMain.Main?language=Basic&location=document" ));
+                                xScript = xProv->getScript( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:VBAProject.testMain.Main?language=Basic&location=document" )));
                             }
                         }
                         OSL_TRACE("Got script for doc %s", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() );
@@ -180,7 +179,7 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath  ) )
                         xScript->invoke(aArgs, aOutArgsIndex, aOutArgs);
 
                         OUString fileName = sUrl.copy ( sUrl.lastIndexOf( '/' ) );
-                        OUString newLocation = msOutDirPath + fileName.copy ( 0, fileName.lastIndexOf( EXTN )  ) + rtl::OUString::createFromAscii( ".log" );
+                        OUString newLocation = msOutDirPath + fileName.copy ( 0, fileName.lastIndexOf( EXTN )  ) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".log" ));
                         try
                         {
                             printf("move log file\n");
@@ -240,7 +239,7 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath  ) )
         rtl::OUString sFileDirectoryURL = convertToURL( sFileDirectory );
         if ( !mxSFA->isFolder( sFileDirectoryURL) )
         {
-            throw lang::IllegalArgumentException( rtl::OUString::createFromAscii( "not a directory: ").concat( sFileDirectoryURL ), Reference<uno::XInterface>(), 1 );
+            throw lang::IllegalArgumentException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "not a directory: ")).concat( sFileDirectoryURL ), Reference<uno::XInterface>(), 1 );
         }
         // Getting all files and directories in the current directory
         Sequence<OUString> entries = mxSFA->getFolderContents( sFileDirectoryURL, sal_False );
@@ -298,8 +297,6 @@ int main( int argv, char** argc )
             dTest->traverse( ascii( argc[ 1 ] ) );
         }
         delete dTest;
-//      tryDispose( xLoader, "desktop" );
-//      tryDispose( xCC, "remote context" );
 
     }
     catch( uno::Exception& e )
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index 7ed96e7f900e..bded9017e8ac 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -301,7 +301,7 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException)
 
     Reference< view::XSelectionSupplier > xSelSupp( xModel->getCurrentController(), UNO_QUERY_THROW );
     Reference< beans::XPropertySet > xPropSet( xSelSupp, UNO_QUERY_THROW );
-    OUString aPropName = OUString::createFromAscii( SC_UNO_FILTERED_RANGE_SELECTION );
+    OUString aPropName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_FILTERED_RANGE_SELECTION ) );
     uno::Any aOldVal = xPropSet->getPropertyValue( aPropName );
     uno::Any any;
     any <<= sal_False;
@@ -313,7 +313,7 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException)
     if (!aSelection.is())
     {
         throw uno::RuntimeException(
-            rtl::OUString::createFromAscii("failed to obtain current selection"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("failed to obtain current selection")),
             uno::Reference< uno::XInterface >() );
     }
 
@@ -338,8 +338,8 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException)
     }
         return uno::makeAny( uno::Reference< msforms::XShape >(new ScVbaShape( this, mxContext, xShape, xShapes, xModel, ScVbaShape::getType( xShape ) ) ) );
     }
-    else if( xServiceInfo->supportsService( rtl::OUString::createFromAscii("com.sun.star.sheet.SheetCellRange")) ||
-             xServiceInfo->supportsService( rtl::OUString::createFromAscii("com.sun.star.sheet.SheetCellRanges")))
+    else if( xServiceInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SheetCellRange")) ) ||
+             xServiceInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SheetCellRanges")) ) )
     {
         uno::Reference< table::XCellRange > xRange( aSelection, ::uno::UNO_QUERY);
         if ( !xRange.is() )
@@ -353,7 +353,8 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException)
     }
     else
     {
-        throw uno::RuntimeException( sImplementationName + rtl::OUString::createFromAscii(" not supported"), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( sImplementationName + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+              " not supported")), uno::Reference< uno::XInterface >() );
     }
 }
 
@@ -364,10 +365,10 @@ ScVbaApplication::getActiveCell() throw (uno::RuntimeException )
     uno::Reference< table::XCellRange > xRange( xView->getActiveSheet(), ::uno::UNO_QUERY_THROW);
     ScTabViewShell* pViewShell = excel::getCurrentBestViewShell(mxContext);
     if ( !pViewShell )
-        throw uno::RuntimeException( rtl::OUString::createFromAscii("No ViewShell available"), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No ViewShell available")), uno::Reference< uno::XInterface >() );
     ScViewData* pTabView = pViewShell->GetViewData();
     if ( !pTabView )
-        throw uno::RuntimeException( rtl::OUString::createFromAscii("No ViewData available"), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No ViewData available")), uno::Reference< uno::XInterface >() );
 
     sal_Int32 nCursorX = pTabView->GetCurX();
     sal_Int32 nCursorY = pTabView->GetCurY();
@@ -399,8 +400,8 @@ ScVbaApplication::Worksheets( const uno::Any& aIndex ) throw (uno::RuntimeExcept
 
     else
         // Fixme - check if this is reasonable/desired behavior
-        throw uno::RuntimeException( rtl::OUString::createFromAscii(
-            "No ActiveWorkBook available" ), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No ActiveWorkBook available" )),
+            uno::Reference< uno::XInterface >() );
 
     return result;
 }
@@ -535,7 +536,7 @@ ScVbaApplication::setStatusBar( const uno::Any& _statusbar ) throw (uno::Runtime
         }
     }
     else
-        throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid prarameter. It should be a string or False" ),
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Invalid prarameter. It should be a string or False" )),
             uno::Reference< uno::XInterface >() );
 }
 
@@ -607,7 +608,9 @@ ScVbaApplication::Names( const css::uno::Any& aIndex ) throw ( uno::RuntimeExcep
 {
     uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
     uno::Reference< beans::XPropertySet > xPropertySet( xModel, uno::UNO_QUERY_THROW );
-    uno::Reference< sheet::XNamedRanges > xNamedRanges( xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("NamedRanges")) , uno::UNO_QUERY_THROW );
+    uno::Reference< sheet::XNamedRanges > xNamedRanges( xPropertySet->getPropertyValue(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "NamedRanges" )) ), uno::UNO_QUERY_THROW );
+
     css::uno::Reference< excel::XNames > xNames ( new ScVbaNames( this , mxContext , xNamedRanges , xModel ) );
     if (  aIndex.getValueTypeClass() == uno::TypeClass_VOID )
     {
@@ -635,8 +638,8 @@ ScVbaApplication::getActiveSheet() throw (uno::RuntimeException)
     if ( !result.is() )
     {
         // Fixme - check if this is reasonable/desired behavior
-        throw uno::RuntimeException( rtl::OUString::createFromAscii(
-            "No activeSheet available" ), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No activeSheet available" )),
+            uno::Reference< uno::XInterface >() );
     }
     return result;
 
@@ -667,7 +670,7 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro
             bScroll = aScroll;
         }
         else
-            throw uno::RuntimeException( rtl::OUString::createFromAscii( "sencond parameter should be boolean" ),
+            throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "second parameter should be boolean" )),
                     uno::Reference< uno::XInterface >() );
     }
 
@@ -709,11 +712,11 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro
         {
             //maybe this should be a procedure name
             //TODO for procedure name
-            //browse::XBrowseNodeFactory is a singlton. OUString::createFromAscii( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory")
+            //browse::XBrowseNodeFactory is a singlton. OUString(RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory"))
             //and the createView( browse::BrowseNodeFactoryViewTypes::MACROSELECTOR ) to get a root browse::XBrowseNode.
             //for query XInvocation interface.
             //but how to directly get the XInvocation?
-            throw uno::RuntimeException( rtl::OUString::createFromAscii( "invalid reference for range name, it should be procedure name" ),
+            throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid reference for range name, it should be procedure name" )),
                     uno::Reference< uno::XInterface >() );
         }
         return;
@@ -748,7 +751,7 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro
         }
         return;
     }
-    throw uno::RuntimeException( rtl::OUString::createFromAscii( "invalid reference or name" ),
+    throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid reference or name" )),
             uno::Reference< uno::XInterface >() );
 }
 
@@ -886,7 +889,7 @@ ScVbaApplication::setIteration(sal_Bool bIteration) throw (uno::RuntimeException
     uno::Any aIteration;
     aIteration <<= bIteration;
 
-    OUString aPropName = OUString::createFromAscii( "IsIterationEnabled" );
+    OUString aPropName(RTL_CONSTASCII_USTRINGPARAM( "IsIterationEnabled" ));
 
     uno::Reference< XCollection > xWorkbooks( new ScVbaWorkbooks( this, mxContext ) );
     sal_Int32 nCount = xWorkbooks->getCount();
@@ -928,7 +931,8 @@ void SAL_CALL ScVbaApplication::setSheetsInNewWorkbook( sal_Int32 SheetsInNewWor
 {
     if ( SheetsInNewWorkbook < 1 || SheetsInNewWorkbook > MAXTAB )
     {
-        DebugHelper::exception( OUString::createFromAscii("The number must be between 1 and 255"), uno::Exception(), SbERR_METHOD_FAILED, OUString() );
+        DebugHelper::exception( OUString(RTL_CONSTASCII_USTRINGPARAM("The number must be between 1 and 255")),
+            uno::Exception(), SbERR_METHOD_FAILED, OUString() );
     }
     else
     {
@@ -951,7 +955,7 @@ uno::Reference< beans::XPropertySet > lcl_getPathSettingsService( const uno::Ref
     if ( !xPathSettings.is() )
     {
         uno::Reference< lang::XMultiComponentFactory > xSMgr( xContext->getServiceManager(), uno::UNO_QUERY_THROW );
-        xPathSettings.set( xSMgr->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.util.PathSettings"), xContext), uno::UNO_QUERY_THROW );
+        xPathSettings.set( xSMgr->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.PathSettings")), xContext ), uno::UNO_QUERY_THROW );
     }
     return xPathSettings;
 }
@@ -1373,7 +1377,7 @@ ScVbaApplication::GetOpenFilename(const uno::Any& FileFilter, const uno::Any& Fi
     uno::Any aRet = uno::makeAny( sal_False );
     try
     {
-        const ::rtl::OUString sServiceName = ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.FilePicker" );
+        const rtl::OUString sServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ));
         uno::Reference< lang::XMultiServiceFactory > xMSF( comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
         // Set the type of File Picker Dialog: TemplateDescription::FILEOPEN_SIMPLE.
         uno::Sequence< uno::Any > aDialogType( 1 );
@@ -1405,7 +1409,8 @@ ScVbaApplication::GetOpenFilename(const uno::Any& FileFilter, const uno::Any& Fi
                 }
                 else if ( nCommaID < 0 && nIndex == 1 )
                 {
-                    throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid FileFilter format!" ), uno::Reference< uno::XInterface >() );
+                    throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Invalid FileFilter format!" )),
+                        uno::Reference< uno::XInterface >() );
                 }
                 xFilterManager->appendFilter( aFilterTitleToken, aFilterToken );
                 if ( nFilterIndex == nIndex )
@@ -1528,7 +1533,7 @@ ScVbaApplication::GetSaveAsFilename( const ::com::sun::star::uno::Any& InitialFi
     uno::Any strRet;
     try
     {
-        const ::rtl::OUString sServiceName = ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.FilePicker" );
+        const rtl::OUString sServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ));
         uno::Reference< lang::XMultiServiceFactory > xMSF( comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
 
         uno::Sequence< uno::Any > aDialogType( 1 );
@@ -1568,7 +1573,8 @@ ScVbaApplication::GetSaveAsFilename( const ::com::sun::star::uno::Any& InitialFi
                 }
                 else if ( nCommaID < 0 && nIndex == 1 )
                 {
-                    throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid FileFilter format!" ), uno::Reference< uno::XInterface >() );
+                    throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Invalid FileFilter format!" )),
+                        uno::Reference< uno::XInterface >() );
                 }
 
                 FileFilterMap::const_iterator aIt = mFilterNameMap.find( aFilterTitleToken );
@@ -1633,7 +1639,7 @@ ScVbaApplication::GetSaveAsFilename( const ::com::sun::star::uno::Any& InitialFi
                         if ( sFileExtension.equalsAscii("") )
                         {
                             sFileExtension = sFirstFilter.equalsAscii("*.*") ? sFileExtension : sFirstFilter.copy( sFirstFilter.indexOfAsciiL("*.", 2) + 2 );
-                            aPathStr = sFileExtension.equalsAscii("") ? aPathStr : aPathStr + ::rtl::OUString::createFromAscii(".") + sFileExtension;
+                            aPathStr = sFileExtension.equalsAscii("") ? aPathStr : aPathStr + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")) + sFileExtension;
                         }
                         else
                         {
@@ -1646,7 +1652,7 @@ ScVbaApplication::GetSaveAsFilename( const ::com::sun::star::uno::Any& InitialFi
                                 do
                                 {
                                     ::rtl::OUString aFilterToken = sSelectedFilters.getToken( 0, ';' , nSemicolonID );
-                                    if ( aFilterToken.trim().equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii("*.") + sFileExtension) )
+                                    if ( aFilterToken.trim().equalsIgnoreAsciiCase( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*.")) + sFileExtension) )
                                     {
                                         bValidFilter = sal_True;
                                         break;
@@ -1660,8 +1666,10 @@ ScVbaApplication::GetSaveAsFilename( const ::com::sun::star::uno::Any& InitialFi
                             }
                             if ( !bValidFilter )
                             {
-                                sFileExtension = sFirstFilter.equalsAscii("*.*") ? ::rtl::OUString::createFromAscii("") : sFirstFilter.copy( sFirstFilter.indexOfAsciiL("*.", 2) + 2 );
-                                aPathStr = sFileExtension.equalsAscii("") ? aPathStr : aPathStr + ::rtl::OUString::createFromAscii(".") + sFileExtension;
+                                sFileExtension = sFirstFilter.equalsAscii("*.*") ? rtl::OUString()
+                                                                                 : sFirstFilter.copy( sFirstFilter.indexOfAsciiL("*.", 2) + 2 );
+                                aPathStr = sFileExtension.equalsAscii("") ? aPathStr
+                                                                          : aPathStr + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")) + sFileExtension;
                             }
                         }
                     }
@@ -1704,33 +1712,33 @@ ConvertCountryCode(const OUString& language)
 {
     sal_Int32 nCode = 0;
 
-    if( language == OUString::createFromAscii("ar") ) nCode = 966; // Arabic
-    else if ( language == OUString::createFromAscii("cs") ) nCode = 42; // Czech
-    else if ( language == OUString::createFromAscii("da") ) nCode = 45;  // Danish
-    else if ( language == OUString::createFromAscii("de") ) nCode = 49;  // German
-    else if ( language == OUString::createFromAscii("en") ) nCode = 1;   // English
-    else if ( language == OUString::createFromAscii("es") ) nCode = 34;  // Spanish
-    else if ( language == OUString::createFromAscii("el") ) nCode = 30;  // Greek
-    else if ( language == OUString::createFromAscii("fa") ) nCode = 98;  // Persian = Farsi
-    else if ( language == OUString::createFromAscii("fi") ) nCode = 358;  // Finnish
-    else if ( language == OUString::createFromAscii("fr") ) nCode = 33;  // French
-    else if ( language == OUString::createFromAscii("he") ) nCode = 972;     // Hebrew
-    else if ( language == OUString::createFromAscii("hi") ) nCode = 91;  // Indian = Hindi
-    else if ( language == OUString::createFromAscii("hu") ) nCode = 36;  // Hungarian
-    else if ( language == OUString::createFromAscii("it") ) nCode = 39;  // Italian
-    else if ( language == OUString::createFromAscii("ja") ) nCode = 81;  // Japanese
-    else if ( language == OUString::createFromAscii("ko") ) nCode = 82;  // Korean
-    else if ( language == OUString::createFromAscii("nl") ) nCode = 31;  // Dutch
-    else if ( language == OUString::createFromAscii("no") ) nCode = 47;  // Norwegian
-    else if ( language == OUString::createFromAscii("pl") ) nCode = 48;  // Polish
-    else if ( language == OUString::createFromAscii("pt") ) nCode = 351;     // Portuguese
-    else if ( language == OUString::createFromAscii("ru") ) nCode = 7;   // Russian
-    else if ( language == OUString::createFromAscii("sv") ) nCode = 46;  // Swedish
-    else if ( language == OUString::createFromAscii("th") ) nCode = 66;  // Thai
-    else if ( language == OUString::createFromAscii("tk") ) nCode = 90;  // Turkish
-    else if ( language == OUString::createFromAscii("ur") ) nCode = 92;  // Urdu
-    else if ( language == OUString::createFromAscii("vi") ) nCode = 84;  // Vietnamese
-    else if ( language == OUString::createFromAscii("zh") ) nCode = 86;  // Simplified Chinese
+    if( language == OUString(RTL_CONSTASCII_USTRINGPARAM("ar")) ) nCode = 966; // Arabic
+    else if ( language == OUString(RTL_CONSTASCII_USTRINGPARAM("cs")) ) nCode = 42; // Czech
+    else if ( language == OUString(RTL_CONSTASCII_USTRINGPARAM("da")) ) nCode = 45;  // Danish
+    else if ( language == OUString(RTL_CONSTASCII_USTRINGPARAM("de")) ) nCode = 49;  // German
+    else if ( language == OUString(RTL_CONSTASCII_USTRINGPARAM("en")) ) nCode = 1;   // English
+    else if ( language == OUString(RTL_CONSTASCII_USTRINGPARAM("es")) ) nCode = 34;  // Spanish
+    else if ( language == OUString(RTL_CONSTASCII_USTRINGPARAM("el")) ) nCode = 30;  // Greek
+    else if ( language == OUString(RTL_CONSTASCII_USTRINGPARAM("fa")) ) nCode = 98;  // Persian = Farsi
+    else if ( language == OUString(RTL_CONSTASCII_USTRINGPARAM("fi")) ) nCode = 358;  // Finnish
+    else if ( language == OUString(RTL_CONSTASCII_USTRINGPARAM("fr")) ) nCode = 33;  // French
+    else if ( language == OUString(RTL_CONSTASCII_USTRINGPARAM("he")) ) nCode = 972;     // Hebrew
+    else if ( language == OUString(RTL_CONSTASCII_USTRINGPARAM("hi")) ) nCode = 91;  // Indian = Hindi
+    else if ( language == OUString(RTL_CONSTASCII_USTRINGPARAM("hu")) ) nCode = 36;  // Hungarian
+    else if ( language == OUString(RTL_CONSTASCII_USTRINGPARAM("it")) ) nCode = 39;  // Italian
+    else if ( language == OUString(RTL_CONSTASCII_USTRINGPARAM("ja")) ) nCode = 81;  // Japanese
+    else if ( language == OUString(RTL_CONSTASCII_USTRINGPARAM("ko")) ) nCode = 82;  // Korean
+    else if ( language == OUString(RTL_CONSTASCII_USTRINGPARAM("nl")) ) nCode = 31;  // Dutch
+    else if ( language == OUString(RTL_CONSTASCII_USTRINGPARAM("no")) ) nCode = 47;  // Norwegian
+    else if ( language == OUString(RTL_CONSTASCII_USTRINGPARAM("pl")) ) nCode = 48;  // Polish
+    else if ( language == OUString(RTL_CONSTASCII_USTRINGPARAM("pt")) ) nCode = 351;     // Portuguese
+    else if ( language == OUString(RTL_CONSTASCII_USTRINGPARAM("ru")) ) nCode = 7;   // Russian
+    else if ( language == OUString(RTL_CONSTASCII_USTRINGPARAM("sv")) ) nCode = 46;  // Swedish
+    else if ( language == OUString(RTL_CONSTASCII_USTRINGPARAM("th")) ) nCode = 66;  // Thai
+    else if ( language == OUString(RTL_CONSTASCII_USTRINGPARAM("tk")) ) nCode = 90;  // Turkish
+    else if ( language == OUString(RTL_CONSTASCII_USTRINGPARAM("ur")) ) nCode = 92;  // Urdu
+    else if ( language == OUString(RTL_CONSTASCII_USTRINGPARAM("vi")) ) nCode = 84;  // Vietnamese
+    else if ( language == OUString(RTL_CONSTASCII_USTRINGPARAM("zh")) ) nCode = 86;  // Simplified Chinese
 
     return nCode;
 }
diff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxx
index 714bb783f3cb..126719c6fd56 100644
--- a/sc/source/ui/vba/vbaassistant.cxx
+++ b/sc/source/ui/vba/vbaassistant.cxx
@@ -38,12 +38,12 @@ using namespace ooo::vba;
 
 using namespace ooo::vba::office::MsoAnimationType;
 
-ScVbaAssistant::ScVbaAssistant( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext ): ScVbaAssistantImpl_BASE( xParent, xContext )
+ScVbaAssistant::ScVbaAssistant( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext ): ScVbaAssistantImpl_BASE( xParent, xContext ),
+m_sName( RTL_CONSTASCII_USTRINGPARAM( "Clippit" ) )
 {
     m_bIsVisible = sal_False;
     m_nPointsLeft = 795;
     m_nPointsTop = 248;
-    m_sName = rtl::OUString::createFromAscii( "Clippit" );
     m_nAnimation = msoAnimationIdle;
 }
 
diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx
index eac7083a797c..9005ffdf6069 100644
--- a/sc/source/ui/vba/vbaaxes.cxx
+++ b/sc/source/ui/vba/vbaaxes.cxx
@@ -73,7 +73,7 @@ ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno:
 {
     ScVbaChart* pChart = static_cast< ScVbaChart* >( xChart.get() );
     if ( !pChart )
-        throw uno::RuntimeException( rtl::OUString::createFromAscii( "Object failure, can't access chart implementation" ), uno::Reference< uno::XInterface >()  );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Object failure, can't access chart implementation" )), uno::Reference< uno::XInterface >()  );
 
     uno::Reference< beans::XPropertySet > xAxisPropertySet;
     if (((nType == xlCategory) || (nType == xlSeriesAxis) || (nType == xlValue)))
@@ -169,7 +169,7 @@ ScVbaAxes::Item( const css::uno::Any& _nType, const css::uno::Any& _oAxisGroup)
     sal_Int32 nAxisGroup = xlPrimary;
     sal_Int32 nType = -1;
     if ( !_nType.hasValue() || ( ( _nType >>= nType ) == sal_False )  )
-        throw uno::RuntimeException( rtl::OUString::createFromAscii( "Axes::Item Failed to extract type" ), uno::Reference< uno::XInterface >()  );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Axes::Item Failed to extract type" )), uno::Reference< uno::XInterface >()  );
 
     if ( _oAxisGroup.hasValue() )
         _oAxisGroup >>= nAxisGroup ;
diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx
index d51534264e38..ce3ace9de6d1 100644
--- a/sc/source/ui/vba/vbaaxis.cxx
+++ b/sc/source/ui/vba/vbaaxis.cxx
@@ -47,7 +47,7 @@ ScVbaAxis::getChartPtr() throw( uno::RuntimeException )
 {
     ScVbaChart* pChart = static_cast< ScVbaChart* >( moChartParent.get() );
     if ( !pChart )
-        throw uno::RuntimeException( rtl::OUString::createFromAscii("Can't access parent chart impl"), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't access parent chart impl")), uno::Reference< uno::XInterface >() );
     return pChart;
 }
 
diff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxx
index b8706b233462..0ca3fa9112f2 100644
--- a/sc/source/ui/vba/vbachartobjects.cxx
+++ b/sc/source/ui/vba/vbachartobjects.cxx
@@ -83,10 +83,10 @@ ScVbaChartObjects::getChartObjectNames() throw( css::script::BasicErrorException
         ScCellRangesBase* pUno= dynamic_cast< ScCellRangesBase* >( xIf.get() );
         ScDocShell* pDocShell = NULL;
         if ( !pUno )
-            throw uno::RuntimeException( rtl::OUString::createFromAscii("Failed to obtain the impl class from the drawpage"), uno::Reference< uno::XInterface >() );
+            throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Failed to obtain the impl class from the drawpage")), uno::Reference< uno::XInterface >() );
         pDocShell = pUno->GetDocShell();
         if ( !pDocShell )
-            throw uno::RuntimeException( rtl::OUString::createFromAscii("Failed to obtain the docshell implclass"), uno::Reference< uno::XInterface >() );
+            throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Failed to obtain the docshell implclass")), uno::Reference< uno::XInterface >() );
 
         uno::Reference< sheet::XSpreadsheetDocument > xSpreadsheetDocument( pDocShell->GetModel(), uno::UNO_QUERY_THROW );
         uno::Reference< sheet::XSpreadsheets > xSpreadsheets = xSpreadsheetDocument->getSheets();
diff --git a/sc/source/ui/vba/vbafiledialog.cxx b/sc/source/ui/vba/vbafiledialog.cxx
index 482e6ab2d5e1..b08f336f2af9 100644
--- a/sc/source/ui/vba/vbafiledialog.cxx
+++ b/sc/source/ui/vba/vbafiledialog.cxx
@@ -90,7 +90,7 @@ ScVbaFileDialog::Show( ) throw (::com::sun::star::uno::RuntimeException)
     {
         m_sSelectedItems.realloc(0);
 
-        const ::rtl::OUString sServiceName = ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.FilePicker" );
+        const ::rtl::OUString sServiceName(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ));
 
         Reference< lang::XMultiServiceFactory > xMSF( comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
         // Set the type of File Picker Dialog: TemplateDescription::FILEOPEN_SIMPLE.
diff --git a/sc/source/ui/vba/vbafilesearch.cxx b/sc/source/ui/vba/vbafilesearch.cxx
index 6df035c21c2b..761058b7655c 100644
--- a/sc/source/ui/vba/vbafilesearch.cxx
+++ b/sc/source/ui/vba/vbafilesearch.cxx
@@ -56,7 +56,7 @@ static Reference< XSimpleFileAccess3 > getFileAccess( void )
         if( xSMgr.is() )
         {
             xSFI = Reference< XSimpleFileAccess3 >( xSMgr->createInstance
-                ( ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), UNO_QUERY );
+                ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" )) ), UNO_QUERY );
         }
     }
     return xSFI;
@@ -171,7 +171,7 @@ sal_Int32 SAL_CALL ScVbaFileSearch::Execute( )  throw (css::uno::RuntimeExceptio
         return 0;
     }
 
-    if ( m_sFileName == ::rtl::OUString::createFromAscii( "" ) )
+    if ( m_sFileName == ::rtl::OUString() )
     {
         return 1;
     }
@@ -180,15 +180,15 @@ sal_Int32 SAL_CALL ScVbaFileSearch::Execute( )  throw (css::uno::RuntimeExceptio
     if ( IsWildCard( aTempFileName ) )
     {
         bool bEndWithAsterisk = aTempFileName.endsWithAsciiL("*", 1);
-        bool bStartWithAsterisk = (aTempFileName.indexOf(::rtl::OUString::createFromAscii("*")) == 0);
+        bool bStartWithAsterisk = (aTempFileName.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*"))) == 0);
         if ( !bEndWithAsterisk && !bStartWithAsterisk )
         {
-            aTempFileName = ::rtl::OUString::createFromAscii("*") + aTempFileName + ::rtl::OUString::createFromAscii("*");
+            aTempFileName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")); + aTempFileName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*"));
         }
     }
     else
     {
-        aTempFileName = ::rtl::OUString::createFromAscii("*") + aTempFileName + ::rtl::OUString::createFromAscii("*");
+        aTempFileName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")); + aTempFileName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*"));
     }
     WildCard wildCard( aTempFileName );
     SearchWildCard( wildCard, m_sLookIn, m_bSearchSubFolders, m_aSearchedFiles );
@@ -211,7 +211,7 @@ sal_Int32 SAL_CALL ScVbaFileSearch::Execute( )  throw (css::uno::RuntimeExceptio
 
 void SAL_CALL ScVbaFileSearch::NewSearch( )  throw (css::uno::RuntimeException)
 {
-    m_sFileName = ::rtl::OUString::createFromAscii( "" );
+    m_sFileName = ::rtl::OUString();
     m_sLookIn = getInitPath();
     m_bSearchSubFolders = false;
     m_bMatchTextExactly = false;
diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx
index e37a2bb933c0..59b8108858d5 100644
--- a/sc/source/ui/vba/vbaglobals.cxx
+++ b/sc/source/ui/vba/vbaglobals.cxx
@@ -57,7 +57,7 @@ ScVbaGlobals::ScVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Referen
     OSL_TRACE("ScVbaGlobals::ScVbaGlobals()");
 
         uno::Sequence< beans::PropertyValue > aInitArgs( 2 );
-        aInitArgs[ 0 ].Name = rtl::OUString::createFromAscii("Application");
+        aInitArgs[ 0 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Application"));
         aInitArgs[ 0 ].Value = uno::makeAny( getApplication() );
         aInitArgs[ 1 ].Name = sDocCtxName;
         aInitArgs[ 1 ].Value = uno::makeAny( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ) );
@@ -101,8 +101,8 @@ ScVbaGlobals::getActiveWorkbook() throw (uno::RuntimeException)
         return xWorkbook;
     }
 // FIXME check if this is correct/desired behavior
-    throw uno::RuntimeException( rtl::OUString::createFromAscii(
-        "No activeWorkbook available" ), Reference< uno::XInterface >() );
+    throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+        "No activeWorkbook available" )), Reference< uno::XInterface >() );
 }
 
 
diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx
index 62d71a08f4fc..c54307fdc890 100644
--- a/sc/source/ui/vba/vbahelper.cxx
+++ b/sc/source/ui/vba/vbahelper.cxx
@@ -82,7 +82,7 @@ getIntrospectionAccess( const uno::Any& aObject ) throw (uno::RuntimeException)
     if( !xIntrospection.is() )
     {
         uno::Reference< lang::XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
-        xIntrospection.set( xFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.beans.Introspection") ), uno::UNO_QUERY_THROW );
+        xIntrospection.set( xFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.Introspection") ), uno::UNO_QUERY_THROW );
     }
     return xIntrospection->inspect( aObject );
 }
@@ -279,7 +279,7 @@ getCurrentDocument() throw (uno::RuntimeException)
             // test if vba service is present
             uno::Reference< uno::XComponentContext > xCtx( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
             uno::Reference<lang::XMultiComponentFactory > xSMgr( xCtx->getServiceManager(), uno::UNO_QUERY_THROW );
-            uno::Reference< frame::XDesktop > xDesktop (xSMgr->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"), xCtx), uno::UNO_QUERY_THROW );
+            uno::Reference< frame::XDesktop > xDesktop (xSMgr->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("com.sun.star.frame.Desktop")), xCtx), uno::UNO_QUERY_THROW );
             xModel.set( xDesktop->getCurrentComponent(), uno::UNO_QUERY );
             if ( !xModel.is() )
             {
@@ -531,7 +531,7 @@ rtl::OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeEx
                 break;
             }
         default:
-                   throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid type, can't convert" ), uno::Reference< uno::XInterface >() );
+                   throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(( "Invalid type, can't convert" )), uno::Reference< uno::XInterface >() );
     }
     return sString;
 }
diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx
index 733f394fabd4..e767ce2b73a2 100644
--- a/sc/source/ui/vba/vbainterior.cxx
+++ b/sc/source/ui/vba/vbainterior.cxx
@@ -261,7 +261,7 @@ ScVbaInterior::GetMixedColorComp(  sal_uInt8 nFore, sal_uInt8 nBack, sal_uInt8 n
 uno::Reference< container::XNameContainer >
 ScVbaInterior::GetAttributeContainer()
 {
-    return uno::Reference < container::XNameContainer > ( m_xProps->getPropertyValue( rtl::OUString::createFromAscii( "UserDefinedAttributes" ) ), uno::UNO_QUERY_THROW );
+    return uno::Reference < container::XNameContainer > ( m_xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UserDefinedAttributes" )) ), uno::UNO_QUERY_THROW );
 }
 sal_Int32
 ScVbaInterior::GetAttributeData( uno::Any aValue )
@@ -277,8 +277,8 @@ uno::Any
 ScVbaInterior::SetAttributeData( sal_Int32 nValue )
 {
     xml::AttributeData aAttributeData;
-    //aAttributeData.Namespace = rtl::OUString::createFromAscii( "ooo.vba.excel.CellPatten");
-    aAttributeData.Type = rtl::OUString::createFromAscii( "sal_Int32" );
+    //aAttributeData.Namespace = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.CellPatten"));
+    aAttributeData.Type = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "sal_Int32" ));
     aAttributeData.Value = rtl::OUString::valueOf( nValue );
     return uno::makeAny( aAttributeData );
 }
@@ -301,7 +301,7 @@ ScVbaInterior::SetUserDefinedAttributes( const rtl::OUString& sName, const uno::
         if( xNameContainer->hasByName( sName ) )
             xNameContainer->removeByName( sName );
         xNameContainer->insertByName( sName, aValue );
-        m_xProps->setPropertyValue( rtl::OUString::createFromAscii( "UserDefinedAttributes" ), uno::makeAny( xNameContainer ) );
+        m_xProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UserDefinedAttributes" )), uno::makeAny( xNameContainer ) );
     }
 }
 // OOo do not support below API
@@ -323,7 +323,7 @@ ScVbaInterior::setPattern( const uno::Any& _pattern ) throw (uno::RuntimeExcepti
         SetMixedColor();
     }
     else
-        throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid Pattern index" ), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Invalid Pattern index" )), uno::Reference< uno::XInterface >() );
 }
 Color
 ScVbaInterior::GetBackColor()
@@ -371,7 +371,7 @@ ScVbaInterior::setPatternColor( const uno::Any& _patterncolor ) throw (uno::Runt
         SetMixedColor();
     }
     else
-        throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Invalid Pattern Color" )), uno::Reference< uno::XInterface >() );
 }
 uno::Any SAL_CALL
 ScVbaInterior::getPatternColorIndex() throw (uno::RuntimeException)
@@ -394,7 +394,7 @@ ScVbaInterior::setPatternColorIndex( const uno::Any& _patterncolorindex ) throw
         setPatternColor( uno::makeAny( OORGBToXLRGB( nPattColor ) ) );
     }
     else
-        throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Invalid Pattern Color" )), uno::Reference< uno::XInterface >() );
 }
 
 rtl::OUString&
diff --git a/sc/source/ui/vba/vbamenubars.cxx b/sc/source/ui/vba/vbamenubars.cxx
index 4dfaefcddda4..1c06e737bdd2 100644
--- a/sc/source/ui/vba/vbamenubars.cxx
+++ b/sc/source/ui/vba/vbamenubars.cxx
@@ -107,7 +107,7 @@ ScVbaMenuBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw
     if( nIndex == excel::XlSheetType::xlWorksheet )
     {
         uno::Any aSource;
-        aSource <<= rtl::OUString::createFromAscii( "Worksheet Menu Bar" );
+        aSource <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Worksheet Menu Bar" ));
         uno::Reference< XCommandBar > xCommandBar( m_xCommandBars->Item( aSource, uno::Any() ), uno::UNO_QUERY_THROW );
         uno::Reference< excel::XMenuBar > xMenuBar( new ScVbaMenuBar( this, mxContext, xCommandBar ) );
         return uno::makeAny( xMenuBar );
diff --git a/sc/source/ui/vba/vbaname.cxx b/sc/source/ui/vba/vbaname.cxx
index 71d42038f89b..4a1020aa8980 100644
--- a/sc/source/ui/vba/vbaname.cxx
+++ b/sc/source/ui/vba/vbaname.cxx
@@ -125,7 +125,7 @@ ScVbaName::getValue(const formula::FormulaGrammar::Grammar eGrammar) throw (css:
     }
     if ( sValue.indexOf('=') != 0 )
     {
-        sValue = rtl::OUString::createFromAscii("=") + sValue;
+        sValue = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("=")) + sValue;
     }
     return sValue;
 }
diff --git a/sc/source/ui/vba/vbanames.cxx b/sc/source/ui/vba/vbanames.cxx
index bee4fbb58856..8379ebafcbc4 100644
--- a/sc/source/ui/vba/vbanames.cxx
+++ b/sc/source/ui/vba/vbanames.cxx
@@ -81,10 +81,10 @@ ScVbaNames::getScDocument()
     uno::Reference< frame::XModel > xModel( getModel() , uno::UNO_QUERY_THROW );
     ScTabViewShell * pTabViewShell = excel::getBestViewShell( xModel );
     if ( !pTabViewShell )
-        throw uno::RuntimeException( rtl::OUString::createFromAscii("No ViewShell available"), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No ViewShell available")), uno::Reference< uno::XInterface >() );
     ScViewData* pViewData = pTabViewShell->GetViewData();
     if ( !pViewData )
-        throw uno::RuntimeException( rtl::OUString::createFromAscii("No ViewData available"), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No ViewData available")), uno::Reference< uno::XInterface >() );
     return pViewData->GetDocument();
 }
 
@@ -156,7 +156,7 @@ ScVbaNames::Add( const css::uno::Any& Name ,
                 sResult = sName.copy( nIndex );
             sName = sResult ;
             if ( !ScRangeData::IsNameValid( sName , getScDocument() ) )
-                throw uno::RuntimeException( rtl::OUString::createFromAscii("This Name is a invalid ."), uno::Reference< uno::XInterface >() );
+                throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("This Name is a invalid .")), uno::Reference< uno::XInterface >() );
         }
     }
     if ( RefersTo.hasValue() || RefersToR1C1.hasValue() || RefersToR1C1Local.hasValue() )
diff --git a/sc/source/ui/vba/vbaoleobject.cxx b/sc/source/ui/vba/vbaoleobject.cxx
index ebf87bf5275d..05cc60de33d7 100644
--- a/sc/source/ui/vba/vbaoleobject.cxx
+++ b/sc/source/ui/vba/vbaoleobject.cxx
@@ -38,18 +38,6 @@
 using namespace com::sun::star;
 using namespace ooo::vba;
 
-
-sal_Int32 pt2mm( double pt ) //1/100mm
-{
-    return static_cast<sal_Int32>(pt * 0.352778);
-}
-
-double mm2pt( sal_Int32 mm )
-{
-    return mm * 2.8345;
-}
-
-
 ScVbaOLEObject::ScVbaOLEObject( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext,
             css::uno::Reference< css::drawing::XControlShape > xControlShape )
 : OLEObjectImpl_BASE( xParent, xContext ), m_xControlShape( xControlShape )
diff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxx
index c80e407fb532..0e2ae31c17a9 100644
--- a/sc/source/ui/vba/vbapagesetup.cxx
+++ b/sc/source/ui/vba/vbapagesetup.cxx
@@ -101,7 +101,7 @@ void SAL_CALL ScVbaPageSetup::setPrintArea( const rtl::OUString& rAreas ) throw
 {
     uno::Reference< sheet::XPrintAreas > xPrintAreas( mxSheet, uno::UNO_QUERY_THROW );
     if( rAreas.getLength() == 0 ||
-        rAreas.equalsIgnoreAsciiCase ( rtl::OUString::createFromAscii("FALSE") ) )
+        rAreas.equalsIgnoreAsciiCase ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FALSE")) ) )
     {
         // print the whole sheet
         uno::Sequence< table::CellRangeAddress > aSeq;
diff --git a/sc/source/ui/vba/vbapane.cxx b/sc/source/ui/vba/vbapane.cxx
index e034ffeead41..8d606f31571b 100644
--- a/sc/source/ui/vba/vbapane.cxx
+++ b/sc/source/ui/vba/vbapane.cxx
@@ -57,7 +57,7 @@ ScVbaPane::setScrollColumn( sal_Int32 _scrollcolumn ) throw (uno::RuntimeExcepti
 {
     if( _scrollcolumn < 1 )
     {
-        throw uno::RuntimeException( rtl::OUString::createFromAscii( "Column number should not less than 1" ),
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Column number should not less than 1" )),
                 uno::Reference< uno::XInterface >() );
     }
     m_xViewPane->setFirstVisibleColumn( _scrollcolumn - 1 );
@@ -74,7 +74,7 @@ ScVbaPane::setScrollRow( sal_Int32 _scrollrow ) throw (uno::RuntimeException)
 {
     if( _scrollrow < 1 )
     {
-        throw uno::RuntimeException( rtl::OUString::createFromAscii( "Row number should not less than 1" ),
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Row number should not less than 1" )),
                 uno::Reference< uno::XInterface >() );
     }
     m_xViewPane->setFirstVisibleRow( _scrollrow - 1 );
@@ -108,7 +108,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any
         if( Down >>= down )
             downRows += down;
         else
-            messageBuffer += rtl::OUString::createFromAscii( "Error getting parameter: Down\n" );
+            messageBuffer += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Error getting parameter: Down\n" ));
     }
     if( Up.hasValue() )
     {
@@ -116,7 +116,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any
         if( Up >>= up )
             downRows -= up;
         else
-            messageBuffer += rtl::OUString::createFromAscii( "Error getting parameter: Up\n" );
+            messageBuffer += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Error getting parameter: Up\n" ));
     }
     if( ToRight.hasValue() )
     {
@@ -124,7 +124,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any
         if( ToRight >>= right )
             rightCols += right;
         else
-            messageBuffer += rtl::OUString::createFromAscii( "Error getting parameter: ToRight\n" );
+            messageBuffer += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Error getting parameter: ToRight\n" ));
     }
     if( ToLeft.hasValue() )
     {
@@ -132,7 +132,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any
         if( ToLeft >>= left )
             rightCols -= left;
         else
-            messageBuffer += rtl::OUString::createFromAscii( "Error getting parameter: ToLeft\n" );
+            messageBuffer += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Error getting parameter: ToLeft\n" ));
     }
     if( messageBuffer.getLength() > 0 )
         throw(uno::RuntimeException( messageBuffer, uno::Reference< uno::XInterface >() ) );
@@ -163,7 +163,7 @@ ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any
         if( Down >>= down )
             downPages += down;
         else
-            messageBuffer += rtl::OUString::createFromAscii( "Error getting parameter: Down\n" );
+            messageBuffer += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Error getting parameter: Down\n" ));
     }
     if( Up.hasValue() )
     {
@@ -171,7 +171,7 @@ ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any
         if( Up >>= up )
             downPages -= up;
         else
-            messageBuffer += rtl::OUString::createFromAscii( "Error getting parameter: Up\n" );
+            messageBuffer += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Error getting parameter: Up\n" ));
     }
     if( ToRight.hasValue() )
     {
@@ -179,7 +179,7 @@ ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any
         if( ToRight >>= right )
             acrossPages += right;
         else
-            messageBuffer += rtl::OUString::createFromAscii( "Error getting parameter: ToRight\n" );
+            messageBuffer += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Error getting parameter: ToRight\n" ));
     }
     if( ToLeft.hasValue() )
     {
@@ -187,7 +187,7 @@ ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any
         if( ToLeft >>= left )
             acrossPages -= left;
         else
-            messageBuffer += rtl::OUString::createFromAscii( "Error getting parameter: ToLeft\n" );
+            messageBuffer += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Error getting parameter: ToLeft\n" ));
     }
     if( messageBuffer.getLength() > 0 )
         throw(uno::RuntimeException( messageBuffer, uno::Reference< uno::XInterface >() ) );
diff --git a/sc/source/ui/vba/vbapropvalue.hxx b/sc/source/ui/vba/vbapropvalue.hxx
index 289870e5b520..2cbc37ecc981 100644
--- a/sc/source/ui/vba/vbapropvalue.hxx
+++ b/sc/source/ui/vba/vbapropvalue.hxx
@@ -52,7 +52,7 @@ public:
     virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
     virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
 
-    rtl::OUString SAL_CALL getDefaultPropertyName() throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
+    rtl::OUString SAL_CALL getDefaultPropertyName() throw (css::uno::RuntimeException) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); }
 
 };
 #endif //SC_VBA_PROPVALULE_HXX
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index c9dce622bf36..da141c3f8074 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -263,7 +263,7 @@ ScCellRangesBase* ScVbaRange::getCellRangesBase() throw ( uno::RuntimeException
         return ScCellRangesBase::getImplementation( mxRanges );
     if( mxRange.is() )
         return ScCellRangesBase::getImplementation( mxRange );
-    throw uno::RuntimeException( rtl::OUString::createFromAscii("General Error creating range - Unknown" ), uno::Reference< uno::XInterface >() );
+    throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("General Error creating range - Unknown" )), uno::Reference< uno::XInterface >() );
 }
 
 ScCellRangeObj* ScVbaRange::getCellRangeObj() throw ( uno::RuntimeException )
@@ -510,7 +510,7 @@ public:
     {
         uno::Reference< beans::XPropertySet > xNumberProps = getNumberProps();
         sal_Int16 nType = ::comphelper::getINT16(
-            xNumberProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Type" ) ) );
+            xNumberProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Type" )) ) );
         return nType;
     }
 
@@ -518,7 +518,7 @@ public:
     {
         lang::Locale aLocale;
         uno::Reference< beans::XPropertySet > xNumProps = getNumberProps();
-        xNumProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Locale" ) ) >>= aLocale;
+        xNumProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Locale" )) ) >>= aLocale;
         sal_Int32 nNewIndex = mxFormats->queryKey(rFormat, aLocale, false );
         if ( nNewIndex == -1 ) // format not defined
         {
@@ -532,7 +532,7 @@ public:
     {
         uno::Reference< beans::XPropertySet > xNumberProps = getNumberProps();
         lang::Locale aLocale;
-        xNumberProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Locale" ) ) >>= aLocale;
+        xNumberProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Locale" )) ) >>= aLocale;
         uno::Reference<util::XNumberFormatTypes> xTypes( mxFormats, uno::UNO_QUERY );
         if ( xTypes.is() )
         {
@@ -919,7 +919,7 @@ public:
 
 };
 
-const static rtl::OUString sNA = rtl::OUString::createFromAscii("#N/A");
+const static rtl::OUString sNA(RTL_CONSTASCII_USTRINGPARAM("#N/A"));
 
 class Dim1ArrayValueSetter : public ArrayVisitor
 {
@@ -1482,10 +1482,10 @@ uno::Any SAL_CALL ScVbaRange::getName() throw (uno::RuntimeException)
     uno::Reference< frame::XModel > xModel = pDocShell ? pDocShell->GetModel() : NULL;
     if ( !xModel.is() )
     {
-        throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid document" ), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Invalid document" )), uno::Reference< uno::XInterface >() );
     }
     uno::Reference< beans::XPropertySet > xPropertySet( xModel, uno::UNO_QUERY_THROW );
-    uno::Reference< sheet::XNamedRanges > xNamedRanges( xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("NamedRanges")) , uno::UNO_QUERY_THROW );
+    uno::Reference< sheet::XNamedRanges > xNamedRanges( xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NamedRanges"))) , uno::UNO_QUERY_THROW );
 
     uno::Reference< excel::XNames > xNames( new ScVbaNames( uno::Reference< XHelperInterface >(), mxContext , xNamedRanges , xModel ) );
     sal_Int32 nCount = xNames->getCount();
@@ -2408,7 +2408,7 @@ ScVbaRange::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException)
             throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Illegal param" ) ), uno::Reference< uno::XInterface >() );
 
         if ( aRange.aStart.Row() < 0 || aRange.aEnd.Row() < 0 )
-            throw uno::RuntimeException( rtl::OUString::createFromAscii("Internal failure, illegal param"), uno::Reference< uno::XInterface >() );
+            throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Internal failure, illegal param")), uno::Reference< uno::XInterface >() );
         // return a normal range ( even for multi-selection
         uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pUnoRangesBase->GetDocShell(), aRange ) );
         return new ScVbaRange( mxParent, mxContext, xRange, true  );
@@ -2455,7 +2455,7 @@ ScVbaRange::Columns(const uno::Any& aIndex ) throw (uno::RuntimeException)
             throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Illegal param" ) ), uno::Reference< uno::XInterface >() );
 
         if ( aRange.aStart.Col() < 0 || aRange.aEnd.Col() < 0 )
-            throw uno::RuntimeException( rtl::OUString::createFromAscii("Internal failure, illegal param"), uno::Reference< uno::XInterface >() );
+            throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Internal failure, illegal param")), uno::Reference< uno::XInterface >() );
     }
     // Columns() - no params
     uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pUnoRangesBase->GetDocShell(), aRange ) );
@@ -3071,7 +3071,7 @@ ScVbaRange::Replace( const ::rtl::OUString& What, const ::rtl::OUString& Replace
     }
 
     // sanity check required params
-    if ( !What.getLength() /*|| !Replacement.getLength()*/ )
+    if ( !What.getLength()  )
         throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Range::Replace, missing params" )) , uno::Reference< uno::XInterface >() );
     rtl::OUString sWhat = VBAToRegexp( What);
     // #TODO #FIXME SearchFormat & ReplacesFormat are not processed
@@ -3224,7 +3224,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L
                         throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Range::Replace, illegal value for LookIn." )) , uno::Reference< uno::XInterface >() );
                 }
                 newOptions.SetCellType( nSearchType );
-                xDescriptor->setPropertyValue( rtl::OUString::createFromAscii( "SearchType" ), uno::makeAny( nSearchType ) );
+                xDescriptor->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SearchType" )), uno::makeAny( nSearchType ) );
             }
         }
 
@@ -3273,7 +3273,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L
                 else
                     throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Range::Replace, illegal value for SearchDirection" )) , uno::Reference< uno::XInterface >() );
                 newOptions.SetBackward( bSearchBackwards );
-                xDescriptor->setPropertyValue( rtl::OUString::createFromAscii( "SearchBackwards" ), uno::makeAny( bSearchBackwards ) );
+                xDescriptor->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SearchBackwards" )), uno::makeAny( bSearchBackwards ) );
             }
         }
 
@@ -3425,15 +3425,6 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any&
     // 2) #TODO #FIXME need to refactor this ( below ) into a IsSingleCell() method
     uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, uno::UNO_QUERY_THROW );
 
-    // 'Fraid I don't remember what I was trying to achieve here ???
-/*
-    if (  isSingleCellRange() )
-    {
-        uno::Reference< XRange > xCurrent = CurrentRegion();
-        xCurrent->Sort( Key1, Order1, Key2, Type, Order2, Key3, Order3, Header, OrderCustom, MatchCase, Orientation, SortMethod, DataOption1, DataOption2, DataOption3 );
-        return;
-    }
-*/
     // set up defaults
 
     sal_Int16 nOrder1 = aSortParam.bAscending[0] ? excel::XlSortOrder::xlAscending : excel::XlSortOrder::xlDescending;
@@ -4789,7 +4780,7 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const css::uno::Any
     if( Destination.hasValue() )
     {
         if( !( Destination >>= xRange ) )
-            throw uno::RuntimeException( rtl::OUString::createFromAscii( "Destination parameter should be a range" ),
+            throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Destination parameter should be a range" )),
                     uno::Reference< uno::XInterface >() );
         OSL_TRACE("set range\n");
     }
@@ -4804,7 +4795,7 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const css::uno::Any
     if ( DataType.hasValue() )
     {
         if( !( DataType >>= xlTextParsingType ) )
-            throw uno::RuntimeException( rtl::OUString::createFromAscii( "DataType parameter should be a short" ),
+            throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataType parameter should be a short" )),
                     uno::Reference< uno::XInterface >() );
         OSL_TRACE("set Datatype\n" );
     }
@@ -4814,7 +4805,7 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const css::uno::Any
     if( TextQualifier.hasValue() )
     {
         if( !( TextQualifier >>= xlTextQualifier ))
-             throw uno::RuntimeException( rtl::OUString::createFromAscii( "TextQualifier parameter should be a short" ),
+             throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "TextQualifier parameter should be a short" )),
                     uno::Reference< uno::XInterface >() );
         OSL_TRACE("set TextQualifier\n");
     }
@@ -4823,7 +4814,7 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const css::uno::Any
     if( ConsecutiveDelimiter.hasValue() )
     {
         if( !( ConsecutiveDelimiter >>= bConsecutiveDelimiter ) )
-            throw uno::RuntimeException( rtl::OUString::createFromAscii( "ConsecutiveDelimiter parameter should be a boolean" ),
+            throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ConsecutiveDelimiter parameter should be a boolean" )),
                     uno::Reference< uno::XInterface >() );
         OSL_TRACE("set ConsecutiveDelimiter\n");
     }
@@ -4832,7 +4823,7 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const css::uno::Any
     if( Tab.hasValue() && bDilimited )
     {
         if( !( Tab >>= bTab ) )
-            throw uno::RuntimeException( rtl::OUString::createFromAscii( "Tab parameter should be a boolean" ),
+            throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Tab parameter should be a boolean" )),
                     uno::Reference< uno::XInterface >() );
         OSL_TRACE("set Tab\n");
     }
@@ -4841,7 +4832,7 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const css::uno::Any
     if( Semicolon.hasValue() && bDilimited )
     {
         if( !( Semicolon >>= bSemicolon ) )
-            throw uno::RuntimeException( rtl::OUString::createFromAscii( "Semicolon parameter should be a boolean" ),
+            throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Semicolon parameter should be a boolean" )),
                     uno::Reference< uno::XInterface >() );
         OSL_TRACE("set Semicolon\n");
     }
@@ -4849,7 +4840,7 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const css::uno::Any
     if( Comma.hasValue() && bDilimited )
     {
         if( !( Comma >>= bComma ) )
-            throw uno::RuntimeException( rtl::OUString::createFromAscii( "Comma parameter should be a boolean" ),
+            throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Comma parameter should be a boolean" )),
                     uno::Reference< uno::XInterface >() );
         OSL_TRACE("set Comma\n");
     }
@@ -4857,7 +4848,7 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const css::uno::Any
     if( Space.hasValue() && bDilimited )
     {
         if( !( Space >>= bSpace ) )
-            throw uno::RuntimeException( rtl::OUString::createFromAscii( "Space parameter should be a boolean" ),
+            throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Space parameter should be a boolean" )),
                     uno::Reference< uno::XInterface >() );
         OSL_TRACE("set Space\n");
     }
@@ -4869,12 +4860,12 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const css::uno::Any
         {
             if( OtherChar.hasValue() )
                 if( !( OtherChar >>= sOtherChar ) )
-                    throw uno::RuntimeException( rtl::OUString::createFromAscii( "OtherChar parameter should be a String" ),
+                    throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OtherChar parameter should be a String" )),
                         uno::Reference< uno::XInterface >() );
         OSL_TRACE("set OtherChar\n" );
         }
      else if( bOther )
-            throw uno::RuntimeException( rtl::OUString::createFromAscii( "Other parameter should be a True" ),
+            throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Other parameter should be a True" )),
                     uno::Reference< uno::XInterface >() );
     }
     // FieldInfo, Optional Variant. An array containing parse information for the individual columns of data.
@@ -4889,7 +4880,7 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const css::uno::Any
     if( DecimalSeparator.hasValue() )
     {
         if( !( DecimalSeparator >>= sDecimalSeparator ) )
-            throw uno::RuntimeException( rtl::OUString::createFromAscii( "DecimalSeparator parameter should be a String" ),
+            throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DecimalSeparator parameter should be a String" )),
                 uno::Reference< uno::XInterface >() );
         OSL_TRACE("set DecimalSeparator\n" );
     }
@@ -4897,7 +4888,7 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const css::uno::Any
     if( ThousandsSeparator.hasValue() )
     {
         if( !( ThousandsSeparator >>= sThousandsSeparator ) )
-            throw uno::RuntimeException( rtl::OUString::createFromAscii( "ThousandsSeparator parameter should be a String" ),
+            throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ThousandsSeparator parameter should be a String" )),
                 uno::Reference< uno::XInterface >() );
         OSL_TRACE("set ThousandsSpeparator\n" );
     }
@@ -5205,12 +5196,6 @@ void ScVbaRange::setShowDetail(const uno::Any& aShowDetail) throw ( css::uno::Ru
 ::com::sun::star::uno::Reference< ::ooo::vba::excel::XQueryTable > SAL_CALL
 ScVbaRange::getQueryTable() throw (::com::sun::star::uno::RuntimeException)
 {
-    /*
-    if (m_pQueryTable == NULL)
-    {
-        m_pQueryTable = new ScVbaQueryTable(mxParent ,mxContext, getScDocument(), this); //add by limingl
-    }
-    //*/
     if (!m_xQueryTable.is())
     {
         m_xQueryTable = new ScVbaQueryTable(mxParent ,mxContext, getScDocument(), this); //add by limingl
@@ -5271,8 +5256,7 @@ throw (::com::sun::star::script::BasicErrorException, ::com::sun::star::uno::Run
     sal_Int32  nCol;
     sal_Int32 nMaxRows = 0;
     sal_Int32 nMaxColumns = 0;
-    sal_Bool bEof;
-//  sal_Bool bColName = sal_True;
+    sal_Bool bEof = sal_False;
     long lColCnt = 0;
     if (MaxColumns.hasValue())
     {
@@ -5289,9 +5273,9 @@ throw (::com::sun::star::script::BasicErrorException, ::com::sun::star::uno::Run
 
     Data >>= xIntRes;
     uno::Reference< script::XInvocation > xInvRes(xIntRes, uno::UNO_QUERY_THROW);
-    rtl::OUString oMoveNext = rtl::OUString::createFromAscii("MoveNext") ;
-    rtl::OUString oEof  = rtl::OUString::createFromAscii("EOF") ;
-    rtl::OUString oFields  = rtl::OUString::createFromAscii("Fields") ;
+    rtl::OUString oMoveNext(RTL_CONSTASCII_USTRINGPARAM("MoveNext")) ;
+    rtl::OUString oEof(RTL_CONSTASCII_USTRINGPARAM("EOF")) ;
+    rtl::OUString oFields(RTL_CONSTASCII_USTRINGPARAM("Fields")) ;
 
     if( !xInvRes->hasMethod(oMoveNext))
     {
@@ -5302,7 +5286,7 @@ throw (::com::sun::star::script::BasicErrorException, ::com::sun::star::uno::Run
     aRet = xInvRes->getValue(oFields);
     aRet >>= xIntFields;
     uno::Reference< script::XInvocation > xInvFields(xIntFields, uno::UNO_QUERY_THROW);
-    aRet = xInvFields->getValue( rtl::OUString::createFromAscii("Count")) ;
+    aRet = xInvFields->getValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Count"))) ;
     aRet >>= lColCnt;
 
     //Set the assign column number
@@ -5330,12 +5314,12 @@ throw (::com::sun::star::script::BasicErrorException, ::com::sun::star::uno::Run
             nCol = l;
             aPar <<= nCol;
             //get every field
-            aRet = xInvFields->invoke( rtl::OUString::createFromAscii("Item"), uno::Sequence< uno::Any >(&aPar,1) , aOutParamIndex,aOutParam);
+            aRet = xInvFields->invoke( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Item")), uno::Sequence< uno::Any >(&aPar,1) , aOutParamIndex,aOutParam);
             aRet >>= xIntFld;
             uno::Reference< script::XInvocation > xInvFld(xIntFld, uno::UNO_QUERY_THROW); //Get the Field obj
 
             //set the field value
-            aRet = xInvFld->getValue( rtl::OUString::createFromAscii("Value") );
+            aRet = xInvFld->getValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")) );
             uno::Reference< excel::XRange > xRngToFill = xRngPos->Offset(aCrrRow,aCrrCol );
 
             xRngToFill->setValue(aRet);
@@ -5410,11 +5394,6 @@ ScVbaRange::AutoFill(  const uno::Reference< excel::XRange >& Destination, const
     ScUnoConversion::FillScRange( destRange, destAddress );
     ScUnoConversion::FillScRange( sourceRange, thisAddress );
 
-
-    // source is valid
-//  if (  !sourceRange.In( destRange ) )
-//      throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "source not in destination" ) ), uno::Reference< uno::XInterface >() );
-
     FillDir eDir = FILL_TO_BOTTOM;
     double fStep = 1.0;
 
@@ -5667,8 +5646,8 @@ ScVbaRange::Merge( const uno::Any& Across ) throw (script::BasicErrorException,
         // #TODO #FIXME this seems incredibly lame, this can't be right
         for (sal_Int32 i=1; i <= oRangeRowsImpl->getCount();i++)
         {
-                       oRangeRowsImpl->Cells( uno::makeAny( i ), uno::Any() )->Merge( uno::makeAny( sal_False ) );
-               }
+            oRangeRowsImpl->Cells( uno::makeAny( i ), uno::Any() )->Merge( uno::makeAny( sal_False ) );
+        }
     }
 }
 
diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx
index 46c60ac35e50..fe59cc5034f2 100644
--- a/sc/source/ui/vba/vbarange.hxx
+++ b/sc/source/ui/vba/vbarange.hxx
@@ -288,7 +288,7 @@ public:
     // XDefaultMethod
     ::rtl::OUString SAL_CALL getDefaultMethodName(  ) throw (css::uno::RuntimeException);
         // XDefaultProperty
-        ::rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
+        ::rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); }
 
 
 // #TODO completely rewrite ScVbaRange, its become a hackfest
diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx
index a31d348ff7c8..1f0c9183708a 100644
--- a/sc/source/ui/vba/vbawindow.cxx
+++ b/sc/source/ui/vba/vbawindow.cxx
@@ -273,7 +273,7 @@ ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*P
 /*
     sal_Int32 nSheets = 0;
     sal_Int32 nPosition = 0;
-    throw uno::RuntimeException( rtl::OUString::createFromAscii("No Implemented" ), uno::Reference< uno::XInterface >() );
+    throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No Implemented" )), uno::Reference< uno::XInterface >() );
     sal_Bool bSheets = ( Sheets >>= nSheets );
     sal_Bool bPosition = ( Position >>= nPosition );
     if ( bSheets || bPosition ) // at least one param specified
diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx
index f7a3e6acb589..e5d0a09e33e7 100644
--- a/sc/source/ui/vba/vbawindows.cxx
+++ b/sc/source/ui/vba/vbawindows.cxx
@@ -78,7 +78,7 @@ public:
             m_xContext->getServiceManager(), uno::UNO_QUERY_THROW );
 
         uno::Reference< frame::XDesktop > xDesktop
-            (xSMgr->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"), m_xContext), uno::UNO_QUERY_THROW );
+            (xSMgr->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")), m_xContext), uno::UNO_QUERY_THROW );
         uno::Reference< container::XEnumeration > mxComponents = xDesktop->getComponents()->createEnumeration();
         while( mxComponents->hasMoreElements() )
         {
diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx
index 67de260af9aa..e7b102c4d4bd 100644
--- a/sc/source/ui/vba/vbaworkbooks.cxx
+++ b/sc/source/ui/vba/vbaworkbooks.cxx
@@ -246,7 +246,7 @@ ScVbaWorkbooks::isSpreadSheetFile( const rtl::OUString& sType )
 rtl::OUString
 ScVbaWorkbooks::getFileFilterType( const rtl::OUString& rFileName )
 {
-    uno::Reference< document::XTypeDetection > xTypeDetect( mxContext->getServiceManager()->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.document.TypeDetection"), mxContext), uno::UNO_QUERY_THROW );
+    uno::Reference< document::XTypeDetection > xTypeDetect( mxContext->getServiceManager()->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection")), mxContext), uno::UNO_QUERY_THROW );
     uno::Sequence< beans::PropertyValue > aMediaDesc(1);
     aMediaDesc[ 0 ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ("URL" ) );
     aMediaDesc[ 0 ].Value <<= rFileName;
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 750d3648631e..95ac536783bf 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -103,8 +103,6 @@
 #define IS_AVAILABLE(WhichId,ppItem) \
     (pReqArgs->GetItemState((WhichId), TRUE, ppItem ) == SFX_ITEM_SET)
 
-#define C2U(cChar)  rtl::OUString::createFromAscii(cChar)
-
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -1567,7 +1565,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                     {
                         Reference< ui::dialogs::XExecutableDialog > xDialog(
                                 xMCF->createInstanceWithContext(
-                                    rtl::OUString::createFromAscii("com.sun.star.linguistic2.ChineseTranslationDialog")
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.ChineseTranslationDialog"))
                                     , xContext), UNO_QUERY);
                         Reference< lang::XInitialization > xInit( xDialog, UNO_QUERY );
                         if( xInit.is() )
@@ -1577,7 +1575,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                             Sequence<Any> aSeq(1);
                             Any* pArray = aSeq.getArray();
                             PropertyValue aParam;
-                            aParam.Name = rtl::OUString::createFromAscii("ParentWindow");
+                            aParam.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow"));
                             aParam.Value <<= makeAny(xDialogParentWindow);
                             pArray[0] <<= makeAny(aParam);
                             xInit->initialize( aSeq );
@@ -1595,9 +1593,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                                 {
                                     try
                                     {
-                                        xProp->getPropertyValue( C2U("IsDirectionToSimplified") ) >>= bToSimplified;
-                                        xProp->getPropertyValue( C2U("IsUseCharacterVariants") ) >>= bUseVariants;
-                                        xProp->getPropertyValue( C2U("IsTranslateCommonTerms") ) >>= bCommonTerms;
+                                        xProp->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDirectionToSimplified")) ) >>= bToSimplified;
+                                        xProp->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsUseCharacterVariants")) ) >>= bUseVariants;
+                                        xProp->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsTranslateCommonTerms")) ) >>= bCommonTerms;
                                     }
                                     catch( Exception& )
                                     {
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index a74a73c85721..05d409cbf0fd 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -234,7 +234,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                 {
                     uno::Reference<frame::XFrame> xFrame = pViewFrame->GetFrame().GetFrameInterface();
                     uno::Reference<frame::XFrame> xBeamerFrame = xFrame->findFrame(
-                                                        rtl::OUString::createFromAscii("_beamer"),
+                                                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_beamer")),
                                                         frame::FrameSearchFlag::CHILDREN);
                     if ( xBeamerFrame.is() )
                         bWasOpen = TRUE;
@@ -338,10 +338,10 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
         case SID_DATA_FORM:
             {
                 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-                DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+                DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
 
                 AbstractScDataFormDlg* pDlg = pFact->CreateScDataFormDlg( pTabViewShell->GetDialogParent(),RID_SCDLG_DATAFORM, pTabViewShell);
-                DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+                DBG_ASSERT(pDlg, "Dialog create fail!");
 
                 pDlg->Execute();
 
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 2c2df72120fa..d9f3ccc97b2e 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -2173,7 +2173,7 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence<sheet
         if (!xPropSet.is())
             continue;
 
-        Any any = xPropSet->getPropertyValue( rtl::OUString::createFromAscii(SC_UNO_NUMBERFO) );
+        Any any = xPropSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_NUMBERFO)) );
         sal_Int32 nNumFmt = 0;
         if (!(any >>= nNumFmt))
             continue;
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index c2340aa0a474..128ca94be950 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -245,7 +245,7 @@ void ScDrawView::CalcNormScale( Fraction& rFractX, Fraction& rFractY ) const
     pDoc->GetTableArea( nTab, nEndCol, nEndRow );
     if (nEndCol<20)
         nEndCol = 20;
-    if (nEndRow<1000)
+    if (nEndRow<20)
         nEndRow = 1000;
 
     Fraction aZoom(1,1);
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index d47136d8fc51..e060a50e62c0 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -88,7 +88,6 @@ void ScDrawView::Construct()
     EnableExtendedCommandEventDispatcher(FALSE);
 
     SetFrameDragSingles(TRUE);
-//  SetSolidMarkHdl(TRUE);              // einstellbar -> UpdateUserViewOptions
 
     SetMinMoveDistancePixel( 2 );
     SetHitTolerancePixel( 2 );
@@ -114,7 +113,7 @@ void ScDrawView::Construct()
         if (pLayer)
         {
             SetLayerLocked( pLayer->GetName(), bProt );
-            SetActiveLayer( pLayer->GetName() );        // FRONT als aktiven Layer setzen
+            SetActiveLayer( pLayer->GetName() );        // set active layer to FRONT
         }
         pLayer = rAdmin.GetLayerPerID(SC_LAYER_CONTROLS);
         if (pLayer)
@@ -205,7 +204,7 @@ void ScDrawView::InvalidateAttribs()
     if (!pViewData) return;
     SfxBindings& rBindings = pViewData->GetBindings();
 
-        // echte Statuswerte:
+        // true status values:
     rBindings.InvalidateAll( TRUE );
 }
 
@@ -248,20 +247,6 @@ void ScDrawView::InvalidateDrawTextAttrs()
     rBindings.Invalidate( SID_ALIGN_ANY_JUSTIFIED );
 }
 
-//void ScDrawView::DrawMarks( OutputDevice* pOut ) const
-//{
-//  DBG_ASSERT(pOut, "ScDrawView::DrawMarks: No OutputDevice (!)");
-//  SdrPaintWindow* pPaintWindow = FindPaintWindow(*pOut);
-//
-//  if(pPaintWindow)
-//  {
-//      if(pPaintWindow->isXorVisible())
-//      {
-//          ToggleShownXor(pOut, 0L);
-//      }
-//  }
-//}
-
 void ScDrawView::SetMarkedToLayer( BYTE nLayerNo )
 {
     if (AreObjectsMarked())
@@ -377,7 +362,7 @@ void ScDrawView::RecalcScale()
     pDoc->GetTableArea( nTab, nEndCol, nEndRow );
     if (nEndCol<20)
         nEndCol = 20;
-    if (nEndRow<1000)
+    if (nEndRow<20)
         nEndRow = 1000;
 
     ScDrawUtil::CalcScale( pDoc, nTab, 0,0, nEndCol,nEndRow, pDev,aZoomX,aZoomY,nPPTX,nPPTY,
@@ -416,9 +401,7 @@ void ScDrawView::MarkListHasChanged()
     if ( pClient && pClient->IsObjectInPlaceActive() && !bUnoRefDialog )
     {
         //  #41730# beim ViewShell::Activate aus dem Reset2Open nicht die Handles anzeigen
-        //HMHbDisableHdl = TRUE;
         pClient->DeactivateObject();
-        //HMHbDisableHdl = FALSE;
         //  Image-Ole wieder durch Grafik ersetzen passiert jetzt in ScClient::UIActivate
     }
 
@@ -618,9 +601,6 @@ void __EXPORT ScDrawView::UpdateUserViewOptions()
         SetSnapEnabled( rGrid.GetUseGridSnap() );
         SetGridSnap( rGrid.GetUseGridSnap() );
 
-        //  Snap from grid options is no longer used
-//      SetSnapGrid( Size( rGrid.GetFldSnapX(), rGrid.GetFldSnapY() ) );
-
         Fraction aFractX( rGrid.GetFldDrawX(), rGrid.GetFldDivisionX() + 1 );
         Fraction aFractY( rGrid.GetFldDrawY(), rGrid.GetFldDivisionY() + 1 );
         SetSnapGridWidth( aFractX, aFractY );
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 6b71dbc61514..204e79004f39 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -373,7 +373,7 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
                         com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xInfo;
                         xStyles->getByName( pNameItem->GetValue() ) >>= xInfo;
                         ::rtl::OUString aUIName;
-                        xInfo->getPropertyValue( ::rtl::OUString::createFromAscii("DisplayName") ) >>= aUIName;
+                        xInfo->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayName")) ) >>= aUIName;
                         if ( aUIName.getLength() )
                             rReq.AppendItem( SfxStringItem( SID_STYLE_APPLY, aUIName ) );
                     }
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index 4aa2b1476759..0b1c2469c552 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -471,7 +471,7 @@ void ScGridWindow::DPLaunchFieldPopupMenu(
     const ScDPLabelData& rLabelData = *pDPData->maDPParam.maLabelArray[pDPData->mnDim];
 
     mpDPFieldPopup.reset(new ScDPFieldPopupWindow(this, pViewData->GetDocument()));
-    mpDPFieldPopup->setName(OUString::createFromAscii("DataPilot field member popup"));
+    mpDPFieldPopup->setName(OUString(RTL_CONSTASCII_USTRINGPARAM("DataPilot field member popup")));
     mpDPFieldPopup->setExtendedData(pDPData.release());
     mpDPFieldPopup->setOKAction(new DPFieldPopupOKAction(this));
     {
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx
index 9d220008907e..4940fba35f82 100644
--- a/sc/source/ui/view/gridwin3.cxx
+++ b/sc/source/ui/view/gridwin3.cxx
@@ -266,7 +266,7 @@ MapMode ScGridWindow::GetDrawMapMode( BOOL bForce )
             SCROW nEndRow = 0;
             pDoc->GetTableArea( nTab, nEndCol, nEndRow );
             if (nEndCol<20) nEndCol = 20;
-            if (nEndRow<1000) nEndRow = 1000;
+            if (nEndRow<20) nEndRow = 1000;
             ScDrawUtil::CalcScale( pDoc, nTab, 0,0, nEndCol,nEndRow, this,
                                     pViewData->GetZoomX(),pViewData->GetZoomY(),
                                     pViewData->GetPPTX(),pViewData->GetPPTY(),
diff --git a/sc/source/ui/view/makefile.mk b/sc/source/ui/view/makefile.mk
index 3b1d570f71c0..f00db352cebe 100644
--- a/sc/source/ui/view/makefile.mk
+++ b/sc/source/ui/view/makefile.mk
@@ -39,22 +39,67 @@ TARGET=view
 
 
 SLOFILES =  \
+        $(EXCEPTIONSFILES) \
+        $(SLO)$/cellmergeoption.obj
+
+EXCEPTIONSFILES= \
+        $(SLO)$/auditsh.obj \
+        $(SLO)$/cellsh.obj \
+        $(SLO)$/cellsh1.obj \
+        $(SLO)$/cellsh2.obj \
+        $(SLO)$/cellsh3.obj \
+        $(SLO)$/cellsh4.obj \
+        $(SLO)$/colrowba.obj \
+        $(SLO)$/dbfunc.obj \
+        $(SLO)$/dbfunc2.obj \
+        $(SLO)$/dbfunc3.obj \
+        $(SLO)$/dbfunc4.obj \
+        $(SLO)$/drawutil.obj \
+        $(SLO)$/drawvie2.obj \
+        $(SLO)$/drawvie3.obj \
+        $(SLO)$/drawvie4.obj \
+        $(SLO)$/drawview.obj \
+        $(SLO)$/editsh.obj \
+        $(SLO)$/formatsh.obj \
+        $(SLO)$/galwrap.obj \
+        $(SLO)$/gridmerg.obj \
+        $(SLO)$/gridwin.obj \
+        $(SLO)$/gridwin2.obj \
+        $(SLO)$/gridwin3.obj \
+        $(SLO)$/gridwin4.obj \
+        $(SLO)$/gridwin5.obj \
+        $(SLO)$/hdrcont.obj \
+        $(SLO)$/hintwin.obj \
+        $(SLO)$/imapwrap.obj \
+        $(SLO)$/invmerge.obj \
+        $(SLO)$/notemark.obj \
+        $(SLO)$/olinewin.obj \
+        $(SLO)$/olkact.obj \
+        $(SLO)$/output.obj \
+        $(SLO)$/output2.obj \
+        $(SLO)$/output3.obj \
+        $(SLO)$/overlayobject.obj \
+        $(SLO)$/pfuncache.obj \
+        $(SLO)$/pgbrksh.obj \
+        $(SLO)$/pivotsh.obj \
+        $(SLO)$/preview.obj \
+        $(SLO)$/prevloc.obj \
+        $(SLO)$/prevwsh.obj \
+        $(SLO)$/prevwsh2.obj \
+        $(SLO)$/printfun.obj \
+        $(SLO)$/reffact.obj \
+        $(SLO)$/scextopt.obj \
+        $(SLO)$/select.obj \
+        $(SLO)$/selectionstate.obj \
+        $(SLO)$/spelldialog.obj \
+        $(SLO)$/spelleng.obj \
+        $(SLO)$/tabcont.obj \
+        $(SLO)$/tabsplit.obj \
         $(SLO)$/tabview.obj \
         $(SLO)$/tabview2.obj \
         $(SLO)$/tabview3.obj \
         $(SLO)$/tabview4.obj \
         $(SLO)$/tabview5.obj \
-        $(SLO)$/viewfunc.obj \
-        $(SLO)$/viewfun2.obj \
-        $(SLO)$/viewfun3.obj \
-        $(SLO)$/viewfun4.obj \
-        $(SLO)$/viewfun5.obj \
-        $(SLO)$/viewfun6.obj \
-        $(SLO)$/viewfun7.obj \
-        $(SLO)$/dbfunc.obj \
-        $(SLO)$/dbfunc2.obj \
-        $(SLO)$/dbfunc3.obj \
-        $(SLO)$/dbfunc4.obj \
         $(SLO)$/tabvwsh.obj \
         $(SLO)$/tabvwsh2.obj \
         $(SLO)$/tabvwsh3.obj \
@@ -70,58 +115,16 @@ SLOFILES =  \
         $(SLO)$/tabvwshf.obj \
         $(SLO)$/tabvwshg.obj \
         $(SLO)$/tabvwshh.obj \
-        $(SLO)$/printfun.obj \
-        $(SLO)$/pfuncache.obj \
-        $(SLO)$/preview.obj \
-        $(SLO)$/prevwsh.obj \
-        $(SLO)$/prevwsh2.obj \
-        $(SLO)$/prevloc.obj \
-        $(SLO)$/editsh.obj \
-        $(SLO)$/pivotsh.obj \
-        $(SLO)$/auditsh.obj \
-        $(SLO)$/gridwin.obj \
-        $(SLO)$/gridwin2.obj \
-        $(SLO)$/gridwin3.obj \
-        $(SLO)$/gridwin4.obj \
-        $(SLO)$/gridwin5.obj \
-        $(SLO)$/drawview.obj \
-        $(SLO)$/drawvie2.obj \
-        $(SLO)$/drawvie3.obj \
-        $(SLO)$/drawvie4.obj \
-        $(SLO)$/drawutil.obj \
-        $(SLO)$/output.obj \
-        $(SLO)$/output2.obj \
-        $(SLO)$/output3.obj \
-        $(SLO)$/overlayobject.obj \
-        $(SLO)$/gridmerg.obj \
-        $(SLO)$/invmerge.obj \
-        $(SLO)$/cellmergeoption.obj \
-        $(SLO)$/select.obj \
-        $(SLO)$/olinewin.obj \
-        $(SLO)$/hintwin.obj \
-        $(SLO)$/notemark.obj \
-        $(SLO)$/tabcont.obj \
-        $(SLO)$/tabsplit.obj \
+        $(SLO)$/viewdata.obj \
+        $(SLO)$/viewfun2.obj \
+        $(SLO)$/viewfun3.obj \
+        $(SLO)$/viewfun4.obj \
+        $(SLO)$/viewfun5.obj \
+        $(SLO)$/viewfun6.obj \
+        $(SLO)$/viewfun7.obj \
+        $(SLO)$/viewfunc.obj \
         $(SLO)$/viewutil.obj \
-        $(SLO)$/hdrcont.obj \
-        $(SLO)$/colrowba.obj \
-        $(SLO)$/olkact.obj \
-        $(SLO)$/galwrap.obj \
-        $(SLO)$/imapwrap.obj \
-        $(SLO)$/reffact.obj \
-        $(SLO)$/selectionstate.obj \
-        $(SLO)$/spelleng.obj \
-        $(SLO)$/spelldialog.obj \
-        $(SLO)$/waitoff.obj \
-        $(SLO)$/cellsh.obj \
-        $(SLO)$/cellsh1.obj\
-        $(SLO)$/cellsh2.obj\
-        $(SLO)$/cellsh3.obj\
-        $(SLO)$/cellsh4.obj\
-        $(SLO)$/formatsh.obj\
-        $(SLO)$/pgbrksh.obj\
-        $(SLO)$/viewdata.obj\
-        $(SLO)$/scextopt.obj
+        $(SLO)$/waitoff.obj
 
 .IF "$(OS)$(COM)$(CPUNAME)"=="LINUXGCCSPARC"
     NOOPTFILES= \
@@ -142,29 +145,6 @@ SLOFILES =  \
         $(SLO)$/tabvwsh2.obj
 .ENDIF
 
-EXCEPTIONSFILES= \
-    $(SLO)$/dbfunc3.obj \
-    $(SLO)$/gridwin.obj \
-    $(SLO)$/invmerge.obj \
-    $(SLO)$/output2.obj \
-    $(SLO)$/overlayobject.obj \
-    $(SLO)$/pfuncache.obj \
-    $(SLO)$/spelldialog.obj \
-    $(SLO)$/cellsh1.obj \
-    $(SLO)$/drawvie4.obj \
-    $(SLO)$/formatsh.obj \
-    $(SLO)$/gridwin2.obj \
-    $(SLO)$/scextopt.obj \
-    $(SLO)$/tabvwshb.obj \
-    $(SLO)$/tabvwshf.obj \
-    $(SLO)$/viewdata.obj \
-    $(SLO)$/viewfunc.obj \
-    $(SLO)$/viewfun2.obj \
-    $(SLO)$/viewfun3.obj \
-    $(SLO)$/viewfun5.obj \
-    $(SLO)$/viewfun7.obj \
-    $(SLO)$/reffact.obj
-
 # goal seek -O2
 
 
diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx
index 9fd8e497d3b7..642aaa63e9b2 100644
--- a/sc/source/ui/view/olinewin.cxx
+++ b/sc/source/ui/view/olinewin.cxx
@@ -165,7 +165,7 @@ void ScOutlineWindow::InitSettings()
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
     SetBackground( rStyleSettings.GetFaceColor() );
     maLineColor = rStyleSettings.GetButtonTextColor();
-    mpSymbols = ScGlobal::GetOutlineSymbols( rStyleSettings.GetHighContrastMode() );
+    mpSymbols = ScGlobal::GetOutlineSymbols();
     Invalidate();
 }
 
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 7f9c1a00deef..e744023568da 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -558,9 +558,18 @@ void ScDrawStringsVars::SetTextToWidthOrHash( ScBaseCell* pCell, long nWidth )
         // must be a value or formula cell.
         return;
 
-    if (eType == CELLTYPE_FORMULA && !static_cast<ScFormulaCell*>(pCell)->IsValue())
+    if (eType == CELLTYPE_FORMULA)
+    {
+        ScFormulaCell* pFCell = static_cast<ScFormulaCell*>(pCell);
+        if (pFCell->GetErrCode() != 0)
+        {
+            SetHashText();      // If the error string doesn't fit, always use "###"
+            return;
+        }
         // If it's formula, the result must be a value.
-        return;
+        if (!pFCell->IsValue())
+            return;
+    }
 
     ULONG nFormat = GetValueFormat();
     if ((nFormat % SV_COUNTRY_LANGUAGE_OFFSET) != 0)
diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx
index b5bb920fb209..e98e1c93591d 100644
--- a/sc/source/ui/view/output3.cxx
+++ b/sc/source/ui/view/output3.cxx
@@ -69,10 +69,8 @@ Point ScOutputData::PrePrintDrawingLayer(long nLogStX, long nLogStY )
     aOffset.Y() -= pDoc->GetRowHeight( 0, nY1-1, nTab );
 
     long nDataWidth = 0;
-    long nDataHeight = 0;
     for (nCol=nX1; nCol<=nX2; nCol++)
         nDataWidth += pDoc->GetColWidth( nCol, nTab );
-    nDataHeight += pDoc->GetRowHeight( nY1, nY2, nTab );
 
     if ( bLayoutRTL )
         aOffset.X() += nDataWidth;
@@ -247,7 +245,6 @@ void ScOutputData::DrawSelectiveObjects(const sal_uInt16 nLayer)
 void ScOutputData::DrawingSingle(const sal_uInt16 nLayer)
 {
     BOOL    bHad    = FALSE;
-    long    nPosY   = nScrY;
     SCSIZE  nArrY;
     for (nArrY=1; nArrY+1<nArrCount; nArrY++)
     {
@@ -265,7 +262,6 @@ void ScOutputData::DrawingSingle(const sal_uInt16 nLayer)
             DrawSelectiveObjects( nLayer );
             bHad = FALSE;
         }
-        nPosY += pRowInfo[nArrY].nHeight;
     }
 
     if (bHad)
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 8317d9df747c..3222ef64531c 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -1152,11 +1152,13 @@ void __EXPORT ScPreview::MouseButtonUp( const MouseEvent& rMEvt )
                     {
                        aLRItem.SetLeft( (long)( aButtonUpPt.X() / HMM_PER_TWIPS + aOffset.X() / HMM_PER_TWIPS ));
                        rStyleSet.Put( aLRItem );
+                       pDocShell->SetModified(true);
                     }
                     else if( bRightRulerChange && bRightRulerMove )
                     {
                         aLRItem.SetRight( (long)( nWidth - aButtonUpPt.X() / HMM_PER_TWIPS - aOffset.X() / HMM_PER_TWIPS ));
                         rStyleSet.Put( aLRItem );
+                        pDocShell->SetModified(true);
                     }
 
                     ScStyleSaveData aNewData;
@@ -1220,11 +1222,13 @@ void __EXPORT ScPreview::MouseButtonUp( const MouseEvent& rMEvt )
                     {
                         aULItem.SetUpperValue( (USHORT)( aButtonUpPt.Y() / HMM_PER_TWIPS + aOffset.Y() / HMM_PER_TWIPS ) );
                         rStyleSet.Put( aULItem );
+                        pDocShell->SetModified(true);
                     }
                     else if( bBottomRulerMove && bBottomRulerChange )
                     {
                         aULItem.SetLowerValue( (USHORT)( nHeight - aButtonUpPt.Y() / HMM_PER_TWIPS - aOffset.Y() / HMM_PER_TWIPS ) );
                         rStyleSet.Put( aULItem );
+                        pDocShell->SetModified(true);
                     }
                     else if( bHeaderRulerMove && bHeaderRulerChange )
                     {
@@ -1238,6 +1242,7 @@ void __EXPORT ScPreview::MouseButtonUp( const MouseEvent& rMEvt )
                             SvxSetItem  aNewHeader( (const SvxSetItem&)rStyleSet.Get(ATTR_PAGE_HEADERSET) );
                             aNewHeader.GetItemSet().Put( SvxSizeItem( ATTR_PAGE_SIZE, aHeaderSize ) );
                             rStyleSet.Put( aNewHeader );
+                            pDocShell->SetModified(true);
                         }
                     }
                     else if( bFooterRulerMove && bFooterRulerChange )
@@ -1252,6 +1257,7 @@ void __EXPORT ScPreview::MouseButtonUp( const MouseEvent& rMEvt )
                             SvxSetItem  aNewFooter( (const SvxSetItem&)rStyleSet.Get(ATTR_PAGE_FOOTERSET) );
                             aNewFooter.GetItemSet().Put( SvxSizeItem( ATTR_PAGE_SIZE, aFooterSize ) );
                             rStyleSet.Put( aNewFooter );
+                            pDocShell->SetModified(true);
                         }
                     }
 
@@ -1319,6 +1325,7 @@ void __EXPORT ScPreview::MouseButtonUp( const MouseEvent& rMEvt )
                 if( nNewColWidth >= 0 )
                 {
                     aFunc.SetWidthOrHeight( TRUE, 1,nCols, nTab, SC_SIZE_DIRECT, (USHORT)nNewColWidth, TRUE, TRUE);
+                    pDocShell->SetModified(true);
                 }
                 if ( ValidTab( nTab ) )
                 {
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index ec316617e20e..f99106ca346a 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -575,7 +575,7 @@ USHORT __EXPORT ScPreviewShell::Print( SfxProgress& rProgress, BOOL bIsAPI, Prin
     }
 
     uno::Sequence < beans::PropertyValue > aProps(1);
-    aProps[0].Name = ::rtl::OUString::createFromAscii( "PrintSheets" );
+    aProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "PrintSheets" ));
     aProps[0].Value <<= aSheets;
     SetAdditionalPrintOptions( aProps );
 
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 8180c1b8ea1e..48b6f3b1a3e4 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -519,7 +519,6 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr
 
     Rectangle aLines;
     ScRange aRange( nX1,nY1,nTab, nX2,nY2,nTab );
-//    BOOL bAddLines = pDoc->HasLines( aRange, aLines );
 
     long nTwipsSizeX = 0;
     for (SCCOL i=nX1; i<=nX2; i++)
@@ -553,9 +552,6 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr
     if (bEmbed)
         pDoc->SetEmbedded(aERange);
 
-/*  if (!bMetaFile)
-        pDev->SetMapMode(MAP_PIXEL);
-*/
     long nScrX = aRect.Left();
     long nScrY = aRect.Top();
 
@@ -798,7 +794,6 @@ long ScPrintFunc::TextHeight( const EditTextObject* pObject )
     if (!pObject)
         return 0;
 
-//  pEditEngine->SetPageNo( nTotalPages );
     pEditEngine->SetTextNewDefaults( *pObject, *pEditDefaults, FALSE );
 
     return (long) pEditEngine->GetTextHeight();
@@ -1024,8 +1019,6 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
         //  Die Tabellen-Abfrage ist schon in DocShell::Print, hier immer
         aAreaParam.aPrintArea.aStart.SetTab(nPrintTab);
         aAreaParam.aPrintArea.aEnd.SetTab(nPrintTab);
-
-//      lcl_LimitRange( aAreaParam.aPrintArea, nPrintTab );         // ganze Zeilen/Spalten...
     }
     else if ( pDoc->HasPrintRange() )
     {
@@ -1183,7 +1176,6 @@ void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, OutputDevi
     Size aDrawSize = aGrfSize;
 
     bool bDraw = TRUE;
-//  bool bRetouche = TRUE;
     switch ( ePos )
     {
         case GPOS_LT: aPos = rOrg.TopLeft();
@@ -1218,7 +1210,6 @@ void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, OutputDevi
         case GPOS_AREA:
                       aPos = rOrg.TopLeft();
                       aDrawSize = rOrg.GetSize();
-//                    bRetouche = FALSE;
                       break;
         case GPOS_TILED:
                     {
@@ -1268,7 +1259,6 @@ void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, OutputDevi
                         }
 
                         bDraw = FALSE;
-//                      bRetouche = FALSE;
                     }
                     break;
 
@@ -1331,12 +1321,10 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH,
         return;                                         // leer
 
     //  #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
-    BOOL bCellContrast = bUseStyleColor &&
-            Application::GetSettings().GetStyleSettings().GetHighContrastMode();
+    BOOL bCellContrast = bUseStyleColor;
 
     if ( pBackground && !bCellContrast )
     {
-//      Rectangle aBackRect( Point(nScrX+nLeft, nScrY+nTop), Size(nEffWidth,nEffHeight) );
         if (pBackground->GetGraphicPos() != GPOS_NONE)
         {
             OutputDevice* pRefDev;
@@ -1425,8 +1413,6 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH,
                                     nScrX+nLeft, nScrY+nTop, 0,0, 0,0, nScaleX, nScaleY );
         aOutputData.SetUseStyleColor( bUseStyleColor );
 
-//      pDev->SetMapMode(aTwipMode);
-
         if (pBorderData)
             aOutputData.DrawFrame();
 
@@ -1684,42 +1670,25 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
             aOutputData.SetRefDevice( pRefDev );
     }
 
-//  aOutputData.SetMetaFileMode(TRUE);
     if( aTableParam.bCellContent )
         aOutputData.DrawBackground();
 
     pDev->SetClipRegion( Rectangle( aPos, Size( aOutputData.GetScrW(), aOutputData.GetScrH() ) ) );
     pDev->SetClipRegion();
 
-//  aOutputData.SetMetaFileMode(FALSE);
     if( aTableParam.bCellContent )
     {
         aOutputData.DrawExtraShadow( bShLeft, bShTop, bShRight, bShBottom );
         aOutputData.DrawFrame();
         aOutputData.DrawStrings();
-
-    //  pDev->SetMapMode(aLogicMode);
         aOutputData.DrawEdit(FALSE);
     }
 
-//  pDev->SetMapMode(aOffsetMode);
     if (aTableParam.bGrid)
         aOutputData.DrawGrid( TRUE, FALSE );    // keine Seitenumbrueche
 
-/*!!!!!!!!!!!       Notizen in Tabelle markieren ??????????????????????????
-
-    if (aTableParam.bNotes)
-    {
-        pDev->SetMapMode(aOffsetMode);
-        aOutputData.PrintNoteMarks(aNotePosList);
-        pDev->SetMapMode(aLogicMode);
-    }
-*/
-
     aOutputData.AddPDFNotes();      // has no effect if not rendering PDF with notes enabled
 
-//  pDev->SetMapMode(aDrawMode);
-
     // test if all paint parts are hidden, then a paint is not necessary at all
     if(!bHideAllDrawingLayer)
     {
@@ -1942,7 +1911,6 @@ long ScPrintFunc::DoNotes( long nNoteStart, BOOL bDoPrint, ScPreviewLocationData
     Font aMarkFont;
     ScAutoFontColorMode eColorMode = bUseStyleColor ? SC_AUTOCOL_DISPLAY : SC_AUTOCOL_PRINT;
     ((const ScPatternAttr&)pDoc->GetPool()->GetDefaultItem(ATTR_PATTERN)).GetFont( aMarkFont, eColorMode );
-//? aMarkFont.SetWeight( WEIGHT_BOLD );
     pDev->SetFont( aMarkFont );
     long nMarkLen = pDev->GetTextWidth(
             String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("GW99999:")));
@@ -2046,7 +2014,6 @@ long ScPrintFunc::PrintNotes( long nPageNo, long nNoteStart, BOOL bDoPrint, ScPr
     if ( pPrinter && bDoPrint )
     {
         DBG_ERROR( "StartPage does not exist anymore" );
-        // pPrinter->StartPage();
     }
 
     if ( bDoPrint || pLocationData )
@@ -2070,7 +2037,6 @@ long ScPrintFunc::PrintNotes( long nPageNo, long nNoteStart, BOOL bDoPrint, ScPr
     if ( pPrinter && bDoPrint )
     {
         DBG_ERROR( "EndPage does not exist anymore" );
-        // pPrinter->EndPage();
     }
 
     return nCount;
@@ -2136,7 +2102,6 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO
     if ( pPrinter && bDoPrint )
     {
         DBG_ERROR( "StartPage does not exist anymore" );
-        // pPrinter->StartPage();
     }
 
     //  Kopf- und Fusszeilen (ohne Zentrierung)
@@ -2230,9 +2195,6 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO
 
     long nStartX = ((long) ( nLeftSpace * nScaleX ));
     long nStartY = ((long) ( nTopSpace  * nScaleY ));
-//      nStartX -= aOffset.X();         // schon im MapMode
-//      nStartY -= aOffset.Y();
-
     long nInnerStartX = nStartX;
     long nInnerStartY = nStartY;
     if (pBorderItem)
@@ -2421,7 +2383,6 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO
     if ( pPrinter && bDoPrint )
     {
         DBG_ERROR( "EndPage does not exist anymore" );
-        // pPrinter->EndPage();
     }
 
     aLastSourceRange = ScRange( nX1, nY1, nPrintTab, nX2, nY2, nPrintTab );
@@ -2567,7 +2528,6 @@ long ScPrintFunc::CountPages()                          // setzt auch nPagesX, n
     }
     else
     {
-//      nZoom = 100;                        // nZoom auf letztem Wert stehenlassen !!!
         nPagesX = nPagesY = nTotalY = 0;
         return 0;
     }
@@ -2647,8 +2607,6 @@ void ScPrintFunc::InitModes()               // aus nZoom etc. die MapModes setze
     aOffset = Point( aSrcOffset.X()*100/nZoom, aSrcOffset.Y()*100/nZoom );
 
     long nEffZoom = nZoom * (long) nManualZoom;
-
-//  nScaleX = nScaleY = 1.0;            // Ausgabe in Twips
     nScaleX = nScaleY = HMM_PER_TWIPS;  // Ausgabe in 1/100 mm
 
     Fraction aZoomFract( nEffZoom,10000 );
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 01877252b078..9fe099ebf327 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -45,7 +45,6 @@
 
 ////////////////////// Umsetzen der Standard-Defines //////////////////////
 
-//#define _SVDDRAG_HXX      // SdrDragStat
 #define _SVDPAGE_HXX        // SdrPage
 
 #ifdef _SDR_NOSURROGATEOBJ
@@ -116,13 +115,8 @@
     #undef _SVDORECT_HXX
 #endif
 
-//#ifdef _SDR_NOVIEWS
-//  #define _SVDDRAG_HXX
-//#endif
-
 ////////////////////// Ende der SVDRAW-Modifikationen /////////////////////
 
-
 // INCLUDE ---------------------------------------------------------------
 
 #include "scitems.hxx"
@@ -200,7 +194,7 @@ void __EXPORT ScCornerButton::Paint( const Rectangle& rRect )
     BOOL bLayoutRTL = pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() );
     long nDarkX = bLayoutRTL ? 0 : nPosX;
 
-    if ( !bAdd && !rStyleSettings.GetHighContrastMode() )
+    if ( !bAdd )
     {
         // match the shaded look of column/row headers
 
@@ -472,7 +466,6 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner )
             if ( WhichH( aViewData.GetActivePart() ) == SC_SPLIT_RIGHT )
                 ActivatePart( SC_SPLIT_BOTTOMLEFT );
             InvalidateSplit();
-//          UpdateShow();
         }
     if ( aViewData.GetVSplitMode() != SC_SPLIT_NONE )
         if ( aViewData.GetVSplitPos() > nSizeY - SPLIT_MARGIN )
@@ -481,7 +474,6 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner )
             if ( WhichV( aViewData.GetActivePart() ) == SC_SPLIT_TOP )
                 ActivatePart( SC_SPLIT_BOTTOMLEFT );
             InvalidateSplit();
-//          UpdateShow();
         }
 
     UpdateShow();
@@ -491,13 +483,11 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner )
         long nScrollBarSize = pFrameWin->GetSettings().GetStyleSettings().GetScrollBarSize();
         if (bVScroll)
         {
-//          nBarX = aVScrollBottom.GetSizePixel().Width();
             nBarX = nScrollBarSize;
             nSizeX -= nBarX - nOverlap;
         }
         if (bHScroll)
         {
-//          nBarY = aHScrollLeft.GetSizePixel().Height();
             nBarY = nScrollBarSize;
             nSizeY -= nBarY - nOverlap;
         }
@@ -1015,11 +1005,6 @@ void ScTabView::SetActivePointer( const Pointer& rPointer )
     for (USHORT i=0; i<4; i++)
         if (pGridWin[i])
             pGridWin[i]->SetPointer( rPointer );
-
-/*  ScSplitPos ePos = aViewData.GetActivePart();
-    if (pGridWin[ePos])
-        pGridWin[ePos]->SetPointer( rPointer );
-*/
 }
 
 
@@ -1750,7 +1735,6 @@ void ScTabView::DoHSplit(long nSplitPos)
         else
         {
             nOldDelta = aViewData.GetPosX( SC_SPLIT_LEFT );
-//          aViewData.SetPosX( SC_SPLIT_LEFT, nOldDelta );
             long nLeftWidth = nSplitPos - pRowBar[SC_SPLIT_BOTTOM]->GetSizePixel().Width();
             if ( nLeftWidth < 0 ) nLeftWidth = 0;
             nNewDelta = nOldDelta + aViewData.CellsAtX( nOldDelta, 1, SC_SPLIT_LEFT,
@@ -2442,5 +2426,4 @@ void ScTabView::EnableRefInput(BOOL bFlag)
 }
 
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 7eb78c81d003..8bfb7b6bf9e5 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -1065,8 +1065,6 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
             SCTAB       nTab = GetViewData()->GetTabNo();
             bool        bOldProtection = pDoc->IsTabProtected(nTab);
 
-#if ENABLE_SHEET_PROTECTION
-
             if( pReqArgs )
             {
                 const SfxPoolItem* pItem;
@@ -1134,85 +1132,6 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                     }
                 }
             }
-#else
-            auto_ptr<SfxPasswordDialog> pDlg;
-            String              aPassword;
-            BOOL                bCancel = FALSE;
-            bool                bNewProtection = ! bOldProtection;
-
-            if( pReqArgs )
-            {
-                const SfxPoolItem* pItem;
-                if( IS_AVAILABLE( FID_PROTECT_TABLE, &pItem ) )
-                    bNewProtection = ((const SfxBoolItem*)pItem)->GetValue();
-                if( bNewProtection == bOldProtection )
-                {
-                    rReq.Ignore();
-                    break;
-                }
-            }
-
-            if ( bOldProtection)
-            {
-                // Unprotect a protected sheet.
-
-                ScTableProtection* pProtect = pDoc->GetTabProtection(nTab);
-                if (pProtect && pProtect->isProtectedWithPass())
-                {
-                    String aText( ScResId(SCSTR_PASSWORDOPT) );
-                    pDlg.reset(new SfxPasswordDialog(GetDialogParent(), &aText));
-                    pDlg->SetText( ScResId(SCSTR_UNPROTECTTAB) );
-                    pDlg->SetMinLen( 0 );
-                    pDlg->SetHelpId( FID_PROTECT_TABLE );
-                    pDlg->SetEditHelpId( HID_PASSWD_TABLE );
-
-                    if (pDlg->Execute() == RET_OK)
-                        aPassword = pDlg->GetPassword();
-                    else
-                        bCancel = TRUE;
-                }
-
-                if (!pReqArgs)
-                {
-                    rReq.AppendItem( SfxBoolItem(FID_PROTECT_TABLE, false) );
-                    rReq.Done();
-                }
-            }
-            else
-            {
-                String aText( ScResId(SCSTR_PASSWORDOPT) );
-
-                pDlg.reset(new SfxPasswordDialog(GetDialogParent(), &aText));
-                pDlg->SetText( ScResId(SCSTR_PROTECTTAB) );
-                pDlg->SetMinLen( 0 );
-                pDlg->SetHelpId( FID_PROTECT_TABLE );
-                pDlg->SetEditHelpId( HID_PASSWD_TABLE );
-                pDlg->ShowExtras( SHOWEXTRAS_CONFIRM );
-
-                if (pDlg->Execute() == RET_OK)
-                    aPassword = pDlg->GetPassword();
-                else
-                    bCancel = TRUE;
-            }
-
-            if( !bCancel )
-            {
-                if ( bOldProtection )
-                    Unprotect( nTab, aPassword );
-                else
-                {
-                    pScMod->InputEnterHandler();
-
-                    Protect( nTab, aPassword );
-                }
-
-                if( !pReqArgs )
-                {
-                    rReq.AppendItem( SfxBoolItem( FID_PROTECT_TABLE, bNewProtection ) );
-                    rReq.Done();
-                }
-            }
-#endif
             TabChanged();
             UpdateInputHandler(true);   // damit sofort wieder eingegeben werden kann
             SelectionChanged();
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 493f45341ff4..f9f9c1f43775 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1212,7 +1212,7 @@ ErrCode ScTabViewShell::DoPrint( SfxPrinter *pPrinter,
             }
 
         uno::Sequence < beans::PropertyValue > aProps(1);
-        aProps[0].Name=::rtl::OUString::createFromAscii("PrintSheets");
+        aProps[0].Name=::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrintSheets"));
         aProps[0].Value <<= aSheets;
         SetAdditionalPrintOptions( aProps );
 
diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx
index f7aac8b56da4..6c83cbcc2f93 100644
--- a/sc/source/ui/view/tabvwshg.cxx
+++ b/sc/source/ui/view/tabvwshg.cxx
@@ -91,21 +91,21 @@ void ScTabViewShell::InsertURLButton( const String& rName, const String& rURL,
     uno::Any aAny;
 
     aAny <<= rtl::OUString(rName);
-    xPropSet->setPropertyValue( rtl::OUString::createFromAscii( "Label" ), aAny );
+    xPropSet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Label" )), aAny );
 
     ::rtl::OUString aTmp = INetURLObject::GetAbsURL( pDoc->GetDocumentShell()->GetMedium()->GetBaseURL(), rURL );
     aAny <<= aTmp;
-    xPropSet->setPropertyValue( rtl::OUString::createFromAscii( "TargetURL" ), aAny );
+    xPropSet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "TargetURL" )), aAny );
 
     if( rTarget.Len() )
     {
         aAny <<= rtl::OUString(rTarget);
-        xPropSet->setPropertyValue( rtl::OUString::createFromAscii( "TargetFrame" ), aAny );
+        xPropSet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "TargetFrame" )), aAny );
     }
 
     form::FormButtonType eButtonType = form::FormButtonType_URL;
     aAny <<= eButtonType;
-    xPropSet->setPropertyValue( rtl::OUString::createFromAscii( "ButtonType" ), aAny );
+    xPropSet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ButtonType" )), aAny );
 
         if ( ::avmedia::MediaWindow::isMediaURL( rURL ) )
     {
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 4ffb4d6db889..ccbb7e6467a0 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -1082,19 +1082,18 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
     if (!bWasThere)
         pNewEngine->InsertView(pEditView[eWhich]);
 
-    //      Hintergrundfarbe der Zelle
+    //      background color of the cell
     Color aBackCol = ((const SvxBrushItem&)pPattern->GetItem(ATTR_BACKGROUND)).GetColor();
 
     ScModule* pScMod = SC_MOD();
-    if ( aBackCol.GetTransparency() > 0 ||
-            Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
+    if ( aBackCol.GetTransparency() > 0 )
     {
         aBackCol.SetColor( pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor );
     }
     pEditView[eWhich]->SetBackgroundColor( aBackCol );
 
-    pEditView[eWhich]->Invalidate();            //  noetig ??
-    //  noetig, wenn Position geaendert
+    pEditView[eWhich]->Invalidate();            //  needed ??
+    //  needed, wenn position changed
 }
 
 IMPL_LINK_INLINE_START( ScViewData, EmptyEditHdl, EditStatus *, EMPTYARG )
@@ -1594,7 +1593,7 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich,
 }
 
 //
-//      Anzahl Zellen auf einem Bildschirm
+//      Number of cells on a screen
 //
 
 SCCOL ScViewData::CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, USHORT nScrSizeX ) const
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index d19401efcab9..ff1e5ea174af 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -58,18 +58,12 @@
 #define _MODALDLG_HXX
 #define _MOREBUTTON_HXX
 #define _OUTLINER_HXX
-//#define _PRNDLG_HXX
-//#define _POLY_HXX
 #define _PVRWIN_HXX
-//#define _QUEUE_HXX
 #define _RULER_HXX
 #define _SCRWIN_HXX
 #define _SETBRW_HXX
-//#define _STACK_HXX
-//#define _STATUS_HXX ***
 #define _STDCTRL_HXX
 #define _STDMENU_HXX
-//#define _TAB_HXX
 #define _TABBAR_HXX
 #define _TREELIST_HXX
 #define _VALUESET_HXX
@@ -80,38 +74,23 @@
 #define _VCONT_HXX
 #define _VDRWOBJ_HXX
 
-//#define _SELENG_HXX
-//#define _SOUND_HXX
-//#define _SYSDLG_HXX
-
-
-
-
 #define _PASSWD_HXX
 
 #define _SFX_DOCFILE_HXX
-//#define _SFX_DOCFILT_HXX
 #define _SFX_DOCINF_HXX
 #define _SFX_DOCSH_HXX
-//#define _SFXDOCFILT_HXX
-//#define _SFXDOCINF_HXX
-//#define _SFXDOCSH_HXX
 #define _SFX_PRNMON_HXX
 #define _SFX_RESMGR_HXX
 #define _SFX_TEMPLDLG_HXX
-//#define _SFXAPPWIN_HXX
 #define _SFXBASIC_HXX
 #define _SFXCTRLITEM
 #define _SFXDLGCFG_HXX
-//#define _SFXDISPATCH_HXX
 #define _SFXFILEDLG_HXX
-//#define _SFXIMGMGR_HXX
 #define _SFXIPFRM_HXX
 #define _SFX_MACRO_HXX
 #define _SFXMNUITEM_HXX
 #define _SFXMNUMGR_HXX
 #define _SFXMULTISEL_HXX
-//#define _SFXMSG_HXX
 #define _SFXMSGDESCR_HXX
 #define _SFXMSGPOOL_HXX
 #define _SFX_MINFITEM_HXX
@@ -124,14 +103,6 @@
 #define _SFXTBXMGR_HXX
 
 #define _SI_HXX
-//#define _SI_DLL_HXX
-//#define _SIDLL_HXX
-//#define _SI_NOITEMS
-//#define _SI_NOOTHERFORMS
-//#define _SI_NOSBXCONTROLS
-//#define _SINOSBXCONTROLS
-//#define _SI_NODRW
-//#define _SI_NOCONTROL
 
 #define _SVBOXITM_HXX
 #define _SVCONTNR_HXX     //
@@ -140,7 +111,6 @@
 
 #define _SVDRAG_HXX
 #define _SVINCVW_HXX
-//#define _SV_MULTISEL_HXX
 #define _SVRTV_HXX
 #define _SVTABBX_HXX
 #define _SVTREEBOX_HXX
@@ -211,7 +181,7 @@
 #include "drwtrans.hxx"
 #include "docuno.hxx"
 #include "clipparam.hxx"
-#include "undodat.hxx"   // Amelia Wang
+#include "undodat.hxx"
 
 using namespace com::sun::star;
 
@@ -680,6 +650,10 @@ void ScViewFunc::PasteFromSystem()
             {
                 //  If it's a Writer object, insert RTF instead of OLE
 
+                //  Else, if the class id is all-zero, and SYLK is available,
+                //  it probably is spreadsheet cells that have been put
+                //  on the clipboard by OOo, so use the SYLK. (fdo#31077)
+
                 BOOL bDoRtf = FALSE;
                 TransferableObjectDescriptor aObjDesc;
                 if( aDataHelper.GetTransferableObjectDescriptor( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR, aObjDesc ) )
@@ -690,6 +664,9 @@ void ScViewFunc::PasteFromSystem()
                 }
                 if ( bDoRtf )
                     PasteFromSystem( FORMAT_RTF );
+                else if ( aObjDesc.maClassName == SvGlobalName( 0,0,0,0,0,0,0,0,0,0,0 )
+                          && aDataHelper.HasFormat( SOT_FORMATSTR_ID_SYLK ))
+                    PasteFromSystem( SOT_FORMATSTR_ID_SYLK );
                 else
                     PasteFromSystem( SOT_FORMATSTR_ID_EMBED_SOURCE );
             }
@@ -722,13 +699,8 @@ void ScViewFunc::PasteFromSystem()
                 PasteFromSystem( SOT_FORMATSTR_ID_EMBED_SOURCE_OLE );
             else if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_LINK_SOURCE_OLE ))
                 PasteFromSystem( SOT_FORMATSTR_ID_LINK_SOURCE_OLE );
-//          else
-//              ErrorMessage(STR_PASTE_ERROR);
         }
-//      else
-//          ErrorMessage(STR_PASTE_ERROR);
     }
-
     //  keine Fehlermeldung, weil SID_PASTE in der idl das FastCall-Flag hat,
     //  also auch gerufen wird, wenn nichts im Clipboard steht (#42531#)
 }
@@ -1253,12 +1225,6 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
     nUndoEndCol = sal::static_int_cast<SCCOL>( nUndoEndCol + nEndCol );
     nUndoEndRow = sal::static_int_cast<SCROW>( nUndoEndRow + nEndRow ); // destination area, expanded for merged cells
 
-//  if (nUndoEndCol < nEndCol) nUndoEndCol = nEndCol;
-//  if (nUndoEndRow < nEndRow) nUndoEndRow = nEndRow;
-
-//  nUndoEndCol += nMarkAddX;
-//  nUndoEndRow += nMarkAddY;
-
     if (nUndoEndCol>MAXCOL || nUndoEndRow>MAXROW)
     {
         ErrorMessage(STR_PASTE_FULL);
@@ -1279,9 +1245,6 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
         //! Test auf Ueberlappung
         //! nur wirkliche Schnittmenge testen !!!!!!!
 
-    //  pDoc->HasCommonAttr( StartCol,nStartRow, nUndoEndCol,nUndoEndRow, nStartTab,
-    //                          pClipDoc, nClipStartX, nClipStartY );
-
     ScDocFunc& rDocFunc = pDocSh->GetDocFunc();
     if ( bRecord )
     {
@@ -1434,9 +1397,6 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
                                 TRUE, FALSE, bIncludeFiltered );
     }
 
-    //
-    //
-    //
 
     pDocSh->UpdatePaintExt( nExtFlags, nStartCol, nStartRow, nStartTab,
                                        nEndCol,   nEndRow,   nEndTab );     // content after the change
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index 52fe04459ad8..ffa79e40b5e4 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -393,9 +393,11 @@ void ScViewFunc::DoThesaurus( BOOL bRecord )
         if (pCell)
         {
             ((ScEditCell*) pCell)->GetData(pTObject);
-            pOldTObj = pTObject->Clone();
             if (pTObject)
+            {
+                pOldTObj = pTObject->Clone();
                 pThesaurusEngine->SetText(*pTObject);
+            }
         }
     }
     else
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 2997b71822e5..d052dac652cb 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -409,7 +409,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS
                     ++nUndoPos;
                 }
 
-            DBG_ASSERT( nUndoPos==nSelCount, "nUndoPos!=nSelCount" );
+            OSL_ENSURE( nUndoPos==nSelCount, "nUndoPos!=nSelCount" );
 
             pUndoData = ( pData ? pData->Clone() : NULL );
         }
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 539bee7d0d1c..d66671cb97a6 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -449,6 +449,7 @@
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:ShowLicense"/>
             <menu:menuseparator/>
+            <menu:menuitem menu:id=".uno:ShowCredits"/>
             <menu:menuitem menu:id=".uno:About"/>
         </menu:menupopup>
     </menu:menu>
diff --git a/sc/util/hidother.src b/sc/util/hidother.src
index ffdb5c329399..7170e7b4c3dc 100644
--- a/sc/util/hidother.src
+++ b/sc/util/hidother.src
@@ -501,4 +501,3 @@ hidspecial HID_DAI_FUNC_ROT13       { HelpID = HID_DAI_FUNC_ROT13; };
 //  generated from there, because of the use of macros (#95943#):
 
 hidspecial SID_RENAME_OBJECT        { HelpID = SID_RENAME_OBJECT; };
-
diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx
index 050feef7dc8b..ea52bdfee002 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -234,9 +234,6 @@ AnalysisAddIn::~AnalysisAddIn()
     if( pCDL )
         delete pCDL;
 
-//  if( pResMgr )           no delete, because _all_ resource managers are deleted _before_ this dtor is called
-//      delete pResMgr;
-
     if( pDefLocales )
         delete[] pDefLocales;
 }
@@ -420,7 +417,7 @@ STRING SAL_CALL AnalysisAddIn::getDisplayArgumentName( const STRING& aName, sal_
     if( p && nArg <= 0xFFFF )
     {
         sal_uInt16  nStr = p->GetStrIndex( sal_uInt16( nArg ) );
-        if( nStr /*&& nStr < 4*/ )
+        if( nStr )
             aRet = GetFuncDescrStr( p->GetDescrID(), nStr );
         else
             aRet = STRFROMANSI( "internal" );
@@ -438,7 +435,7 @@ STRING SAL_CALL AnalysisAddIn::getArgumentDescription( const STRING& aName, sal_
     if( p && nArg <= 0xFFFF )
     {
         sal_uInt16  nStr = p->GetStrIndex( sal_uInt16( nArg ) );
-        if( nStr /*&& nStr < 4*/ )
+        if( nStr )
             aRet = GetFuncDescrStr( p->GetDescrID(), nStr + 1 );
         else
             aRet = STRFROMANSI( "for internal use only" );
@@ -565,13 +562,6 @@ SEQofLocName SAL_CALL AnalysisAddIn::getCompatibilityNames( const STRING& aProgr
 
 // XAnalysis
 
-/*double SAL_CALL AnalysisAddIn::get_Test( constREFXPS&,
-    sal_Int32 nMode, double f1, double f2, double f3 ) THROWDEF_RTE
-{
-    return _Test( nMode, f1, f2, f3 );
-}*/
-
-
 /**
  * Workday
  */
@@ -793,7 +783,6 @@ double SAL_CALL AnalysisAddIn::getSeriessum( double fX, double fN, double fM, co
         sal_Int32       n1, n2;
         sal_Int32       nE1 = aCoeffList.getLength();
         sal_Int32       nE2;
-        //sal_Int32     nZ = 0;
 
         for( n1 = 0 ; n1 < nE1 ; n1++ )
         {
@@ -945,7 +934,6 @@ double SAL_CALL AnalysisAddIn::getBessely( double fNum, sal_Int32 nOrder ) THROW
     if( nOrder < 0 || fNum <= 0.0 )
         THROW_IAE;
 
-//  return yn( nOrder, fNum );
     double fRet = sca::analysis::BesselY( fNum, nOrder );
     RETURN_FINITE( fRet );
 }
@@ -1269,7 +1257,6 @@ STRING SAL_CALL AnalysisAddIn::getImsqrt( const STRING& aNum ) THROWDEF_RTE_IAE
 {
     Complex     z( aNum );
 
-//  z.Power( 0.5 );
     z.Sqrt();
 
     return z.GetString();
diff --git a/scaddins/source/analysis/analysis.src b/scaddins/source/analysis/analysis.src
index f513ca660734..bdff7932b68b 100644
--- a/scaddins/source/analysis/analysis.src
+++ b/scaddins/source/analysis/analysis.src
@@ -25,10 +25,8 @@
  *
  ************************************************************************/
 
-
 #include "analysis.hrc"
 
-
 Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
 {
     Resource ANALYSIS_Workday
@@ -3566,39 +3564,3 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
         };
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/scaddins/source/analysis/analysis_deffuncnames.src b/scaddins/source/analysis/analysis_deffuncnames.src
index 840800da8ae4..2c67e2ca3c11 100644
--- a/scaddins/source/analysis/analysis_deffuncnames.src
+++ b/scaddins/source/analysis/analysis_deffuncnames.src
@@ -25,10 +25,8 @@
  *
  ************************************************************************/
 
-
 #include "analysis.hrc"
 
-
 Resource RID_ANALYSIS_DEFFUNCTION_NAMES
 {
 
@@ -868,7 +866,4 @@ Resource RID_ANALYSIS_DEFFUNCTION_NAMES
             < "FACTDOUBLE"; >;
         };
     };
-
 };
-
-
diff --git a/scaddins/source/analysis/analysis_funcnames.src b/scaddins/source/analysis/analysis_funcnames.src
index e5cd3e02f9d3..47796f3b0e3c 100644
--- a/scaddins/source/analysis/analysis_funcnames.src
+++ b/scaddins/source/analysis/analysis_funcnames.src
@@ -25,10 +25,8 @@
  *
  ************************************************************************/
 
-
 #include "analysis.hrc"
 
-
 Resource RID_ANALYSIS_FUNCTION_NAMES
 {
 
@@ -498,51 +496,3 @@ Resource RID_ANALYSIS_FUNCTION_NAMES
     };
 
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/scaddins/source/analysis/analysisadd.idl b/scaddins/source/analysis/analysisadd.idl
index 6245bff9ad5a..242131f4441e 100644
--- a/scaddins/source/analysis/analysisadd.idl
+++ b/scaddins/source/analysis/analysisadd.idl
@@ -54,11 +54,6 @@ module addin
     */
     interface XAnalysis : com::sun::star::uno::XInterface
     {
-        /// _test.
-//      double get_Test(
-//                  [in] com::sun::star::beans::XPropertySet xOptions,
-//                  [in] long Mode, [in] double f1, [in] double f2, [in] double f3 );
-
         /// workday.
         long getWorkday(
                     [in] com::sun::star::beans::XPropertySet xOptions,
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index 03894c0d21ed..4f0711678a03 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -282,7 +282,6 @@ sal_Int32 GetDiffDate360(
     {
         if( bUSAMethod && nDay1 != 30 )
         {
-            //aDate2 += 1;      -> 1.xx.yyyy
             nDay2 = 1;
             if( nMonth2 == 12 )
             {
@@ -433,7 +432,7 @@ sal_Int32 GetDiffDate( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEnd
             DaysToDate( nEndDate, nD2, nM2, nY2 );
 
             sal_Bool        bLeap = IsLeapYear( nY1 );
-            sal_Int32       nDays, nMonths/*, nYears*/;
+            sal_Int32       nDays, nMonths;
 
             nMonths = nM2 - nM1;
             nDays = nD2 - nD1;
@@ -1013,71 +1012,6 @@ double GetOddfprice( sal_Int32 /*nNullDate*/, sal_Int32 /*nSettle*/, sal_Int32 /
     sal_Int32 /*nBase*/ ) THROWDEF_RTE_IAE
 {
     THROW_RTE;  // #87380#
-/*
-    double      fN = GetCoupnum( nNullDate, nSettle, nMat, nFreq, nBase ) - 1.0;
-    double      fNq = GetCoupnum( nNullDate, nSettle, nFirstCoup, nFreq, nBase ) - 1.0;
-    double      fDSC = GetCoupdaysnc( nNullDate, nSettle, nFirstCoup, nFreq, nBase );
-    double      fDSC_E = fDSC / GetCoupdays( nNullDate, nSettle, nMat, nFreq, nBase );
-    double      fNC = GetCoupnum( nNullDate, nIssue, nFirstCoup, nFreq, nBase );
-    sal_uInt32  nNC = sal_uInt32( fNC );
-    sal_uInt16  nMonthDelta = 12 / sal_uInt16( nFreq );
-
-    sal_uInt32  i;
-    double      f1YieldFreq = 1.0 + fYield / double( nFreq );
-    double      f100RateFreq = 100.0 * fRate / double( nFreq );
-
-    double*     pDC = new double[ nNC + 1 ];
-    double*     pNL = new double[ nNC + 1 ];
-    double*     pA = new double[ nNC + 1 ];
-
-    pDC[ 0 ] = pNL[ 0 ] = pA[ 0 ] = 1.0;
-
-    ScaDate aStartDate( nNullDate, nSettle, nBase );
-    ScaDate aNextCoup( nNullDate, nFirstCoup, nBase );
-    if( nNC )
-    {
-        pDC[ 1 ] = ScaDate::GetDiff( aStartDate, aNextCoup );
-        pNL[ 1 ] = GetCoupdays( nNullDate, nSettle, nFirstCoup, nFreq, nBase );
-        pA[ 1 ] = pDC[ 1 ];
-        ScaDate aPre;
-        for( i = 1 ; i <= nNC ; i++ )
-        {
-            aPre = aStartDate;
-            aStartDate.addMonths( nMonthDelta );
-            aNextCoup.addMonths( nMonthDelta );
-            pDC[ i ] = ScaDate::GetDiff( aPre, aStartDate );
-            pNL[ i ] = GetCoupdays( nNullDate, aStartDate.GetDate( nNullDate ), aNextCoup.GetDate( nNullDate ),
-                                        nFreq, nBase );
-            pA[ i ] = ScaDate::GetDiff( aStartDate, aNextCoup );
-        }
-    }
-
-    double      fT1 = fRedemp / pow( f1YieldFreq, fN + fNq + fDSC_E );
-
-    double      fT2 = 0.0;
-    for( i = 1 ; i <= nNC ; i++ )
-        fT2 += pDC[ i ] / pNL[ i ];
-    fT2 *= f100RateFreq / pow( f1YieldFreq, fNq + fDSC_E );
-
-    double      fT3 = 0.0;
-    for( double k = 2.0 ; k <= fN ; k++ )
-        fT3 += 1.0 / pow( f1YieldFreq, k - fNq + fDSC_E );
-    fT3 *= f100RateFreq;
-
-    double      fT4 = 0.0;
-    for( i = 1 ; i <= nNC ; i++ )
-        fT4 += pA[ i ] / pNL[ i ];
-    fT4 *= f100RateFreq;
-
-    if( nNC )
-    {
-        delete pDC;
-        delete pNL;
-        delete pA;
-    }
-
-    return fT1 + fT2 + fT3 - fT4;
-*/
 }
 
 
@@ -1161,56 +1095,6 @@ double GetOddfyield( sal_Int32 /*nNullDate*/, sal_Int32 /*nSettle*/, sal_Int32 /
     sal_Int32 /*nBase*/ ) THROWDEF_RTE_IAE
 {
     THROW_RTE;  // #87380#
-/*
-    //GetOddfprice( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue,
-    //sal_Int32 nFirstCoup, double fRate, double fYield, double fRedemp, sal_Int32 nFreq,
-    //sal_Int32 nBase )
-    double      fPriceN = 0.0;
-    double      fYield1 = 0.0;
-    double      fYield2 = 1.0;
-    double      fPrice1 = GetOddfprice( nNullDate, nSettle, nMat, nIssue, nFirstCoup, fRate, fYield1, fRedemp, nFreq, nBase );
-    double      fPrice2 = GetOddfprice( nNullDate, nSettle, nMat, nIssue, nFirstCoup, fRate, fYield2, fRedemp, nFreq, nBase );
-    double      fYieldN = ( fYield2 - fYield1 ) * 0.5;
-
-    for( sal_uInt32 nIter = 0 ; nIter < 100 && fPriceN != fPrice ; nIter++ )
-    {
-        fPriceN = GetOddfprice( nNullDate, nSettle, nMat, nIssue, nFirstCoup, fRate, fYieldN, fRedemp, nFreq, nBase );
-
-        if( fPrice == fPrice1 )
-            return fYield1;
-        else if( fPrice == fPrice2 )
-            return fYield2;
-        else if( fPrice == fPriceN )
-            return fYieldN;
-        else if( fPrice < fPrice2 )
-        {
-            fYield2 *= 2.0;
-            fPrice2 = GetOddfprice( nNullDate, nSettle, nMat, nIssue, nFirstCoup, fRate, fYield2, fRedemp, nFreq, nBase );
-
-            fYieldN = ( fYield2 - fYield1 ) * 0.5;
-        }
-        else
-        {
-            if( fPrice < fPriceN )
-            {
-                fYield1 = fYieldN;
-                fPrice1 = fPriceN;
-            }
-            else
-            {
-                fYield2 = fYieldN;
-                fPrice2 = fPriceN;
-            }
-
-            fYieldN = fYield2 - ( fYield2 - fYield1 ) * ( ( fPrice - fPrice2 ) / ( fPrice1 - fPrice2 ) );
-        }
-    }
-
-    if( fabs( fPrice - fPriceN ) > fPrice / 100.0 )
-        THROW_IAE;      // result not precise enough
-
-    return fYieldN;
-*/
 }
 
 
@@ -1283,23 +1167,6 @@ double GetZw( double fZins, double fZzr, double fRmz, double fBw, sal_Int32 nF )
 }
 
 
-/*double TBillYield( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fPrice ) THROWDEF_RTE_IAE
-{
-    sal_Int32   nDiff = GetDiffDate360( xOpt, nSettle, nMat, sal_True );
-
-    if( fPrice <= 0.0 || nSettle >= nMat || nDiff > 360 )
-        THROW_IAE;
-
-    double      fRet = 100.0;
-    fRet /= fPrice;
-    fRet--;
-    fRet *= double( nDiff );
-    fRet /= 360.0;
-
-    return fRet;
-}*/
-
-
 //-----------------------------------------------------------------------------
 // financial functions COUP***
 
@@ -1515,7 +1382,6 @@ FuncData::FuncData( const FuncDataBase& r, ResMgr& rResMgr ) :
     eCat( r.eCat )
 {
     AnalysisRscStrArrLoader aArrLoader( RID_ANALYSIS_DEFFUNCTION_NAMES, nCompID, rResMgr );
-//  ResStringArray      aDefFuncNameArray( AnalysisResId( nCompID, rResMgr ) );
     const ResStringArray&   rArr = aArrLoader.GetStringArray();
 
     sal_uInt16              nCount = sal::static_int_cast<sal_uInt16>( rArr.Count() );
@@ -2356,8 +2222,6 @@ double ConvertDataLinear::Convert(
 {
     if( Class() != r.Class() )
         THROW_IAE;
-
-//  return ::rtl::math::round( r.ConvertFromBase( ConvertToBase( f, nLevFrom ), nLevTo ), 13 );
     return r.ConvertFromBase( ConvertToBase( f, nLevFrom ), nLevTo );
 }
 
@@ -2462,14 +2326,12 @@ ConvertDataList::ConvertDataList( void )
     // ENERGY: 1 Joule is...
     NEWDP( "J",     1.0000000000000000E00,  CDC_Energy ); // Joule
     NEWDP( "e",     1.0000000000000000E07,  CDC_Energy ); // Erg  -> http://www.chemie.fu-berlin.de/chemistry/general/si.html
-//  NEWD( "e",      9.99999519343231E06,    CDC_Energy ); // Erg
     NEWDP( "c",     2.3900624947346700E-01, CDC_Energy ); // Thermodynamical Calorie
     NEWDP( "cal",   2.3884619064201700E-01, CDC_Energy ); // Calorie
     NEWDP( "eV",    6.2414570000000000E18,  CDC_Energy ); // Electronvolt
     NEWDP( "ev",    6.2414570000000000E18,  CDC_Energy ); // Electronvolt also
     NEWD( "HPh",    3.7250611111111111E-07, CDC_Energy ); // Horsepower Hours
     NEWD( "hh",     3.7250611111111111E-07, CDC_Energy ); // Horsepower Hours also
-//  NEWD( "HPh",    3.72506430801000E-07,   CDC_Energy ); // Horsepower Hours
     NEWDP( "Wh",    2.7777777777777778E-04, CDC_Energy ); // Watt Hours
     NEWDP( "wh",    2.7777777777777778E-04, CDC_Energy ); // Watt Hours also
     NEWD( "flb",    2.37304222192651E01,    CDC_Energy ); // Foot Pound
@@ -2482,7 +2344,6 @@ ConvertDataList::ConvertDataList( void )
     NEWD( "HP",     1.341022E-03,           CDC_Power ); // Horsepower
     NEWD( "h",      1.341022E-03,           CDC_Power ); // Horsepower also
     NEWD( "PS",     1.359622E-03,           CDC_Power ); // *** German Pferdestaerke
-//  NEWD( "HP",     1.4102006031908E-03,    CDC_Power ); // Excel seams to be a little bit wrong... either this doesn't fit to J -> HPh
 
     // MAGNETISM: 1 Tesla is...
     NEWDP( "T",     1.0000000000000000E00,  CDC_Magnetism ); // Tesla
@@ -2580,10 +2441,6 @@ ConvertDataList::~ConvertDataList()
 
 double ConvertDataList::Convert( double fVal, const STRING& rFrom, const STRING& rTo ) THROWDEF_RTE_IAE
 {
-// This will not catch illegal units
-//   if( rFrom == rTo )
-//       return fVal;
-
     ConvertData*    pFrom = NULL;
     ConvertData*    pTo = NULL;
     sal_Bool        bSearchFrom = sal_True;
@@ -2850,7 +2707,7 @@ ScaAnyConverter::ScaAnyConverter( const uno::Reference< lang::XMultiServiceFacto
     if( xServiceFact.is() )
     {
         uno::Reference< uno::XInterface > xInstance = xServiceFact->createInstance(
-            OUString::createFromAscii( "com.sun.star.util.NumberFormatter" ) );
+            OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.NumberFormatter" )) );
         xFormatter = uno::Reference< util::XNumberFormatter >( xInstance, uno::UNO_QUERY );
     }
 }
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index 2bc90e23d76e..d9da5ba24c9e 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -53,12 +53,10 @@ class ScaAnyConverter;
 
 #define PI          3.1415926535897932
 #define PI_2        (PI/2.0)
-//#define   EULER       2.7182818284590452
 #define EOL         ( ( const sal_Char* ) 1 )
 #define EOE         ( ( const sal_Char* ) 2 )
 
 
-//double                _Test( sal_Int32 nMode, double f1, double f2, double f3 );
 inline sal_Bool     IsLeapYear( sal_uInt16 nYear );
 sal_uInt16          DaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear );
 sal_Int32           DateToDays( sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear );
@@ -125,7 +123,6 @@ double              GetOddlyield( sal_Int32 nNullDate, sal_Int32 nSettle, sal_In
                                 double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) THROWDEF_RTE_IAE;
 double              GetRmz( double fZins, double fZzr, double fBw, double fZw, sal_Int32 nF );
 double              GetZw( double fZins, double fZzr, double fRmz, double fBw, sal_Int32 nF );
-//double                TBillYield( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fPrice )THROWDEF_RTE_IAE;
 
 double              GetCouppcd( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq,
                                 sal_Int32 nBase ) THROWDEF_RTE_IAE;
diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx
index 3ae28745a32f..fb2d6b2e82f8 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -250,9 +250,9 @@ sal_Bool SAL_CALL component_writeInfo(
     {
         try
         {
-            OUString aImpl = OUString::createFromAscii( "/" );
+            OUString aImpl(RTL_CONSTASCII_USTRINGPARAM( "/" ));
             aImpl += ScaDateAddIn::getImplementationName_Static();
-            aImpl += OUString::createFromAscii( "/UNO/SERVICES" );
+            aImpl += OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
 
             uno::Reference< registry::XRegistryKey > xNewKey(
                 reinterpret_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( aImpl ) );
@@ -401,15 +401,15 @@ OUString ScaDateAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex
 
 OUString ScaDateAddIn::getImplementationName_Static()
 {
-    return OUString::createFromAscii( MY_IMPLNAME );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( MY_IMPLNAME ));
 }
 
 uno::Sequence< OUString > ScaDateAddIn::getSupportedServiceNames_Static()
 {
     uno::Sequence< OUString > aRet( 2 );
     OUString* pArray = aRet.getArray();
-    pArray[0] = OUString::createFromAscii( ADDIN_SERVICE );
-    pArray[1] = OUString::createFromAscii( MY_SERVICE );
+    pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( ADDIN_SERVICE ));
+    pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( MY_SERVICE ));
     return aRet;
 }
 
@@ -418,7 +418,7 @@ uno::Sequence< OUString > ScaDateAddIn::getSupportedServiceNames_Static()
 OUString SAL_CALL ScaDateAddIn::getServiceName() throw( uno::RuntimeException )
 {
     // name of specific AddIn service
-    return OUString::createFromAscii( MY_SERVICE );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( MY_SERVICE ));
 }
 
 // XServiceInfo
@@ -711,7 +711,7 @@ sal_Int32 GetNullDate( const uno::Reference< beans::XPropertySet >& xOptions )
         try
         {
             uno::Any aAny = xOptions->getPropertyValue(
-                                        OUString::createFromAscii( "NullDate" ) );
+                                        OUString(RTL_CONSTASCII_USTRINGPARAM( "NullDate" )) );
             util::Date aDate;
             if ( aAny >>= aDate )
                 return DateToDays( aDate.Day, aDate.Month, aDate.Year );
diff --git a/scaddins/source/datefunc/datefunc.src b/scaddins/source/datefunc/datefunc.src
index 80575e7fd933..a9edc3172ebd 100644
--- a/scaddins/source/datefunc/datefunc.src
+++ b/scaddins/source/datefunc/datefunc.src
@@ -314,35 +314,3 @@ Resource RID_DATE_DEFFUNCTION_NAMES
         };
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx
index ce81f14cce69..23f40299e2b2 100644
--- a/sccomp/source/solver/solver.cxx
+++ b/sccomp/source/solver/solver.cxx
@@ -559,13 +559,13 @@ void SAL_CALL SolverComponent::solve() throw(uno::RuntimeException)
 uno::Sequence< OUString > SolverComponent_getSupportedServiceNames()
 {
     uno::Sequence< OUString > aServiceNames( 1 );
-    aServiceNames[ 0 ] = OUString::createFromAscii( "com.sun.star.sheet.Solver" );
+    aServiceNames[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.Solver" ));
     return aServiceNames;
 }
 
 OUString SolverComponent_getImplementationName()
 {
-    return OUString::createFromAscii( "com.sun.star.comp.Calc.Solver" );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.Solver" ));
 }
 
 OUString SAL_CALL SolverComponent::getImplementationName() throw(uno::RuntimeException)
@@ -614,7 +614,7 @@ extern "C"
                 sal_Int32                              nPos;
 
                 xNewKey = reinterpret_cast< registry::XRegistryKey * >( pRegistryKey )->createKey( SolverComponent_getImplementationName() );
-                xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+                xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" )) );
                 const uno::Sequence< OUString > & rSNL1 = SolverComponent_getSupportedServiceNames();
                 const OUString * pArray1 = rSNL1.getConstArray();
                 for ( nPos = rSNL1.getLength(); nPos--; )
diff --git a/sccomp/source/solver/solver.src b/sccomp/source/solver/solver.src
index ff353bc4db9e..39664c4e22d5 100644
--- a/sccomp/source/solver/solver.src
+++ b/sccomp/source/solver/solver.src
@@ -36,18 +36,22 @@ String RID_PROPERTY_NONNEGATIVE
 {
     Text [ en-US ] = "Assume variables as non-negative";
 };
+
 String RID_PROPERTY_INTEGER
 {
     Text [ en-US ] = "Assume variables as integer";
 };
+
 String RID_PROPERTY_TIMEOUT
 {
     Text [ en-US ] = "Solving time limit (seconds)";
 };
+
 String RID_PROPERTY_EPSILONLEVEL
 {
     Text [ en-US ] = "Epsilon level (0-3)";
 };
+
 String RID_PROPERTY_LIMITBBDEPTH
 {
     Text [ en-US ] = "Limit branch-and-bound depth";
@@ -57,20 +61,23 @@ String RID_ERROR_NONLINEAR
 {
     Text [ en-US ] = "The model is not linear.";
 };
+
 String RID_ERROR_EPSILONLEVEL
 {
     Text [ en-US ] = "The epsilon level is invalid.";
 };
+
 String RID_ERROR_INFEASIBLE
 {
     Text [ en-US ] = "The model is infeasible. Check limiting conditions.";
 };
+
 String RID_ERROR_UNBOUNDED
 {
     Text [ en-US ] = "The model is unbounded.";
 };
+
 String RID_ERROR_TIMEOUT
 {
     Text [ en-US ] = "The time limit was reached.";
 };
-
diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst
index b142a436c157..866db7193537 100644
--- a/scp2/prj/build.lst
+++ b/scp2/prj/build.lst
@@ -26,4 +26,5 @@ cp    scp2\source\base            nmake    -    all    cp_base cp_langmacros cp_
 cp    scp2\source\xsltfilter      nmake    -    all    cp_xsltfilter cp_langmacros cp_langtemplates NULL
 cp    scp2\source\winexplorerext  nmake    -    all    cp_winexplorerext cp_langmacros cp_langtemplates NULL
 cp    scp2\source\onlineupdate    nmake    -    all    cp_update cp_langmacros cp_langtemplates NULL
-cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
+cp    scp2\source\accessories     nmake    -    all    cp_accessories cp_langmacros NULL
+cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL
diff --git a/scp2/source/accessories/file_font_accessories.scp b/scp2/source/accessories/file_font_accessories.scp
new file mode 100644
index 000000000000..919fe1606fb8
--- /dev/null
+++ b/scp2/source/accessories/file_font_accessories.scp
@@ -0,0 +1,901 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+/* Airmole font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_airmole, airmole.ttf, Airmole ) 
+#endif 
+
+/* Airmole Antique font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_airmolea, airmolea.ttf, Airmole Antique ) 
+#endif 
+
+/* Airmole Shaded font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_airmoles, airmoles.ttf, Airmole Shaded ) 
+#endif 
+
+/* Airmole Stripe font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_airmoleq, airmoleq.ttf, Airmole Stripe ) 
+#endif 
+
+/* Astron Boy font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_astronbo, astronbo.ttf, Astron Boy ) 
+#endif 
+
+/* Astron Boy Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_astronbi, astronbi.ttf, Astron Boy Italic ) 
+#endif 
+
+/* Astron Boy Video font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_astronbv, astronbv.ttf, Astron Boy Video ) 
+#endif 
+
+/* Astron Boy Wonder font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_astronbw, astronbw.ttf, Astron Boy Wonder ) 
+#endif 
+
+/* Baveuse font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_baveuse, baveuse.ttf, Baveuse ) 
+#endif 
+
+/* Berylium font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Berylium, Berylium.ttf, Berylium ) 
+#endif 
+
+/* Berylium Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Beryliub, Beryliub.ttf, Berylium Bold )
+#endif 
+
+/* Berylium Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Berylibi, Berylibi.ttf, Berylium Bold Italic ) 
+#endif 
+
+/* Berylium Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Beryliui, Beryliui.ttf, Berylium Italic ) 
+#endif 
+
+/* Betsy Flanagan 2 font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_BETSY2, BETSY2.ttf, Betsy Flanagan 2 ) 
+#endif 
+
+/* Blue Highway font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_bluehigh, bluehigh.ttf, Blue Highway ) 
+#endif 
+
+/* Blue Highway Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_bluebold, bluebold.ttf, Blue Highway Bold ) 
+#endif 
+
+/* Blue Highway Condensed font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_bluecond, bluecond.ttf, Blue Highway Condensed ) 
+#endif 
+
+/* Blue Highway Linocut font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_bluehigl, bluehigl.ttf, Blue Highway Linocut ) 
+#endif 
+
+/* Bullpen font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_bullpen_, bullpen_.ttf, Bullpen ) 
+#endif 
+
+/* Bullpen 3D font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_bullpen3, bullpen3.ttf, Bullpen 3D ) 
+#endif 
+
+/* Bullpen Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_bullpeni, bullpeni.ttf, Bullpen Italic ) 
+#endif 
+
+/* Colourbars font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_colourba, colourba.ttf, Colourbars ) 
+#endif 
+
+/* Colourbars Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_colourbb, colourbb.ttf, Colourbars Bold ) 
+#endif 
+
+/* Counterscraps font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_counters, counters.ttf, Counterscraps ) 
+#endif 
+
+/* Credit Valley font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_creditva, creditva.ttf, Credit Valley ) 
+#endif 
+
+/* Credit Valley Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_creditvb, creditvb.ttf, Credit Valley Bold ) 
+#endif 
+
+/* Credit Valley Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_creditvz, creditvz.ttf, Credit Valley Bold Italic ) 
+#endif 
+
+/* Credit Valley Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_creditvi, creditvi.ttf, Credit Valley Italic ) 
+#endif 
+
+/* Edmunds font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_edmunds, edmunds.ttf, Edmunds ) 
+#endif 
+
+/* Edmunds Distressed font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_edmundis, edmundis.ttf, Edmunds Distressed ) 
+#endif 
+
+/* Engebrechtre font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_engeregu, engeregu.ttf, Engebrechtre ) 
+#endif
+
+/* Engebrechtre Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_engebold, engebold.ttf, Engebrechtre Bold ) 
+#endif
+
+/* Engebrechtre Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_engeboit, engeboit.ttf, Engebrechtre Bold Italic ) 
+#endif
+
+/* Engebrechtre Expanded font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_engeexpa, engeexpa.ttf, Engebrechtre Expanded ) 
+#endif
+
+/* Engebrechtre Expanded Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_engeexbo, engeexbo.ttf, Engebrechtre Expanded Bold ) 
+#endif
+
+/* Engebrechtre Expanded Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_engeexbi, engeexbi.ttf, Engebrechtre Expanded Bold Italic ) 
+#endif
+
+/* Engebrechtre Expanded Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_engeexit, engeexit.ttf, Engebrechtre Expanded Italic ) 
+#endif
+
+/* Engebrechtre Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_engeital, engeital.ttf, Engebrechtre Italic ) 
+#endif
+
+/* Goodfish font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_goodfish, goodfish.ttf, Goodfish ) 
+#endif
+
+/* Goodfish Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_goodfisb, goodfisb.ttf, Goodfish Bold ) 
+#endif
+
+/* Goodfish Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_goodfisc, goodfisc.ttf, Goodfish Bold Italic ) 
+#endif
+
+/* Goodfish Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_goodfisi, goodfisi.ttf, Goodfish Italic ) 
+#endif
+
+/* Guanine font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_guanine_, guanine_.ttf, Guanine ) 
+#endif
+
+/* Gunplay font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_gunplay, gunplay.ttf, Gunplay ) 
+#endif
+
+/* Kirsty font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_kirsty__, kirsty__.ttf, Kirsty ) 
+#endif
+
+/* Kirsty Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_kirsty_b, kirsty_b.ttf, Kirsty Bold ) 
+#endif
+
+/* Kirsty Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_kirstybi, kirstybi.ttf, Kirsty Bold Italic ) 
+#endif
+
+/* Kirsty Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_kirsty_i, kirsty_i.ttf, Kirsty Italic ) 
+#endif
+
+/* Kirsty Ink font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_kirstyin, kirstyin.ttf, Kirsty Ink ) 
+#endif
+
+/* Mufferaw font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_mufferaw, mufferaw.ttf, Mufferaw ) 
+#endif
+
+/* Nasalization font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_nasaliza, nasaliza.ttf, Nasalization ) 
+#endif
+
+/* Neuropol font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_NEUROPOL, NEUROPOL.ttf, Neuropol ) 
+#endif
+
+/* Numberpile font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_numberpi, numberpi.ttf, Numberpile ) 
+#endif
+
+/* Pricedown font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_pricedow, pricedow.ttf, Pricedown ) 
+#endif
+
+/* Pupcat font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_pupcat__, pupcat__.ttf, Pupcat ) 
+#endif
+
+/* Rina font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_rina, rina.ttf, Rina ) 
+#endif
+
+/* Sandoval font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_sandoval, sandoval.ttf, Sandoval ) 
+#endif
+
+/* Sappy Mugs font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_SAPPM___, SAPPM___.ttf, Sappy Mugs ) 
+#endif
+
+/* Screengem font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_screenge, screenge.ttf, Screengem ) 
+#endif
+
+/* Steelfish font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_steelfis, steelfis.ttf, Steelfish ) 
+#endif
+
+/* Steelfish Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_steelfib, steelfib.ttf, Steelfish Bold ) 
+#endif
+
+/* Steelfish Outline font */ 
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_steelout, steelout.ttf, Steelfish Outline ) 
+#endif
+
+/* Strenuous font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_strenuou, strenuou.ttf, Strenuous ) 
+#endif
+
+/* Strenuous 3D font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_strenu3d, strenu3d.ttf, Strenuous 3D ) 
+#endif
+
+/* Subpear font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_subpear_, subpear_.ttf, Subpear ) 
+#endif
+
+/* Teen font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_teen____, teen____.ttf, Teen ) 
+#endif
+
+/* Teen Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_teenbold, teenbold.ttf, Teen Bold ) 
+#endif
+
+/* Teen Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_teenbdit, teenbdit.ttf, Teen Bold Italic ) 
+#endif
+
+/* Teen Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_teenital, teenital.ttf, Teen Italic ) 
+#endif
+
+/* Teen Light font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_teenlite, teenlite.ttf, Teen Light ) 
+#endif
+
+/* Teen Light Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_teenlita, teenlita.ttf, Teen Light Italic ) 
+#endif
+
+/* Typodermic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_typoderm, typoderm.ttf, Typodermic ) 
+#endif
+
+/* Vahika font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_vahika_, vahika_.ttf, Vahika ) 
+#endif
+
+/* Vahika Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_vahikab, vahikab.ttf, Vahika Bold ) 
+#endif
+
+/* Vahika Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_vahikac, vahikac.ttf, Vahika Bold Italic ) 
+#endif
+
+/* Vahika Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_vahikai, vahikai.ttf, Vahika Italic ) 
+#endif
+
+/* Vectroid font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_vectroid, vectroid.ttf, Vectroid ) 
+#endif
+
+/* Velvenda Cooler font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_velvendc, velvendc.ttf, Velvenda Cooler ) 
+#endif
+
+/* Velvenda Megablack font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_velvenda, velvenda.ttf, Velvenda Megablack ) 
+#endif
+
+/* Vibrocentric font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_vibrocen, vibrocen.ttf, Vibrocentric ) 
+#endif
+
+/* Vibrocentric Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_vibroceb, vibroceb.ttf, Vibrocentric Bold ) 
+#endif
+
+/* Vibrocentric Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_vibrocex, vibrocex.ttf, Vibrocentric Bold Italic ) 
+#endif
+
+/* Vibrocentric Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_vibrocei, vibrocei.ttf, Vibrocentric Italic ) 
+#endif
+
+/* Wintermute font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_wintermu, wintermu.ttf, Wintermute ) 
+#endif
+
+/* You're Gone font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_youregon, youregon.ttf, You are Gone )
+#endif
+
+/* You're Gone Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_youregoi, youregoi.ttf, You are Gone Italic )
+#endif
+
+/* Zekton font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_zekton__, zekton__.ttf, Zekton ) 
+#endif
+
+/* Zekton Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_zektonbo, zektonbo.ttf, Zekton Bold ) 
+#endif
+
+/* Zekton Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_zektonbi, zektonbi.ttf, Zekton Bold Italic ) 
+#endif
+
+/* Zekton Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_zektonit, zektonit.ttf, Zekton Italic )
+#endif
+
+/* Zorque font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_zorque, zorque.ttf, Zorque ) 
+#endif
+
+/* Additional fonts for 2.0.3 */
+
+/* -URW-Gothic L */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Gothic_L_Avantgarde, a010013l.ttf, -URW-Gothic L ) 
+#endif
+ 
+/* -URW-Gothic L Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Gothic_L_Bold_Avantgarde, a010015l.ttf, -URW-Gothic L Bold ) 
+#endif
+ 
+/* -URW-Gothic L Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Gothic_L_Italic_Avantgarde, a010033l.ttf, -URW-Gothic L Italic ) 
+#endif
+ 
+/* -URW-Gothic L Bold Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Gothic_L_Bold_Italic_Avantgarde, a010035l.ttf, -URW-Gothic L Bold Italic ) 
+#endif
+ 
+/* -URW-Bookman L */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Bookman_L_Bookman, b018012l.ttf, -URW-Bookman L ) 
+#endif
+ 
+/* -URW-Bookman L Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Bookman_L_Bold_Bookman, b018015l.ttf, -URW-Bookman L Bold ) 
+#endif
+ 
+/* -URW-Bookman L Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Bookman_L_Italic_Bookman, b018032l.ttf, -URW-Bookman L Italic ) 
+#endif
+ 
+/* -URW-Bookman L Bold Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Bookman_L_Bold_Italic_Bookman, b018035l.ttf, -URW-Bookman L Bold Italic ) 
+#endif
+ 
+/* -URW-Century Schoolbook L */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_New_Century_SchoolBook, c059013l.ttf, -URW-Century Schoolbook L ) 
+#endif
+ 
+/* -URW-Century Schoolbook L Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_New_Century_SchoolBook, c059016l.ttf, -URW-Century Schoolbook L Bold ) 
+#endif
+ 
+/* -URW-Century Schoolbook L Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Italic_New_Century_SchoolBook, c059033l.ttf, -URW-Century Schoolbook L Italic ) 
+#endif
+ 
+/* -URW-Century Schoolbook L Bold Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_Italic_New_Century_SchoolBook, c059036l.ttf, -URW-Century Schoolbook L Bold Italic ) 
+#endif
+ 
+/* -URW-Nimbus Sans L */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica, n019003l.ttf, -URW-Nimbus Sans L ) 
+#endif
+ 
+/* -URW-Nimbus Sans L Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica, n019004l.ttf, -URW-Nimbus Sans L Bold ) 
+#endif
+ 
+/* -URW-Nimbus Sans L Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica, n019023l.ttf, -URW-Nimbus Sans L Italic ) 
+#endif
+ 
+/* -URW-Nimbus Sans L Bold Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica, n019024l.ttf, -URW-Nimbus Sans L Bold Italic ) 
+#endif
+ 
+/* -URW-Nimbus Sans L Condensed */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica_Condensed, n019043l.ttf, -URW-Nimbus Sans L Condensed ) 
+#endif
+ 
+/* -URW-Nimbus Sans L Bold Condensed */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica_Condensed, n019044l.ttf, -URW-Nimbus Sans L Bold Condensed ) 
+#endif
+ 
+/* -URW-Nimbus Sans L Italic Condensed */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica_Condensed, n019063l.ttf, -URW-Nimbus Sans L Italic Condensed ) 
+#endif
+ 
+/* -URW-Nimbus Sans L Bold Italic Condensed */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica_Condensed, n019064l.ttf, -URW-Nimbus Sans L Bold Italic Condensed ) 
+#endif
+ 
+/* -URW-Nimbus Roman No9 L */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Times, n021003l.ttf, -URW-Nimbus Roman No9 L ) 
+#endif
+ 
+/* -URW-Nimbus Roman No9 L Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Times, n021004l.ttf, -URW-Nimbus Roman No9 L Bold ) 
+#endif
+ 
+/* -URW-Nimbus Roman No9 L Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Italic_Times, n021023l.ttf, -URW-Nimbus Roman No9 L Italic ) 
+#endif
+ 
+/* -URW-Nimbus Roman No9 L Bold Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Italic_Times, n021024l.ttf, -URW-Nimbus Roman No9 L Bold Italic ) 
+#endif
+ 
+/* -URW-Nimbus Mono L */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Courier, n022003l.ttf, -URW-Nimbus Mono L ) 
+#endif
+ 
+/* -URW-Nimbus Mono L Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Courier, n022004l.ttf, -URW-Nimbus Mono L Bold ) 
+#endif
+ 
+/* -URW-Nimbus Mono LK Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Mono_LK_Italic_Courier, n022023l.ttf, -URW-Nimbus Mono LK Italic ) 
+#endif
+ 
+/* -URW-Nimbus Mono L Bold Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Italic_Courier, n022024l.ttf, -URW-Nimbus Mono L Bold Italic ) 
+#endif
+ 
+/* -URW-Palladio L */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Palladio_L_Palitino, p052003l.ttf, -URW-Palladio L ) 
+#endif
+ 
+/* -URW-Palladio L Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Palladio_L_Bold_Palitino, p052004l.ttf, -URW-Palladio L Bold ) 
+#endif
+ 
+/* -URW-Palladio L Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Palladio_L_Italic_Palitino, p052023l.ttf, -URW-Palladio L Italic ) 
+#endif
+ 
+/* -URW-Palladio L Bold Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Palladio_L_Bold_Italic_Palitino, p052024l.ttf, -URW-Palladio L Bold Italic ) 
+#endif
+ 
+/* -URW-Standard Symbols L */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Standard_Symbols_L_Symbol, s050000l.ttf, -URW-Standard Symbols L ) 
+#endif
+ 
+/* -URW-Chancery L */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_-URW-Chancery_L_Zapf_Chancery, z003034l.ttf, -URW-Chancery L ) 
+#endif
+ 
+/* Dingbats */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Dingbats, d050000l.ttf, Dingbats ) 
+#endif
+ 
+/* Luxi Mono Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Bold, luximb.ttf, Luxi Mono Bold ) 
+#endif
+ 
+/* Luxi Mono Bold Oblique */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Bold_Oblique, luximbi.ttf, Luxi Mono Bold Oblique ) 
+#endif
+ 
+/* Luxi Mono Regular */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Regular, luximr.ttf, Luxi Mono Regular ) 
+#endif
+ 
+/* Luxi Mono Oblique */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Oblique, luximri.ttf, Luxi Mono Oblique ) 
+#endif
+ 
+/* Luxi Serif Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Bold, luxirb.ttf, Luxi Serif Bold ) 
+#endif
+ 
+/* Luxi Serif Bold Oblique */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Bold_Oblique, luxirbi.ttf, Luxi Serif Bold Oblique ) 
+#endif
+ 
+/* Luxi Serif Regular */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Regular, luxirr.ttf, Luxi Serif Regular ) 
+#endif
+ 
+/* Luxi Serif Oblique */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Oblique, luxirri.ttf, Luxi Serif Oblique ) 
+#endif
+ 
+/* Luxi Sans Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Bold, luxisb.ttf, Luxi Sans Bold ) 
+#endif
+ 
+/* Luxi Sans Bold Oblique */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Bold_Oblique, luxisbi.ttf, Luxi Sans Bold Oblique ) 
+#endif
+ 
+/* Luxi Sans Regular */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Regular, luxisr.ttf, Luxi Sans Regular ) 
+#endif
+ 
+/* Luxi Sans Oblique */
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Oblique, luxisri.ttf, Luxi Sans Oblique )
+#endif
+
+/* Gentium */
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_Gentium, GenR102.TTF, Gentium )
+#endif
+
+/* Gentium Italic */
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_Gentium_Italic, GenI102.TTF, Gentium Italic )
+#endif
+
+/* GentiumAlt */
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_GentiumAlt, GenAR102.TTF, GentiumAlt )
+#endif
+
+/* GentiumAlt Italic */
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_GentiumAlt_Italic, GenAI102.TTF, GentiumAlt Italic )
+#endif
+
+/* MgOpen Canonica Bold */
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Bold, MgOpenCanonicaBold.ttf, MgOpen Canonica Bold )
+#endif
+
+/* MgOpen Canonica Bold Italic */
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Bold_Italic, MgOpenCanonicaBoldItalic.ttf, MgOpen Canonica Bold Italic)
+#endif
+
+/* MgOpen Canonica Italic */
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Italic, MgOpenCanonicaItalic.ttf, MgOpen Canonica Italic )
+#endif
+
+/* MgOpen Canonica Regular */
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Regular, MgOpenCanonicaRegular.ttf, MgOpen Canonica )
+#endif
+
+/* Chopin Script */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Chopin_Script, CHOPS___.TTF, Chopin Script ) 
+#endif
+
+/* DTP Dingbats */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_DTPDingbats, DTPDingbats.ttf, DTP Dingbats ) 
+#endif
+
+/* Justus Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Justus-Bold, Justus-Bold.ttf, Justus Bold ) 
+#endif
+
+/* Justus Italic Oldstyle */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Justus-ItalicOldstyle, Justus-ItalicOldstyle.ttf, Justus Italic Oldstyle ) 
+#endif
+
+/* Justus Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Justus-Italic, Justus-Italic.ttf, Justus Italic ) 
+#endif
+
+/* Justus Oldstyle */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Justus-Oldstyle, Justus-Oldstyle.ttf, Justus Oldstyle ) 
+#endif
+
+/* Justus Roman */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Justus-Roman, Justus-Roman.ttf, Justus Roman ) 
+#endif
+
+/* Justus Versalitas */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Justus-Versalitas, Justus-Versalitas.ttf, Justus Versalitas ) 
+#endif
+
+/* Let's trace basic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Lets_trace_basic, letstracebasic.ttf, Lets trace basic  ) 
+#endif
+
+/* Let's trace ruled */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Lets_trace_ruled, letstraceruled.ttf, Lets trace ruled ) 
+#endif
+
+/* Tuffy Bold Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Tuffy_Bold_Italic.ttf, Tuffy_Bold_Italic.ttf, Tuffy Bold Italic ) 
+#endif
+
+/* Tuffy Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Tuffy_Bold, Tuffy_Bold.ttf, Tuffy Bold ) 
+#endif
+
+/* Tuffy Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Tuffy_Italic, Tuffy_Italic.ttf, Tuffy Italic ) 
+#endif
+
+/* Tuffy */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Tuffy, Tuffy.ttf, Tuffy ) 
+#endif
+
+/* Verina Sans Bold Oblique */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Bold_Oblique, Verina_Sans_Bold_Oblique.otf, Verina Sans Bold Oblique ) 
+#endif
+
+/* Verina Sans Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Bold, Verina_Sans_Bold.otf, Verina Sans Bold ) 
+#endif
+
+/* Verina Sans Mono Bold Oblique */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono_Bold_Oblique, Verina_Sans_Mono_Bold_Oblique.otf, Verina Sans Mono Bold Oblique ) 
+#endif
+
+/* Verina Sans Mono Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono_Bold, Verina_Sans_Mono_Bold.otf, Verina Sans Mono Bold ) 
+#endif
+
+/* Verina Sans Mono Oblique */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono_Oblique, Verina_Sans_Mono_Oblique.otf, Verina Sans Mono Oblique ) 
+#endif
+
+/* Verina Sans Mono */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono, Verina_Sans_Mono.otf, Verina Sans Mono ) 
+#endif
+
+/* Verina Sans Oblique */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Oblique, Verina_Sans_Oblique.otf, Verina Sans Oblique ) 
+#endif
+
+/* Verina Sans Roman */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Roman, Verina_Sans_Roman.otf, Verina Sans Roman ) 
+#endif
+
+/* Verina Serif Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Serif_Bold, Verina_Serif_Bold.otf, Verina Serif Bold ) 
+#endif
+
+/* Verina Serif */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Serif, Verina_Serif.otf, Verina Serif ) 
+#endif
+
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_MagyarLinBiolinum, MagyarLinBiolinum.ttf, Magyar Linux Biolinum)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinBiolinumB, MagyarLinBiolinumB.ttf, Magyar Linux Biolinum Bold)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertine, MagyarLinLibertine.ttf, Magyar Linux Libertine)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineB, MagyarLinLibertineB.ttf, Magyar Linux Libertine Bold)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineBI, MagyarLinLibertineBI.ttf, Magyar Linux Libertine Bold Italic)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineC, MagyarLinLibertineC_Re.ttf, Magyar Linux Libertine Capital)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineG, MagyarLinLibertineG.ttf, Magyar Linux Libertine Graphite)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineGB, MagyarLinLibertineGB.ttf, Magyar Linux Libertine Bold Graphite)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineGBI, MagyarLinLibertineGBI.ttf, Magyar Linux Libertine Bold Italic Graphite)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineGI, MagyarLinLibertineGI.ttf, Magyar Linux Libertine Italic Graphite)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineI, MagyarLinLibertineI.ttf, Magyar Linux Libertine Italic)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineN, MagyarLinLibertineN.ttf, Magyar Linux N Libertine)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNB, MagyarLinLibertineNB.ttf, Magyar Linux Libertine N Bold)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNBI, MagyarLinLibertineNBI.ttf, Magyar Linux Libertine N Bold Italic)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNI, MagyarLinLibertineNI.ttf, Magyar Linux Libertine N Italic)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNC, MagyarLinLibertineNC_Re.ttf, Magyar Linux Libertine N Capital)
+#endif
+
diff --git a/scp2/source/accessories/file_gallery_accessories.scp b/scp2/source/accessories/file_gallery_accessories.scp
new file mode 100644
index 000000000000..3499ddbfabdb
--- /dev/null
+++ b/scp2/source/accessories/file_gallery_accessories.scp
@@ -0,0 +1,139 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+/* *** Accessories Extras *** */
+
+/* ** Gallery ** */
+
+#ifdef WITH_EXTRA_GALLERY
+
+File gid_File_Extra_Gallery_Accessories
+    Dir = gid_Dir_Gallery;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigallery.zip";
+End
+
+File gid_File_Extra_Gallery_Draws_People_Accessories
+    Dir = gid_Dir_Gallery_Draws_People;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigallerydrawspeople.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Plants_Accessories
+    Dir = gid_Dir_Gallery_Photos_Plants;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotosplants.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Celebration_Accessories
+    Dir = gid_Dir_Gallery_Photos_Celebration;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotoscelebration.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Fauna_Accessories
+    Dir = gid_Dir_Gallery_Photos_Fauna;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotosfauna.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Flowers_Accessories
+    Dir = gid_Dir_Gallery_Photos_Flowers;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotosflowers.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_FoodsandDrinks_Accessories
+    Dir = gid_Dir_Gallery_Photos_FoodsandDrinks;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotosfoodsanddrinks.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Humans_Accessories
+    Dir = gid_Dir_Gallery_Photos_Humans;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotoshumans.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Landscapes_Accessories
+    Dir = gid_Dir_Gallery_Photos_Landscapes;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotoslandscapes.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Buildings_Accessories
+    Dir = gid_Dir_Gallery_Photos_Buildings;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotosbuildings.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Objects_Accessories
+    Dir = gid_Dir_Gallery_Photos_Objects;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotosobjects.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Cities_Accessories
+    Dir = gid_Dir_Gallery_Photos_Cities;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotoscities.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Space_Accessories
+    Dir = gid_Dir_Gallery_Photos_Space;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotosspace.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Statues_Accessories
+    Dir = gid_Dir_Gallery_Photos_Statues;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotosstatues.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Travel_Accessories
+    Dir = gid_Dir_Gallery_Photos_Travel;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotostravel.zip";
+End
+
+File gid_File_Extra_Gallery_Elements_Bullets2_Accessories
+    Dir = gid_Dir_Gallery_Elements_Bullets2;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryelementsbullets2.zip";
+End
+
+File gid_File_Extra_Gallery_NONFREE_Accessories
+    Dir = gid_Dir_Gallery;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigallerynonfree.zip";
+End
+
+#endif
diff --git a/scp2/source/accessories/file_samples_accessories.scp b/scp2/source/accessories/file_samples_accessories.scp
new file mode 100644
index 000000000000..7b4486fee8e0
--- /dev/null
+++ b/scp2/source/accessories/file_samples_accessories.scp
@@ -0,0 +1,81 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+/* *** Accessories Extras *** */
+
+/* ** Samples ** */
+
+#ifdef WITH_EXTRA_SAMPLE
+
+File gid_File_Extra_Samples_Accessories
+    Dir = gid_Dir_Samples_Language;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamples,zip);
+End
+
+File gid_File_Extra_Samples_Documentations_Accessories
+    Dir = gid_Dir_Samples_Documentations;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamplesdocumentation,zip);
+End
+
+File gid_File_Extra_Samples_Advertisement_Accessories
+    Dir = gid_Dir_Samples_Advertisement;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamplesadvertisement,zip);
+End
+
+/* ** Samples - NON FREE** */
+
+File gid_File_Extra_Samples_NONFREE_Accessories
+    Dir = gid_Dir_Samples_Language;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamplesnonfree,zip);
+End
+
+File gid_File_Extra_Samples_NONFREE_Documentations_Accessories
+    Dir = gid_Dir_Samples_Documentations;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamplesnonfreedocumentation,zip);
+End
+
+File gid_File_Extra_Samples_NONFREE_Advertisement_Accessories
+    Dir = gid_Dir_Samples_Advertisement;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamplesnonfreeadvertisement,zip);
+End
+
+#endif
diff --git a/scp2/source/accessories/file_templates_accessories.scp b/scp2/source/accessories/file_templates_accessories.scp
new file mode 100644
index 000000000000..55689d907123
--- /dev/null
+++ b/scp2/source/accessories/file_templates_accessories.scp
@@ -0,0 +1,272 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+/* *** Accessories Extras *** */
+
+/* ** Templates ** */
+
+#ifdef WITH_EXTRA_TEMPLATE
+
+File gid_File_Extra_Templates_Accessories
+    Dir = gid_Dir_Template_Language;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplates,zip);
+End
+
+File gid_File_Extra_Templates_Layout_Accessories
+    Dir = gid_Dir_Template_Layout;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplateslayout,zip);
+End
+
+File gid_File_Extra_Templates_Present_Accessories
+    Dir = gid_Dir_Template_Presnt;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatespresent,zip);
+End
+
+File gid_File_Extra_Templates_Educate_Accessories
+    Dir = gid_Dir_Template_Educate;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplateseducate,zip);
+End
+
+File gid_File_Extra_Templates_Finance_Accessories
+    Dir = gid_Dir_Template_Finance;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesfinance,zip);
+End
+
+File gid_File_Extra_Templates_Forms_Accessories
+    Dir = gid_Dir_Template_Forms;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesforms,zip);
+End
+
+File gid_File_Extra_Templates_Labels_Accessories
+    Dir = gid_Dir_Template_Labels;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplateslabels,zip);
+End
+
+File gid_File_Extra_Templates_Misc_Accessories
+    Dir = gid_Dir_Template_Misc;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesmisc,zip);
+End
+
+File gid_File_Extra_Templates_Officorr_Accessories
+    Dir = gid_Dir_Template_Officorr;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesofficorr,zip);
+End
+
+File gid_File_Extra_Templates_Offimisc_Accessories
+    Dir = gid_Dir_Template_Offimisc;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesoffimisc,zip);
+End
+
+File gid_File_Extra_Templates_Personal_Accessories
+    Dir = gid_Dir_Template_Personal;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatespersonal,zip);
+End
+
+/* ** Templates - Common ** */
+
+File gid_File_Extra_Templates_Common
+    Dir = gid_Dir_Template_Common;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommon.zip";
+End
+
+File gid_File_Extra_Templates_Common_Layout
+    Dir = gid_Dir_Template_Common_Layout;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonlayout.zip";
+End
+
+File gid_File_Extra_Templates_Common_Present
+    Dir = gid_Dir_Template_Common_Presnt;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonpresent.zip";
+End
+
+File gid_File_Extra_Templates_Common_Educate
+    Dir = gid_Dir_Template_Common_Educate;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommoneducate.zip";
+End
+
+File gid_File_Extra_Templates_Common_Finance
+    Dir = gid_Dir_Template_Common_Finance;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonfinance.zip";
+End
+
+File gid_File_Extra_Templates_Common_Forms
+    Dir = gid_Dir_Template_Common_Forms;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonforms.zip";
+End
+
+File gid_File_Extra_Templates_Common_Labels
+    Dir = gid_Dir_Template_Common_Labels;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonlabels.zip";
+End
+
+File gid_File_Extra_Templates_Common_Misc
+    Dir = gid_Dir_Template_Common_Misc;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonmisc.zip";
+End
+
+File gid_File_Extra_Templates_Common_Officorr
+    Dir = gid_Dir_Template_Common_Officorr;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonofficorr.zip";
+End
+
+File gid_File_Extra_Templates_Common_Offimisc
+    Dir = gid_Dir_Template_Common_Offimisc;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonoffimisc.zip";
+End
+
+File gid_File_Extra_Templates_Common_Personal
+    Dir = gid_Dir_Template_Common_Personal;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonpersonal.zip";
+End
+
+/* ** Templates - NON FREE ** */
+
+File gid_File_Extra_Templates_NONFREE_Accessories
+    Dir = gid_Dir_Template_Language;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfree,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Layout_Accessories
+    Dir = gid_Dir_Template_Layout;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreelayout,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Present_Accessories
+    Dir = gid_Dir_Template_Presnt;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreepresent,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Educate_Accessories
+    Dir = gid_Dir_Template_Educate;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreeeducate,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Finance_Accessories
+    Dir = gid_Dir_Template_Finance;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreefinance,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Forms_Accessories
+    Dir = gid_Dir_Template_Forms;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreeforms,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Labels_Accessories
+    Dir = gid_Dir_Template_Labels;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreelabels,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Misc_Accessories
+    Dir = gid_Dir_Template_Misc;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreemisc,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Officorr_Accessories
+    Dir = gid_Dir_Template_Officorr;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreeofficorr,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Offimisc_Accessories
+    Dir = gid_Dir_Template_Offimisc;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreeoffimisc,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Personal_Accessories
+    Dir = gid_Dir_Template_Personal;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreepersonal,zip);
+End
+
+#endif
diff --git a/scp2/source/accessories/makefile.mk b/scp2/source/accessories/makefile.mk
new file mode 100644
index 000000000000..45c81ca14582
--- /dev/null
+++ b/scp2/source/accessories/makefile.mk
@@ -0,0 +1,86 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+PRJ=..$/..
+
+PRJPCH=
+
+PRJNAME=scp2
+TARGET=accessories
+TARGETTYPE=CUI
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+SCP_PRODUCT_TYPE=osl
+PARFILES= \
+        module_accessories.par
+.IF "$(WITH_EXTRA_GALLERY)" != ""
+PARFILES += \
+        module_gallery_accessories.par     \
+        file_gallery_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_TEMPLATE)" != ""
+PARFILES += \
+        module_templates_accessories.par   \
+        file_templates_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_SAMPLE)" != ""
+PARFILES += \
+        module_samples_accessories.par     \
+        file_samples_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_FONT)" != ""
+PARFILES += \
+        module_font_accessories.par        \
+        file_font_accessories.par
+.ENDIF
+
+ULFFILES= \
+        module_accessories.ulf
+.IF "$(WITH_EXTRA_GALLERY)" != ""
+ULFFILES += \
+        module_gallery_accessories.ulf
+.ENDIF
+.IF "$(WITH_EXTRA_TEMPLATE)" != ""
+ULFFILES += \
+        module_templates_accessories.ulf
+.ENDIF
+.IF "$(WITH_EXTRA_SAMPLE)" != ""
+ULFFILES += \
+        module_samples_accessories.ulf
+.ENDIF
+.IF "$(WITH_EXTRA_FONT)" != ""
+ULFFILES += \
+        module_font_accessories.ulf
+.ENDIF
+
+
+# --- File ---------------------------------------------------------
+.INCLUDE :  target.mk
diff --git a/scp2/source/accessories/module_accessories.scp b/scp2/source/accessories/module_accessories.scp
new file mode 100644
index 000000000000..ded4717f417a
--- /dev/null
+++ b/scp2/source/accessories/module_accessories.scp
@@ -0,0 +1,40 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+Module gid_Module_Optional_Accessories
+    ParentID = gid_Module_Optional;
+    Files = (
+  ); 
+    Sortkey = "300";
+    Minimal = NO;
+    Default = YES;
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES);
+End
+
diff --git a/scp2/source/accessories/module_accessories.ulf b/scp2/source/accessories/module_accessories.ulf
new file mode 100644
index 000000000000..4c1adde8aaa2
--- /dev/null
+++ b/scp2/source/accessories/module_accessories.ulf
@@ -0,0 +1,33 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES]
+en-US = "Accessories"
+
+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES]
+en-US = "Useful %PRODUCTNAME accessories including various Galleries, Templates, Sample documents and Fonts."
diff --git a/scp2/source/accessories/module_font_accessories.scp b/scp2/source/accessories/module_font_accessories.scp
new file mode 100644
index 000000000000..b2e67a7aa890
--- /dev/null
+++ b/scp2/source/accessories/module_font_accessories.scp
@@ -0,0 +1,205 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+#ifdef WITH_EXTRA_FONT
+
+Module gid_Module_Optional_Accessories_Fonts
+    PackageInfo = "packinfo_accessories.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_FONTS);
+    ParentID = gid_Module_Optional_Accessories;
+    Files = ( 
+        gid_File_Fnt_airmole,
+        gid_File_Fnt_airmolea,
+        gid_File_Fnt_airmoles,
+        gid_File_Fnt_airmoleq,
+        gid_File_Fnt_astronbo,
+        gid_File_Fnt_astronbi,
+        gid_File_Fnt_astronbv,
+        gid_File_Fnt_astronbw,
+        gid_File_Fnt_baveuse,
+        gid_File_Fnt_Berylium,
+        gid_File_Fnt_Beryliub,
+        gid_File_Fnt_Berylibi,
+        gid_File_Fnt_Beryliui,
+        gid_File_Fnt_BETSY2,
+        gid_File_Fnt_bluehigh,
+        gid_File_Fnt_bluebold,
+        gid_File_Fnt_bluecond,
+        gid_File_Fnt_bluehigl,
+        gid_File_Fnt_bullpen_,
+        gid_File_Fnt_bullpen3,
+        gid_File_Fnt_bullpeni,
+        gid_File_Fnt_colourba,
+        gid_File_Fnt_colourbb,
+        gid_File_Fnt_counters,
+        gid_File_Fnt_creditva,
+        gid_File_Fnt_creditvb,
+        gid_File_Fnt_creditvz,
+        gid_File_Fnt_creditvi,
+        gid_File_Fnt_edmunds,
+        gid_File_Fnt_edmundis,
+        gid_File_Fnt_engeregu,
+        gid_File_Fnt_engebold,
+        gid_File_Fnt_engeboit,
+        gid_File_Fnt_engeexpa,
+        gid_File_Fnt_engeexbo,
+        gid_File_Fnt_engeexbi,
+        gid_File_Fnt_engeexit,
+        gid_File_Fnt_engeital,
+        gid_File_Fnt_goodfish,
+        gid_File_Fnt_goodfisb,
+        gid_File_Fnt_goodfisc,
+        gid_File_Fnt_goodfisi,
+        gid_File_Fnt_guanine_,
+        gid_File_Fnt_gunplay,
+        gid_File_Fnt_kirsty__,
+        gid_File_Fnt_kirsty_b,
+        gid_File_Fnt_kirstybi,
+        gid_File_Fnt_kirsty_i,
+        gid_File_Fnt_kirstyin,
+        gid_File_Fnt_mufferaw,
+        gid_File_Fnt_nasaliza,
+        gid_File_Fnt_NEUROPOL,
+        gid_File_Fnt_numberpi,
+        gid_File_Fnt_pricedow,
+        gid_File_Fnt_pupcat__,
+        gid_File_Fnt_rina,
+        gid_File_Fnt_sandoval,
+        gid_File_Fnt_SAPPM___,
+        gid_File_Fnt_screenge,
+        gid_File_Fnt_steelfis,
+        gid_File_Fnt_steelfib,
+        gid_File_Fnt_steelout,
+        gid_File_Fnt_strenuou,
+        gid_File_Fnt_strenu3d,
+        gid_File_Fnt_subpear_,
+        gid_File_Fnt_teen____,
+        gid_File_Fnt_teenbold,
+        gid_File_Fnt_teenbdit,
+        gid_File_Fnt_teenital,
+        gid_File_Fnt_teenlite,
+        gid_File_Fnt_teenlita,
+        gid_File_Fnt_typoderm,
+        gid_File_Fnt_vahika_,
+        gid_File_Fnt_vahikab,
+        gid_File_Fnt_vahikac,
+        gid_File_Fnt_vahikai,
+        gid_File_Fnt_vectroid,
+        gid_File_Fnt_velvendc,
+        gid_File_Fnt_velvenda,
+        gid_File_Fnt_vibrocen,
+        gid_File_Fnt_vibroceb,
+        gid_File_Fnt_vibrocex,
+        gid_File_Fnt_vibrocei,
+        gid_File_Fnt_wintermu,
+        gid_File_Fnt_youregon,
+        gid_File_Fnt_youregoi,
+        gid_File_Fnt_zekton__,
+        gid_File_Fnt_zektonbo,
+        gid_File_Fnt_zektonbi,
+        gid_File_Fnt_zektonit,
+        gid_File_Fnt_zorque,
+        gid_File_Fnt_-URW-Gothic_L_Avantgarde,
+        gid_File_Fnt_-URW-Gothic_L_Bold_Avantgarde,
+        gid_File_Fnt_-URW-Gothic_L_Italic_Avantgarde,
+        gid_File_Fnt_-URW-Gothic_L_Bold_Italic_Avantgarde,
+        gid_File_Fnt_-URW-Bookman_L_Bookman,
+        gid_File_Fnt_-URW-Bookman_L_Bold_Bookman,
+        gid_File_Fnt_-URW-Bookman_L_Italic_Bookman,
+        gid_File_Fnt_-URW-Bookman_L_Bold_Italic_Bookman,
+        gid_File_Fnt_-URW-Century_Schoolbook_L_New_Century_SchoolBook,
+        gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_New_Century_SchoolBook,
+        gid_File_Fnt_-URW-Century_Schoolbook_L_Italic_New_Century_SchoolBook,
+        gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_Italic_New_Century_SchoolBook,
+        gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica,
+        gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica,
+        gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica,
+        gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica,
+        gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica_Condensed,
+        gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica_Condensed,
+        gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica_Condensed,
+        gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica_Condensed,
+        gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Times,
+        gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Times,
+        gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Italic_Times,
+        gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Italic_Times,
+        gid_File_Fnt_-URW-Nimbus_Mono_L_Courier,
+        gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Courier,
+        gid_File_Fnt_-URW-Nimbus_Mono_LK_Italic_Courier,
+        gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Italic_Courier,
+        gid_File_Fnt_-URW-Palladio_L_Palitino,
+        gid_File_Fnt_-URW-Palladio_L_Bold_Palitino,
+        gid_File_Fnt_-URW-Palladio_L_Italic_Palitino,
+        gid_File_Fnt_-URW-Palladio_L_Bold_Italic_Palitino,
+        gid_File_Fnt_-URW-Standard_Symbols_L_Symbol,
+        gid_File_Fnt_-URW-Chancery_L_Zapf_Chancery,
+        gid_File_Fnt_Dingbats,
+        gid_File_Fnt_Luxi_Mono_Bold,
+        gid_File_Fnt_Luxi_Mono_Bold_Oblique,
+        gid_File_Fnt_Luxi_Mono_Regular,
+        gid_File_Fnt_Luxi_Mono_Oblique,
+        gid_File_Fnt_Luxi_Serif_Bold,
+        gid_File_Fnt_Luxi_Serif_Bold_Oblique,
+        gid_File_Fnt_Luxi_Serif_Regular,
+        gid_File_Fnt_Luxi_Serif_Oblique,
+        gid_File_Fnt_Luxi_Sans_Bold,
+        gid_File_Fnt_Luxi_Sans_Bold_Oblique,
+        gid_File_Fnt_Luxi_Sans_Regular,
+        gid_File_Fnt_Luxi_Sans_Oblique,
+        gid_File_Fnt_Gentium,
+        gid_File_Fnt_Gentium_Italic,
+        gid_File_Fnt_GentiumAlt,
+        gid_File_Fnt_GentiumAlt_Italic,
+        gid_File_Fnt_MgOpen_Canonica_Bold,
+        gid_File_Fnt_MgOpen_Canonica_Bold_Italic,
+        gid_File_Fnt_MgOpen_Canonica_Italic,
+        gid_File_Fnt_MgOpen_Canonica_Regular,
+        gid_File_Fnt_MagyarLinBiolinum,
+        gid_File_Fnt_MagyarLinBiolinumB,
+        gid_File_Fnt_MagyarLinLibertine,
+        gid_File_Fnt_MagyarLinLibertineB,
+        gid_File_Fnt_MagyarLinLibertineBI,
+        gid_File_Fnt_MagyarLinLibertineC,
+        gid_File_Fnt_MagyarLinLibertineG,
+        gid_File_Fnt_MagyarLinLibertineGB,
+        gid_File_Fnt_MagyarLinLibertineGBI,
+        gid_File_Fnt_MagyarLinLibertineGI,
+        gid_File_Fnt_MagyarLinLibertineI,
+        gid_File_Fnt_MagyarLinLibertineN,
+        gid_File_Fnt_MagyarLinLibertineNB,
+        gid_File_Fnt_MagyarLinLibertineNBI,
+        gid_File_Fnt_MagyarLinLibertineNI,
+        gid_File_Fnt_MagyarLinLibertineNC );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#endif
diff --git a/scp2/source/accessories/module_font_accessories.ulf b/scp2/source/accessories/module_font_accessories.ulf
new file mode 100644
index 000000000000..1fc26c1db003
--- /dev/null
+++ b/scp2/source/accessories/module_font_accessories.ulf
@@ -0,0 +1,33 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_FONTS]
+en-US = "Fonts"
+
+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_FONTS]
+en-US = "Additional fonts for %PRODUCTNAME and other applications."
diff --git a/scp2/source/accessories/module_gallery_accessories.scp b/scp2/source/accessories/module_gallery_accessories.scp
new file mode 100644
index 000000000000..0ea986763c3f
--- /dev/null
+++ b/scp2/source/accessories/module_gallery_accessories.scp
@@ -0,0 +1,60 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+#ifdef WITH_EXTRA_GALLERY
+
+Module gid_Module_Optional_Accessories_Gallery
+    PackageInfo = "packinfo_accessories.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_GALLERY);
+    ParentID = gid_Module_Optional_Accessories;
+    Files = (
+        gid_File_Extra_Gallery_Accessories,
+        gid_File_Extra_Gallery_Draws_People_Accessories,
+        gid_File_Extra_Gallery_Photos_Plants_Accessories,
+        gid_File_Extra_Gallery_Photos_Celebration_Accessories,
+        gid_File_Extra_Gallery_Photos_Fauna_Accessories,
+        gid_File_Extra_Gallery_Photos_Flowers_Accessories,
+        gid_File_Extra_Gallery_Photos_FoodsandDrinks_Accessories,
+        gid_File_Extra_Gallery_Photos_Humans_Accessories,
+        gid_File_Extra_Gallery_Photos_Landscapes_Accessories,
+        gid_File_Extra_Gallery_Photos_Objects_Accessories,
+        gid_File_Extra_Gallery_Photos_Buildings_Accessories,
+        gid_File_Extra_Gallery_Photos_Cities_Accessories,
+        gid_File_Extra_Gallery_Photos_Space_Accessories,
+        gid_File_Extra_Gallery_Photos_Statues_Accessories
+        gid_File_Extra_Gallery_Photos_Travel_Accessories,
+        gid_File_Extra_Gallery_Elements_Bullets2_Accessories,
+        gid_File_Extra_Gallery_NONFREE_Accessories );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#endif
diff --git a/scp2/source/accessories/module_gallery_accessories.ulf b/scp2/source/accessories/module_gallery_accessories.ulf
new file mode 100644
index 000000000000..31745dfffeb6
--- /dev/null
+++ b/scp2/source/accessories/module_gallery_accessories.ulf
@@ -0,0 +1,33 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_GALLERY]
+en-US = "Additional Gallery Themes"
+
+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_GALLERY]
+en-US = "The %PRODUCTNAME Gallery contains more than 3400 elements in various themes."
diff --git a/scp2/source/accessories/module_samples_accessories.scp b/scp2/source/accessories/module_samples_accessories.scp
new file mode 100644
index 000000000000..672774c68f98
--- /dev/null
+++ b/scp2/source/accessories/module_samples_accessories.scp
@@ -0,0 +1,98 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+#ifdef WITH_EXTRA_SAMPLE
+
+Module gid_Module_Optional_Accessories_Advertisement
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_ADVERTISEMENT);
+    ParentID = gid_Module_Optional_Accessories;
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+Module gid_Module_Optional_Accessories_Documentations
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_DOCUMENTATIONS);
+    ParentID = gid_Module_Optional_Accessories;
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+Module gid_Module_Optional_Accessories_Samples
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_SAMPLES);
+    ParentID = gid_Module_Optional_Accessories;
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#include "alllangmodules_accessories_samples_root.inc"
+
+Module gid_Module_Optional_Accessories_Adv_Template
+    ParentID = gid_Module_Optional_Accessories_Advertisement;
+    Name = "gid_Module_Optional_Accessories_Adv_Template";
+    Description = "gid_Module_Optional_Accessories_Adv_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = (
+        gid_File_Extra_Samples_Advertisement_Accessories,
+        gid_File_Extra_Samples_NONFREE_Advertisement_Accessories );
+    Minimal = NO;
+    Default = YES;
+End
+
+Module gid_Module_Optional_Accessories_Doc_Template
+    ParentID = gid_Module_Optional_Accessories_Documentations;
+    Name = "gid_Module_Optional_Accessories_Doc_Template";
+    Description = "gid_Module_Optional_Accessories_Doc_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = (
+        gid_File_Extra_Samples_Documentations_Accessories,
+        gid_File_Extra_Samples_NONFREE_Documentations_Accessories );
+    Minimal = YES;
+    Default = YES;
+End
+
+Module gid_Module_Optional_Accessories_Sam_Template
+    ParentID = gid_Module_Optional_Accessories_Samples;
+    Name = "gid_Module_Optional_Accessories_Sam_Template";
+    Description = "gid_Module_Optional_Accessories_Sam_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = (
+        gid_File_Extra_Samples_Accessories,
+        gid_File_Extra_Samples_NONFREE_Accessories  );
+    Minimal = NO;
+    Default = YES;
+End
+
+#include "alllangmodules_accessories_samples.inc"
+
+#endif
+
diff --git a/scp2/source/accessories/module_samples_accessories.ulf b/scp2/source/accessories/module_samples_accessories.ulf
new file mode 100644
index 000000000000..42166a600afb
--- /dev/null
+++ b/scp2/source/accessories/module_samples_accessories.ulf
@@ -0,0 +1,706 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_SAMPLES]
+en-US = "Sample documents"
+
+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_SAMPLES]
+en-US = "Sample documents are good for learning."
+
+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_DOCUMENTATIONS]
+en-US = "Documentations"
+
+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_DOCUMENTATIONS]
+en-US = "%PRODUCTNAME documentations."
+
+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_ADVERTISEMENT]
+en-US = "Advertisement"
+
+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_ADVERTISEMENT]
+en-US = "%PRODUCTNAME advertisement materials."
+
+[STR_NAME_MODULE_LANGPACK_EN_US]
+en-US = "English"
+
+[STR_DESC_MODULE_LANGPACK_EN_US]
+en-US = "Installs English support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DE]
+en-US = "German"
+
+[STR_DESC_MODULE_LANGPACK_DE]
+en-US = "Installs German support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FR]
+en-US = "French"
+
+[STR_DESC_MODULE_LANGPACK_FR]
+en-US = "Installs French support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_IT]
+en-US = "Italian"
+
+[STR_DESC_MODULE_LANGPACK_IT]
+en-US = "Installs Italian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ES]
+en-US = "Spanish"
+
+[STR_DESC_MODULE_LANGPACK_ES]
+en-US = "Installs Spanish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SV]
+en-US = "Swedish"
+
+[STR_DESC_MODULE_LANGPACK_SV]
+en-US = "Installs Swedish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PT]
+en-US = "Portuguese"
+
+[STR_DESC_MODULE_LANGPACK_PT]
+en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PT_BR]
+en-US = "Portuguese (Brazil)"
+
+[STR_DESC_MODULE_LANGPACK_PT_BR]
+en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_JA]
+en-US = "Japanese"
+
+[STR_DESC_MODULE_LANGPACK_JA]
+en-US = "Installs Japanese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KO]
+en-US = "Korean"
+
+[STR_DESC_MODULE_LANGPACK_KO]
+en-US = "Installs Korean support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZH_CN]
+en-US = "Chinese (simplified)"
+
+[STR_DESC_MODULE_LANGPACK_ZH_CN]
+en-US = "Installs Chinese (simplified) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZH_TW]
+en-US = "Chinese (traditional)"
+
+[STR_DESC_MODULE_LANGPACK_ZH_TW]
+en-US = "Installs Chinese (traditional) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NL]
+en-US = "Dutch"
+
+[STR_DESC_MODULE_LANGPACK_NL]
+en-US = "Installs Dutch support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HU]
+en-US = "Hungarian"
+
+[STR_DESC_MODULE_LANGPACK_HU]
+en-US = "Installs Hungarian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PL]
+en-US = "Polish"
+
+[STR_DESC_MODULE_LANGPACK_PL]
+en-US = "Installs Polish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RU]
+en-US = "Russian"
+
+[STR_DESC_MODULE_LANGPACK_RU]
+en-US = "Installs Russian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TR]
+en-US = "Turkish"
+
+[STR_DESC_MODULE_LANGPACK_TR]
+en-US = "Installs Turkish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EL]
+en-US = "Greek"
+
+[STR_DESC_MODULE_LANGPACK_EL]
+en-US = "Installs Greek support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TH]
+en-US = "Thai"
+
+[STR_DESC_MODULE_LANGPACK_TH]
+en-US = "Installs Thai support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CS]
+en-US = "Czech"
+
+[STR_DESC_MODULE_LANGPACK_CS]
+en-US = "Installs Czech support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SK]
+en-US = "Slovak"
+
+[STR_DESC_MODULE_LANGPACK_SK]
+en-US = "Installs Slovak support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HR]
+en-US = "Croatian"
+
+[STR_DESC_MODULE_LANGPACK_HR]
+en-US = "Installs Croatian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ET]
+en-US = "Estonian"
+
+[STR_DESC_MODULE_LANGPACK_ET]
+en-US = "Installs Estonian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_VI]
+en-US = "Vietnamese"
+
+[STR_DESC_MODULE_LANGPACK_VI]
+en-US = "Installs Vietnamese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BG]
+en-US = "Bulgarian"
+
+[STR_DESC_MODULE_LANGPACK_BG]
+en-US = "Installs Bulgarian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KM]
+en-US = "Khmer"
+
+[STR_DESC_MODULE_LANGPACK_KM]
+en-US = "Installs Khmer support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PA_IN]
+en-US = "Punjabi"
+
+[STR_DESC_MODULE_LANGPACK_PA_IN]
+en-US = "Installs Punjabi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GU_IN]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_LANGPACK_GU_IN]
+en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TA]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_LANGPACK_TA]
+en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TA_IN]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_LANGPACK_TA_IN]
+en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HI]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_LANGPACK_HI]
+en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HI_IN]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_LANGPACK_HI_IN]
+en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ST]
+en-US = "Southern Sotho (Sutu)"
+
+[STR_DESC_MODULE_LANGPACK_ST]
+en-US = "Installs Southern Sotho (Sutu) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TN]
+en-US = "Tswana"
+
+[STR_DESC_MODULE_LANGPACK_TN]
+en-US = "Installs Tswana support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_XH]
+en-US = "Xhosa"
+
+[STR_DESC_MODULE_LANGPACK_XH]
+en-US = "Installs Xhosa support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZU]
+en-US = "Zulu"
+
+[STR_DESC_MODULE_LANGPACK_ZU]
+en-US = "Installs Zulu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AF]
+en-US = "Afrikaans"
+
+[STR_DESC_MODULE_LANGPACK_AF]
+en-US = "Installs Afrikaans support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SW]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_LANGPACK_SW]
+en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SW_TZ]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_LANGPACK_SW_TZ]
+en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LO]
+en-US = "Lao"
+
+[STR_DESC_MODULE_LANGPACK_LO]
+en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NS]
+en-US = "Northern Sotho"
+
+[STR_DESC_MODULE_LANGPACK_NS]
+en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN]
+en-US = "Bengali"
+
+[STR_DESC_MODULE_LANGPACK_BN]
+en-US = "Installs Bengali support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN_BD]
+en-US = "Bengali (Bangladesh)"
+
+[STR_DESC_MODULE_LANGPACK_BN_BD]
+en-US = "Installs Bengali (Bangladesh) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN_IN]
+en-US = "Bengali (India)"
+
+[STR_DESC_MODULE_LANGPACK_BN_IN]
+en-US = "Installs Bengali (India) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_OR]
+en-US = "Oriya"
+
+[STR_DESC_MODULE_LANGPACK_OR]
+en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_OR_IN]
+en-US = "Oriya"
+
+[STR_DESC_MODULE_LANGPACK_OR_IN]
+en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MR]
+en-US = "Marathi"
+
+[STR_DESC_MODULE_LANGPACK_MR]
+en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MR_IN]
+en-US = "Marathi"
+
+[STR_DESC_MODULE_LANGPACK_MR_IN]
+en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NE]
+en-US = "Nepali"
+
+[STR_DESC_MODULE_LANGPACK_NE]
+en-US = "Installs Nepali support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AR]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_LANGPACK_AR]
+en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AR_SA]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_LANGPACK_AR_SA]
+en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CA]
+en-US = "Catalan"
+
+[STR_DESC_MODULE_LANGPACK_CA]
+en-US = "Installs Catalan support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DA]
+en-US = "Danish"
+
+[STR_DESC_MODULE_LANGPACK_DA]
+en-US = "Installs Danish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FI]
+en-US = "Finnish"
+
+[STR_DESC_MODULE_LANGPACK_FI]
+en-US = "Installs Finnish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HE]
+en-US = "Hebrew"
+
+[STR_DESC_MODULE_LANGPACK_HE]
+en-US = "Installs Hebrew support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_IS]
+en-US = "Icelandic"
+
+[STR_DESC_MODULE_LANGPACK_IS]
+en-US = "Installs Icelandic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NB]
+en-US = "Norwegian (Bokmal)"
+
+[STR_DESC_MODULE_LANGPACK_NB]
+en-US = "Installs Norwegian (Bokmal) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NN]
+en-US = "Norwegian (Nynorsk)"
+
+[STR_DESC_MODULE_LANGPACK_NN]
+en-US = "Installs Norwegian (Nynorsk) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RM]
+en-US = "Rhaeto-Romance"
+
+[STR_DESC_MODULE_LANGPACK_RM]
+en-US = "Installs Rhaeto-Romance support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RO]
+en-US = "Romanian"
+
+[STR_DESC_MODULE_LANGPACK_RO]
+en-US = "Installs Romanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SQ]
+en-US = "Albanian"
+
+[STR_DESC_MODULE_LANGPACK_SQ]
+en-US = "Installs Albanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UR]
+en-US = "Urdu"
+
+[STR_DESC_MODULE_LANGPACK_UR]
+en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ID]
+en-US = "Indonesian"
+
+[STR_DESC_MODULE_LANGPACK_ID]
+en-US = "Installs Indonesian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UK]
+en-US = "Ukrainian"
+
+[STR_DESC_MODULE_LANGPACK_UK]
+en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BE_BY]
+en-US = "Belarusian"
+
+[STR_DESC_MODULE_LANGPACK_BE_BY]
+en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SL]
+en-US = "Slovenian"
+
+[STR_DESC_MODULE_LANGPACK_SL]
+en-US = "Installs Slovenian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LV]
+en-US = "Latvian"
+
+[STR_DESC_MODULE_LANGPACK_LV]
+en-US = "Installs Latvian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LT]
+en-US = "Lithuanian"
+
+[STR_DESC_MODULE_LANGPACK_LT]
+en-US = "Installs Lithuanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HY]
+en-US = "Armenian"
+
+[STR_DESC_MODULE_LANGPACK_HY]
+en-US = "Installs Armenian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EU]
+en-US = "Basque"
+
+[STR_DESC_MODULE_LANGPACK_EU]
+en-US = "Installs Basque support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MK]
+en-US = "Macedonian"
+
+[STR_DESC_MODULE_LANGPACK_MK]
+en-US = "Installs Macedonian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MT]
+en-US = "Maltese"
+
+[STR_DESC_MODULE_LANGPACK_MT]
+en-US = "Installs Maltese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CY]
+en-US = "Welsh"
+
+[STR_DESC_MODULE_LANGPACK_CY]
+en-US = "Installs Welsh support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GL]
+en-US = "Galician"
+
+[STR_DESC_MODULE_LANGPACK_GL]
+en-US = "Installs Galician support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SH_YU]
+en-US = "Serbian (Latin)"
+
+[STR_DESC_MODULE_LANGPACK_SH_YU]
+en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SH]
+en-US = "Serbian (Latin)"
+
+[STR_DESC_MODULE_LANGPACK_SH]
+en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GA]
+en-US = "Irish"
+
+[STR_DESC_MODULE_LANGPACK_GA]
+en-US = "Installs Irish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SR_CS]
+en-US = "Serbian (Cyrillic)"
+
+[STR_DESC_MODULE_LANGPACK_SR_CS]
+en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SR]
+en-US = "Serbian (Cyrillic)"
+
+[STR_DESC_MODULE_LANGPACK_SR]
+en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BS]
+en-US = "Bosnian"
+
+[STR_DESC_MODULE_LANGPACK_BS]
+en-US = "Installs Bosnian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AS_IN]
+en-US = "Assamese"
+
+[STR_DESC_MODULE_LANGPACK_AS_IN]
+en-US = "Installs Assamese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RW]
+en-US = "Kinyarwanda"
+
+[STR_DESC_MODULE_LANGPACK_RW]
+en-US = "Installs Kinyarwanda support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SA]
+en-US = "Sanskrit"
+
+[STR_DESC_MODULE_LANGPACK_SA]
+en-US = "Installs Sanskrit support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FA]
+en-US = "Farsi"
+
+[STR_DESC_MODULE_LANGPACK_FA]
+en-US = "Installs Farsi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FO]
+en-US = "Faroese"
+
+[STR_DESC_MODULE_LANGPACK_FO]
+en-US = "Installs Faroese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SB]
+en-US = "Sorbian"
+
+[STR_DESC_MODULE_LANGPACK_SB]
+en-US = "Installs Sorbian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TT]
+en-US = "Tatar"
+
+[STR_DESC_MODULE_LANGPACK_TT]
+en-US = "Installs Tatar support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TS]
+en-US = "Tsonga"
+
+[STR_DESC_MODULE_LANGPACK_TS]
+en-US = "Installs Tsonga support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_YI]
+en-US = "Yiddish"
+
+[STR_DESC_MODULE_LANGPACK_YI]
+en-US = "Installs Yiddish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BR]
+en-US = "Breton"
+
+[STR_DESC_MODULE_LANGPACK_BR]
+en-US = "Installs Breton support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NR]
+en-US = "Ndebele South"
+
+[STR_DESC_MODULE_LANGPACK_NR]
+en-US = "Installs Ndebele South support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SS]
+en-US = "Swazi"
+
+[STR_DESC_MODULE_LANGPACK_SS]
+en-US = "Installs Swazi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_VE]
+en-US = "Venda"
+
+[STR_DESC_MODULE_LANGPACK_VE]
+en-US = "Installs Venda support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KN]
+en-US = "Kannada"
+
+[STR_DESC_MODULE_LANGPACK_KN]
+en-US = "Installs Kannada support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MS]
+en-US = "Malay (Malaysian)"
+
+[STR_DESC_MODULE_LANGPACK_MS]
+en-US = "Installs Malay (Malaysian) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TG]
+en-US = "Tajik"
+
+[STR_DESC_MODULE_LANGPACK_TG]
+en-US = "Installs Tajik support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KU]
+en-US = "Kurdish"
+
+[STR_DESC_MODULE_LANGPACK_KU]
+en-US = "Installs Kurdish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DZ]
+en-US = "Dzongkha"
+
+[STR_DESC_MODULE_LANGPACK_DZ]
+en-US = "Installs Dzongkha support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KA]
+en-US = "Georgian"
+
+[STR_DESC_MODULE_LANGPACK_KA]
+en-US = "Installs Georgian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EO]
+en-US = "Esperanto"
+
+[STR_DESC_MODULE_LANGPACK_EO]
+en-US = "Installs Esperanto support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GU]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_LANGPACK_GU]
+en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EN_ZA]
+en-US = "English (South Africa)"
+
+[STR_DESC_MODULE_LANGPACK_EN_ZA]
+en-US = "Installs English (South Africa) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EN_GB]
+en-US = "English (United Kingdom)"
+
+[STR_DESC_MODULE_LANGPACK_EN_GB]
+en-US = "Installs English (United Kingdom) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UR_IN]
+en-US = "Urdu"
+
+[STR_DESC_MODULE_LANGPACK_UR_IN]
+en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ML_IN]
+en-US = "Malayalam"
+
+[STR_DESC_MODULE_LANGPACK_ML_IN]
+en-US = "Installs Malayalam support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TE_IN]
+en-US = "Telugu"
+
+[STR_DESC_MODULE_LANGPACK_TE_IN]
+en-US = "Installs Telugu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TI_ER]
+en-US = "Tigrinya"
+
+[STR_DESC_MODULE_LANGPACK_TI_ER]
+en-US = "Installs Tigrinya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UZ]
+en-US = "Uzbek"
+
+[STR_DESC_MODULE_LANGPACK_UZ]
+en-US = "Installs Uzbek support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MN]
+en-US = "Mongolian"
+
+[STR_DESC_MODULE_LANGPACK_MN]
+en-US = "Installs Mongolian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KK]
+en-US = "Kazakh"
+
+[STR_DESC_MODULE_LANGPACK_KK]
+en-US = "Installs Kazakh support in %PRODUCTNAME %PRODUCTVERSION"
+
diff --git a/scp2/source/accessories/module_templates_accessories.scp b/scp2/source/accessories/module_templates_accessories.scp
new file mode 100644
index 000000000000..917cf69b93e6
--- /dev/null
+++ b/scp2/source/accessories/module_templates_accessories.scp
@@ -0,0 +1,99 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+#ifdef WITH_EXTRA_TEMPLATE
+
+Module gid_Module_Optional_Accessories_Templates
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_TEMPLATES);
+    ParentID = gid_Module_Optional_Accessories;
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#include "alllangmodules_accessories_templates_root.inc"
+
+Module gid_Module_Optional_Accessories_Tem_Template
+    ParentID = gid_Module_Optional_Accessories_Templates;
+    Name = "gid_Module_Optional_Accessories_Tem_Template";
+    Description = "gid_Module_Optional_Accessories_Tem_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = (
+        gid_File_Extra_Templates_Accessories,
+        gid_File_Extra_Templates_Layout_Accessories,
+        gid_File_Extra_Templates_Present_Accessories,
+        gid_File_Extra_Templates_Educate_Accessories,
+        gid_File_Extra_Templates_Finance_Accessories,
+        gid_File_Extra_Templates_Forms_Accessories,
+        gid_File_Extra_Templates_Labels_Accessories,
+        gid_File_Extra_Templates_Misc_Accessories,
+        gid_File_Extra_Templates_Officorr_Accessories,
+        gid_File_Extra_Templates_Offimisc_Accessories,
+        gid_File_Extra_Templates_Personal_Accessories,
+        gid_File_Extra_Templates_NONFREE_Accessories,
+        gid_File_Extra_Templates_NONFREE_Layout_Accessories,
+        gid_File_Extra_Templates_NONFREE_Present_Accessories,
+        gid_File_Extra_Templates_NONFREE_Educate_Accessories,
+        gid_File_Extra_Templates_NONFREE_Finance_Accessories,
+        gid_File_Extra_Templates_NONFREE_Forms_Accessories,
+        gid_File_Extra_Templates_NONFREE_Labels_Accessories,
+        gid_File_Extra_Templates_NONFREE_Misc_Accessories,
+        gid_File_Extra_Templates_NONFREE_Officorr_Accessories,
+        gid_File_Extra_Templates_NONFREE_Offimisc_Accessories,
+        gid_File_Extra_Templates_NONFREE_Personal_Accessories );
+    Minimal = NO;
+    Default = YES;
+End
+
+Module gid_Module_Optional_Accessories_Tem_Common
+    PackageInfo = "packinfo_accessories.txt";
+    ParentID = gid_Module_Optional_Accessories;
+    Name = "gid_Module_Optional_Accessories_Tem_Common";
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_TEMPLATES_COMMON);
+    Files = (
+        gid_File_Extra_Templates_Common,
+        gid_File_Extra_Templates_Common_Layout,
+        gid_File_Extra_Templates_Common_Present,
+        gid_File_Extra_Templates_Common_Educate,
+        gid_File_Extra_Templates_Common_Finance,
+        gid_File_Extra_Templates_Common_Forms,
+        gid_File_Extra_Templates_Common_Labels,
+        gid_File_Extra_Templates_Common_Misc,
+        gid_File_Extra_Templates_Common_Officorr,
+        gid_File_Extra_Templates_Common_Offimisc,
+        gid_File_Extra_Templates_Common_Personal );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#include "alllangmodules_accessories_templates.inc"
+
+#endif
diff --git a/scp2/source/accessories/module_templates_accessories.ulf b/scp2/source/accessories/module_templates_accessories.ulf
new file mode 100644
index 000000000000..31411cb4743b
--- /dev/null
+++ b/scp2/source/accessories/module_templates_accessories.ulf
@@ -0,0 +1,701 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+
+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_TEMPLATES]
+en-US = "Templates"
+
+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_TEMPLATES]
+en-US = "Create perfect documents within seconds with document templates."
+
+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_TEMPLATES_COMMON]
+en-US = "Common templates"
+
+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_TEMPLATES_COMMON]
+en-US = "Create perfect documents within seconds with document templates. Common templates contain language independent templates."
+
+[STR_NAME_MODULE_LANGPACK_EN_US]
+en-US = "English"
+
+[STR_DESC_MODULE_LANGPACK_EN_US]
+en-US = "Installs English support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DE]
+en-US = "German"
+
+[STR_DESC_MODULE_LANGPACK_DE]
+en-US = "Installs German support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FR]
+en-US = "French"
+
+[STR_DESC_MODULE_LANGPACK_FR]
+en-US = "Installs French support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_IT]
+en-US = "Italian"
+
+[STR_DESC_MODULE_LANGPACK_IT]
+en-US = "Installs Italian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ES]
+en-US = "Spanish"
+
+[STR_DESC_MODULE_LANGPACK_ES]
+en-US = "Installs Spanish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SV]
+en-US = "Swedish"
+
+[STR_DESC_MODULE_LANGPACK_SV]
+en-US = "Installs Swedish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PT]
+en-US = "Portuguese"
+
+[STR_DESC_MODULE_LANGPACK_PT]
+en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PT_BR]
+en-US = "Portuguese (Brazil)"
+
+[STR_DESC_MODULE_LANGPACK_PT_BR]
+en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_JA]
+en-US = "Japanese"
+
+[STR_DESC_MODULE_LANGPACK_JA]
+en-US = "Installs Japanese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KO]
+en-US = "Korean"
+
+[STR_DESC_MODULE_LANGPACK_KO]
+en-US = "Installs Korean support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZH_CN]
+en-US = "Chinese (simplified)"
+
+[STR_DESC_MODULE_LANGPACK_ZH_CN]
+en-US = "Installs Chinese (simplified) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZH_TW]
+en-US = "Chinese (traditional)"
+
+[STR_DESC_MODULE_LANGPACK_ZH_TW]
+en-US = "Installs Chinese (traditional) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NL]
+en-US = "Dutch"
+
+[STR_DESC_MODULE_LANGPACK_NL]
+en-US = "Installs Dutch support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HU]
+en-US = "Hungarian"
+
+[STR_DESC_MODULE_LANGPACK_HU]
+en-US = "Installs Hungarian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PL]
+en-US = "Polish"
+
+[STR_DESC_MODULE_LANGPACK_PL]
+en-US = "Installs Polish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RU]
+en-US = "Russian"
+
+[STR_DESC_MODULE_LANGPACK_RU]
+en-US = "Installs Russian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TR]
+en-US = "Turkish"
+
+[STR_DESC_MODULE_LANGPACK_TR]
+en-US = "Installs Turkish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EL]
+en-US = "Greek"
+
+[STR_DESC_MODULE_LANGPACK_EL]
+en-US = "Installs Greek support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TH]
+en-US = "Thai"
+
+[STR_DESC_MODULE_LANGPACK_TH]
+en-US = "Installs Thai support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CS]
+en-US = "Czech"
+
+[STR_DESC_MODULE_LANGPACK_CS]
+en-US = "Installs Czech support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SK]
+en-US = "Slovak"
+
+[STR_DESC_MODULE_LANGPACK_SK]
+en-US = "Installs Slovak support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HR]
+en-US = "Croatian"
+
+[STR_DESC_MODULE_LANGPACK_HR]
+en-US = "Installs Croatian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ET]
+en-US = "Estonian"
+
+[STR_DESC_MODULE_LANGPACK_ET]
+en-US = "Installs Estonian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_VI]
+en-US = "Vietnamese"
+
+[STR_DESC_MODULE_LANGPACK_VI]
+en-US = "Installs Vietnamese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BG]
+en-US = "Bulgarian"
+
+[STR_DESC_MODULE_LANGPACK_BG]
+en-US = "Installs Bulgarian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KM]
+en-US = "Khmer"
+
+[STR_DESC_MODULE_LANGPACK_KM]
+en-US = "Installs Khmer support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PA_IN]
+en-US = "Punjabi"
+
+[STR_DESC_MODULE_LANGPACK_PA_IN]
+en-US = "Installs Punjabi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GU_IN]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_LANGPACK_GU_IN]
+en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TA]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_LANGPACK_TA]
+en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TA_IN]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_LANGPACK_TA_IN]
+en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HI]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_LANGPACK_HI]
+en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HI_IN]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_LANGPACK_HI_IN]
+en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ST]
+en-US = "Southern Sotho (Sutu)"
+
+[STR_DESC_MODULE_LANGPACK_ST]
+en-US = "Installs Southern Sotho (Sutu) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TN]
+en-US = "Tswana"
+
+[STR_DESC_MODULE_LANGPACK_TN]
+en-US = "Installs Tswana support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_XH]
+en-US = "Xhosa"
+
+[STR_DESC_MODULE_LANGPACK_XH]
+en-US = "Installs Xhosa support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZU]
+en-US = "Zulu"
+
+[STR_DESC_MODULE_LANGPACK_ZU]
+en-US = "Installs Zulu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AF]
+en-US = "Afrikaans"
+
+[STR_DESC_MODULE_LANGPACK_AF]
+en-US = "Installs Afrikaans support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SW]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_LANGPACK_SW]
+en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SW_TZ]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_LANGPACK_SW_TZ]
+en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LO]
+en-US = "Lao"
+
+[STR_DESC_MODULE_LANGPACK_LO]
+en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NS]
+en-US = "Northern Sotho"
+
+[STR_DESC_MODULE_LANGPACK_NS]
+en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN]
+en-US = "Bengali"
+
+[STR_DESC_MODULE_LANGPACK_BN]
+en-US = "Installs Bengali support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN_BD]
+en-US = "Bengali (Bangladesh)"
+
+[STR_DESC_MODULE_LANGPACK_BN_BD]
+en-US = "Installs Bengali (Bangladesh) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN_IN]
+en-US = "Bengali (India)"
+
+[STR_DESC_MODULE_LANGPACK_BN_IN]
+en-US = "Installs Bengali (India) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_OR]
+en-US = "Oriya"
+
+[STR_DESC_MODULE_LANGPACK_OR]
+en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_OR_IN]
+en-US = "Oriya"
+
+[STR_DESC_MODULE_LANGPACK_OR_IN]
+en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MR]
+en-US = "Marathi"
+
+[STR_DESC_MODULE_LANGPACK_MR]
+en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MR_IN]
+en-US = "Marathi"
+
+[STR_DESC_MODULE_LANGPACK_MR_IN]
+en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NE]
+en-US = "Nepali"
+
+[STR_DESC_MODULE_LANGPACK_NE]
+en-US = "Installs Nepali support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AR]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_LANGPACK_AR]
+en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AR_SA]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_LANGPACK_AR_SA]
+en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CA]
+en-US = "Catalan"
+
+[STR_DESC_MODULE_LANGPACK_CA]
+en-US = "Installs Catalan support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DA]
+en-US = "Danish"
+
+[STR_DESC_MODULE_LANGPACK_DA]
+en-US = "Installs Danish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FI]
+en-US = "Finnish"
+
+[STR_DESC_MODULE_LANGPACK_FI]
+en-US = "Installs Finnish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HE]
+en-US = "Hebrew"
+
+[STR_DESC_MODULE_LANGPACK_HE]
+en-US = "Installs Hebrew support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_IS]
+en-US = "Icelandic"
+
+[STR_DESC_MODULE_LANGPACK_IS]
+en-US = "Installs Icelandic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NB]
+en-US = "Norwegian (Bokmal)"
+
+[STR_DESC_MODULE_LANGPACK_NB]
+en-US = "Installs Norwegian (Bokmal) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NN]
+en-US = "Norwegian (Nynorsk)"
+
+[STR_DESC_MODULE_LANGPACK_NN]
+en-US = "Installs Norwegian (Nynorsk) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RM]
+en-US = "Rhaeto-Romance"
+
+[STR_DESC_MODULE_LANGPACK_RM]
+en-US = "Installs Rhaeto-Romance support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RO]
+en-US = "Romanian"
+
+[STR_DESC_MODULE_LANGPACK_RO]
+en-US = "Installs Romanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SQ]
+en-US = "Albanian"
+
+[STR_DESC_MODULE_LANGPACK_SQ]
+en-US = "Installs Albanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UR]
+en-US = "Urdu"
+
+[STR_DESC_MODULE_LANGPACK_UR]
+en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ID]
+en-US = "Indonesian"
+
+[STR_DESC_MODULE_LANGPACK_ID]
+en-US = "Installs Indonesian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UK]
+en-US = "Ukrainian"
+
+[STR_DESC_MODULE_LANGPACK_UK]
+en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BE_BY]
+en-US = "Belarusian"
+
+[STR_DESC_MODULE_LANGPACK_BE_BY]
+en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SL]
+en-US = "Slovenian"
+
+[STR_DESC_MODULE_LANGPACK_SL]
+en-US = "Installs Slovenian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LV]
+en-US = "Latvian"
+
+[STR_DESC_MODULE_LANGPACK_LV]
+en-US = "Installs Latvian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LT]
+en-US = "Lithuanian"
+
+[STR_DESC_MODULE_LANGPACK_LT]
+en-US = "Installs Lithuanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HY]
+en-US = "Armenian"
+
+[STR_DESC_MODULE_LANGPACK_HY]
+en-US = "Installs Armenian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EU]
+en-US = "Basque"
+
+[STR_DESC_MODULE_LANGPACK_EU]
+en-US = "Installs Basque support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MK]
+en-US = "Macedonian"
+
+[STR_DESC_MODULE_LANGPACK_MK]
+en-US = "Installs Macedonian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MT]
+en-US = "Maltese"
+
+[STR_DESC_MODULE_LANGPACK_MT]
+en-US = "Installs Maltese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CY]
+en-US = "Welsh"
+
+[STR_DESC_MODULE_LANGPACK_CY]
+en-US = "Installs Welsh support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GL]
+en-US = "Galician"
+
+[STR_DESC_MODULE_LANGPACK_GL]
+en-US = "Installs Galician support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SH_YU]
+en-US = "Serbian (Latin)"
+
+[STR_DESC_MODULE_LANGPACK_SH_YU]
+en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SH]
+en-US = "Serbian (Latin)"
+
+[STR_DESC_MODULE_LANGPACK_SH]
+en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GA]
+en-US = "Irish"
+
+[STR_DESC_MODULE_LANGPACK_GA]
+en-US = "Installs Irish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SR_CS]
+en-US = "Serbian (Cyrillic)"
+
+[STR_DESC_MODULE_LANGPACK_SR_CS]
+en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SR]
+en-US = "Serbian (Cyrillic)"
+
+[STR_DESC_MODULE_LANGPACK_SR]
+en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BS]
+en-US = "Bosnian"
+
+[STR_DESC_MODULE_LANGPACK_BS]
+en-US = "Installs Bosnian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AS_IN]
+en-US = "Assamese"
+
+[STR_DESC_MODULE_LANGPACK_AS_IN]
+en-US = "Installs Assamese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RW]
+en-US = "Kinyarwanda"
+
+[STR_DESC_MODULE_LANGPACK_RW]
+en-US = "Installs Kinyarwanda support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SA]
+en-US = "Sanskrit"
+
+[STR_DESC_MODULE_LANGPACK_SA]
+en-US = "Installs Sanskrit support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FA]
+en-US = "Farsi"
+
+[STR_DESC_MODULE_LANGPACK_FA]
+en-US = "Installs Farsi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FO]
+en-US = "Faroese"
+
+[STR_DESC_MODULE_LANGPACK_FO]
+en-US = "Installs Faroese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SB]
+en-US = "Sorbian"
+
+[STR_DESC_MODULE_LANGPACK_SB]
+en-US = "Installs Sorbian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TT]
+en-US = "Tatar"
+
+[STR_DESC_MODULE_LANGPACK_TT]
+en-US = "Installs Tatar support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TS]
+en-US = "Tsonga"
+
+[STR_DESC_MODULE_LANGPACK_TS]
+en-US = "Installs Tsonga support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_YI]
+en-US = "Yiddish"
+
+[STR_DESC_MODULE_LANGPACK_YI]
+en-US = "Installs Yiddish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BR]
+en-US = "Breton"
+
+[STR_DESC_MODULE_LANGPACK_BR]
+en-US = "Installs Breton support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NR]
+en-US = "Ndebele South"
+
+[STR_DESC_MODULE_LANGPACK_NR]
+en-US = "Installs Ndebele South support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SS]
+en-US = "Swazi"
+
+[STR_DESC_MODULE_LANGPACK_SS]
+en-US = "Installs Swazi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_VE]
+en-US = "Venda"
+
+[STR_DESC_MODULE_LANGPACK_VE]
+en-US = "Installs Venda support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KN]
+en-US = "Kannada"
+
+[STR_DESC_MODULE_LANGPACK_KN]
+en-US = "Installs Kannada support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MS]
+en-US = "Malay (Malaysian)"
+
+[STR_DESC_MODULE_LANGPACK_MS]
+en-US = "Installs Malay (Malaysian) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TG]
+en-US = "Tajik"
+
+[STR_DESC_MODULE_LANGPACK_TG]
+en-US = "Installs Tajik support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KU]
+en-US = "Kurdish"
+
+[STR_DESC_MODULE_LANGPACK_KU]
+en-US = "Installs Kurdish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DZ]
+en-US = "Dzongkha"
+
+[STR_DESC_MODULE_LANGPACK_DZ]
+en-US = "Installs Dzongkha support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KA]
+en-US = "Georgian"
+
+[STR_DESC_MODULE_LANGPACK_KA]
+en-US = "Installs Georgian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EO]
+en-US = "Esperanto"
+
+[STR_DESC_MODULE_LANGPACK_EO]
+en-US = "Installs Esperanto support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GU]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_LANGPACK_GU]
+en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EN_ZA]
+en-US = "English (South Africa)"
+
+[STR_DESC_MODULE_LANGPACK_EN_ZA]
+en-US = "Installs English (South Africa) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EN_GB]
+en-US = "English (United Kingdom)"
+
+[STR_DESC_MODULE_LANGPACK_EN_GB]
+en-US = "Installs English (United Kingdom) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UR_IN]
+en-US = "Urdu"
+
+[STR_DESC_MODULE_LANGPACK_UR_IN]
+en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ML_IN]
+en-US = "Malayalam"
+
+[STR_DESC_MODULE_LANGPACK_ML_IN]
+en-US = "Installs Malayalam support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TE_IN]
+en-US = "Telugu"
+
+[STR_DESC_MODULE_LANGPACK_TE_IN]
+en-US = "Installs Telugu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TI_ER]
+en-US = "Tigrinya"
+
+[STR_DESC_MODULE_LANGPACK_TI_ER]
+en-US = "Installs Tigrinya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UZ]
+en-US = "Uzbek"
+
+[STR_DESC_MODULE_LANGPACK_UZ]
+en-US = "Installs Uzbek support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MN]
+en-US = "Mongolian"
+
+[STR_DESC_MODULE_LANGPACK_MN]
+en-US = "Installs Mongolian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KK]
+en-US = "Kazakh"
+
+[STR_DESC_MODULE_LANGPACK_KK]
+en-US = "Installs Kazakh support in %PRODUCTNAME %PRODUCTVERSION"
+
diff --git a/scp2/source/binfilter/module_binfilter.scp b/scp2/source/binfilter/module_binfilter.scp
index ca3c94b759e0..4857ecf3804b 100644
--- a/scp2/source/binfilter/module_binfilter.scp
+++ b/scp2/source/binfilter/module_binfilter.scp
@@ -60,7 +60,7 @@ Module gid_Module_Langpack_Binfilter_Template
     ParentID = gid_Module_Optional_Binfilter;
     Name = "gid_Module_Langpack_Binfilter_Template";
     Description = "gid_Module_Langpack_Binfilter_Template";
-    Default = NO;
+    Default = YES;
     Styles = (TEMPLATEMODULE);
     Files = (gid_File_Res_Bf_Sch,
              gid_File_Res_Bf_Svx,
diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp
index 0e072a927912..a9fd5ecd0942 100644
--- a/scp2/source/extensions/directory_extensions.scp
+++ b/scp2/source/extensions/directory_extensions.scp
@@ -249,3 +249,20 @@ End
 
 
 #endif
+
+/* script providers */
+
+Directory gid_Brand_Dir_Share_Extensions_Script_Provider_For_Beanshell
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "script-provider-for-beanshell";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Script_Provider_For_Javascript
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "script-provider-for-javascript";
+End
+
+Directory gid_Brand_Dir_Share_Extensions_Script_Provider_For_Python
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "script-provider-for-python";
+End
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index 79bbce95e615..05445310cf10 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -302,4 +302,27 @@ File gid_File_Optional_Extensions_Sun_Template_Pack
    UnixRights = 444;
 End
 
+/* script providers */
+
+File gid_File_Oxt_Script_Provider_For_Beanshell
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Beanshell;
+    Name = "script-provider-for-beanshell.oxt";
+End
+
+File gid_File_Oxt_Script_Provider_For_Javascript
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Javascript;
+    Name = "script-provider-for-javascript.oxt";
+End
+
+File gid_File_Oxt_Script_Provider_For_Python
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Python;
+    Name = "script-provider-for-python.oxt";
+End
+
 #endif
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
index 6f0af6d3c8d2..7cd525f03a24 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -377,3 +377,42 @@ Module gid_Module_Optional_Extensions_Sun_Template_Pack
 End
 #endif
 #endif
+
+#ifdef WITH_EXTENSION_INTEGRATION
+Module gid_Module_Optional_Extensions_Script_Provider_For_Beanshell
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Script_Provider_For_Beanshell );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+#ifdef WITH_EXTENSION_INTEGRATION
+Module gid_Module_Optional_Extensions_Script_Provider_For_Javascript
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Script_Provider_For_Javascript );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+#ifdef WITH_EXTENSION_INTEGRATION
+Module gid_Module_Optional_Extensions_Script_Provider_For_Python
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_PYTHON);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Script_Provider_For_Python );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
diff --git a/scp2/source/extensions/module_extensions.ulf b/scp2/source/extensions/module_extensions.ulf
index 900065ad6456..3bd36d56a5f7 100644
--- a/scp2/source/extensions/module_extensions.ulf
+++ b/scp2/source/extensions/module_extensions.ulf
@@ -158,3 +158,21 @@ en-US = "Sun Professional Template Pack"
 
 [STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SUN_TEMPLATE_PACK]
 en-US = "Sun Professional Template Pack"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL]
+en-US = "Script provider for BeanShell"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL]
+en-US = "Script provider for BeanShell"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT]
+en-US = "Script provider for JavaScript"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT]
+en-US = "Script provider for JavaScript"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_PYTHON]
+en-US = "Script provider for Python"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_PYTHON]
+en-US = "Script provider for Python"
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 5734a4bac00f..5fe49e6d2498 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -134,18 +134,12 @@ Module gid_Module_Langpack_Brand_Template
              gid_Brand_File_Help_C05_Swriter_Zip,
              gid_Brand_File_License_License,
              gid_Brand_File_License_License_Small,
-             gid_Brand_File_License_License_Html,
-             gid_Brand_File_License_License_Html_Small,
              gid_Brand_File_Readme_Readme,
-             gid_Brand_File_Readme_Readme_Html,
              gid_Brand_File_Share_Registry_Cjk_Xcd,
              gid_Brand_File_Share_Registry_Korea_Xcd,
              gid_Brand_File_Txt_License,
              gid_Brand_File_Txt_License_Small,
-             gid_Brand_File_Txt_License_Html,
-             gid_Brand_File_Txt_License_Html_Small,
-             gid_Brand_File_Txt_Readme,
-             gid_Brand_File_Txt_Readme_Html);
+             gid_Brand_File_Txt_Readme);
 End
 
 // Directories
@@ -1519,3 +1513,14 @@ File gid_License_Odt
     Name = "LICENSE.odt";
     Styles = (PACKED);
 End
+
+File gid_Credits_Odt
+    BIN_FILE_BODY;
+#if defined MACOSX
+    Dir = gid_Brand_Dir_BasisLink;
+#else
+    Dir = gid_Dir_Brand_Root;
+#endif
+    Name = "CREDITS.odt";
+    Styles = (PACKED);
+End
diff --git a/scp2/source/ooo/common_brand_readme.scp b/scp2/source/ooo/common_brand_readme.scp
index dea9145a000e..bd77922392ce 100644
--- a/scp2/source/ooo/common_brand_readme.scp
+++ b/scp2/source/ooo/common_brand_readme.scp
@@ -41,18 +41,6 @@ File gid_Brand_File_Txt_License
     Styles = (PACKED, SCPZIP_REPLACE);
 End
 
-File gid_Brand_File_Txt_License_Html
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Readme;
-  #ifdef UNX
-    README_TXT_ALL_LANG(Name, LICENSE, html);
-  #endif
-  #ifdef WNT
-    README_TXT_ALL_LANG(Name, license, html);
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
 File gid_Brand_File_License_License
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_License;
@@ -65,18 +53,6 @@ File gid_Brand_File_License_License
     Styles = (PACKED, SCPZIP_REPLACE);
 End
 
-File gid_Brand_File_License_License_Html
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_License;
-  #ifdef UNX
-    README_TXT_ALL_LANG(Name, LICENSE, html);
-  #endif
-  #ifdef WNT
-    README_TXT_ALL_LANG(Name, license, html);
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
 File gid_Brand_File_Txt_Readme
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Share_Readme;
@@ -89,18 +65,6 @@ File gid_Brand_File_Txt_Readme
     Styles = (PACKED, SCPZIP_REPLACE);
 End
 
-File gid_Brand_File_Txt_Readme_Html
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Readme;
-  #ifdef UNX
-    README_TXT_ALL_LANG(Name, README, html);
-  #endif
-  #ifdef WNT
-    README_TXT_ALL_LANG(Name, readme, html);
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
 File gid_Brand_File_Readme_Readme
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Readme;
@@ -112,15 +76,3 @@ File gid_Brand_File_Readme_Readme
   #endif
     Styles = (PACKED, SCPZIP_REPLACE);
 End
-
-File gid_Brand_File_Readme_Readme_Html
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Readme;
-  #ifdef UNX
-    README_TXT_ALL_LANG(Name, README, html);
-  #endif
-  #ifdef WNT
-    README_TXT_ALL_LANG(Name, readme, html);
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index a0c3f8005bec..9668742113f5 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -1005,6 +1005,11 @@ Directory gid_Dir_Template_Forms
     DIR_IDENT_ALL_LANG(forms);
 End
 
+Directory gid_Dir_Template_Labels
+    ParentID = gid_Dir_Template_Language;
+    DIR_IDENT_ALL_LANG(labels);
+End
+
 Directory gid_Dir_Template_Layout
     ParentID = gid_Dir_Template_Language;
     DIR_IDENT_ALL_LANG(layout);
@@ -1339,3 +1344,182 @@ Directory gid_Dir_Share_Icons
 End
 
 #endif
+
+/* *** Accessories Extras *** */
+
+/* ** Gallery ** */
+
+/* Draws */
+Directory gid_Dir_Gallery_Draws
+    ParentID = gid_Dir_Gallery;
+    DosName = "Draws";
+End
+
+/* Draws - People */
+Directory gid_Dir_Gallery_Draws_People
+    ParentID = gid_Dir_Gallery_Draws;
+    DosName = "People";
+End
+
+/* Photos */
+Directory gid_Dir_Gallery_Photos
+    ParentID = gid_Dir_Gallery;
+    DosName = "Photos";
+End
+
+/* Photos - Cities */
+Directory gid_Dir_Gallery_Photos_Cities
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Cities";
+End
+
+/* Photos - Buildings */
+Directory gid_Dir_Gallery_Photos_Buildings
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Buildings";
+End
+
+/* Photos - Plants */
+Directory gid_Dir_Gallery_Photos_Plants
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Plants";
+End
+
+/* Photos - Fauna */
+Directory gid_Dir_Gallery_Photos_Fauna
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Fauna";
+End
+
+/* Photos - Flowers */
+Directory gid_Dir_Gallery_Photos_Flowers
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Flowers";
+End
+
+/* Photos - Landscapes */
+Directory gid_Dir_Gallery_Photos_Landscapes
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Landscapes";
+End
+
+/* Photos - Statues */
+Directory gid_Dir_Gallery_Photos_Statues
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Statues";
+End
+
+/* Photos - Space */
+Directory gid_Dir_Gallery_Photos_Space
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Space";
+End
+
+/* Photos - Travel */
+Directory gid_Dir_Gallery_Photos_Travel
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Travel";
+End
+
+/* Photos - Objects */
+Directory gid_Dir_Gallery_Photos_Objects
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Objects";
+End
+
+/* Photos - Humans */
+Directory gid_Dir_Gallery_Photos_Humans
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Humans";
+End
+
+/* Photos - FoodsandDrinks */
+Directory gid_Dir_Gallery_Photos_FoodsandDrinks
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "FoodsandDrinks";
+End
+
+/* Photos - Celebration */
+Directory gid_Dir_Gallery_Photos_Celebration
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Celebration";
+End
+
+/* Samples - Documentations */
+Directory gid_Dir_Samples_Documentations
+    ParentID = gid_Dir_Samples_Language;
+    DosName = "Documentations";
+End
+
+/* Samples - Advertisement */
+Directory gid_Dir_Samples_Advertisement
+    ParentID = gid_Dir_Samples_Language;
+    DosName = "Advertisement";
+End
+
+/* Elements */
+Directory gid_Dir_Gallery_Elements
+    ParentID = gid_Dir_Gallery;
+    DosName = "Elements";
+End
+
+/* Elements - Bullets 2 */
+Directory gid_Dir_Gallery_Elements_Bullets2
+    ParentID = gid_Dir_Gallery_Elements;
+    DosName = "Bullets2";
+End
+
+ /* Templates - Common */
+Directory gid_Dir_Template_Common
+    ParentID = gid_Dir_Template;
+    DosName = "common";
+End
+
+Directory gid_Dir_Template_Common_Educate
+    ParentID = gid_Dir_Template_Common;
+    DosName = "educate";
+End
+
+Directory gid_Dir_Template_Common_Finance
+    ParentID = gid_Dir_Template_Common;
+    DosName = "finance";
+End
+
+Directory gid_Dir_Template_Common_Forms
+    ParentID = gid_Dir_Template_Common;
+    DosName = "forms";
+End
+
+Directory gid_Dir_Template_Common_Labels
+    ParentID = gid_Dir_Template_Common;
+    DosName = "labels";
+End
+
+Directory gid_Dir_Template_Common_Layout
+    ParentID = gid_Dir_Template_Common;
+    DosName = "layout";
+End
+
+Directory gid_Dir_Template_Common_Misc
+    ParentID = gid_Dir_Template_Common;
+    DosName = "misc";
+End
+
+Directory gid_Dir_Template_Common_Officorr
+    ParentID = gid_Dir_Template_Common;
+    DosName = "officorr";
+End
+
+Directory gid_Dir_Template_Common_Offimisc
+    ParentID = gid_Dir_Template_Common;
+    DosName = "offimisc";
+End
+
+Directory gid_Dir_Template_Common_Personal
+    ParentID = gid_Dir_Template_Common;
+    DosName = "personal";
+End
+
+Directory gid_Dir_Template_Common_Presnt
+    ParentID = gid_Dir_Template_Common;
+    DosName = "presnt";
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index d052261a6451..0ab9fa24c590 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -345,7 +345,7 @@ End
 
 STD_FILTER_FILE( gid_File_Filter_Eme, eme)
 
-STD_FILTER_FILE( gid_File_Filter_Sdfilt, sdfilt)
+STD_UNO_LIB_FILE_PATCH( gid_File_Filter_Sdfilt, sdfilt)
 
 STD_FILTER_FILE( gid_File_Filter_Icg, icg)
 
@@ -453,10 +453,6 @@ UNO_JAR_FILE( gid_File_Jar_Lucenehelpwrapper, LuceneHelpWrapper )
 #endif
 
 #ifdef SOLAR_JAVA
-STD_JAR_FILE( gid_File_Jar_Js, js )
-#endif
-
-#ifdef SOLAR_JAVA
 
 #ifndef MACOSX
 
@@ -501,9 +497,7 @@ End
 
 #ifdef SOLAR_JAVA
 UNO_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework )
-UNO_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell )
 UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava )
-UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScript )
 #endif
 
 #ifdef SOLAR_JAVA
@@ -1877,13 +1871,6 @@ File gid_File_ImagesTango_Zip
     Styles = (PACKED);
 End
 
-File gid_File_ImagesClassic8_Zip
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Config;
-    Name = "images_classic.zip";
-    Styles = (PACKED);
-End
-
 File gid_File_Share_Registry_Lingucomponent_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 5ffe87abe49f..7a14c628e8d3 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -91,7 +91,6 @@ Module gid_Module_Root_Files_3
 	gid_File_Jar_Hsqldb,
 	gid_File_Jar_Hsqldb_Sdbc,
 	gid_File_Jar_Accessbridge,
-	gid_File_Jar_Js,
 	gid_File_Jar_Officebean,
 	gid_File_Jar_Report,
 	gid_File_Jar_Table,
@@ -104,9 +103,7 @@ Module gid_Module_Root_Files_3
 	gid_File_Jar_Commonwizards,
 	gid_File_Jar_Sandbox,
 	gid_File_Jar_Scriptframework,
-	gid_File_Jar_Scriptproviderforbeanshell,
 	gid_File_Jar_Scriptproviderforjava,
-	gid_File_Jar_Scriptproviderforjavascript,
 	gid_File_Jar_Xml_Apis,
 	gid_File_Jar_Bsh,
 	gid_File_Jar_Classes,
@@ -716,8 +713,7 @@ Module gid_Module_Root_Files_Images
              gid_File_ImagesCrystal_Zip,
              gid_File_ImagesOxygen_Zip,
              gid_File_ImagesHicontrast_Zip,
-             gid_File_ImagesTango_Zip,
-             gid_File_ImagesClassic8_Zip);
+             gid_File_ImagesTango_Zip);
 End
 
 #ifndef WITHOUT_FONTS
diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf
index 3127cdd8b904..d81aa81f7fa6 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -690,3 +690,33 @@ en-US = "Burmese"
 
 [STR_DESC_MODULE_LANGPACK_MY]
 en-US = "Installs Burmese (Myanmar) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BO]
+en-US = "Tibetan"
+
+[STR_DESC_MODULE_LANGPACK_BO]
+en-US = "Installs Tibetan support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_OC]
+en-US = "Occitan"
+
+[STR_DESC_MODULE_LANGPACK_OC]
+en-US = "Installs Occitan support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_OM]
+en-US = "Oromo"
+
+[STR_DESC_MODULE_LANGPACK_OM]
+en-US = "Installs Oromo support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SI]
+en-US = "Sinhala"
+
+[STR_DESC_MODULE_LANGPACK_SI]
+en-US = "Installs Sinhala support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UG]
+en-US = "Uyghur"
+
+[STR_DESC_MODULE_LANGPACK_UG]
+en-US = "Installs Uyghur support in %PRODUCTNAME %PRODUCTVERSION"
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp
index d6f294f1da08..de546e8d47ce 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -27,22 +27,6 @@
 
 #include "macros.inc"
 
-ScpAction scp_Copy_License_Html
-  #ifdef UNX
-    README_TXT_ALL_LANG(Copy, LICENSE, html);
-    README_TXT_ALL_LANG(Name, LICENSE, html);
-  #else
-    README_TXT_ALL_LANG(Copy, license, html);
-    README_TXT_ALL_LANG(Name, license, html);
-  #endif
-    Styles = (SCPZIP_REPLACE);
-  #ifndef MACOSX
-    Subdir = "licenses";
-  #else
-    Subdir = "LICENSEs";
-  #endif
-End
-
 ScpAction scp_Copy_License_Txt
   #ifdef UNX
     README_ALL_LANG(Copy, LICENSE);
@@ -67,22 +51,6 @@ ScpAction scp_Copy_Thirdpartylicense_Readme_Html
 End
 #endif
 
-ScpAction scp_Copy_Readme_Html
-  #ifdef UNX
-    README_TXT_ALL_LANG(Copy, README, html);
-    README_TXT_ALL_LANG(Name, README, html);
-  #else
-    README_TXT_ALL_LANG(Copy, readme, html);
-    README_TXT_ALL_LANG(Name, readme, html);
-  #endif
-    Styles = (SCPZIP_REPLACE);
-  #ifndef MACOSX
-    Subdir = "readmes";
-  #else
-    Subdir = "READMEs";
-  #endif
-End
-
 ScpAction scp_Copy_Readme_Txt
   #ifdef UNX
     README_ALL_LANG(Copy, README);
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index e58687658ac7..1228900121b7 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -104,18 +104,6 @@ End
 #endif
 #endif
 
-// Scripting Framework Python script proxy
-
-#ifndef AIX
-File gid_File_Py_Pythonscript
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = "pythonscript.py";
-    RegistryID = gid_Starregistry_Services_Rdb;
-    Styles = (PACKED,UNO_COMPONENT);
-End
-#endif
- 
 //Scripting Framework Python example scripts
 
 File gid_File_Scripts_Python
@@ -142,6 +130,14 @@ File gid_File_Lib_Python_So
     Name = STRING(PY_FULL_DLL_NAME);
     Styles = (PACKED);
 End
+#ifdef UNX
+Shortcut gid_Shortcut_Lib_Python_So
+    FileID = gid_File_Lib_Python_So;
+    Dir = gid_Dir_Program;
+    Name = STRING(CONCAT3(libpython,PYMAJMIN,UNXSUFFIX));
+    Styles = (NETWORK,RELATIVE);
+End
+#endif //UNX
 #else //MACOSX
 //directory entries solely to be able to create the symlinks
 Directory gid_Dir_PythonFramework
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
index 3abeec2e3142..3b017720dc4a 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -32,7 +32,7 @@ Module gid_Module_Optional_Pyuno
     MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON );
     ParentID = gid_Module_Optional;
     Sortkey = "750";
-    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So, gid_File_Lib_Python_So_Brand, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
+    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So,gid_Shortcut_Lib_Python_So,gid_File_Lib_Python_So_Brand,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
     Minimal = NO;
     Default = YES;
     Styles = ( );
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index 0f79720972e0..2c7aa6e069e4 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -95,13 +95,6 @@ End
 
 
 #if defined MACOSX
-ScpAction scp_Copy_License_Html_Sdk
-    README_TXT_ALL_LANG(Copy, LICENSE, html);
-    README_TXT_ALL_LANG(Name, LICENSE, html);
-    Styles = (SCPZIP_REPLACE);
-    Subdir = "LICENSEs";
-End
-
 ScpAction scp_Copy_License_Txt_Sdk
     README_ALL_LANG(Copy, LICENSE);
     README_ALL_LANG(Name, LICENSE);
@@ -110,7 +103,6 @@ ScpAction scp_Copy_License_Txt_Sdk
 End
 #endif
 
-
 Directory gid_Dir_Share_Sdk
     ParentID = gid_Dir_Basis_Sdk;
     DosName = "share";
@@ -141,18 +133,6 @@ File gid_File_Txt_License
     Styles = (PACKED, SCPZIP_REPLACE);
 End
 
-File gid_File_Txt_License_Html
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Readme_Sdk;
-  #ifdef UNX
-    Name = "LICENSE_en-US.html";
-  #endif
-  #ifdef WNT
-    Name = "license_en-US.html";
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
 File gid_File_Txt_Readme
     TXT_FILE_BODY;
     Dir = gid_Dir_Share_Readme_Sdk;
@@ -165,19 +145,6 @@ File gid_File_Txt_Readme
     Styles = (PACKED, SCPZIP_REPLACE);
 End
 
-File gid_File_Txt_Readme_Html
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Readme_Sdk;
-  #ifdef UNX
-    Name = "README_en-US.html";
-  #endif
-  #ifdef WNT
-    Name = "readme_en-US.html";
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
-
 File gid_File_Zip_Odkexamples
     TXT_FILE_BODY;
     Dir = gid_Dir_Basis_Sdk;
diff --git a/scp2/source/templates/module_langpack_binfilter.sct b/scp2/source/templates/module_langpack_binfilter.sct
index 72c209228849..ffcabf0cf587 100644
--- a/scp2/source/templates/module_langpack_binfilter.sct
+++ b/scp2/source/templates/module_langpack_binfilter.sct
@@ -28,7 +28,7 @@
 Module gid_Module_Langpack_Binfilter_<LANGUAGE_>
     ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
     Sortkey = "900";
-    Default = NO;
+    Default = YES;
     Language = "<LANGUAGE>";
     Assigns = gid_Module_Langpack_Binfilter_Template;
     Name = "gid_Module_Langpack_Binfilter_<LANGUAGE_>";
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index c777b9381341..740065c3b3f4 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -86,6 +86,28 @@ SCP1FILES  = installation_ooo.par          \
              module_python_mailmerge.par   \
              file_python.par               \
              profileitem_python.par        \
+             module_accessories.par
+.IF "$(WITH_EXTRA_GALLERY)" != ""
+SCP1FILES +=                               \
+             module_gallery_accessories.par   \
+             file_gallery_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_SAMPLE)" != ""
+SCP1FILES +=                               \
+             module_samples_accessories.par   \
+             file_samples_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_TEMPLATE)" != ""
+SCP1FILES +=                               \
+             module_templates_accessories.par \
+             file_templates_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_FONT)" != ""
+SCP1FILES +=                               \
+             module_font_accessories.par      \
+             file_font_accessories.par
+.ENDIF
+SCP1FILES +=                               \
              ure_into_ooo.par              \
              ure.par                       \
              module_improvement.par        \
@@ -96,7 +118,7 @@ SCP1FILES  = installation_ooo.par          \
 
 .IF "$(OS)"=="MACOSX" 
 SCP1FILES +=                               \
-             directory_ooo_macosx.par      
+             directory_ooo_macosx.par
 .ENDIF
  
 .IF "$(WITH_BINFILTER)" != "NO"
@@ -249,6 +271,28 @@ SCP2FILES  = installation_ooo.par          \
              module_python_mailmerge.par   \
              file_python.par               \
              profileitem_python.par        \
+             module_accessories.par
+.IF "$(WITH_EXTRA_GALLERY)" != ""
+SCP2FILES +=                               \
+             module_gallery_accessories.par   \
+             file_gallery_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_SAMPLE)" != ""
+SCP2FILES +=                               \
+             module_samples_accessories.par   \
+             file_samples_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_TEMPLATE)" != ""
+SCP2FILES +=                               \
+             module_templates_accessories.par \
+             file_templates_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_FONT)" != ""
+SCP2FILES +=                               \
+             module_font_accessories.par      \
+             file_font_accessories.par
+.ENDIF
+SCP2FILES +=                           \
              ure_into_ooo.par              \
              ure.par                       \
              module_improvement.par        \
diff --git a/scripting/prj/build.lst b/scripting/prj/build.lst
index 7d5162173eae..cdb51acd0c27 100755
--- a/scripting/prj/build.lst
+++ b/scripting/prj/build.lst
@@ -1,4 +1,4 @@
-tc	scripting	:	oovbaapi vbahelper bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper NULL
+tc	scripting	:	filter oovbaapi vbahelper bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper NULL
 tc	scripting									usr1	-	all	tc1_mkout NULL
 tc	scripting\inc								nmake	-	all	tc1_inc NULL
 tc	scripting\source\provider				nmake	-	all	tc1_scriptingprovider tc1_inc NULL
@@ -12,3 +12,5 @@ tc	scripting\java						nmake	-	all	tc1_scriptingjava tc1_scriptingprovider tc1_s
 tc	scripting\examples\java				nmake	-	all	tc1_scriptingexamplesjava tc1_scriptingjava  NULL
 tc	scripting\examples				nmake	-	all	tc1_scriptingexamples tc1_scriptingexamplesjava  tc1_inc NULL
 tc	scripting\util						nmake	-	all	tc1_scriptingutil tc1_scriptingprovider tc1_scriptingprotocolhandler tc1_scriptingbasprov tc1_scriptingstringresource tc1_scriptingvbaevents tc1_scriptingpyprov tc1_scriptingjava tc1_scriptingexamplesjava tc1_scriptingexamples NULL
+tc  scripting\util\provider\javascript  nmake   -   all tc1_scriptingjsprov tc1_scriptingjava NULL
+tc  scripting\util\provider\beanshell   nmake   -   all tc1_scriptingbshprov tc1_scriptingjava NULL
diff --git a/scripting/prj/d.lst b/scripting/prj/d.lst
index ef216fe84f8a..30d5e1c3452f 100644
--- a/scripting/prj/d.lst
+++ b/scripting/prj/d.lst
@@ -15,3 +15,6 @@ mkdir: %_DEST%\bin%_EXT%\pyuno
 ..\source\storage\storage.xml %_DEST%\xml%_EXT%\storage.xml
 
 ..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib
+
+# Extensions
+..\%__SRC%\bin\*.oxt %_DEST%\bin%_EXT%\*.oxt
diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx
index f87ee1759dd2..b41f5c2988ce 100644
--- a/scripting/source/basprov/basmethnode.cxx
+++ b/scripting/source/basprov/basmethnode.cxx
@@ -87,17 +87,17 @@ namespace basprov
                 StarBASIC* pBasic = static_cast< StarBASIC* >( pModule->GetParent() );
                 if ( pBasic )
                 {
-                    m_sURI = ::rtl::OUString::createFromAscii( "vnd.sun.star.script:" );
+                    m_sURI = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.script:"));
                     m_sURI += pBasic->GetName();
-                    m_sURI += ::rtl::OUString::createFromAscii( "." );
+                    m_sURI += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("."));
                     m_sURI += pModule->GetName();
-                    m_sURI += ::rtl::OUString::createFromAscii( "." );
+                    m_sURI += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("."));
                     m_sURI += m_pMethod->GetName();
-                    m_sURI += ::rtl::OUString::createFromAscii( "?language=Basic&location=" );
+                    m_sURI += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("?language=Basic&location="));
                     if ( m_bIsAppScript )
-                        m_sURI += ::rtl::OUString::createFromAscii( "application" );
+                        m_sURI += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("application"));
                     else
-                        m_sURI += ::rtl::OUString::createFromAscii( "document" );
+                        m_sURI += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("document"));
                 }
             }
         }
@@ -236,7 +236,7 @@ namespace basprov
                         for ( sal_Int32 i = 0; i < nProps; ++i )
                         {
                             // TODO: according to MBA the property 'Title' may change in future
-                            if ( pProps[i].Name == ::rtl::OUString::createFromAscii( "Title" ) )
+                            if ( pProps[i].Name == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) )
                             {
                                 pProps[i].Value >>= sDocURL;
                                 break;
@@ -280,17 +280,17 @@ namespace basprov
                             if ( xHelper.is() )
                             {
                                 Sequence < PropertyValue > aArgs(7);
-                                aArgs[0].Name = ::rtl::OUString::createFromAscii( "Document" );
+                                aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Document"));
                                 aArgs[0].Value <<= sDocURL;
-                                aArgs[1].Name = ::rtl::OUString::createFromAscii( "LibName" );
+                                aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LibName"));
                                 aArgs[1].Value <<= sLibName;
-                                aArgs[2].Name = ::rtl::OUString::createFromAscii( "Name" );
+                                aArgs[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"));
                                 aArgs[2].Value <<= sModName;
-                                aArgs[3].Name = ::rtl::OUString::createFromAscii( "Type" );
-                                aArgs[3].Value <<= ::rtl::OUString::createFromAscii( "Module" );
-                                aArgs[4].Name = ::rtl::OUString::createFromAscii( "Line" );
+                                aArgs[3].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Type"));
+                                aArgs[3].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Module"));
+                                aArgs[4].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Line"));
                                 aArgs[4].Value <<= static_cast< sal_uInt32 >( nLine1 );
-                                xHelper->executeDispatch( xProv, ::rtl::OUString::createFromAscii( ".uno:BasicIDEAppear" ), ::rtl::OUString(), 0, aArgs );
+                                xHelper->executeDispatch( xProv, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:BasicIDEAppear")), ::rtl::OUString(), 0, aArgs );
                             }
                         }
                     }
diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx
index 5cb4e1425f7b..e64166533f9f 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -150,8 +150,8 @@ namespace basprov
                 Reference< lang::XMultiComponentFactory > xSMgr( m_xContext->getServiceManager() );
                 if ( xSMgr.is() )
                 {
-                    xUriFac.set( xSMgr->createInstanceWithContext( ::rtl::OUString::createFromAscii(
-                        "com.sun.star.uri.UriReferenceFactory" ), m_xContext ), UNO_QUERY );
+                    xUriFac.set( xSMgr->createInstanceWithContext( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.uri.UriReferenceFactory" )), m_xContext ), UNO_QUERY );
                 }
 
                 if ( xUriFac.is() )
@@ -175,7 +175,7 @@ namespace basprov
                                 aDecodedURL = ::rtl::Uri::decode( aDecodedURL, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 );
                                 Reference<util::XMacroExpander> xMacroExpander(
                                     m_xContext->getValueByName(
-                                    ::rtl::OUString::createFromAscii( "/singletons/com.sun.star.util.theMacroExpander" ) ),
+                                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.util.theMacroExpander")) ),
                                     UNO_QUERY );
                                 if ( xMacroExpander.is() )
                                     aFileURL = xMacroExpander->expandMacros( aDecodedURL );
@@ -338,8 +338,8 @@ namespace basprov
         Reference< provider::XScript > xScript;
         Reference< lang::XMultiComponentFactory > xMcFac ( m_xContext->getServiceManager() );
         Reference< uri::XUriReferenceFactory > xFac (
-            xMcFac->createInstanceWithContext( rtl::OUString::createFromAscii(
-            "com.sun.star.uri.UriReferenceFactory"), m_xContext ) , UNO_QUERY );
+            xMcFac->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.uri.UriReferenceFactory")), m_xContext ) , UNO_QUERY );
 
         if ( !xFac.is() )
         {
@@ -356,7 +356,7 @@ namespace basprov
 
         if ( !uriRef.is() || !sfUri.is() )
         {
-            ::rtl::OUString errorMsg = ::rtl::OUString::createFromAscii( "BasicProviderImpl::getScript: failed to parse URI: " );
+            ::rtl::OUString errorMsg(RTL_CONSTASCII_USTRINGPARAM("BasicProviderImpl::getScript: failed to parse URI: "));
             errorMsg = errorMsg.concat( scriptURI );
             throw provider::ScriptFrameworkErrorException(
                 errorMsg, Reference< XInterface >(),
@@ -367,18 +367,18 @@ namespace basprov
 
         ::rtl::OUString aDescription = sfUri->getName();
         ::rtl::OUString aLocation = sfUri->getParameter(
-            ::rtl::OUString::createFromAscii( "location" ) );
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("location")) );
 
         sal_Int32 nIndex = 0;
         // In some strange circumstances the Library name can have an
         // apparantly illegal '.' in it ( in imported VBA )
 
         BasicManager* pBasicMgr =  NULL;
-        if ( aLocation.equals( ::rtl::OUString::createFromAscii("document") ) )
+        if ( aLocation.equals( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("document")) ) )
         {
             pBasicMgr = m_pDocBasicManager;
         }
-        else if ( aLocation.equals( ::rtl::OUString::createFromAscii("application") ) )
+        else if ( aLocation.equals( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("application")) ) )
         {
             pBasicMgr = m_pAppBasicManager;
         }
@@ -469,7 +469,7 @@ namespace basprov
 
         SolarMutexGuard aGuard;
 
-        return ::rtl::OUString::createFromAscii( "Basic" );
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Basic"));
     }
 
     // -----------------------------------------------------------------------------
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx
index 836d723a14c1..02eb6495b464 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -38,6 +38,7 @@
 #include <tools/diagnose_ex.h>
 
 #include <com/sun/star/awt/XControl.hpp>
+#include <com/sun/star/awt/XControlContainer.hpp>
 #include <com/sun/star/awt/XDialogEventHandler.hpp>
 #include <com/sun/star/awt/XContainerWindowEventHandler.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -144,7 +145,7 @@ namespace dlgprov
 
     void DialogVBAScriptListenerImpl::firing_impl( const script::ScriptEvent& aScriptEvent, uno::Any* )
     {
-        if ( aScriptEvent.ScriptType.equals( rtl::OUString::createFromAscii("VBAInterop") ) && mxListener.is() )
+        if ( aScriptEvent.ScriptType.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VBAInterop")) ) && mxListener.is() )
         {
             ScriptEvent aScriptEventCopy( aScriptEvent );
             aScriptEventCopy.ScriptCode = msDialogLibName.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "." ) ) ).concat( msDialogCodeName );
@@ -171,12 +172,12 @@ namespace dlgprov
         // key listeners by protocol when ScriptType = 'Script'
         // otherwise key is the ScriptType e.g. StarBasic
         if ( rxRTLListener.is() ) // set up handler for RTL_BASIC
-            listernersForTypes[ rtl::OUString::createFromAscii("StarBasic") ] = rxRTLListener;
+            listernersForTypes[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StarBasic")) ] = rxRTLListener;
         else
-            listernersForTypes[ rtl::OUString::createFromAscii("StarBasic") ] = new DialogLegacyScriptListenerImpl( rxContext, rxModel );
-        // handler for Script & ::rtl::OUString::createFromAscii( "vnd.sun.star.UNO:" )
-        listernersForTypes[ rtl::OUString::createFromAscii("vnd.sun.star.UNO") ] = new DialogUnoScriptListenerImpl( rxContext, rxModel, rxControl, rxHandler, rxIntrospect, bProviderMode );
-        listernersForTypes[ rtl::OUString::createFromAscii("vnd.sun.star.script") ] = new DialogSFScriptListenerImpl( rxContext, rxModel );
+            listernersForTypes[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StarBasic")) ] = new DialogLegacyScriptListenerImpl( rxContext, rxModel );
+        // handler for Script & ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.UNO:"))
+        listernersForTypes[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.UNO")) ] = new DialogUnoScriptListenerImpl( rxContext, rxModel, rxControl, rxHandler, rxIntrospect, bProviderMode );
+        listernersForTypes[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.script")) ] = new DialogSFScriptListenerImpl( rxContext, rxModel );
         // Note: in a future cws ( npower13_ObjectModule ) it will be possible
         // to determine the vba mode from the basiclibrary container, the tunnel hack
         // below can then be replaced
@@ -192,7 +193,7 @@ namespace dlgprov
             }
         }
         if ( mbUseFakeVBAEvents )
-            listernersForTypes[ rtl::OUString::createFromAscii("VBAInterop") ] = new DialogVBAScriptListenerImpl( rxContext, rxControl, rxModel, sDialogLibName );
+            listernersForTypes[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VBAInterop")) ] = new DialogVBAScriptListenerImpl( rxContext, rxControl, rxModel, sDialogLibName );
     }
 
     // -----------------------------------------------------------------------------
@@ -232,6 +233,9 @@ namespace dlgprov
             Reference< container::XNameContainer > xEventCont = xEventsSupplier->getEvents();
 
             Reference< XControlModel > xControlModel = xControl->getModel();
+            Reference< XPropertySet > xProps( xControlModel, uno::UNO_QUERY );
+            rtl::OUString sName;
+            xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")) ) >>= sName;
             if ( xEventCont.is() )
             {
                 Sequence< ::rtl::OUString > aNames = xEventCont->getElementNames();
@@ -245,7 +249,7 @@ namespace dlgprov
                     Any aElement = xEventCont->getByName( pNames[ j ] );
                     aElement >>= aDesc;
                     rtl::OUString sKey = aDesc.ScriptType;
-                    if ( aDesc.ScriptType.equals( rtl::OUString::createFromAscii("Script" ) ) || aDesc.ScriptType.equals( rtl::OUString::createFromAscii("UNO" ) ) )
+                    if ( aDesc.ScriptType.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Script")) ) || aDesc.ScriptType.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNO")) ) )
                     {
                         sal_Int32 nIndex = aDesc.ScriptCode.indexOf( ':' );
                         sKey = aDesc.ScriptCode.copy( 0, nIndex );
@@ -288,6 +292,51 @@ namespace dlgprov
         }
     }
 
+
+    void DialogEventsAttacherImpl::nestedAttachEvents( const Sequence< Reference< XInterface > >& Objects, const Any& Helper, rtl::OUString& sDialogCodeName )
+    {
+        const Reference< XInterface >* pObjects = Objects.getConstArray();
+        sal_Int32 nObjCount = Objects.getLength();
+
+        for ( sal_Int32 i = 0; i < nObjCount; ++i )
+        {
+            // We know that we have to do with instances of XControl.
+            // Otherwise this is not the right implementation for
+            // XScriptEventsAttacher and we have to give up.
+            Reference< XControl > xControl( pObjects[ i ], UNO_QUERY );
+            Reference< XControlContainer > xControlContainer( xControl, UNO_QUERY );
+            Reference< XDialog > xDialog( xControl, UNO_QUERY );
+            if ( !xControl.is() )
+                throw IllegalArgumentException();
+
+            // get XEventsSupplier from control model
+            Reference< XControlModel > xControlModel = xControl->getModel();
+            Reference< XScriptEventsSupplier > xEventsSupplier( xControlModel, UNO_QUERY );
+            attachEventsToControl( xControl, xEventsSupplier, Helper );
+            if ( mbUseFakeVBAEvents )
+            {
+                xEventsSupplier.set( getFakeVbaEventsSupplier( xControl, sDialogCodeName ) );
+                Any newHelper(xControl );
+                attachEventsToControl( xControl, xEventsSupplier, newHelper );
+            }
+            if ( xControlContainer.is() && !xDialog.is() )
+            {
+                Sequence< Reference< XControl > > aControls = xControlContainer->getControls();
+                sal_Int32 nControlCount = aControls.getLength();
+
+                Sequence< Reference< XInterface > > aObjects( nControlCount );
+                Reference< XInterface >* pObjectsModify = aObjects.getArray();
+                const Reference< XControl >* pControls = aControls.getConstArray();
+
+                for ( sal_Int32 j = 0; j < nControlCount; ++j )
+                {
+                    pObjectsModify[j] = Reference< XInterface >( pControls[j], UNO_QUERY );
+                }
+                nestedAttachEvents( aObjects, Helper, sDialogCodeName );
+            }
+        }
+    }
+
     // -----------------------------------------------------------------------------
     // XScriptEventsAttacher
     // -----------------------------------------------------------------------------
@@ -320,12 +369,9 @@ namespace dlgprov
 
             }
         }
-
-        // go over all objects
-        const Reference< XInterface >* pObjects = Objects.getConstArray();
+        rtl::OUString sDialogCodeName;
         sal_Int32 nObjCount = Objects.getLength();
         Reference< awt::XControl > xDlgControl( Objects[ nObjCount - 1 ], uno::UNO_QUERY ); // last object is the dialog
-        rtl::OUString sDialogCodeName;
         if ( xDlgControl.is() )
         {
             Reference< XPropertySet > xProps( xDlgControl->getModel(), UNO_QUERY );
@@ -335,26 +381,8 @@ namespace dlgprov
             }
             catch( Exception& ){}
         }
-
-        for ( sal_Int32 i = 0; i < nObjCount; ++i )
-        {
-            // We know that we have to do with instances of XControl.
-            // Otherwise this is not the right implementation for
-            // XScriptEventsAttacher and we have to give up.
-            Reference< XControl > xControl( pObjects[ i ], UNO_QUERY );
-            if ( !xControl.is() )
-                throw IllegalArgumentException();
-
-            // get XEventsSupplier from control model
-            Reference< XControlModel > xControlModel = xControl->getModel();
-            Reference< XScriptEventsSupplier > xEventsSupplier( xControlModel, UNO_QUERY );
-            attachEventsToControl( xControl, xEventsSupplier, Helper );
-            if ( mbUseFakeVBAEvents )
-            {
-                xEventsSupplier.set( getFakeVbaEventsSupplier( xControl, sDialogCodeName ) );
-                attachEventsToControl( xControl, xEventsSupplier, Helper );
-            }
-        }
+        // go over all objects
+        nestedAttachEvents( Objects, Helper, sDialogCodeName );
     }
 
 
@@ -474,13 +502,13 @@ namespace dlgprov
                 {
                     Reference< provider::XScriptProviderFactory > xFactory(
                         m_xContext->getValueByName(
-                        ::rtl::OUString::createFromAscii( "/singletons/com.sun.star.script.provider.theMasterScriptProviderFactory" ) ),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.script.provider.theMasterScriptProviderFactory")) ),
                         UNO_QUERY );
                     OSL_ENSURE( xFactory.is(), "SFURL_firing_impl: failed to get master script provider factory" );
                     if ( xFactory.is() )
                     {
                         Any aCtx;
-                        aCtx <<= ::rtl::OUString::createFromAscii( "user" );
+                        aCtx <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user"));
                         xScriptProvider.set( xFactory->createScriptProvider( aCtx ), UNO_QUERY );
                     }
                 }
@@ -525,9 +553,9 @@ namespace dlgprov
             sal_Int32 nIndex = sScriptCode.indexOf( ':' );
             if ( nIndex >= 0 && nIndex < sScriptCode.getLength() )
             {
-                sScriptURL = ::rtl::OUString::createFromAscii( "vnd.sun.star.script:" );
+                sScriptURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.script:"));
                 sScriptURL += sScriptCode.copy( nIndex + 1 );
-                sScriptURL += ::rtl::OUString::createFromAscii( "?language=Basic&location=" );
+                sScriptURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("?language=Basic&location="));
                 sScriptURL += sScriptCode.copy( 0, nIndex );
             }
             ScriptEvent aSFScriptEvent( aScriptEvent );
@@ -538,7 +566,7 @@ namespace dlgprov
 
     void DialogUnoScriptListenerImpl::firing_impl( const ScriptEvent& aScriptEvent, Any* pRet )
     {
-        static ::rtl::OUString sUnoURLScheme = ::rtl::OUString::createFromAscii( "vnd.sun.star.UNO:" );
+        static ::rtl::OUString sUnoURLScheme(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.UNO:"));
 
         ::rtl::OUString sScriptCode( aScriptEvent.ScriptCode );
         ::rtl::OUString aMethodName = aScriptEvent.ScriptCode.copy( sUnoURLScheme.getLength() );
diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx
index 437abc668838..dc24f1410a2f 100644
--- a/scripting/source/dlgprov/dlgevtatt.hxx
+++ b/scripting/source/dlgprov/dlgevtatt.hxx
@@ -69,6 +69,7 @@ namespace dlgprov
         ::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacher > m_xEventAttacher;
         ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener > getScriptListenerForKey( const rtl::OUString& sScriptName ) throw ( ::com::sun::star::uno::RuntimeException );
         ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptEventsSupplier > getFakeVbaEventsSupplier( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl, rtl::OUString& sCodeName );
+        void nestedAttachEvents( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >& Objects, const ::com::sun::star::uno::Any& Helper, rtl::OUString& sDialogCodeName );
         void  SAL_CALL attachEventsToControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl, const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptEventsSupplier >& events, const ::com::sun::star::uno::Any& Helper  );
     public:
         DialogEventsAttacherImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx
index 8eeeb85a9ec1..4a8485dd246b 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -74,7 +74,7 @@ namespace dlgprov
 {
 //.........................................................................
 
-static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAscii( "ResourceResolver" );
+static ::rtl::OUString aResourceResolverPropName(RTL_CONSTASCII_USTRINGPARAM("ResourceResolver"));
     // =============================================================================
     // component operations
     // =============================================================================
@@ -243,13 +243,13 @@ static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAs
         }
 
         Reference< uri::XUriReferenceFactory > xFac (
-            xSMgr->createInstanceWithContext( rtl::OUString::createFromAscii(
-            "com.sun.star.uri.UriReferenceFactory"), m_xContext ) , UNO_QUERY );
+            xSMgr->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.uri.UriReferenceFactory")), m_xContext ) , UNO_QUERY );
 
         if  ( !xFac.is() )
         {
             throw RuntimeException(
-                ::rtl::OUString::createFromAscii( "DialogProviderImpl::getDialogModel(), could not instatiate UriReferenceFactory." ),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DialogProviderImpl::getDialogModel(), could not instatiate UriReferenceFactory.")),
                 Reference< XInterface >() );
         }
 
@@ -262,7 +262,7 @@ static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAs
 
         Reference< util::XMacroExpander > xMacroExpander(
             m_xContext->getValueByName(
-            ::rtl::OUString::createFromAscii( "/singletons/com.sun.star.util.theMacroExpander" ) ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.util.theMacroExpander")) ),
             UNO_QUERY_THROW );
 
         Reference< uri::XUriReference > uriRef;
@@ -271,7 +271,7 @@ static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAs
             uriRef = Reference< uri::XUriReference >( xFac->parse( aURL ), UNO_QUERY );
             if ( !uriRef.is() )
             {
-                ::rtl::OUString errorMsg = ::rtl::OUString::createFromAscii( "DialogProviderImpl::getDialogModel: failed to parse URI: " );
+                ::rtl::OUString errorMsg(RTL_CONSTASCII_USTRINGPARAM("DialogProviderImpl::getDialogModel: failed to parse URI: "));
                 errorMsg += aURL;
                 throw IllegalArgumentException( errorMsg,
                                                 Reference< XInterface >(), 1 );
@@ -291,7 +291,7 @@ static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAs
             // Try any other URL with SimpleFileAccess
             Reference< ::com::sun::star::ucb::XSimpleFileAccess > xSFI =
                 Reference< ::com::sun::star::ucb::XSimpleFileAccess >( xSMgr->createInstanceWithContext
-                ( ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ), m_xContext ), UNO_QUERY );
+                ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")), m_xContext ), UNO_QUERY );
 
             try
             {
@@ -312,18 +312,18 @@ static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAs
                 sDlgName = sDescription.getToken( 0, (sal_Unicode)'.', nIndex );
 
             ::rtl::OUString sLocation = sfUri->getParameter(
-                ::rtl::OUString::createFromAscii( "location" ) );
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("location")) );
 
 
             // get dialog library container
             // TODO: dialogs in packages
             Reference< XLibraryContainer > xLibContainer;
 
-            if ( sLocation == ::rtl::OUString::createFromAscii( "application" ) )
+            if ( sLocation == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("application")) )
             {
                 xLibContainer = Reference< XLibraryContainer >( SFX_APP()->GetDialogContainer(), UNO_QUERY );
             }
-            else if ( sLocation == ::rtl::OUString::createFromAscii( "document" ) )
+            else if ( sLocation == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("document")) )
             {
                 Reference< XEmbeddedScripts > xDocumentScripts( m_xModel, UNO_QUERY );
                 if ( xDocumentScripts.is() )
@@ -442,7 +442,7 @@ static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAs
                 Reference< XMultiComponentFactory > xSMgr_( m_xContext->getServiceManager(), UNO_QUERY_THROW );
                 // TODO: Ctor
                 xStringResourceManager = Reference< resource::XStringResourceManager >( xSMgr_->createInstanceWithContext
-                    ( ::rtl::OUString::createFromAscii( "com.sun.star.resource.StringResourceWithLocation" ),
+                    ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.resource.StringResourceWithLocation")),
                         m_xContext ), UNO_QUERY );
                 if( xStringResourceManager.is() )
                 {
@@ -530,7 +530,7 @@ static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAs
         const Reference< XControl >& rxControl,
         const Reference< XInterface >& rxHandler,
         const Reference< XIntrospectionAccess >& rxIntrospectionAccess,
-        bool bDialogProviderMode, const rtl::OUString& sDialogLibName )
+        bool bDialogProviderMode )
     {
         if ( rxControl.is() )
         {
@@ -582,7 +582,7 @@ static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAs
 
             // Get introspection service
             Reference< XInterface > xI = xSMgr->createInstanceWithContext
-                ( rtl::OUString::createFromAscii("com.sun.star.beans.Introspection"), m_xContext );
+                ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.Introspection")), m_xContext );
             if (xI.is())
                 xIntrospection = Reference< XIntrospection >::query( xI );
         }
@@ -680,10 +680,8 @@ static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAs
     // XDialogProvider
     // -----------------------------------------------------------------------------
 
-    static ::rtl::OUString aDecorationPropName =
-        ::rtl::OUString::createFromAscii( "Decoration" );
-    static ::rtl::OUString aTitlePropName =
-        ::rtl::OUString::createFromAscii( "Title" );
+    static ::rtl::OUString aDecorationPropName(RTL_CONSTASCII_USTRINGPARAM("Decoration"));
+    static ::rtl::OUString aTitlePropName(RTL_CONSTASCII_USTRINGPARAM("Title"));
 
     Reference < XControl > DialogProviderImpl::createDialogImpl(
         const ::rtl::OUString& URL, const Reference< XInterface >& xHandler,
@@ -746,7 +744,7 @@ static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAs
             {
                 //xDialog = Reference< XDialog >( xCtrl, UNO_QUERY );
                 Reference< XIntrospectionAccess > xIntrospectionAccess = inspectHandler( xHandler );
-                attachControlEvents( xCtrl, xHandler, xIntrospectionAccess, bDialogProviderMode, msDialogLibName );
+                attachControlEvents( xCtrl, xHandler, xIntrospectionAccess, bDialogProviderMode );
             }
         }
 
diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx
index b4c057a8ff35..43aa99592ff9 100644
--- a/scripting/source/dlgprov/dlgprov.hxx
+++ b/scripting/source/dlgprov/dlgprov.hxx
@@ -92,7 +92,7 @@ namespace dlgprov
         void attachControlEvents( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& rxControlContainer,
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxHandler,
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess >& rxIntrospectionAccess,
-            bool bDialogProviderMode, const rtl::OUString& );
+            bool bDialogProviderMode );
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess > inspectHandler(
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxHandler );
     // helper methods
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index c7289b993d2f..dce9ddee15f5 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -114,8 +114,8 @@ Reference< XDispatch > SAL_CALL ScriptProtocolHandler::queryDispatch(
     // get scheme of url
 
     Reference< uri::XUriReferenceFactory > xFac (
-         m_xFactory->createInstance( rtl::OUString::createFromAscii(
-            "com.sun.star.uri.UriReferenceFactory") ) , UNO_QUERY );
+         m_xFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.uri.UriReferenceFactory")) ) , UNO_QUERY );
     if ( xFac.is() )
     {
         Reference<  uri::XUriReference > uriRef(
@@ -163,7 +163,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
     {
         try
         {
-            bool bIsDocumentScript = ( aURL.Complete.indexOf( ::rtl::OUString::createFromAscii( "document" ) ) !=-1 );
+            bool bIsDocumentScript = ( aURL.Complete.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("document")) ) !=-1 );
                 // TODO: isn't this somewhat strange? This should be a test for a location=document parameter, shouldn't it?
 
             if ( bIsDocumentScript )
@@ -252,8 +252,8 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
 #ifdef _DEBUG
         catch ( ... )
         {
-            ::rtl::OUString reason = ::rtl::OUString::createFromAscii(
-                "ScriptProtocolHandler::dispatch: caught unknown exception" );
+            ::rtl::OUString reason(RTL_CONSTASCII_USTRINGPARAM(
+                "ScriptProtocolHandler::dispatch: caught unknown exception" ));
 
             invokeResult <<= reason;
         }
@@ -262,9 +262,9 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification(
     }
     else
     {
-        ::rtl::OUString reason = ::rtl::OUString::createFromAscii(
+        ::rtl::OUString reason(RTL_CONSTASCII_USTRINGPARAM(
         "ScriptProtocolHandler::dispatchWithNotification failed, ScriptProtocolHandler not initialised"
-        );
+        ));
         invokeResult <<= reason;
     }
 
@@ -408,8 +408,8 @@ ScriptProtocolHandler::createScriptProvider()
             Reference< XComponentContext > xCtx(
                 xProps->getPropertyValue( dc ), UNO_QUERY_THROW );
 
-            ::rtl::OUString tmspf = ::rtl::OUString::createFromAscii(
-                "/singletons/com.sun.star.script.provider.theMasterScriptProviderFactory");
+            ::rtl::OUString tmspf(RTL_CONSTASCII_USTRINGPARAM(
+                "/singletons/com.sun.star.script.provider.theMasterScriptProviderFactory"));
 
             Reference< provider::XScriptProviderFactory > xFac(
                 xCtx->getValueByName( tmspf ), UNO_QUERY_THROW );
diff --git a/scripting/source/provider/ActiveMSPList.cxx b/scripting/source/provider/ActiveMSPList.cxx
index c60e81a590ca..226951ff9fbd 100644
--- a/scripting/source/provider/ActiveMSPList.cxx
+++ b/scripting/source/provider/ActiveMSPList.cxx
@@ -58,9 +58,9 @@ namespace func_provider
 
 ActiveMSPList::ActiveMSPList(  const Reference< XComponentContext > & xContext ) : m_xContext( xContext )
 {
-    userDirString = ::rtl::OUString::createFromAscii("user");
-    shareDirString =  ::rtl::OUString::createFromAscii("share");
-    bundledDirString = ::rtl::OUString::createFromAscii("bundled");
+    userDirString = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user"));
+    shareDirString =  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("share"));
+    bundledDirString = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bundled"));
 }
 
 ActiveMSPList::~ActiveMSPList()
@@ -70,7 +70,7 @@ ActiveMSPList::~ActiveMSPList()
 Reference< provider::XScriptProvider >
 ActiveMSPList::createNewMSP( const uno::Any& context )
 {
-    ::rtl::OUString serviceName = ::rtl::OUString::createFromAscii("com.sun.star.script.provider.MasterScriptProvider");
+    ::rtl::OUString serviceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.provider.MasterScriptProvider"));
     Sequence< Any > args( &context, 1 );
 
     Reference< provider::XScriptProvider > msp(
@@ -297,7 +297,7 @@ ActiveMSPList::createNonDocMSPs()
             return;
         }
         // do creation of user and share MSPs here
-        ::rtl::OUString serviceName = ::rtl::OUString::createFromAscii("com.sun.star.script.provider.MasterScriptProvider");
+        ::rtl::OUString serviceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.provider.MasterScriptProvider"));
         Sequence< Any > args(1);
 
         args[ 0 ] <<= userDirString;
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index bcc48dae1894..8123ec2c9611 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -265,7 +265,7 @@ private:
         for ( sal_Int32 i = 0; i < langNodes.getLength(); i++ )
         {
             Reference< browse::XBrowseNode > xbn;
-            if ( langNodes[ i ]->getName().equals(::rtl::OUString::createFromAscii("uno_packages")) )
+            if ( langNodes[ i ]->getName().equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("uno_packages"))) )
             {
                 xbn.set( new LocationBrowseNode( langNodes[ i ] ) );
             }
@@ -325,8 +325,8 @@ Sequence< Reference< browse::XBrowseNode > > getAllBrowseNodes( const Reference<
             xCtx->getValueByName(
                 OUSTR("/singletons/com.sun.star.script.provider.theMasterScriptProviderFactory") ), UNO_QUERY_THROW );
 
-        locnBNs[ mspIndex++ ] = Reference< browse::XBrowseNode >( xFac->createScriptProvider( makeAny( ::rtl::OUString::createFromAscii("user") ) ), UNO_QUERY_THROW );
-        locnBNs[ mspIndex++ ] = Reference< browse::XBrowseNode >( xFac->createScriptProvider( makeAny( ::rtl::OUString::createFromAscii("share") ) ), UNO_QUERY_THROW );
+        locnBNs[ mspIndex++ ] = Reference< browse::XBrowseNode >( xFac->createScriptProvider( makeAny( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")) ) ), UNO_QUERY_THROW );
+        locnBNs[ mspIndex++ ] = Reference< browse::XBrowseNode >( xFac->createScriptProvider( makeAny( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("share")) ) ), UNO_QUERY_THROW );
     }
     // TODO proper exception handling, should throw
     catch( Exception& e )
@@ -570,7 +570,7 @@ public:
         {
             m_vNodes.push_back( new DefaultBrowseNode( xCtx, nodes[ i ] ) );
         }
-        m_Name = ::rtl::OUString::createFromAscii( "Root" );
+        m_Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Root"));
     }
 
     ~DefaultRootBrowseNode()
@@ -638,7 +638,7 @@ public:
     virtual ::rtl::OUString SAL_CALL getName()
         throw ( RuntimeException )
     {
-        return ::rtl::OUString::createFromAscii( "Root" );
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Root"));
     }
 
     virtual Sequence< Reference< browse::XBrowseNode > > SAL_CALL
@@ -736,8 +736,8 @@ Sequence< ::rtl::OUString > SAL_CALL
 bnf_getSupportedServiceNames( )
     SAL_THROW( () )
 {
-    ::rtl::OUString str_name = ::rtl::OUString::createFromAscii(
-        "com.sun.star.script.browse.BrowseNodeFactory");
+    ::rtl::OUString str_name(RTL_CONSTASCII_USTRINGPARAM(
+        "com.sun.star.script.browse.BrowseNodeFactory"));
 
     return Sequence< ::rtl::OUString >( &str_name, 1 );
 }
@@ -746,8 +746,8 @@ bnf_getSupportedServiceNames( )
 bnf_getImplementationName( )
     SAL_THROW( () )
 {
-    return ::rtl::OUString::createFromAscii(
-        "com.sun.star.script.browse.BrowseNodeFactory" );
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+        "com.sun.star.script.browse.BrowseNodeFactory" ));
 }
 
 Reference< XInterface > SAL_CALL
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx
index de359380b461..b326bf6a31bf 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -273,11 +273,11 @@ throw ( provider::ScriptFrameworkErrorException,
     // need to get the language from the string
 
     Reference< uri::XUriReferenceFactory > xFac (
-         m_xMgr->createInstanceWithContext( rtl::OUString::createFromAscii(
-            "com.sun.star.uri.UriReferenceFactory"), m_xContext ) , UNO_QUERY );
+         m_xMgr->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.uri.UriReferenceFactory")), m_xContext ) , UNO_QUERY );
     if ( !xFac.is() )
     {
-        ::rtl::OUString message = ::rtl::OUString::createFromAscii("Failed to instantiate  UriReferenceFactory");
+        ::rtl::OUString message(RTL_CONSTASCII_USTRINGPARAM("Failed to instantiate  UriReferenceFactory"));
         throw provider::ScriptFrameworkErrorException(
             message, Reference< XInterface >(),
             scriptURI, ::rtl::OUString(),
@@ -299,8 +299,8 @@ throw ( provider::ScriptFrameworkErrorException,
             provider::ScriptFrameworkErrorType::UNKNOWN );
     }
 
-    ::rtl::OUString langKey = ::rtl::OUString::createFromAscii( "language" );
-    ::rtl::OUString locKey = ::rtl::OUString::createFromAscii( "location" );
+    ::rtl::OUString langKey(RTL_CONSTASCII_USTRINGPARAM("language"));
+    ::rtl::OUString locKey(RTL_CONSTASCII_USTRINGPARAM("location"));
 
     if ( sfUri->hasParameter( langKey ) == sal_False ||
          sfUri->hasParameter( locKey ) == sal_False ||
@@ -319,8 +319,7 @@ throw ( provider::ScriptFrameworkErrorException,
 
     // if script us located in uno pkg
     sal_Int32 index = -1;
-    ::rtl::OUString pkgTag =
-        ::rtl::OUString::createFromAscii( ":uno_packages" );
+    ::rtl::OUString pkgTag(RTL_CONSTASCII_USTRINGPARAM(":uno_packages"));
     // for languages other than basic,  scripts located in uno packages
     // are merged into the user/share location context.
     // For other languages the location attribute in script url has the form
@@ -819,8 +818,8 @@ MasterScriptProvider::getAllProviders() throw ( css::uno::RuntimeException )
     }
     else
     {
-        ::rtl::OUString errorMsg = ::rtl::OUString::createFromAscii(
-            "MasterScriptProvider::getAllProviders, cache not initialised");
+        ::rtl::OUString errorMsg(RTL_CONSTASCII_USTRINGPARAM(
+            "MasterScriptProvider::getAllProviders, cache not initialised"));
         throw RuntimeException( errorMsg.concat( errorMsg ),
             Reference< XInterface >() );
     }
@@ -922,8 +921,8 @@ Sequence< ::rtl::OUString > urihelper_getSupportedServiceNames( )
     SAL_THROW( () )
 {
     ::rtl::OUString serviceNameList[] = {
-        ::rtl::OUString::createFromAscii(
-            "com.sun.star.script.provider.ScriptURIHelper" ) };
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.script.provider.ScriptURIHelper" )) };
 
     Sequence< ::rtl::OUString > serviceNames = Sequence <
         ::rtl::OUString > ( serviceNameList, 1 );
@@ -934,8 +933,8 @@ Sequence< ::rtl::OUString > urihelper_getSupportedServiceNames( )
 ::rtl::OUString urihelper_getImplementationName( )
     SAL_THROW( () )
 {
-    return ::rtl::OUString::createFromAscii(
-        "com.sun.star.script.provider.ScriptURIHelper");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+        "com.sun.star.script.provider.ScriptURIHelper"));
 }
 
 static struct cppu::ImplementationEntry s_entries [] =
diff --git a/scripting/source/provider/MasterScriptProviderFactory.cxx b/scripting/source/provider/MasterScriptProviderFactory.cxx
index dac81770dcd6..946793461ed9 100644
--- a/scripting/source/provider/MasterScriptProviderFactory.cxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.cxx
@@ -92,8 +92,8 @@ Sequence< ::rtl::OUString > SAL_CALL
 mspf_getSupportedServiceNames( )
     SAL_THROW( () )
 {
-    ::rtl::OUString str_name = ::rtl::OUString::createFromAscii(
-        "com.sun.star.script.provider.MasterScriptProviderFactory");
+    ::rtl::OUString str_name(RTL_CONSTASCII_USTRINGPARAM(
+        "com.sun.star.script.provider.MasterScriptProviderFactory"));
 
     return Sequence< ::rtl::OUString >( &str_name, 1 );
 }
@@ -102,8 +102,8 @@ mspf_getSupportedServiceNames( )
 mspf_getImplementationName( )
     SAL_THROW( () )
 {
-    return ::rtl::OUString::createFromAscii(
-        "com.sun.star.script.provider.MasterScriptProviderFactory");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+        "com.sun.star.script.provider.MasterScriptProviderFactory"));
 }
 
 Reference< XInterface > SAL_CALL
diff --git a/scripting/source/provider/ProviderCache.cxx b/scripting/source/provider/ProviderCache.cxx
index e11de9b14d47..ae0f0858f6f7 100644
--- a/scripting/source/provider/ProviderCache.cxx
+++ b/scripting/source/provider/ProviderCache.cxx
@@ -167,7 +167,7 @@ ProviderCache::populateCache() throw ( RuntimeException )
             Reference< lang::XSingleComponentFactory > factory;
             if ( sal_False == ( xEnum->nextElement() >>= factory ) )
             {
-                throw new RuntimeException( ::rtl::OUString::createFromAscii( "  error extracting XSingleComponentFactory from Content enumeration. " ), Reference< XInterface >() );
+                throw new RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("  error extracting XSingleComponentFactory from Content enumeration. ")), Reference< XInterface >() );
             }
             validateXRef( factory, "ProviderCache::populateCache() invalid factory" );
             Reference< lang::XServiceInfo > xServiceInfo( factory, UNO_QUERY_THROW );
@@ -214,7 +214,7 @@ ProviderCache::createProvider( ProviderDetails& details ) throw ( RuntimeExcepti
     }
     catch ( RuntimeException& e )
     {
-        ::rtl::OUString temp = ::rtl::OUString::createFromAscii("ProviderCache::createProvider() Error creating provider from factory!!!");
+        ::rtl::OUString temp(RTL_CONSTASCII_USTRINGPARAM("ProviderCache::createProvider() Error creating provider from factory!!!"));
         throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() );
     }
 
diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx
index e59e24147618..e5ab80f838cf 100644
--- a/scripting/source/provider/URIHelper.cxx
+++ b/scripting/source/provider/URIHelper.cxx
@@ -72,8 +72,8 @@ ScriptingFrameworkURIHelper::ScriptingFrameworkURIHelper(
     {
         m_xSimpleFileAccess = uno::Reference< ucb::XSimpleFileAccess >(
             xContext->getServiceManager()->createInstanceWithContext(
-                OUString::createFromAscii(
-                    "com.sun.star.ucb.SimpleFileAccess"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.ucb.SimpleFileAccess")),
                 xContext), uno::UNO_QUERY_THROW);
     }
     catch (uno::Exception&)
@@ -86,8 +86,8 @@ ScriptingFrameworkURIHelper::ScriptingFrameworkURIHelper(
     {
         m_xUriReferenceFactory = uno::Reference< uri::XUriReferenceFactory >(
             xContext->getServiceManager()->createInstanceWithContext(
-                OUString::createFromAscii(
-                    "com.sun.star.uri.UriReferenceFactory"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.uri.UriReferenceFactory")),
             xContext ), uno::UNO_QUERY_THROW );
     }
     catch (uno::Exception&)
@@ -111,26 +111,26 @@ throw ( uno::Exception, uno::RuntimeException )
          args[0].getValueType() != ::getCppuType((const OUString*)NULL) ||
          args[1].getValueType() != ::getCppuType((const OUString*)NULL) )
     {
-        throw uno::RuntimeException( OUString::createFromAscii(
-            "ScriptingFrameworkURIHelper got invalid argument list" ),
+        throw uno::RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "ScriptingFrameworkURIHelper got invalid argument list" )),
                 uno::Reference< uno::XInterface >() );
     }
 
     if ( (args[0] >>= m_sLanguage) == sal_False ||
          (args[1] >>= m_sLocation) == sal_False )
     {
-        throw uno::RuntimeException( OUString::createFromAscii(
-            "ScriptingFrameworkURIHelper error parsing args" ),
+        throw uno::RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "ScriptingFrameworkURIHelper error parsing args" )),
                 uno::Reference< uno::XInterface >() );
     }
 
-    SCRIPTS_PART = OUString::createFromAscii( "/Scripts/" );
+    SCRIPTS_PART = OUString(RTL_CONSTASCII_USTRINGPARAM("/Scripts/"));
     SCRIPTS_PART = SCRIPTS_PART.concat( m_sLanguage.toAsciiLowerCase() );
 
     if ( !initBaseURI() )
     {
-        throw uno::RuntimeException( OUString::createFromAscii(
-            "ScriptingFrameworkURIHelper cannot find script directory"),
+        throw uno::RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "ScriptingFrameworkURIHelper cannot find script directory")),
                 uno::Reference< uno::XInterface >() );
     }
 }
@@ -143,31 +143,31 @@ ScriptingFrameworkURIHelper::initBaseURI()
 
     if ( m_sLocation.equalsAscii(USER))
     {
-        test = OUString::createFromAscii(USER);
-        uri = OUString::createFromAscii(USER_URI);
+        test = OUString(RTL_CONSTASCII_USTRINGPARAM(USER));
+        uri = OUString(RTL_CONSTASCII_USTRINGPARAM(USER_URI));
         bAppendScriptsPart = true;
     }
     else if ( m_sLocation.equalsAscii(USER_UNO_PACKAGES))
     {
-        test = OUString::createFromAscii("uno_packages");
-        uri = OUString::createFromAscii(USER_URI);
-        uri = uri.concat(OUString::createFromAscii(USER_UNO_PACKAGES_DIR));
+        test = OUString(RTL_CONSTASCII_USTRINGPARAM("uno_packages"));
+        uri = OUString(RTL_CONSTASCII_USTRINGPARAM(USER_URI));
+        uri = uri.concat(OUString(RTL_CONSTASCII_USTRINGPARAM(USER_UNO_PACKAGES_DIR)));
     }
     else if (m_sLocation.equalsAscii(SHARE))
     {
-        test = OUString::createFromAscii(SHARE);
-        uri = OUString::createFromAscii(SHARE_URI);
+        test = OUString(RTL_CONSTASCII_USTRINGPARAM(SHARE));
+        uri = OUString(RTL_CONSTASCII_USTRINGPARAM(SHARE_URI));
         bAppendScriptsPart = true;
     }
     else if (m_sLocation.equalsAscii(SHARE_UNO_PACKAGES))
     {
-        test = OUString::createFromAscii("uno_packages");
-        uri = OUString::createFromAscii(SHARE_UNO_PACKAGES_URI);
+        test = OUString(RTL_CONSTASCII_USTRINGPARAM("uno_packages"));
+        uri = OUString(RTL_CONSTASCII_USTRINGPARAM(SHARE_UNO_PACKAGES_URI));
     }
-    else if (m_sLocation.indexOf(OUString::createFromAscii(TDOC_SCHEME)) == 0)
+    else if (m_sLocation.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM(TDOC_SCHEME))) == 0)
     {
         m_sBaseURI = m_sLocation.concat( SCRIPTS_PART );
-        m_sLocation = OUString::createFromAscii( DOCUMENT );
+        m_sLocation = OUString(RTL_CONSTASCII_USTRINGPARAM( DOCUMENT ));
         return true;
     }
     else
@@ -264,13 +264,13 @@ ScriptingFrameworkURIHelper::getStorageURI(const OUString& rScriptURI)
     catch ( uno::Exception& )
     {
         throw lang::IllegalArgumentException(
-            OUString::createFromAscii( "Script URI not valid" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("Script URI not valid")),
                 uno::Reference< uno::XInterface >(), 1 );
     }
 
     ::rtl::OUStringBuffer buf(120);
     buf.append(m_sBaseURI);
-    buf.append(OUString::createFromAscii("/"));
+    buf.append(OUString(RTL_CONSTASCII_USTRINGPARAM("/")));
     buf.append(getLanguagePath(sLanguagePart));
 
     OUString result = buf.makeStringAndClear();
@@ -289,16 +289,16 @@ OUString SAL_CALL
 ScriptingFrameworkURIHelper::getImplementationName()
     throw( uno::RuntimeException )
 {
-    return OUString::createFromAscii(
-        "com.sun.star.script.provider.ScriptURIHelper" );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(
+        "com.sun.star.script.provider.ScriptURIHelper" ));
 }
 
 sal_Bool SAL_CALL
 ScriptingFrameworkURIHelper::supportsService( const OUString& serviceName )
     throw( uno::RuntimeException )
 {
-    OUString m_sServiceName = OUString::createFromAscii(
-        "com.sun.star.script.provider.ScriptURIHelper" );
+    OUString m_sServiceName(RTL_CONSTASCII_USTRINGPARAM(
+        "com.sun.star.script.provider.ScriptURIHelper" ));
 
     if ( serviceName.equals( m_sServiceName ) )
     {
@@ -312,8 +312,8 @@ ScriptingFrameworkURIHelper::getSupportedServiceNames()
     throw( uno::RuntimeException )
 {
     ::rtl::OUString serviceNameList[] = {
-        ::rtl::OUString::createFromAscii(
-            "com.sun.star.script.provider.ScriptURIHelper" ) };
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.script.provider.ScriptURIHelper" )) };
 
     uno::Sequence< ::rtl::OUString > serviceNames = uno::Sequence <
         ::rtl::OUString > ( serviceNameList, 1 );
diff --git a/scripting/source/pyprov/delzip b/scripting/source/pyprov/delzip
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/scripting/source/pyprov/delzip
diff --git a/scripting/source/pyprov/description.xml b/scripting/source/pyprov/description.xml
new file mode 100644
index 000000000000..1fe0a3d923da
--- /dev/null
+++ b/scripting/source/pyprov/description.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<description
+  xmlns="http://openoffice.org/extensions/description/2006"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns:dep="http://openoffice.org/extensions/description/2006">
+
+  <identifier value="com.sun.star.script.provider.ScriptProviderForPython"/>
+
+  <dependencies>
+    <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
+  </dependencies>
+
+  <version value="3.3.0"/>
+
+  <publisher>
+    <name xlink:href="http://www.documentfoundation.org" lang="en">The
+      Document Foundation</name>
+  </publisher>
+
+  <display-name>
+    <name lang="en">Script provider for Python</name>
+  </display-name>
+
+</description>
diff --git a/scripting/source/pyprov/makefile.mk b/scripting/source/pyprov/makefile.mk
index 3c0278595181..2a63d9f25d4e 100644
--- a/scripting/source/pyprov/makefile.mk
+++ b/scripting/source/pyprov/makefile.mk
@@ -39,11 +39,26 @@ TARGET=pyprov
 
 # --- Targets ------------------------------------------------------
 ALL : ALLTAR \
-        $(DLLDEST)$/pythonscript.py	\
     $(DLLDEST)$/officehelper.py	\
         $(DLLDEST)$/mailmerge.py
 
 $(DLLDEST)$/%.py: %.py
     cp $? $@
 
-.INCLUDE :  target.mk
+# scripting provider extension
+.IF "$(L10N_framework)"==""
+
+EXTENSIONNAME:=ScriptProviderForPython
+EXTENSION_ZIPNAME:=script-provider-for-python
+
+COMPONENT_FILES=$(EXTENSIONDIR)$/pythonscript.py
+
+.INCLUDE : extension_pre.mk
+.INCLUDE : target.mk
+.INCLUDE : extension_post.mk
+
+.ELSE
+
+.INCLUDE : target.mk
+
+.ENDIF
diff --git a/scripting/source/pyprov/manifest.xml b/scripting/source/pyprov/manifest.xml
new file mode 100644
index 000000000000..7e4e0456ea97
--- /dev/null
+++ b/scripting/source/pyprov/manifest.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
+<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
+  <manifest:file-entry
+    manifest:media-type="application/vnd.sun.star.uno-component;type=python"
+    manifest:full-path="pythonscript.py"/>
+</manifest:manifest>
diff --git a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
index 5a45a29b731b..4ce06254b30f 100644
--- a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
+++ b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx
@@ -54,10 +54,10 @@ namespace scripting_runtimemgr
 {
 
 const sal_Char* const LANGUAGE_TO_RESOLVE_ON[] = { "All" }; // should be configurable
-OUString nrs_implName = OUString::createFromAscii(
-    "drafts.com.sun.star.script.framework.runtime.DefaultScriptNameResolver" );
-OUString nrs_serviceName = OUString::createFromAscii(
-    "drafts.com.sun.star.script.framework.runtime.DefaultScriptNameResolver" );
+OUString nrs_implName(RTL_CONSTASCII_USTRINGPARAM(
+    "drafts.com.sun.star.script.framework.runtime.DefaultScriptNameResolver" ));
+OUString nrs_serviceName(RTL_CONSTASCII_USTRINGPARAM(
+    "drafts.com.sun.star.script.framework.runtime.DefaultScriptNameResolver" ));
 Sequence< OUString > nrs_serviceNames = Sequence< OUString >( &nrs_serviceName, 1 );
 
 const char* const SCRIPTSTORAGEMANAGER_SERVICE =
@@ -173,10 +173,10 @@ throw ( lang::IllegalArgumentException, script::CannotConvertException, RuntimeE
 
 
     OSL_TRACE( "ScriptNameResolverImpl::resolve Starting..." );
-    OUString docString = OUString::createFromAscii( "location=document" );
-    OUString userString = OUString::createFromAscii( "location=user" );
-    OUString shareString = OUString::createFromAscii( "location=share" );
-    OUString filesysString = OUString::createFromAscii( "location=filesystem" );
+    OUString docString(RTL_CONSTASCII_USTRINGPARAM("location=document"));
+    OUString userString(RTL_CONSTASCII_USTRINGPARAM("location=user"));
+    OUString shareString(RTL_CONSTASCII_USTRINGPARAM("location=share"));
+    OUString filesysString(RTL_CONSTASCII_USTRINGPARAM("location=filesystem"));
 
     // initialise vector with doc, user and share
 
@@ -222,8 +222,8 @@ throw ( lang::IllegalArgumentException, script::CannotConvertException, RuntimeE
             throw RuntimeException( temp.concat( e.Message ), Reference< XInterface >() );
         }
         Reference< XInterface > xInterface = m_xMultiComFac->createInstanceWithContext(
-            ::rtl::OUString::createFromAscii(
-                    "com.sun.star.ucb.SimpleFileAccess" ), m_xContext );
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.ucb.SimpleFileAccess" )), m_xContext );
         validateXRef( xInterface,
             "ScriptProvider::initialise: cannot get SimpleFileAccess Service\n" );
         Reference < ucb::XSimpleFileAccess > xSimpleFileAccess = Reference <
@@ -270,7 +270,7 @@ throw ( lang::IllegalArgumentException, script::CannotConvertException, RuntimeE
         // b) an illegal location
 
         // detect illegal location
-        if (  scriptURI.indexOf( OUString::createFromAscii( "location=" ) ) != -1 )
+        if (  scriptURI.indexOf( OUString(RTL_CONSTASCII_USTRINGPARAM("location=")) ) != -1 )
         {
             OSL_TRACE(
                 "ScriptNameResolver::resolve, throwing IllegalArgException" );
@@ -432,7 +432,7 @@ SAL_THROW ( ( lang::IllegalArgumentException, css::security::AccessControlExcept
     try
     {
         OUString permissionURI = docURI;
-        OUString filesysString = OUString::createFromAscii( "location=filesystem" );
+        OUString filesysString(RTL_CONSTASCII_USTRINGPARAM("location=filesystem"));
         if ( scriptURI.indexOf( filesysString ) != -1 )
         {
             // in the case of filesys scripts we're checking whether the
@@ -520,7 +520,7 @@ const ::rtl::OUString & permissionURI ) SAL_THROW ( ( RuntimeException, css::sec
         Reference< XInterface > xInterface;
 
         Any a = m_xContext->getValueByName(
-                    OUString::createFromAscii( SCRIPTSTORAGEMANAGER_SERVICE ) );
+                    OUString(RTL_CONSTASCII_USTRINGPARAM( SCRIPTSTORAGEMANAGER_SERVICE )) );
         if ( sal_False == ( a >>= xInterface ) )
         {
             throw RuntimeException(
@@ -541,7 +541,7 @@ const ::rtl::OUString & permissionURI ) SAL_THROW ( ( RuntimeException, css::sec
             ( sid != scriptingConstantsPool.SHARED_STORAGE_ID ) )
         {
             xScriptSecurity->checkPermission( permissionURI,
-                OUString::createFromAscii( "execute" ) );
+                OUString(RTL_CONSTASCII_USTRINGPARAM("execute")) );
             // if we get here, the checkPermission hasn't thrown an
             // AccessControlException, ie. permission has been granted
             OSL_TRACE( "ScriptNameResolverImpl::getStorageInstance: got execute permission for ID=%d", sid );
@@ -586,7 +586,7 @@ throw( lang::IllegalArgumentException )
 {
         OUString filePath;
         OUString fileName;
-        OUString filesysString = OUString::createFromAscii( "location=filesystem" );
+        OUString filesysString(RTL_CONSTASCII_USTRINGPARAM("location=filesystem"));
         sal_Int32 locationPos = scriptURI.indexOf( filesysString );
         // expect location=filesys:file:///foo/bar/myscript.bsh etc
         // except the file url at this point is encoded
@@ -603,7 +603,7 @@ throw( lang::IllegalArgumentException )
                                 endOfLocn - locationPos - filesysStrLen );
         }
         //file name shoul also be encoded so again ok to search for '&'
-        OUString functionKey = OUString::createFromAscii( "function=" );
+        OUString functionKey(RTL_CONSTASCII_USTRINGPARAM("function="));
         sal_Int32 functionKeyLength = functionKey.getLength();
         sal_Int32 functionNamePos = scriptURI.indexOf( functionKey );
         if ( functionNamePos > 0 )
diff --git a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx
index 113c08bc63b4..06dc463b4878 100644
--- a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx
+++ b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx
@@ -55,10 +55,10 @@ using namespace ::drafts::com::sun::star::script::framework;
 namespace scripting_runtimemgr
 {
 
-static OUString s_implName = ::rtl::OUString::createFromAscii(
- "drafts.com.sun.star.script.framework.runtime.ScriptRuntimeManager" );
-static OUString s_serviceName = ::rtl::OUString::createFromAscii(
- "drafts.com.sun.star.script.framework.runtime.ScriptRuntimeManager" );
+static OUString s_implName(RTL_CONSTASCII_USTRINGPARAM(
+ "drafts.com.sun.star.script.framework.runtime.ScriptRuntimeManager" ));
+static OUString s_serviceName(RTL_CONSTASCII_USTRINGPARAM(
+ "drafts.com.sun.star.script.framework.runtime.ScriptRuntimeManager" ));
 static Sequence< OUString > s_serviceNames = Sequence< OUString >( &s_serviceName, 1 );
 
 ::rtl_StandardModuleCount s_moduleCount = MODULE_COUNT_INIT;
@@ -143,8 +143,8 @@ throw( RuntimeException )
     try
     {
         Reference< XInterface > xInterface = m_xMgr->createInstanceWithContext(
-            OUString::createFromAscii(
-                "drafts.com.sun.star.script.framework.runtime.DefaultScriptNameResolver" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "drafts.com.sun.star.script.framework.runtime.DefaultScriptNameResolver" )),
                 m_xContext );
         validateXRef( xInterface,
             "ScriptRuntimeManager::GetScriptRuntime: cannot get instance of DefaultScriptNameResolver" );
@@ -225,8 +225,8 @@ Any SAL_CALL ScriptRuntimeManager::invoke(
                                              aOutParamIndex, aOutParam );
 
         // need to dispose of filesystem storage
-        OUString filesysString = OUString::createFromAscii(
-                                        "location=filesystem" );
+        OUString filesysString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "location=filesystem" ));
         if ( scriptURI.indexOf( filesysString ) != -1 )
         {
             Any a = m_xContext->getValueByName(
diff --git a/scripting/source/runtimemgr/StorageBridge.cxx b/scripting/source/runtimemgr/StorageBridge.cxx
index e441389f2b05..f422a4a67666 100644
--- a/scripting/source/runtimemgr/StorageBridge.cxx
+++ b/scripting/source/runtimemgr/StorageBridge.cxx
@@ -82,7 +82,7 @@ StorageBridge::initStorage() throw ( ::com::sun::star::uno::RuntimeException )
         Reference< XInterface > temp;
 
         Any a = m_xContext->getValueByName(
-                    OUString::createFromAscii( SCRIPTSTORAGEMANAGER_SERVICE ) );
+                    OUString(RTL_CONSTASCII_USTRINGPARAM( SCRIPTSTORAGEMANAGER_SERVICE )) );
         if ( sal_False == ( a >>= temp ) )
         {
             throw RuntimeException(
diff --git a/scripting/source/storage/ScriptInfo.cxx b/scripting/source/storage/ScriptInfo.cxx
index 1511d9ff5644..fa41501c4283 100644
--- a/scripting/source/storage/ScriptInfo.cxx
+++ b/scripting/source/storage/ScriptInfo.cxx
@@ -247,7 +247,7 @@ OUString SAL_CALL ScriptInfo::getDescription(  ) throw ( RuntimeException )
     // TDB need to determine locale here, hardcoded at the moment
     // to english
 
-    OUString localeLang = OUString::createFromAscii( "en" );
+    OUString localeLang(RTL_CONSTASCII_USTRINGPARAM("en"));
     strpair_map::const_iterator str_it =
         m_scriptData.locales.find( localeLang );
 
diff --git a/scripting/source/storage/ScriptMetadataImporter.cxx b/scripting/source/storage/ScriptMetadataImporter.cxx
index f46d87b7ceae..b6a7e78838fd 100644
--- a/scripting/source/storage/ScriptMetadataImporter.cxx
+++ b/scripting/source/storage/ScriptMetadataImporter.cxx
@@ -93,7 +93,7 @@ void ScriptMetadataImporter::parseMetaData(
         "ScriptMetadataImporter::parseMetaData: No service manager available" );
 
     Reference< XInterface > xInterface = xMgr->createInstanceWithContext(
-        OUString::createFromAscii( "com.sun.star.xml.sax.Parser" ), m_xContext );
+        OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")), m_xContext );
 
     validateXRef( xInterface, "ScriptMetadataImporter::parseMetaData: cannot get SAX Parser" );
     Reference< xml::sax::XParser > xParser;
@@ -103,8 +103,8 @@ void ScriptMetadataImporter::parseMetaData(
     }
     catch (RuntimeException & re )
     {
-        OUString msg = OUString::createFromAscii(
-            "ScriptMetadata:Importer::parserMetaData cannot get XParser" );
+        OUString msg(RTL_CONSTASCII_USTRINGPARAM(
+            "ScriptMetadata:Importer::parserMetaData cannot get XParser" ));
         msg.concat( re.Message );
         throw RuntimeException( msg, Reference< XInterface > () );
     }
@@ -127,24 +127,24 @@ void ScriptMetadataImporter::parseMetaData(
     }
     catch ( xml::sax::SAXException & saxe )
     {
-        OUString msg = OUString::createFromAscii(
-            "ScriptMetadata:Importer::parserMetaData SAXException" );
+        OUString msg(RTL_CONSTASCII_USTRINGPARAM(
+            "ScriptMetadata:Importer::parserMetaData SAXException" ));
         msg.concat( saxe.Message );
         throw xml::sax::SAXException( msg, Reference< XInterface > (),
             saxe.WrappedException );
     }
     catch ( io::IOException & ioe )
     {
-        throw io::IOException( OUString::createFromAscii(
-            "ScriptMetadataImporter::parseMetaData IOException: " ) + ioe.Message,
+        throw io::IOException( OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "ScriptMetadataImporter::parseMetaData IOException: " )) + ioe.Message,
             Reference< XInterface > () );
     }
 
 #ifdef _DEBUG
     catch ( ... )
     {
-        throw RuntimeException( OUString::createFromAscii(
-            "ScriptMetadataImporter::parseMetadata UnknownException: " ),
+        throw RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "ScriptMetadataImporter::parseMetadata UnknownException: " )),
             Reference< XInterface > () );
     }
 #endif
@@ -230,35 +230,35 @@ void ScriptMetadataImporter::startElement(
         case SCRIPT:
             m_ScriptData.parcelURI = ms_parcelURI;
             m_ScriptData.language = xAttribs->getValueByName(
-                ::rtl::OUString::createFromAscii( "language" ));
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("language")));
             OSL_TRACE(  "Trace Message: language is %s\n",
                 ::rtl::OUStringToOString( m_ScriptData.language,
                     RTL_TEXTENCODING_ASCII_US ).pData->buffer );
             break;
         case LOCALE:
             ms_localeLang = xAttribs->getValueByName(
-               ::rtl::OUString::createFromAscii( "lang" ) );
+               ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("lang")) );
             OSL_TRACE(  "Trace Message: Locale is %s\n",
                 ::rtl::OUStringToOString( ms_localeLang,
                     RTL_TEXTENCODING_ASCII_US ).pData->buffer );
             break;
         case DISPLAYNAME:
             ms_localeDisName = xAttribs->getValueByName(
-               ::rtl::OUString::createFromAscii( "value" ));
+               ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value")));
             OSL_TRACE(  "Trace Message: Displyaname is %s\n",
                 ::rtl::OUStringToOString( ms_localeDisName,
                     RTL_TEXTENCODING_ASCII_US ).pData->buffer );
             break;
         case FUNCTIONNAME:
             m_ScriptData.functionname = xAttribs->getValueByName(
-               ::rtl::OUString::createFromAscii( "value" ) );
+               ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value")) );
             OSL_TRACE(  "Trace Message: Functionname is %s\n",
                 ::rtl::OUStringToOString( m_ScriptData.functionname,
                     RTL_TEXTENCODING_ASCII_US ).pData->buffer );
             break;
         case LOGICALNAME:
             m_ScriptData.logicalname = xAttribs->getValueByName(
-               ::rtl::OUString::createFromAscii( "value" ));
+               ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value")));
 #ifdef _DEBUG
             fprintf(stderr, "Trace Message: logicalname is %s\n",
                 ::rtl::OUStringToOString( m_ScriptData.logicalname,
@@ -268,21 +268,21 @@ void ScriptMetadataImporter::startElement(
         case LANGDEPPROPS:
              m_ScriptData.languagedepprops.push_back(
                 ::std::make_pair( xAttribs->getValueByName(
-                     ::rtl::OUString::createFromAscii( "name" ) ),
+                     ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("name")) ),
                  xAttribs->getValueByName(
-                     ::rtl::OUString::createFromAscii( "value" ) )
+                     ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value")) )
                  ));
             OSL_TRACE(  "Trace Message: Langdepprops is %s\t%s\n",
                 ::rtl::OUStringToOString( xAttribs->getValueByName(
-                   ::rtl::OUString::createFromAscii( "name" ) ),
+                   ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("name")) ),
                    RTL_TEXTENCODING_ASCII_US ).pData->buffer,
                 ::rtl::OUStringToOString( xAttribs->getValueByName(
-                   ::rtl::OUString::createFromAscii( "value" ) ),
+                   ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value")) ),
                    RTL_TEXTENCODING_ASCII_US ).pData->buffer );
              break;
         case FILESET:
             ms_filesetname = xAttribs->getValueByName(
-               ::rtl::OUString::createFromAscii( "name" ) );
+               ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("name")) );
             OSL_TRACE(  "Trace Message: filesetname is %s\n",
                 ::rtl::OUStringToOString(ms_filesetname,
                     RTL_TEXTENCODING_ASCII_US ).pData->buffer );
@@ -290,21 +290,21 @@ void ScriptMetadataImporter::startElement(
         case FILESETPROPS:
             mv_filesetprops.push_back( ::std::make_pair(
                 xAttribs->getValueByName(
-                    ::rtl::OUString::createFromAscii( "name" ) ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("name")) ),
                 xAttribs->getValueByName(
-                    ::rtl::OUString::createFromAscii( "value" ) )
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value")) )
                 ));
             OSL_TRACE(  "Trace Message: filesetprops is %s\t%s\n",
                 ::rtl::OUStringToOString( xAttribs->getValueByName(
-                   ::rtl::OUString::createFromAscii( "name" ) ),
+                   ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("name")) ),
                    RTL_TEXTENCODING_ASCII_US ).pData->buffer,
                 ::rtl::OUStringToOString( xAttribs->getValueByName(
-                   ::rtl::OUString::createFromAscii( "value" ) ),
+                   ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value")) ),
                    RTL_TEXTENCODING_ASCII_US ).pData->buffer );
             break;
         case FILES:
             ms_filename = xAttribs->getValueByName(
-                ::rtl::OUString::createFromAscii( "name" ) );
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("name")) );
             OSL_TRACE(  "Trace Message: filename is %s\n",
                 ::rtl::OUStringToOString( ms_filename,
                     RTL_TEXTENCODING_ASCII_US).pData->buffer );
@@ -313,22 +313,22 @@ void ScriptMetadataImporter::startElement(
             /**
             mm_files.insert( strpair_pair( ms_filename,
                 str_pair( xAttribs->getValueByName(
-                    ::rtl::OUString::createFromAscii( "name" ) ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("name")) ),
                 xAttribs->getValueByName(
-                    ::rtl::OUString::createFromAscii( "value") ) )
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value")) ) )
                 )
             );
             */
             mv_fileprops.push_back(str_pair( xAttribs->getValueByName(
-                ::rtl::OUString::createFromAscii( "name" ) ),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("name")) ),
                 xAttribs->getValueByName(
-                ::rtl::OUString::createFromAscii( "value") ) ) );
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value")) ) ) );
             OSL_TRACE(  "Trace Message: fileprops is %s\t%s\n",
                 ::rtl::OUStringToOString( xAttribs->getValueByName(
-                   ::rtl::OUString::createFromAscii( "name" ) ),
+                   ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("name")) ),
                    RTL_TEXTENCODING_ASCII_US ).pData->buffer,
                 ::rtl::OUStringToOString( xAttribs->getValueByName(
-                   ::rtl::OUString::createFromAscii( "value" ) ),
+                   ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value")) ),
                    RTL_TEXTENCODING_ASCII_US ).pData->buffer );
             break;
 
@@ -519,7 +519,7 @@ void ScriptMetadataImporter::setState( const ::rtl::OUString & tagName )
     else
     {
         //If there is a tag we don't know about, throw a exception (wobbler) :)
-        ::rtl::OUString str_sax = ::rtl::OUString::createFromAscii( "No Such Tag" );
+        ::rtl::OUString str_sax(RTL_CONSTASCII_USTRINGPARAM("No Such Tag"));
 
         OSL_TRACE(  "ScriptMetadataImporter: No Such Tag: %s\n",
             ::rtl::OUStringToOString(
diff --git a/scripting/source/storage/ScriptSecurityManager.cxx b/scripting/source/storage/ScriptSecurityManager.cxx
index 42fa362e0e85..b653f6ce92c6 100644
--- a/scripting/source/storage/ScriptSecurityManager.cxx
+++ b/scripting/source/storage/ScriptSecurityManager.cxx
@@ -63,17 +63,17 @@ const char* const SCRIPTSTORAGEMANAGER_SERVICE =
 namespace scripting_securitymgr
 {
 
-static OUString s_configProv = ::rtl::OUString::createFromAscii(
-    "com.sun.star.configuration.ConfigurationProvider");
+static OUString s_configProv(RTL_CONSTASCII_USTRINGPARAM(
+    "com.sun.star.configuration.ConfigurationProvider"));
 
-static OUString s_configAccess = ::rtl::OUString::createFromAscii(
-    "com.sun.star.configuration.ConfigurationAccess");
+static OUString s_configAccess(RTL_CONSTASCII_USTRINGPARAM(
+    "com.sun.star.configuration.ConfigurationAccess"));
 
-static OUString s_configUpdate = ::rtl::OUString::createFromAscii(
-    "com.sun.star.configuration.ConfigurationUpdateAccess");
+static OUString s_configUpdate(RTL_CONSTASCII_USTRINGPARAM(
+    "com.sun.star.configuration.ConfigurationUpdateAccess"));
 
-static OUString s_securityDialog = ::rtl::OUString::createFromAscii(
-    "com.sun.star.script.framework.security.SecurityDialog");
+static OUString s_securityDialog(RTL_CONSTASCII_USTRINGPARAM(
+    "com.sun.star.script.framework.security.SecurityDialog"));
 
 static const int PERMISSION_NEVER = 0;
 static const int PERMISSION_PATHLIST = 1;
@@ -137,7 +137,7 @@ throw ( RuntimeException )
 
         Reference< XInterface > xInterface;
         Any a = m_xContext->getValueByName(
-                OUString::createFromAscii( SCRIPTSTORAGEMANAGER_SERVICE ) );
+                OUString(RTL_CONSTASCII_USTRINGPARAM( SCRIPTSTORAGEMANAGER_SERVICE )) );
         if ( sal_False == ( a >>= xInterface ) )
         {
             throw RuntimeException(
@@ -356,7 +356,7 @@ void ScriptSecurityManager::checkPermission( const OUString & scriptStorageURL,
     const OUString & permissionRequest )
     throw ( RuntimeException, lang::IllegalArgumentException, security::AccessControlException )
 {
-    if( permissionRequest.equals( OUString::createFromAscii( "execute" ) ) )
+    if( permissionRequest.equals( OUString(RTL_CONSTASCII_USTRINGPARAM("execute")) ) )
     {
         OSL_TRACE(
             "ScriptSecurityManager::checkPermission: execute permission request for %s",
@@ -376,18 +376,18 @@ void ScriptSecurityManager::checkPermission( const OUString & scriptStorageURL,
                 OSL_TRACE( "permission refused" );
                 Any aPermission;
                 security::RuntimePermission permission;
-                permission.Name = OUString::createFromAscii( "execute" ).concat( scriptStorageURL );
+                permission.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("execute")).concat( scriptStorageURL );
                 aPermission <<= permission;
                 throw security::AccessControlException(
-                    OUString::createFromAscii( "ScriptSecurityManager::checkPermission: no execute permission for URL" ).concat( scriptStorageURL ),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("ScriptSecurityManager::checkPermission: no execute permission for URL")).concat( scriptStorageURL ),
                     Reference< XInterface > (), aPermission );
             }
         }
         // we should never get here!!
-        throw lang::IllegalArgumentException( OUString::createFromAscii( "ScriptSecurityManager::checkPermission: storageURL not found" ), Reference< XInterface > (), 0 );
+        throw lang::IllegalArgumentException( OUString(RTL_CONSTASCII_USTRINGPARAM("ScriptSecurityManager::checkPermission: storageURL not found")), Reference< XInterface > (), 0 );
     }
     // inappropriate permission request
-    throw lang::IllegalArgumentException( OUString::createFromAscii( "ScriptSecurityManager::checkPermission: storageURL not found" ), Reference< XInterface > (), 1 );
+    throw lang::IllegalArgumentException( OUString(RTL_CONSTASCII_USTRINGPARAM("ScriptSecurityManager::checkPermission: storageURL not found")), Reference< XInterface > (), 1 );
 }
 
 void ScriptSecurityManager::removePermissionSettings ( ::rtl::OUString & scriptStorageURL )
@@ -415,8 +415,8 @@ void ScriptSecurityManager::readConfiguration()
     try
     {
     beans::PropertyValue configPath;
-    configPath.Name = ::rtl::OUString::createFromAscii( "nodepath" );
-    configPath.Value <<= ::rtl::OUString::createFromAscii( "org.openoffice.Office.Common/Security/Scripting" );
+    configPath.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath"));
+    configPath.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/Security/Scripting"));
     Sequence < Any > aargs( 1 );
     aargs[ 0 ] <<= configPath;
     validateXRef( m_xConfigProvFactory,
@@ -513,8 +513,8 @@ void ScriptSecurityManager::readConfiguration()
     validateXRef( xMgr,
         "ScriptSecurityManager::readConfiguration: cannot get XMultiComponentFactory" );
     xInterface = xMgr->createInstanceWithContext(
-        ::rtl::OUString::createFromAscii(
-        "com.sun.star.util.PathSubstitution"), m_xContext);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+        "com.sun.star.util.PathSubstitution")), m_xContext);
     validateXRef( xInterface,
         "ScriptSecurityManager::readConfiguration: cannot get ConfigurationProvider" );
     Reference< util::XStringSubstitution > xStringSubstitution(
@@ -549,8 +549,8 @@ throw ( RuntimeException )
 {
     OSL_TRACE( "--->ScriptSecurityManager::addToSecurePaths" );
     beans::PropertyValue configPath;
-    configPath.Name = ::rtl::OUString::createFromAscii( "nodepath" );
-    configPath.Value <<= ::rtl::OUString::createFromAscii( "org.openoffice.Office.Common/Security/Scripting" );
+    configPath.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath"));
+    configPath.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/Security/Scripting"));
     Sequence < Any > aargs( 1 );
     aargs[ 0 ] <<= configPath;
     Reference< XInterface > xInterface = m_xConfigProvFactory->createInstanceWithArguments( s_configUpdate,
diff --git a/scripting/source/storage/ScriptStorage.cxx b/scripting/source/storage/ScriptStorage.cxx
index 957532185866..c32e1683f638 100644
--- a/scripting/source/storage/ScriptStorage.cxx
+++ b/scripting/source/storage/ScriptStorage.cxx
@@ -70,8 +70,8 @@ const sal_Char * const SCRIPT_DIR = "/Scripts";
 const sal_Char * const SCRIPT_PARCEL = "/parcel-descriptor.xml";
 const sal_Char * const SCRIPT_PARCEL_NAME_ONLY = "parcel-descriptor";
 
-static OUString ss_implName = OUString::createFromAscii( IMPL_NAME );
-static OUString ss_serviceName = OUString::createFromAscii( SERVICE_NAME );
+static OUString ss_implName(RTL_CONSTASCII_USTRINGPARAM( IMPL_NAME ));
+static OUString ss_serviceName(RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ));
 static Sequence< OUString > ss_serviceNames =
     Sequence< OUString >( &ss_serviceName, 1 );
 
@@ -104,8 +104,8 @@ throw ( RuntimeException )
             mh_scriptLangs = new ScriptLanguages_hash();
             Reference< XInterface > xInterface =
                 m_xMgr->createInstanceWithContext(
-                        OUString::createFromAscii(
-                            "com.sun.star.configuration.ConfigurationProvider" )
+                        OUString(RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.configuration.ConfigurationProvider" ))
                         , m_xContext );
             validateXRef( xInterface,
                 "ScriptStorage::ScriptStorage: cannot get ConfigurationProvider" );
@@ -117,14 +117,14 @@ throw ( RuntimeException )
             validateXRef( xConfigProvFactory,
                 "ScriptStorage::ScriptStorage: cannot get XMultiServiceFactory interface from ConfigurationProvider" );
             beans::PropertyValue configPath;
-            configPath.Name = ::rtl::OUString::createFromAscii( "nodepath" );
-            configPath.Value <<= ::rtl::OUString::createFromAscii( "org.openoffice.Office.Scripting/ScriptRuntimes" );
+            configPath.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath"));
+            configPath.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Scripting/ScriptRuntimes"));
             Sequence < Any > aargs( 1 );
             aargs[ 0 ] <<= configPath;
 
             xInterface = xConfigProvFactory->createInstanceWithArguments(
-                        OUString::createFromAscii(
-                            "com.sun.star.configuration.ConfigurationAccess"),
+                        OUString(RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.configuration.ConfigurationAccess")),
                         aargs );
             validateXRef( xInterface,
                 "ScriptStorage::ScriptStorage: cannot get ConfigurationAccess" );
@@ -144,7 +144,7 @@ throw ( RuntimeException )
                 validateXRef( xPropSet,
                     "ScriptStorage::ScriptStorage: cannot get XPropertySet for name" );
                 Any aProp = xPropSet->getPropertyValue(
-                        OUString::createFromAscii( "SupportedFileExtensions") );
+                        OUString(RTL_CONSTASCII_USTRINGPARAM("SupportedFileExtensions")) );
                 Sequence< OUString > extns;
                 if( sal_False == ( aProp >>= extns ) )
                 {
@@ -290,8 +290,8 @@ throw ( RuntimeException, Exception )
 
         validateXRef( xSMI, "ScriptStorage::create: failed to obtain valid XExtendedDocumentHandler" );
 
-        xStringUri = xStringUri.concat( ::rtl::OUString::createFromAscii(
-            SCRIPT_DIR ) );
+        xStringUri = xStringUri.concat( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            SCRIPT_DIR )) );
 
        // No Scripts directory - just return
        if ( ! m_xSimpleFileAccess->isFolder( xStringUri ) )
@@ -329,7 +329,7 @@ throw ( RuntimeException, Exception )
                     RTL_TEXTENCODING_ASCII_US ).pData->buffer );
 
                 OUString parcelFile = parcelDirs[ j ].concat(
-                    ::rtl::OUString::createFromAscii( SCRIPT_PARCEL ) );
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCRIPT_PARCEL )) );
 
                 // Do not have a valid parcel.xml
                 if ( !m_xSimpleFileAccess->exists( parcelFile ) ||
@@ -448,7 +448,7 @@ throw ( RuntimeException, Exception )
     // the char just after the filesep
     lastFileSep += 1;
     sal_Int32 lastFileExt = xStringUri.lastIndexOf( fileExtension );
-    OUString searchString = OUString::createFromAscii( "://" );
+    OUString searchString(RTL_CONSTASCII_USTRINGPARAM("://"));
     sal_Int32 searchStringLength = searchString.getLength();
     sal_Int32 startPath = xStringUri.indexOf( searchString );
     sal_Int32 uriLength = xStringUri.getLength();
@@ -500,7 +500,7 @@ ScriptStorage::getFileExtension( const OUString & stringUri )
     }
     else
     {
-        fileExtension = OUString::createFromAscii("");
+        fileExtension = OUString(RTL_CONSTASCII_USTRINGPARAM(""));
     }
     return fileExtension;
 }
@@ -559,8 +559,8 @@ throw ( RuntimeException )
     // xScriptInvocation = Reference<XScriptInvocation>(xx, UNO_QUERY_THROW);
     Reference< xml::sax::XExtendedDocumentHandler > xHandler;
 
-    OUString parcel_suffix = OUString::createFromAscii( SCRIPT_PARCEL );
-    OUString ou_parcel = OUString(
+    OUString parcel_suffix(RTL_CONSTASCII_USTRINGPARAM( SCRIPT_PARCEL ));
+    OUString ou_parcel(
         RTL_CONSTASCII_USTRINGPARAM( SCRIPT_PARCEL_NAME_ONLY ) );
 
     try
@@ -584,13 +584,13 @@ throw ( RuntimeException )
                     xOS = m_xSimpleFileAccess->openFileWrite( parcel_xml_path );
 
                     OSL_TRACE(  "saving: %s\n", rtl::OUStringToOString(
-                        it_sfh->second.parcelURI.concat( OUString::createFromAscii(
-                        "/parcel.xml" ) ),
+                        it_sfh->second.parcelURI.concat( OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "/parcel.xml" )) ),
                         RTL_TEXTENCODING_ASCII_US ).pData->buffer );
 
                     Reference< XInterface > xInterface =
                         m_xMgr->createInstanceWithContext(
-                        OUString::createFromAscii( "com.sun.star.xml.sax.Writer" ),
+                        OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer")),
                         m_xContext );
                     validateXRef( xInterface, "ScriptStorage::save: cannot get sax.Writer" );
                     xHandler = Reference<xml::sax::XExtendedDocumentHandler>(
diff --git a/scripting/source/storage/ScriptStorageManager.cxx b/scripting/source/storage/ScriptStorageManager.cxx
index ae05ff7cd57d..07e5031376dc 100644
--- a/scripting/source/storage/ScriptStorageManager.cxx
+++ b/scripting/source/storage/ScriptStorageManager.cxx
@@ -55,12 +55,10 @@ using namespace ::drafts::com::sun::star::script::framework;
 namespace scripting_impl
 {
 
-static OUString s_implName =
-    ::rtl::OUString::createFromAscii(
-        "drafts.com.sun.star.script.framework.storage.ScriptStorageManager" );
-static OUString s_serviceName =
-    ::rtl::OUString::createFromAscii(
+static OUString s_implName(RTL_CONSTASCII_USTRINGPARAM(
         "drafts.com.sun.star.script.framework.storage.ScriptStorageManager" );
+static OUString s_serviceName(RTL_CONSTASCII_USTRINGPARAM(
+        "drafts.com.sun.star.script.framework.storage.ScriptStorageManager" ));
 static Sequence< OUString > s_serviceNames = Sequence< OUString >( &s_serviceName, 1 );
 
 //extern ::rtl_StandardModuleCount s_moduleCount = MODULE_COUNT_INIT;
@@ -87,8 +85,8 @@ ScriptStorageManager::ScriptStorageManager( const Reference<
     {
         // obtain the macro expander singleton to use in determining the
         // location of the application script storage
-        Any aAny = m_xContext->getValueByName( OUString::createFromAscii(
-                                                   "/singletons/com.sun.star.util.theMacroExpander" ) );
+        Any aAny = m_xContext->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                                   "/singletons/com.sun.star.util.theMacroExpander" )) );
         Reference< util::XMacroExpander > xME;
         if ( sal_False == ( aAny >>= xME ) )
         {
@@ -98,14 +96,14 @@ ScriptStorageManager::ScriptStorageManager( const Reference<
         }
         validateXRef( xME, "ScriptStorageManager constructor: can't get MacroExpander" );
 
-        OUString base = OUString::createFromAscii(
-                            SAL_CONFIGFILE( "${$BRAND_BASE_DIR/program/bootstrap" ) );
+        OUString base(RTL_CONSTASCII_USTRINGPARAM(
+                            SAL_CONFIGFILE( "${$BRAND_BASE_DIR/program/bootstrap" )) );
 
         setupAppStorage( xME,
-                         base.concat( OUString::createFromAscii( "::BaseInstallation}/share" ) ),
+                         base.concat( OUString(RTL_CONSTASCII_USTRINGPARAM("::BaseInstallation}/share")) ),
                          OUSTR( "SHARE" ) );
         setupAppStorage( xME,
-                         base.concat( OUString::createFromAscii( "::UserInstallation}/user" ) ),
+                         base.concat( OUString(RTL_CONSTASCII_USTRINGPARAM("::UserInstallation}/user")) ),
                          OUSTR( "USER" ) );
 
     }
@@ -129,7 +127,7 @@ SAL_THROW ( ( RuntimeException ) )
     {
         Reference< XInterface > xInterface =
             m_xMgr->createInstanceWithContext(
-                OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ), m_xContext );
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")), m_xContext );
         validateXRef( xInterface,
                       "ScriptStorageManager constructor: can't get SimpleFileAccess XInterface" );
         Reference< ucb::XSimpleFileAccess > xSFA( xInterface, UNO_QUERY_THROW );
@@ -171,8 +169,8 @@ SAL_THROW ( ( RuntimeException ) )
 
         Reference< XInterface > xInterface =
             m_xMgr->createInstanceWithArgumentsAndContext(
-                OUString::createFromAscii(
-                    "drafts.com.sun.star.script.framework.storage.ScriptStorage" ),
+                OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "drafts.com.sun.star.script.framework.storage.ScriptStorage" )),
                 aArgs, m_xContext );
 
         validateXRef( xInterface, "ScriptStorageManager:: setupAnyStorage: Can't create ScriptStorage for share" );
@@ -219,8 +217,8 @@ throw ( RuntimeException )
     validateXRef( xSFA,
                   "ScriptStorageManager::createScriptStorage: XSimpleFileAccess is not valid" );
 
-    return setupAnyStorage( xSFA, ::rtl::OUString::createFromAscii( "" ),
-                            ::rtl::OUString::createFromAscii( "" ) );
+    return setupAnyStorage( xSFA, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) );
 }
 
 //*************************************************************************
@@ -237,7 +235,7 @@ throw ( RuntimeException )
     // workaround issue: no functionProvider created on doc open
     // if NODIALOG tag, strip from stringURI, set boolean=true
     bool displayDialog = true;
-    ::rtl::OUString dialogTag = ::rtl::OUString::createFromAscii( "NoDialog::" );
+    ::rtl::OUString dialogTag(RTL_CONSTASCII_USTRINGPARAM("NoDialog::"));
     ::rtl::OUString stringURI = cStringURI;
     if( stringURI.indexOf( dialogTag ) == 0 )
     {
@@ -249,8 +247,7 @@ throw ( RuntimeException )
 
 
     // convert file:///... url to vnd... syntax
-    ::rtl::OUString canonicalURI(
-        ::rtl::OUString::createFromAscii( "vnd.sun.star.pkg://" ) );
+    ::rtl::OUString canonicalURI(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.pkg://"));
     canonicalURI = canonicalURI.concat( ::rtl::Uri::encode( stringURI,
                                         rtl_UriCharClassUricNoSlash, rtl_UriEncodeCheckEscapes,
                                         RTL_TEXTENCODING_ASCII_US ) );
diff --git a/scripting/source/storage/ScriptURI.cxx b/scripting/source/storage/ScriptURI.cxx
index ead8b99f9f68..b001b1d25e67 100644
--- a/scripting/source/storage/ScriptURI.cxx
+++ b/scripting/source/storage/ScriptURI.cxx
@@ -47,7 +47,7 @@ using namespace ::com::sun::star::lang;
 
 namespace scripting_impl {
 
-static const OUString schema = OUString::createFromAscii( "vnd.sun.star.script://" );
+static const OUString schema(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.script://"));
 
 /**
  *  Constructor
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index 2f9201f4fb3d..c68c938baffa 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -208,7 +208,7 @@ void StringResourceImpl::removeModifyListener( const Reference< XModifyListener
     }
     if( !bSuccess )
     {
-        ::rtl::OUString errorMsg = ::rtl::OUString::createFromAscii( "StringResourceImpl: No entry for ResourceID: " );
+        ::rtl::OUString errorMsg(RTL_CONSTASCII_USTRINGPARAM("StringResourceImpl: No entry for ResourceID: "));
         errorMsg.concat( ResourceID );
         throw ::com::sun::star::resource::MissingResourceException( errorMsg, Reference< XInterface >() );
     }
@@ -456,7 +456,7 @@ void StringResourceImpl::implRemoveId( const ::rtl::OUString& ResourceID, Locale
         IdToStringMap::iterator it = rHashMap.find( ResourceID );
         if( it == rHashMap.end() )
         {
-            ::rtl::OUString errorMsg = ::rtl::OUString::createFromAscii( "StringResourceImpl: No entries for ResourceID: " );
+            ::rtl::OUString errorMsg(RTL_CONSTASCII_USTRINGPARAM("StringResourceImpl: No entries for ResourceID: "));
             errorMsg.concat( ResourceID );
             throw ::com::sun::star::resource::MissingResourceException( errorMsg, Reference< XInterface >() );
         }
@@ -491,7 +491,7 @@ void StringResourceImpl::newLocale( const Locale& locale )
 
     if( getItemForLocale( locale, false ) != NULL )
     {
-        ::rtl::OUString errorMsg = ::rtl::OUString::createFromAscii( "StringResourceImpl: locale already exists" );
+        ::rtl::OUString errorMsg(RTL_CONSTASCII_USTRINGPARAM("StringResourceImpl: locale already exists"));
         throw ElementExistException( errorMsg, Reference< XInterface >() );
     }
 
@@ -544,7 +544,7 @@ void StringResourceImpl::newLocale( const Locale& locale )
     }
     else
     {
-        ::rtl::OUString errorMsg = ::rtl::OUString::createFromAscii( "StringResourceImpl: Invalid locale" );
+        ::rtl::OUString errorMsg(RTL_CONSTASCII_USTRINGPARAM("StringResourceImpl: Invalid locale"));
         throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 0 );
     }
 }
@@ -649,7 +649,7 @@ sal_Int32 StringResourceImpl::getUniqueNumericId(  )
 
     if( m_nNextUniqueNumericId < UNIQUE_NUMBER_NEEDS_INITIALISATION )
     {
-        ::rtl::OUString errorMsg = ::rtl::OUString::createFromAscii( "getUniqueNumericId: Extended sal_Int32 range" );
+        ::rtl::OUString errorMsg(RTL_CONSTASCII_USTRINGPARAM("getUniqueNumericId: Extended sal_Int32 range"));
         throw NoSupportException( errorMsg, Reference< XInterface >() );
     }
     return m_nNextUniqueNumericId;
@@ -684,7 +684,7 @@ LocaleItem* StringResourceImpl::getItemForLocale
 
     if( pRetItem == NULL && bException )
     {
-        ::rtl::OUString errorMsg = ::rtl::OUString::createFromAscii( "StringResourceImpl: Invalid locale" );
+        ::rtl::OUString errorMsg(RTL_CONSTASCII_USTRINGPARAM("StringResourceImpl: Invalid locale"));
         throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 0 );
     }
     return pRetItem;
@@ -830,7 +830,7 @@ Sequence< ::rtl::OUString > StringResourcePersistenceImpl::getSupportedServiceNa
 // XInitialization base functionality for derived classes
 // -----------------------------------------------------------------------------
 
-static ::rtl::OUString aNameBaseDefaultStr = ::rtl::OUString::createFromAscii( "strings" );
+static ::rtl::OUString aNameBaseDefaultStr(RTL_CONSTASCII_USTRINGPARAM("strings"));
 
 void StringResourcePersistenceImpl::implInitializeCommonParameters
     ( const Sequence< Any >& aArguments )
@@ -839,7 +839,7 @@ void StringResourcePersistenceImpl::implInitializeCommonParameters
     bool bReadOnlyOk = (aArguments[1] >>= m_bReadOnly);
     if( !bReadOnlyOk )
     {
-        ::rtl::OUString errorMsg = ::rtl::OUString::createFromAscii( "XInitialization::initialize: Expected ReadOnly flag" );
+        ::rtl::OUString errorMsg(RTL_CONSTASCII_USTRINGPARAM("XInitialization::initialize: Expected ReadOnly flag"));
         throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 1 );
     }
 
@@ -847,14 +847,14 @@ void StringResourcePersistenceImpl::implInitializeCommonParameters
     bool bLocaleOk = (aArguments[2] >>= aCurrentLocale);
     if( !bLocaleOk )
     {
-        ::rtl::OUString errorMsg = ::rtl::OUString::createFromAscii( "XInitialization::initialize: Expected Locale" );
+        ::rtl::OUString errorMsg(RTL_CONSTASCII_USTRINGPARAM("XInitialization::initialize: Expected Locale"));
         throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 2 );
     }
 
     bool bNameBaseOk = (aArguments[3] >>= m_aNameBase);
     if( !bNameBaseOk )
     {
-        ::rtl::OUString errorMsg = ::rtl::OUString::createFromAscii( "XInitialization::initialize: Expected NameBase string" );
+        ::rtl::OUString errorMsg(RTL_CONSTASCII_USTRINGPARAM("XInitialization::initialize: Expected NameBase string"));
         throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 3 );
     }
     if( m_aNameBase.getLength() == 0 )
@@ -863,7 +863,7 @@ void StringResourcePersistenceImpl::implInitializeCommonParameters
     bool bCommentOk = (aArguments[4] >>= m_aComment);
     if( !bCommentOk )
     {
-        ::rtl::OUString errorMsg = ::rtl::OUString::createFromAscii( "XInitialization::initialize: Expected Comment string" );
+        ::rtl::OUString errorMsg(RTL_CONSTASCII_USTRINGPARAM("XInitialization::initialize: Expected Comment string"));
         throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 4 );
     }
 
@@ -1043,7 +1043,7 @@ void StringResourcePersistenceImpl::implStoreAtStorage
             if( pLocaleItem != NULL )
             {
                 ::rtl::OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem, m_aNameBase );
-                aStreamName += ::rtl::OUString::createFromAscii( ".properties" );
+                aStreamName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".properties"));
 
                 try
                 {
@@ -1065,13 +1065,13 @@ void StringResourcePersistenceImpl::implStoreAtStorage
             loadLocale( pLocaleItem ) )
         {
             ::rtl::OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem, aNameBase );
-            aStreamName += ::rtl::OUString::createFromAscii( ".properties" );
+            aStreamName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".properties"));
 
             Reference< io::XStream > xElementStream =
                     Storage->openStreamElement( aStreamName, ElementModes::READWRITE );
 
-            ::rtl::OUString aPropName = ::rtl::OUString::createFromAscii( "MediaType" );
-            ::rtl::OUString aMime = ::rtl::OUString::createFromAscii( "text/plain" );
+            ::rtl::OUString aPropName(RTL_CONSTASCII_USTRINGPARAM("MediaType"));
+            ::rtl::OUString aMime(RTL_CONSTASCII_USTRINGPARAM("text/plain"));
 
             uno::Reference< beans::XPropertySet > xProps( xElementStream, uno::UNO_QUERY );
             OSL_ENSURE( xProps.is(), "The StorageStream must implement XPropertySet interface!\n" );
@@ -1079,7 +1079,7 @@ void StringResourcePersistenceImpl::implStoreAtStorage
             {
                 xProps->setPropertyValue( aPropName, uno::makeAny( aMime ) );
 
-                aPropName = ::rtl::OUString::createFromAscii( "UseCommonStoragePasswordEncryption" );
+                aPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseCommonStoragePasswordEncryption"));
                 xProps->setPropertyValue( aPropName, uno::makeAny( sal_True ) );
             }
 
@@ -1103,7 +1103,7 @@ void StringResourcePersistenceImpl::implStoreAtStorage
             if( pLocaleItem != NULL )
             {
                 ::rtl::OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem, m_aNameBase );
-                aStreamName += ::rtl::OUString::createFromAscii( ".default" );
+                aStreamName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".default"));
 
                 try
                 {
@@ -1122,13 +1122,13 @@ void StringResourcePersistenceImpl::implStoreAtStorage
     if( m_pDefaultLocaleItem != NULL && (bStoreAll || m_bDefaultModified) )
     {
         ::rtl::OUString aStreamName = implGetFileNameForLocaleItem( m_pDefaultLocaleItem, aNameBase );
-        aStreamName += ::rtl::OUString::createFromAscii( ".default" );
+        aStreamName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".default"));
 
         Reference< io::XStream > xElementStream =
                 Storage->openStreamElement( aStreamName, ElementModes::READWRITE );
 
-        ::rtl::OUString aPropName = ::rtl::OUString::createFromAscii( "MediaType" );
-        ::rtl::OUString aMime = ::rtl::OUString::createFromAscii( "text/plain" );
+        ::rtl::OUString aPropName(RTL_CONSTASCII_USTRINGPARAM("MediaType"));
+        ::rtl::OUString aMime(RTL_CONSTASCII_USTRINGPARAM("text/plain"));
 
         // Only create stream without content
         Reference< io::XOutputStream > xOutputStream = xElementStream->getOutputStream();
@@ -1152,7 +1152,7 @@ void StringResourcePersistenceImpl::storeToURL( const ::rtl::OUString& URL,
     Reference< XMultiComponentFactory > xMCF = getMultiComponentFactory();
     Reference< ucb::XSimpleFileAccess > xFileAccess;
     xFileAccess = Reference< ucb::XSimpleFileAccess >( xMCF->createInstanceWithContext
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ),
+        ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")),
             m_xContext ), UNO_QUERY );
     if( xFileAccess.is() && Handler.is() )
         xFileAccess->setInteractionHandler( Handler );
@@ -1316,7 +1316,7 @@ BinaryOutput::BinaryOutput( Reference< XMultiComponentFactory > xMCF,
         , m_xContext( xContext )
 {
     m_xTempFile = m_xMCF->createInstanceWithContext
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ), m_xContext );
+        ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")), m_xContext );
     if( m_xTempFile.is() )
         m_xOutputStream = Reference< io::XOutputStream >( m_xTempFile, UNO_QUERY );
 }
@@ -1518,7 +1518,7 @@ public:
     Reference< io::XInputStream > getInputStreamForSection( sal_Int32 nSize );
 
     void seek( sal_Int32 nPos );
-    sal_Int32 getPosition( void )
+    sal_Int32 getPosition( void ) const
         { return m_nCurPos; }
 
     sal_Int16 readInt16( void );
@@ -1544,7 +1544,7 @@ Reference< io::XInputStream > BinaryInput::getInputStreamForSection( sal_Int32 n
     if( m_nCurPos + nSize <= m_nSize )
     {
         Reference< io::XOutputStream > xTempOut( m_xMCF->createInstanceWithContext
-            ( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ), m_xContext ), UNO_QUERY );
+            ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")), m_xContext ), UNO_QUERY );
         if( xTempOut.is() )
         {
             Sequence< sal_Int8 > aSection( m_pData + m_nCurPos, nSize );
@@ -1846,7 +1846,7 @@ bool StringResourcePersistenceImpl::implLoadLocale( LocaleItem* )
 
 ::rtl::OUString implGetNameScemeForLocaleItem( const LocaleItem* pLocaleItem )
 {
-    static ::rtl::OUString aUnder = ::rtl::OUString::createFromAscii( "_" );
+    static ::rtl::OUString aUnder(RTL_CONSTASCII_USTRINGPARAM("_"));
 
     OSL_ENSURE( pLocaleItem,
         "StringResourcePersistenceImpl::implGetNameScemeForLocaleItem(): pLocaleItem == NULL" );
@@ -2017,7 +2017,7 @@ bool StringResourcePersistenceImpl::implReadPropertiesFile
     bool bSuccess = false;
     Reference< XMultiComponentFactory > xMCF = getMultiComponentFactory();
     Reference< io::XTextInputStream > xTextInputStream( xMCF->createInstanceWithContext
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.io.TextInputStream" ), m_xContext ), UNO_QUERY );
+        ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TextInputStream")), m_xContext ), UNO_QUERY );
 
     if( xTextInputStream.is() )
     {
@@ -2229,8 +2229,8 @@ void implWriteStringWithEncoding( const ::rtl::OUString& aStr,
 bool StringResourcePersistenceImpl::implWritePropertiesFile( LocaleItem* pLocaleItem,
     const Reference< io::XOutputStream >& xOutputStream, const ::rtl::OUString& aComment )
 {
-    static ::rtl::OUString aAssignmentStr = ::rtl::OUString::createFromAscii( "=" );
-    static ::rtl::OUString aLineFeedStr = ::rtl::OUString::createFromAscii( "\n" );
+    static ::rtl::OUString aAssignmentStr(RTL_CONSTASCII_USTRINGPARAM("="));
+    static ::rtl::OUString aLineFeedStr(RTL_CONSTASCII_USTRINGPARAM("\n"));
 
     if( !xOutputStream.is() || pLocaleItem == NULL )
         return false;
@@ -2238,7 +2238,7 @@ bool StringResourcePersistenceImpl::implWritePropertiesFile( LocaleItem* pLocale
     bool bSuccess = false;
     Reference< XMultiComponentFactory > xMCF = getMultiComponentFactory();
     Reference< io::XTextOutputStream > xTextOutputStream( xMCF->createInstanceWithContext
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.io.TextOutputStream" ), m_xContext ), UNO_QUERY );
+        ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TextOutputStream")), m_xContext ), UNO_QUERY );
 
     if( xTextOutputStream.is() )
     {
@@ -2402,7 +2402,7 @@ void StringResourceWithStorageImpl::initialize( const Sequence< Any >& aArgument
 
     if( !bOk )
     {
-        ::rtl::OUString errorMsg = ::rtl::OUString::createFromAscii( "StringResourceWithStorageImpl::initialize: invalid storage" );
+        ::rtl::OUString errorMsg(RTL_CONSTASCII_USTRINGPARAM("StringResourceWithStorageImpl::initialize: invalid storage"));
         throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 0 );
     }
 
@@ -2593,8 +2593,8 @@ void StringResourceWithStorageImpl::setStorage( const Reference< XStorage >& Sto
 
     if( !Storage.is() )
     {
-        ::rtl::OUString errorMsg = ::rtl::OUString::createFromAscii
-            ( "StringResourceWithStorageImpl::setStorage: invalid storage" );
+        ::rtl::OUString errorMsg(RTL_CONSTASCII_USTRINGPARAM
+            ( "StringResourceWithStorageImpl::setStorage: invalid storage" ));
         throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 0 );
     }
 
@@ -2744,12 +2744,12 @@ void StringResourceWithLocationImpl::initialize( const Sequence< Any >& aArgumen
     else
     {
         if( m_aLocation.getStr()[nLen - 1] != '/' )
-            m_aLocation += ::rtl::OUString::createFromAscii( "/" );
+            m_aLocation += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     }
 
     if( !bOk )
     {
-        ::rtl::OUString errorMsg = ::rtl::OUString::createFromAscii( "XInitialization::initialize: invalid URL" );
+        ::rtl::OUString errorMsg(RTL_CONSTASCII_USTRINGPARAM("XInitialization::initialize: invalid URL"));
         throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 0 );
     }
 
@@ -2757,7 +2757,7 @@ void StringResourceWithLocationImpl::initialize( const Sequence< Any >& aArgumen
     bOk = (aArguments[5] >>= m_xInteractionHandler);
     if( !bOk )
     {
-        ::rtl::OUString errorMsg = ::rtl::OUString::createFromAscii( "StringResourceWithStorageImpl::initialize: invalid type" );
+        ::rtl::OUString errorMsg(RTL_CONSTASCII_USTRINGPARAM("StringResourceWithStorageImpl::initialize: invalid type"));
         throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 5 );
     }
 
@@ -2953,8 +2953,8 @@ void StringResourceWithLocationImpl::setURL( const ::rtl::OUString& URL )
     sal_Int32 nLen = URL.getLength();
     if( nLen == 0 )
     {
-        ::rtl::OUString errorMsg = ::rtl::OUString::createFromAscii
-            ( "StringResourceWithLocationImpl::setURL: invalid URL" );
+        ::rtl::OUString errorMsg(RTL_CONSTASCII_USTRINGPARAM
+            ( "StringResourceWithLocationImpl::setURL: invalid URL" ));
         throw IllegalArgumentException( errorMsg, Reference< XInterface >(), 0 );
     }
 
@@ -3023,7 +3023,7 @@ const Reference< ucb::XSimpleFileAccess > StringResourceWithLocationImpl::getFil
     {
         Reference< XMultiComponentFactory > xMCF = getMultiComponentFactory();
         m_xSFI = Reference< ucb::XSimpleFileAccess >( xMCF->createInstanceWithContext
-            ( ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ), m_xContext ), UNO_QUERY );
+            ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")), m_xContext ), UNO_QUERY );
 
         if( m_xSFI.is() && m_xInteractionHandler.is() )
             m_xSFI->setInteractionHandler( m_xInteractionHandler );
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index cfd1dad6b6cc..5676a0d401ea 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -56,6 +56,7 @@
 #include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/script/ScriptEventDescriptor.hpp>
 #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>
+#include <com/sun/star/script/vba/XVBACompatibility.hpp>
 
 #include <com/sun/star/container/XNamed.hpp>
 
@@ -116,7 +117,7 @@ using namespace ::ooo::vba;
 #define GET_TYPE(x) ::getCppuType((uno::Reference< x > *)0);
 
 // Some constants
-const static rtl::OUString DELIM = rtl::OUString::createFromAscii( "::" );
+const static rtl::OUString DELIM(RTL_CONSTASCII_USTRINGPARAM("::"));
 const static sal_Int32 DELIMLEN = DELIM.getLength();
 
 bool isKeyEventOk( awt::KeyEvent& evt, const Sequence< Any >& params )
@@ -413,8 +414,8 @@ eventMethodToDescriptor( const ::rtl::OUString& rEventMethod, ScriptEventDescrip
 
         // set this it VBAInterop, ensures that it doesn't
         // get persisted or shown in property editors
-        evtDesc.ScriptType = rtl::OUString::createFromAscii(
-            "VBAInterop" );
+        evtDesc.ScriptType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "VBAInterop" ));
         return true;
     }
     return false;
@@ -521,18 +522,18 @@ public:
 
     virtual void SAL_CALL insertByName( const ::rtl::OUString&, const Any& ) throw (lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, RuntimeException)
     {
-        throw RuntimeException( rtl::OUString::createFromAscii( "ReadOnly container" ), Reference< XInterface >() );
+        throw RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly container")), Reference< XInterface >() );
 
     }
     virtual void SAL_CALL removeByName( const ::rtl::OUString& ) throw (::com::sun::star::container::NoSuchElementException, lang::WrappedTargetException, RuntimeException)
     {
-        throw RuntimeException( rtl::OUString::createFromAscii( "ReadOnly container" ), Reference< XInterface >() );
+        throw RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly container")), Reference< XInterface >() );
     }
 
     // XNameReplace
     virtual void SAL_CALL replaceByName( const ::rtl::OUString&, const Any& ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, RuntimeException)
     {
-        throw RuntimeException( rtl::OUString::createFromAscii( "ReadOnly container" ), Reference< XInterface >() );
+        throw RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly container")), Reference< XInterface >() );
 
     }
 
@@ -688,9 +689,9 @@ private:
 
     Reference< XComponentContext > m_xContext;
     Reference< frame::XModel > m_xModel;
-    SfxObjectShell* mpShell;
     sal_Bool m_bDocClosed;
-
+    SfxObjectShell* mpShell;
+    rtl::OUString msProject;
 };
 
 EventListener::EventListener( const Reference< XComponentContext >& rxContext ) :
@@ -698,7 +699,7 @@ OPropertyContainer(GetBroadcastHelper()), m_xContext( rxContext ), m_bDocClosed(
 {
     registerProperty( EVENTLSTNR_PROPERTY_MODEL, EVENTLSTNR_PROPERTY_ID_MODEL,
         beans::PropertyAttribute::TRANSIENT, &m_xModel, ::getCppuType( &m_xModel ) );
-
+    msProject = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Standard"));
 }
 
 void
@@ -716,6 +717,14 @@ EventListener::setShellFromModel()
         }
         pShell = SfxObjectShell::GetNext( *pShell );
     }
+    // set ProjectName from model
+    try
+    {
+        uno::Reference< beans::XPropertySet > xProps( m_xModel, UNO_QUERY_THROW );
+        uno::Reference< script::vba::XVBACompatibility > xVBAMode( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BasicLibraries") ) ), uno::UNO_QUERY_THROW );
+        msProject = xVBAMode->getProjectName();
+    }
+    catch ( uno::Exception& ) {}
 }
 
 //XEventListener
@@ -772,13 +781,13 @@ EventListener::approveFiring(const ScriptEvent& evt) throw(reflection::Invocatio
 
 // XCloseListener
 void SAL_CALL
-EventListener::queryClosing( const lang::EventObject& Source, ::sal_Bool GetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException)
+EventListener::queryClosing( const lang::EventObject& /*Source*/, ::sal_Bool /*GetsOwnership*/ ) throw (util::CloseVetoException, uno::RuntimeException)
 {
     //Nothing to do
 }
 
 void SAL_CALL
-EventListener::notifyClosing( const lang::EventObject& Source ) throw (uno::RuntimeException)
+EventListener::notifyClosing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException)
 {
     m_bDocClosed = sal_True;
     uno::Reference< util::XCloseBroadcaster > xCloseBroadcaster( m_xModel, uno::UNO_QUERY );
@@ -915,7 +924,7 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce
 {
     OSL_TRACE("EventListener::firing_Impl( FAKE VBA_EVENTS )");
     static const ::rtl::OUString vbaInterOp =
-        ::rtl::OUString::createFromAscii("VBAInterop");
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VBAInterop"));
 
     // let default handlers deal with non vba stuff
     if ( !evt.ScriptType.equals( vbaInterOp ) )
@@ -931,36 +940,34 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce
     uno::Reference< awt::XDialog > xDlg( aEvent.Source, uno::UNO_QUERY );
     if ( !xDlg.is() )
     {
-    OSL_TRACE("Getting Control");
+        OSL_TRACE("Getting Control");
         // evt.Source is
         // a) Dialog
         // b) xShapeControl ( from api (sheet control) )
         // c) eventmanager ( I guess )
         // d) vba control ( from api also )
-    uno::Reference< drawing::XControlShape > xCntrlShape( evt.Source, uno::UNO_QUERY );
-    uno::Reference< awt::XControl > xControl( aEvent.Source, uno::UNO_QUERY );
-    if ( xCntrlShape.is() )
-    {
-                // for sheet controls ( that fire from the api ) we don't
-                // have the real control ( thats only available from the view )
-                // api code creates just a control instance that is transferred
-                // via aEvent.Arguments[ 0 ] that control though has no
-                // info like name etc.
-        uno::Reference< drawing::XControlShape >  xCntrlShape( evt.Source, UNO_QUERY_THROW );
-        OSL_TRACE("Got control shape");
-        uno::Reference< container::XNamed > xName( xCntrlShape->getControl(), uno::UNO_QUERY_THROW );
-        OSL_TRACE("Got xnamed ");
-        sName = xName->getName();
-    }
-    else
+        uno::Reference< drawing::XControlShape > xCntrlShape( evt.Source, uno::UNO_QUERY );
+        uno::Reference< awt::XControl > xControl( aEvent.Source, uno::UNO_QUERY );
+        if ( xCntrlShape.is() )
         {
-                // Userform control ( fired from the api or from event manager )
-        uno::Reference< beans::XPropertySet > xProps;
-        OSL_TRACE("Getting properties");
-        xProps.set( xControl->getModel(), uno::UNO_QUERY_THROW );
-        xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Name") ) ) >>= sName;
-    }
-
+            // for sheet controls ( that fire from the api ) we don't
+            // have the real control ( thats only available from the view )
+            // api code creates just a control instance that is transferred
+            // via aEvent.Arguments[ 0 ] that control though has no
+            // info like name etc.
+            OSL_TRACE("Got control shape");
+            uno::Reference< container::XNamed > xName( xCntrlShape->getControl(), uno::UNO_QUERY_THROW );
+            OSL_TRACE("Got xnamed ");
+            sName = xName->getName();
+        }
+        else
+        {
+            // Userform control ( fired from the api or from event manager )
+            uno::Reference< beans::XPropertySet > xProps;
+            OSL_TRACE("Getting properties");
+            xProps.set( xControl->getModel(), uno::UNO_QUERY_THROW );
+            xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Name") ) ) >>= sName;
+        }
     }
     //dumpEvent( evt );
     EventInfoHash& infos = getEventTransInfo();
@@ -984,7 +991,6 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce
             eventInfo_it->second.begin();
         std::list< TranslateInfo >::const_iterator txInfo_end = eventInfo_it->second.end();
 
-        StarBASIC* pBasic = mpShell->GetBasic();
         BasicManager* pBasicManager = mpShell->GetBasicManager();
         rtl::OUString sProject;
         rtl::OUString sScriptCode( evt.ScriptCode );
@@ -992,8 +998,8 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce
     if ( sScriptCode.indexOf( '.' ) == -1 )
     {
        //'Project' is a better default but I want to force failures
-       //rtl::OUString sMacroLoc = rtl::OUString::createFromAscii("Project");
-        sProject = rtl::OUString::createFromAscii("Standard");
+       //rtl::OUString sMacroLoc(RTL_CONSTASCII_USTRINGPARAM("Project"));
+        sProject = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Standard"));
 
         if ( pBasicManager->GetName().Len() > 0 )
             sProject =  pBasicManager->GetName();
@@ -1005,8 +1011,8 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce
         sScriptCode = sScriptCode.copy( nIndex + 1 );
     }
         rtl::OUString sMacroLoc = sProject;
-        sMacroLoc = sMacroLoc.concat(  rtl::OUString::createFromAscii(".") );
-        sMacroLoc = sMacroLoc.concat( sScriptCode ).concat( rtl::OUString::createFromAscii(".") );
+        sMacroLoc = sMacroLoc.concat(  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")) );
+        sMacroLoc = sMacroLoc.concat( sScriptCode ).concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")) );
 
         OSL_TRACE("sMacroLoc is %s", rtl::OUStringToOString( sMacroLoc, RTL_TEXTENCODING_UTF8 ).getStr() );
         for ( ; txInfo != txInfo_end; ++txInfo )
@@ -1051,7 +1057,7 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce
                             RTL_TEXTENCODING_UTF8 ).getStr() );
                     try
                     {
-                        uno::Any aDummyCaller = uno::makeAny( rtl::OUString::createFromAscii("Error") );
+                        uno::Any aDummyCaller = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Error")) );
                         if ( pRet )
                             ooo::vba::executeMacro( mpShell, url, aArguments, *pRet, aDummyCaller );
                         else
diff --git a/scripting/source/vbaevents/vbamsformreturntypes.hxx b/scripting/source/vbaevents/vbamsformreturntypes.hxx
index 4f3e26b32fa4..82e6ddce8ff4 100644
--- a/scripting/source/vbaevents/vbamsformreturntypes.hxx
+++ b/scripting/source/vbaevents/vbamsformreturntypes.hxx
@@ -50,7 +50,7 @@ public:
     virtual void SAL_CALL setValue( ::sal_Bool _value ) throw (::com::sun::star::uno::RuntimeException) { Value = _value; }
 
     // XDefaultProperty
-    ::rtl::OUString SAL_CALL getDefaultPropertyName() throw (com::sun::star::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
+    ::rtl::OUString SAL_CALL getDefaultPropertyName() throw (com::sun::star::uno::RuntimeException) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); }
 };
 
 
@@ -69,7 +69,7 @@ public:
     virtual void SAL_CALL setValue( ::sal_Int32 _value ) throw (::com::sun::star::uno::RuntimeException) { Value = _value; }
 
     // XDefaultProperty
-    ::rtl::OUString SAL_CALL getDefaultPropertyName() throw (com::sun::star::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
+    ::rtl::OUString SAL_CALL getDefaultPropertyName() throw (com::sun::star::uno::RuntimeException) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); }
 };
 #endif
 
diff --git a/scripting/util/provider/beanshell/delzip b/scripting/util/provider/beanshell/delzip
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/scripting/util/provider/beanshell/delzip
diff --git a/scripting/util/provider/beanshell/description.xml b/scripting/util/provider/beanshell/description.xml
new file mode 100644
index 000000000000..6b053188bf0a
--- /dev/null
+++ b/scripting/util/provider/beanshell/description.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<description
+  xmlns="http://openoffice.org/extensions/description/2006"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns:dep="http://openoffice.org/extensions/description/2006">
+
+  <identifier value="com.sun.star.script.provider.ScriptProviderForBeanShell"/>
+
+  <dependencies>
+    <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
+  </dependencies>
+
+  <version value="3.3.0"/>
+
+  <publisher>
+    <name xlink:href="http://www.documentfoundation.org" lang="en">The
+      Document Foundation</name>
+  </publisher>
+
+  <display-name>
+    <name lang="en">Script provider for BeanShell</name>
+  </display-name>
+
+</description>
diff --git a/scripting/util/provider/beanshell/makefile.mk b/scripting/util/provider/beanshell/makefile.mk
new file mode 100644
index 000000000000..7e16329fda34
--- /dev/null
+++ b/scripting/util/provider/beanshell/makefile.mk
@@ -0,0 +1,48 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Red Hat, Inc.
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): David Tardon <dtardon@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+PRJ=..$/..$/..
+
+PRJNAME=scripting
+TARGET=bshprov
+
+.INCLUDE : settings.mk
+
+.IF "$(L10N_framework)"=="" && "$(SOLAR_JAVA)"!=""
+
+EXTENSIONNAME:=ScriptProviderForBeanShell
+EXTENSION_ZIPNAME:=script-provider-for-beanshell
+
+COMPONENT_JARFILES=$(EXTENSIONDIR)$/$(EXTENSIONNAME).jar
+
+.INCLUDE : extension_pre.mk
+.INCLUDE : target.mk
+.INCLUDE : extension_post.mk
+
+.ELSE
+
+.INCLUDE : target.mk
+
+.ENDIF
diff --git a/scripting/util/provider/beanshell/manifest.xml b/scripting/util/provider/beanshell/manifest.xml
new file mode 100644
index 000000000000..da8e620281a0
--- /dev/null
+++ b/scripting/util/provider/beanshell/manifest.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
+<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
+  <manifest:file-entry
+    manifest:media-type="application/vnd.sun.star.uno-component;type=java"
+    manifest:full-path="ScriptProviderForBeanShell.jar"/>
+</manifest:manifest>
diff --git a/scripting/util/provider/javascript/delzip b/scripting/util/provider/javascript/delzip
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/scripting/util/provider/javascript/delzip
diff --git a/scripting/util/provider/javascript/description.xml b/scripting/util/provider/javascript/description.xml
new file mode 100644
index 000000000000..58f047891f9f
--- /dev/null
+++ b/scripting/util/provider/javascript/description.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<description
+  xmlns="http://openoffice.org/extensions/description/2006"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns:dep="http://openoffice.org/extensions/description/2006">
+
+  <identifier value="com.sun.star.script.provider.ScriptProviderForJavaScript"/>
+
+  <dependencies>
+    <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
+  </dependencies>
+
+  <version value="3.3.0"/>
+
+  <publisher>
+    <name xlink:href="http://www.documentfoundation.org" lang="en">The
+      Document Foundation</name>
+  </publisher>
+
+  <display-name>
+    <name lang="en">Script provider for JavaScript</name>
+  </display-name>
+
+</description>
diff --git a/scripting/util/provider/javascript/makefile.mk b/scripting/util/provider/javascript/makefile.mk
new file mode 100644
index 000000000000..a99096a626ec
--- /dev/null
+++ b/scripting/util/provider/javascript/makefile.mk
@@ -0,0 +1,55 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Red Hat, Inc.
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): David Tardon <dtardon@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+PRJ=..$/..$/..
+
+PRJNAME=scripting
+TARGET=jsprov
+
+.INCLUDE : settings.mk
+
+.IF "$(L10N_framework)"=="" && "$(SOLAR_JAVA)"!=""
+
+EXTENSIONNAME:=ScriptProviderForJavaScript
+EXTENSION_ZIPNAME:=script-provider-for-javascript
+
+COMPONENT_JARFILES=$(EXTENSIONDIR)$/$(EXTENSIONNAME).jar
+EXTENSION_PACKDEPS=$(SOLARBINDIR)$/js.jar
+
+.INCLUDE : extension_pre.mk
+.INCLUDE : target.mk
+.INCLUDE : extension_post.mk
+
+ALLTAR : $(EXTENSIONDIR)$/js.jar
+
+$(EXTENSIONDIR)$/js.jar : $(SOLARBINDIR)$/js.jar
+    @@-$(MKDIRHIER) $(@:d)
+    $(COMMAND_ECHO)$(COPY) $< $@
+
+.ELSE
+
+.INCLUDE : target.mk
+
+.ENDIF
diff --git a/scripting/util/provider/javascript/manifest.xml b/scripting/util/provider/javascript/manifest.xml
new file mode 100644
index 000000000000..4c61747f4dcf
--- /dev/null
+++ b/scripting/util/provider/javascript/manifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
+<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
+  <manifest:file-entry
+    manifest:media-type="application/vnd.sun.star.uno-component;type=java"
+    manifest:full-path="js.jar"/>
+  <manifest:file-entry
+    manifest:media-type="application/vnd.sun.star.uno-component;type=java"
+    manifest:full-path="ScriptProviderForJavaScript.jar"/>
+</manifest:manifest>
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index eb622351dc1b..eb622351dc1b 100755..100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
diff --git a/sd/prj/build.lst b/sd/prj/build.lst
index 6b4f478b7c20..441bedde2805 100644
--- a/sd/prj/build.lst
+++ b/sd/prj/build.lst
@@ -1,4 +1,4 @@
-sd      sd      :    filter l10n animations svx sfx2 stoc canvas NULL
+sd      sd      :    filter l10n animations svx sfx2 stoc canvas oox NULL
 sd	sd										usr1	-	all	sd_mkout NULL
 sd	sd\inc									nmake		-	all	sd_inc NULL
 sd	sd\prj									get		-	all	sd_prj NULL
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index 0c51d6739187..f97ce257b8d9 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -314,7 +314,7 @@ sal_Int32 CustomAnimationEffect::getNumberOfSubitems( const Any& aTarget, sal_In
         {
             // TODO/LATER: Optimize this, don't create a break iterator each time
             Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory() );
-            Reference < i18n::XBreakIterator > xBI( xMSF->createInstance( OUString::createFromAscii( "com.sun.star.i18n.BreakIterator" ) ), UNO_QUERY );
+            Reference < i18n::XBreakIterator > xBI( xMSF->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.BreakIterator" )) ), UNO_QUERY );
             DBG_ASSERT( xBI.is(), "sd::CustomAnimationEffect::getNumberOfSubitems(), could not create a 'com.sun.star.i18n.BreakIterator'!" );
 
             if( xBI.is() )
@@ -3401,7 +3401,7 @@ void MainSequence::reset()
     EffectSequenceHelper::reset();
 
     InteractiveSequenceList::iterator aIter;
-    for( aIter = maInteractiveSequenceList.begin(); aIter != maInteractiveSequenceList.end(); aIter++ )
+    for( aIter = maInteractiveSequenceList.begin(); aIter != maInteractiveSequenceList.end(); ++aIter )
         (*aIter)->reset();
     maInteractiveSequenceList.clear();
 
@@ -3454,7 +3454,7 @@ CustomAnimationEffectPtr MainSequence::findEffect( const ::com::sun::star::uno::
     if( pEffect.get() == 0 )
     {
         InteractiveSequenceList::const_iterator aIter;
-        for( aIter = maInteractiveSequenceList.begin(); (aIter != maInteractiveSequenceList.end()) && (pEffect.get() == 0); aIter++ )
+        for( aIter = maInteractiveSequenceList.begin(); (aIter != maInteractiveSequenceList.end()) && (pEffect.get() == 0); ++aIter )
         {
             pEffect = (*aIter)->findEffect( xNode );
         }
@@ -3474,7 +3474,7 @@ sal_Int32 MainSequence::getOffsetFromEffect( const CustomAnimationEffectPtr& pEf
     nOffset = EffectSequenceHelper::getCount();
 
     InteractiveSequenceList::const_iterator aIter;
-    for( aIter = maInteractiveSequenceList.begin(); aIter != maInteractiveSequenceList.end(); aIter++ )
+    for( aIter = maInteractiveSequenceList.begin(); aIter != maInteractiveSequenceList.end(); ++aIter )
     {
         sal_Int32 nTemp = (*aIter)->getOffsetFromEffect( pEffect );
         if( nTemp != -1 )
@@ -3563,7 +3563,7 @@ void MainSequence::insertTextRange( const com::sun::star::uno::Any& aTarget )
     EffectSequenceHelper::insertTextRange( aTarget );
 
     InteractiveSequenceList::iterator aIter;
-    for( aIter = maInteractiveSequenceList.begin(); aIter != maInteractiveSequenceList.end(); aIter++ )
+    for( aIter = maInteractiveSequenceList.begin(); aIter != maInteractiveSequenceList.end(); ++aIter )
     {
         (*aIter)->insertTextRange( aTarget );
     }
@@ -3575,7 +3575,7 @@ void MainSequence::disposeTextRange( const com::sun::star::uno::Any& aTarget )
     EffectSequenceHelper::disposeTextRange( aTarget );
 
     InteractiveSequenceList::iterator aIter;
-    for( aIter = maInteractiveSequenceList.begin(); aIter != maInteractiveSequenceList.end(); aIter++ )
+    for( aIter = maInteractiveSequenceList.begin(); aIter != maInteractiveSequenceList.end(); ++aIter )
     {
         (*aIter)->disposeTextRange( aTarget );
     }
@@ -3589,7 +3589,7 @@ void MainSequence::onTextChanged( const Reference< XShape >& xShape )
     EffectSequenceHelper::onTextChanged( xShape );
 
     InteractiveSequenceList::iterator aIter;
-    for( aIter = maInteractiveSequenceList.begin(); aIter != maInteractiveSequenceList.end(); aIter++ )
+    for( aIter = maInteractiveSequenceList.begin(); aIter != maInteractiveSequenceList.end(); ++aIter )
     {
         (*aIter)->onTextChanged( xShape );
     }
@@ -3602,7 +3602,7 @@ void EffectSequenceHelper::onTextChanged( const Reference< XShape >& xShape )
     bool bChanges = false;
 
     EffectSequence::iterator aIter;
-    for( aIter = maEffects.begin(); aIter != maEffects.end(); aIter++ )
+    for( aIter = maEffects.begin(); aIter != maEffects.end(); ++aIter )
     {
         if( (*aIter)->getTargetShape() == xShape )
             bChanges |= (*aIter)->checkForText();
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index 8644c9bf625e..9926b708f0a6 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -275,7 +275,7 @@ Reference< XAnimationNode > implImportEffects( const Reference< XMultiServiceFac
         // get parser
         Reference< xml::sax::XParser > xParser(
             xServiceFactory->createInstance(
-                OUString::createFromAscii("com.sun.star.xml.sax.Parser") ),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) ),
             UNO_QUERY );
 
         DBG_ASSERT( xParser.is(), "Can't create parser" );
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx
index 61b1a4c502d2..50dc2f7dccad 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -416,7 +416,7 @@ EffectSequence::iterator ImplFindEffect( MainSequencePtr& pMainSequence, const R
 {
     EffectSequence::iterator aIter;
 
-    for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); aIter++ )
+    for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter )
     {
         CustomAnimationEffectPtr pEffect( (*aIter) );
         if( (pEffect->getTargetShape() == rShape) && (pEffect->getTargetSubItem() == nSubItem) )
@@ -567,7 +567,7 @@ AnimationEffect EffectMigration::GetAnimationEffect( SvxShape* pShape )
 
         EffectSequence::iterator aIter;
 
-        for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); aIter++ )
+        for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter )
         {
             CustomAnimationEffectPtr pEffect( (*aIter) );
             if( pEffect->getTargetShape() == xShape )
@@ -707,7 +707,7 @@ void EffectMigration::SetTextAnimationEffect( SvxShape* pShape, AnimationEffect
             const EffectSequence& rEffects = pGroup->getEffects();
 
             EffectSequence::const_iterator aIter;
-            for( aIter = rEffects.begin(); aIter != rEffects.end(); aIter++ )
+            for( aIter = rEffects.begin(); aIter != rEffects.end(); ++aIter )
             {
                 // only work on paragraph targets
                 if( (*aIter)->getTarget().getValueType() == ::getCppuType((const ParagraphTarget*)0) )
@@ -856,7 +856,7 @@ void EffectMigration::SetAnimationSpeed( SvxShape* pShape, AnimationSpeed eSpeed
     EffectSequence::iterator aIter;
     bool bNeedRebuild = false;
 
-    for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); aIter++ )
+    for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter )
     {
         CustomAnimationEffectPtr pEffect( (*aIter) );
         if( pEffect->getTargetShape() == xShape )
@@ -884,7 +884,7 @@ AnimationSpeed EffectMigration::GetAnimationSpeed( SvxShape* pShape )
 
     double fDuration = 1.0;
 
-    for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); aIter++ )
+    for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter )
     {
         CustomAnimationEffectPtr pEffect( (*aIter) );
         if( pEffect->getTargetShape() == xShape )
@@ -936,7 +936,7 @@ void EffectMigration::SetDimColor( SvxShape* pShape, sal_Int32 nColor )
     EffectSequence::iterator aIter;
     bool bNeedRebuild = false;
 
-    for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); aIter++ )
+    for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter )
     {
         CustomAnimationEffectPtr pEffect( (*aIter) );
         if( pEffect->getTargetShape() == xShape )
@@ -967,7 +967,7 @@ sal_Int32 EffectMigration::GetDimColor( SvxShape* pShape )
             const Reference< XShape > xShape( pShape );
             EffectSequence::iterator aIter;
 
-            for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); aIter++ )
+            for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter )
             {
                 CustomAnimationEffectPtr pEffect( (*aIter) );
                 if( (pEffect->getTargetShape() == xShape) &&
@@ -1007,7 +1007,7 @@ void EffectMigration::SetDimHide( SvxShape* pShape, sal_Bool bDimHide )
     EffectSequence::iterator aIter;
     bool bNeedRebuild = false;
 
-    for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); aIter++ )
+    for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter )
     {
         CustomAnimationEffectPtr pEffect( (*aIter) );
         if( pEffect->getTargetShape() == xShape )
@@ -1039,7 +1039,7 @@ sal_Bool EffectMigration::GetDimHide( SvxShape* pShape )
             const Reference< XShape > xShape( pShape );
 
             EffectSequence::iterator aIter;
-            for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); aIter++ )
+            for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter )
             {
                 CustomAnimationEffectPtr pEffect( (*aIter) );
                 if( pEffect->getTargetShape() == xShape )
@@ -1081,7 +1081,7 @@ void EffectMigration::SetDimPrevious( SvxShape* pShape, sal_Bool bDimPrevious )
     EffectSequence::iterator aIter;
     bool bNeedRebuild = false;
 
-    for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); aIter++ )
+    for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter )
     {
         CustomAnimationEffectPtr pEffect( (*aIter) );
         if( pEffect->getTargetShape() == xShape )
@@ -1113,7 +1113,7 @@ sal_Bool EffectMigration::GetDimPrevious( SvxShape* pShape )
             const Reference< XShape > xShape( pShape );
 
             EffectSequence::iterator aIter;
-            for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); aIter++ )
+            for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter )
             {
                 CustomAnimationEffectPtr pEffect( (*aIter) );
                 if( pEffect->getTargetShape() == xShape )
@@ -1152,7 +1152,7 @@ void EffectMigration::SetPresentationOrder( SvxShape* pShape, sal_Int32 nNewPos
 
         EffectSequence::iterator aIter( rSequence.begin() );
         EffectSequence::iterator aEnd( rSequence.end() );
-        for( nPos = 0; aIter != aEnd; aIter++ )
+        for( nPos = 0; aIter != aEnd; ++aIter )
         {
             CustomAnimationEffectPtr pEffect = (*aIter);
 
@@ -1241,7 +1241,7 @@ sal_Int32 EffectMigration::GetPresentationOrder( SvxShape* pShape )
 
     EffectSequence::iterator aIter( rSequence.begin() );
     EffectSequence::iterator aEnd( rSequence.end() );
-    for( ; aIter != aEnd; aIter++ )
+    for( ; aIter != aEnd; ++aIter )
     {
         CustomAnimationEffectPtr pEffect = (*aIter);
 
@@ -1280,7 +1280,7 @@ void EffectMigration::UpdateSoundEffect( SvxShape* pShape, SdAnimationInfo* pInf
         if( pInfo->mbSoundOn )
             aSoundFile = pInfo->maSoundFile;
 
-        for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); aIter++ )
+        for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter )
         {
             CustomAnimationEffectPtr pEffect( (*aIter) );
             if( pEffect->getTargetShape() == xShape )
@@ -1321,7 +1321,7 @@ OUString EffectMigration::GetSoundFile( SvxShape* pShape )
 
             for(    aIter = pMainSequence->getBegin();
                     (aSoundFile.getLength() == 0) && (aIter != pMainSequence->getEnd());
-                    aIter++ )
+                    ++aIter )
             {
                 CustomAnimationEffectPtr pEffect( (*aIter) );
                 if( pEffect->getTargetShape() == xShape )
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 2d53d55b0787..05aa502d67d6 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -209,49 +209,24 @@ USHORT SdDrawDocument::GetPageByName(const String& rPgName, BOOL& rbIsMasterPage
     return nPageNum;
 }
 
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 SdPage* SdDrawDocument::GetSdPage(USHORT nPgNum, PageKind ePgKind) const
 {
     // #109538#
     return mpDrawPageListWatcher->GetSdPage(ePgKind, sal_uInt32(nPgNum));
 }
 
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 USHORT SdDrawDocument::GetSdPageCount(PageKind ePgKind) const
 {
     // #109538#
     return (sal_uInt16)mpDrawPageListWatcher->GetSdPageCount(ePgKind);
 }
 
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 SdPage* SdDrawDocument::GetMasterSdPage(USHORT nPgNum, PageKind ePgKind)
 {
     // #109538#
     return mpMasterPageListWatcher->GetSdPage(ePgKind, sal_uInt32(nPgNum));
 }
 
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 USHORT SdDrawDocument::GetMasterSdPageCount(PageKind ePgKind) const
 {
     // #109538#
@@ -1100,13 +1075,6 @@ SdAnimationInfo* SdDrawDocument::GetShapeUserData(SdrObject& rObject, bool bCrea
     return pRet;
 }
 
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 SdIMapInfo* SdDrawDocument::GetIMapInfo( SdrObject* pObject ) const
 {
     DBG_ASSERT(pObject, "ohne Objekt keine IMapInfo");
@@ -1127,13 +1095,6 @@ SdIMapInfo* SdDrawDocument::GetIMapInfo( SdrObject* pObject ) const
     return pIMapInfo;
 }
 
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 IMapObject* SdDrawDocument::GetHitIMapObject( SdrObject* pObj,
                                               const Point& rWinPoint,
                                               const ::Window& /* rCmpWnd */ )
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 2b86af1e09c9..2f827ddf239a 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -1129,8 +1129,6 @@ BOOL SdDrawDocument::InsertBookmarkAsObject(
 
         delete pView;
 
-        List* pList = pBookmarkList;
-
         if (pExchangeList)
         {
             // Anzahl Objekte nach dem Einfuegen bestimmen
@@ -1151,8 +1149,6 @@ BOOL SdDrawDocument::InsertBookmarkAsObject(
 
                 pExchangeList->Next();
             }
-
-            pList = pExchangeList;
         }
     }
 
@@ -1728,9 +1724,8 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum,
         if (pSourceDoc != this)
         {
             // Aus dem Source-Dokument austragen
-            SdrPage* pTest = NULL;
-            pTest = pSourceDoc->RemoveMasterPage(pNotesMaster->GetPageNum());
-            pTest = pSourceDoc->RemoveMasterPage(pMaster->GetPageNum());
+            pSourceDoc->RemoveMasterPage(pNotesMaster->GetPageNum());
+            pSourceDoc->RemoveMasterPage(pMaster->GetPageNum());
         }
 
         /*********************************************************************
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 22270930ed28..ee87e41b5ecf 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -1374,12 +1374,6 @@ void SdDrawDocument::SetTextDefaults() const
     pItemPool->SetPoolDefaultItem( aNumBulletItem );
 }
 
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 ::com::sun::star::text::WritingMode SdDrawDocument::GetDefaultWritingMode() const
 {
     const SfxPoolItem*                  pItem = ( pItemPool ? pItemPool->GetPoolDefaultItem( EE_PARA_WRITINGDIR ) : NULL );
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 16469e7b8d44..936edfaf5233 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1710,12 +1710,6 @@ void SdPage::onRemoveObject( SdrObject* pObject )
     }
 }
 
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 void SdPage::SetSize(const Size& aSize)
 {
     Size aOldSize = GetSize();
@@ -1740,13 +1734,6 @@ void SdPage::SetSize(const Size& aSize)
     }
 }
 
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 void SdPage::SetBorder(INT32 nLft, INT32 nUpp, INT32 nRgt, INT32 nLwr)
 {
     if (nLft != GetLftBorder() || nUpp != GetUppBorder() ||
@@ -1756,13 +1743,6 @@ void SdPage::SetBorder(INT32 nLft, INT32 nUpp, INT32 nRgt, INT32 nLwr)
     }
 }
 
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 void SdPage::SetLftBorder(INT32 nBorder)
 {
     if (nBorder != GetLftBorder() )
@@ -1771,13 +1751,6 @@ void SdPage::SetLftBorder(INT32 nBorder)
     }
 }
 
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 void SdPage::SetRgtBorder(INT32 nBorder)
 {
     if (nBorder != GetRgtBorder() )
@@ -1786,13 +1759,6 @@ void SdPage::SetRgtBorder(INT32 nBorder)
     }
 }
 
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 void SdPage::SetUppBorder(INT32 nBorder)
 {
     if (nBorder != GetUppBorder() )
@@ -1801,13 +1767,6 @@ void SdPage::SetUppBorder(INT32 nBorder)
     }
 }
 
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 void SdPage::SetLwrBorder(INT32 nBorder)
 {
     if (nBorder != GetLwrBorder() )
@@ -2644,23 +2603,11 @@ const String& SdPage::GetName() const
     return maCreatedPageName;
 }
 
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 void SdPage::SetOrientation( Orientation eOrient)
 {
     meOrientation = eOrient;
 }
 
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 Orientation SdPage::GetOrientation() const
 {
     return meOrientation;
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index bd1e389cf5df..38a3dce90270 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -88,7 +88,7 @@ PresStyleMap& SdStyleFamilyImpl::getStyleSheets()
             maStyleSheets.clear();
 
             const SfxStyles& rStyles = mxPool->GetStyles();
-            for( SfxStyles::const_iterator iter( rStyles.begin() ); iter != rStyles.end(); iter++ )
+            for( SfxStyles::const_iterator iter( rStyles.begin() ); iter != rStyles.end(); ++iter )
             {
                 SdStyleSheet* pStyle = static_cast< SdStyleSheet* >( (*iter).get() );
                 if( pStyle && (pStyle->GetFamily() == SD_STYLE_FAMILY_MASTERPAGE) && (pStyle->GetName().Equals( aLayoutName, 0, nLen )) )
@@ -166,7 +166,7 @@ SdStyleSheet* SdStyleFamily::GetSheetByName( const OUString& rName ) throw(NoSuc
         else
         {
             const SfxStyles& rStyles = mxPool->GetStyles();
-            for( SfxStyles::const_iterator iter( rStyles.begin() ); iter != rStyles.end(); iter++ )
+            for( SfxStyles::const_iterator iter( rStyles.begin() ); iter != rStyles.end(); ++iter )
             {
                 SdStyleSheet* pStyle = static_cast< SdStyleSheet* >( (*iter).get() );
                 if( pStyle && (pStyle->GetFamily() == mnFamily) && (pStyle->GetApiName() == rName) )
@@ -286,7 +286,7 @@ Sequence< OUString > SAL_CALL SdStyleFamily::getElementNames() throw(RuntimeExce
     {
         std::vector< OUString > aNames;
         const SfxStyles& rStyles = mxPool->GetStyles();
-        for( SfxStyles::const_iterator iter( rStyles.begin() ); iter != rStyles.end(); iter++ )
+        for( SfxStyles::const_iterator iter( rStyles.begin() ); iter != rStyles.end(); ++iter )
         {
             SdStyleSheet* pStyle = static_cast< SdStyleSheet* >( (*iter).get() );
             if( pStyle && (pStyle->GetFamily() == mnFamily) )
@@ -314,7 +314,7 @@ sal_Bool SAL_CALL SdStyleFamily::hasByName( const OUString& aName ) throw(Runtim
         else
         {
             const SfxStyles& rStyles = mxPool->GetStyles();
-            for( SfxStyles::const_iterator iter( rStyles.begin() ); iter != rStyles.end(); iter++ )
+            for( SfxStyles::const_iterator iter( rStyles.begin() ); iter != rStyles.end(); ++iter )
             {
                 SdStyleSheet* pStyle = static_cast< SdStyleSheet* >( (*iter).get() );
                 if( pStyle && (pStyle->GetFamily() == mnFamily) && ( pStyle->GetApiName() == aName ) )
@@ -349,7 +349,7 @@ sal_Bool SAL_CALL SdStyleFamily::hasElements() throw(RuntimeException)
     else
     {
         const SfxStyles& rStyles = mxPool->GetStyles();
-        for( SfxStyles::const_iterator iter( rStyles.begin() ); iter != rStyles.end(); iter++ )
+        for( SfxStyles::const_iterator iter( rStyles.begin() ); iter != rStyles.end(); ++iter )
         {
             SdStyleSheet* pStyle = static_cast< SdStyleSheet* >( (*iter).get() );
             if( pStyle && (pStyle->GetFamily() == mnFamily) )
@@ -377,7 +377,7 @@ sal_Int32 SAL_CALL SdStyleFamily::getCount() throw(RuntimeException)
     else
     {
         const SfxStyles& rStyles = mxPool->GetStyles();
-        for( SfxStyles::const_iterator iter( rStyles.begin() ); iter != rStyles.end(); iter++ )
+        for( SfxStyles::const_iterator iter( rStyles.begin() ); iter != rStyles.end(); ++iter )
         {
             SdStyleSheet* pStyle = static_cast< SdStyleSheet* >( (*iter).get() );
             if( pStyle && (pStyle->GetFamily() == mnFamily) )
@@ -404,7 +404,7 @@ Any SAL_CALL SdStyleFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBounds
             {
                 PresStyleMap::iterator iter( rStyleSheets.begin() );
                 while( Index-- && (iter != rStyleSheets.end()) )
-                    iter++;
+                    ++iter;
 
                 if( (Index==-1) && (iter != rStyleSheets.end()) )
                     return Any( Reference< XStyle >( (*iter).second.get() ) );
@@ -413,7 +413,7 @@ Any SAL_CALL SdStyleFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBounds
         else
         {
             const SfxStyles& rStyles = mxPool->GetStyles();
-            for( SfxStyles::const_iterator iter( rStyles.begin() ); iter != rStyles.end(); iter++ )
+            for( SfxStyles::const_iterator iter( rStyles.begin() ); iter != rStyles.end(); ++iter )
             {
                 SdStyleSheet* pStyle = static_cast< SdStyleSheet* >( (*iter).get() );
                 if( pStyle && (pStyle->GetFamily() == mnFamily) )
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 2c5ba9cf5258..e425a35fb874 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -955,7 +955,7 @@ void SdStyleSheet::notifyModifyListener()
 
 OUString SAL_CALL SdStyleSheet::getImplementationName() throw(RuntimeException)
 {
-    return OUString::createFromAscii( "SdStyleSheet" );
+    return OUString( RTL_CONSTASCII_USTRINGPARAM( "SdStyleSheet" ) );
 }
 
 // --------------------------------------------------------------------
diff --git a/sd/source/filter/cgm/makefile.mk b/sd/source/filter/cgm/makefile.mk
index 65ac2c48557d..510a727c51d3 100644
--- a/sd/source/filter/cgm/makefile.mk
+++ b/sd/source/filter/cgm/makefile.mk
@@ -36,7 +36,9 @@ TARGET=cgm
 
 # --- Files --------------------------------------------------------
 
-SLOFILES = $(SLO)$/sdcgmfilter.obj	
+SLOFILES = $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = $(SLO)$/sdcgmfilter.obj
 
 # --- Targets --------------------------------------------------------------
 
diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx
index dc03cd6b3829..c6032a7bb16f 100644
--- a/sd/source/filter/cgm/sdcgmfilter.cxx
+++ b/sd/source/filter/cgm/sdcgmfilter.cxx
@@ -95,7 +95,7 @@ sal_Bool SdCGMFilter::Import()
 
     if( pLibrary && mxModel.is() )
     {
-        ImportCGM       FncImportCGM = reinterpret_cast< ImportCGM >( pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii( "ImportCGM" ) ) );
+        ImportCGM       FncImportCGM = reinterpret_cast< ImportCGM >( pLibrary->getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ImportCGM" ) ) ) );
         ::rtl::OUString aFileURL( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) );
         UINT32          nRetValue;
 
@@ -139,7 +139,7 @@ sal_Bool SdCGMFilter::Export()
 
     if( pLibrary && mxModel.is() )
     {
-        ExportCGM FncCGMExport = reinterpret_cast< ExportCGM >( pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii( "ExportCGM" ) ) );
+        ExportCGM FncCGMExport = reinterpret_cast< ExportCGM >( pLibrary->getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ExportCGM" ) ) ) );
 
         if( FncCGMExport )
         {
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 3e41514b6f97..abbfadd9ee63 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -63,62 +63,13 @@
 #include <filter/msfilter/svxmsbas.hxx>
 #include <editeng/flditem.hxx>
 #include <sfx2/docinf.hxx>
-
-#define PPT_TRANSITION_TYPE_NONE            0
-#define PPT_TRANSITION_TYPE_RANDOM          1
-#define PPT_TRANSITION_TYPE_BLINDS          2
-#define PPT_TRANSITION_TYPE_CHECKER         3
-#define PPT_TRANSITION_TYPE_COVER           4
-#define PPT_TRANSITION_TYPE_DISSOLVE        5
-#define PPT_TRANSITION_TYPE_FADE            6
-#define PPT_TRANSITION_TYPE_PULL            7
-#define PPT_TRANSITION_TYPE_RANDOM_BARS     8
-#define PPT_TRANSITION_TYPE_STRIPS          9
-#define PPT_TRANSITION_TYPE_WIPE           10
-#define PPT_TRANSITION_TYPE_ZOOM           11
-#define PPT_TRANSITION_TYPE_SPLIT          13
-
-// effects, new in xp
-#define PPT_TRANSITION_TYPE_DIAMOND         17
-#define PPT_TRANSITION_TYPE_PLUS            18
-#define PPT_TRANSITION_TYPE_WEDGE           19
-#define PPT_TRANSITION_TYPE_PUSH            20
-#define PPT_TRANSITION_TYPE_COMB            21
-#define PPT_TRANSITION_TYPE_NEWSFLASH       22
-#define PPT_TRANSITION_TYPE_SMOOTHFADE      23
-#define PPT_TRANSITION_TYPE_WHEEL           26
-#define PPT_TRANSITION_TYPE_CIRCLE          27
+#include <oox/export/utils.hxx>
 
 using namespace com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::presentation;
 
-static PHLayout pPHLayout[] =
-{
-    { EPP_LAYOUT_TITLESLIDE,            { 0x0d, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x10, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_TITLEANDBODYSLIDE,     { 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_TITLEANDBODYSLIDE,     { 0x0d, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, TRUE, TRUE, TRUE },
-    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x0e, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_BLANCSLIDE,            { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, FALSE, FALSE, FALSE },
-    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x0e, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x14, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_TITLEANDBODYSLIDE,     { 0x0d, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x15, 0x0d, 0x0e, TRUE, FALSE, FALSE },
-    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x16, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_TITLEANDBODYSLIDE,     { 0x0d, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, FALSE, FALSE },
-    { EPP_LAYOUT_RIGHTCOLUMN2ROWS,      { 0x0d, 0x0e, 0x13, 0x13, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_2ROWSANDTITLE,         { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_LEFTCOLUMN2ROWS,       { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_TOPROW2COLUMN,         { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_2ROWSANDTITLE,         { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_4OBJECTS,              { 0x0d, 0x13, 0x13, 0x13, 0x13, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, FALSE, FALSE },
-    { EPP_LAYOUT_ONLYTITLE,             { 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, TRUE, FALSE, FALSE },
-    { EPP_LAYOUT_BLANCSLIDE,            { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, FALSE, FALSE, FALSE },
-    { EPP_LAYOUT_TITLERIGHT2BODIESLEFT, { 0x11, 0x12, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x11, 0x12, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_TITLERIGHTBODYLEFT,    { 0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x11, 0x12, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_TITLEANDBODYSLIDE,     { 0x0d, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x12, TRUE, TRUE, FALSE },
-    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x16, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x12, TRUE, TRUE, FALSE }
-};
+using ::com::sun::star::beans::XPropertySet;
 
 //============================ PPTWriter ==================================
 
@@ -126,16 +77,12 @@ PPTWriter::PPTWriter( SvStorageRef& rSvStorage,
             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rXModel,
             ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > & rXStatInd,
             SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags ) :
+    PPTWriterBase           ( rXModel, rXStatInd ),
+    mnCnvrtFlags            ( nCnvrtFlags ),
     mbStatus                ( sal_False ),
     mbUseNewAnimations      ( sal_True ),
     mnLatestStatValue       ( 0 ),
-    maFraction              ( 1, 576 ),
-    maMapModeSrc            ( MAP_100TH_MM ),
-    maMapModeDest           ( MAP_INCH, Point(), maFraction, maFraction ),
-    meLatestPageType        ( NORMAL ),
-    mXModel                 ( rXModel ),
-    mXStatusIndicator       ( rXStatInd ),
-    mbStatusIndicator       ( FALSE ),
+    mrStg                   ( rSvStorage ),
     mpCurUserStrm           ( NULL ),
     mpStrm                  ( NULL ),
     mpPicStrm               ( NULL ),
@@ -147,38 +94,10 @@ PPTWriter::PPTWriter( SvStorageRef& rSvStorage,
     mnPagesWritten          ( 0 ),
     mnTxId                  ( 0x7a2f64 )
 {
-    sal_uInt32 i;
-    if ( !ImplInitSOIface() )
-        return;
-
-    FontCollectionEntry aDefaultFontDesc( String( RTL_CONSTASCII_USTRINGPARAM( "Times New Roman" ) ),
-                                            ::com::sun::star::awt::FontFamily::ROMAN,
-                                                ::com::sun::star::awt::FontPitch::VARIABLE,
-                                                    RTL_TEXTENCODING_MS_1252 );
-    maFontCollection.GetId( aDefaultFontDesc ); // default is always times new roman
-
-    if ( !ImplGetPageByIndex( 0, NOTICE ) )
-        return;
-    INT32 nWidth = 21000;
-    if ( ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM(  "Width" ) ) ) )
-        mAny >>= nWidth;
-    INT32 nHeight = 29700;
-    if ( ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Height" ) ) ) )
-        mAny >>= nHeight;
-
-    maNotesPageSize = ImplMapSize( ::com::sun::star::awt::Size( nWidth, nHeight ) );
+}
 
-    if ( !ImplGetPageByIndex( 0, MASTER ) )
-        return;
-    nWidth = 28000;
-    if ( ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Width" ) ) ) )
-        mAny >>= nWidth;
-    nHeight = 21000;
-    if ( ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Height" ) ) ) )
-        mAny >>= nHeight;
-    maDestPageSize = ImplMapSize( ::com::sun::star::awt::Size( nWidth, nHeight ) );
-
-    mrStg = rSvStorage;
+void PPTWriter::exportPPTPre()
+{
     if ( !mrStg.Is() )
         return;
 
@@ -207,30 +126,10 @@ PPTWriter::PPTWriter( SvStorageRef& rSvStorage,
         mpPicStrm = mrStg->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( "Pictures" ) ) );
 
     mpPptEscherEx = new PptEscherEx( *mpStrm );
+}
 
-    if ( !ImplGetStyleSheets() )
-        return;
-
-    if ( !ImplCreateDocument() )
-        return;
-
-    for ( i = 0; i < mnMasterPages; i++ )
-    {
-        if ( !ImplCreateMaster( i ) )
-            return;
-    }
-    if ( !ImplCreateMainNotes() )
-        return;
-    for ( i = 0; i < mnPages; i++ )
-    {
-        if ( !ImplCreateSlide( i ) )
-            return;
-    }
-    for ( i = 0; i < mnPages; i++ )
-    {
-        if ( !ImplCreateNotes( i ) )
-            return;
-    }
+void PPTWriter::exportPPTPost( )
+{
     if ( !ImplCloseDocument() )
         return;
 
@@ -245,19 +144,371 @@ PPTWriter::PPTWriter( SvStorageRef& rSvStorage,
         }
     }
 
-    ImplWriteOLE( nCnvrtFlags );
+    ImplWriteOLE();
 
-    ImplWriteVBA( pVBA );
+    ImplWriteVBA();
 
     if ( !ImplWriteAtomEnding() )
         return;
 
-    if ( !ImplCreateDocumentSummaryInformation( nCnvrtFlags ) )
+    if ( !ImplCreateDocumentSummaryInformation() )
         return;
 
     mbStatus = TRUE;
 };
 
+// ---------------------------------------------------------------------------------------------
+
+void ImplExportComments( uno::Reference< drawing::XDrawPage > xPage, SvMemoryStream& rBinaryTagData10Atom );
+
+void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_uInt16 nMode,
+                                sal_Bool bHasBackground, Reference< XPropertySet > aXBackgroundPropSet )
+{
+    Any aAny;
+
+    const PHLayout& rLayout = GetLayout( mXPagePropSet );
+    mpPptEscherEx->PtReplaceOrInsert( EPP_Persist_Slide | nPageNum, mpStrm->Tell() );
+    mpPptEscherEx->OpenContainer( EPP_Slide );
+    mpPptEscherEx->AddAtom( 24, EPP_SlideAtom, 2 );
+    *mpStrm << rLayout.nLayout;
+    mpStrm->Write( rLayout.nPlaceHolder, 8 );       // placeholderIDs ( 8Stueck )
+    *mpStrm << (sal_uInt32)(nMasterNum | 0x80000000)// master ID ( ist gleich 0x80000000 bei einer masterpage   )
+            << (sal_uInt32)nPageNum + 0x100         // notes ID ( ist gleich null wenn keine notizen vorhanden )
+            << nMode
+            << (sal_uInt16)0;                       // padword
+
+    mnDiaMode = 0;
+    sal_Bool bVisible = sal_True;
+    ::com::sun::star::presentation::FadeEffect eFe = ::com::sun::star::presentation::FadeEffect_NONE;
+
+    if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Visible" ) ) ) )
+        aAny >>= bVisible;
+    if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Change" ) ) ) )
+    {
+        switch ( *(INT32*)aAny.getValue() )
+        {
+            case 1 :        // automatisch
+                mnDiaMode++;
+            case 2 :        // halbautomatisch
+                mnDiaMode++;
+            default :
+            case 0 :        // manuell
+            break;
+        }
+    }
+    if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Effect" ) ) ) )
+        aAny >>= eFe;
+
+    sal_uInt32  nSoundRef = 0;
+    sal_Bool    bIsSound = sal_False;
+    sal_Bool    bStopSound = sal_False;
+    sal_Bool    bLoopSound = sal_False;
+
+    if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Sound" ) ) ) )
+    {
+        rtl::OUString aSoundURL;
+        if ( aAny >>= aSoundURL )
+        {
+            nSoundRef = maSoundCollection.GetId( aSoundURL );
+            bIsSound = sal_True;
+        }
+        else
+            aAny >>= bStopSound;
+    }
+    if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "LoopSound" ) ) ) )
+        aAny >>= bLoopSound;
+
+    sal_Bool bNeedsSSSlideInfoAtom = ( bVisible == FALSE )
+                                    || ( mnDiaMode == 2 )
+                                    || ( bIsSound )
+                                    || ( bStopSound )
+                                    || ( eFe != ::com::sun::star::presentation::FadeEffect_NONE );
+    if ( bNeedsSSSlideInfoAtom )
+    {
+        sal_uInt8   nDirection = 0;
+        sal_uInt8   nTransitionType = 0;
+        sal_uInt16  nBuildFlags = 1;        // advange by mouseclick
+        INT32       nSlideTime = 0;         // muss noch !!!
+        sal_uInt8   nSpeed = 1;
+
+        if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Speed" ) ) ) )
+        {
+            ::com::sun::star::presentation::AnimationSpeed aAs;
+            aAny >>= aAs;
+            nSpeed = (sal_uInt8)aAs;
+        }
+        sal_Int16 nTT = 0, nTST = 0;
+        if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TransitionType" ) ) )
+            && ( aAny >>= nTT ) )
+        {
+            if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TransitionSubtype" ) ) )
+                && ( aAny >>= nTST ) )
+                nTransitionType = GetTransition( nTT, nTST, eFe, nDirection );
+
+        }
+        if ( !nTransitionType )
+            nTransitionType = GetTransition( eFe, nDirection );
+        if ( mnDiaMode == 2 )                                   // automatic ?
+            nBuildFlags |= 0x400;
+        if ( bVisible == FALSE )
+            nBuildFlags |= 4;
+        if ( bIsSound )
+            nBuildFlags |= 16;
+        if ( bLoopSound )
+            nBuildFlags |= 64;
+        if ( bStopSound )
+            nBuildFlags |= 256;
+
+        if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Duration" ) ) ) )// duration of this slide
+            nSlideTime = *(INT32*)aAny.getValue() << 10;        // in ticks
+
+        mpPptEscherEx->AddAtom( 16, EPP_SSSlideInfoAtom );
+        *mpStrm << nSlideTime       // standtime in ticks
+                << nSoundRef
+                << nDirection
+                << nTransitionType
+                << nBuildFlags
+                << nSpeed
+                << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0;
+    }
+
+    ImplCreateHeaderFooters( mXPagePropSet );
+
+    EscherSolverContainer aSolverContainer;
+    mpPptEscherEx->OpenContainer( EPP_PPDrawing );
+    mpPptEscherEx->OpenContainer( ESCHER_DgContainer );
+    mpPptEscherEx->EnterGroup(0,0);
+    ImplWritePage( rLayout, aSolverContainer, NORMAL, FALSE, nPageNum );    // Die Shapes der Seite werden im PPT Dok. erzeugt
+    mpPptEscherEx->LeaveGroup();
+
+    if ( bHasBackground )
+        ImplWriteBackground( aXBackgroundPropSet );
+    else
+    {
+        mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
+        mpPptEscherEx->AddShape( ESCHER_ShpInst_Rectangle, 0xc00 );             // Flags: Connector | Background | HasSpt
+        EscherPropertyContainer aPropOpt;
+        aPropOpt.AddOpt( ESCHER_Prop_fillRectRight, PPTtoEMU( maDestPageSize.Width ) );
+        aPropOpt.AddOpt( ESCHER_Prop_fillRectBottom, PPTtoEMU( maDestPageSize.Width ) );
+        aPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x120012 );
+        aPropOpt.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x80000 );
+        aPropOpt.AddOpt( ESCHER_Prop_bWMode, ESCHER_wDontShow );
+        aPropOpt.AddOpt( ESCHER_Prop_fBackground, 0x10001 );                // if true, this is the background shape
+        aPropOpt.Commit( *mpStrm );
+        mpPptEscherEx->CloseContainer();    // ESCHER_SpContainer
+    }
+
+    aSolverContainer.WriteSolver( *mpStrm );
+
+    mpPptEscherEx->CloseContainer();    // ESCHER_DgContainer
+    mpPptEscherEx->CloseContainer();    // EPP_Drawing
+    mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 1 );
+    *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0x99cc00 << (sal_uInt32)0xcc3333 << (sal_uInt32)0xffcccc << (sal_uInt32)0xb2b2b2;
+
+    SvMemoryStream aBinaryTagData10Atom;
+    ImplExportComments( mXDrawPage, aBinaryTagData10Atom );
+    if ( mbUseNewAnimations )
+    {
+        SvMemoryStream amsofbtAnimGroup;
+        ppt::AnimationExporter aExporter( aSolverContainer, maSoundCollection );
+        aExporter.doexport( mXDrawPage, amsofbtAnimGroup );
+        sal_uInt32 nmsofbtAnimGroupSize = amsofbtAnimGroup.Tell();
+        if ( nmsofbtAnimGroupSize )
+        {
+            {
+                EscherExAtom aMagic2( aBinaryTagData10Atom, 0x2eeb );
+                aBinaryTagData10Atom << (sal_uInt32)0x01c45df9
+                                     << (sal_uInt32)0xe1471b30;
+            }
+            {
+                EscherExAtom aMagic( aBinaryTagData10Atom, 0x2b00 );
+                aBinaryTagData10Atom << (sal_uInt32)0;
+            }
+            aBinaryTagData10Atom.Write( amsofbtAnimGroup.GetData(), amsofbtAnimGroup.Tell() );
+            {
+                EscherExContainer aMagic2( aBinaryTagData10Atom, 0x2b02 );
+            }
+        }
+    }
+    if ( aBinaryTagData10Atom.Tell() )
+    {
+        EscherExContainer aProgTags     ( *mpStrm, EPP_ProgTags );
+        EscherExContainer aProgBinaryTag( *mpStrm, EPP_ProgBinaryTag );
+        {
+            EscherExAtom aCString( *mpStrm, EPP_CString );
+            *mpStrm << (sal_uInt32)0x5f005f
+                    << (sal_uInt32)0x50005f
+                    << (sal_uInt32)0x540050
+                    << (sal_uInt16)0x31
+                    << (sal_uInt16)0x30;
+        }
+        {
+            EscherExAtom aBinaryTagData( *mpStrm, EPP_BinaryTagData );
+            mpStrm->Write( aBinaryTagData10Atom.GetData(), aBinaryTagData10Atom.Tell() );
+        }
+    }
+/*
+    if ( mbUseNewAnimations )
+    {
+        SvMemoryStream amsofbtAnimGroup;
+        ppt::AnimationExporter aExporter( aSolverContainer, maSoundCollection );
+        aExporter.doexport( mXDrawPage, amsofbtAnimGroup );
+        sal_uInt32 nmsofbtAnimGroupSize = amsofbtAnimGroup.Tell();
+        if ( nmsofbtAnimGroupSize )
+        {
+            EscherExContainer aProgTags     ( *mpStrm, EPP_ProgTags );
+            EscherExContainer aProgBinaryTag( *mpStrm, EPP_ProgBinaryTag );
+            {
+                EscherExAtom aCString( *mpStrm, EPP_CString );
+                *mpStrm << (sal_uInt32)0x5f005f
+                        << (sal_uInt32)0x50005f
+                        << (sal_uInt32)0x540050
+                        << (sal_uInt16)0x31
+                        << (sal_uInt16)0x30;
+            }
+            {
+                EscherExAtom aBinaryTagData( *mpStrm, EPP_BinaryTagData );
+                {
+                    {
+                        EscherExAtom aMagic2( *mpStrm, 0x2eeb );
+                        *mpStrm << (sal_uInt32)0x01c45df9
+                                << (sal_uInt32)0xe1471b30;
+                    }
+                    {
+                        EscherExAtom aMagic( *mpStrm, 0x2b00 );
+                        *mpStrm << (sal_uInt32)0;
+                    }
+                }
+                mpStrm->Write( amsofbtAnimGroup.GetData(), amsofbtAnimGroup.Tell() );
+                {
+                    EscherExContainer aMagic2( *mpStrm, 0x2b02 );
+                }
+            }
+        }
+    }
+*/
+    mpPptEscherEx->CloseContainer();    // EPP_Slide
+}
+
+// ---------------------------------------------------------------------------------------------
+
+void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertySet > aXBackgroundPropSet )
+{
+    sal_uInt32 nFillColor = 0xffffff;
+    sal_uInt32 nFillBackColor = 0x000000;
+
+    ::com::sun::star::drawing::FillStyle aFS = ::com::sun::star::drawing::FillStyle_NONE;
+    if ( ImplGetPropertyValue( aXBackgroundPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" ) ) ) )
+        mAny >>= aFS;
+    switch ( aFS )
+    {
+        case ::com::sun::star::drawing::FillStyle_GRADIENT :
+        {
+            if ( ImplGetPropertyValue( aXBackgroundPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillGradient" ) ) ) )
+            {
+                nFillColor = EscherPropertyContainer::GetGradientColor( (::com::sun::star::awt::Gradient*)mAny.getValue(), 0 );
+                nFillBackColor = EscherPropertyContainer::GetGradientColor( (::com::sun::star::awt::Gradient*)mAny.getValue(), 1 );
+            }
+        }
+        break;
+
+        case ::com::sun::star::drawing::FillStyle_SOLID :
+        {
+            if ( ImplGetPropertyValue( aXBackgroundPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillColor" ) ) ) )
+            {
+                nFillColor = mpPptEscherEx->GetColor( *((sal_uInt32*)mAny.getValue()) );
+                nFillBackColor = nFillColor ^ 0xffffff;
+            }
+        }
+        break;
+
+        default:
+            break;
+    }
+
+    mpPptEscherEx->PtReplaceOrInsert( EPP_Persist_MainMaster | nPageNum, mpStrm->Tell() );
+    mpPptEscherEx->OpenContainer( EPP_MainMaster );
+    mpPptEscherEx->AddAtom( 24, EPP_SlideAtom, 2 );
+    *mpStrm << (INT32)EPP_LAYOUT_TITLEANDBODYSLIDE  // slide layout -> title and body slide
+            << (sal_uInt8)1 << (sal_uInt8)2 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0     // placeholderID
+            << (sal_uInt32)0        // master ID ( ist gleich null bei einer masterpage )
+            << (sal_uInt32)0        // notes ID ( ist gleich null wenn keine notizen vorhanden )
+            << (sal_uInt16)0        // Bit 1: Follow master objects, Bit 2: Follow master scheme, Bit 3: Follow master background
+            << (sal_uInt16)0;       // padword
+
+    mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
+    *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0x99cc00 << (sal_uInt32)0xcc3333 << (sal_uInt32)0xffcccc << (sal_uInt32)0xb2b2b2;
+    mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
+    *mpStrm << (sal_uInt32)0xff0000 << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x00ffff << (sal_uInt32)0x0099ff << (sal_uInt32)0xffff00 << (sal_uInt32)0x0000ff << (sal_uInt32)0x969696;
+    mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
+    *mpStrm << (sal_uInt32)0xccffff << (sal_uInt32)0x000000 << (sal_uInt32)0x336666 << (sal_uInt32)0x008080 << (sal_uInt32)0x339933 << (sal_uInt32)0x000080 << (sal_uInt32)0xcc3300 << (sal_uInt32)0x66ccff;
+    mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
+    *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x333333 << (sal_uInt32)0x000000 << (sal_uInt32)0xdddddd << (sal_uInt32)0x808080 << (sal_uInt32)0x4d4d4d << (sal_uInt32)0xeaeaea;
+    mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
+    *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0x66ccff << (sal_uInt32)0xff0000 << (sal_uInt32)0xcc00cc << (sal_uInt32)0xc0c0c0;
+    mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
+    *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0xc0c0c0 << (sal_uInt32)0xff6600 << (sal_uInt32)0x0000ff << (sal_uInt32)0x009900;
+    mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
+    *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0xff9933 << (sal_uInt32)0xccff99 << (sal_uInt32)0xcc00cc << (sal_uInt32)0xb2b2b2;
+
+    for ( int nInstance = EPP_TEXTTYPE_Title; nInstance <= EPP_TEXTTYPE_QuarterBody; nInstance++ )
+    {
+        if ( nInstance == EPP_TEXTTYPE_notUsed )
+            continue;
+
+        // the auto color is dependent to the page background,so we have to set a page that is in the right context
+        if ( nInstance == EPP_TEXTTYPE_Notes )
+            GetPageByIndex( 0, NOTICE );
+        else
+            GetPageByIndex( 0, MASTER );
+
+        mpPptEscherEx->BeginAtom();
+
+        sal_Bool bFirst = TRUE;
+        sal_Bool bSimpleText = FALSE;
+
+        *mpStrm << (sal_uInt16)5;                           // paragraph count
+
+        for ( sal_uInt16 nLev = 0; nLev < 5; nLev++ )
+        {
+            if ( nInstance >= EPP_TEXTTYPE_CenterBody )
+            {
+                bFirst = FALSE;
+                bSimpleText = TRUE;
+                *mpStrm << nLev;
+            }
+            mpStyleSheet->mpParaSheet[ nInstance ]->Write( *mpStrm, mpPptEscherEx, nLev, bFirst, bSimpleText, mXPagePropSet );
+            mpStyleSheet->mpCharSheet[ nInstance ]->Write( *mpStrm, mpPptEscherEx, nLev, bFirst, bSimpleText, mXPagePropSet );
+            bFirst = FALSE;
+        }
+        mpPptEscherEx->EndAtom( EPP_TxMasterStyleAtom, 0, nInstance );
+    }
+    GetPageByIndex( nPageNum, MASTER );
+
+    EscherSolverContainer aSolverContainer;
+
+    mpPptEscherEx->OpenContainer( EPP_PPDrawing );
+    mpPptEscherEx->OpenContainer( ESCHER_DgContainer );
+
+    mpPptEscherEx->EnterGroup(0,0);
+    ImplWritePage( GetLayout( 0 ), aSolverContainer, MASTER, TRUE );    // Die Shapes der Seite werden im PPT Dok. erzeugt
+    mpPptEscherEx->LeaveGroup();
+
+    ImplWriteBackground( aXBackgroundPropSet );
+
+    aSolverContainer.WriteSolver( *mpStrm );
+
+    mpPptEscherEx->CloseContainer();    // ESCHER_DgContainer
+    mpPptEscherEx->CloseContainer();    // EPP_Drawing
+    mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 1 );
+    *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0x99cc00 << (sal_uInt32)0xcc3333 << (sal_uInt32)0xffcccc << (sal_uInt32)0xb2b2b2;
+
+    if ( aBuExMasterStream.Tell() )
+    {
+        ImplProgTagContainer( mpStrm, &aBuExMasterStream );
+    }
+    mpPptEscherEx->CloseContainer();    // EPP_MainMaster
+};
 
 // ---------------------------------------------------------------------------------------------
 
@@ -284,13 +535,6 @@ PPTWriter::~PPTWriter()
 
 // ---------------------------------------------------------------------------------------------
 
-static inline sal_uInt32 PPTtoEMU( INT32 nPPT )
-{
-    return (sal_uInt32)( (double)nPPT * 1587.5 );
-}
-
-// ---------------------------------------------------------------------------------------------
-
 sal_Bool PPTWriter::ImplCreateCurrentUserStream()
 {
     mpCurUserStrm = mrStg->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( "Current User" ) ) );
@@ -323,7 +567,7 @@ sal_Bool PPTWriter::ImplCreateCurrentUserStream()
 
 // ---------------------------------------------------------------------------------------------
 
-sal_Bool PPTWriter::ImplCreateDocumentSummaryInformation( sal_uInt32 nCnvrtFlags )
+sal_Bool PPTWriter::ImplCreateDocumentSummaryInformation()
 {
     uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
         mXModel, uno::UNO_QUERY_THROW);
@@ -353,10 +597,10 @@ sal_Bool PPTWriter::ImplCreateDocumentSummaryInformation( sal_uInt32 nCnvrtFlags
             aHyperSeq[j] = pBlob[j];
         }
 
-        if ( nCnvrtFlags & 0x8000 )
+        if ( mnCnvrtFlags & 0x8000 )
         {
             uno::Sequence<sal_uInt8> aThumbSeq;
-            if ( ImplGetPageByIndex( 0, NORMAL ) &&
+            if ( GetPageByIndex( 0, NORMAL ) &&
                  ImplGetPropertyValue( mXPagePropSet,
                     String( RTL_CONSTASCII_USTRINGPARAM( "PreviewBitmap" ) ) ) )
             {
@@ -543,13 +787,13 @@ sal_Bool PPTWriter::ImplCreateDocument()
     mpPptEscherEx->OpenContainer( EPP_HeadersFooters, 3 );  //Master footer (default)
     mpPptEscherEx->AddAtom( 4, EPP_HeadersFootersAtom );
     *mpStrm << (sal_uInt32)0x25000d;
-    if ( ImplGetPageByIndex( 0, MASTER ) )
+    if ( GetPageByIndex( 0, MASTER ) )
         ImplCreateHeaderFooterStrings( *mpStrm, mXPagePropSet );
     mpPptEscherEx->CloseContainer();
     mpPptEscherEx->OpenContainer( EPP_HeadersFooters, 4 );  //NotesMaster footer (default)
     mpPptEscherEx->AddAtom( 4, EPP_HeadersFootersAtom );
     *mpStrm << (sal_uInt32)0x3d000d;
-    if ( ImplGetPageByIndex( 0, NOTICE ) )
+    if ( GetPageByIndex( 0, NOTICE ) )
         ImplCreateHeaderFooterStrings( *mpStrm, mXPagePropSet );
     mpPptEscherEx->CloseContainer();
 
@@ -565,9 +809,9 @@ sal_Bool PPTWriter::ImplCreateDocument()
                 << (INT32)i + 0x100                             // slideId - Unique slide identifier, used for OLE link monikers for example
                 << (sal_uInt32)0;                               // reserved, usualy 0
 
-        if ( !ImplGetPageByIndex( i, NORMAL ) )                 // sehr aufregend: noch einmal ueber alle seiten
+        if ( !GetPageByIndex( i, NORMAL ) )                     // sehr aufregend: noch einmal ueber alle seiten
             return FALSE;
-        ImplSetCurrentStyleSheet( ImplGetMasterIndex( NORMAL ) );
+        SetCurrentStyleSheet( GetMasterIndex( NORMAL ) );
 
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed >
             aXName( mXDrawPage, ::com::sun::star::uno::UNO_QUERY );
@@ -879,184 +1123,10 @@ sal_Bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm )
     return TRUE;
 }
 
-PHLayout& PPTWriter::ImplGetLayout(  const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const
-{
-    ::com::sun::star::uno::Any aAny;
-    sal_Int16 nLayout = 20;
-    if ( GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Layout" ) ) ), sal_True )
-        aAny >>= nLayout;
-
-    if ( ( nLayout >= 21 ) && ( nLayout <= 26 ) )   // NOTES _> HANDOUT6
-        nLayout = 20;
-    if ( ( nLayout >= 27 ) && ( nLayout <= 30 ) )   // VERTICAL LAYOUT
-        nLayout -= 6;
-    else if ( nLayout > 30 )
-        nLayout = 20;
-    return pPHLayout[ nLayout ];
-}
-
-
-// ---------------------------------------------------------------------------------------------
-
-sal_Bool PPTWriter::ImplCreateMaster( sal_uInt32 nPageNum )
-{
-    if ( !ImplGetPageByIndex( nPageNum, MASTER ) )
-        return FALSE;
-    ImplSetCurrentStyleSheet( nPageNum );
-
-    if ( !ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Background" ) ) ) )                // Backgroundshape laden
-        return FALSE;
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet;
-    if ( !( mAny >>= aXBackgroundPropSet ) )
-        return FALSE;
-
-    sal_uInt32 nFillColor = 0xffffff;
-    sal_uInt32 nFillBackColor = 0x000000;
-
-    ::com::sun::star::drawing::FillStyle aFS = ::com::sun::star::drawing::FillStyle_NONE;
-    if ( ImplGetPropertyValue( aXBackgroundPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" ) ) ) )
-        mAny >>= aFS;
-    switch ( aFS )
-    {
-        case ::com::sun::star::drawing::FillStyle_GRADIENT :
-        {
-            if ( ImplGetPropertyValue( aXBackgroundPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillGradient" ) ) ) )
-            {
-                nFillColor = EscherPropertyContainer::GetGradientColor( (::com::sun::star::awt::Gradient*)mAny.getValue(), 0 );
-                nFillBackColor = EscherPropertyContainer::GetGradientColor( (::com::sun::star::awt::Gradient*)mAny.getValue(), 1 );
-            }
-        }
-        break;
-
-        case ::com::sun::star::drawing::FillStyle_SOLID :
-        {
-            if ( ImplGetPropertyValue( aXBackgroundPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "FillColor" ) ) ) )
-            {
-                nFillColor = mpPptEscherEx->GetColor( *((sal_uInt32*)mAny.getValue()) );
-                nFillBackColor = nFillColor ^ 0xffffff;
-            }
-        }
-        break;
-
-        default:
-            break;
-    }
-
-    mpPptEscherEx->PtReplaceOrInsert( EPP_Persist_MainMaster | nPageNum, mpStrm->Tell() );
-    mpPptEscherEx->OpenContainer( EPP_MainMaster );
-    mpPptEscherEx->AddAtom( 24, EPP_SlideAtom, 2 );
-    *mpStrm << (INT32)EPP_LAYOUT_TITLEANDBODYSLIDE  // slide layout -> title and body slide
-            << (sal_uInt8)1 << (sal_uInt8)2 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0     // placeholderID
-            << (sal_uInt32)0        // master ID ( ist gleich null bei einer masterpage )
-            << (sal_uInt32)0        // notes ID ( ist gleich null wenn keine notizen vorhanden )
-            << (sal_uInt16)0        // Bit 1: Follow master objects, Bit 2: Follow master scheme, Bit 3: Follow master background
-            << (sal_uInt16)0;       // padword
-
-    mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
-    *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0x99cc00 << (sal_uInt32)0xcc3333 << (sal_uInt32)0xffcccc << (sal_uInt32)0xb2b2b2;
-    mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
-    *mpStrm << (sal_uInt32)0xff0000 << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x00ffff << (sal_uInt32)0x0099ff << (sal_uInt32)0xffff00 << (sal_uInt32)0x0000ff << (sal_uInt32)0x969696;
-    mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
-    *mpStrm << (sal_uInt32)0xccffff << (sal_uInt32)0x000000 << (sal_uInt32)0x336666 << (sal_uInt32)0x008080 << (sal_uInt32)0x339933 << (sal_uInt32)0x000080 << (sal_uInt32)0xcc3300 << (sal_uInt32)0x66ccff;
-    mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
-    *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x333333 << (sal_uInt32)0x000000 << (sal_uInt32)0xdddddd << (sal_uInt32)0x808080 << (sal_uInt32)0x4d4d4d << (sal_uInt32)0xeaeaea;
-    mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
-    *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0x66ccff << (sal_uInt32)0xff0000 << (sal_uInt32)0xcc00cc << (sal_uInt32)0xc0c0c0;
-    mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
-    *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0xc0c0c0 << (sal_uInt32)0xff6600 << (sal_uInt32)0x0000ff << (sal_uInt32)0x009900;
-    mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 );
-    *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0xff9933 << (sal_uInt32)0xccff99 << (sal_uInt32)0xcc00cc << (sal_uInt32)0xb2b2b2;
-
-    for ( int nInstance = EPP_TEXTTYPE_Title; nInstance <= EPP_TEXTTYPE_QuarterBody; nInstance++ )
-    {
-        if ( nInstance == EPP_TEXTTYPE_notUsed )
-            continue;
-
-        // the auto color is dependent to the page background,so we have to set a page that is in the right context
-        if ( nInstance == EPP_TEXTTYPE_Notes )
-            ImplGetPageByIndex( 0, NOTICE );
-        else
-            ImplGetPageByIndex( 0, MASTER );
-
-        mpPptEscherEx->BeginAtom();
-
-        sal_Bool bFirst = TRUE;
-        sal_Bool bSimpleText = FALSE;
-
-        *mpStrm << (sal_uInt16)5;                           // paragraph count
-
-        for ( sal_uInt16 nLev = 0; nLev < 5; nLev++ )
-        {
-            if ( nInstance >= EPP_TEXTTYPE_CenterBody )
-            {
-                bFirst = FALSE;
-                bSimpleText = TRUE;
-                *mpStrm << nLev;
-            }
-            mpStyleSheet->mpParaSheet[ nInstance ]->Write( *mpStrm, mpPptEscherEx, nLev, bFirst, bSimpleText, mXPagePropSet );
-            mpStyleSheet->mpCharSheet[ nInstance ]->Write( *mpStrm, mpPptEscherEx, nLev, bFirst, bSimpleText, mXPagePropSet );
-            bFirst = FALSE;
-        }
-        mpPptEscherEx->EndAtom( EPP_TxMasterStyleAtom, 0, nInstance );
-    }
-    ImplGetPageByIndex( nPageNum, MASTER );
-
-    EscherSolverContainer aSolverContainer;
-
-    mpPptEscherEx->OpenContainer( EPP_PPDrawing );
-    mpPptEscherEx->OpenContainer( ESCHER_DgContainer );
-
-    mpPptEscherEx->EnterGroup(0,0);
-    ImplWritePage( pPHLayout[ 0 ], aSolverContainer, MASTER, TRUE );    // Die Shapes der Seite werden im PPT Dok. erzeugt
-    mpPptEscherEx->LeaveGroup();
-
-    ImplWriteBackground( aXBackgroundPropSet );
-
-    aSolverContainer.WriteSolver( *mpStrm );
-
-    mpPptEscherEx->CloseContainer();    // ESCHER_DgContainer
-    mpPptEscherEx->CloseContainer();    // EPP_Drawing
-    mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 1 );
-    *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0x99cc00 << (sal_uInt32)0xcc3333 << (sal_uInt32)0xffcccc << (sal_uInt32)0xb2b2b2;
-
-    if ( aBuExMasterStream.Tell() )
-    {
-        ImplProgTagContainer( mpStrm, &aBuExMasterStream );
-    }
-    mpPptEscherEx->CloseContainer();    // EPP_MainMaster
-    return TRUE;
-};
-
 // ---------------------------------------------------------------------------------------------
 
 sal_Bool PPTWriter::ImplCreateMainNotes()
 {
-    if ( !ImplGetPageByIndex( 0, NOTICE ) )
-        return FALSE;
-    ImplSetCurrentStyleSheet( 0 );
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XMasterPageTarget >
-        aXMasterPageTarget( mXDrawPage, ::com::sun::star::uno::UNO_QUERY );
-
-    if ( !aXMasterPageTarget.is() )
-        return FALSE;
-
-    mXDrawPage = aXMasterPageTarget->getMasterPage();
-    if ( !mXDrawPage.is() )
-        return FALSE;
-
-    mXPropSet = ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >
-            ( mXDrawPage, ::com::sun::star::uno::UNO_QUERY );
-    if ( !mXPropSet.is() )
-        return FALSE;
-
-    mXShapes = ::com::sun::star::uno::Reference<
-        ::com::sun::star::drawing::XShapes >
-            ( mXDrawPage, ::com::sun::star::uno::UNO_QUERY );
-    if ( !mXShapes.is() )
-        return FALSE;
-
     EscherSolverContainer aSolverContainer;
 
     mpPptEscherEx->PtReplaceOrInsert( EPP_Persist_MainNotes, mpStrm->Tell() );
@@ -1068,7 +1138,7 @@ sal_Bool PPTWriter::ImplCreateMainNotes()
     mpPptEscherEx->OpenContainer( ESCHER_DgContainer );
     mpPptEscherEx->EnterGroup(0,0);
 
-    ImplWritePage( pPHLayout[ 20 ], aSolverContainer, NOTICE, TRUE );
+    ImplWritePage( GetLayout( 20 ), aSolverContainer, NOTICE, TRUE );
 
     mpPptEscherEx->LeaveGroup();
     mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
@@ -1184,462 +1254,8 @@ void ImplExportComments( uno::Reference< drawing::XDrawPage > xPage, SvMemoryStr
 
 // ---------------------------------------------------------------------------------------------
 
-sal_Bool PPTWriter::ImplCreateSlide( sal_uInt32 nPageNum )
+void PPTWriter::ImplWriteNotes( sal_uInt32 nPageNum )
 {
-    ::com::sun::star::uno::Any aAny;
-
-    if ( !ImplGetPageByIndex( nPageNum, NORMAL ) )
-        return FALSE;
-    sal_uInt32 nMasterID = ImplGetMasterIndex( NORMAL );
-    ImplSetCurrentStyleSheet( nMasterID );
-    nMasterID |= 0x80000000;
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet;
-    sal_Bool bHasBackground = GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Background" ) ) );
-    if ( bHasBackground )
-        bHasBackground = ( aAny >>= aXBackgroundPropSet );
-
-    sal_uInt16 nMode = 7;   // Bit 1: Follow master objects, Bit 2: Follow master scheme, Bit 3: Follow master background
-    if ( bHasBackground )
-        nMode &=~4;
-
-/* sj: Don't know what's IsBackgroundVisible for, have to ask cl
-    if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundVisible" ) ) ) )
-    {
-        sal_Bool bBackgroundVisible;
-        if ( aAny >>= bBackgroundVisible )
-        {
-            if ( bBackgroundVisible )
-                nMode &= ~4;
-        }
-    }
-*/
-    if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundObjectsVisible" ) ) ) )
-    {
-        sal_Bool bBackgroundObjectsVisible = sal_False;
-        if ( aAny >>= bBackgroundObjectsVisible )
-        {
-            if ( !bBackgroundObjectsVisible )
-                nMode &= ~1;
-        }
-    }
-
-    const PHLayout& rLayout = ImplGetLayout( mXPagePropSet );
-    mpPptEscherEx->PtReplaceOrInsert( EPP_Persist_Slide | nPageNum, mpStrm->Tell() );
-    mpPptEscherEx->OpenContainer( EPP_Slide );
-    mpPptEscherEx->AddAtom( 24, EPP_SlideAtom, 2 );
-    *mpStrm << rLayout.nLayout;
-    mpStrm->Write( rLayout.nPlaceHolder, 8 );       // placeholderIDs ( 8Stueck )
-    *mpStrm << (sal_uInt32)nMasterID                // master ID ( ist gleich 0x80000000 bei einer masterpage   )
-            << (sal_uInt32)nPageNum + 0x100         // notes ID ( ist gleich null wenn keine notizen vorhanden )
-            << nMode
-            << (sal_uInt16)0;                       // padword
-
-    mnDiaMode = 0;
-    sal_Bool bVisible = sal_True;
-    ::com::sun::star::presentation::FadeEffect eFe = ::com::sun::star::presentation::FadeEffect_NONE;
-
-    if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Visible" ) ) ) )
-        aAny >>= bVisible;
-    if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Change" ) ) ) )
-    {
-        switch ( *(INT32*)aAny.getValue() )
-        {
-            case 1 :        // automatisch
-                mnDiaMode++;
-            case 2 :        // halbautomatisch
-                mnDiaMode++;
-            default :
-            case 0 :        // manuell
-            break;
-        }
-    }
-    if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Effect" ) ) ) )
-        aAny >>= eFe;
-
-    sal_uInt32  nSoundRef = 0;
-    sal_Bool    bIsSound = sal_False;
-    sal_Bool    bStopSound = sal_False;
-    sal_Bool    bLoopSound = sal_False;
-
-    if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Sound" ) ) ) )
-    {
-        rtl::OUString aSoundURL;
-        if ( aAny >>= aSoundURL )
-        {
-            nSoundRef = maSoundCollection.GetId( aSoundURL );
-            bIsSound = sal_True;
-        }
-        else
-            aAny >>= bStopSound;
-    }
-    if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "LoopSound" ) ) ) )
-        aAny >>= bLoopSound;
-
-
-    sal_Bool bNeedsSSSlideInfoAtom = ( bVisible == FALSE )
-                                    || ( mnDiaMode == 2 )
-                                    || ( bIsSound )
-                                    || ( bStopSound )
-                                    || ( eFe != ::com::sun::star::presentation::FadeEffect_NONE );
-    if ( bNeedsSSSlideInfoAtom )
-    {
-        sal_uInt8   nDirection = 0;
-        sal_uInt8   nTransitionType = 0;
-        sal_uInt16  nBuildFlags = 1;        // advange by mouseclick
-        INT32       nSlideTime = 0;         // muss noch !!!
-        sal_uInt8   nSpeed = 1;
-
-        if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Speed" ) ) ) )
-        {
-            ::com::sun::star::presentation::AnimationSpeed aAs;
-            aAny >>= aAs;
-            nSpeed = (sal_uInt8)aAs;
-        }
-        sal_Int16 nTT = 0, nTST = 0;
-        if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TransitionType" ) ) )
-            && ( aAny >>= nTT ) )
-        {
-            if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TransitionSubtype" ) ) )
-                && ( aAny >>= nTST ) )
-            {
-                switch( nTT )
-                {
-                    case animations::TransitionType::FADE :
-                    {
-                        if ( nTST == animations::TransitionSubType::CROSSFADE )
-                            nTransitionType = PPT_TRANSITION_TYPE_SMOOTHFADE;
-                        else if ( nTST == animations::TransitionSubType::FADEOVERCOLOR )
-                            nTransitionType = PPT_TRANSITION_TYPE_FADE;
-                    }
-                    break;
-                    case PPT_TRANSITION_TYPE_COMB :
-                    {
-                        nTransitionType = PPT_TRANSITION_TYPE_COMB;
-                        if ( nTST == animations::TransitionSubType::COMBVERTICAL )
-                            nDirection++;
-                    }
-                    break;
-                    case animations::TransitionType::PUSHWIPE :
-                    {
-                        nTransitionType = PPT_TRANSITION_TYPE_PUSH;
-                        switch( nTST )
-                        {
-                            case animations::TransitionSubType::FROMRIGHT: nDirection = 0; break;
-                            case animations::TransitionSubType::FROMBOTTOM: nDirection = 1; break;
-                            case animations::TransitionSubType::FROMLEFT: nDirection = 2; break;
-                            case animations::TransitionSubType::FROMTOP: nDirection = 3; break;
-                        }
-                    }
-                    break;
-                    case animations::TransitionType::PINWHEELWIPE :
-                    {
-                        nTransitionType = PPT_TRANSITION_TYPE_WHEEL;
-                        switch( nTST )
-                        {
-                            case animations::TransitionSubType::ONEBLADE: nDirection = 1; break;
-                            case animations::TransitionSubType::TWOBLADEVERTICAL : nDirection = 2; break;
-                            case animations::TransitionSubType::THREEBLADE : nDirection = 3; break;
-                            case animations::TransitionSubType::FOURBLADE: nDirection = 4; break;
-                            case animations::TransitionSubType::EIGHTBLADE: nDirection = 8; break;
-                        }
-                    }
-                    break;
-                    case animations::TransitionType::FANWIPE :
-                    {
-                        nTransitionType = PPT_TRANSITION_TYPE_WEDGE;
-                    }
-                    break;
-                    case animations::TransitionType::ELLIPSEWIPE :
-                    {
-                        nTransitionType = PPT_TRANSITION_TYPE_CIRCLE;
-                    }
-                    break;
-                    case animations::TransitionType::FOURBOXWIPE :
-                    {
-                        nTransitionType = PPT_TRANSITION_TYPE_PLUS;
-                    }
-                    break;
-                    case animations::TransitionType::IRISWIPE :
-                    {
-                        nTransitionType = PPT_TRANSITION_TYPE_DIAMOND;
-                    }
-                    break;
-                }
-            }
-        }
-        if ( !nTransitionType )
-        {
-            switch ( eFe )
-            {
-                default :
-                case ::com::sun::star::presentation::FadeEffect_RANDOM :
-                    nTransitionType = PPT_TRANSITION_TYPE_RANDOM;
-                break;
-
-                case ::com::sun::star::presentation::FadeEffect_HORIZONTAL_STRIPES :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_VERTICAL_STRIPES :
-                    nTransitionType = PPT_TRANSITION_TYPE_BLINDS;
-                break;
-
-                case ::com::sun::star::presentation::FadeEffect_VERTICAL_CHECKERBOARD :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_HORIZONTAL_CHECKERBOARD :
-                    nTransitionType = PPT_TRANSITION_TYPE_CHECKER;
-                break;
-
-                case ::com::sun::star::presentation::FadeEffect_MOVE_FROM_UPPERLEFT :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_MOVE_FROM_UPPERRIGHT :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_MOVE_FROM_LOWERLEFT :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_MOVE_FROM_LOWERRIGHT :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_MOVE_FROM_TOP :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_MOVE_FROM_LEFT :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_MOVE_FROM_BOTTOM :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_MOVE_FROM_RIGHT :
-                    nTransitionType = PPT_TRANSITION_TYPE_COVER;
-                break;
-
-                case ::com::sun::star::presentation::FadeEffect_DISSOLVE :
-                    nTransitionType = PPT_TRANSITION_TYPE_DISSOLVE;
-                break;
-
-                case ::com::sun::star::presentation::FadeEffect_VERTICAL_LINES :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_HORIZONTAL_LINES :
-                    nTransitionType = PPT_TRANSITION_TYPE_RANDOM_BARS;
-                break;
-
-                case ::com::sun::star::presentation::FadeEffect_CLOSE_HORIZONTAL :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_OPEN_HORIZONTAL :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_CLOSE_VERTICAL :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_OPEN_VERTICAL :
-                    nTransitionType = PPT_TRANSITION_TYPE_SPLIT;
-                break;
-
-                case ::com::sun::star::presentation::FadeEffect_FADE_FROM_UPPERLEFT :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_FADE_FROM_UPPERRIGHT :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_FADE_FROM_LOWERLEFT :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_FADE_FROM_LOWERRIGHT :
-                    nDirection += 4;
-                    nTransitionType = PPT_TRANSITION_TYPE_STRIPS;
-                break;
-
-                case ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_LOWERRIGHT :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_LOWERLEFT :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_UPPERRIGHT :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_UPPERLEFT :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_BOTTOM :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_RIGHT :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_TOP :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_UNCOVER_TO_LEFT :
-                    nTransitionType = PPT_TRANSITION_TYPE_PULL;
-                break;
-
-                case ::com::sun::star::presentation::FadeEffect_FADE_FROM_TOP :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_FADE_FROM_LEFT :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_FADE_FROM_BOTTOM :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_FADE_FROM_RIGHT :
-                    nTransitionType = PPT_TRANSITION_TYPE_WIPE;
-                break;
-
-                case ::com::sun::star::presentation::FadeEffect_ROLL_FROM_TOP :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_ROLL_FROM_LEFT :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_ROLL_FROM_BOTTOM :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_ROLL_FROM_RIGHT :
-                    nTransitionType = PPT_TRANSITION_TYPE_WIPE;
-                break;
-
-                case ::com::sun::star::presentation::FadeEffect_FADE_TO_CENTER :
-                    nDirection++;
-                case ::com::sun::star::presentation::FadeEffect_FADE_FROM_CENTER :
-                    nTransitionType = PPT_TRANSITION_TYPE_ZOOM;
-                break;
-
-                case ::com::sun::star::presentation::FadeEffect_NONE :
-                    nDirection = 2;
-                break;
-            }
-        }
-        if ( mnDiaMode == 2 )                                   // automatic ?
-            nBuildFlags |= 0x400;
-        if ( bVisible == FALSE )
-            nBuildFlags |= 4;
-        if ( bIsSound )
-            nBuildFlags |= 16;
-        if ( bLoopSound )
-            nBuildFlags |= 64;
-        if ( bStopSound )
-            nBuildFlags |= 256;
-
-        if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Duration" ) ) ) )// duration of this slide
-            nSlideTime = *(INT32*)aAny.getValue() << 10;        // in ticks
-
-
-        mpPptEscherEx->AddAtom( 16, EPP_SSSlideInfoAtom );
-        *mpStrm << nSlideTime       // standtime in ticks
-                << nSoundRef
-                << nDirection
-                << nTransitionType
-                << nBuildFlags
-                << nSpeed
-                << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0;
-    }
-
-    ImplCreateHeaderFooters( mXPagePropSet );
-
-    EscherSolverContainer aSolverContainer;
-    mpPptEscherEx->OpenContainer( EPP_PPDrawing );
-    mpPptEscherEx->OpenContainer( ESCHER_DgContainer );
-    mpPptEscherEx->EnterGroup(0,0);
-    ImplWritePage( rLayout, aSolverContainer, NORMAL, FALSE, nPageNum );    // Die Shapes der Seite werden im PPT Dok. erzeugt
-    mpPptEscherEx->LeaveGroup();
-
-    if ( bHasBackground )
-        ImplWriteBackground( aXBackgroundPropSet );
-    else
-    {
-        mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
-        mpPptEscherEx->AddShape( ESCHER_ShpInst_Rectangle, 0xc00 );             // Flags: Connector | Background | HasSpt
-        EscherPropertyContainer aPropOpt;
-        aPropOpt.AddOpt( ESCHER_Prop_fillRectRight, PPTtoEMU( maDestPageSize.Width ) );
-        aPropOpt.AddOpt( ESCHER_Prop_fillRectBottom, PPTtoEMU( maDestPageSize.Width ) );
-        aPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x120012 );
-        aPropOpt.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x80000 );
-        aPropOpt.AddOpt( ESCHER_Prop_bWMode, ESCHER_wDontShow );
-        aPropOpt.AddOpt( ESCHER_Prop_fBackground, 0x10001 );                // if true, this is the background shape
-        aPropOpt.Commit( *mpStrm );
-        mpPptEscherEx->CloseContainer();    // ESCHER_SpContainer
-    }
-
-    aSolverContainer.WriteSolver( *mpStrm );
-
-    mpPptEscherEx->CloseContainer();    // ESCHER_DgContainer
-    mpPptEscherEx->CloseContainer();    // EPP_Drawing
-    mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 1 );
-    *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0x99cc00 << (sal_uInt32)0xcc3333 << (sal_uInt32)0xffcccc << (sal_uInt32)0xb2b2b2;
-
-    SvMemoryStream aBinaryTagData10Atom;
-    ImplExportComments( mXDrawPage, aBinaryTagData10Atom );
-    if ( mbUseNewAnimations )
-    {
-        SvMemoryStream amsofbtAnimGroup;
-        ppt::AnimationExporter aExporter( aSolverContainer, maSoundCollection );
-        aExporter.doexport( mXDrawPage, amsofbtAnimGroup );
-        sal_uInt32 nmsofbtAnimGroupSize = amsofbtAnimGroup.Tell();
-        if ( nmsofbtAnimGroupSize )
-        {
-            {
-                EscherExAtom aMagic2( aBinaryTagData10Atom, 0x2eeb );
-                aBinaryTagData10Atom << (sal_uInt32)0x01c45df9
-                                     << (sal_uInt32)0xe1471b30;
-            }
-            {
-                EscherExAtom aMagic( aBinaryTagData10Atom, 0x2b00 );
-                aBinaryTagData10Atom << (sal_uInt32)0;
-            }
-            aBinaryTagData10Atom.Write( amsofbtAnimGroup.GetData(), amsofbtAnimGroup.Tell() );
-            {
-                EscherExContainer aMagic2( aBinaryTagData10Atom, 0x2b02 );
-            }
-        }
-    }
-    if ( aBinaryTagData10Atom.Tell() )
-    {
-        EscherExContainer aProgTags     ( *mpStrm, EPP_ProgTags );
-        EscherExContainer aProgBinaryTag( *mpStrm, EPP_ProgBinaryTag );
-        {
-            EscherExAtom aCString( *mpStrm, EPP_CString );
-            *mpStrm << (sal_uInt32)0x5f005f
-                    << (sal_uInt32)0x50005f
-                    << (sal_uInt32)0x540050
-                    << (sal_uInt16)0x31
-                    << (sal_uInt16)0x30;
-        }
-        {
-            EscherExAtom aBinaryTagData( *mpStrm, EPP_BinaryTagData );
-            mpStrm->Write( aBinaryTagData10Atom.GetData(), aBinaryTagData10Atom.Tell() );
-        }
-    }
-/*
-    if ( mbUseNewAnimations )
-    {
-        SvMemoryStream amsofbtAnimGroup;
-        ppt::AnimationExporter aExporter( aSolverContainer, maSoundCollection );
-        aExporter.doexport( mXDrawPage, amsofbtAnimGroup );
-        sal_uInt32 nmsofbtAnimGroupSize = amsofbtAnimGroup.Tell();
-        if ( nmsofbtAnimGroupSize )
-        {
-            EscherExContainer aProgTags     ( *mpStrm, EPP_ProgTags );
-            EscherExContainer aProgBinaryTag( *mpStrm, EPP_ProgBinaryTag );
-            {
-                EscherExAtom aCString( *mpStrm, EPP_CString );
-                *mpStrm << (sal_uInt32)0x5f005f
-                        << (sal_uInt32)0x50005f
-                        << (sal_uInt32)0x540050
-                        << (sal_uInt16)0x31
-                        << (sal_uInt16)0x30;
-            }
-            {
-                EscherExAtom aBinaryTagData( *mpStrm, EPP_BinaryTagData );
-                {
-                    {
-                        EscherExAtom aMagic2( *mpStrm, 0x2eeb );
-                        *mpStrm << (sal_uInt32)0x01c45df9
-                                << (sal_uInt32)0xe1471b30;
-                    }
-                    {
-                        EscherExAtom aMagic( *mpStrm, 0x2b00 );
-                        *mpStrm << (sal_uInt32)0;
-                    }
-                }
-                mpStrm->Write( amsofbtAnimGroup.GetData(), amsofbtAnimGroup.Tell() );
-                {
-                    EscherExContainer aMagic2( *mpStrm, 0x2b02 );
-                }
-            }
-        }
-    }
-*/
-    mpPptEscherEx->CloseContainer();    // EPP_Slide
-    return TRUE;
-};
-
-// ---------------------------------------------------------------------------------------------
-
-sal_Bool PPTWriter::ImplCreateNotes( sal_uInt32 nPageNum )
-{
-    if ( !ImplGetPageByIndex( nPageNum, NOTICE ) )
-        return FALSE;
-    ImplSetCurrentStyleSheet( ImplGetMasterIndex( NORMAL ) );
-
-
     mpPptEscherEx->PtReplaceOrInsert( EPP_Persist_Notes | nPageNum, mpStrm->Tell() );
     mpPptEscherEx->OpenContainer( EPP_Notes );
     mpPptEscherEx->AddAtom( 8, EPP_NotesAtom, 1 );
@@ -1655,7 +1271,7 @@ sal_Bool PPTWriter::ImplCreateNotes( sal_uInt32 nPageNum )
     mpPptEscherEx->OpenContainer( ESCHER_DgContainer );
     mpPptEscherEx->EnterGroup(0,0);
 
-    ImplWritePage( pPHLayout[ 20 ], aSolverContainer, NOTICE, FALSE );  // Die Shapes der Seite werden im PPT Dok. erzeugt
+    ImplWritePage( GetLayout( 20 ), aSolverContainer, NOTICE, FALSE );  // Die Shapes der Seite werden im PPT Dok. erzeugt
 
     mpPptEscherEx->LeaveGroup();
     mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
@@ -1679,7 +1295,6 @@ sal_Bool PPTWriter::ImplCreateNotes( sal_uInt32 nPageNum )
     mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 1 );
     *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0x99cc00 << (sal_uInt32)0xcc3333 << (sal_uInt32)0xffcccc << (sal_uInt32)0xb2b2b2;
     mpPptEscherEx->CloseContainer();    // EPP_Notes
-    return TRUE;
 };
 
 void PPTWriter::ImplWriteBackground( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet )
@@ -1744,18 +1359,18 @@ void PPTWriter::ImplWriteBackground( ::com::sun::star::uno::Reference< ::com::su
     mpPptEscherEx->CloseContainer();    // ESCHER_SpContainer
 }
 
-void PPTWriter::ImplWriteVBA( SvMemoryStream* pVBA )
+void PPTWriter::ImplWriteVBA()
 {
-    if ( pVBA )
+    if ( mpVBA )
     {
-        pVBA->Seek( STREAM_SEEK_TO_END );
-        sal_uInt32 nLen = pVBA->Tell();
+        mpVBA->Seek( STREAM_SEEK_TO_END );
+        sal_uInt32 nLen = mpVBA->Tell();
         if ( nLen > 8 )
         {
             nLen -= 8;
             mnVBAOleOfs = mpStrm->Tell();
             mpPptEscherEx->BeginAtom();
-            mpStrm->Write( (sal_Int8*)pVBA->GetData() + 8, nLen );
+            mpStrm->Write( (sal_Int8*)mpVBA->GetData() + 8, nLen );
             mpPptEscherEx->EndAtom( EPP_ExOleObjStg, 0, 1 );
         }
     }
@@ -1763,11 +1378,11 @@ void PPTWriter::ImplWriteVBA( SvMemoryStream* pVBA )
 
 // ---------------------------------------------------------------------------------------------
 
-void PPTWriter::ImplWriteOLE( sal_uInt32 nCnvrtFlags )
+void PPTWriter::ImplWriteOLE( )
 {
     PPTExOleObjEntry* pPtr;
 
-    SvxMSExportOLEObjects aOleExport( nCnvrtFlags );
+    SvxMSExportOLEObjects aOleExport( mnCnvrtFlags );
 
     for ( pPtr = (PPTExOleObjEntry*)maExOleObj.First(); pPtr;
         pPtr = (PPTExOleObjEntry*)maExOleObj.Next() )
@@ -1858,7 +1473,6 @@ sal_Bool PPTWriter::ImplWriteAtomEnding()
 #define EPP_LastViewTypeOutlineView 2
 #define EPP_LastViewTypeNotes       3
 
-
     sal_uInt32  i, nPos, nOfs, nPersistOfs = mpStrm->Tell();
     sal_uInt32  nPersistEntrys = 0;
     *mpStrm << (sal_uInt32)0 << (sal_uInt32)0 << (sal_uInt32)0;         // Record Header und ersten Eintrag ueberspringen
@@ -1962,488 +1576,6 @@ sal_Bool PPTWriter::ImplWriteAtomEnding()
     return TRUE;
 }
 
-// ---------------------------------------------------------------------------------------------
-
-PPTExCharSheet::PPTExCharSheet( int nInstance )
-{
-    sal_uInt16 nFontHeight = 24;
-
-    for ( int nDepth = 0; nDepth < 5; nDepth++ )
-    {
-        PPTExCharLevel& rLev = maCharLevel[ nDepth ];
-        switch ( nInstance )
-        {
-            case EPP_TEXTTYPE_Title :
-            case EPP_TEXTTYPE_CenterTitle :
-                nFontHeight = 44;
-            break;
-            case EPP_TEXTTYPE_Body :
-            case EPP_TEXTTYPE_CenterBody :
-            case EPP_TEXTTYPE_HalfBody :
-            case EPP_TEXTTYPE_QuarterBody :
-            {
-                switch ( nDepth )
-                {
-                    case 0 : nFontHeight = 32; break;
-                    case 1 : nFontHeight = 28; break;
-                    case 2 : nFontHeight = 24; break;
-                    default :nFontHeight = 20; break;
-                }
-            }
-            break;
-            case EPP_TEXTTYPE_Notes :
-                nFontHeight = 12;
-            break;
-            case EPP_TEXTTYPE_notUsed :
-            case EPP_TEXTTYPE_Other :
-                nFontHeight = 24;
-            break;
-        }
-        rLev.mnFlags = 0;
-        rLev.mnFont = 0;
-        rLev.mnAsianOrComplexFont = 0xffff;
-        rLev.mnFontHeight = nFontHeight;
-        rLev.mnFontColor = 0;
-        rLev.mnEscapement = 0;
-    }
-}
-
-
-void PPTExCharSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
-                                    FontCollection& rFontCollection, int nLevel )
-{
-    PortionObj  aPortionObj( rXPropSet, rFontCollection );
-
-    PPTExCharLevel& rLev = maCharLevel[ nLevel ];
-
-    if ( aPortionObj.meCharColor == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
-        rLev.mnFontColor = aPortionObj.mnCharColor;
-    if ( aPortionObj.meCharEscapement == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
-        rLev.mnEscapement = aPortionObj.mnCharEscapement;
-    if ( aPortionObj.meCharHeight == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
-        rLev.mnFontHeight = aPortionObj.mnCharHeight;
-    if ( aPortionObj.meFontName == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
-        rLev.mnFont = aPortionObj.mnFont;
-    if ( aPortionObj.meAsianOrComplexFont == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
-        rLev.mnAsianOrComplexFont = aPortionObj.mnAsianOrComplexFont;
-    rLev.mnFlags = aPortionObj.mnCharAttr;
-}
-
-void PPTExCharSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bool, sal_Bool bSimpleText,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPagePropSet )
-{
-    const PPTExCharLevel& rLev = maCharLevel[ nLev ];
-
-    sal_uInt32 nCharFlags = 0xefffff;
-    if ( bSimpleText )
-        nCharFlags = 0x7ffff;
-
-    rSt << nCharFlags
-        << rLev.mnFlags
-        << rLev.mnFont;
-
-    sal_uInt32 nFontColor = rLev.mnFontColor;
-    if ( nFontColor == COL_AUTO )
-    {
-        sal_Bool bIsDark = sal_False;
-        ::com::sun::star::uno::Any aAny;
-        if ( PropValue::GetPropertyValue( aAny, rPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundDark" ) ), sal_True ) )
-            aAny >>= bIsDark;
-        nFontColor = bIsDark ? 0xffffff : 0x000000;
-    }
-    nFontColor &= 0xffffff;
-    nFontColor |= 0xfe000000;
-    if ( bSimpleText )
-    {
-        rSt << rLev.mnFontHeight
-            << nFontColor;
-    }
-    else
-    {
-        rSt << rLev.mnAsianOrComplexFont
-            << (sal_uInt16)0xffff       // unbekannt
-            << (sal_uInt16)0xffff       // unbekannt
-            << rLev.mnFontHeight
-            << nFontColor
-            << rLev.mnEscapement;
-    }
-}
-
-PPTExParaSheet::PPTExParaSheet( int nInstance, sal_uInt16 nDefaultTab, PPTExBulletProvider& rProv ) :
-    rBuProv     ( rProv ),
-    mnInstance  ( nInstance )
-{
-    sal_Bool bHasBullet = FALSE;
-
-    sal_uInt16 nUpperDist = 0;
-    sal_uInt16 nBulletChar = 0x2022;
-    sal_uInt16 nBulletOfs = 0;
-    sal_uInt16 nTextOfs = 0;
-
-    for ( int nDepth = 0; nDepth < 5; nDepth++ )
-    {
-        PPTExParaLevel& rLev = maParaLevel[ nDepth ];
-        switch ( nInstance )
-        {
-            case EPP_TEXTTYPE_Title :
-            case EPP_TEXTTYPE_CenterTitle :
-            break;
-            case EPP_TEXTTYPE_Body :
-            case EPP_TEXTTYPE_CenterBody :
-            case EPP_TEXTTYPE_HalfBody :
-            case EPP_TEXTTYPE_QuarterBody :
-            {
-                bHasBullet = TRUE;
-                nUpperDist = 0x14;
-            }
-            break;
-            case EPP_TEXTTYPE_Notes :
-                nUpperDist = 0x1e;
-            break;
-
-//          default :
-//          case EPP_TEXTTYPE_notUsed :
-//          case EPP_TEXTTYPE_Other :
-//          break;
-        }
-        switch ( nDepth )
-        {
-            case 0 :
-            {
-                nBulletChar = 0x2022;
-                nBulletOfs = 0;
-                nTextOfs = ( bHasBullet ) ? 0xd8 : 0;
-            }
-            break;
-            case 1 :
-            {
-                nBulletChar = 0x2013;
-                nBulletOfs = 0x120;
-                nTextOfs = 0x1d4;
-            }
-            break;
-            case 2 :
-            {
-                nBulletChar = 0x2022;
-                nBulletOfs = 0x240;
-                nTextOfs = 0x2d0;
-            }
-            break;
-            case 3 :
-            {
-                nBulletChar = 0x2013;
-                nBulletOfs = 0x360;
-                nTextOfs = 0x3f0;
-            }
-            break;
-            case 4 :
-            {
-                nBulletChar = 0xbb;
-                nBulletOfs = 0x480;
-                nTextOfs = 0x510;
-            }
-            break;
-        }
-        rLev.mbIsBullet = bHasBullet;
-        rLev.mnBulletChar = nBulletChar;
-        rLev.mnBulletFont = 0;
-        rLev.mnBulletHeight = 100;
-        rLev.mnBulletColor = 0;
-        rLev.mnAdjust = 0;
-        rLev.mnLineFeed = 100;
-        rLev.mnLowerDist = 0;
-        rLev.mnUpperDist = nUpperDist;
-        rLev.mnTextOfs = nTextOfs;
-        rLev.mnBulletOfs = nBulletOfs;
-        rLev.mnDefaultTab = nDefaultTab;
-        rLev.mnAsianSettings = 2;
-        rLev.mnBiDi = 0;
-
-        rLev.mbExtendedBulletsUsed = FALSE;
-        rLev.mnBulletId = 0xffff;
-        rLev.mnBulletStart = 0;
-        rLev.mnMappedNumType = 0;
-        rLev.mnNumberingType = 0;
-    }
-}
-
-void PPTExParaSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
-                                        FontCollection& rFontCollection, int nLevel, const PPTExCharLevel& rCharLevel )
-{
-    ParagraphObj aParagraphObj( rXPropSet, rBuProv );
-    aParagraphObj.CalculateGraphicBulletSize( rCharLevel.mnFontHeight );
-    PPTExParaLevel& rLev = maParaLevel[ nLevel ];
-
-    if ( aParagraphObj.meTextAdjust == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
-        rLev.mnAdjust = aParagraphObj.mnTextAdjust;
-    if ( aParagraphObj.meLineSpacing == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
-    {
-        sal_Int16 nLineSpacing = aParagraphObj.mnLineSpacing;
-        if ( nLineSpacing > 0 ) // if nLinespacing is < 0 the linespacing is an absolute spacing
-        {
-            sal_Bool bFixedLineSpacing = sal_False;
-            uno::Any aAny = rXPropSet->getPropertyValue( ::rtl::OUString(
-                                                             RTL_CONSTASCII_USTRINGPARAM(
-                                                                 "FontIndependentLineSpacing" ) ) );
-            if( !(aAny >>= bFixedLineSpacing) || !bFixedLineSpacing )
-            {
-                const FontCollectionEntry* pDesc = rFontCollection.GetById( rCharLevel.mnFont );
-                if ( pDesc )
-                    nLineSpacing = (sal_Int16)( (double)nLineSpacing * pDesc->Scaling + 0.5 );
-            }
-        }
-        else
-        {
-            if ( rCharLevel.mnFontHeight > (sal_uInt16)( ((double)-nLineSpacing) * 0.001 * 72.0 / 2.54 ) ) // 1/100mm to point
-            {
-                const FontCollectionEntry* pDesc = rFontCollection.GetById( rCharLevel.mnFont );
-                if ( pDesc )
-                     nLineSpacing = (sal_Int16)( (double)100.0 * pDesc->Scaling + 0.5 );
-                else
-                    nLineSpacing = 100;
-            }
-            else
-                nLineSpacing = (sal_Int16)( (double)nLineSpacing / 4.40972 );
-        }
-        rLev.mnLineFeed = nLineSpacing;
-    }
-    if ( aParagraphObj.meLineSpacingBottom == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
-        rLev.mnLowerDist = aParagraphObj.mnLineSpacingBottom;
-    if ( aParagraphObj.meLineSpacingTop == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
-        rLev.mnUpperDist = aParagraphObj.mnLineSpacingTop;
-    if ( aParagraphObj.meForbiddenRules == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
-    {
-        rLev.mnAsianSettings &=~1;
-        if ( aParagraphObj.mbForbiddenRules )
-            rLev.mnAsianSettings |= 1;
-    }
-    if ( aParagraphObj.meParagraphPunctation == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
-    {
-        rLev.mnAsianSettings &=~4;
-        if ( aParagraphObj.mbParagraphPunctation )
-            rLev.mnAsianSettings |= 4;
-    }
-
-    if ( aParagraphObj.meBiDi == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
-        rLev.mnBiDi = aParagraphObj.mnBiDi;
-
-    rLev.mbIsBullet = aParagraphObj.mbIsBullet; //( ( aParagraphObj.nBulletFlags & 1 ) != 0 );
-
-    if ( !nLevel )
-    {
-        if ( ( aParagraphObj.meBullet ==  ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
-                    && aParagraphObj.bExtendedParameters )
-        {
-            for ( sal_Int16 i = 0; i < 5; i++ )
-            {
-                PPTExParaLevel& rLevel = maParaLevel[ i ];
-                if ( i )
-                    aParagraphObj.ImplGetNumberingLevel( rBuProv, i, FALSE );
-//              rLevel.mbIsBullet = ( ( aParagraphObj.nBulletFlags & 1 ) != 0 );
-                rLevel.mnTextOfs = aParagraphObj.nTextOfs;
-                rLevel.mnBulletOfs = (sal_uInt16)aParagraphObj.nBulletOfs;
-                rLevel.mnBulletChar = aParagraphObj.cBulletId;
-                FontCollectionEntry aFontDescEntry( aParagraphObj.aFontDesc.Name, aParagraphObj.aFontDesc.Family,
-                                                        aParagraphObj.aFontDesc.Pitch, aParagraphObj.aFontDesc.CharSet );
-                rLevel.mnBulletFont = (sal_uInt16)rFontCollection.GetId( aFontDescEntry );
-                rLevel.mnBulletHeight = aParagraphObj.nBulletRealSize;
-                rLevel.mnBulletColor = aParagraphObj.nBulletColor;
-
-                rLevel.mbExtendedBulletsUsed = aParagraphObj.bExtendedBulletsUsed;
-                rLevel.mnBulletId = aParagraphObj.nBulletId;
-                rLevel.mnNumberingType = aParagraphObj.nNumberingType;
-                rLevel.mnBulletStart = aParagraphObj.nStartWith;
-                rLevel.mnMappedNumType = aParagraphObj.nMappedNumType;
-            }
-        }
-    }
-}
-
-void PPTExParaSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bool, sal_Bool bSimpleText,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPagePropSet )
-{
-    const PPTExParaLevel& rLev = maParaLevel[ nLev ];
-
-    if ( maParaLevel[ 0 ].mbExtendedBulletsUsed || maParaLevel[ 1 ].mbExtendedBulletsUsed ||
-            maParaLevel[ 2 ].mbExtendedBulletsUsed || maParaLevel[ 3 ].mbExtendedBulletsUsed ||
-                maParaLevel[ 4 ].mbExtendedBulletsUsed )
-    {
-        SvStream& rOut = rBuProv.aBuExMasterStream;
-        if ( !nLev )
-        {
-            rOut << (sal_uInt32)( ( EPP_PST_ExtendedParagraphMasterAtom << 16 ) | ( mnInstance << 4 ) )
-                 << (sal_uInt32)( 5 * 16 + 2 )
-                 << (sal_uInt16)5;              // depth
-        }
-        sal_uInt16 nBulletId = rLev.mnBulletId;
-        if ( rLev.mnNumberingType != SVX_NUM_BITMAP )
-            nBulletId = 0xffff;
-        rOut << (sal_uInt32)0x03800000
-             << (sal_uInt16)nBulletId
-             << (sal_uInt32)rLev.mnMappedNumType
-             << (sal_uInt16)rLev.mnBulletStart
-             << (sal_uInt32)0;
-    }
-
-    sal_uInt32 nParaFlags = 0x3ffdff;
-    sal_uInt16 nBulletFlags = ( rLev.mbIsBullet ) ? 0xf : 0xe;
-
-    if ( nLev )
-        nParaFlags &= 0x207fff;
-    if ( bSimpleText )
-        nParaFlags &= 0x7fff;
-    sal_uInt32 nBulletColor = rLev.mnBulletColor;
-    if ( nBulletColor == COL_AUTO )
-    {
-        sal_Bool bIsDark = sal_False;
-        ::com::sun::star::uno::Any aAny;
-        if ( PropValue::GetPropertyValue( aAny, rPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundDark" ) ), sal_True ) )
-            aAny >>= bIsDark;
-        nBulletColor = bIsDark ? 0xffffff : 0x000000;
-    }
-    nBulletColor &= 0xffffff;
-    nBulletColor |= 0xfe000000;
-    rSt << nParaFlags
-        << nBulletFlags
-        << rLev.mnBulletChar
-        << rLev.mnBulletFont
-        << rLev.mnBulletHeight
-        << nBulletColor
-        << rLev.mnAdjust
-        << rLev.mnLineFeed
-        << rLev.mnUpperDist
-        << rLev.mnLowerDist
-        << rLev.mnTextOfs
-        << rLev.mnBulletOfs;
-
-    if ( bSimpleText || nLev )
-    {
-        if ( nParaFlags & 0x200000 )
-            rSt << rLev.mnBiDi;
-    }
-    else
-    {
-        rSt << rLev.mnDefaultTab
-            << (sal_uInt16)0
-            << (sal_uInt16)0
-            << rLev.mnAsianSettings
-            << rLev.mnBiDi;
-    }
-}
-
-
-PPTExStyleSheet::PPTExStyleSheet( sal_uInt16 nDefaultTab, PPTExBulletProvider& rBuProv )
-{
-    for ( int nInstance = EPP_TEXTTYPE_Title; nInstance <= EPP_TEXTTYPE_QuarterBody; nInstance++ )
-    {
-        mpParaSheet[ nInstance ] = ( nInstance == EPP_TEXTTYPE_notUsed ) ? NULL : new PPTExParaSheet( nInstance, nDefaultTab, rBuProv );
-        mpCharSheet[ nInstance ] = ( nInstance == EPP_TEXTTYPE_notUsed ) ? NULL : new PPTExCharSheet( nInstance );
-    }
-}
-
-PPTExStyleSheet::~PPTExStyleSheet()
-{
-    for ( int nInstance = EPP_TEXTTYPE_Title; nInstance <= EPP_TEXTTYPE_QuarterBody; nInstance++ )
-    {
-        if ( nInstance == EPP_TEXTTYPE_notUsed )
-            continue;
-
-        delete mpParaSheet[ nInstance ];
-        delete mpCharSheet[ nInstance ];
-    }
-}
-
-void PPTExStyleSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
-                                        FontCollection& rFontCollection, int nInstance, int nLevel )
-{
-    if ( nInstance == EPP_TEXTTYPE_notUsed )
-        return;
-    mpCharSheet[ nInstance ]->SetStyleSheet( rXPropSet, rFontCollection, nLevel );
-    mpParaSheet[ nInstance ]->SetStyleSheet( rXPropSet, rFontCollection, nLevel, mpCharSheet[ nInstance ]->maCharLevel[ nLevel ] );
-}
-
-sal_Bool PPTExStyleSheet::IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLevel, PPTExTextAttr eAttr, sal_uInt32 nValue )
-{
-    const PPTExParaLevel& rPara = mpParaSheet[ nInstance ]->maParaLevel[ nLevel ];
-    const PPTExCharLevel& rChar = mpCharSheet[ nInstance ]->maCharLevel[ nLevel ];
-
-    sal_uInt32 nFlag = 0;
-
-    switch ( eAttr )
-    {
-        case ParaAttr_BulletOn : return ( rPara.mbIsBullet ) ? ( nValue ) ? FALSE : TRUE : ( nValue ) ? TRUE : FALSE;
-        case ParaAttr_BuHardFont :
-        case ParaAttr_BulletFont : return ( rPara.mnBulletFont != nValue );
-        case ParaAttr_BuHardColor :
-        case ParaAttr_BulletColor : return ( rPara.mnBulletColor != nValue );
-        case ParaAttr_BuHardHeight :
-        case ParaAttr_BulletHeight : return ( rPara.mnBulletHeight != nValue );
-        case ParaAttr_BulletChar : return ( rPara.mnBulletChar != nValue );
-        case ParaAttr_Adjust : return ( rPara.mnAdjust != nValue );
-        case ParaAttr_LineFeed : return ( rPara.mnLineFeed != nValue );
-        case ParaAttr_UpperDist : return ( rPara.mnUpperDist != nValue );
-        case ParaAttr_LowerDist : return ( rPara.mnLowerDist != nValue );
-        case ParaAttr_TextOfs : return ( rPara.mnTextOfs != nValue );
-        case ParaAttr_BulletOfs : return ( rPara.mnBulletOfs != nValue );
-        case ParaAttr_DefaultTab : return ( rPara.mnDefaultTab != nValue );
-        case ParaAttr_BiDi : return ( rPara.mnBiDi != nValue );
-        case CharAttr_Bold : nFlag = 1; break;
-        case CharAttr_Italic : nFlag = 2; break;
-        case CharAttr_Underline : nFlag = 4; break;
-        case CharAttr_Shadow : nFlag = 16; break;
-        case CharAttr_Strikeout : nFlag = 256; break;
-        case CharAttr_Embossed : nFlag = 512; break;
-        case CharAttr_Font : return ( rChar.mnFont != nValue );
-        case CharAttr_AsianOrComplexFont : return ( rChar.mnAsianOrComplexFont != nValue );
-        case CharAttr_Symbol : return TRUE;
-        case CharAttr_FontHeight : return ( rChar.mnFontHeight != nValue );
-        case CharAttr_FontColor : return ( rChar.mnFontColor != nValue );
-        case CharAttr_Escapement : return ( rChar.mnEscapement != nValue );
-        default:
-            break;
-    };
-    if ( nFlag )
-    {
-        if ( rChar.mnFlags & nFlag )
-            return ( ( nValue & nFlag ) == 0 );
-        else
-            return ( ( nValue & nFlag ) != 0 );
-    }
-    return TRUE;
-}
-
-sal_uInt32 PPTExStyleSheet::SizeOfTxCFStyleAtom() const
-{
-    return 24;
-}
-
-// the TxCFStyleAtom stores the text properties that are used
-// when creating new objects in PowerPoint.
-
-void PPTExStyleSheet::WriteTxCFStyleAtom( SvStream& rSt )
-{
-    const PPTExCharLevel& rCharStyle = mpCharSheet[ EPP_TEXTTYPE_Other ]->maCharLevel[ 0 ];
-
-    sal_uInt16 nFlags = 0x60        // ??
-                      | 0x02        // fontsize;
-                      | 0x04;       // fontcolor
-
-    sal_uInt32 nCharFlags = rCharStyle.mnFlags;
-    nCharFlags &= CharAttr_Italic | CharAttr_Bold | CharAttr_Underline | CharAttr_Shadow;
-
-    rSt << (sal_uInt32)( EPP_TxCFStyleAtom << 16 )  // recordheader
-        << SizeOfTxCFStyleAtom() - 8
-        << (sal_uInt16)( 0x80 | nCharFlags )
-        << (sal_uInt16)nFlags
-        << (sal_uInt16)nCharFlags
-        << (sal_Int32)-1                            // ?
-        << rCharStyle.mnFontHeight
-        << rCharStyle.mnFontColor;
-}
-
-
-// ---------------------------------------------------------------------------------------------
-
 // ---------------------
 // - exported function -
 // ---------------------
@@ -2459,6 +1591,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT BOOL __LOADONCALLAPI ExportPPT( SvStorageRef& rS
     pPPTWriter = new PPTWriter( rSvStorage, rXModel, rXStatInd, pVBA, nCnvrtFlags );
     if ( pPPTWriter )
     {
+        pPPTWriter->exportPPT();
         bStatus = ( pPPTWriter->IsValid() == TRUE );
         delete pPPTWriter;
     }
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index 0f427275e637..11cd4f714fae 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -39,6 +39,8 @@
 #include "pptexanimations.hxx"
 #include <pptexsoundcollection.hxx>
 
+#include "text.hxx"
+
 // ------------------------------------------------------------------------
 
 #include <vcl/mapmod.hxx>
@@ -91,7 +93,7 @@
 #include <com/sun/star/text/WritingMode.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 
-enum PageType { NORMAL = 0, MASTER = 1, NOTICE = 2, UNDEFINED = 3 };
+#include <epptbase.hxx>
 
 #define EPP_MAINMASTER_PERSIST_KEY      0x80010000
 #define EPP_MAINNOTESMASTER_PERSIST_KEY 0x80020000
@@ -112,283 +114,6 @@ enum PageType { NORMAL = 0, MASTER = 1, NOTICE = 2, UNDEFINED = 3 };
 #define EPP_TEXTSTYLE_BODY              0x00000100
 #define EPP_TEXTSTYLE_TEXT              0x00001000
 
-// PLACEMENT_ID
-#define EPP_LAYOUT_TITLESLIDE             0 /* The slide is a title slide                                                             */
-#define EPP_LAYOUT_TITLEANDBODYSLIDE      1 /* Title and body slide                                                                   */
-#define EPP_LAYOUT_TITLEMASTERSLIDE       2 /* Title master slide                                                                     */
-#define EPP_LAYOUT_MASTERSLIDE            3 /* Master slide layout                                                                    */
-#define EPP_LAYOUT_MASTERNOTES            4 /* Master notes layout                                                                    */
-#define EPP_LAYOUT_NOTESTITLEBODY         5 /* Notes title/body layout                                                                */
-#define EPP_LAYOUT_HANDOUTLAYOUT          6 /* Handout layout, therefore it doesn't have placeholders except header, footer, and date */
-#define EPP_LAYOUT_ONLYTITLE              7 /* Only title placeholder                                                                 */
-#define EPP_LAYOUT_2COLUMNSANDTITLE       8 /* Body of the slide has 2 columns and a title                                            */
-#define EPP_LAYOUT_2ROWSANDTITLE          9 /* Slide's body has 2 rows and a title                                                    */
-#define EPP_LAYOUT_RIGHTCOLUMN2ROWS      10 /* Body contains 2 columns, right column has 2 rows                                       */
-#define EPP_LAYOUT_LEFTCOLUMN2ROWS       11 /* Body contains 2 columns, left column has 2 rows                                        */
-#define EPP_LAYOUT_BOTTOMROW2COLUMNS     12 /* Body contains 2 rows, bottom row has 2 columns                                         */
-#define EPP_LAYOUT_TOPROW2COLUMN         13 /* Body contains 2 rows, top row has 2 columns                                            */
-#define EPP_LAYOUT_4OBJECTS              14 /* 4 objects                                                                              */
-#define EPP_LAYOUT_BIGOBJECT             15 /* Big object                                                                             */
-#define EPP_LAYOUT_BLANCSLIDE            16 /* Blank slide                                                                            */
-#define EPP_LAYOUT_TITLERIGHTBODYLEFT    17 /* Vertical title on the right, body on the left                                          */
-#define EPP_LAYOUT_TITLERIGHT2BODIESLEFT 18 /* Vertical title on the right, body on the left split into 2 rows                        */
-
-class Polygon;
-class PptEscherEx;
-class XStatusIndicatorRef;
-
-struct PHLayout
-{
-    sal_Int32   nLayout;
-    sal_uInt8   nPlaceHolder[ 8 ];
-
-    sal_uInt8   nUsedObjectPlaceHolder;
-    sal_uInt8   nTypeOfTitle;
-    sal_uInt8   nTypeOfOutliner;
-
-    BOOL    bTitlePossible;
-    BOOL    bOutlinerPossible;
-    BOOL    bSecOutlinerPossible;
-};
-
-struct SOParagraph
-{
-    sal_Bool                bExtendedParameters;
-    sal_uInt32              nParaFlags;
-    sal_Int16               nBulletFlags;
-    String                  sPrefix;
-    String                  sSuffix;
-    String                  sGraphicUrl;            // String auf eine Graphic
-    Size                    aBuGraSize;
-    sal_uInt32              nNumberingType;         // in wirlichkeit ist dies ein SvxEnum
-    sal_uInt32              nHorzAdjust;
-    sal_uInt32              nBulletColor;
-    sal_Int32               nBulletOfs;
-    sal_Int16               nStartWith;             // Start der nummerierung
-    sal_Int16               nTextOfs;
-    sal_Int16               nBulletRealSize;        // GroessenVerhaeltnis in Proz
-    sal_Int16               nDepth;                 // aktuelle tiefe
-    sal_Unicode             cBulletId;              // wenn Numbering Type == CharSpecial
-    ::com::sun::star::awt::FontDescriptor       aFontDesc;
-
-    sal_Bool                bExtendedBulletsUsed;
-    sal_uInt16              nBulletId;
-    sal_uInt32              nMappedNumType;
-    sal_Bool                bNumberingIsNumber;
-
-    SOParagraph()
-    {
-        nDepth = 0;
-        bExtendedParameters = FALSE;
-        nParaFlags = 0;
-        nBulletFlags = 0;
-        nBulletOfs = 0;
-        nTextOfs = 0;
-        bExtendedBulletsUsed = FALSE;
-        nBulletId = 0xffff;
-        bNumberingIsNumber = sal_True;
-    };
-};
-
-// ------------------------------------------------------------------------
-
-class EscherGraphicProvider;
-class PPTExBulletProvider
-{
-    friend struct PPTExParaSheet;
-
-    protected :
-
-        SvMemoryStream          aBuExPictureStream;
-        SvMemoryStream          aBuExOutlineStream;
-        SvMemoryStream          aBuExMasterStream;
-
-        EscherGraphicProvider*  pGraphicProv;
-
-    public :
-
-        sal_uInt16              GetId( const ByteString& rUniqueId, Size& rGraphicSize );
-
-                                PPTExBulletProvider();
-                                ~PPTExBulletProvider();
-};
-
-struct FontCollectionEntry
-{
-        String                  Name;
-        double                  Scaling;
-        sal_Int16               Family;
-        sal_Int16               Pitch;
-        sal_Int16               CharSet;
-
-        String                  Original;
-        sal_Bool                bIsConverted;
-
-        FontCollectionEntry( const String& rName, sal_Int16 nFamily, sal_Int16 nPitch, sal_Int16 nCharSet ) :
-                            Scaling ( 1.0 ),
-                            Family  ( nFamily ),
-                            Pitch   ( nPitch ),
-                            CharSet ( nCharSet ),
-                            Original( rName )
-                            {
-                                ImplInit( rName );
-                            };
-
-        FontCollectionEntry( const String& rName ) :
-                            Scaling ( 1.0 ),
-                            Original( rName )
-                            {
-                                ImplInit( rName );
-                            };
-        ~FontCollectionEntry();
-
-    private :
-
-        FontCollectionEntry() {};
-
-        void ImplInit( const String& rName );
-};
-
-class VirtualDevice;
-class FontCollection : private List
-{
-        VirtualDevice* pVDev;
-    public :
-                    FontCollection();
-                    ~FontCollection();
-
-        short       GetScriptDirection( const String& rText ) const;
-        sal_uInt32  GetId( FontCollectionEntry& rFontDescriptor );
-        sal_uInt32  GetCount() const { return List::Count(); };
-        const FontCollectionEntry*                      GetById( sal_uInt32 nId );
-        FontCollectionEntry&    GetLast() { return *(FontCollectionEntry*)List::Last(); };
-};
-
-// ------------------------------------------------------------------------
-
-#define PPTEX_STYLESHEETENTRYS  9
-
-enum PPTExTextAttr
-{
-    ParaAttr_BulletOn,
-    ParaAttr_BuHardFont,
-    ParaAttr_BuHardColor,
-    ParaAttr_BuHardHeight,
-    ParaAttr_BulletChar,
-    ParaAttr_BulletFont,
-    ParaAttr_BulletHeight,
-    ParaAttr_BulletColor,
-    ParaAttr_Adjust,
-    ParaAttr_LineFeed,
-    ParaAttr_UpperDist,
-    ParaAttr_LowerDist,
-    ParaAttr_TextOfs,
-    ParaAttr_BulletOfs,
-    ParaAttr_DefaultTab,
-    ParaAttr_AsianLB_1,
-    ParaAttr_AsianLB_2,
-    ParaAttr_AsianLB_3,
-    ParaAttr_BiDi,
-    CharAttr_Bold,
-    CharAttr_Italic,
-    CharAttr_Underline,
-    CharAttr_Shadow,
-    CharAttr_Strikeout,
-    CharAttr_Embossed,
-    CharAttr_Font,
-    CharAttr_AsianOrComplexFont,
-    CharAttr_Symbol,
-    CharAttr_FontHeight,
-    CharAttr_FontColor,
-    CharAttr_Escapement
-};
-
-struct PPTExCharLevel
-{
-    sal_uInt16      mnFlags;
-    sal_uInt16      mnFont;
-    sal_uInt16      mnAsianOrComplexFont;
-    sal_uInt16      mnFontHeight;
-    sal_uInt16      mnEscapement;
-    sal_uInt32      mnFontColor;
-};
-
-struct PPTExCharSheet
-{
-                PPTExCharLevel  maCharLevel[ 5 ];
-
-                PPTExCharSheet( int nInstance );
-
-                void    SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
-                                        FontCollection& rFontCollection, int nLevel );
-                void    Write( SvStream& rSt, PptEscherEx* pEx, sal_uInt16 nLev, sal_Bool bFirst, sal_Bool bSimpleText,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPagePropSet );
-
-};
-
-struct PPTExParaLevel
-{
-    sal_Bool        mbIsBullet;
-    sal_uInt16      mnBulletChar;
-    sal_uInt16      mnBulletFont;
-    sal_uInt16      mnBulletHeight;
-    sal_uInt32      mnBulletColor;
-
-    sal_uInt16      mnAdjust;
-    sal_uInt16      mnLineFeed;
-    sal_uInt16      mnUpperDist;
-    sal_uInt16      mnLowerDist;
-    sal_uInt16      mnTextOfs;
-    sal_uInt16      mnBulletOfs;
-    sal_uInt16      mnDefaultTab;
-
-    sal_Bool        mbExtendedBulletsUsed;
-    sal_uInt16      mnBulletId;
-    sal_uInt16      mnBulletStart;
-    sal_uInt32      mnMappedNumType;
-    sal_uInt32      mnNumberingType;
-    sal_uInt16      mnAsianSettings;
-    sal_uInt16      mnBiDi;
-};
-
-struct PPTExParaSheet
-{
-                PPTExBulletProvider& rBuProv;
-
-                sal_uInt32  mnInstance;
-
-                PPTExParaLevel  maParaLevel[ 5 ];
-                PPTExParaSheet( int nInstance, sal_uInt16 nDefaultTab, PPTExBulletProvider& rProv );
-
-                void    SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
-                                        FontCollection& rFontCollection, int nLevel, const PPTExCharLevel& rCharLevel );
-                void    Write( SvStream& rSt, PptEscherEx* pEx, sal_uInt16 nLev, sal_Bool bFirst, sal_Bool bSimpleText,
-                    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPagePropSet );
-};
-
-class PPTExStyleSheet
-{
-
-    public :
-
-                PPTExCharSheet*     mpCharSheet[ PPTEX_STYLESHEETENTRYS ];
-                PPTExParaSheet*     mpParaSheet[ PPTEX_STYLESHEETENTRYS ];
-
-                PPTExStyleSheet( sal_uInt16 nDefaultTab, PPTExBulletProvider& rBuProv );
-                ~PPTExStyleSheet();
-
-                PPTExParaSheet& GetParaSheet( int nInstance ) { return *mpParaSheet[ nInstance ]; };
-                PPTExCharSheet& GetCharSheet( int nInstance ) { return *mpCharSheet[ nInstance ]; };
-
-                void            SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
-                                                FontCollection& rFontCollection, int nInstance, int nLevel );
-                sal_Bool        IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLevel, PPTExTextAttr eAttr, sal_uInt32 nValue );
-
-                sal_uInt32      SizeOfTxCFStyleAtom() const;
-                void            WriteTxCFStyleAtom( SvStream& rSt );
-};
-
-
 struct EPPTHyperlink
 {
     String      aURL;
@@ -433,293 +158,34 @@ struct TextRuleEntry
     ~TextRuleEntry() { delete pOut; };
 };
 
-// ------------------------------------------------------------------------
-
-struct GroupEntry
-{
-        sal_uInt32                  mnCurrentPos;
-        sal_uInt32                  mnCount;
-        ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >           mXIndexAccess;
-                                GroupEntry( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & rIndex )
-                                {
-                                    mXIndexAccess = rIndex;
-                                    mnCount =mXIndexAccess->getCount();
-                                    mnCurrentPos = 0;
-                                };
-                                GroupEntry( sal_uInt32 nCount )
-                                {
-                                    mnCount = nCount;
-                                    mnCurrentPos = 0;
-                                };
-                                ~GroupEntry(){};
-};
-
-// ------------------------------------------------------------------------
-
-class GroupTable
-{
-    protected:
-
-        sal_uInt32              mnIndex;
-        sal_uInt32              mnCurrentGroupEntry;
-        sal_uInt32              mnMaxGroupEntry;
-        sal_uInt32              mnGroupsClosed;
-        GroupEntry**            mpGroupEntry;
-
-        void                    ImplResizeGroupTable( sal_uInt32 nEntrys );
-
-    public:
-
-        sal_uInt32              GetCurrentGroupIndex() const { return mnIndex; };
-        sal_Int32               GetCurrentGroupLevel() const { return mnCurrentGroupEntry - 1; };
-        ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > &
-                                GetCurrentGroupAccess() const { return mpGroupEntry[  mnCurrentGroupEntry - 1 ]->mXIndexAccess; };
-        sal_uInt32              GetGroupsClosed();
-        void                    ResetGroupTable( sal_uInt32 nCount );
-        void                    ClearGroupTable();
-        sal_Bool                EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & rIndex );
-        sal_Bool                GetNextGroupEntry();
-                                GroupTable();
-                                ~GroupTable();
-};
-
-class PropValue
+class TextObjBinary : public TextObj
 {
-    protected :
-
-        ::com::sun::star::uno::Any                              mAny;
-
-        ::com::sun::star::uno::Reference
-            < ::com::sun::star::beans::XPropertySet >           mXPropSet;
-
-        sal_Bool    ImplGetPropertyValue( const String& rString );
-        sal_Bool    ImplGetPropertyValue( const ::com::sun::star::uno::Reference
-                        < ::com::sun::star::beans::XPropertySet > &, const String& );
-
-    public :
-
-        static sal_Bool GetPropertyValue(
-                ::com::sun::star::uno::Any& rAny,
-                    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
-                        const String& rPropertyName,
-                            sal_Bool bTestPropertyAvailability = sal_False );
-
-        static ::com::sun::star::beans::PropertyState GetPropertyState(
-                    const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > &,
-                        const String& rPropertyName );
-};
-
-class PropStateValue : public PropValue
-{
-    protected :
-
-        ::com::sun::star::beans::PropertyState                  ePropState;
-        ::com::sun::star::uno::Reference
-            < ::com::sun::star::beans::XPropertyState >         mXPropState;
-
-        sal_Bool    ImplGetPropertyValue( const String& rString, sal_Bool bGetPropertyState = TRUE );
-
+public:
+    TextObjBinary( ::com::sun::star::uno::Reference< ::com::sun::star::text::XSimpleText > &
+                   rXText, int nInstance, FontCollection& rFontCollection, PPTExBulletProvider& rBuProv ) : TextObj( rXText, nInstance, rFontCollection, rBuProv ) {}
+    void            Write( SvStream* pStrm );
+    void            WriteTextSpecInfo( SvStream* pStrm );
 };
 
 // ------------------------------------------------------------------------
 
-struct FieldEntry;
-class PortionObj : public PropStateValue
-{
-
-    friend class ParagraphObj;
-
-    protected :
-
-        void            ImplClear();
-        void            ImplConstruct( const PortionObj& rPortionObj );
-        sal_uInt32      ImplGetTextField( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRangeRef,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef, String& rURL );
-        sal_uInt32      ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition );
-        void            ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool bGetPropStateValue = FALSE );
-
-    public :
-
-        ::com::sun::star::beans::PropertyState  meCharColor;
-        ::com::sun::star::beans::PropertyState  meCharHeight;
-        ::com::sun::star::beans::PropertyState  meFontName;
-        ::com::sun::star::beans::PropertyState  meAsianOrComplexFont;
-        ::com::sun::star::beans::PropertyState  meCharEscapement;
-        ::com::sun::star::lang::Locale          meCharLocale;
-        sal_uInt16      mnCharAttrHard;
-
-        sal_uInt32      mnCharColor;
-        sal_uInt16      mnCharAttr;
-        sal_uInt16      mnCharHeight;
-        sal_uInt16      mnFont;
-        sal_uInt16      mnAsianOrComplexFont;
-        sal_Int16       mnCharEscapement;
-
-        sal_uInt32      mnTextSize;
-        sal_Bool        mbLastPortion;
-
-        sal_uInt16*     mpText;
-        FieldEntry*     mpFieldEntry;
-
-                        PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRangeRef,
-                                        sal_Bool bLast, FontCollection& rFontCollection );
-                        PortionObj( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef,
-                                        FontCollection& rFontCollection );
-                        PortionObj( const PortionObj& rPortionObj );
-                        ~PortionObj();
-
-        void            Write( SvStream* pStrm, sal_Bool bLast );
-        sal_uInt32      Count() const { return mnTextSize; };
-
-        PortionObj&     operator=( const PortionObj& rPortionObj );
-};
-
-struct ParaFlags
-{
-    sal_Bool    bFirstParagraph : 1;
-    sal_Bool    bLastParagraph  : 1;
-
-                    ParaFlags() { bFirstParagraph = TRUE; bLastParagraph = FALSE; };
-};
-
-class ParagraphObj : public List, public PropStateValue, public SOParagraph
-{
-    friend class TextObj;
-    friend struct PPTExParaSheet;
-
-        MapMode         maMapModeSrc;
-        MapMode         maMapModeDest;
-
-    protected :
-
-        void            ImplConstruct( const ParagraphObj& rParagraphObj );
-        void            ImplClear();
-        sal_uInt32      ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition );
-        void            ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Bool bGetPropStateValue = FALSE );
-        void            ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nDepth, sal_Bool bIsBullet, sal_Bool bGetPropStateValue = FALSE );
-
-    public :
-
-        ::com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > maTabStop;
-
-        sal_uInt32          mnTextSize;
-
-        sal_Bool            mbIsBullet;
-        sal_Bool            mbFirstParagraph;
-        sal_Bool            mbLastParagraph;
-
-        ::com::sun::star::beans::PropertyState  meBullet;
-        ::com::sun::star::beans::PropertyState  meTextAdjust;
-        ::com::sun::star::beans::PropertyState  meLineSpacing;
-        ::com::sun::star::beans::PropertyState  meLineSpacingTop;
-        ::com::sun::star::beans::PropertyState  meLineSpacingBottom;
-        ::com::sun::star::beans::PropertyState  meForbiddenRules;
-        ::com::sun::star::beans::PropertyState  meParagraphPunctation;
-        ::com::sun::star::beans::PropertyState  meBiDi;
-
-        sal_uInt16                              mnTextAdjust;
-        sal_Int16                               mnLineSpacing;
-        sal_Int16                               mnLineSpacingTop;
-        sal_Int16                               mnLineSpacingBottom;
-        sal_Bool                                mbForbiddenRules;
-        sal_Bool                                mbParagraphPunctation;
-        sal_uInt16                              mnBiDi;
-
-                        ParagraphObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & rXTextContentRef,
-                            ParaFlags, FontCollection& rFontCollection,
-                                PPTExBulletProvider& rBuProv );
-                        ParagraphObj( const ParagraphObj& rParargraphObj );
-                        ParagraphObj( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef,
-                                        PPTExBulletProvider& rBuProv );
-
-        void            CalculateGraphicBulletSize( sal_uInt16 nFontHeight );
-                        ~ParagraphObj();
-
-        void            Write( SvStream* pStrm );
-        sal_uInt32          Count() const { return mnTextSize; };
-
-        ParagraphObj&   operator=( const ParagraphObj& rParagraphObj );
-};
-
-struct ImplTextObj
-{
-    sal_uInt32      mnRefCount;
-    sal_uInt32      mnTextSize;
-    int             mnInstance;
-    List*           mpList;
-    sal_Bool        mbHasExtendedBullets;
-    sal_Bool        mbFixedCellHeightUsed;
-
-                    ImplTextObj( int nInstance );
-                    ~ImplTextObj();
-};
-
-class TextObj
-{
-        mutable ImplTextObj*    mpImplTextObj;
-        void            ImplCalculateTextPositions();
-
-    public :
-                        TextObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XSimpleText > &
-                                    rXText, int nInstance, FontCollection& rFontCollection, PPTExBulletProvider& rBuProv );
-                        TextObj( const TextObj& rTextObj );
-                        ~TextObj();
-
-        void            Write( SvStream* pStrm );
-
-        ParagraphObj*   First(){ return (ParagraphObj*)mpImplTextObj->mpList->First(); };
-        ParagraphObj*   Next(){ return(ParagraphObj*)mpImplTextObj->mpList->Next(); };
-        sal_uInt32      Count() const { return mpImplTextObj->mnTextSize; };
-        int             GetInstance() const { return mpImplTextObj->mnInstance; };
-        sal_Bool        HasExtendedBullets(){ return mpImplTextObj->mbHasExtendedBullets; };
-        void            WriteTextSpecInfo( SvStream* pStrm );
-
-        TextObj&        operator=( TextObj& rTextObj );
-};
-
-// ------------------------------------------------------------------------
 struct CellBorder;
-class PPTWriter : public GroupTable, public PropValue, public PPTExBulletProvider
+class PPTWriter : public PPTWriterBase, public PPTExBulletProvider
 {
+        sal_uInt32                      mnCnvrtFlags;
         sal_Bool                        mbStatus;
         sal_Bool                        mbUseNewAnimations;
         sal_uInt32                      mnStatMaxValue;
         sal_uInt32                      mnLatestStatValue;
-        std::vector< PPTExStyleSheet* > maStyleSheetList;
-        PPTExStyleSheet*                mpStyleSheet;
 
         EscherGraphicProvider*          mpGraphicProvider;
-        Fraction                        maFraction;
-        MapMode                         maMapModeSrc;
-        MapMode                         maMapModeDest;
-        ::com::sun::star::awt::Size     maDestPageSize;
-        ::com::sun::star::awt::Size     maNotesPageSize;
-        PageType                        meLatestPageType;
         List                            maSlideNameList;
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >                 mXModel;
-        ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator >        mXStatusIndicator;
-        ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPagesSupplier >   mXDrawPagesSupplier;
-        ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XMasterPagesSupplier > mXMasterPagesSupplier;
-        ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages >           mXDrawPages;
-        ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >            mXDrawPage;
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >           mXPagePropSet;
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >           mXBackgroundPropSet;
-        ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >              mXShapes;
-        ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >               mXShape;
         ::com::sun::star::uno::Reference< ::com::sun::star::text::XSimpleText >             mXText;             // TextRef des globalen Text
         ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor >             mXCursor;
         ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >              mXCursorText;       // TextRef des Teilstuecks des Cursors
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >           mXCursorPropSet;    // die Properties des Teilstueckes
         ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextField >              mXTextField;
-        ::com::sun::star::awt::Size         maSize;
-        ::com::sun::star::awt::Point        maPosition;
-        Rectangle           maRect;
-        ByteString          mType;
-        sal_Bool            mbPresObj;
-        sal_Bool            mbEmptyPresObj;
-        sal_Bool            mbStatusIndicator;
-        sal_Int32           mnAngle;
         sal_uInt32          mnTextStyle;
 
         sal_Bool            mbFontIndependentLineSpacing;
@@ -737,8 +203,6 @@ class PPTWriter : public GroupTable, public PropValue, public PPTExBulletProvide
         sal_uInt32          mnExEmbed;
         SvMemoryStream*     mpExEmbed;
 
-        sal_uInt32          mnPages;            // anzahl einzelner Slides ( ohne masterpages & notes & handout )
-        sal_uInt32          mnMasterPages;      //
         sal_uInt32          mnDrawings;         // anzahl Slides +  masterpages + notes +  handout
         sal_uInt32          mnPagesWritten;
         sal_uInt32          mnUniqueSlideIdentifier;
@@ -752,13 +216,10 @@ class PPTWriter : public GroupTable, public PropValue, public PPTExBulletProvide
 
         List                maHyperlink;
 
-        FontCollection          maFontCollection;
         ppt::ExSoundCollection  maSoundCollection;
 
-        PHLayout&           ImplGetLayout( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const;
         void                ImplWriteExtParaHeader( SvMemoryStream& rSt, sal_uInt32 nRef, sal_uInt32 nInstance, sal_uInt32 nSlideId );
 
-
         sal_uInt32          ImplProgBinaryTag( SvStream* pOutStrm = NULL );
         sal_uInt32          ImplProgBinaryTagContainer( SvStream* pOutStrm = NULL, SvMemoryStream* pBinTag = NULL );
         sal_uInt32          ImplProgTagContainer( SvStream* pOutStrm = NULL, SvMemoryStream* pBinTag = NULL );
@@ -773,29 +234,22 @@ class PPTWriter : public GroupTable, public PropValue, public PPTExBulletProvide
 
     protected:
 
-        sal_Bool            ImplCreateDocumentSummaryInformation( sal_uInt32 nCnvrtFlags );
+        sal_Bool            ImplCreateDocumentSummaryInformation();
         sal_Bool            ImplCreateCurrentUserStream();
         void                ImplCreateHeaderFooterStrings( SvStream& rOut,
                                 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet );
         void                ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet );
-        sal_Bool            ImplCreateDocument();
+        virtual sal_Bool        ImplCreateDocument();
         sal_Bool            ImplCreateHyperBlob( SvMemoryStream& rStream );
         sal_uInt32          ImplInsertBookmarkURL( const String& rBookmark, const sal_uInt32 nType,
             const String& rStringVer0, const String& rStringVer1, const String& rStringVer2, const String& rStringVer3 );
-        sal_Bool            ImplCreateMaster( sal_uInt32 nPageNum );
-        sal_Bool            ImplCreateMainNotes();
-        sal_Bool            ImplCreateSlide( sal_uInt32 nPageNum );
+        virtual sal_Bool        ImplCreateMainNotes();
         sal_Bool            ImplCreateNotes( sal_uInt32 nPageNum );
         void                ImplWriteBackground( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXBackgroundPropSet );
-        void                ImplWriteVBA( SvMemoryStream* pVBA );
-        void                ImplWriteOLE( sal_uInt32 nCnvrtFlags );
+  void              ImplWriteVBA();
+        void                ImplWriteOLE();
         sal_Bool            ImplWriteAtomEnding();
 
-        sal_Bool            ImplInitSOIface();
-        sal_Bool            ImplSetCurrentStyleSheet( sal_uInt32 nPageNum );
-        sal_Bool            ImplGetPageByIndex( sal_uInt32 nIndex, PageType );
-        sal_Bool            ImplGetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup = FALSE );
-        sal_uInt32          ImplGetMasterIndex( PageType ePageType );
         void                ImplFlipBoundingBox( EscherPropertyContainer& rPropOpt );
         sal_Bool            ImplGetText();
         sal_Bool            ImplCreatePresentationPlaceholder( const sal_Bool bMaster, const PageType PageType,
@@ -809,7 +263,6 @@ class PPTWriter : public GroupTable, public PropValue, public PPTExBulletProvide
                                 ::com::sun::star::presentation::AnimationEffect eTextEffect,
                                 sal_uInt16 nOrder );
         void                ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentation::ClickAction eAction, sal_Bool bMediaClickAction );
-        sal_Bool            ImplGetStyleSheets();
         void                ImplWriteParagraphs( SvStream& rOutStrm, TextObj& rTextObj );
         void                ImplWritePortions( SvStream& rOutStrm, TextObj& rTextObj );
         void                ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_uInt32 nAtomInstance,
@@ -826,12 +279,14 @@ class PPTWriter : public GroupTable, public PropValue, public PPTExBulletProvide
         void                ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2 );
         void                ImplCreateTable( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rXShape, EscherSolverContainer& aSolverContainer,
                                 EscherPropertyContainer& aPropOpt );
-        ::com::sun::star::awt::Point        ImplMapPoint( const ::com::sun::star::awt::Point& );
-        ::com::sun::star::awt::Size         ImplMapSize( const ::com::sun::star::awt::Size& );
-        Rectangle                           ImplMapRectangle( const ::com::sun::star::awt::Rectangle& );
 
         sal_Bool                            ImplCloseDocument();        // die font-, hyper-, Soundliste wird geschrieben ..
 
+        virtual void        ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterID, sal_uInt16 nMode,
+                                            sal_Bool bHasBackground, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet );
+        virtual void        ImplWriteNotes( sal_uInt32 nPageNum );
+        virtual void        ImplWriteSlideMaster( sal_uInt32 nPageNum, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet );
+
     public:
                                 PPTWriter( SvStorageRef& rSvStorage,
                                             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rModel,
@@ -841,8 +296,10 @@ class PPTWriter : public GroupTable, public PropValue, public PPTExBulletProvide
                                 ~PPTWriter();
 
         sal_Bool                IsValid() const { return mbStatus; };
-};
 
+        virtual void        exportPPTPre();
+        virtual void        exportPPTPost( );
+};
 
 #endif
 
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx
new file mode 100644
index 000000000000..b0576eeeee6c
--- /dev/null
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -0,0 +1,443 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef EPPT_EPPTBASE_HXX
+#define EPPT_EPPTBASE_HXX
+
+#include "grouptable.hxx"
+#include <vector>
+#include <vcl/mapmod.hxx>
+#include <tools/list.hxx>
+#include <tools/string.hxx>
+#include <tools/stream.hxx>
+#include <tools/gen.hxx>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
+#include <com/sun/star/drawing/XMasterPagesSupplier.hpp>
+#include <com/sun/star/drawing/XMasterPageTarget.hpp>
+#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/presentation/XPresentationSupplier.hpp>
+#include <com/sun/star/presentation/FadeEffect.hpp>
+#include <com/sun/star/task/XStatusIndicatorSupplier.hpp>
+
+// PLACEMENT_ID
+#define EPP_LAYOUT_TITLESLIDE             0 /* The slide is a title slide                                                             */
+#define EPP_LAYOUT_TITLEANDBODYSLIDE      1 /* Title and body slide                                                                   */
+#define EPP_LAYOUT_TITLEMASTERSLIDE       2 /* Title master slide                                                                     */
+#define EPP_LAYOUT_MASTERSLIDE            3 /* Master slide layout                                                                    */
+#define EPP_LAYOUT_MASTERNOTES            4 /* Master notes layout                                                                    */
+#define EPP_LAYOUT_NOTESTITLEBODY         5 /* Notes title/body layout                                                                */
+#define EPP_LAYOUT_HANDOUTLAYOUT          6 /* Handout layout, therefore it doesn't have placeholders except header, footer, and date */
+#define EPP_LAYOUT_ONLYTITLE              7 /* Only title placeholder                                                                 */
+#define EPP_LAYOUT_2COLUMNSANDTITLE       8 /* Body of the slide has 2 columns and a title                                            */
+#define EPP_LAYOUT_2ROWSANDTITLE          9 /* Slide's body has 2 rows and a title                                                    */
+#define EPP_LAYOUT_RIGHTCOLUMN2ROWS      10 /* Body contains 2 columns, right column has 2 rows                                       */
+#define EPP_LAYOUT_LEFTCOLUMN2ROWS       11 /* Body contains 2 columns, left column has 2 rows                                        */
+#define EPP_LAYOUT_BOTTOMROW2COLUMNS     12 /* Body contains 2 rows, bottom row has 2 columns                                         */
+#define EPP_LAYOUT_TOPROW2COLUMN         13 /* Body contains 2 rows, top row has 2 columns                                            */
+#define EPP_LAYOUT_4OBJECTS              14 /* 4 objects                                                                              */
+#define EPP_LAYOUT_BIGOBJECT             15 /* Big object                                                                             */
+#define EPP_LAYOUT_BLANCSLIDE            16 /* Blank slide                                                                            */
+#define EPP_LAYOUT_TITLERIGHTBODYLEFT    17 /* Vertical title on the right, body on the left                                          */
+#define EPP_LAYOUT_TITLERIGHT2BODIESLEFT 18 /* Vertical title on the right, body on the left split into 2 rows                        */
+
+#define EPP_LAYOUT_SIZE 25
+
+class Polygon;
+class PptEscherEx;
+class XStatusIndicatorRef;
+
+struct PHLayout
+{
+    sal_Int32   nLayout;
+    sal_uInt8   nPlaceHolder[ 8 ];
+
+    sal_uInt8   nUsedObjectPlaceHolder;
+    sal_uInt8   nTypeOfTitle;
+    sal_uInt8   nTypeOfOutliner;
+
+    BOOL    bTitlePossible;
+    BOOL    bOutlinerPossible;
+    BOOL    bSecOutlinerPossible;
+};
+
+enum PageType { NORMAL = 0, MASTER = 1, NOTICE = 2, UNDEFINED = 3 };
+
+class PropValue
+{
+    protected :
+
+        ::com::sun::star::uno::Any                              mAny;
+
+        ::com::sun::star::uno::Reference
+            < ::com::sun::star::beans::XPropertySet >           mXPropSet;
+
+        sal_Bool    ImplGetPropertyValue( const String& rString );
+        sal_Bool    ImplGetPropertyValue( const ::com::sun::star::uno::Reference
+                        < ::com::sun::star::beans::XPropertySet > &, const String& );
+
+    public :
+
+        PropValue() {}
+
+        PropValue( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet )
+            : mXPropSet( rXPropSet )
+        {}
+
+        ::com::sun::star::uno::Any GetAny() { return mAny; }
+
+        static sal_Bool GetPropertyValue(
+                ::com::sun::star::uno::Any& rAny,
+                    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
+                        const String& rPropertyName,
+                            sal_Bool bTestPropertyAvailability = sal_False );
+
+        static ::com::sun::star::beans::PropertyState GetPropertyState(
+                    const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > &,
+                        const String& rPropertyName );
+};
+
+class EscherGraphicProvider;
+class PPTExBulletProvider
+{
+    friend struct PPTExParaSheet;
+
+    protected :
+
+        SvMemoryStream          aBuExPictureStream;
+        SvMemoryStream          aBuExOutlineStream;
+        SvMemoryStream          aBuExMasterStream;
+
+        EscherGraphicProvider*  pGraphicProv;
+
+    public :
+
+        sal_uInt16              GetId( const ByteString& rUniqueId, Size& rGraphicSize );
+
+                                PPTExBulletProvider();
+                                ~PPTExBulletProvider();
+};
+
+struct FontCollectionEntry
+{
+        String                  Name;
+        double                  Scaling;
+        sal_Int16               Family;
+        sal_Int16               Pitch;
+        sal_Int16               CharSet;
+
+        String                  Original;
+        sal_Bool                bIsConverted;
+
+        FontCollectionEntry( const String& rName, sal_Int16 nFamily, sal_Int16 nPitch, sal_Int16 nCharSet ) :
+                            Scaling ( 1.0 ),
+                            Family  ( nFamily ),
+                            Pitch   ( nPitch ),
+                            CharSet ( nCharSet ),
+                            Original( rName )
+                            {
+                                ImplInit( rName );
+                            };
+
+        FontCollectionEntry( const String& rName ) :
+                            Scaling ( 1.0 ),
+                            Original( rName )
+                            {
+                                ImplInit( rName );
+                            };
+        ~FontCollectionEntry();
+
+    private :
+
+        FontCollectionEntry() {};
+
+        void ImplInit( const String& rName );
+};
+
+class VirtualDevice;
+class FontCollection : private List
+{
+        VirtualDevice* pVDev;
+    public :
+                    FontCollection();
+                    ~FontCollection();
+
+        short       GetScriptDirection( const String& rText ) const;
+        sal_uInt32  GetId( FontCollectionEntry& rFontDescriptor );
+    sal_uInt32  GetCount() const { return List::Count(); };
+        const FontCollectionEntry*                      GetById( sal_uInt32 nId );
+        FontCollectionEntry&    GetLast() { return *(FontCollectionEntry*)List::Last(); };
+};
+
+// ------------------------------------------------------------------------
+
+#define PPTEX_STYLESHEETENTRYS  9
+
+enum PPTExTextAttr
+{
+    ParaAttr_BulletOn,
+    ParaAttr_BuHardFont,
+    ParaAttr_BuHardColor,
+    ParaAttr_BuHardHeight,
+    ParaAttr_BulletChar,
+    ParaAttr_BulletFont,
+    ParaAttr_BulletHeight,
+    ParaAttr_BulletColor,
+    ParaAttr_Adjust,
+    ParaAttr_LineFeed,
+    ParaAttr_UpperDist,
+    ParaAttr_LowerDist,
+    ParaAttr_TextOfs,
+    ParaAttr_BulletOfs,
+    ParaAttr_DefaultTab,
+    ParaAttr_AsianLB_1,
+    ParaAttr_AsianLB_2,
+    ParaAttr_AsianLB_3,
+    ParaAttr_BiDi,
+    CharAttr_Bold,
+    CharAttr_Italic,
+    CharAttr_Underline,
+    CharAttr_Shadow,
+    CharAttr_Strikeout,
+    CharAttr_Embossed,
+    CharAttr_Font,
+    CharAttr_AsianOrComplexFont,
+    CharAttr_Symbol,
+    CharAttr_FontHeight,
+    CharAttr_FontColor,
+    CharAttr_Escapement
+};
+
+struct PPTExCharLevel
+{
+    sal_uInt16      mnFlags;
+    sal_uInt16      mnFont;
+    sal_uInt16      mnAsianOrComplexFont;
+    sal_uInt16      mnFontHeight;
+    sal_uInt16      mnEscapement;
+    sal_uInt32      mnFontColor;
+};
+
+struct PPTExCharSheet
+{
+                PPTExCharLevel  maCharLevel[ 5 ];
+
+                PPTExCharSheet( int nInstance );
+
+                void    SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
+                                        FontCollection& rFontCollection, int nLevel );
+                void    Write( SvStream& rSt, PptEscherEx* pEx, sal_uInt16 nLev, sal_Bool bFirst, sal_Bool bSimpleText,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPagePropSet );
+
+};
+
+struct PPTExParaLevel
+{
+    sal_Bool        mbIsBullet;
+    sal_uInt16      mnBulletChar;
+    sal_uInt16      mnBulletFont;
+    sal_uInt16      mnBulletHeight;
+    sal_uInt32      mnBulletColor;
+
+    sal_uInt16      mnAdjust;
+    sal_Int16       mnOOAdjust;
+    sal_uInt16      mnLineFeed;
+    sal_uInt16      mnUpperDist;
+    sal_uInt16      mnLowerDist;
+    sal_uInt16      mnTextOfs;
+    sal_uInt16      mnBulletOfs;
+    sal_uInt16      mnDefaultTab;
+
+    sal_Bool        mbExtendedBulletsUsed;
+    sal_uInt16      mnBulletId;
+    sal_uInt16      mnBulletStart;
+    sal_uInt32      mnMappedNumType;
+    sal_uInt32      mnNumberingType;
+    sal_uInt16      mnAsianSettings;
+    sal_uInt16      mnBiDi;
+};
+
+struct PPTExParaSheet
+{
+                PPTExBulletProvider& rBuProv;
+
+                sal_uInt32  mnInstance;
+
+                PPTExParaLevel  maParaLevel[ 5 ];
+                PPTExParaSheet( int nInstance, sal_uInt16 nDefaultTab, PPTExBulletProvider& rProv );
+
+                void    SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
+                                        FontCollection& rFontCollection, int nLevel, const PPTExCharLevel& rCharLevel );
+                void    Write( SvStream& rSt, PptEscherEx* pEx, sal_uInt16 nLev, sal_Bool bFirst, sal_Bool bSimpleText,
+                    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPagePropSet );
+};
+
+class PPTExStyleSheet
+{
+
+    public :
+
+                PPTExCharSheet*     mpCharSheet[ PPTEX_STYLESHEETENTRYS ];
+                PPTExParaSheet*     mpParaSheet[ PPTEX_STYLESHEETENTRYS ];
+
+                PPTExStyleSheet( sal_uInt16 nDefaultTab, PPTExBulletProvider& rBuProv );
+                ~PPTExStyleSheet();
+
+                PPTExParaSheet& GetParaSheet( int nInstance ) { return *mpParaSheet[ nInstance ]; };
+                PPTExCharSheet& GetCharSheet( int nInstance ) { return *mpCharSheet[ nInstance ]; };
+
+                void            SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &,
+                                                FontCollection& rFontCollection, int nInstance, int nLevel );
+                sal_Bool        IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLevel, PPTExTextAttr eAttr, sal_uInt32 nValue );
+
+                sal_uInt32      SizeOfTxCFStyleAtom() const;
+                void            WriteTxCFStyleAtom( SvStream& rSt );
+};
+
+// ------------------------------------------------------------------------
+
+class PPTWriterBase : public PropValue, public GroupTable
+{
+protected:
+    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >                 mXModel;
+    ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator >        mXStatusIndicator;
+
+    sal_Bool            mbStatusIndicator;
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPagesSupplier >   mXDrawPagesSupplier;
+    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XMasterPagesSupplier > mXMasterPagesSupplier;
+    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages >           mXDrawPages;
+    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >            mXDrawPage;
+    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >           mXPagePropSet;
+    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >           mXBackgroundPropSet;
+    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >              mXShapes;
+    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >               mXShape;
+    ::com::sun::star::awt::Size         maSize;
+    ::com::sun::star::awt::Point        maPosition;
+    Rectangle           maRect;
+    ByteString          mType;
+    sal_Bool            mbPresObj;
+    sal_Bool            mbEmptyPresObj;
+    sal_Int32           mnAngle;
+
+    sal_uInt32          mnPages;            // number of Slides ( w/o master pages & notes & handout )
+    sal_uInt32          mnMasterPages;
+
+    Fraction                        maFraction;
+    MapMode                         maMapModeSrc;
+    MapMode                         maMapModeDest;
+    ::com::sun::star::awt::Size     maDestPageSize;
+    ::com::sun::star::awt::Size     maNotesPageSize;
+
+    PageType                        meLatestPageType;
+    std::vector< PPTExStyleSheet* > maStyleSheetList;
+    PPTExStyleSheet*                mpStyleSheet;
+
+    FontCollection      maFontCollection;
+
+    List                maTextRuleList;     // TextRuleEntry's
+
+    virtual void ImplWriteSlide( sal_uInt32 /* nPageNum */, sal_uInt32 /* nMasterNum */, sal_uInt16 /* nMode */,
+                                 sal_Bool /* bHasBackground */, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > /* aXBackgroundPropSet */ ) {}
+    virtual void ImplWriteNotes( sal_uInt32 nPageNum ) = 0;
+    virtual void ImplWriteSlideMaster( sal_uInt32 /* nPageNum */, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > /* aXBackgroundPropSet */ ) {}
+    virtual void ImplWriteLayout( sal_Int32 /* nOffset */, sal_uInt32 /* nMasterNum */ ) {}
+
+    virtual void exportPPTPre() {}
+    virtual void exportPPTPost() {}
+
+    virtual sal_Bool ImplCreateDocument()=0;
+    virtual sal_Bool ImplCreateMainNotes()=0;
+
+    sal_Bool GetStyleSheets();
+    sal_Bool GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup = FALSE );
+
+    sal_Bool CreateMainNotes();
+
+    ::com::sun::star::awt::Size   MapSize( const ::com::sun::star::awt::Size& );
+    ::com::sun::star::awt::Point  MapPoint( const ::com::sun::star::awt::Point& );
+    Rectangle                     MapRectangle( const ::com::sun::star::awt::Rectangle& );
+
+    sal_Bool ContainsOtherShapeThanPlaceholders( sal_Bool bForOOMLX );
+
+public:
+    PPTWriterBase();
+    PPTWriterBase( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rModel,
+                   const ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > & rStatInd );
+
+    ~PPTWriterBase();
+
+    void exportPPT();
+
+    sal_Bool InitSOIface();
+    sal_Bool GetPageByIndex( sal_uInt32 nIndex, PageType );
+    sal_uInt32 GetMasterIndex( PageType ePageType );
+    sal_Bool SetCurrentStyleSheet( sal_uInt32 nPageNum );
+
+    sal_Bool GetPresObj() { return mbPresObj; }
+
+    PHLayout& GetLayout( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const;
+    PHLayout& GetLayout( sal_Int32 nOffset ) const;
+    sal_Int32 GetLayoutOffset( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const;
+
+    sal_Bool CreateSlide( sal_uInt32 nPageNum );
+    sal_Bool CreateSlideMaster( sal_uInt32 nPageNum );
+    sal_Bool CreateNotes( sal_uInt32 nPageNum );
+
+    static sal_Int8 GetTransition( sal_Int16 nTransitionType, sal_Int16 nTransitionSubtype, ::com::sun::star::presentation::FadeEffect eEffect, sal_uInt8& nDirection );
+    static sal_Int8 GetTransition( ::com::sun::star::presentation::FadeEffect eEffect, sal_uInt8& nDirection );
+};
+
+#define PPT_TRANSITION_TYPE_NONE            0
+#define PPT_TRANSITION_TYPE_RANDOM          1
+#define PPT_TRANSITION_TYPE_BLINDS          2
+#define PPT_TRANSITION_TYPE_CHECKER         3
+#define PPT_TRANSITION_TYPE_COVER           4
+#define PPT_TRANSITION_TYPE_DISSOLVE        5
+#define PPT_TRANSITION_TYPE_FADE            6
+#define PPT_TRANSITION_TYPE_PULL            7
+#define PPT_TRANSITION_TYPE_RANDOM_BARS     8
+#define PPT_TRANSITION_TYPE_STRIPS          9
+#define PPT_TRANSITION_TYPE_WIPE           10
+#define PPT_TRANSITION_TYPE_ZOOM           11
+#define PPT_TRANSITION_TYPE_SPLIT          13
+
+// effects, new in xp
+#define PPT_TRANSITION_TYPE_DIAMOND         17
+#define PPT_TRANSITION_TYPE_PLUS            18
+#define PPT_TRANSITION_TYPE_WEDGE           19
+#define PPT_TRANSITION_TYPE_PUSH            20
+#define PPT_TRANSITION_TYPE_COMB            21
+#define PPT_TRANSITION_TYPE_NEWSFLASH       22
+#define PPT_TRANSITION_TYPE_SMOOTHFADE      23
+#define PPT_TRANSITION_TYPE_WHEEL           26
+#define PPT_TRANSITION_TYPE_CIRCLE          27
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx
new file mode 100644
index 000000000000..75f9f1c88330
--- /dev/null
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -0,0 +1,165 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef EPPT_POWERPOINT_EXPORT_HXX
+#define EPPT_POWERPOINT_EXPORT_HXX
+
+#include <oox/core/xmlfilterbase.hxx>
+#include <oox/helper/zipstorage.hxx>
+#include <oox/vml/vmldrawing.hxx>
+#include <oox/export/shapes.hxx>
+#include "epptbase.hxx"
+
+namespace com { namespace sun { namespace star {
+    namespace animations {
+        class XAnimate;
+        class XAnimationNode;
+    }
+}}}
+
+namespace oox {
+    namespace drawingml {
+        class ShapeExport;
+    }
+namespace core {
+
+class PowerPointShapeExport;
+
+struct LayoutInfo
+{
+    std::vector< sal_Int32 > mnFileIdArray;
+};
+
+enum PlaceholderType
+{
+    None,
+    SlideImage,
+    Notes,
+    Header,
+    Footer,
+    SlideNumber,
+    DateAndTime,
+    Outliner,
+    Title,
+    Subtitle
+};
+
+class PowerPointExport : public XmlFilterBase, public PPTWriterBase
+{
+    friend class PowerPointShapeExport;
+public:
+
+    PowerPointExport( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr  );
+    ~PowerPointExport();
+
+    // from FilterBase
+    virtual bool importDocument() throw();
+    virtual bool exportDocument() throw();
+
+    // only needed for import, leave them empty, refactor later XmlFilterBase to export and import base?
+    virtual sal_Int32 getSchemeClr( sal_Int32 /* nColorSchemeToken */ ) const { return 0; }
+    virtual oox::vml::Drawing* getVmlDrawing() { return NULL; }
+    virtual const oox::drawingml::Theme* getCurrentTheme() const { return NULL; }
+    virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() { return oox::drawingml::table::TableStyleListPtr(); }
+    virtual oox::drawingml::chart::ChartConverter& getChartConverter() { static oox::drawingml::chart::ChartConverter aConverter; return aConverter; }
+
+    static const char* GetSideDirection( sal_uInt8 nDirection );
+    static const char* GetCornerDirection( sal_uInt8 nDirection );
+    static const char* Get8Direction( sal_uInt8 nDirection );
+
+protected:
+
+    virtual void ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_uInt16 nMode,
+                                 sal_Bool bHasBackground, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet );
+    virtual void ImplWriteNotes( sal_uInt32 nPageNum );
+    virtual void ImplWriteSlideMaster( sal_uInt32 nPageNum, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet );
+    virtual void ImplWriteLayout( sal_Int32 nOffset, sal_uInt32 nMasterNum );
+    void WriteTheme( sal_Int32 nThemeNum );
+
+    virtual sal_Bool ImplCreateDocument();
+    virtual sal_Bool ImplCreateMainNotes();
+
+    sal_Bool WriteNotesMaster();
+
+    void WriteAnimateTo( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Any aValue, const ::rtl::OUString& rAttributeName );
+    void WriteAnimateValues( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimate >& rXAnimate );
+    void WriteAnimationCondition( ::sax_fastparser::FSHelperPtr pFS, ::com::sun::star::uno::Any& rAny, sal_Bool bWriteEvent, sal_Bool bMainSeqChild );
+    void WriteAnimationCondition( ::sax_fastparser::FSHelperPtr pFS, const char* pDelay, const char* pEvent, double fDelay, sal_Bool bHasFDelay );
+    void WriteAnimations( ::sax_fastparser::FSHelperPtr pFS );
+    void WriteAnimationAttributeName( ::sax_fastparser::FSHelperPtr pFS, const ::rtl::OUString& rAttributeName );
+    void WriteAnimationNode( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Bool bMainSeqChild );
+    void WriteAnimationNodeAnimate( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Int32 nXmlNodeType, sal_Bool bMainSeqChild );
+    void WriteAnimationNodeAnimateInside( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Bool bMainSeqChild, sal_Bool bSimple );
+    void WriteAnimationNodeSeq( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Int32 nXmlNodeType, sal_Bool bMainSeqChild );
+    void WriteAnimationNodeEffect( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Int32 nXmlNodeType, sal_Bool bMainSeqChild );
+    void WriteAnimationNodeCommonPropsStart( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Bool bSingle, sal_Bool bMainSeqChild );
+    void WriteAnimationNodeCommonPropsEnd( ::sax_fastparser::FSHelperPtr pFS );
+    void WriteAnimationProperty( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Any& rAny );
+    void WriteAnimationTarget( ::sax_fastparser::FSHelperPtr pFS, ::com::sun::star::uno::Any aTarget );
+    void WriteTextStyles( ::sax_fastparser::FSHelperPtr pFS );
+    void WriteTextStyle( ::sax_fastparser::FSHelperPtr pFS, int nInstance, sal_Int32 xmlToken );
+    void WriteTextStyleLevel( ::sax_fastparser::FSHelperPtr pFS, int nInstance, int nLevel );
+    void ImplWriteBackground( ::sax_fastparser::FSHelperPtr pFS, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet );
+    void WriteTransition( ::sax_fastparser::FSHelperPtr pFS );
+
+    sal_Int32 GetLayoutFileId( sal_Int32 nOffset, sal_uInt32 nMasterNum );
+
+    // shapes
+    void WriteShapeTree( ::sax_fastparser::FSHelperPtr pFS, PageType ePageType, sal_Bool bMaster );
+
+    sal_uInt32 GetNewSlideId() { return mnSlideIdMax ++; }
+    sal_uInt32 GetNewSlideMasterId() { return mnSlideMasterIdMax ++; }
+
+private:
+    void AddLayoutIdAndRelation( ::sax_fastparser::FSHelperPtr pFS, sal_Int32 nLayoutFileId );
+
+    virtual ::rtl::OUString implGetImplementationName() const;
+
+    ::boost::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv;
+
+    ::sax_fastparser::FSHelperPtr mPresentationFS;
+
+    LayoutInfo mLayoutInfo[EPP_LAYOUT_SIZE];
+    std::vector< ::sax_fastparser::FSHelperPtr > mpSlidesFSArray;
+    std::vector< ::sax_fastparser::FSHelperPtr > mpMasterFSArray;
+    sal_Int32 mnLayoutFileIdMax;
+
+    sal_uInt32 mnSlideIdMax;
+    sal_uInt32 mnSlideMasterIdMax;
+    sal_uInt32 mnAnimationNodeIdMax;
+
+    sal_Bool mbCreateNotes;
+
+    static sal_Int32 nStyleLevelToken[5];
+
+    ::oox::drawingml::ShapeExport::ShapeHashMap maShapeMap;
+};
+
+}
+}
+
+#endif
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 0bf0484205a5..f3243920e876 100644..100755
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -30,6 +30,7 @@
 #include "precompiled_sd.hxx"
 #include <osl/endian.h>
 #include <eppt.hxx>
+#include "text.hxx"
 #include "epptdef.hxx"
 #include "escherex.hxx"
 #include <tools/poly.hxx>
@@ -121,9 +122,6 @@ using namespace ::com::sun::star;
 
 // ---------------------------------------------------------------------------------------------
 
-com::sun::star::uno::Reference< com::sun::star::i18n::XBreakIterator > xPPTBreakIter;
-com::sun::star::uno::Reference< com::sun::star::i18n::XScriptTypeDetector > xScriptTypeDetector;
-
 PPTExBulletProvider::PPTExBulletProvider()
 {
     pGraphicProv = new EscherGraphicProvider( _E_GRAPH_PROV_USE_INSTANCES  | _E_GRAPH_PROV_DO_NOT_ROTATE_METAFILES );
@@ -182,211 +180,6 @@ sal_uInt16 PPTExBulletProvider::GetId( const ByteString& rUniqueId, Size& rGraph
 
 // ---------------------------------------------------------------------------------------------
 
-GroupTable::GroupTable() :
-    mnCurrentGroupEntry ( 0 ),
-    mnMaxGroupEntry     ( 0 ),
-    mnGroupsClosed      ( 0 ),
-    mpGroupEntry        ( NULL )
-{
-    ImplResizeGroupTable( 32 );
-}
-
-// ---------------------------------------------------------------------------------------------
-
-GroupTable::~GroupTable()
-{
-    for ( sal_uInt32 i = 0; i < mnCurrentGroupEntry; delete mpGroupEntry[ i++ ] ) ;
-    delete[] mpGroupEntry;
-}
-
-// ---------------------------------------------------------------------------------------------
-
-void GroupTable::ImplResizeGroupTable( sal_uInt32 nEntrys )
-{
-    if ( nEntrys > mnMaxGroupEntry )
-    {
-        mnMaxGroupEntry         = nEntrys;
-        GroupEntry** pTemp = new GroupEntry*[ nEntrys ];
-        for ( sal_uInt32 i = 0; i < mnCurrentGroupEntry; i++ )
-            pTemp[ i ] = mpGroupEntry[ i ];
-        if ( mpGroupEntry )
-            delete[] mpGroupEntry;
-        mpGroupEntry = pTemp;
-    }
-}
-
-// ---------------------------------------------------------------------------------------------
-
-sal_Bool GroupTable::EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rXIndexAccessRef )
-{
-    sal_Bool bRet = sal_False;
-    if ( rXIndexAccessRef.is() )
-    {
-        GroupEntry* pNewGroup = new GroupEntry( rXIndexAccessRef );
-        if ( pNewGroup->mnCount )
-        {
-            if ( mnMaxGroupEntry == mnCurrentGroupEntry )
-                ImplResizeGroupTable( mnMaxGroupEntry + 8 );
-            mpGroupEntry[ mnCurrentGroupEntry++ ] = pNewGroup;
-            bRet = sal_True;
-        }
-        else
-            delete pNewGroup;
-    }
-    return bRet;
-}
-
-// ---------------------------------------------------------------------------------------------
-
-sal_uInt32 GroupTable::GetGroupsClosed()
-{
-    sal_uInt32 nRet = mnGroupsClosed;
-    mnGroupsClosed = 0;
-    return nRet;
-}
-
-// ---------------------------------------------------------------------------------------------
-
-void GroupTable::ClearGroupTable()
-{
-    for ( sal_uInt32 i = 0; i < mnCurrentGroupEntry; i++, delete mpGroupEntry[ i ] ) ;
-    mnCurrentGroupEntry = 0;
-}
-
-// ---------------------------------------------------------------------------------------------
-
-void GroupTable::ResetGroupTable( sal_uInt32 nCount )
-{
-    ClearGroupTable();
-    mpGroupEntry[ mnCurrentGroupEntry++ ] = new GroupEntry( nCount );
-}
-
-// ---------------------------------------------------------------------------------------------
-
-sal_Bool GroupTable::GetNextGroupEntry()
-{
-    while ( mnCurrentGroupEntry )
-    {
-        mnIndex = mpGroupEntry[ mnCurrentGroupEntry - 1 ]->mnCurrentPos++;
-
-        if ( mpGroupEntry[ mnCurrentGroupEntry - 1 ]->mnCount > mnIndex )
-            return TRUE;
-
-        delete ( mpGroupEntry[ --mnCurrentGroupEntry ] );
-
-        if ( mnCurrentGroupEntry )
-            mnGroupsClosed++;
-    }
-    return FALSE;
-}
-
-// ---------------------------------------------------------------------------------------------
-
-FontCollectionEntry::~FontCollectionEntry()
-{
-}
-
-// ---------------------------------------------------------------------------------------------
-
-void FontCollectionEntry::ImplInit( const String& rName )
-{
-    String aSubstName( GetSubsFontName( rName, SUBSFONT_ONLYONE | SUBSFONT_MS ) );
-    if ( aSubstName.Len() )
-    {
-        Name = aSubstName;
-        bIsConverted = sal_True;
-    }
-    else
-    {
-        Name = rName;
-        bIsConverted = sal_False;
-    }
-}
-
-FontCollection::~FontCollection()
-{
-    for( void* pStr = List::First(); pStr; pStr = List::Next() )
-        delete (FontCollectionEntry*)pStr;
-    delete pVDev;
-    xPPTBreakIter = NULL;
-    xScriptTypeDetector = NULL;
-}
-
-FontCollection::FontCollection() :
-    pVDev ( NULL )
-{
-    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
-        xMSF = ::comphelper::getProcessServiceFactory();
-    com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
-        xInterface = xMSF->createInstance( rtl::OUString::createFromAscii( "com.sun.star.i18n.BreakIterator" ) );
-    if ( xInterface.is() )
-        xPPTBreakIter = com::sun::star::uno::Reference< com::sun::star::i18n::XBreakIterator >
-            ( xInterface, com::sun::star::uno::UNO_QUERY );
-
-    xInterface = xMSF->createInstance( rtl::OUString::createFromAscii( "com.sun.star.i18n.ScriptTypeDetector" ) );
-    if ( xInterface.is() )
-        xScriptTypeDetector = com::sun::star::uno::Reference< com::sun::star::i18n::XScriptTypeDetector >
-            ( xInterface, com::sun::star::uno::UNO_QUERY );
-}
-
-short FontCollection::GetScriptDirection( const String& rString ) const
-{
-    short nRet = com::sun::star::i18n::ScriptDirection::NEUTRAL;
-    if ( xScriptTypeDetector.is() )
-    {
-        const rtl::OUString sT( rString );
-        nRet = xScriptTypeDetector->getScriptDirection( sT, 0, com::sun::star::i18n::ScriptDirection::NEUTRAL );
-    }
-    return nRet;
-}
-
-sal_uInt32 FontCollection::GetId( FontCollectionEntry& rEntry )
-{
-    if( rEntry.Name.Len() )
-    {
-        const sal_uInt32 nFonts = GetCount();
-
-        for( sal_uInt32 i = 0; i < nFonts; i++ )
-        {
-            const FontCollectionEntry* pEntry = GetById( i );
-            if( pEntry->Name == rEntry.Name )
-                return i;
-        }
-        Font aFont;
-        aFont.SetCharSet( rEntry.CharSet );
-        aFont.SetName( rEntry.Original );
-//      aFont.SetFamily( rEntry.Family );
-//      aFont.SetPitch( rEntry.Pitch );
-        aFont.SetHeight( 100 );
-
-        if ( !pVDev )
-            pVDev = new VirtualDevice;
-
-        pVDev->SetFont( aFont );
-        FontMetric aMetric( pVDev->GetFontMetric() );
-
-        sal_uInt16 nTxtHeight = (sal_uInt16)aMetric.GetAscent() + (sal_uInt16)aMetric.GetDescent();
-
-        if ( nTxtHeight )
-        {
-            double fScaling = (double)nTxtHeight / 120.0;
-            if ( ( fScaling > 0.50 ) && ( fScaling < 1.5 ) )
-                rEntry.Scaling = fScaling;
-        }
-
-        List::Insert( new FontCollectionEntry( rEntry ), LIST_APPEND );
-        return nFonts;
-    }
-    return 0;
-}
-
-const FontCollectionEntry* FontCollection::GetById( sal_uInt32 nId )
-{
-    return (FontCollectionEntry*)List::GetObject( nId );
-}
-
-// ---------------------------------------------------------------------------------------------
-
 sal_uInt32 PPTWriter::ImplVBAInfoContainer( SvStream* pStrm )
 {
     sal_uInt32 nSize = 28;
@@ -936,360 +729,6 @@ sal_Bool PropStateValue::ImplGetPropertyValue( const String& rString, sal_Bool b
 
 // ---------------------------------------------------------------------------------------------
 
-sal_Bool PPTWriter::ImplInitSOIface()
-{
-    while( TRUE )
-    {
-        mXDrawPagesSupplier = ::com::sun::star::uno::Reference<
-            ::com::sun::star::drawing::XDrawPagesSupplier >
-                ( mXModel, ::com::sun::star::uno::UNO_QUERY );
-        if ( !mXDrawPagesSupplier.is() )
-            break;
-
-        mXMasterPagesSupplier = ::com::sun::star::uno::Reference<
-            ::com::sun::star::drawing::XMasterPagesSupplier >
-                ( mXModel, ::com::sun::star::uno::UNO_QUERY );
-        if ( !mXMasterPagesSupplier.is() )
-            break;
-        mXDrawPages = mXMasterPagesSupplier->getMasterPages();
-        if ( !mXDrawPages.is() )
-            break;
-        mnMasterPages = mXDrawPages->getCount();
-        mXDrawPages = mXDrawPagesSupplier->getDrawPages();
-        if( !mXDrawPages.is() )
-            break;
-        mnPages =  mXDrawPages->getCount();
-        if ( !ImplGetPageByIndex( 0, NORMAL ) )
-            break;
-
-        return TRUE;
-    }
-    return FALSE;
-}
-
-// ---------------------------------------------------------------------------------------------
-
-sal_Bool PPTWriter::ImplSetCurrentStyleSheet( sal_uInt32 nPageNum )
-{
-    sal_Bool bRet = sal_False;
-    if ( nPageNum >= maStyleSheetList.size() )
-        nPageNum = 0;
-    else
-        bRet = sal_True;
-    mpStyleSheet = maStyleSheetList[ nPageNum ];
-    return bRet;
-}
-
-// ---------------------------------------------------------------------------------------------
-
-sal_Bool PPTWriter::ImplGetPageByIndex( sal_uInt32 nIndex, PageType ePageType )
-{
-    while( TRUE )
-    {
-        if ( ePageType != meLatestPageType )
-        {
-            switch( ePageType )
-            {
-                case NORMAL :
-                case NOTICE :
-                {
-                    mXDrawPages = mXDrawPagesSupplier->getDrawPages();
-                    if( !mXDrawPages.is() )
-                        return FALSE;
-                }
-                break;
-
-                case MASTER :
-                {
-                    mXDrawPages = mXMasterPagesSupplier->getMasterPages();
-                    if( !mXDrawPages.is() )
-                        return FALSE;
-                }
-                break;
-                default:
-                    break;
-            }
-            meLatestPageType = ePageType;
-        }
-        ::com::sun::star::uno::Any aAny( mXDrawPages->getByIndex( nIndex ) );
-        aAny >>= mXDrawPage;
-        if ( !mXDrawPage.is() )
-            break;
-        if ( ePageType == NOTICE )
-        {
-            ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentationPage >
-                aXPresentationPage( mXDrawPage, ::com::sun::star::uno::UNO_QUERY );
-            if ( !aXPresentationPage.is() )
-                break;
-            mXDrawPage = aXPresentationPage->getNotesPage();
-            if ( !mXDrawPage.is() )
-                break;
-        }
-        mXPagePropSet = ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
-            ( mXDrawPage, ::com::sun::star::uno::UNO_QUERY );
-        if ( !mXPagePropSet.is() )
-            break;
-
-        mXShapes = ::com::sun::star::uno::Reference<
-            ::com::sun::star::drawing::XShapes >
-                ( mXDrawPage, ::com::sun::star::uno::UNO_QUERY );
-        if ( !mXShapes.is() )
-            break;
-
-        /* try to get the "real" background PropertySet. If the normal page is not supporting this property, it is
-           taken the property from the master */
-        sal_Bool bHasBackground = GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Background" ) ), sal_True );
-        if ( bHasBackground )
-            bHasBackground = ( aAny >>= mXBackgroundPropSet );
-        if ( !bHasBackground )
-        {
-            ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XMasterPageTarget >
-                aXMasterPageTarget( mXDrawPage, ::com::sun::star::uno::UNO_QUERY );
-            if ( aXMasterPageTarget.is() )
-            {
-                ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > aXMasterDrawPage;
-                aXMasterDrawPage = aXMasterPageTarget->getMasterPage();
-                if ( aXMasterDrawPage.is() )
-                {
-                    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXMasterPagePropSet;
-                    aXMasterPagePropSet = ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
-                        ( aXMasterDrawPage, ::com::sun::star::uno::UNO_QUERY );
-                    if ( aXMasterPagePropSet.is() )
-                    {
-                        sal_Bool bBackground = GetPropertyValue( aAny, aXMasterPagePropSet,
-                                String( RTL_CONSTASCII_USTRINGPARAM( "Background" ) ) );
-                        if ( bBackground )
-                        {
-                            aAny >>= mXBackgroundPropSet;
-                        }
-                    }
-                }
-            }
-        }
-        return TRUE;
-    }
-    return FALSE;
-}
-
-// ---------------------------------------------------------------------------------------------
-
-sal_Bool PPTWriter::ImplGetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup )
-{
-    while(TRUE)
-    {
-        if (  ( bGroup == FALSE ) || ( GetCurrentGroupLevel() == 0 ) )
-        {
-            ::com::sun::star::uno::Any aAny( mXShapes->getByIndex( nIndex ) );
-            aAny >>= mXShape;
-        }
-        else
-        {
-            ::com::sun::star::uno::Any aAny( GetCurrentGroupAccess()->getByIndex( GetCurrentGroupIndex() ) );
-            aAny >>= mXShape;
-        }
-        if ( !mXShape.is() )
-            break;
-
-        ::com::sun::star::uno::Any aAny( mXShape->queryInterface( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >*) 0 ) ));
-        aAny >>= mXPropSet;
-
-        if ( !mXPropSet.is() )
-            break;
-        maPosition = ImplMapPoint( mXShape->getPosition() );
-        maSize = ImplMapSize( mXShape->getSize() );
-        maRect = Rectangle( Point( maPosition.X, maPosition.Y ), Size( maSize.Width, maSize.Height ) );
-        mType = ByteString( String( mXShape->getShapeType() ), RTL_TEXTENCODING_UTF8 );
-        mType.Erase( 0, 13 );                                   // "com.sun.star." entfernen
-        sal_uInt16 nPos = mType.Search( (const char*)"Shape" );
-        mType.Erase( nPos, 5 );
-
-        mbPresObj = mbEmptyPresObj = FALSE;
-        if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsPresentationObject" ) ) ) )
-            mAny >>= mbPresObj;
-
-        if ( mbPresObj && ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsEmptyPresentationObject" ) ) ) )
-            mAny >>= mbEmptyPresObj;
-
-        mnAngle = ( PropValue::GetPropertyValue( aAny,
-            mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "RotateAngle" ) ), sal_True ) )
-                ? *((sal_Int32*)aAny.getValue() )
-                : 0;
-
-        return TRUE;
-    }
-    return FALSE;
-}
-
-//  -----------------------------------------------------------------------
-
-sal_uInt32 PPTWriter::ImplGetMasterIndex( PageType ePageType )
-{
-    sal_uInt32 nRetValue = 0;
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XMasterPageTarget >
-        aXMasterPageTarget( mXDrawPage, ::com::sun::star::uno::UNO_QUERY );
-
-    if ( aXMasterPageTarget.is() )
-    {
-        ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >
-            aXDrawPage = aXMasterPageTarget->getMasterPage();
-        if ( aXDrawPage.is() )
-        {
-            ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
-                aXPropertySet( aXDrawPage, ::com::sun::star::uno::UNO_QUERY );
-
-            if ( aXPropertySet.is() )
-            {
-                if ( ImplGetPropertyValue( aXPropertySet, String( RTL_CONSTASCII_USTRINGPARAM( "Number" ) ) ) )
-                    nRetValue |= *(sal_Int16*)mAny.getValue();
-                if ( nRetValue & 0xffff )           // ueberlauf vermeiden
-                    nRetValue--;
-            }
-        }
-    }
-    if ( ePageType == NOTICE )
-        nRetValue += mnMasterPages;
-    return nRetValue;
-}
-
-//  -----------------------------------------------------------------------
-
-sal_Bool PPTWriter::ImplGetStyleSheets()
-{
-    int             nInstance, nLevel;
-    sal_Bool        bRetValue = sal_False;
-    sal_uInt32      nPageNum;
-
-    for ( nPageNum = 0; nPageNum < mnMasterPages; nPageNum++ )
-    {
-        ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed >
-            aXNamed;
-
-        ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
-            aXNameAccess;
-
-        ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyleFamiliesSupplier >
-            aXStyleFamiliesSupplier( mXModel, ::com::sun::star::uno::UNO_QUERY );
-
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
-            aXPropSet( mXModel, ::com::sun::star::uno::UNO_QUERY );
-
-        sal_uInt16 nDefaultTab = ( aXPropSet.is() && ImplGetPropertyValue( aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TabStop" ) ) ) )
-            ? (sal_uInt16)( *(sal_Int32*)mAny.getValue() / 4.40972 )
-            : 1250;
-
-        maStyleSheetList.push_back( new PPTExStyleSheet( nDefaultTab, (PPTExBulletProvider&)*this ) );
-        ImplSetCurrentStyleSheet( nPageNum );
-        if ( ImplGetPageByIndex( nPageNum, MASTER ) )
-            aXNamed = ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed >
-                        ( mXDrawPage, ::com::sun::star::uno::UNO_QUERY );
-
-        if ( aXStyleFamiliesSupplier.is() )
-            aXNameAccess = aXStyleFamiliesSupplier->getStyleFamilies();
-
-        bRetValue = aXNamed.is() && aXNameAccess.is() && aXStyleFamiliesSupplier.is();
-        if  ( bRetValue )
-        {
-            for ( nInstance = EPP_TEXTTYPE_Title; nInstance <= EPP_TEXTTYPE_CenterTitle; nInstance++ )
-            {
-                String aStyle;
-                String aFamily;
-                switch ( nInstance )
-                {
-                    case EPP_TEXTTYPE_CenterTitle :
-                    case EPP_TEXTTYPE_Title :
-                    {
-                        aStyle = String( RTL_CONSTASCII_USTRINGPARAM( "title" ) );
-                        aFamily = aXNamed->getName();
-                    }
-                    break;
-                    case EPP_TEXTTYPE_Body :
-                    {
-                        aStyle = String( RTL_CONSTASCII_USTRINGPARAM( "outline1" ) );      // SD_LT_SEPARATOR
-                        aFamily = aXNamed->getName();
-                    }
-                    break;
-                    case EPP_TEXTTYPE_Other :
-                    {
-                        aStyle = String( RTL_CONSTASCII_USTRINGPARAM( "standard" ) );
-                        aFamily = String( RTL_CONSTASCII_USTRINGPARAM( "graphics" ) );
-                    }
-                    break;
-                    case EPP_TEXTTYPE_CenterBody :
-                    {
-                        aStyle = String( RTL_CONSTASCII_USTRINGPARAM( "subtitle" ) );
-                        aFamily = aXNamed->getName();
-                    }
-                    break;
-                }
-                if ( aStyle.Len() && aFamily.Len() )
-                {
-                    try
-                    {
-                        ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >xNameAccess;
-                        if ( aXNameAccess->hasByName( aFamily ) )
-                        {
-                            ::com::sun::star::uno::Any aAny( aXNameAccess->getByName( aFamily ) );
-                            if( aAny.getValue() && ::cppu::extractInterface( xNameAccess, aAny ) )
-                            {
-                                ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > aXFamily;
-                                if ( aAny >>= aXFamily )
-                                {
-                                    if ( aXFamily->hasByName( aStyle ) )
-                                    {
-                                        ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > xStyle;
-                                        aAny = aXFamily->getByName( aStyle );
-                                        if( aAny.getValue() && ::cppu::extractInterface( xStyle, aAny ) )
-                                        {
-                                            ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > aXStyle;
-                                            aAny >>= aXStyle;
-                                            ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
-                                                xPropSet( aXStyle, ::com::sun::star::uno::UNO_QUERY );
-                                            if( xPropSet.is() )
-                                                mpStyleSheet->SetStyleSheet( xPropSet, maFontCollection, nInstance, 0 );
-                                            for ( nLevel = 1; nLevel < 5; nLevel++ )
-                                            {
-                                                if ( nInstance == EPP_TEXTTYPE_Body )
-                                                {
-                                                    sal_Unicode cTemp = aStyle.GetChar( aStyle.Len() - 1 );
-                                                    aStyle.SetChar( aStyle.Len() - 1, ++cTemp );
-                                                    if ( aXFamily->hasByName( aStyle ) )
-                                                    {
-                                                        aXFamily->getByName( aStyle ) >>= xStyle;
-                                                        if( xStyle.is() )
-                                                        {
-                                                            ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
-                                                                xPropertySet( xStyle, ::com::sun::star::uno::UNO_QUERY );
-                                                            if ( xPropertySet.is() )
-                                                                mpStyleSheet->SetStyleSheet( xPropertySet, maFontCollection, nInstance, nLevel );
-                                                        }
-                                                    }
-                                                }
-                                                else
-                                                    mpStyleSheet->SetStyleSheet( xPropSet, maFontCollection, nInstance, nLevel );
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    catch( ::com::sun::star::uno::Exception& )
-                    {
-                    //
-                    }
-                }
-            }
-            for ( ; nInstance <= EPP_TEXTTYPE_QuarterBody; nInstance++ )
-            {
-
-            }
-        }
-    }
-    return bRetValue;
-}
-
-//  -----------------------------------------------------------------------
-
 void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj )
 {
     sal_Bool            bFirstParagraph = TRUE;
@@ -1360,7 +799,6 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj )
             ( mpStyleSheet->IsHardAttribute( nInstance, nDepth, ParaAttr_BiDi, pPara->mnBiDi ) ) )
             nPropertyFlags |= 0x00200000;
 
-
         sal_Int32 nBuRealSize = pPara->nBulletRealSize;
         sal_Int16 nBulletFlags = pPara->nBulletFlags;
 
@@ -1666,1362 +1104,6 @@ void PPTWriter::ImplFlipBoundingBox( EscherPropertyContainer& rPropOpt )
 
 //  -----------------------------------------------------------------------
 
-struct FieldEntry
-{
-    sal_uInt32  nFieldType;
-    sal_uInt32  nFieldStartPos;
-    sal_uInt32  nFieldEndPos;
-    String      aRepresentation;
-    String      aFieldUrl;
-
-    FieldEntry( sal_uInt32 nType, sal_uInt32 nStart, sal_uInt32 nEnd )
-    {
-        nFieldType = nType;
-        nFieldStartPos = nStart;
-        nFieldEndPos = nEnd;
-    }
-};
-
-//  -----------------------------------------------------------------------
-
-PortionObj::PortionObj( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
-                FontCollection& rFontCollection ) :
-    mnCharAttrHard      ( 0 ),
-    mnCharAttr          ( 0 ),
-    mnFont              ( 0 ),
-    mnAsianOrComplexFont( 0xffff ),
-    mnTextSize          ( 0 ),
-    mbLastPortion       ( TRUE ),
-    mpText              ( NULL ),
-    mpFieldEntry        ( NULL )
-{
-    mXPropSet = rXPropSet;
-
-    ImplGetPortionValues( rFontCollection, FALSE );
-}
-
-PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRange,
-                            sal_Bool bLast, FontCollection& rFontCollection ) :
-    mnCharAttrHard          ( 0 ),
-    mnCharAttr              ( 0 ),
-    mnFont                  ( 0 ),
-    mnAsianOrComplexFont    ( 0xffff ),
-    mbLastPortion           ( bLast ),
-    mpText                  ( NULL ),
-    mpFieldEntry            ( NULL )
-{
-    String aString( rXTextRange->getString() );
-    String aURL;
-    BOOL bRTL_endingParen = FALSE;
-
-    mnTextSize = aString.Len();
-    if ( bLast )
-        mnTextSize++;
-
-    if ( mnTextSize )
-    {
-        mpFieldEntry = NULL;
-        sal_uInt32 nFieldType = 0;
-
-        mXPropSet = ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet >
-                ( rXTextRange, ::com::sun::star::uno::UNO_QUERY );
-        mXPropState = ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertyState >
-                ( rXTextRange, ::com::sun::star::uno::UNO_QUERY );
-
-        sal_Bool bPropSetsValid = ( mXPropSet.is() && mXPropState.is() );
-        if ( bPropSetsValid )
-            nFieldType = ImplGetTextField( rXTextRange, mXPropSet, aURL );
-        if ( nFieldType )
-        {
-            mpFieldEntry = new FieldEntry( nFieldType, 0, mnTextSize );
-            if ( ( nFieldType >> 28 == 4 ) )
-            {
-                mpFieldEntry->aRepresentation = aString;
-                mpFieldEntry->aFieldUrl = aURL;
-            }
-        }
-        sal_Bool bSymbol = FALSE;
-
-        if ( bPropSetsValid && ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontCharSet" ) ), FALSE ) )
-        {
-            sal_Int16 nCharset;
-            mAny >>= nCharset;
-            if ( nCharset == ::com::sun::star::awt::CharSet::SYMBOL )
-                bSymbol = TRUE;
-        }
-        if ( mpFieldEntry && ( nFieldType & 0x800000 ) )    // placeholder ?
-        {
-            mnTextSize = 1;
-            if ( bLast )
-                mnTextSize++;
-            mpText = new sal_uInt16[ mnTextSize ];
-            mpText[ 0 ] = 0x2a;
-        }
-        else
-        {
-            const sal_Unicode* pText = aString.GetBuffer();
-            // For i39516 - a closing parenthesis that ends an RTL string is displayed backwards by PPT
-            // Solution: add a Unicode Right-to-Left Mark, following the method described in i18024
-            if ( bLast && pText[ aString.Len() - 1 ] == sal_Unicode(')') && rFontCollection.GetScriptDirection( aString ) == com::sun::star::i18n::ScriptDirection::RIGHT_TO_LEFT )
-            {
-                mnTextSize++;
-                bRTL_endingParen = TRUE;
-            }
-            mpText = new sal_uInt16[ mnTextSize ];
-            sal_uInt16 nChar;
-            for ( int i = 0; i < aString.Len(); i++ )
-            {
-                nChar = (sal_uInt16)pText[ i ];
-                if ( nChar == 0xa )
-                    nChar++;
-                else if ( !bSymbol )
-                {
-                    switch ( nChar )
-                    {
-                        // Currency
-                        case 128:   nChar = 0x20AC; break;
-                        // Punctuation and other
-                        case 130:   nChar = 0x201A; break;// SINGLE LOW-9 QUOTATION MARK
-                        case 131:   nChar = 0x0192; break;// LATIN SMALL LETTER F WITH HOOK
-                        case 132:   nChar = 0x201E; break;// DOUBLE LOW-9 QUOTATION MARK
-                                                              // LOW DOUBLE PRIME QUOTATION MARK
-                        case 133:   nChar = 0x2026; break;// HORIZONTAL ELLIPSES
-                        case 134:   nChar = 0x2020; break;// DAGGER
-                        case 135:   nChar = 0x2021; break;// DOUBLE DAGGER
-                        case 136:   nChar = 0x02C6; break;// MODIFIER LETTER CIRCUMFLEX ACCENT
-                        case 137:   nChar = 0x2030; break;// PER MILLE SIGN
-                        case 138:   nChar = 0x0160; break;// LATIN CAPITAL LETTER S WITH CARON
-                        case 139:   nChar = 0x2039; break;// SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-                        case 140:   nChar = 0x0152; break;// LATIN CAPITAL LIGATURE OE
-                        case 142:   nChar = 0x017D; break;// LATIN CAPITAL LETTER Z WITH CARON
-                        case 145:   nChar = 0x2018; break;// LEFT SINGLE QUOTATION MARK
-                                                              // MODIFIER LETTER TURNED COMMA
-                        case 146:   nChar = 0x2019; break;// RIGHT SINGLE QUOTATION MARK
-                                                              // MODIFIER LETTER APOSTROPHE
-                        case 147:   nChar = 0x201C; break;// LEFT DOUBLE QUOTATION MARK
-                                                              // REVERSED DOUBLE PRIME QUOTATION MARK
-                        case 148:   nChar = 0x201D; break;// RIGHT DOUBLE QUOTATION MARK
-                                                              // REVERSED DOUBLE PRIME QUOTATION MARK
-                        case 149:   nChar = 0x2022; break;// BULLET
-                        case 150:   nChar = 0x2013; break;// EN DASH
-                        case 151:   nChar = 0x2014; break;// EM DASH
-                        case 152:   nChar = 0x02DC; break;// SMALL TILDE
-                        case 153:   nChar = 0x2122; break;// TRADE MARK SIGN
-                        case 154:   nChar = 0x0161; break;// LATIN SMALL LETTER S WITH CARON
-                        case 155:   nChar = 0x203A; break;// SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-                        case 156:   nChar = 0x0153; break;// LATIN SMALL LIGATURE OE
-                        case 158:   nChar = 0x017E; break;// LATIN SMALL LETTER Z WITH CARON
-                        case 159:   nChar = 0x0178; break;// LATIN CAPITAL LETTER Y WITH DIAERESIS
-//                      case 222:   nChar = 0x00B6; break;// PILCROW SIGN / PARAGRAPH SIGN
-                    }
-                }
-                mpText[ i ] = nChar;
-            }
-        }
-        if ( bRTL_endingParen )
-            mpText[ mnTextSize - 2 ] = 0x200F; // Unicode Right-to-Left mark
-
-        if ( bLast )
-            mpText[ mnTextSize - 1 ] = 0xd;
-
-        if ( bPropSetsValid )
-            ImplGetPortionValues( rFontCollection, TRUE );
-    }
-}
-
-PortionObj::PortionObj( const PortionObj& rPortionObj )
-: PropStateValue( rPortionObj )
-{
-    ImplConstruct( rPortionObj );
-}
-
-PortionObj::~PortionObj()
-{
-    ImplClear();
-}
-
-void PortionObj::Write( SvStream* pStrm, sal_Bool bLast )
-{
-    sal_uInt32 nCount = mnTextSize;
-    if ( bLast && mbLastPortion )
-        nCount--;
-    for ( sal_uInt32 i = 0; i < nCount; i++ )
-        *pStrm << (sal_uInt16)mpText[ i ];
-}
-
-void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool bGetPropStateValue )
-{
-
-    sal_Bool bOk = ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontName" ) ), bGetPropStateValue );
-    meFontName = ePropState;
-    if ( bOk )
-    {
-        FontCollectionEntry aFontDesc( *(::rtl::OUString*)mAny.getValue() );
-        sal_uInt32  nCount = rFontCollection.GetCount();
-        mnFont = (sal_uInt16)rFontCollection.GetId( aFontDesc );
-        if ( mnFont == nCount )
-        {
-            FontCollectionEntry& rFontDesc = rFontCollection.GetLast();
-            if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontCharSet" ) ), sal_False ) )
-                mAny >>= rFontDesc.CharSet;
-            if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontFamily" ) ), sal_False ) )
-                mAny >>= rFontDesc.Family;
-            if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontPitch" ) ), sal_False ) )
-                mAny >>= rFontDesc.Pitch;
-        }
-    }
-
-    sal_Int16 nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage( Application::GetSettings().GetLanguage() );
-    if ( mpText && mnTextSize && xPPTBreakIter.is() )
-    {
-        rtl::OUString sT( mpText, mnTextSize );
-        nScriptType = xPPTBreakIter->getScriptType( sT, 0 );
-    }
-    if ( nScriptType != com::sun::star::i18n::ScriptType::COMPLEX )
-    {
-        bOk = ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontNameAsian" ) ), bGetPropStateValue );
-        meAsianOrComplexFont = ePropState;
-        if ( bOk )
-        {
-            FontCollectionEntry aFontDesc( *(::rtl::OUString*)mAny.getValue() );
-            sal_uInt32  nCount = rFontCollection.GetCount();
-            mnAsianOrComplexFont = (sal_uInt16)rFontCollection.GetId( aFontDesc );
-            if ( mnAsianOrComplexFont == nCount )
-            {
-                FontCollectionEntry& rFontDesc = rFontCollection.GetLast();
-                if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontCharSetAsian" ) ), sal_False ) )
-                    mAny >>= rFontDesc.CharSet;
-                if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontFamilyAsian" ) ), sal_False ) )
-                    mAny >>= rFontDesc.Family;
-                if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontPitchAsian" ) ), sal_False ) )
-                    mAny >>= rFontDesc.Pitch;
-            }
-        }
-    }
-    else
-    {
-        bOk = ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontNameComplex" ) ), bGetPropStateValue );
-        meAsianOrComplexFont = ePropState;
-        if ( bOk )
-        {
-            FontCollectionEntry aFontDesc( *(::rtl::OUString*)mAny.getValue() );
-            sal_uInt32  nCount = rFontCollection.GetCount();
-            mnAsianOrComplexFont = (sal_uInt16)rFontCollection.GetId( aFontDesc );
-            if ( mnAsianOrComplexFont == nCount )
-            {
-                FontCollectionEntry& rFontDesc = rFontCollection.GetLast();
-                if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontCharSetComplex" ) ), sal_False ) )
-                    mAny >>= rFontDesc.CharSet;
-                if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontFamilyComplex" ) ), sal_False ) )
-                    mAny >>= rFontDesc.Family;
-                if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontPitchComplex" ) ), sal_False ) )
-                    mAny >>= rFontDesc.Pitch;
-            }
-        }
-    }
-
-    rtl::OUString aCharHeightName, aCharWeightName, aCharLocaleName, aCharPostureName;
-    switch( nScriptType )
-    {
-        case com::sun::star::i18n::ScriptType::ASIAN :
-        {
-            aCharHeightName  = String( RTL_CONSTASCII_USTRINGPARAM( "CharHeightAsian" ) );
-            aCharWeightName  = String( RTL_CONSTASCII_USTRINGPARAM( "CharWeightAsian" ) );
-            aCharLocaleName  = String( RTL_CONSTASCII_USTRINGPARAM( "CharLocaleAsian" ) );
-            aCharPostureName = String( RTL_CONSTASCII_USTRINGPARAM( "CharPostureAsian" ) );
-            break;
-        }
-        case com::sun::star::i18n::ScriptType::COMPLEX :
-        {
-            aCharHeightName  = String( RTL_CONSTASCII_USTRINGPARAM( "CharHeightComplex" ) );
-            aCharWeightName  = String( RTL_CONSTASCII_USTRINGPARAM( "CharWeightComplex" ) );
-            aCharLocaleName  = String( RTL_CONSTASCII_USTRINGPARAM( "CharLocaleComplex" ) );
-            aCharPostureName = String( RTL_CONSTASCII_USTRINGPARAM( "CharPostureComplex" ) );
-            break;
-        }
-        default:
-        {
-            aCharHeightName  = String( RTL_CONSTASCII_USTRINGPARAM( "CharHeight" ) );
-            aCharWeightName  = String( RTL_CONSTASCII_USTRINGPARAM( "CharWeight" ) );
-            aCharLocaleName  = String( RTL_CONSTASCII_USTRINGPARAM( "CharLocale" ) );
-            aCharPostureName = String( RTL_CONSTASCII_USTRINGPARAM( "CharPosture" ) );
-            break;
-        }
-    }
-
-    mnCharHeight = 24;
-    if ( GetPropertyValue( mAny, mXPropSet, aCharHeightName, sal_False ) )
-    {
-        float fVal(0.0);
-        if ( mAny >>= fVal )
-        {
-            mnCharHeight = (sal_uInt16)( fVal + 0.5 );
-            meCharHeight = GetPropertyState( mXPropSet, aCharHeightName );
-        }
-    }
-    if ( GetPropertyValue( mAny, mXPropSet, aCharWeightName, sal_False ) )
-    {
-        float fFloat(0.0);
-        if ( mAny >>= fFloat )
-        {
-            if ( fFloat >= ::com::sun::star::awt::FontWeight::SEMIBOLD )
-                mnCharAttr |= 1;
-            if ( GetPropertyState( mXPropSet, aCharWeightName ) == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
-                mnCharAttrHard |= 1;
-        }
-    }
-    if ( GetPropertyValue( mAny, mXPropSet, aCharLocaleName, sal_False ) )
-    {
-        com::sun::star::lang::Locale eLocale;
-        if ( mAny >>= eLocale )
-            meCharLocale = eLocale;
-    }
-    if ( GetPropertyValue( mAny, mXPropSet, aCharPostureName, sal_False ) )
-    {
-        ::com::sun::star::awt::FontSlant aFS;
-        if ( mAny >>= aFS )
-        {
-            switch( aFS )
-            {
-                case ::com::sun::star::awt::FontSlant_OBLIQUE :
-                case ::com::sun::star::awt::FontSlant_ITALIC :
-                    mnCharAttr |= 2;
-                    break;
-                default:
-                    break;
-            }
-            if ( GetPropertyState( mXPropSet, aCharPostureName ) == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
-                mnCharAttrHard |= 2;
-        }
-    }
-
-    if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharUnderline" ) ), bGetPropStateValue ) )
-    {
-        sal_Int16 nVal(0);
-        mAny >>= nVal;
-        switch ( nVal )
-        {
-            case ::com::sun::star::awt::FontUnderline::SINGLE :
-            case ::com::sun::star::awt::FontUnderline::DOUBLE :
-            case ::com::sun::star::awt::FontUnderline::DOTTED :
-                mnCharAttr |= 4;
-        }
-    }
-    if ( ePropState == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
-        mnCharAttrHard |= 4;
-
-    if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharShadowed" ) ), bGetPropStateValue ) )
-    {
-        sal_Bool bBool(sal_False);
-        mAny >>= bBool;
-        if ( bBool )
-            mnCharAttr |= 0x10;
-    }
-    if ( ePropState == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
-        mnCharAttrHard |= 16;
-
-    if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharRelief" ) ), bGetPropStateValue ) )
-    {
-        sal_Int16 nVal(0);
-        mAny >>= nVal;
-        if ( nVal != ::com::sun::star::text::FontRelief::NONE )
-            mnCharAttr |= 512;
-    }
-    if ( ePropState == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
-        mnCharAttrHard |= 512;
-
-    if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharColor" ) ), bGetPropStateValue ) )
-    {
-        sal_uInt32 nSOColor = *( (sal_uInt32*)mAny.getValue() );
-        mnCharColor = nSOColor & 0xff00ff00;                            // green and hibyte
-        mnCharColor |= (sal_uInt8)( nSOColor ) << 16;                   // red and blue is switched
-        mnCharColor |= (sal_uInt8)( nSOColor >> 16 );
-    }
-    meCharColor = ePropState;
-
-    mnCharEscapement = 0;
-    if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharEscapement" ) ), bGetPropStateValue ) )
-    {
-        mAny >>= mnCharEscapement;
-        if ( mnCharEscapement > 100 )
-            mnCharEscapement = 33;
-        else if ( mnCharEscapement < -100 )
-            mnCharEscapement = -33;
-    }
-    meCharEscapement = ePropState;
-}
-
-void PortionObj::ImplClear()
-{
-    delete (FieldEntry*)mpFieldEntry;
-    delete[] mpText;
-}
-
-void PortionObj::ImplConstruct( const PortionObj& rPortionObj )
-{
-    mbLastPortion = rPortionObj.mbLastPortion;
-    mnTextSize = rPortionObj.mnTextSize;
-    mnCharColor = rPortionObj.mnCharColor;
-    mnCharEscapement = rPortionObj.mnCharEscapement;
-    mnCharAttr = rPortionObj.mnCharAttr;
-    mnCharHeight = rPortionObj.mnCharHeight;
-    mnFont = rPortionObj.mnFont;
-    mnAsianOrComplexFont = rPortionObj.mnAsianOrComplexFont;
-
-    if ( rPortionObj.mpText )
-    {
-        mpText = new sal_uInt16[ mnTextSize ];
-        memcpy( mpText, rPortionObj.mpText, mnTextSize << 1 );
-    }
-    else
-        mpText = NULL;
-
-    if ( rPortionObj.mpFieldEntry )
-        mpFieldEntry = new FieldEntry( *( rPortionObj.mpFieldEntry ) );
-    else
-        mpFieldEntry = NULL;
-}
-
-sal_uInt32 PortionObj::ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition )
-{
-    if ( mpFieldEntry && ( !mpFieldEntry->nFieldStartPos ) )
-    {
-        mpFieldEntry->nFieldStartPos += nCurrentTextPosition;
-        mpFieldEntry->nFieldEndPos += nCurrentTextPosition;
-    }
-    return mnTextSize;
-}
-
-//  -----------------------------------------------------------------------
-// Rueckgabe:                           0 = kein TextField
-//  bit28->31   text field type :
-//                                      1 = Date
-//                                      2 = Time
-//                                      3 = SlideNumber
-//                                      4 = Url
-//                                      5 = DateTime
-//                                      6 = header
-//                                      7 = footer
-//  bit24->27   text field sub type (optional)
-//     23->     PPT Textfield needs a placeholder
-
-sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & ,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, String& rURL )
-{
-    sal_uInt32 nRetValue = 0;
-    sal_Int32 nFormat;
-    ::com::sun::star::uno::Any aAny;
-    if ( GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TextPortionType" ) ), sal_True ) )
-    {
-        String  aTextFieldType( *(::rtl::OUString*)aAny.getValue() );
-        if ( aTextFieldType == String( RTL_CONSTASCII_USTRINGPARAM( "TextField" ) ) )
-        {
-            if ( GetPropertyValue( aAny, rXPropSet, aTextFieldType, sal_True ) )
-            {
-                ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextField > aXTextField;
-                if ( aAny >>= aXTextField )
-                {
-                    if ( aXTextField.is() )
-                    {
-                        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
-                            xFieldPropSet( aXTextField, ::com::sun::star::uno::UNO_QUERY );
-                        if ( xFieldPropSet.is() )
-                        {
-                            String aFieldKind( aXTextField->getPresentation( TRUE ) );
-                            if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "Date" ) ) )
-                            {
-                                if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsFix" ) ) ), sal_True )
-                                {
-                                    sal_Bool bBool;
-                                    aAny >>= bBool;
-                                    if ( !bBool )  // Fixed DateFields gibt es in PPT nicht
-                                    {
-                                        if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Format" ) ) ), sal_True )
-                                        {
-                                            nFormat = *(sal_Int32*)aAny.getValue();
-                                            switch ( nFormat )
-                                            {
-                                                default:
-                                                case 5 :
-                                                case 4 :
-                                                case 2 : nFormat = 0; break;
-                                                case 8 :
-                                                case 9 :
-                                                case 3 : nFormat = 1; break;
-                                                case 7 :
-                                                case 6 : nFormat = 2; break;
-                                            }
-                                            nRetValue |= ( ( ( 1 << 4 ) | nFormat ) << 24 ) | 0x800000;
-                                        }
-                                    }
-                                }
-                            }
-                            else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ) )
-                            {
-                                if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ) ), sal_True )
-                                    rURL = String( *(::rtl::OUString*)aAny.getValue() );
-                                nRetValue = 4 << 28;
-                            }
-                            else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "Page" ) ) )
-                            {
-                                nRetValue = 3 << 28 | 0x800000;
-                            }
-                            else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "Pages" ) ) )
-                            {
-
-                            }
-                            else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "Time" ) ) )
-                            {
-                                if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsFix" ) ) ), sal_True )
-                                {
-                                    sal_Bool bBool;
-                                    aAny >>= bBool;
-                                    if ( !bBool )
-                                    {
-                                        if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsFix" ) ) ), sal_True )
-                                        {
-                                            nFormat = *(sal_Int32*)aAny.getValue();
-                                            nRetValue |= ( ( ( 2 << 4 ) | nFormat ) << 24 ) | 0x800000;
-                                        }
-                                    }
-                                }
-                            }
-                            else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "File" ) ) )
-                            {
-
-                            }
-                            else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "Table" ) ) )
-                            {
-
-                            }
-                            else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "ExtTime" ) ) )
-                            {
-                                if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsFix" ) ) ), sal_True )
-                                {
-                                    sal_Bool bBool;
-                                    aAny >>= bBool;
-                                    if ( !bBool )
-                                    {
-                                        if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Format" ) ) ), sal_True )
-                                        {
-                                            nFormat = *(sal_Int32*)aAny.getValue();
-                                            switch ( nFormat )
-                                            {
-                                                default:
-                                                case 6 :
-                                                case 7 :
-                                                case 8 :
-                                                case 2 : nFormat = 12; break;
-                                                case 3 : nFormat = 9; break;
-                                                case 5 :
-                                                case 4 : nFormat = 10; break;
-
-                                            }
-                                            nRetValue |= ( ( ( 2 << 4 ) | nFormat ) << 24 ) | 0x800000;
-                                        }
-                                    }
-                                }
-                            }
-                            else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "ExtFile" ) ) )
-                            {
-
-                            }
-                            else if ( aFieldKind ==  String( RTL_CONSTASCII_USTRINGPARAM( "Author" ) ) )
-                            {
-
-                            }
-                            else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "DateTime" ) ) )
-                            {
-                                nRetValue = 5 << 28 | 0x800000;
-                            }
-                            else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "Header" ) ) )
-                            {
-                                nRetValue = 6 << 28 | 0x800000;
-                            }
-                            else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "Footer" ) ) )
-                            {
-                                nRetValue = 7 << 28 | 0x800000;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-    return nRetValue;
-}
-
-PortionObj& PortionObj::operator=( const PortionObj& rPortionObj )
-{
-    if ( this != &rPortionObj )
-    {
-        ImplClear();
-        ImplConstruct( rPortionObj );
-    }
-    return *this;
-}
-
-//  -----------------------------------------------------------------------
-
-ParagraphObj::ParagraphObj( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
-                PPTExBulletProvider& rProv ) :
-    maMapModeSrc        ( MAP_100TH_MM ),
-    maMapModeDest       ( MAP_INCH, Point(), Fraction( 1, 576 ), Fraction( 1, 576 ) )
-{
-    mXPropSet = rXPropSet;
-
-    bExtendedParameters = FALSE;
-
-    nDepth = 0;
-    nBulletFlags = 0;
-    nParaFlags = 0;
-
-    ImplGetParagraphValues( rProv, FALSE );
-}
-
-    ParagraphObj::ParagraphObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & rXTextContent,
-                    ParaFlags aParaFlags, FontCollection& rFontCollection, PPTExBulletProvider& rProv ) :
-    maMapModeSrc        ( MAP_100TH_MM ),
-    maMapModeDest       ( MAP_INCH, Point(), Fraction( 1, 576 ), Fraction( 1, 576 ) ),
-    mbFirstParagraph    ( aParaFlags.bFirstParagraph ),
-    mbLastParagraph     ( aParaFlags.bLastParagraph )
-{
-    bExtendedParameters = FALSE;
-
-    nDepth = 0;
-    nBulletFlags = 0;
-    nParaFlags = 0;
-
-    mXPropSet = ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >
-            ( rXTextContent, ::com::sun::star::uno::UNO_QUERY );
-
-    mXPropState = ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertyState >
-            ( rXTextContent, ::com::sun::star::uno::UNO_QUERY );
-
-    if ( mXPropSet.is() && mXPropState.is() )
-    {
-        ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess >
-            aXTextPortionEA( rXTextContent, ::com::sun::star::uno::UNO_QUERY );
-        if ( aXTextPortionEA.is() )
-        {
-            ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration >
-                aXTextPortionE( aXTextPortionEA->createEnumeration() );
-            if ( aXTextPortionE.is() )
-            {
-                while ( aXTextPortionE->hasMoreElements() )
-                {
-                    ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > aXCursorText;
-                    ::com::sun::star::uno::Any aAny( aXTextPortionE->nextElement() );
-                    if ( aAny >>= aXCursorText )
-                    {
-                        PortionObj* pPortionObj = new PortionObj( aXCursorText, !aXTextPortionE->hasMoreElements(), rFontCollection );
-                        if ( pPortionObj->Count() )
-                            Insert( pPortionObj, LIST_APPEND );
-                        else
-                            delete pPortionObj;
-                    }
-                }
-            }
-        }
-        ImplGetParagraphValues( rProv, TRUE );//
-    }
-}
-
-ParagraphObj::ParagraphObj( const ParagraphObj& rObj )
-: List()
-, PropStateValue()
-, SOParagraph()
-{
-    ImplConstruct( rObj );
-}
-
-ParagraphObj::~ParagraphObj()
-{
-    ImplClear();
-}
-
-void ParagraphObj::Write( SvStream* pStrm )
-{
-    for ( void* pPtr = First(); pPtr; pPtr = Next() )
-        ((PortionObj*)pPtr)->Write( pStrm, mbLastParagraph );
-}
-
-void ParagraphObj::ImplClear()
-{
-    for ( void* pPtr = First(); pPtr; pPtr = Next() )
-        delete (PortionObj*)pPtr;
-}
-
-void ParagraphObj::CalculateGraphicBulletSize( sal_uInt16 nFontHeight )
-{
-    if ( ( (SvxExtNumType)nNumberingType == SVX_NUM_BITMAP ) && ( nBulletId != 0xffff ) )
-    {
-        // calculate the bulletrealsize for this grafik
-        if ( aBuGraSize.Width() && aBuGraSize.Height() )
-        {
-            double fCharHeight = nFontHeight;
-            double fLen = aBuGraSize.Height();
-            fCharHeight = fCharHeight * 0.2540;
-            double fQuo = fLen / fCharHeight;
-            nBulletRealSize = (sal_Int16)( fQuo + 0.5 );
-            if ( (sal_uInt16)nBulletRealSize > 400 )
-                nBulletRealSize = 400;
-        }
-    }
-}
-
-// from sw/source/filter/ww8/wrtw8num.cxx for default bullets to export to MS intact
-static void lcl_SubstituteBullet(String& rNumStr, rtl_TextEncoding& rChrSet, String& rFontName)
-{
-    sal_Unicode cChar = rNumStr.GetChar(0);
-    StarSymbolToMSMultiFont *pConvert = CreateStarSymbolToMSMultiFont();
-    String sFont = pConvert->ConvertChar(cChar);
-    delete pConvert;
-    if (sFont.Len())
-    {
-        rNumStr = static_cast< sal_Unicode >(cChar | 0xF000);
-        rFontName = sFont;
-        rChrSet = RTL_TEXTENCODING_SYMBOL;
-    }
-    else if ( (rNumStr.GetChar(0) < 0xE000 || rNumStr.GetChar(0) > 0xF8FF) )
-    {
-        /*
-        Ok we can't fit into a known windows unicode font, but
-        we are not in the private area, so we are a
-        standardized symbol, so turn off the symbol bit and
-        let words own font substitution kick in
-        */
-        rChrSet = RTL_TEXTENCODING_UNICODE;
-        rFontName = ::GetFontToken(rFontName, 0);
-    }
-    else
-    {
-        /*
-        Well we don't have an available substition, and we're
-        in our private area, so give up and show a standard
-        bullet symbol
-        */
-        rFontName.AssignAscii(RTL_CONSTASCII_STRINGPARAM("Wingdings"));
-        rNumStr = static_cast< sal_Unicode >(0x6C);
-     }
-}
-
-void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nNumberingDepth, sal_Bool bIsBullet, sal_Bool bGetPropStateValue )
-{
-    ::com::sun::star::uno::Any aAny;
-    if ( GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "ParaLeftMargin" ) ) ) )
-    {
-        sal_Int32 nVal;
-        if ( aAny >>= nVal )
-            nTextOfs = static_cast< sal_Int16 >( nVal / ( 2540.0 / 576 ) + 0.5 ) ;
-    }
-    if ( GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "ParaFirstLineIndent" ) ) ) )
-    {
-        if ( aAny >>= nBulletOfs )
-            nBulletOfs = static_cast< sal_Int32 >( nBulletOfs / ( 2540.0 / 576 ) + 0.5 );
-    }
-    if ( GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "NumberingIsNumber" ) ) ) )
-        aAny >>= bNumberingIsNumber;
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > aXIndexReplace;
-
-    if ( bIsBullet && ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "NumberingRules" ) ), bGetPropStateValue ) )
-    {
-        if ( ( mAny >>= aXIndexReplace ) && nNumberingDepth < aXIndexReplace->getCount() )
-        {
-            mAny <<= aXIndexReplace->getByIndex( nNumberingDepth );
-            ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>
-                aPropertySequence( *( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>*)mAny.getValue() );
-
-            const ::com::sun::star::beans::PropertyValue* pPropValue = aPropertySequence.getArray();
-
-            sal_Int32 nPropertyCount = aPropertySequence.getLength();
-            if ( nPropertyCount )
-            {
-                bExtendedParameters = TRUE;
-                nBulletRealSize = 100;
-                nMappedNumType = 0;
-
-                String aGraphicURL;
-                for ( sal_Int32 i = 0; i < nPropertyCount; i++ )
-                {
-                    const void* pValue = pPropValue[ i ].Value.getValue();
-                    if ( pValue )
-                    {
-                        ::rtl::OUString aPropName( pPropValue[ i ].Name );
-                        if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "NumberingType" ) ) )
-                            nNumberingType = *( (sal_Int16*)pValue );
-                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Adjust" ) ) )
-                            nHorzAdjust = *( (sal_Int16*)pValue );
-                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "BulletChar" ) ) )
-                        {
-                            String aString( *( (String*)pValue ) );
-                            if ( aString.Len() )
-                                cBulletId = aString.GetChar( 0 );
-                        }
-                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "BulletFont" ) ) )
-                        {
-                            aFontDesc = *( (::com::sun::star::awt::FontDescriptor*)pValue );
-
-                            // Our numbullet dialog has set the wrong textencoding for our "StarSymbol" font,
-                            // instead of a Unicode encoding the encoding RTL_TEXTENCODING_SYMBOL was used.
-                            // Because there might exist a lot of damaged documemts I added this two lines
-                            // which fixes the bullet problem for the export.
-                            if ( aFontDesc.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StarSymbol" ) ) )
-                                aFontDesc.CharSet = RTL_TEXTENCODING_MS_1252;
-
-                        }
-                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "GraphicURL" ) ) )
-                            aGraphicURL = ( *(::rtl::OUString*)pValue );
-                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "GraphicSize" ) ) )
-                        {
-                            if ( pPropValue[ i ].Value.getValueType() == ::getCppuType( (::com::sun::star::awt::Size*)0) )
-                            {
-                                // don't cast awt::Size to Size as on 64-bits they are not the same.
-                                ::com::sun::star::awt::Size aSize;
-                                pPropValue[ i ].Value >>= aSize;
-                                aBuGraSize.nA = aSize.Width;
-                                aBuGraSize.nB = aSize.Height;
-                            }
-                        }
-                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StartWith" ) ) )
-                            nStartWith = *( (sal_Int16*)pValue );
-                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "LeftMargin" ) ) )
-                            nTextOfs = nTextOfs + static_cast< sal_Int16 >( *( (sal_Int32*)pValue ) / ( 2540.0 / 576 ) );
-                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FirstLineOffset" ) ) )
-                            nBulletOfs += (sal_Int16)( *( (sal_Int32*)pValue ) / ( 2540.0 / 576 ) );
-                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "BulletColor" ) ) )
-                        {
-                            sal_uInt32 nSOColor = *( (sal_uInt32*)pValue );
-                            nBulletColor = nSOColor & 0xff00ff00;                       // green and hibyte
-                            nBulletColor |= (sal_uInt8)( nSOColor ) << 16;              // red
-                            nBulletColor |= (sal_uInt8)( nSOColor >> 16 ) | 0xfe000000; // blue
-                        }
-                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "BulletRelSize" ) ) )
-                        {
-                            nBulletRealSize = *( (sal_Int16*)pValue );
-                            nParaFlags |= 0x40;
-                            nBulletFlags |= 8;
-                        }
-                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Prefix" ) ) )
-                            sPrefix = ( *(::rtl::OUString*)pValue );
-                        else if  ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Suffix" ) ) )
-                            sSuffix = ( *(::rtl::OUString*)pValue );
-#ifdef DBG_UTIL
-                        else if ( ! (
-                                ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "SymbolTextDistance" ) ) )
-                            ||  ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Graphic" ) ) ) ) )
-                        {
-                            DBG_ERROR( "Unbekanntes Property" );
-                        }
-#endif
-                    }
-                }
-
-                if ( aGraphicURL.Len() )
-                {
-                    if ( aBuGraSize.Width() && aBuGraSize.Height() )
-                    {
-                        xub_StrLen nIndex = aGraphicURL.Search( (sal_Unicode)':', 0 );
-                        if ( nIndex != STRING_NOTFOUND )
-                        {
-                            nIndex++;
-                            if ( aGraphicURL.Len() > nIndex  )
-                            {
-                                ByteString aUniqueId( aGraphicURL, nIndex, aGraphicURL.Len() - nIndex, RTL_TEXTENCODING_UTF8 );
-                                if ( aUniqueId.Len() )
-                                {
-                                    nBulletId = rBuProv.GetId( aUniqueId, aBuGraSize );
-                                    if ( nBulletId != 0xffff )
-                                        bExtendedBulletsUsed = TRUE;
-                                }
-                            }
-                        }
-                    }
-                    else
-                    {
-                        nNumberingType = SVX_NUM_NUMBER_NONE;
-                    }
-                }
-
-                PortionObj* pPortion = (PortionObj*)First();
-                CalculateGraphicBulletSize( ( pPortion ) ? pPortion->mnCharHeight : 24 );
-
-                switch( (SvxExtNumType)nNumberingType )
-                {
-                    case SVX_NUM_NUMBER_NONE : nParaFlags |= 0xf; break;
-
-                    case SVX_NUM_CHAR_SPECIAL :                           // Bullet
-                    {
-                        if ( aFontDesc.Name.equalsIgnoreAsciiCaseAscii("starsymbol") ||
-                            aFontDesc.Name.equalsIgnoreAsciiCaseAscii("opensymbol") )
-                        {
-                            String sFontName = aFontDesc.Name;
-                            String sNumStr = cBulletId;
-                            rtl_TextEncoding eChrSet = aFontDesc.CharSet;
-                            lcl_SubstituteBullet(sNumStr,eChrSet,sFontName);
-                            aFontDesc.Name = sFontName;
-                            cBulletId = sNumStr.GetChar( 0 );
-                            aFontDesc.CharSet = eChrSet;
-                         }
-
-                        if ( aFontDesc.Name.getLength() )
-                        {
-/*
-                            if ( aFontDesc.CharSet != ::com::sun::star::awt::CharSet::SYMBOL )
-                            {
-                                switch ( cBulletId )
-                                {
-                                    // Currency
-                                    case 128:   cBulletId = 0x20AC; break;
-                                    // Punctuation and other
-                                    case 130:   cBulletId = 0x201A; break;// SINGLE LOW-9 QUOTATION MARK
-                                    case 131:   cBulletId = 0x0192; break;// LATIN SMALL LETTER F WITH HOOK
-                                    case 132:   cBulletId = 0x201E; break;// DOUBLE LOW-9 QUOTATION MARK
-                                                                          // LOW DOUBLE PRIME QUOTATION MARK
-                                    case 133:   cBulletId = 0x2026; break;// HORIZONTAL ELLIPSES
-                                    case 134:   cBulletId = 0x2020; break;// DAGGER
-                                    case 135:   cBulletId = 0x2021; break;// DOUBLE DAGGER
-                                    case 136:   cBulletId = 0x02C6; break;// MODIFIER LETTER CIRCUMFLEX ACCENT
-                                    case 137:   cBulletId = 0x2030; break;// PER MILLE SIGN
-                                    case 138:   cBulletId = 0x0160; break;// LATIN CAPITAL LETTER S WITH CARON
-                                    case 139:   cBulletId = 0x2039; break;// SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-                                    case 140:   cBulletId = 0x0152; break;// LATIN CAPITAL LIGATURE OE
-                                    case 142:   cBulletId = 0x017D; break;// LATIN CAPITAL LETTER Z WITH CARON
-                                    case 145:   cBulletId = 0x2018; break;// LEFT SINGLE QUOTATION MARK
-                                                                          // MODIFIER LETTER TURNED COMMA
-                                    case 146:   cBulletId = 0x2019; break;// RIGHT SINGLE QUOTATION MARK
-                                                                          // MODIFIER LETTER APOSTROPHE
-                                    case 147:   cBulletId = 0x201C; break;// LEFT DOUBLE QUOTATION MARK
-                                                                          // REVERSED DOUBLE PRIME QUOTATION MARK
-                                    case 148:   cBulletId = 0x201D; break;// RIGHT DOUBLE QUOTATION MARK
-                                                                          // REVERSED DOUBLE PRIME QUOTATION MARK
-                                    case 149:   cBulletId = 0x2022; break;// BULLET
-                                    case 150:   cBulletId = 0x2013; break;// EN DASH
-                                    case 151:   cBulletId = 0x2014; break;// EM DASH
-                                    case 152:   cBulletId = 0x02DC; break;// SMALL TILDE
-                                    case 153:   cBulletId = 0x2122; break;// TRADE MARK SIGN
-                                    case 154:   cBulletId = 0x0161; break;// LATIN SMALL LETTER S WITH CARON
-                                    case 155:   cBulletId = 0x203A; break;// SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-                                    case 156:   cBulletId = 0x0153; break;// LATIN SMALL LIGATURE OE
-                                    case 158:   cBulletId = 0x017E; break;// LATIN SMALL LETTER Z WITH CARON
-                                    case 159:   cBulletId = 0x0178; break;// LATIN CAPITAL LETTER Y WITH DIAERESIS
-//                                  case 222:   cBulletId = 0x00B6; break;// PILCROW SIGN / PARAGRAPH SIGN
-                                }
-                            }
-*/
-                            nParaFlags |= 0x90; // wir geben den Font und den Charset vor
-                        }
-                    }
-                    case SVX_NUM_CHARS_UPPER_LETTER :       // zaehlt von a-z, aa - az, ba - bz, ...
-                    case SVX_NUM_CHARS_LOWER_LETTER :
-                    case SVX_NUM_ROMAN_UPPER :
-                    case SVX_NUM_ROMAN_LOWER :
-                    case SVX_NUM_ARABIC :
-                    case SVX_NUM_PAGEDESC :                 // Numerierung aus der Seitenvorlage
-                    case SVX_NUM_BITMAP :
-                    case SVX_NUM_CHARS_UPPER_LETTER_N :     // zaehlt von  a-z, aa-zz, aaa-zzz
-                    case SVX_NUM_CHARS_LOWER_LETTER_N :
-                    {
-                        if ( nNumberingType != SVX_NUM_CHAR_SPECIAL )
-                        {
-                            bExtendedBulletsUsed = TRUE;
-                            if ( nNumberingDepth & 1 )
-                                cBulletId = 0x2013;         // defaulting bullet characters for ppt97
-                            else if ( nNumberingDepth == 4 )
-                                cBulletId = 0xbb;
-                            else
-                                cBulletId = 0x2022;
-
-                            switch( (SvxExtNumType)nNumberingType )
-                            {
-                                case SVX_NUM_CHARS_UPPER_LETTER :
-                                case SVX_NUM_CHARS_UPPER_LETTER_N :
-                                {
-                                    if ( sSuffix == String( RTL_CONSTASCII_USTRINGPARAM( ")" ) ) )
-                                    {
-                                        if ( sPrefix == String( RTL_CONSTASCII_USTRINGPARAM( "(" ) ) )
-                                            nMappedNumType = 0xa0001;   // (A)
-                                        else
-                                            nMappedNumType = 0xb0001;   // A)
-                                    }
-                                    else
-                                        nMappedNumType = 0x10001;       // A.
-                                }
-                                break;
-                                case SVX_NUM_CHARS_LOWER_LETTER :
-                                case SVX_NUM_CHARS_LOWER_LETTER_N :
-                                {
-                                    if ( sSuffix == String( RTL_CONSTASCII_USTRINGPARAM( ")" ) ) )
-                                    {
-                                        if ( sPrefix == String( RTL_CONSTASCII_USTRINGPARAM( "(" ) ) )
-                                            nMappedNumType = 0x80001;   // (a)
-                                        else
-                                            nMappedNumType = 0x90001;   // a)
-                                    }
-                                    else
-                                        nMappedNumType = 0x00001;       // a.
-                                }
-                                break;
-                                case SVX_NUM_ROMAN_UPPER :
-                                {
-                                    if ( sSuffix == String( RTL_CONSTASCII_USTRINGPARAM( ")" ) ) )
-                                    {
-                                        if ( sPrefix == String( RTL_CONSTASCII_USTRINGPARAM( "(" ) ) )
-                                            nMappedNumType = 0xe0001;   // (I)
-                                        else
-                                            nMappedNumType = 0xf0001;   // I)
-                                    }
-                                    else
-                                        nMappedNumType = 0x70001;       // I.
-                                }
-                                break;
-                                case SVX_NUM_ROMAN_LOWER :
-                                {
-                                    if ( sSuffix == String( RTL_CONSTASCII_USTRINGPARAM( ")" ) ) )
-                                    {
-                                        if ( sPrefix == String( RTL_CONSTASCII_USTRINGPARAM( "(" ) ) )
-                                            nMappedNumType = 0x40001;   // (i)
-                                        else
-                                            nMappedNumType = 0x50001;   // i)
-                                    }
-                                    else
-                                        nMappedNumType = 0x60001;       // i.
-                                }
-                                break;
-                                case SVX_NUM_ARABIC :
-                                {
-                                    if ( sSuffix == String( RTL_CONSTASCII_USTRINGPARAM( ")" ) ) )
-                                    {
-                                        if ( sPrefix == String( RTL_CONSTASCII_USTRINGPARAM( "(" ) ) )
-                                            nMappedNumType = 0xc0001;   // (1)
-                                        else
-                                            nMappedNumType = 0x20001;   // 1)
-                                    }
-                                    else
-                                    {
-                                        if ( ! ( sSuffix.Len() + sPrefix.Len() ) )
-                                            nMappedNumType = 0xd0001;   // 1
-                                        else
-                                            nMappedNumType = 0x30001;   // 1.
-                                    }
-                                }
-                                break;
-                                default:
-                                    break;
-                            }
-                        }
-                        nParaFlags |= 0x2f;
-                        nBulletFlags |= 6;
-                        if ( mbIsBullet && bNumberingIsNumber )
-                            nBulletFlags |= 1;
-                    }
-                }
-            }
-        }
-    }
-    nBulletOfs = nTextOfs + nBulletOfs;
-    if ( nBulletOfs < 0 )
-        nBulletOfs = 0;
-}
-
-void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Bool bGetPropStateValue )
-{
-    static String sNumberingLevel   ( RTL_CONSTASCII_USTRINGPARAM( "NumberingLevel" ) );
-
-    ::com::sun::star::uno::Any aAny;
-    if ( GetPropertyValue( aAny, mXPropSet, sNumberingLevel, sal_True ) )
-    {
-        if ( bGetPropStateValue )
-            meBullet = GetPropertyState( mXPropSet, sNumberingLevel );
-        nDepth = *( (sal_Int16*)aAny.getValue() );
-
-        if ( nDepth < 0 )
-        {
-            mbIsBullet = sal_False;
-            nDepth = 0;
-        }
-        else
-        {
-            if ( nDepth > 4 )
-                nDepth = 4;
-            mbIsBullet = sal_True;
-        }
-    }
-    else
-    {
-        nDepth = 0;
-        mbIsBullet = sal_False;
-    }
-    ImplGetNumberingLevel( rBuProv, nDepth, mbIsBullet, bGetPropStateValue );
-
-    if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "ParaTabStops" ) ), bGetPropStateValue ) )
-        maTabStop = *( ::com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop>*)mAny.getValue();
-    sal_Int16 eTextAdjust( ::com::sun::star::style::ParagraphAdjust_LEFT );
-    if ( GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "ParaAdjust" ) ), bGetPropStateValue ) )
-        aAny >>= eTextAdjust;
-    switch ( (::com::sun::star::style::ParagraphAdjust)eTextAdjust )
-    {
-        case ::com::sun::star::style::ParagraphAdjust_CENTER :
-            mnTextAdjust = 1;
-        break;
-        case ::com::sun::star::style::ParagraphAdjust_RIGHT :
-            mnTextAdjust = 2;
-        break;
-        case ::com::sun::star::style::ParagraphAdjust_BLOCK :
-            mnTextAdjust = 3;
-        break;
-        default :
-        case ::com::sun::star::style::ParagraphAdjust_LEFT :
-            mnTextAdjust = 0;
-        break;
-    }
-    meTextAdjust = ePropState;
-
-    if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "ParaLineSpacing" ) ), bGetPropStateValue ) )
-    {
-        ::com::sun::star::style::LineSpacing aLineSpacing
-            = *( (::com::sun::star::style::LineSpacing*)mAny.getValue() );
-        switch ( aLineSpacing.Mode )
-        {
-            case ::com::sun::star::style::LineSpacingMode::MINIMUM :
-            case ::com::sun::star::style::LineSpacingMode::LEADING :
-            case ::com::sun::star::style::LineSpacingMode::FIX :
-                mnLineSpacing = (sal_Int16)(-( aLineSpacing.Height ) );
-            break;
-
-            case ::com::sun::star::style::LineSpacingMode::PROP :
-            default:
-                mnLineSpacing = (sal_Int16)( aLineSpacing.Height );
-            break;
-        }
-    }
-    meLineSpacing = ePropState;
-
-    if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "ParaBottomMargin" ) ), bGetPropStateValue ) )
-    {
-        double fSpacing = *( (sal_uInt32*)mAny.getValue() ) + ( 2540.0 / 576.0 ) - 1;
-        mnLineSpacingBottom = (sal_Int16)(-( fSpacing * 576.0 / 2540.0 ) );
-    }
-    meLineSpacingBottom = ePropState;
-
-    if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "ParaTopMargin" ) ), bGetPropStateValue ) )
-    {
-        double fSpacing = *( (sal_uInt32*)mAny.getValue() ) + ( 2540.0 / 576.0 ) - 1;
-        mnLineSpacingTop = (sal_Int16)(-( fSpacing * 576.0 / 2540.0 ) );
-    }
-    meLineSpacingTop = ePropState;
-
-    if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "ParaIsForbiddenRules" ) ), bGetPropStateValue ) )
-        mAny >>= mbForbiddenRules;
-    meForbiddenRules = ePropState;
-
-    if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "ParaIsHangingPunctuation" ) ), bGetPropStateValue ) )
-        mAny >>= mbParagraphPunctation;
-    meParagraphPunctation = ePropState;
-
-    mnBiDi = 0;
-    if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "WritingMode" ) ), bGetPropStateValue ) )
-    {
-        sal_Int16 nWritingMode;
-        mAny >>= nWritingMode;
-
-        SvxFrameDirection eWritingMode( (SvxFrameDirection)nWritingMode );
-        if ( ( eWritingMode == FRMDIR_HORI_RIGHT_TOP )
-            || ( eWritingMode == FRMDIR_VERT_TOP_RIGHT ) )
-        {
-            mnBiDi = 1;
-        }
-    }
-    meBiDi = ePropState;
-}
-
-void ParagraphObj::ImplConstruct( const ParagraphObj& rParagraphObj )
-{
-    mnTextSize = rParagraphObj.mnTextSize;
-    mnTextAdjust = rParagraphObj.mnTextAdjust;
-    mnLineSpacing = rParagraphObj.mnLineSpacing;
-    mnLineSpacingTop = rParagraphObj.mnLineSpacingTop;
-    mnLineSpacingBottom = rParagraphObj.mnLineSpacingBottom;
-    mbFirstParagraph = rParagraphObj.mbFirstParagraph;
-    mbLastParagraph = rParagraphObj.mbLastParagraph;
-    mbParagraphPunctation = rParagraphObj.mbParagraphPunctation;
-    mbForbiddenRules = rParagraphObj.mbForbiddenRules;
-    mnBiDi = rParagraphObj.mnBiDi;
-
-    ParagraphObj& rOther = const_cast<ParagraphObj&>(rParagraphObj);
-    for ( const void* pPtr = rOther.First(); pPtr; pPtr = rOther.Next() )
-        Insert( new PortionObj( *(const PortionObj*)pPtr ), LIST_APPEND );
-
-    maTabStop = rParagraphObj.maTabStop;
-    bExtendedParameters = rParagraphObj.bExtendedParameters;
-    nParaFlags = rParagraphObj.nParaFlags;
-    nBulletFlags = rParagraphObj.nBulletFlags;
-    sPrefix = rParagraphObj.sPrefix;
-    sSuffix = rParagraphObj.sSuffix;
-    sGraphicUrl = rParagraphObj.sGraphicUrl;            // String auf eine Graphic
-    aBuGraSize = rParagraphObj.aBuGraSize;
-    nNumberingType = rParagraphObj.nNumberingType;      // in wirlichkeit ist dies ein SvxEnum
-    nHorzAdjust = rParagraphObj.nHorzAdjust;
-    nBulletColor = rParagraphObj.nBulletColor;
-    nBulletOfs = rParagraphObj.nBulletOfs;
-    nStartWith = rParagraphObj.nStartWith;              // Start der nummerierung
-    nTextOfs = rParagraphObj.nTextOfs;
-    nBulletRealSize = rParagraphObj.nBulletRealSize;    // GroessenVerhaeltnis in Proz
-    nDepth = rParagraphObj.nDepth;                      // aktuelle tiefe
-    cBulletId = rParagraphObj.cBulletId;                // wenn Numbering Type == CharSpecial
-    aFontDesc = rParagraphObj.aFontDesc;
-
-    bExtendedBulletsUsed = rParagraphObj.bExtendedBulletsUsed;
-    nBulletId = rParagraphObj.nBulletId;
-}
-
-sal_uInt32 ParagraphObj::ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition )
-{
-    mnTextSize = 0;
-    for ( void* pPtr = First(); pPtr; pPtr = Next() )
-        mnTextSize += ((PortionObj*)pPtr)->ImplCalculateTextPositions( nCurrentTextPosition + mnTextSize );
-    return mnTextSize;
-}
-
-ParagraphObj& ParagraphObj::operator=( const ParagraphObj& rParagraphObj )
-{
-    if ( this != &rParagraphObj )
-    {
-        ImplClear();
-        ImplConstruct( rParagraphObj );
-    }
-    return *this;
-}
-
-//  -----------------------------------------------------------------------
-
-ImplTextObj::ImplTextObj( int nInstance )
-{
-    mnRefCount = 1;
-    mnTextSize = 0;
-    mnInstance = nInstance;
-    mpList = new List;
-    mbHasExtendedBullets = FALSE;
-    mbFixedCellHeightUsed = FALSE;
-}
-
-ImplTextObj::~ImplTextObj()
-{
-    for ( ParagraphObj* pPtr = (ParagraphObj*)mpList->First(); pPtr; pPtr = (ParagraphObj*)mpList->Next() )
-        delete pPtr;
-    delete mpList;
-}
-
-TextObj::TextObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XSimpleText > & rXTextRef,
-            int nInstance, FontCollection& rFontCollection, PPTExBulletProvider& rProv )
-{
-    mpImplTextObj = new ImplTextObj( nInstance );
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess >
-        aXTextParagraphEA( rXTextRef, ::com::sun::star::uno::UNO_QUERY );
-
-    if ( aXTextParagraphEA.is()  )
-    {
-        ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration >
-            aXTextParagraphE( aXTextParagraphEA->createEnumeration() );
-        if ( aXTextParagraphE.is() )
-        {
-            ParaFlags aParaFlags;
-            while ( aXTextParagraphE->hasMoreElements() )
-            {
-                ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > aXParagraph;
-                ::com::sun::star::uno::Any aAny( aXTextParagraphE->nextElement() );
-                if ( aAny >>= aXParagraph )
-                {
-                    if ( !aXTextParagraphE->hasMoreElements() )
-                        aParaFlags.bLastParagraph = TRUE;
-                    ParagraphObj* pPara = new ParagraphObj( aXParagraph, aParaFlags, rFontCollection, rProv );
-                    mpImplTextObj->mbHasExtendedBullets |= pPara->bExtendedBulletsUsed;
-                    mpImplTextObj->mpList->Insert( pPara, LIST_APPEND );
-                    aParaFlags.bFirstParagraph = FALSE;
-                }
-            }
-        }
-    }
-    ImplCalculateTextPositions();
-}
-
-TextObj::TextObj( const TextObj& rTextObj )
-{
-    mpImplTextObj = rTextObj.mpImplTextObj;
-    mpImplTextObj->mnRefCount++;
-}
-
-TextObj::~TextObj()
-{
-    if ( ! ( --mpImplTextObj->mnRefCount ) )
-        delete mpImplTextObj;
-}
-
-void TextObj::Write( SvStream* pStrm )
-{
-    sal_uInt32 nSize, nPos = pStrm->Tell();
-    *pStrm << (sal_uInt32)( EPP_TextCharsAtom << 16 ) << (sal_uInt32)0;
-    for ( void* pPtr = First(); pPtr; pPtr = Next() )
-        ((ParagraphObj*)pPtr)->Write( pStrm );
-    nSize = pStrm->Tell() - nPos;
-    pStrm->SeekRel( - ( (sal_Int32)nSize - 4 ) );
-    *pStrm << (sal_uInt32)( nSize - 8 );
-    pStrm->SeekRel( nSize - 8 );
-}
-
-void TextObj::ImplCalculateTextPositions()
-{
-    mpImplTextObj->mnTextSize = 0;
-    for ( void* pPtr = First(); pPtr; pPtr = Next() )
-        mpImplTextObj->mnTextSize += ((ParagraphObj*)pPtr)->ImplCalculateTextPositions( mpImplTextObj->mnTextSize );
-}
-
-TextObj& TextObj::operator=( TextObj& rTextObj )
-{
-    if ( this != &rTextObj )
-    {
-        if ( ! ( --mpImplTextObj->mnRefCount ) )
-            delete mpImplTextObj;
-        mpImplTextObj = rTextObj.mpImplTextObj;
-        mpImplTextObj->mnRefCount++;
-    }
-    return *this;
-}
-
-void TextObj::WriteTextSpecInfo( SvStream* pStrm )
-{
-    sal_uInt32 nCharactersLeft( Count() );
-    if ( nCharactersLeft >= 1 )
-    {
-        EscherExAtom aAnimationInfoAtom( *pStrm, EPP_TextSpecInfoAtom, 0, 0 );
-        for ( ParagraphObj* pPtr = static_cast < ParagraphObj * >( First() ); nCharactersLeft && pPtr; pPtr = static_cast< ParagraphObj* >( Next() ) )
-        {
-            for ( PortionObj* pPortion = static_cast< PortionObj* >( pPtr->First() ); nCharactersLeft && pPortion; pPortion = static_cast< PortionObj* >( pPtr->Next() ) )
-            {
-                sal_Int32 nPortionSize = pPortion->mnTextSize >= nCharactersLeft ? nCharactersLeft : pPortion->mnTextSize;
-                sal_Int32 nFlags = 7;
-                nCharactersLeft -= nPortionSize;
-                *pStrm  << static_cast< sal_uInt32 >( nPortionSize )
-                        << nFlags
-                        << static_cast< sal_Int16 >( 1 )    // spellinfo -> needs rechecking
-                        << static_cast< sal_Int16 >( MsLangId::convertLocaleToLanguageWithFallback( pPortion->meCharLocale ) )
-                        << static_cast< sal_Int16 >( 0 );   // alt language
-            }
-        }
-        if ( nCharactersLeft )
-            *pStrm << nCharactersLeft << static_cast< sal_Int32 >( 1 ) << static_cast< sal_Int16 >( 1 );
-
-    }
-}
-
-//  -----------------------------------------------------------------------
-
 void PPTWriter::ImplAdjustFirstLineLineSpacing( TextObj& rTextObj, EscherPropertyContainer& rPropOpt )
 {
     if ( !mbFontIndependentLineSpacing )
@@ -3096,7 +1178,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
     if ( !mbEmptyPresObj )
     {
         ParagraphObj* pPara;
-        TextObj aTextObj( mXText, nTextInstance, maFontCollection, (PPTExBulletProvider&)*this );
+        TextObjBinary aTextObj( mXText, nTextInstance, maFontCollection, (PPTExBulletProvider&)*this );
 
         // leaving out EPP_TextCharsAtom w/o text - still write out
         // attribute info though
@@ -3147,9 +1229,18 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
                             String aPageUrl;
                             String aEmpty;
                             String aFile( pFieldEntry->aFieldUrl );
+                            String aTarget( pFieldEntry->aFieldUrl );
                             INetURLObject aUrl( pFieldEntry->aFieldUrl );
                             if ( INET_PROT_FILE == aUrl.GetProtocol() )
                                 aFile = aUrl.PathToFileName();
+                            else if ( INET_PROT_SMB == aUrl.GetProtocol() )
+                            {
+                                // #n382718# (and #n261623#) Convert smb notation to '\\'
+                                aFile = aUrl.GetMainURL( INetURLObject::NO_DECODE );
+                                aFile = String( aFile.GetBuffer() + 4 ); // skip the 'smb:' part
+                                aFile.SearchAndReplaceAll( '/', '\\' );
+                                aTarget = aFile;
+                            }
                             else if ( pFieldEntry->aFieldUrl.GetChar( 0 ) == '#' )
                             {
                                 String aPage( INetURLObject::decode( pFieldEntry->aFieldUrl, '%', INetURLObject::DECODE_WITH_CHARSET ) );
@@ -3170,7 +1261,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
                             if ( aPageUrl.Len() )
                                 nHyperId = ImplInsertBookmarkURL( aPageUrl, 1 | ( nPageIndex << 8 ) | ( 1 << 31 ), pFieldEntry->aRepresentation, aEmpty, aEmpty, aPageUrl );
                             else
-                                nHyperId = ImplInsertBookmarkURL( pFieldEntry->aFieldUrl, 2 | ( nHyperId << 8 ), aFile, pFieldEntry->aFieldUrl, aEmpty, aEmpty );
+                                nHyperId = ImplInsertBookmarkURL( pFieldEntry->aFieldUrl, 2 | ( nHyperId << 8 ), aFile, aTarget, aEmpty, aEmpty );
 
                             rOut << (sal_uInt32)( ( EPP_InteractiveInfo << 16 ) | 0xf ) << (sal_uInt32)24
                                  << (sal_uInt32)( EPP_InteractiveInfoAtom << 16 ) << (sal_uInt32)16
@@ -3248,7 +1339,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
             }
             nParaFlags >>= 16;
 
-            sal_uInt32  nDefaultTabSize = ImplMapSize( ::com::sun::star::awt::Size( 2011, 1 ) ).Width;
+            sal_uInt32  nDefaultTabSize = MapSize( ::com::sun::star::awt::Size( 2011, 1 ) ).Width;
             sal_uInt32  nDefaultTabs = abs( maRect.GetWidth() ) / nDefaultTabSize;
             if ( nTabs )
                 nDefaultTabs -= (sal_Int32)( ( ( pTabStop[ nTabs - 1 ].Position / 4.40972 ) + nTextOfs ) / nDefaultTabSize );
@@ -4206,7 +2297,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
         nGroups = GetGroupsClosed();
         for ( sal_uInt32 i = 0; i < nGroups; i++, mpPptEscherEx->LeaveGroup() ) ;
 
-        if ( ImplGetShapeByIndex( GetCurrentGroupIndex(), TRUE ) )
+        if ( GetShapeByIndex( GetCurrentGroupIndex(), TRUE ) )
         {
             sal_Bool bIsSound;
             sal_Bool bMediaClickAction = sal_False;
@@ -4276,8 +2367,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                     if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "BoundRect" ) ) ) )
                     {
                         ::com::sun::star::awt::Rectangle aRect( *(::com::sun::star::awt::Rectangle*)mAny.getValue() );
-                        maPosition = ImplMapPoint( ::com::sun::star::awt::Point( aRect.X, aRect.Y ) );
-                        maSize = ImplMapSize( ::com::sun::star::awt::Size( aRect.Width, aRect.Height ) );
+                        maPosition = MapPoint( ::com::sun::star::awt::Point( aRect.X, aRect.Y ) );
+                        maSize = MapSize( ::com::sun::star::awt::Size( aRect.Width, aRect.Height ) );
                         maRect = Rectangle( Point( maPosition.X, maPosition.Y ), Size( maSize.Width, maSize.Height ) );
                     }
                     mType = "drawing.dontknow";
@@ -4304,8 +2395,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                         if ( pObj )
                         {
                             Rectangle aBound = pObj->GetCurrentBoundRect();
-                            maPosition = ImplMapPoint( ::com::sun::star::awt::Point( aBound.Left(), aBound.Top() ) );
-                            maSize = ImplMapSize( ::com::sun::star::awt::Size ( aBound.GetWidth(), aBound.GetHeight() ) );
+                            maPosition = MapPoint( ::com::sun::star::awt::Point( aBound.Left(), aBound.Top() ) );
+                            maSize = MapSize( ::com::sun::star::awt::Size ( aBound.GetWidth(), aBound.GetHeight() ) );
                             maRect = Rectangle( Point( maPosition.X, maPosition.Y ), Size( maSize.Width, maSize.Height ) );
                             mnAngle = 0;
                         }
@@ -4330,7 +2421,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                 if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CornerRadius" ) ) ) )
                 {
                     mAny >>= nRadius;
-                    nRadius = ImplMapSize( ::com::sun::star::awt::Size( nRadius, 0 ) ).Width;
+                    nRadius = MapSize( ::com::sun::star::awt::Size( nRadius, 0 ) ).Width;
                 }
                 if ( nRadius )
                 {
@@ -4449,7 +2540,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                         }
                         break;
                     }
-                    maRect = ImplMapRectangle( aNewRect );
+                    maRect = MapRectangle( aNewRect );
                     maPosition = ::com::sun::star::awt::Point( maRect.Left(), maRect.Top() );
                     maSize = ::com::sun::star::awt::Size( maRect.GetWidth(), maRect.GetHeight() );
                     if ( bNeedText && ImplGetText() )
@@ -4506,7 +2597,6 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                             << (sal_uInt32)4    // index to the persist table
                             << (sal_uInt32)0x0012de00;
 
-
                 ::com::sun::star::awt::Size     aSize;
                 String          aControlName;
                 SvStorageRef    xTemp( new SvStorage( new SvMemoryStream(), TRUE ) );
@@ -4593,7 +2683,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                 if ( aPropOpt.CreateConnectorProperties( mXShape, aSolverContainer, aNewRect, nSpType, nSpFlags ) == sal_False )
                     continue;
 
-                maRect = ImplMapRectangle( aNewRect );
+                maRect = MapRectangle( aNewRect );
                 maPosition = ::com::sun::star::awt::Point( maRect.Left(), maRect.Top() );
                 maSize = ::com::sun::star::awt::Size( maRect.GetWidth(), maRect.GetHeight() );
 
@@ -4608,7 +2698,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
             {
                 ::com::sun::star::awt::Rectangle aNewRect;
                 aPropOpt.CreatePolygonProperties( mXPropSet, ESCHER_CREATEPOLYGON_LINE, sal_False, aNewRect, NULL );
-                maRect = ImplMapRectangle( aNewRect );
+                maRect = MapRectangle( aNewRect );
                 maPosition = ::com::sun::star::awt::Point( maRect.Left(), maRect.Top() );
                 maSize = ::com::sun::star::awt::Size( maRect.GetWidth(), maRect.GetHeight() );
                 if ( ImplGetText() )
@@ -4643,7 +2733,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                 ImplCreateShape( ESCHER_ShpInst_NotPrimitive, 0xa00, aSolverContainer );            // Flags: Connector | HasSpt
                 ::com::sun::star::awt::Rectangle aNewRect;
                 aPropOpt.CreatePolygonProperties( mXPropSet, ESCHER_CREATEPOLYGON_POLYPOLYGON, sal_False, aNewRect, NULL );
-                maRect = ImplMapRectangle( aNewRect );
+                maRect = MapRectangle( aNewRect );
                 maPosition = ::com::sun::star::awt::Point( maRect.Left(), maRect.Top() );
                 maSize = ::com::sun::star::awt::Size( maRect.GetWidth(), maRect.GetHeight() );
                 aPropOpt.CreateFillProperties( mXPropSet, sal_True );
@@ -4662,7 +2752,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                 ImplCreateShape( ESCHER_ShpInst_NotPrimitive, 0xa00, aSolverContainer );            // Flags: Connector | HasSpt
                 ::com::sun::star::awt::Rectangle aNewRect;
                 aPropOpt.CreatePolygonProperties( mXPropSet, ESCHER_CREATEPOLYGON_POLYLINE, sal_False, aNewRect, NULL );
-                maRect = ImplMapRectangle( aNewRect );
+                maRect = MapRectangle( aNewRect );
                 maPosition = ::com::sun::star::awt::Point( maRect.Left(), maRect.Top() );
                 maSize = ::com::sun::star::awt::Size( maRect.GetWidth(), maRect.GetHeight() );
                 aPropOpt.CreateLineProperties( mXPropSet, sal_False );
@@ -4681,7 +2771,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                 ImplCreateShape( ESCHER_ShpInst_NotPrimitive, 0xa00, aSolverContainer );            // Flags: Connector | HasSpt
                 ::com::sun::star::awt::Rectangle aNewRect;
                 aPropOpt.CreatePolygonProperties( mXPropSet, ESCHER_CREATEPOLYGON_POLYLINE, sal_True, aNewRect, NULL );
-                maRect = ImplMapRectangle( aNewRect );
+                maRect = MapRectangle( aNewRect );
                 maPosition = ::com::sun::star::awt::Point( maRect.Left(), maRect.Top() );
                 maSize = ::com::sun::star::awt::Size( maRect.GetWidth(), maRect.GetHeight() );
                 aPropOpt.CreateLineProperties( mXPropSet, sal_False );
@@ -4700,7 +2790,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                 ImplCreateShape( ESCHER_ShpInst_NotPrimitive, 0xa00, aSolverContainer );            // Flags: Connector | HasSpt
                 ::com::sun::star::awt::Rectangle aNewRect;
                 aPropOpt.CreatePolygonProperties( mXPropSet, ESCHER_CREATEPOLYGON_POLYPOLYGON, sal_True, aNewRect, NULL );
-                maRect = ImplMapRectangle( aNewRect );
+                maRect = MapRectangle( aNewRect );
                 maPosition = ::com::sun::star::awt::Point( maRect.Left(), maRect.Top() );
                 maSize = ::com::sun::star::awt::Size( maRect.GetWidth(), maRect.GetHeight() );
                 aPropOpt.CreateFillProperties( mXPropSet, sal_True );
@@ -4782,7 +2872,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                         bIsTitlePossible = FALSE;
 
                         ImplGetText();
-                        TextObj aTextObj( mXText, EPP_TEXTTYPE_Title, maFontCollection, (PPTExBulletProvider&)*this );
+                        TextObjBinary aTextObj( mXText, EPP_TEXTTYPE_Title, maFontCollection, (PPTExBulletProvider&)*this );
                         if ( ePageType == MASTER )
                         {
                             if ( mnTextSize )
@@ -4878,7 +2968,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                        )
                     {
                         ImplGetText();
-                        TextObj aTextObj( mXText, EPP_TEXTTYPE_Body, maFontCollection, (PPTExBulletProvider&)*this );
+                        TextObjBinary aTextObj( mXText, EPP_TEXTTYPE_Body, maFontCollection, (PPTExBulletProvider&)*this );
                         if ( ePageType == MASTER )
                         {
                             nPrevTextStyle = EPP_TEXTSTYLE_TITLE;
@@ -5148,7 +3238,6 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                                     << (sal_uInt16)0
                                     << (sal_uInt16)0x435;
 
-
                         sal_uInt16 i, nStringLen = (sal_uInt16)aMediaURL.getLength();
                         *mpExEmbed << (sal_uInt32)( EPP_CString << 16 ) << (sal_uInt32)( nStringLen * 2 );
                         for ( i = 0; i < nStringLen; i++ )
@@ -5452,38 +3541,6 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
 
 //  -----------------------------------------------------------------------
 
-::com::sun::star::awt::Point PPTWriter::ImplMapPoint( const ::com::sun::star::awt::Point& rPoint )
-{
-    Point aRet( OutputDevice::LogicToLogic( Point( rPoint.X, rPoint.Y ), maMapModeSrc, maMapModeDest ) );
-    return ::com::sun::star::awt::Point( aRet.X(), aRet.Y() );
-}
-
-//  -----------------------------------------------------------------------
-
-::com::sun::star::awt::Size PPTWriter::ImplMapSize( const ::com::sun::star::awt::Size& rSize )
-{
-    Size aRetSize( OutputDevice::LogicToLogic( Size( rSize.Width, rSize.Height ), maMapModeSrc, maMapModeDest ) );
-
-    if ( !aRetSize.Width() )
-        aRetSize.Width()++;
-    if ( !aRetSize.Height() )
-        aRetSize.Height()++;
-    return ::com::sun::star::awt::Size( aRetSize.Width(), aRetSize.Height() );
-}
-
-//  -----------------------------------------------------------------------
-
-Rectangle PPTWriter::ImplMapRectangle( const ::com::sun::star::awt::Rectangle& rRect )
-{
-    ::com::sun::star::awt::Point    aPoint( rRect.X, rRect.Y );
-    ::com::sun::star::awt::Size     aSize( rRect.Width, rRect.Height );
-    ::com::sun::star::awt::Point    aP( ImplMapPoint( aPoint ) );
-    ::com::sun::star::awt::Size     aS( ImplMapSize( aSize ) );
-    return Rectangle( Point( aP.X, aP.Y ), Size( aS.Width, aS.Height ) );
-}
-
-//  -----------------------------------------------------------------------
-
 struct CellBorder
 {
     sal_Int32                       mnPos;      // specifies the distance to the top/left position of the table
@@ -5570,14 +3627,14 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
             std::vector< std::pair< sal_Int32, sal_Int32 > > aColumns;
             std::vector< std::pair< sal_Int32, sal_Int32 > > aRows;
 
-            awt::Point aPosition( ImplMapPoint( rXShape->getPosition() ) );
+            awt::Point aPosition( MapPoint( rXShape->getPosition() ) );
             sal_uInt32 nPosition = aPosition.X;
             for ( sal_Int32 x = 0; x < nColumnCount; x++ )
             {
                 uno::Reference< beans::XPropertySet > xPropSet( xColumns->getByIndex( x ), uno::UNO_QUERY_THROW );
                 awt::Size aS( 0, 0 );
                 xPropSet->getPropertyValue( sWidth ) >>= aS.Width;
-                awt::Size aM( ImplMapSize( aS ) );
+                awt::Size aM( MapSize( aS ) );
                 aColumns.push_back( std::pair< sal_Int32, sal_Int32 >( nPosition, aM.Width ) );
                 nPosition += aM.Width;
             }
@@ -5588,7 +3645,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
                 uno::Reference< beans::XPropertySet > xPropSet( xRows->getByIndex( y ), uno::UNO_QUERY_THROW );
                 awt::Size aS( 0, 0 );
                 xPropSet->getPropertyValue( sHeight ) >>= aS.Height;
-                awt::Size aM( ImplMapSize( aS ) );
+                awt::Size aM( MapSize( aS ) );
                 aRows.push_back( std::pair< sal_Int32, sal_Int32 >( nPosition, aM.Height ) );
                 nPosition += aM.Height;
             }
@@ -5618,7 +3675,6 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
                         << (sal_Int16)( maRect.GetHeight() + maRect.Top() );
                 mpPptEscherEx->CloseContainer();
 
-
                 uno::Reference< table::XCellRange > xCellRange( xTable, uno::UNO_QUERY_THROW );
                 for( sal_Int32 nRow = 0; nRow < xRows->getCount(); nRow++ )
                 {
@@ -5695,17 +3751,17 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
                 static const rtl::OUString  sDiagonalBLTR( RTL_CONSTASCII_USTRINGPARAM ( "DiagonalBLTR" ) );
 
                 // creating horz lines
-                sal_Int32 nYPos = ImplMapPoint( rXShape->getPosition() ).Y;
+                sal_Int32 nYPos = MapPoint( rXShape->getPosition() ).Y;
                 for( sal_Int32 nLine = 0; nLine < ( xRows->getCount() + 1 ); nLine++ )
                 {
-                    sal_Int32 nXPos = ImplMapPoint( rXShape->getPosition() ).X;
+                    sal_Int32 nXPos = MapPoint( rXShape->getPosition() ).X;
                     std::vector< CellBorder > vCellBorders;
                     for( sal_Int32 nColumn = 0; nColumn < xColumns->getCount(); nColumn++ )
                     {
                         uno::Reference< beans::XPropertySet > xPropSet( xColumns->getByIndex( nColumn ), uno::UNO_QUERY_THROW );
                         awt::Size aS( 0, 0 );
                         xPropSet->getPropertyValue( sWidth ) >>= aS.Width;
-                        awt::Size aM( ImplMapSize( aS ) );
+                        awt::Size aM( MapSize( aS ) );
 
                         CellBorder aCellBorder;
                         aCellBorder.mnPos = nXPos;
@@ -5741,23 +3797,23 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
                         uno::Reference< beans::XPropertySet > xPropSet( xRows->getByIndex( nLine ), uno::UNO_QUERY_THROW );
                         awt::Size aS( 0, 0 );
                         xPropSet->getPropertyValue( sHeight ) >>= aS.Height;
-                        awt::Size aM( ImplMapSize( aS ) );
+                        awt::Size aM( MapSize( aS ) );
                         nYPos += aM.Height;
                     }
                 }
 
                 // creating vertical lines
-                sal_Int32 nXPos = ImplMapPoint( rXShape->getPosition() ).X;
+                sal_Int32 nXPos = MapPoint( rXShape->getPosition() ).X;
                 for( sal_Int32 nLine = 0; nLine < ( xColumns->getCount() + 1 ); nLine++ )
                 {
-                    nYPos = ImplMapPoint( rXShape->getPosition() ).Y;
+                    nYPos = MapPoint( rXShape->getPosition() ).Y;
                     std::vector< CellBorder > vCellBorders;
                     for( sal_Int32 nRow = 0; nRow < xRows->getCount(); nRow++ )
                     {
                         uno::Reference< beans::XPropertySet > xPropSet( xRows->getByIndex( nRow ), uno::UNO_QUERY_THROW );
                         awt::Size aS( 0, 0 );
                         xPropSet->getPropertyValue( sHeight ) >>= aS.Height;
-                        awt::Size aM( ImplMapSize( aS ) );
+                        awt::Size aM( MapSize( aS ) );
 
                         CellBorder aCellBorder;
                         aCellBorder.mnPos = nYPos;
@@ -5793,7 +3849,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
                         uno::Reference< beans::XPropertySet > xPropSet( xColumns->getByIndex( nLine ), uno::UNO_QUERY_THROW );
                         awt::Size aS( 0, 0 );
                         xPropSet->getPropertyValue( sWidth ) >>= aS.Width;
-                        awt::Size aM( ImplMapSize( aS ) );
+                        awt::Size aM( MapSize( aS ) );
                         nXPos += aM.Width;
                     }
                 }
@@ -5806,4 +3862,44 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
     mpPptEscherEx->CloseContainer();
 }
 
+//----------------------------------------------------------------------------------------------------------
+
+void TextObjBinary::Write( SvStream* pStrm )
+{
+    sal_uInt32 nSize, nPos = pStrm->Tell();
+    *pStrm << (sal_uInt32)( EPP_TextCharsAtom << 16 ) << (sal_uInt32)0;
+    for ( void* pPtr = First(); pPtr; pPtr = Next() )
+        ((ParagraphObj*)pPtr)->Write( pStrm );
+    nSize = pStrm->Tell() - nPos;
+    pStrm->SeekRel( - ( (sal_Int32)nSize - 4 ) );
+    *pStrm << (sal_uInt32)( nSize - 8 );
+    pStrm->SeekRel( nSize - 8 );
+}
+
+void TextObjBinary::WriteTextSpecInfo( SvStream* pStrm )
+{
+    sal_uInt32 nCharactersLeft( Count() );
+    if ( nCharactersLeft >= 1 )
+    {
+        EscherExAtom aAnimationInfoAtom( *pStrm, EPP_TextSpecInfoAtom, 0, 0 );
+        for ( ParagraphObj* pPtr = static_cast < ParagraphObj * >( First() ); nCharactersLeft && pPtr; pPtr = static_cast< ParagraphObj* >( Next() ) )
+        {
+            for ( PortionObj* pPortion = static_cast< PortionObj* >( pPtr->First() ); nCharactersLeft && pPortion; pPortion = static_cast< PortionObj* >( pPtr->Next() ) )
+            {
+                sal_Int32 nPortionSize = pPortion->mnTextSize >= nCharactersLeft ? nCharactersLeft : pPortion->mnTextSize;
+                sal_Int32 nFlags = 7;
+                nCharactersLeft -= nPortionSize;
+                *pStrm  << static_cast< sal_uInt32 >( nPortionSize )
+                        << nFlags
+                        << static_cast< sal_Int16 >( 1 )    // spellinfo -> needs rechecking
+                        << static_cast< sal_Int16 >( MsLangId::convertLocaleToLanguageWithFallback( pPortion->meCharLocale ) )
+                        << static_cast< sal_Int16 >( 0 );   // alt language
+            }
+        }
+        if ( nCharactersLeft )
+            *pStrm << nCharactersLeft << static_cast< sal_Int32 >( 1 ) << static_cast< sal_Int16 >( 1 );
+
+    }
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/filter/eppt/grouptable.hxx b/sd/source/filter/eppt/grouptable.hxx
new file mode 100644
index 000000000000..d9e11661af85
--- /dev/null
+++ b/sd/source/filter/eppt/grouptable.hxx
@@ -0,0 +1,86 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef EPPT_GROUP_TABLE
+#define EPPT_GROUP_TABLE
+
+#include <com/sun/star/container/XIndexAccess.hpp>
+
+struct GroupEntry
+{
+    sal_uInt32                  mnCurrentPos;
+    sal_uInt32                  mnCount;
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >           mXIndexAccess;
+
+    GroupEntry( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & rIndex )
+    {
+        mXIndexAccess = rIndex;
+        mnCount =mXIndexAccess->getCount();
+        mnCurrentPos = 0;
+    };
+
+    GroupEntry( sal_uInt32 nCount )
+    {
+        mnCount = nCount;
+        mnCurrentPos = 0;
+    };
+
+    ~GroupEntry(){};
+};
+
+class GroupTable
+{
+    protected:
+
+        sal_uInt32              mnIndex;
+        sal_uInt32              mnCurrentGroupEntry;
+        sal_uInt32              mnMaxGroupEntry;
+        sal_uInt32              mnGroupsClosed;
+        GroupEntry**            mpGroupEntry;
+
+        void                    ImplResizeGroupTable( sal_uInt32 nEntrys );
+
+    public:
+
+        sal_uInt32              GetCurrentGroupIndex() const { return mnIndex; };
+        sal_Int32               GetCurrentGroupLevel() const { return mnCurrentGroupEntry - 1; };
+        ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > &
+                                GetCurrentGroupAccess() const { return mpGroupEntry[  mnCurrentGroupEntry - 1 ]->mXIndexAccess; };
+        sal_uInt32              GetGroupsClosed();
+        void                    SkipCurrentGroup();
+        void                    ResetGroupTable( sal_uInt32 nCount );
+        void                    ClearGroupTable();
+        sal_Bool                EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & rIndex );
+        sal_Bool                GetNextGroupEntry();
+                                GroupTable();
+                                ~GroupTable();
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/filter/eppt/makefile.mk b/sd/source/filter/eppt/makefile.mk
index 85a8ee18152d..2a911038e07b 100644
--- a/sd/source/filter/eppt/makefile.mk
+++ b/sd/source/filter/eppt/makefile.mk
@@ -41,11 +41,16 @@ VISIBILITY_HIDDEN=TRUE
 NOOPTFILES= $(SLO)$/epptso.obj
 .ENDIF
 
-SLOFILES =	$(SLO)$/eppt.obj				\
-            $(SLO)$/epptso.obj				\
-            $(SLO)$/escherex.obj			\
+SLOFILES =  $(SLO)$/eppt.obj			\
+            $(SLO)$/epptso.obj			\
+            $(SLO)$/escherex.obj		\
             $(SLO)$/pptexanimations.obj		\
-            $(SLO)$/pptexsoundcollection.obj
+            $(SLO)$/pptexsoundcollection.obj	\
+            $(SLO)$/pptx-epptbase.obj		\
+            $(SLO)$/pptx-epptooxml.obj		\
+            $(SLO)$/pptx-stylesheet.obj		\
+            $(SLO)$/pptx-grouptable.obj		\
+            $(SLO)$/pptx-text.obj
 
 # --- Targets --------------------------------------------------------------
 
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index a7f7dbbfecff..9f06eac6feb0 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -53,7 +53,6 @@
 #include <com/sun/star/animations/TransitionSubType.hpp>
 #include <com/sun/star/animations/ValuePair.hpp>
 #include <com/sun/star/animations/AnimationColorSpace.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/awt/FontWeight.hpp>
@@ -160,7 +159,7 @@ void ImplTranslateAttribute( rtl::OUString& rString, const TranslateMode eTransl
     }
 }
 
-sal_uInt32 ImplTranslatePresetSubType( const sal_uInt32 nPresetClass, const sal_uInt32 nPresetId, const rtl::OUString& rPresetSubType )
+sal_uInt32 AnimationExporter::TranslatePresetSubType( const sal_uInt32 nPresetClass, const sal_uInt32 nPresetId, const rtl::OUString& rPresetSubType )
 {
     sal_uInt32  nPresetSubType = 0;
     sal_Bool    bTranslated = sal_False;
@@ -240,7 +239,7 @@ sal_uInt32 ImplTranslatePresetSubType( const sal_uInt32 nPresetClass, const sal_
     return nPresetSubType;
 }
 
-const sal_Char* transition::find( const sal_Int16 nType, const sal_Int16 nSubType, const sal_Bool bDirection )
+const sal_Char* AnimationExporter::FindTransitionName( const sal_Int16 nType, const sal_Int16 nSubType, const sal_Bool bDirection )
 {
     const sal_Char* pRet = NULL;
     int             nFit = 0;
@@ -290,7 +289,7 @@ AnimationExporter::AnimationExporter( const EscherSolverContainer& rSolverContai
 
 // --------------------------------------------------------------------
 
-static sal_Int16 GetFillMode( const Reference< XAnimationNode >& xNode, const sal_Int16 nFillDefault )
+sal_Int16 AnimationExporter::GetFillMode( const Reference< XAnimationNode >& xNode, const sal_Int16 nFillDefault )
 {
     sal_Int16 nFill = xNode->getFill();
     if ( ( nFill == AnimationFill::DEFAULT ) ||
@@ -776,7 +775,6 @@ Reference< XAnimationNode > AnimationExporter::createAfterEffectNodeClone( const
         Any aEmpty;
         xCloneNode->setBegin( aEmpty );
 
-
         return xCloneNode;
     }
     catch( Exception& e )
@@ -787,6 +785,27 @@ Reference< XAnimationNode > AnimationExporter::createAfterEffectNodeClone( const
     return xNode;
 }
 
+sal_Bool AnimationExporter::GetNodeType( const Reference< XAnimationNode >& xNode, sal_Int16& nType )
+{
+    // trying to get the nodetype
+    Sequence< NamedValue > aUserData = xNode->getUserData();
+    if ( aUserData.getLength() )
+    {
+    const NamedValue* p = aUserData.getConstArray();
+    sal_Int32 nLength = aUserData.getLength();
+    while( nLength-- )
+    {
+        if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "node-type" ) ) )
+        {
+        if ( p->Value >>= nType )
+            return TRUE;
+        }
+    }
+    }
+
+    return FALSE;
+}
+
 void AnimationExporter::exportAnimNode( SvStream& rStrm, const Reference< XAnimationNode >& xNode,
         const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >*, const sal_Int32, const sal_Int16 nFillDefault )
 {
@@ -839,23 +858,12 @@ void AnimationExporter::exportAnimNode( SvStream& rStrm, const Reference< XAnima
             aAnim.mnGroupType = mso_Anim_GroupType_PAR;
         case AnimationNodeType::SEQ :
         {
-            // trying to get the nodetype
-            Sequence< NamedValue > aUserData = xNode->getUserData();
-            if ( aUserData.getLength() )
+            sal_Int16 nType = 0;
+            if( GetNodeType( xNode, nType ) )
+            switch( nType )
             {
-                const NamedValue* p = aUserData.getConstArray();
-                sal_Int32 nLength = aUserData.getLength();
-                while( nLength-- )
-                {
-                    if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "node-type" ) ) )
-                    {
-                        sal_Int16 nType = 0;
-                        if ( p->Value >>= nType )
-                        {
-                            switch( nType )
-                            {
-                                case ::com::sun::star::presentation::EffectNodeType::TIMING_ROOT : aAnim.mnNodeType = 0x12; break;
-                                case ::com::sun::star::presentation::EffectNodeType::MAIN_SEQUENCE : aAnim.mnNodeType = 0x18; break;
+                case ::com::sun::star::presentation::EffectNodeType::TIMING_ROOT : aAnim.mnNodeType = 0x12; break;
+                case ::com::sun::star::presentation::EffectNodeType::MAIN_SEQUENCE : aAnim.mnNodeType = 0x18; break;
         /*
                                 case ::com::sun::star::presentation::EffectNodeType::ON_CLICK :
                                 case ::com::sun::star::presentation::EffectNodeType::WITH_PREVIOUS :
@@ -863,11 +871,6 @@ void AnimationExporter::exportAnimNode( SvStream& rStrm, const Reference< XAnima
                                 case ::com::sun::star::presentation::EffectNodeType::INTERACTIVE_SEQUENCE :
                                 default:
         */
-                                }
-                        }
-                        break;
-                    }
-                }
             }
         }
         break;
@@ -900,54 +903,94 @@ void AnimationExporter::exportAnimNode( SvStream& rStrm, const Reference< XAnima
         }
         break;
     }
+
     rStrm << aAnim;
 }
 
+void AnimationExporter::GetUserData( const Sequence< NamedValue >& rUserData, const Any ** pAny, sal_Size nLen )
+{
+    // storing user data into pAny, to allow direct access later
+    rtl_zeroMemory( pAny, nLen );
+    if ( rUserData.getLength() )
+    {
+    const NamedValue* p = rUserData.getConstArray();
+    sal_Int32 nLength = rUserData.getLength();
+    while( nLength-- )
+    {
+        if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "node-type" ) ) )
+        {
+        pAny[ DFF_ANIM_NODE_TYPE ] = &(p->Value);
+        }
+        else if ( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "preset-class" ) ) )
+        {
+        pAny[ DFF_ANIM_PRESET_CLASS ] = &(p->Value);
+        }
+        else if ( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "preset-id" ) ) )
+        {
+        pAny[ DFF_ANIM_PRESET_ID ] = &(p->Value);
+        }
+        else if ( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "preset-sub-type" ) ) )
+        {
+        pAny[ DFF_ANIM_PRESET_SUB_TYPE ] = &(p->Value);
+        }
+        else if ( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "master-element" ) ) )
+        {
+        pAny[ DFF_ANIM_AFTEREFFECT ] = &(p->Value);;
+        }
+        p++;
+    }
+    }
+}
+
+sal_uInt32 AnimationExporter::GetPresetID( const rtl::OUString& rPreset, sal_uInt32 nAPIPresetClass, sal_Bool& bPresetId )
+{
+    sal_uInt32 nPresetId = 0;
+    bPresetId = sal_False;
+
+    if ( rPreset.match( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ppt_" ) ), 0 ) )
+    {
+    sal_Int32 nLast = rPreset.lastIndexOf( '_' );
+    if ( ( nLast != -1 ) && ( ( nLast + 1 ) < rPreset.getLength() ) )
+    {
+        rtl::OUString aNumber( rPreset.copy( nLast + 1 ) );
+        nPresetId = aNumber.toInt32();
+        bPresetId = sal_True;
+    }
+    }
+    else
+    {
+    const preset_maping* p = gPresetMaping;
+    while( p->mpStrPresetId && ((p->mnPresetClass != (sal_Int32)nAPIPresetClass) || !rPreset.equalsAscii( p->mpStrPresetId )) )
+        p++;
+
+    if( p->mpStrPresetId )
+    {
+        nPresetId = p->mnPresetId;
+        bPresetId = sal_True;
+    }
+    }
+
+    return nPresetId;
+}
+
 sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Reference< XAnimationNode >& xNode )
 {
     sal_Int16 nNodeType = ::com::sun::star::presentation::EffectNodeType::DEFAULT;
 
     EscherExContainer aAnimPropertySet( rStrm, DFF_msofbtAnimPropertySet );
-    const ::com::sun::star::uno::Any* pAny[ DFF_ANIM_PROPERTY_ID_COUNT ];
-    rtl_zeroMemory( pAny, sizeof( pAny ) );
 
     Reference< XAnimationNode > xMaster;
 
-    const Any aTrue( makeAny( (sal_Bool)sal_True ) );
+    //const Any aTrue( makeAny( (sal_Bool)sal_True ) );
     Any aMasterRel, aOverride, aRunTimeContext;
 
     // storing user data into pAny, to allow direct access later
-    Sequence< NamedValue > aUserData = xNode->getUserData();
-    if ( aUserData.getLength() )
-    {
-        const NamedValue* p = aUserData.getConstArray();
-        sal_Int32 nLength = aUserData.getLength();
-        while( nLength-- )
-        {
-            if( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "node-type" ) ) )
-            {
-                pAny[ DFF_ANIM_NODE_TYPE ] = &(p->Value);
-            }
-            else if ( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "preset-class" ) ) )
-            {
-                pAny[ DFF_ANIM_PRESET_CLASS ] = &(p->Value);
-            }
-            else if ( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "preset-id" ) ) )
-            {
-                pAny[ DFF_ANIM_PRESET_ID ] = &(p->Value);
-            }
-            else if ( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "preset-sub-type" ) ) )
-            {
-                pAny[ DFF_ANIM_PRESET_SUB_TYPE ] = &(p->Value);
-            }
-            else if ( p->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "master-element" ) ) )
-            {
-                pAny[ DFF_ANIM_AFTEREFFECT ] = &aTrue;
-                p->Value >>= xMaster;
-            }
-            p++;
-        }
-    }
+    const Sequence< NamedValue > aUserData = xNode->getUserData();
+    const ::com::sun::star::uno::Any* pAny[ DFF_ANIM_PROPERTY_ID_COUNT ];
+    GetUserData( aUserData, pAny, sizeof( pAny ) );
+
+    if( pAny[ DFF_ANIM_AFTEREFFECT ] )
+        ( *pAny[ DFF_ANIM_AFTEREFFECT ] ) >>= xMaster;
 
     // calculate master-rel
     if( xMaster.is() )
@@ -992,7 +1035,7 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer
     sal_uInt32 nAPIPresetClass = EffectPresetClass::CUSTOM;
     sal_uInt32 nPresetClass = DFF_ANIM_PRESS_CLASS_USER_DEFINED;
     sal_Bool bPresetClass, bPresetId, bPresetSubType;
-    bPresetClass = bPresetId = bPresetSubType = sal_False;
+    bPresetId = bPresetClass = bPresetSubType = sal_False;
 
     if ( pAny[ DFF_ANIM_PRESET_CLASS ] )
     {
@@ -1018,30 +1061,7 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer
     {
         rtl::OUString sPreset;
         if ( *pAny[ DFF_ANIM_PRESET_ID ] >>= sPreset )
-        {
-            if ( sPreset.match( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ppt_" ) ), 0 ) )
-            {
-                sal_Int32 nLast = sPreset.lastIndexOf( '_' );
-                if ( ( nLast != -1 ) && ( ( nLast + 1 ) < sPreset.getLength() ) )
-                {
-                    rtl::OUString aNumber( sPreset.copy( nLast + 1 ) );
-                    nPresetId = aNumber.toInt32();
-                    bPresetId = sal_True;
-                }
-               }
-            else
-            {
-                const preset_maping* p = gPresetMaping;
-                while( p->mpStrPresetId && ((p->mnPresetClass != (sal_Int32)nAPIPresetClass) || !sPreset.equalsAscii( p->mpStrPresetId )) )
-                    p++;
-
-                if( p->mpStrPresetId )
-                {
-                    nPresetId = p->mnPresetId;
-                    bPresetId = sal_True;
-                }
-            }
-        }
+            nPresetId = GetPresetID( sPreset, nAPIPresetClass, bPresetId );
     }
 
     if ( pAny[ DFF_ANIM_PRESET_SUB_TYPE ] )
@@ -1049,7 +1069,7 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer
         rtl::OUString sPresetSubType;
         if ( *pAny[ DFF_ANIM_PRESET_SUB_TYPE ] >>= sPresetSubType )
         {
-            nPresetSubType = ImplTranslatePresetSubType( nPresetClass, nPresetId, sPresetSubType );
+            nPresetSubType = TranslatePresetSubType( nPresetClass, nPresetId, sPresetSubType );
             bPresetSubType = sal_True;
         }
     }
@@ -1412,7 +1432,7 @@ void AnimationExporter::exportAnimEvent( SvStream& rStrm, const Reference< XAnim
     }
 }
 
-Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::OUString& rAttributeName ) const
+Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const rtl::OUString& rAttributeName )
 {
     rtl::OUString aDest;
     if ( rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "X" ) )
@@ -1561,7 +1581,7 @@ void AnimationExporter::exportAnimateSet( SvStream& rStrm, const Reference< XAni
     }
 }
 
-sal_uInt32 GetValueTypeForAttributeName( const rtl::OUString& rAttributeName )
+sal_uInt32 AnimationExporter::GetValueTypeForAttributeName( const rtl::OUString& rAttributeName )
 {
     sal_uInt32 nValueType = 0;
 
@@ -1708,9 +1728,9 @@ void AnimationExporter::exportAnimateTarget( SvStream& rStrm, const Reference< X
             rtl::OUString aAttributeName( xAnimate->getAttributeName() );
             if ( nForceAttributeNames )
             {
-                switch( nForceAttributeNames )
+                if( nForceAttributeNames == 1 )
                 {
-                    case 1 : aAttributeName = rtl::OUString::createFromAscii( "r" ); break;
+                    aAttributeName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "r" ));
                 }
             }
             sal_Int32 nIndex = 0;
@@ -1736,54 +1756,69 @@ void AnimationExporter::exportAnimateTarget( SvStream& rStrm, const Reference< X
     }
 }
 
-void AnimationExporter::exportAnimateTargetElement( SvStream& rStrm, const Any aAny, const sal_Bool bCreate2b01Atom )
+Reference< XShape > AnimationExporter::getTargetElementShape( const Any& rAny, sal_Int32& rBegin, sal_Int32& rEnd, sal_Bool& rParagraphTarget )
 {
     Reference< XShape > xShape;
-    aAny >>= xShape;
-    sal_uInt32 nRefMode = 0;    // nRefMode == 2 -> Paragraph
-    sal_Int32 begin = -1;
-    sal_Int32 end = -1;
+    rAny >>= xShape;
+
+    rParagraphTarget = sal_False;
 
     if( !xShape.is() )
     {
-        ParagraphTarget aParaTarget;
-        if( aAny >>= aParaTarget )
-            xShape = aParaTarget.Shape;
-        if ( xShape.is() )
+    ParagraphTarget aParaTarget;
+    if( rAny >>= aParaTarget )
+        xShape = aParaTarget.Shape;
+    if ( xShape.is() )
+    {
+        // now calculating the character range for the paragraph
+        sal_Int16 nParagraph = aParaTarget.Paragraph;
+        Reference< XSimpleText > xText( xShape, UNO_QUERY );
+        if ( xText.is() )
         {
-            // now calculating the character range for the paragraph
-            sal_Int16 nParagraph = aParaTarget.Paragraph;
-            Reference< XSimpleText > xText( xShape, UNO_QUERY );
-            if ( xText.is() )
+        rParagraphTarget = sal_True;
+        Reference< XEnumerationAccess > xTextParagraphEnumerationAccess( xText, UNO_QUERY );
+        if ( xTextParagraphEnumerationAccess.is() )
+        {
+            Reference< XEnumeration > xTextParagraphEnumeration( xTextParagraphEnumerationAccess->createEnumeration() );
+            if ( xTextParagraphEnumeration.is() )
+            {
+            sal_Int16 nCurrentParagraph;
+            rBegin = rEnd = nCurrentParagraph = 0;
+            while ( xTextParagraphEnumeration->hasMoreElements() )
             {
-                nRefMode = 2;
-                Reference< XEnumerationAccess > xTextParagraphEnumerationAccess( xText, UNO_QUERY );
-                if ( xTextParagraphEnumerationAccess.is() )
+                Reference< XTextRange > xTextRange( xTextParagraphEnumeration->nextElement(), UNO_QUERY );
+                if ( xTextRange.is() )
                 {
-                    Reference< XEnumeration > xTextParagraphEnumeration( xTextParagraphEnumerationAccess->createEnumeration() );
-                    if ( xTextParagraphEnumeration.is() )
-                    {
-                        sal_Int16 nCurrentParagraph;
-                        begin = end = nCurrentParagraph = 0;
-                        while ( xTextParagraphEnumeration->hasMoreElements() )
-                        {
-                            Reference< XTextRange > xTextRange( xTextParagraphEnumeration->nextElement(), UNO_QUERY );
-                            if ( xTextRange.is() )
-                            {
-                                rtl::OUString aParaText( xTextRange->getString() );
-                                sal_Int32 nLength = aParaText.getLength() + 1;
-                                end += nLength;
-                                if ( nCurrentParagraph == nParagraph )
-                                    break;
-                                nCurrentParagraph++;
-                                begin += nLength;
-                            }
-                        }
-                    }
+                rtl::OUString aParaText( xTextRange->getString() );
+                sal_Int32 nLength = aParaText.getLength() + 1;
+                rEnd += nLength;
+                if ( nCurrentParagraph == nParagraph )
+                    break;
+                nCurrentParagraph++;
+                rBegin += nLength;
                 }
             }
+            }
+        }
         }
     }
+    }
+
+    return xShape;
+}
+
+void AnimationExporter::exportAnimateTargetElement( SvStream& rStrm, const Any aAny, const sal_Bool bCreate2b01Atom )
+{
+    sal_uInt32 nRefMode = 0;    // nRefMode == 2 -> Paragraph
+    sal_Int32 begin = -1;
+    sal_Int32 end = -1;
+    sal_Bool bParagraphTarget;
+
+    Reference< XShape > xShape = getTargetElementShape( aAny, begin, end, bParagraphTarget );
+
+    if( bParagraphTarget )
+        nRefMode = 2;
+
     if ( xShape.is() || bCreate2b01Atom )
     {
         EscherExContainer aAnimateTargetElement( rStrm, DFF_msofbtAnimateTargetElement );
@@ -1918,7 +1953,7 @@ void AnimationExporter::exportTransitionFilter( SvStream& rStrm, const Reference
             rStrm << nBits
                   << nTransition;
         }
-        const sal_Char* pFilter = transition::find( xFilter->getTransition(), xFilter->getSubtype(), xFilter->getDirection() );
+        const sal_Char* pFilter = FindTransitionName( xFilter->getTransition(), xFilter->getSubtype(), xFilter->getDirection() );
         if ( pFilter )
         {
             const OUString aStr( OUString::createFromAscii( pFilter ) );
diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx
index e96408e1af90..448f3c9f7ef1 100644
--- a/sd/source/filter/eppt/pptexanimations.hxx
+++ b/sd/source/filter/eppt/pptexanimations.hxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/animations/XTimeContainer.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/animations/XAnimate.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
 #include "../ppt/pptanimations.hxx"
 #include <pptexsoundcollection.hxx>
 #include <filter/msfilter/escherex.hxx>
@@ -81,7 +82,6 @@ class AnimationExporter
     void writeZString( SvStream& rStrm, const rtl::OUString& rVal );
     sal_Bool getColorAny( const ::com::sun::star::uno::Any& rAny, const sal_Int16 nColorSpace, sal_Int32& rMode, sal_Int32& rA, sal_Int32& rB, sal_Int32& rC ) const;
     sal_Bool exportAnimProperty( SvStream& rStrm, const sal_uInt16 nPropertyId, const ::com::sun::star::uno::Any& rAny, const TranslateMode eTranslateMode );
-    ::com::sun::star::uno::Any convertAnimateValue( const ::com::sun::star::uno::Any& rSource, const rtl::OUString& rAttributeName ) const;
     void exportAnimPropertyString( SvStream& rStrm, const sal_uInt16 nPropertyId, const rtl::OUString& rVal, const TranslateMode eTranslateMode );
     void exportAnimPropertyFloat( SvStream& rStrm, const sal_uInt16 nPropertyId, const double& rVal, const TranslateMode eTranslateMode );
     void exportAnimPropertyuInt32( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt32 nVal, const TranslateMode eTranslateMode );
@@ -127,8 +127,19 @@ public:
     void doexport( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage, SvStream& rStrm );
 
     sal_Int32 mnCurrentGroup;
-};
 
+        // helper methods also used in ooxml export
+    static ::com::sun::star::uno::Any convertAnimateValue( const ::com::sun::star::uno::Any& rSource, const rtl::OUString& rAttributeName );
+        static sal_Bool GetNodeType( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, sal_Int16& nType );
+        static sal_Int16 GetFillMode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, const sal_Int16 nFillDefault );
+        static void GetUserData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rUserData, const ::com::sun::star::uno::Any ** pAny, sal_Size nLen );
+        static sal_uInt32 TranslatePresetSubType( const sal_uInt32 nPresetClass, const sal_uInt32 nPresetId, const rtl::OUString& rPresetSubType );
+        static sal_uInt32 GetPresetID( const rtl::OUString& rPreset, sal_uInt32 nAPIPresetClass, sal_Bool& bPresetId );
+        static sal_uInt32 GetValueTypeForAttributeName( const rtl::OUString& rAttributeName );
+
+    static const sal_Char* FindTransitionName( const sal_Int16 nType, const sal_Int16 nSubType, const sal_Bool bDirection );
+    static ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getTargetElementShape( const ::com::sun::star::uno::Any& rAny, sal_Int32& rBegin, sal_Int32& rEnd, sal_Bool& rParagraphTarget );
+};
 } // namespace ppt
 
 #endif
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
new file mode 100644
index 000000000000..47084b9e2179
--- /dev/null
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -0,0 +1,1010 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sd.hxx"
+
+#include "eppt.hxx"
+#include "epptdef.hxx"
+
+#include <cppuhelper/extract.hxx>
+#include <tools/globname.hxx>
+#include <tools/datetime.hxx>
+#include <tools/poly.hxx>
+#include <tools/stream.hxx>
+#include <tools/zcodec.hxx>
+#include <vcl/graph.hxx>
+#include <vcl/bmpacc.hxx>
+#include <vcl/gradient.hxx>
+#include <vcl/virdev.hxx>
+#include <rtl/ustring.hxx>
+#include <svtools/fltcall.hxx>
+#include <svtools/wmf.hxx>
+#include <sfx2/docfile.hxx>
+#include <sfx2/docinf.hxx>
+#include <svx/unoapi.hxx>
+#include <svx/svdobj.hxx>
+#include <svx/svdoole2.hxx>
+#include <svx/svdmodel.hxx>
+#include <svx/svdpage.hxx>
+#include <com/sun/star/view/PaperOrientation.hpp>
+#include <com/sun/star/view/PaperFormat.hpp>
+#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
+#include <com/sun/star/office/XAnnotation.hpp>
+#include <com/sun/star/office/XAnnotationAccess.hpp>
+#include <com/sun/star/office/XAnnotationEnumeration.hpp>
+#include <com/sun/star/geometry/RealPoint2D.hpp>
+#include <com/sun/star/util/DateTime.hpp>
+#include <com/sun/star/animations/TransitionType.hpp>
+#include <com/sun/star/animations/TransitionSubType.hpp>
+#include <com/sun/star/awt/FontDescriptor.hpp>
+#include <com/sun/star/awt/FontFamily.hpp>
+#include <com/sun/star/awt/FontPitch.hpp>
+#include <com/sun/star/container/XNamed.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/presentation/XPresentationPage.hpp>
+#include <com/sun/star/text/XSimpleText.hpp>
+#include <com/sun/star/style/XStyle.hpp>
+#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
+#include <editeng/svxenum.hxx>
+#include <editeng/flditem.hxx>
+#include <sot/storinfo.hxx>
+#include <filter/msfilter/msoleexp.hxx>
+#include <filter/msfilter/msdffimp.hxx>
+#include <filter/msfilter/svxmsbas.hxx>
+
+#ifdef DEBUG
+#define DBG(x) x
+#include <stdio.h>
+#else
+#define DBG(x)
+#endif
+
+using namespace com::sun::star;
+
+using namespace ::com::sun::star::animations;
+using namespace ::com::sun::star::awt::FontFamily;
+using namespace ::com::sun::star::awt::FontPitch;
+using namespace ::com::sun::star::presentation;
+
+using ::com::sun::star::awt::FontDescriptor;
+using ::com::sun::star::beans::XPropertySet;
+using ::com::sun::star::container::XNameAccess;
+using ::com::sun::star::container::XNamed;
+using ::com::sun::star::drawing::XDrawPagesSupplier;
+using ::com::sun::star::drawing::XMasterPagesSupplier;
+using ::com::sun::star::drawing::XShapes;
+using ::com::sun::star::drawing::XMasterPageTarget;
+using ::com::sun::star::drawing::XDrawPage;
+using ::com::sun::star::frame::XModel;
+using ::com::sun::star::style::XStyleFamiliesSupplier;
+using ::com::sun::star::style::XStyle;
+using ::com::sun::star::task::XStatusIndicator;
+using ::com::sun::star::text::XSimpleText;
+using ::com::sun::star::uno::Any;
+using ::com::sun::star::uno::Exception;
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::UNO_QUERY;
+
+static PHLayout pPHLayout[] =
+{
+    { EPP_LAYOUT_TITLESLIDE,            { 0x0d, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x10, TRUE, TRUE, FALSE },
+    { EPP_LAYOUT_TITLEANDBODYSLIDE,     { 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, TRUE, TRUE, FALSE },
+    { EPP_LAYOUT_TITLEANDBODYSLIDE,     { 0x0d, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, TRUE, TRUE, FALSE },
+    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, TRUE, TRUE, TRUE },
+    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x0e, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, TRUE, TRUE, FALSE },
+    { EPP_LAYOUT_BLANCSLIDE,            { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, FALSE, FALSE, FALSE },
+    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x0e, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, TRUE, TRUE, FALSE },
+    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x14, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, TRUE, TRUE, FALSE },
+    { EPP_LAYOUT_TITLEANDBODYSLIDE,     { 0x0d, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x15, 0x0d, 0x0e, TRUE, FALSE, FALSE },
+    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x16, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, TRUE, TRUE, FALSE },
+    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
+    { EPP_LAYOUT_TITLEANDBODYSLIDE,     { 0x0d, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, FALSE, FALSE },
+    { EPP_LAYOUT_RIGHTCOLUMN2ROWS,      { 0x0d, 0x0e, 0x13, 0x13, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
+    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
+    { EPP_LAYOUT_2ROWSANDTITLE,         { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
+    { EPP_LAYOUT_LEFTCOLUMN2ROWS,       { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
+    { EPP_LAYOUT_TOPROW2COLUMN,         { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
+    { EPP_LAYOUT_2ROWSANDTITLE,         { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE },
+    { EPP_LAYOUT_4OBJECTS,              { 0x0d, 0x13, 0x13, 0x13, 0x13, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, FALSE, FALSE },
+    { EPP_LAYOUT_ONLYTITLE,             { 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, TRUE, FALSE, FALSE },
+    { EPP_LAYOUT_BLANCSLIDE,            { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, FALSE, FALSE, FALSE },
+    { EPP_LAYOUT_TITLERIGHT2BODIESLEFT, { 0x11, 0x12, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x11, 0x12, TRUE, TRUE, FALSE },
+    { EPP_LAYOUT_TITLERIGHTBODYLEFT,    { 0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x11, 0x12, TRUE, TRUE, FALSE },
+    { EPP_LAYOUT_TITLEANDBODYSLIDE,     { 0x0d, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x12, TRUE, TRUE, FALSE },
+    { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x16, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x12, TRUE, TRUE, FALSE }
+};
+
+#define PPT_WRITER_BASE_INIT_VALUES \
+    maFraction              ( 1, 576 ), \
+    maMapModeSrc            ( MAP_100TH_MM ), \
+    maMapModeDest           ( MAP_INCH, Point(), maFraction, maFraction ), \
+    meLatestPageType        ( NORMAL )
+
+PPTWriterBase::PPTWriterBase() :
+    PPT_WRITER_BASE_INIT_VALUES
+{
+    DBG(printf ("PPTWriterBase::PPTWriterBase()\n"));
+}
+
+PPTWriterBase::PPTWriterBase( const Reference< XModel > & rXModel,
+                              const Reference< XStatusIndicator > & rXStatInd ) :
+    mXModel                 ( rXModel ),
+    mXStatusIndicator       ( rXStatInd ),
+    mbStatusIndicator       ( false ),
+    PPT_WRITER_BASE_INIT_VALUES
+{
+}
+
+// ---------------------------------------------------------------------------------------------
+
+PPTWriterBase::~PPTWriterBase()
+{
+    if ( mbStatusIndicator )
+        mXStatusIndicator->end();
+}
+
+// ---------------------------------------------------------------------------------------------
+
+void PPTWriterBase::exportPPT()
+{
+    if ( !InitSOIface() )
+        return;
+
+    FontCollectionEntry aDefaultFontDesc( String( RTL_CONSTASCII_USTRINGPARAM( "Times New Roman" ) ),
+                                          ROMAN,
+                                          awt::FontPitch::VARIABLE,
+                                                    RTL_TEXTENCODING_MS_1252 );
+    maFontCollection.GetId( aDefaultFontDesc ); // default is always times new roman
+
+    if ( !GetPageByIndex( 0, NOTICE ) )
+        return;
+
+    INT32 nWidth = 21000;
+    if ( ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM(  "Width" ) ) ) )
+        mAny >>= nWidth;
+    INT32 nHeight = 29700;
+    if ( ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Height" ) ) ) )
+        mAny >>= nHeight;
+
+    maNotesPageSize = MapSize( awt::Size( nWidth, nHeight ) );
+
+    if ( !GetPageByIndex( 0, MASTER ) )
+        return;
+
+    nWidth = 28000;
+    if ( ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Width" ) ) ) )
+        mAny >>= nWidth;
+    nHeight = 21000;
+    if ( ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Height" ) ) ) )
+        mAny >>= nHeight;
+    maDestPageSize = MapSize( awt::Size( nWidth, nHeight ) );
+
+    DBG(printf( "call exportDocumentPre()\n"));
+    exportPPTPre();
+
+    if ( !GetStyleSheets() )
+        return;
+
+    if ( !ImplCreateDocument() )
+         return;
+
+    sal_uInt32 i;
+
+    for ( i = 0; i < mnPages; i++ )
+    {
+    if ( GetPageByIndex( i, NORMAL ) ) {
+        sal_uInt32 nMasterNum = GetMasterIndex( NORMAL );
+        ImplWriteLayout( GetLayoutOffset( mXPagePropSet ), nMasterNum );
+    }
+    }
+
+    for ( i = 0; i < mnMasterPages; i++ )
+    {
+        if ( !CreateSlideMaster( i ) )
+            return;
+    }
+    if ( !CreateMainNotes() )
+        return;
+    maTextRuleList.First();                         // rewind list, so we can get the current or next entry without
+                                                    // searching, all entrys are sorted#
+    for ( i = 0; i < mnPages; i++ )
+    {
+        DBG(printf( "call ImplCreateSlide( %d )\n", i));
+        if ( !CreateSlide( i ) )
+            return;
+    }
+
+    for ( i = 0; i < mnPages; i++ )
+    {
+        if ( !CreateNotes( i ) )
+            return;
+    }
+
+    DBG(printf( "call exportDocumentPost()\n"));
+    exportPPTPost();
+}
+
+// ---------------------------------------------------------------------------------------------
+
+sal_Bool PPTWriterBase::InitSOIface()
+{
+    while( TRUE )
+    {
+        mXDrawPagesSupplier = Reference< XDrawPagesSupplier >( mXModel, UNO_QUERY );
+        if ( !mXDrawPagesSupplier.is() )
+            break;
+
+        mXMasterPagesSupplier = Reference< XMasterPagesSupplier >( mXModel, UNO_QUERY );
+        if ( !mXMasterPagesSupplier.is() )
+            break;
+        mXDrawPages = mXMasterPagesSupplier->getMasterPages();
+        if ( !mXDrawPages.is() )
+            break;
+        mnMasterPages = mXDrawPages->getCount();
+        mXDrawPages = mXDrawPagesSupplier->getDrawPages();
+        if( !mXDrawPages.is() )
+            break;
+        mnPages =  mXDrawPages->getCount();
+        if ( !GetPageByIndex( 0, NORMAL ) )
+            break;
+
+        return TRUE;
+    }
+    return FALSE;
+}
+
+// ---------------------------------------------------------------------------------------------
+
+sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType )
+{
+    while( TRUE )
+    {
+        if ( ePageType != meLatestPageType )
+        {
+            switch( ePageType )
+            {
+                case NORMAL :
+                case NOTICE :
+                {
+                    mXDrawPages = mXDrawPagesSupplier->getDrawPages();
+                    if( !mXDrawPages.is() )
+                        return FALSE;
+                }
+                break;
+
+                case MASTER :
+                {
+                    mXDrawPages = mXMasterPagesSupplier->getMasterPages();
+                    if( !mXDrawPages.is() )
+                        return FALSE;
+                }
+                break;
+                default:
+                    break;
+            }
+            meLatestPageType = ePageType;
+        }
+        Any aAny( mXDrawPages->getByIndex( nIndex ) );
+        aAny >>= mXDrawPage;
+        if ( !mXDrawPage.is() )
+            break;
+        if ( ePageType == NOTICE )
+        {
+            Reference< XPresentationPage > aXPresentationPage( mXDrawPage, UNO_QUERY );
+            if ( !aXPresentationPage.is() )
+                break;
+            mXDrawPage = aXPresentationPage->getNotesPage();
+            if ( !mXDrawPage.is() )
+                break;
+        }
+        mXPagePropSet = Reference< XPropertySet >( mXDrawPage, UNO_QUERY );
+        if ( !mXPagePropSet.is() )
+            break;
+
+        mXShapes = Reference< XShapes >( mXDrawPage, UNO_QUERY );
+        if ( !mXShapes.is() )
+            break;
+
+        /* try to get the "real" background PropertySet. If the normal page is not supporting this property, it is
+           taken the property from the master */
+        sal_Bool bHasBackground = GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Background" ) ), sal_True );
+        if ( bHasBackground )
+            bHasBackground = ( aAny >>= mXBackgroundPropSet );
+        if ( !bHasBackground )
+        {
+            Reference< XMasterPageTarget > aXMasterPageTarget( mXDrawPage, UNO_QUERY );
+            if ( aXMasterPageTarget.is() )
+            {
+                Reference< XDrawPage > aXMasterDrawPage;
+                aXMasterDrawPage = aXMasterPageTarget->getMasterPage();
+                if ( aXMasterDrawPage.is() )
+                {
+                    Reference< XPropertySet > aXMasterPagePropSet;
+                    aXMasterPagePropSet = Reference< XPropertySet >
+                        ( aXMasterDrawPage, UNO_QUERY );
+                    if ( aXMasterPagePropSet.is() )
+                    {
+                        sal_Bool bBackground = GetPropertyValue( aAny, aXMasterPagePropSet,
+                                String( RTL_CONSTASCII_USTRINGPARAM( "Background" ) ) );
+                        if ( bBackground )
+                        {
+                            aAny >>= mXBackgroundPropSet;
+                        }
+                    }
+                }
+            }
+        }
+        return TRUE;
+    }
+    return FALSE;
+}
+
+// ---------------------------------------------------------------------------------------------
+
+sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum )
+{
+    Any aAny;
+
+    if ( !GetPageByIndex( nPageNum, NORMAL ) )
+        return FALSE;
+
+    sal_uInt32 nMasterNum = GetMasterIndex( NORMAL );
+    SetCurrentStyleSheet( nMasterNum );
+
+    Reference< XPropertySet > aXBackgroundPropSet;
+    sal_Bool bHasBackground = GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Background" ) ) );
+    if ( bHasBackground )
+        bHasBackground = ( aAny >>= aXBackgroundPropSet );
+
+    sal_uInt16 nMode = 7;   // Bit 1: Follow master objects, Bit 2: Follow master scheme, Bit 3: Follow master background
+    if ( bHasBackground )
+        nMode &=~4;
+
+/* sj: Don't know what's IsBackgroundVisible for, have to ask cl
+    if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundVisible" ) ) ) )
+    {
+        sal_Bool bBackgroundVisible;
+        if ( aAny >>= bBackgroundVisible )
+        {
+            if ( bBackgroundVisible )
+                nMode &= ~4;
+        }
+    }
+*/
+    if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundObjectsVisible" ) ) ) )
+    {
+        sal_Bool bBackgroundObjectsVisible = sal_False;
+        if ( aAny >>= bBackgroundObjectsVisible )
+        {
+            if ( !bBackgroundObjectsVisible )
+                nMode &= ~1;
+        }
+    }
+
+    ImplWriteSlide( nPageNum, nMasterNum, nMode, bHasBackground, aXBackgroundPropSet );
+
+    return TRUE;
+};
+
+// ---------------------------------------------------------------------------------------------
+
+sal_Bool PPTWriterBase::CreateNotes( sal_uInt32 nPageNum )
+{
+    if ( !GetPageByIndex( nPageNum, NOTICE ) )
+        return FALSE;
+    SetCurrentStyleSheet( GetMasterIndex( NORMAL ) );
+
+    ImplWriteNotes( nPageNum );
+
+    return TRUE;
+};
+
+// ---------------------------------------------------------------------------------------------
+
+sal_Bool PPTWriterBase::CreateSlideMaster( sal_uInt32 nPageNum )
+{
+    if ( !GetPageByIndex( nPageNum, MASTER ) )
+        return FALSE;
+    SetCurrentStyleSheet( nPageNum );
+
+    if ( !ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Background" ) ) ) )                // Backgroundshape laden
+        return FALSE;
+    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet;
+    if ( !( mAny >>= aXBackgroundPropSet ) )
+        return FALSE;
+
+    ImplWriteSlideMaster( nPageNum, aXBackgroundPropSet );
+
+    return TRUE;
+};
+
+// ---------------------------------------------------------------------------------------------
+
+sal_Int32 PPTWriterBase::GetLayoutOffset( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const
+{
+    ::com::sun::star::uno::Any aAny;
+    sal_Int32 nLayout = 20;
+    if ( GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Layout" ) ) ), sal_True )
+        aAny >>= nLayout;
+
+    if ( ( nLayout >= 21 ) && ( nLayout <= 26 ) )   // NOTES _> HANDOUT6
+        nLayout = 20;
+    if ( ( nLayout >= 27 ) && ( nLayout <= 30 ) )   // VERTICAL LAYOUT
+        nLayout -= 6;
+    else if ( nLayout > 30 )
+        nLayout = 20;
+
+    return nLayout;
+}
+
+PHLayout& PPTWriterBase::GetLayout(  const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const
+{
+    return pPHLayout[ GetLayoutOffset( rXPropSet ) ];
+}
+
+// ---------------------------------------------------------------------------------------------
+
+PHLayout& PPTWriterBase::GetLayout( sal_Int32 nOffset ) const
+{
+    if( nOffset >= 0 && nOffset < EPP_LAYOUT_SIZE )
+        return pPHLayout[ nOffset ];
+
+    DBG(printf("asked %d for layout outside of 0,%d array scope\n", nOffset, EPP_LAYOUT_SIZE ));
+
+    return pPHLayout[ 0 ];
+}
+
+// ---------------------------------------------------------------------------------------------
+
+sal_uInt32 PPTWriterBase::GetMasterIndex( PageType ePageType )
+{
+    sal_uInt32 nRetValue = 0;
+    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XMasterPageTarget >
+        aXMasterPageTarget( mXDrawPage, ::com::sun::star::uno::UNO_QUERY );
+
+    if ( aXMasterPageTarget.is() )
+    {
+        ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >
+            aXDrawPage = aXMasterPageTarget->getMasterPage();
+        if ( aXDrawPage.is() )
+        {
+            ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
+                aXPropertySet( aXDrawPage, ::com::sun::star::uno::UNO_QUERY );
+
+            if ( aXPropertySet.is() )
+            {
+                if ( ImplGetPropertyValue( aXPropertySet, String( RTL_CONSTASCII_USTRINGPARAM( "Number" ) ) ) )
+                    nRetValue |= *(sal_Int16*)mAny.getValue();
+                if ( nRetValue & 0xffff )           // ueberlauf vermeiden
+                    nRetValue--;
+            }
+        }
+    }
+    if ( ePageType == NOTICE )
+        nRetValue += mnMasterPages;
+    return nRetValue;
+}
+
+//  -----------------------------------------------------------------------
+
+sal_Bool PPTWriterBase::SetCurrentStyleSheet( sal_uInt32 nPageNum )
+{
+    sal_Bool bRet = sal_False;
+    if ( nPageNum >= maStyleSheetList.size() )
+        nPageNum = 0;
+    else
+        bRet = sal_True;
+    mpStyleSheet = maStyleSheetList[ nPageNum ];
+    return bRet;
+}
+
+// ---------------------------------------------------------------------------------------------
+
+sal_Bool PPTWriterBase::GetStyleSheets()
+{
+    int             nInstance, nLevel;
+    sal_Bool        bRetValue = sal_False;
+    sal_uInt32      nPageNum;
+
+    for ( nPageNum = 0; nPageNum < mnMasterPages; nPageNum++ )
+    {
+        Reference< XNamed >
+            aXNamed;
+
+        Reference< XNameAccess >
+            aXNameAccess;
+
+        Reference< XStyleFamiliesSupplier >
+            aXStyleFamiliesSupplier( mXModel, UNO_QUERY );
+
+        Reference< XPropertySet >
+            aXPropSet( mXModel, UNO_QUERY );
+
+        sal_uInt16 nDefaultTab = ( aXPropSet.is() && ImplGetPropertyValue( aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TabStop" ) ) ) )
+            ? (sal_uInt16)( *(sal_Int32*)mAny.getValue() / 4.40972 )
+            : 1250;
+
+        maStyleSheetList.push_back( new PPTExStyleSheet( nDefaultTab, (PPTExBulletProvider&)*this ) );
+        SetCurrentStyleSheet( nPageNum );
+        if ( GetPageByIndex( nPageNum, MASTER ) )
+            aXNamed = Reference< XNamed >
+                        ( mXDrawPage, UNO_QUERY );
+
+        if ( aXStyleFamiliesSupplier.is() )
+            aXNameAccess = aXStyleFamiliesSupplier->getStyleFamilies();
+
+        bRetValue = aXNamed.is() && aXNameAccess.is() && aXStyleFamiliesSupplier.is();
+        if  ( bRetValue )
+        {
+            for ( nInstance = EPP_TEXTTYPE_Title; nInstance <= EPP_TEXTTYPE_CenterTitle; nInstance++ )
+            {
+                String aStyle;
+                String aFamily;
+                switch ( nInstance )
+                {
+                    case EPP_TEXTTYPE_CenterTitle :
+                    case EPP_TEXTTYPE_Title :
+                    {
+                        aStyle = String( RTL_CONSTASCII_USTRINGPARAM( "title" ) );
+                        aFamily = aXNamed->getName();
+                    }
+                    break;
+                    case EPP_TEXTTYPE_Body :
+                    {
+                        aStyle = String( RTL_CONSTASCII_USTRINGPARAM( "outline1" ) );      // SD_LT_SEPARATOR
+                        aFamily = aXNamed->getName();
+                    }
+                    break;
+                    case EPP_TEXTTYPE_Other :
+                    {
+                        aStyle = String( RTL_CONSTASCII_USTRINGPARAM( "standard" ) );
+                        aFamily = String( RTL_CONSTASCII_USTRINGPARAM( "graphics" ) );
+                    }
+                    break;
+                    case EPP_TEXTTYPE_CenterBody :
+                    {
+                        aStyle = String( RTL_CONSTASCII_USTRINGPARAM( "subtitle" ) );
+                        aFamily = aXNamed->getName();
+                    }
+                    break;
+                }
+                if ( aStyle.Len() && aFamily.Len() )
+                {
+                    try
+                    {
+                        Reference< XNameAccess >xNameAccess;
+                        if ( aXNameAccess->hasByName( aFamily ) )
+                        {
+                            Any aAny( aXNameAccess->getByName( aFamily ) );
+                            if( aAny.getValue() && ::cppu::extractInterface( xNameAccess, aAny ) )
+                            {
+                                Reference< XNameAccess > aXFamily;
+                                if ( aAny >>= aXFamily )
+                                {
+                                    if ( aXFamily->hasByName( aStyle ) )
+                                    {
+                                        Reference< XStyle > xStyle;
+                                        aAny = aXFamily->getByName( aStyle );
+                                        if( aAny.getValue() && ::cppu::extractInterface( xStyle, aAny ) )
+                                        {
+                                            Reference< XStyle > aXStyle;
+                                            aAny >>= aXStyle;
+                                            Reference< XPropertySet >
+                                                xPropSet( aXStyle, UNO_QUERY );
+                                            if( xPropSet.is() )
+                                                mpStyleSheet->SetStyleSheet( xPropSet, maFontCollection, nInstance, 0 );
+                                            for ( nLevel = 1; nLevel < 5; nLevel++ )
+                                            {
+                                                if ( nInstance == EPP_TEXTTYPE_Body )
+                                                {
+                                                    sal_Unicode cTemp = aStyle.GetChar( aStyle.Len() - 1 );
+                                                    aStyle.SetChar( aStyle.Len() - 1, ++cTemp );
+                                                    if ( aXFamily->hasByName( aStyle ) )
+                                                    {
+                                                        aXFamily->getByName( aStyle ) >>= xStyle;
+                                                        if( xStyle.is() )
+                                                        {
+                                                            Reference< XPropertySet >
+                                                                xPropertySet( xStyle, UNO_QUERY );
+                                                            if ( xPropertySet.is() )
+                                                                mpStyleSheet->SetStyleSheet( xPropertySet, maFontCollection, nInstance, nLevel );
+                                                        }
+                                                    }
+                                                }
+                                                else
+                                                    mpStyleSheet->SetStyleSheet( xPropSet, maFontCollection, nInstance, nLevel );
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    catch( Exception& )
+                    {
+                    //
+                    }
+                }
+            }
+            for ( ; nInstance <= EPP_TEXTTYPE_QuarterBody; nInstance++ )
+            {
+
+            }
+        }
+    }
+    return bRetValue;
+}
+
+//  -----------------------------------------------------------------------
+
+sal_Bool PPTWriterBase::CreateMainNotes()
+{
+    if ( !GetPageByIndex( 0, NOTICE ) )
+        return FALSE;
+    SetCurrentStyleSheet( 0 );
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XMasterPageTarget >
+        aXMasterPageTarget( mXDrawPage, ::com::sun::star::uno::UNO_QUERY );
+
+    if ( !aXMasterPageTarget.is() )
+        return FALSE;
+
+    mXDrawPage = aXMasterPageTarget->getMasterPage();
+    if ( !mXDrawPage.is() )
+        return FALSE;
+
+    mXPropSet = ::com::sun::star::uno::Reference<
+        ::com::sun::star::beans::XPropertySet >
+            ( mXDrawPage, ::com::sun::star::uno::UNO_QUERY );
+    if ( !mXPropSet.is() )
+        return FALSE;
+
+    mXShapes = ::com::sun::star::uno::Reference<
+        ::com::sun::star::drawing::XShapes >
+            ( mXDrawPage, ::com::sun::star::uno::UNO_QUERY );
+    if ( !mXShapes.is() )
+        return FALSE;
+
+    return ImplCreateMainNotes();
+}
+
+//  -----------------------------------------------------------------------
+
+awt::Size PPTWriterBase::MapSize( const awt::Size& rSize )
+{
+    Size aRetSize( OutputDevice::LogicToLogic( Size( rSize.Width, rSize.Height ), maMapModeSrc, maMapModeDest ) );
+
+    if ( !aRetSize.Width() )
+        aRetSize.Width()++;
+    if ( !aRetSize.Height() )
+        aRetSize.Height()++;
+    return awt::Size( aRetSize.Width(), aRetSize.Height() );
+}
+
+//  -----------------------------------------------------------------------
+
+awt::Point PPTWriterBase::MapPoint( const awt::Point& rPoint )
+{
+    Point aRet( OutputDevice::LogicToLogic( Point( rPoint.X, rPoint.Y ), maMapModeSrc, maMapModeDest ) );
+    return awt::Point( aRet.X(), aRet.Y() );
+}
+
+//  -----------------------------------------------------------------------
+
+Rectangle PPTWriterBase::MapRectangle( const awt::Rectangle& rRect )
+{
+    ::com::sun::star::awt::Point    aPoint( rRect.X, rRect.Y );
+    ::com::sun::star::awt::Size     aSize( rRect.Width, rRect.Height );
+    ::com::sun::star::awt::Point    aP( MapPoint( aPoint ) );
+    ::com::sun::star::awt::Size     aS( MapSize( aSize ) );
+    return Rectangle( Point( aP.X, aP.Y ), Size( aS.Width, aS.Height ) );
+}
+
+//  -----------------------------------------------------------------------
+
+sal_Bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup )
+{
+    while(TRUE)
+    {
+        if (  ( bGroup == FALSE ) || ( GetCurrentGroupLevel() == 0 ) )
+        {
+            Any aAny( mXShapes->getByIndex( nIndex ) );
+            aAny >>= mXShape;
+        }
+        else
+        {
+            Any aAny( GetCurrentGroupAccess()->getByIndex( GetCurrentGroupIndex() ) );
+            aAny >>= mXShape;
+        }
+        if ( !mXShape.is() )
+            break;
+
+        Any aAny( mXShape->queryInterface( ::getCppuType( (const Reference< XPropertySet >*) 0 ) ));
+        aAny >>= mXPropSet;
+
+        if ( !mXPropSet.is() )
+            break;
+        maPosition = MapPoint( mXShape->getPosition() );
+        maSize = MapSize( mXShape->getSize() );
+        maRect = Rectangle( Point( maPosition.X, maPosition.Y ), Size( maSize.Width, maSize.Height ) );
+        mType = ByteString( String( mXShape->getShapeType() ), RTL_TEXTENCODING_UTF8 );
+        mType.Erase( 0, 13 );                                   // "com.sun.star." entfernen
+        sal_uInt16 nPos = mType.Search( (const char*)"Shape" );
+        mType.Erase( nPos, 5 );
+
+        mbPresObj = mbEmptyPresObj = FALSE;
+        if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsPresentationObject" ) ) ) )
+            mAny >>= mbPresObj;
+
+        if ( mbPresObj && ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsEmptyPresentationObject" ) ) ) )
+            mAny >>= mbEmptyPresObj;
+
+        mnAngle = ( PropValue::GetPropertyValue( aAny,
+            mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "RotateAngle" ) ), sal_True ) )
+                ? *((sal_Int32*)aAny.getValue() )
+                : 0;
+
+        return TRUE;
+    }
+    return FALSE;
+}
+
+//  -----------------------------------------------------------------------
+
+sal_Int8 PPTWriterBase::GetTransition( sal_Int16 nTransitionType, sal_Int16 nTransitionSubtype, FadeEffect eEffect, sal_uInt8& nDirection )
+{
+    sal_Int8 nPPTTransitionType = 0;
+    nDirection = 0;
+
+    switch( nTransitionType )
+    {
+    case TransitionType::FADE :
+    {
+        if ( nTransitionSubtype == TransitionSubType::CROSSFADE )
+        nPPTTransitionType = PPT_TRANSITION_TYPE_SMOOTHFADE;
+        else if ( nTransitionSubtype == TransitionSubType::FADEOVERCOLOR )
+        nPPTTransitionType = PPT_TRANSITION_TYPE_FADE;
+    }
+    break;
+    case PPT_TRANSITION_TYPE_COMB :
+    {
+        nPPTTransitionType = PPT_TRANSITION_TYPE_COMB;
+        if ( nTransitionSubtype == TransitionSubType::COMBVERTICAL )
+        nDirection++;
+    }
+    break;
+    case TransitionType::PUSHWIPE :
+    {
+        nPPTTransitionType = PPT_TRANSITION_TYPE_PUSH;
+        switch( nTransitionSubtype )
+        {
+        case TransitionSubType::FROMRIGHT: nDirection = 0; break;
+        case TransitionSubType::FROMBOTTOM: nDirection = 1; break;
+        case TransitionSubType::FROMLEFT: nDirection = 2; break;
+        case TransitionSubType::FROMTOP: nDirection = 3; break;
+        }
+    }
+    break;
+    case TransitionType::PINWHEELWIPE :
+    {
+        nPPTTransitionType = PPT_TRANSITION_TYPE_WHEEL;
+        switch( nTransitionSubtype )
+        {
+        case TransitionSubType::ONEBLADE: nDirection = 1; break;
+        case TransitionSubType::TWOBLADEVERTICAL : nDirection = 2; break;
+        case TransitionSubType::THREEBLADE : nDirection = 3; break;
+        case TransitionSubType::FOURBLADE: nDirection = 4; break;
+        case TransitionSubType::EIGHTBLADE: nDirection = 8; break;
+        }
+    }
+    break;
+    case TransitionType::FANWIPE :
+    {
+        nPPTTransitionType = PPT_TRANSITION_TYPE_WEDGE;
+    }
+    break;
+    case TransitionType::ELLIPSEWIPE :
+    {
+        nPPTTransitionType = PPT_TRANSITION_TYPE_CIRCLE;
+    }
+    break;
+    case TransitionType::FOURBOXWIPE :
+    {
+        nPPTTransitionType = PPT_TRANSITION_TYPE_PLUS;
+    }
+    break;
+    case TransitionType::IRISWIPE :
+    {
+        switch( nTransitionSubtype ) {
+        case TransitionSubType::RECTANGLE:
+            nPPTTransitionType = PPT_TRANSITION_TYPE_ZOOM;
+            nDirection = (eEffect == FadeEffect_FADE_FROM_CENTER) ? 0 : 1;
+            break;
+        default:
+            nPPTTransitionType = PPT_TRANSITION_TYPE_DIAMOND;
+            break;
+        }
+    }
+    break;
+    }
+
+    return nPPTTransitionType;
+}
+
+sal_Int8 PPTWriterBase::GetTransition( FadeEffect eEffect, sal_uInt8& nDirection )
+{
+    sal_Int8 nPPTTransitionType = 0;
+
+    switch ( eEffect )
+    {
+    default :
+    case FadeEffect_RANDOM :
+        nPPTTransitionType = PPT_TRANSITION_TYPE_RANDOM;
+        break;
+
+    case FadeEffect_HORIZONTAL_STRIPES :
+        nDirection++;
+    case FadeEffect_VERTICAL_STRIPES :
+        nPPTTransitionType = PPT_TRANSITION_TYPE_BLINDS;
+        break;
+
+    case FadeEffect_VERTICAL_CHECKERBOARD :
+        nDirection++;
+    case FadeEffect_HORIZONTAL_CHECKERBOARD :
+        nPPTTransitionType = PPT_TRANSITION_TYPE_CHECKER;
+        break;
+
+    case FadeEffect_MOVE_FROM_UPPERLEFT :
+        nDirection++;
+    case FadeEffect_MOVE_FROM_UPPERRIGHT :
+        nDirection++;
+    case FadeEffect_MOVE_FROM_LOWERLEFT :
+        nDirection++;
+    case FadeEffect_MOVE_FROM_LOWERRIGHT :
+        nDirection++;
+    case FadeEffect_MOVE_FROM_TOP :
+        nDirection++;
+    case FadeEffect_MOVE_FROM_LEFT :
+        nDirection++;
+    case FadeEffect_MOVE_FROM_BOTTOM :
+        nDirection++;
+    case FadeEffect_MOVE_FROM_RIGHT :
+        nPPTTransitionType = PPT_TRANSITION_TYPE_COVER;
+        break;
+
+    case FadeEffect_DISSOLVE :
+        nPPTTransitionType = PPT_TRANSITION_TYPE_DISSOLVE;
+        break;
+
+    case FadeEffect_VERTICAL_LINES :
+        nDirection++;
+    case FadeEffect_HORIZONTAL_LINES :
+        nPPTTransitionType = PPT_TRANSITION_TYPE_RANDOM_BARS;
+        break;
+
+    case FadeEffect_CLOSE_HORIZONTAL :
+        nDirection++;
+    case FadeEffect_OPEN_HORIZONTAL :
+        nDirection++;
+    case FadeEffect_CLOSE_VERTICAL :
+        nDirection++;
+    case FadeEffect_OPEN_VERTICAL :
+        nPPTTransitionType = PPT_TRANSITION_TYPE_SPLIT;
+        break;
+
+    case FadeEffect_FADE_FROM_UPPERLEFT :
+        nDirection++;
+    case FadeEffect_FADE_FROM_UPPERRIGHT :
+        nDirection++;
+    case FadeEffect_FADE_FROM_LOWERLEFT :
+        nDirection++;
+    case FadeEffect_FADE_FROM_LOWERRIGHT :
+        nDirection += 4;
+        nPPTTransitionType = PPT_TRANSITION_TYPE_STRIPS;
+        break;
+
+    case FadeEffect_UNCOVER_TO_LOWERRIGHT :
+        nDirection++;
+    case FadeEffect_UNCOVER_TO_LOWERLEFT :
+        nDirection++;
+    case FadeEffect_UNCOVER_TO_UPPERRIGHT :
+        nDirection++;
+    case FadeEffect_UNCOVER_TO_UPPERLEFT :
+        nDirection++;
+    case FadeEffect_UNCOVER_TO_BOTTOM :
+        nDirection++;
+    case FadeEffect_UNCOVER_TO_RIGHT :
+        nDirection++;
+    case FadeEffect_UNCOVER_TO_TOP :
+        nDirection++;
+    case FadeEffect_UNCOVER_TO_LEFT :
+        nPPTTransitionType = PPT_TRANSITION_TYPE_PULL;
+        break;
+
+    case FadeEffect_FADE_FROM_TOP :
+        nDirection++;
+    case FadeEffect_FADE_FROM_LEFT :
+        nDirection++;
+    case FadeEffect_FADE_FROM_BOTTOM :
+        nDirection++;
+    case FadeEffect_FADE_FROM_RIGHT :
+        nPPTTransitionType = PPT_TRANSITION_TYPE_WIPE;
+        break;
+
+    case FadeEffect_ROLL_FROM_TOP :
+        nDirection++;
+    case FadeEffect_ROLL_FROM_LEFT :
+        nDirection++;
+    case FadeEffect_ROLL_FROM_BOTTOM :
+        nDirection++;
+    case FadeEffect_ROLL_FROM_RIGHT :
+        nPPTTransitionType = PPT_TRANSITION_TYPE_WIPE;
+        break;
+
+    case FadeEffect_FADE_TO_CENTER :
+        nDirection++;
+    case FadeEffect_FADE_FROM_CENTER :
+        nPPTTransitionType = PPT_TRANSITION_TYPE_ZOOM;
+        break;
+
+    case FadeEffect_NONE :
+        nDirection = 2;
+        break;
+    }
+
+    return nPPTTransitionType;
+}
+
+//  -----------------------------------------------------------------------
+
+sal_Bool PPTWriterBase::ContainsOtherShapeThanPlaceholders( sal_Bool bForOOMLX )
+{
+    sal_uInt32 nShapes = mXShapes->getCount();
+    sal_Bool bOtherThanPlaceHolders = FALSE;
+
+    if ( nShapes )
+    for ( sal_uInt32 nIndex = 0; ( nIndex < nShapes ) && ( bOtherThanPlaceHolders == FALSE ); nIndex++ ) {
+        if ( GetShapeByIndex( nIndex ) && mType != "drawing.Page" ) {
+        if( bForOOMLX &&
+            ( mType == "presentation.Page" ||
+              mType == "presentation.Notes" ) ) {
+            Reference< XSimpleText > rXText( mXShape, UNO_QUERY );
+
+            if( rXText.is() && rXText->getString().getLength() != 0 )
+            bOtherThanPlaceHolders = TRUE;
+        } else
+            bOtherThanPlaceHolders = TRUE;
+        }
+        DBG(printf("mType == %s\n", mType.GetBuffer()));
+    }
+
+    return bOtherThanPlaceHolders;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
new file mode 100644
index 000000000000..2170ba38211e
--- /dev/null
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -0,0 +1,2079 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <hash_map>
+#include <stdio.h>
+#include <oox/drawingml/chart/chartconverter.hxx>
+#include <oox/core/tokens.hxx>
+#include <epptooxml.hxx>
+#include <epptdef.hxx>
+#include <oox/export/shapes.hxx>
+
+#include <cppuhelper/factory.hxx>
+#include <sax/fshelper.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <filter/msfilter/escherex.hxx>
+#include <tools/poly.hxx>
+
+#include <com/sun/star/animations/AnimationAdditiveMode.hpp>
+#include <com/sun/star/animations/AnimationCalcMode.hpp>
+#include <com/sun/star/animations/AnimationFill.hpp>
+#include <com/sun/star/animations/AnimationNodeType.hpp>
+#include <com/sun/star/animations/AnimationRestart.hpp>
+#include <com/sun/star/animations/AnimationValueType.hpp>
+#include <com/sun/star/animations/Event.hpp>
+#include <com/sun/star/animations/EventTrigger.hpp>
+#include <com/sun/star/animations/Timing.hpp>
+#include <com/sun/star/animations/ValuePair.hpp>
+#include <com/sun/star/animations/XAnimateSet.hpp>
+#include <com/sun/star/animations/XAnimationNode.hpp>
+#include <com/sun/star/animations/XAnimationNodeSupplier.hpp>
+#include <com/sun/star/animations/XTransitionFilter.hpp>
+#include <com/sun/star/beans/Property.hpp>
+#include <com/sun/star/beans/XPropertySetInfo.hpp>
+#include <com/sun/star/container/XEnumerationAccess.hpp>
+#include <com/sun/star/drawing/FillStyle.hpp>
+#include <com/sun/star/drawing/RectanglePoint.hpp>
+#include <com/sun/star/presentation/AnimationSpeed.hpp>
+#include <com/sun/star/presentation/EffectNodeType.hpp>
+#include <com/sun/star/text/XSimpleText.hpp>
+
+#include <oox/export/utils.hxx>
+
+#include "pptexanimations.hxx"
+
+// presentation namespaces
+#define PNMSS         FSNS( XML_xmlns, XML_a ), "http://schemas.openxmlformats.org/drawingml/2006/main", \
+                      FSNS( XML_xmlns, XML_p ), "http://schemas.openxmlformats.org/presentationml/2006/main", \
+                      FSNS( XML_xmlns, XML_r ), "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+
+using ::rtl::OString;
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::animations;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::drawing;
+using namespace ::com::sun::star::presentation;
+using namespace ::com::sun::star::uno;
+using namespace ::ppt;
+using ::com::sun::star::beans::XPropertySet;
+using ::com::sun::star::beans::XPropertySetInfo;
+using ::com::sun::star::lang::XMultiServiceFactory;
+using ::com::sun::star::container::XIndexAccess;
+using ::com::sun::star::frame::XModel;
+using ::com::sun::star::io::XOutputStream;
+using ::com::sun::star::task::XStatusIndicator;
+using ::com::sun::star::text::XSimpleText;
+using ::sax_fastparser::FastSerializerHelper;
+using ::sax_fastparser::FSHelperPtr;
+
+void dump_pset(Reference< XPropertySet > rXPropSet);
+
+#define IDS(x) (OString(#x " ") + OString::valueOf( mnShapeIdMax++ )).getStr()
+
+namespace oox {
+    using namespace drawingml;
+    namespace core {
+
+class PowerPointShapeExport : public ShapeExport
+{
+    PowerPointExport&   mrExport;
+    PageType            mePageType;
+    sal_Bool            mbMaster;
+public:
+    PowerPointShapeExport( FSHelperPtr pFS, ShapeHashMap* pShapeMap, PowerPointExport* pFB );
+    void                SetMaster( sal_Bool bMaster );
+    void                SetPageType( PageType ePageType );
+    ShapeExport&        WriteNonVisualProperties( Reference< XShape > xShape );
+    ShapeExport&        WriteTextShape( Reference< XShape > xShape );
+    ShapeExport&        WriteUnknownShape( Reference< XShape > xShape );
+    ShapeExport&        WritePlaceholderShape( Reference< XShape > xShape, PlaceholderType ePlaceholder );
+    ShapeExport&        WritePageShape( Reference< XShape > xShape, PageType ePageType, sal_Bool bPresObj );
+
+    // helper parts
+    sal_Bool WritePlaceholder( Reference< XShape > xShape, PlaceholderType ePlaceholder, sal_Bool bMaster );
+};
+
+    PowerPointShapeExport::PowerPointShapeExport( FSHelperPtr pFS, ShapeHashMap* pShapeMap, PowerPointExport* pFB )
+        : ShapeExport( XML_p, pFS, pShapeMap, pFB )
+    , mrExport( *pFB )
+{
+}
+
+void PowerPointShapeExport::SetMaster( sal_Bool bMaster )
+{
+    mbMaster = bMaster;
+}
+
+void PowerPointShapeExport::SetPageType( PageType ePageType )
+{
+    mePageType = ePageType;
+}
+
+ShapeExport& PowerPointShapeExport::WriteNonVisualProperties( Reference< XShape > )
+{
+    GetFS()->singleElementNS( XML_p, XML_nvPr, FSEND );
+
+    return *this;
+}
+
+ShapeExport& PowerPointShapeExport::WriteTextShape( Reference< XShape > xShape )
+{
+    OUString sShapeType = xShape->getShapeType();
+
+    DBG(printf( "shape(text): %s\n", USS(sShapeType) ));
+
+    if( sShapeType.equalsAscii( "com.sun.star.drawing.TextShape" ) )
+    {
+    ShapeExport::WriteTextShape( xShape );
+    }
+    else if( sShapeType.equalsAscii( "com.sun.star.presentation.DateTimeShape" ) )
+    {
+        if( !WritePlaceholder( xShape, DateAndTime, mbMaster ) )
+            ShapeExport::WriteTextShape( xShape );
+    }
+    else if( sShapeType.equalsAscii( "com.sun.star.presentation.FooterShape" ) )
+    {
+        if( !WritePlaceholder( xShape, Footer, mbMaster ) )
+            ShapeExport::WriteTextShape( xShape );
+    }
+    else if( sShapeType.equalsAscii( "com.sun.star.presentation.HeaderShape" ) )
+    {
+        if( !WritePlaceholder( xShape, Header, mbMaster ) )
+            ShapeExport::WriteTextShape( xShape );
+    }
+    else if( sShapeType.equalsAscii( "com.sun.star.presentation.NotesShape" ) )
+    {
+        if( mePageType == NOTICE && mrExport.GetPresObj() )
+            WritePlaceholderShape( xShape, Notes );
+        else
+            ShapeExport::WriteTextShape( xShape );
+    }
+    else if( sShapeType.equalsAscii( "com.sun.star.presentation.OutlinerShape" ) )
+    {
+        if( !WritePlaceholder( xShape, Outliner, mbMaster ) )
+            ShapeExport::WriteTextShape( xShape );
+    }
+    else if( sShapeType.equalsAscii( "com.sun.star.presentation.SlideNumberShape" ) )
+    {
+        if( !WritePlaceholder( xShape, SlideNumber, mbMaster ) )
+            ShapeExport::WriteTextShape( xShape );
+    }
+    else if( sShapeType.equalsAscii( "com.sun.star.presentation.TitleTextShape" ) )
+    {
+        if( !WritePlaceholder( xShape, Title, mbMaster ) )
+            ShapeExport::WriteTextShape( xShape );
+    }
+
+    return *this;
+}
+
+ShapeExport& PowerPointShapeExport::WriteUnknownShape( Reference< XShape > xShape )
+{
+    OUString sShapeType = xShape->getShapeType();
+
+    DBG(printf( "shape(unknown): %s\n", USS(sShapeType) ));
+
+    if( sShapeType.equalsAscii( "com.sun.star.drawing.GroupShape" ) )
+    {
+        Reference< XIndexAccess > rXIndexAccess( xShape, UNO_QUERY );
+
+        mrExport.EnterGroup( rXIndexAccess );
+        DBG(printf( "enter group\n" ));
+    }
+    else if( sShapeType.equalsAscii( "com.sun.star.drawing.PageShape" ) )
+    {
+        WritePageShape( xShape, mePageType, mrExport.GetPresObj() );
+    }
+    else if( sShapeType.equalsAscii( "com.sun.star.presentation.SubtitleShape" ) )
+    {
+        if( !WritePlaceholder( xShape, Subtitle, mbMaster ) )
+            ShapeExport::WriteTextShape( xShape );
+    }
+
+    return *this;
+}
+
+PowerPointExport::PowerPointExport( const Reference< XMultiServiceFactory > & rSMgr  )
+    : XmlFilterBase( rSMgr ),
+      PPTWriterBase(),
+      mnLayoutFileIdMax( 1 ),
+      mnSlideIdMax( 1 << 8 ),
+      mnSlideMasterIdMax( 1 << 31 ),
+      mnAnimationNodeIdMax( 1 )
+{
+    memset( mLayoutInfo, 0, sizeof(mLayoutInfo) );
+}
+
+PowerPointExport::~PowerPointExport()
+{
+}
+
+bool PowerPointExport::importDocument() throw()
+{
+    return false;
+}
+
+bool PowerPointExport::exportDocument() throw()
+{
+    DrawingML::ResetCounters();
+    maShapeMap.clear ();
+
+    addRelation( US( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" ), S( "ppt/presentation.xml" ) );
+
+    mPresentationFS = openFragmentStreamWithSerializer( US( "ppt/presentation.xml" ),
+                                                    US( "application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml" ) );
+
+    addRelation( mPresentationFS->getOutputStream(),
+                 US( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme" ),
+                 US( "theme/theme1.xml" ) );
+
+    mPresentationFS->startElementNS( XML_p, XML_presentation, PNMSS, FSEND );
+
+    mXModel.set( getModel(), UNO_QUERY );
+    mXStatusIndicator.set( getStatusIndicator(), UNO_QUERY );
+
+    exportPPT();
+
+    mPresentationFS->singleElementNS( XML_p, XML_sldSz,
+                                      XML_cx, IS( PPTtoEMU( maDestPageSize.Width ) ),
+                                      XML_cy, IS( PPTtoEMU( maDestPageSize.Height ) ),
+                                      FSEND );
+    // for some reason if added before slides list it will not load the slides (alas with error reports) in mso
+    mPresentationFS->singleElementNS( XML_p, XML_notesSz,
+                                      XML_cx, IS( PPTtoEMU( maNotesPageSize.Width ) ),
+                                      XML_cy, IS( PPTtoEMU( maNotesPageSize.Height ) ),
+                                      FSEND );
+
+    mPresentationFS->endElementNS( XML_p, XML_presentation );
+    mPresentationFS.reset();
+
+    commitStorage();
+
+    maShapeMap.clear ();
+
+    return true;
+}
+
+void PowerPointExport::ImplWriteBackground( FSHelperPtr pFS, Reference< XPropertySet > rXPropSet )
+{
+    FillStyle aFillStyle( FillStyle_NONE );
+    if ( ImplGetPropertyValue( rXPropSet, S( "FillStyle" ) ) )
+        mAny >>= aFillStyle;
+
+    if( aFillStyle == FillStyle_BITMAP ) {
+        //DBG(printf ("FillStyle_BITMAP properties\n"));
+        //DBG(dump_pset(rXPropSet));
+    }
+
+    if( aFillStyle == FillStyle_NONE ||
+        aFillStyle == FillStyle_GRADIENT ||
+        aFillStyle == FillStyle_HATCH )
+        return;
+
+    pFS->startElementNS( XML_p, XML_bg, FSEND );
+    pFS->startElementNS( XML_p, XML_bgPr, FSEND );
+
+    PowerPointShapeExport( pFS, &maShapeMap, this ).WriteFill( rXPropSet );
+
+    pFS->endElementNS( XML_p, XML_bgPr );
+    pFS->endElementNS( XML_p, XML_bg );
+}
+
+#define MINIMAL_SPTREE "<p:spTree>\
+      <p:nvGrpSpPr>\
+        <p:cNvPr id=\"1\" name=\"\"/>\
+        <p:cNvGrpSpPr/>\
+        <p:nvPr/>\
+      </p:nvGrpSpPr>\
+      <p:grpSpPr>\
+        <a:xfrm>\
+          <a:off x=\"0\" y=\"0\"/>\
+          <a:ext cx=\"0\" cy=\"0\"/>\
+          <a:chOff x=\"0\" y=\"0\"/>\
+          <a:chExt cx=\"0\" cy=\"0\"/>\
+        </a:xfrm>\
+      </p:grpSpPr>\
+    </p:spTree>"
+
+#define MAIN_GROUP \
+     "<p:nvGrpSpPr>\
+        <p:cNvPr id=\"1\" name=\"\"/>\
+        <p:cNvGrpSpPr/>\
+        <p:nvPr/>\
+      </p:nvGrpSpPr>\
+      <p:grpSpPr>\
+        <a:xfrm>\
+          <a:off x=\"0\" y=\"0\"/>\
+          <a:ext cx=\"0\" cy=\"0\"/>\
+          <a:chOff x=\"0\" y=\"0\"/>\
+          <a:chExt cx=\"0\" cy=\"0\"/>\
+        </a:xfrm>\
+      </p:grpSpPr>"
+
+#define GETA(propName) \
+    ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( #propName ) ) )
+
+#define GET(variable, propName) \
+    if ( GETA(propName) ) \
+        mAny >>= variable;
+
+const char* PowerPointExport::GetSideDirection( sal_uInt8 nDirection )
+{
+    const char* pDirection = NULL;
+
+    switch( nDirection ) {
+    case 0:
+        pDirection = "r";
+        break;
+    case 1:
+        pDirection = "d";
+        break;
+    case 2:
+        pDirection = "l";
+        break;
+    case 3:
+        pDirection = "u";
+        break;
+    }
+
+    return pDirection;
+}
+
+const char* PowerPointExport::GetCornerDirection( sal_uInt8 nDirection )
+{
+    const char* pDirection = NULL;
+
+    switch( nDirection ) {
+    case 4:
+        pDirection = "rd";
+        break;
+    case 5:
+        pDirection = "ld";
+        break;
+    case 6:
+        pDirection = "ru";
+        break;
+    case 7:
+        pDirection = "lu";
+        break;
+    }
+
+    return pDirection;
+}
+
+const char* PowerPointExport::Get8Direction( sal_uInt8 nDirection )
+{
+    const char* pDirection = GetSideDirection( nDirection );
+
+    if( !pDirection )
+    pDirection = GetCornerDirection( nDirection );
+
+    return pDirection;
+}
+
+void PowerPointExport::WriteTransition( FSHelperPtr pFS )
+{
+    FadeEffect eFadeEffect = FadeEffect_NONE;
+    GET( eFadeEffect, Effect );
+
+    OSL_TRACE("fade effect %d", eFadeEffect);
+
+    sal_Int16 nTransitionType = 0, nTransitionSubtype = 0;
+    sal_Int8 nPPTTransitionType = 0;
+    sal_uInt8 nDirection = 0;
+
+    if( GETA( TransitionType ) && ( mAny >>= nTransitionType ) &&
+    GETA( TransitionSubtype ) && ( mAny >>= nTransitionSubtype ) )
+    nPPTTransitionType = GetTransition( nTransitionType, nTransitionSubtype, eFadeEffect, nDirection );
+
+    if( !nPPTTransitionType && eFadeEffect != FadeEffect_NONE )
+    nPPTTransitionType = GetTransition( eFadeEffect, nDirection );
+
+    if( nPPTTransitionType ) {
+    AnimationSpeed animationSpeed = AnimationSpeed_MEDIUM;
+    const char* speed = NULL;
+    sal_Int32 advanceTiming = -1;
+    sal_Int32 changeType = 0;
+
+    if( GETA( Speed ) ) {
+        mAny >>= animationSpeed;
+
+        switch( animationSpeed ) {
+        default:
+        case AnimationSpeed_MEDIUM:
+            speed = "med";
+            break;
+        case AnimationSpeed_SLOW:
+            speed = "slow";
+            break;
+        case AnimationSpeed_FAST:
+            break;
+        }
+    }
+
+    if( GETA( Change ) )
+        mAny >>= changeType;
+
+    // 1 means automatic, 2 half automatic - not sure what it means - at least I don't see it in UI
+    if( changeType == 1 && GETA( Duration ) )
+        mAny >>= advanceTiming;
+
+    pFS->startElementNS( XML_p, XML_transition,
+                 XML_spd, speed,
+                 XML_advTm, advanceTiming != -1 ? I32S( advanceTiming*1000 ) : NULL,
+                 FSEND );
+
+    sal_Int32 nTransition = 0;
+    const char* pDirection = NULL;
+    const char* pOrientation = NULL;
+    const char* pThruBlk = NULL;
+    const char* pSpokes = NULL;
+    char pSpokesTmp[2] = "0";
+
+    switch( nPPTTransitionType ) {
+        case PPT_TRANSITION_TYPE_BLINDS:
+        nTransition = XML_blinds;
+        pDirection = ( nDirection == 0) ? "vert" : "horz";
+        break;
+        case PPT_TRANSITION_TYPE_CHECKER:
+        nTransition = XML_checker;
+        pDirection = ( nDirection == 1) ? "vert" : "horz";
+        break;
+        case PPT_TRANSITION_TYPE_CIRCLE:
+        nTransition = XML_circle;
+        break;
+        case PPT_TRANSITION_TYPE_COMB:
+        nTransition = XML_comb;
+        pDirection = ( nDirection == 1) ? "vert" : "horz";
+        break;
+        case PPT_TRANSITION_TYPE_COVER:
+        nTransition = XML_cover;
+        pDirection = Get8Direction( nDirection );
+        break;
+// we don't have cut transition AFAIK
+//      case PPT_TRANSITION_TYPE_CUT:
+//      nTransition = XML_cut;
+//      break;
+        case PPT_TRANSITION_TYPE_DIAMOND:
+        nTransition = XML_diamond;
+        break;
+        case PPT_TRANSITION_TYPE_DISSOLVE:
+        nTransition = XML_dissolve;
+        break;
+        case PPT_TRANSITION_TYPE_FADE:
+        nTransition = XML_fade;
+        pThruBlk = "true";
+        break;
+        case PPT_TRANSITION_TYPE_SMOOTHFADE:
+        nTransition = XML_fade;
+        break;
+        case PPT_TRANSITION_TYPE_NEWSFLASH:
+        nTransition = XML_newsflash;
+        break;
+        case PPT_TRANSITION_TYPE_PLUS:
+        nTransition = XML_plus;
+        break;
+        case PPT_TRANSITION_TYPE_PULL:
+        nTransition = XML_pull;
+        pDirection = Get8Direction( nDirection );
+        break;
+        case PPT_TRANSITION_TYPE_PUSH:
+        nTransition = XML_push;
+        pDirection = GetSideDirection( nDirection );
+        break;
+        case PPT_TRANSITION_TYPE_RANDOM:
+        nTransition = XML_random;
+        break;
+        case PPT_TRANSITION_TYPE_RANDOM_BARS:
+        nTransition = XML_randomBar;
+        pDirection = ( nDirection == 1) ? "vert" : "horz";
+        break;
+        case PPT_TRANSITION_TYPE_SPLIT:
+        nTransition = XML_split;
+        pDirection = ( nDirection & 1) ? "in" : "out";
+        pOrientation = ( nDirection < 2) ? "horz" : "vert";
+        break;
+        case PPT_TRANSITION_TYPE_STRIPS:
+        nTransition = XML_strips;
+        pDirection = GetCornerDirection( nDirection );
+        break;
+        case PPT_TRANSITION_TYPE_WEDGE:
+        nTransition = XML_wedge;
+        break;
+        case PPT_TRANSITION_TYPE_WHEEL:
+        nTransition = XML_wheel;
+        if( nDirection != 4 && nDirection <= 9 ) {
+            pSpokesTmp[0] = '0' + nDirection;
+            pSpokes = pSpokesTmp;
+        }
+        break;
+        case PPT_TRANSITION_TYPE_WIPE:
+        nTransition = XML_wipe;
+        pDirection = GetSideDirection( nDirection );
+        break;
+        case PPT_TRANSITION_TYPE_ZOOM:
+        nTransition = XML_zoom;
+        pDirection = ( nDirection == 1) ? "in" : "out";
+        break;
+        case PPT_TRANSITION_TYPE_NONE:
+        default:
+        nTransition = 0;
+    }
+
+    if( nTransition )
+        pFS->singleElementNS( XML_p, nTransition,
+                  XML_dir, pDirection,
+                  XML_orient, pOrientation,
+                  XML_spokes, pSpokes,
+                  XML_thruBlk, pThruBlk,
+                  FSEND );
+
+    pFS->endElementNS( XML_p, XML_transition );
+    }
+}
+
+void PowerPointExport::WriteAnimationProperty( FSHelperPtr pFS, const Any& rAny )
+{
+    if( !rAny.hasValue() )
+    return;
+
+    switch( rAny.getValueType().getTypeClass() ) {
+    case TypeClass_STRING:
+        pFS->singleElementNS( XML_p, XML_strVal,
+                  XML_val, USS( *static_cast< const OUString* >( rAny.getValue() ) ),
+                  FSEND );
+        break;
+    default:
+        break;
+    }
+}
+
+void PowerPointExport::WriteAnimateValues( FSHelperPtr pFS, const Reference< XAnimate >& rXAnimate )
+{
+    const Sequence< double > aKeyTimes = rXAnimate->getKeyTimes();
+    if( aKeyTimes.getLength() <= 0 )
+    return;
+    const Sequence< Any > aValues = rXAnimate->getValues();
+    const OUString& sFormula = rXAnimate->getFormula();
+    const OUString& rAttributeName = rXAnimate->getAttributeName();
+
+    DBG(printf("animate values, formula: %s\n", USS( sFormula )));
+
+    pFS->startElementNS( XML_p, XML_tavLst, FSEND );
+
+    for( int i = 0; i < aKeyTimes.getLength(); i++ ) {
+    DBG(printf("animate value %d: %f\n", i, aKeyTimes[ i ]));
+    if( aValues[ i ].hasValue() ) {
+        pFS->startElementNS( XML_p, XML_tav,
+                 XML_fmla, sFormula.getLength() > 0 ? USS( sFormula ) : NULL,
+                 XML_tm, I32S( ( sal_Int32 )( aKeyTimes[ i ]*100000.0 ) ),
+                 FSEND );
+        pFS->startElementNS( XML_p, XML_val, FSEND );
+        ValuePair aPair;
+        if( aValues[ i ] >>= aPair ) {
+        WriteAnimationProperty( pFS, AnimationExporter::convertAnimateValue( aPair.First, rAttributeName ) );
+        WriteAnimationProperty( pFS, AnimationExporter::convertAnimateValue( aPair.Second, rAttributeName ) );
+        } else
+        WriteAnimationProperty( pFS, AnimationExporter::convertAnimateValue( aValues[ i ], rAttributeName ) );
+
+        pFS->endElementNS( XML_p, XML_val );
+        pFS->endElementNS( XML_p, XML_tav );
+    }
+    }
+
+    pFS->endElementNS( XML_p, XML_tavLst );
+}
+
+void PowerPointExport::WriteAnimateTo( FSHelperPtr pFS, Any aValue, const OUString& rAttributeName )
+{
+    if( !aValue.hasValue() )
+    return;
+
+    DBG(printf("to attribute name: %s\n", USS( rAttributeName )));
+
+    pFS->startElementNS( XML_p, XML_to, FSEND );
+
+    WriteAnimationProperty( pFS, AnimationExporter::convertAnimateValue( aValue, rAttributeName ) );
+
+    pFS->endElementNS( XML_p, XML_to );
+}
+
+void PowerPointExport::WriteAnimationAttributeName( FSHelperPtr pFS, const OUString& rAttributeName )
+{
+    if( ! rAttributeName.getLength() )
+    return;
+
+    pFS->startElementNS( XML_p, XML_attrNameLst, FSEND );
+
+    DBG(printf("write attribute name: %s\n", USS( rAttributeName )));
+
+    const char* sAttributeName = NULL;
+    if( rAttributeName.equalsAscii( "Visibility" ) ) {
+    sAttributeName = "style.visibility";
+    } else if( rAttributeName.equalsAscii( "X" ) ) {
+    sAttributeName = "ppt_x";
+    } else if( rAttributeName.equalsAscii( "Y" ) ) {
+    sAttributeName = "ppt_y";
+    }
+
+    pFS->startElementNS( XML_p, XML_attrName, FSEND );
+    pFS->writeEscaped( sAttributeName );
+    pFS->endElementNS( XML_p, XML_attrName );
+
+    pFS->endElementNS( XML_p, XML_attrNameLst );
+}
+
+void PowerPointExport::WriteAnimationTarget( FSHelperPtr pFS, Any aTarget )
+{
+    sal_Int32 nBegin = -1, nEnd = -1;
+    sal_Bool bParagraphTarget;
+    Reference< XShape > rXShape = AnimationExporter::getTargetElementShape( aTarget, nBegin, nEnd, bParagraphTarget );
+
+    if( rXShape.is() ) {
+    pFS->startElementNS( XML_p, XML_tgtEl, FSEND );
+    pFS->startElementNS( XML_p, XML_spTgt,
+                 XML_spid, I32S( ShapeExport::GetShapeID( rXShape, &maShapeMap ) ),
+                 FSEND );
+    if( bParagraphTarget ) {
+        pFS->startElementNS( XML_p, XML_txEl, FSEND );
+        pFS->singleElementNS( XML_p, XML_pRg,
+                  XML_st, I32S( nBegin ),
+                  XML_end, I32S( nEnd ),
+                  FSEND );
+        pFS->endElementNS( XML_p, XML_txEl );
+    }
+    pFS->endElementNS( XML_p, XML_spTgt );
+    pFS->endElementNS( XML_p, XML_tgtEl );
+    }
+}
+
+void PowerPointExport::WriteAnimationNodeAnimate( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, sal_Int32 nXmlNodeType, sal_Bool bMainSeqChild )
+{
+    Reference< XAnimate > rXAnimate( rXNode, UNO_QUERY );
+    if( !rXAnimate.is() )
+    return;
+
+    const char* pCalcMode = NULL;
+    const char* pValueType = NULL;
+    sal_Bool bSimple = ( nXmlNodeType != XML_anim );
+
+    if( !bSimple ) {
+    switch( rXAnimate->getCalcMode() ) {
+        case AnimationCalcMode::DISCRETE:
+        pCalcMode = "discrete";
+        break;
+        case AnimationCalcMode::LINEAR:
+        pCalcMode = "lin";
+        break;
+    }
+
+    switch( AnimationExporter::GetValueTypeForAttributeName( rXAnimate->getAttributeName() ) ) {
+        case AnimationValueType::STRING:
+        pValueType = "str";
+        break;
+        case AnimationValueType::NUMBER:
+        pValueType = "num";
+        break;
+        case AnimationValueType::COLOR:
+        pValueType = "clr";
+        break;
+    }
+    }
+
+    pFS->startElementNS( XML_p, nXmlNodeType,
+             XML_calcmode, pCalcMode,
+             XML_valueType, pValueType,
+             FSEND );
+    WriteAnimationNodeAnimateInside( pFS, rXNode, bMainSeqChild, bSimple );
+    pFS->endElementNS( XML_p, nXmlNodeType );
+}
+
+void PowerPointExport::WriteAnimationNodeAnimateInside( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, sal_Bool bMainSeqChild, sal_Bool bSimple )
+{
+    Reference< XAnimate > rXAnimate( rXNode, UNO_QUERY );
+    if( !rXAnimate.is() )
+    return;
+
+    const char* pAdditive = NULL;
+
+    if( !bSimple ) {
+    switch( rXAnimate->getAdditive() ) {
+        case AnimationAdditiveMode::BASE:
+        pAdditive = "base";
+        break;
+        case AnimationAdditiveMode::SUM:
+        pAdditive = "sum";
+        break;
+        case AnimationAdditiveMode::REPLACE:
+        pAdditive = "repl";
+        break;
+        case AnimationAdditiveMode::MULTIPLY:
+        pAdditive = "mult";
+        break;
+        case AnimationAdditiveMode::NONE:
+        pAdditive = "none";
+        break;
+    }
+    }
+
+    pFS->startElementNS( XML_p, XML_cBhvr,
+             XML_additive, pAdditive,
+             FSEND );
+    WriteAnimationNodeCommonPropsStart( pFS, rXNode, TRUE, bMainSeqChild );
+    WriteAnimationTarget( pFS, rXAnimate->getTarget() );
+    WriteAnimationAttributeName( pFS, rXAnimate->getAttributeName() );
+    pFS->endElementNS( XML_p, XML_cBhvr );
+    WriteAnimateValues( pFS, rXAnimate );
+    WriteAnimateTo( pFS, rXAnimate->getTo(), rXAnimate->getAttributeName() );
+}
+
+void PowerPointExport::WriteAnimationCondition( FSHelperPtr pFS, const char* pDelay, const char* pEvent, double fDelay, sal_Bool bHasFDelay )
+{
+    if( bHasFDelay || pDelay || pEvent ) {
+    if( !pEvent )
+        pFS->singleElementNS( XML_p, XML_cond,
+                  XML_delay, bHasFDelay ? I64S( (sal_uInt32) (fDelay*1000.0) ) : pDelay,
+                  FSEND );
+    else {
+        pFS->startElementNS( XML_p, XML_cond,
+                 XML_delay, bHasFDelay ? I64S( (sal_uInt32) (fDelay*1000.0) ) : pDelay,
+                 XML_evt, pEvent,
+                 FSEND );
+
+        pFS->startElementNS( XML_p, XML_tgtEl, FSEND );
+        pFS->singleElementNS( XML_p, XML_sldTgt, FSEND );
+        pFS->endElementNS( XML_p, XML_tgtEl );
+
+        pFS->endElementNS( XML_p, XML_cond );
+    }
+    }
+}
+
+void PowerPointExport::WriteAnimationCondition( FSHelperPtr pFS, Any& rAny, sal_Bool bWriteEvent, sal_Bool bMainSeqChild )
+{
+    sal_Bool bHasFDelay = FALSE;
+    double fDelay = 0;
+    Timing eTiming;
+    Event aEvent;
+    const char* pDelay = NULL;
+    const char* pEvent = NULL;
+
+    if( rAny >>= fDelay )
+    bHasFDelay = TRUE;
+    else if( rAny >>= eTiming ) {
+    if( eTiming == Timing_INDEFINITE )
+        pDelay = "indefinite";
+    } else if( rAny >>= aEvent ) {
+    // TODO
+    DBG(printf ("animation condition event: TODO\n"));
+    DBG(printf ("event offset has value: %d triger: %d source has value: %d\n", aEvent.Offset.hasValue(), aEvent.Trigger, aEvent.Source.hasValue()));
+
+    if( !bWriteEvent && aEvent.Trigger == EventTrigger::ON_NEXT && bMainSeqChild )
+        pDelay = "indefinite";
+    else if( bWriteEvent ) {
+        switch( aEvent.Trigger ) {
+        case EventTrigger::ON_NEXT:
+            pEvent = "onNext";
+            break;
+        case EventTrigger::ON_PREV:
+            pEvent = "onPrev";
+            break;
+        case EventTrigger::BEGIN_EVENT:
+            pEvent = "begin";
+            break;
+        case EventTrigger::END_EVENT:
+            pEvent = "end";
+            break;
+        case EventTrigger::ON_BEGIN:
+            pEvent = "onBegin";
+            break;
+        case EventTrigger::ON_END:
+            pEvent = "onEnd";
+            break;
+        case EventTrigger::ON_CLICK:
+            pEvent = "onClick";
+            break;
+        case EventTrigger::ON_DBL_CLICK:
+            pEvent = "onDblClick";
+            break;
+        case EventTrigger::ON_STOP_AUDIO:
+            pEvent = "onStopAudio";
+            break;
+        case EventTrigger::ON_MOUSE_ENTER:
+            pEvent = "onMouseOver";   // not exact?
+            break;
+        case EventTrigger::ON_MOUSE_LEAVE:
+            pEvent = "onMouseOut";
+            break;
+        }
+    }
+
+    if( aEvent.Offset >>= fDelay ) {
+        bHasFDelay = TRUE;
+        DBG(printf ("event offset: %f\n", fDelay));
+    } else if( aEvent.Offset >>= eTiming ) {
+        if( eTiming == Timing_INDEFINITE )
+        pDelay = "indefinite";
+        DBG(printf ("event offset timing: %d\n", eTiming));
+    }
+    }
+
+    WriteAnimationCondition( pFS, pDelay, pEvent, fDelay, bHasFDelay );
+}
+
+void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, sal_Bool bSingle, sal_Bool bMainSeqChild )
+{
+    const char* pDuration = NULL;
+    const char* pRestart = NULL;
+    const char* pNodeType = NULL;
+    const char* pPresetClass = NULL;
+    const char* pFill = NULL;
+    double fDuration = 0;
+    Any aAny;
+
+    aAny = rXNode->getDuration();
+    if( aAny.hasValue() ) {
+    Timing eTiming;
+
+    if( aAny >>= eTiming ) {
+        if( eTiming == Timing_INDEFINITE )
+        pDuration = "indefinite";
+    } else
+        aAny >>= fDuration;
+    }
+
+    switch( rXNode->getRestart() ) {
+    case AnimationRestart::ALWAYS:
+        pRestart = "always";
+        break;
+    case AnimationRestart::WHEN_NOT_ACTIVE:
+        pRestart = "whenNotActive";
+        break;
+    case AnimationRestart::NEVER:
+        pRestart = "never";
+        break;
+    }
+
+    const Sequence< NamedValue > aUserData = rXNode->getUserData();
+    const Any* pAny[ DFF_ANIM_PROPERTY_ID_COUNT ];
+    AnimationExporter::GetUserData( aUserData, pAny, sizeof( pAny ) );
+
+    sal_Int16 nType = 0;
+    if( pAny[ DFF_ANIM_NODE_TYPE ] && ( *pAny[ DFF_ANIM_NODE_TYPE ] >>= nType ) ) {
+    switch( nType ) {
+        case EffectNodeType::TIMING_ROOT:
+        pNodeType = "tmRoot";
+        if( !pDuration )
+            pDuration = "indefinite";
+        if( !pRestart )
+            pRestart = "never";
+        break;
+        case EffectNodeType::MAIN_SEQUENCE:
+        pNodeType = "mainSeq";
+        break;
+        case EffectNodeType::ON_CLICK:
+        pNodeType = "clickEffect";
+        break;
+        case EffectNodeType::AFTER_PREVIOUS:
+        pNodeType = "afterEffect";
+        break;
+        case EffectNodeType::WITH_PREVIOUS:
+        pNodeType = "withEffect";
+        break;
+        case EffectNodeType::INTERACTIVE_SEQUENCE:
+        pNodeType = "interactiveSeq";
+        break;
+    }
+    }
+
+    sal_uInt32 nPresetClass = DFF_ANIM_PRESS_CLASS_USER_DEFINED;
+    if ( pAny[ DFF_ANIM_PRESET_CLASS ] ) {
+    if ( *pAny[ DFF_ANIM_PRESET_CLASS ] >>= nPresetClass ) {
+        switch( nPresetClass ) {
+        case EffectPresetClass::ENTRANCE:
+            pPresetClass = "entr";
+            break;
+        case EffectPresetClass::EXIT:
+            pPresetClass = "exit";
+            break;
+        case EffectPresetClass::EMPHASIS:
+            pPresetClass = "emph";
+            break;
+        case EffectPresetClass::MOTIONPATH:
+            pPresetClass = "path";
+            break;
+        case EffectPresetClass::OLEACTION:
+            pPresetClass = "verb";  // ?
+            break;
+        case EffectPresetClass::MEDIACALL:
+            pPresetClass = "mediacall";
+            break;
+        }
+    }
+    }
+
+    sal_uInt32 nPresetId = 0;
+    sal_Bool bPresetId = FALSE;
+    if ( pAny[ DFF_ANIM_PRESET_ID ] ) {
+    rtl::OUString sPreset;
+    if ( *pAny[ DFF_ANIM_PRESET_ID ] >>= sPreset )
+        nPresetId = AnimationExporter::GetPresetID( sPreset, nPresetClass, bPresetId );
+    }
+
+    sal_uInt32 nPresetSubType = 0;
+    sal_Bool bPresetSubType = FALSE;
+    if ( pAny[ DFF_ANIM_PRESET_SUB_TYPE ] ) {
+    rtl::OUString sPresetSubType;
+    if ( *pAny[ DFF_ANIM_PRESET_SUB_TYPE ] >>= sPresetSubType ) {
+        nPresetSubType = AnimationExporter::TranslatePresetSubType( nPresetClass, nPresetId, sPresetSubType );
+        bPresetSubType = sal_True;
+    }
+    }
+
+    if( nType != EffectNodeType::TIMING_ROOT && nType != EffectNodeType::MAIN_SEQUENCE ) {
+    // it doesn't seem to work right on root and mainseq nodes
+    sal_Int16 nFill = AnimationExporter::GetFillMode( rXNode, AnimationFill::AUTO );
+    switch( nFill ) {
+        case AnimationFill::FREEZE:
+        pFill = "freeze";
+        break;
+        case AnimationFill::HOLD:
+        pFill = "hold";
+        break;
+        case AnimationFill::REMOVE:
+        pFill = "remove";
+        break;
+        case AnimationFill::TRANSITION:
+        pFill = "transition";
+        break;
+    }
+    }
+
+    pFS->startElementNS( XML_p, XML_cTn,
+             XML_id, I64S( mnAnimationNodeIdMax ++ ),
+             XML_dur, fDuration != 0 ? I32S( (sal_Int32) ( fDuration * 1000.0 ) ) : pDuration,
+             XML_restart, pRestart,
+             XML_nodeType, pNodeType,
+             XML_fill, pFill,
+             XML_presetClass, pPresetClass,
+             XML_presetID, bPresetId ? I64S( nPresetId ) : NULL,
+             XML_presetSubtype, bPresetSubType ? I64S( nPresetSubType ) : NULL,
+             FSEND );
+
+    aAny = rXNode->getBegin();
+    if( aAny.hasValue() ) {
+    Sequence< Any > aCondSeq;
+
+    pFS->startElementNS( XML_p, XML_stCondLst, FSEND );
+    if( aAny >>= aCondSeq ) {
+        for( int i = 0; i < aCondSeq.getLength(); i ++ )
+        WriteAnimationCondition( pFS, aCondSeq[ i ], FALSE, bMainSeqChild );
+    } else
+        WriteAnimationCondition( pFS, aAny, FALSE, bMainSeqChild );
+    pFS->endElementNS( XML_p, XML_stCondLst );
+    }
+
+    aAny = rXNode->getEnd();
+    if( aAny.hasValue() ) {
+    Sequence< Any > aCondSeq;
+
+    pFS->startElementNS( XML_p, XML_endCondLst, FSEND );
+    if( aAny >>= aCondSeq ) {
+        for( int i = 0; i < aCondSeq.getLength(); i ++ )
+        WriteAnimationCondition( pFS, aCondSeq[ i ], FALSE, bMainSeqChild );
+    } else
+        WriteAnimationCondition( pFS, aAny, FALSE, bMainSeqChild );
+    pFS->endElementNS( XML_p, XML_stCondLst );
+    }
+
+    Reference< XEnumerationAccess > xEnumerationAccess( rXNode, UNO_QUERY );
+    if( xEnumerationAccess.is() ) {
+    Reference< XEnumeration > xEnumeration( xEnumerationAccess->createEnumeration(), UNO_QUERY );
+    if( xEnumeration.is() ) {
+        DBG(printf ("-----\n"));
+
+        pFS->startElementNS( XML_p, XML_childTnLst, FSEND );
+
+        while( xEnumeration->hasMoreElements() ) {
+        Reference< XAnimationNode > xChildNode( xEnumeration->nextElement(), UNO_QUERY );
+        if( xChildNode.is() )
+            WriteAnimationNode( pFS, xChildNode, nType == EffectNodeType::MAIN_SEQUENCE );
+        }
+
+        pFS->endElementNS( XML_p, XML_childTnLst );
+
+        DBG(printf ("-----\n"));
+    }
+    }
+
+    if( bSingle )
+    pFS->endElementNS( XML_p, XML_cTn );
+}
+
+void PowerPointExport::WriteAnimationNodeCommonPropsEnd( FSHelperPtr pFS )
+{
+    pFS->endElementNS( XML_p, XML_cTn );
+}
+
+void PowerPointExport::WriteAnimationNodeSeq( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, sal_Int32, sal_Bool bMainSeqChild )
+{
+    DBG(printf ("write animation node SEQ\n"));
+
+    pFS->startElementNS( XML_p, XML_seq, FSEND );
+
+    WriteAnimationNodeCommonPropsStart( pFS, rXNode, TRUE, bMainSeqChild );
+
+    pFS->startElementNS( XML_p, XML_prevCondLst, FSEND );
+    WriteAnimationCondition( pFS, NULL, "onPrev", 0, TRUE );
+    pFS->endElementNS( XML_p, XML_prevCondLst );
+
+    pFS->startElementNS( XML_p, XML_nextCondLst, FSEND );
+    WriteAnimationCondition( pFS, NULL, "onNext", 0, TRUE );
+    pFS->endElementNS( XML_p, XML_nextCondLst );
+
+    pFS->endElementNS( XML_p, XML_seq );
+}
+
+void PowerPointExport::WriteAnimationNodeEffect( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, sal_Int32, sal_Bool bMainSeqChild )
+{
+    DBG(printf ("write animation node FILTER\n"));
+
+    Reference< XTransitionFilter > xFilter( rXNode, UNO_QUERY );
+    if ( xFilter.is() ) {
+    const char* pFilter = ppt::AnimationExporter::FindTransitionName( xFilter->getTransition(), xFilter->getSubtype(), xFilter->getDirection() );
+    const char* pDirection = xFilter->getDirection() ? "in" : "out";
+    pFS->startElementNS( XML_p, XML_animEffect,
+                 XML_filter, pFilter,
+                 XML_transition, pDirection,
+                 FSEND );
+
+    WriteAnimationNodeAnimateInside( pFS, rXNode, bMainSeqChild, FALSE );
+
+    pFS->endElementNS( XML_p, XML_animEffect );
+    }
+}
+
+void PowerPointExport::WriteAnimationNode( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, sal_Bool bMainSeqChild )
+{
+    DBG(printf ("export node type: %d\n", rXNode->getType()));
+    sal_Int32 xmlNodeType = -1;
+    typedef void (PowerPointExport::*AnimationNodeWriteMethod)( FSHelperPtr, const Reference< XAnimationNode >&, sal_Int32, sal_Bool );
+    AnimationNodeWriteMethod pMethod = NULL;
+
+    switch( rXNode->getType() ) {
+    case AnimationNodeType::PAR:
+        xmlNodeType = XML_par;
+        break;
+    case AnimationNodeType::SEQ:
+        pMethod = &PowerPointExport::WriteAnimationNodeSeq;
+        break;
+    case AnimationNodeType::ANIMATE:
+        xmlNodeType = XML_anim;
+        pMethod = &PowerPointExport::WriteAnimationNodeAnimate;
+        break;
+    case AnimationNodeType::SET:
+        xmlNodeType = XML_set;
+        pMethod = &PowerPointExport::WriteAnimationNodeAnimate;
+        break;
+    case AnimationNodeType::TRANSITIONFILTER:
+        xmlNodeType = XML_animEffect;
+        pMethod = &PowerPointExport::WriteAnimationNodeEffect;
+        break;
+    }
+
+    if( pMethod ) {
+    (this->*(pMethod))( pFS, rXNode, xmlNodeType, bMainSeqChild );
+    return;
+    }
+
+    if( xmlNodeType == -1 )
+    return;
+
+    pFS->startElementNS( XML_p, xmlNodeType, FSEND );
+
+    WriteAnimationNodeCommonPropsStart( pFS, rXNode, TRUE, bMainSeqChild );
+
+    pFS->endElementNS( XML_p, xmlNodeType );
+}
+
+void PowerPointExport::WriteAnimations( FSHelperPtr pFS )
+{
+    Reference< XAnimationNodeSupplier > xNodeSupplier( mXDrawPage, UNO_QUERY );
+    if( xNodeSupplier.is() ) {
+    const Reference< XAnimationNode > xNode( xNodeSupplier->getAnimationNode() );
+    if( xNode.is() ) {
+        Reference< XEnumerationAccess > xEnumerationAccess( xNode, UNO_QUERY );
+        if( xEnumerationAccess.is() ) {
+        Reference< XEnumeration > xEnumeration( xEnumerationAccess->createEnumeration(), UNO_QUERY );
+        if( xEnumeration.is() && xEnumeration->hasMoreElements() ) {
+
+            pFS->startElementNS( XML_p, XML_timing, FSEND );
+            pFS->startElementNS( XML_p, XML_tnLst, FSEND );
+
+            WriteAnimationNode( pFS, xNode, FALSE );
+
+            pFS->endElementNS( XML_p, XML_tnLst );
+            pFS->endElementNS( XML_p, XML_timing );
+        }
+        }
+    }
+    }
+}
+
+void PowerPointExport::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_uInt16 /* nMode */,
+                                       sal_Bool bHasBackground, Reference< XPropertySet > aXBackgroundPropSet )
+{
+    DBG(printf("write slide: %d\n----------------\n", nPageNum));
+
+    // slides list
+    if( nPageNum == 0 )
+        mPresentationFS->startElementNS( XML_p, XML_sldIdLst, FSEND );
+
+    // add explicit relation of presentation to this slide
+    OUString sRelId = addRelation( mPresentationFS->getOutputStream(),
+                                   US( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide" ),
+                                   OUStringBuffer()
+                                   .appendAscii( "slides/slide" )
+                                   .append( (sal_Int32) nPageNum + 1 )
+                                   .appendAscii( ".xml" )
+                                   .makeStringAndClear() );
+
+    mPresentationFS->singleElementNS( XML_p, XML_sldId,
+                                      XML_id, I32S( GetNewSlideId() ),
+                                      FSNS( XML_r, XML_id ), USS( sRelId ),
+                                      FSEND );
+
+    if( nPageNum == mnPages - 1 )
+        mPresentationFS->endElementNS( XML_p, XML_sldIdLst );
+
+    FSHelperPtr pFS = openFragmentStreamWithSerializer( OUStringBuffer()
+                                                        .appendAscii( "ppt/slides/slide" )
+                                                        .append( (sal_Int32) nPageNum + 1 )
+                                                        .appendAscii( ".xml" )
+                                                        .makeStringAndClear(),
+                                                        US( "application/vnd.openxmlformats-officedocument.presentationml.slide+xml" ) );
+
+    if( mpSlidesFSArray.size() < mnPages )
+    mpSlidesFSArray.resize( mnPages );
+    mpSlidesFSArray[ nPageNum ] = pFS;
+
+    const char* pShow = NULL;
+
+    if( GETA( Visible ) ) {
+    sal_Bool bShow(sal_False);
+    if( ( mAny >>= bShow ) && !bShow )
+        pShow = "0";
+    }
+
+    pFS->startElementNS( XML_p, XML_sld, PNMSS,
+             XML_show, pShow,
+             FSEND );
+
+    pFS->startElementNS( XML_p, XML_cSld, FSEND );
+
+    // background
+    if( bHasBackground ) {
+        ImplWriteBackground( pFS, aXBackgroundPropSet );
+    }
+
+    WriteShapeTree( pFS, NORMAL, FALSE );
+
+    pFS->endElementNS( XML_p, XML_cSld );
+
+    WriteTransition( pFS );
+    WriteAnimations( pFS );
+
+    pFS->endElementNS( XML_p, XML_sld );
+
+    // add implicit relation to slide layout
+    addRelation( pFS->getOutputStream(),
+                 US( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout" ),
+                 OUStringBuffer()
+                 .appendAscii( "../slideLayouts/slideLayout" )
+                 .append( GetLayoutFileId( GetLayoutOffset( mXPagePropSet ), nMasterNum ) )
+                 .appendAscii( ".xml" )
+                 .makeStringAndClear() );
+
+    DBG(printf("----------------\n"));
+}
+
+void PowerPointExport::ImplWriteNotes( sal_uInt32 nPageNum )
+{
+    if( !mbCreateNotes || !ContainsOtherShapeThanPlaceholders( TRUE ) )
+    return;
+
+    DBG(printf("write Notes %d\n----------------\n", nPageNum));
+
+    FSHelperPtr pFS = openFragmentStreamWithSerializer( OUStringBuffer()
+                                                        .appendAscii( "ppt/notesSlides/notesSlide" )
+                                                        .append( (sal_Int32) nPageNum + 1 )
+                                                        .appendAscii( ".xml" )
+                                                        .makeStringAndClear(),
+                                                        US( "application/vnd.openxmlformats-officedocument.presentationml.notesSlide+xml" ) );
+
+    pFS->startElementNS( XML_p, XML_notes, PNMSS, FSEND );
+
+    pFS->startElementNS( XML_p, XML_cSld, FSEND );
+
+    // background
+//     if( bHasBackground ) {
+//         ImplWriteBackground( pFS, aXBackgroundPropSet );
+//     }
+
+    WriteShapeTree( pFS, NOTICE, FALSE );
+
+    pFS->endElementNS( XML_p, XML_cSld );
+
+    pFS->endElementNS( XML_p, XML_notes );
+
+    // add implicit relation to slide
+    addRelation( pFS->getOutputStream(),
+                 US( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide" ),
+                 OUStringBuffer()
+                 .appendAscii( "../slides/slide" )
+                 .append( (sal_Int32) nPageNum + 1 )
+                 .appendAscii( ".xml" )
+                 .makeStringAndClear() );
+
+    // add slide implicit relation to notes
+    if( mpSlidesFSArray.size() >= nPageNum )
+    addRelation( mpSlidesFSArray[ nPageNum ]->getOutputStream(),
+             US( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesSlide" ),
+             OUStringBuffer()
+             .appendAscii( "../notesSlides/notesSlide" )
+             .append( (sal_Int32) nPageNum + 1 )
+             .appendAscii( ".xml" )
+             .makeStringAndClear() );
+
+    // add implicit relation to notes master
+    addRelation( pFS->getOutputStream(),
+                 US( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesMaster" ),
+         US( "../notesMasters/notesMaster1.xml" ) );
+
+    DBG(printf("----------------\n"));
+}
+
+void PowerPointExport::AddLayoutIdAndRelation( FSHelperPtr pFS, sal_Int32 nLayoutFileId )
+{
+    // add implicit relation of slide master to slide layout
+    OUString sRelId = addRelation( pFS->getOutputStream(),
+                   US( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout" ),
+                   OUStringBuffer()
+                   .appendAscii( "../slideLayouts/slideLayout" )
+                   .append( nLayoutFileId )
+                   .appendAscii( ".xml" )
+                   .makeStringAndClear() );
+
+    pFS->singleElementNS( XML_p, XML_sldLayoutId,
+              XML_id, I64S( GetNewSlideMasterId() ),
+              FSNS( XML_r, XML_id ), USS( sRelId ),
+              FSEND );
+}
+
+sal_Int32 PowerPointExport::nStyleLevelToken[5] =
+{
+    XML_lvl1pPr,
+    XML_lvl2pPr,
+    XML_lvl3pPr,
+    XML_lvl4pPr,
+    XML_lvl5pPr
+};
+
+void PowerPointExport::WriteTextStyleLevel( FSHelperPtr pFS, int nInstance, int nLevel )
+{
+    OSL_ASSERT( nLevel >= 0 && nLevel < 5 );
+    OSL_ASSERT( nInstance >= 0 && nInstance < 9 );
+
+    PPTExCharLevel rCharLevel = mpStyleSheet->GetCharSheet( nInstance ).maCharLevel[ nLevel ];
+    PPTExParaLevel rParaLevel = mpStyleSheet->GetParaSheet( nInstance ).maParaLevel[ nLevel ];
+
+    pFS->startElementNS( XML_a, PowerPointExport::nStyleLevelToken[ nLevel ],
+             XML_algn, DrawingML::GetAlignment( rParaLevel.mnOOAdjust ),
+             FSEND );
+
+    pFS->endElementNS( XML_a, PowerPointExport::nStyleLevelToken[ nLevel ] );
+}
+
+void PowerPointExport::WriteTextStyle( FSHelperPtr pFS, int nInstance, sal_Int32 xmlToken )
+{
+    pFS->startElementNS( XML_p, xmlToken, FSEND );
+
+    for( int nLevel = 0; nLevel < 5; nLevel ++ )
+    WriteTextStyleLevel( pFS, nInstance, nLevel );
+
+    pFS->endElementNS( XML_p, xmlToken );
+}
+
+void PowerPointExport::WriteTextStyles( FSHelperPtr pFS )
+{
+    pFS->startElementNS( XML_p, XML_txBody, FSEND );
+
+    WriteTextStyle( pFS, EPP_TEXTTYPE_Title, XML_titleStyle );
+    WriteTextStyle( pFS, EPP_TEXTTYPE_Body, XML_bodyStyle );
+    WriteTextStyle( pFS, EPP_TEXTTYPE_Other, XML_otherStyle );
+
+    pFS->endElementNS( XML_p, XML_txBody );
+}
+
+void PowerPointExport::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertySet > aXBackgroundPropSet )
+{
+    DBG(printf("write slide master: %d\n----------------\n", nPageNum));
+
+    // slides list
+    if( nPageNum == 0 )
+        mPresentationFS->startElementNS( XML_p, XML_sldMasterIdLst, FSEND );
+
+    OUString sRelId = addRelation( mPresentationFS->getOutputStream(),
+                                   US( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideMaster" ),
+                                   OUStringBuffer()
+                                   .appendAscii( "slideMasters/slideMaster" )
+                                   .append( (sal_Int32) nPageNum + 1 )
+                                   .appendAscii( ".xml" )
+                                   .makeStringAndClear() );
+
+    mPresentationFS->singleElementNS( XML_p, XML_sldMasterId,
+                                      XML_id, OString::valueOf( (sal_Int64) GetNewSlideMasterId() ).getStr(),
+                                      FSNS( XML_r, XML_id ), USS( sRelId ),
+                                      FSEND );
+
+    if( nPageNum == mnMasterPages - 1 )
+        mPresentationFS->endElementNS( XML_p, XML_sldMasterIdLst );
+
+    FSHelperPtr pFS =
+    openFragmentStreamWithSerializer( OUStringBuffer()
+                      .appendAscii( "ppt/slideMasters/slideMaster" )
+                      .append( (sal_Int32) nPageNum + 1 )
+                      .appendAscii( ".xml" )
+                      .makeStringAndClear(),
+                      US( "application/vnd.openxmlformats-officedocument.presentationml.slideMaster+xml" ) );
+    if( mpMasterFSArray.size() < mnMasterPages )
+    mpMasterFSArray.resize( mnMasterPages );
+    mpMasterFSArray[ nPageNum ] = pFS;
+
+    // write theme per master
+    WriteTheme( nPageNum );
+
+    // add implicit relation to the presentation theme
+    addRelation( pFS->getOutputStream(),
+                 US( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme" ),
+         OUStringBuffer()
+         .appendAscii( "../theme/theme" )
+         .append( (sal_Int32) nPageNum + 1 )
+         .appendAscii( ".xml" )
+         .makeStringAndClear() );
+
+    pFS->startElementNS( XML_p, XML_sldMaster, PNMSS, FSEND );
+
+    pFS->startElementNS( XML_p, XML_cSld, FSEND );
+
+    ImplWriteBackground( pFS, aXBackgroundPropSet );
+    WriteShapeTree( pFS, MASTER, TRUE );
+
+    pFS->endElementNS( XML_p, XML_cSld );
+
+    // color map - now it uses colors from hardcoded theme, once we eventually generate theme, this might need update
+    pFS->singleElementNS( XML_p, XML_clrMap,
+                          XML_bg1, "lt1",
+                          XML_bg2, "lt2",
+                          XML_tx1, "dk1",
+                          XML_tx2, "dk2",
+                          XML_accent1, "accent1",
+                          XML_accent2, "accent2",
+                          XML_accent3, "accent3",
+                          XML_accent4, "accent4",
+                          XML_accent5, "accent5",
+                          XML_accent6, "accent6",
+                          XML_hlink, "hlink",
+                          XML_folHlink, "folHlink",
+                          FSEND );
+
+    // use master's id type as they have same range, mso does that as well
+    pFS->startElementNS( XML_p, XML_sldLayoutIdLst, FSEND );
+
+    int nCount = 0;
+    for( int i = 0; i < EPP_LAYOUT_SIZE; i++) {
+
+    sal_Int32 nLayoutFileId = GetLayoutFileId( i, nPageNum );
+    if( nLayoutFileId > 0 ) {
+        AddLayoutIdAndRelation( pFS, nLayoutFileId );
+        nCount++;
+    }
+    }
+
+    if( nCount == 0 ) {
+    // add at least empty layout, so that we don't have master page
+    // without layout, such master cannot be used in ppt
+    ImplWriteLayout( 0, nPageNum );
+    AddLayoutIdAndRelation( pFS, GetLayoutFileId( 0, nPageNum ) );
+    }
+
+    pFS->endElementNS( XML_p, XML_sldLayoutIdLst );
+
+    // WriteTextStyles( pFS );
+
+    pFS->endElementNS( XML_p, XML_sldMaster );
+
+    DBG(printf("----------------\n"));
+}
+
+sal_Int32 PowerPointExport::GetLayoutFileId( sal_Int32 nOffset, sal_uInt32 nMasterNum )
+{
+    if( mLayoutInfo[ nOffset ].mnFileIdArray.size() <= nMasterNum )
+    return 0;
+
+    return mLayoutInfo[ nOffset ].mnFileIdArray[ nMasterNum ];
+}
+
+void PowerPointExport::ImplWriteLayout( sal_Int32 nOffset, sal_uInt32 nMasterNum )
+{
+    if( mLayoutInfo[ nOffset ].mnFileIdArray.size() < mnMasterPages ) {
+    mLayoutInfo[ nOffset ].mnFileIdArray.resize( mnMasterPages );
+    }
+
+    if( mLayoutInfo[ nOffset ].mnFileIdArray[ nMasterNum ] != 0 )
+    return;
+
+    FSHelperPtr pFS
+        = openFragmentStreamWithSerializer( OUStringBuffer()
+                                            .appendAscii( "ppt/slideLayouts/slideLayout" )
+                                            .append( (sal_Int32) mnLayoutFileIdMax )
+                                            .appendAscii( ".xml" )
+                                            .makeStringAndClear(),
+                                            US( "application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml" ) );
+
+//     LayoutInfo& rLayoutInfo = GetLayoutInfo( mXPagePropSet );
+
+    // add implicit relation of slide layout to slide master
+    addRelation( pFS->getOutputStream(),
+                 US( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideMaster" ),
+                 OUStringBuffer()
+                 .appendAscii( "../slideMasters/slideMaster" )
+                 .append( (sal_Int32) nMasterNum + 1 )
+                 .appendAscii( ".xml" )
+                 .makeStringAndClear() );
+
+    pFS->startElementNS( XML_p, XML_sldLayout,
+                         PNMSS,
+                         XML_type, "title",
+                         XML_preserve, "1",
+                         FSEND );
+
+    pFS->startElementNS( XML_p, XML_cSld,
+                         XML_name, "Title Slide",
+                         FSEND );
+    pFS->write( MINIMAL_SPTREE ); // TODO: write actual shape tree
+    pFS->endElementNS( XML_p, XML_cSld );
+
+    pFS->endElementNS( XML_p, XML_sldLayout );
+
+    mLayoutInfo[ nOffset ].mnFileIdArray[ nMasterNum ] = mnLayoutFileIdMax;
+
+    mnLayoutFileIdMax ++;
+}
+
+void PowerPointExport::WriteShapeTree( FSHelperPtr pFS, PageType ePageType, sal_Bool bMaster )
+{
+    PowerPointShapeExport aDML( pFS, &maShapeMap, this );
+    aDML.SetMaster( bMaster );
+    aDML.SetPageType( ePageType );
+    sal_uInt32 nShapes;
+
+    pFS->startElementNS( XML_p, XML_spTree, FSEND );
+    pFS->write( MAIN_GROUP );
+
+    ResetGroupTable( nShapes = mXShapes->getCount() );
+
+    while( GetNextGroupEntry() ) {
+
+        sal_uInt32 nGroups = GetGroupsClosed();
+        for ( sal_uInt32 i = 0; i < nGroups; i++ ) {
+            DBG(printf( "leave group\n" ));
+        }
+
+        if ( GetShapeByIndex( GetCurrentGroupIndex(), TRUE ) ) {
+            DBG(printf( "mType: \"%s\"\n", mType.GetBuffer() ));
+            aDML.WriteShape( mXShape );
+        }
+    }
+
+    pFS->endElementNS( XML_p, XML_spTree );
+}
+
+#define BEGIN_SHAPE mpFS->startElementNS( XML_p, XML_sp, FSEND )
+#define END_SHAPE mpFS->endElementNS( XML_p, XML_sp )
+
+ShapeExport& PowerPointShapeExport::WritePageShape( Reference< XShape > xShape, PageType ePageType, sal_Bool bPresObj )
+{
+    if( ePageType == NOTICE && bPresObj )
+    return WritePlaceholderShape( xShape, SlideImage );
+
+    return WriteTextShape( xShape );
+}
+
+sal_Bool PowerPointShapeExport::WritePlaceholder( Reference< XShape > xShape, PlaceholderType ePlaceholder, sal_Bool bMaster )
+{
+    if( bMaster && ShapeExport::NonEmptyText( xShape ) ) {
+    WritePlaceholderShape( xShape, ePlaceholder );
+
+    return TRUE;
+    }
+
+    return FALSE;
+}
+
+ShapeExport& PowerPointShapeExport::WritePlaceholderShape( Reference< XShape > xShape, PlaceholderType ePlaceholder )
+{
+    BEGIN_SHAPE;
+
+    // non visual shape properties
+    mpFS->startElementNS( XML_p, XML_nvSpPr, FSEND );
+    WriteNonVisualDrawingProperties( xShape, IDS( PlaceHolder ) );
+    mpFS->startElementNS( XML_p, XML_cNvSpPr, FSEND );
+    mpFS->singleElementNS( XML_a, XML_spLocks, XML_noGrp, "1", FSEND );
+    mpFS->endElementNS( XML_p, XML_cNvSpPr );
+    mpFS->startElementNS( XML_p, XML_nvPr, FSEND );
+
+    const char* pType = NULL;
+    switch( ePlaceholder ) {
+    case SlideImage:
+        pType = "sldImg";
+        break;
+    case Notes:
+        pType = "body";
+        break;
+    case Header:
+        pType = "hdr";
+        break;
+    case Footer:
+        pType = "ftr";
+        break;
+    case SlideNumber:
+        pType = "sldNum";
+        break;
+    case DateAndTime:
+        pType = "dt";
+        break;
+    case Outliner:
+        pType = "body";
+        break;
+    case Title:
+        pType = "title";
+        break;
+    case Subtitle:
+        pType = "subTitle";
+        break;
+    default:
+        DBG(printf("warning: unhandled placeholder type: %d\n", ePlaceholder));
+    }
+    mpFS->singleElementNS( XML_p, XML_ph, XML_type, pType, FSEND );
+    mpFS->endElementNS( XML_p, XML_nvPr );
+    mpFS->endElementNS( XML_p, XML_nvSpPr );
+
+    // visual shape properties
+    mpFS->startElementNS( XML_p, XML_spPr, FSEND );
+    WriteShapeTransformation( xShape, XML_a );
+    WritePresetShape( "rect" );
+    Reference< XPropertySet > xProps( xShape, UNO_QUERY );
+    if( xProps.is() )
+    WriteBlipFill( xProps, S( "GraphicURL" ) );
+    mpFS->endElementNS( XML_p, XML_spPr );
+
+    WriteTextBox( xShape );
+
+    END_SHAPE;
+
+    return *this;
+}
+
+#define MINIMAL_THEME "  <a:themeElements>\
+    <a:clrScheme name=\"Office\">\
+      <a:dk1>\
+        <a:sysClr val=\"windowText\" lastClr=\"000000\"/>\
+      </a:dk1>\
+      <a:lt1>\
+        <a:sysClr val=\"window\" lastClr=\"FFFFFF\"/>\
+      </a:lt1>\
+      <a:dk2>\
+        <a:srgbClr val=\"1F497D\"/>\
+      </a:dk2>\
+      <a:lt2>\
+        <a:srgbClr val=\"EEECE1\"/>\
+      </a:lt2>\
+      <a:accent1>\
+        <a:srgbClr val=\"4F81BD\"/>\
+      </a:accent1>\
+      <a:accent2>\
+        <a:srgbClr val=\"C0504D\"/>\
+      </a:accent2>\
+      <a:accent3>\
+        <a:srgbClr val=\"9BBB59\"/>\
+      </a:accent3>\
+      <a:accent4>\
+        <a:srgbClr val=\"8064A2\"/>\
+      </a:accent4>\
+      <a:accent5>\
+        <a:srgbClr val=\"4BACC6\"/>\
+      </a:accent5>\
+      <a:accent6>\
+        <a:srgbClr val=\"F79646\"/>\
+      </a:accent6>\
+      <a:hlink>\
+        <a:srgbClr val=\"0000FF\"/>\
+      </a:hlink>\
+      <a:folHlink>\
+        <a:srgbClr val=\"800080\"/>\
+      </a:folHlink>\
+    </a:clrScheme>\
+    <a:fontScheme name=\"Office\">\
+      <a:majorFont>\
+        <a:latin typeface=\"Arial\"/>\
+        <a:ea typeface=\"DejaVu Sans\"/>\
+        <a:cs typeface=\"DejaVu Sans\"/>\
+      </a:majorFont>\
+      <a:minorFont>\
+        <a:latin typeface=\"Arial\"/>\
+        <a:ea typeface=\"DejaVu Sans\"/>\
+        <a:cs typeface=\"DejaVu Sans\"/>\
+      </a:minorFont>\
+    </a:fontScheme>\
+    <a:fmtScheme name=\"Office\">\
+      <a:fillStyleLst>\
+        <a:solidFill>\
+          <a:schemeClr val=\"phClr\"/>\
+        </a:solidFill>\
+        <a:gradFill rotWithShape=\"1\">\
+          <a:gsLst>\
+            <a:gs pos=\"0\">\
+              <a:schemeClr val=\"phClr\">\
+                <a:tint val=\"50000\"/>\
+                <a:satMod val=\"300000\"/>\
+              </a:schemeClr>\
+            </a:gs>\
+            <a:gs pos=\"35000\">\
+              <a:schemeClr val=\"phClr\">\
+                <a:tint val=\"37000\"/>\
+                <a:satMod val=\"300000\"/>\
+              </a:schemeClr>\
+            </a:gs>\
+            <a:gs pos=\"100000\">\
+              <a:schemeClr val=\"phClr\">\
+                <a:tint val=\"15000\"/>\
+                <a:satMod val=\"350000\"/>\
+              </a:schemeClr>\
+            </a:gs>\
+          </a:gsLst>\
+          <a:lin ang=\"16200000\" scaled=\"1\"/>\
+        </a:gradFill>\
+        <a:gradFill rotWithShape=\"1\">\
+          <a:gsLst>\
+            <a:gs pos=\"0\">\
+              <a:schemeClr val=\"phClr\">\
+                <a:shade val=\"51000\"/>\
+                <a:satMod val=\"130000\"/>\
+              </a:schemeClr>\
+            </a:gs>\
+            <a:gs pos=\"80000\">\
+              <a:schemeClr val=\"phClr\">\
+                <a:shade val=\"93000\"/>\
+                <a:satMod val=\"130000\"/>\
+              </a:schemeClr>\
+            </a:gs>\
+            <a:gs pos=\"100000\">\
+              <a:schemeClr val=\"phClr\">\
+                <a:shade val=\"94000\"/>\
+                <a:satMod val=\"135000\"/>\
+              </a:schemeClr>\
+            </a:gs>\
+          </a:gsLst>\
+          <a:lin ang=\"16200000\" scaled=\"0\"/>\
+        </a:gradFill>\
+      </a:fillStyleLst>\
+      <a:lnStyleLst>\
+        <a:ln w=\"9525\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\">\
+          <a:solidFill>\
+            <a:schemeClr val=\"phClr\">\
+              <a:shade val=\"95000\"/>\
+              <a:satMod val=\"105000\"/>\
+            </a:schemeClr>\
+          </a:solidFill>\
+          <a:prstDash val=\"solid\"/>\
+        </a:ln>\
+        <a:ln w=\"25400\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\">\
+          <a:solidFill>\
+            <a:schemeClr val=\"phClr\"/>\
+          </a:solidFill>\
+          <a:prstDash val=\"solid\"/>\
+        </a:ln>\
+        <a:ln w=\"38100\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\">\
+          <a:solidFill>\
+            <a:schemeClr val=\"phClr\"/>\
+          </a:solidFill>\
+          <a:prstDash val=\"solid\"/>\
+        </a:ln>\
+      </a:lnStyleLst>\
+      <a:effectStyleLst>\
+        <a:effectStyle>\
+          <a:effectLst>\
+            <a:outerShdw blurRad=\"40000\" dist=\"20000\" dir=\"5400000\" rotWithShape=\"0\">\
+              <a:srgbClr val=\"000000\">\
+                <a:alpha val=\"38000\"/>\
+              </a:srgbClr>\
+            </a:outerShdw>\
+          </a:effectLst>\
+        </a:effectStyle>\
+        <a:effectStyle>\
+          <a:effectLst>\
+            <a:outerShdw blurRad=\"40000\" dist=\"23000\" dir=\"5400000\" rotWithShape=\"0\">\
+              <a:srgbClr val=\"000000\">\
+                <a:alpha val=\"35000\"/>\
+              </a:srgbClr>\
+            </a:outerShdw>\
+          </a:effectLst>\
+        </a:effectStyle>\
+        <a:effectStyle>\
+          <a:effectLst>\
+            <a:outerShdw blurRad=\"40000\" dist=\"23000\" dir=\"5400000\" rotWithShape=\"0\">\
+              <a:srgbClr val=\"000000\">\
+                <a:alpha val=\"35000\"/>\
+              </a:srgbClr>\
+            </a:outerShdw>\
+          </a:effectLst>\
+          <a:scene3d>\
+            <a:camera prst=\"orthographicFront\">\
+              <a:rot lat=\"0\" lon=\"0\" rev=\"0\"/>\
+            </a:camera>\
+            <a:lightRig rig=\"threePt\" dir=\"t\">\
+              <a:rot lat=\"0\" lon=\"0\" rev=\"1200000\"/>\
+            </a:lightRig>\
+          </a:scene3d>\
+          <a:sp3d>\
+            <a:bevelT w=\"63500\" h=\"25400\"/>\
+          </a:sp3d>\
+        </a:effectStyle>\
+      </a:effectStyleLst>\
+      <a:bgFillStyleLst>\
+        <a:solidFill>\
+          <a:schemeClr val=\"phClr\"/>\
+        </a:solidFill>\
+        <a:gradFill rotWithShape=\"1\">\
+          <a:gsLst>\
+            <a:gs pos=\"0\">\
+              <a:schemeClr val=\"phClr\">\
+                <a:tint val=\"40000\"/>\
+                <a:satMod val=\"350000\"/>\
+              </a:schemeClr>\
+            </a:gs>\
+            <a:gs pos=\"40000\">\
+              <a:schemeClr val=\"phClr\">\
+                <a:tint val=\"45000\"/>\
+                <a:shade val=\"99000\"/>\
+                <a:satMod val=\"350000\"/>\
+              </a:schemeClr>\
+            </a:gs>\
+            <a:gs pos=\"100000\">\
+              <a:schemeClr val=\"phClr\">\
+                <a:shade val=\"20000\"/>\
+                <a:satMod val=\"255000\"/>\
+              </a:schemeClr>\
+            </a:gs>\
+          </a:gsLst>\
+          <a:path path=\"circle\">\
+            <a:fillToRect l=\"50000\" t=\"-80000\" r=\"50000\" b=\"180000\"/>\
+          </a:path>\
+        </a:gradFill>\
+        <a:gradFill rotWithShape=\"1\">\
+          <a:gsLst>\
+            <a:gs pos=\"0\">\
+              <a:schemeClr val=\"phClr\">\
+                <a:tint val=\"80000\"/>\
+                <a:satMod val=\"300000\"/>\
+              </a:schemeClr>\
+            </a:gs>\
+            <a:gs pos=\"100000\">\
+              <a:schemeClr val=\"phClr\">\
+                <a:shade val=\"30000\"/>\
+                <a:satMod val=\"200000\"/>\
+              </a:schemeClr>\
+            </a:gs>\
+          </a:gsLst>\
+          <a:path path=\"circle\">\
+            <a:fillToRect l=\"50000\" t=\"50000\" r=\"50000\" b=\"50000\"/>\
+          </a:path>\
+        </a:gradFill>\
+      </a:bgFillStyleLst>\
+    </a:fmtScheme>\
+  </a:themeElements>"
+
+void PowerPointExport::WriteTheme( sal_Int32 nThemeNum )
+{
+    FSHelperPtr pFS = openFragmentStreamWithSerializer( OUStringBuffer()
+                                .appendAscii( "ppt/theme/theme" )
+                                .append( (sal_Int32) nThemeNum + 1 )
+                                .appendAscii( ".xml" )
+                                .makeStringAndClear(),
+                                                        US( "application/vnd.openxmlformats-officedocument.theme+xml" ) );
+
+    pFS->startElementNS( XML_a, XML_theme,
+                         FSNS( XML_xmlns, XML_a), "http://schemas.openxmlformats.org/drawingml/2006/main",
+                         XML_name, "Office Theme",
+                         FSEND );
+
+    pFS->write( MINIMAL_THEME );
+    pFS->endElementNS( XML_a, XML_theme );
+}
+
+sal_Bool PowerPointExport::ImplCreateDocument()
+{
+    mbCreateNotes = FALSE;
+
+    for( sal_uInt32 i = 0; i < mnPages; i++ )
+    {
+        if ( !GetPageByIndex( i, NOTICE ) )
+            return FALSE;
+
+    if( ContainsOtherShapeThanPlaceholders( TRUE ) ) {
+        mbCreateNotes = TRUE;
+        break;
+    }
+    }
+
+    return TRUE;
+}
+
+sal_Bool PowerPointExport::WriteNotesMaster()
+{
+    DBG(printf("write Notes master\n----------------\n"));
+
+    mPresentationFS->startElementNS( XML_p, XML_notesMasterIdLst, FSEND );
+
+    OUString sRelId = addRelation( mPresentationFS->getOutputStream(),
+                                   US( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesMaster" ),
+                                   US( "notesMasters/notesMaster1.xml" ) );
+
+    mPresentationFS->singleElementNS( XML_p, XML_notesMasterId,
+                                      FSNS( XML_r, XML_id ), USS( sRelId ),
+                                      FSEND );
+
+    mPresentationFS->endElementNS( XML_p, XML_notesMasterIdLst );
+
+    FSHelperPtr pFS =
+    openFragmentStreamWithSerializer( US( "ppt/notesMasters/notesMaster1.xml" ),
+                      US( "application/vnd.openxmlformats-officedocument.presentationml.notesMaster+xml" ) );
+    // write theme per master
+    WriteTheme( mnMasterPages );
+
+    // add implicit relation to the presentation theme
+    addRelation( pFS->getOutputStream(),
+                 US( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme" ),
+         OUStringBuffer()
+         .appendAscii( "../theme/theme" )
+         .append( (sal_Int32) mnMasterPages + 1 )
+         .appendAscii( ".xml" )
+         .makeStringAndClear() );
+
+    pFS->startElementNS( XML_p, XML_notesMaster, PNMSS, FSEND );
+
+    pFS->startElementNS( XML_p, XML_cSld, FSEND );
+
+    Reference< XPropertySet > aXBackgroundPropSet;
+    if( ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Background" ) ) ) &&
+    ( mAny >>= aXBackgroundPropSet ) )
+    ImplWriteBackground( pFS, aXBackgroundPropSet );
+
+    WriteShapeTree( pFS, NOTICE, TRUE );
+
+    pFS->endElementNS( XML_p, XML_cSld );
+
+    // color map - now it uses colors from hardcoded theme, once we eventually generate theme, this might need update
+    pFS->singleElementNS( XML_p, XML_clrMap,
+                          XML_bg1, "lt1",
+                          XML_bg2, "lt2",
+                          XML_tx1, "dk1",
+                          XML_tx2, "dk2",
+                          XML_accent1, "accent1",
+                          XML_accent2, "accent2",
+                          XML_accent3, "accent3",
+                          XML_accent4, "accent4",
+                          XML_accent5, "accent5",
+                          XML_accent6, "accent6",
+                          XML_hlink, "hlink",
+                          XML_folHlink, "folHlink",
+                          FSEND );
+
+    pFS->endElementNS( XML_p, XML_notesMaster );
+
+    DBG(printf("----------------\n"));
+
+    return TRUE;
+}
+
+sal_Bool PowerPointExport::ImplCreateMainNotes()
+{
+    if( mbCreateNotes )
+    return WriteNotesMaster();
+
+    return TRUE;
+}
+
+#define IMPL_NAME "com.sun.star.comp.Impress.oox.PowerPointExport"
+
+OUString SAL_CALL PowerPointExport_getImplementationName() throw()
+{
+    return CREATE_OUSTRING( IMPL_NAME );
+}
+
+uno::Sequence< OUString > SAL_CALL PowerPointExport_getSupportedServiceNames() throw()
+{
+    const OUString aServiceName = CREATE_OUSTRING( "com.sun.star.comp.ooxpptx" );
+    const Sequence< OUString > aSeq( &aServiceName, 1 );
+    return aSeq;
+}
+
+uno::Reference< uno::XInterface > SAL_CALL PowerPointExport_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception )
+{
+    return (cppu::OWeakObject*)new PowerPointExport( rSMgr );
+}
+
+OUString PowerPointExport::implGetImplementationName() const
+{
+    return PowerPointExport_getImplementationName();
+}
+}
+}
+
+// UNO component
+// ------------------------------------------
+// - component_getImplementationEnvironment -
+// ------------------------------------------
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
+{
+    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
+
+// -----------------------
+// - component_writeInfo -
+// -----------------------
+
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /* pServiceManager */, void* pRegistryKey )
+{
+    sal_Bool bRet = sal_False;
+
+    if( pRegistryKey )
+    {
+        try
+        {
+            uno::Reference< registry::XRegistryKey > xNewKey1(
+                static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( IMPL_NAME "/UNO/SERVICES/" )) ) );
+            xNewKey1->createKey( oox::core::PowerPointExport_getSupportedServiceNames().getConstArray()[0] );
+
+            bRet = sal_True;
+        }
+        catch( registry::InvalidRegistryException& )
+        {
+            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
+        }
+    }
+
+    return bRet;
+}
+
+// ------------------------
+// - component_getFactory -
+// ------------------------
+
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
+{
+    uno::Reference< lang::XSingleServiceFactory > xFactory;
+    void*                                   pRet = 0;
+
+    if( rtl_str_compare( pImplName, IMPL_NAME ) == 0 )
+    {
+        const ::rtl::OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( IMPL_NAME ) );
+
+        xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
+                        reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
+                        oox::core::PowerPointExport_getImplementationName(),
+                        oox::core::PowerPointExport_createInstance,
+                        oox::core::PowerPointExport_getSupportedServiceNames() ) );
+    }
+
+    if( xFactory.is() )
+    {
+        xFactory->acquire();
+        pRet = xFactory.get();
+    }
+
+    return pRet;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+DBG(
+void dump_pset(Reference< XPropertySet > rXPropSet)
+{
+    Reference< XPropertySetInfo > info = rXPropSet->getPropertySetInfo ();
+    Sequence< beans::Property > props = info->getProperties ();
+
+    for (int i=0; i < props.getLength (); i++) {
+        OString name = OUStringToOString( props [i].Name, RTL_TEXTENCODING_UTF8);
+        printf ("%30s = ", name.getStr() );
+
+        Any value = rXPropSet->getPropertyValue( props [i].Name );
+
+        OUString strValue;
+        sal_Int32 intValue;
+        bool boolValue;
+        RectanglePoint pointValue;
+
+        if( value >>= strValue )
+            printf ("\"%s\"\n", USS( strValue ) );
+        else if( value >>= intValue )
+            printf ("%d            (hex: %x)\n", intValue, intValue);
+        else if( value >>= boolValue )
+            printf ("%d            (bool)\n", boolValue);
+        else if( value >>= pointValue )
+            printf ("%d            (RectanglePoint)\n", pointValue);
+        else
+            printf ("???           <unhandled type>\n");
+    }
+}
+);
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/filter/eppt/pptx-grouptable.cxx b/sd/source/filter/eppt/pptx-grouptable.cxx
new file mode 100644
index 000000000000..fed63ac7bf56
--- /dev/null
+++ b/sd/source/filter/eppt/pptx-grouptable.cxx
@@ -0,0 +1,142 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "grouptable.hxx"
+
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::container::XIndexAccess;
+
+GroupTable::GroupTable() :
+    mnCurrentGroupEntry ( 0 ),
+    mnMaxGroupEntry     ( 0 ),
+    mnGroupsClosed      ( 0 ),
+    mpGroupEntry        ( NULL )
+{
+    ImplResizeGroupTable( 32 );
+}
+
+// ---------------------------------------------------------------------------------------------
+
+GroupTable::~GroupTable()
+{
+    for ( sal_uInt32 i = 0; i < mnCurrentGroupEntry; delete mpGroupEntry[ i++ ] ) ;
+    delete[] mpGroupEntry;
+}
+
+// ---------------------------------------------------------------------------------------------
+
+void GroupTable::ImplResizeGroupTable( sal_uInt32 nEntrys )
+{
+    if ( nEntrys > mnMaxGroupEntry )
+    {
+        mnMaxGroupEntry         = nEntrys;
+        GroupEntry** pTemp = new GroupEntry*[ nEntrys ];
+        for ( sal_uInt32 i = 0; i < mnCurrentGroupEntry; i++ )
+            pTemp[ i ] = mpGroupEntry[ i ];
+        if ( mpGroupEntry )
+            delete[] mpGroupEntry;
+        mpGroupEntry = pTemp;
+    }
+}
+
+// ---------------------------------------------------------------------------------------------
+
+sal_Bool GroupTable::EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rXIndexAccessRef )
+{
+    sal_Bool bRet = sal_False;
+    if ( rXIndexAccessRef.is() )
+    {
+        GroupEntry* pNewGroup = new GroupEntry( rXIndexAccessRef );
+        if ( pNewGroup->mnCount )
+        {
+            if ( mnMaxGroupEntry == mnCurrentGroupEntry )
+                ImplResizeGroupTable( mnMaxGroupEntry + 8 );
+            mpGroupEntry[ mnCurrentGroupEntry++ ] = pNewGroup;
+            bRet = sal_True;
+        }
+        else
+            delete pNewGroup;
+    }
+    return bRet;
+}
+
+// ---------------------------------------------------------------------------------------------
+
+sal_uInt32 GroupTable::GetGroupsClosed()
+{
+    sal_uInt32 nRet = mnGroupsClosed;
+    mnGroupsClosed = 0;
+    return nRet;
+}
+
+// ---------------------------------------------------------------------------------------------
+
+void GroupTable::ClearGroupTable()
+{
+    for ( sal_uInt32 i = 0; i < mnCurrentGroupEntry; i++, delete mpGroupEntry[ i ] ) ;
+    mnCurrentGroupEntry = 0;
+}
+
+// ---------------------------------------------------------------------------------------------
+
+void GroupTable::ResetGroupTable( sal_uInt32 nCount )
+{
+    ClearGroupTable();
+    mpGroupEntry[ mnCurrentGroupEntry++ ] = new GroupEntry( nCount );
+}
+
+// ---------------------------------------------------------------------------------------------
+
+sal_Bool GroupTable::GetNextGroupEntry()
+{
+    while ( mnCurrentGroupEntry )
+    {
+        mnIndex = mpGroupEntry[ mnCurrentGroupEntry - 1 ]->mnCurrentPos++;
+
+        if ( mpGroupEntry[ mnCurrentGroupEntry - 1 ]->mnCount > mnIndex )
+            return sal_True;
+
+        delete ( mpGroupEntry[ --mnCurrentGroupEntry ] );
+
+        if ( mnCurrentGroupEntry )
+            mnGroupsClosed++;
+    }
+    return sal_False;
+}
+
+// ---------------------------------------------------------------------------------------------
+
+void GroupTable::SkipCurrentGroup()
+{
+    if ( mnCurrentGroupEntry )
+        delete ( mpGroupEntry[ --mnCurrentGroupEntry ] );
+}
+
+// ---------------------------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx b/sd/source/filter/eppt/pptx-stylesheet.cxx
new file mode 100644
index 000000000000..76ac156b342b
--- /dev/null
+++ b/sd/source/filter/eppt/pptx-stylesheet.cxx
@@ -0,0 +1,514 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <epptbase.hxx>
+#include <epptdef.hxx>
+#include <text.hxx>
+#include <tools/color.hxx>
+#include <editeng/svxenum.hxx>
+
+using namespace ::com::sun::star;
+
+PPTExCharSheet::PPTExCharSheet( int nInstance )
+{
+    sal_uInt16 nFontHeight = 24;
+
+    for ( int nDepth = 0; nDepth < 5; nDepth++ )
+    {
+        PPTExCharLevel& rLev = maCharLevel[ nDepth ];
+        switch ( nInstance )
+        {
+            case EPP_TEXTTYPE_Title :
+            case EPP_TEXTTYPE_CenterTitle :
+                nFontHeight = 44;
+            break;
+            case EPP_TEXTTYPE_Body :
+            case EPP_TEXTTYPE_CenterBody :
+            case EPP_TEXTTYPE_HalfBody :
+            case EPP_TEXTTYPE_QuarterBody :
+            {
+                switch ( nDepth )
+                {
+                    case 0 : nFontHeight = 32; break;
+                    case 1 : nFontHeight = 28; break;
+                    case 2 : nFontHeight = 24; break;
+                    default :nFontHeight = 20; break;
+                }
+            }
+            break;
+            case EPP_TEXTTYPE_Notes :
+                nFontHeight = 12;
+            break;
+            case EPP_TEXTTYPE_notUsed :
+            case EPP_TEXTTYPE_Other :
+                nFontHeight = 24;
+            break;
+        }
+        rLev.mnFlags = 0;
+        rLev.mnFont = 0;
+        rLev.mnAsianOrComplexFont = 0xffff;
+        rLev.mnFontHeight = nFontHeight;
+        rLev.mnFontColor = 0;
+        rLev.mnEscapement = 0;
+    }
+}
+
+
+void PPTExCharSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
+                                    FontCollection& rFontCollection, int nLevel )
+{
+    PortionObj  aPortionObj( rXPropSet, rFontCollection );
+
+    PPTExCharLevel& rLev = maCharLevel[ nLevel ];
+
+    if ( aPortionObj.meCharColor == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
+        rLev.mnFontColor = aPortionObj.mnCharColor;
+    if ( aPortionObj.meCharEscapement == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
+        rLev.mnEscapement = aPortionObj.mnCharEscapement;
+    if ( aPortionObj.meCharHeight == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
+        rLev.mnFontHeight = aPortionObj.mnCharHeight;
+    if ( aPortionObj.meFontName == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
+        rLev.mnFont = aPortionObj.mnFont;
+    if ( aPortionObj.meAsianOrComplexFont == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
+        rLev.mnAsianOrComplexFont = aPortionObj.mnAsianOrComplexFont;
+    rLev.mnFlags = aPortionObj.mnCharAttr;
+}
+
+void PPTExCharSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bool, sal_Bool bSimpleText,
+    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPagePropSet )
+{
+    const PPTExCharLevel& rLev = maCharLevel[ nLev ];
+
+    sal_uInt32 nCharFlags = 0xefffff;
+    if ( bSimpleText )
+        nCharFlags = 0x7ffff;
+
+    rSt << nCharFlags
+        << rLev.mnFlags
+        << rLev.mnFont;
+
+    sal_uInt32 nFontColor = rLev.mnFontColor;
+    if ( nFontColor == COL_AUTO )
+    {
+        sal_Bool bIsDark = sal_False;
+        ::com::sun::star::uno::Any aAny;
+        if ( PropValue::GetPropertyValue( aAny, rPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundDark" ) ), sal_True ) )
+            aAny >>= bIsDark;
+        nFontColor = bIsDark ? 0xffffff : 0x000000;
+    }
+    nFontColor &= 0xffffff;
+    nFontColor |= 0xfe000000;
+    if ( bSimpleText )
+    {
+        rSt << rLev.mnFontHeight
+            << nFontColor;
+    }
+    else
+    {
+        rSt << rLev.mnAsianOrComplexFont
+            << (sal_uInt16)0xffff       // unbekannt
+            << (sal_uInt16)0xffff       // unbekannt
+            << rLev.mnFontHeight
+            << nFontColor
+            << rLev.mnEscapement;
+    }
+}
+
+PPTExParaSheet::PPTExParaSheet( int nInstance, sal_uInt16 nDefaultTab, PPTExBulletProvider& rProv ) :
+    rBuProv     ( rProv ),
+    mnInstance  ( nInstance )
+{
+    sal_Bool bHasBullet = FALSE;
+
+    sal_uInt16 nUpperDist = 0;
+    sal_uInt16 nBulletChar = 0x2022;
+    sal_uInt16 nBulletOfs = 0;
+    sal_uInt16 nTextOfs = 0;
+
+    for ( int nDepth = 0; nDepth < 5; nDepth++ )
+    {
+        PPTExParaLevel& rLev = maParaLevel[ nDepth ];
+        switch ( nInstance )
+        {
+            case EPP_TEXTTYPE_Title :
+            case EPP_TEXTTYPE_CenterTitle :
+            break;
+            case EPP_TEXTTYPE_Body :
+            case EPP_TEXTTYPE_CenterBody :
+            case EPP_TEXTTYPE_HalfBody :
+            case EPP_TEXTTYPE_QuarterBody :
+            {
+                bHasBullet = TRUE;
+                nUpperDist = 0x14;
+            }
+            break;
+            case EPP_TEXTTYPE_Notes :
+                nUpperDist = 0x1e;
+            break;
+
+//          default :
+//          case EPP_TEXTTYPE_notUsed :
+//          case EPP_TEXTTYPE_Other :
+//          break;
+        }
+        switch ( nDepth )
+        {
+            case 0 :
+            {
+                nBulletChar = 0x2022;
+                nBulletOfs = 0;
+                nTextOfs = ( bHasBullet ) ? 0xd8 : 0;
+            }
+            break;
+            case 1 :
+            {
+                nBulletChar = 0x2013;
+                nBulletOfs = 0x120;
+                nTextOfs = 0x1d4;
+            }
+            break;
+            case 2 :
+            {
+                nBulletChar = 0x2022;
+                nBulletOfs = 0x240;
+                nTextOfs = 0x2d0;
+            }
+            break;
+            case 3 :
+            {
+                nBulletChar = 0x2013;
+                nBulletOfs = 0x360;
+                nTextOfs = 0x3f0;
+            }
+            break;
+            case 4 :
+            {
+                nBulletChar = 0xbb;
+                nBulletOfs = 0x480;
+                nTextOfs = 0x510;
+            }
+            break;
+        }
+        rLev.mbIsBullet = bHasBullet;
+        rLev.mnBulletChar = nBulletChar;
+        rLev.mnBulletFont = 0;
+        rLev.mnBulletHeight = 100;
+        rLev.mnBulletColor = 0;
+        rLev.mnAdjust = 0;
+        rLev.mnLineFeed = 100;
+        rLev.mnLowerDist = 0;
+        rLev.mnUpperDist = nUpperDist;
+        rLev.mnTextOfs = nTextOfs;
+        rLev.mnBulletOfs = nBulletOfs;
+        rLev.mnDefaultTab = nDefaultTab;
+        rLev.mnAsianSettings = 2;
+        rLev.mnBiDi = 0;
+
+        rLev.mbExtendedBulletsUsed = FALSE;
+        rLev.mnBulletId = 0xffff;
+        rLev.mnBulletStart = 0;
+        rLev.mnMappedNumType = 0;
+        rLev.mnNumberingType = 0;
+    }
+}
+
+void PPTExParaSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
+                                        FontCollection& rFontCollection, int nLevel, const PPTExCharLevel& rCharLevel )
+{
+    ParagraphObj aParagraphObj( rXPropSet, rBuProv );
+    aParagraphObj.CalculateGraphicBulletSize( rCharLevel.mnFontHeight );
+    PPTExParaLevel& rLev = maParaLevel[ nLevel ];
+
+    if ( aParagraphObj.meTextAdjust == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
+        rLev.mnAdjust = aParagraphObj.mnTextAdjust;
+    if ( aParagraphObj.meLineSpacing == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
+    {
+        sal_Int16 nLineSpacing = aParagraphObj.mnLineSpacing;
+        if ( nLineSpacing > 0 ) // if nLinespacing is < 0 the linespacing is an absolute spacing
+        {
+            sal_Bool bFixedLineSpacing = sal_False;
+            uno::Any aAny = rXPropSet->getPropertyValue( ::rtl::OUString(
+                                                             RTL_CONSTASCII_USTRINGPARAM(
+                                                                 "FontIndependentLineSpacing" ) ) );
+            if( !(aAny >>= bFixedLineSpacing) || !bFixedLineSpacing )
+            {
+                const FontCollectionEntry* pDesc = rFontCollection.GetById( rCharLevel.mnFont );
+                if ( pDesc )
+                    nLineSpacing = (sal_Int16)( (double)nLineSpacing * pDesc->Scaling + 0.5 );
+            }
+        }
+        else
+        {
+            if ( rCharLevel.mnFontHeight > (sal_uInt16)( ((double)-nLineSpacing) * 0.001 * 72.0 / 2.54 ) ) // 1/100mm to point
+            {
+                const FontCollectionEntry* pDesc = rFontCollection.GetById( rCharLevel.mnFont );
+                if ( pDesc )
+                     nLineSpacing = (sal_Int16)( (double)100.0 * pDesc->Scaling + 0.5 );
+                else
+                    nLineSpacing = 100;
+            }
+            else
+                nLineSpacing = (sal_Int16)( (double)nLineSpacing / 4.40972 );
+        }
+        rLev.mnLineFeed = nLineSpacing;
+    }
+    if ( aParagraphObj.meLineSpacingBottom == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
+        rLev.mnLowerDist = aParagraphObj.mnLineSpacingBottom;
+    if ( aParagraphObj.meLineSpacingTop == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
+        rLev.mnUpperDist = aParagraphObj.mnLineSpacingTop;
+    if ( aParagraphObj.meForbiddenRules == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
+    {
+        rLev.mnAsianSettings &=~1;
+        if ( aParagraphObj.mbForbiddenRules )
+            rLev.mnAsianSettings |= 1;
+    }
+    if ( aParagraphObj.meParagraphPunctation == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
+    {
+        rLev.mnAsianSettings &=~4;
+        if ( aParagraphObj.mbParagraphPunctation )
+            rLev.mnAsianSettings |= 4;
+    }
+
+    if ( aParagraphObj.meBiDi == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
+        rLev.mnBiDi = aParagraphObj.mnBiDi;
+
+    rLev.mbIsBullet = aParagraphObj.mbIsBullet; //( ( aParagraphObj.nBulletFlags & 1 ) != 0 );
+
+    if ( !nLevel )
+    {
+        if ( ( aParagraphObj.meBullet ==  ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
+                    && aParagraphObj.bExtendedParameters )
+        {
+            for ( sal_Int16 i = 0; i < 5; i++ )
+            {
+                PPTExParaLevel& rLevel = maParaLevel[ i ];
+                if ( i )
+                    aParagraphObj.ImplGetNumberingLevel( rBuProv, i, FALSE );
+//              rLevel.mbIsBullet = ( ( aParagraphObj.nBulletFlags & 1 ) != 0 );
+                rLevel.mnTextOfs = aParagraphObj.nTextOfs;
+                rLevel.mnBulletOfs = (sal_uInt16)aParagraphObj.nBulletOfs;
+                rLevel.mnBulletChar = aParagraphObj.cBulletId;
+                FontCollectionEntry aFontDescEntry( aParagraphObj.aFontDesc.Name, aParagraphObj.aFontDesc.Family,
+                                                        aParagraphObj.aFontDesc.Pitch, aParagraphObj.aFontDesc.CharSet );
+                rLevel.mnBulletFont = (sal_uInt16)rFontCollection.GetId( aFontDescEntry );
+                rLevel.mnBulletHeight = aParagraphObj.nBulletRealSize;
+                rLevel.mnBulletColor = aParagraphObj.nBulletColor;
+
+                rLevel.mbExtendedBulletsUsed = aParagraphObj.bExtendedBulletsUsed;
+                rLevel.mnBulletId = aParagraphObj.nBulletId;
+                rLevel.mnNumberingType = aParagraphObj.nNumberingType;
+                rLevel.mnBulletStart = aParagraphObj.nStartWith;
+                rLevel.mnMappedNumType = aParagraphObj.nMappedNumType;
+            }
+        }
+    }
+}
+
+void PPTExParaSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bool, sal_Bool bSimpleText,
+    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPagePropSet )
+{
+    const PPTExParaLevel& rLev = maParaLevel[ nLev ];
+
+    if ( maParaLevel[ 0 ].mbExtendedBulletsUsed || maParaLevel[ 1 ].mbExtendedBulletsUsed ||
+            maParaLevel[ 2 ].mbExtendedBulletsUsed || maParaLevel[ 3 ].mbExtendedBulletsUsed ||
+                maParaLevel[ 4 ].mbExtendedBulletsUsed )
+    {
+        SvStream& rOut = rBuProv.aBuExMasterStream;
+        if ( !nLev )
+        {
+            rOut << (sal_uInt32)( ( EPP_PST_ExtendedParagraphMasterAtom << 16 ) | ( mnInstance << 4 ) )
+                 << (sal_uInt32)( 5 * 16 + 2 )
+                 << (sal_uInt16)5;              // depth
+        }
+        sal_uInt16 nBulletId = rLev.mnBulletId;
+        if ( rLev.mnNumberingType != SVX_NUM_BITMAP )
+            nBulletId = 0xffff;
+        rOut << (sal_uInt32)0x03800000
+             << (sal_uInt16)nBulletId
+             << (sal_uInt32)rLev.mnMappedNumType
+             << (sal_uInt16)rLev.mnBulletStart
+             << (sal_uInt32)0;
+    }
+
+    sal_uInt32 nParaFlags = 0x3ffdff;
+    sal_uInt16 nBulletFlags = ( rLev.mbIsBullet ) ? 0xf : 0xe;
+
+    if ( nLev )
+        nParaFlags &= 0x207fff;
+    if ( bSimpleText )
+        nParaFlags &= 0x7fff;
+    sal_uInt32 nBulletColor = rLev.mnBulletColor;
+    if ( nBulletColor == COL_AUTO )
+    {
+        sal_Bool bIsDark = sal_False;
+        ::com::sun::star::uno::Any aAny;
+        if ( PropValue::GetPropertyValue( aAny, rPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundDark" ) ), sal_True ) )
+            aAny >>= bIsDark;
+        nBulletColor = bIsDark ? 0xffffff : 0x000000;
+    }
+    nBulletColor &= 0xffffff;
+    nBulletColor |= 0xfe000000;
+    rSt << nParaFlags
+        << nBulletFlags
+        << rLev.mnBulletChar
+        << rLev.mnBulletFont
+        << rLev.mnBulletHeight
+        << nBulletColor
+        << rLev.mnAdjust
+        << rLev.mnLineFeed
+        << rLev.mnUpperDist
+        << rLev.mnLowerDist
+        << rLev.mnTextOfs
+        << rLev.mnBulletOfs;
+
+    if ( bSimpleText || nLev )
+    {
+        if ( nParaFlags & 0x200000 )
+            rSt << rLev.mnBiDi;
+    }
+    else
+    {
+        rSt << rLev.mnDefaultTab
+            << (sal_uInt16)0
+            << (sal_uInt16)0
+            << rLev.mnAsianSettings
+            << rLev.mnBiDi;
+    }
+}
+
+
+PPTExStyleSheet::PPTExStyleSheet( sal_uInt16 nDefaultTab, PPTExBulletProvider& rBuProv )
+{
+    for ( int nInstance = EPP_TEXTTYPE_Title; nInstance <= EPP_TEXTTYPE_QuarterBody; nInstance++ )
+    {
+        mpParaSheet[ nInstance ] = ( nInstance == EPP_TEXTTYPE_notUsed ) ? NULL : new PPTExParaSheet( nInstance, nDefaultTab, rBuProv );
+        mpCharSheet[ nInstance ] = ( nInstance == EPP_TEXTTYPE_notUsed ) ? NULL : new PPTExCharSheet( nInstance );
+    }
+}
+
+PPTExStyleSheet::~PPTExStyleSheet()
+{
+    for ( int nInstance = EPP_TEXTTYPE_Title; nInstance <= EPP_TEXTTYPE_QuarterBody; nInstance++ )
+    {
+        if ( nInstance == EPP_TEXTTYPE_notUsed )
+            continue;
+
+        delete mpParaSheet[ nInstance ];
+        delete mpCharSheet[ nInstance ];
+    }
+}
+
+void PPTExStyleSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
+                                        FontCollection& rFontCollection, int nInstance, int nLevel )
+{
+    if ( nInstance == EPP_TEXTTYPE_notUsed )
+        return;
+    mpCharSheet[ nInstance ]->SetStyleSheet( rXPropSet, rFontCollection, nLevel );
+    mpParaSheet[ nInstance ]->SetStyleSheet( rXPropSet, rFontCollection, nLevel, mpCharSheet[ nInstance ]->maCharLevel[ nLevel ] );
+}
+
+sal_Bool PPTExStyleSheet::IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLevel, PPTExTextAttr eAttr, sal_uInt32 nValue )
+{
+    const PPTExParaLevel& rPara = mpParaSheet[ nInstance ]->maParaLevel[ nLevel ];
+    const PPTExCharLevel& rChar = mpCharSheet[ nInstance ]->maCharLevel[ nLevel ];
+
+    sal_uInt32 nFlag = 0;
+
+    switch ( eAttr )
+    {
+        case ParaAttr_BulletOn : return ( rPara.mbIsBullet ) ? ( nValue ) ? FALSE : TRUE : ( nValue ) ? TRUE : FALSE;
+        case ParaAttr_BuHardFont :
+        case ParaAttr_BulletFont : return ( rPara.mnBulletFont != nValue );
+        case ParaAttr_BuHardColor :
+        case ParaAttr_BulletColor : return ( rPara.mnBulletColor != nValue );
+        case ParaAttr_BuHardHeight :
+        case ParaAttr_BulletHeight : return ( rPara.mnBulletHeight != nValue );
+        case ParaAttr_BulletChar : return ( rPara.mnBulletChar != nValue );
+        case ParaAttr_Adjust : return ( rPara.mnAdjust != nValue );
+        case ParaAttr_LineFeed : return ( rPara.mnLineFeed != nValue );
+        case ParaAttr_UpperDist : return ( rPara.mnUpperDist != nValue );
+        case ParaAttr_LowerDist : return ( rPara.mnLowerDist != nValue );
+        case ParaAttr_TextOfs : return ( rPara.mnTextOfs != nValue );
+        case ParaAttr_BulletOfs : return ( rPara.mnBulletOfs != nValue );
+        case ParaAttr_DefaultTab : return ( rPara.mnDefaultTab != nValue );
+        case ParaAttr_BiDi : return ( rPara.mnBiDi != nValue );
+        case CharAttr_Bold : nFlag = 1; break;
+        case CharAttr_Italic : nFlag = 2; break;
+        case CharAttr_Underline : nFlag = 4; break;
+        case CharAttr_Shadow : nFlag = 16; break;
+        case CharAttr_Strikeout : nFlag = 256; break;
+        case CharAttr_Embossed : nFlag = 512; break;
+        case CharAttr_Font : return ( rChar.mnFont != nValue );
+        case CharAttr_AsianOrComplexFont : return ( rChar.mnAsianOrComplexFont != nValue );
+        case CharAttr_Symbol : return TRUE;
+        case CharAttr_FontHeight : return ( rChar.mnFontHeight != nValue );
+        case CharAttr_FontColor : return ( rChar.mnFontColor != nValue );
+        case CharAttr_Escapement : return ( rChar.mnEscapement != nValue );
+        default:
+            break;
+    };
+    if ( nFlag )
+    {
+        if ( rChar.mnFlags & nFlag )
+            return ( ( nValue & nFlag ) == 0 );
+        else
+            return ( ( nValue & nFlag ) != 0 );
+    }
+    return TRUE;
+}
+
+sal_uInt32 PPTExStyleSheet::SizeOfTxCFStyleAtom() const
+{
+    return 24;
+}
+
+// the TxCFStyleAtom stores the text properties that are used
+// when creating new objects in PowerPoint.
+
+void PPTExStyleSheet::WriteTxCFStyleAtom( SvStream& rSt )
+{
+    const PPTExCharLevel& rCharStyle = mpCharSheet[ EPP_TEXTTYPE_Other ]->maCharLevel[ 0 ];
+
+    sal_uInt16 nFlags = 0x60        // ??
+                      | 0x02        // fontsize;
+                      | 0x04;       // fontcolor
+
+    sal_uInt32 nCharFlags = rCharStyle.mnFlags;
+    nCharFlags &= CharAttr_Italic | CharAttr_Bold | CharAttr_Underline | CharAttr_Shadow;
+
+    rSt << (sal_uInt32)( EPP_TxCFStyleAtom << 16 )  // recordheader
+        << SizeOfTxCFStyleAtom() - 8
+        << (sal_uInt16)( 0x80 | nCharFlags )
+        << (sal_uInt16)nFlags
+        << (sal_uInt16)nCharFlags
+        << (sal_Int32)-1                            // ?
+        << rCharStyle.mnFontHeight
+        << rCharStyle.mnFontColor;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
new file mode 100644
index 000000000000..77ac24943f21
--- /dev/null
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -0,0 +1,1479 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "text.hxx"
+
+#include <com/sun/star/awt/CharSet.hpp>
+#include <com/sun/star/awt/FontWeight.hpp>
+#include <com/sun/star/awt/FontUnderline.hpp>
+#include <com/sun/star/beans/XPropertyState.hpp>
+#include <com/sun/star/container/XEnumerationAccess.hpp>
+#include <com/sun/star/container/XIndexReplace.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
+#include <com/sun/star/i18n/ScriptDirection.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
+#include <com/sun/star/i18n/XScriptTypeDetector.hpp>
+#include <com/sun/star/text/FontRelief.hpp>
+#include <com/sun/star/text/XTextField.hpp>
+#include <com/sun/star/text/XTextRange.hpp>
+#include <com/sun/star/style/LineSpacing.hpp>
+#include <com/sun/star/style/LineSpacingMode.hpp>
+#include <com/sun/star/style/ParagraphAdjust.hpp>
+#include <com/sun/star/style/TabStop.hpp>
+
+#include <svl/languageoptions.hxx>
+#include <sfx2/app.hxx>
+#include <editeng/svxenum.hxx>
+#include <editeng/frmdir.hxx>
+#include <unotools/fontcvt.hxx>
+#include <vcl/metric.hxx>
+#include <vcl/outdev.hxx>
+#include <vcl/virdev.hxx>
+#include <comphelper/processfactory.hxx>
+#include <oox/export/drawingml.hxx> // for SubstituteBullet
+
+com::sun::star::uno::Reference< com::sun::star::i18n::XBreakIterator > xPPTBreakIter;
+com::sun::star::uno::Reference< com::sun::star::i18n::XScriptTypeDetector > xScriptTypeDetector;
+
+PortionObj::PortionObj( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
+                FontCollection& rFontCollection ) :
+    mnCharAttrHard      ( 0 ),
+    mnCharAttr          ( 0 ),
+    mnFont              ( 0 ),
+    mnAsianOrComplexFont( 0xffff ),
+    mnTextSize          ( 0 ),
+    mbLastPortion       ( TRUE ),
+    mpText              ( NULL ),
+    mpFieldEntry        ( NULL )
+{
+    mXPropSet = rXPropSet;
+
+    ImplGetPortionValues( rFontCollection, FALSE );
+}
+
+PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRange,
+                            sal_Bool bLast, FontCollection& rFontCollection ) :
+    mnCharAttrHard          ( 0 ),
+    mnCharAttr              ( 0 ),
+    mnFont                  ( 0 ),
+    mnAsianOrComplexFont    ( 0xffff ),
+    mbLastPortion           ( bLast ),
+    mpText                  ( NULL ),
+    mpFieldEntry            ( NULL )
+{
+    String aString( rXTextRange->getString() );
+    String aURL;
+    BOOL bRTL_endingParen = FALSE;
+
+    mnTextSize = aString.Len();
+    if ( bLast )
+        mnTextSize++;
+
+    if ( mnTextSize )
+    {
+        mpFieldEntry = NULL;
+        sal_uInt32 nFieldType = 0;
+
+        mXPropSet = ::com::sun::star::uno::Reference<
+            ::com::sun::star::beans::XPropertySet >
+                ( rXTextRange, ::com::sun::star::uno::UNO_QUERY );
+        mXPropState = ::com::sun::star::uno::Reference<
+            ::com::sun::star::beans::XPropertyState >
+                ( rXTextRange, ::com::sun::star::uno::UNO_QUERY );
+
+        sal_Bool bPropSetsValid = ( mXPropSet.is() && mXPropState.is() );
+        if ( bPropSetsValid )
+            nFieldType = ImplGetTextField( rXTextRange, mXPropSet, aURL );
+        if ( nFieldType )
+        {
+            mpFieldEntry = new FieldEntry( nFieldType, 0, mnTextSize );
+            if ( ( nFieldType >> 28 == 4 ) )
+            {
+                mpFieldEntry->aRepresentation = aString;
+                mpFieldEntry->aFieldUrl = aURL;
+            }
+        }
+        sal_Bool bSymbol = FALSE;
+
+        if ( bPropSetsValid && ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontCharSet" ) ), FALSE ) )
+        {
+            sal_Int16 nCharset = 0;
+            mAny >>= nCharset;
+            if ( nCharset == ::com::sun::star::awt::CharSet::SYMBOL )
+                bSymbol = TRUE;
+        }
+        if ( mpFieldEntry && ( nFieldType & 0x800000 ) )    // placeholder ?
+        {
+            mnTextSize = 1;
+            if ( bLast )
+                mnTextSize++;
+            mpText = new sal_uInt16[ mnTextSize ];
+            mpText[ 0 ] = 0x2a;
+        }
+        else
+        {
+            const sal_Unicode* pText = aString.GetBuffer();
+            // For i39516 - a closing parenthesis that ends an RTL string is displayed backwards by PPT
+            // Solution: add a Unicode Right-to-Left Mark, following the method described in i18024
+            if ( bLast && pText[ aString.Len() - 1 ] == sal_Unicode(')') && rFontCollection.GetScriptDirection( aString ) == com::sun::star::i18n::ScriptDirection::RIGHT_TO_LEFT )
+            {
+                mnTextSize++;
+                bRTL_endingParen = TRUE;
+            }
+            mpText = new sal_uInt16[ mnTextSize ];
+            sal_uInt16 nChar;
+            for ( int i = 0; i < aString.Len(); i++ )
+            {
+                nChar = (sal_uInt16)pText[ i ];
+                if ( nChar == 0xa )
+                    nChar++;
+                else if ( !bSymbol )
+                {
+                    switch ( nChar )
+                    {
+                        // Currency
+                        case 128:   nChar = 0x20AC; break;
+                        // Punctuation and other
+                        case 130:   nChar = 0x201A; break;// SINGLE LOW-9 QUOTATION MARK
+                        case 131:   nChar = 0x0192; break;// LATIN SMALL LETTER F WITH HOOK
+                        case 132:   nChar = 0x201E; break;// DOUBLE LOW-9 QUOTATION MARK
+                                                              // LOW DOUBLE PRIME QUOTATION MARK
+                        case 133:   nChar = 0x2026; break;// HORIZONTAL ELLIPSES
+                        case 134:   nChar = 0x2020; break;// DAGGER
+                        case 135:   nChar = 0x2021; break;// DOUBLE DAGGER
+                        case 136:   nChar = 0x02C6; break;// MODIFIER LETTER CIRCUMFLEX ACCENT
+                        case 137:   nChar = 0x2030; break;// PER MILLE SIGN
+                        case 138:   nChar = 0x0160; break;// LATIN CAPITAL LETTER S WITH CARON
+                        case 139:   nChar = 0x2039; break;// SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+                        case 140:   nChar = 0x0152; break;// LATIN CAPITAL LIGATURE OE
+                        case 142:   nChar = 0x017D; break;// LATIN CAPITAL LETTER Z WITH CARON
+                        case 145:   nChar = 0x2018; break;// LEFT SINGLE QUOTATION MARK
+                                                              // MODIFIER LETTER TURNED COMMA
+                        case 146:   nChar = 0x2019; break;// RIGHT SINGLE QUOTATION MARK
+                                                              // MODIFIER LETTER APOSTROPHE
+                        case 147:   nChar = 0x201C; break;// LEFT DOUBLE QUOTATION MARK
+                                                              // REVERSED DOUBLE PRIME QUOTATION MARK
+                        case 148:   nChar = 0x201D; break;// RIGHT DOUBLE QUOTATION MARK
+                                                              // REVERSED DOUBLE PRIME QUOTATION MARK
+                        case 149:   nChar = 0x2022; break;// BULLET
+                        case 150:   nChar = 0x2013; break;// EN DASH
+                        case 151:   nChar = 0x2014; break;// EM DASH
+                        case 152:   nChar = 0x02DC; break;// SMALL TILDE
+                        case 153:   nChar = 0x2122; break;// TRADE MARK SIGN
+                        case 154:   nChar = 0x0161; break;// LATIN SMALL LETTER S WITH CARON
+                        case 155:   nChar = 0x203A; break;// SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+                        case 156:   nChar = 0x0153; break;// LATIN SMALL LIGATURE OE
+                        case 158:   nChar = 0x017E; break;// LATIN SMALL LETTER Z WITH CARON
+                        case 159:   nChar = 0x0178; break;// LATIN CAPITAL LETTER Y WITH DIAERESIS
+//                      case 222:   nChar = 0x00B6; break;// PILCROW SIGN / PARAGRAPH SIGN
+                    }
+                }
+                mpText[ i ] = nChar;
+            }
+        }
+        if ( bRTL_endingParen )
+            mpText[ mnTextSize - 2 ] = 0x200F; // Unicode Right-to-Left mark
+
+        if ( bLast )
+            mpText[ mnTextSize - 1 ] = 0xd;
+
+        if ( bPropSetsValid )
+            ImplGetPortionValues( rFontCollection, TRUE );
+    }
+}
+
+PortionObj::PortionObj( PortionObj& rPortionObj )
+: PropStateValue( rPortionObj )
+{
+    ImplConstruct( rPortionObj );
+}
+
+PortionObj::~PortionObj()
+{
+    ImplClear();
+}
+
+void PortionObj::Write( SvStream* pStrm, sal_Bool bLast )
+{
+    sal_uInt32 nCount = mnTextSize;
+    if ( bLast && mbLastPortion )
+        nCount--;
+    for ( sal_uInt32 i = 0; i < nCount; i++ )
+        *pStrm << (sal_uInt16)mpText[ i ];
+}
+
+void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool bGetPropStateValue )
+{
+
+    sal_Bool bOk = ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontName" ) ), bGetPropStateValue );
+    meFontName = ePropState;
+    if ( bOk )
+    {
+        FontCollectionEntry aFontDesc( *(::rtl::OUString*)mAny.getValue() );
+        sal_uInt32  nCount = rFontCollection.GetCount();
+        mnFont = (sal_uInt16)rFontCollection.GetId( aFontDesc );
+        if ( mnFont == nCount )
+        {
+            FontCollectionEntry& rFontDesc = rFontCollection.GetLast();
+            if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontCharSet" ) ), sal_False ) )
+                mAny >>= rFontDesc.CharSet;
+            if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontFamily" ) ), sal_False ) )
+                mAny >>= rFontDesc.Family;
+            if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontPitch" ) ), sal_False ) )
+                mAny >>= rFontDesc.Pitch;
+        }
+    }
+
+    sal_Int16 nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage( Application::GetSettings().GetLanguage() );
+    if ( mpText && mnTextSize && xPPTBreakIter.is() )
+    {
+        rtl::OUString sT( mpText, mnTextSize );
+        nScriptType = xPPTBreakIter->getScriptType( sT, 0 );
+    }
+    if ( nScriptType != com::sun::star::i18n::ScriptType::COMPLEX )
+    {
+        bOk = ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontNameAsian" ) ), bGetPropStateValue );
+        meAsianOrComplexFont = ePropState;
+        if ( bOk )
+        {
+            FontCollectionEntry aFontDesc( *(::rtl::OUString*)mAny.getValue() );
+            sal_uInt32  nCount = rFontCollection.GetCount();
+            mnAsianOrComplexFont = (sal_uInt16)rFontCollection.GetId( aFontDesc );
+            if ( mnAsianOrComplexFont == nCount )
+            {
+                FontCollectionEntry& rFontDesc = rFontCollection.GetLast();
+                if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontCharSetAsian" ) ), sal_False ) )
+                    mAny >>= rFontDesc.CharSet;
+                if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontFamilyAsian" ) ), sal_False ) )
+                    mAny >>= rFontDesc.Family;
+                if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontPitchAsian" ) ), sal_False ) )
+                    mAny >>= rFontDesc.Pitch;
+            }
+        }
+    }
+    else
+    {
+        bOk = ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontNameComplex" ) ), bGetPropStateValue );
+        meAsianOrComplexFont = ePropState;
+        if ( bOk )
+        {
+            FontCollectionEntry aFontDesc( *(::rtl::OUString*)mAny.getValue() );
+            sal_uInt32  nCount = rFontCollection.GetCount();
+            mnAsianOrComplexFont = (sal_uInt16)rFontCollection.GetId( aFontDesc );
+            if ( mnAsianOrComplexFont == nCount )
+            {
+                FontCollectionEntry& rFontDesc = rFontCollection.GetLast();
+                if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontCharSetComplex" ) ), sal_False ) )
+                    mAny >>= rFontDesc.CharSet;
+                if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontFamilyComplex" ) ), sal_False ) )
+                    mAny >>= rFontDesc.Family;
+                if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontPitchComplex" ) ), sal_False ) )
+                    mAny >>= rFontDesc.Pitch;
+            }
+        }
+    }
+
+    rtl::OUString aCharHeightName, aCharWeightName, aCharLocaleName, aCharPostureName;
+    switch( nScriptType )
+    {
+        case com::sun::star::i18n::ScriptType::ASIAN :
+        {
+            aCharHeightName  = String( RTL_CONSTASCII_USTRINGPARAM( "CharHeightAsian" ) );
+            aCharWeightName  = String( RTL_CONSTASCII_USTRINGPARAM( "CharWeightAsian" ) );
+            aCharLocaleName  = String( RTL_CONSTASCII_USTRINGPARAM( "CharLocaleAsian" ) );
+            aCharPostureName = String( RTL_CONSTASCII_USTRINGPARAM( "CharPostureAsian" ) );
+            break;
+        }
+        case com::sun::star::i18n::ScriptType::COMPLEX :
+        {
+            aCharHeightName  = String( RTL_CONSTASCII_USTRINGPARAM( "CharHeightComplex" ) );
+            aCharWeightName  = String( RTL_CONSTASCII_USTRINGPARAM( "CharWeightComplex" ) );
+            aCharLocaleName  = String( RTL_CONSTASCII_USTRINGPARAM( "CharLocaleComplex" ) );
+            aCharPostureName = String( RTL_CONSTASCII_USTRINGPARAM( "CharPostureComplex" ) );
+            break;
+        }
+        default:
+        {
+            aCharHeightName  = String( RTL_CONSTASCII_USTRINGPARAM( "CharHeight" ) );
+            aCharWeightName  = String( RTL_CONSTASCII_USTRINGPARAM( "CharWeight" ) );
+            aCharLocaleName  = String( RTL_CONSTASCII_USTRINGPARAM( "CharLocale" ) );
+            aCharPostureName = String( RTL_CONSTASCII_USTRINGPARAM( "CharPosture" ) );
+            break;
+        }
+    }
+
+    mnCharHeight = 24;
+    if ( GetPropertyValue( mAny, mXPropSet, aCharHeightName, sal_False ) )
+    {
+        float fVal(0.0);
+        if ( mAny >>= fVal )
+        {
+            mnCharHeight = (sal_uInt16)( fVal + 0.5 );
+            meCharHeight = GetPropertyState( mXPropSet, aCharHeightName );
+        }
+    }
+    if ( GetPropertyValue( mAny, mXPropSet, aCharWeightName, sal_False ) )
+    {
+        float fFloat(0.0);
+        if ( mAny >>= fFloat )
+        {
+            if ( fFloat >= ::com::sun::star::awt::FontWeight::SEMIBOLD )
+                mnCharAttr |= 1;
+            if ( GetPropertyState( mXPropSet, aCharWeightName ) == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
+                mnCharAttrHard |= 1;
+        }
+    }
+    if ( GetPropertyValue( mAny, mXPropSet, aCharLocaleName, sal_False ) )
+    {
+        com::sun::star::lang::Locale eLocale;
+        if ( mAny >>= eLocale )
+            meCharLocale = eLocale;
+    }
+    if ( GetPropertyValue( mAny, mXPropSet, aCharPostureName, sal_False ) )
+    {
+        ::com::sun::star::awt::FontSlant aFS;
+        if ( mAny >>= aFS )
+        {
+            switch( aFS )
+            {
+                case ::com::sun::star::awt::FontSlant_OBLIQUE :
+                case ::com::sun::star::awt::FontSlant_ITALIC :
+                    mnCharAttr |= 2;
+                    break;
+                default:
+                    break;
+            }
+            if ( GetPropertyState( mXPropSet, aCharPostureName ) == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
+                mnCharAttrHard |= 2;
+        }
+    }
+
+    if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharUnderline" ) ), bGetPropStateValue ) )
+    {
+        sal_Int16 nVal(0);
+        mAny >>= nVal;
+        switch ( nVal )
+        {
+            case ::com::sun::star::awt::FontUnderline::SINGLE :
+            case ::com::sun::star::awt::FontUnderline::DOUBLE :
+            case ::com::sun::star::awt::FontUnderline::DOTTED :
+                mnCharAttr |= 4;
+        }
+    }
+    if ( ePropState == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
+        mnCharAttrHard |= 4;
+
+    if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharShadowed" ) ), bGetPropStateValue ) )
+    {
+        sal_Bool bBool(sal_False);
+        mAny >>= bBool;
+        if ( bBool )
+            mnCharAttr |= 0x10;
+    }
+    if ( ePropState == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
+        mnCharAttrHard |= 16;
+
+    if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharRelief" ) ), bGetPropStateValue ) )
+    {
+        sal_Int16 nVal(0);
+        mAny >>= nVal;
+        if ( nVal != ::com::sun::star::text::FontRelief::NONE )
+            mnCharAttr |= 512;
+    }
+    if ( ePropState == ::com::sun::star::beans::PropertyState_DIRECT_VALUE )
+        mnCharAttrHard |= 512;
+
+    if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharColor" ) ), bGetPropStateValue ) )
+    {
+        sal_uInt32 nSOColor = *( (sal_uInt32*)mAny.getValue() );
+        mnCharColor = nSOColor & 0xff00ff00;                            // green and hibyte
+        mnCharColor |= (sal_uInt8)( nSOColor ) << 16;                   // red and blue is switched
+        mnCharColor |= (sal_uInt8)( nSOColor >> 16 );
+    }
+    meCharColor = ePropState;
+
+    mnCharEscapement = 0;
+    if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharEscapement" ) ), bGetPropStateValue ) )
+    {
+        mAny >>= mnCharEscapement;
+        if ( mnCharEscapement > 100 )
+            mnCharEscapement = 33;
+        else if ( mnCharEscapement < -100 )
+            mnCharEscapement = -33;
+    }
+    meCharEscapement = ePropState;
+}
+
+void PortionObj::ImplClear()
+{
+    delete (FieldEntry*)mpFieldEntry;
+    delete[] mpText;
+}
+
+void PortionObj::ImplConstruct( PortionObj& rPortionObj )
+{
+    mbLastPortion = rPortionObj.mbLastPortion;
+    mnTextSize = rPortionObj.mnTextSize;
+    mnCharColor = rPortionObj.mnCharColor;
+    mnCharEscapement = rPortionObj.mnCharEscapement;
+    mnCharAttr = rPortionObj.mnCharAttr;
+    mnCharHeight = rPortionObj.mnCharHeight;
+    mnFont = rPortionObj.mnFont;
+    mnAsianOrComplexFont = rPortionObj.mnAsianOrComplexFont;
+
+    if ( rPortionObj.mpText )
+    {
+        mpText = new sal_uInt16[ mnTextSize ];
+        memcpy( mpText, rPortionObj.mpText, mnTextSize << 1 );
+    }
+    else
+        mpText = NULL;
+
+    if ( rPortionObj.mpFieldEntry )
+        mpFieldEntry = new FieldEntry( *( rPortionObj.mpFieldEntry ) );
+    else
+        mpFieldEntry = NULL;
+}
+
+sal_uInt32 PortionObj::ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition )
+{
+    if ( mpFieldEntry && ( !mpFieldEntry->nFieldStartPos ) )
+    {
+        mpFieldEntry->nFieldStartPos += nCurrentTextPosition;
+        mpFieldEntry->nFieldEndPos += nCurrentTextPosition;
+    }
+    return mnTextSize;
+}
+
+//  -----------------------------------------------------------------------
+// Rueckgabe:                           0 = kein TextField
+//  bit28->31   text field type :
+//                                      1 = Date
+//                                      2 = Time
+//                                      3 = SlideNumber
+//                                      4 = Url
+//                                      5 = DateTime
+//                                      6 = header
+//                                      7 = footer
+//  bit24->27   text field sub type (optional)
+//     23->     PPT Textfield needs a placeholder
+
+sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & ,
+    const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, String& rURL )
+{
+    sal_uInt32 nRetValue = 0;
+    sal_Int32 nFormat;
+    ::com::sun::star::uno::Any aAny;
+    if ( GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "TextPortionType" ) ), sal_True ) )
+    {
+        String  aTextFieldType( *(::rtl::OUString*)aAny.getValue() );
+        if ( aTextFieldType == String( RTL_CONSTASCII_USTRINGPARAM( "TextField" ) ) )
+        {
+            if ( GetPropertyValue( aAny, rXPropSet, aTextFieldType, sal_True ) )
+            {
+                ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextField > aXTextField;
+                if ( aAny >>= aXTextField )
+                {
+                    if ( aXTextField.is() )
+                    {
+                        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
+                            xFieldPropSet( aXTextField, ::com::sun::star::uno::UNO_QUERY );
+                        if ( xFieldPropSet.is() )
+                        {
+                            String aFieldKind( aXTextField->getPresentation( TRUE ) );
+                            if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "Date" ) ) )
+                            {
+                                if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsFix" ) ) ), sal_True )
+                                {
+                                    sal_Bool bBool = sal_False;
+                                    aAny >>= bBool;
+                                    if ( !bBool )  // Fixed DateFields gibt es in PPT nicht
+                                    {
+                                        if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Format" ) ) ), sal_True )
+                                        {
+                                            nFormat = *(sal_Int32*)aAny.getValue();
+                                            switch ( nFormat )
+                                            {
+                                                default:
+                                                case 5 :
+                                                case 4 :
+                                                case 2 : nFormat = 0; break;
+                                                case 8 :
+                                                case 9 :
+                                                case 3 : nFormat = 1; break;
+                                                case 7 :
+                                                case 6 : nFormat = 2; break;
+                                            }
+                                            nRetValue |= ( ( ( 1 << 4 ) | nFormat ) << 24 ) | 0x800000;
+                                        }
+                                    }
+                                }
+                            }
+                            else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ) )
+                            {
+                                if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ) ), sal_True )
+                                    rURL = String( *(::rtl::OUString*)aAny.getValue() );
+                                nRetValue = 4 << 28;
+                            }
+                            else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "Page" ) ) )
+                            {
+                                nRetValue = 3 << 28 | 0x800000;
+                            }
+                            else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "Pages" ) ) )
+                            {
+
+                            }
+                            else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "Time" ) ) )
+                            {
+                                if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsFix" ) ) ), sal_True )
+                                {
+                                    sal_Bool bBool = sal_False;
+                                    aAny >>= bBool;
+                                    if ( !bBool )
+                                    {
+                                        if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsFix" ) ) ), sal_True )
+                                        {
+                                            nFormat = *(sal_Int32*)aAny.getValue();
+                                            nRetValue |= ( ( ( 2 << 4 ) | nFormat ) << 24 ) | 0x800000;
+                                        }
+                                    }
+                                }
+                            }
+                            else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "File" ) ) )
+                            {
+
+                            }
+                            else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "Table" ) ) )
+                            {
+
+                            }
+                            else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "ExtTime" ) ) )
+                            {
+                                if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsFix" ) ) ), sal_True )
+                                {
+                                    sal_Bool bBool = sal_False;
+                                    aAny >>= bBool;
+                                    if ( !bBool )
+                                    {
+                                        if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Format" ) ) ), sal_True )
+                                        {
+                                            nFormat = *(sal_Int32*)aAny.getValue();
+                                            switch ( nFormat )
+                                            {
+                                                default:
+                                                case 6 :
+                                                case 7 :
+                                                case 8 :
+                                                case 2 : nFormat = 12; break;
+                                                case 3 : nFormat = 9; break;
+                                                case 5 :
+                                                case 4 : nFormat = 10; break;
+
+                                            }
+                                            nRetValue |= ( ( ( 2 << 4 ) | nFormat ) << 24 ) | 0x800000;
+                                        }
+                                    }
+                                }
+                            }
+                            else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "ExtFile" ) ) )
+                            {
+
+                            }
+                            else if ( aFieldKind ==  String( RTL_CONSTASCII_USTRINGPARAM( "Author" ) ) )
+                            {
+
+                            }
+                            else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "DateTime" ) ) )
+                            {
+                                nRetValue = 5 << 28 | 0x800000;
+                            }
+                            else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "Header" ) ) )
+                            {
+                                nRetValue = 6 << 28 | 0x800000;
+                            }
+                            else if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "Footer" ) ) )
+                            {
+                                nRetValue = 7 << 28 | 0x800000;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return nRetValue;
+}
+
+PortionObj& PortionObj::operator=( PortionObj& rPortionObj )
+{
+    if ( this != &rPortionObj )
+    {
+        ImplClear();
+        ImplConstruct( rPortionObj );
+    }
+    return *this;
+}
+
+ParagraphObj::ParagraphObj( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
+                PPTExBulletProvider& rProv ) :
+    maMapModeSrc        ( MAP_100TH_MM ),
+    maMapModeDest       ( MAP_INCH, Point(), Fraction( 1, 576 ), Fraction( 1, 576 ) )
+{
+    mXPropSet = rXPropSet;
+
+    bExtendedParameters = FALSE;
+
+    nDepth = 0;
+    nBulletFlags = 0;
+    nParaFlags = 0;
+
+    ImplGetParagraphValues( rProv, FALSE );
+}
+
+    ParagraphObj::ParagraphObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & rXTextContent,
+                    ParaFlags aParaFlags, FontCollection& rFontCollection, PPTExBulletProvider& rProv ) :
+    maMapModeSrc        ( MAP_100TH_MM ),
+    maMapModeDest       ( MAP_INCH, Point(), Fraction( 1, 576 ), Fraction( 1, 576 ) ),
+    mbFirstParagraph    ( aParaFlags.bFirstParagraph ),
+    mbLastParagraph     ( aParaFlags.bLastParagraph )
+{
+    bExtendedParameters = FALSE;
+
+    nDepth = 0;
+    nBulletFlags = 0;
+    nParaFlags = 0;
+
+    mXPropSet = ::com::sun::star::uno::Reference<
+        ::com::sun::star::beans::XPropertySet >
+            ( rXTextContent, ::com::sun::star::uno::UNO_QUERY );
+
+    mXPropState = ::com::sun::star::uno::Reference<
+        ::com::sun::star::beans::XPropertyState >
+            ( rXTextContent, ::com::sun::star::uno::UNO_QUERY );
+
+    if ( mXPropSet.is() && mXPropState.is() )
+    {
+        ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess >
+            aXTextPortionEA( rXTextContent, ::com::sun::star::uno::UNO_QUERY );
+        if ( aXTextPortionEA.is() )
+        {
+            ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration >
+                aXTextPortionE( aXTextPortionEA->createEnumeration() );
+            if ( aXTextPortionE.is() )
+            {
+                while ( aXTextPortionE->hasMoreElements() )
+                {
+                    ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > aXCursorText;
+                    ::com::sun::star::uno::Any aAny( aXTextPortionE->nextElement() );
+                    if ( aAny >>= aXCursorText )
+                    {
+                        PortionObj* pPortionObj = new PortionObj( aXCursorText, !aXTextPortionE->hasMoreElements(), rFontCollection );
+                        if ( pPortionObj->Count() )
+                            Insert( pPortionObj, LIST_APPEND );
+                        else
+                            delete pPortionObj;
+                    }
+                }
+            }
+        }
+        ImplGetParagraphValues( rProv, TRUE );//
+    }
+}
+
+ParagraphObj::ParagraphObj( ParagraphObj& rObj )
+: List()
+, PropStateValue()
+, SOParagraph()
+{
+    ImplConstruct( rObj );
+}
+
+ParagraphObj::~ParagraphObj()
+{
+    ImplClear();
+}
+
+void ParagraphObj::Write( SvStream* pStrm )
+{
+    for ( void* pPtr = First(); pPtr; pPtr = Next() )
+        ((PortionObj*)pPtr)->Write( pStrm, mbLastParagraph );
+}
+
+void ParagraphObj::ImplClear()
+{
+    for ( void* pPtr = First(); pPtr; pPtr = Next() )
+        delete (PortionObj*)pPtr;
+}
+
+void ParagraphObj::CalculateGraphicBulletSize( sal_uInt16 nFontHeight )
+{
+    if ( ( (SvxExtNumType)nNumberingType == SVX_NUM_BITMAP ) && ( nBulletId != 0xffff ) )
+    {
+        // calculate the bulletrealsize for this grafik
+        if ( aBuGraSize.Width() && aBuGraSize.Height() )
+        {
+            double fCharHeight = nFontHeight;
+            double fLen = aBuGraSize.Height();
+            fCharHeight = fCharHeight * 0.2540;
+            double fQuo = fLen / fCharHeight;
+            nBulletRealSize = (sal_Int16)( fQuo + 0.5 );
+            if ( (sal_uInt16)nBulletRealSize > 400 )
+                nBulletRealSize = 400;
+        }
+    }
+}
+
+// from sw/source/filter/ww8/wrtw8num.cxx for default bullets to export to MS intact
+static void lcl_SubstituteBullet(String& rNumStr, rtl_TextEncoding& rChrSet, String& rFontName)
+{
+    sal_Unicode cChar = rNumStr.GetChar(0);
+    StarSymbolToMSMultiFont *pConvert = CreateStarSymbolToMSMultiFont();
+    String sFont = pConvert->ConvertChar(cChar);
+    delete pConvert;
+    if (sFont.Len())
+    {
+        rNumStr = static_cast< sal_Unicode >(cChar | 0xF000);
+        rFontName = sFont;
+        rChrSet = RTL_TEXTENCODING_SYMBOL;
+    }
+    else if ( (rNumStr.GetChar(0) < 0xE000 || rNumStr.GetChar(0) > 0xF8FF) )
+    {
+        /*
+        Ok we can't fit into a known windows unicode font, but
+        we are not in the private area, so we are a
+        standardized symbol, so turn off the symbol bit and
+        let words own font substitution kick in
+        */
+        rChrSet = RTL_TEXTENCODING_UNICODE;
+        rFontName = ::GetFontToken(rFontName, 0);
+    }
+    else
+    {
+        /*
+        Well we don't have an available substition, and we're
+        in our private area, so give up and show a standard
+        bullet symbol
+        */
+        rFontName.AssignAscii(RTL_CONSTASCII_STRINGPARAM("Wingdings"));
+        rNumStr = static_cast< sal_Unicode >(0x6C);
+     }
+}
+
+void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nNumberingDepth, sal_Bool bIsBullet, sal_Bool bGetPropStateValue )
+{
+    ::com::sun::star::uno::Any aAny;
+    if ( GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "ParaLeftMargin" ) ) ) )
+    {
+        sal_Int32 nVal(0);
+        if ( aAny >>= nVal )
+            nTextOfs = static_cast< sal_Int16 >( nVal / ( 2540.0 / 576 ) + 0.5 ) ;
+    }
+    if ( GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "ParaFirstLineIndent" ) ) ) )
+    {
+        if ( aAny >>= nBulletOfs )
+            nBulletOfs = static_cast< sal_Int32 >( nBulletOfs / ( 2540.0 / 576 ) + 0.5 );
+    }
+    if ( GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "NumberingIsNumber" ) ) ) )
+        aAny >>= bNumberingIsNumber;
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > aXIndexReplace;
+
+    if ( bIsBullet && ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "NumberingRules" ) ), bGetPropStateValue ) )
+    {
+        if ( ( mAny >>= aXIndexReplace ) && nNumberingDepth < aXIndexReplace->getCount() )
+        {
+            mAny <<= aXIndexReplace->getByIndex( nNumberingDepth );
+            ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>
+                aPropertySequence( *( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>*)mAny.getValue() );
+
+            const ::com::sun::star::beans::PropertyValue* pPropValue = aPropertySequence.getArray();
+
+            sal_Int32 nPropertyCount = aPropertySequence.getLength();
+            if ( nPropertyCount )
+            {
+                bExtendedParameters = TRUE;
+                nBulletRealSize = 100;
+                nMappedNumType = 0;
+
+                String aGraphicURL;
+                for ( sal_Int32 i = 0; i < nPropertyCount; i++ )
+                {
+                    const void* pValue = pPropValue[ i ].Value.getValue();
+                    if ( pValue )
+                    {
+                        ::rtl::OUString aPropName( pPropValue[ i ].Name );
+                        if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "NumberingType" ) ) )
+                            nNumberingType = *( (sal_Int16*)pValue );
+                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Adjust" ) ) )
+                            nHorzAdjust = *( (sal_Int16*)pValue );
+                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "BulletChar" ) ) )
+                        {
+                            String aString( *( (String*)pValue ) );
+                            if ( aString.Len() )
+                                cBulletId = aString.GetChar( 0 );
+                        }
+                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "BulletFont" ) ) )
+                        {
+                            aFontDesc = *( (::com::sun::star::awt::FontDescriptor*)pValue );
+
+                            // Our numbullet dialog has set the wrong textencoding for our "StarSymbol" font,
+                            // instead of a Unicode encoding the encoding RTL_TEXTENCODING_SYMBOL was used.
+                            // Because there might exist a lot of damaged documemts I added this two lines
+                            // which fixes the bullet problem for the export.
+                            if ( aFontDesc.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StarSymbol" ) ) )
+                                aFontDesc.CharSet = RTL_TEXTENCODING_MS_1252;
+
+                        }
+                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "GraphicURL" ) ) )
+                            aGraphicURL = ( *(::rtl::OUString*)pValue );
+                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "GraphicSize" ) ) )
+                        {
+                            if ( pPropValue[ i ].Value.getValueType() == ::getCppuType( (::com::sun::star::awt::Size*)0) )
+                            {
+                                // don't cast awt::Size to Size as on 64-bits they are not the same.
+                                ::com::sun::star::awt::Size aSize;
+                                pPropValue[ i ].Value >>= aSize;
+                                aBuGraSize.nA = aSize.Width;
+                                aBuGraSize.nB = aSize.Height;
+                            }
+                        }
+                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StartWith" ) ) )
+                            nStartWith = *( (sal_Int16*)pValue );
+                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "LeftMargin" ) ) )
+                            nTextOfs = nTextOfs + static_cast< sal_Int16 >( *( (sal_Int32*)pValue ) / ( 2540.0 / 576 ) );
+                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FirstLineOffset" ) ) )
+                            nBulletOfs += (sal_Int16)( *( (sal_Int32*)pValue ) / ( 2540.0 / 576 ) );
+                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "BulletColor" ) ) )
+                        {
+                            sal_uInt32 nSOColor = *( (sal_uInt32*)pValue );
+                            nBulletColor = nSOColor & 0xff00ff00;                       // green and hibyte
+                            nBulletColor |= (sal_uInt8)( nSOColor ) << 16;              // red
+                            nBulletColor |= (sal_uInt8)( nSOColor >> 16 ) | 0xfe000000; // blue
+                        }
+                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "BulletRelSize" ) ) )
+                        {
+                            nBulletRealSize = *( (sal_Int16*)pValue );
+                            nParaFlags |= 0x40;
+                            nBulletFlags |= 8;
+                        }
+                        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Prefix" ) ) )
+                            sPrefix = ( *(::rtl::OUString*)pValue );
+                        else if  ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Suffix" ) ) )
+                            sSuffix = ( *(::rtl::OUString*)pValue );
+#ifdef DBG_UTIL
+                        else if ( ! (
+                                ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "SymbolTextDistance" ) ) )
+                            ||  ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Graphic" ) ) ) ) )
+                        {
+                            DBG_ERROR( "Unbekanntes Property" );
+                        }
+#endif
+                    }
+                }
+
+                if ( aGraphicURL.Len() )
+                {
+                    if ( aBuGraSize.Width() && aBuGraSize.Height() )
+                    {
+                        xub_StrLen nIndex = aGraphicURL.Search( (sal_Unicode)':', 0 );
+                        if ( nIndex != STRING_NOTFOUND )
+                        {
+                            nIndex++;
+                            if ( aGraphicURL.Len() > nIndex  )
+                            {
+                                ByteString aUniqueId( aGraphicURL, nIndex, aGraphicURL.Len() - nIndex, RTL_TEXTENCODING_UTF8 );
+                                if ( aUniqueId.Len() )
+                                {
+                                    nBulletId = rBuProv.GetId( aUniqueId, aBuGraSize );
+                                    if ( nBulletId != 0xffff )
+                                        bExtendedBulletsUsed = TRUE;
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        nNumberingType = SVX_NUM_NUMBER_NONE;
+                    }
+                }
+
+                PortionObj* pPortion = (PortionObj*)First();
+                CalculateGraphicBulletSize( ( pPortion ) ? pPortion->mnCharHeight : 24 );
+
+                switch( (SvxExtNumType)nNumberingType )
+                {
+                    case SVX_NUM_NUMBER_NONE : nParaFlags |= 0xf; break;
+
+                    case SVX_NUM_CHAR_SPECIAL :                           // Bullet
+                    {
+                        if ( aFontDesc.Name.equalsIgnoreAsciiCaseAscii("starsymbol") ||
+                            aFontDesc.Name.equalsIgnoreAsciiCaseAscii("opensymbol") )
+                        {
+                            String sFontName = aFontDesc.Name;
+                            String sNumStr = cBulletId;
+                            rtl_TextEncoding eChrSet = aFontDesc.CharSet;
+                            lcl_SubstituteBullet(sNumStr,eChrSet,sFontName);
+                            aFontDesc.Name = sFontName;
+                            cBulletId = sNumStr.GetChar( 0 );
+                            aFontDesc.CharSet = eChrSet;
+                         }
+
+                        if ( aFontDesc.Name.getLength() )
+                        {
+/*
+                            if ( aFontDesc.CharSet != ::com::sun::star::awt::CharSet::SYMBOL )
+                            {
+                                switch ( cBulletId )
+                                {
+                                    // Currency
+                                    case 128:   cBulletId = 0x20AC; break;
+                                    // Punctuation and other
+                                    case 130:   cBulletId = 0x201A; break;// SINGLE LOW-9 QUOTATION MARK
+                                    case 131:   cBulletId = 0x0192; break;// LATIN SMALL LETTER F WITH HOOK
+                                    case 132:   cBulletId = 0x201E; break;// DOUBLE LOW-9 QUOTATION MARK
+                                                                          // LOW DOUBLE PRIME QUOTATION MARK
+                                    case 133:   cBulletId = 0x2026; break;// HORIZONTAL ELLIPSES
+                                    case 134:   cBulletId = 0x2020; break;// DAGGER
+                                    case 135:   cBulletId = 0x2021; break;// DOUBLE DAGGER
+                                    case 136:   cBulletId = 0x02C6; break;// MODIFIER LETTER CIRCUMFLEX ACCENT
+                                    case 137:   cBulletId = 0x2030; break;// PER MILLE SIGN
+                                    case 138:   cBulletId = 0x0160; break;// LATIN CAPITAL LETTER S WITH CARON
+                                    case 139:   cBulletId = 0x2039; break;// SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+                                    case 140:   cBulletId = 0x0152; break;// LATIN CAPITAL LIGATURE OE
+                                    case 142:   cBulletId = 0x017D; break;// LATIN CAPITAL LETTER Z WITH CARON
+                                    case 145:   cBulletId = 0x2018; break;// LEFT SINGLE QUOTATION MARK
+                                                                          // MODIFIER LETTER TURNED COMMA
+                                    case 146:   cBulletId = 0x2019; break;// RIGHT SINGLE QUOTATION MARK
+                                                                          // MODIFIER LETTER APOSTROPHE
+                                    case 147:   cBulletId = 0x201C; break;// LEFT DOUBLE QUOTATION MARK
+                                                                          // REVERSED DOUBLE PRIME QUOTATION MARK
+                                    case 148:   cBulletId = 0x201D; break;// RIGHT DOUBLE QUOTATION MARK
+                                                                          // REVERSED DOUBLE PRIME QUOTATION MARK
+                                    case 149:   cBulletId = 0x2022; break;// BULLET
+                                    case 150:   cBulletId = 0x2013; break;// EN DASH
+                                    case 151:   cBulletId = 0x2014; break;// EM DASH
+                                    case 152:   cBulletId = 0x02DC; break;// SMALL TILDE
+                                    case 153:   cBulletId = 0x2122; break;// TRADE MARK SIGN
+                                    case 154:   cBulletId = 0x0161; break;// LATIN SMALL LETTER S WITH CARON
+                                    case 155:   cBulletId = 0x203A; break;// SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+                                    case 156:   cBulletId = 0x0153; break;// LATIN SMALL LIGATURE OE
+                                    case 158:   cBulletId = 0x017E; break;// LATIN SMALL LETTER Z WITH CARON
+                                    case 159:   cBulletId = 0x0178; break;// LATIN CAPITAL LETTER Y WITH DIAERESIS
+//                                  case 222:   cBulletId = 0x00B6; break;// PILCROW SIGN / PARAGRAPH SIGN
+                                }
+                            }
+*/
+                            nParaFlags |= 0x90; // wir geben den Font und den Charset vor
+                        }
+                    }
+                    case SVX_NUM_CHARS_UPPER_LETTER :       // zaehlt von a-z, aa - az, ba - bz, ...
+                    case SVX_NUM_CHARS_LOWER_LETTER :
+                    case SVX_NUM_ROMAN_UPPER :
+                    case SVX_NUM_ROMAN_LOWER :
+                    case SVX_NUM_ARABIC :
+                    case SVX_NUM_PAGEDESC :                 // Numerierung aus der Seitenvorlage
+                    case SVX_NUM_BITMAP :
+                    case SVX_NUM_CHARS_UPPER_LETTER_N :     // zaehlt von  a-z, aa-zz, aaa-zzz
+                    case SVX_NUM_CHARS_LOWER_LETTER_N :
+                    {
+                        if ( nNumberingType != SVX_NUM_CHAR_SPECIAL )
+                        {
+                            bExtendedBulletsUsed = TRUE;
+                            if ( nNumberingDepth & 1 )
+                                cBulletId = 0x2013;         // defaulting bullet characters for ppt97
+                            else if ( nNumberingDepth == 4 )
+                                cBulletId = 0xbb;
+                            else
+                                cBulletId = 0x2022;
+
+                            switch( (SvxExtNumType)nNumberingType )
+                            {
+                                case SVX_NUM_CHARS_UPPER_LETTER :
+                                case SVX_NUM_CHARS_UPPER_LETTER_N :
+                                {
+                                    if ( sSuffix == String( RTL_CONSTASCII_USTRINGPARAM( ")" ) ) )
+                                    {
+                                        if ( sPrefix == String( RTL_CONSTASCII_USTRINGPARAM( "(" ) ) )
+                                            nMappedNumType = 0xa0001;   // (A)
+                                        else
+                                            nMappedNumType = 0xb0001;   // A)
+                                    }
+                                    else
+                                        nMappedNumType = 0x10001;       // A.
+                                }
+                                break;
+                                case SVX_NUM_CHARS_LOWER_LETTER :
+                                case SVX_NUM_CHARS_LOWER_LETTER_N :
+                                {
+                                    if ( sSuffix == String( RTL_CONSTASCII_USTRINGPARAM( ")" ) ) )
+                                    {
+                                        if ( sPrefix == String( RTL_CONSTASCII_USTRINGPARAM( "(" ) ) )
+                                            nMappedNumType = 0x80001;   // (a)
+                                        else
+                                            nMappedNumType = 0x90001;   // a)
+                                    }
+                                    else
+                                        nMappedNumType = 0x00001;       // a.
+                                }
+                                break;
+                                case SVX_NUM_ROMAN_UPPER :
+                                {
+                                    if ( sSuffix == String( RTL_CONSTASCII_USTRINGPARAM( ")" ) ) )
+                                    {
+                                        if ( sPrefix == String( RTL_CONSTASCII_USTRINGPARAM( "(" ) ) )
+                                            nMappedNumType = 0xe0001;   // (I)
+                                        else
+                                            nMappedNumType = 0xf0001;   // I)
+                                    }
+                                    else
+                                        nMappedNumType = 0x70001;       // I.
+                                }
+                                break;
+                                case SVX_NUM_ROMAN_LOWER :
+                                {
+                                    if ( sSuffix == String( RTL_CONSTASCII_USTRINGPARAM( ")" ) ) )
+                                    {
+                                        if ( sPrefix == String( RTL_CONSTASCII_USTRINGPARAM( "(" ) ) )
+                                            nMappedNumType = 0x40001;   // (i)
+                                        else
+                                            nMappedNumType = 0x50001;   // i)
+                                    }
+                                    else
+                                        nMappedNumType = 0x60001;       // i.
+                                }
+                                break;
+                                case SVX_NUM_ARABIC :
+                                {
+                                    if ( sSuffix == String( RTL_CONSTASCII_USTRINGPARAM( ")" ) ) )
+                                    {
+                                        if ( sPrefix == String( RTL_CONSTASCII_USTRINGPARAM( "(" ) ) )
+                                            nMappedNumType = 0xc0001;   // (1)
+                                        else
+                                            nMappedNumType = 0x20001;   // 1)
+                                    }
+                                    else
+                                    {
+                                        if ( ! ( sSuffix.Len() + sPrefix.Len() ) )
+                                            nMappedNumType = 0xd0001;   // 1
+                                        else
+                                            nMappedNumType = 0x30001;   // 1.
+                                    }
+                                }
+                                break;
+                                default:
+                                    break;
+                            }
+                        }
+                        nParaFlags |= 0x2f;
+                        nBulletFlags |= 6;
+                        if ( mbIsBullet && bNumberingIsNumber )
+                            nBulletFlags |= 1;
+                    }
+                }
+            }
+        }
+    }
+    nBulletOfs = nTextOfs + nBulletOfs;
+    if ( nBulletOfs < 0 )
+        nBulletOfs = 0;
+}
+
+void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Bool bGetPropStateValue )
+{
+    static String sNumberingLevel   ( RTL_CONSTASCII_USTRINGPARAM( "NumberingLevel" ) );
+
+    ::com::sun::star::uno::Any aAny;
+    if ( GetPropertyValue( aAny, mXPropSet, sNumberingLevel, sal_True ) )
+    {
+        if ( bGetPropStateValue )
+            meBullet = GetPropertyState( mXPropSet, sNumberingLevel );
+        nDepth = *( (sal_Int16*)aAny.getValue() );
+
+        if ( nDepth < 0 )
+        {
+            mbIsBullet = sal_False;
+            nDepth = 0;
+        }
+        else
+        {
+            if ( nDepth > 4 )
+                nDepth = 4;
+            mbIsBullet = sal_True;
+        }
+    }
+    else
+    {
+        nDepth = 0;
+        mbIsBullet = sal_False;
+    }
+    ImplGetNumberingLevel( rBuProv, nDepth, mbIsBullet, bGetPropStateValue );
+
+    if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "ParaTabStops" ) ), bGetPropStateValue ) )
+        maTabStop = *( ::com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop>*)mAny.getValue();
+    sal_Int16 eTextAdjust( ::com::sun::star::style::ParagraphAdjust_LEFT );
+    if ( GetPropertyValue( aAny, mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "ParaAdjust" ) ), bGetPropStateValue ) )
+        aAny >>= eTextAdjust;
+    switch ( (::com::sun::star::style::ParagraphAdjust)eTextAdjust )
+    {
+        case ::com::sun::star::style::ParagraphAdjust_CENTER :
+            mnTextAdjust = 1;
+        break;
+        case ::com::sun::star::style::ParagraphAdjust_RIGHT :
+            mnTextAdjust = 2;
+        break;
+        case ::com::sun::star::style::ParagraphAdjust_BLOCK :
+            mnTextAdjust = 3;
+        break;
+        default :
+        case ::com::sun::star::style::ParagraphAdjust_LEFT :
+            mnTextAdjust = 0;
+        break;
+    }
+    meTextAdjust = ePropState;
+
+    if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "ParaLineSpacing" ) ), bGetPropStateValue ) )
+    {
+        ::com::sun::star::style::LineSpacing aLineSpacing
+            = *( (::com::sun::star::style::LineSpacing*)mAny.getValue() );
+        switch ( aLineSpacing.Mode )
+        {
+            case ::com::sun::star::style::LineSpacingMode::MINIMUM :
+            case ::com::sun::star::style::LineSpacingMode::LEADING :
+            case ::com::sun::star::style::LineSpacingMode::FIX :
+                mnLineSpacing = (sal_Int16)(-( aLineSpacing.Height ) );
+            break;
+
+            case ::com::sun::star::style::LineSpacingMode::PROP :
+            default:
+                mnLineSpacing = (sal_Int16)( aLineSpacing.Height );
+            break;
+        }
+    }
+    meLineSpacing = ePropState;
+
+    if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "ParaBottomMargin" ) ), bGetPropStateValue ) )
+    {
+        double fSpacing = *( (sal_uInt32*)mAny.getValue() ) + ( 2540.0 / 576.0 ) - 1;
+        mnLineSpacingBottom = (sal_Int16)(-( fSpacing * 576.0 / 2540.0 ) );
+    }
+    meLineSpacingBottom = ePropState;
+
+    if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "ParaTopMargin" ) ), bGetPropStateValue ) )
+    {
+        double fSpacing = *( (sal_uInt32*)mAny.getValue() ) + ( 2540.0 / 576.0 ) - 1;
+        mnLineSpacingTop = (sal_Int16)(-( fSpacing * 576.0 / 2540.0 ) );
+    }
+    meLineSpacingTop = ePropState;
+
+    if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "ParaIsForbiddenRules" ) ), bGetPropStateValue ) )
+        mAny >>= mbForbiddenRules;
+    meForbiddenRules = ePropState;
+
+    if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "ParaIsHangingPunctuation" ) ), bGetPropStateValue ) )
+        mAny >>= mbParagraphPunctation;
+    meParagraphPunctation = ePropState;
+
+    mnBiDi = 0;
+    if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "WritingMode" ) ), bGetPropStateValue ) )
+    {
+        sal_Int16 nWritingMode = 0;
+        mAny >>= nWritingMode;
+
+        SvxFrameDirection eWritingMode( (SvxFrameDirection)nWritingMode );
+        if ( ( eWritingMode == FRMDIR_HORI_RIGHT_TOP )
+            || ( eWritingMode == FRMDIR_VERT_TOP_RIGHT ) )
+        {
+            mnBiDi = 1;
+        }
+    }
+    meBiDi = ePropState;
+}
+
+void ParagraphObj::ImplConstruct( ParagraphObj& rParagraphObj )
+{
+    mnTextSize = rParagraphObj.mnTextSize;
+    mnTextAdjust = rParagraphObj.mnTextAdjust;
+    mnLineSpacing = rParagraphObj.mnLineSpacing;
+    mnLineSpacingTop = rParagraphObj.mnLineSpacingTop;
+    mnLineSpacingBottom = rParagraphObj.mnLineSpacingBottom;
+    mbFirstParagraph = rParagraphObj.mbFirstParagraph;
+    mbLastParagraph = rParagraphObj.mbLastParagraph;
+    mbParagraphPunctation = rParagraphObj.mbParagraphPunctation;
+    mbForbiddenRules = rParagraphObj.mbForbiddenRules;
+    mnBiDi = rParagraphObj.mnBiDi;
+
+    for ( void* pPtr = rParagraphObj.First(); pPtr; pPtr = rParagraphObj.Next() )
+        Insert( new PortionObj( *(PortionObj*)pPtr ), LIST_APPEND );
+
+    maTabStop = rParagraphObj.maTabStop;
+    bExtendedParameters = rParagraphObj.bExtendedParameters;
+    nParaFlags = rParagraphObj.nParaFlags;
+    nBulletFlags = rParagraphObj.nBulletFlags;
+    sPrefix = rParagraphObj.sPrefix;
+    sSuffix = rParagraphObj.sSuffix;
+    sGraphicUrl = rParagraphObj.sGraphicUrl;            // String auf eine Graphic
+    aBuGraSize = rParagraphObj.aBuGraSize;
+    nNumberingType = rParagraphObj.nNumberingType;      // in wirlichkeit ist dies ein SvxEnum
+    nHorzAdjust = rParagraphObj.nHorzAdjust;
+    nBulletColor = rParagraphObj.nBulletColor;
+    nBulletOfs = rParagraphObj.nBulletOfs;
+    nStartWith = rParagraphObj.nStartWith;              // Start der nummerierung
+    nTextOfs = rParagraphObj.nTextOfs;
+    nBulletRealSize = rParagraphObj.nBulletRealSize;    // GroessenVerhaeltnis in Proz
+    nDepth = rParagraphObj.nDepth;                      // aktuelle tiefe
+    cBulletId = rParagraphObj.cBulletId;                // wenn Numbering Type == CharSpecial
+    aFontDesc = rParagraphObj.aFontDesc;
+
+    bExtendedBulletsUsed = rParagraphObj.bExtendedBulletsUsed;
+    nBulletId = rParagraphObj.nBulletId;
+}
+
+::com::sun::star::awt::Size ParagraphObj::ImplMapSize( const ::com::sun::star::awt::Size& rSize )
+{
+    Size aSize( OutputDevice::LogicToLogic( Size( rSize.Width, rSize.Height ), maMapModeSrc, maMapModeDest ) );
+    if ( !aSize.Width() )
+        aSize.Width()++;
+    if ( !aSize.Height() )
+        aSize.Height()++;
+    return ::com::sun::star::awt::Size( aSize.Width(), aSize.Height() );
+}
+
+sal_uInt32 ParagraphObj::ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition )
+{
+    mnTextSize = 0;
+    for ( void* pPtr = First(); pPtr; pPtr = Next() )
+        mnTextSize += ((PortionObj*)pPtr)->ImplCalculateTextPositions( nCurrentTextPosition + mnTextSize );
+    return mnTextSize;
+}
+
+ParagraphObj& ParagraphObj::operator=( ParagraphObj& rParagraphObj )
+{
+    if ( this != &rParagraphObj )
+    {
+        ImplClear();
+        ImplConstruct( rParagraphObj );
+    }
+    return *this;
+}
+
+ImplTextObj::ImplTextObj( int nInstance )
+{
+    mnRefCount = 1;
+    mnTextSize = 0;
+    mnInstance = nInstance;
+    mpList = new List;
+    mbHasExtendedBullets = FALSE;
+    mbFixedCellHeightUsed = FALSE;
+}
+
+ImplTextObj::~ImplTextObj()
+{
+    for ( ParagraphObj* pPtr = (ParagraphObj*)mpList->First(); pPtr; pPtr = (ParagraphObj*)mpList->Next() )
+        delete pPtr;
+    delete mpList;
+}
+
+TextObj::TextObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XSimpleText > & rXTextRef,
+            int nInstance, FontCollection& rFontCollection, PPTExBulletProvider& rProv )
+{
+    mpImplTextObj = new ImplTextObj( nInstance );
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess >
+        aXTextParagraphEA( rXTextRef, ::com::sun::star::uno::UNO_QUERY );
+
+    if ( aXTextParagraphEA.is()  )
+    {
+        ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration >
+            aXTextParagraphE( aXTextParagraphEA->createEnumeration() );
+        if ( aXTextParagraphE.is() )
+        {
+            ParaFlags aParaFlags;
+            while ( aXTextParagraphE->hasMoreElements() )
+            {
+                ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > aXParagraph;
+                ::com::sun::star::uno::Any aAny( aXTextParagraphE->nextElement() );
+                if ( aAny >>= aXParagraph )
+                {
+                    if ( !aXTextParagraphE->hasMoreElements() )
+                        aParaFlags.bLastParagraph = TRUE;
+                    ParagraphObj* pPara = new ParagraphObj( aXParagraph, aParaFlags, rFontCollection, rProv );
+                    mpImplTextObj->mbHasExtendedBullets |= pPara->bExtendedBulletsUsed;
+                    mpImplTextObj->mpList->Insert( pPara, LIST_APPEND );
+                    aParaFlags.bFirstParagraph = FALSE;
+                }
+            }
+        }
+    }
+    ImplCalculateTextPositions();
+}
+
+TextObj::TextObj( TextObj& rTextObj )
+{
+    mpImplTextObj = rTextObj.mpImplTextObj;
+    mpImplTextObj->mnRefCount++;
+}
+
+TextObj::~TextObj()
+{
+    if ( ! ( --mpImplTextObj->mnRefCount ) )
+        delete mpImplTextObj;
+}
+
+void TextObj::Write( SvStream* pStrm )
+{
+    sal_uInt32 nSize, nPos = pStrm->Tell();
+    *pStrm << (sal_uInt32)( EPP_TextCharsAtom << 16 ) << (sal_uInt32)0;
+    for ( void* pPtr = First(); pPtr; pPtr = Next() )
+        ((ParagraphObj*)pPtr)->Write( pStrm );
+    nSize = pStrm->Tell() - nPos;
+    pStrm->SeekRel( - ( (sal_Int32)nSize - 4 ) );
+    *pStrm << (sal_uInt32)( nSize - 8 );
+    pStrm->SeekRel( nSize - 8 );
+}
+
+void TextObj::ImplCalculateTextPositions()
+{
+    mpImplTextObj->mnTextSize = 0;
+    for ( void* pPtr = First(); pPtr; pPtr = Next() )
+        mpImplTextObj->mnTextSize += ((ParagraphObj*)pPtr)->ImplCalculateTextPositions( mpImplTextObj->mnTextSize );
+}
+
+TextObj& TextObj::operator=( TextObj& rTextObj )
+{
+    if ( this != &rTextObj )
+    {
+        if ( ! ( --mpImplTextObj->mnRefCount ) )
+            delete mpImplTextObj;
+        mpImplTextObj = rTextObj.mpImplTextObj;
+        mpImplTextObj->mnRefCount++;
+    }
+    return *this;
+}
+
+FontCollectionEntry::~FontCollectionEntry()
+{
+}
+
+void FontCollectionEntry::ImplInit( const String& rName )
+{
+    String aSubstName( GetSubsFontName( rName, SUBSFONT_ONLYONE | SUBSFONT_MS ) );
+    if ( aSubstName.Len() )
+    {
+        Name = aSubstName;
+        bIsConverted = sal_True;
+    }
+    else
+    {
+        Name = rName;
+        bIsConverted = sal_False;
+    }
+}
+
+FontCollection::~FontCollection()
+{
+    for( void* pStr = List::First(); pStr; pStr = List::Next() )
+        delete (FontCollectionEntry*)pStr;
+    delete pVDev;
+    xPPTBreakIter = NULL;
+    xScriptTypeDetector = NULL;
+}
+
+FontCollection::FontCollection() :
+    pVDev ( NULL )
+{
+    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
+        xMSF = ::comphelper::getProcessServiceFactory();
+    com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
+        xInterface = xMSF->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.BreakIterator" ) ) );
+    if ( xInterface.is() )
+        xPPTBreakIter = com::sun::star::uno::Reference< com::sun::star::i18n::XBreakIterator >
+            ( xInterface, com::sun::star::uno::UNO_QUERY );
+
+    xInterface = xMSF->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.ScriptTypeDetector" ) ) );
+    if ( xInterface.is() )
+        xScriptTypeDetector = com::sun::star::uno::Reference< com::sun::star::i18n::XScriptTypeDetector >
+            ( xInterface, com::sun::star::uno::UNO_QUERY );
+}
+
+short FontCollection::GetScriptDirection( const String& rString ) const
+{
+    short nRet = com::sun::star::i18n::ScriptDirection::NEUTRAL;
+    if ( xScriptTypeDetector.is() )
+    {
+        const rtl::OUString sT( rString );
+        nRet = xScriptTypeDetector->getScriptDirection( sT, 0, com::sun::star::i18n::ScriptDirection::NEUTRAL );
+    }
+    return nRet;
+}
+
+sal_uInt32 FontCollection::GetId( FontCollectionEntry& rEntry )
+{
+    if( rEntry.Name.Len() )
+    {
+        const sal_uInt32 nFonts = GetCount();
+
+        for( sal_uInt32 i = 0; i < nFonts; i++ )
+        {
+            const FontCollectionEntry* pEntry = GetById( i );
+            if( pEntry->Name == rEntry.Name )
+                return i;
+        }
+        Font aFont;
+        aFont.SetCharSet( rEntry.CharSet );
+        aFont.SetName( rEntry.Original );
+//      aFont.SetFamily( rEntry.Family );
+//      aFont.SetPitch( rEntry.Pitch );
+        aFont.SetHeight( 100 );
+
+        if ( !pVDev )
+            pVDev = new VirtualDevice;
+
+        pVDev->SetFont( aFont );
+        FontMetric aMetric( pVDev->GetFontMetric() );
+
+        sal_uInt16 nTxtHeight = (sal_uInt16)aMetric.GetAscent() + (sal_uInt16)aMetric.GetDescent();
+
+        if ( nTxtHeight )
+        {
+            double fScaling = (double)nTxtHeight / 120.0;
+            if ( ( fScaling > 0.50 ) && ( fScaling < 1.5 ) )
+                rEntry.Scaling = fScaling;
+        }
+
+        List::Insert( new FontCollectionEntry( rEntry ), LIST_APPEND );
+        return nFonts;
+    }
+    return 0;
+}
+
+const FontCollectionEntry* FontCollection::GetById( sal_uInt32 nId )
+{
+    return (FontCollectionEntry*)List::GetObject( nId );
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx
new file mode 100644
index 000000000000..adcf65e7b9d1
--- /dev/null
+++ b/sd/source/filter/eppt/text.hxx
@@ -0,0 +1,270 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef EPPT_TEXT_HXX
+#define EPPT_TEXT_HXX
+
+#include "epptbase.hxx"
+#include "epptdef.hxx"
+
+#include <rtl/textenc.h>
+#include <com/sun/star/awt/FontDescriptor.hpp>
+#include <com/sun/star/lang/Locale.hpp>
+
+namespace com { namespace sun { namespace star {
+namespace awt { class FontDescriptor; }
+namespace beans { class XPropertyState; }
+namespace text { class XTextRange; class XTextContent; class XSimpleText; }
+namespace style { class TabStop; }
+}}}
+
+struct SOParagraph
+{
+    sal_Bool                bExtendedParameters;
+    sal_uInt32              nParaFlags;
+    sal_Int16               nBulletFlags;
+    String                  sPrefix;
+    String                  sSuffix;
+    String                  sGraphicUrl;            // String auf eine Graphic
+    Size                    aBuGraSize;
+    sal_uInt32              nNumberingType;         // in wirlichkeit ist dies ein SvxEnum
+    sal_uInt32              nHorzAdjust;
+    sal_uInt32              nBulletColor;
+    sal_Int32               nBulletOfs;
+    sal_Int16               nStartWith;             // Start der nummerierung
+    sal_Int16               nTextOfs;
+    sal_Int16               nBulletRealSize;        // GroessenVerhaeltnis in Proz
+    sal_Int16               nDepth;                 // aktuelle tiefe
+    sal_Unicode             cBulletId;              // wenn Numbering Type == CharSpecial
+    ::com::sun::star::awt::FontDescriptor       aFontDesc;
+
+    sal_Bool                bExtendedBulletsUsed;
+    sal_uInt16              nBulletId;
+    sal_uInt32              nMappedNumType;
+    sal_Bool                bNumberingIsNumber;
+
+    SOParagraph()
+    {
+        nDepth = 0;
+        bExtendedParameters = FALSE;
+        nParaFlags = 0;
+        nBulletFlags = 0;
+        nBulletOfs = 0;
+        nTextOfs = 0;
+        bExtendedBulletsUsed = FALSE;
+        nBulletId = 0xffff;
+        bNumberingIsNumber = sal_True;
+    };
+};
+
+class PropStateValue : public PropValue
+{
+    protected :
+
+        ::com::sun::star::beans::PropertyState                  ePropState;
+        ::com::sun::star::uno::Reference
+            < ::com::sun::star::beans::XPropertyState >         mXPropState;
+
+        sal_Bool    ImplGetPropertyValue( const String& rString, sal_Bool bGetPropertyState = TRUE );
+
+};
+
+struct FieldEntry
+{
+    sal_uInt32  nFieldType;
+    sal_uInt32  nFieldStartPos;
+    sal_uInt32  nFieldEndPos;
+    String      aRepresentation;
+    String      aFieldUrl;
+
+    FieldEntry( sal_uInt32 nType, sal_uInt32 nStart, sal_uInt32 nEnd )
+    {
+        nFieldType = nType;
+        nFieldStartPos = nStart;
+        nFieldEndPos = nEnd;
+    }
+};
+
+class PortionObj : public PropStateValue
+{
+
+    friend class ParagraphObj;
+
+    protected :
+
+        void            ImplClear();
+        void            ImplConstruct( PortionObj& rPortionObj );
+        sal_uInt32      ImplGetTextField( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRangeRef,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef, String& rURL );
+        sal_uInt32      ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition );
+        void            ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool bGetPropStateValue = FALSE );
+
+    public :
+
+        ::com::sun::star::beans::PropertyState  meCharColor;
+        ::com::sun::star::beans::PropertyState  meCharHeight;
+        ::com::sun::star::beans::PropertyState  meFontName;
+        ::com::sun::star::beans::PropertyState  meAsianOrComplexFont;
+        ::com::sun::star::beans::PropertyState  meCharEscapement;
+        ::com::sun::star::lang::Locale          meCharLocale;
+        sal_uInt16      mnCharAttrHard;
+
+        sal_uInt32      mnCharColor;
+        sal_uInt16      mnCharAttr;
+        sal_uInt16      mnCharHeight;
+        sal_uInt16      mnFont;
+        sal_uInt16      mnAsianOrComplexFont;
+        sal_Int16       mnCharEscapement;
+
+        sal_uInt32      mnTextSize;
+        sal_Bool        mbLastPortion;
+
+        sal_uInt16*     mpText;
+        FieldEntry*     mpFieldEntry;
+
+                        PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRangeRef,
+                                        sal_Bool bLast, FontCollection& rFontCollection );
+                        PortionObj( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef,
+                                        FontCollection& rFontCollection );
+                        PortionObj( PortionObj& rPortionObj );
+                        ~PortionObj();
+
+        void            Write( SvStream* pStrm, sal_Bool bLast );
+        sal_uInt32      Count() const { return mnTextSize; };
+
+        PortionObj&     operator=( PortionObj& rPortionObj );
+};
+
+struct ParaFlags
+{
+    sal_Bool    bFirstParagraph : 1;
+    sal_Bool    bLastParagraph  : 1;
+
+                    ParaFlags() { bFirstParagraph = TRUE; bLastParagraph = FALSE; };
+};
+
+class ParagraphObj : public List, public PropStateValue, public SOParagraph
+{
+    friend class TextObj;
+    friend struct PPTExParaSheet;
+
+        MapMode         maMapModeSrc;
+        MapMode         maMapModeDest;
+
+    protected :
+
+        void            ImplConstruct( ParagraphObj& rParagraphObj );
+        void            ImplClear();
+        sal_uInt32      ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition );
+        ::com::sun::star::awt::Size         ImplMapSize( const ::com::sun::star::awt::Size& rSize );
+        void            ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Bool bGetPropStateValue = FALSE );
+        void            ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nDepth, sal_Bool bIsBullet, sal_Bool bGetPropStateValue = FALSE );
+
+    public :
+
+        ::com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > maTabStop;
+
+        sal_uInt32          mnTextSize;
+
+        sal_Bool            mbIsBullet;
+        sal_Bool            mbFirstParagraph;
+        sal_Bool            mbLastParagraph;
+
+        ::com::sun::star::beans::PropertyState  meBullet;
+        ::com::sun::star::beans::PropertyState  meTextAdjust;
+        ::com::sun::star::beans::PropertyState  meLineSpacing;
+        ::com::sun::star::beans::PropertyState  meLineSpacingTop;
+        ::com::sun::star::beans::PropertyState  meLineSpacingBottom;
+        ::com::sun::star::beans::PropertyState  meForbiddenRules;
+        ::com::sun::star::beans::PropertyState  meParagraphPunctation;
+        ::com::sun::star::beans::PropertyState  meBiDi;
+
+        sal_uInt16                              mnTextAdjust;
+        sal_Int16                               mnLineSpacing;
+        sal_Bool                                mbFixedLineSpacing;
+        sal_Int16                               mnLineSpacingTop;
+        sal_Int16                               mnLineSpacingBottom;
+        sal_Bool                                mbForbiddenRules;
+        sal_Bool                                mbParagraphPunctation;
+        sal_uInt16                              mnBiDi;
+
+                        ParagraphObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & rXTextContentRef,
+                            ParaFlags, FontCollection& rFontCollection,
+                                PPTExBulletProvider& rBuProv );
+                        ParagraphObj( ParagraphObj& rParargraphObj );
+                        ParagraphObj( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef,
+                                        PPTExBulletProvider& rBuProv );
+
+        void            CalculateGraphicBulletSize( sal_uInt16 nFontHeight );
+                        ~ParagraphObj();
+
+        void            Write( SvStream* pStrm );
+        sal_uInt32          Count() const { return mnTextSize; };
+
+        ParagraphObj&   operator=( ParagraphObj& rParagraphObj );
+};
+
+struct ImplTextObj
+{
+    sal_uInt32      mnRefCount;
+    sal_uInt32      mnTextSize;
+    int             mnInstance;
+    List*           mpList;
+    sal_Bool        mbHasExtendedBullets;
+    sal_Bool        mbFixedCellHeightUsed;
+
+                    ImplTextObj( int nInstance );
+                    ~ImplTextObj();
+};
+
+class TextObj
+{
+        ImplTextObj*    mpImplTextObj;
+        void            ImplCalculateTextPositions();
+
+    public :
+                        TextObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XSimpleText > &
+                                    rXText, int nInstance, FontCollection& rFontCollection, PPTExBulletProvider& rBuProv );
+                        TextObj( TextObj& rTextObj );
+                        ~TextObj();
+
+        void            Write( SvStream* pStrm );
+
+        ParagraphObj*   First(){ return (ParagraphObj*)mpImplTextObj->mpList->First(); };
+        ParagraphObj*   Next(){ return(ParagraphObj*)mpImplTextObj->mpList->Next(); };
+        sal_uInt32      Count() const { return mpImplTextObj->mnTextSize; };
+        int             GetInstance() const { return mpImplTextObj->mnInstance; };
+        sal_Bool        HasExtendedBullets(){ return mpImplTextObj->mbHasExtendedBullets; };
+        void            WriteTextSpecInfo( SvStream* pStrm );
+
+        TextObj&        operator=( TextObj& rTextObj );
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index 0a1d1d5f47cc..4ead1cca70f3 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -276,7 +276,7 @@ sal_Bool SdGRFFilter::Export()
      uno::Reference< lang::XMultiServiceFactory >
         xSMgr( ::comphelper::getProcessServiceFactory() );
     uno::Reference< uno::XInterface > xComponent
-        ( xSMgr->createInstance( rtl::OUString::createFromAscii( "com.sun.star.drawing.GraphicExportFilter" ) ),
+        ( xSMgr->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.GraphicExportFilter" ) ) ),
             uno::UNO_QUERY );
     if ( xComponent.is() )
     {
@@ -440,7 +440,7 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su
             switch( nGraphicType )
             {
             case ::com::sun::star::graphic::GraphicType::VECTOR:
-                aMimeType = OUString::createFromAscii( "image/x-svm" );
+                aMimeType = OUString(RTL_CONSTASCII_USTRINGPARAM( "image/x-svm" ) );
                 break;
 
             case ::com::sun::star::graphic::GraphicType::PIXEL:
@@ -450,14 +450,14 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su
 
                     if( bAnimated )
                     {
-                        aMimeType = OUString::createFromAscii( "image/gif" );
+                        aMimeType = OUString(RTL_CONSTASCII_USTRINGPARAM( "image/gif" ) );
                         break;
                     }
                 }
                 // Fallthrough!
 //          case ::com::sun::star::graphic::GraphicType::EMPTY:
             default:
-                aMimeType = OUString::createFromAscii( "image/png" );
+                aMimeType = OUString(RTL_CONSTASCII_USTRINGPARAM( "image/png" ) );
                 break;
             }
         }
diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx
index cd47b0e21af7..b7c4577ac187 100644
--- a/sd/source/filter/html/buttonset.cxx
+++ b/sd/source/filter/html/buttonset.cxx
@@ -103,7 +103,7 @@ bool ButtonsImpl::getGraphic( const Reference< XGraphicProvider >& xGraphicProvi
     if( xInputStream.is() && xGraphicProvider.is() ) try
     {
         Sequence< PropertyValue > aMediaProperties( 1 );
-        aMediaProperties[0].Name = ::rtl::OUString::createFromAscii( "InputStream" );
+        aMediaProperties[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "InputStream" ) );
         aMediaProperties[0].Value <<= xInputStream;
         Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties  ) );
 
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 6c0e4de2d3f9..45b205ac94db 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -1717,10 +1717,6 @@ BOOL SdPublishingDlg::Save()
 // *********************************************************************
 // SdDesignNameDlg Methoden
 // *********************************************************************
-
-// =====================================================================
-//
-// =====================================================================
 SdDesignNameDlg::SdDesignNameDlg(Window* pWindow, const String& aName):
                 ModalDialog             (pWindow, SdResId( DLG_DESIGNNAME )),
                 m_aEdit                 (this, SdResId(EDT_NAME)),
@@ -1733,17 +1729,11 @@ SdDesignNameDlg::SdDesignNameDlg(Window* pWindow, const String& aName):
     m_aBtnOK.Enable(aName.Len() != 0);
 }
 
-// =====================================================================
-//
-// =====================================================================
 String SdDesignNameDlg::GetDesignName()
 {
     return m_aEdit.GetText();
 }
 
-// =====================================================================
-//
-// =====================================================================
 IMPL_LINK( SdDesignNameDlg, ModifyHdl, Edit*, EMPTYARG )
 {
     m_aBtnOK.Enable(m_aEdit.GetText().Len() != 0);
diff --git a/sd/source/filter/makefile.mk b/sd/source/filter/makefile.mk
index 554b1c5367be..78d383e03c5d 100644
--- a/sd/source/filter/makefile.mk
+++ b/sd/source/filter/makefile.mk
@@ -43,12 +43,11 @@ CDEFS+= -DDBG_ANIM_LOG
 # --- Files --------------------------------------------------------
 
 SLOFILES =\
-        $(SLO)$/sdfilter.obj	\
-        $(SLO)$/sdpptwrp.obj	
+        $(EXCEPTIONSFILES)
 
 EXCEPTIONSFILES= \
-           $(SLO)$/pptin.obj		\
-           $(SLO)$/sdfilter.obj
+        $(SLO)$/sdfilter.obj	\
+        $(SLO)$/sdpptwrp.obj
 
 # --- Tagets -------------------------------------------------------
 
diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx
index f22df66795dd..7e415b5a778a 100644
--- a/sd/source/filter/ppt/ppt97animations.cxx
+++ b/sd/source/filter/ppt/ppt97animations.cxx
@@ -220,10 +220,10 @@ void Ppt97Animation::SetAnimateAssociatedShape( bool bAnimate )
     if( !bAnimate )
     {
         //the appear effect cannot be animated without text
-        if( this->GetPresetId().equals( ::rtl::OUString::createFromAscii("ooo-entrance-appear") ) )
+        if( this->GetPresetId().equals( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-appear")) ) )
             return;
         //the random effect may be the appear effect and than has the same problem
-        if( this->GetPresetId().equals( ::rtl::OUString::createFromAscii("ooo-entrance-random") ) )
+        if( this->GetPresetId().equals( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-random")) ) )
         {
             //this case is not 100% correct -> feel free to complete
             //i consider this case as seldom and not that problematic and a simple correct fix is not in sight
@@ -301,11 +301,11 @@ void Ppt97Animation::UpdateCacheData() const
     {
         case 0x0:
             //eRetval = ::com::sun::star::presentation::AnimationEffect_APPEAR;
-            m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-appear");                  // --- appear ---
+            m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-appear"));                  // --- appear ---
         break;
         case 0x01:
             //eRetval = ::com::sun::star::presentation::AnimationEffect_RANDOM;
-            m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-random");                  // --- random ---
+            m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-random"));                  // --- random ---
         break;
         case 0x02:                                                                                  // --- blinds effect ---
         {
@@ -313,13 +313,13 @@ void Ppt97Animation::UpdateCacheData() const
             {
                 case 0x0:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_VERTICAL_STRIPES;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-venetian-blinds");
-                    m_aSubType = ::rtl::OUString::createFromAscii("horizontal");                    // horizontal
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-venetian-blinds"));
+                    m_aSubType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("horizontal"));                    // horizontal
                 break;
                 case 0x1:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_HORIZONTAL_STRIPES;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-venetian-blinds");
-                    m_aSubType = ::rtl::OUString::createFromAscii("vertical");                      // vertical
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-venetian-blinds"));
+                    m_aSubType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vertical"));                      // vertical
                 break;
             }
         }
@@ -330,20 +330,20 @@ void Ppt97Animation::UpdateCacheData() const
             {
                 case 0x0:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_HORIZONTAL_CHECKERBOARD;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-checkerboard");
-                    m_aSubType = ::rtl::OUString::createFromAscii("across");                        // vertical ???
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-checkerboard"));
+                    m_aSubType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("across"));                        // vertical ???
                 break;
                 case 0x1:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_VERTICAL_CHECKERBOARD;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-checkerboard");
-                    m_aSubType = ::rtl::OUString::createFromAscii("downward");                      // horizontal ???
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-checkerboard"));
+                    m_aSubType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("downward"));                      // horizontal ???
                 break;
             }
         }
         break;
         case 0x05:
             //eRetval = ::com::sun::star::presentation::AnimationEffect_DISSOLVE;                   // --- dissolve ----
-            m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-dissolve-in");
+            m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-dissolve-in"));
         break;
         case 0x08:                                                                                  // --- (hor/ver) lines ---
         {
@@ -351,13 +351,13 @@ void Ppt97Animation::UpdateCacheData() const
             {
                 case 0x0:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_HORIZONTAL_LINES;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-random-bars");
-                    m_aSubType = ::rtl::OUString::createFromAscii("vertical");                      // horizontal ???
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-random-bars"));
+                    m_aSubType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vertical"));                      // horizontal ???
                 break;
                 case 0x1:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_VERTICAL_LINES;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-random-bars");
-                    m_aSubType = rtl::OUString::createFromAscii("horizontal");                      // vertical ???
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-random-bars"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("horizontal"));                      // vertical ???
                 break;
             }
         }
@@ -368,23 +368,23 @@ void Ppt97Animation::UpdateCacheData() const
             {
                 case 0x4:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LOWERRIGHT;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-diagonal-squares");
-                    m_aSubType = rtl::OUString::createFromAscii("left-to-top");                     // to left top
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-diagonal-squares"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("left-to-top"));                     // to left top
                 break;
                 case 0x5:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LOWERLEFT;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-diagonal-squares");
-                    m_aSubType = rtl::OUString::createFromAscii("right-to-top");                    // to right top
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-diagonal-squares"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("right-to-top"));                    // to right top
                 break;
                 case 0x6:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_UPPERRIGHT;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-diagonal-squares");
-                    m_aSubType = rtl::OUString::createFromAscii("left-to-bottom");                  // to left bottom
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-diagonal-squares"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("left-to-bottom"));                  // to left bottom
                 break;
                 case 0x7:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_UPPERLEFT;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-diagonal-squares");
-                    m_aSubType = rtl::OUString::createFromAscii("right-to-bottom");                 // to right bottom
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-diagonal-squares"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("right-to-bottom"));                 // to right bottom
                 break;
             }
         }
@@ -395,23 +395,23 @@ void Ppt97Animation::UpdateCacheData() const
             {
                 case 0x0:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_RIGHT;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-wipe");
-                    m_aSubType = rtl::OUString::createFromAscii("from-right");                      // from right
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-wipe"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-right"));                      // from right
                 break;
                 case 0x1:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_BOTTOM;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-wipe");
-                    m_aSubType = rtl::OUString::createFromAscii("from-bottom");                     // from bottom
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-wipe"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom"));                     // from bottom
                 break;
                 case 0x2:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LEFT;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-wipe");
-                    m_aSubType = rtl::OUString::createFromAscii("from-left");                       // from left
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-wipe"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-left"));                       // from left
                 break;
                 case 0x3:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_TOP;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-wipe");
-                    m_aSubType = rtl::OUString::createFromAscii("from-top");                        // from top
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-wipe"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top"));                        // from top
                 break;
             }
         }
@@ -422,13 +422,13 @@ void Ppt97Animation::UpdateCacheData() const
             {
                 case 0x0:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_CENTER;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-box");
-                    m_aSubType = rtl::OUString::createFromAscii("out");                             // from center
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-box"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("out"));                             // from center
                 break;
                 case 0x1:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_TO_CENTER;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-box");
-                    m_aSubType = rtl::OUString::createFromAscii("in");                              // to center
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-box"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("in"));                              // to center
                 break;
             }
         }
@@ -439,160 +439,160 @@ void Ppt97Animation::UpdateCacheData() const
             {
                 case 0x0:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_LEFT;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in");
-                    m_aSubType = rtl::OUString::createFromAscii("from-left");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-left"));
 
                 break;
                 case 0x1:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_TOP;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in");
-                    m_aSubType = rtl::OUString::createFromAscii("from-top");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top"));
                 break;
                 case 0x2:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_RIGHT;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in");
-                    m_aSubType = rtl::OUString::createFromAscii("from-right");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-right"));
                 break;
                 case 0x3:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_BOTTOM;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in");
-                    m_aSubType = rtl::OUString::createFromAscii("from-bottom");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom"));
                 break;
                 case 0x4:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_UPPERLEFT;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in");
-                    m_aSubType = rtl::OUString::createFromAscii("from-top-left");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top-left"));
                 break;
                 case 0x5:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_UPPERRIGHT;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in");
-                    m_aSubType = rtl::OUString::createFromAscii("from-top-right");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top-right"));
                 break;
                 case 0x6:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_LOWERLEFT;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in");
-                    m_aSubType = rtl::OUString::createFromAscii("from-bottom-left");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom-left"));
                 break;
                 case 0x7:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_LOWERRIGHT;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in");
-                    m_aSubType = rtl::OUString::createFromAscii("from-bottom-right");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom-right"));
                 break;
                 case 0x8:                                                                               // -- short text effects --
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_SHORT_FROM_LEFT;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-peek-in");
-                    m_aSubType = rtl::OUString::createFromAscii("from-left");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-peek-in"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-left"));
                 break;
                 case 0x9:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_SHORT_FROM_BOTTOM;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-peek-in");
-                    m_aSubType = rtl::OUString::createFromAscii("from-bottom");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-peek-in"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom"));
                 break;
                 case 0xa:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_SHORT_FROM_RIGHT;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-peek-in");
-                    m_aSubType = rtl::OUString::createFromAscii("from-right");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-peek-in"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-right"));
                 break;
                 case 0xb:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_SHORT_FROM_TOP;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-peek-in");
-                    m_aSubType = rtl::OUString::createFromAscii("from-top");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-peek-in"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top"));
                 break;
                 case 0xc:                                                                               // -- slow text effects --
                 {
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_LEFT;
                     //rSpeed = ::com::sun::star::presentation::AnimationSpeed_SLOW;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in-slow");
-                    m_aSubType = rtl::OUString::createFromAscii("from-left");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in-slow"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-left"));
                 }
                 break;
                 case 0xd:
                 {
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_TOP;
                     //rSpeed = ::com::sun::star::presentation::AnimationSpeed_SLOW;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in-slow");
-                    m_aSubType = rtl::OUString::createFromAscii("from-top");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in-slow"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top"));
                 }
                 break;
                 case 0xe:
                 {
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_RIGHT;
                     //rSpeed = ::com::sun::star::presentation::AnimationSpeed_SLOW;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in-slow");
-                    m_aSubType = rtl::OUString::createFromAscii("from-right");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in-slow"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-right"));
                 }
                 break;
                 case 0xf:
                 {
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_BOTTOM;
                     //rSpeed = ::com::sun::star::presentation::AnimationSpeed_SLOW;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in-slow");
-                    m_aSubType = rtl::OUString::createFromAscii("from-bottom");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in-slow"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom"));
                 }
                 break;
                 case 0x10:                                                                              // --- zoom ---
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_CENTER;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-zoom");
-                    m_aSubType = rtl::OUString::createFromAscii("in");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-zoom"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("in"));
                 break;
                 case 0x11:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_CENTER;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-zoom");
-                    m_aSubType = rtl::OUString::createFromAscii("in-slightly");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-zoom"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("in-slightly"));
                 break;
                 case 0x12:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_TO_CENTER;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-zoom");
-                    m_aSubType = rtl::OUString::createFromAscii("out");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-zoom"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("out"));
                 break;
                 case 0x13:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_TO_CENTER;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-zoom");
-                    m_aSubType = rtl::OUString::createFromAscii("out-slightly");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-zoom"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("out-slightly"));
                 break;
                 case 0x14:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_CENTER;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-zoom");
-                    m_aSubType = rtl::OUString::createFromAscii("in-from-screen-center");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-zoom"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("in-from-screen-center"));
                 break;
                 case 0x15:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_TO_CENTER;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-zoom");
-                    m_aSubType = rtl::OUString::createFromAscii("out-from-screen-center");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-zoom"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("out-from-screen-center"));
                 break;
                 case 0x16:                                                                              // --- stretch ---
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_HORIZONTAL_STRETCH;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-stretchy");
-                    m_aSubType = rtl::OUString::createFromAscii("across");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-stretchy"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("across"));
                 break;
                 case 0x17:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_STRETCH_FROM_LEFT;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-stretchy");
-                    m_aSubType = rtl::OUString::createFromAscii("from-left");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-stretchy"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-left"));
                 break;
                 case 0x18:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_STRETCH_FROM_TOP;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-stretchy");
-                    m_aSubType = rtl::OUString::createFromAscii("from-top");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-stretchy"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top"));
                 break;
                 case 0x19:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_STRETCH_FROM_RIGHT;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-stretchy");
-                    m_aSubType = rtl::OUString::createFromAscii("from-right");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-stretchy"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-right"));
                 break;
                 case 0x1a:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_STRETCH_FROM_BOTTOM;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-stretchy");
-                    m_aSubType = rtl::OUString::createFromAscii("from-bottom");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-stretchy"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom"));
                 break;
                 case 0x1b:                                                                              // --- rotate ---
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_HORIZONTAL_ROTATE;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-swivel");
-                    m_aSubType = rtl::OUString::createFromAscii("vertical");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-swivel"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vertical"));
                 break;
                 case 0x1c:                                                                              // --- spirale ---
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_SPIRALOUT_LEFT;
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-spiral-in");
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-spiral-in"));
                 break;
             }
         }
@@ -603,30 +603,30 @@ void Ppt97Animation::UpdateCacheData() const
             {
                 case 0x0:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_OPEN_VERTICAL   ;       // ???
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-split");
-                    m_aSubType = rtl::OUString::createFromAscii("horizontal-out");                      //horizontal open
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-split"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("horizontal-out"));                      //horizontal open
                 break;
                 case 0x1:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_CLOSE_VERTICAL;         // ???
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-split");
-                    m_aSubType = rtl::OUString::createFromAscii("horizontal-in");                       //horizontal close
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-split"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("horizontal-in"));                       //horizontal close
                 break;
                 case 0x2:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_OPEN_HORIZONTAL;        // ???
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-split");
-                    m_aSubType = rtl::OUString::createFromAscii("vertical-out");                        // vertical open
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-split"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vertical-out"));                        // vertical open
                 break;
                 case 0x3:
                     //eRetval = ::com::sun::star::presentation::AnimationEffect_CLOSE_HORIZONTAL;       // ???
-                    m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-split");
-                    m_aSubType = rtl::OUString::createFromAscii("vertical-in");                         // vertical close
+                    m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-split"));
+                    m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vertical-in"));                         // vertical close
                 break;
             }
         }
         break;
         case 0x0e:                                                                                      // --- blink ---
         {
-            m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-flash-once");
+            m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-flash-once"));
             switch ( m_aAtom.nFlyDirection )
             {
                 case 0x0: //fast
@@ -646,7 +646,7 @@ void Ppt97Animation::UpdateCacheData() const
         break;
         default:
         {
-            m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-appear");
+            m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-appear"));
             DBG_ERROR("no effect mapped");
         }
         break;
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 2e0159a1fa13..97087feaa6d1 100644..100755
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -389,7 +389,7 @@ sal_Bool ImplSdPPTImport::Import()
                 Dictionary aDict;
                 if ( pSection->GetDictionary( aDict ) )
                 {
-                    UINT32 nPropId = aDict.GetProperty( rtl::OUString::createFromAscii("_PID_HLINKS" ));
+                    UINT32 nPropId = aDict.GetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_PID_HLINKS" )));
                     if ( nPropId )
                     {
                         if ( pSection->GetProperty( nPropId, aPropItem ) )
@@ -430,6 +430,11 @@ sal_Bool ImplSdPPTImport::Import()
                                         aPropItem >> pHyperlink->nInfo;
                                         if ( !aPropItem.Read( pHyperlink->aTarget, VT_EMPTY ) )
                                             break;
+
+                                        // #n382718# (and #n261623#) Convert '\\' notation to 'smb://'
+                                        INetURLObject aUrl( pHyperlink->aTarget, INET_PROT_FILE );
+                                        pHyperlink->aTarget = aUrl.GetMainURL( INetURLObject::NO_DECODE );
+
                                         if ( !aPropItem.Read( pHyperlink->aSubAdress, VT_EMPTY ) )
                                             break;
                                         pHyperlink->nStartPos = pHyperlink->nEndPos = -1;
@@ -773,7 +778,7 @@ sal_Bool ImplSdPPTImport::Import()
                 if ( SeekToAktPage( &aPageHd ) )
                 {
                     if ( mbTracing )
-                        mpTracer->AddAttribute( rtl::OUString::createFromAscii( "MasterPage" ), rtl::OUString::valueOf( (sal_Int32) (nAktPageNum + 1) ) );
+                        mpTracer->AddAttribute( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MasterPage" )), rtl::OUString::valueOf( (sal_Int32) (nAktPageNum + 1) ) );
 
                     while( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < aPageHd.GetRecEndFilePos() ) )
                     {
@@ -851,7 +856,7 @@ sal_Bool ImplSdPPTImport::Import()
                         aHd.SeekToEndOfRecord( rStCtrl );
                     }
                     if ( mbTracing )
-                        mpTracer->RemoveAttribute( rtl::OUString::createFromAscii( "MasterPage" ) );
+                        mpTracer->RemoveAttribute( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MasterPage" )) );
                 }
                 rStCtrl.Seek( nFPosMerk );
                 ImportPageEffect( (SdPage*)pMPage, bNewAnimationsUsed );
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 21a776ef77c1..a78b8ce8e26c 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -1446,7 +1446,7 @@ void AnimationImporter::importTimeContainer( const Atom* pAtom, const Reference<
                 {
                     if( pChildAtom->hasChildAtom( DFF_msofbtAnimCommand ) )
                     {
-                        const OUString aServiceName( OUString::createFromAscii("com.sun.star.animations.Command") );
+                        const OUString aServiceName( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.animations.Command")) );
                         Reference< XAnimationNode > xChildNode( ::comphelper::getProcessServiceFactory()->createInstance(aServiceName), UNO_QUERY );
                         importAnimationNodeContainer( pChildAtom, xChildNode );
                         Reference< XTimeContainer > xParentContainer( xNode, UNO_QUERY );
@@ -3771,7 +3771,7 @@ void AnimationImporter::dump( const PropertySet& rSet )
             fprintf( mpFile, "\"" );
         }
 
-        aIter++;
+        ++aIter;
     }
 }
 
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index a36441a0aee4..18c69e690439 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -144,7 +144,7 @@ sal_Bool SdPPTFilter::Export()
         if( mxModel.is() )
         {
             SotStorageRef    xStorRef = new SotStorage( mrMedium.GetOutStream(), FALSE );
-            ExportPPT       PPTExport = reinterpret_cast<ExportPPT>(pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii("ExportPPT") ));
+            ExportPPT       PPTExport = reinterpret_cast<ExportPPT>(pLibrary->getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ExportPPT")) ));
 
             /* !!!
             if ( pViewShell && pViewShell->GetView() )
@@ -190,7 +190,7 @@ void SdPPTFilter::PreSaveBasic()
         ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() );
         if( pLibrary )
         {
-            SaveVBA pSaveVBA= reinterpret_cast<SaveVBA>(pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii("SaveVBA") ));
+            SaveVBA pSaveVBA= reinterpret_cast<SaveVBA>(pLibrary->getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SaveVBA")) ));
             if( pSaveVBA )
             {
                 pSaveVBA( (SfxObjectShell&) mrDocShell, pBas );
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 91560d821582..25f59eed1d49 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -232,7 +232,7 @@ sal_Int32 ReadThroughComponent(
     // get parser
     Reference< xml::sax::XParser > xParser(
         rFactory->createInstance(
-            OUString::createFromAscii("com.sun.star.xml.sax.Parser") ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) ),
         UNO_QUERY );
     DBG_ASSERT( xParser.is(), "Can't create parser" );
     if( !xParser.is() )
@@ -518,7 +518,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
     };
 
     uno::Reference< beans::XPropertySet > xInfoSet( GenericPropertySet_CreateInstance( new PropertySetInfo( aImportInfoMap ) ) );
-    xInfoSet->setPropertyValue( OUString::createFromAscii( "Preview" ), uno::makeAny( mrDocShell.GetDoc()->IsStarDrawPreviewMode() ) );
+    xInfoSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "Preview" )), uno::makeAny( mrDocShell.GetDoc()->IsStarDrawPreviewMode() ) );
 
     // ---- get BuildId from parent container if available
 
@@ -622,7 +622,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
                 aName = pDocHierarchItem->GetValue();
         }
         else
-            aName = ::rtl::OUString::createFromAscii( "dummyObjectName" );
+            aName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "dummyObjectName" ));
 
         if( aName.getLength() )
         {
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 6f27b177d1c3..9a8ed5dd8ddb 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -281,7 +281,7 @@ Reference<XAccessible> SAL_CALL
             return mxAccessibleOLEObject;
 
     throw lang::IndexOutOfBoundsException (
-        ::rtl::OUString::createFromAscii ("no child with index ")
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("no child with index ") ))
         + rtl::OUString::valueOf(nIndex),
         NULL);
 }
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index e748724054ab..8b1028377710 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -260,7 +260,7 @@ uno::Reference<XAccessible> SAL_CALL
     }
     else
         throw lang::IndexOutOfBoundsException (
-            ::rtl::OUString::createFromAscii ("no accessible child with index ")
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("no accessible child with index "))
             + rtl::OUString::valueOf(nIndex),
             static_cast<uno::XWeak*>(this));
 }
diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx
index b1969fdd7823..574b4a90d27a 100644
--- a/sd/source/ui/accessibility/AccessiblePageShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx
@@ -103,7 +103,7 @@ uno::Reference<XAccessible> SAL_CALL
     throw (::com::sun::star::uno::RuntimeException)
 {
     throw lang::IndexOutOfBoundsException (
-        ::rtl::OUString::createFromAscii ("page shape has no children"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("page shape has no children") ),
         static_cast<uno::XWeak*>(this));
 }
 
@@ -196,7 +196,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getForeground (void)
         if (aSet.is())
         {
             uno::Any aColor;
-            aColor = aSet->getPropertyValue (::rtl::OUString::createFromAscii ("LineColor"));
+            aColor = aSet->getPropertyValue (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineColor")));
             aColor >>= nColor;
         }
     }
@@ -247,7 +247,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getBackground (void)
             if (xBGSet.is())
             {
                 uno::Any aColor;
-                aColor = xBGSet->getPropertyValue (::rtl::OUString::createFromAscii ("FillColor"));
+                aColor = xBGSet->getPropertyValue (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FillColor")));
                 aColor >>= nColor;
             }
             else
diff --git a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
index af99c29fd564..badc16d208d4 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
@@ -109,11 +109,11 @@ AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape (void)
     switch (nShapeType)
     {
         case PRESENTATION_GRAPHIC_OBJECT:
-            aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationGraphicShape"));
+            aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(("PresentationGraphicShape"))));
             break;
         default:
             aDG.Initialize (
-                ::rtl::OUString::createFromAscii ("Unknown accessible presentation graphic shape"));
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown accessible presentation graphic shape")));
             uno::Reference<drawing::XShapeDescriptor> xDescriptor (mxShape, uno::UNO_QUERY);
             if (xDescriptor.is())
             {
diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
index c95ccb5bff62..0773fbdbaaff 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
@@ -50,16 +50,10 @@ AccessiblePresentationOLEShape::AccessiblePresentationOLEShape (
 {
 }
 
-
-
-
 AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape (void)
 {
 }
 
-
-
-
 //=====  XServiceInfo  ========================================================
 
 ::rtl::OUString SAL_CALL
@@ -69,9 +63,6 @@ AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape (void)
     return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessiblePresentationOLEShape"));
 }
 
-
-
-
 /// Set this object's name if it is different to the current name.
 ::rtl::OUString
     AccessiblePresentationOLEShape::CreateAccessibleBaseName (void)
@@ -103,9 +94,6 @@ AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape (void)
     return sName;
 }
 
-
-
-
 ::rtl::OUString
     AccessiblePresentationOLEShape::CreateAccessibleDescription (void)
     throw (::com::sun::star::uno::RuntimeException)
@@ -116,25 +104,25 @@ AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape (void)
     switch (nShapeType)
     {
         case PRESENTATION_OLE:
-            aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationOLEShape"));
+            aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("PresentationOLEShape")));
             //SVX_RESSTR(RID_SVXSTR_A11Y_ST_RECTANGLE));
-            aDG.AddProperty (OUString::createFromAscii ("CLSID"),
+            aDG.AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM ("CLSID")),
                 DescriptionGenerator::STRING);
             break;
         case PRESENTATION_CHART:
-            aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationChartShape"));
+            aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationChartShape")));
             //SVX_RESSTR(RID_SVXSTR_A11Y_ST_RECTANGLE));
-            aDG.AddProperty (OUString::createFromAscii ("CLSID"),
+            aDG.AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID")),
                 DescriptionGenerator::STRING);
             break;
         case PRESENTATION_TABLE:
-            aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationTableShape"));
+            aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationTableShape")));
             //SVX_RESSTR(RID_SVXSTR_A11Y_ST_RECTANGLE));
-            aDG.AddProperty (OUString::createFromAscii ("CLSID"),
+            aDG.AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID")),
                 DescriptionGenerator::STRING);
             break;
         default:
-            aDG.Initialize (::rtl::OUString::createFromAscii ("Unknown accessible presentation OLE shape"));
+            aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown accessible presentation OLE shape")));
             uno::Reference<drawing::XShapeDescriptor> xDescriptor (mxShape, uno::UNO_QUERY);
             if (xDescriptor.is())
             {
diff --git a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
index b8f48200ee4b..9558d3c546ef 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
@@ -136,37 +136,37 @@ AccessiblePresentationShape::~AccessiblePresentationShape (void)
     switch (nShapeType)
     {
         case PRESENTATION_TITLE:
-            aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationTitleShape"));
+            aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationTitleShape")));
             break;
         case PRESENTATION_OUTLINER:
-            aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationOutlinerShape"));
+            aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationOutlinerShape")));
             break;
         case PRESENTATION_SUBTITLE:
-            aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationSubtitleShape"));
+            aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationSubtitleShape")));
             break;
         case PRESENTATION_PAGE:
-            aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationPageShape"));
+            aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationPageShape")));
             break;
         case PRESENTATION_NOTES:
-            aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationNotesShape"));
+            aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationNotesShape")));
             break;
         case PRESENTATION_HANDOUT:
-            aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationHandoutShape"));
+            aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationHandoutShape")));
             break;
         case PRESENTATION_HEADER:
-            aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationHeaderShape"));
+            aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationHeaderShape")));
             break;
         case PRESENTATION_FOOTER:
-            aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationFooterShape"));
+            aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationFooterShape")));
             break;
         case PRESENTATION_DATETIME:
-            aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationDateAndTimeShape"));
+            aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationDateAndTimeShape")));
             break;
         case PRESENTATION_PAGENUMBER:
-            aDG.Initialize (::rtl::OUString::createFromAscii ("PresentationPageNumberShape"));
+            aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationPageNumberShape")));
             break;
         default:
-            aDG.Initialize (::rtl::OUString::createFromAscii ("Unknown accessible presentation shape"));
+            aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown accessible presentation shape")));
             uno::Reference<drawing::XShapeDescriptor> xDescriptor (mxShape, uno::UNO_QUERY);
             if (xDescriptor.is())
             {
diff --git a/sd/source/ui/accessibility/SdShapeTypes.cxx b/sd/source/ui/accessibility/SdShapeTypes.cxx
index ad7519ee295c..3b869c72c568 100644
--- a/sd/source/ui/accessibility/SdShapeTypes.cxx
+++ b/sd/source/ui/accessibility/SdShapeTypes.cxx
@@ -76,59 +76,59 @@ AccessibleShape*
 ShapeTypeDescriptor aSdShapeTypeList[] = {
     ShapeTypeDescriptor (
         PRESENTATION_OUTLINER,
-        ::rtl::OUString::createFromAscii ("com.sun.star.presentation.OutlinerShape"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.OutlinerShape"))),
         CreateSdAccessibleShape ),
     ShapeTypeDescriptor (
         PRESENTATION_SUBTITLE,
-        ::rtl::OUString::createFromAscii ("com.sun.star.presentation.SubtitleShape"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.SubtitleShape"))),
         CreateSdAccessibleShape ),
     ShapeTypeDescriptor (
         PRESENTATION_GRAPHIC_OBJECT,
-        ::rtl::OUString::createFromAscii ("com.sun.star.presentation.GraphicObjectShape"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.GraphicObjectShape"))),
         CreateSdAccessibleShape ),
     ShapeTypeDescriptor (
         PRESENTATION_PAGE,
-        ::rtl::OUString::createFromAscii ("com.sun.star.presentation.PageShape"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.PageShape"))),
         CreateSdAccessibleShape ),
     ShapeTypeDescriptor (
         PRESENTATION_OLE,
-        ::rtl::OUString::createFromAscii ("com.sun.star.presentation.OLE2Shape"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.OLE2Shape"))),
         CreateSdAccessibleShape ),
     ShapeTypeDescriptor (
         PRESENTATION_CHART,
-        ::rtl::OUString::createFromAscii ("com.sun.star.presentation.ChartShape"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.ChartShape"))),
         CreateSdAccessibleShape ),
     ShapeTypeDescriptor (
         PRESENTATION_TABLE,
-        ::rtl::OUString::createFromAscii ("com.sun.star.presentation.TableShape"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.TableShape"))),
         CreateSdAccessibleShape ),
     ShapeTypeDescriptor (
         PRESENTATION_NOTES,
-        ::rtl::OUString::createFromAscii ("com.sun.star.presentation.NotesShape"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ("com.sun.star.presentation.NotesShape"))),
         CreateSdAccessibleShape ),
     ShapeTypeDescriptor (
         PRESENTATION_TITLE,
-        ::rtl::OUString::createFromAscii ("com.sun.star.presentation.TitleTextShape"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.presentation.TitleTextShape")),
         CreateSdAccessibleShape ),
     ShapeTypeDescriptor (
         PRESENTATION_HANDOUT,
-        ::rtl::OUString::createFromAscii ("com.sun.star.presentation.HandoutShape"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.presentation.HandoutShape")),
         CreateSdAccessibleShape ),
     ShapeTypeDescriptor (
         PRESENTATION_HEADER,
-        ::rtl::OUString::createFromAscii ("com.sun.star.presentation.HeaderShape"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.presentation.HeaderShape")),
         CreateSdAccessibleShape ),
     ShapeTypeDescriptor (
         PRESENTATION_FOOTER,
-        ::rtl::OUString::createFromAscii ("com.sun.star.presentation.FooterShape"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.presentation.FooterShape")),
         CreateSdAccessibleShape ),
     ShapeTypeDescriptor (
         PRESENTATION_DATETIME,
-        ::rtl::OUString::createFromAscii ("com.sun.star.presentation.DateTimeShape"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.presentation.DateTimeShape")),
         CreateSdAccessibleShape ),
     ShapeTypeDescriptor (
         PRESENTATION_PAGENUMBER,
-        ::rtl::OUString::createFromAscii ("com.sun.star.presentation.SlideNumberShape"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.presentation.SlideNumberShape")),
         CreateSdAccessibleShape )
 };
 
diff --git a/sd/source/ui/animations/CustomAnimation.hrc b/sd/source/ui/animations/CustomAnimation.hrc
index bfe4e1d9c6d4..d5406ded8a26 100644
--- a/sd/source/ui/animations/CustomAnimation.hrc
+++ b/sd/source/ui/animations/CustomAnimation.hrc
@@ -56,25 +56,15 @@
 #define RID_CUSTOMANIMATION_FONTSTYLE_POPUP             RID_CUSTOMANIMATION_START+12
 
 #define IMG_CUSTOMANIMATION_ON_CLICK                    RID_CUSTOMANIMATION_START+0
-#define IMG_CUSTOMANIMATION_ON_CLICK_H                  RID_CUSTOMANIMATION_START+1
-#define IMG_CUSTOMANIMATION_AFTER_PREVIOUS              RID_CUSTOMANIMATION_START+2
-#define IMG_CUSTOMANIMATION_AFTER_PREVIOUS_H            RID_CUSTOMANIMATION_START+3
-#define IMG_CUSTOMANIMATION_ENTRANCE_EFFECT             RID_CUSTOMANIMATION_START+4
-#define IMG_CUSTOMANIMATION_ENTRANCE_EFFECT_H           RID_CUSTOMANIMATION_START+5
-#define IMG_CUSTOMANIMATION_EMPHASIS_EFFECT             RID_CUSTOMANIMATION_START+6
-#define IMG_CUSTOMANIMATION_EMPHASIS_EFFECT_H           RID_CUSTOMANIMATION_START+7
-#define IMG_CUSTOMANIMATION_EXIT_EFFECT                 RID_CUSTOMANIMATION_START+8
-#define IMG_CUSTOMANIMATION_EXIT_EFFECT_H               RID_CUSTOMANIMATION_START+9
-#define IMG_CUSTOMANIMATION_MOTION_PATH                 RID_CUSTOMANIMATION_START+10
-#define IMG_CUSTOMANIMATION_MOTION_PATH_H               RID_CUSTOMANIMATION_START+11
-#define IMG_CUSTOMANIMATION_OLE                         RID_CUSTOMANIMATION_START+12
-#define IMG_CUSTOMANIMATION_OLE_H                       RID_CUSTOMANIMATION_START+13
-#define IMG_CUSTOMANIMATION_MEDIA_PLAY                  RID_CUSTOMANIMATION_START+14
-#define IMG_CUSTOMANIMATION_MEDIA_PLAY_H                RID_CUSTOMANIMATION_START+15
-#define IMG_CUSTOMANIMATION_MEDIA_PAUSE                 RID_CUSTOMANIMATION_START+16
-#define IMG_CUSTOMANIMATION_MEDIA_PAUSE_H               RID_CUSTOMANIMATION_START+17
-#define IMG_CUSTOMANIMATION_MEDIA_STOP                  RID_CUSTOMANIMATION_START+18
-#define IMG_CUSTOMANIMATION_MEDIA_STOP_H                RID_CUSTOMANIMATION_START+19
+#define IMG_CUSTOMANIMATION_AFTER_PREVIOUS              RID_CUSTOMANIMATION_START+1
+#define IMG_CUSTOMANIMATION_ENTRANCE_EFFECT             RID_CUSTOMANIMATION_START+2
+#define IMG_CUSTOMANIMATION_EMPHASIS_EFFECT             RID_CUSTOMANIMATION_START+3
+#define IMG_CUSTOMANIMATION_EXIT_EFFECT                 RID_CUSTOMANIMATION_START+4
+#define IMG_CUSTOMANIMATION_MOTION_PATH                 RID_CUSTOMANIMATION_START+5
+#define IMG_CUSTOMANIMATION_OLE                         RID_CUSTOMANIMATION_START+6
+#define IMG_CUSTOMANIMATION_MEDIA_PLAY                  RID_CUSTOMANIMATION_START+7
+#define IMG_CUSTOMANIMATION_MEDIA_PAUSE                 RID_CUSTOMANIMATION_START+8
+#define IMG_CUSTOMANIMATION_MEDIA_STOP                  RID_CUSTOMANIMATION_START+9
 
 #define STR_CUSTOMANIMATION_DURATION_VERY_SLOW          RID_CUSTOMANIMATION_START+0
 #define STR_CUSTOMANIMATION_DURATION_SLOW               RID_CUSTOMANIMATION_START+1
diff --git a/sd/source/ui/animations/CustomAnimation.src b/sd/source/ui/animations/CustomAnimation.src
index 449107f05c75..14c0eb420428 100644
--- a/sd/source/ui/animations/CustomAnimation.src
+++ b/sd/source/ui/animations/CustomAnimation.src
@@ -397,99 +397,47 @@ Image IMG_CUSTOMANIMATION_ON_CLICK
     ImageBitmap = Bitmap { File = "click_16.png" ; };
 };
 
-Image IMG_CUSTOMANIMATION_ON_CLICK_H
-{
-    ImageBitmap = Bitmap { File = "click_16_h.png" ; };
-};
-
 Image IMG_CUSTOMANIMATION_AFTER_PREVIOUS
 {
     ImageBitmap = Bitmap { File = "time_16.png" ; };
 };
 
-Image IMG_CUSTOMANIMATION_AFTER_PREVIOUS_H
-{
-    ImageBitmap = Bitmap { File = "time_16_h.png" ; };
-};
-
 Image IMG_CUSTOMANIMATION_ENTRANCE_EFFECT
 {
     ImageBitmap = Bitmap { File = "effect_16.png" ; };
 };
 
-Image IMG_CUSTOMANIMATION_ENTRANCE_EFFECT_H
-{
-    ImageBitmap = Bitmap { File = "effect_16_h.png" ; };
-};
-
 Image IMG_CUSTOMANIMATION_EMPHASIS_EFFECT
 {
     ImageBitmap = Bitmap { File = "effectshape_16.png" ; };
 };
 
-Image IMG_CUSTOMANIMATION_EMPHASIS_EFFECT_H
-{
-    ImageBitmap = Bitmap { File = "effectshape_16_h.png" ; };
-};
-
 Image IMG_CUSTOMANIMATION_EXIT_EFFECT
 {
     ImageBitmap = Bitmap { File = "effectfade_16.png" ; };
 };
 
-Image IMG_CUSTOMANIMATION_EXIT_EFFECT_H
-{
-    ImageBitmap = Bitmap { File = "effectfade_16_h.png" ; };
-};
-
 Image IMG_CUSTOMANIMATION_MOTION_PATH
 {
     ImageBitmap = Bitmap { File = "effectpath_16.png" ; };
 };
 
-Image IMG_CUSTOMANIMATION_MOTION_PATH_H
-{
-    ImageBitmap = Bitmap { File = "effectpath_16_h.png" ; };
-};
-
 Image IMG_CUSTOMANIMATION_OLE
 {
     ImageBitmap = Bitmap { File = "effectole_16.png"; } ;
 };
 
-Image IMG_CUSTOMANIMATION_OLE_H
-{
-    ImageBitmap = Bitmap { File = "effectole_16_h.png"; } ;
-};
-
 Image IMG_CUSTOMANIMATION_MEDIA_PLAY
 {
     ImageBitmap = Bitmap { File = "playblue_16.png"; } ;
 };
 
-Image IMG_CUSTOMANIMATION_MEDIA_PLAY_H
-{
-    ImageBitmap = Bitmap { File = "playblue_16_h.png"; } ;
-};
-
 Image IMG_CUSTOMANIMATION_MEDIA_PAUSE
 {
     ImageBitmap = Bitmap { File = "breakplayingblue_16.png"; } ;
 };
 
-Image IMG_CUSTOMANIMATION_MEDIA_PAUSE_H
-{
-    ImageBitmap = Bitmap { File = "breakplayingblue_16_h.png"; } ;
-};
-
 Image IMG_CUSTOMANIMATION_MEDIA_STOP
 {
     ImageBitmap = Bitmap { File = "stopplayingblue_16.png"; } ;
 };
-
-Image IMG_CUSTOMANIMATION_MEDIA_STOP_H
-{
-    ImageBitmap = Bitmap { File = "stopplayingblue_16_h.png"; } ;
-};
-
-
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index e4295c800380..cd0d5fc30146 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -230,7 +230,7 @@ ImplStlEffectCategorySortHelper::ImplStlEffectCategorySortHelper()
     uno::Reference<lang::XMultiServiceFactory> xFac( ::comphelper::getProcessServiceFactory() );
     if( xFac.is() )
     {
-        mxCollator.set( xFac->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.i18n.Collator" ) ), uno::UNO_QUERY );
+        mxCollator.set( xFac->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.Collator" )) ), uno::UNO_QUERY );
 
         if( mxCollator.is() )
         {
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 0d38c738aef1..050a21ea1176 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -257,7 +257,6 @@ void CustomAnimationListEntryItem::InitViewData( SvLBox* pView, SvLBoxEntry* pEn
 
 void CustomAnimationListEntryItem::Paint( const Point& rPos, SvLBox& rDev, USHORT, SvLBoxEntry* pEntry )
 {
-    const bool bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
 
     SvViewDataItem* pViewData = mpParent->GetViewDataItem( pEntry, this );
 
@@ -267,11 +266,11 @@ void CustomAnimationListEntryItem::Paint( const Point& rPos, SvLBox& rDev, USHOR
     sal_Int16 nNodeType = mpEffect->getNodeType();
     if( nNodeType == EffectNodeType::ON_CLICK )
     {
-        rDev.DrawImage( aPos, mpParent->getImage( IMG_CUSTOMANIMATION_ON_CLICK, bHighContrast ) );
+        rDev.DrawImage( aPos, mpParent->getImage( IMG_CUSTOMANIMATION_ON_CLICK ) );
     }
     else if( nNodeType == EffectNodeType::AFTER_PREVIOUS )
     {
-        rDev.DrawImage( aPos, mpParent->getImage( IMG_CUSTOMANIMATION_AFTER_PREVIOUS, bHighContrast ) );
+        rDev.DrawImage( aPos, mpParent->getImage( IMG_CUSTOMANIMATION_AFTER_PREVIOUS ) );
     }
 
     aPos.X() += 19;
@@ -298,7 +297,7 @@ void CustomAnimationListEntryItem::Paint( const Point& rPos, SvLBox& rDev, USHOR
 
     if( nImage != 0xffff )
     {
-        const Image& rImage = mpParent->getImage( nImage, bHighContrast );
+        const Image& rImage = mpParent->getImage( nImage );
         Point aImagePos( aPos );
         aImagePos.Y() += ( aSize.Height() - rImage.GetSizePixel().Height() ) >> 1;
         rDev.DrawImage( aImagePos, rImage );
@@ -484,13 +483,10 @@ CustomAnimationList::CustomAnimationList( ::Window* pParent, const ResId& rResId
 
 // --------------------------------------------------------------------
 
-const Image&  CustomAnimationList::getImage( USHORT nId, bool bHighContrast )
+const Image&  CustomAnimationList::getImage( USHORT nId )
 {
     DBG_ASSERT( (nId >= IMG_CUSTOMANIMATION_ON_CLICK) && (nId <= IMG_CUSTOMANIMATION_MEDIA_STOP), "sd::CustomAnimationList::getImage(), illegal index!" );
 
-    if( bHighContrast )
-        nId += 1;
-
     Image& rImage = maImages[nId - IMG_CUSTOMANIMATION_ON_CLICK];
 
     // load on demand
diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx
index 8bc1b6f43c6c..8920bbb41cee 100644
--- a/sd/source/ui/animations/CustomAnimationList.hxx
+++ b/sd/source/ui/animations/CustomAnimationList.hxx
@@ -96,7 +96,7 @@ public:
 
     virtual void notify_change();
 
-    const Image& getImage( USHORT nId, bool bHighContrast );
+    const Image& getImage( USHORT nId );
 
     bool isExpanded( const CustomAnimationEffectPtr& pEffect ) const;
 
@@ -115,7 +115,7 @@ private:
 
     Image maImgEmpty;
 
-    Image maImages[ IMG_CUSTOMANIMATION_MEDIA_STOP_H - IMG_CUSTOMANIMATION_ON_CLICK + 1];
+    Image maImages[ IMG_CUSTOMANIMATION_MEDIA_STOP - IMG_CUSTOMANIMATION_ON_CLICK + 1];
 
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxLastTargetShape;
     sal_Int32 mnLastGroupId;
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 2941fd24ef87..f09abc7cb09d 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -262,7 +262,7 @@ CustomAnimationPane::~CustomAnimationPane()
     MotionPathTagVector aTags;
     aTags.swap( maMotionPathTags );
     MotionPathTagVector::iterator aIter;
-    for( aIter = aTags.begin(); aIter != aTags.end(); aIter++ )
+    for( aIter = aTags.begin(); aIter != aTags.end(); ++aIter )
         (*aIter)->Dispose();
 
     delete mpFLModify;
@@ -824,9 +824,6 @@ void CustomAnimationPane::updateControls()
             mpPBPropertyMore->Enable( FALSE );
         }
 
-        //
-        // ---
-        //
         USHORT nPos = 0xffff;
 
         sal_Int16 nNodeType = pEffect->getNodeType();
@@ -961,7 +958,7 @@ static bool updateMotionPathImpl( CustomAnimationPane& rPane, ::sd::View& rView,
             rtl::Reference< MotionPathTag > xMotionPathTag;
             // first try to find if there is already a tag for this
             MotionPathTagVector::iterator aMIter( rOldTags.begin() );
-            for( ; aMIter != rOldTags.end(); aMIter++ )
+            for( ; aMIter != rOldTags.end(); ++aMIter )
             {
                 rtl::Reference< MotionPathTag > xTag( (*aMIter) );
                 if( xTag->getEffect() == pEffect )
@@ -1372,8 +1369,6 @@ STLPropertySet* CustomAnimationPane::createSelectionSet()
             addValue( pSet, nHandleTrigger, makeAny( pIS->getTriggerShape() ) );
         }
 
-        //
-
         CustomAnimationPresetPtr pDescriptor = rPresets.getEffectDescriptor( pEffect->getPresetId() );
         if( pDescriptor.get() )
         {
@@ -1901,7 +1896,7 @@ void CustomAnimationPane::onChange( bool bCreate )
                 aParaTarget.Shape = xShape;
 
                 std::list< sal_Int16 >::iterator aIter( aParaList.begin() );
-                for( ; aIter != aParaList.end(); aIter++ )
+                for( ; aIter != aParaList.end(); ++aIter )
                 {
                     aParaTarget.Paragraph = (*aIter);
                     aTargets.push_back( makeAny( aParaTarget ) );
@@ -1950,7 +1945,7 @@ void CustomAnimationPane::onChange( bool bCreate )
                 std::vector< Any >::iterator aIter( aTargets.begin() );
                 const std::vector< Any >::iterator aEnd( aTargets.end() );
                 bool bFirst = true;
-                for( ; aIter != aEnd; aIter++ )
+                for( ; aIter != aEnd; ++aIter )
                 {
                     CustomAnimationEffectPtr pCreated = mpMainSequence->append( pDescriptor, (*aIter), fDuration );
 
@@ -2275,9 +2270,9 @@ void CustomAnimationPane::moveSelection( bool bUp )
 
                 if( aInsertPos != rEffectSequence.begin() )
                 {
-                    aInsertPos--;
+                    --aInsertPos;
                     while( (aInsertPos != rEffectSequence.begin()) && !mpCustomAnimationList->isExpanded(*aInsertPos))
-                        aInsertPos--;
+                        --aInsertPos;
 
                     rEffectSequence.insert( aInsertPos, pEffect );
                 }
@@ -2305,9 +2300,9 @@ void CustomAnimationPane::moveSelection( bool bUp )
 
                 if( aInsertPos != rEffectSequence.end() )
                 {
-                    aInsertPos++;
+                    ++aInsertPos;
                     while( (aInsertPos != rEffectSequence.end()) && !mpCustomAnimationList->isExpanded(*aInsertPos))
-                        aInsertPos++;
+                        ++aInsertPos;
 
                     rEffectSequence.insert( aInsertPos, pEffect );
                 }
@@ -2337,7 +2332,7 @@ void CustomAnimationPane::onPreview( bool bForcePreview )
     {
         rtl::Reference< MotionPathTag > xMotionPathTag;
         MotionPathTagVector::iterator aIter;
-        for( aIter = maMotionPathTags.begin(); aIter != maMotionPathTags.end(); aIter++ )
+        for( aIter = maMotionPathTags.begin(); aIter != maMotionPathTags.end(); ++aIter )
         {
             if( (*aIter)->isSelected() )
             {
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index a6a1ae2051fb..0cfc62537d98 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -182,7 +182,7 @@ OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAnnotatio
 
         Time aTime( aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds, aDateTime.HundredthSeconds );
         if(aTime.GetTime() != 0)
-            sRet = sRet + rtl::OUString::createFromAscii(" ")  + rLocalData.getTime( aTime,false );
+            sRet = sRet + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "))  + rLocalData.getTime( aTime,false );
     }
     return sRet;
 }
@@ -398,7 +398,7 @@ void AnnotationManagerImpl::InsertAnnotation()
                 Rectangle aNewRect( x, y, x + width - 1, y + height - 1 );
                    bool bFree = true;
 
-                   for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); iter++ )
+                   for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); ++iter )
                    {
                        RealPoint2D aPoint( (*iter)->getPosition() );
                        aTagRect.nLeft   = sal::static_int_cast< long >( aPoint.X * 100.0 );
@@ -554,7 +554,7 @@ void AnnotationManagerImpl::DeleteAnnotationsByAuthor( const rtl::OUString& sAut
         if( pPage && !pPage->getAnnotations().empty() )
         {
             AnnotationVector aAnnotations( pPage->getAnnotations() );
-            for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); iter++ )
+            for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); ++iter )
             {
                 Reference< XAnnotation > xAnnotation( *iter );
                 if( xAnnotation->getAuthor() == sAuthor )
@@ -585,7 +585,7 @@ void AnnotationManagerImpl::DeleteAllAnnotations()
         {
 
             AnnotationVector aAnnotations( pPage->getAnnotations() );
-            for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); iter++ )
+            for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); ++iter )
             {
                 pPage->removeAnnotation( (*iter) );
             }
@@ -663,11 +663,11 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward)
     {
         if( xCurrent.is() )
         {
-               for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); iter++ )
+               for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); ++iter )
                {
                    if( (*iter) == xCurrent )
                    {
-                       iter++;
+                       ++iter;
                        if( iter != aAnnotations.end() )
                        {
                            SelectAnnotation( (*iter) );
@@ -687,20 +687,19 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward)
     {
         if( xCurrent.is() )
         {
-               for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); iter++ )
-               {
-                   if( (*iter) == xCurrent )
-                   {
-                       if( iter != aAnnotations.begin() )
-                       {
-                           iter--;
+            for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); ++iter )
+            {
+                if( (*iter) == xCurrent )
+                {
+                    if( iter != aAnnotations.begin() )
+                    {
+                        --iter;
                         SelectAnnotation( (*iter) );
                         return;
-
-                       }
-                       break;
-                   }
-               }
+                    }
+                    break;
+                }
+            }
         }
         else if( !aAnnotations.empty() )
         {
@@ -1053,7 +1052,6 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation
     Reference< ::com::sun::star::frame::XFrame > xFrame( mrBase.GetMainViewShell()->GetViewFrame()->GetFrame().GetFrameInterface() );
     if( xFrame.is() )
     {
-        const bool bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
         for( USHORT nPos = 0; nPos < pMenu->GetItemCount(); nPos++ )
         {
             nId = pMenu->GetItemId( nPos );
@@ -1062,7 +1060,7 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation
                 OUString sSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
                 sSlotURL += OUString::valueOf( sal_Int32( nId ));
 
-                Image aImage( GetImage( xFrame, sSlotURL, false, bHighContrast ) );
+                Image aImage( GetImage( xFrame, sSlotURL, false ) );
                 if( !!aImage )
                     pMenu->SetItemImage( nId, aImage );
             }
diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx
index cf0cd20a9163..0a31dfa0d04e 100644
--- a/sd/source/ui/annotations/annotationmanagerimpl.hxx
+++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx
@@ -70,7 +70,6 @@ public:
     virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
 
-    //
     void ExecuteAnnotation (SfxRequest& rRequest);
     void GetAnnotationState (SfxItemSet& rItemSet);
 
diff --git a/sd/source/ui/app/makefile.mk b/sd/source/ui/app/makefile.mk
index b0ac26018877..8fbbf31d202d 100755
--- a/sd/source/ui/app/makefile.mk
+++ b/sd/source/ui/app/makefile.mk
@@ -59,24 +59,19 @@ SRC1FILES =	\
 #		$(OBJ)$/sdresid.obj	\
 
 SLOFILES =	\
+        $(EXCEPTIONSFILES)		\
+        $(SLO)$/sdresid.obj
+
+EXCEPTIONSFILES= \
+        $(SLO)$/optsitem.obj		\
+        $(SLO)$/sddll.obj		\
+        $(SLO)$/sddll1.obj      	\
+        $(SLO)$/sddll2.obj      	\
         $(SLO)$/sdmod.obj		\
         $(SLO)$/sdmod1.obj		\
         $(SLO)$/sdmod2.obj		\
-        $(SLO)$/sddll.obj		\
-        $(SLO)$/sddll1.obj      \
-        $(SLO)$/sddll2.obj      \
-        $(SLO)$/tbxww.obj		\
-        $(SLO)$/optsitem.obj	\
-        $(SLO)$/sdresid.obj		\
         $(SLO)$/sdpopup.obj		\
         $(SLO)$/sdxfer.obj		\
-        $(SLO)$/tmplctrl.obj
-
-EXCEPTIONSFILES= \
-        $(SLO)$/sddll1.obj      \
-        $(SLO)$/sddll2.obj      \
-        $(SLO)$/sdxfer.obj		\
-        $(SLO)$/sdmod1.obj		\
         $(SLO)$/tbxww.obj		\
         $(SLO)$/tmplctrl.obj
 
diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index 0901e53df0ed..f2d1ed5be10e 100755
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -35,165 +35,82 @@ Bitmap BMP_LAYOUT_EMPTY
 {
     File = "layout_empty.png";
 };
-Bitmap BMP_LAYOUT_EMPTY_H
-{
-    File = "layout_empty_h.png";
-};
 Bitmap BMP_LAYOUT_HEAD01
 {
     File = "layout_head01.png";
 };
-Bitmap BMP_LAYOUT_HEAD01_H
-{
-    File = "layout_head01_h.png";
-};
 Bitmap BMP_LAYOUT_HEAD02
 {
     File = "layout_head02.png";
 };
-Bitmap BMP_LAYOUT_HEAD02_H
-{
-    File = "layout_head02_h.png";
-};
 Bitmap BMP_LAYOUT_HEAD02A
 {
     File = "layout_head02a.png";
 };
-Bitmap BMP_LAYOUT_HEAD02A_H
-{
-    File = "layout_head02a_h.png";
-};
 Bitmap BMP_LAYOUT_HEAD02B
 {
     File = "layout_head02b.png";
 };
-Bitmap BMP_LAYOUT_HEAD02B_H
-{
-    File = "layout_head02b_h.png";
-};
 Bitmap BMP_LAYOUT_HEAD03
 {
     File = "layout_head03.png";
 };
-Bitmap BMP_LAYOUT_HEAD03_H
-{
-    File = "layout_head03_h.png";
-};
 Bitmap BMP_LAYOUT_HEAD03A
 {
     File = "layout_head03a.png";
 };
-Bitmap BMP_LAYOUT_HEAD03A_H
-{
-    File = "layout_head03a_h.png";
-};
 Bitmap BMP_LAYOUT_HEAD03B
 {
     File = "layout_head03b.png";
 };
-Bitmap BMP_LAYOUT_HEAD03B_H
-{
-    File = "layout_head03b_h.png";
-};
 Bitmap BMP_LAYOUT_HEAD03C
 {
     File = "layout_head03c.png";
 };
-Bitmap BMP_LAYOUT_HEAD03C_H
-{
-    File = "layout_head03c_h.png";
-};
 Bitmap BMP_LAYOUT_HEAD04
 {
     File = "layout_head04.png";
 };
-Bitmap BMP_LAYOUT_HEAD04_H
-{
-    File = "layout_head04_h.png";
-};
 Bitmap BMP_LAYOUT_HEAD06
 {
     File = "layout_head06.png";
 };
-Bitmap BMP_LAYOUT_HEAD06_H
-{
-    File = "layout_head06_h.png";
-};
 Bitmap BMP_LAYOUT_TEXTONLY
 {
     File = "layout_textonly.png";
 };
-Bitmap BMP_LAYOUT_TEXTONLY_H
-{
-    File = "layout_textonly_h.png";
-};
 Bitmap BMP_LAYOUT_VERTICAL01
 {
     File = "layout_vertical01.png";
 };
-Bitmap BMP_LAYOUT_VERTICAL01_H
-{
-    File = "layout_vertical01_h.png";
-};
 Bitmap BMP_LAYOUT_VERTICAL02
 {
     File = "layout_vertical02.png";
 };
-Bitmap BMP_LAYOUT_VERTICAL02_H
-{
-    File = "layout_vertical02_h.png";
-};
-
 Bitmap BMP_FOILH_01
 {
     File = "foilh01.png";
 };
-Bitmap BMP_FOILH_01_H
-{
-    File = "foilh01_h.png";
-};
 Bitmap BMP_FOILH_02
 {
     File = "foilh02.png";
 };
-Bitmap BMP_FOILH_02_H
-{
-    File = "foilh02_h.png";
-};
 Bitmap BMP_FOILH_03
 {
     File = "foilh03.png";
 };
-Bitmap BMP_FOILH_03_H
-{
-    File = "foilh03_h.png";
-};
 Bitmap BMP_FOILH_04
 {
     File = "foilh04.png";
 };
-Bitmap BMP_FOILH_04_H
-{
-    File = "foilh04_h.png";
-};
 Bitmap BMP_FOILH_06
 {
     File = "foilh06.png";
 };
-Bitmap BMP_FOILH_06_H
-{
-    File = "foilh06_h.png";
-};
 Bitmap BMP_FOILH_09
 {
     File = "foilh09.png";
 };
-Bitmap BMP_FOILH_09_H
-{
-    File = "foilh09_h.png";
-};
-
-
 Bitmap BMP_PLACEHOLDER_CHART_SMALL
 {
     File = "placeholder_chart_small.png";
@@ -264,139 +181,72 @@ Bitmap BMP_FOILN_01
 {
     File = "foiln01.bmp" ;
 };
-Bitmap BMP_FOILN_01_H
-{
-    File = "foiln01_h.bmp" ;
-};
+
 Bitmap BMP_PAGE
 {
     File = "page.bmp" ;
 };
-Bitmap BMP_PAGE_H
-{
-    File = "page_h.bmp" ;
-};
+
 Bitmap BMP_PAGE_EXCLUDED
 {
     File = "pageexcl.bmp" ;
 };
-Bitmap BMP_PAGE_EXCLUDED_H
-{
-    File = "pageexcl_h.bmp" ;
-};
+
 Bitmap BMP_PAGEOBJS_EXCLUDED
 {
     File = "pagobjex.bmp" ;
 };
-Bitmap BMP_PAGEOBJS_EXCLUDED_H
-{
-    File = "pagobjex_h.bmp" ;
-};
+
 Bitmap BMP_PAGEOBJS
 {
     File = "pageobjs.bmp" ;
 };
-Bitmap BMP_PAGEOBJS_H
-{
-    File = "pageobjs_h.bmp" ;
-};
+
 Bitmap BMP_OBJECTS
 {
     File = "objects.bmp" ;
 };
-Bitmap BMP_OBJECTS_H
-{
-    File = "objects_h.bmp" ;
-};
+
 Bitmap BMP_OLE
 {
     File = "ole.bmp" ;
 };
-Bitmap BMP_OLE_H
-{
-    File = "ole_h.bmp" ;
-};
+
 Bitmap BMP_GROUP
 {
     File = "group.bmp" ;
 };
-Bitmap BMP_GROUP_H
-{
-    File = "group_h.bmp" ;
-};
+
 Bitmap BMP_DOC_OPEN
 {
     File = "docopen.bmp" ;
 };
-Bitmap BMP_DOC_OPEN_H
-{
-    File = "docopen_h.bmp" ;
-};
+
 Bitmap BMP_DOC_CLOSED
 {
     File = "docclose.bmp" ;
 };
-Bitmap BMP_DOC_CLOSED_H
-{
-    File = "docclose_h.bmp" ;
-};
+
 Bitmap BMP_DOC_TEXT
 {
     File = "doctext.bmp" ;
 };
-Bitmap BMP_DOC_TEXT_H
-{
-    File = "doctext_h.bmp" ;
-};
+
 Bitmap BMP_EXPAND
 {
     File = "plus.bmp" ;
 };
-Bitmap BMP_EXPAND_H
-{
-    File = "plus_h.bmp" ;
-};
+
 Bitmap BMP_COLLAPSE
 {
     File = "minus.bmp" ;
 };
-Bitmap BMP_COLLAPSE_H
-{
-    File = "minus_h.bmp" ;
-};
+
 Bitmap BMP_GRAPHIC
 {
     File = "graphic.bmp" ;
 };
-Bitmap BMP_GRAPHIC_H
-{
-    File = "graphic_h.bmp" ;
-};
-Image IMG_PIPETTE_H
-{
-    ImageBitmap = Bitmap { File = "pipette_h.bmp" ; };
-    MaskColor = IMAGE_MASK_STDCOLOR_HC ;
-};
-Image IMG_GET1OBJECT_H
-{
-    ImageBitmap = Bitmap { File = "get1obj_h.bmp" ; };
-    MaskColor = IMAGE_MASK_STDCOLOR_HC ;
-};
-Image IMG_GETALLOBJECT_H
-{
-    ImageBitmap = Bitmap { File = "getallob_h.bmp" ; };
-    MaskColor = IMAGE_MASK_STDCOLOR_HC ;
-};
-Image IMG_REMOVEBMP_H
-{
-    ImageBitmap = Bitmap { File = "del1bmp_h.bmp" ; };
-    MaskColor = IMAGE_MASK_STDCOLOR_HC ;
-};
-Image IMG_REMOVEALLBMP_H
-{
-    ImageBitmap = Bitmap { File = "delall_h.bmp" ; };
-    MaskColor = IMAGE_MASK_STDCOLOR_HC ;
-};
+
 #define SfxStyleFamiliesRes1\
     Text [ en-US ] = "Graphics Styles" ;\
 
@@ -431,9 +281,9 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
     #define STYLE_IMAGE_LISTEF \
         IdList = \
         { \
-            1; 2; \
+            1; \
         }; \
-        IdCount = 2;
+        IdCount = 1;
 
     ImageList 1 // == BMP_COLOR_NORMAL + 1
     {
@@ -441,12 +291,6 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
         MaskColor = IMAGE_MASK_STDCOLOR;
         STYLE_IMAGE_LISTEF
     };
-    ImageList 2 // == BMP_COLOR_HIGHCONTRAST + 1
-    {
-        Prefix = "sfh";
-        MaskColor = IMAGE_MASK_STDCOLOR_HC;
-        STYLE_IMAGE_LISTEF
-    };
     #undef STYLE_IMAGE_LISTEF
 };
 
@@ -454,22 +298,27 @@ Bitmap BMP_PRESOBJ_GRAPHIC
 {
     File = "image.bmp" ;
 };
+
 Bitmap BMP_PRESOBJ_OBJECT
 {
     File = "object.bmp" ;
 };
+
 Bitmap BMP_PRESOBJ_CHART
 {
     File = "chart.bmp" ;
 };
+
 Bitmap BMP_PRESOBJ_ORGCHART
 {
     File = "orgchart.bmp" ;
 };
+
 Bitmap BMP_PRESOBJ_TABLE
 {
     File = "table.bmp" ;
 };
+
 Bitmap BMP_WAIT_ICON
 {
     File = "waiticon.bmp";
@@ -481,15 +330,8 @@ Bitmap BMP_FADE_EFFECT_INDICATOR
 {
     File = "fade_effect_indicator.bmp";
 };
-Bitmap BMP_FADE_EFFECT_INDICATOR_H
-{
-    File = "fade_effect_indicator_hc.bmp";
-};
+
 Bitmap BMP_COMMENTS_INDICATOR
 {
     File = "comments_indicator.bmp";
 };
-Bitmap BMP_COMMENTS_INDICATOR_H
-{
-    File = "comments_indicator_hc.bmp";
-};
\ No newline at end of file
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index fe4d0f07ec45..ca089bd3838a 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -307,10 +307,6 @@ SvStorageStreamRef SdModule::GetOptionStream( const String& rOptionName,
     return xStm;
 }
 
-/*************************************************************************
-|*
-\************************************************************************/
-
 SvNumberFormatter* SdModule::GetNumberFormatter()
 {
     if( !pNumberFormatter )
@@ -319,10 +315,6 @@ SvNumberFormatter* SdModule::GetNumberFormatter()
     return pNumberFormatter;
 }
 
-/*************************************************************************
-|*
-\************************************************************************/
-
 OutputDevice* SdModule::GetVirtualRefDevice (void)
 {
     return mpVirtualRefDevice;
diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx
index 4d2855cfb831..905c0a242a92 100644
--- a/sd/source/ui/app/tbxww.cxx
+++ b/sd/source/ui/app/tbxww.cxx
@@ -306,8 +306,8 @@ void SdTbxControl::StateChanged( USHORT nSId,
                 aSlotURL += rtl::OUString::valueOf( sal_Int32( nImage ));
                 Image aImage = GetImage( m_xFrame,
                                          aSlotURL,
-                                         hasBigImages(),
-                                         GetToolBox().GetSettings().GetStyleSettings().GetHighContrastMode() );
+                                         hasBigImages()
+                                       );
 
                 // !-Operator prueft, ob Image nicht vorhanden ist
                 if( !!aImage )
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index cf7bbf6d44e5..569b91fc7b47 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -103,7 +103,6 @@ private:
 struct snewfoil_value_info
 {
     USHORT mnBmpResId;
-    USHORT mnHCBmpResId;
     USHORT mnStrResId;
     WritingMode meWritingMode;
     AutoLayout maAutoLayout;
@@ -111,68 +110,61 @@ struct snewfoil_value_info
 
 static snewfoil_value_info notes[] =
 {
-    {BMP_FOILN_01, BMP_FOILN_01_H, STR_AUTOLAYOUT_NOTES, WritingMode_LR_TB,
-     AUTOLAYOUT_NOTES},
-    {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
+    {BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, WritingMode_LR_TB, AUTOLAYOUT_NOTES},
+    {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
 };
 
 static snewfoil_value_info handout[] =
 {
-    {BMP_FOILH_01, BMP_FOILH_01_H, STR_AUTOLAYOUT_HANDOUT1, WritingMode_LR_TB,
-     AUTOLAYOUT_HANDOUT1},
-    {BMP_FOILH_02, BMP_FOILH_02_H, STR_AUTOLAYOUT_HANDOUT2, WritingMode_LR_TB,
-     AUTOLAYOUT_HANDOUT2},
-    {BMP_FOILH_03, BMP_FOILH_03_H, STR_AUTOLAYOUT_HANDOUT3, WritingMode_LR_TB,
-     AUTOLAYOUT_HANDOUT3},
-    {BMP_FOILH_04, BMP_FOILH_04_H, STR_AUTOLAYOUT_HANDOUT4, WritingMode_LR_TB,
-     AUTOLAYOUT_HANDOUT4},
-    {BMP_FOILH_06, BMP_FOILH_06_H, STR_AUTOLAYOUT_HANDOUT6, WritingMode_LR_TB,
-     AUTOLAYOUT_HANDOUT6},
-    {BMP_FOILH_09, BMP_FOILH_09_H, STR_AUTOLAYOUT_HANDOUT9, WritingMode_LR_TB,
-     AUTOLAYOUT_HANDOUT9},
-    {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
+    {BMP_FOILH_01, STR_AUTOLAYOUT_HANDOUT1, WritingMode_LR_TB, AUTOLAYOUT_HANDOUT1},
+    {BMP_FOILH_02, STR_AUTOLAYOUT_HANDOUT2, WritingMode_LR_TB, AUTOLAYOUT_HANDOUT2},
+    {BMP_FOILH_03, STR_AUTOLAYOUT_HANDOUT3, WritingMode_LR_TB, AUTOLAYOUT_HANDOUT3},
+    {BMP_FOILH_04, STR_AUTOLAYOUT_HANDOUT4, WritingMode_LR_TB, AUTOLAYOUT_HANDOUT4},
+    {BMP_FOILH_06, STR_AUTOLAYOUT_HANDOUT6, WritingMode_LR_TB, AUTOLAYOUT_HANDOUT6},
+    {BMP_FOILH_09, STR_AUTOLAYOUT_HANDOUT9, WritingMode_LR_TB, AUTOLAYOUT_HANDOUT9},
+    {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
 };
 
 static snewfoil_value_info standard[] =
 {
-    {BMP_LAYOUT_EMPTY, BMP_LAYOUT_EMPTY_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB,        AUTOLAYOUT_NONE},
-    {BMP_LAYOUT_HEAD03, BMP_LAYOUT_HEAD03_H, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB,       AUTOLAYOUT_TITLE},
-    {BMP_LAYOUT_HEAD02, BMP_LAYOUT_HEAD02_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB,        AUTOLAYOUT_ENUM},
-    {BMP_LAYOUT_HEAD02A, BMP_LAYOUT_HEAD02A_H, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB,       AUTOLAYOUT_2TEXT},
-    {BMP_LAYOUT_HEAD01, BMP_LAYOUT_HEAD01_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB,  AUTOLAYOUT_ONLY_TITLE},
-    {BMP_LAYOUT_TEXTONLY, BMP_LAYOUT_TEXTONLY_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB,   AUTOLAYOUT_ONLY_TEXT},
-    {BMP_LAYOUT_HEAD03B, BMP_LAYOUT_HEAD03B_H, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB,    AUTOLAYOUT_2OBJTEXT},
-    {BMP_LAYOUT_HEAD03C, BMP_LAYOUT_HEAD03C_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB,    AUTOLAYOUT_TEXT2OBJ},
-    {BMP_LAYOUT_HEAD03A, BMP_LAYOUT_HEAD03A_H, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT},
-    {BMP_LAYOUT_HEAD02B, BMP_LAYOUT_HEAD02B_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT},
-    {BMP_LAYOUT_HEAD04, BMP_LAYOUT_HEAD04_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB,        AUTOLAYOUT_4OBJ},
-    {BMP_LAYOUT_HEAD06, BMP_LAYOUT_HEAD06_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB,    AUTOLAYOUT_6CLIPART},
-    {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
+    {BMP_LAYOUT_EMPTY,    STR_AUTOLAYOUT_NONE,                 WritingMode_LR_TB, AUTOLAYOUT_NONE         },
+    {BMP_LAYOUT_HEAD03,   STR_AUTOLAYOUT_TITLE,                WritingMode_LR_TB, AUTOLAYOUT_TITLE        },
+    {BMP_LAYOUT_HEAD02,   STR_AUTOLAYOUT_CONTENT,              WritingMode_LR_TB, AUTOLAYOUT_ENUM         },
+    {BMP_LAYOUT_HEAD02A,  STR_AUTOLAYOUT_2CONTENT,             WritingMode_LR_TB, AUTOLAYOUT_2TEXT        },
+    {BMP_LAYOUT_HEAD01,   STR_AUTOLAYOUT_ONLY_TITLE,           WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE   },
+    {BMP_LAYOUT_TEXTONLY, STR_AUTOLAYOUT_ONLY_TEXT,            WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT    },
+    {BMP_LAYOUT_HEAD03B,  STR_AUTOLAYOUT_2CONTENT_CONTENT,     WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT     },
+    {BMP_LAYOUT_HEAD03C,  STR_AUTOLAYOUT_CONTENT_2CONTENT,     WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ     },
+    {BMP_LAYOUT_HEAD03A,  STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT },
+    {BMP_LAYOUT_HEAD02B,  STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT  },
+    {BMP_LAYOUT_HEAD04,   STR_AUTOLAYOUT_4CONTENT,             WritingMode_LR_TB, AUTOLAYOUT_4OBJ         },
+    {BMP_LAYOUT_HEAD06,   STR_AUTOLAYOUT_6CONTENT,             WritingMode_LR_TB, AUTOLAYOUT_6CLIPART     },
+    {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
 };
 
 static snewfoil_value_info v_standard[] =
 {
     // vertical
-    {BMP_LAYOUT_VERTICAL02, BMP_LAYOUT_VERTICAL02_H, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART},
-    {BMP_LAYOUT_VERTICAL01, BMP_LAYOUT_VERTICAL01_H, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE},
-    {BMP_LAYOUT_HEAD02, BMP_LAYOUT_HEAD02_H, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE},
-    {BMP_LAYOUT_HEAD02A, BMP_LAYOUT_HEAD02A_H, STR_AL_TITLE_VERT_OUTLINE_CLIPART,   WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART},
-    {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
+    {BMP_LAYOUT_VERTICAL02, STR_AL_VERT_TITLE_TEXT_CHART,      WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART       },
+    {BMP_LAYOUT_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE,    WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE },
+    {BMP_LAYOUT_HEAD02,     STR_AL_TITLE_VERT_OUTLINE,         WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE          },
+    {BMP_LAYOUT_HEAD02A,    STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART  },
+    {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
 };
 
 // -----------------------------------------------------------------------
 
-static void fillLayoutValueSet( ValueSet* pValue, snewfoil_value_info* pInfo, const bool bHighContrast )
+static void fillLayoutValueSet( ValueSet* pValue, snewfoil_value_info* pInfo )
 {
     Size aLayoutItemSize;
     for( ; pInfo->mnBmpResId; pInfo++ )
     {
-        String aText( SdResId( pInfo->mnStrResId ) );
-        BitmapEx aBmp( SdResId( (bHighContrast ? pInfo->mnHCBmpResId : pInfo->mnBmpResId) ) );
+        String   aText( SdResId( pInfo->mnStrResId ) );
+        BitmapEx aBmp(  SdResId( pInfo->mnBmpResId ) );
 
         pValue->InsertItem( static_cast<USHORT>(pInfo->maAutoLayout)+1, aBmp, aText );
 
-        aLayoutItemSize.Width() = std::max( aLayoutItemSize.Width(), aBmp.GetSizePixel().Width() );
+        aLayoutItemSize.Width()  = std::max( aLayoutItemSize.Width(),  aBmp.GetSizePixel().Width()  );
         aLayoutItemSize.Height() = std::max( aLayoutItemSize.Height(), aBmp.GetSizePixel().Height() );
     }
 
@@ -209,7 +201,6 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const
     String aTitle1( SdResId( STR_GLUE_ESCDIR_HORZ ) );
     String aTitle2( SdResId( STR_GLUE_ESCDIR_VERT ) );
 
-    const bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
     SvtLanguageOptions aLanguageOptions;
     const bool bVerticalEnabled = aLanguageOptions.IsVerticalTextEnabled();
 
@@ -230,7 +221,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const
 
     mpLayoutSet1->SetColCount( nColCount );
 
-    fillLayoutValueSet( mpLayoutSet1, pInfo, bHighContrast );
+    fillLayoutValueSet( mpLayoutSet1, pInfo );
 
     Size aSize( mpLayoutSet1->GetOutputSizePixel() );
     aSize.Width() += (mpLayoutSet1->GetColCount() + 1) * LAYOUT_BORDER_PIX;
@@ -244,14 +235,13 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const
     if( bVerticalEnabled && (eMode == DrawViewMode_DRAW) )
     {
         mpLayoutSet2 = new ValueSet( this, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT );
-    //  mpLayoutSet2->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING );
 
         mpLayoutSet2->SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectHdl ) );
         mpLayoutSet2->SetColCount( 4 );
         mpLayoutSet2->EnableFullItemMode( FALSE );
         mpLayoutSet2->SetColor( GetControlBackground() );
 
-        fillLayoutValueSet( mpLayoutSet2, &v_standard[0], bHighContrast );
+        fillLayoutValueSet( mpLayoutSet2, &v_standard[0] );
 
         aSize = mpLayoutSet2->GetOutputSizePixel();
         aSize.Width() += (mpLayoutSet2->GetColCount() + 1) * LAYOUT_BORDER_PIX;
@@ -274,7 +264,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const
                 sSlotStr = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DuplicatePage" ) );
             else
                 sSlotStr = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Undo" ) );
-            aSlotImage = ::GetImage( mxFrame, sSlotStr, FALSE, bHighContrast );
+            aSlotImage = ::GetImage( mxFrame, sSlotStr, FALSE );
 
             String sSlotTitle;
             if( bInsertPage )
diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx
index aafacced28b1..7a72024a71fb 100644
--- a/sd/source/ui/dlg/LayerTabBar.cxx
+++ b/sd/source/ui/dlg/LayerTabBar.cxx
@@ -97,20 +97,12 @@ LayerTabBar::~LayerTabBar()
 {
 }
 
-/*************************************************************************
-|*
-\************************************************************************/
-
 void LayerTabBar::Select()
 {
     SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher();
     pDispatcher->Execute(SID_SWITCHLAYER, SFX_CALLMODE_ASYNCHRON);
 }
 
-/*************************************************************************
-|*
-\************************************************************************/
-
 void LayerTabBar::MouseButtonDown(const MouseEvent& rMEvt)
 {
     BOOL bSetPageID=FALSE;
@@ -144,10 +136,6 @@ void LayerTabBar::MouseButtonDown(const MouseEvent& rMEvt)
         TabBar::MouseButtonDown(rMEvt);
 }
 
-/*************************************************************************
-|*
-\************************************************************************/
-
 void LayerTabBar::DoubleClick()
 {
     if (GetCurPageId() != 0)
@@ -203,10 +191,6 @@ sal_Int8 LayerTabBar::ExecuteDrop( const ExecuteDropEvent& rEvt )
 
 }
 
-/*************************************************************************
-|*
-\************************************************************************/
-
 void  LayerTabBar::Command(const CommandEvent& rCEvt)
 {
     if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU )
@@ -216,10 +200,6 @@ void  LayerTabBar::Command(const CommandEvent& rCEvt)
     }
 }
 
-
-/*************************************************************************
-|*
-\************************************************************************/
 long LayerTabBar::StartRenaming()
 {
     BOOL bOK = TRUE;
@@ -250,10 +230,6 @@ long LayerTabBar::StartRenaming()
     return(bOK);
 }
 
-/*************************************************************************
-|*
-\************************************************************************/
-
 long LayerTabBar::AllowRenaming()
 {
     BOOL bOK = TRUE;
@@ -295,10 +271,6 @@ long LayerTabBar::AllowRenaming()
     return(bOK);
 }
 
-/*************************************************************************
-|*
-\************************************************************************/
-
 void LayerTabBar::EndRenaming()
 {
     if( !IsEditModeCanceled() )
@@ -348,11 +320,6 @@ void LayerTabBar::EndRenaming()
     }
 }
 
-
-/*************************************************************************
-|*
-\************************************************************************/
-
 void LayerTabBar::ActivatePage()
 {
     if ( /*IsInSwitching*/ 1 && pDrViewSh!=NULL)
diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx
index f5eead649139..61f8f323863c 100644
--- a/sd/source/ui/dlg/PaneShells.cxx
+++ b/sd/source/ui/dlg/PaneShells.cxx
@@ -61,7 +61,7 @@ TYPEINIT1(LeftImpressPaneShell, SfxShell);
 LeftImpressPaneShell::LeftImpressPaneShell (void)
     : SfxShell()
 {
-    SetName(rtl::OUString::createFromAscii("LeftImpressPane"));
+    SetName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LeftImpressPane")));
 }
 
 
@@ -97,7 +97,7 @@ TYPEINIT1(LeftDrawPaneShell, SfxShell);
 LeftDrawPaneShell::LeftDrawPaneShell (void)
     : SfxShell()
 {
-    SetName(rtl::OUString::createFromAscii("LeftDrawPane"));
+    SetName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LeftDrawPane")));
 }
 
 
@@ -130,7 +130,7 @@ TYPEINIT1( ToolPanelPaneShell, SfxShell );
 ToolPanelPaneShell::ToolPanelPaneShell()
     :SfxShell()
 {
-    SetName( ::rtl::OUString::createFromAscii( "ToolPanel" ) );
+    SetName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ToolPanel" )) );
 }
 
 ToolPanelPaneShell::~ToolPanelPaneShell(void)
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx
index 78bc6eb08766..671023a35073 100644
--- a/sd/source/ui/dlg/TemplateScanner.cxx
+++ b/sd/source/ui/dlg/TemplateScanner.cxx
@@ -51,19 +51,19 @@ using namespace ::com::sun::star::uno;
 
 namespace {
 
-const ::rtl::OUString TITLE            = ::rtl::OUString::createFromAscii ("Title");
-const ::rtl::OUString TARGET_DIR_URL   = ::rtl::OUString::createFromAscii ("TargetDirURL");
-const ::rtl::OUString DESCRIPTION      = ::rtl::OUString::createFromAscii ("TypeDescription");
-const ::rtl::OUString TARGET_URL       = ::rtl::OUString::createFromAscii ("TargetURL");
+const ::rtl::OUString TITLE(RTL_CONSTASCII_USTRINGPARAM ("Title"));
+const ::rtl::OUString TARGET_DIR_URL(RTL_CONSTASCII_USTRINGPARAM ("TargetDirURL"));
+const ::rtl::OUString DESCRIPTION(RTL_CONSTASCII_USTRINGPARAM ("TypeDescription"));
+const ::rtl::OUString TARGET_URL(RTL_CONSTASCII_USTRINGPARAM ("TargetURL"));
 
-const ::rtl::OUString DOCTEMPLATES     = ::rtl::OUString::createFromAscii ("com.sun.star.frame.DocumentTemplates");
+const ::rtl::OUString DOCTEMPLATES(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.frame.DocumentTemplates"));
 
 //  These strings are used to find impress templates in the tree of
 //  template files.  Should probably be determined dynamically.
-const ::rtl::OUString IMPRESS_BIN_TEMPLATE = ::rtl::OUString::createFromAscii ("application/vnd.stardivision.impress");
+const ::rtl::OUString IMPRESS_BIN_TEMPLATE(RTL_CONSTASCII_USTRINGPARAM ("application/vnd.stardivision.impress"));
 const ::rtl::OUString IMPRESS_XML_TEMPLATE = MIMETYPE_VND_SUN_XML_IMPRESS;
 // The following id comes from the bugdoc in #i2764#.
-const ::rtl::OUString IMPRESS_XML_TEMPLATE_B = ::rtl::OUString::createFromAscii ("Impress 2.0");
+const ::rtl::OUString IMPRESS_XML_TEMPLATE_B(RTL_CONSTASCII_USTRINGPARAM ("Impress 2.0"));
 const ::rtl::OUString IMPRESS_XML_TEMPLATE_OASIS = MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION;
 
 
@@ -89,9 +89,11 @@ public:
     //    Reference<sdbc::XResultSet> mxFolderResultSet;
     Reference<com::sun::star::ucb::XCommandEnvironment> mxFolderEnvironment;
 
-    class Comparator { public:
-        bool operator() (const FolderDescriptor& r1, const FolderDescriptor& r2)
-        { return r1.mnPriority < r2.mnPriority; }
+    class Comparator
+    {
+    public:
+        bool operator() (const FolderDescriptor& r1, const FolderDescriptor& r2) const
+            { return r1.mnPriority < r2.mnPriority; }
     };
 };
 
@@ -104,19 +106,19 @@ int Classify (const ::rtl::OUString&, const ::rtl::OUString& rsURL)
 
     if (rsURL.getLength() == 0)
         nPriority = 100;
-    else if (rsURL.indexOf(::rtl::OUString::createFromAscii("presnt"))>=0)
+    else if (rsURL.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("presnt")))>=0)
     {
         nPriority = 30;
     }
-    else if (rsURL.indexOf(::rtl::OUString::createFromAscii("layout"))>=0)
+    else if (rsURL.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("layout")))>=0)
     {
         nPriority = 20;
     }
-    else if (rsURL.indexOf(::rtl::OUString::createFromAscii("educate"))>=0)
+    else if (rsURL.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("educate")))>=0)
     {
         nPriority = 40;
     }
-    else if (rsURL.indexOf(::rtl::OUString::createFromAscii("finance"))>=0)
+    else if (rsURL.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("finance")))>=0)
     {
         nPriority = 40;
     }
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index d515d3255b2c..a381e46c80fa 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -182,11 +182,6 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings,
 {
     FreeResource();
 
-    aBtnGetOneObject.SetModeImage( Image( SdResId( IMG_GET1OBJECT_H ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnGetAllObjects.SetModeImage( Image( SdResId( IMG_GETALLOBJECT_H ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnRemoveBitmap.SetModeImage( Image( SdResId( IMG_REMOVEBMP_H ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnRemoveAll.SetModeImage( Image( SdResId( IMG_REMOVEALLBMP_H ) ), BMP_COLOR_HIGHCONTRAST );
-
     // neues Dokument mit Seite erzeugen
     pMyDoc = new SdDrawDocument(DOCUMENT_TYPE_IMPRESS, NULL);
     SdPage* pPage = (SdPage*) pMyDoc->AllocPage(FALSE);
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index 0553159870df..9043bd00ae00 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -102,7 +102,6 @@ CopyDlg::CopyDlg(
     FreeResource();
 
     // Set up the view data button (image and accessible name).
-    maBtnSetViewData.SetModeImage( Image( SdResId( IMG_PIPETTE_H ) ), BMP_COLOR_HIGHCONTRAST );
     maBtnSetViewData.SetAccessibleName (maBtnSetViewData.GetQuickHelpText());
 
     // Farbtabellen
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 5ef9531f1a07..16b62f219711 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -438,13 +438,13 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
         String sText (GetUiTextForCommand(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Open"))));
         // Remove the mnemonic and add a leading space so that icon and text
         // are not too close together.
-        sText.SearchAndReplaceAll(String(RTL_CONSTASCII_STRINGPARAM("~")),String());
-        sText.Insert(String(RTL_CONSTASCII_STRINGPARAM(" ")),0);
+        sText.SearchAndReplaceAll(String(RTL_CONSTASCII_USTRINGPARAM("~")),String());
+        sText.Insert(String(RTL_CONSTASCII_USTRINGPARAM(" ")),0);
         mpPage1OpenPB->SetText(sText);
         // Place icon left of text and both centered in the button.
         mpPage1OpenPB->SetModeImage(
-            GetUiIconForCommand(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Open"))),
-            BMP_COLOR_NORMAL);
+            GetUiIconForCommand(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Open")))
+        );
         mpPage1OpenPB->EnableImageDisplay(TRUE);
         mpPage1OpenPB->EnableTextDisplay(TRUE);
         mpPage1OpenPB->SetImageAlign(IMAGEALIGN_LEFT);
@@ -463,7 +463,6 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
     mpPage1OpenLB->SetSelectHdl(LINK(this,AssistentDlgImpl,SelectFileHdl));
     mpPage1OpenLB->SetDoubleClickHdl(rFinishLink);
     mpPage1OpenPB->SetClickHdl(LINK(this,AssistentDlgImpl,OpenButtonHdl));
-    //  mpPage1OpenLB->InsertEntry(String(SdResId(STR_WIZARD_POSITION)));
 
     // Seite 2
     maAssistentFunc.InsertControl(2, &maPreview );
@@ -529,7 +528,6 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
         mpPage3LogoCB = new CheckBox( pWindow, SdResId( CB_PAGE3_LOGO) ));
 
     mpPage3EffectLB->Fill();
-//  mpPage3EffectLB->SelectEffect( presentation::FadeEffect_NONE );
     mpPage3EffectLB->SetSelectHdl( LINK(this,AssistentDlgImpl,SelectEffectHdl ));
     mpPage3EffectLB->SetDropDownLineCount( 12 );
 
diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx
index 9a56a8c91d28..a9c50a6da310 100644
--- a/sd/source/ui/dlg/dlgfield.cxx
+++ b/sd/source/ui/dlg/dlgfield.cxx
@@ -184,12 +184,6 @@ SvxFieldData* SdModifyFieldDlg::GetField()
     return( pNewField );
 }
 
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 void SdModifyFieldDlg::FillFormatList()
 {
     LanguageType eLangType = maLbLanguage.GetSelectLanguage();
diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx
index 9b42f8f48684..f454c64ca780 100644
--- a/sd/source/ui/dlg/dlgsnap.cxx
+++ b/sd/source/ui/dlg/dlgsnap.cxx
@@ -74,10 +74,6 @@ SdSnapLineDlg::SdSnapLineDlg(
       eUIUnit(pView->GetDoc()->GetUIUnit()),
       aUIScale(pView->GetDoc()->GetUIScale())
 {
-    aRbPoint.SetModeRadioImage( Image( SdResId( BMP_POINT_H ) ), BMP_COLOR_HIGHCONTRAST );
-    aRbVert.SetModeRadioImage( Image( SdResId( BMP_VERTICAL_H ) ), BMP_COLOR_HIGHCONTRAST );
-    aRbHorz.SetModeRadioImage( Image( SdResId( BMP_HORIZONTAL_H ) ), BMP_COLOR_HIGHCONTRAST );
-
     FreeResource();
 
     aRbHorz.SetClickHdl(LINK(this, SdSnapLineDlg, ClickHdl));
diff --git a/sd/source/ui/dlg/dlgsnap.src b/sd/source/ui/dlg/dlgsnap.src
index 631034dd5879..1112ade164c3 100644
--- a/sd/source/ui/dlg/dlgsnap.src
+++ b/sd/source/ui/dlg/dlgsnap.src
@@ -157,50 +157,4 @@ ModalDialog DLG_SNAPLINE
             ImageBitmap = Bitmap { File = "hlplhorz.bmp" ; };
         };
     };
-
-    Image BMP_POINT_H
-    {
-        MaskColor = IMAGE_MASK_STDCOLOR_HC;
-        ImageBitmap = Bitmap { File = "hlppoint_h.bmp" ; };
-    };
-
-    Image BMP_VERTICAL_H
-    {
-        MaskColor = IMAGE_MASK_STDCOLOR_HC;
-        ImageBitmap = Bitmap { File = "hlplvert_h.bmp" ; };
-    };
-
-    Image BMP_HORIZONTAL_H
-    {
-        MaskColor = IMAGE_MASK_STDCOLOR_HC;
-        ImageBitmap = Bitmap { File = "hlplhorz_h.bmp" ; };
-    };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx
index c906623d9e28..42bf9db12f49 100644
--- a/sd/source/ui/dlg/gluectrl.cxx
+++ b/sd/source/ui/dlg/gluectrl.cxx
@@ -203,12 +203,6 @@ void SdTbxCtlGlueEscDir::StateChanged( USHORT nSId,
     SfxToolBoxControl::StateChanged( nSId, eState, pState );
 }
 
-/*************************************************************************
-|*
-|* No Comment
-|*
-\************************************************************************/
-
 Window* SdTbxCtlGlueEscDir::CreateItemWindow( Window *pParent )
 {
     if( GetSlotId() == SID_GLUE_ESCDIR )
diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx
index 7f4aa65178fd..698fa76551b3 100644
--- a/sd/source/ui/dlg/inspagob.cxx
+++ b/sd/source/ui/dlg/inspagob.cxx
@@ -111,11 +111,7 @@ void SdInsertPagesObjsDlg::Reset()
         Color aColor( COL_WHITE );
         Bitmap aBmpText( SdResId( BMP_DOC_TEXT ) );
         Image aImgText( aBmpText, aColor );
-        Bitmap aBmpTextH( SdResId( BMP_DOC_TEXT_H ) );
-        Image aImgTextH( aBmpTextH, Color( COL_BLACK ) );
-        SvLBoxEntry* pEntry = aLbTree.InsertEntry( rName, aImgText, aImgText );
-        aLbTree.SetExpandedEntryBmp( pEntry, aImgTextH, BMP_COLOR_HIGHCONTRAST );
-        aLbTree.SetCollapsedEntryBmp( pEntry, aImgTextH, BMP_COLOR_HIGHCONTRAST );
+        aLbTree.InsertEntry( rName, aImgText, aImgText );
     }
 
     aCbxMasters.Check( TRUE );
diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx
index 78b52dcfe915..1e3a1c8c9205 100644
--- a/sd/source/ui/dlg/morphdlg.cxx
+++ b/sd/source/ui/dlg/morphdlg.cxx
@@ -50,26 +50,12 @@
 
 namespace sd {
 
-
-/******************************************************************************/
-
-
 #define FADE_STEP   "FadeSteps"
 #define FADE_ATTRIB "FadeAttributes"
 #define FADE_ORIENT "FadeOrientation"
 #define FADE_TRUE   "true"
 #define FADE_FALSE  "false"
 
-
-/******************************************************************************/
-
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
 MorphDlg::MorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2 ) :
             ModalDialog     ( pParent, SdResId( DLG_MORPH ) ),
             aGrpPreset      ( this, SdResId( GRP_PRESET ) ),
@@ -103,24 +89,10 @@ MorphDlg::MorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject*
     }
 }
 
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
 MorphDlg::~MorphDlg()
 {
 }
 
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
 void MorphDlg::LoadSettings()
 {
     SvStorageStreamRef  xIStm( SD_MOD()->GetOptionStream( UniString::CreateFromAscii(
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 268de09e43b0..18a880a0874c 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -87,7 +87,6 @@ SdNavigatorWin::SdNavigatorWin(
 ,   meDragType      ( NAVIGATOR_DRAGTYPE_EMBEDDED )
 ,   mpBindings      ( pInBindings )
 ,   maImageList     ( SdResId( IL_NAVIGATR ) )
-,   maImageListH    ( SdResId( ILH_NAVIGATR ) )
 {
     maTlbObjects.SetViewFrame( mpBindings->GetDispatcher()->GetFrame() );
 
@@ -716,7 +715,6 @@ void SdNavigatorWin::RefreshDocumentLB( const String* pDocName )
 
                 maLbDocs.InsertEntry( aStr, LISTBOX_APPEND );
 
-                //
                 if( pDocShell == pCurrentDocShell )
                     pInfo->SetActive();
                 else
@@ -860,11 +858,9 @@ void SdNavigatorWin::SetDragImage()
 
 void SdNavigatorWin::ApplyImageList()
 {
-    const bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
 
-    maToolbox.SetImageList( bHighContrast ? maImageListH : maImageList );
-
-    maToolbox.SetItemImage(TBI_SHAPE_FILTER, BitmapEx(SdResId( bHighContrast ? BMP_GRAPHIC_H : BMP_GRAPHIC)));
+    maToolbox.SetImageList( maImageList );
+    maToolbox.SetItemImage( TBI_SHAPE_FILTER, BitmapEx( SdResId( BMP_GRAPHIC ) ) );
 
     SetDragImage();
 }
diff --git a/sd/source/ui/dlg/navigatr.src b/sd/source/ui/dlg/navigatr.src
index 4d4499d3226d..1173f9fd1b83 100644
--- a/sd/source/ui/dlg/navigatr.src
+++ b/sd/source/ui/dlg/navigatr.src
@@ -152,10 +152,4 @@ Window FLT_NAVIGATOR
         MaskColor = IMAGE_STDBTN_COLOR ;
         NAVIGATR_IDLIST
     };
-    ImageList ILH_NAVIGATR
-    {
-        Prefix = "nvh";
-        MaskColor = IMAGE_STDBTN_COLOR ;
-           NAVIGATR_IDLIST
-    };
 };
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index 1bc0ca78dfbb..4ecd148a66a8 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -257,9 +257,6 @@ void SdPrintOptions::updateControls()
     aCbxPagename.Enable( !aRbtBooklet.IsChecked() && (aCbxDraw.IsChecked() || aCbxNotes.IsChecked() || aCbxOutline.IsChecked()) );
 }
 
-/* -----------------------------04.05.01 10:53--------------------------------
-
- ---------------------------------------------------------------------------*/
 void lcl_MoveRB_Impl(Window& rBtn, long nXDiff)
 {
     Point aPos(rBtn.GetPosPixel());
diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx
index 87e8d64c4a5d..e9497cc3ea26 100644
--- a/sd/source/ui/dlg/sdabstdlg.cxx
+++ b/sd/source/ui/dlg/sdabstdlg.cxx
@@ -45,7 +45,7 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create()
     static ::osl::Module aDialogLibrary;
     if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( RTL_CONSTASCII_USTRINGPARAM( DLL_NAME ) ) ) )
         fp = ( SdAbstractDialogFactory* (__LOADONCALLAPI*)() )
-            aDialogLibrary.getFunctionSymbol( ::rtl::OUString::createFromAscii("CreateDialogFactory") );
+            aDialogLibrary.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialogFactory")) );
     if ( fp )
         return fp();
     return 0;
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 586201496926..69cee3940f70 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -72,14 +72,6 @@ public:
     Image maImgPageObjs;
     Image maImgObjects;
     Image maImgGroup;
-
-    // High contrast icons.
-    Image maImgPageH;
-    Image maImgPageExclH;
-    Image maImgPageObjsExclH;
-    Image maImgPageObjsH;
-    Image maImgObjectsH;
-    Image maImgGroupH;
 };
 
 
@@ -227,9 +219,9 @@ sal_uInt32 SdPageObjsTLB::SdPageObjsTransferable::GetListBoxDropFormatId (void)
 {
     if (mnListBoxDropFormatId == SAL_MAX_UINT32)
         mnListBoxDropFormatId = SotExchange::RegisterFormatMimeType(
-            ::rtl::OUString::createFromAscii(
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "application/x-openoffice-treelistbox-moveonly;"
-                    "windows_formatname=\"SV_LBOX_DD_FORMAT_MOVE\""));
+                    "windows_formatname=\"SV_LBOX_DD_FORMAT_MOVE\"")));
     return mnListBoxDropFormatId;
 }
 
@@ -248,8 +240,6 @@ SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId )
 ,   mpOwnMedium         ( NULL )
 ,   maImgOle             ( BitmapEx( SdResId( BMP_OLE ) ) )
 ,   maImgGraphic         ( BitmapEx( SdResId( BMP_GRAPHIC ) ) )
-,   maImgOleH            ( BitmapEx( SdResId( BMP_OLE_H ) ) )
-,   maImgGraphicH        ( BitmapEx( SdResId( BMP_GRAPHIC_H ) ) )
 ,   mbLinkableSelected  ( FALSE )
 ,   mpDropNavWin        ( NULL )
 ,   mbShowAllShapes     ( false )
@@ -264,10 +254,6 @@ SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId )
     SetNodeBitmaps( Bitmap( SdResId( BMP_EXPAND ) ),
                     Bitmap( SdResId( BMP_COLLAPSE ) ) );
 
-    SetNodeBitmaps( Bitmap( SdResId( BMP_EXPAND_H ) ),
-                    Bitmap( SdResId( BMP_COLLAPSE_H ) ),
-                    BMP_COLOR_HIGHCONTRAST );
-
     SetDragDropMode(
          SV_DRAGDROP_CTRL_MOVE | SV_DRAGDROP_CTRL_COPY |
             SV_DRAGDROP_APP_MOVE  | SV_DRAGDROP_APP_COPY  | SV_DRAGDROP_APP_DROP );
@@ -460,20 +446,11 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, SfxMedium* pInMedium,
 
     Image aImgDocOpen=Image( BitmapEx( SdResId( BMP_DOC_OPEN ) ) );
     Image aImgDocClosed=Image( BitmapEx( SdResId( BMP_DOC_CLOSED ) ) );
-    Image aImgDocOpenH=Image( BitmapEx( SdResId( BMP_DOC_OPEN_H ) ) );
-    Image aImgDocClosedH=Image( BitmapEx( SdResId( BMP_DOC_CLOSED_H ) ) );
 
     // Dokumentnamen einfuegen
-    SvLBoxEntry* pFileEntry = InsertEntry( maDocName,
-                              aImgDocOpen,
-                              aImgDocClosed,
-                              NULL,
-                              TRUE,
-                              LIST_APPEND,
-                              reinterpret_cast< void* >( 1 ) );
-
-    SetExpandedEntryBmp( pFileEntry, aImgDocOpenH, BMP_COLOR_HIGHCONTRAST );
-    SetCollapsedEntryBmp( pFileEntry, aImgDocClosedH, BMP_COLOR_HIGHCONTRAST );
+    InsertEntry( maDocName, aImgDocOpen, aImgDocClosed, NULL, TRUE, LIST_APPEND,
+                 reinterpret_cast< void* >( 1 )
+    );
 }
 
 
@@ -506,15 +483,6 @@ void SdPageObjsTLB::AddShapeList (
         LIST_APPEND,
         pUserData);
 
-    SetExpandedEntryBmp(
-        pEntry,
-        bIsExcluded ? rIconProvider.maImgPageExclH : rIconProvider.maImgPageH,
-        BMP_COLOR_HIGHCONTRAST );
-    SetCollapsedEntryBmp(
-        pEntry,
-        bIsExcluded ? rIconProvider.maImgPageExclH : rIconProvider.maImgPageH,
-        BMP_COLOR_HIGHCONTRAST );
-
     SdrObjListIter aIter(
         rList,
         !rList.HasObjectNavigationOrder() /* use navigation order, if available */,
@@ -533,19 +501,27 @@ void SdPageObjsTLB::AddShapeList (
         {
             if( pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() == OBJ_OLE2 )
             {
-                SvLBoxEntry* pNewEntry = InsertEntry( aStr, maImgOle, maImgOle, pEntry,
-                    FALSE, LIST_APPEND, pObj);
-
-                SetExpandedEntryBmp( pNewEntry, maImgOleH, BMP_COLOR_HIGHCONTRAST );
-                SetCollapsedEntryBmp( pNewEntry, maImgOleH, BMP_COLOR_HIGHCONTRAST );
+                InsertEntry(
+                    aStr,
+                    maImgOle,
+                    maImgOle,
+                    pEntry,
+                    FALSE,
+                    LIST_APPEND,
+                    pObj
+                );
             }
             else if( pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() == OBJ_GRAF )
             {
-                SvLBoxEntry* pNewEntry = InsertEntry( aStr, maImgGraphic, maImgGraphic, pEntry,
-                    FALSE, LIST_APPEND, pObj );
-
-                SetExpandedEntryBmp( pNewEntry, maImgGraphicH, BMP_COLOR_HIGHCONTRAST );
-                SetCollapsedEntryBmp( pNewEntry, maImgGraphicH, BMP_COLOR_HIGHCONTRAST );
+                InsertEntry(
+                    aStr,
+                    maImgGraphic,
+                    maImgGraphic,
+                    pEntry,
+                    FALSE,
+                    LIST_APPEND,
+                    pObj
+                );
             }
             else if (pObj->IsGroupObject())
             {
@@ -555,15 +531,20 @@ void SdPageObjsTLB::AddShapeList (
                     aStr,
                     false,
                     pEntry,
-                    rIconProvider);
+                    rIconProvider
+                );
             }
             else
             {
-                SvLBoxEntry* pNewEntry = InsertEntry( aStr, rIconProvider.maImgObjects, rIconProvider.maImgObjects, pEntry,
-                    FALSE, LIST_APPEND, pObj );
-
-                SetExpandedEntryBmp( pNewEntry, rIconProvider.maImgObjectsH, BMP_COLOR_HIGHCONTRAST );
-                SetCollapsedEntryBmp( pNewEntry, rIconProvider.maImgObjectsH, BMP_COLOR_HIGHCONTRAST );
+                InsertEntry(
+                    aStr,
+                    rIconProvider.maImgObjects,
+                    rIconProvider.maImgObjects,
+                    pEntry,
+                    FALSE,
+                    LIST_APPEND,
+                    pObj
+                );
             }
         }
     }
@@ -576,14 +557,6 @@ void SdPageObjsTLB::AddShapeList (
         SetCollapsedEntryBmp(
             pEntry,
             bIsExcluded ? rIconProvider.maImgPageObjsExcl : rIconProvider.maImgPageObjs);
-        SetExpandedEntryBmp(
-            pEntry,
-            bIsExcluded ? rIconProvider.maImgPageObjsExclH : rIconProvider.maImgPageObjsH,
-            BMP_COLOR_HIGHCONTRAST);
-        SetCollapsedEntryBmp(
-            pEntry,
-            bIsExcluded ? rIconProvider.maImgPageObjsExclH : rIconProvider.maImgPageObjsH,
-            BMP_COLOR_HIGHCONTRAST);
     }
 }
 
@@ -744,12 +717,9 @@ void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry )
             SdPage*      pPage = NULL;
             SvLBoxEntry* pPageEntry = NULL;
 
-            Image aImgPage=Image( BitmapEx( SdResId( BMP_PAGE ) ) );
-            Image aImgPageObjs=Image( BitmapEx( SdResId( BMP_PAGEOBJS ) ) );
-            Image aImgObjects=Image( BitmapEx( SdResId( BMP_OBJECTS ) ) );
-            Image aImgPageH=Image( BitmapEx( SdResId( BMP_PAGE_H ) ) );
-            Image aImgPageObjsH=Image( BitmapEx( SdResId( BMP_PAGEOBJS_H ) ) );
-            Image aImgObjectsH=Image( BitmapEx( SdResId( BMP_OBJECTS_H ) ) );
+            Image aImgPage     = Image( BitmapEx( SdResId( BMP_PAGE     ) ) );
+            Image aImgPageObjs = Image( BitmapEx( SdResId( BMP_PAGEOBJS ) ) );
+            Image aImgObjects  = Image( BitmapEx( SdResId( BMP_OBJECTS  ) ) );
 
             // document name already inserted
 
@@ -770,9 +740,6 @@ void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry )
                                               LIST_APPEND,
                                               reinterpret_cast< void* >( 1 ) );
 
-                    SetExpandedEntryBmp( pPageEntry, aImgPageH, BMP_COLOR_HIGHCONTRAST );
-                    SetCollapsedEntryBmp( pPageEntry, aImgPageH, BMP_COLOR_HIGHCONTRAST );
-
                     SdrObjListIter aIter( *pPage, IM_DEEPWITHGROUPS );
 
                     while( aIter.IsMore() )
@@ -783,34 +750,22 @@ void SdPageObjsTLB::RequestingChilds( SvLBoxEntry* pFileEntry )
                         {
                             if( pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() == OBJ_OLE2 )
                             {
-                                SvLBoxEntry* pNewEntry = InsertEntry(aStr, maImgOle, maImgOle, pPageEntry);
-
-
-                                SetExpandedEntryBmp( pNewEntry, maImgOleH, BMP_COLOR_HIGHCONTRAST );
-                                SetCollapsedEntryBmp( pNewEntry, maImgOleH, BMP_COLOR_HIGHCONTRAST );
+                                InsertEntry(aStr, maImgOle, maImgOle, pPageEntry);
                             }
                             else if( pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() == OBJ_GRAF )
                             {
-                                SvLBoxEntry* pNewEntry = InsertEntry(aStr, maImgGraphic, maImgGraphic, pPageEntry);
-
-                                SetExpandedEntryBmp( pNewEntry, maImgGraphicH, BMP_COLOR_HIGHCONTRAST );
-                                SetCollapsedEntryBmp( pNewEntry, maImgGraphicH, BMP_COLOR_HIGHCONTRAST );
+                                InsertEntry(aStr, maImgGraphic, maImgGraphic, pPageEntry);
                             }
                             else
                             {
-                                SvLBoxEntry* pNewEntry = InsertEntry(aStr, aImgObjects, aImgObjects, pPageEntry);
-
-                                SetExpandedEntryBmp( pNewEntry, aImgObjectsH, BMP_COLOR_HIGHCONTRAST );
-                                SetCollapsedEntryBmp( pNewEntry, aImgObjectsH, BMP_COLOR_HIGHCONTRAST );
+                                InsertEntry(aStr, aImgObjects, aImgObjects, pPageEntry);
                             }
                         }
                     }
                     if( pPageEntry->HasChilds() )
                     {
-                        SetExpandedEntryBmp( pPageEntry, aImgPageObjs );
+                        SetExpandedEntryBmp(  pPageEntry, aImgPageObjs );
                         SetCollapsedEntryBmp( pPageEntry, aImgPageObjs );
-                        SetExpandedEntryBmp( pPageEntry, aImgPageObjsH, BMP_COLOR_HIGHCONTRAST );
-                        SetCollapsedEntryBmp( pPageEntry, aImgPageObjsH, BMP_COLOR_HIGHCONTRAST );
                     }
                 }
                 nPage++;
@@ -916,12 +871,6 @@ void SdPageObjsTLB::CloseBookmarkDoc()
     mpBookmarkDoc = NULL;
 }
 
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 void SdPageObjsTLB::SelectHdl()
 {
     SvLBoxEntry* pEntry = FirstSelected();
@@ -1447,14 +1396,7 @@ SdPageObjsTLB::IconProvider::IconProvider (void)
       maImgPageObjsExcl( BitmapEx( SdResId( BMP_PAGEOBJS_EXCLUDED ) ) ),
       maImgPageObjs( BitmapEx( SdResId( BMP_PAGEOBJS ) ) ),
       maImgObjects( BitmapEx( SdResId( BMP_OBJECTS ) ) ),
-      maImgGroup( BitmapEx( SdResId( BMP_GROUP ) ) ),
-
-      maImgPageH( BitmapEx( SdResId( BMP_PAGE_H ) ) ),
-      maImgPageExclH( BitmapEx( SdResId( BMP_PAGE_EXCLUDED_H ) ) ),
-      maImgPageObjsExclH( BitmapEx( SdResId( BMP_PAGEOBJS_EXCLUDED_H ) ) ),
-      maImgPageObjsH( BitmapEx( SdResId( BMP_PAGEOBJS_H ) ) ),
-      maImgObjectsH( BitmapEx( SdResId( BMP_OBJECTS_H ) ) ),
-      maImgGroupH( BitmapEx( SdResId( BMP_GROUP_H ) ) )
+      maImgGroup( BitmapEx( SdResId( BMP_GROUP ) ) )
 {
 }
 
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index e6c74a7d2e33..cb68c6a6ba95 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -805,7 +805,7 @@ void SdTpOptionsMisc::UpdateCompatibilityControls (void)
                 break;
 
             Reference<frame::XDesktop> xDesktop (xFactory->createInstance (
-                ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")), UNO_QUERY);
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"))), UNO_QUERY);
             if ( ! xDesktop.is())
                 break;
 
diff --git a/sd/source/ui/dlg/vectdlg.src b/sd/source/ui/dlg/vectdlg.src
index 3a7407990cbe..7dda10a9c9fa 100644
--- a/sd/source/ui/dlg/vectdlg.src
+++ b/sd/source/ui/dlg/vectdlg.src
@@ -29,12 +29,6 @@
 #include "app.hrc"
 #include "vectdlg.hrc"
 
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
 ModalDialog DLG_VECTORIZE
 {
     HelpID = SID_VECTORIZE;
diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx
index 030da66a7ce6..35b81d1a7390 100644
--- a/sd/source/ui/docshell/docshel2.cxx
+++ b/sd/source/ui/docshell/docshel2.cxx
@@ -161,12 +161,6 @@ void DrawDocShell::Draw(OutputDevice* pOut, const JobSetup&, USHORT nAspect)
 //  }
 }
 
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 Rectangle DrawDocShell::GetVisArea(USHORT nAspect) const
 {
     Rectangle aVisArea;
@@ -225,12 +219,6 @@ void DrawDocShell::Disconnect(ViewShell* pViewSh)
     }
 }
 
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 FrameView* DrawDocShell::GetFrameView()
 {
     FrameView* pFrameView = NULL;
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index e30eaadd1b5d..e081eed7cae4 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -189,21 +189,11 @@ void DrawDocShell::UpdateFontList()
     PutItem( aFontListItem );
 }
 
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
 Printer* DrawDocShell::GetDocumentPrinter()
 {
     return GetPrinter(FALSE);
 }
 
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
 void DrawDocShell::OnDocumentPrinterChanged(Printer* pNewPrinter)
 {
     // if we already have a printer, see if its the same
@@ -229,11 +219,6 @@ void DrawDocShell::OnDocumentPrinterChanged(Printer* pNewPrinter)
     }
 }
 
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
 void DrawDocShell::UpdateRefDevice()
 {
     if( mpDoc )
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index aaaecc27f71e..b59fb2bfc328 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -478,12 +478,6 @@ void DrawDocShell::UpdateTablePointers()
     UpdateFontList();
 }
 
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 void DrawDocShell::CancelSearching()
 {
     if( dynamic_cast<FuSearch*>( mxDocShellFunction.get() ) )
diff --git a/sd/source/ui/docshell/sdclient.cxx b/sd/source/ui/docshell/sdclient.cxx
index 59d04ae257ce..2634572150e9 100644
--- a/sd/source/ui/docshell/sdclient.cxx
+++ b/sd/source/ui/docshell/sdclient.cxx
@@ -148,12 +148,6 @@ void Client::ObjectAreaChanged()
     }
 }
 
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 void Client::ViewChanged()
 {
     if ( GetAspect() == embed::Aspects::MSOLE_ICON )
diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx
index 18e216f10545..82a23affae4c 100644
--- a/sd/source/ui/framework/configuration/Configuration.cxx
+++ b/sd/source/ui/framework/configuration/Configuration.cxx
@@ -99,8 +99,8 @@ OUString Configuration_getImplementationName (void) throw(RuntimeException)
 Sequence<rtl::OUString> SAL_CALL Configuration_getSupportedServiceNames (void)
     throw (RuntimeException)
 {
-    static const OUString sServiceName(OUString::createFromAscii(
-        "com.sun.star.drawing.framework.Configuration"));
+    static const OUString sServiceName(OUString(RTL_CONSTASCII_USTRINGPARAM(
+        "com.sun.star.drawing.framework.Configuration")));
     return Sequence<rtl::OUString>(&sServiceName, 1);
 }
 
@@ -296,8 +296,8 @@ OUString SAL_CALL Configuration::getName (void)
     OUString aString;
 
     if (rBHelper.bDisposed || rBHelper.bInDispose)
-        aString += OUString::createFromAscii("DISPOSED ");
-    aString += OUString::createFromAscii("Configuration[");
+        aString += OUString(RTL_CONSTASCII_USTRINGPARAM("DISPOSED "));
+    aString += OUString(RTL_CONSTASCII_USTRINGPARAM("Configuration["));
 
     ResourceContainer::const_iterator iResource;
     for (iResource=mpResourceContainer->begin();
@@ -305,10 +305,10 @@ OUString SAL_CALL Configuration::getName (void)
          ++iResource)
     {
         if (iResource != mpResourceContainer->begin())
-            aString += OUString::createFromAscii(", ");
+            aString += OUString(RTL_CONSTASCII_USTRINGPARAM(", "));
         aString += FrameworkHelper::ResourceIdToString(*iResource);
     }
-    aString += OUString::createFromAscii("]");
+    aString += OUString(RTL_CONSTASCII_USTRINGPARAM("]"));
 
     return aString;
 }
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index 10d7a1aa00e7..1724e764d506 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -84,8 +84,8 @@ OUString ConfigurationController_getImplementationName (void) throw(RuntimeExcep
 Sequence<rtl::OUString> SAL_CALL ConfigurationController_getSupportedServiceNames (void)
     throw (RuntimeException)
 {
-    static const OUString sServiceName(OUString::createFromAscii(
-        "com.sun.star.drawing.framework.ConfigurationController"));
+    static const OUString sServiceName(OUString(RTL_CONSTASCII_USTRINGPARAM(
+        "com.sun.star.drawing.framework.ConfigurationController")));
     return Sequence<rtl::OUString>(&sServiceName, 1);
 }
 
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
index 55d72d592f99..7c8141da4cab 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
@@ -58,7 +58,7 @@ void ConfigurationControllerBroadcaster::AddListener(
 {
     if ( ! rxListener.is())
         throw lang::IllegalArgumentException(
-            OUString::createFromAscii("invalid listener"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("invalid listener")),
             mxConfigurationController,
             0);
 
@@ -78,7 +78,7 @@ void ConfigurationControllerBroadcaster::RemoveListener(
 {
     if ( ! rxListener.is())
         throw lang::IllegalArgumentException(
-            OUString::createFromAscii("invalid listener"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("invalid listener")),
             mxConfigurationController,
             0);
 
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
index b640c89453cc..e1c285f149af 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
@@ -220,7 +220,9 @@ void ConfigurationControllerResourceManager::DeactivateResource (
     if ( ! rxResourceId.is())
         return;
 
+#if defined VERBOSE && VERBOSE>=1
     bool bSuccess (false);
+#endif
     try
     {
         // 1. Remove resource from URL->Object map.
@@ -254,7 +256,9 @@ void ConfigurationControllerResourceManager::DeactivateResource (
                 }
             }
 
+#if defined VERBOSE && VERBOSE>=1
             bSuccess = true;
+#endif
         }
     }
     catch (RuntimeException&)
diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
index f4a2aa297fe1..5e1150c16eb2 100644
--- a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
@@ -69,7 +69,7 @@ void ConfigurationTracer::TraceBoundResources (
 {
     Sequence<Reference<XResourceId> > aResourceList (
         rxConfiguration->getResources(rxResourceId, ::rtl::OUString(), AnchorBindingMode_DIRECT));
-    const ::rtl::OUString sIndentation (::rtl::OUString::createFromAscii("    "));
+    const ::rtl::OUString sIndentation (RTL_CONSTASCII_USTRINGPARAM("    "));
     for (sal_Int32 nIndex=0; nIndex<aResourceList.getLength(); ++nIndex)
     {
         ::rtl::OUString sLine (aResourceList[nIndex]->getResourceURL());
diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
index 6d146fa11e97..79ceb38324bc 100644
--- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
+++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
@@ -86,8 +86,8 @@ void SAL_CALL GenericConfigurationChangeRequest::execute (
 OUString SAL_CALL GenericConfigurationChangeRequest::getName (void)
     throw (RuntimeException)
 {
-    return OUString::createFromAscii("GenericConfigurationChangeRequest ")
-        + OUString::createFromAscii(meMode==Activation ? "activate " : "deactivate ")
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("GenericConfigurationChangeRequest "))
+        + (meMode==Activation ? OUString(RTL_CONSTASCII_USTRINGPARAM("activate ")) : OUString(RTL_CONSTASCII_USTRINGPARAM("deactivate ")))
         + FrameworkHelper::ResourceIdToString(mxResourceId);
 }
 
diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx
index 88c548ca2d3c..ce56cf0f0704 100644
--- a/sd/source/ui/framework/configuration/ResourceId.cxx
+++ b/sd/source/ui/framework/configuration/ResourceId.cxx
@@ -75,7 +75,7 @@ Sequence<rtl::OUString> SAL_CALL ResourceId_getSupportedServiceNames (void)
     throw (RuntimeException)
 {
     static const ::rtl::OUString sServiceName(
-        ::rtl::OUString::createFromAscii("com.sun.star.drawing.framework.ResourceId"));
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.framework.ResourceId")));
     return Sequence<rtl::OUString>(&sServiceName, 1);
 }
 
diff --git a/sd/source/ui/framework/configuration/UpdateRequest.cxx b/sd/source/ui/framework/configuration/UpdateRequest.cxx
index ba779c4b587c..149e490dde20 100644
--- a/sd/source/ui/framework/configuration/UpdateRequest.cxx
+++ b/sd/source/ui/framework/configuration/UpdateRequest.cxx
@@ -70,7 +70,7 @@ void SAL_CALL UpdateRequest::execute (const Reference<XConfiguration>& rxConfigu
 OUString SAL_CALL UpdateRequest::getName (void)
     throw (RuntimeException)
 {
-    return OUString::createFromAscii("UpdateRequest");
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("UpdateRequest"));
 }
 
 
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index 07d7be7fb6f3..8c58b4568e40 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -119,7 +119,7 @@ Sequence<rtl::OUString> SAL_CALL BasicPaneFactory_getSupportedServiceNames (void
     throw (RuntimeException)
 {
     static const ::rtl::OUString sServiceName(
-        ::rtl::OUString::createFromAscii("com.sun.star.drawing.framework.BasicPaneFactory"));
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.framework.BasicPaneFactory")));
     return Sequence<rtl::OUString>(&sServiceName, 1);
 }
 
@@ -329,8 +329,8 @@ Reference<XResource> SAL_CALL BasicPaneFactory::createResource (
         // The requested pane can not be created by any of the factories
         // managed by the called BasicPaneFactory object.
         throw lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii(
-                "BasicPaneFactory::createPane() called for unknown resource id"),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "BasicPaneFactory::createPane() called for unknown resource id")),
             NULL,
             0);
     }
@@ -388,8 +388,8 @@ void SAL_CALL BasicPaneFactory::releaseResource (
         // created by any of the factories managed by the called
         // BasicPaneFactory object.
         throw lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii(
-                "BasicPaneFactory::releasePane() called for pane that that was not created by same factory."),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "BasicPaneFactory::releasePane() called for pane that that was not created by same factory.")),
             NULL,
             0);
     }
diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
index 64bd39de396c..6294b253841f 100644
--- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
@@ -67,7 +67,7 @@ Sequence<rtl::OUString> SAL_CALL BasicToolBarFactory_getSupportedServiceNames (v
     throw (RuntimeException)
 {
     static const ::rtl::OUString sServiceName(
-        ::rtl::OUString::createFromAscii("com.sun.star.drawing.framework.BasicToolBarFactory"));
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.framework.BasicToolBarFactory")));
     return Sequence<rtl::OUString>(&sServiceName, 1);
 }
 
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 917081e48f5e..6b577ba3009e 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -88,7 +88,7 @@ Sequence<rtl::OUString> SAL_CALL BasicViewFactory_getSupportedServiceNames (void
     throw (RuntimeException)
 {
     static const ::rtl::OUString sServiceName(
-        ::rtl::OUString::createFromAscii("com.sun.star.drawing.framework.BasicViewFactory"));
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.framework.BasicViewFactory")));
     return Sequence<rtl::OUString>(&sServiceName, 1);
 }
 
diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx
index a6135cca94f0..fa7e3fbf7f9c 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.cxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.cxx
@@ -255,7 +255,7 @@ Reference<rendering::XCanvas> FullScreenPane::CreateCanvas (void)
             mxComponentContext->getServiceManager(), UNO_QUERY_THROW);
         return Reference<rendering::XCanvas>(
             xFactory->createInstanceWithArguments(
-                OUString::createFromAscii("com.sun.star.rendering.SpriteCanvas.VCL"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.rendering.SpriteCanvas.VCL")),
                 aArg),
             UNO_QUERY);
     }
diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx
index b3ecd378d8de..998c51b413ce 100644
--- a/sd/source/ui/framework/factories/PresentationFactory.cxx
+++ b/sd/source/ui/framework/factories/PresentationFactory.cxx
@@ -140,7 +140,7 @@ Sequence<rtl::OUString> SAL_CALL PresentationFactoryProvider_getSupportedService
 //===== PresentationFactory ===================================================
 
 const ::rtl::OUString PresentationFactory::msPresentationViewURL(
-    OUString::createFromAscii("private:resource/view/Presentation"));
+    RTL_CONSTASCII_USTRINGPARAM("private:resource/view/Presentation"));
 
 
 PresentationFactory::PresentationFactory (
diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx
index 296697699151..0cfbc942df87 100644
--- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx
+++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx
@@ -66,7 +66,7 @@ Sequence<rtl::OUString> SAL_CALL TaskPanelFactory_getSupportedServiceNames (void
     throw (RuntimeException)
 {
     static const OUString sServiceName(
-        OUString::createFromAscii("com.sun.star.drawing.framework.TaskPanelFactory"));
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.framework.TaskPanelFactory"));
     return Sequence<rtl::OUString>(&sServiceName, 1);
 }
 
diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx
index 5387ca7a06d6..d244631eb403 100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -104,7 +104,7 @@ Sequence<rtl::OUString> SAL_CALL ModuleController_getSupportedServiceNames (void
     throw (RuntimeException)
 {
     static const ::rtl::OUString sServiceName(
-        ::rtl::OUString::createFromAscii("com.sun.star.drawing.framework.ModuleController"));
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.framework.ModuleController"));
     return Sequence<rtl::OUString>(&sServiceName, 1);
 }
 
@@ -155,15 +155,15 @@ void ModuleController::LoadFactories (const Reference<XComponentContext>& rxCont
     {
         ConfigurationAccess aConfiguration (
             rxContext,
-            OUString::createFromAscii("/org.openoffice.Office.Impress/"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Impress/")),
             ConfigurationAccess::READ_ONLY);
         Reference<container::XNameAccess> xFactories (
             aConfiguration.GetConfigurationNode(
-                OUString::createFromAscii("MultiPaneGUI/Framework/ResourceFactories")),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("MultiPaneGUI/Framework/ResourceFactories"))),
             UNO_QUERY);
         ::std::vector<rtl::OUString> aProperties (snFactoryPropertyCount);
-        aProperties[0] = OUString::createFromAscii("ServiceName");
-        aProperties[1] = OUString::createFromAscii("ResourceList");
+        aProperties[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("ServiceName"));
+        aProperties[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("ResourceList"));
         ConfigurationAccess::ForAll(
             xFactories,
             aProperties,
@@ -191,7 +191,7 @@ void ModuleController::ProcessFactory (const ::std::vector<Any>& rValues)
     ::std::vector<rtl::OUString> aURLs;
     tools::ConfigurationAccess::FillList(
         xResources,
-        OUString::createFromAscii("URL"),
+        OUString(RTL_CONSTASCII_USTRINGPARAM("URL")),
         aURLs);
 
 #if defined VERBOSE && VERBOSE>0
@@ -219,14 +219,14 @@ void ModuleController::InstantiateStartupServices (void)
     try
     {
         tools::ConfigurationAccess aConfiguration (
-            OUString::createFromAscii("/org.openoffice.Office.Impress/"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Impress/")),
             tools::ConfigurationAccess::READ_ONLY);
         Reference<container::XNameAccess> xFactories (
             aConfiguration.GetConfigurationNode(
-                OUString::createFromAscii("MultiPaneGUI/Framework/StartupServices")),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("MultiPaneGUI/Framework/StartupServices"))),
             UNO_QUERY);
         ::std::vector<rtl::OUString> aProperties (snStartupPropertyCount);
-        aProperties[0] = OUString::createFromAscii("ServiceName");
+        aProperties[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("ServiceName"));
         tools::ConfigurationAccess::ForAll(
             xFactories,
             aProperties,
diff --git a/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx b/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx
index 73d455457676..1625b0c63f3f 100644
--- a/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx
+++ b/sd/source/ui/framework/module/ReadOnlyModeObserver.cxx
@@ -66,7 +66,7 @@ ReadOnlyModeObserver::ReadOnlyModeObserver (
       mpBroadcaster(new ModifyBroadcaster(maMutex))
 {
     // Create a URL object for the slot name.
-    maSlotNameURL.Complete = OUString::createFromAscii(".uno:EditDoc");
+    maSlotNameURL.Complete = OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:EditDoc"));
     uno::Reference<lang::XMultiServiceFactory> xServiceManager (
         ::comphelper::getProcessServiceFactory());
     if (xServiceManager.is())
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index b37508140f54..47465f364398 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -175,84 +175,84 @@ namespace sd { namespace framework {
 // Pane URLS.
 
 const OUString FrameworkHelper::msPaneURLPrefix(
-    OUString::createFromAscii("private:resource/pane/"));
+    RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/"));
 const OUString FrameworkHelper::msCenterPaneURL(
-    msPaneURLPrefix + OUString::createFromAscii("CenterPane"));
+    msPaneURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("CenterPane")));
 const OUString FrameworkHelper::msFullScreenPaneURL(
-    msPaneURLPrefix + OUString::createFromAscii("FullScreenPane"));
+    msPaneURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("FullScreenPane")));
 const OUString FrameworkHelper::msLeftImpressPaneURL(
-    msPaneURLPrefix + OUString::createFromAscii("LeftImpressPane"));
+    msPaneURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("LeftImpressPane")));
 const OUString FrameworkHelper::msLeftDrawPaneURL(
-    msPaneURLPrefix + OUString::createFromAscii("LeftDrawPane"));
+    msPaneURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("LeftDrawPane")));
 const OUString FrameworkHelper::msRightPaneURL(
-    msPaneURLPrefix + OUString::createFromAscii("RightPane"));
+    msPaneURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("RightPane")));
 
 
 // View URLs.
 
 const OUString FrameworkHelper::msViewURLPrefix(
-    OUString::createFromAscii("private:resource/view/"));
+    RTL_CONSTASCII_USTRINGPARAM("private:resource/view/"));
 const OUString FrameworkHelper::msImpressViewURL(
-    msViewURLPrefix + OUString::createFromAscii("ImpressView"));
+    msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("ImpressView")));
 const OUString FrameworkHelper::msDrawViewURL(
-    msViewURLPrefix + OUString::createFromAscii("GraphicView"));
+    msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicView")));
 const OUString FrameworkHelper::msOutlineViewURL(
-    msViewURLPrefix + OUString::createFromAscii("OutlineView"));
+    msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("OutlineView")));
 const OUString FrameworkHelper::msNotesViewURL(
-    msViewURLPrefix + OUString::createFromAscii("NotesView"));
+    msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("NotesView")));
 const OUString FrameworkHelper::msHandoutViewURL(
-    msViewURLPrefix + OUString::createFromAscii("HandoutView"));
+    msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("HandoutView")));
 const OUString FrameworkHelper::msSlideSorterURL(
-    msViewURLPrefix + OUString::createFromAscii("SlideSorter"));
+    msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("SlideSorter")));
 const OUString FrameworkHelper::msPresentationViewURL(
-    msViewURLPrefix + OUString::createFromAscii("PresentationView"));
+    msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("PresentationView")));
 const OUString FrameworkHelper::msTaskPaneURL(
-    msViewURLPrefix + OUString::createFromAscii("TaskPane"));
+    msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("TaskPane")));
 
 
 // Tool bar URLs.
 
 const OUString FrameworkHelper::msToolBarURLPrefix(
-    OUString::createFromAscii("private:resource/toolbar/"));
+    RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/"));
 const OUString FrameworkHelper::msViewTabBarURL(
-    msToolBarURLPrefix + OUString::createFromAscii("ViewTabBar"));
+    msToolBarURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("ViewTabBar")));
 
 
 // Task panel URLs.
 const ::rtl::OUString FrameworkHelper::msTaskPanelURLPrefix(
-    OUString::createFromAscii("private:resource/toolpanel/DrawingFramework/"));
+    RTL_CONSTASCII_USTRINGPARAM("private:resource/toolpanel/DrawingFramework/"));
 const ::rtl::OUString FrameworkHelper::msMasterPagesTaskPanelURL(
-    msTaskPanelURLPrefix + OUString::createFromAscii("MasterPages"));
+    msTaskPanelURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("MasterPages")));
 const ::rtl::OUString FrameworkHelper::msLayoutTaskPanelURL(
-    msTaskPanelURLPrefix + OUString::createFromAscii("Layouts"));
+    msTaskPanelURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("Layouts")));
 const ::rtl::OUString FrameworkHelper::msTableDesignPanelURL(
-    msTaskPanelURLPrefix + OUString::createFromAscii("TableDesign"));
+    msTaskPanelURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("TableDesign")));
 const ::rtl::OUString FrameworkHelper::msCustomAnimationTaskPanelURL(
-    msTaskPanelURLPrefix + OUString::createFromAscii("CustomAnimations"));
+    msTaskPanelURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("CustomAnimations")));
 const ::rtl::OUString FrameworkHelper::msSlideTransitionTaskPanelURL(
-    msTaskPanelURLPrefix + OUString::createFromAscii("SlideTransitions"));
+    msTaskPanelURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("SlideTransitions")));
 
 
 // Event URLs.
 const OUString FrameworkHelper::msResourceActivationRequestEvent(
-    OUString::createFromAscii("ResourceActivationRequested"));
+    RTL_CONSTASCII_USTRINGPARAM("ResourceActivationRequested"));
 const OUString FrameworkHelper::msResourceDeactivationRequestEvent(
-    OUString::createFromAscii("ResourceDeactivationRequest"));
+    RTL_CONSTASCII_USTRINGPARAM("ResourceDeactivationRequest"));
 const OUString FrameworkHelper::msResourceActivationEvent(
-    OUString::createFromAscii("ResourceActivation"));
+    RTL_CONSTASCII_USTRINGPARAM("ResourceActivation"));
 const OUString FrameworkHelper::msResourceDeactivationEvent(
-    OUString::createFromAscii("ResourceDeactivation"));
+    RTL_CONSTASCII_USTRINGPARAM("ResourceDeactivation"));
 const OUString FrameworkHelper::msConfigurationUpdateStartEvent(
-    OUString::createFromAscii("ConfigurationUpdateStart"));
+    RTL_CONSTASCII_USTRINGPARAM("ConfigurationUpdateStart"));
 const OUString FrameworkHelper::msConfigurationUpdateEndEvent(
-    OUString::createFromAscii("ConfigurationUpdateEnd"));
+    RTL_CONSTASCII_USTRINGPARAM("ConfigurationUpdateEnd"));
 
 
 // Service names of controllers.
 const OUString FrameworkHelper::msModuleControllerService(
-    OUString::createFromAscii("com.sun.star.drawing.framework.ModuleController"));
+    RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.framework.ModuleController"));
 const OUString FrameworkHelper::msConfigurationControllerService(
-    OUString::createFromAscii("com.sun.star.drawing.framework.ConfigurationController"));
+    RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.framework.ConfigurationController"));
 
 //----- helper ----------------------------------------------------------------
 namespace
@@ -786,7 +786,7 @@ class FlagUpdater
 {
 public:
     FlagUpdater (bool& rFlag) : mrFlag(rFlag) {}
-    void operator() (bool) {mrFlag = true;}
+    void operator() (bool) const {mrFlag = true;}
 private:
     bool& mrFlag;
 };
@@ -892,7 +892,7 @@ OUString FrameworkHelper::ResourceIdToString (const Reference<XResourceId>& rxRe
             Sequence<OUString> aAnchorURLs (rxResourceId->getAnchorURLs());
             for (sal_Int32 nIndex=0; nIndex<aAnchorURLs.getLength(); ++nIndex)
             {
-                sString += OUString::createFromAscii(" | ");
+                sString += OUString(RTL_CONSTASCII_USTRINGPARAM(" | "));
                 sString += aAnchorURLs[nIndex];
             }
         }
diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx
index f09141ccc989..fe428393be74 100644
--- a/sd/source/ui/func/fuexpand.cxx
+++ b/sd/source/ui/func/fuexpand.cxx
@@ -196,7 +196,6 @@ void FuExpandPage::DoExecute( SfxRequest& )
                     // Title-Textobjekt erstellen
                     SdrTextObj* pTextObj = (SdrTextObj*) pPage->GetPresObj(PRESOBJ_TITLE);
 
-//
                     OutlinerParaObject* pOutlinerParaObject = pOutl->CreateParaObject( (USHORT) nParaPos, 1);
                     pOutlinerParaObject->SetOutlinerMode(OUTLINERMODE_TITLEOBJECT);
 
@@ -231,7 +230,6 @@ void FuExpandPage::DoExecute( SfxRequest& )
 
                         OutlinerParaObject* pOPO = pOutl->CreateParaObject( (USHORT) nParaPos, (USHORT) nChildCount);
 
-// --
                         SdrOutliner* pTempOutl = SdrMakeOutliner( OUTLINERMODE_OUTLINEOBJECT, mpDoc );
                         pTempOutl->SetText( *pOPO );
 
@@ -248,7 +246,6 @@ void FuExpandPage::DoExecute( SfxRequest& )
                         pOPO = pTempOutl->CreateParaObject();
                         delete pTempOutl;
 
-// --
                         pOutlineObj->SetOutlinerParaObject( pOPO );
                         pOutlineObj->SetEmptyPresObj(FALSE);
 
diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx
index 3cc212478b93..f6751059a28c 100644
--- a/sd/source/ui/func/fuhhconv.cxx
+++ b/sd/source/ui/func/fuhhconv.cxx
@@ -230,7 +230,7 @@ void FuHangulHanjaConversion::StartChineseConversion()
         {
             Reference< ui::dialogs::XExecutableDialog > xDialog(
                     xMCF->createInstanceWithContext(
-                        rtl::OUString::createFromAscii("com.sun.star.linguistic2.ChineseTranslationDialog")
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.ChineseTranslationDialog"))
                         , xContext), UNO_QUERY);
             Reference< lang::XInitialization > xInit( xDialog, UNO_QUERY );
             if( xInit.is() )
@@ -240,7 +240,7 @@ void FuHangulHanjaConversion::StartChineseConversion()
                 Sequence<Any> aSeq(1);
                 Any* pArray = aSeq.getArray();
                 PropertyValue aParam;
-                aParam.Name = rtl::OUString::createFromAscii("ParentWindow");
+                aParam.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow"));
                 aParam.Value <<= makeAny(xDialogParentWindow);
                 pArray[0] <<= makeAny(aParam);
                 xInit->initialize( aSeq );
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index de244e5f259a..8047da661951 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -508,7 +508,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
                                 uno::Reference < beans::XPropertySet > xSet( xSup->getComponent(), uno::UNO_QUERY );
                                 if ( xSet.is() )
                                 {
-                                    xSet->setPropertyValue( ::rtl::OUString::createFromAscii("PluginURL"),
+                                    xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginURL")),
                                             uno::makeAny( ::rtl::OUString( aURL.GetMainURL( INetURLObject::NO_DECODE ) ) ) );
                                 }
                             }
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 5ade46f9a8a3..8b03f4a4598c 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -162,7 +162,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
                     Reference< XPropertySet > xInfo( xStyles->getByName( pNameItem->GetValue() ), UNO_QUERY_THROW );
 
                     OUString aUIName;
-                    xInfo->getPropertyValue( ::rtl::OUString::createFromAscii("DisplayName") ) >>= aUIName;
+                    xInfo->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayName")) ) >>= aUIName;
                     if ( aUIName.getLength() )
                         rReq.AppendItem( SfxStringItem( nSId, aUIName ) );
                 }
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index 6f1448fec799..0df134ebd593 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -202,11 +202,6 @@ private:
 
     SfxProgress*        mpProgress;
 
-    /** stores the last used high contrast mode.
-        this is changed in onUpdateStyleSettings()
-    */
-    bool mbHighContrastMode;
-
     /** stores the last used document color.
         this is changed in onUpdateStyleSettings()
     */
diff --git a/sd/source/ui/inc/dlgsnap.hrc b/sd/source/ui/inc/dlgsnap.hrc
index 1d7f5bf7c164..6d4c1a6fc67f 100644
--- a/sd/source/ui/inc/dlgsnap.hrc
+++ b/sd/source/ui/inc/dlgsnap.hrc
@@ -38,7 +38,3 @@
 #define RB_HORIZONTAL 11
 #define RB_VERTICAL 12
 #define RB_POINT 13
-
-#define BMP_POINT_H 1
-#define BMP_VERTICAL_H 2
-#define BMP_HORIZONTAL_H 3
diff --git a/sd/source/ui/inc/fumorph.hxx b/sd/source/ui/inc/fumorph.hxx
index 1137823d1f04..7773d69dca89 100644
--- a/sd/source/ui/inc/fumorph.hxx
+++ b/sd/source/ui/inc/fumorph.hxx
@@ -33,9 +33,6 @@
 
 #include <math.h>
 
-/*************************************************************************
-|*
-\************************************************************************/
 class List;
 namespace basegfx {
     class B2DPolyPolygon;
diff --git a/sd/source/ui/inc/morphdlg.hxx b/sd/source/ui/inc/morphdlg.hxx
index 387c7df1d7ec..141170475627 100644
--- a/sd/source/ui/inc/morphdlg.hxx
+++ b/sd/source/ui/inc/morphdlg.hxx
@@ -39,12 +39,6 @@ class SdrObject;
 
 namespace sd {
 
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
 class MorphDlg
     : public ModalDialog
 {
diff --git a/sd/source/ui/inc/navigatr.hrc b/sd/source/ui/inc/navigatr.hrc
index 47812c304890..74a6490257d2 100644
--- a/sd/source/ui/inc/navigatr.hrc
+++ b/sd/source/ui/inc/navigatr.hrc
@@ -40,4 +40,3 @@
 #define LB_DOCS 1
 
 #define IL_NAVIGATR 333
-#define ILH_NAVIGATR 444
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index fd05e9ffa99f..cec36afe65ff 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -135,7 +135,6 @@ private:
     SdPageNameControllerItem*   mpPageNameCtrlItem;
 
     ImageList                   maImageList;
-    ImageList                   maImageListH;
 
     /** This flag controls whether all shapes or only the named shapes are
         shown.
diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc
index fb788cb83614..14b3b112f27f 100755
--- a/sd/source/ui/inc/res_bmp.hrc
+++ b/sd/source/ui/inc/res_bmp.hrc
@@ -138,73 +138,36 @@
 #define BMP_EFFECT_UNCOVER_TO_B             RID_APP_START+171
 #define BMP_EFFECT_UNCOVER_TO_LL            RID_APP_START+172
 
-#define BMP_PAGE_H                          RID_SD_START+213
-#define BMP_PAGEOBJS_H                      RID_SD_START+214
-#define BMP_OBJECTS_H                       RID_SD_START+215
-#define BMP_DOC_OPEN_H                      RID_SD_START+216
-#define BMP_DOC_CLOSED_H                    RID_SD_START+217
-#define BMP_DOC_TEXT_H                      RID_SD_START+218
-#define BMP_OLE_H                           RID_SD_START+219
-#define BMP_PAGE_EXCLUDED_H                 RID_SD_START+220
-#define BMP_PAGEOBJS_EXCLUDED_H             RID_SD_START+221
-#define BMP_EXPAND_H                        RID_SD_START+222
-#define BMP_COLLAPSE_H                      RID_SD_START+223
-#define BMP_GRAPHIC_H                       RID_SD_START+224
-
 #define BMP_FOIL_NONE_H                     RID_SD_START+225
-#define BMP_GROUP_H                         RID_SD_START+226
 #define BMP_WAIT_ICON_H                     RID_SD_START+229
 
 #define BMP_FADE_EFFECT_INDICATOR           RID_SD_START+331
-#define BMP_FADE_EFFECT_INDICATOR_H         RID_SD_START+332
 
 #define BMP_COMMENTS_INDICATOR              RID_SD_START+338
-#define BMP_COMMENTS_INDICATOR_H            RID_SD_START+339
 
 #define BMP_LAYOUT_EMPTY                    RID_SD_START+340
-#define BMP_LAYOUT_EMPTY_H                  RID_SD_START+341
 #define BMP_LAYOUT_HEAD01                   RID_SD_START+342
-#define BMP_LAYOUT_HEAD01_H                 RID_SD_START+343
 #define BMP_LAYOUT_HEAD02                   RID_SD_START+344
-#define BMP_LAYOUT_HEAD02_H                 RID_SD_START+345
 #define BMP_LAYOUT_HEAD02A                  RID_SD_START+346
-#define BMP_LAYOUT_HEAD02A_H                RID_SD_START+347
 #define BMP_LAYOUT_HEAD02B                  RID_SD_START+348
-#define BMP_LAYOUT_HEAD02B_H                RID_SD_START+349
 #define BMP_LAYOUT_HEAD03                   RID_SD_START+350
-#define BMP_LAYOUT_HEAD03_H                 RID_SD_START+351
 #define BMP_LAYOUT_HEAD03A                  RID_SD_START+352
-#define BMP_LAYOUT_HEAD03A_H                RID_SD_START+353
 #define BMP_LAYOUT_HEAD03B                  RID_SD_START+354
-#define BMP_LAYOUT_HEAD03B_H                RID_SD_START+355
 #define BMP_LAYOUT_HEAD03C                  RID_SD_START+356
-#define BMP_LAYOUT_HEAD03C_H                RID_SD_START+357
 #define BMP_LAYOUT_HEAD04                   RID_SD_START+358
-#define BMP_LAYOUT_HEAD04_H                 RID_SD_START+359
 #define BMP_LAYOUT_HEAD06                   RID_SD_START+360
-#define BMP_LAYOUT_HEAD06_H                 RID_SD_START+361
 #define BMP_LAYOUT_TEXTONLY                 RID_SD_START+362
-#define BMP_LAYOUT_TEXTONLY_H               RID_SD_START+363
 #define BMP_LAYOUT_VERTICAL01               RID_SD_START+364
-#define BMP_LAYOUT_VERTICAL01_H             RID_SD_START+365
 #define BMP_LAYOUT_VERTICAL02               RID_SD_START+366
-#define BMP_LAYOUT_VERTICAL02_H             RID_SD_START+367
 
 #define BMP_FOILH_01                        RID_SD_START+388
-#define BMP_FOILH_01_H                      RID_SD_START+389
 #define BMP_FOILH_02                        RID_SD_START+390
-#define BMP_FOILH_02_H                      RID_SD_START+391
 #define BMP_FOILH_03                        RID_SD_START+392
-#define BMP_FOILH_03_H                      RID_SD_START+393
 #define BMP_FOILH_04                        RID_SD_START+394
-#define BMP_FOILH_04_H                      RID_SD_START+395
 #define BMP_FOILH_06                        RID_SD_START+396
-#define BMP_FOILH_06_H                      RID_SD_START+397
 #define BMP_FOILH_09                        RID_SD_START+398
-#define BMP_FOILH_09_H                      RID_SD_START+399
 
 #define BMP_FOILN_01                        RID_SD_START+400
-#define BMP_FOILN_01_H                      RID_SD_START+401
 
 #define BMP_PLACEHOLDER_SMALL_START         (RID_SD_START+402)      // these ids must stay in order!
 #define BMP_PLACEHOLDER_TABLE_SMALL         (RID_SD_START+402)
@@ -229,12 +192,6 @@
 
 // -----------------------------------------------------------------------------
 
-#define IMG_PIPETTE_H                       RID_APP_START+21
-#define IMG_GET1OBJECT_H                    RID_APP_START+22
-#define IMG_GETALLOBJECT_H                  RID_APP_START+23
-#define IMG_REMOVEBMP_H                     RID_APP_START+24
-#define IMG_REMOVEALLBMP_H                  RID_APP_START+25
-
 /*
  *  ResourceIDs fuer Popup-Menues brauchen keinen Dummy-String !!!
  */
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index 06cd1f57814d..170166e05e79 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -135,8 +135,6 @@ protected:
     SfxMedium*              mpOwnMedium;
     Image                   maImgOle;
     Image                   maImgGraphic;
-    Image                   maImgOleH;
-    Image                   maImgGraphicH;
     BOOL                    mbLinkableSelected;
     BOOL                    mbDragEnabled;
     String                  maDocName;
diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx
index b4f57b365ac3..f00bf1f00ab9 100644
--- a/sd/source/ui/presenter/PresenterCanvas.cxx
+++ b/sd/source/ui/presenter/PresenterCanvas.cxx
@@ -64,7 +64,7 @@ Reference<XInterface> SAL_CALL PresenterCanvas_createInstance (
 
 ::rtl::OUString PresenterCanvas_getImplementationName (void) throw(RuntimeException)
 {
-    return OUString::createFromAscii("com.sun.star.comp.Draw.PresenterCanvasFactory");
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterCanvasFactory"));
 }
 
 
@@ -74,7 +74,7 @@ Sequence<rtl::OUString> SAL_CALL PresenterCanvas_getSupportedServiceNames (void)
     throw (RuntimeException)
 {
     static const ::rtl::OUString sServiceName(
-        ::rtl::OUString::createFromAscii("com.sun.star.rendering.Canvas"));
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.rendering.Canvas")));
     return Sequence<rtl::OUString>(&sServiceName, 1);
 }
 
@@ -233,7 +233,7 @@ void SAL_CALL PresenterCanvas::initialize (
             if ( ! (rArguments[2] >>= mxSharedWindow))
             {
                 throw lang::IllegalArgumentException(
-                    OUString::createFromAscii("PresenterCanvas: invalid shared window"),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterCanvas: invalid shared window")),
                     static_cast<XWeak*>(this),
                     1);
             }
@@ -241,7 +241,7 @@ void SAL_CALL PresenterCanvas::initialize (
             if ( ! (rArguments[3] >>= mxSharedCanvas))
             {
                 throw lang::IllegalArgumentException(
-                    OUString::createFromAscii("PresenterCanvas: invalid shared canvas"),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterCanvas: invalid shared canvas")),
                     static_cast<XWeak*>(this),
                     2);
             }
@@ -249,7 +249,7 @@ void SAL_CALL PresenterCanvas::initialize (
             if ( ! (rArguments[4] >>= mxWindow))
             {
                 throw lang::IllegalArgumentException(
-                    OUString::createFromAscii("PresenterCanvas: invalid window"),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterCanvas: invalid window")),
                     static_cast<XWeak*>(this),
                     3);
             }
@@ -270,7 +270,7 @@ void SAL_CALL PresenterCanvas::initialize (
     else
     {
         throw RuntimeException(
-            OUString::createFromAscii("PresenterCanvas: invalid number of arguments"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterCanvas: invalid number of arguments")),
                 static_cast<XWeak*>(this));
     }
 }
diff --git a/sd/source/ui/presenter/PresenterCanvasFactory.cxx b/sd/source/ui/presenter/PresenterCanvasFactory.cxx
index 81b990f57f09..cfb1d84ee5a3 100644
--- a/sd/source/ui/presenter/PresenterCanvasFactory.cxx
+++ b/sd/source/ui/presenter/PresenterCanvasFactory.cxx
@@ -252,7 +252,7 @@ Reference<rendering::XCanvas> PresenterCanvasFactory::CreateCanvas (
             xFactory->createInstanceWithArguments(
                 rsCanvasServiceName.getLength()>0
                     ? rsCanvasServiceName
-                        : OUString::createFromAscii("com.sun.star.rendering.VCLCanvas"),
+                        : OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.rendering.VCLCanvas")),
                 aArg),
             UNO_QUERY);
     }
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx
index 5814b2d16e13..493c3c5a4bed 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -61,7 +61,7 @@ Reference<XInterface> SAL_CALL PresenterHelperService_createInstance (
 ::rtl::OUString PresenterHelperService_getImplementationName (void)
     throw(RuntimeException)
 {
-    return OUString::createFromAscii("com.sun.star.comp.Draw.PresenterHelper");
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper"));
 }
 
 
@@ -71,7 +71,7 @@ Sequence<rtl::OUString> SAL_CALL PresenterHelperService_getSupportedServiceNames
     throw (RuntimeException)
 {
     static const ::rtl::OUString sServiceName(
-        ::rtl::OUString::createFromAscii("com.sun.star.drawing.PresenterHelper"));
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PresenterHelper")));
     return Sequence<rtl::OUString>(&sServiceName, 1);
 }
 
@@ -177,7 +177,7 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createSharedCanvas (
         || ! rxWindow.is())
     {
         throw RuntimeException(
-            OUString::createFromAscii("illegal argument"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("illegal argument")),
             Reference<XInterface>(static_cast<XWeak*>(this)));
     }
 
@@ -223,7 +223,7 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createCanvas (
             xFactory->createInstanceWithArguments(
                 rsOptionalCanvasServiceName.getLength()>0
                     ? rsOptionalCanvasServiceName
-                    : OUString::createFromAscii("com.sun.star.rendering.VCLCanvas"),
+                    : OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.rendering.VCLCanvas")),
                 aArg),
             UNO_QUERY);
     }
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx
index 12f54ff91a2d..d7c8793a6d63 100644
--- a/sd/source/ui/presenter/PresenterPreviewCache.cxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx
@@ -100,7 +100,7 @@ Reference<XInterface> SAL_CALL PresenterPreviewCache_createInstance (
 
 ::rtl::OUString PresenterPreviewCache_getImplementationName (void) throw(RuntimeException)
 {
-    return OUString::createFromAscii("com.sun.star.comp.Draw.PresenterPreviewCache");
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterPreviewCache"));
 }
 
 
@@ -110,7 +110,7 @@ Sequence<rtl::OUString> SAL_CALL PresenterPreviewCache_getSupportedServiceNames
     throw (RuntimeException)
 {
     static const ::rtl::OUString sServiceName(
-        ::rtl::OUString::createFromAscii("com.sun.star.drawing.PresenterPreviewCache"));
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PresenterPreviewCache")));
     return Sequence<rtl::OUString>(&sServiceName, 1);
 }
 
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx
index cf9550baf1c2..ec3261686bdf 100644
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -73,7 +73,7 @@ Reference<XInterface> SAL_CALL PresenterTextViewService_createInstance (
 
 ::rtl::OUString PresenterTextViewService_getImplementationName (void) throw(RuntimeException)
 {
-    return OUString::createFromAscii("com.sun.star.comp.Draw.PresenterTextView");
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterTextView"));
 }
 
 
@@ -83,7 +83,7 @@ Sequence<rtl::OUString> SAL_CALL PresenterTextViewService_getSupportedServiceNam
     throw (RuntimeException)
 {
     static const ::rtl::OUString sServiceName(
-        ::rtl::OUString::createFromAscii("com.sun.star.drawing.PresenterTextView"));
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PresenterTextView")));
     return Sequence<rtl::OUString>(&sServiceName, 1);
 }
 
@@ -193,7 +193,7 @@ void SAL_CALL PresenterTextView::initialize (const Sequence<Any>& rArguments)
     else
     {
         throw RuntimeException(
-            OUString::createFromAscii("PresenterTextView: invalid number of arguments"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterTextView: invalid number of arguments")),
                 static_cast<XWeak*>(this));
     }
 }
@@ -303,15 +303,15 @@ void PresenterTextView::ThrowIfDisposed (void)
 //===== PresenterTextView::Implementation =====================================
 
 PresenterTextView::Implementation::Implementation (void)
-    : msTextPropertyName(OUString::createFromAscii("Text")),
-      msBitmapPropertyName(OUString::createFromAscii("Bitmap")),
-      msSizePropertyName(OUString::createFromAscii("Size")),
-      msBackgroundColorPropertyName(OUString::createFromAscii("BackgroundColor")),
-      msTextColorPropertyName(OUString::createFromAscii("TextColor")),
-      msFontDescriptorPropertyName(OUString::createFromAscii("FontDescriptor")),
-      msTopPropertyName(OUString::createFromAscii("Top")),
-      msTopRelativePropertyName(OUString::createFromAscii("RelativeTop")),
-      msTotalHeightPropertyName(OUString::createFromAscii("TotalHeight")),
+    : msTextPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("Text"))),
+      msBitmapPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("Bitmap"))),
+      msSizePropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("Size"))),
+      msBackgroundColorPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("BackgroundColor"))),
+      msTextColorPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("TextColor"))),
+      msFontDescriptorPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("FontDescriptor"))),
+      msTopPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("Top"))),
+      msTopRelativePropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("RelativeTop"))),
+      msTotalHeightPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("TotalHeight"))),
       mxBitmap(),
       mpCanvas(),
       mpOutputDevice(new VirtualDevice(*Application::GetDefaultDevice(), 0, 0)),
@@ -362,7 +362,7 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine (void)
         //
         SvtLinguOptions aOpt;
         SvtLinguConfig().GetOptions( aOpt );
-        //
+
         struct FontDta {
             INT16       nFallbackLang;
             INT16       nLang;
@@ -383,7 +383,7 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine (void)
         aTable[0].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN);
         aTable[1].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN);
         aTable[2].nLang = MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX);
-        //
+
         for (int i = 0;  i < 3;  ++i)
         {
             const FontDta &rFntDta = aTable[i];
diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx
index dbd43cbbab5b..148e8322b15e 100644
--- a/sd/source/ui/presenter/SlideRenderer.cxx
+++ b/sd/source/ui/presenter/SlideRenderer.cxx
@@ -54,7 +54,7 @@ Reference<XInterface> SAL_CALL SlideRenderer_createInstance (
 
 ::rtl::OUString SlideRenderer_getImplementationName (void) throw(RuntimeException)
 {
-    return OUString::createFromAscii("com.sun.star.comp.Draw.SlideRenderer");
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.SlideRenderer"));
 }
 
 
@@ -64,7 +64,7 @@ Sequence<rtl::OUString> SAL_CALL SlideRenderer_getSupportedServiceNames (void)
     throw (RuntimeException)
 {
     static const ::rtl::OUString sServiceName(
-        ::rtl::OUString::createFromAscii("com.sun.star.drawing.SlideRenderer"));
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.SlideRenderer")));
     return Sequence<rtl::OUString>(&sServiceName, 1);
 }
 
@@ -117,7 +117,7 @@ void SAL_CALL SlideRenderer::initialize (const Sequence<Any>& rArguments)
     else
     {
         throw RuntimeException(
-            OUString::createFromAscii("SlideRenderer: invalid number of arguments"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("SlideRenderer: invalid number of arguments")),
                 static_cast<XWeak*>(this));
     }
 }
@@ -203,7 +203,7 @@ BitmapEx SlideRenderer::CreatePreview (
     const SdPage* pPage = SdPage::getImplementation(rxSlide);
     if (pPage == NULL)
         throw lang::IllegalArgumentException(
-            OUString::createFromAscii("SlideRenderer::createPreview() called with invalid slide"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("SlideRenderer::createPreview() called with invalid slide")),
             static_cast<XWeak*>(this),
             0);
 
@@ -211,7 +211,7 @@ BitmapEx SlideRenderer::CreatePreview (
     Size aPageSize = pPage->GetSize();
     if (aPageSize.Height() <= 0)
         throw lang::IllegalArgumentException(
-            OUString::createFromAscii("SlideRenderer::createPreview() called with invalid size"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("SlideRenderer::createPreview() called with invalid size")),
             static_cast<XWeak*>(this),
             1);
 
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index e9ebe9715fac..a31df75f6a99 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -787,7 +787,7 @@ void SAL_CALL SlideShow::end() throw(RuntimeException)
                     if( xProvider.is() )
                     {
                         util::URL aURL;
-                        aURL.Complete = ::rtl::OUString::createFromAscii(".uno:CloseFrame");
+                        aURL.Complete = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseFrame"));
 
                         uno::Reference< frame::XDispatch > xDispatch(
                             xProvider->queryDispatch(
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 8818df2bceac..fc77d10bc7c5 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -2224,13 +2224,13 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG )
         Reference< ::com::sun::star::frame::XFrame > xFrame( pViewFrame->GetFrame().GetFrameInterface() );
         if( xFrame.is() )
         {
-            pMenu->SetItemImage( CM_NEXT_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10617") ), FALSE, FALSE ) );
-            pMenu->SetItemImage( CM_PREV_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10618") ), FALSE, FALSE ) );
+            pMenu->SetItemImage( CM_NEXT_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10617") ), FALSE ) );
+            pMenu->SetItemImage( CM_PREV_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10618") ), FALSE ) );
 
             if( pPageMenu )
             {
-                pPageMenu->SetItemImage( CM_FIRST_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10616") ), FALSE, FALSE ) );
-                pPageMenu->SetItemImage( CM_LAST_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10619") ), FALSE, FALSE ) );
+                pPageMenu->SetItemImage( CM_FIRST_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10616") ), FALSE ) );
+                pPageMenu->SetItemImage( CM_LAST_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10619") ), FALSE ) );
             }
         }
     }
@@ -3012,18 +3012,18 @@ void SlideshowImpl::setAutoSaveState( bool bOn)
         uno::Reference<lang::XMultiServiceFactory> xFac( ::comphelper::getProcessServiceFactory() );
 
         uno::Reference< util::XURLTransformer > xParser(
-            xFac->createInstance( OUString::createFromAscii("com.sun.star.util.URLTransformer" ) ),
+            xFac->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer" )) ),
                 uno::UNO_QUERY_THROW);
         util::URL aURL;
-        aURL.Complete = OUString::createFromAscii("vnd.sun.star.autorecovery:/setAutoSaveState");
+        aURL.Complete = OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.autorecovery:/setAutoSaveState"));
         xParser->parseStrict(aURL);
 
         Sequence< beans::PropertyValue > aArgs(1);
-        aArgs[0].Name = OUString::createFromAscii("AutoSaveState");
+        aArgs[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("AutoSaveState"));
         aArgs[0].Value <<= bOn ? sal_True : sal_False;
 
         uno::Reference< frame::XDispatch > xAutoSave(
-            xFac->createInstance(OUString::createFromAscii("com.sun.star.frame.AutoRecovery")),
+            xFac->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.AutoRecovery"))),
             uno::UNO_QUERY_THROW);
         xAutoSave->dispatch(aURL, aArgs);
     }
diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
index c62b4ea31a60..0568dfa083d4 100644
--- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx
@@ -147,7 +147,7 @@ public:
     class CompareWithCache { public:
         CompareWithCache(const ::boost::shared_ptr<PageCacheManager::Cache>& rpCache)
             : mpCache(rpCache) {}
-        bool operator () (const PageCacheContainer::value_type& rValue)
+        bool operator () (const PageCacheContainer::value_type& rValue) const
         { return rValue.second == mpCache; }
     private:
         ::boost::shared_ptr<PageCacheManager::Cache> mpCache;
diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
index d0fdf848f06f..7a7abd79658a 100644
--- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
+++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
@@ -193,7 +193,7 @@ sal_Int32 SlideSorterModel::GetIndex (const Reference<drawing::XDrawPage>& rxSli
     {
         try
         {
-            const Any aNumber (xSet->getPropertyValue(::rtl::OUString::createFromAscii("Number")));
+            const Any aNumber (xSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Number"))));
             sal_Int16 nNumber (-1);
             aNumber >>= nNumber;
             nNumber -= 1;
diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx
index 8d6ccdd0530a..b4c1b57f9600 100644
--- a/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx
+++ b/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx
@@ -41,7 +41,7 @@ namespace {
 class AllPagesPredicate
 {
 public:
-    bool operator() (const SharedPageDescriptor& rpDescriptor)
+    bool operator() (const SharedPageDescriptor& rpDescriptor) const
     {
         (void)rpDescriptor;
         return true;
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
index e24da73862e1..41f55fcc6be5 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
@@ -79,7 +79,7 @@ Reference<XInterface> SAL_CALL SlideSorterService_createInstance (
 
 ::rtl::OUString SlideSorterService_getImplementationName (void) throw(RuntimeException)
 {
-    return OUString::createFromAscii("com.sun.star.comp.Draw.SlideSorter");
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.SlideSorter"));
 }
 
 
@@ -89,7 +89,7 @@ Sequence<rtl::OUString> SAL_CALL SlideSorterService_getSupportedServiceNames (vo
     throw (RuntimeException)
 {
     static const ::rtl::OUString sServiceName(
-        ::rtl::OUString::createFromAscii("com.sun.star.drawing.SlideSorter"));
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.SlideSorter")));
     return Sequence<rtl::OUString>(&sServiceName, 1);
 }
 
@@ -175,7 +175,7 @@ void SAL_CALL SlideSorterService::initialize (const Sequence<Any>& rArguments)
     else
     {
         throw RuntimeException(
-            OUString::createFromAscii("SlideSorterService: invalid number of arguments"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("SlideSorterService: invalid number of arguments")),
             static_cast<drawing::XDrawView*>(this));
     }
 }
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
index 8cde7b0dfdbd..952d659fc10a 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
@@ -671,9 +671,7 @@ const BitmapEx& SdPageObjectFadeNameNumberPrimitive::getFadeEffectIconBitmap() c
     if(mpFadeEffectIconBitmap == NULL)
     {
         // prepare FadeEffectIconBitmap on demand
-        const sal_uInt16 nIconId(Application::GetSettings().GetStyleSettings().GetHighContrastMode()
-            ? BMP_FADE_EFFECT_INDICATOR_H
-            : BMP_FADE_EFFECT_INDICATOR);
+        const sal_uInt16 nIconId(BMP_FADE_EFFECT_INDICATOR);
         const BitmapEx aFadeEffectIconBitmap(IconCache::Instance().GetIcon(nIconId).GetBitmapEx());
         const_cast< SdPageObjectFadeNameNumberPrimitive* >(this)->mpFadeEffectIconBitmap = new BitmapEx(aFadeEffectIconBitmap);
     }
diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx
index 770b6945c0a8..6b09a54fc400 100644
--- a/sd/source/ui/toolpanel/LayoutMenu.cxx
+++ b/sd/source/ui/toolpanel/LayoutMenu.cxx
@@ -123,7 +123,6 @@ TYPEINIT1(LayoutMenu, SfxShell);
 struct snewfoil_value_info
 {
     USHORT mnBmpResId;
-    USHORT mnHCBmpResId;
     USHORT mnStrResId;
     WritingMode meWritingMode;
     AutoLayout maAutoLayout;
@@ -131,49 +130,49 @@ struct snewfoil_value_info
 
 static snewfoil_value_info notes[] =
 {
-    {BMP_FOILN_01, BMP_FOILN_01_H, STR_AUTOLAYOUT_NOTES, WritingMode_LR_TB,
+    {BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, WritingMode_LR_TB,
      AUTOLAYOUT_NOTES},
-    {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
+    {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
 };
 
 static snewfoil_value_info handout[] =
 {
-    {BMP_FOILH_01, BMP_FOILH_01_H, STR_AUTOLAYOUT_HANDOUT1, WritingMode_LR_TB,
+    {BMP_FOILH_01, STR_AUTOLAYOUT_HANDOUT1, WritingMode_LR_TB,
      AUTOLAYOUT_HANDOUT1},
-    {BMP_FOILH_02, BMP_FOILH_02_H, STR_AUTOLAYOUT_HANDOUT2, WritingMode_LR_TB,
+    {BMP_FOILH_02, STR_AUTOLAYOUT_HANDOUT2, WritingMode_LR_TB,
      AUTOLAYOUT_HANDOUT2},
-    {BMP_FOILH_03, BMP_FOILH_03_H, STR_AUTOLAYOUT_HANDOUT3, WritingMode_LR_TB,
+    {BMP_FOILH_03, STR_AUTOLAYOUT_HANDOUT3, WritingMode_LR_TB,
      AUTOLAYOUT_HANDOUT3},
-    {BMP_FOILH_04, BMP_FOILH_04_H, STR_AUTOLAYOUT_HANDOUT4, WritingMode_LR_TB,
+    {BMP_FOILH_04, STR_AUTOLAYOUT_HANDOUT4, WritingMode_LR_TB,
      AUTOLAYOUT_HANDOUT4},
-    {BMP_FOILH_06, BMP_FOILH_06_H, STR_AUTOLAYOUT_HANDOUT6, WritingMode_LR_TB,
+    {BMP_FOILH_06, STR_AUTOLAYOUT_HANDOUT6, WritingMode_LR_TB,
      AUTOLAYOUT_HANDOUT6},
-    {BMP_FOILH_09, BMP_FOILH_09_H, STR_AUTOLAYOUT_HANDOUT9, WritingMode_LR_TB,
+    {BMP_FOILH_09, STR_AUTOLAYOUT_HANDOUT9, WritingMode_LR_TB,
      AUTOLAYOUT_HANDOUT9},
-    {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
+    {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
 };
 
 static snewfoil_value_info standard[] =
 {
-    {BMP_LAYOUT_EMPTY, BMP_LAYOUT_EMPTY_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB,        AUTOLAYOUT_NONE},
-    {BMP_LAYOUT_HEAD03, BMP_LAYOUT_HEAD03_H, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB,       AUTOLAYOUT_TITLE},
-    {BMP_LAYOUT_HEAD02, BMP_LAYOUT_HEAD02_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB,        AUTOLAYOUT_ENUM},
-    {BMP_LAYOUT_HEAD02A, BMP_LAYOUT_HEAD02A_H, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB,       AUTOLAYOUT_2TEXT},
-    {BMP_LAYOUT_HEAD01, BMP_LAYOUT_HEAD01_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB,  AUTOLAYOUT_ONLY_TITLE},
-    {BMP_LAYOUT_TEXTONLY, BMP_LAYOUT_TEXTONLY_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB,   AUTOLAYOUT_ONLY_TEXT},
-    {BMP_LAYOUT_HEAD03B, BMP_LAYOUT_HEAD03B_H, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB,    AUTOLAYOUT_2OBJTEXT},
-    {BMP_LAYOUT_HEAD03C, BMP_LAYOUT_HEAD03C_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB,    AUTOLAYOUT_TEXT2OBJ},
-    {BMP_LAYOUT_HEAD03A, BMP_LAYOUT_HEAD03A_H, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT},
-    {BMP_LAYOUT_HEAD02B, BMP_LAYOUT_HEAD02B_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT},
-    {BMP_LAYOUT_HEAD04, BMP_LAYOUT_HEAD04_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB,        AUTOLAYOUT_4OBJ},
-    {BMP_LAYOUT_HEAD06, BMP_LAYOUT_HEAD06_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB,    AUTOLAYOUT_6CLIPART},
+    {BMP_LAYOUT_EMPTY, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB,        AUTOLAYOUT_NONE},
+    {BMP_LAYOUT_HEAD03, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB,       AUTOLAYOUT_TITLE},
+    {BMP_LAYOUT_HEAD02, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB,        AUTOLAYOUT_ENUM},
+    {BMP_LAYOUT_HEAD02A, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB,       AUTOLAYOUT_2TEXT},
+    {BMP_LAYOUT_HEAD01, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB,  AUTOLAYOUT_ONLY_TITLE},
+    {BMP_LAYOUT_TEXTONLY, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB,   AUTOLAYOUT_ONLY_TEXT},
+    {BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB,    AUTOLAYOUT_2OBJTEXT},
+    {BMP_LAYOUT_HEAD03C, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB,    AUTOLAYOUT_TEXT2OBJ},
+    {BMP_LAYOUT_HEAD03A, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT},
+    {BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT},
+    {BMP_LAYOUT_HEAD04, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB,        AUTOLAYOUT_4OBJ},
+    {BMP_LAYOUT_HEAD06, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB,    AUTOLAYOUT_6CLIPART},
 
     // vertical
-    {BMP_LAYOUT_VERTICAL02, BMP_LAYOUT_VERTICAL02_H, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART},
-    {BMP_LAYOUT_VERTICAL01, BMP_LAYOUT_VERTICAL01_H, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE},
-    {BMP_LAYOUT_HEAD02, BMP_LAYOUT_HEAD02_H, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE},
-    {BMP_LAYOUT_HEAD02A, BMP_LAYOUT_HEAD02A_H, STR_AL_TITLE_VERT_OUTLINE_CLIPART,   WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART},
-    {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
+    {BMP_LAYOUT_VERTICAL02, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART},
+    {BMP_LAYOUT_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE},
+    {BMP_LAYOUT_HEAD02, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE},
+    {BMP_LAYOUT_HEAD02A, STR_AL_TITLE_VERT_OUTLINE_CLIPART,   WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART},
+    {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
 };
 
 LayoutMenu::LayoutMenu( TreeNode* pParent, ToolPanelViewShell& i_rPanelViewShell )
@@ -229,7 +228,7 @@ void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell )
     mxListener = new ::sd::tools::SlotStateListener(
         aStateChangeLink,
         Reference<frame::XDispatchProvider>(mrBase.GetController()->getFrame(), UNO_QUERY),
-        ::rtl::OUString::createFromAscii(".uno:VerticalTextState"));
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:VerticalTextState")));
 
     // Add this new object as shell to the shell factory.
     GetShellManager()->AddSubShell(HID_SD_TASK_PANE_PREVIEW_LAYOUTS,this,this);
@@ -764,7 +763,6 @@ SfxRequest LayoutMenu::CreateRequest (
 
 void LayoutMenu::Fill (void)
 {
-    const bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
     SvtLanguageOptions aLanguageOptions;
     sal_Bool bVertical = aLanguageOptions.IsVerticalTextEnabled();
     SdDrawDocument* pDocument = mrBase.GetDocument();
@@ -812,9 +810,7 @@ void LayoutMenu::Fill (void)
     {
         if ((WritingMode_TB_RL != pInfo->meWritingMode) || bVertical)
         {
-            BitmapEx aBmp (SdResId (bHighContrast
-                             ? pInfo->mnHCBmpResId
-                             : pInfo->mnBmpResId));
+            BitmapEx aBmp(SdResId(pInfo->mnBmpResId));
 
             if (bRightToLeft && (WritingMode_TB_RL != pInfo->meWritingMode))
                 aBmp.Mirror (BMP_MIRROR_HORZ);
diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx
index 0b1c748b7470..f7127f1a15f8 100644
--- a/sd/source/ui/toolpanel/ScrollPanel.cxx
+++ b/sd/source/ui/toolpanel/ScrollPanel.cxx
@@ -82,7 +82,7 @@ ScrollPanel::ScrollPanel (
 void ScrollPanel::Construct()
 {
     SetAccessibleName (
-        ::rtl::OUString::createFromAscii("Sub Task Panel"));
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Sub Task Panel")));
     mpControlContainer->SetMultiSelection (true);
 
     SetBorderStyle (WINDOW_BORDER_NORMAL);
@@ -714,8 +714,8 @@ long ScrollPanel::Notify( NotifyEvent& rNEvt )
 {
     return new ::accessibility::AccessibleScrollPanel (
         *this,
-        ::rtl::OUString::createFromAscii("Scroll Panel"),
-        ::rtl::OUString::createFromAscii("Scroll Panel"));
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scroll Panel")),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scroll Panel")));
 }
 
 
diff --git a/sd/source/ui/toolpanel/SubToolPanel.cxx b/sd/source/ui/toolpanel/SubToolPanel.cxx
index 473ecd4a820b..6ac415b82fca 100644
--- a/sd/source/ui/toolpanel/SubToolPanel.cxx
+++ b/sd/source/ui/toolpanel/SubToolPanel.cxx
@@ -55,7 +55,7 @@ SubToolPanel::SubToolPanel (
       mnHorizontalBorder(2)
 {
     SetAccessibleName (
-        ::rtl::OUString::createFromAscii("Sub Task Panel"));
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Sub Task Panel")));
     mpControlContainer->SetMultiSelection (true);
 
     SetBorderStyle (WINDOW_BORDER_NORMAL);
@@ -84,7 +84,7 @@ SubToolPanel::SubToolPanel (
       mnHorizontalBorder(2)
 {
     SetAccessibleName (
-        ::rtl::OUString::createFromAscii("Sub Task Panel"));
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Sub Task Panel")));
     mpControlContainer->SetMultiSelection (true);
 
     SetBorderStyle (WINDOW_BORDER_NORMAL);
@@ -412,8 +412,8 @@ IMPL_LINK(SubToolPanel, WindowEventListener, VclSimpleEvent*, pEvent)
 {
     return new ::accessibility::AccessibleTreeNode (
         *this,
-        ::rtl::OUString::createFromAscii("Sub Task Panel"),
-        ::rtl::OUString::createFromAscii("Sub Task Panel"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Sub Task Panel")),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Sub Task Panel")),
         ::com::sun::star::accessibility::AccessibleRole::PANEL);
 }
 
diff --git a/sd/source/ui/toolpanel/TitleBar.cxx b/sd/source/ui/toolpanel/TitleBar.cxx
index fd690a364aba..4e4d6da5ecea 100644
--- a/sd/source/ui/toolpanel/TitleBar.cxx
+++ b/sd/source/ui/toolpanel/TitleBar.cxx
@@ -252,7 +252,6 @@ bool TitleBar::HasExpansionIndicator (void) const
 Image TitleBar::GetExpansionIndicator (void) const
 {
     Image aIndicator;
-    bool bHighContrastMode (GetSettings().GetStyleSettings().GetHighContrastMode() != 0);
     if (mbIsExpandable)
     {
         USHORT nResourceId = 0;
@@ -260,15 +259,9 @@ Image TitleBar::GetExpansionIndicator (void) const
         {
             case TBT_SUB_CONTROL_HEADLINE:
                 if (mbExpanded)
-                    if (bHighContrastMode)
-                        nResourceId = BMP_COLLAPSE_H;
-                    else
-                        nResourceId = BMP_COLLAPSE;
+                    nResourceId = BMP_COLLAPSE;
                 else
-                    if (bHighContrastMode)
-                        nResourceId = BMP_EXPAND_H;
-                    else
-                        nResourceId = BMP_EXPAND;
+                    nResourceId = BMP_EXPAND;
 
                 aIndicator = IconCache::Instance().GetIcon(nResourceId);
                 break;
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx
index 94c4e9bcc1d4..da8ede52027d 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx
@@ -131,8 +131,8 @@ Image TemplatePreviewProvider::operator() (
         {
             uno::Reference<lang::XSingleServiceFactory> xStorageFactory(
                 xServiceManager->createInstance(
-                    ::rtl::OUString::createFromAscii(
-                        "com.sun.star.embed.StorageFactory")),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.embed.StorageFactory"))),
                 uno::UNO_QUERY);
 
             if (xStorageFactory.is())
@@ -150,14 +150,14 @@ Image TemplatePreviewProvider::operator() (
                     {
                         uno::Reference<embed::XStorage> xStorage (
                             xDocStorage->openStorageElement(
-                                ::rtl::OUString::createFromAscii("Thumbnails"),
+                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Thumbnails")),
                                 embed::ElementModes::READ));
                         if (xStorage.is())
                         {
                             uno::Reference<io::XStream> xThumbnailCopy (
                                 xStorage->cloneStreamElement(
-                                    ::rtl::OUString::createFromAscii(
-                                        "thumbnail.png")));
+                                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "thumbnail.png"))));
                             if (xThumbnailCopy.is())
                                 xIStream = xThumbnailCopy->getInputStream();
                         }
@@ -183,14 +183,14 @@ Image TemplatePreviewProvider::operator() (
                     {
                         uno::Reference<embed::XStorage> xStorage (
                             xDocStorage->openStorageElement(
-                                ::rtl::OUString::createFromAscii("Thumbnail"),
+                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Thumbnail")),
                                 embed::ElementModes::READ));
                         if (xStorage.is())
                         {
                             uno::Reference<io::XStream> xThumbnailCopy (
                                 xStorage->cloneStreamElement(
-                                    ::rtl::OUString::createFromAscii(
-                                        "thumbnail.png")));
+                                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "thumbnail.png"))));
                             if (xThumbnailCopy.is())
                                 xIStream = xThumbnailCopy->getInputStream();
                         }
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.cxx
index 9fceb3270687..3aec7fd8ceab 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.cxx
@@ -54,8 +54,10 @@ public:
     {}
     SharedMasterPageDescriptor mpDescriptor;
     int mnPriority;
-    class Compare {public:
-        bool operator() (const PreviewCreationRequest& r1,const PreviewCreationRequest& r2)
+    class Compare
+    {
+    public:
+        bool operator() (const PreviewCreationRequest& r1,const PreviewCreationRequest& r2) const
         {
             if (r1.mnPriority != r2.mnPriority)
             {
@@ -70,11 +72,13 @@ public:
             }
         }
     };
-    class CompareToken {public:
+    class CompareToken
+    {
+        public:
         MasterPageContainer::Token maToken;
         CompareToken(MasterPageContainer::Token aToken) : maToken(aToken) {}
-        bool operator() (const PreviewCreationRequest& rRequest)
-        {     return maToken==rRequest.mpDescriptor->maToken; }
+        bool operator() (const PreviewCreationRequest& rRequest) const
+            { return maToken==rRequest.mpDescriptor->maToken; }
     };
 };
 
diff --git a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
index c9b87b425a9d..352999836a3c 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
@@ -293,15 +293,15 @@ MasterPageDescriptor::URLClassification MasterPageDescriptor::GetURLClassificati
     {
         if (msURL.getLength() == 0)
             meURLClassification = URLCLASS_UNKNOWN;
-        else if (msURL.indexOf(::rtl::OUString::createFromAscii("presnt"))>=0)
+        else if (msURL.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("presnt")))>=0)
         {
             meURLClassification = URLCLASS_PRESENTATION;
         }
-        else if (msURL.indexOf(::rtl::OUString::createFromAscii("layout"))>=0)
+        else if (msURL.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("layout")))>=0)
         {
             meURLClassification = URLCLASS_LAYOUT;
         }
-        else if (msURL.indexOf(::rtl::OUString::createFromAscii("educate"))>=0)
+        else if (msURL.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("educate")))>=0)
         {
             meURLClassification = URLCLASS_OTHER;
         }
diff --git a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx
index 7a685ca76cd7..c968377d11cf 100644
--- a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx
@@ -96,12 +96,14 @@ public:
           maToken(aToken)
     {}
     class TokenComparator
-    { public:
+    {
+    public:
         TokenComparator(::sd::toolpanel::controls::MasterPageContainer::Token aToken)
             : maToken(aToken) {}
-        bool operator () (const Descriptor& rDescriptor)
-        { return maToken==rDescriptor.maToken; }
-    private: ::sd::toolpanel::controls::MasterPageContainer::Token maToken;
+        bool operator () (const Descriptor& rDescriptor) const
+            { return maToken==rDescriptor.maToken; }
+    private:
+        ::sd::toolpanel::controls::MasterPageContainer::Token maToken;
     };
 };
 
@@ -197,8 +199,8 @@ void RecentlyUsedMasterPages::LoadPersistentValues (void)
         if ( ! xSet.is())
             return;
 
-        const String sURLMemberName (OUString::createFromAscii("URL"));
-        const String sNameMemberName (OUString::createFromAscii("Name"));
+        const String sURLMemberName (RTL_CONSTASCII_USTRINGPARAM("URL"));
+        const String sNameMemberName (RTL_CONSTASCII_USTRINGPARAM("Name"));
         OUString sURL;
         OUString sName;
 
@@ -272,8 +274,8 @@ void RecentlyUsedMasterPages::SavePersistentValues (void)
             xSet->removeByName (aKeys[i]);
 
         // Fill it with the URLs of this object.
-        const String sURLMemberName (OUString::createFromAscii("URL"));
-        const String sNameMemberName (OUString::createFromAscii("Name"));
+        const String sURLMemberName (RTL_CONSTASCII_USTRINGPARAM("URL"));
+        const String sNameMemberName (RTL_CONSTASCII_USTRINGPARAM("Name"));
         Any aValue;
         Reference<lang::XSingleServiceFactory> xChildFactory (
             xSet, UNO_QUERY);
@@ -286,7 +288,7 @@ void RecentlyUsedMasterPages::SavePersistentValues (void)
                 ++iDescriptor,++nIndex)
         {
             // Create new child.
-            OUString sKey (OUString::createFromAscii("index_"));
+            OUString sKey (RTL_CONSTASCII_USTRINGPARAM("index_"));
             sKey += OUString::valueOf(nIndex);
             Reference<container::XNameReplace> xChild(
                 xChildFactory->createInstance(), UNO_QUERY);
diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx b/sd/source/ui/tools/ConfigurationAccess.cxx
index 6ee18c463d16..9dfe45f6a64a 100644
--- a/sd/source/ui/tools/ConfigurationAccess.cxx
+++ b/sd/source/ui/tools/ConfigurationAccess.cxx
@@ -53,7 +53,7 @@ ConfigurationAccess::ConfigurationAccess (
     {
         Reference<lang::XMultiServiceFactory> xProvider (
             xFactory->createInstanceWithContext(
-                OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider")),
                 rxContext),
             UNO_QUERY);
         if (xProvider.is())
@@ -71,7 +71,7 @@ ConfigurationAccess::ConfigurationAccess (
 {
     Reference<lang::XMultiServiceFactory> xProvider (
         ::comphelper::getProcessServiceFactory()->createInstance(
-            OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))),
         UNO_QUERY);
     if (xProvider.is())
         Initialize(xProvider, rsRootName, eMode);
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index 5e9d15f867bd..149fdc17b9fe 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -247,7 +247,7 @@ OUString SAL_CALL DrawController::getImplementationName(  ) throw(RuntimeExcepti
 
 
 
-static OUString ssServiceName (OUString::createFromAscii(
+static OUString ssServiceName (RTL_CONSTASCII_USTRINGPARAM(
     "com.sun.star.drawing.DrawingDocumentDrawView"));
 
 sal_Bool SAL_CALL DrawController::supportsService (
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 9d9fda79de96..c47869073be1 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -423,7 +423,7 @@ SdFilterDetect::~SdFilterDetect()
     {
         // if input stream wasn't part of the descriptor, now it should be, otherwise the content would be opend twice
         lDescriptor.realloc( nPropertyCount + 1 );
-        lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("InputStream");
+        lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream"));
         lDescriptor[nPropertyCount].Value <<= xStream;
         nPropertyCount++;
     }
@@ -432,7 +432,7 @@ SdFilterDetect::~SdFilterDetect()
     {
         // if input stream wasn't part of the descriptor, now it should be, otherwise the content would be opend twice
         lDescriptor.realloc( nPropertyCount + 1 );
-        lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("UCBContent");
+        lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UCBContent"));
         lDescriptor[nPropertyCount].Value <<= xContent;
         nPropertyCount++;
     }
@@ -442,7 +442,7 @@ SdFilterDetect::~SdFilterDetect()
         if ( nIndexOfReadOnlyFlag == -1 )
         {
             lDescriptor.realloc( nPropertyCount + 1 );
-            lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("ReadOnly");
+            lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
             lDescriptor[nPropertyCount].Value <<= bReadOnly;
             nPropertyCount++;
         }
@@ -453,7 +453,7 @@ SdFilterDetect::~SdFilterDetect()
     if ( !bRepairPackage && bRepairAllowed )
     {
         lDescriptor.realloc( nPropertyCount + 1 );
-        lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("RepairPackage");
+        lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RepairPackage"));
         lDescriptor[nPropertyCount].Value <<= bRepairAllowed;
         nPropertyCount++;
 
@@ -467,7 +467,7 @@ SdFilterDetect::~SdFilterDetect()
         if ( nIndexOfTemplateFlag == -1 )
         {
             lDescriptor.realloc( nPropertyCount + 1 );
-            lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("AsTemplate");
+            lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AsTemplate"));
             lDescriptor[nPropertyCount].Value <<= bOpenAsTemplate;
             nPropertyCount++;
         }
@@ -481,7 +481,7 @@ SdFilterDetect::~SdFilterDetect()
         if ( nIndexOfDocumentTitle == -1 )
         {
             lDescriptor.realloc( nPropertyCount + 1 );
-            lDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("DocumentTitle");
+            lDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentTitle"));
             lDescriptor[nPropertyCount].Value <<= aDocumentTitle;
             nPropertyCount++;
         }
@@ -531,14 +531,14 @@ UNOSEQUENCE< UNOOUSTRING > SdFilterDetect::impl_getStaticSupportedServiceNames()
 {
     UNOMUTEXGUARD aGuard( UNOMUTEX::getGlobalMutex() );
     UNOSEQUENCE< UNOOUSTRING > seqServiceNames( 1 );
-    seqServiceNames.getArray() [0] = UNOOUSTRING::createFromAscii( "com.sun.star.frame.ExtendedTypeDetection"  );
+    seqServiceNames.getArray() [0] = UNOOUSTRING(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ExtendedTypeDetection"  ));
     return seqServiceNames ;
 }
 
 /* Helper for XServiceInfo */
 UNOOUSTRING SdFilterDetect::impl_getStaticImplementationName()
 {
-    return UNOOUSTRING::createFromAscii( "com.sun.star.comp.draw.FormatDetector" );
+    return UNOOUSTRING(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.draw.FormatDetector" ));
 }
 
 /* Helper for registry */
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 7a2f577b153b..2b9f65687dca 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 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,7 +241,6 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKin
         GRAPHIC_PAGE_PROPERTIES
     };
 
-    //
     bool bWithoutBackground = ePageKind != PK_STANDARD && ePageKind != PK_HANDOUT;
     const SvxItemPropertySet* pRet = 0;
     if( bImpress )
@@ -372,9 +371,6 @@ sal_Int64 SAL_CALL SdGenericDrawPage::getSomething( const ::com::sun::star::uno:
         }
 }
 
-/***********************************************************************
-*                                                                      *
-***********************************************************************/
 SdGenericDrawPage::SdGenericDrawPage( SdXImpressDocument* _pModel, SdPage* pInPage, const SvxItemPropertySet* _pSet ) throw()
 :       SvxFmDrawPage( (SdrPage*) pInPage ),
         SdUnoSearchReplaceShape(this),
@@ -995,9 +991,6 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
     GetModel()->SetModified();
 }
 
-/***********************************************************************
-*                                                                      *
-***********************************************************************/
 Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
     throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
@@ -1076,9 +1069,8 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
     }
     case WID_PAGE_LDBITMAP:
         {
-            BOOL bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
             Reference< awt::XBitmap > xBitmap(
-                VCLUnoHelper::CreateBitmap( BitmapEx( SdResId( bHC ? BMP_PAGE_H : BMP_PAGE ) ) ) );
+                VCLUnoHelper::CreateBitmap( BitmapEx( SdResId( BMP_PAGE ) ) ) );
             aAny <<= xBitmap;
         }
         break;
@@ -2003,9 +1995,6 @@ sal_Bool SAL_CALL SdPageLinkTargets::hasByName( const OUString& aName )
     return FindObject( aName ) != NULL;
 }
 
-/***********************************************************************
-*                                                                      *
-***********************************************************************/
 SdrObject* SdPageLinkTargets::FindObject( const String& rName ) const throw()
 {
     SdPage* pPage = mpUnoPage->GetPage();
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index e741f644665c..1e82402d8a1b 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -216,7 +216,7 @@ Outliner::Outliner( SdDrawDocument* pDoc, USHORT nMode )
             Any                     aAny;
 
             aAny = aLinguConfig.GetProperty(
-                rtl::OUString::createFromAscii( UPN_IS_SPELL_AUTO ) );
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_SPELL_AUTO )) );
             aAny >>= bOnlineSpell;
         }
         catch( ... )
diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx
index f565bfccd4df..431a1184f908 100644
--- a/sd/source/ui/view/PresentationViewShellBase.cxx
+++ b/sd/source/ui/view/PresentationViewShellBase.cxx
@@ -98,12 +98,12 @@ PresentationViewShellBase::PresentationViewShellBase (
         if (xFrameSet.is())
         {
             Reference<beans::XPropertySet> xLayouterSet (
-                xFrameSet->getPropertyValue(::rtl::OUString::createFromAscii("LayoutManager")),
+                xFrameSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))),
                 UNO_QUERY);
             if (xLayouterSet.is())
             {
                 xLayouterSet->setPropertyValue(
-                    ::rtl::OUString::createFromAscii("AutomaticToolbars"),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutomaticToolbars")),
                     makeAny(sal_False));
             }
         }
diff --git a/sd/source/ui/view/UpdateLockManager.cxx b/sd/source/ui/view/UpdateLockManager.cxx
index c51e6cc86e24..ea0f40471686 100644
--- a/sd/source/ui/view/UpdateLockManager.cxx
+++ b/sd/source/ui/view/UpdateLockManager.cxx
@@ -407,7 +407,7 @@ Reference< ::com::sun::star::frame::XLayoutManager>
                 try
                 {
                     Any aValue (xFrameProperties->getPropertyValue(
-                        ::rtl::OUString::createFromAscii("LayoutManager")));
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))));
                     aValue >>= xLayoutManager;
                 }
                 catch (const beans::UnknownPropertyException& rException)
diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx
index e7e3e7c53a5a..47958e7806c2 100644
--- a/sd/source/ui/view/ViewClipboard.cxx
+++ b/sd/source/ui/view/ViewClipboard.cxx
@@ -169,7 +169,7 @@ void ViewClipboard::AssignMasterPage (
 
     // We have to remove the layout suffix from the layout name which is
     // appended again by SetMasterPage() to the given name.  Don't ask.
-    String sLayoutSuffix (RTL_CONSTASCII_STRINGPARAM(SD_LT_SEPARATOR));
+    String sLayoutSuffix (RTL_CONSTASCII_USTRINGPARAM(SD_LT_SEPARATOR));
     sLayoutSuffix.Append (SdResId(STR_LAYOUT_OUTLINE));
     USHORT nLength = sLayoutSuffix.Len();
     String sLayoutName (pMasterPage->GetLayoutName());
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 9fdcdff78a0b..6bfa765b1050 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -1330,7 +1330,7 @@ void ViewShellBase::Implementation::ProcessRestoreEditingViewSlot (void)
                 pHelper->GetViewURL(pFrameView->GetViewShellTypeOnLoad()),
                 FrameworkHelper::msCenterPaneURL);
             pHelper->RunOnConfigurationEvent(
-                ::rtl::OUString::createFromAscii("ConfigurationUpdateEnd"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ConfigurationUpdateEnd")),
                 CurrentPageSetter(mrBase));
         }
     }
diff --git a/sd/source/ui/view/clview.cxx b/sd/source/ui/view/clview.cxx
index e7518bc01d71..8f5cf681dad1 100644
--- a/sd/source/ui/view/clview.cxx
+++ b/sd/source/ui/view/clview.cxx
@@ -92,13 +92,6 @@ void ClientView::InvalidateOneWin(::Window& rWin, const Rectangle& rRect)
     CompleteRedraw(&rWin, rRect);
 }
 
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 void ClientView::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector )
 {
     DrawView::CompleteRedraw(pOutDev, rReg, pRedirector);
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 363212fe0c9f..ba41975a4e2f 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -997,24 +997,11 @@ void  DrawViewShell::GetSnapItemState( SfxItemSet &rSet )
     }
 }
 
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 void DrawViewShell::AddWindow (::sd::Window* pWin)
 {
     mpDrawView->AddWindowToPaintView(pWin);
 }
 
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 void DrawViewShell::RemoveWindow(::sd::Window* pWin)
 {
     mpDrawView->DeleteWindowFromPaintView(pWin);
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 79fac4455b18..9339b262308a 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -908,23 +908,11 @@ void DrawViewShell::ShowMousePosInfo(const Rectangle& rRect,
     }
 }
 
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 void DrawViewShell::LockInput()
 {
     mnLockCount++;
 }
 
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 void DrawViewShell::UnlockInput()
 {
     DBG_ASSERT( mnLockCount, "Input for this shell is not locked!" );
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index 6be0ffe52c90..6d41e5c6565d 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -412,12 +412,6 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq )
     }
 }
 
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 void DrawViewShell::GetBmpMaskState( SfxItemSet& rSet )
 {
     const SdrMarkList&  rMarkList = mpDrawView->GetMarkedObjectList();
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index b4919c6e9573..81eb888e616e 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -88,7 +88,7 @@ using namespace ::com::sun::star::uno;
 
 namespace {
 static const ::rtl::OUString MASTER_VIEW_TOOL_BAR_NAME(
-    ::rtl::OUString::createFromAscii("masterviewtoolbar"));
+    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("masterviewtoolbar")));
 }
 
 namespace sd {
@@ -390,7 +390,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
     if( xMgr.is() )
     {
         mxScannerManager = ::com::sun::star::uno::Reference< ::com::sun::star::scanner::XScannerManager >(
-                           xMgr->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.scanner.ScannerManager" ) ),
+                           xMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.scanner.ScannerManager" )) ),
                            ::com::sun::star::uno::UNO_QUERY );
 
         if( mxScannerManager.is() )
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index 3ef394bc9995..8ffa06eb3f5d 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -698,7 +698,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
         {
             try
             {
-                com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString::createFromAscii("com.sun.star.comp.ui.XSLTFilterDialog")), com::sun::star::uno::UNO_QUERY);
+                com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XExecutableDialog > xDialog(::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ui.XSLTFilterDialog"))), com::sun::star::uno::UNO_QUERY);
                 if( xDialog.is() )
                 {
                     xDialog->execute();
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 3f7a86aa5084..b4e97c4ee489 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -1649,12 +1649,6 @@ void DrawViewShell::InsertURLButton(const String& rURL, const String& rText,
     }
 }
 
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 void DrawViewShell::ShowUIControls (bool bVisible)
 {
     ViewShell::ShowUIControls (bVisible);
diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx
index 2e81a007146c..9b33f3b60427 100644
--- a/sd/source/ui/view/drviewsg.cxx
+++ b/sd/source/ui/view/drviewsg.cxx
@@ -57,12 +57,6 @@
 
 namespace sd {
 
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 void DrawViewShell::ExecIMap( SfxRequest& rReq )
 {
     // waehrend einer Diashow wird nichts ausgefuehrt!
@@ -94,13 +88,6 @@ void DrawViewShell::ExecIMap( SfxRequest& rReq )
     }
 }
 
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 void DrawViewShell::GetIMapState( SfxItemSet& rSet )
 {
     BOOL bDisable = TRUE;
diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx
index 0d14f18e9a37..590a5265593c 100644
--- a/sd/source/ui/view/drviewsj.cxx
+++ b/sd/source/ui/view/drviewsj.cxx
@@ -98,8 +98,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
             SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_MEASURE_DLG ) ||
             SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONNECTION_DLG ) ||
             SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONNECTION_NEW_ROUTING ) ||
-//          SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_3D_LATHE ) ||
-//          SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_3D_LATHE_FAST ) ||
             SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_SHEAR ) ||
             SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_1BIT_THRESHOLD ) ||
             SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_1BIT_MATRIX ) ||
@@ -160,12 +158,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
             {
                 rSet.DisableItem(SID_UNGROUP);
             }
-/*
-            if (!pObj->ISA(SdrObjGroup) && !pObj->ISA(SdrGrafObj) && !pObj->ISA(SdrOle2Obj))
-            {
-                rSet.DisableItem( SID_NAME_GROUP );
-            }
-*/
             if (!pObj->ISA(SdrGrafObj) ||
                 ((SdrGrafObj*) pObj)->GetGraphicType() != GRAPHIC_BITMAP ||
                 ((SdrGrafObj*) pObj)->IsLinkedGraphic())
@@ -297,13 +289,8 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
         }
         if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OUTLINE_TEXT_AUTOFIT ) )
         {
-            bool bSet = false;
-            const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
-            if( rMarkList.GetMarkCount() == 1 )
-            {
-                SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
-                bSet = ((const SdrTextFitToSizeTypeItem*)pObj->GetMergedItemSet().GetItem(SDRATTR_TEXT_FITTOSIZE))->GetValue() != SDRTEXTFIT_NONE;
-            }
+            const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
+            const bool bSet = ((const SdrTextFitToSizeTypeItem*)pObj->GetMergedItemSet().GetItem(SDRATTR_TEXT_FITTOSIZE))->GetValue() != SDRTEXTFIT_NONE;
             rSet.Put(SfxBoolItem(SID_OUTLINE_TEXT_AUTOFIT, bSet));
         }
 
@@ -322,8 +309,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
         if(nMarkCount <= 2)
             rSet.DisableItem(SID_DISTRIBUTE_DLG);
 
-//        rSet.ClearItem( SID_BEZIER_EDIT );
-//        rSet.DisableItem( SID_BEZIER_EDIT );
         rSet.DisableItem( SID_LINEEND_POLYGON );
         rSet.DisableItem( SID_ENTER_GROUP );
         // Jetzt (28.10.96) muessen Namen fuer Objekte eindeutig sein
@@ -332,22 +317,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
         rSet.DisableItem( SID_OBJECT_TITLE_DESCRIPTION );
         rSet.DisableItem( SID_MODIFY_FIELD );
 
-        if( 1 )
-//      if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ATTR_FILL_STYLE ) ||
-//          SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_UNGROUP ) ||
-//          SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_MEASURE_DLG ) ||
-//          SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONNECTION_DLG ) ||
-//          SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_COMBINE ) ||
-//            SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_SHEAR ) ||
-//          SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_TEXTATTR_DLG ) ||
-//          SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_3D_LATHE ) ||
-//          SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONVERT_TO_3D_LATHE_FAST ) ||
-//          SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_LEFT ) ||
-//          SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_CENTER ) ||
-//          SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_RIGHT ) ||
-//          SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_UP ) ||
-//          SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_MIDDLE ) ||
-//          SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_ALIGN_DOWN ) )
         {
             BOOL bText = FALSE;
             BOOL bLine = FALSE;
@@ -415,7 +384,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
             */
             if( bLine && !bText && !bDrawObj &&!b3dObj)
             {
-                //rSet.DisableItem( SID_ATTRIBUTES_AREA );
                 rSet.DisableItem( SID_ATTR_FILL_STYLE );
             }
             if( !bEdgeObj )
@@ -509,8 +477,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
     // kein Objekt selektiert
     else
     {
-//        rSet.ClearItem( SID_BEZIER_EDIT );
-
         rSet.DisableItem( SID_ENTER_GROUP );
         rSet.DisableItem( SID_CUT );
         rSet.DisableItem( SID_COPY );
@@ -532,7 +498,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
         rSet.DisableItem( SID_BEHIND_OBJ );
         rSet.DisableItem( SID_CONVERT );
 
-//      rSet.DisableItem( SID_BEZIER_EDIT );
         rSet.DisableItem( SID_SIZE_OPTIMAL );
         rSet.DisableItem( SID_LINEEND_POLYGON );
         rSet.DisableItem( SID_COPYOBJECTS );
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index fab725a31d58..cc06db2a4d8c 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -120,7 +120,6 @@ OutlineView::OutlineView( DrawDocShell* pDocSh, ::Window* pWindow, OutlineViewSh
 , mnPagesProcessed(0)
 , mbFirstPaint(TRUE)
 , mpProgress(NULL)
-, mbHighContrastMode( false )
 , maDocColor( COL_WHITE )
 , mnPageNumberWidthPixel( 0 )
 , maLRSpaceItem( 0, 0, 2000, 0, EE_PARA_OUTLLRSPACE )
@@ -132,37 +131,6 @@ OutlineView::OutlineView( DrawDocShell* pDocSh, ::Window* pWindow, OutlineViewSh
         // Outliner initialisieren: Referenz-Device setzen
         bInitOutliner = TRUE;
         mpOutliner->Init( OUTLINERMODE_OUTLINEVIEW );
-/*
-        SfxStyleSheet* pTitleSheet = mpDoc->GetSdPage( 0, PK_STANDARD )->GetStyleSheetForPresObj( PRESOBJ_TITLE );
-
-        if ( pTitleSheet )
-        {
-            // set title symbol (level 0)
-            SvxNumBulletItem aNumBulletItem( (const SvxNumBulletItem&) pTitleSheet->GetItemSet().Get(EE_PARA_NUMBULLET) );
-            SvxNumRule aNumRule(* aNumBulletItem.GetNumRule());
-            SvxNumberFormat aFormat( aNumRule.GetLevel(0));
-            Font    aBulletFont;
-            const Font* pFont = aFormat.GetBulletFont();
-            if ( pFont )                                        // if available take font size and color from style
-                aBulletFont = *pFont;
-            else
-            {
-                aBulletFont.SetColor( COL_AUTO );
-                aBulletFont.SetHeight( 1552 );
-            }
-            aBulletFont.SetCharSet(RTL_TEXTENCODING_MS_1252);   // and replacing other values by standard
-            aBulletFont.SetName( String( RTL_CONSTASCII_USTRINGPARAM( "StarSymbol" )) );
-            aBulletFont.SetWeight(WEIGHT_NORMAL);
-            aBulletFont.SetUnderline(UNDERLINE_NONE);
-            aBulletFont.SetStrikeout(STRIKEOUT_NONE);
-            aBulletFont.SetItalic(ITALIC_NONE);
-            aBulletFont.SetOutline(FALSE);
-            aBulletFont.SetShadow(FALSE);
-            aFormat.SetBulletFont( &aBulletFont );
-            aFormat.SetBulletChar( 0xE011 );  // StarBats: 0xF000 + 114
-            mpOutliner->OverwriteLevel0Bullet( aFormat );
-        }
-*/
         mpOutliner->SetRefDevice( SD_MOD()->GetRefDevice( *pDocSh ) );
         ULONG nWidth = OUTLINE_PAPERWIDTH;
         mpOutliner->SetPaperSize(Size(nWidth, 400000000));
@@ -213,7 +181,7 @@ OutlineView::OutlineView( DrawDocShell* pDocSh, ::Window* pWindow, OutlineViewSh
     Reference<XFrame> xFrame (mpOutlineViewShell->GetViewShellBase().GetFrame()->GetTopFrame().GetFrameInterface(), UNO_QUERY);
 
     const OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( ".uno:ShowSlide" ));
-    maSlideImage = GetImage( xFrame, aSlotURL, true, false /* todo, hc mode */ );
+    maSlideImage = GetImage( xFrame, aSlotURL, true );
 
     // Tell undo manager of the document about the undo manager of the
     // outliner, so that the former can synchronize with the later.
@@ -303,46 +271,6 @@ void OutlineView::Paint(const Rectangle& rRect, ::sd::Window* pWin)
 
         pOlView->ShowCursor(mbFirstPaint);
 
-/*
-        if( mnPageNumberWidthPixel == 0 )
-            GetPageNumberWidthPixel();
-
-        const ULONG nParaCount = pOlView->GetOutliner()->GetParagraphCount();
-        EditView& rEditView = pOlView->GetEditView();
-
-        Font aOldFont( pWin->GetFont() );
-
-        const String aBulletStr( sal_Unicode( 0xE011 ) );
-        pWin->SetFont( maBulletFont);
-        sal_Int32 nBulletWidth = pWin->GetTextWidth(aBulletStr);
-
-        sal_Int32 nPage = 1;
-        for( ULONG nPara = 0; nPara < nParaCount; nPara++ )
-        {
-            Paragraph* pPara = pOlView->GetOutliner()->GetParagraph( nPara );
-            if( pPara->HasFlag( PARAFLAG_ISPAGE ) )
-            {
-                pWin->SetFont( maPageNumberFont );
-                const String aStr( String::CreateFromInt32( nPage++ ) );
-                Point aPos( rEditView.GetWindowPosTopLeft( (USHORT)nPara ) );
-
-                sal_Int32 nNumberOffset = pWin->PixelToLogic( Point(mnPageNumberWidthPixel, 0) ).X() - nBulletWidth;
-                sal_Int32 nLineHeight = pOlView->GetOutliner()->GetLineHeight( nPara, 0 );
-
-                aPos.X() = nNumberOffset;
-
-                Point aPoint( aPos.X() - pWin->GetTextWidth( aStr ), aPos.Y() + ( nLineHeight - maPageNumberFont.GetHeight()) / 2 );
-                pWin->DrawText( aPoint, aStr );
-
-                aPoint.X() = aPos.X();
-                aPoint.Y() = aPos.Y() +( nLineHeight - maBulletFont.GetHeight()) / 2;
-                pWin->SetFont( maBulletFont );
-                pWin->DrawText( aPoint, aBulletStr );
-            }
-        }
-
-        pWin->SetFont( aOldFont );
-*/
         mbFirstPaint = FALSE;
     }
 }
@@ -970,8 +898,6 @@ IMPL_LINK( OutlineView, StatusEventHdl, EditStatus *, EMPTYARG )
     ::sd::Window*   pWin = mpOutlineViewShell->GetActiveWindow();
     OutlinerView*   pOutlinerView = GetViewByWindow(pWin);
     Rectangle     aVis          = pOutlinerView->GetVisArea();
-
-//    ULONG nWidth = ((SdPage*)mpDoc->GetSdPage(0, PK_STANDARD))->GetSize().Width();
     ULONG nWidth = OUTLINE_PAPERWIDTH;
     Rectangle aText = Rectangle(Point(0,0),
                                    Size(nWidth,
@@ -1682,17 +1608,6 @@ sal_uInt16 OutlineView::GetScriptType() const
 
 void OutlineView::onUpdateStyleSettings( bool bForceUpdate /* = false */ )
 {
-    const bool bHighContrastMode = Application::GetSettings().GetStyleSettings().GetHighContrastMode() != 0;
-    if( bForceUpdate || (mbHighContrastMode != bHighContrastMode) )
-    {
-        if( mpOutliner )
-        {
-            mpOutliner->ForceAutoColor( bHighContrastMode );
-        }
-        mbHighContrastMode = bHighContrastMode;
-
-    }
-
     svtools::ColorConfig aColorConfig;
     const Color aDocColor( aColorConfig.GetColorValue( svtools::DOCCOLOR ).nColor );
     if( bForceUpdate || (maDocColor != aDocColor) )
@@ -1973,14 +1888,10 @@ IMPL_LINK(OutlineView, PaintingFirstLineHdl, PaintFirstLineInfo*, pInfo)
             long nFontHeight = 0;
             if ( !rEditEngine.IsFlatMode() )
             {
-//              const SvxFontHeightItem& rFH = (const SvxFontHeightItem&)rEditEngine.GetParaAttrib( pInfo->mnPara, EE_CHAR_FONTHEIGHT );
-//              nBulletHeight = rFH.GetHeight();
                 nFontHeight = nBulletHeight / 5;
             }
             else
             {
-//              const SvxFontHeightItem& rFH = (const SvxFontHeightItem&)rEditEngine.GetEmptyItemSet().Get( EE_CHAR_FONTHEIGHT );
- //               nBulletHeight = rFH.GetHeight();
                 nFontHeight = (nBulletHeight * 10) / 25;
             }
 
@@ -2007,7 +1918,6 @@ IMPL_LINK(OutlineView, PaintingFirstLineHdl, PaintFirstLineInfo*, pInfo)
             Point aTextPos( aImagePos.X() - aOffset.Width(), pInfo->mrStartPos.Y() );
             Font aNewFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SANS_UNICODE, eLang, 0 ) );
             aNewFont.SetSize( aFontSz );
-//          aNewFont.SetAlign( aBulletFont.GetAlign() );
             aNewFont.SetVertical( bVertical );
             aNewFont.SetOrientation( bVertical ? 2700 : 0 );
             aNewFont.SetColor( COL_AUTO );
@@ -2016,7 +1926,6 @@ IMPL_LINK(OutlineView, PaintingFirstLineHdl, PaintFirstLineInfo*, pInfo)
             Size aTextSz;
             aTextSz.Width() = pInfo->mpOutDev->GetTextWidth( aPageText );
             aTextSz.Height() = pInfo->mpOutDev->GetTextHeight();
-//            long nBulletHeight = !bVertical ? aBulletArea.GetHeight() : aBulletArea.GetWidth();
             if ( !bVertical )
             {
                 aTextPos.Y() += (aOutSize.Height() - aTextSz.Height()) / 2;
diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx
index 41ec7e8e154d..1b63c322678f 100644
--- a/sd/source/ui/view/sdruler.cxx
+++ b/sd/source/ui/view/sdruler.cxx
@@ -63,21 +63,12 @@ class RulerCtrlItem : public SfxControllerItem
     RulerCtrlItem(USHORT nId, Ruler& rRlr, SfxBindings& rBind);
 };
 
-/*************************************************************************
-|*
-\************************************************************************/
-
 RulerCtrlItem::RulerCtrlItem(USHORT _nId, Ruler& rRlr, SfxBindings& rBind)
 : SfxControllerItem(_nId, rBind)
 , rRuler(rRlr)
 {
 }
 
-
-/*************************************************************************
-|*
-\************************************************************************/
-
 void RulerCtrlItem::StateChanged( USHORT nSId, SfxItemState, const SfxPoolItem* pState )
 {
     switch( nSId )
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 1b9b60e9aeec..fe22a81b38f1 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -1011,12 +1011,6 @@ void View::DoConnect(SdrOle2Obj* pObj)
     }
 }
 
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 BOOL View::IsMorphingAllowed() const
 {
     const SdrMarkList&  rMarkList = GetMarkedObjectList();
@@ -1063,12 +1057,6 @@ BOOL View::IsMorphingAllowed() const
     return bRet;
 }
 
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
 BOOL View::IsVectorizeAllowed() const
 {
     const SdrMarkList&  rMarkList = GetMarkedObjectList();
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 779ef01d1562..306529bbf9a6 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -165,30 +165,6 @@ bool View::InsertMetaFile( TransferableDataHelper& rDataHelper, const Point& rPo
     if( !rDataHelper.GetGDIMetaFile( FORMAT_GDIMETAFILE, aMtf ) )
         return false;
 
-/*
-SvFileStream    aSvOutputStream( String( RTL_CONSTASCII_USTRINGPARAM( "/tmp/test.png" ) ), STREAM_WRITE | STREAM_TRUNC );
-Graphic         aMtfGraphic( aMtf );
-Size            aPreviewSizePixel( OutputDevice::LogicToLogic( aMtf.GetPrefSize(), aMtf.GetPrefMapMode(), MAP_PIXEL ) );
-
-if( aPreviewSizePixel.Width() && aPreviewSizePixel.Height() )
-{
-    const double fWH = static_cast< double >( aPreviewSizePixel.Width() ) / static_cast< double >( aPreviewSizePixel.Height() );
-
-    if( fWH <= 1.0 )
-        aPreviewSizePixel.Width() = static_cast< long >( 128.0 * fWH ), aPreviewSizePixel.Height() = 128;
-    else
-        aPreviewSizePixel.Width() = 128, aPreviewSizePixel.Height() = static_cast< long >( 128.0 / fWH );
-
-    if( GraphicConverter::Export( aSvOutputStream, aMtfGraphic.GetBitmapEx( &aPreviewSizePixel ), CVT_PNG ) )
-    {
-        // handle errror case here
-    }
-    else
-    {
-        // Success
-    }
-}
-*/
     bool bVector = false;
     Graphic aGraphic;
 
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index c649f4d958a6..9f63b00c162e 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -396,7 +396,7 @@ IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG )
             if( !pGraphicFilter->ImportGraphic( aGraphic, aURL ) )
             {
                 sal_Int8    nTempAction = ( aIter == maDropFileVector.begin() ) ? mnAction : 0;
-                SdrGrafObj* pGrafObj = InsertGraphic( aGraphic, nTempAction, maDropPos, NULL, NULL );
+                InsertGraphic( aGraphic, nTempAction, maDropPos, NULL, NULL );
 
                 // return action from first inserted graphic
                 if( aIter == maDropFileVector.begin() )
diff --git a/sd/source/ui/view/sdview5.cxx b/sd/source/ui/view/sdview5.cxx
index 2cc5ccad7c4b..a3c48e6c6a13 100644
--- a/sd/source/ui/view/sdview5.cxx
+++ b/sd/source/ui/view/sdview5.cxx
@@ -97,7 +97,7 @@ SdrObject* View::GetEmptyPresentationObject( PresObjKind eKind )
             {
                 const std::list< SdrObject* >& rShapes = pPage->GetPresentationShapeList().getList();
 
-                for( std::list< SdrObject* >::const_iterator iter( rShapes.begin() ); iter != rShapes.end(); iter++ )
+                for( std::list< SdrObject* >::const_iterator iter( rShapes.begin() ); iter != rShapes.end(); ++iter )
                 {
                     if( (*iter)->IsEmptyPresObj() && implIsMultiPresObj(pPage->GetPresObjKind(*iter)) )
                     {
diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx
index 24e63ed5c8da..3c4fabb2c6ca 100644
--- a/sd/source/ui/view/tabcontr.cxx
+++ b/sd/source/ui/view/tabcontr.cxx
@@ -116,10 +116,6 @@ TabControl::~TabControl()
 {
 }
 
-/*************************************************************************
-|*
-\************************************************************************/
-
 void TabControl::Select()
 {
     SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher();
@@ -127,10 +123,6 @@ void TabControl::Select()
                             SFX_CALLMODE_RECORD);
 }
 
-/*************************************************************************
-|*
-\************************************************************************/
-
 void  TabControl::MouseButtonDown(const MouseEvent& rMEvt)
 {
     if (rMEvt.IsLeft()
@@ -177,10 +169,6 @@ void  TabControl::MouseButtonDown(const MouseEvent& rMEvt)
     TabBar::MouseButtonDown(rMEvt);
 }
 
-/*************************************************************************
-|*
-\************************************************************************/
-
 void TabControl::DoubleClick()
 {
     if (GetCurPageId() != 0)
@@ -343,10 +331,6 @@ sal_Int8 TabControl::ExecuteDrop( const ExecuteDropEvent& rEvt )
     return nRet;
 }
 
-/*************************************************************************
-|*
-\************************************************************************/
-
 void TabControl::Command(const CommandEvent& rCEvt)
 {
     USHORT nCmd = rCEvt.GetCommand();
@@ -361,10 +345,6 @@ void TabControl::Command(const CommandEvent& rCEvt)
     }
 }
 
-/*************************************************************************
-|*
-\************************************************************************/
-
 long TabControl::StartRenaming()
 {
     BOOL bOK = FALSE;
@@ -382,10 +362,6 @@ long TabControl::StartRenaming()
     return( bOK );
 }
 
-/*************************************************************************
-|*
-\************************************************************************/
-
 long TabControl::AllowRenaming()
 {
     BOOL bOK = TRUE;
@@ -409,21 +385,12 @@ long TabControl::AllowRenaming()
     return( bOK );
 }
 
-/*************************************************************************
-|*
-\************************************************************************/
-
 void TabControl::EndRenaming()
 {
     if( !IsEditModeCanceled() )
         pDrViewSh->RenameSlide( GetEditPageId(), GetEditText() );
 }
 
-
-/*************************************************************************
-|*
-\************************************************************************/
-
 void TabControl::ActivatePage()
 {
     if ( /*IsInSwitching && */ pDrViewSh->IsSwitchPageAllowed() )
@@ -434,11 +401,6 @@ void TabControl::ActivatePage()
     }
 }
 
-
-/*************************************************************************
-|*
-\************************************************************************/
-
 long TabControl::DeactivatePage()
 {
     return pDrViewSh->IsSwitchPageAllowed();
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index fd71c28483c9..58e460f40bdf 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -325,6 +325,7 @@
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ShowLicense"/>
       <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ShowCredits"/>
       <menu:menuitem menu:id=".uno:About"/>
     </menu:menupopup>
   </menu:menu>
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index 389a91828cd7..4ae1665b3b2f 100755
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -299,6 +299,7 @@
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:ShowLicense"/>
             <menu:menuseparator/>
+            <menu:menuitem menu:id=".uno:ShowCredits"/>
             <menu:menuitem menu:id=".uno:About"/>
         </menu:menupopup>
     </menu:menu>
diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk
index 7c2573dbbc39..b0140f45417a 100755
--- a/sd/util/makefile.mk
+++ b/sd/util/makefile.mk
@@ -80,6 +80,8 @@ SHL1STDLIBS+= \
     $(UNOTOOLSLIB) \
     $(TOOLSLIB) \
     $(I18NISOLANGLIB) \
+    $(OOXLIB) \
+    $(SAXLIB) \
     $(COMPHELPERLIB) \
     $(UCBHELPERLIB) \
     $(CPPUHELPERLIB) \
@@ -250,7 +252,9 @@ DEF5NAME=$(SHL5TARGET)
 SHL5STDLIBS = $(ISDLIB) \
               $(EDITENGLIB)       \
               $(SVXCORELIB)       \
-              $(MSFILTERLIB)   \
+              $(MSFILTERLIB)      \
+              $(OOXLIB)           \
+              $(SAXLIB)           \
               $(SFX2LIB)          \
               $(SVTOOLLIB)        \
               $(SOTLIB)           \
diff --git a/sd/util/sdfilt.map b/sd/util/sdfilt.map
index e38cc1e8c597..0d926cde67db 100644
--- a/sd/util/sdfilt.map
+++ b/sd/util/sdfilt.map
@@ -3,6 +3,9 @@ UDK_3_0_0 {
                 ExportPPT;
                 ImportPPT;
                 SaveVBA;
+                component_getImplementationEnvironment;
+                component_writeInfo;
+                component_getFactory;
         local:
                 *;
 };
diff --git a/sdext/source/minimizer/description.xml b/sdext/source/minimizer/description.xml
index 455c92a8a392..f10e8c21efa8 100755
--- a/sdext/source/minimizer/description.xml
+++ b/sdext/source/minimizer/description.xml
@@ -11,7 +11,7 @@
         <OpenOffice.org-minimal-version value="2.3" dep:name="OpenOffice.org 2.3"/>
     </dependencies>
 
-    <version value="1.0.2"/>
+    <version value="1.0.3"/>
 
     <platform value="UPDATED_SUPPORTED_PLATFORM"/>
 
@@ -25,7 +25,6 @@
 
     <icon>
       <default xlink:href="bitmaps/extension_32.png" />
-      <high-contrast xlink:href="bitmaps/extension_32_h.png" />
     </icon>
 
 </description>
diff --git a/sdext/source/minimizer/makefile.mk b/sdext/source/minimizer/makefile.mk
index 969a0cb1f248..152f0b0102e9 100755
--- a/sdext/source/minimizer/makefile.mk
+++ b/sdext/source/minimizer/makefile.mk
@@ -98,14 +98,10 @@ COMPONENT_LIBRARIES= \
 COMPONENT_BITMAPS= \
     $(EXTENSIONDIR)$/bitmaps$/opt_16.png \
     $(EXTENSIONDIR)$/bitmaps$/opt_26.png \
-    $(EXTENSIONDIR)$/bitmaps$/opt_16_h.png \
-    $(EXTENSIONDIR)$/bitmaps$/opt_26_h.png \
-    $(EXTENSIONDIR)$/bitmaps$/minimizepresi_80.png \
-    $(EXTENSIONDIR)$/bitmaps$/minimizepresi_80_h.png
+    $(EXTENSIONDIR)$/bitmaps$/minimizepresi_80.png
 
 COMPONENT_IMAGES=\
-    $(EXTENSIONDIR)$/bitmaps$/extension_32.png \
-    $(EXTENSIONDIR)$/bitmaps$/extension_32_h.png
+    $(EXTENSIONDIR)$/bitmaps$/extension_32.png
 
 # rather freestyle or common to all?
 COMPONENT_HELP= \
diff --git a/sdext/source/pdfimport/config/description.xml b/sdext/source/pdfimport/config/description.xml
index 0b4031a5a63f..a83191a58043 100755
--- a/sdext/source/pdfimport/config/description.xml
+++ b/sdext/source/pdfimport/config/description.xml
@@ -24,7 +24,6 @@
 
     <icon>
       <default xlink:href="images/extension_32.png" />
-      <high-contrast xlink:href="images/extension_32_h.png" />
     </icon>
 
 </description>
diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk
index 8a7f7de20e18..2a9697f50d3d 100755
--- a/sdext/source/pdfimport/makefile.mk
+++ b/sdext/source/pdfimport/makefile.mk
@@ -125,8 +125,7 @@ COMPONENT_LIBRARIES= \
     $(EXTENSIONDIR)$/$(SHL1TARGET)$(DLLPOST)
 
 COMPONENT_IMAGES=\
-    $(EXTENSIONDIR)$/images$/extension_32.png \
-    $(EXTENSIONDIR)$/images$/extension_32_h.png
+    $(EXTENSIONDIR)$/images$/extension_32.png
 
 EXTENSION_PACKDEPS=$(CONVERTER_FILE) $(COMPONENT_DIALOGS) $(COMPONENT_HELP) $(COMPONENT_IMAGES) makefile.mk
 
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index bc24000025c2..d23232d5ca79 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -98,7 +98,7 @@ void DrawXmlEmitter::visit( HyperlinkElement& elem, const std::list< Element* >:
     while( this_it !=elem.Children.end() && *this_it != &elem )
     {
         (*this_it)->visitedBy( *this, this_it );
-        this_it++;
+        ++this_it;
     }
     m_rEmitContext.rEmitter.endTag( pType );
 }
@@ -120,15 +120,6 @@ void DrawXmlEmitter::visit( TextElement& elem, const std::list< Element* >::cons
 
     rtl::OUString str(elem.Text.getStr());
 
-    // Check for CTL
-    bool isComplex = false;
-    for(int i=0; i< elem.Text.getLength(); i++)
-    {
-    sal_Int16 nType = GetBreakIterator()->getScriptType( str, i + 1);
-    if (nType == ::com::sun::star::i18n::ScriptType::COMPLEX)
-        isComplex = true;
-    }
-
     m_rEmitContext.rEmitter.beginTag( "text:span", aProps );
 
     for(int i=0; i< elem.Text.getLength(); i++)
@@ -158,7 +149,7 @@ void DrawXmlEmitter::visit( TextElement& elem, const std::list< Element* >::cons
     while( this_it !=elem.Children.end() && *this_it != &elem )
     {
         (*this_it)->visitedBy( *this, this_it );
-        this_it++;
+        ++this_it;
     }
 
     m_rEmitContext.rEmitter.endTag( "text:span" );
@@ -180,7 +171,7 @@ void DrawXmlEmitter::visit( ParagraphElement& elem, const std::list< Element* >:
     while( this_it !=elem.Children.end() && *this_it != &elem )
     {
         (*this_it)->visitedBy( *this, this_it );
-        this_it++;
+        ++this_it;
     }
 
     m_rEmitContext.rEmitter.endTag( pTagType );
@@ -265,7 +256,7 @@ void DrawXmlEmitter::visit( FrameElement& elem, const std::list< Element* >::con
     while( this_it !=elem.Children.end() && *this_it != &elem )
     {
         (*this_it)->visitedBy( *this, this_it );
-        this_it++;
+        ++this_it;
     }
 
     if( bTextBox )
@@ -363,7 +354,7 @@ void DrawXmlEmitter::visit( PageElement& elem, const std::list< Element* >::cons
     while( this_it !=elem.Children.end() && *this_it != &elem )
     {
         (*this_it)->visitedBy( *this, this_it );
-        this_it++;
+        ++this_it;
     }
 
     m_rEmitContext.rEmitter.endTag("draw:page");
@@ -379,7 +370,7 @@ void DrawXmlEmitter::visit( DocumentElement& elem, const std::list< Element* >::
     while( this_it !=elem.Children.end() && *this_it != &elem )
     {
         (*this_it)->visitedBy( *this, this_it );
-        this_it++;
+        ++this_it;
     }
 
     m_rEmitContext.rEmitter.endTag( m_bWriteDrawDocument ? "office:drawing" : "office:presentation" );
@@ -687,14 +678,7 @@ void DrawXmlOptimizer::optimizeTextElements(Element& rParent)
     // concatenate child elements with same font id
     std::list< Element* >::iterator next = rParent.Children.begin();
     std::list< Element* >::iterator it = next++;
-    FrameElement* pFrame = dynamic_cast<FrameElement*>(rParent.Parent);
-    bool bRotatedFrame = false;
-    if( pFrame )
-    {
-        const GraphicsContext& rFrameGC = m_rProcessor.getGraphicsContext( pFrame->GCId );
-        if( rFrameGC.isRotatedOrSkewed() )
-            bRotatedFrame = true;
-    }
+
     while( next != rParent.Children.end() )
     {
         bool bConcat = false;
@@ -907,26 +891,6 @@ void DrawXmlFinalizer::visit( ParagraphElement& elem, const std::list< Element*
 
     elem.StyleId = m_rStyleContainer.getStyleId( aStyle );
 
-    // update page boundaries
-    if( elem.Parent )
-    {
-        // check for center alignement
-        // criterion: paragraph is small relative to parent and distributed around its center
-        double p_x = elem.Parent->x;
-        double p_y = elem.Parent->y;
-        double p_w = elem.Parent->w;
-        double p_h = elem.Parent->h;
-
-        PageElement* pPage = dynamic_cast<PageElement*>(elem.Parent);
-        if( pPage )
-        {
-            p_x += pPage->LeftMargin;
-            p_y += pPage->TopMargin;
-            p_w -= pPage->LeftMargin+pPage->RightMargin;
-            p_h -= pPage->TopMargin+pPage->BottomMargin;
-        }
-    }
-
     elem.applyToChildren(*this);
 }
 
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
index 16d60cd5a8bf..a42e8704178f 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
@@ -261,15 +261,17 @@ namespace pdfi
             void  setGraphicsContext (GraphicsContext&  rCurrentContext ){ m_rCurrentContext= rCurrentContext; }
             void  setCurElement( Element* pCurElement ){ m_pCurElement= pCurElement; }
 
-            double getYPrevGlyphPosition(){ return m_fYPrevGlyphPosition; }
-            double getXPrevGlyphPosition(){ return m_fXPrevGlyphPosition; }
-            double getPrevGlyphHeight(){ return m_fPrevGlyphHeight; }
-            double getPrevGlyphWidth (){ return m_fPrevGlyphWidth; }
-            double getPrevGlyphsSpace() { if( (m_rRect.X1-m_fXPrevGlyphPosition)<0 )
-                                                return 0;
-                                           else
-                                            return m_rRect.X1-m_fXPrevGlyphPosition;
-                                         }
+            double getYPrevGlyphPosition() const { return m_fYPrevGlyphPosition; }
+            double getXPrevGlyphPosition() const { return m_fXPrevGlyphPosition; }
+            double getPrevGlyphHeight() const { return m_fPrevGlyphHeight; }
+            double getPrevGlyphWidth () const { return m_fPrevGlyphWidth; }
+            double getPrevGlyphsSpace() const
+            {
+                if( (m_rRect.X1-m_fXPrevGlyphPosition)<0 )
+                    return 0;
+                else
+                    return m_rRect.X1-m_fXPrevGlyphPosition;
+            }
 
             void setYPrevGlyphPosition( double fYPrevTextPosition ){ m_fYPrevGlyphPosition= fYPrevTextPosition; }
             void setXPrevGlyphPosition( double fXPrevTextPosition ){ m_fXPrevGlyphPosition= fXPrevTextPosition; }
diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
index a28a676bcf79..fd44fba4b016 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
@@ -131,7 +131,7 @@ sal_uInt32 PngHelper::deflateBuffer( const Output_t* i_pBuf, size_t i_nLen, Outp
 
 void PngHelper::appendFileHeader( OutputBuffer& o_rOutputBuf )
 {
-    static const Output_t aHeader[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a };
+    static const unsigned char aHeader[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a };
 
     o_rOutputBuf.insert( o_rOutputBuf.end(), aHeader, aHeader + SAL_N_ELEMENTS(aHeader) );
 }
diff --git a/sdext/source/presenter/PresenterClock.cxx b/sdext/source/presenter/PresenterClock.cxx
index d220941843b4..43c7d037d000 100644
--- a/sdext/source/presenter/PresenterClock.cxx
+++ b/sdext/source/presenter/PresenterClock.cxx
@@ -350,7 +350,6 @@ void PresenterClock::LateInit (void)
 
 void SAL_CALL PresenterClock::disposing (void)
 {
-    //    osl::MutexGuard aGuard (m_aMutex);
     if (mpTimer != NULL)
     {
         mpTimer->Stop();
@@ -398,9 +397,6 @@ void PresenterClock::UpdateTime (void)
 void SAL_CALL PresenterClock::disposing (const lang::EventObject& rEventObject)
     throw (RuntimeException)
 {
-    //    ::osl::MutexGuard aSolarGuard (::osl::Mutex::getGlobalMutex());
-    //    osl::MutexGuard aGuard (m_aMutex);
-
     if (rEventObject.Source == mxWindow)
     {
         mxWindow = NULL;
@@ -417,9 +413,7 @@ void SAL_CALL PresenterClock::disposing (const lang::EventObject& rEventObject)
 void SAL_CALL PresenterClock::windowPaint (const awt::PaintEvent& rEvent)
     throw (RuntimeException)
 {
-    (void)rEvent;
     ThrowIfDisposed();
-    ::osl::MutexGuard aSolarGuard (::osl::Mutex::getGlobalMutex());
     Paint(rEvent.UpdateRect);
 }
 
@@ -472,7 +466,6 @@ void SAL_CALL PresenterClock::windowHidden (const lang::EventObject& rEvent)
 void SAL_CALL PresenterClock::mousePressed (const css::awt::MouseEvent& rEvent)
     throw (css::uno::RuntimeException)
 {
-    (void)rEvent;
     if (rEvent.Buttons == awt::MouseButton::LEFT)
     {
         SetMode(mnMode+1);
diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx
index 8841d8234bd4..f4a5618353c9 100644
--- a/sdext/source/presenter/PresenterTimer.cxx
+++ b/sdext/source/presenter/PresenterTimer.cxx
@@ -68,7 +68,7 @@ typedef ::boost::shared_ptr<TimerTask> SharedTimerTask;
 class TimerTaskComparator
 {
 public:
-    bool operator() (const SharedTimerTask& rpTask1, const SharedTimerTask& rpTask2)
+    bool operator() (const SharedTimerTask& rpTask1, const SharedTimerTask& rpTask2) const
     {
         return rpTask1->maDueTime.Seconds < rpTask2->maDueTime.Seconds
             || (rpTask1->maDueTime.Seconds == rpTask2->maDueTime.Seconds
diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml
index cbe292c04152..85393f76e9ff 100755
--- a/sdext/source/presenter/description.xml
+++ b/sdext/source/presenter/description.xml
@@ -8,7 +8,7 @@
   <identifier value="com.sun.PresenterScreen-UPDATED_PLATFORM" />
 
   <dependencies>
-    <OpenOffice.org-minimal-version value="3.2" dep:name="OpenOffice.org 3.2"/>
+    <OpenOffice.org-minimal-version value="3.3" dep:name="OpenOffice.org 3.3"/>
   </dependencies>
 
   <version value="1.1.0" />
@@ -25,7 +25,6 @@
 
   <icon>
     <default xlink:href="bitmaps/extension_32.png" />
-    <high-contrast xlink:href="bitmaps/extension_32_h.png" />
   </icon>
 
 </description>
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index 818ecd1014c8..501c99e8fd74 100755
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -42,14 +42,14 @@ MAXLINELENGTH:=100000
 
 PACKAGE=com.sun.PresenterScreen-$(PLATFORMID)
 
-.IF "$(L10N_framework)"==""
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
 .IF "$(ENABLE_PRESENTER_SCREEN)" == "NO"
 @all:
     @echo "Presenter Screen build disabled."
 .ELSE
 
+.IF "$(L10N_framework)"==""
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
 DLLPRE=
 common_build_zip=
 
@@ -239,8 +239,7 @@ COMPONENT_BITMAPS=												\
     $(ZIP1DIR)$/bitmaps$/LabelMouseOverRight.png
 
 COMPONENT_IMAGES=\
-    $(ZIP1DIR)$/bitmaps$/extension_32.png \
-    $(ZIP1DIR)$/bitmaps$/extension_32_h.png
+    $(ZIP1DIR)$/bitmaps$/extension_32.png
 
 COMPONENT_MANIFEST= 							\
     $(ZIP1DIR)$/META-INF$/manifest.xml
@@ -379,10 +378,9 @@ $(DESCRIPTION) $(PHONYDESC) : $$(@:f)
     $(TYPE) $(DESCRIPTION_TMP) | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
     @@-$(RM) $(DESCRIPTION_TMP)
 
-
-.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"
 .ELSE
 ivo:
     $(ECHO)
 .ENDIF # L10N_framework
 
+.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"
diff --git a/set_soenv.in b/set_soenv.in
index dbaada48110f..09648f88a3e3 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1,8 +1,6 @@
 #!@PERL@ -w
 #
 # Program:     set_soenv.in
-# Version:     $Revision: 1.201 $
-# Date:        $Date: 2008-09-05 14:14:29 $
 # Author:      Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems, Ireland.
 #
 #---------------------------------------------------------------------------
@@ -38,12 +36,12 @@ use File::Basename;
 # IIa. Declaring variables for the system commands, etc.
 #--------------------------------------------------------
 #
-my ( $outfile, $outfile_sh, $bootfile, $newline, $comment,
-     $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps,
-     $wps, $cur_dir, $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $MINGW,
+my ( $outfile, $bootfile, $newline, $comment,
+     $compiler, $ds, $ps,
+     $wps, $cur_dir, $par_dir, $I, $L, $tmp, $MINGW,
      $USE_MINGW, $platform,
      $cygwinver, $empty, $no_ant, $no_stl, $no_gcc_include,
-     $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $unsetvarsbat, $exportvars, $win_format_var, $perl_os, @mingw_lib_include_paths, $mingw_lib_include_path);
+     $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $exportvars, $win_format_var, $perl_os, @mingw_lib_include_paths, $mingw_lib_include_path);
 #
 #-------------------------------------------------
 # IIb. Declaring environment values (constants).
@@ -56,7 +54,7 @@ my ( $CALL_CDECL, $COMMON_OUTDIR, $BMP_WRITES_FLAG,
      $SOLAR_PLUGIN, $UPDATER, $BUILD_DELIVER, $VCL,
      $CC, $CXX,
      $BUILD_SOSL, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC,
-     $BUILD_SOSL_RELEASE, $RSC_ONCE );
+     $BUILD_SOSL_RELEASE);
 #
 # Platform dependent constant values.
 my ( $BIG_SVX, $COM, $ARCH, $CPU, $CPUNAME, $CVER, $GLIBC, $GUI, $GUIBASE,
@@ -74,7 +72,7 @@ my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV
      $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE,
      $SOLARENVINC, $USR_DT, $USR_OPENWIN, $XLIB, $XINC,
      $CYGWIN_PATH, $language, $dict, $ASM_PATH, $NSIS_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB,
-     $STLPORT_stlport, $STLPORT_inc_stlport, $PERL_PATH );
+     $STLPORT_stlport, $STLPORT_inc_stlport, $PERL_PATH, $CL_X64 );
 
 # Environment variables.
 my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
@@ -90,7 +88,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
      $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
      $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD,
 	 $PROEXT, $TARFILE_LOCATION,
-     $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS);
+     $PYTHON, $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS);
 #
 #-------------------------------------------
 # IId. Declaring the aliases.
@@ -110,10 +108,6 @@ chomp( $platform );
 
 $UPD            = '@UPD@';          # the project's UPD
 $newline        = "\n";             # Perl newline character
-$unsetenv       = "unsetenv";       # c-shell command
-$setenv         = "setenv";         # c-shell command
-$unset          = "unset";          # msdos batch file command
-$set            = "set";            # msdos batch file command
 $ds             = "/";              # directory separator
 $ps             = ":";              # path separator
 $wps            = ":";              # path separator, will be set to ';' for windows later.
@@ -121,13 +115,15 @@ $cur_dir        = ".";              # current directory
 $par_dir        = "..";             # parrent directory
 $I              = " -I";            # include search path
 $L              = " -L";            # library search path
-$D              = " -D";            # define search path
 $empty          = "";               # used as argument
 $no_stl         = "NO_STLPORT4";    # possible argument
 $warnfile       = "warn";           # logfile configure warnings.
 $Warning        = "";               # container for warning messages
 $STLPORT4       = '@STLPORT4@';     # Location of STLport4
 $SYSTEM_PYTHON	= '@SYSTEM_PYTHON@';
+if ($SYSTEM_PYTHON eq "NO") {
+    $PYTHON              = "python";
+}
 $SYSTEM_MOZILLA = '@SYSTEM_MOZILLA@';
 $JDK 		= '@JDK@';
 $JAVAFLAGS 		= '@JAVAFLAGS@';
@@ -145,6 +141,7 @@ $FLIPCMD        = "";               # Flip '/' to '\' wrapper (only for winnt)
 $GLIBC          = "";               # Whether the platform uses glibc
 $PROEXT         = "@PROEXT@";
 $EPM_FLAGS	= "";
+$CL_X64 = '@CL_X64@';
 
 #
 #--------------------------------------------------------------------
@@ -177,11 +174,9 @@ chomp( $oldPATH );                  # cut off new line
 # C. Setting the constant values.
 #
 # Setting platform independent constant values.
-print "Setting platform independent values... ";
 # NB: Language options now set at 'ToFile' stage.
 $BMP_WRITES_FLAG      = "TRUE";
 $BUILD_SOSL_RELEASE   = "TRUE";
-$RSC_ONCE             = "TRUE";
 $CALL_CDECL           = "TRUE";
 $COMMON_OUTDIR        = "";
 $common_build         = "";
@@ -205,10 +200,10 @@ if ( $platform =~ m/solaris/ )
    if ($platform =~ m/^i[3456]86/)
    {
       if ( $CC =~ "gcc") {
-         $outfile        = "SolarisX86GccEnv.Set";
+         $outfile        = "SolarisX86GccEnv.Set.sh";
          $OUTPATH        = "unxsogi";
       } else {
-         $outfile        = "SolarisX86Env.Set";
+         $outfile        = "SolarisX86Env.Set.sh";
          $OUTPATH        = "unxsoli4";
       }
       $CPU            = "I";
@@ -221,10 +216,10 @@ if ( $platform =~ m/solaris/ )
    else
    {
       if ( $CC =~ "gcc") {
-         $outfile        = "SolarisSparcGccEnv.Set";
+         $outfile        = "SolarisSparcGccEnv.Set.sh";
          $OUTPATH        = "unxsogs";
       } else {
-         $outfile        = "SolarisSparcEnv.Set";
+         $outfile        = "SolarisSparcEnv.Set.sh";
          $OUTPATH        = "unxsols4";
       }
       $CPU            = "S";
@@ -256,7 +251,7 @@ elsif ( $platform =~ m/netbsd/ )
 #Set platform specific values:
    if ($platform =~ m/^i[3456]86/)
    {  print "Setting NetBSD x86 specific values... ";
-      $outfile        = "NetBSDX86Env.Set";
+      $outfile        = "NetBSDX86Env.Set.sh";
       $CPU            = "I";
       $CPUNAME        = "INTEL";
       $OUTPATH        = "unxbsdi";
@@ -266,7 +261,7 @@ elsif ( $platform =~ m/netbsd/ )
    }
    elsif ($platform =~ m/^sparc/)
    {  print "Setting NetBSD Sparc specific values... ";
-      $outfile        = "NetBSDSparcEnv.Set";
+      $outfile        = "NetBSDSparcEnv.Set.sh";
       $CPU            = "S";
       $CPUNAME        = "SPARC";
       $OUTPATH        = "unxbsds";
@@ -276,7 +271,7 @@ elsif ( $platform =~ m/netbsd/ )
    }
    elsif ($platform =~ m/powerpc/)
    {  print "Setting NetBSD PPC specific values... ";
-      $outfile        = "NetBSDPPCEnv.Set";
+      $outfile        = "NetBSDPPCEnv.Set.sh";
       $CPU            = "P";
       $CPUNAME        = "POWERPC";
       $OUTPATH        = "unxbsdppc";
@@ -319,7 +314,7 @@ elsif ( $platform =~ m/kfreebsd/ )
 #Set platform specific values:
    if ($platform =~ m/^i[3456]86/)
    {  print "Setting GNU/kFreeBSD x86 specific values... ";
-      $outfile        = "GNUkFreeBSDX86Env.Set";
+      $outfile        = "GNUkFreeBSDX86Env.Set.sh";
       $CPU            = "I";
       $CPUNAME        = "INTEL";
       $OUTPATH        = "unxkfgi6";
@@ -331,7 +326,7 @@ elsif ( $platform =~ m/kfreebsd/ )
    }
    elsif ($platform =~ m/^x86_64/)
    {  print "Setting GNU/kFreeBSD x86-64 specific values... ";
-      $outfile        = "GNUkFreeBSDX86-64Env.Set";
+      $outfile        = "GNUkFreeBSDX86-64Env.Set.sh";
       $CPU            = "X";
       $CPUNAME        = "X86_64";
       $OUTPATH        = "unxkfgx6";
@@ -357,7 +352,7 @@ elsif ( $platform =~ m/freebsd/ )
    if ($platform =~ m/^amd64/)
    {  my ( $JAVA_OS );
       print "Setting FreeBSD AMD64 specific values... ";
-      $outfile        = "FreeBSDAMDEnv.Set";
+      $outfile        = "FreeBSDAMDEnv.Set.sh";
       $CPU            = "X";
       $CPUNAME        = "X86_64";
       $OUTPATH        = "unxfbsdx";
@@ -376,7 +371,7 @@ elsif ( $platform =~ m/freebsd/ )
    }
    elsif ($platform =~ m/^i386/)
    {  print "Setting FreeBSD x86 specific values... ";
-      $outfile        = "FreeBSDX86Env.Set";
+      $outfile        = "FreeBSDX86Env.Set.sh";
       $CPU            = "I";
       $CPUNAME        = "INTEL";
       $OUTPATH        = "unxfbsdi";
@@ -405,7 +400,7 @@ elsif ( $platform =~ m/openbsd/ )
       $PATH_SEPERATOR = $ps;
       $OSVERSION      = '@OSVERSION@';
       $OUTPATH        = "unxobsd";
-      $outfile        = "OpenBSDEnv.Set";
+      $outfile        = "OpenBSDEnv.Set.sh";
    if ($platform =~ m/^amd64/)
    {
       print "Setting OpenBSD AMD64 specific values... ";
@@ -449,7 +444,7 @@ elsif ( $platform =~ m/linux/ )
 #Set platform specific values:
    if ($platform =~ m/^i[3456]86/)
    {  print "Setting Linux x86 specific values... ";
-      $outfile        = "LinuxX86Env.Set";
+      $outfile        = "LinuxX86Env.Set.sh";
       $CPU            = "I";
       $CPUNAME        = "INTEL";
 
@@ -474,7 +469,7 @@ elsif ( $platform =~ m/linux/ )
    }
    elsif ($platform =~ m/^x86_64/)
    {  print "Setting Linux x86-64 specific values... ";
-      $outfile        = "LinuxX86-64Env.Set";
+      $outfile        = "LinuxX86-64Env.Set.sh";
       $CPU            = "X";
       $CPUNAME        = "X86_64";
       $OUTPATH        = "unxlngx6";
@@ -486,7 +481,7 @@ elsif ( $platform =~ m/linux/ )
    }
    elsif ($platform =~ m/^ia64/)
    {  print "Setting Linux ia64 specific values... ";
-      $outfile        = "LinuxIA64Env.Set";
+      $outfile        = "LinuxIA64Env.Set.sh";
       $CPU            = "A";
       $CPUNAME        = "IA64";
       $OUTPATH        = "unxlnga";
@@ -497,7 +492,7 @@ elsif ( $platform =~ m/linux/ )
    elsif ($platform =~ m/^sparc/)
 
    {  print "Setting Linux Sparc specific values... ";
-      $outfile        = "LinuxSparcEnv.Set";
+      $outfile        = "LinuxSparcEnv.Set.sh";
       $CPU            = "S";
       $CPUNAME        = "SPARC";
       $OUTPATH        = "unxlngs";
@@ -509,7 +504,7 @@ elsif ( $platform =~ m/linux/ )
    {
       if (($platform =~ m/^powerpc64/) && ('@SIZEOF_LONG@' eq '8')) {
          print "Setting Linux PPC64 specific values... ";
-         $outfile = "LinuxPPC64Env.Set";
+         $outfile = "LinuxPPC64Env.Set.sh";
          $OUTPATH = "unxlngppc64";
          $CPUNAME = "POWERPC64";
 
@@ -521,7 +516,7 @@ elsif ( $platform =~ m/linux/ )
       }
       else {
          print "Setting Linux PPC specific values... ";
-         $outfile = "LinuxPPCEnv.Set";
+         $outfile = "LinuxPPCEnv.Set.sh";
          $OUTPATH = "unxlngppc";
          $CPUNAME = "POWERPC";
 
@@ -549,14 +544,14 @@ elsif ( $platform =~ m/linux/ )
    {
       if (($platform =~ m/^s390x/) && ('@SIZEOF_LONG@' eq '8')) {
          print "Setting Linux zSeries specific values... ";
-         $outfile        = "LinuxS390XEnv.Set";
+         $outfile        = "LinuxS390XEnv.Set.sh";
          $CPUNAME        = "S390X";
 	 $ARCH           = "s390x";
          $OUTPATH        = "unxlngs390x";
       }
       else {
          print "Setting Linux S/390 specific values... ";
-         $outfile        = "LinuxS390Env.Set";
+         $outfile        = "LinuxS390Env.Set.sh";
          $CPUNAME        = "S390";
 	 $ARCH           = "s390";
          $OUTPATH        = "unxlngs390";
@@ -568,7 +563,7 @@ elsif ( $platform =~ m/linux/ )
    }
    elsif ($platform =~ m/^m68k/)
    {  print "Setting Linux m68k specific values... ";
-      $outfile        = "LinuxM68KEnv.Set";
+      $outfile        = "LinuxM68KEnv.Set.sh";
       $CPU            = "6";
       $CPUNAME        = "M68K";
       $OUTPATH        = "unxlngm68k";
@@ -578,7 +573,7 @@ elsif ( $platform =~ m/linux/ )
    }
    elsif ($platform =~ m/^hppa/)
    {  print "Setting Linux hppa specific values... ";
-      $outfile        = "LinuxHPPAEnv.Set";
+      $outfile        = "LinuxHPPAEnv.Set.sh";
       $CPU            = "H";
       $CPUNAME        = "HPPA";
       $OUTPATH        = "unxlnghppa";
@@ -589,7 +584,7 @@ elsif ( $platform =~ m/linux/ )
    }
    elsif ($platform =~ m/^alpha/)
    {  print "Setting Linux Alpha specific values... ";
-      $outfile        = "LinuxAlphaEnv.Set";
+      $outfile        = "LinuxAlphaEnv.Set.sh";
       $CPU            = "L";
       $CPUNAME        = "AXP";
       $OUTPATH        = "unxlngaxp";
@@ -599,7 +594,7 @@ elsif ( $platform =~ m/linux/ )
    }
    elsif ($platform =~ m/^arm.*?l-/)
    {  print "Setting Linux ARM specific values... ";
-      $outfile        = "LinuxARMEnv.Set";
+      $outfile        = "LinuxARMEnv.Set.sh";
       $CPU            = "R";
       $CPUNAME        = "ARM";
       $OUTPATH        = "unxlngr";
@@ -610,7 +605,7 @@ elsif ( $platform =~ m/linux/ )
    }
    elsif ($platform =~ m/^mips/)
    {  print "Setting Linux MIPS specific values... ";
-      $outfile        = "LinuxMIPSEnv.Set";
+      $outfile        = "LinuxMIPSEnv.Set.sh";
       $CPU            = "M";
       $CPUNAME        = "GODSON";
       $OUTPATH        = "unxlngmips";
@@ -654,7 +649,7 @@ elsif ( $platform =~ m/linux/ )
 }
 elsif ( $platform =~ m/osf1/ )
 {     print "Setting Tru64 specific values... ";
-      $outfile        = "Tru64AlphaEnv.Set";
+      $outfile        = "Tru64AlphaEnv.Set.sh";
       $BIG_SVX        = "TRUE";
       $COM            = "CXX";
       $COMPATH        = '@COMPATH@';
@@ -697,7 +692,7 @@ elsif ( $platform =~ m/cygwin/ )
       print "Setting Windows NT cygwin MinGW specific values... ";
       $FLIPCMD        = "slfl.pl";
       $PATH_SEPERATOR = ';';
-      $outfile        = "winmingw.set";
+      $outfile        = "winmingw.set.sh";
       $COMPATH        = PathFormat('@COMPATH@/bin');
       $COMPATH        =~ s/\/bin$//i;
       $COM            = "GCC";
@@ -707,7 +702,7 @@ elsif ( $platform =~ m/cygwin/ )
       $ATL_INCLUDE = '$SOLARVER'.$ds.'$INPATH'.$ds."inc".$ds."external".$ds."mingw".$ds."include".$ds."atl". " ".'$PSDK_HOME'.$ds."include".$ds."atl";
   }
   else # The MSVC section starts here
-  {   $outfile        = "winenv.set";
+  {   $outfile        = "winenv.set.sh";
       $COMPATH        = PathFormat('@COMPATH@');
       $COM            = "MSC";
       $OUTPATH        = "wntmsci@COMEX@";
@@ -769,7 +764,7 @@ elsif ( $platform =~ m/os2/ )
       $use_shl_versions = "TRUE";
   {
       print "Setting OS/2 gcc 3.3.5 specific values... \n";
-      $outfile        = "os2env.set";
+      $outfile        = "os2env.set.sh";
       $COM            = "GCC";
       $CVER           = "C300";
       $OUTPATH        = "os2gcci";
@@ -794,7 +789,7 @@ elsif ( $platform =~ m/darwin/ )
       if ($platform =~ m/^powerpc/)
       {
           print "Setting values for Mac OS X/Darwin on PowerPC... ";
-          $outfile        = "MacOSXPPCEnv.Set";
+          $outfile        = "MacOSXPPCEnv.Set.sh";
           $CPU            = "P";
           $CPUNAME        = "POWERPC";
           $OUTPATH        = "unxmacxp";
@@ -802,7 +797,7 @@ elsif ( $platform =~ m/darwin/ )
       else
       {
           print "Setting values for Mac OS X/Darwin on default x86... ";
-          $outfile        = "MacOSXX86Env.Set";
+          $outfile        = "MacOSXX86Env.Set.sh";
           $CPU            = "I";
           $CPUNAME        = "INTEL";
           $OUTPATH        = "unxmacxi";
@@ -822,7 +817,7 @@ elsif ( $platform =~ m/darwin/ )
 elsif ( $platform =~ m/aix/ )
 {
    print "Setting AIX PPC specific values... ";
-   $outfile        = "aixPPCEnv.Set";
+   $outfile        = "aixPPCEnv.Set.sh";
    $CPU            = "P";
    $CPUNAME        = "POWERPC";
    $OUTPATH        = "unxaigppc";
@@ -925,8 +920,7 @@ else
 #
 # E. Determining the envionment values based on the information
 #    that was gathered earlier on.
-#
-print "Setting the environment variables... ";
+
 $USR                  = $ds."usr";
 $ETC                  = $ds."etc";
 $BIN                  = $ds."bin";
@@ -938,6 +932,8 @@ $LIB64               .= "64"
 if (($platform =~ m/powerpc64-.*-linux/) && ('@SIZEOF_LONG@' eq '8'));
 $LIB64               .= "64"
 if (($platform =~ m/s390x-.*-linux/) && ('@SIZEOF_LONG@' eq '8'));
+$LIB64               .= $ds."x64"
+if ($platform =~ m/cygwin/);
 $INC                  = $ds."inc";
 $INCLUDE              = $ds."include";
 $DEV                  = $ds."dev";
@@ -955,9 +951,6 @@ $USR_OPENWIN          = $USR.$ds."openwin";
 $USR_DT               = $USR.$ds."dt";
 $COMMON_BUILD_TOOLS   = '$SRC_ROOT'.$ds."external".$ds."common";
 
-# Generate alternate output file for sh?
-$outfile_sh = $outfile.".sh";
-
 if ($STLPORT4 ne $no_stl) {
 	$ps_STLPORT_LIB		= $ps.'$STLPORT4'.$LIB64;
 	$L_STLPORT_LIB		= $L.'$STLPORT4'.$LIB64;
@@ -1110,10 +1103,15 @@ if ($platform =~ m/cygwin|os2/)
    # Mingw is different
    if ( $COM eq "MSC" )
    {  $ILIB       .=    $wps.$SOLARVER.$ds.$INPATH.$LIB.
-                        $wps.$JAVA_HOME.$LIB.
-                        $wps.$PSDK_HOME.$LIB.
-                        $wps.$FRAME_HOME.$LIB.
-                        $wps.$COMPATH.$LIB;
+                        $wps.$JAVA_HOME.$LIB;
+      if ( $CL_X64 ne "TRUE" ) {
+          $ILIB   .= $wps.$COMPATH.$LIB.
+		             $wps.$PSDK_HOME.$LIB;
+	  } else {
+	      $ILIB   .= $wps.$COMPATH.$LIB.$ds."amd64".
+		             $wps.$PSDK_HOME.$LIB64;
+	  }
+      $ILIB       .= $wps.$FRAME_HOME.$LIB;
       if ( '@ENABLE_DIRECTX@' ne "" ) {
           $ILIB   .= $wps.$DIRECTXSDK_LIB;
           if ( '@COMEX@' eq "10" ) {
@@ -1550,13 +1548,10 @@ else
 {  AddWarning( "set_soenv", "$platform not configured for system dependant include dir" );
 }
 
-#
-print "done\n";
 
 #
 # F. Setting the different aliases.
 #
-print "Setting the aliases... ";
 # 1. alias for a full product make.
 	$mkout           = '"perl $SOLARENV/bin/mkout.pl"';
 	$deliver         = '"perl $SOLARENV/bin/deliver.pl"';
@@ -1565,7 +1560,7 @@ print "Setting the aliases... ";
 	$zipdep          = '"perl $SOLARENV/bin/zipdep.pl"';
 # 3. alias for a full product make
 $nmake           = '"dmake"';
-print "done\n";
+
 #
 #--------------------------
 # VI. Open the output file.
@@ -1574,18 +1569,13 @@ print "done\n";
 open( OUT, ">$outfile" ) ||
    die "Cannot open $outfile: $!\n";
 
-# Create sh environment file
-open( OUT_SH, ">$outfile_sh" ) ||
-  die "Cannot open $outfile_sh: $!\n";
-
 #
 #------------------------------------------
 # VII. Writing the data to the output file.
 #------------------------------------------
 #
 # Write file header.
-CreateFileHeader( *OUT, $UPD, $platform, "(t)csh", "#" );
-CreateFileHeader( *OUT_SH, $UPD, $platform, "sh/bash/ksh", "#" );
+CreateFileHeader( *OUT, $UPD, $platform, "sh/bash/ksh", "#" );
 
 ToFile( "SRC_ROOT",	     $SRC_ROOT,          "e" );
 ToFile( "OOO_SHELL",         $OOO_SHELL,         "e" );
@@ -1842,6 +1832,8 @@ ToFile( "JAVAHOME",          $JAVAHOME,          "e" );
 ToFile( "CC",                $CC,                "e" );
 ToFile( "HAVE_GCC_VISIBILITY_FEATURE",
 		"@HAVE_GCC_VISIBILITY_FEATURE@", "e" );
+ToFile( "HAVE_GCC_VISIBILITY_BROKEN",
+        "@HAVE_GCC_VISIBILITY_BROKEN@", "e" );
 ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" );
 ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS",
 		"@HAVE_LD_BSYMBOLIC_FUNCTIONS@","e" );
@@ -1866,7 +1858,7 @@ ToFile( "ENABLE_GRAPHITE",   "@ENABLE_GRAPHITE@",   "e");
 ToFile( "SYSTEM_GRAPHITE",   "@SYSTEM_GRAPHITE@",   "e");
 ToFile( "GRAPHITE_LIBS",     "@GRAPHITE_LIBS@",     "e");
 ToFile( "GRAPHITE_CFLAGS",   "@GRAPHITE_CFLAGS@",   "e");
-ToFile( "VC_STANDARD",       "@VC_STANDARD@",      "e" );
+ToFile( "CL_X64",            "@CL_X64@",            "e");
 ToFile( "WITH_MYSPELL_DICTS","@WITH_MYSPELL_DICTS@","e");
 ToFile( "SYSTEM_DICTS",      "@SYSTEM_DICTS@",     "e");
 ToFile( "DICT_SYSTEM_DIR",   "@DICT_SYSTEM_DIR@",  "e");
@@ -1885,6 +1877,7 @@ ToFile( "MOZ_LIB",           "@MOZ_LIB@",          "e" );
 ToFile( "MOZ_LIB_XPCOM",     "@MOZ_LIB_XPCOM@",    "e" );
 ToFile( "MOZ_NSPR_CFLAGS",   "@MOZ_NSPR_CFLAGS@",  "e" );
 ToFile( "MOZ_NSS_CFLAGS",    "@MOZ_NSS_CFLAGS@",   "e" );
+ToFile( "MOZ_NSS_LIBS",      "@MOZ_NSS_LIBS@",     "e" );
 ToFile( "MOZ_LDAP_CFLAGS",   "@MOZ_LDAP_CFLAGS@",  "e" );
 ToFile( "WITH_FONTS",        "@WITH_FONTS@",       "e" );
 ToFile( "WITHOUT_AFMS",      "@WITHOUT_AFMS@",     "e" );
@@ -1909,6 +1902,7 @@ ToFile( "SYSTEM_OPENSSL",    "@SYSTEM_OPENSSL@",   "e" );
 ToFile( "OPENSSL_CFLAGS",    "@OPENSSL_CFLAGS@",   "e" );
 ToFile( "OPENSSL_LIBS",      "@OPENSSL_LIBS@",     "e" );
 ToFile( "SYSTEM_PYTHON",     "@SYSTEM_PYTHON@",    "e" );
+ToFile( "PYTHON",            "@PYTHON@",           "e" );
 ToFile( "PYTHON_CFLAGS",     "@PYTHON_CFLAGS@",    "e" );
 ToFile( "PYTHON_LIBS",       "@PYTHON_LIBS@",      "e" );
 if ($SYSTEM_PYTHON eq "NO") {
@@ -1950,6 +1944,10 @@ ToFile( "USE_FT_EMBOLDEN",   "@USE_FT_EMBOLDEN@",  "e" );
 ToFile( "LIBXML_CFLAGS",     "@LIBXML_CFLAGS@",    "e" );
 ToFile( "LIBXML_LIBS",       "@LIBXML_LIBS@",      "e" );
 ToFile( "SYSTEM_EXPAT",      "@SYSTEM_EXPAT@",     "e" );
+ToFile( "WITH_EXTRA_GALLERY",       "@WITH_EXTRA_GALLERY@",      "e" );
+ToFile( "WITH_EXTRA_TEMPLATE",       "@WITH_EXTRA_TEMPLATE@",      "e" );
+ToFile( "WITH_EXTRA_SAMPLE",       "@WITH_EXTRA_SAMPLE@",      "e" );
+ToFile( "WITH_EXTRA_FONT",       "@WITH_EXTRA_FONT@",      "e" );
 ToFile( "SYSTEM_DB",         "@SYSTEM_DB@",        "e" );
 ToFile( "DB_VERSION",        "@DB_VERSION@",       "e" );
 ToFile( "DB_INCLUDES",       "@DB_INCLUDES@",      "e" );
@@ -2069,7 +2067,6 @@ ToFile( "ZIPDEP",        $perlpre."zipdep.pl",      "e" );
 # Writing the aliases to file.
 ToFile( "Aliases.",          $empty,             "c" );
 ToFile( "Don't set aliases when bootstrapping", $empty, "c" );
-ToFile( 'if ( ! ${?_ISBOOTSTRAP_} ) then', $empty, "y");
 ToFile( "if test -z \"\$_ISBOOTSTRAP_\"; then", $empty, "z");
 
 ToFile( "alias mkout",       $mkout,             "a" );
@@ -2084,7 +2081,6 @@ if ( $platform =~ m/os2/ )
 {  ToFile( "alias gunzip",       "gzip -d",         "a" );
 }
 
-ToFile( "endif",             $empty, "y");
 ToFile( "fi",                $empty, "z");
 
 # Check if the right dmake version is used. (W32 only)
@@ -2092,8 +2088,6 @@ if ( $platform =~ m/cygwin/ ) {
     ToFile( "Check if the right dmake version is used.", $empty, "c" );
     # Invalidate build environment.
     ToFile( "WORK_STAMP", "_invalid_", "e" );
-    # Don't test the dmake version if this file is sourced by bootstrap
-    ToFile( "bash -c 'if test -n \"\$_ISBOOTSTRAP_\" || (dmake.exe -V | grep -e \"-cygwin\\|OS := cygwin\" > /dev/null ); then true; else echo -e \"\\n\\nERROR: Not a cygwin build dmake or dmake missing, please check!\\n\\n\" ; sleep 5; false ; fi' || exit 1", $empty, "y");
     # Restore valid environment if test was successful.
     ToFile( "WORK_STAMP",        $WORK_STAMP,        "e" );
     ToFile( "", $empty, "n");
@@ -2119,11 +2113,8 @@ ToFile( "ENV_SCRIPT", "$outfile", "e" );
 #
 # Writing unset variables you might not need to file.
 #
-print OUT $unsetvars;
-
-print OUT_SH "export $exportvars$newline";
-print OUT_SH "unset $unsetvarssh$newline";
-
+print OUT "export $exportvars$newline";
+print OUT "unset $unsetvars$newline";
 
 #
 #---------------------------
@@ -2132,8 +2123,6 @@ print OUT_SH "unset $unsetvarssh$newline";
 #
 close( OUT ) || print "Can't close $outfile: $!";
 
-close( OUT_SH ) || print "Can't close $outfile_sh: $!";
-
 #
 #------------------------------
 # IX. Sourcing the output file.
@@ -2152,11 +2141,6 @@ if (rename( $outfile, $tmp ) ne 1)
 {  `mv -f $outfile $tmp`;
 }
 
-$tmp = $SRC_ROOT.$ds.$outfile_sh;
-if (rename( $outfile_sh, $tmp ) ne 1)
-{  `mv -f $outfile_sh $tmp`;
-}
-
 #
 #--------------------------------------------------------
 # XII. Message at the end.
@@ -2165,34 +2149,24 @@ if (rename( $outfile_sh, $tmp ) ne 1)
 #
 print "$newline";
 print "*********************************************************".
-      "******************* $newline"."*"."$newline";
-print "* LibreOffice $UPD configuration. $newline";
-for ( $tmp = 0; $tmp < 2; $tmp++ )
-{  print "* $newline";
-}
-print "* Configuration part of LibreOffice $UPD build is finished. $newline* $newline";
-print "* NB! Be aware that you might not be able to build LibreOffice if you $newline".
-      "* ignore any warning message that were generated during this configuration $newline".
-      "* process. $newline* $newline";
+      "*******************$newline*$newline";
+print "* LibreOffice $UPD configuration finished. $newline*$newline";
 
 if ( $Warning ne "" )
-{  print "$Warning*";
-   print "$newline";
+{  print "$Warning*$newline";
 }
 
 print "*********************************************************".
       "******************* $newline";
 
-print "\nTo build, do:\n";
-print "  \$ make\n\n";
-print "Developer installation (after you have built):\n";
-print "  \$ make dev-install\n\n";
+print "\nTo build, issue:\nmake\n\n";
+print "For the developer installation, issue:\nmake dev-install\n\n";
 
 $bootfile = "bootstrap";
 open( OUT, ">$bootfile" ) ||
 die "Cannot open $bootfile: $!\n";
 print OUT "#!/bin/sh\n";
-print OUT "_ISBOOTSTRAP_=TRUE ; export _ISBOOTSTRAP_ ; . $SRC_ROOT/$outfile.sh\n";
+print OUT "_ISBOOTSTRAP_=TRUE ; export _ISBOOTSTRAP_ ; . $SRC_ROOT/$outfile\n";
 print OUT "unset _ISBOOTSTRAP_; export _ISBOOTSTRAP_\n";
 if ( $MINGW eq "yes" )
 {  print OUT 'PATH="/usr/bin:$PATH" : export PATH'."\n"; }
@@ -2209,7 +2183,6 @@ if (rename( $bootfile, $tmp ) ne 1)
 {  `mv -f $bootfile $tmp`;
 }
 
-print "Configure completed\n";
 if ( $Warning ne "" ) {
 	print "***** WARNINGS ISSUED *****\n";
 }
@@ -2295,9 +2268,7 @@ sub CreateFileHeader
 #                   a - alias
 #                   c - comment
 #                   n - newline
-#                   x - raw, write as is to OUT_BAT
-#                   y - raw, write as is to OUT
-#                   z - raw, write as is to OUT_SH
+#                   z - raw, write as is to OUT
 # Return value:  void
 #---------------------------------------------------------
 sub ToFile {
@@ -2305,28 +2276,23 @@ sub ToFile {
       # Write an environment variable to file.
       if (defined $_[ 1 ] && $_[ 1 ] ne "" ) {
          my $envvar = $_[ 1 ];
-         my $envvarbash = $envvar;
 
          # Tcsh/bash needs backslashes quoted
          $envvar =~ s/\\/\\\\/g;
-         $envvarbash = $envvar;
 
          printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", $envvar) if ( '@VERBOSE@' eq 'TRUE' );
-         print OUT "$setenv $_[ 0 ] \"$envvar\"$newline";  # to tcsh file
-         print OUT_SH "$_[ 0 ]=\"$envvarbash\"$newline";   # to sh file
+         print OUT "$_[ 0 ]=\"$envvar\"$newline";      # to sh file
          $exportvars .= " $_[ 0 ]";                        # add to export list for sh file
 
       } else {
          printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", "unset") if ( '@VERBOSE@' eq 'TRUE' );
-         $unsetvars .= "$unsetenv $_[ 0 ] >& /dev/null$newline"; # for tcsh file
-         $unsetvarssh .= " $_[ 0 ]";                             # for sh file
+         $unsetvars .= " $_[ 0 ]";                             # for sh file
       }
    }
    elsif ( $_[ 2 ] eq "a" )
    {  # Write an alias to file.
       print "The $_[ 0 ] is set to: $_[ 1 ]\n" if ( '@VERBOSE@' eq 'TRUE' );    # to stdout
-      print OUT "$_[ 0 ] $_[ 1 ]$newline";         # to tcsh file
-      print OUT_SH "$_[ 0 ]=$_[ 1 ]$newline";      # to sh file
+      print OUT "$_[ 0 ]=$_[ 1 ]$newline";      # to sh file
    }
    elsif ( $_[ 2 ] eq "c" )
    {  # Write a comment to file.
@@ -2341,25 +2307,15 @@ sub ToFile {
       print OUT "$comment$newline";
       print OUT "$comment $_[ 0 ]$newline";
       print OUT "$comment$newline";
-      print OUT_SH "$newline";
-      print OUT_SH "$comment$newline";
-      print OUT_SH "$comment $_[ 0 ]$newline";
-      print OUT_SH "$comment$newline";
    }
    elsif ( $_[ 2 ] eq "n" )
    {  #Write a newline to a file
       print OUT "$newline";
-      print OUT_SH "$newline";
-   }
-   elsif ( $_[ 2 ] eq "y" )
-   {
-      #Write first argument as is, and nothing else
-      print OUT "$_[ 0 ]$newline";
    }
    elsif ( $_[ 2 ] eq "z" )
    {
       #Write first argument as is, and nothing else
-      print OUT_SH "$_[ 0 ]$newline";
+      print OUT "$_[ 0 ]$newline";
    }
    else
    {  print "Unknown type!$newline";
diff --git a/setup_native/source/packinfo/packinfo_accessories.txt b/setup_native/source/packinfo/packinfo_accessories.txt
new file mode 100644
index 000000000000..6b6e780f1eb1
--- /dev/null
+++ b/setup_native/source/packinfo/packinfo_accessories.txt
@@ -0,0 +1,73 @@
+# Format:
+
+# Start
+# scpModule
+# shellscript file (optional)
+# solarispackagename
+# solarisrequires (optional)
+# solarisprovides (optional)
+# packagename
+# linuxreplaces (optional)
+# requires (optional)
+# provides (optional)
+# copyright
+# vendor
+# description
+# destpath
+# End
+
+# Package definitions for OxygenOffice Professional
+# 1/3 Gallery
+
+Start
+module = "gid_Module_Optional_Accessories_Gallery"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extra-gallery"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extra-gallery"
+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+copyright = "1999-2008 by %PRODUCTNAME"
+solariscopyright = "solariscopyrightfile"
+vendor = "%PRODUCTNAME"
+description = "Extra gallery for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%OOOPACKAGEVERSION"
+End
+
+# 2/3 Fonts
+
+Start
+module = "gid_Module_Optional_Accessories_Fonts"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extra-fonts"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extra-fonts"
+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+copyright = "1999-2008 by %PRODUCTNAME"
+solariscopyright = "solariscopyrightfile"
+vendor = "%PRODUCTNAME"
+description = "Extra fonts for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%OOOPACKAGEVERSION"
+End
+
+# 3/3 Templates - Common
+
+Start
+module = "gid_Module_Optional_Accessories_Tem_Common"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extra-templates-common"
+solarisrequires = %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extra-templates-common"
+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+copyright = "1999-2008 by %PRODUCTNAME"
+solariscopyright = "solariscopyrightfile"
+vendor = "%PRODUCTNAME"
+description = "Extra Common Templates for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%OOOPACKAGEVERSION"
+End
+
+
+# END OF Package definitions for OxygenOffice Professional
+
diff --git a/setup_native/source/packinfo/packinfo_extensions.txt b/setup_native/source/packinfo/packinfo_extensions.txt
index 38c2f9c3214a..7d76ef7f95f6 100644
--- a/setup_native/source/packinfo/packinfo_extensions.txt
+++ b/setup_native/source/packinfo/packinfo_extensions.txt
@@ -301,3 +301,48 @@ description = "oooblogger extension for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
 End
+
+Start
+module = "gid_Module_Optional_Extensions_Script_Provider_For_Beanshell"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-beanshell-script-provider"
+solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-beanshell-script-provider"
+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+linuxpatchrequires = ""
+copyright = "1999-2008 by OpenOffice.org"
+solariscopyright = "solariscopyrightfile"
+vendor = "OpenOffice.org"
+description = "Script provider for BeanShell extension for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
+Start
+module = "gid_Module_Optional_Extensions_Script_Provider_For_Javascript"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-javascript-script-provider"
+solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-javascript-script-provider"
+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+linuxpatchrequires = ""
+copyright = "1999-2008 by OpenOffice.org"
+solariscopyright = "solariscopyrightfile"
+vendor = "OpenOffice.org"
+description = "Script provider for JavaScript extension for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
+Start
+module = "gid_Module_Optional_Extensions_Script_Provider_For_Python"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-python-script-provider"
+solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-python-script-provider"
+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+linuxpatchrequires = ""
+copyright = "1999-2008 by OpenOffice.org"
+solariscopyright = "solariscopyrightfile"
+vendor = "OpenOffice.org"
+description = "Script provider for Python extension for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registry.hxx b/setup_native/source/win32/customactions/reg4msdoc/registry.hxx
index fe0014b6a191..d993060ae560 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registry.hxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registry.hxx
@@ -57,10 +57,6 @@ typedef std::auto_ptr<RegistryKeyImpl>      RegistryKey;
 typedef std::vector<std::wstring>               StringList;
 typedef std::auto_ptr<StringList>               StringListPtr;
 
-//---------------------------------------
-//
-//---------------------------------------
-
 class RegistryKeyImpl
 {
 public:
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registryexception.cxx b/setup_native/source/win32/customactions/reg4msdoc/registryexception.cxx
index cebbe67c6798..e7e66825ed4b 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registryexception.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registryexception.cxx
@@ -23,16 +23,12 @@ RegistryException::RegistryException(long ErrorCode) :
 {
 }
 
-/**
-*/
 RegistryException::~RegistryException() throw()
 {
     if (m_ErrorMsg)
         LocalFree(m_ErrorMsg);
 }
 
-/**
-*/
 const char* RegistryException::what() const throw()
 {
     FormatMessage(
@@ -49,8 +45,6 @@ const char* RegistryException::what() const throw()
     return reinterpret_cast<char*>(m_ErrorMsg);
 }
 
-/**
-*/
 long RegistryException::GetErrorCode() const
 {
     return m_ErrorCode;
@@ -66,46 +60,26 @@ RegistryIOException::RegistryIOException(long ErrorCode) :
 {
 };
 
-//#######################################
-//
-//#######################################
-
 RegistryNoWriteAccessException::RegistryNoWriteAccessException(long ErrorCode) :
     RegistryException(ErrorCode)
 {
 };
 
-//#######################################
-//
-//#######################################
-
 RegistryAccessDeniedException::RegistryAccessDeniedException(long ErrorCode) :
     RegistryException(ErrorCode)
 {
 };
 
-//#######################################
-//
-//#######################################
-
 RegistryValueNotFoundException::RegistryValueNotFoundException(long ErrorCode) :
     RegistryException(ErrorCode)
 {
 };
 
-//#######################################
-//
-//#######################################
-
 RegistryKeyNotFoundException::RegistryKeyNotFoundException(long ErrorCode) :
     RegistryException(ErrorCode)
 {
 };
 
-//#######################################
-//
-//#######################################
-
 RegistryInvalidOperationException::RegistryInvalidOperationException(long ErrorCode) :
     RegistryException(ErrorCode)
 {
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registryw9x.cxx b/setup_native/source/win32/customactions/reg4msdoc/registryw9x.cxx
index 47cc8ce70ec5..30e1cf07c5b5 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registryw9x.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registryw9x.cxx
@@ -26,10 +26,6 @@
  *
  ************************************************************************/
 
-//---------------------------------------
-//
-//---------------------------------------
-
 #include "registryw9x.hxx"
 
 #include <windows.h>
@@ -44,10 +40,6 @@
 #pragma warning(disable : 4786 4350)
 #endif
 
-//---------------------------------------
-//
-//---------------------------------------
-
 const size_t MAX_TMP_BUFF_SIZE = 1024 * sizeof(wchar_t);
 
 
@@ -138,9 +130,6 @@ size_t RegistryKeyImplWin9x::GetSubKeyCount() const
     return nSubKeys;
 }
 
-//-----------------------------------------------------
-/**
-*/
 StringListPtr RegistryKeyImplWin9x::GetSubKeyNames() const
 {
     assert(IsOpen());
@@ -176,9 +165,6 @@ StringListPtr RegistryKeyImplWin9x::GetSubKeyNames() const
     return (StringListPtr) key_names;
 }
 
-//-----------------------------------------------------
-/**
-*/
 StringListPtr RegistryKeyImplWin9x::GetSubValueNames() const
 {
     assert(IsOpen());
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrywnt.cxx b/setup_native/source/win32/customactions/reg4msdoc/registrywnt.cxx
index 4f60d0cae32a..8776e0edd0e0 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registrywnt.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registrywnt.cxx
@@ -26,10 +26,6 @@
  *
  ************************************************************************/
 
-//---------------------------------------
-//
-//---------------------------------------
-
 #ifdef _MSC_VER
 #pragma warning(push, 1) /* disable warnings within system headers */
 #endif
@@ -49,10 +45,6 @@
 #pragma warning(disable : 4786 4350)
 #endif
 
-//---------------------------------------
-//
-//---------------------------------------
-
 const size_t MAX_TMP_BUFF_SIZE = 1024 * sizeof(wchar_t);
 
 
@@ -143,9 +135,6 @@ size_t RegistryKeyImplWinNT::GetSubKeyCount() const
     return nSubKeys;
 }
 
-//-----------------------------------------------------
-/**
-*/
 StringListPtr RegistryKeyImplWinNT::GetSubKeyNames() const
 {
     assert(IsOpen());
@@ -185,9 +174,6 @@ StringListPtr RegistryKeyImplWinNT::GetSubKeyNames() const
 #endif
 }
 
-//-----------------------------------------------------
-/**
-*/
 StringListPtr RegistryKeyImplWinNT::GetSubValueNames() const
 {
     assert(IsOpen());
diff --git a/setup_native/source/win32/customactions/reg4msdoc/windowsregistry.cxx b/setup_native/source/win32/customactions/reg4msdoc/windowsregistry.cxx
index 1e97f779bc39..e06f1e51bd51 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/windowsregistry.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/windowsregistry.cxx
@@ -11,10 +11,6 @@
 #pragma warning(disable : 4350)
 #endif
 
-//------------------------------
-//
-//------------------------------
-
 WindowsRegistry::WindowsRegistry()
 {
     OSVERSIONINFOA osverinfo;
@@ -25,46 +21,26 @@ WindowsRegistry::WindowsRegistry()
     m_IsWinNT = (osverinfo.dwPlatformId == VER_PLATFORM_WIN32_NT);
 }
 
-//------------------------------
-//
-//------------------------------
-
 RegistryKey WindowsRegistry::GetClassesRootKey(bool Writeable) const
 {
     return GetRegistryKey(HKEY_CLASSES_ROOT, Writeable);
 }
 
-//------------------------------
-//
-//------------------------------
-
 RegistryKey WindowsRegistry::GetCurrentUserKey(bool Writeable) const
 {
     return GetRegistryKey(HKEY_CURRENT_USER, Writeable);
 }
 
-//------------------------------
-//
-//------------------------------
-
 RegistryKey WindowsRegistry::GetLocalMachineKey(bool Writeable) const
 {
     return GetRegistryKey(HKEY_LOCAL_MACHINE, Writeable);
 }
 
-//------------------------------
-//
-//------------------------------
-
 RegistryKey WindowsRegistry::GetUserKey(bool Writeable) const
 {
     return GetRegistryKey(HKEY_USERS, Writeable);
 }
 
-//------------------------------
-//
-//------------------------------
-
 RegistryKey WindowsRegistry::GetRegistryKey(HKEY RootKey, bool Writeable) const
 {
     RegistryKey regkey;
diff --git a/setup_native/source/win32/customactions/reg64/reg64.cxx b/setup_native/source/win32/customactions/reg64/reg64.cxx
index fe22ed86b829..d9d3d50e540a 100644
--- a/setup_native/source/win32/customactions/reg64/reg64.cxx
+++ b/setup_native/source/win32/customactions/reg64/reg64.cxx
@@ -254,13 +254,6 @@ bool DeleteRegistryKey(HKEY RootKey, const wchar_t* KeyName)
     return (ERROR_SUCCESS == rc);
 }
 
-
-
-
-//---------------------------------------
-//
-//---------------------------------------
-
 bool SetRegistryKey(HKEY RootKey, const wchar_t* KeyName, const wchar_t* ValueName, const wchar_t* Value)
 {
     HKEY hSubKey;
diff --git a/setup_native/source/win32/msi-encodinglist.txt b/setup_native/source/win32/msi-encodinglist.txt
index 5185a9ea642e..efa0f57b87ae 100644
--- a/setup_native/source/win32/msi-encodinglist.txt
+++ b/setup_native/source/win32/msi-encodinglist.txt
@@ -120,7 +120,8 @@ te-IN    0  1098
 te       0  1098
 tg       0  1064   # Tajik
 th     874  1054
-ti-ER    0  1139
+ti       0  1139   # Tigrinya
+ti-ER    0  1139   # Tigrinya
 tn       0  1074   # Setsuana
 tr    1254  1055   # Turkish
 ts       0  1073   # Tsonga
diff --git a/setup_native/source/win32/nsis/downloadtemplate.nsi b/setup_native/source/win32/nsis/downloadtemplate.nsi
index 97842125fc91..30ee215038af 100644
--- a/setup_native/source/win32/nsis/downloadtemplate.nsi
+++ b/setup_native/source/win32/nsis/downloadtemplate.nsi
@@ -5,12 +5,13 @@
 
 SetCompressor lzma
 ; SetCompressor zlib
+; Helpful for debugging, disable for products
+; RequestExecutionLevel user
 
 ; MUI 1.67 compatible ------
 !include "MUI.nsh"
 
 Function .onInit
-
   Call GetParameters
   Pop $1
   ;MessageBox MB_OK "$1"
@@ -206,6 +207,8 @@ FunctionEnd
 !define MUI_WELCOMEPAGE_TITLE_3LINES
 !define MUI_ABORTWARNING
 !define MUI_ICON "SETUPICOPLACEHOLDER"
+!define MUI_CUSTOMFUNCTION_GUIINIT     SetupBranding
+!define MUI_CUSTOMFUNCTION_UNGUIINIT   SetupBranding
 
 ; Welcome page
 !insertmacro MUI_PAGE_WELCOME
@@ -269,6 +272,29 @@ FunctionEnd
 ; Language files
 ALLLANGUAGESPLACEHOLDER
 
+Function SetupBranding
+	File "/oname=$PLUGINSDIR\modern-header.bmp" BANNERBMPPLACEHOLDER
+	File "/oname=$PLUGINSDIR\modern-header-br.bmp" BANNERBMPPLACEHOLDER_BR
+	File "/oname=$PLUGINSDIR\modern-wizard.bmp" WELCOMEBMPPLACEHOLDER
+	File "/oname=$PLUGINSDIR\modern-wizard-br.bmp" WELCOMEBMPPLACEHOLDER_BR
+
+	; use broffice specific branding if executable name begins BrOffice
+	StrCpy $0 $EXEFILE 8
+;	messageBox MB_OK "ExeName: $0 - chopped $EXEFILE"
+	StrCmp $0 "BrOffice" BrOfficeSplash DefaultSplash
+	DefaultSplash:
+;		messageBox MB_OK "LibreOffice"
+		SetBrandingImage /IMGID=1046 "$PLUGINSDIR\modern-header.bmp"
+		!insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\modern-wizard.bmp"
+		GoTo atEnd
+	BrOfficeSplash:
+;		messageBox MB_OK "BrOffice"
+		SetBrandingImage /IMGID=1046 "$PLUGINSDIR\modern-header-br.bmp"
+		!insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\modern-wizard-br.bmp"
+		GoTo atEnd
+	atEnd:
+FunctionEnd
+
 ; Reserve files
 ;!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
 
@@ -278,7 +304,6 @@ Name "PRODUCTNAMEPLACEHOLDER PRODUCTVERSIONPLACEHOLDER"
 OutFile "OUTPUTDIRPLACEHOLDER\DOWNLOADNAMEPLACEHOLDER"
 ; InstallDir "$DESKTOP\PRODUCTNAMEPLACEHOLDER PRODUCTVERSIONPLACEHOLDER Installation Files"
 ; ShowInstDetails show
-
 Section "MainSection" SEC01
 ALLFILESPLACEHOLDER
 SectionEnd
diff --git a/sfx2/inc/configmgr.hxx b/sfx2/inc/configmgr.hxx
index 5858dcf7238e..5146fd662101 100644
--- a/sfx2/inc/configmgr.hxx
+++ b/sfx2/inc/configmgr.hxx
@@ -33,9 +33,6 @@ namespace utl{
     class ConfigManager;
 }
 
-/* -----------------------------05.09.00 16:42--------------------------------
-    appdata.cxx
- ---------------------------------------------------------------------------*/
 utl::ConfigManager*         GetUtlConfigManager();
 #endif
 
diff --git a/sfx2/inc/docvor.hxx b/sfx2/inc/docvor.hxx
index f9f8c69e6c1a..fb4d4e753501 100644
--- a/sfx2/inc/docvor.hxx
+++ b/sfx2/inc/docvor.hxx
@@ -57,11 +57,6 @@ friend class SfxOrganizeDlg_Impl;
     Image                   aOpenedDocBmp;
     Image                   aClosedDocBmp;
 
-    Image                   aOpenedFolderBmpHC;
-    Image                   aClosedFolderBmpHC;
-    Image                   aOpenedDocBmpHC;
-    Image                   aClosedDocBmpHC;
-
     SfxOrganizeMgr*         pMgr;
     SfxOrganizeDlg_Impl*    pDlg;
 
@@ -102,8 +97,8 @@ public:
     void SetMgr(SfxOrganizeMgr *pM) { pMgr = pM; }
     void Reset();
     inline void SetBitmaps(
-                    const Image &rOFolderBmp, const Image &rCFolderBmp, const Image &rODocBmp, const Image &rCDocBmp,
-                    const Image &rOFolderBmpHC, const Image &rCFolderBmpHC, const Image &rODocBmpHC, const Image &rCDocBmpHC );
+                    const Image &rOFolderBmp, const Image &rCFolderBmp, const Image &rODocBmp, const Image &rCDocBmp
+                    );
     const Image &GetClosedBmp(USHORT nLevel) const;
     const Image &GetOpenedBmp(USHORT nLevel) const;
 
@@ -144,7 +139,6 @@ friend class SfxOrganizeListBox_Impl;
 
     class SfxOrganizeDlg_Impl *pImp;
 
-//  virtual void    DataChanged( const DataChangedEvent& rDCEvt );
 public:
     SfxTemplateOrganizeDlg(Window * pParent, SfxDocumentTemplates* = 0);
     ~SfxTemplateOrganizeDlg();
diff --git a/sfx2/inc/fwkhelper.hxx b/sfx2/inc/fwkhelper.hxx
index 34dd81bc3480..1b23e4c2bae6 100644
--- a/sfx2/inc/fwkhelper.hxx
+++ b/sfx2/inc/fwkhelper.hxx
@@ -33,6 +33,8 @@
 
 #include <rtl/ustring.hxx>
 
-SFX2_DLLPUBLIC void SAL_CALL RefreshToolbars( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
+SFX2_DLLPUBLIC void SAL_CALL RefreshToolbars(
+    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame
+);
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/imagemgr.hxx b/sfx2/inc/imagemgr.hxx
index 699786f6f5a7..8bdb07d68185 100644
--- a/sfx2/inc/imagemgr.hxx
+++ b/sfx2/inc/imagemgr.hxx
@@ -34,6 +34,10 @@
 #include <rtl/ustring.hxx>
 #include <vcl/image.hxx>
 
-SFX2_DLLPUBLIC Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
+SFX2_DLLPUBLIC Image SAL_CALL GetImage(
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    const ::rtl::OUString& aURL,
+    BOOL bBig
+);
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/imgmgr.hxx b/sfx2/inc/imgmgr.hxx
index df9d0f4b2c60..506f29d3ad58 100644
--- a/sfx2/inc/imgmgr.hxx
+++ b/sfx2/inc/imgmgr.hxx
@@ -54,13 +54,13 @@ public:
 
                     // get images from resources
     void            SetImages( ToolBox& rToolBox );
-    void            SetImages( ToolBox& rToolBox, BOOL bHiContrast, BOOL bLarge );
-    void            SetImagesForceSize( ToolBox& rToolBox, BOOL bHiContrast, BOOL bLarge );
+    void            SetImages( ToolBox& rToolBox, BOOL bLarge );
+    void            SetImagesForceSize( ToolBox& rToolBox, BOOL bLarge );
 
-    Image           GetImage( USHORT nId, BOOL bLarge, BOOL bHiContrast ) const;
-    Image           GetImage( USHORT nId, BOOL bHiContrast ) const;
-    Image           SeekImage( USHORT nId, BOOL bLarge, BOOL bHiContrast ) const;
-    Image           SeekImage( USHORT nId, BOOL bHiContrast ) const;
+    Image           GetImage( USHORT nId, BOOL bLarge ) const;
+    Image           GetImage( USHORT nId) const;
+    Image           SeekImage( USHORT nId, BOOL bLarge ) const;
+    Image           SeekImage( USHORT nId ) const;
 };
 
 #endif
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index d5695013f871..17887103274b 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -239,9 +239,6 @@ public:
     void                        EnterBasicCall();
     bool                        IsInBasicCall() const;
     void                        LeaveBasicCall();
-    void                        RegisterBasicConstants( const char *pPrefix,
-                                                        const SfxConstant *pConsts,
-                                                        USHORT nCount );
 
     // misc.
     BOOL                        GetOptions(SfxItemSet &);
diff --git a/sfx2/inc/sfx2/macrconf.hxx b/sfx2/inc/sfx2/macrconf.hxx
index fe75ad7cee04..60692b4c49a6 100644
--- a/sfx2/inc/sfx2/macrconf.hxx
+++ b/sfx2/inc/sfx2/macrconf.hxx
@@ -56,8 +56,6 @@ class SFX2_DLLPUBLIC SfxMacroInfo
 {
 friend class SfxMacroConfig;
 friend class SfxEventConfiguration;
-friend SvStream& operator >> (SvStream& rStream, SfxMacroInfo& rInfo);
-friend SvStream& operator << (SvStream& rStream, const SfxMacroInfo& rInfo);
 
     String*                 pHelpText;
     sal_uInt16                  nRefCnt;
@@ -77,8 +75,6 @@ public:
                     const String& rModuleName, const String& rMethodName);
     ~SfxMacroInfo();
     sal_Bool operator==(const SfxMacroInfo& rOther) const;
-    int Load (SvStream&);
-    int Store (SvStream&);
     String              GetMacroName() const;
     String              GetQualifiedName() const;
     String              GetFullQualifiedName() const;
@@ -103,10 +99,6 @@ public:
     String              GetURL() const;
 };
 
-//ASDBG obsolete >= 582
-//ASDBG class ::com::sun::star::uno::Reference< ::com::sun::star::script::XEngine > ;
-//ASDBG class ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ;
-
 class SFX2_DLLPUBLIC SfxMacroConfig
 {
 friend class SfxEventConfiguration;
@@ -127,9 +119,6 @@ public:
     static sal_Bool             IsBasic( SbxObject*, const String&, BasicManager* );
     static ErrCode          Call( SbxObject*, const String&, BasicManager*,
                                 SbxArray *pArgs=NULL, SbxValue *pRet=NULL );
-//ASDBG obsolete >= 582
-//ASDBG     static void CallStarScript( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XEngine > & rxEngine, const String & rCode,
-//ASDBG     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rSource, void *pArgs, void *pRet );
     static SbMethod*        GetMethod_Impl( const String&, BasicManager* );
 
     sal_uInt16                  GetSlotId(SfxMacroInfoPtr);
diff --git a/sfx2/inc/sfx2/macropg.hxx b/sfx2/inc/sfx2/macropg.hxx
deleted file mode 100644
index 22aa0249c0f8..000000000000
--- a/sfx2/inc/sfx2/macropg.hxx
+++ /dev/null
@@ -1,151 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _MACROPG_HXX
-#define _MACROPG_HXX
-
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-
-#include <sfx2/basedlgs.hxx>
-#include <sfx2/tabdlg.hxx>
-#include <svl/macitem.hxx>
-#include <vcl/lstbox.hxx>
-#include <com/sun/star/frame/XFrame.hpp>
-
-class _SfxMacroTabPage;
-class SvStringsDtor;
-class SvTabListBox;
-class Edit;
-class String;
-class SfxObjectShell;
-
-typedef SvStringsDtor* (*FNGetRangeHdl)( _SfxMacroTabPage*, const String& rLanguage );
-typedef SvStringsDtor* (*FNGetMacrosOfRangeHdl)( _SfxMacroTabPage*, const String& rLanguage, const String& rRange );
-
-class SfxConfigGroupListBox_Impl;
-class SfxConfigFunctionListBox_Impl;
-
-class _HeaderTabListBox;
-class _SfxMacroTabPage_Impl;
-
-class SFX2_DLLPUBLIC _SfxMacroTabPage : public SfxTabPage
-{
-    SvxMacroTableDtor           aTbl;
-    DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox * );
-    DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox * );
-    DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox * );
-
-    DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, DoubleClickHdl_Impl, Control* );
-    DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton * );
-
-    DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, ChangeScriptHdl_Impl, RadioButton * );
-    DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, GetFocus_Impl, Edit* );
-    DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, TimeOut_Impl, Timer* );
-protected:
-    _SfxMacroTabPage_Impl*      mpImpl;
-
-                                _SfxMacroTabPage( Window* pParent, const ResId& rId, const SfxItemSet& rItemSet );
-
-    void                        InitAndSetHandler();
-    void                        FillEvents();
-    void                        FillMacroList();
-    void                        EnableButtons( const String& rLanguage );
-
-public:
-
-    virtual                     ~_SfxMacroTabPage();
-
-    void                        AddEvent( const String & rEventName, USHORT nEventId );
-
-    const SvxMacroTableDtor&    GetMacroTbl() const;
-    void                        SetMacroTbl( const SvxMacroTableDtor& rTbl );
-    void                        ClearMacroTbl();
-
-    virtual void                ScriptChanged( const String& rLanguage );
-
-    // zum setzen / abfragen der Links
-    void                        SetGetRangeLink( FNGetRangeHdl pFn );
-    FNGetRangeHdl               GetGetRangeLink() const;
-    void                        SetGetMacrosOfRangeLink( FNGetMacrosOfRangeHdl pFn );
-    FNGetMacrosOfRangeHdl       GetGetMacrosOfRangeLink() const;
-
-    // --------- Erben aus der Basis -------------
-    virtual BOOL                FillItemSet( SfxItemSet& rSet );
-    virtual void                Reset( const SfxItemSet& rSet );
-
-    void                        SetReadOnly( BOOL bSet );
-    BOOL                        IsReadOnly() const;
-    void                        SelectEvent( const String& rEventName, USHORT nEventId );
-};
-
-inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTbl() const
-{
-    return aTbl;
-}
-
-inline void _SfxMacroTabPage::SetMacroTbl( const SvxMacroTableDtor& rTbl )
-{
-    aTbl = rTbl;
-}
-
-inline void _SfxMacroTabPage::ClearMacroTbl()
-{
-    aTbl.DelDtor();
-}
-
-class SFX2_DLLPUBLIC SfxMacroTabPage : public _SfxMacroTabPage
-{
-public:
-    SfxMacroTabPage(
-        Window* pParent,
-        const ResId& rId,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame,
-        const SfxItemSet& rSet
-    );
-
-    // --------- Erben aus der Basis -------------
-    static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
-};
-
-class SFX2_DLLPUBLIC SfxMacroAssignDlg : public SfxSingleTabDialog
-{
-public:
-    SfxMacroAssignDlg(
-        Window* pParent,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame,
-        SfxItemSet& rSet );
-    SfxMacroAssignDlg(
-        Window* pParent,
-        const SfxObjectShell* _pShell,
-        SfxItemSet& rSet );
-    virtual ~SfxMacroAssignDlg();
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index 8b598708f40f..1a846228cbff 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.hxx
@@ -159,11 +159,10 @@ class SfxAppMenuControl_Impl : public SfxMenuControl
 {
     PopupMenu*  pMenu;
     ULONG       m_nSymbolsStyle;
-    BOOL        m_bWasHiContrastMode;
     BOOL        m_bShowMenuImages;
 
 protected:
-    DECL_LINK( Activate, Menu * ); // Needed to support high contrast images
+    DECL_LINK( Activate, Menu * );
 
 public:
     SFX_DECL_MENU_CONTROL();
diff --git a/sfx2/inc/sfx2/module.hxx b/sfx2/inc/sfx2/module.hxx
index a90375bfb5be..0ae9c471e493 100644
--- a/sfx2/inc/sfx2/module.hxx
+++ b/sfx2/inc/sfx2/module.hxx
@@ -105,7 +105,6 @@ public:
     SAL_DLLPRIVATE SfxMenuCtrlFactArr_Impl* GetMenuCtrlFactories_Impl() const;
     SAL_DLLPRIVATE SfxChildWinFactArr_Impl* GetChildWinFactories_Impl() const;
     SAL_DLLPRIVATE ImageList* GetImageList_Impl( BOOL bBig );
-    SAL_DLLPRIVATE ImageList* GetImageList_Impl( BOOL bBig, BOOL bHiContrast );
 };
 
 #endif
diff --git a/sfx2/inc/sfx2/new.hxx b/sfx2/inc/sfx2/new.hxx
index d38306f282bf..a566703508c6 100644
--- a/sfx2/inc/sfx2/new.hxx
+++ b/sfx2/inc/sfx2/new.hxx
@@ -63,13 +63,6 @@ protected:
     virtual void    Paint( const Rectangle& rRect );
     virtual void    DataChanged( const DataChangedEvent& rDCEvt );
 
-    /** state whether a system setting for high contrast should be evaluated
-        and taken into account for this window.
-
-        The default implementation uses the accessibility option IsForDrawings
-      */
-    virtual bool    UseHighContrastSetting() const;
-
 public:
     SfxPreviewWin( Window* pParent,
                    const ResId& rResId,
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index e41c00794e7c..41c57b45452e 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -552,36 +552,24 @@ public:
     virtual void                SetOrganizerSearchMask(
                                     SfxStyleSheetBasePool* ) const;
 
+    virtual sal_uInt16          GetContentCount( sal_uInt16 nIdx1 = INDEX_IGNORE );
 
-    virtual sal_uInt16          GetContentCount(
-                                        sal_uInt16 nIdx1 = INDEX_IGNORE,
-                                        sal_uInt16 nIdx2 = INDEX_IGNORE );
     virtual sal_Bool            CanHaveChilds(
                                         sal_uInt16 nIdx1,
-                                            sal_uInt16 nIdx2 = INDEX_IGNORE );
-    virtual void                GetContent( String &,
-                                        Bitmap &rClosedBitmap,
-                                        Bitmap &rOpenedBitmap,
-                                        sal_Bool   &bCanDelete,
-                                        sal_uInt16 nPos,
-                                        sal_uInt16 nIdx1,
-                                        sal_uInt16 nIdx2 = INDEX_IGNORE );
+                                        sal_uInt16 nIdx2 = INDEX_IGNORE
+                                );
 
     virtual void                GetContent( String &,
                                         Bitmap &rClosedBitmap,
                                         Bitmap &rOpenedBitmap,
-                                        BmpColorMode eColorMode,
                                         sal_Bool   &bCanDelete,
                                         sal_uInt16 nPos,
-                                        sal_uInt16 nIdx1,
-                                        sal_uInt16 nIdx2 = INDEX_IGNORE );
-
-    virtual void                TriggerHelpPI(
-                                    sal_uInt16 nIdx1, sal_uInt16 nIdx2, sal_uInt16 nIdx3);
+                                        sal_uInt16 nIdx1
+                                );
 
-    virtual Bitmap              GetStyleFamilyBitmap(SfxStyleFamily eFamily );
+    virtual void                TriggerHelpPI( sal_uInt16 nIdx1, sal_uInt16 nIdx2 );
 
-    virtual Bitmap              GetStyleFamilyBitmap(SfxStyleFamily eFamily, BmpColorMode eColorMode );
+    virtual Bitmap              GetStyleFamilyBitmap(SfxStyleFamily eFamily);
 
     virtual sal_Bool            Insert( SfxObjectShell &rSource,
                                         sal_uInt16 nSourceIdx1,
@@ -609,10 +597,6 @@ public:
                                 // F"ur Docs, die zum Formatieren die Viewgr"o\se
                                 // ben"otigen
     virtual SfxObjectShell*     GetObjectShell();
-    //void                        SetBaseURL( const String& rURL );
-    //const String&               GetBaseURL() const;
-    //const String&               GetBaseURLForSaving() const;
-    //void                        SetEmptyBaseURL();
 
     virtual SfxFrame*           GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium );
 
@@ -656,7 +640,6 @@ public:
 
     ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetStorage();
 
-//REMOVE        void SetFileName( const ::rtl::OUString& );
     SvGlobalName    GetClassName() const;
 
     // comphelper::IEmbeddedHelper
@@ -717,7 +700,7 @@ public:
 
     // =================================
 
-    SAL_DLLPRIVATE ::boost::shared_ptr<GDIMetaFile> CreatePreviewMetaFile_Impl( sal_Bool bFullContent, sal_Bool bHighContrast ) const;
+    SAL_DLLPRIVATE ::boost::shared_ptr<GDIMetaFile> CreatePreviewMetaFile_Impl( sal_Bool bFullContent ) const;
 
     SAL_DLLPRIVATE sal_Bool IsOwnStorageFormat_Impl(const SfxMedium &) const;
 
diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc
index 8b81029593eb..6787724675d6 100755
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/sfx2/inc/sfx2/sfx.hrc
@@ -183,9 +183,7 @@
 #define RID_DEFAULTIMAGELIST_LC             (RID_SFX_START+17)
 #define RID_DEFAULTIMAGELIST_LM             (RID_SFX_START+18)
 #define RID_STYLEDLG                        (RID_SFX_START+28)
-#define RID_DEFAULTIMAGELIST_SCH            (RID_SFX_START+35)
 #define RID_DEFAULTIMAGELIST_SMH            (RID_SFX_START+36)
-#define RID_DEFAULTIMAGELIST_LCH            (RID_SFX_START+37)
 #define RID_DEFAULTIMAGELIST_LMH            (RID_SFX_START+38)
 #define RID_IMAGELIST_SCH                   (RID_SFX_START+39)
 #define RID_IMAGELIST_SMH                   (RID_SFX_START+40)
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index a0b8282895a3..d59ffddde17e 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -126,7 +126,7 @@
 #define SID_HELP_HELPFILEBOX                (SID_SFX_START + 419)
 #define SID_HELP_HELPFILEBOX_SELECTED       (SID_SFX_START + 420)
 #define SID_SHOW_LICENSE                    (SID_SFX_START + 1683)
-#define SID_SHOW_CREDITS                    (SID_SFX_START + 1684)
+#define SID_SHOW_CREDITS                    (SID_SFX_START + 1711)
 #define SID_HELP_TUTORIALS                  (SID_SFX_START + 1695)
 
 // default-ids for document
diff --git a/sfx2/inc/sfx2/styfitem.hxx b/sfx2/inc/sfx2/styfitem.hxx
index 60a1ca1c675a..8903c34b1eee 100644
--- a/sfx2/inc/sfx2/styfitem.hxx
+++ b/sfx2/inc/sfx2/styfitem.hxx
@@ -105,7 +105,7 @@ public:
         @return
             <TRUE/> if an image list for the requested mode could be found in the given resource.
     */
-    sal_Bool    updateImages( const ResId& _rId, const BmpColorMode _eMode );
+    sal_Bool    updateImages( const ResId& _rId );
 };
 
 #endif
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
index 14c7a07de5ca..01137af6831a 100644
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/sfx2/inc/sfx2/tabdlg.hxx
@@ -302,7 +302,7 @@ public:
     String              GetUserData() { return aUserString; }
     virtual void        FillUserData();
     virtual BOOL        IsReadOnly() const;
-    virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
+    virtual void PageCreated (SfxAllItemSet aSet);
     static const SfxPoolItem* GetItem( const SfxItemSet& rSet, USHORT nSlot, sal_Bool bDeep = sal_True );
 
     void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx
index b9b6c59e63d5..c7e704410337 100644
--- a/sfx2/inc/sfx2/tbxctrl.hxx
+++ b/sfx2/inc/sfx2/tbxctrl.hxx
@@ -56,7 +56,6 @@ class SfxUnoControllerItem;
 
 svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const ::rtl::OUString& aCommandURL );
 
-//typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( USHORT nId, ToolBox &rTbx, SfxBindings & );
 typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( USHORT nSlotId, USHORT nId, ToolBox& rBox );
 
 struct SfxTbxCtrlFactory
@@ -326,10 +325,6 @@ public:
 };
 
 class SfxDragToolBoxControl_Impl : public SfxToolBoxControl
-/*  [Beschreibung]
-
-*/
-
 {
 public:
                             SFX_DECL_TOOLBOX_CONTROL();
@@ -371,13 +366,12 @@ protected:
     virtual void            Select( BOOL );
     virtual void            StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
     virtual SfxPopupWindow* CreatePopupWindow();
-                            DECL_LINK( Activate, Menu * ); // Needed to support high contrast images
+                            DECL_LINK( Activate, Menu * );
 private:
     String                  aLastURL;
     BOOL                    bBigImages;
     PopupMenu*              pMenu;
     ULONG                   m_nSymbolsStyle;
-    BOOL                    m_bWasHiContrastMode;
     BOOL                    m_bShowMenuImages;
 };
 
@@ -421,7 +415,6 @@ class SfxAddonsToolBoxControl_Impl : public SfxToolBoxControl
 {
     BOOL        bBigImages;
     PopupMenu*  pMenu;
-    BOOL        m_bWasHiContrastMode;
     BOOL        m_bShowMenuImages;
 
 protected:
@@ -429,7 +422,7 @@ protected:
     using SfxToolBoxControl::Select;
     virtual void            Select( BOOL );
     virtual void            StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
-                            DECL_LINK( Activate, Menu * ); // Needed to support high contrast images
+                            DECL_LINK( Activate, Menu * );
 public:
                             SFX_DECL_TOOLBOX_CONTROL();
                             SfxAddonsToolBoxControl_Impl( USHORT nSlotId, USHORT nId, ToolBox& rBox );
diff --git a/sfx2/qa/cppunit/makefile.mk b/sfx2/qa/cppunit/makefile.mk
index dce0b86a0619..56195fdbf4b1 100644
--- a/sfx2/qa/cppunit/makefile.mk
+++ b/sfx2/qa/cppunit/makefile.mk
@@ -48,8 +48,7 @@ DLLPRE = # no leading "lib" on .so files
 # --- Libs ---------------------------------------------------------
 
 SHL1OBJS=  \
-    $(SLO)/test_metadatable.obj \
-
+    $(SLO)/test_metadatable.obj
 
 SHL1STDLIBS= \
      $(CPPUNITLIB) \
@@ -57,21 +56,18 @@ SHL1STDLIBS= \
      $(CPPULIB) \
      $(CPPUHELPERLIB) \
      $(VCLLIB) \
-     $(SFXLIB) \
-
+     $(SFXLIB)
 
 SHL1TARGET= test_metadatable
 SHL1RPATH = NONE
 SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF= $(MISC)/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
-# DEF1EXPORTFILE= export.exp
 SHL1VERSIONMAP= version.map
 
 # --- All object files ---------------------------------------------
 
 SLOFILES= \
-    $(SHL1OBJS) \
+    $(SHL1OBJS)
 
 
 # --- Targets ------------------------------------------------------
diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx
index f8e6913b9a2d..2dcfb08d1a25 100644
--- a/sfx2/qa/cppunit/test_metadatable.cxx
+++ b/sfx2/qa/cppunit/test_metadatable.cxx
@@ -116,12 +116,12 @@ void MetadatableTest::test()
     MockMetadatable m4(*pReg);
     MockMetadatable m5(*pReg);
     ::rtl::OUString empty;
-    ::rtl::OUString content( ::rtl::OUString::createFromAscii("content.xml") );
-    ::rtl::OUString styles ( ::rtl::OUString::createFromAscii("styles.xml") );
-    ::rtl::OUString sid1( ::rtl::OUString::createFromAscii("id1") );
-    ::rtl::OUString sid2( ::rtl::OUString::createFromAscii("id2") );
-    ::rtl::OUString sid3( ::rtl::OUString::createFromAscii("id3") );
-    ::rtl::OUString sid4( ::rtl::OUString::createFromAscii("id4") );
+    ::rtl::OUString content( RTL_CONSTASCII_USTRINGPARAM("content.xml") );
+    ::rtl::OUString styles( RTL_CONSTASCII_USTRINGPARAM("styles.xml") );
+    ::rtl::OUString sid1( RTL_CONSTASCII_USTRINGPARAM("id1") );
+    ::rtl::OUString sid2( RTL_CONSTASCII_USTRINGPARAM("id2") );
+    ::rtl::OUString sid3( RTL_CONSTASCII_USTRINGPARAM("id3") );
+    ::rtl::OUString sid4( RTL_CONSTASCII_USTRINGPARAM("id4") );
     beans::StringPair id1(content, sid1);
     beans::StringPair id2(content, sid2);
     beans::StringPair id3(content, sid3);
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index d801b3a14ecc..97e5dcd2171f 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -757,8 +757,8 @@ sal_Bool SfxApplication::IsXScriptURL( const String& rScriptURL )
     ::com::sun::star::uno::Reference
         < ::com::sun::star::uri::XUriReferenceFactory >
             xFactory( xSMgr->createInstance(
-                ::rtl::OUString::createFromAscii(
-                    "com.sun.star.uri.UriReferenceFactory" ) ),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.uri.UriReferenceFactory" )) ),
                 ::com::sun::star::uno::UNO_QUERY );
 
     if ( xFactory.is() )
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index dca172269443..92304bf3d22f 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -39,9 +39,6 @@
 #define MSG_ERR_VERSION_CFG                     (RID_SFX_APP_START+6)
 #define MSG_ERR_NO_WEBBROWSER_FOUND                 (RID_SFX_APP_START+7)
 
-// Note: no longer in use
-// #define MSG_ERR_EXTERNAL_APP_NOT_FOUND           (RID_SFX_APP_START+8)
-
 #define MSG_ISPRINTING_QUERYABORT               (RID_SFX_APP_START+9)
 #define MSG_CANT_QUIT                           (RID_SFX_APP_START+10)
 #define STR_ISMODIFIED                          (RID_SFX_APP_START+11)
@@ -105,7 +102,7 @@
 
 #define RID_STR_NOWELCOMESCREEN             (RID_SFX_APP_START+91)
 
-// --> PB 2004-08-20 #i33095#
+// Option for 'recommend opening document read only' is not evaluated (#i33095#)
 /* obsolete
 #define STR_EDITOBJECT                      (RID_SFX_APP_START+92)
 #define STR_OPENOBJECT                      (RID_SFX_APP_START+93)
@@ -161,13 +158,9 @@
 #define IMG_HELP_TOOLBOX_COPY                   (RID_SFX_APP_START+118)
 
 #define IMG_HELP_CONTENT_BOOK_OPEN              (RID_SFX_APP_START+120)
-#define IMG_HELP_CONTENT_BOOK_OPEN_HC           (RID_SFX_APP_START+121)
 #define IMG_HELP_CONTENT_BOOK_CLOSED            (RID_SFX_APP_START+122)
-#define IMG_HELP_CONTENT_BOOK_CLOSED_HC         (RID_SFX_APP_START+123)
 #define IMG_HELP_CONTENT_DOC                    (RID_SFX_APP_START+124)
 
-#define IMG_HELP_CONTENT_DOC_HC                 (RID_SFX_APP_START+125) // image
-
 #define IMG_MISSING_1                           (RID_SFX_APP_START+126) // image
 #define IMG_MISSING_2                           (RID_SFX_APP_START+127) // image
 #define IMG_MISSING_3                           (RID_SFX_APP_START+128) // image
@@ -203,16 +196,6 @@
 #define RID_HELP_ONSTARTUP_BOX                  (RID_SFX_APP_START+144)
 #define RID_HELP_ONSTARTUP_TEXT                 (RID_SFX_APP_START+145)
 
-#define IMG_HELP_TOOLBOX_HC_INDEX_ON            (RID_SFX_APP_START+150)
-#define IMG_HELP_TOOLBOX_HC_INDEX_OFF           (RID_SFX_APP_START+151)
-#define IMG_HELP_TOOLBOX_HC_START               (RID_SFX_APP_START+152)
-#define IMG_HELP_TOOLBOX_HC_PREV                (RID_SFX_APP_START+153)
-#define IMG_HELP_TOOLBOX_HC_NEXT                (RID_SFX_APP_START+154)
-#define IMG_HELP_TOOLBOX_HC_PRINT               (RID_SFX_APP_START+155)
-#define IMG_HELP_TOOLBOX_HC_BOOKMARKS           (RID_SFX_APP_START+156)
-#define IMG_HELP_TOOLBOX_HC_SEARCHDIALOG        (RID_SFX_APP_START+157)
-#define IMG_HELP_TOOLBOX_HC_COPY                (RID_SFX_APP_START+158)
-
 #define IMG_HELP_TOOLBOX_L_INDEX_ON             (RID_SFX_APP_START+160)
 #define IMG_HELP_TOOLBOX_L_INDEX_OFF            (RID_SFX_APP_START+161)
 #define IMG_HELP_TOOLBOX_L_START                (RID_SFX_APP_START+162)
@@ -223,16 +206,6 @@
 #define IMG_HELP_TOOLBOX_L_SEARCHDIALOG         (RID_SFX_APP_START+167)
 #define IMG_HELP_TOOLBOX_L_COPY                 (RID_SFX_APP_START+168)
 
-#define IMG_HELP_TOOLBOX_HCL_INDEX_ON           (RID_SFX_APP_START+170)
-#define IMG_HELP_TOOLBOX_HCL_INDEX_OFF          (RID_SFX_APP_START+171)
-#define IMG_HELP_TOOLBOX_HCL_START              (RID_SFX_APP_START+172)
-#define IMG_HELP_TOOLBOX_HCL_PREV               (RID_SFX_APP_START+173)
-#define IMG_HELP_TOOLBOX_HCL_NEXT               (RID_SFX_APP_START+174)
-#define IMG_HELP_TOOLBOX_HCL_PRINT              (RID_SFX_APP_START+175)
-#define IMG_HELP_TOOLBOX_HCL_BOOKMARKS          (RID_SFX_APP_START+176)
-#define IMG_HELP_TOOLBOX_HCL_SEARCHDIALOG       (RID_SFX_APP_START+177)
-#define IMG_HELP_TOOLBOX_HCL_COPY               (RID_SFX_APP_START+178)
-
 #define RID_SECURITY_WARNING_HYPERLINK          (RID_SFX_APP_START + 180)
 #define RID_SECURITY_WARNING_TITLE              (RID_SFX_APP_START + 181)
 
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 639988b3b482..3b3ad68e4f7e 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -101,79 +101,8 @@ using namespace ::com::sun::star::script;
 
 using ::basic::BasicManagerRepository;
 
-// #ifndef STR_VERSION_ID
-// #define STR_VERSION_ID 1
-// #endif
-// #ifndef STR_VERSION_TYPE
-// #define STR_VERSION_TYPE 1
-// #endif
-
-//=========================================================================
-/*ASDBG
-const SfxConstant __FAR_DATA aConstants[] =
-{
-    SFX_USHORT_CONSTANT( "AlignBottom",         ALIGN_BOTTOM ),
-    SFX_USHORT_CONSTANT( "AlignTop",            ALIGN_TOP ),
-    SFX_USHORT_CONSTANT( "CharSetANSI",         CHARSET_ANSI ),
-    SFX_USHORT_CONSTANT( "CharSetDontKnow",     CHARSET_DONTKNOW ),
-    SFX_USHORT_CONSTANT( "CharSetIBMPC437",     CHARSET_IBMPC_437 ),
-    SFX_USHORT_CONSTANT( "CharSetIBMPC850",     CHARSET_IBMPC_850 ),
-    SFX_USHORT_CONSTANT( "CharSetIBMPC860",     CHARSET_IBMPC_860 ),
-    SFX_USHORT_CONSTANT( "CharSetIBMPC861",     CHARSET_IBMPC_861 ),
-    SFX_USHORT_CONSTANT( "CharSetIBMPC863",     CHARSET_IBMPC_863 ),
-    SFX_USHORT_CONSTANT( "CharSetIBMPC865",     CHARSET_IBMPC_865 ),
-    SFX_USHORT_CONSTANT( "CharSetIBMPC",        CHARSET_IBMPC ),
-    SFX_USHORT_CONSTANT( "CharSetMac",          CHARSET_MAC ),
-    SFX_USHORT_CONSTANT( "CharSetSymbol",       CHARSET_SYMBOL ),
-    SFX_USHORT_CONSTANT( "CharSetSystem",       RTL_TEXTENCODING_UTF8 ),
-    SFX_USHORT_CONSTANT( "FamilyDecorative",    FAMILY_DECORATIVE ),
-    SFX_USHORT_CONSTANT( "FamilyDontknow",      FAMILY_DONTKNOW ),
-    SFX_USHORT_CONSTANT( "FamilyModern",        FAMILY_MODERN ),
-    SFX_USHORT_CONSTANT( "FamilyRoman",         FAMILY_ROMAN ),
-    SFX_USHORT_CONSTANT( "FamilyScript",        FAMILY_SCRIPT ),
-    SFX_USHORT_CONSTANT( "FamilySwiss",         FAMILY_SWISS ),
-    SFX_USHORT_CONSTANT( "FamilySystem",        FAMILY_SYSTEM ),
-    SFX_USHORT_CONSTANT( "GradientAxial",       GRADIENT_AXIAL ),
-    SFX_USHORT_CONSTANT( "GradientElliptical",  GRADIENT_ELLIPTICAL ),
-    SFX_USHORT_CONSTANT( "GradientLinear",      GRADIENT_LINEAR ),
-    SFX_USHORT_CONSTANT( "GradientRadial",      GRADIENT_RADIAL ),
-    SFX_USHORT_CONSTANT( "GradientRect",        GRADIENT_RECT ),
-    SFX_USHORT_CONSTANT( "GradientSquare",      GRADIENT_SQUARE ),
-    SFX_USHORT_CONSTANT( "ItalicNone",          ITALIC_NONE ),
-    SFX_USHORT_CONSTANT( "ItalicOblique",       ITALIC_OBLIQUE ),
-    SFX_USHORT_CONSTANT( "StrikeThroughDouble", STRIKEOUT_DOUBLE ),
-    SFX_USHORT_CONSTANT( "StrikeThroughNone",   STRIKEOUT_NONE ),
-    SFX_USHORT_CONSTANT( "StrikeThroughSingle", STRIKEOUT_SINGLE ),
-    SFX_USHORT_CONSTANT( "UnderlineDotted",     UNDERLINE_DOTTED ),
-    SFX_USHORT_CONSTANT( "UnderlineDouble",     UNDERLINE_DOUBLE ),
-    SFX_USHORT_CONSTANT( "UnderlineNone",       UNDERLINE_NONE ),
-    SFX_USHORT_CONSTANT( "UnderlineSingle",     UNDERLINE_SINGLE ),
-    SFX_USHORT_CONSTANT( "UnitFoot",            FUNIT_FOOT ),
-    SFX_USHORT_CONSTANT( "UnitInch",            FUNIT_INCH ),
-    SFX_USHORT_CONSTANT( "UnitMile",            FUNIT_MILE ),
-    SFX_USHORT_CONSTANT( "UnitPercent",         FUNIT_PERCENT ),
-    SFX_USHORT_CONSTANT( "UnitPoint",           FUNIT_POINT ),
-    SFX_USHORT_CONSTANT( "UnitTwip",            FUNIT_TWIP ),
-    SFX_USHORT_CONSTANT( "Unit_cm",             FUNIT_CM ),
-    SFX_USHORT_CONSTANT( "Unit_m",              FUNIT_M ),
-    SFX_USHORT_CONSTANT( "Unit_mm",             FUNIT_MM ),
-    SFX_USHORT_CONSTANT( "WeightBlack",         WEIGHT_BLACK ),
-    SFX_USHORT_CONSTANT( "WeightBold",          WEIGHT_BOLD ),
-    SFX_USHORT_CONSTANT( "WeightDontKnow",      WEIGHT_DONTKNOW ),
-    SFX_USHORT_CONSTANT( "WeightLight",         WEIGHT_LIGHT ),
-    SFX_USHORT_CONSTANT( "WeightMedium",        WEIGHT_MEDIUM ),
-    SFX_USHORT_CONSTANT( "WeightNormal",        WEIGHT_NORMAL ),
-    SFX_USHORT_CONSTANT( "WeightSemibold",      WEIGHT_SEMIBOLD ),
-    SFX_USHORT_CONSTANT( "WeightSemilight",     WEIGHT_SEMILIGHT ),
-    SFX_USHORT_CONSTANT( "WeightThin",          WEIGHT_THIN ),
-    SFX_USHORT_CONSTANT( "WeightUltrabold",     WEIGHT_ULTRABOLD ),
-    SFX_USHORT_CONSTANT( "WeightUltralight",    WEIGHT_ULTRALIGHT )
-};
-*/
-//========================================================================
-
 //------------------------------------------------------------------------
-String lcl_GetVersionString(ResMgr* /*pAppData_ImplResMgr*/)
+String lcl_GetVersionString()
 {
     ::rtl::OUString aDefault;
     String aVersion( utl::Bootstrap::getBuildIdData( aDefault ));
@@ -204,46 +133,6 @@ sal_uInt16 SfxApplication::SaveBasicAndDialogContainer() const
 
 //--------------------------------------------------------------------
 
-void SfxApplication::RegisterBasicConstants
-(
-    const char*,        // Prefix vor Konstanten-Namen
-    const SfxConstant*, // Array von <SfxConstant> Instanzen
-    sal_uInt16          // Anahl der Kontanten in pConsts
-)
-
-/*  [Beschreibung]
-
-    Diese Methode meldet Konstanten beim BASIC an. Sie sollte on-demand
-    (in GetSbxObject() der Applikation) gerufen werden. Das Array mu\s
-    alphabetisch nach den Namen sortiert sein!
-
-    Durch den Prefix kann Speicher gespart und das Suchen beschleunigt
-    werden. Im StarOffice soll der Prefix "so" verwendet werden.
-
-
-    [Beispiel]
-
-    const SfxConstant __FAR_DATA aConstants[] =
-    {
-        SFX_BOOL_CONSTANT( "False", sal_False ),
-        SFX_BOOL_CONSTANT( "True",  sal_True ),
-    };
-
-    ...
-    SFX_APP()->RegisterBasicConstants( 0, aConstants, 2 );
-    ...
-
-*/
-
-{
-//  DBG_ASSERT( pAppData_Impl->pBasicMgr, "no basic available" );
-
-//  pAppData_Impl->pBasicMgr->GetLib(0)->Insert(
-//              new SfxConstants_Impl( pPrefix, pConsts, nCount ) );
-}
-
-//--------------------------------------------------------------------
-
 SbxVariable* MakeVariable( StarBASIC *pBas, SbxObject *pObject,
            const char *pName, sal_uInt32 nSID, SbxDataType eType, SbxClassType eClassType )
 {
@@ -503,7 +392,7 @@ void SfxApplication::PropState_Impl( SfxItemSet &rSet )
 
             case SID_BUILD_VERSION:
             {
-                String aVersion = lcl_GetVersionString(pAppData_Impl->pLabelResMgr);
+                String aVersion = lcl_GetVersionString();
                 rSet.Put( SfxUInt32Item( SID_BUILD_VERSION, (sal_uInt32) aVersion.ToInt32() ) );
                 break;
             }
diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx
index d3e9a5f66dd0..f76e334ee7cf 100644
--- a/sfx2/source/appl/appbaslib.cxx
+++ b/sfx2/source/appl/appbaslib.cxx
@@ -175,7 +175,7 @@ Sequence< OUString > SfxApplicationDialogLibraryContainer::impl_getStaticSupport
     if( bNeedsInit )
     {
         OUString* pSeq = seqServiceNames.getArray();
-        pSeq[0] = OUString::createFromAscii( "com.sun.star.script.ApplicationDialogLibraryContainer" );
+        pSeq[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.ApplicationDialogLibraryContainer"));
         bNeedsInit = sal_False;
     }
     return seqServiceNames;
@@ -189,7 +189,7 @@ OUString SfxApplicationDialogLibraryContainer::impl_getStaticImplementationName(
     MutexGuard aGuard( Mutex::getGlobalMutex() );
     if( bNeedsInit )
     {
-        aImplName = OUString::createFromAscii( "com.sun.star.comp.sfx2.ApplicationDialogLibraryContainer" );
+        aImplName = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sfx2.ApplicationDialogLibraryContainer"));
         bNeedsInit = sal_False;
     }
     return aImplName;
@@ -218,7 +218,7 @@ Sequence< OUString > SfxApplicationScriptLibraryContainer::impl_getStaticSupport
     if( bNeedsInit )
     {
         OUString* pSeq = seqServiceNames.getArray();
-        pSeq[0] = OUString::createFromAscii( "com.sun.star.script.ApplicationScriptLibraryContainer" );
+        pSeq[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.ApplicationScriptLibraryContainer"));
         bNeedsInit = sal_False;
     }
     return seqServiceNames;
@@ -232,7 +232,7 @@ OUString SfxApplicationScriptLibraryContainer::impl_getStaticImplementationName(
     MutexGuard aGuard( Mutex::getGlobalMutex() );
     if( bNeedsInit )
     {
-        aImplName = OUString::createFromAscii( "com.sun.star.comp.sfx2.ApplicationScriptLibraryContainer" );
+        aImplName = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sfx2.ApplicationScriptLibraryContainer"));
         bNeedsInit = sal_False;
     }
     return aImplName;
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index b412fc8c9692..5d92d43f4e59 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -120,8 +120,8 @@ void SAL_CALL SfxTerminateListener_Impl::queryTermination( const EventObject& )
 
 void SAL_CALL SfxTerminateListener_Impl::notifyTermination( const EventObject& aEvent ) throw(RuntimeException )
 {
-    static ::rtl::OUString SERVICE_GLOBALEVENTBROADCASTER = ::rtl::OUString::createFromAscii("com.sun.star.frame.GlobalEventBroadcaster");
-    static ::rtl::OUString EVENT_QUIT_APP                 = ::rtl::OUString::createFromAscii("OnCloseApp");
+    static ::rtl::OUString SERVICE_GLOBALEVENTBROADCASTER(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.GlobalEventBroadcaster"));
+    static ::rtl::OUString EVENT_QUIT_APP                (RTL_CONSTASCII_USTRINGPARAM("OnCloseApp"));
 
     Reference< XDesktop > xDesktop( aEvent.Source, UNO_QUERY );
     if( xDesktop.is() == sal_True )
@@ -151,7 +151,7 @@ void SAL_CALL SfxTerminateListener_Impl::notifyTermination( const EventObject& a
 
 ::rtl::OUString SAL_CALL SfxTerminateListener_Impl::getImplementationName() throw (RuntimeException)
 {
-    static const ::rtl::OUString IMPLNAME = ::rtl::OUString::createFromAscii("com.sun.star.comp.sfx2.SfxTerminateListener");
+    static const ::rtl::OUString IMPLNAME(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sfx2.SfxTerminateListener"));
     return IMPLNAME;
 }
 
@@ -178,7 +178,7 @@ Sequence< ::rtl::OUString > SAL_CALL SfxTerminateListener_Impl::getSupportedServ
     // The desktop must know, which listener will terminate the SfxApplication in real !
     // It must call this special listener as last one ... otherwise we shutdown the SfxApplication BEFORE other listener
     // can react ...
-    static const ::rtl::OUString SERVICENAME = ::rtl::OUString::createFromAscii("com.sun.star.frame.TerminateListener");
+    static const ::rtl::OUString SERVICENAME(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.TerminateListener"));
     Sequence< ::rtl::OUString > lNames(1);
     lNames[0] = SERVICENAME;
     return lNames;
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index 019f46c460a6..0083bec101b7 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -178,7 +178,7 @@ bool SfxApplication::InitLabelResMgr( const char* _pLabelPrefix, bool _bExceptio
             {
                 // maybe corrupted installation
                 throw (::com::sun::star::uno::RuntimeException(
-                    ::rtl::OUString::createFromAscii("iso resource could not be loaded by SfxApplication"),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("iso resource could not be loaded by SfxApplication")),
                     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >()));
             }
         }
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 553d804d0a97..e9a9a2fe75d6 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -315,7 +315,7 @@ sal_uInt32 CheckPasswd_Impl
             {
                 sal_Bool bIsEncrypted = sal_False;
                 try {
-                    xStorageProps->getPropertyValue( ::rtl::OUString::createFromAscii("HasEncryptedEntries") )
+                    xStorageProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasEncryptedEntries")) )
                         >>= bIsEncrypted;
                 } catch( uno::Exception& )
                 {
@@ -667,7 +667,7 @@ bool lcl_isFilterNativelySupported(const SfxFilter& rFilter)
         return true;
 
     ::rtl::OUString aName = rFilter.GetFilterName();
-    if (aName.indexOf(::rtl::OUString::createFromAscii("MS Excel")) == 0)
+    if (aName.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MS Excel"))) == 0)
         // We can handle all Excel variants natively.
         return true;
 
@@ -921,7 +921,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
     {
         Reference< ::com::sun::star::document::XTypeDetection > xTypeDetection(
                                                                     ::comphelper::getProcessServiceFactory()->createInstance(
-                                                                    ::rtl::OUString::createFromAscii( "com.sun.star.document.TypeDetection" )),
+                                                                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection"))),
                                                                     UNO_QUERY );
         if ( xTypeDetection.is() )
         {
@@ -930,7 +930,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
 
             aURL.Complete = aFileName;
             Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
-                                                    ::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY );
+                                                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
             xTrans->parseStrict( aURL );
 
             INetProtocol aINetProtocol = INetURLObject( aURL.Complete ).GetProtocol();
@@ -989,7 +989,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
             {
                 // hyperlink does not link to own type => special handling (http, ftp) browser and (other external protocols) OS
                 Reference< XSystemShellExecute > xSystemShellExecute( ::comphelper::getProcessServiceFactory()->createInstance(
-                                                    ::rtl::OUString::createFromAscii( "com.sun.star.system.SystemShellExecute" )), UNO_QUERY );
+                                                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SystemShellExecute"))), UNO_QUERY );
                 if ( xSystemShellExecute.is() )
                 {
                     if ( aINetProtocol == INET_PROT_MAILTO )
@@ -1029,14 +1029,14 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
                         Sequence < ::rtl::OUString > aProtocols(2);
 
                         // add special protocols that always should be treated as internal
-                        aProtocols[0] = ::rtl::OUString::createFromAscii("private:*");
-                        aProtocols[1] = ::rtl::OUString::createFromAscii("vnd.sun.star.*");
+                        aProtocols[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:*"));
+                        aProtocols[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.*"));
 
                         try
                         {
                             // get registered protocol handlers from configuration
                             Reference < XNameAccess > xAccess( ::comphelper::ConfigurationHelper::openConfig( ::comphelper::getProcessServiceFactory(),
-                                ::rtl::OUString::createFromAscii("org.openoffice.Office.ProtocolHandler/HandlerSet"), ::comphelper::ConfigurationHelper::E_READONLY ), UNO_QUERY );
+                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.ProtocolHandler/HandlerSet")), ::comphelper::ConfigurationHelper::E_READONLY ), UNO_QUERY );
                             if ( xAccess.is() )
                             {
                                 Sequence < ::rtl::OUString > aNames = xAccess->getElementNames();
@@ -1048,7 +1048,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
                                     if ( xSet.is() )
                                     {
                                         // copy protocols
-                                        aRet = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("Protocols") );
+                                        aRet = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Protocols")) );
                                         Sequence < ::rtl::OUString > aTmp;
                                         aRet >>= aTmp;
 
@@ -1185,7 +1185,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
 
         if (!pInteractionItem)
         {
-            Reference < ::com::sun::star::task::XInteractionHandler > xHdl( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.comp.uui.UUIInteractionHandler")), UNO_QUERY );
+            Reference < ::com::sun::star::task::XInteractionHandler > xHdl( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uui.UUIInteractionHandler"))), UNO_QUERY );
             if (xHdl.is())
                 rReq.AppendItem( SfxUnoAnyItem(SID_INTERACTIONHANDLER,::com::sun::star::uno::makeAny(xHdl)) );
         }
@@ -1226,7 +1226,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
             }
             else
             {
-                xTargetFrame.set( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")), UNO_QUERY );
+                xTargetFrame.set( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"))), UNO_QUERY );
             }
         }
 
@@ -1281,7 +1281,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
         {
             URL aURL;
             aURL.Complete = aFileName;
-            Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY );
+            Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
             xTrans->parseStrict( aURL );
 
             Reference < XDispatchProvider > xProv( xTargetFrame, UNO_QUERY );
@@ -1299,7 +1299,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
 
         // Desktop service must exists! dont catch() or check for problems here ...
         // But loading of documents can fail by other reasons. Handle it more gracefully.
-        Reference < XComponentLoader > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")), UNO_QUERY );
+        Reference < XComponentLoader > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"))), UNO_QUERY );
         Reference < XComponent >       xComp;
         try
         {
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 2d78f0ca0c8d..3fc6f977ff91 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -513,7 +513,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
                 sBuildId.Insert( sProductSource, 0 );
             }
 
-            // --> PB 2008-10-30 #i94693#
+            // Version information (in about box) (#i94693#)
             /* if the build ids of the basis or ure layer are different from the build id
              * of the brand layer then show them */
             rtl::OUString aBasisProductBuildId( DEFINE_CONST_OUSTRING(
@@ -531,7 +531,6 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
                 sTemp += String( aUREProductBuildId );
                 sBuildId.Insert( sTemp, sBuildId.Search( ')' ) );
             }
-            // <--
 
             // the build id format is "milestone(build)[cwsname]". For readability, it would
             // be nice to have some more spaces in there.
@@ -792,7 +791,7 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
 
 static const ::rtl::OUString& getProductRegistrationServiceName( )
 {
-    static ::rtl::OUString s_sServiceName = ::rtl::OUString::createFromAscii( "com.sun.star.setup.ProductRegistration" );
+    static ::rtl::OUString s_sServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.setup.ProductRegistration"));
     return s_sServiceName;
 }
 
@@ -1012,9 +1011,9 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
                 // read repository URL from configuration
                 ::rtl::OUString sTemplRepoURL =
                     getConfigurationStringValue(
-                        ::rtl::OUString::createFromAscii("org.openoffice.Office.Common"),
-                        ::rtl::OUString::createFromAscii("Dictionaries"),
-                        ::rtl::OUString::createFromAscii("RepositoryURL"),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common")),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Dictionaries")),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RepositoryURL")),
                         ::rtl::OUString());
 
                 if ( xSystemShell.is() && sTemplRepoURL.getLength() > 0 )
@@ -1025,10 +1024,10 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
 
                     // read locale from configuration
                     ::rtl::OUString sLocale = getConfigurationStringValue(
-                        ::rtl::OUString::createFromAscii("org.openoffice.Setup"),
-                        ::rtl::OUString::createFromAscii("L10N"),
-                        ::rtl::OUString::createFromAscii("ooLocale"),
-                        ::rtl::OUString::createFromAscii("en-US"));
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup")),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("L10N")),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooLocale")),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en-US")));
 
                     aURLBuf.append( sLocale );
                     xSystemShell->execute(
@@ -1058,7 +1057,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
                 // tell it that the user wants to register
                 if ( xProductRegistration.is() )
                 {
-                    xProductRegistration->trigger( ::rtl::OUString::createFromAscii( "RegistrationRequired" ) );
+                    xProductRegistration->trigger( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RegistrationRequired")) );
                 }
             }
             catch( const ::com::sun::star::uno::Exception& )
@@ -1298,13 +1297,13 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
 
             Reference< com::sun::star::lang::XMultiServiceFactory > xORB = ::comphelper::getProcessServiceFactory();
             Reference< com::sun::star::frame::XDispatchProvider > xProv(
-                xORB->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.drawing.ModuleDispatcher")), UNO_QUERY );
+                xORB->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ModuleDispatcher"))), UNO_QUERY );
 
             if ( xProv.is() )
             {
                 ::rtl::OUString aCmd = ::rtl::OUString::createFromAscii( GetInterface()->GetSlot( rReq.GetSlot() )->GetUnoName() );
                 Reference< com::sun::star::frame::XDispatchHelper > xHelper(
-                    xORB->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.frame.DispatchHelper")), UNO_QUERY );
+                    xORB->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.DispatchHelper"))), UNO_QUERY );
                 if ( xHelper.is() )
                 {
                     Sequence < com::sun::star::beans::PropertyValue > aSeq;
@@ -1328,13 +1327,13 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
         {
             Reference< com::sun::star::lang::XMultiServiceFactory > xORB = ::comphelper::getProcessServiceFactory();
             Reference< com::sun::star::frame::XDispatchProvider > xProv(
-                xORB->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.text.ModuleDispatcher")), UNO_QUERY );
+                xORB->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.ModuleDispatcher"))), UNO_QUERY );
 
             if ( xProv.is() )
             {
                 ::rtl::OUString aCmd = ::rtl::OUString::createFromAscii( GetInterface()->GetSlot( rReq.GetSlot() )->GetUnoName() );
                 Reference< com::sun::star::frame::XDispatchHelper > xHelper(
-                    xORB->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.frame.DispatchHelper")), UNO_QUERY );
+                    xORB->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.DispatchHelper"))), UNO_QUERY );
                 if ( xHelper.is() )
                 {
                     Sequence < com::sun::star::beans::PropertyValue > aSeq;
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 3c3ea6b4f190..2aa7d6a4b021 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -136,7 +136,6 @@ using namespace ::com::sun::star::io;
 #include "SfxDocumentMetaData.hxx"
 
 
-#define FRAMELOADER_SERVICENAME         "com.sun.star.frame.FrameLoader"
 #define PROTOCOLHANDLER_SERVICENAME     "com.sun.star.frame.ProtocolHandler"
 
 static char const sTemplateRegionName[] = "TemplateRegionName";
@@ -861,7 +860,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
 #endif
             }
         }
-        // --> PB 2007-12-09 #i83757#
+        // API to raise options dialog with a specified options ab page (#i83757#)
         else
         {
             // transform parameter "OptionsPageURL" of slot "OptionsTreeDialog"
@@ -883,7 +882,6 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 }
             }
         }
-        // <--
 #ifdef DB_UTIL
         if ( nFoundArgs == nCount )
         {
@@ -2155,7 +2153,7 @@ SFX2_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo(
     aTempStr = aImpl;
     aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
     xNewKey = xKey->createKey( aTempStr );
-    xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.SpecialEmbeddedObject") );
+    xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.SpecialEmbeddedObject")) );
 
     // IFrameObject
     aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
@@ -2164,7 +2162,7 @@ SFX2_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo(
     aTempStr = aImpl;
     aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
     xNewKey = xKey->createKey( aTempStr );
-    xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.SpecialEmbeddedObject") );
+    xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.SpecialEmbeddedObject")) );
 
     // global app event broadcaster
     aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
@@ -2173,7 +2171,7 @@ SFX2_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo(
     aTempStr = aImpl;
     aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
     xNewKey = xKey->createKey( aTempStr );
-    xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.GlobalEventBroadcaster") );
+    xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.GlobalEventBroadcaster")) );
 
     // global app dispatcher
     aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
@@ -2182,7 +2180,7 @@ SFX2_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo(
     aTempStr = aImpl;
     aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
     xNewKey = xKey->createKey( aTempStr );
-    xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.ProtocolHandler") );
+    xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ProtocolHandler")) );
 
     // standalone document info
     aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
@@ -2191,7 +2189,7 @@ SFX2_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo(
     aTempStr = aImpl;
     aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
     xNewKey = xKey->createKey( aTempStr );
-    xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.document.StandaloneDocumentInfo") );
+    xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.StandaloneDocumentInfo")) );
 
     // frame loader
     aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
@@ -2212,7 +2210,7 @@ SFX2_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo(
     aTempStr = aImpl;
     aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
     xNewKey = xKey->createKey( aTempStr );
-    xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.ProtocolHandler") );
+    xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ProtocolHandler")) );
 
     // - sfx document templates
     aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
@@ -2221,7 +2219,7 @@ SFX2_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo(
     aTempStr = aImpl;
     aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
     xNewKey = xKey->createKey( aTempStr );
-    xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.DocumentTemplates") );
+    xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.DocumentTemplates")) );
 
     // quickstart wrapper service
     aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
@@ -2230,7 +2228,7 @@ SFX2_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo(
     aTempStr = aImpl;
     aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
     xNewKey = xKey->createKey( aTempStr );
-    xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.office.Quickstart") );
+    xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.office.Quickstart")) );
 
     // application script library container service
     aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
@@ -2239,7 +2237,7 @@ SFX2_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo(
     aTempStr = aImpl;
     aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
     xNewKey = xKey->createKey( aTempStr );
-    xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.script.ApplicationScriptLibraryContainer") );
+    xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.ApplicationScriptLibraryContainer")) );
 
     // application dialog library container service
     aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
@@ -2248,7 +2246,7 @@ SFX2_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo(
     aTempStr = aImpl;
     aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
     xNewKey = xKey->createKey( aTempStr );
-    xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.script.ApplicationDialogLibraryContainer") );
+    xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.ApplicationDialogLibraryContainer")) );
 
     // converter of fs folders to packages
     aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
@@ -2279,7 +2277,7 @@ SFX2_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo(
     aTempStr = aImpl;
     aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
     xNewKey = xKey->createKey( aTempStr );
-    xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.document.DocumentProperties") );
+    xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.DocumentProperties")) );
 
 
     // writer compatable document properties
@@ -2289,7 +2287,7 @@ SFX2_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo(
     aTempStr = aImpl;
     aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
     xNewKey = xKey->createKey( aTempStr );
-    xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.writer.DocumentProperties") );
+    xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.writer.DocumentProperties")) );
 
     return sal_True;
 }
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index edb3fe7aa43c..77b2ddc617f4 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -419,7 +419,7 @@ String impl_getFilter( const String& _rURL )
     {
         css::uno::Reference< ::com::sun::star::document::XTypeDetection > xTypeDetection(
             ::comphelper::getProcessServiceFactory()->createInstance(
-                ::rtl::OUString::createFromAscii("com.sun.star.document.TypeDetection") ),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection")) ),
                 css::uno::UNO_QUERY );
         if ( xTypeDetection.is() )
         {
@@ -436,7 +436,7 @@ String impl_getFilter( const String& _rURL )
                 {
                     ::comphelper::SequenceAsHashMap lTypeProps( xTypeCont->getByName( sType ) );
                     sFilter = lTypeProps.getUnpackedValueOrDefault(
-                        ::rtl::OUString::createFromAscii("PreferredFilter"), ::rtl::OUString() );
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PreferredFilter")), ::rtl::OUString() );
                 }
             }
         }
diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx
index 8383b9f18883..78a1f3399819 100644
--- a/sfx2/source/appl/helpinterceptor.cxx
+++ b/sfx2/source/appl/helpinterceptor.cxx
@@ -162,7 +162,7 @@ Reference< XDispatch > SAL_CALL HelpInterceptor_Impl::queryDispatch(
 
     // INetURLObject aObj( aURL.Complete );
     // sal_Bool bHelpURL = ( aObj.GetProtocol() == INET_PROT_VND_SUN_STAR_HELP );
-    BOOL bHelpURL = aURL.Complete.toAsciiLowerCase().match(rtl::OUString::createFromAscii("vnd.sun.star.help"),0);
+    BOOL bHelpURL = aURL.Complete.toAsciiLowerCase().match(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.help")),0);
 
     if ( bHelpURL )
     {
@@ -334,33 +334,25 @@ void SAL_CALL HelpListener_Impl::disposing( const ::com::sun::star::lang::EventO
     pInterceptor->removeStatusListener( this, ::com::sun::star::util::URL() );
     pInterceptor = NULL;
 }
-/*-- 05.09.2002 12:17:59---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 HelpStatusListener_Impl::HelpStatusListener_Impl(
         Reference < XDispatch > aDispatch, URL& rURL)
 {
     aDispatch->addStatusListener(this, rURL);
 }
-/*-- 05.09.2002 12:17:59---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 HelpStatusListener_Impl::~HelpStatusListener_Impl()
 {
     if(xDispatch.is())
         xDispatch->removeStatusListener(this, com::sun::star::util::URL());
 }
-/*-- 05.09.2002 12:17:59---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void HelpStatusListener_Impl::statusChanged(
     const FeatureStateEvent& rEvent ) throw( RuntimeException )
 {
     aStateEvent = rEvent;
 }
-/*-- 05.09.2002 12:18:00---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void HelpStatusListener_Impl::disposing( const EventObject& ) throw( RuntimeException )
 {
     xDispatch->removeStatusListener(this, com::sun::star::util::URL());
diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx
index 85810cd95a17..569c14c8154e 100644
--- a/sfx2/source/appl/imagemgr.cxx
+++ b/sfx2/source/appl/imagemgr.cxx
@@ -68,7 +68,11 @@ typedef std::hash_map< ::rtl::OUString,
                        ::std::equal_to< ::rtl::OUString > > ModuleIdToImagegMgr;
 
 
-Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast )
+Image SAL_CALL GetImage(
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    const ::rtl::OUString& aURL,
+    BOOL bBig
+)
 {
     // TODO/LATeR: shouldn't this become a method at SfxViewFrame?! That would save the UnoTunnel
     if ( !rFrame.is() )
@@ -128,8 +132,6 @@ Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::sta
                             ::com::sun::star::ui::ImageType::SIZE_DEFAULT );
     if ( bBig )
         nImageType |= ::com::sun::star::ui::ImageType::SIZE_LARGE;
-    if ( bHiContrast )
-        nImageType |= ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST;
 
     if ( xDocImgMgr.is() )
     {
@@ -211,7 +213,7 @@ Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::sta
             if ( !!aImage )
                 return aImage;
             else if ( nProtocol != INET_PROT_UNO && nProtocol != INET_PROT_SLOT )
-                return SvFileInformationManager::GetImageNoDefault( aObj, bBig, bHiContrast );
+                return SvFileInformationManager::GetImageNoDefault( aObj, bBig );
         }
     }
     catch ( Exception& )
diff --git a/sfx2/source/appl/makefile.mk b/sfx2/source/appl/makefile.mk
index 72ac94a9b38e..a5831022d39a 100644
--- a/sfx2/source/appl/makefile.mk
+++ b/sfx2/source/appl/makefile.mk
@@ -53,6 +53,10 @@ CFLAGS+=-DENABLE_QUICKSTART_APPLET
         CDEFS+=-DDLL_NAME=libsfx$(DLLPOSTFIX)$(DLLPOST)
 .IF "$(ENABLE_SYSTRAY_GTK)"=="TRUE"
         PKGCONFIG_MODULES=gtk+-2.0
+.IF "$(ENABLE_GIO)"!=""
+        PKGCONFIG_MODULES+=gio-2.0
+        CDEFS+=-DENABLE_GIO
+.ENDIF
         .INCLUDE: pkg_config.mk
         CFLAGS+=$(PKGCONFIG_CFLAGS)
         CFLAGS+=-DENABLE_QUICKSTART_APPLET
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index 22c4214c464c..3235aa3e5bf3 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -66,12 +66,10 @@ public:
     SfxChildWinFactArr_Impl*    pFactArr;
     ImageList*                  pImgListSmall;
     ImageList*                  pImgListBig;
-    ImageList*                  pImgListHiSmall;
-    ImageList*                  pImgListHiBig;
 
                                 SfxModule_Impl();
                                 ~SfxModule_Impl();
-    ImageList*                  GetImageList( ResMgr*, BOOL, BOOL bHiContrast = FALSE );
+    ImageList*                  GetImageList( ResMgr* pResMgr, BOOL bBig );
 };
 
 SfxModule_Impl::SfxModule_Impl()
@@ -88,18 +86,15 @@ SfxModule_Impl::~SfxModule_Impl()
     delete pFactArr;
     delete pImgListSmall;
     delete pImgListBig;
-    delete pImgListHiSmall;
-    delete pImgListHiBig;
 }
 
-ImageList* SfxModule_Impl::GetImageList( ResMgr* pResMgr, BOOL bBig, BOOL bHiContrast )
+ImageList* SfxModule_Impl::GetImageList( ResMgr* pResMgr, BOOL bBig )
 {
-    ImageList*& rpList = bBig ? ( bHiContrast ? pImgListHiBig: pImgListBig ) :
-                                ( bHiContrast ? pImgListHiSmall : pImgListSmall );
+    ImageList*& rpList = bBig ? pImgListBig : pImgListSmall;
     if ( !rpList )
     {
-        ResId aResId( bBig ? ( bHiContrast ? RID_DEFAULTIMAGELIST_LCH : RID_DEFAULTIMAGELIST_LC ) :
-                             ( bHiContrast ? RID_DEFAULTIMAGELIST_SCH : RID_DEFAULTIMAGELIST_SC ), *pResMgr );
+        ResId aResId( bBig ? ( RID_DEFAULTIMAGELIST_LC ) : ( RID_DEFAULTIMAGELIST_SC ), *pResMgr );
+
         aResId.SetRT( RSC_IMAGELIST );
 
         DBG_ASSERT( pResMgr->IsAvailable(aResId), "No default ImageList!" );
@@ -128,16 +123,7 @@ ResMgr* SfxModule::GetResMgr()
 }
 
 //====================================================================
-/*
-SfxModule::SfxModule( ResMgr* pMgrP, BOOL bDummyP,
-                      SfxObjectFactory* pFactoryP )
-    : pResMgr( pMgrP ), bDummy( bDummyP ), pImpl(0L)
-{
-    Construct_Impl();
-    if ( pFactoryP )
-        pFactoryP->SetModule_Impl( this );
-}
-*/
+
 SfxModule::SfxModule( ResMgr* pMgrP, BOOL bDummyP,
                       SfxObjectFactory* pFactoryP, ... )
     : pResMgr( pMgrP ), bDummy( bDummyP ), pImpl(0L)
@@ -168,8 +154,6 @@ void SfxModule::Construct_Impl()
         pImpl->pFactArr=0;
         pImpl->pImgListSmall=0;
         pImpl->pImgListBig=0;
-        pImpl->pImgListHiSmall=0;
-        pImpl->pImgListHiBig=0;
 
         SetPool( &pApp->GetPool() );
     }
@@ -217,7 +201,6 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact)
     if (!pImpl->pFactArr)
         pImpl->pFactArr = new SfxChildWinFactArr_Impl;
 
-//#ifdef DBG_UTIL
     for (USHORT nFactory=0; nFactory<pImpl->pFactArr->Count(); ++nFactory)
     {
         if (pFact->nId ==  (*pImpl->pFactArr)[nFactory]->nId)
@@ -227,7 +210,6 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact)
             return;
         }
     }
-//#endif
 
     pImpl->pFactArr->C40_INSERT(
         SfxChildWinFactory, pFact, pImpl->pFactArr->Count() );
@@ -352,12 +334,7 @@ SfxChildWinFactArr_Impl* SfxModule::GetChildWinFactories_Impl() const
 
 ImageList* SfxModule::GetImageList_Impl( BOOL bBig )
 {
-    return pImpl->GetImageList( pResMgr, bBig, FALSE );
-}
-
-ImageList* SfxModule::GetImageList_Impl( BOOL bBig, BOOL bHiContrast )
-{
-    return pImpl->GetImageList( pResMgr, bBig, bHiContrast );
+    return pImpl->GetImageList( pResMgr, bBig );
 }
 
 SfxTabPage* SfxModule::CreateTabPage( USHORT, Window*, const SfxItemSet& )
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index fd5b7193db0d..eb6021f9cdf4 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -292,13 +292,6 @@ ContentListBox_Impl::ContentListBox_Impl( Window* pParent, const ResId& rResId )
     aDocumentImage      ( SfxResId( IMG_HELP_CONTENT_DOC ) )
 
 {
-    if ( GetSettings().GetStyleSettings().GetHighContrastMode() )
-    {
-        aOpenBookImage = Image( SfxResId( IMG_HELP_CONTENT_BOOK_OPEN_HC ) );
-        aClosedBookImage = Image( SfxResId( IMG_HELP_CONTENT_BOOK_CLOSED_HC ) );
-        aDocumentImage = Image( SfxResId( IMG_HELP_CONTENT_DOC_HC ) );
-    }
-
     SetWindowBits( WB_HIDESELECTION | WB_HSCROLL );
 
     SetEntryHeight( 16 );
@@ -1314,7 +1307,7 @@ void BookmarksBox_Impl::DoAction( USHORT nAction )
                     RemoveEntry( nPos );
                     rtl::OUString aImageURL = IMAGE_URL;
                     aImageURL += INetURLObject( *pURL ).GetHost();
-                    nPos = InsertEntry( aDlg.GetTitle(), SvFileInformationManager::GetImage( aImageURL ) );
+                    nPos = InsertEntry( aDlg.GetTitle(), SvFileInformationManager::GetImage( aImageURL, false ) );
                     SetEntryData( nPos, (void*)(ULONG)( new String( *pURL ) ) );
                     SelectEntryPos( nPos );
                     delete pURL;
@@ -1487,7 +1480,7 @@ void BookmarksTabPage_Impl::AddBookmarks( const String& rTitle, const String& rU
 {
     rtl::OUString aImageURL = IMAGE_URL;
     aImageURL += INetURLObject( rURL ).GetHost();
-    USHORT nPos = aBookmarksBox.InsertEntry( rTitle, SvFileInformationManager::GetImage( aImageURL ) );
+    USHORT nPos = aBookmarksBox.InsertEntry( rTitle, SvFileInformationManager::GetImage( aImageURL, false ) );
     aBookmarksBox.SetEntryData( nPos, (void*)(ULONG)( new String( rURL ) ) );
 }
 
@@ -1534,7 +1527,6 @@ void SfxHelpWindow_Impl::loadHelpContent(const ::rtl::OUString& sHelpURL, sal_Bo
     if (!xLoader.is())
         return;
 
-    // --> PB 2007-03-12 #134037#
     // If a print job runs do not open a new page
     Reference< XFrame >      xTextFrame      = pTextWin->getFrame();
     Reference< XController > xTextController ;
@@ -1545,7 +1537,6 @@ void SfxHelpWindow_Impl::loadHelpContent(const ::rtl::OUString& sHelpURL, sal_Bo
         xTextController->suspend( sal_False );
         return;
     }
-    // <--
 
     // save url to history
     if (bAddToHistory)
@@ -2174,34 +2165,35 @@ sal_Bool SfxHelpTextWindow_Impl::HasSelection() const
 void SfxHelpTextWindow_Impl::InitToolBoxImages()
 {
     sal_Bool bLarge = SvtMiscOptions().AreCurrentSymbolsLarge();
-    sal_Bool bHiContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
-    aIndexOnImage = Image( SfxResId(
-        bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_INDEX_ON : IMG_HELP_TOOLBOX_L_INDEX_ON
-               : bHiContrast ? IMG_HELP_TOOLBOX_HC_INDEX_ON : IMG_HELP_TOOLBOX_INDEX_ON ) );
-    aIndexOffImage = Image( SfxResId(
-        bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_INDEX_OFF : IMG_HELP_TOOLBOX_L_INDEX_OFF
-               : bHiContrast ? IMG_HELP_TOOLBOX_HC_INDEX_OFF : IMG_HELP_TOOLBOX_INDEX_OFF ) );
+
+    aIndexOnImage  = Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_INDEX_ON  : IMG_HELP_TOOLBOX_INDEX_ON  ) );
+    aIndexOffImage = Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_INDEX_OFF : IMG_HELP_TOOLBOX_INDEX_OFF ) );
+
     aToolBox.SetItemImage( TBI_INDEX, bIsIndexOn ? aIndexOffImage : aIndexOnImage );
 
-    aToolBox.SetItemImage( TBI_BACKWARD, Image( SfxResId(
-        bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_PREV : IMG_HELP_TOOLBOX_L_PREV
-               : bHiContrast ? IMG_HELP_TOOLBOX_HC_PREV : IMG_HELP_TOOLBOX_PREV ) ) );
-    aToolBox.SetItemImage( TBI_FORWARD, Image( SfxResId(
-        bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_NEXT : IMG_HELP_TOOLBOX_L_NEXT
-               : bHiContrast ? IMG_HELP_TOOLBOX_HC_NEXT : IMG_HELP_TOOLBOX_NEXT ) ) );
-    aToolBox.SetItemImage( TBI_START, Image( SfxResId(
-        bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_START : IMG_HELP_TOOLBOX_L_START
-               : bHiContrast ? IMG_HELP_TOOLBOX_HC_START : IMG_HELP_TOOLBOX_START ) ) );
-    aToolBox.SetItemImage( TBI_PRINT, Image( SfxResId(
-        bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_PRINT : IMG_HELP_TOOLBOX_L_PRINT
-               : bHiContrast ? IMG_HELP_TOOLBOX_HC_PRINT : IMG_HELP_TOOLBOX_PRINT ) ) );
-    aToolBox.SetItemImage( TBI_BOOKMARKS, Image( SfxResId(
-        bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_BOOKMARKS : IMG_HELP_TOOLBOX_L_BOOKMARKS
-               : bHiContrast ? IMG_HELP_TOOLBOX_HC_BOOKMARKS : IMG_HELP_TOOLBOX_BOOKMARKS ) ) );
-    aToolBox.SetItemImage( TBI_SEARCHDIALOG, Image( SfxResId(
-        bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_SEARCHDIALOG : IMG_HELP_TOOLBOX_L_SEARCHDIALOG
-               : bHiContrast ? IMG_HELP_TOOLBOX_HC_SEARCHDIALOG : IMG_HELP_TOOLBOX_SEARCHDIALOG ) ) );
+    aToolBox.SetItemImage( TBI_BACKWARD,
+                           Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_PREV : IMG_HELP_TOOLBOX_PREV ) )
+    );
+
+    aToolBox.SetItemImage( TBI_FORWARD,
+                           Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_NEXT : IMG_HELP_TOOLBOX_NEXT ) )
+    );
+
+    aToolBox.SetItemImage( TBI_START,
+                           Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_START : IMG_HELP_TOOLBOX_START ) )
+    );
+
+    aToolBox.SetItemImage( TBI_PRINT,
+                           Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_PRINT : IMG_HELP_TOOLBOX_PRINT ) )
+    );
+
+    aToolBox.SetItemImage( TBI_BOOKMARKS,
+                           Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_BOOKMARKS : IMG_HELP_TOOLBOX_BOOKMARKS ) )
+    );
+
+    aToolBox.SetItemImage( TBI_SEARCHDIALOG,
+                           Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_SEARCHDIALOG : IMG_HELP_TOOLBOX_SEARCHDIALOG ) )
+    );
 
     Size aSize = aToolBox.CalcWindowSizePixel();
     aSize.Height() += TOOLBOX_OFFSET;
@@ -2580,7 +2572,6 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
 
         if ( pCmdEvt->GetCommand() == COMMAND_CONTEXTMENU && pCmdWin != this && pCmdWin != &aToolBox )
         {
-            sal_Bool bHiContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
             Point aPos;
             if ( pCmdEvt->IsMouseEvent() )
                 aPos = pCmdEvt->GetMousePosPixel();
@@ -2589,33 +2580,44 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
             aPos.Y() += pTextWin->GetPosPixel().Y();
             PopupMenu aMenu;
             if ( bIsIndexOn )
-                aMenu.InsertItem( TBI_INDEX, aIndexOffText, Image( SfxResId(
-                    bHiContrast ? IMG_HELP_TOOLBOX_HC_INDEX_OFF : IMG_HELP_TOOLBOX_INDEX_OFF ) ) );
+                aMenu.InsertItem( TBI_INDEX, aIndexOffText, Image( SfxResId( IMG_HELP_TOOLBOX_INDEX_OFF ) ) );
             else
-                aMenu.InsertItem( TBI_INDEX, aIndexOnText, Image( SfxResId(
-                    bHiContrast ? IMG_HELP_TOOLBOX_HC_INDEX_ON : IMG_HELP_TOOLBOX_INDEX_ON ) ) );
+                aMenu.InsertItem( TBI_INDEX, aIndexOnText,  Image( SfxResId( IMG_HELP_TOOLBOX_INDEX_ON  ) ) );
+
             aMenu.SetHelpId( TBI_INDEX, HID_HELP_TOOLBOXITEM_INDEX );
             aMenu.InsertSeparator();
-            aMenu.InsertItem( TBI_BACKWARD, String( SfxResId( STR_HELP_BUTTON_PREV ) ),
-                Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_PREV : IMG_HELP_TOOLBOX_PREV ) ) );
+            aMenu.InsertItem( TBI_BACKWARD,
+                              String( SfxResId( STR_HELP_BUTTON_PREV  ) ),
+                              Image(  SfxResId( IMG_HELP_TOOLBOX_PREV ) )
+            );
             aMenu.SetHelpId( TBI_BACKWARD, HID_HELP_TOOLBOXITEM_BACKWARD );
             aMenu.EnableItem( TBI_BACKWARD, pHelpWin->HasHistoryPredecessor() );
-            aMenu.InsertItem( TBI_FORWARD, String( SfxResId( STR_HELP_BUTTON_NEXT ) ),
-                Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_NEXT : IMG_HELP_TOOLBOX_NEXT ) ) );
+            aMenu.InsertItem( TBI_FORWARD,
+                              String( SfxResId( STR_HELP_BUTTON_NEXT  ) ),
+                              Image(  SfxResId( IMG_HELP_TOOLBOX_NEXT ) )
+            );
             aMenu.SetHelpId( TBI_FORWARD, HID_HELP_TOOLBOXITEM_FORWARD );
             aMenu.EnableItem( TBI_FORWARD, pHelpWin->HasHistorySuccessor() );
-            aMenu.InsertItem( TBI_START, String( SfxResId( STR_HELP_BUTTON_START ) ),
-                Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_START : IMG_HELP_TOOLBOX_START ) ) );
+            aMenu.InsertItem( TBI_START,
+                              String( SfxResId( STR_HELP_BUTTON_START  ) ),
+                              Image(  SfxResId( IMG_HELP_TOOLBOX_START ) )
+            );
             aMenu.SetHelpId( TBI_START, HID_HELP_TOOLBOXITEM_START );
             aMenu.InsertSeparator();
-            aMenu.InsertItem( TBI_PRINT, String( SfxResId( STR_HELP_BUTTON_PRINT ) ),
-                Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_PRINT : IMG_HELP_TOOLBOX_PRINT ) ) );
+            aMenu.InsertItem( TBI_PRINT,
+                              String( SfxResId( STR_HELP_BUTTON_PRINT  ) ),
+                              Image(  SfxResId( IMG_HELP_TOOLBOX_PRINT ) )
+            );
             aMenu.SetHelpId( TBI_PRINT, HID_HELP_TOOLBOXITEM_PRINT );
-            aMenu.InsertItem( TBI_BOOKMARKS, String( SfxResId( STR_HELP_BUTTON_ADDBOOKMARK ) ),
-                Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_BOOKMARKS : IMG_HELP_TOOLBOX_BOOKMARKS ) ) );
+            aMenu.InsertItem( TBI_BOOKMARKS,
+                              String( SfxResId( STR_HELP_BUTTON_ADDBOOKMARK ) ),
+                              Image(  SfxResId( IMG_HELP_TOOLBOX_BOOKMARKS  ) )
+             );
             aMenu.SetHelpId( TBI_BOOKMARKS, HID_HELP_TOOLBOXITEM_BOOKMARKS );
-            aMenu.InsertItem( TBI_SEARCHDIALOG, String( SfxResId( STR_HELP_BUTTON_SEARCHDIALOG ) ),
-                Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_SEARCHDIALOG : IMG_HELP_TOOLBOX_SEARCHDIALOG ) ) );
+            aMenu.InsertItem( TBI_SEARCHDIALOG,
+                              String( SfxResId( STR_HELP_BUTTON_SEARCHDIALOG  ) ),
+                              Image(  SfxResId( IMG_HELP_TOOLBOX_SEARCHDIALOG ) )
+            );
             aMenu.SetHelpId( TBI_SEARCHDIALOG, HID_HELP_TOOLBOXITEM_SEARCHDIALOG );
             aMenu.InsertSeparator();
             aMenu.InsertItem( TBI_SELECTIONMODE, String( SfxResId( STR_HELP_MENU_TEXT_SELECTION_MODE ) ) );
@@ -2637,8 +2639,10 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
                 aMenu.CheckItem(TBI_SELECTIONMODE, bCheck);
             }
             aMenu.InsertSeparator();
-            aMenu.InsertItem( TBI_COPY, String( SfxResId( STR_HELP_MENU_TEXT_COPY ) ),
-                Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_COPY : IMG_HELP_TOOLBOX_COPY ) ) );
+            aMenu.InsertItem( TBI_COPY,
+                              String( SfxResId( STR_HELP_MENU_TEXT_COPY ) ),
+                              Image(  SfxResId( IMG_HELP_TOOLBOX_COPY   ) )
+            );
             aMenu.SetHelpId( TBI_COPY, SID_COPY );
             aMenu.EnableItem( TBI_COPY, HasSelection() );
 
@@ -3087,7 +3091,7 @@ IMPL_LINK( SfxHelpWindow_Impl, OpenHdl, SfxHelpIndexWindow_Impl* , EMPTYARG )
 //  INetURLObject aObj(aEntry);
 //  BOOL bComplete = ( aObj.GetProtocol() == INET_PROT_VND_SUN_STAR_HELP );
 
-    BOOL bComplete = rtl::OUString(aEntry).toAsciiLowerCase().match(rtl::OUString::createFromAscii("vnd.sun.star.help"),0);
+    BOOL bComplete = rtl::OUString(aEntry).toAsciiLowerCase().match(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.help")),0);
 
     if (bComplete)
         sHelpURL = ::rtl::OUString(aEntry);
diff --git a/sfx2/source/appl/newhelp.src b/sfx2/source/appl/newhelp.src
index 8a2b4f760f7e..c59eb50b193b 100644
--- a/sfx2/source/appl/newhelp.src
+++ b/sfx2/source/appl/newhelp.src
@@ -207,113 +207,118 @@ Image IMG_HELP_TOOLBOX_INDEX_ON
     ImageBitmap = Bitmap { File = "indexon_small.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_INDEX_OFF
 {
     ImageBitmap = Bitmap { File = "indexoff_small.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_START
 {
     ImageBitmap = Bitmap { File = "sc06303.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_PREV
 {
     ImageBitmap = Bitmap { File = "sc06301.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_NEXT
 {
     ImageBitmap = Bitmap { File = "sc06300.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_PRINT
 {
     ImageBitmap = Bitmap { File = "sc05504.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_BOOKMARKS
 {
     ImageBitmap = Bitmap { File = "favourite.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_SEARCHDIALOG
 {
     ImageBitmap = Bitmap { File = "sc05961.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_COPY
 {
     ImageBitmap = Bitmap { File = "sc05711.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_CONTENT_BOOK_OPEN
 {
     ImageBitmap = Bitmap { File = "hlpbookopen.bmp" ; };
     MASKCOLOR_MAGENTA
 };
-Image IMG_HELP_CONTENT_BOOK_OPEN_HC
-{
-    ImageBitmap = Bitmap { File = "hlpbookopen_h.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
+
 Image IMG_HELP_CONTENT_BOOK_CLOSED
 {
     ImageBitmap = Bitmap { File = "hlpbookclosed.bmp" ; };
     MASKCOLOR_MAGENTA
 };
-Image IMG_HELP_CONTENT_BOOK_CLOSED_HC
-{
-    ImageBitmap = Bitmap { File = "hlpbookclosed_h.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
+
 Image IMG_HELP_CONTENT_DOC
 {
     ImageBitmap = Bitmap { File = "hlpdoc.bmp" ; };
     MASKCOLOR_MAGENTA
 };
-Image IMG_HELP_CONTENT_DOC_HC
-{
-    ImageBitmap = Bitmap { File = "hlpdoc_h.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
 
 String STR_HELP_WINDOW_TITLE
 {
     Text [ en-US ] = "%PRODUCTNAME Help";
 };
+
 String STR_HELP_BUTTON_INDEX_ON
 {
     Text [ en-US ] = "Show Navigation Pane";
 };
+
 String STR_HELP_BUTTON_INDEX_OFF
 {
     Text [ en-US ] = "Hide Navigation Pane";
 };
+
 String STR_HELP_BUTTON_START
 {
     Text [ en-US ] = "First Page";
 };
+
 String STR_HELP_BUTTON_PREV
 {
     Text [ en-US ] = "Previous Page";
 };
+
 String STR_HELP_BUTTON_NEXT
 {
     Text [ en-US ] = "Next Page";
 };
+
 String STR_HELP_BUTTON_PRINT
 {
     Text [ en-US ] = "Print...";
 };
+
 String STR_HELP_BUTTON_ADDBOOKMARK
 {
     Text [ en-US ] = "Add to Bookmarks...";
 };
+
 String STR_HELP_BUTTON_SEARCHDIALOG
 {
     Text [ en-US ] = "Find on this Page...";
 };
+
 String STR_HELP_BUTTON_SOURCEVIEW
 {
     Text [ en-US ] = "HTML Source";
@@ -323,18 +328,22 @@ String STR_HELP_FIRST_MESSAGE
 {
     Text [ en-US ] = "The Help is being started...";
 };
+
 String STR_HELP_FIRST_HTML
 {
     Text = "<html></head><body><center><br></br><br></br><p><tt>%1</tt></center></body></html>";
 };
+
 String STR_HELP_MENU_TEXT_SELECTION_MODE
 {
     Text [ en-US ] = "Select Text";
 };
+
 String STR_HELP_MENU_TEXT_COPY
 {
     Text [ en-US ] = "~Copy" ;
 };
+
 ModalDialog DLG_HELP_ADDBOOKMARK
 {
     Size = MAP_APPFONT ( 208 , 43 ) ;
@@ -428,144 +437,60 @@ InfoBox RID_INFO_NOSEARCHTEXTFOUND
     Message [ en-US ] = "The text you entered was not found.";
 };
 
-Image IMG_HELP_TOOLBOX_HC_INDEX_ON
-{
-    ImageBitmap = Bitmap { File = "indexon_small_h.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HC_INDEX_OFF
-{
-    ImageBitmap = Bitmap { File = "indexoff_small_h.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HC_START
-{
-    ImageBitmap = Bitmap { File = "sch06303.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HC_PREV
-{
-    ImageBitmap = Bitmap { File = "sch06301.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HC_NEXT
-{
-    ImageBitmap = Bitmap { File = "sch06300.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HC_PRINT
-{
-    ImageBitmap = Bitmap { File = "sch05504.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HC_BOOKMARKS
-{
-    ImageBitmap = Bitmap { File = "favourite_h.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HC_SEARCHDIALOG
-{
-    ImageBitmap = Bitmap { File = "sch05961.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HC_COPY
-{
-    ImageBitmap = Bitmap { File = "sch05711.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-
 Image IMG_HELP_TOOLBOX_L_INDEX_ON
 {
     ImageBitmap = Bitmap { File = "indexon_big.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_L_INDEX_OFF
 {
     ImageBitmap = Bitmap { File = "indexoff_big.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_L_START
 {
     ImageBitmap = Bitmap { File = "lc06303.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_L_PREV
 {
     ImageBitmap = Bitmap { File = "lc06301.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_L_NEXT
 {
     ImageBitmap = Bitmap { File = "lc06300.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_L_PRINT
 {
     ImageBitmap = Bitmap { File = "lc05504.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_L_BOOKMARKS
 {
     ImageBitmap = Bitmap { File = "favourite_big.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_L_SEARCHDIALOG
 {
     ImageBitmap = Bitmap { File = "lc05961.bmp" ; };
     MASKCOLOR_MAGENTA
 };
+
 Image IMG_HELP_TOOLBOX_L_COPY
 {
     ImageBitmap = Bitmap { File = "lc05711.bmp" ; };
     MASKCOLOR_MAGENTA
 };
 
-Image IMG_HELP_TOOLBOX_HCL_INDEX_ON
-{
-    ImageBitmap = Bitmap { File = "indexon_big_h.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HCL_INDEX_OFF
-{
-    ImageBitmap = Bitmap { File = "indexoff_big_h.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HCL_START
-{
-    ImageBitmap = Bitmap { File = "lch06303.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HCL_PREV
-{
-    ImageBitmap = Bitmap { File = "lch06301.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HCL_NEXT
-{
-    ImageBitmap = Bitmap { File = "lch06300.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HCL_PRINT
-{
-    ImageBitmap = Bitmap { File = "lch05504.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HCL_BOOKMARKS
-{
-    ImageBitmap = Bitmap { File = "favourite_big_h.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HCL_SEARCHDIALOG
-{
-    ImageBitmap = Bitmap { File = "lch05961.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-Image IMG_HELP_TOOLBOX_HCL_COPY
-{
-    ImageBitmap = Bitmap { File = "lch05711.bmp" ; };
-    MASKCOLOR_MAGENTA
-};
-
 CheckBox RID_HELP_ONSTARTUP_BOX
 {
     HelpId = HID_HELP_ONSTARTUP_BOX;
@@ -573,8 +498,8 @@ CheckBox RID_HELP_ONSTARTUP_BOX
     TabStop = TRUE;
     Size = MAP_APPFONT ( 200 , 10 ) ;
 };
+
 String RID_HELP_ONSTARTUP_TEXT
 {
     Text [ en-US ] = "~Display %PRODUCTNAME %MODULENAME Help at Startup";
 };
-
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index bef55646ae92..7b867c284bfd 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -49,6 +49,8 @@
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/frame/XModuleManager.hpp>
+#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
 #include <unotools/configmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <svtools/helpopt.hxx>
@@ -84,6 +86,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::system;
 
 #define ERROR_TAG   String( DEFINE_CONST_UNICODE("Error: ") )
 #define PATH_TAG    String( DEFINE_CONST_UNICODE("\nPath: ") )
@@ -183,7 +186,7 @@ sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor )
     {
         ::ucbhelper::Content aCnt( INetURLObject( _rURL ).GetMainURL( INetURLObject::NO_DECODE ),
                              Reference< ::com::sun::star::ucb::XCommandEnvironment > () );
-        if ( ( aCnt.getPropertyValue( ::rtl::OUString::createFromAscii( "AnchorName" ) ) >>= sAnchor ) )
+        if ( ( aCnt.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AnchorName")) ) >>= sAnchor ) )
         {
 
             if ( sAnchor.getLength() > 0 )
@@ -237,7 +240,7 @@ static Sequence< ::rtl::OUString > GetPropertyNames()
 }
 
 SfxHelpOptions_Impl::SfxHelpOptions_Impl()
-    : ConfigItem( ::rtl::OUString::createFromAscii("Office.SFX/Help") )
+    : ConfigItem( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.SFX/Help")) )
     , m_pIds( NULL )
 {
     Sequence< ::rtl::OUString > aNames = GetPropertyNames();
@@ -640,28 +643,7 @@ String  SfxHelp::CreateHelpURL_Impl( const String& aCommandURL, const String& rM
 
     String aModuleName( rModuleName );
     if ( aModuleName.Len() == 0 )
-    {
-        // no active module (quicklaunch?) -> detect default module
-        SvtModuleOptions aModOpt;
-        if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) )
-            aModuleName = DEFINE_CONST_UNICODE("swriter");
-        else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) )
-            aModuleName = DEFINE_CONST_UNICODE("scalc");
-        else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) )
-            aModuleName = DEFINE_CONST_UNICODE("simpress");
-        else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) )
-            aModuleName = DEFINE_CONST_UNICODE("sdraw");
-        else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SMATH ) )
-            aModuleName = DEFINE_CONST_UNICODE("smath");
-        else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SCHART ) )
-            aModuleName = DEFINE_CONST_UNICODE("schart");
-        else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SBASIC ) )
-            aModuleName = DEFINE_CONST_UNICODE("sbasic");
-        else
-        {
-            DBG_ERRORFILE( "no installed module found" );
-        }
-    }
+        aModuleName = getDefaultModule_Impl();
 
     aHelpURL = String::CreateFromAscii("vnd.sun.star.help://");
     aHelpURL += aModuleName;
@@ -742,25 +724,41 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame >& rHelpTask   ,
     return pHelpWindow;
 }
 
-BOOL SfxHelp::Start( const String& rURL, const Window* pWindow )
+static bool impl_showOnlineHelp( const String& rURL )
 {
-    // check if help is available
-    String aHelpRootURL( DEFINE_CONST_OUSTRING("vnd.sun.star.help://") );
-    AppendConfigToken_Impl( aHelpRootURL, sal_True );
-    Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet( aHelpRootURL );
-    if ( 0 == aFactories.getLength() )
+    String aInternal( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" ) );
+    if ( rURL.Len() <= aInternal.Len() || rURL.Copy( 0, aInternal.Len() ) != aInternal )
+        return false;
+
+    rtl::OUString aHelpLink( RTL_CONSTASCII_USTRINGPARAM( "http://help.libreoffice.org/" ) );
+    aHelpLink += rURL.Copy( aInternal.Len() );
+    try
     {
-        // no factories -> no help -> error message and return
-        NoHelpErrorBox aErrBox( const_cast< Window* >( pWindow ) );
-        aErrBox.Execute();
-        return FALSE;
+        Reference< XSystemShellExecute > xSystemShell(
+                ::comphelper::getProcessServiceFactory()->createInstance(
+                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" ) ) ),
+                UNO_QUERY );
+
+        if ( xSystemShell.is() )
+        {
+            xSystemShell->execute( aHelpLink, rtl::OUString(), SystemShellExecuteFlags::DEFAULTS );
+            return true;
+        }
     }
+    catch( const Exception& )
+    {
+    }
+    return false;
+}
+
+BOOL SfxHelp::Start( const String& rURL, const Window* pWindow )
+{
+    String aHelpURL( rURL );
+    INetURLObject aParser( aHelpURL );
+    INetProtocol nProtocol = aParser.GetProtocol();
 
     // check if it's an URL or a jump mark!
-    String          aHelpURL(rURL    );
-    INetURLObject   aParser (aHelpURL);
     ::rtl::OUString sKeyword;
-    INetProtocol nProtocol = aParser.GetProtocol();
     if ( nProtocol != INET_PROT_VND_SUN_STAR_HELP )
     {
         // #i90162 Accept anything that is not invalid as help id, as both
@@ -782,7 +780,7 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow )
         }
         else
         {
-            aHelpURL  = CreateHelpURL_Impl( 0, GetHelpModuleName_Impl( ) );
+            aHelpURL = CreateHelpURL_Impl( 0, GetHelpModuleName_Impl( ) );
 
             // pb i91715: strings begin with ".HelpId:" are not words of the basic ide
             // they are helpid-strings used by the testtool -> so we ignore them
@@ -792,6 +790,23 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow )
         }
     }
 
+    // check if help is available
+    String aHelpRootURL( DEFINE_CONST_OUSTRING("vnd.sun.star.help://") );
+    AppendConfigToken_Impl( aHelpRootURL, sal_True );
+    Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet( aHelpRootURL );
+    if ( 0 == aFactories.getLength() )
+    {
+        // no factories -> no help -> try online
+        if ( impl_showOnlineHelp( aHelpURL ) )
+            return TRUE;
+        else
+        {
+            NoHelpErrorBox aErrBox( const_cast< Window* >( pWindow ) );
+            aErrBox.Execute();
+            return FALSE;
+        }
+    }
+
     Reference < XFrame > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(
         DEFINE_CONST_UNICODE("com.sun.star.frame.Desktop") ), UNO_QUERY );
 
@@ -955,7 +970,7 @@ void SfxHelp::OpenHelpAgent( ULONG nHelpId )
                 URL aURL;
                 aURL.Complete = CreateHelpURL_Impl( nHelpId, GetHelpModuleName_Impl() );
                 Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
-                    ::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" ) ), UNO_QUERY );
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer")) ), UNO_QUERY );
                 xTrans->parseStrict(aURL);
 
                 Reference < XFrame > xCurrentFrame;
@@ -968,7 +983,7 @@ void SfxHelp::OpenHelpAgent( ULONG nHelpId )
                 Reference< XDispatch > xHelpDispatch;
                 if ( xDispProv.is() )
                     xHelpDispatch = xDispProv->queryDispatch(
-                        aURL, ::rtl::OUString::createFromAscii("_helpagent"),
+                        aURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_helpagent")),
                         FrameSearchFlag::PARENT | FrameSearchFlag::SELF );
 
                 DBG_ASSERT( xHelpDispatch.is(), "OpenHelpAgent: could not get a dispatcher!" );
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index f08bbadcc300..2dece8ce8102 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -182,6 +182,9 @@ bool ShutdownIcon::LoadModule( osl::Module **pModule,
     return true;
 }
 
+// These two timeouts are necessary to avoid there being
+// plugin frames still on the stack, after unloading that
+// code, causing a crash during disabling / termination.
 class IdleUnloader : Timer
 {
     ::osl::Module *m_pModule;
@@ -199,6 +202,22 @@ public:
     }
 };
 
+class IdleTerminate : Timer
+{
+    Reference< XDesktop > m_xDesktop;
+public:
+    IdleTerminate (Reference< XDesktop > xDesktop)
+    {
+        m_xDesktop = xDesktop;
+        Start();
+    }
+    virtual void Timeout()
+    {
+        m_xDesktop->terminate();
+        delete this;
+    }
+};
+
 void ShutdownIcon::initSystray()
 {
     if (m_bInitialized)
@@ -264,7 +283,7 @@ void ShutdownIcon::OpenURL( const ::rtl::OUString& aURL, const ::rtl::OUString&
             aDispatchURL.Complete = aURL;
 
             Reference < com::sun::star::util::XURLTransformer > xURLTransformer(
-                ::comphelper::getProcessServiceFactory()->createInstance( OUString::createFromAscii("com.sun.star.util.URLTransformer") ),
+                ::comphelper::getProcessServiceFactory()->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer")) ),
                 com::sun::star::uno::UNO_QUERY );
             if ( xURLTransformer.is() )
             {
@@ -314,7 +333,7 @@ void ShutdownIcon::FromTemplate()
 
         URL aTargetURL;
         aTargetURL.Complete = OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:5500" ) );
-        Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY );
+        Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
         xTrans->parseStrict( aTargetURL );
 
         Reference < ::com::sun::star::frame::XDispatchProvider > xProv( xFrame, UNO_QUERY );
@@ -324,14 +343,14 @@ void ShutdownIcon::FromTemplate()
             if ( aTargetURL.Protocol.compareToAscii("slot:") == COMPARE_EQUAL )
                 xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
             else
-                xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString::createFromAscii("_blank"), 0 );
+                xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_blank")), 0 );
         }
         if ( xDisp.is() )
         {
             Sequence<PropertyValue> aArgs(1);
             PropertyValue* pArg = aArgs.getArray();
-            pArg[0].Name = rtl::OUString::createFromAscii("Referer");
-            pArg[0].Value <<= ::rtl::OUString::createFromAscii("private:user");
+            pArg[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
+            pArg[0].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:user"));
             Reference< ::com::sun::star::frame::XNotifyingDispatch > xNotifyer( xDisp, UNO_QUERY );
             if ( xNotifyer.is() )
             {
@@ -418,18 +437,18 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
                 Sequence< PropertyValue >   aArgs(3);
 
                 Reference < com::sun::star::task::XInteractionHandler > xInteraction(
-                    ::comphelper::getProcessServiceFactory()->createInstance( OUString::createFromAscii("com.sun.star.task.InteractionHandler") ),
+                    ::comphelper::getProcessServiceFactory()->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler")) ),
                     com::sun::star::uno::UNO_QUERY );
 
-                aArgs[0].Name = OUString::createFromAscii( "InteractionHandler" );
+                aArgs[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("InteractionHandler"));
                 aArgs[0].Value <<= xInteraction;
 
                 sal_Int16 nMacroExecMode = ::com::sun::star::document::MacroExecMode::USE_CONFIG;
-                aArgs[1].Name = OUString::createFromAscii( "MacroExecutionMode" );
+                aArgs[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("MacroExecutionMode"));
                 aArgs[1].Value <<= nMacroExecMode;
 
                 sal_Int16 nUpdateDoc = ::com::sun::star::document::UpdateDocMode::ACCORDING_TO_CONFIG;
-                aArgs[2].Name = OUString::createFromAscii( "UpdateDocMode" );
+                aArgs[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("UpdateDocMode"));
                 aArgs[2].Value <<= nUpdateDoc;
 
                 // pb: #102643# use the filedlghelper to get the current filter name,
@@ -451,7 +470,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
                     if ( bReadOnly )
                     {
                         aArgs.realloc( ++nArgs );
-                        aArgs[nArgs-1].Name  = OUString::createFromAscii( "ReadOnly" );
+                        aArgs[nArgs-1].Name  = OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
                         aArgs[nArgs-1].Value <<= bReadOnly;
                     }
 
@@ -466,7 +485,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
                         sal_Int16   uVersion = (sal_Int16)iVersion;
 
                         aArgs.realloc( ++nArgs );
-                        aArgs[nArgs-1].Name  = OUString::createFromAscii( "Version" );
+                        aArgs[nArgs-1].Name  = OUString(RTL_CONSTASCII_USTRINGPARAM("Version"));
                         aArgs[nArgs-1].Value <<= uVersion;
                     }
 
@@ -491,7 +510,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
                         if ( aFilterName.getLength() )
                         {
                             aArgs.realloc( ++nArgs );
-                            aArgs[nArgs-1].Name  = OUString::createFromAscii( "FilterName" );
+                            aArgs[nArgs-1].Name  = OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName"));
                             aArgs[nArgs-1].Value <<= aFilterName;
                         }
                     }
@@ -503,7 +522,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
                 {
                     OUString    aBaseDirURL = sFiles[0];
                     if ( aBaseDirURL.getLength() > 0 && aBaseDirURL[aBaseDirURL.getLength()-1] != '/' )
-                        aBaseDirURL += OUString::createFromAscii("/");
+                        aBaseDirURL += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
                     int iFiles;
                     for ( iFiles = 1; iFiles < nFiles; iFiles++ )
@@ -576,11 +595,8 @@ void ShutdownIcon::terminateDesktop()
     if ( xSupplier.is() )
     {
         Reference< XIndexAccess > xTasks ( xSupplier->getFrames(), UNO_QUERY );
-        if( xTasks.is() )
-        {
-            if( xTasks->getCount() < 1 )
-                xDesktop->terminate();
-        }
+        if( xTasks.is() && xTasks->getCount() < 1 )
+            new IdleTerminate( xDesktop );
     }
 
     // remove the instance pointer
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index 510c6ca967dc..db0f232e190f 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -19,6 +19,10 @@
 #include "shutdownicon.hxx"
 #endif
 
+#ifdef ENABLE_GIO
+#include <gio/gio.h>
+#endif
+
 // Cut/paste from vcl/inc/svids.hrc
 #define SV_ICON_SMALL_START                 25000
 
@@ -39,6 +43,9 @@ static EggTrayIcon *pTrayIcon;
 static GtkWidget *pExitMenuItem = NULL;
 static GtkWidget *pOpenMenuItem = NULL;
 static GtkWidget *pDisableMenuItem = NULL;
+#ifdef ENABLE_GIO
+GFileMonitor* pMonitor = NULL;
+#endif
 
 static void open_url_cb( GtkWidget *, gpointer data )
 {
@@ -66,11 +73,14 @@ static void systray_disable_cb()
 
 static void exit_quickstarter_cb( GtkWidget * )
 {
-    egg_tray_icon_cancel_message (pTrayIcon, 1 );
-    plugin_shutdown_sys_tray();
-    //terminate may cause this .so to be unloaded. So we must be hands off
-    //all calls into this .so after this call
-    ShutdownIcon::terminateDesktop();
+    if (pTrayIcon)
+    {
+        egg_tray_icon_cancel_message (pTrayIcon, 1 );
+        plugin_shutdown_sys_tray();
+        //terminate may cause this .so to be unloaded. So we must be hands off
+        //all calls into this .so after this call
+        ShutdownIcon::terminateDesktop();
+    }
 }
 
 static void menu_deactivate_cb( GtkWidget *pMenu )
@@ -91,7 +101,8 @@ static GdkPixbuf * ResIdToPixbuf( USHORT nResId )
     g_return_val_if_fail( pSalBitmap != NULL, NULL );
 
     Size aSize( pSalBitmap->Width(), pSalBitmap->Height() );
-    g_return_val_if_fail( Size( pSalAlpha->Width(), pSalAlpha->Height() ) == aSize, NULL );
+    if (pSalAlpha)
+        g_return_val_if_fail( Size( pSalAlpha->Width(), pSalAlpha->Height() ) == aSize, NULL );
 
     int nX, nY;
     guchar *pPixbufData = ( guchar * )g_malloc( 4 * aSize.Width() * aSize.Height() );
@@ -354,6 +365,22 @@ extern "C" {
     }
 }
 
+#ifdef ENABLE_GIO
+/*
+ * See rhbz#610103. If the quickstarter is running, then LibreOffice is
+ * upgraded, then the old quickstarter is still running, but is now unreliable
+ * as the old install has been deleted. A fairly intractable problem but we
+ * can avoid much of the pain if we turn off the quickstarter if we detect
+ * that it has been physically deleted.
+*/
+static void notify_file_changed(GFileMonitor * /*gfilemonitor*/, GFile * /*arg1*/,
+    GFile * /*arg2*/, GFileMonitorEvent event_type, gpointer /*user_data*/)
+{
+    if (event_type == G_FILE_MONITOR_EVENT_DELETED)
+        exit_quickstarter_cb(GTK_WIDGET(pTrayIcon));
+}
+#endif
+
 void SAL_DLLPUBLIC_EXPORT plugin_init_sys_tray()
 {
     ::SolarMutexGuard aGuard;
@@ -396,6 +423,23 @@ void SAL_DLLPUBLIC_EXPORT plugin_init_sys_tray()
     // disable shutdown
     pShutdownIcon->SetVeto( true );
     pShutdownIcon->addTerminateListener();
+
+    g_signal_connect(GTK_WIDGET(pTrayIcon), "destroy",
+            G_CALLBACK(exit_quickstarter_cb), NULL);
+
+#ifdef ENABLE_GIO
+    GFile* pFile = NULL;
+    rtl::OUString sLibraryFileUrl;
+    if (osl::Module::getUrlFromAddress(plugin_init_sys_tray, sLibraryFileUrl))
+        pFile = g_file_new_for_uri(rtl::OUStringToOString(sLibraryFileUrl, RTL_TEXTENCODING_UTF8).getStr());
+
+    if (pFile)
+    {
+        if ((pMonitor = g_file_monitor_file(pFile, G_FILE_MONITOR_NONE, NULL, NULL)))
+            g_signal_connect(pMonitor, "changed", (GCallback)notify_file_changed, NULL);
+        g_object_unref(pFile);
+    }
+#endif
 }
 
 void SAL_DLLPUBLIC_EXPORT plugin_shutdown_sys_tray()
@@ -403,8 +447,28 @@ void SAL_DLLPUBLIC_EXPORT plugin_shutdown_sys_tray()
     ::SolarMutexGuard aGuard;
     if( !pTrayIcon )
         return;
-    gtk_widget_destroy( GTK_WIDGET( pTrayIcon ) );
+
+#ifdef ENABLE_GIO
+    if (pMonitor)
+    {
+        g_signal_handlers_disconnect_by_func(pMonitor,
+            (void*)notify_file_changed, pMonitor);
+        g_file_monitor_cancel(pMonitor);
+        g_object_unref(pMonitor);
+        pMonitor = NULL;
+    }
+#endif
+
+    /* we have to set pTrayIcon to NULL now, because gtk_widget_destroy
+     * causes calling exit_quickstarter_cb (which then calls this func.)
+     * again -> crash.
+     * As an alternative, we could deregister the "destroy" signal here,
+     * but this is simpler .-)
+     */
+    GtkWidget* const pIcon = GTK_WIDGET( pTrayIcon );
     pTrayIcon = NULL;
+    gtk_widget_destroy( pIcon );
+
     pExitMenuItem = NULL;
     pOpenMenuItem = NULL;
     pDisableMenuItem = NULL;
diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx
index 869cc2272920..1fd6269389b9 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -275,7 +275,7 @@ static HMENU createSystrayMenu( )
     addMenuItem( hMenu, IDM_TEMPLATE, ICON_TEMPLATE,
         pShutdownIcon->GetResString( STR_QUICKSTART_FROMTEMPLATE ), pos, true, aEmpty);
     addMenuItem( hMenu, static_cast< UINT >( -1 ), 0, OUString(), pos, false, aEmpty );
-    addMenuItem( hMenu, IDM_OPEN,   ICON_OPEN, pShutdownIcon->GetResString( STR_QUICKSTART_FILEOPEN ), pos, true, OUString::createFromAscii( "SHELL32" ));
+    addMenuItem( hMenu, IDM_OPEN,   ICON_OPEN, pShutdownIcon->GetResString( STR_QUICKSTART_FILEOPEN ), pos, true, OUString(RTL_CONSTASCII_USTRINGPARAM("SHELL32")));
     addMenuItem( hMenu, static_cast< UINT >( -1 ), 0, OUString(), pos, false, aEmpty );
 #endif
     addMenuItem( hMenu, IDM_INSTALL,0, pShutdownIcon->GetResString( STR_QUICKSTART_PRELAUNCH ), pos, false, aEmpty );
@@ -495,7 +495,7 @@ LRESULT CALLBACK listenerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP
 static sal_Bool checkOEM() {
     Reference<XMultiServiceFactory> rFactory = ::comphelper::getProcessServiceFactory();
     Reference<XJob> rOemJob(rFactory->createInstance(
-        OUString::createFromAscii("com.sun.star.office.OEMPreloadJob")),
+        OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.office.OEMPreloadJob"))),
         UNO_QUERY );
     Sequence<NamedValue> args;
     sal_Bool bResult = sal_False;
diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx
index f91b42f6eccc..17a27c6c8ce9 100644
--- a/sfx2/source/appl/xpackcreator.cxx
+++ b/sfx2/source/appl/xpackcreator.cxx
@@ -48,15 +48,15 @@ using namespace ::com::sun::star;
 uno::Sequence< ::rtl::OUString > SAL_CALL OPackageStructureCreator::impl_getStaticSupportedServiceNames()
 {
     uno::Sequence< ::rtl::OUString > aRet(2);
-    aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.embed.PackageStructureCreator");
-    aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.PackageStructureCreator");
+    aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.PackageStructureCreator"));
+    aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.PackageStructureCreator"));
     return aRet;
 }
 
 //-------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OPackageStructureCreator::impl_getStaticImplementationName()
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.PackageStructureCreator");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.PackageStructureCreator"));
 }
 
 //-------------------------------------------------------------------------
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index d059b29f94ba..a84440bbf00d 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -368,7 +368,7 @@ sal_uInt32  SfxFilterMatcher::GuessFilterIgnoringContent(
     SfxFilterFlags nMust,
     SfxFilterFlags nDont ) const
 {
-    Reference< XTypeDetection > xDetection( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.document.TypeDetection")), UNO_QUERY );
+    Reference< XTypeDetection > xDetection( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection"))), UNO_QUERY );
     ::rtl::OUString sTypeName;
     try
     {
@@ -420,7 +420,7 @@ sal_uInt32  SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c
     const SfxFilter* pOldFilter = *ppFilter;
 
     // no detection service -> nothing to do !
-    Reference< XTypeDetection > xDetection( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.document.TypeDetection")), UNO_QUERY );
+    Reference< XTypeDetection > xDetection( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection"))), UNO_QUERY );
     if (!xDetection.is())
         return ERRCODE_ABORT;
 
@@ -466,7 +466,7 @@ sal_uInt32  SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c
             // The DocumentService property is only a preselection, and all preselections are considered as optional!
             // This "wrong" type will be sorted out now because we match only allowed filters to the detected type
             ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > lQuery(1);
-            lQuery[0].Name = ::rtl::OUString::createFromAscii("Name");
+            lQuery[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"));
             lQuery[0].Value <<= sTypeName;
 
             const SfxFilter* pFilter = GetFilterForProps(lQuery, nMust, nDont);
@@ -639,7 +639,7 @@ const SfxFilter* SfxFilterMatcher::GetFilterForProps( const com::sun::star::uno:
             ::rtl::OUString aValue;
 
             // try to get the preferred filter (works without loading all filters!)
-            if ( (aProps[::rtl::OUString::createFromAscii("PreferredFilter")] >>= aValue) && aValue.getLength() )
+            if ( (aProps[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PreferredFilter"))] >>= aValue) && aValue.getLength() )
             {
                 const SfxFilter* pFilter = SfxFilter::GetFilterByName( aValue );
                 if ( !pFilter || (pFilter->GetFilterFlags() & nMust) != nMust || (pFilter->GetFilterFlags() & nDont ) )
@@ -655,7 +655,7 @@ const SfxFilter* SfxFilterMatcher::GetFilterForProps( const com::sun::star::uno:
                     {
                         // preferred filter belongs to another document type; now we must search the filter
                         pImpl->InitForIterating();
-                        aProps[::rtl::OUString::createFromAscii("Name")] >>= aValue;
+                        aProps[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"))] >>= aValue;
                         pFilter = GetFilter4EA( aValue, nMust, nDont );
                         if ( pFilter )
                             return pFilter;
@@ -689,7 +689,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4Mime( const String& rMediaType,SfxF
     }
 
     com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1);
-    aSeq[0].Name = ::rtl::OUString::createFromAscii("MediaType");
+    aSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType"));
     aSeq[0].Value <<= ::rtl::OUString( rMediaType );
     return GetFilterForProps( aSeq, nMust, nDont );
 }
@@ -719,7 +719,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4EA( const String& rType,SfxFilterFl
     }
 
     com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1);
-    aSeq[0].Name = ::rtl::OUString::createFromAscii("Name");
+    aSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"));
     aSeq[0].Value <<= ::rtl::OUString( rType );
     return GetFilterForProps( aSeq, nMust, nDont );
 }
@@ -759,7 +759,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4Extension( const String& rExt, SfxF
         sExt.Erase(0,1);
 
     com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1);
-    aSeq[0].Name = ::rtl::OUString::createFromAscii("Extensions");
+    aSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Extensions"));
     ::com::sun::star::uno::Sequence < ::rtl::OUString > aExts(1);
     aExts[0] = sExt;
     aSeq[0].Value <<= aExts;
@@ -789,7 +789,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4ClipBoardId( sal_uInt32 nId, SfxFil
 
     com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1);
     ::rtl::OUString aName = SotExchange::GetFormatName( nId );
-    aSeq[0].Name = ::rtl::OUString::createFromAscii("ClipboardFormat");
+    aSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ClipboardFormat"));
     aSeq[0].Value <<= aName;
     return GetFilterForProps( aSeq, nMust, nDont );
 }
@@ -1199,7 +1199,7 @@ void SfxFilterContainer::ReadFilters_Impl( BOOL bUpdate )
                     // And conditional breakpoints on unicode values seams not to be supported .-(
                     #ifdef DEBUG
                     bool bDBGStop = FALSE;
-                    if (sFilterName.indexOf(::rtl::OUString::createFromAscii("DBG_"))>-1)
+                    if (sFilterName.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DBG_")))>-1)
                         bDBGStop = TRUE;
                     #endif
 
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index c2a0ac05fcbb..38f06f0e28a2 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -235,7 +235,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
 
         uno::Reference < script::XTypeConverter > xConverter(
             ::comphelper::getProcessServiceFactory()->createInstance(
-                ::rtl::OUString::createFromAscii("com.sun.star.script.Converter")),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter"))),
                 uno::UNO_QUERY_THROW );
         uno::Reference<beans::XPropertySet> xUserDefinedProps(
             i_xDocProps->getUserDefinedProperties(), uno::UNO_QUERY_THROW);
@@ -289,7 +289,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
     {
         ByteString sOut;
         ::rtl::OUString aStr;
-        uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameURL") );
+        uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameURL")) );
         if ( (aAny >>= aStr) && aStr.getLength() )
         {
             String aURL = INetURLObject( aStr ).GetMainURL( INetURLObject::DECODE_TO_IURI );
@@ -304,7 +304,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
             }
         }
 
-        aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameName") );
+        aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameName")) );
         if ( (aAny >>= aStr) && aStr.getLength() )
         {
             ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_name) += "=\"";
@@ -314,18 +314,18 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
         }
 
         sal_Int32 nVal = SIZE_NOT_SET;
-        aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameMarginWidth") );
+        aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginWidth")) );
         if ( (aAny >>= nVal) && nVal != SIZE_NOT_SET )
             (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_marginwidth) += '=') += ByteString::CreateFromInt32( nVal );
-        aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameMarginHeight") );
+        aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginHeight")) );
         if ( (aAny >>= nVal) && nVal != SIZE_NOT_SET )
             (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_marginheight) += '=') += ByteString::CreateFromInt32( nVal );
 
         sal_Bool bVal = sal_True;
-        aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameIsAutoScroll") );
+        aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoScroll")) );
         if ( (aAny >>= bVal) && !bVal )
         {
-            aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameIsScrollingMode") );
+            aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsScrollingMode")) );
             if ( aAny >>= bVal )
             {
                 const sal_Char *pStr = bVal ? sHTML_SC_yes : sHTML_SC_no;
@@ -334,10 +334,10 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
         }
 
         // frame border (MS+Netscape-Erweiterung)
-        aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameIsAutoBorder") );
+        aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoBorder")) );
         if ( (aAny >>= bVal) && !bVal )
         {
-            aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameIsBorder") );
+            aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsBorder")) );
             if ( aAny >>= bVal )
             {
                 const char* pStr = bVal ? sHTML_SC_yes : sHTML_SC_no;
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index 59e9d6d8d443..38278d9bc1ab 100644
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/helper.cxx
@@ -103,7 +103,7 @@ sal_Bool SfxContentHelper::Transfer_Impl( const String& rSource, const String& r
     {
         ::ucbhelper::Content aDestPath( aDestObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment > () );
         uno::Reference< ucb::XCommandInfo > xInfo = aDestPath.getCommands();
-        OUString aTransferName = OUString::createFromAscii( "transfer" );
+        OUString aTransferName(RTL_CONSTASCII_USTRINGPARAM("transfer"));
         if ( xInfo->hasCommandByName( aTransferName ) )
         {
             aDestPath.executeCommand( aTransferName, uno::makeAny(
@@ -206,7 +206,7 @@ sal_Bool SfxContentHelper::GetTitle( const String& rContent, String& rTitle )
     {
         ::ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment > () );
         OUString aTemp;
-        aCnt.getPropertyValue( OUString::createFromAscii( "Title" ) ) >>= aTemp;
+        aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) ) >>= aTemp;
         rTitle = String( aTemp );
         bRet = sal_True;
     }
@@ -232,7 +232,7 @@ sal_Bool SfxContentHelper::Kill( const String& rContent )
     try
     {
         ::ucbhelper::Content aCnt( aDeleteObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment > () );
-        aCnt.executeCommand( OUString::createFromAscii( "delete" ), uno::makeAny( sal_Bool( sal_True ) ) );
+        aCnt.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), uno::makeAny( sal_Bool( sal_True ) ) );
     }
     catch( ucb::CommandAbortedException& )
     {
@@ -261,8 +261,8 @@ uno::Sequence < OUString > SfxContentHelper::GetFolderContents( const String& rF
         uno::Reference< sdbc::XResultSet > xResultSet;
         uno::Sequence< OUString > aProps(2);
         OUString* pProps = aProps.getArray();
-        pProps[0] = OUString::createFromAscii( "Title" );
-        pProps[1] = OUString::createFromAscii( "IsFolder" );
+        pProps[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
+        pProps[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder"));
 
         try
         {
@@ -279,7 +279,7 @@ uno::Sequence < OUString > SfxContentHelper::GetFolderContents( const String& rF
                 uno::Reference < ucb::XAnyCompareFactory > xFactory;
                 uno::Reference < lang::XMultiServiceFactory > xMgr = getProcessServiceFactory();
                 uno::Reference < ucb::XSortedDynamicResultSetFactory > xSRSFac(
-                    xMgr->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.ucb.SortedDynamicResultSetFactory") ), uno::UNO_QUERY );
+                    xMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory")) ), uno::UNO_QUERY );
 
                 uno::Sequence< ucb::NumberedSortingInfo > aSortInfo( 2 );
                 ucb::NumberedSortingInfo* pInfo = aSortInfo.getArray();
@@ -369,11 +369,11 @@ uno::Sequence < OUString > SfxContentHelper::GetFolderContentProperties( const S
         uno::Reference< sdbc::XResultSet > xResultSet;
         uno::Sequence< OUString > aProps(5);
         OUString* pProps = aProps.getArray();
-        pProps[0] = OUString::createFromAscii( "Title" );
-        pProps[1] = OUString::createFromAscii( "ContentType" );
-        pProps[2] = OUString::createFromAscii( "Size" );
-        pProps[3] = OUString::createFromAscii( "DateModified" );
-        pProps[4] = OUString::createFromAscii( "IsFolder" );
+        pProps[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
+        pProps[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType"));
+        pProps[2] = OUString(RTL_CONSTASCII_USTRINGPARAM("Size"));
+        pProps[3] = OUString(RTL_CONSTASCII_USTRINGPARAM("DateModified"));
+        pProps[4] = OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder"));
 
         try
         {
@@ -384,7 +384,7 @@ uno::Sequence < OUString > SfxContentHelper::GetFolderContentProperties( const S
             uno::Reference < ucb::XAnyCompareFactory > xCmpFactory;
             uno::Reference < lang::XMultiServiceFactory > xMgr = getProcessServiceFactory();
             uno::Reference < ucb::XSortedDynamicResultSetFactory > xSRSFac(
-                xMgr->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.ucb.SortedDynamicResultSetFactory") ), uno::UNO_QUERY );
+                xMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory")) ), uno::UNO_QUERY );
 
             uno::Sequence< ucb::NumberedSortingInfo > aSortInfo( 2 );
             ucb::NumberedSortingInfo* pInfo = aSortInfo.getArray();
@@ -500,9 +500,9 @@ uno::Sequence < OUString > SfxContentHelper::GetResultSet( const String& rURL )
         uno::Reference< ucb::XDynamicResultSet > xDynResultSet;
         uno::Sequence< OUString > aProps(3);
         OUString* pProps = aProps.getArray();
-        pProps[0] = OUString::createFromAscii( "Title" );
-        pProps[1] = OUString::createFromAscii( "ContentType" );
-        pProps[2] = OUString::createFromAscii( "IsFolder" );
+        pProps[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
+        pProps[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType"));
+        pProps[2] = OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder"));
 
         try
         {
@@ -596,8 +596,8 @@ uno::Sequence< OUString > SfxContentHelper::GetHelpTreeViewContents( const Strin
         uno::Reference< sdbc::XResultSet > xResultSet;
         uno::Sequence< OUString > aProps(2);
         OUString* pProps = aProps.getArray();
-        pProps[0] = OUString::createFromAscii( "Title" );
-        pProps[1] = OUString::createFromAscii( "IsFolder" );
+        pProps[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
+        pProps[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder"));
 
         try
         {
@@ -707,7 +707,7 @@ sal_Bool SfxContentHelper::IsHelpErrorDocument( const String& rURL )
     {
         ::ucbhelper::Content aCnt( INetURLObject( rURL ).GetMainURL( INetURLObject::NO_DECODE ),
                       uno::Reference< ucb::XCommandEnvironment > () );
-        if ( !( aCnt.getPropertyValue( OUString::createFromAscii( "IsErrorDocument" ) ) >>= bRet ) )
+        if ( !( aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsErrorDocument")) ) >>= bRet ) )
         {
             DBG_ERRORFILE( "Property 'IsErrorDocument' is missing" );
         }
@@ -785,7 +785,7 @@ ErrCode SfxContentHelper::QueryDiskSpace( const String& rPath, sal_Int64& rFreeB
     try
     {
         ::ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment > () );
-        aCnt.getPropertyValue( OUString::createFromAscii( "FreeSpace" ) ) >>= rFreeBytes;
+        aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("FreeSpace")) ) >>= rFreeBytes;
     }
     catch( ucb::CommandAbortedException& )
     {
@@ -811,7 +811,7 @@ ULONG SfxContentHelper::GetSize( const String& rContent )
     try
     {
         ::ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment > () );
-        aCnt.getPropertyValue( OUString::createFromAscii( "Size" ) ) >>= nTemp;
+        aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Size")) ) >>= nTemp;
     }
     catch( ucb::CommandAbortedException& )
     {
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 76ef2a9563b1..6e63989ee712 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -180,17 +180,17 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro )
             uno::Sequence < beans::PropertyValue > aProperties(3);
             beans::PropertyValue *pValues = aProperties.getArray();
 
-            ::rtl::OUString aType = ::rtl::OUString::createFromAscii( STAR_BASIC );;
+            ::rtl::OUString aType(RTL_CONSTASCII_USTRINGPARAM( STAR_BASIC ));
             ::rtl::OUString aLib  = pMacro->GetLibName();
             ::rtl::OUString aMacro = pMacro->GetMacName();
 
-            pValues[ 0 ].Name = ::rtl::OUString::createFromAscii( PROP_EVENT_TYPE );
+            pValues[ 0 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_EVENT_TYPE ));
             pValues[ 0 ].Value <<= aType;
 
-            pValues[ 1 ].Name = ::rtl::OUString::createFromAscii( PROP_LIBRARY );
+            pValues[ 1 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_LIBRARY ));
             pValues[ 1 ].Value <<= aLib;
 
-            pValues[ 2 ].Name = ::rtl::OUString::createFromAscii( PROP_MACRO_NAME );
+            pValues[ 2 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_MACRO_NAME ));
             pValues[ 2 ].Value <<= aMacro;
 
             aEventData <<= aProperties;
@@ -203,10 +203,10 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro )
             ::rtl::OUString aLib   = pMacro->GetLibName();
             ::rtl::OUString aMacro = pMacro->GetMacName();
 
-            pValues[ 0 ].Name = ::rtl::OUString::createFromAscii( PROP_EVENT_TYPE );
+            pValues[ 0 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_EVENT_TYPE ));
             pValues[ 0 ].Value <<= aLib;
 
-            pValues[ 1 ].Name = ::rtl::OUString::createFromAscii( PROP_SCRIPT );
+            pValues[ 1 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_SCRIPT ));
             pValues[ 1 ].Value <<= aMacro;
 
             aEventData <<= aProperties;
@@ -218,10 +218,10 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro )
 
             ::rtl::OUString aMacro  = pMacro->GetMacName();
 
-            pValues[ 0 ].Name = ::rtl::OUString::createFromAscii( PROP_EVENT_TYPE );
-            pValues[ 0 ].Value <<= ::rtl::OUString::createFromAscii(SVX_MACRO_LANGUAGE_JAVASCRIPT);
+            pValues[ 0 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_EVENT_TYPE ));
+            pValues[ 0 ].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SVX_MACRO_LANGUAGE_JAVASCRIPT));
 
-            pValues[ 1 ].Name = ::rtl::OUString::createFromAscii( PROP_MACRO_NAME );
+            pValues[ 1 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_MACRO_NAME ));
             pValues[ 1 ].Value <<= aMacro;
 
             aEventData <<= aProperties;
@@ -252,7 +252,7 @@ void PropagateEvent_Impl( SfxObjectShell *pDoc, rtl::OUString aEventName, const
     {
         xSupplier = uno::Reference < document::XEventsSupplier >
                 ( ::comphelper::getProcessServiceFactory()->createInstance(
-                rtl::OUString::createFromAscii("com.sun.star.frame.GlobalEventBroadcaster" )), uno::UNO_QUERY );
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.GlobalEventBroadcaster"))), uno::UNO_QUERY );
     }
 
     if ( xSupplier.is() )
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 70bdd1b42d60..906b9fb6212e 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -2355,7 +2355,7 @@ BOOL SfxBindings::ExecuteCommand_Impl( const String& rCommand )
 {
     ::com::sun::star::util::URL aURL;
     aURL.Complete = rCommand;
-    Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY );
+    Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
     xTrans->parseStrict( aURL );
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >  xDisp = pImp->xProv->queryDispatch( aURL, ::rtl::OUString(), 0 );
     if ( xDisp.is() )
@@ -2365,7 +2365,7 @@ BOOL SfxBindings::ExecuteCommand_Impl( const String& rCommand )
             ::rtl::OUString sAppName;
             try
             {
-                static ::rtl::OUString our_aModuleManagerName = ::rtl::OUString::createFromAscii("com.sun.star.frame.ModuleManager");
+                static ::rtl::OUString our_aModuleManagerName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager"));
                 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager =
                     ::comphelper::getProcessServiceFactory();
                 ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager > xModuleManager(
@@ -2376,7 +2376,7 @@ BOOL SfxBindings::ExecuteCommand_Impl( const String& rCommand )
                 sAppName = xModuleManager->identify(xFrame);
             } catch(::com::sun::star::uno::Exception&) {}
             Sequence<beans::PropertyValue> source;
-            ::comphelper::UiEventsLogger::appendDispatchOrigin(source, sAppName, ::rtl::OUString::createFromAscii("SfxAsyncExec"));
+            ::comphelper::UiEventsLogger::appendDispatchOrigin(source, sAppName, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SfxAsyncExec")));
             ::comphelper::UiEventsLogger::logDispatch(aURL, source);
         }
         new SfxAsyncExec_Impl( aURL, xDisp );
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index da996184e29b..c249cdfc84e5 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -248,7 +248,7 @@ int SfxDispatcher::Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest
 
             if ( xSet.is() )
             {
-                com::sun::star::uno::Any aProp = xSet->getPropertyValue(::rtl::OUString::createFromAscii("DispatchRecorderSupplier"));
+                com::sun::star::uno::Any aProp = xSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DispatchRecorderSupplier")));
                 com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorderSupplier > xSupplier;
                 com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder;
                 aProp >>= xSupplier;
diff --git a/sfx2/source/control/macrconf.cxx b/sfx2/source/control/macrconf.cxx
index c574a0ef533c..b2e43759f736 100644
--- a/sfx2/source/control/macrconf.cxx
+++ b/sfx2/source/control/macrconf.cxx
@@ -403,83 +403,6 @@ void SfxMacroInfo::SetHelpText( const String& rName )
     *pHelpText = rName;
 }
 
-//==========================================================================
-
-SvStream& operator >> (SvStream& rStream, SfxMacroInfo& rInfo)
-{
-    sal_uInt16 nAppBasic, nFileVersion;
-    String aDocName;
-
-    rStream >> nFileVersion;
-    if ( nVersion < nCompatVersion )
-    {
-        // In der 1.Version ohne Versionskennung
-        nAppBasic = nVersion;
-        nFileVersion = 1;
-        rStream.ReadByteString(aDocName,RTL_TEXTENCODING_UTF8);
-        rStream.ReadByteString(rInfo.aLibName,RTL_TEXTENCODING_UTF8);
-        rStream.ReadByteString(rInfo.aModuleName,RTL_TEXTENCODING_UTF8);
-        rStream.ReadByteString(rInfo.aMethodName,RTL_TEXTENCODING_UTF8);
-    }
-    else
-    {
-        String aInput;
-        rStream >> nAppBasic;
-        rStream.ReadByteString(aDocName,RTL_TEXTENCODING_UTF8);                 // Vorsicht: kann bei AppName Unsinn sein!
-        rStream.ReadByteString(rInfo.aLibName,RTL_TEXTENCODING_UTF8);
-        rStream.ReadByteString(rInfo.aModuleName,RTL_TEXTENCODING_UTF8);
-        rStream.ReadByteString(aInput,RTL_TEXTENCODING_UTF8);
-
-        if ( nFileVersion == nCompatVersion )
-            rInfo.aMethodName = aInput;
-        else
-        {
-            sal_uInt16 nCount = aInput.GetTokenCount('.');
-            rInfo.aMethodName = aInput.GetToken( nCount-1, '.' );
-            if ( nCount > 1 )
-                rInfo.aModuleName = aInput.GetToken( nCount-2, '.' );
-            if ( nCount > 2 )
-                rInfo.aLibName = aInput.GetToken( 0, '.' );
-        }
-    }
-
-    rInfo.bAppBasic = (sal_Bool) nAppBasic;
-    return rStream;
-}
-
-int SfxMacroInfo::Load( SvStream& rStream )
-{
-    rStream >> (*this);
-    nSlotId = SFX_APP()->GetMacroConfig()->GetSlotId(this);
-    return 0;
-}
-
-//==========================================================================
-
-SvStream& operator << (SvStream& rStream, const SfxMacroInfo& rInfo)
-{
-    if ( rInfo.bAppBasic )
-    {
-        rStream << nVersion
-                << (sal_uInt16) rInfo.bAppBasic;
-        rStream.WriteByteString(rInfo.GetBasicName(),RTL_TEXTENCODING_UTF8);
-        rStream.WriteByteString(rInfo.aLibName,RTL_TEXTENCODING_UTF8);
-        rStream.WriteByteString(rInfo.aModuleName,RTL_TEXTENCODING_UTF8);
-        rStream.WriteByteString(rInfo.aMethodName,RTL_TEXTENCODING_UTF8);
-    }
-    else
-    {
-        rStream << nVersion
-                << (sal_uInt16) rInfo.bAppBasic;
-        rStream.WriteByteString(SFX_APP()->GetName(),RTL_TEXTENCODING_UTF8);
-        rStream.WriteByteString(rInfo.aLibName,RTL_TEXTENCODING_UTF8);
-        rStream.WriteByteString(rInfo.aModuleName,RTL_TEXTENCODING_UTF8);
-        rStream.WriteByteString(rInfo.aMethodName,RTL_TEXTENCODING_UTF8);
-    }
-
-    return rStream;
-}
-
 sal_Bool SfxMacroInfo::Compare( const SvxMacro& rMacro ) const
 {
     String aName = rMacro.GetLibName();
diff --git a/sfx2/source/control/macro.cxx b/sfx2/source/control/macro.cxx
index 0d387716e422..fcaef08a6fbf 100644
--- a/sfx2/source/control/macro.cxx
+++ b/sfx2/source/control/macro.cxx
@@ -381,7 +381,7 @@ void SfxMacroStatement::GenerateNameAndArgs_Impl
                 USHORT nPos = 0;
                 while ( TRUE )
                 {
-                    nPos = aRecordable.SearchAndReplace( DEFINE_CONST_UNICODE('"'), DEFINE_CONST_UNICODE("\"\""), nPos );
+                    nPos = aRecordable.SearchAndReplace( String('"'), DEFINE_CONST_UNICODE("\"\""), nPos );
                     if ( STRING_NOTFOUND == nPos )
                         break;
                     nPos += 2;
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index 80fe94ce72fe..8d552c6d99ef 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -48,13 +48,6 @@
 
 //====================================================================
 
-struct SfxSIDRegistration_Impl
-{
-    String          _aGroup;
-    String          _aName;
-    USHORT          _nSID;
-};
-
 struct SfxSlotType_Impl
 {
     USHORT  nId;
diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx
index b28143f9661a..4a07098ed23e 100644
--- a/sfx2/source/control/querystatus.cxx
+++ b/sfx2/source/control/querystatus.cxx
@@ -98,7 +98,7 @@ SfxQueryStatus_Impl::SfxQueryStatus_Impl( const Reference< XDispatchProvider >&
 {
     m_aCommand.Complete = rCommand;
     Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
-                                            rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY );
+                                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
     xTrans->parseStrict( m_aCommand );
     if ( rDispatchProvider.is() )
         m_xDispatch = rDispatchProvider->queryDispatch( m_aCommand, rtl::OUString(), 0 );
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index 902383670f20..8e2577b33db1 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -390,7 +390,7 @@ void SfxRequest_Impl::Record
                 com::sun::star::uno::UNO_QUERY);
 
         com::sun::star::uno::Reference< com::sun::star::util::XURLTransformer > xTransform(
-                xFactory->createInstance(rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer")),
+                xFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))),
                 com::sun::star::uno::UNO_QUERY);
 
         com::sun::star::util::URL aURL;
@@ -867,7 +867,7 @@ com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > SfxRe
 
     if(xSet.is())
     {
-        com::sun::star::uno::Any aProp = xSet->getPropertyValue(rtl::OUString::createFromAscii("DispatchRecorderSupplier"));
+        com::sun::star::uno::Any aProp = xSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DispatchRecorderSupplier")));
         com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorderSupplier > xSupplier;
         aProp >>= xSupplier;
         if(xSupplier.is())
diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx
index d585f6374604..9b86d6c911bf 100644
--- a/sfx2/source/control/sfxstatuslistener.cxx
+++ b/sfx2/source/control/sfxstatuslistener.cxx
@@ -69,7 +69,7 @@ SfxStatusListener::SfxStatusListener( const Reference< XDispatchProvider >& rDis
 {
     m_aCommand.Complete = rCommand;
     Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
-                                            rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY );
+                                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
     xTrans->parseStrict( m_aCommand );
     if ( rDispatchProvider.is() )
         m_xDispatch = rDispatchProvider->queryDispatch( m_aCommand, rtl::OUString(), 0 );
@@ -113,7 +113,7 @@ void SfxStatusListener::Bind( USHORT nSlotId, const rtl::OUString& rNewCommand )
         m_nSlotID = nSlotId;
         m_aCommand.Complete = rNewCommand;
         Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
-                                                rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY );
+                                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
         xTrans->parseStrict( m_aCommand );
 
         m_xDispatch = m_xDispatchProvider->queryDispatch( m_aCommand, rtl::OUString(), 0 );
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index ff016fe03509..6cabae17e4aa 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -109,7 +109,7 @@ SfxUnoControllerItem::SfxUnoControllerItem( SfxControllerItem *pItem, SfxBinding
     DBG_ASSERT( !pCtrlItem || !pCtrlItem->IsBound(), "ControllerItem fehlerhaft!" );
 
     aCommand.Complete = rCmd;
-    Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY );
+    Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
     xTrans->parseStrict( aCommand );
     pBindings->RegisterUnoController_Impl( this );
 }
@@ -340,28 +340,6 @@ sal_Int64 SAL_CALL SfxOfficeDispatch::getSomething( const ::com::sun::star::uno:
         return 0;
 }
 
-/* ASDBG
-void* SfxOfficeDispatch::getImplementation(Reflection *p)
-{
-    if( p == ::getCppuType((const SfxOfficeDispatch*)0) )
-        return this;
-    else
-        return ::cppu::OWeakObject::getImplementation(p);
-
-}
-
-Reflection* ::getCppuType((const SfxOfficeDispatch*)0)
-{
-    static StandardClassReflection aRefl(
-        0,
-        createStandardClass(
-            "SfxOfficeDispatch", ::cppu::OWeakObject::get::cppu::OWeakObjectIdlClass(),
-            1,
-            ::getCppuType((const ::com::sun::star::frame::XDispatch*)0) ) );
-    return &aRefl;
-}
-*/
-
 SfxOfficeDispatch::SfxOfficeDispatch( SfxBindings& rBindings, SfxDispatcher* pDispat, const SfxSlot* pSlot, const ::com::sun::star::util::URL& rURL )
 {
 //    nOfficeDispatchCount++;
@@ -512,7 +490,7 @@ SfxDispatchController_Impl::SfxDispatchController_Impl(
         ByteString aTmp(".uno:");
         aTmp += pUnoName;
         aDispatchURL.Complete = ::rtl::OUString::createFromAscii( aTmp.GetBuffer() );
-        Reference < ::com::sun::star::util::XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY );
+        Reference < ::com::sun::star::util::XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
         xTrans->parseStrict( aDispatchURL );
     }
 
@@ -809,10 +787,10 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
                         bFailure = aReq.IsCancelled();
                         if ( bVBARequest )
                         {
-                            SFX_REQUEST_ARG( aReq, pItem, SfxBoolItem, SID_DIALOG_RETURN, FALSE );
-                            if ( pItem )
+                            SFX_REQUEST_ARG( aReq, pDlgRet, SfxBoolItem, SID_DIALOG_RETURN, FALSE );
+                            if ( pDlgRet )
                             {
-                                bSuccess = pItem->GetValue();
+                                bSuccess = pDlgRet->GetValue();
                             }
                         }
                     }
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 5b314bbc7a58..ed08d8abcd20 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -56,7 +56,7 @@
 using namespace ::com::sun::star::uno;
 using namespace ::rtl;
 
-#define USERITEM_NAME OUString::createFromAscii( "UserItem" )
+#define USERITEM_NAME OUString(RTL_CONSTASCII_USTRINGPARAM("UserItem"))
 
 class SfxModelessDialog_Impl : public SfxListener
 {
diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc
index 7f03bf416431..08940391ac87 100644
--- a/sfx2/source/dialog/dialog.hrc
+++ b/sfx2/source/dialog/dialog.hrc
@@ -65,8 +65,6 @@
 
 #define RID_ERRBOX_MAIL_CONFIG          ( RC_DIALOG_BEGIN + 92 )
 
-#define IMG_LST_STYLE_DESIGNER_HC       ( RC_DIALOG_BEGIN + 99 )
-
 // 100-106 in tbxcust.hrc
 #define STR_MACRO_LOSS                  ( RC_DIALOG_BEGIN + 107 )
 #define STR_CANCEL_RECORDING            ( RC_DIALOG_BEGIN + 108 )
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 4d5f8b752fab..c578b30ecbef 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1624,9 +1624,7 @@ public:
 
     util::Duration  GetDuration() const;
 };
-/*-- 20.11.2009 15:40:46---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 DurationDialog_Impl::DurationDialog_Impl(
     Window* pParent, const util::Duration& rDuration)
         :   ModalDialog( pParent, SfxResId( RID_EDIT_DURATIONS ) ),
@@ -1660,15 +1658,11 @@ DurationDialog_Impl::DurationDialog_Impl(
     aSecondNF.SetValue(rDuration.Seconds);
     aMSecondNF.SetValue(rDuration.MilliSeconds);
 }
-/*-- 20.11.2009 16:08:55---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 DurationDialog_Impl::~DurationDialog_Impl()
 {
 }
-/*-- 20.11.2009 15:41:47---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 util::Duration  DurationDialog_Impl::GetDuration() const
 {
     util::Duration  aRet;
@@ -1683,24 +1677,17 @@ util::Duration  DurationDialog_Impl::GetDuration() const
     return aRet;
 }
 
-/*-- 20.11.2009 15:30:58---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 CustomPropertiesDurationField::CustomPropertiesDurationField( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) :
         Edit( pParent, rResId ), m_pLine( pLine )
 
 {
     SetDuration( util::Duration(false, 0, 0, 0, 0, 0, 0, 0) );
 }
-/*-- 23.11.2009 08:46:02---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 CustomPropertiesDurationField::~CustomPropertiesDurationField()
 {
 }
-/*-- 23.11.2009 09:23:35---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void CustomPropertiesDurationField::RequestHelp( const HelpEvent& rHEvt )
 {
     if( rHEvt.GetMode() & HELPMODE_QUICK )
@@ -1714,9 +1701,7 @@ void CustomPropertiesDurationField::RequestHelp( const HelpEvent& rHEvt )
                 QUICKHELP_LEFT|QUICKHELP_VCENTER );
     }
 }
-/*-- 20.11.2009 15:30:58---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void CustomPropertiesDurationField::SetDuration( const util::Duration& rDuration )
 {
     m_aDuration = rDuration;
@@ -1730,23 +1715,17 @@ void CustomPropertiesDurationField::SetDuration( const util::Duration& rDuration
     sText.SearchAndReplace(String::CreateFromAscii( "%6"), String::CreateFromInt32( rDuration.Seconds) );
     SetText( sText );
 }
-/*-- 23.11.2009 08:51:15---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 CustomPropertiesEditButton::CustomPropertiesEditButton( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) :
         PushButton( pParent, rResId ), m_pLine( pLine )
 {
     SetClickHdl( LINK( this, CustomPropertiesEditButton, ClickHdl ));
 }
-/*-- 23.11.2009 08:51:15---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 CustomPropertiesEditButton::~CustomPropertiesEditButton()
 {
 }
-/*-- 23.11.2009 08:47:37---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 IMPL_LINK( CustomPropertiesEditButton, ClickHdl, PushButton*, EMPTYARG )
 {
     DurationDialog_Impl* pDurationDlg = new DurationDialog_Impl( this, m_pLine->m_aDurationField.GetDuration() );
@@ -1790,8 +1769,7 @@ CustomPropertyLine::CustomPropertyLine( Window* pParent ) :
     m_aTimeField.SetExtFormat( EXTTIMEF_24H_LONG );
     m_aDateField.SetExtDateFormat( XTDATEF_SYSTEM_SHORT_YYYY );
 
-    m_aRemoveButton.SetModeImage( SfxResId( SFX_IMG_PROPERTY_REMOVE ), BMP_COLOR_NORMAL );
-    m_aRemoveButton.SetModeImage( SfxResId( SFX_IMG_PROPERTY_REMOVE_HC ), BMP_COLOR_HIGHCONTRAST );
+    m_aRemoveButton.SetModeImage( SfxResId( SFX_IMG_PROPERTY_REMOVE ) );
 }
 
 void CustomPropertyLine::SetRemoved()
diff --git a/sfx2/source/dialog/dinfdlg.src b/sfx2/source/dialog/dinfdlg.src
index 53b0f35685cb..ddc76d54ce19 100755
--- a/sfx2/source/dialog/dinfdlg.src
+++ b/sfx2/source/dialog/dinfdlg.src
@@ -672,11 +672,6 @@ Image SFX_IMG_PROPERTY_REMOVE
     ImageBitmap = Bitmap { File = "deleterow.bmp" ; };
     MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
 };
-Image SFX_IMG_PROPERTY_REMOVE_HC
-{
-    ImageBitmap = Bitmap { File = "deleterow_h.bmp" ; };
-    MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
-};
 
 QueryBox SFX_QB_WRONG_TYPE
 {
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index dad3134ea671..1b75113b418c 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1627,7 +1627,7 @@ ErrCode FileDialogHelper_Impl::execute( SvStringsDtor*& rpURLList,
                 if ( ( aValue >>= bPassWord ) && bPassWord )
                 {
                     // ask for a password
-                    uno::Reference < ::com::sun::star::task::XInteractionHandler > xInteractionHandler( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.comp.uui.UUIInteractionHandler")), UNO_QUERY );
+                    uno::Reference < ::com::sun::star::task::XInteractionHandler > xInteractionHandler( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uui.UUIInteractionHandler"))), UNO_QUERY );
 
                     if( xInteractionHandler.is() )
                     {
@@ -1842,7 +1842,7 @@ void FileDialogHelper_Impl::addFilters( sal_Int64 nFlags,
 
     uno::Reference< XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
     uno::Reference< XContainerQuery > xFilterCont(
-        xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.document.FilterFactory")),
+        xSMGR->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.FilterFactory"))),
         UNO_QUERY);
     if ( ! xFilterCont.is() )
         return;
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index aefe8109479f..4eb605a4eb76 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -920,7 +920,7 @@ namespace sfx2
         {
             ::comphelper::SequenceAsHashMap lFilterProps (xFilterList->nextElement());
             ::rtl::OUString                 sFilterName  = lFilterProps.getUnpackedValueOrDefault(
-                                                             ::rtl::OUString::createFromAscii("Name"),
+                                                             ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")),
                                                              ::rtl::OUString());
             if (sFilterName.getLength())
                 m_lFilters.push_back(sFilterName);
@@ -968,10 +968,9 @@ namespace sfx2
         // retrieve the default filter for this application module.
         // It must be set as first of the generated filter list.
         const SfxFilter* pDefaultFilter = SfxFilterContainer::GetDefaultFilter_Impl(_rFactory);
-        // --> PB 2004-11-01 #i32434# only use one extension
+        // Only use one extension (#i32434#)
         // (and always the first if there are more than one)
         sExtension = pDefaultFilter->GetWildcard().GetWildCard().GetToken( 0, ';' );
-        // <--
         sUIName = addExtension( pDefaultFilter->GetUIName(), sExtension, sal_False, _rFileDlgImpl );
         try
         {
@@ -993,10 +992,9 @@ namespace sfx2
             if (pFilter->GetName() == pDefaultFilter->GetName())
                 continue;
 
-            // --> PB 2004-09-21 #i32434# only use one extension
+            // Only use one extension (#i32434#)
             // (and always the first if there are more than one)
             sExtension = pFilter->GetWildcard().GetWildCard().GetToken( 0, ';' );
-            // <--
             sUIName = addExtension( pFilter->GetUIName(), sExtension, sal_False, _rFileDlgImpl );
             try
             {
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index 7ae301f9d553..88e7d50150d4 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -173,7 +173,7 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog(
             ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xFilterCFG =
                 uno::Reference< container::XNameAccess >(
                     xSMGR->createInstance(
-                        ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ), uno::UNO_QUERY );
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.FilterFactory")) ), uno::UNO_QUERY );
         css::uno::Reference< css::util::XModifiable > xModifiable( xModel, css::uno::UNO_QUERY );
 
         if ( !xFilterCFG.is() )
@@ -186,7 +186,7 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog(
             sal_Int32 nPropertyCount = aProps.getLength();
             for( sal_Int32 nProperty=0; nProperty < nPropertyCount; ++nProperty )
             {
-                if( aProps[nProperty].Name.equals( ::rtl::OUString::createFromAscii( "UIComponent" )) )
+                if( aProps[nProperty].Name.equals( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIComponent"))) )
                 {
                     ::rtl::OUString aServiceName;
                     aProps[nProperty].Value >>= aServiceName;
@@ -233,7 +233,7 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog(
                                 //add them to the args
                                 for ( sal_Int32 nInd = 0; nInd < aPropsFromDialog.getLength(); nInd++ )
                                 {
-                                    if( aPropsFromDialog[ nInd ].Name.equals( ::rtl::OUString::createFromAscii( "FilterData" ) ) )
+                                    if( aPropsFromDialog[ nInd ].Name.equals( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterData")) ) )
                                     {
                                         //found the filterdata, add to the storing argument
                                         rArgs.realloc( ++rNumArgs );
@@ -393,7 +393,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat(
                 {
                     ::comphelper::SequenceAsHashMap aFilterPropsHM( xEnumeration->nextElement() );
                     aFilterName = aFilterPropsHM.getUnpackedValueOrDefault(
-                                                ::rtl::OUString::createFromAscii( "Name" ),
+                                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")),
                                                 ::rtl::OUString() );
                 }
 
@@ -432,7 +432,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat(
                     {
                         ::comphelper::SequenceAsHashMap aFilterPropsHM( xNameAccess->getByName( aModule ) );
                         aFilterName = aFilterPropsHM.getUnpackedValueOrDefault(
-                                                    ::rtl::OUString::createFromAscii( "ooSetupFactoryDefaultFilter" ),
+                                                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryDefaultFilter")),
                                                     ::rtl::OUString() );
                         css::uno::Reference< css::container::XNameAccess > xNameAccess2(
                             xContainerQuery, css::uno::UNO_QUERY );
@@ -440,7 +440,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat(
                         {
                             ::comphelper::SequenceAsHashMap aFilterPropsHM2( xNameAccess2->getByName( aFilterName ) );
                             aTypeName = aFilterPropsHM2.getUnpackedValueOrDefault(
-                                                        ::rtl::OUString::createFromAscii( "Type" ),
+                                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Type")),
                                                         ::rtl::OUString() );
                         }
                     }
@@ -479,7 +479,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat(
                     {
                         ::comphelper::SequenceAsHashMap aTypeNamePropsHM( xTypeDetection->getByName( aTypeName ) );
                         uno::Sequence< ::rtl::OUString > aExtensions = aTypeNamePropsHM.getUnpackedValueOrDefault(
-                                                        ::rtl::OUString::createFromAscii( "Extensions" ),
+                                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Extensions")),
                                                         ::uno::Sequence< ::rtl::OUString >() );
                         if ( aExtensions.getLength() )
                             aExtension = aExtensions[0];
@@ -849,7 +849,7 @@ SfxMailModel::SendMailResult SfxMailModel::Send( const css::uno::Reference< css:
                         OUString baseName( maAttachedDocuments[0].copy( maAttachedDocuments[0].lastIndexOf( '/' ) + 1 ) );
                         OUString subject( baseName );
                         if ( maAttachedDocuments.size() > 1 )
-                            subject += OUString::createFromAscii( ", ..." );
+                            subject += OUString(RTL_CONSTASCII_USTRINGPARAM(", ..."));
                         xSimpleMailMessage->setSubject( subject );
                     }
                     xSimpleMailMessage->setAttachement( aAttachmentSeq );
diff --git a/sfx2/source/dialog/recfloat.src b/sfx2/source/dialog/recfloat.src
index 5bdde1f57ab6..7c35f2106cee 100644
--- a/sfx2/source/dialog/recfloat.src
+++ b/sfx2/source/dialog/recfloat.src
@@ -30,7 +30,6 @@
 
  // -----------------------------------------------------------------------
 #define STD_MASKCOLOR Color { Red = 0xC000; Green = 0xC000; Blue = 0xC000; }
-#define STD_HC_MASKCOLOR Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }
 
 FloatingWindow SID_RECORDING_FLOATWINDOW
 {
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index 7c4f44118239..817658880a09 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -57,7 +57,7 @@ using namespace ::rtl;
 
 #define VERSION 1
 #define nPixel  30L
-#define USERITEM_NAME           OUString::createFromAscii( "UserItem" )
+#define USERITEM_NAME           OUString(RTL_CONSTASCII_USTRINGPARAM("UserItem"))
 
 struct SfxDock_Impl
 {
@@ -650,7 +650,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
             }
         }
     }
-    if (nInsertPos == nCount && nLastWindowIdx != nCount - 1)
+    if (nCount != 0 && nInsertPos == nCount && nLastWindowIdx != nCount - 1)
     {
         nInsertPos = nLastWindowIdx + 1;    // ignore all non-windows after the last window
     }
diff --git a/sfx2/source/dialog/styfitem.cxx b/sfx2/source/dialog/styfitem.cxx
index fe625af90670..7c3bdbd08c2d 100644
--- a/sfx2/source/dialog/styfitem.cxx
+++ b/sfx2/source/dialog/styfitem.cxx
@@ -128,7 +128,7 @@ SfxStyleFamilies::SfxStyleFamilies( const ResId& rResId ) :
 
     FreeResource();
 
-    updateImages( rResId, BMP_COLOR_NORMAL );
+    updateImages( rResId );
 }
 
 // -----------------------------------------------------------------------
@@ -149,7 +149,7 @@ SfxStyleFamilies::~SfxStyleFamilies()
 
 // -----------------------------------------------------------------------
 
-sal_Bool SfxStyleFamilies::updateImages( const ResId& _rId, const BmpColorMode _eMode )
+sal_Bool SfxStyleFamilies::updateImages( const ResId& _rId )
 {
     sal_Bool bSuccess = sal_False;
 
@@ -157,7 +157,7 @@ sal_Bool SfxStyleFamilies::updateImages( const ResId& _rId, const BmpColorMode _
         ::svt::OLocalResourceAccess aLocalRes( _rId );
 
         // check if the image list is present
-        ResId aImageListId( (sal_uInt16)_eMode + 1, *_rId.GetResMgr() );
+        ResId aImageListId( (sal_uInt16) 1, *_rId.GetResMgr() );
         aImageListId.SetRT( RSC_IMAGELIST );
 
         if ( aLocalRes.IsAvailableRes( aImageListId ) )
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 5977f9ec38fe..350eed030579 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -63,7 +63,7 @@
 using namespace ::com::sun::star::uno;
 using namespace ::rtl;
 
-#define USERITEM_NAME           OUString::createFromAscii( "UserItem" )
+#define USERITEM_NAME           OUString(RTL_CONSTASCII_USTRINGPARAM("UserItem"))
 
 TYPEINIT1(LAYOUT_NS_SFX_TABDIALOG SfxTabDialogItem,SfxSetItem);
 
@@ -369,11 +369,6 @@ void SfxTabPage::FillUserData()
 // -----------------------------------------------------------------------
 
 BOOL SfxTabPage::IsReadOnly() const
-
-/*  [Description]
-
-*/
-
 {
     return FALSE;
 }
@@ -1054,11 +1049,6 @@ SfxTabPage* SfxTabDialog::GetTabPage( USHORT nPageId ) const
 // -----------------------------------------------------------------------
 
 BOOL SfxTabDialog::IsInOK() const
-
-/*  [Beschreibung]
-
-*/
-
 {
     return pImpl->bInOK;
 }
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index d1847cdccd0e..d1de5e0aec68 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -185,8 +185,7 @@ namespace sfx2
                         aCommandName.append( sImageURL.copy( nCommandImagePrefixLen ) );
                         const ::rtl::OUString sCommandName( aCommandName.makeStringAndClear() );
 
-                        const BOOL bHiContrast( Application::GetSettings().GetStyleSettings().GetHighContrastMode() );
-                        const Image aPanelImage( GetImage( i_rDocFrame, sCommandName, FALSE, bHiContrast ) );
+                        const Image aPanelImage( GetImage( i_rDocFrame, sCommandName, FALSE ) );
                         return aPanelImage.GetXGraphic();
                     }
 
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index aa3fd67dbbec..ac5bef16ffaa 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2205,32 +2205,6 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox
     // HilfePI antriggern, wenn von Call als Handler und Bereich erlaubt ist
     if( !pListBox || pListBox->IsSelected( pListBox->GetHdlEntry() ) )
     {
-#ifdef WIR_KOENNEN_WIEDER_HILFE_FUER_STYLESHEETS
-        SfxHelpPI* pHelpPI = SFX_APP()->GetHelpPI();
-        if ( pHelpPI && pListBox && IsInitialized() &&
-             GetSelectedEntry().Len() )
-        {
-            const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
-            const SfxStyleFamily eFam = pItem->GetFamily();
-            DBG_ASSERT(pStyleSheetPool, "Kein Pool");
-            // SfxStyleSheetBase* pStyle = pStyleSheetPool
-            //      ? pStyleSheetPool->Find( GetSelectedEntry(), eFam ) : 0;
-            SfxStyleSheetBase *pStyle;
-            if ( pStyleSheetPool )
-                pStyle = pStyleSheetPool->Find ( GetSelectedEntry(), eFam );
-            else
-                pStyle = 0;
-
-            if ( pStyle )
-            {
-                String aHelpFile;
-                ULONG nHelpId=pStyle->GetHelpId(aHelpFile);
-                if ( nHelpId )
-                    pHelpPI->LoadTopic( nHelpId );
-            }
-        }
-#endif
-
         // nur, wenn Giesskanne an ist
         if ( IsInitialized() &&
              IsCheckedItem(SID_STYLE_WATERCAN) &&
@@ -2401,8 +2375,7 @@ void SfxTemplateDialog_Impl::updateFamilyImages()
         return;
 
     // let the families collection update the images
-    sal_Bool bIsHighContrast = m_pFloat->GetSettings().GetStyleSettings().GetHighContrastMode();
-    pStyleFamilies->updateImages( *m_pStyleFamiliesId, bIsHighContrast ? BMP_COLOR_HIGHCONTRAST : BMP_COLOR_NORMAL );
+    pStyleFamilies->updateImages( *m_pStyleFamiliesId );
 
     // and set the new images on our toolbox
     USHORT nLoop = pStyleFamilies->Count();
@@ -2417,9 +2390,7 @@ void SfxTemplateDialog_Impl::updateFamilyImages()
 // ------------------------------------------------------------------------
 void SfxTemplateDialog_Impl::updateNonFamilyImages()
 {
-    m_aActionTbR.SetImageList( ImageList( SfxResId(
-        m_pFloat->GetSettings().GetStyleSettings().GetHighContrastMode() ? IMG_LST_STYLE_DESIGNER_HC
-                                                             : DLG_STYLE_DESIGNER ) ) );
+    m_aActionTbR.SetImageList( ImageList( SfxResId( DLG_STYLE_DESIGNER ) ) );
 }
 
 // ------------------------------------------------------------------------
@@ -2449,14 +2420,6 @@ void SfxCommonTemplateDialog_Impl::InvalidateBindings()
 
 SfxTemplateDialog_Impl::~SfxTemplateDialog_Impl()
 {
-/*
-    SfxImageManager* pImgMgr = pBindings->GetImageManager();
-    if ( pImgMgr )
-    {
-        pImgMgr->ReleaseToolBox( &m_aActionTbL );
-        pImgMgr->ReleaseToolBox( &m_aActionTbR );
-    }
-*/
 }
 
 //-------------------------------------------------------------------------
@@ -2476,10 +2439,6 @@ void SfxTemplateDialog_Impl::Resize()
     FloatingWindow *pF = m_pFloat->GetFloatingWindow();
     if ( pF )
     {
-//      if(pF->IsZoomedIn() && m_bZoomIn==FALSE)
-//          pF->SetText(String(SfxResId( DLG_STYLE_DESIGNER )));
-//      if(!pF->IsZoomedIn() && m_bZoomIn==TRUE && GetFamilyItem_Impl())
-//          UpdateStyles_Impl(UPDATE_FAMILY); //Bereich wieder in Titel schreiben
         m_bZoomIn = pF->IsRollUp();
         if ( m_bZoomIn )
             return;
@@ -2660,12 +2619,12 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox )
         PopupMenu *pMenu = new PopupMenu;
         uno::Reference< container::XNameAccess > xNameAccess(
                     ::comphelper::getProcessServiceFactory()->
-                    createInstance( ::rtl::OUString::createFromAscii(
-                            "com.sun.star.frame.UICommandDescription") ), uno::UNO_QUERY );
+                    createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.frame.UICommandDescription")) ), uno::UNO_QUERY );
         uno::Reference< container::XNameAccess > xUICommands;
         if ( xNameAccess.is() )
         {
-            rtl::OUString sTextDoc = ::rtl::OUString::createFromAscii("com.sun.star.text.TextDocument");
+            rtl::OUString sTextDoc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument"));
             if(xNameAccess->hasByName(sTextDoc))
             {
                 uno::Any a = xNameAccess->getByName( sTextDoc );
@@ -2677,18 +2636,18 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox )
         try
         {
             uno::Sequence< beans::PropertyValue > aPropSeq;
-            uno::Any aCommand = xUICommands->getByName(::rtl::OUString::createFromAscii(".uno:StyleNewByExample"));
+            uno::Any aCommand = xUICommands->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:StyleNewByExample")));
             ::rtl::OUString sLabel = lcl_GetLabel( aCommand );
             pMenu->InsertItem( SID_STYLE_NEW_BY_EXAMPLE, sLabel );
             pMenu->SetHelpId(SID_STYLE_NEW_BY_EXAMPLE, HID_TEMPLDLG_NEWBYEXAMPLE);
 
-            aCommand = xUICommands->getByName(::rtl::OUString::createFromAscii(".uno:StyleUpdateByExample"));
+            aCommand = xUICommands->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:StyleUpdateByExample")));
             sLabel = lcl_GetLabel( aCommand );
 
             pMenu->InsertItem( SID_STYLE_UPDATE_BY_EXAMPLE, sLabel );
             pMenu->SetHelpId(SID_STYLE_UPDATE_BY_EXAMPLE, HID_TEMPLDLG_UPDATEBYEXAMPLE);
 
-            aCommand = xUICommands->getByName(::rtl::OUString::createFromAscii(".uno:LoadStyles"));
+            aCommand = xUICommands->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LoadStyles")));
             sLabel = lcl_GetLabel( aCommand );
             pMenu->InsertItem( SID_TEMPLATE_LOAD, sLabel );
             pMenu->SetHelpId(SID_TEMPLATE_LOAD, SID_TEMPLATE_LOAD);
@@ -2869,13 +2828,6 @@ void SfxTemplateCatalog_Impl::EnableItem( USHORT nMesId, BOOL bCheck )
         aOkBtn.Enable( bCheck );
     if ( nMesId > SFX_STYLE_FAMILY_PSEUDO || nMesId < SFX_STYLE_FAMILY_CHAR )
         return;
-
-/*      for(USHORT i=0;i<aFamIds.Count&&aFamIds[i]!=nMesId;i++);
-    if(i!=aFamIds.Count())
-        aFamList.SelectEntry(aFamIds[i]);
-    else
-        DBG_ERROR("Entry nicht gefunden");*/
-
 }
 
 //-------------------------------------------------------------------------
@@ -3015,24 +2967,17 @@ void SfxTemplateDialog::StateChanged( StateChangedType nStateChange )
     SfxDockingWindow::StateChanged( nStateChange );
 }
 
-/*-- 10.12.2003 11:44:35---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 DropToolBox_Impl::DropToolBox_Impl(Window* pParent, SfxTemplateDialog_Impl* pTemplateDialog) :
     ToolBox(pParent),
     DropTargetHelper(this),
     rParent(*pTemplateDialog)
 {
 }
-/*-- 10.12.2003 11:44:35---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 DropToolBox_Impl::~DropToolBox_Impl()
 {
 }
-/*-- 10.12.2003 11:44:35---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Int8    DropToolBox_Impl::AcceptDrop( const AcceptDropEvent& rEvt )
 {
     sal_Int8 nReturn = DND_ACTION_NONE;
@@ -3052,9 +2997,7 @@ sal_Int8    DropToolBox_Impl::AcceptDrop( const AcceptDropEvent& rEvt )
     }
     return nReturn;
 }
-/*-- 10.12.2003 11:44:35---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Int8    DropToolBox_Impl::ExecuteDrop( const ExecuteDropEvent& rEvt )
 {
      return rParent.aFmtLb.ExecuteDrop(rEvt);
diff --git a/sfx2/source/dialog/templdlg.src b/sfx2/source/dialog/templdlg.src
index a4adcd77b6d3..fcd6d33e55c6 100644
--- a/sfx2/source/dialog/templdlg.src
+++ b/sfx2/source/dialog/templdlg.src
@@ -42,18 +42,7 @@ ImageList DLG_STYLE_DESIGNER
     };
     IdCount = { 3 ; };
 };
-ImageList IMG_LST_STYLE_DESIGNER_HC
-{
-    Prefix = "sch";
-    MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-    IdList =
-    {
-        SID_STYLE_WATERCAN ;
-        SID_STYLE_NEW_BY_EXAMPLE ;
-        SID_STYLE_UPDATE_BY_EXAMPLE ;
-    };
-    IdCount = { 3 ; };
-};
+
  // RID_STYLECATALOG ------------------------------------------------------
 ModalDialog RID_STYLECATALOG
 {
@@ -136,11 +125,13 @@ ModalDialog RID_STYLECATALOG
         DropDown = TRUE ;
     };
 };
+
  // Strings ---------------------------------------------------------------
 String STR_STYLE_FILTER_HIERARCHICAL
 {
     Text [ en-US ] = "Hierarchical" ;
 };
+
  // DLG_STYLE_DESIGNER ----------------------------------------------------
 DockingWindow DLG_STYLE_DESIGNER
 {
diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx
index 642aabbb0d68..ed5940cace31 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -251,12 +251,7 @@ namespace sfx2
 
         // Get the closer bitmap and set it as right most button.
         Image aImage( SfxResId( SFX_IMG_CLOSE_DOC ) );
-        Image aImageHC( SfxResId( SFX_IMG_CLOSE_DOC_HC ) );
-        m_aToolbox.InsertItem( 1,
-                GetSettings().GetStyleSettings().GetHighContrastMode()
-            ?   aImageHC
-            :   aImage
-        );
+        m_aToolbox.InsertItem( 1, aImage );
         m_aToolbox.ShowItem( 1 );
     }
 
diff --git a/sfx2/source/dialog/titledockwin.src b/sfx2/source/dialog/titledockwin.src
index 3f52e84ab75d..ede6c4b8c4d1 100644
--- a/sfx2/source/dialog/titledockwin.src
+++ b/sfx2/source/dialog/titledockwin.src
@@ -31,9 +31,3 @@ Image SFX_IMG_CLOSE_DOC
 {
     ImageBitmap = Bitmap { File = "closedoc.png" ; };
 };
-
-Image SFX_IMG_CLOSE_DOC_HC
-{
-    ImageBitmap = Bitmap { File = "closedochc.png" ; };
-};
-
diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx
index 2e74ba01411e..a6d1043ddb7c 100644
--- a/sfx2/source/dialog/tplcitem.cxx
+++ b/sfx2/source/dialog/tplcitem.cxx
@@ -164,9 +164,7 @@ void SfxTemplateControllerItem::StateChanged( USHORT nSID, SfxItemState eState,
         }
     }
 }
-/* -----------------------------05.09.2001 10:48------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_STATIC_LINK(SfxTemplateControllerItem, SetWaterCanStateHdl_Impl,
                                     SfxTemplateControllerItem*, EMPTYARG)
 {
diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx
index 6bb734c10c76..4e2920a95417 100644
--- a/sfx2/source/doc/DocumentMetadataAccess.cxx
+++ b/sfx2/source/doc/DocumentMetadataAccess.cxx
@@ -161,8 +161,8 @@ uno::Reference<rdf::XURI> createBaseURI(
         i_xContext->getServiceManager(), uno::UNO_SET_THROW);
     const uno::Reference<uri::XUriReferenceFactory> xUriFactory(
         xServiceFactory->createInstanceWithContext(
-            ::rtl::OUString::createFromAscii(
-                "com.sun.star.uri.UriReferenceFactory"), i_xContext),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.uri.UriReferenceFactory")), i_xContext),
         uno::UNO_QUERY_THROW);
     uno::Reference< uri::XUriReference > xBaseURI;
 
@@ -335,8 +335,8 @@ addFile(struct DocumentMetadataAccess_Impl & i_rImpl,
         throw;
     } catch (uno::Exception & e) {
         throw lang::WrappedTargetRuntimeException(
-            ::rtl::OUString::createFromAscii(
-                "addFile: exception"), /*this*/0, uno::makeAny(e));
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "addFile: exception")), /*this*/0, uno::makeAny(e));
     }
 }
 
@@ -384,7 +384,7 @@ removeFile(struct DocumentMetadataAccess_Impl & i_rImpl,
         throw;
     } catch (uno::Exception & e) {
         throw lang::WrappedTargetRuntimeException(
-            ::rtl::OUString::createFromAscii("removeFile: exception"),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("removeFile: exception")),
             0, uno::makeAny(e));
     }
 }
@@ -413,7 +413,7 @@ getAllParts(struct DocumentMetadataAccess_Impl & i_rImpl)
         throw;
     } catch (uno::Exception & e) {
         throw lang::WrappedTargetRuntimeException(
-            ::rtl::OUString::createFromAscii("getAllParts: exception"),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getAllParts: exception")),
             0, uno::makeAny(e));
     }
 }
@@ -435,7 +435,7 @@ isPartOfType(struct DocumentMetadataAccess_Impl & i_rImpl,
         throw;
     } catch (uno::Exception & e) {
         throw lang::WrappedTargetRuntimeException(
-            ::rtl::OUString::createFromAscii("isPartOfType: exception"),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("isPartOfType: exception")),
             0, uno::makeAny(e));
     }
 }
@@ -452,10 +452,10 @@ mkException( ::rtl::OUString const & i_rMessage,
     iaioe.Classification = task::InteractionClassification_ERROR;
     iaioe.Code = i_ErrorCode;
 
-    const beans::PropertyValue uriProp(::rtl::OUString::createFromAscii("Uri"),
+    const beans::PropertyValue uriProp(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Uri")),
         -1, uno::makeAny(i_rUri), static_cast<beans::PropertyState>(0));
     const beans::PropertyValue rnProp(
-        ::rtl::OUString::createFromAscii("ResourceName"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ResourceName")),
         -1, uno::makeAny(i_rResource), static_cast<beans::PropertyState>(0));
     iaioe.Arguments = ::comphelper::makeSequence(
         uno::makeAny(uriProp), uno::makeAny(rnProp));
@@ -475,8 +475,8 @@ handleError( ucb::InteractiveAugmentedIOException const & i_rException,
     const uno::Reference<task::XInteractionHandler> & i_xHandler)
 {
     if (!i_xHandler.is()) {
-        throw lang::WrappedTargetException(::rtl::OUString::createFromAscii(
-            "DocumentMetadataAccess::loadMetadataFromStorage: exception"),
+        throw lang::WrappedTargetException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "DocumentMetadataAccess::loadMetadataFromStorage: exception")),
             /* *this*/ 0, uno::makeAny(i_rException));
     }
 
@@ -503,8 +503,8 @@ handleError( ucb::InteractiveAugmentedIOException const & i_rException,
         return false;
     } else {
         OSL_ENSURE(pAbort->wasSelected(), "no continuation selected?");
-        throw lang::WrappedTargetException(::rtl::OUString::createFromAscii(
-            "DocumentMetadataAccess::loadMetadataFromStorage: exception"),
+        throw lang::WrappedTargetException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "DocumentMetadataAccess::loadMetadataFromStorage: exception")),
             /* *this*/ 0, uno::makeAny(i_rException));
     }
 }
@@ -516,8 +516,8 @@ collectFilesFromStorage(uno::Reference<embed::XStorage> const& i_xStorage,
     ::rtl::OUString i_Path,
     std::set< ::rtl::OUString > & o_rFiles)
 {
-    static ::rtl::OUString content(::rtl::OUString::createFromAscii(s_content));
-    static ::rtl::OUString styles (::rtl::OUString::createFromAscii(s_styles ));
+    static ::rtl::OUString content(RTL_CONSTASCII_USTRINGPARAM(s_content));
+    static ::rtl::OUString styles(RTL_CONSTASCII_USTRINGPARAM(s_styles ));
     try {
         if (i_xStorage->hasByName(content) &&
             i_xStorage->isStreamElement(content))
@@ -560,8 +560,8 @@ readStream(struct DocumentMetadataAccess_Impl & i_rImpl,
                 i_rImpl.m_xRepository->importGraph(rdf::FileFormat::RDF_XML,
                     xInStream, xURI, xBaseURI);
             } else {
-                throw mkException(::rtl::OUString::createFromAscii(
-                    "readStream: is not a stream"),
+                throw mkException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "readStream: is not a stream")),
                     ucb::IOErrorCode_NO_FILE, i_rBaseURI + i_rPath, i_rPath);
             }
         } else {
@@ -587,8 +587,8 @@ readStream(struct DocumentMetadataAccess_Impl & i_rImpl,
                 buf.append(dir).append(static_cast<sal_Unicode>('/'));
                 readStream(i_rImpl, xDir, rest, buf.makeStringAndClear() );
             } else {
-                throw mkException(::rtl::OUString::createFromAscii(
-                    "readStream: is not a directory"),
+                throw mkException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "readStream: is not a directory")),
                     ucb::IOErrorCode_NO_DIRECTORY, i_rBaseURI + dir, dir);
             }
         }
@@ -621,7 +621,7 @@ retry:
         throw;
     } catch (uno::Exception & e) {
         throw lang::WrappedTargetRuntimeException(
-            ::rtl::OUString::createFromAscii("importFile: exception"),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("importFile: exception")),
             0, uno::makeAny(e));
     }
 }
@@ -642,8 +642,8 @@ exportStream(struct DocumentMetadataAccess_Impl & i_rImpl,
         uno::UNO_QUERY);
     if (xStreamProps.is()) { // this is NOT supported in FileSystemStorage
         xStreamProps->setPropertyValue(
-            ::rtl::OUString::createFromAscii("MediaType"),
-            uno::makeAny(::rtl::OUString::createFromAscii(s_rdfxml)));
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")),
+            uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s_rdfxml))));
     }
     const uno::Reference<io::XOutputStream> xOutStream(
         xStream->getOutputStream(), uno::UNO_SET_THROW );
@@ -762,9 +762,9 @@ retry:
 
     if (rterr.hasValue()) {
         throw lang::WrappedTargetRuntimeException(
-            ::rtl::OUString::createFromAscii(
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "DocumentMetadataAccess::loadMetadataFromStorage: "
-                "exception"), 0, rterr);
+                "exception")), 0, rterr);
     }
 
     if (err) {
@@ -788,7 +788,7 @@ static void init(struct DocumentMetadataAccess_Impl & i_rImpl)
             getURI<rdf::URIs::PKG_DOCUMENT>(i_rImpl.m_xContext).get());
     } catch (uno::Exception & e) {
         throw lang::WrappedTargetRuntimeException(
-            ::rtl::OUString::createFromAscii("init: unexpected exception"), 0,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("init: unexpected exception")), 0,
             uno::makeAny(e));
     }
 
@@ -877,8 +877,8 @@ throw (uno::RuntimeException)
     const IXmlIdRegistry * pReg(
         m_pImpl->m_rXmlIdRegistrySupplier.GetXmlIdRegistry() );
     if (!pReg) {
-        throw uno::RuntimeException(::rtl::OUString::createFromAscii(
-            "DocumentMetadataAccess::getElementByXmlId: no registry"), *this);
+        throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "DocumentMetadataAccess::getElementByXmlId: no registry")), *this);
     }
     return pReg->GetElementByMetadataReference(i_rReference);
 }
@@ -889,8 +889,8 @@ DocumentMetadataAccess::getElementByURI(
 throw (uno::RuntimeException, lang::IllegalArgumentException)
 {
     if (!i_xURI.is()) {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
-            "DocumentMetadataAccess::getElementByURI: URI is null"), *this, 0);
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "DocumentMetadataAccess::getElementByURI: URI is null")), *this, 0);
     }
 
     const ::rtl::OUString baseURI( m_pImpl->m_xBaseURI->getStringValue() );
@@ -915,9 +915,9 @@ DocumentMetadataAccess::getMetadataGraphsWithType(
 throw (uno::RuntimeException, lang::IllegalArgumentException)
 {
     if (!i_xType.is()) {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "DocumentMetadataAccess::getMetadataGraphsWithType: "
-            "type is null"), *this, 0);
+            "type is null")), *this, 0);
     }
 
     ::comphelper::SequenceAsVector< uno::Reference< rdf::XURI > > ret;
@@ -938,21 +938,21 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
     container::ElementExistException)
 {
     if (!isFileNameValid(i_rFileName)) {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
-            "DocumentMetadataAccess::addMetadataFile: invalid FileName"),
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "DocumentMetadataAccess::addMetadataFile: invalid FileName")),
             *this, 0);
     }
     if (isReservedFile(i_rFileName)) {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "DocumentMetadataAccess::addMetadataFile:"
-            "invalid FileName: reserved"), *this, 0);
+            "invalid FileName: reserved")), *this, 0);
     }
     for (sal_Int32 i = 0; i < i_rTypes.getLength(); ++i) {
         if (!i_rTypes[i].is()) {
             throw lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                     "DocumentMetadataAccess::addMetadataFile: "
-                    "null type"), *this, 2);
+                    "null type")), *this, 2);
         }
     }
 
@@ -963,8 +963,8 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
         m_pImpl->m_xRepository->createGraph(xGraphName);
     } catch (rdf::RepositoryException & e) {
         throw lang::WrappedTargetRuntimeException(
-            ::rtl::OUString::createFromAscii(
-                "DocumentMetadataAccess::addMetadataFile: exception"),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "DocumentMetadataAccess::addMetadataFile: exception")),
             *this, uno::makeAny(e));
         // note: all other exceptions are propagated
     }
@@ -984,20 +984,20 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
     container::ElementExistException, rdf::ParseException, io::IOException)
 {
     if (!isFileNameValid(i_rFileName)) {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
-            "DocumentMetadataAccess::importMetadataFile: invalid FileName"),
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "DocumentMetadataAccess::importMetadataFile: invalid FileName")),
             *this, 0);
     }
     if (isReservedFile(i_rFileName)) {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "DocumentMetadataAccess::importMetadataFile:"
-            "invalid FileName: reserved"), *this, 0);
+            "invalid FileName: reserved")), *this, 0);
     }
     for (sal_Int32 i = 0; i < i_rTypes.getLength(); ++i) {
         if (!i_rTypes[i].is()) {
             throw lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii(
-                    "DocumentMetadataAccess::importMetadataFile: null type"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "DocumentMetadataAccess::importMetadataFile: null type")),
                 *this, 5);
         }
     }
@@ -1010,9 +1010,9 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
             i_Format, i_xInStream, xGraphName, i_xBaseURI);
     } catch (rdf::RepositoryException & e) {
         throw lang::WrappedTargetRuntimeException(
-            ::rtl::OUString::createFromAscii(
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "DocumentMetadataAccess::importMetadataFile: "
-                "RepositoryException"), *this, uno::makeAny(e));
+                "RepositoryException")), *this, uno::makeAny(e));
         // note: all other exceptions are propagated
     }
 
@@ -1031,9 +1031,9 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
         m_pImpl->m_xRepository->destroyGraph(i_xGraphName);
     } catch (rdf::RepositoryException & e) {
         throw lang::WrappedTargetRuntimeException(
-            ::rtl::OUString::createFromAscii(
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "DocumentMetadataAccess::removeMetadataFile: "
-                "RepositoryException"), *this, uno::makeAny(e));
+                "RepositoryException")), *this, uno::makeAny(e));
         // note: all other exceptions are propagated
     }
 
@@ -1048,15 +1048,15 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
     container::ElementExistException)
 {
     if (!isFileNameValid(i_rFileName)) {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "DocumentMetadataAccess::addContentOrStylesFile: "
-            "invalid FileName"), *this, 0);
+            "invalid FileName")), *this, 0);
     }
 
     if (!addContentOrStylesFileImpl(*m_pImpl, i_rFileName)) {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "DocumentMetadataAccess::addContentOrStylesFile: "
-            "invalid FileName: must end with content.xml or styles.xml"),
+            "invalid FileName: must end with content.xml or styles.xml")),
             *this, 0);
     }
 }
@@ -1068,9 +1068,9 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
     container::NoSuchElementException)
 {
     if (!isFileNameValid(i_rFileName)) {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "DocumentMetadataAccess::removeContentOrStylesFile: "
-            "invalid FileName"), *this, 0);
+            "invalid FileName")), *this, 0);
     }
 
     try {
@@ -1083,9 +1083,9 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
             uno::UNO_SET_THROW);
         if (!xEnum->hasMoreElements()) {
             throw container::NoSuchElementException(
-                ::rtl::OUString::createFromAscii(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                     "DocumentMetadataAccess::removeContentOrStylesFile: "
-                    "cannot find stream in manifest graph: ") + i_rFileName,
+                    "cannot find stream in manifest graph: ")) + i_rFileName,
                 *this);
         }
 
@@ -1096,8 +1096,8 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
         throw;
     } catch (uno::Exception & e) {
         throw lang::WrappedTargetRuntimeException(
-            ::rtl::OUString::createFromAscii(
-                "DocumentMetadataAccess::removeContentOrStylesFile: exception"),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "DocumentMetadataAccess::removeContentOrStylesFile: exception")),
             *this, uno::makeAny(e));
     }
 }
@@ -1110,32 +1110,32 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
     lang::WrappedTargetException)
 {
     if (!i_xStorage.is()) {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "DocumentMetadataAccess::loadMetadataFromStorage: "
-            "storage is null"), *this, 0);
+            "storage is null")), *this, 0);
     }
     if (!i_xBaseURI.is()) {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "DocumentMetadataAccess::loadMetadataFromStorage: "
-            "base URI is null"), *this, 1);
+            "base URI is null")), *this, 1);
     }
     const ::rtl::OUString baseURI( i_xBaseURI->getStringValue());
     if (baseURI.indexOf('#') >= 0) {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "DocumentMetadataAccess::loadMetadataFromStorage: "
-            "base URI not absolute"), *this, 1);
+            "base URI not absolute")), *this, 1);
     }
     if (!baseURI.getLength() || !baseURI.endsWithAsciiL("/", 1)) {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "DocumentMetadataAccess::loadMetadataFromStorage: "
-            "base URI does not end with slash"), *this, 1);
+            "base URI does not end with slash")), *this, 1);
     }
 
     initLoading(*m_pImpl, i_xStorage, i_xBaseURI, i_xHandler);
 
     std::set< ::rtl::OUString > StgFiles;
     collectFilesFromStorage(i_xStorage,
-        ::rtl::OUString::createFromAscii(""), StgFiles);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")), StgFiles);
 
     std::vector< ::rtl::OUString > MfstMetadataFiles;
 
@@ -1202,9 +1202,9 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
         throw;
     } catch (uno::Exception & e) {
         throw lang::WrappedTargetRuntimeException(
-            ::rtl::OUString::createFromAscii(
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "DocumentMetadataAccess::loadMetadataFromStorage: "
-                "exception"), *this, uno::makeAny(e));
+                "exception")), *this, uno::makeAny(e));
     }
 
     std::for_each(StgFiles.begin(), StgFiles.end(),
@@ -1221,9 +1221,9 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
     lang::WrappedTargetException)
 {
     if (!i_xStorage.is()) {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "DocumentMetadataAccess::storeMetadataToStorage: "
-            "storage is null"), *this, 0);
+            "storage is null")), *this, 0);
     }
 
     // export manifest
@@ -1237,12 +1237,12 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
     } catch (uno::RuntimeException &) {
         throw;
     } catch (io::IOException & e) {
-        throw lang::WrappedTargetException( ::rtl::OUString::createFromAscii(
-            "storeMetadataToStorage: IO exception"), *this, uno::makeAny(e));
+        throw lang::WrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "storeMetadataToStorage: IO exception")), *this, uno::makeAny(e));
     } catch (uno::Exception & e) {
         throw lang::WrappedTargetRuntimeException(
-            ::rtl::OUString::createFromAscii(
-                "storeMetadataToStorage: exception"), *this, uno::makeAny(e));
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "storeMetadataToStorage: exception")), *this, uno::makeAny(e));
     }
 
     // export metadata streams
@@ -1275,20 +1275,20 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
                 throw;
             } catch (io::IOException & e) {
                 throw lang::WrappedTargetException(
-                    ::rtl::OUString::createFromAscii(
-                        "storeMetadataToStorage: IO exception"),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "storeMetadataToStorage: IO exception")),
                     *this, uno::makeAny(e));
             } catch (uno::Exception & e) {
                 throw lang::WrappedTargetRuntimeException(
-                    ::rtl::OUString::createFromAscii(
-                        "storeMetadataToStorage: exception"),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "storeMetadataToStorage: exception")),
                     *this, uno::makeAny(e));
             }
         }
     } catch (rdf::RepositoryException & e) {
         throw lang::WrappedTargetRuntimeException(
-            ::rtl::OUString::createFromAscii(
-                "storeMetadataToStorage: exception"), *this, uno::makeAny(e));
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "storeMetadataToStorage: exception")), *this, uno::makeAny(e));
     }
 }
 
@@ -1308,9 +1308,9 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
         md[ ::comphelper::MediaDescriptor::PROP_INPUTSTREAM() ] >>= xIn;
     }
     if (!xIn.is() && URL.equalsAscii("")) {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "DocumentMetadataAccess::loadMetadataFromMedium: "
-            "inalid medium: no URL, no input stream"), *this, 0);
+            "inalid medium: no URL, no input stream")), *this, 0);
     }
     uno::Reference<embed::XStorage> xStorage;
     try {
@@ -1329,14 +1329,14 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
         throw;
     } catch (uno::Exception & e) {
         throw lang::WrappedTargetException(
-                ::rtl::OUString::createFromAscii(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                     "DocumentMetadataAccess::loadMetadataFromMedium: "
-                    "exception"), *this, uno::makeAny(e));
+                    "exception")), *this, uno::makeAny(e));
     }
     if (!xStorage.is()) {
-        throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+        throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "DocumentMetadataAccess::loadMetadataFromMedium: "
-            "cannot get Storage"), *this);
+            "cannot get Storage")), *this);
     }
     uno::Reference<rdf::XURI> xBaseURI;
     try {
@@ -1364,9 +1364,9 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
     ::rtl::OUString URL;
     md[ ::comphelper::MediaDescriptor::PROP_URL() ] >>= URL;
     if (URL.equalsAscii("")) {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "DocumentMetadataAccess::storeMetadataToMedium: "
-            "invalid medium: no URL"), *this, 0);
+            "invalid medium: no URL")), *this, 0);
     }
 
     SfxMedium aMedium(i_rMedium);
@@ -1383,9 +1383,9 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
     }
 
     if (!xStorage.is()) {
-        throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+        throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "DocumentMetadataAccess::storeMetadataToMedium: "
-            "cannot get Storage"), *this);
+            "cannot get Storage")), *this);
     }
     // set MIME type of the storage
     ::comphelper::MediaDescriptor::const_iterator iter
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index c96b627b3cee..0a107eb99450 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -522,8 +522,8 @@ XmlIdRegistryDocument::XmlIdRegistry_Impl::LookupElement(
 {
     if (!isValidXmlId(i_rStreamName, i_rIdref))
     {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
-            "illegal XmlId"), 0, 0);
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "illegal XmlId")), 0, 0);
     }
 
     const XmlIdList_t * pList( LookupElementList(i_rStreamName, i_rIdref) );
@@ -691,15 +691,15 @@ XmlIdRegistryDocument::TryRegisterMetadatable(Metadatable & i_rObject,
 
     if (!isValidXmlId(i_rStreamName, i_rIdref))
     {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
-            "illegal XmlId"), 0, 0);
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "illegal XmlId")), 0, 0);
     }
     if (i_rObject.IsInContent()
         ?   !isContentFile(i_rStreamName)
         :   !isStylesFile(i_rStreamName))
     {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
-            "illegal XmlId: wrong stream"), 0, 0);
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "illegal XmlId: wrong stream")), 0, 0);
     }
 
     ::rtl::OUString old_path;
@@ -994,8 +994,8 @@ XmlIdRegistryClipboard::XmlIdRegistry_Impl::LookupEntry(
 {
     if (!isValidXmlId(i_rStreamName, i_rIdref))
     {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
-            "illegal XmlId"), 0, 0);
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "illegal XmlId")), 0, 0);
     }
 
     const ClipboardXmlIdMap_t::const_iterator iter( m_XmlIdMap.find(i_rIdref) );
@@ -1125,15 +1125,15 @@ XmlIdRegistryClipboard::TryRegisterMetadatable(Metadatable & i_rObject,
 
     if (!isValidXmlId(i_rStreamName, i_rIdref))
     {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
-            "illegal XmlId"), 0, 0);
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "illegal XmlId")), 0, 0);
     }
     if (i_rObject.IsInContent()
         ?   !isContentFile(i_rStreamName)
         :   !isStylesFile(i_rStreamName))
     {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
-            "illegal XmlId: wrong stream"), 0, 0);
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "illegal XmlId: wrong stream")), 0, 0);
     }
 
     ::rtl::OUString old_path;
@@ -1262,8 +1262,8 @@ XmlIdRegistryClipboard::RegisterCopyClipboard(Metadatable & i_rCopy,
 
     if (!isValidXmlId(i_rReference.First, i_rReference.Second))
     {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
-            "illegal XmlId"), 0, 0);
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "illegal XmlId")), 0, 0);
     }
 
     if (!i_isLatent)
@@ -1355,8 +1355,8 @@ Metadatable::SetMetadataReference(
         else
         {
             throw lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii("Metadatable::"
-                    "SetMetadataReference: argument is invalid"), /*this*/0, 0);
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Metadatable::"
+                    "SetMetadataReference: argument is invalid")), /*this*/0, 0);
         }
     }
 }
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index f9111cb7f6bd..2379dd7a140e 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -670,8 +670,8 @@ SfxDocumentMetaData::getURLProperties(
     css::uno::Reference<css::lang::XMultiComponentFactory> xMsf (
         m_xContext->getServiceManager());
     css::uno::Reference< css::beans::XPropertyContainer> xPropArg(
-        xMsf->createInstanceWithContext(::rtl::OUString::createFromAscii(
-                "com.sun.star.beans.PropertyBag"), m_xContext),
+        xMsf->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.beans.PropertyBag")), m_xContext),
         css::uno::UNO_QUERY_THROW);
     try {
         ::rtl::OUString dburl =
@@ -708,8 +708,8 @@ getNodeText(css::uno::Reference<css::xml::dom::XNode> i_xNode)
         throw (css::uno::RuntimeException)
 {
     if (!i_xNode.is()) throw css::uno::RuntimeException(
-        ::rtl::OUString::createFromAscii(
-                "SfxDocumentMetaData::getNodeText: argument is null"), i_xNode);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "SfxDocumentMetaData::getNodeText: argument is null")), i_xNode);
     for (css::uno::Reference<css::xml::dom::XNode> c = i_xNode->getFirstChild();
             c.is();
             c = c->getNextSibling()) {
@@ -788,8 +788,8 @@ SfxDocumentMetaData::setMetaText(const char* i_name,
     } catch (css::xml::dom::DOMException & e) {
         css::uno::Any a(e);
         throw css::lang::WrappedTargetRuntimeException(
-                ::rtl::OUString::createFromAscii(
-                        "SfxDocumentMetaData::setMetaText: DOM exception"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "SfxDocumentMetaData::setMetaText: DOM exception")),
                 css::uno::Reference<css::uno::XInterface>(*this), a);
     }
 }
@@ -926,8 +926,8 @@ SfxDocumentMetaData::setMetaList(const char* i_name,
     } catch (css::xml::dom::DOMException & e) {
         css::uno::Any a(e);
         throw css::lang::WrappedTargetRuntimeException(
-                ::rtl::OUString::createFromAscii(
-                        "SfxDocumentMetaData::setMetaList: DOM exception"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "SfxDocumentMetaData::setMetaList: DOM exception")),
                 css::uno::Reference<css::uno::XInterface>(*this), a);
     }
 }
@@ -1067,8 +1067,8 @@ SfxDocumentMetaData::updateElement(const char *i_name,
     } catch (css::xml::dom::DOMException & e) {
         css::uno::Any a(e);
         throw css::lang::WrappedTargetRuntimeException(
-                ::rtl::OUString::createFromAscii(
-                    "SfxDocumentMetaData::updateElement: DOM exception"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "SfxDocumentMetaData::updateElement: DOM exception")),
                 css::uno::Reference<css::uno::XInterface>(*this), a);
     }
 }
@@ -1145,18 +1145,18 @@ SfxDocumentMetaData::createDOM() const // throw (css::uno::RuntimeException)
     css::uno::Reference<css::lang::XMultiComponentFactory> xMsf (
         m_xContext->getServiceManager());
     css::uno::Reference<css::xml::dom::XDocumentBuilder> xBuilder(
-        xMsf->createInstanceWithContext(::rtl::OUString::createFromAscii(
-                "com.sun.star.xml.dom.DocumentBuilder"), m_xContext),
+        xMsf->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.xml.dom.DocumentBuilder")), m_xContext),
         css::uno::UNO_QUERY_THROW );
     if (!xBuilder.is()) throw css::uno::RuntimeException(
-        ::rtl::OUString::createFromAscii("SfxDocumentMetaData::createDOM: "
-                "cannot create DocumentBuilder service"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SfxDocumentMetaData::createDOM: "
+                "cannot create DocumentBuilder service")),
                 *const_cast<SfxDocumentMetaData*>(this));
     css::uno::Reference<css::xml::dom::XDocument> xDoc =
                 xBuilder->newDocument();
     if (!xDoc.is()) throw css::uno::RuntimeException(
-        ::rtl::OUString::createFromAscii("SfxDocumentMetaData::createDOM: "
-                "cannot create new document"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SfxDocumentMetaData::createDOM: "
+                "cannot create new document")),
                 *const_cast<SfxDocumentMetaData*>(this));
     return xDoc;
 }
@@ -1165,8 +1165,8 @@ void SAL_CALL
 SfxDocumentMetaData::checkInit() const // throw (css::uno::RuntimeException)
 {
     if (!m_isInitialized) {
-        throw css::uno::RuntimeException(::rtl::OUString::createFromAscii(
-                "SfxDocumentMetaData::checkInit: not initialized"),
+        throw css::uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "SfxDocumentMetaData::checkInit: not initialized")),
                 *const_cast<SfxDocumentMetaData*>(this));
     }
     DBG_ASSERT((m_xDoc.is() && m_xParent.is() ),
@@ -1180,18 +1180,18 @@ void SAL_CALL SfxDocumentMetaData::init(
 //               css::uno::Exception)
 {
     if (!i_xDoc.is()) throw css::uno::RuntimeException(
-        ::rtl::OUString::createFromAscii(
-                "SfxDocumentMetaData::init: no DOM tree given"), *this);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "SfxDocumentMetaData::init: no DOM tree given")), *this);
 
     css::uno::Reference<css::lang::XMultiComponentFactory> xMsf (
         m_xContext->getServiceManager());
     css::uno::Reference<css::xml::xpath::XXPathAPI> xPath(
-        xMsf->createInstanceWithContext(::rtl::OUString::createFromAscii(
-                "com.sun.star.xml.xpath.XPathAPI"), m_xContext),
+        xMsf->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.xml.xpath.XPathAPI")), m_xContext),
         css::uno::UNO_QUERY_THROW );
     if (!xPath.is()) throw css::uno::RuntimeException(
-        ::rtl::OUString::createFromAscii("SfxDocumentMetaData::init:"
-                " cannot create XPathAPI service"), *this);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SfxDocumentMetaData::init:"
+                " cannot create XPathAPI service")), *this);
 
     m_isInitialized = false;
     m_xDoc = i_xDoc;
@@ -1209,8 +1209,8 @@ void SAL_CALL SfxDocumentMetaData::init(
     // NB: we do not handle the single-XML-file ODF variant, which would
     //     have the root element office:document.
     //     The root of such documents must be converted in the importer!
-    ::rtl::OUString prefix = ::rtl::OUString::createFromAscii(
-        "/child::office:document-meta/child::office:meta");
+    ::rtl::OUString prefix(RTL_CONSTASCII_USTRINGPARAM(
+        "/child::office:document-meta/child::office:meta"));
     css::uno::Reference<css::xml::dom::XNode> xDocNode(
         m_xDoc, css::uno::UNO_QUERY_THROW);
     m_xParent.clear();
@@ -1227,29 +1227,27 @@ void SAL_CALL SfxDocumentMetaData::init(
             css::uno::Reference<css::xml::dom::XElement> xRElem(
                 i_xDoc->createElementNS(
                     ::rtl::OUString::createFromAscii(s_nsODF),
-                    ::rtl::OUString::createFromAscii("office:document-meta")));
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("office:document-meta"))));
             css::uno::Reference<css::xml::dom::XNode> xRNode(xRElem,
                 css::uno::UNO_QUERY_THROW);
             // NB: the following is a _bad_idea_ with our DOM implementation
             //     do _not_ create attributes with xmlns prefix!
-//        xRElem->setAttribute(::rtl::OUString::createFromAscii("xmlns:office"),
-//                    ::rtl::OUString::createFromAscii(s_nsODF));
             xRElem->setAttributeNS(::rtl::OUString::createFromAscii(s_nsODF),
-                        ::rtl::OUString::createFromAscii("office:version"),
-                        ::rtl::OUString::createFromAscii("1.0"));
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("office:version")),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1.0")));
             i_xDoc->appendChild(xRNode);
             css::uno::Reference<css::xml::dom::XNode> xParent (
                 i_xDoc->createElementNS(
                     ::rtl::OUString::createFromAscii(s_nsODF),
-                    ::rtl::OUString::createFromAscii("office:meta")),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("office:meta"))),
             css::uno::UNO_QUERY_THROW);
             xRNode->appendChild(xParent);
             m_xParent = xParent;
         } catch (css::xml::dom::DOMException & e) {
             css::uno::Any a(e);
             throw css::lang::WrappedTargetRuntimeException(
-                    ::rtl::OUString::createFromAscii(
-                            "SfxDocumentMetaData::init: DOM exception"),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                            "SfxDocumentMetaData::init: DOM exception")),
                     css::uno::Reference<css::uno::XInterface>(*this), a);
         }
     }
@@ -1266,7 +1264,7 @@ void SAL_CALL SfxDocumentMetaData::init(
         // application-specific.
         css::uno::Reference<css::xml::dom::XNode> xNode =
             xPath->selectSingleNode(m_xParent,
-                ::rtl::OUString::createFromAscii("child::") + name);
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("child::")) + name);
         // Do not create an empty element if it is missing;
         // for certain elements, such as dateTime, this would be invalid
         m_meta[name] = xNode;
@@ -1277,7 +1275,7 @@ void SAL_CALL SfxDocumentMetaData::init(
         ::rtl::OUString name = ::rtl::OUString::createFromAscii(*pName);
         css::uno::Reference<css::xml::dom::XNodeList> nodes =
             xPath->selectNodeList(m_xParent,
-                ::rtl::OUString::createFromAscii("child::") + name);
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("child::")) + name);
         std::vector<css::uno::Reference<css::xml::dom::XNode> > v;
         for (sal_Int32 i = 0; i < nodes->getLength(); ++i) {
             v.push_back(nodes->item(i));
@@ -1298,7 +1296,7 @@ void SAL_CALL SfxDocumentMetaData::init(
 
 
     std::vector<css::uno::Reference<css::xml::dom::XNode> > & vec =
-        m_metaList[::rtl::OUString::createFromAscii("meta:user-defined")];
+        m_metaList[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("meta:user-defined"))];
     m_xUserDefined.clear(); // #i105826#: reset (may be re-initialization)
     if ( !vec.empty() )
     {
@@ -1316,7 +1314,7 @@ void SAL_CALL SfxDocumentMetaData::init(
                 ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("name")));
         ::rtl::OUString type = xElem->getAttributeNS(
                 ::rtl::OUString::createFromAscii(s_nsODFMeta),
-                ::rtl::OUString::createFromAscii("value-type"));
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value-type")));
         ::rtl::OUString text = getNodeText(*it);
         if (type.equalsAscii("float")) {
             double d;
@@ -1574,7 +1572,7 @@ SfxDocumentMetaData::setLanguage(const css::lang::Locale & the_value)
 {
     ::rtl::OUString text = the_value.Language;
     if (the_value.Country.getLength() > 0) {
-        text += ::rtl::OUString::createFromAscii("-").concat(the_value.Country);
+        text += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-")).concat(the_value.Country);
     }
     setMetaTextAndNotify("dc:language", text);
 }
@@ -1732,8 +1730,8 @@ SfxDocumentMetaData::setAutoloadSecs(::sal_Int32 the_value)
         throw (css::uno::RuntimeException, css::lang::IllegalArgumentException)
 {
     if (the_value < 0) throw css::lang::IllegalArgumentException(
-        ::rtl::OUString::createFromAscii(
-            "SfxDocumentMetaData::setAutoloadSecs: argument is negative"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "SfxDocumentMetaData::setAutoloadSecs: argument is negative")),
             *this, 0);
     ::osl::ClearableMutexGuard g(m_aMutex);
     checkInit();
@@ -1846,8 +1844,8 @@ SfxDocumentMetaData::setEditingCycles(::sal_Int16 the_value)
         throw (css::uno::RuntimeException, css::lang::IllegalArgumentException)
 {
     if (the_value < 0) throw css::lang::IllegalArgumentException(
-        ::rtl::OUString::createFromAscii(
-                "SfxDocumentMetaData::setEditingCycles: argument is negative"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "SfxDocumentMetaData::setEditingCycles: argument is negative")),
                 *this, 0);
     ::rtl::OUStringBuffer buf;
     ::sax::Converter::convertNumber(buf, the_value);
@@ -1866,8 +1864,8 @@ SfxDocumentMetaData::setEditingDuration(::sal_Int32 the_value)
         throw (css::uno::RuntimeException, css::lang::IllegalArgumentException)
 {
     if (the_value < 0) throw css::lang::IllegalArgumentException(
-        ::rtl::OUString::createFromAscii(
-            "SfxDocumentMetaData::setEditingDuration: argument is negative"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "SfxDocumentMetaData::setEditingDuration: argument is negative")),
             *this, 0);
     setMetaTextAndNotify("meta:editing-duration", durationToText(the_value));
 }
@@ -1891,7 +1889,7 @@ SfxDocumentMetaData::resetUserData(const ::rtl::OUString & the_value)
         dateTimeToText(css::util::DateTime()));
     bModified |= setMetaText("meta:editing-duration", durationToText(0));
     bModified |= setMetaText("meta:editing-cycles",
-        ::rtl::OUString::createFromAscii("1"));
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1")));
 
     if (bModified) {
         g.clear();
@@ -1920,8 +1918,8 @@ SfxDocumentMetaData::loadFromStorage(
            css::lang::WrappedTargetException, css::io::IOException)
 {
     if (!xStorage.is()) throw css::lang::IllegalArgumentException(
-        ::rtl::OUString::createFromAscii("SfxDocumentMetaData::loadFromStorage:"
-                " argument is null"), *this, 0);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SfxDocumentMetaData::loadFromStorage:"
+                " argument is null")), *this, 0);
     ::osl::MutexGuard g(m_aMutex);
 
     // open meta data file
@@ -1938,12 +1936,12 @@ SfxDocumentMetaData::loadFromStorage(
     css::uno::Reference<css::lang::XMultiComponentFactory> xMsf (
         m_xContext->getServiceManager());
     css::uno::Reference<css::xml::sax::XParser> xParser (
-        xMsf->createInstanceWithContext(::rtl::OUString::createFromAscii(
-                "com.sun.star.xml.sax.Parser"), m_xContext),
+        xMsf->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.xml.sax.Parser")), m_xContext),
         css::uno::UNO_QUERY_THROW);
     if (!xParser.is()) throw css::uno::RuntimeException(
-        ::rtl::OUString::createFromAscii("SfxDocumentMetaData::loadFromStorage:"
-                " cannot create Parser service"), *this);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SfxDocumentMetaData::loadFromStorage:"
+                " cannot create Parser service")), *this);
     css::xml::sax::InputSource input;
     input.aInputStream = xInStream;
 
@@ -1960,7 +1958,7 @@ SfxDocumentMetaData::loadFromStorage(
     try {
         xPropArg->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseURI")))
             >>= input.sSystemId;
-        input.sSystemId += ::rtl::OUString::createFromAscii("/").concat(
+        input.sSystemId += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")).concat(
                 ::rtl::OUString::createFromAscii(s_metaXml));
     } catch (css::uno::Exception &) {
         input.sSystemId = ::rtl::OUString::createFromAscii(s_metaXml);
@@ -1973,8 +1971,8 @@ SfxDocumentMetaData::loadFromStorage(
             ::rtl::OUString::createFromAscii(pServiceName), args, m_xContext),
         css::uno::UNO_QUERY_THROW);
     if (!xDocHandler.is()) throw css::uno::RuntimeException(
-        ::rtl::OUString::createFromAscii("SfxDocumentMetaData::loadFromStorage:"
-                " cannot create XMLOasisMetaImporter service"), *this);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SfxDocumentMetaData::loadFromStorage:"
+                " cannot create XMLOasisMetaImporter service")), *this);
     css::uno::Reference<css::document::XImporter> xImp (xDocHandler,
         css::uno::UNO_QUERY_THROW);
     xImp->setTargetDocument(css::uno::Reference<css::lang::XComponent>(this));
@@ -1982,9 +1980,9 @@ SfxDocumentMetaData::loadFromStorage(
     try {
         xParser->parseStream(input);
     } catch (css::xml::sax::SAXException &) {
-        throw css::io::WrongFormatException(::rtl::OUString::createFromAscii(
+        throw css::io::WrongFormatException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "SfxDocumentMetaData::loadFromStorage:"
-                " XML parsing exception"), *this);
+                " XML parsing exception")), *this);
     }
     // NB: the implementation of XMLOasisMetaImporter calls initialize
 //    init(xDocBuilder->getDocument());
@@ -1999,8 +1997,8 @@ SfxDocumentMetaData::storeToStorage(
            css::lang::WrappedTargetException, css::io::IOException)
 {
     if (!xStorage.is()) throw css::lang::IllegalArgumentException(
-        ::rtl::OUString::createFromAscii("SfxDocumentMetaData::storeToStorage:"
-                " argument is null"), *this, 0);
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SfxDocumentMetaData::storeToStorage:"
+                " argument is null")), *this, 0);
     ::osl::MutexGuard g(m_aMutex);
     checkInit();
 
@@ -2017,7 +2015,7 @@ SfxDocumentMetaData::storeToStorage(
         css::uno::UNO_QUERY_THROW);
     xStreamProps->setPropertyValue(
         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")),
-        css::uno::makeAny(::rtl::OUString::createFromAscii("text/xml")));
+        css::uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("text/xml"))));
     xStreamProps->setPropertyValue(
         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Compressed")),
         css::uno::makeAny(static_cast<sal_Bool> (sal_False)));
@@ -2030,8 +2028,8 @@ SfxDocumentMetaData::storeToStorage(
     css::uno::Reference<css::lang::XMultiComponentFactory> xMsf (
         m_xContext->getServiceManager());
     css::uno::Reference<css::io::XActiveDataSource> xSaxWriter(
-        xMsf->createInstanceWithContext(::rtl::OUString::createFromAscii(
-                "com.sun.star.xml.sax.Writer"), m_xContext),
+        xMsf->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.xml.sax.Writer")), m_xContext),
         css::uno::UNO_QUERY_THROW);
     xSaxWriter->setOutputStream(xOutStream);
     css::uno::Reference<css::xml::sax::XDocumentHandler> xDocHandler (
@@ -2065,8 +2063,8 @@ SfxDocumentMetaData::storeToStorage(
             xTransaction->commit();
         }
     } else {
-        throw css::io::IOException(::rtl::OUString::createFromAscii(
-                "SfxDocumentMetaData::storeToStorage: cannot filter"), *this);
+        throw css::io::IOException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "SfxDocumentMetaData::storeToStorage: cannot filter")), *this);
     }
 }
 
@@ -2102,14 +2100,14 @@ SfxDocumentMetaData::loadFromMedium(const ::rtl::OUString & URL,
         throw;
     } catch (css::uno::Exception & e) {
         throw css::lang::WrappedTargetException(
-                ::rtl::OUString::createFromAscii(
-                    "SfxDocumentMetaData::loadFromMedium: exception"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "SfxDocumentMetaData::loadFromMedium: exception")),
                 css::uno::Reference<css::uno::XInterface>(*this),
                 css::uno::makeAny(e));
     }
     if (!xStorage.is()) {
-        throw css::uno::RuntimeException(::rtl::OUString::createFromAscii(
-                "SfxDocumentMetaData::loadFromMedium: cannot get Storage"),
+        throw css::uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "SfxDocumentMetaData::loadFromMedium: cannot get Storage")),
                 *this);
     }
     loadFromStorage(xStorage, md.getAsConstPropertyValueList());
@@ -2131,8 +2129,8 @@ SfxDocumentMetaData::storeToMedium(const ::rtl::OUString & URL,
 
 
     if (!xStorage.is()) {
-        throw css::uno::RuntimeException(::rtl::OUString::createFromAscii(
-                "SfxDocumentMetaData::storeToMedium: cannot get Storage"),
+        throw css::uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "SfxDocumentMetaData::storeToMedium: cannot get Storage")),
                 *this);
     }
     // set MIME type of the storage
@@ -2181,14 +2179,14 @@ SfxDocumentMetaData::initialize(
         if (any >>= xDoc) {
             if (!xDoc.is()) {
                 throw css::lang::IllegalArgumentException(
-                    ::rtl::OUString::createFromAscii("SfxDocumentMetaData::"
-                        "initialize: argument is null"),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SfxDocumentMetaData::"
+                        "initialize: argument is null")),
                     *this, static_cast<sal_Int16>(i));
             }
         } else {
             throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii("SfxDocumentMetaData::"
-                    "initialize: argument must be XDocument"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SfxDocumentMetaData::"
+                    "initialize: argument must be XDocument")),
                 *this, static_cast<sal_Int16>(i));
         }
     }
@@ -2227,8 +2225,8 @@ SfxDocumentMetaData::createClone()
     } catch (css::uno::Exception & e) {
         css::uno::Any a(e);
         throw css::lang::WrappedTargetRuntimeException(
-                ::rtl::OUString::createFromAscii(
-                    "SfxDocumentMetaData::createClone: exception"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "SfxDocumentMetaData::createClone: exception")),
                 css::uno::Reference<css::uno::XInterface>(*this), a);
     }
 //    return static_cast< ::cppu::OWeakObject * > (pNew);
diff --git a/sfx2/source/doc/applet.cxx b/sfx2/source/doc/applet.cxx
index 1109883f10d6..f9a7fcca9052 100644
--- a/sfx2/source/doc/applet.cxx
+++ b/sfx2/source/doc/applet.cxx
@@ -138,8 +138,8 @@ AppletObject::getSupportedServiceNames()
 AppletObject::impl_getStaticSupportedServiceNames()
 {
     ::com::sun::star::uno::Sequence< ::rtl::OUString > seqServiceNames( 1 );
-    seqServiceNames.getArray() [0] = ::rtl::OUString::createFromAscii(
-        "com.sun.star.embed.SpecialEmbeddedObject" );
+    seqServiceNames.getArray() [0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+        "com.sun.star.embed.SpecialEmbeddedObject" ));
     return seqServiceNames ;
 }
 
@@ -154,8 +154,8 @@ AppletObject::impl_createInstance(
 
 ::rtl::OUString AppletObject::impl_getStaticImplementationName()
 {
-    return ::rtl::OUString::createFromAscii(
-        "com.sun.star.comp.sfx2.AppletObject" );
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+        "com.sun.star.comp.sfx2.AppletObject" ));
 }
 
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc
index 838168e64526..5f3507334fac 100644
--- a/sfx2/source/doc/doc.hrc
+++ b/sfx2/source/doc/doc.hrc
@@ -62,14 +62,6 @@
 #define BMP_STYLES_FAMILY3                  (RID_SFX_DOC_START+ 4)
 #define BMP_STYLES_FAMILY4                  (RID_SFX_DOC_START+ 5)
 
-#define BMP_STYLES_CLOSED_HC                (RID_SFX_DOC_START+ 6)
-#define BMP_STYLES_OPENED_HC                (RID_SFX_DOC_START+ 7)
-
-#define BMP_STYLES_FAMILY1_HC               (RID_SFX_DOC_START+ 8)
-#define BMP_STYLES_FAMILY2_HC               (RID_SFX_DOC_START+ 9)
-#define BMP_STYLES_FAMILY3_HC               (RID_SFX_DOC_START+ 10)
-#define BMP_STYLES_FAMILY4_HC               (RID_SFX_DOC_START+ 11)
-
 #define STR_STYLES                          (RID_SFX_DOC_START+ 18)
 #define STR_MACROS                          (RID_SFX_DOC_START+ 19)
 
@@ -148,10 +140,6 @@
 
 #define STR_OBJECT                          (RID_SFX_DOC_START+ 84)
 #define STR_EDITOBJECT                      (RID_SFX_DOC_START+ 85)
-// --> PB 2004-08-20 #i33095#
-/* obsolete
-#define STR_OPENOBJECT                      (RID_SFX_DOC_START+ 86)
-*/
 
 #define DLOAD_URL 1
 #define DLOAD_STATUS 2
diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src
index ce4c5f804b48..10d264181288 100644
--- a/sfx2/source/doc/doc.src
+++ b/sfx2/source/doc/doc.src
@@ -72,9 +72,6 @@ String STR_QUERY_SAVE_DOCUMENT
 Bitmap BMP_STYLES_CLOSED { File = "newex.bmp" ; };
 Bitmap BMP_STYLES_OPENED { File = "newex.bmp" ; };
 
-Bitmap BMP_STYLES_CLOSED_HC { File = "newex_h.bmp" ; };
-Bitmap BMP_STYLES_OPENED_HC { File = "newex_h.bmp" ; };
-
 String STR_STYLES
 {
     Text [ en-US ] = "Styles" ;
@@ -100,11 +97,6 @@ Bitmap BMP_STYLES_FAMILY2 { File = "styfam2.bmp" ; };
 Bitmap BMP_STYLES_FAMILY3 { File = "styfam3.bmp" ; };
 Bitmap BMP_STYLES_FAMILY4 { File = "styfam4.bmp" ; };
 
-Bitmap BMP_STYLES_FAMILY1_HC { File = "styfam1_h.bmp" ; };
-Bitmap BMP_STYLES_FAMILY2_HC { File = "styfam2_h.bmp" ; };
-Bitmap BMP_STYLES_FAMILY3_HC { File = "styfam3_h.bmp" ; };
-Bitmap BMP_STYLES_FAMILY4_HC { File = "styfam4_h.bmp" ; };
-
 ErrorBox MSG_PRINT_ERROR
 {
     BUTTONS = WB_OK ;
@@ -384,14 +376,6 @@ String STR_EDITOBJECT
     Text [ en-US ] = "~Edit";
 };
 
-// --> PB 2004-08-20 #i33095#
-/* obsolete
-String STR_OPENOBJECT
-{
-    Text [ en-US ] = "~Open";
-};
-*/
-
 QueryBox DLG_MACROQUERY
 {
     Buttons = WB_OK_CANCEL;
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index 3c0d0c7e9d71..2d3fd7dc75b7 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -213,16 +213,16 @@ void SfxObjectFactory::SetModule_Impl( SfxModule *pMod )
 void SfxObjectFactory::SetSystemTemplate( const String& rServiceName, const String& rTemplateName )
 {
     static const int nMaxPathSize = 16000;
-    static ::rtl::OUString SERVICE_FILTER_FACTORY = ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" );
-    static ::rtl::OUString SERVICE_TYPE_DECTECTION = ::rtl::OUString::createFromAscii( "com.sun.star.document.TypeDetection" );
-    static ::rtl::OUString SERVICE_SIMPLE_ACCESS = ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" );
+    static ::rtl::OUString SERVICE_FILTER_FACTORY(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.FilterFactory"));
+    static ::rtl::OUString SERVICE_TYPE_DECTECTION(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection"));
+    static ::rtl::OUString SERVICE_SIMPLE_ACCESS(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"));
 
-    static ::rtl::OUString CONF_ROOT  = ::rtl::OUString::createFromAscii( "/org.openoffice.Setup");
-    static ::rtl::OUString CONF_PATH  = ::rtl::OUString::createFromAscii( "Office/Factories/" ) + ::rtl::OUString( rServiceName );
-    static ::rtl::OUString PROP_DEF_TEMPL_CHANGED  = ::rtl::OUString::createFromAscii( "ooSetupFactorySystemDefaultTemplateChanged" );
-    static ::rtl::OUString PROP_ACTUAL_FILTER  = ::rtl::OUString::createFromAscii( "ooSetupFactoryActualFilter" );
+    static ::rtl::OUString CONF_ROOT(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup"));
+    static ::rtl::OUString CONF_PATH  = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Office/Factories/" )) + ::rtl::OUString( rServiceName );
+    static ::rtl::OUString PROP_DEF_TEMPL_CHANGED(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactorySystemDefaultTemplateChanged"));
+    static ::rtl::OUString PROP_ACTUAL_FILTER(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryActualFilter"));
 
-    static ::rtl::OUString DEF_TPL_STR = ::rtl::OUString::createFromAscii("/soffice.");
+    static ::rtl::OUString DEF_TPL_STR(RTL_CONSTASCII_USTRINGPARAM("/soffice."));
 
     String      sURL;
     String      sPath;
@@ -258,7 +258,7 @@ void SfxObjectFactory::SetSystemTemplate( const String& rServiceName, const Stri
                     aActuralFilterData[nInd].Value >>= aActualFilterTypeName;
             ::comphelper::SequenceAsHashMap aProps1( xTypeDetection->getByName( aActualFilterTypeName ) );
             uno::Sequence< ::rtl::OUString > aAllExt =
-                aProps1.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Extensions" ), uno::Sequence< ::rtl::OUString >() );
+                aProps1.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Extensions")), uno::Sequence< ::rtl::OUString >() );
             //To-do: check if aAllExt is empty first
             ::rtl::OUString aExt = aAllExt[0];
 
@@ -270,7 +270,7 @@ void SfxObjectFactory::SetSystemTemplate( const String& rServiceName, const Stri
 
             ::rtl::OUString aBackupURL;
             ::osl::Security().getConfigDir(aBackupURL);
-            aBackupURL += ::rtl::OUString::createFromAscii( "/temp" );
+            aBackupURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/temp"));
 
             if ( !xSimpleFileAccess->exists( aBackupURL ) )
                 xSimpleFileAccess->createFolder( aBackupURL );
@@ -286,21 +286,21 @@ void SfxObjectFactory::SetSystemTemplate( const String& rServiceName, const Stri
                 uno::Reference< document::XTypeDetection > xTypeDetector( xTypeDetection, uno::UNO_QUERY );
                 ::comphelper::SequenceAsHashMap aProps2( xTypeDetection->getByName( xTypeDetector->queryTypeByURL( rTemplateName ) ) );
                 ::rtl::OUString aFilterName =
-                    aProps2.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii("PreferredFilter"), ::rtl::OUString() );
+                    aProps2.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PreferredFilter")), ::rtl::OUString() );
 
                 uno::Sequence< beans::PropertyValue > aArgs( 3 );
-                aArgs[0].Name = ::rtl::OUString::createFromAscii( "FilterName" );
+                aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName"));
                 aArgs[0].Value <<= aFilterName;
-                aArgs[1].Name = ::rtl::OUString::createFromAscii( "AsTemplate" );
+                aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AsTemplate"));
                 aArgs[1].Value <<= sal_True;
-                aArgs[2].Name = ::rtl::OUString::createFromAscii( "URL" );
+                aArgs[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"));
                 aArgs[2].Value <<= ::rtl::OUString( rTemplateName );
 
                 uno::Reference< frame::XLoadable > xLoadable( xFactory->createInstance( ::rtl::OUString( rServiceName ) ), uno::UNO_QUERY );
                 xLoadable->load( aArgs );
 
                 aArgs.realloc( 2 );
-                aArgs[1].Name = ::rtl::OUString::createFromAscii( "Overwrite" );
+                aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Overwrite"));
                 aArgs[1].Value <<= sal_True;
 
                 uno::Reference< frame::XStorable > xStorable( xLoadable, uno::UNO_QUERY );
@@ -439,8 +439,8 @@ String SfxObjectFactory::GetFactoryURL() const
 
 String SfxObjectFactory::GetModuleName() const
 {
-    static ::rtl::OUString SERVICENAME_MODULEMANAGER = ::rtl::OUString::createFromAscii("com.sun.star.frame.ModuleManager");
-    static ::rtl::OUString PROP_MODULEUINAME         = ::rtl::OUString::createFromAscii("ooSetupFactoryUIName");
+    static ::rtl::OUString SERVICENAME_MODULEMANAGER(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager"));
+    static ::rtl::OUString PROP_MODULEUINAME        (RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryUIName"));
 
     try
     {
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 19ced3f09391..8323214bef29 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -143,12 +143,11 @@ using namespace ::com::sun::star::io;
 #include "openflag.hxx"     // SFX_STREAM_READONLY etc.
 #include "sfxresid.hxx"
 #include <sfx2/appuno.hxx>
+#include "sfxacldetect.hxx"
 
 #define MAX_REDIRECT 5
 
 
-sal_Bool IsReadonlyAccordingACL( const sal_Unicode* pFilePath );
-
 //==========================================================
 namespace {
 
@@ -1055,6 +1054,11 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI )
             catch( uno::Exception )
             {}
 
+#if EXTRA_ACL_CHECK
+            // This block was introduced as a fix to i#102464, but removing
+            // this does not make the problem re-appear.  But leaving this
+            // part would interfere with documents saved in samba share.  This
+            // affects Windows only.
             if ( !bContentReadonly )
             {
                 // the file is not readonly, check the ACL
@@ -1063,6 +1067,7 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI )
                 if ( ::utl::LocalFileHelper::ConvertURLToPhysicalName( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), aPhysPath ) )
                     bContentReadonly = IsReadonlyAccordingACL( aPhysPath.GetBuffer() );
             }
+#endif
         }
 
         // do further checks only if the file not readonly in fs
@@ -1265,9 +1270,9 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( sal_Bool bCreateTempIf
                                     new utl::ProgressHandlerWrap( xStatusIndicator ) );
 
         uno::Sequence< beans::PropertyValue > aAddProps( 2 );
-        aAddProps[0].Name = ::rtl::OUString::createFromAscii( "RepairPackage" );
+        aAddProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RepairPackage"));
         aAddProps[0].Value <<= (sal_Bool)sal_True;
-        aAddProps[1].Name = ::rtl::OUString::createFromAscii( "StatusIndicator" );
+        aAddProps[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StatusIndicator"));
         aAddProps[1].Value <<= xProgressHandler;
 
         // the first arguments will be filled later
@@ -1649,7 +1654,7 @@ sal_Bool SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource,
                     {
                         Reference< XInputStream > aTempInput = aTempCont.openStream();
                         bTransactStarted = sal_True;
-                        aOriginalContent.setPropertyValue( ::rtl::OUString::createFromAscii( "Size" ),
+                        aOriginalContent.setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size")),
                                                             uno::makeAny( (sal_Int64)0 ) );
                         aOriginalContent.writeStream( aTempInput, bOverWrite );
                         bResult = sal_True;
@@ -3185,11 +3190,11 @@ SvKeyValueIterator* SfxMedium::GetHeaderAttributes_Impl()
 
             try
             {
-                Any aAny = pImp->aContent.getPropertyValue( ::rtl::OUString::createFromAscii( "MediaType" ) );
+                Any aAny = pImp->aContent.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) );
                 ::rtl::OUString aContentType;
                 aAny >>= aContentType;
 
-                pImp->xAttributes->Append( SvKeyValue( ::rtl::OUString::createFromAscii( "content-type" ), aContentType ) );
+                pImp->xAttributes->Append( SvKeyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("content-type")), aContentType ) );
             }
             catch ( ::com::sun::star::uno::Exception& )
             {
@@ -3225,7 +3230,7 @@ const uno::Sequence < util::RevisionTag >& SfxMedium::GetVersionList( bool _bNoR
          ( aName.Len() || aLogicName.Len() ) && GetStorage().is() )
     {
         uno::Reference < document::XDocumentRevisionListPersistence > xReader( comphelper::getProcessServiceFactory()->createInstance(
-                ::rtl::OUString::createFromAscii("com.sun.star.document.DocumentRevisionListPersistence") ), uno::UNO_QUERY );
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.DocumentRevisionListPersistence")) ), uno::UNO_QUERY );
         if ( xReader.is() )
         {
             try
@@ -3247,7 +3252,7 @@ const uno::Sequence < util::RevisionTag >& SfxMedium::GetVersionList( bool _bNoR
 uno::Sequence < util::RevisionTag > SfxMedium::GetVersionList( const uno::Reference < embed::XStorage >& xStorage )
 {
     uno::Reference < document::XDocumentRevisionListPersistence > xReader( comphelper::getProcessServiceFactory()->createInstance(
-            ::rtl::OUString::createFromAscii("com.sun.star.document.DocumentRevisionListPersistence") ), uno::UNO_QUERY );
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.DocumentRevisionListPersistence")) ), uno::UNO_QUERY );
     if ( xReader.is() )
     {
         try
@@ -3335,7 +3340,7 @@ sal_Bool SfxMedium::SaveVersionList_Impl( sal_Bool /*bUseXML*/ )
             return sal_True;
 
         uno::Reference < document::XDocumentRevisionListPersistence > xWriter( comphelper::getProcessServiceFactory()->createInstance(
-                ::rtl::OUString::createFromAscii("com.sun.star.document.DocumentRevisionListPersistence") ), uno::UNO_QUERY );
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.DocumentRevisionListPersistence")) ), uno::UNO_QUERY );
         if ( xWriter.is() )
         {
             try
@@ -3541,7 +3546,7 @@ void SfxMedium::CreateTempFileNoCopy()
 
             try
             {
-                Any aAny = pImp->aContent.getPropertyValue( ::rtl::OUString::createFromAscii( "MediaType" ) );
+                Any aAny = pImp->aContent.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) );
                 ::rtl::OUString aField;
                 aAny >>= aField;
 
diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx
index 8fe04b13b127..c73b1cbf88d4 100644
--- a/sfx2/source/doc/docfilt.cxx
+++ b/sfx2/source/doc/docfilt.cxx
@@ -197,7 +197,7 @@ String SfxFilter::GetTypeFromStorage( const com::sun::star::uno::Reference< com:
     if ( xProps.is() )
     {
         ::rtl::OUString aMediaType;
-        xProps->getPropertyValue( ::rtl::OUString::createFromAscii( "MediaType" ) ) >>= aMediaType;
+        xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) ) >>= aMediaType;
         if ( aMediaType.getLength() )
         {
             ::com::sun::star::datatransfer::DataFlavor aDataFlavor;
diff --git a/sfx2/source/doc/docinf.cxx b/sfx2/source/doc/docinf.cxx
index ab2d0118e9a7..27cc97102e0a 100644
--- a/sfx2/source/doc/docinf.cxx
+++ b/sfx2/source/doc/docinf.cxx
@@ -262,7 +262,7 @@ bool SFX2_DLLPUBLIC SaveOlePropertySet(
         const sal_Int32 nPropId = rCustomSect.GetFreePropertyId();
         rCustomSect.SetBlobValue( nPropId, *i_pGuid );
         rCustomSect.SetPropertyName( nPropId,
-            ::rtl::OUString::createFromAscii("_PID_GUID") );
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_PID_GUID")) );
     }
 
     // write hyperlinks
@@ -270,7 +270,7 @@ bool SFX2_DLLPUBLIC SaveOlePropertySet(
         const sal_Int32 nPropId = rCustomSect.GetFreePropertyId();
         rCustomSect.SetBlobValue( nPropId, *i_pHyperlinks );
         rCustomSect.SetPropertyName( nPropId,
-            ::rtl::OUString::createFromAscii("_PID_HLINKS") );
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_PID_HLINKS")) );
     }
 
     uno::Reference<beans::XPropertySet> xUserDefinedProps(
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 6d40eed84105..95ac1eb2e7b5 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -121,8 +121,6 @@ using namespace ::ucbhelper;
 
 #define SERVICENAME_TYPEDETECTION       "com.sun.star.document.TypeDetection"
 #define TYPEDETECTION_PARAMETER         "FileName"
-//#define SERVICENAME_OLD_TYPEDETECTION   "com.sun.star.frame.FrameLoaderFactory"
-//#define PARAMETER_OLD_TYPEDETECTION     "DeepDetection"
 #define SERVICENAME_DOCINFO             "com.sun.star.document.DocumentProperties"
 #define SERVICENAME_DOCTEMPLATES        "com.sun.star.frame.DocumentTemplates"
 #define SERVICENAME_DESKTOP             "com.sun.star.frame.Desktop"
@@ -1200,7 +1198,7 @@ sal_Bool SfxDocumentTemplates::CopyFrom
                                                 UNO_QUERY );
 
         Sequence< PropertyValue > aArgs( 1 );
-        aArgs[0].Name = ::rtl::OUString::createFromAscii("Hidden");
+        aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Hidden"));
         aArgs[0].Value <<= sal_True;
 
         INetURLObject   aTemplURL( rName );
@@ -1210,7 +1208,7 @@ sal_Bool SfxDocumentTemplates::CopyFrom
         {
             xStorable = uno::Reference< XStorable >(
                 xDesktop->loadComponentFromURL( aTemplURL.GetMainURL(INetURLObject::NO_DECODE),
-                                                OUString::createFromAscii( "_blank" ),
+                                                OUString(RTL_CONSTASCII_USTRINGPARAM("_blank")),
                                                 0,
                                                 aArgs ),
                 UNO_QUERY );
@@ -2177,9 +2175,8 @@ const OUString& RegionData_Impl::GetTargetURL()
             OUString aPropName( RTL_CONSTASCII_USTRINGPARAM( TARGET_DIR_URL ) );
 
             getTextProperty_Impl( aRegion, aPropName, maTargetURL );
-            // --> PB 2004-10-27 #i32656# - the targeturl must be substituted: $(baseinsturl)
+            // The targeturl must be substituted: $(baseinsturl) (#i32656#)
             maTargetURL = SvtPathOptions().SubstituteVariable( maTargetURL );
-            // <--
         }
         else
         {
@@ -2332,8 +2329,8 @@ void SfxDocTemplate_Impl::AddRegion( const OUString& rTitle,
     // now get the content of the region
     uno::Reference< XResultSet > xResultSet;
     Sequence< OUString > aProps(2);
-    aProps[0] = OUString::createFromAscii( TITLE );
-    aProps[1] = OUString::createFromAscii( TARGET_URL );
+    aProps[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( TITLE ));
+    aProps[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( TARGET_URL ));
 
     try
     {
@@ -2369,7 +2366,7 @@ void SfxDocTemplate_Impl::CreateFromHierarchy( Content &rTemplRoot )
 {
     uno::Reference< XResultSet > xResultSet;
     Sequence< OUString > aProps(1);
-    aProps[0] = OUString::createFromAscii( TITLE );
+    aProps[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( TITLE ));
 
     try
     {
@@ -2431,7 +2428,7 @@ sal_Bool SfxDocTemplate_Impl::Construct( )
     Sequence< Any > aCompareArg(1);
     *(aCompareArg.getArray()) <<= xLocalizable->getLocale();;
     m_rCompareFactory = uno::Reference< XAnyCompareFactory >(
-                    xFactory->createInstanceWithArguments( OUString::createFromAscii( "com.sun.star.ucb.AnyCompareFactory" ),
+                    xFactory->createInstanceWithArguments( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.AnyCompareFactory")),
                                                            aCompareArg ),
                     UNO_QUERY );
 
@@ -2477,7 +2474,7 @@ void SfxDocTemplate_Impl::GetTemplates( Content& rTargetFolder,
     uno::Reference< XResultSet > xResultSet;
     Sequence< OUString >    aProps(1);
 
-    aProps[0] = OUString::createFromAscii( TITLE );
+    aProps[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( TITLE ));
 
     try
     {
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 9c6a821e952f..806e0c36136a 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -375,8 +375,8 @@ public:
     void                setHierarchyURL( const OUString& rURL ) { maHierarchyURL = rURL; }
     void                setTargetURL( const OUString& rURL ) { maTargetURL = rURL; }
 
-    sal_Bool            getInUse() { return mbInUse; }
-    sal_Bool            getInHierarchy() { return mbInHierarchy; }
+    sal_Bool            getInUse() const { return mbInUse; }
+    sal_Bool            getInHierarchy() const { return mbInHierarchy; }
     const OUString&     getHierarchyURL() const { return maHierarchyURL; }
     const OUString&     getTargetURL() const { return maTargetURL; }
     const OUString&     getTitle() const { return maTitle; }
@@ -703,7 +703,7 @@ sal_Bool SfxDocTplService_Impl::getTitleFromURL( const OUString& rURL, OUString&
                 uno::Reference< container::XNameAccess > xTypeDetection( mxType, uno::UNO_QUERY_THROW );
                 SequenceAsHashMap aTypeProps( xTypeDetection->getByName( aDocType ) );
                 aType = aTypeProps.getUnpackedValueOrDefault(
-                            ::rtl::OUString::createFromAscii( "MediaType" ),
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")),
                             ::rtl::OUString() );
             }
             catch( uno::Exception& )
@@ -1387,11 +1387,11 @@ sal_Bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const ::rtl::OU
     sal_Bool bResult = sal_False;
     try {
         uno::Reference< beans::XPropertySet > xTempFile(
-                mxFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ),
+                mxFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")) ),
                 uno::UNO_QUERY_THROW );
 
         ::rtl::OUString aTempURL;
-        uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString::createFromAscii( "Uri" ) );
+        uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Uri")) );
         aUrl >>= aTempURL;
 
         uno::Reference< io::XStream > xStream( xTempFile, uno::UNO_QUERY_THROW );
@@ -1600,7 +1600,7 @@ sal_Bool SfxDocTplService_Impl::removeGroup( const OUString& rGroupName )
         uno::Reference< XResultSet > xResultSet;
         Sequence< OUString > aProps( 1 );
 
-        aProps[0] = OUString::createFromAscii( TARGET_URL );
+        aProps[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( TARGET_URL ));
 
         try
         {
@@ -1717,7 +1717,7 @@ sal_Bool SfxDocTplService_Impl::renameGroup( const OUString& rOldName,
         uno::Reference< XResultSet > xResultSet;
         Sequence< OUString > aProps( 1 );
 
-        aProps[0] = OUString::createFromAscii( TARGET_URL );
+        aProps[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( TARGET_URL ));
         ResultSetInclude eInclude = INCLUDE_DOCUMENTS_ONLY;
         xResultSet = aGroup.createCursor( aProps, eInclude );
 
@@ -1823,7 +1823,7 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName,
         // get document service name
         uno::Reference< frame::XModuleManager > xModuleManager(
             xFactory->createInstance(
-                    ::rtl::OUString::createFromAscii( "com.sun.star.frame.ModuleManager" ) ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager")) ),
             uno::UNO_QUERY_THROW );
         sDocServiceName = xModuleManager->identify( uno::Reference< uno::XInterface >( rStorable, uno::UNO_QUERY ) );
         if ( !sDocServiceName.getLength() )
@@ -1834,18 +1834,18 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName,
 
         uno::Reference< lang::XMultiServiceFactory > xConfigProvider(
                 xFactory->createInstance(
-                    ::rtl::OUString::createFromAscii( "com.sun.star.configuration.ConfigurationProvider" ) ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider")) ),
                 uno::UNO_QUERY_THROW );
 
         uno::Sequence< uno::Any > aArgs( 1 );
         beans::PropertyValue aPathProp;
-        aPathProp.Name = ::rtl::OUString::createFromAscii( "nodepath" );
+        aPathProp.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath"));
         aPathProp.Value <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Setup/Office/Factories/" ) );
         aArgs[0] <<= aPathProp;
 
         uno::Reference< container::XNameAccess > xSOFConfig(
             xConfigProvider->createInstanceWithArguments(
-                                    ::rtl::OUString::createFromAscii( "com.sun.star.configuration.ConfigurationAccess" ),
+                                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")),
                                     aArgs ),
             uno::UNO_QUERY_THROW );
 
@@ -1861,7 +1861,7 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName,
         // find the related type name
         ::rtl::OUString aTypeName;
         uno::Reference< container::XNameAccess > xFilterFactory(
-            xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ),
+            xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.FilterFactory")) ),
             uno::UNO_QUERY_THROW );
 
         uno::Sequence< beans::PropertyValue > aFilterData;
@@ -1878,16 +1878,16 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName,
             mxType.is() ?
                 uno::Reference< container::XNameAccess >( mxType, uno::UNO_QUERY_THROW ) :
                 uno::Reference< container::XNameAccess >(
-                    xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.TypeDetection" ) ),
+                    xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection")) ),
                     uno::UNO_QUERY_THROW );
 
         SequenceAsHashMap aTypeProps( xTypeDetection->getByName( aTypeName ) );
         uno::Sequence< ::rtl::OUString > aAllExt =
-            aTypeProps.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Extensions" ), Sequence< ::rtl::OUString >() );
+            aTypeProps.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Extensions")), Sequence< ::rtl::OUString >() );
         if ( !aAllExt.getLength() )
             throw uno::RuntimeException();
 
-        ::rtl::OUString aMediaType = aTypeProps.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "MediaType"  ), ::rtl::OUString() );
+        ::rtl::OUString aMediaType = aTypeProps.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), ::rtl::OUString() );
         ::rtl::OUString aExt = aAllExt[0];
 
         if ( !aMediaType.getLength() || !aExt.getLength() )
@@ -1913,9 +1913,9 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName,
 
         // store template
         uno::Sequence< PropertyValue > aStoreArgs( 2 );
-        aStoreArgs[0].Name = ::rtl::OUString::createFromAscii( "FilterName" );
+        aStoreArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName"));
         aStoreArgs[0].Value <<= aFilterName;
-        aStoreArgs[1].Name = ::rtl::OUString::createFromAscii( "DocumentTitle" );
+        aStoreArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentTitle"));
         aStoreArgs[1].Value <<= rTemplateName;
 
         ::rtl::OUString aCurrentDocumentURL = rStorable->getLocation();
@@ -2432,9 +2432,9 @@ void SfxDocTplService_Impl::addHierGroup( GroupList_Impl& rList,
     uno::Reference< XResultSet > xResultSet;
     Sequence< OUString >    aProps(3);
 
-    aProps[0] = OUString::createFromAscii( TITLE );
-    aProps[1] = OUString::createFromAscii( TARGET_URL );
-    aProps[2] = OUString::createFromAscii( PROPERTY_TYPE );
+    aProps[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( TITLE ));
+    aProps[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( TARGET_URL ));
+    aProps[2] = OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTY_TYPE ));
 
     try
     {
@@ -2538,7 +2538,7 @@ void SfxDocTplService_Impl::addFsysGroup( GroupList_Impl& rList,
     Content                 aContent;
     uno::Reference< XResultSet > xResultSet;
     Sequence< OUString >    aProps(1);
-    aProps[0] = OUString::createFromAscii( TITLE );
+    aProps[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( TITLE ));
 
     try
     {
@@ -2606,7 +2606,7 @@ void SfxDocTplService_Impl::createFromContent( GroupList_Impl& rList,
 
     uno::Reference< XResultSet > xResultSet;
     Sequence< OUString > aProps(1);
-    aProps[0] = OUString::createFromAscii( TITLE );
+    aProps[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( TITLE ));
 
     try
     {
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index 983074e91fb3..d47ad728aef4 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -104,19 +104,13 @@ public:
 
 
 inline void SfxOrganizeListBox_Impl::SetBitmaps(
-    const Image &rOFolder, const Image &rCFolder, const Image &rODoc, const Image &rCDoc,
-    const Image &rOFolderHC, const Image &rCFolderHC, const Image &rODocHC, const Image &rCDocHC )
+    const Image &rOFolder, const Image &rCFolder, const Image &rODoc, const Image &rCDoc )
 {
     aOpenedFolderBmp = rOFolder;
     aClosedFolderBmp = rCFolder;
     aOpenedDocBmp = rODoc;
     aClosedDocBmp = rCDoc;
 
-    aOpenedFolderBmpHC = rOFolderHC;
-    aClosedFolderBmpHC = rCFolderHC;
-    aOpenedDocBmpHC = rODocHC;
-    aClosedDocBmpHC = rCDocHC;
-
 }
 
 //=========================================================================
@@ -325,15 +319,8 @@ void SfxOrganizeDlg_Impl::InitBitmaps( void )
     Image   aOpenedDocBmp( SfxResId( IMG_OPENED_DOC ) );
     Image   aClosedDocBmp( SfxResId( IMG_CLOSED_DOC ) );
 
-    Image   aOpenedFolderBmpHC( SfxResId( IMG_OPENED_FOLDER_HC ) );
-    Image   aClosedFolderBmpHC( SfxResId( IMG_CLOSED_FOLDER_HC ) );
-    Image   aOpenedDocBmpHC( SfxResId( IMG_OPENED_DOC_HC ) );
-    Image   aClosedDocBmpHC( SfxResId( IMG_CLOSED_DOC_HC ) );
-
-    aLeftLb.SetBitmaps( aOpenedFolderBmp, aClosedFolderBmp, aOpenedDocBmp, aClosedDocBmp,
-                        aOpenedFolderBmpHC, aClosedFolderBmpHC, aOpenedDocBmpHC, aClosedDocBmpHC );
-    aRightLb.SetBitmaps( aOpenedFolderBmp, aClosedFolderBmp, aOpenedDocBmp, aClosedDocBmp,
-                        aOpenedFolderBmpHC, aClosedFolderBmpHC, aOpenedDocBmpHC, aClosedDocBmpHC );
+    aLeftLb.SetBitmaps( aOpenedFolderBmp, aClosedFolderBmp, aOpenedDocBmp, aClosedDocBmp );
+    aRightLb.SetBitmaps( aOpenedFolderBmp, aClosedFolderBmp, aOpenedDocBmp, aClosedDocBmp );
 }
 
 //=========================================================================
@@ -427,7 +414,6 @@ ImpPath_Impl::ImpPath_Impl( const ImpPath_Impl& rCopy ) :
 class Path
 {
     ImpPath_Impl *pData;
-    void NewImp();
 public:
     Path(SvLBox *pBox, SvLBoxEntry *pEntry);
     Path(const Path &rPath):
@@ -478,17 +464,6 @@ Path::Path(SvLBox *pBox, SvLBoxEntry *pEntry) :
 
 //-------------------------------------------------------------------------
 
-void Path::NewImp()
-{
-    if(pData->nRef != 1)
-    {
-        pData->nRef--;
-        pData = new ImpPath_Impl(*pData);
-    }
-}
-
-//-------------------------------------------------------------------------
-
 SvLBoxEntry *GetIndices_Impl(SvLBox *pBox,
                                SvLBoxEntry *pEntry,
                                USHORT &rRegion,
@@ -544,7 +519,7 @@ BOOL SfxOrganizeListBox_Impl::Select( SvLBoxEntry* pEntry, BOOL bSelect )
 
     Path aPath(this, pEntry);
     GetObjectShell(aPath)->TriggerHelpPI(
-        aPath[nLevel+1], aPath[nLevel+2], aPath[nLevel+3]);
+        aPath[nLevel+1], aPath[nLevel+2]);
     return SvTreeListBox::Select(pEntry,bSelect);
 }
 
@@ -1178,20 +1153,10 @@ void SfxOrganizeListBox_Impl::RequestingChilds( SvLBoxEntry* pEntry )
 */
 
 {
-    // wenn keine Childs vorhanden sind, gfs. Childs
-    // einfuegen
-    BmpColorMode eColorMode = BMP_COLOR_NORMAL;
-
-    if ( GetSettings().GetStyleSettings().GetHighContrastMode() )
-        eColorMode = BMP_COLOR_HIGHCONTRAST;
-
-
     if ( !GetModel()->HasChilds( pEntry ) )
     {
         WaitObject aWaitCursor( this );
 
-        // Choose the correct mask color dependent from eColorMode. This must be adopted if
-        // we change the mask color for normal images, too!
         Color aMaskColor( COL_LIGHTMAGENTA );
 
         // hier sind alle initial eingefuegt
@@ -1210,19 +1175,18 @@ void SfxOrganizeListBox_Impl::RequestingChilds( SvLBoxEntry* pEntry )
             SfxObjectShellRef aRef = GetObjectShell(aPath);
             if(aRef.Is())
             {
-                const USHORT nCount = aRef->GetContentCount(
-                    aPath[nDocLevel+1], aPath[nDocLevel+2]);
+                const USHORT nCount = aRef->GetContentCount(aPath[nDocLevel+1]);
                 String aText;
                 Bitmap aClosedBmp, aOpenedBmp;
-                const BOOL bCanHaveChilds =
+                const bool bCanHaveChilds =
                     aRef->CanHaveChilds(aPath[nDocLevel+1],
                                         aPath[nDocLevel+2]);
-                for(USHORT i = 0; i < nCount; ++i)
+                for(sal_uInt16 i = 0; i < nCount; ++i)
                 {
-                    BOOL bDeletable;
+                    sal_Bool bDeletable;
                     aRef->GetContent(
-                        aText, aClosedBmp, aOpenedBmp, eColorMode, bDeletable,
-                        i, aPath[nDocLevel+1], aPath[nDocLevel+2]);
+                        aText, aClosedBmp, aOpenedBmp, bDeletable,
+                        i, aPath[nDocLevel+1]);
 
                     // Create image with the correct mask color
                     Image aClosedImage( aClosedBmp, aMaskColor );
@@ -1323,39 +1287,37 @@ USHORT SfxOrganizeListBox_Impl::GetLevelCount_Impl(SvLBoxEntry* pParent) const
 
 //-------------------------------------------------------------------------
 
-SvLBoxEntry* SfxOrganizeListBox_Impl::InsertEntryByBmpType( const XubString& rText, BMPTYPE eBmpType,
-    SvLBoxEntry* pParent, BOOL bChildsOnDemand, ULONG nPos, void* pUserData )
+SvLBoxEntry* SfxOrganizeListBox_Impl::InsertEntryByBmpType(
+    const XubString& rText,
+    BMPTYPE eBmpType,
+    SvLBoxEntry* pParent,
+    BOOL bChildsOnDemand,
+    ULONG nPos,
+    void* pUserData
+)
 {
     SvLBoxEntry*    pEntry = NULL;
     const Image*    pExp = NULL;
     const Image*    pCol = NULL;
-    const Image*    pExpHC = NULL;
-    const Image*    pColHC = NULL;
 
     switch( eBmpType )
     {
         case BMPTYPE_FOLDER:
             pExp = &aOpenedFolderBmp;
             pCol = &aClosedFolderBmp;
-            pExpHC = &aOpenedFolderBmpHC;
-            pColHC = &aClosedFolderBmpHC;
             break;
-        default:
-            DBG_ERROR( "SfxOrganizeListBox_Impl::InsertEntryByBmpType(): something forgotten?!" );
 
         case BMPTYPE_DOC:
             pExp = &aOpenedDocBmp;
             pCol = &aClosedDocBmp;
-            pExpHC = &aOpenedDocBmpHC;
-            pColHC = &aClosedDocBmpHC;
             break;
+
+        default:
+            DBG_ERROR( "SfxOrganizeListBox_Impl::InsertEntryByBmpType(): something forgotten?!" );
     }
 
     pEntry = SvTreeListBox::InsertEntry( rText, *pExp, *pCol, pParent, bChildsOnDemand, nPos, pUserData );
 
-    SetExpandedEntryBmp( pEntry, *pExpHC, BMP_COLOR_HIGHCONTRAST );
-    SetCollapsedEntryBmp( pEntry, *pColHC, BMP_COLOR_HIGHCONTRAST );
-
     return pEntry;
 }
 
@@ -1474,15 +1436,16 @@ const Image &SfxOrganizeListBox_Impl::GetClosedBmp(USHORT nLevel) const
 */
 
 {
-    BOOL            bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
     const Image*    pRet = NULL;
 
     switch( nLevel )
     {
         default:    DBG_ERROR( "Bitmaps ueberindiziert" );
 
-        case 0:     pRet = bHC? &aClosedFolderBmpHC : &aClosedFolderBmp;        break;
-        case 1:     pRet = bHC? &aClosedDocBmpHC : &aClosedDocBmp;              break;
+        case 0:     pRet = &aClosedFolderBmp;
+            break;
+        case 1:     pRet = &aClosedDocBmp;
+            break;
     }
 
     return *pRet;
@@ -1508,17 +1471,16 @@ const Image &SfxOrganizeListBox_Impl::GetOpenedBmp(USHORT nLevel) const
 */
 
 {
-    BOOL         bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
     const Image* pRet = NULL;
 
     switch( nLevel )
     {
         case 0:
-           pRet = bHC ? &aOpenedFolderBmpHC : &aOpenedFolderBmp; break;
+            pRet = &aOpenedFolderBmp; break;
         case 1:
-           pRet = bHC ? &aOpenedDocBmpHC : &aOpenedDocBmp; break;
+            pRet = &aOpenedDocBmp; break;
         default:
-            pRet = bHC ? &aClosedFolderBmpHC : &aClosedFolderBmp; break;
+            pRet = &aClosedFolderBmp; break;
     }
 
     return *pRet;
@@ -2136,7 +2098,7 @@ IMPL_LINK( SfxOrganizeDlg_Impl, MenuActivate_Impl, Menu *, pMenu )
             String aTitle = SvFileInformationManager::GetDescription(
                 INetURLObject(aObjFacURL) );
             pSubMenu->InsertItem( nItemId, aTitle,
-                SvFileInformationManager::GetImage(INetURLObject(aObjFacURL)) );
+                SvFileInformationManager::GetImage(INetURLObject(aObjFacURL), false) );
             pSubMenu->SetItemCommand( nItemId++, aObjFacURL );
             DBG_ASSERT( nItemId <= ID_RESET_DEFAULT_TEMPLATE_END, "menu item id overflow" );
         }
diff --git a/sfx2/source/doc/docvor.hrc b/sfx2/source/doc/docvor.hrc
index 842aa73fb8a3..c17f424a2a90 100644
--- a/sfx2/source/doc/docvor.hrc
+++ b/sfx2/source/doc/docvor.hrc
@@ -29,10 +29,6 @@
 #define IMG_CLOSED_FOLDER       1
 #define IMG_OPENED_DOC          3
 #define IMG_CLOSED_DOC          4
-#define IMG_OPENED_FOLDER_HC    5
-#define IMG_CLOSED_FOLDER_HC    6
-#define IMG_OPENED_DOC_HC       7
-#define IMG_CLOSED_DOC_HC       8
 
 #define ACC_EDIT 1
 #define ID_COPY 201
diff --git a/sfx2/source/doc/docvor.src b/sfx2/source/doc/docvor.src
index 2c9975de9bb8..0c82ba60638c 100644
--- a/sfx2/source/doc/docvor.src
+++ b/sfx2/source/doc/docvor.src
@@ -259,57 +259,4 @@ ModalDialog DLG_ORGANIZE
         MASKCOLOR ;
         ImageBitmap = Bitmap { File = "doccl.bmp" ; } ;
     };
-    Image IMG_OPENED_FOLDER_HC
-    {
-        MASKCOLOR ;
-        ImageBitmap = Bitmap { File = "folderop_h.bmp" ; } ;
-    };
-    Image IMG_CLOSED_FOLDER_HC
-    {
-        MASKCOLOR ;
-        ImageBitmap = Bitmap { File = "foldercl_h.bmp" ; } ;
-    };
-    Image IMG_OPENED_DOC_HC
-    {
-        MASKCOLOR ;
-        ImageBitmap = Bitmap { File = "doccl_h.bmp" ; } ;
-    };
-    Image IMG_CLOSED_DOC_HC
-    {
-        MASKCOLOR ;
-        ImageBitmap = Bitmap { File = "doccl_h.bmp" ; } ;
-    };
-    /*    FixedText FT_DEFAULT_TEMPLATE_LABEL
-    {
-        Pos = MAP_APPFONT ( 3 , 161 ) ;
-        Size = MAP_APPFONT ( 61 , 10 ) ;
-        Text [ en-US ] = "Default template:" ;
-    };
-    FixedText FT_DEFAULT_TEMPLATE
-    {
-        Pos = MAP_APPFONT ( 66 , 161 ) ;
-        Size = MAP_APPFONT ( 131 , 10 ) ;
-    };*/
 };
- // ********************************************************************** EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index f0b1d5b10496..0983e8218743 100644
--- a/sfx2/source/doc/graphhelp.cxx
+++ b/sfx2/source/doc/graphhelp.cxx
@@ -118,7 +118,7 @@ void* GraphicHelper::getEnhMetaFileFromGDI_Impl( const GDIMetaFile* pGDIMeta )
 #ifdef WNT
     if ( pGDIMeta )
     {
-        String aStr = ::rtl::OUString::createFromAscii( ".emf" );
+        String aStr = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".emf"));
         ::utl::TempFile aTempFile( ::rtl::OUString(),
                                    &aStr,
                                    NULL,
@@ -464,25 +464,25 @@ sal_Bool GraphicHelper::getThumbnailReplacement_Impl( sal_Int32 nResID, const un
             {
                 uno::Reference< graphic::XGraphicProvider > xGraphProvider(
                     xServiceManager->createInstance(
-                        ::rtl::OUString::createFromAscii( "com.sun.star.graphic.GraphicProvider" ) ),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.graphic.GraphicProvider")) ),
                     uno::UNO_QUERY );
                 if ( xGraphProvider.is() )
                 {
-                    ::rtl::OUString aURL = ::rtl::OUString::createFromAscii( "private:resource/sfx/bitmapex/" );
+                    ::rtl::OUString aURL(RTL_CONSTASCII_USTRINGPARAM("private:resource/sfx/bitmapex/"));
                     aURL += ::rtl::OUString::valueOf( nResID );
 
                     uno::Sequence< beans::PropertyValue > aMediaProps( 1 );
-                    aMediaProps[0].Name = ::rtl::OUString::createFromAscii( "URL" );
+                    aMediaProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"));
                     aMediaProps[0].Value <<= aURL;
 
                     uno::Reference< graphic::XGraphic > xGraphic = xGraphProvider->queryGraphic( aMediaProps );
                     if ( xGraphic.is() )
                     {
                         uno::Sequence< beans::PropertyValue > aStoreProps( 2 );
-                        aStoreProps[0].Name = ::rtl::OUString::createFromAscii( "OutputStream" );
+                        aStoreProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OutputStream"));
                         aStoreProps[0].Value <<= xStream;
-                        aStoreProps[1].Name = ::rtl::OUString::createFromAscii( "MimeType" );
-                        aStoreProps[1].Value <<= ::rtl::OUString::createFromAscii( "image/png" );
+                        aStoreProps[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MimeType"));
+                        aStoreProps[1].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("image/png"));
 
                         xGraphProvider->storeGraphic( xGraphic, aStoreProps );
                         bResult = sal_True;
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 52ca3f51037b..314c6825754f 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -272,7 +272,7 @@ public:
 
     ::comphelper::SequenceAsHashMap& GetMediaDescr() { return m_aMediaDescrHM; }
 
-    sal_Bool IsRecommendReadOnly() { return m_bRecommendReadOnly; }
+    sal_Bool IsRecommendReadOnly() const { return m_bRecommendReadOnly; }
 
     const ::comphelper::SequenceAsHashMap& GetDocProps();
 
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index 349195858071..854833c8ad16 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -160,7 +160,7 @@ throw( uno::RuntimeException )
         // we must destroy the IFrame before the parent is destroyed
         xWindow->addEventListener( this );
 
-        mxFrame = uno::Reference< frame::XFrame >( mxFact->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.frame.Frame" ) ),
+        mxFrame = uno::Reference< frame::XFrame >( mxFact->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame")) ),
                     uno::UNO_QUERY );
         uno::Reference < awt::XWindow > xWin( pWin->GetComponentInterface(), uno::UNO_QUERY );
         mxFrame->initialize( xWin );
@@ -174,15 +174,15 @@ throw( uno::RuntimeException )
 
         util::URL aTargetURL;
         aTargetURL.Complete = ::rtl::OUString( maFrmDescr.GetURL().GetMainURL( INetURLObject::NO_DECODE ) );
-        uno::Reference < util::XURLTransformer > xTrans( mxFact->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), uno::UNO_QUERY );
+        uno::Reference < util::XURLTransformer > xTrans( mxFact->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), uno::UNO_QUERY );
         xTrans->parseStrict( aTargetURL );
 
         uno::Sequence < beans::PropertyValue > aProps(2);
-        aProps[0].Name = ::rtl::OUString::createFromAscii("PluginMode");
+        aProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginMode"));
         aProps[0].Value <<= (sal_Int16) 2;
-        aProps[1].Name = ::rtl::OUString::createFromAscii("ReadOnly");
+        aProps[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
         aProps[1].Value <<= (sal_Bool) sal_True;
-        uno::Reference < frame::XDispatch > xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString::createFromAscii("_self"), 0 );
+        uno::Reference < frame::XDispatch > xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")), 0 );
         if ( xDisp.is() )
             xDisp->dispatch( aTargetURL, aProps );
 
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 975362305756..a066a8db1203 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -157,9 +157,6 @@ void SfxPreviewWin_Impl::ImpPaint(
         pWindow->SetLineColor( aBlackCol );
         pWindow->SetFillColor( aWhiteCol );
         pWindow->DrawRect( Rectangle( aPoint + Point( FRAME, FRAME ), bPoint + Point( FRAME, FRAME ) ) );
-//!     pFile->Move( Point( FRAME, FRAME ) );
-//!     pFile->Scale( Fraction( aTmpSize.Width(), aSize.Width() ),
-//!                   Fraction( aTmpSize.Height(), aSize.Height() ) );
         pFile->WindStart();
         pFile->Play( pWindow, aPoint + Point( FRAME, FRAME ), aSize  );
     }
@@ -177,8 +174,7 @@ SfxPreviewWin::SfxPreviewWin(
     SetHelpId( HID_PREVIEW_FRAME );
 
     // adjust contrast mode initially
-    bool bUseContrast = UseHighContrastSetting();
-    SetDrawMode( bUseContrast ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR );
+    SetDrawMode( OUTPUT_DRAWMODE_COLOR );
 
     // #107818# This preview window is for document previews.  Therefore
     // right-to-left mode should be off
@@ -219,18 +215,10 @@ void SfxPreviewWin::DataChanged( const DataChangedEvent& rDCEvt )
     if( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
         (rDCEvt.GetFlags() & SETTINGS_STYLE) )
     {
-        // adjust contrast mode
-        bool bUseContrast = UseHighContrastSetting();
-        SetDrawMode( bUseContrast ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR );
+        SetDrawMode( OUTPUT_DRAWMODE_COLOR );
     }
 }
 
-bool SfxPreviewWin::UseHighContrastSetting() const
-{
-    return GetSettings().GetStyleSettings().GetHighContrastMode();
-}
-
-
 class SfxNewFileDialog_Impl
 {
     FixedText aRegionFt;
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index f7712651c330..dc0428659f9d 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -119,16 +119,14 @@ bool operator> (const util::DateTime& i_rLeft, const util::DateTime& i_rRight)
     return sal_False;
 }
 
-
 ::boost::shared_ptr<GDIMetaFile>
 SfxObjectShell::GetPreviewMetaFile( sal_Bool bFullContent ) const
 {
-    return CreatePreviewMetaFile_Impl( bFullContent, sal_False );
+    return CreatePreviewMetaFile_Impl( bFullContent );
 }
 
-
 ::boost::shared_ptr<GDIMetaFile>
-SfxObjectShell::CreatePreviewMetaFile_Impl( sal_Bool bFullContent, sal_Bool bHighContrast ) const
+SfxObjectShell::CreatePreviewMetaFile_Impl( sal_Bool bFullContent ) const
 {
     // Nur wenn gerade nicht gedruckt wird, darf DoDraw aufgerufen
     // werden, sonst wird u.U. der Printer abgeschossen !
@@ -143,10 +141,6 @@ SfxObjectShell::CreatePreviewMetaFile_Impl( sal_Bool bFullContent, sal_Bool bHig
     VirtualDevice aDevice;
     aDevice.EnableOutput( FALSE );
 
-    // adjust the output device if HC-metafile is requested
-    if ( bHighContrast )
-        aDevice.SetDrawMode( aDevice.GetDrawMode() | DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT );
-
     MapMode aMode( ((SfxObjectShell*)this)->GetMapUnit() );
     aDevice.SetMapMode( aMode );
     pFile->SetPrefMapMode( aMode );
@@ -329,11 +323,9 @@ void SfxObjectShell::SetOrganizerSearchMask(
 
 //--------------------------------------------------------------------
 
-USHORT SfxObjectShell::GetContentCount(
-    USHORT nIdx1,
-    USHORT /*nIdx2*/)
+sal_uInt16 SfxObjectShell::GetContentCount(sal_uInt16 nIdx)
 {
-    switch(nIdx1)
+    switch(nIdx)
     {
         case INDEX_IGNORE:
             return DEF_CONTENT_COUNT;
@@ -347,56 +339,34 @@ USHORT SfxObjectShell::GetContentCount(
         }
         case CONTENT_MACRO:
             break;
-/*
-        case CONTENT_CONFIG:
-            return ( GetConfigManager() ) ?
-                        GetConfigManager()->GetItemCount() : 0;
-            break;
- */
     }
     return 0;
 }
 
 
 //--------------------------------------------------------------------
-//TODO/CLEANUP: remove this method (it's virtual)
-void  SfxObjectShell::TriggerHelpPI(USHORT nIdx1, USHORT nIdx2, USHORT)
+//TODO/CLEANUP: remove this method
+void  SfxObjectShell::TriggerHelpPI(USHORT nIdx1, USHORT nIdx2)
 {
     if(nIdx1==CONTENT_STYLE && nIdx2 != INDEX_IGNORE) //StyleSheets
     {
         SfxStyleSheetBasePool *pStylePool = GetStyleSheetPool();
         SetOrganizerSearchMask(pStylePool);
-#ifdef WIR_KOENNEN_WIEDER_HILFE_FUER_STYLESHEETS
-        SfxStyleSheetBase *pStyle = (*pStylePool)[nIdx2];
-        if(pStyle)
-        {
-            String aHelpFile;
-            ULONG nHelpId=pStyle->GetHelpId(aHelpFile);
-            SfxHelpPI* pHelpPI = SFX_APP()->GetHelpPI();
-            if ( pHelpPI && nHelpId )
-                pHelpPI->LoadTopic( nHelpId );
-        }
-#endif
     }
 }
 
-BOOL   SfxObjectShell::CanHaveChilds(USHORT nIdx1,
-                                       USHORT nIdx2)
+sal_Bool SfxObjectShell::CanHaveChilds(sal_uInt16 nIdx1, sal_uInt16 nIdx2)
 {
-    switch(nIdx1) {
+    switch(nIdx1)
+    {
     case INDEX_IGNORE:
-        return TRUE;
+        return true;
     case CONTENT_STYLE:
-        return INDEX_IGNORE == nIdx2 || !GetStyleSheetPool()? FALSE: TRUE;
+        return INDEX_IGNORE == nIdx2 || !GetStyleSheetPool() ? false : true;
     case CONTENT_MACRO:
-//!!    return INDEX_IGNORE == nIdx2? FALSE: TRUE;
-        return FALSE;
-/*
-    case CONTENT_CONFIG:
-        return INDEX_IGNORE == nIdx2 ? FALSE : TRUE;
- */
+        return false;
     }
-    return FALSE;
+    return false;
 }
 
 //--------------------------------------------------------------------
@@ -404,29 +374,14 @@ BOOL   SfxObjectShell::CanHaveChilds(USHORT nIdx1,
 void SfxObjectShell::GetContent(String &rText,
                                 Bitmap &rClosedBitmap,
                                 Bitmap &rOpenedBitmap,
-                                BOOL &bCanDel,
-                                USHORT i,
-                                USHORT nIdx1,
-                                USHORT nIdx2 )
-{
-    DBG_ERRORFILE( "Non high contrast method called. Please update calling code!" );
-    SfxObjectShell::GetContent( rText, rClosedBitmap, rOpenedBitmap, BMP_COLOR_NORMAL, bCanDel, i, nIdx1, nIdx2 );
-}
-
-//--------------------------------------------------------------------
-
-void   SfxObjectShell::GetContent(String &rText,
-                                  Bitmap &rClosedBitmap,
-                                  Bitmap &rOpenedBitmap,
-                                  BmpColorMode eColorMode,
-                                  BOOL &bCanDel,
-                                  USHORT i,
-                                  USHORT nIdx1,
-                                  USHORT /*nIdx2*/ )
+                                sal_Bool &bCanDel,
+                                sal_uInt16 i,
+                                sal_uInt16 nIdx
+)
 {
-    bCanDel=TRUE;
+    bCanDel=true;
 
-    switch(nIdx1)
+    switch(nIdx)
     {
         case INDEX_IGNORE:
         {
@@ -437,37 +392,14 @@ void   SfxObjectShell::GetContent(String &rText,
             {
                 case CONTENT_STYLE:
                     nTextResId = STR_STYLES;
-                    if ( eColorMode == BMP_COLOR_NORMAL )
-                    {
-                        nClosedBitmapResId= BMP_STYLES_CLOSED;
-                        nOpenedBitmapResId= BMP_STYLES_OPENED;
-                    }
-                    else
-                    {
-                        nClosedBitmapResId= BMP_STYLES_CLOSED_HC;
-                        nOpenedBitmapResId= BMP_STYLES_OPENED_HC;
-                    }
+                    nClosedBitmapResId= BMP_STYLES_CLOSED;
+                    nOpenedBitmapResId= BMP_STYLES_OPENED;
                     break;
                 case CONTENT_MACRO:
                     nTextResId = STR_MACROS;
-                    if ( eColorMode == BMP_COLOR_NORMAL )
-                    {
-                        nClosedBitmapResId= BMP_STYLES_CLOSED;
-                        nOpenedBitmapResId= BMP_STYLES_OPENED;
-                    }
-                    else
-                    {
-                        nClosedBitmapResId= BMP_STYLES_CLOSED_HC;
-                        nOpenedBitmapResId= BMP_STYLES_OPENED_HC;
-                    }
-                    break;
-/*
-                case CONTENT_CONFIG:
-                    nTextResId = STR_CONFIG;
                     nClosedBitmapResId= BMP_STYLES_CLOSED;
                     nOpenedBitmapResId= BMP_STYLES_OPENED;
                     break;
- */
             }
 
             if ( nTextResId )
@@ -488,52 +420,32 @@ void   SfxObjectShell::GetContent(String &rText,
             bCanDel=((pStyle->GetMask() & SFXSTYLEBIT_USERDEF)
                      == SFXSTYLEBIT_USERDEF);
             rClosedBitmap = rOpenedBitmap =
-                GetStyleFamilyBitmap(pStyle->GetFamily(), eColorMode );
+                GetStyleFamilyBitmap(pStyle->GetFamily());
         }
             break;
         case CONTENT_MACRO:
             break;
-/*
-        case CONTENT_CONFIG:
-            if ( GetConfigManager() )
-            {
-                rText = GetConfigManager()->GetItem(i);
-                bCanDel = GetConfigManager()->CanDelete(i);
-            }
-            else
-                rText = String();
-            rClosedBitmap = Bitmap(SfxResId(BMP_STYLES_CLOSED));
-            rOpenedBitmap = Bitmap(SfxResId(BMP_STYLES_OPENED));
-            break;
-*/
     }
 }
 
 //--------------------------------------------------------------------
-Bitmap SfxObjectShell::GetStyleFamilyBitmap( SfxStyleFamily eFamily )
-{
-    DBG_ERRORFILE( "Non high contrast method called. Please update calling code!" );
-    return SfxObjectShell::GetStyleFamilyBitmap( eFamily, BMP_COLOR_NORMAL );
-}
 
-//--------------------------------------------------------------------
-
-Bitmap SfxObjectShell::GetStyleFamilyBitmap(SfxStyleFamily eFamily, BmpColorMode eColorMode )
+Bitmap SfxObjectShell::GetStyleFamilyBitmap(SfxStyleFamily eFamily)
 {
     USHORT nResId = 0;
     switch(eFamily)
     {
         case SFX_STYLE_FAMILY_CHAR:
-            nResId = ( eColorMode == BMP_COLOR_NORMAL ) ? BMP_STYLES_FAMILY1 : BMP_STYLES_FAMILY1_HC;
+            nResId = BMP_STYLES_FAMILY1;
             break;
         case SFX_STYLE_FAMILY_PARA:
-            nResId = ( eColorMode == BMP_COLOR_NORMAL ) ? BMP_STYLES_FAMILY2 : BMP_STYLES_FAMILY2_HC;
+            nResId = BMP_STYLES_FAMILY2;
             break;
         case SFX_STYLE_FAMILY_FRAME:
-            nResId = ( eColorMode == BMP_COLOR_NORMAL ) ? BMP_STYLES_FAMILY3 : BMP_STYLES_FAMILY3_HC;
+            nResId = BMP_STYLES_FAMILY3;
             break;
         case SFX_STYLE_FAMILY_PAGE :
-            nResId = ( eColorMode == BMP_COLOR_NORMAL ) ? BMP_STYLES_FAMILY4 : BMP_STYLES_FAMILY4_HC;
+            nResId = BMP_STYLES_FAMILY4;
             break;
         case SFX_STYLE_FAMILY_PSEUDO:
         case SFX_STYLE_FAMILY_ALL:
@@ -762,10 +674,6 @@ BOOL SfxObjectShell::Print
     USHORT          /*nIdx3*/,
     const String*   pObjectName
 )
-
-/*  [Beschreibung]
-*/
-
 {
     switch(nIdx1)
     {
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index b4f30307080a..6bf22441d146 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1728,7 +1728,7 @@ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptCon
             {
                 Sequence< uno::Any > aArgs( 1 );
                 aArgs[ 0 ] = *pCaller;
-                xProps->setPropertyValue( rtl::OUString::createFromAscii("Caller"), uno::makeAny( aArgs ) );
+                xProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Caller")), uno::makeAny( aArgs ) );
             }
         }
         aRet = xScript->invoke( aParams, aOutParamIndex, aOutParam );
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 3e0aa30e7ca4..37e907db2c2b 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -163,7 +163,7 @@ void impl_addToModelCollection(const css::uno::Reference< css::frame::XModel >&
 
     css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
     css::uno::Reference< css::container::XSet > xModelCollection(
-        xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.GlobalEventBroadcaster")),
+        xSMGR->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.GlobalEventBroadcaster"))),
         css::uno::UNO_QUERY);
     if (xModelCollection.is())
     {
@@ -223,7 +223,7 @@ sal_Bool SfxObjectShell::PutURLContentsToVersionStream_Impl(
     try
     {
         uno::Reference< embed::XStorage > xVersion = xDocStorage->openStorageElement(
-                                                        ::rtl::OUString::createFromAscii( "Versions" ),
+                                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Versions")),
                                                         embed::ElementModes::READWRITE );
 
         DBG_ASSERT( xVersion.is(),
@@ -335,7 +335,7 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto
             {
                 try
                 {
-                    xProps->setPropertyValue( ::rtl::OUString::createFromAscii( "MediaType" ), uno::makeAny( aDataFlavor.MimeType ) );
+                    xProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), uno::makeAny( aDataFlavor.MimeType ) );
                 }
                 catch( uno::Exception& )
                 {
@@ -354,7 +354,7 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto
                 {
                     try
                     {
-                        xProps->setPropertyValue( ::rtl::OUString::createFromAscii( "Version" ), uno::makeAny( aVersion ) );
+                        xProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Version")), uno::makeAny( aVersion ) );
                     }
                     catch( uno::Exception& )
                     {
@@ -686,7 +686,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed )
             if ( pMedium->GetFilter() && ( pMedium->GetFilter()->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) )
             {
                 uno::Reference < beans::XPropertySet > xSet( GetModel(), uno::UNO_QUERY );
-                ::rtl::OUString sLockUpdates(::rtl::OUString::createFromAscii("LockUpdates"));
+                ::rtl::OUString sLockUpdates(RTL_CONSTASCII_USTRINGPARAM("LockUpdates"));
                 bool bSetProperty = true;
                 try
                 {
@@ -827,7 +827,7 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo
         if( xServiceManager.is() )
         {
             xFilterCFG = com::sun::star::uno::Reference< XNameAccess >(
-                xServiceManager->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ),
+                xServiceManager->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.FilterFactory")) ),
                 UNO_QUERY );
         }
 
@@ -842,7 +842,7 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo
                 {
                     sal_Int32 nPropertyCount = aProps.getLength();
                     for( sal_Int32 nProperty=0; nProperty < nPropertyCount; ++nProperty )
-                        if( aProps[nProperty].Name.equals( ::rtl::OUString::createFromAscii("UIComponent")) )
+                        if( aProps[nProperty].Name.equals( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIComponent"))) )
                         {
                             ::rtl::OUString aServiceName;
                             aProps[nProperty].Value >>= aServiceName;
@@ -1307,7 +1307,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl
                     if ( !xProps.is() )
                         throw uno::RuntimeException();
 
-                    xProps->setPropertyValue( ::rtl::OUString::createFromAscii( "MediaType" ),
+                    xProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")),
                                             uno::makeAny( aDataFlavor.MimeType ) );
                 }
                 catch( uno::Exception& )
@@ -2718,7 +2718,7 @@ sal_Bool SfxObjectShell::CommonSaveAs_Impl
 
     BOOL bWasReadonly = IsReadOnly();
 
-    if ( aURL == aActName && aURL != INetURLObject( OUString::createFromAscii( "private:stream" ) )
+    if ( aURL == aActName && aURL != INetURLObject( OUString(RTL_CONSTASCII_USTRINGPARAM("private:stream")) )
         && IsReadOnly() )
     {
         SetError(ERRCODE_SFX_DOCUMENTREADONLY, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
@@ -3592,12 +3592,12 @@ sal_Bool SfxObjectShell::GenerateAndStoreThumbnail( sal_Bool bEncrypted,
 
     try {
         uno::Reference< embed::XStorage > xThumbnailStor =
-                                        xStor->openStorageElement( ::rtl::OUString::createFromAscii( "Thumbnails" ),
+                                        xStor->openStorageElement( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Thumbnails")),
                                                                     embed::ElementModes::READWRITE );
         if ( xThumbnailStor.is() )
         {
             uno::Reference< io::XStream > xStream = xThumbnailStor->openStreamElement(
-                                                        ::rtl::OUString::createFromAscii( "thumbnail.png" ),
+                                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("thumbnail.png")),
                                                         embed::ElementModes::READWRITE );
 
             if ( xStream.is() && WriteThumbnail( bEncrypted, bSigned, bIsTemplate, xStream ) )
@@ -3630,8 +3630,8 @@ sal_Bool SfxObjectShell::WriteThumbnail( sal_Bool bEncrypted,
 
             uno::Reference < beans::XPropertySet > xSet( xStream, uno::UNO_QUERY );
             if ( xSet.is() )
-                xSet->setPropertyValue( ::rtl::OUString::createFromAscii("MediaType"),
-                                        uno::makeAny( ::rtl::OUString::createFromAscii("image/png") ) );
+                xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")),
+                                        uno::makeAny( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("image/png")) ) );
             if ( bEncrypted )
             {
                 sal_uInt16 nResID = GraphicHelper::getThumbnailReplacementIDByFactoryName_Impl(
diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx
index adb597c91a13..80f8c320a516 100644
--- a/sfx2/source/doc/objuno.cxx
+++ b/sfx2/source/doc/objuno.cxx
@@ -394,13 +394,13 @@ void SfxDocumentInfoObject_Impl::Reset(uno::Reference<document::XDocumentPropert
                     : sName + ::rtl::OUString::valueOf(i+1);
                 while (std::find(names.begin(), names.end(), name)
                        != names.end()) {
-                    name += ::rtl::OUString::createFromAscii("'");
+                    name += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'"));
                 }
                 // FIXME there is a race condition here
                 try {
                     xPropContainer->addProperty(name,
                         beans::PropertyAttribute::REMOVEABLE,
-                        uno::makeAny(::rtl::OUString::createFromAscii("")));
+                        uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(""))));
                 } catch (uno::RuntimeException) {
                     throw;
                 } catch (uno::Exception) {
@@ -443,14 +443,14 @@ SfxDocumentInfoObject::initialize(const uno::Sequence< uno::Any > & aArguments)
         uno::Any any = aArguments[0];
         uno::Reference<document::XDocumentProperties> xDoc;
         if (!(any >>= xDoc) || !xDoc.is()) throw lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii(
-                "SfxDocumentInfoObject::initialize: no XDocumentProperties given"),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "SfxDocumentInfoObject::initialize: no XDocumentProperties given")),
                 *this, 0);
         _pImp->Reset(xDoc);
     } else {
         throw lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii(
-                "SfxDocumentInfoObject::initialize: no argument given"),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "SfxDocumentInfoObject::initialize: no argument given")),
                 *this, 0);
     }
 }
@@ -888,7 +888,7 @@ void SAL_CALL  SfxDocumentInfoObject::setFastPropertyValue(sal_Int32 nHandle, co
                     _pImp->m_xDocProps->setAutoloadSecs(60); // default
                 } else if ( !bBoolVal && (0 != _pImp->m_xDocProps->getAutoloadSecs()) ) {
                     _pImp->m_xDocProps->setAutoloadSecs(0);
-                    _pImp->m_xDocProps->setAutoloadURL(::rtl::OUString::createFromAscii(""));
+                    _pImp->m_xDocProps->setAutoloadURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")));
                 }
                 break;
             default:
@@ -1141,7 +1141,7 @@ void  SAL_CALL SfxDocumentInfoObject::setUserFieldName(sal_Int16 nIndex, const :
                 try {
                     xPropContainer->addProperty(aName,
                         beans::PropertyAttribute::REMOVEABLE,
-                        uno::makeAny(::rtl::OUString::createFromAscii("")));
+                        uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(""))));
                     _pImp->m_UserDefined[nIndex] = aName;
                 } catch (beans::PropertyExistException) {
                     _pImp->m_UserDefined[nIndex] = aName;
@@ -1310,9 +1310,9 @@ void SAL_CALL  SfxStandaloneDocumentInfoObject::loadFromURL(const ::rtl::OUStrin
         try
         {
             uno::Sequence<beans::PropertyValue> medium(2);
-            medium[0].Name = ::rtl::OUString::createFromAscii("DocumentBaseURL");
+            medium[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentBaseURL"));
             medium[0].Value <<= aURL;
-            medium[1].Name = ::rtl::OUString::createFromAscii("URL");
+            medium[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"));
             medium[1].Value <<= aURL;
             _pImp->m_xDocProps->loadFromStorage(xStorage, medium);
             _pImp->Reset(_pImp->m_xDocProps);
@@ -1350,9 +1350,9 @@ void SAL_CALL  SfxStandaloneDocumentInfoObject::storeIntoURL(const ::rtl::OUStri
         try
         {
             uno::Sequence<beans::PropertyValue> medium(2);
-            medium[0].Name = ::rtl::OUString::createFromAscii("DocumentBaseURL");
+            medium[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentBaseURL"));
             medium[0].Value <<= aURL;
-            medium[1].Name = ::rtl::OUString::createFromAscii("URL");
+            medium[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"));
             medium[1].Value <<= aURL;
 
             _pImp->m_xDocProps->storeToStorage(xStorage, medium);
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 2bd8aa5a8bec..47f90b602a7f 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -902,9 +902,7 @@ void SfxObjectShell::SetBaseModel( SfxBaseModel* pModel )
 {
     return pImp->pBaseModel.get();
 }
-/* -----------------------------10.09.2001 15:56------------------------------
 
- ---------------------------------------------------------------------------*/
 void SfxObjectShell::SetAutoStyleFilterIndex(sal_uInt16 nSet)
 {
     pImp->nStyleFilter = nSet;
@@ -972,43 +970,43 @@ String SfxObjectShell::GetServiceNameFromFactory( const String& rFact )
 
     if ( aFact.EqualsAscii("swriter") )
     {
-        aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.text.TextDocument");
+        aServiceName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument"));
     }
     else if ( aFact.EqualsAscii("sweb") || aFact.EqualsAscii("swriter/web") )
     {
-        aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.text.WebDocument");
+        aServiceName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.WebDocument"));
     }
     else if ( aFact.EqualsAscii("sglobal") || aFact.EqualsAscii("swriter/globaldocument") )
     {
-        aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.text.GlobalDocument");
+        aServiceName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.GlobalDocument"));
     }
     else if ( aFact.EqualsAscii("scalc") )
     {
-        aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.sheet.SpreadsheetDocument");
+        aServiceName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument"));
     }
     else if ( aFact.EqualsAscii("sdraw") )
     {
-        aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.drawing.DrawingDocument");
+        aServiceName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DrawingDocument"));
     }
     else if ( aFact.EqualsAscii("simpress") )
     {
-        aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.presentation.PresentationDocument");
+        aServiceName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.PresentationDocument"));
     }
     else if ( aFact.EqualsAscii("schart") )
     {
-        aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.chart.ChartDocument");
+        aServiceName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.ChartDocument"));
     }
     else if ( aFact.EqualsAscii("smath") )
     {
-        aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.formula.FormulaProperties");
+        aServiceName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.formula.FormulaProperties"));
     }
     else if ( aFact.EqualsAscii("sbasic") )
     {
-        aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.script.BasicIDE");
+        aServiceName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.BasicIDE"));
     }
     else if ( aFact.EqualsAscii("sdatabase") )
     {
-        aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.sdb.OfficeDatabaseDocument");
+        aServiceName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OfficeDatabaseDocument"));
     }
 
     return aServiceName;
@@ -1056,7 +1054,7 @@ Reference<lang::XComponent> SfxObjectShell::CreateAndLoadComponent( const SfxIte
     SFX_ITEMSET_ARG(&rSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, FALSE);
     SFX_ITEMSET_ARG(&rSet, pTargetItem, SfxStringItem, SID_TARGETNAME, FALSE);
     ::rtl::OUString aURL;
-    ::rtl::OUString aTarget = rtl::OUString::createFromAscii("_blank");
+    ::rtl::OUString aTarget(RTL_CONSTASCII_USTRINGPARAM("_blank"));
     if ( pFileNameItem )
         aURL = pFileNameItem->GetValue();
     if ( pTargetItem )
@@ -1069,7 +1067,7 @@ Reference<lang::XComponent> SfxObjectShell::CreateAndLoadComponent( const SfxIte
     }
     else
         xLoader = uno::Reference < frame::XComponentLoader >( comphelper::getProcessServiceFactory()->createInstance(
-            ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop") ), uno::UNO_QUERY );
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), uno::UNO_QUERY );
 
     Reference <lang::XComponent> xComp;
     try
diff --git a/sfx2/source/doc/ownsubfilterservice.cxx b/sfx2/source/doc/ownsubfilterservice.cxx
index 61ca1b279bd9..de28259e2391 100644
--- a/sfx2/source/doc/ownsubfilterservice.cxx
+++ b/sfx2/source/doc/ownsubfilterservice.cxx
@@ -54,15 +54,15 @@ OwnSubFilterService::~OwnSubFilterService()
 uno::Sequence< ::rtl::OUString > SAL_CALL OwnSubFilterService::impl_getStaticSupportedServiceNames()
 {
     uno::Sequence< ::rtl::OUString > aRet(2);
-    aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.OwnSubFilter");
-    aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.comp.document.OwnSubFilter");
+    aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.OwnSubFilter"));
+    aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.document.OwnSubFilter"));
     return aRet;
 }
 
 //-------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OwnSubFilterService::impl_getStaticImplementationName()
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.document.OwnSubFilter");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.document.OwnSubFilter"));
 }
 
 //-------------------------------------------------------------------------
diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx
index d319534b1478..7ef877f90a18 100644
--- a/sfx2/source/doc/plugin.cxx
+++ b/sfx2/source/doc/plugin.cxx
@@ -104,7 +104,7 @@ sal_Bool SAL_CALL PluginObject::load(
     const uno::Reference < frame::XFrame >& xFrame )
 throw( uno::RuntimeException )
 {
-    uno::Reference< plugin::XPluginManager > xPMgr( mxFact->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.plugin.PluginManager") ), uno::UNO_QUERY );
+    uno::Reference< plugin::XPluginManager > xPMgr( mxFact->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginManager")) ), uno::UNO_QUERY );
     if (!xPMgr.is() )
         return FALSE;
 
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index 671c6098fe4f..0fc755829032 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -650,7 +650,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
                 aCheckedArgs[nProps++].Value <<= sFileURL;
                 // and append the local filename
                 aCheckedArgs.realloc( aCheckedArgs.getLength()+1 );
-                aCheckedArgs[nProps].Name = rtl::OUString::createFromAscii("LocalFileName");
+                aCheckedArgs[nProps].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LocalFileName"));
                 aCheckedArgs[nProps++].Value <<= ::rtl::OUString( sTemp );
             }
             else
@@ -666,7 +666,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
                 aCheckedArgs[nProps++].Value <<= sTemp;
                 // and append the local filename
                 aCheckedArgs.realloc( aCheckedArgs.getLength()+1 );
-                aCheckedArgs[nProps].Name = rtl::OUString::createFromAscii("LocalFileName");
+                aCheckedArgs[nProps].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LocalFileName"));
                 aCheckedArgs[nProps++].Value <<= ::rtl::OUString( sPath );
             }
             else
@@ -684,7 +684,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
                 pUCBPrintTempFile->EnableKillingFile();
 
                 //FIXME: does it work?
-                aCheckedArgs[nProps].Name = rtl::OUString::createFromAscii("LocalFileName");
+                aCheckedArgs[nProps].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LocalFileName"));
                 aCheckedArgs[nProps++].Value <<= ::rtl::OUString( pUCBPrintTempFile->GetFileName() );
                 sUcbUrl = sURL;
             }
@@ -709,7 +709,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
             sal_Bool bTemp = sal_Bool();
             if ( rProp.Value >>= bTemp )
             {
-                aCheckedArgs[nProps].Name = rtl::OUString::createFromAscii("Collate");
+                aCheckedArgs[nProps].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Collate"));
                 aCheckedArgs[nProps++].Value <<= bTemp;
             }
             else
diff --git a/sfx2/source/doc/sfxacldetect.cxx b/sfx2/source/doc/sfxacldetect.cxx
index f0e3984bc3a5..57680b360293 100644
--- a/sfx2/source/doc/sfxacldetect.cxx
+++ b/sfx2/source/doc/sfxacldetect.cxx
@@ -26,6 +26,13 @@
  *
  ************************************************************************/
 
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sfx2.hxx"
+
+#include "sfxacldetect.hxx"
+
+#if EXTRA_ACL_CHECK
+
 #ifdef WNT
 
 // necessary to include system headers without warnings
@@ -104,4 +111,6 @@ sal_Bool IsReadonlyAccordingACL( const sal_Unicode* )
 
 #endif
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/sfxacldetect.hxx b/sfx2/source/doc/sfxacldetect.hxx
new file mode 100644
index 000000000000..99868f650709
--- /dev/null
+++ b/sfx2/source/doc/sfxacldetect.hxx
@@ -0,0 +1,39 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kohei Yoshida <kyoshida@novell.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef __SFXACLDETECT_HXX__
+#define __SFXACLDETECT_HXX__
+
+// Let's check if this extra ACL check is still necessary...  If disabling it
+// causes no regressions, then we can safely remove this code.
+#define EXTRA_ACL_CHECK 0
+
+#if EXTRA_ACL_CHECK
+sal_Bool IsReadonlyAccordingACL( const sal_Unicode* pFilePath );
+#endif
+
+#endif
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 0b5a106664a2..521ec7860fde 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -281,8 +281,8 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument
             const uno::Reference<frame::
                 XTransientDocumentsDocumentContentFactory> xTDDCF(
                     xMsf->createInstanceWithContext(
-                        ::rtl::OUString::createFromAscii( "com.sun.star.frame."
-                            "TransientDocumentsDocumentContentFactory"),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame."
+                            "TransientDocumentsDocumentContentFactory")),
                     xContext),
                 uno::UNO_QUERY_THROW);
             const uno::Reference<ucb::XContent> xContent(
@@ -296,7 +296,7 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument
             OSL_ENSURE(uri.getLength(), "GetDMA: empty uri?");
             if (uri.getLength() && !uri.endsWithAsciiL("/", 1))
             {
-                uri = uri + ::rtl::OUString::createFromAscii("/");
+                uri = uri + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
             }
 
             m_xDocumentMetadata = new ::sfx2::DocumentMetadataAccess(
@@ -470,8 +470,8 @@ SfxSaveGuard::SfxSaveGuard(const uno::Reference< frame::XModel >&             xM
     , m_pData      (pData )
     , m_pFramesLock(0     )
 {
-    static ::rtl::OUString MSG_1 = ::rtl::OUString::createFromAscii("Object already disposed."                                       );
-    static ::rtl::OUString MSG_2 = ::rtl::OUString::createFromAscii("Concurrent save requests on the same document are not possible.");
+    static ::rtl::OUString MSG_1(RTL_CONSTASCII_USTRINGPARAM("Object already disposed."));
+    static ::rtl::OUString MSG_2(RTL_CONSTASCII_USTRINGPARAM("Concurrent save requests on the same document are not possible."));
 
     if ( m_pData->m_bClosed )
         throw ::com::sun::star::lang::DisposedException(
@@ -861,12 +861,12 @@ uno::Reference< document::XDocumentInfo > SAL_CALL SfxBaseModel::getDocumentInfo
         } catch (uno::RuntimeException &) {
             throw;
         } catch (uno::Exception & e) {
-            throw lang::WrappedTargetRuntimeException(::rtl::OUString::createFromAscii(
-                "SfxBaseModel::getDocumentInfo: cannot initialize"), *this,
+            throw lang::WrappedTargetRuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "SfxBaseModel::getDocumentInfo: cannot initialize")), *this,
                 uno::makeAny(e));
         }
         try {
-            rtl::OUString aName = rtl::OUString::createFromAscii("MediaType");
+            rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM("MediaType"));
             uno::Reference < beans::XPropertySet > xSet(
                 getDocumentStorage(), uno::UNO_QUERY );
             uno::Any aMediaType = xSet->getPropertyValue( aName );
@@ -1067,13 +1067,13 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs() throw(::c
         aRectSeq[3] = aTmpRect.Bottom();
 
         seqArgsNew.realloc( ++nNewLength );
-        seqArgsNew[ nNewLength - 1 ].Name = ::rtl::OUString::createFromAscii( "WinExtent" );
+        seqArgsNew[ nNewLength - 1 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WinExtent"));
         seqArgsNew[ nNewLength - 1 ].Value <<= aRectSeq;
 
         if ( m_pData->m_aPreusedFilterName.getLength() )
         {
             seqArgsNew.realloc( ++nNewLength );
-            seqArgsNew[ nNewLength - 1 ].Name = ::rtl::OUString::createFromAscii( "PreusedFilterName" );
+            seqArgsNew[ nNewLength - 1 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PreusedFilterName"));
             seqArgsNew[ nNewLength - 1 ].Value <<= m_pData->m_aPreusedFilterName;
         }
 
@@ -1089,7 +1089,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs() throw(::c
             aBorderSeq[3] = aBorder.Bottom();
 
             seqArgsNew.realloc( ++nNewLength );
-            seqArgsNew[ nNewLength - 1 ].Name = ::rtl::OUString::createFromAscii( "DocumentBorder" );
+            seqArgsNew[ nNewLength - 1 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentBorder"));
             seqArgsNew[ nNewLength - 1 ].Value <<= aBorderSeq;
         }
 
@@ -1362,7 +1362,7 @@ void SAL_CALL SfxBaseModel::removeModifyListener(const uno::Reference< XMODIFYLI
 
 void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership ) throw (util::CloseVetoException, uno::RuntimeException)
 {
-    static ::rtl::OUString MSG_1 = ::rtl::OUString::createFromAscii("Cant close while saving.");
+    static ::rtl::OUString MSG_1(RTL_CONSTASCII_USTRINGPARAM("Cant close while saving."));
 
     SolarMutexGuard aGuard;
     if ( impl_isDisposed() || m_pData->m_bClosed || m_pData->m_bClosing )
@@ -1996,7 +1996,7 @@ uno::Any SAL_CALL SfxBaseModel::getTransferData( const DATAFLAVOR& aFlavor )
             if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
             {
                 ::boost::shared_ptr<GDIMetaFile> pMetaFile =
-                    m_pData->m_pObjectShell->CreatePreviewMetaFile_Impl( sal_True, sal_True );
+                    m_pData->m_pObjectShell->CreatePreviewMetaFile_Impl( sal_True );
 
                 if ( pMetaFile )
                 {
@@ -3240,7 +3240,7 @@ uno::Reference< ui::XUIConfigurationManager > SAL_CALL SfxBaseModel::getUIConfig
     {
         uno::Reference< ui::XUIConfigurationManager > xNewUIConfMan(
             ::comphelper::getProcessServiceFactory()->createInstance(
-                ::rtl::OUString::createFromAscii( "com.sun.star.ui.UIConfigurationManager" )),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.UIConfigurationManager"))),
                 uno::UNO_QUERY );
 
         Reference< ui::XUIConfigurationStorage > xUIConfigStorage( xNewUIConfMan, uno::UNO_QUERY );
@@ -3414,8 +3414,8 @@ embed::VisualRepresentation SAL_CALL SfxBaseModel::getPreferredVisualRepresentat
     SfxModelGuard aGuard( *this );
 
     datatransfer::DataFlavor aDataFlavor(
-            ::rtl::OUString::createFromAscii( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ),
-            ::rtl::OUString::createFromAscii( "GDIMetaFile" ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" )),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GDIMetaFile")),
             ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) );
 
     embed::VisualRepresentation aVisualRepresentation;
@@ -3668,7 +3668,7 @@ css::uno::Reference< css::frame::XUntitledNumbers > SfxBaseModel::impl_getUntitl
         m_pData->m_xNumberedControllers = css::uno::Reference< css::frame::XUntitledNumbers >(static_cast< ::cppu::OWeakObject* >(pHelper), css::uno::UNO_QUERY_THROW);
 
         pHelper->setOwner          (xThis);
-        pHelper->setUntitledPrefix (::rtl::OUString::createFromAscii(" : "));
+        pHelper->setUntitledPrefix (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" : ")));
     }
 
     return m_pData->m_xNumberedControllers;
@@ -4029,8 +4029,8 @@ SfxBaseModel::getRDFRepository() throw (uno::RuntimeException)
 
     const uno::Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA());
     if (!xDMA.is()) {
-        throw uno::RuntimeException( ::rtl::OUString::createFromAscii(
-            "model has no document metadata"), *this );
+        throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "model has no document metadata")), *this );
     }
 
     return xDMA->getRDFRepository();
@@ -4044,8 +4044,8 @@ SfxBaseModel::getStringValue() throw (uno::RuntimeException)
 
     const uno::Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA());
     if (!xDMA.is()) {
-        throw uno::RuntimeException( ::rtl::OUString::createFromAscii(
-            "model has no document metadata"), *this );
+        throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "model has no document metadata")), *this );
     }
 
     return xDMA->getStringValue();
@@ -4059,8 +4059,8 @@ SfxBaseModel::getNamespace() throw (uno::RuntimeException)
 
     const uno::Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA());
     if (!xDMA.is()) {
-        throw uno::RuntimeException( ::rtl::OUString::createFromAscii(
-            "model has no document metadata"), *this );
+        throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "model has no document metadata")), *this );
     }
 
     return xDMA->getNamespace();
@@ -4073,8 +4073,8 @@ SfxBaseModel::getLocalName() throw (uno::RuntimeException)
 
     const uno::Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA());
     if (!xDMA.is()) {
-        throw uno::RuntimeException( ::rtl::OUString::createFromAscii(
-            "model has no document metadata"), *this );
+        throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "model has no document metadata")), *this );
     }
 
     return xDMA->getLocalName();
@@ -4090,8 +4090,8 @@ throw (uno::RuntimeException)
 
     const uno::Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA());
     if (!xDMA.is()) {
-        throw uno::RuntimeException( ::rtl::OUString::createFromAscii(
-            "model has no document metadata"), *this );
+        throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "model has no document metadata")), *this );
     }
 
     return xDMA->getElementByMetadataReference(i_rReference);
@@ -4105,8 +4105,8 @@ throw (uno::RuntimeException, lang::IllegalArgumentException)
 
     const uno::Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA());
     if (!xDMA.is()) {
-        throw uno::RuntimeException( ::rtl::OUString::createFromAscii(
-            "model has no document metadata"), *this );
+        throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "model has no document metadata")), *this );
     }
 
     return xDMA->getElementByURI(i_xURI);
@@ -4121,8 +4121,8 @@ throw (uno::RuntimeException, lang::IllegalArgumentException)
 
     const uno::Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA());
     if (!xDMA.is()) {
-        throw uno::RuntimeException( ::rtl::OUString::createFromAscii(
-            "model has no document metadata"), *this );
+        throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "model has no document metadata")), *this );
     }
 
     return xDMA->getMetadataGraphsWithType(i_xType);
@@ -4138,8 +4138,8 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
 
     const uno::Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA());
     if (!xDMA.is()) {
-        throw uno::RuntimeException( ::rtl::OUString::createFromAscii(
-            "model has no document metadata"), *this );
+        throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "model has no document metadata")), *this );
     }
 
     return xDMA->addMetadataFile(i_rFileName, i_rTypes);
@@ -4159,8 +4159,8 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
 
     const uno::Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA());
     if (!xDMA.is()) {
-        throw uno::RuntimeException( ::rtl::OUString::createFromAscii(
-            "model has no document metadata"), *this );
+        throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "model has no document metadata")), *this );
     }
 
     return xDMA->importMetadataFile(i_Format,
@@ -4177,8 +4177,8 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
 
     const uno::Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA());
     if (!xDMA.is()) {
-        throw uno::RuntimeException( ::rtl::OUString::createFromAscii(
-            "model has no document metadata"), *this );
+        throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "model has no document metadata")), *this );
     }
 
     return xDMA->removeMetadataFile(i_xGraphName);
@@ -4193,8 +4193,8 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
 
     const uno::Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA());
     if (!xDMA.is()) {
-        throw uno::RuntimeException( ::rtl::OUString::createFromAscii(
-            "model has no document metadata"), *this );
+        throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "model has no document metadata")), *this );
     }
 
     return xDMA->addContentOrStylesFile(i_rFileName);
@@ -4209,8 +4209,8 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
 
     const uno::Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA());
     if (!xDMA.is()) {
-        throw uno::RuntimeException( ::rtl::OUString::createFromAscii(
-            "model has no document metadata"), *this );
+        throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "model has no document metadata")), *this );
     }
 
     return xDMA->removeContentOrStylesFile(i_rFileName);
@@ -4229,8 +4229,8 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
     const uno::Reference<rdf::XDocumentMetadataAccess> xDMA(
         m_pData->CreateDMAUninitialized());
     if (!xDMA.is()) {
-        throw uno::RuntimeException( ::rtl::OUString::createFromAscii(
-            "model has no document metadata"), *this );
+        throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "model has no document metadata")), *this );
     }
 
     try {
@@ -4256,8 +4256,8 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
 
     const uno::Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA());
     if (!xDMA.is()) {
-        throw uno::RuntimeException( ::rtl::OUString::createFromAscii(
-            "model has no document metadata"), *this );
+        throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "model has no document metadata")), *this );
     }
 
     return xDMA->storeMetadataToStorage(i_xStorage);
@@ -4274,8 +4274,8 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
     const uno::Reference<rdf::XDocumentMetadataAccess> xDMA(
         m_pData->CreateDMAUninitialized());
     if (!xDMA.is()) {
-        throw uno::RuntimeException( ::rtl::OUString::createFromAscii(
-            "model has no document metadata"), *this );
+        throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "model has no document metadata")), *this );
     }
 
     try {
@@ -4300,8 +4300,8 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
 
     const uno::Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA());
     if (!xDMA.is()) {
-        throw uno::RuntimeException( ::rtl::OUString::createFromAscii(
-            "model has no document metadata"), *this );
+        throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "model has no document metadata")), *this );
     }
 
     return xDMA->storeMetadataToMedium(i_rMedium);
diff --git a/sfx2/source/inc/sfxlocal.hrc b/sfx2/source/inc/sfxlocal.hrc
index 202ed6f6f00f..a6a7d85de0e5 100644
--- a/sfx2/source/inc/sfxlocal.hrc
+++ b/sfx2/source/inc/sfxlocal.hrc
@@ -67,9 +67,7 @@
 // Images ----------------------------------------------------------------
 
 #define SFX_IMG_PROPERTY_REMOVE             (RID_SFX_SFXLOCAL_START +  0)
-#define SFX_IMG_PROPERTY_REMOVE_HC          (RID_SFX_SFXLOCAL_START +  1)
 #define SFX_IMG_CLOSE_DOC                   (RID_SFX_SFXLOCAL_START +  2)
-#define SFX_IMG_CLOSE_DOC_HC                (RID_SFX_SFXLOCAL_START +  3)
 
 #endif
 
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index d2efa69bd82d..9b28fa182b27 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -274,9 +274,6 @@ public:
 
     void                SetAutomaticFilter();
 };
-/* -----------------10.12.2003 11:42-----------------
-
- --------------------------------------------------*/
 
 class DropToolBox_Impl : public ToolBox, public DropTargetHelper
 {
diff --git a/sfx2/source/inc/tplcomp.hxx b/sfx2/source/inc/tplcomp.hxx
index a9f2f88966b2..ba090e87cb67 100644
--- a/sfx2/source/inc/tplcomp.hxx
+++ b/sfx2/source/inc/tplcomp.hxx
@@ -30,9 +30,6 @@
 #define _TPLCOMP_HXX
 
 #include <osl/mutex.hxx>
-//ASDBG #include <usr/uno.hxx>
-//ASDBG #include <usr/iterhlp.hxx>
-//ASDBG #include <usr/services.hxx>
 #include <com/sun/star/chaos/XCommandExecutor.hpp>
 #include <com/sun/star/chaos/XStatusCallback.hpp>
 #include <com/sun/star/chaos/UnknownCommandException.hpp>
diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx
index 22ac6450318b..2d3dd55be573 100644
--- a/sfx2/source/inc/virtmenu.hxx
+++ b/sfx2/source/inc/virtmenu.hxx
@@ -64,7 +64,6 @@ private:
     BOOL            bHelpInitialized : 1;
     BOOL            bIsActive : 1;
     BOOL            bControllersUnBound : 1;
-    BOOL            bWasHighContrast : 1;
     BOOL            bIsAddonPopupMenu : 1;
 
 private:
@@ -125,7 +124,6 @@ public:
     void            SetResMgr(ResMgr* pMgr)  {pResMgr = pMgr; }
     ResMgr*         GetResMgr() { return pResMgr; }
     void            SetHelpIds( ResMgr* );
-    BOOL            IsHiContrastMode() const;
     void            UpdateImages();
 
     DECL_LINK( Select, Menu * );
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index 95a1b4de926a..3ba99f1fa94d 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -114,7 +114,7 @@ void SfxURLToolBoxControl_Impl::OpenURL( const String& rName, BOOL /*bNew*/ ) co
     if ( xDispatchProvider.is() && m_xServiceManager.is() )
     {
         URL             aTargetURL;
-        ::rtl::OUString aTarget( ::rtl::OUString::createFromAscii( "_default" ));
+        ::rtl::OUString aTarget( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default")));
 
         aTargetURL.Complete = aName;
 
@@ -123,17 +123,17 @@ void SfxURLToolBoxControl_Impl::OpenURL( const String& rName, BOOL /*bNew*/ ) co
         if ( xDispatch.is() )
         {
             Sequence< PropertyValue > aArgs( 2 );
-            aArgs[0].Name = ::rtl::OUString::createFromAscii( "Referer" );
-            aArgs[0].Value = makeAny( ::rtl::OUString::createFromAscii( SFX_REFERER_USER ));
+            aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
+            aArgs[0].Value = makeAny( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SFX_REFERER_USER )));
             aArgs[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FileName" ));
             aArgs[1].Value = makeAny( ::rtl::OUString( aName ));
 
             if ( aFilter.Len() )
             {
                 aArgs.realloc( 4 );
-                aArgs[2].Name = ::rtl::OUString::createFromAscii( "FilterOptions" );
+                aArgs[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterOptions"));
                 aArgs[2].Value = makeAny( ::rtl::OUString( aOptions ));
-                aArgs[3].Name = ::rtl::OUString::createFromAscii( "FilterName" );
+                aArgs[3].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName"));
                 aArgs[3].Value = makeAny( ::rtl::OUString( aFilter ));
             }
 
@@ -194,7 +194,7 @@ IMPL_LINK( SfxURLToolBoxControl_Impl, OpenHdl, void*, EMPTYARG )
     if ( m_xServiceManager.is() )
     {
         Reference< XFramesSupplier > xDesktop( m_xServiceManager->createInstance(
-                                                ::rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" )),
+                                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"))),
                                              UNO_QUERY );
         Reference< XFrame > xFrame( xDesktop->getActiveFrame(), UNO_QUERY );
         if ( xFrame.is() )
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 4b104bd54de0..a9026f49775f 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -443,7 +443,6 @@ SfxAppMenuControl_Impl::SfxAppMenuControl_Impl(
     // Determine the current background color setting for menus
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
     m_nSymbolsStyle         = rSettings.GetSymbolsStyle();
-    m_bWasHiContrastMode    = rSettings.GetHighContrastMode();
     m_bShowMenuImages       = rSettings.GetUseImagesInMenus();
 
     Reference<com::sun::star::lang::XMultiServiceFactory> aXMultiServiceFactory(::comphelper::getProcessServiceFactory());
@@ -469,15 +468,12 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
     {
         const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
         ULONG nSymbolsStyle = rSettings.GetSymbolsStyle();
-        BOOL bIsHiContrastMode = rSettings.GetHighContrastMode();
         BOOL bShowMenuImages = rSettings.GetUseImagesInMenus();
 
         if (( nSymbolsStyle != m_nSymbolsStyle ) ||
-            ( bIsHiContrastMode != m_bWasHiContrastMode ) ||
             ( bShowMenuImages != m_bShowMenuImages ))
         {
             m_nSymbolsStyle         = nSymbolsStyle;
-            m_bWasHiContrastMode    = bIsHiContrastMode;
             m_bShowMenuImages       = bShowMenuImages;
 
             USHORT nCount = pActMenu->GetItemCount();
@@ -499,7 +495,7 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
                         if ( aImageId.getLength() > 0 )
                         {
                             Reference< ::com::sun::star::frame::XFrame > xFrame;
-                            Image aImage = GetImage( xFrame, aImageId, FALSE, bIsHiContrastMode );
+                            Image aImage = GetImage( xFrame, aImageId, FALSE );
                             if ( !!aImage )
                             {
                                 bImageSet = sal_True;
@@ -511,7 +507,7 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
                         if ( !bImageSet && aCmd.Len() )
                         {
                             Image aImage = SvFileInformationManager::GetImage(
-                                INetURLObject(aCmd), FALSE, bIsHiContrastMode );
+                                INetURLObject(aCmd), FALSE );
                             if ( !!aImage )
                                 pActMenu->SetItemImage( nItemId, aImage );
                         }
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 601ec9fd4395..080bb8380877 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -228,11 +228,10 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu )
         if (nNumSynonyms > 0)
         {
             SvtLinguConfig aCfg;
-            const bool bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
 
             Image aImage;
             String sThesImplName( aHelper.GetThesImplName( aLocale ) );
-            ::rtl::OUString aSynonymsImageUrl( aCfg.GetSynonymsContextImage( sThesImplName, bHC ) );
+            ::rtl::OUString aSynonymsImageUrl( aCfg.GetSynonymsContextImage( sThesImplName ) );
             if (sThesImplName.Len() > 0 && aSynonymsImageUrl.getLength() > 0)
                 aImage = Image( lcl_GetImageFromPngUrl( aSynonymsImageUrl ) );
 
@@ -243,7 +242,7 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu )
 
                 String aItemText( GetThesaurusReplaceText_Impl( aSynonyms[i] ) );
                 pThesSubMenu->InsertItem( nId, aItemText );
-                ::rtl::OUString aCmd( ::rtl::OUString::createFromAscii( ".uno:ThesaurusFromContext?WordReplace:string=" ) );
+                ::rtl::OUString aCmd(RTL_CONSTASCII_USTRINGPARAM(".uno:ThesaurusFromContext?WordReplace:string=") );
                 aCmd += aItemText;
                 pThesSubMenu->SetItemCommand( nId, aCmd );
 
@@ -259,7 +258,7 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu )
         pThesSubMenu->InsertSeparator();
         const String sThesaurus( SfxResId( STR_MENU_THESAURUS ) );
         pThesSubMenu->InsertItem( 100, sThesaurus );
-        pThesSubMenu->SetItemCommand( 100, ::rtl::OUString::createFromAscii( ".uno:ThesaurusDialog" ) );
+        pThesSubMenu->SetItemCommand( 100, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:ThesaurusDialog")) );
 
         pSVMenu->InsertSeparator();
         const String sSynonyms( SfxResId( STR_MENU_SYNONYMS ) );
diff --git a/sfx2/source/menu/thessubmenu.cxx b/sfx2/source/menu/thessubmenu.cxx
index 10a7f9ec3372..34818c6e69fc 100644
--- a/sfx2/source/menu/thessubmenu.cxx
+++ b/sfx2/source/menu/thessubmenu.cxx
@@ -261,7 +261,7 @@ String SfxThesSubMenuHelper::GetThesImplName( const lang::Locale &rLocale ) cons
     if (m_xLngMgr.is())
     {
         uno::Sequence< OUString > aServiceNames = m_xLngMgr->getConfiguredServices(
-                OUString::createFromAscii("com.sun.star.linguistic2.Thesaurus"), rLocale );
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.Thesaurus")), rLocale );
         // there should be at most one thesaurus configured for each language
         DBG_ASSERT( aServiceNames.getLength() <= 1, "more than one thesaurus found. Should not be possible" );
         if (aServiceNames.getLength() == 1)
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index ab000109dc24..f13591687838 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -134,21 +134,21 @@ void SfxMenuImageControl_Impl::Update()
 static Image RetrieveAddOnImage( Reference< com::sun::star::frame::XFrame >& rFrame,
                                  const rtl::OUString& aImageId,
                                  const rtl::OUString& aURL,
-                                 BOOL bBigImage,
-                                 BOOL bHiContrast )
+                                 BOOL bBigImage
+)
 {
     Image aImage;
 
     if ( aImageId.getLength() > 0 )
     {
-        aImage = GetImage( rFrame, aImageId, bBigImage, bHiContrast );
+        aImage = GetImage( rFrame, aImageId, bBigImage );
         if ( !!aImage )
             return aImage;
     }
 
-    aImage = GetImage( rFrame, aURL, bBigImage, bHiContrast );
+    aImage = GetImage( rFrame, aURL, bBigImage );
     if ( !aImage )
-        aImage = framework::AddonsOptions().GetImageFromURL( aURL, bBigImage, bHiContrast );
+        aImage = framework::AddonsOptions().GetImageFromURL( aURL, bBigImage );
 
     return aImage;
 }
@@ -195,13 +195,12 @@ SfxVirtualMenu::SfxVirtualMenu( USHORT nOwnId,
                 SfxVirtualMenu* pOwnParent, Menu& rMenu, BOOL bWithHelp,
                 SfxBindings &rBindings, BOOL bOLEServer, BOOL bRes, BOOL bIsAddonMenu ):
     pItems(0),
-       pImageControl(0),
+    pImageControl(0),
     pBindings(&rBindings),
     pResMgr(0),
     pAutoDeactivate(0),
     nLocks(0),
     bHelpInitialized( bWithHelp ),
-    bWasHighContrast( FALSE ),
     bIsAddonPopupMenu( bIsAddonMenu )
 {
     DBG_MEMTEST();
@@ -237,7 +236,6 @@ SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, BOOL bWithHelp,
     pAutoDeactivate(0),
     nLocks(0),
     bHelpInitialized( bWithHelp ),
-    bWasHighContrast( FALSE ),
     bIsAddonPopupMenu( bIsAddonMenu )
 {
     DBG_MEMTEST();
@@ -323,14 +321,6 @@ SfxVirtualMenu::~SfxVirtualMenu()
     DBG_ASSERT( !nLocks, "destroying active menu" );
 }
 //--------------------------------------------------------------------
-
-BOOL SfxVirtualMenu::IsHiContrastMode() const
-{
-    const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-    return rSettings.GetHighContrastMode();
-}
-
-//--------------------------------------------------------------------
 // internal: creates the virtual menu from the pSVMenu
 
 void SfxVirtualMenu::CreateFromSVMenu()
@@ -393,9 +383,6 @@ void SfxVirtualMenu::CreateFromSVMenu()
     pBindings->ENTERREGISTRATIONS(); ++nLocks;
     pImageControl = new SfxMenuImageControl_Impl( SID_IMAGE_ORIENTATION, *pBindings, this );
 
-    // Update high contrast state
-    bWasHighContrast = IsHiContrastMode();
-
     USHORT nSVPos = 0;
     for ( USHORT nPos=0; nPos<nCount; ++nPos, ++nSVPos )
     {
@@ -436,7 +423,7 @@ void SfxVirtualMenu::CreateFromSVMenu()
                 {
                     rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
                     aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
-                    Image aImage = GetImage( xFrame, aSlotURL, FALSE, bWasHighContrast );
+                    Image aImage = GetImage( xFrame, aSlotURL, FALSE );
                     pSVMenu->SetItemImage( nSlotId, aImage );
                 }
             }
@@ -542,13 +529,13 @@ void SfxVirtualMenu::CreateFromSVMenu()
                             if ( pMenuAttributes )
                                 aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
 
-                            aImage = RetrieveAddOnImage( xFrame, aImageId, aCmd, FALSE, bWasHighContrast );
+                            aImage = RetrieveAddOnImage( xFrame, aImageId, aCmd, FALSE );
                         }
                         else
                         {
                             rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
                             aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
-                            aImage = GetImage( xFrame, aSlotURL, FALSE, bWasHighContrast );
+                            aImage = GetImage( xFrame, aSlotURL, FALSE );
                         }
 
                         if ( !!aImage )
@@ -603,7 +590,6 @@ IMPL_LINK( SfxVirtualMenu, SettingsChanged, void*, EMPTYARG )
     USHORT nItemCount = pSVMenu->GetItemCount();
     SfxViewFrame *pViewFrame = pBindings->GetDispatcher()->GetFrame();
     BOOL bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
-    BOOL bIsHiContrastMode = IsHiContrastMode();
     Reference<com::sun::star::frame::XFrame> xFrame( pViewFrame->GetFrame().GetFrameInterface() );
 
     if ( !bIsAddonPopupMenu )
@@ -626,13 +612,13 @@ IMPL_LINK( SfxVirtualMenu, SettingsChanged, void*, EMPTYARG )
                     if ( pMenuAttributes )
                         aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
 
-                    pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, FALSE, bIsHiContrastMode ));
+                    pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, FALSE ));
                 }
                 else
                 {
                     rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
                     aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
-                    pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, FALSE, bWasHighContrast ));
+                    pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, FALSE ));
                 }
             }
             else if( nType == MENUITEM_STRINGIMAGE && !bIcons )
@@ -673,7 +659,6 @@ void SfxVirtualMenu::UpdateImages()
 
     if ( bIcons )
     {
-        BOOL            bIsHiContrastMode   = IsHiContrastMode();
         USHORT          nItemCount          = pSVMenu->GetItemCount();
         SfxViewFrame *  pViewFrame          = pBindings->GetDispatcher()->GetFrame();
         Reference<com::sun::star::frame::XFrame> xFrame( pViewFrame->GetFrame().GetFrameInterface() );
@@ -695,13 +680,13 @@ void SfxVirtualMenu::UpdateImages()
                     if ( pMenuAttributes )
                         aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
 
-                    pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, FALSE, bIsHiContrastMode ));
+                    pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, FALSE ));
                 }
                 else
                 {
                     rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
                     aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
-                    pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, FALSE, bWasHighContrast ));
+                    pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, FALSE ));
                 }
             }
         }
@@ -723,7 +708,6 @@ void SfxVirtualMenu::UpdateImages( Menu* pMenu )
     BOOL bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
     if ( bIcons )
     {
-        BOOL            bIsHiContrastMode   = IsHiContrastMode();
         USHORT          nItemCount          = pMenu->GetItemCount();
         Reference<com::sun::star::frame::XFrame> aXFrame( pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame().GetFrameInterface() );
 
@@ -741,7 +725,7 @@ void SfxVirtualMenu::UpdateImages( Menu* pMenu )
                 if ( pMenuAttributes )
                     aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
 
-                pMenu->SetItemImage( nSlotId, RetrieveAddOnImage( aXFrame, aImageId, pMenu->GetItemCommand( nSlotId ), FALSE, bIsHiContrastMode ));
+                pMenu->SetItemImage( nSlotId, RetrieveAddOnImage( aXFrame, aImageId, pMenu->GetItemCommand( nSlotId ), FALSE ));
             }
 
             if ( pPopup )
@@ -919,7 +903,7 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu )
         {
                rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
                aSlotURL += rtl::OUString::valueOf( sal_Int32( SID_ADDONS ));
-         pMenu->SetItemImage( SID_ADDONS, GetImage( xFrame, aSlotURL, FALSE, bWasHighContrast ));
+         pMenu->SetItemImage( SID_ADDONS, GetImage( xFrame, aSlotURL, FALSE ));
         }
     }
     else
@@ -1066,16 +1050,6 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
         if ( pAutoDeactivate ) // QAP-Hack
             pAutoDeactivate->Start();
 
-        if ( IsHiContrastMode() != bWasHighContrast )
-        {
-            // Refresh images as our background color changed and remember it!!
-            bWasHighContrast = IsHiContrastMode();
-            if ( bIsAddonPopupMenu )
-                UpdateImages( pSVMenu );
-            else
-                UpdateImages();
-        }
-
         // erledigt
         return TRUE;
     }
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index 56e56fd813eb..d9cfe06f95b3 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -248,8 +248,8 @@ static void Execute( ANY& aEventData, const css::document::DocumentEvent& aTrigg
                 ::com::sun::star::uno::Reference
                     < ::com::sun::star::util::XURLTransformer > xTrans(
                         ::comphelper::getProcessServiceFactory()->createInstance(
-                            rtl::OUString::createFromAscii(
-                                "com.sun.star.util.URLTransformer" ) ),
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                "com.sun.star.util.URLTransformer" )) ),
                         UNO_QUERY );
 
                 ::com::sun::star::util::URL aURL;
@@ -270,8 +270,8 @@ static void Execute( ANY& aEventData, const css::document::DocumentEvent& aTrigg
                     xProv = ::com::sun::star::uno::Reference
                         < ::com::sun::star::frame::XDispatchProvider > (
                             ::comphelper::getProcessServiceFactory()->createInstance(
-                                rtl::OUString::createFromAscii(
-                                    "com.sun.star.frame.Desktop" ) ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "com.sun.star.frame.Desktop" )) ),
                             UNO_QUERY );
                 }
 
@@ -282,7 +282,7 @@ static void Execute( ANY& aEventData, const css::document::DocumentEvent& aTrigg
                 if ( xDisp.is() )
                 {
                     //::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > aArgs(1);
-                    //aArgs[0].Name = rtl::OUString::createFromAscii("Referer");
+                    //aArgs[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
                     //aArs[0].Value <<= ::rtl::OUString( pDoc->GetMedium()->GetName() );
                     //xDisp->dispatch( aURL, aArgs );
 
@@ -539,11 +539,11 @@ void SfxEvents_Impl::BlowUpMacro( const ANY& rEvent, ANY& rRet, SfxObjectShell*
                 aLibrary = String::CreateFromAscii("application");
         }
 
-        aOutProps[1].Name = OUSTRING::createFromAscii( PROP_SCRIPT );
+        aOutProps[1].Name = OUSTRING(RTL_CONSTASCII_USTRINGPARAM( PROP_SCRIPT ));
         aOutProps[1].Value <<= aScript;
-        aOutProps[2].Name = OUSTRING::createFromAscii( PROP_LIBRARY );
+        aOutProps[2].Name = OUSTRING(RTL_CONSTASCII_USTRINGPARAM( PROP_LIBRARY ));
         aOutProps[2].Value <<= aLibrary;
-        aOutProps[3].Name = OUSTRING::createFromAscii( PROP_MACRO_NAME );
+        aOutProps[3].Name = OUSTRING(RTL_CONSTASCII_USTRINGPARAM( PROP_MACRO_NAME ));
         aOutProps[3].Value <<= aMacroName;
         rRet <<= aOutProps;
     }
@@ -597,7 +597,7 @@ css::uno::Any SAL_CALL ModelCollectionEnumeration::nextElement()
     ::osl::ResettableMutexGuard aLock(m_aLock);
     if (m_pEnumerationIt == m_lModels.end())
         throw css::container::NoSuchElementException(
-                    ::rtl::OUString::createFromAscii("End of model enumeration reached."),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("End of model enumeration reached.")),
                     static_cast< css::container::XEnumeration* >(this));
     css::uno::Reference< css::frame::XModel > xModel(*m_pEnumerationIt, UNO_QUERY);
     ++m_pEnumerationIt;
@@ -623,7 +623,7 @@ SfxGlobalEvents_Impl::SfxGlobalEvents_Impl( const com::sun::star::uno::Reference
     pImp                   = new GlobalEventConfig();
     m_xEvents              = pImp;
     m_xJobExecutorListener = css::uno::Reference< css::document::XEventListener >(
-                        xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.task.JobExecutor")),
+                        xSMGR->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.JobExecutor"))),
                         UNO_QUERY);
     m_refCount--;
 }
@@ -746,7 +746,7 @@ void SAL_CALL SfxGlobalEvents_Impl::insert( const css::uno::Any& aElement )
     aElement >>= xDoc;
     if (!xDoc.is())
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii("Cant locate at least the model parameter."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cant locate at least the model parameter.")),
                 static_cast< css::container::XSet* >(this),
                 0);
 
@@ -783,7 +783,7 @@ void SAL_CALL SfxGlobalEvents_Impl::remove( const css::uno::Any& aElement )
     aElement >>= xDoc;
     if (!xDoc.is())
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii("Cant locate at least the model parameter."),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cant locate at least the model parameter.")),
                 static_cast< css::container::XSet* >(this),
                 0);
 
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index 246d90aded1e..390da576c5fd 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -90,7 +90,7 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory(
     util::URL aTargetURL;
     aTargetURL.Complete = aCommandURL;
     uno::Reference < util::XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
-        rtl::OUString::createFromAscii( "com.sun.star.util.URLTransformer" )), uno::UNO_QUERY );
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), uno::UNO_QUERY );
     xTrans->parseStrict( aTargetURL );
 
     SfxObjectShell* pObjShell = NULL;
diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx
index 7dc74d5b0fc8..efad5bdf43fd 100644
--- a/sfx2/source/toolbox/imgmgr.cxx
+++ b/sfx2/source/toolbox/imgmgr.cxx
@@ -66,8 +66,8 @@ public:
     ImageList*                      m_pImageList[IMAGELIST_COUNT];
     SfxModule*                      m_pModule;
 
-    ImageList*              GetImageList( BOOL bBig, BOOL bHiContrast );
-    Image                   GetImage( USHORT nId, BOOL bBig, BOOL bHiContrast );
+    ImageList*              GetImageList( BOOL bBig );
+    Image                   GetImage( USHORT nId, BOOL bBig );
     void                    SetSymbolsSize_Impl( sal_Int16 );
 
     DECL_LINK( OptionsChanged_Impl, void* );
@@ -84,10 +84,6 @@ typedef std::hash_map< sal_Int64, sal_Int64 > SfxImageManagerMap;
 static SfxImageManager_Impl* pGlobalImageManager = 0;
 static SfxImageManagerMap    m_ImageManager_ImplMap;
 static SfxImageManagerMap    m_ImageManagerMap;
-static ImageList*            pImageListSmall=0;
-static ImageList*            pImageListBig=0;
-static ImageList*            pImageListHiSmall=0;
-static ImageList*            pImageListHiBig=0;
 
 static SfxImageManager_Impl* GetImageManager( SfxModule* pModule )
 {
@@ -118,40 +114,32 @@ static SfxImageManager_Impl* GetImageManager( SfxModule* pModule )
 }
 
 // Global image list
-static ImageList* GetImageList( BOOL bBig, BOOL bHiContrast )
+static ImageList* GetImageList( BOOL bBig )
 {
     SolarMutexGuard aGuard;
+    ImageList* rpList = NULL;
 
-    // Has to be changed if we know how the IDs are named!!!
-    ImageList*& rpList = bBig ? ( bHiContrast ? pImageListHiBig : pImageListBig ) :
-                                ( bHiContrast ? pImageListHiSmall : pImageListSmall );
-    if ( !rpList )
-    {
-        ResMgr *pResMgr = SfxApplication::GetOrCreate()->GetOffResManager_Impl();
+    ResMgr *pResMgr = SfxApplication::GetOrCreate()->GetOffResManager_Impl();
 
-        ResId aResId( bBig ? ( bHiContrast ? RID_DEFAULTIMAGELIST_LCH : RID_DEFAULTIMAGELIST_LC ) :
-                             ( bHiContrast ? RID_DEFAULTIMAGELIST_SCH : RID_DEFAULTIMAGELIST_SC ), *pResMgr);
+    ResId aResId( bBig ? ( RID_DEFAULTIMAGELIST_LC ) : ( RID_DEFAULTIMAGELIST_SC ), *pResMgr);
 
-        aResId.SetRT( RSC_IMAGELIST );
+    aResId.SetRT( RSC_IMAGELIST );
 
-        DBG_ASSERT( pResMgr->IsAvailable(aResId), "No default ImageList!" );
+    DBG_ASSERT( pResMgr->IsAvailable(aResId), "No default ImageList!" );
 
-        if ( pResMgr->IsAvailable(aResId) )
-            rpList = new ImageList( aResId );
-        else
-            rpList = new ImageList();
-    }
+    if ( pResMgr->IsAvailable(aResId) )
+        rpList = new ImageList( aResId );
+    else
+        rpList = new ImageList();
 
     return rpList;
 }
 
-static sal_Int16 impl_convertBools( sal_Bool bLarge, sal_Bool bHiContrast )
+static sal_Int16 impl_convertBools( sal_Bool bLarge )
 {
     sal_Int16 nIndex( 0 );
     if ( bLarge  )
         nIndex += 1;
-    if ( bHiContrast )
-        nIndex += 2;
     return nIndex;
 }
 
@@ -181,15 +169,15 @@ SfxImageManager_Impl::~SfxImageManager_Impl()
 
 //-------------------------------------------------------------------------
 
-ImageList* SfxImageManager_Impl::GetImageList( BOOL bBig, BOOL bHiContrast )
+ImageList* SfxImageManager_Impl::GetImageList( BOOL bBig )
 {
-    sal_Int32 nIndex = impl_convertBools( bBig, bHiContrast );
+    sal_Int32 nIndex = impl_convertBools( bBig );
     if ( !m_pImageList[nIndex] )
     {
         if ( !m_pModule )
-            m_pImageList[nIndex] = ::GetImageList( bBig, bHiContrast );
+            m_pImageList[nIndex] = ::GetImageList( bBig );
         else
-            m_pImageList[nIndex] = m_pModule->GetImageList_Impl( bBig, bHiContrast );
+            m_pImageList[nIndex] = m_pModule->GetImageList_Impl( bBig );
     }
 
     return m_pImageList[nIndex];
@@ -197,9 +185,9 @@ ImageList* SfxImageManager_Impl::GetImageList( BOOL bBig, BOOL bHiContrast )
 
 //-------------------------------------------------------------------------
 
-Image SfxImageManager_Impl::GetImage( USHORT nId, BOOL bBig, BOOL bHiContrast )
+Image SfxImageManager_Impl::GetImage( USHORT nId, BOOL bBig )
 {
-    ImageList* pImageList = GetImageList( bBig, bHiContrast );
+    ImageList* pImageList = GetImageList( bBig );
     if ( pImageList )
         return pImageList->GetImage( nId );
     return Image();
@@ -222,14 +210,13 @@ void SfxImageManager_Impl::SetSymbolsSize_Impl( sal_Int16 nNewSymbolsSize )
             if ( pInf->nFlags & SFX_TOOLBOX_CHANGESYMBOLSET )
             {
                 ToolBox *pBox       = pInf->pToolBox;
-                BOOL    bHiContrast = pBox->GetSettings().GetStyleSettings().GetHighContrastMode();
                 USHORT  nCount      = pBox->GetItemCount();
                 for ( USHORT nPos=0; nPos<nCount; nPos++ )
                 {
                     USHORT nId = pBox->GetItemId( nPos );
                     if ( pBox->GetItemType(nPos) == TOOLBOXITEM_BUTTON )
                     {
-                        pBox->SetItemImage( nId, GetImage( nId, bLarge, bHiContrast ) );
+                        pBox->SetItemImage( nId, GetImage( nId, bLarge ) );
                         SfxStateCache *pCache = SfxViewFrame::Current()->GetBindings().GetStateCache( nId );
                         if ( pCache )
                             pCache->SetCachedState();
@@ -308,9 +295,9 @@ SfxImageManager* SfxImageManager::GetImageManager( SfxModule* pModule )
 
 //-------------------------------------------------------------------------
 
-Image SfxImageManager::GetImage( USHORT nId, BOOL bBig, BOOL bHiContrast ) const
+Image SfxImageManager::GetImage( USHORT nId, BOOL bBig ) const
 {
-    ImageList* pImageList = pImp->GetImageList( bBig, bHiContrast );
+    ImageList* pImageList = pImp->GetImageList( bBig );
     if ( pImageList && pImageList->HasImageAtPos( nId ) )
         return pImageList->GetImage( nId );
     return Image();
@@ -318,23 +305,23 @@ Image SfxImageManager::GetImage( USHORT nId, BOOL bBig, BOOL bHiContrast ) const
 
 //-------------------------------------------------------------------------
 
-Image SfxImageManager::GetImage( USHORT nId, BOOL bHiContrast ) const
+Image SfxImageManager::GetImage( USHORT nId ) const
 {
     BOOL bLarge = SvtMiscOptions().AreCurrentSymbolsLarge();
-    return GetImage( nId, bLarge, bHiContrast );
+    return GetImage( nId, bLarge );
 }
 
 //-------------------------------------------------------------------------
 
-Image SfxImageManager::SeekImage( USHORT nId, BOOL bBig, BOOL bHiContrast ) const
+Image SfxImageManager::SeekImage( USHORT nId, BOOL bBig ) const
 {
     sal_Bool bGlobal = ( pImp->m_pModule == 0 );
-    ImageList* pImageList = pImp->GetImageList( bBig, bHiContrast );
+    ImageList* pImageList = pImp->GetImageList( bBig );
     if ( pImageList && pImageList->HasImageAtPos( nId ) )
         return pImageList->GetImage( nId );
     else if ( !bGlobal )
     {
-        pImageList = ::GetImageManager( 0 )->GetImageList( bBig, bHiContrast );
+        pImageList = ::GetImageManager( 0 )->GetImageList( bBig );
         if ( pImageList )
             return pImageList->GetImage( nId );
     }
@@ -343,10 +330,10 @@ Image SfxImageManager::SeekImage( USHORT nId, BOOL bBig, BOOL bHiContrast ) cons
 
 //-------------------------------------------------------------------------
 
-Image SfxImageManager::SeekImage( USHORT nId, BOOL bHiContrast ) const
+Image SfxImageManager::SeekImage( USHORT nId ) const
 {
     BOOL bLarge = SvtMiscOptions().AreCurrentSymbolsLarge();
-    return SeekImage( nId, bLarge, bHiContrast );
+    return SeekImage( nId, bLarge );
 }
 
 //-------------------------------------------------------------------------
@@ -380,16 +367,16 @@ void SfxImageManager::ReleaseToolBox( ToolBox *pBox )
 
 //-------------------------------------------------------------------------
 
-void SfxImageManager::SetImages( ToolBox& rToolBox, BOOL bHiContrast, BOOL bLarge )
+void SfxImageManager::SetImages( ToolBox& rToolBox, BOOL bLarge )
 {
-    SetImagesForceSize( rToolBox, bLarge, bHiContrast );
+    SetImagesForceSize( rToolBox, bLarge );
 }
 
 //-------------------------------------------------------------------------
 
-void SfxImageManager::SetImagesForceSize( ToolBox& rToolBox, BOOL bHiContrast, BOOL bLarge )
+void SfxImageManager::SetImagesForceSize( ToolBox& rToolBox, BOOL bLarge )
 {
-    ImageList* pImageList = pImp->GetImageList( bLarge, bHiContrast );
+    ImageList* pImageList = pImp->GetImageList( bLarge );
 
     USHORT nCount = rToolBox.GetItemCount();
     for (USHORT n=0; n<nCount; n++)
@@ -417,8 +404,7 @@ void SfxImageManager::SetImagesForceSize( ToolBox& rToolBox, BOOL bHiContrast, B
 void SfxImageManager::SetImages( ToolBox& rToolBox )
 {
     BOOL bLarge = ( pImp->m_nSymbolsSize == SFX_SYMBOLS_SIZE_LARGE );
-    BOOL bHiContrast = rToolBox.GetSettings().GetStyleSettings().GetHighContrastMode();
-    SetImagesForceSize( rToolBox, bHiContrast, bLarge );
+    SetImagesForceSize( rToolBox, bLarge );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index c613c5186892..8c799be8c94f 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -153,7 +153,7 @@ svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const Reference< X
 
     URL aTargetURL;
     aTargetURL.Complete = aCommandURL;
-    Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY );
+    Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
     xTrans->parseStrict( aTargetURL );
     if ( aTargetURL.Arguments.getLength() )
         return NULL;
@@ -450,7 +450,7 @@ void SfxToolBoxControl::Dispatch(
         ::com::sun::star::util::URL aTargetURL;
         aTargetURL.Complete = rCommand;
         Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
-                                            rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )),
+                                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))),
                                           UNO_QUERY );
         xTrans->parseStrict( aTargetURL );
 
@@ -483,7 +483,7 @@ void SfxToolBoxControl::Dispatch( const ::rtl::OUString& aCommand, ::com::sun::s
                 ::rtl::OUString sAppName;
                 try
                 {
-                    static ::rtl::OUString our_aModuleManagerName = ::rtl::OUString::createFromAscii("com.sun.star.frame.ModuleManager");
+                    static ::rtl::OUString our_aModuleManagerName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager"));
                     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager =
                         ::comphelper::getProcessServiceFactory();
                     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager > xModuleManager(
@@ -494,7 +494,7 @@ void SfxToolBoxControl::Dispatch( const ::rtl::OUString& aCommand, ::com::sun::s
                     sAppName = xModuleManager->identify(xFrame);
                 } catch(::com::sun::star::uno::Exception&) {}
                 Sequence<PropertyValue> source;
-                ::comphelper::UiEventsLogger::appendDispatchOrigin(source, sAppName, ::rtl::OUString::createFromAscii("SfxToolBoxControl"));
+                ::comphelper::UiEventsLogger::appendDispatchOrigin(source, sAppName, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SfxToolBoxControl")));
                 ::comphelper::UiEventsLogger::logDispatch(aTargetURL, source);
             }
             xDispatch->dispatch( aTargetURL, aArgs );
@@ -1027,7 +1027,7 @@ void SfxToolBoxControl::Select( BOOL /*bMod1*/ )
         ::rtl::OUString sAppName;
         try
         {
-            static ::rtl::OUString our_aModuleManagerName = ::rtl::OUString::createFromAscii("com.sun.star.frame.ModuleManager");
+            static ::rtl::OUString our_aModuleManagerName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager"));
             ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager =
                 ::comphelper::getProcessServiceFactory();
             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager > xModuleManager(
@@ -1036,7 +1036,7 @@ void SfxToolBoxControl::Select( BOOL /*bMod1*/ )
             sAppName = xModuleManager->identify(m_xFrame);
         } catch(::com::sun::star::uno::Exception&) {}
         Sequence<PropertyValue> vSource;
-        ::comphelper::UiEventsLogger::appendDispatchOrigin(vSource, sAppName, ::rtl::OUString::createFromAscii("SfxToolBoxControl"));
+        ::comphelper::UiEventsLogger::appendDispatchOrigin(vSource, sAppName, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SfxToolBoxControl")));
         URL aURL;
         aURL.Complete = m_aCommandURL;
         ::comphelper::UiEventsLogger::logDispatch(aURL, vSource);
@@ -1522,7 +1522,6 @@ SfxAppToolBoxControl_Impl::SfxAppToolBoxControl_Impl( USHORT nSlotId, USHORT nId
     // Determine the current background color of the menus
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
     m_nSymbolsStyle         = rSettings.GetSymbolsStyle();
-    m_bWasHiContrastMode    = rSettings.GetHighContrastMode();
     m_bShowMenuImages       = rSettings.GetUseImagesInMenus();
 
     SetImage( String() );
@@ -1647,11 +1646,10 @@ void SfxAppToolBoxControl_Impl::SetImage( const String &rURL )
         aURL = sFallback;
 
     BOOL bBig = SvtMiscOptions().AreCurrentSymbolsLarge();
-    BOOL bHC = GetToolBox().GetSettings().GetStyleSettings().GetHighContrastMode();
-    Image aImage = SvFileInformationManager::GetImageNoDefault( INetURLObject( aURL ), bBig, bHC );
+    Image aImage = SvFileInformationManager::GetImageNoDefault( INetURLObject( aURL ), bBig );
     if ( !aImage )
         aImage = !!aMenuImage ? aMenuImage :
-            SvFileInformationManager::GetImage( INetURLObject( aURL ), bBig, bHC );
+            SvFileInformationManager::GetImage( INetURLObject( aURL ), bBig );
     Size aBigSize( GetToolBox().GetDefaultImageSize() );
     if ( bBig && aImage.GetSizePixel() != aBigSize )
     {
@@ -1709,7 +1707,7 @@ void SfxAppToolBoxControl_Impl::Select( BOOL bMod1 )
             aTargetURL.Complete = aLastURL;
             getURLTransformer()->parseStrict( aTargetURL );
 
-            ::rtl::OUString aTarget( ::rtl::OUString::createFromAscii( "_default" ));
+            ::rtl::OUString aTarget( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default")));
             if ( pMenu )
             {
                 ::framework::MenuConfiguration::Attributes* pMenuAttributes =
@@ -1725,8 +1723,8 @@ void SfxAppToolBoxControl_Impl::Select( BOOL bMod1 )
             {
                 Sequence< PropertyValue > aArgs( 1 );
 
-                aArgs[0].Name = ::rtl::OUString::createFromAscii( "Referer" );
-                aArgs[0].Value = makeAny( ::rtl::OUString::createFromAscii( SFX_REFERER_USER ));
+                aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
+                aArgs[0].Value = makeAny( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SFX_REFERER_USER )) );
 
                 ExecuteInfo* pExecuteInfo = new ExecuteInfo;
                 pExecuteInfo->xDispatch     = xDispatch;
@@ -1757,7 +1755,7 @@ long Select_Impl( void* /*pHdl*/, void* pVoid )
     URL aTargetURL;
     aTargetURL.Complete = aURL;
     Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
-                                            rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )),
+                                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))),
                                           UNO_QUERY );
     xTrans->parseStrict( aTargetURL );
 
@@ -1769,7 +1767,7 @@ long Select_Impl( void* /*pHdl*/, void* pVoid )
             xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
         else
         {
-            ::rtl::OUString aTargetFrame( ::rtl::OUString::createFromAscii( "_blank" ) );
+            ::rtl::OUString aTargetFrame( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_blank")) );
             ::framework::MenuConfiguration::Attributes* pMenuAttributes =
                 (::framework::MenuConfiguration::Attributes*)pMenu->GetUserValue( pMenu->GetCurItemId() );
 
@@ -1798,15 +1796,12 @@ IMPL_LINK( SfxAppToolBoxControl_Impl, Activate, Menu *, pActMenu )
     {
         const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
         ULONG nSymbolsStyle     = rSettings.GetSymbolsStyle();
-        BOOL bIsHiContrastMode  = rSettings.GetHighContrastMode();
         BOOL bShowMenuImages    = rSettings.GetUseImagesInMenus();
 
         if (( nSymbolsStyle != m_nSymbolsStyle ) ||
-            ( bIsHiContrastMode != m_bWasHiContrastMode ) ||
             ( bShowMenuImages != m_bShowMenuImages ))
         {
             m_nSymbolsStyle      = nSymbolsStyle;
-            m_bWasHiContrastMode = bIsHiContrastMode;
             m_bShowMenuImages    = bShowMenuImages;
 
             USHORT nCount = pActMenu->GetItemCount();
@@ -1828,7 +1823,7 @@ IMPL_LINK( SfxAppToolBoxControl_Impl, Activate, Menu *, pActMenu )
                         if ( aImageId.getLength() > 0 )
                         {
                             Reference< ::com::sun::star::frame::XFrame > xFrame;
-                            Image aImage = GetImage( xFrame, aImageId, FALSE, bIsHiContrastMode );
+                            Image aImage = GetImage( xFrame, aImageId, FALSE );
                             if ( !!aImage )
                             {
                                 bImageSet = sal_True;
@@ -1840,7 +1835,7 @@ IMPL_LINK( SfxAppToolBoxControl_Impl, Activate, Menu *, pActMenu )
                         if ( !bImageSet && aCmd.Len() )
                         {
                             Image aImage = SvFileInformationManager::GetImage(
-                                INetURLObject(aCmd), FALSE, bIsHiContrastMode );
+                                INetURLObject(aCmd), FALSE );
                             if ( !!aImage )
                                 pActMenu->SetItemImage( nId, aImage );
                         }
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index 9794bc8735e0..6c92ff0c0605 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -730,14 +730,14 @@ UNOSEQUENCE< UNOOUSTRING > SfxFrameLoader_Impl::impl_getStaticSupportedServiceNa
 {
     UNOMUTEXGUARD aGuard( UNOMUTEX::getGlobalMutex() );
     UNOSEQUENCE< UNOOUSTRING > seqServiceNames( 1 );
-    seqServiceNames.getArray() [0] = UNOOUSTRING::createFromAscii( "com.sun.star.frame.SynchronousFrameLoader" );
+    seqServiceNames.getArray() [0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.SynchronousFrameLoader" ));
     return seqServiceNames ;
 }
 
 /* Helper for XServiceInfo */
 UNOOUSTRING SfxFrameLoader_Impl::impl_getStaticImplementationName()
 {
-    return UNOOUSTRING::createFromAscii( "com.sun.star.comp.office.FrameLoader" );
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.office.FrameLoader" ));
 }
 
 /* Helper for registry */
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index ce74acaff325..cae590128e23 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -438,7 +438,7 @@ uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL SfxInPlaceCli
     uno::Reference< ::com::sun::star::frame::XLayoutManager > xMan;
     try
     {
-        uno::Any aAny = xFrame->getPropertyValue( ::rtl::OUString::createFromAscii("LayoutManager") );
+        uno::Any aAny = xFrame->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) );
         aAny >>= xMan;
     }
     catch ( uno::Exception& )
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 37da366100a8..ded1e2b2f163 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -438,7 +438,7 @@ void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::queryClosing( const EV
                     pShell->TakeFrameOwnerShip_Impl();
             }
 
-            throw com::sun::star::util::CloseVetoException(::rtl::OUString::createFromAscii("Controller disagree ..."),static_cast< ::cppu::OWeakObject*>(this));
+            throw com::sun::star::util::CloseVetoException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Controller disagree ...")),static_cast< ::cppu::OWeakObject*>(this));
         }
     }
 }
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index cd868c512117..a2c4bbd83868 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -716,7 +716,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
 
                 if (!pInteractionItem)
                 {
-                    Reference < ::com::sun::star::task::XInteractionHandler > xHdl( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.comp.uui.UUIInteractionHandler")), UNO_QUERY );
+                    Reference < ::com::sun::star::task::XInteractionHandler > xHdl( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uui.UUIInteractionHandler"))), UNO_QUERY );
                     if (xHdl.is())
                         pNewSet->Put( SfxUnoAnyItem(SID_INTERACTIONHANDLER,::com::sun::star::uno::makeAny(xHdl)) );
                 }
@@ -2171,7 +2171,7 @@ SfxViewShell* SfxViewFrame::LoadViewIntoFrame_Impl( const SfxObjectShell& i_rDoc
         sURL = i_rDoc.GetFactory().GetFactoryURL();
 
     Reference< XComponentLoader > xLoader( i_rFrame, UNO_QUERY_THROW );
-    xLoader->loadComponentFromURL( sURL, ::rtl::OUString::createFromAscii( "_self" ), 0,
+    xLoader->loadComponentFromURL( sURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")), 0,
         aTransformLoadArgs.getPropertyValues() );
 
     SfxViewShell* pViewShell = SfxViewShell::Get( i_rFrame->getController() );
@@ -2543,16 +2543,16 @@ void SfxViewFrame::ExecView_Impl
 */
 sal_Bool impl_maxOpenDocCountReached()
 {
-    static ::rtl::OUString SERVICE_DESKTOP = ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop");
+    static ::rtl::OUString SERVICE_DESKTOP(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"));
 
     try
     {
         css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
         css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey(
                                 xSMGR,
-                                ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/"),
-                                ::rtl::OUString::createFromAscii("Misc"),
-                                ::rtl::OUString::createFromAscii("MaxOpenDocuments"),
+                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/")),
+                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Misc")),
+                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxOpenDocuments")),
                                 ::comphelper::ConfigurationHelper::E_READONLY);
 
         // NIL means: count of allowed documents = infinite !
@@ -2860,7 +2860,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro )
         String aLocation;
         Reference< XMultiServiceFactory > xSMgr = ::comphelper::getProcessServiceFactory();
         Reference< com::sun::star::uri::XUriReferenceFactory > xFactory( xSMgr->createInstance(
-            ::rtl::OUString::createFromAscii( "com.sun.star.uri.UriReferenceFactory" ) ), UNO_QUERY );
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.UriReferenceFactory")) ), UNO_QUERY );
         if ( xFactory.is() )
         {
             Reference< com::sun::star::uri::XVndSunStarScriptUrl > xUrl( xFactory->parse( aScriptURL ), UNO_QUERY );
@@ -2877,7 +2877,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro )
                     aMacroName = aName.getToken( 0, cTok, nIndex );
 
                 // get location
-                ::rtl::OUString aLocKey = ::rtl::OUString::createFromAscii( "location" );
+                ::rtl::OUString aLocKey(RTL_CONSTASCII_USTRINGPARAM("location"));
                 if ( xUrl->hasParameter( aLocKey ) )
                     aLocation = xUrl->getParameter( aLocKey );
             }
@@ -3042,7 +3042,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
         case SID_RECORDMACRO :
         {
             // try to find any active recorder on this frame
-            ::rtl::OUString sProperty = rtl::OUString::createFromAscii("DispatchRecorderSupplier");
+            ::rtl::OUString sProperty(RTL_CONSTASCII_USTRINGPARAM("DispatchRecorderSupplier"));
             com::sun::star::uno::Reference< com::sun::star::frame::XFrame > xFrame(
                     GetFrame().GetFrameInterface(),
                     com::sun::star::uno::UNO_QUERY);
@@ -3087,11 +3087,11 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
                         com::sun::star::uno::UNO_QUERY);
 
                 xRecorder = com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder >(
-                        xFactory->createInstance(rtl::OUString::createFromAscii("com.sun.star.frame.DispatchRecorder")),
+                        xFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.DispatchRecorder"))),
                         com::sun::star::uno::UNO_QUERY);
 
                 xSupplier = com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorderSupplier >(
-                        xFactory->createInstance(rtl::OUString::createFromAscii("com.sun.star.frame.DispatchRecorderSupplier")),
+                        xFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.DispatchRecorderSupplier"))),
                         com::sun::star::uno::UNO_QUERY);
 
                 xSupplier->setDispatchRecorder(xRecorder);
@@ -3252,7 +3252,7 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
                         break;
                     }
 
-                    ::rtl::OUString sProperty = rtl::OUString::createFromAscii("DispatchRecorderSupplier");
+                    ::rtl::OUString sProperty(RTL_CONSTASCII_USTRINGPARAM("DispatchRecorderSupplier"));
                     com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xSet(
                             GetFrame().GetFrameInterface(),
                             com::sun::star::uno::UNO_QUERY);
@@ -3277,7 +3277,7 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
                         break;
                     }
 
-                    ::rtl::OUString sProperty = rtl::OUString::createFromAscii("DispatchRecorderSupplier");
+                    ::rtl::OUString sProperty(RTL_CONSTASCII_USTRINGPARAM("DispatchRecorderSupplier"));
                     com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xSet(
                             GetFrame().GetFrameInterface(),
                             com::sun::star::uno::UNO_QUERY);
@@ -3383,20 +3383,20 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
         else
         {
             ::com::sun::star::util::URL aTargetURL;
-            aTargetURL.Complete = ::rtl::OUString::createFromAscii(".component:DB/DataSourceBrowser");
-            Reference < ::com::sun::star::util::XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY );
+            aTargetURL.Complete = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".component:DB/DataSourceBrowser"));
+            Reference < ::com::sun::star::util::XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
             xTrans->parseStrict( aTargetURL );
 
             Reference < XDispatchProvider > xProv( xFrame, UNO_QUERY );
             Reference < ::com::sun::star::frame::XDispatch > xDisp;
             if ( xProv.is() )
-                xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString::createFromAscii("_beamer"), 31 );
+                xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_beamer")), 31 );
             if ( xDisp.is() )
             {
                 Sequence < ::com::sun::star::beans::PropertyValue > aArgs(1);
                 ::com::sun::star::beans::PropertyValue* pArg = aArgs.getArray();
-                pArg[0].Name = rtl::OUString::createFromAscii("Referer");
-                pArg[0].Value <<= ::rtl::OUString::createFromAscii("private:user");
+                pArg[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
+                pArg[0].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:user"));
                 xDisp->dispatch( aTargetURL, aArgs );
             }
         }
diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index e8386796fc8e..db4dc9a549c8 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -77,7 +77,7 @@ using ::com::sun::star::lang::XComponent;
 
 static ::rtl::OUString GetModuleName_Impl( const ::rtl::OUString& sDocService )
 {
-    uno::Reference< container::XNameAccess > xMM( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.ModuleManager")), uno::UNO_QUERY );
+    uno::Reference< container::XNameAccess > xMM( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager"))), uno::UNO_QUERY );
     ::rtl::OUString sVar;
     if ( !xMM.is() )
         return sVar;
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 292f28c0c77c..c52260af143a 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -750,19 +750,19 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
                 for ( sal_Int32 nProp=0; nProp<aProps.getLength(); nProp++ )
                 {
                     if ( aProps[nProp].Name.equalsAscii("Copies") )
-                        aProps[nProp]. Name = rtl::OUString::createFromAscii("CopyCount");
+                        aProps[nProp]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CopyCount"));
                     else if ( aProps[nProp].Name.equalsAscii("RangeText") )
-                        aProps[nProp]. Name = rtl::OUString::createFromAscii("Pages");
+                        aProps[nProp]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Pages"));
                     if ( aProps[nProp].Name.equalsAscii("Asynchron") )
                     {
-                        aProps[nProp]. Name = rtl::OUString::createFromAscii("Wait");
+                        aProps[nProp]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wait"));
                         sal_Bool bAsynchron = sal_False;
                         aProps[nProp].Value >>= bAsynchron;
                         aProps[nProp].Value <<= (sal_Bool) (!bAsynchron);
                     }
                     if ( aProps[nProp].Name.equalsAscii("Silent") )
                     {
-                        aProps[nProp]. Name = rtl::OUString::createFromAscii("MonitorVisible");
+                        aProps[nProp]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MonitorVisible"));
                         sal_Bool bPrintSilent = sal_False;
                         aProps[nProp].Value >>= bPrintSilent;
                         aProps[nProp].Value <<= (sal_Bool) (!bPrintSilent);
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 3f6499d629ea..02edb37cea44 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -277,11 +277,11 @@ static ::rtl::OUString impl_retrieveFilterNameFromTypeAndModule(
     {
         ::comphelper::SequenceAsHashMap aFilterPropsHM( xEnumeration->nextElement() );
         ::rtl::OUString aFilterName = aFilterPropsHM.getUnpackedValueOrDefault(
-                                    ::rtl::OUString::createFromAscii( "Name" ),
+                                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")),
                                     ::rtl::OUString() );
 
         sal_Int32 nFilterFlags = aFilterPropsHM.getUnpackedValueOrDefault(
-                                    ::rtl::OUString::createFromAscii( "Flags" ),
+                                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")),
                                     sal_Int32( 0 ) );
 
         if ( nFilterFlags & nFlags )
@@ -307,7 +307,7 @@ enum ETypeFamily
 ::rtl::OUString impl_searchFormatTypeForApp(const css::uno::Reference< css::frame::XFrame >& xFrame     ,
                                                   ETypeFamily                                eTypeFamily)
 {
-    static ::rtl::OUString SERVICENAME_MODULEMANAGER = ::rtl::OUString::createFromAscii("com.sun.star.frame.ModuleManager");
+    static ::rtl::OUString SERVICENAME_MODULEMANAGER(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager"));
 
     try
     {
@@ -639,7 +639,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
                 }
 
                 ::com::sun::star::uno::Reference< XSystemShellExecute > xSystemShellExecute( xSMGR->createInstance(
-                    ::rtl::OUString::createFromAscii( "com.sun.star.system.SystemShellExecute" )),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SystemShellExecute"))),
                     css::uno::UNO_QUERY );
 
                 BOOL bRet( TRUE );
diff --git a/shell/qa/recent_docs.cxx b/shell/qa/recent_docs.cxx
index b5121406a318..db4e56a64ab2 100644
--- a/shell/qa/recent_docs.cxx
+++ b/shell/qa/recent_docs.cxx
@@ -46,11 +46,11 @@ using namespace rtl;
 namespace syssh = SystemShell;
 
 //########################################
-const OUString SXW_MIME_TYPE = OUString::createFromAscii("application/vnd.sun.xml.writer");
-const OUString SXC_MIME_TYPE = OUString::createFromAscii("application/vnd.sun.xml.calc");
-const OUString SXI_MIME_TYPE = OUString::createFromAscii("application/vnd.sun.xml.impress");
-const OUString SXD_MIME_TYPE = OUString::createFromAscii("application/vnd.sun.xml.draw");
-const OUString SXM_MIME_TYPE = OUString::createFromAscii("application/vnd.sun.xml.math");
+const OUString SXW_MIME_TYPE(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.xml.writer"));
+const OUString SXC_MIME_TYPE(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.xml.calc"));
+const OUString SXI_MIME_TYPE(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.xml.impress"));
+const OUString SXD_MIME_TYPE(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.xml.draw"));
+const OUString SXM_MIME_TYPE(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.xml.math"));
 
 class Test_AddToRecentDocs : public CppUnit::TestFixture
 {
@@ -66,19 +66,19 @@ public:
         system("rm $HOME/.recently-used");
         system("echo '<?xml version=\"1.0\"?>\n<RecentFiles>\n<RecentItem>\n<URI>file:///home/federico/gedit.txt</URI>\n<Mime-Type>text/plain</Mime-Type>\n<Timestamp>1046485966</Timestamp>\n<Groups>\n<Group>gedit</Group>\n</Groups>\n</RecentItem>\n</RecentFiles>' > $HOME/.recently-used");
 
-        rtl::OUString url = rtl::OUString::createFromAscii("file:///home_athene/test.sxw");
+        rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxw"));
         syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE);
 
-        url = rtl::OUString::createFromAscii("file:///home_athene/test.sxc");
+        url = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxc"));
         syssh::AddToRecentDocumentList(url, SXC_MIME_TYPE);
 
-        url = rtl::OUString::createFromAscii("file:///home_athene/test.sxi");
+        url = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxi"));
         syssh::AddToRecentDocumentList(url, SXI_MIME_TYPE);
 
-        url = rtl::OUString::createFromAscii("file:///home_athene/test.sxd");
+        url = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxd"));
         syssh::AddToRecentDocumentList(url, SXD_MIME_TYPE);
 
-        url = rtl::OUString::createFromAscii("file:///home_athene/test.sxm");
+        url = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxm"));
         syssh::AddToRecentDocumentList(url, SXM_MIME_TYPE);
     }
 
@@ -88,7 +88,7 @@ public:
         system("rm $HOME/.recently-used");
         system("echo '<?xml version=\"1.0\"?>\n<RecentFiles>\n<RecentItem>\n<URI>file:///home/federico/gedit.txt</URI>\n<Mime-Type>text/plain</Mime-Type>\n<Timestamp>1046485966</Timestamp>\n<Groups>\n<Group>gedit</Group>\n</Groups>\n<RecentItem>\n<URI>file:///home/federico/gedit2.txt</URI>\n<Mime-Type>text/plain</Mime-Type>\n<Timestamp>1046485966</Timestamp>\n<Groups>\n<Group>gedit</Group>\n</Groups>\n</RecentItem>\n</RecentFiles>' > $HOME/.recently-used");
 
-        rtl::OUString url = rtl::OUString::createFromAscii("file:///home_athene/test.sxw");
+        rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxw"));
         syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE);
     }
 
@@ -97,19 +97,19 @@ public:
     {
         int ret = system("rm $HOME/.recently-used");
 
-        rtl::OUString url = rtl::OUString::createFromAscii("file:///home_athene/test.sxw");
+        rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxw"));
         syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE);
 
-        url = rtl::OUString::createFromAscii("file:///home_athene/test.sxc");
+        url = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxc"));
         syssh::AddToRecentDocumentList(url, SXC_MIME_TYPE);
 
-        url = rtl::OUString::createFromAscii("file:///home_athene/test.sxi");
+        url = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxi"));
         syssh::AddToRecentDocumentList(url, SXI_MIME_TYPE);
 
-        url = rtl::OUString::createFromAscii("file:///home_athene/test.sxd");
+        url = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxd"));
         syssh::AddToRecentDocumentList(url, SXD_MIME_TYPE);
 
-        url = rtl::OUString::createFromAscii("file:///home_athene/test.sxm");
+        url = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxm"));
         syssh::AddToRecentDocumentList(url, SXM_MIME_TYPE);
 
         ret = system("ls $HOME/.recently-used");
@@ -127,9 +127,9 @@ public:
 
         if ((recently_used_url.getLength() > 0) &&
             ('/' != recently_used_url.pData->buffer[recently_used_url.getLength() - 1]))
-            recently_used_url += rtl::OUString::createFromAscii("/");
+            recently_used_url += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
-        recently_used_url += rtl::OUString::createFromAscii(".recently-used");
+        recently_used_url += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".recently-used"));
         return recently_used_url;
     }
 
@@ -159,7 +159,7 @@ public:
         memset(cnt_before, 0, sizeof(cnt_before));
         read_recently_used(cnt_before, sizeof(cnt_before));
 
-        OUString url = OUString::createFromAscii("file:///home_athene/test.sxw");
+        OUString url(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxw"));
         syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE);
 
         char cnt_after[128];
@@ -178,7 +178,7 @@ public:
         sprintf(cmd, "echo '%s' > $HOME/.recently-used", xml_unknown);
         system(cmd);
 
-        OUString url = OUString::createFromAscii("file:///home_athene/test.sxw");
+        OUString url(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxw"));
         syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE);
 
         char buffer[256];
@@ -194,7 +194,7 @@ public:
         system("rm $HOME/.recently-used");
         system("touch $HOME/.recently-used");
 
-        OUString url = OUString::createFromAscii("file:///home_athene/test.sxw");
+        OUString url(RTL_CONSTASCII_USTRINGPARAM("file:///home_athene/test.sxw"));
         syssh::AddToRecentDocumentList(url, SXW_MIME_TYPE);
 
         char buffer[256];
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx
index 1db95aaff87a..7cecb89aae0f 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -76,8 +76,8 @@ GConfClient* getGconfClient()
         mClient = gconf_client_get_default();
         if (!mClient)
         {
-            throw uno::RuntimeException(rtl::OUString::createFromAscii
-                ("GconfBackend:GconfLayer: Cannot Initialize Gconf connection"),NULL);
+            throw uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
+                ("GconfBackend:GconfLayer: Cannot Initialize Gconf connection")),NULL);
         }
 
         static const char * const PreloadValuesList[] =
@@ -117,7 +117,7 @@ static OUString xdg_user_dir_lookup (const char *type)
 
     if (!aSecurity.getHomeDir( aHomeDirURL ) )
     {
-    osl::FileBase::getFileURLFromSystemPath(rtl::OUString::createFromAscii("/tmp"), aDocumentsDirURL);
+    osl::FileBase::getFileURLFromSystemPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/tmp")), aDocumentsDirURL);
     return aDocumentsDirURL;
     }
 
@@ -125,12 +125,12 @@ static OUString xdg_user_dir_lookup (const char *type)
     if (config_home == NULL || config_home[0] == 0)
     {
     aConfigFileURL = OUString(aHomeDirURL);
-    aConfigFileURL += OUString::createFromAscii( "/.config/user-dirs.dirs" );
+    aConfigFileURL += OUString(RTL_CONSTASCII_USTRINGPARAM("/.config/user-dirs.dirs"));
     }
     else
     {
     aConfigFileURL = OUString::createFromAscii(config_home);
-    aConfigFileURL += OUString::createFromAscii( "/user-dirs.dirs" );
+    aConfigFileURL += OUString(RTL_CONSTASCII_USTRINGPARAM("/user-dirs.dirs"));
     }
 
     if(osl_File_E_None == osl_openFile(aConfigFileURL.pData, &handle, osl_File_OpenFlag_Read))
@@ -281,9 +281,9 @@ uno::Any translateToOOo( const ConfigurationValue aValue, GConfValue *aGconfValu
             uno::Any aOriginalValue = makeAnyOfGconfValue( aGconfValue );
             aOriginalValue >>= aProxyMode;
 
-            if( aProxyMode.equals( rtl::OUString::createFromAscii( "manual" ) ) )
+            if( aProxyMode.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("manual")) ) )
                 return uno::makeAny( (sal_Int32) 1 );
-            else if( aProxyMode.equals( rtl::OUString::createFromAscii( "none" ) ) )
+            else if( aProxyMode.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("none")) ) )
                 return uno::makeAny( (sal_Int32) 0 );
         }
             break;
@@ -322,7 +322,7 @@ uno::Any translateToOOo( const ConfigurationValue aValue, GConfValue *aGconfValu
         case SETTING_FONT_ANTI_ALIASING_MIN_PIXEL:
         case SETTING_SYMBOL_SET:
         {
-            sal_Int32 nShortValue;
+            sal_Int32 nShortValue(0);
             uno::Any aOriginalValue = makeAnyOfGconfValue( aGconfValue );
             aOriginalValue >>= nShortValue;
             return uno::makeAny( (sal_Int16) nShortValue );
@@ -442,7 +442,7 @@ sal_Bool SAL_CALL isDependencySatisfied( GConfClient* aClient, const Configurati
                 g_get_real_name(), osl_getThreadTextEncoding() ) );
             if( !aCompleteName.equalsAscii( "Unknown" ) )
             {
-                if( aCompleteName.trim().indexOf(rtl::OUString::createFromAscii(" "), 0) != -1 )
+                if( aCompleteName.trim().indexOf(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")), 0) != -1 )
                     return sal_True;
             }
         }
diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx
index 808aab8d1440..ba8e4ff66ac9 100644
--- a/shell/source/backends/localebe/localebackend.cxx
+++ b/shell/source/backends/localebe/localebackend.cxx
@@ -321,7 +321,7 @@ css::uno::Any LocaleBackend::getPropertyValue(
 //------------------------------------------------------------------------------
 
 rtl::OUString SAL_CALL LocaleBackend::getBackendName(void) {
-    return rtl::OUString::createFromAscii("com.sun.star.comp.configuration.backend.LocaleBackend") ;
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.configuration.backend.LocaleBackend")) ;
 }
 
 //------------------------------------------------------------------------------
diff --git a/shell/source/backends/macbe/macbackend.cxx b/shell/source/backends/macbe/macbackend.cxx
index 5814806be1ff..fee3e696a04c 100644
--- a/shell/source/backends/macbe/macbackend.cxx
+++ b/shell/source/backends/macbe/macbackend.cxx
@@ -428,7 +428,7 @@ css::uno::Any MacOSXBackend::getPropertyValue(
                 CFStringRef rException = (CFStringRef) CFArrayGetValueAtIndex(rExceptionsList, idx);
 
                 if (idx>0)
-                    aProxyBypassList += rtl::OUString::createFromAscii( ";" );
+                    aProxyBypassList += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
 
                 aProxyBypassList += CFStringToOUString(rException);
             }
@@ -456,7 +456,7 @@ css::uno::Any MacOSXBackend::getPropertyValue(
 
 rtl::OUString SAL_CALL MacOSXBackend::getBackendName(void)
 {
-    return rtl::OUString::createFromAscii("com.sun.star.comp.configuration.backend.MacOSXBackend");
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.configuration.backend.MacOSXBackend"));
 }
 
 //------------------------------------------------------------------------------
diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx
index 4601e71a6b0b..fe9a37459157 100644
--- a/shell/source/backends/wininetbe/wininetbackend.cxx
+++ b/shell/source/backends/wininetbe/wininetbackend.cxx
@@ -360,7 +360,7 @@ css::uno::Any WinInetBackend::getPropertyValue(
 //------------------------------------------------------------------------------
 
 rtl::OUString SAL_CALL WinInetBackend::getBackendName(void) {
-    return rtl::OUString::createFromAscii("com.sun.star.comp.configuration.backend.WinInetBackend") ;
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.configuration.backend.WinInetBackend")) ;
 }
 
 //------------------------------------------------------------------------------
diff --git a/shell/source/cmdmail/cmdmailmsg.cxx b/shell/source/cmdmail/cmdmailmsg.cxx
index c51e2f469042..6b0a37d31c21 100644
--- a/shell/source/cmdmail/cmdmailmsg.cxx
+++ b/shell/source/cmdmail/cmdmailmsg.cxx
@@ -213,7 +213,7 @@ Any SAL_CALL CmdMailMsg::getByName( const OUString& aName )
     else if( 0 == aName.compareToAscii( "attachment" ) &&  m_Attachments.getLength() )
         return makeAny( m_Attachments );
 
-   throw NoSuchElementException( OUString::createFromAscii( "key not found: ") + aName,
+   throw NoSuchElementException( OUString(RTL_CONSTASCII_USTRINGPARAM("key not found: ")) + aName,
         static_cast < XNameAccess * > (this) );
 }
 
@@ -230,22 +230,22 @@ Sequence< OUString > SAL_CALL CmdMailMsg::getElementNames(  )
     Sequence< OUString > aRet( 6 );
 
     if( m_aOriginator.getLength() )
-        aRet[nItems++] = OUString::createFromAscii( "from" );
+        aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM("from"));
 
     if( m_aRecipient.getLength() )
-        aRet[nItems++] = OUString::createFromAscii( "to" );
+        aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM("to"));
 
     if( m_CcRecipients.getLength() )
-        aRet[nItems++] = OUString::createFromAscii( "cc" );
+        aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM("cc"));
 
     if( m_BccRecipients.getLength() )
-        aRet[nItems++] = OUString::createFromAscii( "bcc" );
+        aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM("bcc"));
 
     if( m_aSubject.getLength() )
-        aRet[nItems++] = OUString::createFromAscii( "subject" );
+        aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM("subject"));
 
     if( m_Attachments.getLength() )
-        aRet[nItems++] = OUString::createFromAscii( "attachment" );
+        aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM("attachment"));
 
     aRet.realloc( nItems );
     return aRet;
diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx
index ce6ff20c119b..7b1b1c1b2b8b 100644
--- a/shell/source/cmdmail/cmdmailsuppl.cxx
+++ b/shell/source/cmdmail/cmdmailsuppl.cxx
@@ -88,7 +88,7 @@ namespace // private
     Sequence< OUString > SAL_CALL Component_getSupportedServiceNames()
     {
         Sequence< OUString > aRet(1);
-        aRet[0] = OUString::createFromAscii("com.sun.star.system.SimpleCommandMail");
+        aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SimpleCommandMail"));
         return aRet;
     }
 
@@ -106,7 +106,7 @@ CmdMailSuppl::CmdMailSuppl( const Reference< XComponentContext >& xContext ) :
     if ( xServiceManager.is() ) {
         m_xConfigurationProvider = Reference< XMultiServiceFactory > (
             xServiceManager->createInstanceWithContext(
-                OUString::createFromAscii( "com.sun.star.configuration.ConfigurationProvider" ), xContext ),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider")), xContext ),
             UNO_QUERY );
     }
 }
@@ -178,7 +178,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM
             RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office.Common/ExternalMailer" ) );
 
         PropertyValue aProperty;
-        aProperty.Name = OUString::createFromAscii( "nodepath" );
+        aProperty.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath"));
         aProperty.Value = makeAny( aConfigRoot );
 
         Sequence< Any > aArgumentList( 1 );
@@ -187,7 +187,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM
         Reference< XNameAccess > xNameAccess =
             Reference< XNameAccess > (
                 m_xConfigurationProvider->createInstanceWithArguments(
-                    OUString::createFromAscii( "com.sun.star.configuration.ConfigurationAccess" ),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")),
                     aArgumentList ),
                 UNO_QUERY );
 
@@ -197,7 +197,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM
 
             // Retrieve the value for "Program" node and append it feed senddoc with it
             // using the (undocumented) --mailclient switch
-            xNameAccess->getByName( OUString::createFromAscii( "Program" ) ) >>= aMailer;
+            xNameAccess->getByName( OUString(RTL_CONSTASCII_USTRINGPARAM("Program")) ) >>= aMailer;
 
             if( aMailer.getLength() )
             {
@@ -298,7 +298,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM
 OUString SAL_CALL CmdMailSuppl::getImplementationName(  )
     throw( RuntimeException )
 {
-    return OUString::createFromAscii( COMP_IMPL_NAME );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( COMP_IMPL_NAME ));
 }
 
 // -------------------------------------------------
diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx
index 1d52eab31618..8d9152ae0c40 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -81,7 +81,7 @@ namespace // private
     Sequence< OUString > SAL_CALL ShellExec_getSupportedServiceNames()
     {
         Sequence< OUString > aRet(1);
-        aRet[0] = OUString::createFromAscii("com.sun.star.sys.shell.SystemShellExecute");
+        aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sys.shell.SystemShellExecute"));
         return aRet;
     }
 }
@@ -299,7 +299,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
 OUString SAL_CALL ShellExec::getImplementationName(  )
     throw( RuntimeException )
 {
-    return OUString::createFromAscii( SHELLEXEC_IMPL_NAME );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( SHELLEXEC_IMPL_NAME ));
 }
 
 // -------------------------------------------------
diff --git a/shell/source/unix/misc/gnome-open-url.c b/shell/source/unix/misc/gnome-open-url.c
index 864af14a265b..b914cfcb7b5c 100644
--- a/shell/source/unix/misc/gnome-open-url.c
+++ b/shell/source/unix/misc/gnome-open-url.c
@@ -110,6 +110,7 @@ int main(int argc, char *argv[] )
     GError *error = NULL;
     char *fallback;
     char *index;
+    int retcode = -1;
 
     if( argc != 2 )
     {
@@ -137,12 +138,11 @@ int main(int argc, char *argv[] )
         args[0] = fallback;
         args[1] = argv[1];
         args[2] = NULL;
-        return execv(fallback, args);
+        retcode = execv(fallback, args);
     }
+    free(fallback);
 
-    return -1;
+    return retcode;
 }
 
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/unix/sysshell/recently_used_file.cxx b/shell/source/unix/sysshell/recently_used_file.cxx
index 6e20aaa23f92..3f6f7b4d398a 100644
--- a/shell/source/unix/sysshell/recently_used_file.cxx
+++ b/shell/source/unix/sysshell/recently_used_file.cxx
@@ -44,8 +44,8 @@
 
 #include <unistd.h>
 
-const rtl::OUString RECENTLY_USED_FILE_NAME = rtl::OUString::createFromAscii(".recently-used");
-const rtl::OUString SLASH = rtl::OUString::createFromAscii("/");
+const rtl::OUString RECENTLY_USED_FILE_NAME(RTL_CONSTASCII_USTRINGPARAM(".recently-used"));
+const rtl::OUString SLASH(RTL_CONSTASCII_USTRINGPARAM("/"));
 
 namespace /* private */ {
 
diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx
index a90eca8c4cb1..1ef8c621dd3b 100644
--- a/shell/source/unix/sysshell/recently_used_file_handler.cxx
+++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx
@@ -396,8 +396,8 @@ namespace /* private */ {
             uri_(uri)
         {}
 
-        bool operator() (const recently_used_item* item)
-        { return (item->uri_ == uri_); }
+        bool operator() (const recently_used_item* item) const
+            { return (item->uri_ == uri_); }
     private:
         string_t uri_;
     };
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index bf430b2e6497..46ca21240d57 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -84,7 +84,7 @@ namespace // private
     Sequence< OUString > SAL_CALL SysShExec_getSupportedServiceNames()
     {
         Sequence< OUString > aRet(1);
-        aRet[0] = OUString::createFromAscii("com.sun.star.sys.shell.SystemShellExecute");
+        aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sys.shell.SystemShellExecute"));
         return aRet;
     }
 
@@ -202,8 +202,8 @@ namespace // private
     // trying to identify a jump mark
     //-----------------------------------------
 
-    const OUString    JUMP_MARK_HTM  = OUString::createFromAscii(".htm#");
-    const OUString    JUMP_MARK_HTML = OUString::createFromAscii(".html#");
+    const OUString    JUMP_MARK_HTM(RTL_CONSTASCII_USTRINGPARAM(".htm#"));
+    const OUString    JUMP_MARK_HTML(RTL_CONSTASCII_USTRINGPARAM(".html#"));
     const sal_Unicode HASH_MARK      = (sal_Unicode)'#';
 
     bool has_jump_mark(const OUString& system_path, sal_Int32* jmp_mark_start = NULL)
@@ -288,13 +288,13 @@ void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aPa
     // parameter checking
     if (0 == aCommand.getLength())
         throw IllegalArgumentException(
-            OUString::createFromAscii( "Empty command" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command")),
             static_cast< XSystemShellExecute* >( this ),
             1 );
 
     if (!(nFlags >= DEFAULTS && nFlags <= NO_SYSTEM_ERROR_MESSAGE))
         throw IllegalArgumentException(
-            OUString::createFromAscii( "Invalid Flags specified" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid Flags specified")),
             static_cast< XSystemShellExecute* >( this ),
             3 );
 
@@ -344,7 +344,7 @@ void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aPa
             psxErr = MapError(psxErr);
 
         throw SystemShellExecuteException(
-            OUString::createFromAscii("Error executing command"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("Error executing command")),
             static_cast< XSystemShellExecute* >(this),
             psxErr);
     }
@@ -357,7 +357,7 @@ void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aPa
 OUString SAL_CALL CSysShExec::getImplementationName(  )
     throw( RuntimeException )
 {
-    return OUString::createFromAscii( SYSSHEXEC_IMPL_NAME );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( SYSSHEXEC_IMPL_NAME ));
 }
 
 // -------------------------------------------------
diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx
index c96a1ea7dfdb..848201c604f2 100644
--- a/shell/source/win32/SysShentry.cxx
+++ b/shell/source/win32/SysShentry.cxx
@@ -100,7 +100,7 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr
         {
             Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );
             pXNewKey->createKey(
-                OUString::createFromAscii( SYSSHEXEC_REGKEY_NAME ) );
+                OUString(RTL_CONSTASCII_USTRINGPARAM( SYSSHEXEC_REGKEY_NAME )) );
         }
         catch( InvalidRegistryException& )
         {
@@ -124,7 +124,7 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* p
     if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, SYSSHEXEC_IMPL_NAME ) ) )
     {
         Sequence< OUString > aSNS( 1 );
-        aSNS.getArray( )[0] = OUString::createFromAscii( SYSSHEXEC_SERVICE_NAME );
+        aSNS.getArray( )[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SYSSHEXEC_SERVICE_NAME ));
 
         Reference< XSingleServiceFactory > xFactory ( createOneInstanceFactory(
             reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
diff --git a/shell/source/win32/simplemail/smplmailclient.cxx b/shell/source/win32/simplemail/smplmailclient.cxx
index 6ca98590ddee..e47a767c0aeb 100644
--- a/shell/source/win32/simplemail/smplmailclient.cxx
+++ b/shell/source/win32/simplemail/smplmailclient.cxx
@@ -63,15 +63,15 @@ using css::system::SimpleMailClientFlags::NO_LOGON_DIALOG;
 typedef std::vector<rtl::OUString> StringList_t;
 typedef StringList_t::const_iterator StringListIterator_t;
 
-const rtl::OUString TO = rtl::OUString::createFromAscii("--to");
-const rtl::OUString CC = rtl::OUString::createFromAscii("--cc");
-const rtl::OUString BCC = rtl::OUString::createFromAscii("--bcc");
-const rtl::OUString FROM = rtl::OUString::createFromAscii("--from");
-const rtl::OUString SUBJECT = rtl::OUString::createFromAscii("--subject");
-const rtl::OUString BODY = rtl::OUString::createFromAscii("--body");
-const rtl::OUString ATTACH = rtl::OUString::createFromAscii("--attach");
-const rtl::OUString FLAG_MAPI_DIALOG = rtl::OUString::createFromAscii("--mapi-dialog");
-const rtl::OUString FLAG_MAPI_LOGON_UI = rtl::OUString::createFromAscii("--mapi-logon-ui");
+const rtl::OUString TO(RTL_CONSTASCII_USTRINGPARAM("--to"));
+const rtl::OUString CC(RTL_CONSTASCII_USTRINGPARAM("--cc"));
+const rtl::OUString BCC(RTL_CONSTASCII_USTRINGPARAM("--bcc"));
+const rtl::OUString FROM(RTL_CONSTASCII_USTRINGPARAM("--from"));
+const rtl::OUString SUBJECT(RTL_CONSTASCII_USTRINGPARAM("--subject"));
+const rtl::OUString BODY(RTL_CONSTASCII_USTRINGPARAM("--body"));
+const rtl::OUString ATTACH(RTL_CONSTASCII_USTRINGPARAM("--attach"));
+const rtl::OUString FLAG_MAPI_DIALOG(RTL_CONSTASCII_USTRINGPARAM("--mapi-dialog"));
+const rtl::OUString FLAG_MAPI_LOGON_UI(RTL_CONSTASCII_USTRINGPARAM("--mapi-logon-ui"));
 
 namespace /* private */
 {
@@ -232,7 +232,7 @@ void CSmplMailClient::assembleCommandLine(
         osl::FileBase::RC err = osl::FileBase::getSystemPathFromFileURL(attachments[i], sysPath);
         if (err != osl::FileBase::E_None)
             throw IllegalArgumentException(
-                rtl::OUString::createFromAscii("Invalid attachment file URL"),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid attachment file URL")),
                 static_cast<XSimpleMailClient*>(this),
                 1);
 
@@ -258,7 +258,7 @@ void SAL_CALL CSmplMailClient::sendSimpleMailMessage(
 
     if (!executeSenddoc(senddocParams))
         throw Exception(
-            rtl::OUString::createFromAscii("Send email failed"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Send email failed")),
             static_cast<XSimpleMailClient*>(this));
 }
 
@@ -267,7 +267,7 @@ void CSmplMailClient::validateParameter(
 {
     if (!xSimpleMailMessage.is())
         throw IllegalArgumentException(
-            rtl::OUString::createFromAscii("Empty mail message reference"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty mail message reference")),
             static_cast<XSimpleMailClient*>(this),
             1);
 
@@ -277,14 +277,14 @@ void CSmplMailClient::validateParameter(
     // check the flags, the allowed range is 0 - (2^n - 1)
     if (aFlag < 0 || aFlag > 3)
         throw IllegalArgumentException(
-            rtl::OUString::createFromAscii("Invalid flag value"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid flag value")),
             static_cast<XSimpleMailClient*>(this),
             2);
 
     // check if a recipient is specified of the flags NO_USER_INTERFACE is specified
     if ((aFlag & NO_USER_INTERFACE) && !xSimpleMailMessage->getRecipient().getLength())
         throw IllegalArgumentException(
-            rtl::OUString::createFromAscii("No recipient specified"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No recipient specified")),
             static_cast<XSimpleMailClient*>(this),
             1);
 }
diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx
index 7ed4380b8116..2c6c571eb92f 100644
--- a/shell/source/win32/simplemail/smplmailentry.cxx
+++ b/shell/source/win32/simplemail/smplmailentry.cxx
@@ -100,7 +100,7 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr
         {
             Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );
             pXNewKey->createKey(
-                OUString::createFromAscii( COMP_REGKEY_NAME ) );
+                OUString(RTL_CONSTASCII_USTRINGPARAM( COMP_REGKEY_NAME )) );
         }
         catch( InvalidRegistryException& )
         {
@@ -124,7 +124,7 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* p
     if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, COMP_IMPL_NAME ) ) )
     {
         Sequence< OUString > aSNS( 1 );
-        aSNS.getArray( )[0] = OUString::createFromAscii( COMP_SERVICE_NAME );
+        aSNS.getArray( )[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( COMP_SERVICE_NAME ));
 
         Reference< XSingleServiceFactory > xFactory ( createOneInstanceFactory(
             reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
diff --git a/shell/source/win32/simplemail/smplmailsuppl.cxx b/shell/source/win32/simplemail/smplmailsuppl.cxx
index 0839717b4726..9202df97efb8 100644
--- a/shell/source/win32/simplemail/smplmailsuppl.cxx
+++ b/shell/source/win32/simplemail/smplmailsuppl.cxx
@@ -50,7 +50,7 @@ namespace // private
     Sequence< OUString > SAL_CALL Component_getSupportedServiceNames()
     {
         Sequence< OUString > aRet(1);
-        aRet[0] = OUString::createFromAscii("com.sun.star.sys.shell.SimpleSystemMail");
+        aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sys.shell.SimpleSystemMail"));
         return aRet;
     }
 
@@ -85,7 +85,7 @@ Reference<XSimpleMailClient> SAL_CALL CSmplMailSuppl::querySimpleMailClient()
 OUString SAL_CALL CSmplMailSuppl::getImplementationName()
     throw(RuntimeException)
 {
-    return OUString::createFromAscii(COMP_IMPL_NAME);
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(COMP_IMPL_NAME));
 }
 
 sal_Bool SAL_CALL CSmplMailSuppl::supportsService(const OUString& ServiceName)
diff --git a/shell/source/win32/workbench/TestProxySet.cxx b/shell/source/win32/workbench/TestProxySet.cxx
index 3e69f78fd86d..843a80cf61b2 100644
--- a/shell/source/win32/workbench/TestProxySet.cxx
+++ b/shell/source/win32/workbench/TestProxySet.cxx
@@ -114,7 +114,7 @@ int SAL_CALL main(int, char*, char* )
     try
     {
         Reference< XProxySettings > xProxySettings(
-            g_xFactory->createInstance( OUString::createFromAscii( "com.sun.star.system.SystemProxySettings" ) ), UNO_QUERY );
+            g_xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SystemProxySettings")) ), UNO_QUERY );
 
         if ( !xProxySettings.is() )
         {
@@ -141,7 +141,7 @@ int SAL_CALL main(int, char*, char* )
         printf( "Test of SystemProxySettings successful\n" );
 
         xProxySettings = Reference< XProxySettings >(
-            g_xFactory->createInstance( OUString::createFromAscii( "com.sun.star.system.SOProxySettings" ) ), UNO_QUERY );
+            g_xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SOProxySettings")) ), UNO_QUERY );
 
         if ( !xProxySettings.is() )
         {
diff --git a/shell/source/win32/workbench/TestSmplMail.cxx b/shell/source/win32/workbench/TestSmplMail.cxx
index 9e0dcd4bc4f9..49e2701fa1ff 100644
--- a/shell/source/win32/workbench/TestSmplMail.cxx
+++ b/shell/source/win32/workbench/TestSmplMail.cxx
@@ -109,7 +109,7 @@ int SAL_CALL main(int , char*, char* )
     try
     {
         Reference< XSimpleMailClientSupplier > xSmplMailClientSuppl(
-            g_xFactory->createInstance( OUString::createFromAscii( "com.sun.star.system.SimpleSystemMail" ) ), UNO_QUERY );
+            g_xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SimpleSystemMail")) ), UNO_QUERY );
 
         if ( !xSmplMailClientSuppl.is() )
         {
@@ -127,30 +127,30 @@ int SAL_CALL main(int , char*, char* )
 
             if ( xSmplMailMsg.is( ) )
             {
-                xSmplMailMsg->setRecipient( OUString::createFromAscii("tino.rachui@germany.sun.com") );
-                xSmplMailMsg->setOriginator( OUString::createFromAscii( "tino.rachui@germany.sun.com" ) );
+                xSmplMailMsg->setRecipient( OUString(RTL_CONSTASCII_USTRINGPARAM("tino.rachui@germany.sun.com")) );
+                xSmplMailMsg->setOriginator( OUString(RTL_CONSTASCII_USTRINGPARAM("tino.rachui@germany.sun.com")) );
 
                 Sequence< OUString > ccRecips( 1 );
-                ccRecips[0] = OUString::createFromAscii( "tino.rachui@germany.sun.com" );
+                ccRecips[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("tino.rachui@germany.sun.com"));
 
                 xSmplMailMsg->setCcRecipient( ccRecips );
 
                 Sequence< OUString > bccRecips( 1 );
-                bccRecips[0] = OUString::createFromAscii( "tino.rachui@germany.sun.com" );
+                bccRecips[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("tino.rachui@germany.sun.com"));
 
                 xSmplMailMsg->setBccRecipient( bccRecips );
 
-                xSmplMailMsg->setSubject( OUString::createFromAscii( "Mapi Test" ) );
+                xSmplMailMsg->setSubject( OUString(RTL_CONSTASCII_USTRINGPARAM("Mapi Test")) );
 
                 Sequence< OUString > attachements( 2 );
 
-                OUString aFile = OUString::createFromAscii( "D:\\Projects\\gsl\\shell\\wntmsci7\\bin\\testprx.exe" );
+                OUString aFile(RTL_CONSTASCII_USTRINGPARAM("D:\\Projects\\gsl\\shell\\wntmsci7\\bin\\testprx.exe"));
                 OUString aFileURL;
 
                 osl::FileBase::getFileURLFromSystemPath( aFile, aFileURL );
                 attachements[0] = aFileURL;
 
-                aFile = OUString::createFromAscii( "D:\\Projects\\gsl\\shell\\wntmsci7\\bin\\testsyssh.exe" );
+                aFile = OUString(RTL_CONSTASCII_USTRINGPARAM("D:\\Projects\\gsl\\shell\\wntmsci7\\bin\\testsyssh.exe"));
                 osl::FileBase::getFileURLFromSystemPath( aFile, aFileURL );
 
                 attachements[1] = aFile;
diff --git a/shell/source/win32/workbench/TestSysShExec.cxx b/shell/source/win32/workbench/TestSysShExec.cxx
index c3c7b5d2d435..4151f95df86a 100644
--- a/shell/source/win32/workbench/TestSysShExec.cxx
+++ b/shell/source/win32/workbench/TestSysShExec.cxx
@@ -117,7 +117,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char*    )
     //-------------------------------------------------
 
     Reference< XSystemShellExecute > xSysShExec(
-        g_xFactory->createInstance( OUString::createFromAscii( "com.sun.star.system.SystemShellExecute" ) ), UNO_QUERY );
+        g_xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SystemShellExecute")) ), UNO_QUERY );
 
     if ( !xSysShExec.is() )
     {
diff --git a/slideshow/source/engine/OGLTrans/OGLTrans_Shaders.cxx b/slideshow/source/engine/OGLTrans/OGLTrans_Shaders.cxx
index e2114ee0cffd..3da691f6bfae 100644
--- a/slideshow/source/engine/OGLTrans/OGLTrans_Shaders.cxx
+++ b/slideshow/source/engine/OGLTrans/OGLTrans_Shaders.cxx
@@ -36,10 +36,10 @@ namespace unx
 #include <GL/glxext.h>
 }
 
-bool OGLShaders::cbInitialized = false;
-
 #ifdef GL_VERSION_2_0
 
+bool OGLShaders::cbInitialized = false;
+
 PFNGLCREATESHADERPROC OGLShaders::glCreateShader = NULL;
 PFNGLSHADERSOURCEPROC OGLShaders::glShaderSource = NULL;
 PFNGLCOMPILESHADERPROC OGLShaders::glCompileShader = NULL;
diff --git a/slideshow/source/engine/OGLTrans/OGLTrans_Shaders.hxx b/slideshow/source/engine/OGLTrans/OGLTrans_Shaders.hxx
index 2b1bd49374c9..7eff31329eec 100644
--- a/slideshow/source/engine/OGLTrans/OGLTrans_Shaders.hxx
+++ b/slideshow/source/engine/OGLTrans/OGLTrans_Shaders.hxx
@@ -34,8 +34,11 @@
 #include <GL/glext.h>
 
 class OGLShaders {
+
+#ifdef GL_VERSION_2_0
     static bool Initialize();
     static bool cbInitialized;
+#endif
 
 public:
 
diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx
index ce0c416e75ff..890b42df76ae 100644
--- a/slideshow/source/engine/animationfactory.cxx
+++ b/slideshow/source/engine/animationfactory.cxx
@@ -592,6 +592,13 @@ namespace slideshow
                 bool                               mbAnimationStarted;
             };
 
+            //Current c++0x draft (apparently) has std::identity, but not operator()
+            template<typename T> struct SGI_identity : public std::unary_function<T,T>
+            {
+                T& operator()(T& x) const { return x; }
+                const T& operator()(const T& x) const { return x; }
+            };
+
             /** Function template wrapper around GenericAnimation template
 
                 @tpl AnimationBase
@@ -608,7 +615,7 @@ namespace slideshow
             {
                 return ::boost::shared_ptr< AnimationBase >(
                     new GenericAnimation< AnimationBase,
-                                          ::std::identity< typename AnimationBase::ValueType > >(
+                                          SGI_identity< typename AnimationBase::ValueType > >(
                                               rShapeManager,
                                               nFlags,
                                               pIsValid,
@@ -616,8 +623,8 @@ namespace slideshow
                                               pGetValue,
                                               pSetValue,
                                               // no modification necessary, use identity functor here
-                                              ::std::identity< typename AnimationBase::ValueType >(),
-                                              ::std::identity< typename AnimationBase::ValueType >() ) );
+                                              SGI_identity< typename AnimationBase::ValueType >(),
+                                              SGI_identity< typename AnimationBase::ValueType >() ) );
             }
 
             class Scaler
diff --git a/slideshow/source/engine/debug.cxx b/slideshow/source/engine/debug.cxx
index 4bf3e86b5191..a0dbe58cb7ec 100644
--- a/slideshow/source/engine/debug.cxx
+++ b/slideshow/source/engine/debug.cxx
@@ -73,30 +73,30 @@ OUString DebugGetDescription (const AnimationNodeSharedPtr& rpNode)
     {
         // Node is a container.
         if (::boost::dynamic_pointer_cast<ParallelTimeContainer>(rpNode))
-            return OUString::createFromAscii("ParallelTimeContainer");
+            return OUString(RTL_CONSTASCII_USTRINGPARAM("ParallelTimeContainer"));
         else if (::boost::dynamic_pointer_cast<SequentialTimeContainer>(rpNode))
-            return OUString::createFromAscii("SequentialTimeContainer");
+            return OUString(RTL_CONSTASCII_USTRINGPARAM("SequentialTimeContainer"));
         else
-            return OUString::createFromAscii("<unknown container>");
+            return OUString(RTL_CONSTASCII_USTRINGPARAM("<unknown container>"));
     }
     else if (::boost::dynamic_pointer_cast<AnimationTransitionFilterNode>(rpNode))
-        return OUString::createFromAscii("AnimationTransitionFilterNode");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("AnimationTransitionFilterNode"));
     else if (::boost::dynamic_pointer_cast<AnimationAudioNode>(rpNode))
-        return OUString::createFromAscii("AnimationAudioNode");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("AnimationAudioNode"));
     else if (::boost::dynamic_pointer_cast<AnimationColorNode>(rpNode))
-        return OUString::createFromAscii("AnimationColorNode");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("AnimationColorNode"));
     else if (::boost::dynamic_pointer_cast<AnimationCommandNode>(rpNode))
-        return OUString::createFromAscii("AnimationCommandNode");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("AnimationCommandNode"));
     else if (::boost::dynamic_pointer_cast<AnimationPathMotionNode>(rpNode))
-        return OUString::createFromAscii("AnimationPathMotionNode");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("AnimationPathMotionNode"));
     else if (::boost::dynamic_pointer_cast<AnimationSetNode>(rpNode))
-        return OUString::createFromAscii("AnimationSetNode");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("AnimationSetNode"));
     else if (::boost::dynamic_pointer_cast<AnimationTransformNode>(rpNode))
-        return OUString::createFromAscii("AnimationTransformNode");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("AnimationTransformNode"));
     else if (::boost::dynamic_pointer_cast<PropertyAnimationNode>(rpNode))
-        return OUString::createFromAscii("PropertyAnimationNode");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("PropertyAnimationNode"));
     else
-        return OUString::createFromAscii("<unknown node type>");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("<unknown node type>"));
 }
 
 
@@ -113,28 +113,28 @@ void DebugShowState (const AnimationNodeSharedPtr& rpNode)
     {
         default:
         case AnimationNode::INVALID:
-            sState = OUString::createFromAscii("Invalid");
-            sStateColor = OUString::createFromAscii("firebrick1");
+            sState = OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid"));
+            sStateColor = OUString(RTL_CONSTASCII_USTRINGPARAM("firebrick1"));
             break;
         case AnimationNode::UNRESOLVED:
-            sState = OUString::createFromAscii("Unresolved");
-            sStateColor = OUString::createFromAscii("dodgerblue4");
+            sState = OUString(RTL_CONSTASCII_USTRINGPARAM("Unresolved"));
+            sStateColor = OUString(RTL_CONSTASCII_USTRINGPARAM("dodgerblue4"));
             break;
         case AnimationNode::RESOLVED:
-            sState = OUString::createFromAscii("Resolved");
-            sStateColor = OUString::createFromAscii("dodgerblue");
+            sState = OUString(RTL_CONSTASCII_USTRINGPARAM("Resolved"));
+            sStateColor = OUString(RTL_CONSTASCII_USTRINGPARAM("dodgerblue"));
             break;
         case AnimationNode::ACTIVE:
-            sState = OUString::createFromAscii("Active");
-            sStateColor = OUString::createFromAscii("seagreen1");
+            sState = OUString(RTL_CONSTASCII_USTRINGPARAM("Active"));
+            sStateColor = OUString(RTL_CONSTASCII_USTRINGPARAM("seagreen1"));
             break;
         case AnimationNode::FROZEN:
-            sState = OUString::createFromAscii("Frozen");
-            sStateColor = OUString::createFromAscii("lightskyblue1");
+            sState = OUString(RTL_CONSTASCII_USTRINGPARAM("Frozen"));
+            sStateColor = OUString(RTL_CONSTASCII_USTRINGPARAM("lightskyblue1"));
             break;
         case AnimationNode::ENDED:
-            sState = OUString::createFromAscii("Ended");
-            sStateColor = OUString::createFromAscii("slategray3");
+            sState = OUString(RTL_CONSTASCII_USTRINGPARAM("Ended"));
+            sStateColor = OUString(RTL_CONSTASCII_USTRINGPARAM("slategray3"));
             break;
     }
 
@@ -158,11 +158,11 @@ void DebugShowState (const AnimationNodeSharedPtr& rpNode)
         }
         else
         {
-            sTrigger = OUString::createFromAscii("other");
+            sTrigger = OUString(RTL_CONSTASCII_USTRINGPARAM("other"));
         }
     }
     else
-        sTrigger = ::rtl::OUString::createFromAscii("void");
+        sTrigger = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("void"));
 
     TRACE("Node state: n%x [label=\"%x / %x / %s\\n%s\\n%s\",style=filled,fillcolor=\"%s\"]\r",
         rpNode.get(),
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index e91ad5664ac6..f8b124676065 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -71,7 +71,7 @@ public:
                  ActivitySharedPtr const&                                 rActivity,
                  ActivitiesQueue &                                        rActivityQueue ) :
 #if OSL_DEBUG_LEVEL > 1
-        Event(::rtl::OUString::createFromAscii("WakeupEvent")),
+        Event(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WakeupEvent"))),
 #endif
         maTimer(pTimeBase),
         mnNextTime(0.0),
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
index a4268599ba38..a7cb526834bf 100644
--- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx
+++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
@@ -376,7 +376,7 @@ void ActivityImpl::ImpForceScrollTextAnimNodes()
         sal_uInt32 nLoopTime;
         double fZeroLogic, fOneLogic, fInitLogic, fDistanceLogic;
         double fZeroLogicAlternate = 0.0, fOneLogicAlternate = 0.0;
-        double fZeroRelative, fOneRelative, fInitRelative,fDistanceRelative;
+        double fZeroRelative, fOneRelative, fInitRelative;
 
         if(ScrollHorizontal())
         {
@@ -429,13 +429,11 @@ void ActivityImpl::ImpForceScrollTextAnimNodes()
                 (fZeroLogicAlternate - fZeroLogic) / fDistanceLogic;
             fOneRelative =
                 (fOneLogicAlternate - fZeroLogic) / fDistanceLogic;
-            fDistanceRelative = fOneRelative - fZeroRelative;
         }
         else
         {
             fZeroRelative = 0.0;
             fOneRelative = 1.0;
-            fDistanceRelative = 1.0;
         }
 
         if(mnStartTime)
diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx
index 6ef2c8a82e8b..0c8d6cbcf23e 100644
--- a/slideshow/source/engine/shapes/shapeimporter.cxx
+++ b/slideshow/source/engine/shapes/shapeimporter.cxx
@@ -468,11 +468,11 @@ bool ShapeImporter::isSkip(
         rtl::OUString layerName;
         uno::Reference<beans::XPropertySet> xPropLayerSet(
                                                           xLayer, uno::UNO_QUERY );
-        const uno::Any& a(xPropLayerSet->getPropertyValue(rtl::OUString::createFromAscii("Name")) );
+        const uno::Any& a(xPropLayerSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"))) );
         bool const bRet = (a >>= layerName);
         if(bRet)
         {
-            if( layerName.equals(rtl::OUString::createFromAscii("DrawnInSlideshow")))
+            if( layerName.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DrawnInSlideshow"))))
             {
                 //Transform shapes into PolyPolygons
                 importPolygons(xPropSet);
diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx
index f3c87161d78f..f22927ddd520 100644
--- a/slideshow/source/engine/shapes/viewappletshape.cxx
+++ b/slideshow/source/engine/shapes/viewappletshape.cxx
@@ -150,7 +150,7 @@ namespace slideshow
 
                 uno::Reference< awt::XWindow2 > xParentWindow(
                     xPropSet->getPropertyValue(
-                        ::rtl::OUString::createFromAscii( "Window" )),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Window" ))),
                     uno::UNO_QUERY_THROW );
 
                 uno::Reference<lang::XMultiComponentFactory> xFactory(
@@ -163,7 +163,7 @@ namespace slideshow
 
                     uno::Reference< awt::XToolkit > xToolkit(
                         xFactory->createInstanceWithContext(
-                            ::rtl::OUString::createFromAscii( "com.sun.star.awt.Toolkit" ),
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.Toolkit" )),
                             mxComponentContext ),
                         uno::UNO_QUERY_THROW );
 
@@ -187,7 +187,7 @@ namespace slideshow
 
                     mxFrame.set(
                         xFactory->createInstanceWithContext(
-                            ::rtl::OUString::createFromAscii( "com.sun.star.frame.Frame" ),
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Frame" )),
                             mxComponentContext ),
                         uno::UNO_QUERY_THROW );
 
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index 2155e4161c0c..e861b789e561 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -232,7 +232,7 @@ namespace slideshow
             if( xPropSet.is() &&
                 getPropertyValue( xParentWindow,
                                   xPropSet,
-                                  ::rtl::OUString::createFromAscii( "Window" )) )
+                                  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Window" ))) )
             {
                 const awt::Rectangle aRect( xParentWindow->getPosSize() );
 
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 4ef0ca09f4f7..8b37aec5f6f0 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -187,9 +187,6 @@ private:
     bool mbIsActive;
 };
 
-
-
-
 /******************************************************************************
 
    SlideShowImpl
@@ -345,7 +342,6 @@ private:
         uno::Reference<drawing::XShape> const& xShape, sal_Int16 nPointerShape )
         throw (uno::RuntimeException);
 
-
     // CursorManager
     // -----------------------------------------------------------
 
@@ -434,7 +430,6 @@ private:
     private: SlideShowImpl& mrSlideShowImpl;
     };
 
-
     /// Filter requested cursor shape against hard slideshow cursors (wait, etc.)
     sal_Int16 calcActiveCursor( sal_Int16 nCursorShape ) const;
 
@@ -517,7 +512,6 @@ private:
     FrameSynchronization                    maFrameSynchronization;
 };
 
-
 /** Separate event listener for animation, view and hyperlink events.
 
     This handler is registered for slide animation end, view and
@@ -580,7 +574,6 @@ struct SlideShowImpl::SeparateListenerImpl : public EventHandler,
     }
 };
 
-
 SlideShowImpl::SlideShowImpl(
     uno::Reference<uno::XComponentContext> const& xContext )
     : SlideShowImplBase(m_aMutex),
@@ -638,7 +631,7 @@ SlideShowImpl::SlideShowImpl(
             // #i82460# try to retrieve special transition factory
             mxOptionalTransitionFactory.set(
                 xFactory->createInstanceWithContext(
-                    ::rtl::OUString::createFromAscii( "com.sun.star.presentation.TransitionFactory" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.TransitionFactory" )),
                     mxComponentContext ),
                 uno::UNO_QUERY );
         }
@@ -912,7 +905,6 @@ PolygonMap::iterator SlideShowImpl::findPolygons( uno::Reference<drawing::XDrawP
     bool bFound = false;
     PolygonMap::iterator aIter=maPolygons.begin();
 
-
     while(aIter!=maPolygons.end() && !bFound)
     {
         if(aIter->first == xDrawPage)
@@ -1010,7 +1002,6 @@ sal_Int16 SlideShowImpl::calcActiveCursor( sal_Int16 nCursorShape ) const
     return nCursorShape;
 }
 
-
 void SlideShowImpl::stopShow()
 {
     // Force-end running animation
@@ -1050,8 +1041,6 @@ void SlideShowImpl::stopShow()
     }
 }
 
-
-
 class SlideShowImpl::PrefetchPropertiesFunc
 {
 public:
@@ -1278,7 +1267,6 @@ sal_Bool SlideShowImpl::nextEffect() throw (uno::RuntimeException)
         return maEventMultiplexer.notifyNextEffect();
 }
 
-
 sal_Bool SlideShowImpl::previousEffect() throw (uno::RuntimeException)
 {
     osl::MutexGuard const guard( m_aMutex );
@@ -1361,7 +1349,6 @@ sal_Bool SlideShowImpl::pause( sal_Bool bPauseShow )
     // precondition: must only be called from the main thread!
     DBG_TESTSOLARMUTEX();
 
-
     if (bPauseShow)
         mpPresTimer->pauseTimer();
     else
@@ -1483,17 +1470,17 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult
     uno::Reference< beans::XPropertySet > xLayerPropSet(xDrawnInSlideshow, uno::UNO_QUERY);
 
     //Layer Name which enables to catch annotations
-    rtl::OUString layerName = rtl::OUString::createFromAscii("DrawnInSlideshow");
+    rtl::OUString layerName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DrawnInSlideshow"));
     uno::Any aPropLayer;
 
     aPropLayer <<= layerName;
-    xLayerPropSet->setPropertyValue(rtl::OUString::createFromAscii("Name"), aPropLayer);
+    xLayerPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), aPropLayer);
 
     aPropLayer <<= true;
-    xLayerPropSet->setPropertyValue(rtl::OUString::createFromAscii("IsVisible"), aPropLayer);
+    xLayerPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsVisible")), aPropLayer);
 
     aPropLayer <<= false;
-    xLayerPropSet->setPropertyValue(rtl::OUString::createFromAscii("IsLocked"), aPropLayer);
+    xLayerPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsLocked")), aPropLayer);
 
     PolygonMap::iterator aIter=maPolygons.begin();
 
@@ -1525,7 +1512,7 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult
                 {
                     //create the PolyLineShape
                     uno::Reference< uno::XInterface > polyshape(xDocFactory->createInstance(
-                                                                    rtl::OUString::createFromAscii("com.sun.star.drawing.PolyLineShape") ) );
+                                                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PolyLineShape")) ) );
                     uno::Reference< drawing::XShape > rPolyShape(polyshape, uno::UNO_QUERY);
 
                     //Add the shape to the slide
@@ -1555,27 +1542,27 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult
                     //Give the built PointSequenceSequence.
                     uno::Any aParam;
                     aParam <<= aRetval;
-                    aXPropSet->setPropertyValue( rtl::OUString::createFromAscii("PolyPolygon"), aParam );
+                    aXPropSet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PolyPolygon")), aParam );
 
                     //LineStyle : SOLID by default
                     uno::Any            aAny;
                     drawing::LineStyle  eLS;
                     eLS = drawing::LineStyle_SOLID;
                     aAny <<= eLS;
-                    aXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineStyle"), aAny );
+                    aXPropSet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineStyle")), aAny );
 
                     //LineColor
                     sal_uInt32          nLineColor;
                     nLineColor = pPolyPoly->getRGBALineColor();
                     //Transform polygon color from RRGGBBAA to AARRGGBB
                     aAny <<= RGBAColor2UnoColor(nLineColor);
-                    aXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineColor"), aAny );
+                    aXPropSet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineColor")), aAny );
 
                     //LineWidth
                     double              fLineWidth;
                     fLineWidth = pPolyPoly->getStrokeWidth();
                     aAny <<= (sal_Int32)fLineWidth;
-                    aXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineWidth"), aAny );
+                    aXPropSet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineWidth")), aAny );
 
                     // make polygons special
                     xLayerManager->attachShapeToLayer(rPolyShape, xDrawnInSlideshow);
@@ -1684,7 +1671,6 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty )
         return true;
     }
 
-
     if (rProperty.Name.equalsAsciiL(
             RTL_CONSTASCII_STRINGPARAM("SwitchEraserMode") ))
     {
@@ -1705,8 +1691,6 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty )
         return true;
     }
 
-
-
     if (rProperty.Name.equalsAsciiL(
             RTL_CONSTASCII_STRINGPARAM("EraseInk") ))
     {
@@ -2458,7 +2442,6 @@ bool SlideShowImpl::handleAnimationEvent( const AnimationNodeSharedPtr& rNode )
     return true;
 }
 
-
 //===== FrameSynchronization ==================================================
 
 FrameSynchronization::FrameSynchronization (const double nFrameDuration)
@@ -2470,17 +2453,11 @@ FrameSynchronization::FrameSynchronization (const double nFrameDuration)
     MarkCurrentFrame();
 }
 
-
-
-
 void FrameSynchronization::MarkCurrentFrame (void)
 {
     mnNextFrameTargetTime = maTimer.getElapsedTime() + mnFrameDuration;
 }
 
-
-
-
 void FrameSynchronization::Synchronize (void)
 {
     if (mbIsActive)
@@ -2493,31 +2470,21 @@ void FrameSynchronization::Synchronize (void)
     MarkCurrentFrame();
 }
 
-
-
-
 void FrameSynchronization::Activate (void)
 {
     mbIsActive = true;
 }
 
-
-
-
 void FrameSynchronization::Deactivate (void)
 {
     mbIsActive = false;
 }
 
-
-
-
 double FrameSynchronization::GetCurrentTime (void) const
 {
     return maTimer.getElapsedTime();
 }
 
-
 } // anon namespace
 
 namespace sdecl = comphelper::service_decl;
diff --git a/slideshow/source/engine/tools.cxx b/slideshow/source/engine/tools.cxx
index 85b2e0323aab..f49226761faa 100644
--- a/slideshow/source/engine/tools.cxx
+++ b/slideshow/source/engine/tools.cxx
@@ -77,7 +77,7 @@ namespace slideshow
                 {
                 }
 
-                bool operator()( const beans::NamedValue& rValue )
+                bool operator()( const beans::NamedValue& rValue ) const
                 {
                     return rValue.Name == mrSearchString;
                 }
@@ -94,7 +94,7 @@ namespace slideshow
                 {
                 }
 
-                bool operator()( const beans::NamedValue& rValue )
+                bool operator()( const beans::NamedValue& rValue ) const
                 {
                     return rValue.Name == mrKey.Name && rValue.Value == mrKey.Value;
                 }
diff --git a/slideshow/source/engine/wakeupevent.cxx b/slideshow/source/engine/wakeupevent.cxx
index 4cf70774f23f..6ab4b821cab8 100644
--- a/slideshow/source/engine/wakeupevent.cxx
+++ b/slideshow/source/engine/wakeupevent.cxx
@@ -44,7 +44,7 @@ namespace slideshow
             boost::shared_ptr<canvas::tools::ElapsedTime> const & pTimeBase,
             ActivitiesQueue& rActivityQueue ) :
 #if OSL_DEBUG_LEVEL > 1
-            Event(::rtl::OUString::createFromAscii("WakeupEvent")),
+            Event(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WakeupEvent"))),
 #endif
             maTimer(pTimeBase),
             mnNextTime(0.0),
diff --git a/slideshow/source/inc/interruptabledelayevent.hxx b/slideshow/source/inc/interruptabledelayevent.hxx
index 4319024365f8..089d98e1368c 100644
--- a/slideshow/source/inc/interruptabledelayevent.hxx
+++ b/slideshow/source/inc/interruptabledelayevent.hxx
@@ -48,7 +48,7 @@ namespace slideshow
             DelayFacade( const EventSharedPtr&  rEvent,
                          double                 nTimeout    ) :
 #if OSL_DEBUG_LEVEL > 1
-                Event(::rtl::OUString::createFromAscii("DelayFacade")),
+                Event(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DelayFacade"))),
 #endif
                 mpEvent( rEvent ),
                 mnTimeout( nTimeout )
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx
index 254544a24e46..6e80a3637f32 100644
--- a/slideshow/test/demoshow.cxx
+++ b/slideshow/test/demoshow.cxx
@@ -54,6 +54,7 @@
 #include <ucbhelper/configurationkeys.hxx>
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <basegfx/tools/canvastools.hxx>
 #include <basegfx/range/b2drectangle.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
@@ -199,6 +200,11 @@ private:
     {
     }
 
+    virtual awt::Rectangle SAL_CALL getCanvasArea(  ) throw (uno::RuntimeException)
+    {
+        return awt::Rectangle(0,0,maSize.Width(),maSize.Height());
+    }
+
     uno::Reference< rendering::XSpriteCanvas > mxCanvas;
     ::cppu::OInterfaceContainerHelper          maPaintListeners;
     ::cppu::OInterfaceContainerHelper          maTransformationListeners;
@@ -456,7 +462,9 @@ void DemoWindow::init()
         if( mxShow.is() && !mbSlideDisplayed )
         {
             uno::Reference< drawing::XDrawPage > xSlide( new DummySlide );
+            uno::Reference< drawing::XDrawPages > xDrawPages;
             mxShow->displaySlide( xSlide,
+                                  uno::Reference< drawing::XDrawPagesSupplier >(),
                                   uno::Reference< animations::XAnimationNode >(),
                                   uno::Sequence< beans::PropertyValue >() );
             mxShow->setProperty( beans::PropertyValue(
@@ -556,8 +564,8 @@ void DemoApp::Main()
 
     // Create UCB.
     uno::Sequence< uno::Any > aArgs( 2 );
-    aArgs[ 0 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );
-    aArgs[ 1 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );
+    aArgs[ 0 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL ));
+    aArgs[ 1 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE ));
     ::ucbhelper::ContentBroker::initialize( xFactory, aArgs );
 
     DemoWindow pWindow;
diff --git a/slideshow/test/export.map b/slideshow/test/export.map
index 7321bbca16ad..3308588ef6f8 100644
--- a/slideshow/test/export.map
+++ b/slideshow/test/export.map
@@ -27,7 +27,7 @@
 
 UDK_3_0_0 {
     global:
-        registerAllTestFunction;
+        cppunitTestPlugIn;
 
     local:
         *;
diff --git a/slideshow/test/makefile.mk b/slideshow/test/makefile.mk
index c86d166b95a2..c7f63bb14e7d 100644
--- a/slideshow/test/makefile.mk
+++ b/slideshow/test/makefile.mk
@@ -39,6 +39,15 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  settings.mk
 .INCLUDE : $(PRJ)$/util$/makefile.pmk
 
+#building with stlport, but cppunit was not built with stlport
+.IF "$(USE_SYSTEM_STL)"!="YES"
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGSCXX+=-DADAPT_EXT_STL
+.ENDIF
+.ENDIF
+
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
+
 # --- Common ----------------------------------------------------------
 
 # BEGIN target1 -------------------------------------------------------
@@ -53,7 +62,6 @@ SHL1STDLIBS= 	$(SALLIB)		 \
                 $(BASEGFXLIB)	 \
                 $(CPPUHELPERLIB) \
                 $(CPPULIB)		 \
-                                $(TESTSHL2LIB)    \
                 $(CPPUNITLIB)	 \
                 $(UNOTOOLSLIB)	 \
                 $(VCLLIB)
@@ -68,6 +76,8 @@ SHL1IMPLIB= i$(SHL1TARGET)
 
 DEF1NAME    =$(SHL1TARGET)
 SHL1VERSIONMAP = export.map
+SHL1RPATH = NONE
+
 # END target1 ----------------------------------------------------------
 
 # BEGIN target2 --------------------------------------------------------
diff --git a/slideshow/test/slidetest.cxx b/slideshow/test/slidetest.cxx
index b3a33f2823d5..df3fc0f4f6a6 100644
--- a/slideshow/test/slidetest.cxx
+++ b/slideshow/test/slidetest.cxx
@@ -26,7 +26,11 @@
  *
  ************************************************************************/
 
-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestAssert.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include "cppunit/plugin/TestPlugIn.h"
+
 #include <cppuhelper/compbase1.hxx>
 #include <comphelper/broadcasthelper.hxx>
 
@@ -365,8 +369,9 @@ public:
 }; // class LayerManagerTest
 
 // -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(LayerManagerTest, "LayerManagerTest");
+CPPUNIT_TEST_SUITE_REGISTRATION(LayerManagerTest);
 } // namespace
 
+CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/test/testshape.cxx b/slideshow/test/testshape.cxx
index 92fd95d466d4..9bf39cc0ce8a 100644
--- a/slideshow/test/testshape.cxx
+++ b/slideshow/test/testshape.cxx
@@ -26,7 +26,10 @@
  *
  ************************************************************************/
 
-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestAssert.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+
 #include <cppuhelper/compbase1.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <comphelper/make_shared_from_uno.hxx>
diff --git a/slideshow/test/testview.cxx b/slideshow/test/testview.cxx
index 036fc05d948d..7d40e03ce63d 100644
--- a/slideshow/test/testview.cxx
+++ b/slideshow/test/testview.cxx
@@ -26,7 +26,10 @@
  *
  ************************************************************************/
 
-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestAssert.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+
 #include <cppuhelper/compbase1.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <comphelper/make_shared_from_uno.hxx>
@@ -134,6 +137,11 @@ public:
     {
     }
 
+    virtual awt::Rectangle SAL_CALL getCanvasArea(  ) throw (uno::RuntimeException)
+    {
+        return awt::Rectangle(0,0,100,100);
+    }
+
     // TestView
     virtual bool isClearCalled() const
     {
@@ -276,6 +284,15 @@ public:
     {
         mbDisposed = true;
     }
+
+    virtual bool isSoundEnabled (void) const
+    {
+        return true;
+    }
+
+    virtual void setIsSoundEnabled (const bool /*bValue*/)
+    {
+    }
 };
 
 
diff --git a/slideshow/test/views.cxx b/slideshow/test/views.cxx
index f9bb13ee1c37..d27a55a7795f 100644
--- a/slideshow/test/views.cxx
+++ b/slideshow/test/views.cxx
@@ -26,7 +26,10 @@
  *
  ************************************************************************/
 
-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestAssert.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+
 #include <cppuhelper/compbase1.hxx>
 #include <comphelper/broadcasthelper.hxx>
 
@@ -82,11 +85,4 @@ public:
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(UnoViewContainerTest, "UnoViewContainerTest");
 } // namespace
 
-
-// -----------------------------------------------------------------------------
-
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/smoketestoo_native/com/sun/star/comp/smoketest/manifest.xml b/smoketestoo_native/com/sun/star/comp/smoketest/manifest.xml
index 7e3e7947aa0f..fcedabf96b4b 100755
--- a/smoketestoo_native/com/sun/star/comp/smoketest/manifest.xml
+++ b/smoketestoo_native/com/sun/star/comp/smoketest/manifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<manifest:manifest>
+<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
  <manifest:file-entry manifest:full-path="TestExtension.jar" manifest:media-type="application/vnd.sun.star.uno-component;type=Java"/>
  <manifest:file-entry manifest:full-path="TestExtension.rdb" manifest:media-type="application/vnd.sun.star.uno-typelibrary;type=RDB"/>
-</manifest:manifest>
\ No newline at end of file
+</manifest:manifest>
diff --git a/soldep/bootstrp/dep.cxx b/soldep/bootstrp/dep.cxx
deleted file mode 100644
index 4213fc70ee0e..000000000000
--- a/soldep/bootstrp/dep.cxx
+++ /dev/null
@@ -1,119 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "dep.hxx"
-
-// class SByteExtStringList
-
-/*****************************************************************************/
-SByteExtStringList::~SByteExtStringList()
-/*****************************************************************************/
-{
-    if (bDeleteStrings)
-        while( Count()) {
-            delete GetObject((ULONG)0);
-            Remove((ULONG)0);
-        }
-}
-
-// class VersionDepInfo
-
-/*****************************************************************************/
-VersionDepInfo::~VersionDepInfo()
-/*****************************************************************************/
-{
-    if (pVersion)
-        delete pVersion;
-}
-
-/*****************************************************************************/
-void VersionDepInfo::Clear()
-/*****************************************************************************/
-{
-    while( Count()) {
-        delete GetObject((ULONG)0);
-        Remove((ULONG)0);
-    }
-}
-
-// class VersionDepInfoList
-
-/*****************************************************************************/
-VersionDepInfo* VersionDepInfoList::GetVersion (ByteString& rVersion)
-/*****************************************************************************/
-{
-    VersionDepInfo* pInfo = First();
-    while (pInfo)
-    {
-        const ByteString* pStr = pInfo->GetVersion();
-        if (*pStr == rVersion)
-            return pInfo;
-        pInfo = Next();
-    }
-    return NULL;
-}
-
-/*****************************************************************************/
-void VersionDepInfoList::RemoveVersion (ByteString& rVersion)
-/*****************************************************************************/
-{
-    VersionDepInfo* pInfo = First();
-    while (pInfo)
-    {
-        const ByteString* pStr = pInfo->GetVersion();
-        if (*pStr == rVersion)
-        {
-            Remove (pInfo);
-            delete pInfo;
-            return;
-        }
-        pInfo = Next();
-    }
-}
-
-/*****************************************************************************/
-VersionDepInfo* VersionDepInfoList::InsertVersion (ByteString& rVersion)
-/*****************************************************************************/
-{
-    VersionDepInfo* pInfo = First();
-    while (pInfo)
-    {
-        const ByteString* pStr = pInfo->GetVersion();
-        if (*pStr == rVersion)
-        {
-            pInfo->Clear();
-            return pInfo;
-        }
-        pInfo = Next();
-    }
-    pInfo = new VersionDepInfo (rVersion);
-    Insert (pInfo, LIST_APPEND);
-    return pInfo;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soldep/bootstrp/prj.cxx b/soldep/bootstrp/prj.cxx
index 0e09f8fd815c..ffd6f34c10b8 100644
--- a/soldep/bootstrp/prj.cxx
+++ b/soldep/bootstrp/prj.cxx
@@ -40,8 +40,6 @@
 #pragma hdrstop
 #endif
 
-//#define TEST  1
-
 #ifdef MAC
 #define putenv(x)
 #endif
@@ -70,8 +68,6 @@
 #endif
 #endif
 
-//static const char * XML_ALL  =    "all";
-
 //
 //  class SimpleConfig
 //
@@ -108,7 +104,7 @@ ByteString SimpleConfig::GetNext()
     ByteString aString;
 
     if ( aStringBuffer =="" )
-      while ((aStringBuffer = GetNextLine()) == "\t"); //solange bis != "\t"
+      while ((aStringBuffer = GetNextLine()) == "\t");
     if ( aStringBuffer =="" )
         return ByteString();
 
@@ -126,7 +122,6 @@ ByteString  SimpleConfig::GetNextLine()
 {
     ByteString aSecStr;
     sal_Bool bStreamOk;
-//  USHORT iret = 0;
     nLine++;
 
     bStreamOk = aFileStream.ReadLine ( aTmpStr );
@@ -138,7 +133,6 @@ ByteString  SimpleConfig::GetNextLine()
     int nLength = aTmpStr.Len();
     if ( bStreamOk && (nLength == 0) )
         return "\t";
-//  USHORT nPos = 0;
     BOOL bFound = FALSE;
     ByteString aEraseString;
     for ( USHORT i = 0; i<= nLength; i++)
@@ -948,8 +942,6 @@ void Prj::SetMode(SByteStringList* pModList)
         {
             pPrjDepList->PutString( new ByteString((ByteString) *(pInfo->GetProject())));
             pPrjInitialDepList->PutString( new ByteString((ByteString) *(pInfo->GetProject())));
-            //pPrjDepList->PutString( pInfo->GetProject());
-            //pPrjInitialDepList->PutString( pInfo->GetProject());
         }
         else
         {
@@ -965,8 +957,6 @@ void Prj::SetMode(SByteStringList* pModList)
                     {
                         pPrjDepList->PutString( new ByteString((ByteString) *(pInfo->GetProject())));
                         pPrjInitialDepList->PutString( new ByteString((ByteString) *(pInfo->GetProject())));
-                        //pPrjDepList->PutString( pInfo->GetProject());
-                        //pPrjInitialDepList->PutString( pInfo->GetProject());
                         bStringFound = TRUE;
                         break;
                     }
@@ -1506,7 +1496,6 @@ void Star::Read( String &rFileName )
         StarFile* pFile = ReadBuildlist (ssFileName);
         aMutex.acquire();
         ReplaceFileEntry (&aLoadedFilesList, pFile);
-        //aLoadedFilesList.Insert( pFile, LIST_APPEND );
         aMutex.release();
         aFileList.Remove(( ULONG ) 0 );
     }
@@ -1576,7 +1565,6 @@ void Star::Read( SolarFileList *pSolarFiles )
 
         aMutex.acquire();
         ReplaceFileEntry (&aLoadedFilesList, pFile);
-        //aLoadedFilesList.Insert( pFile,   LIST_APPEND );
         aMutex.release();
         delete pSolarFiles->Remove(( ULONG ) 0 );
     }
@@ -1592,7 +1580,6 @@ String Star::CreateFileName( String& rProject, String& rSourceRoot )
     // this method is used to find solarlist parts of nabours (other projects)
     String sPrjDir( String::CreateFromAscii( "prj" ));
     String sBuildList( String::CreateFromAscii( "build.lst" ));
-//  String sXmlBuildList( String::CreateFromAscii( "build.xlist" ));
 
     DirEntry aEntry( rSourceRoot );
     aEntry += DirEntry( rProject );
@@ -1610,17 +1597,10 @@ String Star::CreateFileName( String& rProject, String& rSourceRoot )
     }
 
     aEntry += DirEntry( sPrjDir );
-
-//  DirEntry aPossibleEntry(aEntry);
-//  aPossibleEntry += DirEntry( sXmlBuildList );
-
     aEntry += DirEntry( sBuildList );
 
     DirEntry& aActualEntry = aEntry;
-/*
-    if (aPossibleEntry.Exists()) {
-        aActualEntry = aPossibleEntry;
-    } else */
+
     if ( !aActualEntry.Exists() && aDBNotFoundHdl.IsSet())
         aDBNotFoundHdl.Call( &rProject );
     return aActualEntry.GetFull();
@@ -1979,7 +1959,6 @@ Prj* Star::GetPrj ( ByteString aProjectName )
         if ( pPrj->GetProjectName().ToLowerAscii() == aProjectName.ToLowerAscii() )
             return pPrj;
     }
-//  return (Prj*)NULL;
     return 0L ;
 }
 
@@ -2130,164 +2109,6 @@ void Star::SetCurrentDeps (SByteStringList* pDepList)
     Expand_Impl();
 }
 
-///*****************************************************************************/
-//void Star::ReadXmlBuildList(const ByteString& sBuildLstPath) {
-///*****************************************************************************/
-//  if (mpXmlBuildList) {
-//      Prj* pPrj = NULL;
-//
-//      try {
-//          mpXmlBuildList->loadXMLFile(sBuildLstPath);
-//      }
-//      catch (XmlBuildListException) {
-//          DirEntry aDirEntry (sBuildLstPath);
-//          String ssPrjName = aDirEntry.GetPath().GetPath().GetBase();
-//          ByteString sPrjName = ByteString(ssPrjName, RTL_TEXTENCODING_ASCII_US);
-//          pPrj = GetPrj( sPrjName );
-//          if (pPrj)
-//          {
-//              //remove old Project
-//              RemovePrj (pPrj);
-//          }
-//          return;
-//      }
-//
-//      try {
-//          ByteString sProjectName = mpXmlBuildList->getModuleName();
-//          pPrj = GetPrj( sProjectName );
-//          if (pPrj)
-//          {
-//              //remove old Project
-//              RemovePrj (pPrj);
-//          }
-//
-//          // insert new Project
-//          pPrj = new Prj ( sProjectName );
-//          pPrj->SetPreFix( sProjectName ); // use ProjectName as Prefix
-//          Insert(pPrj,LIST_APPEND);
-//
-//          // get global dependencies
-//          FullByteStringListWrapper aProducts = mpXmlBuildList->getProducts();
-//          ByteString aDepType = ByteString(DEP_MD_ALWAYS_STR);
-//          if (mpXmlBuildList->hasModuleDepType(aProducts, aDepType))
-//              pPrj->HasHardDependencies( TRUE );
-//
-//          aDepType = ByteString(DEP_MD_FORCE_STR);
-//          if (mpXmlBuildList->hasModuleDepType(aProducts, aDepType))
-//          {
-//              pPrj->HasHardDependencies( TRUE );
-//              pPrj->HasFixedDependencies( TRUE );
-//          }
-//
-//          // modul dependencies
-//          ByteString sModulDepType = ByteString();
-//          FullByteStringListWrapper aModulDeps = mpXmlBuildList->getModuleDependencies(aProducts, sModulDepType);
-//          ByteString * pModulDep = aModulDeps.First();
-//          while (pModulDep)
-//          {
-//              FullByteStringListWrapper aModulProducts = mpXmlBuildList->getModuleProducts(*pModulDep);
-//              ByteString *pModulePoduct = aModulProducts.First();
-//              while (pModulePoduct)
-//              {
-//                  if (*pModulePoduct == XML_ALL)
-//                      pPrj->AddDependencies( *pModulDep );
-//                  else
-//                      pPrj->AddDependencies( *pModulDep, *pModulePoduct);
-//
-//                  pModulePoduct = aModulProducts.Next();
-//              }
-//              pModulDep = aModulDeps.Next();
-//          }
-//
-//          // job dirs
-//          ByteString sJobType = ByteString();
-//          ByteString sJobPlatforms = ByteString();
-//          FullByteStringListWrapper aJobDirs = mpXmlBuildList->getJobDirectories(sJobType, sJobPlatforms); // all dirs
-//          ByteString* pJobDir = aJobDirs.First();
-//          while (pJobDir)
-//          {
-//              FullByteStringListWrapper aJobPlatforms = mpXmlBuildList->getJobPlatforms (*pJobDir);
-//              ByteString* pJobPlatform = aJobPlatforms.First();
-//              while (pJobPlatform)
-//              {
-//                  ByteString sJobRestriction = ByteString();
-//                  FullByteStringListWrapper aJobReq = mpXmlBuildList->getJobBuildReqs (*pJobDir, *pJobPlatform);
-//                  // nur ein Req pro Platform wird zur Zeit unterstützt
-//                  // mehr geht wegen der Struktur zur Zeit nicht!
-//                  // lese sie trotzdem kommasepariert ein, wenn nötig
-//                  if (aJobReq.Count() > 0)
-//                  {
-//                      ByteString* pRestriction = aJobReq.First();
-//                      sJobRestriction = ByteString (*pRestriction);
-//                      pRestriction = aJobReq.Next();
-//                      while (pRestriction)
-//                      {
-//                          sJobRestriction += ByteString (",");
-//                          sJobRestriction += ByteString (*pRestriction);
-//                          pRestriction = aJobReq.Next();
-//                      }
-//                  }
-//
-//                  FullByteStringListWrapper aJobTypes = mpXmlBuildList->getJobTypes (*pJobDir);
-//                  ByteString * pJobType = aJobTypes.First();
-//                  while(pJobType)
-//                  {
-//                      FullByteStringListWrapper aDirDependencies = mpXmlBuildList->getDirDependencies(*pJobDir, *pJobType, *pJobPlatform);
-//                      SByteStringList *pDepList = NULL;
-//                      if (aDirDependencies.Count() > 0)
-//                      {
-//                          pDepList = new SByteStringList;
-//                          ByteString* pDirDep = aDirDependencies.First();
-//                          while (pDirDep)
-//                          {
-//                              ByteString sFullDir = sProjectName;
-//                              sFullDir += *pDirDep;
-//                              sFullDir.SearchAndReplaceAll('/', '\\');
-//                              *pDirDep = sFullDir;
-//                              pDepList->PutString(pDirDep);   // String wird übergeben
-//                              aDirDependencies.Remove();      // Zeiger aus alter Liste löschen
-//                              pDirDep = aDirDependencies.First();
-//                          }
-//                      }
-//                      // insert CommandData
-//                      CommandData * pCmdData = new CommandData;
-//                      ByteString sRequiredPath = sProjectName;
-//                      sRequiredPath += *pJobDir;
-//                      sRequiredPath.SearchAndReplaceAll('/', '\\');
-//                      pCmdData->SetPath(sRequiredPath);
-//                      pCmdData->SetCommandType( GetJobType(*pJobType) );
-//                      pCmdData->SetCommandPara( ByteString() );
-//                      pCmdData->SetOSType( GetOSType(*pJobPlatform) );
-//                      ByteString sLogFileName = sProjectName;
-//                      sLogFileName += ByteString::CreateFromInt64( pPrj->Count() );
-//                      pCmdData->SetLogFile( sLogFileName );
-//                      pCmdData->SetClientRestriction( sJobRestriction );
-//                      if ( pDepList )
-//                          pCmdData->SetDependencies( pDepList );
-//
-//                      pPrj->Insert ( pCmdData, LIST_APPEND );
-//
-//                      pJobType = aJobTypes.Next();
-//                  }
-//
-//                  pJobPlatform = aJobPlatforms.Next();
-//              }
-//
-//              pJobDir = aJobDirs.Next();
-//          }
-//          pPrj->ExtractDependencies();
-//      }
-//      catch (XmlBuildListException) {
-//          if (pPrj)
-//          {
-//              RemovePrj (pPrj);
-//              delete pPrj;
-//          }
-//
-//      }
-//  }
-//}
-
 /*****************************************************************************/
 int Star::GetOSType ( ByteString& aWhatOS ) {
 /*****************************************************************************/
diff --git a/soldep/inc/dep.hxx b/soldep/inc/dep.hxx
deleted file mode 100644
index 712bd92bb98d..000000000000
--- a/soldep/inc/dep.hxx
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
- /*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _DEP_HXX
-#define _DEP_HXX
-
-#include <bootstrp/sstring.hxx>
-
-class SByteExtStringList : public SByteStringList
-{
-    private:
-        BOOL        bDeleteStrings;
-    public:
-        SByteExtStringList(BOOL bDelete = TRUE) : bDeleteStrings (bDelete) {}
-        ~SByteExtStringList();
-};
-
-class VersionDepInfo : public SByteExtStringList
-{
-    private:
-        ByteString*                 pVersion;
-    public:
-        VersionDepInfo() : pVersion (NULL) {}
-        VersionDepInfo(const ByteString& rCurrentVersion) : pVersion (NULL) { pVersion = new ByteString(rCurrentVersion); }
-        ~VersionDepInfo();
-        void                Clear();
-        const ByteString*   GetVersion() { return pVersion; }
-        //void              SetVersion(ByteString* pStr) { pVersion = pStr; }
-};
-
-DECLARE_LIST( VersionDepInfoList_Impl, VersionDepInfo* )
-
-class VersionDepInfoList : public VersionDepInfoList_Impl
-{
-    public:
-        VersionDepInfoList () {}
-        ~VersionDepInfoList () {}
-        VersionDepInfo*     GetVersion (ByteString& rVersion);
-        void                RemoveVersion (ByteString& rVersion);
-        VersionDepInfo*     InsertVersion (ByteString& rVersion);
-
-};
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/soldep/inc/soldep/prj.hxx b/soldep/inc/soldep/prj.hxx
index 0f83168e7baa..ba082d98fafe 100644
--- a/soldep/inc/soldep/prj.hxx
+++ b/soldep/inc/soldep/prj.hxx
@@ -55,11 +55,6 @@
 class SByteStringList;
 class GenericInformationList;
 
-/*
-// Pfade auf Konfigurationsdateien des Build-Servers
-
-#define REQUEST_DIR         \\src\data4\source\b_server\server\newjob
-*/
 /*********************************************************************
 *
 *   Die Klasse CommandData haelte alle Informationen, die fuer die
@@ -84,55 +79,54 @@ class CommandData
     ByteString      sClientRestriction;
     SByteStringList *pDepList;
     SByteStringList *pCommandList;
-    USHORT      nOSType;
-    USHORT      nCommand;
-
-    ULONG       nDepth;             // Tiefe der Abhaenigkeit
+    USHORT          nOSType;
+    USHORT          nCommand;
+    ULONG           nDepth;             // Tiefe der Abhaenigkeit
 
 public:
-                CommandData();
-                ~CommandData();
+                    CommandData();
+                    ~CommandData();
     ByteString      GetProjectName(){return aPrj;}
-    void        SetProjectName( ByteString aName ){aPrj = aName;}
+    void            SetProjectName( ByteString aName ){aPrj = aName;}
     ByteString      GetLogFile(){return aLogFileName;}
-    void        SetLogFile( ByteString aName ){aLogFileName = aName;}
+    void            SetLogFile( ByteString aName ){aLogFileName = aName;}
     ByteString      GetInpath(){return aInpath;}
-    void        SetInpath( ByteString aName ){aInpath = aName;}
+    void            SetInpath( ByteString aName ){aInpath = aName;}
     ByteString      GetUpd(){return aUpd;}
-    void        SetUpd( ByteString aName ){aUpd = aName;}
+    void            SetUpd( ByteString aName ){aUpd = aName;}
     ByteString      GetUpdMinor(){return aUpdMinor;}
-    void        SetUpdMinor( ByteString aName ){aUpdMinor = aName;}
+    void            SetUpdMinor( ByteString aName ){aUpdMinor = aName;}
     ByteString      GetProduct(){return aProduct;}
-    void        SetProduct( ByteString aName ){aProduct = aName;}
+    void            SetProduct( ByteString aName ){aProduct = aName;}
     ByteString      GetCommand(){return aCommand;}
-    void        SetCommand ( ByteString aName ){aCommand = aName;}
+    void            SetCommand ( ByteString aName ){aCommand = aName;}
     ByteString      GetCommandPara(){return aCommandPara;}
-    void        SetCommandPara ( ByteString aName ){aCommandPara = aName;}
+    void            SetCommandPara ( ByteString aName ){aCommandPara = aName;}
     ByteString      GetComment(){return aComment;}
-    void        SetComment ( ByteString aCommentString ){aComment = aCommentString;}
+    void            SetComment ( ByteString aCommentString ){aComment = aCommentString;}
     ByteString      GetPath(){return aPath;}
-    void        SetPath( ByteString aName ){aPath = aName;}
+    void            SetPath( ByteString aName ){aPath = aName;}
     ByteString      GetPrePath(){return aPrePath;}
-    void        SetPrePath( ByteString aName ){aPrePath = aName;}
-    USHORT      GetOSType(){return nOSType;}
+    void            SetPrePath( ByteString aName ){aPrePath = aName;}
+    USHORT          GetOSType(){return nOSType;}
     ByteString      GetOSTypeString();
-    void        SetOSType( USHORT nType ){nOSType = nType;}
-    USHORT      GetCommandType(){return nCommand;}
+    void            SetOSType( USHORT nType ){nOSType = nType;}
+    USHORT          GetCommandType(){return nCommand;}
     ByteString      GetCommandTypeString();
-    void        SetCommandType( USHORT nCommandType ){nCommand = nCommandType;}
-    SByteStringList* GetDependencies(){return pDepList;}
-    void        SetDependencies( SByteStringList *pList ){pDepList = pList;}
+    void            SetCommandType( USHORT nCommandType ){nCommand = nCommandType;}
+    SByteStringList*    GetDependencies(){return pDepList;}
+    void            SetDependencies( SByteStringList *pList ){pDepList = pList;}
     ByteString      GetClientRestriction() { return sClientRestriction; }
-    void        SetClientRestriction( ByteString sRestriction ) { sClientRestriction = sRestriction; }
+    void            SetClientRestriction( ByteString sRestriction ) { sClientRestriction = sRestriction; }
 
-    void        AddDepth(){nDepth++;}
-    ULONG       GetDepth(){return nDepth;}
+    void            AddDepth(){nDepth++;}
+    ULONG           GetDepth(){return nDepth;}
 
-    void AddCommand(ByteString* pCommand);
-    SByteStringList* GetCommandList() {return pCommandList;}
+    void            AddCommand(ByteString* pCommand);
+    SByteStringList*    GetCommandList() {return pCommandList;}
 
-    CommandData& operator<<  ( SvStream& rStream );
-    CommandData& operator>>  ( SvStream& rStream );
+    CommandData&    operator<<  ( SvStream& rStream );
+    CommandData&    operator>>  ( SvStream& rStream );
 };
 
 /*********************************************************************
@@ -147,16 +141,16 @@ class SimpleConfig
     long            nLine;
     String          aFileName;
     SvFileStream    aFileStream;
-    ByteString          aTmpStr;
-    ByteString          aStringBuffer;
+    ByteString      aTmpStr;
+    ByteString      aStringBuffer;
+    ByteString      GetNextLine();
 
-    ByteString          GetNextLine();
 public:
                     SimpleConfig(String aSimpleConfigFileName);
                     SimpleConfig(DirEntry& rDirEntry);
                     ~SimpleConfig();
-    ByteString          GetNext();
-    ByteString          GetCleanedNextLine( BOOL bReadComments = FALSE );
+    ByteString      GetNext();
+    ByteString      GetCleanedNextLine( BOOL bReadComments = FALSE );
 };
 
 #define ENV_GUI     0x00000000
@@ -287,16 +281,15 @@ private:
     PrjList*        pTempCommandDataList;
     BOOL            bTempCommandDataListPermanent;
     BOOL            bError;
+
 public:
                     Prj();
                     Prj( ByteString aName );
                     ~Prj();
     void            SetPreFix( ByteString aPre ){aProjectPrefix = aPre;}
-    ByteString          GetPreFix(){return aProjectPrefix;}
-    ByteString          GetProjectName()
-                            {return aProjectName;}
-    void            SetProjectName(ByteString aName)
-                            {aProjectName = aName;}
+    ByteString      GetPreFix(){return aProjectPrefix;}
+    ByteString      GetProjectName() { return aProjectName; }
+    void            SetProjectName(ByteString aName) { aProjectName = aName; }
     BOOL            InsertDirectory( ByteString aDirName , USHORT aWhat,
                                     USHORT aWhatOS, ByteString aLogFileName,
                                     const ByteString &rClientRestriction );
@@ -371,7 +364,6 @@ public:
 DECLARE_LIST( StarFileList, StarFile * )
 
 #define STAR_MODE_SINGLE_PARSE          0x0000
-//#define STAR_MODE_RECURSIVE_PARSE     0x0001      it dosen't work anymore
 #define STAR_MODE_MULTIPLE_PARSE        0x0002
 
 class Star : public StarList
@@ -416,7 +408,6 @@ public:
     ByteString      GetName(){ return aStarName; }; // dummy function of VG
     void            Read( String &rFileName );
     void            Read( SolarFileList *pSOlarFiles );
-//  void            ReadXmlBuildList(const ByteString& sBuildLstPath);
 
 
     BOOL            HasProject( ByteString aProjectName );
@@ -472,7 +463,7 @@ public:
     Prj*            RemoveProject ( ByteString aProjectName );
 
     USHORT          Read( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE  );
-       USHORT           Read( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE );
+    USHORT          Read( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE );
     USHORT          Write( String aFileName );
     USHORT          WriteMultiple( String rSourceRoot );
 
diff --git a/soldep/source/depapp.cxx b/soldep/source/depapp.cxx
index 9f548ee49d7a..91a7b66cc10a 100644
--- a/soldep/source/depapp.cxx
+++ b/soldep/source/depapp.cxx
@@ -137,8 +137,8 @@ SAL_IMPLEMENT_MAIN()
     InitVCL( xMS );
     ::comphelper::setProcessServiceFactory(xMS);
     com::sun::star::uno::Sequence< com::sun::star::uno::Any > aArgs(2);
-    aArgs[0] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );
-    aArgs[1] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );
+    aArgs[0] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL ));
+    aArgs[1] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE ));
 
     ::ucbhelper::ContentBroker::initialize( xMS, aArgs );
 
diff --git a/soldep/source/soldep.cxx b/soldep/source/soldep.cxx
index 487541531f49..c47ae3098bb6 100644
--- a/soldep/source/soldep.cxx
+++ b/soldep/source/soldep.cxx
@@ -44,7 +44,7 @@
 #include "dtsodcmp.hrc"
 
 IMPLEMENT_HASHTABLE_OWNER( SolIdMapper, ByteString, ULONG* );
-//IMPLEMENT_HASHTABLE_OWNER( PrjIdMapper, ByteString, ULONG* );
+
 #define EVENT_RESIZE                0x00000001
 #define MIN(a,b) (a)<(b)?(a):(b)
 #define MAX(a,b) (a)>(b)?(a):(b)
@@ -67,7 +67,6 @@ SolDep::SolDep( Window* pBaseWindow )
 {
     mnSolWinCount = 0;
     mnSolLastId = 0;
-//    mpPrjIdMapper = new SolIdMapper( 63997 );
     maTaskBarFrame.EnableAlwaysOnTop();
     maTaskBarFrame.Show();
     maToolBox.SetPosSizePixel( Point( 0,0 ), Size( 1100,35 ));
@@ -102,8 +101,7 @@ void SolDep::Init()
     if ( mpStandLst && (aUpdater == "YES") ) {
         if ( GetVersion() )
             ReadSource( TRUE );
-    } else
-    {
+    } else {
         ReadSource();   // if stand.lst isn't available
     }
 }
@@ -144,86 +142,80 @@ void SolDep::ProcessChildWindowEvent( const VclWindowEvent& _rVclWindowEvent )
 /*****************************************************************************/
 {
     Window* pChildWin = _rVclWindowEvent.GetWindow();
-//    Window* pParentWin = pChildWin->GetParent();
-//Resize();
     if ( isAlive() )
+    {
+        ULONG id = _rVclWindowEvent.GetId();
+        switch ( id )
         {
-            ULONG id = _rVclWindowEvent.GetId();
-            switch ( id )
+        case VCLEVENT_USER_MOUSEBUTTON_DOWN:
             {
-                case VCLEVENT_USER_MOUSEBUTTON_DOWN:
-                    {
-                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
-                        if( pObjWin )
-                        {
-                            // handle mouse click on ObjectWin object
-                            ObjectWin* pWin = (ObjectWin*) pChildWin;
-                            //GetObjectList()->ResetSelectedObject();
-                            if (IsHideMode())      // simple mouse click left
-                            {
-                                pWin->CaptureMouse();
-                                pWin->SetMarkMode( MARKMODE_SELECTED );
-                                pWin->MarkNeeded();
-                                pWin->MarkDepending();
-                                pWin->Invalidate();
-                            } else
-                            {
-                                pWin->LoseFocus();
-                                pWin->SetMarkMode( MARKMODE_SELECTED );
-                                pWin->UnsetMarkMode( MARKMODE_ACTIVATED );
-                                pWin->MarkNeeded( TRUE );
-                                pWin->MarkDepending( TRUE );
-                            }
-
-                        }
-                    }
-                    break;
-                case VCLEVENT_USER_MOUSEBUTTON_DOWN_ALT:
+                ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
+                if( pObjWin )
+                {
+                    // handle mouse click on ObjectWin object
+                    ObjectWin* pWin = (ObjectWin*) pChildWin;
+                    if (IsHideMode())      // simple mouse click left
                     {
-                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
-                        if( pObjWin )
-                        {
-                            ObjectWin* pWin = (ObjectWin*) pChildWin;
-                            MarkObjects( pWin );
-                        }
+                        pWin->CaptureMouse();
+                        pWin->SetMarkMode( MARKMODE_SELECTED );
+                        pWin->MarkNeeded();
+                        pWin->MarkDepending();
+                        pWin->Invalidate();
+                    } else {
+                        pWin->LoseFocus();
+                        pWin->SetMarkMode( MARKMODE_SELECTED );
+                        pWin->UnsetMarkMode( MARKMODE_ACTIVATED );
+                        pWin->MarkNeeded( TRUE );
+                        pWin->MarkDepending( TRUE );
                     }
-                    break;
-                case VCLEVENT_USER_MOUSEBUTTON_DOWN_DBLCLICK:
-                    {
-                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
-                        if( pObjWin )
-                        {
-                            if (IsHideMode()) ToggleHideDependency();
-                            ByteString text = ((ObjectWin*) pChildWin)->GetBodyText();
-                            ViewContent(text);
-                        }
-                    }
-                    break;
-                case VCLEVENT_USER_MOUSEBUTTON_UP_SHFT:
-                    {
-                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
-                        if( pObjWin )
-                        {
-                            ObjectWin* pWin = (ObjectWin*) pChildWin;
-                            GetDepWin()->NewConnector( pWin );
-                        }
-                    }
-                    break;
-                case VCLEVENT_USER_MOUSEBUTTON_UP:
-                     {
-                        ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
-                        if( pObjWin )
-                        {
-                            ObjectWin* pWin = (ObjectWin*) pChildWin;
-                            pWin->ReleaseMouse();
-                            pWin->SetMarkMode(MARKMODE_SELECTED);
-                            GetDepWin()->Invalidate();
-                        }
-                     }
-                     break;
-            }    // switch
-        }  // if isAlive
-        //fprintf(stdout,"BLA::Resize: %d\n",pChildWin);
+                }
+            }
+            break;
+        case VCLEVENT_USER_MOUSEBUTTON_DOWN_ALT:
+            {
+                ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
+                if( pObjWin )
+                {
+                    ObjectWin* pWin = (ObjectWin*) pChildWin;
+                    MarkObjects( pWin );
+                }
+            }
+            break;
+        case VCLEVENT_USER_MOUSEBUTTON_DOWN_DBLCLICK:
+            {
+                ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
+                if( pObjWin )
+                {
+                    if (IsHideMode()) ToggleHideDependency();
+                    ByteString text = ((ObjectWin*) pChildWin)->GetBodyText();
+                    ViewContent(text);
+                }
+            }
+            break;
+        case VCLEVENT_USER_MOUSEBUTTON_UP_SHFT:
+            {
+               ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
+               if( pObjWin )
+               {
+                    ObjectWin* pWin = (ObjectWin*) pChildWin;
+                    GetDepWin()->NewConnector( pWin );
+                }
+            }
+            break;
+        case VCLEVENT_USER_MOUSEBUTTON_UP:
+            {
+                ObjectWin* pObjWin = dynamic_cast<ObjectWin*>(pChildWin);
+                if( pObjWin )
+                {
+                    ObjectWin* pWin = (ObjectWin*) pChildWin;
+                    pWin->ReleaseMouse();
+                    pWin->SetMarkMode(MARKMODE_SELECTED);
+                    GetDepWin()->Invalidate();
+                }
+            }
+            break;
+        }
+    }
 }
 
 /*****************************************************************************/
@@ -233,10 +225,10 @@ IMPL_LINK( SolDep, ToolSelect, SoldepToolBox* , pBox)
     USHORT nItemId = pBox->GetCurItemId();
     switch ( nItemId )
     {
-        case TID_SOLDEP_FIND:
-            FindProject();
-            break;
-        case TID_SOLDEP_CREATEMETA :
+    case TID_SOLDEP_FIND:
+        FindProject();
+        break;
+    case TID_SOLDEP_CREATEMETA :
         {
             VirtualDevice   aVDev;
             aVDev.SetMapMode( MAP_100TH_MM );
@@ -279,38 +271,37 @@ IMPL_LINK( SolDep, ToolSelect, SoldepToolBox* , pBox)
             aMtf.SetPrefSize( aDevSize );
             SvFileStream aStream( String::CreateFromAscii("d:\\out.svm"), STREAM_STD_READWRITE );
             aMtf.Write( aStream );
-            break;
         }
-        case TID_SOLDEP_HIDE_INDEPENDEND:
-            {
-                ToggleHideDependency();
-                for ( USHORT i=0; i<mpObjectList->Count(); i++ )
-                    mpObjectList->GetObject(i)->SetViewMask(!mbIsHide);
-
-                   maToolBox.CheckItem(TID_SOLDEP_HIDE_INDEPENDEND, IsHideMode());
-                   GetDepWin()->Invalidate(); //repaint Main-View
-            }
-            break;
-        case TID_SOLDEP_SELECT_WORKSPACE:
-            if (mpStandLst)
+        break;
+    case TID_SOLDEP_HIDE_INDEPENDEND:
+        {
+            ToggleHideDependency();
+            for ( USHORT i=0; i<mpObjectList->Count(); i++ )
+                mpObjectList->GetObject(i)->SetViewMask(!mbIsHide);
+                maToolBox.CheckItem(TID_SOLDEP_HIDE_INDEPENDEND, IsHideMode());
+               GetDepWin()->Invalidate(); //repaint Main-View
+        }
+        break;
+    case TID_SOLDEP_SELECT_WORKSPACE:
+        if (mpStandLst)
+        {
+            if (GetVersion()) // Version dialog box
             {
-                if (GetVersion()) // Version dialog box
-                {
-                    delete mpSolIdMapper;
-                    delete mpStarWriter;
-                    mpObjectList->ClearAndDelete();
-                    ReadSource(TRUE);
-                }
+                delete mpSolIdMapper;
+                delete mpStarWriter;
+                mpObjectList->ClearAndDelete();
+                ReadSource(TRUE);
             }
-            break;
-        case TID_SOLDEP_BACK:
-            maToolBox.HideItem(TID_SOLDEP_BACK);
-            maToolBox.ShowItem(TID_SOLDEP_SELECT_WORKSPACE);  //disabled for prj view (doubleclick ObjWin)
-            maToolBox.ShowItem(TID_SOLDEP_HIDE_INDEPENDEND);  //disabled for prj view (doubleclick ObjWin)
-            maToolBox.ShowItem(TID_SOLDEP_FIND);              //disabled for prj view (doubleclick ObjWin)
-            maToolBox.Resize();
-            TogglePrjViewStatus();
-            break;
+        }
+        break;
+    case TID_SOLDEP_BACK:
+        maToolBox.HideItem(TID_SOLDEP_BACK);
+        maToolBox.ShowItem(TID_SOLDEP_SELECT_WORKSPACE);  //disabled for prj view (doubleclick ObjWin)
+        maToolBox.ShowItem(TID_SOLDEP_HIDE_INDEPENDEND);  //disabled for prj view (doubleclick ObjWin)
+        maToolBox.ShowItem(TID_SOLDEP_FIND);              //disabled for prj view (doubleclick ObjWin)
+        maToolBox.Resize();
+        TogglePrjViewStatus();
+        break;
     }
     return 0;
 }
@@ -367,7 +358,7 @@ ObjectWin *SolDep::RemoveObject( USHORT nId, BOOL bDelete )
 {
     Prj* pPrj;
 
-//hshtable auf stand halten
+    //hshtable auf stand halten
     ObjectWin* pWin = RemoveObjectFromList( mpObjectList, mnSolWinCount, nId, FALSE );
     if ( pWin )
     {
@@ -375,7 +366,7 @@ ObjectWin *SolDep::RemoveObject( USHORT nId, BOOL bDelete )
         if( (pPrj = mpStarWriter->GetPrj( aBodyText )) )
         {
             mpStarWriter->Remove( pPrj );
-//cleanup ist teuer...
+            //cleanup ist teuer...
             mpStarWriter->CleanUp();
             delete pPrj;
         }
@@ -402,7 +393,7 @@ ULONG SolDep::AddObject( ByteString& rBodyText, BOOL bInteract )
     }
     else
     {
-//hashtable auf stand halten
+        //hashtable auf stand halten
         MyHashObject* pHObject;
         nObjectId = AddObjectToList( mpBaseWin, mpObjectList, mnSolLastId, mnSolWinCount, rBodyText, FALSE );
         pHObject = new MyHashObject( nObjectId, ObjIdToPtr(mpObjectList, nObjectId ));
@@ -422,11 +413,11 @@ ULONG SolDep::AddPrjObject( ByteString& rBodyText, BOOL bInteract )
     }
     else
     {
-//hshtable auf stand halten
+        //hshtable auf stand halten
         MyHashObject* pHObject;
         nObjectId = AddObjectToList( mpBasePrjWin, mpObjectPrjList, mnPrjLastId, mnPrjWinCount, rBodyText );
         pHObject = new MyHashObject( nObjectId, ObjIdToPtr( mpObjectPrjList, nObjectId ));
-        mpPrjIdMapper->Insert( rBodyText, pHObject ); // mpPrjIdMapper
+        mpPrjIdMapper->Insert( rBodyText, pHObject );
     }
     return nObjectId;
 }
@@ -435,7 +426,6 @@ ULONG SolDep::AddPrjObject( ByteString& rBodyText, BOOL bInteract )
 USHORT SolDep::AddConnector( ObjectWin* pStartWin, ObjectWin* pEndWin )
 /*****************************************************************************/
 {
-//  DBG_ASSERT( FALSE , "not yet" );
     ByteString sEndName = pEndWin->GetBodyText();
     ByteString sStartName = pStartWin->GetBodyText();
 
@@ -500,7 +490,6 @@ void SolDep::RemoveAllObjects( ObjectList* pObjLst )
 ULONG SolDep::GetStart(SolIdMapper* pIdMapper, ObjectList* pObjList)
 /*****************************************************************************/
 {
-//  DBG_ASSERT( FALSE , "soldep" );
     MyHashObject* pHObject = pIdMapper->Find( "null" );//null_project
 
     if ( !pHObject ) {
@@ -517,7 +506,6 @@ ULONG SolDep::GetStart(SolIdMapper* pIdMapper, ObjectList* pObjList)
 ULONG SolDep::GetStartPrj(SolIdMapper* , ObjectList* )
 /*****************************************************************************/
 {
-//  DBG_ASSERT( FALSE , "prjdep" );
     MyHashObject* pHObject = mpPrjIdMapper->Find( ByteString( "null" ) ); //null_dir
     if ( !pHObject )
     {
@@ -593,30 +581,20 @@ USHORT SolDep::ReadSource(BOOL bUpdater)
             {
                 pStr = pLst->GetObject(m);
                 pHObject = mpSolIdMapper->Find( *pStr );
-                /*if ( !pHObject )
-                {
-    // create new prj
-                    Prj *pNewPrj = new Prj( *pStr );
-                    ByteString sPrjName = pNewPrj->GetProjectName();
-                    nObjectId = AddObject( sPrjName, FALSE );
-                    pHObject = mpSolIdMapper->Find( *pStr );
-                    ObjIdToPtr( mpObjectList, nObjectId )->SetViewMask( 2 );
-                }*/
-
                 if ( pHObject )
                 {
-                nHashedId = pHObject->GetId();
-                ByteString sF_Os2 = pPrj->GetProjectName();
-                pStr = &sF_Os2;
-                pHObject = mpSolIdMapper->Find( *pStr );
-                nObjectId = pHObject->GetId();
-                pStartWin = ObjIdToPtr( mpObjectList, nHashedId );
-                pEndWin = ObjIdToPtr( mpObjectList, nObjectId );
-                AddConnectorToObjects( pStartWin, pEndWin );
+                    nHashedId = pHObject->GetId();
+                    ByteString sF_Os2 = pPrj->GetProjectName();
+                    pStr = &sF_Os2;
+                    pHObject = mpSolIdMapper->Find( *pStr );
+                    nObjectId = pHObject->GetId();
+                    pStartWin = ObjIdToPtr( mpObjectList, nHashedId );
+                    pEndWin = ObjIdToPtr( mpObjectList, nObjectId );
+                    AddConnectorToObjects( pStartWin, pEndWin );
+                }
             }
         }
     }
-    }
     if (!IsPrjView())
     {
         AutoArrange( mpSolIdMapper, mpObjectList, GetStart(mpSolIdMapper,mpObjectList), 0, GetStart(mpSolIdMapper,mpObjectList) );
@@ -669,37 +647,12 @@ SolarFileList* SolDep::GetPrjListFromDir()
 USHORT SolDep::WriteSource()
 /*****************************************************************************/
 {
-/* zur Sicherheit deaktiviert
-    USHORT nMode = mpStarWriter->GetMode();
-    if ( nMode == STAR_MODE_SINGLE_PARSE ) {
-        ByteString sFileName = mpStarWriter->GetName();
-        if ( sFileName.Len()) {
-            mpStarWriter->Write( String( sFileName, RTL_TEXTENCODING_UTF8) );
-            mpStarWriter->RemoveProject( ByteString( "null"));  //null_project
-        }
-    }
-    else if ( nMode == STAR_MODE_MULTIPLE_PARSE ) {
-    // *OBO*
-    //String sRoot = mpStarWriter->GetSourceRoot();
-    //nicht mehr unterstützt mpStarWriter->GetSourceRoot()
-        ByteString sFileName = mpStarWriter->GetName();
-        DirEntry aEntry( sFileName );
-        aEntry.ToAbs();
-        aEntry = aEntry.GetPath().GetPath().GetPath();
-        String sRoot = aEntry.GetFull();
-
-        if ( sRoot.Len()) {
-            mpStarWriter->RemoveProject( ByteString( "null")); //null_project
-            mpStarWriter->WriteMultiple( sRoot );
-        }
-    }
-*/
     return 1;
 }
 
 USHORT SolDep::Load( const ByteString& rFileName )
 {
-// moved from depper class
+    // moved from depper class
     DBG_ASSERT( FALSE , "you are dead!" );
     SvFileStream aInFile( String( rFileName, RTL_TEXTENCODING_UTF8 ), STREAM_READ );
     depper_head dh;
@@ -723,7 +676,7 @@ USHORT SolDep::Load( const ByteString& rFileName )
 
     ULONG nStartId;
     ULONG nEndId;
-//  ueber addconnector fuehren!
+    //  ueber addconnector fuehren!
     for ( i=0; i < nCnctrCount ; i++ )
     {
         Connector* pCon = new Connector( mpBaseWin, WB_NOBORDER );
@@ -738,7 +691,6 @@ USHORT SolDep::Load( const ByteString& rFileName )
         pCon->Initialize( pStartWin, pEndWin );
     }
 
-
     return 0;
 }
 
@@ -752,7 +704,6 @@ BOOL SolDep::ViewContent( ByteString& rObjectName )
     for ( ULONG i = 0; i < mpObjectList->Count() && !mpFocusWin; i++ )
         if ( mpObjectList->GetObject( i )->HasFocus())
             mpFocusWin = mpObjectList->GetObject( i );
-    //HideObjectsAndConnections( mpObjectList );
     mpProcessWin->Resize();
     GetDepWin()->Show();
     return InitPrj( rObjectName );
@@ -794,8 +745,7 @@ BOOL SolDep::InitPrj( ByteString& rListName )
 
     for ( i=0; i<nCount; i++ )
     {
-// pPrj->GetProjectName() returns the name of
-// the project e.g. svtools
+        // pPrj->GetProjectName() returns the name of the project e.g. svtools
         pPrj = mpStarWriter->GetObject(i);
         ByteString sPrjName = pPrj->GetProjectName();
         if ( sPrjName == rListName )
@@ -809,23 +759,23 @@ BOOL SolDep::InitPrj( ByteString& rListName )
                 CommandData *pData = mpPrj->GetObject(j);
                 fprintf( stdout, "\tProjectDir : %s\n",
                         pData->GetLogFile().GetBuffer());
-// pData->GetLogFile() contains internal project IDs
-// e.g. st_mkout etc.
+                        // pData->GetLogFile() contains internal project IDs
+                        // e.g. st_mkout etc.
                 if ( pData->GetLogFile() != "" )
                 {
                     ByteString sItem = pData->GetLogFile();
                     nObjectId = AddPrjObject( sItem, FALSE);
-// there may be faster ways......
+                    // there may be faster ways......
                     ObjectWin *pWin = ObjIdToPtr( mpObjectPrjList, nObjectId );
                     pWin->SetViewMask( 0x0001 );
-// pData->GetPath() contains internal project directories
-// e.g. svtools/inc etc.
+                    // pData->GetPath() contains internal project directories
+                    // e.g. svtools/inc etc.
                     ByteString sPath = pData->GetPath();
                     pWin->SetTipText( sPath );
                 }
             }
 
-// set connectors for dependencies here
+            // set connectors for dependencies here
             for ( j=0; j<nDirCount; j++ )
             {
                 CommandData *pData = mpPrj->GetObject(j);
@@ -834,11 +784,9 @@ BOOL SolDep::InitPrj( ByteString& rListName )
                 {
                     ByteString sFlagName = pData->GetLogFile();
                     pFlagName = &sFlagName;
-                    //pHObject = mpPrjIdMapper->Find( (*pFlagName).GetToken( 0, '.'));//mpSolIdMapper see ReadSource()
                     pHObject = mpPrjIdMapper->Find( sFlagName.GetToken( 0, '.'));
                     if (pHObject)
                     {
-
                         nObjectId = pHObject->GetId();
 
                         ULONG nDepCount = pDeps->Count();
@@ -866,9 +814,7 @@ BOOL SolDep::InitPrj( ByteString& rListName )
                         }
                     }
                 }
-
             }
-
             break;
         }
     }
@@ -877,9 +823,6 @@ BOOL SolDep::InitPrj( ByteString& rListName )
     ObjectWin *pWin = ObjIdToPtr( mpObjectPrjList, nObjectId );
     pWin->SetViewMask( 0x0001 );
     mpGraphPrjWin->EnablePaint( TRUE );
-    //debug
-//    int test_l = GetStartPrj(mpPrjIdMapper, mpObjectPrjList);
-//    ObjectWin *pTestWin = ObjIdToPtr( mpObjectPrjList, test_l );
     AutoArrange( mpPrjIdMapper, mpObjectPrjList, GetStartPrj(mpPrjIdMapper, mpObjectPrjList), 0, GetStartPrj(mpPrjIdMapper, mpObjectPrjList) );
     mpGraphWin->Hide();
     mpGraphPrjWin->Show();
@@ -984,21 +927,17 @@ BOOL SolDep::MarkObjects( ObjectWin* pObjectWin )
 
 void SolDep::Resize()
 {
-//funzt! muß aber von der applikation aufgerufen werden.
+    //funzt! muß aber von der applikation aufgerufen werden.
     Point aOutPos = Point( 0, 0 );
     Size aOutSize = mpProcessWin->GetOutputSizePixel();
-        // calculate output size
+    // calculate output size
     ULONG nTaskHeight = maToolBox.CalcWindowSizePixel().Height();
     ULONG nTaskWidth  = maToolBox.CalcWindowSizePixel().Width();
     Size aSize( aOutSize.Width(), nTaskHeight );
 
-//  ULONG nMenuHeight = 0;
     Point aGraphWinPos = Point(0,0);
     Size  aGraphWinSize = Size(0,0);
 
-//weiß nicht wie:    nMenuHeight = aMenuBar.GetWindow()->GetSizePixel().Height(); //Höhe des Menues
-
-    //aInRect = pTBManager->Resize( Rectangle( aOutPos, aOutSize );
     // Set Docking-Rectangle for ToolBar
     Rectangle aInRect;
 
@@ -1067,14 +1006,8 @@ void SolDep::Resize()
         }
     }
 
-    Rectangle rout = Rectangle( Point( 0,0 ), aOutSize ); //OutputToScreenPixel( aOutPos )
-    Rectangle rin  = Rectangle( Point( 0,0 ),//OutputToScreenPixel( Point( aOutPos.X() - 20, aInRect.Top())
-                Size( aOutSize.Width(), aOutSize.Height()));
-/*
-    Rectangle rout = mpProcessWin->OutputToScreenPixel( aOutPos );
-    Rectangle rin  = Rectangle( Point( 0,0 ),//OutputToScreenPixel( Point( aOutPos.X() - 20, aInRect.Top())
-                Size( aOutSize.Width(), aOutSize.Height()));
-*/
+    Rectangle rout = Rectangle( Point( 0,0 ), aOutSize );
+    Rectangle rin  = Rectangle( Point( 0,0 ), Size( aOutSize.Width(), aOutSize.Height()));
     maToolBox.SetDockingRects( rout, rin );
 
     BOOL bFloating = maToolBox.IsFloatingMode();
@@ -1082,10 +1015,8 @@ void SolDep::Resize()
     if ( bFloating )
     {
         GetGraphWin()->SetPosSizePixel(Point(0,0),aOutSize);
-        //if (IsPrjView() && (mpPrjDep)) mpPrjDep->Resize();
         if (maToolBox.IsVisible()) maToolBox.Show();
-    } else
-    {
+    } else {
         GetGraphWin()->SetPosSizePixel( aGraphWinPos, aGraphWinSize );
     }
     if (maToolBox.IsVisible()) maToolBox.Show();
@@ -1093,7 +1024,6 @@ void SolDep::Resize()
 
 USHORT SolDep::AddConnectorPrjView( ObjectWin* pStartWin, ObjectWin* pEndWin )
 {
-//  DBG_ASSERT( FALSE , "not yet" );
     ByteString sEndName = pEndWin->GetBodyText();
     ByteString sStartName = pStartWin->GetBodyText();
     if ( sStartName != ByteString("null"))
@@ -1222,12 +1152,9 @@ double SolDep::CalcDistSum( ObjWinList* pObjList, DistType eDistType )
                 }
                 j++;
             }
-//          if ( j != 0 )
-//              dWinVal /= j;
             dRetVal += dWinVal;
         }
     }
-
     return dRetVal;
 }
 
@@ -1271,13 +1198,12 @@ USHORT SolDep::Impl_Traveller( ObjectWin* pWin, USHORT nDepth )
 
 double SolDep::Impl_PermuteMin( ObjWinList& rObjList, Point* pPosArray, ObjWinList& rResultList, double dMinDist, ULONG nStart, ULONG nSize, DistType eDistType )
 {
-
     ULONG i, j, l;
     ULONG nEnd = nStart + nSize;
     ObjectWin* pSwapWin;
     ULONG nLevelObjCount = rObjList.Count();
 
-//dont use full recusion for more than 6 objects
+    //dont use full recusion for more than 6 objects
     if ( nLevelObjCount > 6 )
     {
         srand(( unsigned ) time( NULL ));
@@ -1315,7 +1241,6 @@ double SolDep::Impl_PermuteMin( ObjWinList& rObjList, Point* pPosArray, ObjWinLi
                         rResultList.Insert( pSwapWin, LIST_APPEND);
                     }
                 }
-//              if ( dCurDist > dMinDist * 1.5 )
                 if ( dCurDist > dMinDist * 15 )
                 {
                     pSwapWin = rObjList.GetObject( nIdx1 );
@@ -1478,7 +1403,7 @@ USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nT
                 }
                 else
                 {
-    //              need to be arranged more intelligent...
+                    // need to be arranged more intelligent...
                     Point aPos( 5, nUnvisYOffs );
                     pWin->SetCalcPosPixel( aPos );
 
@@ -1515,11 +1440,9 @@ USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nT
         {
             LevelList[ i ]->Insert( NULL, LIST_APPEND );
             nLevelObjCount++;
-//          LevelUse bleibt orginal...
-//          LevelUse[ i ]++;
         }
 
-// catch too big lists
+        // catch too big lists
         DBG_ASSERT( nLevelObjCount < DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH , "graph zu breit! dat geiht nich gut. breaking" );
         if ( nLevelObjCount >= DEPPER_MAX_LEVEL_WIDTH * DEPPER_MAX_WIDTH )
         {
@@ -1631,7 +1554,7 @@ USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nT
 
     mnMinDynXOffs = 0xffff;
 
-// and back again...
+    // and back again...
     // get better results form already preoptimized upper and lower rows
 
     do
@@ -1651,7 +1574,7 @@ USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nT
             aWorkList.Insert( pSwapWin, LIST_APPEND);
             Point aPos = CalcPos( i, j );
             aPosArray[ j ] = aPos;
-//no need to do this stuff.......   ?????
+            //no need to do this stuff.......   ?????
             if ( pSwapWin )
                 pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
         }
@@ -1659,12 +1582,11 @@ USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nT
         double dMinDist = CalcDistSum( LevelList[ i ], BOTH );
 
         dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelObjCount, BOTH ));
-// wrong position for remaping - keep old positions for comparing
+        // wrong position for remaping - keep old positions for comparing
         for ( j = 0; j < nLevelObjCount; j++ )
         {
             pSwapWin = aWorkList.GetObject( j );
             if ( pSwapWin )
-//              pSwapWin->SetCalcPosPixel( mpBaseWin->LogicToPixel( aPosArray[ j ] ));
                 pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
         }
 
@@ -1681,7 +1603,7 @@ USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nT
             {
                 Point aPos = CalcPos( i, j );
                 bUsedPos = FALSE;
-// could be faster
+                // could be faster
                 for ( k = 0; k < nLevelObjCount; k++ )
                 {
                     if ( LevelList[ i ]->GetObject( k ) )
@@ -1705,7 +1627,7 @@ USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nT
             dMinDist = CalcDistSum( LevelSecList[ i ], BOTH );
 
             dMinDist = MIN( dMinDist, Impl_PermuteMin( *(LevelSecList[ i ]), aPosArray, aWorkList, dMinDist, 0, nLevelSecObjCount, BOTH ));
-// wrong position for remaping - keep old positions for comparing
+            // wrong position for remaping - keep old positions for comparing
             for ( j = 0; j < nLevelSecObjCount; j++ )
             {
                 pSwapWin = aWorkList.GetObject( j );
@@ -1713,14 +1635,11 @@ USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nT
                     pSwapWin->SetCalcPosPixel( aPosArray[ j ] );
             }
         }
-//      i--;
     } while ( i != 0 );
     SetMainProgressBar( 100 );
 
     ULONG nNewXSize = ( DEPPER_MAX_WIDTH + 1 )  * ( OBJWIN_X_SPACING + GetDefSize().Width() );
 
-    //    ULONG aObjID = GetStart(pIdMapper, pObjLst) //hier muß man switchen GetStart/GetPrjStart oder so
-
     ObjectWin* pObjWin = ObjIdToPtr( pObjLst, aObjID);
 
     ULONG nNewYSize = pObjWin->GetCalcPosPixel().Y() + GetDefSize().Height() + 2 * OBJWIN_Y_SPACING;
@@ -1738,14 +1657,7 @@ USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nT
     if ( GetDepWin()->LogicToPixel( aNowSize ).Height()  > aTmpSize.Height() )
         aTmpSize.Height() = GetDepWin()->LogicToPixel( aNowSize ).Height() ;
 
-//  if ( nZoomed <= 0 )
-//  {
-//      mpBaseWin->SetSizePixel( aTmpSize );
-//      mpGraphWin->SetTotalSize( aTmpSize );
-//      mpGraphWin->EndScroll( 0, 0 );
-//  }
-
-// now remap all objects
+    // now remap all objects
     ULONG nAllObjCount = pObjLst->Count();
     Point aTmpPos;
     for ( j = 0; j < nAllObjCount; j++ )
@@ -1755,10 +1667,10 @@ USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nT
             aTmpPos = pWin->GetCalcPosPixel();
             if ( pWin->mbVisited )
             {
-// reserve space for unconnected
+                // reserve space for unconnected
                 aTmpPos.X() -= mnMinDynXOffs;
                 aTmpPos.X() += GetDefSize().Width() + OBJWIN_X_SPACING;
-// center window
+                // center window
                 aTmpPos.X() += GetDefSize().Width() / 2;
                 aTmpPos.X() -= pWin->PixelToLogic( pWin->GetSizePixel()).Width() / 2 ;
             }
@@ -1768,10 +1680,10 @@ USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nT
     aWorkList.Clear();
     GetDepWin()->EnablePaint( TRUE );
     GetDepWin()->Invalidate();
-//LevelListen loeschen                  Hä? Welche Levellisten?
+    //LevelListen loeschen                  Hä? Welche Levellisten?
 
-//Update all Connectors
-// --> To be done: Don't call twice Object1-Connector-Object2
+    //Update all Connectors
+    // --> To be done: Don't call twice Object1-Connector-Object2
     ObjectWin* pObject1;
     for ( i = 0 ; i < nObjCount ; i++)
     {
@@ -1784,7 +1696,7 @@ USHORT SolDep::OptimizePos(SolIdMapper* pIdMapper, ObjectList* pObjLst, ULONG nT
 
 void SolDep::WriteToErrorFile()
 {
-//Needs some improvement
+    //Needs some improvement
     ObjectWin* pWin;
     WarningBox aWBox( mpBaseWin, WB_OK, String::CreateFromAscii("graph too deep! dat geiht nich gut.\nlook at depper.err in your Tmp-directory\nfor list of objects"));
     aWBox.Execute();
diff --git a/solenv/bin/addsym.awk b/solenv/bin/addsym.awk
index 52efcb4ab740..621ca2e4bc42 100644
--- a/solenv/bin/addsym.awk
+++ b/solenv/bin/addsym.awk
@@ -26,16 +26,29 @@
 #*************************************************************************
 
 # Add certain symbol patterns to the first global section.
+#
+# The below code fails with 'perverted' mapfiles (using a strange line layout,
+# or containing version UDK_3_0_0 without a global section, ...).
 
 BEGIN { state = 0 }
-/\{/ && state == 1 { exit 1 } #TODO: print error explanation to stderr?
-/^[\t ]*UDK_3_0_0[\t ]*\{/ && state == 0 { state = 1 }
-/^[\t ]*global[\t ]*:/ && state == 1 { state = 2 }
-{ print }
+END {
+    if (state == 0) {
+        print "# Weak RTTI symbols for C++ exceptions:"
+        print "UDK_3_0_0 {"
+        print "global:"
+        print "_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
+        if (ENVIRON["USE_SYSTEM_STL"] != "YES")
+            print "_ZN4_STL7num_put*; # for STLport"
+        print "};"
+    }
+}
 state == 2 {
     print "_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
     if (ENVIRON["USE_SYSTEM_STL"] != "YES")
         print "_ZN4_STL7num_put*; # for STLport"
     state = 3
 }
-END { if (state != 3) exit 1 } #TODO: print error explanation to stderr?
+# #i66636# - ???
+/^[\t ]*UDK_3_0_0[\t ]*\{/ { state = 1 }
+/^[\t ]*global[\t ]*:/ && state == 1 { state = 2 }
+{ print }
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 0bdff5f61a3d..56abd7870a37 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -87,7 +87,7 @@
 
 #########################
 #                       #
-#   Globale Variablen   #
+#   Global Variables    #
 #                       #
 #########################
 
@@ -151,7 +151,6 @@
     %platforms = (); # platforms available or being working with
     %platforms_to_copy = (); # copy output trees for the platforms when --prepare
     $tmp_dir = get_tmp_dir(); # temp directory for checkout and other actions
-#    $dmake_batch = undef;     #
     @possible_build_lists = ('build.lst', 'build.xlist'); # build lists names
     %build_list_paths = (); # build lists names
     %build_lists_hash = (); # hash of arrays $build_lists_hash{$module} = \($path, $xml_list_object)
@@ -168,15 +167,13 @@
     %build_in_progress_shown = ();  # hash of modules being built,
                                     # and shown last time (to keep order)
     $build_time = time;
-    $html_last_updated = 0;
     %jobs_hash = ();
     $html_path = undef;
     $build_finished = 0;
     $html_file = '';
-    %had_error = (); # hack for misteriuos windows problems - try run dmake 2 times if first time there was an error
+    %had_error = (); # hack for mysterious windows problems - try run dmake 2 times if first time there was an error
     $mkout = CorrectPath("$ENV{SOLARENV}/bin/mkout.pl");
     %weights_hash = (); # hash contains info about how many modules are dependent from one module
-#    %weight_stored = ();
     $grab_output = 1;
     $stop_build_on_error = 0; # for multiprocessing mode: do not build further module if there is an error
     $interactive = 0; # for interactive mode... (for testing purpose enabled by default)
@@ -204,7 +201,7 @@
     my %add_to_config = ();
     my %remove_from_config = ();
     my $clear_config = 0;
-    my $finisched_children = 0;
+    my $finished_children = 0;
     my $debug = 0;
     %module_deps_hash_pids = ();
     my @argv = @ARGV;
@@ -220,7 +217,6 @@
     zenity_open();
     zenity_tooltip("Starting build.");
 
-#    my $temp_html_file = CorrectPath($tmp_dir. '/' . $ENV{INPATH}. '.build.html');
     get_build_modes();
     %deliver_env = ();
     if ($prepare) {
@@ -265,7 +261,6 @@
     %prj_platform = ();
     $check_error_string = '';
     $dmake = '';
-#    $dmake_bin = '';
     $dmake_args = '';
     $echo = '';
     $new_line = "\n";
@@ -285,8 +280,6 @@
         } else {
             print_error ("Cannot open file $cmd_file");
         };
-#    } elsif ($show) {
-#        select STDOUT;
     };
 
     print $new_line;
@@ -300,8 +293,6 @@
     }
     if (scalar keys %broken_build) {
         cancel_build();
-#    } elsif (!$custom_job && $post_custom_job) {
-#        do_post_custom_job(CorrectPath($StandDir.$initial_module));
     };
     print_warnings();
     if (scalar keys %active_modules) {
@@ -420,7 +411,6 @@ sub start_html_message_trigger {
 
     if ($child_id) {
         # parent
-#       print "started listener trigger\n";
     } else {
         my $buffer_size = 1024;
         my $buffer;
@@ -437,7 +427,6 @@ sub start_html_message_trigger {
             if (connect(SOCKET, $paddr)) {
                 $full_buffer .= "\n";
                 syswrite SOCKET, $full_buffer, length $full_buffer;
-#                close SOCKET or die "Child close socket: $!";
             } else {
                 die "Child connect: $!";
             };
@@ -447,7 +436,6 @@ sub start_html_message_trigger {
 };
 
 sub get_html_orders {
-#    print "Parent gonna read\n";
     return if (!$interactive);
     my $buffer_size = 1024;
     my $buffer;
@@ -455,10 +443,9 @@ sub get_html_orders {
     my $full_buffer = '';
     my %modules_to_rebuild = ();
     my %modules_to_delete = ();
-        while ($rv = sysread(HTML_PIPE, $buffer, $buffer_size)) {
-            $full_buffer .= $buffer;
-        };
-#    };
+    while ($rv = sysread(HTML_PIPE, $buffer, $buffer_size)) {
+        $full_buffer .= $buffer;
+    };
     my @html_messages = split(/\n/, $full_buffer);
     foreach (@html_messages) {
         if (/^html_port:(\d+)/) {
@@ -491,7 +478,6 @@ sub get_html_orders {
         schedule_rebuild(\%modules_to_rebuild);
         generate_html_file();
     };
-#    print "Parent got nothing to read\n";
 };
 
 sub schedule_delete {
@@ -643,7 +629,7 @@ sub expand_dependencies {
 # This procedure fills the second hash with reversed dependencies,
 # ie, with info about modules "waiting" for the module
 #
-sub reverse_dependensies {
+sub reverse_dependencies {
     my ($deps_hash, $reversed) = @_;
     foreach my $module (keys %$deps_hash) {
         foreach (keys %{$$deps_hash{$module}}) {
@@ -673,7 +659,7 @@ sub build_all {
         prepare_incompatible_build(\%global_deps_hash) if ($incompatible && (!$build_from_with_branches));
         if ($build_from_with_branches) {
             my %reversed_full_deps_hash = ();
-            reverse_dependensies(\%global_deps_hash, \%reversed_full_deps_hash);
+            reverse_dependencies(\%global_deps_hash, \%reversed_full_deps_hash);
             prepare_build_from_with_branches(\%global_deps_hash, \%reversed_full_deps_hash);
         }
         if ($build_all_cont || $build_since) {
@@ -698,7 +684,7 @@ sub build_all {
         };
         store_weights(\%global_deps_hash);
         backup_deps_hash(\%global_deps_hash, \%global_deps_hash_backup);
-        reverse_dependensies(\%global_deps_hash_backup, \%reversed_dependencies);
+        reverse_dependencies(\%global_deps_hash_backup, \%reversed_dependencies);
         $modules_number = scalar keys %global_deps_hash;
         initialize_html_info($_) foreach (keys %global_deps_hash);
         if ($processes_to_run) {
@@ -792,7 +778,6 @@ sub dmake_dir {
             print "$dmake\n";
             print $check_error_string;
         } else {
-            print "\n" if ( ! $show );
             print "Entering $job_name\n";
         };
         remove_from_dependencies($job_name, \%local_deps_hash) if (!$child);
@@ -817,7 +802,6 @@ sub dmake_dir {
         _exit(0);
     } elsif ($error_code && ($error_code != -1)) {
         return $error_code;
-#        print_error("Error $? occurred while making $job_name");
     };
 };
 
@@ -895,7 +879,6 @@ sub get_prj_platform {
             };
         };
     };
-#seek(BUILD_LST, 0, 0);
 };
 
 #
@@ -957,7 +940,6 @@ sub get_deps_hash {
     };
 
     my  $build_list_ref = $build_lists_hash{$module_to_build};
-#    delete $build_lists_hash{$module_to_build};
     if (ref($build_list_ref) eq 'XMLBuildListParser') {
         get_deps_from_object($module_to_build, $build_list_ref, $dependencies_hash);
     } else {
@@ -1024,7 +1006,6 @@ sub get_deps_hash {
             };
         };
     };
-#    check_deps_hash($dependencies_hash);
     resolve_aliases($dependencies_hash, \%PathHash);
     if (!$prepare) {
         add_prerequisite_job($dependencies_hash, $module_to_build, $pre_custom_job);
@@ -1102,14 +1083,9 @@ sub CorrectPath {
 
 
 sub check_dmake {
-#print "Checking dmake...";
     if (open(DMAKEVERSION, "dmake -V |")) {
-#    if (open(DMAKEVERSION, "dmake -V |")) {
         my @dmake_version = <DMAKEVERSION>;
         close DMAKEVERSION;
-#       if ($dmake_version[0] =~ /^dmake\s\-\sCopyright\s\(c\)/) {
-#            print " Using version $1\n" if ($dmake_version[0] =~ /Version\s(\d+\.*\d*)/);
-#        };
         return;
     };
     my $error_message = 'dmake: Command not found.';
@@ -1161,33 +1137,7 @@ sub get_stand_dir {
         $initial_module = $`;
     };
     $module_paths{$initial_module} = $StandDir . "/$initial_module";
-#    $build_list_paths{$initial_module} =$StandDir . '/prj/'.$_;
-#    if ( defined $ENV{PWD} ) {
-#       $StandDir = $ENV{PWD};
-#   } elsif (defined $ENV{_cwd}) {
-#       $StandDir = $ENV{_cwd};
-#   } else {
-#       $StandDir = cwd();
-#    };
-#    my $previous_dir = '';
-#    do {
-#        foreach (@possible_build_lists) {# ('build.lst', 'build.xlist');
-#            if (-e $StandDir . '/prj/'.$_) {
-#                $initial_module = File::Basename::basename($StandDir);
-#                $build_list_paths{$initial_module} =$StandDir . '/prj/'.$_;
-#                $StandDir = File::Basename::dirname($StandDir);
-#                $module_paths{$initial_module} = $StandDir . "/$initial_module";
-                return $StandDir;
-#            } elsif ($StandDir eq $previous_dir) {
-#                $ENV{mk_tmp} = '';
-#                print_error('Found no project to build');
-#            };
-#        };
-#        $previous_dir = $StandDir;
-#        $StandDir = File::Basename::dirname(Cwd::realpath($StandDir));
-#        print_error('Found no project to build') if (!$StandDir);
-#    }
-#    while (chdir "$StandDir");
+    return $StandDir;
 };
 
 #
@@ -1591,7 +1541,6 @@ sub get_options {
     $grab_output = 0 if ($dont_grab_output);
     print_error('Switches --with_branches and --all collision') if ($build_from_with_branches && $build_all_cont);
     print_error('Switch --skip is for building multiple modules only!!') if ((scalar keys %skip_modules) && (!$build_all_parents));
-#    print_error('Please prepare the workspace on one of UNIX platforms') if ($prepare && ($ENV{GUI} ne 'UNX'));
     print_error('Switches --with_branches and --since collision') if ($build_from_with_branches && $build_since);
     if ($show) {
         $processes_to_run = 0;
@@ -1702,7 +1651,6 @@ sub get_switch_options {
 # cancel build when one of children has error exit code
 #
 sub cancel_build {
-#    close_server_socket();
     my $broken_modules_number = scalar @broken_modules_names;
 
     print "\n";
@@ -1741,7 +1689,7 @@ sub cancel_build {
     print "\n";
     print "" . $ENV{'OOO_SHELL'} . "\n";
     print "cd " . $ENV{'SRC_ROOT'} . "\n";
-    print "source ./" . $ENV{'ENV_SCRIPT'} . ".sh\n";
+    print "source ./" . $ENV{'ENV_SCRIPT'} . "\n";
     print "cd $module\n";
     print "build\n";
     print "\n";
@@ -1820,7 +1768,7 @@ sub handle_dead_children {
                 } else {
                     clear_from_child($pid);
                 };
-                $finisched_children++;
+                $finished_children++;
             };
         };
     } while(children_number() >= $processes_to_run);
@@ -1828,7 +1776,7 @@ sub handle_dead_children {
 
 sub give_second_chance {
     my $pid = shift;
-    # A malicious hack for misterious windows problems - try 2 times
+    # A malicious hack for mysterious windows problems - try 2 times
     # to run dmake in the same directory if errors occurs
     my $child_nick = $processes_hash{$pid};
     $running_children{$folders_hashes{$child_nick}}--;
@@ -1956,7 +1904,7 @@ sub build_multiprocessing {
     my $Prj;
     do {
         my $got_module = 0;
-        $finisched_children = 0;
+        $finished_children = 0;
         while ($Prj = pick_prj_to_build(\%global_deps_hash)) {
             if (!defined $projects_deps_hash{$Prj}) {
                 $projects_deps_hash{$Prj} = {};
@@ -1970,8 +1918,7 @@ sub build_multiprocessing {
         };
         if (!$got_module) {
             cancel_build() if ((!scalar keys %module_build_queue) && !children_number());
-            if (!$finisched_children) {
-#                print "#### 1979: Starting waiting for dead child\n";
+            if (!$finished_children) {
                 handle_dead_children(1);
             };
         };
@@ -1980,7 +1927,6 @@ sub build_multiprocessing {
     # Let the last module be built till the end
     while (scalar keys %module_build_queue) {
         build_actual_queue(\%module_build_queue);
-#        print "#### 1988: Starting waiting for dead child\n";
         handle_dead_children(1);
     };
     # Let all children finish their work
@@ -1992,10 +1938,6 @@ sub build_multiprocessing {
 };
 
 sub mp_success_exit {
-#    close_server_socket();
-#    if (!$custom_job && $post_custom_job) {
-#        do_post_custom_job(CorrectPath($StandDir.$initial_module));
-#    };
     print "\nMultiprocessing build is finished\n";
     print "Maximal number of processes run: $maximal_processes\n";
     zenity_message("LibreOffice Build Success!");
@@ -2012,7 +1954,6 @@ sub build_actual_queue {
     do {
         my @sorted_queue = sort {(scalar keys %{$projects_deps_hash{$a}}) <=> (scalar keys %{$projects_deps_hash{$b}})} keys %$build_queue;
         my $started_children = 0;
-#        foreach $Prj (@sorted_queue) {
         foreach $Prj (keys %$build_queue) {
             get_html_orders();
             if ($reschedule_queue) {
@@ -2089,7 +2030,6 @@ sub do_custom_job {
     my $error_code = 0;
     if ($job eq $pre_job) {
         announce_module($module);
-#        html_store_job_info($dependencies_hash, $job_dir);
         remove_from_dependencies($module_job, $dependencies_hash);
     } else {
         $error_code = run_job($job, $module_paths{$module}, $module_job);
@@ -2293,13 +2233,11 @@ sub clear_module {
         next if (/^\.+$/);
         my $dir = CorrectPath($module_paths{$module}.'/'.$_);
         if ((!-d $dir.'/.svn') && is_output_tree($dir)) {
-            #print "I would delete $dir\n";
             rmtree("$dir", 0, 1);
             if (-d $dir) {
                 system("$remove_command $dir");
                 if (-d $dir) {
                     push(@warnings, "Cannot delete $dir");
-#print_error("Cannot delete $dir");
                 } else {
                     print STDERR (">>> Removed $dir by force\n");
                 };
@@ -2386,7 +2324,6 @@ sub prepare_build_from_with_branches {
             if (defined ${$$reversed_full_deps_hash{$prerequisite}}{$dependent_module}) {
                 remove_from_dependencies($prerequisite, $full_deps_hash);
                 delete $$full_deps_hash{$prerequisite};
-#                print "Removed $prerequisite\n";
                 last;
             };
         };
@@ -2527,9 +2464,6 @@ sub get_list_of_modules {
             };
         };
     };
-#    if (!scalar %$hash_ref) {
-#        print_error('No module list supplied!!');
-#    };
 };
 
 sub get_modules_passed {
@@ -2639,7 +2573,6 @@ sub clear_delivered {
             };
         };
         my $undeliver = "$deliver_command $deliver_delete_switches $nul";
-#        my $current_dir = getcwd();
         foreach my $module (sort @modules_built) {
             if (chdir($module_paths{$module})) {
                 print "Removing delivered from module $module\n";
@@ -2652,8 +2585,6 @@ sub clear_delivered {
                 push(@warnings, "Could not remove delivered files from the module $module. Your build can become inconsistent.\n");
             };
         };
-#        chdir $current_dir;
-#        getcwd();
     };
     $ENV{$_} = $backup_vars{$_} foreach (keys %backup_vars);
 };
@@ -2698,7 +2629,7 @@ sub read_ssolar_vars {
 sub get_solar_vars {
     my ($solar_vars, $file) = @_;
     my ($var, $value);
-    open SOLARTABLE, "<$file" or die "can´t open solarfile $file";
+    open SOLARTABLE, "<$file" or die "can't open solarfile $file";
     while(<SOLARTABLE>) {
         s/\r\n//o;
         next if(!/^\w+\s+(\w+)/o);
@@ -2786,7 +2717,6 @@ sub pick_for_build_type {
 };
 
 sub do_exit {
-#    close_server_socket();
     my $exit_code = shift;
     $build_finished++;
     generate_html_file(1);
@@ -2832,7 +2762,6 @@ sub generate_html_file {
     return if (!$html);
     my $force_update = shift;
     $force_update++ if ($debug);
-    $html_last_updated = time;
     my @modules_order = sort_modules_appearance();
     my ($successes_percent, $errors_percent) = get_progress_percentage(scalar keys %html_info, scalar keys %build_is_finished, scalar keys %modules_with_errors);
     my $build_duration = get_time_line(time - $build_time);
@@ -2918,9 +2847,6 @@ sub generate_html_file {
             print HTML $errors_number;
             print HTML ' error(s)\">', $_, '</a>");' . "\n";
         } else {
-#            print HTML 'document.write("<em style=color:gray>' . $_ . '</em>");';
-####            print HTML 'document.write("<em style=color:gray>' . $_ ."href=\'http://$local_host_ip:$html_port/delete=\'$_". '</em>");';
-
             print HTML 'document.write("            <a target=\'infoframe\' id=';
             print HTML $_;
             print HTML ' href=\"javascript:void(0)\"; title=\"Remove module\">' . $_ . '</a>");' . "\n";
@@ -3279,7 +3205,6 @@ sub get_html_info {
         }
     } else {
         return(undef, undef, 0, 0, 0, '-');
-#        $dirs_info_line .= 'No information available yet';
     };
     $dirs_info_line =~ s/(<br>)*$//o;
     $dirs_info_line .= '\'';
@@ -3294,13 +3219,9 @@ sub get_html_info {
         $errors_info_line .= 'No errors';
     };
     $errors_info_line .= '\'';
-#    if (defined $full_info) {
     my $time_line = get_time_line($$module_info_hash{BUILD_TIME});
-        my ($successes_percent, $errors_percent) = get_progress_percentage($dirs_number - 1, $successful_number - 1, $errorful_number);
-        return($errors_info_line, $dirs_info_line, $errorful_number, $successes_percent, $errors_percent, $time_line);
-#    } else {
-#        return($errors_info_line, $dirs_info_line, $errorful_number);
-#    };
+    my ($successes_percent, $errors_percent) = get_progress_percentage($dirs_number - 1, $successful_number - 1, $errorful_number);
+    return($errors_info_line, $dirs_info_line, $errorful_number, $successes_percent, $errors_percent, $time_line);
 };
 
 sub get_time_line {
@@ -3414,8 +3335,6 @@ sub check_client_jobs {
             delete $processes_hash{$_};
             delete $clients_jobs{$_};
             delete $clients_times{$_};
-#        } else {
-#            print time - $clients_times{$_} . "\n";
         };
     };
 };
@@ -3440,10 +3359,6 @@ sub run_server {
             if ($error) {
                 print STDERR "port $_: $error\n";
             } else {
-#                $SIG{KILL} = \&stop_server;
-#                $SIG{INT} = \&stop_server;
-#                $SIG{TERM} = \&stop_server;
-#                $SIG{QUIT} = \&stop_server;
                 last;
             };
         };
@@ -3479,7 +3394,6 @@ sub run_server {
             };
         } else {
             if ($client_hash{result} eq "0") {
-#                print "$clients_jobs{$pid} succedded on $pid\n";
             } else {
                 print "Error $client_hash{result}\n";
                 if (store_error($pid, $client_hash{result})) {
@@ -3505,7 +3419,6 @@ sub run_server {
             $job_string = $lost_jobs[0];
             delete $lost_client_jobs{$lost_jobs[0]};
         } else {
-#            $job_string = get_job_string(\@build_queue, $pid);
             $job_string = get_job_string(\@build_queue);
         };
         if ($job_string) {
@@ -3567,10 +3480,8 @@ sub get_job_string {
             $jobs_hash{$job_dir}->{START_TIME} = time();
             $jobs_hash{$job_dir}->{STATUS} = 'building';
             if ($job_dir =~ /(\s)$pre_job/o) {
-#                if ($' eq $pre_job) {
-                    do_custom_job($job_dir, $dependencies_hash);
-                    $job_dir = '';
-#                }
+                do_custom_job($job_dir, $dependencies_hash);
+                $job_dir = '';
             };
         } while (!$job_dir);
     };
diff --git a/solenv/bin/converttags.pl b/solenv/bin/converttags.pl
deleted file mode 100644
index aa2fe63c6ce8..000000000000
--- a/solenv/bin/converttags.pl
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-# converttags - a perl script to coonvert some predefined tags
-# to user specified values
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-
-if($#ARGV == -1)
-{
-    die "No parameters were specified.\nperl converttags.pl <mode> <title> <productname> [<color1>] [<color2>] file_1 [... file_n]\n";
-}
-if($#ARGV < 2)
-{
-    die "No file were specified -> no file must be converted!\n";
-}
-
-# mode = 1 -> convert
-#      = 2 -> exit without conversion
-$mode = shift @ARGV;
-
-$title = shift @ARGV;
-$productname = shift @ARGV;
-
-$color1 = "";
-$color2 = "";
-
-if( $mode =~ s/2/$1/go )
-{
-    exit 0;
-}
-
-if( $ARGV[0] =~ s/(#[\w]{6})/$1/go )
-{
-    $color1 = shift @ARGV;
-}
-if( $ARGV[0] =~ s/(#[\w]{6})/$1/go )
-{
-    $color2 = shift @ARGV;
-}
-
-print "$title\n";
-print "$productname\n";
-print "$color1\n";
-print "$color2\n";
-
-$return = 0;
-
-while (@ARGV)
-{
-    my $lineCount = 0;
-    $ARGV = shift @ARGV;
-    print "convert tags: $ARGV ";
-
-    open ( FILEIN, $ARGV ) || die "could not open $ARGV for reading";
-    @lines = <FILEIN>;
-    close( FILEIN );
-    open( FILEOUT, ">$ARGV.tmp" ) || die "could not open $ARGV.tmp for writing";
-
-
-    foreach $_ (@lines)
-    {
-    $lineCount++;
-    if ( $lineCount == 10 )
-    {
-        $lineCount = 0;
-        print ".";
-    }
-    # change [TITLE] tag
-    s#\[TITLE\]#$title#go;
-
-    # change [PRODUCTNAME] tag
-    s#\[PRODUCTNAME\]#$productname#go;
-
-    # change color #003399 to #$color1 if color1 was specified!
-    if ( ! "$color1" eq "" )
-    {
-        s/#003399/$color1/go;
-    }
-
-    # change color #99CCFF to #$color2 if color2 was specified!
-    if ( ! "$color2" eq "" )
-    {
-        s/#99CCFF/$color2/go;
-    }
-    print FILEOUT $_;
-    }
-    print " OK\n";
-
-    close FILEOUT;
-    chmod 0666, $ARGV;
-    rename "$ARGV.tmp", $ARGV || die "could not rename $ARGV.tmp to $ARGV";
-}
-
-exit $return;
diff --git a/solenv/bin/gen_userfeedback_VCL_names.pl b/solenv/bin/gen_userfeedback_VCL_names.pl
index e65968e6b6c2..2b7f59d7775f 100755
--- a/solenv/bin/gen_userfeedback_VCL_names.pl
+++ b/solenv/bin/gen_userfeedback_VCL_names.pl
@@ -59,7 +59,7 @@ for (<HID>) {
 
   if ( exists $hids{$upperlongname} && ( $hids{$upperlongname} != $ID ) )
   {
-    print STDERR "errror: unclear definition of longname: $longname = $hids{$upperlongname} or $ID\n";
+    print STDERR "warn: unclear definition of longname: $longname = $hids{$upperlongname} or $ID\n";
   }
   $hids{$upperlongname} = $ID;
 
@@ -121,7 +121,7 @@ foreach ( glob("$winpath/*win") ) {
       $upperlongname =~ tr/a-z/A-Z/;
       if ( $shortname !~ /^[\+\*]/ && !exists $hids{$upperlongname} )
       {
-        print STDERR "errror: Longname not in hid.lst: $filename $longname\n";
+        print STDERR "warn: Longname not in hid.lst: $filename $longname\n";
       }
       if ( exists $hids{$upperlongname} )
       {
diff --git a/solenv/bin/hicontrast-to-theme.pl b/solenv/bin/hicontrast-to-theme.pl
deleted file mode 100644
index 027d7405dab2..000000000000
--- a/solenv/bin/hicontrast-to-theme.pl
+++ /dev/null
@@ -1,125 +0,0 @@
-:
-    eval 'exec perl -S $0 ${1+"$@"}'
-        if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-#
-# Create ordinary theme from HiContrast images.
-#
-
-use File::Copy;
-use File::Find;
-use File::Path;
-use File::Spec;
-
-( $src, $dst ) = @ARGV;
-
-if ( $src eq "" || $dst eq "" ) {
-    print STDERR "Usage: hicontrast-to-theme.pl src dest\n\n";
-    print STDERR "Create ordinary theme from HiContrast images.\n";
-    exit 1;
-}
-
-$dst = File::Spec->rel2abs( $dst );
-
-@hc_table = (
-    [ ".*_h.png",         "_h.png",    ".png" ],
-    [ ".*_sch.png",       "_sch.png",  ".png" ],
-    [ ".*_hc.png",        "_hc.png",   ".png" ],
-    [ "lch_.*.png",       "lch_",      "lc_" ],
-    [ "sch_.*.png",       "sch_",      "sc_" ],
-    [ "lch[0-9].*.png",   "lch",       "lc" ],
-    [ "sch[0-9].*.png",   "sch",       "sc" ],
-    [ "loh[0-9].*.png",   "loh",       "lo" ],
-    [ "lxh[0-9].*.png",   "lxh",       "lx" ],
-    [ "sxh[0-9].*.png",   "sxh",       "sx" ],
-    [ "avh[0-9].*.png",   "avh",       "av" ],
-    [ "avlh[0-9].*.png",  "avlh",      "avl" ],
-    [ "idh[0-9].*.png",   "idh",       "id" ],
-    [ "imh[0-9].*.png",   "imh",       "im" ],
-    [ "mih[0-9].*.png",   "mih",       "mi" ],
-    [ "tbh[0-9].*.png",   "tbh",       "tb" ],
-    [ "nah[0-9].*.png",   "nah",       "na" ],
-    [ "nch[0-9].*.png",   "nch",       "nc" ],
-    [ "nvh[0-9].*.png",   "nvh",       "nv" ],
-    [ "ouh[0-9].*.png",   "ouh",       "ou" ],
-    [ "ddh[0-9].*.png",   "ddh",       "dd" ],
-    [ "sfh[0-9].*.png",   "sfh",       "sf" ],
-    [ "srh[0-9].*.png",   "srh",       "sr" ],
-    [ "wrh[0-9].*.png",   "wrh",       "wr" ],
-    [ "alh[0-9].*.png",   "alh",       "al" ],
-    [ "ath[0-9].*.png",   "ath",       "at" ],
-    [ "bih[0-9].*.png",   "bih",       "bi" ],
-    [ "coh[0-9].*.png",   "coh",       "co" ],
-    [ "foh[0-9].*.png",   "foh",       "fo" ],
-    [ "fuh[0-9].*.png",   "fuh",       "fu" ],
-    [ "oph[0-9].*.png",   "oph",       "op" ],
-    [ "unh[0-9].*.png",   "unh",       "un" ],
-    [ "edh[0-9].*.png",   "edh",       "ed" ],
-    [ "cdh[0-9].*.png",   "cdh",       "cd" ],
-    [ "frh[0-9].*.png",   "frh",       "fr" ],
-    [ "fwh[0-9].*.png",   "fwh",       "fw" ],
-    [ "nuh[0-9].*.png",   "nuh",       "nu" ],
-    [ "prh[0-9].*.png",   "prh",       "pr" ],
-    [ "shh[0-9].*.png",   "shh",       "sh" ],
-    [ "trh[0-9].*.png",   "trh",       "tr" ],
-    [ "reh[0-9].*.png",   "reh",       "re" ],
-    [ "joh[0-9].*.png",   "joh",       "jo" ],
-    [ "fph[0-9].*.png",   "fph",       "fp" ],
-    [ "dah[0-9].*.png",   "dah",       "da" ]
-);
-
-my (@from_stat, @to_stat);
-
-sub copy_normalized {
-    $file = $_;
-    for $hc ( @hc_table ) {
-        ( $what, $from, $to ) = @$hc;
-        if ( $file =~ /$what/&&!($file=~/\.svn/) ) {
-            my $dir = File::Spec->catdir( $dst, $File::Find::dir );
-
-            if ( ! -d $dir ) {
-                mkpath( $dir );
-            }
-
-            ( my $copy = $file ) =~ s/$from/$to/;
-            $copy = File::Spec->catfile( $dir, $copy );
-
-            @from_stat = stat($file);
-            @to_stat = stat($copy);
-            if ( $from_stat[9] > $to_stat[9] ) {
-                copy( $file, $copy ) || die $!;
-                utime( $from_stat[9], $from_stat[9], $copy );
-            }
-
-            last;
-        }
-    }
-}
-
-chdir( $src );
-find( \&copy_normalized, '.' );
diff --git a/solenv/bin/modules/installer/archivefiles.pm b/solenv/bin/modules/installer/archivefiles.pm
index e85903c699aa..6db7e2a626da 100644
--- a/solenv/bin/modules/installer/archivefiles.pm
+++ b/solenv/bin/modules/installer/archivefiles.pm
@@ -241,9 +241,6 @@ sub resolving_archive_flag
 
             my $unzipdir;
 
-            # if ($iscommonfile) { $unzipdir = $commonunzipdirbase . $installer::globals::separator . $onelanguage . $installer::globals::separator; }
-            # else { $unzipdir = $platformunzipdirbase . $installer::globals::separator . $onelanguage . $installer::globals::separator; }
-
             $unzipdir = $platformunzipdirbase . $installer::globals::separator . $onelanguage . $installer::globals::separator;
 
             installer::systemactions::create_directory($unzipdir);  # creating language specific subdirectories
@@ -411,13 +408,9 @@ sub resolving_archive_flag
                                 $newfile{'Styles'} =~ s/\,\s*\,/\,/;
                                 $newfile{'Styles'} =~ s/\(\s*\,/\(/;
                                 $newfile{'Styles'} =~ s/\,\s*\)/\)/;
-                                # $infoline = "Removing PATCH flag from: $zipname\n";
-                                # push( @installer::globals::logfileinfo, $infoline);
                             }
                             else
                             {
-                                # $infoline = "Keeping PATCH flag at: $zipname\n";
-                                # push( @installer::globals::logfileinfo, $infoline);
                                 push( @keptpatchflags, $zipname); # collecting all PATCH flags
                             }
                         }
diff --git a/solenv/bin/modules/installer/configuration.pm b/solenv/bin/modules/installer/configuration.pm
index 4aa82d25b5b2..0fb587f68bb6 100644
--- a/solenv/bin/modules/installer/configuration.pm
+++ b/solenv/bin/modules/installer/configuration.pm
@@ -482,7 +482,6 @@ sub insert_into_config_file
     elsif ( $styles =~ /CFG_NUMERIC/ ) { $valuetype = "int"; }
     elsif ( $styles =~ /CFG_BOOLEAN/ ) { $valuetype = "boolean"; }
     elsif ( $styles =~ /CFG_STRINGLIST/ ) { $valuetype = "string-list"; }
-#   elsif ( $styles =~ /CFG_STRINGLIST/ ) { $valuetype = "string-list oor:separator=\"\|\""; }
     else
     {
         installer::exiter::exit_program("ERROR: Unknown configuration value type: $styles", "insert_into_config_file");
@@ -525,8 +524,8 @@ sub insert_into_config_file
 
     if (( $styles =~ /\bCREATE\b/ ) && (!($isbracketnode)))
     {
-        # my $typepart = 'oor:type="xs:VALUETYPE"'; # VALUETYPE can be "string", "boolean", ...
-
+        # $typepart is 'oor:type="xs:VALUETYPE"';
+        # VALUETYPE can be "string", "boolean", ...
         my $localtypepart = $typepart;
         $localtypepart =~ s/VALUETYPE/$valuetype/;
 
@@ -552,8 +551,6 @@ sub insert_into_config_file
 
     # ToDo: Substituting the setup replace variables
 
-    # replace_setting_variables();
-
     $value =~ s/^\s*\<//;
     $value =~ s/\>\s*$//;
 
@@ -577,14 +574,12 @@ sub insert_into_config_file
 
     if (!($oneconfig->{'isisocode'} ))  # this is the simpe case
     {
-        # my $valueline = '<value SEPARATORPART>VALUECONTENT</value>' . "\n";
         $newvalueline = $valueline;
         $newvalueline =~ s/VALUECONTENT/$value/g;
         $newvalueline =~ s/SEPARATORPART/$separatorpart/;
     }
     else
     {
-        # my $langvalueline = '<value xml:lang="SAVEDLANGUAGE">VALUECONTENT</value>' . "\n";
         $newvalueline = $langvalueline;
         $newvalueline =~ s/VALUECONTENT/$value/;
         my $savedlanguage = $oneconfig->{'Key'};
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 5066c05c315b..f81d17350afa 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -369,7 +369,6 @@ sub check_logfile
 
         $line = "*********************************************************************\n";
         push(@output, $line);
-#       exit(-1);
     }
     else
     {
@@ -415,7 +414,6 @@ sub determine_ship_directory
     {
         my $number_of_languages = installer::systemactions::get_number_of_langs($languagestring);
         chomp(my $shorter = `echo $languagestring | md5sum | sed -e "s/ .*//g"`);
-        # $languagestring = $shorter;
         my $id = substr($shorter, 0, 8); # taking only the first 8 digits
         $languagestring = "lang_" . $number_of_languages . "_id_" . $id;
     }
@@ -629,11 +627,6 @@ sub read_encodinglist
 
     $installer::globals::msiencoding = \%msiencoding;
     $installer::globals::msilanguage = \%msilanguage;
-
-    # my $key;
-    # foreach $key (keys %{$installer::globals::msiencoding}) { print "A Key: $key : Value: $installer::globals::msiencoding->{$key}\n"; }
-    # foreach $key (keys %{$installer::globals::msilanguage}) { print "B Key: $key : Value: $installer::globals::msilanguage->{$key}\n"; }
-
 }
 
 #############################################################
diff --git a/solenv/bin/modules/installer/copyproject.pm b/solenv/bin/modules/installer/copyproject.pm
index 5db9cf7f8b04..e2ae39a796fb 100644
--- a/solenv/bin/modules/installer/copyproject.pm
+++ b/solenv/bin/modules/installer/copyproject.pm
@@ -69,17 +69,14 @@ sub copy_project
 
         installer::systemactions::copy_one_file($source, $destination);
 
-        if ( $destination =~ /install\s*$/ )
+        if ( $onefile->{'UnixRights'} )
         {
-            my $localcall = "chmod 775 $destination \>\/dev\/null 2\>\&1";
-            system($localcall);
+            chmod oct($onefile->{'UnixRights'}), $destination;
         }
-
-            if ( $onefile->{'UnixRights'} )
+        elsif ( $destination =~ /install\s*$/ )
         {
-            my $localcall = "chmod $onefile->{'UnixRights'} $destination \>\/dev\/null 2\>\&1";
-            system($localcall);
-            }
+            chmod 0775, $destination;
+        }
     }
 
     # copy ScpActions
@@ -93,16 +90,13 @@ sub copy_project
 
         installer::systemactions::copy_one_file($source, $destination);
 
-        if ( $destination =~ /install\s*$/ )
+        if ( $onefile->{'UnixRights'} )
         {
-            my $localcall = "chmod 775 $destination \>\/dev\/null 2\>\&1";
-            system($localcall);
+            chmod oct($onefile->{'UnixRights'}), $destination;
         }
-
-        if ( $onefile->{'UnixRights'} )
+        elsif ( $destination =~ /install\s*$/ )
         {
-            my $localcall = "chmod $onefile->{'UnixRights'} $destination \>\/dev\/null 2\>\&1";
-            system($localcall);
+            chmod 0775, $destination;
         }
     }
 
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index f300226589d4..01fe0e4691e6 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -118,8 +118,7 @@ sub save_script_file
 
     if ( ! $installer::globals::iswindowsbuild )
     {
-        my $localcall = "chmod 775 $newscriptfilename \>\/dev\/null 2\>\&1";
-        system($localcall);
+        chmod 0775, $newscriptfilename;
     }
 
     return $newscriptfilename;
@@ -339,8 +338,7 @@ sub tar_package
         push( @installer::globals::logfileinfo, $infoline);
     }
 
-    my $localcall = "chmod 775 $tarfilename \>\/dev\/null 2\>\&1";
-    $returnvalue = system($localcall);
+    chmod 0775, $tarfilename;
 
     return ( -s $tarfilename );
 }
@@ -443,14 +441,6 @@ sub get_downloadname_language
         $languages =~ s/_en-US//;
     }
 
-    # en-US is default language and can be removed therefore
-    # for one-language installation sets
-
-    # if ( $languages =~ /^\s*en-US\s*$/ )
-    # {
-    #   $languages = "";
-    # }
-
     if ( length ($languages) > $installer::globals::max_lang_length )
     {
         $languages = 'multi';
@@ -592,7 +582,6 @@ sub get_download_platformname
     }
     else
     {
-        # $platformname = $installer::globals::packageformat;
         $platformname = $installer::globals::compiler;
     }
 
@@ -753,7 +742,6 @@ sub get_current_version
     my $infoline = "";
     my $versionstring = "";
     my $filename = "version.info";
-    # $filename = $installer::globals::ooouploaddir . $installer::globals::separator . $filename;
 
     if ( -f $filename )
     {
@@ -778,9 +766,7 @@ sub get_current_version
 ###############################################################################################
 # Setting the download file name
 # Syntax:
-# (PRODUCTNAME)_(VERSION)_(TIMESTAMP)_(OS)_(ARCH)_(INSTALLTYPE)_(LANGUAGE).(FILEEXTENSION)
-# Rules:
-# Timestamp only for Beta and Release Candidate
+# (PRODUCTNAME)_(VERSION)_(OS)_(ARCH)_(INSTALLTYPE)_(LANGUAGE).(FILEEXTENSION)
 ###############################################################################################
 
 sub set_download_filename
@@ -789,7 +775,6 @@ sub set_download_filename
 
     my $start = get_downloadname_productname($allvariables);
     my $versionstring = get_download_version($allvariables);
-    my $date = set_date_string($allvariables);
     my $platform = get_download_platformname();
     my $architecture = get_download_architecture();
     my $type = get_install_type($allvariables);
@@ -797,7 +782,7 @@ sub set_download_filename
 
     # Setting the extension happens automatically
 
-    my $filename = $start . "_" . $versionstring . "_" . $date . "_" . $platform . "_" . $architecture . "_" . $type . "_" . $language;
+    my $filename = $start . "_" . $versionstring . "_" . "_" . $platform . "_" . $architecture . "_" . $type . "_" . $language;
 
     $filename =~ s/\_\_/\_/g;   # necessary, if $versionstring or $platform or $language are empty
     $filename =~ s/\_\s*$//;    # necessary, if $language and $addon are empty
@@ -986,76 +971,16 @@ sub put_windows_productname_into_template
 }
 
 ##################################################################
-# Windows: Including the path to the banner.bmp into nsi template
-##################################################################
-
-sub put_banner_bmp_into_template
-{
-    my ($templatefile, $includepatharrayref, $allvariables) = @_;
-
-    # my $filename = "downloadbanner.bmp";
-    if ( ! $allvariables->{'DOWNLOADBANNER'} ) { installer::exiter::exit_program("ERROR: DOWNLOADBANNER not defined in product definition!", "put_banner_bmp_into_template"); }
-    my $filename = $allvariables->{'DOWNLOADBANNER'};
-
-    my $completefilenameref = "";
-
-    if ( $installer::globals::include_pathes_read )
-    {
-        $completefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 0);
-    }
-    else
-    {
-        $completefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$filename, $includepatharrayref, 0);
-    }
-
-    if ($$completefilenameref eq "") { installer::exiter::exit_program("ERROR: Could not find download file $filename!", "put_banner_bmp_into_template"); }
-
-    if ( $^O =~ /cygwin/i ) { $$completefilenameref =~ s/\//\\/g; }
-
-    replace_one_variable($templatefile, "BANNERBMPPLACEHOLDER", $$completefilenameref);
-}
-
-##################################################################
-# Windows: Including the path to the welcome.bmp into nsi template
-##################################################################
-
-sub put_welcome_bmp_into_template
-{
-    my ($templatefile, $includepatharrayref, $allvariables) = @_;
-
-    # my $filename = "downloadbitmap.bmp";
-    if ( ! $allvariables->{'DOWNLOADBITMAP'} ) { installer::exiter::exit_program("ERROR: DOWNLOADBITMAP not defined in product definition!", "put_welcome_bmp_into_template"); }
-    my $filename = $allvariables->{'DOWNLOADBITMAP'};
-
-    my $completefilenameref = "";
-
-    if ( $installer::globals::include_pathes_read )
-    {
-        $completefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 0);
-    }
-    else
-    {
-        $completefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$filename, $includepatharrayref, 0);
-    }
-
-    if ($$completefilenameref eq "") { installer::exiter::exit_program("ERROR: Could not find download file $filename!", "put_welcome_bmp_into_template"); }
-
-    if ( $^O =~ /cygwin/i ) { $$completefilenameref =~ s/\//\\/g; }
-
-    replace_one_variable($templatefile, "WELCOMEBMPPLACEHOLDER", $$completefilenameref);
-}
-
-##################################################################
-# Windows: Including the path to the setup.ico into nsi template
+# Windows: Substituting the path to a file into the nsi template
 ##################################################################
 
-sub put_setup_ico_into_template
+sub substitute_path_into_template
 {
-    my ($templatefile, $includepatharrayref, $allvariables) = @_;
+    my ($templatefile, $includepatharrayref, $allvariables, $var, $subst) = @_;
 
-    # my $filename = "downloadsetup.ico";
-    if ( ! $allvariables->{'DOWNLOADSETUPICO'} ) { installer::exiter::exit_program("ERROR: DOWNLOADSETUPICO not defined in product definition!", "put_setup_ico_into_template"); }
-    my $filename = $allvariables->{'DOWNLOADSETUPICO'};
+    if ( ! $allvariables->{$var} ) { $var =~ s/_.*$//; } # _BR suffix ?
+    if ( ! $allvariables->{$var} ) { installer::exiter::exit_program("ERROR: $var not defined in product definition!", "substitute_path_into_template"); }
+    my $filename = $allvariables->{$var};
 
     my $completefilenameref = "";
 
@@ -1068,65 +993,24 @@ sub put_setup_ico_into_template
         $completefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$filename, $includepatharrayref, 0);
     }
 
-    if ($$completefilenameref eq "") { installer::exiter::exit_program("ERROR: Could not find download file $filename!", "put_setup_ico_into_template"); }
+    if ($$completefilenameref eq "") { installer::exiter::exit_program("ERROR: Could not find download file $filename!", "substitute_path_into_template"); }
 
     if ( $^O =~ /cygwin/i ) { $$completefilenameref =~ s/\//\\/g; }
 
-    replace_one_variable($templatefile, "SETUPICOPLACEHOLDER", $$completefilenameref);
+    replace_one_variable($templatefile, $subst, $$completefilenameref);
 }
 
 ##################################################################
-# Windows: Including the publisher into nsi template
+# Windows: substitute a variable into the nsi template
 ##################################################################
-
-sub put_publisher_into_template
+sub substitute_variable_into_template($$$$)
 {
-    my ($templatefile) = @_;
+    my ($templatefile, $variableshashref, $varname, $subst) = @_;
 
-    my $publisher = "Sun Microsystems, Inc.";
+    my $var = "";
+    if ( $variableshashref->{$varname} ) { $var = $variableshashref->{$varname}; }
 
-    replace_one_variable($templatefile, "PUBLISHERPLACEHOLDER", $publisher);
-}
-
-##################################################################
-# Windows: Including the web site into nsi template
-##################################################################
-
-sub put_website_into_template
-{
-    my ($templatefile) = @_;
-
-    my $website = "http\:\/\/www\.sun\.com\/staroffice";
-
-    replace_one_variable($templatefile, "WEBSITEPLACEHOLDER", $website);
-}
-
-##################################################################
-# Windows: Including the Java file name into nsi template
-##################################################################
-
-sub put_javafilename_into_template
-{
-    my ($templatefile, $variableshashref) = @_;
-
-    my $javaversion = "";
-
-    if ( $variableshashref->{'WINDOWSJAVAFILENAME'} ) { $javaversion = $variableshashref->{'WINDOWSJAVAFILENAME'}; }
-
-    replace_one_variable($templatefile, "WINDOWSJAVAFILENAMEPLACEHOLDER", $javaversion);
-}
-
-##################################################################
-# Windows: Including the product version into nsi template
-##################################################################
-
-sub put_windows_productversion_into_template
-{
-    my ($templatefile, $variableshashref) = @_;
-
-    my $productversion = $variableshashref->{'PRODUCTVERSION'};
-
-    replace_one_variable($templatefile, "PRODUCTVERSIONPLACEHOLDER", $productversion);
+    replace_one_variable($templatefile, $subst, $var);
 }
 
 ##################################################################
@@ -1142,7 +1026,6 @@ sub put_windows_productpath_into_template
     if (length($locallangs) > $installer::globals::max_lang_length) { $locallangs = "multi lingual"; }
 
     if ( ! $installer::globals::languagepack ) { $productpath = $productpath . " (" . sprintf('%x', time()) . ")"; }
-    # if (( $installer::globals::languagepack ) && ( $installer::globals::unicodensis )) { $productpath = convert_textstring_to_utf16($productpath, $localnsisdir, "stringhelper.txt"); }
 
     replace_one_variable($templatefile, "PRODUCTPATHPLACEHOLDER", $productpath);
 }
@@ -1298,7 +1181,6 @@ sub nsis_language_converter
         my $infoline = "NSIS language_converter : Could not find nsis language for $language!\n";
         push( @installer::globals::logfileinfo, $infoline);
         $nsislanguage = "English";
-        # installer::exiter::exit_program("ERROR: Could not find nsis language for $language!", "nsis_language_converter");
     }
 
     return $nsislanguage;
@@ -1527,8 +1409,6 @@ sub convert_utf16_to_utf8
     my $savfilename = $filename . "_before.utf16";
     installer::systemactions::copy_one_file($filename, $savfilename);
 
-#   open( IN, "<:utf16", $filename ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "convert_utf16_to_utf8");
-#   open( IN, "<:para:crlf:uni", $filename ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "convert_utf16_to_utf8");
     open( IN, "<:encoding(UTF16-LE)", $filename ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "convert_utf16_to_utf8");
     while ( $line = <IN> ) {
         push @localfile, $line;
@@ -1753,12 +1633,6 @@ sub get_path_to_nsis_sdk
         $nsispath = $ENV{'NSISSDK_SOURCE'}; # overriding the NSIS SDK with NSISSDK_SOURCE
     }
 
-#   if( ($^O =~ /cygwin/i) and $nsispath =~ /\\/ ) {
-#       # We need a POSIX path for W32-4nt-cygwin-perl
-#       $nsispath =~ s/\\/\\\\/g;
-#       chomp( $nsispath = qx{cygpath -u "$nsispath"} );
-#   }
-
     if ( $nsispath eq "" )
     {
         installer::logger::print_message( "... no Environment variable \"SOLARROOT\", \"NSIS_PATH\" or \"NSISSDK_SOURCE\" found and NSIS not found in path!", "get_path_to_nsis_sdk");
@@ -1784,7 +1658,7 @@ sub call_nsis
 
     if( $^O =~ /cygwin/i ) { $nsifile =~ s/\\/\//g; }
 
-    my $systemcall = "$makensisexe $nsifile |";
+    my $systemcall = "$makensisexe /V4 /DMUI_VERBOSE=4 $nsifile |";
 
     my $infoline = "Systemcall: $systemcall\n";
     push( @installer::globals::logfileinfo, $infoline);
@@ -1834,7 +1708,8 @@ sub replace_variables
 {
     my ($translationfile, $variableshashref) = @_;
 
-    foreach $key (keys %{$variableshashref})
+    # we want to substitute FOO_BR before FOO to avoid floating _BR suffixes
+    foreach $key (sort { length ($b) <=> length ($a) } keys %{$variableshashref})
     {
         my $value = $variableshashref->{$key};
 
@@ -1873,9 +1748,6 @@ sub remove_english_for_nsis_installer
 {
     my ($languagestringref, $languagesarrayref) = @_;
 
-    # $$languagestringref =~ s/en-US_//;
-    # shift(@{$languagesarrayref});
-
     @{$languagesarrayref} = ("en-US");  # only english for NSIS installer!
 }
 
@@ -2077,13 +1949,29 @@ sub create_download_sets
 
         # add product name into script template
         put_windows_productname_into_template($templatefile, $allvariableshashref);
-        put_banner_bmp_into_template($templatefile, $includepatharrayref, $allvariableshashref);
-        put_welcome_bmp_into_template($templatefile, $includepatharrayref, $allvariableshashref);
-        put_setup_ico_into_template($templatefile, $includepatharrayref, $allvariableshashref);
-        put_publisher_into_template($templatefile);
-        put_website_into_template($templatefile);
-        put_javafilename_into_template($templatefile, $allvariableshashref);
-        put_windows_productversion_into_template($templatefile, $allvariableshashref);
+        @path_substs = (
+            'DOWNLOADBANNER_BR' => 'BANNERBMPPLACEHOLDER_BR',
+            'DOWNLOADBITMAP_BR' => 'WELCOMEBMPPLACEHOLDER_BR',
+            'DOWNLOADBANNER' => 'BANNERBMPPLACEHOLDER',
+            'DOWNLOADBITMAP' => 'WELCOMEBMPPLACEHOLDER',
+            'DOWNLOADSETUPICO' => 'SETUPICOPLACEHOLDER'
+        );
+        while (@path_substs) {
+            my $var= shift @path_substs;
+            my $val = shift @path_substs;
+            substitute_path_into_template($templatefile, $includepatharrayref,
+                                          $allvariableshashref, $var, $val);
+        }
+        %var_substs = (
+            'OOOVENDOR' => 'PUBLISHERPLACEHOLDER',
+            'STARTCENTER_INFO_URL' => 'WEBSITEPLACEHOLDER',
+            'WINDOWSJAVAFILENAME' => 'WINDOWSJAVAFILENAMEPLACEHOLDER',
+            'PRODUCTVERSION' => 'PRODUCTVERSIONPLACEHOLDER'
+        );
+        for $var (keys %var_substs) {
+            substitute_variable_into_template($templatefile, $allvariableshashref,
+                                              $var, $var_substs{$var});
+        }
         put_windows_productpath_into_template($templatefile, $allvariableshashref, $languagestringref, $localnsisdir);
         put_outputfilename_into_template($templatefile, $downloadname);
         put_filelist_into_template($templatefile, $installationdir);
@@ -2153,9 +2041,6 @@ sub create_download_link_tree
                 push( @installer::globals::logfileinfo, $infoline);
 
                 create_link_tree($sourcedownloadfile, $destdownloadfilename, $versionstring);
-                # my $md5sumoutput = call_md5sum($downloadfile);
-                # my $md5sum = get_md5sum($md5sumoutput);
-
             }
         }
         else
diff --git a/solenv/bin/modules/installer/downloadsigner.pm b/solenv/bin/modules/installer/downloadsigner.pm
index aa3bbb25a484..a01658959c44 100644
--- a/solenv/bin/modules/installer/downloadsigner.pm
+++ b/solenv/bin/modules/installer/downloadsigner.pm
@@ -91,8 +91,6 @@ Ende
 
 sub getparameter
 {
-    # installer::logger::print_message("Checking parameter");
-
     while ( $#ARGV >= 0 )
     {
         my $param = shift(@ARGV);
@@ -347,7 +345,6 @@ sub check_cws_build
     my $iscws = 1;
 
     if ( $filename =~ /follow_me_\d+_/ ) { $iscws = 0; }
-    # if ( $filename =~ /log_\d+_/ ) { $iscws = 0; }
 
     return $iscws;
 }
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index b54912b72616..4b4d93aa3723 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -47,7 +47,6 @@ sub create_pathvariables
     $variables{'solarpath'} = $solarpath;
 
     my $solarcommonpath = $environment->{'SOLARVERSION'} . $installer::globals::separator . "common" . $installer::globals::productextension;
-    # my $solarcommonpath = $environment->{'SOLARVERSION'} . $installer::globals::separator . $environment->{'COMMON_OUTDIR'} . $installer::globals::productextension;
     $variables{'solarcommonpath'} = $solarcommonpath;
 
     my $osdef = lc($environment->{'GUI'});
@@ -110,7 +109,6 @@ sub set_global_environment_variables
     my ( $environment ) = @_;
 
     $installer::globals::build = $environment->{'WORK_STAMP'};
-    # $installer::globals::minor = $environment->{'UPDMINOR'};
     $installer::globals::compiler = $environment->{'OUTPATH'};
 
     if ( $ENV{'UPDMINOR'} ) { $installer::globals::minor = $ENV{'UPDMINOR'}; }
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index f86d224b1f36..72ee717e9f4d 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -228,14 +228,10 @@ sub put_directories_into_epmfile
 
         if ( $onedir->{'Dir'} ) { $dir = $onedir->{'Dir'}; }
 
-        # if (!($dir =~ /\bPREDEFINED_/ ))
         if ((!($dir =~ /\bPREDEFINED_/ )) || ( $dir =~ /\bPREDEFINED_PROGDIR\b/ ))
         {
             my $hostname = $onedir->{'HostName'};
 
-            # not including simple directory "/opt"
-            # if (( $allvariables->{'SETSTATICPATH'} ) && ( $hostname eq $packagerootpath )) { next; }
-
             my $line = "d 755 root $group $hostname -\n";
 
             push(@{$epmfileref}, $line)
@@ -356,7 +352,6 @@ sub create_epm_header
     # Determining the release version
     # This release version has to be listed in the line %version : %version versionnumber releasenumber
 
-    # if ( $variableshashref->{'PACKAGEVERSION'} ) { $installer::globals::packageversion = $variableshashref->{'PACKAGEVERSION'}; }
     if ( ! $onepackage->{'packageversion'} ) { installer::exiter::exit_program("ERROR: No packageversion defined for package: $onepackage->{'module'}!", "create_epm_header"); }
     $installer::globals::packageversion = $onepackage->{'packageversion'};
     installer::packagelist::resolve_packagevariables(\$installer::globals::packageversion, $variableshashref, 0);
@@ -598,15 +593,9 @@ sub create_epm_header
         $requires = "requires";         # the name in the packagelist
     }
 
-    # if ( $installer::globals::patch )
-    # {
-    #   $onepackage->{$provides} = "";
         my $isdict = 0;
         if ( $onepackage->{'packagename'} =~ /-dict-/ ) { $isdict = 1;  }
 
-    #   $onepackage->{$requires} = "";
-    # }
-
     if ( $onepackage->{$provides} )
     {
         my $providesstring = $onepackage->{$provides};
@@ -649,19 +638,6 @@ sub create_epm_header
             $onerequires =~ s/\s*$//;
             installer::packagelist::resolve_packagevariables2(\$onerequires, $variableshashref, 0, $isdict);
 
-            # Special handling for Solaris. In depend files, the names of the packages are required, not
-            # only the abbreviation. Therefore there is a special syntax for names in packagelist:
-            # solarisrequires = "SUNWcar (Name="Package name of SUNWcar"),SUNWkvm (Name="Package name of SUNWcar"), ...
-            # if ( $installer::globals::issolarispkgbuild )
-            # {
-            #   if ( $onerequires =~ /^\s*(.*?)\s+\(\s*Name\s*=\s*\"(.*?)\"\s*\)\s*$/ )
-            #   {
-            #       $onerequires = $1;
-            #       $packagename = $2;
-            #       $installer::globals::dependfilenames{$onerequires} = $packagename;
-            #   }
-            # }
-
             $line = "%requires" . " " . $onerequires . "\n";
             push(@epmheader, $line);
         }
@@ -683,19 +659,6 @@ sub create_epm_header
                 $onerequires =~ s/\s*$//;
                 installer::packagelist::resolve_packagevariables(\$onerequires, $variableshashref, 0);
 
-                # Special handling for Solaris. In depend files, the names of the packages are required, not
-                # only the abbreviation. Therefore there is a special syntax for names in packagelist:
-                # solarisrequires = "SUNWcar (Name="Package name of SUNWcar"),SUNWkvm (Name="Package name of SUNWcar"), ...
-                # if ( $installer::globals::issolarispkgbuild )
-                # {
-                #   if ( $onerequires =~ /^\s*(.*?)\s+\(\s*Name\s*=\s*\"(.*?)\"\s*\)\s*$/ )
-                #   {
-                #       $onerequires = $1;
-                #       $packagename = $2;
-                #       $installer::globals::dependfilenames{$onerequires} = $packagename;
-                #   }
-                # }
-
                 $line = "%requires" . " " . $onerequires . "\n";
                 push(@epmheader, $line);
             }
@@ -762,8 +725,6 @@ sub replace_many_variables_in_shellscripts
     foreach $key (keys %{$variableshashref})
     {
         my $value = $variableshashref->{$key};
-        # $value = lc($value);  # lowercase !
-        # if ( $installer::globals::issolarisbuild) { $value =~ s/\.org/org/g; }    # openofficeorg instead of openoffice.org
         replace_variable_in_shellscripts($scriptref, $value, $key);
     }
 }
@@ -776,8 +737,6 @@ sub adding_shellscripts_to_epm_file
 {
     my ($epmfileref, $shellscriptsfilename, $localrootpath, $allvariableshashref, $filesinpackage) = @_;
 
-    # $installer::globals::shellscriptsfilename
-
     push( @{$epmfileref}, "\n\n" );
 
     my $shellscriptsfileref = installer::files::read_file($shellscriptsfilename);
@@ -1080,8 +1039,6 @@ sub set_revision_in_pkginfo
                 my $finalminor = $minor;
                 my $finalmicro = 0;
 
-                # if (( $packagename =~ /-ure\s*$/ ) && ( $finalmajor == 1 )) { $finalminor = 4; }
-
                 $version = "$finalmajor.$finalminor.$finalmicro";
             }
 
@@ -1318,7 +1275,6 @@ sub set_topdir_in_specfile
 {
     my ($changefile, $filename, $newepmdir) = @_;
 
-    # $newepmdir =~ s/^\s*\.//; # removing leading "."
     $newepmdir = cwd() . $installer::globals::separator . $newepmdir; # only absolute path allowed
 
     # removing "%define _topdir", if existing
@@ -1919,11 +1875,6 @@ sub include_patchinfos_into_pkginfo
     }
     $newline = "SUNW_PATCH_PROPERTIES=\n";
     add_one_line_into_file($changefile, $newline, $filename);
-    # $newline = "SUNW_PKGTYPE=usr\n";
-    # add_one_line_into_file($changefile, $newline, $filename);
-
-    # $newline = "SUNW_PKGVERS=1.0\n";
-    # add_one_line_into_file($changefile, $newline, $filename);
 }
 
 ############################################################
@@ -2103,7 +2054,6 @@ sub prepare_packages
 
     if ( $installer::globals::isrpmbuild )
     {
-        # if ( $localrelocatablepath =~ /^\s*$/ ) { $localrelocatablepath = "/"; }; # at least the "/"
         $filename =  $packagename . ".spec";
         $newline = "Prefix\:\ " . $localrelocatablepath . "\n";
     }
@@ -2118,9 +2068,6 @@ sub prepare_packages
         installer::files::save_file($completefilename, $changefile);
     }
 
-    # my $newepmdir = $completefilename;
-    # installer::pathanalyzer::get_path_from_fullqualifiedname(\$newepmdir);
-
     # adding new "topdir" and removing old "topdir" in specfile
 
     if ( $installer::globals::isrpmbuild )
@@ -2131,7 +2078,6 @@ sub prepare_packages
         if ( is_extension_package($changefile) ) { set_prereq_in_specfile($changefile); }
         set_license_in_specfile($changefile, $variableshashref);
         set_tab_into_datafile($changefile, $filesref);
-        # check_requirements_in_specfile($changefile);
         installer::files::save_file($completefilename, $changefile);
         if ( $installer::globals::patch ) { collect_patch_files($changefile, $packagename, $localrelocatablepath); }
     }
@@ -2245,7 +2191,6 @@ sub determine_rpm_version
     my $rpmout = "";
     my $systemcall = "";
 
-    # my $systemcall = "rpm --version |";
     # "rpm --version" has problems since LD_LIBRARY_PATH was removed. Therefore the content of $RPM has to be called.
     # "rpm --version" and "rpmbuild --version" have the same output. Therefore $RPM can be used. Its value
     # is saved in $installer::globals::rpm
@@ -2354,7 +2299,6 @@ sub create_packages_without_epm
         installer::pathanalyzer::get_path_from_fullqualifiedname(\$destinationdir);
         $destinationdir =~ s/\/\s*$//;  # removing ending slashes
 
-        # my $systemcall = "pkgmk -o -f $prototypefile -d $destinationdir \> /dev/null 2\>\&1";
         my $systemcall = "pkgmk -l 1073741824 -o -f $prototypefile -d $destinationdir 2\>\&1 |";
         installer::logger::print_message( "... $systemcall ...\n" );
 
@@ -2503,6 +2447,7 @@ sub create_packages_without_epm
             push( @installer::globals::logfileinfo, $infoline);
         }
 
+
         ######################
         # making pkg files
         ######################
@@ -2518,13 +2463,13 @@ sub create_packages_without_epm
 
         # if ($returnvalue)
         # {
-        #   $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-        #   push( @installer::globals::logfileinfo, $infoline);
+        # $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
+        # push( @installer::globals::logfileinfo, $infoline);
         # }
         # else
         # {
-        #   $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-        #   push( @installer::globals::logfileinfo, $infoline);
+        # $infoline = "Success: Executed \"$systemcall\" successfully!\n";
+        # push( @installer::globals::logfileinfo, $infoline);
         # }
 
         #########################
@@ -2542,14 +2487,15 @@ sub create_packages_without_epm
 
         # if ($returnvalue)
         # {
-        #   $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-        #   push( @installer::globals::logfileinfo, $infoline);
+        # $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
+        # push( @installer::globals::logfileinfo, $infoline);
         # }
         # else
         # {
-        #   $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-        #   push( @installer::globals::logfileinfo, $infoline);
+        # $infoline = "Success: Executed \"$systemcall\" successfully!\n";
+        # push( @installer::globals::logfileinfo, $infoline);
         # }
+
     }
 
     # Linux: rpm -bb so8m35.spec    ( -> dependency check abklemmen? )
@@ -2559,12 +2505,9 @@ sub create_packages_without_epm
         my $specfilename = $epmdir . $packagename . ".spec";
         if (! -f $specfilename) { installer::exiter::exit_program("ERROR: Did not find file: $specfilename", "create_packages_without_epm"); }
 
-        # my $rpmcommand = "rpm";
         my $rpmcommand = $installer::globals::rpm;
         my $rpmversion = determine_rpm_version();
 
-        # if ( $rpmversion >= 4 ) { $rpmcommand = "rpmbuild"; }
-
         # saving globally for later usage
         $installer::globals::rpmcommand = $rpmcommand;
         $installer::globals::rpmquerycommand = "rpm";
@@ -2614,7 +2557,6 @@ sub create_packages_without_epm
 
             for ( my $j = 0; $j <= $#rpmoutput; $j++ )
             {
-                # if ( $i < $maxrpmcalls ) { $rpmoutput[$j] =~ s/\bERROR\b/PROBLEM/ig; }
                 $rpmoutput[$j] =~ s/\bERROR\b/PROBLEM/ig;
                 push( @installer::globals::logfileinfo, "$rpmoutput[$j]");
             }
@@ -2717,30 +2659,6 @@ sub remove_temporary_epm_files
             $infoline = "Systemcall: $systemcall\n";
             push( @installer::globals::logfileinfo, $infoline);
         }
-
-        # removing the package
-
-#       my $removedir = $epmdir . $packagename;
-#
-#       my $systemcall = "rm -rf $removedir";
-#
-#       print "... $systemcall ...\n";
-#
-#       my $returnvalue = system($systemcall);
-#
-#       my $infoline = "Systemcall: $systemcall\n";
-#       push( @installer::globals::logfileinfo, $infoline);
-#
-#       if ($returnvalue)
-#       {
-#           $infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-#           push( @installer::globals::logfileinfo, $infoline);
-#       }
-#       else
-#       {
-#           $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-#           push( @installer::globals::logfileinfo, $infoline);
-#       }
     }
 
     if ( $installer::globals::isrpmbuild )
@@ -2748,8 +2666,6 @@ sub remove_temporary_epm_files
         my $removefile = $epmdir . $packagename . ".spec";
         my $destfile = $loggingdir . $packagename . ".spec.log";
 
-         # if (! -f $removefile) { next; }
-
         my $systemcall = "mv -f $removefile $destfile";
         system($systemcall);     # ignoring the return value
         $infoline = "Systemcall: $systemcall\n";
@@ -2875,23 +2791,7 @@ sub create_new_directory_structure
     }
 
     # Setting unix rights to "775" for $newdir ("RPMS" or "packages")
-
-    my $localcall = "chmod 775 $newdir \>\/dev\/null 2\>\&1";
-    my $callreturnvalue = system($localcall);
-
-    my $callinfoline = "Systemcall: $localcall\n";
-    push( @installer::globals::logfileinfo, $callinfoline);
-
-    if ($callreturnvalue)
-    {
-        $callinfoline = "ERROR: Could not execute \"$localcall\"!\n";
-        push( @installer::globals::logfileinfo, $callinfoline);
-    }
-    else
-    {
-        $callinfoline = "Success: Executed \"$localcall\" successfully!\n";
-        push( @installer::globals::logfileinfo, $callinfoline);
-    }
+    chmod 0775, $newdir;
 }
 
 ######################################################
@@ -3193,40 +3093,6 @@ sub analyze_rootpath
     $rootpath =~ s/\/\s*$//;    # removing ending slash
 
     ##############################################################
-    # Version 1: "/opt" is variable and "openofficeorg20" fixed
-    ##############################################################
-
-    # my $staticpath = $rootpath;
-    # installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$staticpath);
-    # $$staticpathref = $staticpath;                # will be "openofficeorg20"
-
-    # my $relocatablepath = $rootpath;
-    # installer::pathanalyzer::get_path_from_fullqualifiedname(\$relocatablepath);
-    # $$relocatablepathref = $relocatablepath;      # will be "/opt/"
-
-    ##############################################################
-    # Version 2: "/opt/openofficeorg20" is variable and "" fixed
-    ##############################################################
-
-    # if ( $$relocatablepathref eq "" ) # relocatablepath is not defined in package list
-    # {
-    #   $$staticpathref = "";   # will be ""
-    #   $$relocatablepathref = $rootpath . "\/"; # relocatable path must end with "/", will be "/opt/openofficeorg20/"
-    #   # setting the static path to the hostname of the directory with style OFFICEDIRECTORY
-    #   if ( $allvariables->{'SETSTATICPATH'} ) { $$staticpathref = $installer::globals::officedirhostname; }
-    #
-    # }
-    # else  # relocatablepath is defined in package list
-    # {
-    #   $$relocatablepathref =~ s/\/\s*$//;         # removing ending slash
-    #   $$relocatablepathref = $$relocatablepathref . "\/"; # relocatable path must end with "/"
-    #   my $staticpath = $rootpath;
-    #   $staticpath =~ s/\Q$$relocatablepathref\E//;
-    #   $staticpath =~ s/\/\s*$//;
-    #   $$staticpathref = $staticpath;
-    # }
-
-    ##############################################################
     # Version 3: "/" is variable and "/opt/openofficeorg20" fixed
     ##############################################################
 
@@ -3246,7 +3112,6 @@ sub analyze_rootpath
     {
         $$relocatablepathref = "";
         # $$staticpathref is already "/opt/openoffice.org3", no additional $rootpath required.
-        # $$staticpathref = $rootpath . $installer::globals::separator . $$staticpathref;  # no relocatibility for Debian
     }
 
 }
@@ -3397,20 +3262,6 @@ sub finalize_linux_patch
     if ( ! ( $#{$rpmfiles} > -1 )) { installer::exiter::exit_program("ERROR: Could not find rpm in directory $newepmdir!", "finalize_linux_patch"); }
     for ( my $i = 0; $i <= $#{$rpmfiles}; $i++ ) { installer::pathanalyzer::make_absolute_filename_to_relative_filename(\${$rpmfiles}[$i]); }
 
-#   my $installline = "";
-#
-#   for ( my $i = 0; $i <= $#{$rpmfiles}; $i++ )
-#   {
-#       $installline = $installline . "  rpm --prefix \$PRODUCTINSTALLLOCATION -U $newepmdir/${$rpmfiles}[$i]\n";
-#   }
-#
-#   $installline =~ s/\s*$//;
-#
-#   for ( my $j = 0; $j <= $#{$scriptfile}; $j++ )
-#   {
-#       ${$scriptfile}[$j] =~ s/INSTALLLINES/$installline/;
-#   }
-
     # Searching packagename containing -core01
     my $found_package = 0;
     my $searchpackagename = "";
@@ -3437,7 +3288,6 @@ sub finalize_linux_patch
     my $productname = $allvariables->{'PRODUCTNAME'};
     $productname = lc($productname);
     $productname =~ s/ /_/g;    # abc office -> abc_office
-#   $productname =~ s/\.//g;    # openoffice.org -> openofficeorg
 
     $infoline = "Adding productname $productname into Linux patch script\n";
     push( @installer::globals::logfileinfo, $infoline);
@@ -3446,15 +3296,14 @@ sub finalize_linux_patch
 
     # Saving the file
 
-    my $newscriptfilename = "setup"; # $newepmdir . $installer::globals::separator . "setup";
+    my $newscriptfilename = "setup";
     installer::files::save_file($newscriptfilename, $scriptfile);
 
     $infoline = "Saved Linux patch setup $newscriptfilename \n";
     push( @installer::globals::logfileinfo, $infoline);
 
     # Setting unix rights 755
-    my $localcall = "chmod 775 $newscriptfilename \>\/dev\/null 2\>\&1";
-    system($localcall);
+    chmod 0755, $newscriptfilename;
 }
 
 1;
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 1ae206346910..70bac1122346 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -306,7 +306,6 @@ BEGIN
     $productxpdfile = "setup.xpd";
     $xpd_files_prepared = 0;
     $defaultlanguage = "";
-    # @emptyxpdparents = ();
     @createdxpdfiles = ();
     @allxpdfiles = ();
     $isxpdplatform = 0;
@@ -531,9 +530,6 @@ BEGIN
         $isunix = 1;
         $iswin = 0;
     }
-    # WRAPCMD is gone - remove this and all related
-    # $installer::globals::wrapcmd entries
-    $wrapcmd = "";
 
     if ( $plat =~ /linux/i ) { $islinux = 1; }
     if ( $plat =~ /kfreebsd/i ) { $islinux = 1; }
diff --git a/solenv/bin/modules/installer/javainstaller.pm b/solenv/bin/modules/installer/javainstaller.pm
index ebc7b440de8f..6cc71c2f2eb7 100644
--- a/solenv/bin/modules/installer/javainstaller.pm
+++ b/solenv/bin/modules/installer/javainstaller.pm
@@ -260,7 +260,6 @@ sub translate_javafile
             $newstring =~ s/\"/\\\"/g;  # masquerading the "
             $newstring =~ s/\\\\\"/\\\"/g;  # unmasquerading if \" was converted to \\" (because " was already masked)
 
-            # if (!( $newstring eq "" )) { ${$idtfile}[$i] =~ s/$oldstring/$newstring/; }
             ${$templatefile}[$i] =~ s/$oldstring/$newstring/;   # always substitute, even if $newstring eq ""
         }
     }
@@ -861,15 +860,7 @@ sub prepare_language_pack_in_xmlfile
 {
     my ($xmlfile, $languagesarrayref) = @_;
 
-    # if ( ! $installer::globals::is_unix_multi )
-    # {
-    #   remove_languagepack_from_xmlfile($xmlfile);
-    # }
-    # else
-    # {
         duplicate_languagepack_in_xmlfile($xmlfile, $languagesarrayref);
-    # }
-
 }
 
 #######################################################
@@ -1168,8 +1159,7 @@ sub copy_setup_locally
     if ($$loadernameref eq "") { installer::exiter::exit_program("ERROR: Could not find Java loader $loadername!", "copy_setup_locally"); }
 
     installer::systemactions::copy_one_file($$loadernameref, $newname);
-    my $localcall = "chmod 775 $newname \>\/dev\/null 2\>\&1";
-    system($localcall);
+    chmod 0775, $newname;
 }
 
 
@@ -1185,8 +1175,7 @@ sub put_loader_into_installset
 
     installer::systemactions::copy_one_file($filename, $installname);
 
-    my $localcall = "chmod 775 $installname \>\/dev\/null 2\>\&1";
-    system($localcall);
+    chmod 0775, $installname;
 }
 
 #################################################################
@@ -1672,7 +1661,6 @@ sub create_java_installer
     # creating the directory
     my $javadir = installer::systemactions::create_directories("javainstaller", $languagestringref);
     $javadir =~ s/\/\s*$//;
-#   push(@installer::globals::removedirs, $javadir);
 
     # copying the content from directory install_sdk into the java directory
 
@@ -1694,7 +1682,6 @@ sub create_java_installer
 
     # determining the ulf language file
 
-    # my $ulffilename = "installsdk.ulf";
     my $ulffilename = "installsdk.jlf";
     $ulffilename = $installer::globals::javalanguagepath . $installer::globals::separator . $ulffilename;
     my $ulffile = installer::files::read_file($ulffilename);
@@ -1728,7 +1715,6 @@ sub create_java_installer
 
         # setting the class name in the java file ( "MyResources_TEMPLATE" -> "MyResources_en" )
 
-        # if ( $onelanguage =~ /^\s*(\w+)\-(\w+)\s*$/ ) { $onelanguage = $1; }
         $onelanguage =~ s/en-US/en/;    # java file name and class name contain only "_en"
         $onelanguage =~ s/\-/\_/;       # "pt-BR" -> "pt_BR"
         my $classfilename = "MyResources_" . $onelanguage;
@@ -1750,8 +1736,6 @@ sub create_java_installer
     my $baselanguage = installer::languages::get_default_language($languagesarrayref);
     $baselanguage =~ s/\-/\_/;      # "pt-BR" -> "pt_BR"
     $baselanguage =~ s/en_US/en/;   # java file name and class name contain only "_en"
-    # if ( $baselanguage =~ /^\s*(\w+)\-(\w+)\s*$/ ) { $baselanguage = $1; }     # java file name and class name contain only "_en"
-    # $baselanguage =~ s/en-US/en/;  # java file name and class name contain only "_en"
     my $baselanguagefilename = $javadir . $installer::globals::separator . "locale/resources/MyResources_" . $baselanguage . "\.java";
     my $basedestfilename = $javadir . $installer::globals::separator . "locale/resources/MyResources.java";
     installer::systemactions::copy_one_file($baselanguagefilename, $basedestfilename);
diff --git a/solenv/bin/modules/installer/languagepack.pm b/solenv/bin/modules/installer/languagepack.pm
index 7d3e0f6aca0e..80d2fa82c420 100644
--- a/solenv/bin/modules/installer/languagepack.pm
+++ b/solenv/bin/modules/installer/languagepack.pm
@@ -82,33 +82,6 @@ sub select_language_items
 
             if ( $specificlanguage eq $onelanguage )
             {
-                # $oneitem->{'modules'} = $installer::globals::rootmodulegid;    # all files in a language pack are root files
-                # Using $installer::globals::languagemodulesbase (?)
-
-#               # no more automatic change of module assignments
-#               $oneitem->{'modules'} = $installer::globals::rootmodulegid . "_$locallang";      # all files in a language pack are root files
-#
-#               if (( $installer::globals::islinuxbuild ) || ( $installer::globals::issolarispkgbuild ))
-#               {
-#                   if ( $oneitem->{'Dir'} )
-#                   {
-#                       if ( $oneitem->{'Dir'} eq "gid_Dir_Fonts_Truetype" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Fonts_$locallang"; }
-#                       if ( $oneitem->{'Dir'} eq "gid_Dir_Resource" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Resource_$locallang"; }
-#                       if ( $oneitem->{'Dir'} eq "gid_Dir_Help_Isolanguage" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Help_$locallang"; }
-#                   }
-#               }
-
-                # preparing different modules for Windows Installer language packs
-                # my $underlinelanguage = $specificlanguage;
-                # $underlinelanguage =~ s/-/_/;
-                # if ( $installer::globals::iswindowsbuild ) { $oneitem->{'modules'} = $installer::globals::languagemodulesbase . $underlinelanguage; }
-
-#               # no more collecting of language pack feature
-#               if (! installer::existence::exists_in_array($oneitem->{'modules'}, \@installer::globals::languagepackfeature))
-#               {
-#                   push(@installer::globals::languagepackfeature, $oneitem->{'modules'});  # Collecting all language pack feature
-#               }
-
                 push(@itemsarray, $oneitem);
             }
         }
@@ -195,20 +168,6 @@ sub get_packagename_from_packagelist
 {
     my ( $alldirs, $allvariables, $languagestringref ) = @_;
 
-    # my $packagename = "";
-
-    # for ( my $i = 0; $i <= $#{$alldirs}; $i++ )
-    # {
-    #   if ( ${$alldirs}[$i] =~ /-fonts/ ) { next; }
-    #   if ( ${$alldirs}[$i] =~ /-help/ ) { next; }
-    #   if ( ${$alldirs}[$i] =~ /-res/ ) { next; }
-    #
-    #   $packagename = ${$alldirs}[$i];
-    #   last;
-    # }
-
-    # if ( $packagename eq "" ) { installer::exiter::exit_program("ERROR: Could not find base package in directory $installdir!", "get_packagename_from_packagelist"); }
-
     my $localproductname = $allvariables->{'PRODUCTNAME'};
     $localproductname = lc($localproductname);
     $localproductname =~ s/ //g;
@@ -411,9 +370,6 @@ sub determine_scriptfile_name
 
     my $scriptfilename = $packagename;
 
-#   if ( $installer::globals::isrpmbuild ) { $scriptfilename =~ s/\.rpm\s*$/\.sh/; }
-#   if ( $installer::globals::issolarisbuild ) { $scriptfilename =~ s/\.tar\.gz\s*$/\.sh/; }
-
     $scriptfilename =~ s/\.tar\.gz\s*$/\.sh/;
 
     my $infoline = "Setting language pack script file name to $scriptfilename\n";
@@ -466,8 +422,7 @@ sub include_package_into_script
         push( @installer::globals::logfileinfo, $infoline);
     }
 
-    my $localcall = "chmod 775 $scriptfilename \>\/dev\/null 2\>\&1";
-    system($localcall);
+    chmod 0775, $scriptfilename;
 
 }
 
diff --git a/solenv/bin/modules/installer/languages.pm b/solenv/bin/modules/installer/languages.pm
index 7070b09f80b8..8f0b6e929356 100644
--- a/solenv/bin/modules/installer/languages.pm
+++ b/solenv/bin/modules/installer/languages.pm
@@ -331,45 +331,6 @@ sub get_java_language
 {
     my ( $language ) = @_;
 
-    # my $javalanguage = "";
-
-    # if ( $language eq "en-US" ) { $javalanguage = "en_US"; }
-    # elsif ( $language eq "ar" ) { $javalanguage = "ar_AR"; }
-    # elsif ( $language eq "bg" ) { $javalanguage = "bg_BG"; }
-    # elsif ( $language eq "ca" ) { $javalanguage = "ca_CA"; }
-    # elsif ( $language eq "cs" ) { $javalanguage = "cs_CS"; }
-    # elsif ( $language eq "da" ) { $javalanguage = "da_DA"; }
-    # elsif ( $language eq "de" ) { $javalanguage = "de"; }
-    # elsif ( $language eq "de" ) { $javalanguage = "de_DE"; }
-    # elsif ( $language eq "et" ) { $javalanguage = "et_ET"; }
-    # elsif ( $language eq "el" ) { $javalanguage = "el_EL"; }
-    # elsif ( $language eq "fi" ) { $javalanguage = "fi_FI"; }
-    # elsif ( $language eq "fr" ) { $javalanguage = "fr_FR"; }
-    # elsif ( $language eq "hu" ) { $javalanguage = "hu_HU"; }
-    # elsif ( $language eq "he" ) { $javalanguage = "he_HE"; }
-    # elsif ( $language eq "it" ) { $javalanguage = "it_IT"; }
-    # elsif ( $language eq "nl" ) { $javalanguage = "nl_NL"; }
-    # elsif ( $language eq "es" ) { $javalanguage = "es_ES"; }
-    # elsif ( $language eq "sv" ) { $javalanguage = "sv_SV"; }
-    # elsif ( $language eq "sk" ) { $javalanguage = "sk_SK"; }
-    # elsif ( $language eq "pl" ) { $javalanguage = "pl_PL"; }
-    # elsif ( $language eq "pt-BR" ) { $javalanguage = "pt_BR"; }
-    # elsif ( $language eq "ru" ) { $javalanguage = "ru_RU"; }
-    # elsif ( $language eq "tr" ) { $javalanguage = "tr_TR"; }
-    # elsif ( $language eq "ja" ) { $javalanguage = "ja"; }
-    # elsif ( $language eq "ja" ) { $javalanguage = "ja_JP"; }
-    # elsif ( $language eq "ko" ) { $javalanguage = "ko_KR"; }
-    # elsif ( $language eq "th" ) { $javalanguage = "th_TH"; }
-    # elsif ( $language eq "zh-CN" ) { $javalanguage = "zh_CN"; }
-    # elsif ( $language eq "zh-TW" ) { $javalanguage = "zh_TW"; }
-
-    # languages not defined yet
-    # if ( $javalanguage eq "" )
-    # {
-    #   $javalanguage = $language;
-    #   $javalanguage =~ s/\-/\_/;
-    # }
-
     $javalanguage = $language;
     $javalanguage =~ s/\-/\_/;
 
diff --git a/solenv/bin/modules/installer/packagelist.pm b/solenv/bin/modules/installer/packagelist.pm
index f2becc19a610..1c5d6fa00ba0 100644
--- a/solenv/bin/modules/installer/packagelist.pm
+++ b/solenv/bin/modules/installer/packagelist.pm
@@ -85,7 +85,6 @@ sub analyze_list
 
         push(@allmodules, $onegid);
 
-        # get_children($moduleslist, $onegid, \@allmodules);
         get_children_with_hash($moduleshash, $onegid, \@allmodules);
 
         $onepackage->{'allmodules'} = \@allmodules;
@@ -180,8 +179,6 @@ sub remove_multiple_modules_packages
         my $onepackage = ${$allpackagemodules}[$i];
         my $allmodules = $onepackage->{'allmodules'};
 
-        # print "Modules below $onepackage->{'module'}: $#{$allmodules}\n";
-
         # Comparing each package, with all following packages. If a
         # gid for the module is part of more than one package, it is
         # removed if the number of modules in the package is greater
@@ -240,14 +237,6 @@ sub remove_multiple_modules_packages
 
         $onepackage->{'allmodules'} = \@optimizedpackage;
     }
-
-    # for ( my $i = 0; $i <= $#{$allpackagemodules}; $i++ )
-    # {
-    #   my $onepackage = ${$allpackagemodules}[$i];
-    #   my $allmodules = $onepackage->{'allmodules'};
-    #   print "New: Modules below $onepackage->{'module'}: $#{$allmodules}\n";
-    # }
-
 }
 
 #####################################################################
@@ -652,11 +641,6 @@ sub collectpackages
         {
             my $modulegid = $onemodule->{'gid'};
 
-            # Only collecting modules with correct language for language packs
-#           if ( $installer::globals::languagepack ) { if ( ! ( $modulegid =~ /_$onelanguage\s*$/ )) { next; } }
-            # Resetting language, if this is no language pack
-#           if ( ! $installer::globals::languagepack ) { $onelanguage = ""; }
-
             my $styles = "";
             if ( $onemodule->{'Styles'} ) { $styles = $onemodule->{'Styles'}; }
 
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index f43af6a35454..c4d8739fbc31 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -454,8 +454,7 @@ sub setglobalvariables
 
         if ( $installer::globals::compiler =~ /^unxmac/ )
         {
-            my $localcall = "chmod 777 $installer::globals::temppath \>\/dev\/null 2\>\&1";
-            system($localcall);
+            chmod 0777, $installer::globals::temppath;
         }
 
         $installer::globals::temppath = $installer::globals::temppath . $installer::globals::separator . "i";
diff --git a/solenv/bin/modules/installer/regmerge.pm b/solenv/bin/modules/installer/regmerge.pm
index 1c2821549131..193d77073e37 100644
--- a/solenv/bin/modules/installer/regmerge.pm
+++ b/solenv/bin/modules/installer/regmerge.pm
@@ -315,7 +315,6 @@ sub merge_registration_files
         {
             $databasegid = ${$databasegids}[$i];
 
-            # my $databasedirname = "starregistryrdb"; <- not unique!
             my $databasedirname = $databasegid . "_rdb"; # <- unique!
             my $databasedir = installer::systemactions::create_directories($databasedirname, $languagestringref);
             push(@installer::globals::removedirs, $databasedir);
diff --git a/solenv/bin/modules/installer/scppatchsoname.pm b/solenv/bin/modules/installer/scppatchsoname.pm
index 32a142828981..df7caeb48c81 100644
--- a/solenv/bin/modules/installer/scppatchsoname.pm
+++ b/solenv/bin/modules/installer/scppatchsoname.pm
@@ -175,9 +175,6 @@ sub resolving_patchsoname_flag
             my $destinationpath = $replacedir . $onefilename;
             my $movepath = $destinationpath . ".orig";
 
-            # if (!(-f $destinationpath))   # do nothing if the file already exists
-            # {
-
             my $copysuccess = installer::systemactions::copy_one_file($sourcepath, $movepath);
 
             if ( $copysuccess )
@@ -197,8 +194,6 @@ sub resolving_patchsoname_flag
                 }
             }
 
-            # }
-
             # Saving the original source, where the file was found
             $onefile->{'originalsourcepath'} = $onefile->{'sourcepath'};
 
diff --git a/solenv/bin/modules/installer/scpzipfiles.pm b/solenv/bin/modules/installer/scpzipfiles.pm
index 52dea6032ee1..bcfd49e0b145 100644
--- a/solenv/bin/modules/installer/scpzipfiles.pm
+++ b/solenv/bin/modules/installer/scpzipfiles.pm
@@ -69,8 +69,6 @@ sub replace_all_ziplistvariables_in_rtffile
 {
     my ( $fileref, $variablesref, $onelanguage, $loggingdir ) = @_;
 
-    # installer::files::save_file($loggingdir . "license_" . $onelanguage . "_before.rtf", $fileref);
-
     for ( my $i = 0; $i <= $#{$fileref}; $i++ )
     {
         my $line = ${$fileref}[$i];
@@ -96,8 +94,6 @@ sub replace_all_ziplistvariables_in_rtffile
             }
         }
     }
-
-    # installer::files::save_file($loggingdir . "license_" . $onelanguage . "_after.rtf", $fileref);
 }
 
 #########################################################
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index 03ebe685073e..9b2a07f10674 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -809,7 +809,6 @@ sub replace_setup_variables
 
     if ( $localminor =~ /^\s*\w(\d+)\w*\s*$/ ) { $localminor = $1; }
 
-    # $updateid
     my $updateid = $productname . "_" . $userdirproductversion . "_" . $$languagestringref;
     $updateid =~ s/ /_/g;
 
@@ -1243,7 +1242,6 @@ sub get_Source_Directory_For_Files_From_Includepathlist
                 my $oldname = $onefile->{'Name'};
                 my $oldlanguage = $onefile->{'specificlanguage'};
                 my $newlanguage = "en-US";
-                # $onefile->{'Name'} =~ s/$oldlanguage\./$newlanguage\./;   # Example: tplwizfax_it.zip -> tplwizfax_en-US.zip
                 $onefilename = $onefile->{'Name'};
                 $onefilename =~ s/$oldlanguage\./$newlanguage\./;   # Example: tplwizfax_it.zip -> tplwizfax_en-US.zip
                 $onefilename =~ s/^\s*\Q$installer::globals::separator\E//;     # filename begins with a slash, for instance /registry/schema/org/openoffice/VCL.xcs
@@ -1255,7 +1253,6 @@ sub get_Source_Directory_For_Files_From_Includepathlist
                     $infoline = "WARNING: Using $onefilename instead of $oldname\n";
                     push( @installer::globals::logfileinfo, $infoline);
                     print "    $infoline";
-                    # if ( $onefile->{'destination'} ) { $onefile->{'destination'} =~ s/\Q$oldname\E/$onefile->{'Name'}/; }
 
                     # If the directory, in which the new file is installed, is not language dependent,
                     # the filename has to be changed to avoid installation conflicts
@@ -2013,18 +2010,14 @@ sub quoting_illegal_filenames
 
             # sourcepath and destination have to be quoted for epm list file
 
-            # $filename =~ s/\$/\$\$/g;
             $destpath =~ s/\$/\$\$/g;
             $sourcepath =~ s/\$/\$\$/g;
 
-            # my $infoline = "ATTENTION: Files: Renaming $onefile->{'Name'} to $filename\n";
-            # push( @installer::globals::logfileinfo, $infoline);
             my $infoline = "ATTENTION: Files: Quoting sourcepath $onefile->{'sourcepath'} to $sourcepath\n";
             push( @installer::globals::logfileinfo, $infoline);
             $infoline = "ATTENTION: Files: Quoting destination path $onefile->{'destination'} to $destpath\n";
             push( @installer::globals::logfileinfo, $infoline);
 
-            # $onefile->{'Name'} = $filename;
             $onefile->{'sourcepath'} = $sourcepath;
             $onefile->{'destination'} = $destpath;
         }
@@ -2089,7 +2082,6 @@ sub collect_directories_from_filesarray
             $directoryhash{'specificlanguage'} = $onefile->{'specificlanguage'};
             $directoryhash{'Dir'} = $onefile->{'Dir'};
             $directoryhash{'modules'} = $onefile->{'modules'}; # NEW, saving modules
-            # NEVER!!!  if ( ! $installer::globals::iswindowsbuild ) { $directoryhash{'Styles'} = "(CREATE)"; } # this directories must be created
 
             if ( $onefile->{'Dir'} eq "PREDEFINED_PROGDIR" ) { $predefinedprogdir_added = 1; }
 
@@ -2114,7 +2106,6 @@ sub collect_directories_from_filesarray
                     $directoryhash{'specificlanguage'} = $onefile->{'specificlanguage'};
                     $directoryhash{'Dir'} = $onefile->{'Dir'};
                     $directoryhash{'modules'} = $onefile->{'modules'}; # NEW, saving modules
-                    # NEVER!!! if ( ! $installer::globals::iswindowsbuild ) { $directoryhash{'Styles'} = "(CREATE)"; }  # this directories must be created
 
                     $alldirectoryhash{$destinationpath} = \%directoryhash;
                 }
@@ -2199,7 +2190,6 @@ sub collect_directories_with_create_flag_from_directoryarray
                 my %directoryhash = ();
                 $directoryhash{'HostName'} = $directoryname;
                 $directoryhash{'specificlanguage'} = $onedir->{'specificlanguage'};
-                # $directoryhash{'gid'} = $onedir->{'gid'};
                 $directoryhash{'Dir'} = $onedir->{'gid'};
                 $directoryhash{'Styles'} = $onedir->{'Styles'};
 
@@ -2472,7 +2462,6 @@ sub insert_for_item ($$$)
 {
     my ($hash, $item, $id) = @_;
 
-    # print STDERR "insert '$id' for '$item'\n";
     if (!defined $hash->{$item})
     {
         my @gids = ();
@@ -2526,7 +2515,6 @@ sub get_string_of_modulegids_for_itemgid
     my $haslanguagemodule = 0;
     my %foundmodules = ();
 
-    # print STDERR "lookup '" . lc($itemgid) . "'\n";
     my $gid_list = $module_lookup_table->{lc($itemgid)};
 
     for my $gid (@{$gid_list})
@@ -2546,8 +2534,6 @@ sub get_string_of_modulegids_for_itemgid
         if ( ! $isreallylanguagemodule ) { installer::exiter::exit_program("ERROR: \"$itemgid\" is assigned to modules with flag \"LANGUAGEMODULE\" and also to modules without this flag! Modules: $allmodules", "get_string_of_modulegids_for_itemgid");  }
     }
 
-    # print STDERR "get_string_for_itemgid ($itemgid, $itemname) => $allmodules, $haslanguagemodule\n";
-
     return ($allmodules, $haslanguagemodule);
 }
 
diff --git a/solenv/bin/modules/installer/servicesfile.pm b/solenv/bin/modules/installer/servicesfile.pm
index 63e5f44125c8..892b5af28180 100644
--- a/solenv/bin/modules/installer/servicesfile.pm
+++ b/solenv/bin/modules/installer/servicesfile.pm
@@ -167,7 +167,7 @@ sub call_regcomp
 
     my $error_occured = 0;
 
-    my $systemcall = "$installer::globals::wrapcmd $$regcompfileref -register -r ".fix_cygwin_path($servicesfile)." -c "  . $installer::globals::quote . $filestring . $installer::globals::quote . " -wop=" . $installer::globals::quote . $urlprefix . $installer::globals::quote . " 2\>\&1 |";
+    my $systemcall = "$$regcompfileref -register -r ".fix_cygwin_path($servicesfile)." -c "  . $installer::globals::quote . $filestring . $installer::globals::quote . " -wop=" . $installer::globals::quote . $urlprefix . $installer::globals::quote . " 2\>\&1 |";
 
     open (REG, "$systemcall");
     while (<REG>) {push(@regcompoutput, $_); }
@@ -229,7 +229,7 @@ sub register_javacomponents
             {
                 my @regcompoutput = ();
 
-                my $systemcall = "$installer::globals::wrapcmd $$regcompfileref -register -br ".fix_cygwin_path($regcomprdb)." -r ".fix_cygwin_path($servicesfile)." -c " . $installer::globals::quote . $filestring . $installer::globals::quote . " -l com.sun.star.loader.Java2 -wop=" . $installer::globals::quote . $javaservicesurlprefix . $installer::globals::quote ." -env:URE_INTERNAL_JAVA_DIR=" . $installer::globals::quote . make_file_url($$ure_internal_java_dir_ref) . $installer::globals::quote . " 2\>\&1 |";
+                my $systemcall = "$$regcompfileref -register -br ".fix_cygwin_path($regcomprdb)." -r ".fix_cygwin_path($servicesfile)." -c " . $installer::globals::quote . $filestring . $installer::globals::quote . " -l com.sun.star.loader.Java2 -wop=" . $installer::globals::quote . $javaservicesurlprefix . $installer::globals::quote ." -env:URE_INTERNAL_JAVA_DIR=" . $installer::globals::quote . make_file_url($$ure_internal_java_dir_ref) . $installer::globals::quote . " 2\>\&1 |";
 
                 open (REG, "$systemcall");
                 while (<REG>) {push(@regcompoutput, $_); }
@@ -276,7 +276,7 @@ sub fix_cygwin_path
 {
     my ( $path ) = @_;
 
-    if ( $installer::globals::iswin eq 1 && $installer::globals::wrapcmd eq "" )
+    if ( $installer::globals::iswin eq 1 )
     {
     $path = qx{cygpath -m "$path"};
     chomp($path);
@@ -365,7 +365,7 @@ sub register_pythoncomponents
 
                 my @regcompoutput = ();
 
-                $systemcall = "$installer::globals::wrapcmd $$regcompfileref -register"
+                $systemcall = "$$regcompfileref -register"
                 . " -br " . fix_cygwin_path($$typesrdbref)
                 . " -br " . fix_cygwin_path($$pyunoservicesrdbref)
                 . " -r " . fix_cygwin_path($servicesfile)
@@ -715,7 +715,7 @@ sub prepare_regcomp_rdb
 
         chdir($to);
 
-        my $systemcall = "$installer::globals::wrapcmd $regcompfile -register -s -r " . fix_cygwin_path($regcomprdb) . " -c $libfilename";
+        my $systemcall = "$regcompfile -register -s -r " . fix_cygwin_path($regcomprdb) . " -c $libfilename";
 
         my $returnvalue = system($systemcall);
 
@@ -922,26 +922,16 @@ sub create_services_rdb
         {
             my $registryfile = ${$registryfiles}[$i];
 
-            # my $servicesname = "services.rdb";
             my $servicesname = $registryfile->{'Name'};  # not unique!
             my $servicesgid = $registryfile->{'gid'};  # unique
             my $uniquedirname = $servicesgid . "_servicesrdb";
-            # my $uniquedirname = $servicesgid;
 
             my ($nativeservicesurlprefix, $javaservicesurlprefix) = set_url_prefixes($registryfile);
 
             installer::logger::include_header_into_logfile("Creating $servicesname ($servicesgid):");
 
-            # my $servicesdir = installer::systemactions::create_directories($servicesname, $languagestringref);
             my $servicesdir = installer::systemactions::create_directories($uniquedirname, $languagestringref);
 
-#           if ( $^O =~ /cygwin/i )
-#           {      # $servicesdir is used as a parameter for regcomp and has to be DOS style
-#               $servicesdir = qx{cygpath -d "$servicesdir"};
-#               chomp($servicesdir);
-#               $servicesdir =~ s/\\/\//g;
-#           }
-
             push(@installer::globals::removedirs, $servicesdir);
 
             my $servicesfile = $servicesdir . $installer::globals::separator . $servicesname;
@@ -949,8 +939,6 @@ sub create_services_rdb
             # If there is an older version of this file, it has to be removed
             if ( -f $servicesfile ) { unlink($servicesfile); }
 
-            # if ((-f $servicesfile) && (!($installer::globals::services_rdb_created))) { $installer::globals::services_rdb_created = 1; }
-            # if ((!($installer::globals::services_rdb_created)) && $installer::globals::servicesrdb_can_be_created )   # This has to be done once
             if ( $installer::globals::servicesrdb_can_be_created )  # This has to be done always
             {
                 # Creating the services.rdb in directory "inprogress"
@@ -1009,7 +997,6 @@ sub create_services_rdb
 
                 # and now iteration over all files
 
-                # my $error_during_registration = register_all_components($filesarrayref, $regcompfileref, $servicesfile, $regcomprdb, $includepatharrayref);
                 my $error_during_registration = register_all_components($allvariableshashref, $servicesgid, $unocomponentfiles, $regcompfileref, $servicesfile, $regcomprdb, $includepatharrayref, $nativeservicesurlprefix, $javaservicesurlprefix);
 
                 if (defined $var_library_path) {
@@ -1061,7 +1048,6 @@ sub create_services_rdb
 
             # Adding the new services file source path to the filearray
             $registryfile->{'sourcepath'} = $servicesfile;  # setting the sourcepath!
-            # add_services_sourcepath_into_filearray( $filesarrayref, $servicesfile, $servicesname );
         }
     }
 
diff --git a/solenv/bin/modules/installer/setupscript.pm b/solenv/bin/modules/installer/setupscript.pm
index a3bf5abf50a9..70a862949385 100644
--- a/solenv/bin/modules/installer/setupscript.pm
+++ b/solenv/bin/modules/installer/setupscript.pm
@@ -162,23 +162,17 @@ sub add_lowercase_productname_setupscriptvariable
                 push(@{$variablesref} ,$newline);
                 $value = $original;
                 $value =~ s/\s/\_/g;
-                # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $1 . $2 . $4; }
                 $newline = "\%UNIXPRODUCTNAME " . lc($value) . "\n";
                 push(@{$variablesref} ,$newline);
                 $newline = "\%SYSTEMINTUNIXPACKAGENAME " . lc($value) . "\n";
                 push(@{$variablesref} ,$newline);
-                # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $1 . $2 . $4; }
-                # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $2 . $4; }
                 $newline = "\%UNIXPACKAGENAME " . lc($value) . "\n";
                 push(@{$variablesref} ,$newline);
                 $value = $original;
                 $value =~ s/\s/\_/g;
                 $value =~ s/\.//g;
-                # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $1 . $2 . $4; }
                 $newline = "\%WITHOUTDOTUNIXPRODUCTNAME " . lc($value) . "\n";
                 push(@{$variablesref} ,$newline);
-                # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $1 . $2 . $4; }
-                # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $2 . $4; }
                 $newline = "\%WITHOUTDOTUNIXPACKAGENAME " . lc($value) . "\n";
                 push(@{$variablesref} ,$newline);
                 $newline = "\%SOLARISBRANDPACKAGENAME " . lc($value) . "\n";
@@ -292,7 +286,6 @@ sub replace_all_setupscriptvariables_in_script
             if (( $check =~ /%1/ ) || ( $check =~ /%2/ ) || ( $check =~ /%verify/ )) { next; }
             my $infoline = "WARNING: mis-named or un-known '%' variable in setup script at line $num:\n$check\n";
             push( @installer::globals::globallogfileinfo, $infoline);
-            # print STDERR "Warning: mis-named or un-known '%' variable at line $num:\n$check\n";
         }
     }
 
@@ -521,10 +514,6 @@ sub replace_preset_properties
     my @presetproperties = ();
     push(@presetproperties, "SOLARISBRANDPACKAGENAME");
     push(@presetproperties, "SYSTEMINTUNIXPACKAGENAME");
-    # push(@presetproperties, "UNIXPACKAGENAME");
-    # push(@presetproperties, "WITHOUTDOTUNIXPACKAGENAME");
-    # push(@presetproperties, "UNIXPRODUCTNAME");
-    # push(@presetproperties, "WITHOUTDOTUNIXPRODUCTNAME");
 
 
     foreach $property ( @presetproperties )
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index adf1a9afdae6..84e0047df85d 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -27,7 +27,6 @@
 
 package installer::simplepackage;
 
-# use Archive::Zip qw( :ERROR_CODES :CONSTANTS );
 use Cwd;
 use File::Copy;
 use installer::download;
@@ -192,9 +191,6 @@ sub register_extensions
 sub get_mac_translation_file
 {
     my $translationfilename = $installer::globals::maclangpackfilename;
-    # my $translationfilename = $installer::globals::idtlanguagepath . $installer::globals::separator . $installer::globals::maclangpackfilename;
-    # if ( $installer::globals::unicodensis ) { $translationfilename = $translationfilename . ".uulf"; }
-    # else { $translationfilename = $translationfilename . ".mlf"; }
     if ( ! -f $translationfilename ) { installer::exiter::exit_program("ERROR: Could not find language file $translationfilename!", "get_mac_translation_file"); }
     my $translationfile = installer::files::read_file($translationfilename);
 
@@ -306,8 +302,6 @@ sub localize_scriptfile
 {
     my ($scriptfile, $translationfile, $languagestringref) = @_;
 
-    # my $translationfile = get_mac_translation_file();
-
     my $onelanguage = $$languagestringref;
     if ( $onelanguage =~ /^\s*(.*?)_/ ) { $onelanguage = $1; }
 
@@ -500,10 +494,8 @@ sub create_package
             replace_variables_in_scriptfile($scriptfilecontent, $volume_name, $allvariables);
             installer::files::save_file($scriptfilename, $scriptfilecontent);
 
-            $systemcall = "chmod 775 " . "\"" . $scriptfilename . "\"";
-            system($systemcall);
-            $systemcall = "chmod 775 " . "\"" . $scripthelperrealfilename . "\"";
-            system($systemcall);
+            chmod 0775, $scriptfilename;
+            chmod 0775, $scripthelperrealfilename;
 
             # Copy also Info.plist and icon file
             # Finding both files in solver
@@ -717,13 +709,9 @@ sub create_simple_package
             if ( ! $installer::globals::iswindowsbuild )
             {
                 # see issue 102274
-                my $unixrights = "";
                 if ( $onefile->{'UnixRights'} )
                 {
-                    $unixrights = $onefile->{'UnixRights'};
-
-                    my $localcall = "$installer::globals::wrapcmd chmod $unixrights \'$destination\' \>\/dev\/null 2\>\&1";
-                    system($localcall);
+                    chmod oct($onefile->{'UnixRights'}), $destination;
                 }
             }
         }
diff --git a/solenv/bin/modules/installer/substfilenamefiles.pm b/solenv/bin/modules/installer/substfilenamefiles.pm
index 12cb6ab8eb4f..ac41e2f423bd 100644
--- a/solenv/bin/modules/installer/substfilenamefiles.pm
+++ b/solenv/bin/modules/installer/substfilenamefiles.pm
@@ -82,7 +82,6 @@ sub resolving_subst_filename_flag
 
             my $sourcepath = $onefile->{'sourcepath'};
 
-            # if ( $onefilename =~ /^\s*\Q$installer::globals::separator\E/ )   # filename begins with a slash, for instance /registry/schema/org/openoffice/VCL.xcs
             if ( $onefilename =~ /\Q$installer::globals::separator\E/ ) # filename begins with a slash, for instance /registry/schema/org/openoffice/VCL.xcs
             {
                 $onefilename =~ s/^\s*\Q$installer::globals::separator\E//;
diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm
index c1cca5e47c17..9a29a91dcbf8 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -43,108 +43,7 @@ sub create_directory
 {
     my ($directory) = @_;
 
-    my $returnvalue = 1;
-    my $infoline = "";
-
-    if (!(-d $directory))
-    {
-        $returnvalue = mkdir($directory, 0775);
-
-        if ($returnvalue)
-        {
-            $infoline = "\nCreated directory: $directory\n";
-            push(@installer::globals::logfileinfo, $infoline);
-
-            my $localcall = "chmod 0775 $directory \>\/dev\/null 2\>\&1";
-            system($localcall);
-
-            # chmod 0775 is not sufficient on mac to remove sticky tag
-            $localcall = "chmod a-s $directory \>\/dev\/null 2\>\&1";
-            system($localcall);
-        }
-        else
-        {
-            # New solution in parallel packing: It is possible, that the directory now exists, although it
-            # was not created in this process. There is only an important error, if the directory does not
-            # exist now.
-
-            $infoline = "\nDid not succeed in creating directory: \"$directory\". Further attempts will follow.\n";
-            push(@installer::globals::logfileinfo, $infoline);
-
-            if (!(-d $directory))
-            {
-                # Problem with parallel packaging? -> Try a little harder, before exiting.
-                # Did someone else remove the parent directory in the meantime?
-                my $parentdir = $directory;
-                installer::pathanalyzer::get_path_from_fullqualifiedname(\$parentdir);
-                if (!(-d $parentdir))
-                {
-                    $returnvalue = mkdir($parentdir, 0775);
-
-                    if ($returnvalue)
-                    {
-                        $infoline = "\nAttention: Successfully created parent directory (should already be created before): $parentdir\n";
-                        push(@installer::globals::logfileinfo, $infoline);
-
-                        my $localcall = "chmod 775 $parentdir \>\/dev\/null 2\>\&1";
-                        system($localcall);
-                    }
-                    else
-                    {
-                        $infoline = "\Error: \"$directory\" could not be created. Even the parent directory \"$parentdir\" does not exist and could not be created.\n";
-                        push(@installer::globals::logfileinfo, $infoline);
-                        if ( -d $parentdir )
-                        {
-                            $infoline = "\nAttention: Finally the parent directory \"$parentdir\" exists, but I could not create it.\n";
-                            push(@installer::globals::logfileinfo, $infoline);
-                        }
-                        else
-                        {
-                            # Now it is time to exit, even the parent could not be created.
-                            installer::exiter::exit_program("ERROR: Could not create parent directory \"$parentdir\"", "create_directory");
-                        }
-                    }
-                }
-
-                # At this point we have to assume, that the parent directory exist.
-                # Trying once more to create the desired directory
-
-                $returnvalue = mkdir($directory, 0775);
-
-                if ($returnvalue)
-                {
-                    $infoline = "\nAttention: Created directory \"$directory\" in the second try.\n";
-                    push(@installer::globals::logfileinfo, $infoline);
-
-                    my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1";
-                    system($localcall);
-                }
-                else
-                {
-                    if ( -d $directory )
-                    {
-                        $infoline = "\nAttention: Finally the directory \"$directory\" exists, but I could not create it.\n";
-                        push(@installer::globals::logfileinfo, $infoline);
-                    }
-                    else
-                    {
-                        # It is time to exit, even the second try failed.
-                        installer::exiter::exit_program("ERROR: Failed to create the directory: $directory", "create_directory");
-                    }
-                }
-            }
-            else
-            {
-                $infoline = "\nAnother process created this directory in exactly this moment :-) : $directory\n";
-                push(@installer::globals::logfileinfo, $infoline);
-            }
-        }
-    }
-    else
-    {
-        $infoline = "\nAlready existing directory, did not create: $directory\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
+    create_directory_with_privileges( $directory, "755" );
 }
 
 ######################################################
@@ -157,10 +56,10 @@ sub create_directory_with_privileges
 
     my $returnvalue = 1;
     my $infoline = "";
+    my $localprivileges = oct("0".$privileges); # changes "777" to 0777
 
     if (!(-d $directory))
     {
-        my $localprivileges = oct("0".$privileges); # changes "777" to 0777
         $returnvalue = mkdir($directory, $localprivileges);
 
         if ($returnvalue)
@@ -168,8 +67,7 @@ sub create_directory_with_privileges
             $infoline = "\nCreated directory: $directory\n";
             push(@installer::globals::logfileinfo, $infoline);
 
-            my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1";
-            system($localcall);
+            chmod $localprivileges, $directory;
         }
         else
         {
@@ -195,8 +93,7 @@ sub create_directory_with_privileges
                         $infoline = "\nAttention: Successfully created parent directory (should already be created before): $parentdir\n";
                         push(@installer::globals::logfileinfo, $infoline);
 
-                        my $localcall = "chmod $privileges $parentdir \>\/dev\/null 2\>\&1";
-                        system($localcall);
+                        chmod $localprivileges, $parentdir;
                     }
                     else
                     {
@@ -225,8 +122,7 @@ sub create_directory_with_privileges
                     $infoline = "\nAttention: Created directory \"$directory\" in the second try.\n";
                     push(@installer::globals::logfileinfo, $infoline);
 
-                    my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1";
-                    system($localcall);
+                    chmod $localprivileges, $directory;
                 }
                 else
                 {
@@ -254,8 +150,7 @@ sub create_directory_with_privileges
         $infoline = "\nAlready existing directory, did not create: $directory\n";
         push(@installer::globals::logfileinfo, $infoline);
 
-        my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1";
-        system($localcall);
+        chmod $localprivileges, $directory;
     }
 }
 
@@ -395,10 +290,10 @@ sub create_directories
 
         if ( $$languagesref ) { $locallanguagesref = $$languagesref; }
 
-        if ($newdirectory eq "install" )
+        if ($newdirectory eq "install" && $installer::globals::ooodownloadfilename ne "" )
         {
-            # put packages into versioned path (fdo#30837)
-            $path = $path . "$installer::globals::ooodownloadfilename";
+            # put packages into versioned path; needed only on linux (fdo#30837)
+            $path = $path . "$installer::globals::ooodownloadfilename" . $installer::globals::separator;
             create_directory($path);
         }
         else
@@ -412,12 +307,11 @@ sub create_directories
                 {
                     my $number_of_languages = get_number_of_langs($languagestring);
                     chomp(my $shorter = `echo $languagestring | md5sum | sed -e "s/ .*//g"`);
-                    # $languagestring = $shorter;
                     my $id = substr($shorter, 0, 8); # taking only the first 8 digits
                     $languagestring = "lang_" . $number_of_languages . "_id_" . $id;
                 }
 
-                $path = $path . $languagestring  . $installer::globals::separator;
+                $path = $path . $languagestring . $installer::globals::separator;
                 create_directory($path);
             }
         }
@@ -1205,8 +1099,6 @@ sub rename_directory
     else
     {
         installer::exiter::exit_program("ERROR: Could not move directory from $olddir to $newdir", "rename_directory");
-        # $infoline = "\nATTENTION: Could not move directory from $olddir to $newdir, \"rename_directory\"\n";
-        # push(@installer::globals::logfileinfo, $infoline);
     }
 
     return $newdir;
@@ -1443,12 +1335,7 @@ sub try_to_create_directory
             $infoline = "\nCreated directory: $directory\n";
             push(@installer::globals::logfileinfo, $infoline);
 
-            my $localcall = "chmod 0775 $directory \>\/dev\/null 2\>\&1";
-            system($localcall);
-
-            # chmod 0775 is not sufficient on mac to remove sticky tag
-            $localcall = "chmod a-s $directory \>\/dev\/null 2\>\&1";
-            system($localcall);
+            chmod 0775, $directory;
         }
         else
         {
diff --git a/solenv/bin/modules/installer/windows/admin.pm b/solenv/bin/modules/installer/windows/admin.pm
index 47a71b059b2a..6c79aaedea3c 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -54,13 +54,6 @@ sub unpack_cabinet_file
     # But this wrong expand.exe is typically in the PATH before this expand.exe, to unpack
     # cabinet files.
 
-#   if ( $^O =~ /cygwin/i )
-#   {
-#       $expandfile = $ENV{'SYSTEMROOT'} . "/system32/expand.exe"; # Has to be located in the systemdirectory
-#       $expandfile =~ s/\\/\//;
-#       if ( ! -f $expandfile ) { exit_program("ERROR: Did not find file $expandfile in the Windows system folder!"); }
-#   }
-
     if ( $^O =~ /cygwin/i )
     {
         $expandfile = qx(cygpath -u "$ENV{WINDIR}"/System32/expand.exe);
@@ -70,7 +63,6 @@ sub unpack_cabinet_file
     my $expandlogfile = $unpackdir . $installer::globals::separator . "expand.log";
 
     # exclude cabinet file
-    # my $systemcall = $cabarc . " -o X " . $mergemodulehash->{'cabinetfile'};
 
     my $systemcall = "";
     if ( $^O =~ /cygwin/i ) {
@@ -326,7 +318,6 @@ sub analyze_registry_file
             my $component = $6;
 
             my %helphash = ();
-            # $helphash{'Registry'} = $registry;
             $helphash{'Root'} = $root;
             $helphash{'Key'} = $key;
             $helphash{'Name'} = $name;
@@ -489,13 +480,7 @@ sub copy_files_into_directory_structure
             }
 
             if ( $destfile =~ /unopkg\.exe\s*$/ ) { $unopkgfile = $destfile; }
-
-            # installer::systemactions::copy_one_file($sourcefile, $destfile);
         }
-        # else  # allowing missing sequence numbers ?
-        # {
-        #   installer::exiter::exit_program("ERROR: No file assigned to sequence $i", "copy_files_into_directory_structure");
-        # }
     }
 
     return $unopkgfile;
@@ -805,8 +790,6 @@ sub remove_empty_dirs_in_folder
 
         # try to remove empty directory
         my $returnvalue = rmdir $dir;
-
-        # if ( $returnvalue ) { print "Successfully removed empty dir $dir\n"; }
     }
 }
 
diff --git a/solenv/bin/modules/installer/windows/assembly.pm b/solenv/bin/modules/installer/windows/assembly.pm
index bb5efe2207d5..349f92cecc42 100644
--- a/solenv/bin/modules/installer/windows/assembly.pm
+++ b/solenv/bin/modules/installer/windows/assembly.pm
@@ -81,7 +81,6 @@ sub get_msiassembly_filemanifest
     my $filemanifest = "";
 
     $filemanifest = $onefile->{'uniquename'};
-    # $filemanifest = $onefile->{'Name'};
 
     return $filemanifest;
 }
@@ -139,8 +138,6 @@ sub get_msiassembly_file
     }
 
     # It does not need to exist. For example products that do not contain the libraries.
-    # if (! $foundfile ) { installer::exiter::exit_program("ERROR: No unique file name found for $filename !", "get_selfreg_file"); }
-
     if (! $foundfile ) { $onefile  = ""; }
 
     return $onefile;
@@ -170,8 +167,6 @@ sub get_msiassembly_file_by_gid
     }
 
     # It does not need to exist. For example products that do not contain the libraries.
-    # if (! $foundfile ) { installer::exiter::exit_program("ERROR: No unique file name found for $filename !", "get_selfreg_file"); }
-
     if (! $foundfile ) { $onefile  = ""; }
 
     return $onefile;
@@ -344,7 +339,6 @@ sub add_assembly_condition_into_component_table
                 {
                     # setting the condition
 
-                    # $condition = "MsiNetAssemblySupport";
                     $condition = "DOTNET_SUFFICIENT=1";
                     $oneline = $component . "\t" . $componentid . "\t" . $directory . "\t" . $attributes . "\t" . $condition . "\t" . $keypath . "\n";
                     ${$componenttable}[$j] = $oneline;
@@ -368,4 +362,4 @@ sub add_assembly_condition_into_component_table
     }
 }
 
-1;
\ No newline at end of file
+1;
diff --git a/solenv/bin/modules/installer/windows/component.pm b/solenv/bin/modules/installer/windows/component.pm
index ad8510b21fdc..498a86c2d319 100644
--- a/solenv/bin/modules/installer/windows/component.pm
+++ b/solenv/bin/modules/installer/windows/component.pm
@@ -394,9 +394,6 @@ sub create_component_table
 
     installer::windows::idtglobal::write_idt_header(\@componenttable, "component");
 
-    # collect_layer_conditions();
-
-
     # File components
 
     for ( my $i = 0; $i <= $#{$allfilecomponentsref}; $i++ )
@@ -526,4 +523,4 @@ sub set_component_in_environment_table
     }
 }
 
-1;
\ No newline at end of file
+1;
diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm
index 22092f39aa53..0ef739b1792d 100644
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ b/solenv/bin/modules/installer/windows/directory.pm
@@ -235,7 +235,6 @@ sub create_defaultdir_directorynames
 
         $hostname =~ s/\Q$installer::globals::separator\E\s*$//;
         get_last_directory_name(\$hostname);
-        # installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$hostname); # making program/classes to classes
         my $uniquename = $onedir->{'uniquename'};
         my $shortstring;
         if (( $installer::globals::updatedatabase ) && ( exists($shortdirnamehashref->{$uniquename}) ))
@@ -310,15 +309,6 @@ sub add_root_directories
 {
     my ($directorytableref, $allvariableshashref) = @_;
 
-#   my $sourcediraddon = "";
-#   if (($installer::globals::addchildprojects) ||
-#       ($installer::globals::patch) ||
-#       ($installer::globals::languagepack) ||
-#       ($allvariableshashref->{'CHANGETARGETDIR'}))
-#   {
-#       $sourcediraddon = "\:\.";
-#   }
-
     my $oneline = "";
 
     if (( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $allvariableshashref->{'DONTUSESTARTMENUFOLDER'} ))
diff --git a/solenv/bin/modules/installer/windows/feature.pm b/solenv/bin/modules/installer/windows/feature.pm
index 39521baecdfe..194b133be61e 100644
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ b/solenv/bin/modules/installer/windows/feature.pm
@@ -399,7 +399,6 @@ sub create_feature_table
 
             $feature{'feature'} = get_feature_gid($onefeature);
             $feature{'feature_parent'} = get_feature_parent($onefeature);
-            # if ( $onefeature->{'ParentID'} eq "" ) { $feature{'feature_parent'} = ""; }   # Root has no parent
             $feature{'Title'} = $onefeature->{'Name'};
             $feature{'Description'} = $onefeature->{'Description'};
             $feature{'Display'} = get_feature_display($onefeature);
diff --git a/solenv/bin/modules/installer/windows/featurecomponent.pm b/solenv/bin/modules/installer/windows/featurecomponent.pm
index b47d363d4183..8e9ebee84703 100644
--- a/solenv/bin/modules/installer/windows/featurecomponent.pm
+++ b/solenv/bin/modules/installer/windows/featurecomponent.pm
@@ -132,71 +132,6 @@ sub create_featurecomponent_table_from_registry_collector
 }
 
 #################################################################################
-# Collecting all feature that are listed in the featurecomponent table.
-#################################################################################
-
-sub collect_all_feature
-{
-    my ($featurecomponenttable) = @_;
-
-    my @allfeature = ();
-
-    for ( my $i = 3; $i <= $#{$featurecomponenttable}; $i++ )   # beginning in line 4
-    {
-        my $oneline = ${$featurecomponenttable}[$i];
-
-        if ( $oneline =~ /^\s*(\S+)\s+(\S+)\s*$/ )
-        {
-            my $feature = $1;
-
-            if (! installer::existence::exists_in_array($feature, \@allfeature)) { push(@allfeature, $feature); }
-        }
-    }
-
-    return \@allfeature;
-}
-
-#################################################################################
-# On Win98 and Win Me there seems to be the problem, that maximum 817
-# components can be added to a feature. Even if Windows Installer 2.0
-# is used.
-#################################################################################
-
-sub check_number_of_components_at_feature
-{
-    my ($featurecomponenttable) = @_;
-
-    my $infoline = "\nChecking number of components at features. Maximum is 817 (for Win 98 and Win Me)\n";
-    push(@installer::globals::logfileinfo, $infoline);
-
-    my $allfeature = collect_all_feature($featurecomponenttable);
-
-    for ( my $i = 0; $i <= $#{$allfeature}; $i++ )
-    {
-        my $onefeature = ${$allfeature}[$i];
-        my $featurecomponents = 0;
-
-        for ( my $j = 0; $j <= $#{$featurecomponenttable}; $j++ )
-        {
-            if ( ${$featurecomponenttable}[$j] =~ /^\s*\Q$onefeature\E\s+(\S+)\s*$/ ) { $featurecomponents++; }
-        }
-
-        # if ( $featurecomponents > 816 )
-        # {
-        #     installer::exiter::exit_program("ERROR: More than 816 components ($featurecomponents) at feature $onefeature. This causes problems on Win 98 and Win Me!", "check_number_of_components_at_feature");
-        # }
-
-        # Logging the result
-
-        $infoline = "Number of components at feature $onefeature : $featurecomponents\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-
-    $infoline = "\n";
-    push(@installer::globals::logfileinfo, $infoline);
-}
-
-#################################################################################
 # Creating the file FeatureC.idt dynamically
 # Content:
 # Feature Component
@@ -228,10 +163,6 @@ sub create_featurecomponent_table
 
     # Additional components have to be added here
 
-    # Checking, whether there are more than 817 components at a feature
-
-    check_number_of_components_at_feature(\@featurecomponenttable);
-
     # Saving the file
 
     my $featurecomponenttablename = $basedir . $installer::globals::separator . "FeatureC.idt";
diff --git a/solenv/bin/modules/installer/windows/file.pm b/solenv/bin/modules/installer/windows/file.pm
index 10666be7460c..8396df3de157 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -773,7 +773,6 @@ sub create_files_table
 
     # The filenames must be collected because of uniqueness
     # 01-44-~1.DAT, 01-44-~2.DAT, ...
-    # my @shortnames = ();
     my %shortnames = ();
 
     if ( $installer::globals::updatedatabase ) { collect_shortnames_from_old_database($uniquefilenamehashref, \%shortnames); }
@@ -798,7 +797,6 @@ sub create_files_table
         $onefile->{'componentname'} = $file{'Component_'};
 
         # Collecting all components
-        # if (!(installer::existence::exists_in_array($file{'Component_'}, $allfilecomponentsref))) { push(@{$allfilecomponentsref}, $file{'Component_'}); }
 
         if ( ! exists($allfilecomponents{$file{'Component_'}}) ) { $allfilecomponents{$file{'Component_'}} = 1; }
 
@@ -880,7 +878,6 @@ sub create_files_table
         }
 
         # Collecting all language specific conditions
-        # if ( $onefile->{'haslanguagemodule'} )
         if ( $onefile->{'ismultilingual'} )
         {
             if ( $onefile->{'ComponentCondition'} ) { installer::exiter::exit_program("ERROR: Cannot set language condition. There is already another component condition for file $onefile->{'gid'}: \"$onefile->{'ComponentCondition'}\" !", "create_files_table"); }
diff --git a/solenv/bin/modules/installer/windows/font.pm b/solenv/bin/modules/installer/windows/font.pm
index 9dab78caf5f7..3e3afed5577b 100644
--- a/solenv/bin/modules/installer/windows/font.pm
+++ b/solenv/bin/modules/installer/windows/font.pm
@@ -58,7 +58,6 @@ sub create_font_table
             my %font = ();
 
             $font{'File_'} = $onefile->{'uniquename'};
-            # $font{'FontTitle'} = $onefile->{'FontName'};  # results in a warning during validation
             $font{'FontTitle'} = "";
 
             my $oneline = $font{'File_'} . "\t" . $font{'FontTitle'} . "\n";
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm
index 64dc2f34a12a..2ac925db144b 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -138,7 +138,6 @@ sub get_next_free_number_with_hash
 
     if (!($dontsave))
     {
-        # push(@{$shortnamesref}, $newname);    # adding the new shortname to the array of shortnames
         $shortnamesref->{$newname} = 1; # adding the new shortname to the array of shortnames, always uppercase
         $saved = 1;
     }
@@ -256,7 +255,6 @@ sub make_eight_three_conform_with_hash
     my $changed = 0;
     my $saved;
 
-    # if (( $inputstring =~ /^\s*(.*?)\.(.*?)\s*$/ ) && ( $pattern eq "file" )) # files with a dot
     if (( $inputstring =~ /^\s*(.*)\.(.*?)\s*$/ ) && ( $pattern eq "file" ))    # files with a dot
     {
         # extension has to be non-greedy, but name is. This is important to find the last dot in the filename
@@ -612,7 +610,6 @@ sub get_languagefilename
 {
     my ($idtfilename, $basedir) = @_;
 
-    # $idtfilename =~ s/\.idt/\.ulf/;
     $idtfilename =~ s/\.idt/\.mlf/;
 
     my $languagefilename = $basedir . $installer::globals::separator . $idtfilename;
@@ -741,7 +738,6 @@ sub translate_idtfile
             my $language_block = get_language_block_from_language_file($oldstring, $languagefile);
             my $newstring = get_language_string_from_language_block($language_block, $onelanguage, $oldstring);
 
-            # if (!( $newstring eq "" )) { ${$idtfile}[$i] =~ s/$oldstring/$newstring/; }
             ${$idtfile}[$i] =~ s/$oldstring/$newstring/;    # always substitute, even if $newstring eq "" (there are empty strings for control.idt)
         }
     }
@@ -905,18 +901,12 @@ sub get_rtf_licensetext
     for ( my $i = 0; $i <= $#{$licensefile}; $i++ )
     {
         my $oneline = ${$licensefile}[$i];
-        # if  ( $oneline =~ /^\s*$/ ) { $oneline = '\par'; }    # empty lines
 
         if ( $i == 0 ) { $oneline =~ s/^\W*//; }
 
         $oneline =~ s/\t/    /g;        # no tabs allowed, converting to four spaces
         $oneline =~ s/\n$//g;           # no newline at line end
 
-#       $oneline =~ s/ä/\\\'e4/g;           # converting "ä"
-#       $oneline =~ s/ö/\\\'f6/g;           # converting "ö"
-#       $oneline =~ s/ü/\\\'fc/g;           # converting "ü"
-#       $oneline =~ s/ß/\\\'df/g;           # converting "ß"
-
         # german replacements
 
         $oneline =~ s/\Ã\„/\\\'c4/g;        # converting "Ä"
@@ -1129,11 +1119,7 @@ sub add_language_checkboxes_to_database
         my $onelanguage = ${$languagesarrayref}[$i];
         my $windowslanguage = installer::windows::language::get_windows_language($onelanguage);
 
-        # my $is_english = 0;
-        # if ( $windowslanguage eq "1033" ) { $is_english = 1; }
-
         my $checkboxattribute = "3";
-        # if ( $is_english ) { $checkboxattribute = "1"; }  # english is not deselectable
 
         my $count = $i + 1;
         my $nextcount = $i + 2;
@@ -1150,7 +1136,6 @@ sub add_language_checkboxes_to_database
         my $yvalue = $offset + $i * $multiplier;
 
         my $property = "IS" . $windowslanguage;
-    #   if ( ! exists($installer::globals::languageproperties{$property}) ) { installer::exiter::exit_program("ERROR: Could not find property \"$property\" in the list of language properties!", "add_language_checkboxes_to_database"); }
 
         my $controlnext = "";
         if ( $last ) { $controlnext = "Next"; }
@@ -1596,7 +1581,6 @@ sub include_subdirname_into_directory_table
             {
                 my $newuniquename = "sub" . $subdir;
                 $newdir = $newuniquename;
-                # my $newparent = $parent;
                 my $newparent = "INSTALLLOCATION";
                 my $newname = $name . "\:" . $subdir;
                 my $newline =
@@ -2176,9 +2160,6 @@ sub set_positions_in_table
 
     if (( $template_exists ) && ( ! $template_replaced ))
     {
-        # Giving a precise error message, collecting all unresolved templates
-        # my $templatestring = "";
-
         for ( my $i = 0; $i <= $#{$sequencetable}; $i++ )
         {
             if ( ${$sequencetable}[$i] =~ /^\s*([\w\.]+)\t.*\t\s*(POSITIONTEMPLATE_.*?)\s*$/ )
@@ -2187,22 +2168,12 @@ sub set_positions_in_table
                 my $fulltemplate = $2;
                 my $template = $fulltemplate;
                 $template =~ s/POSITIONTEMPLATE_//;
-                # my $newstring = $customactionname . " (" . $template . ")";
-                # $templatestring = $templatestring . $newstring . ", ";
-                # Setting at the end!
                 $lastposition = $lastposition + 25;
                 ${$sequencetable}[$i] =~ s/$fulltemplate/$lastposition/;
                 $infoline = "WARNING: Setting position \"$lastposition\" for custom action \"$customactionname\". Could not find CustomAction \"$template\".\n";
                 push(@installer::globals::logfileinfo, $infoline);
             }
         }
-        # $templatestring =~ s/,\s*$//;
-
-        # $infoline = "Error: Saving table \"$tablename\"\n";
-        # push(@installer::globals::logfileinfo, $infoline);
-        # print $infoline;
-        # installer::files::save_file($tablename, $sequencetable);
-        # installer::exiter::exit_program("ERROR: Unresolved positions in CustomActions in scp2: $templatestring", "set_positions_in_table");
     }
 }
 
diff --git a/solenv/bin/modules/installer/windows/language.pm b/solenv/bin/modules/installer/windows/language.pm
index c0dca543eb56..a95bed94517c 100644
--- a/solenv/bin/modules/installer/windows/language.pm
+++ b/solenv/bin/modules/installer/windows/language.pm
@@ -60,7 +60,6 @@ sub get_windows_encoding
 
     if ( $installer::globals::msiencoding->{$language} ) { $windowsencoding = $installer::globals::msiencoding->{$language}; }
 
-    # if ( $windowsencoding eq "" ) { installer::exiter::exit_program("ERROR: Unknown language $language in function get_windows_encoding", "get_windows_encoding"); }
     if ( $windowsencoding eq "" ) { $windowsencoding = "0"; }   # setting value, if the language is not listed in the encodinglist
 
     if ( $windowsencoding eq "0" ) { $windowsencoding = "65001"; }  # languages with "0" have to be available in UTF-8 (65001)
@@ -71,4 +70,4 @@ sub get_windows_encoding
     return $windowsencoding;
 }
 
-1;
\ No newline at end of file
+1;
diff --git a/solenv/bin/modules/installer/windows/media.pm b/solenv/bin/modules/installer/windows/media.pm
index 35e90f6a3856..12da8a723c9d 100644
--- a/solenv/bin/modules/installer/windows/media.pm
+++ b/solenv/bin/modules/installer/windows/media.pm
@@ -351,7 +351,6 @@ sub create_media_table
         if ( $allvariables->{'CABFILENUMBER'} ) { $maxcabfilenumber = $allvariables->{'CABFILENUMBER'}; }
         my $allfiles = $#{$filesref} + 1;
         my $maxfilenumber = get_maximum_filenumber($allfiles, $maxcabfilenumber);
-        # my $maxfilenumber = 1000; # maximum 1000 files in each cabinet file
         my $cabfilenumber = 0;
         my $cabfull = 0;
         my $counter = 0;
@@ -385,7 +384,6 @@ sub create_media_table
                 $cabfilenumber++;
 
                 $media{'DiskId'} = get_media_diskid($cabfilenumber);
-                # $media{'LastSequence'} = get_media_lastsequence($onefile);
                 $media{'LastSequence'} = $i + 1;    # This should be correct, also for unsorted files collectors
                 $media{'DiskPrompt'} = get_media_diskprompt();
                 $media{'Cabinet'} = generate_cab_filename_for_some_cabs($allvariables, $cabfilenumber);
@@ -420,7 +418,6 @@ sub create_media_table
         my $maximumfile = $#{$filesref};
 
         $media{'DiskId'} = get_media_diskid($diskid);
-        # $media{'LastSequence'} = ${$filesref}[$maximumfile]->{'sequencenumber'};  # sequence number of the last file
         $media{'LastSequence'} = $maximumfile + 1; # This works also for unsorted file collector
         $media{'DiskPrompt'} = get_media_diskprompt();
         $media{'Cabinet'} = generate_cab_filename($allvariables);
diff --git a/solenv/bin/modules/installer/windows/mergemodule.pm b/solenv/bin/modules/installer/windows/mergemodule.pm
index 5f45f8ad59c8..295c30c42010 100755
--- a/solenv/bin/modules/installer/windows/mergemodule.pm
+++ b/solenv/bin/modules/installer/windows/mergemodule.pm
@@ -79,7 +79,6 @@ sub merge_mergemodules_into_msi_database
             %installer::globals::mergemodules = ();
 
             my $mergemoduledir = installer::systemactions::create_directories("mergefiles", $languagestringref);
-            # push(@installer::globals::removedirs, $mergemoduledir);
 
             my $mergemodule;
             foreach $mergemodule ( @{$mergemodules} )
@@ -144,7 +143,6 @@ sub merge_mergemodules_into_msi_database
                 }
                 else
                 {
-                    # $systemcall = $msidb . " -d " . $filename . " -f " . $workdir . " -e File Component MsiAssembly Directory";
                     $systemcall = $msidb . " -d " . $filename . " -f " . $workdir . " -e \*";
                 }
 
@@ -1111,23 +1109,6 @@ sub change_file_table
     {
         if ( ! -d $unpackdir ) { installer::systemactions::create_directory($unpackdir); }
 
-        # Unpack the cab file, so that in can be included into the last office cabinet file. Attention: cararc.exe from cabsdk required.
-        # cabarc.exe -o X <fullcabfilepath>
-
-        # my $cabarcfilename = "cabarc.exe";
-        # my $cabarcfile = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$cabarcfilename, $includepatharrayref, 1);
-
-        # if ( ! -f $$cabarcfile )
-        # {
-        #   $cabarcfilename = "CABARC.EXE";
-        #   $cabarcfile = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$cabarcfilename, $includepatharrayref, 1);
-        #   if ( ! -f $$cabarcfile )
-        #   {
-        #       installer::exiter::exit_program("ERROR: cabarc.exe not found !", "change_file_table");
-        #   }
-        # }
-        # my $cabarc = $$cabarcfile;
-
         # changing directory
         my $from = cwd();
         my $to = $mergemodulehash->{'workdir'};
@@ -1154,9 +1135,6 @@ sub change_file_table
 
         my $cabfilename = "MergeModule.CABinet";
 
-        # exclude cabinet file
-        # my $systemcall = $cabarc . " -o X " . $mergemodulehash->{'cabinetfile'};
-
         my $systemcall = "";
         if ( $^O =~ /cygwin/i ) {
             my $localunpackdir = qx(cygpath -m "$unpackdir");
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index b1d1bd01fd7e..159867f03fd2 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1471,7 +1471,6 @@ sub get_guid_list
 
     # "-c" for uppercase output
 
-    # my $systemcall = "$uuidgen -n$number -c |";
     my $systemcall = "$uuidgen -n$number |";
     open (UUIDGEN, "$systemcall" ) or die("uuidgen is missing.");
     my @uuidlist = <UUIDGEN>;
@@ -1514,7 +1513,6 @@ sub calculate_guid
     my $digest = $md5->hexdigest;
     $digest = uc($digest);
 
-    # my $id = pack("A32", $digest);
     my ($first, $second, $third, $fourth, $fifth) = unpack ('A8 A4 A4 A4 A12', $digest);
     $guid = "$first-$second-$third-$fourth-$fifth";
 
@@ -1588,8 +1586,6 @@ sub set_uuid_into_component_table
 
     my $infoline = "";
     my $counter = 0;
-    # my $componentfile = installer::files::read_file($installer::globals::componentfilename);
-    # my $componenthash = fill_component_hash($componentfile);
 
     for ( my $i = 3; $i <= $#{$componenttable}; $i++ )  # ignoring the first three lines
     {
@@ -1599,13 +1595,6 @@ sub set_uuid_into_component_table
 
         my $uuid = "";
 
-    #   if ( $componenthash->{$componentname} )
-    #   {
-    #       $uuid = $componenthash->{$componentname};
-    #   }
-    #   else
-    #   {
-
             if ( exists($installer::globals::calculated_component_guids{$componentname}))
             {
                 $uuid = $installer::globals::calculated_component_guids{$componentname};
@@ -1629,44 +1618,12 @@ sub set_uuid_into_component_table
                 if ( exists($installer::globals::allcalculated_guids{$uuid}) ) { installer::exiter::exit_program("ERROR: \"$uuid\" was already created before!", "set_uuid_into_component_table"); }
                 $installer::globals::allcalculated_guids{$uuid} = 1;
                 $installer::globals::calculated_component_guids{$componentname} = $uuid;
-
-                # Setting new uuid
-                # $componenthash->{$componentname} = $uuid;
-
-                # Setting flag
-                # $installer::globals::created_new_component_guid = 1;  # this is very important!
             }
-    #   }
 
         ${$componenttable}[$i] =~ s/COMPONENTGUID/$uuid/;
     }
 
     installer::files::save_file($componenttablename, $componenttable);
-
-#   if ( $installer::globals::created_new_component_guid )
-#   {
-#       # create new component file!
-#       $componentfile = create_new_component_file($componenthash);
-#       installer::worker::sort_array($componentfile);
-#
-#       # To avoid conflict the components file cannot be saved at the same place
-#       # All important data have to be saved in the directory: $installer::globals::infodirectory
-#       my $localcomponentfilename = $installer::globals::componentfilename;
-#       installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$localcomponentfilename);
-#       $localcomponentfilename = $installer::globals::infodirectory . $installer::globals::separator . $localcomponentfilename;
-#       installer::files::save_file($localcomponentfilename, $componentfile);
-#
-#       # installer::files::save_file($installer::globals::componentfilename, $componentfile);  # version using new file in solver
-#
-#       $infoline = "COMPONENTCODES: Created $counter new GUIDs for components ! \n";
-#       push( @installer::globals::logfileinfo, $infoline);
-#   }
-#   else
-#   {
-#       $infoline = "SUCCESS COMPONENTCODES: All component codes exist! \n";
-#       push( @installer::globals::logfileinfo, $infoline);
-#   }
-
 }
 
 #################################################################
@@ -1782,8 +1739,6 @@ sub execute_packaging
 
         installer::logger::print_message( "... makecab.exe ($callscounter/$allmakecabcalls) ... \n" );
 
-        # my $returnvalue = system($systemcall);
-
         for ( my $n = 1; $n <= $maxmakecabcalls; $n++ )
         {
             my @ddfoutput = ();
@@ -1811,7 +1766,6 @@ sub execute_packaging
                 }
 
                 push( @installer::globals::logfileinfo, $infoline);
-                # for ( my $j = 0; $j <= $#ddfoutput; $j++ ) { push( @installer::globals::logfileinfo, "$ddfoutput[$j]"); }
 
                 for ( my $m = 0; $m <= $#ddfoutput; $m++ )
                 {
@@ -1828,7 +1782,6 @@ sub execute_packaging
             }
             else
             {
-                # installer::logger::print_message( "Success (Try $n): \"$systemcall\"\n" );
                 $infoline = "Success (Try $n): $systemcall";
                 push( @installer::globals::logfileinfo, $infoline);
                 last;
@@ -1931,7 +1884,6 @@ sub set_global_code_variables
         $installer::globals::upgradecode = installer::windows::idtglobal::get_language_string_from_language_block($codeblock, $onelanguage, "");
     }
 
-    # if (( $installer::globals::productcode eq "" ) && ( ! $isopensource )) { installer::exiter::exit_program("ERROR: ProductCode for language $onelanguage not defined in $installer::globals::codefilename !", "set_global_code_variables"); }
     if ( $installer::globals::upgradecode eq "" ) { installer::exiter::exit_program("ERROR: UpgradeCode not defined in $installer::globals::codefilename !", "set_global_code_variables"); }
 
     $infoline = "Setting ProductCode to: $installer::globals::productcode \n";
@@ -2254,7 +2206,6 @@ sub read_saved_mappings
             installer::exiter::exit_program("ERROR: Duplicate entries in saved mappings!", "read_saved_mappings");
         }
     } else {
-        # push( @installer::globals::globallogfileinfo, "WARNING: Windows patch shall be prepared, but PREVIOUS_IDT_DIR is not set!\n" );
         installer::exiter::exit_program("ERROR: Windows patch shall be prepared, but environment variable PREVIOUS_IDT_DIR is not set!", "read_saved_mappings");
     }
 
diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm
index 0f79d6b3b261..c5740aab1b0e 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -229,7 +229,6 @@ sub execute_msimsp
         $locallogfilename =~ s/\//\\\\/g;
 
         $localmspfilename =~ s/\\/\\\\/g; # path already contains backslash
-        # $localmspfilename =~ s/\//\\\\/g;
 
         $localmsimsptemppath = qx{cygpath -w "$localmsimsptemppath"};
         $localmsimsptemppath =~ s/\\/\\\\/g;
@@ -1082,10 +1081,7 @@ sub convert_unicode_to_ascii
     my $savfilename = $filename . "_before.unicode";
     installer::systemactions::copy_one_file($filename, $savfilename);
 
-#   open( IN, "<:utf16", $filename ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "convert_unicode_to_ascii");
-#   open( IN, "<:para:crlf:uni", $filename ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "convert_unicode_to_ascii");
     open( IN, "<:encoding(UTF16-LE)", $filename ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "convert_unicode_to_ascii");
-#   open( IN, "<:encoding(UTF-8)", $filename ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "convert_unicode_to_ascii");
     while ( $line = <IN> ) {
         push @localfile, $line;
     }
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index 35866103d9fa..10e632ecd229 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -166,8 +166,7 @@ sub get_productname_for_property_table
 
     if ( $installer::globals::languagepack )
     {
-        # my $langstring = get_language_string();   # Example (English, Deutsch)
-        my $langstring = get_english_language_string(); # New: (English, German)
+        my $langstring = get_english_language_string(); # Example: (English, German)
         $productname = $name . " " . $version . " Language Pack" . " " . $langstring;
     }
 
diff --git a/solenv/bin/modules/installer/windows/shortcut.pm b/solenv/bin/modules/installer/windows/shortcut.pm
index 76039baf10c9..cb62a0a7fdd9 100644
--- a/solenv/bin/modules/installer/windows/shortcut.pm
+++ b/solenv/bin/modules/installer/windows/shortcut.pm
@@ -357,10 +357,9 @@ sub get_folderitem_directory
 {
     my ($shortcut) = @_;
 
-    # my $directory = "$installer::globals::programmenufolder";  # default
     my $directory = "$installer::globals::officemenufolder";     # default
 
-    # The value $installer::globals::programmenufolder is not correct for the
+    # The default is not correct for the
     # PREDEFINED folders, like PREDEFINED_AUTOSTART
 
     if ( $shortcut->{'FolderID'} eq "PREDEFINED_AUTOSTART" )
@@ -694,4 +693,4 @@ sub create_shortcut_table
 }
 
 
-1;
\ No newline at end of file
+1;
diff --git a/solenv/bin/modules/installer/windows/sign.pm b/solenv/bin/modules/installer/windows/sign.pm
index 70954bd9f5b1..0a99fe4cfa4c 100644
--- a/solenv/bin/modules/installer/windows/sign.pm
+++ b/solenv/bin/modules/installer/windows/sign.pm
@@ -243,9 +243,6 @@ sub execute_open_system_call
 
     if( $^O =~ /cygwin/i )
     {
-        # $comspec =~ s/\\/\\\\/g;
-        # $comspec = qx{cygpath -u "$comspec"};
-        # $comspec =~ s/\s*$//g;
         $comspec = "";
     }
 
@@ -548,7 +545,6 @@ sub cabinet_cosistency_check
         my $sourcecabfile = $finalinstalldir . $installer::globals::separator . $onefile;
         my $currentpath = cwd();
         my $destcabfile = $currentpath . $installer::globals::separator . $onefile;
-        # my $destcabfile = $onefile;
 
         if ( $^O =~ /cygwin/i )
         {
@@ -614,7 +610,6 @@ sub cabinet_cosistency_check
                 # Also making a binary diff?
 
                 my $difffile = "diff.exe";  # has to be in the path
-                # $systemcall = "$difffile $sourcecabfile $destcabfile";  # Test for differences
                 $systemcall = "$difffile $origfile $newfile";
                 $infoline = $systemcall . "\n";
                 $returnvalue = make_systemcall($systemcall, $systemcall);
@@ -1050,8 +1045,6 @@ sub already_certified
 
     if ( $returnvalue ) { $success = 0; }
 
-    # my $success = make_systemcall($systemcall, $systemcall);
-
      if ( $success )
      {
          $is_certified = 1;
diff --git a/solenv/bin/modules/installer/windows/update.pm b/solenv/bin/modules/installer/windows/update.pm
index efe6949b6fc4..8abde86e7286 100644
--- a/solenv/bin/modules/installer/windows/update.pm
+++ b/solenv/bin/modules/installer/windows/update.pm
@@ -334,7 +334,6 @@ sub readdatabase
     }
     else
     {
-        # installer::logger::print_message( "... no update process, no database found ...\n" );
         $infoline = "\nNo database found in $completelistname. This is no update process!\n\n";
     }
     push( @installer::globals::logfileinfo, $infoline);
@@ -597,4 +596,4 @@ sub create_database_hashes
 }
 
 
-1;
\ No newline at end of file
+1;
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index 56c4b8eb7af8..8cf25bf6d6b3 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -31,6 +31,7 @@ use Cwd;
 use File::Copy;
 use File::stat;
 use File::Temp qw(tmpnam);
+use File::Path;
 use installer::control;
 use installer::converter;
 use installer::existence;
@@ -107,8 +108,7 @@ sub copy_install_sets_to_ship
     if (( ! $installer::globals::iswindowsbuild ) && ( $installer::globals::addjavainstaller ))
     {
         # Setting Unix rights for Java starter ("setup")
-        my $localcall = "chmod 775 $localshipinstalldir/setup \>\/dev\/null 2\>\&1";
-        system($localcall);
+        chmod 0775, "$localshipinstalldir/setup";
     }
 
     # unpacking the tar.gz file for Solaris
@@ -184,17 +184,6 @@ sub make_checksum_file
     my $checksumfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$installer::globals::checksumfile, $includepatharrayref, 1);
     if ( $$checksumfileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $installer::globals::checksumfile !", "make_checksum_file"); }
 
-#   # very slow on Windows
-#   for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-#   {
-#       my $onefile = ${$filesref}[$i];
-#       my $systemcall = "$$checksumfileref $onefile->{'sourcepath'} |";
-#       open (CHECK, "$systemcall");
-#       my $localchecksum = <CHECK>;
-#       close (CHECK);
-#       push(@checksum, $localchecksum);
-#   }
-
     my $systemcall = "$$checksumfileref";
 
     for ( my $i = 0; $i <= $#{$filesref}; $i++ )
@@ -773,7 +762,6 @@ sub install_simple ($$$$$$)
 
         if ((!($dir =~ /\bPREDEFINED_/ )) || ( $dir =~ /\bPREDEFINED_PROGDIR\b/ ))
         {
-            # printf "mkdir $destdir$onedir->{'HostName'}\n";
             mkdir $destdir . $onedir->{'HostName'};
             push @lines, "%dir " . $onedir->{'HostName'} . "\n";
         }
@@ -793,12 +781,18 @@ sub install_simple ($$$$$$)
         $sourcepath =~ s/\$\$/\$/;
 
         push @lines, "$destination\n";
-        # printf "cp $sourcepath $destdir$destination\n";
+        if(-d  "$destdir$destination"){
+            rmtree("$destdir$destination");
+        }
+        if(-e "$destdir$destination") {
+            unlink "$destdir$destination";
+        }
+
         copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $sourcepath -> $destdir$destination $!";
         my $sourcestat = stat($sourcepath);
         utime ($sourcestat->atime, $sourcestat->mtime, "$destdir$destination");
         chmod (oct($unixrights), "$destdir$destination") || die "Can't change permissions: $!";
-         push @lines, "$destination\n";
+        push @lines, "$destination\n";
     }
 
     for ( my $i = 0; $i <= $#{$linksarray}; $i++ )
@@ -807,7 +801,9 @@ sub install_simple ($$$$$$)
         my $destination = $onelink->{'destination'};
         my $destinationfile = $onelink->{'destinationfile'};
 
-        # print "link $destinationfile -> $destdir$destination\n";
+        if(-e "$destdir$destination") {
+            unlink "$destdir$destination";
+        }
         symlink ("$destinationfile", "$destdir$destination") || die "Can't create symlink: $!";
         push @lines, "$destination\n";
     }
@@ -818,7 +814,6 @@ sub install_simple ($$$$$$)
         my $target = $onelink->{'Target'};
         my $destination = $onelink->{'destination'};
 
-        # print "Unix link $target -> $destdir$destination\n";
         `ln -sf '$target' '$destdir$destination'`;
         push @lines, "$destination\n";
     }
@@ -1491,7 +1486,6 @@ sub reorg_patchfile
 
         for ( my $j = 0; $j <= $#{$patchfiles}; $j++ )
         {
-            # "\tXXXXX\t" . $olddestination . "\n";
             if ( ${$patchfiles}[$j] =~ /^\s*(.*?)\s*\tXXXXX\t\Q$directory\E\s*$/ )
             {
                 $line = $1 . "\n";
@@ -1625,7 +1619,6 @@ sub prepare_windows_patchfiles
     my $patchfilename2 = "patchmsi.dll";
 
     if ( ! $allvariableshashref->{'WINDOWSPATCHLEVEL'} ) { installer::exiter::exit_program("ERROR: No Windows patch level defined in list file (WINDOWSPATCHLEVEL) !", "prepare_windows_patchfiles"); }
-    # my $windowspatchlevel = $allvariableshashref->{'WINDOWSPATCHLEVEL'};
     my $windowspatchlevel = $installer::globals::buildid;
 
     # the environment variable CWS_WORK_STAMP is set only in CWS
@@ -1701,9 +1694,6 @@ sub prepare_windows_patchfiles
         $infoline = "Size of patch file list: $filesize\n\n";
         push( @installer::globals::logfileinfo, $infoline);
         installer::logger::print_message( "... size of patch list file: $filesize Byte ... \n" );
-
-        # Win 98: Maximum size of ini file is 65 kB
-        # if ( $filesize > 64000 ) { installer::exiter::exit_program("ERROR: Maximum size of patch file list is 65 kB (Win98), now reached: $filesize Byte !", "prepare_windows_patchfiles"); }
     }
 
 }
@@ -1942,8 +1932,6 @@ sub copy_all_packages
                 {
                     my $destinationdir = $destdir . $installer::globals::separator . $packagename;
                     if ( ! -d $onepackage ) { installer::exiter::exit_program("ERROR: Could not find Solaris package $onepackage!", "copy_all_packages"); }
-                    # installer::systemactions::hardlink_complete_directory($onepackage, $destinationdir);
-                    # installer::systemactions::copy_complete_directory($onepackage, $destinationdir);
 
                     my $systemcall = "cp -p -R $onepackage $destinationdir";
                      make_systemcall($systemcall);
@@ -2108,8 +2096,6 @@ sub check_jds_language
 
     my $infoline = "";
 
-    # languagesarrayref and $allvariableshashref->{'JDSLANG'}
-
     if ( ! $allvariableshashref->{'JDSLANG'} ) { installer::exiter::exit_program("ERROR: For building JDS installation sets \"JDSLANG\" must be defined!", "check_jds_language"); }
     my $languagestring = $allvariableshashref->{'JDSLANG'};
 
@@ -2207,8 +2193,7 @@ sub put_scpactions_into_installset
 
         if ( $onescpaction->{'UnixRights'} )
         {
-            my $localcall = "chmod $onescpaction->{'UnixRights'} $destfile \>\/dev\/null 2\>\&1";
-            system($localcall);
+            chmod oct($onescpaction->{'UnixRights'}), $destfile;
         }
 
     }
@@ -2273,7 +2258,6 @@ sub get_platform_name
     }
     else
     {
-        # $platformname = $installer::globals::packageformat;
         $platformname = $installer::globals::compiler;
     }
 
@@ -2369,7 +2353,6 @@ sub collect_all_files_from_includepathes
 
         my @sourcefiles = ();
         my $pathstring = "";
-        # installer::systemactions::read_complete_directory($includepath, $pathstring, \@sourcefiles);
         installer::systemactions::read_full_directory($includepath, $pathstring, \@sourcefiles);
 
         if ( ! ( $#sourcefiles > -1 ))
@@ -2424,9 +2407,6 @@ sub find_file_by_id
         }
     }
 
-    # It does not need to exist. For example products that do not contain the libraries.
-    # if (! $foundfile ) { installer::exiter::exit_program("ERROR: No unique file name found for $filename !", "get_selfreg_file"); }
-
     if (! $foundfile ) { $onefile  = ""; }
 
     return $onefile;
@@ -2974,7 +2954,6 @@ sub resolving_hidden_flag
 
             if ( $copysuccess )
             {
-                # $onefile->{'Name'} = $newfilename;
                 $onefile->{'sourcepath'} = $destfile;
                 $destination = $onefile->{'destination'};
                 installer::pathanalyzer::get_path_from_fullqualifiedname(\$destination);
@@ -3132,7 +3111,6 @@ sub put_license_into_setup
 
     # find and read english license file
     my $licenselanguage = "en-US";                  # always english !
-    # my $licensefilename = "LICENSE_" . $licenselanguage;
     my $licensefilename = "license_" . $licenselanguage . ".txt";
     my $licenseincludepatharrayref = get_language_specific_include_pathes($includepatharrayref, $licenselanguage);
 
@@ -3184,7 +3162,6 @@ sub tar_package
     if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" . $getuidlibrary; }
 
     my $systemcall = "cd $installdir; $ldpreloadstring tar -cf - $packagename > $tarfilename";
-    # my $systemcall = "cd $installdir; $ldpreloadstring tar -cf - * > $tarfilename";
 
     my $returnvalue = system($systemcall);
 
@@ -3202,8 +3179,7 @@ sub tar_package
         push( @installer::globals::logfileinfo, $infoline);
     }
 
-    my $localcall = "chmod 775 $tarfilename \>\/dev\/null 2\>\&1";
-    $returnvalue = system($localcall);
+    chmod 0775, $tarfilename;
 
     my $fulltarfile = $installdir . $installer::globals::separator . $tarfilename;
     my $filesize = ( -s $fulltarfile );
@@ -3240,8 +3216,7 @@ sub untar_package
         push( @installer::globals::logfileinfo, $infoline);
     }
 
-    my $localcall = "chmod 775 $tarfilename \>\/dev\/null 2\>\&1";
-    $returnvalue = system($localcall);
+    chmod 0775, $tarfilename;
 }
 
 #########################################################
@@ -3252,32 +3227,12 @@ sub shuffle_array
 {
     my ( $arrayref ) = @_;
 
-    # my $counter = 0;
-    # my $infoline = "Old package order: \n";
-    # push( @installer::globals::logfileinfo, $infoline);
-    # foreach my $onepackage ( @{$arrayref} )
-    # {
-    #   $counter++;
-    #   $infoline = "$counter: $onepackage->{'module'}\n";
-    #   push( @installer::globals::logfileinfo, $infoline);
-    # }
-
     my $i = @$arrayref;
     while (--$i)
     {
         my $j = int rand ($i+1);
         @$arrayref[$i,$j] = @$arrayref[$j,$i];
     }
-
-    # $counter = 0;
-    # $infoline = "New package order: \n";
-    # push( @installer::globals::logfileinfo, $infoline);
-    # foreach my $onepackage ( @{$arrayref} )
-    # {
-    #   $counter++;
-    #   $infoline = "$counter: $onepackage->{'module'}\n";
-    #   push( @installer::globals::logfileinfo, $infoline);
-    # }
 }
 
 ################################################
@@ -3427,7 +3382,6 @@ sub collectpackagemaps
     # Create a tar gz file with all package maps
     my $tarfilename = $subdirname . ".tar";
     my $targzname = $tarfilename . ".gz";
-    # my $systemcall = "cd $pkgmapdir; tar -cf - $subdirname > $tarfilename";
     $systemcall = "cd $pkgmapdir; tar -cf - $subdirname | gzip > $targzname";
     make_systemcall($systemcall);
     installer::systemactions::remove_complete_directory($pkgmapsubdir, 1);
diff --git a/solenv/bin/modules/installer/xpdinstaller.pm b/solenv/bin/modules/installer/xpdinstaller.pm
index cb03c89364d1..5a26ab0c4d81 100644
--- a/solenv/bin/modules/installer/xpdinstaller.pm
+++ b/solenv/bin/modules/installer/xpdinstaller.pm
@@ -109,8 +109,6 @@ sub get_module
             $found = 1;
             last;
         }
-
-        # if ( ! $found ) { installer::exiter::exit_program("ERROR: Could not find module belonging to gid $modulegid!", "get_module (xpdinstaller)"); }
     }
 
     return $searchmodule;
@@ -581,7 +579,6 @@ sub get_size_value
 
     if (( $installer::globals::isrpmbuild ) && ( $isrpmfile ))
     {
-        # if ( ! $installer::globals::rpmquerycommand ) { installer::exiter::exit_program("ERROR: rpm not found for querying packages!", "get_size_value"); }
         if ( ! $installer::globals::rpmquerycommand ) { $installer::globals::rpmquerycommand = "rpm"; }
 
         my $systemcall = "$installer::globals::rpmquerycommand -qp --queryformat \"\[\%\{FILESIZES\}\\n\]\" $packagename 2\>\&1 |";
@@ -720,7 +717,6 @@ sub get_fullpkgname_value
             return $value;
         }
 
-        # if ( ! $installer::globals::rpmquerycommand ) { installer::exiter::exit_program("ERROR: rpm not found for querying packages!", "get_fullpkgname_value"); }
         if ( ! $installer::globals::rpmquerycommand ) { $installer::globals::rpmquerycommand = "rpm"; }
         my $systemcall = "$installer::globals::rpmquerycommand -qp $packagename |";
         my $ld_library_backup = $ENV{LD_LIBRARY_PATH};
@@ -1076,7 +1072,6 @@ sub set_productdir_tag
         if ( $allvariables->{"BRANDPACKAGEVERSION"} )
         {
             $productdir = $productdir . $allvariables->{"BRANDPACKAGEVERSION"};
-#           if ( $allvariables->{"LCPRODUCTEXTENSION"} ) { $productdir = $productdir . $allvariables->{"LCPRODUCTEXTENSION"}; }
         }
         else
         {
@@ -1487,7 +1482,6 @@ sub create_emptyparents_xpd_file
         push(@installer::globals::logfileinfo, $infoline);
     }
 
-    # push(@installer::globals::emptyxpdparents, $parentgid);
     push( @installer::globals::createdxpdfiles, $parentgid);
 
     return $grandpagid;
@@ -1558,7 +1552,6 @@ sub create_xpd_file
     my $xpddir = installer::systemactions::create_directories("xpdinstaller", $languagestringref);
     $xpddir =~ s/\/\s*$//;
     $installer::globals::xpddir = $xpddir;
-    # push(@installer::globals::removedirs, $xpddir);
 
     my $modulegid = $onepackage->{'module'};
 
@@ -1616,7 +1609,6 @@ sub create_xpd_file
         {
             my $create_missing_parent = is_empty_parent($parentgid, $allpackages);
 
-            # if (( $create_missing_parent ) && ( ! installer::existence::exists_in_array($parentgid, \@installer::globals::emptyxpdparents) ))
             if (( $create_missing_parent ) && ( ! installer::existence::exists_in_array($parentgid, \@installer::globals::createdxpdfiles) ))
             {
                 $grandpagid = create_emptyparents_xpd_file($parentgid, $modulesarrayref, $xpddir);
@@ -1627,7 +1619,6 @@ sub create_xpd_file
         {
             my $create_missing_parent = is_empty_parent($grandpagid, $allpackages);
 
-            # if (( $create_missing_parent ) && ( ! installer::existence::exists_in_array($parentgid, \@installer::globals::emptyxpdparents) ))
             if (( $create_missing_parent ) && ( ! installer::existence::exists_in_array($grandpagid, \@installer::globals::createdxpdfiles) ))
             {
                 create_emptyparents_xpd_file($grandpagid, $modulesarrayref, $xpddir);
@@ -1671,7 +1662,6 @@ sub create_xpd_file_for_childproject
 
     if ( $parentgid ne "root" )
     {
-        # my $create_missing_parent = is_empty_parent($parentgid, $allpackages);
         my $create_missing_parent = 1; # -> Always missing parent by child projects!
         # Parent is now created, if it was not created before. Attention: Parent module must not come later.
         if (( $create_missing_parent ) && ( ! installer::existence::exists_in_array($parentgid, \@installer::globals::createdxpdfiles) ))
@@ -1698,8 +1688,6 @@ sub create_xpd_file_for_systemintegration
     {
         my $newpackagename = ${$newcontent}[$i];
 
-        # installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$newpackagename);
-
         my $infoline = "Creating xpd file for package: $newpackagename\n";
         push( @installer::globals::logfileinfo, $infoline);
 
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index cb34331f741d..17533a893587 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -490,7 +490,6 @@ sub replace_minor_in_pathes
         my $line = ${$patharrayref}[$i];
 
         if ( ! defined $ENV{CWS_WORK_STAMP} and defined $ENV{UPDMINOR} )
-#       if ( $installer::globals::minor )
         {
             $line =~ s/\{minor\}/$installer::globals::minor/g;
             # no difference for minor and minornonpre (ToDo ?)
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index dfca65e2fc39..c20be417e047 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -14,18 +14,6 @@ use Cwd;
 $path = '';
 $do_link = 0;
 
-sub wanted {
-    my $path_to_unopkg="$path/program";
-    if ( $^O =~ /darwin/i )
-    {
-        $path_to_unopkg="$path/OpenOffice.org.app/Contents/MacOS";
-    }
-    -f $_
-	&& /.*\.oxt$/
-	&& system ( "LD_LIBRARY_PATH='' $path_to_unopkg/unopkg add -v --shared $File::Find::name" )
-	&& die "Cannot install $_ extension!";
-}
-
 ( $^O =~ /openbsd/i ) || ( $^O =~ /darwin/i ) || ( -f "/proc/meminfo" ) || die "The installer cannot work without javaldx running, which requires /proc to be mounted";
 
 # Workaround for system Mozilla
@@ -77,10 +65,8 @@ $ENV{DEFAULT_TO_ENGLISH_FOR_PACKING} = 1;
 
 $langs=$ENV{WITH_LANG};
 $langs='en-US' if $langs eq '';
-$langs =~ s/\s+/,/g;
-# FIXME: hack... we get a useless , at the end which makes it being e.g. zu#
-# which breaks the build...
-$langs =~ s/,'/'/;
+my @larr = grep { $_ ne '' } split(/ /, $langs);
+$langs = join (",", @larr);
 
 $destdir='';
 if ( defined $ENV{OODESTDIR} &&
diff --git a/solenv/bin/packimages.pl b/solenv/bin/packimages.pl
index 9466110124d2..741dfcc64efc 100755
--- a/solenv/bin/packimages.pl
+++ b/solenv/bin/packimages.pl
@@ -356,7 +356,7 @@ sub create_zip_archive
     foreach ( optimize_zip_layout($zip_hash_ref) ) {
         my $path = $zip_hash_ref->{$_} . "/$_";
         print_message("zipping '$path' ...") if $extra_verbose;
-        my $member = $zip->addFile($path, $_);
+        my $member = $zip->addFile($path, $_, COMPRESSION_STORED);
         if ( !$member ) {
             print_error("can't add file '$path' to image zip archive: $!", 5);
         }
diff --git a/solenv/config/sooo330.ini b/solenv/config/sooo330.ini
index 9ca5489a1278..ff23482aaf3c 100644
--- a/solenv/config/sooo330.ini
+++ b/solenv/config/sooo330.ini
@@ -41,7 +41,6 @@ common
 			PCLEAN_PATH xxx
 			RES_ENUS TRUE
 			RES_GER TRUE
-			rsc_once TRUE
 			SHIPDRIVE /so/install
 			STLPORT4 NO_STLPORT4
 			STLPORT_VER 400
diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn
index de332146a1f0..1f2b05db3f5f 100644
--- a/solenv/config/ssolar.cmn
+++ b/solenv/config/ssolar.cmn
@@ -22,7 +22,6 @@ common
         *copyprj
 		__mgrdir
 		product
-        rsc_once
         wrapper_override_cc_wrapper
         *zipdep
 		ALT_L10N_MODULE
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
index 80de44682287..15a80b02dcde 100644
--- a/solenv/inc/installationtest.mk
+++ b/solenv/inc/installationtest.mk
@@ -39,7 +39,7 @@ my_instsets = $(shell ls -dt \
 installationtest_instset = $(my_instsets:1)
 .ELSE
 installationtest_instset = \
-    $(SOLARSRC)/instsetoo_native/$(INPATH)/LibreOffice/archive/install
+    $(SOLARSRC)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/$(defaultlangiso)
 .END
 
 .IF "$(OS)" == "WNT"
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index e635e0c2354e..6e5dd9b70d2c 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=330
-RSCREVISION=330m13(Build:1)
+RSCREVISION=330m17(Build:1)
 BUILD=1
-LAST_MINOR=m12
+LAST_MINOR=m17
 SOURCEVERSION=OOO330
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 5bdffbab4b16..a276cf4573e5 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -386,10 +386,6 @@ COMPILER_WARN_ALL=TRUE
 COMPILER_WARN_ERRORS=TRUE
 .ENDIF
 
-.IF "$(RSC_ONCE)"!=""
-rsc_once*=$(RSC_ONCE)
-.ENDIF
-
 .IF "$(COMMON_BUILD)"!=""
 common_build*=$(COMMON_BUILD)
 .ENDIF
@@ -463,7 +459,7 @@ product=full
 .ENDIF
 
 .IF "$(debug)"!=""
-DBG_LEVEL*=2
+DBG_LEVEL*=1
 .ENDIF
 
 # Produkt auf einen Wert setzen (alles klein)
diff --git a/solenv/inc/tg_merge.mk b/solenv/inc/tg_merge.mk
index a40d48a81c66..19f44cb828af 100644
--- a/solenv/inc/tg_merge.mk
+++ b/solenv/inc/tg_merge.mk
@@ -31,36 +31,27 @@ MKFILENAME:=tg_merge.mk
 
 .IF "$(WITH_LANG)"!=""
 .IF "$(ULFFILES)"!=""
-$(foreach,i,$(ULFFILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF) 
-.ENDIF          # "$(ULFFILES)"!=""
+$(foreach,i,$(ULFFILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
+.ENDIF
 
 # *.xrb merge
 .IF "$(XMLPROPERTIES)"!=""
-$(foreach,i,$(XMLPROPERTIES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF) 
-.ENDIF          # "$(ULFFILES)"!=""
+$(foreach,i,$(XMLPROPERTIES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
+.ENDIF
 
 # *.xrm merge
 .IF "$(READMEFILES)"!=""
-$(foreach,i,$(READMEFILES) $(COMMONMISC)/$(TARGET)/$(i:b).xrm) : $$(@:f) $(LOCALIZESDF) 
-.ENDIF          # "$(ULFFILES)"!=""
+$(foreach,i,$(READMEFILES) $(COMMONMISC)/$(TARGET)/$(i:b).xrm) : $$(@:f) $(LOCALIZESDF)
+.ENDIF
 
-# *.xrm merge
-#.IF "$(APOCHELPFILES)"!=""
-#$(foreach,i,$(APOCHELPFILES) $(COMMONMISC)/$(MYPATH)/$(i:b).xrm) : $$(@:f) $(LOCALIZESDF) 
-#.ENDIF          # "$(ULFFILES)"!=""
 # *.xcu merge
 .IF "$(LOCALIZEDFILES)"!=""
 $(foreach,i,$(LOCALIZEDFILES) $(PROCESSOUT)/merge/{$(subst,.,/ $(PACKAGE))}/$(i:b).xcu) : $$(@:f) $(LOCALIZESDF) 
-.ENDIF          # "$(ULFFILES)"!=""
-.ENDIF			# "$(WITH_LANG)"!=""
+.ENDIF
+.ENDIF # "$(WITH_LANG)"!=""
 
 # dependencies from *.ulf to par-files
 .IF "$(ULFPARFILES)"!=""
 $(ULFPARFILES) : $(COMMONMISC)/$(TARGET)/$$(@:b).$(LANGFILEEXT)
 .ENDIF          # "$(ULFPARFILES)"!=""
 
-# *.xrm merge
-#.IF "$(READMEFILES)"!=""
-#$(uniq $(foreach,i,$(READMEFILES) $(COMMONMISC)/$(TARGET)/$(i:b).xrm)) : $$(@:f) $(LOCALIZESDF)
-#.ENDIF          # "$(ULFFILES)"!=""
-
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
new file mode 100644
index 000000000000..63475e71ac04
--- /dev/null
+++ b/solenv/inc/unxgcc.mk
@@ -0,0 +1,279 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# generic mk file for gcc on unix systems
+
+ASM*=
+AFLAGS*=
+SOLAR_JAVA*=
+# default optimization level for product code
+CDEFAULTOPT*=-O2
+# architecture dependent flags for the C and C++ compiler that can be changed by
+# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
+ARCH_FLAGS*=
+# position independent code switch
+PICSWITCH*:=-fpic
+JAVAFLAGSDEBUG=-g
+
+# filter for supressing verbose messages from linker
+#not needed at the moment
+#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
+
+# _PTHREADS is needed for the stl
+CDEFS+=-D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
+
+# enable visibility define in "sal/types.h"
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
+# this is a platform with JAVA support
+.IF "$(SOLAR_JAVA)"!=""
+JAVADEF=-DSOLAR_JAVA
+.IF "$(debug)"==""
+JAVA_RUNTIME=-ljava
+.ELSE
+JAVA_RUNTIME=-ljava_g
+.ENDIF
+.ENDIF
+
+# name of C++ Compiler
+CXX*=g++
+# name of C Compiler
+CC*=gcc
+.IF "$(SYSBASE)"!=""
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CXX+:=$(CFLAGS_SYSBASE)
+CC+:=$(CFLAGS_SYSBASE)
+.ENDIF          # "$(SYSBASE)"!=""
+CFLAGS+=-fmessage-length=0 -c
+
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+CFLAGSENABLESYMBOLS=-g1
+.ELSE
+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
+
+.ENDIF
+
+# flags for the C++ Compiler
+CFLAGSCC= -pipe $(ARCH_FLAGS)
+# Flags for enabling exception handling
+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+# Flags for disabling exception handling
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+
+# -fpermissive should be removed as soon as possible
+CFLAGSCXX= -pipe $(ARCH_FLAGS)
+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" && "$(HAVE_GCC_VISIBILITY_BROKEN)" != "TRUE"
+CFLAGSCXX += -fvisibility-inlines-hidden
+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+
+CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
+CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch
+CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
+
+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
+CFLAGSOBJGUIMT=
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
+CFLAGSSLOGUIMT=$(PICSWITCH)
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
+CFLAGSSLOCUIMT=$(PICSWITCH)
+# Compiler flags for profiling
+CFLAGSPROF=
+# Compiler flags for debugging
+CFLAGSDEBUG=-g
+CFLAGSDBGUTIL=
+# Compiler flags for enabling optimizations
+.IF "$(PRODUCT)"!=""
+CFLAGSOPT=$(CDEFAULTOPT) # optimizing for products
+
+GCCNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
+GCCNUMVER:=$(shell @-$(CXX) $(GCCNUMVERSION_CMD))
+
+.IF "$(USE_SYSTEM_STL)"!="YES" || "$(GCCNUMVER)" <= "000400050000"
+#STLPort headers are full of aliasing warnings and
+#At least SLED 10.2 gcc 4.3 overly agressively optimizes
+#uno::Sequence into junk, so only strict-alias on compiler
+#later than 4.5.1
+CFLAGSOPT+=-fno-strict-aliasing
+.ENDIF
+.ELSE 	# "$(PRODUCT)"!=""
+CFLAGSOPT=   							# no optimizing for non products
+.ENDIF	# "$(PRODUCT)"!=""
+# Compiler flags for disabling optimizations
+CFLAGSNOOPT=-O0
+# Compiler flags for describing the output path
+CFLAGSOUTOBJ=-o
+
+# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
+CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
+CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
+    -Wno-non-virtual-dtor
+CFLAGSWALLCC=$(CFLAGSWARNCC)
+CFLAGSWALLCXX=$(CFLAGSWARNCXX)
+CFLAGSWERRCC=-Werror
+
+# Once all modules on this platform compile without warnings, set
+# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
+# settings.mk):
+MODULES_WITH_WARNINGS := \
+    lotuswordpro \
+    soldep
+
+# switches for dynamic and static linking
+STATIC		= -Wl,-Bstatic
+DYNAMIC		= -Wl,-Bdynamic
+
+# name of linker
+LINK*=$(CXX)
+LINKC*=$(CC)
+
+# default linker flags
+LINKFLAGSDEFS*=-Wl,-z,defs
+LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
+    #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
+LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
+LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
+LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
+LINKFLAGSRUNPATH_OXT=
+LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\'
+LINKFLAGSRUNPATH_NONE=
+# flag -Wl,-z,noexecstack sets the NX bit on the stack
+LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS)
+.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)"  == "TRUE"
+LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
+.ENDIF
+
+# linker flags for linking applications
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
+    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
+    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
+
+# linker flags for linking shared libraries
+LINKFLAGSSHLGUI= -shared
+LINKFLAGSSHLCUI= -shared
+
+LINKFLAGSTACK=
+LINKFLAGSPROF=
+LINKFLAGSDEBUG=-g
+LINKFLAGSOPT=
+
+# linker flags for optimization (symbol hashtable)
+# for now, applied to symbol scoped libraries, only
+LINKFLAGSOPTIMIZE*=-Wl,-O1
+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
+
+SONAME_SWITCH=-Wl,-h
+
+# Sequence of libs does matter !
+
+STDLIBCPP=-lstdc++
+
+# default objectfilenames to link
+STDOBJVCL=$(L)$/salmain.o
+STDOBJGUI=
+STDSLOGUI=
+STDOBJCUI=
+STDSLOCUI=
+
+.IF "$(ALLOC)" == "TCMALLOC"
+STDLIBGUIMT+=-ltcmalloc
+STDLIBCUIMT+=-ltcmalloc
+STDSHLGUIMT+=-ltcmalloc
+STDSHLCUIMT+=-ltcmalloc
+.ENDIF
+
+.IF "$(ALLOC)" == "JEMALLOC"
+STDLIBGUIMT+=-ljemalloc
+STDLIBCUIMT+=-ljemalloc
+STDSHLGUIMT+=-ljemalloc
+STDSHLCUIMT+=-ljemalloc
+.ENDIF
+
+.IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
+LINKFLAGS += -Wl,--hash-style=both
+.ELSE
+LINKFLAGS += -Wl,-zdynsort
+.ENDIF
+
+# libraries for linking applications
+STDLIBGUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
+STDLIBCUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
+# libraries for linking shared libraries
+STDSHLGUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
+STDSHLCUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
+
+X11LINK_DYNAMIC = -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed
+
+LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
+
+.IF "$(USE_STLP_DEBUG)" != ""
+.IF "$(STLPORT_VER)" >= "500"
+LIBSTLPORT=$(DYNAMIC) -lstlportstlg
+LIBSTLPORTST=$(STATIC) -lstlportstlg $(DYNAMIC)
+.ELSE
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
+LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
+.ENDIF
+.ELSE # "$(USE_STLP_DEBUG)" != ""
+.IF "$(STLPORT_VER)" >= "500"
+LIBSTLPORT=$(DYNAMIC) -lstlport
+LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
+.ELSE
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+.ENDIF
+.ENDIF # "$(USE_STLP_DEBUG)" != ""
+
+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
+
+# name of library manager
+LIBMGR*=ar
+LIBFLAGS=-r
+
+# tool for generating import libraries
+IMPLIB=
+IMPLIBFLAGS=
+
+MAPSYM=
+MAPSYMFLAGS=
+
+RC=irc
+RCFLAGS=-fo$@ $(RCFILES)
+RCLINK=
+RCLINKFLAGS=
+RCSETVERSION=
+
+# platform specific identifier for shared libs
+DLLPRE=lib
+DLLPOST=.so
+PCHPOST=.gch
diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk
index 1b7ee75d295c..62746cee4f15 100644
--- a/solenv/inc/unxlng.mk
+++ b/solenv/inc/unxlng.mk
@@ -25,254 +25,8 @@
 #
 #*************************************************************************
 
-# generic mk file for unxlng (unix linux glibc)
-ASM*=
-AFLAGS*=
-SOLAR_JAVA*=
-# default optimization level for product code
-CDEFAULTOPT*=-O2
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-# position independent code switch
-PICSWITCH*:=-fpic
-JAVAFLAGSDEBUG=-g
+CDEFS+=-DGLIBC=2
+PTHREAD_LIBS=-lpthread
+DL_LIB=-ldl
 
-# filter for supressing verbose messages from linker
-#not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
-
-# _PTHREADS is needed for the stl
-CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
-
-# enable visibility define in "sal/types.h"
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-# this is a platform with JAVA support
-.IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-.ENDIF
-
-# name of C++ Compiler
-CXX*=g++
-# name of C Compiler
-CC*=gcc
-.IF "$(SYSBASE)"!=""
-CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
-CXX+:=$(CFLAGS_SYSBASE)
-CC+:=$(CFLAGS_SYSBASE)
-.ENDIF          # "$(SYSBASE)"!=""
-CFLAGS+=-fmessage-length=0 -c
-
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
-CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-
-.ENDIF
-
-# flags for the C++ Compiler
-CFLAGSCC= -pipe $(ARCH_FLAGS)
-# Flags for enabling exception handling
-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-# Flags for disabling exception handling
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-
-# -fpermissive should be removed as soon as possible
-CFLAGSCXX= -pipe $(ARCH_FLAGS)
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CFLAGSCXX += -fvisibility-inlines-hidden
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
-CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch
-CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
-
-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-CFLAGSOBJGUIMT=
-# Compiler flags for compiling static object in multi threaded environment with character user interface
-CFLAGSOBJCUIMT=
-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-CFLAGSSLOGUIMT=$(PICSWITCH)
-# Compiler flags for compiling shared object in multi threaded environment with character user interface
-CFLAGSSLOCUIMT=$(PICSWITCH)
-# Compiler flags for profiling
-CFLAGSPROF=
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-# Compiler flags for enabling optimizations
-.IF "$(PRODUCT)"!=""
-CFLAGSOPT=$(CDEFAULTOPT) # optimizing for products
-
-GCCNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
-GCCNUMVER:=$(shell @-$(CXX) $(GCCNUMVERSION_CMD))
-
-.IF "$(USE_SYSTEM_STL)"!="YES" || "$(GCCNUMVER)" <= "000400050000"
-#STLPort headers are full of aliasing warnings and
-#At least SLED 10.2 gcc 4.3 overly agressively optimizes
-#uno::Sequence into junk, so only strict-alias on compiler
-#later than 4.5.1
-CFLAGSOPT+=-fno-strict-aliasing
-.ENDIF
-.ELSE 	# "$(PRODUCT)"!=""
-CFLAGSOPT=   							# no optimizing for non products
-.ENDIF	# "$(PRODUCT)"!=""
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
-    -Wno-non-virtual-dtor
-CFLAGSWALLCC=$(CFLAGSWARNCC)
-CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-Werror
-
-# Once all modules on this platform compile without warnings, set
-# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
-# settings.mk):
-MODULES_WITH_WARNINGS := \
-    lotuswordpro \
-    soldep
-
-# switches for dynamic and static linking
-STATIC		= -Wl,-Bstatic
-DYNAMIC		= -Wl,-Bdynamic
-
-# name of linker
-LINK*=$(CXX)
-LINKC*=$(CC)
-
-# default linker flags
-LINKFLAGSDEFS*=-Wl,-z,defs
-LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
-LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
-    #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
-LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
-LINKFLAGSRUNPATH_OXT=
-LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\'
-LINKFLAGSRUNPATH_NONE=
-# flag -Wl,-z,noexecstack sets the NX bit on the stack
-LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS)
-.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)"  == "TRUE"
-LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
-.ENDIF
-
-# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
-    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
-    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
-
-# linker flags for linking shared libraries
-LINKFLAGSSHLGUI= -shared
-LINKFLAGSSHLCUI= -shared
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=-g
-LINKFLAGSOPT=
-
-# linker flags for optimization (symbol hashtable)
-# for now, applied to symbol scoped libraries, only
-LINKFLAGSOPTIMIZE*=-Wl,-O1
-LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-
-SONAME_SWITCH=-Wl,-h
-
-# Sequence of libs does matter !
-
-STDLIBCPP=-lstdc++
-
-# default objectfilenames to link
-STDOBJVCL=$(L)$/salmain.o
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-
-.IF "$(ALLOC)" == "TCMALLOC"
-STDLIBGUIMT+=-ltcmalloc
-STDLIBCUIMT+=-ltcmalloc
-STDSHLGUIMT+=-ltcmalloc
-STDSHLCUIMT+=-ltcmalloc
-.ENDIF
-
-.IF "$(ALLOC)" == "JEMALLOC"
-STDLIBGUIMT+=-ljemalloc
-STDLIBCUIMT+=-ljemalloc
-STDSHLGUIMT+=-ljemalloc
-STDSHLCUIMT+=-ljemalloc
-.ENDIF
-
-.IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
-LINKFLAGS += -Wl,--hash-style=both
-.ELSE
-LINKFLAGS += -Wl,-zdynsort
-.ENDIF
-
-# libraries for linking applications
-STDLIBGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
-STDLIBCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
-# libraries for linking shared libraries
-STDSHLGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
-STDSHLCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
-
-X11LINK_DYNAMIC = -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed
-
-LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-
-.IF "$(USE_STLP_DEBUG)" != ""
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlportstlg
-LIBSTLPORTST=$(STATIC) -lstlportstlg $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
-LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
-.ENDIF
-.ELSE # "$(USE_STLP_DEBUG)" != ""
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlport
-LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-.ENDIF
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-
-#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-
-# name of library manager
-LIBMGR*=ar
-LIBFLAGS=-r
-
-# tool for generating import libraries
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=irc
-RCFLAGS=-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-# platform specific identifier for shared libs
-DLLPRE=lib
-DLLPOST=.so
-PCHPOST=.gch
+.INCLUDE : unxgcc.mk
diff --git a/solenv/inc/unxobsd.mk b/solenv/inc/unxobsd.mk
index 548be65a23a2..d700614d757a 100644
--- a/solenv/inc/unxobsd.mk
+++ b/solenv/inc/unxobsd.mk
@@ -26,17 +26,6 @@
 #*************************************************************************
 
 # Makefile for OpenBSD
-ASM*=
-AFLAGS*=
-SOLAR_JAVA*=
-# default optimization level for product code
-CDEFAULTOPT*=-O2
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-# position independent code switch
-PICSWITCH*:=-fpic
-JAVAFLAGSDEBUG=-g
 
 # arch specific defines
 .IF "$(CPUNAME)" == "INTEL"
@@ -48,224 +37,13 @@ ARCH_FLAGS*=
 BUILD64=1
 .ENDIF
 
-# filter for supressing verbose messages from linker
-#not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
-
-# _PTHREADS is needed for the stl
-CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
-
-# enable visibility define in "sal/types.h"
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-# this is a platform with JAVA support
-.IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-.ENDIF
-
-# name of C++ Compiler
-CXX*=g++
-# name of C Compiler
-CC*=gcc
-.IF "$(SYSBASE)"!=""
-CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
-CXX+:=$(CFLAGS_SYSBASE)
-CC+:=$(CFLAGS_SYSBASE)
-.ENDIF          # "$(SYSBASE)"!=""
-CFLAGS+=-fmessage-length=0 -c
-
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
-CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-
-.ENDIF
-
-# flags for the C++ Compiler
-CFLAGSCC= -pipe $(ARCH_FLAGS)
-# Flags for enabling exception handling
-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-# Flags for disabling exception handling
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions -DBOOST_NO_EXCEPTIONS
-
-# -fpermissive should be removed as soon as possible
-CFLAGSCXX= -pipe $(ARCH_FLAGS)
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CFLAGSCXX += -fvisibility-inlines-hidden
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-
-CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
-CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch
-CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
-
-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-CFLAGSOBJGUIMT=
-# Compiler flags for compiling static object in multi threaded environment with character user interface
-CFLAGSOBJCUIMT=
-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-CFLAGSSLOGUIMT=$(PICSWITCH)
-# Compiler flags for compiling shared object in multi threaded environment with character user interface
-CFLAGSSLOCUIMT=$(PICSWITCH)
-# Compiler flags for profiling
-CFLAGSPROF=
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-# Compiler flags for enabling optimizations
-.IF "$(PRODUCT)"!=""
-CFLAGSOPT=$(CDEFAULTOPT) # optimizing for products
-.IF "$(USE_SYSTEM_STL)"!="YES" || "$(CCNUMVER)" <= "000400050000"
-#STLPort headers are full of aliasing warnings and
-#At least SLED 10.2 gcc 4.3 overly agressively optimizes
-#uno::Sequence into junk, so only strict-alias on compiler
-#later than 4.5.1
-CFLAGSOPT+=-fno-strict-aliasing
-.ENDIF
-.ELSE 	# "$(PRODUCT)"!=""
-CFLAGSOPT=   							# no optimizing for non products
-.ENDIF	# "$(PRODUCT)"!=""
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
-    -Wno-non-virtual-dtor
-CFLAGSWALLCC=$(CFLAGSWARNCC)
-CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-Werror
-
-# Once all modules on this platform compile without warnings, set
-# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
-# settings.mk):
-MODULES_WITH_WARNINGS := \
-    lotuswordpro \
-    soldep
-
-# switches for dynamic and static linking
-STATIC		= -Wl,-Bstatic
-DYNAMIC		= -Wl,-Bdynamic
+.INCLUDE : unxgcc.mk
 
-# name of linker
-LINK*=$(CXX)
-LINKC*=$(CC)
+# disable exceptions in boost
+CFLAGS_NO_EXCEPTIONS+=-DBOOST_NO_EXCEPTIONS
 
 # default linker flags
-LINKFLAGSDEFS*=#-Wl,-z,defs
-LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
-LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
-    #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
-LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
-LINKFLAGSRUNPATH_OXT=
-LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\'
-LINKFLAGSRUNPATH_NONE=
-# flag -Wl,-z,noexecstack sets the NX bit on the stack
-LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS)
-.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)"  == "TRUE"
-LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
-.ENDIF
-
-# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
-    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
-    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
-
-# linker flags for linking shared libraries
-LINKFLAGSSHLGUI= -shared
-LINKFLAGSSHLCUI= -shared
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=-g
-LINKFLAGSOPT=
-
-# linker flags for optimization (symbol hashtable)
-# for now, applied to symbol scoped libraries, only
-LINKFLAGSOPTIMIZE*=-Wl,-O1
-LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-
-SONAME_SWITCH=-Wl,-h
-
-# Sequence of libs does matter !
-
-STDLIBCPP=-lstdc++
-
-# default objectfilenames to link
-STDOBJVCL=$(L)$/salmain.o
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-
-.IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
-LINKFLAGS += -Wl,--hash-style=both
-.ELSE
-LINKFLAGS += -Wl,-zdynsort
-.ENDIF
-
-# libraries for linking applications
-STDLIBGUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
-STDLIBCUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
-# libraries for linking shared libraries
-STDSHLGUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
-STDSHLCUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
-
-X11LINK_DYNAMIC = -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed
-
-LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-
-.IF "$(USE_STLP_DEBUG)" != ""
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlportstlg
-LIBSTLPORTST=$(STATIC) -lstlportstlg $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
-LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
-.ENDIF
-.ELSE # "$(USE_STLP_DEBUG)" != ""
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlport
-LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-.ENDIF
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-
-#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-
-# name of library manager
-LIBMGR*=ar
-LIBFLAGS=-r
-
-# tool for generating import libraries
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=irc
-RCFLAGS=-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
+LINKFLAGSDEFS:=
 
 # platform specific identifier for shared libs
-DLLPRE=lib
-DLLPOST=.so
 DLLPOSTFIX=ob
-PCHPOST=.gch
diff --git a/solenv/inc/wntmsci10.mk b/solenv/inc/wntmsci10.mk
index 5c959f7d0e3c..fbdc0a471b95 100644
--- a/solenv/inc/wntmsci10.mk
+++ b/solenv/inc/wntmsci10.mk
@@ -78,12 +78,6 @@ CDEFS+= -D_X86_=1
 CFLAGS+= -Gy
 .ENDIF # "$(product)" != ""
 
-.IF "$(bndchk)" == ""
-.IF "$(VC_STANDARD)"==""
-CFLAGS+= -Ob1
-.ENDIF	# "$(VC_STANDARD)"==""
-.ENDIF
-
 # flags to enable build with symbols; required for crashdump feature
 #CFLAGSENABLESYMBOLS=-Zi -Fd$(MISC)/_ooo_st_$(TARGET).PDB
 # full debug for RE builds only due to size concerns
diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk
index 972feb0a8fdc..b9faf3a8dbcd 100644..100755
--- a/solenv/inc/wntmsci11.mk
+++ b/solenv/inc/wntmsci11.mk
@@ -88,18 +88,16 @@ CFLAGS+=-GS
 
 CFLAGS+=-c -nologo -Gs $(NOLOGO)
 
+.IF "$(cl_x64)" == ""
 CDEFS+= -D_X86_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS
+.ELSE
+CDEFS+= -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS
+.ENDIF
 
 .IF "$(product)" != ""
 CFLAGS+= -Gy
 .ENDIF # "$(product)" != ""
 
-.IF "$(bndchk)" == ""
-.IF "$(VC_STANDARD)"==""
-CFLAGS+= -Ob1
-.ENDIF	# "$(VC_STANDARD)"==""
-.ENDIF
-
 # flags to enable build with symbols; required for crashdump feature
 #CFLAGSENABLESYMBOLS=-Zi -Fd$(MISC)/_ooo_st_$(TARGET).PDB
 CFLAGSENABLESYMBOLS=-Z7 -Yd
@@ -230,7 +228,11 @@ _VC_MANIFEST_BASENAME=__VC80
 _VC_MANIFEST_BASENAME=__VC90
 .ENDIF
 
+.IF "$(cl_x64)" == ""
 LINK=link /MACHINE:IX86
+.ELSE
+LINK=link /MACHINE:X64
+.ENDIF
     # do *not* add $(NOLOGO) to LINK or LINKFLAGS. Strangely, the wntmsci12 linker links fine then, but exits with
     # a return value 1, which makes dmake think it failed
 LINKOUTPUTFILTER= $(PIPEERROR) $(GREP) -v "LNK4197:"
@@ -240,7 +242,9 @@ LINKFLAGS=/MAP /OPT:NOREF
 .ENDIF
 
 # excetion handling protection
+.IF "$(cl_x64)" == ""
 LINKFLAGS+=-safeseh
+.ENDIF
 
 # enable DEP
 LINKFLAGS+=-nxcompat
@@ -338,7 +342,11 @@ LIBMGR=lib $(NOLOGO)
 IMPLIB=lib
 LIBFLAGS=
 
+.IF "$(cl_x64)" == ""
 IMPLIBFLAGS=-machine:IX86
+.ELSE
+IMPLIBFLAGS=-machine:X64
+.ENDIF
 
 MAPSYM=
 MAPSYMFLAGS=
diff --git a/sot/inc/sot/exchange.hxx b/sot/inc/sot/exchange.hxx
index 9e0e39f96306..48dd74e57fde 100644
--- a/sot/inc/sot/exchange.hxx
+++ b/sot/inc/sot/exchange.hxx
@@ -29,12 +29,8 @@
 #ifndef _SOT_EXCHANGE_HXX
 #define _SOT_EXCHANGE_HXX
 
-#ifndef __SGI_STL_LIST
 #include <list>
-#endif
-#ifndef __SGI_STL_VECTOR
 #include <vector>
-#endif
 #include <tools/string.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/datatransfer/DataFlavor.hpp>
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index a34ed2c83537..065d54aa9d6c 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.cxx
@@ -210,7 +210,7 @@ namespace
             /*136 SOT_FORMATSTR_ID_STARCALC_8_TEMPLATE*/            { MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII, "Calc 8 Template", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             /*137 SOT_FORMATSTR_ID_STARCHART_8_TEMPLATE*/           { MIMETYPE_OASIS_OPENDOCUMENT_CHART_TEMPLATE_ASCII, "Chart 8 Template", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             /*138 SOT_FORMATSTR_ID_STARMATH_8_TEMPLATE*/            { MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII, "Math 8 Template", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /*139 SOT_FORMATSTR_ID_STARBASE_8*/            { MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII, "StarBase 8", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /*139 SOT_FORMATSTR_ID_STARBASE_8*/             { MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII, "StarBase 8", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             /*140 SOT_FORMAT_GDIMETAFILE*/                  { "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"", "High Contrast GDIMetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             };
         return &aInstance[0];
diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
index df373898e219..e6b318da7148 100644
--- a/sot/source/sdstor/stgelem.cxx
+++ b/sot/source/sdstor/stgelem.cxx
@@ -269,11 +269,11 @@ static String ToUpperUnicode( const String & rStr )
     // I don't know the locale, so en_US is hopefully fine
     /*
     com.sun.star.lang.Locale aLocale;
-    aLocale.Language = OUString::createFromAscii( "en" );
-    aLocale.Country  = OUString::createFromAscii( "US" );
+    aLocale.Language = OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
+    aLocale.Country  = OUString(RTL_CONSTASCII_USTRINGPARAM("US"));
     */
-    static rtl::OUString aEN=rtl::OUString::createFromAscii( "en" );
-    static rtl::OUString aUS=rtl::OUString::createFromAscii( "US" );
+    static rtl::OUString aEN(RTL_CONSTASCII_USTRINGPARAM("en"));
+    static rtl::OUString aUS(RTL_CONSTASCII_USTRINGPARAM("US"));
     static CharClass aCC( com::sun::star::lang::Locale( aEN, aUS, rtl::OUString() ) );
     return aCC.toUpper( rStr, 0, rStr.Len() );
 }
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 2ee6c6f78361..e9ea19bd3ffe 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -169,11 +169,10 @@ SotStorageStream::~SotStorageStream()
 *************************************************************************/
 void SotStorageStream::SyncSvStream()
 {
-    ULONG nPos = 0;
     if( pOwnStm )
     {
         pOwnStm->Flush();
-        nPos = pOwnStm->Tell();
+        ULONG nPos = pOwnStm->Tell();
         SetError( pOwnStm->GetError() );
         SvStream::SyncSvStream( nPos );
     }
@@ -807,8 +806,8 @@ uno::Reference< embed::XStorage > SotStorage::GetUNOAPIDuplicate( const String&
                                 uno::Any aMediaType;
 
                                 if ( pChildUCBStg->GetProperty(
-                                                    ::rtl::OUString::createFromAscii( "MediaType" ), aMediaType ) )
-                                    pTempStorage->SetProperty( ::rtl::OUString::createFromAscii( "MediaType" ), aMediaType );
+                                                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), aMediaType ) )
+                                    pTempStorage->SetProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), aMediaType );
 
                                 bStorageReady = !pChildUCBStg->GetError() && !pTempStorage->GetError()
                                             && pTempStorage->Commit();
@@ -826,7 +825,7 @@ uno::Reference< embed::XStorage > SotStorage::GetUNOAPIDuplicate( const String&
                         try {
                             uno::Reference< lang::XSingleServiceFactory > xStorageFactory(
                                     ::comphelper::getProcessServiceFactory()->createInstance(
-                                        ::rtl::OUString::createFromAscii( "com.sun.star.embed.StorageFactory" ) ),
+                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.StorageFactory")) ),
                                     uno::UNO_QUERY );
 
                             OSL_ENSURE( xStorageFactory.is(), "Can't create storage factory!\n" );
@@ -1466,7 +1465,7 @@ void SotStorage::SetKey( const ByteString& rKey )
             ::com::sun::star::uno::Sequence < sal_Int8 > aSequ( (sal_Int8*) pBuffer, RTL_DIGEST_LENGTH_SHA1 );
             ::com::sun::star::uno::Any aAny;
             aAny <<= aSequ;
-            SetProperty( ::rtl::OUString::createFromAscii("EncryptionKey"), aAny );
+            SetProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EncryptionKey")), aAny );
         }
     }
 }
@@ -1515,7 +1514,7 @@ sal_Int32 SotStorage::GetFormatID( const com::sun::star::uno::Reference < com::s
         return 0;
 
     ::rtl::OUString aMediaType;
-    xProps->getPropertyValue( ::rtl::OUString::createFromAscii( "MediaType" ) ) >>= aMediaType;
+    xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) ) >>= aMediaType;
     if ( aMediaType.getLength() )
     {
         ::com::sun::star::datatransfer::DataFlavor aDataFlavor;
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 487b5421ddd7..bf374ba55279 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -701,7 +701,7 @@ UCBStorageStream_Impl::UCBStorageStream_Impl( const String& rName, StreamMode nM
         {
             xComEnv = new ::ucbhelper::CommandEnvironment( Reference< ::com::sun::star::task::XInteractionHandler >(),
                                                      xProgress );
-            aTemp += rtl::OUString::createFromAscii("?repairpackage");
+            aTemp += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("?repairpackage"));
         }
 
         m_pContent = new ::ucbhelper::Content( aTemp, xComEnv );
@@ -719,7 +719,7 @@ UCBStorageStream_Impl::UCBStorageStream_Impl( const String& rName, StreamMode nM
                 ::com::sun::star::uno::Sequence < sal_Int8 > aSequ( (sal_Int8*) pBuffer, RTL_DIGEST_LENGTH_SHA1 );
                 ::com::sun::star::uno::Any aAny;
                 aAny <<= aSequ;
-                m_pContent->setPropertyValue( ::rtl::OUString::createFromAscii("EncryptionKey"), aAny );
+                m_pContent->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EncryptionKey")), aAny );
             }
         }
     }
@@ -1220,7 +1220,7 @@ sal_Int16 UCBStorageStream_Impl::Commit()
                 aArg.Data = xStream;
                 aArg.ReplaceExisting = sal_True;
                 aAny <<= aArg;
-                m_pContent->executeCommand( ::rtl::OUString::createFromAscii("insert"), aAny );
+                m_pContent->executeCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert")), aAny );
 
                 // wrapper now controls lifetime of temporary file
                 m_aTempURL.Erase();
@@ -1862,7 +1862,7 @@ void UCBStorage_Impl::Init()
                             Reference < ::com::sun::star::packages::manifest::XManifestReader > xReader =
                                 Reference< ::com::sun::star::packages::manifest::XManifestReader >
                                     ( ::comphelper::getProcessServiceFactory()->createInstance(
-                                        ::rtl::OUString::createFromAscii( "com.sun.star.packages.manifest.ManifestReader" )), UNO_QUERY) ;
+                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.packages.manifest.ManifestReader"))), UNO_QUERY) ;
                             Sequence < Sequence < PropertyValue > > aProps = xReader->readManifestSequence( xInputStream );
 
                             // cleanup
@@ -1882,7 +1882,7 @@ void UCBStorage_Impl::Init()
         {
             // get the manifest information from the package
             try {
-                Any aAny = m_pContent->getPropertyValue( ::rtl::OUString::createFromAscii( "MediaType" ) );
+                Any aAny = m_pContent->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) );
                 rtl::OUString aTmp;
                 if ( ( aAny >>= aTmp ) && aTmp.getLength() )
                     m_aContentType = m_aOriginalContentType = aTmp;
@@ -1927,7 +1927,7 @@ void UCBStorage_Impl::CreateContent()
         {
             xComEnv = new ::ucbhelper::CommandEnvironment( Reference< ::com::sun::star::task::XInteractionHandler >(),
                                                      m_xProgressHandler );
-            aTemp += rtl::OUString::createFromAscii("?repairpackage");
+            aTemp += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("?repairpackage"));
         }
 
         m_pContent = new ::ucbhelper::Content( aTemp, xComEnv );
@@ -1954,10 +1954,10 @@ void UCBStorage_Impl::ReadContent()
     // create cursor for access to children
     Sequence< ::rtl::OUString > aProps(4);
     ::rtl::OUString* pProps = aProps.getArray();
-    pProps[0] = ::rtl::OUString::createFromAscii( "Title" );
-    pProps[1] = ::rtl::OUString::createFromAscii( "IsFolder" );
-    pProps[2] = ::rtl::OUString::createFromAscii( "MediaType" );
-    pProps[3] = ::rtl::OUString::createFromAscii( "Size" );
+    pProps[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
+    pProps[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder"));
+    pProps[2] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType"));
+    pProps[3] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size"));
     ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS;
 
     try
@@ -2018,7 +2018,7 @@ void UCBStorage_Impl::ReadContent()
                     ::ucbhelper::Content aContent( aName, xComEnv );
 
                     ::rtl::OUString aMediaType;
-                    Any aAny = aContent.getPropertyValue( ::rtl::OUString::createFromAscii( "MediaType" ) );
+                    Any aAny = aContent.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) );
                     if ( ( aAny >>= aMediaType ) && ( aMediaType.compareToAscii("application/vnd.sun.star.oleobject") == 0 ) )
                         pElement->m_bIsStorage = TRUE;
                     else if ( !aMediaType.getLength() )
@@ -2181,9 +2181,9 @@ void UCBStorage_Impl::GetProps( sal_Int32& nProps, Sequence < Sequence < Propert
     if ( !m_bIsRoot )
         aPath += m_aName;
     aPath += '/';
-    aProps[0].Name = ::rtl::OUString::createFromAscii("MediaType");
+    aProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType"));
     aProps[0].Value <<= (::rtl::OUString ) m_aContentType;
-    aProps[1].Name = ::rtl::OUString::createFromAscii("FullPath");
+    aProps[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FullPath"));
     aProps[1].Value <<= (::rtl::OUString ) aPath;
     rSequence[ nProps++ ] = aProps;
 
@@ -2204,9 +2204,9 @@ void UCBStorage_Impl::GetProps( sal_Int32& nProps, Sequence < Sequence < Propert
             // properties of streams
             String aElementPath( aPath );
             aElementPath += pElement->m_aName;
-            aProps[0].Name = ::rtl::OUString::createFromAscii("MediaType");
+            aProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType"));
             aProps[0].Value <<= (::rtl::OUString ) pElement->GetContentType();
-            aProps[1].Name = ::rtl::OUString::createFromAscii("FullPath");
+            aProps[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FullPath"));
             aProps[1].Value <<= (::rtl::OUString ) aElementPath;
             rSequence[ nProps++ ] = aProps;
         }
@@ -2344,7 +2344,7 @@ sal_Int16 UCBStorage_Impl::Commit()
                         // first remove all open stream handles
                         if( !pElement->m_xStream.Is() || pElement->m_xStream->Clear() )
                         {
-                            pContent->executeCommand( ::rtl::OUString::createFromAscii("delete"), makeAny( sal_Bool( sal_True ) ) );
+                            pContent->executeCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), makeAny( sal_Bool( sal_True ) ) );
                             nRet = COMMIT_RESULT_SUCCESS;
                         }
                         else
@@ -2390,7 +2390,7 @@ sal_Int16 UCBStorage_Impl::Commit()
                         nLocalRet = COMMIT_RESULT_SUCCESS;
                         Any aAny;
                         aAny <<= (rtl::OUString) pElement->m_aName;
-                        pContent->setPropertyValue( ::rtl::OUString::createFromAscii("Title"), aAny );
+                        pContent->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")), aAny );
                     }
 
                     if ( pElement->IsLoaded() && pElement->GetContentType() != pElement->GetOriginalContentType() )
@@ -2399,7 +2399,7 @@ sal_Int16 UCBStorage_Impl::Commit()
                         nLocalRet = COMMIT_RESULT_SUCCESS;
                         Any aAny;
                         aAny <<= (rtl::OUString) pElement->GetContentType();
-                        pContent->setPropertyValue( ::rtl::OUString::createFromAscii("MediaType"), aAny );
+                        pContent->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), aAny );
                     }
 
                     if ( nLocalRet != COMMIT_RESULT_NOTHING_TO_DO )
@@ -2452,7 +2452,7 @@ sal_Int16 UCBStorage_Impl::Commit()
                     // clipboard format and ClassId will be retrieved from the media type when the file is loaded again
                     Any aType;
                     aType <<= (rtl::OUString) m_aContentType;
-                    m_pContent->setPropertyValue( ::rtl::OUString::createFromAscii( "MediaType" ), aType );
+                    m_pContent->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), aType );
 
                     if (  m_bIsLinked )
                     {
@@ -2475,7 +2475,7 @@ sal_Int16 UCBStorage_Impl::Commit()
                             Reference < ::com::sun::star::packages::manifest::XManifestWriter > xWriter =
                                 Reference< ::com::sun::star::packages::manifest::XManifestWriter >
                                     ( ::comphelper::getProcessServiceFactory()->createInstance(
-                                        ::rtl::OUString::createFromAscii( "com.sun.star.packages.manifest.ManifestWriter" )), UNO_QUERY) ;
+                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.packages.manifest.ManifestWriter"))), UNO_QUERY) ;
                             sal_Int32 nCount = GetObjectCount() + 1;
                             Sequence < Sequence < PropertyValue > > aProps( nCount );
                             sal_Int32 nProps = 0;
@@ -2487,7 +2487,7 @@ sal_Int16 UCBStorage_Impl::Commit()
                             xWriter = NULL;
                             xOutputStream = NULL;
                             DELETEZ( pTempFile );
-                            aNewSubFolder.transferContent( aSource, InsertOperation_MOVE, ::rtl::OUString::createFromAscii("manifest.xml"), NameClash::OVERWRITE );
+                            aNewSubFolder.transferContent( aSource, InsertOperation_MOVE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("manifest.xml")), NameClash::OVERWRITE );
                         }
                     }
                     else
@@ -2498,7 +2498,7 @@ sal_Int16 UCBStorage_Impl::Commit()
 #endif
                         // force writing
                         Any aAny;
-                        m_pContent->executeCommand( ::rtl::OUString::createFromAscii("flush"), aAny );
+                        m_pContent->executeCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("flush")), aAny );
                         if ( m_pSource != 0 )
                         {
                             SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( m_pTempFile->GetURL(), STREAM_STD_READ );
diff --git a/sot/source/sdstor/unostorageholder.cxx b/sot/source/sdstor/unostorageholder.cxx
index 55e3e2db4105..4e593a066d83 100644
--- a/sot/source/sdstor/unostorageholder.cxx
+++ b/sot/source/sdstor/unostorageholder.cxx
@@ -110,7 +110,7 @@ void SAL_CALL UNOStorageHolder::commited( const lang::EventObject& /*aEvent*/ )
 
     uno::Reference< lang::XSingleServiceFactory > xStorageFactory(
             ::comphelper::getProcessServiceFactory()->createInstance(
-                   ::rtl::OUString::createFromAscii( "com.sun.star.embed.StorageFactory" ) ),
+                   ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.StorageFactory")) ),
             uno::UNO_QUERY );
 
     OSL_ENSURE( xStorageFactory.is(), "Can't create storage factory!\n" );
@@ -155,8 +155,8 @@ void SAL_CALL UNOStorageHolder::commited( const lang::EventObject& /*aEvent*/ )
     // CopyTo does not transport unknown media type
     // just workaround it
     uno::Any aMediaType;
-    if ( rTempStorage->GetProperty( ::rtl::OUString::createFromAscii( "MediaType" ), aMediaType ) )
-        m_rSotStorage->SetProperty( ::rtl::OUString::createFromAscii( "MediaType" ), aMediaType );
+    if ( rTempStorage->GetProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), aMediaType ) )
+        m_rSotStorage->SetProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), aMediaType );
 
     m_rSotStorage->Commit();
 }
diff --git a/sot/source/unoolestorage/xolesimplestorage.cxx b/sot/source/unoolestorage/xolesimplestorage.cxx
index 6851bfc8f5f4..059857be6e5d 100644
--- a/sot/source/unoolestorage/xolesimplestorage.cxx
+++ b/sot/source/unoolestorage/xolesimplestorage.cxx
@@ -84,14 +84,14 @@ OLESimpleStorage::~OLESimpleStorage()
 uno::Sequence< ::rtl::OUString > SAL_CALL OLESimpleStorage::impl_staticGetSupportedServiceNames()
 {
     uno::Sequence< ::rtl::OUString > aRet(1);
-    aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.embed.OLESimpleStorage");
+    aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.OLESimpleStorage"));
     return aRet;
 }
 
 //-------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OLESimpleStorage::impl_staticGetImplementationName()
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.OLESimpleStorage");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.OLESimpleStorage"));
 }
 
 //-------------------------------------------------------------------------
@@ -267,7 +267,7 @@ void SAL_CALL OLESimpleStorage::initialize( const uno::Sequence< uno::Any >& aAr
     else
     {
         uno::Reference < io::XStream > xTempFile(
-                m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ),
+                m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")) ),
                 uno::UNO_QUERY_THROW );
         uno::Reference < io::XSeekable > xTempSeek( xTempFile, uno::UNO_QUERY_THROW );
         uno::Reference< io::XOutputStream > xTempOut = xTempFile->getOutputStream();
@@ -426,7 +426,7 @@ void SAL_CALL OLESimpleStorage::replaceByName( const ::rtl::OUString& aName, con
     {
            uno::Any aCaught( ::cppu::getCaughtException() );
 
-        throw lang::WrappedTargetException( ::rtl::OUString::createFromAscii( "Can't copy raw stream" ),
+        throw lang::WrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't copy raw stream")),
                                             uno::Reference< uno::XInterface >(),
                                             aCaught );
     }
@@ -452,7 +452,7 @@ uno::Any SAL_CALL OLESimpleStorage::getByName( const ::rtl::OUString& aName )
     uno::Any aResult;
 
     uno::Reference< io::XStream > xTempFile(
-        m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ),
+        m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")) ),
         uno::UNO_QUERY );
     uno::Reference< io::XSeekable > xSeekable( xTempFile, uno::UNO_QUERY_THROW );
     uno::Reference< io::XOutputStream > xOutputStream = xTempFile->getOutputStream();
@@ -488,7 +488,7 @@ uno::Any SAL_CALL OLESimpleStorage::getByName( const ::rtl::OUString& aName )
 
         uno::Reference< container::XNameContainer > xResultNameContainer(
             m_xFactory->createInstanceWithArguments(
-                    ::rtl::OUString::createFromAscii( "com.sun.star.embed.OLESimpleStorage" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.OLESimpleStorage")),
                     aArgs ),
             uno::UNO_QUERY_THROW );
 
diff --git a/starmath/inc/caret.hxx b/starmath/inc/caret.hxx
index df8abaf14888..bc22f0336b29 100644
--- a/starmath/inc/caret.hxx
+++ b/starmath/inc/caret.hxx
@@ -177,7 +177,13 @@ public:
         nOffset = 0;
     }
     ~SmCaretPosGraph();
+    /** Add a caret position
+     *  @remarks If Left and/or Right are set NULL, they will point back to the entry.
+     */
     SmCaretPosGraphEntry* Add(SmCaretPosGraphEntry entry);
+    /** Add a caret position
+     *  @remarks If left and/or right are set NULL, they will point back to the entry.
+     */
     SmCaretPosGraphEntry* Add(SmCaretPos pos,
                             SmCaretPosGraphEntry* left = NULL,
                             SmCaretPosGraphEntry* right = NULL){
diff --git a/starmath/inc/cursor.hxx b/starmath/inc/cursor.hxx
index fab86a4a984b..139d5c4c9dfc 100644
--- a/starmath/inc/cursor.hxx
+++ b/starmath/inc/cursor.hxx
@@ -180,7 +180,7 @@ public:
      *
      * @returns True, if the caret was in a context where this operation was possible.
      */
-    BOOL InsertLimit(SmSubSup eSubSup, BOOL bMoveCaret = TRUE);
+    bool InsertLimit(SmSubSup eSubSup, bool bMoveCaret = true);
 
     /** Insert a new row or newline
      *
@@ -192,7 +192,7 @@ public:
      * @remarks If the caret is placed in a subline of a command that doesn't support
      *          this operator the method returns FALSE, and doesn't do anything.
      */
-    BOOL InsertRow();
+    bool InsertRow();
 
     /** Insert a fraction, use selection as numerator */
     void InsertFraction();
@@ -226,7 +226,7 @@ public:
     static SmNode* FindTopMostNodeInLine(SmNode* pSNode, bool MoveUpIfSelected = false);
 
     /** Draw the caret */
-    void Draw(OutputDevice& pDev, Point Offset);
+    void Draw(OutputDevice& pDev, Point Offset, bool isCaretVisible);
 
 private:
     friend class SmDocShell;
@@ -341,14 +341,14 @@ private:
                                                          SmNodeList *pSelectedNodes = NULL);
 
     /** Create an instance of SmMathSymbolNode usable for brackets */
-    static SmNode *CreateBracket(SmBracketType eBracketType, BOOL bIsLeft);
+    static SmNode *CreateBracket(SmBracketType eBracketType, bool bIsLeft);
 
     /** The number of times BeginEdit have been called
      * Used to allow nesting of BeginEdit() and EndEdit() sections
      */
     int nEditSections;
     /** Holds data for BeginEdit() and EndEdit() */
-    BOOL bIsEnabledSetModifiedSmDocShell;
+    bool bIsEnabledSetModifiedSmDocShell;
     /** Begin edit section where the tree will be modified */
     void BeginEdit();
     /** End edit section where the tree will be modified */
@@ -407,17 +407,17 @@ public:
      */
     SmNode* Parse(SmNodeList* list, bool bDeleteErrorNodes = true);
     /** True, if the token is an operator */
-    static BOOL IsOperator(const SmToken &token);
+    static bool IsOperator(const SmToken &token);
     /** True, if the token is a relation operator */
-    static BOOL IsRelationOperator(const SmToken &token);
+    static bool IsRelationOperator(const SmToken &token);
     /** True, if the token is a sum operator */
-    static BOOL IsSumOperator(const SmToken &token);
+    static bool IsSumOperator(const SmToken &token);
     /** True, if the token is a product operator */
-    static BOOL IsProductOperator(const SmToken &token);
+    static bool IsProductOperator(const SmToken &token);
     /** True, if the token is a unary operator */
-    static BOOL IsUnaryOperator(const SmToken &token);
+    static bool IsUnaryOperator(const SmToken &token);
     /** True, if the token is a postfix operator */
-    static BOOL IsPostfixOperator(const SmToken &token);
+    static bool IsPostfixOperator(const SmToken &token);
 private:
     SmNodeList* pList;
     /** Get the current terminal */
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index fcad9688f940..64cb550d787b 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -120,7 +120,7 @@ class SmFontDialog : public ModalDialog
     virtual void    DataChanged( const DataChangedEvent& rDCEvt );
 
 public:
-    SmFontDialog(Window * pParent, OutputDevice *pFntListDevice, BOOL bHideCheckboxes, BOOL bFreeRes = TRUE);
+    SmFontDialog(Window * pParent, OutputDevice *pFntListDevice, bool bHideCheckboxes, bool bFreeRes = true);
 
     const Font& GetFont() const { return Face; }
     void        SetFont(const Font &rFont);
@@ -150,7 +150,7 @@ class SmFontSizeDialog : public ModalDialog
     DECL_LINK(DefaultButtonClickHdl, Button *);
 
 public:
-    SmFontSizeDialog(Window *pParent, BOOL bFreeRes = TRUE);
+    SmFontSizeDialog(Window *pParent, bool bFreeRes = true);
 
     void ReadFrom(const SmFormat &rFormat);
     void WriteTo (SmFormat &rFormat) const;
@@ -187,7 +187,7 @@ class SmFontTypeDialog : public ModalDialog
     DECL_LINK(DefaultButtonClickHdl, Button *);
 
 public:
-    SmFontTypeDialog(Window *pParent, OutputDevice *pFntListDevice, BOOL bFreeRes = TRUE);
+    SmFontTypeDialog(Window *pParent, OutputDevice *pFntListDevice, bool bFreeRes = true);
 
     void ReadFrom(const SmFormat &rFormat);
     void WriteTo (SmFormat &rFormat) const;
@@ -202,11 +202,9 @@ class SmCategoryDesc : public Resource
     XubString       Name;
     XubString      *Strings[4];
     Bitmap         *Graphics[4];    /* regular bitmaps */
-    Bitmap         *GraphicsH[4];   /* high contrast bitmaps */
     USHORT          Minimum[4];
     USHORT          Maximum[4];
     USHORT          Value[4];
-    BOOL            bIsHighContrast;
 
 public:
     SmCategoryDesc(const ResId &rResId, USHORT nCategoryIdx);
@@ -219,10 +217,9 @@ public:
     USHORT          GetValue(USHORT Index) const    { return Value[Index]; }
     void            SetValue(USHORT Index, USHORT nVal) { Value[Index] = nVal;}
 
-    void            SetHighContrast( BOOL bVal )    { bIsHighContrast = bVal; }
     const Bitmap *  GetGraphic(USHORT Index) const
     {
-        return bIsHighContrast ? GraphicsH[Index] : Graphics[Index];
+        return Graphics[Index];
     }
 };
 
@@ -247,7 +244,7 @@ class SmDistanceDialog : public ModalDialog
 
     SmCategoryDesc *Categories[NOCATEGORIES];
     USHORT          nActiveCategory;
-    BOOL            bScaleAllBrackets;
+    bool            bScaleAllBrackets;
 
     DECL_LINK(GetFocusHdl, Control *);
     DECL_LINK(MenuSelectHdl, Menu *);
@@ -258,10 +255,8 @@ class SmDistanceDialog : public ModalDialog
     void    SetHelpId(MetricField &rField, ULONG nHelpId);
     void    SetCategory(USHORT Category);
 
-    void    ApplyImages();
-
 public:
-    SmDistanceDialog(Window *pParent, BOOL bFreeRes = TRUE);
+    SmDistanceDialog(Window *pParent, bool bFreeRes = true);
     ~SmDistanceDialog();
 
     void ReadFrom(const SmFormat &rFormat);
@@ -288,7 +283,7 @@ class SmAlignDialog : public ModalDialog
     DECL_LINK(DefaultButtonClickHdl, Button *);
 
 public:
-    SmAlignDialog(Window *pParent, BOOL bFreeRes = TRUE);
+    SmAlignDialog(Window *pParent, bool bFreeRes = true);
 
     void ReadFrom(const SmFormat &rFormat);
     void WriteTo (SmFormat &rFormat) const;
@@ -372,7 +367,7 @@ class SmSymbolDialog : public ModalDialog
     DECL_LINK(EditClickHdl, Button *);
     DECL_LINK(GetClickHdl, Button *);
 
-    void            FillSymbolSets(BOOL bDeleteText = TRUE);
+    void            FillSymbolSets(bool bDeleteText = true);
     void            SetSymbolSetManager(SmSymbolManager &rMgr);
     const SmSym    *GetSymbol() const;
     void            InitColor_Impl();
@@ -381,10 +376,10 @@ class SmSymbolDialog : public ModalDialog
 
 public:
     SmSymbolDialog(Window * pParent, OutputDevice *pFntListDevice,
-            SmSymbolManager &rSymbolMgr, SmViewShell &rViewShell, BOOL bFreeRes = TRUE);
+            SmSymbolManager &rSymbolMgr, SmViewShell &rViewShell, bool bFreeRes = true);
     virtual ~SmSymbolDialog();
 
-    BOOL    SelectSymbolSet(const XubString &rSymbolSetName);
+    bool    SelectSymbolSet(const XubString &rSymbolSetName);
     void    SelectSymbol(USHORT nSymbolPos);
     USHORT  GetSelectedSymbol() const   { return aSymbolSetDisplay.GetSelectSymbol(); }
 };
@@ -437,7 +432,6 @@ class SmSymDefineDialog : public ModalDialog
     PushButton      aDeleteBtn;
     FixedImage      aRightArrow;
     Image           aRigthArrow_Im;
-    Image           aRigthArrow_Im_HC;     // hi-contrast version
 
     SmSymbolManager     aSymbolMgrCopy,
                        &rSymbolMgr;
@@ -457,22 +451,22 @@ class SmSymDefineDialog : public ModalDialog
     DECL_LINK(ChangeClickHdl, Button *);
     DECL_LINK(DeleteClickHdl, Button *);
 
-    void    FillSymbols(ComboBox &rComboBox, BOOL bDeleteText = TRUE);
-    void    FillSymbolSets(ComboBox &rComboBox, BOOL bDeleteText = TRUE);
-    void    FillFonts(BOOL bDeleteText = TRUE);
-    void    FillStyles(BOOL bDeleteText = TRUE);
+    void    FillSymbols(ComboBox &rComboBox, bool bDeleteText = true);
+    void    FillSymbolSets(ComboBox &rComboBox, bool bDeleteText = true);
+    void    FillFonts(bool bDeleteText = true);
+    void    FillStyles(bool bDeleteText = true);
 
     void    SetSymbolSetManager(const SmSymbolManager &rMgr);
     void    SetFont(const XubString &rFontName, const XubString &rStyleName);
     void    SetOrigSymbol(const SmSym *pSymbol, const XubString &rSymbolSetName);
     void    UpdateButtons();
 
-    BOOL    SelectSymbolSet(ComboBox &rComboBox, const XubString &rSymbolSetName,
-                            BOOL bDeleteText);
-    BOOL    SelectSymbol(ComboBox &rComboBox, const XubString &rSymbolName,
-                            BOOL bDeleteText);
-    BOOL    SelectFont(const XubString &rFontName, BOOL bApplyFont);
-    BOOL    SelectStyle(const XubString &rStyleName, BOOL bApplyFont);
+    bool    SelectSymbolSet(ComboBox &rComboBox, const XubString &rSymbolSetName,
+                            bool bDeleteText);
+    bool    SelectSymbol(ComboBox &rComboBox, const XubString &rSymbolName,
+                            bool bDeleteText);
+    bool    SelectFont(const XubString &rFontName, bool bApplyFont);
+    bool    SelectStyle(const XubString &rStyleName, bool bApplyFont);
 
     SmSym       * GetSymbol(const ComboBox &rComboBox);
     const SmSym * GetSymbol(const ComboBox &rComboBox) const
@@ -485,7 +479,7 @@ class SmSymDefineDialog : public ModalDialog
     virtual void    DataChanged( const DataChangedEvent& rDCEvt );
 
 public:
-    SmSymDefineDialog(Window *pParent, OutputDevice *pFntListDevice, SmSymbolManager &rMgr, BOOL bFreeRes = TRUE);
+    SmSymDefineDialog(Window *pParent, OutputDevice *pFntListDevice, SmSymbolManager &rMgr, bool bFreeRes = true);
     ~SmSymDefineDialog();
 
     using OutputDevice::SetFont;
@@ -493,28 +487,28 @@ public:
     // Dialog
     virtual short   Execute();
 
-    BOOL SelectOldSymbolSet(const XubString &rSymbolSetName)
+    bool SelectOldSymbolSet(const XubString &rSymbolSetName)
     {
-        return SelectSymbolSet(aOldSymbolSets, rSymbolSetName, FALSE);
+        return SelectSymbolSet(aOldSymbolSets, rSymbolSetName, false);
     }
 
-    BOOL SelectOldSymbol(const XubString &rSymbolName)
+    bool SelectOldSymbol(const XubString &rSymbolName)
     {
-        return SelectSymbol(aOldSymbols, rSymbolName, FALSE);
+        return SelectSymbol(aOldSymbols, rSymbolName, false);
     }
 
-    BOOL SelectSymbolSet(const XubString &rSymbolSetName)
+    bool SelectSymbolSet(const XubString &rSymbolSetName)
     {
-        return SelectSymbolSet(aSymbolSets, rSymbolSetName, FALSE);
+        return SelectSymbolSet(aSymbolSets, rSymbolSetName, false);
     }
 
-    BOOL SelectSymbol(const XubString &rSymbolName)
+    bool SelectSymbol(const XubString &rSymbolName)
     {
-        return SelectSymbol(aSymbols, rSymbolName, FALSE);
+        return SelectSymbol(aSymbols, rSymbolName, false);
     }
 
-    BOOL        SelectFont(const XubString &rFontName)   { return SelectFont(rFontName, TRUE); }
-    BOOL        SelectStyle(const XubString &rStyleName) { return SelectStyle(rStyleName, TRUE); };
+    bool        SelectFont(const XubString &rFontName)   { return SelectFont(rFontName, true); }
+    bool        SelectStyle(const XubString &rStyleName) { return SelectStyle(rStyleName, true); };
     void        SelectChar(xub_Unicode cChar);
 };
 
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 6f73e2244009..f0661013db95 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -126,7 +126,7 @@ class SmDocShell : public SfxObjectShell, public SfxListener
                         nTopBorder,
                         nBottomBorder;
     USHORT              nModifyCount;
-    BOOL                bIsFormulaArranged;
+    bool                bIsFormulaArranged;
     SmCursor           *pCursor;
 
 
@@ -134,7 +134,7 @@ class SmDocShell : public SfxObjectShell, public SfxListener
     virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType,
                         const SfxHint& rHint, const TypeId& rHintType);
 
-    BOOL        WriteAsMathType3( SfxMedium& );
+    bool        WriteAsMathType3( SfxMedium& );
 
     virtual void        Draw(OutputDevice *pDevice,
                              const JobSetup & rSetup,
@@ -162,8 +162,8 @@ class SmDocShell : public SfxObjectShell, public SfxListener
     Printer             *GetPrt();
     OutputDevice*       GetRefDev();
 
-    BOOL                IsFormulaArranged() const { return bIsFormulaArranged; }
-    void                SetFormulaArranged(BOOL bVal) { bIsFormulaArranged = bVal; }
+    bool                IsFormulaArranged() const { return bIsFormulaArranged; }
+    void                SetFormulaArranged(bool bVal) { bIsFormulaArranged = bVal; }
 
     virtual BOOL        ConvertFrom(SfxMedium &rMedium);
 
@@ -190,7 +190,7 @@ public:
     //und fuer die Kommunikation mit dem SFX!
     //Alle internen Verwendungen des Printers sollten ausschlieslich uber
     //den SmPrinterAccess funktionieren.
-    BOOL        HasPrinter()    { return 0 != pPrinter; }
+    bool        HasPrinter()    { return 0 != pPrinter; }
     SfxPrinter *GetPrinter()    { GetPrt(); return pPrinter; }
     void        SetPrinter( SfxPrinter * );
 
@@ -215,7 +215,7 @@ public:
     EditEngine &    GetEditEngine();
     SfxItemPool &   GetEditEngineItemPool();
 
-    void        DrawFormula(OutputDevice &rDev, Point &rPosition, BOOL bDrawSelection = FALSE);
+    void        DrawFormula(OutputDevice &rDev, Point &rPosition, bool bDrawSelection = false);
     Size        GetSize();
 
     void        Repaint();
@@ -237,7 +237,7 @@ public:
     /** True, if cursor have previously been requested and thus
      * has some sort of position.
      */
-    BOOL        HasCursor() { return pCursor != NULL; }
+    bool        HasCursor() { return pCursor != NULL; }
 };
 
 #endif
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index cfb5ddffda8b..e69f752a5363 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -114,9 +114,9 @@ public:
     ESelection          GetSelection() const;
     void                SetSelection(const ESelection &rSel);
 
-    BOOL                IsEmpty() const;
-    BOOL                IsSelected() const;
-    BOOL                IsAllSelected() const;
+    bool                IsEmpty() const;
+    bool                IsSelected() const;
+    bool                IsAllSelected() const;
     void                Cut();
     void                Copy();
     void                Paste();
@@ -127,14 +127,14 @@ public:
     void                MarkError(const Point &rPos);
     void                SelNextMark();
     void                SelPrevMark();
-    BOOL                HasMark(const String &rText) const;
+    bool                HasMark(const String &rText) const;
 
     void                Flush();
     void                DeleteEditView( SmViewShell &rView );
 
     void ApplyColorConfigValues( const svtools::ColorConfig &rColorCfg );
 
-    BOOL                HandleWheelCommands( const CommandEvent &rCEvt );
+    bool                HandleWheelCommands( const CommandEvent &rCEvt );
     bool                IsInlineEditEnabled();
     void                StartCursorMove();
 
diff --git a/starmath/inc/format.hxx b/starmath/inc/format.hxx
index f4cddc3bbdc9..55899b9d0c9f 100644
--- a/starmath/inc/format.hxx
+++ b/starmath/inc/format.hxx
@@ -104,14 +104,14 @@ String GetDefaultFontName( LanguageType nLang, USHORT nIdent );
 class SmFormat : public SfxBroadcaster
 {
     SmFace      vFont[FNT_END + 1];
-    BOOL        bDefaultFont[FNT_END + 1];
+    bool        bDefaultFont[FNT_END + 1];
     Size        aBaseSize;
     long        nVersion;
     USHORT      vSize[SIZ_END + 1];
     USHORT      vDist[DIS_END + 1];
     SmHorAlign  eHorAlign;
     INT16       nGreekCharStyle;
-    BOOL        bIsTextmode,
+    bool        bIsTextmode,
                 bScaleNormalBrackets;
 
 public:
@@ -122,11 +122,11 @@ public:
     void            SetBaseSize(const Size &rSize)  { aBaseSize = rSize; }
 
     const SmFace &  GetFont(USHORT nIdent) const { return vFont[nIdent]; }
-    void            SetFont(USHORT nIdent, const SmFace &rFont, BOOL bDefault = FALSE);
+    void            SetFont(USHORT nIdent, const SmFace &rFont, bool bDefault = false);
     void            SetFontSize(USHORT nIdent, const Size &rSize)   { vFont[nIdent].SetSize( rSize ); }
 
-    void            SetDefaultFont(USHORT nIdent, BOOL bVal)    { bDefaultFont[nIdent] = bVal; }
-    BOOL            IsDefaultFont(USHORT nIdent) const   { return bDefaultFont[nIdent]; }
+    void            SetDefaultFont(USHORT nIdent, bool bVal)    { bDefaultFont[nIdent] = bVal; }
+    bool            IsDefaultFont(USHORT nIdent) const   { return bDefaultFont[nIdent]; }
 
     USHORT          GetRelSize(USHORT nIdent) const         { return vSize[nIdent]; }
     void            SetRelSize(USHORT nIdent, USHORT nVal)  { vSize[nIdent] = nVal;}
@@ -137,14 +137,14 @@ public:
     SmHorAlign      GetHorAlign() const             { return eHorAlign; }
     void            SetHorAlign(SmHorAlign eAlign)  { eHorAlign = eAlign; }
 
-    BOOL            IsTextmode() const     { return bIsTextmode; }
-    void            SetTextmode(BOOL bVal) { bIsTextmode = bVal; }
+    bool            IsTextmode() const     { return bIsTextmode; }
+    void            SetTextmode(bool bVal) { bIsTextmode = bVal; }
 
     INT16           GetGreekCharStyle() const     { return nGreekCharStyle; }
     void            SetGreekCharStyle(INT16 nVal) { nGreekCharStyle = nVal; }
 
-    BOOL            IsScaleNormalBrackets() const     { return bScaleNormalBrackets; }
-    void            SetScaleNormalBrackets(BOOL bVal) { bScaleNormalBrackets = bVal; }
+    bool            IsScaleNormalBrackets() const     { return bScaleNormalBrackets; }
+    void            SetScaleNormalBrackets(bool bVal) { bScaleNormalBrackets = bVal; }
 
     long            GetVersion() const { return nVersion; }
 
@@ -153,8 +153,8 @@ public:
 
     SmFormat &      operator = (const SmFormat &rFormat);
 
-    BOOL            operator == (const SmFormat &rFormat) const;
-    inline BOOL     operator != (const SmFormat &rFormat) const;
+    bool            operator == (const SmFormat &rFormat) const;
+    inline bool     operator != (const SmFormat &rFormat) const;
 
     void RequestApplyChanges() const
     {
@@ -163,7 +163,7 @@ public:
 
 };
 
-inline BOOL    SmFormat::operator != (const SmFormat &rFormat) const
+inline bool    SmFormat::operator != (const SmFormat &rFormat) const
 {
     return !(*this == rFormat);
 }
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 114f7204a236..e575e50194e4 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -52,7 +52,7 @@
 #endif
 
 // Comment out below to disable dumpasdot
-#define DEBUG_ENABLE_DUMPASDOT
+//#define DEBUG_ENABLE_DUMPASDOT
 
 #include "parse.hxx"
 #include "types.hxx"
@@ -119,10 +119,10 @@ class SmNode : public SmRect
     RectHorAlign    eRectHorAlign;
     USHORT          nFlags,
                     nAttributes;
-    BOOL            bIsPhantom,
+    bool            bIsPhantom,
                     bIsDebug;
 
-    BOOL            bIsSelected;
+    bool            bIsSelected;
 
 protected:
     SmNode(SmNodeType eNodeType, const SmToken &rNodeToken);
@@ -133,7 +133,7 @@ protected:
 public:
     virtual             ~SmNode();
 
-    virtual BOOL        IsVisible() const;
+    virtual bool        IsVisible() const;
 
     virtual USHORT      GetNumSubNodes() const;
     virtual SmNode *    GetSubNode(USHORT nIndex);
@@ -151,9 +151,9 @@ public:
             USHORT &    Flags() { return nFlags; }
             USHORT &    Attributes() { return nAttributes; }
 
-            BOOL IsDebug() const { return bIsDebug; }
-            BOOL IsPhantom() const { return bIsPhantom; }
-            void SetPhantom(BOOL bIsPhantom);
+            bool IsDebug() const { return bIsDebug; }
+            bool IsPhantom() const { return bIsPhantom; }
+            void SetPhantom(bool bIsPhantom);
             void SetColor(const Color &rColor);
 
             void SetAttribut(USHORT nAttrib);
@@ -173,7 +173,7 @@ public:
             void ToggleDebug() const;
 #endif
 
-    void         SetRectHorAlign(RectHorAlign eHorAlign, BOOL bApplyToSubTree = TRUE );
+    void         SetRectHorAlign(RectHorAlign eHorAlign, bool bApplyToSubTree = true );
     RectHorAlign GetRectHorAlign() const { return eRectHorAlign; }
 
     const SmRect & GetRect() const { return *this; }
@@ -213,8 +213,8 @@ public:
     virtual void Accept(SmVisitor* pVisitor);
 
     /** True if this node is selected */
-    BOOL IsSelected() const {return bIsSelected;}
-    void SetSelected(BOOL Selected = true) {bIsSelected = Selected;}
+    bool IsSelected() const {return bIsSelected;}
+    void SetSelected(bool Selected = true) {bIsSelected = Selected;}
 
 #ifdef DEBUG_ENABLE_DUMPASDOT
     /** The tree as dot graph for graphviz, usable for debugging
@@ -341,7 +341,7 @@ public:
             SmStructureNode( const SmStructureNode &rNode );
     virtual ~SmStructureNode();
 
-    virtual BOOL        IsVisible() const;
+    virtual bool        IsVisible() const;
 
     virtual USHORT      GetNumSubNodes() const;
             void        SetNumSubNodes(USHORT nSize) { aSubNodes.resize(nSize); }
@@ -386,7 +386,7 @@ protected:
 
 public:
 
-    virtual BOOL        IsVisible() const;
+    virtual bool        IsVisible() const;
     virtual USHORT      GetNumSubNodes() const;
     using   SmNode::GetSubNode;
     virtual SmNode *    GetSubNode(USHORT nIndex);
@@ -725,24 +725,24 @@ public:
  */
 class SmLineNode : public SmStructureNode
 {
-    BOOL  bUseExtraSpaces;
+    bool  bUseExtraSpaces;
 
 protected:
     SmLineNode(SmNodeType eNodeType, const SmToken &rNodeToken)
     :   SmStructureNode(eNodeType, rNodeToken)
     {
-        bUseExtraSpaces = TRUE;
+        bUseExtraSpaces = true;
     }
 
 public:
     SmLineNode(const SmToken &rNodeToken)
     :   SmStructureNode(NLINE, rNodeToken)
     {
-        bUseExtraSpaces = TRUE;
+        bUseExtraSpaces = true;
     }
 
-    void  SetUseExtraSpaces(BOOL bVal) { bUseExtraSpaces = bVal; }
-    BOOL  IsUseExtraSpaces() const { return bUseExtraSpaces; };
+    void  SetUseExtraSpaces(bool bVal) { bUseExtraSpaces = bVal; }
+    bool  IsUseExtraSpaces() const { return bUseExtraSpaces; };
 
     virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell);
     virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
@@ -897,7 +897,7 @@ public:
  */
 class SmBinDiagonalNode : public SmStructureNode
 {
-    BOOL    bAscending;
+    bool    bAscending;
 
     void    GetOperPosSize(Point &rPos, Size &rSize,
                            const Point &rDiagPoint, double fAngleDeg) const;
@@ -905,8 +905,8 @@ class SmBinDiagonalNode : public SmStructureNode
 public:
     SmBinDiagonalNode(const SmToken &rNodeToken);
 
-    BOOL    IsAscending() const { return bAscending; }
-    void    SetAscending(BOOL bVal)  { bAscending = bVal; }
+    bool    IsAscending() const { return bAscending; }
+    void    SetAscending(bool bVal)  { bAscending = bVal; }
 
     virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
     void Accept(SmVisitor* pVisitor);
@@ -958,14 +958,14 @@ enum SmSubSup
  */
 class SmSubSupNode : public SmStructureNode
 {
-    BOOL  bUseLimits;
+    bool  bUseLimits;
 
 public:
     SmSubSupNode(const SmToken &rNodeToken)
     :   SmStructureNode(NSUBSUP, rNodeToken)
     {
         SetNumSubNodes(1 + SUBSUP_NUM_ENTRIES);
-        bUseLimits = FALSE;
+        bUseLimits = false;
     }
 
     /** Get body (Not NULL) */
@@ -976,8 +976,8 @@ public:
         return ((SmSubSupNode *) this)->GetBody();
     }
 
-    void  SetUseLimits(BOOL bVal) { bUseLimits = bVal; }
-    BOOL  IsUseLimits() const { return bUseLimits; };
+    void  SetUseLimits(bool bVal) { bUseLimits = bVal; }
+    bool  IsUseLimits() const { return bUseLimits; };
 
     /** Get super- or subscript
      * @remarks this method may return NULL.
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index 5018340b5a01..8e85f4dfc32d 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -195,7 +195,7 @@ class SmParser
     USHORT          Row,
                     ColOff;
     SmConvert       eConversion;
-    BOOL            bImportSymNames,
+    bool            bImportSymNames,
                     bExportSymNames;
 
     // declare copy-constructor and assignment-operator private
@@ -204,14 +204,14 @@ class SmParser
 
 protected:
 #if OSL_DEBUG_LEVEL
-    BOOL            IsDelimiter( const String &rTxt, xub_StrLen nPos );
+    bool            IsDelimiter( const String &rTxt, xub_StrLen nPos );
 #endif
     void            NextToken();
     xub_StrLen      GetTokenIndex() const   { return nTokenIndex; }
     void            Insert(const String &rText, USHORT nPos);
     void            Replace( USHORT nPos, USHORT nLen, const String &rText );
 
-    inline BOOL     TokenInGroup(ULONG nGroup);
+    inline bool     TokenInGroup(ULONG nGroup);
 
     // grammar
     void    Table();
@@ -236,7 +236,7 @@ protected:
     void    FontSize();
     void    Color();
     void    Brace();
-    void    Bracebody(BOOL bIsLeftRight);
+    void    Bracebody(bool bIsLeftRight);
     void    Function();
     void    Binom();
     void    Stack();
@@ -263,10 +263,10 @@ public:
     SmConvert    GetConversion() const              { return eConversion; }
     void         SetConversion(SmConvert eConv)     { eConversion = eConv; }
 
-    BOOL         IsImportSymbolNames() const        { return bImportSymNames; }
-    void         SetImportSymbolNames(BOOL bVal)    { bImportSymNames = bVal; }
-    BOOL         IsExportSymbolNames() const        { return bExportSymNames; }
-    void         SetExportSymbolNames(BOOL bVal)    { bExportSymNames = bVal; }
+    bool         IsImportSymbolNames() const        { return bImportSymNames; }
+    void         SetImportSymbolNames(bool bVal)    { bImportSymNames = bVal; }
+    bool         IsExportSymbolNames() const        { return bExportSymNames; }
+    void         SetExportSymbolNames(bool bVal)    { bExportSymNames = bVal; }
 
     USHORT       AddError(SmParseError Type, SmNode *pNode);
 
@@ -277,9 +277,9 @@ public:
 };
 
 
-inline BOOL SmParser::TokenInGroup(ULONG nGroup)
+inline bool SmParser::TokenInGroup(ULONG nGroup)
 {
-    return (CurToken.nGroup & nGroup) ? TRUE : FALSE;
+    return (CurToken.nGroup & nGroup) ? true : false;
 }
 
 
diff --git a/starmath/inc/rect.hxx b/starmath/inc/rect.hxx
index fdd12dd86669..f1f0f60d19b2 100644
--- a/starmath/inc/rect.hxx
+++ b/starmath/inc/rect.hxx
@@ -39,10 +39,10 @@
 #include "format.hxx"
 
 
-BOOL SmGetGlyphBoundRect(const OutputDevice &rDev,
+bool SmGetGlyphBoundRect(const OutputDevice &rDev,
                          const XubString &rText, Rectangle &rRect);
 
-BOOL SmIsMathAlpha(const XubString &rText);
+bool SmIsMathAlpha(const XubString &rText);
 
 
 inline long SmFromTo(long nFrom, long nTo, double fRelDist)
@@ -105,7 +105,7 @@ class SmRect
             nLoAttrFence,
             nHiAttrFence;
     USHORT  nBorderWidth;
-    BOOL    bHasBaseline,
+    bool    bHasBaseline,
             bHasAlignInfo;
 
 protected:
@@ -114,7 +114,7 @@ protected:
             void Init(const OutputDevice &rDev, const SmFormat *pFormat,
                       const XubString &rText, USHORT nBorderWidth);
 
-            void ClearBaseline()    { bHasBaseline = FALSE; };
+            void ClearBaseline()    { bHasBaseline = false; };
     inline  void CopyMBL(const SmRect& rRect);
             void CopyAlignInfo(const SmRect& rRect);
 
@@ -164,7 +164,7 @@ public:
             long GetItalicRight() const     { return GetRight() + GetItalicRightSpace(); }
             long GetItalicWidth() const     { return GetWidth() + GetItalicLeftSpace() + GetItalicRightSpace(); }
 
-            BOOL HasBaseline() const        { return bHasBaseline; }
+            bool HasBaseline() const        { return bHasBaseline; }
     inline  long GetBaseline() const;
             long GetBaselineOffset() const  { return GetBaseline() - GetTop(); }
 
@@ -187,12 +187,12 @@ public:
             void Move  (const Point &rPosition);
             void MoveTo(const Point &rPosition) { Move(rPosition - GetTopLeft()); }
 
-            BOOL IsEmpty() const
+            bool IsEmpty() const
             {
                 return GetWidth() == 0  ||  GetHeight() == 0;
             }
 
-            BOOL HasAlignInfo() const { return bHasAlignInfo; }
+            bool HasAlignInfo() const { return bHasAlignInfo; }
 
             const Point AlignTo(const SmRect &rRect, RectPos ePos,
                                 RectHorAlign eHor, RectVerAlign eVer) const;
@@ -201,11 +201,11 @@ public:
             SmRect & ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode,
                               long nNewAlignM);
             SmRect & ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode,
-                      BOOL bKeepVerAlignParams);
+                      bool bKeepVerAlignParams);
 
             long    OrientedDist(const Point &rPoint) const;
-            BOOL    IsInsideRect(const Point &rPoint) const;
-            BOOL    IsInsideItalicRect(const Point &rPoint) const;
+            bool    IsInsideRect(const Point &rPoint) const;
+            bool    IsInsideItalicRect(const Point &rPoint) const;
 
     inline  SmRect & operator = (const SmRect &rRect);
 
diff --git a/starmath/inc/smdll.hxx b/starmath/inc/smdll.hxx
index cc5560764914..d7d86238bc84 100644
--- a/starmath/inc/smdll.hxx
+++ b/starmath/inc/smdll.hxx
@@ -38,7 +38,7 @@ class SfxFilter;
 
 class SmDLL
 {
-    static BOOL bInitialized;
+    static bool bInitialized;
 public:
     static void Init();
     static void Exit();
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 9be6defc3964..dd95c19ae8e4 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -162,27 +162,16 @@
 #define RID_ERR_OVERFLOW            (RID_APP_START + 937)
 
 // toolbox image lists for 'Selection' window
-//!! RID_ILH_XYZ = RID_IL_XYZ + 1 !!
 #define RID_IL_CATALOG                  (RID_APP_START + 950)
-#define RID_ILH_CATALOG                 (RID_APP_START + 951)
 #define RID_IL_UNBINOPS                 (RID_APP_START + 952)
-#define RID_ILH_UNBINOPS                (RID_APP_START + 953)
 #define RID_IL_RELATIONS                (RID_APP_START + 954)
-#define RID_ILH_RELATIONS               (RID_APP_START + 955)
 #define RID_IL_SETOPERATIONS            (RID_APP_START + 956)
-#define RID_ILH_SETOPERATIONS           (RID_APP_START + 957)
 #define RID_IL_FUNCTIONS                (RID_APP_START + 958)
-#define RID_ILH_FUNCTIONS               (RID_APP_START + 959)
 #define RID_IL_OPERATORS                (RID_APP_START + 960)
-#define RID_ILH_OPERATORS               (RID_APP_START + 961)
 #define RID_IL_ATTRIBUTES               (RID_APP_START + 962)
-#define RID_ILH_ATTRIBUTES              (RID_APP_START + 963)
 #define RID_IL_BRACKETS                 (RID_APP_START + 964)
-#define RID_ILH_BRACKETS                (RID_APP_START + 965)
 #define RID_IL_FORMAT                   (RID_APP_START + 966)
-#define RID_ILH_FORMAT                  (RID_APP_START + 967)
 #define RID_IL_MISC                     (RID_APP_START + 968)
-#define RID_ILH_MISC                    (RID_APP_START + 969)
 
 #define RID_UNBINOPS_CAT                (RID_APP_START + 1101)
 #define RID_RELATIONS_CAT               (RID_APP_START + 1102)
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx
index 1422550ff161..f35be53d1c09 100644
--- a/starmath/inc/symbol.hxx
+++ b/starmath/inc/symbol.hxx
@@ -85,13 +85,13 @@ private:
     String              m_aExportName;
     String              m_aSetName;
     sal_Unicode         m_cChar;
-    BOOL                m_bPredefined;
-    BOOL                m_bDocSymbol;
+    bool                m_bPredefined;
+    bool                m_bDocSymbol;
 
 public:
     SmSym();
     SmSym(const String& rName, const Font& rFont, sal_Unicode cChar,
-          const String& rSet, BOOL bIsPredefined = FALSE);
+          const String& rSet, bool bIsPredefined = false);
     SmSym(const SmSym& rSymbol);
 
     SmSym&      operator = (const SmSym& rSymbol);
@@ -107,14 +107,14 @@ public:
 //! because ten the key would not be the same as its supposed copy here
 //    void            SetName( const String &rTxt )       { m_aName = rTxt; }
 
-    BOOL            IsPredefined() const        { return m_bPredefined; }
+    bool            IsPredefined() const        { return m_bPredefined; }
     const String &  GetSymbolSetName() const    { return m_aSetName; }
     void            SetSymbolSetName( const String &rName )     { m_aSetName = rName; }
     const String &  GetExportName() const       { return m_aExportName; }
     void            SetExportName( const String &rName )        { m_aExportName = rName; }
 
-    BOOL            IsDocSymbol() const         { return m_bDocSymbol; }
-    void            SetDocSymbol( BOOL bVal )   { m_bDocSymbol = bVal; }
+    bool            IsDocSymbol() const         { return m_bDocSymbol; }
+    void            SetDocSymbol( bool bVal )   { m_bDocSymbol = bVal; }
 
     // true if rSymbol has the same name, font and character
     bool            IsEqualInUI( const SmSym& rSymbol ) const;
diff --git a/starmath/inc/toolbox.hxx b/starmath/inc/toolbox.hxx
index e35ee9a8891c..516a265731a4 100644
--- a/starmath/inc/toolbox.hxx
+++ b/starmath/inc/toolbox.hxx
@@ -48,7 +48,6 @@ protected:
     ToolBox    *pToolBoxCmd;
     ToolBox    *vToolBoxCategories[NUM_TBX_CATEGORIES];
     ImageList  *aImageLists [NUM_TBX_CATEGORIES + 1];   /* regular */
-    ImageList  *aImageListsH[NUM_TBX_CATEGORIES + 1];   /* high contrast */
     USHORT      nActiveCategoryRID;
 
     virtual BOOL    Close();
@@ -60,7 +59,7 @@ protected:
     DECL_LINK( CmdSelectHdl, ToolBox* );
 
     SmViewShell * GetView();
-    const ImageList * GetImageList( USHORT nResId, BOOL bHighContrast );
+    const ImageList * GetImageList( USHORT nResId );
 
 public:
     SmToolBoxWindow(SfxBindings    *pBindings,
@@ -72,7 +71,7 @@ public:
     virtual void    StateChanged( StateChangedType nStateChange );
     virtual void    DataChanged( const DataChangedEvent &rEvt );
 
-    void        AdjustPosSize( BOOL bSetPos );
+    void        AdjustPosSize( bool bSetPos );
     void        SetCategory(USHORT nCategory);
 };
 
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx
index ec5faf1c1ead..9302173296e7 100644
--- a/starmath/inc/utility.hxx
+++ b/starmath/inc/utility.hxx
@@ -96,8 +96,8 @@ SmViewShell * SmGetActiveView();
 // SmFace
 //
 
-BOOL    IsItalic( const Font &rFont );
-BOOL    IsBold( const Font &rFont );
+bool    IsItalic( const Font &rFont );
+bool    IsBold( const Font &rFont );
 
 class SmFace : public Font
 {
@@ -170,7 +170,7 @@ protected:
     virtual void   *CreateItem(const void *pItem) = 0;
     virtual void    DestroyItem(void *pItem) = 0;
 
-    virtual BOOL    CompareItem(const void *pFirstItem, const void *pSecondItem) const = 0;
+    virtual bool    CompareItem(const void *pFirstItem, const void *pSecondItem) const = 0;
 
     virtual String  GetStringItem(void *pItem) = 0;
 
@@ -214,7 +214,7 @@ protected:
     virtual void   *CreateItem(const void *pItem);
     virtual void    DestroyItem(void *pItem);
 
-    virtual BOOL    CompareItem(const void *pFirstItem, const void *pSecondItem) const;
+    virtual bool    CompareItem(const void *pFirstItem, const void *pSecondItem) const;
 
     virtual String  GetStringItem(void *pItem);
 
@@ -231,7 +231,7 @@ public:
     virtual void    Update(const String &rString, const String &rNewString);
     virtual void    Remove(const String &rString);
 
-    inline BOOL     Contains(const String &rString) const;
+    inline bool     Contains(const String &rString) const;
     inline String   Get(USHORT nPos = 0) const;
 
     inline SmStringPickList& operator = (const SmStringPickList& rList);
@@ -253,7 +253,7 @@ inline String SmStringPickList::Get(USHORT nPos) const
     return nPos < Count() ? *((String *)SmPickList::Get(nPos)) : String();
 }
 
-inline BOOL SmStringPickList::Contains(const String &rString) const
+inline bool SmStringPickList::Contains(const String &rString) const
 {
     return SmPickList::Contains((void *)&rString);
 }
@@ -273,7 +273,7 @@ protected:
     virtual void   *CreateItem(const void *pItem);
     virtual void    DestroyItem(void *pItem);
 
-    virtual BOOL    CompareItem(const void *pFirstItem, const void *pSecondItem) const;
+    virtual bool    CompareItem(const void *pFirstItem, const void *pSecondItem) const;
 
     virtual String  GetStringItem(void *pItem);
 
@@ -294,7 +294,7 @@ public:
     virtual void    Remove(const Font &rFont);
 
     using   SmPickList::Contains;
-    inline BOOL     Contains(const Font &rFont) const;
+    inline bool     Contains(const Font &rFont) const;
     inline Font     Get(USHORT nPos = 0) const;
 
     inline SmFontPickList&  operator = (const SmFontPickList& rList);
@@ -320,7 +320,7 @@ inline Font SmFontPickList::Get(USHORT nPos) const
     return nPos < Count() ? *((Font *)SmPickList::Get(nPos)) : Font();
 }
 
-inline BOOL SmFontPickList::Contains(const Font &rFont) const
+inline bool SmFontPickList::Contains(const Font &rFont) const
 {
     return SmPickList::Contains((void *)&rFont);
 }
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index cc13a35edf9f..081dc2388f8c 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -35,10 +35,10 @@
 #include <sfx2/shell.hxx>
 #include <sfx2/viewfac.hxx>
 #include <sfx2/viewfrm.hxx>
+#include <vcl/timer.hxx>
 #include <svtools/colorcfg.hxx>
 #include "edit.hxx"
 #include "node.hxx"
-#include "accessibility.hxx"
 
 class Menu;
 class DataChangedEvent;
@@ -46,6 +46,7 @@ class SmClipboardChangeListener;
 class SmDocShell;
 class SmViewShell;
 class SmPrintUIOptions;
+class SmGraphicAccessible;
 
 /**************************************************************************/
 
@@ -56,12 +57,16 @@ class SmGraphicWindow : public ScrollableWindow
     // old style editing pieces
     Rectangle aCursorRect;
     bool      bIsCursorVisible;
+    bool      bIsLineVisible;
+    AutoTimer aCaretBlinkTimer;
 public:
-    BOOL IsCursorVisible() const { return bIsCursorVisible; }
-    void ShowCursor(BOOL bShow);
+    bool IsCursorVisible() const { return bIsCursorVisible; }
+    void ShowCursor(bool bShow);
+    bool IsLineVisible() const { return bIsLineVisible; }
+    void ShowLine(bool bShow);
     const SmNode * SetCursorPos(USHORT nRow, USHORT nCol);
 protected:
-    void        SetIsCursorVisible(BOOL bVis) { bIsCursorVisible = bVis; }
+    void        SetIsCursorVisible(bool bVis) { bIsCursorVisible = bVis; }
     using   Window::SetCursor;
     void        SetCursor(const SmNode *pNode);
     void        SetCursor(const Rectangle &rRect);
@@ -86,6 +91,12 @@ protected:
     virtual void StateChanged( StateChangedType eChanged );
     DECL_LINK(MenuSelectHdl, Menu *);
 
+private:
+    void RepaintViewShellDoc();
+    DECL_LINK(CaretBlinkTimerHdl, AutoTimer *);
+    void CaretBlinkInit();
+    void CaretBlinkStart();
+    void CaretBlinkStop();
 public:
     SmGraphicWindow(SmViewShell* pShell);
     ~SmGraphicWindow();
@@ -154,7 +165,7 @@ class SmCmdBoxWindow : public SfxDockingWindow
 {
     SmEditWindow        aEdit;
     SmEditController    aController;
-    BOOL                bExiting;
+    bool                bExiting;
 
     Timer               aInitialFocusTimer;
 
@@ -230,7 +241,7 @@ class SmViewShell: public SfxViewShell
             ::com::sun::star::lang:: XEventListener > xClipEvtLstnr;
     SmClipboardChangeListener*  pClipEvtLstnr;
     SmViewShell_Impl*   pImpl;
-    BOOL                bPasteState;
+    bool                bPasteState;
 
     DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* );
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
@@ -239,7 +250,7 @@ class SmViewShell: public SfxViewShell
      * should be inserted into SmEditWindow or directly into the SmDocShell as done if the
      * visual editor was last to have focus.
      */
-    BOOL bInsertIntoEditWindow;
+    bool bInsertIntoEditWindow;
 protected:
 
     Size GetTextLineSize(OutputDevice& rDevice,
@@ -260,8 +271,8 @@ protected:
     virtual USHORT SetPrinter(SfxPrinter *pNewPrinter,
                               USHORT     nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false);
 
-    BOOL        Insert( SfxMedium& rMedium );
-    BOOL        InsertFrom(SfxMedium &rMedium);
+    bool        Insert( SfxMedium& rMedium );
+    bool        InsertFrom(SfxMedium &rMedium);
 
     virtual SfxTabPage *CreatePrintOptionsPage(Window           *pParent,
                                                const SfxItemSet &rOptions);
@@ -310,7 +321,7 @@ public:
      * so that when text is inserted from catalog or elsewhere we know whether to
      * insert for the visual editor, or the text editor.
      */
-    void SetInsertIntoEditWindow(BOOL bEditWindowHadFocusLast = TRUE){
+    void SetInsertIntoEditWindow(bool bEditWindowHadFocusLast = true){
         bInsertIntoEditWindow = bEditWindowHadFocusLast;
     }
     bool IsInlineEditEnabled() const;
diff --git a/starmath/inc/visitors.hxx b/starmath/inc/visitors.hxx
index d63bc13fcdae..cff09dcd8a36 100644
--- a/starmath/inc/visitors.hxx
+++ b/starmath/inc/visitors.hxx
@@ -152,13 +152,14 @@ class SmCaretDrawingVisitor : public SmDefaultingVisitor
 {
 public:
     /** Given position and device this constructor will draw the caret */
-    SmCaretDrawingVisitor( OutputDevice& rDevice, SmCaretPos position, Point offset );
+    SmCaretDrawingVisitor( OutputDevice& rDevice, SmCaretPos position, Point offset, bool caretVisible );
     void Visit( SmTextNode* pNode );
 private:
     OutputDevice &rDev;
     SmCaretPos pos;
     /** Offset to draw from */
     Point Offset;
+    bool isCaretVisible;
 protected:
     /** Default method for drawing pNodes */
     void DefaultVisit( SmNode* pNode );
@@ -263,17 +264,13 @@ private:
 class SmSetSelectionVisitor : public SmDefaultingVisitor
 {
 public:
-    SmSetSelectionVisitor( SmCaretPos startPos,
-                        SmCaretPos endPos ){
-        StartPos    = startPos;
-        EndPos      = endPos;
-        IsSelecting = false;
-    }
+    SmSetSelectionVisitor( SmCaretPos startPos, SmCaretPos endPos, SmNode* pNode);
     void Visit( SmBinHorNode* pNode );
     void Visit( SmUnHorNode* pNode );
     void Visit( SmFontNode* pNode );
     void Visit( SmTextNode* pNode );
     void Visit( SmExpressionNode* pNode );
+    void Visit( SmLineNode* pNode );
     void Visit( SmAlignNode* pNode );
     /** Set IsSelected on all pNodes of pSubTree */
     static void SetSelectedOnAll( SmNode* pSubTree, bool IsSelected = true );
@@ -295,7 +292,7 @@ private:
      * or EndPos. This means that anything visited in between will be
      * selected.
      */
-    BOOL IsSelecting;
+    bool IsSelecting;
 };
 
 
@@ -421,7 +418,7 @@ private:
     /** Reference to drawing device */
     OutputDevice& rDev;
     /** True if  aSelectionArea have been initialized */
-    BOOL bHasSelectionArea;
+    bool bHasSelectionArea;
     /** The current area that is selected */
     Rectangle aSelectionArea;
     /** Extend the area that must be selected  */
diff --git a/starmath/qa/cppunit/makefile.mk b/starmath/qa/cppunit/makefile.mk
new file mode 100644
index 000000000000..ff6e81d6d337
--- /dev/null
+++ b/starmath/qa/cppunit/makefile.mk
@@ -0,0 +1,133 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=../..
+PRJNAME=starmath
+TARGET=qa_cppunit
+
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+#building with stlport, but cppunit was not built with stlport
+.IF "$(USE_SYSTEM_STL)"!="YES"
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGSCXX+=-DADAPT_EXT_STL
+.ENDIF
+.ENDIF
+
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
+
+# --- Libs ---------------------------------------------------------
+
+SHL1OBJS=  \
+    $(SLO)/test_starmath.obj \
+    $(SLO)/test_nodetotextvisitors.obj
+
+
+SHL1STDLIBS= \
+    $(CPPUNITLIB) \
+    $(EDITENGLIB) \
+    $(SVXCORELIB) \
+    $(SVXLIB) \
+    $(SFX2LIB) \
+    $(XMLOFFLIB) \
+    $(SVTOOLLIB) \
+    $(TKLIB) \
+    $(VCLLIB) \
+    $(SVLLIB)   \
+    $(I18NPAPERLIB)     \
+    $(SOTLIB) \
+    $(UNOTOOLSLIB) \
+    $(TOOLSLIB) \
+    $(COMPHELPERLIB) \
+    $(CPPUHELPERLIB) \
+    $(CPPULIB) \
+    $(SALLIB)
+
+SHL1LIBS=$(SLB)$/starmath.lib
+
+SHL1TARGET= test_starmath
+SHL1RPATH = NONE
+SHL1IMPLIB= i$(SHL1TARGET)
+# SHL1DEF= $(MISC)/$(SHL1TARGET).def
+DEF1NAME=$(SHL1TARGET)
+# DEF1EXPORTFILE= export.exp
+SHL1VERSIONMAP= version.map
+
+# --- All object files ---------------------------------------------
+
+SLOFILES= \
+    $(SHL1OBJS) \
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+.IF "$(OS)" == "WNT"
+my_file = file:///
+.ELSE
+my_file = file://
+.END
+
+ALLTAR: test
+
+$(MISC)$/$(TARGET)$/types.rdb .ERRREMOVE : $(SOLARBINDIR)$/types.rdb
+    $(MKDIRHIER) $(@:d)
+    $(GNUCOPY) $? $@
+
+$(MISC)/$(TARGET)/udkapi.rdb .ERRREMOVE : $(SOLARBINDIR)$/udkapi.rdb
+    $(MKDIRHIER) $(@:d)
+    $(GNUCOPY) $? $@
+
+#Make a services.rdb with the services we know we need to get up and running
+$(MISC)/$(TARGET)/services.rdb .ERRREMOVE : $(MISC)/$(TARGET)/udkapi.rdb
+    $(MKDIRHIER) $(@:d)
+    $(REGCOMP) -register -br $(MISC)/$(TARGET)/udkapi.rdb -r $@ -wop \
+        -c $(DLLPRE)fwk$(DLLPOSTFIX)$(DLLPOST) \
+        -c $(DLLPRE)tk$(DLLPOSTFIX)$(DLLPOST) \
+        -c $(DLLPRE)sfx$(DLLPOSTFIX)$(DLLPOST) \
+        -c $(DLLPRE)vcl$(DLLPOSTFIX)$(DLLPOST) \
+        -c i18npool.uno$(DLLPOST)
+
+#Tweak things so that we use the .res files in the solver
+STAR_RESOURCEPATH:=$(PWD)/$(BIN)$(PATH_SEPERATOR)$(SOLARBINDIR)
+.EXPORT : STAR_RESOURCEPATH
+
+test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb $(MISC)$/$(TARGET)$/types.rdb $(MISC)/$(TARGET)/udkapi.rdb
+    @echo ----------------------------------------------------------
+    @echo - start unit test \#1 on library $(SHL1TARGETN)
+    @echo ----------------------------------------------------------
+    $(CPPUNITTESTER) $(SHL1TARGETN) -headless -invisible \
+        -env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb \
+        -env:UNO_TYPES="$(my_file)$(PWD)/$(MISC)/$(TARGET)/types.rdb $(my_file)$(PWD)/$(MISC)/$(TARGET)/udkapi.rdb" \
+        -env:OOO_BASE_DIR="$(my_file)$(PWD)/$(MISC)/$(TARGET)" \
+        -env:BRAND_BASE_DIR="$(my_file)$(PWD)/$(MISC)/$(TARGET)" \
+        -env:UNO_USER_PACKAGES_CACHE="$(my_file)$(PWD)/$(MISC)/$(TARGET)"
diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
new file mode 100644
index 000000000000..45386d13aa7a
--- /dev/null
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -0,0 +1,487 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Luke Dixon <6b8b4567@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_starmath.hxx"
+
+#include "sal/config.h"
+
+#include <cppuhelper/bootstrap.hxx>
+#include <comphelper/processfactory.hxx>
+#include <cppunit/TestAssert.h>
+
+#include <vcl/svapp.hxx>
+#include <smdll.hxx>
+
+#include <document.hxx>
+#include <node.hxx>
+#include <visitors.hxx>
+
+#include "preextstl.h"
+#include <cppunit/TestSuite.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/TestCase.h>
+#include <cppunit/plugin/TestPlugIn.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include "postextstl.h"
+
+namespace CppUnit {
+template<>
+struct assertion_traits<String>
+{
+    static bool equal(const String& x, const String& y)
+    {
+        return x == y;
+    }
+
+    static std::string toString(const String& x)
+    {
+        std::string text = ByteString(x, RTL_TEXTENCODING_UTF8).GetBuffer();
+        OStringStream ost;
+        ost << text;
+        return ost.str();
+    }
+};
+}
+
+SO2_DECL_REF(SmDocShell)
+SO2_IMPL_REF(SmDocShell)
+
+using namespace ::com::sun::star;
+
+namespace {
+
+class Test : public CppUnit::TestFixture {
+public:
+    // init
+    virtual void setUp();
+    virtual void tearDown();
+
+    // tests
+    void SimpleUnaryOp();
+    void SimpleBinaryOp();
+    void SimpleRelationalOp();
+    void SimpleSetOp();
+    void SimpleFunctions();
+    void SimpleOperators();
+    void SimpleAttributes();
+    void SimpleMisc();
+    void SimpleBrackets();
+    void SimpleFormats();
+    void SimpleGreekChars();
+    void SimpleSpecialChars();
+
+    CPPUNIT_TEST_SUITE(Test);
+    CPPUNIT_TEST(SimpleUnaryOp);
+    CPPUNIT_TEST(SimpleBinaryOp);
+    CPPUNIT_TEST(SimpleRelationalOp);
+    CPPUNIT_TEST(SimpleSetOp);
+    CPPUNIT_TEST(SimpleFunctions);
+    CPPUNIT_TEST(SimpleOperators);
+    CPPUNIT_TEST(SimpleAttributes);
+    CPPUNIT_TEST(SimpleMisc);
+    CPPUNIT_TEST(SimpleBrackets);
+    CPPUNIT_TEST(SimpleFormats);
+    CPPUNIT_TEST(SimpleGreekChars);
+    CPPUNIT_TEST(SimpleSpecialChars);
+    CPPUNIT_TEST_SUITE_END();
+
+private:
+    uno::Reference< uno::XComponentContext > m_context;
+    SmDocShellRef xDocShRef;
+    void parseandparseagain(const char *input, const char *test_name);
+};
+
+void Test::setUp()
+{
+    m_context = cppu::defaultBootstrap_InitialComponentContext();
+
+    uno::Reference<lang::XMultiComponentFactory> xFactory(m_context->getServiceManager());
+    uno::Reference<lang::XMultiServiceFactory> xSM(xFactory, uno::UNO_QUERY_THROW);
+
+    //Without this we're crashing because callees are using
+    //getProcessServiceFactory.  In general those should be removed in favour
+    //of retaining references to the root ServiceFactory as its passed around
+    comphelper::setProcessServiceFactory(xSM);
+
+    InitVCL(xSM);
+
+    SmDLL::Init();
+
+    xDocShRef = new SmDocShell(SFXOBJECTSHELL_STD_NORMAL);
+}
+
+void Test::tearDown()
+{
+}
+
+/*
+ * Most of the formula commands in this file came from:
+ * http://wiki.services.openoffice.org/wiki/Template:Math_commands_reference
+ * which was licensed with a
+ * Creative Common Attribution 3.0 license and written by:
+ * Jeanweber, Weegreenblobbie, Jdpipe, TJFrazier, Ysangkok, B michaelsen, Spellbreaker
+ */
+
+void Test::SimpleUnaryOp()
+{
+    parseandparseagain("+1", "Positive (plus)");
+    parseandparseagain("-2", "Negative (minus)");
+    parseandparseagain("+-3", "Plus/minus");
+    parseandparseagain("-+4", "Minus/plus");
+    parseandparseagain("neg a", "Boolean 'not'");
+}
+
+void Test::SimpleBinaryOp()
+{
+    parseandparseagain("a + b", "Addition");
+    parseandparseagain("a cdot b", "Dot product");
+    parseandparseagain("a times b", "Cross product");
+    parseandparseagain("a * b", "Multiplication (asterisk)");
+    parseandparseagain("a and b", "Boolean 'and'");
+    parseandparseagain("a - b", "Subtraction");
+    parseandparseagain("a over b", "Division (as a fraction)");
+    parseandparseagain("a div b", "Division (as an operator)");
+    parseandparseagain("a / b", "Division (with a slash)");
+    parseandparseagain("a or b", "Boolean 'or'");
+    parseandparseagain("a circ b", "Concatenation");
+}
+
+void Test::SimpleRelationalOp()
+{
+    parseandparseagain("a = b", "Is equal");
+    parseandparseagain("a <> b", "Is not equal");
+    parseandparseagain("a approx 2", "Approximately");
+    parseandparseagain("a divides b", "Divides");
+    parseandparseagain("a ndivides b", "Does not divide");
+    parseandparseagain("a < 2", "Less than");
+    parseandparseagain("a > 2", "Greater than");
+    parseandparseagain("a simeq b", "Similar to or equal");
+    parseandparseagain("a parallel b", "Parallel");
+    parseandparseagain("a ortho b", "Orthogonal to");
+    parseandparseagain("a leslant b", "Less than or equal to");
+    parseandparseagain("a geslant b", "Greater than or equal to");
+    parseandparseagain("a sim b", "Similar to");
+    parseandparseagain("a equiv b", "Congruent");
+    parseandparseagain("a <= b", "Less than or equal to");
+    parseandparseagain("a >= b", "Greater than or equal to");
+    parseandparseagain("a prop b", "Proportional");
+    parseandparseagain("a toward b", "Toward");
+    parseandparseagain("a dlarrow b", "Arrow left");
+    parseandparseagain("a dlrarrow b", "Double arrow left and right");
+    parseandparseagain("drarrow b", "Arrow right");
+}
+
+void Test::SimpleSetOp()
+{
+    parseandparseagain("a in B", "Is in");
+    parseandparseagain("a notin B", "Is not in");
+    parseandparseagain("A owns b", "Owns");
+    parseandparseagain("emptyset", "Empty set");
+    parseandparseagain("A intersection B", "Intersection");
+    parseandparseagain("A union B", "Union");
+    parseandparseagain("A setminus B", "Difference");
+    parseandparseagain("A slash B", "Quotient");
+    parseandparseagain("aleph", "Aleph");
+    parseandparseagain("A subset B", "Subset");
+    parseandparseagain("A subseteq B", "Subset or equal to");
+    parseandparseagain("A supset B", "Superset");
+    parseandparseagain("A supseteq B", "Superset or equal to");
+    parseandparseagain("A nsubset B", "Not subset");
+    parseandparseagain("A nsubseteq B", "Not subset or equal");
+    parseandparseagain("A nsupset B", "Not superset");
+    parseandparseagain("A nsupseteq B", "Not superset or equal");
+    parseandparseagain("setN", "Set of natural numbers");
+    parseandparseagain("setZ", "Set of integers");
+    parseandparseagain("setQ", "Set of rational numbers");
+    parseandparseagain("setR", "Set of real numbers");
+    parseandparseagain("setC", "Set of complex numbers");
+}
+
+void Test::SimpleFunctions()
+{
+    parseandparseagain("func e^{a}", "Exponential");
+    parseandparseagain("ln(a)", "Natural logarithm");
+    parseandparseagain("exp(a)", "Exponential function");
+    parseandparseagain("log(a)", "Logarithm");
+    parseandparseagain("a^{b}", "Power");
+    parseandparseagain("sin(a)", "Sine");
+    parseandparseagain("cos(a)", "Cosine");
+    parseandparseagain("tan(a)", "Tangent");
+    parseandparseagain("cot(a)", "Cotangent");
+    parseandparseagain("sqrt{a}", "Square root");
+    parseandparseagain("arcsin(a)", "Arcsine");
+    parseandparseagain("arccos(a)", "Arccosine");
+    parseandparseagain("arctan(a)", "Arctangent");
+    parseandparseagain("arccot(a)", "Arc cotangent");
+    parseandparseagain("nroot{a}{b}", "nth root");
+    parseandparseagain("sinh(a)", "Hyperbolic sine");
+    parseandparseagain("cosh(a)", "Hyperbolic cosine");
+    parseandparseagain("tanh(a)", "Hyperbolic tangent");
+    parseandparseagain("coth(a)", "Hyperbolic cotangent");
+    parseandparseagain("abs{a}", "Absolute value");
+    parseandparseagain("arsinh(a)", "Arc hyperbolic sine");
+    parseandparseagain("arcosh(a)", "Arc hyperbolic cosine");
+    parseandparseagain("artanh(a)", "Arc hyperbolic tangent");
+    parseandparseagain("arcoth(a)", "Arc hyperbolic cotangent");
+    parseandparseagain("fact a", "Factorial");
+}
+
+void Test::SimpleOperators()
+{
+    parseandparseagain("lim{a}", "Limit");
+    parseandparseagain("sum{a}", "Sum");
+    parseandparseagain("prod{a}", "Product");
+    parseandparseagain("coprod{a}", "Coproduct");
+    parseandparseagain("int from {r_0} to {r_t} a", "Upper and lower bounds shown with integral");
+    parseandparseagain("int{a}", "Integral");
+    parseandparseagain("iint{a}", "Double integral");
+    parseandparseagain("iiint{a}", "Triple integral");
+    parseandparseagain("sum from{3}b", "Lower bound shown with summation symbol");
+    parseandparseagain("lint a", "Contour integral");
+    parseandparseagain("llint a", "Double curved integral");
+    parseandparseagain("lllint a", "Triple curved integral");
+    parseandparseagain("prod from {i=1} to {n} {(i+1)}", "Product with range");
+}
+
+void Test::SimpleAttributes()
+{
+    parseandparseagain("acute a", "Acute accent");
+    parseandparseagain("grave a", "Grave accent");
+    parseandparseagain("check a", "Reverse circumflex");
+    parseandparseagain("breve a", "Breve");
+    parseandparseagain("circle a", "Circle");
+    parseandparseagain("vec a", "Vector arrow");
+    parseandparseagain("tilde a", "Tilde");
+    parseandparseagain("hat a", "Circumflex");
+    parseandparseagain("bar a", "Line above");
+    parseandparseagain("dot a", "Dot");
+    parseandparseagain("widevec abc", "Wide vector arrow");
+    parseandparseagain("widetilde abc", "Wide tilde");
+    parseandparseagain("widehat abc", "Wide circumflex");
+    parseandparseagain("ddot a", "Double dot");
+    parseandparseagain("overline abc", "Line over");
+    parseandparseagain("underline abc", "Line under");
+    parseandparseagain("overstrike abc", "Line through");
+    parseandparseagain("dddot a", "Triple dot");
+    parseandparseagain("phantom a", "Transparent (useful to get a placeholder of a given size)");
+    parseandparseagain("bold a", "Bold font");
+    parseandparseagain("ital a", "Italic font");
+    parseandparseagain("nitalic a", "Roman (non-italic) font 1");
+    parseandparseagain("\"a\"", "Roman (non-italic) font 2");
+    parseandparseagain("size 16 qv", "Resize font");
+    parseandparseagain("font sans qv", "Sans serif font");
+    parseandparseagain("font serif qv", "Serif font");
+    parseandparseagain("font fixed qv", "Fixed font");
+    parseandparseagain("color cyan qv", "Cyan color");
+    parseandparseagain("color yellow qv", "Yellow color");
+    parseandparseagain("color white qv", "White color");
+    parseandparseagain("color green qv", "Green color");
+    parseandparseagain("color blue qv", "Blue color");
+    parseandparseagain("color red qv", "Red color");
+    parseandparseagain("color green X qv", "Green color changes back");
+    parseandparseagain("color green {X qv}", "Green color, more than one item");
+}
+
+void Test::SimpleMisc()
+{
+    parseandparseagain("infinity", "Infinity");
+    parseandparseagain("partial", "Partial");
+    parseandparseagain("nabla", "Nabla");
+    parseandparseagain("exists", "There exists");
+    parseandparseagain("forall", "For all");
+    parseandparseagain("hbar", "H bar");
+    parseandparseagain("lambdabar", "Lambda bar");
+    parseandparseagain("re", "Real part");
+    parseandparseagain("im", "Imaginary part");
+    parseandparseagain("wp", "Weierstrass p");
+    parseandparseagain("leftarrow", "Left arrow");
+    parseandparseagain("rightarrow", "Right arrow");
+    parseandparseagain("uparrow", "Up arrow");
+    parseandparseagain("downarrow", "Down arrow");
+    parseandparseagain("dotslow", "Dots at bottom");
+    parseandparseagain("dotsaxis", "Dots at middle");
+    parseandparseagain("dotsvert", "Dots vertical");
+    parseandparseagain("dotsup", "Dots diagonal upward");
+    parseandparseagain("dotsdown", "Dots diagonal downward");
+}
+
+void Test::SimpleBrackets()
+{
+    parseandparseagain("(a)", "Round Brackets");
+    parseandparseagain("[b]", "Square Brackets");
+    parseandparseagain("ldbracket c rdbracket", "Double Square Brackets");
+    parseandparseagain("lline a rline", "Single line or absolute");
+    parseandparseagain("abs a", "Single line or absolute 2");
+    parseandparseagain("ldline a rdline", "Double line");
+    parseandparseagain("lbrace w rbrace", "Braces");
+    parseandparseagain("left lbrace stack{0, n <> 0 # 1, n = 1} right none", "Single left brace");
+    parseandparseagain("langle d rangle", "Angle Brackets");
+    parseandparseagain("langle a mline b rangle", "Operator Brackets");
+    parseandparseagain("{a}", "Group brackets (used for program control)");
+    parseandparseagain("left ( stack{a # b # z} right )", "Round brackets scalable");
+    parseandparseagain("left [ stack{x # y} right ]", "Square brackets scalable");
+    parseandparseagain("left ldbracket c right rdbracket", "Double square brackets scalable");
+    parseandparseagain("left lline a right rline", "Line scalable");
+    parseandparseagain("left ldline d right rdline", "Double line scalable");
+    parseandparseagain("left lbrace e right rbrace", "Brace scalable");
+    parseandparseagain("left langle f right rangle", "Angle bracket scalable");
+    parseandparseagain("left langle g mline h right rangle", "Operator brackets scalable");
+    parseandparseagain("{a} overbrace b", "Over brace scalable");
+    parseandparseagain("{b} underbrace a", "Under brace scalable");
+}
+
+void Test::SimpleFormats()
+{
+    parseandparseagain("a lsup{b}", "Left superscript");
+    parseandparseagain("a csup{b}", "Center superscript");
+    parseandparseagain("a^{b}", "Right superscript");
+    parseandparseagain("a lsub{b}", "Left subscript");
+    parseandparseagain("a csub{b}", "Center subscript");
+    parseandparseagain("a_{b}", "Right subscript");
+    parseandparseagain("stack { Hello world # alignl (a) }", "Align character to left");
+    parseandparseagain("stack{Hello world # alignc(a)}", "Align character to center");
+    parseandparseagain("stack { Hello world # alignr(a)}", "Align character to right");
+    parseandparseagain("binom{a}{b}", "Vertical stack of 2");
+    parseandparseagain("stack{a # b # z}", "Vertical stack, more than 2");
+    parseandparseagain("matrix{a # b ## c # d}", "Matrix");
+    parseandparseagain("matrix{a # \"=\" # alignl{b} ## {} # \"=\" # alignl{c+1}}", "Equations aligned at '=' (using 'matrix') ");
+    parseandparseagain("stack{alignl{a} = b # alignl{phantom{a} = c+1}}", "Equations aligned at '=' (using 'phantom') ");
+    parseandparseagain("asldkfjo newline sadkfj", "New line");
+    parseandparseagain("stuff `stuff", "Small gap (grave)");
+    parseandparseagain("stuff~stuff", "Large gap (tilde)");
+}
+
+void Test::SimpleGreekChars()
+{
+    parseandparseagain("%ALPHA", "Capital alpha");
+    parseandparseagain("%BETA", "Capital beta");
+    parseandparseagain("%CHI", "Capital chi");
+    parseandparseagain("%DELTA", "Capital delta");
+    parseandparseagain("%EPSILON", "Capital epsilon");
+    parseandparseagain("%ETA", "Capital eta");
+    parseandparseagain("%GAMMA", "Capital gamma");
+    parseandparseagain("%IOTA", "Capital iota");
+    parseandparseagain("%LAMBDA", "Capital lambda");
+    parseandparseagain("%MU", "Capital mu");
+    parseandparseagain("%NU", "Capital nu");
+    parseandparseagain("%OMEGA", "Capital omega");
+    parseandparseagain("%OMICRON", "Capital omicron");
+    parseandparseagain("%PHI", "Capital phi");
+    parseandparseagain("%PI", "Capital pi");
+    parseandparseagain("%PSI", "Capital psi");
+    parseandparseagain("%RHO", "Capital rho");
+    parseandparseagain("%SIGMA", "Capital sigma");
+    parseandparseagain("%TAU", "Capital tau");
+    parseandparseagain("%THETA", "Capital theta");
+    parseandparseagain("%UPSILON", "Capital upsilon");
+    parseandparseagain("%XI", "Capital xi");
+    parseandparseagain("%ZETA", "Capital zeta");
+    parseandparseagain("%alpha", "lowercase alpha");
+    parseandparseagain("%beta", "lowercase beta");
+    parseandparseagain("%chi", "lowercase chi");
+    parseandparseagain("%delta", "lowercase delta");
+    parseandparseagain("%epsilon", "lowercase epsilon");
+    parseandparseagain("%eta", "lowercase eta");
+    parseandparseagain("%gamma", "lowercase gamma");
+    parseandparseagain("%iota", "lowercase iota");
+    parseandparseagain("%kappa", "lowercase kappa");
+    parseandparseagain("%lambda", "lowercase lambda");
+    parseandparseagain("%mu", "lowercase mu");
+    parseandparseagain("%nu", "lowercase nu");
+    parseandparseagain("%omega", "lowercase omega");
+    parseandparseagain("%omicron", "lowercase omicron");
+    parseandparseagain("%phi", "lowercase phi");
+    parseandparseagain("%pi", "lowercase pi");
+    parseandparseagain("%psi", "lowercase psi");
+    parseandparseagain("%rho", "lowercase rho");
+    parseandparseagain("%sigma", "lowercase sigma");
+    parseandparseagain("%tau", "lowercase tau");
+    parseandparseagain("%theta", "lowercase theta");
+    parseandparseagain("%upsilon", "lowercase upsilon");
+    parseandparseagain("%varepsilon", "Varepsilon");
+    parseandparseagain("%varphi", "Varphi");
+    parseandparseagain("%varpi", "Varpi");
+    parseandparseagain("%varrho", "Varrho");
+    parseandparseagain("%varsigma", "Varsigma");
+    parseandparseagain("%vartheta", "Vartheta");
+    parseandparseagain("%xi", "lowercase xi");
+    parseandparseagain("%zeta", "lowercase zeta");
+}
+
+void Test::SimpleSpecialChars()
+{
+    parseandparseagain("%and", "And");
+    parseandparseagain("%angle", "Angle");
+    parseandparseagain("%element", "Element");
+    parseandparseagain("%identical", "Identical");
+    parseandparseagain("%infinite", "Infinite");
+    parseandparseagain("%noelement", "No element");
+    parseandparseagain("%notequal", "Not equal");
+    parseandparseagain("%or", "Or");
+    parseandparseagain("%perthousand", "Per thousand");
+    parseandparseagain("%strictlygreaterthan", "Strictly greater than");
+    parseandparseagain("%strictlylessthan", "Strictly less than");
+    parseandparseagain("%tendto", "Tend to");
+}
+
+/* This test takes a formula command, parses it, converts the node to text,
+ * parses it again, converts it to text again, and compares the values.
+ * Doing this doesn't prove that it is correct, but it should prove that the
+ * meaning of the original command is not being changed.
+ */
+void Test::parseandparseagain(const char *formula, const char *test_name)
+{
+    String input, output1, output2;
+    SmNode *pNode1, *pNode2;
+
+    // parse 1
+    input.AppendAscii(formula);
+    pNode1 = SmParser().ParseExpression(input);
+    pNode1->Prepare(xDocShRef->GetFormat(), *xDocShRef);
+    SmNodeToTextVisitor(pNode1, output1);
+
+    // parse 2
+    pNode2 = SmParser().ParseExpression(output1);
+    pNode2->Prepare(xDocShRef->GetFormat(), *xDocShRef);
+    SmNodeToTextVisitor(pNode2, output2);
+
+    // compare
+    CPPUNIT_ASSERT_EQUAL_MESSAGE(test_name,
+        output1,
+        output2);
+
+    delete pNode1;
+    delete pNode2;
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx
new file mode 100644
index 000000000000..a3df1fd66e8a
--- /dev/null
+++ b/starmath/qa/cppunit/test_starmath.cxx
@@ -0,0 +1,315 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_starmath.hxx"
+
+#include "sal/config.h"
+
+#include <cppuhelper/bootstrap.hxx>
+#include <comphelper/processfactory.hxx>
+#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/frame/XDesktop.hpp>
+
+#include <vcl/svapp.hxx>
+#include <smdll.hxx>
+#include <document.hxx>
+#include <view.hxx>
+
+#include <sfx2/bindings.hxx>
+#include <sfx2/request.hxx>
+#include <sfx2/dispatch.hxx>
+
+#include <svl/stritem.hxx>
+
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+
+#include "preextstl.h"
+#include <cppunit/TestSuite.h>
+#include <cppunit/TestFixture.h>
+#include <cppunit/TestCase.h>
+#include <cppunit/plugin/TestPlugIn.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include "postextstl.h"
+
+SO2_DECL_REF(SmDocShell)
+SO2_IMPL_REF(SmDocShell)
+
+using namespace ::com::sun::star;
+
+namespace {
+
+class Test : public CppUnit::TestFixture {
+public:
+    // init
+    virtual void setUp();
+    virtual void tearDown();
+
+    // tests
+    void createDocument();
+
+    void tmEditUndoRedo(SmDocShellRef &rDocShRef);
+    void tmEditAllClipboard(SmEditWindow &rEditWindow);
+    void tmEditMarker(SmEditWindow &rEditWindow);
+    void tmEditFailure(SmDocShellRef &rDocShRef);
+
+    void tViewZoom(SmViewShell &rViewShell);
+
+    CPPUNIT_TEST_SUITE(Test);
+    CPPUNIT_TEST(createDocument);
+    CPPUNIT_TEST_SUITE_END();
+
+private:
+    uno::Reference<uno::XComponentContext> m_xContext;
+    uno::Reference<lang::XMultiComponentFactory> m_xFactory;
+};
+
+void Test::setUp()
+{
+    m_xContext = cppu::defaultBootstrap_InitialComponentContext();
+    m_xFactory = m_xContext->getServiceManager();
+
+    uno::Reference<lang::XMultiServiceFactory> xSM(m_xFactory, uno::UNO_QUERY_THROW);
+
+    //Without this we're crashing because callees are using
+    //getProcessServiceFactory.  In general those should be removed in favour
+    //of retaining references to the root ServiceFactory as its passed around
+    comphelper::setProcessServiceFactory(xSM);
+
+    InitVCL(xSM);
+
+    SmDLL::Init();
+}
+
+void Test::tearDown()
+{
+    uno::Reference< lang::XComponent >(m_xContext, uno::UNO_QUERY_THROW)->dispose();
+}
+
+void Test::tmEditMarker(SmEditWindow &rEditWindow)
+{
+    {
+        rtl::OUString sMarkedText(RTL_CONSTASCII_USTRINGPARAM("<?> under <?> under <?>"));
+        rEditWindow.SetText(sMarkedText);
+        rEditWindow.Flush();
+        rtl::OUString sFinalText = rEditWindow.GetText();
+        CPPUNIT_ASSERT_MESSAGE("Should be equal text", sFinalText == sMarkedText);
+    }
+
+    {
+        rtl::OUString sTargetText(RTL_CONSTASCII_USTRINGPARAM("a under b under c"));
+
+        rEditWindow.SelNextMark();
+        rEditWindow.Cut();
+        rEditWindow.InsertText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("a")));
+
+        rEditWindow.SelNextMark();
+        rEditWindow.SelNextMark();
+        rEditWindow.Cut();
+        rEditWindow.InsertText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("c")));
+
+        rEditWindow.SelPrevMark();
+        rEditWindow.Cut();
+        rEditWindow.InsertText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("b")));
+
+        rEditWindow.Flush();
+        rtl::OUString sFinalText = rEditWindow.GetText();
+        CPPUNIT_ASSERT_MESSAGE("Should be a under b under c", sFinalText == sTargetText);
+    }
+
+    {
+        rEditWindow.SetText(rtl::OUString());
+        rEditWindow.Flush();
+    }
+}
+
+void Test::tmEditAllClipboard(SmEditWindow &rEditWindow)
+{
+    rtl::OUString sOriginalText(RTL_CONSTASCII_USTRINGPARAM("a over b"));
+
+    {
+        rEditWindow.SetText(sOriginalText);
+        rEditWindow.Flush();
+        rtl::OUString sFinalText = rEditWindow.GetText();
+        CPPUNIT_ASSERT_MESSAGE("Should be equal text", sFinalText == sOriginalText);
+    }
+
+    {
+        rEditWindow.SelectAll();
+        rEditWindow.Cut();
+        rEditWindow.Flush();
+        rtl::OUString sFinalText = rEditWindow.GetText();
+        CPPUNIT_ASSERT_MESSAGE("Should be empty", !sFinalText.getLength());
+    }
+
+    {
+        rEditWindow.Paste();
+        rEditWindow.Flush();
+        rtl::OUString sFinalText = rEditWindow.GetText();
+        CPPUNIT_ASSERT_MESSAGE("Should be equal text", sFinalText == sOriginalText);
+    }
+
+    {
+        rEditWindow.SelectAll();
+        rEditWindow.Copy();
+    }
+
+    {
+        rtl::OUString sExpectedText(RTL_CONSTASCII_USTRINGPARAM("a over ba over b"));
+
+        rEditWindow.Paste();
+        rEditWindow.Paste();
+        rEditWindow.Flush();
+        rtl::OUString sFinalText = rEditWindow.GetText();
+        CPPUNIT_ASSERT_MESSAGE("Should be equal text", sFinalText == sExpectedText);
+    }
+
+    {
+        rEditWindow.SetText(rtl::OUString());
+        rEditWindow.Flush();
+    }
+}
+
+void Test::tmEditFailure(SmDocShellRef &rDocShRef)
+{
+    rDocShRef->SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("color a b over {a/}")));
+
+    const SmErrorDesc *pErrorDesc = rDocShRef->GetParser().NextError();
+
+    CPPUNIT_ASSERT_MESSAGE("Should be a PE_UNEXPECTED_CHAR",
+        pErrorDesc && pErrorDesc->Type == PE_UNEXPECTED_CHAR);
+
+    pErrorDesc = rDocShRef->GetParser().PrevError();
+
+    CPPUNIT_ASSERT_MESSAGE("Should be a PE_RGROUP_EXPECTED",
+        pErrorDesc && pErrorDesc->Type == PE_RGROUP_EXPECTED);
+
+    pErrorDesc = rDocShRef->GetParser().PrevError();
+
+    CPPUNIT_ASSERT_MESSAGE("Should be a PE_COLOR_EXPECTED",
+        pErrorDesc && pErrorDesc->Type == PE_COLOR_EXPECTED);
+
+    const SmErrorDesc *pLastErrorDesc = rDocShRef->GetParser().PrevError();
+
+    CPPUNIT_ASSERT_MESSAGE("Should be three syntax errors",
+        pLastErrorDesc && pLastErrorDesc == pErrorDesc);
+}
+
+void Test::tmEditUndoRedo(SmDocShellRef &rDocShRef)
+{
+    EditEngine &rEditEngine = rDocShRef->GetEditEngine();
+
+    rtl::OUString sStringOne(RTL_CONSTASCII_USTRINGPARAM("a under b"));
+    {
+        rEditEngine.SetText(0, sStringOne);
+        rDocShRef->UpdateText();
+        rtl::OUString sFinalText = rDocShRef->GetText();
+        CPPUNIT_ASSERT_MESSAGE("Strings must match", sStringOne == sFinalText);
+    }
+
+    rtl::OUString sStringTwo(RTL_CONSTASCII_USTRINGPARAM("a over b"));
+    {
+        rEditEngine.SetText(0, sStringTwo);
+        rDocShRef->UpdateText();
+        rtl::OUString sFinalText = rDocShRef->GetText();
+        CPPUNIT_ASSERT_MESSAGE("Strings must match", sStringTwo == sFinalText);
+    }
+
+    SfxRequest aUndo(SID_UNDO, SFX_CALLMODE_SYNCHRON, rDocShRef->GetPool());
+
+    {
+        rDocShRef->Execute(aUndo);
+        rtl::OUString sFoo = rEditEngine.GetText();
+        rDocShRef->UpdateText();
+        rtl::OUString sFinalText = rDocShRef->GetText();
+        CPPUNIT_ASSERT_MESSAGE("Strings much match", sStringOne == sFinalText);
+    }
+
+    {
+        rDocShRef->Execute(aUndo);
+        rtl::OUString sFoo = rEditEngine.GetText();
+        rDocShRef->UpdateText();
+        rtl::OUString sFinalText = rDocShRef->GetText();
+        CPPUNIT_ASSERT_MESSAGE("Must now be empty", !sFinalText.getLength());
+    }
+
+    SfxRequest aRedo(SID_REDO, SFX_CALLMODE_SYNCHRON, rDocShRef->GetPool());
+    {
+        rDocShRef->Execute(aRedo);
+        rtl::OUString sFoo = rEditEngine.GetText();
+        rDocShRef->UpdateText();
+        rtl::OUString sFinalText = rDocShRef->GetText();
+        CPPUNIT_ASSERT_MESSAGE("Strings much match", sStringOne == sFinalText);
+    }
+
+    {
+        rEditEngine.SetText(0, rtl::OUString());
+        rDocShRef->UpdateText();
+        rEditEngine.ClearModifyFlag();
+        rtl::OUString sFinalText = rDocShRef->GetText();
+        CPPUNIT_ASSERT_MESSAGE("Must be empty", !sFinalText.getLength());
+    }
+
+}
+
+void Test::tViewZoom(SmViewShell &rViewShell)
+{
+    sal_uInt16 nOrigZoom, nNextZoom, nFinalZoom;
+
+    SmGraphicWindow &rGraphicWindow = rViewShell.GetGraphicWindow();
+    nOrigZoom = rGraphicWindow.GetZoom();
+
+    {
+        SfxRequest aZoomIn(SID_ZOOMIN, SFX_CALLMODE_SYNCHRON, rViewShell.GetPool());
+        rViewShell.Execute(aZoomIn);
+        nNextZoom = rGraphicWindow.GetZoom();
+        CPPUNIT_ASSERT_MESSAGE("Should be bigger", nNextZoom > nOrigZoom);
+    }
+
+    {
+        SfxRequest aZoomOut(SID_ZOOMOUT, SFX_CALLMODE_SYNCHRON, rViewShell.GetPool());
+        rViewShell.Execute(aZoomOut);
+        nFinalZoom = rGraphicWindow.GetZoom();
+        CPPUNIT_ASSERT_MESSAGE("Should be equal", nFinalZoom == nOrigZoom);
+    }
+}
+
+void Test::createDocument()
+{
+    SmDocShellRef xDocShRef = new SmDocShell(SFXOBJECTSHELL_STD_NORMAL);
+    xDocShRef->DoInitNew(0);
+
+    uno::Reference< frame::XFrame > xDesktop
+        (m_xFactory->createInstanceWithContext(
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")), m_xContext),
+        uno::UNO_QUERY_THROW );
+
+    SfxViewFrame *pViewFrame = SfxViewFrame::LoadHiddenDocument(*xDocShRef, 0);
+
+    CPPUNIT_ASSERT_MESSAGE("Should have a SfxViewFrame", pViewFrame);
+
+    SfxBindings aBindings;
+    SfxDispatcher aDispatcher(pViewFrame);
+    aBindings.SetDispatcher(&aDispatcher);
+    SmCmdBoxWindow aSmCmdBoxWindow(&aBindings, NULL, NULL);
+    SmEditWindow aEditWindow(aSmCmdBoxWindow);
+    SmViewShell *pViewShell = aEditWindow.GetView();
+    CPPUNIT_ASSERT_MESSAGE("Should have a SmViewShell", pViewShell);
+
+    tmEditUndoRedo(xDocShRef);
+    tmEditAllClipboard(aEditWindow);
+    tmEditMarker(aEditWindow);
+    tmEditFailure(xDocShRef);
+
+    tViewZoom(*pViewShell);
+
+    xDocShRef.Clear();
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
+
+}
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/qa/cppunit/version.map b/starmath/qa/cppunit/version.map
new file mode 100644
index 000000000000..3308588ef6f8
--- /dev/null
+++ b/starmath/qa/cppunit/version.map
@@ -0,0 +1,34 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+UDK_3_0_0 {
+    global:
+        cppunitTestPlugIn;
+
+    local:
+        *;
+};
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index cb7ec0d0dee4..b2650f39753f 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -1167,8 +1167,8 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe
         // get list of char attribs
         rEditEngine.GetCharAttribs( nPara, aAttribs );
 
-        BOOL bEmpty = TRUE;     // we found no item inside the selektion of this paragraph
-        BOOL bGaps  = FALSE;    // we found items but theire gaps between them
+        bool bEmpty = true;     // we found no item inside the selektion of this paragraph
+        bool bGaps  = false;    // we found items but theire gaps between them
         USHORT nLastEnd = nPos;
 
         const SfxPoolItem* pParaItem = NULL;
@@ -1201,16 +1201,16 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe
             }
 
             if( bEmpty )
-                bEmpty = FALSE;
+                bEmpty = false;
 
             if( !bGaps && aAttrib.nStart > nLastEnd )
-                bGaps = TRUE;
+                bGaps = true;
 
             nLastEnd = aAttrib.nEnd;
         }
 
         if( !bEmpty && !bGaps && nLastEnd < ( nEndPos - 1 ) )
-            bGaps = TRUE;
+            bGaps = true;
         if( bEmpty )
             eParaState = SFX_ITEM_DEFAULT;
         else if( bGaps )
diff --git a/starmath/source/caret.cxx b/starmath/source/caret.cxx
index 128c427b92b1..a847d136c12f 100644
--- a/starmath/source/caret.cxx
+++ b/starmath/source/caret.cxx
@@ -47,6 +47,10 @@ SmCaretPosGraphEntry* SmCaretPosGraph::Add(SmCaretPosGraphEntry entry){
             pNext = new SmCaretPosGraph();
         return pNext->Add(entry);
     }else{
+        //Set Left and Right to point to the entry itself if they are NULL
+        entry.Left = entry.Left ? entry.Left : Graph + nOffset;
+        entry.Right = entry.Right ? entry.Right : Graph + nOffset;
+        //Save the entry
         Graph[nOffset] = entry;
         return Graph + nOffset++;
     }
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 10148c9d39eb..876a679523d8 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -202,13 +202,13 @@ struct SmCfgOther
 {
     SmPrintSize     ePrintSize;
     USHORT          nPrintZoomFactor;
-    BOOL            bPrintTitle;
-    BOOL            bPrintFormulaText;
-    BOOL            bPrintFrame;
-    BOOL            bIgnoreSpacesRight;
-    BOOL            bToolboxVisible;
-    BOOL            bAutoRedraw;
-    BOOL            bFormulaCursor;
+    bool            bPrintTitle;
+    bool            bPrintFormulaText;
+    bool            bPrintFrame;
+    bool            bIgnoreSpacesRight;
+    bool            bToolboxVisible;
+    bool            bAutoRedraw;
+    bool            bFormulaCursor;
 
     SmCfgOther();
 };
@@ -221,7 +221,7 @@ SmCfgOther::SmCfgOther()
     bPrintTitle         = bPrintFormulaText   =
     bPrintFrame         = bIgnoreSpacesRight  =
     bToolboxVisible     = bAutoRedraw         =
-    bFormulaCursor      = TRUE;
+    bFormulaCursor      = true;
 }
 
 /////////////////////////////////////////////////////////////////
@@ -262,7 +262,7 @@ const Font SmFontFormat::GetFont() const
 }
 
 
-BOOL SmFontFormat::operator == ( const SmFontFormat &rFntFmt ) const
+bool SmFontFormat::operator == ( const SmFontFormat &rFntFmt ) const
 {
     return  aName    == rFntFmt.aName       &&
             nCharSet == rFntFmt.nCharSet    &&
@@ -284,7 +284,7 @@ SmFntFmtListEntry::SmFntFmtListEntry( const String &rId, const SmFontFormat &rFn
 
 SmFontFormatList::SmFontFormatList()
 {
-    bModified = FALSE;
+    bModified = false;
 }
 
 
@@ -294,7 +294,7 @@ void SmFontFormatList::Clear()
     if (nCnt)
     {
         aEntries.Remove( 0, nCnt );
-        SetModified( TRUE );
+        SetModified( true );
     }
 }
 
@@ -308,7 +308,7 @@ void SmFontFormatList::AddFontFormat( const String &rFntFmtId,
     {
         SmFntFmtListEntry aEntry( rFntFmtId, rFntFmt );
         aEntries.Insert( aEntry, aEntries.Count() );
-        SetModified( TRUE );
+        SetModified( true );
     }
 }
 
@@ -329,7 +329,7 @@ void SmFontFormatList::RemoveFontFormat( const String &rFntFmtId )
     if (nPos != 0xFFFF)
     {
         aEntries.Remove( nPos );
-        SetModified( TRUE );
+        SetModified( true );
     }
 }
 
@@ -376,7 +376,7 @@ const String SmFontFormatList::GetFontFormatId( const SmFontFormat &rFntFmt ) co
 }
 
 
-const String SmFontFormatList::GetFontFormatId( const SmFontFormat &rFntFmt, BOOL bAdd )
+const String SmFontFormatList::GetFontFormatId( const SmFontFormat &rFntFmt, bool bAdd )
 {
     String aRes( GetFontFormatId( rFntFmt) );
     if (0 == aRes.Len()  &&  bAdd)
@@ -403,7 +403,7 @@ const String SmFontFormatList::GetNewFontFormatId() const
 
     String aRes;
 
-    String aPrefix( RTL_CONSTASCII_STRINGPARAM( "Id" ) );
+    String aPrefix( RTL_CONSTASCII_USTRINGPARAM( "Id" ) );
     INT32 nCnt = GetCount();
     for (INT32 i = 1;  i <= nCnt + 1  &&  0 == aRes.Len();  ++i)
     {
@@ -427,7 +427,7 @@ SmMathConfig::SmMathConfig() :
     pFontFormatList = 0;
     pSymbolMgr      = 0;
 
-    bIsOtherModified = bIsFormatModified = FALSE;
+    bIsOtherModified = bIsFormatModified = false;
 }
 
 
@@ -441,19 +441,19 @@ SmMathConfig::~SmMathConfig()
 }
 
 
-void SmMathConfig::SetOtherModified( BOOL bVal )
+void SmMathConfig::SetOtherModified( bool bVal )
 {
     bIsOtherModified = bVal;
 }
 
 
-void SmMathConfig::SetFormatModified( BOOL bVal )
+void SmMathConfig::SetFormatModified( bool bVal )
 {
     bIsFormatModified = bVal;
 }
 
 
-void SmMathConfig::SetFontFormatListModified( BOOL bVal )
+void SmMathConfig::SetFontFormatListModified( bool bVal )
 {
     if (pFontFormatList)
         pFontFormatList->SetModified( bVal );
@@ -488,27 +488,27 @@ void SmMathConfig::ReadSymbol( SmSym &rSymbol,
         Font        aFont;
         sal_Unicode cChar = '\0';
         String      aSet;
-        BOOL        bPredefined = FALSE;
+        bool        bPredefined = false;
 
         OUString    aTmpStr;
         INT32       nTmp32 = 0;
-        BOOL        bTmp = FALSE;
+        bool        bTmp = false;
 
-        BOOL bOK = TRUE;
+        bool bOK = true;
         if (pValue->hasValue()  &&  (*pValue >>= nTmp32))
             cChar = (sal_Unicode) nTmp32;
         else
-            bOK = FALSE;
+            bOK = false;
         ++pValue;
         if (pValue->hasValue()  &&  (*pValue >>= aTmpStr))
             aSet = aTmpStr;
         else
-            bOK = FALSE;
+            bOK = false;
         ++pValue;
         if (pValue->hasValue()  &&  (*pValue >>= bTmp))
             bPredefined = bTmp;
         else
-            bOK = FALSE;
+            bOK = false;
         ++pValue;
         if (pValue->hasValue()  &&  (*pValue >>= aTmpStr))
         {
@@ -518,7 +518,7 @@ void SmMathConfig::ReadSymbol( SmSym &rSymbol,
                 aFont = pFntFmt->GetFont();
         }
         else
-            bOK = FALSE;
+            bOK = false;
         ++pValue;
 
         if (bOK)
@@ -636,7 +636,7 @@ void SmMathConfig::SetSymbols( const std::vector< SmSym > &rNewSymbols )
         pVal++;
         // FontFormatId
         SmFontFormat aFntFmt( rSymbol.GetFace() );
-        String aFntFmtId( GetFontFormatList().GetFontFormatId( aFntFmt, TRUE ) );
+        String aFntFmtId( GetFontFormatList().GetFontFormatId( aFntFmt, true ) );
         OSL_ENSURE( aFntFmtId.Len(), "FontFormatId not found" );
         pVal->Name  = aNodeNameDelim;
         pVal->Name += *pName++;
@@ -683,7 +683,7 @@ void SmMathConfig::LoadFontFormatList()
             pFontFormatList->AddFontFormat( pNode[i], aFntFmt );
         }
     }
-    pFontFormatList->SetModified( FALSE );
+    pFontFormatList->SetModified( false );
 }
 
 
@@ -715,36 +715,36 @@ void SmMathConfig::ReadFontFormat( SmFontFormat &rFontFormat,
         OUString    aTmpStr;
         INT16       nTmp16 = 0;
 
-        BOOL bOK = TRUE;
+        bool bOK = true;
         if (pValue->hasValue()  &&  (*pValue >>= aTmpStr))
             rFontFormat.aName = aTmpStr;
         else
-            bOK = FALSE;
+            bOK = false;
         ++pValue;
         if (pValue->hasValue()  &&  (*pValue >>= nTmp16))
             rFontFormat.nCharSet = nTmp16; // 6.0 file-format GetSOLoadTextEncoding not needed
         else
-            bOK = FALSE;
+            bOK = false;
         ++pValue;
         if (pValue->hasValue()  &&  (*pValue >>= nTmp16))
             rFontFormat.nFamily = nTmp16;
         else
-            bOK = FALSE;
+            bOK = false;
         ++pValue;
         if (pValue->hasValue()  &&  (*pValue >>= nTmp16))
             rFontFormat.nPitch = nTmp16;
         else
-            bOK = FALSE;
+            bOK = false;
         ++pValue;
         if (pValue->hasValue()  &&  (*pValue >>= nTmp16))
             rFontFormat.nWeight = nTmp16;
         else
-            bOK = FALSE;
+            bOK = false;
         ++pValue;
         if (pValue->hasValue()  &&  (*pValue >>= nTmp16))
             rFontFormat.nItalic = nTmp16;
         else
-            bOK = FALSE;
+            bOK = false;
         ++pValue;
 
         OSL_ENSURE( bOK, "read FontFormat failed" );
@@ -815,7 +815,7 @@ void SmMathConfig::SaveFontFormatList()
     OSL_ENSURE( pVal - pValues == nCount * nSymbolProps, "properties missing" );
     ReplaceSetProperties( A2OU( FONT_FORMAT_LIST ) , aValues );
 
-    rFntFmtList.SetModified( FALSE );
+    rFntFmtList.SetModified( false );
 }
 
 
@@ -830,12 +830,12 @@ void SmMathConfig::StripFontFormatList( const std::vector< SmSym > &rSymbols )
     for (i = 0;  i < nCount;  ++i)
     {
         OSL_ENSURE( rSymbols[i].GetName().Len() > 0, "non named symbol" );
-        aUsedList.GetFontFormatId( SmFontFormat( rSymbols[i].GetFace() ) , TRUE );
+        aUsedList.GetFontFormatId( SmFontFormat( rSymbols[i].GetFace() ) , true );
     }
     const SmFormat & rStdFmt = GetStandardFormat();
     for (i = FNT_BEGIN;  i <= FNT_END;  ++i)
     {
-        aUsedList.GetFontFormatId( SmFontFormat( rStdFmt.GetFont( i ) ) , TRUE );
+        aUsedList.GetFontFormatId( SmFontFormat( rStdFmt.GetFont( i ) ) , true );
     }
 
     // remove unused font-formats from list
@@ -876,7 +876,7 @@ void SmMathConfig::LoadOther()
         const Any *pVal = pValues;
 
         INT16   nTmp16 = 0;
-        BOOL    bTmp = FALSE;
+        bool    bTmp = false;
 
         // Print/Title
         if (pVal->hasValue()  &&  (*pVal >>= bTmp))
@@ -916,7 +916,7 @@ void SmMathConfig::LoadOther()
         ++pVal;
 
         OSL_ENSURE( pVal - pValues == nProps, "property mismatch" );
-        SetOtherModified( FALSE );
+        SetOtherModified( false );
     }
 }
 
@@ -955,7 +955,7 @@ void SmMathConfig::SaveOther()
     OSL_ENSURE( pValue - pValues == nProps, "property mismatch" );
     PutProperties( aNames , aValues );
 
-    SetOtherModified( FALSE );
+    SetOtherModified( false );
 }
 
 void SmMathConfig::LoadFormat()
@@ -975,7 +975,7 @@ void SmMathConfig::LoadFormat()
 
         OUString    aTmpStr;
         INT16       nTmp16 = 0;
-        BOOL        bTmp = FALSE;
+        bool        bTmp = false;
 
         // StandardFormat/Textmode
         if (pVal->hasValue()  &&  (*pVal >>= bTmp))
@@ -1017,7 +1017,7 @@ void SmMathConfig::LoadFormat()
         for (i = FNT_BEGIN;  i < FNT_END;  ++i)
         {
             Font aFnt;
-            BOOL bUseDefaultFont = TRUE;
+            bool bUseDefaultFont = true;
             if (pVal->hasValue()  &&  (*pVal >>= aTmpStr))
             {
                 bUseDefaultFont = 0 == aTmpStr.getLength();
@@ -1041,7 +1041,7 @@ void SmMathConfig::LoadFormat()
         }
 
         OSL_ENSURE( pVal - pValues == nProps, "property mismatch" );
-        SetFormatModified( FALSE );
+        SetFormatModified( false );
     }
 }
 
@@ -1084,7 +1084,7 @@ void SmMathConfig::SaveFormat()
         if (!pFormat->IsDefaultFont( i ))
         {
             SmFontFormat aFntFmt( pFormat->GetFont( i ) );
-            aFntFmtId = GetFontFormatList().GetFontFormatId( aFntFmt, TRUE );
+            aFntFmtId = GetFontFormatList().GetFontFormatId( aFntFmt, true );
             OSL_ENSURE( aFntFmtId.getLength(), "FontFormatId not found" );
         }
 
@@ -1094,7 +1094,7 @@ void SmMathConfig::SaveFormat()
     OSL_ENSURE( pValue - pValues == nProps, "property mismatch" );
     PutProperties( aNames , aValues );
 
-    SetFormatModified( FALSE );
+    SetFormatModified( false );
 }
 
 
@@ -1106,20 +1106,20 @@ const SmFormat & SmMathConfig::GetStandardFormat() const
 }
 
 
-void SmMathConfig::SetStandardFormat( const SmFormat &rFormat, BOOL bSaveFontFormatList )
+void SmMathConfig::SetStandardFormat( const SmFormat &rFormat, bool bSaveFontFormatList )
 {
     if (!pFormat)
         LoadFormat();
     if (rFormat != *pFormat)
     {
         *pFormat = rFormat;
-        SetFormatModified( TRUE );
+        SetFormatModified( true );
         SaveFormat();
 
         if (bSaveFontFormatList)
         {
             // needed for SmFontTypeDialog's DefaultButtonClickHdl
-            SetFontFormatListModified( TRUE );
+            SetFontFormatListModified( true );
             SaveFontFormatList();
         }
     }
@@ -1141,7 +1141,7 @@ void SmMathConfig::SetPrintSize( SmPrintSize eSize )
     if (eSize != pOther->ePrintSize)
     {
         pOther->ePrintSize = eSize;
-        SetOtherModified( TRUE );
+        SetOtherModified( true );
     }
 }
 
@@ -1161,22 +1161,22 @@ void SmMathConfig::SetPrintZoomFactor( USHORT nVal )
     if (nVal != pOther->nPrintZoomFactor)
     {
         pOther->nPrintZoomFactor = nVal;
-        SetOtherModified( TRUE );
+        SetOtherModified( true );
     }
 }
 
 
-void SmMathConfig::SetOtherIfNotEqual( BOOL &rbItem, BOOL bNewVal )
+void SmMathConfig::SetOtherIfNotEqual( bool &rbItem, bool bNewVal )
 {
     if (bNewVal != rbItem)
     {
         rbItem = bNewVal;
-        SetOtherModified( TRUE );
+        SetOtherModified( true );
     }
 }
 
 
-BOOL SmMathConfig::IsPrintTitle() const
+bool SmMathConfig::IsPrintTitle() const
 {
     if (!pOther)
         ((SmMathConfig *) this)->LoadOther();
@@ -1184,7 +1184,7 @@ BOOL SmMathConfig::IsPrintTitle() const
 }
 
 
-void SmMathConfig::SetPrintTitle( BOOL bVal )
+void SmMathConfig::SetPrintTitle( bool bVal )
 {
     if (!pOther)
         LoadOther();
@@ -1192,7 +1192,7 @@ void SmMathConfig::SetPrintTitle( BOOL bVal )
 }
 
 
-BOOL SmMathConfig::IsPrintFormulaText() const
+bool SmMathConfig::IsPrintFormulaText() const
 {
     if (!pOther)
         ((SmMathConfig *) this)->LoadOther();
@@ -1200,7 +1200,7 @@ BOOL SmMathConfig::IsPrintFormulaText() const
 }
 
 
-void SmMathConfig::SetPrintFormulaText( BOOL bVal )
+void SmMathConfig::SetPrintFormulaText( bool bVal )
 {
     if (!pOther)
         LoadOther();
@@ -1208,7 +1208,7 @@ void SmMathConfig::SetPrintFormulaText( BOOL bVal )
 }
 
 
-BOOL SmMathConfig::IsPrintFrame() const
+bool SmMathConfig::IsPrintFrame() const
 {
     if (!pOther)
         ((SmMathConfig *) this)->LoadOther();
@@ -1216,7 +1216,7 @@ BOOL SmMathConfig::IsPrintFrame() const
 }
 
 
-void SmMathConfig::SetPrintFrame( BOOL bVal )
+void SmMathConfig::SetPrintFrame( bool bVal )
 {
     if (!pOther)
         LoadOther();
@@ -1224,7 +1224,7 @@ void SmMathConfig::SetPrintFrame( BOOL bVal )
 }
 
 
-BOOL SmMathConfig::IsIgnoreSpacesRight() const
+bool SmMathConfig::IsIgnoreSpacesRight() const
 {
     if (!pOther)
         ((SmMathConfig *) this)->LoadOther();
@@ -1232,7 +1232,7 @@ BOOL SmMathConfig::IsIgnoreSpacesRight() const
 }
 
 
-void SmMathConfig::SetIgnoreSpacesRight( BOOL bVal )
+void SmMathConfig::SetIgnoreSpacesRight( bool bVal )
 {
     if (!pOther)
         LoadOther();
@@ -1240,7 +1240,7 @@ void SmMathConfig::SetIgnoreSpacesRight( BOOL bVal )
 }
 
 
-BOOL SmMathConfig::IsAutoRedraw() const
+bool SmMathConfig::IsAutoRedraw() const
 {
     if (!pOther)
         ((SmMathConfig *) this)->LoadOther();
@@ -1248,7 +1248,7 @@ BOOL SmMathConfig::IsAutoRedraw() const
 }
 
 
-void SmMathConfig::SetAutoRedraw( BOOL bVal )
+void SmMathConfig::SetAutoRedraw( bool bVal )
 {
     if (!pOther)
         LoadOther();
@@ -1256,7 +1256,7 @@ void SmMathConfig::SetAutoRedraw( BOOL bVal )
 }
 
 
-BOOL SmMathConfig::IsShowFormulaCursor() const
+bool SmMathConfig::IsShowFormulaCursor() const
 {
     if (!pOther)
         ((SmMathConfig *) this)->LoadOther();
@@ -1264,7 +1264,7 @@ BOOL SmMathConfig::IsShowFormulaCursor() const
 }
 
 
-void SmMathConfig::SetShowFormulaCursor( BOOL bVal )
+void SmMathConfig::SetShowFormulaCursor( bool bVal )
 {
     if (!pOther)
         LoadOther();
diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx
index 645cb6264fab..3762d15fc6bc 100644
--- a/starmath/source/cfgitem.hxx
+++ b/starmath/source/cfgitem.hxx
@@ -71,7 +71,7 @@ struct SmFontFormat
     SmFontFormat( const Font &rFont );
 
     const Font      GetFont() const;
-    BOOL            operator == ( const SmFontFormat &rFntFmt ) const;
+    bool            operator == ( const SmFontFormat &rFntFmt ) const;
 };
 
 
@@ -90,7 +90,7 @@ SV_DECL_OBJARR( SmFntFmtListEntryArr, SmFntFmtListEntry, 8, 8 )
 class SmFontFormatList
 {
     SmFntFmtListEntryArr    aEntries;
-    BOOL                    bModified;
+    bool                    bModified;
 
     // disallow copy-constructor and assignment-operator for now
     SmFontFormatList( const SmFontFormatList & );
@@ -106,13 +106,13 @@ public:
     const SmFontFormat *    GetFontFormat( const String &rFntFmtId ) const;
     const SmFontFormat *    GetFontFormat( USHORT nPos ) const;
     const String            GetFontFormatId( const SmFontFormat &rFntFmt ) const;
-    const String            GetFontFormatId( const SmFontFormat &rFntFmt, BOOL bAdd );
+    const String            GetFontFormatId( const SmFontFormat &rFntFmt, bool bAdd );
     const String            GetFontFormatId( USHORT nPos ) const;
     const String            GetNewFontFormatId() const;
     USHORT                  GetCount() const    { return aEntries.Count(); }
 
-    BOOL    IsModified() const          { return bModified; }
-    void    SetModified( BOOL bVal )    { bModified = bVal; }
+    bool    IsModified() const          { return bModified; }
+    void    SetModified( bool bVal )    { bModified = bVal; }
 };
 
 
@@ -124,8 +124,8 @@ class SmMathConfig : public utl::ConfigItem
     SmCfgOther *        pOther;
     SmFontFormatList *  pFontFormatList;
     SmSymbolManager *   pSymbolMgr;
-    BOOL                bIsOtherModified;
-    BOOL                bIsFormatModified;
+    bool                bIsOtherModified;
+    bool                bIsFormatModified;
 
     // disallow copy-constructor and assignment-operator for now
     SmMathConfig( const SmMathConfig & );
@@ -144,7 +144,7 @@ class SmMathConfig : public utl::ConfigItem
                         const rtl::OUString &rSymbolName,
                         const rtl::OUString &rBaseNode ) const;
 
-    void            SetOtherIfNotEqual( BOOL &rbItem, BOOL bNewVal );
+    void            SetOtherIfNotEqual( bool &rbItem, bool bNewVal );
 
 protected:
     void    LoadOther();
@@ -154,12 +154,12 @@ protected:
     void    LoadFontFormatList();
     void    SaveFontFormatList();
 
-    void        SetOtherModified( BOOL bVal );
-    inline BOOL IsOtherModified() const     { return bIsOtherModified; }
-    void        SetFormatModified( BOOL bVal );
-    inline BOOL IsFormatModified() const    { return bIsFormatModified; }
-    void        SetFontFormatListModified( BOOL bVal );
-    inline BOOL IsFontFormatListModified() const    { return pFontFormatList ? pFontFormatList->IsModified(): FALSE; }
+    void        SetOtherModified( bool bVal );
+    inline bool IsOtherModified() const     { return bIsOtherModified; }
+    void        SetFormatModified( bool bVal );
+    inline bool IsFormatModified() const    { return bIsFormatModified; }
+    void        SetFontFormatListModified( bool bVal );
+    inline bool IsFontFormatListModified() const    { return pFontFormatList ? pFontFormatList->IsModified(): false; }
 
     SmFontFormatList &          GetFontFormatList();
     const SmFontFormatList &    GetFontFormatList() const
@@ -180,25 +180,25 @@ public:
     void                SetSymbols( const std::vector< SmSym > &rNewSymbols );
 
     const SmFormat &    GetStandardFormat() const;
-    void                SetStandardFormat( const SmFormat &rFormat, BOOL bSaveFontFormatList = FALSE );
-
-    BOOL            IsPrintTitle() const;
-    void            SetPrintTitle( BOOL bVal );
-    BOOL            IsPrintFormulaText() const;
-    void            SetPrintFormulaText( BOOL bVal );
-    BOOL            IsPrintFrame() const;
-    void            SetPrintFrame( BOOL bVal );
+    void                SetStandardFormat( const SmFormat &rFormat, bool bSaveFontFormatList = false );
+
+    bool            IsPrintTitle() const;
+    void            SetPrintTitle( bool bVal );
+    bool            IsPrintFormulaText() const;
+    void            SetPrintFormulaText( bool bVal );
+    bool            IsPrintFrame() const;
+    void            SetPrintFrame( bool bVal );
     SmPrintSize     GetPrintSize() const;
     void            SetPrintSize( SmPrintSize eSize );
     USHORT          GetPrintZoomFactor() const;
     void            SetPrintZoomFactor( USHORT nVal );
 
-    BOOL            IsIgnoreSpacesRight() const;
-    void            SetIgnoreSpacesRight( BOOL bVal );
-    BOOL            IsAutoRedraw() const;
-    void            SetAutoRedraw( BOOL bVal );
-    BOOL            IsShowFormulaCursor() const;
-    void            SetShowFormulaCursor( BOOL bVal );
+    bool            IsIgnoreSpacesRight() const;
+    void            SetIgnoreSpacesRight( bool bVal );
+    bool            IsAutoRedraw() const;
+    void            SetAutoRedraw( bool bVal );
+    bool            IsShowFormulaCursor() const;
+    void            SetShowFormulaCursor( bool bVal );
 };
 
 /////////////////////////////////////////////////////////////////
diff --git a/starmath/source/config.cxx b/starmath/source/config.cxx
index 38fa63429215..c9e36a93b51d 100644
--- a/starmath/source/config.cxx
+++ b/starmath/source/config.cxx
@@ -64,7 +64,7 @@ void SmConfig::ItemSetToConfig(const SfxItemSet &rSet)
     const SfxPoolItem *pItem     = NULL;
 
     UINT16 nU16;
-    BOOL bVal;
+    bool bVal;
     if (rSet.GetItemState(SID_PRINTSIZE, TRUE, &pItem) == SFX_ITEM_SET)
     {   nU16 = ((const SfxUInt16Item *) pItem)->GetValue();
         SetPrintSize( (SmPrintSize) nU16 );
diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx
index 5613c3ba3a68..94b9e386ea95 100644
--- a/starmath/source/cursor.cxx
+++ b/starmath/source/cursor.cxx
@@ -29,19 +29,20 @@
 #include "visitors.hxx"
 #include "document.hxx"
 #include "view.hxx"
+#include "accessibility.hxx"
 
 void SmCursor::Move(OutputDevice* pDev, SmMovementDirection direction, bool bMoveAnchor){
     SmCaretPosGraphEntry* NewPos = NULL;
     switch(direction){
         case MoveLeft:
         {
-            //If position->Left is NULL, we want NewPos = NULL anyway...
             NewPos = position->Left;
+            j_assert(NewPos, "NewPos shouldn't be NULL here!");
         }break;
         case MoveRight:
         {
-            //If position->Right is NULL, we want NewPos = NULL anyway...
             NewPos = position->Right;
+            j_assert(NewPos, "NewPos shouldn't be NULL here!");
         }break;
         case MoveUp:
             //Implementation is practically identical to MoveDown, except for a single if statement
@@ -177,12 +178,11 @@ bool SmCursor::SetCaretPosition(SmCaretPos pos, bool moveAnchor){
 
 void SmCursor::AnnotateSelection(){
     //TODO: Manage a state, reset it upon modification and optimize this call
-    SmSetSelectionVisitor SSV(anchor->CaretPos, position->CaretPos);
-    pTree->Accept(&SSV);
+    SmSetSelectionVisitor(anchor->CaretPos, position->CaretPos, pTree);
 }
 
-void SmCursor::Draw(OutputDevice& pDev, Point Offset){
-    SmCaretDrawingVisitor(pDev, GetPosition(), Offset);
+void SmCursor::Draw(OutputDevice& pDev, Point Offset, bool isCaretVisible){
+    SmCaretDrawingVisitor(pDev, GetPosition(), Offset, isCaretVisible);
 }
 
 void SmCursor::Delete(){
@@ -202,6 +202,7 @@ void SmCursor::Delete(){
 
     //Find the topmost node of the line that holds the selection
     SmNode* pLine = FindTopMostNodeInLine(pSNode, true);
+    j_assert(pLine != pTree, "Shouldn't be able to select the entire tree");
 
     //Get the parent of the line
     SmStructureNode* pLineParent = pLine->GetParent();
@@ -481,7 +482,7 @@ void SmCursor::InsertSubSup(SmSubSup eSubSup) {
 
     //Find node that this should be applied to
     SmNode* pSubject;
-    BOOL bPatchLine = pSelectedNodesList->size() > 0; //If the line should be patched later
+    bool bPatchLine = pSelectedNodesList->size() > 0; //If the line should be patched later
     if(it != pLineList->begin()) {
         it--;
         pSubject = *it;
@@ -492,7 +493,7 @@ void SmCursor::InsertSubSup(SmSubSup eSubSup) {
         pSubject->Prepare(pDocShell->GetFormat(), *pDocShell);
         it = pLineList->insert(it, pSubject);
         it++;
-        bPatchLine = TRUE;  //We've modified the line it should be patched later.
+        bPatchLine = true;  //We've modified the line it should be patched later.
     }
 
     //Wrap the subject in a SmSubSupNode
@@ -555,7 +556,7 @@ void SmCursor::InsertSubSup(SmSubSup eSubSup) {
     FinishEdit(pLineList, pLineParent, nParentIndex, PosAfterScript, pScriptLine);
 }
 
-BOOL SmCursor::InsertLimit(SmSubSup eSubSup, BOOL bMoveCaret) {
+bool SmCursor::InsertLimit(SmSubSup eSubSup, bool bMoveCaret) {
     //Find a subject to set limits on
     SmOperNode *pSubject = NULL;
     //Check if pSelectedNode might be a subject
@@ -570,7 +571,7 @@ BOOL SmCursor::InsertLimit(SmSubSup eSubSup, BOOL bMoveCaret) {
 
     //Abort operation if we're not in the appropriate context
     if(!pSubject)
-        return FALSE;
+        return false;
 
     BeginEdit();
 
@@ -591,7 +592,7 @@ BOOL SmCursor::InsertLimit(SmSubSup eSubSup, BOOL bMoveCaret) {
 
     //Create the limit, if needed
     SmCaretPos PosAfterLimit;
-    SmNode *pLine;
+    SmNode *pLine = NULL;
     if(!pSubSup->GetSubSup(eSubSup)){
         pLine = new SmPlaceNode();
         pSubSup->SetSubSup(eSubSup, pLine);
@@ -624,7 +625,7 @@ BOOL SmCursor::InsertLimit(SmSubSup eSubSup, BOOL bMoveCaret) {
 
     EndEdit();
 
-    return TRUE;
+    return true;
 }
 
 void SmCursor::InsertBrackets(SmBracketType eBracketType) {
@@ -697,7 +698,7 @@ void SmCursor::InsertBrackets(SmBracketType eBracketType) {
     FinishEdit(pLineList, pLineParent, nParentIndex, PosAfterInsert);
 }
 
-SmNode *SmCursor::CreateBracket(SmBracketType eBracketType, BOOL bIsLeft) {
+SmNode *SmCursor::CreateBracket(SmBracketType eBracketType, bool bIsLeft) {
     SmToken aTok;
     if(bIsLeft){
         switch(eBracketType){
@@ -771,7 +772,7 @@ SmNode *SmCursor::CreateBracket(SmBracketType eBracketType, BOOL bIsLeft) {
     return pRetVal;
 }
 
-BOOL SmCursor::InsertRow() {
+bool SmCursor::InsertRow() {
     AnnotateSelection();
 
     //Find line
@@ -808,7 +809,7 @@ BOOL SmCursor::InsertRow() {
 
     //If we're not in a context that supports InsertRow, return FALSE
     if(!pTable && !pMatrix)
-        return FALSE;
+        return false;
 
     //Now we start editing
     BeginEdit();
@@ -893,7 +894,7 @@ BOOL SmCursor::InsertRow() {
     //FinishEdit is actually used to handle siturations where parent is an instance of
     //SmSubSupNode. In this case parent should always be a table or matrix, however, for
     //code reuse we just use FinishEdit() here too.
-    return TRUE;
+    return true;
 }
 
 void SmCursor::InsertFraction() {
@@ -1108,14 +1109,14 @@ void SmCursor::InsertCommand(USHORT nCommand) {
             InsertRow();
             break;
         case RID_FROMX:
-            InsertLimit(CSUB, TRUE);
+            InsertLimit(CSUB, true);
             break;
         case RID_TOX:
-            InsertLimit(CSUP, TRUE);
+            InsertLimit(CSUP, true);
             break;
         case RID_FROMXTOY:
-            if(InsertLimit(CSUB, FALSE))
-                InsertLimit(CSUP, TRUE);
+            if(InsertLimit(CSUB, true))
+                InsertLimit(CSUP, true);
             break;
         default:
             InsertCommandText(SmResId(nCommand));
@@ -1226,19 +1227,18 @@ SmNode* SmCursor::FindTopMostNodeInLine(SmNode* pSNode, bool MoveUpIfSelected){
         return NULL;
 
     //Move up parent untill we find a node who's
-    //parent isn't selected and not a type of:
+    //parent is NULL or isn't selected and not a type of:
     //      SmExpressionNode
+    //      SmLineNode
     //      SmBinHorNode
     //      SmUnHorNode
     //      SmAlignNode
     //      SmFontNode
-    while((MoveUpIfSelected && pSNode->GetParent()->IsSelected()) ||
-          IsLineCompositionNode(pSNode->GetParent())){
+    while(pSNode->GetParent() &&
+          ((MoveUpIfSelected &&
+            pSNode->GetParent()->IsSelected()) ||
+           IsLineCompositionNode(pSNode->GetParent())))
         pSNode = pSNode->GetParent();
-        j_assert(pSNode, "pSNode shouldn't be NULL, have we hit root node if so, this is bad!");
-        if(!pSNode) //I've got to do something, nothing is probably the best solution :)
-            return NULL;
-    }
     //Now we have the selection line node
     return pSNode;
 }
@@ -1259,6 +1259,7 @@ SmNodeList* SmCursor::LineToList(SmStructureNode* pLine, SmNodeList* list){
     SmNodeIterator it(pLine);
     while(it.Next()){
         switch(it->GetType()){
+            case NLINE:
             case NUNHOR:
             case NEXPRESSION:
             case NBINHOR:
@@ -1304,6 +1305,7 @@ SmNodeList* SmCursor::CloneLineToList(SmStructureNode* pLine, bool bOnlyIfSelect
 
 bool SmCursor::IsLineCompositionNode(SmNode* pNode){
     switch(pNode->GetType()){
+        case NLINE:
         case NUNHOR:
         case NEXPRESSION:
         case NBINHOR:
@@ -1577,7 +1579,7 @@ SmNode* SmNodeListParser::Error(){
     return new SmErrorNode(PE_UNEXPECTED_TOKEN, SmToken());
 }
 
-BOOL SmNodeListParser::IsOperator(const SmToken &token) {
+bool SmNodeListParser::IsOperator(const SmToken &token) {
     return  IsRelationOperator(token) ||
             IsSumOperator(token) ||
             IsProductOperator(token) ||
@@ -1585,15 +1587,15 @@ BOOL SmNodeListParser::IsOperator(const SmToken &token) {
             IsPostfixOperator(token);
 }
 
-BOOL SmNodeListParser::IsRelationOperator(const SmToken &token) {
+bool SmNodeListParser::IsRelationOperator(const SmToken &token) {
     return token.nGroup & TGRELATION;
 }
 
-BOOL SmNodeListParser::IsSumOperator(const SmToken &token) {
+bool SmNodeListParser::IsSumOperator(const SmToken &token) {
     return token.nGroup & TGSUM;
 }
 
-BOOL SmNodeListParser::IsProductOperator(const SmToken &token) {
+bool SmNodeListParser::IsProductOperator(const SmToken &token) {
     return token.nGroup & TGPRODUCT &&
            token.eType != TWIDESLASH &&
            token.eType != TWIDEBACKSLASH &&
@@ -1602,7 +1604,7 @@ BOOL SmNodeListParser::IsProductOperator(const SmToken &token) {
            token.eType != TOVER;
 }
 
-BOOL SmNodeListParser::IsUnaryOperator(const SmToken &token) {
+bool SmNodeListParser::IsUnaryOperator(const SmToken &token) {
     return  token.nGroup & TGUNOPER &&
             (token.eType == TPLUS ||
              token.eType == TMINUS ||
@@ -1612,6 +1614,6 @@ BOOL SmNodeListParser::IsUnaryOperator(const SmToken &token) {
              token.eType == TUOPER);
 }
 
-BOOL SmNodeListParser::IsPostfixOperator(const SmToken &token) {
+bool SmNodeListParser::IsPostfixOperator(const SmToken &token) {
     return token.eType == TFACT;
 }
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index e69c0c31fa09..ddddc7fb1664 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -100,7 +100,7 @@ SmFontStyles::SmFontStyles() :
 const String & SmFontStyles::GetStyleName( const Font &rFont ) const
 {
     //! compare also SmSpecialNode::Prepare
-    BOOL bBold   = IsBold( rFont ),
+    bool bBold   = IsBold( rFont ),
          bItalic = IsItalic( rFont );
 
     if (bBold && bItalic)
@@ -215,7 +215,7 @@ BOOL SmPrintOptionsTabPage::FillItemSet(SfxItemSet& rSet)
     rSet.Put(SfxBoolItem(GetWhich(SID_PRINTFRAME), aFrame.IsChecked()));
     rSet.Put(SfxBoolItem(GetWhich(SID_NO_RIGHT_SPACES), aNoRightSpaces.IsChecked()));
 
-    return TRUE;
+    return true;
 }
 
 
@@ -324,7 +324,7 @@ void SmFontDialog::SetFont(const Font &rFont)
 
 
 SmFontDialog::SmFontDialog(Window * pParent,
-        OutputDevice *pFntListDevice, BOOL bHideCheckboxes, BOOL bFreeRes)
+        OutputDevice *pFntListDevice, bool bHideCheckboxes, bool bFreeRes)
     : ModalDialog(pParent,SmResId(RID_FONTDIALOG)),
     aFixedText1     (this, SmResId(1)),
     aFontBox        (this, SmResId(1)),
@@ -353,7 +353,7 @@ SmFontDialog::SmFontDialog(Window * pParent,
         Face.SetFamily(FAMILY_DONTKNOW);
         Face.SetPitch(PITCH_DONTKNOW);
         Face.SetCharSet(RTL_TEXTENCODING_DONTKNOW);
-        Face.SetTransparent(TRUE);
+        Face.SetTransparent(true);
 
         InitColor_Impl();
 
@@ -368,13 +368,13 @@ SmFontDialog::SmFontDialog(Window * pParent,
 
     if (bHideCheckboxes)
     {
-        aBoldCheckBox.Check( FALSE );
-        aBoldCheckBox.Enable( FALSE );
-        aBoldCheckBox.Show( FALSE );
-        aItalicCheckBox.Check( FALSE );
-        aItalicCheckBox.Enable( FALSE );
-        aItalicCheckBox.Show( FALSE );
-        aFixedText2.Show( FALSE );
+        aBoldCheckBox.Check( false );
+        aBoldCheckBox.Enable( false );
+        aBoldCheckBox.Show( false );
+        aItalicCheckBox.Check( false );
+        aItalicCheckBox.Enable( false );
+        aItalicCheckBox.Show( false );
+        aFixedText2.Show( false );
 
         Size  aSize( aFontBox.GetSizePixel() );
         long nComboBoxBottom = aFontBox.GetPosPixel().Y() + aFontBox.GetSizePixel().Height();
@@ -435,7 +435,7 @@ IMPL_LINK( SmFontSizeDialog, DefaultButtonClickHdl, Button *, EMPTYARG /*pButton
 }
 
 
-SmFontSizeDialog::SmFontSizeDialog(Window * pParent, BOOL bFreeRes)
+SmFontSizeDialog::SmFontSizeDialog(Window * pParent, bool bFreeRes)
     : ModalDialog(pParent, SmResId(RID_FONTSIZEDIALOG)),
     aFixedText1(this, SmResId(1)),
     aBaseSize(this, SmResId(1)),
@@ -500,16 +500,16 @@ IMPL_LINK( SmFontTypeDialog, MenuSelectHdl, Menu *, pMenu )
 {
     SmFontPickListBox *pActiveListBox;
 
-    BOOL bHideCheckboxes = FALSE;
+    bool bHideCheckboxes = false;
     switch (pMenu->GetCurItemId())
     {
         case 1: pActiveListBox = &aVariableFont; break;
         case 2: pActiveListBox = &aFunctionFont; break;
         case 3: pActiveListBox = &aNumberFont;   break;
         case 4: pActiveListBox = &aTextFont;     break;
-        case 5: pActiveListBox = &aSerifFont; bHideCheckboxes = TRUE;   break;
-        case 6: pActiveListBox = &aSansFont;  bHideCheckboxes = TRUE;   break;
-        case 7: pActiveListBox = &aFixedFont; bHideCheckboxes = TRUE;   break;
+        case 5: pActiveListBox = &aSerifFont; bHideCheckboxes = true;   break;
+        case 6: pActiveListBox = &aSansFont;  bHideCheckboxes = true;   break;
+        case 7: pActiveListBox = &aFixedFont; bHideCheckboxes = true;   break;
         default:pActiveListBox = NULL;
     }
 
@@ -534,7 +534,7 @@ IMPL_LINK_INLINE_START( SmFontTypeDialog, DefaultButtonClickHdl, Button *, EMPTY
         SmModule *pp = SM_MOD();
         SmFormat aFmt( pp->GetConfig()->GetStandardFormat() );
         WriteTo( aFmt );
-        pp->GetConfig()->SetStandardFormat( aFmt, TRUE );
+        pp->GetConfig()->SetStandardFormat( aFmt, true );
     }
 
     delete pQueryBox;
@@ -543,7 +543,7 @@ IMPL_LINK_INLINE_START( SmFontTypeDialog, DefaultButtonClickHdl, Button *, EMPTY
 IMPL_LINK_INLINE_END( SmFontTypeDialog, DefaultButtonClickHdl, Button *, pButton )
 
 
-SmFontTypeDialog::SmFontTypeDialog(Window * pParent, OutputDevice *pFntListDevice, BOOL bFreeRes)
+SmFontTypeDialog::SmFontTypeDialog(Window * pParent, OutputDevice *pFntListDevice, bool bFreeRes)
     : ModalDialog(pParent, SmResId(RID_FONTTYPEDIALOG)),
     aFixedText1    (this, SmResId(1)),
     aVariableFont  (this, SmResId(1)),
@@ -654,8 +654,7 @@ static const FieldMinMax pMinMaxData[10][4] =
 };
 
 SmCategoryDesc::SmCategoryDesc(const ResId& rResId, USHORT nCategoryIdx) :
-    Resource(rResId),
-    bIsHighContrast(FALSE)
+    Resource(rResId)
 {
     if (IsAvailableRes(ResId(1,*rResId.GetResMgr()).SetRT(RSC_STRING)))
     {
@@ -670,13 +669,11 @@ SmCategoryDesc::SmCategoryDesc(const ResId& rResId, USHORT nCategoryIdx) :
             {
                 Strings  [i] = new XubString(ResId(nI2,*rResId.GetResMgr()));
                 Graphics [i] = new Bitmap(ResId(10*nI2,*rResId.GetResMgr()));
-                GraphicsH[i] = new Bitmap(ResId(10*nI2+1,*rResId.GetResMgr()));
             }
             else
             {
                 Strings  [i] = 0;
                 Graphics [i] = 0;
-                GraphicsH[i] = 0;
             }
         }
 
@@ -698,7 +695,6 @@ SmCategoryDesc::~SmCategoryDesc()
     {
         delete Strings  [i];
         delete Graphics [i];
-        delete GraphicsH[i];
     }
 }
 
@@ -754,7 +750,7 @@ IMPL_LINK( SmDistanceDialog, CheckBoxClickHdl, CheckBox *, pCheckBox )
     {
         aCheckBox1.Toggle();
 
-        BOOL bChecked = aCheckBox1.IsChecked();
+        bool bChecked = aCheckBox1.IsChecked();
         aFixedText4  .Enable( bChecked );
         aMetricField4.Enable( bChecked );
     }
@@ -837,12 +833,12 @@ void SmDistanceDialog::SetCategory(USHORT nCategory)
         if (nActiveCategory == 5)
             bScaleAllBrackets = aCheckBox1.IsChecked();
 
-        aMenuButton.GetPopupMenu()->CheckItem(nActiveCategory + 1, FALSE);
+        aMenuButton.GetPopupMenu()->CheckItem(nActiveCategory + 1, false);
     }
 
     // aktivieren/deaktivieren der zugehoerigen Controls in Abhaengigkeit von der
     // gewaehlten Kategorie.
-    BOOL  bActive;
+    bool  bActive;
     for (USHORT i = 0;  i < 4;  i++)
     {
         FixedText   *pFT = (FixedText * const)   aWin[i][0];
@@ -895,12 +891,12 @@ void SmDistanceDialog::SetCategory(USHORT nCategory)
     {
         aCheckBox1.Check( bScaleAllBrackets );
 
-        BOOL bChecked = aCheckBox1.IsChecked();
+        bool bChecked = aCheckBox1.IsChecked();
         aFixedText4  .Enable( bChecked );
         aMetricField4.Enable( bChecked );
     }
 
-    aMenuButton.GetPopupMenu()->CheckItem(nCategory + 1, TRUE);
+    aMenuButton.GetPopupMenu()->CheckItem(nCategory + 1, true);
     aFixedLine.SetText(Categories[nCategory]->GetName());
 
     nActiveCategory = nCategory;
@@ -911,7 +907,7 @@ void SmDistanceDialog::SetCategory(USHORT nCategory)
 }
 
 
-SmDistanceDialog::SmDistanceDialog(Window *pParent, BOOL bFreeRes)
+SmDistanceDialog::SmDistanceDialog(Window *pParent, bool bFreeRes)
     : ModalDialog(pParent, SmResId(RID_DISTANCEDIALOG)),
     aFixedText1    (this, SmResId(1)),
     aMetricField1  (this, SmResId(1)),
@@ -932,13 +928,11 @@ SmDistanceDialog::SmDistanceDialog(Window *pParent, BOOL bFreeRes)
     for (USHORT i = 0; i < NOCATEGORIES; i++)
         Categories[i] = new SmCategoryDesc(SmResId(i + 1), i);
     nActiveCategory   = CATEGORY_NONE;
-    bScaleAllBrackets = FALSE;
+    bScaleAllBrackets = false;
 
     if (bFreeRes)
         FreeResource();
 
-    ApplyImages();
-
     // preview like controls should have a 2D look
     aBitmap.SetBorderStyle( WINDOW_BORDER_MONO );
 
@@ -960,22 +954,8 @@ SmDistanceDialog::~SmDistanceDialog()
         DELETEZ(Categories[i]);
 }
 
-void SmDistanceDialog::ApplyImages()
-{
-    BOOL bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-    for (int i = 0;  i < NOCATEGORIES;  ++i)
-    {
-        SmCategoryDesc *pCat = Categories[i];
-        if (pCat)
-            pCat->SetHighContrast( bHighContrast );
-    }
-}
-
 void SmDistanceDialog::DataChanged( const DataChangedEvent &rEvt )
 {
-    if ( (rEvt.GetType() == DATACHANGED_SETTINGS) && (rEvt.GetFlags() & SETTINGS_STYLE) )
-            ApplyImages();
-
     ModalDialog::DataChanged( rEvt );
 }
 
@@ -1072,7 +1052,7 @@ IMPL_LINK( SmAlignDialog, DefaultButtonClickHdl, Button *, EMPTYARG /*pButton*/
 }
 
 
-SmAlignDialog::SmAlignDialog(Window * pParent, BOOL bFreeRes)
+SmAlignDialog::SmAlignDialog(Window * pParent, bool bFreeRes)
     : ModalDialog(pParent, SmResId(RID_ALIGNDIALOG)),
     aLeft          (this, SmResId(1)),
     aCenter        (this, SmResId(2)),
@@ -1094,21 +1074,21 @@ void SmAlignDialog::ReadFrom(const SmFormat &rFormat)
     switch (rFormat.GetHorAlign())
     {
         case AlignLeft:
-            aLeft  .Check(TRUE);
-            aCenter.Check(FALSE);
-            aRight .Check(FALSE);
+            aLeft  .Check(true);
+            aCenter.Check(false);
+            aRight .Check(false);
             break;
 
         case AlignCenter:
-            aLeft  .Check(FALSE);
-            aCenter.Check(TRUE);
-            aRight .Check(FALSE);
+            aLeft  .Check(false);
+            aCenter.Check(true);
+            aRight .Check(false);
             break;
 
         case AlignRight:
-            aLeft  .Check(FALSE);
-            aCenter.Check(FALSE);
-            aRight .Check(TRUE);
+            aLeft  .Check(false);
+            aCenter.Check(false);
+            aRight .Check(true);
             break;
     }
 }
@@ -1261,7 +1241,7 @@ SmShowSymbolSet::SmShowSymbolSet(Window *pParent, const ResId& rResId) :
 
     aVScrollBar.SetPosSizePixel(Point(aOutputSize.Width() + 1, -1),
                                 Size(nScrollBarWidth, aOutputSize.Height() + 2));
-    aVScrollBar.Enable(FALSE);
+    aVScrollBar.Enable(false);
     aVScrollBar.Show();
     aVScrollBar.SetScrollHdl(LINK(this, SmShowSymbolSet, ScrollHdl));
 
@@ -1279,12 +1259,12 @@ void SmShowSymbolSet::SetSymbolSet(const SymbolPtrVec_t& rSymbolSet)
     if (static_cast< USHORT >(aSymbolSet.size()) > (nColumns * nRows))
     {
         aVScrollBar.SetRange(Range(0, ((aSymbolSet.size() + (nColumns - 1)) / nColumns) - nRows));
-        aVScrollBar.Enable(TRUE);
+        aVScrollBar.Enable(true);
     }
     else
     {
         aVScrollBar.SetRange(Range(0,0));
-        aVScrollBar.Enable (FALSE);
+        aVScrollBar.Enable (false);
     }
 
     Invalidate();
@@ -1370,7 +1350,7 @@ void SmShowSymbol::SetSymbol(const SmSym *pSymbol)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-void SmSymbolDialog::FillSymbolSets(BOOL bDeleteText)
+void SmSymbolDialog::FillSymbolSets(bool bDeleteText)
     // fuellt die Eintraege der moeglichen 'SymbolsSet's im Dialog mit den
     // aktuellen Werten des SymbolSet Managers, selektiert aber keinen.
 {
@@ -1501,14 +1481,14 @@ IMPL_LINK_INLINE_START( SmSymbolDialog, CloseClickHdl, Button *, EMPTYARG pButto
     OSL_ENSURE(pButton == &aCloseBtn, "Sm : wrong button");
 #endif
 
-    EndDialog(TRUE);
+    EndDialog(true);
     return 0;
 }
 IMPL_LINK_INLINE_END( SmSymbolDialog, CloseClickHdl, Button *, pButton )
 
 
 SmSymbolDialog::SmSymbolDialog(Window *pParent, OutputDevice *pFntListDevice,
-        SmSymbolManager &rMgr, SmViewShell &rViewShell, BOOL bFreeRes) :
+        SmSymbolManager &rMgr, SmViewShell &rViewShell, bool bFreeRes) :
     ModalDialog         (pParent, SmResId(RID_SYMBOLDIALOG)),
     aSymbolSetText      (this, SmResId(1)),
     aSymbolSets         (this, SmResId(1)),
@@ -1585,9 +1565,9 @@ void SmSymbolDialog::DataChanged( const DataChangedEvent& rDCEvt )
 }
 
 
-BOOL SmSymbolDialog::SelectSymbolSet(const XubString &rSymbolSetName)
+bool SmSymbolDialog::SelectSymbolSet(const XubString &rSymbolSetName)
 {
-    BOOL    bRet = FALSE;
+    bool    bRet = false;
     USHORT  nPos = aSymbolSets.GetEntryPos(rSymbolSetName);
 
     aSymbolSetName = String();
@@ -1606,7 +1586,7 @@ BOOL SmSymbolDialog::SelectSymbolSet(const XubString &rSymbolSetName)
         if (aSymbolSet.size() > 0)
             SelectSymbol(0);
 
-        bRet = TRUE;
+        bRet = true;
     }
     else
         aSymbolSets.SetNoSelection();
@@ -1669,7 +1649,7 @@ void SmShowChar::SetFont(const Font &rFont)
 
     aFont.SetSize(aSize);
     aFont.SetAlign(ALIGN_TOP);
-    aFont.SetTransparent(TRUE);
+    aFont.SetTransparent(true);
     Control::SetFont(aFont);
 
     // keep text color (new font may have different one)
@@ -1680,7 +1660,7 @@ void SmShowChar::SetFont(const Font &rFont)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-void SmSymDefineDialog::FillSymbols(ComboBox &rComboBox, BOOL bDeleteText)
+void SmSymDefineDialog::FillSymbols(ComboBox &rComboBox, bool bDeleteText)
 {
 #if OSL_DEBUG_LEVEL > 1
     OSL_ENSURE(&rComboBox == &aOldSymbols  ||  &rComboBox == &aSymbols,
@@ -1698,7 +1678,7 @@ void SmSymDefineDialog::FillSymbols(ComboBox &rComboBox, BOOL bDeleteText)
 }
 
 
-void SmSymDefineDialog::FillSymbolSets(ComboBox &rComboBox, BOOL bDeleteText)
+void SmSymDefineDialog::FillSymbolSets(ComboBox &rComboBox, bool bDeleteText)
 {
 #if OSL_DEBUG_LEVEL > 1
     OSL_ENSURE(&rComboBox == &aOldSymbolSets  ||  &rComboBox == &aSymbolSets,
@@ -1716,7 +1696,7 @@ void SmSymDefineDialog::FillSymbolSets(ComboBox &rComboBox, BOOL bDeleteText)
 }
 
 
-void SmSymDefineDialog::FillFonts(BOOL bDelete)
+void SmSymDefineDialog::FillFonts(bool bDelete)
 {
     aFonts.Clear();
     if (bDelete)
@@ -1734,7 +1714,7 @@ void SmSymDefineDialog::FillFonts(BOOL bDelete)
 }
 
 
-void SmSymDefineDialog::FillStyles(BOOL bDeleteText)
+void SmSymDefineDialog::FillStyles(bool bDeleteText)
 {
     aStyles.Clear();
     if (bDeleteText)
@@ -1772,7 +1752,7 @@ IMPL_LINK( SmSymDefineDialog, OldSymbolChangeHdl, ComboBox *, EMPTYARG pComboBox
 #if OSL_DEBUG_LEVEL > 1
     OSL_ENSURE(pComboBox == &aOldSymbols, "Sm : wrong argument");
 #endif
-    SelectSymbol(aOldSymbols, aOldSymbols.GetText(), FALSE);
+    SelectSymbol(aOldSymbols, aOldSymbols.GetText(), false);
     return 0;
 }
 
@@ -1783,7 +1763,7 @@ IMPL_LINK( SmSymDefineDialog, OldSymbolSetChangeHdl, ComboBox *, EMPTYARG pCombo
 #if OSL_DEBUG_LEVEL > 1
     OSL_ENSURE(pComboBox == &aOldSymbolSets, "Sm : wrong argument");
 #endif
-    SelectSymbolSet(aOldSymbolSets, aOldSymbolSets.GetText(), FALSE);
+    SelectSymbolSet(aOldSymbolSets, aOldSymbolSets.GetText(), false);
     return 0;
 }
 
@@ -1794,18 +1774,18 @@ IMPL_LINK( SmSymDefineDialog, ModifyHdl, ComboBox *, pComboBox )
     Selection  aSelection (pComboBox->GetSelection());
 
     if (pComboBox == &aSymbols)
-        SelectSymbol(aSymbols, aSymbols.GetText(), FALSE);
+        SelectSymbol(aSymbols, aSymbols.GetText(), false);
     else if (pComboBox == &aSymbolSets)
-        SelectSymbolSet(aSymbolSets, aSymbolSets.GetText(), FALSE);
+        SelectSymbolSet(aSymbolSets, aSymbolSets.GetText(), false);
     else if (pComboBox == &aOldSymbols)
         // nur Namen aus der Liste erlauben
-        SelectSymbol(aOldSymbols, aOldSymbols.GetText(), TRUE);
+        SelectSymbol(aOldSymbols, aOldSymbols.GetText(), true);
     else if (pComboBox == &aOldSymbolSets)
         // nur Namen aus der Liste erlauben
-        SelectSymbolSet(aOldSymbolSets, aOldSymbolSets.GetText(), TRUE);
+        SelectSymbolSet(aOldSymbolSets, aOldSymbolSets.GetText(), true);
     else if (pComboBox == &aStyles)
         // nur Namen aus der Liste erlauben (ist hier eh immer der Fall)
-        SelectStyle(aStyles.GetText(), TRUE);
+        SelectStyle(aStyles.GetText(), true);
     else
     {
 #if OSL_DEBUG_LEVEL > 1
@@ -1907,10 +1887,10 @@ IMPL_LINK( SmSymDefineDialog, AddClickHdl, Button *, EMPTYARG pButton )
     aSymbolSetName.SetText( aNewSymbol.GetSymbolSetName() );
 
     // update list box entries
-    FillSymbolSets(aOldSymbolSets, FALSE);
-    FillSymbolSets(aSymbolSets,    FALSE);
-    FillSymbols(aOldSymbols ,FALSE);
-    FillSymbols(aSymbols    ,FALSE);
+    FillSymbolSets(aOldSymbolSets, false);
+    FillSymbolSets(aSymbolSets,    false);
+    FillSymbols(aOldSymbols ,false);
+    FillSymbols(aSymbols    ,false);
 
     UpdateButtons();
 
@@ -1951,10 +1931,10 @@ IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, EMPTYARG pButton )
     aSymbolSetName.SetText( aNewSymbol.GetSymbolSetName() );
 
     // update list box entries
-    FillSymbolSets(aOldSymbolSets, FALSE);
-    FillSymbolSets(aSymbolSets,    FALSE);
-    FillSymbols(aOldSymbols ,FALSE);
-    FillSymbols(aSymbols    ,FALSE);
+    FillSymbolSets(aOldSymbolSets, false);
+    FillSymbolSets(aSymbolSets,    false);
+    FillSymbols(aOldSymbols ,false);
+    FillSymbols(aSymbols    ,false);
 
     UpdateButtons();
 
@@ -1978,10 +1958,10 @@ IMPL_LINK( SmSymDefineDialog, DeleteClickHdl, Button *, EMPTYARG pButton )
         SetOrigSymbol(NULL, XubString());
 
         // update list box entries
-        FillSymbolSets(aOldSymbolSets, FALSE);
-        FillSymbolSets(aSymbolSets,    FALSE);
-        FillSymbols(aOldSymbols ,FALSE);
-        FillSymbols(aSymbols    ,FALSE);
+        FillSymbolSets(aOldSymbolSets, false);
+        FillSymbolSets(aSymbolSets,    false);
+        FillSymbols(aOldSymbols ,false);
+        FillSymbols(aSymbols    ,false);
     }
 
     UpdateButtons();
@@ -1992,9 +1972,9 @@ IMPL_LINK( SmSymDefineDialog, DeleteClickHdl, Button *, EMPTYARG pButton )
 
 void SmSymDefineDialog::UpdateButtons()
 {
-    BOOL  bAdd    = FALSE,
-          bChange = FALSE,
-          bDelete = FALSE,
+    bool  bAdd    = false,
+          bChange = false,
+          bDelete = false,
           bEqual;
     XubString aTmpSymbolName    (aSymbols.GetText()),
               aTmpSymbolSetName (aSymbolSets.GetText());
@@ -2029,7 +2009,7 @@ void SmSymDefineDialog::UpdateButtons()
 
 
 SmSymDefineDialog::SmSymDefineDialog(Window * pParent,
-        OutputDevice *pFntListDevice, SmSymbolManager &rMgr, BOOL bFreeRes) :
+        OutputDevice *pFntListDevice, SmSymbolManager &rMgr, bool bFreeRes) :
     ModalDialog         (pParent, SmResId(RID_SYMDEFINEDIALOG)),
     aOldSymbolText      (this, SmResId(1)),
     aOldSymbols         (this, SmResId(1)),
@@ -2059,7 +2039,6 @@ SmSymDefineDialog::SmSymDefineDialog(Window * pParent,
     aDeleteBtn          (this, SmResId(3)),
     aRightArrow         (this, SmResId(1)),
     aRigthArrow_Im      (SmResId(1)),
-    aRigthArrow_Im_HC   (SmResId(2)),   // hi-contrast version
     rSymbolMgr          (rMgr),
     pSubsetMap          (NULL),
     pFontList           (NULL)
@@ -2073,8 +2052,8 @@ SmSymDefineDialog::SmSymDefineDialog(Window * pParent,
 
     // auto completion is troublesome since that symbols character also gets automatically selected in the
     // display and if the user previously selected a character to define/redefine that one this is bad
-   aOldSymbols.EnableAutocomplete( FALSE, TRUE );
-   aSymbols   .EnableAutocomplete( FALSE, TRUE );
+   aOldSymbols.EnableAutocomplete( false, true );
+   aSymbols   .EnableAutocomplete( false, true );
 
     FillFonts();
     if (aFonts.GetEntryCount() > 0)
@@ -2118,7 +2097,7 @@ void SmSymDefineDialog::InitColor_Impl()
 #endif
     ColorData   nBgCol  = COL_WHITE,
                 nTxtCol = COL_BLACK;
-    BOOL bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
+    bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
     if (bHighContrast)
     {
         const StyleSettings &rS = GetSettings().GetStyleSettings();
@@ -2136,7 +2115,7 @@ void SmSymDefineDialog::InitColor_Impl()
     aSymbolDisplay   .SetBackground( aWall );
     aSymbolDisplay   .SetTextColor( aTxtColor );
 
-    const Image &rArrowRight = bHighContrast ? aRigthArrow_Im_HC : aRigthArrow_Im;
+    const Image &rArrowRight = aRigthArrow_Im;
     aRightArrow.SetImage( rArrowRight );
 }
 
@@ -2170,9 +2149,9 @@ void SmSymDefineDialog::SetSymbolSetManager(const SmSymbolManager &rMgr)
 //        USHORT nS = aSymbolMgrCopy.GetSymbolSetCount();
 #endif
 
-    // Das modified Flag der Kopie auf FALSE setzen, damit man spaeter damit
+    // Das modified Flag der Kopie auf false setzen, damit man spaeter damit
     // testen kann ob sich was geaendert hat.
-    aSymbolMgrCopy.SetModified(FALSE);
+    aSymbolMgrCopy.SetModified(false);
 
     FillSymbolSets(aOldSymbolSets);
     if (aOldSymbolSets.GetEntryCount() > 0)
@@ -2191,8 +2170,8 @@ void SmSymDefineDialog::SetSymbolSetManager(const SmSymbolManager &rMgr)
 }
 
 
-BOOL SmSymDefineDialog::SelectSymbolSet(ComboBox &rComboBox,
-        const XubString &rSymbolSetName, BOOL bDeleteText)
+bool SmSymDefineDialog::SelectSymbolSet(ComboBox &rComboBox,
+        const XubString &rSymbolSetName, bool bDeleteText)
 {
 #if OSL_DEBUG_LEVEL > 1
     OSL_ENSURE(&rComboBox == &aOldSymbolSets  ||  &rComboBox == &aSymbolSets,
@@ -2206,18 +2185,18 @@ BOOL SmSymDefineDialog::SelectSymbolSet(ComboBox &rComboBox,
     // und evtl Abweichungen in der Eingabe beseitigen
     rComboBox.SetText(aNormName);
 
-    BOOL   bRet = FALSE;
+    bool   bRet = false;
     USHORT nPos = rComboBox.GetEntryPos(aNormName);
 
     if (nPos != COMBOBOX_ENTRY_NOTFOUND)
     {
         rComboBox.SetText(rComboBox.GetEntry(nPos));
-        bRet = TRUE;
+        bRet = true;
     }
     else if (bDeleteText)
         rComboBox.SetText(XubString());
 
-    BOOL  bIsOld = &rComboBox == &aOldSymbolSets;
+    bool  bIsOld = &rComboBox == &aOldSymbolSets;
 
     // setzen des SymbolSet Namens an der zugehoerigen Darstellung
     FixedText &rFT = bIsOld ? aOldSymbolSetName : aSymbolSetName;
@@ -2226,7 +2205,7 @@ BOOL SmSymDefineDialog::SelectSymbolSet(ComboBox &rComboBox,
     // setzen der zum SymbolSet gehoerenden Symbol Namen an der zugehoerigen
     // Auswahbox
     ComboBox  &rCB = bIsOld ? aOldSymbols : aSymbols;
-    FillSymbols(rCB, FALSE);
+    FillSymbols(rCB, false);
 
     // bei Wechsel des SymbolSets fuer das alte Zeichen ein gueltiges
     // Symbol bzw keins zur Anzeige bringen
@@ -2235,7 +2214,7 @@ BOOL SmSymDefineDialog::SelectSymbolSet(ComboBox &rComboBox,
         XubString  aTmpOldSymbolName;
         if (aOldSymbols.GetEntryCount() > 0)
             aTmpOldSymbolName = aOldSymbols.GetEntry(0);
-        SelectSymbol(aOldSymbols, aTmpOldSymbolName, TRUE);
+        SelectSymbol(aOldSymbols, aTmpOldSymbolName, true);
     }
 
     UpdateButtons();
@@ -2273,8 +2252,8 @@ void SmSymDefineDialog::SetOrigSymbol(const SmSym *pSymbol,
 }
 
 
-BOOL SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox,
-        const XubString &rSymbolName, BOOL bDeleteText)
+bool SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox,
+        const XubString &rSymbolName, bool bDeleteText)
 {
 #if OSL_DEBUG_LEVEL > 1
     OSL_ENSURE(&rComboBox == &aOldSymbols  ||  &rComboBox == &aSymbols,
@@ -2287,10 +2266,10 @@ BOOL SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox,
     // und evtl Abweichungen in der Eingabe beseitigen
     rComboBox.SetText(aNormName);
 
-    BOOL   bRet = FALSE;
+    bool   bRet = false;
     USHORT nPos = rComboBox.GetEntryPos(aNormName);
 
-    BOOL  bIsOld = &rComboBox == &aOldSymbols;
+    bool  bIsOld = &rComboBox == &aOldSymbols;
 
     if (nPos != COMBOBOX_ENTRY_NOTFOUND)
     {
@@ -2303,8 +2282,8 @@ BOOL SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox,
             {
                 // Font und Style entsprechend waehlen
                 const Font &rFont = pSymbol->GetFace();
-                SelectFont(rFont.GetName(), FALSE);
-                SelectStyle(GetFontStyles().GetStyleName(rFont), FALSE);
+                SelectFont(rFont.GetName(), false);
+                SelectStyle(GetFontStyles().GetStyleName(rFont), false);
 
                 // da das setzen des Fonts ueber den Style Namen des SymbolsFonts nicht
                 // so gut klappt (er kann zB leer sein obwohl der Font selbst 'bold' und
@@ -2318,7 +2297,7 @@ BOOL SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox,
             }
         }
 
-        bRet = TRUE;
+        bRet = true;
     }
     else if (bDeleteText)
         rComboBox.SetText(XubString());
@@ -2380,9 +2359,9 @@ void SmSymDefineDialog::SetFont(const XubString &rFontName, const XubString &rSt
 }
 
 
-BOOL SmSymDefineDialog::SelectFont(const XubString &rFontName, BOOL bApplyFont)
+bool SmSymDefineDialog::SelectFont(const XubString &rFontName, bool bApplyFont)
 {
-    BOOL   bRet = FALSE;
+    bool   bRet = false;
     USHORT nPos = aFonts.GetEntryPos(rFontName);
 
     if (nPos != LISTBOX_ENTRY_NOTFOUND)
@@ -2392,7 +2371,7 @@ BOOL SmSymDefineDialog::SelectFont(const XubString &rFontName, BOOL bApplyFont)
             SelectStyle(aStyles.GetEntry(0));
         if (bApplyFont)
             SetFont(aFonts.GetSelectEntry(), aStyles.GetText());
-        bRet = TRUE;
+        bRet = true;
     }
     else
         aFonts.SetNoSelection();
@@ -2404,9 +2383,9 @@ BOOL SmSymDefineDialog::SelectFont(const XubString &rFontName, BOOL bApplyFont)
 }
 
 
-BOOL SmSymDefineDialog::SelectStyle(const XubString &rStyleName, BOOL bApplyFont)
+bool SmSymDefineDialog::SelectStyle(const XubString &rStyleName, bool bApplyFont)
 {
-    BOOL   bRet = FALSE;
+    bool   bRet = false;
     USHORT nPos = aStyles.GetEntryPos(rStyleName);
 
     // falls der Style nicht zur Auswahl steht nehmen wir den erst moeglichen
@@ -2419,7 +2398,7 @@ BOOL SmSymDefineDialog::SelectStyle(const XubString &rStyleName, BOOL bApplyFont
         aStyles.SetText(aStyles.GetEntry(nPos));
         if (bApplyFont)
             SetFont(aFonts.GetSelectEntry(), aStyles.GetText());
-        bRet = TRUE;
+        bRet = true;
     }
     else
         aStyles.SetText(XubString());
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index b912903fdff6..7a831f7ccf68 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -99,6 +99,7 @@
 #include <svx/svxids.hrc>
 #include "cursor.hxx"
 #include "visitors.hxx"
+#include "accessibility.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
@@ -133,7 +134,7 @@ void SmDocShell::SFX_NOTIFY(SfxBroadcaster&, const TypeId&,
     switch (((SfxSimpleHint&)rHint).GetId())
     {
         case HINT_FORMATCHANGED:
-            SetFormulaArranged(FALSE);
+            SetFormulaArranged(false);
 
             nModifyCount++;     //! see comment for SID_GAPHIC_SM in SmDocShell::GetState
 
@@ -168,12 +169,12 @@ void SmDocShell::SetText(const String& rBuffer)
 
     if (rBuffer != aText)
     {
-        BOOL bIsEnabled = IsEnableSetModified();
+        bool bIsEnabled = IsEnableSetModified();
         if( bIsEnabled )
-            EnableSetModified( FALSE );
+            EnableSetModified( false );
 
         aText = rBuffer;
-        SetFormulaArranged( FALSE );
+        SetFormulaArranged( false );
 
         Parse();
 
@@ -189,7 +190,7 @@ void SmDocShell::SetText(const String& rBuffer)
 
         if ( bIsEnabled )
             EnableSetModified( bIsEnabled );
-        SetModified(TRUE);
+        SetModified(true);
 
         // launch accessible event if necessary
         SmGraphicAccessible *pAcc = pViewSh ? pViewSh->GetGraphicWindow().GetAccessible_Impl() : 0;
@@ -213,8 +214,8 @@ void SmDocShell::SetFormat(SmFormat& rFormat)
     RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::SetFormat" );
 
     aFormat = rFormat;
-    SetFormulaArranged( FALSE );
-    SetModified( TRUE );
+    SetFormulaArranged( false );
+    SetModified( true );
 
     nModifyCount++;     //! see comment for SID_GAPHIC_SM in SmDocShell::GetState
 
@@ -252,7 +253,7 @@ void SmDocShell::Parse()
     ReplaceBadChars();
     pTree = aInterpreter.Parse(aText);
     nModifyCount++;     //! see comment for SID_GAPHIC_SM in SmDocShell::GetState
-    SetFormulaArranged( FALSE );
+    SetFormulaArranged( false );
     InvalidateCursor();
 }
 
@@ -306,7 +307,7 @@ void SmDocShell::ArrangeFormula()
     pOutDev->SetLayoutMode( nLayoutMode );
     pOutDev->SetDigitLanguage( nDigitLang );
 
-    SetFormulaArranged(TRUE);
+    SetFormulaArranged(true);
 
     // invalidate accessible text
     aAccText = String();
@@ -398,7 +399,7 @@ EditEngine& SmDocShell::GetEditEngine()
 
         pEditEngine = new EditEngine( pEditEngineItemPool );
 
-        pEditEngine->EnableUndo( TRUE );
+        pEditEngine->EnableUndo( true );
         pEditEngine->SetDefTab( USHORT(
             Application::GetDefaultDevice()->GetTextWidth( C2S("XXXX") ) ) );
 
@@ -437,7 +438,7 @@ SfxItemPool& SmDocShell::GetEditEngineItemPool()
     return *pEditEngineItemPool;
 }
 
-void SmDocShell::DrawFormula(OutputDevice &rDev, Point &rPosition, BOOL bDrawSelection)
+void SmDocShell::DrawFormula(OutputDevice &rDev, Point &rPosition, bool bDrawSelection)
 {
     RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::Draw" );
 
@@ -463,13 +464,13 @@ void SmDocShell::DrawFormula(OutputDevice &rDev, Point &rPosition, BOOL bDrawSel
     //! Math for example in Calc in "a over b" the fraction bar may not
     //! be visible else. More generally: the FillColor may have been changed.
     ULONG nOldDrawMode = DRAWMODE_DEFAULT;
-    BOOL bRestoreDrawMode = FALSE;
+    bool bRestoreDrawMode = false;
     if (OUTDEV_WINDOW == rDev.GetOutDevType() &&
         ((Window &) rDev).GetSettings().GetStyleSettings().GetHighContrastMode())
     {
         nOldDrawMode = rDev.GetDrawMode();
         rDev.SetDrawMode( DRAWMODE_DEFAULT );
-        bRestoreDrawMode = TRUE;
+        bRestoreDrawMode = true;
     }
 
     // format/draw formulas always from left to right
@@ -663,7 +664,7 @@ void SmDocShell::SetPrinter( SfxPrinter *pNew )
     delete pPrinter;
     pPrinter = pNew;    //Eigentumsuebergang!
     pPrinter->SetMapMode( MapMode(MAP_100TH_MM) );
-    SetFormulaArranged(FALSE);
+    SetFormulaArranged(false);
     Repaint();
 }
 
@@ -672,11 +673,11 @@ void SmDocShell::OnDocumentPrinterChanged( Printer *pPrt )
     RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::OnDocumentPrinterChanged" );
 
     pTmpPrinter = pPrt;
-    SetFormulaArranged(FALSE);
+    SetFormulaArranged(false);
     Size aOldSize = GetVisArea().GetSize();
     Repaint();
     if( aOldSize != GetVisArea().GetSize() && aText.Len() )
-        SetModified( TRUE );
+        SetModified( true );
     pTmpPrinter = 0;
 }
 
@@ -684,11 +685,11 @@ void SmDocShell::Repaint()
 {
     RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::Repaint" );
 
-    BOOL bIsEnabled = IsEnableSetModified();
+    bool bIsEnabled = IsEnableSetModified();
     if ( bIsEnabled )
-        EnableSetModified( FALSE );
+        EnableSetModified( false );
 
-    SetFormulaArranged( FALSE );
+    SetFormulaArranged( false );
 
     Size aVisSize = GetSize();
     SetVisAreaSize( aVisSize );
@@ -709,7 +710,7 @@ SmDocShell::SmDocShell( const sal_uInt64 i_nSfxCreationFlags ) :
     pPrinter            ( 0 ),
     pTmpPrinter         ( 0 ),
     nModifyCount        ( 0 ),
-    bIsFormulaArranged  ( FALSE )
+    bIsFormulaArranged  ( false )
 {
     pCursor = NULL;
     RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::SmDocShell" );
@@ -753,7 +754,7 @@ BOOL SmDocShell::SetData( const String& rData )
     RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::SetData" );
 
     SetText( rData );
-    return TRUE;
+    return true;
 }
 
 
@@ -761,7 +762,7 @@ BOOL SmDocShell::ConvertFrom(SfxMedium &rMedium)
 {
     RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::ConvertFrom" );
 
-    BOOL     bSuccess = FALSE;
+    bool     bSuccess = false;
     const String& rFltName = rMedium.GetFilter()->GetFilterName();
 
     OSL_ENSURE( !rFltName.EqualsAscii( STAROFFICE_XML ), "Wrong filter!");
@@ -785,12 +786,12 @@ BOOL SmDocShell::ConvertFrom(SfxMedium &rMedium)
         {
             if ( SotStorage::IsStorageFile( pStream ) )
             {
-                SvStorageRef aStorage = new SotStorage( pStream, FALSE );
+                SvStorageRef aStorage = new SotStorage( pStream, false );
                 if ( aStorage->IsStream( C2S( "Equation Native" ) ) )
                 {
                     // is this a MathType Storage?
                     MathType aEquation( aText );
-                    if ( TRUE == (bSuccess = (1 == aEquation.Parse( aStorage )) ))
+                    if ( true == (bSuccess = (1 == aEquation.Parse( aStorage )) ))
                         Parse();
                 }
             }
@@ -799,7 +800,7 @@ BOOL SmDocShell::ConvertFrom(SfxMedium &rMedium)
 
     if ( GetCreateMode() == SFX_CREATE_MODE_EMBEDDED )
     {
-        SetFormulaArranged( FALSE );
+        SetFormulaArranged( false );
         Repaint();
     }
 
@@ -812,10 +813,10 @@ BOOL SmDocShell::InitNew( const uno::Reference < embed::XStorage >& xStorage )
 {
     RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::InitNew" );
 
-    BOOL bRet = FALSE;
+    bool bRet = false;
     if ( SfxObjectShell::InitNew( xStorage ) )
     {
-        bRet = TRUE;
+        bRet = true;
         SetVisArea(Rectangle(Point(0, 0), Size(2000, 1000)));
     }
     return bRet;
@@ -826,7 +827,7 @@ BOOL SmDocShell::Load( SfxMedium& rMedium )
 {
     RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::Load" );
 
-    BOOL bRet = FALSE;
+    bool bRet = false;
     if( SfxObjectShell::Load( rMedium ))
     {
         uno::Reference < embed::XStorage > xStorage = GetMedium()->GetStorage();
@@ -853,7 +854,7 @@ BOOL SmDocShell::Load( SfxMedium& rMedium )
 
     if ( GetCreateMode() == SFX_CREATE_MODE_EMBEDDED )
     {
-        SetFormulaArranged( FALSE );
+        SetFormulaArranged( false );
         Repaint();
     }
 
@@ -883,7 +884,7 @@ BOOL SmDocShell::Save()
         return aEquation.Export(*GetMedium());
     }
 
-    return FALSE;
+    return false;
 }
 
 /*
@@ -938,7 +939,7 @@ BOOL SmDocShell::SaveAs( SfxMedium& rMedium )
 {
     RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::SaveAs" );
 
-    BOOL bRet = FALSE;
+    bool bRet = false;
 
     //! apply latest changes if necessary
     UpdateText();
@@ -962,7 +963,7 @@ BOOL SmDocShell::ConvertTo( SfxMedium &rMedium )
 {
     RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::ConvertTo" );
 
-    BOOL bRet = FALSE;
+    bool bRet = false;
     const SfxFilter* pFlt = rMedium.GetFilter();
     if( pFlt )
     {
@@ -997,9 +998,9 @@ BOOL SmDocShell::SaveCompleted( const ::com::sun::star::uno::Reference< ::com::s
     RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::SaveCompleted" );
 
     if( SfxObjectShell::SaveCompleted( xStorage ))
-        return TRUE;
+        return true;
 
-    return FALSE;
+    return false;
 }
 
 
@@ -1028,7 +1029,7 @@ void SmDocShell::Execute(SfxRequest& rReq)
         case SID_AUTO_REDRAW :
         {
             SmModule *pp = SM_MOD();
-            BOOL bRedraw = pp->GetConfig()->IsAutoRedraw();
+            bool bRedraw = pp->GetConfig()->IsAutoRedraw();
             pp->GetConfig()->SetAutoRedraw(!bRedraw);
         }
         break;
@@ -1164,7 +1165,7 @@ void SmDocShell::Execute(SfxRequest& rReq)
                 USHORT nId = rReq.GetSlot(), nCnt = 1;
                 const SfxItemSet* pArgs = rReq.GetArgs();
                 const SfxPoolItem* pItem;
-                if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nId, FALSE, &pItem ))
+                if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nId, false, &pItem ))
                     nCnt = ((SfxUInt16Item*)pItem)->GetValue();
 
                 BOOL (SfxUndoManager:: *fnDo)( USHORT );
@@ -1224,7 +1225,7 @@ void SmDocShell::GetState(SfxItemSet &rSet)
         case SID_AUTO_REDRAW :
             {
                 SmModule  *pp = SM_MOD();
-                BOOL       bRedraw = pp->GetConfig()->IsAutoRedraw();
+                bool       bRedraw = pp->GetConfig()->IsAutoRedraw();
 
                 rSet.Put(SfxBoolItem(SID_AUTO_REDRAW, bRedraw));
             }
@@ -1348,21 +1349,21 @@ void SmDocShell::SetVisArea(const Rectangle & rVisArea)
     if (! aNewRect.Right()) aNewRect.Right() = 2000;
     if (! aNewRect.Bottom()) aNewRect.Bottom() = 1000;
 
-    BOOL bIsEnabled = IsEnableSetModified();
+    bool bIsEnabled = IsEnableSetModified();
     if ( bIsEnabled )
-        EnableSetModified( FALSE );
+        EnableSetModified( false );
 
     //TODO/LATER: it's unclear how this interacts with the SFX code
     // If outplace editing, then dont resize the OutplaceWindow. But the
     // ObjectShell has to resize. Bug 56470
-    BOOL bUnLockFrame;
+    bool bUnLockFrame;
     if( GetCreateMode() == SFX_CREATE_MODE_EMBEDDED && !IsInPlaceActive() && GetFrame() )
     {
         GetFrame()->LockAdjustPosSizePixel();
-        bUnLockFrame = TRUE;
+        bUnLockFrame = true;
     }
     else
-        bUnLockFrame = FALSE;
+        bUnLockFrame = false;
 
     SfxObjectShell::SetVisArea( aNewRect );
 
@@ -1417,13 +1418,13 @@ void SmDocShell::SetModified(BOOL bModified)
     }
 }
 
-BOOL SmDocShell::WriteAsMathType3( SfxMedium& rMedium )
+bool SmDocShell::WriteAsMathType3( SfxMedium& rMedium )
 {
     RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::WriteAsMathType3" );
 
     MathType aEquation( aText, pTree );
 
-    BOOL bRet = 0 != aEquation.ConvertFromStarMath( rMedium );
+    bool bRet = 0 != aEquation.ConvertFromStarMath( rMedium );
     return bRet;
 }
 
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 83fcfab0351b..c95dd76e5901 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -64,6 +64,7 @@
 #include "view.hxx"
 #include "document.hxx"
 #include "config.hxx"
+#include "accessibility.hxx"
 
 #define SCROLL_LINE         24
 
@@ -118,7 +119,7 @@ SmEditWindow::SmEditWindow( SmCmdBoxWindow &rMyCmdBoxWin ) :
     SetMapMode(MAP_PIXEL);
 
     // Even RTL languages don't use RTL for math
-    rCmdBox.GetEditWindow()->EnableRTL( FALSE );
+    rCmdBox.GetEditWindow()->EnableRTL( false );
 
     ApplyColorConfigValues( SM_MOD()->GetColorConfig() );
 
@@ -351,7 +352,7 @@ void SmEditWindow::MouseButtonDown(const MouseEvent &rEvt)
 
 void SmEditWindow::Command(const CommandEvent& rCEvt)
 {
-    BOOL bForwardEvt = TRUE;
+    bool bForwardEvt = true;
     if (rCEvt.GetCommand() == COMMAND_CONTEXTMENU)
     {
         GetParent()->ToTop();
@@ -379,7 +380,7 @@ void SmEditWindow::Command(const CommandEvent& rCEvt)
 
         pPopupMenu->Execute( this, aPoint );
         delete pPopupMenu;
-        bForwardEvt = FALSE;
+        bForwardEvt = false;
     }
     else if (rCEvt.GetCommand() == COMMAND_WHEEL)
         bForwardEvt = !HandleWheelCommands( rCEvt );
@@ -394,9 +395,9 @@ void SmEditWindow::Command(const CommandEvent& rCEvt)
 }
 
 
-BOOL SmEditWindow::HandleWheelCommands( const CommandEvent &rCEvt )
+bool SmEditWindow::HandleWheelCommands( const CommandEvent &rCEvt )
 {
-    BOOL bCommandHandled = FALSE;    // true if the CommandEvent needs not
+    bool bCommandHandled = false;    // true if the CommandEvent needs not
                                     // to be passed on (because it has fully
                                     // been taken care of).
 
@@ -404,7 +405,7 @@ BOOL SmEditWindow::HandleWheelCommands( const CommandEvent &rCEvt )
     if (pWData)
     {
         if (COMMAND_WHEEL_ZOOM == pWData->GetMode())
-            bCommandHandled = TRUE;     // no zooming in Command window
+            bCommandHandled = true;     // no zooming in Command window
         else
             bCommandHandled = HandleScrollCommand( rCEvt, pHScrollBar, pVScrollBar);
     }
@@ -428,7 +429,7 @@ void SmEditWindow::KeyInput(const KeyEvent& rKEvt)
 {
     if (rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE)
     {
-        BOOL bCallBase = TRUE;
+        bool bCallBase = true;
         SfxViewShell* pViewShell = GetView();
         if ( pViewShell && pViewShell->ISA(SmViewShell) )
         {
@@ -508,8 +509,8 @@ void SmEditWindow::CreateEditView()
             pScrollBox  = new ScrollBarBox(this);
         pVScrollBar->SetScrollHdl(LINK(this, SmEditWindow, ScrollHdl));
         pHScrollBar->SetScrollHdl(LINK(this, SmEditWindow, ScrollHdl));
-        pVScrollBar->EnableDrag( TRUE );
-        pHScrollBar->EnableDrag( TRUE );
+        pVScrollBar->EnableDrag( true );
+        pHScrollBar->EnableDrag( true );
 
         pEditView->SetOutputArea(AdjustScrollBars());
 
@@ -517,7 +518,7 @@ void SmEditWindow::CreateEditView()
 
         pEditView->SetSelection(eSelection);
         Update();
-        pEditView->ShowCursor(TRUE, TRUE);
+        pEditView->ShowCursor(true, true);
 
         pEditEngine->SetStatusEventHdl( LINK(this, SmEditWindow, EditStatusHdl) );
         SetPointer(pEditView->GetPointer());
@@ -669,7 +670,7 @@ void SmEditWindow::GetFocus()
 
     //Let SmViewShell know we got focus
     if(GetView() && IsInlineEditEnabled())
-        GetView()->SetInsertIntoEditWindow(TRUE);
+        GetView()->SetInsertIntoEditWindow(true);
 }
 
 
@@ -691,9 +692,9 @@ void SmEditWindow::LoseFocus()
 }
 
 
-BOOL SmEditWindow::IsAllSelected() const
+bool SmEditWindow::IsAllSelected() const
 {
-    BOOL bRes = FALSE;
+    bool bRes = false;
     EditEngine *pEditEngine = ((SmEditWindow *) this)->GetEditEngine();
     OSL_ENSURE( pEditView, "NULL pointer" );
     OSL_ENSURE( pEditEngine, "NULL pointer" );
@@ -841,7 +842,7 @@ void SmEditWindow::SelPrevMark()
     }
 }
 
-BOOL SmEditWindow::HasMark(const String& rText) const
+bool SmEditWindow::HasMark(const String& rText) const
     // returns true iff 'rText' contains a mark
 {
     return rText.SearchAscii("<?>", 0) != STRING_NOTFOUND;
@@ -882,17 +883,16 @@ void SmEditWindow::SetSelection(const ESelection &rSel)
     InvalidateSlots();
 }
 
-BOOL SmEditWindow::IsEmpty() const
+bool SmEditWindow::IsEmpty() const
 {
     EditEngine *pEditEngine = ((SmEditWindow *) this)->GetEditEngine();
-    BOOL bEmpty = sal::static_int_cast< BOOL >(
-                    pEditEngine ? pEditEngine->GetTextLen() == 0 : FALSE);
+    bool bEmpty = ( pEditEngine ? pEditEngine->GetTextLen() == 0 : false);
     return bEmpty;
 }
 
-BOOL SmEditWindow::IsSelected() const
+bool SmEditWindow::IsSelected() const
 {
-    return pEditView ? pEditView->HasSelection() : FALSE;
+    return pEditView ? pEditView->HasSelection() : false;
 }
 
 void SmEditWindow::Cut()
@@ -901,7 +901,7 @@ void SmEditWindow::Cut()
     if (pEditView)
     {
         pEditView->Cut();
-        GetDoc()->SetModified( TRUE );
+        GetDoc()->SetModified( true );
     }
 }
 
@@ -918,7 +918,7 @@ void SmEditWindow::Paste()
     if (pEditView)
     {
         pEditView->Paste();
-        GetDoc()->SetModified( TRUE );
+        GetDoc()->SetModified( true );
     }
 }
 
@@ -928,7 +928,7 @@ void SmEditWindow::Delete()
     if (pEditView)
     {
         pEditView->DeleteSelected();
-        GetDoc()->SetModified( TRUE );
+        GetDoc()->SetModified( true );
     }
 }
 
diff --git a/starmath/source/format.cxx b/starmath/source/format.cxx
index 1117da96421a..744ebb8061b7 100644
--- a/starmath/source/format.cxx
+++ b/starmath/source/format.cxx
@@ -115,7 +115,7 @@ SmFormat::SmFormat()
 
     eHorAlign       = AlignCenter;
     nGreekCharStyle = 0;
-    bIsTextmode     = bScaleNormalBrackets = FALSE;
+    bIsTextmode     = bScaleNormalBrackets = false;
 
     vSize[SIZ_TEXT]     = 100;
     vSize[SIZ_INDEX]    = 60;
@@ -170,18 +170,18 @@ SmFormat::SmFormat()
     for ( USHORT i = FNT_BEGIN;  i <= FNT_END;  i++ )
     {
         SmFace &rFace = vFont[i];
-        rFace.SetTransparent( TRUE );
+        rFace.SetTransparent( true );
         rFace.SetAlign( ALIGN_BASELINE );
         rFace.SetColor( COL_AUTO );
-        bDefaultFont[i] = FALSE;
+        bDefaultFont[i] = false;
     }
 }
 
 
-void SmFormat::SetFont(USHORT nIdent, const SmFace &rFont, BOOL bDefault )
+void SmFormat::SetFont(USHORT nIdent, const SmFace &rFont, bool bDefault )
 {
     vFont[nIdent] = rFont;
-    vFont[nIdent].SetTransparent( TRUE );
+    vFont[nIdent].SetTransparent( true );
     vFont[nIdent].SetAlign( ALIGN_BASELINE );
 
     bDefaultFont[nIdent] = bDefault;
@@ -211,9 +211,9 @@ SmFormat & SmFormat::operator = (const SmFormat &rFormat)
 }
 
 
-BOOL SmFormat::operator == (const SmFormat &rFormat) const
+bool SmFormat::operator == (const SmFormat &rFormat) const
 {
-    BOOL bRes = aBaseSize == rFormat.aBaseSize  &&
+    bool bRes = aBaseSize == rFormat.aBaseSize  &&
                 eHorAlign == rFormat.eHorAlign  &&
                 nGreekCharStyle == rFormat.nGreekCharStyle &&
                 bIsTextmode == rFormat.bIsTextmode  &&
@@ -223,18 +223,18 @@ BOOL SmFormat::operator == (const SmFormat &rFormat) const
     for (i = 0;  i <= SIZ_END && bRes;  ++i)
     {
         if (vSize[i] != rFormat.vSize[i])
-            bRes = FALSE;
+            bRes = false;
     }
     for (i = 0;  i <= DIS_END && bRes;  ++i)
     {
         if (vDist[i] != rFormat.vDist[i])
-            bRes = FALSE;
+            bRes = false;
     }
     for (i = 0;  i <= FNT_END && bRes;  ++i)
     {
         if (vFont[i] != rFormat.vFont[i]  ||
             bDefaultFont[i] != rFormat.bDefaultFont[i])
-            bRes = FALSE;
+            bRes = false;
     }
 
     return bRes;
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index cefb16823bdc..937799aec67a 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -662,8 +662,8 @@ void SmXMLExport::_ExportContent()
         if (pDocShell)
         {
             SmParser &rParser = pDocShell->GetParser();
-            BOOL bVal = rParser.IsExportSymbolNames();
-            rParser.SetExportSymbolNames( TRUE );
+            bool bVal = rParser.IsExportSymbolNames();
+            rParser.SetExportSymbolNames( true );
             SmNode *pTmpTree = rParser.Parse( aText );
             aText = rParser.GetText();
             delete pTmpTree;
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 29d776e4d256..6a4ae10370b6 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -242,7 +242,7 @@ ULONG SmXMLImportWrapper::Import(SfxMedium &rMedium)
             xStatusIndicator->setValue(nSteps++);
 
         nError = ReadThroughComponent( xInputStream, xModelComp,
-            xServiceFactory, xInfoSet, "com.sun.star.comp.Math.XMLImporter", FALSE );
+            xServiceFactory, xInfoSet, "com.sun.star.comp.Math.XMLImporter", false );
     }
 
     if (xStatusIndicator.is())
@@ -591,8 +591,8 @@ void SmXMLImport::endDocument(void)
 
             // Convert symbol names
             SmParser &rParser = pDocShell->GetParser();
-            BOOL bVal = rParser.IsImportSymbolNames();
-            rParser.SetImportSymbolNames( TRUE );
+            bool bVal = rParser.IsImportSymbolNames();
+            rParser.SetImportSymbolNames( true );
             SmNode *pTmpTree = rParser.Parse( aText );
             aText = rParser.GetText();
             delete pTmpTree;
@@ -1688,13 +1688,13 @@ public:
 
 class SmXMLMultiScriptsContext_Impl : public SmXMLSubSupContext_Impl
 {
-    sal_Bool bHasPrescripts;
+    bool bHasPrescripts;
 
 public:
     SmXMLMultiScriptsContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,
         const OUString& rLName) :
         SmXMLSubSupContext_Impl(rImport,nPrefix,rLName),
-        bHasPrescripts(FALSE) {}
+        bHasPrescripts(false) {}
 
     void EndElement();
     void MiddleElement();
@@ -2453,7 +2453,7 @@ SvXMLImportContext *SmXMLMultiScriptsContext_Impl::CreateChildContext(
 
 void SmXMLMultiScriptsContext_Impl::MiddleElement()
 {
-    bHasPrescripts=sal_True;
+    bHasPrescripts=true;
 
     OSL_ENSURE(GetSmImport().GetNodeStack().Count() - nElementCount > 0,
         "Sub has no arguments");
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index bbfe4f5952ca..6cec4950f93e 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -122,7 +122,7 @@ void MathType::Init()
 sal_Bool MathType::LookupChar(sal_Unicode nChar,String &rRet,sal_uInt8 nVersion,
     sal_uInt8 nTypeFace)
 {
-    sal_Bool bRet=FALSE;
+    bool bRet=false;
     const char *pC = NULL;
     switch(nChar)
     {
@@ -156,56 +156,56 @@ sal_Bool MathType::LookupChar(sal_Unicode nChar,String &rRet,sal_uInt8 nVersion,
             else
             {
                 rRet.Append(nChar);
-                bRet=TRUE;
+                bRet=true;
             }
             break;
         case 0x00fb:
             if ((nVersion < 3) && (nTypeFace == 0x81))
                 nChar = 0xDF;
             rRet.Append(nChar);
-            bRet=TRUE;
+            bRet=true;
             break;
         case 'a':
             if ((nVersion < 3) && (nTypeFace == 0x84))
                 nChar = 0x3b1;
             rRet.Append(nChar);
-            bRet=TRUE;
+            bRet=true;
             break;
         case 'b':
             if ((nVersion < 3) && (nTypeFace == 0x84))
                 nChar = 0x3b2;
             rRet.Append(nChar);
-            bRet=TRUE;
+            bRet=true;
             break;
         case 'l':
             if ((nVersion < 3) && (nTypeFace == 0x84))
                 nChar = 0x3bb;
             rRet.Append(nChar);
-            bRet=TRUE;
+            bRet=true;
             break;
         case 'n':
             if ((nVersion < 3) && (nTypeFace == 0x84))
                 nChar = 0x3bd;
             rRet.Append(nChar);
-            bRet=TRUE;
+            bRet=true;
             break;
         case 'r':
             if ((nVersion < 3) && (nTypeFace == 0x84))
                 nChar = 0x3c1;
             rRet.Append(nChar);
-            bRet=TRUE;
+            bRet=true;
             break;
         case 'D':
             if ((nVersion < 3) && (nTypeFace == 0x84))
                 nChar = 0x394;
             rRet.Append(nChar);
-            bRet=TRUE;
+            bRet=true;
             break;
         case 0xa9:
             if ((nVersion < 3) && (nTypeFace == 0x82))
                 nChar = '\'';
             rRet.Append(nChar);
-            bRet=TRUE;
+            bRet=true;
             break;
         case 0x00f1:
             if ((nVersion < 3) && (nTypeFace == 0x86))
@@ -213,7 +213,7 @@ sal_Bool MathType::LookupChar(sal_Unicode nChar,String &rRet,sal_uInt8 nVersion,
             else
             {
                 rRet.Append(nChar);
-                bRet=TRUE;
+                bRet=true;
             }
             break;
         case 0x00a3:
@@ -222,7 +222,7 @@ sal_Bool MathType::LookupChar(sal_Unicode nChar,String &rRet,sal_uInt8 nVersion,
             else
             {
                 rRet.Append(nChar);
-                bRet=TRUE;
+                bRet=true;
             }
             break;
         case 0x00de:
@@ -231,7 +231,7 @@ sal_Bool MathType::LookupChar(sal_Unicode nChar,String &rRet,sal_uInt8 nVersion,
             else
             {
                 rRet.Append(nChar);
-                bRet=TRUE;
+                bRet=true;
             }
             break;
         case 0x0057:
@@ -240,7 +240,7 @@ sal_Bool MathType::LookupChar(sal_Unicode nChar,String &rRet,sal_uInt8 nVersion,
             else
             {
                 rRet.Append(nChar);
-                bRet=TRUE;
+                bRet=true;
             }
             break;
         case 0x007b:
@@ -496,7 +496,7 @@ sal_Bool MathType::LookupChar(sal_Unicode nChar,String &rRet,sal_uInt8 nVersion,
             break;
         case 0xe083:
             rRet.Append('+');
-            bRet=TRUE;
+            bRet=true;
             break;
         case '^':
         case 0xe091:
@@ -516,7 +516,7 @@ sal_Bool MathType::LookupChar(sal_Unicode nChar,String &rRet,sal_uInt8 nVersion,
             break;
         case 0xeb01:    //no space
         case 0xeb08:    //normal space
-            bRet=TRUE;
+            bRet=true;
             break;
         case 0xef04:    //tiny space
         case 0xef05:    //tiny space
@@ -532,7 +532,7 @@ sal_Bool MathType::LookupChar(sal_Unicode nChar,String &rRet,sal_uInt8 nVersion,
             break;
         default:
             rRet.Append(nChar);
-            bRet=TRUE;
+            bRet=true;
             break;
     }
     if (pC)
@@ -637,7 +637,7 @@ static void lcl_PrependDummyTerm(String &rRet, xub_StrLen &rTextStart)
 
 static void lcl_AppendDummyTerm(String &rRet)
 {
-    sal_Bool bOk=sal_False;
+    bool bOk=false;
     for(int nI=rRet.Len()-1;nI >= 0; nI--)
     {
         xub_StrLen nIdx = sal::static_int_cast< xub_StrLen >(nI);
@@ -645,7 +645,7 @@ static void lcl_AppendDummyTerm(String &rRet)
         if (nChar == ' ')
             continue;
         if (rRet.GetChar(nIdx) != '{')
-            bOk=sal_True;
+            bOk=true;
         break;
     }
     if (!bOk)   //No term, use dummy
@@ -677,12 +677,12 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
     sal_Char nChar8;
     String sFontName;
     int i,nRet=1,newline=0;
-    sal_Bool bSilent=FALSE;
+    bool bSilent=false;
     int nPart=0;
     String sPush,sMainTerm;
     int nSetSize=0,nSetAlign=0;
     int nCurRow=0,nCurCol=0;
-    sal_Bool bOpenString=FALSE;
+    bool bOpenString=false;
     xub_StrLen nTextStart = 0;
     xub_StrLen nSubSupStartPos = 0;
     xub_StrLen nLastTemplateBracket=STRING_NOTFOUND;
@@ -704,12 +704,12 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
          */
         if ((nRecord == CHAR) && (!bIsSilent) && (!bOpenString))
         {
-            bOpenString=TRUE;
+            bOpenString=true;
             nTextStart = rRet.Len();
         }
         else if ((nRecord != CHAR) && (bOpenString))
         {
-            bOpenString=FALSE;
+            bOpenString=false;
             if ((rRet.Len() - nTextStart) > 1)
             {
                 String aStr;
@@ -1282,19 +1282,19 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
                         nRet = HandleRecords(nLevel+1);
                         while (nSetSize)
                         {
-                            sal_Bool bOk=sal_False;
+                            bool bOk=false;
                             xub_StrLen nI = rRet.SearchBackward('{');
                             if (nI != STRING_NOTFOUND)
                             {
                                 for(nI=nI+1;nI<rRet.Len();nI++)
                                     if (rRet.GetChar(nI) != ' ')
                                     {
-                                        bOk=sal_True;
+                                        bOk=true;
                                         break;
                                     }
                             }
                             else
-                                bOk=sal_True;
+                                bOk=true;
 
                             if (bOk)
                                 APPEND(rRet,"} ");
@@ -1407,19 +1407,19 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
                                     ((nVariation == 2) || (nVariation == 1)))
                                 newline--;
 
-                            sal_Bool bOk=sal_False;
+                            bool bOk=false;
                             xub_StrLen nI = rRet.SearchBackward('{');
                             if (nI != STRING_NOTFOUND)
                             {
                                 for(nI=nI+1;nI<rRet.Len();nI++)
                                     if (rRet.GetChar(nI) != ' ')
                                     {
-                                        bOk=sal_True;
+                                        bOk=true;
                                         break;
                                     }
                             }
                             else
-                                bOk=sal_True;
+                                bOk=true;
 
                             if (bOk)
                                 APPEND(rRet,"} ");
@@ -1701,7 +1701,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
                         default:
                             break;
                         }
-                        bSilent = TRUE; //Skip the optional brackets and/or
+                        bSilent = true; //Skip the optional brackets and/or
                                         //symbols that follow some of these
                                         //records. Foo Data.
 
@@ -1748,7 +1748,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector,
                     *pS >> nTabType;
                     *pS >> nTabOffset;
                 }
-                OSL_ENSURE(FALSE,"Not seen in the wild Equation Ruler Field");
+                OSL_ENSURE(false,"Not seen in the wild Equation Ruler Field");
                 break;
             case FONT:
                 {
@@ -1853,7 +1853,7 @@ void MathType::HandleAlign(sal_uInt8 nHorAlign, sal_uInt8 /*nVAlign*/, int &rSet
  * indicator by mathtype file format*/
 sal_Bool MathType::HandleSize(sal_Int16 nLstSize,sal_Int16 nDefSize, int &rSetSize)
 {
-    sal_Bool bRet=FALSE;
+    bool bRet=false;
     if (nLstSize < 0)
     {
         if ((-nLstSize/32 != nDefaultSize) && (-nLstSize/32 != nCurSize))
@@ -1862,7 +1862,7 @@ sal_Bool MathType::HandleSize(sal_Int16 nLstSize,sal_Int16 nDefSize, int &rSetSi
             {
                 rSetSize--;
                 rRet += '}';
-                bRet=TRUE;
+                bRet=true;
             }
             if (-nLstSize/32 != nLastSize)
             {
@@ -1870,7 +1870,7 @@ sal_Bool MathType::HandleSize(sal_Int16 nLstSize,sal_Int16 nDefSize, int &rSetSi
                 APPEND(rRet," size ");
                 rRet += String::CreateFromInt32(-nLstSize/32);
                 rRet += '{';
-                bRet=TRUE;
+                bRet=true;
                 rSetSize++;
             }
             nCurSize = -nLstSize/32;
@@ -1891,7 +1891,7 @@ sal_Bool MathType::HandleSize(sal_Int16 nLstSize,sal_Int16 nDefSize, int &rSetSi
             {
                 rSetSize--;
                 rRet += '}';
-                bRet=TRUE;
+                bRet=true;
             }
             if (nLstSize != nLastSize)
             {
@@ -1899,7 +1899,7 @@ sal_Bool MathType::HandleSize(sal_Int16 nLstSize,sal_Int16 nDefSize, int &rSetSi
                 APPEND(rRet," size ");
                 rRet += String::CreateFromInt32(nLstSize);
                 rRet += '{';
-                bRet=TRUE;
+                bRet=true;
                 rSetSize++;
             }
             nCurSize = nLstSize;
@@ -1916,7 +1916,7 @@ int MathType::ConvertFromStarMath( SfxMedium& rMedium )
     SvStream *pStream = rMedium.GetOutStream();
     if ( pStream )
     {
-        SvStorageRef pStor = new SotStorage( pStream, FALSE );
+        SvStorageRef pStor = new SotStorage( pStream, false );
 
         SvGlobalName aGName(0x0002ce02L, 0x0000, 0x0000,0xc0,0x00,
             0x00,0x00,0x00,0x00,0x00,0x46 );
@@ -1983,7 +1983,7 @@ int MathType::ConvertFromStarMath( SfxMedium& rMedium )
 
 sal_uInt8 MathType::HandleNodes(SmNode *pNode,int nLevel)
 {
-    sal_Bool bRet=FALSE;
+    bool bRet=false;
     switch(pNode->GetType())
     {
         case NATTRIBUT:
@@ -2742,14 +2742,14 @@ int MathType::HandleTemplate(int nLevel,sal_uInt8 &rSelector,
     //For the (broken) case where one subscript template ends, and there is
     //another one after it, mathtype handles it as if the second one was
     //inside the first one and renders it as sub of sub
-    BOOL bRemove=FALSE;
+    bool bRemove=false;
     if ( (rSelector == 0xf) && (rLastTemplateBracket != STRING_NOTFOUND) )
     {
-        bRemove=TRUE;
+        bRemove=true;
         for (xub_StrLen nI = rLastTemplateBracket+1; nI < rRet.Len(); nI++ )
             if (rRet.GetChar(nI) != ' ')
             {
-                bRemove=FALSE;
+                bRemove=false;
                 break;
             }
     }
@@ -2989,7 +2989,7 @@ int MathType::HandleChar(xub_StrLen &rTextStart,int &rSetSize,int nLevel,
 
 sal_Bool MathType::HandleLim(SmNode *pNode,int nLevel)
 {
-    sal_Bool bRet=0;
+    bool bRet=false;
     //Special case for the "lim" option in StarMath
     if ((pNode->GetToken().eType == TLIM)
         || (pNode->GetToken().eType == TLIMSUP)
@@ -3058,7 +3058,7 @@ sal_Bool MathType::HandleLim(SmNode *pNode,int nLevel)
             }
             HandleNodes(pNode->GetSubNode(1),nLevel+1);
             //*pS << sal_uInt8(END); //options
-            bRet = 1;
+            bRet = true;
         }
     }
     return bRet;
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index ecfa7d52b08c..3ef9cfeee091 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -76,7 +76,7 @@ class SmTmpDevice
     Color   Impl_GetColor( const Color& rColor );
 
 public:
-    SmTmpDevice(OutputDevice &rTheDev, BOOL bUseMap100th_mm);
+    SmTmpDevice(OutputDevice &rTheDev, bool bUseMap100th_mm);
     ~SmTmpDevice()  { rOutDev.Pop(); }
 
     void SetFont(const Font &rNewFont);
@@ -89,7 +89,7 @@ public:
 };
 
 
-SmTmpDevice::SmTmpDevice(OutputDevice &rTheDev, BOOL bUseMap100th_mm) :
+SmTmpDevice::SmTmpDevice(OutputDevice &rTheDev, bool bUseMap100th_mm) :
     rOutDev(rTheDev)
 {
     rOutDev.Push( PUSH_FONT | PUSH_MAPMODE |
@@ -154,9 +154,9 @@ SmNode::~SmNode()
 }
 
 
-BOOL SmNode::IsVisible() const
+bool SmNode::IsVisible() const
 {
-    return FALSE;
+    return false;
 }
 
 
@@ -184,7 +184,7 @@ SmNode * SmNode::GetLeftMost()
 }
 
 
-void SmNode::SetPhantom(BOOL bIsPhantomP)
+void SmNode::SetPhantom(bool bIsPhantomP)
 {
     if (! (Flags() & FLG_VISIBLE))
         bIsPhantom = bIsPhantomP;
@@ -326,7 +326,7 @@ void SmNode::SetSize(const Fraction &rSize)
 }
 
 
-void SmNode::SetRectHorAlign(RectHorAlign eHorAlign, BOOL bApplyToSubTree )
+void SmNode::SetRectHorAlign(RectHorAlign eHorAlign, bool bApplyToSubTree )
 {
     if (!(Flags() & FLG_HORALIGN))
         eRectHorAlign = eHorAlign;
@@ -352,11 +352,11 @@ void SmNode::PrepareAttributes()
 void SmNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell)
 {
 #if OSL_DEBUG_LEVEL > 1
-    bIsDebug    = TRUE;
+    bIsDebug    = true;
 #else
-    bIsDebug    = FALSE;
+    bIsDebug    = false;
 #endif
-    bIsPhantom  = FALSE;
+    bIsPhantom  = false;
     nFlags      = 0;
     nAttributes = 0;
 
@@ -386,7 +386,7 @@ void  SmNode::ToggleDebug() const
 {
     SmNode *pThis = (SmNode *) this;
 
-    pThis->bIsDebug = bIsDebug ? FALSE : TRUE;
+    pThis->bIsDebug = bIsDebug ? false : true;
 
     SmNode *pNode;
     USHORT      nSize = GetNumSubNodes();
@@ -718,9 +718,9 @@ void SmStructureNode::SetSubNodes(const SmNodeArray &rNodeArray)
 }
 
 
-BOOL SmStructureNode::IsVisible() const
+bool SmStructureNode::IsVisible() const
 {
-    return FALSE;
+    return false;
 }
 
 
@@ -754,9 +754,9 @@ void SmStructureNode::GetAccessibleText( String &rText ) const
 ///////////////////////////////////////////////////////////////////////////
 
 
-BOOL SmVisibleNode::IsVisible() const
+bool SmVisibleNode::IsVisible() const
 {
-    return TRUE;
+    return true;
 }
 
 
@@ -887,7 +887,7 @@ void SmLineNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
         if (NULL != (pNode = GetSubNode(i)))
             pNode->Arrange(rDev, rFormat);
 
-    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, TRUE);
+    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, true);
     aTmpDev.SetFont(GetFont());
 
     // provide an empty rectangle with alignment parameters for the "current"
@@ -937,7 +937,7 @@ void SmExpressionNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat
     //  copy alignment of leftmost subnode if any
     SmNode *pNode = GetLeftMost();
     if (pNode)
-        SetRectHorAlign(pNode->GetRectHorAlign(), FALSE);
+        SetRectHorAlign(pNode->GetRectHorAlign(), false);
 }
 
 
@@ -946,7 +946,7 @@ void SmExpressionNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat
 
 void SmUnHorNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
 {
-    BOOL  bIsPostfix = GetToken().eType == TFACT;
+    bool  bIsPostfix = GetToken().eType == TFACT;
 
     SmNode *pOper = GetSubNode(bIsPostfix ? 1 : 0),
            *pBody = GetSubNode(bIsPostfix ? 0 : 1);
@@ -1060,7 +1060,7 @@ void SmRootNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
     SmRect::operator = (*pBody);
     ExtendBy(*pRootSym, RCP_THIS);
     if (pExtra)
-        ExtendBy(*pExtra, RCP_THIS, (BOOL) TRUE);
+        ExtendBy(*pExtra, RCP_THIS, true);
 }
 
 
@@ -1129,7 +1129,7 @@ void SmBinVerNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
     OSL_ENSURE(pLine,  "Sm : NULL pointer");
     OSL_ENSURE(pDenom, "Sm : NULL pointer");
 
-    BOOL  bIsTextmode = rFormat.IsTextmode();
+    bool  bIsTextmode = rFormat.IsTextmode();
     if (bIsTextmode)
     {
         Fraction  aFraction(rFormat.GetRelSize(SIZ_INDEX), 100);
@@ -1204,14 +1204,14 @@ double Det(const Point &rHeading1, const Point &rHeading2)
 }
 
 
-BOOL IsPointInLine(const Point &rPoint1,
+bool IsPointInLine(const Point &rPoint1,
                    const Point &rPoint2, const Point &rHeading2)
-    // ergibt TRUE genau dann, wenn der Punkt 'rPoint1' zu der Gerade gehoert die
+    // ergibt true genau dann, wenn der Punkt 'rPoint1' zu der Gerade gehoert die
     // durch den Punkt 'rPoint2' geht und den Richtungsvektor 'rHeading2' hat
 {
     OSL_ENSURE(rHeading2 != Point(), "Sm : 0 vector");
 
-    BOOL bRes = FALSE;
+    bool bRes = false;
     const double eps = 5.0 * DBL_EPSILON;
 
     double fLambda;
@@ -1266,7 +1266,7 @@ USHORT GetLineIntersectionPoint(Point &rResult,
 SmBinDiagonalNode::SmBinDiagonalNode(const SmToken &rNodeToken)
 :   SmStructureNode(NBINDIAGONAL, rNodeToken)
 {
-    bAscending = FALSE;
+    bAscending = false;
     SetNumSubNodes(3);
 }
 
@@ -1416,7 +1416,7 @@ void SmBinDiagonalNode::Arrange(const OutputDevice &rDev, const SmFormat &rForma
     //! some routines being called extract some info from the OutputDevice's
     //! font (eg the space to be used for borders OR the font name(!!)).
     //! Thus the font should reflect the needs and has to be set!
-    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, TRUE);
+    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, true);
     aTmpDev.SetFont(GetFont());
 
     pLeft->Arrange(aTmpDev, rFormat);
@@ -1517,7 +1517,7 @@ void SmSubSupNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
 
         pSubSup->Arrange(rDev, rFormat);
 
-        BOOL  bIsTextmode = rFormat.IsTextmode();
+        bool  bIsTextmode = rFormat.IsTextmode();
         nDist = 0;
 
         //! be sure that CSUB, CSUP are handled before the other cases!
@@ -1565,12 +1565,12 @@ void SmSubSupNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
                 aPos.Y() -= nDist;
                 break;
             default :
-                OSL_ENSURE(FALSE, "Sm: unknown case");
+                OSL_ENSURE(false, "Sm: unknown case");
                 break;
         }
 
         pSubSup->MoveTo(aPos);
-        ExtendBy(*pSubSup, RCP_THIS, (BOOL) TRUE);
+        ExtendBy(*pSubSup, RCP_THIS, true);
 
         // update rectangle to which  RSUB, RSUP, LSUB, LSUP
         // will be aligned to
@@ -1683,7 +1683,7 @@ void SmBraceNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
 
     pBody->Arrange(rDev, rFormat);
 
-    BOOL  bIsScaleNormal = rFormat.IsScaleNormalBrackets(),
+    bool  bIsScaleNormal = rFormat.IsScaleNormalBrackets(),
           bScale         = pBody->GetHeight() > 0  &&
                            (GetScaleMode() == SCALE_HEIGHT  ||  bIsScaleNormal),
           bIsABS         = GetToken().eType == TABS;
@@ -1787,7 +1787,7 @@ void SmBracebodyNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
     nBodyHeight = aRefRect.GetHeight();
 
     // scale separators to required height and arrange them
-    BOOL bScale  = GetScaleMode() == SCALE_HEIGHT  ||  rFormat.IsScaleNormalBrackets();
+    bool bScale  = GetScaleMode() == SCALE_HEIGHT  ||  rFormat.IsScaleNormalBrackets();
     long nHeight = bScale ? aRefRect.GetHeight() : GetFont().GetSize().Height();
     USHORT nIndex  = GetScaleMode() == SCALE_HEIGHT ?
                         DIS_BRACKETSIZE : DIS_NORMALBRACKETSIZE;
@@ -1809,7 +1809,7 @@ void SmBracebodyNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
     SmRect::operator = (*pLeft);
     for (i = 1;  i < nNumSubNodes;  i++)
     {
-        BOOL          bIsSeparator = i % 2 != 0;
+        bool          bIsSeparator = i % 2 != 0;
         RectVerAlign  eVerAlign    = bIsSeparator ? RVA_CENTERY : RVA_BASELINE;
 
         SmNode *pRight = GetSubNode(i);
@@ -1837,7 +1837,7 @@ void SmVerticalBraceNode::Arrange(const OutputDevice &rDev, const SmFormat &rFor
     OSL_ENSURE(pBrace,  "Sm: NULL pointer!");
     OSL_ENSURE(pScript, "Sm: NULL pointer!");
 
-    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, TRUE);
+    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, true);
     aTmpDev.SetFont(GetFont());
 
     pBody->Arrange(aTmpDev, rFormat);
@@ -2022,7 +2022,7 @@ void SmAttributNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
     pAttr->MoveTo(aPos);
 
     SmRect::operator = (*pBody);
-    ExtendBy(*pAttr, RCP_THIS, (BOOL) TRUE);
+    ExtendBy(*pAttr, RCP_THIS, true);
 }
 
 
@@ -2159,7 +2159,7 @@ void SmFontNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
             break;
         case TUNKNOWN : break;  // no assertion on "font <?> <?>"
 
-        case TPHANTOM : SetPhantom(TRUE);               break;
+        case TPHANTOM : SetPhantom(true);               break;
         case TBOLD :    SetAttribut(ATTR_BOLD);         break;
         case TITALIC :  SetAttribut(ATTR_ITALIC);       break;
         case TNBOLD :   ClearAttribut(ATTR_BOLD);       break;
@@ -2175,7 +2175,7 @@ void SmFontNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
         case TYELLOW :  SetColor(Color(COL_YELLOW));    break;
 
         default:
-            OSL_ENSURE(FALSE, "Sm: unknown case");
+            OSL_ENSURE(false, "Sm: unknown case");
     }
 
     pNode->Arrange(rDev, rFormat);
@@ -2220,7 +2220,7 @@ void SmPolyLineNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
     //! some routines being called extract some info from the OutputDevice's
     //! font (eg the space to be used for borders OR the font name(!!)).
     //! Thus the font should reflect the needs and has to be set!
-    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, TRUE);
+    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, true);
     aTmpDev.SetFont(GetFont());
 
     long  nBorderwidth = GetFont().GetBorderWidth();
@@ -2298,14 +2298,14 @@ void SmRectangleNode::Arrange(const OutputDevice &rDev, const SmFormat &/*rForma
     if (nWidth == 0)
         nWidth  = nFontHeight / 3;
 
-    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, TRUE);
+    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, true);
     aTmpDev.SetFont(GetFont());
 
     // add some borderspace
     ULONG  nTmpBorderWidth = GetFont().GetBorderWidth();
     nHeight += 2 * nTmpBorderWidth;
 
-    //! use this method in order to have 'SmRect::HasAlignInfo() == TRUE'
+    //! use this method in order to have 'SmRect::HasAlignInfo() == true'
     //! and thus having the attribut-fences updated in 'SmRect::ExtendBy'
     SmRect::operator = (SmRect(nWidth, nHeight));
 }
@@ -2362,7 +2362,7 @@ void SmTextNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
                             SIZ_FUNCTION : SIZ_TEXT;
     GetFont() *= Fraction (rFormat.GetRelSize(nSizeDesc), 100);
 
-    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, TRUE);
+    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, true);
     aTmpDev.SetFont(GetFont());
 
     SmRect::operator = (SmRect(aTmpDev, &rFormat, aText, GetFont().GetBorderWidth()));
@@ -2370,17 +2370,17 @@ void SmTextNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
 
 void SmTextNode::CreateTextFromNode(String &rText)
 {
-    BOOL bQuoted=FALSE;
+    bool bQuoted=false;
     if (GetToken().eType == TTEXT)
     {
         rText.Append('\"');
-        bQuoted=TRUE;
+        bQuoted=true;
     }
     else
     {
         SmParser aParseTest;
         SmNode *pTable = aParseTest.Parse(GetToken().aText);
-        bQuoted=TRUE;
+        bQuoted=true;
         if ( (pTable->GetType() == NTABLE) && (pTable->GetNumSubNodes() == 1) )
         {
             SmNode *pResult = pTable->GetSubNode(0);
@@ -2393,7 +2393,7 @@ void SmTextNode::CreateTextFromNode(String &rText)
                 {
                     pResult = pResult->GetSubNode(0);
                     if (pResult->GetType() == NTEXT)
-                        bQuoted=FALSE;
+                        bQuoted=false;
                 }
             }
         }
@@ -2612,7 +2612,7 @@ void SmMathSymbolNode::AdaptToX(const OutputDevice &rDev, ULONG nWidth)
     aFntSize.Width() = nWidth;
     GetFont().SetSize(aFntSize);
 
-    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, TRUE);
+    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, true);
     aTmpDev.SetFont(GetFont());
 
     // get denominator of error factor for width
@@ -2648,7 +2648,7 @@ void SmMathSymbolNode::AdaptToY(const OutputDevice &rDev, ULONG nHeight)
     aFntSize.Height() = nHeight;
     GetFont().SetSize(aFntSize);
 
-    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, TRUE);
+    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, true);
     aTmpDev.SetFont(GetFont());
 
     // get denominator of error factor for height
@@ -2692,7 +2692,7 @@ void SmMathSymbolNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat
 
     GetFont() *= Fraction (rFormat.GetRelSize(SIZ_TEXT), 100);
 
-    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, TRUE);
+    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, true);
     aTmpDev.SetFont(GetFont());
 
     SmRect::operator = (SmRect(aTmpDev, &rFormat, rText, GetFont().GetBorderWidth()));
@@ -2878,7 +2878,7 @@ void SmSpecialNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
 {
     PrepareAttributes();
 
-    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, TRUE);
+    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, true);
     aTmpDev.SetFont(GetFont());
 
     SmRect::operator = (SmRect(aTmpDev, &rFormat, GetText(), GetFont().GetBorderWidth()));
@@ -2891,7 +2891,7 @@ void SmGlyphSpecialNode::Arrange(const OutputDevice &rDev, const SmFormat &rForm
 {
     PrepareAttributes();
 
-    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, TRUE);
+    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, true);
     aTmpDev.SetFont(GetFont());
 
     SmRect::operator = (SmRect(aTmpDev, &rFormat, GetText(),
@@ -2915,7 +2915,7 @@ void SmPlaceNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
 {
     PrepareAttributes();
 
-    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, TRUE);
+    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, true);
     aTmpDev.SetFont(GetFont());
 
     SmRect::operator = (SmRect(aTmpDev, &rFormat, GetText(), GetFont().GetBorderWidth()));
@@ -2939,7 +2939,7 @@ void SmErrorNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
 {
     PrepareAttributes();
 
-    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, TRUE);
+    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, true);
     aTmpDev.SetFont(GetFont());
 
     const XubString &rText = GetText();
@@ -2977,7 +2977,7 @@ void SmBlankNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell)
 
 void SmBlankNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
 {
-    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, TRUE);
+    SmTmpDevice  aTmpDev ((OutputDevice &) rDev, true);
     aTmpDev.SetFont(GetFont());
 
     // Abstand von der Fonthoehe abhaengig machen
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 7952fa02aeb3..61d40ab3fb8f 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -53,7 +53,7 @@ using namespace ::com::sun::star::i18n;
 
 ///////////////////////////////////////////////////////////////////////////
 
-static inline BOOL strnccmp(const String &u1, xub_StrLen nIdx,
+static inline bool strnccmp(const String &u1, xub_StrLen nIdx,
                               const sal_Char *s2, xub_StrLen nLen)
 {
     return u1.EqualsIgnoreCaseAscii( s2, nIdx, nLen );
@@ -68,7 +68,7 @@ static const sal_Unicode aDelimiterTable[] =
 };
 
 
-static inline BOOL IsDigit( sal_Unicode cChar )
+static inline bool IsDigit( sal_Unicode cChar )
 {
     return '0' <= cChar && cChar <= '9';
 }
@@ -335,14 +335,14 @@ const SmTokenTableEntry * SmParser::GetTokenTableEntry( const String &rName )
 
 #if OSL_DEBUG_LEVEL
 
-BOOL SmParser::IsDelimiter( const String &rTxt, xub_StrLen nPos )
-    // returns 'TRUE' iff cChar is '\0' or a delimeter
+bool SmParser::IsDelimiter( const String &rTxt, xub_StrLen nPos )
+    // returns 'true' iff cChar is '\0' or a delimeter
 {
     OSL_ENSURE( nPos <= rTxt.Len(), "index out of range" );
 
     sal_Unicode cChar = rTxt.GetChar( nPos );
     if(!cChar)
-        return TRUE;
+        return true;
 
     // check if 'cChar' is in the delimeter table
     const sal_Unicode *pDelim = &aDelimiterTable[0];
@@ -350,11 +350,11 @@ BOOL SmParser::IsDelimiter( const String &rTxt, xub_StrLen nPos )
         if (*pDelim == cChar)
             break;
 
-    BOOL bIsDelim = *pDelim != 0;
 
     INT16 nTypJp = SM_MOD()->GetSysLocale().GetCharClass().getType( rTxt, nPos );
-    bIsDelim |= nTypJp == com::sun::star::i18n::UnicodeType::SPACE_SEPARATOR ||
-                nTypJp == com::sun::star::i18n::UnicodeType::CONTROL;
+    bool bIsDelim = (*pDelim != 0 ||
+            nTypJp == com::sun::star::i18n::UnicodeType::SPACE_SEPARATOR ||
+            nTypJp == com::sun::star::i18n::UnicodeType::CONTROL);
 
     return bIsDelim;
 }
@@ -408,8 +408,8 @@ void SmParser::NextToken()
     xub_StrLen  nBufLen = BufferString.Len();
     ParseResult aRes;
     xub_StrLen  nRealStart;
-    BOOL        bCont;
-    BOOL        bNumStart = FALSE;
+    bool        bCont;
+    bool        bNumStart = false;
     CharClass   aCC(SM_MOD()->GetSysLocale().GetCharClass().getLocale());
     do
     {
@@ -449,7 +449,7 @@ void SmParser::NextToken()
         nRealStart = BufferIndex + sal::static_int_cast< xub_StrLen >(aRes.LeadingWhiteSpace);
         BufferIndex = nRealStart;
 
-        bCont = FALSE;
+        bCont = false;
         if ( aRes.TokenType == 0  &&
                 nRealStart < nBufLen &&
                 '\n' == BufferString.GetChar( nRealStart ) )
@@ -457,7 +457,7 @@ void SmParser::NextToken()
             // keep data needed for tokens row and col entry up to date
             ++Row;
             BufferIndex = ColOff = nRealStart + 1;
-            bCont = TRUE;
+            bCont = true;
         }
         else if (aRes.TokenType & KParseType::ONE_SINGLE_CHAR)
         {
@@ -469,7 +469,7 @@ void SmParser::NextToken()
                 while (BufferIndex < nBufLen  &&
                     '\n' != BufferString.GetChar( BufferIndex ))
                     ++BufferIndex;
-                bCont = TRUE;
+                bCont = true;
             }
         }
 
@@ -481,7 +481,7 @@ void SmParser::NextToken()
     CurToken.nRow   = Row;
     CurToken.nCol   = nRealStart - ColOff + 1;
 
-    BOOL bHandled = TRUE;
+    bool bHandled = true;
     if (nRealStart >= nBufLen)
     {
         CurToken.eType     = TEND;
@@ -660,7 +660,7 @@ void SmParser::NextToken()
                     }
                     break;
                 default:
-                    bHandled = FALSE;
+                    bHandled = false;
             }
         }
     }
@@ -953,12 +953,12 @@ void SmParser::NextToken()
                     }
                     break;
                 default:
-                    bHandled = FALSE;
+                    bHandled = false;
             }
         }
     }
     else
-        bHandled = FALSE;
+        bHandled = false;
 
     if (!bHandled)
     {
@@ -1012,7 +1012,7 @@ void SmParser::Align()
     // parse alignment info (if any), then go on with rest of expression
 {
     SmStructureNode *pSNode = 0;
-    BOOL    bNeedGroupClose = FALSE;
+    bool    bNeedGroupClose = false;
 
     if (TokenInGroup(TGALIGN))
     {
@@ -1020,7 +1020,7 @@ void SmParser::Align()
             // encapsulate expression to be aligned in group braces
             // (here group-open brace)
         {   Insert('{', GetTokenIndex());
-            bNeedGroupClose = TRUE;
+            bNeedGroupClose = true;
 
             // get first valid align statement in sequence
             // (the dominant one in 4.0) and erase all others (especially old
@@ -1102,12 +1102,12 @@ void SmParser::Line()
 
 void SmParser::Expression()
 {
-    BOOL bUseExtraSpaces = TRUE;
+    bool bUseExtraSpaces = true;
     SmNode *pNode = NodeStack.Pop();
     if (pNode)
     {
         if (pNode->GetToken().eType == TNOSPACE)
-            bUseExtraSpaces = FALSE;
+            bUseExtraSpaces = false;
         else
             NodeStack.Push(pNode);  // push the node from above again (now to be used as argument to this current 'nospace' node)
     }
@@ -1180,7 +1180,7 @@ void SmParser::Product()
     {   SmStructureNode *pSNode;
         SmNode *pFirst = NodeStack.Pop(),
                *pOper;
-        BOOL bSwitchArgs = FALSE;
+        bool bSwitchArgs = false;
 
         SmTokenType eType = CurToken.eType;
         switch (eType)
@@ -1222,7 +1222,7 @@ void SmParser::Product()
                 pOper = new SmPolyLineNode(CurToken);
                 NextToken();
 
-                bSwitchArgs =TRUE;
+                bSwitchArgs = true;
                 break;
             }
 
@@ -1296,7 +1296,7 @@ void SmParser::SubSup(ULONG nActiveGroup)
             case TLSUB :    nIndex = (int) LSUB;    break;
             case TLSUP :    nIndex = (int) LSUP;    break;
             default :
-                OSL_ENSURE(FALSE, "Sm: unknown case");
+                OSL_ENSURE(false, "Sm: unknown case");
         }
         nIndex++;
         OSL_ENSURE(1 <= nIndex  &&  nIndex <= 1 + SUBSUP_NUM_ENTRIES,
@@ -1500,9 +1500,9 @@ void SmParser::Term()
                      ||  TokenInGroup(TGFONTATTR))
             {   SmStructureNodeArray  aArray;
 
-                BOOL    bIsAttr;
+                bool    bIsAttr;
                 USHORT  n = 0;
-                while (TRUE == (bIsAttr = TokenInGroup(TGATTRIBUT))
+                while (true == (bIsAttr = TokenInGroup(TGATTRIBUT))
                        ||  TokenInGroup(TGFONTATTR))
                 {   aArray.resize(n + 1);
 
@@ -1688,7 +1688,7 @@ void SmParser::UnOper()
 
     SmToken      aNodeToken = CurToken;
     SmTokenType  eType      = CurToken.eType;
-    BOOL         bIsPostfix = eType == TFACT;
+    bool         bIsPostfix = eType == TFACT;
 
     SmStructureNode *pSNode;
     SmNode *pOper   = 0,
@@ -1884,9 +1884,9 @@ void SmParser::Font()
 
 // gets number used as arguments in Math formulas (e.g. 'size' command)
 // Format: no negative numbers, must start with a digit, no exponent notation, ...
-BOOL lcl_IsNumber(const UniString& rText)
+bool lcl_IsNumber(const UniString& rText)
 {
-    BOOL bPoint = FALSE;
+    bool bPoint = false;
     const sal_Unicode* pBuffer = rText.GetBuffer();
     for(xub_StrLen nPos = 0; nPos < rText.Len(); nPos++, pBuffer++)
     {
@@ -1894,14 +1894,14 @@ BOOL lcl_IsNumber(const UniString& rText)
         if(cChar == '.')
         {
             if(bPoint)
-                return FALSE;
+                return false;
             else
-                bPoint = TRUE;
+                bPoint = true;
         }
         else if ( !IsDigit( cChar ) )
-            return FALSE;
+            return false;
     }
-    return TRUE;
+    return true;
 }
 
 void SmParser::FontSize()
@@ -1996,7 +1996,7 @@ void SmParser::Brace()
             pLeft = new SmMathSymbolNode(CurToken);
 
             NextToken();
-            Bracebody(TRUE);
+            Bracebody(true);
             pBody = NodeStack.Pop();
 
             if (CurToken.eType == TRIGHT)
@@ -2024,7 +2024,7 @@ void SmParser::Brace()
             pLeft = new SmMathSymbolNode(CurToken);
 
             NextToken();
-            Bracebody(FALSE);
+            Bracebody(false);
             pBody = NodeStack.Pop();
 
             SmTokenType  eExpectedType = TUNKNOWN;
@@ -2072,7 +2072,7 @@ void SmParser::Brace()
 }
 
 
-void SmParser::Bracebody(BOOL bIsLeftRight)
+void SmParser::Bracebody(bool bIsLeftRight)
 {
     SmStructureNode *pBody = new SmBracebodyNode(CurToken);
     SmNodeArray      aNodes;
@@ -2288,7 +2288,7 @@ void SmParser::Matrix()
 
 void SmParser::Special()
 {
-    BOOL bReplace = FALSE;
+    bool bReplace = false;
     String &rName = CurToken.aText;
     String aNewName;
 
@@ -2301,13 +2301,13 @@ void SmParser::Special()
         {
             const SmLocalizedSymbolData &rLSD = SM_MOD()->GetLocSymbolData();
             aNewName = rLSD.GetUiSymbolName( rName );
-            bReplace = TRUE;
+            bReplace = true;
         }
         else if (IsExportSymbolNames())
         {
             const SmLocalizedSymbolData &rLSD = SM_MOD()->GetLocSymbolData();
             aNewName = rLSD.GetExportSymbolName( rName );
-            bReplace = TRUE;
+            bReplace = true;
         }
     }
     else    // 5.0 <-> 6.0 formula text (symbol name) conversion
@@ -2336,7 +2336,7 @@ void SmParser::Special()
                 if (pFrom->GetString(i) == rName)
                 {
                     aNewName = pTo->GetString(i);
-                    bReplace = TRUE;
+                    bReplace = true;
                 }
             }
         }
@@ -2386,7 +2386,7 @@ void SmParser::Error(SmParseError eError)
 SmParser::SmParser()
 {
     eConversion = CONVERT_NONE;
-    bImportSymNames = bExportSymNames = FALSE;
+    bImportSymNames = bExportSymNames = false;
     nLang = Application::GetSettings().GetUILanguage();
 }
 
diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx
index 895bb0a18186..dc0a33728cd5 100644
--- a/starmath/source/rect.cxx
+++ b/starmath/source/rect.cxx
@@ -62,19 +62,19 @@ static xub_Unicode __READONLY_DATA aMathAlpha[] =
     xub_Unicode('\0')
 };
 
-BOOL SmIsMathAlpha(const XubString &rText)
-    // ergibt genau dann TRUE, wenn das Zeichen (aus dem StarMath Font) wie ein
+bool SmIsMathAlpha(const XubString &rText)
+    // ergibt genau dann true, wenn das Zeichen (aus dem StarMath Font) wie ein
     // Buchstabe behandelt werden soll.
 {
     if (rText.Len() == 0)
-        return FALSE;
+        return false;
 
     OSL_ENSURE(rText.Len() == 1, "Sm : string must be exactly one character long");
     xub_Unicode cChar = rText.GetChar(0);
 
     // ist es ein griechisches Zeichen ?
     if (xub_Unicode(0xE0AC) <= cChar  &&  cChar <= xub_Unicode(0xE0D4))
-        return TRUE;
+        return true;
     else
     {
         // kommt es in 'aMathAlpha' vor ?
@@ -98,7 +98,7 @@ SmRect::SmRect()
     OSL_ENSURE(aTopLeft == Point(0, 0), "Sm: ooops...");
     OSL_ENSURE(aSize == Size(0, 0), "Sm: ooops...");
 
-    bHasBaseline = bHasAlignInfo = FALSE;
+    bHasBaseline = bHasAlignInfo = false;
     nBaseline = nAlignT = nAlignM = nAlignB =
     nGlyphTop = nGlyphBottom =
     nItalicLeftSpace = nItalicRightSpace =
@@ -148,13 +148,13 @@ void SmRect::BuildRect(const OutputDevice &rDev, const SmFormat *pFormat,
     aSize = Size(rDev.GetTextWidth(rText), rDev.GetTextHeight());
 
     const FontMetric  aFM (rDev.GetFontMetric());
-    BOOL              bIsMath  = aFM.GetName().EqualsIgnoreCaseAscii( FONTNAME_MATH );
-    BOOL              bAllowSmaller = bIsMath && !SmIsMathAlpha(rText);
+    bool              bIsMath  = aFM.GetName().EqualsIgnoreCaseAscii( FONTNAME_MATH );
+    bool              bAllowSmaller = bIsMath && !SmIsMathAlpha(rText);
     const long        nFontHeight = rDev.GetFont().GetSize().Height();
 
     nBorderWidth  = nBorder;
-    bHasAlignInfo = TRUE;
-    bHasBaseline  = TRUE;
+    bHasAlignInfo = true;
+    bHasBaseline  = true;
     nBaseline     = aFM.GetAscent();
     nAlignT       = nBaseline - nFontHeight * 750L / 1000L;
     nAlignM       = nBaseline - nFontHeight * 121L / 422L;
@@ -188,7 +188,7 @@ void SmRect::BuildRect(const OutputDevice &rDev, const SmFormat *pFormat,
     // get GlyphBoundRect
     Rectangle  aGlyphRect;
 #if OSL_DEBUG_LEVEL > 1
-    BOOL bSuccess =
+    bool bSuccess =
 #endif
                 SmGetGlyphBoundRect(rDev, rText, aGlyphRect);
 #if OSL_DEBUG_LEVEL > 1
@@ -262,8 +262,8 @@ SmRect::SmRect(long nWidth, long nHeight)
 {
     OSL_ENSURE(aTopLeft == Point(0, 0), "Sm: ooops...");
 
-    bHasBaseline  = FALSE;
-    bHasAlignInfo = TRUE;
+    bHasBaseline  = false;
+    bHasAlignInfo = true;
     nBaseline     = 0;
     nAlignT       = GetTop();
     nAlignB       = GetBottom();
@@ -350,7 +350,7 @@ const Point SmRect::AlignTo(const SmRect &rRect, RectPos ePos,
                        + GetItalicLeftSpace();
             break;
         default :
-            OSL_ENSURE(FALSE, "Sm: unknown case");
+            OSL_ENSURE(false, "Sm: unknown case");
     }
 
     // check if horizontal position is already set
@@ -387,7 +387,7 @@ const Point SmRect::AlignTo(const SmRect &rRect, RectPos ePos,
                 aPos.Y() += rRect.GetLoAttrFence() - GetTop();
                 break;
         default :
-                OSL_ENSURE(FALSE, "Sm: unknown case");
+                OSL_ENSURE(false, "Sm: unknown case");
         }
 
     // check if vertical position is already set
@@ -404,7 +404,7 @@ const Point SmRect::AlignTo(const SmRect &rRect, RectPos ePos,
                 aPos.X() += rRect.GetItalicRight() - GetItalicRight();
                 break;
             default :
-                OSL_ENSURE(FALSE, "Sm: unknown case");
+                OSL_ENSURE(false, "Sm: unknown case");
         }
 
     return aPos;
@@ -495,7 +495,7 @@ SmRect & SmRect::ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode)
                     CopyMBL(rRect);
                 break;
             default :
-                OSL_ENSURE(FALSE, "Sm: unknown case");
+                OSL_ENSURE(false, "Sm: unknown case");
         }
     }
 
@@ -520,7 +520,7 @@ SmRect & SmRect::ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode,
 
 
 SmRect & SmRect::ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode,
-                          BOOL bKeepVerAlignParams)
+                          bool bKeepVerAlignParams)
     // as 'ExtendBy' but keeps original values for AlignT, -M and -B and
     // baseline.
     // (this is used in 'SmSupSubNode' where the sub-/supscripts shouldn't
@@ -530,7 +530,7 @@ SmRect & SmRect::ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode,
           nOldAlignM   = GetAlignM(),
           nOldAlignB   = GetAlignB(),
           nOldBaseline = nBaseline;     //! depends not on 'HasBaseline'
-    BOOL  bOldHasAlignInfo = HasAlignInfo();
+    bool  bOldHasAlignInfo = HasAlignInfo();
 
     ExtendBy(rRect, eCopyMode);
 
@@ -552,7 +552,7 @@ long SmRect::OrientedDist(const Point &rPoint) const
     // rectangle.
     // For simplicity the maximum-norm is used.
 {
-    BOOL  bIsInside = IsInsideItalicRect(rPoint);
+    bool  bIsInside = IsInsideItalicRect(rPoint);
 
     // build reference point to define the distance
     Point  aRef;
@@ -590,7 +590,7 @@ long SmRect::OrientedDist(const Point &rPoint) const
 }
 
 
-BOOL SmRect::IsInsideRect(const Point &rPoint) const
+bool SmRect::IsInsideRect(const Point &rPoint) const
 {
     return     rPoint.Y() >= GetTop()
            &&  rPoint.Y() <= GetBottom()
@@ -599,7 +599,7 @@ BOOL SmRect::IsInsideRect(const Point &rPoint) const
 }
 
 
-BOOL SmRect::IsInsideItalicRect(const Point &rPoint) const
+bool SmRect::IsInsideItalicRect(const Point &rPoint) const
 {
     return     rPoint.Y() >= GetTop()
            &&  rPoint.Y() <= GetBottom()
@@ -696,7 +696,7 @@ void SmDrawFrame(OutputDevice &rDev, const Rectangle &rRec,
 #endif //SM_RECT_DEBUG
 
 
-BOOL SmGetGlyphBoundRect(const OutputDevice &rDev,
+bool SmGetGlyphBoundRect(const OutputDevice &rDev,
                          const XubString &rText, Rectangle &rRect)
     // basically the same as 'GetTextBoundRect' (in class 'OutputDevice')
     // but with a string as argument.
@@ -705,7 +705,7 @@ BOOL SmGetGlyphBoundRect(const OutputDevice &rDev,
     xub_StrLen nLen = rText.Len();
     if (nLen == 0)
     {   rRect.SetEmpty();
-        return TRUE;
+        return true;
     }
 
     // get a device where 'OutputDevice::GetTextBoundRect' will be successful
@@ -743,7 +743,7 @@ BOOL SmGetGlyphBoundRect(const OutputDevice &rDev,
     Rectangle   aResult (aPoint, Size(nTextWidth, rDev.GetTextHeight())),
                 aTmp;
 
-    BOOL bSuccess = pGlyphDev->GetTextBoundRect(aTmp, rText, 0, 0);
+    bool bSuccess = pGlyphDev->GetTextBoundRect(aTmp, rText, 0, 0);
     OSL_ENSURE( bSuccess, "GetTextBoundRect failed" );
 
 
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index f599dc1070bb..ffae33b07d0c 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -199,9 +199,9 @@ SmFilterDetect::~SmFilterDetect()
     {
         // ctor of SfxMedium uses owner transition of ItemSet
         SfxMedium aMedium( aURL, bWasReadOnly ? STREAM_STD_READ : STREAM_STD_READWRITE, FALSE, NULL, pSet );
-        aMedium.UseInteractionHandler( TRUE );
+        aMedium.UseInteractionHandler( true );
 
-        BOOL bIsStorage = aMedium.IsStorage();
+        bool bIsStorage = aMedium.IsStorage();
         if ( aMedium.GetErrorCode() == ERRCODE_NONE )
         {
             // remember input stream and content and put them into the descriptor later
@@ -468,14 +468,14 @@ UNOSEQUENCE< UNOOUSTRING > SmFilterDetect::impl_getStaticSupportedServiceNames()
 {
     UNOMUTEXGUARD aGuard( UNOMUTEX::getGlobalMutex() );
     UNOSEQUENCE< UNOOUSTRING > seqServiceNames( 1 );
-    seqServiceNames.getArray() [0] = UNOOUSTRING::createFromAscii( "com.sun.star.frame.ExtendedTypeDetection"  );
+    seqServiceNames.getArray() [0] = UNOOUSTRING(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ExtendedTypeDetection"  ));
     return seqServiceNames ;
 }
 
 /* Helper for XServiceInfo */
 UNOOUSTRING SmFilterDetect::impl_getStaticImplementationName()
 {
-    return UNOOUSTRING::createFromAscii( "com.sun.star.comp.math.FormatDetector" );
+    return UNOOUSTRING(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.math.FormatDetector" ));
 }
 
 /* Helper for registry */
diff --git a/starmath/source/smdll.cxx b/starmath/source/smdll.cxx
index d425db27f924..930c09488223 100644
--- a/starmath/source/smdll.cxx
+++ b/starmath/source/smdll.cxx
@@ -52,7 +52,7 @@
 
 
 
-BOOL SmDLL::bInitialized = FALSE;
+bool SmDLL::bInitialized = false;
 
 /*************************************************************************
 |*
@@ -64,7 +64,7 @@ void SmDLL::Init()
     if ( bInitialized )
         return;
 
-    bInitialized = TRUE;
+    bInitialized = true;
 
     SfxObjectFactory& rFactory = SmDocShell::Factory();
 
@@ -88,10 +88,10 @@ void SmDLL::Init()
     SvxUndoRedoControl::RegisterControl( SID_REDO, pp );
     XmlSecStatusBarControl::RegisterControl( SID_SIGNATURE, pp );
 
-    SmToolBoxWrapper::RegisterChildWindow(TRUE);
-    SmCmdBoxWrapper::RegisterChildWindow(TRUE);
+    SmToolBoxWrapper::RegisterChildWindow(true);
+    SmCmdBoxWrapper::RegisterChildWindow(true);
 
-    ::sfx2::TaskPaneWrapper::RegisterChildWindow( FALSE, pp );
+    ::sfx2::TaskPaneWrapper::RegisterChildWindow( false, pp );
 }
 
 /*************************************************************************
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index c35d77c9afcf..3e0dea4fa380 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -33,8 +33,6 @@
 #include "toolbox.hrc"
 
 #define IMAGE_STDBTN_COLOR Color { Red = 0xff00; Green = 0x0000; Blue = 0xff00; }
-#define IMAGE_STDBTN_COLOR_HC IMAGE_STDBTN_COLOR
-
 #define MN_SUB_TOOLBAR 32
 #define WORKARROUND_1 1
 #define WORKARROUND_3 3
@@ -567,10 +565,6 @@ ModalDialog RID_DISTANCEDIALOG
         {
             File = "dist11.bmp" ;
         };
-        Bitmap 21
-        {
-            File = "dist11_h.bmp" ;
-        };
         String 3
         {
             Text [ en-US ] = "~Line spacing";
@@ -579,10 +573,6 @@ ModalDialog RID_DISTANCEDIALOG
         {
             File = "dist12.bmp" ;
         };
-        Bitmap 31
-        {
-            File = "dist12_h.bmp" ;
-        };
         String 4
         {
             Text [ en-US ] = "~Root spacing";
@@ -591,10 +581,6 @@ ModalDialog RID_DISTANCEDIALOG
         {
             File = "dist13.bmp" ;
         };
-        Bitmap 41
-        {
-            File = "dist13_h.bmp" ;
-        };
     };
     Resource 2
     {
@@ -610,10 +596,6 @@ ModalDialog RID_DISTANCEDIALOG
         {
             File = "dist21.bmp" ;
         };
-        Bitmap 21
-        {
-            File = "dist21_h.bmp" ;
-        };
         String 3
         {
             Text [ en-US ] = "S~ubscript";
@@ -622,10 +604,6 @@ ModalDialog RID_DISTANCEDIALOG
         {
             File = "dist22.bmp" ;
         };
-        Bitmap 31
-        {
-            File = "dist22_h.bmp" ;
-        };
     };
     Resource 3
     {
@@ -641,10 +619,6 @@ ModalDialog RID_DISTANCEDIALOG
         {
             File = "dist31.bmp" ;
         };
-        Bitmap 21
-        {
-            File = "dist31_h.bmp" ;
-        };
         String 3
         {
             Text [ en-US ] = "~Denominator";
@@ -653,10 +627,6 @@ ModalDialog RID_DISTANCEDIALOG
         {
             File = "dist32.bmp" ;
         };
-        Bitmap 31
-        {
-            File = "dist32_h.bmp" ;
-        };
     };
     Resource 4
     {
@@ -672,10 +642,6 @@ ModalDialog RID_DISTANCEDIALOG
         {
             File = "dist41.bmp" ;
         };
-        Bitmap 21
-        {
-            File = "dist41_h.bmp" ;
-        };
         String 3
         {
             Text [ en-US ] = "~Weight";
@@ -684,10 +650,6 @@ ModalDialog RID_DISTANCEDIALOG
         {
             File = "dist42.bmp" ;
         };
-        Bitmap 31
-        {
-            File = "dist42_h.bmp" ;
-        };
     };
     Resource 5
     {
@@ -703,10 +665,6 @@ ModalDialog RID_DISTANCEDIALOG
         {
             File = "dist51.bmp" ;
         };
-        Bitmap 21
-        {
-            File = "dist51_h.bmp" ;
-        };
         String 3
         {
             Text [ en-US ] = "~Lower limit";
@@ -715,10 +673,6 @@ ModalDialog RID_DISTANCEDIALOG
         {
             File = "dist52.bmp" ;
         };
-        Bitmap 31
-        {
-            File = "dist52_h.bmp" ;
-        };
     };
     Resource 6
     {
@@ -734,10 +688,6 @@ ModalDialog RID_DISTANCEDIALOG
         {
             File = "dist61.bmp" ;
         };
-        Bitmap 21
-        {
-            File = "dist61_h.bmp" ;
-        };
         String 3
         {
             Text [ en-US ] = "~Spacing";
@@ -746,10 +696,6 @@ ModalDialog RID_DISTANCEDIALOG
         {
             File = "dist62.bmp" ;
         };
-        Bitmap 31
-        {
-            File = "dist62_h.bmp" ;
-        };
         String 5
         {
             Text [ en-US ] = "~Excess size";
@@ -758,10 +704,6 @@ ModalDialog RID_DISTANCEDIALOG
         {
             File = "dist61.bmp" ;
         };
-        Bitmap 51
-        {
-            File = "dist61_h.bmp" ;
-        };
     };
     Resource 7
     {
@@ -777,10 +719,6 @@ ModalDialog RID_DISTANCEDIALOG
         {
             File = "dist71.bmp" ;
         };
-        Bitmap 21
-        {
-            File = "dist71_h.bmp" ;
-        };
         String 3
         {
             Text [ en-US ] = "~Column spacing";
@@ -789,10 +727,6 @@ ModalDialog RID_DISTANCEDIALOG
         {
             File = "dist72.bmp" ;
         };
-        Bitmap 31
-        {
-            File = "dist72_h.bmp" ;
-        };
     };
     Resource 8
     {
@@ -808,10 +742,6 @@ ModalDialog RID_DISTANCEDIALOG
         {
             File = "dist81.bmp" ;
         };
-        Bitmap 21
-        {
-            File = "dist81_h.bmp" ;
-        };
         String 3
         {
             Text [ en-US ] = "~Minimum spacing";
@@ -820,10 +750,6 @@ ModalDialog RID_DISTANCEDIALOG
         {
             File = "dist82.bmp" ;
         };
-        Bitmap 31
-        {
-            File = "dist82_h.bmp" ;
-        };
     };
     Resource 9
     {
@@ -839,10 +765,6 @@ ModalDialog RID_DISTANCEDIALOG
         {
             File = "dist91.bmp" ;
         };
-        Bitmap 21
-        {
-            File = "dist91_h.bmp" ;
-        };
         String 3
         {
             Text [ en-US ] = "~Spacing";
@@ -851,10 +773,6 @@ ModalDialog RID_DISTANCEDIALOG
         {
             File = "dist92.bmp" ;
         };
-        Bitmap 31
-        {
-            File = "dist92_h.bmp" ;
-        };
     };
     Resource 10
     {
@@ -870,10 +788,6 @@ ModalDialog RID_DISTANCEDIALOG
         {
             File = "dist101.bmp" ;
         };
-        Bitmap 21
-        {
-            File = "dist101_h.bmp" ;
-        };
         String 3
         {
             Text [ en-US ] = "~Right";
@@ -882,10 +796,6 @@ ModalDialog RID_DISTANCEDIALOG
         {
             File = "dist102.bmp" ;
         };
-        Bitmap 31
-        {
-            File = "dist102_h.bmp" ;
-        };
         String 4
         {
             Text [ en-US ] = "~Top";
@@ -894,10 +804,6 @@ ModalDialog RID_DISTANCEDIALOG
         {
             File = "dist103.bmp" ;
         };
-        Bitmap 41
-        {
-            File = "dist103_h.bmp" ;
-        };
         String 5
         {
             Text [ en-US ] = "~Bottom";
@@ -906,10 +812,6 @@ ModalDialog RID_DISTANCEDIALOG
         {
             File = "dist104.bmp" ;
         };
-        Bitmap 51
-        {
-            File = "dist104_h.bmp" ;
-        };
     };
 };
 
@@ -1277,11 +1179,6 @@ ModalDialog RID_SYMDEFINEDIALOG
         ImageBitmap = Bitmap { File = "ar_right.bmp" ; };
         MaskColor = IMAGE_STDBTN_COLOR ;
     };
-    Image 2
-    {
-        ImageBitmap = Bitmap { File = "ar_right_h.bmp" ; };
-        MaskColor = IMAGE_STDBTN_COLOR ;
-    };
     FixedImage BMP_ARROW_RIGHT
     {
         Pos  = MAP_APPFONT ( 252 , 142 ) ;
@@ -3002,12 +2899,6 @@ DockingWindow RID_CMDBOXWINDOW\
         MaskColor = IMAGE_STDBTN_COLOR ;
         UNBINOPS_IDLIST
     };
-    ImageList RID_ILH_UNBINOPS
-    {
-        Prefix = "unh";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        UNBINOPS_IDLIST
-    };
 
 #define RELATIONS_IDLIST         \
     IdList =                \
@@ -3042,12 +2933,6 @@ DockingWindow RID_CMDBOXWINDOW\
         MaskColor = IMAGE_STDBTN_COLOR ;
         RELATIONS_IDLIST
     };
-    ImageList RID_ILH_RELATIONS
-    {
-        Prefix = "bih";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        RELATIONS_IDLIST
-    };
 
 #define SETOPERATIONS_IDLIST             \
     IdList =                    \
@@ -3083,12 +2968,6 @@ DockingWindow RID_CMDBOXWINDOW\
         MaskColor = IMAGE_STDBTN_COLOR ;
         SETOPERATIONS_IDLIST
     };
-    ImageList RID_ILH_SETOPERATIONS
-    {
-        Prefix = "oph";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        SETOPERATIONS_IDLIST
-    };
 
 #define FUNCTIONS_IDLIST         \
     IdList =                \
@@ -3127,12 +3006,6 @@ DockingWindow RID_CMDBOXWINDOW\
         MaskColor = IMAGE_STDBTN_COLOR ;
         FUNCTIONS_IDLIST
     };
-    ImageList RID_ILH_FUNCTIONS
-    {
-        Prefix = "fuh";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        FUNCTIONS_IDLIST
-    };
 
 #define OPERATORS_IDLIST         \
     IdList =                \
@@ -3159,12 +3032,6 @@ DockingWindow RID_CMDBOXWINDOW\
         MaskColor = IMAGE_STDBTN_COLOR ;
         OPERATORS_IDLIST
     };
-    ImageList RID_ILH_OPERATORS
-    {
-        Prefix = "foh";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        OPERATORS_IDLIST
-    };
 
 #define ATTRIBUTES_IDLIST             \
     IdList =                    \
@@ -3201,12 +3068,6 @@ DockingWindow RID_CMDBOXWINDOW\
         MaskColor = IMAGE_STDBTN_COLOR ;
         ATTRIBUTES_IDLIST
     };
-    ImageList RID_ILH_ATTRIBUTES
-    {
-        Prefix = "ath";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        ATTRIBUTES_IDLIST
-    };
 
 #define BRACKETS_IDLIST             \
     IdList =                    \
@@ -3239,12 +3100,6 @@ DockingWindow RID_CMDBOXWINDOW\
         MaskColor = IMAGE_STDBTN_COLOR ;
         BRACKETS_IDLIST
     };
-    ImageList RID_ILH_BRACKETS
-    {
-        Prefix = "alh";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        BRACKETS_IDLIST
-    };
 
 #define FORMAT_IDLIST         \
     IdList =                \
@@ -3273,12 +3128,6 @@ DockingWindow RID_CMDBOXWINDOW\
         MaskColor = IMAGE_STDBTN_COLOR ;
         FORMAT_IDLIST
     };
-    ImageList RID_ILH_FORMAT
-    {
-        Prefix = "coh";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        FORMAT_IDLIST
-    };
 
 #define MISC_IDLIST         \
     IdList =                \
@@ -3311,12 +3160,6 @@ DockingWindow RID_CMDBOXWINDOW\
         MaskColor = IMAGE_STDBTN_COLOR ;
         MISC_IDLIST
     };
-    ImageList RID_ILH_MISC
-    {
-        Prefix = "mih";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        MISC_IDLIST
-    };
 
 #define CATALOG_IDLIST                  \
     IdList =                        \
@@ -3339,14 +3182,6 @@ DockingWindow RID_CMDBOXWINDOW\
         MaskColor = IMAGE_STDBTN_COLOR ;
         CATALOG_IDLIST
     };
-    ImageList RID_ILH_CATALOG
-    {
-        Prefix = "imh";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        CATALOG_IDLIST
-    };
-
-
 
 String STR_CMDBOXWINDOW
 {
diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx
index fd2c7ea76f76..89d99a4f5c1f 100644
--- a/starmath/source/symbol.cxx
+++ b/starmath/source/symbol.cxx
@@ -64,11 +64,11 @@ SmSym::SmSym() :
     m_aName(C2S("unknown")),
     m_aSetName(C2S("unknown")),
     m_cChar('\0'),
-    m_bPredefined(FALSE),
-    m_bDocSymbol(FALSE)
+    m_bPredefined(false),
+    m_bDocSymbol(false)
 {
     m_aExportName = m_aName;
-    m_aFace.SetTransparent(TRUE);
+    m_aFace.SetTransparent(true);
     m_aFace.SetAlign(ALIGN_BASELINE);
 }
 
@@ -80,18 +80,18 @@ SmSym::SmSym(const SmSym& rSymbol)
 
 
 SmSym::SmSym(const String& rName, const Font& rFont, sal_Unicode cChar,
-             const String& rSet, BOOL bIsPredefined)
+             const String& rSet, bool bIsPredefined)
 {
     m_aName     = m_aExportName   = rName;
 
     m_aFace     = rFont;
-    m_aFace.SetTransparent(TRUE);
+    m_aFace.SetTransparent(true);
     m_aFace.SetAlign(ALIGN_BASELINE);
 
     m_cChar         = cChar;
     m_aSetName      = rSet;
     m_bPredefined   = bIsPredefined;
-    m_bDocSymbol    = FALSE;
+    m_bDocSymbol    = false;
 }
 
 
@@ -298,7 +298,7 @@ void SmSymbolManager::Load()
         String aSymbolName( (sal_Unicode)'i' );
         aSymbolName += rSym.GetName();
         SmSym aSymbol( aSymbolName, aFont, rSym.GetCharacter(),
-                aSymbolSetName, TRUE /*bIsPredefined*/ );
+                aSymbolSetName, true /*bIsPredefined*/ );
 
         AddOrReplaceSymbol( aSymbol );
     }
diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx
index ff253fbb80f1..214fd74c92f2 100644
--- a/starmath/source/toolbox.cxx
+++ b/starmath/source/toolbox.cxx
@@ -46,7 +46,7 @@
 
 ////////////////////////////////////////////////////////////
 
-static USHORT  GetImageListRID( USHORT nCategoryRID, BOOL bHighContrast )
+static USHORT  GetImageListRID( USHORT nCategoryRID )
 {
     USHORT nRes = 0xFFFF;
     switch (nCategoryRID)
@@ -63,8 +63,6 @@ static USHORT  GetImageListRID( USHORT nCategoryRID, BOOL bHighContrast )
         default :
             DBG_ERROR( "unkown category" );
     }
-    if (nRes != 0xFFFF && bHighContrast)
-        ++nRes;     //! the resource ID for the high contrast image list is just +1 compared to the regular ones
     return nRes;
 }
 
@@ -95,26 +93,17 @@ static USHORT  GetCategoryRID( USHORT nResId )
     USHORT nRes = 0xFFFF;
     switch (nResId)
     {
-        case RID_IL_UNBINOPS        :
-        case RID_ILH_UNBINOPS       : nRes = RID_UNBINOPS_CAT; break;
-        case RID_IL_RELATIONS       :
-        case RID_ILH_RELATIONS      : nRes = RID_RELATIONS_CAT; break;
-        case RID_IL_SETOPERATIONS   :
-        case RID_ILH_SETOPERATIONS  : nRes = RID_SETOPERATIONS_CAT; break;
-        case RID_IL_FUNCTIONS       :
-        case RID_ILH_FUNCTIONS      : nRes = RID_FUNCTIONS_CAT; break;
-        case RID_IL_OPERATORS       :
-        case RID_ILH_OPERATORS      : nRes = RID_OPERATORS_CAT; break;
-        case RID_IL_ATTRIBUTES      :
-        case RID_ILH_ATTRIBUTES     : nRes = RID_ATTRIBUTES_CAT; break;
-        case RID_IL_BRACKETS        :
-        case RID_ILH_BRACKETS       : nRes = RID_BRACKETS_CAT; break;
-        case RID_IL_FORMAT          :
-        case RID_ILH_FORMAT         : nRes = RID_FORMAT_CAT; break;
-        case RID_IL_MISC            :
-        case RID_ILH_MISC           : nRes = RID_MISC_CAT; break;
+        case RID_IL_UNBINOPS       : nRes = RID_UNBINOPS_CAT; break;
+        case RID_IL_RELATIONS      : nRes = RID_RELATIONS_CAT; break;
+        case RID_IL_SETOPERATIONS  : nRes = RID_SETOPERATIONS_CAT; break;
+        case RID_IL_FUNCTIONS      : nRes = RID_FUNCTIONS_CAT; break;
+        case RID_IL_OPERATORS      : nRes = RID_OPERATORS_CAT; break;
+        case RID_IL_ATTRIBUTES     : nRes = RID_ATTRIBUTES_CAT; break;
+        case RID_IL_BRACKETS       : nRes = RID_BRACKETS_CAT; break;
+        case RID_IL_FORMAT         : nRes = RID_FORMAT_CAT; break;
+        case RID_IL_MISC           : nRes = RID_MISC_CAT; break;
         default :
-            if (nResId != RID_IL_CATALOG  &&  nResId != RID_ILH_CATALOG)
+            if (nResId != RID_IL_CATALOG)
             {
 #if OSL_DEBUG_LEVEL > 1
                 DBG_ERROR( "unkown category" );
@@ -154,10 +143,7 @@ SmToolBoxWindow::SmToolBoxWindow(SfxBindings *pTmpBindings,
     pToolBoxCmd = vToolBoxCategories[0];
 
     for (i = 0;  i <= NUM_TBX_CATEGORIES; ++i)
-    {
         aImageLists [i] = 0;
-        aImageListsH[i] = 0;
-    }
 
     FreeResource();
 
@@ -174,10 +160,7 @@ SmToolBoxWindow::~SmToolBoxWindow()
         delete pBox;
     }
     for (i = 0;  i < NUM_TBX_CATEGORIES + 1;  ++i)
-    {
         delete aImageLists[i];
-        delete aImageListsH[i];
-    }
 }
 
 
@@ -188,7 +171,7 @@ SmViewShell * SmToolBoxWindow::GetView()
 }
 
 
-const ImageList * SmToolBoxWindow::GetImageList( USHORT nResId, BOOL bHighContrast )
+const ImageList * SmToolBoxWindow::GetImageList( USHORT nResId )
 {
     // creates the image list via its resource id and stores that
     // list for later use in the respective array.
@@ -198,12 +181,12 @@ const ImageList * SmToolBoxWindow::GetImageList( USHORT nResId, BOOL bHighContra
     // get index to use
     USHORT nCategoryRID = GetCategoryRID( nResId );
     sal_Int16 nIndex = GetToolBoxCategoriesIndex( nCategoryRID );
-    if (nIndex == -1 && (nResId == RID_IL_CATALOG || nResId == RID_ILH_CATALOG))
+    if (nIndex == -1 && (nResId == RID_IL_CATALOG))
         nIndex = NUM_TBX_CATEGORIES;
 
     if (nIndex >= 0)
     {
-        ImageList **pImgList = bHighContrast ? aImageListsH : aImageLists;
+        ImageList **pImgList = aImageLists;
         if (!pImgList[ nIndex ])
             pImgList[ nIndex ] = new ImageList( SmResId(nResId) );
         pIL = pImgList[ nIndex ];
@@ -216,18 +199,16 @@ const ImageList * SmToolBoxWindow::GetImageList( USHORT nResId, BOOL bHighContra
 
 void SmToolBoxWindow::ApplyImageLists( USHORT nCategoryRID )
 {
-    BOOL bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
     // set image list for toolbox 'catalog'
-    const ImageList *pImageList = GetImageList( bHighContrast ? RID_ILH_CATALOG : RID_IL_CATALOG, bHighContrast );
+    const ImageList *pImageList = GetImageList( RID_IL_CATALOG );
     OSL_ENSURE( pImageList, "image list missing" );
     if (pImageList)
         aToolBoxCat.SetImageList( *pImageList );
 
     // set image list for active (visible) category of 'catalog'
     sal_Int16 nIdx = GetToolBoxCategoriesIndex( nCategoryRID );
-    USHORT nResId = GetImageListRID( nCategoryRID, bHighContrast );
-    pImageList = GetImageList( nResId, bHighContrast );
+    USHORT nResId = GetImageListRID( nCategoryRID );
+    pImageList = GetImageList( nResId );
     OSL_ENSURE( pImageList && nIdx >= 0, "image list or index missing" );
     if (pImageList && nIdx >= 0)
         vToolBoxCategories[ nIdx ]->SetImageList( *pImageList );
@@ -243,12 +224,12 @@ void SmToolBoxWindow::DataChanged( const DataChangedEvent &rEvt )
 
 void SmToolBoxWindow::StateChanged( StateChangedType nStateChange )
 {
-    static BOOL bSetPosition = TRUE;
+    static bool bSetPosition = true;
     if (STATE_CHANGE_INITSHOW == nStateChange)
     {
         // calculate initial position to be used after creation of the window...
         AdjustPosSize( bSetPosition );
-        bSetPosition = FALSE;
+        bSetPosition = false;
 
         SetCategory(RID_UNBINOPS_CAT);
     }
@@ -257,7 +238,7 @@ void SmToolBoxWindow::StateChanged( StateChangedType nStateChange )
 }
 
 
-void SmToolBoxWindow::AdjustPosSize( BOOL bSetPos )
+void SmToolBoxWindow::AdjustPosSize( bool bSetPos )
 {
     Size aCatSize( aToolBoxCat.CalcWindowSizePixel( 2 ) );
     Size aCmdSize( pToolBoxCmd->CalcWindowSizePixel( 5 ) );
@@ -310,8 +291,8 @@ BOOL SmToolBoxWindow::Close()
     if (pViewSh)
         pViewSh->GetViewFrame()->GetDispatcher()->Execute(
                 SID_TOOLBOX, SFX_CALLMODE_STANDARD,
-                new SfxBoolItem(SID_TOOLBOX, FALSE), 0L);
-    return TRUE;
+                new SfxBoolItem(SID_TOOLBOX, false), 0L);
+    return true;
 }
 
 void SmToolBoxWindow::GetFocus()
@@ -361,9 +342,9 @@ void SmToolBoxWindow::SetCategory(USHORT nCategoryRID)
         SetOutputSizePixel( aWndSize );
 
         if (nActiveCategoryRID)
-            aToolBoxCat.CheckItem(nActiveCategoryRID, FALSE);
+            aToolBoxCat.CheckItem(nActiveCategoryRID, false);
         nActiveCategoryRID = nCategoryRID;
-        aToolBoxCat.CheckItem(nActiveCategoryRID, TRUE);
+        aToolBoxCat.CheckItem(nActiveCategoryRID, true);
 
         pToolBoxCmd->Show();
     }
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 6edee27b11a8..c439e33361b0 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -501,7 +501,7 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any*
             {
                 if((*pValues).getValueType() != ::getBooleanCppuType())
                     throw IllegalArgumentException();
-                BOOL bVal = *(sal_Bool*)(*pValues).getValue();
+                bool bVal = *(sal_Bool*)(*pValues).getValue();
                 Font aNewFont(aFormat.GetFont((*ppEntries)->mnMemberId));
                 aNewFont.SetItalic((bVal) ? ITALIC_NORMAL : ITALIC_NONE);
                 aFormat.SetFont((*ppEntries)->mnMemberId, aNewFont);
@@ -517,7 +517,7 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any*
             {
                 if((*pValues).getValueType() != ::getBooleanCppuType())
                     throw IllegalArgumentException();
-                BOOL bVal = *(sal_Bool*)(*pValues).getValue();
+                bool bVal = *(sal_Bool*)(*pValues).getValue();
                 Font aNewFont(aFormat.GetFont((*ppEntries)->mnMemberId));
                 aNewFont.SetWeight((bVal) ? WEIGHT_BOLD : WEIGHT_NORMAL);
                 aFormat.SetFont((*ppEntries)->mnMemberId, aNewFont);
@@ -761,7 +761,7 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu
             case HANDLE_FONT_TEXT_POSTURE        :
             {
                 const SmFace &  rFace = aFormat.GetFont((*ppEntries)->mnMemberId);
-                BOOL bVal = IsItalic( rFace );
+                bool bVal = IsItalic( rFace );
                 (*pValue).setValue(&bVal, *(*ppEntries)->mpType);
             }
             break;
@@ -774,7 +774,7 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu
             case HANDLE_FONT_TEXT_WEIGHT         :
             {
                 const SmFace &  rFace = aFormat.GetFont((*ppEntries)->mnMemberId);
-                BOOL bVal = IsBold( rFace ); // bold?
+                bool bVal = IsBold( rFace ); // bold?
                 (*pValue).setValue(&bVal, *(*ppEntries)->mpType);
             }
             break;
diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx
index 330314118ad7..68690b179a3b 100644
--- a/starmath/source/utility.cxx
+++ b/starmath/source/utility.cxx
@@ -156,7 +156,7 @@ void SmFontPickList::DestroyItem(void *pItem)
     delete (Font *)pItem;
 }
 
-BOOL SmFontPickList::CompareItem(const void *pFirstItem, const void *pSecondItem) const
+bool SmFontPickList::CompareItem(const void *pFirstItem, const void *pSecondItem) const
 {
     Font    *pFirstFont, *pSecondFont;
 
@@ -168,9 +168,9 @@ BOOL SmFontPickList::CompareItem(const void *pFirstItem, const void *pSecondItem
             (pFirstFont->GetCharSet() == pSecondFont->GetCharSet()) &&
             (pFirstFont->GetWeight()  == pSecondFont->GetWeight())  &&
             (pFirstFont->GetItalic()  == pSecondFont->GetItalic()))
-            return (TRUE);
+            return (true);
 
-    return FALSE;
+    return false;
 }
 
 String SmFontPickList::GetStringItem(void *pItem)
@@ -309,7 +309,7 @@ void SmFontPickListBox::Remove(const Font &rFont)
 
 ////////////////////////////////////////
 
-BOOL IsItalic( const Font &rFont )
+bool IsItalic( const Font &rFont )
 {
     FontItalic eItalic = rFont.GetItalic();
     // the code below leaves only _NONE and _DONTKNOW as not italic
@@ -317,7 +317,7 @@ BOOL IsItalic( const Font &rFont )
 }
 
 
-BOOL IsBold( const Font &rFont )
+bool IsBold( const Font &rFont )
 {
     FontWeight eWeight = rFont.GetWeight();
     return eWeight != WEIGHT_DONTKNOW && eWeight > WEIGHT_NORMAL;
@@ -327,7 +327,7 @@ BOOL IsBold( const Font &rFont )
 void SmFace::Impl_Init()
 {
     SetSize( GetSize() );
-    SetTransparent( TRUE );
+    SetTransparent( true );
     SetAlign( ALIGN_BASELINE );
     SetColor( COL_AUTO );
 }
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index a48fe61b2444..932354116014 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -78,6 +78,7 @@
 #include "toolbox.hxx"
 #include "mathmlimport.hxx"
 #include "cursor.hxx"
+#include "accessibility.hxx"
 
 #define MINWIDTH        200
 #define MINHEIGHT       200
@@ -115,6 +116,9 @@ SmGraphicWindow::SmGraphicWindow(SmViewShell* pShell):
 
     SetHelpId(HID_SMA_WIN_DOCUMENT);
     SetUniqueId(HID_SMA_WIN_DOCUMENT);
+
+    ShowLine(false);
+    CaretBlinkInit();
 }
 
 SmGraphicWindow::~SmGraphicWindow()
@@ -123,6 +127,7 @@ SmGraphicWindow::~SmGraphicWindow()
         pAccessible->ClearWin();    // make Accessible defunctional
     // Note: memory for pAccessible will be freed when the reference
     // xAccessible is released.
+    CaretBlinkStop();
 }
 
 void SmGraphicWindow::StateChanged( StateChangedType eType )
@@ -207,10 +212,7 @@ void SmGraphicWindow::MouseButtonDown(const MouseEvent& rMEvt)
 
 bool SmGraphicWindow::IsInlineEditEnabled() const
 {
-    //Avoid crash on startup (happens when starmath is selected from splash screen)
-    if(pViewShell->GetEditWindow())
-        return pViewShell->GetEditWindow()->IsInlineEditEnabled();
-    return false;
+    return pViewShell->IsInlineEditEnabled();
 }
 
 void SmGraphicWindow::GetFocus()
@@ -219,7 +221,11 @@ void SmGraphicWindow::GetFocus()
         return;
     pViewShell->GetEditWindow()->Flush();
     //Let view shell know what insertions should be done in visual editor
-    pViewShell->SetInsertIntoEditWindow(FALSE);
+    pViewShell->SetInsertIntoEditWindow(false);
+    SetIsCursorVisible(true);
+    ShowLine(true);
+    CaretBlinkStart();
+    RepaintViewShellDoc();
 }
 
 void SmGraphicWindow::LoseFocus()
@@ -233,15 +239,60 @@ void SmGraphicWindow::LoseFocus()
         pAccessible->LaunchEvent( AccessibleEventId::STATE_CHANGED,
                 aOldValue, aNewValue );
     }
+    if (!IsInlineEditEnabled())
+        return;
+    SetIsCursorVisible(false);
+    ShowLine(false);
+    CaretBlinkStop();
+    RepaintViewShellDoc();
 }
 
-void SmGraphicWindow::ShowCursor(BOOL bShow)
-    // shows or hides the formula-cursor depending on 'bShow' is TRUE or not
+void SmGraphicWindow::RepaintViewShellDoc()
+{
+    SmDocShell &rDoc = *pViewShell->GetDoc();
+    rDoc.Repaint();
+}
+
+IMPL_LINK( SmGraphicWindow, CaretBlinkTimerHdl, AutoTimer *, EMPTYARG )
+{
+    if (IsCursorVisible())
+        SetIsCursorVisible(false);
+    else
+        SetIsCursorVisible(true);
+
+    RepaintViewShellDoc();
+
+    return 0;
+}
+
+void SmGraphicWindow::CaretBlinkInit()
+{
+    aCaretBlinkTimer.SetTimeoutHdl(LINK(this, SmGraphicWindow, CaretBlinkTimerHdl));
+    aCaretBlinkTimer.SetTimeout( ScrollableWindow::GetSettings().GetStyleSettings().GetCursorBlinkTime() );
+}
+
+void SmGraphicWindow::CaretBlinkStart()
+{
+    if (!IsInlineEditEnabled())
+        return;
+    if ( aCaretBlinkTimer.GetTimeout() != STYLE_CURSOR_NOBLINKTIME )
+        aCaretBlinkTimer.Start();
+}
+
+void SmGraphicWindow::CaretBlinkStop()
+{
+    if (!IsInlineEditEnabled())
+        return;
+    aCaretBlinkTimer.Stop();
+}
+
+void SmGraphicWindow::ShowCursor(bool bShow)
+    // shows or hides the formula-cursor depending on 'bShow' is true or not
 {
     if (IsInlineEditEnabled())
         return;
 
-    BOOL  bInvert = bShow != IsCursorVisible();
+    bool  bInvert = bShow != IsCursorVisible();
 
     if (bInvert)
         InvertTracking(aCursorRect, SHOWTRACK_SMALL | SHOWTRACK_WINDOW);
@@ -249,6 +300,13 @@ void SmGraphicWindow::ShowCursor(BOOL bShow)
     SetIsCursorVisible(bShow);
 }
 
+void SmGraphicWindow::ShowLine(bool bShow)
+{
+    if (!IsInlineEditEnabled())
+        return;
+
+    bIsLineVisible = bShow;
+}
 
 void SmGraphicWindow::SetCursor(const SmNode *pNode)
 {
@@ -278,10 +336,10 @@ void SmGraphicWindow::SetCursor(const Rectangle &rRect)
     SmModule *pp = SM_MOD();
 
     if (IsCursorVisible())
-        ShowCursor(FALSE);      // clean up remainings of old cursor
+        ShowCursor(false);      // clean up remainings of old cursor
     aCursorRect = rRect;
     if (pp->GetConfig()->IsShowFormulaCursor())
-        ShowCursor(TRUE);       // draw new cursor
+        ShowCursor(true);       // draw new cursor
 }
 
 const SmNode * SmGraphicWindow::SetCursorPos(USHORT nRow, USHORT nCol)
@@ -304,7 +362,7 @@ const SmNode * SmGraphicWindow::SetCursorPos(USHORT nRow, USHORT nCol)
     if (pNode)
         SetCursor(pNode);
     else
-        ShowCursor(FALSE);
+        ShowCursor(false);
 
     return pNode;
 }
@@ -316,15 +374,15 @@ void SmGraphicWindow::Paint(const Rectangle&)
     SmDocShell &rDoc = *pViewShell->GetDoc();
     Point aPoint;
 
-    rDoc.DrawFormula(*this, aPoint, TRUE);  //! modifies aPoint to be the topleft
+    rDoc.DrawFormula(*this, aPoint, true);  //! modifies aPoint to be the topleft
                                 //! corner of the formula
     SetFormulaDrawPos(aPoint);
     if(IsInlineEditEnabled()) {
         //Draw cursor if any...
-        if(pViewShell->GetDoc()->HasCursor())
-            pViewShell->GetDoc()->GetCursor().Draw(*this, aPoint);
+        if(pViewShell->GetDoc()->HasCursor() && IsLineVisible())
+            pViewShell->GetDoc()->GetCursor().Draw(*this, aPoint, IsCursorVisible());
     } else {
-    SetIsCursorVisible(FALSE);  // (old) cursor must be drawn again
+    SetIsCursorVisible(false);  // (old) cursor must be drawn again
 
     const SmEditWindow *pEdit = pViewShell->GetEditWindow();
     if (pEdit)
@@ -337,7 +395,7 @@ void SmGraphicWindow::Paint(const Rectangle&)
 
         SmModule  *pp = SM_MOD();
         if (pFound && pp->GetConfig()->IsShowFormulaCursor())
-            ShowCursor(TRUE);
+            ShowCursor(true);
     }
     }
 }
@@ -463,12 +521,16 @@ void SmGraphicWindow::KeyInput(const KeyEvent& rKEvt)
             }
         }
     }
+    CaretBlinkStop();
+    CaretBlinkStart();
+    SetIsCursorVisible(true);
+    RepaintViewShellDoc();
 }
 
 
 void SmGraphicWindow::Command(const CommandEvent& rCEvt)
 {
-    BOOL bCallBase = TRUE;
+    bool bCallBase = true;
     if ( !pViewShell->GetViewFrame()->GetFrame().IsInPlace() )
     {
         switch ( rCEvt.GetCommand() )
@@ -489,7 +551,7 @@ void SmGraphicWindow::Command(const CommandEvent& rCEvt)
                         ->ExecutePopup( aResId, this, &aPos );
 
                 delete pPopupMenu;
-                bCallBase = FALSE;
+                bCallBase = false;
             }
             break;
 
@@ -504,7 +566,7 @@ void SmGraphicWindow::Command(const CommandEvent& rCEvt)
                     else
                         nTmpZoom += 10;
                     SetZoom( nTmpZoom );
-                    bCallBase = FALSE;
+                    bCallBase = false;
                 }
             }
             break;
@@ -622,7 +684,7 @@ SmCmdBoxWindow::SmCmdBoxWindow(SfxBindings *pBindings_, SfxChildWindow *pChildWi
     SfxDockingWindow(pBindings_, pChildWindow, pParent, SmResId(RID_CMDBOXWINDOW)),
     aEdit       (*this),
     aController (aEdit, SID_TEXT, *pBindings_),
-    bExiting    (FALSE)
+    bExiting    (false)
 {
     Hide ();
 
@@ -634,13 +696,14 @@ SmCmdBoxWindow::SmCmdBoxWindow(SfxBindings *pBindings_, SfxChildWindow *pChildWi
 SmCmdBoxWindow::~SmCmdBoxWindow ()
 {
     aInitialFocusTimer.Stop();
-    bExiting = TRUE;
+    bExiting = true;
 }
 
 
 SmViewShell * SmCmdBoxWindow::GetView()
 {
-    SfxViewShell *pView = GetBindings().GetDispatcher()->GetFrame()->GetViewShell();
+    SfxDispatcher *pDispatcher = GetBindings().GetDispatcher();
+    SfxViewShell *pView = pDispatcher ? pDispatcher->GetFrame()->GetViewShell() : NULL;
     return PTR_CAST(SmViewShell, pView);
 }
 
@@ -752,7 +815,7 @@ void SmCmdBoxWindow::StateChanged( StateChangedType nStateChange )
         Resize();   // #98848# avoid SmEditWindow not being painted correctly
 
         // set initial position of window in floating mode
-        if (TRUE == IsFloatingMode())
+        if (true == IsFloatingMode())
             AdjustPosition();   //! don't change pos in docking-mode !
 
         aInitialFocusTimer.Start();
@@ -1262,7 +1325,7 @@ void SmViewShell::Impl_Print(
 
     rOutDev.SetMapMode(OutputMapMode);
     rOutDev.SetClipRegion(Region(aOutRect));
-    GetDoc()->DrawFormula(rOutDev, aPos, FALSE);
+    GetDoc()->DrawFormula(rOutDev, aPos, false);
     rOutDev.SetClipRegion();
 
     rOutDev.Pop();
@@ -1380,14 +1443,14 @@ void SmViewShell::PrevError()
 }
 
 
-BOOL SmViewShell::Insert( SfxMedium& rMedium )
+bool SmViewShell::Insert( SfxMedium& rMedium )
 {
     RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::Insert" );
 
     SmDocShell *pDoc = GetDoc();
     String aText( pDoc->GetText() );
     String aTemp = aText;
-    BOOL bRet = FALSE, bChkOldVersion = TRUE;
+    bool bRet = false;
 
     uno::Reference < embed::XStorage > xStorage = rMedium.GetStorage();
     uno::Reference< container::XNameAccess > xNameAccess( xStorage, uno::UNO_QUERY );
@@ -1395,7 +1458,6 @@ BOOL SmViewShell::Insert( SfxMedium& rMedium )
     {
         if ( xNameAccess->hasByName( C2S( "content.xml" ) ) || xNameAccess->hasByName( C2S( "Content.xml" ) ))
         {
-            bChkOldVersion = FALSE;
             // is this a fabulous math package ?
             Reference<com::sun::star::frame::XModel> xModel(pDoc->GetModel());
             SmXMLImportWrapper aEquation(xModel);    //!! modifies the result of pDoc->GetText() !!
@@ -1417,7 +1479,7 @@ BOOL SmViewShell::Insert( SfxMedium& rMedium )
         }
 
         pDoc->Parse();
-        pDoc->SetModified(TRUE);
+        pDoc->SetModified(true);
 
         SfxBindings &rBnd = GetViewFrame()->GetBindings();
         rBnd.Invalidate(SID_GAPHIC_SM);
@@ -1427,11 +1489,11 @@ BOOL SmViewShell::Insert( SfxMedium& rMedium )
 }
 
 
-BOOL SmViewShell::InsertFrom(SfxMedium &rMedium)
+bool SmViewShell::InsertFrom(SfxMedium &rMedium)
 {
     RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::InsertFrom" );
 
-    BOOL        bSuccess = FALSE;
+    bool        bSuccess = false;
     SmDocShell *pDoc = GetDoc();
     SvStream   *pStream = rMedium.GetInStream();
     String      aText( pDoc->GetText() );
@@ -1462,7 +1524,7 @@ BOOL SmViewShell::InsertFrom(SfxMedium &rMedium)
         }
 
         pDoc->Parse();
-        pDoc->SetModified(TRUE);
+        pDoc->SetModified(true);
 
         SfxBindings &rBnd = GetViewFrame()->GetBindings();
         rBnd.Invalidate(SID_GAPHIC_SM);
@@ -1488,9 +1550,9 @@ void SmViewShell::Execute(SfxRequest& rReq)
             const SfxItemSet  *pArgs = rReq.GetArgs();
             const SfxPoolItem *pItem;
 
-            BOOL  bVal;
+            bool  bVal;
             if ( pArgs &&
-                 SFX_ITEM_SET == pArgs->GetItemState( SID_FORMULACURSOR, FALSE, &pItem))
+                 SFX_ITEM_SET == pArgs->GetItemState( SID_FORMULACURSOR, false, &pItem))
                 bVal = ((SfxBoolItem *) pItem)->GetValue();
             else
                 bVal = !pp->GetConfig()->IsShowFormulaCursor();
@@ -1605,7 +1667,7 @@ void SmViewShell::Execute(SfxRequest& rReq)
 
         case SID_PASTE:
             {
-                BOOL bCallExec = 0 == pWin;
+                bool bCallExec = 0 == pWin;
                 if( !bCallExec )
                 {
                     TransferableDataHelper aDataHelper(
@@ -1616,7 +1678,7 @@ void SmViewShell::Execute(SfxRequest& rReq)
                         aDataHelper.HasFormat( FORMAT_STRING ))
                         pWin->Paste();
                     else
-                        bCallExec = TRUE;
+                        bCallExec = true;
                 }
                 if( bCallExec )
                 {
@@ -1735,10 +1797,10 @@ void SmViewShell::Execute(SfxRequest& rReq)
                     {
                         pDlg = pFact->CreateSvxZoomDialog(&GetViewFrame()->GetWindow(), aSet);
                         OSL_ENSURE(pDlg, "Dialogdiet fail!");
+                        pDlg->SetLimits( MINZOOM, MAXZOOM );
+                        if( pDlg->Execute() != RET_CANCEL )
+                            pSet = pDlg->GetOutputItemSet();
                     }
-                    pDlg->SetLimits( MINZOOM, MAXZOOM );
-                    if( pDlg->Execute() != RET_CANCEL )
-                        pSet = pDlg->GetOutputItemSet();
                 }
                 if ( pSet )
                 {
@@ -1757,7 +1819,7 @@ void SmViewShell::Execute(SfxRequest& rReq)
                         case SVX_ZOOM_WHOLEPAGE:
                         {
                             const MapMode aMap( MAP_100TH_MM );
-                            SfxPrinter *pPrinter = GetPrinter( TRUE );
+                            SfxPrinter *pPrinter = GetPrinter( true );
                             Point aPoint;
                             Rectangle  OutputRect(aPoint, pPrinter->GetOutputSize());
                             Size       OutputSize(pPrinter->LogicToPixel(Size(OutputRect.GetWidth(),
@@ -1876,11 +1938,11 @@ void SmViewShell::GetState(SfxItemSet &rSet)
 
         case SID_TOOLBOX:
             {
-                BOOL bState = FALSE;
+                bool bState = false;
                 SfxChildWindow *pChildWnd = GetViewFrame()->
                         GetChildWindow( SmToolBoxWrapper::GetChildWindowId() );
                 if (pChildWnd  &&  pChildWnd->GetWindow()->IsVisible())
-                    bState = TRUE;
+                    bState = true;
                 rSet.Put(SfxBoolItem(SID_TOOLBOX, bState));
             }
             break;
@@ -1978,7 +2040,7 @@ IMPL_LINK( SmViewShell, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg )
         }
     }
 
-    pImpl->pRequest->SetReturnValue( SfxBoolItem( pImpl->pRequest->GetSlot(), TRUE ) );
+    pImpl->pRequest->SetReturnValue( SfxBoolItem( pImpl->pRequest->GetSlot(), true ) );
     pImpl->pRequest->Done();
     return 0;
 }
@@ -1991,7 +2053,7 @@ void SmViewShell::Notify( SfxBroadcaster& , const SfxHint& rHint )
         {
             case SFX_HINT_MODECHANGED:
             case SFX_HINT_DOCCHANGED:
-                GetViewFrame()->GetBindings().InvalidateAll(FALSE);
+                GetViewFrame()->GetBindings().InvalidateAll(false);
                 break;
             default:
                 break;
diff --git a/starmath/source/visitors.cxx b/starmath/source/visitors.cxx
index dc5dd3834f21..3b9bdef2f9e2 100644
--- a/starmath/source/visitors.cxx
+++ b/starmath/source/visitors.cxx
@@ -335,16 +335,17 @@ void SmDefaultingVisitor::Visit( SmVerticalBraceNode* pNode )
     DefaultVisit( pNode );
 }
 
-
 /////////////////////////////// SmCaretDrawingVisitor ////////////////////////////////
 
 SmCaretDrawingVisitor::SmCaretDrawingVisitor( OutputDevice& rDevice,
                                              SmCaretPos position,
-                                             Point offset )
+                                             Point offset,
+                                             bool caretVisible )
  : rDev( rDevice )
 {
     pos = position;
     Offset = offset;
+    isCaretVisible = caretVisible;
     j_assert( position.IsValid( ), "Cannot draw invalid position!" );
     if( !position.IsValid( ) )
         return;
@@ -370,14 +371,23 @@ void SmCaretDrawingVisitor::Visit( SmTextNode* pNode )
     long left = pNode->GetLeft( ) + rDev.GetTextWidth( pNode->GetText( ), 0, i ) + Offset.X( );
     long top = pLine->GetTop( ) + Offset.Y( );
     long height = pLine->GetHeight( );
+    long left_line = pLine->GetLeft( ) + Offset.X( );
+    long right_line = pLine->GetRight( ) + Offset.X( );
 
     //Set color
     rDev.SetLineColor( Color( COL_BLACK ) );
 
-    //Draw vertical line
-    Point p1( left, top );
-    Point p2( left, top + height );
-    rDev.DrawLine( p1, p2 );
+    if ( isCaretVisible ) {
+        //Draw vertical line
+        Point p1( left, top );
+        Point p2( left, top + height );
+        rDev.DrawLine( p1, p2 );
+    }
+
+    //Underline the line
+    Point pLeft( left_line, top + height );
+    Point pRight( right_line, top + height );
+    rDev.DrawLine( pLeft, pRight );
 }
 
 void SmCaretDrawingVisitor::DefaultVisit( SmNode* pNode )
@@ -391,14 +401,23 @@ void SmCaretDrawingVisitor::DefaultVisit( SmNode* pNode )
     long left = pNode->GetLeft( ) + Offset.X( ) + ( pos.Index == 1 ? pNode->GetWidth( ) : 0 );
     long top = pLine->GetTop( ) + Offset.Y( );
     long height = pLine->GetHeight( );
+    long left_line = pLine->GetLeft( ) + Offset.X( );
+    long right_line = pLine->GetRight( ) + Offset.X( );
 
     //Set color
     rDev.SetLineColor( Color( COL_BLACK ) );
 
-    //Draw vertical line
-    Point p1( left, top );
-    Point p2( left, top + height );
-    rDev.DrawLine( p1, p2 );
+    if ( isCaretVisible ) {
+        //Draw vertical line
+        Point p1( left, top );
+        Point p2( left, top + height );
+        rDev.DrawLine( p1, p2 );
+    }
+
+    //Underline the line
+    Point pLeft( left_line, top + height );
+    Point pRight( right_line, top + height );
+    rDev.DrawLine( pLeft, pRight );
 }
 
 /////////////////////////////// SmCaretPos2LineVisitor ////////////////////////////////
@@ -435,7 +454,6 @@ void SmCaretPos2LineVisitor::DefaultVisit( SmNode* pNode )
 
 /////////////////////////////// Nasty temporary device!!! ////////////////////////////////
 
-
 #include <tools/gen.hxx>
 #include <tools/fract.hxx>
 #include <rtl/math.hxx>
@@ -458,7 +476,7 @@ class SmTmpDevice2
     Color   Impl_GetColor( const Color& rColor );
 
 public:
-    SmTmpDevice2( OutputDevice &rTheDev, BOOL bUseMap100th_mm );
+    SmTmpDevice2( OutputDevice &rTheDev, bool bUseMap100th_mm );
     ~SmTmpDevice2( )  { rOutDev.Pop( ); }
 
     void SetFont( const Font &rNewFont );
@@ -470,8 +488,7 @@ public:
     operator OutputDevice & ( ) { return rOutDev; }
 };
 
-
-SmTmpDevice2::SmTmpDevice2( OutputDevice &rTheDev, BOOL bUseMap100th_mm ) :
+SmTmpDevice2::SmTmpDevice2( OutputDevice &rTheDev, bool bUseMap100th_mm ) :
     rOutDev( rTheDev )
 {
     rOutDev.Push( PUSH_FONT | PUSH_MAPMODE |
@@ -483,7 +500,6 @@ SmTmpDevice2::SmTmpDevice2( OutputDevice &rTheDev, BOOL bUseMap100th_mm ) :
     }
 }
 
-
 Color SmTmpDevice2::Impl_GetColor( const Color& rColor )
 {
     ColorData nNewCol = rColor.GetColor( );
@@ -509,7 +525,6 @@ Color SmTmpDevice2::Impl_GetColor( const Color& rColor )
     return Color( nNewCol );
 }
 
-
 void SmTmpDevice2::SetFont( const Font &rNewFont )
 {
     rOutDev.SetFont( rNewFont );
@@ -646,8 +661,7 @@ void SmDrawingVisitor::Visit( SmRootSymbolNode* pNode )
     // draw root-sign itself
     DrawSpecialNode( pNode );
 
-
-    SmTmpDevice2  aTmpDev( ( OutputDevice & ) rDev, TRUE );
+    SmTmpDevice2  aTmpDev( ( OutputDevice & ) rDev, true );
     aTmpDev.SetFillColor( pNode->GetFont( ).GetColor( ) );
     rDev.SetLineColor( );
     aTmpDev.SetFont( pNode->GetFont( ) );
@@ -696,7 +710,7 @@ void SmDrawingVisitor::Visit( SmPolyLineNode* pNode )
           aPos ( Position + aOffset );
     pNode->GetPolygon( ).Move( aPos.X( ), aPos.Y( ) );    //Works because Polygon wraps a pointer
 
-    SmTmpDevice2  aTmpDev ( ( OutputDevice & ) rDev, FALSE );
+    SmTmpDevice2  aTmpDev ( ( OutputDevice & ) rDev, false );
     aTmpDev.SetLineColor( pNode->GetFont( ).GetColor( ) );
 
     rDev.DrawPolyLine( pNode->GetPolygon( ), aInfo );
@@ -715,7 +729,7 @@ void SmDrawingVisitor::Visit( SmRectangleNode* pNode )
     if ( pNode->IsPhantom( ) )
         return;
 
-    SmTmpDevice2  aTmpDev ( ( OutputDevice & ) rDev, FALSE );
+    SmTmpDevice2  aTmpDev ( ( OutputDevice & ) rDev, false );
     aTmpDev.SetFillColor( pNode->GetFont( ).GetColor( ) );
     rDev.SetLineColor( );
     aTmpDev.SetFont( pNode->GetFont( ) );
@@ -755,7 +769,7 @@ void SmDrawingVisitor::DrawTextNode( SmTextNode* pNode )
     if ( pNode->IsPhantom( )  ||  pNode->GetText( ).Len( ) == 0  ||  pNode->GetText( ).GetChar( 0 ) == xub_Unicode( '\0' ) )
         return;
 
-    SmTmpDevice2  aTmpDev ( ( OutputDevice & ) rDev, FALSE );
+    SmTmpDevice2  aTmpDev ( ( OutputDevice & ) rDev, false );
     aTmpDev.SetFont( pNode->GetFont( ) );
 
     Point  aPos ( Position );
@@ -809,8 +823,46 @@ void SmDrawingVisitor::DrawChildren( SmNode* pNode )
 
 /////////////////////////////// SmSetSelectionVisitor ////////////////////////////////
 
-void SmSetSelectionVisitor::SetSelectedOnAll( SmNode* pSubTree, bool IsSelected )
-{
+SmSetSelectionVisitor::SmSetSelectionVisitor( SmCaretPos startPos, SmCaretPos endPos, SmNode* pTree) {
+    StartPos    = startPos;
+    EndPos      = endPos;
+    IsSelecting = false;
+
+    //Assume that pTree is a SmTableNode
+    j_assert(pTree->GetType() == NTABLE, "pTree should be a SmTableNode!");
+    //Visit root node, this is special as this node cannot be selected, but it's children can!
+    if(pTree->GetType() == NTABLE){
+        //Change state if StartPos is infront of this node
+        if( StartPos.pSelectedNode == pTree && StartPos.Index == 0 )
+            IsSelecting = !IsSelecting;
+        //Change state if EndPos is infront of this node
+        if( EndPos.pSelectedNode == pTree && EndPos.Index == 0 )
+            IsSelecting = !IsSelecting;
+        j_assert(!IsSelecting, "Caret positions needed to set IsSelecting about, shouldn't be possible!");
+
+        //Visit lines
+        SmNodeIterator it( pTree );
+        while( it.Next( ) ) {
+            it->Accept( this );
+            //If we started a selection in this line and it haven't ended, we do that now!
+            if(IsSelecting) {
+                IsSelecting = false;
+                SetSelectedOnAll(it.Current(), true);
+                //Set StartPos and EndPos to invalid positions, this ensures that an unused
+                //start or end (because we forced end above), doesn't start a new selection.
+                StartPos = EndPos = SmCaretPos();
+            }
+        }
+        //Check if pTree isn't selected
+        j_assert(!pTree->IsSelected(), "pTree should never be selected!");
+        //Discard the selection if there's a bug (it's better than crashing)
+        if(pTree->IsSelected())
+            SetSelectedOnAll(pTree, false);
+    }else //This shouldn't happen, but I don't see any reason to die if it does
+        pTree->Accept(this);
+}
+
+void SmSetSelectionVisitor::SetSelectedOnAll( SmNode* pSubTree, bool IsSelected ) {
     pSubTree->SetSelected( IsSelected );
 
     //Quick BFS to set all selections
@@ -819,8 +871,7 @@ void SmSetSelectionVisitor::SetSelectedOnAll( SmNode* pSubTree, bool IsSelected
         SetSelectedOnAll( it.Current( ), IsSelected );
 }
 
-void SmSetSelectionVisitor::DefaultVisit( SmNode* pNode )
-{
+void SmSetSelectionVisitor::DefaultVisit( SmNode* pNode ) {
     //Change state if StartPos is infront of this node
     if( StartPos.pSelectedNode == pNode && StartPos.Index == 0 )
         IsSelecting = !IsSelecting;
@@ -829,8 +880,8 @@ void SmSetSelectionVisitor::DefaultVisit( SmNode* pNode )
         IsSelecting = !IsSelecting;
 
     //Cache current state
-    BOOL WasSelecting = IsSelecting;
-    BOOL ChangedState = FALSE;
+    bool WasSelecting = IsSelecting;
+    bool ChangedState = false;
 
     //Set selected
     pNode->SetSelected( IsSelecting );
@@ -875,8 +926,7 @@ void SmSetSelectionVisitor::DefaultVisit( SmNode* pNode )
     }
 }
 
-void SmSetSelectionVisitor::VisitCompositionNode( SmNode* pNode )
-{
+void SmSetSelectionVisitor::VisitCompositionNode( SmNode* pNode ) {
     //Change state if StartPos is infront of this node
     if( StartPos.pSelectedNode == pNode && StartPos.Index == 0 )
         IsSelecting = !IsSelecting;
@@ -903,8 +953,7 @@ void SmSetSelectionVisitor::VisitCompositionNode( SmNode* pNode )
         IsSelecting = !IsSelecting;
 }
 
-void SmSetSelectionVisitor::Visit( SmTextNode* pNode )
-{
+void SmSetSelectionVisitor::Visit( SmTextNode* pNode ) {
     long    i1 = -1,
             i2 = -1;
     if( StartPos.pSelectedNode == pNode )
@@ -946,36 +995,33 @@ void SmSetSelectionVisitor::Visit( SmTextNode* pNode )
     pNode->SetSelectionEnd( end );
 }
 
-void SmSetSelectionVisitor::Visit( SmExpressionNode* pNode )
-{
+void SmSetSelectionVisitor::Visit( SmExpressionNode* pNode ) {
     VisitCompositionNode( pNode );
 }
 
-void SmSetSelectionVisitor::Visit( SmAlignNode* pNode )
-{
+void SmSetSelectionVisitor::Visit( SmLineNode* pNode ) {
     VisitCompositionNode( pNode );
 }
 
-void SmSetSelectionVisitor::Visit( SmBinHorNode* pNode )
-{
+void SmSetSelectionVisitor::Visit( SmAlignNode* pNode ) {
     VisitCompositionNode( pNode );
 }
 
-void SmSetSelectionVisitor::Visit( SmUnHorNode* pNode )
-{
+void SmSetSelectionVisitor::Visit( SmBinHorNode* pNode ) {
     VisitCompositionNode( pNode );
 }
 
-void SmSetSelectionVisitor::Visit( SmFontNode* pNode )
-{
+void SmSetSelectionVisitor::Visit( SmUnHorNode* pNode ) {
     VisitCompositionNode( pNode );
 }
 
-
+void SmSetSelectionVisitor::Visit( SmFontNode* pNode ) {
+    VisitCompositionNode( pNode );
+}
 
 /////////////////////////////// SmCaretPosGraphBuildingVisitor ////////////////////////////////
 
-SmCaretPosGraphBuildingVisitor::SmCaretPosGraphBuildingVisitor( SmNode* pRootNode ){
+SmCaretPosGraphBuildingVisitor::SmCaretPosGraphBuildingVisitor( SmNode* pRootNode ) {
     pRightMost  = NULL;
     pGraph = new SmCaretPosGraph( );
     //pRootNode should always be a table
@@ -995,7 +1041,7 @@ SmCaretPosGraphBuildingVisitor::SmCaretPosGraphBuildingVisitor( SmNode* pRootNod
             //The argument for doing this is that we now don't have to worry about SmLineNode
             //being a visual line composition node. Thus, no need for yet another special case
             //in SmCursor::IsLineCompositionNode and everywhere this method is used.
-            if( it->GetType( ) != NLINE )
+            //if( it->GetType( ) != NLINE )
                 pRightMost = pGraph->Add( SmCaretPos( it.Current( ), 0 ) );
             it->Accept( this );
         }
@@ -1004,11 +1050,11 @@ SmCaretPosGraphBuildingVisitor::SmCaretPosGraphBuildingVisitor( SmNode* pRootNod
 }
 
 void SmCaretPosGraphBuildingVisitor::Visit( SmLineNode* pNode ){
-    pRightMost = NULL;
+    //pRightMost = NULL;
     SmNodeIterator it( pNode );
     while( it.Next( ) ){
-        if( !pRightMost )
-            pRightMost = pGraph->Add( SmCaretPos( it.Current( ), 0 ) );
+        //if( !pRightMost )
+        //    pRightMost = pGraph->Add( SmCaretPos( it.Current( ), 0 ) );
         it->Accept( this );
     }
 }
@@ -1021,7 +1067,7 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmLineNode* pNode ){
 void SmCaretPosGraphBuildingVisitor::Visit( SmTableNode* pNode ){
     SmCaretPosGraphEntry *left  = pRightMost,
                          *right = pGraph->Add( SmCaretPos( pNode, 1) );
-    BOOL bIsFirst = TRUE;
+    bool bIsFirst = true;
     SmNodeIterator it( pNode );
     while( it.Next() ){
         pRightMost = pGraph->Add( SmCaretPos( it.Current(), 0 ), left);
@@ -1031,7 +1077,7 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmTableNode* pNode ){
         pRightMost->SetRight(right);
         if(bIsFirst)
             right->SetLeft(pRightMost);
-        bIsFirst = FALSE;
+        bIsFirst = false;
     }
     pRightMost = right;
 }
@@ -1489,7 +1535,6 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmBinDiagonalNode* pNode )
     pRightMost = right;
 }
 
-
 //Straigt forward ( I think )
 void SmCaretPosGraphBuildingVisitor::Visit( SmBinHorNode* pNode )
 {
@@ -1853,7 +1898,6 @@ void SmCloningVisitor::Visit( SmBraceNode* pNode )
     pResult = pClone;
 }
 
-
 void SmCloningVisitor::Visit( SmBracebodyNode* pNode )
 {
     SmBracebodyNode* pClone = new SmBracebodyNode( pNode->GetToken( ) );
@@ -2047,7 +2091,7 @@ void SmCloningVisitor::Visit( SmVerticalBraceNode* pNode )
 
 SmSelectionDrawingVisitor::SmSelectionDrawingVisitor( OutputDevice& rDevice, SmNode* pTree, Point Offset )
     : rDev( rDevice ) {
-    bHasSelectionArea = FALSE;
+    bHasSelectionArea = false;
 
     //Visit everything
     j_assert( pTree, "pTree can't be null!" );
@@ -2114,7 +2158,6 @@ void SmSelectionDrawingVisitor::Visit( SmTextNode* pNode )
     }
 }
 
-
 /////////////////////////////// SmNodeToTextVisitor ///////////////////////////////
 
 void SmNodeToTextVisitor::Visit( SmTableNode* pNode )
@@ -2131,7 +2174,7 @@ void SmNodeToTextVisitor::Visit( SmTableNode* pNode )
             LineToText( it.Current( ) );
             if( it.Next( ) ) {
                 Separate( );
-                Append( "## " );
+                Append( "# " );
             }else
                 break;
         }
@@ -2199,33 +2242,39 @@ void SmNodeToTextVisitor::Visit( SmOperNode* pNode )
         SmNode* pChild;
         if( ( pChild = pSubSup->GetSubSup( LSUP ) ) ) {
             Separate( );
-            Append( "lsup " );
+            Append( "lsup { " );
             LineToText( pChild );
+            Append( "} ");
         }
         if( ( pChild = pSubSup->GetSubSup( LSUB ) ) ) {
             Separate( );
-            Append( "lsub " );
+            Append( "lsub { " );
             LineToText( pChild );
+            Append( "} ");
         }
         if( ( pChild = pSubSup->GetSubSup( RSUP ) ) ) {
             Separate( );
-            Append( "rsup " );
+            Append( "rsup { " );
             LineToText( pChild );
+            Append( "} ");
         }
         if( ( pChild = pSubSup->GetSubSup( RSUB ) ) ) {
             Separate( );
-            Append( "rsub " );
+            Append( "rsub { " );
             LineToText( pChild );
+            Append( "} ");
         }
         if( ( pChild = pSubSup->GetSubSup( CSUP ) ) ) {
             Separate( );
-            Append( "csup " );
+            Append( "csup { " );
             LineToText( pChild );
+            Append( "} ");
         }
         if( ( pChild = pSubSup->GetSubSup( CSUB ) ) ) {
             Separate( );
-            Append( "csub " );
+            Append( "csub { " );
             LineToText( pChild );
+            Append( "} ");
         }
     }
     LineToText( pNode->GetSubNode( 1 ) );
@@ -2417,9 +2466,11 @@ void SmNodeToTextVisitor::Visit( SmMatrixNode* pNode )
     for ( USHORT i = 0; i < pNode->GetNumRows( ); i++ ) {
         for ( USHORT j = 0; j < pNode->GetNumCols( ); j++ ) {
             SmNode* pSubNode = pNode->GetSubNode( i * pNode->GetNumCols( ) + j );
+            Append( "{" );
             Separate( );
             pSubNode->Accept( this );
             Separate( );
+            Append( "}" );
             if( j != pNode->GetNumCols( ) - 1 )
                 Append( "#" );
         }
@@ -2447,7 +2498,6 @@ void SmNodeToTextVisitor::Visit( SmTextNode* pNode )
 
 void SmNodeToTextVisitor::Visit( SmSpecialNode* pNode )
 {
-    Append( "%" );
     Append( pNode->GetToken( ).aText );
 }
 
@@ -2485,13 +2535,18 @@ void SmNodeToTextVisitor::Visit( SmLineNode* pNode )
 
 void SmNodeToTextVisitor::Visit( SmExpressionNode* pNode )
 {
-    Append( "{ " );
+    USHORT nSize = pNode->GetNumSubNodes();
+    if (nSize > 1) {
+        Append( "{ " );
+    }
     SmNodeIterator it( pNode );
     while( it.Next( ) ) {
         it->Accept( this );
         Separate( );
     }
-    Append( "}" );
+    if (nSize > 1) {
+        Append( "} " );
+    }
 }
 
 void SmNodeToTextVisitor::Visit( SmPolyLineNode* )
diff --git a/starmath/uiconfig/smath/menubar/menubar.xml b/starmath/uiconfig/smath/menubar/menubar.xml
index d9ae7af85edc..5b01e9beda24 100644
--- a/starmath/uiconfig/smath/menubar/menubar.xml
+++ b/starmath/uiconfig/smath/menubar/menubar.xml
@@ -114,6 +114,7 @@
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ShowLicense"/>
       <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ShowCredits"/>
       <menu:menuitem menu:id=".uno:About"/>
     </menu:menupopup>
   </menu:menu>
diff --git a/starmath/visual-editor-todo b/starmath/visual-editor-todo
index 027140f0e231..b19c1e7b7739 100644
--- a/starmath/visual-editor-todo
+++ b/starmath/visual-editor-todo
@@ -12,20 +12,20 @@ on IRC (jopsen) or e-mail me at jopsen@gmail.com.
 
 Easy
 ----
-1. Draw a non-blinking line under the visual line that the caret is in, in SmCaretDrawingVisitor.
-2. SmGraphicWindow::KeyInput relies on comparison of sal_Char, a better way must be available for CTRL+c
-3. Code style (missing spaces, linebreaks and a few renames)
-4. More documentation
-5. Replace j_assert with DBG_ASSERT (don't do this yet).
+1. SmGraphicWindow::KeyInput relies on comparison of sal_Char, a better way must be available for CTRL+c
+2. Code style (missing spaces, linebreaks and a few renames)
+3. More documentation
+4. Replace j_assert with DBG_ASSERT (don't do this yet).
+5. Remove the CreateTextFromNode methods and replace calls to it with NodeToTextVisitor
+6. Extend NodeToTextVisitor to update token offsets so SmNode::GetRow and SmNode::GetColumn will work.
+   (These methods can be used to enable synchronization of caret positions between visual and non-visual editor).
 
 Medium
 ------
 1. SmCursor::InsertCol() method for added columns to matrices should be implemented.
 2. SmCursor` should support deletion of lines, rows, cols and sub-/superscripts.
 3. SmCursor::InsertSubSup() should wrap the body in a SmBraceNode if the body is an SmOperNode, SmBinVerNode, etc.
-4. Make caret in visual editor blink.
-5. Don't draw visual editor caret, when SmGraphicWindow doesn't have focus.
-6. When OpenOffice Math runs in standalone mode it centers the current formula, this is not nice for visual editing.
+4. When OpenOffice Math runs in standalone mode it centers the current formula, this is not nice for visual editing.
 
 Complex
 -------
@@ -42,3 +42,4 @@ Complex and non-essential
 4. Consider allowing users to enter commands in visual editor, by prefixing the command...
 5. Optimize things, for instance SmCursor::AnnotateSelection() is called way too many places...
 6. Improve handling of MoveUp and MoveDown in SmCursor::Move, SmCaretPos2LineVisitor might need improvement.
+7. Synchronized command text caret and visual editor caret.
diff --git a/stlport/prj/build.lst b/stlport/prj/build.lst
index 259feec2f6bc..2a6ec0dda681 100644
--- a/stlport/prj/build.lst
+++ b/stlport/prj/build.lst
@@ -1,2 +1,2 @@
-sl	stlport	:   SO:so_prereq solenv NULL
+sl	stlport	:   solenv NULL
 sl	stlport						nmake	-	all	sl_mkout NULL
diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx
index 8639b10ff23b..5755defd7739 100644
--- a/stoc/source/security/file_policy.cxx
+++ b/stoc/source/security/file_policy.cxx
@@ -199,12 +199,12 @@ class PolicyReader
     inline void back( sal_Unicode c ) SAL_THROW( () )
         { m_back = c; }
 
-    inline bool isWhiteSpace( sal_Unicode c ) SAL_THROW( () )
+    inline bool isWhiteSpace( sal_Unicode c ) const SAL_THROW( () )
         { return (' ' == c || '\t' == c || '\n' == c || '\r' == c); }
     void skipWhiteSpace()
         SAL_THROW( (RuntimeException) );
 
-    inline bool isCharToken( sal_Unicode c ) SAL_THROW( () )
+    inline bool isCharToken( sal_Unicode c ) const SAL_THROW( () )
         { return (';' == c || ',' == c || '{' == c || '}' == c); }
 
 public:
@@ -439,7 +439,6 @@ static OUString s_user = OUSTR("user");
 static OUString s_permission = OUSTR("permission");
 static OUString s_openBrace = OUSTR("{");
 static OUString s_closingBrace = OUSTR("}");
-static OUString s_semi = OUSTR(";");
 
 static OUString s_filePermission = OUSTR("com.sun.star.io.FilePermission");
 static OUString s_socketPermission = OUSTR("com.sun.star.connection.SocketPermission");
diff --git a/svl/inc/cntwids.hrc b/svl/inc/cntwids.hrc
index 01a965c38652..968700f1b79b 100644
--- a/svl/inc/cntwids.hrc
+++ b/svl/inc/cntwids.hrc
@@ -77,7 +77,6 @@
 #define WID_TO                              (WID_CHAOS_START + 24)
 #define WID_FROM                            (WID_CHAOS_START + 25)
 #define WID_TITLE                           (WID_CHAOS_START + 26)
-#define WID_SUBJECT WID_TITLE // only here to prevent panic, should be removed
 #define WID_MESSAGEBODY                     (WID_CHAOS_START + 27)
 
 #define WID_REFERENCES                      (WID_CHAOS_START + 28)
@@ -137,8 +136,6 @@
 //PROP FOLDER VIEW
 #define WID_DUMMY_PROPFOLDERVIEW1           (WID_CHAOS_START + 65)
 #define WID_THREADING                       (WID_CHAOS_START + 66)
-#define WID_MSG_COLUMN_INFO  /* obsolete */ (WID_CHAOS_START + 67)
-#define WID_FLD_COLUMN_INFO  /* obsolete */ (WID_CHAOS_START + 68)
 #define WID_FOLDERVIEW_MODE                 (WID_CHAOS_START + 69)
 #define WID_MESSAGEVIEW_MODE                (WID_CHAOS_START + 70)
 #define WID_SENTMESSAGEVIEW_MODE            (WID_CHAOS_START + 71)
@@ -153,8 +150,6 @@
 //PROP FOLDER DIR
 #define WID_DUMMY_FOLDERDIR1                (WID_CHAOS_START + 79)
 #define WID_TOTALCONTENTCOUNT               (WID_CHAOS_START + 80)
-#define WID_NEWSGROUPCOUNT  /* ??? */       (WID_CHAOS_START + 81)
-#define WID_ARTICLECOUNT    /* ??? */       (WID_CHAOS_START + 82)
 #define WID_KNOWN_RANGES                    (WID_CHAOS_START + 83)
 #define WID_IMAPFOLDERINFO                  (WID_CHAOS_START + 84)
 
@@ -176,23 +171,9 @@
 #define WID_PASSWORD                        (WID_CHAOS_START + 92)
 #define WID_SERVERNAME                      (WID_CHAOS_START + 93)
 #define WID_SERVERPORT                      (WID_CHAOS_START + 94)
-// obsolete
-#define WID_MAILSEND_USERNAME               (WID_CHAOS_START + 95)
-#define WID_MAILSEND_PASSWORD               (WID_CHAOS_START + 96)
-#define WID_MAILSEND_SERVERNAME             (WID_CHAOS_START + 97)
-#define WID_NEWSSEND_USERNAME               (WID_CHAOS_START + 98)
-#define WID_NEWSSEND_PASSWORD               (WID_CHAOS_START + 99)
-#define WID_NEWSSEND_SERVERNAME             (WID_CHAOS_START + 100)
-// end obsolete
 #define WID_SERVERBASE                      (WID_CHAOS_START + 101)
-// not used
-#define WID_SMTP_GATEWAY                    (WID_CHAOS_START + 102)
 
 // -> ..._DEFAULT
-// obsolete
-#define WID_FROM_DEFAULT                    (WID_CHAOS_START + 103)
-// obsolete
-#define WID_REPLY_TO_DEFAULT                (WID_CHAOS_START + 104)
 
 #define WID_AUTOUPDATE_INTERVAL             (WID_CHAOS_START + 105)
 #define WID_UPDATE_ENABLED                  (WID_CHAOS_START + 106)
@@ -243,13 +224,6 @@
 #define WID_STORE_MSGS_TIMELIMIT            (WID_CHAOS_START + 124)
 
 // PROP BOX
-#define WID_MSG_COLUMN_WIDTHS /* obsolete */(WID_CHAOS_START + 125)
-
-#ifdef OLD_CHAOS
-
-#define WID_CHAOS_END                       (WID_CHAOS_START + 125)
-
-#else
 
 //////////////////////////////////////////////////////////////////////////
 // WID's added after SO 4.0 release ( SUPD > 364 )
@@ -501,6 +475,4 @@
 // END
 #define WID_CHAOS_END                       (WID_CHAOS_START + 253)
 
-#endif /* OLD_CHAOS */
-
 #endif /* !_CNTWIDS_HRC */
diff --git a/svl/inc/svl/itemprop.hxx b/svl/inc/svl/itemprop.hxx
index e494277c3824..46dce586bb94 100644
--- a/svl/inc/svl/itemprop.hxx
+++ b/svl/inc/svl/itemprop.hxx
@@ -37,9 +37,8 @@
 #include <com/sun/star/beans/PropertyState.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <vector>
-/* -----------------------------21.02.00 11:03--------------------------------
-    UNO III - Implementation
- ---------------------------------------------------------------------------*/
+
+// UNO III - Implementation
 #define MAP_CHAR_LEN(cchar) cchar, sizeof(cchar) - 1
 
 struct SfxItemPropertyMapEntry
@@ -109,9 +108,7 @@ public:
     sal_uInt32 getSize() const;
 
 };
-/* -----------------------------21.02.00 11:19--------------------------------
 
- ---------------------------------------------------------------------------*/
 class SVL_DLLPUBLIC SfxItemPropertySet
 {
     SfxItemPropertyMap                                                              m_aMap;
@@ -163,9 +160,7 @@ public:
         getPropertyMap() const {return &m_aMap;}
 
 };
-/* -----------------------------21.02.00 11:09--------------------------------
 
- ---------------------------------------------------------------------------*/
 struct SfxItemPropertySetInfo_Impl;
 class SVL_DLLPUBLIC SfxItemPropertySetInfo : public
     cppu::WeakImplHelper1<com::sun::star::beans::XPropertySetInfo>
@@ -192,9 +187,7 @@ public:
 
     const SfxItemPropertyMap* getMap() const;
 };
-/* -----------------------------21.02.00 12:01--------------------------------
 
- ---------------------------------------------------------------------------*/
 class SVL_DLLPUBLIC SfxExtItemPropertySetInfo: public cppu::WeakImplHelper1<com::sun::star::beans::XPropertySetInfo >
 {
     SfxItemPropertyMap aExtMap;
diff --git a/svl/inc/svl/style.hrc b/svl/inc/svl/style.hrc
index f49a95e48f67..b507e6ed960b 100644
--- a/svl/inc/svl/style.hrc
+++ b/svl/inc/svl/style.hrc
@@ -35,5 +35,3 @@
 #define SFXSTYLEBIT_ALL      0xFFFF // alle Vorlagen
 
 #endif
-
-
diff --git a/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx b/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
index 4ee8ce09289f..3f44d5a8dd9c 100644
--- a/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
@@ -47,13 +47,13 @@ namespace css = ::com::sun::star;
 namespace svl{
 
 //=============================================================================
-static const ::rtl::OUString PROP_TEST                  = ::rtl::OUString::createFromAscii("Test");
-static const ::rtl::OUString TEST_PICKLIST              = ::rtl::OUString::createFromAscii("checkPicklist");
-static const ::rtl::OUString TEST_URLHISTORY            = ::rtl::OUString::createFromAscii("checkURLHistory");
-static const ::rtl::OUString TEST_HELPBOOKMARKS         = ::rtl::OUString::createFromAscii("checkHelpBookmarks");
-static const ::rtl::OUString TEST_ACCESSIBILITYOPTIONS  = ::rtl::OUString::createFromAscii("checkAccessibilityOptions");
-static const ::rtl::OUString TEST_PRINTOPTIONS          = ::rtl::OUString::createFromAscii("checkPrintOptions");
-static const ::rtl::OUString TEST_USEROPTIONS           = ::rtl::OUString::createFromAscii("checkUserOptions");
+static const ::rtl::OUString PROP_TEST                  (RTL_CONSTASCII_USTRINGPARAM("Test"));
+static const ::rtl::OUString TEST_PICKLIST              (RTL_CONSTASCII_USTRINGPARAM("checkPicklist"));
+static const ::rtl::OUString TEST_URLHISTORY            (RTL_CONSTASCII_USTRINGPARAM("checkURLHistory"));
+static const ::rtl::OUString TEST_HELPBOOKMARKS         (RTL_CONSTASCII_USTRINGPARAM("checkHelpBookmarks"));
+static const ::rtl::OUString TEST_ACCESSIBILITYOPTIONS  (RTL_CONSTASCII_USTRINGPARAM("checkAccessibilityOptions"));
+static const ::rtl::OUString TEST_PRINTOPTIONS          (RTL_CONSTASCII_USTRINGPARAM("checkPrintOptions"));
+static const ::rtl::OUString TEST_USEROPTIONS           (RTL_CONSTASCII_USTRINGPARAM("checkUserOptions"));
 
 //=============================================================================
 class ConfigItemTest : public ::cppu::WeakImplHelper2< css::task::XJob         ,
@@ -189,14 +189,14 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL ConfigItemTest::getSupportedServi
 //=============================================================================
 ::rtl::OUString SAL_CALL ConfigItemTest::st_getImplementationName()
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.svl.ConfigItemTest");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.svl.ConfigItemTest"));
 }
 
 //=============================================================================
 css::uno::Sequence< ::rtl::OUString > SAL_CALL ConfigItemTest::st_getSupportedServiceNames()
 {
     css::uno::Sequence< ::rtl::OUString > lServices(1);
-    lServices[0] = ::rtl::OUString::createFromAscii("com.sun.star.test.ConfigItems");
+    lServices[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.test.ConfigItems"));
     return lServices;
 }
 
diff --git a/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx
index a304a508b3fb..7bf855c7e4a3 100644
--- a/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx
@@ -42,14 +42,14 @@
 namespace css = ::com::sun::star;
 
 //=============================================================================
-static const ::rtl::OUString MESSAGE_CLEAR_FAILED       = ::rtl::OUString::createFromAscii("Clearing the list failed.");
-static const ::rtl::OUString MESSAGE_SETSIZE_FAILED     = ::rtl::OUString::createFromAscii("Setting a new size for a list failed.");
-static const ::rtl::OUString MESSAGE_MISS_HISTORY       = ::rtl::OUString::createFromAscii("Could not get config access to history list inside config.");
-static const ::rtl::OUString MESSAGE_MISS_ITEMLIST      = ::rtl::OUString::createFromAscii("Could not get config access to item list inside config.");
-static const ::rtl::OUString MESSAGE_MISS_ORDERLIST     = ::rtl::OUString::createFromAscii("Could not get config access to order list inside config.");
-static const ::rtl::OUString MESSAGE_MISS_ITEM          = ::rtl::OUString::createFromAscii("Could not locate item.");
-static const ::rtl::OUString MESSAGE_UNEXPECTED_ITEM    = ::rtl::OUString::createFromAscii("Found an unexpected item.");
-static const ::rtl::OUString MESSAGE_WRONG_ORDER        = ::rtl::OUString::createFromAscii("Wrong order in history list.");
+static const ::rtl::OUString MESSAGE_CLEAR_FAILED       (RTL_CONSTASCII_USTRINGPARAM("Clearing the list failed."));
+static const ::rtl::OUString MESSAGE_SETSIZE_FAILED     (RTL_CONSTASCII_USTRINGPARAM("Setting a new size for a list failed."));
+static const ::rtl::OUString MESSAGE_MISS_HISTORY       (RTL_CONSTASCII_USTRINGPARAM("Could not get config access to history list inside config."));
+static const ::rtl::OUString MESSAGE_MISS_ITEMLIST      (RTL_CONSTASCII_USTRINGPARAM("Could not get config access to item list inside config."));
+static const ::rtl::OUString MESSAGE_MISS_ORDERLIST     (RTL_CONSTASCII_USTRINGPARAM("Could not get config access to order list inside config."));
+static const ::rtl::OUString MESSAGE_MISS_ITEM          (RTL_CONSTASCII_USTRINGPARAM("Could not locate item."));
+static const ::rtl::OUString MESSAGE_UNEXPECTED_ITEM    (RTL_CONSTASCII_USTRINGPARAM("Found an unexpected item."));
+static const ::rtl::OUString MESSAGE_WRONG_ORDER        (RTL_CONSTASCII_USTRINGPARAM("Wrong order in history list."));
 
 //=============================================================================
 HistoryOptTest::HistoryOptTest()
@@ -662,10 +662,10 @@ void HistoryOptTest::impl_checkGetList(const ::rtl::OUString& sList)
     {
         impl_clearList(s_sPickList);
         aHistoryOpt.AppendItem( ePICKLIST  ,
-            ::rtl::OUString::createFromAscii("file:///c/test1"),
-            ::rtl::OUString::createFromAscii(""),
-            ::rtl::OUString::createFromAscii(""),
-            ::rtl::OUString::createFromAscii("") );
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///c/test1")),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) );
         css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > aHistoryList = aHistoryOpt.GetList( ePICKLIST );
 
         if ( aHistoryList.getLength()==0 )
@@ -677,10 +677,10 @@ void HistoryOptTest::impl_checkGetList(const ::rtl::OUString& sList)
     {
         impl_clearList(s_sURLHistory);
         aHistoryOpt.AppendItem( eHISTORY  ,
-            ::rtl::OUString::createFromAscii("file:///c/test1"),
-            ::rtl::OUString::createFromAscii(""),
-            ::rtl::OUString::createFromAscii(""),
-            ::rtl::OUString::createFromAscii("") );
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///c/test1")),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) );
         css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > aHistoryList = aHistoryOpt.GetList( eHISTORY );
 
         if ( aHistoryList.getLength()==0 )
@@ -692,10 +692,10 @@ void HistoryOptTest::impl_checkGetList(const ::rtl::OUString& sList)
     {
         impl_clearList(s_sHelpBookmarks);
         aHistoryOpt.AppendItem( eHELPBOOKMARKS  ,
-            ::rtl::OUString::createFromAscii("file:///c/test1"),
-            ::rtl::OUString::createFromAscii(""),
-            ::rtl::OUString::createFromAscii(""),
-            ::rtl::OUString::createFromAscii("") );
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///c/test1")),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) );
         css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > aHistoryList = aHistoryOpt.GetList( eHELPBOOKMARKS );
 
         if ( aHistoryList.getLength()==0 )
@@ -714,15 +714,15 @@ void HistoryOptTest::impl_checkAppendItem(const ::rtl::OUString& sList)
         for (sal_Int32 i=0; i<nListSize; ++i)
             aHistoryOpt.AppendItem( ePICKLIST  ,
             ::rtl::OUString::valueOf(i),
-            ::rtl::OUString::createFromAscii(""),
-            ::rtl::OUString::createFromAscii(""),
-            ::rtl::OUString::createFromAscii("") );
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) );
 
         aHistoryOpt.AppendItem( ePICKLIST  ,
             ::rtl::OUString::valueOf(nListSize),
-            ::rtl::OUString::createFromAscii(""),
-            ::rtl::OUString::createFromAscii(""),
-            ::rtl::OUString::createFromAscii("") );
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) );
     }
 
     else if (sList.equalsAscii("URLHistory"))
@@ -733,15 +733,15 @@ void HistoryOptTest::impl_checkAppendItem(const ::rtl::OUString& sList)
         for (sal_Int32 i=0; i<nListSize; ++i)
             aHistoryOpt.AppendItem( eHISTORY  ,
             ::rtl::OUString::valueOf(i),
-            ::rtl::OUString::createFromAscii(""),
-            ::rtl::OUString::createFromAscii(""),
-            ::rtl::OUString::createFromAscii("") );
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) );
 
         aHistoryOpt.AppendItem( eHISTORY  ,
             ::rtl::OUString::valueOf(nListSize),
-            ::rtl::OUString::createFromAscii(""),
-            ::rtl::OUString::createFromAscii(""),
-            ::rtl::OUString::createFromAscii("") );
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) );
     }
 
     else if (sList.equalsAscii("HelpBookmarks"))
@@ -752,15 +752,15 @@ void HistoryOptTest::impl_checkAppendItem(const ::rtl::OUString& sList)
         //for (sal_Int32 i=0; i<nListSize; ++i)
         //  aHistoryOpt.AppendItem( eHELPBOOKMARKS  ,
         //  ::rtl::OUString::valueOf(i),
-        //  ::rtl::OUString::createFromAscii(""),
-        //  ::rtl::OUString::createFromAscii(""),
-        //  ::rtl::OUString::createFromAscii("") );
+        //  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+        //  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+        //  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) );
 
         //aHistoryOpt.AppendItem( eHELPBOOKMARKS  ,
         //  ::rtl::OUString::valueOf(nListSize),
-        //  ::rtl::OUString::createFromAscii(""),
-        //  ::rtl::OUString::createFromAscii(""),
-        //  ::rtl::OUString::createFromAscii("") );
+        //  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+        //  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")),
+        //  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) );
     }
 }
 
diff --git a/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx b/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx
index e2ef940cbde6..b02c7deba53b 100644
--- a/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx
@@ -36,24 +36,24 @@
 namespace css = ::com::sun::star;
 
 // using test  only
-#define ROOTNODE_PRINTOPTION                            rtl::OUString::createFromAscii("org.openoffice.Office.Common/Print/Option")
-#define PROPERTYNAME_REDUCETRANSPARENCY                 rtl::OUString::createFromAscii("ReduceTransparency")
-#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE            rtl::OUString::createFromAscii("ReducedTransparencyMode")
-#define PROPERTYNAME_REDUCEGRADIENTS                    rtl::OUString::createFromAscii("ReduceGradients")
-#define PROPERTYNAME_REDUCEDGRADIENTMODE                rtl::OUString::createFromAscii("ReducedGradientMode")
-#define PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT           rtl::OUString::createFromAscii("ReducedGradientStepCount")
-#define PROPERTYNAME_REDUCEBITMAPS                      rtl::OUString::createFromAscii("ReduceBitmaps")
-#define PROPERTYNAME_REDUCEDBITMAPMODE                  rtl::OUString::createFromAscii("ReducedBitmapMode")
-#define PROPERTYNAME_REDUCEDBITMAPRESOLUTION            rtl::OUString::createFromAscii("ReducedBitmapResolution")
-#define PROPERTYNAME_REDUCEDBITMAPINCLUDESTRANSPARENCY  rtl::OUString::createFromAscii("ReducedBitmapIncludesTransparency")
-#define PROPERTYNAME_CONVERTTOGREYSCALES                rtl::OUString::createFromAscii("ConvertToGreyscales")
+#define ROOTNODE_PRINTOPTION                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/Print/Option"))
+#define PROPERTYNAME_REDUCETRANSPARENCY                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceTransparency"))
+#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedTransparencyMode"))
+#define PROPERTYNAME_REDUCEGRADIENTS                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceGradients"))
+#define PROPERTYNAME_REDUCEDGRADIENTMODE                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedGradientMode"))
+#define PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT           rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedGradientStepCount"))
+#define PROPERTYNAME_REDUCEBITMAPS                      rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceBitmaps"))
+#define PROPERTYNAME_REDUCEDBITMAPMODE                  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedBitmapMode"))
+#define PROPERTYNAME_REDUCEDBITMAPRESOLUTION            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedBitmapResolution"))
+#define PROPERTYNAME_REDUCEDBITMAPINCLUDESTRANSPARENCY  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedBitmapIncludesTransparency"))
+#define PROPERTYNAME_CONVERTTOGREYSCALES                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ConvertToGreyscales"))
 
 PrintOptTest::PrintOptTest()
 {
     m_xCfg = css::uno::Reference< css::container::XNameAccess >(
             ::comphelper::ConfigurationHelper::openConfig(
             ::utl::getProcessServiceFactory(),
-            rtl::OUString::createFromAscii("org.openoffice.Office.Common/Print/Option"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/Print/Option")),
             ::comphelper::ConfigurationHelper::E_STANDARD),
             css::uno::UNO_QUERY);
 
@@ -62,7 +62,7 @@ PrintOptTest::PrintOptTest()
             //UniString  sTmp = UniString("printer");
             //xub_StrLen nTokenCount = sTmp.GetTokenCount('/');
             //sTmp = sTmp.GetToken(nTokenCount - 1, '/');
-            m_xCfg->getByName(rtl::OUString::createFromAscii("Printer")) >>= m_xNode;
+            m_xCfg->getByName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Printer"))) >>= m_xNode;
         }
 }
 
@@ -397,9 +397,9 @@ void PrintOptTest::impl_checkPrint()
     if ( bNewValue == bOldValue ) // test the new source
     {
         throw css::uno::RuntimeException(
-            rtl::OUString::createFromAscii(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "null com.sun.star.configuration."
-            "the SetReduceTransparency() error!"),
+            "the SetReduceTransparency() error!")),
             0);
     }
 
@@ -413,9 +413,9 @@ void PrintOptTest::impl_checkPrint()
     if(bNewValue == bOldValue) // test the new source
     {
         throw css::uno::RuntimeException(
-            rtl::OUString::createFromAscii(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "null com.sun.star.configuration."
-            "the IsReduceTransparency() error!"),
+            "the IsReduceTransparency() error!")),
             0);
     }
 
@@ -430,9 +430,9 @@ void PrintOptTest::impl_checkPrint()
     if ( nNewMode == nOldMode ) // test the new source
     {
         throw css::uno::RuntimeException(
-            rtl::OUString::createFromAscii(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "null com.sun.star.configuration."
-            "the SetReducedTransparencyMode() error!"),
+            "the SetReducedTransparencyMode() error!")),
             0);
     }
 
@@ -446,10 +446,10 @@ void PrintOptTest::impl_checkPrint()
     if(nNewMode == nOldMode)  // test the new source
     {
         throw css::uno::RuntimeException(
-            rtl::OUString::createFromAscii(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "null com.sun.star.configuration."
             "the IsReducedTransparencyMode() error!"
-            "nOldMode's value is :"),
+            "nOldMode's value is :")),
             0);
     }
 
@@ -463,9 +463,9 @@ void PrintOptTest::impl_checkPrint()
     if (bNewValue == bOldValue)   //test the new source
     {
         throw css::uno::RuntimeException(
-            rtl::OUString::createFromAscii(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "null com.sun.star.configuration."
-            "the SetReduceGradients() error!"),
+            "the SetReduceGradients() error!")),
             0);
 
     }
@@ -480,9 +480,9 @@ void PrintOptTest::impl_checkPrint()
     if (bNewValue == bOldValue) // test the new source
     {
         throw css::uno::RuntimeException(
-            rtl::OUString::createFromAscii(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "null com.sun.star.configuration."
-            "the IsReduceGradients() error!"),
+            "the IsReduceGradients() error!")),
             0);
 
     }
@@ -497,9 +497,9 @@ void PrintOptTest::impl_checkPrint()
     if (nNewMode == nOldMode)// test the new source
     {
         throw css::uno::RuntimeException(
-            rtl::OUString::createFromAscii(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "null com.sun.star.configuration."
-            "the SetRedecedGradientMode() error!"),
+            "the SetRedecedGradientMode() error!")),
             0);
     }
 
@@ -513,9 +513,9 @@ void PrintOptTest::impl_checkPrint()
     if (nNewMode == nOldMode) // test the new source
     {
         throw css::uno::RuntimeException(
-            rtl::OUString::createFromAscii(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "null com.sun.star.configuration."
-            "the GetReducedGradientMode() error!"),
+            "the GetReducedGradientMode() error!")),
             0);
 
     }
@@ -532,9 +532,9 @@ void PrintOptTest::impl_checkPrint()
     if (nNewStepCount == nOldStepCount) // test the new source
     {
         throw css::uno::RuntimeException(
-            rtl::OUString::createFromAscii(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "null com.sun.star.configuration."
-            "the SetReducedGradientStepCount() error!"),
+            "the SetReducedGradientStepCount() error!")),
             0);
 
     }
@@ -549,9 +549,9 @@ void PrintOptTest::impl_checkPrint()
     if (nNewStepCount == nOldStepCount)  //test the new source
     {
         throw css::uno::RuntimeException(
-            rtl::OUString::createFromAscii(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "null com.sun.star.configuration."
-            "the GetReduceGradientStepCount() error!"),
+            "the GetReduceGradientStepCount() error!")),
             0);
     }
 
@@ -565,9 +565,9 @@ void PrintOptTest::impl_checkPrint()
     if (bNewValue == bOldValue) // test the new source
     {
         throw css::uno::RuntimeException(
-            rtl::OUString::createFromAscii(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "null com.sun.star.configuration."
-            "the SetReduceBitmaps() error!"),
+            "the SetReduceBitmaps() error!")),
             0);
     }
 
@@ -581,9 +581,9 @@ void PrintOptTest::impl_checkPrint()
     if (bNewValue == bOldValue) // test the new source
     {
         throw css::uno::RuntimeException(
-            rtl::OUString::createFromAscii(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "null com.sun.star.configuration."
-            "the IsReduceBitmaps() error!"),
+            "the IsReduceBitmaps() error!")),
             0);
     }
 
@@ -597,9 +597,9 @@ void PrintOptTest::impl_checkPrint()
     if (nNewMode == nOldMode)// test the new source
     {
         throw css::uno::RuntimeException(
-            rtl::OUString::createFromAscii(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "null com.sun.star.configuration."
-            "the SetReduceBitmap() error!"),
+            "the SetReduceBitmap() error!")),
             0);
     }
 
@@ -613,9 +613,9 @@ void PrintOptTest::impl_checkPrint()
     if (nNewMode == nOldMode)  // test the new source
     {
         throw css::uno::RuntimeException(
-            rtl::OUString::createFromAscii(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "null com.sun.star.configuration."
-            "the SetReduceBitmapMode() error!"),
+            "the SetReduceBitmapMode() error!")),
             0);
     }
 
@@ -629,9 +629,9 @@ void PrintOptTest::impl_checkPrint()
     if (nNewMode == nOldMode)// test the new source
     {
         throw css::uno::RuntimeException(
-            rtl::OUString::createFromAscii(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "null com.sun.star.configuration."
-            "the GetReduceBitmapMode() error!"),
+            "the GetReduceBitmapMode() error!")),
             0);
 
     }
@@ -648,9 +648,9 @@ void PrintOptTest::impl_checkPrint()
     if (nNewResolution == nOldResolution)// test the new source
     {
         throw css::uno::RuntimeException(
-            rtl::OUString::createFromAscii(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "null com.sun.star.configuration."
-            "the SetReducedBitmapResolution() error!"),
+            "the SetReducedBitmapResolution() error!")),
             0);
     }
 
@@ -664,9 +664,9 @@ void PrintOptTest::impl_checkPrint()
     if (nNewResolution == nOldResolution) // test the new source
     {
         throw css::uno::RuntimeException(
-            rtl::OUString::createFromAscii(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "null com.sun.star.configuration."
-            "the GetReduceBitmapResolution() error!"),
+            "the GetReduceBitmapResolution() error!")),
             0);
     }
 
@@ -680,9 +680,9 @@ void PrintOptTest::impl_checkPrint()
     if (bNewValue == bOldValue) // test the old source
     {
         throw css::uno::RuntimeException(
-            rtl::OUString::createFromAscii(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "null com.sun.star.configuration."
-            "the SetReducedBitmapIncludesTransparency() error!"),
+            "the SetReducedBitmapIncludesTransparency() error!")),
             0);
     }
 
@@ -696,9 +696,9 @@ void PrintOptTest::impl_checkPrint()
     if (bNewValue == bOldValue) // test the new source
     {
         throw css::uno::RuntimeException(
-            rtl::OUString::createFromAscii(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "null com.sun.star.configuration."
-            "the IsReducedBitmapIncludesTransparency() error!"),
+            "the IsReducedBitmapIncludesTransparency() error!")),
             0);
     }
 
@@ -712,9 +712,9 @@ void PrintOptTest::impl_checkPrint()
     if (bNewValue == bOldValue) // test the new source
     {
         throw css::uno::RuntimeException(
-            rtl::OUString::createFromAscii(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "null com.sun.star.configuration."
-            "the SetConvertToGreyscales() error!"),
+            "the SetConvertToGreyscales() error!")),
             0);
     }
 
@@ -728,9 +728,9 @@ void PrintOptTest::impl_checkPrint()
     if (bNewValue == bOldValue) // test the new source
     {
         throw css::uno::RuntimeException(
-            rtl::OUString::createFromAscii(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "null com.sun.star.configuration."
-            "the IsConvertToGreyscales() error!"),
+            "the IsConvertToGreyscales() error!")),
             0);
     }
 }
diff --git a/svl/qa/complex/ConfigItems/helper/UserOptTest.cxx b/svl/qa/complex/ConfigItems/helper/UserOptTest.cxx
index 571d5bb9e3ed..c1e03e915ed2 100644
--- a/svl/qa/complex/ConfigItems/helper/UserOptTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/UserOptTest.cxx
@@ -31,24 +31,24 @@
 namespace css = ::com::sun::star;
 
 //=============================================================================
-static const ::rtl::OUString MESSAGE_SETCOMPANY_FAILED        = ::rtl::OUString::createFromAscii("set company failed")       ;
-static const ::rtl::OUString MESSAGE_SETFIRSTNAME_FAILED      = ::rtl::OUString::createFromAscii("set firstname failed")     ;
-static const ::rtl::OUString MESSAGE_SETLASTNAME_FAILED       = ::rtl::OUString::createFromAscii("set lastname failed")      ;
-static const ::rtl::OUString MESSAGE_SETID_FAILED             = ::rtl::OUString::createFromAscii("set ID failed")            ;
-static const ::rtl::OUString MESSAGE_SETSTREET_FAILED         = ::rtl::OUString::createFromAscii("set street failed")        ;
-static const ::rtl::OUString MESSAGE_SETCITY_FAILED           = ::rtl::OUString::createFromAscii("set city failed")          ;
-static const ::rtl::OUString MESSAGE_SETSTATE_FAILED          = ::rtl::OUString::createFromAscii("set state failed")         ;
-static const ::rtl::OUString MESSAGE_SETZIP_FAILED            = ::rtl::OUString::createFromAscii("set zip failed")           ;
-static const ::rtl::OUString MESSAGE_SETCOUNTRY_FAILED        = ::rtl::OUString::createFromAscii("set country failed")       ;
-static const ::rtl::OUString MESSAGE_SETPOSITION_FAILED       = ::rtl::OUString::createFromAscii("set position failed")      ;
-static const ::rtl::OUString MESSAGE_SETTITLE_FAILED          = ::rtl::OUString::createFromAscii("set title failed")         ;
-static const ::rtl::OUString MESSAGE_SETTELEPHONEHOME_FAILED  = ::rtl::OUString::createFromAscii("set telephonehome failed") ;
-static const ::rtl::OUString MESSAGE_SETTELEPHONEWORK_FAILED  = ::rtl::OUString::createFromAscii("set telephonework failed") ;
-static const ::rtl::OUString MESSAGE_SETFAX_FAILED            = ::rtl::OUString::createFromAscii("set fax failed")           ;
-static const ::rtl::OUString MESSAGE_SETEMAIL_FAILED          = ::rtl::OUString::createFromAscii("set email failed")         ;
-static const ::rtl::OUString MESSAGE_SETCUSTOMERNUMBER_FAILED = ::rtl::OUString::createFromAscii("set customernumber failed");
-static const ::rtl::OUString MESSAGE_SETFATHERSNAME_FAILED    = ::rtl::OUString::createFromAscii("set fathersname failed")   ;
-static const ::rtl::OUString MESSAGE_SETAPARTMENT_FAILED      = ::rtl::OUString::createFromAscii("set apartment failed")     ;
+static const ::rtl::OUString MESSAGE_SETCOMPANY_FAILED        (RTL_CONSTASCII_USTRINGPARAM("set company failed"))       ;
+static const ::rtl::OUString MESSAGE_SETFIRSTNAME_FAILED      (RTL_CONSTASCII_USTRINGPARAM("set firstname failed"))     ;
+static const ::rtl::OUString MESSAGE_SETLASTNAME_FAILED       (RTL_CONSTASCII_USTRINGPARAM("set lastname failed"))      ;
+static const ::rtl::OUString MESSAGE_SETID_FAILED             (RTL_CONSTASCII_USTRINGPARAM("set ID failed"))            ;
+static const ::rtl::OUString MESSAGE_SETSTREET_FAILED         (RTL_CONSTASCII_USTRINGPARAM("set street failed"))        ;
+static const ::rtl::OUString MESSAGE_SETCITY_FAILED           (RTL_CONSTASCII_USTRINGPARAM("set city failed"))          ;
+static const ::rtl::OUString MESSAGE_SETSTATE_FAILED          (RTL_CONSTASCII_USTRINGPARAM("set state failed"))         ;
+static const ::rtl::OUString MESSAGE_SETZIP_FAILED            (RTL_CONSTASCII_USTRINGPARAM("set zip failed"))           ;
+static const ::rtl::OUString MESSAGE_SETCOUNTRY_FAILED        (RTL_CONSTASCII_USTRINGPARAM("set country failed"))       ;
+static const ::rtl::OUString MESSAGE_SETPOSITION_FAILED       (RTL_CONSTASCII_USTRINGPARAM("set position failed"))      ;
+static const ::rtl::OUString MESSAGE_SETTITLE_FAILED          (RTL_CONSTASCII_USTRINGPARAM("set title failed"))         ;
+static const ::rtl::OUString MESSAGE_SETTELEPHONEHOME_FAILED  (RTL_CONSTASCII_USTRINGPARAM("set telephonehome failed")) ;
+static const ::rtl::OUString MESSAGE_SETTELEPHONEWORK_FAILED  (RTL_CONSTASCII_USTRINGPARAM("set telephonework failed")) ;
+static const ::rtl::OUString MESSAGE_SETFAX_FAILED            (RTL_CONSTASCII_USTRINGPARAM("set fax failed"))           ;
+static const ::rtl::OUString MESSAGE_SETEMAIL_FAILED          (RTL_CONSTASCII_USTRINGPARAM("set email failed"))         ;
+static const ::rtl::OUString MESSAGE_SETCUSTOMERNUMBER_FAILED (RTL_CONSTASCII_USTRINGPARAM("set customernumber failed"));
+static const ::rtl::OUString MESSAGE_SETFATHERSNAME_FAILED    (RTL_CONSTASCII_USTRINGPARAM("set fathersname failed"))   ;
+static const ::rtl::OUString MESSAGE_SETAPARTMENT_FAILED      (RTL_CONSTASCII_USTRINGPARAM("set apartment failed"))     ;
 
 //=============================================================================
 
@@ -84,24 +84,24 @@ void UserOptTest::impl_checkUserData()
     impl_checkSetFathersName( ::rtl::OUString() );
     impl_checkSetApartment( ::rtl::OUString() );
 
-    impl_checkSetCompany( ::rtl::OUString::createFromAscii("RedFlag2000") );
-    impl_checkSetFirstName( ::rtl::OUString::createFromAscii("Yan") );
-    impl_checkSetLastName( ::rtl::OUString::createFromAscii("Wu") );
-    impl_checkSetID( ::rtl::OUString::createFromAscii("wuy") );
-    impl_checkSetStreet( ::rtl::OUString::createFromAscii("SouthFifthRing") );
-    impl_checkSetCity( ::rtl::OUString::createFromAscii("Beijing") );
-    impl_checkSetState( ::rtl::OUString::createFromAscii("Beijing") );
-    impl_checkSetZip( ::rtl::OUString::createFromAscii("100176") );
-    impl_checkSetCountry( ::rtl::OUString::createFromAscii("China") );
-    impl_checkSetPosition( ::rtl::OUString::createFromAscii("Engineer") );
-    impl_checkSetTitle( ::rtl::OUString::createFromAscii("Software Engineer") );
-    impl_checkSetTelephoneHome( ::rtl::OUString::createFromAscii("010-51570010") );
-    impl_checkSetTelephoneWork( ::rtl::OUString::createFromAscii("010-51570010") );
-    impl_checkSetFax( ::rtl::OUString::createFromAscii("010-51570010") );
-    impl_checkSetEmail( ::rtl::OUString::createFromAscii("wuy@redflag2000.cn") );
-    //impl_checkSetCustomerNumber( ::rtl::OUString::createFromAscii("87654321") );
-    impl_checkSetFathersName( ::rtl::OUString::createFromAscii("father") );
-    impl_checkSetApartment( ::rtl::OUString::createFromAscii("apartment") );
+    impl_checkSetCompany( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RedFlag2000")) );
+    impl_checkSetFirstName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Yan")) );
+    impl_checkSetLastName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wu")) );
+    impl_checkSetID( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wuy")) );
+    impl_checkSetStreet( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SouthFifthRing")) );
+    impl_checkSetCity( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Beijing")) );
+    impl_checkSetState( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Beijing")) );
+    impl_checkSetZip( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("100176")) );
+    impl_checkSetCountry( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("China")) );
+    impl_checkSetPosition( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Engineer")) );
+    impl_checkSetTitle( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Software Engineer")) );
+    impl_checkSetTelephoneHome( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("010-51570010")) );
+    impl_checkSetTelephoneWork( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("010-51570010")) );
+    impl_checkSetFax( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("010-51570010")) );
+    impl_checkSetEmail( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wuy@redflag2000.cn")) );
+    //impl_checkSetCustomerNumber( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("87654321")) );
+    impl_checkSetFathersName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("father")) );
+    impl_checkSetApartment( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("apartment")) );
 }
 
 void UserOptTest::impl_checkSetCompany( const ::rtl::OUString& sUserData )
diff --git a/svl/source/config/asiancfg.cxx b/svl/source/config/asiancfg.cxx
index 000be6d1ff68..dcc0819790a2 100644
--- a/svl/source/config/asiancfg.cxx
+++ b/svl/source/config/asiancfg.cxx
@@ -73,9 +73,7 @@ struct SvxAsianConfig_Impl
         bKerningWesternTextOnly(sal_True),
         nCharDistanceCompression(0) {}
 };
-/* -----------------------------16.01.01 15:36--------------------------------
 
- ---------------------------------------------------------------------------*/
 Sequence<OUString> lcl_GetPropertyNames()
 {
     Sequence<OUString> aNames(2);
@@ -93,16 +91,12 @@ SvxAsianConfig::SvxAsianConfig(sal_Bool bEnableNotify) :
         EnableNotification(lcl_GetPropertyNames());
     Load();
 }
-/* -----------------------------16.01.01 15:36--------------------------------
 
- ---------------------------------------------------------------------------*/
 SvxAsianConfig::~SvxAsianConfig()
 {
     delete pImpl;
 }
-/* -----------------------------17.01.01 09:57--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SvxAsianConfig::Load()
 {
     Sequence<Any> aValues = GetProperties(lcl_GetPropertyNames());
@@ -144,16 +138,12 @@ void SvxAsianConfig::Load()
         pImpl->aForbiddenArr.Insert(pInsert, pImpl->aForbiddenArr.Count());
     }
 }
-/* -----------------------------17.01.01 09:57--------------------------------
 
- ---------------------------------------------------------------------------*/
 void    SvxAsianConfig::Notify( const Sequence<OUString>& )
 {
     Load();
 }
-/* -----------------------------16.01.01 15:36--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SvxAsianConfig::Commit()
 {
     Sequence<Any> aValues(2);
@@ -190,40 +180,30 @@ void SvxAsianConfig::Commit()
         ReplaceSetProperties(sNode, aSetValues);
     }
 }
-/* -----------------------------16.01.01 15:36--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool    SvxAsianConfig::IsKerningWesternTextOnly() const
 {
     return pImpl->bKerningWesternTextOnly;
 }
-/* -----------------------------16.01.01 15:36--------------------------------
 
- ---------------------------------------------------------------------------*/
 void        SvxAsianConfig::SetKerningWesternTextOnly(sal_Bool bSet)
 {
     pImpl->bKerningWesternTextOnly = bSet;
     SetModified();
 }
-/* -----------------------------16.01.01 15:36--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Int16   SvxAsianConfig::GetCharDistanceCompression() const
 {
     return pImpl->nCharDistanceCompression;
 }
-/* -----------------------------16.01.01 15:36--------------------------------
 
- ---------------------------------------------------------------------------*/
 void        SvxAsianConfig::SetCharDistanceCompression(sal_Int16 nSet)
 {
     DBG_ASSERT(nSet >= 0 && nSet < 3, "compression value illegal");
     SetModified();
     pImpl->nCharDistanceCompression = nSet;
 }
-/* -----------------------------16.01.01 15:36--------------------------------
 
- ---------------------------------------------------------------------------*/
 uno::Sequence<lang::Locale> SvxAsianConfig::GetStartEndCharLocales()
 {
     Sequence<Locale> aRet(pImpl->aForbiddenArr.Count());
@@ -234,9 +214,7 @@ uno::Sequence<lang::Locale> SvxAsianConfig::GetStartEndCharLocales()
     }
     return aRet;
 }
-/* -----------------------------16.01.01 15:36--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool    SvxAsianConfig::GetStartEndChars( const Locale& rLocale,
                                     OUString& rStartChars,
                                     OUString& rEndChars )
@@ -253,9 +231,7 @@ sal_Bool    SvxAsianConfig::GetStartEndChars( const Locale& rLocale,
     }
     return sal_False;
 }
-/* -----------------------------16.01.01 15:36--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SvxAsianConfig::SetStartEndChars( const Locale& rLocale,
                                     const OUString* pStartChars,
                                     const OUString* pEndChars )
diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx
index 83dfb705c648..97727b16e2d3 100644
--- a/svl/source/config/cjkoptions.cxx
+++ b/svl/source/config/cjkoptions.cxx
@@ -47,9 +47,7 @@ using namespace ::rtl;
 
 #define C2U(cChar) OUString::createFromAscii(cChar)
 #define CFG_READONLY_DEFAULT sal_False
-/* -----------------------------10.04.01 12:39--------------------------------
 
- ---------------------------------------------------------------------------*/
 class SvtCJKOptions_Impl : public utl::ConfigItem
 {
     sal_Bool        bIsLoaded;
@@ -99,9 +97,7 @@ public:
     void    SetAll(sal_Bool bSet);
     sal_Bool IsReadOnly(SvtCJKOptions::EOption eOption) const;
 };
-/*-- 10.04.01 12:41:57---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 namespace
 {
     struct PropertyNames
@@ -131,15 +127,11 @@ SvtCJKOptions_Impl::SvtCJKOptions_Impl() :
     bROVerticalCallOut(CFG_READONLY_DEFAULT)
 {
 }
-/*-- 10.04.01 12:41:57---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SvtCJKOptions_Impl::~SvtCJKOptions_Impl()
 {
 }
-/* -----------------------------20.04.01 14:34--------------------------------
 
- ---------------------------------------------------------------------------*/
 void    SvtCJKOptions_Impl::SetAll(sal_Bool bSet)
 {
     if (
@@ -169,9 +161,7 @@ void    SvtCJKOptions_Impl::SetAll(sal_Bool bSet)
         NotifyListeners(0);
     }
 }
-/*-- 10.04.01 12:41:56---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvtCJKOptions_Impl::Load()
 {
     Sequence<OUString> &rPropertyNames = PropertyNames::get();
@@ -233,17 +223,13 @@ void SvtCJKOptions_Impl::Load()
     }
     bIsLoaded = sal_True;
 }
-/*-- 10.04.01 12:41:57---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void    SvtCJKOptions_Impl::Notify( const Sequence< OUString >& )
 {
     Load();
     NotifyListeners(0);
 }
-/*-- 10.04.01 12:41:57---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void    SvtCJKOptions_Impl::Commit()
 {
     Sequence<OUString> &rPropertyNames = PropertyNames::get();
@@ -366,9 +352,7 @@ void    SvtCJKOptions_Impl::Commit()
     aValues.realloc(nRealCount);
     PutProperties(aNames, aValues);
 }
-/*-- 13.02.2003 12:12---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SvtCJKOptions_Impl::IsReadOnly(SvtCJKOptions::EOption eOption) const
 {
     sal_Bool bReadOnly = CFG_READONLY_DEFAULT;
@@ -478,25 +462,19 @@ sal_Bool SvtCJKOptions::IsVerticalCallOutEnabled() const
     DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
     return pCJKOptions->IsVerticalCallOutEnabled();
 }
-/*-- 20.04.01 14:32:04---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void        SvtCJKOptions::SetAll(sal_Bool bSet)
 {
     DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
     pCJKOptions->SetAll(bSet);
 }
-/*-- 20.04.01 14:32:06---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool    SvtCJKOptions::IsAnyEnabled() const
 {
     DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
     return pCJKOptions->IsAnyEnabled();
 }
-/*-- 13.02.2003 12:11---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool    SvtCJKOptions::IsReadOnly(EOption eOption) const
 {
     DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx
index 17e9724e8a87..9f752aa9f471 100644
--- a/svl/source/config/itemholder2.cxx
+++ b/svl/source/config/itemholder2.cxx
@@ -59,7 +59,7 @@ ItemHolder2::ItemHolder2()
     {
         css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
         css::uno::Reference< css::lang::XComponent > xCfg(
-            xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")),
+            xSMGR->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))),
             css::uno::UNO_QUERY);
         if (xCfg.is())
             xCfg->addEventListener(static_cast< css::lang::XEventListener* >(this));
diff --git a/svl/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx
index 5d9cb63c6fef..9a84199e366e 100644
--- a/svl/source/config/languageoptions.cxx
+++ b/svl/source/config/languageoptions.cxx
@@ -147,30 +147,22 @@ sal_Bool SvtLanguageOptions::IsCTLSequenceChecking() const
 {
     return m_pCTLOptions->IsCTLSequenceChecking();
 }
-/*-- 26.09.2005 15:48:23---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvtLanguageOptions::SetCTLSequenceCheckingRestricted( sal_Bool _bEnable )
 {
     m_pCTLOptions->SetCTLSequenceCheckingRestricted( _bEnable );
 }
-/*-- 26.09.2005 15:48:23---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SvtLanguageOptions::IsCTLSequenceCheckingRestricted( void ) const
 {
     return m_pCTLOptions->IsCTLSequenceCheckingRestricted();
 }
-/*-- 26.09.2005 15:48:23---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvtLanguageOptions::SetCTLSequenceCheckingTypeAndReplace( sal_Bool _bEnable )
 {
     m_pCTLOptions->SetCTLSequenceCheckingTypeAndReplace( _bEnable );
 }
-/*-- 26.09.2005 15:48:24---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SvtLanguageOptions::IsCTLSequenceCheckingTypeAndReplace() const
 {
     return m_pCTLOptions->IsCTLSequenceCheckingTypeAndReplace();
@@ -201,7 +193,6 @@ sal_Bool SvtLanguageOptions::IsReadOnly(SvtLanguageOptions::EOption eOption) con
     }
     return bReadOnly;
 }
-/* -----------------30.04.2003 11:03-----------------*/
 
 // returns for a language the scripttype
 sal_uInt16 SvtLanguageOptions::GetScriptTypeOfLanguage( sal_uInt16 nLang )
@@ -228,10 +219,6 @@ sal_uInt16 SvtLanguageOptions::GetScriptTypeOfLanguage( sal_uInt16 nLang )
 }
 // -----------------------------------------------------------------------------
 
-
-/*-- 27.10.2005 08:18:01---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SvtSystemLanguageOptions::SvtSystemLanguageOptions() :
     utl::ConfigItem( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("System/L10N") ))
 {
@@ -245,15 +232,11 @@ SvtSystemLanguageOptions::SvtSystemLanguageOptions() :
         aValues[0]>>= m_sWin16SystemLocale;
     }
 }
-/*-- 27.10.2005 08:18:01---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SvtSystemLanguageOptions::~SvtSystemLanguageOptions()
 {
 }
-/*-- 27.10.2005 08:18:02---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void    SvtSystemLanguageOptions::Commit()
 {
     //does nothing
@@ -264,9 +247,7 @@ void    SvtSystemLanguageOptions::Notify( const com::sun::star::uno::Sequence< r
     // no listeners supported yet
 }
 
-/*-- 27.10.2005 08:36:14---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 LanguageType SvtSystemLanguageOptions::GetWin16SystemLanguage()
 {
     if( m_sWin16SystemLocale.getLength() == 0 )
diff --git a/svl/source/config/srchcfg.cxx b/svl/source/config/srchcfg.cxx
index 533f83cae1c6..963c320cc357 100644
--- a/svl/source/config/srchcfg.cxx
+++ b/svl/source/config/srchcfg.cxx
@@ -55,9 +55,7 @@ struct SvxSearchConfig_Impl
 {
     SvxSearchEngineArr   aEngineArr;
 };
-/* -----------------------------19.03.01 14:00--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool SvxSearchEngineData::operator==(const SvxSearchEngineData& rData)
 {
     return sEngineName      == rData.sEngineName     &&
@@ -74,9 +72,7 @@ sal_Bool SvxSearchEngineData::operator==(const SvxSearchEngineData& rData)
             sExactSeparator  == rData.sExactSeparator &&
             nExactCaseMatch  == rData.nExactCaseMatch;
 }
-/* -----------------------------16.01.01 15:36--------------------------------
 
- ---------------------------------------------------------------------------*/
 const Sequence<OUString>& lcl_GetSearchPropertyNames_Impl()
 {
     static Sequence<OUString> aNames;
@@ -112,16 +108,12 @@ SvxSearchConfig::SvxSearchConfig(sal_Bool bEnableNotify) :
     }
     Load();
 }
-/* -----------------------------16.01.01 15:36--------------------------------
 
- ---------------------------------------------------------------------------*/
 SvxSearchConfig::~SvxSearchConfig()
 {
     delete pImpl;
 }
-/* -----------------------------17.01.01 09:57--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SvxSearchConfig::Load()
 {
     pImpl->aEngineArr.DeleteAndDestroy(0, pImpl->aEngineArr.Count());
@@ -168,16 +160,12 @@ void SvxSearchConfig::Load()
         pImpl->aEngineArr.Insert(pNew, pImpl->aEngineArr.Count());
     }
 }
-/* -----------------------------17.01.01 09:57--------------------------------
 
- ---------------------------------------------------------------------------*/
 void    SvxSearchConfig::Notify( const Sequence<OUString>& )
 {
     Load();
 }
-/* -----------------------------16.01.01 15:36--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SvxSearchConfig::Commit()
 {
     OUString sNode;
@@ -224,24 +212,18 @@ void SvxSearchConfig::Commit()
         ReplaceSetProperties(sNode, aSetValues);
     }
 }
-/* -----------------------------19.03.01 10:02--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_uInt16 SvxSearchConfig::Count()
 {
     return pImpl->aEngineArr.Count();
 }
-/* -----------------------------19.03.01 10:02--------------------------------
 
- ---------------------------------------------------------------------------*/
 const SvxSearchEngineData&  SvxSearchConfig::GetData(sal_uInt16 nPos)
 {
     DBG_ASSERT(nPos < pImpl->aEngineArr.Count(), "wrong array index");
     return *pImpl->aEngineArr[nPos];
 }
-/* -----------------------------19.03.01 10:38--------------------------------
 
- ---------------------------------------------------------------------------*/
 const SvxSearchEngineData*  SvxSearchConfig::GetData(const rtl::OUString& rEngineName)
 {
     for(sal_uInt16 nPos = 0; nPos < pImpl->aEngineArr.Count(); nPos++)
@@ -251,9 +233,7 @@ const SvxSearchEngineData*  SvxSearchConfig::GetData(const rtl::OUString& rEngin
     }
     return 0;
 }
-/* -----------------------------19.03.01 10:02--------------------------------
 
- ---------------------------------------------------------------------------*/
 void  SvxSearchConfig::SetData(const SvxSearchEngineData& rData)
 {
     for(sal_uInt16 nPos = 0; nPos < pImpl->aEngineArr.Count(); nPos++)
@@ -270,9 +250,7 @@ void  SvxSearchConfig::SetData(const SvxSearchEngineData& rData)
     pImpl->aEngineArr.Insert(pInsert, pImpl->aEngineArr.Count());
     SetModified();
 }
-/* -----------------------------19.03.01 10:38--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SvxSearchConfig::RemoveData(const rtl::OUString& rEngineName)
 {
     for(sal_uInt16 nPos = 0; nPos < pImpl->aEngineArr.Count(); nPos++)
diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx
index 6da26ece8381..f4dfd8e6f025 100644
--- a/svl/source/fsstor/fsfactory.cxx
+++ b/svl/source/fsstor/fsfactory.cxx
@@ -53,15 +53,15 @@ using namespace ::com::sun::star;
 uno::Sequence< ::rtl::OUString > SAL_CALL FSStorageFactory::impl_staticGetSupportedServiceNames()
 {
     uno::Sequence< ::rtl::OUString > aRet(2);
-    aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.embed.FileSystemStorageFactory");
-    aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.FileSystemStorageFactory");
+    aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.FileSystemStorageFactory"));
+    aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.FileSystemStorageFactory"));
     return aRet;
 }
 
 //-------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL FSStorageFactory::impl_staticGetImplementationName()
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.FileSystemStorageFactory");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.FileSystemStorageFactory"));
 }
 
 //-------------------------------------------------------------------------
@@ -154,7 +154,7 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstanceWithA
         if( aArguments[2] >>= aDescr )
         {
             aPropsToSet.realloc(1);
-            aPropsToSet[0].Name = ::rtl::OUString::createFromAscii( "URL" );
+            aPropsToSet[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"));
             aPropsToSet[0].Value <<= aURL;
 
             for ( sal_Int32 nInd = 0, nNumArgs = 1; nInd < aDescr.getLength(); nInd++ )
diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index 628bb7563759..e3fa778fe94d 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
@@ -255,8 +255,8 @@ void FSStorage::CopyContentToStorage_Impl( ::ucbhelper::Content* pContent, const
     // create cursor for access to children
     uno::Sequence< ::rtl::OUString > aProps( 2 );
     ::rtl::OUString* pProps = aProps.getArray();
-    pProps[0] = ::rtl::OUString::createFromAscii( "TargetURL" );
-    pProps[1] = ::rtl::OUString::createFromAscii( "IsFolder" );
+    pProps[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL"));
+    pProps[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder"));
     ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS;
 
     try
@@ -440,7 +440,7 @@ void SAL_CALL FSStorage::copyToStorage( const uno::Reference< embed::XStorage >&
     catch( uno::Exception& )
     {
           uno::Any aCaught( ::cppu::getCaughtException() );
-        throw embed::StorageWrappedTargetException( ::rtl::OUString::createFromAscii( "Can't copy raw stream" ),
+        throw embed::StorageWrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't copy raw stream")),
                                                  uno::Reference< io::XInputStream >(),
                                                  aCaught );
     }
@@ -550,7 +550,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::openStreamElement(
     catch( uno::Exception& )
     {
           uno::Any aCaught( ::cppu::getCaughtException() );
-        throw embed::StorageWrappedTargetException( ::rtl::OUString::createFromAscii( "Can't copy raw stream" ),
+        throw embed::StorageWrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't copy raw stream")),
                                                  uno::Reference< io::XInputStream >(),
                                                  aCaught );
     }
@@ -659,7 +659,7 @@ uno::Reference< embed::XStorage > SAL_CALL FSStorage::openStorageElement(
     catch( uno::Exception& )
     {
           uno::Any aCaught( ::cppu::getCaughtException() );
-        throw embed::StorageWrappedTargetException( ::rtl::OUString::createFromAscii( "Can't copy raw stream" ),
+        throw embed::StorageWrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't copy raw stream")),
                                                  uno::Reference< io::XInputStream >(),
                                                  aCaught );
     }
@@ -696,7 +696,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::cloneStreamElement( const ::rt
         uno::Reference< io::XInputStream > xInStream = aResultContent.openStream();
 
         xTempResult = uno::Reference < io::XStream >(
-                    m_pImpl->m_xFactory->createInstance ( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ),
+                    m_pImpl->m_xFactory->createInstance ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")) ),
                     uno::UNO_QUERY_THROW );
         uno::Reference < io::XOutputStream > xTempOut = xTempResult->getOutputStream();
         uno::Reference < io::XInputStream > xTempIn = xTempResult->getInputStream();
@@ -734,7 +734,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::cloneStreamElement( const ::rt
     catch( uno::Exception& )
     {
           uno::Any aCaught( ::cppu::getCaughtException() );
-        throw embed::StorageWrappedTargetException( ::rtl::OUString::createFromAscii( "Can't copy raw stream" ),
+        throw embed::StorageWrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't copy raw stream")),
                                                  uno::Reference< io::XInputStream >(),
                                                  aCaught );
     }
@@ -932,7 +932,7 @@ void SAL_CALL FSStorage::renameElement( const ::rtl::OUString& aElementName, con
     catch( uno::Exception& )
     {
           uno::Any aCaught( ::cppu::getCaughtException() );
-        throw embed::StorageWrappedTargetException( ::rtl::OUString::createFromAscii( "Can't copy raw stream" ),
+        throw embed::StorageWrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't copy raw stream")),
                                                  uno::Reference< io::XInputStream >(),
                                                  aCaught );
     }
@@ -1017,7 +1017,7 @@ void SAL_CALL FSStorage::copyElementTo( const ::rtl::OUString& aElementName,
     catch( uno::Exception& )
     {
           uno::Any aCaught( ::cppu::getCaughtException() );
-        throw embed::StorageWrappedTargetException( ::rtl::OUString::createFromAscii( "Can't copy raw stream" ),
+        throw embed::StorageWrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't copy raw stream")),
                                                  uno::Reference< io::XInputStream >(),
                                                  aCaught );
     }
@@ -1097,7 +1097,7 @@ uno::Any SAL_CALL FSStorage::getByName( const ::rtl::OUString& aName )
     catch ( uno::Exception& )
     {
            uno::Any aCaught( ::cppu::getCaughtException() );
-        throw lang::WrappedTargetException( ::rtl::OUString::createFromAscii( "Can not open element!\n" ),
+        throw lang::WrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can not open element!\n")),
                                             uno::Reference< uno::XInterface >(  static_cast< OWeakObject* >( this ),
                                                                                 uno::UNO_QUERY ),
                                             aCaught );
@@ -1121,7 +1121,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FSStorage::getElementNames()
 
     uno::Sequence< ::rtl::OUString > aProps( 1 );
     ::rtl::OUString* pProps = aProps.getArray();
-    pProps[0] = ::rtl::OUString::createFromAscii( "Title" );
+    pProps[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
     ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS;
 
     uno::Sequence< ::rtl::OUString > aResult;
@@ -1150,7 +1150,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FSStorage::getElementNames()
         else
         {
                uno::Any aCaught( ::cppu::getCaughtException() );
-            throw lang::WrappedTargetRuntimeException( ::rtl::OUString::createFromAscii( "Can not open storage!\n" ),
+            throw lang::WrappedTargetRuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can not open storage!\n")),
                                             uno::Reference< uno::XInterface >(  static_cast< OWeakObject* >( this ),
                                                                                 uno::UNO_QUERY ),
                                             aCaught );
@@ -1163,7 +1163,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FSStorage::getElementNames()
     catch ( uno::Exception& )
     {
            uno::Any aCaught( ::cppu::getCaughtException() );
-        throw lang::WrappedTargetRuntimeException( ::rtl::OUString::createFromAscii( "Can not open storage!\n" ),
+        throw lang::WrappedTargetRuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can not open storage!\n")),
                                             uno::Reference< uno::XInterface >(  static_cast< OWeakObject* >( this ),
                                                                                 uno::UNO_QUERY ),
                                             aCaught );
@@ -1197,7 +1197,7 @@ sal_Bool SAL_CALL FSStorage::hasByName( const ::rtl::OUString& aName )
     catch ( uno::Exception& )
     {
            uno::Any aCaught( ::cppu::getCaughtException() );
-        throw lang::WrappedTargetRuntimeException( ::rtl::OUString::createFromAscii( "Can not open storage!\n" ),
+        throw lang::WrappedTargetRuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can not open storage!\n")),
                                             uno::Reference< uno::XInterface >(  static_cast< OWeakObject* >( this ),
                                                                                 uno::UNO_QUERY ),
                                             aCaught );
@@ -1236,7 +1236,7 @@ sal_Bool SAL_CALL FSStorage::hasElements()
         throw io::IOException(); // TODO: error handling
 
     uno::Sequence< ::rtl::OUString > aProps( 1 );
-    aProps[0] = ::rtl::OUString::createFromAscii( "TargetURL" );
+    aProps[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL"));
     ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS;
 
     try
@@ -1549,7 +1549,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamEl
     catch( uno::Exception& )
     {
           uno::Any aCaught( ::cppu::getCaughtException() );
-        throw embed::StorageWrappedTargetException( ::rtl::OUString::createFromAscii( "Can't copy raw stream" ),
+        throw embed::StorageWrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't copy raw stream")),
                                                  uno::Reference< io::XInputStream >(),
                                                  aCaught );
     }
diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx
index cbcd596103f4..90a367814202 100644
--- a/svl/source/inc/passwordcontainer.hxx
+++ b/svl/source/inc/passwordcontainer.hxx
@@ -216,7 +216,7 @@ public:
     {
         ::com::sun::star::uno::Sequence< ::rtl::OUString > aNode( 1 );
         *aNode.getArray()  = path;
-        *aNode.getArray() += ::rtl::OUString::createFromAscii( "/Store" );
+        *aNode.getArray() += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/Store"));
         EnableNotification( aNode );
     }
 
diff --git a/svl/source/items/cstitem.src b/svl/source/items/cstitem.src
index 009fcb19e3c6..206fe1a18893 100644
--- a/svl/source/items/cstitem.src
+++ b/svl/source/items/cstitem.src
@@ -30,40 +30,3 @@ String STR_COLUM_DT_AUTO
 {
     Text [ en-US ] = "automatic" ;
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx
index 57853f6fcfa2..5bb2fd5c7231 100644
--- a/svl/source/items/globalnameitem.cxx
+++ b/svl/source/items/globalnameitem.cxx
@@ -84,7 +84,7 @@ SfxPoolItem* SfxGlobalNameItem::Clone(SfxItemPool *) const
 bool SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
 {
     com::sun::star::uno::Reference < com::sun::star::script::XTypeConverter > xConverter
-            ( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.script.Converter")),
+            ( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter"))),
             com::sun::star::uno::UNO_QUERY );
     com::sun::star::uno::Sequence< sal_Int8 > aSeq;
     com::sun::star::uno::Any aNew;
diff --git a/svl/source/items/ilstitem.cxx b/svl/source/items/ilstitem.cxx
index 9316cef2ffd3..61917ffa63b5 100644
--- a/svl/source/items/ilstitem.cxx
+++ b/svl/source/items/ilstitem.cxx
@@ -79,7 +79,7 @@ SfxPoolItem* SfxIntegerListItem::Clone( SfxItemPool * ) const
 bool SfxIntegerListItem::PutValue  ( const com::sun::star::uno::Any& rVal, BYTE )
 {
     ::com::sun::star::uno::Reference < ::com::sun::star::script::XTypeConverter > xConverter
-            ( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.script.Converter")),
+            ( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter"))),
             ::com::sun::star::uno::UNO_QUERY );
     ::com::sun::star::uno::Any aNew;
     try { aNew = xConverter->convertTo( rVal, ::getCppuType((const ::com::sun::star::uno::Sequence < sal_Int32 >*)0) ); }
diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx
index b79bdeac8eda..bc0a52d73843 100644
--- a/svl/source/items/itemprop.cxx
+++ b/svl/source/items/itemprop.cxx
@@ -42,10 +42,6 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::uno;
 
-/*-- 16.02.2009 10:03:55---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
-
 struct equalOUString
 {
   bool operator()(const ::rtl::OUString& r1, const ::rtl::OUString&  r2) const
@@ -73,9 +69,6 @@ SfxItemPropertyMap_Impl::SfxItemPropertyMap_Impl( const SfxItemPropertyMap_Impl*
     m_aPropSeq = pSource->m_aPropSeq;
 }
 
-/*-- 16.02.2009 10:03:51---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SfxItemPropertyMap::SfxItemPropertyMap( const SfxItemPropertyMapEntry* pEntries ) :
     m_pImpl( new SfxItemPropertyMap_Impl )
 {
@@ -86,23 +79,17 @@ SfxItemPropertyMap::SfxItemPropertyMap( const SfxItemPropertyMapEntry* pEntries
         ++pEntries;
     }
 }
-/*-- 16.02.2009 12:46:41---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SfxItemPropertyMap::SfxItemPropertyMap( const SfxItemPropertyMap* pSource ) :
     m_pImpl( new SfxItemPropertyMap_Impl( pSource->m_pImpl ) )
 {
 }
-/*-- 16.02.2009 10:03:51---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SfxItemPropertyMap::~SfxItemPropertyMap()
 {
     delete m_pImpl;
 }
-/*-- 16.02.2009 10:03:51---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 const SfxItemPropertySimpleEntry* SfxItemPropertyMap::getByName( const ::rtl::OUString &rName ) const
 {
     SfxItemPropertyHashMap_t::const_iterator aIter = m_pImpl->find(rName);
@@ -111,9 +98,6 @@ const SfxItemPropertySimpleEntry* SfxItemPropertyMap::getByName( const ::rtl::OU
     return &aIter->second;
 }
 
-/*-- 16.02.2009 10:44:24---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 uno::Sequence<beans::Property> SfxItemPropertyMap::getProperties() const
 {
     if( !m_pImpl->m_aPropSeq.getLength() )
@@ -139,9 +123,7 @@ uno::Sequence<beans::Property> SfxItemPropertyMap::getProperties() const
 
     return m_pImpl->m_aPropSeq;
 }
-/*-- 16.02.2009 11:04:31---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 beans::Property SfxItemPropertyMap::getPropertyByName( const ::rtl::OUString rName ) const
     throw( beans::UnknownPropertyException )
 {
@@ -157,17 +139,13 @@ beans::Property SfxItemPropertyMap::getPropertyByName( const ::rtl::OUString rNa
     aProp.Attributes = sal::static_int_cast< sal_Int16 >(pEntry->nFlags);
     return aProp;
 }
-/*-- 16.02.2009 11:09:16---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SfxItemPropertyMap::hasPropertyByName( const ::rtl::OUString& rName ) const
 {
     SfxItemPropertyHashMap_t::const_iterator aIter = m_pImpl->find(rName);
     return aIter != m_pImpl->end();
 }
-/*-- 16.02.2009 11:25:14---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SfxItemPropertyMap::mergeProperties( const uno::Sequence< beans::Property >& rPropSeq )
 {
     const beans::Property* pPropArray = rPropSeq.getConstArray();
@@ -182,9 +160,7 @@ void SfxItemPropertyMap::mergeProperties( const uno::Sequence< beans::Property >
         (*m_pImpl)[pPropArray[nElement].Name] = aTemp;
     }
 }
-/*-- 18.02.2009 12:04:42---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 PropertyEntryVector_t SfxItemPropertyMap::getPropertyEntries() const
 {
     PropertyEntryVector_t aRet;
@@ -199,29 +175,21 @@ PropertyEntryVector_t SfxItemPropertyMap::getPropertyEntries() const
     }
     return aRet;
 }
-/*-- 18.02.2009 15:11:06---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_uInt32 SfxItemPropertyMap::getSize() const
 {
     return m_pImpl->size();
 }
-/*-- 16.02.2009 13:44:54---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SfxItemPropertySet::~SfxItemPropertySet()
 {
 }
-/* -----------------------------21.02.00 11:26--------------------------------
 
- ---------------------------------------------------------------------------*/
 BOOL SfxItemPropertySet::FillItem(SfxItemSet&, USHORT, BOOL) const
 {
     return FALSE;
 }
-/* -----------------------------06.06.01 12:32--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SfxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry& rEntry,
             const SfxItemSet& rSet, Any& rAny ) const
                         throw(RuntimeException)
@@ -257,9 +225,7 @@ void SfxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry& rEn
         rAny.setValue( &nTmp, *rEntry.pType );
     }
 }
-/* -----------------------------06.06.01 12:32--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SfxItemPropertySet::getPropertyValue( const rtl::OUString &rName,
             const SfxItemSet& rSet, Any& rAny ) const
                         throw(RuntimeException, UnknownPropertyException)
@@ -270,9 +236,7 @@ void SfxItemPropertySet::getPropertyValue( const rtl::OUString &rName,
         throw UnknownPropertyException();
     getPropertyValue( *pEntry,rSet, rAny );
 }
-/* -----------------------------21.02.00 11:26--------------------------------
 
- ---------------------------------------------------------------------------*/
 Any SfxItemPropertySet::getPropertyValue( const rtl::OUString &rName,
             const SfxItemSet& rSet ) const
                         throw(RuntimeException, UnknownPropertyException)
@@ -281,9 +245,7 @@ Any SfxItemPropertySet::getPropertyValue( const rtl::OUString &rName,
     getPropertyValue( rName,rSet, aVal );
     return aVal;
 }
-/* -----------------------------15.11.00 14:46--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SfxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry& rEntry,
                                             const Any& aVal,
                                             SfxItemSet& rSet ) const
@@ -322,9 +284,7 @@ void SfxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry& rEn
         delete pNewItem;
     }
 }
-/* -----------------------------21.02.00 11:26--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SfxItemPropertySet::setPropertyValue( const rtl::OUString &rName,
                                             const Any& aVal,
                                             SfxItemSet& rSet ) const
@@ -339,9 +299,7 @@ void SfxItemPropertySet::setPropertyValue( const rtl::OUString &rName,
     }
     setPropertyValue(*pEntry, aVal, rSet);
 }
-/* -----------------------------21.02.00 11:26--------------------------------
 
- ---------------------------------------------------------------------------*/
 PropertyState SfxItemPropertySet::getPropertyState(const SfxItemPropertySimpleEntry& rEntry, const SfxItemSet& rSet) const
                                     throw()
 {
@@ -383,9 +341,7 @@ PropertyState   SfxItemPropertySet::getPropertyState(
         eRet = PropertyState_AMBIGUOUS_VALUE;
     return eRet;
 }
-/* -----------------------------21.02.00 11:26--------------------------------
 
- ---------------------------------------------------------------------------*/
 Reference<XPropertySetInfo>
     SfxItemPropertySet::getPropertySetInfo() const
 {
@@ -393,75 +349,57 @@ Reference<XPropertySetInfo>
         m_xInfo = new SfxItemPropertySetInfo( &m_aMap );
     return m_xInfo;
 }
-/*-- 16.02.2009 13:49:25---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 struct SfxItemPropertySetInfo_Impl
 {
     SfxItemPropertyMap*         m_pOwnMap;
 };
-/*-- 16.02.2009 13:49:24---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SfxItemPropertySetInfo::SfxItemPropertySetInfo(const SfxItemPropertyMap *pMap ) :
     m_pImpl( new SfxItemPropertySetInfo_Impl )
 {
     m_pImpl->m_pOwnMap = new SfxItemPropertyMap( pMap );
 }
-/*-- 16.02.2009 13:49:25---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SfxItemPropertySetInfo::SfxItemPropertySetInfo(const SfxItemPropertyMapEntry *pEntries ) :
     m_pImpl( new SfxItemPropertySetInfo_Impl )
 {
     m_pImpl->m_pOwnMap = new SfxItemPropertyMap( pEntries );
 }
-/* -----------------------------21.02.00 11:09--------------------------------
 
- ---------------------------------------------------------------------------*/
 Sequence< Property > SAL_CALL
         SfxItemPropertySetInfo::getProperties(  )
             throw(RuntimeException)
 {
     return m_pImpl->m_pOwnMap->getProperties();
 }
-/*-- 16.02.2009 13:49:27---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 const SfxItemPropertyMap* SfxItemPropertySetInfo::getMap() const
 {
     return m_pImpl->m_pOwnMap;
 }
 
-/*-- 16.02.2009 12:43:36---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SfxItemPropertySetInfo::~SfxItemPropertySetInfo()
 {
     delete m_pImpl->m_pOwnMap;
     delete m_pImpl;
 }
-/* -----------------------------21.02.00 11:27--------------------------------
 
- ---------------------------------------------------------------------------*/
 Property SAL_CALL
         SfxItemPropertySetInfo::getPropertyByName( const ::rtl::OUString& rName )
             throw(UnknownPropertyException, RuntimeException)
 {
     return m_pImpl->m_pOwnMap->getPropertyByName( rName );
 }
-/* -----------------------------21.02.00 11:28--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool SAL_CALL
         SfxItemPropertySetInfo::hasPropertyByName( const ::rtl::OUString& rName )
             throw(RuntimeException)
 {
     return m_pImpl->m_pOwnMap->hasPropertyByName( rName );
 }
-/* -----------------------------21.02.00 12:03--------------------------------
 
- ---------------------------------------------------------------------------*/
 SfxExtItemPropertySetInfo::SfxExtItemPropertySetInfo(
                                 const SfxItemPropertyMapEntry *pMap,
                                 const Sequence<Property>& rPropSeq ) :
@@ -469,32 +407,24 @@ SfxExtItemPropertySetInfo::SfxExtItemPropertySetInfo(
 {
     aExtMap.mergeProperties( rPropSeq );
 }
-/*-- 16.02.2009 12:06:49---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SfxExtItemPropertySetInfo::~SfxExtItemPropertySetInfo()
 {
 }
-/* -----------------------------21.02.00 12:03--------------------------------
 
- ---------------------------------------------------------------------------*/
 Sequence< Property > SAL_CALL
         SfxExtItemPropertySetInfo::getProperties(  ) throw(RuntimeException)
 {
     return aExtMap.getProperties();
 }
-/* -----------------------------21.02.00 12:03--------------------------------
 
- ---------------------------------------------------------------------------*/
 Property SAL_CALL
 SfxExtItemPropertySetInfo::getPropertyByName( const rtl::OUString& rPropertyName )
             throw(UnknownPropertyException, RuntimeException)
 {
     return aExtMap.getPropertyByName( rPropertyName );
 }
-/* -----------------------------21.02.00 12:03--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool SAL_CALL
 SfxExtItemPropertySetInfo::hasPropertyByName( const rtl::OUString& rPropertyName )
             throw(RuntimeException)
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 91ca71f180fe..16a7268a3861 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -112,7 +112,7 @@ static Sequence< ::rtl::OUString > lcl_GetNotifyNames()
 SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) :
 
     SfxPoolItem( nId ),
-    ConfigItem( ::rtl::OUString::createFromAscii( CFG_ROOT_NODE ) ),
+    ConfigItem( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFG_ROOT_NODE )) ),
 
     aSearchOpt      (   SearchAlgorithms_ABSOLUTE,
                         SearchFlags::LEV_RELAXED,
@@ -200,7 +200,7 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) :
 SvxSearchItem::SvxSearchItem( const SvxSearchItem& rItem ) :
 
     SfxPoolItem ( rItem ),
-    ConfigItem( ::rtl::OUString::createFromAscii( CFG_ROOT_NODE ) ),
+    ConfigItem( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFG_ROOT_NODE )) ),
 
     aSearchOpt      ( rItem.aSearchOpt ),
     eFamily         ( rItem.eFamily ),
diff --git a/svl/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx
index d595ca585a09..12f98ce326ea 100644
--- a/svl/source/misc/documentlockfile.cxx
+++ b/svl/source/misc/documentlockfile.cxx
@@ -103,7 +103,7 @@ sal_Bool DocumentLockFile::CreateOwnLockFile()
     try
     {
         uno::Reference< io::XStream > xTempFile(
-            m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ),
+            m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")) ),
             uno::UNO_QUERY_THROW );
         uno::Reference< io::XSeekable > xSeekable( xTempFile, uno::UNO_QUERY_THROW );
 
@@ -173,7 +173,7 @@ uno::Reference< io::XInputStream > DocumentLockFile::OpenStream()
 
     uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
         uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess > xSimpleFileAccess(
-            xFactory->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess") ),
+            xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")) ),
             uno::UNO_QUERY_THROW );
 
     // the file can be opened readonly, no locking will be done
@@ -226,7 +226,7 @@ void DocumentLockFile::RemoveFile()
 
     uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
     uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess > xSimpleFileAccess(
-        xFactory->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess") ),
+        xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")) ),
         uno::UNO_QUERY_THROW );
     xSimpleFileAccess->kill( m_aURL );
 }
diff --git a/svl/source/misc/fstathelper.cxx b/svl/source/misc/fstathelper.cxx
index 43259f5bad7c..46d6eae274f7 100644
--- a/svl/source/misc/fstathelper.cxx
+++ b/svl/source/misc/fstathelper.cxx
@@ -50,7 +50,7 @@ sal_Bool FStatHelper::GetModifiedDateTimeOfFile( const UniString& rURL,
         ::ucbhelper::Content aTestContent( rURL,
                                 uno::Reference< XCommandEnvironment > ());
         uno::Any aAny = aTestContent.getPropertyValue(
-            OUString::createFromAscii(  "DateModified" ) );
+            OUString(RTL_CONSTASCII_USTRINGPARAM("DateModified")) );
         if( aAny.hasValue() )
         {
             bRet = sal_True;
diff --git a/svl/source/misc/mediatyp.src b/svl/source/misc/mediatyp.src
index 6085155fb0f7..5d34a320c7d8 100644
--- a/svl/source/misc/mediatyp.src
+++ b/svl/source/misc/mediatyp.src
@@ -742,28 +742,3 @@ String STR_SVT_MIMETYPE_APP_SXIPACKED
 {
     Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation (packed)" ;
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svl/source/misc/sharecontrolfile.cxx b/svl/source/misc/sharecontrolfile.cxx
index c00a8f916f2d..6d4f4975869c 100644
--- a/svl/source/misc/sharecontrolfile.cxx
+++ b/svl/source/misc/sharecontrolfile.cxx
@@ -118,7 +118,7 @@ void ShareControlFile::OpenStream()
                 ucb::InsertCommandArgument aInsertArg;
                 aInsertArg.Data = xInput;
                 aInsertArg.ReplaceExisting = sal_False;
-                aContent.executeCommand( rtl::OUString::createFromAscii( "insert" ), uno::makeAny( aInsertArg ) );
+                aContent.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert")), uno::makeAny( aInsertArg ) );
 
                 // try to let the file be hidden if possible
                 try {
@@ -365,7 +365,7 @@ void ShareControlFile::RemoveFile()
 
     uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
     uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess > xSimpleFileAccess(
-        xFactory->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess") ),
+        xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")) ),
         uno::UNO_QUERY_THROW );
     xSimpleFileAccess->kill( m_aURL );
 }
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index cf026acb8a71..4142bca372e2 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -405,7 +405,7 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryPreviewColorForNumber(
 rtl::OUString SAL_CALL SvNumberFormatterServiceObj::getImplementationName()
                             throw(uno::RuntimeException)
 {
-    return rtl::OUString::createFromAscii("com.sun.star.uno.util.numbers.SvNumberFormatterServiceObject");
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.util.numbers.SvNumberFormatterServiceObject"));
 }
 
 sal_Bool SAL_CALL SvNumberFormatterServiceObj::supportsService( const rtl::OUString& ServiceName )
@@ -419,7 +419,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SvNumberFormatterServiceObj::getSupportedS
 {
     uno::Sequence<rtl::OUString> aRet(1);
     rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = rtl::OUString::createFromAscii(SERVICENAME_NUMBERFORMATTER);
+    pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME_NUMBERFORMATTER));
     return aRet;
 }
 
@@ -694,7 +694,7 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::getFormatForLocale( sal_Int32 nKey, const
 rtl::OUString SAL_CALL SvNumberFormatsObj::getImplementationName()
                             throw(uno::RuntimeException)
 {
-    return rtl::OUString::createFromAscii("SvNumberFormatsObj");
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SvNumberFormatsObj"));
 }
 
 sal_Bool SAL_CALL SvNumberFormatsObj::supportsService( const rtl::OUString& ServiceName )
@@ -708,7 +708,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SvNumberFormatsObj::getSupportedServiceNam
 {
     uno::Sequence<rtl::OUString> aRet(1);
     rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = rtl::OUString::createFromAscii(SERVICENAME_NUMBERFORMATS);
+    pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME_NUMBERFORMATS));
     return aRet;
 }
 
@@ -909,31 +909,31 @@ uno::Sequence<beans::PropertyValue> SAL_CALL SvNumberFormatObj::getPropertyValue
         uno::Sequence<beans::PropertyValue> aSeq(13);
         beans::PropertyValue* pArray = aSeq.getArray();
 
-        pArray[0].Name = rtl::OUString::createFromAscii( PROPERTYNAME_FMTSTR );
+        pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_FMTSTR ));
         pArray[0].Value <<= rtl::OUString( aFmtStr );
-        pArray[1].Name = rtl::OUString::createFromAscii( PROPERTYNAME_LOCALE );
+        pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_LOCALE ));
         pArray[1].Value <<= aLocale;
-        pArray[2].Name = rtl::OUString::createFromAscii( PROPERTYNAME_TYPE );
+        pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_TYPE ));
         pArray[2].Value <<= (sal_Int16)( pFormat->GetType() );
-        pArray[3].Name = rtl::OUString::createFromAscii( PROPERTYNAME_COMMENT );
+        pArray[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_COMMENT ));
         pArray[3].Value <<= rtl::OUString( aComment );
-        pArray[4].Name = rtl::OUString::createFromAscii( PROPERTYNAME_STDFORM );
+        pArray[4].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_STDFORM ));
         pArray[4].Value.setValue( &bStandard, getBooleanCppuType() );
-        pArray[5].Name = rtl::OUString::createFromAscii( PROPERTYNAME_USERDEF );
+        pArray[5].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_USERDEF ));
         pArray[5].Value.setValue( &bUserDef, getBooleanCppuType() );
-        pArray[6].Name = rtl::OUString::createFromAscii( PROPERTYNAME_DECIMALS );
+        pArray[6].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_DECIMALS ));
         pArray[6].Value <<= (sal_Int16)( nDecimals );
-        pArray[7].Name = rtl::OUString::createFromAscii( PROPERTYNAME_LEADING );
+        pArray[7].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_LEADING ));
         pArray[7].Value <<= (sal_Int16)( nLeading );
-        pArray[8].Name = rtl::OUString::createFromAscii( PROPERTYNAME_NEGRED );
+        pArray[8].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_NEGRED ));
         pArray[8].Value.setValue( &bRed, getBooleanCppuType() );
-        pArray[9].Name = rtl::OUString::createFromAscii( PROPERTYNAME_THOUS );
+        pArray[9].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_THOUS ));
         pArray[9].Value.setValue( &bThousand, getBooleanCppuType() );
-        pArray[10].Name = rtl::OUString::createFromAscii( PROPERTYNAME_CURRSYM );
+        pArray[10].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_CURRSYM ));
         pArray[10].Value <<= rtl::OUString( aSymbol );
-        pArray[11].Name = rtl::OUString::createFromAscii( PROPERTYNAME_CURREXT );
+        pArray[11].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_CURREXT ));
         pArray[11].Value <<= rtl::OUString( aExt );
-        pArray[12].Name = rtl::OUString::createFromAscii( PROPERTYNAME_CURRABB );
+        pArray[12].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_CURRABB ));
         pArray[12].Value <<= rtl::OUString( aAbb );
 
         return aSeq;
@@ -955,7 +955,7 @@ void SAL_CALL SvNumberFormatObj::setPropertyValues( const uno::Sequence<beans::P
 rtl::OUString SAL_CALL SvNumberFormatObj::getImplementationName()
                             throw(uno::RuntimeException)
 {
-    return rtl::OUString::createFromAscii("SvNumberFormatObj");
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SvNumberFormatObj"));
 }
 
 sal_Bool SAL_CALL SvNumberFormatObj::supportsService( const rtl::OUString& ServiceName )
@@ -969,7 +969,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SvNumberFormatObj::getSupportedServiceName
 {
     uno::Sequence<rtl::OUString> aRet(1);
     rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = rtl::OUString::createFromAscii(SERVICENAME_NUMBERFORMAT);
+    pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME_NUMBERFORMAT));
     return aRet;
 }
 
@@ -1118,7 +1118,7 @@ void SAL_CALL SvNumberFormatSettingsObj::removeVetoableChangeListener( const rtl
 rtl::OUString SAL_CALL SvNumberFormatSettingsObj::getImplementationName()
                             throw(uno::RuntimeException)
 {
-    return rtl::OUString::createFromAscii("SvNumberFormatSettingsObj");
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SvNumberFormatSettingsObj"));
 }
 
 sal_Bool SAL_CALL SvNumberFormatSettingsObj::supportsService( const rtl::OUString& ServiceName )
@@ -1132,7 +1132,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SvNumberFormatSettingsObj::getSupportedSer
 {
     uno::Sequence<rtl::OUString> aRet(1);
     rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = rtl::OUString::createFromAscii(SERVICENAME_NUMBERSETTINGS);
+    pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME_NUMBERSETTINGS));
     return aRet;
 }
 
diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx
index 909a141e018f..3f5eb9aa1582 100644
--- a/svl/source/numbers/supservs.cxx
+++ b/svl/source/numbers/supservs.cxx
@@ -45,7 +45,7 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::util;
 using namespace ::utl;
 
-#define PERSISTENT_SERVICE_NAME     ::rtl::OUString::createFromAscii("com.sun.star.util.NumberFormatsSupplier");
+#define PERSISTENT_SERVICE_NAME     ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatsSupplier"));
 
 //-------------------------------------------------------------------------
 Reference< XInterface > SAL_CALL SvNumberFormatsSupplierServiceObject_CreateInstance(const Reference< XMultiServiceFactory >& _rxFactory)
@@ -130,7 +130,7 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence<
 //-------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL SvNumberFormatsSupplierServiceObject::getImplementationName(  ) throw(RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.uno.util.numbers.SvNumberFormatsSupplierServiceObject");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.util.numbers.SvNumberFormatsSupplierServiceObject"));
 }
 
 //-------------------------------------------------------------------------
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index 1d315c2d264f..f01f7e3f96a7 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -150,7 +150,7 @@ static vector< ::rtl::OUString > getInfoFromInd( ::rtl::OUString aInd )
 static sal_Bool shorterUrl( ::rtl::OUString& aURL )
 {
     sal_Int32 aInd = aURL.lastIndexOf( sal_Unicode( '/' ) );
-    if( aInd > 0  && aURL.indexOf( ::rtl::OUString::createFromAscii( "://" ) ) != aInd-2 )
+    if( aInd > 0  && aURL.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("://")) ) != aInd-2 )
     {
         aURL = aURL.copy( 0, aInd );
         return sal_True;
@@ -222,16 +222,16 @@ PassMap StorageItem::getInfo()
 {
     PassMap aResult;
 
-    Sequence< ::rtl::OUString > aNodeNames     = ConfigItem::GetNodeNames( ::rtl::OUString::createFromAscii("Store") );
+    Sequence< ::rtl::OUString > aNodeNames     = ConfigItem::GetNodeNames( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Store")) );
     sal_Int32 aNodeCount = aNodeNames.getLength();
     Sequence< ::rtl::OUString > aPropNames( aNodeCount );
     sal_Int32 aNodeInd;
 
     for( aNodeInd = 0; aNodeInd < aNodeCount; ++aNodeInd )
     {
-        aPropNames[aNodeInd]  = ::rtl::OUString::createFromAscii( "Store/Passwordstorage['" );
+        aPropNames[aNodeInd]  = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Store/Passwordstorage['"));
         aPropNames[aNodeInd] += aNodeNames[aNodeInd];
-        aPropNames[aNodeInd] += ::rtl::OUString::createFromAscii( "']/Password" );
+        aPropNames[aNodeInd] += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("']/Password"));
     }
 
     Sequence< Any > aPropertyValues = ConfigItem::GetProperties( aPropNames );
@@ -279,7 +279,7 @@ void StorageItem::setUseStorage( sal_Bool bUse )
     Sequence< ::rtl::OUString > sendNames(1);
     Sequence< uno::Any > sendVals(1);
 
-    sendNames[0] = ::rtl::OUString::createFromAscii( "UseStorage" );
+    sendNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseStorage"));
 
     sendVals[0] <<= bUse;
 
@@ -292,7 +292,7 @@ void StorageItem::setUseStorage( sal_Bool bUse )
 sal_Bool StorageItem::useStorage()
 {
     Sequence< ::rtl::OUString > aNodeNames( 1 );
-    aNodeNames[0] = ::rtl::OUString::createFromAscii( "UseStorage" );
+    aNodeNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseStorage"));
 
     Sequence< Any > aPropertyValues = ConfigItem::GetProperties( aNodeNames );
 
@@ -319,8 +319,8 @@ sal_Bool StorageItem::getEncodedMP( ::rtl::OUString& aResult )
     }
 
     Sequence< ::rtl::OUString > aNodeNames( 2 );
-    aNodeNames[0] = ::rtl::OUString::createFromAscii( "HasMaster" );
-    aNodeNames[1] = ::rtl::OUString::createFromAscii( "Master" );
+    aNodeNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasMaster"));
+    aNodeNames[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Master"));
 
     Sequence< Any > aPropertyValues = ConfigItem::GetProperties( aNodeNames );
 
@@ -345,8 +345,8 @@ void StorageItem::setEncodedMP( const ::rtl::OUString& aEncoded, sal_Bool bAccep
     Sequence< ::rtl::OUString > sendNames(2);
     Sequence< uno::Any > sendVals(2);
 
-    sendNames[0] = ::rtl::OUString::createFromAscii( "HasMaster" );
-    sendNames[1] = ::rtl::OUString::createFromAscii( "Master" );
+    sendNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasMaster"));
+    sendNames[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Master"));
 
     sal_Bool bHasMaster = ( aEncoded.getLength() > 0 || bAcceptEmpty );
     sendVals[0] <<= bHasMaster;
@@ -370,11 +370,11 @@ void StorageItem::remove( const ::rtl::OUString& aURL, const ::rtl::OUString& aN
     Sequence< ::rtl::OUString > sendSeq(1);
 
     sendSeq[0] = createIndex( forIndex );
-    // sendSeq[0]  = ::rtl::OUString::createFromAscii( "Store/Passwordstorage['" );
+    // sendSeq[0]  = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Store/Passwordstorage['"));
     // sendSeq[0] += createIndex( forIndex );
-    // sendSeq[0] += ::rtl::OUString::createFromAscii( "']" );
+    // sendSeq[0] += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("']"));
 
-    ConfigItem::ClearNodeElements( ::rtl::OUString::createFromAscii( "Store" ), sendSeq );
+    ConfigItem::ClearNodeElements( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Store")), sendSeq );
 }
 
 //-------------------------------------------------------------------------
@@ -383,7 +383,7 @@ void StorageItem::clear()
 {
     Sequence< ::rtl::OUString > sendSeq(1);
 
-    ConfigItem::ClearNodeSet( ::rtl::OUString::createFromAscii( "Store" ) );
+    ConfigItem::ClearNodeSet( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Store")) );
 }
 
 //-------------------------------------------------------------------------
@@ -402,14 +402,14 @@ void StorageItem::update( const ::rtl::OUString& aURL, const NamePassRecord& aRe
 
     Sequence< beans::PropertyValue > sendSeq(1);
 
-    sendSeq[0].Name  = ::rtl::OUString::createFromAscii( "Store/Passwordstorage['" );
+    sendSeq[0].Name  = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Store/Passwordstorage['"));
     sendSeq[0].Name += createIndex( forIndex );
-    sendSeq[0].Name += ::rtl::OUString::createFromAscii( "']/Password" );
+    sendSeq[0].Name += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("']/Password"));
 
     sendSeq[0].Value <<= aRecord.GetPersPasswords();
 
     ConfigItem::SetModified();
-    ConfigItem::SetSetProperties( ::rtl::OUString::createFromAscii( "Store" ), sendSeq );
+    ConfigItem::SetSetProperties( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Store")), sendSeq );
 }
 
 //-------------------------------------------------------------------------
@@ -440,7 +440,7 @@ PasswordContainer::PasswordContainer( const Reference<XMultiServiceFactory>& xSe
     mComponent = Reference< XComponent >( xServiceFactory, UNO_QUERY );
     mComponent->addEventListener( this );
 
-    m_pStorageFile = new StorageItem( this, ::rtl::OUString::createFromAscii( "Office.Common/Passwords" ) );
+    m_pStorageFile = new StorageItem( this, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Passwords")) );
     if( m_pStorageFile )
         if( m_pStorageFile->useStorage() )
             m_aContainer = m_pStorageFile->getInfo();
@@ -532,7 +532,7 @@ vector< ::rtl::OUString > PasswordContainer::DecodePasswords( const ::rtl::OUStr
 
     // problems with decoding
     OSL_ENSURE( sal_False, "Problem with decoding\n" );
-    throw RuntimeException( ::rtl::OUString::createFromAscii( "Can't decode!" ), Reference< XInterface >() );
+    throw RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't decode!")), Reference< XInterface >() );
 }
 
 
@@ -612,7 +612,7 @@ vector< ::rtl::OUString > PasswordContainer::DecodePasswords( const ::rtl::OUStr
 
     // problems with encoding
     OSL_ENSURE( sal_False, "Problem with encoding\n" );
-    throw RuntimeException( ::rtl::OUString::createFromAscii( "Can't encode!" ), Reference< XInterface >() );
+    throw RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't encode!")), Reference< XInterface >() );
 }
 
 //-------------------------------------------------------------------------
@@ -843,7 +843,7 @@ UrlRecord PasswordContainer::find(
             {
                 ::rtl::OUString tmpUrl( aUrl );
                 if ( tmpUrl.getStr()[tmpUrl.getLength() - 1] != (sal_Unicode)'/' )
-                    tmpUrl += ::rtl::OUString::createFromAscii( "/" );
+                    tmpUrl += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
                 aIter = m_aContainer.lower_bound( tmpUrl );
                 if( aIter != m_aContainer.end() && aIter->first.match( tmpUrl ) )
@@ -906,7 +906,7 @@ UrlRecord PasswordContainer::find(
 {
     PasswordRequestMode aRMode = PasswordRequestMode_PASSWORD_ENTER;
     if( !m_pStorageFile || !m_pStorageFile->useStorage() )
-        throw NoMasterException( ::rtl::OUString::createFromAscii( "Password storing is not active!" ), Reference< XInterface >(), aRMode );
+        throw NoMasterException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Password storing is not active!")), Reference< XInterface >(), aRMode );
 
     if( !m_aMasterPasswd.getLength() && aHandler.is() )
     {
@@ -955,7 +955,7 @@ UrlRecord PasswordContainer::find(
     }
 
     if ( !m_aMasterPasswd.getLength() )
-        throw NoMasterException( ::rtl::OUString::createFromAscii( "No master password!" ), Reference< XInterface >(), aRMode );
+        throw NoMasterException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No master password!")), Reference< XInterface >(), aRMode );
 
     return m_aMasterPasswd;
 }
@@ -977,7 +977,7 @@ void SAL_CALL PasswordContainer::remove( const ::rtl::OUString& aURL, const ::rt
             if( aInd > 0 && aUrl.getLength()-1 == aInd )
                 aUrl = aUrl.copy( 0, aUrl.getLength() - 1 );
             else
-                aUrl += ::rtl::OUString::createFromAscii( "/" );
+                aUrl += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
             aIter = m_aContainer.find( aUrl );
         }
@@ -1019,7 +1019,7 @@ void SAL_CALL PasswordContainer::removePersistent( const ::rtl::OUString& aURL,
             if( aInd > 0 && aUrl.getLength()-1 == aInd )
                 aUrl = aUrl.copy( 0, aUrl.getLength() - 1 );
             else
-                aUrl += ::rtl::OUString::createFromAscii( "/" );
+                aUrl += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
             aIter = m_aContainer.find( aUrl );
         }
@@ -1463,7 +1463,7 @@ Sequence< ::rtl::OUString > SAL_CALL PasswordContainer::getSupportedServiceNames
 Sequence< ::rtl::OUString > SAL_CALL PasswordContainer::impl_getStaticSupportedServiceNames(  ) throw(uno::RuntimeException)
 {
     Sequence< ::rtl::OUString > aRet(1);
-    *aRet.getArray() = ::rtl::OUString::createFromAscii("com.sun.star.task.PasswordContainer");
+    *aRet.getArray() = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.PasswordContainer"));
     return aRet;
 }
 
@@ -1471,7 +1471,7 @@ Sequence< ::rtl::OUString > SAL_CALL PasswordContainer::impl_getStaticSupportedS
 
 ::rtl::OUString SAL_CALL PasswordContainer::impl_getStaticImplementationName() throw(uno::RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("stardiv.svl.PasswordContainer");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv.svl.PasswordContainer"));
 }
 
 //-------------------------------------------------------------------------
@@ -1554,8 +1554,8 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
         Reference< XRegistryKey > xNewKey;
 
         xNewKey = xRegistryKey->createKey(
-            ::rtl::OUString::createFromAscii( "/stardiv.svl.PasswordContainer/UNO/SERVICES" ));
-        xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.task.PasswordContainer"));
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/stardiv.svl.PasswordContainer/UNO/SERVICES")));
+        xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.PasswordContainer")));
 
         return sal_True;
     }
diff --git a/svl/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx
index 4ba6d78a660e..66efc892cd65 100644
--- a/svl/source/passwordcontainer/syscreds.cxx
+++ b/svl/source/passwordcontainer/syscreds.cxx
@@ -33,14 +33,14 @@ using namespace com::sun::star;
 
 SysCredentialsConfigItem::SysCredentialsConfigItem(
     SysCredentialsConfig * pOwner )
-: utl::ConfigItem( rtl::OUString::createFromAscii( "Office.Common/Passwords" ),
+: utl::ConfigItem( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Passwords")),
                    CONFIG_MODE_IMMEDIATE_UPDATE ),
   m_bInited( false ),
   m_pOwner( pOwner )
 {
     uno::Sequence< ::rtl::OUString > aNode( 1 );
-    aNode[ 0 ] = rtl::OUString::createFromAscii(
-        "Office.Common/Passwords/AuthenticateUsingSystemCredentials" );
+    aNode[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+        "Office.Common/Passwords/AuthenticateUsingSystemCredentials" ));
     EnableNotification( aNode );
 }
 
@@ -70,8 +70,8 @@ SysCredentialsConfigItem::getSystemCredentialsURLs()
     {
         // read config item
         uno::Sequence< ::rtl::OUString > aPropNames( 1 );
-        aPropNames[ 0 ] = rtl::OUString::createFromAscii(
-            "AuthenticateUsingSystemCredentials" );
+        aPropNames[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "AuthenticateUsingSystemCredentials" ));
         uno::Sequence< uno::Any > aAnyValues(
             utl::ConfigItem::GetProperties( aPropNames ) );
 
@@ -100,8 +100,8 @@ void SysCredentialsConfigItem::setSystemCredentialsURLs(
     uno::Sequence< rtl::OUString > aPropNames( 1 );
     uno::Sequence< uno::Any > aPropValues( 1 );
     aPropNames[ 0 ]
-        = ::rtl::OUString::createFromAscii(
-            "AuthenticateUsingSystemCredentials" );
+        = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "AuthenticateUsingSystemCredentials" ));
     aPropValues[ 0 ] <<= seqURLList;
 
     utl::ConfigItem::SetModified();
@@ -123,7 +123,7 @@ namespace
         if( aInd > 0  )
         {
             sal_Int32 aPrevInd = aURL.lastIndexOf( sal_Unicode( '/' ), aInd );
-            if ( aURL.indexOf( ::rtl::OUString::createFromAscii( "://" ) )
+            if ( aURL.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("://")) )
                     != aPrevInd - 2 ||
                  aInd != aURL.getLength() - 1 )
             {
@@ -157,7 +157,7 @@ namespace
                 {
                     ::rtl::OUString tmpUrl( aUrl );
                     if ( tmpUrl.getStr()[tmpUrl.getLength() - 1] != (sal_Unicode)'/' )
-                      tmpUrl += ::rtl::OUString::createFromAscii( "/" );
+                      tmpUrl += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
                     aIter = rContainer.lower_bound( tmpUrl );
                     if( aIter != rContainer.end() && aIter->match( tmpUrl ) )
diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx
index a7a932435d24..5317176f51b5 100644
--- a/svl/source/uno/pathservice.cxx
+++ b/svl/source/uno/pathservice.cxx
@@ -52,7 +52,7 @@ public:
     virtual OUString SAL_CALL getImplementationName()
         throw(css::uno::RuntimeException)
         {
-            return OUString::createFromAscii("com.sun.star.comp.svl.PathService");
+            return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.svl.PathService"));
         }
 
     virtual sal_Bool SAL_CALL supportsService (
@@ -66,7 +66,7 @@ public:
         throw(css::uno::RuntimeException)
         {
             css::uno::Sequence< OUString > aRet(1);
-            aRet.getArray()[0] = OUString::createFromAscii("com.sun.star.config.SpecialConfigManager");
+            aRet.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.config.SpecialConfigManager"));
             return aRet;
         }
 
diff --git a/svl/source/uno/registerservices.cxx b/svl/source/uno/registerservices.cxx
index 679f79898d79..49f00d6a7845 100644
--- a/svl/source/uno/registerservices.cxx
+++ b/svl/source/uno/registerservices.cxx
@@ -71,21 +71,21 @@ SVL_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo (
         Reference< css::registry::XRegistryKey > xNewKey;
 
         xNewKey = xRegistryKey->createKey (
-            OUString::createFromAscii(
-                "/com.sun.star.uno.util.numbers.SvNumberFormatsSupplierServiceObject/UNO/SERVICES" ) );
+            OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "/com.sun.star.uno.util.numbers.SvNumberFormatsSupplierServiceObject/UNO/SERVICES" )) );
         xNewKey->createKey (
-            OUString::createFromAscii( "com.sun.star.util.NumberFormatsSupplier" ) );
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatsSupplier")) );
 
         xNewKey = xRegistryKey->createKey (
-            OUString::createFromAscii(
-                "/com.sun.star.uno.util.numbers.SvNumberFormatterServiceObject/UNO/SERVICES" ) );
+            OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "/com.sun.star.uno.util.numbers.SvNumberFormatterServiceObject/UNO/SERVICES" )) );
         xNewKey->createKey (
-            OUString::createFromAscii( "com.sun.star.util.NumberFormatter" ) );
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatter")) );
 
         xNewKey = xRegistryKey->createKey(
-            OUString::createFromAscii( "/com.sun.star.comp.svl.PathService/UNO/SERVICES" ) );
+            OUString(RTL_CONSTASCII_USTRINGPARAM("/com.sun.star.comp.svl.PathService/UNO/SERVICES")) );
         xNewKey->createKey (
-            OUString::createFromAscii( "com.sun.star.config.SpecialConfigManager" ) );
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.config.SpecialConfigManager")) );
 
         return sal_True;
     }
@@ -105,7 +105,7 @@ SVL_DLLPUBLIC void* SAL_CALL component_getFactory (
         {
             Sequence< OUString > aServiceNames(1);
             aServiceNames.getArray()[0] =
-                OUString::createFromAscii( "com.sun.star.util.NumberFormatsSupplier" );
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatsSupplier"));
 
             xFactory = ::cppu::createSingleFactory(
                 reinterpret_cast< css::lang::XMultiServiceFactory* >(_pServiceManager),
@@ -119,7 +119,7 @@ SVL_DLLPUBLIC void* SAL_CALL component_getFactory (
         {
             Sequence< OUString > aServiceNames(1);
             aServiceNames.getArray()[0] =
-                OUString::createFromAscii( "com.sun.star.util.NumberFormatter" );
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatter"));
 
             xFactory = ::cppu::createSingleFactory(
                 reinterpret_cast< css::lang::XMultiServiceFactory* >(_pServiceManager),
@@ -132,7 +132,7 @@ SVL_DLLPUBLIC void* SAL_CALL component_getFactory (
         {
             Sequence< OUString > aServiceNames(1);
             aServiceNames.getArray()[0] =
-                OUString::createFromAscii( "com.sun.star.config.SpecialConfigManager" );
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.config.SpecialConfigManager"));
             xFactory = ::cppu::createSingleFactory (
                 reinterpret_cast< css::lang::XMultiServiceFactory* >( _pServiceManager ),
                 OUString::createFromAscii( pImplementationName ),
diff --git a/svtools/bmpmaker/bmpsum.cxx b/svtools/bmpmaker/bmpsum.cxx
index 26245b97affb..a052cf45d75c 100644
--- a/svtools/bmpmaker/bmpsum.cxx
+++ b/svtools/bmpmaker/bmpsum.cxx
@@ -60,7 +60,6 @@ private:
     sal_uInt32      cExitCode;
 
     BOOL            GetCommandOption( const ::std::vector< String >& rArgs, const String& rSwitch, String& rSwitchParam );
-    BOOL            GetCommandOptions( const ::std::vector< String >& rArgs, const String& rSwitch, ::std::vector< String >& rSwitchParams );
 
     void            SetExitCode( BYTE cExit )
                     {
@@ -129,38 +128,6 @@ BOOL BmpSum::GetCommandOption( const ::std::vector< String >& rArgs, const Strin
 
 // -----------------------------------------------------------------------
 
-BOOL BmpSum::GetCommandOptions( const ::std::vector< String >& rArgs, const String& rSwitch, ::std::vector< String >& rParams )
-{
-    BOOL bRet = FALSE;
-
-    for( int i = 0, nCount = rArgs.size(); ( i < nCount ); i++ )
-    {
-        String  aTestStr( '-' );
-
-        for( int n = 0; ( n < 2 ) && !bRet; n++ )
-        {
-            aTestStr += rSwitch;
-
-            if( aTestStr.CompareIgnoreCaseToAscii( rArgs[ i ] ) == COMPARE_EQUAL )
-            {
-                if( i < ( nCount - 1 ) )
-                    rParams.push_back( rArgs[ i + 1 ] );
-                else
-                    rParams.push_back( String() );
-
-                break;
-            }
-
-            if( 0 == n )
-                aTestStr = '/';
-        }
-    }
-
-    return( rParams.size() > 0 );
-}
-
-// -----------------------------------------------------------------------
-
 void BmpSum::Message( const String& rText, BYTE nExitCode )
 {
     if( EXIT_NOERROR != nExitCode )
diff --git a/svtools/inc/apearcfg.hxx b/svtools/inc/apearcfg.hxx
index f9f588abb9a9..0399fae273b0 100644
--- a/svtools/inc/apearcfg.hxx
+++ b/svtools/inc/apearcfg.hxx
@@ -34,9 +34,6 @@
 
 class Application;
 
-/*--------------------------------------------------------------------
-     Beschreibung:
- --------------------------------------------------------------------*/
 typedef enum {
     LookStardivision = 0,
     LookMotif,
diff --git a/svtools/inc/contextmenuhelper.hxx b/svtools/inc/contextmenuhelper.hxx
index c0a9826367f5..c6f30e2a3d4b 100644
--- a/svtools/inc/contextmenuhelper.hxx
+++ b/svtools/inc/contextmenuhelper.hxx
@@ -97,7 +97,7 @@ class SVT_DLLPUBLIC ContextMenuHelper
 
         // methods to retrieve a single command URL dependent value from a
         // ui configuratin manager
-        Image           getImageFromCommandURL( const ::rtl::OUString& aCmdURL, bool bHiContrast ) const;
+        Image           getImageFromCommandURL( const ::rtl::OUString& aCmdURL ) const;
         rtl::OUString   getLabelFromCommandURL( const ::rtl::OUString& aCmdURL ) const;
 
         // creates an association between current module/controller bound to the
diff --git a/svtools/inc/extcolorcfg.hxx b/svtools/inc/extcolorcfg.hxx
index e7cfbd65b626..11d551cd88e6 100644
--- a/svtools/inc/extcolorcfg.hxx
+++ b/svtools/inc/extcolorcfg.hxx
@@ -37,9 +37,7 @@
 
 //-----------------------------------------------------------------------------
 namespace svtools{
-/* -----------------------------22.03.2002 15:36------------------------------
 
- ---------------------------------------------------------------------------*/
 class ExtendedColorConfig_Impl;
 class ExtendedColorConfigValue
 {
@@ -69,9 +67,7 @@ public:
     sal_Bool operator !=(const ExtendedColorConfigValue& rCmp) const
         { return m_nColor != rCmp.m_nColor;}
 };
-/* -----------------------------22.03.2002 15:36------------------------------
 
- ---------------------------------------------------------------------------*/
 class SVT_DLLPUBLIC ExtendedColorConfig : public SfxBroadcaster, public SfxListener
 {
     friend class ExtendedColorConfig_Impl;
@@ -91,9 +87,7 @@ public:
     sal_Int32                       GetComponentColorCount(const ::rtl::OUString& _sName) const;
     ExtendedColorConfigValue        GetComponentColorConfigValue(const ::rtl::OUString& _sComponentName,sal_uInt32 _nPos) const;
 };
-/* -----------------------------22.03.2002 15:31------------------------------
 
- ---------------------------------------------------------------------------*/
 class SVT_DLLPUBLIC EditableExtendedColorConfig
 {
     ExtendedColorConfig_Impl*   m_pImpl;
diff --git a/svtools/inc/imagemgr.hxx b/svtools/inc/imagemgr.hxx
index a99aa44b749d..eca8b658e5cb 100644
--- a/svtools/inc/imagemgr.hxx
+++ b/svtools/inc/imagemgr.hxx
@@ -75,18 +75,11 @@ private:
     SVT_DLLPRIVATE static String    GetDescription_Impl( const INetURLObject& rObject, sal_Bool bDetectFolder );
 
 public:
-    // depricated, because no high contrast mode
     SVT_DLLPUBLIC static Image  GetImage( const INetURLObject& rURL, sal_Bool bBig = sal_False );
-    static Image    GetFileImage( const INetURLObject& rURL, sal_Bool bBig = sal_False );
-    static Image    GetImageNoDefault( const INetURLObject& rURL, sal_Bool bBig = sal_False );
+    SVT_DLLPUBLIC static Image  GetFileImage( const INetURLObject& rURL, sal_Bool bBig = sal_False );
+    SVT_DLLPUBLIC static Image  GetImageNoDefault( const INetURLObject& rURL, sal_Bool bBig = sal_False );
     SVT_DLLPUBLIC static Image  GetFolderImage( const svtools::VolumeInfo& rInfo, sal_Bool bBig = sal_False );
 
-    // now with high contrast mode
-    SVT_DLLPUBLIC static Image  GetImage( const INetURLObject& rURL, sal_Bool bBig, sal_Bool bHighContrast );
-    SVT_DLLPUBLIC static Image  GetFileImage( const INetURLObject& rURL, sal_Bool bBig, sal_Bool bHighContrast );
-    SVT_DLLPUBLIC static Image  GetImageNoDefault( const INetURLObject& rURL, sal_Bool bBig, sal_Bool bHighContrast );
-    SVT_DLLPUBLIC static Image  GetFolderImage( const svtools::VolumeInfo& rInfo, sal_Bool bBig, sal_Bool bHighContrast );
-
     SVT_DLLPUBLIC static String GetDescription( const INetURLObject& rObject );
     SVT_DLLPUBLIC static String GetFileDescription( const INetURLObject& rObject );
     SVT_DLLPUBLIC static String GetFolderDescription( const svtools::VolumeInfo& rInfo );
diff --git a/svtools/inc/ivctrl.hxx b/svtools/inc/ivctrl.hxx
index f2214fec8570..ccba40e43442 100644
--- a/svtools/inc/ivctrl.hxx
+++ b/svtools/inc/ivctrl.hxx
@@ -73,7 +73,6 @@ enum SvxIconChoiceCtrlPositionMode
 class SvxIconChoiceCtrlEntry
 {
     Image aImage;
-    Image aImageHC;
 
     String aText;
     String aQuickHelpText;
@@ -123,16 +122,13 @@ class SvxIconChoiceCtrlEntry
 public:
                             SvxIconChoiceCtrlEntry( USHORT nFlags = 0 );
                             SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, USHORT nFlags = 0 );
-                            SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, const Image& rImageHC, USHORT nFlags = 0 );
                             ~SvxIconChoiceCtrlEntry () {}
 
     void                    SetImage ( const Image& rImage ) { aImage = rImage; }
-    void                    SetImageHC ( const Image& rImage ) { aImageHC = rImage; }
     Image                   GetImage () const { return aImage; }
-    Image                   GetImageHC () const { return aImageHC; }
     void                    SetText ( const String& rText ) { aText = rText; }
     String                  GetText () const { return aText; }
-    String SVT_DLLPUBLIC                    GetDisplayText() const;
+    String SVT_DLLPUBLIC    GetDisplayText() const;
     void                    SetQuickHelpText( const String& rText ) { aQuickHelpText = rText; }
     String                  GetQuickHelpText() const { return aQuickHelpText; }
     void                    SetUserData ( void* _pUserData ) { pUserData = _pUserData; }
@@ -303,14 +299,12 @@ public:
     SvxIconChoiceCtrlEntry* InsertEntry( ULONG nPos = LIST_APPEND,
                                      const Point* pPos = 0,
                                      USHORT nFlags = 0 );
-    SvxIconChoiceCtrlEntry* InsertEntry( const String& rText, const Image& rImage,
-                                     ULONG nPos = LIST_APPEND,
-                                     const Point* pPos = 0,
-                                     USHORT nFlags = 0 );
-    SvxIconChoiceCtrlEntry* InsertEntry( const String& rText, const Image& rImage, const Image& rImageHC,
-                                     ULONG nPos = LIST_APPEND,
-                                     const Point* pPos = 0,
-                                     USHORT nFlags = 0 );
+    SvxIconChoiceCtrlEntry* InsertEntry( const String& rText,
+                                         const Image& rImage,
+                                         ULONG nPos = LIST_APPEND,
+                                         const Point* pPos = 0,
+                                         USHORT nFlags = 0
+                                       );
 
     /** creates automatic mnemonics for all icon texts in the control
     */
diff --git a/svtools/inc/rtfkeywd.hxx b/svtools/inc/rtfkeywd.hxx
index a335ae64bac4..b9ad75ae8e32 100644
--- a/svtools/inc/rtfkeywd.hxx
+++ b/svtools/inc/rtfkeywd.hxx
@@ -1124,6 +1124,7 @@
 #define OOO_STRING_SVTOOLS_RTF_SHP "\\shp"
 #define OOO_STRING_SVTOOLS_RTF_SN "\\sn"
 #define OOO_STRING_SVTOOLS_RTF_SV "\\sv"
+#define OOO_STRING_SVTOOLS_RTF_SP "\\sp"
 
 // Support for overline attributes
 #define OOO_STRING_SVTOOLS_RTF_OL "\\ol"
diff --git a/svtools/inc/rtftoken.h b/svtools/inc/rtftoken.h
index fa7a0a2b2062..d7dda804a8d7 100644
--- a/svtools/inc/rtftoken.h
+++ b/svtools/inc/rtftoken.h
@@ -1257,7 +1257,7 @@ enum RTF_TOKEN_IDS {
     RTF_SOUTLVL,
 
 // shapes
-    RTF_SHP, RTF_SN, RTF_SV
+    RTF_SHP, RTF_SN, RTF_SV, RTF_SP
 /*
     RTF_SHPLEFT,
     RTF_SHPTOP,
diff --git a/svtools/inc/svtools/colorcfg.hxx b/svtools/inc/svtools/colorcfg.hxx
index d2fd175e7057..eae67dc2c51b 100644
--- a/svtools/inc/svtools/colorcfg.hxx
+++ b/svtools/inc/svtools/colorcfg.hxx
@@ -89,9 +89,7 @@ enum ColorConfigEntry
     SQLCOMMENT,
     ColorConfigEntryCount
 };
-/* -----------------------------22.03.2002 15:36------------------------------
 
- ---------------------------------------------------------------------------*/
 class ColorConfig_Impl;
 struct ColorConfigValue
 {
@@ -102,9 +100,7 @@ struct ColorConfigValue
     sal_Bool operator !=(const ColorConfigValue& rCmp) const
         { return nColor != rCmp.nColor || bIsVisible != rCmp.bIsVisible;}
 };
-/* -----------------------------22.03.2002 15:36------------------------------
 
- ---------------------------------------------------------------------------*/
 class SVT_DLLPUBLIC ColorConfig:
     public utl::detail::Options
 {
@@ -120,9 +116,7 @@ public:
     ColorConfigValue        GetColorValue(ColorConfigEntry eEntry, sal_Bool bSmart = sal_True)const;
     static Color            GetDefaultColor(ColorConfigEntry eEntry);
 };
-/* -----------------------------22.03.2002 15:31------------------------------
 
- ---------------------------------------------------------------------------*/
 class SVT_DLLPUBLIC EditableColorConfig
 {
     ColorConfig_Impl*   m_pImpl;
diff --git a/svtools/inc/svtools/embedhlp.hxx b/svtools/inc/svtools/embedhlp.hxx
index fc2d12a3b3c3..bbc839d12c8a 100644
--- a/svtools/inc/svtools/embedhlp.hxx
+++ b/svtools/inc/svtools/embedhlp.hxx
@@ -110,9 +110,6 @@ namespace svt
         // no conversion is done if no target mode is provided
         Size            GetSize( MapMode* pTargetMapMode = NULL ) const;
 
-        // the following method tries to get the HC graphic if it is possible, otherwise returns NULL
-        Graphic*        GetHCGraphic() const;
-
         void            SetGraphic( const Graphic& rGraphic, const ::rtl::OUString& rMediaType );
         void            SetGraphicStream(
                             const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInGrStream,
diff --git a/svtools/inc/svtools/svlbitm.hxx b/svtools/inc/svtools/svlbitm.hxx
index f84c457abc4d..1f23481ff783 100644
--- a/svtools/inc/svtools/svlbitm.hxx
+++ b/svtools/inc/svtools/svlbitm.hxx
@@ -251,43 +251,37 @@ public:
     void            Clone( SvLBoxItem* pSource );
 
 
-    BOOL            SetModeImages( const Image& _rBitmap1, const Image& _rBitmap2, BmpColorMode _eMode = BMP_COLOR_NORMAL );
-    void            GetModeImages(       Image& _rBitmap1,       Image& _rBitmap2, BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
+    BOOL            SetModeImages( const Image& _rBitmap1, const Image& _rBitmap2 );
+    void            GetModeImages(       Image& _rBitmap1,       Image& _rBitmap2 ) const;
 
-    inline void         SetBitmap1( const Image& _rImage, BmpColorMode _eMode = BMP_COLOR_NORMAL );
-    inline void         SetBitmap2( const Image& _rImage, BmpColorMode _eMode = BMP_COLOR_NORMAL );
-    inline const Image& GetBitmap1( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
-    inline const Image& GetBitmap2( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
+    inline void         SetBitmap1( const Image& _rImage );
+    inline void         SetBitmap2( const Image& _rImage );
+    inline const Image& GetBitmap1( ) const;
+    inline const Image& GetBitmap2( ) const;
 
 private:
-    Image& implGetImageStore( sal_Bool _bFirst, BmpColorMode _eMode );
+    Image& implGetImageStore( sal_Bool _bFirst );
 };
 
-inline void SvLBoxContextBmp::SetBitmap1( const Image& _rImage, BmpColorMode _eMode  )
+inline void SvLBoxContextBmp::SetBitmap1( const Image& _rImage  )
 {
-    implGetImageStore( sal_True, _eMode ) = _rImage;
+    implGetImageStore( sal_True ) = _rImage;
 }
 
-inline void SvLBoxContextBmp::SetBitmap2( const Image& _rImage, BmpColorMode _eMode  )
+inline void SvLBoxContextBmp::SetBitmap2( const Image& _rImage )
 {
-    implGetImageStore( sal_False, _eMode ) = _rImage;
+    implGetImageStore( sal_False ) = _rImage;
 }
 
-inline const Image& SvLBoxContextBmp::GetBitmap1( BmpColorMode _eMode ) const
+inline const Image& SvLBoxContextBmp::GetBitmap1( ) const
 {
-    Image& rImage = const_cast< SvLBoxContextBmp* >( this )->implGetImageStore( sal_True, _eMode );
-    if ( !rImage )
-        // fallback to the "normal" image
-        rImage = const_cast< SvLBoxContextBmp* >( this )->implGetImageStore( sal_True, BMP_COLOR_NORMAL );
+    Image& rImage = const_cast< SvLBoxContextBmp* >( this )->implGetImageStore( sal_True );
     return rImage;
 }
 
-inline const Image& SvLBoxContextBmp::GetBitmap2( BmpColorMode _eMode ) const
+inline const Image& SvLBoxContextBmp::GetBitmap2( ) const
 {
-    Image& rImage = const_cast< SvLBoxContextBmp* >( this )->implGetImageStore( sal_False, _eMode );
-    if ( !rImage )
-        // fallback to the "normal" image
-        rImage = const_cast< SvLBoxContextBmp* >( this )->implGetImageStore( sal_True, BMP_COLOR_NORMAL );
+    Image& rImage = const_cast< SvLBoxContextBmp* >( this )->implGetImageStore( sal_False );
     return rImage;
 }
 
diff --git a/svtools/inc/svtools/svtools.hrc b/svtools/inc/svtools/svtools.hrc
index 107c3655ed84..eceb237a939c 100644
--- a/svtools/inc/svtools/svtools.hrc
+++ b/svtools/inc/svtools/svtools.hrc
@@ -152,7 +152,7 @@
 #define STR_SVT_PRNDLG_POWER_SAVE           (STR_SVT_PRNDLG_START+26)
 #define STR_SVT_PRNDLG_DEFPRINTER           (STR_SVT_PRNDLG_START+27)
 #define STR_SVT_PRNDLG_JOBCOUNT             (STR_SVT_PRNDLG_START+28)
-#define STR_SVT_PRNDLG_END                  (RID_IMG_PRNDLG_NOCOLLATE_HC)
+#define STR_SVT_PRNDLG_END              (RID_IMG_PRNDLG_NOCOLLATE)
 
 #define STR_SVT_CALENDAR_START              (STR_SVT_PRNDLG_END+1)
 #define STR_SVT_CALENDAR_DAY                (STR_SVT_CALENDAR_START+0)
@@ -317,11 +317,7 @@
 #define RID_SVTOOLS_IMAGELIST_BIG                   (RID_SVTOOLS_IMAGELIST_START +  1)
 #define RID_SVTOOLS_IMAGELIST_SMALL                 (RID_SVTOOLS_IMAGELIST_START +  2)
 #define RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX         (RID_SVTOOLS_IMAGELIST_START +  3)
-#define RID_SVTOOLS_IMAGELIST_BIG_HIGHCONTRAST      (RID_SVTOOLS_IMAGELIST_START +  4)
-#define RID_SVTOOLS_IMAGELIST_SMALL_HIGHCONTRAST    (RID_SVTOOLS_IMAGELIST_START +  5)
-#define RID_SVTOOLS_IMAGELIST_EDITBWSEBOX_H         (RID_SVTOOLS_IMAGELIST_START +  6)
 #define RID_FILEPICKER_IMAGES                       (RID_SVTOOLS_IMAGELIST_START +  7)
-#define RID_FILEPICKER_IMAGES_HC                    (RID_SVTOOLS_IMAGELIST_START +  8)
 
 //.............................................................................
 // error boxes
@@ -342,20 +338,13 @@
 // images
 #define RID_IMG_TREENODE_COLLAPSED      (RID_SVTOOLS_START +  0)
 #define RID_IMG_TREENODE_EXPANDED       (RID_SVTOOLS_START +  1)
-#define RID_IMG_TREENODE_COLLAPSED_HC   (RID_SVTOOLS_START +  2)
-#define RID_IMG_TREENODE_EXPANDED_HC    (RID_SVTOOLS_START +  3)
 
 #define RID_IMG_PRINTERFONT             (RID_SVTOOLS_START + 12)
 #define RID_IMG_BITMAPFONT              (RID_SVTOOLS_START + 13)
 #define RID_IMG_SCALABLEFONT            (RID_SVTOOLS_START + 14)
-#define RID_IMG_PRINTERFONT_HC          (RID_SVTOOLS_START + 15)
-#define RID_IMG_BITMAPFONT_HC           (RID_SVTOOLS_START + 16)
-#define RID_IMG_SCALABLEFONT_HC         (RID_SVTOOLS_START + 17)
 
 #define IMG_TRIANGLE_RIGHT              (RID_SVTOOLS_START + 18)
-#define IMG_TRIANGLE_RIGHT_HC           (RID_SVTOOLS_START + 19)
 #define IMG_TRIANGLE_DOWN               (RID_SVTOOLS_START + 20)
-#define IMG_TRIANGLE_DOWN_HC            (RID_SVTOOLS_START + 21)
 
 #define IMG_SVT_FOLDER                  (RID_SVTOOLS_START + 40)
 
@@ -364,11 +353,6 @@
 #define IMG_SVT_TEMPLATES               (RID_SVTOOLS_START + 54)
 #define IMG_SVT_SAMPLES                 (RID_SVTOOLS_START + 55)
 
-#define IMG_SVT_NEWDOC_HC               (RID_SVTOOLS_START + 59)
-#define IMG_SVT_MYDOCS_HC               (RID_SVTOOLS_START + 60)
-#define IMG_SVT_TEMPLATES_HC            (RID_SVTOOLS_START + 61)
-#define IMG_SVT_SAMPLES_HC              (RID_SVTOOLS_START + 62)
-
 #define IMG_SVT_DOCTEMPLATE_BACK_SMALL      (RID_SVTOOLS_START + 70)
 #define IMG_SVT_DOCTEMPLATE_BACK_LARGE      (RID_SVTOOLS_START + 71)
 #define IMG_SVT_DOCTEMPLATE_PREV_SMALL      (RID_SVTOOLS_START + 72)
@@ -380,23 +364,8 @@
 #define IMG_SVT_DOCTEMPLATE_PREVIEW_SMALL   (RID_SVTOOLS_START + 78)
 #define IMG_SVT_DOCTEMPLATE_PREVIEW_LARGE   (RID_SVTOOLS_START + 79)
 
-#define IMG_SVT_DOCTEMPL_HC_BACK_SMALL      (RID_SVTOOLS_START + 80)
-#define IMG_SVT_DOCTEMPL_HC_BACK_LARGE      (RID_SVTOOLS_START + 81)
-#define IMG_SVT_DOCTEMPL_HC_PREV_SMALL      (RID_SVTOOLS_START + 82)
-#define IMG_SVT_DOCTEMPL_HC_PREV_LARGE      (RID_SVTOOLS_START + 83)
-#define IMG_SVT_DOCTEMPL_HC_PRINT_SMALL     (RID_SVTOOLS_START + 84)
-#define IMG_SVT_DOCTEMPL_HC_PRINT_LARGE     (RID_SVTOOLS_START + 85)
-#define IMG_SVT_DOCTEMPL_HC_DOCINFO_SMALL   (RID_SVTOOLS_START + 86)
-#define IMG_SVT_DOCTEMPL_HC_DOCINFO_LARGE   (RID_SVTOOLS_START + 87)
-#define IMG_SVT_DOCTEMPL_HC_PREVIEW_SMALL   (RID_SVTOOLS_START + 88)
-#define IMG_SVT_DOCTEMPL_HC_PREVIEW_LARGE   (RID_SVTOOLS_START + 89)
-
 #define RID_IMG_PRNDLG_COLLATE              (STR_SVT_PRNDLG_START + 29)
 #define RID_IMG_PRNDLG_NOCOLLATE            (STR_SVT_PRNDLG_START + 30)
-#define RID_IMG_PRNDLG_COLLATE_HC           (STR_SVT_PRNDLG_START + 31)
-#define RID_IMG_PRNDLG_NOCOLLATE_HC         (STR_SVT_PRNDLG_START + 32)
 
 #endif  // #ifndef _SVTOOLS_HRC
 
-// ******************************************************************* EOF
-
diff --git a/svtools/inc/svtools/svtreebx.hxx b/svtools/inc/svtools/svtreebx.hxx
index cc7520d0ef8c..18fdde318eec 100644
--- a/svtools/inc/svtools/svtreebx.hxx
+++ b/svtools/inc/svtools/svtreebx.hxx
@@ -25,6 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
 #ifndef _SVTREEBOX_HXX
 #define _SVTREEBOX_HXX
 
@@ -86,12 +87,12 @@ class SVT_DLLPUBLIC SvTreeListBox : public SvLBox
 #ifdef _SVTREEBX_CXX
     DECL_DLLPRIVATE_LINK( CheckButtonClick, SvLBoxButtonData * );
 
-    SVT_DLLPRIVATE short            GetHeightOffset( const Image& rBmp, Size& rLogicSize);
-    SVT_DLLPRIVATE short            GetHeightOffset( const Font& rFont, Size& rLogicSize);
+    SVT_DLLPRIVATE short        GetHeightOffset( const Image& rBmp, Size& rLogicSize);
+    SVT_DLLPRIVATE short        GetHeightOffset( const Font& rFont, Size& rLogicSize);
 
     SVT_DLLPRIVATE void         SetEntryHeight( SvLBoxEntry* pEntry );
     SVT_DLLPRIVATE void         AdjustEntryHeight( const Image& rBmp );
-    SVT_DLLPRIVATE void             AdjustEntryHeight( const Font& rFont );
+    SVT_DLLPRIVATE void         AdjustEntryHeight( const Font& rFont );
 
     SVT_DLLPRIVATE void         ImpEntryInserted( SvLBoxEntry* pEntry );
     SVT_DLLPRIVATE long         PaintEntry1( SvLBoxEntry*, long nLine,
@@ -99,7 +100,7 @@ class SVT_DLLPUBLIC SvTreeListBox : public SvLBox
                                 BOOL bHasClipRegion=FALSE );
 
     SVT_DLLPRIVATE void         InitTreeView( WinBits nWinStyle );
-    SVT_DLLPRIVATE SvLBoxItem*      GetItem_Impl( SvLBoxEntry*, long nX, SvLBoxTab** ppTab,
+    SVT_DLLPRIVATE SvLBoxItem*  GetItem_Impl( SvLBoxEntry*, long nX, SvLBoxTab** ppTab,
                         USHORT nEmptyWidth );
 #endif
 
@@ -182,25 +183,26 @@ public:
 
     void            EnableCheckButton( SvLBoxButtonData* );
     void            SetCheckButtonData( SvLBoxButtonData* );
-    void            SetNodeBitmaps( const Image& rCollapsedNodeBmp, const Image& rExpandedNodeBmp, BmpColorMode _eMode = BMP_COLOR_NORMAL );
-    void            SetDontKnowNodeBitmap( const Image& rDontKnowBmp, BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    void            SetNodeBitmaps( const Image& rCollapsedNodeBmp, const Image& rExpandedNodeBmp );
 
     /** returns the default image which clients should use for expanded nodes, to have a consistent user
         interface experience in the whole product.
     */
-    static const Image& GetDefaultExpandedNodeImage( BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    static const Image& GetDefaultExpandedNodeImage( );
 
     /** returns the default image which clients should use for expanded nodes, to have a consistent user
         interface experience in the whole product.
     */
-    static const Image& GetDefaultCollapsedNodeImage( BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    static const Image& GetDefaultCollapsedNodeImage( );
 
     /** sets default bitmaps for collapsed and expanded nodes.
     */
     inline  void    SetNodeDefaultImages( )
     {
-        SetNodeBitmaps( GetDefaultCollapsedNodeImage( BMP_COLOR_NORMAL ), GetDefaultExpandedNodeImage( BMP_COLOR_NORMAL ), BMP_COLOR_NORMAL );
-        SetNodeBitmaps( GetDefaultCollapsedNodeImage( BMP_COLOR_HIGHCONTRAST ), GetDefaultExpandedNodeImage( BMP_COLOR_HIGHCONTRAST ), BMP_COLOR_HIGHCONTRAST );
+        SetNodeBitmaps(
+            GetDefaultCollapsedNodeImage( ),
+            GetDefaultExpandedNodeImage( )
+        );
     }
 
     virtual SvLBoxEntry*    InsertEntry( const XubString& rText, SvLBoxEntry* pParent = 0,
@@ -216,11 +218,11 @@ public:
                                          ULONG nPos = LIST_APPEND, void* pUserData = 0,
                                          SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox );
 
-    const Image&    GetDefaultExpandedEntryBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
-    const Image&    GetDefaultCollapsedEntryBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
+    const Image&    GetDefaultExpandedEntryBmp( ) const;
+    const Image&    GetDefaultCollapsedEntryBmp( ) const;
 
-    void            SetDefaultExpandedEntryBmp( const Image& rBmp, BmpColorMode _eMode = BMP_COLOR_NORMAL );
-    void            SetDefaultCollapsedEntryBmp( const Image& rBmp, BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    void            SetDefaultExpandedEntryBmp( const Image& rBmp );
+    void            SetDefaultCollapsedEntryBmp( const Image& rBmp );
 
     void            SetCheckButtonState( SvLBoxEntry*, SvButtonState );
     SvButtonState   GetCheckButtonState( SvLBoxEntry* ) const;
@@ -229,13 +231,13 @@ public:
     BOOL            IsExpandBitmapOnCursor() const  { return (BOOL)(aContextBmpMode & SVLISTENTRYFLAG_FOCUSED)!=0; }
 
     void            SetEntryText(SvLBoxEntry*, const XubString& );
-    void            SetExpandedEntryBmp( SvLBoxEntry* _pEntry, const Image& _rImage, BmpColorMode _eMode = BMP_COLOR_NORMAL );
-    void            SetCollapsedEntryBmp( SvLBoxEntry* _pEntry, const Image& _rImage, BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    void            SetExpandedEntryBmp( SvLBoxEntry* _pEntry, const Image& _rImage );
+    void            SetCollapsedEntryBmp( SvLBoxEntry* _pEntry, const Image& _rImage );
 
     virtual String  GetEntryText( SvLBoxEntry* pEntry ) const;
     String          SearchEntryText( SvLBoxEntry* pEntry ) const;
-    const Image&    GetExpandedEntryBmp(SvLBoxEntry* _pEntry, BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
-    const Image&    GetCollapsedEntryBmp(SvLBoxEntry* _pEntry, BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
+    const Image&    GetExpandedEntryBmp(SvLBoxEntry* _pEntry ) const;
+    const Image&    GetCollapsedEntryBmp(SvLBoxEntry* _pEntry ) const;
 
     void            SetCheckButtonHdl( const Link& rLink )  { aCheckButtonHdl=rLink; }
     Link            GetCheckButtonHdl() const { return aCheckButtonHdl; }
@@ -305,10 +307,10 @@ public:
     virtual void    MakeVisible( SvLBoxEntry* );
     void            MakeVisible( SvLBoxEntry*, BOOL bMoveToTop );
 
-    void            SetCollapsedNodeBmp( const Image&, BmpColorMode _eMode = BMP_COLOR_NORMAL );
-    void            SetExpandedNodeBmp( const Image&, BmpColorMode _eMode = BMP_COLOR_NORMAL  );
-    Image           GetCollapsedNodeBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
-    Image           GetExpandedNodeBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
+    void            SetCollapsedNodeBmp( const Image& );
+    void            SetExpandedNodeBmp( const Image& );
+    Image           GetCollapsedNodeBmp( ) const;
+    Image           GetExpandedNodeBmp( ) const;
 
     void            SetFont( const Font& rFont );
 
diff --git a/svtools/inc/svtools/toolboxcontroller.hxx b/svtools/inc/svtools/toolboxcontroller.hxx
index 61bd7b7889f4..c6984be4e7a9 100644
--- a/svtools/inc/svtools/toolboxcontroller.hxx
+++ b/svtools/inc/svtools/toolboxcontroller.hxx
@@ -157,7 +157,6 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL
         void unbindListener();
         sal_Bool isBound() const;
         sal_Bool hasBigImages() const;
-        sal_Bool isHighContrast() const;
         ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > getURLTransformer() const;
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > getParent() const;
 
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index d9dac2ece56b..9cd56b4932d0 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -57,13 +57,6 @@ namespace svt
     namespace
     {
         //..............................................................
-        sal_Bool isHiContrast(Window* _pWindow)
-        {
-            OSL_ENSURE(_pWindow,"Window must be not null!");
-            return _pWindow && _pWindow->GetSettings().GetStyleSettings().GetHighContrastMode();
-        }
-
-        //..............................................................
         sal_uInt16 getRealGetFocusFlags( Window* _pWindow )
         {
             sal_uInt16 nFlags = 0;
@@ -137,7 +130,6 @@ namespace svt
     void EditBrowseBox::impl_construct()
     {
         m_aImpl = ::std::auto_ptr<EditBrowseBoxImpl>(new EditBrowseBoxImpl());
-        m_aImpl->m_bHiContrast = isHiContrast(&GetDataWindow());
 
         SetCompoundControl(sal_True);
         SetGridLineColor( Color( COL_LIGHTGRAY ) );
@@ -302,11 +294,9 @@ namespace svt
     //------------------------------------------------------------------------------
     Image EditBrowseBox::GetImage(RowStatus eStatus) const
     {
-        sal_Bool bHiContrast = isHiContrast(&GetDataWindow());
-        if ( !m_aStatusImages.GetImageCount() || (bHiContrast != m_aImpl->m_bHiContrast) )
+        if ( !m_aStatusImages.GetImageCount() )
         {
-            m_aImpl->m_bHiContrast = bHiContrast;
-            const_cast<EditBrowseBox*>(this)->m_aStatusImages = ImageList(SvtResId(bHiContrast ? RID_SVTOOLS_IMAGELIST_EDITBWSEBOX_H : RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX));
+            const_cast<EditBrowseBox*>(this)->m_aStatusImages = ImageList( SvtResId( RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX ) );
         }
 
         Image aImage;
diff --git a/svtools/source/brwbox/editbrowsebox.src b/svtools/source/brwbox/editbrowsebox.src
index 6511d97ea86a..beb2236ab2c8 100644
--- a/svtools/source/brwbox/editbrowsebox.src
+++ b/svtools/source/brwbox/editbrowsebox.src
@@ -42,25 +42,15 @@ ImageList RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX
             Blue  = 0xFFFF;
     };
     IdList = {
-        IMG_EBB_CURRENT; IMG_EBB_MODIFIED;
-        IMG_EBB_NEW;IMG_EBB_DELETED;IMG_EBB_CURRENTNEW;
-        IMG_EBB_PRIMARYKEY; IMG_EBB_CURRENT_PRIMARYKEY; IMG_EBB_FILTER;IMG_EBB_HEADERFOOTER;
-    };
-    IdCount = { 9; };
-};
-
-ImageList RID_SVTOOLS_IMAGELIST_EDITBWSEBOX_H
-{
-    Prefix = "edh";
-    MaskColor   = Color {
-            Red   = 0xFFFF;
-            Green = 0x0000;
-            Blue  = 0xFFFF;
-    };
-    IdList = {
-        IMG_EBB_CURRENT; IMG_EBB_MODIFIED;
-        IMG_EBB_NEW;IMG_EBB_DELETED;IMG_EBB_CURRENTNEW;
-        IMG_EBB_PRIMARYKEY; IMG_EBB_CURRENT_PRIMARYKEY; IMG_EBB_FILTER;IMG_EBB_HEADERFOOTER;
+        IMG_EBB_CURRENT;
+        IMG_EBB_MODIFIED;
+        IMG_EBB_NEW;
+        IMG_EBB_DELETED;
+        IMG_EBB_CURRENTNEW;
+        IMG_EBB_PRIMARYKEY;
+        IMG_EBB_CURRENT_PRIMARYKEY;
+        IMG_EBB_FILTER;
+        IMG_EBB_HEADERFOOTER;
     };
     IdCount = { 9; };
 };
diff --git a/svtools/source/brwbox/editbrowseboximpl.hxx b/svtools/source/brwbox/editbrowseboximpl.hxx
index c58a117d65a7..cb7303fcfba6 100644
--- a/svtools/source/brwbox/editbrowseboximpl.hxx
+++ b/svtools/source/brwbox/editbrowseboximpl.hxx
@@ -37,7 +37,6 @@ namespace svt
     {
     public:
         ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >    m_xActiveCell;
-        sal_Bool                                                                            m_bHiContrast;
 
         void clearActiveCell();
     };
diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx
index cadbb3c7da6f..83a688e10607 100644
--- a/svtools/source/config/apearcfg.cxx
+++ b/svtools/source/config/apearcfg.cxx
@@ -49,9 +49,6 @@ using namespace ::com::sun::star::uno;
 
 sal_Bool SvtTabAppearanceCfg::bInitialized = sal_False;
 
-/*--------------------------------------------------------------------
-     Beschreibung:
- --------------------------------------------------------------------*/
 SvtTabAppearanceCfg::SvtTabAppearanceCfg()
     :ConfigItem(OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/View")))
     ,nLookNFeel         ( DEFAULT_LOOKNFEEL )
@@ -101,15 +98,11 @@ SvtTabAppearanceCfg::SvtTabAppearanceCfg()
         }
     }
 }
-/* -----------------------------22.05.01 11:53--------------------------------
 
- ---------------------------------------------------------------------------*/
 SvtTabAppearanceCfg::~SvtTabAppearanceCfg( )
 {
 }
-/* -----------------------------22.05.01 11:54--------------------------------
 
- ---------------------------------------------------------------------------*/
 const Sequence<OUString>& SvtTabAppearanceCfg::GetPropertyNames()
 {
     static Sequence<OUString> aNames;
@@ -140,9 +133,7 @@ const Sequence<OUString>& SvtTabAppearanceCfg::GetPropertyNames()
     }
     return aNames;
 }
-/* -----------------------------22.05.01 11:54--------------------------------
 
- ---------------------------------------------------------------------------*/
 void  SvtTabAppearanceCfg::Commit()
 {
     const Sequence<OUString>& rNames = GetPropertyNames();
@@ -175,56 +166,35 @@ void SvtTabAppearanceCfg::Notify( const com::sun::star::uno::Sequence< rtl::OUSt
 {
 }
 
-/*--------------------------------------------------------------------
-     Beschreibung:
- --------------------------------------------------------------------*/
-
 void SvtTabAppearanceCfg::SetLookNFeel ( USHORT nSet )
 {
     nLookNFeel = nSet;
     SetModified();
 }
 
-/*--------------------------------------------------------------------
-     Beschreibung:
- --------------------------------------------------------------------*/
-
 void SvtTabAppearanceCfg::SetDragMode  ( USHORT nSet )
 {
     nDragMode = nSet;
     SetModified();
 }
 
-/*--------------------------------------------------------------------
-     Beschreibung:
- --------------------------------------------------------------------*/
-
 void SvtTabAppearanceCfg::SetScaleFactor ( USHORT nSet )
 {
     nScaleFactor = nSet;
     SetModified();
 }
 
-/*--------------------------------------------------------------------
-     Beschreibung:
- --------------------------------------------------------------------*/
-
 void SvtTabAppearanceCfg::SetSnapMode ( USHORT nSet )
 {
     nSnapMode = nSet;
     SetModified();
 }
-/*--------------------------------------------------------------------
-     Beschreibung:
- --------------------------------------------------------------------*/
+
 void SvtTabAppearanceCfg::SetMiddleMouseButton ( USHORT nSet )
 {
     nMiddleMouse = nSet;
     SetModified();
 }
-/*--------------------------------------------------------------------
-     Beschreibung:
- --------------------------------------------------------------------*/
 
 void SvtTabAppearanceCfg::SetApplicationDefaults ( Application* pApp )
 {
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index e537c5682622..503ca80ffa7e 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -72,8 +72,6 @@ namespace
 
 ColorConfig_Impl*    ColorConfig::m_pImpl = NULL;
 
-/* -----------------------------16.01.01 15:36--------------------------------
- ---------------------------------------------------------------------------*/
 class ColorConfig_Impl : public utl::ConfigItem
 {
     ColorConfigValue    m_aConfigValues[ColorConfigEntryCount];
@@ -114,9 +112,6 @@ public:
     void ImplUpdateApplicationSettings();
 };
 
-/* -----------------------------16.01.01 15:36--------------------------------
-
- ---------------------------------------------------------------------------*/
 uno::Sequence< OUString> ColorConfig_Impl::GetPropertyNames(const rtl::OUString& rScheme)
 {
     uno::Sequence<OUString> aNames(2 * ColorConfigEntryCount);
@@ -199,9 +194,7 @@ uno::Sequence< OUString> ColorConfig_Impl::GetPropertyNames(const rtl::OUString&
     aNames.realloc(nIndex);
     return aNames;
 }
-/* -----------------------------22.03.2002 14:37------------------------------
 
- ---------------------------------------------------------------------------*/
 ColorConfig_Impl::ColorConfig_Impl(sal_Bool bEditMode) :
     ConfigItem(C2U("Office.UI/ColorScheme")),
     m_bEditMode(bEditMode),
@@ -221,17 +214,13 @@ ColorConfig_Impl::ColorConfig_Impl(sal_Bool bEditMode) :
     ::Application::AddEventListener( LINK(this, ColorConfig_Impl, DataChangedEventListener) );
 
 }
-/* -----------------------------25.03.2002 12:28------------------------------
 
- ---------------------------------------------------------------------------*/
 ColorConfig_Impl::~ColorConfig_Impl()
 {
     // #100822#
     ::Application::RemoveEventListener( LINK(this, ColorConfig_Impl, DataChangedEventListener) );
 }
-/* -----------------------------22.03.2002 14:38------------------------------
 
- ---------------------------------------------------------------------------*/
 void ColorConfig_Impl::Load(const rtl::OUString& rScheme)
 {
     rtl::OUString sScheme(rScheme);
@@ -264,18 +253,14 @@ void ColorConfig_Impl::Load(const rtl::OUString& rScheme)
              m_aConfigValues[i / 2].bIsVisible = Any2Bool(pColors[nIndex++]);
     }
 }
-/* -----------------------------22.03.2002 14:38------------------------------
 
- ---------------------------------------------------------------------------*/
 void    ColorConfig_Impl::Notify( const uno::Sequence<OUString>& )
 {
     //loading via notification always uses the default setting
     Load(::rtl::OUString());
     NotifyListeners(0);
 }
-/* -----------------------------22.03.2002 14:38------------------------------
 
- ---------------------------------------------------------------------------*/
 void ColorConfig_Impl::Commit()
 {
     uno::Sequence < ::rtl::OUString > aColorNames = GetPropertyNames(m_sLoadedScheme);
@@ -307,9 +292,7 @@ void ColorConfig_Impl::Commit()
 
     CommitCurrentSchemeName();
 }
-/* -----------------11.12.2002 10:42-----------------
- *
- * --------------------------------------------------*/
+
 void ColorConfig_Impl::CommitCurrentSchemeName()
 {
     //save current scheme name
@@ -319,9 +302,7 @@ void ColorConfig_Impl::CommitCurrentSchemeName()
     aCurrentVal.getArray()[0] <<= m_sLoadedScheme;
     PutProperties(aCurrent, aCurrentVal);
 }
-/* -----------------------------25.03.2002 12:19------------------------------
 
- ---------------------------------------------------------------------------*/
 void ColorConfig_Impl::SetColorConfigValue(ColorConfigEntry eValue, const ColorConfigValue& rValue )
 {
     if(rValue != m_aConfigValues[eValue])
@@ -330,16 +311,12 @@ void ColorConfig_Impl::SetColorConfigValue(ColorConfigEntry eValue, const ColorC
         SetModified();
     }
 }
-/* -----------------------------25.03.2002 15:22------------------------------
 
- ---------------------------------------------------------------------------*/
 uno::Sequence< ::rtl::OUString> ColorConfig_Impl::GetSchemeNames()
 {
     return GetNodeNames(C2U("ColorSchemes"));
 }
-/* -----------------------------09.04.2002 17:19------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool ColorConfig_Impl::AddScheme(const rtl::OUString& rScheme)
 {
     if(ConfigItem::AddNode(C2U("ColorSchemes"), rScheme))
@@ -350,18 +327,14 @@ sal_Bool ColorConfig_Impl::AddScheme(const rtl::OUString& rScheme)
     }
     return sal_False;
 }
-/* -----------------------------09.04.2002 17:19------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool ColorConfig_Impl::RemoveScheme(const rtl::OUString& rScheme)
 {
     uno::Sequence< rtl::OUString > aElements(1);
     aElements.getArray()[0] = rScheme;
     return ClearNodeElements(C2U("ColorSchemes"), aElements);
 }
-/* -----------------------------2002/06/20 13:03------------------------------
 
- ---------------------------------------------------------------------------*/
 void ColorConfig_Impl::SettingsChanged()
 {
     SolarMutexGuard aVclGuard;
@@ -370,9 +343,7 @@ void ColorConfig_Impl::SettingsChanged()
 
     NotifyListeners(0);
 }
-/* -----------------------------2002/08/16 12:07 -----------------------------
-   #100822#
- --------------------------------------------------------------------------- */
+
 IMPL_LINK( ColorConfig_Impl, DataChangedEventListener, VclWindowEvent*, pEvent )
 {
     if ( pEvent->GetId() == VCLEVENT_APPLICATION_DATACHANGED )
@@ -429,9 +400,7 @@ ColorConfig::ColorConfig()
     ++nColorRefCount_Impl;
     m_pImpl->AddListener(this);
 }
-/* -----------------------------16.01.01 15:36--------------------------------
 
- ---------------------------------------------------------------------------*/
 ColorConfig::~ColorConfig()
 {
     ::osl::MutexGuard aGuard( ColorMutex_Impl::get() );
@@ -442,9 +411,7 @@ ColorConfig::~ColorConfig()
         m_pImpl = 0;
     }
 }
-/* -----------------------------11.04.2002 11:49------------------------------
 
- ---------------------------------------------------------------------------*/
 Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
 {
     static const sal_Int32 aAutoColors[] =
@@ -511,17 +478,12 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
         case SPELL :
         case DRAWDRAWING :
         case SMARTTAGS :
-        {
-            const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
-                aRet = rStyleSettings.GetHighContrastMode() ?
-                    rStyleSettings.GetDialogTextColor().GetColor() : aAutoColors[eEntry];
-        }
-        break;
+            aRet = aAutoColors[eEntry];
+            break;
 
         case DRAWFILL            :
-                aRet = /*rStyleSettings.GetHighContrastMode() ?
-                    rStyleSettings.OutlineMode??? : */  aAutoColors[eEntry];
-        break;
+            aRet = aAutoColors[eEntry];
+            break;
 
         case FONTCOLOR :
             aRet = Application::GetSettings().GetStyleSettings().GetWindowTextColor();
@@ -540,9 +502,7 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
     }
     return aRet;
 }
-/* -----------------------------11.04.2002 11:49------------------------------
 
- ---------------------------------------------------------------------------*/
 ColorConfigValue ColorConfig::GetColorValue(ColorConfigEntry eEntry, sal_Bool bSmart)const
 {
     ColorConfigValue aRet = m_pImpl->GetColorConfigValue(eEntry);
@@ -563,18 +523,14 @@ ColorConfigValue ColorConfig::GetColorValue(ColorConfigEntry eEntry, sal_Bool bS
 
     return aRet;
 }
-/* -----------------------------25.03.2002 12:01------------------------------
 
- ---------------------------------------------------------------------------*/
 EditableColorConfig::EditableColorConfig() :
     m_pImpl(new ColorConfig_Impl),
     m_bModified(sal_False)
 {
     m_pImpl->BlockBroadcasts(TRUE);
 }
-/*-- 25.03.2002 12:03:08---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 EditableColorConfig::~EditableColorConfig()
 {
     m_pImpl->BlockBroadcasts(FALSE);
@@ -585,30 +541,21 @@ EditableColorConfig::~EditableColorConfig()
     delete m_pImpl;
 }
 
-/*-- 25.03.2002 12:03:15---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 uno::Sequence< ::rtl::OUString >  EditableColorConfig::GetSchemeNames() const
 {
     return m_pImpl->GetSchemeNames();
 }
-/*-- 25.03.2002 12:03:16---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void EditableColorConfig::DeleteScheme(const ::rtl::OUString& rScheme )
 {
     m_pImpl->RemoveScheme(rScheme);
 }
-/*-- 25.03.2002 12:03:16---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void EditableColorConfig::AddScheme(const ::rtl::OUString& rScheme )
 {
     m_pImpl->AddScheme(rScheme);
 }
-/*-- 25.03.2002 12:03:16---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool EditableColorConfig::LoadScheme(const ::rtl::OUString& rScheme )
 {
     if(m_bModified)
@@ -621,32 +568,25 @@ sal_Bool EditableColorConfig::LoadScheme(const ::rtl::OUString& rScheme )
     m_pImpl->CommitCurrentSchemeName();
     return sal_True;
 }
-/*-- 25.03.2002 12:03:16---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 const ::rtl::OUString& EditableColorConfig::GetCurrentSchemeName()const
 {
     return m_pImpl->GetLoadedScheme();
 }
-/* -----------------11.12.2002 10:56-----------------
- *  changes the name of the current scheme but doesn't load it!
- * --------------------------------------------------*/
+
+// Changes the name of the current scheme but doesn't load it!
 void EditableColorConfig::SetCurrentSchemeName(const ::rtl::OUString& rScheme)
 {
     m_pImpl->SetCurrentSchemeName(rScheme);
     m_pImpl->CommitCurrentSchemeName();
 }
-/*-- 25.03.2002 12:03:17---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 const ColorConfigValue& EditableColorConfig::GetColorValue(
     ColorConfigEntry eEntry)const
 {
     return m_pImpl->GetColorConfigValue(eEntry);
 }
-/*-- 25.03.2002 12:03:17---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void EditableColorConfig::SetColorValue(
     ColorConfigEntry eEntry, const ColorConfigValue& rValue)
 {
@@ -654,16 +594,12 @@ void EditableColorConfig::SetColorValue(
     m_pImpl->ClearModified();
     m_bModified = sal_True;
 }
-/* -----------------------------10.04.2002 13:22------------------------------
 
- ---------------------------------------------------------------------------*/
 void EditableColorConfig::SetModified()
 {
     m_bModified = sal_True;
 }
-/* -----------------15.10.2002 14:51-----------------
- *
- * --------------------------------------------------*/
+
 void EditableColorConfig::Commit()
 {
     if(m_bModified)
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index 7610554612c6..b62285f85ea6 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -70,8 +70,6 @@ namespace
 
 ExtendedColorConfig_Impl*    ExtendedColorConfig::m_pImpl = NULL;
 
-/* -----------------------------16.01.01 15:36--------------------------------
- ---------------------------------------------------------------------------*/
 class ExtendedColorConfig_Impl : public utl::ConfigItem, public SfxBroadcaster
 {
     DECLARE_STL_USTRINGACCESS_MAP( ::rtl::OUString, TDisplayNames);
@@ -152,9 +150,6 @@ public:
     DECL_LINK( DataChangedEventListener, VclWindowEvent* );
 };
 
-/* -----------------------------16.01.01 15:36--------------------------------
-
- ---------------------------------------------------------------------------*/
 uno::Sequence< OUString> ExtendedColorConfig_Impl::GetPropertyNames(const rtl::OUString& rScheme)
 {
     uno::Sequence< OUString> aNames(GetNodeNames(rScheme));
@@ -213,10 +208,7 @@ ExtendedColorConfigValue ExtendedColorConfig_Impl::GetComponentColorConfigValue(
         sRet = m_aConfigValuesPos[_nPos]->first;
     return sRet;
 }
-// -----------------------------------------------------------------------------
-/* -----------------------------22.03.2002 14:37------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool ExtendedColorConfig_Impl::m_bLockBroadcast = sal_False;
 sal_Bool ExtendedColorConfig_Impl::m_bBroadcastWhenUnlocked = sal_False;
 ExtendedColorConfig_Impl::ExtendedColorConfig_Impl(sal_Bool bEditMode) :
@@ -236,9 +228,7 @@ ExtendedColorConfig_Impl::ExtendedColorConfig_Impl(sal_Bool bEditMode) :
     ::Application::AddEventListener( LINK(this, ExtendedColorConfig_Impl, DataChangedEventListener) );
 
 }
-/* -----------------------------25.03.2002 12:28------------------------------
 
- ---------------------------------------------------------------------------*/
 ExtendedColorConfig_Impl::~ExtendedColorConfig_Impl()
 {
     // #100822#
@@ -261,9 +251,7 @@ sal_Bool ExtendedColorConfig_Impl::IsEnableBroadcast()
 {
     return ExtendedColorConfig::m_pImpl ? ExtendedColorConfig::m_pImpl->m_bIsBroadcastEnabled : sal_False;
 }
-/* -----------------------------22.03.2002 14:38------------------------------
 
- ---------------------------------------------------------------------------*/
 void lcl_addString(uno::Sequence < ::rtl::OUString >& _rSeq,const ::rtl::OUString& _sAdd)
 {
     ::rtl::OUString* pIter = _rSeq.getArray();
@@ -425,9 +413,7 @@ void ExtendedColorConfig_Impl::FillComponentColors(uno::Sequence < ::rtl::OUStri
         }
     }
 }
-/* -----------------------------22.03.2002 14:38------------------------------
 
- ---------------------------------------------------------------------------*/
 void    ExtendedColorConfig_Impl::Notify( const uno::Sequence<OUString>& /*rPropertyNames*/)
 {
     //loading via notification always uses the default setting
@@ -442,9 +428,7 @@ void    ExtendedColorConfig_Impl::Notify( const uno::Sequence<OUString>& /*rProp
     else
         Broadcast(SfxSimpleHint(SFX_HINT_COLORS_CHANGED));
 }
-/* -----------------------------22.03.2002 14:38------------------------------
 
- ---------------------------------------------------------------------------*/
 void ExtendedColorConfig_Impl::Commit()
 {
     if ( !m_sLoadedScheme.getLength() )
@@ -491,9 +475,7 @@ void ExtendedColorConfig_Impl::Commit()
 
     CommitCurrentSchemeName();
 }
-/* -----------------11.12.2002 10:42-----------------
- *
- * --------------------------------------------------*/
+
 void ExtendedColorConfig_Impl::CommitCurrentSchemeName()
 {
     //save current scheme name
@@ -516,10 +498,7 @@ sal_Bool ExtendedColorConfig_Impl::ExistsScheme(const ::rtl::OUString& _sSchemeN
         ;
     return pCompIter != pCompEnd;
 }
-// -----------------------------------------------------------------------------
-/* -----------------------------25.03.2002 12:19------------------------------
 
- ---------------------------------------------------------------------------*/
 void ExtendedColorConfig_Impl::SetColorConfigValue(const ::rtl::OUString& _sName, const ExtendedColorConfigValue& rValue )
 {
     TComponents::iterator aFind = m_aConfigValues.find(_sName);
@@ -531,16 +510,12 @@ void ExtendedColorConfig_Impl::SetColorConfigValue(const ::rtl::OUString& _sName
         SetModified();
     }
 }
-/* -----------------------------25.03.2002 15:22------------------------------
 
- ---------------------------------------------------------------------------*/
 uno::Sequence< ::rtl::OUString> ExtendedColorConfig_Impl::GetSchemeNames()
 {
     return GetNodeNames(C2U("ExtendedColorScheme/ColorSchemes"));
 }
-/* -----------------------------09.04.2002 17:19------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool ExtendedColorConfig_Impl::AddScheme(const rtl::OUString& rScheme)
 {
     if(ConfigItem::AddNode(C2U("ExtendedColorScheme/ColorSchemes"), rScheme))
@@ -551,34 +526,26 @@ sal_Bool ExtendedColorConfig_Impl::AddScheme(const rtl::OUString& rScheme)
     }
     return sal_False;
 }
-/* -----------------------------09.04.2002 17:19------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool ExtendedColorConfig_Impl::RemoveScheme(const rtl::OUString& rScheme)
 {
     uno::Sequence< rtl::OUString > aElements(1);
     aElements.getArray()[0] = rScheme;
     return ClearNodeElements(C2U("ExtendedColorScheme/ColorSchemes"), aElements);
 }
-/* -----------------------------2002/06/20 13:03------------------------------
 
- ---------------------------------------------------------------------------*/
 void ExtendedColorConfig_Impl::SettingsChanged()
 {
     SolarMutexGuard aVclGuard;
 
     Broadcast( SfxSimpleHint( SFX_HINT_COLORS_CHANGED ) );
 }
-/* -----------------11.12.2002 09:21-----------------
- *
- * --------------------------------------------------*/
+
 void ExtendedColorConfig_Impl::LockBroadcast()
 {
     m_bLockBroadcast = sal_True;
 }
-/* -----------------11.12.2002 09:21-----------------
- *
- * --------------------------------------------------*/
+
 void ExtendedColorConfig_Impl::UnlockBroadcast()
 {
     if ( m_bBroadcastWhenUnlocked )
@@ -595,9 +562,7 @@ void ExtendedColorConfig_Impl::UnlockBroadcast()
     }
     m_bLockBroadcast = sal_False;
 }
-/* -----------------------------2002/08/16 12:07 -----------------------------
-   #100822#
- --------------------------------------------------------------------------- */
+
 IMPL_LINK( ExtendedColorConfig_Impl, DataChangedEventListener, VclWindowEvent*, pEvent )
 {
     if ( pEvent->GetId() == VCLEVENT_APPLICATION_DATACHANGED )
@@ -626,9 +591,7 @@ ExtendedColorConfig::ExtendedColorConfig()
     ++nExtendedColorRefCount_Impl;
     StartListening( *m_pImpl);
 }
-/* -----------------------------16.01.01 15:36--------------------------------
 
- ---------------------------------------------------------------------------*/
 ExtendedColorConfig::~ExtendedColorConfig()
 {
     ::osl::MutexGuard aGuard( ColorMutex_Impl::get() );
@@ -639,9 +602,7 @@ ExtendedColorConfig::~ExtendedColorConfig()
         m_pImpl = 0;
     }
 }
-/* -----------------------------11.04.2002 11:49------------------------------
 
- ---------------------------------------------------------------------------*/
 ExtendedColorConfigValue ExtendedColorConfig::GetColorValue(const ::rtl::OUString& _sComponentName,const ::rtl::OUString& _sName)const
 {
     return m_pImpl->GetColorConfigValue(_sComponentName,_sName);
@@ -671,28 +632,21 @@ ExtendedColorConfigValue ExtendedColorConfig::GetComponentColorConfigValue(const
 {
     return m_pImpl->GetComponentDisplayName(_sComponentName);
 }
-// -----------------------------------------------------------------------------
-/* -----------------------------12.04.2002 09:25------------------------------
 
- ---------------------------------------------------------------------------*/
 void ExtendedColorConfig::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 {
     SolarMutexGuard aVclGuard;
 
     Broadcast( rHint );
 }
-/* -----------------------------25.03.2002 12:01------------------------------
 
- ---------------------------------------------------------------------------*/
 EditableExtendedColorConfig::EditableExtendedColorConfig() :
     m_pImpl(new ExtendedColorConfig_Impl),
     m_bModified(sal_False)
 {
     m_pImpl->LockBroadcast();
 }
-/*-- 25.03.2002 12:03:08---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 EditableExtendedColorConfig::~EditableExtendedColorConfig()
 {
     m_pImpl->UnlockBroadcast();
@@ -703,30 +657,22 @@ EditableExtendedColorConfig::~EditableExtendedColorConfig()
     delete m_pImpl;
 }
 
-/*-- 25.03.2002 12:03:15---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 uno::Sequence< ::rtl::OUString >  EditableExtendedColorConfig::GetSchemeNames() const
 {
     return m_pImpl->GetSchemeNames();
 }
-/*-- 25.03.2002 12:03:16---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void EditableExtendedColorConfig::DeleteScheme(const ::rtl::OUString& rScheme )
 {
     m_pImpl->RemoveScheme(rScheme);
 }
-/*-- 25.03.2002 12:03:16---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void EditableExtendedColorConfig::AddScheme(const ::rtl::OUString& rScheme )
 {
     m_pImpl->AddScheme(rScheme);
 }
-/*-- 25.03.2002 12:03:16---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool EditableExtendedColorConfig::LoadScheme(const ::rtl::OUString& rScheme )
 {
     if(m_bModified)
@@ -739,32 +685,25 @@ sal_Bool EditableExtendedColorConfig::LoadScheme(const ::rtl::OUString& rScheme
     m_pImpl->CommitCurrentSchemeName();
     return sal_True;
 }
-/*-- 25.03.2002 12:03:16---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 const ::rtl::OUString& EditableExtendedColorConfig::GetCurrentSchemeName()const
 {
     return m_pImpl->GetLoadedScheme();
 }
-/* -----------------11.12.2002 10:56-----------------
- *  changes the name of the current scheme but doesn't load it!
- * --------------------------------------------------*/
+
+// Changes the name of the current scheme but doesn't load it!
 void EditableExtendedColorConfig::SetCurrentSchemeName(const ::rtl::OUString& rScheme)
 {
     m_pImpl->SetCurrentSchemeName(rScheme);
     m_pImpl->CommitCurrentSchemeName();
 }
-/*-- 25.03.2002 12:03:17---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ExtendedColorConfigValue EditableExtendedColorConfig::GetColorValue(const ::rtl::OUString& _sComponentName,
     const ::rtl::OUString& _sName)const
 {
     return m_pImpl->GetColorConfigValue(_sComponentName,_sName);
 }
-/*-- 25.03.2002 12:03:17---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void EditableExtendedColorConfig::SetColorValue(
     const ::rtl::OUString& _sName, const ExtendedColorConfigValue& rValue)
 {
@@ -772,16 +711,12 @@ void EditableExtendedColorConfig::SetColorValue(
     m_pImpl->ClearModified();
     m_bModified = sal_True;
 }
-/* -----------------------------10.04.2002 13:22------------------------------
 
- ---------------------------------------------------------------------------*/
 void EditableExtendedColorConfig::SetModified()
 {
     m_bModified = sal_True;
 }
-/* -----------------15.10.2002 14:51-----------------
- *
- * --------------------------------------------------*/
+
 void EditableExtendedColorConfig::Commit()
 {
     if(m_bModified)
diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx
index 4202ffa45a52..e929efab0a90 100644
--- a/svtools/source/config/fontsubstconfig.cxx
+++ b/svtools/source/config/fontsubstconfig.cxx
@@ -64,9 +64,7 @@ struct SvtFontSubstConfig_Impl
 {
     SubstitutionStructArr   aSubstArr;
 };
-/* -----------------------------18.01.01 12:04--------------------------------
 
- ---------------------------------------------------------------------------*/
 SvtFontSubstConfig::SvtFontSubstConfig() :
     ConfigItem(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Font/Substitution"))),
     bIsEnabled(sal_False),
@@ -112,16 +110,12 @@ SvtFontSubstConfig::SvtFontSubstConfig() :
         pImpl->aSubstArr.Insert(pInsert, pImpl->aSubstArr.Count());
     }
 }
-/* -----------------------------18.01.01 12:06--------------------------------
 
- ---------------------------------------------------------------------------*/
 SvtFontSubstConfig::~SvtFontSubstConfig()
 {
     delete pImpl;
 }
-/*-- 18.01.01 12:08:00---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvtFontSubstConfig::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
 {
 }
@@ -169,23 +163,17 @@ void SvtFontSubstConfig::Commit()
         ReplaceSetProperties(sNode, aSetValues);
     }
 }
-/*-- 18.01.01 12:08:00---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Int32 SvtFontSubstConfig::SubstitutionCount() const
 {
     return pImpl->aSubstArr.Count();
 }
-/*-- 18.01.01 12:08:00---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvtFontSubstConfig::ClearSubstitutions()
 {
     pImpl->aSubstArr.DeleteAndDestroy(0, pImpl->aSubstArr.Count());
 }
-/*-- 18.01.01 12:08:00---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 const SubstitutionStruct* SvtFontSubstConfig::GetSubstitution(sal_Int32 nPos)
 {
     DBG_ASSERT(nPos >= 0 && nPos < pImpl->aSubstArr.Count(), "illegal array index");
@@ -193,9 +181,7 @@ const SubstitutionStruct* SvtFontSubstConfig::GetSubstitution(sal_Int32 nPos)
         return pImpl->aSubstArr[(sal_uInt16)nPos];
     return 0;
 }
-/*-- 18.01.01 12:08:01---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvtFontSubstConfig::AddSubstitution(const SubstitutionStruct& rToAdd)
 {
     SubstitutionStructPtr pInsert = new SubstitutionStruct(rToAdd);
diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index 6e1f817ad622..7582712389f7 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -166,7 +166,7 @@ Sequence< OUString > SvtHelpOptions_Impl::GetPropertyNames()
 // -----------------------------------------------------------------------
 
 SvtHelpOptions_Impl::SvtHelpOptions_Impl()
-    : ConfigItem( OUString::createFromAscii("Office.Common/Help") )
+    : ConfigItem( OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Help" )) )
     , pList( 0 )
     , bExtendedHelp( sal_False )
     , bHelpTips( sal_True )
@@ -279,10 +279,10 @@ void  SvtHelpOptions_Impl::Load(const uno::Sequence< ::rtl::OUString>& rProperty
 void SvtHelpOptions_Impl::implGetURLCounters( Sequence< ::rtl::OUString >& _rNodeNames, Sequence< Any >& _rURLs, Sequence< Any >& _rCounters )
 {
     // the ignore counters for the help agent URLs
-    const ::rtl::OUString sIgnoreListNodePath = ::rtl::OUString::createFromAscii("HelpAgent/IgnoreList");
-    const ::rtl::OUString sPathSeparator = ::rtl::OUString::createFromAscii("/");
-    const ::rtl::OUString sURLLocalPath = ::rtl::OUString::createFromAscii("/Name");
-    const ::rtl::OUString sCounterLocalPath = ::rtl::OUString::createFromAscii("/Counter");
+    const ::rtl::OUString sIgnoreListNodePath( RTL_CONSTASCII_USTRINGPARAM( "HelpAgent/IgnoreList" ));
+    const ::rtl::OUString sPathSeparator(      RTL_CONSTASCII_USTRINGPARAM( "/" ));
+    const ::rtl::OUString sURLLocalPath(       RTL_CONSTASCII_USTRINGPARAM( "/Name" ));
+    const ::rtl::OUString sCounterLocalPath(   RTL_CONSTASCII_USTRINGPARAM( "/Counter" ));
 
     // get the names of all the nodes containing ignore counters
     // collect the node names we have to ask
@@ -339,10 +339,10 @@ void SvtHelpOptions_Impl::implSaveURLCounters()
 {
     ::osl::MutexGuard aGuard(aIgnoreCounterSafety);
 
-    const ::rtl::OUString sIgnoreListNodePath = ::rtl::OUString::createFromAscii("HelpAgent/IgnoreList");
-    const ::rtl::OUString sPathSeparator = ::rtl::OUString::createFromAscii("/");
-    const ::rtl::OUString sURLLocalPath = ::rtl::OUString::createFromAscii("/Name");
-    const ::rtl::OUString sCounterLocalPath = ::rtl::OUString::createFromAscii("/Counter");
+    const ::rtl::OUString sIgnoreListNodePath( RTL_CONSTASCII_USTRINGPARAM( "HelpAgent/IgnoreList" ));
+    const ::rtl::OUString sPathSeparator(      RTL_CONSTASCII_USTRINGPARAM( "/" ));
+    const ::rtl::OUString sURLLocalPath(       RTL_CONSTASCII_USTRINGPARAM( "/Name" ));
+    const ::rtl::OUString sCounterLocalPath(   RTL_CONSTASCII_USTRINGPARAM( "/Counter" ));
 
     // get the current URL/counter pairs (as they're persistent at the moment)
     Sequence< ::rtl::OUString > aNodeNames;
@@ -426,7 +426,7 @@ void SvtHelpOptions_Impl::implSaveURLCounters()
     ::rtl::OUString sNewNodeName;
     Sequence< ::rtl::OUString > aNewCounterDataNodeNames(2);
     Sequence< Any >             aNewCounterDataValues(2);
-    const ::rtl::OUString sNodeNameBase = ::rtl::OUString::createFromAscii("URL");
+    const ::rtl::OUString sNodeNameBase( RTL_CONSTASCII_USTRINGPARAM( "URL" ));
     for (   ConstMapString2IntIterator aCollectNew = aURLIgnoreCounters.begin();
             aCollectNew != aURLIgnoreCounters.end();
             ++aCollectNew
diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx
index 77b9083c2481..69c2b57f5aff 100644
--- a/svtools/source/config/htmlcfg.cxx
+++ b/svtools/source/config/htmlcfg.cxx
@@ -57,9 +57,7 @@ static SvxHtmlOptions* pOptions = 0;
 DECLARE_LIST( LinkList, Link * )
 
 #define C2U(cChar) OUString::createFromAscii(cChar)
-/* -----------------------------23.11.00 11:39--------------------------------
 
- ---------------------------------------------------------------------------*/
 struct HtmlOptions_Impl
 {
     LinkList    aList;
@@ -85,9 +83,6 @@ struct HtmlOptions_Impl
     }
 };
 
-/* -----------------------------23.11.00 11:39--------------------------------
-
- ---------------------------------------------------------------------------*/
 const Sequence<OUString>& SvxHtmlOptions::GetPropertyNames()
 {
     static Sequence<OUString> aNames;
@@ -381,17 +376,11 @@ void SvxHtmlOptions::SetStarBasic(BOOL bSet)
     SetModified();
 }
 
-/*-----------------14.02.97 08.34-------------------
-
---------------------------------------------------*/
-
 BOOL SvxHtmlOptions::IsSaveGraphicsLocal() const
 {
     return 0 != (pImp->nFlags & HTMLCFG_LOCAL_GRF) ;
 }
-/*-----------------14.02.97 08.34-------------------
 
---------------------------------------------------*/
 void SvxHtmlOptions::SetSaveGraphicsLocal(BOOL bSet)
 {
     if(bSet)
@@ -401,10 +390,6 @@ void SvxHtmlOptions::SetSaveGraphicsLocal(BOOL bSet)
     SetModified();
 }
 
-/*-----------------10/21/97 08:34am-----------------
-
---------------------------------------------------*/
-
 BOOL    SvxHtmlOptions::IsPrintLayoutExtension() const
 {
     BOOL bRet = 0 != (pImp->nFlags & HTMLCFG_PRINT_LAYOUT_EXTENSION);
@@ -419,9 +404,7 @@ BOOL    SvxHtmlOptions::IsPrintLayoutExtension() const
     }
     return bRet;
 }
-/*-----------------10/21/97 08:34am-----------------
 
---------------------------------------------------*/
 void    SvxHtmlOptions::SetPrintLayoutExtension(BOOL bSet)
 {
     if(bSet)
@@ -431,17 +414,11 @@ void    SvxHtmlOptions::SetPrintLayoutExtension(BOOL bSet)
     SetModified();
 }
 
-/*-----------------10.07.98 10.02-------------------
-
---------------------------------------------------*/
-
 BOOL SvxHtmlOptions::IsIgnoreFontFamily() const
 {
     return 0 != (pImp->nFlags & HTMLCFG_IGNORE_FONT_FAMILY) ;
 }
-/*-----------------10.07.98 10.02-------------------
 
---------------------------------------------------*/
 void SvxHtmlOptions::SetIgnoreFontFamily(BOOL bSet)
 {
     if(bSet)
@@ -450,16 +427,12 @@ void SvxHtmlOptions::SetIgnoreFontFamily(BOOL bSet)
         pImp->nFlags &= ~HTMLCFG_IGNORE_FONT_FAMILY;
     SetModified();
 }
-/* -----------------05.02.99 09:03-------------------
- *
- * --------------------------------------------------*/
+
 BOOL SvxHtmlOptions::IsStarBasicWarning() const
 {
     return 0 != (pImp->nFlags & HTMLCFG_IS_BASIC_WARNING) ;
 }
-/* -----------------05.02.99 09:03-------------------
- *
- * --------------------------------------------------*/
+
 void SvxHtmlOptions::SetStarBasicWarning(BOOL bSet)
 {
     if(bSet)
@@ -469,9 +442,6 @@ void SvxHtmlOptions::SetStarBasicWarning(BOOL bSet)
     SetModified();
 }
 
-/*-----------------19.02.2001 18:40-----------------
- *
- * --------------------------------------------------*/
 rtl_TextEncoding SvxHtmlOptions::GetTextEncoding() const
 {
     rtl_TextEncoding eRet;
@@ -482,18 +452,13 @@ rtl_TextEncoding SvxHtmlOptions::GetTextEncoding() const
     return eRet;
 }
 
-/*-----------------19.02.2001 18:40-----------------
- *
- * --------------------------------------------------*/
 void SvxHtmlOptions::SetTextEncoding( rtl_TextEncoding eEnc )
 {
     pImp->eEncoding = eEnc;
     pImp->bIsEncodingDefault = sal_False;
     SetModified();
 }
-/* -----------------------------15.08.2001 12:01------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool SvxHtmlOptions::IsDefaultTextEncoding() const
 {
     return pImp->bIsEncodingDefault;
@@ -506,15 +471,11 @@ SvxHtmlOptions* SvxHtmlOptions::Get()
     return pOptions;
 }
 
-
-/* ---------------------- 2006-06-07T21:02+0200 ---------------------- */
 BOOL SvxHtmlOptions::IsNumbersEnglishUS() const
 {
     return 0 != (pImp->nFlags & HTMLCFG_NUMBERS_ENGLISH_US) ;
 }
 
-
-/* ---------------------- 2006-06-07T21:02+0200 ---------------------- */
 void SvxHtmlOptions::SetNumbersEnglishUS(BOOL bSet)
 {
     if(bSet)
diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx
index 2c0b250934b5..8c0446ebc37e 100644
--- a/svtools/source/config/itemholder2.cxx
+++ b/svtools/source/config/itemholder2.cxx
@@ -65,7 +65,7 @@ ItemHolder2::ItemHolder2()
     {
         css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
         css::uno::Reference< css::lang::XComponent > xCfg(
-            xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")),
+            xSMGR->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ))),
             css::uno::UNO_QUERY);
         if (xCfg.is())
             xCfg->addEventListener(static_cast< css::lang::XEventListener* >(this));
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index 8d481799789f..c5c32d47aee2 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -474,9 +474,6 @@ SvtMiscOptions_Impl::~SvtMiscOptions_Impl()
         delete aList.Remove(n);
 }
 
-/*-- 25.02.2005 13:22:04---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 static int lcl_MapPropertyName( const ::rtl::OUString rCompare,
                 const uno::Sequence< ::rtl::OUString>& aInternalPropertyNames)
 {
diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx
index 0f40bf0fbb18..f17958fa8722 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.cxx
@@ -192,18 +192,18 @@ namespace svt
             Reference< XResultSet > xResultSet;
             Sequence< OUString > aProps(12);
 
-            aProps[0] = OUString::createFromAscii( "Title" );
-            aProps[1] = OUString::createFromAscii( "Size" );
-            aProps[2] = OUString::createFromAscii( "DateModified" );
-            aProps[3] = OUString::createFromAscii( "DateCreated" );
-            aProps[4] = OUString::createFromAscii( "IsFolder" );
-            aProps[5] = OUString::createFromAscii( "TargetURL" );
-            aProps[6] = OUString::createFromAscii( "IsHidden" );
-            aProps[7] = OUString::createFromAscii( "IsVolume" );
-            aProps[8] = OUString::createFromAscii( "IsRemote" );
-            aProps[9] = OUString::createFromAscii( "IsRemoveable" );
-            aProps[10] = OUString::createFromAscii( "IsFloppy" );
-            aProps[11] = OUString::createFromAscii( "IsCompactDisc" );
+            aProps[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ));
+            aProps[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ));
+            aProps[2] = OUString( RTL_CONSTASCII_USTRINGPARAM( "DateModified" ));
+            aProps[3] = OUString( RTL_CONSTASCII_USTRINGPARAM( "DateCreated" ));
+            aProps[4] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ));
+            aProps[5] = OUString( RTL_CONSTASCII_USTRINGPARAM( "TargetURL" ));
+            aProps[6] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsHidden" ));
+            aProps[7] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsVolume" ));
+            aProps[8] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsRemote" ));
+            aProps[9] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsRemoveable" ));
+            aProps[10] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFloppy" ));
+            aProps[11] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsCompactDisc" ));
 
             Reference< XCommandEnvironment > xEnvironment;
             try
@@ -299,8 +299,8 @@ namespace svt
                                 ::ucbhelper::Content aCnt( aTargetURL, xEnvironment );
                                 try
                                 {
-                                aCnt.getPropertyValue( OUString::createFromAscii( "Size" ) ) >>= pData->maSize;
-                                aCnt.getPropertyValue( OUString::createFromAscii( "DateModified" ) ) >>= aDT;
+                                aCnt.getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" )) ) >>= pData->maSize;
+                                aCnt.getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DateModified" )) ) >>= aDT;
                                 }
                                 catch (...) {}
                             }
@@ -396,7 +396,7 @@ namespace svt
 
     sal_Bool FileViewContentEnumerator::URLOnBlackList ( const ::rtl::OUString& sRealURL )
     {
-        ::rtl::OUString entryName = sRealURL.copy( sRealURL.lastIndexOf( rtl::OUString::createFromAscii("/")) +1 );
+        ::rtl::OUString entryName = sRealURL.copy( sRealURL.lastIndexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ))) +1 );
 
         for (int i = 0; i < m_rBlackList.getLength() ; i++)
         {
@@ -431,7 +431,7 @@ namespace svt
             m_xDocInfo->loadFromURL( _rTargetURL );
             Reference< XPropertySet > xPropSet( m_xDocInfo, UNO_QUERY );
 
-            Any aAny = xPropSet->getPropertyValue( OUString::createFromAscii( "Title" ) );
+            Any aAny = xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" )) );
 
             OUString sTitle;
             if ( ( aAny >>= sTitle ) && sTitle.getLength() > 0 )
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 346b02632784..b30fff04c6a9 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -144,13 +144,6 @@ namespace
 
 // -----------------------------------------------------------------------
 
-static sal_Bool isHighContrast( const Window* _pView )
-{
-    return _pView->GetSettings().GetStyleSettings().GetHighContrastMode();
-}
-
-// -----------------------------------------------------------------------
-
 void FilterMatch::createWildCardFilterList(const String& _rFilterList,::std::vector< WildCard >& _rFilters)
 {
     if( _rFilterList.Len() )
@@ -892,7 +885,7 @@ PopupMenu* ViewTabListBox_Impl::CreateContextMenu( void )
                     if ( aCommands.is() )
                         bEnableDelete
                             = aCommands->hasCommandByName(
-                                OUString::createFromAscii( "delete" ) );
+                                OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" )) );
                     else
                         bEnableDelete = false;
                 }
@@ -911,7 +904,7 @@ PopupMenu* ViewTabListBox_Impl::CreateContextMenu( void )
                     {
                         Property aProp
                             = aProps->getPropertyByName(
-                                OUString::createFromAscii( "Title" ) );
+                                OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" )) );
                         bEnableRename
                             = !( aProp.Attributes & PropertyAttribute::READONLY );
                     }
@@ -995,7 +988,7 @@ void ViewTabListBox_Impl::DeleteEntries()
             if ( aCommands.is() )
                 canDelete
                     = aCommands->hasCommandByName(
-                        OUString::createFromAscii( "delete" ) );
+                        OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" )) );
             else
                 canDelete = false;
         }
@@ -1055,7 +1048,7 @@ BOOL ViewTabListBox_Impl::EditedEntry( SvLBoxEntry* pEntry,
 
     try
     {
-        OUString aPropName = OUString::createFromAscii( "Title" );
+        OUString aPropName( RTL_CONSTASCII_USTRINGPARAM( "Title" ));
         bool canRename = true;
         ::ucbhelper::Content aContent( aURL, mxCmdEnv );
 
@@ -1191,7 +1184,7 @@ sal_Bool ViewTabListBox_Impl::Kill( const OUString& rContent )
     try
     {
         ::ucbhelper::Content aCnt( rContent, mxCmdEnv );
-        aCnt.executeCommand( OUString::createFromAscii( "delete" ), makeAny( sal_Bool( sal_True ) ) );
+        aCnt.executeCommand( OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" )), makeAny( sal_Bool( sal_True ) ) );
     }
     catch( ::com::sun::star::ucb::CommandAbortedException const & )
     {
@@ -1323,7 +1316,7 @@ void SvtFileView::OpenFolder( const Sequence< OUString >& aContents )
         // detect image
         sal_Bool bDoInsert = sal_True;
         INetURLObject aObj( aImageURL.Len() > 0 ? aImageURL : aURL );
-        Image aImage = SvFileInformationManager::GetImage( aObj, FALSE, isHighContrast( this ) );
+        Image aImage = SvFileInformationManager::GetImage( aObj, FALSE );
 
         if ( bDoInsert )
         {
@@ -2292,8 +2285,8 @@ void SvtFileView_Impl::implEnumerationSuccess()
 // -----------------------------------------------------------------------
 void SvtFileView_Impl::ReplaceTabWithString( OUString& aValue )
 {
-    OUString aTab     = OUString::createFromAscii( "\t" );
-    OUString aTabString = OUString::createFromAscii( "%09" );
+    OUString aTab(       RTL_CONSTASCII_USTRINGPARAM( "\t" ));
+    OUString aTabString( RTL_CONSTASCII_USTRINGPARAM( "%09" ));
     sal_Int32 iPos;
 
     while ( ( iPos = aValue.indexOf( aTab ) ) >= 0 )
@@ -2306,8 +2299,8 @@ void SvtFileView_Impl::CreateDisplayText_Impl()
     ::osl::MutexGuard aGuard( maMutex );
 
     OUString aValue;
-    OUString aTab     = OUString::createFromAscii( "\t" );
-    OUString aDateSep = OUString::createFromAscii( ", " );
+    OUString aTab(     RTL_CONSTASCII_USTRINGPARAM( "\t" ));
+    OUString aDateSep( RTL_CONSTASCII_USTRINGPARAM( ", " ));
 
     std::vector< SortingData_Impl* >::iterator aIt;
 
@@ -2341,10 +2334,10 @@ void SvtFileView_Impl::CreateDisplayText_Impl()
             ::svtools::VolumeInfo aVolInfo( (*aIt)->mbIsVolume, (*aIt)->mbIsRemote,
                                             (*aIt)->mbIsRemoveable, (*aIt)->mbIsFloppy,
                                             (*aIt)->mbIsCompactDisc );
-            (*aIt)->maImage = SvFileInformationManager::GetFolderImage( aVolInfo, FALSE, isHighContrast( mpView ) );
+            (*aIt)->maImage = SvFileInformationManager::GetFolderImage( aVolInfo, FALSE );
         }
         else
-            (*aIt)->maImage = SvFileInformationManager::GetFileImage( INetURLObject( (*aIt)->maTargetURL ), FALSE, isHighContrast( mpView ));
+            (*aIt)->maImage = SvFileInformationManager::GetFileImage( INetURLObject( (*aIt)->maTargetURL ), FALSE );
     }
 }
 
@@ -2357,7 +2350,7 @@ void SvtFileView_Impl::CreateVector_Impl( const Sequence < OUString > &rList )
 {
     ::osl::MutexGuard aGuard( maMutex );
 
-    OUString aTab     = OUString::createFromAscii( "\t" );
+    OUString aTab( RTL_CONSTASCII_USTRINGPARAM( "\t" ));
 
     sal_uInt32 nCount = (sal_uInt32) rList.getLength();
 
@@ -2429,7 +2422,7 @@ void SvtFileView_Impl::CreateVector_Impl( const Sequence < OUString > &rList )
 
         // detect the image
         INetURLObject aObj( pEntry->maImageURL.getLength() ? pEntry->maImageURL : pEntry->maTargetURL );
-        pEntry->maImage = SvFileInformationManager::GetImage( aObj, FALSE, isHighContrast( mpView ) );
+        pEntry->maImage = SvFileInformationManager::GetImage( aObj, FALSE );
 
         maContent.push_back( pEntry );
     }
@@ -2639,11 +2632,11 @@ String SvtFileView_Impl::FolderInserted( const OUString& rURL, const OUString& r
 
     ::svtools::VolumeInfo aVolInfo;
     pData->maType = SvFileInformationManager::GetFolderDescription( aVolInfo );
-    pData->maImage = SvFileInformationManager::GetFolderImage( aVolInfo, FALSE, isHighContrast( mpView ) );
+    pData->maImage = SvFileInformationManager::GetFolderImage( aVolInfo, FALSE );
 
     OUString aValue;
-    OUString aTab     = OUString::createFromAscii( "\t" );
-    OUString aDateSep = OUString::createFromAscii( ", " );
+    OUString aTab(     RTL_CONSTASCII_USTRINGPARAM( "\t" ));
+    OUString aDateSep( RTL_CONSTASCII_USTRINGPARAM( ", " ));
 
     // title, type, size, date
     aValue = pData->GetTitle();
diff --git a/svtools/source/contnr/fileview.src b/svtools/source/contnr/fileview.src
index f40530c10347..c8f5e6aa1911 100644
--- a/svtools/source/contnr/fileview.src
+++ b/svtools/source/contnr/fileview.src
@@ -83,7 +83,7 @@ String STR_SVT_GB
 
 Image IMG_SVT_FOLDER
 {
-    ImageBitmap = Bitmap { File = "folder.bmp" ; };
+    ImageBitmap = Bitmap { File = "folder.png" ; };
     MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
 };
 
@@ -173,24 +173,3 @@ ModalDialog DLG_SVT_QUERYDELETE
         TabStop = TRUE ;
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index 6eeb469cf543..1bd17f9d584c 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -46,20 +46,6 @@ SvxIconChoiceCtrlEntry::SvxIconChoiceCtrlEntry( const String& rText, const Image
 {
     aText = rText;
     aImage = rImage;
-    aImageHC = rImage;
-    pUserData = NULL;
-
-    nFlags = _nFlags;
-    eTextMode = IcnShowTextShort;
-    pblink = 0;
-    pflink = 0;
-}
-
-SvxIconChoiceCtrlEntry::SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, const Image& rImageHC, USHORT _nFlags )
-{
-    aText = rText;
-    aImage = rImage;
-    aImageHC = rImageHC;
     pUserData = NULL;
 
     nFlags = _nFlags;
@@ -94,15 +80,6 @@ void SvxIconChoiceCtrlEntry::LockPos( BOOL bLock )
         nFlags &= ~ICNVIEW_FLAG_POS_LOCKED;
 }
 
-/*sal_Unicode SvxIconChoiceCtrlEntry::GetMnemonicChar() const
-{
-    sal_Unicode cChar = 0;
-    xub_StrLen nPos = aText.Search( '~' );
-    if ( nPos != STRING_NOTFOUND && nPos < ( aText.Len() ) - 1 )
-        cChar = aText.GetChar( nPos + 1 );
-    return cChar;
-}*/
-
 String SvxIconChoiceCtrlEntry::GetDisplayText() const
 {
     return MnemonicGenerator::EraseAllMnemonicChars( aText );
@@ -177,43 +154,41 @@ SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const String& rText, con
     return pEntry;
 }
 
-SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const String& rText, const Image& rImage, const Image& rImageHC, ULONG nPos, const Point* pPos, USHORT nFlags  )
-{
-    SvxIconChoiceCtrlEntry* pEntry = new SvxIconChoiceCtrlEntry( rText, rImage, rImageHC, nFlags);
-
-    _pImp->InsertEntry( pEntry, nPos, pPos );
-
-    return pEntry;
-}
-
 BOOL SvtIconChoiceCtrl::EditedEntry( SvxIconChoiceCtrlEntry*, const XubString&, BOOL )
 {
     return TRUE;
 }
+
 BOOL SvtIconChoiceCtrl::EditingEntry( SvxIconChoiceCtrlEntry* )
 {
     return TRUE;
 }
+
 void SvtIconChoiceCtrl::DrawEntryImage( SvxIconChoiceCtrlEntry* pEntry, const Point& rPos, OutputDevice& rDev )
 {
-    rDev.DrawImage( rPos, GetSettings().GetStyleSettings().GetHighContrastMode() ? pEntry->GetImageHC() : pEntry->GetImage() );
+    rDev.DrawImage( rPos, pEntry->GetImage() );
 }
+
 String SvtIconChoiceCtrl::GetEntryText( SvxIconChoiceCtrlEntry* pEntry, BOOL )
 {
     return pEntry->GetText();
 }
+
 BOOL SvtIconChoiceCtrl::HasBackground() const
 {
     return FALSE;
 }
+
 BOOL SvtIconChoiceCtrl::HasFont() const
 {
     return FALSE;
 }
+
 BOOL SvtIconChoiceCtrl::HasFontTextColor() const
 {
     return TRUE;
 }
+
 BOOL SvtIconChoiceCtrl::HasFontFillColor() const
 {
     return TRUE;
diff --git a/svtools/source/contnr/svcontnr.src b/svtools/source/contnr/svcontnr.src
index bcd1e060664f..2a4b12a8250c 100644
--- a/svtools/source/contnr/svcontnr.src
+++ b/svtools/source/contnr/svcontnr.src
@@ -29,25 +29,13 @@
 
 Image RID_IMG_TREENODE_COLLAPSED
 {
-    ImageBitmap = Bitmap { File = "plus.bmp"; } ;
+    ImageBitmap = Bitmap { File = "plus.png"; } ;
     MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; };
 };
 
 Image RID_IMG_TREENODE_EXPANDED
 {
-    ImageBitmap = Bitmap { File = "minus.bmp"; } ;
-    MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; };
-};
-
-Image RID_IMG_TREENODE_COLLAPSED_HC
-{
-    ImageBitmap = Bitmap { File = "plus_sch.bmp"; } ;
-    MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; };
-};
-
-Image RID_IMG_TREENODE_EXPANDED_HC
-{
-    ImageBitmap = Bitmap { File = "minus_sch.bmp"; } ;
+    ImageBitmap = Bitmap { File = "minus.png"; } ;
     MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; };
 };
 
@@ -57,47 +45,23 @@ String STR_SVT_ACC_DESC_TABLISTBOX
 {
     Text [ en-US ] = "Row: %1, Column: %2";
 };
+
 String STR_SVT_ACC_DESC_FILEVIEW
 {
     Text [ en-US ] = ", Type: %1, URL: %2";
 };
+
 String STR_SVT_ACC_DESC_FOLDER
 {
     Text [ en-US ] = "Folder";
 };
+
 String STR_SVT_ACC_DESC_FILE
 {
     Text [ en-US ] = "File";
 };
+
 String STR_SVT_ACC_EMPTY_FIELD
 {
     Text [ en-US ] = "Empty Field";
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 86c5146d9dec..6d3801a2dbab 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -56,8 +56,6 @@
 // #i27063# (pl), #i32300# (pb) never access VCL after DeInitVCL - also no destructors
 Image*  SvImpLBox::s_pDefCollapsed      = NULL;
 Image*  SvImpLBox::s_pDefExpanded       = NULL;
-Image*  SvImpLBox::s_pDefCollapsedHC    = NULL;
-Image*  SvImpLBox::s_pDefExpandedHC     = NULL;
 sal_Int32 SvImpLBox::s_nImageRefCount   = 0;
 
 SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvLBoxTreeList* pLBTree, WinBits nWinStyle) :
@@ -140,8 +138,6 @@ SvImpLBox::~SvImpLBox()
     {
         DELETEZ(s_pDefCollapsed);
         DELETEZ(s_pDefExpanded);
-        DELETEZ(s_pDefCollapsedHC);
-        DELETEZ(s_pDefExpandedHC);
     }
 }
 
@@ -3077,9 +3073,8 @@ void SvImpLBox::PaintDDCursor( SvLBoxEntry* pInsertionPos )
     pView->SetLineColor( aOldLineColor );
     pView->SetRasterOp( eOldOp );
 }
-/* -----------------26.08.2003 12:52-----------------
-    Delete all sub menues of a PopupMenu, recursively
- --------------------------------------------------*/
+
+// Delete all submenus of a PopupMenu, recursively
 void lcl_DeleteSubPopups(PopupMenu* pPopup)
 {
     for(USHORT i = 0; i < pPopup->GetItemCount(); i++)
@@ -3568,24 +3563,22 @@ void SvImpLBox::implInitDefaultNodeImages()
         // assume that all or nothing is initialized
         return;
 
-    s_pDefCollapsed = new Image( SvtResId( RID_IMG_TREENODE_COLLAPSED ) );
-    s_pDefCollapsedHC = new Image( SvtResId( RID_IMG_TREENODE_COLLAPSED_HC ) );
-    s_pDefExpanded = new Image( SvtResId( RID_IMG_TREENODE_EXPANDED ) );
-    s_pDefExpandedHC = new Image( SvtResId( RID_IMG_TREENODE_EXPANDED_HC ) );
+    s_pDefCollapsed  = new Image( SvtResId( RID_IMG_TREENODE_COLLAPSED ) );
+    s_pDefExpanded   = new Image( SvtResId( RID_IMG_TREENODE_EXPANDED ) );
 }
 
 // -----------------------------------------------------------------------
-const Image& SvImpLBox::GetDefaultExpandedNodeImage( BmpColorMode _eMode )
+const Image& SvImpLBox::GetDefaultExpandedNodeImage( )
 {
     implInitDefaultNodeImages();
-    return ( BMP_COLOR_NORMAL == _eMode ) ? *s_pDefExpanded : *s_pDefExpandedHC;
+    return *s_pDefExpanded;
 }
 
 // -----------------------------------------------------------------------
-const Image& SvImpLBox::GetDefaultCollapsedNodeImage( BmpColorMode _eMode )
+const Image& SvImpLBox::GetDefaultCollapsedNodeImage( )
 {
     implInitDefaultNodeImages();
-    return ( BMP_COLOR_NORMAL == _eMode ) ? *s_pDefCollapsed : *s_pDefCollapsedHC;
+    return *s_pDefCollapsed;
 }
 
 // -----------------------------------------------------------------------
diff --git a/svtools/source/contnr/svimpicn.cxx b/svtools/source/contnr/svimpicn.cxx
index 95e1e2835a54..ccded0e72008 100644
--- a/svtools/source/contnr/svimpicn.cxx
+++ b/svtools/source/contnr/svimpicn.cxx
@@ -664,7 +664,6 @@ class ImpIcnCursor
     SvLBoxEntry*    SearchRow(USHORT nRow,USHORT nRight,USHORT nLeft,USHORT nPref,
                         BOOL bRight, BOOL bSimple );
 
-    void            ExpandGrid();
     void            CreateGridMap();
     // Rueckgabe FALSE: Eintrag liegt nicht in der GridMap. rGridx,y werden
     // dann an nGridCols, nGridRows geclippt
@@ -673,10 +672,6 @@ class ImpIcnCursor
                     {
                         pGridMap[ (nDY * nGridCols) + nDX ] = bUsed;
                     }
-    BOOL            IsGridUsed( USHORT nDX, USHORT nDY )
-                    {
-                        return pGridMap[ (nDY * nGridCols) + nDX ];
-                    }
 public:
                     ImpIcnCursor( SvImpIconView* pOwner );
                     ~ImpIcnCursor();
@@ -3553,20 +3548,6 @@ void ImpIcnCursor::SetDeltas()
     }
 }
 
-
-void ImpIcnCursor::ExpandGrid()
-{
-    if( pGridMap )
-    {
-        long nNewGridRows = nGridRows + 20;
-        BOOL* pTempMap = new BOOL[ nNewGridRows * nGridCols ];
-        memcpy( pTempMap, pGridMap, nGridRows * nGridCols );
-        delete pGridMap;
-        pGridMap = pTempMap;
-        nGridRows = nNewGridRows;
-    }
-}
-
 BOOL ImpIcnCursor::FindEmptyGridRect( Rectangle& rRect )
 {
     CreateGridMap();
@@ -3585,9 +3566,6 @@ BOOL ImpIcnCursor::FindEmptyGridRect( Rectangle& rRect )
             rRect.Right() = rRect.Left() + nGridDX;
             SetGridUsed( nCol, nRow, TRUE );
 
-            //XXX
-            //if( nRow + 5 > nGridRows )
-            //  ExpandGrid();
             DBG_ASSERT(pGridMap[nCur],"SetGridUsed failed");
             return TRUE;
         }
@@ -3598,9 +3576,6 @@ BOOL ImpIcnCursor::FindEmptyGridRect( Rectangle& rRect )
     rRect.Left() = LROFFS_WINBORDER;
     rRect.Right() = rRect.Left() + nGridDX;
     return FALSE;
-    //XXX
-    //ExpandGrid();
-    //return TRUE;
 }
 
 void ImpIcnCursor::CreateGridAjustData( SvPtrarr& rLists, SvLBoxEntry* pRefEntry)
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index 39a62ade19fa..3fa940603aa4 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -483,9 +483,6 @@ struct SvLBoxContextBmp_Impl
     Image       m_aImage1;
     Image       m_aImage2;
 
-    Image       m_aImage1_hc;
-    Image       m_aImage2_hc;
-
     USHORT      m_nB2IndicatorFlags;
 };
 
@@ -523,47 +520,20 @@ USHORT SvLBoxContextBmp::IsA()
     return SV_ITEM_ID_LBOXCONTEXTBMP;
 }
 
-BOOL SvLBoxContextBmp::SetModeImages( const Image& _rBitmap1, const Image& _rBitmap2, BmpColorMode _eMode )
+BOOL SvLBoxContextBmp::SetModeImages( const Image& _rBitmap1, const Image& _rBitmap2 )
 {
     DBG_CHKTHIS(SvLBoxContextBmp,0);
 
     sal_Bool bSuccess = sal_True;
-    switch ( _eMode )
-    {
-        case BMP_COLOR_NORMAL:
-            m_pImpl->m_aImage1 = _rBitmap1;
-            m_pImpl->m_aImage2 = _rBitmap2;
-            break;
-
-        case BMP_COLOR_HIGHCONTRAST:
-            m_pImpl->m_aImage1_hc = _rBitmap1;
-            m_pImpl->m_aImage2_hc = _rBitmap2;
-            break;
-
-        default:
-            DBG_ERROR( "SvLBoxContextBmp::SetModeImages: unexpected mode!");
-            bSuccess = sal_False;
-            break;
-    }
+    m_pImpl->m_aImage1 = _rBitmap1;
+    m_pImpl->m_aImage2 = _rBitmap2;
     return bSuccess;
 }
 
-Image& SvLBoxContextBmp::implGetImageStore( sal_Bool _bFirst, BmpColorMode _eMode )
+Image& SvLBoxContextBmp::implGetImageStore( sal_Bool _bFirst )
 {
     DBG_CHKTHIS(SvLBoxContextBmp,0);
 
-    switch ( _eMode )
-    {
-        case BMP_COLOR_NORMAL:
-            return _bFirst ? m_pImpl->m_aImage1 : m_pImpl->m_aImage2;
-
-        case BMP_COLOR_HIGHCONTRAST:
-            return _bFirst ? m_pImpl->m_aImage1_hc : m_pImpl->m_aImage2_hc;
-
-        default:
-            DBG_ERROR( "SvLBoxContextBmp::implGetImageStore: unexpected mode!");
-    }
-
     // OJ: #i27071# wrong mode so we just return the normal images
     return _bFirst ? m_pImpl->m_aImage1 : m_pImpl->m_aImage2;
 }
@@ -582,16 +552,8 @@ void SvLBoxContextBmp::Paint( const Point& _rPos, SvLBox& _rDev,
 {
     DBG_CHKTHIS(SvLBoxContextBmp,0);
 
-    // determine the image set
-    BmpColorMode eMode( BMP_COLOR_NORMAL );
-    if ( !!m_pImpl->m_aImage1_hc )
-    {   // we really have HC images
-        if ( _rDev.GetSettings().GetStyleSettings().GetHighContrastMode() )
-            eMode = BMP_COLOR_HIGHCONTRAST;
-    }
-
     // get the image
-    const Image& rImage = implGetImageStore( 0 == ( _nViewDataEntryFlags & m_pImpl->m_nB2IndicatorFlags ), eMode );
+    const Image& rImage = implGetImageStore( 0 == ( _nViewDataEntryFlags & m_pImpl->m_nB2IndicatorFlags ) );
 
     sal_Bool _bSemiTransparent = _pEntry && ( 0 != ( SV_ENTRYFLAG_SEMITRANSPARENT  & _pEntry->GetFlags( ) ) );
     // draw
diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx
index fb364d34be4d..c4a322d9ee3c 100644
--- a/svtools/source/contnr/svtreebx.cxx
+++ b/svtools/source/contnr/svtreebx.cxx
@@ -25,7 +25,6 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
@@ -367,22 +366,22 @@ String SvTreeListBox::SearchEntryText( SvLBoxEntry* pEntry ) const
     return sRet;
 }
 
-const Image& SvTreeListBox::GetExpandedEntryBmp(SvLBoxEntry* pEntry, BmpColorMode _eMode) const
+const Image& SvTreeListBox::GetExpandedEntryBmp(SvLBoxEntry* pEntry) const
 {
     DBG_CHKTHIS(SvTreeListBox,0);
     DBG_ASSERT(pEntry,"Entry?");
     SvLBoxContextBmp* pItem = (SvLBoxContextBmp*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP));
     DBG_ASSERT(pItem,"GetContextBmp:Item not found");
-    return pItem->GetBitmap2( _eMode );
+    return pItem->GetBitmap2( );
 }
 
-const Image& SvTreeListBox::GetCollapsedEntryBmp( SvLBoxEntry* pEntry, BmpColorMode _eMode ) const
+const Image& SvTreeListBox::GetCollapsedEntryBmp( SvLBoxEntry* pEntry ) const
 {
     DBG_CHKTHIS(SvTreeListBox,0);
     DBG_ASSERT(pEntry,"Entry?");
     SvLBoxContextBmp* pItem = (SvLBoxContextBmp*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP));
     DBG_ASSERT(pItem,"GetContextBmp:Item not found");
-    return pItem->GetBitmap1( _eMode );
+    return pItem->GetBitmap1( );
 }
 
 IMPL_LINK_INLINE_START( SvTreeListBox, CheckButtonClick, SvLBoxButtonData *, pData )
@@ -394,9 +393,13 @@ IMPL_LINK_INLINE_START( SvTreeListBox, CheckButtonClick, SvLBoxButtonData *, pDa
 }
 IMPL_LINK_INLINE_END( SvTreeListBox, CheckButtonClick, SvLBoxButtonData *, pData )
 
-SvLBoxEntry* SvTreeListBox::InsertEntry( const XubString& aText,SvLBoxEntry* pParent,
-                                     BOOL bChildsOnDemand, ULONG nPos, void* pUser,
-                                     SvLBoxButtonKind eButtonKind )
+SvLBoxEntry* SvTreeListBox::InsertEntry(
+    const XubString& aText,
+    SvLBoxEntry* pParent,
+    BOOL bChildsOnDemand, ULONG nPos,
+    void* pUser,
+    SvLBoxButtonKind eButtonKind
+)
 {
     DBG_CHKTHIS(SvTreeListBox,0);
     nTreeFlags |= TREEFLAG_MANINS;
@@ -412,14 +415,6 @@ SvLBoxEntry* SvTreeListBox::InsertEntry( const XubString& aText,SvLBoxEntry* pPa
     InitEntry( pEntry, aText, rDefColBmp, rDefExpBmp, eButtonKind );
     pEntry->EnableChildsOnDemand( bChildsOnDemand );
 
-    // Add the HC versions of the default images
-    SvLBoxContextBmp* pBmpItem = static_cast< SvLBoxContextBmp* >( pEntry->GetFirstItem( SV_ITEM_ID_LBOXCONTEXTBMP ) );
-    if( pBmpItem )
-    {
-        pBmpItem->SetBitmap1( pImp->GetDefaultEntryColBmp( BMP_COLOR_HIGHCONTRAST ), BMP_COLOR_HIGHCONTRAST );
-        pBmpItem->SetBitmap2( pImp->GetDefaultEntryExpBmp( BMP_COLOR_HIGHCONTRAST ), BMP_COLOR_HIGHCONTRAST );
-    }
-
     if( !pParent )
         SvLBox::Insert( pEntry, nPos );
     else
@@ -473,13 +468,13 @@ void SvTreeListBox::SetEntryText( SvLBoxEntry* pEntry, const XubString& aStr)
     GetModel()->InvalidateEntry( pEntry );
 }
 
-void SvTreeListBox::SetExpandedEntryBmp( SvLBoxEntry* pEntry, const Image& aBmp, BmpColorMode _eMode )
+void SvTreeListBox::SetExpandedEntryBmp( SvLBoxEntry* pEntry, const Image& aBmp )
 {
     DBG_CHKTHIS(SvTreeListBox,0);
     SvLBoxContextBmp* pItem = (SvLBoxContextBmp*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP));
 
     DBG_ASSERT(pItem,"SetExpBmp:Item not found");
-    pItem->SetBitmap2( aBmp, _eMode );
+    pItem->SetBitmap2( aBmp );
 
     GetModel()->InvalidateEntry( pEntry );
     SetEntryHeight( pEntry );
@@ -492,13 +487,13 @@ void SvTreeListBox::SetExpandedEntryBmp( SvLBoxEntry* pEntry, const Image& aBmp,
     }
 }
 
-void SvTreeListBox::SetCollapsedEntryBmp(SvLBoxEntry* pEntry,const Image& aBmp, BmpColorMode _eMode )
+void SvTreeListBox::SetCollapsedEntryBmp(SvLBoxEntry* pEntry,const Image& aBmp )
 {
     DBG_CHKTHIS(SvTreeListBox,0);
     SvLBoxContextBmp* pItem = (SvLBoxContextBmp*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP));
 
     DBG_ASSERT(pItem,"SetExpBmp:Item not found");
-    pItem->SetBitmap1( aBmp, _eMode );
+    pItem->SetBitmap1( aBmp );
 
     GetModel()->InvalidateEntry( pEntry );
     SetEntryHeight( pEntry );
@@ -616,8 +611,8 @@ SvLBoxEntry* SvTreeListBox::CloneEntry( SvLBoxEntry* pSource )
     SvLBoxContextBmp* pBmpItem = (SvLBoxContextBmp*)(pSource->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP));
     if( pBmpItem )
     {
-        aCollEntryBmp = pBmpItem->GetBitmap1( BMP_COLOR_NORMAL );
-        aExpEntryBmp  = pBmpItem->GetBitmap2( BMP_COLOR_NORMAL );
+        aCollEntryBmp = pBmpItem->GetBitmap1( );
+        aExpEntryBmp  = pBmpItem->GetBitmap2( );
     }
     SvLBoxButton* pButtonItem = (SvLBoxButton*)(pSource->GetFirstItem(SV_ITEM_ID_LBOXBUTTON));
     if( pButtonItem )
@@ -628,16 +623,6 @@ SvLBoxEntry* SvTreeListBox::CloneEntry( SvLBoxEntry* pSource )
     pClone->EnableChildsOnDemand( pSource->HasChildsOnDemand() );
     pClone->SetUserData( pSource->GetUserData() );
 
-    if ( pBmpItem )
-    {
-        SvLBoxContextBmp* pCloneBitmap = static_cast< SvLBoxContextBmp* >( pClone->GetFirstItem( SV_ITEM_ID_LBOXCONTEXTBMP ) );
-        if ( pCloneBitmap )
-        {
-            pCloneBitmap->SetBitmap1( pBmpItem->GetBitmap1( BMP_COLOR_HIGHCONTRAST ), BMP_COLOR_HIGHCONTRAST );
-            pCloneBitmap->SetBitmap2( pBmpItem->GetBitmap2( BMP_COLOR_HIGHCONTRAST ), BMP_COLOR_HIGHCONTRAST );
-        }
-    }
-
     return pClone;
 }
 
@@ -659,17 +644,17 @@ void SvTreeListBox::SetIndent( short nNewIndent )
         Invalidate();
 }
 
-const Image& SvTreeListBox::GetDefaultExpandedEntryBmp( BmpColorMode _eMode ) const
+const Image& SvTreeListBox::GetDefaultExpandedEntryBmp( ) const
 {
-    return pImp->GetDefaultEntryExpBmp( _eMode );
+    return pImp->GetDefaultEntryExpBmp( );
 }
 
-const Image& SvTreeListBox::GetDefaultCollapsedEntryBmp( BmpColorMode _eMode ) const
+const Image& SvTreeListBox::GetDefaultCollapsedEntryBmp( ) const
 {
-    return pImp->GetDefaultEntryColBmp( _eMode );
+    return pImp->GetDefaultEntryColBmp( );
 }
 
-void SvTreeListBox::SetDefaultExpandedEntryBmp( const Image& aBmp, BmpColorMode _eMode )
+void SvTreeListBox::SetDefaultExpandedEntryBmp( const Image& aBmp )
 {
     DBG_CHKTHIS(SvTreeListBox,0);
     Size aSize = aBmp.GetSizePixel();
@@ -677,10 +662,10 @@ void SvTreeListBox::SetDefaultExpandedEntryBmp( const Image& aBmp, BmpColorMode
         nContextBmpWidthMax = (short)aSize.Width();
     SetTabs();
 
-    pImp->SetDefaultEntryExpBmp( aBmp, _eMode );
+    pImp->SetDefaultEntryExpBmp( aBmp );
 }
 
-void SvTreeListBox::SetDefaultCollapsedEntryBmp( const Image& aBmp, BmpColorMode _eMode )
+void SvTreeListBox::SetDefaultCollapsedEntryBmp( const Image& aBmp )
 {
     DBG_CHKTHIS(SvTreeListBox,0);
     Size aSize = aBmp.GetSizePixel();
@@ -688,7 +673,7 @@ void SvTreeListBox::SetDefaultCollapsedEntryBmp( const Image& aBmp, BmpColorMode
         nContextBmpWidthMax = (short)aSize.Width();
     SetTabs();
 
-    pImp->SetDefaultEntryColBmp( aBmp, _eMode );
+    pImp->SetDefaultEntryColBmp( aBmp );
 }
 
 void SvTreeListBox::EnableCheckButton( SvLBoxButtonData* pData )
@@ -716,29 +701,24 @@ void SvTreeListBox::SetCheckButtonData( SvLBoxButtonData* pData )
         pCheckButtonData = pData;
 }
 
-const Image& SvTreeListBox::GetDefaultExpandedNodeImage( BmpColorMode _eMode )
+const Image& SvTreeListBox::GetDefaultExpandedNodeImage( )
 {
-    return SvImpLBox::GetDefaultExpandedNodeImage( _eMode );
+    return SvImpLBox::GetDefaultExpandedNodeImage( );
 }
 
-const Image& SvTreeListBox::GetDefaultCollapsedNodeImage( BmpColorMode _eMode )
+const Image& SvTreeListBox::GetDefaultCollapsedNodeImage( )
 {
-    return SvImpLBox::GetDefaultCollapsedNodeImage( _eMode );
+    return SvImpLBox::GetDefaultCollapsedNodeImage( );
 }
 
-void SvTreeListBox::SetNodeBitmaps( const Image& rCollapsedNodeBmp, const Image& rExpandedNodeBmp, BmpColorMode _eMode )
+void SvTreeListBox::SetNodeBitmaps( const Image& rCollapsedNodeBmp, const Image& rExpandedNodeBmp )
 {
     DBG_CHKTHIS(SvTreeListBox,0);
-    SetExpandedNodeBmp( rExpandedNodeBmp, _eMode );
-    SetCollapsedNodeBmp( rCollapsedNodeBmp, _eMode );
+    SetExpandedNodeBmp( rExpandedNodeBmp );
+    SetCollapsedNodeBmp( rCollapsedNodeBmp );
     SetTabs();
 }
 
-void SvTreeListBox::SetDontKnowNodeBitmap( const Image& rDontKnowBmp, BmpColorMode _eMode )
-{
-    pImp->SetDontKnowNodeBmp( rDontKnowBmp, _eMode );
-}
-
 BOOL SvTreeListBox::EditingEntry( SvLBoxEntry*, Selection& )
 {
     DBG_CHKTHIS(SvTreeListBox,0);
@@ -1135,18 +1115,18 @@ void SvTreeListBox::ModelHasRemoved( SvListEntry* /* pEntry */ )
     pImp->EntryRemoved();
 }
 
-void SvTreeListBox::SetCollapsedNodeBmp( const Image& rBmp, BmpColorMode _eMode )
+void SvTreeListBox::SetCollapsedNodeBmp( const Image& rBmp)
 {
     DBG_CHKTHIS(SvTreeListBox,0);
     AdjustEntryHeight( rBmp );
-    pImp->SetCollapsedNodeBmp( rBmp, _eMode );
+    pImp->SetCollapsedNodeBmp( rBmp );
 }
 
-void SvTreeListBox::SetExpandedNodeBmp( const Image& rBmp, BmpColorMode _eMode )
+void SvTreeListBox::SetExpandedNodeBmp( const Image& rBmp )
 {
     DBG_CHKTHIS(SvTreeListBox,0);
     AdjustEntryHeight( rBmp );
-    pImp->SetExpandedNodeBmp( rBmp, _eMode );
+    pImp->SetExpandedNodeBmp( rBmp );
 }
 
 
@@ -1229,14 +1209,14 @@ void SvTreeListBox::SetCurEntry( SvLBoxEntry* pEntry )
     pImp->SetCurEntry( pEntry );
 }
 
-Image SvTreeListBox::GetCollapsedNodeBmp( BmpColorMode _eMode ) const
+Image SvTreeListBox::GetCollapsedNodeBmp( ) const
 {
-    return pImp->GetCollapsedNodeBmp( _eMode );
+    return pImp->GetCollapsedNodeBmp( );
 }
 
-Image SvTreeListBox::GetExpandedNodeBmp( BmpColorMode _eMode ) const
+Image SvTreeListBox::GetExpandedNodeBmp( ) const
 {
-    return pImp->GetExpandedNodeBmp( _eMode );
+    return pImp->GetExpandedNodeBmp( );
 }
 
 Point SvTreeListBox::GetEntryPosition( SvLBoxEntry* pEntry ) const
@@ -1511,7 +1491,6 @@ void SvTreeListBox::InvalidateEntry( SvLBoxEntry* pEntry )
     if( pEntry )
     {
         GetModel()->InvalidateEntry( pEntry );
-    //  pImp->InvalidateEntry( pEntry );
     }
 }
 
@@ -1768,20 +1747,17 @@ long SvTreeListBox::PaintEntry1(SvLBoxEntry* pEntry,long nLine,USHORT nTabFlags,
                 aPos.X() += pImp->nNodeBmpTabDistance;
 
                 const Image* pImg = 0;
-                BmpColorMode eBitmapMode = BMP_COLOR_NORMAL;
-                if ( GetSettings().GetStyleSettings().GetHighContrastMode() )
-                    eBitmapMode = BMP_COLOR_HIGHCONTRAST;
 
                 if( IsExpanded(pEntry) )
-                    pImg = &pImp->GetExpandedNodeBmp( eBitmapMode );
+                    pImg = &pImp->GetExpandedNodeBmp( );
                 else
                 {
                     if( (!pEntry->HasChilds()) && pEntry->HasChildsOnDemand() &&
                         (!(pEntry->GetFlags() & SV_ENTRYFLAG_HAD_CHILDREN)) &&
                         pImp->GetDontKnowNodeBmp().GetSizePixel().Width() )
-                        pImg = &pImp->GetDontKnowNodeBmp( eBitmapMode );
+                        pImg = &pImp->GetDontKnowNodeBmp( );
                     else
-                        pImg = &pImp->GetCollapsedNodeBmp( eBitmapMode );
+                        pImg = &pImp->GetCollapsedNodeBmp( );
                 }
                 aPos.Y() += (nTempEntryHeight - pImg->GetSizePixel().Height()) / 2;
 
@@ -1803,12 +1779,14 @@ long SvTreeListBox::PaintEntry1(SvLBoxEntry* pEntry,long nLine,USHORT nTabFlags,
                         aControlValue.setTristateVal( BUTTONVALUE_ON );//expanded node
                     else
                     {
-                        if( (!pEntry->HasChilds()) && pEntry->HasChildsOnDemand() &&
-                            (!(pEntry->GetFlags() & SV_ENTRYFLAG_HAD_CHILDREN)) &&
-                            pImp->GetDontKnowNodeBmp().GetSizePixel().Width() )
-                            aControlValue.setTristateVal( BUTTONVALUE_DONTKNOW );//dont know
+                        if( (!pEntry->HasChilds() )                              &&
+                              pEntry->HasChildsOnDemand()                        &&
+                             (!(pEntry->GetFlags() & SV_ENTRYFLAG_HAD_CHILDREN)) &&
+                            pImp->GetDontKnowNodeBmp().GetSizePixel().Width()
+                        )
+                            aControlValue.setTristateVal( BUTTONVALUE_DONTKNOW ); //dont know
                         else
-                            aControlValue.setTristateVal( BUTTONVALUE_OFF );//collapsed node
+                            aControlValue.setTristateVal( BUTTONVALUE_OFF ); //collapsed node
                     }
 
                     bNativeOK = DrawNativeControl( CTRL_LISTNODE, PART_ENTIRE_CONTROL,
@@ -1816,7 +1794,6 @@ long SvTreeListBox::PaintEntry1(SvLBoxEntry* pEntry,long nLine,USHORT nTabFlags,
                 }
 
                 if( !bNativeOK) {
-                //non native
                     DrawImage( aPos, *pImg ,nStyle);
                 }
             }
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index 5dff290c20c1..544c36c18951 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -174,7 +174,7 @@ void lcl_insertDateTimeEntry(SvtExtendedMultiLineEdit_Impl* i_pEditWin,
             ::comphelper::getProcessServiceFactory(),
             Application::GetSettings().GetLocale() );
         String aDateStr = aLocaleWrapper.getDate( aToolsDT );
-        aDateStr += String( RTL_CONSTASCII_STRINGPARAM(", ") );
+        aDateStr += String( RTL_CONSTASCII_USTRINGPARAM(", ") );
         aDateStr += aLocaleWrapper.getTime( aToolsDT );
         i_pEditWin->InsertEntry( i_rName, aDateStr );
     }
@@ -362,8 +362,7 @@ SvtIconWindow_Impl::SvtIconWindow_Impl( Window* pParent ) :
 
     // insert the categories
     // "New Document"
-    sal_Bool bHiContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-    Image aImage( SvtResId( bHiContrast ? IMG_SVT_NEWDOC_HC : IMG_SVT_NEWDOC ) );
+    Image aImage( SvtResId( IMG_SVT_NEWDOC ) );
     nMaxTextLength = aImage.GetSizePixel().Width();
     String aEntryStr = String( SvtResId( STR_SVT_NEWDOC ) );
     SvxIconChoiceCtrlEntry* pEntry =
@@ -380,7 +379,7 @@ SvtIconWindow_Impl::SvtIconWindow_Impl( Window* pParent ) :
     {
         aEntryStr = String( SvtResId( STR_SVT_TEMPLATES ) );
         pEntry = aIconCtrl.InsertEntry(
-            aEntryStr, Image( SvtResId( bHiContrast ? IMG_SVT_TEMPLATES_HC : IMG_SVT_TEMPLATES ) ), ICON_POS_TEMPLATES );
+            aEntryStr, Image( SvtResId( IMG_SVT_TEMPLATES ) ), ICON_POS_TEMPLATES );
         pEntry->SetUserData( new String( aTemplateRootURL ) );
         pEntry->SetQuickHelpText( String( SvtResId( STR_SVT_TEMPLATES_HELP ) ) );
         DBG_ASSERT( !pEntry->GetBoundRect().IsEmpty(), "empty rectangle" );
@@ -392,7 +391,7 @@ SvtIconWindow_Impl::SvtIconWindow_Impl( Window* pParent ) :
     // "My Documents"
     aEntryStr = String( SvtResId( STR_SVT_MYDOCS ) );
     pEntry = aIconCtrl.InsertEntry(
-        aEntryStr, Image( SvtResId( bHiContrast ? IMG_SVT_MYDOCS_HC : IMG_SVT_MYDOCS ) ), ICON_POS_MYDOCS );
+        aEntryStr, Image( SvtResId( IMG_SVT_MYDOCS ) ), ICON_POS_MYDOCS );
     pEntry->SetUserData( new String( aMyDocumentsRootURL ) );
     pEntry->SetQuickHelpText( String( SvtResId( STR_SVT_MYDOCS_HELP ) ) );
     DBG_ASSERT( !pEntry->GetBoundRect().IsEmpty(), "empty rectangle" );
@@ -403,7 +402,7 @@ SvtIconWindow_Impl::SvtIconWindow_Impl( Window* pParent ) :
     // "Samples"
     aEntryStr = String( SvtResId( STR_SVT_SAMPLES ) );
     pEntry = aIconCtrl.InsertEntry(
-        aEntryStr, Image( SvtResId( bHiContrast ? IMG_SVT_SAMPLES_HC : IMG_SVT_SAMPLES ) ), ICON_POS_SAMPLES );
+        aEntryStr, Image( SvtResId( IMG_SVT_SAMPLES ) ), ICON_POS_SAMPLES );
     pEntry->SetUserData( new String( aSamplesFolderRootURL ) );
     pEntry->SetQuickHelpText( String( SvtResId( STR_SVT_SAMPLES_HELP ) ) );
     DBG_ASSERT( !pEntry->GetBoundRect().IsEmpty(), "empty rectangle" );
@@ -569,20 +568,18 @@ ULONG SvtIconWindow_Impl::GetRootPos( const String& rURL ) const
     return nPos;
 }
 
-void SvtIconWindow_Impl::UpdateIcons( sal_Bool _bHiContrast )
+void SvtIconWindow_Impl::UpdateIcons()
 {
     aIconCtrl.GetEntry( ICON_POS_NEWDOC )->SetImage(
-        Image( SvtResId( _bHiContrast ? IMG_SVT_NEWDOC_HC : IMG_SVT_NEWDOC ) ) );
+        Image( SvtResId( IMG_SVT_NEWDOC ) ) );
     aIconCtrl.GetEntry( ICON_POS_TEMPLATES )->SetImage(
-        Image( SvtResId( _bHiContrast ? IMG_SVT_TEMPLATES_HC : IMG_SVT_TEMPLATES ) ) );
+        Image( SvtResId( IMG_SVT_TEMPLATES ) ) );
     aIconCtrl.GetEntry( ICON_POS_MYDOCS )->SetImage(
-        Image( SvtResId( _bHiContrast ? IMG_SVT_MYDOCS_HC : IMG_SVT_MYDOCS ) ) );
+        Image( SvtResId( IMG_SVT_MYDOCS ) ) );
     aIconCtrl.GetEntry( ICON_POS_SAMPLES )->SetImage(
-        Image( SvtResId( _bHiContrast ? IMG_SVT_SAMPLES_HC : IMG_SVT_SAMPLES ) ) );
+        Image( SvtResId( IMG_SVT_SAMPLES ) ) );
 }
-/* -----------------27.11.2002 16:58-----------------
- *
- * --------------------------------------------------*/
+
 void SvtIconWindow_Impl::SelectFolder(sal_Int32 nFolderPosition)
 {
     SvxIconChoiceCtrlEntry* pEntry = aIconCtrl.GetEntry( nFolderPosition );
@@ -900,9 +897,9 @@ void SvtFrameWindow_Impl::ShowDocInfo( const String& rURL )
     try
     {
         uno::Reference < task::XInteractionHandler > xInteractionHandler( ::comphelper::getProcessServiceFactory()->createInstance(
-            ::rtl::OUString::createFromAscii("com.sun.star.task.InteractionHandler") ), uno::UNO_QUERY );
+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.InteractionHandler" )) ), uno::UNO_QUERY );
         uno::Sequence < beans::PropertyValue> aProps(1);
-        aProps[0].Name = ::rtl::OUString::createFromAscii("InteractionHandler");
+        aProps[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ));
         aProps[0].Value <<= xInteractionHandler;
         m_xDocProps->loadFromMedium( rURL, aProps );
         pEditWin->fill( m_xDocProps, rURL );
@@ -950,7 +947,7 @@ void SvtFrameWindow_Impl::OpenFile( const String& rURL, sal_Bool bPreview, sal_B
         else
         {
             // can be removed if the database application change its URL
-            String sServiceScheme( RTL_CONSTASCII_STRINGPARAM( "service:" ) );
+            String sServiceScheme( RTL_CONSTASCII_USTRINGPARAM( "service:" ) );
             if ( rURL.Match( sServiceScheme ) != sServiceScheme.Len() )
                 // service URL has no default target
                 aTarget = ASCII_STR("_default");
@@ -983,8 +980,8 @@ void SvtFrameWindow_Impl::OpenFile( const String& rURL, sal_Bool bPreview, sal_B
                         aArgs[2].Name = ASCII_STR("AsTemplate");    // prevents getting an empty URL with getURL()!
 
                         uno::Reference < task::XInteractionHandler > xInteractionHandler( ::comphelper::getProcessServiceFactory()->createInstance(
-                            ::rtl::OUString::createFromAscii("com.sun.star.task.InteractionHandler") ), uno::UNO_QUERY );
-                        aArgs[3].Name = ::rtl::OUString::createFromAscii("InteractionHandler");
+                            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.InteractionHandler" )) ), uno::UNO_QUERY );
+                        aArgs[3].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ));
                         aArgs[3].Value <<= xInteractionHandler;
 
                         b = sal_False;
@@ -1341,31 +1338,30 @@ void SvtTemplateWindow::InitToolBoxImages()
 {
     SvtMiscOptions aMiscOpt;
     BOOL bLarge = aMiscOpt.AreCurrentSymbolsLarge();
-    sal_Bool bHiContrast = aFileViewTB.GetSettings().GetStyleSettings().GetHighContrastMode();
 
     aFileViewTB.SetItemImage( TI_DOCTEMPLATE_BACK, Image( SvtResId(
-        bLarge ? bHiContrast ? IMG_SVT_DOCTEMPL_HC_BACK_LARGE : IMG_SVT_DOCTEMPLATE_BACK_LARGE
-               : bHiContrast ? IMG_SVT_DOCTEMPL_HC_BACK_SMALL : IMG_SVT_DOCTEMPLATE_BACK_SMALL ) ) );
+        bLarge ? IMG_SVT_DOCTEMPLATE_BACK_LARGE
+               : IMG_SVT_DOCTEMPLATE_BACK_SMALL ) ) );
     aFileViewTB.SetItemImage( TI_DOCTEMPLATE_PREV, Image( SvtResId(
-        bLarge ? bHiContrast ? IMG_SVT_DOCTEMPL_HC_PREV_LARGE : IMG_SVT_DOCTEMPLATE_PREV_LARGE
-               : bHiContrast ? IMG_SVT_DOCTEMPL_HC_PREV_SMALL : IMG_SVT_DOCTEMPLATE_PREV_SMALL ) ) );
+        bLarge ? IMG_SVT_DOCTEMPLATE_PREV_LARGE
+               : IMG_SVT_DOCTEMPLATE_PREV_SMALL ) ) );
     aFileViewTB.SetItemImage( TI_DOCTEMPLATE_PRINT, Image( SvtResId(
-        bLarge ? bHiContrast ? IMG_SVT_DOCTEMPL_HC_PRINT_LARGE : IMG_SVT_DOCTEMPLATE_PRINT_LARGE
-               : bHiContrast ? IMG_SVT_DOCTEMPL_HC_PRINT_SMALL : IMG_SVT_DOCTEMPLATE_PRINT_SMALL ) ) );
+        bLarge ? IMG_SVT_DOCTEMPLATE_PRINT_LARGE
+               : IMG_SVT_DOCTEMPLATE_PRINT_SMALL ) ) );
 
     aFrameWinTB.SetItemImage( TI_DOCTEMPLATE_DOCINFO, Image( SvtResId(
-        bLarge ? bHiContrast ? IMG_SVT_DOCTEMPL_HC_DOCINFO_LARGE : IMG_SVT_DOCTEMPLATE_DOCINFO_LARGE
-               : bHiContrast ? IMG_SVT_DOCTEMPL_HC_DOCINFO_SMALL : IMG_SVT_DOCTEMPLATE_DOCINFO_SMALL ) ) );
+        bLarge ? IMG_SVT_DOCTEMPLATE_DOCINFO_LARGE
+               : IMG_SVT_DOCTEMPLATE_DOCINFO_SMALL ) ) );
     aFrameWinTB.SetItemImage( TI_DOCTEMPLATE_PREVIEW, Image( SvtResId(
-        bLarge ? bHiContrast ? IMG_SVT_DOCTEMPL_HC_PREVIEW_LARGE : IMG_SVT_DOCTEMPLATE_PREVIEW_LARGE
-               : bHiContrast ? IMG_SVT_DOCTEMPL_HC_PREVIEW_SMALL : IMG_SVT_DOCTEMPLATE_PREVIEW_SMALL ) ) );
+        bLarge ? IMG_SVT_DOCTEMPLATE_PREVIEW_LARGE
+               : IMG_SVT_DOCTEMPLATE_PREVIEW_SMALL ) ) );
 }
 
 // ------------------------------------------------------------------------
 
 void SvtTemplateWindow::UpdateIcons()
 {
-    pIconWin->UpdateIcons( aFileViewTB.GetSettings().GetStyleSettings().GetHighContrastMode() );
+    pIconWin->UpdateIcons();
 }
 
 // ------------------------------------------------------------------------
@@ -1627,9 +1623,6 @@ void SvtTemplateWindow::WriteViewSettings()
     SvtViewOptions aViewSettings( E_DIALOG, VIEWSETTING_NEWFROMTEMPLATE );
     aViewSettings.SetUserData( aSettings );
 }
-/* -----------------27.11.2002 17:20-----------------
- *
- * --------------------------------------------------*/
 
 void SvtTemplateWindow::SelectFolder(sal_Int32 nFolderPosition)
 {
@@ -1741,7 +1734,7 @@ void SvtDocumentTemplateDialog::InitImpl( )
     if ( !bHideLink )
          {
     aMoreTemplatesLink.SetURL( String(
-        RTL_CONSTASCII_STRINGPARAM( "http://templates.libreoffice.org/" ) ) );
+        RTL_CONSTASCII_USTRINGPARAM( "http://templates.libreoffice.org/" ) ) );
     aMoreTemplatesLink.SetClickHdl( LINK( this, SvtDocumentTemplateDialog, OpenLinkHdl_Impl ) );
     }
     else
@@ -2012,9 +2005,6 @@ IMPL_LINK ( SvtDocumentTemplateDialog, OpenLinkHdl_Impl, svt::FixedHyperlink*, E
     return 0;
 }
 
-/* -----------------27.11.2002 16:54-----------------
- *
- * --------------------------------------------------*/
 void SvtDocumentTemplateDialog::SelectTemplateFolder()
 {
     pImpl->pWin->SelectFolder(ICON_POS_TEMPLATES);
diff --git a/svtools/source/contnr/templwin.hxx b/svtools/source/contnr/templwin.hxx
index aa2766fbe104..5ad2bba38c51 100644
--- a/svtools/source/contnr/templwin.hxx
+++ b/svtools/source/contnr/templwin.hxx
@@ -102,7 +102,7 @@ public:
     long                CalcHeight() const;
     sal_Bool            IsRootURL( const String& rURL ) const;
     ULONG               GetRootPos( const String& rURL ) const;
-    void                UpdateIcons( sal_Bool _bHiContrast );
+    void                UpdateIcons();
 
     inline sal_Bool         ProcessKeyEvent( const KeyEvent& rKEvt );
 
diff --git a/svtools/source/contnr/templwin.src b/svtools/source/contnr/templwin.src
index 048d052c18d8..162202408437 100644
--- a/svtools/source/contnr/templwin.src
+++ b/svtools/source/contnr/templwin.src
@@ -48,13 +48,7 @@ String STR_SVT_NEWDOC
 
 Image IMG_SVT_NEWDOC
 {
-    ImageBitmap = Bitmap { File = "new_doc.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
-
-Image IMG_SVT_NEWDOC_HC
-{
-    ImageBitmap = Bitmap { File = "new_doc_h.bmp" ; };
+    ImageBitmap = Bitmap { File = "new_doc.png" ; };
     MaskColor = MASK_COL_MAGENTA
 };
 
@@ -65,13 +59,7 @@ String STR_SVT_MYDOCS
 
 Image IMG_SVT_MYDOCS
 {
-    ImageBitmap = Bitmap { File = "my_docs.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
-
-Image IMG_SVT_MYDOCS_HC
-{
-    ImageBitmap = Bitmap { File = "my_docs_h.bmp" ; };
+    ImageBitmap = Bitmap { File = "my_docs.png" ; };
     MaskColor = MASK_COL_MAGENTA
 };
 
@@ -82,13 +70,7 @@ String STR_SVT_TEMPLATES
 
 Image IMG_SVT_TEMPLATES
 {
-    ImageBitmap = Bitmap { File = "template.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
-
-Image IMG_SVT_TEMPLATES_HC
-{
-    ImageBitmap = Bitmap { File = "template_h.bmp" ; };
+    ImageBitmap = Bitmap { File = "template.png" ; };
     MaskColor = MASK_COL_MAGENTA
 };
 
@@ -99,13 +81,7 @@ String STR_SVT_SAMPLES
 
 Image IMG_SVT_SAMPLES
 {
-    ImageBitmap = Bitmap { File = "samples.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
-
-Image IMG_SVT_SAMPLES_HC
-{
-    ImageBitmap = Bitmap { File = "samples_h.bmp" ; };
+    ImageBitmap = Bitmap { File = "samples.png" ; };
     MaskColor = MASK_COL_MAGENTA
 };
 
@@ -142,62 +118,32 @@ ToolBox TB_SVT_FILEVIEW
 
 Image IMG_SVT_DOCTEMPLATE_BACK_SMALL
 {
-    ImageBitmap = Bitmap { File = "back_small.bmp" ; };
+    ImageBitmap = Bitmap { File = "back_small.png" ; };
     MaskColor = MASK_COL_MAGENTA
 };
 Image IMG_SVT_DOCTEMPLATE_BACK_LARGE
 {
-    ImageBitmap = Bitmap { File = "back_large.bmp" ; };
+    ImageBitmap = Bitmap { File = "back_large.png" ; };
     MaskColor = MASK_COL_MAGENTA
 };
 Image IMG_SVT_DOCTEMPLATE_PREV_SMALL
 {
-    ImageBitmap = Bitmap { File = "up_small.bmp" ; };
+    ImageBitmap = Bitmap { File = "up_small.png" ; };
     MaskColor = MASK_COL_MAGENTA
 };
 Image IMG_SVT_DOCTEMPLATE_PREV_LARGE
 {
-    ImageBitmap = Bitmap { File = "up_large.bmp" ; };
+    ImageBitmap = Bitmap { File = "up_large.png" ; };
     MaskColor = MASK_COL_MAGENTA
 };
 Image IMG_SVT_DOCTEMPLATE_PRINT_SMALL
 {
-    ImageBitmap = Bitmap { File = "sc05509.bmp" ; };
+    ImageBitmap = Bitmap { File = "sc05509.png" ; };
     MaskColor = MASK_COL_MAGENTA
 };
 Image IMG_SVT_DOCTEMPLATE_PRINT_LARGE
 {
-    ImageBitmap = Bitmap { File = "lc05509.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
-Image IMG_SVT_DOCTEMPL_HC_BACK_SMALL
-{
-    ImageBitmap = Bitmap { File = "back_small_h.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
-Image IMG_SVT_DOCTEMPL_HC_BACK_LARGE
-{
-    ImageBitmap = Bitmap { File = "back_large_h.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
-Image IMG_SVT_DOCTEMPL_HC_PREV_SMALL
-{
-    ImageBitmap = Bitmap { File = "up_small_h.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
-Image IMG_SVT_DOCTEMPL_HC_PREV_LARGE
-{
-    ImageBitmap = Bitmap { File = "up_large_h.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
-Image IMG_SVT_DOCTEMPL_HC_PRINT_SMALL
-{
-    ImageBitmap = Bitmap { File = "sch05509.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
-Image IMG_SVT_DOCTEMPL_HC_PRINT_LARGE
-{
-    ImageBitmap = Bitmap { File = "lch05509.bmp" ; };
+    ImageBitmap = Bitmap { File = "lc05509.png" ; };
     MaskColor = MASK_COL_MAGENTA
 };
 
@@ -228,42 +174,22 @@ ToolBox TB_SVT_FRAMEWIN
 
 Image IMG_SVT_DOCTEMPLATE_DOCINFO_SMALL
 {
-    ImageBitmap = Bitmap { File = "info_small.bmp" ; };
+    ImageBitmap = Bitmap { File = "info_small.png" ; };
     MaskColor = MASK_COL_MAGENTA
 };
 Image IMG_SVT_DOCTEMPLATE_DOCINFO_LARGE
 {
-    ImageBitmap = Bitmap { File = "info_large.bmp" ; };
+    ImageBitmap = Bitmap { File = "info_large.png" ; };
     MaskColor = MASK_COL_MAGENTA
 };
 Image IMG_SVT_DOCTEMPLATE_PREVIEW_SMALL
 {
-    ImageBitmap = Bitmap { File = "preview_small.bmp" ; };
+    ImageBitmap = Bitmap { File = "preview_small.png" ; };
     MaskColor = MASK_COL_MAGENTA
 };
 Image IMG_SVT_DOCTEMPLATE_PREVIEW_LARGE
 {
-    ImageBitmap = Bitmap { File = "preview_large.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
-Image IMG_SVT_DOCTEMPL_HC_DOCINFO_SMALL
-{
-    ImageBitmap = Bitmap { File = "info_small_h.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
-Image IMG_SVT_DOCTEMPL_HC_DOCINFO_LARGE
-{
-    ImageBitmap = Bitmap { File = "info_large_h.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
-Image IMG_SVT_DOCTEMPL_HC_PREVIEW_SMALL
-{
-    ImageBitmap = Bitmap { File = "preview_small_h.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
-Image IMG_SVT_DOCTEMPL_HC_PREVIEW_LARGE
-{
-    ImageBitmap = Bitmap { File = "preview_large_h.bmp" ; };
+    ImageBitmap = Bitmap { File = "preview_large.png" ; };
     MaskColor = MASK_COL_MAGENTA
 };
 
@@ -353,24 +279,3 @@ String STR_SVT_SAMPLES_HELP
 {
     Text [ en-US ] = "Contains a selection of sample letters, reports and other documents";
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svtools/source/control/calendar.src b/svtools/source/control/calendar.src
index 4dd31765a5c1..f9d0e676f0cb 100755
--- a/svtools/source/control/calendar.src
+++ b/svtools/source/control/calendar.src
@@ -42,33 +42,3 @@ String STR_SVT_CALENDAR_NONE
 {
     Text [ en-US ] = "None" ;
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 0dce36d4a5d8..44d6971b8e85 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -762,11 +762,9 @@ void FontNameBox::DataChanged( const DataChangedEvent& rDCEvt )
 
 void FontNameBox::InitBitmaps( void )
 {
-    BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
-
-    maImagePrinterFont = Image( SvtResId( bHC? RID_IMG_PRINTERFONT_HC : RID_IMG_PRINTERFONT ) );
-    maImageBitmapFont = Image( SvtResId( bHC? RID_IMG_BITMAPFONT_HC : RID_IMG_BITMAPFONT ) );
-    maImageScalableFont = Image( SvtResId( bHC? RID_IMG_SCALABLEFONT_HC : RID_IMG_SCALABLEFONT ) );
+    maImagePrinterFont = Image( SvtResId( RID_IMG_PRINTERFONT ) );
+    maImageBitmapFont = Image( SvtResId( RID_IMG_BITMAPFONT ) );
+    maImageScalableFont = Image( SvtResId( RID_IMG_SCALABLEFONT ) );
 }
 
 // -------------------------------------------------------------------
diff --git a/svtools/source/control/ctrlbox.src b/svtools/source/control/ctrlbox.src
index 95440c905d89..2bb6c8cc4df8 100755
--- a/svtools/source/control/ctrlbox.src
+++ b/svtools/source/control/ctrlbox.src
@@ -33,37 +33,19 @@
 
 IMAGE RID_IMG_SCALABLEFONT
 {
-    ImageBitmap = Bitmap { File = "scalfont.bmp" ; };
-    MaskColor = IMAGE_STDBTN_COLOR ;
-};
-
-IMAGE RID_IMG_SCALABLEFONT_HC
-{
-    ImageBitmap = Bitmap { File = "scalfont_h.bmp" ; };
+    ImageBitmap = Bitmap { File = "scalfont.png" ; };
     MaskColor = IMAGE_STDBTN_COLOR ;
 };
 
 IMAGE RID_IMG_PRINTERFONT
 {
-    ImageBitmap = Bitmap { File = "prnfont.bmp" ; };
-    MaskColor = IMAGE_STDBTN_COLOR ;
-};
-
-IMAGE RID_IMG_PRINTERFONT_HC
-{
-    ImageBitmap = Bitmap { File = "prnfont_h.bmp" ; };
+    ImageBitmap = Bitmap { File = "prnfont.png" ; };
     MaskColor = IMAGE_STDBTN_COLOR ;
 };
 
 IMAGE RID_IMG_BITMAPFONT
 {
-    ImageBitmap = Bitmap { File = "bmpfont.bmp" ; };
-    MaskColor = IMAGE_STDBTN_COLOR ;
-};
-
-IMAGE RID_IMG_BITMAPFONT_HC
-{
-    ImageBitmap = Bitmap { File = "bmpfont_h.bmp" ; };
+    ImageBitmap = Bitmap { File = "bmpfont.png" ; };
     MaskColor = IMAGE_STDBTN_COLOR ;
 };
 
@@ -73,7 +55,7 @@ String STR_SVT_AUTOMATIC_COLOR
 };
 
 /*
- * ressources for CollatorRessource / CollatorRessourceData resp.
+ * resources for CollatorRessource / CollatorRessourceData resp.
  */
 
 String STR_SVT_COLLATE_ALPHANUMERIC
@@ -201,32 +183,3 @@ String STR_SVT_INDEXENTRY_PHONETIC_LC
 {
     Text [ en-US ] = "Phonetic (alphanumeric last, grouped by consonants)";
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index 3e5d3e16cc39..8a0616507224 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -123,8 +123,6 @@ private:
                             ImplFontListNameInfo( const XubString& rSearchName ) :
                                 maSearchName( rSearchName )
                             {}
-
-    const XubString&        GetSearchName() const { return maSearchName; }
 };
 
 // =======================================================================
diff --git a/svtools/source/control/ctrltool.src b/svtools/source/control/ctrltool.src
index 72420af4908e..1cf580bd4309 100755
--- a/svtools/source/control/ctrltool.src
+++ b/svtools/source/control/ctrltool.src
@@ -66,18 +66,6 @@ String STR_SVT_STYLE_BLACK_ITALIC
     Text [ en-US ] = "Black Italic" ;
 };
 
-/*
-Finnische Texte:
-    "Light",
-    "Light Kursivoitu",
-    "Normaali",
-    "Kursivoitu",
-    "Lihavoitu",
-    "Lihavoitu Kursivoitu",
-    "Black",
-    "Black Kursivoitu"
-*/
-
 String STR_SVT_FONTMAP_BOTH
 {
     Text [ en-US ] = "The same font will be used on both your printer and your screen." ;
@@ -107,38 +95,3 @@ String STR_SVT_FONTMAP_NOTAVAILABLE
 {
     Text [ en-US ] = "This font has not been installed. The closest available font will be used.";
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svtools/source/control/filectrl.src b/svtools/source/control/filectrl.src
index dc8bbb5905d6..de6cb8409ff4 100644
--- a/svtools/source/control/filectrl.src
+++ b/svtools/source/control/filectrl.src
@@ -30,29 +30,3 @@ String STR_FILECTRL_BUTTONTEXT
 {
     Text [ en-US ] = "Browse..." ;
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svtools/source/control/filectrl2.cxx b/svtools/source/control/filectrl2.cxx
index a45014d7d13e..83fc04030ea6 100644
--- a/svtools/source/control/filectrl2.cxx
+++ b/svtools/source/control/filectrl2.cxx
@@ -49,7 +49,7 @@ void FileControl::ImplBrowseFile( )
     {
         XubString aNewText;
 
-        const ::rtl::OUString sServiceName = ::rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.FilePicker" );
+        const ::rtl::OUString sServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ));
 
         Reference< XMultiServiceFactory > xMSF = vcl::unohelper::GetMultiServiceFactory();
         Reference < dialogs::XFilePicker > xFilePicker( xMSF->createInstance( sServiceName ), UNO_QUERY );
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index 8a2c4767794a..7755367bf1f9 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -294,7 +294,7 @@ namespace validation
             return sal_True;
 
         // normalize the string
-        String sNormalized( RTL_CONSTASCII_STRINGPARAM( "_") );
+        String sNormalized( RTL_CONSTASCII_USTRINGPARAM("_") );
         sNormalized.Append( _rText );
         sNormalized.AppendAscii( "_" );
 
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 2a3153109eed..a7583c6634af 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -1196,7 +1196,7 @@ String SvtURLBox::GetURL()
         bool bSlash = aObj.hasFinalSlash();
         {
             static const rtl::OUString aPropName(
-                rtl::OUString::createFromAscii("CasePreservingURL"));
+                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CasePreservingURL" )));
 
             rtl::OUString aFileURL;
 
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index 55677bb15e67..90952d7c0ce4 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -34,9 +34,7 @@
 #define _STRING_HXX
 #endif
 
-#ifndef __SGI_STL_VECTOR
 #include <vector>
-#endif
 
 #include <algorithm>
 #include <vcl/bitmap.hxx>
@@ -833,7 +831,7 @@ namespace svt
 
         if ( mpID )
         {
-            ::rtl::OUString aIDText = ::rtl::OUString::valueOf( (sal_Int32)( _nIndex + 1 ) ) +  ::rtl::OUString::createFromAscii( "." );
+            ::rtl::OUString aIDText = ::rtl::OUString::valueOf( (sal_Int32)( _nIndex + 1 ) ) +  ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "." ));
              mpID->SetText( aIDText );
         }
 
@@ -931,7 +929,7 @@ namespace svt
     {
         // calculate widths
         long nIDWidth = mpID->GetTextWidth( mpID->GetText() );
-        long nMaxIDWidth = mpID->GetTextWidth( ::rtl::OUString::createFromAscii( "100." ) );
+        long nMaxIDWidth = mpID->GetTextWidth( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "100." )) );
         nIDWidth = ::std::min( nIDWidth, nMaxIDWidth );
 
         // check how many space the description would need
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 43cdf1132c43..93f49cd4fccb 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -3199,9 +3199,7 @@ void Ruler::DrawTab( OutputDevice* pDevice, const Point& rPos, USHORT nStyle )
     ImplDrawRulerTab( pDevice, aPos, nTabStyle, nStyle  );
     pDevice->Pop();
 }
-/* -----------------16.10.2002 15:17-----------------
- *
- * --------------------------------------------------*/
+
 void Ruler::SetTextRTL(BOOL bRTL)
 {
     if(mpData->bTextRTL != bRTL)
diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx
index adc92f75e719..f311ddf67612 100644
--- a/svtools/source/control/scriptedtext.cxx
+++ b/svtools/source/control/scriptedtext.cxx
@@ -30,9 +30,7 @@
 #include "precompiled_svtools.hxx"
 #include "scriptedtext.hxx"
 
-#ifndef __SGI_STL_VECTOR
 #include <vector>
-#endif
 #include <rtl/ustring.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/font.hxx>
diff --git a/svtools/source/control/svxbox.cxx b/svtools/source/control/svxbox.cxx
index 5dbf505d4946..f3404e80a4d8 100644
--- a/svtools/source/control/svxbox.cxx
+++ b/svtools/source/control/svxbox.cxx
@@ -66,10 +66,6 @@ SvxBoxEntry::SvxBoxEntry(const SvxBoxEntry& rOld) :
 {
 }
 
-/*--------------------------------------------------------------------
-     Beschreibung:
- --------------------------------------------------------------------*/
-
 SvxListBox::SvxListBox(Window* pParent, WinBits nBits) :
     ListBox(pParent, nBits)
 {
diff --git a/svtools/source/dialogs/addresstemplate.src b/svtools/source/dialogs/addresstemplate.src
index 0652dfb9d0f5..52a663f5b3ae 100644
--- a/svtools/source/dialogs/addresstemplate.src
+++ b/svtools/source/dialogs/addresstemplate.src
@@ -25,15 +25,9 @@
  *
  ************************************************************************/
 
-#ifndef _SVTOOLS_HRC
 #include <svtools/svtools.hrc>
-#endif
-#ifndef _SVT_ADDRESSTEMPLATE_HRC_
 #include "addresstemplate.hrc"
-#endif
-#ifndef _SVT_CONTROLDIMS_HRC_
 #include "controldims.hrc"
-#endif
 
 #define FIELD_ROW_HEIGHT    17
 
diff --git a/svtools/source/dialogs/colrdlg.src b/svtools/source/dialogs/colrdlg.src
index 55517299c057..34df3c11eeaa 100644
--- a/svtools/source/dialogs/colrdlg.src
+++ b/svtools/source/dialogs/colrdlg.src
@@ -274,35 +274,3 @@ ModalDialog DLG_COLOR
         TabStop = TRUE ;
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svtools/source/dialogs/filedlg2.src b/svtools/source/dialogs/filedlg2.src
index 977a0d6f430b..47277de88a52 100644
--- a/svtools/source/dialogs/filedlg2.src
+++ b/svtools/source/dialogs/filedlg2.src
@@ -86,41 +86,3 @@ String STR_FILEDLG_ASKNEWDIR
 {
     Text [ en-US ] = "Do you want the directory %s to be created ?" ;
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svtools/source/dialogs/formats.src b/svtools/source/dialogs/formats.src
index f8ce80f62f2f..7587eedd6b86 100644
--- a/svtools/source/dialogs/formats.src
+++ b/svtools/source/dialogs/formats.src
@@ -291,4 +291,3 @@ String STR_FORMAT_ID_HTML_NO_COMMENT
 {
     Text [ en-US ] = "HTML format without comments";
 };
-
diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx
index fba9d66cdf73..f2002ed27179 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -129,19 +129,17 @@ void SvObjectServerList::FillInsertObjects()
     uno::Reference< lang::XMultiServiceFactory > _globalMSFactory= comphelper::getProcessServiceFactory();
     if( _globalMSFactory.is())
     {
-        ::rtl::OUString sProviderService =
-        ::rtl::OUString::createFromAscii( "com.sun.star.configuration.ConfigurationProvider" );
+        ::rtl::OUString sProviderService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ));
         uno::Reference< lang::XMultiServiceFactory > sProviderMSFactory(
             _globalMSFactory->createInstance( sProviderService ), uno::UNO_QUERY );
 
         if( sProviderMSFactory.is())
         {
-            ::rtl::OUString sReaderService =
-                ::rtl::OUString::createFromAscii( "com.sun.star.configuration.ConfigurationAccess" );
+            ::rtl::OUString sReaderService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" ));
             uno::Sequence< uno::Any > aArguments( 1 );
             beans::PropertyValue aPathProp;
-            aPathProp.Name = ::rtl::OUString::createFromAscii( "nodepath" );
-            aPathProp.Value <<= ::rtl::OUString::createFromAscii( "/org.openoffice.Office.Embedding/ObjectNames");
+            aPathProp.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ));
+            aPathProp.Value <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Embedding/ObjectNames" ));
             aArguments[0] <<= aPathProp;
 
             uno::Reference< container::XNameAccess > xNameAccess(
@@ -183,8 +181,8 @@ void SvObjectServerList::FillInsertObjects()
                     {
                         ::rtl::OUString aUIName;
                         ::rtl::OUString aClassID;
-                        xEntry->getByName( ::rtl::OUString::createFromAscii("ObjectUIName") ) >>= aUIName;
-                        xEntry->getByName( ::rtl::OUString::createFromAscii("ClassID") ) >>= aClassID;
+                        xEntry->getByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ObjectUIName" )) ) >>= aUIName;
+                        xEntry->getByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ClassID" )) ) >>= aClassID;
 
                         if ( aUIName.getLength() )
                         {
diff --git a/svtools/source/dialogs/printdlg.cxx b/svtools/source/dialogs/printdlg.cxx
index 66105d262559..ebb75e0dc6cc 100644
--- a/svtools/source/dialogs/printdlg.cxx
+++ b/svtools/source/dialogs/printdlg.cxx
@@ -165,16 +165,8 @@ PrintDialog::~PrintDialog()
 
 void PrintDialog::ImplSetImages()
 {
-    if( ! GetSettings().GetStyleSettings().GetHighContrastMode() )
-    {
-        maImgCollate.SetModeImage( Image( SvtResId( RID_IMG_PRNDLG_COLLATE ) ), BMP_COLOR_NORMAL );
-        maImgNotCollate.SetModeImage( Image( SvtResId( RID_IMG_PRNDLG_NOCOLLATE ) ), BMP_COLOR_NORMAL );
-    }
-    else
-    {
-        maImgCollate.SetModeImage( Image( SvtResId( RID_IMG_PRNDLG_COLLATE_HC ) ), BMP_COLOR_HIGHCONTRAST );
-        maImgNotCollate.SetModeImage( Image( SvtResId( RID_IMG_PRNDLG_NOCOLLATE_HC ) ), BMP_COLOR_HIGHCONTRAST );
-    }
+    maImgCollate.SetModeImage(   Image( SvtResId( RID_IMG_PRNDLG_COLLATE   ) ) );
+    maImgNotCollate.SetModeImage(Image( SvtResId( RID_IMG_PRNDLG_NOCOLLATE ) ) );
 }
 
 // -----------------------------------------------------------------------
diff --git a/svtools/source/dialogs/printdlg.src b/svtools/source/dialogs/printdlg.src
index 405accc63344..6ce73d01aa7f 100644
--- a/svtools/source/dialogs/printdlg.src
+++ b/svtools/source/dialogs/printdlg.src
@@ -278,56 +278,12 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
 
 Image RID_IMG_PRNDLG_COLLATE
 {
-    ImageBitmap = Bitmap { File = "collate.bmp" ; };
+    ImageBitmap = Bitmap { File = "collate.png" ; };
     MaskColor = IMAGE_MAGENTA_MASK ;
 };
 
 Image RID_IMG_PRNDLG_NOCOLLATE
 {
-    ImageBitmap = Bitmap { File = "ncollate.bmp" ; };
+    ImageBitmap = Bitmap { File = "ncollate.png" ; };
     MaskColor = IMAGE_MAGENTA_MASK ;
 };
-
-Image RID_IMG_PRNDLG_COLLATE_HC
-{
-    ImageBitmap = Bitmap { File = "collate_h.bmp" ; };
-    MaskColor = IMAGE_MAGENTA_MASK ;
-};
-
-Image RID_IMG_PRNDLG_NOCOLLATE_HC
-{
-    ImageBitmap = Bitmap { File = "ncollate_h.bmp" ; };
-    MaskColor = IMAGE_MAGENTA_MASK ;
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svtools/source/dialogs/prnsetup.src b/svtools/source/dialogs/prnsetup.src
index 1443a35e0f39..8bb866c4e40e 100644
--- a/svtools/source/dialogs/prnsetup.src
+++ b/svtools/source/dialogs/prnsetup.src
@@ -241,38 +241,3 @@ ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG
         Size = MAP_APPFONT ( 50 , 14 ) ;
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svtools/source/dialogs/wizardmachine.src b/svtools/source/dialogs/wizardmachine.src
index 9c82ea30071f..8f6956684350 100644
--- a/svtools/source/dialogs/wizardmachine.src
+++ b/svtools/source/dialogs/wizardmachine.src
@@ -25,9 +25,7 @@
  *
  ************************************************************************/
 
-#ifndef _SVTOOLS_HRC
 #include <svtools/svtools.hrc>
-#endif
 
 String STR_WIZDLG_FINISH
 {
diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx
index 78467140c181..6fcc61dd467b 100644
--- a/svtools/source/edit/svmedit.cxx
+++ b/svtools/source/edit/svmedit.cxx
@@ -1648,9 +1648,7 @@ MultiLineEdit::GetComponentInterface(BOOL bCreate)
     }
     return xPeer;
 }
-/*-- 11.08.2004 11:29:23---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void MultiLineEdit::DisableSelectionOnFocus()
 {
     pImpSvMEdit->GetTextWindow()->DisableSelectionOnFocus();
diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx
index 9a3497303c83..ef7bc52bf777 100644
--- a/svtools/source/edit/texteng.cxx
+++ b/svtools/source/edit/texteng.cxx
@@ -705,7 +705,7 @@ uno::Reference < i18n::XExtendedInputSequenceChecker > TextEngine::GetInputSeque
 //    if ( !xISC.is() )
     {
         uno::Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
-        uno::Reference< uno::XInterface > xI = xMSF->createInstance( OUString::createFromAscii( "com.sun.star.i18n.InputSequenceChecker" ) );
+        uno::Reference< uno::XInterface > xI = xMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.InputSequenceChecker" )) );
         if ( xI.is() )
         {
             Any x = xI->queryInterface( ::getCppuType((const uno::Reference< i18n::XExtendedInputSequenceChecker >*)0) );
diff --git a/svtools/source/edit/textview.cxx b/svtools/source/edit/textview.cxx
index 5103e8362ee7..1d7b9ee9694e 100644
--- a/svtools/source/edit/textview.cxx
+++ b/svtools/source/edit/textview.cxx
@@ -156,9 +156,6 @@ sal_Bool TETextDataObject::isDataFlavorSupported( const datatransfer::DataFlavor
     return ( nT == SOT_FORMAT_STRING );
 }
 
-/*-- 24.06.2004 13:54:36---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 struct ImpTextView
 {
     TextEngine*         mpTextEngine;
diff --git a/svtools/source/edit/txtattr.cxx b/svtools/source/edit/txtattr.cxx
index 34fc88e3f7a6..57b4ade43379 100644
--- a/svtools/source/edit/txtattr.cxx
+++ b/svtools/source/edit/txtattr.cxx
@@ -156,42 +156,29 @@ int TextAttribHyperLink::operator==( const TextAttrib& rAttr ) const
                 ( maColor == ((const TextAttribHyperLink&)rAttr).maColor ) );
 }
 
-/*-- 24.06.2004 14:49:44---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 TextAttribProtect::TextAttribProtect() :
     TextAttrib( TEXTATTR_PROTECTED )
 {
 }
-/*-- 24.06.2004 14:49:44---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 TextAttribProtect::TextAttribProtect( const TextAttribProtect&) :
     TextAttrib( TEXTATTR_PROTECTED )
 {
 }
-/*-- 24.06.2004 14:49:44---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 TextAttribProtect::~TextAttribProtect()
 {
 }
-/*-- 24.06.2004 14:49:44---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void TextAttribProtect::SetFont( Font& ) const
 {
 }
-/*-- 24.06.2004 14:49:44---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 TextAttrib*     TextAttribProtect::Clone() const
 {
     return new TextAttribProtect();
 }
-/*-- 24.06.2004 14:49:45---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 int TextAttribProtect::operator==( const TextAttrib& rAttr ) const
 {
     return ( TextAttrib::operator==(rAttr ) );
diff --git a/svtools/source/filter.vcl/filter/FilterConfigCache.cxx b/svtools/source/filter.vcl/filter/FilterConfigCache.cxx
index 324b267eb7c4..3c26d8cad9d4 100644
--- a/svtools/source/filter.vcl/filter/FilterConfigCache.cxx
+++ b/svtools/source/filter.vcl/filter/FilterConfigCache.cxx
@@ -107,7 +107,7 @@ sal_Bool FilterConfigCache::FilterConfigCacheEntry::CreateFilterName( const OUSt
             if ( sFilterName.EqualsIgnoreCaseAscii( *pPtr ) )
                 bIsPixelFormat = sal_True;
         }
-        String aTemp( OUString::createFromAscii( SVLIBRARY( "?" ) ) );
+        String aTemp( OUString(RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "?" ) )) );
         xub_StrLen nIndex = aTemp.Search( (sal_Unicode)'?' );
         aTemp.Replace( nIndex, 1, sFilterName );
         sFilterName = aTemp;
@@ -151,7 +151,7 @@ Reference< XInterface > openConfig(const char* sPackage)
     {
         // get access to config API (not to file!)
         Reference< XMultiServiceFactory > xConfigProvider( xSMGR->createInstance(
-            OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")), UNO_QUERY);
+            OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ))), UNO_QUERY);
 
         if (xConfigProvider.is())
         {
@@ -159,16 +159,16 @@ Reference< XInterface > openConfig(const char* sPackage)
             PropertyValue   aParam    ;
 
             // define cfg path for open
-            aParam.Name = OUString::createFromAscii("nodepath");
+            aParam.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ));
             if (TYPEPKG.equalsIgnoreAsciiCaseAscii(sPackage))
-                aParam.Value <<= OUString::createFromAscii("/org.openoffice.TypeDetection.Types/Types");
+                aParam.Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.TypeDetection.Types/Types" ));
             if (FILTERPKG.equalsIgnoreAsciiCaseAscii(sPackage))
-                aParam.Value <<= OUString::createFromAscii("/org.openoffice.TypeDetection.GraphicFilter/Filters");
+                aParam.Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.TypeDetection.GraphicFilter/Filters" ));
             lParams[0] = makeAny(aParam);
 
             // get access to file
             xCfg = xConfigProvider->createInstanceWithArguments(
-                OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"), lParams);
+                OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" )), lParams);
         }
     }
     catch(const RuntimeException&)
diff --git a/svtools/source/filter.vcl/filter/dlgejpg.hrc b/svtools/source/filter.vcl/filter/dlgejpg.hrc
index 90a3c1d162be..fae40f4c3f6f 100644
--- a/svtools/source/filter.vcl/filter/dlgejpg.hrc
+++ b/svtools/source/filter.vcl/filter/dlgejpg.hrc
@@ -35,5 +35,3 @@
 #define GRP_COLORS 2
 #define RB_GRAY 1
 #define RB_RGB 2
-
-
diff --git a/svtools/source/filter.vcl/filter/dlgejpg.src b/svtools/source/filter.vcl/filter/dlgejpg.src
index fd224f22c409..0817f7cbf3c7 100644
--- a/svtools/source/filter.vcl/filter/dlgejpg.src
+++ b/svtools/source/filter.vcl/filter/dlgejpg.src
@@ -99,38 +99,3 @@ ModalDialog DLG_EXPORT_JPG
         Text [ en-US ] = "True Colors" ;
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svtools/source/filter.vcl/filter/dlgepng.src b/svtools/source/filter.vcl/filter/dlgepng.src
index aa778842dc48..14c53ad8374b 100644
--- a/svtools/source/filter.vcl/filter/dlgepng.src
+++ b/svtools/source/filter.vcl/filter/dlgepng.src
@@ -87,33 +87,3 @@ ModalDialog DLG_EXPORT_EPNG
         Text [ en-US ] = "~Interlaced" ;
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svtools/source/filter.vcl/filter/dlgexpor.src b/svtools/source/filter.vcl/filter/dlgexpor.src
index 7573b394d72f..f1e63268fb22 100644
--- a/svtools/source/filter.vcl/filter/dlgexpor.src
+++ b/svtools/source/filter.vcl/filter/dlgexpor.src
@@ -274,42 +274,3 @@ ModalDialog DLG_EXPORT_VEC
         TabStop = TRUE ;
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svtools/source/filter.vcl/filter/filter.cxx b/svtools/source/filter.vcl/filter/filter.cxx
index 879bf684b5a6..917e50ee8ee0 100644
--- a/svtools/source/filter.vcl/filter/filter.cxx
+++ b/svtools/source/filter.vcl/filter/filter.cxx
@@ -172,7 +172,7 @@ void ImplDirEntryHelper::Kill( const String& rMainUrl )
         ::ucbhelper::Content aCnt( rMainUrl,
                              ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() );
 
-        aCnt.executeCommand( ::rtl::OUString::createFromAscii( "delete" ),
+        aCnt.executeCommand( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" )),
                              ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) );
     }
     catch( ::com::sun::star::ucb::CommandAbortedException& )
@@ -1921,10 +1921,10 @@ USHORT GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& rPat
                     if( xMgr.is() )
                     {
                         ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > xSaxWriter( xMgr->createInstance(
-                            ::rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Writer" ) ), ::com::sun::star::uno::UNO_QUERY );
+                            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Writer" )) ), ::com::sun::star::uno::UNO_QUERY );
 
                         ::com::sun::star::uno::Reference< ::com::sun::star::svg::XSVGWriter > xSVGWriter( xMgr->createInstance(
-                            ::rtl::OUString::createFromAscii( "com.sun.star.svg.SVGWriter" ) ), ::com::sun::star::uno::UNO_QUERY );
+                            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.svg.SVGWriter" )) ), ::com::sun::star::uno::UNO_QUERY );
 
                         if( xSaxWriter.is() && xSVGWriter.is() )
                         {
@@ -2033,7 +2033,7 @@ BOOL GraphicFilter::DoExportDialog( Window*, USHORT nFormat, FieldUnit )
         xSMgr( ::comphelper::getProcessServiceFactory() );
 
     uno::Reference< com::sun::star::uno::XInterface > xFilterOptionsDialog
-        ( xSMgr->createInstance( rtl::OUString::createFromAscii( "com.sun.star.svtools.SvFilterOptionsDialog" ) ),
+        ( xSMgr->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.svtools.SvFilterOptionsDialog" )) ),
             com::sun::star::uno::UNO_QUERY );
     if ( xFilterOptionsDialog.is() )
     {
diff --git a/svtools/source/filter.vcl/filter/strings.src b/svtools/source/filter.vcl/filter/strings.src
index 60e628ee0b5c..3087a70f1316 100644
--- a/svtools/source/filter.vcl/filter/strings.src
+++ b/svtools/source/filter.vcl/filter/strings.src
@@ -56,30 +56,3 @@ String KEY_RLE_CODING
 {
     Text = "RLE_Coding" ;
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svtools/source/filter.vcl/ixbm/xbmread.cxx b/svtools/source/filter.vcl/ixbm/xbmread.cxx
index 6d0c34cc5c56..6adb1e4a621b 100644
--- a/svtools/source/filter.vcl/ixbm/xbmread.cxx
+++ b/svtools/source/filter.vcl/ixbm/xbmread.cxx
@@ -287,7 +287,6 @@ ReadState XBMReader::ReadXBM( Graphic& rGraphic )
     if ( rIStm.GetError() != ERRCODE_IO_PENDING )
     {
         ByteString  aLine;
-        int         nValue;
 
         rIStm.Seek( nLastPos );
         bStatus = FALSE;
@@ -295,6 +294,7 @@ ReadState XBMReader::ReadXBM( Graphic& rGraphic )
 
         if ( bStatus )
         {
+            int nValue;
             if ( ( nValue = (int) ParseDefine( aLine.GetBuffer() ) ) > 0 )
             {
                 nWidth = nValue;
diff --git a/svtools/source/filter.vcl/wmf/winwmf.cxx b/svtools/source/filter.vcl/wmf/winwmf.cxx
index 1a67a97f17c2..8a3a6897cb22 100644
--- a/svtools/source/filter.vcl/wmf/winwmf.cxx
+++ b/svtools/source/filter.vcl/wmf/winwmf.cxx
@@ -1211,10 +1211,6 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt
     rPlaceableBound.Right()  = (sal_Int32)0x80000000;
     rPlaceableBound.Bottom() = (sal_Int32)0x80000000;
 
-    sal_Int16 nMapMode = MM_ANISOTROPIC;
-
-    sal_uInt16 nFunction;
-    sal_uInt32 nRSize;
     sal_uInt32 nPos = pStm->Tell();
     sal_uInt32 nEnd = pStm->Seek( STREAM_SEEK_TO_END );
 
@@ -1222,6 +1218,10 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt
 
     if( nEnd - nPos )
     {
+        sal_Int16 nMapMode = MM_ANISOTROPIC;
+        sal_uInt16 nFunction;
+        sal_uInt32 nRSize;
+
         while( bRet )
         {
             *pStm >> nRSize >> nFunction;
diff --git a/svtools/source/filter.vcl/wmf/wmfwr.cxx b/svtools/source/filter.vcl/wmf/wmfwr.cxx
index b1d08c091be8..269fbb4fe877 100644
--- a/svtools/source/filter.vcl/wmf/wmfwr.cxx
+++ b/svtools/source/filter.vcl/wmf/wmfwr.cxx
@@ -841,13 +841,6 @@ void WMFWriter::WMFRecord_SelectObject(USHORT nObjectHandle)
 }
 
 
-void WMFWriter::WMFRecord_SetBkColor(const Color & rColor)
-{
-    WriteRecordHeader(0x00000005,W_META_SETBKCOLOR);
-    WriteColor(rColor);
-}
-
-
 void WMFWriter::WMFRecord_SetBkMode(BOOL bTransparent)
 {
     WriteRecordHeader(0x00000004,W_META_SETBKMODE);
diff --git a/svtools/source/filter.vcl/wmf/wmfwr.hxx b/svtools/source/filter.vcl/wmf/wmfwr.hxx
index 222550317784..22fe8efb2256 100644
--- a/svtools/source/filter.vcl/wmf/wmfwr.hxx
+++ b/svtools/source/filter.vcl/wmf/wmfwr.hxx
@@ -182,7 +182,6 @@ private:
     void WMFRecord_RoundRect(const Rectangle & rRect, long nHorzRound, long nVertRound);
     void WMFRecord_SaveDC();
     void WMFRecord_SelectObject(USHORT nObjectHandle);
-    void WMFRecord_SetBkColor(const Color & rColor);
     void WMFRecord_SetBkMode(BOOL bTransparent);
     void WMFRecord_SetStretchBltMode();
     void WMFRecord_SetPixel(const Point & rPoint, const Color & rColor);
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index 3c477f045fc3..c3929f5007d0 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -409,7 +409,7 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
                     }
 
                     if( !aMimeType.getLength() && ( mpGraphic->GetType() != GRAPHIC_NONE ) )
-                        aMimeType = ::rtl::OUString::createFromAscii( MIMETYPE_VCLGRAPHIC );
+                        aMimeType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_VCLGRAPHIC ));
                 }
                 else
                     aMimeType = maMimeType;
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index 6f3c02907144..9414b19a5d92 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -171,7 +171,6 @@ private:
     BOOL                mbSwappedAll;
 
     BOOL                ImplInit( const GraphicObject& rObj );
-    BOOL                ImplMatches( const GraphicObject& rObj ) const { return( GraphicID( rObj ) == maID ); }
     void                ImplFillSubstitute( Graphic& rSubstitute );
 
 public:
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index 22e790a5db55..303da056933e 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -1217,7 +1217,7 @@ SvStream& operator<<( SvStream& rOStm, const GraphicObject& rGraphicObj )
 
 GraphicObject GraphicObject::CreateGraphicObjectFromURL( const ::rtl::OUString &rURL )
 {
-    const String aURL( rURL ), aPrefix( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX) );
+    const String aURL( rURL ), aPrefix( RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX) );
     if( aURL.Search( aPrefix ) == 0 )
     {
         // graphic manager url
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx
index 8fe7739cf8cf..629d3202d962 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -1353,14 +1353,16 @@ BOOL GraphicManager::ImplCreateRotatedScaled( const BitmapEx& rBmpEx,
     // create horizontal mapping table
     for( nX = 0L, nTmpX = aNewBound.Left() + nStartX; nX < nDstW; nX++ )
     {
-        pCosX[ nX ] = FRound( fCosAngle * ( fTmp = nTmpX++ << 8 ) );
+        fTmp = nTmpX++ << 8;
+        pCosX[ nX ] = FRound( fCosAngle * fTmp );
         pSinX[ nX ] = FRound( fSinAngle * fTmp );
     }
 
     // create vertical mapping table
     for( nY = 0L, nTmpY = aNewBound.Top() + nStartY; nY < nDstH; nY++ )
     {
-        pCosY[ nY ] = FRound( fCosAngle * ( fTmp = nTmpY++ << 8 ) );
+        fTmp = nTmpY++ << 8;
+        pCosY[ nY ] = FRound( fCosAngle * fTmp );
         pSinY[ nY ] = FRound( fSinAngle * fTmp );
     }
 
diff --git a/svtools/source/hatchwindow/hatchwindowfactory.cxx b/svtools/source/hatchwindow/hatchwindowfactory.cxx
index c5076e8984c3..d0e9786fe99c 100644
--- a/svtools/source/hatchwindow/hatchwindowfactory.cxx
+++ b/svtools/source/hatchwindow/hatchwindowfactory.cxx
@@ -41,15 +41,15 @@ using namespace ::com::sun::star;
 uno::Sequence< ::rtl::OUString > SAL_CALL OHatchWindowFactory::impl_staticGetSupportedServiceNames()
 {
     uno::Sequence< ::rtl::OUString > aRet(2);
-    aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.embed.HatchWindowFactory");
-    aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.HatchWindowFactory");
+    aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.HatchWindowFactory" ));
+    aRet[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.embed.HatchWindowFactory" ));
     return aRet;
 }
 
 //-------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OHatchWindowFactory::impl_staticGetImplementationName()
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.HatchWindowFactory");
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.embed.HatchWindowFactory" ));
 }
 
 //-------------------------------------------------------------------------
diff --git a/svtools/source/inc/iodlg.hrc b/svtools/source/inc/iodlg.hrc
index e78e3fb687fe..b94d0dfe8f8d 100644
--- a/svtools/source/inc/iodlg.hrc
+++ b/svtools/source/inc/iodlg.hrc
@@ -28,9 +28,7 @@
 #ifndef _SVTOOLS_IODLGIMPL_HRC
 #define _SVTOOLS_IODLGIMPL_HRC
 
-#ifndef _SVTOOLS_HRC
 #include <svtools/svtools.hrc>
-#endif
 
 // ModalDialog DLG_SVT_EXPLORERFILE
 
diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index 7361893532d6..fdc7fb867542 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
@@ -62,7 +62,7 @@ public:
     void        CreateAnchor();
     void        DestroyAnchor();
     BOOL        SetCursorAtPoint( const Point& rPoint,
-                    BOOL bDontSelectAtCursor=FALSE );
+    BOOL        bDontSelectAtCursor=FALSE );
     BOOL        IsSelectionAtPoint( const Point& rPoint );
     void        DeselectAtPoint( const Point& rPoint );
     void        DeselectAll();
@@ -111,8 +111,6 @@ private:
 
     static Image*       s_pDefCollapsed;
     static Image*       s_pDefExpanded;
-    static Image*       s_pDefCollapsedHC;
-    static Image*       s_pDefExpandedHC;
     static oslInterlockedCount  s_nImageRefCount; /// When 0 all static images will be destroyed
 
     // Node Bitmaps
@@ -129,8 +127,6 @@ private:
 
     // all our images
     Image               m_aNodeAndEntryImages[ IT_IMAGE_COUNT ];
-    // plus the high contrast versions
-    Image               m_aNodeAndEntryImages_HC[ IT_IMAGE_COUNT ];
 
     // wg. kompat. hier
     Size                aOutputSize;
@@ -315,24 +311,22 @@ public:
     void                PaintDDCursor( SvLBoxEntry* );
 
     // Images
-    inline Image&       implGetImageLocation( const ImageType _eType, BmpColorMode _eMode );
-    inline Image&       implGetImageLocationWithFallback( const ImageType _eType, BmpColorMode _eMode ) const;
+    inline Image&       implGetImageLocation( const ImageType _eType );
 
-    inline void         SetExpandedNodeBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL );
-    inline void         SetCollapsedNodeBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL  );
-    inline void         SetDontKnowNodeBmp( const Image& rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    inline void         SetExpandedNodeBmp(  const Image& _rImg );
+    inline void         SetCollapsedNodeBmp( const Image& _rImg );
 
-    inline const Image& GetExpandedNodeBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
-    inline const Image& GetCollapsedNodeBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
-    inline const Image& GetDontKnowNodeBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const;
+    inline const Image& GetExpandedNodeBmp( );
+    inline const Image& GetCollapsedNodeBmp( );
+    inline const Image& GetDontKnowNodeBmp( );
 
-    inline void         SetDefaultEntryExpBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL );
-    inline void         SetDefaultEntryColBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL );
-    inline const Image& GetDefaultEntryExpBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL );
-    inline const Image& GetDefaultEntryColBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    inline void         SetDefaultEntryExpBmp( const Image& _rImg );
+    inline void         SetDefaultEntryColBmp( const Image& _rImg );
+    inline const Image& GetDefaultEntryExpBmp( );
+    inline const Image& GetDefaultEntryColBmp( );
 
-    static const Image& GetDefaultExpandedNodeImage( BmpColorMode _eMode = BMP_COLOR_NORMAL );
-    static const Image& GetDefaultCollapsedNodeImage( BmpColorMode _eMode = BMP_COLOR_NORMAL );
+    static const Image& GetDefaultExpandedNodeImage( );
+    static const Image& GetDefaultCollapsedNodeImage( );
 
     const Size&         GetOutputSize() const { return aOutputSize;}
     void                KeyUp( BOOL bPageUp, BOOL bNotifyScroll = TRUE );
@@ -371,76 +365,60 @@ public:
     bool                IsSelectable( const SvLBoxEntry* pEntry );
 };
 
-inline Image& SvImpLBox::implGetImageLocation( const ImageType _eType, BmpColorMode _eMode )
+inline Image& SvImpLBox::implGetImageLocation( const ImageType _eType )
 {
-    DBG_ASSERT( ( BMP_COLOR_HIGHCONTRAST == _eMode ) || ( BMP_COLOR_NORMAL == _eMode ),
-        "SvImpLBox::implGetImageLocation: invalid mode!" );
     DBG_ASSERT( ( _eType >= 0 ) && ( _eType < IT_IMAGE_COUNT ),
         "SvImpLBox::implGetImageLocation: invalid image index (will crash)!" );
 
-    Image* _pSet = ( BMP_COLOR_HIGHCONTRAST == _eMode ) ? m_aNodeAndEntryImages_HC : m_aNodeAndEntryImages;
+    Image* _pSet = m_aNodeAndEntryImages;
     return *( _pSet + (sal_Int32)_eType );
 }
 
-inline Image& SvImpLBox::implGetImageLocationWithFallback( const ImageType _eType, BmpColorMode _eMode ) const
+inline void SvImpLBox::SetExpandedNodeBmp( const Image& rImg )
 {
-    Image& rImage = const_cast< SvImpLBox* >( this )->implGetImageLocation( _eType, _eMode );
-    if ( !rImage )
-        // fallback to normal images in case the one for the special mode has not been set
-        rImage = const_cast< SvImpLBox* >( this )->implGetImageLocation( _eType, BMP_COLOR_NORMAL );
-    return rImage;
-}
-
-inline void SvImpLBox::SetDontKnowNodeBmp( const Image& rImg, BmpColorMode _eMode )
-{
-    implGetImageLocation( itNodeDontKnow, _eMode ) = rImg;
-}
-
-inline void SvImpLBox::SetExpandedNodeBmp( const Image& rImg, BmpColorMode _eMode )
-{
-    implGetImageLocation( itNodeExpanded, _eMode ) = rImg;
+    implGetImageLocation( itNodeExpanded ) = rImg;
     SetNodeBmpYOffset( rImg );
 }
 
-inline void SvImpLBox::SetCollapsedNodeBmp( const Image& rImg, BmpColorMode _eMode )
+inline void SvImpLBox::SetCollapsedNodeBmp( const Image& rImg )
 {
-    implGetImageLocation( itNodeCollapsed, _eMode ) = rImg;
+    implGetImageLocation( itNodeCollapsed ) = rImg;
     SetNodeBmpYOffset( rImg );
 }
 
-inline const Image& SvImpLBox::GetDontKnowNodeBmp( BmpColorMode _eMode ) const
+inline const Image& SvImpLBox::GetDontKnowNodeBmp( )
 {
-    return implGetImageLocationWithFallback( itNodeDontKnow, _eMode );
+    return implGetImageLocation( itNodeDontKnow );
 }
 
-inline const Image& SvImpLBox::GetExpandedNodeBmp( BmpColorMode _eMode ) const
+inline const Image& SvImpLBox::GetExpandedNodeBmp( )
 {
-    return implGetImageLocationWithFallback( itNodeExpanded, _eMode );
+    return implGetImageLocation( itNodeExpanded );
 }
 
-inline const Image& SvImpLBox::GetCollapsedNodeBmp( BmpColorMode _eMode ) const
+inline const Image& SvImpLBox::GetCollapsedNodeBmp( )
 {
-    return implGetImageLocationWithFallback( itNodeCollapsed, _eMode );
+    return implGetImageLocation( itNodeCollapsed );
 }
 
-inline void SvImpLBox::SetDefaultEntryExpBmp( const Image& _rImg, BmpColorMode _eMode )
+inline void SvImpLBox::SetDefaultEntryExpBmp( const Image& _rImg )
 {
-    implGetImageLocation( itEntryDefExpanded, _eMode ) = _rImg;
+    implGetImageLocation( itEntryDefExpanded ) = _rImg;
 }
 
-inline void SvImpLBox::SetDefaultEntryColBmp( const Image& _rImg, BmpColorMode _eMode )
+inline void SvImpLBox::SetDefaultEntryColBmp( const Image& _rImg )
 {
-    implGetImageLocation( itEntryDefCollapsed, _eMode ) = _rImg;
+    implGetImageLocation( itEntryDefCollapsed ) = _rImg;
 }
 
-inline const Image& SvImpLBox::GetDefaultEntryExpBmp( BmpColorMode _eMode )
+inline const Image& SvImpLBox::GetDefaultEntryExpBmp( )
 {
-    return implGetImageLocationWithFallback( itEntryDefExpanded, _eMode );
+    return implGetImageLocation( itEntryDefExpanded );
 }
 
-inline const Image& SvImpLBox::GetDefaultEntryColBmp( BmpColorMode _eMode )
+inline const Image& SvImpLBox::GetDefaultEntryColBmp( )
 {
-    return implGetImageLocationWithFallback( itEntryDefCollapsed, _eMode );
+    return implGetImageLocation( itEntryDefCollapsed );
 }
 
 inline Point SvImpLBox::GetEntryPosition( SvLBoxEntry* pEntry ) const
diff --git a/svtools/source/java/javaerror.src b/svtools/source/java/javaerror.src
index d5990c05a663..fb750968b798 100644
--- a/svtools/source/java/javaerror.src
+++ b/svtools/source/java/javaerror.src
@@ -89,5 +89,3 @@ String STR_ERROR_JVMCREATIONFAILED
 {
     Text[ en-US ] = "JRE is Defective" ;
 };
-
-
diff --git a/svtools/source/java/patchjavaerror.src b/svtools/source/java/patchjavaerror.src
index d5990c05a663..fb750968b798 100644
--- a/svtools/source/java/patchjavaerror.src
+++ b/svtools/source/java/patchjavaerror.src
@@ -89,5 +89,3 @@ String STR_ERROR_JVMCREATIONFAILED
 {
     Text[ en-US ] = "JRE is Defective" ;
 };
-
-
diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx
index fea433503989..6cadec2a0e5c 100644
--- a/svtools/source/misc/acceleratorexecute.cxx
+++ b/svtools/source/misc/acceleratorexecute.cxx
@@ -153,7 +153,7 @@ void AcceleratorExecute::init(const css::uno::Reference< css::lang::XMultiServic
         // <- SAFE ------------------------------
 
         css::uno::Reference< css::frame::XDispatchProvider > xDispatcher(
-                            xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")),
+                            xSMGR->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ))),
                             css::uno::UNO_QUERY_THROW);
 
         // SAFE -> ------------------------------
@@ -390,7 +390,7 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey)
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SelectWord" ) );
 
         case com::sun::star::awt::Key::SELECT_LINE:
-            return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "" ) );
+            return rtl::OUString();
 
         case com::sun::star::awt::Key::SELECT_PARAGRAPH:
             return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SelectText" ) );
@@ -427,7 +427,7 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey)
 css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::st_openGlobalConfig(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR)
 {
     css::uno::Reference< css::ui::XAcceleratorConfiguration > xAccCfg(
-        xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.ui.GlobalAcceleratorConfiguration")),
+        xSMGR->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.GlobalAcceleratorConfiguration" ))),
         css::uno::UNO_QUERY_THROW);
     return xAccCfg;
 }
@@ -437,7 +437,7 @@ css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::st
                                                                                                    const css::uno::Reference< css::frame::XFrame >&              xFrame)
 {
     css::uno::Reference< css::frame::XModuleManager > xModuleDetection(
-        xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.ModuleManager")),
+        xSMGR->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ModuleManager" ))),
         css::uno::UNO_QUERY_THROW);
 
     ::rtl::OUString sModule;
@@ -451,7 +451,7 @@ css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::st
         { return css::uno::Reference< css::ui::XAcceleratorConfiguration >(); }
 
     css::uno::Reference< css::ui::XModuleUIConfigurationManagerSupplier > xUISupplier(
-        xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.ui.ModuleUIConfigurationManagerSupplier")),
+        xSMGR->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.ModuleUIConfigurationManagerSupplier" ))),
         css::uno::UNO_QUERY_THROW);
 
     css::uno::Reference< css::ui::XAcceleratorConfiguration > xAccCfg;
@@ -492,7 +492,7 @@ css::uno::Reference< css::util::XURLTransformer > AcceleratorExecute::impl_ts_ge
     // <- SAFE ----------------------------------
 
     css::uno::Reference< css::util::XURLTransformer > xParser(
-                xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer")),
+                xSMGR->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))),
                 css::uno::UNO_QUERY_THROW);
 
     // SAFE -> ----------------------------------
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 22c8d889bd83..cd349e233a2c 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -235,7 +235,6 @@ struct EmbeddedObjectRef_Impl
     ::rtl::OUString                             aMediaType;
     comphelper::EmbeddedObjectContainer*        pContainer;
     Graphic*                                    pGraphic;
-    Graphic*                                    pHCGraphic;
     sal_Int64                                   nViewAspect;
     BOOL                                        bIsLocked;
     sal_Bool                                    bNeedUpdate;
@@ -250,7 +249,6 @@ void EmbeddedObjectRef::Construct_Impl()
     mpImp = new EmbeddedObjectRef_Impl;
     mpImp->pContainer = 0;
     mpImp->pGraphic = 0;
-    mpImp->pHCGraphic = 0;
     mpImp->nViewAspect = embed::Aspects::MSOLE_CONTENT;
     mpImp->bIsLocked = FALSE;
     mpImp->bNeedUpdate = sal_False;
@@ -289,42 +287,15 @@ EmbeddedObjectRef::EmbeddedObjectRef( const EmbeddedObjectRef& rObj )
     else
         mpImp->pGraphic = 0;
 
-    mpImp->pHCGraphic = 0;
     mpImp->mnGraphicVersion = 0;
 }
 
 EmbeddedObjectRef::~EmbeddedObjectRef()
 {
     delete mpImp->pGraphic;
-    if ( mpImp->pHCGraphic )
-        DELETEZ( mpImp->pHCGraphic );
     Clear();
 }
-/*
-EmbeddedObjectRef& EmbeddedObjectRef::operator = ( const EmbeddedObjectRef& rObj )
-{
-    DBG_ASSERT( !mxObj.is(), "Never assign an already assigned object!" );
-
-    delete mpImp->pGraphic;
-    if ( mpImp->pHCGraphic ) DELETEZ( mpImp->pHCGraphic );
-    Clear();
-
-    mpImp->nViewAspect = rObj.mpImp->nViewAspect;
-    mpImp->bIsLocked = rObj.mpImp->bIsLocked;
-    mxObj = rObj.mxObj;
-    mpImp->xListener = EmbedEventListener_Impl::Create( this );
-    mpImp->pContainer = rObj.mpImp->pContainer;
-    mpImp->aPersistName = rObj.mpImp->aPersistName;
-    mpImp->aMediaType = rObj.mpImp->aMediaType;
-    mpImp->bNeedUpdate = rObj.mpImp->bNeedUpdate;
 
-    if ( rObj.mpImp->pGraphic && !rObj.mpImp->bNeedUpdate )
-        mpImp->pGraphic = new Graphic( *rObj.mpImp->pGraphic );
-    else
-        mpImp->pGraphic = 0;
-    return *this;
-}
-*/
 void EmbeddedObjectRef::Assign( const NS_UNO::Reference < NS_EMBED::XEmbeddedObject >& xObj, sal_Int64 nAspect )
 {
     DBG_ASSERT( !mxObj.is(), "Never assign an already assigned object!" );
@@ -448,8 +419,6 @@ void EmbeddedObjectRef::GetReplacement( BOOL bUpdate )
         DELETEZ( mpImp->pGraphic );
         mpImp->aMediaType = ::rtl::OUString();
         mpImp->pGraphic = new Graphic;
-        if ( mpImp->pHCGraphic )
-            DELETEZ( mpImp->pHCGraphic );
         mpImp->mnGraphicVersion++;
     }
     else if ( !mpImp->pGraphic )
@@ -546,70 +515,6 @@ Size EmbeddedObjectRef::GetSize( MapMode* pTargetMapMode ) const
     return aResult;
 }
 
-Graphic* EmbeddedObjectRef::GetHCGraphic() const
-{
-    if ( !mpImp->pHCGraphic )
-    {
-        uno::Reference< io::XInputStream > xInStream;
-        try
-        {
-            // if the object needs size on load, that means that it is not our object
-            // currently the HC mode is supported only for OOo own objects so the following
-            // check is used as an optimization
-            // TODO/LATER: shouldn't there be a special status flag to detect alien implementation?
-            if ( mpImp->nViewAspect == embed::Aspects::MSOLE_CONTENT
-              && mxObj.is() && !( mxObj->getStatus( mpImp->nViewAspect ) & embed::EmbedMisc::EMBED_NEEDSSIZEONLOAD ) )
-            {
-                // TODO/LATER: optimization, it makes no sence to do it for OLE objects
-                if ( mxObj->getCurrentState() == embed::EmbedStates::LOADED )
-                    mxObj->changeState( embed::EmbedStates::RUNNING );
-
-                // TODO: return for the aspect of the document
-                embed::VisualRepresentation aVisualRepresentation;
-                uno::Reference< datatransfer::XTransferable > xTransferable( mxObj->getComponent(), uno::UNO_QUERY );
-                if ( !xTransferable.is() )
-                    throw uno::RuntimeException();
-
-                datatransfer::DataFlavor aDataFlavor(
-                        ::rtl::OUString::createFromAscii(
-                                "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"" ),
-                        ::rtl::OUString::createFromAscii( "GDIMetaFile" ),
-                        ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) );
-
-                uno::Sequence < sal_Int8 > aSeq;
-                if ( ( xTransferable->getTransferData( aDataFlavor ) >>= aSeq ) && aSeq.getLength() )
-                    xInStream = new ::comphelper::SequenceInputStream( aSeq );
-            }
-        }
-        catch ( uno::Exception& )
-        {
-        }
-
-        if ( xInStream.is() )
-        {
-            SvStream* pStream = NULL;
-            pStream = ::utl::UcbStreamHelper::CreateStream( xInStream );
-            if ( pStream )
-            {
-                if ( !pStream->GetError() )
-                {
-                    GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
-                    Graphic* pGraphic = new Graphic();
-                    if ( pGF->ImportGraphic( *pGraphic, String(), *pStream, GRFILTER_FORMAT_DONTKNOW ) == 0 )
-                        mpImp->pHCGraphic = pGraphic;
-                    else
-                        delete pGraphic;
-                    mpImp->mnGraphicVersion++;
-                }
-
-                delete pStream;
-            }
-        }
-    }
-
-    return mpImp->pHCGraphic;
-}
-
 void EmbeddedObjectRef::SetGraphicStream( const uno::Reference< io::XInputStream >& xInGrStream,
                                             const ::rtl::OUString& rMediaType )
 {
@@ -617,8 +522,6 @@ void EmbeddedObjectRef::SetGraphicStream( const uno::Reference< io::XInputStream
         delete mpImp->pGraphic;
     mpImp->pGraphic = new Graphic();
     mpImp->aMediaType = rMediaType;
-    if ( mpImp->pHCGraphic )
-        DELETEZ( mpImp->pHCGraphic );
     mpImp->mnGraphicVersion++;
 
     SvStream* pGraphicStream = ::utl::UcbStreamHelper::CreateStream( xInGrStream );
@@ -650,8 +553,6 @@ void EmbeddedObjectRef::SetGraphic( const Graphic& rGraphic, const ::rtl::OUStri
         delete mpImp->pGraphic;
     mpImp->pGraphic = new Graphic( rGraphic );
     mpImp->aMediaType = rMediaType;
-    if ( mpImp->pHCGraphic )
-        DELETEZ( mpImp->pHCGraphic );
     mpImp->mnGraphicVersion++;
 
     if ( mpImp->pContainer )
@@ -887,8 +788,6 @@ void EmbeddedObjectRef::UpdateReplacementOnDemand()
 {
     DELETEZ( mpImp->pGraphic );
     mpImp->bNeedUpdate = sal_True;
-    if ( mpImp->pHCGraphic )
-        DELETEZ( mpImp->pHCGraphic );
     mpImp->mnGraphicVersion++;
 
     if( mpImp->pContainer )
diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx
index 8944bc126d18..67d325cb41e5 100644
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.cxx
@@ -116,7 +116,7 @@ sal_Bool SvEmbedTransferHelper::GetData( const ::com::sun::star::datatransfer::D
                         if ( xPers.is() )
                         {
                             uno::Reference < embed::XStorage > xStg = comphelper::OStorageHelper::GetTemporaryStorage();
-                            ::rtl::OUString aName = ::rtl::OUString::createFromAscii("Dummy");
+                            ::rtl::OUString aName( RTL_CONSTASCII_USTRINGPARAM( "Dummy" ));
                             SvStream* pStream = NULL;
                             BOOL bDeleteStream = FALSE;
                             uno::Sequence < beans::PropertyValue > aEmpty;
diff --git a/svtools/source/misc/errtxt.src b/svtools/source/misc/errtxt.src
index f33896e20003..08514ea23953 100644
--- a/svtools/source/misc/errtxt.src
+++ b/svtools/source/misc/errtxt.src
@@ -92,6 +92,7 @@ Resource RID_ERRCTX
         Text [ en-US ] = "$(ERR) searching for an address";
     };
 };
+
 Resource RID_ERRHDL
 {
     String ERRCODE_CLASS_ABORT
diff --git a/svtools/source/misc/helpagent.src b/svtools/source/misc/helpagent.src
index 1f2eaaa291a3..d3566a404a01 100644
--- a/svtools/source/misc/helpagent.src
+++ b/svtools/source/misc/helpagent.src
@@ -31,11 +31,10 @@
 
 Bitmap BMP_HELP_AGENT_IMAGE
 {
-    File = "helpagent.bmp";
+    File = "helpagent.png";
 };
 
 Bitmap BMP_HELP_AGENT_CLOSER
 {
-    File = "closer.bmp";
+    File = "closer.png";
 };
-
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 19148344a6f4..5ac854df7bc0 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -409,7 +409,7 @@ static USHORT GetImageId_Impl( const INetURLObject& rObject, sal_Bool bDetectFol
     {
         String aURLPath = sURL.Copy( URL_PREFIX_PRIV_SOFFICE_LEN );
         String aType = aURLPath.GetToken( 0, INET_PATH_TOKEN );
-        if ( aType == String( RTL_CONSTASCII_STRINGPARAM("factory") ) )
+        if ( aType == String( RTL_CONSTASCII_USTRINGPARAM("factory") ) )
         {
             // detect an image id for our "private:factory" urls
             aExt = GetImageExtensionByFactory_Impl( sURL );
@@ -417,7 +417,7 @@ static USHORT GetImageId_Impl( const INetURLObject& rObject, sal_Bool bDetectFol
                 nImage = GetImageId_Impl( aExt );
             return nImage;
         }
-        else if ( aType == String( RTL_CONSTASCII_STRINGPARAM("image") ) )
+        else if ( aType == String( RTL_CONSTASCII_USTRINGPARAM("image") ) )
             nImage = (USHORT)aURLPath.GetToken( 1, INET_PATH_TOKEN ).ToInt32();
     }
     else
@@ -566,14 +566,12 @@ static ImageList* CreateImageList_Impl( USHORT nResId )
     return pList;
 }
 
-static Image GetOfficeImageFromList_Impl( USHORT nImageId, BOOL bBig, BOOL bHighContrast )
+static Image GetOfficeImageFromList_Impl( USHORT nImageId, BOOL bBig )
 {
     ImageList* pList = NULL;
 
     static ImageList* _pSmallOfficeImgList = NULL;
     static ImageList* _pBigOfficeImgList = NULL;
-    static ImageList* _pSmallHCOfficeImgList = NULL;
-    static ImageList* _pBigHCOfficeImgList = NULL;
     static ULONG nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle();
 
     // If the style has been changed, throw away our cache of the older images
@@ -581,69 +579,30 @@ static Image GetOfficeImageFromList_Impl( USHORT nImageId, BOOL bBig, BOOL bHigh
     {
         delete _pSmallOfficeImgList, _pSmallOfficeImgList = NULL;
         delete _pBigOfficeImgList, _pBigOfficeImgList = NULL;
-        delete _pSmallHCOfficeImgList, _pSmallHCOfficeImgList = NULL;
-        delete _pBigHCOfficeImgList, _pBigHCOfficeImgList = NULL;
         nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle();
     }
 
-    // #i21242# MT: For B&W we need the HC Image and must transform.
-    // bHiContrast is TRUE for all dark backgrounds, but we need HC Images for HC White also,
-    // so we can't rely on bHighContrast.
-    BOOL bBlackAndWhite = Application::GetSettings().GetStyleSettings().IsHighContrastBlackAndWhite();
-    if ( bBlackAndWhite )
-        bHighContrast = TRUE;
-
-
     if ( bBig )
     {
-        if ( bHighContrast )
-        {
-            if ( !_pBigHCOfficeImgList )
-                _pBigHCOfficeImgList = CreateImageList_Impl( RID_SVTOOLS_IMAGELIST_BIG_HIGHCONTRAST );
-            pList = _pBigHCOfficeImgList;
-        }
-        else
-        {
-            if ( !_pBigOfficeImgList )
-                _pBigOfficeImgList = CreateImageList_Impl( RID_SVTOOLS_IMAGELIST_BIG );
-            pList = _pBigOfficeImgList;
-        }
+        if ( !_pBigOfficeImgList )
+            _pBigOfficeImgList = CreateImageList_Impl( RID_SVTOOLS_IMAGELIST_BIG );
+        pList = _pBigOfficeImgList;
     }
     else
     {
-        if ( bHighContrast )
-        {
-            if ( !_pSmallHCOfficeImgList )
-                _pSmallHCOfficeImgList = CreateImageList_Impl( RID_SVTOOLS_IMAGELIST_SMALL_HIGHCONTRAST );
-            pList = _pSmallHCOfficeImgList;
-        }
-        else
-        {
-            if ( !_pSmallOfficeImgList )
-                _pSmallOfficeImgList = CreateImageList_Impl( RID_SVTOOLS_IMAGELIST_SMALL );
-            pList = _pSmallOfficeImgList;
-        }
+        if ( !_pSmallOfficeImgList )
+            _pSmallOfficeImgList = CreateImageList_Impl( RID_SVTOOLS_IMAGELIST_SMALL );
+        pList = _pSmallOfficeImgList;
     }
 
     Image aImage = pList->GetImage( nImageId );
 
-    if ( bBlackAndWhite )
-    {
-        // First invert the Image, because it's designed for black background, structures are bright
-        aImage.Invert();
-        // Now make monochrome...
-        ImageColorTransform eTrans = IMAGECOLORTRANSFORM_MONOCHROME_WHITE;
-        if ( Application::GetSettings().GetStyleSettings().GetFaceColor().GetColor() == COL_WHITE )
-            eTrans = IMAGECOLORTRANSFORM_MONOCHROME_BLACK;
-        aImage = aImage.GetColorTransformedImage( eTrans );
-    }
-
     return aImage;
 }
 
-static Image GetImageFromList_Impl( USHORT nImageId, BOOL bBig, BOOL bHighContrast )
+static Image GetImageFromList_Impl( USHORT nImageId, BOOL bBig )
 {
-    if ( !bBig && IMG_FOLDER == nImageId && !bHighContrast )
+    if ( !bBig && IMG_FOLDER == nImageId )
         // return our new small folder image (256 colors)
         return Image( SvtResId( IMG_SVT_FOLDER ) );
 
@@ -651,8 +610,6 @@ static Image GetImageFromList_Impl( USHORT nImageId, BOOL bBig, BOOL bHighContra
 
     static ImageList* _pSmallImageList = NULL;
     static ImageList* _pBigImageList = NULL;
-    static ImageList* _pSmallHCImageList = NULL;
-    static ImageList* _pBigHCImageList = NULL;
     static ULONG nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle();
 
     // If the style has been changed, throw away our cache of the older images
@@ -660,53 +617,33 @@ static Image GetImageFromList_Impl( USHORT nImageId, BOOL bBig, BOOL bHighContra
     {
         delete _pSmallImageList, _pSmallImageList = NULL;
         delete _pBigImageList, _pBigImageList = NULL;
-        delete _pSmallHCImageList, _pSmallHCImageList = NULL;
-        delete _pBigHCImageList, _pBigHCImageList = NULL;
         nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle();
     }
 
     if ( bBig )
     {
-        if ( bHighContrast )
-        {
-            if ( !_pBigHCImageList )
-                _pBigHCImageList = new ImageList( SvtResId( RID_SVTOOLS_IMAGELIST_BIG_HIGHCONTRAST ) );
-            pList = _pBigHCImageList;
-        }
-        else
-        {
-            if ( !_pBigImageList )
-                _pBigImageList = new ImageList( SvtResId( RID_SVTOOLS_IMAGELIST_BIG ) );
-            pList = _pBigImageList;
-        }
+        if ( !_pBigImageList )
+            _pBigImageList = new ImageList( SvtResId( RID_SVTOOLS_IMAGELIST_BIG ) );
+        pList = _pBigImageList;
     }
     else
     {
-        if ( bHighContrast )
-        {
-            if ( !_pSmallHCImageList )
-                _pSmallHCImageList = new ImageList( SvtResId( RID_SVTOOLS_IMAGELIST_SMALL_HIGHCONTRAST ) );
-            pList = _pSmallHCImageList;
-        }
-        else
-        {
-            if ( !_pSmallImageList )
-                _pSmallImageList = new ImageList( SvtResId( RID_SVTOOLS_IMAGELIST_SMALL ) );
-            pList = _pSmallImageList;
-        }
+        if ( !_pSmallImageList )
+            _pSmallImageList = new ImageList( SvtResId( RID_SVTOOLS_IMAGELIST_SMALL ) );
+        pList = _pSmallImageList;
     }
 
     if ( pList->HasImageAtPos( nImageId ) )
         return pList->GetImage( nImageId );
     else
-        return GetOfficeImageFromList_Impl( nImageId, bBig, bHighContrast );
+        return GetOfficeImageFromList_Impl( nImageId, bBig );
 }
 
 //****************************************************************************
 
 void ReplaceStarOfficeVar( String& _rDescription )
 {
-    static String sVariable( RTL_CONSTASCII_STRINGPARAM( "%STAROFFICE" ) );
+    static String sVariable( RTL_CONSTASCII_USTRINGPARAM( "%STAROFFICE" ) );
     static String sProductName;
     if ( sProductName.Len() == 0 )
     {
@@ -737,7 +674,7 @@ String SvFileInformationManager::GetDescription_Impl( const INetURLObject& rObje
             {
                 String aURLPath = sURL.Copy( URL_PREFIX_PRIV_SOFFICE_LEN );
                 String aType = aURLPath.GetToken( 0, INET_PATH_TOKEN );
-                if ( aType == String( RTL_CONSTASCII_STRINGPARAM("factory") ) )
+                if ( aType == String( RTL_CONSTASCII_USTRINGPARAM("factory") ) )
                 {
                     sDescription = GetDescriptionByFactory_Impl( aURLPath.Copy( aURLPath.Search( INET_PATH_TOKEN ) + 1 ) );
                     bDetected = sal_True;
@@ -781,7 +718,7 @@ String SvFileInformationManager::GetDescription_Impl( const INetURLObject& rObje
 
     if ( bShowExt )
     {
-        sDescription += String( RTL_CONSTASCII_STRINGPARAM(" (") );
+        sDescription += String( RTL_CONSTASCII_USTRINGPARAM(" (") );
         sDescription += sExtension;
         sDescription += ')';
     }
@@ -792,39 +729,19 @@ String SvFileInformationManager::GetDescription_Impl( const INetURLObject& rObje
 
 Image SvFileInformationManager::GetImage( const INetURLObject& rObject, sal_Bool bBig )
 {
-    return GetImage( rObject, bBig, FALSE );
-}
-
-Image SvFileInformationManager::GetFileImage( const INetURLObject& rObject, sal_Bool bBig )
-{
-    return GetFileImage( rObject, bBig, FALSE );
-}
-
-Image SvFileInformationManager::GetImageNoDefault( const INetURLObject& rObject, sal_Bool bBig )
-{
-    return GetImageNoDefault( rObject, bBig, FALSE );
-}
-
-Image SvFileInformationManager::GetFolderImage( const svtools::VolumeInfo& rInfo, sal_Bool bBig )
-{
-    return GetFolderImage( rInfo, bBig, FALSE );
-}
-
-Image SvFileInformationManager::GetImage( const INetURLObject& rObject, sal_Bool bBig, sal_Bool bHighContrast )
-{
     USHORT nImage = GetImageId_Impl( rObject, sal_True );
     DBG_ASSERT( nImage, "invalid ImageId" );
-    return GetImageFromList_Impl( nImage, bBig, bHighContrast );
+    return GetImageFromList_Impl( nImage, bBig );
 }
 
-Image SvFileInformationManager::GetFileImage( const INetURLObject& rObject, sal_Bool bBig, sal_Bool bHighContrast )
+Image SvFileInformationManager::GetFileImage( const INetURLObject& rObject, sal_Bool bBig )
 {
     USHORT nImage = GetImageId_Impl( rObject, sal_False );
     DBG_ASSERT( nImage, "invalid ImageId" );
-    return GetImageFromList_Impl( nImage, bBig, bHighContrast );
+    return GetImageFromList_Impl( nImage, bBig );
 }
 
-Image SvFileInformationManager::GetImageNoDefault( const INetURLObject& rObject, sal_Bool bBig, sal_Bool bHighContrast )
+Image SvFileInformationManager::GetImageNoDefault( const INetURLObject& rObject, sal_Bool bBig )
 {
     USHORT nImage = GetImageId_Impl( rObject, sal_True );
     DBG_ASSERT( nImage, "invalid ImageId" );
@@ -832,10 +749,10 @@ Image SvFileInformationManager::GetImageNoDefault( const INetURLObject& rObject,
     if ( nImage == IMG_FILE )
         return Image();
 
-    return GetImageFromList_Impl( nImage, bBig, bHighContrast );
+    return GetImageFromList_Impl( nImage, bBig );
 }
 
-Image SvFileInformationManager::GetFolderImage( const svtools::VolumeInfo& rInfo, sal_Bool bBig, sal_Bool bHighContrast )
+Image SvFileInformationManager::GetFolderImage( const svtools::VolumeInfo& rInfo, sal_Bool bBig )
 {
     USHORT nImage = IMG_FOLDER;
     DBG_ASSERT( nImage, "invalid ImageId" );
@@ -849,7 +766,7 @@ Image SvFileInformationManager::GetFolderImage( const svtools::VolumeInfo& rInfo
     else if ( rInfo.m_bIsVolume )
         nImage = IMG_FIXEDDEV;
 
-    return GetImageFromList_Impl( nImage, bBig, bHighContrast );
+    return GetImageFromList_Impl( nImage, bBig );
 }
 
 String SvFileInformationManager::GetDescription( const INetURLObject& rObject )
diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src
index 5cd0a714aa9b..723de62cc618 100644
--- a/svtools/source/misc/imagemgr.src
+++ b/svtools/source/misc/imagemgr.src
@@ -129,34 +129,6 @@ ImageList RID_SVTOOLS_IMAGELIST_SMALL
     };
 };
 
-ImageList RID_SVTOOLS_IMAGELIST_BIG_HIGHCONTRAST
-{
-    Prefix = "lxh";
-    MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-    IdList =
-    {
-        X_IMAGE_LIST
-    };
-    IdCount =
-    {
-        68 ;
-    };
-};
-
-ImageList RID_SVTOOLS_IMAGELIST_SMALL_HIGHCONTRAST
-{
-    Prefix = "sxh";
-    MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-    IdList =
-    {
-        X_IMAGE_LIST
-    };
-    IdCount =
-    {
-        68;
-    };
-};
-
 Bitmap BMP_PLUGIN
 {
     File = "plugin.png" ;
diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx
index fe99763cf825..930d157f6576 100644
--- a/svtools/source/misc/langhelp.cxx
+++ b/svtools/source/misc/langhelp.cxx
@@ -38,7 +38,7 @@ void localizeWebserviceURI( ::rtl::OUString& rURI )
     if ( aLang.equalsIgnoreAsciiCaseAscii( "pt" )
          && Application::GetSettings().GetUILocale().Country.equalsIgnoreAsciiCaseAscii("br") )
     {
-        aLang = ::rtl::OUString::createFromAscii("pt-br");
+        aLang = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "pt-br" ));
     }
 
     rURI += aLang;
diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx
index 80d766354dfc..b63d1084e045 100644
--- a/svtools/source/misc/svtaccessiblefactory.cxx
+++ b/svtools/source/misc/svtaccessiblefactory.cxx
@@ -284,14 +284,13 @@ namespace svt
             // load the library implementing the factory
             if ( !s_pFactory.get() )
             {
-                const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii(
+                const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(
                     SVLIBRARY( "acc" )
-                );
+                ));
                 s_hAccessibleImplementationModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, 0 );
                 if ( s_hAccessibleImplementationModule != NULL )
                 {
-                    const ::rtl::OUString sFactoryCreationFunc =
-                        ::rtl::OUString::createFromAscii( "getSvtAccessibilityComponentFactory" );
+                    const ::rtl::OUString sFactoryCreationFunc( RTL_CONSTASCII_USTRINGPARAM( "getSvtAccessibilityComponentFactory" ));
                     s_pAccessibleFactoryFunc = (GetSvtAccessibilityComponentFactory)
                         osl_getFunctionSymbol( s_hAccessibleImplementationModule, sFactoryCreationFunc.pData );
 
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index 366037c7a1d3..20da20142c6f 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -490,7 +490,6 @@ namespace svt
         void        storeState( sal_Bool _bForceRetrieval );
 
     private:
-        void        initTemplDirs( ::std::vector< String >& _rRootDirs );
         sal_Bool    openCacheStream( sal_Bool _bForRead );
         void        closeCacheStream( );
 
@@ -635,10 +634,10 @@ namespace svt
             // create a content for the current folder root
             Reference< XResultSet > xResultSet;
             Sequence< ::rtl::OUString > aContentProperties( 4);
-            aContentProperties[0] = ::rtl::OUString::createFromAscii( "Title" );
-            aContentProperties[1] = ::rtl::OUString::createFromAscii( "DateModified" );
-            aContentProperties[2] = ::rtl::OUString::createFromAscii( "DateCreated" );
-            aContentProperties[3] = ::rtl::OUString::createFromAscii( "IsFolder" );
+            aContentProperties[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ));
+            aContentProperties[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateModified" ));
+            aContentProperties[2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateCreated" ));
+            aContentProperties[3] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ));
 
             // get the set of sub contents in the folder
             try
@@ -839,11 +838,6 @@ namespace svt
     }
 
     //---------------------------------------------------------------------
-    void TemplateFolderCacheImpl::initTemplDirs( ::std::vector< String >& )
-    {
-    }
-
-    //---------------------------------------------------------------------
     uno::Reference< util::XOfficeInstallationDirectories >
     TemplateFolderCacheImpl::getOfficeInstDirs()
     {
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 50ad17317955..e5ffed1689da 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -155,20 +155,20 @@ const ::rtl::OUString aQuotedParamChars = ::rtl::OUString( RTL_CONSTASCII_USTRIN
 
 static ::rtl::OUString ImplGetParameterString( const TransferableObjectDescriptor& rObjDesc )
 {
-    const ::rtl::OUString   aChar( ::rtl::OUString::createFromAscii( "\"" ) );
+    const ::rtl::OUString   aChar( RTL_CONSTASCII_USTRINGPARAM( "\"" ));
     const ::rtl::OUString   aClassName( rObjDesc.maClassName.GetHexName() );
     ::rtl::OUString         aParams;
 
     if( aClassName.getLength() )
     {
-        aParams += ::rtl::OUString::createFromAscii( ";classname=\"" );
+        aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";classname=\"" ));
         aParams += aClassName;
         aParams += aChar;
     }
 
     if( rObjDesc.maTypeName.Len() )
     {
-        aParams += ::rtl::OUString::createFromAscii( ";typename=\"" );
+        aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";typename=\"" ));
         aParams += rObjDesc.maTypeName;
         aParams += aChar;
     }
@@ -188,28 +188,28 @@ static ::rtl::OUString ImplGetParameterString( const TransferableObjectDescripto
                 pToAccept[nChar] = sal_True;
         }
 
-        aParams += ::rtl::OUString::createFromAscii( ";displayname=\"" );
+        aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";displayname=\"" ));
         aParams += ::rtl::Uri::encode( rObjDesc.maDisplayName, pToAccept, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 );
         aParams += aChar;
     }
 
-    aParams += ::rtl::OUString::createFromAscii( ";viewaspect=\"" );
+    aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";viewaspect=\"" ));
     aParams += ::rtl::OUString::valueOf( static_cast< sal_Int32 >( rObjDesc.mnViewAspect ) );
     aParams += aChar;
 
-    aParams += ::rtl::OUString::createFromAscii( ";width=\"" );
+    aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";width=\"" ));
     aParams += ::rtl::OUString::valueOf( rObjDesc.maSize.Width() );
     aParams += aChar;
 
-    aParams += ::rtl::OUString::createFromAscii( ";height=\"" );
+    aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";height=\"" ));
     aParams += ::rtl::OUString::valueOf( rObjDesc.maSize.Height() );
     aParams += aChar;
 
-    aParams += ::rtl::OUString::createFromAscii( ";posx=\"" );
+    aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";posx=\"" ));
     aParams += ::rtl::OUString::valueOf( rObjDesc.maDragStartPos.X() );
     aParams += aChar;
 
-    aParams += ::rtl::OUString::createFromAscii( ";posy=\"" );
+    aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";posy=\"" ));
     aParams += ::rtl::OUString::valueOf( rObjDesc.maDragStartPos.X() );
     aParams += aChar;
 
@@ -227,8 +227,7 @@ static void ImplSetParameterString( TransferableObjectDescriptor& rObjDesc, cons
     {
         if( xFact.is() )
         {
-            xMimeFact = Reference< XMimeContentTypeFactory >( xFact->createInstance( ::rtl::OUString::createFromAscii(
-                                                              "com.sun.star.datatransfer.MimeContentTypeFactory" ) ),
+            xMimeFact = Reference< XMimeContentTypeFactory >( xFact->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.datatransfer.MimeContentTypeFactory" )) ),
                                                               UNO_QUERY );
         }
 
@@ -238,14 +237,14 @@ static void ImplSetParameterString( TransferableObjectDescriptor& rObjDesc, cons
 
             if( xMimeType.is() )
             {
-                const ::rtl::OUString aClassNameString( ::rtl::OUString::createFromAscii( "classname" ) );
-                const ::rtl::OUString aTypeNameString( ::rtl::OUString::createFromAscii( "typename" ) );
-                const ::rtl::OUString aDisplayNameString( ::rtl::OUString::createFromAscii( "displayname" ) );
-                const ::rtl::OUString aViewAspectString( ::rtl::OUString::createFromAscii( "viewaspect" ) );
-                const ::rtl::OUString aWidthString( ::rtl::OUString::createFromAscii( "width" ) );
-                const ::rtl::OUString aHeightString( ::rtl::OUString::createFromAscii( "height" ) );
-                const ::rtl::OUString aPosXString( ::rtl::OUString::createFromAscii( "posx" ) );
-                const ::rtl::OUString aPosYString( ::rtl::OUString::createFromAscii( "posy" ) );
+                const ::rtl::OUString aClassNameString(RTL_CONSTASCII_USTRINGPARAM( "classname" ));
+                const ::rtl::OUString aTypeNameString(RTL_CONSTASCII_USTRINGPARAM( "typename" ));
+                const ::rtl::OUString aDisplayNameString(RTL_CONSTASCII_USTRINGPARAM( "displayname" ));
+                const ::rtl::OUString aViewAspectString(RTL_CONSTASCII_USTRINGPARAM( "viewaspect" ));
+                const ::rtl::OUString aWidthString(RTL_CONSTASCII_USTRINGPARAM( "width" ));
+                const ::rtl::OUString aHeightString(RTL_CONSTASCII_USTRINGPARAM( "height" ));
+                const ::rtl::OUString aPosXString(RTL_CONSTASCII_USTRINGPARAM( "posx" ));
+                const ::rtl::OUString aPosYString(RTL_CONSTASCII_USTRINGPARAM( "posy" ));
 
                 if( xMimeType->hasParameter( aClassNameString ) )
                 {
@@ -540,7 +539,7 @@ void SAL_CALL TransferableHelper::lostOwnership( const Reference< XClipboard >&,
 
             if( xFact.is() )
             {
-                Reference< XDesktop > xDesktop( xFact->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ), UNO_QUERY );
+                Reference< XDesktop > xDesktop( xFact->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" )) ), UNO_QUERY );
 
                 if( xDesktop.is() )
                     xDesktop->removeTerminateListener( mxTerminateListener );
@@ -951,7 +950,7 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk,
 
         case SOT_FORMATSTR_ID_FILECONTENT:
         {
-            String aStr( RTL_CONSTASCII_STRINGPARAM( "[InternetShortcut]\x0aURL=" ) );
+            String aStr( RTL_CONSTASCII_USTRINGPARAM( "[InternetShortcut]\x0aURL=" ) );
             maAny <<= ::rtl::OUString( aStr += rBmk.GetURL() );
         }
         break;
@@ -1090,7 +1089,7 @@ void TransferableHelper::CopyToClipboard( Window *pWindow ) const
 
             if( xFact.is() )
             {
-                Reference< XDesktop > xDesktop( xFact->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ), UNO_QUERY );
+                Reference< XDesktop > xDesktop( xFact->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" )) ), UNO_QUERY );
 
                 if( xDesktop.is() )
                     xDesktop->addTerminateListener( pThis->mxTerminateListener = new TerminateListener( *pThis ) );
@@ -1127,7 +1126,7 @@ void TransferableHelper::CopyToSelection( Window *pWindow ) const
 
             if( xFact.is() )
             {
-                Reference< XDesktop > xDesktop( xFact->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ), UNO_QUERY );
+                Reference< XDesktop > xDesktop( xFact->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" )) ), UNO_QUERY );
 
                 if( xDesktop.is() )
                     xDesktop->addTerminateListener( pThis->mxTerminateListener = new TerminateListener( *pThis ) );
@@ -1416,11 +1415,10 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor
         Reference< XMultiServiceFactory >       xFact( ::comphelper::getProcessServiceFactory() );
         Reference< XMimeContentTypeFactory >    xMimeFact;
         DataFlavorEx                            aFlavorEx;
-        const ::rtl::OUString                   aCharsetStr( ::rtl::OUString::createFromAscii( "charset" ) );
+        const ::rtl::OUString                   aCharsetStr(RTL_CONSTASCII_USTRINGPARAM( "charset" ));
 
         if( xFact.is() )
-            xMimeFact = Reference< XMimeContentTypeFactory >( xFact->createInstance( ::rtl::OUString::createFromAscii(
-                                                              "com.sun.star.datatransfer.MimeContentTypeFactory" ) ),
+            xMimeFact = Reference< XMimeContentTypeFactory >( xFact->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.datatransfer.MimeContentTypeFactory" )) ),
                                                               UNO_QUERY );
 
         for( sal_Int32 i = 0; i < rDataFlavorSeq.getLength(); i++ )
@@ -1468,35 +1466,35 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor
                 aFlavorEx.mnSotId = SOT_FORMATSTR_ID_HTML_NO_COMMENT;
                 rDataFlavorExVector.push_back( aFlavorEx );
             }
-            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString::createFromAscii( "text/plain" ) ) )
+            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text/plain" )) ) )
             {
                 // add, if it is a UTF-8 byte buffer
                 if( xMimeType->hasParameter( aCharsetStr ) )
                 {
                     const ::rtl::OUString aCharset( xMimeType->getParameterValue( aCharsetStr ) );
 
-                    if( xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( ::rtl::OUString::createFromAscii( "unicode" ) ) ||
-                        xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( ::rtl::OUString::createFromAscii( "utf-16" ) ) )
+                    if( xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unicode" )) ) ||
+                        xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "utf-16" )) ) )
                     {
                         rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = FORMAT_STRING;
 
                     }
                 }
             }
-            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString::createFromAscii( "text/rtf" ) ) )
+            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text/rtf" )) ) )
             {
                 rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = FORMAT_RTF;
             }
-            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString::createFromAscii( "text/html" ) ) )
+            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text/html" )) ) )
 
             {
                 rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = SOT_FORMATSTR_ID_HTML;
             }
-            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString::createFromAscii( "text/uri-list" ) ) )
+            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text/uri-list" )) ) )
             {
                 rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = SOT_FORMAT_FILE_LIST;
             }
-            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString::createFromAscii( "application/x-openoffice-objectdescriptor-xml" ) ) )
+            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-objectdescriptor-xml" )) ) )
             {
                 rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = SOT_FORMATSTR_ID_OBJECTDESCRIPTOR;
             }
@@ -2145,7 +2143,7 @@ sal_Bool TransferableDataHelper::GetFileList(
 
             if( GetSotStorageStream( aFlavor, xStm ) )
             {
-                if( aFlavor.MimeType.indexOf( ::rtl::OUString::createFromAscii( "text/uri-list" ) ) > -1 )
+                if( aFlavor.MimeType.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text/uri-list" )) ) > -1 )
                 {
                     ByteString aByteString;
 
@@ -2363,8 +2361,7 @@ sal_Bool TransferableDataHelper::IsEqual( const ::com::sun::star::datatransfer::
     try
     {
         if( xFact.is() )
-            xMimeFact = Reference< XMimeContentTypeFactory >( xFact->createInstance( ::rtl::OUString::createFromAscii(
-                                                              "com.sun.star.datatransfer.MimeContentTypeFactory" ) ),
+            xMimeFact = Reference< XMimeContentTypeFactory >( xFact->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.datatransfer.MimeContentTypeFactory" )) ),
                                                               UNO_QUERY );
 
         if( xMimeFact.is() )
@@ -2376,22 +2373,22 @@ sal_Bool TransferableDataHelper::IsEqual( const ::com::sun::star::datatransfer::
             {
                 if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( xRequestType2->getFullMediaType() ) )
                 {
-                    if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString::createFromAscii( "text/plain" ) ) )
+                    if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text/plain" )) ) )
                     {
                         // special handling for text/plain media types
-                        const ::rtl::OUString aCharsetString( ::rtl::OUString::createFromAscii( "charset" ) );
+                        const ::rtl::OUString aCharsetString(RTL_CONSTASCII_USTRINGPARAM( "charset" ));
 
                         if( !xRequestType2->hasParameter( aCharsetString ) ||
-                            xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( ::rtl::OUString::createFromAscii( "utf-16" ) ) ||
-                            xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( ::rtl::OUString::createFromAscii( "unicode" ) ) )
+                            xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "utf-16" )) ) ||
+                            xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unicode" )) ) )
                         {
                             bRet = sal_True;
                         }
                     }
-                    else if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString::createFromAscii( "application/x-openoffice" ) ) )
+                    else if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice" )) ) )
                     {
                         // special handling for application/x-openoffice media types
-                        const ::rtl::OUString aFormatString( ::rtl::OUString::createFromAscii( "windows_formatname" ) );
+                        const ::rtl::OUString aFormatString(RTL_CONSTASCII_USTRINGPARAM( "windows_formatname" ));
 
                         if( xRequestType1->hasParameter( aFormatString ) &&
                             xRequestType2->hasParameter( aFormatString ) &&
diff --git a/svtools/source/plugapp/commtest.src b/svtools/source/plugapp/commtest.src
index 7073699f4956..d1efb29a1730 100644
--- a/svtools/source/plugapp/commtest.src
+++ b/svtools/source/plugapp/commtest.src
@@ -33,7 +33,6 @@ ToolBox TBMenu {
     Pos = MAP_APPFONT( 0, 0 );
     Size = MAP_APPFONT( 100, 20 );
     LineCount = 2;
-//  FloatingLines = 2;
     ItemList = {
     ToolBoxItem  {
             Identifier = SERVER_TCP;
diff --git a/svtools/source/plugapp/testtool.src b/svtools/source/plugapp/testtool.src
index 9cc52c58f013..55112329dcf5 100644
--- a/svtools/source/plugapp/testtool.src
+++ b/svtools/source/plugapp/testtool.src
@@ -40,16 +40,9 @@ ToolBox DisplayHidToolBox {
     ToolBoxItem  {
             Type = TOOLBOXITEM_BUTTON;
             _ToolBoxItemFlags = TIB_AUTOCHECK ;
-
-/*
-class FlagToolBoxState
-{
-    TIB_CHECKABLE, TIB_AUTOCHECK, TIB_RADIOCHECK, TIB_LEFT,
-    TIB_AUTOSIZE, TIB_DROPDOWN,
-};*/
             Identifier = TT_SHOW;
             ItemBitmap = Bitmap  {
-                File = "ttshow.bmp";
+                File = "ttshow.png";
             };
             Text[ en-US ] = "Display IDs";
         };
@@ -67,7 +60,7 @@ class FlagToolBoxState
     ToolBoxItem  {
             Identifier = TT_SEND_DATA;
             ItemBitmap = Bitmap  {
-                File = "ttremote.bmp";
+                File = "ttremote.png";
             };
             Text[ en-US ] = "Transfer to TestTool";
         };
@@ -77,21 +70,21 @@ class FlagToolBoxState
     ToolBoxItem  {
             Identifier = TT_ALLWIN;
             ItemBitmap = Bitmap  {
-                File = "ttall.bmp";
+                File = "ttall.png";
             };
             Text[ en-US ] = "Show all windows";
         };
     ToolBoxItem  {
             Identifier = TT_KURZNAME;
             ItemBitmap = Bitmap  {
-                File = "ttdef.bmp";
+                File = "ttdef.png";
             };
             Text[ en-US ] = "Show short names (if available)";
         };
     ToolBoxItem  {
             Identifier = TT_LANGNAME;
             ItemBitmap = Bitmap  {
-                File = "tthid.bmp";
+                File = "tthid.png";
             };
             Text[ en-US ] = "Always show long-name";
         };
@@ -100,7 +93,7 @@ class FlagToolBoxState
 };
 
 Bitmap TT_SHOW2 {
-    File = "ttshow2.bmp";
+    File = "ttshow2.png";
 };
 
 WorkWindow TT_INLINE_TRANSLATION {
@@ -111,60 +104,60 @@ WorkWindow TT_INLINE_TRANSLATION {
     Closeable = TRUE;
     Border = TRUE;
     GroupBox TT_GB_TRANSLATION {
-            Pos = MAP_APPFONT( 2, 3 );
-            Size = MAP_APPFONT( 173, 44 );
+        Pos = MAP_APPFONT( 2, 3 );
+        Size = MAP_APPFONT( 173, 44 );
         Text[ en-US ] = "Translation";
     };
     Edit TT_E_NEW {
-            Disable = TRUE;
-            Border = TRUE;
-            Pos = MAP_APPFONT( 7, 16 );
-            Size = MAP_APPFONT( 162, 12 );
-            TabStop = TRUE;
+        Disable = TRUE;
+        Border = TRUE;
+        Pos = MAP_APPFONT( 7, 16 );
+        Size = MAP_APPFONT( 162, 12 );
+        TabStop = TRUE;
         Text[ en-US ] = "~Edit";
     };
     FixedText TT_FT_OLD {
-            Pos = MAP_APPFONT( 7, 33 );
-            Size = MAP_APPFONT( 162, 10 );
+        Pos = MAP_APPFONT( 7, 33 );
+        Size = MAP_APPFONT( 162, 10 );
         Text[ en-US ] = "Original Text";
     };
     GroupBox TT_GB_COMMENT {
-            Pos = MAP_APPFONT( 2, 52 );
-            Size = MAP_APPFONT( 173, 32 );
+        Pos = MAP_APPFONT( 2, 52 );
+        Size = MAP_APPFONT( 173, 32 );
         Text[ en-US ] = "Comment";
     };
     Edit TT_E_COMMENT {
-            Disable = TRUE;
-            Border = TRUE;
-            Pos = MAP_APPFONT( 7, 64 );
-            Size = MAP_APPFONT( 162, 12 );
-            TabStop = TRUE;
+        Disable = TRUE;
+        Border = TRUE;
+        Pos = MAP_APPFONT( 7, 64 );
+        Size = MAP_APPFONT( 162, 12 );
+        TabStop = TRUE;
         Text[ en-US ] = "~Comment";
     };
     PushButton TT_PB_SELECT {
-            Pos = MAP_APPFONT( Control_Border, 89 );
-            Size = MAP_APPFONT( ButtonWidth, 12 );
-            TabStop = TRUE;
+        Pos = MAP_APPFONT( Control_Border, 89 );
+        Size = MAP_APPFONT( ButtonWidth, 12 );
+        TabStop = TRUE;
         Text[ en-US ] = "~Select";
     };
     PushButton TT_PB_RESTORE {
-            Disable = TRUE;
-            Pos = MAP_APPFONT( Control_Border + ButtonWidth + Button_Button, 89 );
-            Size = MAP_APPFONT( ButtonWidth, 12 );
-            TabStop = TRUE;
+        Disable = TRUE;
+        Pos = MAP_APPFONT( Control_Border + ButtonWidth + Button_Button, 89 );
+        Size = MAP_APPFONT( ButtonWidth, 12 );
+        TabStop = TRUE;
         Text[ en-US ] = "~Restore";
     };
     PushButton TT_PB_ACCEPT {
-            Disable = TRUE;
-            Pos = MAP_APPFONT( Control_Border + 2*(ButtonWidth + Button_Button), 89 );
-            Size = MAP_APPFONT( ButtonWidth, 12 );
-            TabStop = TRUE;
+        Disable = TRUE;
+        Pos = MAP_APPFONT( Control_Border + 2*(ButtonWidth + Button_Button), 89 );
+        Size = MAP_APPFONT( ButtonWidth, 12 );
+        TabStop = TRUE;
         Text[ en-US ] = "~Accept";
     };
     PushButton TT_PB_NEXT {
-            Pos = MAP_APPFONT( Control_Border + 3*(ButtonWidth + Button_Button), 89 );
-            Size = MAP_APPFONT( ButtonWidth, 12 );
-            TabStop = TRUE;
+        Pos = MAP_APPFONT( Control_Border + 3*(ButtonWidth + Button_Button), 89 );
+        Size = MAP_APPFONT( ButtonWidth, 12 );
+        TabStop = TRUE;
         Text[ en-US ] = "~Next";
     };
     Text[ en-US ] = "Inplace Translation";
diff --git a/svtools/source/productregistration/productregistration.cxx b/svtools/source/productregistration/productregistration.cxx
index 1a76a939def7..ff4ed10bf4f0 100644
--- a/svtools/source/productregistration/productregistration.cxx
+++ b/svtools/source/productregistration/productregistration.cxx
@@ -104,14 +104,14 @@ namespace svt
     //--------------------------------------------------------------------
     OUString SAL_CALL OProductRegistration::getImplementationName_Static( )
     {
-        return OUString::createFromAscii( PRODREG_IMPLNAME );
+        return OUString(RTL_CONSTASCII_USTRINGPARAM( PRODREG_IMPLNAME ));
     }
 
     //--------------------------------------------------------------------
     Sequence< OUString > SAL_CALL OProductRegistration::getSupportedServiceNames_Static(  ) throw (RuntimeException)
     {
         Sequence< OUString > aServiceNames( 1 );
-        aServiceNames[ 0 ] = OUString::createFromAscii( PRODREG_SERVNAME );
+        aServiceNames[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM( PRODREG_SERVNAME ));
         return aServiceNames;
     }
 
@@ -386,7 +386,7 @@ namespace svt
             }
 
             Sequence< NamedValue > aJobResponse( 1 );
-            aJobResponse[0].Name = OUString::createFromAscii( "Deactivate" );
+            aJobResponse[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Deactivate" ));
             aJobResponse[0].Value <<= bDeactivateJob;
             aReturn <<= aJobResponse;
         }
@@ -402,7 +402,7 @@ namespace svt
         {
             // create the Desktop component which can load components
             Reference< XSystemShellExecute > xSystemShell(
-                m_xORB->createInstance( OUString::createFromAscii( "com.sun.star.system.SystemShellExecute" ) ),
+                m_xORB->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" )) ),
                 UNO_QUERY
             );
             OSL_ENSURE( xSystemShell.is(), "OProductRegistration::doOnlineRegistration: invalid SystemExecute component!" );
@@ -470,9 +470,9 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
         Reference< XRegistryKey > xNewKey;
 
         xNewKey = xRegistryKey->createKey(
-            OUString::createFromAscii( "/" PRODREG_IMPLNAME "/UNO/SERVICES" ));
+            OUString( RTL_CONSTASCII_USTRINGPARAM( "/" PRODREG_IMPLNAME "/UNO/SERVICES" )));
         xNewKey->createKey(
-            OUString::createFromAscii( PRODREG_SERVNAME ));
+            OUString(RTL_CONSTASCII_USTRINGPARAM( PRODREG_SERVNAME )));
 
         return sal_True;
     }
diff --git a/svtools/source/productregistration/registrationdlg.src b/svtools/source/productregistration/registrationdlg.src
index c4cdcbcbe3ec..4021e395b069 100644
--- a/svtools/source/productregistration/registrationdlg.src
+++ b/svtools/source/productregistration/registrationdlg.src
@@ -25,15 +25,9 @@
  *
  ************************************************************************/
 
-#ifndef SVTOOLS_REGISTRATIONDLG_HRC
 #include "registrationdlg.hrc"
-#endif
-#ifndef _SVTOOLS_HRC
 #include <svtools/svtools.hrc>
-#endif
-#ifndef _SVT_HELPID_HRC
 #include <svtools/helpid.hrc>
-#endif
 
 ModalDialog DLG_REGISTRATION_REQUEST
 {
@@ -52,7 +46,7 @@ ModalDialog DLG_REGISTRATION_REQUEST
         {
             ImageBitmap = Bitmap
             {
-                File = "regkey.bmp" ;
+                File = "regkey.png" ;
             };
             MaskColor = Color { Red = 0x0000 ; Green = 0x0000 ; Blue = 0xFFFF ; };
         };
diff --git a/svtools/source/svrtf/rtfkey2.cxx b/svtools/source/svrtf/rtfkey2.cxx
index 8f24c94d36ae..e2e2bef0f721 100644
--- a/svtools/source/svrtf/rtfkey2.cxx
+++ b/svtools/source/svrtf/rtfkey2.cxx
@@ -1127,6 +1127,7 @@ sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SOUTLVL, "\\soutlvl" );
 sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHP, "\\shp" );
 sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SN, "\\sn" );
 sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SV, "\\sv" );
+sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SP, "\\sp" );
 /*
 sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPLEFT, "\\shpleft" );
 sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPTOP, "\\shptop" );
diff --git a/svtools/source/svrtf/rtfkeywd.cxx b/svtools/source/svrtf/rtfkeywd.cxx
index 844c05573b63..feebe3d78332 100644
--- a/svtools/source/svrtf/rtfkeywd.cxx
+++ b/svtools/source/svrtf/rtfkeywd.cxx
@@ -1159,6 +1159,7 @@ static RTF_TokenEntry __FAR_DATA aRTFTokenTab[] = {
         */
         {{OOO_STRING_SVTOOLS_RTF_SN},       RTF_SN},
         {{OOO_STRING_SVTOOLS_RTF_SV},       RTF_SV},
+        {{OOO_STRING_SVTOOLS_RTF_SP},       RTF_SP},
 
 // Support for overline attributes
         {{OOO_STRING_SVTOOLS_RTF_OL},           RTF_OL},
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index 999bcbd84e61..f29d06189a80 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -383,7 +383,7 @@ namespace svt { namespace table
 
 ::com::sun::star::uno::Any TableControl::GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos) const
 {
-    ::com::sun::star::uno::Any cellContent(::com::sun::star::uno::Any(::rtl::OUString::createFromAscii("")));
+    ::com::sun::star::uno::Any cellContent(::com::sun::star::uno::Any(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("")) ));
     std::vector<std::vector< ::com::sun::star::uno::Any > >& aTableContent = GetModel()->getCellContent();
     if(&aTableContent)
         cellContent = aTableContent[_nRowPos][_nColPos];
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 97904f640b0f..212502416527 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -242,7 +242,7 @@ namespace svt { namespace table
     virtual std::vector<rtl::OUString>& getRowHeaderName()
     {
         aRowHeaderNames.clear();
-        aRowHeaderNames.push_back(rtl::OUString::createFromAscii(""));
+        aRowHeaderNames.push_back( rtl::OUString() );
         return aRowHeaderNames;
     }
     private:
@@ -1952,7 +1952,7 @@ namespace svt { namespace table
                 }
                 else
                 {
-                    aTooltipText+= ::rtl::OUString::createFromAscii("\n");
+                    aTooltipText+= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "\n" ));
                     ::com::sun::star::uno::Any content = m_pModel->getCellContent()[current][cols[i]];
                     aTooltipText += convertToString(content);
                 }
@@ -1966,7 +1966,7 @@ namespace svt { namespace table
                     aTooltipText = text[i];
                 else
                 {
-                    aTooltipText+= ::rtl::OUString::createFromAscii("\n");
+                    aTooltipText+= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "\n" ));
                     aTooltipText+= text[i];
                 }
             }
@@ -1988,7 +1988,7 @@ namespace svt { namespace table
                 }
                 else
                 {
-                    aTooltipText+= ::rtl::OUString::createFromAscii("\n");
+                    aTooltipText+= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "\n" ));
                     aTooltipText+= text[i];
                     if(nCols > i)
                     {
diff --git a/svtools/source/toolpanel/paneltabbarpeer.cxx b/svtools/source/toolpanel/paneltabbarpeer.cxx
index ce22d1b7c914..82b94ad7b4d3 100644
--- a/svtools/source/toolpanel/paneltabbarpeer.cxx
+++ b/svtools/source/toolpanel/paneltabbarpeer.cxx
@@ -35,6 +35,7 @@
 /** === end UNO includes === **/
 
 #include <tools/diagnose_ex.h>
+#include <vcl/svapp.hxx>
 
 //........................................................................
 namespace svt
@@ -75,7 +76,7 @@ namespace svt
     //------------------------------------------------------------------------------------------------------------------
     Reference< XAccessibleContext > PanelTabBarPeer::CreateAccessibleContext()
     {
-        ::osl::SolarGuard aSolarGuard( GetMutex() );
+        SolarMutexGuard aSolarGuard;
         if ( m_pTabBar == NULL )
             throw DisposedException( ::rtl::OUString(), *this );
 
@@ -91,7 +92,7 @@ namespace svt
     void SAL_CALL PanelTabBarPeer::dispose() throw(RuntimeException)
     {
         {
-            ::osl::SolarGuard aSolarGuard( GetMutex() );
+            SolarMutexGuard aSolarGuard;
             m_pTabBar = NULL;
         }
         VCLXWindow::dispose();
diff --git a/svtools/source/toolpanel/toolpanel.src b/svtools/source/toolpanel/toolpanel.src
index 5908a8fbcf98..6170c1eed42f 100644
--- a/svtools/source/toolpanel/toolpanel.src
+++ b/svtools/source/toolpanel/toolpanel.src
@@ -41,17 +41,7 @@ Image IMG_TRIANGLE_RIGHT
     ImageBitmap = Bitmap { File = "triangle_right.png"; };
 };
 
-Image IMG_TRIANGLE_RIGHT_HC
-{
-    ImageBitmap = Bitmap { File = "triangle_right_hc.png"; };
-};
-
 Image IMG_TRIANGLE_DOWN
 {
     ImageBitmap = Bitmap { File = "triangle_down.png"; };
 };
-
-Image IMG_TRIANGLE_DOWN_HC
-{
-    ImageBitmap = Bitmap { File = "plus.png"; } ;
-};
diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.cxx b/svtools/source/toolpanel/toolpaneldeckpeer.cxx
index c0a6f041f06f..8565b30f0e0a 100644
--- a/svtools/source/toolpanel/toolpaneldeckpeer.cxx
+++ b/svtools/source/toolpanel/toolpaneldeckpeer.cxx
@@ -35,6 +35,7 @@
 /** === end UNO includes === **/
 
 #include <tools/diagnose_ex.h>
+#include <vcl/svapp.hxx>
 
 //......................................................................................................................
 namespace svt
@@ -75,7 +76,7 @@ namespace svt
     //------------------------------------------------------------------------------------------------------------------
     Reference< XAccessibleContext > ToolPanelDeckPeer::CreateAccessibleContext()
     {
-        ::osl::SolarGuard aSolarGuard( GetMutex() );
+        SolarMutexGuard aSolarGuard;
         if ( m_pDeck == NULL )
             throw DisposedException( ::rtl::OUString(), *this );
 
@@ -89,7 +90,7 @@ namespace svt
     void SAL_CALL ToolPanelDeckPeer::dispose() throw(RuntimeException)
     {
         {
-            ::osl::SolarGuard aSolarGuard( GetMutex() );
+            SolarMutexGuard aSolarGuard;
             m_pDeck = NULL;
         }
         VCLXWindow::dispose();
diff --git a/svtools/source/toolpanel/toolpaneldrawer.cxx b/svtools/source/toolpanel/toolpaneldrawer.cxx
index 076a99411e7d..41593b1d6897 100644
--- a/svtools/source/toolpanel/toolpaneldrawer.cxx
+++ b/svtools/source/toolpanel/toolpaneldrawer.cxx
@@ -159,25 +159,18 @@ namespace svt
         return aExpansionIndicatorArea;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Image ToolPanelDrawer::impl_getExpansionIndicator() const
     {
-        const bool bHighContrastMode( GetSettings().GetStyleSettings().GetHighContrastMode() != 0 );
         USHORT nResourceId = 0;
         if ( m_bExpanded )
-            if ( bHighContrastMode )
-                nResourceId = IMG_TRIANGLE_DOWN_HC;
-            else
-                nResourceId = IMG_TRIANGLE_DOWN;
+            nResourceId = IMG_TRIANGLE_DOWN;
         else
-            if ( bHighContrastMode )
-                nResourceId = IMG_TRIANGLE_RIGHT_HC;
-            else
-                nResourceId = IMG_TRIANGLE_RIGHT;
+            nResourceId = IMG_TRIANGLE_RIGHT;
         return Image( SvtResId( nResourceId ) );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     USHORT ToolPanelDrawer::impl_getTextStyle() const
     {
         const USHORT nBasicStyle =  TEXT_DRAW_LEFT
diff --git a/svtools/source/toolpanel/toolpaneldrawerpeer.cxx b/svtools/source/toolpanel/toolpaneldrawerpeer.cxx
index e6282c530a00..1d264dc3228d 100644
--- a/svtools/source/toolpanel/toolpaneldrawerpeer.cxx
+++ b/svtools/source/toolpanel/toolpaneldrawerpeer.cxx
@@ -39,6 +39,7 @@
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <vcl/vclevent.hxx>
+#include <vcl/svapp.hxx>
 
 //......................................................................................................................
 namespace svt
@@ -134,7 +135,7 @@ namespace svt
     //------------------------------------------------------------------------------------------------------------------
     Reference< XAccessibleContext > ToolPanelDrawerPeer::CreateAccessibleContext()
     {
-        ::osl::SolarGuard aSolarGuard( GetMutex() );
+        SolarMutexGuard aSolarGuard;
         return new ToolPanelDrawerContext( *this );
     }
 
diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx
index 072b54d3a3f6..48010373a091 100644
--- a/svtools/source/uno/addrtempuno.cxx
+++ b/svtools/source/uno/addrtempuno.cxx
@@ -113,7 +113,7 @@ namespace svt
     OAddressBookSourceDialogUno::OAddressBookSourceDialogUno(const Reference< XMultiServiceFactory >& _rxORB)
         :OGenericUnoDialog(_rxORB)
     {
-        registerProperty(::rtl::OUString::createFromAscii(UNODIALOG_PROPERTY_ALIASES), UNODIALOG_PROPERTY_ID_ALIASES, PropertyAttribute::READONLY,
+        registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNODIALOG_PROPERTY_ALIASES)), UNODIALOG_PROPERTY_ID_ALIASES, PropertyAttribute::READONLY,
             &m_aAliases, getCppuType(&m_aAliases));
     }
 
@@ -139,7 +139,7 @@ namespace svt
     //-------------------------------------------------------------------------
     ::rtl::OUString OAddressBookSourceDialogUno::getImplementationName_Static() throw(RuntimeException)
     {
-        return ::rtl::OUString::createFromAscii("com.sun.star.comp.svtools.OAddressBookSourceDialogUno");
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.OAddressBookSourceDialogUno" ));
     }
 
     //-------------------------------------------------------------------------
@@ -152,7 +152,7 @@ namespace svt
     ::comphelper::StringSequence OAddressBookSourceDialogUno::getSupportedServiceNames_Static() throw(RuntimeException)
     {
         ::comphelper::StringSequence aSupported(1);
-        aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.ui.AddressBookSourceDialog");
+        aSupported.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.AddressBookSourceDialog" ));
         return aSupported;
     }
 
diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx
index 65834dd8b3cc..4d163f68acaa 100644
--- a/svtools/source/uno/contextmenuhelper.cxx
+++ b/svtools/source/uno/contextmenuhelper.cxx
@@ -504,15 +504,11 @@ ContextMenuHelper::associateUIConfigurationManagers()
 }
 
 Image
-ContextMenuHelper::getImageFromCommandURL(
-    const ::rtl::OUString& aCmdURL,
-    bool                   bHiContrast ) const
+ContextMenuHelper::getImageFromCommandURL( const ::rtl::OUString& aCmdURL ) const
 {
     Image     aImage;
     sal_Int16 nImageType( ui::ImageType::COLOR_NORMAL|
                           ui::ImageType::SIZE_DEFAULT );
-    if ( bHiContrast )
-        nImageType |= ui::ImageType::COLOR_HIGHCONTRAST;
 
     uno::Sequence< uno::Reference< graphic::XGraphic > > aGraphicSeq;
     uno::Sequence< ::rtl::OUString > aImageCmdSeq( 1 );
@@ -544,7 +540,7 @@ ContextMenuHelper::getImageFromCommandURL(
         {
             aGraphicSeq = m_xModuleImageMgr->getImages( nImageType, aImageCmdSeq );
             uno::Reference< ::com::sun::star::graphic::XGraphic > xGraphic = aGraphicSeq[0];
-        aImage = Image( xGraphic );
+            aImage = Image( xGraphic );
 
             if ( !!aImage )
                 return aImage;
@@ -609,7 +605,6 @@ ContextMenuHelper::completeMenuProperties(
     // menu correctly.
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
     bool  bShowMenuImages( rSettings.GetUseImagesInMenus() );
-    bool  bIsHiContrast( rSettings.GetHighContrastMode() );
 
     if ( pMenu )
     {
@@ -639,7 +634,7 @@ ContextMenuHelper::completeMenuProperties(
                 {
                     Image aImage;
                     if ( aCmdURL.getLength() > 0 )
-                        aImage = getImageFromCommandURL( aCmdURL, bIsHiContrast );
+                        aImage = getImageFromCommandURL( aCmdURL );
                     pMenu->SetItemImage( nId, aImage );
                 }
                 else
diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx
index b1c050fe3eff..a5bffed006b7 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -67,9 +67,9 @@ OGenericUnoDialog::OGenericUnoDialog(const Reference< XMultiServiceFactory >& _r
         ,m_bNeedInitialization( false )
         ,m_aContext( _rxORB )
 {
-    registerProperty(::rtl::OUString::createFromAscii(UNODIALOG_PROPERTY_TITLE), UNODIALOG_PROPERTY_ID_TITLE, PropertyAttribute::TRANSIENT,
+    registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNODIALOG_PROPERTY_TITLE)), UNODIALOG_PROPERTY_ID_TITLE, PropertyAttribute::TRANSIENT,
         &m_sTitle, getCppuType(&m_sTitle));
-    registerProperty(::rtl::OUString::createFromAscii(UNODIALOG_PROPERTY_PARENT), UNODIALOG_PROPERTY_ID_PARENT, PropertyAttribute::TRANSIENT,
+    registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNODIALOG_PROPERTY_PARENT)), UNODIALOG_PROPERTY_ID_PARENT, PropertyAttribute::TRANSIENT,
         &m_xParent, getCppuType(&m_xParent));
 }
 
@@ -84,9 +84,9 @@ OGenericUnoDialog::OGenericUnoDialog(const Reference< XComponentContext >& _rxCo
         ,m_bNeedInitialization( false )
         ,m_aContext(_rxContext)
 {
-    registerProperty(::rtl::OUString::createFromAscii(UNODIALOG_PROPERTY_TITLE), UNODIALOG_PROPERTY_ID_TITLE, PropertyAttribute::TRANSIENT,
+    registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNODIALOG_PROPERTY_TITLE)), UNODIALOG_PROPERTY_ID_TITLE, PropertyAttribute::TRANSIENT,
         &m_sTitle, getCppuType(&m_sTitle));
-    registerProperty(::rtl::OUString::createFromAscii(UNODIALOG_PROPERTY_PARENT), UNODIALOG_PROPERTY_ID_PARENT, PropertyAttribute::TRANSIENT,
+    registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNODIALOG_PROPERTY_PARENT)), UNODIALOG_PROPERTY_ID_PARENT, PropertyAttribute::TRANSIENT,
         &m_xParent, getCppuType(&m_xParent));
 }
 
@@ -189,7 +189,7 @@ void SAL_CALL OGenericUnoDialog::setTitle( const ::rtl::OUString& _rTitle ) thro
 
     try
     {
-        setPropertyValue(::rtl::OUString::createFromAscii(UNODIALOG_PROPERTY_TITLE), makeAny(_rTitle));
+        setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNODIALOG_PROPERTY_TITLE)), makeAny(_rTitle));
     }
     catch(RuntimeException&)
     {
diff --git a/svtools/source/uno/miscservices.cxx b/svtools/source/uno/miscservices.cxx
index 7219155e62b4..ad614a3f7b88 100644
--- a/svtools/source/uno/miscservices.cxx
+++ b/svtools/source/uno/miscservices.cxx
@@ -113,14 +113,14 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
         uno::Sequence< ::rtl::OUString >            aServices;
 
         xNewKey = xRegistryKey->createKey (
-            OUString::createFromAscii( "/com.sun.star.comp.svtools.OAddressBookSourceDialogUno/UNO/SERVICES" ) );
+            OUString( RTL_CONSTASCII_USTRINGPARAM( "/com.sun.star.comp.svtools.OAddressBookSourceDialogUno/UNO/SERVICES" )) );
         xNewKey->createKey(
-            OUString::createFromAscii( "com.sun.star.ui.AddressBookSourceDialog" ) );
+            OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.AddressBookSourceDialog" )) );
 
         xNewKey = xRegistryKey->createKey (
-            OUString::createFromAscii( "/com.sun.star.svtools.SvFilterOptionsDialog/UNO/SERVICES" ) );
+            OUString( RTL_CONSTASCII_USTRINGPARAM( "/com.sun.star.svtools.SvFilterOptionsDialog/UNO/SERVICES" )) );
         xNewKey->createKey (
-            OUString::createFromAscii( "com.sun.star.ui.dialogs.FilterOptionsDialog" ) );
+            OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilterOptionsDialog" )) );
 
         // GraphicProvider
         xNewKey = reinterpret_cast< registry::XRegistryKey * >( _pRegistryKey )->createKey(
@@ -163,7 +163,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
         {
             Sequence< OUString > aServiceNames(1);
             aServiceNames.getArray()[0] =
-                OUString::createFromAscii( "com.sun.star.ui.AddressBookSourceDialog" );
+                OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.AddressBookSourceDialog" ));
 
             xFactory = ::cppu::createSingleFactory (
                 reinterpret_cast< XMultiServiceFactory* >( _pServiceManager ),
@@ -176,7 +176,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
         {
             Sequence< OUString > aServiceNames(1);
             aServiceNames.getArray()[0] =
-                OUString::createFromAscii( "com.sun.star.ui.dialogs.FilterOptionsDialog" );
+                OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilterOptionsDialog" ));
 
             xFactory = ::cppu::createSingleFactory (
                 reinterpret_cast< XMultiServiceFactory* >( _pServiceManager ),
diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx
index 1e82f2f729ef..e0d51e32aa63 100644
--- a/svtools/source/uno/svtxgridcontrol.cxx
+++ b/svtools/source/uno/svtxgridcontrol.cxx
@@ -51,6 +51,8 @@
 #include <com/sun/star/util/Color.hpp>
 #include <com/sun/star/awt/FontDescriptor.hpp>
 
+#include <vcl/svapp.hxx>
+
 using ::rtl::OUString;
 using namespace ::svt::table;
 using namespace ::com::sun::star::uno;
@@ -124,7 +126,7 @@ void SAL_CALL SVTXGridControl::removeSelectionListener(const ::com::sun::star::u
 
 void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const Any& aValue) throw(RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     TableControl* pTable = (TableControl*)GetWindow();
     switch( GetPropertyId( PropertyName ) )
@@ -285,7 +287,7 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An
                             }
                             else
                                 if((unsigned int)rawRowData.getLength()!=(unsigned)m_pTableModel->getColumnCount())
-                                    throw GridInvalidDataException(rtl::OUString::createFromAscii("The column count doesn't match with the length of row data"), m_xDataModel);
+                                    throw GridInvalidDataException(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "The column count doesn't match with the length of row data" )), m_xDataModel);
 
                             for ( int k = 0; k < rawRowData.getLength(); k++)
                             {
@@ -302,7 +304,7 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An
                     }
                 }
                 else
-                    throw GridInvalidDataException(rtl::OUString::createFromAscii("The data model isn't set!"), m_xDataModel);
+                    throw GridInvalidDataException(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "The data model isn't set!" )), m_xDataModel);
                 sal_Int32 fontHeight = pTable->PixelToLogic( Size( 0, pTable->GetTextHeight()+3 ), MAP_APPFONT ).Height();
                 if(m_xDataModel->getRowHeight() == 0)
                 {
@@ -351,7 +353,7 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An
                 }
             }
             else
-                throw GridInvalidModelException(rtl::OUString::createFromAscii("The column model isn't set!"), m_xColumnModel);
+                throw GridInvalidModelException(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "The column model isn't set!" )), m_xColumnModel);
 
             break;
         }
@@ -363,7 +365,7 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An
 
 Any SVTXGridControl::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     const sal_uInt16 nPropId = GetPropertyId( PropertyName );
     TableControl* pTable = (TableControl*)GetWindow();
@@ -422,7 +424,7 @@ void SVTXGridControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 }
 void SAL_CALL SVTXGridControl::setVisible( sal_Bool bVisible ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     TableControl* pTable = (TableControl*)GetWindow();
     if ( pTable )
     {
@@ -432,13 +434,13 @@ void SAL_CALL SVTXGridControl::setVisible( sal_Bool bVisible ) throw(::com::sun:
 }
 void SAL_CALL SVTXGridControl::setFocus() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     if ( GetWindow())
         GetWindow()->GrabFocus();
 }
 void SAL_CALL SVTXGridControl::rowAdded(const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     std::vector< Any > newRow;
     Sequence< Any > rawRowData = Event.rowData;
@@ -456,7 +458,7 @@ void SAL_CALL SVTXGridControl::rowAdded(const ::com::sun::star::awt::grid::GridD
 
     }
     else if((unsigned int)rawRowData.getLength()!=(unsigned)colCount)
-        throw GridInvalidDataException(rtl::OUString::createFromAscii("The column count doesn't match with the length of row data"), m_xDataModel);
+        throw GridInvalidDataException(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "The column count doesn't match with the length of row data" )), m_xDataModel);
 
     for ( int k = 0; k < rawRowData.getLength(); k++)
         newRow.push_back(rawRowData[k]);
@@ -486,7 +488,7 @@ void SAL_CALL SVTXGridControl::rowAdded(const ::com::sun::star::awt::grid::GridD
 
 void SAL_CALL SVTXGridControl::rowRemoved(const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     TableControl* pTable = (TableControl*)GetWindow();
     if(Event.index == -1)
@@ -529,73 +531,73 @@ void SAL_CALL SVTXGridControl::rowRemoved(const ::com::sun::star::awt::grid::Gri
 
 void SAL_CALL  SVTXGridControl::columnChanged(const ::com::sun::star::awt::grid::GridColumnEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     TableControl* pTable = (TableControl*)GetWindow();
-    if(Event.valueName == rtl::OUString::createFromAscii("ColumnResize"))
+    if(Event.valueName == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ColumnResize" )))
     {
         bool resizable = m_pTableModel->getColumnModel()[Event.index]->isResizable();
         Event.newValue>>=resizable;
         m_pTableModel->getColumnModel()[Event.index]->setResizable(resizable);
     }
-    else if(Event.valueName == rtl::OUString::createFromAscii("ColWidth"))
+    else if(Event.valueName == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ColWidth" )))
     {
         sal_Int32 colWidth = m_pTableModel->getColumnModel()[Event.index]->getWidth();
         Event.newValue>>=colWidth;
         m_pTableModel->getColumnModel()[Event.index]->setWidth(colWidth);
     }
-    else if(Event.valueName == rtl::OUString::createFromAscii("MaxWidth"))
+    else if(Event.valueName == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxWidth" )))
     {
         sal_Int32 maxWidth = m_pTableModel->getColumnModel()[Event.index]->getMaxWidth();
         Event.newValue>>=maxWidth;
         m_pTableModel->getColumnModel()[Event.index]->setMaxWidth(maxWidth);
     }
-    else if(Event.valueName == rtl::OUString::createFromAscii("MinWidth"))
+    else if(Event.valueName == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MinWidth" )))
     {
         sal_Int32 minWidth = m_pTableModel->getColumnModel()[Event.index]->getMinWidth();
         Event.newValue>>=minWidth;
         m_pTableModel->getColumnModel()[Event.index]->setMinWidth(minWidth);
     }
-    else if(Event.valueName == rtl::OUString::createFromAscii("PrefWidth"))
+    else if(Event.valueName == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrefWidth" )))
     {
         sal_Int32 prefWidth = m_pTableModel->getColumnModel()[Event.index]->getPreferredWidth();
         Event.newValue>>=prefWidth;
         m_pTableModel->getColumnModel()[Event.index]->setPreferredWidth(prefWidth);
     }
-    else if(Event.valueName == rtl::OUString::createFromAscii("HAlign"))
+    else if(Event.valueName == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HAlign" )))
     {
         ::com::sun::star::style::HorizontalAlignment hAlign = m_pTableModel->getColumnModel()[Event.index]->getHorizontalAlign();
         Event.newValue>>=hAlign;
         m_pTableModel->getColumnModel()[Event.index]->setHorizontalAlign(hAlign);
     }
-    else if(Event.valueName == rtl::OUString::createFromAscii("UpdateWidth"))
+    else if(Event.valueName == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UpdateWidth" )))
     {
         if(m_pTableModel->getColumnModel()[Event.index]->getPreferredWidth() != 0)
-            m_xColumnModel->getColumn(Event.index)->updateColumn(rtl::OUString::createFromAscii("PrefWidth"), m_pTableModel->getColumnModel()[Event.index]->getPreferredWidth());
-        m_xColumnModel->getColumn(Event.index)->updateColumn(rtl::OUString::createFromAscii("ColWidth"), m_pTableModel->getColumnModel()[Event.index]->getWidth());
+            m_xColumnModel->getColumn(Event.index)->updateColumn(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrefWidth" )), m_pTableModel->getColumnModel()[Event.index]->getPreferredWidth());
+        m_xColumnModel->getColumn(Event.index)->updateColumn(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ColWidth" )), m_pTableModel->getColumnModel()[Event.index]->getWidth());
     }
     pTable->Invalidate();
 }
 void SAL_CALL  SVTXGridControl::dataChanged(const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     TableControl* pTable = (TableControl*)GetWindow();
-    if(Event.valueName == rtl::OUString::createFromAscii("RowHeight"))
+    if(Event.valueName == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RowHeight" )))
     {
         sal_Int32 rowHeight = m_pTableModel->getRowHeight();
         Event.newValue>>=rowHeight;
         m_pTableModel->setRowHeight(rowHeight);
         pTable->Invalidate();
     }
-    else if(Event.valueName == rtl::OUString::createFromAscii("RowHeaderWidth"))
+    else if(Event.valueName == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RowHeaderWidth" )))
     {
         sal_Int32 rowHeaderWidth = m_pTableModel->getRowHeaderWidth();
         Event.newValue>>=rowHeaderWidth;
         m_pTableModel->setRowHeaderWidth(rowHeaderWidth);
         pTable->Invalidate();
     }
-    else if(Event.valueName == rtl::OUString::createFromAscii("RowHeaders"))
+    else if(Event.valueName == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RowHeaders" )))
     {
         Sequence< rtl::OUString > headers(0);
         Event.newValue>>=headers;
@@ -603,7 +605,7 @@ void SAL_CALL  SVTXGridControl::dataChanged(const ::com::sun::star::awt::grid::G
         m_pTableModel->setRowHeaderName(headerNames);
         pTable->Invalidate();
     }
-    else if(Event.valueName == rtl::OUString::createFromAscii("CellUpdated"))
+    else if(Event.valueName == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CellUpdated" )))
     {
         std::vector< std::vector< Any > >& rowContent = m_pTableModel->getCellContent();
         sal_Int32 col(0);
@@ -611,7 +613,7 @@ void SAL_CALL  SVTXGridControl::dataChanged(const ::com::sun::star::awt::grid::G
         rowContent[Event.index][col] = Event.newValue;
         pTable->InvalidateDataWindow(Event.index, Event.index, false);
     }
-    else if(Event.valueName == rtl::OUString::createFromAscii("RowUpdated"))
+    else if(Event.valueName == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RowUpdated" )))
     {
         std::vector<std::vector< Any > >& rowContent = m_pTableModel->getCellContent();
         Sequence< sal_Int32 > cols(0);
@@ -819,7 +821,7 @@ void SAL_CALL SVTXGridControl::selectColumn(::sal_Int32 x) throw (::com::sun::st
 }
 void SVTXGridControl::dispose() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::lang::EventObject aObj;
     aObj.Source = (::cppu::OWeakObject*)this;
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index 2981959bf035..1503c8a73737 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -673,22 +673,6 @@ sal_Bool ToolboxController::hasBigImages() const
     return SvtMiscOptions().AreCurrentSymbolsLarge();
 }
 
-sal_Bool ToolboxController::isHighContrast() const
-{
-    sal_Bool bHighContrast( sal_False );
-
-    Reference< XWindow > xWindow = m_pImpl->m_xParentWindow;
-    if ( xWindow.is() )
-    {
-        SolarMutexGuard aSolarMutexGuard;
-        Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-        if ( pWindow )
-            bHighContrast = ( ((ToolBox *)pWindow)->GetSettings().GetStyleSettings().GetHighContrastMode() );
-    }
-
-    return bHighContrast;
-}
-
 void ToolboxController::updateStatus()
 {
     bindListener();
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index 5ec1f1cc40cd..a4d63c4aa144 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -43,6 +43,7 @@
 
 #include <rtl/ref.hxx>
 #include <vcl/graph.hxx>
+#include <vcl/svapp.hxx>
 #include <svtools/svtreebx.hxx>
 
 #include <map>
@@ -487,7 +488,7 @@ UnoTreeListBoxImpl& TreeControlPeer::getTreeListBoxOrThrow() const throw (Runtim
 
 void TreeControlPeer::ChangeNodesSelection( const Any& rSelection, bool bSelect, bool bSetSelection ) throw( RuntimeException, IllegalArgumentException )
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
 
@@ -549,7 +550,7 @@ void TreeControlPeer::ChangeNodesSelection( const Any& rSelection, bool bSelect,
 
 sal_Bool SAL_CALL TreeControlPeer::select( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     ChangeNodesSelection( rSelection, true, true );
     return sal_True;
 }
@@ -558,7 +559,7 @@ sal_Bool SAL_CALL TreeControlPeer::select( const Any& rSelection ) throw (Illega
 
 Any SAL_CALL TreeControlPeer::getSelection() throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
 
@@ -625,7 +626,7 @@ void SAL_CALL TreeControlPeer::removeSelection( const Any& rSelection ) throw (I
 
 void SAL_CALL TreeControlPeer::clearSelection() throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     getTreeListBoxOrThrow().SelectAll( FALSE );
 }
 
@@ -633,7 +634,7 @@ void SAL_CALL TreeControlPeer::clearSelection() throw (RuntimeException)
 
 sal_Int32 SAL_CALL TreeControlPeer::getSelectionCount() throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     return getTreeListBoxOrThrow().GetSelectionCount();
 }
 
@@ -679,7 +680,7 @@ Any SAL_CALL TreeSelectionEnumeration::nextElement() throw (NoSuchElementExcepti
 
 Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration() throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
 
@@ -703,7 +704,7 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration()
 
 Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumeration() throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
 
@@ -729,7 +730,7 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumer
 
 OUString SAL_CALL TreeControlPeer::getDefaultExpandedGraphicURL() throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     return msDefaultExpandedGraphicURL;
 }
 
@@ -737,7 +738,7 @@ OUString SAL_CALL TreeControlPeer::getDefaultExpandedGraphicURL() throw (::com::
 
 void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const ::rtl::OUString& sDefaultExpandedGraphicURL ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     if( msDefaultExpandedGraphicURL != sDefaultExpandedGraphicURL )
     {
         if( sDefaultExpandedGraphicURL.getLength() )
@@ -767,7 +768,7 @@ void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const ::rtl::OUStri
 
 OUString SAL_CALL TreeControlPeer::getDefaultCollapsedGraphicURL() throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     return msDefaultCollapsedGraphicURL;
 }
 
@@ -775,7 +776,7 @@ OUString SAL_CALL TreeControlPeer::getDefaultCollapsedGraphicURL() throw (::com:
 
 void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const ::rtl::OUString& sDefaultCollapsedGraphicURL ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     if( msDefaultCollapsedGraphicURL != sDefaultCollapsedGraphicURL )
     {
         if( sDefaultCollapsedGraphicURL.getLength() )
@@ -805,7 +806,7 @@ void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const ::rtl::OUStr
 
 sal_Bool SAL_CALL TreeControlPeer::isNodeExpanded( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
     UnoTreeListEntry* pEntry = getEntry( xNode );
@@ -816,7 +817,7 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeExpanded( const Reference< XTreeNode >&
 
 sal_Bool SAL_CALL TreeControlPeer::isNodeCollapsed( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     return !isNodeExpanded( xNode );
 }
 
@@ -824,7 +825,7 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeCollapsed( const Reference< XTreeNode >
 
 void SAL_CALL TreeControlPeer::makeNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
     UnoTreeListEntry* pEntry = getEntry( xNode );
@@ -836,7 +837,7 @@ void SAL_CALL TreeControlPeer::makeNodeVisible( const Reference< XTreeNode >& xN
 
 sal_Bool SAL_CALL TreeControlPeer::isNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
     UnoTreeListEntry* pEntry = getEntry( xNode );
@@ -847,7 +848,7 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeVisible( const Reference< XTreeNode >&
 
 void SAL_CALL TreeControlPeer::expandNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
     UnoTreeListEntry* pEntry = getEntry( xNode );
@@ -859,7 +860,7 @@ void SAL_CALL TreeControlPeer::expandNode( const Reference< XTreeNode >& xNode )
 
 void SAL_CALL TreeControlPeer::collapseNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
     UnoTreeListEntry* pEntry = getEntry( xNode );
@@ -885,7 +886,7 @@ void SAL_CALL TreeControlPeer::removeTreeExpansionListener( const Reference< XTr
 
 Reference< XTreeNode > SAL_CALL TreeControlPeer::getNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
 
@@ -903,7 +904,7 @@ Reference< XTreeNode > SAL_CALL TreeControlPeer::getNodeForLocation( sal_Int32 x
 
 Reference< XTreeNode > SAL_CALL TreeControlPeer::getClosestNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
 
@@ -921,7 +922,7 @@ Reference< XTreeNode > SAL_CALL TreeControlPeer::getClosestNodeForLocation( sal_
 
 awt::Rectangle SAL_CALL TreeControlPeer::getNodeRect( const Reference< XTreeNode >& i_Node ) throw (IllegalArgumentException, RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
     UnoTreeListEntry* pEntry = getEntry( i_Node, true );
@@ -934,7 +935,7 @@ awt::Rectangle SAL_CALL TreeControlPeer::getNodeRect( const Reference< XTreeNode
 
 sal_Bool SAL_CALL TreeControlPeer::isEditing(  ) throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
     return rTree.IsEditingActive() ? sal_True : sal_False;
@@ -944,7 +945,7 @@ sal_Bool SAL_CALL TreeControlPeer::isEditing(  ) throw (RuntimeException)
 
 sal_Bool SAL_CALL TreeControlPeer::stopEditing() throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
     if( rTree.IsEditingActive() )
@@ -962,7 +963,7 @@ sal_Bool SAL_CALL TreeControlPeer::stopEditing() throw (RuntimeException)
 
 void SAL_CALL TreeControlPeer::cancelEditing(  ) throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
     rTree.EndEditing(FALSE);
@@ -972,7 +973,7 @@ void SAL_CALL TreeControlPeer::cancelEditing(  ) throw (RuntimeException)
 
 void SAL_CALL TreeControlPeer::startEditingAtNode( const Reference< XTreeNode >& xNode ) throw (IllegalArgumentException, RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
     UnoTreeListEntry* pEntry = getEntry( xNode );
@@ -1042,7 +1043,7 @@ bool TreeControlPeer::onEditedEntry( UnoTreeListEntry* pEntry, const XubString&
 
 void SAL_CALL TreeControlPeer::treeNodesChanged( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if( mnEditLock != 0 )
         return;
@@ -1052,7 +1053,7 @@ void SAL_CALL TreeControlPeer::treeNodesChanged( const ::com::sun::star::awt::tr
 
 void SAL_CALL TreeControlPeer::treeNodesInserted( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if( mnEditLock != 0 )
         return;
@@ -1062,7 +1063,7 @@ void SAL_CALL TreeControlPeer::treeNodesInserted( const ::com::sun::star::awt::t
 
 void SAL_CALL TreeControlPeer::treeNodesRemoved( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if( mnEditLock != 0 )
         return;
@@ -1072,7 +1073,7 @@ void SAL_CALL TreeControlPeer::treeNodesRemoved( const ::com::sun::star::awt::tr
 
 void SAL_CALL TreeControlPeer::treeStructureChanged( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if( mnEditLock != 0 )
         return;
@@ -1242,7 +1243,7 @@ OUString TreeControlPeer::getEntryString( const Any& rValue )
 void SAL_CALL TreeControlPeer::disposing( const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException)
 {
     // model is disposed, so we clear our tree
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
     rTree.Clear();
     mxDataModel.clear();
@@ -1282,7 +1283,7 @@ void TreeControlPeer::onChangeDataModel( UnoTreeListBoxImpl& rTree, const Refere
 
 ::com::sun::star::awt::Size TreeControlPeer::getMinimumSize() throw(RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::awt::Size aSz;
 /* todo
@@ -1300,7 +1301,7 @@ void TreeControlPeer::onChangeDataModel( UnoTreeListBoxImpl& rTree, const Refere
 
 ::com::sun::star::awt::Size TreeControlPeer::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::awt::Size aSz = rNewSize;
 /* todo
@@ -1317,7 +1318,7 @@ void TreeControlPeer::onChangeDataModel( UnoTreeListBoxImpl& rTree, const Refere
 
 void TreeControlPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& aValue) throw(RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
 
@@ -1420,7 +1421,7 @@ void TreeControlPeer::setProperty( const ::rtl::OUString& PropertyName, const An
 
 Any TreeControlPeer::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     const sal_uInt16 nPropId = GetPropertyId( PropertyName );
     if( (nPropId >= BASEPROPERTY_TREE_START) && (nPropId <= BASEPROPERTY_TREE_END) )
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index cc40453f2d72..bfca764bd587 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -226,7 +226,7 @@ void VCLXMultiLineEdit::removeTextListener( const ::com::sun::star::uno::Referen
 
 void VCLXMultiLineEdit::setText( const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     MultiLineEdit* pEdit = (MultiLineEdit*)GetWindow();
     if ( pEdit )
@@ -243,7 +243,7 @@ void VCLXMultiLineEdit::setText( const ::rtl::OUString& aText ) throw(::com::sun
 
 void VCLXMultiLineEdit::insertText( const ::com::sun::star::awt::Selection& rSel, const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     MultiLineEdit* pEdit = (MultiLineEdit*)GetWindow();
     if ( pEdit )
@@ -255,7 +255,7 @@ void VCLXMultiLineEdit::insertText( const ::com::sun::star::awt::Selection& rSel
 
 ::rtl::OUString VCLXMultiLineEdit::getText() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::rtl::OUString aText;
     MultiLineEdit* pEdit = (MultiLineEdit*)GetWindow();
@@ -266,7 +266,7 @@ void VCLXMultiLineEdit::insertText( const ::com::sun::star::awt::Selection& rSel
 
 ::rtl::OUString VCLXMultiLineEdit::getSelectedText() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::rtl::OUString aText;
     MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow();
@@ -278,7 +278,7 @@ void VCLXMultiLineEdit::insertText( const ::com::sun::star::awt::Selection& rSel
 
 void VCLXMultiLineEdit::setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow();
     if ( pMultiLineEdit )
@@ -289,7 +289,7 @@ void VCLXMultiLineEdit::setSelection( const ::com::sun::star::awt::Selection& aS
 
 ::com::sun::star::awt::Selection VCLXMultiLineEdit::getSelection() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::awt::Selection aSel;
     MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow();
@@ -303,7 +303,7 @@ void VCLXMultiLineEdit::setSelection( const ::com::sun::star::awt::Selection& aS
 
 sal_Bool VCLXMultiLineEdit::isEditable() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow();
     return ( pMultiLineEdit && !pMultiLineEdit->IsReadOnly() && pMultiLineEdit->IsEnabled() ) ? sal_True : sal_False;
@@ -311,7 +311,7 @@ sal_Bool VCLXMultiLineEdit::isEditable() throw(::com::sun::star::uno::RuntimeExc
 
 void VCLXMultiLineEdit::setEditable( sal_Bool bEditable ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow();
     if ( pMultiLineEdit )
@@ -320,7 +320,7 @@ void VCLXMultiLineEdit::setEditable( sal_Bool bEditable ) throw(::com::sun::star
 
 void VCLXMultiLineEdit::setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow();
     if ( pMultiLineEdit )
@@ -329,7 +329,7 @@ void VCLXMultiLineEdit::setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::
 
 sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow();
     return pMultiLineEdit ? (sal_Int16)pMultiLineEdit->GetMaxTextLen() : (sal_Int16)0;
@@ -337,7 +337,7 @@ sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::Runtim
 
 ::rtl::OUString VCLXMultiLineEdit::getTextLines() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::rtl::OUString aText;
     MultiLineEdit* pEdit = (MultiLineEdit*)GetWindow();
@@ -348,7 +348,7 @@ sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::Runtim
 
 ::com::sun::star::awt::Size VCLXMultiLineEdit::getMinimumSize() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::awt::Size aSz;
     MultiLineEdit* pEdit = (MultiLineEdit*) GetWindow();
@@ -364,7 +364,7 @@ sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::Runtim
 
 ::com::sun::star::awt::Size VCLXMultiLineEdit::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::awt::Size aSz = rNewSize;
     MultiLineEdit* pEdit = (MultiLineEdit*) GetWindow();
@@ -375,7 +375,7 @@ sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::Runtim
 
 ::com::sun::star::awt::Size VCLXMultiLineEdit::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::awt::Size aSz;
     MultiLineEdit* pEdit = (MultiLineEdit*) GetWindow();
@@ -386,7 +386,7 @@ sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::Runtim
 
 void VCLXMultiLineEdit::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     nCols = nLines = 0;
     MultiLineEdit* pEdit = (MultiLineEdit*) GetWindow();
@@ -423,7 +423,7 @@ void VCLXMultiLineEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEven
 
 void VCLXMultiLineEdit::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     MultiLineEdit* pMultiLineEdit = (MultiLineEdit*)GetWindow();
     if ( pMultiLineEdit )
@@ -479,7 +479,7 @@ void VCLXMultiLineEdit::setProperty( const ::rtl::OUString& PropertyName, const
 
 ::com::sun::star::uno::Any VCLXMultiLineEdit::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Any aProp;
     MultiLineEdit* pMultiLineEdit = (MultiLineEdit*)GetWindow();
@@ -523,7 +523,7 @@ void VCLXMultiLineEdit::setProperty( const ::rtl::OUString& PropertyName, const
 
 void SAL_CALL VCLXMultiLineEdit::setFocus(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     // don't grab the focus if we already have it. Reason is that the only thing which the edit
     // does is forwarding the focus to it's text window. This text window then does a "select all".
@@ -578,7 +578,7 @@ IMPL_XTYPEPROVIDER_END
 
 void SAL_CALL VCLXFileControl::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FileControl* pControl = (FileControl*)GetWindow();
     if ( pControl )
@@ -628,7 +628,7 @@ void VCLXFileControl::removeTextListener( const ::com::sun::star::uno::Reference
 
 void VCLXFileControl::setText( const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindow();
     if ( pWindow )
@@ -643,7 +643,7 @@ void VCLXFileControl::setText( const ::rtl::OUString& aText ) throw(::com::sun::
 
 void VCLXFileControl::insertText( const ::com::sun::star::awt::Selection& rSel, const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FileControl* pFileControl = (FileControl*) GetWindow();
     if ( pFileControl )
@@ -655,7 +655,7 @@ void VCLXFileControl::insertText( const ::com::sun::star::awt::Selection& rSel,
 
 ::rtl::OUString VCLXFileControl::getText() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::rtl::OUString aText;
     Window* pWindow = GetWindow();
@@ -666,7 +666,7 @@ void VCLXFileControl::insertText( const ::com::sun::star::awt::Selection& rSel,
 
 ::rtl::OUString VCLXFileControl::getSelectedText() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::rtl::OUString aText;
     FileControl* pFileControl = (FileControl*) GetWindow();
@@ -678,7 +678,7 @@ void VCLXFileControl::insertText( const ::com::sun::star::awt::Selection& rSel,
 
 void VCLXFileControl::setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FileControl* pFileControl = (FileControl*) GetWindow();
     if ( pFileControl )
@@ -687,7 +687,7 @@ void VCLXFileControl::setSelection( const ::com::sun::star::awt::Selection& aSel
 
 ::com::sun::star::awt::Selection VCLXFileControl::getSelection() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::awt::Selection aSel;
     FileControl* pFileControl = (FileControl*) GetWindow();
@@ -701,7 +701,7 @@ void VCLXFileControl::setSelection( const ::com::sun::star::awt::Selection& aSel
 
 sal_Bool VCLXFileControl::isEditable() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FileControl* pFileControl = (FileControl*) GetWindow();
     return ( pFileControl && !pFileControl->GetEdit().IsReadOnly() && pFileControl->GetEdit().IsEnabled() ) ? sal_True : sal_False;
@@ -709,7 +709,7 @@ sal_Bool VCLXFileControl::isEditable() throw(::com::sun::star::uno::RuntimeExcep
 
 void VCLXFileControl::setEditable( sal_Bool bEditable ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FileControl* pFileControl = (FileControl*) GetWindow();
     if ( pFileControl )
@@ -718,7 +718,7 @@ void VCLXFileControl::setEditable( sal_Bool bEditable ) throw(::com::sun::star::
 
 void VCLXFileControl::setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FileControl* pFileControl = (FileControl*) GetWindow();
     if ( pFileControl )
@@ -727,7 +727,7 @@ void VCLXFileControl::setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::un
 
 sal_Int16 VCLXFileControl::getMaxTextLen() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FileControl* pFileControl = (FileControl*) GetWindow();
     return pFileControl ? pFileControl->GetEdit().GetMaxTextLen() : 0;
@@ -745,7 +745,7 @@ IMPL_LINK( VCLXFileControl, ModifyHdl, Edit*, EMPTYARG )
 
 ::com::sun::star::awt::Size VCLXFileControl::getMinimumSize() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::awt::Size aSz;
     FileControl* pControl = (FileControl*) GetWindow();
@@ -767,7 +767,7 @@ IMPL_LINK( VCLXFileControl, ModifyHdl, Edit*, EMPTYARG )
 
 ::com::sun::star::awt::Size VCLXFileControl::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::awt::Size aSz =rNewSize;
     FileControl* pControl = (FileControl*) GetWindow();
@@ -782,7 +782,7 @@ IMPL_LINK( VCLXFileControl, ModifyHdl, Edit*, EMPTYARG )
 
 ::com::sun::star::awt::Size VCLXFileControl::getMinimumSize( sal_Int16 nCols, sal_Int16 ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::awt::Size aSz;
     FileControl* pControl = (FileControl*) GetWindow();
@@ -796,7 +796,7 @@ IMPL_LINK( VCLXFileControl, ModifyHdl, Edit*, EMPTYARG )
 
 void VCLXFileControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     nCols = 0;
     nLines = 1;
@@ -847,7 +847,7 @@ void SVTXFormattedField::SetWindow( Window* _pWindow )
 // --------------------------------------------------------------------------------------
 void SVTXFormattedField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -972,7 +972,7 @@ void SVTXFormattedField::setProperty( const ::rtl::OUString& PropertyName, const
 // --------------------------------------------------------------------------------------
 ::com::sun::star::uno::Any SVTXFormattedField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Any aReturn;
 
@@ -1433,7 +1433,7 @@ void SVTXRoadmap::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
     {
         case VCLEVENT_ROADMAP_ITEMSELECTED:
         {
-            ::osl::SolarGuard aGuard( GetMutex() );
+            SolarMutexGuard aGuard;
             ::svt::ORoadmap* pField = GetRoadmap();
             if ( pField )
             {
@@ -1455,7 +1455,7 @@ void SVTXRoadmap::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 
 void SVTXRoadmap::propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     ::svt::ORoadmap* pField = GetRoadmap();
     if ( pField )
     {
@@ -1463,25 +1463,25 @@ void SVTXRoadmap::propertyChange( const ::com::sun::star::beans::PropertyChangeE
         xRoadmapItem = evt.Source;
         sal_Int32 nID = 0;
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropertySet( xRoadmapItem, ::com::sun::star::uno::UNO_QUERY );
-        ::com::sun::star::uno::Any aValue = xPropertySet->getPropertyValue(::rtl::OUString::createFromAscii( "ID" ));
+        ::com::sun::star::uno::Any aValue = xPropertySet->getPropertyValue(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ID" )));
         aValue >>= nID;
 
         ::com::sun::star::uno::Any rVal = evt.NewValue;
         evt.NewValue >>= rVal;
         ::rtl::OUString sPropertyName = evt.PropertyName;
-        if ( sPropertyName.equals(::rtl::OUString::createFromAscii( "Enabled" ) ) )
+        if ( sPropertyName.equals(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enabled" )) ) )
         {
             sal_Bool bEnable = false;
             evt.NewValue >>= bEnable;
             pField->EnableRoadmapItem( (RoadmapTypes::ItemId)nID , bEnable );
         }
-        else if ( sPropertyName.equals(::rtl::OUString::createFromAscii( "Label" ) ) )
+        else if ( sPropertyName.equals(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Label" )) ) )
         {
             ::rtl::OUString sLabel;
             evt.NewValue >>= sLabel;
             pField->ChangeRoadmapItemLabel( (RoadmapTypes::ItemId)nID , sLabel );
         }
-        else if  ( sPropertyName.equals(::rtl::OUString::createFromAscii( "ID" ) ) )
+        else if  ( sPropertyName.equals(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ID" )) ) )
         {
             sal_Int32 nNewID = 0;
             evt.NewValue >>= nNewID;
@@ -1512,11 +1512,11 @@ RMItemData SVTXRoadmap::GetRMItemData( const ::com::sun::star::container::Contai
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropertySet( xRoadmapItem, ::com::sun::star::uno::UNO_QUERY );
     if ( xPropertySet.is() )
     {
-        ::com::sun::star::uno::Any aValue = xPropertySet->getPropertyValue(::rtl::OUString::createFromAscii( "Label" ));
+        ::com::sun::star::uno::Any aValue = xPropertySet->getPropertyValue(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Label" )));
         aValue >>= aCurRMItemData.Label;
-        aValue = xPropertySet->getPropertyValue(::rtl::OUString::createFromAscii( "ID" ));
+        aValue = xPropertySet->getPropertyValue(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ID" )));
         aValue >>= aCurRMItemData.n_ID;
-        aValue = xPropertySet->getPropertyValue(::rtl::OUString::createFromAscii( "Enabled" ));
+        aValue = xPropertySet->getPropertyValue(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enabled" )));
         aValue >>= aCurRMItemData.b_Enabled;
     }
     return aCurRMItemData;;
@@ -1524,7 +1524,7 @@ RMItemData SVTXRoadmap::GetRMItemData( const ::com::sun::star::container::Contai
 
 void SVTXRoadmap::elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent )throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     ::svt::ORoadmap* pField = GetRoadmap();
     if ( pField )
     {
@@ -1537,7 +1537,7 @@ void SVTXRoadmap::elementInserted( const ::com::sun::star::container::ContainerE
 
 void SVTXRoadmap::elementRemoved( const ::com::sun::star::container::ContainerEvent& _rEvent )throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     ::svt::ORoadmap* pField = GetRoadmap();
     if ( pField )
     {
@@ -1551,7 +1551,7 @@ void SVTXRoadmap::elementRemoved( const ::com::sun::star::container::ContainerEv
 
 void SVTXRoadmap::elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent )throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     ::svt::ORoadmap* pField = GetRoadmap();
     if ( pField )
     {
@@ -1567,7 +1567,7 @@ void SVTXRoadmap::elementReplaced( const ::com::sun::star::container::ContainerE
 // --------------------------------------------------------------------------------------
 void SVTXRoadmap::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::svt::ORoadmap* pField = GetRoadmap();
     if ( pField )
@@ -1622,7 +1622,7 @@ void SVTXRoadmap::setProperty( const ::rtl::OUString& PropertyName, const ::com:
 // --------------------------------------------------------------------------------------
 ::com::sun::star::uno::Any SVTXRoadmap::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Any aReturn;
 
@@ -1696,7 +1696,7 @@ IMPL_XTYPEPROVIDER_END
 
 void SVTXNumericField::setValue( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1705,7 +1705,7 @@ void SVTXNumericField::setValue( double Value ) throw(::com::sun::star::uno::Run
 
 double SVTXNumericField::getValue() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetValue() : 0;
@@ -1713,7 +1713,7 @@ double SVTXNumericField::getValue() throw(::com::sun::star::uno::RuntimeExceptio
 
 void SVTXNumericField::setMin( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1722,7 +1722,7 @@ void SVTXNumericField::setMin( double Value ) throw(::com::sun::star::uno::Runti
 
 double SVTXNumericField::getMin() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetMinValue() : 0;
@@ -1730,7 +1730,7 @@ double SVTXNumericField::getMin() throw(::com::sun::star::uno::RuntimeException)
 
 void SVTXNumericField::setMax( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1739,7 +1739,7 @@ void SVTXNumericField::setMax( double Value ) throw(::com::sun::star::uno::Runti
 
 double SVTXNumericField::getMax() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetMaxValue() : 0;
@@ -1747,7 +1747,7 @@ double SVTXNumericField::getMax() throw(::com::sun::star::uno::RuntimeException)
 
 void SVTXNumericField::setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1756,7 +1756,7 @@ void SVTXNumericField::setFirst( double Value ) throw(::com::sun::star::uno::Run
 
 double SVTXNumericField::getFirst() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetSpinFirst() : 0;
@@ -1764,7 +1764,7 @@ double SVTXNumericField::getFirst() throw(::com::sun::star::uno::RuntimeExceptio
 
 void SVTXNumericField::setLast( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1773,7 +1773,7 @@ void SVTXNumericField::setLast( double Value ) throw(::com::sun::star::uno::Runt
 
 double SVTXNumericField::getLast() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetSpinLast() : 0;
@@ -1781,7 +1781,7 @@ double SVTXNumericField::getLast() throw(::com::sun::star::uno::RuntimeException
 
 void SVTXNumericField::setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1790,7 +1790,7 @@ void SVTXNumericField::setSpinSize( double Value ) throw(::com::sun::star::uno::
 
 double SVTXNumericField::getSpinSize() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetSpinSize() : 0;
@@ -1798,7 +1798,7 @@ double SVTXNumericField::getSpinSize() throw(::com::sun::star::uno::RuntimeExcep
 
 void SVTXNumericField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1807,7 +1807,7 @@ void SVTXNumericField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::sta
 
 sal_Int16 SVTXNumericField::getDecimalDigits() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetDecimalDigits() : 0;
@@ -1815,7 +1815,7 @@ sal_Int16 SVTXNumericField::getDecimalDigits() throw(::com::sun::star::uno::Runt
 
 void SVTXNumericField::setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1824,7 +1824,7 @@ void SVTXNumericField::setStrictFormat( sal_Bool bStrict ) throw(::com::sun::sta
 
 sal_Bool SVTXNumericField::isStrictFormat() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->IsStrictFormat() : sal_False;
@@ -1862,7 +1862,7 @@ IMPL_XTYPEPROVIDER_END
 
 void SVTXCurrencyField::setValue( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1871,7 +1871,7 @@ void SVTXCurrencyField::setValue( double Value ) throw(::com::sun::star::uno::Ru
 
 double SVTXCurrencyField::getValue() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetValue() : 0;
@@ -1879,7 +1879,7 @@ double SVTXCurrencyField::getValue() throw(::com::sun::star::uno::RuntimeExcepti
 
 void SVTXCurrencyField::setMin( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1888,7 +1888,7 @@ void SVTXCurrencyField::setMin( double Value ) throw(::com::sun::star::uno::Runt
 
 double SVTXCurrencyField::getMin() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetMinValue() : 0;
@@ -1896,7 +1896,7 @@ double SVTXCurrencyField::getMin() throw(::com::sun::star::uno::RuntimeException
 
 void SVTXCurrencyField::setMax( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1905,7 +1905,7 @@ void SVTXCurrencyField::setMax( double Value ) throw(::com::sun::star::uno::Runt
 
 double SVTXCurrencyField::getMax() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetMaxValue() : 0;
@@ -1913,7 +1913,7 @@ double SVTXCurrencyField::getMax() throw(::com::sun::star::uno::RuntimeException
 
 void SVTXCurrencyField::setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1922,7 +1922,7 @@ void SVTXCurrencyField::setFirst( double Value ) throw(::com::sun::star::uno::Ru
 
 double SVTXCurrencyField::getFirst() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetSpinFirst() : 0;
@@ -1930,7 +1930,7 @@ double SVTXCurrencyField::getFirst() throw(::com::sun::star::uno::RuntimeExcepti
 
 void SVTXCurrencyField::setLast( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1939,7 +1939,7 @@ void SVTXCurrencyField::setLast( double Value ) throw(::com::sun::star::uno::Run
 
 double SVTXCurrencyField::getLast() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetSpinLast() : 0;
@@ -1947,7 +1947,7 @@ double SVTXCurrencyField::getLast() throw(::com::sun::star::uno::RuntimeExceptio
 
 void SVTXCurrencyField::setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1956,7 +1956,7 @@ void SVTXCurrencyField::setSpinSize( double Value ) throw(::com::sun::star::uno:
 
 double SVTXCurrencyField::getSpinSize() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetSpinSize() : 0;
@@ -1964,7 +1964,7 @@ double SVTXCurrencyField::getSpinSize() throw(::com::sun::star::uno::RuntimeExce
 
 void SVTXCurrencyField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1973,7 +1973,7 @@ void SVTXCurrencyField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::st
 
 sal_Int16 SVTXCurrencyField::getDecimalDigits() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetDecimalDigits() : 0;
@@ -1981,7 +1981,7 @@ sal_Int16 SVTXCurrencyField::getDecimalDigits() throw(::com::sun::star::uno::Run
 
 void SVTXCurrencyField::setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     if ( pField )
@@ -1990,7 +1990,7 @@ void SVTXCurrencyField::setStrictFormat( sal_Bool bStrict ) throw(::com::sun::st
 
 sal_Bool SVTXCurrencyField::isStrictFormat() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormattedField* pField = GetFormattedField();
     return pField ? pField->IsStrictFormat() : sal_False;
@@ -1998,7 +1998,7 @@ sal_Bool SVTXCurrencyField::isStrictFormat() throw(::com::sun::star::uno::Runtim
 
 void SVTXCurrencyField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Any aReturn;
 
@@ -2038,7 +2038,7 @@ void SVTXCurrencyField::setProperty( const ::rtl::OUString& PropertyName, const
 
 ::com::sun::star::uno::Any SVTXCurrencyField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Any aReturn;
 
@@ -2159,7 +2159,7 @@ IMPL_XTYPEPROVIDER_END
 // ::com::sun::star::awt::XProgressBar
 void VCLXProgressBar::setForegroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindow();
     if ( pWindow )
@@ -2171,7 +2171,7 @@ void VCLXProgressBar::setForegroundColor( sal_Int32 nColor ) throw(::com::sun::s
 
 void VCLXProgressBar::setBackgroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindow();
     if ( pWindow )
@@ -2185,7 +2185,7 @@ void VCLXProgressBar::setBackgroundColor( sal_Int32 nColor ) throw(::com::sun::s
 
 void VCLXProgressBar::setValue( sal_Int32 nValue ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     m_nValue = nValue;
     ImplUpdateValue();
@@ -2193,7 +2193,7 @@ void VCLXProgressBar::setValue( sal_Int32 nValue ) throw(::com::sun::star::uno::
 
 void VCLXProgressBar::setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException )
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( nMin < nMax )
     {
@@ -2213,7 +2213,7 @@ void VCLXProgressBar::setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::com::su
 
 sal_Int32 VCLXProgressBar::getValue() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     return m_nValue;
 }
@@ -2221,7 +2221,7 @@ sal_Int32 VCLXProgressBar::getValue() throw(::com::sun::star::uno::RuntimeExcept
 // ::com::sun::star::awt::VclWindowPeer
 void VCLXProgressBar::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ProgressBar* pProgressBar = (ProgressBar*)GetWindow();
     if ( pProgressBar )
@@ -2279,7 +2279,7 @@ void VCLXProgressBar::setProperty( const ::rtl::OUString& PropertyName, const ::
 
 ::com::sun::star::uno::Any VCLXProgressBar::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Any aProp;
     ProgressBar* pProgressBar = (ProgressBar*)GetWindow();
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index 924654907fdc..3d10bb97167c 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -660,7 +660,7 @@ void SAL_CALL SvUnoImageMap::insertByIndex( sal_Int32 Index, const Any& Element
     {
         std::list< SvUnoImageMapObject* >::iterator aIter = maObjectList.begin();
         for( sal_Int32 n = 0; n < Index; n++ )
-            aIter++;
+            ++aIter;
 
         maObjectList.insert( aIter, pObject );
     }
@@ -681,7 +681,7 @@ void SAL_CALL SvUnoImageMap::removeByIndex( sal_Int32 Index ) throw(IndexOutOfBo
     {
         std::list< SvUnoImageMapObject* >::iterator aIter = maObjectList.begin();
         for( sal_Int32 n = 0; n < Index; n++ )
-            aIter++;
+            ++aIter;
 
         (*aIter)->release();
         maObjectList.erase( aIter );
@@ -698,7 +698,7 @@ void SAL_CALL SvUnoImageMap::replaceByIndex( sal_Int32 Index, const Any& Element
 
     std::list< SvUnoImageMapObject* >::iterator aIter = maObjectList.begin();
     for( sal_Int32 n = 0; n < Index; n++ )
-        aIter++;
+        ++aIter;
 
     (*aIter)->release();
     *aIter = pObject;
@@ -719,7 +719,7 @@ Any SAL_CALL SvUnoImageMap::getByIndex( sal_Int32 Index ) throw(IndexOutOfBounds
 
     std::list< SvUnoImageMapObject* >::iterator aIter = maObjectList.begin();
     for( sal_Int32 n = 0; n < Index; n++ )
-        aIter++;
+        ++aIter;
 
     Reference< XPropertySet > xObj( *aIter );
     return makeAny( xObj );
@@ -778,7 +778,7 @@ sal_Bool SvUnoImageMap::fillImageMap( ImageMap& rMap ) const
         rMap.InsertIMapObject( *pNewMapObject );
         delete pNewMapObject;
 
-        aIter++;
+        ++aIter;
     }
 
     return sal_True;
diff --git a/svtools/workben/cui/loadlib.cxx b/svtools/workben/cui/loadlib.cxx
index 48c41774852a..70da235bdb38 100644
--- a/svtools/workben/cui/loadlib.cxx
+++ b/svtools/workben/cui/loadlib.cxx
@@ -66,7 +66,7 @@ int __LOADONCALLAPI main( int argc, char **argv )
     oslModule aLibrary = osl_loadModule( aLib.pData, SAL_LOADMODULE_DEFAULT );
     if ( aLibrary )
     {
-        void* pFunc = osl_getSymbol( aLibrary, OUString::createFromAscii( "GetVersionInfo" ).pData );
+        void* pFunc = osl_getSymbol( aLibrary, OUString( RTL_CONSTASCII_USTRINGPARAM( "GetVersionInfo" )).pData );
         if ( pFunc )
             pInfo = (*(GetVersionInfo)pFunc)();
     }
diff --git a/svtools/workben/toolpanel/toolpaneltest.cxx b/svtools/workben/toolpanel/toolpaneltest.cxx
index fe3c1d11d045..5f60670dad3b 100644
--- a/svtools/workben/toolpanel/toolpaneltest.cxx
+++ b/svtools/workben/toolpanel/toolpaneltest.cxx
@@ -868,8 +868,8 @@ void __EXPORT PanelDemo::Main()
 
     // initialize the UCB
     Sequence< Any > aArgs(2);
-    aArgs[0] <<= rtl::OUString::createFromAscii( "Local" );
-    aArgs[1] <<= rtl::OUString::createFromAscii( "Office" );
+    aArgs[0] <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Local" ));
+    aArgs[1] <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Office" ));
     ::ucbhelper::ContentBroker::initialize( xSMgr, aArgs );
 
     // run the application
diff --git a/svtools/workben/treecontrol/treetest.cxx b/svtools/workben/treecontrol/treetest.cxx
index bd309b650b8e..0fd806f1c5ba 100644
--- a/svtools/workben/treecontrol/treetest.cxx
+++ b/svtools/workben/treecontrol/treetest.cxx
@@ -348,7 +348,7 @@ int SAL_CALL main( int argc, char **argv )
     */
     Reference< XInterface > xInterface =
         xMultiComponentFactoryClient->createInstanceWithContext(
-            OUString::createFromAscii( "com.sun.star.bridge.UnoUrlResolver" ),
+            OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.bridge.UnoUrlResolver" )),
             xComponentContext );
 
     Reference< XUnoUrlResolver > resolver( xInterface, UNO_QUERY );
@@ -369,7 +369,7 @@ int SAL_CALL main( int argc, char **argv )
 
     // gets the server component context as property of the office component factory
     Reference< XPropertySet > xPropSet( xInterface, UNO_QUERY );
-    xPropSet->getPropertyValue( OUString::createFromAscii("DefaultContext") ) >>= xComponentContext;
+    xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" )) ) >>= xComponentContext;
 
     // gets the service manager from the office
     Reference< XMultiComponentFactory > xMultiComponentFactoryServer(
diff --git a/svx/inc/float3d.hrc b/svx/inc/float3d.hrc
index f047394c968f..7f2032123d12 100644
--- a/svx/inc/float3d.hrc
+++ b/svx/inc/float3d.hrc
@@ -26,8 +26,6 @@
  ************************************************************************/
 #include <svx/dialogs.hrc>
 
-//#define FLT_WIN_3D                827
-
 #define BTN_GEO                 2
 #define BTN_REPRESENTATION      3
 #define BTN_LIGHT               4
@@ -43,12 +41,12 @@
 #define CTL_PREVIEW             12
 #define CTL_LIGHT_PREVIEW       13
 
-// Geometrie
+// Geomerty
 #define FT_HORIZONTAL           24
 #define NUM_HORIZONTAL          25
 #define FT_VERTICAL             26
 #define NUM_VERTICAL            27
-#define FL_SEGMENTS                    28
+#define FL_SEGMENTS             28
 #define FT_PERCENT_DIAGONAL     29
 #define MTR_PERCENT_DIAGONAL    30
 #define FT_BACKSCALE            31
@@ -57,32 +55,32 @@
 #define MTR_END_ANGLE           34
 #define FT_DEPTH                35
 #define MTR_DEPTH               36
-#define FL_GEOMETRIE                   37
+#define FL_GEOMETRIE            37
 
 #define BTN_NORMALS_OBJ         38
 #define BTN_NORMALS_FLAT        39
 #define BTN_NORMALS_SPHERE      40
 #define BTN_TWO_SIDED_LIGHTING  41
 #define BTN_NORMALS_INVERT      42
-#define FL_NORMALS                             43
+#define FL_NORMALS              43
 
 #define BTN_DOUBLE_SIDED        44
 
-// Darstellung
+// Depiction/Appearance
 #define FT_SHADEMODE            45
 #define LB_SHADEMODE            46
 #define BTN_SHADOW_3D           47
 #define FT_SLANT                48
 #define MTR_SLANT               49
-#define FL_SHADOW              50
+#define FL_SHADOW               50
 #define FT_DISTANCE             51
 #define MTR_DISTANCE            52
 #define FT_FOCAL_LENGTH         53
 #define MTR_FOCAL_LENGTH        54
-#define FL_CAMERA              55
-#define FL_REPRESENTATION      56
+#define FL_CAMERA               55
+#define FL_REPRESENTATION       56
 
-// Beleuchtung
+// Lighting
 #define BTN_LIGHT_1             60
 #define BTN_LIGHT_2             61
 #define BTN_LIGHT_3             62
@@ -100,11 +98,11 @@
 #define LB_LIGHT_7              74
 #define LB_LIGHT_8              75
 #define BTN_LIGHT_COLOR         76
-#define FT_LIGHTSOURCE                 77
+#define FT_LIGHTSOURCE          77
 #define LB_AMBIENTLIGHT         78
 #define BTN_AMBIENT_COLOR       79
-#define FT_AMBIENTLIGHT                80
-#define FL_LIGHT                               81
+#define FT_AMBIENTLIGHT         80
+#define FL_LIGHT                81
 
 // Textures
 #define FT_TEX_KIND             90
@@ -124,11 +122,10 @@
 #define BTN_TEX_OBJECT_Y        104
 #define FT_TEX_FILTER           105
 #define BTN_TEX_FILTER          106
-#define FL_TEXTURE                             107
+#define FL_TEXTURE              107
 
 // Material
-//#define CTL_MATERIAL              110
-#define FL_MATERIAL                            111
+#define FL_MATERIAL             111
 
 #define FT_MAT_COLOR                112
 #define LB_MAT_COLOR                113
@@ -141,44 +138,6 @@
 #define BTN_SPECULAR_COLOR          120
 #define FT_MAT_SPECULAR_INTENSITY   121
 #define MTR_MAT_SPECULAR_INTENSITY  122
-#define FL_MAT_SPECULAR                        123
+#define FL_MAT_SPECULAR             123
 #define FT_MAT_FAVORITES            124
 #define LB_MAT_FAVORITES            125
-
-
-//#define BTN_MAT_FAVORITES         125
-//#define BTN_MAT_EDITOR            126
-
-
-// high contrast
-#define BMP_GEO_H                   130
-#define BMP_REPRESENTATION_H        131
-#define BMP_LIGHT_H                 132
-#define BMP_TEXTURE_H               133
-#define BMP_MATERIAL_H              134
-#define BMP_UPDATE_H                135
-#define BMP_ASSIGN_H                136
-#define BMP_CHANGE_TO_3D_H          137
-#define BMP_LATHE_OBJ_H             138
-#define BMP_PERSPECTIVE_H           139
-#define BMP_NORMALS_OBJ_H           142
-#define BMP_NORMALS_FLAT_H          143
-#define BMP_NORMALS_SPHERE_H        144
-#define BMP_NORMALS_INVERT_H        145
-#define BMP_TWO_SIDED_LIGHTING_H    146
-#define BMP_DOUBLE_SIDED_H          147
-#define BMP_SHADOW_3D_H             148
-#define BMP_3DLIGHT_H               149
-#define BMP_LIGHT_COLOR_H           150
-#define BMP_AMBIENT_COLOR_H         151
-#define BMP_TEX_LUMINANCE_H         152
-#define BMP_TEX_COLOR_H             153
-#define BMP_TEX_REPLACE_H           154
-#define BMP_TEX_MODULATE_H          155
-#define BMP_TEX_BLEND_H             156
-#define BMP_TEX_OBJECT_H            157
-#define BMP_TEX_PARALLEL_H          158
-#define BMP_TEX_CIRCLE_H            159
-#define BMP_TEX_FILTER_H            160
-#define BMP_COLORDLG_H              161
-
diff --git a/svx/inc/fontworkgallery.hrc b/svx/inc/fontworkgallery.hrc
index e03c04d0f1ca..7b2f93647217 100644
--- a/svx/inc/fontworkgallery.hrc
+++ b/svx/inc/fontworkgallery.hrc
@@ -51,22 +51,12 @@
 #define STR_CHARS_SPACING_KERN_PAIRS        12
 
 #define IMG_FONTWORK_ALIGN_LEFT_16          1
-#define IMG_FONTWORK_ALIGN_LEFT_16_H        2
 #define IMG_FONTWORK_ALIGN_LEFT_26          3
-#define IMG_FONTWORK_ALIGN_LEFT_26_H        4
 #define IMG_FONTWORK_ALIGN_CENTER_16        5
-#define IMG_FONTWORK_ALIGN_CENTER_16_H      6
 #define IMG_FONTWORK_ALIGN_CENTER_26        7
-#define IMG_FONTWORK_ALIGN_CENTER_26_H      8
 #define IMG_FONTWORK_ALIGN_RIGHT_16         9
-#define IMG_FONTWORK_ALIGN_RIGHT_16_H       10
 #define IMG_FONTWORK_ALIGN_RIGHT_26         11
-#define IMG_FONTWORK_ALIGN_RIGHT_26_H       12
 #define IMG_FONTWORK_ALIGN_WORD_16          13
-#define IMG_FONTWORK_ALIGN_WORD_16_H        14
 #define IMG_FONTWORK_ALIGN_WORD_26          15
-#define IMG_FONTWORK_ALIGN_WORD_26_H        16
 #define IMG_FONTWORK_ALIGN_STRETCH_16       17
-#define IMG_FONTWORK_ALIGN_STRETCH_16_H     18
 #define IMG_FONTWORK_ALIGN_STRETCH_26       19
-#define IMG_FONTWORK_ALIGN_STRETCH_26_H     20
diff --git a/svx/inc/gallery.hrc b/svx/inc/gallery.hrc
index 852b1f14c7de..8405bb2b6238 100644
--- a/svx/inc/gallery.hrc
+++ b/svx/inc/gallery.hrc
@@ -81,8 +81,6 @@
 #define RID_SVXBMP_THEME_DEFAULT                (RID_SVX_GALLERY_START + 54)
 #define RID_SVXIMG_GALLERY_VIEW_ICON            (RID_SVX_GALLERY_START + 56)
 #define RID_SVXIMG_GALLERY_VIEW_LIST            (RID_SVX_GALLERY_START + 57)
-#define RID_SVXIMG_GALLERY_VIEW_ICON_HC         (RID_SVX_GALLERY_START + 58)
-#define RID_SVXIMG_GALLERY_VIEW_LIST_HC         (RID_SVX_GALLERY_START + 59)
 
 // Gallery-Bitmaps fuer Sounds
 #define RID_SVXBMP_GALLERY_SOUND_0              (RID_SVX_GALLERY_START + 61)
diff --git a/svx/inc/imapdlg.hxx b/svx/inc/imapdlg.hxx
index c0338637b67b..e456335adfde 100644
--- a/svx/inc/imapdlg.hxx
+++ b/svx/inc/imapdlg.hxx
@@ -126,7 +126,6 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow
     ComboBox            maCbbTarget;
     StatusBar           aStbStatus;
     ImageList           maImageList;
-    ImageList           maImageListH;
 
     Size                aLastSize;
     IMapWindow*         pIMapWnd;
diff --git a/svx/inc/svdstr.hrc b/svx/inc/svdstr.hrc
index 4b0aef6c6dbb..0bfee13a223b 100644
--- a/svx/inc/svdstr.hrc
+++ b/svx/inc/svdstr.hrc
@@ -701,8 +701,6 @@
 
 #define BMP_SVXOLEOBJ                       (SIP_Begin + 261)
 
-#define SIP_SA_ACCESSIBILITY_MARKERS        (SIP_Begin + 262)
-
 #define STR_TABLE_ATTR                      (SIP_Begin + 263)
 #define STR_TABLE_AUTOFMT                   (SIP_Begin + 264)
 #define STR_TABLE_INSCOL                    (SIP_Begin + 265)
@@ -718,8 +716,7 @@
 #define STR_TABLE_STYLE_SETTINGS            (SIP_Begin + 275)
 #define SIP_SA_CROP_MARKERS                 (SIP_Begin + 276)
 #define SIP_SA_CROP_FINE_MARKERS            (SIP_Begin + 277)
-#define SIP_SA_ACCESSIBILITY_CROP_MARKERS   (SIP_Begin + 278)
 
-#define SIP_End                             (SIP_SA_ACCESSIBILITY_CROP_MARKERS)
+#define SIP_End                             (SIP_SA_CROP_FINE_MARKERS)
 
 #define SDR_ResourceEnd                     (SIP_End)
diff --git a/svx/inc/svx/bmpmask.hxx b/svx/inc/svx/bmpmask.hxx
index 2ff4d1b7db5c..f7be657b8d0b 100644
--- a/svx/inc/svx/bmpmask.hxx
+++ b/svx/inc/svx/bmpmask.hxx
@@ -128,7 +128,6 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow
     SvxBmpMaskSelectItem aSelItem;
 
     Image               maImgPipette;
-    Image               maImgPipetteH;
 
     virtual BOOL        Close();
 
diff --git a/svx/inc/svx/checklbx.hxx b/svx/inc/svx/checklbx.hxx
index 5bac454a652b..2925fe950397 100644
--- a/svx/inc/svx/checklbx.hxx
+++ b/svx/inc/svx/checklbx.hxx
@@ -61,8 +61,7 @@ public:
     SvxCheckListBox( Window* pParent, WinBits nWinStyle = 0 );
     SvxCheckListBox( Window* pParent, const ResId& rResId );
     SvxCheckListBox( Window* pParent, const ResId& rResId,
-                     const Image& rNormalStaticImage,
-                     const Image& rHighContrastStaticImage );
+                     const Image& rNormalStaticImage );
     ~SvxCheckListBox();
 
     void            InsertEntry         ( const String& rStr,
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index 530a079c3de3..42497fcddc33 100755
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -180,7 +180,6 @@
 #define RID_SVXSW_FRAMEPOSITIONS            (RID_SVX_START + 289)
 
 #define RID_SVXIL_FRAME                     (RID_SVX_START +  65)
-#define RID_SVXIL_FRAME_HC                  (RID_SVX_START +  66)
 
 #define RID_SVXDLG_3D                       (RID_SVX_START +  70)
 #define RID_SVXPAGE_LIGHT3D                 (RID_SVX_START +  71)
@@ -189,10 +188,7 @@
 
 #define RID_SVXIMAGE_LIGHT_ON               (RID_SVX_START + 210)
 #define RID_SVXIMAGE_LIGHT_OFF              (RID_SVX_START + 211)
-#define RID_SVXIMAGE_LIGHT_ON_H             (RID_SVX_START + 212)
-#define RID_SVXIMAGE_LIGHT_OFF_H            (RID_SVX_START + 213)
 #define RID_SVXIMAGE_COLORDLG               (RID_SVX_START + 214)
-#define RID_SVXIMAGE_COLORDLG_H             (RID_SVX_START + 215)
 
 #define RID_SVXFLOAT3D_FAVORITE             (RID_SVX_START + 73)
 #define RID_SVXFLOAT3D_FIX_X                (RID_SVX_START + 74)
@@ -225,18 +221,12 @@
 #define RID_SVXBMP_SIZE                     (RID_SVX_START +  86)
 
 #define RID_SVXBMP_SIGNET                   (RID_SVX_START +  87)
-#define RID_SVXBMP_SIGNET_H                 (RID_SVX_START +  88)
 #define RID_SVXBMP_SIGNET_BROKEN            (RID_SVX_START +  89)
-#define RID_SVXBMP_SIGNET_BROKEN_H          (RID_SVX_START +  90)
 #define RID_SVXBMP_SIGNET_NOTVALIDATED      (RID_SVX_START +  91)
-#define RID_SVXBMP_SIGNET_NOTVALIDATED_H    (RID_SVX_START +  92)
 
-#define RID_SVXBMP_SLIDERBUTTON                 (RID_SVX_START +  67)
-#define RID_SVXBMP_SLIDERDECREASE               (RID_SVX_START +  68)
-#define RID_SVXBMP_SLIDERINCREASE               (RID_SVX_START +  69)
-#define RID_SVXBMP_SLIDERBUTTON_HC              (RID_SVX_START +  70)
-#define RID_SVXBMP_SLIDERDECREASE_HC            (RID_SVX_START +  71)
-#define RID_SVXBMP_SLIDERINCREASE_HC            (RID_SVX_START +  72)
+#define RID_SVXBMP_SLIDERBUTTON             (RID_SVX_START +  67)
+#define RID_SVXBMP_SLIDERDECREASE           (RID_SVX_START +  68)
+#define RID_SVXBMP_SLIDERINCREASE           (RID_SVX_START +  69)
 
 // Resource with bitmaps for the CheckListBox
 #define RID_CHECKLISTBOX_BITMAPS            (RID_SVX_START +  91)
@@ -354,27 +344,6 @@
 
 #define RID_SVXDLG_RUBY                     (RID_SVX_START + 247)
 
-#define RID_SVXBMP_FONTWORK_FORM1_H         (RID_SVX_START + 260)
-#define RID_SVXBMP_FONTWORK_FORM2_H         (RID_SVX_START + 261)
-#define RID_SVXBMP_FONTWORK_FORM3_H         (RID_SVX_START + 262)
-#define RID_SVXBMP_FONTWORK_FORM4_H         (RID_SVX_START + 263)
-#define RID_SVXBMP_FONTWORK_FORM5_H         (RID_SVX_START + 264)
-#define RID_SVXBMP_FONTWORK_FORM6_H         (RID_SVX_START + 265)
-#define RID_SVXBMP_FONTWORK_FORM7_H         (RID_SVX_START + 266)
-#define RID_SVXBMP_FONTWORK_FORM8_H         (RID_SVX_START + 267)
-#define RID_SVXBMP_FONTWORK_FORM9_H         (RID_SVX_START + 268)
-#define RID_SVXBMP_FONTWORK_FORM10_H        (RID_SVX_START + 269)
-#define RID_SVXBMP_FONTWORK_FORM11_H        (RID_SVX_START + 270)
-#define RID_SVXBMP_FONTWORK_FORM12_H        (RID_SVX_START + 271)
-#define RID_SVXIMG_GRAF_RED_H               (RID_SVX_START + 276)
-#define RID_SVXIMG_GRAF_GREEN_H             (RID_SVX_START + 277)
-#define RID_SVXIMG_GRAF_BLUE_H              (RID_SVX_START + 278)
-#define RID_SVXIMG_GRAF_LUMINANCE_H         (RID_SVX_START + 279)
-#define RID_SVXIMG_GRAF_CONTRAST_H          (RID_SVX_START + 280)
-#define RID_SVXIMG_GRAF_GAMMA_H             (RID_SVX_START + 281)
-#define RID_SVXIMG_GRAF_TRANSPARENCE_H      (RID_SVX_START + 282)
-#define RID_SVXIMG_CHECKED_H                (RID_SVX_START + 285)
-
 #define RID_SVXDLG_TEXTCONTROL_CHARATTR     (RID_SVX_START + 286)
 #define RID_SVXDLG_TEXTCONTROL_PARAATTR     (RID_SVX_START + 287)
 
diff --git a/svx/inc/svx/fontwork.hxx b/svx/inc/svx/fontwork.hxx
index 47ad6b9404aa..0594e032f4cb 100644
--- a/svx/inc/svx/fontwork.hxx
+++ b/svx/inc/svx/fontwork.hxx
@@ -134,7 +134,6 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
     long            nSaveShadowSize;
 
     ImageList       maImageList;
-    ImageList       maImageListH;
 
     const XColorTable* pColorTable;
 
diff --git a/svx/inc/svx/itemwin.hxx b/svx/inc/svx/itemwin.hxx
index 2733d157eacb..f87d7f4e8538 100644
--- a/svx/inc/svx/itemwin.hxx
+++ b/svx/inc/svx/itemwin.hxx
@@ -43,7 +43,6 @@ class SfxObjectShell;
 
 class SvxLineBox : public LineLB
 {
-    BmpColorMode    meBmpMode;
     USHORT          nCurPos;
     Timer           aDelayTimer;
     Size            aLogicalSize;
diff --git a/svx/inc/svx/langbox.hxx b/svx/inc/svx/langbox.hxx
index 280b26abea4e..50ae2c66f160 100644
--- a/svx/inc/svx/langbox.hxx
+++ b/svx/inc/svx/langbox.hxx
@@ -68,7 +68,6 @@ public:
 private:
     Image                   m_aNotCheckedImage;
     Image                   m_aCheckedImage;
-    Image                   m_aCheckedImageHC;
     String                  m_aAllString;
     com::sun::star::uno::Sequence< INT16 >  *m_pSpellUsedLang;
     SvtLanguageTable*       m_pLangTable;
diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx
index e8f7bae73d6c..c67fae1e9173 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx
@@ -65,7 +65,7 @@ namespace sdr
             // scaling (e.g. for EmptyPresObj's), the correct graphic and other stuff. It is used from
             // createViewIndependentPrimitive2DSequence with false, and with evtl. HighContrast true
             // from the VOC which knows that
-            drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceWithParameters(bool bHighContrast) const;
+            drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceWithParameters() const;
 
         protected:
             // This method is responsible for creating the graphical visualisation data
diff --git a/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
index 8b61b302b38d..314c15436b0a 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#ifndef INCLUDED_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX
+#ifndef INCLUDED_SDR_PRIMITIVE2D_SdrOleContentPrimitive2D_HXX
 #define INCLUDED_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
@@ -55,9 +55,6 @@ namespace drawinglayer
             // be expensive, e.g. triggering chart creation)
             sal_uInt32                                  mnGraphicVersion;
 
-            // bitfield
-            unsigned                                    mbHighContrast : 1;
-
         protected:
             // local decomposition.
             virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
@@ -66,8 +63,8 @@ namespace drawinglayer
             SdrOleContentPrimitive2D(
                 const SdrOle2Obj& rSdrOle2Obj,
                 const basegfx::B2DHomMatrix& rObjectTransform,
-                sal_uInt32 nGraphicVersion,
-                bool bHighContrast);
+                sal_uInt32 nGraphicVersion
+            );
 
             // compare operator
             virtual bool operator==(const BasePrimitive2D& rPrimitive) const;
@@ -78,7 +75,6 @@ namespace drawinglayer
             // data access
             const basegfx::B2DHomMatrix& getObjectTransform() const { return maObjectTransform; }
             sal_uInt32 getGraphicVersion() const { return mnGraphicVersion; }
-            bool getHighContrast() const { return mbHighContrast; }
 
             // provide unique ID
             DeclPrimitrive2DIDBlock()
diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx
index 3d09726cd73c..cd326f05d9d2 100644
--- a/svx/inc/svx/svdhdl.hxx
+++ b/svx/inc/svx/svdhdl.hxx
@@ -150,7 +150,7 @@ class SVX_DLLPUBLIC SdrHdl
     friend class                SdrHdlList;
 
     // #101928#
-    BitmapEx ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd, sal_Bool bFine, sal_Bool bIsHighContrast);
+    BitmapEx ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd, sal_Bool bFine );
 
 protected:
     SdrObject*                  pObj;      // Gehoert das Handle zu einem Objekt?
@@ -524,7 +524,7 @@ protected:
 
     BitmapEx GetBitmapForHandle( const BitmapEx& rBitmap, int nSize );
 
-    static BitmapEx GetHandlesBitmap( bool bIsFineHdl, bool bIsHighContrast );
+    static BitmapEx GetHandlesBitmap( bool bIsFineHdl );
 };
 
 #endif //_SVDHDL_HXX
diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx
index 92547d56ac19..a2f1871ff049 100644
--- a/svx/inc/svx/svdundo.hxx
+++ b/svx/inc/svx/svdundo.hxx
@@ -480,7 +480,7 @@ public:
     virtual bool CanSdrRepeat(SdrView& rView) const;
 };
 
-// --> OD 2009-07-09 #i73249#
+// Implement Title/Description Elements UI for Writer text frames, graphics and embedded objects (#i73249#)
 class SdrUndoObjStrAttr : public SdrUndoObj
 {
 public:
@@ -507,7 +507,6 @@ public:
 
     virtual String GetComment() const;
 };
-// <--
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //
@@ -852,12 +851,11 @@ public:
     virtual SdrUndoAction* CreateUndoObjectLayerChange( SdrObject& rObject, SdrLayerID aOldLayer, SdrLayerID aNewLayer );
     virtual SdrUndoAction* CreateUndoObjectSetText( SdrObject& rNewObj, sal_Int32 nText );
 
-    // --> OD 2009-07-09 #i73249#
+    // Implement Title/Description Elements UI for Writer text frames, graphics and embedded objects (#i73249#)
     virtual SdrUndoAction* CreateUndoObjectStrAttr( SdrObject& rObject,
                                                     SdrUndoObjStrAttr::ObjStrAttrType eObjStrAttrType,
                                                     String sOldStr,
                                                     String sNewStr );
-    // <--
 
     // layer
     virtual SdrUndoAction* CreateUndoNewLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel);
diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx
index ae6e8fe7246b..ab2c8b93978d 100644
--- a/svx/inc/svx/svxdlg.hxx
+++ b/svx/inc/svx/svxdlg.hxx
@@ -347,7 +347,7 @@ public:
 
     virtual AbstractSvxCaptionDialog* CreateCaptionDialog( Window* pParent,
                                         const SdrView* pView,
-                                        USHORT nAnchorTypes = 0 ) = 0;      //add for SvxCaptionTabDialog CHINA001
+                                        USHORT nAnchorTypes = 0 ) = 0; //add for SvxCaptionTabDialog
 
     virtual AbstractSvxDistributeDialog*    CreateSvxDistributeDialog(Window* pParent,
                                             const SfxItemSet& rAttr,
diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
index 6d1e5a119659..eb2ec28c544f 100755
--- a/svx/inc/svx/svxids.hrc
+++ b/svx/inc/svx/svxids.hrc
@@ -745,11 +745,11 @@
 //#define SID_ZOOM_PREV                                   ( SID_SVX_START + 403 )   -> sfxsids.hrc
 #define SID_BACKGRND_DESTINATION                        ( SID_SVX_START + 404 )
 #define SID_ATTR_FLASH                                  ( SID_SVX_START + 406 )
-#define SID_ATTR_3D_LIGHT                               ( SID_SVX_START + 407 ) /* --> Slots mit --> koennen demnaechst entfallen ( heute 12.03.1998 ) */
+#define SID_ATTR_3D_LIGHT                               ( SID_SVX_START + 407 ) /* Slots mit --> koennen demnaechst entfallen */
 #define SID_ATTR_3D_START                                   SID_ATTR_3D_LIGHT
-#define SID_ATTR_3D_LIGHTINTENSITY                      ( SID_SVX_START + 408 ) /* --> Slots mit --> koennen demnaechst entfallen ( heute 12.03.1998 ) */
-#define SID_ATTR_3D_LIGHTCOLOR                          ( SID_SVX_START + 409 ) /* --> Slots mit --> koennen demnaechst entfallen ( heute 12.03.1998 ) */
-#define SID_ATTR_3D_AMBIENTINTENSITY                    ( SID_SVX_START + 410 ) /* --> Slots mit --> koennen demnaechst entfallen ( heute 12.03.1998 ) */
+#define SID_ATTR_3D_LIGHTINTENSITY                      ( SID_SVX_START + 408 ) /* Slots mit --> koennen demnaechst entfallen */
+#define SID_ATTR_3D_LIGHTCOLOR                          ( SID_SVX_START + 409 ) /* Slots mit --> koennen demnaechst entfallen */
+#define SID_ATTR_3D_AMBIENTINTENSITY                    ( SID_SVX_START + 410 ) /* Slots mit --> koennen demnaechst entfallen */
 #define SID_ATTR_3D_AMBIENTCOLOR                        ( SID_SVX_START + 411 )
 #define SID_IMPORT_GRAPH_LINK                           ( SID_SVX_START + 412 )
 
diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx
index 12e8d52f1266..47a1c4899eb7 100644
--- a/svx/inc/svx/unoshape.hxx
+++ b/svx/inc/svx/unoshape.hxx
@@ -70,12 +70,11 @@ class SfxItemSet;
 class SdrModel;
 class SvxDrawPage;
 class SvGlobalName;
-// --> OD 2009-01-16 #i59051#
+// Dimension arrows change size/position on save/reload (#i59051#)
 namespace basegfx
     {
         class B2DPolyPolygon;
     } // end of namespace basegfx
-// <--
 
 class SvxShapeMutex
 {
@@ -140,10 +139,9 @@ protected:
     // Umrechnungen fuer den Writer, der in TWIPS arbeitet
     void ForceMetricToItemPoolMetric(Pair& rPoint) const throw();
     void ForceMetricTo100th_mm(Pair& rPoint) const throw();
-    // --> OD 2009-01-16 #i59051#
+    // Dimension arrows change size/position on save/reload (#i59051#)
     void ForceMetricToItemPoolMetric(basegfx::B2DPolyPolygon& rPolyPolygon) const throw();
     void ForceMetricTo100th_mm(basegfx::B2DPolyPolygon& rPolyPolygon) const throw();
-    // <--
 
     ::com::sun::star::uno::Any GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap ) const;
 
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 6a1e2aa2a62d..f0437b7a08e3 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -380,10 +380,10 @@ void SAL_CALL AccessibleControlShape::grabFocus(void)  throw (RuntimeException)
             if ( !sDesc.getLength() )
             {   // no -> use the default
                 aDG.Initialize (STR_ObjNameSingulUno);
-                aDG.AddProperty (::rtl::OUString::createFromAscii ("ControlBackground"),
+                aDG.AddProperty (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlBackground")),
                     DescriptionGenerator::COLOR,
                     ::rtl::OUString());
-                aDG.AddProperty (::rtl::OUString::createFromAscii ("ControlBorder"),
+                aDG.AddProperty (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlBorder")),
                     DescriptionGenerator::INTEGER,
                     ::rtl::OUString());
             }
@@ -393,8 +393,8 @@ void SAL_CALL AccessibleControlShape::grabFocus(void)  throw (RuntimeException)
         break;
 
         default:
-            aDG.Initialize (::rtl::OUString::createFromAscii (
-                "Unknown accessible control shape"));
+            aDG.Initialize (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "Unknown accessible control shape")) );
             Reference< XShapeDescriptor > xDescriptor (mxShape, UNO_QUERY);
             if (xDescriptor.is())
             {
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx
index ed675738de9d..36174f6c5db1 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -563,7 +563,7 @@ void AccFrameSelector::removeEventListener( const Reference< XAccessibleEventLis
 
 OUString AccFrameSelector::getImplementationName(  ) throw (RuntimeException)
 {
-    return OUString::createFromAscii("AccFrameSelector");
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("AccFrameSelector"));
 }
 
 // ----------------------------------------------------------------------------
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index d3712e0a397a..ae3e020e8d41 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -378,7 +378,7 @@ uno::Reference<XAccessible> SAL_CALL
     }
     else
         throw lang::IndexOutOfBoundsException (
-            ::rtl::OUString::createFromAscii ("shape has no child with index ")
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("shape has no child with index "))
             + rtl::OUString::valueOf(nIndex),
             static_cast<uno::XWeak*>(this));
 
@@ -676,7 +676,7 @@ sal_Int32 SAL_CALL AccessibleShape::getForeground (void)
         if (aSet.is())
         {
             uno::Any aColor;
-            aColor = aSet->getPropertyValue (OUString::createFromAscii ("LineColor"));
+            aColor = aSet->getPropertyValue (OUString(RTL_CONSTASCII_USTRINGPARAM("LineColor")) );
             aColor >>= nColor;
         }
     }
@@ -702,7 +702,7 @@ sal_Int32 SAL_CALL AccessibleShape::getBackground (void)
         if (aSet.is())
         {
             uno::Any aColor;
-            aColor = aSet->getPropertyValue (OUString::createFromAscii ("FillColor"));
+            aColor = aSet->getPropertyValue (OUString(RTL_CONSTASCII_USTRINGPARAM("FillColor")) );
             aColor >>= nColor;
         }
     }
@@ -1034,7 +1034,7 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType,
             uno::Reference<beans::XPropertySet> xSet (mxShape, uno::UNO_QUERY);
             if (xSet.is())
             {
-                uno::Any aZOrder (xSet->getPropertyValue (::rtl::OUString::createFromAscii ("ZOrder")));
+                uno::Any aZOrder (xSet->getPropertyValue (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZOrder")) ));
                 aZOrder >>= nIndex;
 
                 // Add one to be not zero based.
@@ -1104,10 +1104,10 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType,
             break;
 
         case DRAWING_CONTROL:
-            aDG.AddProperty (OUString::createFromAscii ("ControlBackground"),
+            aDG.AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("ControlBackground")),
                 DescriptionGenerator::COLOR,
                 OUString());
-            aDG.AddProperty (OUString::createFromAscii ("ControlBorder"),
+            aDG.AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("ControlBorder")),
                 DescriptionGenerator::INTEGER,
                 OUString());
             break;
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index fff5c6e82895..8d69b800be9a 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -178,7 +178,7 @@ namespace accessibility
         // checks all children for visibility, throws away invisible ones
         void UpdateVisibleChildren( bool bBroadcastEvents=true );
 
-        // check all children for changes in positíon and size
+        // check all children for changes in position and size
         void UpdateBoundRect();
 
         // calls SetSelection on the forwarder and updates maLastSelection
@@ -641,18 +641,15 @@ namespace accessibility
                         makeSortedPair(::std::min( maLastSelection.nStartPara, nMaxValidParaIndex ),
                                        ::std::min( maLastSelection.nEndPara, nMaxValidParaIndex ) ) );
 
-                    // --> OD 2005-12-15 #i27299#
-                    // event TEXT_SELECTION_CHANGED has to be submitted.
+                    // event TEXT_SELECTION_CHANGED has to be submitted. (#i27299#)
                     const sal_Int16 nTextSelChgEventId =
                                     AccessibleEventId::TEXT_SELECTION_CHANGED;
-                    // <--
                     // #107037# notify selection change
                     if( maLastSelection.nStartPara == EE_PARA_NOT_FOUND )
                     {
                         // last selection is undefined
-                        // --> OD 2005-12-15 #i27299# - use method <ESelection::HasRange()>
+                        // use method <ESelection::HasRange()> (#i27299#)
                         if ( aSelection.HasRange() )
-                        // <--
                         {
                             // selection was undefined, now is on
                             maParaManager.FireEvent( sortedSelection.first,
@@ -663,36 +660,31 @@ namespace accessibility
                     else
                     {
                         // last selection is valid
-                        // --> OD 2005-12-15 #i27299# - use method <ESelection::HasRange()>
+                        // use method <ESelection::HasRange()> (#i27299#)
                         if ( maLastSelection.HasRange() &&
                              !aSelection.HasRange() )
-                        // <--
                         {
                             // selection was on, now is empty
                             maParaManager.FireEvent( sortedLastSelection.first,
                                                      sortedLastSelection.second+1,
                                                      nTextSelChgEventId );
                         }
-                        // --> OD 2005-12-15 #i27299# - use method <ESelection::HasRange()>
+                        // use method <ESelection::HasRange()> (#i27299#)
                         else if( !maLastSelection.HasRange() &&
                                  aSelection.HasRange() )
-                        // <--
                         {
                             // selection was empty, now is on
                             maParaManager.FireEvent( sortedSelection.first,
                                                      sortedSelection.second+1,
                                                      nTextSelChgEventId );
                         }
-                        // --> OD 2005-12-15 #i27299#
-                        // - no event TEXT_SELECTION_CHANGED event, if new and
-                        //   last selection are empty.
+                        // no event TEXT_SELECTION_CHANGED event, if new and
+                        // last selection are empty. (#i27299#)
                         else if ( maLastSelection.HasRange() &&
                                   aSelection.HasRange() )
-                        // <--
                         {
-                            // --> OD 2005-12-16 #i27299#
-                            // - send event TEXT_SELECTION_CHANGED for difference
-                            //   between last and new selection.
+                            // send event TEXT_SELECTION_CHANGED for difference
+                            // between last and new selection. (#i27299#)
 //                            // selection was on, now is different: take union of ranges
 //                            maParaManager.FireEvent( ::std::min(sortedSelection.first,
 //                                                           sortedLastSelection.second),
@@ -1462,10 +1454,9 @@ namespace accessibility
             if( pEditSourceHint )
             {
                 maEventQueue.Append( *pEditSourceHint );
-                // --> OD 2005-12-19 #i27299#
+                // EditEngine should emit TEXT_SELECTION_CHANGED events (#i27299#)
                 if( maEventOpenFrames == 0 )
                     ProcessQueue();
-                // <--
             }
             else if( pTextHint )
             {
@@ -1502,17 +1493,14 @@ namespace accessibility
                     case TEXT_HINT_BLOCKNOTIFICATION_START:
                     case TEXT_HINT_INPUT_START:
                         ++maEventOpenFrames;
-                        // --> OD 2005-12-19 #i27299# - no FALLTROUGH
-                        // reason: event will not be processes, thus appending
-                        // the event isn't necessary.
+                        // no FALLTHROUGH reason: event will not be processed,
+                        // thus appending the event isn't necessary. (#i27299#)
                         break;
-                        // <--
                     default:
                         maEventQueue.Append( *pTextHint );
-                        // --> OD 2005-12-19 #i27299#
+                        // EditEngine should emit TEXT_SELECTION_CHANGED events (#i27299#)
                         if( maEventOpenFrames == 0 )
                             ProcessQueue();
-                        // <--
                         break;
                 }
             }
diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx
index e931d49403f5..47812a46dd1e 100644
--- a/svx/source/accessibility/ChildrenManager.cxx
+++ b/svx/source/accessibility/ChildrenManager.cxx
@@ -53,8 +53,8 @@ ChildrenManager::ChildrenManager (
         mpImpl->Init ();
     else
         throw uno::RuntimeException(
-            ::rtl::OUString::createFromAscii(
-                "ChildrenManager::ChildrenManager can't create implementation object"), NULL);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "ChildrenManager::ChildrenManager can't create implementation object")), NULL);
 }
 
 
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index 828159c37646..2c85ea3984a8 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -133,8 +133,8 @@ uno::Reference<XAccessible>
     // Check wether the given index is valid.
     if (nIndex < 0 || (unsigned long)nIndex >= maVisibleChildren.size())
         throw lang::IndexOutOfBoundsException (
-            ::rtl::OUString::createFromAscii(
-                "no accessible child with index ") + nIndex,
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "no accessible child with index ")) + nIndex,
             mxParent);
 
     return GetChild (maVisibleChildren[nIndex],nIndex);
diff --git a/svx/source/accessibility/DGColorNameLookUp.cxx b/svx/source/accessibility/DGColorNameLookUp.cxx
index 5b36cb30efff..c18044501867 100644
--- a/svx/source/accessibility/DGColorNameLookUp.cxx
+++ b/svx/source/accessibility/DGColorNameLookUp.cxx
@@ -99,7 +99,7 @@ DGColorNameLookUp::DGColorNameLookUp (void)
         // Create color table in which to look up the given color.
         uno::Reference<container::XNameContainer> xColorTable (
             ::comphelper::getProcessServiceFactory()->createInstance(
-                OUString::createFromAscii("com.sun.star.drawing.ColorTable")),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ColorTable")) ),
             uno::UNO_QUERY);
 
         // Get list of color names in order to iterate over the color table.
diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx
index 5cd04a2f4cec..7fa67d2c500c 100644
--- a/svx/source/accessibility/DescriptionGenerator.cxx
+++ b/svx/source/accessibility/DescriptionGenerator.cxx
@@ -123,19 +123,19 @@ void DescriptionGenerator::Initialize (::rtl::OUString sPrefix)
         {
             if (mxSet.is())
             {
-                uno::Any aValue = mxSet->getPropertyValue (OUString::createFromAscii ("Style"));
+                uno::Any aValue = mxSet->getPropertyValue (OUString(RTL_CONSTASCII_USTRINGPARAM("Style")) );
                 uno::Reference<container::XNamed> xStyle (aValue, uno::UNO_QUERY);
                 if (xStyle.is())
                     msDescription.append (xStyle->getName());
             }
             else
                 msDescription.append (
-                    OUString::createFromAscii("<no style>"));
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("<no style>")) );
         }
         catch (::com::sun::star::beans::UnknownPropertyException)
         {
             msDescription.append (
-                OUString::createFromAscii("<unknown>"));
+                OUString(RTL_CONSTASCII_USTRINGPARAM("<unknown>")) );
         }
     }
 }
@@ -222,14 +222,14 @@ void DescriptionGenerator::AppendString (const ::rtl::OUString& sString)
 
 void DescriptionGenerator::AddLineProperties (void)
 {
-    AddProperty (OUString::createFromAscii ("LineColor"),
+    AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("LineColor")),
         DescriptionGenerator::COLOR,
         SIP_XA_LINECOLOR);
-    AddProperty (OUString::createFromAscii ("LineDashName"),
+    AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("LineDashName")),
         DescriptionGenerator::STRING,
         SIP_XA_LINEDASH,
         XATTR_LINEDASH);
-    AddProperty (OUString::createFromAscii ("LineWidth"),
+    AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("LineWidth")),
         DescriptionGenerator::INTEGER,
         SIP_XA_LINEWIDTH);
 }
@@ -242,7 +242,7 @@ void DescriptionGenerator::AddLineProperties (void)
 */
 void DescriptionGenerator::AddFillProperties (void)
 {
-    AddProperty (OUString::createFromAscii ("FillStyle"),
+    AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("FillStyle")),
         DescriptionGenerator::FILL_STYLE,
         SIP_XA_FILLSTYLE);
 }
@@ -252,7 +252,7 @@ void DescriptionGenerator::AddFillProperties (void)
 
 void DescriptionGenerator::Add3DProperties (void)
 {
-    AddProperty (OUString::createFromAscii ("D3DMaterialColor"),
+    AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("D3DMaterialColor")),
         DescriptionGenerator::COLOR,
         RID_SVXSTR_A11Y_3D_MATERIAL_COLOR);
     AddLineProperties ();
@@ -264,7 +264,7 @@ void DescriptionGenerator::Add3DProperties (void)
 
 void DescriptionGenerator::AddTextProperties (void)
 {
-    AddProperty (OUString::createFromAscii ("CharColor"),
+    AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("CharColor")),
         DescriptionGenerator::COLOR);
     AddFillProperties ();
 }
@@ -296,7 +296,7 @@ void DescriptionGenerator::AddColor (const OUString& sPropertyName,
     catch (::com::sun::star::beans::UnknownPropertyException)
     {
         msDescription.append (
-            OUString::createFromAscii("<unknown>"));
+            OUString(RTL_CONSTASCII_USTRINGPARAM("<unknown>")) );
     }
 }
 
@@ -332,7 +332,7 @@ void DescriptionGenerator::AddInteger (const OUString& sPropertyName,
     catch (::com::sun::star::beans::UnknownPropertyException)
     {
         msDescription.append (
-            OUString::createFromAscii("<unknown>"));
+            OUString(RTL_CONSTASCII_USTRINGPARAM("<unknown>")) );
     }
 }
 
@@ -368,7 +368,7 @@ void DescriptionGenerator::AddString (const OUString& sPropertyName,
     catch (::com::sun::star::beans::UnknownPropertyException)
     {
         msDescription.append (
-            OUString::createFromAscii("<unknown>"));
+            OUString(RTL_CONSTASCII_USTRINGPARAM("<unknown>")) );
     }
 }
 
@@ -422,27 +422,27 @@ void DescriptionGenerator::AddFillStyle (const OUString& sPropertyName,
                 case drawing::FillStyle_NONE:
                     break;
                 case drawing::FillStyle_SOLID:
-                    AddProperty (OUString::createFromAscii ("FillColor"),
+                    AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("FillColor")),
                         COLOR,
                         SIP_XA_FILLCOLOR);
                     break;
                 case drawing::FillStyle_GRADIENT:
-                    AddProperty (OUString::createFromAscii ("FillGradientName"),
+                    AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("FillGradientName")),
                         STRING,
                         SIP_XA_FILLGRADIENT,
                         XATTR_FILLGRADIENT);
                     break;
                 case drawing::FillStyle_HATCH:
-                    AddProperty (OUString::createFromAscii ("FillColor"),
+                    AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("FillColor")),
                         COLOR,
                         SIP_XA_FILLCOLOR);
-                    AddProperty (OUString::createFromAscii ("FillHatchName"),
+                    AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("FillHatchName")),
                         STRING,
                         SIP_XA_FILLHATCH,
                         XATTR_FILLHATCH);
                     break;
                 case drawing::FillStyle_BITMAP:
-                    AddProperty (OUString::createFromAscii ("FillBitmapName"),
+                    AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM("FillBitmapName")),
                         STRING,
                         SIP_XA_FILLBITMAP,
                         XATTR_FILLBITMAP);
@@ -455,7 +455,7 @@ void DescriptionGenerator::AddFillStyle (const OUString& sPropertyName,
     catch (::com::sun::star::beans::UnknownPropertyException)
     {
         msDescription.append (
-            OUString::createFromAscii("<unknown>"));
+            OUString(RTL_CONSTASCII_USTRINGPARAM("<unknown>")) );
     }
 }
 
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx
index 78ebf9c6c6c9..9c9061fd7208 100644
--- a/svx/source/accessibility/ShapeTypeHandler.cxx
+++ b/svx/source/accessibility/ShapeTypeHandler.cxx
@@ -157,7 +157,7 @@ ShapeTypeHandler::ShapeTypeHandler (void)
     // Resize the list, if necessary, so that the new type can be inserted.
     maShapeTypeDescriptorList[0].mnShapeTypeId = UNKNOWN_SHAPE_TYPE;
     maShapeTypeDescriptorList[0].msServiceName =
-        OUString::createFromAscii ("UNKNOWN_SHAPE_TYPE");
+        OUString(RTL_CONSTASCII_USTRINGPARAM("UNKNOWN_SHAPE_TYPE"));
     maShapeTypeDescriptorList[0].maCreateFunction = CreateEmptyShapeReference;
     maServiceNameToSlotId[maShapeTypeDescriptorList[0].msServiceName] = 0;
 }
diff --git a/svx/source/accessibility/SvxShapeTypes.cxx b/svx/source/accessibility/SvxShapeTypes.cxx
index e3fa352976c5..6f172966a4a5 100644
--- a/svx/source/accessibility/SvxShapeTypes.cxx
+++ b/svx/source/accessibility/SvxShapeTypes.cxx
@@ -67,14 +67,12 @@ AccessibleShape* CreateSvxAccessibleShape (
         case DRAWING_POLY_LINE_PATH:
         case DRAWING_RECTANGLE:
         case DRAWING_TEXT:
-        // --> OD 2004-11-29 #i37790# - default accessiblility shape for
-        // com::sun::star::drawing::CustomShape
+        // Default accessiblility shape for
+        // com::sun::star::drawing::CustomShape (#i37790#)
         case DRAWING_CUSTOM:
-        // <--
-        // --> OD 2008-05-19 #i85429# - default accessiblility shape for
-        // com::sun::star::drawing::MediaShape
+        // Default accessiblility shape for
+        // com::sun::star::drawing::MediaShape (#i85429#)
         case DRAWING_MEDIA:
-        // <--
             return new AccessibleShape (rShapeInfo, rShapeTreeInfo);
 
         case DRAWING_CONTROL:
@@ -199,9 +197,8 @@ ShapeTypeDescriptor aSvxShapeTypeList[] = {
 
 void RegisterDrawShapeTypes (void)
 {
-    // --> OD 2004-11-26 #i37790#
+    // Crash while inserting callout with activated accesibility (#i37790#)
     ShapeTypeHandler::Instance().AddShapeTypeList ( DRAWING_END, aSvxShapeTypeList);
-    // <--
 }
 
 
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 8118264ccbc9..f1e8a25d2604 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -868,7 +868,7 @@ Reference < i18n::XBreakIterator > EnhancedCustomShapeFontWork::GetBreakIterator
     if ( !mxBreakIterator.is() )
     {
         Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
-        Reference < XInterface > xI = xMSF->createInstance( rtl::OUString::createFromAscii( "com.sun.star.i18n.BreakIterator" ) );
+        Reference < XInterface > xI = xMSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")) );
         if ( xI.is() )
         {
             Any x = xI->queryInterface( ::getCppuType((const Reference< i18n::XBreakIterator >*)0) );
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index 334b3ffd0841..bcaf8a6f80ac 100644
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.cxx
@@ -180,7 +180,7 @@ void SAL_CALL SvxTbxCtlCustomShapes::functionSelected( const ::rtl::OUString& rC
         if ( m_aCommand.getLength() > 0 )
         {
             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( getFrameInterface());
-            Image aImage = GetImage( xFrame, m_aCommand, hasBigImages(), isHighContrast() );
+            Image aImage = GetImage( xFrame, m_aCommand, hasBigImages() );
             if ( !!aImage )
                 GetToolBox().SetItemImage( GetId(), aImage );
         }
@@ -195,7 +195,7 @@ void SAL_CALL SvxTbxCtlCustomShapes::updateImage(  ) throw (::com::sun::star::un
     if ( m_aCommand.getLength() > 0 )
     {
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( getFrameInterface());
-        Image aImage = GetImage( xFrame, m_aCommand, hasBigImages(), isHighContrast() );
+        Image aImage = GetImage( xFrame, m_aCommand, hasBigImages() );
         if ( !!aImage )
             GetToolBox().SetItemImage( GetId(), aImage );
     }
diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx
index 6cde2c265b1f..2a3493841b38 100644
--- a/svx/source/dialog/SpellDialogChildWindow.cxx
+++ b/svx/source/dialog/SpellDialogChildWindow.cxx
@@ -95,24 +95,18 @@ void SpellDialogChildWindow::AddAutoCorrection(
 {
     DBG_ERROR("AutoCorrection should have been overloaded - if available");
 }
-/*-- 16.06.2008 10:11:57---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 bool SpellDialogChildWindow::HasGrammarChecking()
 {
     return false;
 }
-/*-- 18.06.2008 12:26:35---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 bool SpellDialogChildWindow::IsGrammarChecking()
 {
     DBG_ERROR("Grammar checking should have been overloaded - if available");
     return false;
 }
-/*-- 18.06.2008 12:26:35---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SpellDialogChildWindow::SetGrammarChecking(bool )
 {
     DBG_ERROR("Grammar checking should have been overloaded - if available");
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index ef1e74804534..aee42601a278 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -447,8 +447,7 @@ SvxBmpMask::SvxBmpMask( SfxBindings *pBindinx,
         pColTab             ( NULL ),
         aPipetteColor       ( COL_WHITE ),
         aSelItem            ( SID_BMPMASK_EXEC, *this, *pBindinx ),
-        maImgPipette        ( BMP_RESID ( IMG_PIPETTE ) ),
-        maImgPipetteH       ( BMP_RESID ( IMG_PIPETTE_H ) )
+        maImgPipette        ( BMP_RESID ( IMG_PIPETTE ) )
 {
     FreeResource();
 
@@ -1210,9 +1209,7 @@ void SvxBmpMask::DataChanged( const DataChangedEvent& rDCEvt )
 
 void SvxBmpMask::ApplyStyle()
 {
-    bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
-    aTbxPipette.SetItemImage( TBI_PIPETTE, bHighContrast ? maImgPipetteH : maImgPipette );
+    aTbxPipette.SetItemImage( TBI_PIPETTE, maImgPipette );
 }
 
 
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 47d26c3c1eab..894560e78e9a 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -397,8 +397,7 @@ SvxSuperContourDlg::SvxSuperContourDlg( SfxBindings *_pBindings, SfxChildWindow
         nGrfChanged         ( 0UL ),
         bExecState          ( FALSE ),
         bGraphicLinked      ( FALSE ),
-        maImageList         ( SVX_RES( CD_IMAPDLG ) ),
-        maImageListH        ( SVX_RES( CDH_IMAPDLG ) )
+        maImageList         ( SVX_RES( CD_IMAPDLG ) )
 {
     ApplyImageList();
 
@@ -1129,9 +1128,7 @@ IMPL_LINK( SvxSuperContourDlg, WorkplaceClickHdl, ContourWindow*, pWnd )
 
 void SvxSuperContourDlg::ApplyImageList()
 {
-    bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
-    ImageList& rImgLst = bHighContrast ? maImageListH : maImageList;
+    ImageList& rImgLst = maImageList;
 
     aTbx1.SetImageList( rImgLst );
 }
@@ -1152,7 +1149,7 @@ void SvxSuperContourDlg::DataChanged( const DataChangedEvent& rDCEvt )
 
 IMPL_LINK( SvxSuperContourDlg, MiscHdl, void*, EMPTYARG )
 {
-       SvtMiscOptions aMiscOptions;
+    SvtMiscOptions aMiscOptions;
     aTbx1.SetOutStyle( aMiscOptions.GetToolboxStyle() );
 
     return 0L;
diff --git a/svx/source/dialog/bmpmask.hrc b/svx/source/dialog/bmpmask.hrc
index 99c9eab04b7b..f204cfcbf8f7 100644
--- a/svx/source/dialog/bmpmask.hrc
+++ b/svx/source/dialog/bmpmask.hrc
@@ -57,6 +57,3 @@
 #define FT_2 2
 #define FT_3 3
 #define IMG_PIPETTE     11
-#define IMG_PIPETTE_H   12
-
-
diff --git a/svx/source/dialog/bmpmask.src b/svx/source/dialog/bmpmask.src
index 616e7b39fbe4..7ac9ae4d1470 100644
--- a/svx/source/dialog/bmpmask.src
+++ b/svx/source/dialog/bmpmask.src
@@ -293,11 +293,6 @@ DockingWindow RID_SVXDLG_BMPMASK
         MASKCOLOR
     };
 
-    Image IMG_PIPETTE_H
-    {
-        ImageBitmap = Bitmap { File = "sc10350_h.bmp" ; };
-        MASKCOLOR
-    };
 };
 
 String RID_SVXDLG_BMPMASK_STR_TRANSP
diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx
index 2aee16f32aac..e66fdf975559 100644
--- a/svx/source/dialog/checklbx.cxx
+++ b/svx/source/dialog/checklbx.cxx
@@ -62,10 +62,8 @@ SvxCheckListBox::SvxCheckListBox( Window* pParent, const ResId& rResId ) :
 // -----------------------------------------------------------------------
 
 SvxCheckListBox::SvxCheckListBox( Window* pParent, const ResId& rResId,
-                                  const Image& rNormalStaticImage,
-                                  const Image& /*TODO#i72485# rHighContrastStaticImage*/ ) :
-
-    SvTreeListBox( pParent, rResId )
+                                  const Image& rNormalStaticImage )
+    : SvTreeListBox( pParent, rResId )
 
 {
     Init_Impl();
diff --git a/svx/source/dialog/contdlg.hrc b/svx/source/dialog/contdlg.hrc
index a191231daa22..4aba6fc629cc 100644
--- a/svx/source/dialog/contdlg.hrc
+++ b/svx/source/dialog/contdlg.hrc
@@ -65,7 +65,6 @@
 #define STB_STATUS              1
 
 #define CD_IMAPDLG              1300
-#define CDH_IMAPDLG             1301
 
 
 /******************************************************************************/
diff --git a/svx/source/dialog/contdlg.src b/svx/source/dialog/contdlg.src
index 1b1923c66eab..9a9372a2bd0a 100644
--- a/svx/source/dialog/contdlg.src
+++ b/svx/source/dialog/contdlg.src
@@ -223,30 +223,29 @@ FloatingWindow RID_SVXDLG_CONTOUR
         MASKCOLOR
         CONTOURDLG_IDLIST
     };
-    ImageList CDH_IMAPDLG
-    {
-        Prefix = "cdh";
-        MASKCOLOR
-        CONTOURDLG_IDLIST
-    };
 };
+
 /******************************************************************************/
 String STR_CONTOURDLG_MODIFY
 {
     Text [ en-US ] = "The contour has been modified.\nDo you want to save the changes?" ;
 };
+
 String STR_CONTOURDLG_NEWPIPETTE
 {
     Text [ en-US ] = "Do you want to create a new contour?" ;
 };
+
 String STR_CONTOURDLG_WORKPLACE
 {
     Text [ en-US ] = "Setting a new workspace will\ncause the contour to be deleted.\nAre you sure you want to continue?" ;
 };
+
 String STR_CONTOURDLG_LINKED
 {
     Text [ en-US ] = "This graphic object is linked to the document. Do you want to unlink the graphics in order to edit it?" ;
 };
+
 /******************************************************************************/
 
 
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index be3bfaf223bd..278b38d61270 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -67,7 +67,6 @@ class SvxSuperContourDlg : public SvxContourDlg
     BOOL                bUpdateGraphicLinked;
     BOOL                bGraphicLinked;
     ImageList           maImageList;
-    ImageList           maImageListH;
 
     virtual void        Resize();
     virtual BOOL        Close();
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 1e7e6caed849..12d164d7309d 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -827,12 +827,8 @@ SvxTPFilter::SvxTPFilter( Window * pParent)
     aStrMyName  (       SVX_RES( STR_FILTER) ),
     bModified   (FALSE)
 {
-    Image aImgTimeHC( SVX_RES( IMG_TIME_H ) );
     FreeResource();
 
-    aIbClock.SetModeImage( aImgTimeHC, BMP_COLOR_HIGHCONTRAST );
-    aIbClock2.SetModeImage( aImgTimeHC, BMP_COLOR_HIGHCONTRAST );
-
     aDfDate.SetShowDateCentury( TRUE );
     aDfDate2.SetShowDateCentury( TRUE );
 
diff --git a/svx/source/dialog/ctredlin.hrc b/svx/source/dialog/ctredlin.hrc
index 23cc504c0573..ef4db94e21c0 100644
--- a/svx/source/dialog/ctredlin.hrc
+++ b/svx/source/dialog/ctredlin.hrc
@@ -50,7 +50,6 @@
 #define LB_ACTION       18
 #define CB_COMMENT      19
 #define ED_COMMENT      20
-#define IMG_TIME_H      30
 
 #define HG_VIEW         1
 #define DG_VIEW         2
@@ -67,4 +66,3 @@
 #define STR_TITLE4      4
 #define STR_TITLE5      5
 //
-
diff --git a/svx/source/dialog/ctredlin.src b/svx/source/dialog/ctredlin.src
index e617607ebfad..6b97b66e3f0e 100644
--- a/svx/source/dialog/ctredlin.src
+++ b/svx/source/dialog/ctredlin.src
@@ -249,11 +249,6 @@ TabPage SID_REDLIN_FILTER_PAGE
         Size = MAP_APPFONT ( 178 , 12 ) ;
         TabStop = TRUE ;
     };
-    Image IMG_TIME_H
-    {
-        ImageBitmap = Bitmap { File = "time_h.bmp" ; };
-        MASKCOLOR
-    };
 };
 TabPage SID_REDLIN_VIEW_PAGE
 {
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 7ac2e5a84e93..6d6fe2d97924 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -548,8 +548,7 @@ void SAL_CALL RecoveryCore::statusChanged(const css::frame::FeatureStateEvent& a
     if (!sURL.Len())
         sURL = aNew.TemplateURL;
     INetURLObject aURL(sURL);
-    aNew.StandardImage = SvFileInformationManager::GetFileImage(aURL, false, false);
-    aNew.HCImage       = SvFileInformationManager::GetFileImage(aURL, false, true );
+    aNew.StandardImage = SvFileInformationManager::GetFileImage(aURL, false);
 
     /* set the right UI state for this item to NOT_RECOVERED_YET ... because nDocState shows the state of
        the last emergency save operation before and is interessting for the used recovery core service only ...
@@ -558,7 +557,7 @@ void SAL_CALL RecoveryCore::statusChanged(const css::frame::FeatureStateEvent& a
     aNew.RecoveryState = E_NOT_RECOVERED_YET;
 
     // patch DisplayName! Because the document title contain more then the file name ...
-    sal_Int32 i = aNew.DisplayName.indexOf(::rtl::OUString::createFromAscii(" - "));
+    sal_Int32 i = aNew.DisplayName.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" - ")));
     if (i > 0)
         aNew.DisplayName = aNew.DisplayName.copy(0, i);
 
@@ -774,7 +773,6 @@ SaveDialog::SaveDialog(Window*       pParent,
     m_aTitleFT.SetFont(aFont);
 
     m_aOkBtn.SetClickHdl( LINK( this, SaveDialog, OKButtonHdl ) );
-//    m_aFileListLB.EnableInput( sal_False );
     m_aFileListLB.SetControlBackground( rStyleSettings.GetDialogColor() );
 
     // fill listbox with current open documents
@@ -847,7 +845,6 @@ SaveProgressDialog::SaveProgressDialog(Window*       pParent,
     FreeResource();
     PluginProgress* pProgress   = new PluginProgress( &m_aProgrParent, pCore->getSMGR() );
                     m_xProgress = css::uno::Reference< css::task::XStatusIndicator >(static_cast< css::task::XStatusIndicator* >(pProgress), css::uno::UNO_QUERY_THROW);
-//  m_aProgrBaseTxt = m_aProgrFT.GetText();
 }
 
 //===============================================
@@ -913,16 +910,12 @@ void RecovDocListEntry::Paint(const Point&       aPos   ,
     const String*       pTxt  = 0;
           RecovDocList* pList = static_cast< RecovDocList* >(&aDevice);
 
-    BOOL      bHC         = aDevice.GetSettings().GetStyleSettings().GetHighContrastMode();
-
     TURLInfo* pInfo  = (TURLInfo*)pEntry->GetUserData();
     switch(pInfo->RecoveryState)
     {
         case E_SUCCESSFULLY_RECOVERED :
         {
             pImg = &pList->m_aGreenCheckImg;
-            if (bHC)
-                pImg = &pList->m_aGreenCheckImgHC;
             pTxt = &pList->m_aSuccessRecovStr;
         }
         break;
@@ -930,8 +923,6 @@ void RecovDocListEntry::Paint(const Point&       aPos   ,
         case E_ORIGINAL_DOCUMENT_RECOVERED : // TODO must be renamed into ORIGINAL DOCUMENT recovered! Because its marked as yellow
         {
             pImg = &pList->m_aYellowCheckImg;
-            if (bHC)
-                pImg = &pList->m_aYellowCheckImgHC;
             pTxt = &pList->m_aOrigDocRecovStr;
         }
         break;
@@ -939,8 +930,6 @@ void RecovDocListEntry::Paint(const Point&       aPos   ,
         case E_RECOVERY_FAILED :
         {
             pImg = &pList->m_aRedCrossImg;
-            if (bHC)
-                pImg = &pList->m_aRedCrossImgHC;
             pTxt = &pList->m_aRecovFailedStr;
         }
         break;
@@ -980,9 +969,6 @@ RecovDocList::RecovDocList(      Window* pParent,
     , m_aGreenCheckImg    ( ResId(IMG_GREENCHECK,*rResId.GetResMgr()     ) )
     , m_aYellowCheckImg   ( ResId(IMG_YELLOWCHECK,*rResId.GetResMgr()    ) )
     , m_aRedCrossImg      ( ResId(IMG_REDCROSS,*rResId.GetResMgr()       ) )
-    , m_aGreenCheckImgHC  ( ResId(IMG_GREENCHECK_HC,*rResId.GetResMgr()  ) )
-    , m_aYellowCheckImgHC ( ResId(IMG_YELLOWCHECK_HC,*rResId.GetResMgr() ) )
-    , m_aRedCrossImgHC    ( ResId(IMG_REDCROSS_HC,*rResId.GetResMgr()    ) )
     , m_aSuccessRecovStr  ( ResId(STR_SUCCESSRECOV,*rResId.GetResMgr()   ) )
     , m_aOrigDocRecovStr  ( ResId(STR_ORIGDOCRECOV,*rResId.GetResMgr()   ) )
     , m_aRecovFailedStr   ( ResId(STR_RECOVFAILED,*rResId.GetResMgr()    ) )
@@ -1103,8 +1089,6 @@ RecoveryDialog::RecoveryDialog(Window*       pParent,
         sName += impl_getStatusString( rInfo );
         SvLBoxEntry* pEntry = m_aFileListLB.InsertEntry(sName, rInfo.StandardImage, rInfo.StandardImage);
         pEntry->SetUserData((void*)&rInfo);
-        m_aFileListLB.SetExpandedEntryBmp (pEntry, rInfo.HCImage, BMP_COLOR_HIGHCONTRAST);
-        m_aFileListLB.SetCollapsedEntryBmp(pEntry, rInfo.HCImage, BMP_COLOR_HIGHCONTRAST);
     }
 
     // mark first item
@@ -2036,16 +2020,16 @@ void BrokenRecoveryDialog::impl_askForSavePath()
         {
 
 #if defined(WNT) || defined(OS2)
-            OUString    ustrValue = OUString::createFromAscii("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}");
+            OUString    ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}"));
 #elif defined( MACOSX )
-            OUString    ustrValue = OUString::createFromAscii("~");
+            OUString    ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("~"));
 #else
-            OUString    ustrValue = OUString::createFromAscii("$SYSUSERCONFIG");
+            OUString    ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("$SYSUSERCONFIG"));
 #endif
             Bootstrap::expandMacros( ustrValue );
 
 #if defined(WNT) || defined(OS2)
-            ustrValue += OUString::createFromAscii("/user/crashdata");
+            ustrValue += OUString(RTL_CONSTASCII_USTRINGPARAM("/user/crashdata"));
 #endif
             return ustrValue;
         }
diff --git a/svx/source/dialog/docrecovery.hrc b/svx/source/dialog/docrecovery.hrc
index 18148131f6aa..534edf625fa9 100644
--- a/svx/source/dialog/docrecovery.hrc
+++ b/svx/source/dialog/docrecovery.hrc
@@ -105,9 +105,6 @@
 #define IMG_GREENCHECK              14
 #define IMG_YELLOWCHECK             15
 #define IMG_REDCROSS                16
-#define IMG_GREENCHECK_HC           17
-#define IMG_YELLOWCHECK_HC          18
-#define IMG_REDCROSS_HC             19
 #define STR_SUCCESSRECOV            20
 #define STR_ORIGDOCRECOV            21
 #define STR_RECOVFAILED             22
diff --git a/svx/source/dialog/docrecovery.src b/svx/source/dialog/docrecovery.src
index 7c1532b71b55..2da85bc8c591 100644
--- a/svx/source/dialog/docrecovery.src
+++ b/svx/source/dialog/docrecovery.src
@@ -211,26 +211,14 @@ TabPage RID_SVXPAGE_DOCRECOVERY_RECOVER
     {
         ImageBitmap = Bitmap { File = "nu01.png"; };
     };
-    Image IMG_GREENCHECK_HC
-    {
-        ImageBitmap = Bitmap { File = "nuh01.png"; };
-    };
     Image IMG_YELLOWCHECK
     {
         ImageBitmap = Bitmap { File = "nu04.png"; };
     };
-    Image IMG_YELLOWCHECK_HC
-    {
-        ImageBitmap = Bitmap { File = "nuh04.png"; };
-    };
     Image IMG_REDCROSS
     {
         ImageBitmap = Bitmap { File = "nu02.png"; };
     };
-    Image IMG_REDCROSS_HC
-    {
-        ImageBitmap = Bitmap { File = "nuh02.png"; };
-    };
     String STR_SUCCESSRECOV
     {
         Text[ en-US ] = "Successfully recovered";
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index a87e26eb61a4..1296071fd59d 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -147,7 +147,7 @@ class FontPrevWin_Impl
 public:
     inline FontPrevWin_Impl() :
         pPrinter( NULL ), bDelPrinter( FALSE ),
-        pColor( NULL ), pBackColor( 0 ),
+        pColor( NULL ), pBackColor( 0 ), nAscent( 0 ),
         cStartBracket( 0 ), cEndBracket( 0 ), nFontWidthScale( 100 ),
         bSelection( FALSE ), bGetSelection( FALSE ), bUseResText( FALSE ),
         bTwoLines( FALSE ),
@@ -223,7 +223,7 @@ void FontPrevWin_Impl::_CheckScript()
     {
         Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
         xBreak = Reference< XBreakIterator >(xMSF->createInstance(
-                ::rtl::OUString::createFromAscii( "com.sun.star.i18n.BreakIterator" ) ),UNO_QUERY);
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")) ),UNO_QUERY);
     }
     if( xBreak.is() )
     {
@@ -802,23 +802,17 @@ void SvxFontPrevWindow::Paint( const Rectangle& )
         pImpl->DrawPrev( this, pPrinter, aTmpPoint, rFont );
     }
 }
-/* -----------------------------04.12.00 16:26--------------------------------
 
- ---------------------------------------------------------------------------*/
 BOOL SvxFontPrevWindow::IsTwoLines() const
 {
     return pImpl->bTwoLines;
 }
-/* -----------------------------04.12.00 16:26--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SvxFontPrevWindow::SetTwoLines(BOOL bSet)
 {
     pImpl->bTwoLines = bSet;}
 
-/* -----------------------------04.12.00 16:26--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SvxFontPrevWindow::SetBrackets(sal_Unicode cStart, sal_Unicode cEnd)
 {
     pImpl->cStartBracket = cStart;
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 11cfe4f259c4..d7c2cb8fcc27 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -249,7 +249,6 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx,
     nSaveShadowSize (100),
 
     maImageList     (ResId(IL_FONTWORK,*rResId.GetResMgr())),
-    maImageListH    (ResId(ILH_FONTWORK,*rResId.GetResMgr())),
 
     pColorTable     (NULL)
 {
@@ -1221,30 +1220,16 @@ void SvxFontWorkDialog::DataChanged( const DataChangedEvent& rDCEvt )
 
     SfxDockingWindow::DataChanged( rDCEvt );
 }
-/* -----------------------------08.05.2002 14:28------------------------------
 
- ---------------------------------------------------------------------------*/
 void SvxFontWorkDialog::ApplyImageList()
 {
-    bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
     ResMgr* _pMgr = &DIALOG_MGR();
 
-    USHORT nBitmapResId = bHighContrast ? RID_SVXBMP_FONTWORK_FORM1_H : RID_SVXBMP_FONTWORK_FORM1;
+    USHORT nBitmapResId = RID_SVXBMP_FONTWORK_FORM1;
     USHORT nTextResId = RID_SVXSTR_FONTWORK_FORM1;
 
     bool bInit = aFormSet.GetItemCount() == 0;
 
-    if( bInit )
-    {
-/*
-        Size aSize( aTbxStyle.CalcWindowSizePixel() );
-        Bitmap aBmp(ResId(RID_SVXBMP_FONTWORK_FORM1,_pMgr));
-        aSize.Height() = aFormSet.CalcWindowSizePixel(aBmp.GetSizePixel()).Height() + 2;
-        aFormSet.SetSizePixel(aSize);
-*/
-    }
-
     USHORT i;
     for( i = 1; i < 13; i++, nTextResId++, nBitmapResId++ )
     {
@@ -1259,7 +1244,7 @@ void SvxFontWorkDialog::ApplyImageList()
         }
     }
 
-    ImageList& rImgLst = bHighContrast ? maImageListH : maImageList;
+    ImageList& rImgLst = maImageList;
 
     aTbxStyle.SetImageList( rImgLst );
     aTbxAdjust.SetImageList( rImgLst );
diff --git a/svx/source/dialog/fontwork.hrc b/svx/source/dialog/fontwork.hrc
index cdbc48aa032e..3c696d41da9d 100644
--- a/svx/source/dialog/fontwork.hrc
+++ b/svx/source/dialog/fontwork.hrc
@@ -40,7 +40,6 @@
 #define CLB_SHADOW_COLOR 1
 
 #define IL_FONTWORK     1200
-#define ILH_FONTWORK    1201
 
 // the following ids are also used to identify the
 // bitmaps for the image list
diff --git a/svx/source/dialog/fontwork.src b/svx/source/dialog/fontwork.src
index b0c63d9313d4..a8aec80e52bb 100644
--- a/svx/source/dialog/fontwork.src
+++ b/svx/source/dialog/fontwork.src
@@ -345,12 +345,6 @@ DockingWindow RID_SVXDLG_FONTWORK
         MaskColor = IMAGE_STDBTN_COLOR ;
         FONTWORK_IDLIST
     };
-    ImageList ILH_FONTWORK
-    {
-        Prefix = "fwh";
-        MaskColor = IMAGE_STDBTN_COLOR ;
-        FONTWORK_IDLIST
-    };
 };
  // Bitmaps ---------------------------------------------------------------
 Bitmap RID_SVXBMP_FONTWORK_FORM1
@@ -402,55 +396,6 @@ Bitmap RID_SVXBMP_FONTWORK_FORM12
     File = "fwbuttn4.bmp" ;
 };
 
-Bitmap RID_SVXBMP_FONTWORK_FORM1_H
-{
-    File = "fwthcirc_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM2_H
-{
-    File = "fwbhcirc_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM3_H
-{
-    File = "fwlhcirc_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM4_H
-{
-    File = "fwrhcirc_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM5_H
-{
-    File = "fwtoparc_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM6_H
-{
-    File = "fwbotarc_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM7_H
-{
-    File = "fwlftarc_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM8_H
-{
-    File = "fwrgtarc_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM9_H
-{
-    File = "fwbuttn1_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM10_H
-{
-    File = "fwbuttn2_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM11_H
-{
-    File = "fwbuttn3_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM12_H
-{
-    File = "fwbuttn4_h.bmp" ;
-};
-
  // Strings ---------------------------------------------------------------
 String RID_SVXSTR_FONTWORK_FORM1
 {
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index f5067a3bd374..f843ae7e5c84 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -64,7 +64,7 @@
 #include <svx/dialogs.hrc>
 // static ----------------------------------------------------------------
 
-// --> OD 2004-06-18 #i19922#
+// Word 97 incompatibility (#i19922#)
 //static const long MINBODY = 284;            // 0,5cm in twips aufgerundet
 static const long MINBODY = 56;  // 1mm in twips rounded
 
@@ -90,10 +90,6 @@ static USHORT pRanges[] =
     0
 };
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 // gibt den Bereich der Which-Werte zurueck
 
 
@@ -711,10 +707,6 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet )
     }
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
 {
     const SfxPoolItem* pItem = GetItem( rSet, SID_ATTR_LRSPACE );
@@ -866,10 +858,6 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
     RangeHdl( 0 );
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 int SvxHFPage::DeactivatePage( SfxItemSet* _pSet )
 {
     if ( _pSet )
@@ -953,9 +941,7 @@ IMPL_LINK( SvxHFPage, RangeHdl, Edit *, EMPTYARG )
     aRMEdit.SetMax( aLMEdit.Normalize( nMax ), FUNIT_TWIP );
     return 0;
 }
-/* -----------------------------26.08.2002 12:49------------------------------
 
- ---------------------------------------------------------------------------*/
 void lcl_Move(Window& rWin, sal_Int32 nDiff)
 {
     Point aPos(rWin.GetPosPixel());
diff --git a/svx/source/dialog/hyprdlg.hxx b/svx/source/dialog/hyprdlg.hxx
index 17c1f43e6192..d22160125003 100644
--- a/svx/source/dialog/hyprdlg.hxx
+++ b/svx/source/dialog/hyprdlg.hxx
@@ -39,10 +39,6 @@
 class SvxHyperlinkDlg;
 class SfxViewFrame;
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 class HyperCombo : public ComboBox
 {
     SvxHyperlinkDlg *pDlg;
diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx
index 2ab7acde4789..6b6f562e41c5 100644
--- a/svx/source/dialog/hyprlink.cxx
+++ b/svx/source/dialog/hyprlink.cxx
@@ -68,20 +68,15 @@ public:
     virtual void            Commit();
 };
 
-/*-- 11.11.2003 14:20:59---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SearchDefaultConfigItem_Impl::SearchDefaultConfigItem_Impl() :
-        ConfigItem(OUString::createFromAscii("Inet/DefaultSearchEngine"))
+        ConfigItem(OUString(RTL_CONSTASCII_USTRINGPARAM("Inet/DefaultSearchEngine")))
 {
     uno::Sequence<OUString> aNames(1);
-    aNames.getArray()[0] = OUString::createFromAscii("Name");
+    aNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("Name"));
     uno::Sequence< uno::Any > aValues = GetProperties(aNames);
     aValues.getConstArray()[0] >>= sDefaultEngine;
 }
-/*-- 11.11.2003 14:21:00---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SearchDefaultConfigItem_Impl::~SearchDefaultConfigItem_Impl()
 {
 }
@@ -203,10 +198,6 @@ SvxHyperlinkDlg::SvxHyperlinkDlg( SfxBindings *_pBindings, Window* pParent) :
         HideItem( BTN_INET_SEARCH );
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 SvxHyperlinkDlg::~SvxHyperlinkDlg()
 {
     SfxImageManager::GetImageManager( 0 )->ReleaseToolBox(this);
@@ -247,10 +238,6 @@ void SvxHyperlinkDlg::Resize()
     }
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 void SvxHyperlinkDlg::Resizing(Size& rSize)
 {
     if (rSize.Height() > nMaxHeight)
@@ -339,10 +326,6 @@ void SvxHyperlinkDlg::StateChanged( USHORT nSID, SfxItemState eState,
     }
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 IMPL_LINK( SvxHyperlinkDlg, TBClickHdl, ToolBox *, pBox )
 {
     switch (pBox->GetCurItemId())
@@ -364,10 +347,6 @@ IMPL_LINK( SvxHyperlinkDlg, TBClickHdl, ToolBox *, pBox )
     return TRUE;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 IMPL_LINK( SvxHyperlinkDlg, TBSelectHdl, ToolBox *, pBox )
 {
     switch (pBox->GetCurItemId())
@@ -460,10 +439,6 @@ IMPL_LINK( SvxHyperlinkDlg, DropdownClick, ToolBox *, pBox )
     return TRUE;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 void SvxHyperlinkDlg::TargetMenu(const String& rSelEntry, BOOL bExecute)
 {
     if (pTargetMenu && !bExecute)
@@ -525,10 +500,6 @@ void SvxHyperlinkDlg::TargetMenu(const String& rSelEntry, BOOL bExecute)
     }
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 IMPL_LINK( SvxHyperlinkDlg, LinkPopupSelectHdl, Menu *, pMenu )
 {
     switch (pMenu->GetCurItemId())
@@ -544,10 +515,6 @@ IMPL_LINK( SvxHyperlinkDlg, LinkPopupSelectHdl, Menu *, pMenu )
     return TRUE;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 IMPL_LINK( SvxHyperlinkDlg, SearchPopupSelectHdl, Menu *, pMenu )
 {
     const SvxSearchEngineData&  rData = aSearchConfig.GetData(pMenu->GetCurItemId() - 1);
@@ -624,10 +591,6 @@ IMPL_LINK( SvxHyperlinkDlg, SearchPopupSelectHdl, Menu *, pMenu )
     return TRUE;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 IMPL_LINK( SvxHyperlinkDlg, BookmarkFoundHdl, String *, pUrl )
 {
     if (pUrl && pUrl->Len())
@@ -792,10 +755,6 @@ IMPL_LINK( SvxHyperlinkDlg, ComboSelectHdl, ComboBox *, pCombo )
     return TRUE;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 IMPL_LINK( SvxHyperlinkDlg, ComboModifyHdl, ComboBox *, pCombo )
 {
     BOOL bEnable = TRUE;
@@ -836,13 +795,11 @@ void SvxHyperlinkDlg::DataChanged( const DataChangedEvent& rDCEvt )
 
 void SvxHyperlinkDlg::SetImages()
 {
-    bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
-    SetItemImage( BTN_LINK, mpManager->GetImage( BTN_LINK, bHighContrast ) );
-    SetItemImage( BTN_INSERT_BOOKMARK, mpManager->GetImage( BTN_INSERT_BOOKMARK, bHighContrast ) );
-    SetItemImage( BTN_INET_SEARCH, mpManager->GetImage( BTN_INET_SEARCH, bHighContrast ) );
-    SetItemImage( BTN_TARGET, mpManager->GetImage( BTN_TARGET, bHighContrast ) );
-    SetItemImage( BTN_OPENDIALOG, mpManager->GetImage( BTN_OPENDIALOG, bHighContrast ) );
+    SetItemImage( BTN_LINK,             mpManager->GetImage( BTN_LINK            ) );
+    SetItemImage( BTN_INSERT_BOOKMARK,  mpManager->GetImage( BTN_INSERT_BOOKMARK ) );
+    SetItemImage( BTN_INET_SEARCH,      mpManager->GetImage( BTN_INET_SEARCH     ) );
+    SetItemImage( BTN_TARGET,           mpManager->GetImage( BTN_TARGET          ) );
+    SetItemImage( BTN_OPENDIALOG,       mpManager->GetImage( BTN_OPENDIALOG      ) );
 }
 
 /*--------------------------------------------------------------------
@@ -910,10 +867,6 @@ long HyperCombo::PreNotify( NotifyEvent& rNEvt )
     return nHandled;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 long HyperCombo::CalcResizeWidth( long nW )
 {
     long nNewWidth = Max(nMaxWidth - nW * GetRatio() / 100L, nMinWidth);
@@ -927,10 +880,6 @@ long HyperCombo::CalcResizeWidth( long nW )
         return 0;   // Kein Resize notwendig
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 void HyperCombo::DoResize( long nNewWidth )
 {
     SetSizePixel(Size(nNewWidth, GetSizePixel().Height()));
@@ -988,10 +937,6 @@ SvxHyperlinkDlgWrapper::SvxHyperlinkDlgWrapper( Window* _pParent, USHORT nId,
     eChildAlignment = SFX_ALIGN_TOP;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 SfxChildWinInfo SvxHyperlinkDlgWrapper::GetInfo() const
 {
     SfxChildWinInfo aInfo = SfxChildWindow::GetInfo();
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 997f222a0464..5f577bb32aa1 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -198,7 +198,6 @@ SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW,
         maCbbTarget         ( this, SVX_RES( RID_SVXCTL_CBB_TARGET ) ),
         aStbStatus          ( this, WB_BORDER | WB_3DLOOK | WB_LEFT ),
         maImageList         ( SVX_RES( IL_IMAPDLG ) ),
-        maImageListH        ( SVX_RES( ILH_IMAPDLG ) ),
         pCheckObj           ( NULL ),
         aIMapItem           ( SID_IMAP_EXEC, *this, *_pBindings )
 {
@@ -1034,9 +1033,7 @@ IMPL_LINK( SvxIMapDlg, MiscHdl, void*, EMPTYARG )
 
 void SvxIMapDlg::ApplyImageList()
 {
-    bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
-    ImageList& rImgLst = bHighContrast ? maImageListH : maImageList;
+    ImageList& rImgLst = maImageList;
 
     aTbxIMapDlg1.SetImageList( rImgLst );
 }
diff --git a/svx/source/dialog/imapdlg.hrc b/svx/source/dialog/imapdlg.hrc
index 4a6d322699b5..ecc6b83332cc 100644
--- a/svx/source/dialog/imapdlg.hrc
+++ b/svx/source/dialog/imapdlg.hrc
@@ -71,7 +71,6 @@
 #define STB_STATUS              1
 
 #define IL_IMAPDLG              1024
-#define ILH_IMAPDLG             1025
 
 /******************************************************************************/
 
diff --git a/svx/source/dialog/imapdlg.src b/svx/source/dialog/imapdlg.src
index a61a9e34fa5e..8775acdaaaa2 100644
--- a/svx/source/dialog/imapdlg.src
+++ b/svx/source/dialog/imapdlg.src
@@ -265,13 +265,8 @@ ModelessDialog RID_SVXDLG_IMAP
         MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } ;
         IMAPDLG_IDLIST
     };
-    ImageList ILH_IMAPDLG
-    {
-        Prefix = "idh";
-        MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } ;
-        IMAPDLG_IDLIST
-    };
 };
+
 Control RID_SVXCTL_IMAP
 {
     Border = TRUE ;
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index c17265151d4c..b2b52dd37e57 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -156,7 +156,6 @@ void SvxLanguageBox::Init()
     m_pLangTable = new SvtLanguageTable;
     m_aNotCheckedImage = Image( SVX_RES( RID_SVXIMG_NOTCHECKED ) );
     m_aCheckedImage = Image( SVX_RES( RID_SVXIMG_CHECKED ) );
-    m_aCheckedImageHC = Image( SVX_RES( RID_SVXIMG_CHECKED_H ) );
     m_aAllString            = String( SVX_RESSTR( RID_SVXSTR_LANGUAGE_ALL ) );
     m_nLangList             = LANG_LIST_EMPTY;
     m_bHasLangNone          = FALSE;
@@ -202,8 +201,6 @@ USHORT SvxLanguageBox::ImplInsertImgEntry( const String& rEntry, USHORT nPos, bo
     USHORT nRet = 0;
     if( !bChecked )
         nRet = InsertEntry( rEntry, m_aNotCheckedImage, nPos );
-    else if( GetSettings().GetStyleSettings().GetHighContrastMode() )
-        nRet = InsertEntry( rEntry, m_aCheckedImageHC, nPos );
     else
         nRet = InsertEntry( rEntry, m_aCheckedImage, nPos );
     return nRet;
diff --git a/svx/source/dialog/langbox.src b/svx/source/dialog/langbox.src
index 79bf1cf010c3..b7cc9c40fce5 100644
--- a/svx/source/dialog/langbox.src
+++ b/svx/source/dialog/langbox.src
@@ -34,16 +34,12 @@ Image RID_SVXIMG_NOTCHECKED
     ImageBitmap = Bitmap { File = "notcheck.bmp" ; } ;
     MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
 };
+
 Image RID_SVXIMG_CHECKED
 {
     ImageBitmap = Bitmap { File = "lngcheck.bmp" ; } ;
     MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
 };
-Image RID_SVXIMG_CHECKED_H
-{
-    ImageBitmap = Bitmap { File = "lngcheck_h.bmp" ; } ;
-    MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-};
 
 // ********************************************************************** EOF
 
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index ec67586ad2dd..c50286db6ee1 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -44,9 +44,7 @@
 #include "optgrid.hrc"
 #include "dlgutil.hxx"
 
-/* -----------------18.08.98 17:41-------------------
- * local functions
- * --------------------------------------------------*/
+// local functions
 void    lcl_GetMinMax(MetricField& rField, long& nFirst, long& nLast, long& nMin, long& nMax)
 {
     nFirst  = static_cast<long>(rField.Denormalize( rField.GetFirst( FUNIT_TWIP ) ));
@@ -110,19 +108,11 @@ SvxGridItem::SvxGridItem( const SvxGridItem& rItem )
 
 };
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 SfxPoolItem*  SvxGridItem::Clone( SfxItemPool* ) const
 {
     return new SvxGridItem( *this );
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 int SvxGridItem::operator==( const SfxPoolItem& rAttr ) const
 {
     DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unterschiedliche Typen" );
@@ -141,10 +131,6 @@ int SvxGridItem::operator==( const SfxPoolItem& rAttr ) const
                 nFldSnapY    == rItem.nFldSnapY     );
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 SfxItemPresentation  SvxGridItem::GetPresentation
 (
     SfxItemPresentation ePres,
@@ -167,11 +153,7 @@ SfxItemPresentation  SvxGridItem::GetPresentation
     }
 }
 
-
-/*----------------- OS 23.02.95  -----------------------
- TabPage Rastereinstellungen
--------------------------------------------------------*/
-
+// TabPage Rastereinstellungen
 SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) :
 
     SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_GRID ), rCoreSet ),
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index a006c7d6139d..84c4ced8e42e 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -401,16 +401,12 @@ void SvxPageWindow::SetFtBorder( const SvxBoxItem& rNew )
     delete pFtBorder;
     pFtBorder = new SvxBoxItem( rNew );
 }
-/* -----------------------------13.06.2002 16:16------------------------------
 
- ---------------------------------------------------------------------------*/
 void  SvxPageWindow::EnableFrameDirection(sal_Bool bEnable)
 {
     pImpl->EnableFrameDirection(bEnable);
 }
-/* -----------------------------13.06.2002 16:16------------------------------
 
- ---------------------------------------------------------------------------*/
 void  SvxPageWindow::SetFrameDirection(sal_Int32 nFrameDirection)
 {
     pImpl->SetFrameDirection(nFrameDirection);
diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx
index a581b37c3719..6b625e56dd21 100644
--- a/svx/source/dialog/pfiledlg.cxx
+++ b/svx/source/dialog/pfiledlg.cxx
@@ -88,7 +88,7 @@ SvxPluginFileDlg::SvxPluginFileDlg (Window *, sal_uInt16 nKind ) :
     if( xMgr.is() )
     {
         uno::Reference< plugin::XPluginManager > rPluginManager( xMgr->createInstance(
-            OUString::createFromAscii( "com.sun.star.plugin.PluginManager" ) ), uno::UNO_QUERY );
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginManager")) ), uno::UNO_QUERY );
         if ( rPluginManager.is() )
         {
             const uno::Sequence<plugin::PluginDescription > aSeq( rPluginManager->getPluginDescriptions() );
@@ -233,7 +233,7 @@ bool SvxPluginFileDlg::IsAvailable (sal_uInt16 nKind)
 
     if( xMgr.is() )
     {
-        uno::Reference< plugin::XPluginManager >  rPluginManager = uno::Reference< plugin::XPluginManager > ( xMgr->createInstance( OUString::createFromAscii( "com.sun.star.plugin.PluginManager" ) ), uno::UNO_QUERY );
+        uno::Reference< plugin::XPluginManager >  rPluginManager = uno::Reference< plugin::XPluginManager > ( xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginManager")) ), uno::UNO_QUERY );
         if( rPluginManager.is() )
         {
             const uno::Sequence<plugin::PluginDescription > aSeq( rPluginManager->getPluginDescriptions() );
diff --git a/svx/source/dialog/prtqry.cxx b/svx/source/dialog/prtqry.cxx
index 47745d1714d4..33ef71862336 100644
--- a/svx/source/dialog/prtqry.cxx
+++ b/svx/source/dialog/prtqry.cxx
@@ -34,9 +34,6 @@
 #include <svx/dialmgr.hxx>
 #include <tools/shl.hxx>
 
-/* -----------------------------01.02.00 13:57--------------------------------
-
- ---------------------------------------------------------------------------*/
 SvxPrtQryBox::SvxPrtQryBox(Window* pParent) :
     MessBox(pParent, 0,
             String(SVX_RES(RID_SVXSTR_QRY_PRINT_TITLE)),
@@ -51,9 +48,7 @@ SvxPrtQryBox::SvxPrtQryBox(Window* pParent) :
     AddButton(BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON);
     SetButtonHelpText( RET_OK, String() );
 }
-/* -----------------------------01.02.00 13:57--------------------------------
 
- ---------------------------------------------------------------------------*/
 SvxPrtQryBox::~SvxPrtQryBox()
 {
 }
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index f66c862ca32c..258d972c13dd 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -74,9 +74,7 @@ static const sal_Char cRubyIsAbove[] = "RubyIsAbove";
 static const sal_Char cDisplayName[] = "DisplayName";
 static const sal_Char cRubyCharStyleName[] = "RubyCharStyleName";
 static const sal_Char cRubies[] = "Rubies";
-/* -----------------------------09.01.01 17:24--------------------------------
 
- ---------------------------------------------------------------------------*/
 SvxRubyChildWindow::SvxRubyChildWindow( Window* _pParent, USHORT nId,
     SfxBindings* pBindings, SfxChildWinInfo* pInfo) :
     SfxChildWindow(_pParent, nId)
@@ -91,16 +89,12 @@ SvxRubyChildWindow::SvxRubyChildWindow( Window* _pParent, USHORT nId,
 
     pDlg->Initialize( pInfo );
 }
-/* -----------------------------10.01.01 13:53--------------------------------
 
- ---------------------------------------------------------------------------*/
 SfxChildWinInfo SvxRubyChildWindow::GetInfo() const
 {
     return SfxChildWindow::GetInfo();
 }
-/* -----------------------------09.01.01 17:17--------------------------------
 
- ---------------------------------------------------------------------------*/
 class SvxRubyData_Impl : public cppu::WeakImplHelper1
                                 <  ::com::sun::star::view::XSelectionChangeListener >
 {
@@ -277,18 +271,14 @@ SvxRubyDialog::SvxRubyDialog( SfxBindings *pBind, SfxChildWindow *pCW,
 
     UpdateColors();
 }
-/* -----------------------------09.01.01 17:17--------------------------------
 
- ---------------------------------------------------------------------------*/
 SvxRubyDialog::~SvxRubyDialog()
 {
     ClearCharStyleList();
     EventObject aEvent;
     xImpl->disposing(aEvent);
 }
-/* -----------------------------01.02.01 10:29--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SvxRubyDialog::ClearCharStyleList()
 {
     for(USHORT i = 0; i < aCharStyleLB.GetEntryCount(); i++)
@@ -298,9 +288,7 @@ void SvxRubyDialog::ClearCharStyleList()
     }
     aCharStyleLB.Clear();
 }
-/* -----------------------------09.01.01 17:17--------------------------------
 
- ---------------------------------------------------------------------------*/
 BOOL    SvxRubyDialog::Close()
 {
     pBindings->GetDispatcher()->Execute( SID_RUBY_DIALOG,
@@ -308,9 +296,7 @@ BOOL    SvxRubyDialog::Close()
                               SFX_CALLMODE_RECORD);
     return TRUE;
 }
-/* -----------------------------29.01.01 15:26--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SvxRubyDialog::Activate()
 {
     SfxModelessDialog::Activate();
@@ -392,16 +378,12 @@ void SvxRubyDialog::Activate()
         aPreviewWin.Invalidate();
     }
 }
-/* -----------------------------29.01.01 15:26--------------------------------
 
- ---------------------------------------------------------------------------*/
 void    SvxRubyDialog::Deactivate()
 {
     SfxModelessDialog::Deactivate();
 }
-/* -----------------------------30.01.01 15:35--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SvxRubyDialog::SetText(sal_Int32 nPos, Edit& rLeft, Edit& rRight)
 {
     OUString sLeft, sRight;
@@ -535,17 +517,13 @@ void SvxRubyDialog::Update()
 
     ScrollHdl_Impl(&aScrollSB);
 }
-/* -----------------------------16.02.01 14:01--------------------------------
 
- ---------------------------------------------------------------------------*/
 void    SvxRubyDialog::GetCurrentText(String& rBase, String& rRuby)
 {
     rBase = aEditArr[nCurrentEdit * 2]->GetText();
     rRuby = aEditArr[nCurrentEdit * 2 + 1]->GetText();
 }
-/* -----------------------------31.01.01 14:09--------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK(SvxRubyDialog, ScrollHdl_Impl, ScrollBar*, pScroll)
 {
     long nPos = pScroll->GetThumbPos();
@@ -561,9 +539,7 @@ IMPL_LINK(SvxRubyDialog, ScrollHdl_Impl, ScrollBar*, pScroll)
     aPreviewWin.Invalidate();
     return 0;
 }
-/* -----------------------------30.01.01 14:48--------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK(SvxRubyDialog, ApplyHdl_Impl, PushButton*, EMPTYARG)
 {
     const Sequence<PropertyValues>&  aRubyValues = pImpl->GetRubyValues();
@@ -592,17 +568,13 @@ IMPL_LINK(SvxRubyDialog, ApplyHdl_Impl, PushButton*, EMPTYARG)
     }
     return 0;
 }
-/* -----------------------------29.01.01 09:38--------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK(SvxRubyDialog, CloseHdl_Impl, PushButton*, EMPTYARG)
 {
     Close();
     return 0;
 }
-/* -----------------------------29.01.01 15:10--------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK(SvxRubyDialog, StylistHdl_Impl, PushButton*, EMPTYARG)
 {
     SfxPoolItem* pState = 0;
@@ -615,18 +587,14 @@ IMPL_LINK(SvxRubyDialog, StylistHdl_Impl, PushButton*, EMPTYARG)
     }
     return 0;
 }
-/* -----------------------------30.01.01 15:32--------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK(SvxRubyDialog, AutomaticHdl_Impl, CheckBox*, pBox)
 {
     pImpl->UpdateRubyValues(pBox->IsChecked());
     Update();
     return 0;
 }
-/* -----------------------------31.01.01 16:37--------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK(SvxRubyDialog, AdjustHdl_Impl, ListBox*, pBox)
 {
     AssertOneEntry();
@@ -646,9 +614,7 @@ IMPL_LINK(SvxRubyDialog, AdjustHdl_Impl, ListBox*, pBox)
     aPreviewWin.Invalidate();
     return 0;
 }
-/* -----------------------------01.06.01 10:24--------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK(SvxRubyDialog, PositionHdl_Impl, ListBox*, pBox)
 {
     AssertOneEntry();
@@ -669,9 +635,7 @@ IMPL_LINK(SvxRubyDialog, PositionHdl_Impl, ListBox*, pBox)
     aPreviewWin.Invalidate();
     return 0;
 }
-/* -----------------------------01.02.01 10:06--------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK(SvxRubyDialog, CharStyleHdl_Impl, ListBox*, EMPTYARG )
 {
     AssertOneEntry();
@@ -694,9 +658,7 @@ IMPL_LINK(SvxRubyDialog, CharStyleHdl_Impl, ListBox*, EMPTYARG )
     }
     return 0;
 }
-/* -----------------------------16.02.01 08:35--------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK(SvxRubyDialog, EditModifyHdl_Impl, Edit*, pEdit)
 {
     for(USHORT i = 0; i < 8; i++)
@@ -710,9 +672,7 @@ IMPL_LINK(SvxRubyDialog, EditModifyHdl_Impl, Edit*, pEdit)
     aPreviewWin.Invalidate();
     return 0;
 }
-/* -----------------------------17.07.01 09:11--------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK(SvxRubyDialog, EditScrollHdl_Impl, sal_Int32*, pParam)
 {
     long nRet = 0;
@@ -740,9 +700,7 @@ IMPL_LINK(SvxRubyDialog, EditScrollHdl_Impl, sal_Int32*, pParam)
     }
     return nRet;
 }
-/* -----------------------------20.07.2001 15:18------------------------------
 
- ---------------------------------------------------------------------------*/
 IMPL_LINK(SvxRubyDialog, EditJumpHdl_Impl, sal_Int32*, pParam)
 {
     USHORT nIndex = USHRT_MAX;
@@ -770,9 +728,7 @@ IMPL_LINK(SvxRubyDialog, EditJumpHdl_Impl, sal_Int32*, pParam)
     }
     return 0;
 };
-/* -----------------------------19.06.01 11:33--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SvxRubyDialog::AssertOneEntry()
 {
     pImpl->AssertOneEntry();
@@ -810,9 +766,6 @@ void SvxRubyDialog::DataChanged( const DataChangedEvent& rDCEvt )
         UpdateColors();
 }
 
-/* -----------------------------29.01.01 15:44--------------------------------
-
- ---------------------------------------------------------------------------*/
 void lcl_MoveBox(long nOffset, Edit& rLeft, Edit& rRight)
 {
     Size aLeftSz(rLeft.GetSizePixel());
@@ -825,9 +778,7 @@ void lcl_MoveBox(long nOffset, Edit& rLeft, Edit& rRight)
     rRight.SetPosSizePixel(aRightPos, aRightSz);
 
 }
-/* -----------------------------16.02.01 08:09--------------------------------
 
- ---------------------------------------------------------------------------*/
 RubyPreview::RubyPreview(SvxRubyDialog& rParent, const ResId& rResId) :
         Window(&rParent, rResId),
         rParentDlg(rParent)
@@ -841,9 +792,7 @@ RubyPreview::RubyPreview(SvxRubyDialog& rParent, const ResId& rResId) :
 
     SetBorderStyle( WINDOW_BORDER_MONO );
 }
-/* -----------------------------29.01.01 14:05--------------------------------
 
- ---------------------------------------------------------------------------*/
 void RubyPreview::Paint( const Rectangle& /* rRect */ )
 {
     Font aRubyFont = GetFont();
@@ -950,17 +899,13 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ )
     }
     SetFont(aSaveFont);
 }
-/* -----------------------------16.02.01 15:12--------------------------------
 
- ---------------------------------------------------------------------------*/
 void RubyEdit::GetFocus()
 {
     GetModifyHdl().Call(this);
     Edit::GetFocus();
 }
-/* -----------------------------17.07.01 09:00--------------------------------
 
- ---------------------------------------------------------------------------*/
 long  RubyEdit::PreNotify( NotifyEvent& rNEvt )
 {
     long nHandled = 0;
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index be654e3a0b9b..3f1501f55341 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -145,12 +145,12 @@ struct SearchDlg_Impl
         bDeltaCalculated( FALSE ),
         pRanges         ( NULL )
         {
-            aCommand1URL.Complete = aCommand1URL.Main = rtl::OUString::createFromAscii("vnd.sun.search:SearchViaComponent1");
-            aCommand1URL.Protocol = rtl::OUString::createFromAscii("vnd.sun.search:");
-            aCommand1URL.Path = rtl::OUString::createFromAscii("SearchViaComponent1");
-            aCommand2URL.Complete = aCommand2URL.Main = rtl::OUString::createFromAscii("vnd.sun.search:SearchViaComponent2");
-            aCommand2URL.Protocol = rtl::OUString::createFromAscii("vnd.sun.search:");
-            aCommand2URL.Path = rtl::OUString::createFromAscii("SearchViaComponent2");
+            aCommand1URL.Complete = aCommand1URL.Main = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.search:SearchViaComponent1"));
+            aCommand1URL.Protocol = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.search:"));
+            aCommand1URL.Path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SearchViaComponent1"));
+            aCommand2URL.Complete = aCommand2URL.Main = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.search:SearchViaComponent2"));
+            aCommand2URL.Protocol = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.search:"));
+            aCommand2URL.Path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SearchViaComponent2"));
         }
     ~SearchDlg_Impl() { delete[] pRanges; }
 };
@@ -499,7 +499,7 @@ void SvxSearchDialog::Construct_Impl()
     // vnd.sun.star::SearchViaComponent1 and 2 are supported
     const uno::Reference< frame::XFrame >xFrame = rBindings.GetActiveFrame();
     const uno::Reference< frame::XDispatchProvider > xDispatchProv(xFrame, uno::UNO_QUERY);
-    rtl::OUString sTarget = rtl::OUString::createFromAscii("_self");
+    rtl::OUString sTarget(RTL_CONSTASCII_USTRINGPARAM("_self"));
 
     bool bSearchComponent1 = false;
     bool bSearchComponent2 = false;
@@ -1606,9 +1606,9 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
     {
         uno::Sequence < beans::PropertyValue > aArgs(2);
         beans::PropertyValue* pArgs = aArgs.getArray();
-        pArgs[0].Name = ::rtl::OUString::createFromAscii("SearchString");
+        pArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SearchString"));
         pArgs[0].Value <<= ::rtl::OUString(aSearchLB.GetText());
-        pArgs[1].Name = ::rtl::OUString::createFromAscii("ParentWindow");
+        pArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow"));
         pArgs[1].Value <<= VCLUnoHelper::GetInterface( LAYOUT_THIS_WINDOW (this) );
         if(pBtn == &aSearchComponent1PB)
         {
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index b56fbec035c2..e341da72951c 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -100,9 +100,6 @@ static const sal_Char cSuffix[] = "Suffix";
 static const sal_Char cBulletChar[] = "BulletChar";
 static const sal_Char cBulletFontName[] = "BulletFontName";
 
-/* -----------------28.10.98 08:32-------------------
- *
- * --------------------------------------------------*/
 // Die Auswahl an Bullets aus den StarSymbol
 static const sal_Unicode aBulletTypes[] =
 {
@@ -446,17 +443,11 @@ SvxNumValueSet::SvxNumValueSet( Window* pParent, const ResId& rResId, USHORT nTy
     }
 }
 
-/*-----------------08.02.97 12.38-------------------
-
---------------------------------------------------*/
-
- SvxNumValueSet::~SvxNumValueSet()
+SvxNumValueSet::~SvxNumValueSet()
 {
     delete pVDev;
 }
-/* -----------------------------30.01.01 16:24--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SvxNumValueSet::SetNumberingSettings(
     const Sequence<Sequence<PropertyValue> >& aNum,
     Reference<XNumberingFormatter>& xFormat,
@@ -474,9 +465,7 @@ void SvxNumValueSet::SetNumberingSettings(
                 SetItemText( i + 1, SVX_RESSTR( RID_SVXSTR_SINGLENUM_DESCRIPTIONS + i ));
     }
 }
-/* -----------------------------31.01.01 09:50--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SvxNumValueSet::SetOutlineNumberingSettings(
             Sequence<Reference<XIndexAccess> >& rOutline,
             Reference<XNumberingFormatter>& xFormat,
@@ -509,20 +498,13 @@ SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent, const ResId& rResId/*, co
     aFormatTimer.SetTimeoutHdl(LINK(this, SvxBmpNumValueSet, FormatHdl_Impl));
 }
 
-/*-----------------13.02.97 09.41-------------------
-
---------------------------------------------------*/
-
- SvxBmpNumValueSet::~SvxBmpNumValueSet()
+SvxBmpNumValueSet::~SvxBmpNumValueSet()
 {
     GalleryExplorer::EndLocking(GALLERY_THEME_BULLETS);
     aFormatTimer.Stop();
 }
-/*-----------------13.02.97 09.41-------------------
-
---------------------------------------------------*/
 
-void    SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
+void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
 {
     SvxNumValueSet::UserDraw(rUDEvt);
 
@@ -552,10 +534,6 @@ void    SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
     }
 }
 
-/*-----------------14.02.97 07.34-------------------
-
---------------------------------------------------*/
-
 IMPL_LINK(SvxBmpNumValueSet, FormatHdl_Impl, Timer*, EMPTYARG)
 {
     // nur, wenn eine Grafik nicht da war, muss formatiert werden
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 381536998d85..d6aaa70e7c70 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -753,9 +753,7 @@ void SvxRuler::Update( const SvxProtectItem* pItem )
 {
     if( pItem ) pRuler_Imp->aProtectItem = *pItem;
 }
-/* -----------------------------22.08.2002 13:10------------------------------
 
- ---------------------------------------------------------------------------*/
 void SvxRuler::UpdateTextRTL(const SfxBoolItem* pItem)
 {
   if(bActive && bHorz)
@@ -2780,7 +2778,8 @@ void SvxRuler::EvalModifier()
          const RulerType eType = GetDragType();
          nDragType = DRAG_OBJECT_SIZE_PROPORTIONAL;
          if( RULER_TYPE_TAB == eType ||
-             ( ( RULER_TYPE_BORDER == eType || RULER_TYPE_MARGIN1 == eType ) &&
+             ( ( RULER_TYPE_BORDER == eType || RULER_TYPE_MARGIN1 == eType ||
+                 RULER_TYPE_MARGIN2 == eType ) &&
                pColumnItem ) )
              PrepareProportional_Impl(eType);
          break;
@@ -3949,9 +3948,8 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const
         }
     }
 }
-/*-- 29.11.2007 08:24:23---------------------------------------------------
-    //#i24363# tab stops relative to indent
-  -----------------------------------------------------------------------*/
+
+// Tab stops relative to indent (#i24363#)
 void SvxRuler::SetTabsRelativeToIndent( BOOL bRel )
 {
     pRuler_Imp->bIsTabsRelativeToIndent = bRel;
diff --git a/svx/source/dialog/swframeposstrings.cxx b/svx/source/dialog/swframeposstrings.cxx
index c70da29e17f9..99a9cd371f25 100644
--- a/svx/source/dialog/swframeposstrings.cxx
+++ b/svx/source/dialog/swframeposstrings.cxx
@@ -51,23 +51,17 @@ SvxSwFramePosString_Impl::SvxSwFramePosString_Impl() :
     }
     FreeResource();
 }
-/*-- 04.03.2004 13:14:48---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SvxSwFramePosString::SvxSwFramePosString() :
     pImpl(new SvxSwFramePosString_Impl)
 {
 }
-/*-- 04.03.2004 13:14:48---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SvxSwFramePosString::~SvxSwFramePosString()
 {
     delete pImpl;
 }
-/*-- 04.03.2004 13:14:48---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 const String& SvxSwFramePosString::GetString(StringId eId)
 {
     DBG_ASSERT(eId >= 0 && eId < STR_MAX, "invalid StringId");
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 2c417641ea19..1cc3a4c09d52 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -73,17 +73,8 @@ SFX_IMPL_DOCKINGWINDOW( Svx3DChildWindow, SID_3D_WIN )
 struct Svx3DWinImpl
 {
     SfxItemPool*        pPool;
-    Image               maImgLightOnH;
-    Image               maImgLightOffH;
 };
 
-#define SETHCIMAGE(btn,res) \
-{ \
-    Bitmap aBmp( SVX_RES( res ) ); \
-    Image aImage( aBmp, COL_LIGHTMAGENTA ); \
-    btn.SetModeImage( aImage, BMP_COLOR_HIGHCONTRAST ); \
-}
-
 namespace {
     /** Get the dispatcher from the current view frame, or, if that is not
         available, from the given bindings.
@@ -130,20 +121,20 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
         aMtrEndAngle        ( this, SVX_RES( MTR_END_ANGLE ) ),
         aFtDepth            ( this, SVX_RES( FT_DEPTH ) ),
         aMtrDepth           ( this, SVX_RES( MTR_DEPTH ) ),
-        aFLGeometrie       ( this, SVX_RES( FL_GEOMETRIE ) ),
+        aFLGeometrie        ( this, SVX_RES( FL_GEOMETRIE ) ),
 
         aFtHorizontal       ( this, SVX_RES( FT_HORIZONTAL ) ),
         aNumHorizontal      ( this, SVX_RES( NUM_HORIZONTAL ) ),
         aFtVertical         ( this, SVX_RES( FT_VERTICAL ) ),
         aNumVertical        ( this, SVX_RES( NUM_VERTICAL ) ),
-        aFLSegments        ( this, SVX_RES( FL_SEGMENTS ) ),
+        aFLSegments         ( this, SVX_RES( FL_SEGMENTS ) ),
 
         aBtnNormalsObj      ( this, SVX_RES( BTN_NORMALS_OBJ ) ),
         aBtnNormalsFlat     ( this, SVX_RES( BTN_NORMALS_FLAT ) ),
         aBtnNormalsSphere   ( this, SVX_RES( BTN_NORMALS_SPHERE ) ),
         aBtnNormalsInvert   ( this, SVX_RES( BTN_NORMALS_INVERT ) ),
         aBtnTwoSidedLighting( this, SVX_RES( BTN_TWO_SIDED_LIGHTING ) ),
-        aFLNormals         ( this, SVX_RES( FL_NORMALS ) ),
+        aFLNormals          ( this, SVX_RES( FL_NORMALS ) ),
 
         aBtnDoubleSided     ( this, SVX_RES( BTN_DOUBLE_SIDED ) ),
 
@@ -153,13 +144,13 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
         aBtnShadow3d        ( this, SVX_RES( BTN_SHADOW_3D ) ),
         aFtSlant            ( this, SVX_RES( FT_SLANT ) ),
         aMtrSlant           ( this, SVX_RES( MTR_SLANT ) ),
-        aFLShadow          ( this, SVX_RES( FL_SHADOW ) ),
+        aFLShadow           ( this, SVX_RES( FL_SHADOW ) ),
         aFtDistance         ( this, SVX_RES( FT_DISTANCE ) ),
         aMtrDistance        ( this, SVX_RES( MTR_DISTANCE ) ),
         aFtFocalLeng        ( this, SVX_RES( FT_FOCAL_LENGTH ) ),
         aMtrFocalLength     ( this, SVX_RES( MTR_FOCAL_LENGTH ) ),
-        aFLCamera          ( this, SVX_RES( FL_CAMERA ) ),
-        aFLRepresentation  ( this, SVX_RES( FL_REPRESENTATION ) ),
+        aFLCamera           ( this, SVX_RES( FL_CAMERA ) ),
+        aFLRepresentation   ( this, SVX_RES( FL_REPRESENTATION ) ),
 
         // Beleuchtung
         aBtnLight1          ( this, SVX_RES( BTN_LIGHT_1 ) ),
@@ -180,15 +171,15 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
         aLbLight8           ( this, SVX_RES( LB_LIGHT_8 ) ),
 
         aBtnLightColor      ( this, SVX_RES( BTN_LIGHT_COLOR ) ),
-        aFTLightsource     ( this, SVX_RES( FT_LIGHTSOURCE ) ),
+        aFTLightsource      ( this, SVX_RES( FT_LIGHTSOURCE ) ),
 
         // #99694# Keyboard shortcuts activate the next control, so the
         // order needed to be changed here
-        aFTAmbientlight    ( this, SVX_RES( FT_AMBIENTLIGHT ) ),    // Text label
+        aFTAmbientlight     ( this, SVX_RES( FT_AMBIENTLIGHT ) ),   // Text label
         aLbAmbientlight     ( this, SVX_RES( LB_AMBIENTLIGHT ) ),   // ListBox
         aBtnAmbientColor    ( this, SVX_RES( BTN_AMBIENT_COLOR ) ), // color button
 
-        aFLLight           ( this, SVX_RES( FL_LIGHT ) ),
+        aFLLight            ( this, SVX_RES( FL_LIGHT ) ),
 
         // Textures
         aFtTexKind          ( this, SVX_RES( FT_TEX_KIND ) ),
@@ -208,7 +199,7 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
         aBtnTexCircleY      ( this, SVX_RES( BTN_TEX_CIRCLE_Y ) ),
         aFtTexFilter        ( this, SVX_RES( FT_TEX_FILTER ) ),
         aBtnTexFilter       ( this, SVX_RES( BTN_TEX_FILTER ) ),
-        aFLTexture         ( this, SVX_RES( FL_TEXTURE ) ),
+        aFLTexture          ( this, SVX_RES( FL_TEXTURE ) ),
 
         // Material
         aFtMatFavorites     ( this, SVX_RES( FT_MAT_FAVORITES ) ),
@@ -251,57 +242,11 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
         pControllerItem(0L),
         pConvertTo3DItem(0L),
         pConvertTo3DLatheItem(0L),
-//      pPool               ( NULL ),
         mpImpl              ( new Svx3DWinImpl() ),
         mpRemember2DAttributes(NULL),
         bOnly3DChanged      ( FALSE )
 {
-    SETHCIMAGE( aBtnGeo, BMP_GEO_H );
-    SETHCIMAGE( aBtnRepresentation, BMP_REPRESENTATION_H );
-    SETHCIMAGE( aBtnLight, BMP_3DLIGHT_H );
-    SETHCIMAGE( aBtnTexture, BMP_TEXTURE_H );
-    SETHCIMAGE( aBtnMaterial, BMP_MATERIAL_H );
-    SETHCIMAGE( aBtnUpdate, BMP_UPDATE_H );
-    SETHCIMAGE( aBtnAssign, BMP_ASSIGN_H );
-    SETHCIMAGE( aBtnNormalsObj, BMP_NORMALS_OBJ_H );
-    SETHCIMAGE( aBtnNormalsFlat, BMP_NORMALS_FLAT_H );
-    SETHCIMAGE( aBtnNormalsSphere, BMP_NORMALS_SPHERE_H );
-    SETHCIMAGE( aBtnTwoSidedLighting, BMP_TWO_SIDED_LIGHTING_H );
-    SETHCIMAGE( aBtnNormalsInvert, BMP_NORMALS_INVERT_H );
-    SETHCIMAGE( aBtnDoubleSided, BMP_DOUBLE_SIDED_H );
-    SETHCIMAGE( aBtnShadow3d, BMP_SHADOW_3D_H );
-    SETHCIMAGE( aBtnLight1, BMP_LIGHT_H );
-    SETHCIMAGE( aBtnLight2, BMP_LIGHT_H );
-    SETHCIMAGE( aBtnLight3, BMP_LIGHT_H );
-    SETHCIMAGE( aBtnLight4, BMP_LIGHT_H );
-    SETHCIMAGE( aBtnLight5, BMP_LIGHT_H );
-    SETHCIMAGE( aBtnLight6, BMP_LIGHT_H );
-    SETHCIMAGE( aBtnLight7, BMP_LIGHT_H );
-    SETHCIMAGE( aBtnLight8, BMP_LIGHT_H );
-    SETHCIMAGE( aBtnLightColor, BMP_LIGHT_COLOR_H );
-    SETHCIMAGE( aBtnAmbientColor, BMP_AMBIENT_COLOR_H );
-    SETHCIMAGE( aBtnTexLuminance, BMP_TEX_LUMINANCE_H );
-    SETHCIMAGE( aBtnTexColor, BMP_TEX_COLOR_H );
-    SETHCIMAGE( aBtnTexReplace, BMP_TEX_REPLACE_H );
-    SETHCIMAGE( aBtnTexModulate, BMP_TEX_MODULATE_H );
-    SETHCIMAGE( aBtnTexBlend, BMP_TEX_BLEND_H );
-    SETHCIMAGE( aBtnTexParallelX, BMP_TEX_PARALLEL_H );
-    SETHCIMAGE( aBtnTexCircleX, BMP_TEX_CIRCLE_H );
-    SETHCIMAGE( aBtnTexObjectX, BMP_TEX_OBJECT_H );
-    SETHCIMAGE( aBtnTexParallelY, BMP_TEX_PARALLEL_H );
-    SETHCIMAGE( aBtnTexCircleY, BMP_TEX_CIRCLE_H );
-    SETHCIMAGE( aBtnTexObjectY, BMP_TEX_OBJECT_H );
-    SETHCIMAGE( aBtnTexFilter, BMP_TEX_FILTER_H );
-    SETHCIMAGE( aBtnMatColor, BMP_COLORDLG_H );
-    SETHCIMAGE( aBtnEmissionColor, BMP_COLORDLG_H );
-    SETHCIMAGE( aBtnSpecularColor, BMP_COLORDLG_H );
-    SETHCIMAGE( aBtnPerspective, BMP_PERSPECTIVE_H );
-    SETHCIMAGE( aBtnConvertTo3D, BMP_CHANGE_TO_3D_H );
-    SETHCIMAGE( aBtnLatheObject, BMP_LATHE_OBJ_H );
-
     mpImpl->pPool = NULL;
-    mpImpl->maImgLightOnH = Image( SVX_RES( RID_SVXIMAGE_LIGHT_ON_H ) );
-    mpImpl->maImgLightOffH = Image( SVX_RES( RID_SVXIMAGE_LIGHT_OFF_H ) );
     FreeResource();
 
     // Metrik einstellen
@@ -462,13 +407,12 @@ void Svx3DWin::Reset()
 
 bool Svx3DWin::GetUILightState( ImageButton& aBtn ) const
 {
-    return (aBtn.GetModeImage() == aImgLightOn) || (aBtn.GetModeImage() == mpImpl->maImgLightOnH);
+    return (aBtn.GetModeImage() == aImgLightOn);
 }
 
 void Svx3DWin::SetUILightState( ImageButton& aBtn, bool bState )
 {
     aBtn.SetModeImage( bState ? aImgLightOn : aImgLightOff );
-    aBtn.SetModeImage( bState ? mpImpl->maImgLightOnH : mpImpl->maImgLightOffH, BMP_COLOR_HIGHCONTRAST );
 }
 
 // -----------------------------------------------------------------------
@@ -499,7 +443,6 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
 
     // construct field values
     const SfxPoolItem* pItem;
-    //BOOL bUpdate = FALSE;
 
     // evtl. PoolUnit ermitteln
     if( !mpImpl->pPool )
diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src
index cc745a02bfe8..4fd50929dba1 100644
--- a/svx/source/engine3d/float3d.src
+++ b/svx/source/engine3d/float3d.src
@@ -965,16 +965,6 @@ DockingWindow RID_SVXFLOAT_3D
         Text [ en-US ] = "Textures" ;
     };
      // Material
-    /*  Control CTL_MATERIAL
-  {
-      //HelpId = HID_SD_CTL_FAVORITES ;
-      Border = TRUE ;
-      Pos = MAP_APPFONT ( BORDER + 6 , GROUP_Y + 9 ) ;
-      Size = MAP_APPFONT ( GROUP_WIDTH - 12 , GROUP_HEIGHT - 15 ) ;
-      TabStop = TRUE ;
-      Hide = TRUE ;
-  };
-*/
      // Materialeditor
     FixedText FT_MAT_FAVORITES
     {
@@ -1112,30 +1102,6 @@ DockingWindow RID_SVXFLOAT_3D
         Last = 100 ;
         SpinSize = 1 ;
     };
-    /*
-    ImageButton BTN_MAT_FAVORITES {
-        Pos = MAP_APPFONT( BORDER, GROUP_PREV_Y+1 );
-        Size = IMG_BUTTON_SIZE;
-      QuickHelpText = "Material Favoriten" ;
-      ButtonImage = Image
-      {
-          ImageBitmap = Bitmap { File = "matfavor.bmp" ; };
-          MASKCOLOR
-      };
-            TabStop = TRUE;
-        };
-    ImageButton BTN_MAT_EDITOR {
-            Pos = MAP_APPFONT( BORDER + BUTTON_WIDTH, GROUP_PREV_Y+1 );
-            Size = IMG_BUTTON_SIZE;
-      QuickHelpText = "Material Editor" ;
-      ButtonImage = Image
-      {
-          ImageBitmap = Bitmap { File = "matedit.bmp" ; };
-          MASKCOLOR
-      };
-            TabStop = TRUE;
-        };
-*/
     FixedLine FL_MATERIAL
     {
         Pos = TOP_FIXED_LINE_POS;
@@ -1143,155 +1109,6 @@ DockingWindow RID_SVXFLOAT_3D
         Text [ en-US ] = "Material" ;
     };
 
-    Bitmap BMP_GEO_H
-    {
-        File = "3dgeo_h.bmp";
-    };
-
-    Bitmap BMP_REPRESENTATION_H
-    {
-        File = "3drepres_h.bmp";
-    };
-
-    Bitmap BMP_3DLIGHT_H
-    {
-        File = "3dlight_h.bmp";
-    };
-
-    Bitmap BMP_TEXTURE_H
-    {
-        File = "3dtextur_h.bmp";
-    };
-
-    Bitmap BMP_MATERIAL_H
-    {
-        File = "material_h.bmp";
-    };
-
-    Bitmap BMP_UPDATE_H
-    {
-        File = "sc10350_h.bmp";
-    };
-
-    Bitmap BMP_ASSIGN_H
-    {
-        File = "apply_h.bmp";
-    };
-
-    Bitmap BMP_CHANGE_TO_3D_H
-    {
-        File = "convrt3d_h.bmp";
-    };
-
-    Bitmap BMP_LATHE_OBJ_H
-    {
-        File = "rotate3d_h.bmp";
-    };
-
-    Bitmap BMP_PERSPECTIVE_H
-    {
-        File = "persp3d_h.bmp";
-    };
-
-    Bitmap BMP_NORMALS_OBJ_H
-    {
-        File = "normobjs_h.bmp";
-    };
-
-    Bitmap BMP_NORMALS_FLAT_H
-    {
-        File = "normflat_h.bmp";
-    };
-
-    Bitmap BMP_NORMALS_SPHERE_H
-    {
-        File = "normsphe_h.bmp";
-    };
-
-    Bitmap BMP_NORMALS_INVERT_H
-    {
-        File = "invert3d_h.bmp";
-    };
-
-    Bitmap BMP_TWO_SIDED_LIGHTING_H
-    {
-        File = "lght2sid_h.bmp";
-    };
-
-    Bitmap BMP_DOUBLE_SIDED_H
-    {
-        File = "doublesi_h.bmp";
-    };
-
-    Bitmap BMP_SHADOW_3D_H
-    {
-        File = "shadow3d_h.bmp";
-    };
-
-    Bitmap BMP_LIGHT_H
-    {
-        File = "light_h.bmp";
-    };
-
-    Bitmap BMP_LIGHT_COLOR_H
-    {
-        File = "colordlg_h.bmp";
-    };
-
-    Bitmap BMP_AMBIENT_COLOR_H
-    {
-        File = "colordlg_h.bmp";
-    };
-
-    Bitmap BMP_TEX_LUMINANCE_H
-    {
-        File = "luminanc_h.bmp";
-    };
-
-    Bitmap BMP_TEX_COLOR_H
-    {
-        File = "color_h.bmp";
-    };
-
-    Bitmap BMP_TEX_REPLACE_H
-    {
-        File = "replac3d_h.bmp";
-    };
-
-    Bitmap BMP_TEX_MODULATE_H
-    {
-        File = "modula3d_h.bmp";
-    };
-
-    Bitmap BMP_TEX_BLEND_H
-    {
-        File = "blend3d_h.bmp";
-    };
-
-    Bitmap BMP_TEX_OBJECT_H
-    {
-        File = "objspc3d_h.bmp";
-    };
-
-    Bitmap BMP_TEX_PARALLEL_H
-    {
-        File = "parallel_h.bmp";
-    };
-
-    Bitmap BMP_TEX_CIRCLE_H
-    {
-        File = "sphere3d_h.bmp";
-    };
-
-    Bitmap BMP_TEX_FILTER_H
-    {
-        File = "filter3d_h.bmp";
-    };
-
-    Bitmap BMP_COLORDLG_H
-    {
-        File = "colordlg_h.bmp";
-    };
 };
 
 Image RID_SVXIMAGE_LIGHT_ON
@@ -1306,115 +1123,43 @@ Image RID_SVXIMAGE_LIGHT_OFF
     MASKCOLOR
 };
 
-Image RID_SVXIMAGE_LIGHT_ON_H
-{
-    ImageBitmap = Bitmap { File = "lighton_h.bmp" ; };
-    MASKCOLOR
-};
-
-Image RID_SVXIMAGE_LIGHT_OFF_H
-{
-    ImageBitmap = Bitmap { File = "light_h.bmp" ; };
-    MASKCOLOR
-};
-
 Image RID_SVXIMAGE_COLORDLG
 {
     ImageBitmap = Bitmap { File = "colordlg.bmp" ; };
     MASKCOLOR
 };
 
-Image RID_SVXIMAGE_COLORDLG_H
-{
-    ImageBitmap = Bitmap { File = "colordlg_h.bmp" ; };
-    MASKCOLOR
-};
-
-/*Image RID_SVXIMAGE_LIGHT_ON_SELECTED {
-      ImageBitmap = Bitmap { File = "lightons.bmp" ; };
-      MASKCOLOR
-};
-Image RID_SVXIMAGE_LIGHT_OFF_SELECTED {
-      ImageBitmap = Bitmap { File = "lightsel.bmp" ; };
-      MASKCOLOR
-};*/
-
 String RID_SVXFLOAT3D_FAVORITE
 {
     Text [ en-US ] = "Favorite";
 };
+
 String RID_SVXFLOAT3D_FIX_X
 {
     Text [ en-US ] = "X";
 };
+
 String RID_SVXFLOAT3D_FIX_Y
 {
     Text [ en-US ] = "Y";
 };
+
 String RID_SVXFLOAT3D_FIX_Z
 {
     Text [ en-US ] = "Z";
 };
+
 String RID_SVXFLOAT3D_FIX_R
 {
     Text [ en-US ] = "R:";
 };
+
 String RID_SVXFLOAT3D_FIX_G
 {
     Text [ en-US ] = "G:";
 };
+
 String RID_SVXFLOAT3D_FIX_B
 {
     Text [ en-US ] = "B:";
-
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index c259f1178de9..0ef16a1f5552 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -354,7 +354,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt )
                     // not interested in any results
 
                     Reference< XPropertySet > xStatProps(xStatement,UNO_QUERY);
-                    xStatProps->setPropertyValue(rtl::OUString::createFromAscii("MaxRows"), makeAny(sal_Int32(0)));
+                    xStatProps->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxRows")), makeAny(sal_Int32(0)));
 
                     xResultSet = xStatement->executeQuery();
                     Reference< XColumnsSupplier >  xSupplyCols(xResultSet, UNO_QUERY);
@@ -1173,7 +1173,7 @@ void FmGridControl::DeleteSelectedRows()
         // #100312# ------------
         Reference< ::com::sun::star::util::XURLTransformer > xTransformer(
             ::comphelper::getProcessServiceFactory()->createInstance(
-            ::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer")), UNO_QUERY);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY);
         if( xTransformer.is() )
             xTransformer->parseStrict( aUrl );
 
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index f1897a3040b3..88f325e6d033 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -431,7 +431,7 @@ sal_Bool SAL_CALL FmXGridControl::supportsService(const ::rtl::OUString& Service
 //------------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL FmXGridControl::getImplementationName() throw()
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.form.FmXGridControl");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.FmXGridControl"));
 }
 
 //------------------------------------------------------------------------------
@@ -439,7 +439,7 @@ sal_Bool SAL_CALL FmXGridControl::supportsService(const ::rtl::OUString& Service
 {
     Sequence< ::rtl::OUString > aServiceNames(2);
     aServiceNames[0] = FM_SUN_CONTROL_GRIDCONTROL;
-    aServiceNames[1] = ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControl");
+    aServiceNames[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControl"));
     return aServiceNames;
 }
 
@@ -460,7 +460,7 @@ void SAL_CALL FmXGridControl::dispose() throw( RuntimeException )
 //------------------------------------------------------------------------------
 ::rtl::OUString FmXGridControl::GetComponentServiceName()
 {
-    ::rtl::OUString aName = ::rtl::OUString::createFromAscii("DBGrid");
+    ::rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM("DBGrid"));
     return aName;
 }
 
@@ -802,7 +802,7 @@ void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn) throw( RuntimeExceptio
 
         // prepare firing an event
         aModeChangeEvent.Source = *this;
-        aModeChangeEvent.NewMode = ::rtl::OUString::createFromAscii( mbDesignMode ? "design" : "alive" );
+        aModeChangeEvent.NewMode = mbDesignMode ? ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "design" )) : ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "alive" ));
     }
 
     // --- </mutex_lock> ---
@@ -2798,7 +2798,7 @@ Sequence< ::com::sun::star::util::URL>& FmXGridPeer::getSupportedURLs()
         // let an ::com::sun::star::util::URL-transformer normalize the URLs
         Reference< ::com::sun::star::util::XURLTransformer >  xTransformer(
             ::comphelper::getProcessServiceFactory()->createInstance(
-                ::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer")),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))),
             UNO_QUERY);
         pSupported = aSupported.getArray();
         if (xTransformer.is())
diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx
index ab0030a4a596..4bef3b83af9e 100644
--- a/svx/source/fmcomp/gridcols.cxx
+++ b/svx/source/fmcomp/gridcols.cxx
@@ -89,8 +89,8 @@ namespace
 //------------------------------------------------------------------------------
 sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName)
 {
-    const ::rtl::OUString aModelPrefix = ::rtl::OUString::createFromAscii("com.sun.star.form.component.");
-    const ::rtl::OUString aCompatibleModelPrefix = ::rtl::OUString::createFromAscii("stardiv.one.form.component.");
+    const ::rtl::OUString aModelPrefix(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component."));
+    const ::rtl::OUString aCompatibleModelPrefix(RTL_CONSTASCII_USTRINGPARAM("stardiv.one.form.component."));
 
     sal_Int32 nTypeId = -1;
     if (aModelName == FM_COMPONENT_EDIT)
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 30f492a85fd7..2904dd18df0a 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -733,7 +733,6 @@ void DbGridControl::NavigationBar::SetState(sal_uInt16 nWhich)
         // event (ImplGenerateMouseMove) even if nothing happened. This may lead to some unwanted effects, so we
         // do this check.
         // For further explanation see Bug 69900.
-        // FS - 18.11.99
         pWnd->Enable(bAvailable);
 }
 
@@ -1488,7 +1487,7 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt
             // retrieve the datebase of the Numberformatter
             try
             {
-                xSupplier->getNumberFormatSettings()->getPropertyValue(rtl::OUString::createFromAscii("NullDate")) >>= m_aNullDate;
+                xSupplier->getNumberFormatSettings()->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NullDate"))) >>= m_aNullDate;
             }
             catch(Exception&)
             {
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 66fd1a296355..5274f8a763a8 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -306,14 +306,12 @@ namespace svxform
         m_pNaviWin      ( _pNaviWin ),
         m_bHasModel     ( false ),
         m_eGroup        ( _eGroup ),
-        m_TbxImageList  ( SVX_RES( IL_TBX_BMPS ) ),
-        m_TbxHCImageList( SVX_RES( IL_TBX_BMPS_HC ) )
+        m_TbxImageList  ( SVX_RES( IL_TBX_BMPS ) )
 
     {
         FreeResource();
 
-        const ImageList& rImageList =
-            GetBackground().GetColor().IsDark() ? m_TbxHCImageList : m_TbxImageList;
+        const ImageList& rImageList = m_TbxImageList;
         m_aToolBox.SetItemImage( TBI_ITEM_ADD, rImageList.GetImage( IID_ITEM_ADD ) );
         m_aToolBox.SetItemImage( TBI_ITEM_ADD_ELEMENT, rImageList.GetImage( IID_ITEM_ADD_ELEMENT ) );
         m_aToolBox.SetItemImage( TBI_ITEM_ADD_ATTRIBUTE, rImageList.GetImage( IID_ITEM_ADD_ATTRIBUTE ) );
@@ -710,7 +708,7 @@ namespace svxform
                         {
                             try
                             {
-                                String sDelim( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+                                String sDelim( RTL_CONSTASCII_USTRINGPARAM( ": " ) );
                                 ::rtl::OUString sTemp;
                                 pNode->m_xPropSet->getPropertyValue( PN_BINDING_ID ) >>= sTemp;
                                 sNewName += String( sTemp );
@@ -777,9 +775,7 @@ namespace svxform
     SvLBoxEntry* XFormsPage::AddEntry( ItemNode* _pNewNode, bool _bIsElement )
     {
         SvLBoxEntry* pParent = m_aItemList.FirstSelected();
-        const ImageList& rImageList = GetSettings().GetStyleSettings().GetHighContrastMode()
-            ? m_pNaviWin->GetItemHCImageList()
-            : m_pNaviWin->GetItemImageList();
+        const ImageList& rImageList = m_pNaviWin->GetItemImageList();
         USHORT nImageID = ( _bIsElement ) ? IID_ELEMENT : IID_ATTRIBUTE;
         Image aImage = rImageList.GetImage( nImageID );
         ::rtl::OUString sName;
@@ -987,9 +983,7 @@ namespace svxform
     SvLBoxEntry* XFormsPage::AddEntry( const Reference< XPropertySet >& _rEntry )
     {
         SvLBoxEntry* pEntry = NULL;
-        const ImageList& rImageList = GetSettings().GetStyleSettings().GetHighContrastMode()
-            ? m_pNaviWin->GetItemHCImageList()
-            : m_pNaviWin->GetItemImageList();
+        const ImageList& rImageList = m_pNaviWin->GetItemImageList();
         Image aImage = rImageList.GetImage( IID_ELEMENT );
 
         ItemNode* pNode = new ItemNode( _rEntry );
@@ -1037,7 +1031,7 @@ namespace svxform
         {
             try
             {
-                String sDelim( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+                String sDelim( RTL_CONSTASCII_USTRINGPARAM( ": " ) );
                 ::rtl::OUString sName;
                 _rEntry->getPropertyValue( PN_BINDING_ID ) >>= sTemp;
                 sName += String( sTemp );
@@ -1243,9 +1237,7 @@ namespace svxform
         m_xUIHelper = Reference< css::xforms::XFormsUIHelper1 >( _xModel, UNO_QUERY );
         String sRet;
         m_bHasModel = true;
-        const ImageList& rImageList = GetSettings().GetStyleSettings().GetHighContrastMode()
-            ? m_pNaviWin->GetItemHCImageList()
-            : m_pNaviWin->GetItemImageList();
+        const ImageList& rImageList = m_pNaviWin->GetItemImageList();
 
         switch ( m_eGroup )
         {
@@ -1344,7 +1336,7 @@ namespace svxform
                         {
                             Image aImage1 = rImageList.GetImage( IID_ELEMENT );
                             Image aImage2 = rImageList.GetImage( IID_ELEMENT );
-                            String sDelim( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+                            String sDelim( RTL_CONSTASCII_USTRINGPARAM( ": " ) );
                             while ( xNum->hasMoreElements() )
                             {
                                 Reference< XPropertySet > xPropSet;
@@ -1561,7 +1553,6 @@ namespace svxform
         m_bIsNotifyDisabled ( false ),
 
         m_aItemImageList    (       SVX_RES( IL_ITEM_BMPS ) ),
-        m_aItemHCImageList  (       SVX_RES( IL_ITEM_BMPS_HC ) ),
         m_xDataListener     ( new DataListener( this ) )
 
     {
@@ -3536,7 +3527,7 @@ namespace svxform
                     Reference < XEnumeration > xNum = xNumAccess->createEnumeration();
                     if ( xNum.is() && xNum->hasMoreElements() )
                     {
-                        String sDelim( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+                        String sDelim( RTL_CONSTASCII_USTRINGPARAM( ": " ) );
                         while ( xNum->hasMoreElements() )
                         {
                             Reference< XPropertySet > xPropSet;
diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
index 1b300c279312..f6265b6b0596 100644
--- a/svx/source/form/datanavi.src
+++ b/svx/source/form/datanavi.src
@@ -105,12 +105,6 @@ IdCount = { 5 ; } ;
         MASKCOLOR
         IMG_LST
     };
-    ImageList IL_TBX_BMPS_HC
-    {
-        Prefix = "tbh";
-        MASKCOLOR
-        IMG_LST
-    };
 #undef IMG_LST
 };
 
@@ -246,12 +240,6 @@ IdCount = { 6 ; } ;
         MASKCOLOR
         IMG_LST2
     };
-    ImageList IL_ITEM_BMPS_HC
-    {
-        Prefix = "dah";
-        MASKCOLOR
-        IMG_LST2
-    };
 };
 
 QueryBox RID_QRY_REMOVE_MODEL
diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx
index a56506a74625..62d283ab3a7a 100644
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -111,8 +111,8 @@ namespace svxform
             OSL_ENSURE(NULL == s_hDbtoolsModule, "ODbtoolsClient::registerClient: inconsistence: already have a module!");
             OSL_ENSURE(NULL == s_pFactoryCreationFunc, "ODbtoolsClient::registerClient: inconsistence: already have a factory function!");
 
-            const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii(
-                SVLIBRARY( "dbtools" )
+            const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(
+                SVLIBRARY( "dbtools" ))
             );
 
             // load the dbtools library
@@ -122,7 +122,7 @@ namespace svxform
             if (NULL != s_hDbtoolsModule)
             {
                 // get the symbol for the method creating the factory
-                const ::rtl::OUString sFactoryCreationFunc = ::rtl::OUString::createFromAscii("createDataAccessToolsFactory");
+                const ::rtl::OUString sFactoryCreationFunc( RTL_CONSTASCII_USTRINGPARAM("createDataAccessToolsFactory") );
                 //  reinterpret_cast<createDataAccessToolsFactoryFunction>
                 s_pFactoryCreationFunc = (createDataAccessToolsFactoryFunction)(
                     osl_getFunctionSymbol(s_hDbtoolsModule, sFactoryCreationFunc.pData));
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 89914e8ff841..e81ede2f4b9a 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -164,20 +164,16 @@ FmParentData::~FmParentData()
 //========================================================================
 TYPEINIT1(FmFormItem, FmParentData);
 //------------------------------------------------------------------------
-Image FmFormItem::GetImage( BmpColorMode _eMode ) const
+Image FmFormItem::GetImage( BmpColorMode /* _eMode */) const
 {
     static Image aImage;
-    static Image aImage_HC;
 
     if (!aImage)
     {
         ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
-        ImageList aNavigatorImages_HC( SVX_RES( RID_SVXIMGLIST_FMEXPL_HC ) );
-
         aImage = aNavigatorImages.GetImage( RID_SVXIMG_FORM );
-        aImage_HC = aNavigatorImages_HC.GetImage( RID_SVXIMG_FORM );
     }
-    return ( BMP_COLOR_HIGHCONTRAST == _eMode ) ? aImage_HC : aImage;
+    return aImage;
 }
 
 //========================================================================
@@ -199,20 +195,16 @@ FmFilterItem* FmFilterItems::Find( const ::sal_Int32 _nFilterComponentIndex ) co
 }
 
 //------------------------------------------------------------------------
-Image FmFilterItems::GetImage( BmpColorMode _eMode ) const
+Image FmFilterItems::GetImage( BmpColorMode /* _eMode */ ) const
 {
     static Image aImage;
-    static Image aImage_HC;
 
     if (!aImage)
     {
         ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
-        ImageList aNavigatorImages_HC( SVX_RES( RID_SVXIMGLIST_FMEXPL_HC ) );
-
         aImage = aNavigatorImages.GetImage( RID_SVXIMG_FILTER );
-        aImage_HC = aNavigatorImages_HC.GetImage( RID_SVXIMG_FILTER );
     }
-    return ( BMP_COLOR_HIGHCONTRAST == _eMode ) ? aImage_HC : aImage;
+    return aImage;
 }
 
 //========================================================================
@@ -230,20 +222,16 @@ FmFilterItem::FmFilterItem( const Reference< XMultiServiceFactory >& _rxFactory,
 }
 
 //------------------------------------------------------------------------
-Image FmFilterItem::GetImage( BmpColorMode _eMode ) const
+Image FmFilterItem::GetImage( BmpColorMode /* _eMode */ ) const
 {
     static Image aImage;
-    static Image aImage_HC;
 
     if (!aImage)
     {
         ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
-        ImageList aNavigatorImages_HC( SVX_RES( RID_SVXIMGLIST_FMEXPL_HC ) );
-
         aImage = aNavigatorImages.GetImage( RID_SVXIMG_FIELD );
-        aImage_HC = aNavigatorImages_HC.GetImage( RID_SVXIMG_FIELD );
     }
-    return ( BMP_COLOR_HIGHCONTRAST == _eMode ) ? aImage_HC : aImage;
+    return aImage;
 }
 
 //========================================================================
@@ -1172,22 +1160,11 @@ FmFilterNavigator::FmFilterNavigator( Window* pParent )
     SetHelpId( HID_FILTER_NAVIGATOR );
 
     {
-        {
-            ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
-            SetNodeBitmaps(
-                aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ),
-                aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ),
-                BMP_COLOR_NORMAL
-            );
-        }
-        {
-            ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL_HC ) );
-            SetNodeBitmaps(
-                aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ),
-                aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ),
-                BMP_COLOR_HIGHCONTRAST
-            );
-        }
+        ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
+        SetNodeBitmaps(
+            aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ),
+            aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE )
+        );
     }
 
     m_pModel = new FmFilterModel(comphelper::getProcessServiceFactory());
@@ -1235,7 +1212,7 @@ void FmFilterNavigator::UpdateContent(const Reference< XIndexAccess > & xControl
         if (pEntry)
         {
             if (!IsExpanded(pEntry))
-                Expand(pEntry);
+                    Expand(pEntry);
             Select(pEntry, sal_True);
         }
     }
@@ -1587,12 +1564,7 @@ void FmFilterNavigator::Insert(FmFilterData* pItem, sal_Int32 nPos)
 
     // insert the item
     SvLBoxEntry* pParentEntry = FindEntry( pParent );
-    SvLBoxEntry* pNewEntry = InsertEntry(pItem->GetText(), pItem->GetImage(), pItem->GetImage(), pParentEntry, sal_False, nPos, pItem );
-    if ( pNewEntry )
-    {
-        SetExpandedEntryBmp( pNewEntry, pItem->GetImage( BMP_COLOR_HIGHCONTRAST ), BMP_COLOR_HIGHCONTRAST );
-        SetCollapsedEntryBmp( pNewEntry, pItem->GetImage( BMP_COLOR_HIGHCONTRAST ), BMP_COLOR_HIGHCONTRAST );
-    }
+    InsertEntry( pItem->GetText(), pItem->GetImage(), pItem->GetImage(), pParentEntry, sal_False, nPos, pItem );
     if ( pParentEntry )
         Expand( pParentEntry );
 }
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 45306f7619dd..8b3e567ce697 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -231,7 +231,7 @@ FmPropBrw::FmPropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBinding
     try
     {
         // create a frame wrapper for myself
-        m_xMeAsFrame = Reference< XFrame >(m_xORB->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.Frame")), UNO_QUERY);
+        m_xMeAsFrame = Reference< XFrame >(m_xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame")) ), UNO_QUERY);
         if (m_xMeAsFrame.is())
         {
             // create an intermediate window, which is to be the container window of the frame
@@ -244,7 +244,7 @@ FmPropBrw::FmPropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBinding
             m_xFrameContainerWindow = VCLUnoHelper::GetInterface ( pContainerWindow );
 
             m_xMeAsFrame->initialize( m_xFrameContainerWindow );
-            m_xMeAsFrame->setName(::rtl::OUString::createFromAscii("form property browser"));
+            m_xMeAsFrame->setName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("form property browser")) );
             if ( _pBindings->GetDispatcher() )
             {
                 ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFramesSupplier >
diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx
index 907862e79dd8..807919e60a2f 100644
--- a/svx/source/form/fmdmod.cxx
+++ b/svx/source/form/fmdmod.cxx
@@ -42,11 +42,11 @@ using namespace ::svxform;
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL SvxFmMSFactory::createInstance(const ::rtl::OUString& ServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException )
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  xRet;
-    if ( ServiceSpecifier.indexOf( ::rtl::OUString::createFromAscii("com.sun.star.form.component.") ) == 0 )
+    if ( ServiceSpecifier.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.")) ) == 0 )
     {
         xRet = ::comphelper::getProcessServiceFactory()->createInstance(ServiceSpecifier);
     }
-    else if ( ServiceSpecifier == ::rtl::OUString( ::rtl::OUString::createFromAscii("com.sun.star.drawing.ControlShape") ) )
+    else if ( ServiceSpecifier == ::rtl::OUString( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape")) ) )
     {
         SdrObject* pObj = new FmFormObj(OBJ_FM_CONTROL);
         xRet = *new SvxShapeControl(pObj);
@@ -107,19 +107,19 @@ using namespace ::svxform;
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  xRet;
     sal_uInt16 nTokenCount = ServiceName.getTokenCount('.');
     if (nTokenCount == 5 &&
-        ServiceName.getToken( 0, '.' ) == ::rtl::OUString::createFromAscii("stardiv") &&
-        ServiceName.getToken( 1, '.' ) == ::rtl::OUString::createFromAscii("one") &&
-        ServiceName.getToken( 2, '.' ) == ::rtl::OUString::createFromAscii("form") &&
-        ServiceName.getToken( 3, '.' ) == ::rtl::OUString::createFromAscii("component"))
+        ServiceName.getToken( 0, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv")) &&
+        ServiceName.getToken( 1, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("one")) &&
+        ServiceName.getToken( 2, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("form")) &&
+        ServiceName.getToken( 3, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("component")) )
     {
         xRet = ::comphelper::getProcessServiceFactory()->createInstance(ServiceName);
     }
     else
     if (nTokenCount == 4 &&
-        ServiceName.getToken( 0, '.' ) == ::rtl::OUString::createFromAscii("stardiv") &&
-        ServiceName.getToken( 1, '.' ) == ::rtl::OUString::createFromAscii("one") &&
-        ServiceName.getToken( 2, '.' ) == ::rtl::OUString::createFromAscii("drawing") &&
-        ServiceName.getToken( 3, '.' ) == ::rtl::OUString::createFromAscii("ControlShape"))
+        ServiceName.getToken( 0, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv")) &&
+        ServiceName.getToken( 1, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("one")) &&
+        ServiceName.getToken( 2, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("drawing")) &&
+        ServiceName.getToken( 3, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlShape")) )
     {
         SdrObject* pObj = new FmFormObj();
         xRet = *new SvxShapeControl(pObj);
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index cd4459ed3e82..a407baddd12b 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -252,7 +252,6 @@ FmEntryData::FmEntryData( const FmEntryData& rEntryData )
     pChildList = new FmEntryDataList();
     aText = rEntryData.GetText();
     m_aNormalImage = rEntryData.GetNormalImage();
-    m_aHCImage = rEntryData.GetHCImage();
     pParent = rEntryData.GetParent();
 
     FmEntryData* pChildData;
@@ -317,16 +316,19 @@ sal_Bool FmEntryData::IsEqualWithoutChilds( FmEntryData* pEntryData )
 TYPEINIT1( FmFormData, FmEntryData );
 DBG_NAME(FmFormData);
 //------------------------------------------------------------------------
-FmFormData::FmFormData( const Reference< XForm >& _rxForm, const ImageList& _rNormalImages, const ImageList& _rHCImages, FmFormData* _pParent )
-    :FmEntryData( _pParent, _rxForm )
-    ,m_xForm( _rxForm )
+FmFormData::FmFormData(
+    const Reference< XForm >& _rxForm,
+    const ImageList& _rNormalImages,
+    FmFormData* _pParent
+)
+:   FmEntryData( _pParent, _rxForm ),
+    m_xForm( _rxForm )
 {
     DBG_CTOR(FmEntryData,NULL);
     //////////////////////////////////////////////////////////////////////
     // Images setzen
 
     m_aNormalImage = _rNormalImages.GetImage( RID_SVXIMG_FORM );
-    m_aHCImage = _rHCImages.GetImage( RID_SVXIMG_FORM );
 
     //////////////////////////////////////////////////////////////////////
     // Titel setzen
@@ -384,16 +386,19 @@ sal_Bool FmFormData::IsEqualWithoutChilds( FmEntryData* pEntryData )
 TYPEINIT1( FmControlData, FmEntryData );
 DBG_NAME(FmControlData);
 //------------------------------------------------------------------------
-FmControlData::FmControlData( const Reference< XFormComponent >& _rxComponent, const ImageList& _rNormalImages, const ImageList& _rHCImages, FmFormData* _pParent )
-    :FmEntryData( _pParent, _rxComponent )
-    ,m_xFormComponent( _rxComponent )
+FmControlData::FmControlData(
+    const Reference< XFormComponent >& _rxComponent,
+    const ImageList& _rNormalImages,
+    FmFormData* _pParent
+)
+:   FmEntryData( _pParent, _rxComponent ),
+    m_xFormComponent( _rxComponent )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmControlData::FmControlData" );
     DBG_CTOR(FmControlData,NULL);
     //////////////////////////////////////////////////////////////////////
     // Images setzen
     m_aNormalImage = GetImage( _rNormalImages );
-    m_aHCImage = GetImage( _rHCImages );
 
     //////////////////////////////////////////////////////////////////////
     // Titel setzen
@@ -554,7 +559,10 @@ sal_Bool FmControlData::IsEqualWithoutChilds( FmEntryData* pEntryData )
 }
 
 //------------------------------------------------------------------------
-void FmControlData::ModelReplaced( const Reference< XFormComponent >& _rxNew, const ImageList& _rNormalImages, const ImageList& _rHCImages )
+void FmControlData::ModelReplaced(
+    const Reference< XFormComponent >& _rxNew,
+    const ImageList& _rNormalImages
+)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmControlData::ModelReplaced" );
     m_xFormComponent = _rxNew;
@@ -562,7 +570,6 @@ void FmControlData::ModelReplaced( const Reference< XFormComponent >& _rxNew, co
 
     // Images neu setzen
     m_aNormalImage = GetImage( _rNormalImages );
-    m_aHCImage = GetImage( _rHCImages );
 }
 
 //............................................................................
diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src
index 17881727cd5f..fb7ea13d9984 100644
--- a/svx/source/form/fmexpl.src
+++ b/svx/source/form/fmexpl.src
@@ -295,13 +295,6 @@ ImageList RID_SVXIMGLIST_FMEXPL
     NAVIGATOR_IMAGEIDS;
 };
 
-ImageList RID_SVXIMGLIST_FMEXPL_HC
-{
-    Prefix = "sxh";
-    MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
-    NAVIGATOR_IMAGEIDS;
-};
-
 ModalDialog RID_SVXDLG_SETFORM
 {
     OutputSize = TRUE ;
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index c9d528fcd5c9..5f8f2e6ab526 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -375,7 +375,7 @@ void FmFormObj::clonedFrom(const FmFormObj* _pSource)
     Reference< XInterface >  xSourceContainer = xSourceAsChild->getParent();
 
     m_xEnvironmentHistory = Reference< XIndexContainer >(
-        ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.form.Forms")),
+        ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.Forms")) ),
         UNO_QUERY);
     DBG_ASSERT(m_xEnvironmentHistory.is(), "FmFormObj::clonedFrom : could not create a forms collection !");
 
@@ -581,7 +581,7 @@ Reference< XInterface >  FmFormObj::ensureModelEnv(const Reference< XInterface >
                 {
                     // create and insert (into the destination) a copy of the form
                     xCurrentDestForm.set(
-                        ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii( "com.sun.star.form.component.DataForm" ) ),
+                        ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.DataForm" )) ),
                         UNO_QUERY_THROW );
                     ::comphelper::copyProperties( xCurrentSourceForm, xCurrentDestForm );
 
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index d3f997357a16..0fef03f19257 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -335,7 +335,7 @@ const Reference< XNameContainer >& FmFormPageImpl::getForms( bool _bForceCreate
     {
         m_bAttemptedFormCreation = true;
 
-        const ::rtl::OUString sFormsCollectionServiceName = ::rtl::OUString::createFromAscii("com.sun.star.form.Forms");
+        const ::rtl::OUString sFormsCollectionServiceName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.Forms") );
         m_xForms = Reference< XNameContainer > (
             ::comphelper::getProcessServiceFactory()->createInstance( sFormsCollectionServiceName ),
             UNO_QUERY
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index fe9542d0a7c1..99b5f21a9bcd 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -212,7 +212,7 @@ namespace svxform
             Reference< XHierarchicalNameAccess > xTypeDescriptions( aContext.getSingleton( "com.sun.star.reflection.theTypeDescriptionManager" ), UNO_QUERY_THROW );
 
             ::rtl::OUString sMethodDescription( _rListenerType );
-            sMethodDescription += ::rtl::OUString::createFromAscii( "::" );
+            sMethodDescription += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "::" ));
             sMethodDescription += _rMethodName;
 
             Reference< XInterfaceMethodTypeDescription > xMethod( xTypeDescriptions->getByHierarchicalName( sMethodDescription ), UNO_QUERY_THROW );
@@ -239,8 +239,7 @@ namespace svxform
     void SAL_CALL FormScriptListener::firing( const ScriptEvent& _rEvent ) throw (RuntimeException)
     {
         ::osl::ClearableMutexGuard aGuard( m_aMutex );
-       static const ::rtl::OUString vbaInterOp =
-           ::rtl::OUString::createFromAscii("VBAInterop");
+       static const ::rtl::OUString vbaInterOp( RTL_CONSTASCII_USTRINGPARAM("VBAInterop") );
        if ( _rEvent.ScriptType.equals(vbaInterOp) )
            return; // not handled here
 
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index af22c2300891..827a2f3bcfcf 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -810,7 +810,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
             }
 
             if ( nRecord != -1 )
-                rController->execute( nSlot, ::rtl::OUString::createFromAscii( "Position" ), makeAny( (sal_Int32)nRecord ) );
+                rController->execute( nSlot, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Position" )), makeAny( (sal_Int32)nRecord ) );
 
             rReq.Done();
         }   break;
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 7185a0dae03e..178ca829103c 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -390,8 +390,8 @@ namespace
         Sequence< Type> aModelListeners;
         Sequence< Type> aControlListeners;
 
-        Reference< XIntrospection> xModelIntrospection(::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.beans.Introspection")), UNO_QUERY);
-        Reference< XIntrospection> xControlIntrospection(::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.beans.Introspection")), UNO_QUERY);
+        Reference< XIntrospection> xModelIntrospection(::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.Introspection"))), UNO_QUERY);
+        Reference< XIntrospection> xControlIntrospection(::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.Introspection"))), UNO_QUERY);
 
         if (xModelIntrospection.is() && xModel.is())
         {
@@ -526,8 +526,8 @@ sal_Bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun
         {
             switch ( (TriState)xCheckBox->getState() )
             {
-                case STATE_NOCHECK: *_pCurrentText = ::rtl::OUString::createFromAscii( "0" ); break;
-                case STATE_CHECK: *_pCurrentText = ::rtl::OUString::createFromAscii( "1" ); break;
+                case STATE_NOCHECK: *_pCurrentText = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "0" )); break;
+                case STATE_CHECK: *_pCurrentText = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "1" )); break;
                 default: *_pCurrentText = ::rtl::OUString(); break;
             }
         }
@@ -656,7 +656,7 @@ DBG_NAME(FmXFormShell);
 //------------------------------------------------------------------------
 FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame )
         :FmXFormShell_BASE(m_aMutex)
-        ,FmXFormShell_CFGBASE(::rtl::OUString::createFromAscii("Office.Common/Misc"), CONFIG_MODE_DELAYED_UPDATE)
+        ,FmXFormShell_CFGBASE(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Misc")), CONFIG_MODE_DELAYED_UPDATE)
         ,m_eNavigate( NavigationBarMode_NONE )
         ,m_nInvalidationEvent( 0 )
         ,m_nActivationEvent( 0 )
@@ -695,7 +695,7 @@ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame )
     implAdjustConfigCache();
     // and register for changes on this settings
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString::createFromAscii("FormControlPilotsEnabled");
+    aNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormControlPilotsEnabled"));
     EnableNotification(aNames);
 }
 
@@ -1134,12 +1134,10 @@ void FmXFormShell::ForceUpdateSelection(sal_Bool bAllowInvalidation)
 PopupMenu* FmXFormShell::GetConversionMenu()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::GetConversionMenu" );
-    const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-    BOOL bIsHiContrastMode  = rSettings.GetHighContrastMode();
 
     PopupMenu* pNewMenu = new PopupMenu(SVX_RES( RID_FMSHELL_CONVERSIONMENU ));
 
-    ImageList aImageList( SVX_RES( bIsHiContrastMode ? RID_SVXIMGLIST_FMEXPL_HC : RID_SVXIMGLIST_FMEXPL) );
+    ImageList aImageList( SVX_RES( RID_SVXIMGLIST_FMEXPL) );
     for ( size_t i = 0; i < SAL_N_ELEMENTS( nConvertSlots ); ++i )
     {
         // das entsprechende Image dran
@@ -1737,7 +1735,7 @@ sal_Bool FmXFormShell::GetY2KState(sal_uInt16& n)
         {
             try
             {
-                Any aVal( xSet->getPropertyValue(::rtl::OUString::createFromAscii("TwoDigitDateStart")) );
+                Any aVal( xSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TwoDigitDateStart"))) );
                 aVal >>= n;
                 return sal_True;
             }
@@ -1771,7 +1769,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n)
                 {
                     Any aVal;
                     aVal <<= n;
-                    xSet->setPropertyValue(::rtl::OUString::createFromAscii("TwoDigitDateStart"), aVal);
+                    xSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TwoDigitDateStart")), aVal);
                 }
                 catch(Exception&)
                 {
@@ -1812,7 +1810,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n)
                 {
                     Any aVal;
                     aVal <<= n;
-                    xSet->setPropertyValue(::rtl::OUString::createFromAscii("TwoDigitDateStart"), aVal);
+                    xSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TwoDigitDateStart")), aVal);
                 }
                 catch(Exception&)
                 {
@@ -3342,7 +3340,7 @@ void FmXFormShell::CreateExternalView()
     // the frame the external view is displayed in
     sal_Bool bAlreadyExistent = m_xExternalViewController.is();
     Reference< ::com::sun::star::frame::XFrame> xExternalViewFrame;
-    ::rtl::OUString sFrameName = ::rtl::OUString::createFromAscii("_beamer");
+    ::rtl::OUString sFrameName(RTL_CONSTASCII_USTRINGPARAM("_beamer"));
     sal_Int32 nSearchFlags = ::com::sun::star::frame::FrameSearchFlag::CHILDREN | ::com::sun::star::frame::FrameSearchFlag::CREATE;
 
     Reference< runtime::XFormController > xCurrentNavController( getNavController());
@@ -3426,7 +3424,7 @@ void FmXFormShell::CreateExternalView()
         URL aClearURL;
         aClearURL.Complete = FMURL_GRIDVIEW_CLEARVIEW;
 
-        Reference< ::com::sun::star::frame::XDispatch> xClear( xCommLink->queryDispatch(aClearURL, ::rtl::OUString::createFromAscii(""), 0));
+        Reference< ::com::sun::star::frame::XDispatch> xClear( xCommLink->queryDispatch(aClearURL, ::rtl::OUString(), 0));
         if (xClear.is())
             xClear->dispatch(aClearURL, Sequence< PropertyValue>());
     }
@@ -3443,10 +3441,10 @@ void FmXFormShell::CreateExternalView()
         // collect the dispatchers we will need
         URL aAddColumnURL;
         aAddColumnURL.Complete = FMURL_GRIDVIEW_ADDCOLUMN;
-        Reference< ::com::sun::star::frame::XDispatch> xAddColumnDispatch( xCommLink->queryDispatch(aAddColumnURL, ::rtl::OUString::createFromAscii(""), 0));
+        Reference< ::com::sun::star::frame::XDispatch> xAddColumnDispatch( xCommLink->queryDispatch(aAddColumnURL, ::rtl::OUString(), 0));
         URL aAttachURL;
         aAttachURL.Complete = FMURL_GRIDVIEW_ATTACHTOFORM;
-        Reference< ::com::sun::star::frame::XDispatch> xAttachDispatch( xCommLink->queryDispatch(aAttachURL, ::rtl::OUString::createFromAscii(""), 0));
+        Reference< ::com::sun::star::frame::XDispatch> xAttachDispatch( xCommLink->queryDispatch(aAttachURL, ::rtl::OUString(), 0));
 
         if (xAddColumnDispatch.is() && xAttachDispatch.is())
         {
@@ -3612,7 +3610,7 @@ void FmXFormShell::CreateExternalView()
                 aColumnProps.realloc(pColumnProps - aColumnProps.getArray());
 
                 // columns props are a dispatch argument
-                pDispatchArgs->Name = ::rtl::OUString::createFromAscii("ColumnProperties"); // TODO : fmurl.*
+                pDispatchArgs->Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ColumnProperties")); // TODO : fmurl.*
                 pDispatchArgs->Value = makeAny(aColumnProps);
                 ++pDispatchArgs;
                 DBG_ASSERT(nDispatchArgs == (pDispatchArgs - aDispatchArgs.getConstArray()),
@@ -3699,7 +3697,7 @@ void FmXFormShell::CreateExternalView()
                 ++pDispatchArgs;
 
                 // the
-                pDispatchArgs->Name = ::rtl::OUString::createFromAscii("ColumnProperties"); // TODO : fmurl.*
+                pDispatchArgs->Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ColumnProperties")); // TODO : fmurl.*
                 pDispatchArgs->Value = makeAny(aListBoxDescription);
                 ++pDispatchArgs;
                 DBG_ASSERT(nDispatchArgs == (pDispatchArgs - aDispatchArgs.getConstArray()),
@@ -3751,7 +3749,7 @@ void FmXFormShell::implAdjustConfigCache()
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::implAdjustConfigCache" );
     // get (cache) the wizard usage flag
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString::createFromAscii("FormControlPilotsEnabled");
+    aNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormControlPilotsEnabled"));
     Sequence< Any > aFlags = GetProperties(aNames);
     if (1 == aFlags.getLength())
         m_bUseWizards = ::cppu::any2bool(aFlags[0]);
@@ -3785,7 +3783,7 @@ void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem)
     m_bUseWizards = _bUseThem;
 
     Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString::createFromAscii("FormControlPilotsEnabled");
+    aNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormControlPilotsEnabled"));
     Sequence< Any > aValues(1);
     aValues[0] = ::cppu::bool2any(m_bUseWizards);
     PutProperties(aNames, aValues);
diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx
index e2b891869f78..089c123f5e78 100644
--- a/svx/source/form/fmsrccfg.cxx
+++ b/svx/source/form/fmsrccfg.cxx
@@ -46,9 +46,6 @@ namespace svxform
     // = struct FmSearchParams - Parameter einer Suche
     // ====================================================================
 
-    //---------------------------------------------------------------------
-    //--- 20.08.01 18:17:34 -----------------------------------------------
-
     FmSearchParams::FmSearchParams()
         :nTransliterationFlags( 0 )
         ,nSearchForType     ( 0 )
@@ -73,17 +70,11 @@ namespace svxform
             |   TransliterationModules_IGNORE_CASE;
     }
 
-    //---------------------------------------------------------------------
-    //--- 21.08.01 13:31:48 -----------------------------------------------
-
     sal_Bool FmSearchParams::isIgnoreWidthCJK( ) const
     {
         return 0 != (nTransliterationFlags & TransliterationModules_IGNORE_WIDTH);
     }
 
-    //---------------------------------------------------------------------
-    //--- 21.08.01 13:32:03 -----------------------------------------------
-
     void FmSearchParams::setIgnoreWidthCJK( sal_Bool _bIgnore )
     {
         if ( _bIgnore )
@@ -92,17 +83,11 @@ namespace svxform
             nTransliterationFlags &= ~TransliterationModules_IGNORE_WIDTH;
     }
 
-    //---------------------------------------------------------------------
-    //--- 21.08.01 13:47:52 -----------------------------------------------
-
     sal_Bool FmSearchParams::isCaseSensitive( ) const
     {
         return 0 == (nTransliterationFlags & TransliterationModules_IGNORE_CASE);
     }
 
-    //---------------------------------------------------------------------
-    //--- 21.08.01 13:48:00 -----------------------------------------------
-
     void FmSearchParams::setCaseSensitive( sal_Bool _bCase )
     {
         if ( _bCase )
@@ -121,9 +106,6 @@ namespace svxform
         sal_Int16       nValue;
     };
 
-    //---------------------------------------------------------------------
-    //--- 20.08.01 18:28:38 -----------------------------------------------
-
     static const Ascii2Int16* lcl_getSearchForTypeValueMap()
     {
         static const Ascii2Int16 s_aSearchForTypeMap[] =
@@ -136,9 +118,6 @@ namespace svxform
         return s_aSearchForTypeMap;
     }
 
-    //---------------------------------------------------------------------
-    //--- 20.08.01 18:28:38 -----------------------------------------------
-
     static const Ascii2Int16* lcl_getSearchPositionValueMap()
     {
         static const Ascii2Int16 s_aSearchPositionMap[] =
@@ -152,9 +131,6 @@ namespace svxform
         return s_aSearchPositionMap;
     }
 
-    //---------------------------------------------------------------------
-    //--- 20.08.01 18:30:15 -----------------------------------------------
-
     static sal_Int16 lcl_implMapAsciiValue( const ::rtl::OUString& _rAsciiValue, const Ascii2Int16* _pMap )
     {
         // search the map for the given ascii value
@@ -176,9 +152,6 @@ namespace svxform
         return -1;
     }
 
-    //---------------------------------------------------------------------
-    //--- 20.08.01 18:33:06 -----------------------------------------------
-
     static const sal_Char* lcl_implMapIntValue( const sal_Int16 _nValue, const Ascii2Int16* _pMap )
     {
         // search the map for the given integer value
@@ -208,9 +181,6 @@ namespace svxform
 
 #define TA( c )     &c, getCppuType( &c )
 
-    //---------------------------------------------------------------------
-    //--- 20.08.01 18:19:59 -----------------------------------------------
-
     FmSearchConfigItem::FmSearchConfigItem()
         :OConfigurationValueContainer( ::comphelper::getProcessServiceFactory(), m_aMutex, "/org.openoffice.Office.DataAccess/FormSearchOptions", CVC_UPDATE_ACCESS | CVC_LAZY_UPDATE, 2 )
     {
@@ -256,17 +226,11 @@ namespace svxform
         read( );
     }
 
-    //---------------------------------------------------------------------
-    //--- 20.08.01 18:19:57 -----------------------------------------------
-
     FmSearchConfigItem::~FmSearchConfigItem()
     {
         commit( );
     }
 
-    //---------------------------------------------------------------------
-    //--- 20.08.01 18:20:48 -----------------------------------------------
-
     void FmSearchConfigItem::implTranslateFromConfig( )
     {
         // the search-for string
@@ -300,9 +264,6 @@ namespace svxform
         if ( m_bIsIgnoreMiddleDot           )   nTransliterationFlags |= TransliterationModules_ignoreMiddleDot_ja_JP;
     }
 
-    //---------------------------------------------------------------------
-    //--- 20.08.01 18:42:23 -----------------------------------------------
-
     void FmSearchConfigItem::implTranslateToConfig( )
     {
         // the search-for string
@@ -335,9 +296,6 @@ namespace svxform
         m_bIsIgnoreMiddleDot            = ( 0 != ( nTransliterationFlags & TransliterationModules_ignoreMiddleDot_ja_JP ) );
     }
 
-    //---------------------------------------------------------------------
-    //--- 20.08.01 18:20:01 -----------------------------------------------
-
     const FmSearchParams& FmSearchConfigItem::getParams() const
     {
         // ensure that the properties which are not stored directly are up-to-date
@@ -347,9 +305,6 @@ namespace svxform
         return *this;
     }
 
-    //---------------------------------------------------------------------
-    //--- 20.08.01 18:41:57 -----------------------------------------------
-
     void FmSearchConfigItem::setParams( const FmSearchParams& _rParams )
     {
         // copy the FmSearchParams part
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 51d4ef5c2fca..3930c2e33431 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -218,8 +218,8 @@ CheckBoxWrapper::CheckBoxWrapper(const Reference< ::com::sun::star::awt::XCheckB
 {
     switch ((TriState)m_xBox->getState())
     {
-        case STATE_NOCHECK: return rtl::OUString::createFromAscii("0");
-        case STATE_CHECK: return rtl::OUString::createFromAscii("1");
+        case STATE_NOCHECK: return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0"));
+        case STATE_CHECK: return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1"));
         default: break;
     }
     return rtl::OUString();
@@ -1011,14 +1011,14 @@ void FmSearchEngine::SearchNextImpl()
             switch (m_nPosition)
             {
                 case MATCHING_ANYWHERE :
-                    strSearchExpression = ::rtl::OUString::createFromAscii("*") + strSearchExpression
-                    + ::rtl::OUString::createFromAscii("*");
+                    strSearchExpression = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")) + strSearchExpression
+                    + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*"));
                     break;
                 case MATCHING_BEGINNING :
-                    strSearchExpression = strSearchExpression + ::rtl::OUString::createFromAscii("*");
+                    strSearchExpression = strSearchExpression + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*"));
                     break;
                 case MATCHING_END :
-                    strSearchExpression = ::rtl::OUString::createFromAscii("*") + strSearchExpression;
+                    strSearchExpression = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")) + strSearchExpression;
                     break;
                 case MATCHING_WHOLETEXT :
                     break;
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 56dd61f2ea95..432213384298 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -153,10 +153,10 @@ void displayException(const Any& _rExcept, Window* _pParent)
         Reference< XWindow > xParentWindow = VCLUnoHelper::GetInterface(pParentWindow);
 
         Sequence< Any > aArgs(2);
-        aArgs[0] <<= PropertyValue(::rtl::OUString::createFromAscii("SQLException"), 0, _rExcept, PropertyState_DIRECT_VALUE);
-        aArgs[1] <<= PropertyValue(::rtl::OUString::createFromAscii("ParentWindow"), 0, makeAny(xParentWindow), PropertyState_DIRECT_VALUE);
+        aArgs[0] <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLException")), 0, _rExcept, PropertyState_DIRECT_VALUE);
+        aArgs[1] <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow")), 0, makeAny(xParentWindow), PropertyState_DIRECT_VALUE);
 
-        static ::rtl::OUString s_sDialogServiceName = ::rtl::OUString::createFromAscii("com.sun.star.sdb.ErrorMessageDialog");
+        static ::rtl::OUString s_sDialogServiceName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ErrorMessageDialog") );
         Reference< XExecutableDialog > xErrorDialog(
             ::comphelper::getProcessServiceFactory()->createInstanceWithArguments(s_sDialogServiceName, aArgs), UNO_QUERY);
         if (xErrorDialog.is())
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index d9be80fb949f..e194f9c9fd7b 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -479,7 +479,7 @@ class FmXAutoControl: public UnoControl
 public:
     FmXAutoControl(){}
 
-    virtual ::rtl::OUString GetComponentServiceName() {return ::rtl::OUString::createFromAscii("Edit");}
+    virtual ::rtl::OUString GetComponentServiceName() {return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Edit"));}
     virtual void SAL_CALL createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer ) throw( RuntimeException );
 
 protected:
@@ -709,7 +709,7 @@ sal_Bool SAL_CALL FormController::supportsService(const ::rtl::OUString& Service
 //------------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL FormController::getImplementationName() throw( RuntimeException )
 {
-    return ::rtl::OUString::createFromAscii( "org.openoffice.comp.svx.FormController" );
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.svx.FormController"));
 }
 
 //------------------------------------------------------------------------------
@@ -747,7 +747,7 @@ Sequence< ::rtl::OUString> FormController::getSupportedServiceNames_Static(void)
     {
         aServices.realloc(2);
         aServices.getArray()[0] = FM_FORM_CONTROLLER;
-        aServices.getArray()[1] = ::rtl::OUString::createFromAscii("com.sun.star.awt.control.TabController");
+        aServices.getArray()[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.control.TabController"));
     }
     return aServices;
 }
@@ -3176,7 +3176,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
                         xQueryColumns->getByName(pRefValues[j].Name) >>= xSet;
 
                         // get the RealName
-                        xSet->getPropertyValue(::rtl::OUString::createFromAscii("RealName")) >>= aRealName;
+                        xSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RealName"))) >>= aRealName;
 
                         // compare the condition field name and the RealName
                         if (aCompare(aRealName, pRefValues[j].Name))
@@ -3189,7 +3189,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
                         for (sal_Int32 n = 0, nCount = xColumnsByIndex->getCount(); n < nCount; n++)
                         {
                             xColumnsByIndex->getByIndex(n) >>= xSet;
-                            xSet->getPropertyValue(::rtl::OUString::createFromAscii("RealName")) >>= aRealName;
+                            xSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RealName"))) >>= aRealName;
                             if (aCompare(aRealName, pRefValues[j].Name))
                             {
                                 // get the column by its alias
@@ -3217,10 +3217,10 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
                         if (aRow.find((*iter).xText) != aRow.end())
                         {
                             ::rtl::OUString aCompText = aRow[(*iter).xText];
-                            aCompText += ::rtl::OUString::createFromAscii(" ");
+                            aCompText += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
                             ::rtl::OString aVal = m_xParser->getContext().getIntlKeywordAscii(OParseContext::KEY_AND);
                             aCompText += ::rtl::OUString(aVal.getStr(),aVal.getLength(),RTL_TEXTENCODING_ASCII_US);
-                            aCompText += ::rtl::OUString::createFromAscii(" ");
+                            aCompText += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
                             aCompText += ::comphelper::getString(pRefValues[j].Value);
                             aRow[(*iter).xText] = aCompText;
                         }
@@ -3367,9 +3367,9 @@ void FormController::startFiltering()
                 {
                     // create a filter control
                     Sequence< Any > aCreationArgs( 3 );
-                    aCreationArgs[ 0 ] <<= NamedValue( ::rtl::OUString::createFromAscii( "MessageParent" ), makeAny( VCLUnoHelper::GetInterface( getDialogParentWindow() ) ) );
-                    aCreationArgs[ 1 ] <<= NamedValue( ::rtl::OUString::createFromAscii( "NumberFormatter" ), makeAny( xFormatter ) );
-                    aCreationArgs[ 2 ] <<= NamedValue( ::rtl::OUString::createFromAscii( "ControlModel" ), makeAny( xModel ) );
+                    aCreationArgs[ 0 ] <<= NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MessageParent")), makeAny( VCLUnoHelper::GetInterface( getDialogParentWindow() ) ) );
+                    aCreationArgs[ 1 ] <<= NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberFormatter")), makeAny( xFormatter ) );
+                    aCreationArgs[ 2 ] <<= NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlModel")), makeAny( xModel ) );
                     Reference< XControl > xFilterControl(
                         m_aContext.createComponentWithArguments( "com.sun.star.form.control.FilterControl", aCreationArgs ),
                         UNO_QUERY
diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx
index 029346b32fa9..2224ce7caa2f 100644
--- a/svx/source/form/legacyformcontroller.cxx
+++ b/svx/source/form/legacyformcontroller.cxx
@@ -210,7 +210,7 @@ namespace svxform
     {
         Sequence< ::rtl::OUString > aServices(2);
         aServices.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.FormController" ) );
-        aServices.getArray()[1] = ::rtl::OUString::createFromAscii("com.sun.star.awt.control.TabController");
+        aServices.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.control.TabController") );
         return aServices;
     }
 
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index bcae5c6e793d..f1b6814b13c7 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -204,24 +204,17 @@ namespace svxform
         SetHelpId( HID_FORM_NAVIGATOR );
 
         m_aNavigatorImages = ImageList( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
-        m_aNavigatorImagesHC = ImageList( SVX_RES( RID_SVXIMGLIST_FMEXPL_HC ) );
 
         SetNodeBitmaps(
             m_aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ),
-            m_aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ),
-            BMP_COLOR_NORMAL
-        );
-        SetNodeBitmaps(
-            m_aNavigatorImagesHC.GetImage( RID_SVXIMG_COLLAPSEDNODE ),
-            m_aNavigatorImagesHC.GetImage( RID_SVXIMG_EXPANDEDNODE ),
-            BMP_COLOR_HIGHCONTRAST
+            m_aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE )
         );
 
         SetDragDropMode(0xFFFF);
         EnableInplaceEditing( sal_True );
         SetSelectionMode(MULTIPLE_SELECTION);
 
-        m_pNavModel = new NavigatorTreeModel( m_aNavigatorImages, m_aNavigatorImagesHC );
+        m_pNavModel = new NavigatorTreeModel( m_aNavigatorImages );
         Clear();
 
         StartListening( *m_pNavModel );
@@ -668,11 +661,8 @@ namespace svxform
             SvLBoxEntry* pEntry = FindEntry( pData );
             if (pEntry)
             {   // das Image neu setzen
-                SetCollapsedEntryBmp( pEntry, pData->GetNormalImage(), BMP_COLOR_NORMAL );
-                SetExpandedEntryBmp( pEntry, pData->GetNormalImage(), BMP_COLOR_NORMAL );
-
-                SetCollapsedEntryBmp( pEntry, pData->GetHCImage(), BMP_COLOR_HIGHCONTRAST );
-                SetExpandedEntryBmp( pEntry, pData->GetHCImage(), BMP_COLOR_HIGHCONTRAST );
+                SetCollapsedEntryBmp( pEntry, pData->GetNormalImage() );
+                SetExpandedEntryBmp( pEntry, pData->GetNormalImage() );
             }
         }
 
@@ -692,13 +682,6 @@ namespace svxform
             Image aRootImage( m_aNavigatorImages.GetImage( RID_SVXIMG_FORMS ) );
             m_pRootEntry = InsertEntry( SVX_RES(RID_STR_FORMS), aRootImage, aRootImage,
                 NULL, sal_False, 0, NULL );
-
-            if ( m_pRootEntry )
-            {
-                Image aHCRootImage( m_aNavigatorImagesHC.GetImage( RID_SVXIMG_FORMS ) );
-                SetExpandedEntryBmp( m_pRootEntry, aHCRootImage, BMP_COLOR_HIGHCONTRAST );
-                SetCollapsedEntryBmp( m_pRootEntry, aHCRootImage, BMP_COLOR_HIGHCONTRAST );
-            }
         }
         else if (!m_bMarkingObjects && rHint.ISA(FmNavRequestSelectHint))
         {   // wenn m_bMarkingObjects sal_True ist, markiere ich gerade selber Objekte, und da der ganze Mechanismus dahinter synchron ist,
@@ -733,12 +716,6 @@ namespace svxform
                 pEntryData->GetNormalImage(), pEntryData->GetNormalImage(),
                 pParentEntry, sal_False, nRelPos, pEntryData );
 
-        if ( pNewEntry )
-        {
-            SetExpandedEntryBmp( pNewEntry, pEntryData->GetHCImage(), BMP_COLOR_HIGHCONTRAST );
-            SetCollapsedEntryBmp( pNewEntry, pEntryData->GetHCImage(), BMP_COLOR_HIGHCONTRAST );
-        }
-
         //////////////////////////////////////////////////////////////////////
         // Wenn Root-Eintrag Root expandieren
         if( !pParentEntry )
@@ -1464,7 +1441,7 @@ namespace svxform
         if (!xNewForm.is())
             return;
 
-        FmFormData* pNewFormData = new FmFormData( xNewForm, m_aNavigatorImages, m_aNavigatorImagesHC, pParentFormData );
+        FmFormData* pNewFormData = new FmFormData( xNewForm, m_aNavigatorImages, pParentFormData );
 
         //////////////////////////////////////////////////////////////////////
         // Namen setzen
@@ -1529,7 +1506,7 @@ namespace svxform
         if (!xNewComponent.is())
             return NULL;
 
-        FmControlData* pNewFormControlData = new FmControlData( xNewComponent, m_aNavigatorImages, m_aNavigatorImagesHC, pParentFormData );
+        FmControlData* pNewFormControlData = new FmControlData( xNewComponent, m_aNavigatorImages, pParentFormData );
 
         //////////////////////////////////////////////////////////////////////
         // Namen setzen
@@ -1583,7 +1560,7 @@ namespace svxform
             aNewName = aBaseName;
             if( i>0 )
             {
-                aNewName += ::rtl::OUString::createFromAscii(" ");
+                aNewName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
                 aNewName += ::rtl::OUString::valueOf(i).getStr();
             }
 
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index acbb1ba8f05f..fbf8d669687c 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -216,12 +216,11 @@ namespace svxform
     //========================================================================
 
     //------------------------------------------------------------------------
-    NavigatorTreeModel::NavigatorTreeModel( const ImageList& _rNormalImages, const ImageList& _rHCImages )
+    NavigatorTreeModel::NavigatorTreeModel( const ImageList& _rNormalImages )
                     :m_pFormShell(NULL)
                     ,m_pFormPage(NULL)
                     ,m_pFormModel(NULL)
                     ,m_aNormalImages( _rNormalImages )
-                    ,m_aHCImages( _rHCImages )
     {
         RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::NavigatorTreeModel" );
         m_pPropChangeList = new OFormComponentObserver(this);
@@ -578,7 +577,7 @@ namespace svxform
                     "NavigatorTreeModel::FillBranch : the root container should supply only elements of type XForm");
 
                 xForms->getByIndex(i) >>= xSubForm;
-                pSubFormData = new FmFormData( xSubForm, m_aNormalImages, m_aHCImages, pFormData );
+                pSubFormData = new FmFormData( xSubForm, m_aNormalImages, pFormData );
                 Insert( pSubFormData, LIST_APPEND );
 
                 //////////////////////////////////////////////////////////////
@@ -608,7 +607,7 @@ namespace svxform
 
                 if (xSubForm.is())
                 {   // die aktuelle Component ist eine Form
-                    pSubFormData = new FmFormData(xSubForm, m_aNormalImages, m_aHCImages, pFormData);
+                    pSubFormData = new FmFormData(xSubForm, m_aNormalImages, pFormData);
                     Insert(pSubFormData, LIST_APPEND);
 
                     //////////////////////////////////////////////////////////////
@@ -617,7 +616,7 @@ namespace svxform
                 }
                 else
                 {
-                    pNewControlData = new FmControlData(xCurrentComponent, m_aNormalImages, m_aHCImages, pFormData);
+                    pNewControlData = new FmControlData(xCurrentComponent, m_aNormalImages, pFormData);
                     Insert(pNewControlData, LIST_APPEND);
                 }
             }
@@ -640,7 +639,7 @@ namespace svxform
         if (xParentForm.is())
             pParentData = (FmFormData*)FindData( xParentForm, GetRootList() );
 
-        pFormData = new FmFormData( xForm, m_aNormalImages, m_aHCImages, pParentData );
+        pFormData = new FmFormData( xForm, m_aNormalImages, pParentData );
         Insert( pFormData, nRelPos );
     }
 
@@ -658,7 +657,7 @@ namespace svxform
         FmFormData* pParentData = (FmFormData*)FindData( xForm, GetRootList() );
         if( !pParentData )
         {
-            pParentData = new FmFormData( xForm, m_aNormalImages, m_aHCImages, NULL );
+            pParentData = new FmFormData( xForm, m_aNormalImages, NULL );
             Insert( pParentData, LIST_APPEND );
         }
 
@@ -666,7 +665,7 @@ namespace svxform
         {
             //////////////////////////////////////////////////////////
             // Neue EntryData setzen
-            FmEntryData* pNewEntryData = new FmControlData( xComp, m_aNormalImages, m_aHCImages, pParentData );
+            FmEntryData* pNewEntryData = new FmControlData( xComp, m_aNormalImages, pParentData );
 
             //////////////////////////////////////////////////////////
             // Neue EntryData einfuegen
@@ -675,12 +674,15 @@ namespace svxform
     }
 
     //------------------------------------------------------------------------
-    void NavigatorTreeModel::ReplaceFormComponent(const Reference< XFormComponent > & xOld, const Reference< XFormComponent > & xNew)
+    void NavigatorTreeModel::ReplaceFormComponent(
+        const Reference< XFormComponent > & xOld,
+        const Reference< XFormComponent > & xNew
+    )
     {
         RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::ReplaceFormComponent" );
         FmEntryData* pData = FindData(xOld, GetRootList(), sal_True);
         DBG_ASSERT(pData && pData->ISA(FmControlData), "NavigatorTreeModel::ReplaceFormComponent : invalid argument !");
-        ((FmControlData*)pData)->ModelReplaced( xNew, m_aNormalImages, m_aHCImages );
+        ((FmControlData*)pData)->ModelReplaced( xNew, m_aNormalImages );
 
         FmNavModelReplacedHint aReplacedHint( pData );
         Broadcast( aReplacedHint );
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index 2929697e0807..96c37148b166 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -208,11 +208,7 @@ void SvxFmTbxCtlConfig::StateChanged(USHORT nSID, SfxItemState eState, const Sfx
             {   // set a new image, matching to this slot
                 rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
                 aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlot ));
-                Image aImage = GetImage( m_xFrame,
-                                        aSlotURL,
-                                        hasBigImages(),
-                                        GetToolBox().GetSettings().GetStyleSettings().GetHighContrastMode() );
-
+                Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() );
                 GetToolBox().SetItemImage( GetId(), aImage );
                 nLastSlot = nSlot;
             }
@@ -409,7 +405,7 @@ SvxFmTbxCtlRecTotal::~SvxFmTbxCtlRecTotal()
 Window* SvxFmTbxCtlRecTotal::CreateItemWindow( Window* pParent )
 {
     pFixedText = new FixedText( pParent );
-    String aSample( "123456", sizeof( "123456" ) - 1 );
+    String aSample(RTL_CONSTASCII_USTRINGPARAM("123456"));
     Size aSize( pFixedText->GetTextWidth( aSample ), pFixedText->GetTextHeight( ) );
     aSize.Width() += 12;
     pFixedText->SetSizePixel( aSize );
diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx
index 877d95b92ae8..aff2199bd49d 100644
--- a/svx/source/form/xfm_addcondition.cxx
+++ b/svx/source/form/xfm_addcondition.cxx
@@ -72,7 +72,7 @@ namespace svxform
     //--------------------------------------------------------------------
     ::rtl::OUString SAL_CALL OAddConditionDialog_GetImplementationName()
     {
-        return ::rtl::OUString::createFromAscii( "org.openoffice.comp.svx.OAddConditionDialog" );
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.svx.OAddConditionDialog"));
     }
 
     //====================================================================
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 5f00ad508b2d..026e81c75550 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -237,7 +237,7 @@ void GalleryBrowser1::ImplFillExchangeData( const GalleryTheme* pThm, ExchangeDa
         util::DateTime  aDateTimeModified;
         DateTime        aDateTime;
 
-        aCnt.getPropertyValue( OUString::createFromAscii( "DateModified" ) ) >>= aDateTimeModified;
+        aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "DateModified" )) ) >>= aDateTimeModified;
         ::utl::typeConvert( aDateTimeModified, aDateTime );
         rData.aThemeChangeDate = aDateTime;
         rData.aThemeChangeTime = aDateTime;
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index a48cce387efa..38f5bb87695a 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -1228,12 +1228,10 @@ IMPL_LINK( GalleryBrowser2, SelectTbxHdl, ToolBox*, pBox )
 
 IMPL_LINK( GalleryBrowser2, MiscHdl, void*, EMPTYARG )
 {
-    const sal_Bool  bHC = maViewBox.GetSettings().GetStyleSettings().GetHighContrastMode();
-
     maViewBox.SetOutStyle( maMiscOptions.GetToolboxStyle() );
 
-    BitmapEx aIconBmpEx = BitmapEx( Image( GAL_RESID( bHC? RID_SVXIMG_GALLERY_VIEW_ICON_HC : RID_SVXIMG_GALLERY_VIEW_ICON ) ).GetBitmapEx() );
-    BitmapEx aListBmpEx = BitmapEx( Image( GAL_RESID( bHC? RID_SVXIMG_GALLERY_VIEW_LIST_HC : RID_SVXIMG_GALLERY_VIEW_LIST ) ).GetBitmapEx() );
+    BitmapEx aIconBmpEx = BitmapEx( Image( GAL_RESID( RID_SVXIMG_GALLERY_VIEW_ICON ) ).GetBitmapEx() );
+    BitmapEx aListBmpEx = BitmapEx( Image( GAL_RESID( RID_SVXIMG_GALLERY_VIEW_LIST ) ).GetBitmapEx() );
 
     if( maMiscOptions.AreCurrentSymbolsLarge() )
     {
diff --git a/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src
index fae88c0db251..6ac9839b0f96 100644
--- a/svx/source/gallery2/gallery.src
+++ b/svx/source/gallery2/gallery.src
@@ -257,19 +257,6 @@ Image RID_SVXIMG_GALLERY_VIEW_LIST
     MASKCOLOR
 };
 
-Image RID_SVXIMG_GALLERY_VIEW_ICON_HC
-{
-    ImageBitmap = Bitmap { File = "galicon_h.bmp"; };
-    MASKCOLOR
-};
-
-Image RID_SVXIMG_GALLERY_VIEW_LIST_HC
-{
-    ImageBitmap = Bitmap { File = "gallist_h.bmp"; };
-    MASKCOLOR
-};
-
-
 /******************************************************************************/
 
 Menu RID_SVXMN_GALLERY1
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index b62b0da0f893..0b3ea728f8c4 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -286,7 +286,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR
         ::ucbhelper::Content                       aCnt( rBaseURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv );
 
         uno::Sequence< OUString > aProps( 1 );
-        aProps.getArray()[ 0 ] = OUString::createFromAscii( "Url" );
+        aProps.getArray()[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM("Url"));
 
         uno::Reference< sdbc::XResultSet > xResultSet( aCnt.createCursor( aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY ) );
 
@@ -334,10 +334,10 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR
 
                     if(aThmURL.GetExtension().equalsIgnoreAsciiCaseAscii("thm"))
                     {
-                        INetURLObject   aSdgURL( aThmURL); aSdgURL.SetExtension( OUString::createFromAscii( "sdg" ) );
-                        INetURLObject   aSdvURL( aThmURL ); aSdvURL.SetExtension( OUString::createFromAscii( "sdv" ) );
-                        const OUString  aTitleProp( OUString::createFromAscii( "Title" ) );
-                        const OUString  aReadOnlyProp( OUString::createFromAscii( "IsReadOnly" ) );
+                        INetURLObject   aSdgURL( aThmURL); aSdgURL.SetExtension( OUString(RTL_CONSTASCII_USTRINGPARAM("sdg")) );
+                        INetURLObject   aSdvURL( aThmURL ); aSdvURL.SetExtension( OUString(RTL_CONSTASCII_USTRINGPARAM("sdv")) );
+                        const OUString aTitleProp( RTL_CONSTASCII_USTRINGPARAM("Title") );
+                        const OUString aReadOnlyProp( RTL_CONSTASCII_USTRINGPARAM("IsReadOnly") );
                         OUString        aTitle;
                         sal_Bool        bReadOnly = sal_False;
 
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index d73c49393187..9c7f54ab012d 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -285,7 +285,7 @@ BOOL FileExists( const INetURLObject& rURL )
             ::ucbhelper::Content        aCnt( rURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >() );
             OUString    aTitle;
 
-            aCnt.getPropertyValue( OUString::createFromAscii( "Title" ) ) >>= aTitle;
+            aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) ) >>= aTitle;
             bRet = ( aTitle.getLength() > 0 );
         }
         catch( const ucb::ContentCreationException& )
@@ -319,11 +319,11 @@ BOOL CreateDir( const INetURLObject& rURL )
             uno::Sequence< OUString >               aProps( 1 );
             uno::Sequence< uno::Any >               aValues( 1 );
 
-            aProps.getArray()[ 0 ] = OUString::createFromAscii( "Title" );
+            aProps.getArray()[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
             aValues.getArray()[ 0 ] = uno::makeAny( OUString( aNewFolderURL.GetName() ) );
 
         ::ucbhelper::Content aContent( aNewFolderURL.GetMainURL( INetURLObject::NO_DECODE ), aCmdEnv );
-        bRet = aParent.insertNewContent( OUString::createFromAscii( "application/vnd.sun.staroffice.fsys-folder" ), aProps, aValues, aContent );
+        bRet = aParent.insertNewContent( OUString(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.staroffice.fsys-folder")), aProps, aValues, aContent );
         }
         catch( const ucb::ContentCreationException& )
         {
@@ -349,7 +349,7 @@ BOOL CopyFile(  const INetURLObject& rSrcURL, const INetURLObject& rDstURL )
     {
         ::ucbhelper::Content aDestPath( rDstURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >() );
 
-        aDestPath.executeCommand( OUString::createFromAscii( "transfer" ),
+        aDestPath.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM("transfer")),
                                   uno::makeAny( ucb::TransferInfo( sal_False, rSrcURL.GetMainURL( INetURLObject::NO_DECODE ),
                                                 rDstURL.GetName(), ucb::NameClash::OVERWRITE ) ) );
         bRet = TRUE;
@@ -378,7 +378,7 @@ BOOL KillFile( const INetURLObject& rURL )
         try
         {
             ::ucbhelper::Content aCnt( rURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >() );
-            aCnt.executeCommand( OUString::createFromAscii( "delete" ), uno::makeAny( sal_Bool( sal_True ) ) );
+            aCnt.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), uno::makeAny( sal_Bool( sal_True ) ) );
         }
         catch( const ucb::ContentCreationException& )
         {
@@ -409,7 +409,7 @@ GalleryProgress::GalleryProgress( GraphicFilter* pFilter ) :
     if( xMgr.is() )
     {
         uno::Reference< awt::XProgressMonitor > xMonitor( xMgr->createInstance(
-                                                      ::rtl::OUString::createFromAscii( "com.sun.star.awt.XProgressMonitor" ) ),
+                                                      ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.XProgressMonitor")) ),
                                                       uno::UNO_QUERY );
 
         if ( xMonitor.is() )
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 674cc74f2fd2..154dfb9151c9 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -1181,12 +1181,12 @@ BOOL GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, ULONG
         ::ucbhelper::Content         aCnt( rFileOrDirURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >() );
         sal_Bool        bFolder = false;
 
-        aCnt.getPropertyValue( OUString::createFromAscii( "IsFolder" ) ) >>= bFolder;
+        aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")) ) >>= bFolder;
 
         if( bFolder )
         {
             uno::Sequence< OUString > aProps( 1 );
-            aProps.getArray()[ 0 ] = OUString::createFromAscii( "Url" );
+            aProps.getArray()[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM("Url"));
             uno::Reference< sdbc::XResultSet > xResultSet( aCnt.createCursor( aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY ) );
 
             if( xResultSet.is() )
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index 8712a12c1bca..57c794778e09 100644
--- a/svx/source/gengal/gengal.cxx
+++ b/svx/source/gengal/gengal.cxx
@@ -240,7 +240,7 @@ void GalApp::Init()
             lastSlash = fileName.lastIndexOf( '\\' );
 #endif
         rtl::OUString baseBinDir = fileName.copy( 0, lastSlash );
-        rtl::OUString installPrefix = baseBinDir + rtl::OUString::createFromAscii( "/../.." );
+        rtl::OUString installPrefix = baseBinDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/../.."));
 
         rtl::OUString envVar(RTL_CONSTASCII_USTRINGPARAM("OOO_INSTALL_PREFIX"));
         osl_setEnvironment(envVar.pData, installPrefix.pData);
@@ -263,12 +263,12 @@ void GalApp::InitUCB()
     rtl::OUString aEmpty;
     Sequence< Any > aArgs(6);
     aArgs[0]
-        <<= rtl::OUString::createFromAscii(UCB_CONFIGURATION_KEY1_LOCAL);
+        <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UCB_CONFIGURATION_KEY1_LOCAL));
     aArgs[1]
-        <<= rtl::OUString::createFromAscii(UCB_CONFIGURATION_KEY2_OFFICE);
-    aArgs[2] <<= rtl::OUString::createFromAscii("PIPE");
+        <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UCB_CONFIGURATION_KEY2_OFFICE));
+    aArgs[2] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PIPE"));
     aArgs[3] <<= aEmpty;
-    aArgs[4] <<= rtl::OUString::createFromAscii("PORTAL");
+    aArgs[4] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PORTAL"));
     aArgs[5] <<= aEmpty;
 
     if (! ::ucbhelper::ContentBroker::initialize( xMSF, aArgs ) )
@@ -279,7 +279,7 @@ void GalApp::Main()
 {
     bool bHelp = false;
     rtl::OUString aPath, aDestDir;
-    rtl::OUString aName = rtl::OUString::createFromAscii( "Default name" );
+    rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM("Default name"));
     UINT32 nNumFrom = 0;
     FileNameList aFiles;
 
diff --git a/svx/source/inc/datanavi.hrc b/svx/source/inc/datanavi.hrc
index a77485db399a..ee75a3753ee2 100644
--- a/svx/source/inc/datanavi.hrc
+++ b/svx/source/inc/datanavi.hrc
@@ -38,17 +38,20 @@
 // Controls
 #define TB_ITEMS                10
 #define LB_ITEMS                11
+
 // Menu items
 #define MID_INSERT_CONTROL      100
+
 // ToolBox items
 #define TBI_ITEM_ADD            10
 #define TBI_ITEM_ADD_ELEMENT    11
 #define TBI_ITEM_ADD_ATTRIBUTE  12
 #define TBI_ITEM_EDIT           13
 #define TBI_ITEM_REMOVE         14
+
 // ImageLists
 #define IL_TBX_BMPS             20
-#define IL_TBX_BMPS_HC          21
+
 // ImageIndexes
 #define IID_ITEM_ADD            1
 #define IID_ITEM_ADD_ELEMENT    2
@@ -62,6 +65,7 @@
 #define MB_MODELS               11
 #define TC_ITEMS                12
 #define MB_INSTANCES            13
+
 // MenuItems
 #define MID_MODELS_ADD          10
 #define MID_MODELS_EDIT         11
@@ -70,13 +74,15 @@
 #define MID_INSTANCES_EDIT      21
 #define MID_INSTANCES_REMOVE    22
 #define MID_SHOW_DETAILS        30
+
 // TabPage Ids
 #define TID_SUBMISSION          10
 #define TID_BINDINGS            11
 #define TID_INSTANCE            12
+
 // ImageLists
 #define IL_ITEM_BMPS            30
-#define IL_ITEM_BMPS_HC         31
+
 // ImageIndexes
 #define IID_GROUP_CLOSED        1
 #define IID_GROUP_OPEN          2
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index b8e2aac19beb..8a10c95fb800 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -152,7 +152,6 @@ namespace svxform
         bool                        m_bHasModel;
         DataGroupType               m_eGroup;
         ImageList                   m_TbxImageList;
-        ImageList                   m_TbxHCImageList;
         // these strings are not valid on the Submission and Binding Page
         // mb: furthermore these are properties of an instance, thus
         // it would be much better to get/set them through the UIHelper
@@ -234,7 +233,6 @@ namespace svxform
         Size                        m_a2Size;
         Size                        m_a3Size;
         ImageList                   m_aItemImageList;
-        ImageList                   m_aItemHCImageList;
         PageList                    m_aPageList;
         ContainerList               m_aContainerList;
         EventTargetList             m_aEventTargetList;
@@ -274,7 +272,6 @@ namespace svxform
         void                        RemoveBroadcaster();
 
         inline const ImageList&     GetItemImageList() const { return m_aItemImageList; }
-        inline const ImageList&     GetItemHCImageList() const { return m_aItemHCImageList; }
         inline bool                 IsShowDetails() const { return m_bShowDetails; }
         inline void                 DisableNotify( bool _bDisable ) { m_bIsNotifyDisabled = _bDisable; }
     };
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 4a5a5c500a69..fd3b1adc024d 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -48,47 +48,47 @@
 //===============================================
 // const
 
-#define RECOVERY_CMDPART_PROTOCOL                       ::rtl::OUString::createFromAscii("vnd.sun.star.autorecovery:")
-
-#define RECOVERY_CMDPART_DO_PREPARE_EMERGENCY_SAVE      ::rtl::OUString::createFromAscii("/doPrepareEmergencySave"  )
-#define RECOVERY_CMDPART_DO_EMERGENCY_SAVE              ::rtl::OUString::createFromAscii("/doEmergencySave"         )
-#define RECOVERY_CMDPART_DO_RECOVERY                    ::rtl::OUString::createFromAscii("/doAutoRecovery"          )
-#define RECOVERY_CMDPART_DO_CRASHREPORT                 ::rtl::OUString::createFromAscii("/doCrashReport"           )
-#define RECOVERY_CMDPART_DO_ENTRY_BACKUP                ::rtl::OUString::createFromAscii("/doEntryBackup"           )
-#define RECOVERY_CMDPART_DO_ENTRY_CLEANUP               ::rtl::OUString::createFromAscii("/doEntryCleanUp"          )
-
-#define RECOVERY_CMD_DO_PREPARE_EMERGENCY_SAVE          ::rtl::OUString::createFromAscii("vnd.sun.star.autorecovery:/doPrepareEmergencySave")
-#define RECOVERY_CMD_DO_EMERGENCY_SAVE                  ::rtl::OUString::createFromAscii("vnd.sun.star.autorecovery:/doEmergencySave"       )
-#define RECOVERY_CMD_DO_RECOVERY                        ::rtl::OUString::createFromAscii("vnd.sun.star.autorecovery:/doAutoRecovery"        )
-#define RECOVERY_CMD_DO_CRASHREPORT                     ::rtl::OUString::createFromAscii("vnd.sun.star.autorecovery:/doCrashReport"         )
-#define RECOVERY_CMD_DO_ENTRY_BACKUP                    ::rtl::OUString::createFromAscii("vnd.sun.star.autorecovery:/doEntryBackup"         )
-#define RECOVERY_CMD_DO_ENTRY_CLEANUP                   ::rtl::OUString::createFromAscii("vnd.sun.star.autorecovery:/doEntryCleanUp"        )
-
-#define SERVICENAME_PROGRESSFACTORY                     ::rtl::OUString::createFromAscii("com.sun.star.task.StatusIndicatorFactory")
-#define SERVICENAME_URLTRANSFORMER                      ::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer"        )
-#define SERVICENAME_RECOVERYCORE                        ::rtl::OUString::createFromAscii("com.sun.star.frame.AutoRecovery"         )
-#define SERVICENAME_FOLDERPICKER                        ::rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.FolderPicker"    )
-#define SERVICENAME_DESKTOP                             ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"              )
-
-#define PROP_PARENTWINDOW                               ::rtl::OUString::createFromAscii("Window"           )
-#define PROP_STATUSINDICATOR                            ::rtl::OUString::createFromAscii("StatusIndicator"  )
-#define PROP_DISPATCHASYNCHRON                          ::rtl::OUString::createFromAscii("DispatchAsynchron")
-#define PROP_SAVEPATH                                   ::rtl::OUString::createFromAscii("SavePath"         )
-#define PROP_ENTRYID                                    ::rtl::OUString::createFromAscii("EntryID"          )
-#define PROP_ALLOWPARENTSHOW                            ::rtl::OUString::createFromAscii("AllowParentShow"  )
-
-#define STATEPROP_ID                                    ::rtl::OUString::createFromAscii("ID"           )
-#define STATEPROP_STATE                                 ::rtl::OUString::createFromAscii("DocumentState")
-#define STATEPROP_ORGURL                                ::rtl::OUString::createFromAscii("OriginalURL"  )
-#define STATEPROP_TEMPURL                               ::rtl::OUString::createFromAscii("TempURL"      )
-#define STATEPROP_FACTORYURL                            ::rtl::OUString::createFromAscii("FactoryURL"   )
-#define STATEPROP_TEMPLATEURL                           ::rtl::OUString::createFromAscii("TemplateURL"  )
-#define STATEPROP_TITLE                                 ::rtl::OUString::createFromAscii("Title"        )
-#define STATEPROP_MODULE                                ::rtl::OUString::createFromAscii("Module"       )
-
-#define RECOVERY_OPERATIONSTATE_START                   ::rtl::OUString::createFromAscii("start" )
-#define RECOVERY_OPERATIONSTATE_STOP                    ::rtl::OUString::createFromAscii("stop"  )
-#define RECOVERY_OPERATIONSTATE_UPDATE                  ::rtl::OUString::createFromAscii("update")
+#define RECOVERY_CMDPART_PROTOCOL                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:"))
+
+#define RECOVERY_CMDPART_DO_PREPARE_EMERGENCY_SAVE  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/doPrepareEmergencySave"  ))
+#define RECOVERY_CMDPART_DO_EMERGENCY_SAVE          rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/doEmergencySave"         ))
+#define RECOVERY_CMDPART_DO_RECOVERY                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/doAutoRecovery"          ))
+#define RECOVERY_CMDPART_DO_CRASHREPORT             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/doCrashReport"           ))
+#define RECOVERY_CMDPART_DO_ENTRY_BACKUP            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/doEntryBackup"           ))
+#define RECOVERY_CMDPART_DO_ENTRY_CLEANUP           rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/doEntryCleanUp"          ))
+
+#define RECOVERY_CMD_DO_PREPARE_EMERGENCY_SAVE      rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doPrepareEmergencySave"))
+#define RECOVERY_CMD_DO_EMERGENCY_SAVE              rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doEmergencySave"       ))
+#define RECOVERY_CMD_DO_RECOVERY                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doAutoRecovery"        ))
+#define RECOVERY_CMD_DO_CRASHREPORT                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doCrashReport"         ))
+#define RECOVERY_CMD_DO_ENTRY_BACKUP                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doEntryBackup"         ))
+#define RECOVERY_CMD_DO_ENTRY_CLEANUP               rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doEntryCleanUp"        ))
+
+#define SERVICENAME_PROGRESSFACTORY                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.StatusIndicatorFactory"))
+#define SERVICENAME_URLTRANSFORMER                  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer"        ))
+#define SERVICENAME_RECOVERYCORE                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.AutoRecovery"         ))
+#define SERVICENAME_FOLDERPICKER                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FolderPicker"    ))
+#define SERVICENAME_DESKTOP                         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop"              ))
+
+#define PROP_PARENTWINDOW                           rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Window"           ))
+#define PROP_STATUSINDICATOR                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "StatusIndicator"  ))
+#define PROP_DISPATCHASYNCHRON                      rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DispatchAsynchron"))
+#define PROP_SAVEPATH                               rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SavePath"         ))
+#define PROP_ENTRYID                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "EntryID"          ))
+#define PROP_ALLOWPARENTSHOW                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AllowParentShow"  ))
+
+#define STATEPROP_ID                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ID"           ))
+#define STATEPROP_STATE                             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DocumentState"))
+#define STATEPROP_ORGURL                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OriginalURL"  ))
+#define STATEPROP_TEMPURL                           rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "TempURL"      ))
+#define STATEPROP_FACTORYURL                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FactoryURL"   ))
+#define STATEPROP_TEMPLATEURL                       rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "TemplateURL"  ))
+#define STATEPROP_TITLE                             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Title"        ))
+#define STATEPROP_MODULE                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Module"       ))
+
+#define RECOVERY_OPERATIONSTATE_START               rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "start" ))
+#define RECOVERY_OPERATIONSTATE_STOP                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stop"  ))
+#define RECOVERY_OPERATIONSTATE_UPDATE              rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "update"))
 
 #define DLG_RET_UNKNOWN                                  -1
 #define DLG_RET_OK                                        1
@@ -181,9 +181,6 @@ struct TURLInfo
     /// standard icon
     Image StandardImage;
 
-    /// high contrast icon
-    Image HCImage;
-
     public:
 
     TURLInfo()
@@ -609,9 +606,6 @@ class RecovDocList : public SvxSimpleTable
         Image  m_aGreenCheckImg;
         Image  m_aYellowCheckImg;
         Image  m_aRedCrossImg;
-        Image  m_aGreenCheckImgHC;
-        Image  m_aYellowCheckImgHC;
-        Image  m_aRedCrossImgHC;
 
         String m_aSuccessRecovStr;
         String m_aOrigDocRecovStr;
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 7e3cf4042958..6b65aaf49836 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -157,7 +157,6 @@ private:
 
 protected:
     Image               m_aNormalImage;
-    Image               m_aHCImage;
     ::rtl::OUString     aText;
 
     FmEntryDataList*    pChildList;
@@ -178,7 +177,6 @@ public:
     void    SetParent( FmEntryData* pParentData ){ pParent = pParentData; }
 
     const Image&    GetNormalImage() const { return m_aNormalImage; }
-    const Image&    GetHCImage() const { return m_aHCImage; }
 
     ::rtl::OUString          GetText() const { return aText; }
     FmEntryData*    GetParent() const { return pParent; }
@@ -249,7 +247,6 @@ public:
     FmFormData(
         const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm,
         const ImageList& _rNormalImages,
-        const ImageList& _rHCImages,
         FmFormData* _pParent = NULL
     );
 
@@ -284,7 +281,6 @@ public:
     FmControlData(
         const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& _rxComponent,
         const ImageList& _rNormalImages,
-        const ImageList& _rHCImages,
         FmFormData* _pParent
     );
     FmControlData( const FmControlData& rControlData );
@@ -296,8 +292,7 @@ public:
 
     void ModelReplaced(
         const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& _rxNew,
-        const ImageList& _rNormalImages,
-        const ImageList& _rHCImages
+        const ImageList& _rNormalImages
     );
 };
 
@@ -362,7 +357,6 @@ namespace svxform
         OFormComponentObserver*     m_pPropChangeList;
 
         ImageList                   m_aNormalImages;
-        ImageList                   m_aHCImages;
 
         void UpdateContent( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xForms );
         FmControlData* CreateControlData( ::com::sun::star::form::XFormComponent* pFormComponent );
@@ -384,7 +378,7 @@ namespace svxform
             // Rueckgabe sal_True, wenn das Objekt eine FormComponent ist (oder rekursiv nur aus solchen besteht)
 
     public:
-        NavigatorTreeModel( const ImageList& _rNormalImages, const ImageList& _rHCImages );
+        NavigatorTreeModel( const ImageList& _rNormalImages );
         virtual ~NavigatorTreeModel();
 
         void FillBranch( FmFormData* pParentData );
@@ -432,7 +426,6 @@ namespace svxform
         ListBoxEntrySet         m_aCutEntries;
         // die Images, die ich brauche (und an FormDatas und EntryDatas weiterreiche)
         ImageList           m_aNavigatorImages;
-        ImageList           m_aNavigatorImagesHC;
 
         ::svxform::OControlExchangeHelper   m_aControlExchange;
 
diff --git a/svx/source/inc/fmresids.hrc b/svx/source/inc/fmresids.hrc
index f6843801e522..24637babb057 100644
--- a/svx/source/inc/fmresids.hrc
+++ b/svx/source/inc/fmresids.hrc
@@ -35,7 +35,6 @@
 
 // ImageList-Id's -----------------------------------------------------------
 #define RID_SVXIMGLIST_FMEXPL                       (RID_FORMS_START + 0)
-#define RID_SVXIMGLIST_FMEXPL_HC                    (RID_FORMS_START + 2)
 
 // Image-Id's -----------------------------------------------------------
 //#define SID_FMSLOTS_START                          (SID_SVX_START + 592)  -> svxids.hrc
diff --git a/svx/source/intro/intro_tmpl.hrc b/svx/source/intro/intro_tmpl.hrc
index e49b27cb29e8..f9d3e331bf99 100644
--- a/svx/source/intro/intro_tmpl.hrc
+++ b/svx/source/intro/intro_tmpl.hrc
@@ -28,7 +28,6 @@
 #include <svx/svxids.hrc>
 
 #define RID_IMGLIST_TREEOPT             (RID_OFA_START + 174)
-#define RID_IMGLIST_TREEOPT_HC          (RID_OFA_START + 175)
 
 #define OOO_CONTRIBUTOR_LIST \
 ItemList = \
diff --git a/svx/source/intro/iso.src b/svx/source/intro/iso.src
index ecadfd9d4c6a..b224ea40b760 100644
--- a/svx/source/intro/iso.src
+++ b/svx/source/intro/iso.src
@@ -129,12 +129,6 @@ ImageList RID_IMGLIST_TREEOPT
     MASK_COL
     IMGLST_IDLST
 };
-ImageList RID_IMGLIST_TREEOPT_HC
-{
-    Prefix = "trh";
-    MASK_COL
-    IMGLST_IDLST
-};
 
 #define MASK_COL2   MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; } ;
 #define X_IMAGE_LIST \
@@ -173,52 +167,4 @@ ImageList RID_SVTOOLS_IMAGELIST_SMALL
     X_IMAGE_LIST
 };
 
-ImageList RID_SVTOOLS_IMAGELIST_BIG_HIGHCONTRAST
-{
-    Prefix = "lxh";
-    MASK_COL2
-    X_IMAGE_LIST
-};
-
-ImageList RID_SVTOOLS_IMAGELIST_SMALL_HIGHCONTRAST
-{
-    Prefix = "sxh";
-    MASK_COL2
-    X_IMAGE_LIST
-};
-
 // ******************************************************************* EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svx/source/intro/ooo.src b/svx/source/intro/ooo.src
index a02ceb7ff055..58356a40ac53 100644
--- a/svx/source/intro/ooo.src
+++ b/svx/source/intro/ooo.src
@@ -162,20 +162,6 @@ ImageList RID_SVTOOLS_IMAGELIST_SMALL
     X_IMAGE_LIST
 };
 
-ImageList RID_SVTOOLS_IMAGELIST_BIG_HIGHCONTRAST
-{
-    Prefix = "lxh";
-    MASK_COL2
-    X_IMAGE_LIST
-};
-
-ImageList RID_SVTOOLS_IMAGELIST_SMALL_HIGHCONTRAST
-{
-    Prefix = "sxh";
-    MASK_COL2
-    X_IMAGE_LIST
-};
-
 #define MASK_COL    MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; } ;
 #define IMGLST_IDLST \
     IdList = {                      \
@@ -202,11 +188,3 @@ ImageList RID_IMGLIST_TREEOPT
     MASK_COL
     IMGLST_IDLST
 };
-
-ImageList RID_IMGLIST_TREEOPT_HC
-{
-    Prefix = "trh";
-    MASK_COL
-    IMGLST_IDLST
-};
-
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx
index de0f95d447ce..8b9252c66c37 100644
--- a/svx/source/items/hlnkitem.cxx
+++ b/svx/source/items/hlnkitem.cxx
@@ -45,10 +45,6 @@ TYPEINIT1_FACTORY(SvxHyperlinkItem, SfxPoolItem, new SvxHyperlinkItem(0));
 
 // class SvxHyperlinkItem ------------------------------------------------
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 #define HYPERLINKFF_MARKER  0x599401FE
 
 SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
@@ -130,10 +126,6 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/
     return rStrm;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 SfxPoolItem*    SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVersion*/ ) const
 {
     SvxHyperlinkItem* pNew = new SvxHyperlinkItem( Which() );
@@ -208,10 +200,6 @@ SfxPoolItem*    SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer
     return pNew;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 SvxHyperlinkItem::SvxHyperlinkItem( const SvxHyperlinkItem& rHyperlinkItem ):
             SfxPoolItem(rHyperlinkItem)
 {
@@ -229,10 +217,6 @@ SvxHyperlinkItem::SvxHyperlinkItem( const SvxHyperlinkItem& rHyperlinkItem ):
 
 };
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 SvxHyperlinkItem::SvxHyperlinkItem( sal_uInt16 _nWhich, String& rName, String& rURL,
                                     String& rTarget, String& rIntName, SvxLinkInsertMode eTyp,
                                     sal_uInt16 nEvents, SvxMacroTableDtor *pMacroTbl ):
@@ -250,19 +234,11 @@ SvxHyperlinkItem::SvxHyperlinkItem( sal_uInt16 _nWhich, String& rName, String& r
         pMacroTable=NULL;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 SfxPoolItem* SvxHyperlinkItem::Clone( SfxItemPool* ) const
 {
     return new SvxHyperlinkItem( *this );
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 int SvxHyperlinkItem::operator==( const SfxPoolItem& rAttr ) const
 {
     DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unterschiedliche Typen" );
@@ -305,11 +281,6 @@ int SvxHyperlinkItem::operator==( const SfxPoolItem& rAttr ) const
     return sal_True;
 }
 
-
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 void SvxHyperlinkItem::SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro )
 {
     if( nEvent < EVENT_SFX_START )
@@ -341,10 +312,6 @@ void SvxHyperlinkItem::SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro )
         pMacroTable->Insert( nEvent, new SvxMacro( rMacro ) );
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 void SvxHyperlinkItem::SetMacroTable( const SvxMacroTableDtor& rTbl )
 {
     if ( pMacroTable )
diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx
index 2b6a94ef9bb3..689211b9b71f 100644
--- a/svx/source/mnuctrls/SmartTagCtl.cxx
+++ b/svx/source/mnuctrls/SmartTagCtl.cxx
@@ -42,8 +42,6 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-#define C2U(cChar) rtl::OUString::createFromAscii(cChar)
-
 // STATIC DATA -----------------------------------------------------------
 
 SFX_IMPL_MENU_CONTROL(SvxSmartTagsControl, SvxSmartTagItem);
@@ -118,7 +116,7 @@ void SvxSmartTagsControl::FillMenu()
         pSbMenu->SetSelectHdl( LINK( this, SvxSmartTagsControl, MenuSelect ) );
 
         // sub-menu starts with smart tag caption and separator
-        const rtl::OUString aSmartTagCaption2 = aSmartTagCaption + C2U(": ") + aRangeText;
+        const rtl::OUString aSmartTagCaption2 = aSmartTagCaption + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": ")) + aRangeText;
         nSubMenuPos = 0;
         pSbMenu->InsertItem( nMenuId++, aSmartTagCaption2, MIB_NOSELECT, nSubMenuPos++ );
         pSbMenu->InsertSeparator( nSubMenuPos++ );
diff --git a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
index 8b8858131a12..6da5c2b90b29 100644
--- a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
@@ -69,8 +69,7 @@ namespace sdr
         {
         }
 
-        drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrOle2Obj::createPrimitive2DSequenceWithParameters(
-            bool bHighContrast) const
+        drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrOle2Obj::createPrimitive2DSequenceWithParameters() const
         {
             // take unrotated snap rect (direct model data) for position and size
             const Rectangle& rRectangle = GetOle2Obj().GetGeoRect();
@@ -102,9 +101,8 @@ namespace sdr
 
                     // #i104867# add GraphicVersion number to be able to check for
                     // content change in the primitive later
-                    GetOle2Obj().getEmbeddedObjectRef().getGraphicVersion(),
-
-                    bHighContrast));
+                    GetOle2Obj().getEmbeddedObjectRef().getGraphicVersion()
+                ));
 
             // create primitive. Use Ole2 primitive here. Prepare attribute settings, will
             // be used soon anyways. Always create primitives to allow the decomposition of
@@ -121,8 +119,7 @@ namespace sdr
 
         drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrOle2Obj::createViewIndependentPrimitive2DSequence() const
         {
-            // do as if no HC and call standard creator
-            return createPrimitive2DSequenceWithParameters(false);
+            return createPrimitive2DSequenceWithParameters();
         }
     } // end of namespace contact
 } // end of namespace sdr
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
index 775bed402e15..fbd48516d714 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
@@ -195,7 +195,7 @@ namespace sdr
 
                     // create OLE primitive stuff directly at VC with HC as parameter
                     const ViewContactOfSdrOle2Obj& rVC = static_cast< const ViewContactOfSdrOle2Obj& >(GetViewContact());
-                    xRetval = rVC.createPrimitive2DSequenceWithParameters(GetObjectContact().isDrawModeHighContrast());
+                    xRetval = rVC.createPrimitive2DSequenceWithParameters();
                 }
 
                 if(bIsOutplaceActive)
diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
index 093ac07977e5..b000dbe6c0fc 100644
--- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
@@ -53,9 +53,7 @@ namespace drawinglayer
 
             if(pSource)
             {
-                Graphic* pOLEGraphic = (getHighContrast())
-                    ? pSource->getEmbeddedObjectRef().GetHCGraphic()
-                    : pSource->GetGraphic();
+                Graphic* pOLEGraphic = pSource->GetGraphic();
 
                 if(pOLEGraphic)
                 {
@@ -152,19 +150,18 @@ namespace drawinglayer
         SdrOleContentPrimitive2D::SdrOleContentPrimitive2D(
             const SdrOle2Obj& rSdrOle2Obj,
             const basegfx::B2DHomMatrix& rObjectTransform,
-            sal_uInt32 nGraphicVersion,
-            bool bHighContrast)
+            sal_uInt32 nGraphicVersion
+        )
         :   BufferedDecompositionPrimitive2D(),
             mpSdrOle2Obj(const_cast< SdrOle2Obj* >(&rSdrOle2Obj)),
             maObjectTransform(rObjectTransform),
-            mnGraphicVersion(nGraphicVersion),
-            mbHighContrast(bHighContrast)
+            mnGraphicVersion(nGraphicVersion)
         {
         }
 
         bool SdrOleContentPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const
         {
-            if(BufferedDecompositionPrimitive2D::operator==(rPrimitive))
+            if( BufferedDecompositionPrimitive2D::operator==(rPrimitive) )
             {
                 const SdrOleContentPrimitive2D& rCompare = (SdrOleContentPrimitive2D&)rPrimitive;
                 const bool bBothNot(!mpSdrOle2Obj.is() && !rCompare.mpSdrOle2Obj.is());
@@ -177,8 +174,7 @@ namespace drawinglayer
                     // #i104867# to find out if the Graphic content of the
                     // OLE has changed, use GraphicVersion number
                     && getGraphicVersion() == rCompare.getGraphicVersion()
-
-                    && getHighContrast() == rCompare.getHighContrast());
+                );
             }
 
             return false;
diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
index 675ddd3fe8e0..934a3bf3562f 100644
--- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
@@ -59,7 +59,7 @@ namespace
         {
             try
             {
-                const uno::Any aNumber(xSet->getPropertyValue(::rtl::OUString::createFromAscii("Number")));
+                const uno::Any aNumber(xSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Number"))));
                 aNumber >>= nRetval;
             }
             catch(const uno::Exception&)
diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx
index 74ed3831ab84..6f510e3d042d 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -185,7 +185,7 @@ namespace sdr
                 while(aIter != aEnd)
                 {
                     PostItemChange(*aIter);
-                    aIter++;
+                    ++aIter;
                 }
 
                 ItemSetChanged(aSet);
diff --git a/svx/source/src/app.hrc b/svx/source/src/app.hrc
index d2aaf9d34c30..929ee07b7504 100644
--- a/svx/source/src/app.hrc
+++ b/svx/source/src/app.hrc
@@ -248,10 +248,9 @@
 #define RID_BMP_DB_RELATIONS_S          (RID_OFA_START + 172)
 #define RID_BMP_DB_RELATIONS_L          (RID_OFA_START + 173)
 #define RID_IMGLIST_TREEOPT             (RID_OFA_START + 174)
-#define RID_IMGLIST_TREEOPT_HC          (RID_OFA_START + 175)
 
-                                        // 12 und 13 nicht benutzen!!!
-// ..._BEGIN kann nochmal benutzt werden, nur zum Iterieren
+// don't use 12 and 13 !!!
+// ..._BEGIN can be used again. Just for iteration here
 #define RID_STR_PRIO_BEGIN              (RID_OFA_START + 17)
 #define RID_STR_PRIO_HIGHEST            (RID_OFA_START + 18)
 #define RID_STR_PRIO_HIGH               (RID_OFA_START + 19)
diff --git a/svx/source/src/app.src b/svx/source/src/app.src
index 934fbd76a86f..7086b9223821 100644
--- a/svx/source/src/app.src
+++ b/svx/source/src/app.src
@@ -63,20 +63,6 @@ ImageList RID_DEFAULTIMAGELIST_LC
     IMAGE_ID_LIST
 };
 
-ImageList RID_DEFAULTIMAGELIST_SCH
-{
-    Prefix = "sch";
-    MASKCOLOR
-    IMAGE_ID_LIST
-};
-
-ImageList RID_DEFAULTIMAGELIST_LCH
-{
-    Prefix = "lch";
-    MASKCOLOR
-    IMAGE_ID_LIST
-};
-
 // Strings ---------------------------------------------------------------
 
 String RID_DESKTOP
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index 345845e3bc66..a2470b9a3bb5 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -145,7 +145,7 @@ void SvxModifyControl::DoubleClick()
         return;
 
     Sequence<PropertyValue> aArgs;
-    execute(OUString::createFromAscii(".uno:Save"), aArgs);
+    execute(OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Save")), aArgs);
 }
 
 ULONG SvxModifyControl::GetDefItemWidth(const StatusBar& rStb)
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index d63384a76f16..cd129d18576b 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -260,30 +260,6 @@ Image RID_SVXBMP_SIGNET_NOTVALIDATED
     };
     MaskColor = STD_MASKCOLOR;
 };
-Image RID_SVXBMP_SIGNET_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "signet_11x16_h.png" ;
-    };
-    MaskColor = STD_MASKCOLOR;
-};
-Image RID_SVXBMP_SIGNET_BROKEN_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "caution_11x16_h.png" ;
-    };
-    MaskColor = STD_MASKCOLOR;
-};
-Image RID_SVXBMP_SIGNET_NOTVALIDATED_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "notcertificate_16_h.png" ;
-    };
-    MaskColor = STD_MASKCOLOR;
-};
 
 
 Image RID_SVXBMP_SLIDERBUTTON
@@ -310,31 +286,6 @@ Image RID_SVXBMP_SLIDERINCREASE
     };
     MaskColor = STD_MASKCOLOR;
 };
-Image RID_SVXBMP_SLIDERBUTTON_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "navigationball_10_h.png" ;
-    };
-    MaskColor = STD_MASKCOLOR;
-};
-Image RID_SVXBMP_SLIDERDECREASE_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "slidezoomout_11_h.png" ;
-    };
-    MaskColor = STD_MASKCOLOR;
-};
-Image RID_SVXBMP_SLIDERINCREASE_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "slidezoomin_11_h.png" ;
-    };
-    MaskColor = STD_MASKCOLOR;
-};
-
 Image RID_SVXBMP_DOC_MODIFIED_YES
 {
     ImageBitmap = Bitmap
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index 16f1e56be1fd..eda2ddda5eec 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -67,17 +67,13 @@ struct XmlSecStatusBarControl::XmlSecStatusBarControl_Impl
 
 XmlSecStatusBarControl::XmlSecStatusBarControl( USHORT _nSlotId,  USHORT _nId, StatusBar& _rStb )
     :SfxStatusBarControl( _nSlotId, _nId, _rStb )
-
     ,mpImpl( new XmlSecStatusBarControl_Impl )
 {
     mpImpl->mnState = (UINT16)SIGNATURESTATE_UNKNOWN;
 
-    sal_Bool bHC = GetStatusBar().GetSettings().GetStyleSettings().GetHighContrastMode();
-    mpImpl->maImage = Image( SVX_RES( bHC ? RID_SVXBMP_SIGNET_H : RID_SVXBMP_SIGNET ) );
-    mpImpl->maImageBroken =
-        Image( SVX_RES( bHC ? RID_SVXBMP_SIGNET_BROKEN_H : RID_SVXBMP_SIGNET_BROKEN ) );
-    mpImpl->maImageNotValidated =
-        Image( SVX_RES( bHC ? RID_SVXBMP_SIGNET_NOTVALIDATED_H : RID_SVXBMP_SIGNET_NOTVALIDATED ) );
+    mpImpl->maImage             = Image( SVX_RES( RID_SVXBMP_SIGNET              ) );
+    mpImpl->maImageBroken       = Image( SVX_RES( RID_SVXBMP_SIGNET_BROKEN       ) );
+    mpImpl->maImageNotValidated = Image( SVX_RES( RID_SVXBMP_SIGNET_NOTVALIDATED ) );
 }
 
 XmlSecStatusBarControl::~XmlSecStatusBarControl()
@@ -97,7 +93,6 @@ void XmlSecStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, con
     }
     else if( pState->ISA( SfxUInt16Item ) )
     {
-//      mpImpl->mbSigned = ( ( SfxUInt16Item* ) pState )->GetValue() == 1 /* SIGNED*/ ;
         mpImpl->mnState = ( ( SfxUInt16Item* ) pState )->GetValue();
     }
     else
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx
index 25f74964441c..5b9298a0b1eb 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -182,10 +182,9 @@ SvxZoomSliderControl::SvxZoomSliderControl( USHORT _nSlotId,  USHORT _nId, Statu
     SfxStatusBarControl( _nSlotId, _nId, _rStb ),
     mpImpl( new SvxZoomSliderControl_Impl )
 {
-    const sal_Bool bHC = GetStatusBar().GetSettings().GetStyleSettings().GetHighContrastMode();
-    mpImpl->maSliderButton   = Image( SVX_RES( bHC ? RID_SVXBMP_SLIDERBUTTON_HC : RID_SVXBMP_SLIDERBUTTON ) );
-    mpImpl->maIncreaseButton = Image( SVX_RES( bHC ? RID_SVXBMP_SLIDERINCREASE_HC : RID_SVXBMP_SLIDERINCREASE ) );
-    mpImpl->maDecreaseButton = Image( SVX_RES( bHC ? RID_SVXBMP_SLIDERDECREASE_HC : RID_SVXBMP_SLIDERDECREASE ) );
+    mpImpl->maSliderButton   = Image( SVX_RES( RID_SVXBMP_SLIDERBUTTON   ) );
+    mpImpl->maIncreaseButton = Image( SVX_RES( RID_SVXBMP_SLIDERINCREASE ) );
+    mpImpl->maDecreaseButton = Image( SVX_RES( RID_SVXBMP_SLIDERDECREASE ) );
 }
 
 // -----------------------------------------------------------------------
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx
index 1f3c9c9eb761..bfc3d6665255 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -105,8 +105,8 @@ using namespace ::com::sun::star;
             uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
             if( xFactory.is() )
             {
-                const_cast< SdrPageWindow* >( this )->mxControlContainer = uno::Reference< awt::XControlContainer >(xFactory->createInstance(rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlContainer")), uno::UNO_QUERY);
-                uno::Reference< awt::XControlModel > xModel(xFactory->createInstance(rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlContainerModel")), uno::UNO_QUERY);
+                const_cast< SdrPageWindow* >( this )->mxControlContainer = uno::Reference< awt::XControlContainer >(xFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlContainer"))), uno::UNO_QUERY);
+                uno::Reference< awt::XControlModel > xModel(xFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlContainerModel"))), uno::UNO_QUERY);
                 uno::Reference< awt::XControl > xControl(mxControlContainer, uno::UNO_QUERY);
                 if (xControl.is())
                     xControl->setModel(xModel);
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 0b3a214f52f0..a21d05775045 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -1416,10 +1416,8 @@ SfxItemPresentation __EXPORT SdrTextAniAmountItem::GetPresentation(
 
     if(nValue < 0)
     {
-        sal_Char aText[] = "pixel";
-
         rText = UniString::CreateFromInt32(-nValue);
-        rText += UniString(aText, sizeof(aText-1));
+        rText += UniString(RTL_CONSTASCII_USTRINGPARAM("pixel"));
     }
     else
     {
@@ -2046,14 +2044,9 @@ XubString __EXPORT SdrMeasureUnitItem::GetValueTextByPos(USHORT nPos) const
     XubString aRetval;
 
     if((FieldUnit)nPos == FUNIT_NONE)
-    {
-        sal_Char aText[] = "default";
-        aRetval += UniString(aText, sizeof(aText-1));
-    }
+        aRetval += UniString(RTL_CONSTASCII_USTRINGPARAM("default"));
     else
-    {
         SdrFormatter::TakeUnitStr((FieldUnit)nPos, aRetval);
-    }
 
     return aRetval;
 }
@@ -2360,26 +2353,22 @@ XubString __EXPORT SdrGrafModeItem::GetValueTextByPos(UINT16 nPos) const
     {
         case 1:
         {
-            sal_Char aTextGreys[] = "Greys";
-            aStr += UniString(aTextGreys, sizeof(aTextGreys-1));
+            aStr += UniString(RTL_CONSTASCII_USTRINGPARAM("Greys"));
             break;
         }
         case 2:
         {
-            sal_Char aTextBlackWhite[] = "Black/White";
-            aStr += UniString(aTextBlackWhite, sizeof(aTextBlackWhite-1));
+            aStr += UniString(RTL_CONSTASCII_USTRINGPARAM("Black/White"));
             break;
         }
         case 3:
         {
-            sal_Char aTextWatermark[] = "Watermark";
-            aStr += UniString(aTextWatermark, sizeof(aTextWatermark-1));
+            aStr += UniString(RTL_CONSTASCII_USTRINGPARAM("Watermark"));
             break;
         }
         default:
         {
-            sal_Char aTextStandard[] = "Standard";
-            aStr += UniString(aTextStandard, sizeof(aTextStandard-1));
+            aStr += UniString(RTL_CONSTASCII_USTRINGPARAM("Standard"));
             break;
         }
     }
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index ea12345abe51..e7bc6010d280 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -286,12 +286,6 @@ SdrHdlBitmapSet& getModernSet()
     return *aModernSet.get();
 }
 
-SdrHdlBitmapSet& getHighContrastSet()
-{
-    static vcl::DeleteOnDeinit< SdrHdlBitmapSet > aHighContrastSet(new SdrHdlBitmapSet(SIP_SA_ACCESSIBILITY_MARKERS));
-    return *aHighContrastSet.get();
-}
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 SdrHdl::SdrHdl():
@@ -625,24 +619,16 @@ BitmapMarkerKind SdrHdl::GetNextBigger(BitmapMarkerKind eKnd) const
         case Rect_7x7:          eRetval = Rect_9x9;         break;
         case Rect_9x9:          eRetval = Rect_11x11;       break;
         case Rect_11x11:        eRetval = Rect_13x13;       break;
-        //case Rect_13x13:      eRetval = ; break;
 
         case Circ_7x7:          eRetval = Circ_9x9;         break;
         case Circ_9x9:          eRetval = Circ_11x11;       break;
-        //case Circ_11x11:      eRetval = ; break;
 
         case Elli_7x9:          eRetval = Elli_9x11;        break;
-        //case Elli_9x11:           eRetval = ; break;
 
         case Elli_9x7:          eRetval = Elli_11x9;        break;
-        //case Elli_11x9:           eRetval = ; break;
 
         case RectPlus_7x7:      eRetval = RectPlus_9x9;     break;
         case RectPlus_9x9:      eRetval = RectPlus_11x11;   break;
-        //case RectPlus_11x11:  eRetval = ; break;
-
-        //case Crosshair:           eRetval = ; break;
-        //case Glue:                eRetval = ; break;
 
         // #98388# let anchor blink with it's pressed state
         case Anchor:            eRetval = AnchorPressed;    break;
@@ -657,22 +643,15 @@ BitmapMarkerKind SdrHdl::GetNextBigger(BitmapMarkerKind eKnd) const
 }
 
 // #101928#
-BitmapEx SdrHdl::ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd, sal_Bool bFine, sal_Bool bIsHighContrast)
+BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd, sal_Bool bFine )
 {
-    if(bIsHighContrast)
+    if(bFine)
     {
-        return getHighContrastSet().GetBitmapEx(eKindOfMarker, nInd);
+        return getModernSet().GetBitmapEx(eKindOfMarker, nInd);
     }
     else
     {
-        if(bFine)
-        {
-            return getModernSet().GetBitmapEx(eKindOfMarker, nInd);
-        }
-        else
-        {
-            return getSimpleSet().GetBitmapEx(eKindOfMarker, nInd);
-        }
+        return getSimpleSet().GetBitmapEx(eKindOfMarker, nInd);
     }
 }
 
@@ -682,8 +661,6 @@ BitmapEx SdrHdl::ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd,
 {
     ::sdr::overlay::OverlayObject* pRetval = 0L;
     sal_Bool bIsFineHdl(pHdlList->IsFineHdl());
-    const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
-    sal_Bool bIsHighContrast(rStyleSettings.GetHighContrastMode());
 
     // support bigger sizes
     sal_Bool bForceBiggerSize(sal_False);
@@ -693,17 +670,6 @@ BitmapEx SdrHdl::ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd,
         bForceBiggerSize = sal_True;
     }
 
-    // #101928# ...for high contrast, too.
-    if(!bForceBiggerSize && bIsHighContrast)
-    {
-        // #107925#
-        // ...but not for anchors, else they will not blink when activated
-        if(Anchor != eKindOfMarker && AnchorTR != eKindOfMarker)
-        {
-            bForceBiggerSize = sal_True;
-        }
-    }
-
     if(bForceBiggerSize)
     {
         eKindOfMarker = GetNextBigger(eKindOfMarker);
@@ -741,11 +707,12 @@ BitmapEx SdrHdl::ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd,
 
         // create animated hdl
         // #101928# use ImpGetBitmapEx(...) now
-        BitmapEx aBmpEx1 = ImpGetBitmapEx(eKindOfMarker, (sal_uInt16)eColIndex, bIsFineHdl, bIsHighContrast);
-        BitmapEx aBmpEx2 = ImpGetBitmapEx(eNextBigger, (sal_uInt16)eColIndex, bIsFineHdl, bIsHighContrast);
+        BitmapEx aBmpEx1 = ImpGetBitmapEx( eKindOfMarker, (sal_uInt16)eColIndex, bIsFineHdl );
+        BitmapEx aBmpEx2 = ImpGetBitmapEx( eNextBigger,   (sal_uInt16)eColIndex, bIsFineHdl );
 
         // #i53216# Use system cursor blink time. Use the unsigned value.
-        const sal_uInt32 nBlinkTime((sal_uInt32)Application::GetSettings().GetStyleSettings().GetCursorBlinkTime());
+        const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
+        const sal_uInt32 nBlinkTime((sal_uInt32)rStyleSettings.GetCursorBlinkTime());
 
         if(eKindOfMarker == Anchor || eKindOfMarker == AnchorPressed)
         {
@@ -773,7 +740,7 @@ BitmapEx SdrHdl::ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd,
     {
         // create normal handle
         // #101928# use ImpGetBitmapEx(...) now
-        BitmapEx aBmpEx = ImpGetBitmapEx(eKindOfMarker, (sal_uInt16)eColIndex, bIsFineHdl, bIsHighContrast);
+        BitmapEx aBmpEx = ImpGetBitmapEx(eKindOfMarker, (sal_uInt16)eColIndex, bIsFineHdl );
 
         if(eKindOfMarker == Anchor || eKindOfMarker == AnchorPressed)
         {
@@ -2277,16 +2244,9 @@ SdrCropHdl::SdrCropHdl(const Point& rPnt, SdrHdlKind eNewKind)
 
 // --------------------------------------------------------------------
 
-BitmapEx SdrCropHdl::GetHandlesBitmap( bool bIsFineHdl, bool bIsHighContrast )
+BitmapEx SdrCropHdl::GetHandlesBitmap( bool bIsFineHdl )
 {
-    if( bIsHighContrast )
-    {
-        static BitmapEx* pHighContrastBitmap = 0;
-        if( pHighContrastBitmap == 0 )
-            pHighContrastBitmap = new BitmapEx(ResId(SIP_SA_ACCESSIBILITY_CROP_MARKERS, *ImpGetResMgr()));
-        return *pHighContrastBitmap;
-    }
-    else if( bIsFineHdl )
+    if( bIsFineHdl )
     {
         static BitmapEx* pModernBitmap = 0;
         if( pModernBitmap == 0 )
@@ -2358,12 +2318,9 @@ void SdrCropHdl::CreateB2dIAObject()
     {
         sal_Bool bIsFineHdl(pHdlList->IsFineHdl());
         const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
-        sal_Bool bIsHighContrast(rStyleSettings.GetHighContrastMode());
         int nHdlSize = pHdlList->GetHdlSize();
-        if( bIsHighContrast )
-            nHdlSize = 4;
 
-        const BitmapEx aHandlesBitmap( GetHandlesBitmap( bIsFineHdl, bIsHighContrast ) );
+        const BitmapEx aHandlesBitmap( GetHandlesBitmap( bIsFineHdl ) );
         BitmapEx aBmpEx1( GetBitmapForHandle( aHandlesBitmap, nHdlSize ) );
 
         for(sal_uInt32 b(0L); b < pPageView->PageWindowCount(); b++)
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index 35d079574651..28db8a8a4e2e 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -243,8 +243,7 @@ SdrLayerAdmin::SdrLayerAdmin(SdrLayerAdmin* pNewParent):
     aLSets(1024,16,16),
     pModel(NULL)
 {
-    sal_Char aTextControls[] = "Controls";
-    aControlLayerName = String(aTextControls, sizeof(aTextControls-1));
+    aControlLayerName = String(RTL_CONSTASCII_USTRINGPARAM("Controls"));
     pParent=pNewParent;
 }
 
@@ -254,8 +253,7 @@ SdrLayerAdmin::SdrLayerAdmin(const SdrLayerAdmin& rSrcLayerAdmin):
     pParent(NULL),
     pModel(NULL)
 {
-    sal_Char aTextControls[] = "Controls";
-    aControlLayerName = String(aTextControls, sizeof(aTextControls-1));
+    aControlLayerName = String(RTL_CONSTASCII_USTRINGPARAM("Controls"));
     *this = rSrcLayerAdmin;
 }
 
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index bc6e50efe26f..9d76fa0c8899 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1223,20 +1223,17 @@ void SdrModel::TakeUnitStr(FieldUnit eUnit, XubString& rStr)
         }
         case FUNIT_100TH_MM:
         {
-            sal_Char aText[] = "/100mm";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("/100mm"));
             break;
         }
         case FUNIT_MM     :
         {
-            sal_Char aText[] = "mm";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("mm"));
             break;
         }
         case FUNIT_CM     :
         {
-            sal_Char aText[] = "cm";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("cm"));
             break;
         }
         case FUNIT_M      :
@@ -1247,26 +1244,22 @@ void SdrModel::TakeUnitStr(FieldUnit eUnit, XubString& rStr)
         }
         case FUNIT_KM     :
         {
-            sal_Char aText[] = "km";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("km"));
             break;
         }
         case FUNIT_TWIP   :
         {
-            sal_Char aText[] = "twip";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("twip"));
             break;
         }
         case FUNIT_POINT  :
         {
-            sal_Char aText[] = "pt";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("pt"));
             break;
         }
         case FUNIT_PICA   :
         {
-            sal_Char aText[] = "pica";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("pica"));
             break;
         }
         case FUNIT_INCH   :
@@ -1277,14 +1270,12 @@ void SdrModel::TakeUnitStr(FieldUnit eUnit, XubString& rStr)
         }
         case FUNIT_FOOT   :
         {
-            sal_Char aText[] = "ft";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("ft"));
             break;
         }
         case FUNIT_MILE   :
         {
-            sal_Char aText[] = "mile(s)";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("mile(s)"));
             break;
         }
         case FUNIT_PERCENT:
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 67dc2e3a5c61..73ba5a5ee9c1 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -359,7 +359,7 @@ Reference< XCustomShapeEngine > SdrObjCustomShape::GetCustomShapeEngine( const S
         {
             Sequence< Any > aArgument( 1 );
             Sequence< PropertyValue > aPropValues( 1 );
-            aPropValues[ 0 ].Name = rtl::OUString::createFromAscii( "CustomShape" );
+            aPropValues[ 0 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CustomShape"));
             aPropValues[ 0 ].Value <<= aXShape;
             aArgument[ 0 ] <<= aPropValues;
             Reference< XInterface > xInterface( xFactory->createInstanceWithArguments( aEngine, aArgument ) );
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 7d0c90b73c9d..4fba6c987d4d 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -712,8 +712,7 @@ void SdrObject::SetName(const String& rStr)
 
     if(pPlusData && pPlusData->aObjName != rStr)
     {
-        // --> OD 2009-07-09 #i73249#
-        // Undo/Redo for setting object's name
+        // Undo/Redo for setting object's name (#i73249#)
         bool bUndo( false );
         if ( GetModel() && GetModel()->IsUndoEnabled() )
         {
@@ -727,14 +726,12 @@ void SdrObject::SetName(const String& rStr)
             GetModel()->BegUndo( pUndoAction->GetComment() );
             GetModel()->AddUndo( pUndoAction );
         }
-        // <--
         pPlusData->aObjName = rStr;
-        // --> OD 2009-07-09 #i73249#
+        // Undo/Redo for setting object's name (#i73249#)
         if ( bUndo )
         {
             GetModel()->EndUndo();
         }
-        // <--
         SetChanged();
         BroadcastObjectChange();
     }
@@ -759,8 +756,7 @@ void SdrObject::SetTitle(const String& rStr)
 
     if(pPlusData && pPlusData->aObjTitle != rStr)
     {
-        // --> OD 2009-07-13 #i73249#
-        // Undo/Redo for setting object's title
+        // Undo/Redo for setting object's title (#i73249#)
         bool bUndo( false );
         if ( GetModel() && GetModel()->IsUndoEnabled() )
         {
@@ -774,14 +770,12 @@ void SdrObject::SetTitle(const String& rStr)
             GetModel()->BegUndo( pUndoAction->GetComment() );
             GetModel()->AddUndo( pUndoAction );
         }
-        // <--
         pPlusData->aObjTitle = rStr;
-        // --> OD 2009-07-13 #i73249#
+        // Undo/Redo for setting object's title (#i73249#)
         if ( bUndo )
         {
             GetModel()->EndUndo();
         }
-        // <--
         SetChanged();
         BroadcastObjectChange();
     }
@@ -806,8 +800,7 @@ void SdrObject::SetDescription(const String& rStr)
 
     if(pPlusData && pPlusData->aObjDescription != rStr)
     {
-        // --> OD 2009-07-13 #i73249#
-        // Undo/Redo for setting object's description
+        // Undo/Redo for setting object's description (#i73249#)
         bool bUndo( false );
         if ( GetModel() && GetModel()->IsUndoEnabled() )
         {
@@ -821,14 +814,12 @@ void SdrObject::SetDescription(const String& rStr)
             GetModel()->BegUndo( pUndoAction->GetComment() );
             GetModel()->AddUndo( pUndoAction );
         }
-        // <--
         pPlusData->aObjDescription = rStr;
-        // --> OD 2009-07-13 #i73249#
+        // Undo/Redo for setting object's description (#i73249#)
         if ( bUndo )
         {
             GetModel()->EndUndo();
         }
-        // <--
         SetChanged();
         BroadcastObjectChange();
     }
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 2aa8a88e9cba..13b37db6f4bb 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -272,22 +272,19 @@ SdrObjList* SdrObjGroup::GetSubList() const
 
 const Rectangle& SdrObjGroup::GetCurrentBoundRect() const
 {
-    // --> OD 2007-02-01 #144962#
-    // <aOutRect> has to contain the bounding rectangle
+    // <aOutRect> has to contain the bounding rectangle (#144962#)
     if ( pSub->GetObjCount()!=0 )
     {
         const_cast<SdrObjGroup*>(this)->aOutRect = pSub->GetAllObjBoundRect();
     }
 
     return aOutRect;
-    // <--
 }
 
 
 const Rectangle& SdrObjGroup::GetSnapRect() const
 {
-    // --> OD 2007-02-01 #144962#
-    // <aOutRect> has to contain the bounding rectangle
+    // <aOutRect> has to contain the bounding rectangle (#144962#)
     if ( pSub->GetObjCount()!=0 )
     {
         return pSub->GetAllObjSnapRect();
@@ -296,7 +293,6 @@ const Rectangle& SdrObjGroup::GetSnapRect() const
     {
         return aOutRect;
     }
-    // <--
 }
 
 void SdrObjGroup::operator=(const SdrObject& rObj)
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 32bab5888d41..1aa14d435f0c 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -463,7 +463,7 @@ uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL SdrLightEmbed
     uno::Reference < beans::XPropertySet > xFrame( lcl_getFrame_throw(mpObj));
     try
     {
-        xMan.set(xFrame->getPropertyValue( ::rtl::OUString::createFromAscii("LayoutManager") ),uno::UNO_QUERY);
+        xMan.set(xFrame->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) ),uno::UNO_QUERY);
     }
     catch ( uno::Exception& )
     {
@@ -1492,11 +1492,6 @@ SdrObject* SdrOle2Obj::getFullDragClone() const
     Graphic* pOLEGraphic = GetGraphic();
     SdrObject* pClone = 0;
 
-    if(Application::GetSettings().GetStyleSettings().GetHighContrastMode())
-    {
-        pOLEGraphic = getEmbeddedObjectRef().GetHCGraphic();
-    }
-
     if(pOLEGraphic)
     {
         pClone = new SdrGrafObj(*pOLEGraphic, GetSnapRect());
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index 3506bafae896..cd4b9e4bef32 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -274,7 +274,7 @@ namespace
         {
             // prepare BreakIterator
             Reference < XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
-            Reference < XInterface > xInterface = xMSF->createInstance(::rtl::OUString::createFromAscii("com.sun.star.i18n.BreakIterator"));
+            Reference < XInterface > xInterface = xMSF->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")));
 
             if(xInterface.is())
             {
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index d891b4fb9625..c74cae3dcb5c 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -344,21 +344,21 @@ void SdrUnoObj::operator = (const SdrObject& rObj)
         if ( xObj.is() && xFactory.is() )
         {
             // creating a pipe
-            uno::Reference< io::XOutputStream > xOutPipe(xFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.io.Pipe")), uno::UNO_QUERY);
+            uno::Reference< io::XOutputStream > xOutPipe(xFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe"))), uno::UNO_QUERY);
             uno::Reference< io::XInputStream > xInPipe(xOutPipe, uno::UNO_QUERY);
 
             // creating the mark streams
-            uno::Reference< io::XInputStream > xMarkIn(xFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.io.MarkableInputStream")), uno::UNO_QUERY);
+            uno::Reference< io::XInputStream > xMarkIn(xFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.MarkableInputStream"))), uno::UNO_QUERY);
             uno::Reference< io::XActiveDataSink > xMarkSink(xMarkIn, uno::UNO_QUERY);
 
-            uno::Reference< io::XOutputStream > xMarkOut(xFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.io.MarkableOutputStream")), uno::UNO_QUERY);
+            uno::Reference< io::XOutputStream > xMarkOut(xFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.MarkableOutputStream"))), uno::UNO_QUERY);
             uno::Reference< io::XActiveDataSource > xMarkSource(xMarkOut, uno::UNO_QUERY);
 
             // connect mark and sink
-            uno::Reference< io::XActiveDataSink > xSink(xFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.io.ObjectInputStream")), uno::UNO_QUERY);
+            uno::Reference< io::XActiveDataSink > xSink(xFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.ObjectInputStream"))), uno::UNO_QUERY);
 
             // connect mark and source
-            uno::Reference< io::XActiveDataSource > xSource(xFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.io.ObjectOutputStream")), uno::UNO_QUERY);
+            uno::Reference< io::XActiveDataSource > xSource(xFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.ObjectOutputStream"))), uno::UNO_QUERY);
 
             uno::Reference< io::XObjectOutputStream > xOutStrm(xSource, uno::UNO_QUERY);
             uno::Reference< io::XObjectInputStream > xInStrm(xSink, uno::UNO_QUERY);
@@ -388,7 +388,7 @@ void SdrUnoObj::operator = (const SdrObject& rObj)
     uno::Reference< beans::XPropertySet > xSet(xUnoControlModel, uno::UNO_QUERY);
     if (xSet.is())
     {
-        uno::Any aValue( xSet->getPropertyValue( rtl::OUString::createFromAscii("DefaultControl")) );
+        uno::Any aValue( xSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultControl"))) );
         ::rtl::OUString aStr;
 
         if( aValue >>= aStr )
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 11985fe578e9..02358d125633 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -179,13 +179,14 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
             nCloneErrCnt++;
         }
     }
-    // und nun zu den Konnektoren
-    // Die neuen Objekte werden auf die der rSrcList abgebildet
-    // und so die Objektverbindungen hergestellt.
-    // Aehnliche Implementation an folgenden Stellen:
+
+    // and now for the Connectors
+    // The new objects would be shown in the rSrcList
+    // and then the object connections are made.
+    // Similar implementation are setup as the following:
     //    void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
     //    SdrModel* SdrExchangeView::GetMarkedObjModel() const
-    //    FASTBOOL SdrExchangeView::Paste(const SdrModel& rMod,...)
+    //    BOOL SdrExchangeView::Paste(const SdrModel& rMod,...)
     //    void SdrEditView::CopyMarked()
     if (nCloneErrCnt==0) {
         for (no=0; no<nAnz; no++) {
@@ -980,8 +981,6 @@ void SdrObjList::ClearObjectNavigationOrder (void)
 
 bool SdrObjList::RecalcNavigationPositions (void)
 {
-    bool bUpToDate (false);
-
     if (mbIsNavigationOrderDirty)
     {
         if (mpNavigationOrder.get() != NULL)
@@ -993,8 +992,6 @@ bool SdrObjList::RecalcNavigationPositions (void)
             sal_uInt32 nIndex (0);
             for (iObject=mpNavigationOrder->begin(); iObject!=iEnd; ++iObject,++nIndex)
                 (*iObject)->SetNavigationPosition(nIndex);
-
-            bUpToDate = true;
         }
     }
 
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index f81b55b73133..07d728189f37 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -146,7 +146,7 @@ void ImplEncirclementOverlay::SetSecondPosition(const basegfx::B2DPoint& rNewPos
 
 SdrPaintWindow* SdrPaintView::FindPaintWindow(const OutputDevice& rOut) const
 {
-    for(SdrPaintWindowVector::const_iterator a = maPaintWindows.begin(); a != maPaintWindows.end(); a++)
+    for(SdrPaintWindowVector::const_iterator a = maPaintWindows.begin(); a != maPaintWindows.end(); ++a)
     {
         if(&((*a)->GetOutputDevice()) == &rOut)
         {
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
index 1317a0e1328d..3324728402f6 100644
--- a/svx/source/svdraw/svdstr.src
+++ b/svx/source/svdraw/svdstr.src
@@ -1124,7 +1124,7 @@ String STR_UndoMovLayer
 {
     Text [ en-US ] = "Change order of layers" ;
 };
-// --> OD 2009-07-09 #i73249#
+// Undo/Redo for setting object's name (#i73249#)
 String STR_UndoObjName
 {
     Text [ en-US ] = "Change object name of %1 to" ;
@@ -1137,7 +1137,6 @@ String STR_UndoObjDescription
 {
     Text [ en-US ] = "Change object description of %1" ;
 };
-// <--
 String STR_StandardLayerName
 {
     Text [ en-US ] = "Standard" ;
@@ -1600,8 +1599,8 @@ String STR_ItemNam_SHEARANGLE
  // Ende der gecachten Strings
 
  // und hier noch Bitmaps
-Bitmap BMAP_GrafikEi { File = "grafikei.bmp" ; };
-Bitmap BMAP_GrafikDe { File = "grafikde.bmp" ; };
+Bitmap BMAP_GrafikEi { File = "grafikei.png" ; };
+Bitmap BMAP_GrafikDe { File = "grafikde.png" ; };
 
 // Strings fuer den Vorlagen-Dialog
 String SIP_UNKNOWN_ATTR
@@ -2748,24 +2747,18 @@ String SIP_SA_GRAFRESERVE6 { Text = "" ; };
 
 Bitmap SIP_SA_MARKERS
 {
-    File = "markers.bmp";
+    File = "markers.png";
 };
 
 Bitmap SIP_SA_FINE_MARKERS
 {
-    File = "markers2.bmp";
+    File = "markers2.png";
 };
 
 // #100499#
 Bitmap BMP_SVXOLEOBJ
 {
-    File = "oleobj.bmp" ;
-};
-
-// #101928#
-Bitmap SIP_SA_ACCESSIBILITY_MARKERS
-{
-    File = "markersACC.bmp";
+    File = "oleobj.png" ;
 };
 
 String STR_ObjNameSingulMEDIA
@@ -2847,89 +2840,12 @@ String STR_ObjNamePluralTable
 
 Bitmap SIP_SA_CROP_MARKERS
 {
-    File = "cropmarkers.bmp";
+    File = "cropmarkers.png";
 };
 
 Bitmap SIP_SA_CROP_FINE_MARKERS
 {
-    File = "cropmarkers2.bmp";
-};
-
-Bitmap SIP_SA_ACCESSIBILITY_CROP_MARKERS
-{
-    File = "cropmarkersACC.bmp";
+    File = "cropmarkers2.png";
 };
 
 // ******************************************************************* EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index 9eb033a0ce05..e4b61ce3b3e0 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -1088,46 +1088,39 @@ void SdrFormatter::TakeUnitStr(MapUnit eUnit, XubString& rStr)
         // Metrisch
         case MAP_100TH_MM   :
         {
-            sal_Char aText[] = "/100mm";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("/100mm"));
             break;
         }
         case MAP_10TH_MM    :
         {
-            sal_Char aText[] = "/10mm";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("/10mm"));
             break;
         }
         case MAP_MM         :
         {
-            sal_Char aText[] = "mm";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("mm"));
             break;
         }
         case MAP_CM         :
         {
-            sal_Char aText[] = "cm";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("cm"));
             break;
         }
 
         // Inch
         case MAP_1000TH_INCH:
         {
-            sal_Char aText[] = "/1000\"";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("/1000\""));
             break;
         }
         case MAP_100TH_INCH :
         {
-            sal_Char aText[] = "/100\"";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("/100\""));
             break;
         }
         case MAP_10TH_INCH  :
         {
-            sal_Char aText[] = "/10\"";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("/10\""));
             break;
         }
         case MAP_INCH       :
@@ -1138,34 +1131,29 @@ void SdrFormatter::TakeUnitStr(MapUnit eUnit, XubString& rStr)
         }
         case MAP_POINT      :
         {
-            sal_Char aText[] = "pt";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("pt"));
             break;
         }
         case MAP_TWIP       :
         {
-            sal_Char aText[] = "twip";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("twip"));
             break;
         }
 
         // Sonstiges
         case MAP_PIXEL      :
         {
-            sal_Char aText[] = "pixel";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("pixel"));
             break;
         }
         case MAP_SYSFONT    :
         {
-            sal_Char aText[] = "sysfont";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("sysfont"));
             break;
         }
         case MAP_APPFONT    :
         {
-            sal_Char aText[] = "appfont";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("appfont"));
             break;
         }
         case MAP_RELATIVE   :
@@ -1193,20 +1181,17 @@ void SdrFormatter::TakeUnitStr(FieldUnit eUnit, XubString& rStr)
         // Metrisch
         case FUNIT_100TH_MM:
         {
-            sal_Char aText[] = "/100mm";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("/100mm"));
             break;
         }
         case FUNIT_MM     :
         {
-            sal_Char aText[] = "mm";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("mm"));
             break;
         }
         case FUNIT_CM     :
         {
-            sal_Char aText[] = "cm";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("cm"));
             break;
         }
         case FUNIT_M      :
@@ -1217,28 +1202,24 @@ void SdrFormatter::TakeUnitStr(FieldUnit eUnit, XubString& rStr)
         }
         case FUNIT_KM     :
         {
-            sal_Char aText[] = "km";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("km"));
             break;
         }
 
         // Inch
         case FUNIT_TWIP   :
         {
-            sal_Char aText[] = "twip";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("twip"));
             break;
         }
         case FUNIT_POINT  :
         {
-            sal_Char aText[] = "pt";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("pt"));
             break;
         }
         case FUNIT_PICA   :
         {
-            sal_Char aText[] = "pica";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("pica"));
             break;
         }
         case FUNIT_INCH   :
@@ -1249,14 +1230,12 @@ void SdrFormatter::TakeUnitStr(FieldUnit eUnit, XubString& rStr)
         }
         case FUNIT_FOOT   :
         {
-            sal_Char aText[] = "ft";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("ft"));
             break;
         }
         case FUNIT_MILE   :
         {
-            sal_Char aText[] = "mile(s)";
-            rStr = UniString(aText, sizeof(aText-1));
+            rStr = UniString(RTL_CONSTASCII_USTRINGPARAM("mile(s)"));
             break;
         }
 
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index fa360fa2bafc..77c60c3dedfa 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -160,8 +160,8 @@ void SdrUndoGroup::Redo()
 XubString SdrUndoGroup::GetComment() const
 {
     XubString aRet(aComment);
-    sal_Char aSearchText[] = "%1";
-    String aSearchString(aSearchText, sizeof(aSearchText-1));
+
+    String aSearchString(RTL_CONSTASCII_USTRINGPARAM("%1"));
 
     aRet.SearchAndReplace(aSearchString, aObjDescription);
 
@@ -218,8 +218,8 @@ void SdrUndoGroup::SdrRepeat(SdrView& rView)
 XubString SdrUndoGroup::GetSdrRepeatComment(SdrView& /*rView*/) const
 {
     XubString aRet(aComment);
-    sal_Char aSearchText[] = "%1";
-    String aSearchString(aSearchText, sizeof(aSearchText-1));
+
+    String aSearchString(RTL_CONSTASCII_USTRINGPARAM("%1"));
 
     aRet.SearchAndReplace(aSearchString, ImpGetResStr(STR_ObjNameSingulPlural));
 
@@ -249,8 +249,8 @@ SdrUndoObj::SdrUndoObj(SdrObject& rNewObj):
 void SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, USHORT nStrCacheID, String& rStr, bool bRepeat )
 {
     rStr = ImpGetResStr(nStrCacheID);
-    sal_Char aSearchText[] = "%1";
-    String aSearchString(aSearchText, sizeof(aSearchText-1));
+
+    String aSearchString(RTL_CONSTASCII_USTRINGPARAM("%1"));
 
     xub_StrLen nPos = rStr.Search(aSearchString);
 
@@ -823,9 +823,9 @@ void SdrUndoInsertObj::Redo()
     DBG_ASSERT(!pObj->IsInserted(),"RedoInsertObj: pObj ist bereits Inserted");
     if (!pObj->IsInserted())
     {
-        // --> OD 2005-05-10 #i45952# - restore anchor position of an object,
+        // Restore anchor position of an object,
         // which becomes a member of a group, because its cleared in method
-        // <InsertObject(..)>. Needed for correct ReDo in Writer.
+        // <InsertObject(..)>. Needed for correct ReDo in Writer. (#i45952#)
         Point aAnchorPos( 0, 0 );
         if ( pObjList &&
              pObjList->GetOwnerObj() &&
@@ -833,17 +833,15 @@ void SdrUndoInsertObj::Redo()
         {
             aAnchorPos = pObj->GetAnchorPos();
         }
-        // <--
 
         SdrInsertReason aReason(SDRREASON_UNDO);
         pObjList->InsertObject(pObj,nOrdNum,&aReason);
 
-        // --> OD 2005-05-10 #i45952#
+        // Arcs lose position when grouped (#i45952#)
         if ( aAnchorPos.X() || aAnchorPos.Y() )
         {
             pObj->NbcSetAnchorPos( aAnchorPos );
         }
-        // <--
     }
 
     // #94278# Trigger PageChangeCall
@@ -1217,7 +1215,7 @@ bool SdrUndoObjSetText::CanSdrRepeat(SdrView& rView) const
     return bOk;
 }
 
-// --> OD 2009-07-09 #i73249#
+// Undo/Redo for setting object's name (#i73249#)
 SdrUndoObjStrAttr::SdrUndoObjStrAttr( SdrObject& rNewObj,
                                       const ObjStrAttrType eObjStrAttr,
                                       const String& sOldStr,
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index b01d80e7b473..61dcededf870 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -83,15 +83,17 @@ namespace svx
 
 static sal_Int32 gSkewList[] = { 135, 90, 45, 180, 0, -360, -135, -90, -45 };
 
-ExtrusionDirectionWindow::ExtrusionDirectionWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow )
-: ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_DIRECTION ))
-, mrController( rController )
-, maImgPerspective( SVX_RES( IMG_PERSPECTIVE ) )
-, maImgPerspectiveH( SVX_RES( IMG_PERSPECTIVE_H ) )
-, maImgParallel( SVX_RES( IMG_PARALLEL ) )
-, maImgParallelH( SVX_RES( IMG_PARALLEL_H ) )
-, msExtrusionDirection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirection" ) )
-, msExtrusionProjection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionProjection" ) )
+ExtrusionDirectionWindow::ExtrusionDirectionWindow(
+    svt::ToolboxController& rController,
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    Window* pParentWindow
+)
+:   ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_DIRECTION )) ,
+    mrController( rController ) ,
+    maImgPerspective( SVX_RES( IMG_PERSPECTIVE ) ) ,
+    maImgParallel(    SVX_RES( IMG_PARALLEL    ) ) ,
+    msExtrusionDirection(  RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirection"  ) ) ,
+    msExtrusionProjection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionProjection" ) )
 {
     SetHelpId( HID_MENU_EXTRUSION_DIRECTION );
 
@@ -99,7 +101,6 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( svt::ToolboxController& rCon
     for( i = DIRECTION_NW; i <= DIRECTION_SE; i++ )
     {
         maImgDirection[i] = Image( SVX_RES( IMG_DIRECTION + i ) );
-        maImgDirectionH[i] = Image( SVX_RES( IMG_DIRECTION_H + i ) );
     }
 
     SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectHdl ) );
@@ -110,20 +111,18 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( svt::ToolboxController& rCon
     mpDirectionSet->SetColCount( 3 );
     mpDirectionSet->EnableFullItemMode( FALSE );
 
-    bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
     for( i = DIRECTION_NW; i <= DIRECTION_SE; i++ )
     {
         String aText( SVX_RES( STR_DIRECTION + i ) );
-        mpDirectionSet->InsertItem( i+1, bHighContrast ? maImgDirectionH[ i ] : maImgDirection[ i ], aText );
+        mpDirectionSet->InsertItem( i+1, maImgDirection[ i ], aText );
     }
 
     mpDirectionSet->SetOutputSizePixel( Size( 72, 72 ) );
 
     appendEntry( 2, mpDirectionSet );
     appendSeparator();
-    appendEntry( 0, String( SVX_RES( STR_PERSPECTIVE ) ), bHighContrast ? maImgPerspectiveH : maImgPerspective );
-    appendEntry( 1, String( SVX_RES( STR_PARALLEL ) ), bHighContrast ? maImgParallelH : maImgParallel );
+    appendEntry( 0, String( SVX_RES( STR_PERSPECTIVE ) ), maImgPerspective );
+    appendEntry( 1, String( SVX_RES( STR_PARALLEL    ) ), maImgParallel    );
 
     SetOutputSizePixel( getMenuSize() );
 
@@ -139,15 +138,13 @@ void ExtrusionDirectionWindow::DataChanged( const DataChangedEvent& rDCEvt )
 
     if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
     {
-        bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
         for( USHORT i = DIRECTION_NW; i <= DIRECTION_SE; i++ )
         {
-            mpDirectionSet->SetItemImage( i+1, bHighContrast ? maImgDirectionH[ i ] : maImgDirection[ i ] );
+            mpDirectionSet->SetItemImage( i+1, maImgDirection[ i ] );
         }
 
-        setEntryImage( 0, bHighContrast ? maImgPerspectiveH : maImgPerspective );
-        setEntryImage( 1, bHighContrast ? maImgParallelH : maImgParallel );
+        setEntryImage( 0, maImgPerspective );
+        setEntryImage( 1, maImgParallel );
     }
 }
 
@@ -188,7 +185,9 @@ void ExtrusionDirectionWindow::implSetProjection( sal_Int32 nProjection, bool bE
 
 // -----------------------------------------------------------------------
 
-void SAL_CALL ExtrusionDirectionWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException )
+void SAL_CALL ExtrusionDirectionWindow::statusChanged(
+    const ::com::sun::star::frame::FeatureStateEvent& Event
+)   throw ( ::com::sun::star::uno::RuntimeException )
 {
     if( Event.FeatureURL.Main.equals( msExtrusionDirection ) )
     {
@@ -254,8 +253,13 @@ IMPL_LINK( ExtrusionDirectionWindow, SelectHdl, void *, pControl )
 // ExtrusionDirectionControl
 // =======================================================================
 
-ExtrusionDirectionControl::ExtrusionDirectionControl( const Reference< lang::XMultiServiceFactory >& rServiceManager )
-: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirectionFloater" ) ) )
+ExtrusionDirectionControl::ExtrusionDirectionControl(
+    const Reference< lang::XMultiServiceFactory >& rServiceManager
+)   : svt::PopupWindowController(
+        rServiceManager,
+        Reference< frame::XFrame >(),
+        OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirectionFloater" ) )
+    )
 {
 }
 
@@ -286,7 +290,9 @@ Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames
 
 // --------------------------------------------------------------------
 
-Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDirectionControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
+Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDirectionControl_createInstance(
+    const Reference< XMultiServiceFactory >& rSMgr
+)   throw( RuntimeException )
 {
     return *new ExtrusionDirectionControl( rSMgr );
 }
@@ -328,7 +334,6 @@ ExtrusionDepthDialog::~ExtrusionDepthDialog()
 
 double ExtrusionDepthDialog::getDepth() const
 {
-//  bool bMetric = IsMetric( meDefaultUnit );
     return (double)( maMtrDepth.GetValue( FUNIT_100TH_MM ) ) / 100.0;
 }
 
@@ -337,38 +342,33 @@ double ExtrusionDepthDialog::getDepth() const
 double aDepthListInch[] = { 0, 1270,2540,5080,10160 };
 double aDepthListMM[] = { 0, 1000, 2500, 5000, 10000 };
 
-ExtrusionDepthWindow::ExtrusionDepthWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow )
-: ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_DEPTH ))
-, mrController( rController )
-, maImgDepth0( SVX_RES( IMG_DEPTH_0 ) )
-, maImgDepth1( SVX_RES( IMG_DEPTH_1 ) )
-, maImgDepth2( SVX_RES( IMG_DEPTH_2 ) )
-, maImgDepth3( SVX_RES( IMG_DEPTH_3 ) )
-, maImgDepth4( SVX_RES( IMG_DEPTH_4 ) )
-, maImgDepthInfinity( SVX_RES( IMG_DEPTH_INFINITY ) )
-, maImgDepth0h( SVX_RES( IMG_DEPTH_0_H ) )
-, maImgDepth1h( SVX_RES( IMG_DEPTH_1_H ) )
-, maImgDepth2h( SVX_RES( IMG_DEPTH_2_H ) )
-, maImgDepth3h( SVX_RES( IMG_DEPTH_3_H ) )
-, maImgDepth4h( SVX_RES( IMG_DEPTH_4_H ) )
-, maImgDepthInfinityh( SVX_RES( IMG_DEPTH_INFINITY_H ) )
-, mfDepth( -1.0 )
-, msExtrusionDepth( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepth" ) )
-, msMetricUnit( RTL_CONSTASCII_USTRINGPARAM( ".uno:MetricUnit" ) )
+ExtrusionDepthWindow::ExtrusionDepthWindow(
+    svt::ToolboxController& rController,
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    Window* pParentWindow
+)   : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_DEPTH ))
+    , mrController( rController )
+    , maImgDepth0( SVX_RES( IMG_DEPTH_0 ) )
+    , maImgDepth1( SVX_RES( IMG_DEPTH_1 ) )
+    , maImgDepth2( SVX_RES( IMG_DEPTH_2 ) )
+    , maImgDepth3( SVX_RES( IMG_DEPTH_3 ) )
+    , maImgDepth4( SVX_RES( IMG_DEPTH_4 ) )
+    , maImgDepthInfinity( SVX_RES( IMG_DEPTH_INFINITY ) )
+    , mfDepth( -1.0 )
+    , msExtrusionDepth( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepth" ) )
+    , msMetricUnit(     RTL_CONSTASCII_USTRINGPARAM( ".uno:MetricUnit"     ) )
 {
     SetHelpId( HID_MENU_EXTRUSION_DEPTH );
 
     SetSelectHdl( LINK( this, ExtrusionDepthWindow, SelectHdl ) );
 
-    bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
     String aEmpty;
-    appendEntry( 0, aEmpty, bHighContrast ? maImgDepth0h : maImgDepth0 );
-    appendEntry( 1, aEmpty, bHighContrast ? maImgDepth1h : maImgDepth1 );
-    appendEntry( 2, aEmpty, bHighContrast ? maImgDepth2h : maImgDepth2 );
-    appendEntry( 3, aEmpty, bHighContrast ? maImgDepth3h : maImgDepth3 );
-    appendEntry( 4, aEmpty, bHighContrast ? maImgDepth4h : maImgDepth4 );
-    appendEntry( 5, String( SVX_RES( STR_INFINITY ) ), bHighContrast ? maImgDepthInfinityh : maImgDepthInfinity );
+    appendEntry( 0, aEmpty, maImgDepth0 );
+    appendEntry( 1, aEmpty, maImgDepth1 );
+    appendEntry( 2, aEmpty, maImgDepth2 );
+    appendEntry( 3, aEmpty, maImgDepth3 );
+    appendEntry( 4, aEmpty, maImgDepth4 );
+    appendEntry( 5, String( SVX_RES( STR_INFINITY ) ), maImgDepthInfinity );
     appendEntry( 6, String( SVX_RES( STR_CUSTOM ) ) );
 
     SetOutputSizePixel( getMenuSize() );
@@ -414,7 +414,9 @@ void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit )
 
 // -----------------------------------------------------------------------
 
-void SAL_CALL ExtrusionDepthWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException )
+void SAL_CALL ExtrusionDepthWindow::statusChanged(
+    const ::com::sun::star::frame::FeatureStateEvent& Event
+)   throw ( ::com::sun::star::uno::RuntimeException )
 {
     if( Event.FeatureURL.Main.equals( msExtrusionDepth ) )
     {
@@ -452,14 +454,12 @@ void ExtrusionDepthWindow::DataChanged( const DataChangedEvent& rDCEvt )
 
     if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
     {
-        bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
-        setEntryImage( 0, bHighContrast ? maImgDepth0h : maImgDepth0 );
-        setEntryImage( 1, bHighContrast ? maImgDepth1h : maImgDepth1 );
-        setEntryImage( 2, bHighContrast ? maImgDepth2h : maImgDepth2 );
-        setEntryImage( 3, bHighContrast ? maImgDepth3h : maImgDepth3 );
-        setEntryImage( 4, bHighContrast ? maImgDepth4h : maImgDepth4 );
-        setEntryImage( 5, bHighContrast ? maImgDepthInfinityh : maImgDepthInfinity );
+        setEntryImage( 0, maImgDepth0 );
+        setEntryImage( 1, maImgDepth1 );
+        setEntryImage( 2, maImgDepth2 );
+        setEntryImage( 3, maImgDepth3 );
+        setEntryImage( 4, maImgDepth4 );
+        setEntryImage( 5, maImgDepthInfinity );
     }
 }
 
@@ -518,8 +518,13 @@ IMPL_LINK( ExtrusionDepthWindow, SelectHdl, void *, EMPTYARG )
 // ExtrusionDirectionControl
 // =======================================================================
 
-ExtrusionDepthController::ExtrusionDepthController( const Reference< lang::XMultiServiceFactory >& rServiceManager )
-: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepthFloater" ) ) )
+ExtrusionDepthController::ExtrusionDepthController(
+    const Reference< lang::XMultiServiceFactory >& rServiceManager
+)   : svt::PopupWindowController(
+        rServiceManager,
+        Reference< frame::XFrame >(),
+        OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepthFloater" ) )
+    )
 {
 }
 
@@ -580,10 +585,7 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rContr
 , mrController( rController )
 , maImgBright( SVX_RES( IMG_LIGHTING_BRIGHT ) )
 , maImgNormal( SVX_RES( IMG_LIGHTING_NORMAL ) )
-, maImgDim( SVX_RES( IMG_LIGHTING_DIM ) )
-, maImgBrighth( SVX_RES( IMG_LIGHTING_BRIGHT_H ) )
-, maImgNormalh( SVX_RES( IMG_LIGHTING_NORMAL_H ) )
-, maImgDimh( SVX_RES( IMG_LIGHTING_DIM_H ) )
+, maImgDim(    SVX_RES( IMG_LIGHTING_DIM    ) )
 , mnLevel( 0 )
 , mbLevelEnabled( false )
 , mnDirection( FROM_FRONT )
@@ -596,13 +598,10 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rContr
     {
         if( i != FROM_FRONT )
         {
-            maImgLightingOff[i] = Image( SVX_RES( IMG_LIGHT_OFF + i ) );
-            maImgLightingOn[i] = Image( SVX_RES( IMG_LIGHT_ON + i ) );
-            maImgLightingOffh[i] = Image( SVX_RES( IMG_LIGHT_OFF_H + i ) );
-            maImgLightingOnh[i] = Image( SVX_RES( IMG_LIGHT_ON_H + i ) );
+            maImgLightingOff[  i ] = Image( SVX_RES( IMG_LIGHT_OFF   + i ) );
+            maImgLightingOn[   i ] = Image( SVX_RES( IMG_LIGHT_ON    + i ) );
         }
         maImgLightingPreview[i] = Image( SVX_RES( IMG_LIGHT_PREVIEW + i ) );
-        maImgLightingPreviewh[i] = Image( SVX_RES( IMG_LIGHT_PREVIEW_H + i ) );
     }
 
     SetHelpId( HID_MENU_EXTRUSION_LIGHTING );
@@ -615,26 +614,24 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rContr
     mpLightingSet->SetColCount( 3 );
     mpLightingSet->EnableFullItemMode( FALSE );
 
-    bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
     for( i = FROM_TOP_LEFT; i <= FROM_BOTTOM_RIGHT; i++ )
     {
         if( i != FROM_FRONT )
         {
-            mpLightingSet->InsertItem( i+1, bHighContrast ? maImgLightingOffh[i] : maImgLightingOff[i] );
+            mpLightingSet->InsertItem( i+1, maImgLightingOff[i] );
         }
         else
         {
-            mpLightingSet->InsertItem( 5, bHighContrast ? maImgLightingPreviewh[FROM_FRONT] : maImgLightingPreview[FROM_FRONT] );
+            mpLightingSet->InsertItem( 5, maImgLightingPreview[FROM_FRONT] );
         }
     }
     mpLightingSet->SetOutputSizePixel( Size( 72, 72 ) );
 
     appendEntry( 3, mpLightingSet );
     appendSeparator();
-    appendEntry( 0, String( SVX_RES( STR_BRIGHT ) ), bHighContrast ? maImgBrighth : maImgBright );
-    appendEntry( 1, String( SVX_RES( STR_NORMAL ) ), bHighContrast ? maImgNormalh : maImgNormal );
-    appendEntry( 2, String( SVX_RES( STR_DIM ) ), bHighContrast ? maImgDimh : maImgDim );
+    appendEntry( 0, String( SVX_RES( STR_BRIGHT ) ), maImgBright );
+    appendEntry( 1, String( SVX_RES( STR_NORMAL ) ), maImgNormal );
+    appendEntry( 2, String( SVX_RES( STR_DIM    ) ), maImgDim    );
 
     SetOutputSizePixel( getMenuSize() );
 
@@ -665,8 +662,6 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled )
     mnDirection = nDirection;
     mbDirectionEnabled = bEnabled;
 
-    bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
     if( !bEnabled )
         nDirection = FROM_FRONT;
 
@@ -675,18 +670,14 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled )
     {
         if( nItemId == FROM_FRONT )
         {
-            mpLightingSet->SetItemImage( nItemId + 1, bHighContrast ? maImgLightingPreviewh[ nDirection ] : maImgLightingPreview[ nDirection ] );
+            mpLightingSet->SetItemImage( nItemId + 1, maImgLightingPreview[ nDirection ] );
         }
         else
         {
-            if( bHighContrast )
-            {
-                mpLightingSet->SetItemImage( nItemId + 1, (USHORT)nDirection == nItemId ? maImgLightingOnh[nItemId] : maImgLightingOffh[nItemId] );
-            }
-            else
-            {
-                mpLightingSet->SetItemImage( nItemId + 1, (USHORT)nDirection == nItemId ? maImgLightingOn[nItemId] : maImgLightingOff[nItemId] );
-            }
+            mpLightingSet->SetItemImage(
+                nItemId + 1,
+                (USHORT)nDirection == nItemId ? maImgLightingOn[nItemId] : maImgLightingOff[nItemId]
+            );
         }
     }
 
@@ -695,7 +686,9 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled )
 
 // -----------------------------------------------------------------------
 
-void SAL_CALL ExtrusionLightingWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException )
+void SAL_CALL ExtrusionLightingWindow::statusChanged(
+    const ::com::sun::star::frame::FeatureStateEvent& Event
+)   throw ( ::com::sun::star::uno::RuntimeException )
 {
     if( Event.FeatureURL.Main.equals( msExtrusionLightingIntensity ) )
     {
@@ -733,12 +726,10 @@ void ExtrusionLightingWindow::DataChanged( const DataChangedEvent& rDCEvt )
 
     if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
     {
-        bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
         implSetDirection( mnDirection, mbDirectionEnabled );
-        setEntryImage( 0, bHighContrast ? maImgBrighth : maImgBright );
-        setEntryImage( 1, bHighContrast ? maImgNormalh : maImgNormal );
-        setEntryImage( 2, bHighContrast ? maImgDimh : maImgDim );
+        setEntryImage( 0, maImgBright );
+        setEntryImage( 1, maImgNormal );
+        setEntryImage( 2, maImgDim    );
     }
 }
 
@@ -790,8 +781,12 @@ IMPL_LINK( ExtrusionLightingWindow, SelectHdl, void *, pControl )
 
 // ========================================================================
 
-ExtrusionLightingControl::ExtrusionLightingControl( const Reference< lang::XMultiServiceFactory >& rServiceManager )
-: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirectionFloater" ) ) )
+ExtrusionLightingControl::ExtrusionLightingControl(
+    const Reference< lang::XMultiServiceFactory >& rServiceManager
+)   : svt::PopupWindowController( rServiceManager,
+                Reference< frame::XFrame >(),
+                OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirectionFloater" ) )
+    )
 {
 }
 
@@ -822,7 +817,9 @@ Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames(
 
 // --------------------------------------------------------------------
 
-Reference< XInterface > SAL_CALL SAL_CALL ExtrusionLightingControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
+Reference< XInterface > SAL_CALL SAL_CALL ExtrusionLightingControl_createInstance(
+    const Reference< XMultiServiceFactory >& rSMgr
+)   throw( RuntimeException )
 {
     return *new ExtrusionLightingControl( rSMgr );
 }
@@ -843,28 +840,25 @@ Sequence< OUString > SAL_CALL ExtrusionLightingControl::getSupportedServiceNames
 
 // ####################################################################
 
-ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow )
-: ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_SURFACE ))
-, mrController( rController )
-, maImgSurface1( SVX_RES( IMG_WIRE_FRAME ) )
-, maImgSurface2( SVX_RES( IMG_MATTE ) )
-, maImgSurface3( SVX_RES( IMG_PLASTIC ) )
-, maImgSurface4( SVX_RES( IMG_METAL ) )
-, maImgSurface1h( SVX_RES( IMG_WIRE_FRAME_H ) )
-, maImgSurface2h( SVX_RES( IMG_MATTE_H ) )
-, maImgSurface3h( SVX_RES( IMG_PLASTIC_H ) )
-, maImgSurface4h( SVX_RES( IMG_METAL_H ) )
-, msExtrusionSurface( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionSurface" ))
+ExtrusionSurfaceWindow::ExtrusionSurfaceWindow(
+    svt::ToolboxController& rController,
+    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+    Window* pParentWindow
+)   : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_SURFACE ) )
+    , mrController( rController )
+    , maImgSurface1( SVX_RES( IMG_WIRE_FRAME ) )
+    , maImgSurface2( SVX_RES( IMG_MATTE ) )
+    , maImgSurface3( SVX_RES( IMG_PLASTIC ) )
+    , maImgSurface4( SVX_RES( IMG_METAL ) )
+    , msExtrusionSurface( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionSurface" ) )
 {
-    bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
     SetHelpId( HID_MENU_EXTRUSION_SURFACE );
     SetSelectHdl( LINK( this, ExtrusionSurfaceWindow, SelectHdl ) );
 
-    appendEntry( 0, String( SVX_RES( STR_WIREFRAME ) ), bHighContrast ? maImgSurface1h : maImgSurface1 );
-    appendEntry( 1, String( SVX_RES( STR_MATTE ) ), bHighContrast ? maImgSurface2h : maImgSurface2 );
-    appendEntry( 2, String( SVX_RES( STR_PLASTIC ) ), bHighContrast ? maImgSurface3h : maImgSurface3 );
-    appendEntry( 3, String( SVX_RES( STR_METAL ) ), bHighContrast ? maImgSurface4h : maImgSurface4 );
+    appendEntry( 0, String( SVX_RES( STR_WIREFRAME ) ), maImgSurface1 );
+    appendEntry( 1, String( SVX_RES( STR_MATTE     ) ), maImgSurface2 );
+    appendEntry( 2, String( SVX_RES( STR_PLASTIC   ) ), maImgSurface3 );
+    appendEntry( 3, String( SVX_RES( STR_METAL     ) ), maImgSurface4 );
 
     SetOutputSizePixel( getMenuSize() );
 
@@ -877,20 +871,19 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( svt::ToolboxController& rControl
 
 void ExtrusionSurfaceWindow::implSetSurface( int nSurface, bool bEnabled )
 {
-//  if( mpMenu )
+    int i;
+    for( i = 0; i < 4; i++ )
     {
-        int i;
-        for( i = 0; i < 4; i++ )
-        {
-            checkEntry( i, (i == nSurface) && bEnabled );
-            enableEntry( i, bEnabled );
-        }
+        checkEntry( i, (i == nSurface) && bEnabled );
+        enableEntry( i, bEnabled );
     }
 }
 
 // -----------------------------------------------------------------------
 
-void SAL_CALL ExtrusionSurfaceWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException )
+void SAL_CALL ExtrusionSurfaceWindow::statusChanged(
+    const ::com::sun::star::frame::FeatureStateEvent& Event
+)   throw ( ::com::sun::star::uno::RuntimeException )
 {
     if( Event.FeatureURL.Main.equals( msExtrusionSurface ) )
     {
@@ -931,8 +924,14 @@ IMPL_LINK( ExtrusionSurfaceWindow, SelectHdl, void *, EMPTYARG )
 
 // ========================================================================
 
-ExtrusionSurfaceControl::ExtrusionSurfaceControl( const Reference< lang::XMultiServiceFactory >& rServiceManager )
-: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionSurfaceFloater" ) ) )
+ExtrusionSurfaceControl::ExtrusionSurfaceControl(
+    const Reference< lang::XMultiServiceFactory >& rServiceManager
+)
+:   svt::PopupWindowController(
+        rServiceManager,
+        Reference< frame::XFrame >(),
+        OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionSurfaceFloater" ) )
+    )
 {
 }
 
@@ -963,7 +962,9 @@ Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames()
 
 // --------------------------------------------------------------------
 
-Reference< XInterface > SAL_CALL SAL_CALL ExtrusionSurfaceControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
+Reference< XInterface > SAL_CALL SAL_CALL ExtrusionSurfaceControl_createInstance(
+    const Reference< XMultiServiceFactory >& rSMgr
+)   throw( RuntimeException )
 {
     return *new ExtrusionSurfaceControl( rSMgr );
 }
diff --git a/svx/source/tbxctrls/extrusioncontrols.hrc b/svx/source/tbxctrls/extrusioncontrols.hrc
index 705381cb68a6..9ae43248a499 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hrc
+++ b/svx/source/tbxctrls/extrusioncontrols.hrc
@@ -64,7 +64,6 @@
 #define STR_DIRECTION           30      // needs 10 resource ids
 
 #define IMG_DIRECTION           1       // needs 10 resource ids
-#define IMG_DIRECTION_H         10      // needs 10 resource ids
 
 #define IMG_DEPTH_0             19
 #define IMG_DEPTH_1             20
@@ -73,48 +72,24 @@
 #define IMG_DEPTH_4             23
 #define IMG_DEPTH_INFINITY      24
 
-#define IMG_DEPTH_0_H           25
-#define IMG_DEPTH_1_H           26
-#define IMG_DEPTH_2_H           27
-#define IMG_DEPTH_3_H           28
-#define IMG_DEPTH_4_H           29
-#define IMG_DEPTH_INFINITY_H    30
-
 #define IMG_PERSPECTIVE         31
-#define IMG_PERSPECTIVE_H       32
 #define IMG_PARALLEL            33
-#define IMG_PARALLEL_H          34
 
 #define IMG_WIRE_FRAME          35
 #define IMG_MATTE               36
 #define IMG_PLASTIC             37
 #define IMG_METAL               38
 
-#define IMG_WIRE_FRAME_H        39
-#define IMG_MATTE_H             40
-#define IMG_PLASTIC_H           41
-#define IMG_METAL_H             42
-
 #define IMG_LIGHT_OFF           50  // needs 10 resource ids
 #define IMG_LIGHT_ON            60  // needs 10 resource ids
 #define IMG_LIGHT_PREVIEW       70  // needs 10 resource ids
 
-#define IMG_LIGHT_OFF_H         80  // needs 10 resource ids
-#define IMG_LIGHT_ON_H          90  // needs 10 resource ids
-#define IMG_LIGHT_PREVIEW_H     100  // needs 10 resource ids
-
 #define IMG_LIGHTING_BRIGHT     110
 #define IMG_LIGHTING_NORMAL     111
 #define IMG_LIGHTING_DIM        112
 
-#define IMG_LIGHTING_BRIGHT_H   113
-#define IMG_LIGHTING_NORMAL_H   114
-#define IMG_LIGHTING_DIM_H      115
-
 #define FL_DEPTH                1
 #define MTR_DEPTH               2
 #define BTN_OK                  3
 #define BTN_CANCEL              4
 #define BTN_HELP                5
-
-//
diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx
index 220047f18b5f..35993c461beb 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hxx
+++ b/svx/source/tbxctrls/extrusioncontrols.hxx
@@ -63,12 +63,8 @@ private:
     ValueSet* mpDirectionSet;
 
     Image       maImgDirection[9];
-    Image       maImgDirectionH[9];
-
     Image       maImgPerspective;
-    Image       maImgPerspectiveH;
     Image       maImgParallel;
-    Image       maImgParallelH;
 
     const rtl::OUString msExtrusionDirection;
     const rtl::OUString msExtrusionProjection;
@@ -111,13 +107,6 @@ private:
     Image maImgDepth4;
     Image maImgDepthInfinity;
 
-    Image maImgDepth0h;
-    Image maImgDepth1h;
-    Image maImgDepth2h;
-    Image maImgDepth3h;
-    Image maImgDepth4h;
-    Image maImgDepthInfinityh;
-
     FieldUnit   meUnit;
     double      mfDepth;
 
@@ -164,16 +153,9 @@ private:
     Image maImgLightingOn[9];
     Image maImgLightingPreview[9];
 
-    Image maImgLightingOffh[9];
-    Image maImgLightingOnh[9];
-    Image maImgLightingPreviewh[9];
-
     Image maImgBright;
     Image maImgNormal;
     Image maImgDim;
-    Image maImgBrighth;
-    Image maImgNormalh;
-    Image maImgDimh;
 
     int     mnLevel;
     bool    mbLevelEnabled;
@@ -221,10 +203,6 @@ private:
     Image maImgSurface2;
     Image maImgSurface3;
     Image maImgSurface4;
-    Image maImgSurface1h;
-    Image maImgSurface2h;
-    Image maImgSurface3h;
-    Image maImgSurface4h;
 
     const rtl::OUString msExtrusionSurface;
 
diff --git a/svx/source/tbxctrls/extrusioncontrols.src b/svx/source/tbxctrls/extrusioncontrols.src
index 084606439cc3..55c9ec508d5d 100644
--- a/svx/source/tbxctrls/extrusioncontrols.src
+++ b/svx/source/tbxctrls/extrusioncontrols.src
@@ -47,111 +47,56 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION
         ImageBitmap = Bitmap { File = "directionnorthwest_22.bmp" ; };
         MASKCOLOR
     };
-    Image IMG_DIRECTION_H + DIRECTION_NW
-    {
-        ImageBitmap = Bitmap { File = "directionnorthwest_22_h.bmp" ; };
-        MASKCOLOR
-    };
     Image IMG_DIRECTION + DIRECTION_N
     {
         ImageBitmap = Bitmap { File = "directionnorth_22.bmp" ; };
         MASKCOLOR
     };
-    Image IMG_DIRECTION_H + DIRECTION_N
-    {
-        ImageBitmap = Bitmap { File = "directionnorth_22_h.bmp"; };
-        MASKCOLOR
-    };
     Image IMG_DIRECTION + DIRECTION_NE
     {
         ImageBitmap = Bitmap { File = "directionnortheast_22.bmp"; };
         MASKCOLOR
     };
-    Image IMG_DIRECTION_H + DIRECTION_NE
-    {
-        ImageBitmap = Bitmap { File = "directionnortheast_22_h.bmp"; };
-        MASKCOLOR
-    };
     Image IMG_DIRECTION + DIRECTION_W
     {
         ImageBitmap = Bitmap { File = "directionwest_22.bmp"; };
         MASKCOLOR
     };
-    Image IMG_DIRECTION_H + DIRECTION_W
-    {
-        ImageBitmap = Bitmap { File = "directionwest_22_h.bmp"; };
-        MASKCOLOR
-    };
     Image IMG_DIRECTION + DIRECTION_NONE
     {
         ImageBitmap = Bitmap { File = "directionstraight_22.bmp"; };
         MASKCOLOR
     };
-    Image IMG_DIRECTION_H + DIRECTION_NONE
-    {
-        ImageBitmap = Bitmap { File = "directionstraight_22_h.bmp"; };
-        MASKCOLOR
-    };
     Image IMG_DIRECTION + DIRECTION_E
     {
         ImageBitmap = Bitmap { File = "directioneast_22.bmp"; };
         MASKCOLOR
     };
-    Image IMG_DIRECTION_H + DIRECTION_E
-    {
-        ImageBitmap = Bitmap { File = "directioneast_22_h.bmp"; };
-        MASKCOLOR
-    };
     Image IMG_DIRECTION + DIRECTION_SW
     {
         ImageBitmap = Bitmap { File = "directionsouthwest_22.bmp"; };
         MASKCOLOR
     };
-    Image IMG_DIRECTION_H + DIRECTION_SW
-    {
-        ImageBitmap = Bitmap { File = "directionsouthwest_22_h.bmp"; };
-        MASKCOLOR
-    };
     Image IMG_DIRECTION + DIRECTION_S
     {
         ImageBitmap = Bitmap { File = "directionsouth_22.bmp"; };
         MASKCOLOR
     };
-    Image IMG_DIRECTION_H + DIRECTION_S
-    {
-        ImageBitmap = Bitmap { File = "directionsouth_22_h.bmp"; };
-        MASKCOLOR
-    };
     Image IMG_DIRECTION + DIRECTION_SE
     {
         ImageBitmap = Bitmap { File = "directionsoutheast_22.bmp"; };
         MASKCOLOR
     };
-    Image IMG_DIRECTION_H + DIRECTION_SE
-    {
-        ImageBitmap = Bitmap { File = "directionsoutheast_22_h.bmp"; };
-        MASKCOLOR
-    };
     Image IMG_PERSPECTIVE
     {
         ImageBitmap = Bitmap { File = "perspective_16.bmp"; };
         MASKCOLOR
     };
-    Image IMG_PERSPECTIVE_H
-    {
-        ImageBitmap = Bitmap { File = "perspective_16_h.bmp"; };
-        MASKCOLOR
-    };
     Image IMG_PARALLEL
     {
         ImageBitmap = Bitmap { File = "parallel_16.bmp"; };
         MASKCOLOR
     };
-    Image IMG_PARALLEL_H
-    {
-        ImageBitmap = Bitmap { File = "parallel_16_h.bmp"; };
-        MASKCOLOR
-    };
 
     String STR_PERSPECTIVE
     {
@@ -227,66 +172,36 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DEPTH
         ImageBitmap = Bitmap { File = "extrusion0inch_16.bmp"; };
         MASKCOLOR
     };
-    Image IMG_DEPTH_0_H
-    {
-        ImageBitmap = Bitmap { File = "extrusion0inch_16_h.bmp"; };
-        MASKCOLOR
-    };
 
     Image IMG_DEPTH_1
     {
         ImageBitmap = Bitmap { File = "extrusion05inch_16.bmp"; };
         MASKCOLOR
     };
-    Image IMG_DEPTH_1_H
-    {
-        ImageBitmap = Bitmap { File = "extrusion05inch_16_h.bmp"; };
-        MASKCOLOR
-    };
 
     Image IMG_DEPTH_2
     {
         ImageBitmap = Bitmap { File = "extrusion1inch_16.bmp"; };
         MASKCOLOR
     };
-    Image IMG_DEPTH_2_H
-    {
-        ImageBitmap = Bitmap { File = "extrusion1inch_16_h.bmp"; };
-        MASKCOLOR
-    };
 
     Image IMG_DEPTH_3
     {
         ImageBitmap = Bitmap { File = "extrusion2inch_16.bmp"; };
         MASKCOLOR
     };
-    Image IMG_DEPTH_3_H
-    {
-        ImageBitmap = Bitmap { File = "extrusion2inch_16_h.bmp"; };
-        MASKCOLOR
-    };
 
     Image IMG_DEPTH_4
     {
         ImageBitmap = Bitmap { File = "extrusion4inch_16.bmp"; };
         MASKCOLOR
     };
-    Image IMG_DEPTH_4_H
-    {
-        ImageBitmap = Bitmap { File = "extrusion4inch_16_h.bmp"; };
-        MASKCOLOR
-    };
 
     Image IMG_DEPTH_INFINITY
     {
         ImageBitmap = Bitmap { File = "extrusioninfinity_16.bmp"; };
         MASKCOLOR
     };
-    Image IMG_DEPTH_INFINITY_H
-    {
-        ImageBitmap = Bitmap { File = "extrusioninfinity_16_h.bmp"; };
-        MASKCOLOR
-    };
 };
 
 
@@ -343,47 +258,6 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING
         MASKCOLOR
     };
 
-    Image IMG_LIGHT_OFF_H + FROM_TOP_LEFT
-    {
-        ImageBitmap = Bitmap { File = "lightofffromtopleft_22_h.bmp"; };
-        MASKCOLOR
-    };
-    Image IMG_LIGHT_OFF_H + FROM_TOP
-    {
-        ImageBitmap = Bitmap { File = "lightofffromtop_22_h.bmp"; };
-        MASKCOLOR
-    };
-    Image IMG_LIGHT_OFF_H + FROM_TOP_RIGHT
-    {
-        ImageBitmap = Bitmap { File = "lightofffromtopright_22_h.bmp"; };
-        MASKCOLOR
-    };
-    Image IMG_LIGHT_OFF_H + FROM_LEFT
-    {
-        ImageBitmap = Bitmap { File = "lightofffromleft_22_h.bmp"; };
-        MASKCOLOR
-    };
-    Image IMG_LIGHT_OFF_H + FROM_RIGHT
-    {
-        ImageBitmap = Bitmap { File = "lightofffromright_22_h.bmp"; };
-        MASKCOLOR
-    };
-    Image IMG_LIGHT_OFF_H + FROM_BOTTOM_LEFT
-    {
-        ImageBitmap = Bitmap { File = "lightofffrombottomleft_22_h.bmp"; };
-        MASKCOLOR
-    };
-    Image IMG_LIGHT_OFF_H + FROM_BOTTOM
-    {
-        ImageBitmap = Bitmap { File = "lightofffrombottom_22_h.bmp"; };
-        MASKCOLOR
-    };
-    Image IMG_LIGHT_OFF_H + FROM_BOTTOM_RIGHT
-    {
-        ImageBitmap = Bitmap { File = "lightofffrombottomright_22_h.bmp"; };
-        MASKCOLOR
-    };
-
     Image IMG_LIGHT_ON + FROM_TOP_LEFT
     {
         ImageBitmap = Bitmap { File = "lightonfromtopleft_22.bmp"; };
@@ -425,47 +299,6 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING
         MASKCOLOR
     };
 
-    Image IMG_LIGHT_ON_H + FROM_TOP_LEFT
-    {
-        ImageBitmap = Bitmap { File = "lightonfromtopleft_22_h.bmp"; };
-        MASKCOLOR
-    };
-    Image IMG_LIGHT_ON_H + FROM_TOP
-    {
-        ImageBitmap = Bitmap { File = "lightonfromtop_22_h.bmp"; };
-        MASKCOLOR
-    };
-    Image IMG_LIGHT_ON_H + FROM_TOP_RIGHT
-    {
-        ImageBitmap = Bitmap { File = "lightonfromtopright_22_h.bmp"; };
-        MASKCOLOR
-    };
-    Image IMG_LIGHT_ON_H + FROM_LEFT
-    {
-        ImageBitmap = Bitmap { File = "lightonfromleft_22_h.bmp"; };
-        MASKCOLOR
-    };
-    Image IMG_LIGHT_ON_H + FROM_RIGHT
-    {
-        ImageBitmap = Bitmap { File = "lightonfromright_22_h.bmp"; };
-        MASKCOLOR
-    };
-    Image IMG_LIGHT_ON_H + FROM_BOTTOM_LEFT
-    {
-        ImageBitmap = Bitmap { File = "lightonfrombottomleft_22_h.bmp"; };
-        MASKCOLOR
-    };
-    Image IMG_LIGHT_ON_H + FROM_BOTTOM
-    {
-        ImageBitmap = Bitmap { File = "lightonfrombottom_22_h.bmp"; };
-        MASKCOLOR
-    };
-    Image IMG_LIGHT_ON_H + FROM_BOTTOM_RIGHT
-    {
-        ImageBitmap = Bitmap { File = "lightonfrombottomright_22_h.bmp"; };
-        MASKCOLOR
-    };
-
     Image IMG_LIGHT_PREVIEW + FROM_TOP_LEFT
     {
         ImageBitmap = Bitmap { File = "lightfromtopleft_22.bmp"; };
@@ -512,52 +345,6 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING
         MASKCOLOR
     };
 
-    Image IMG_LIGHT_PREVIEW_H + FROM_TOP_LEFT
-    {
-        ImageBitmap = Bitmap { File = "lightfromtopleft_22_h.bmp"; };
-        MASKCOLOR
-    };
-    Image IMG_LIGHT_PREVIEW_H + FROM_TOP
-    {
-        ImageBitmap = Bitmap { File = "lightfromtop_22_h.bmp"; };
-        MASKCOLOR
-    };
-    Image IMG_LIGHT_PREVIEW_H + FROM_TOP_RIGHT
-    {
-        ImageBitmap = Bitmap { File = "lightfromtopright_22_h.bmp"; };
-        MASKCOLOR
-    };
-    Image IMG_LIGHT_PREVIEW_H + FROM_LEFT
-    {
-        ImageBitmap = Bitmap { File = "lightfromleft_22_h.bmp"; };
-        MASKCOLOR
-    };
-    Image IMG_LIGHT_PREVIEW_H + FROM_RIGHT
-    {
-        ImageBitmap = Bitmap { File = "lightfromright_22_h.bmp"; };
-        MASKCOLOR
-    };
-    Image IMG_LIGHT_PREVIEW_H + FROM_FRONT
-    {
-        ImageBitmap = Bitmap { File = "lightfromfront_22_h.bmp"; };
-        MASKCOLOR
-    };
-    Image IMG_LIGHT_PREVIEW_H + FROM_BOTTOM_LEFT
-    {
-        ImageBitmap = Bitmap { File = "lightfrombottomleft_22_h.bmp"; };
-        MASKCOLOR
-    };
-    Image IMG_LIGHT_PREVIEW_H + FROM_BOTTOM
-    {
-        ImageBitmap = Bitmap { File = "lightfrombottom_22_h.bmp"; };
-        MASKCOLOR
-    };
-    Image IMG_LIGHT_PREVIEW_H + FROM_BOTTOM_RIGHT
-    {
-        ImageBitmap = Bitmap { File = "lightfrombottomright_22_h.bmp"; };
-        MASKCOLOR
-    };
-
     Image IMG_LIGHTING_BRIGHT
     {
         ImageBitmap = Bitmap { File = "brightlit_16.bmp"; };
@@ -574,22 +361,6 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING
         MASKCOLOR
     };
 
-    Image IMG_LIGHTING_BRIGHT_H
-    {
-        ImageBitmap = Bitmap { File = "brightlit_16_h.bmp"; };
-        MASKCOLOR
-    };
-    Image IMG_LIGHTING_NORMAL_H
-    {
-        ImageBitmap = Bitmap { File = "normallit_16_h.bmp"; };
-        MASKCOLOR
-    };
-    Image IMG_LIGHTING_DIM_H
-    {
-        ImageBitmap = Bitmap { File = "dimlit_16_h.bmp"; };
-        MASKCOLOR
-    };
-
     String STR_BRIGHT
     {
         Text [ en-US ] = "~Bright";
@@ -643,42 +414,24 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_SURFACE
         ImageBitmap = Bitmap { File = "wireframe_16.bmp"; };
         MASKCOLOR
     };
-    Image IMG_WIRE_FRAME_H
-    {
-        ImageBitmap = Bitmap { File = "wireframe_16_h.bmp"; };
-        MASKCOLOR
-    };
+
     Image IMG_MATTE
     {
         ImageBitmap = Bitmap { File = "matte_16.bmp"; };
         MASKCOLOR
     };
-    Image IMG_MATTE_H
-    {
-        ImageBitmap = Bitmap { File = "matte_16_h.bmp"; };
-        MASKCOLOR
-    };
+
     Image IMG_PLASTIC
     {
         ImageBitmap = Bitmap { File = "plastic_16.bmp"; };
         MASKCOLOR
     };
-    Image IMG_PLASTIC_H
-    {
-        ImageBitmap = Bitmap { File = "plastic_16_h.bmp"; };
-        MASKCOLOR
-    };
+
     Image IMG_METAL
     {
         ImageBitmap = Bitmap { File = "metal_16.bmp"; };
         MASKCOLOR
     };
-    Image IMG_METAL_H
-    {
-        ImageBitmap = Bitmap { File = "metal_16_h.bmp"; };
-        MASKCOLOR
-    };
-
 };
 
 #define WIDTH                       140
@@ -703,7 +456,6 @@ ModalDialog RID_SVX_MDLG_EXTRUSION_DEPTH
     };
     MetricField MTR_DEPTH
     {
-         //HelpId = HID_SD_CTL_FAVORITES ;
         Border = FALSE ;
         Pos = MAP_APPFONT ( 3 , 14 ) ;
         Size = MAP_APPFONT ( WIDTH - 50 - 12, 12 ) ;
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 996662310fbb..f130c84f9741 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -820,9 +820,6 @@ void FillControl::Resize()
     pLbFillType->SetSizePixel( Size( nW * 2 - nSep, nH ) );
     pLbFillAttr->SetPosSizePixel( Point( nW * 2 + nSep, 0 ), Size( nW * 3 - nSep, nH ) );
 }
-/* -----------------------------08.03.2002 15:04------------------------------
-
- ---------------------------------------------------------------------------*/
 
 void FillControl::DataChanged( const DataChangedEvent& rDCEvt )
 {
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 8de69b705e1b..5a107c55cdd2 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -364,11 +364,6 @@ private:
     Image maImgAlgin3;
     Image maImgAlgin4;
     Image maImgAlgin5;
-    Image maImgAlgin1h;
-    Image maImgAlgin2h;
-    Image maImgAlgin3h;
-    Image maImgAlgin4h;
-    Image maImgAlgin5h;
 
     const rtl::OUString msFontworkAlignment;
 
@@ -380,28 +375,21 @@ private:
 FontWorkAlignmentWindow::FontWorkAlignmentWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, Window* pParentWindow )
 : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_FONTWORK_ALIGNMENT ))
 , mrController( rController )
-, maImgAlgin1( SVX_RES( IMG_FONTWORK_ALIGN_LEFT_16 ) )
-, maImgAlgin2( SVX_RES( IMG_FONTWORK_ALIGN_CENTER_16 ) )
-, maImgAlgin3( SVX_RES( IMG_FONTWORK_ALIGN_RIGHT_16 ) )
-, maImgAlgin4( SVX_RES( IMG_FONTWORK_ALIGN_WORD_16 ) )
+, maImgAlgin1( SVX_RES( IMG_FONTWORK_ALIGN_LEFT_16    ) )
+, maImgAlgin2( SVX_RES( IMG_FONTWORK_ALIGN_CENTER_16  ) )
+, maImgAlgin3( SVX_RES( IMG_FONTWORK_ALIGN_RIGHT_16   ) )
+, maImgAlgin4( SVX_RES( IMG_FONTWORK_ALIGN_WORD_16    ) )
 , maImgAlgin5( SVX_RES( IMG_FONTWORK_ALIGN_STRETCH_16 ) )
-, maImgAlgin1h( SVX_RES( IMG_FONTWORK_ALIGN_LEFT_16_H ) )
-, maImgAlgin2h( SVX_RES( IMG_FONTWORK_ALIGN_CENTER_16_H ) )
-, maImgAlgin3h( SVX_RES( IMG_FONTWORK_ALIGN_RIGHT_16_H ) )
-, maImgAlgin4h( SVX_RES( IMG_FONTWORK_ALIGN_WORD_16_H ) )
-, maImgAlgin5h( SVX_RES( IMG_FONTWORK_ALIGN_STRETCH_16_H ) )
 , msFontworkAlignment( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkAlignment" ) )
 {
-    bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
     SetHelpId( HID_POPUP_FONTWORK_ALIGN );
     SetSelectHdl( LINK( this, FontWorkAlignmentWindow, SelectHdl ) );
 
-    appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT ) ), bHighContrast ? maImgAlgin1h : maImgAlgin1 );
-    appendEntry( 1, String( SVX_RES( STR_ALIGN_CENTER ) ), bHighContrast ? maImgAlgin2h : maImgAlgin2 );
-    appendEntry( 2, String( SVX_RES( STR_ALIGN_RIGHT ) ), bHighContrast ? maImgAlgin3h : maImgAlgin3 );
-    appendEntry( 3, String( SVX_RES( STR_ALIGN_WORD ) ), bHighContrast ? maImgAlgin4h : maImgAlgin4 );
-    appendEntry( 4, String( SVX_RES( STR_ALIGN_STRETCH ) ), bHighContrast ? maImgAlgin5h : maImgAlgin5 );
+    appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT    ) ), maImgAlgin1 );
+    appendEntry( 1, String( SVX_RES( STR_ALIGN_CENTER  ) ), maImgAlgin2 );
+    appendEntry( 2, String( SVX_RES( STR_ALIGN_RIGHT   ) ), maImgAlgin3 );
+    appendEntry( 3, String( SVX_RES( STR_ALIGN_WORD    ) ), maImgAlgin4 );
+    appendEntry( 4, String( SVX_RES( STR_ALIGN_STRETCH ) ), maImgAlgin5 );
 
     SetOutputSizePixel( getMenuSize() );
 
@@ -449,13 +437,11 @@ void FontWorkAlignmentWindow::DataChanged( const DataChangedEvent& rDCEvt )
 
     if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
     {
-        bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
-        appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT ) ), bHighContrast ? maImgAlgin1h : maImgAlgin1 );
-        appendEntry( 1, String( SVX_RES( STR_ALIGN_CENTER ) ), bHighContrast ? maImgAlgin2h : maImgAlgin2 );
-        appendEntry( 2, String( SVX_RES( STR_ALIGN_RIGHT ) ), bHighContrast ? maImgAlgin3h : maImgAlgin3 );
-        appendEntry( 3, String( SVX_RES( STR_ALIGN_WORD ) ), bHighContrast ? maImgAlgin4h : maImgAlgin4 );
-        appendEntry( 4, String( SVX_RES( STR_ALIGN_STRETCH ) ), bHighContrast ? maImgAlgin5h : maImgAlgin5 );
+        appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT    ) ), maImgAlgin1 );
+        appendEntry( 1, String( SVX_RES( STR_ALIGN_CENTER  ) ), maImgAlgin2 );
+        appendEntry( 2, String( SVX_RES( STR_ALIGN_RIGHT   ) ), maImgAlgin3 );
+        appendEntry( 3, String( SVX_RES( STR_ALIGN_WORD    ) ), maImgAlgin4 );
+        appendEntry( 4, String( SVX_RES( STR_ALIGN_STRETCH ) ), maImgAlgin5 );
     }
 }
 
@@ -587,13 +573,13 @@ FontWorkCharacterSpacingWindow::FontWorkCharacterSpacingWindow( svt::ToolboxCont
     SetSelectHdl( LINK( this, FontWorkCharacterSpacingWindow, SelectHdl ) );
 
     appendEntry( 0, String( SVX_RES( STR_CHARS_SPACING_VERY_TIGHT ) ), MIB_RADIOCHECK );
-    appendEntry( 1, String( SVX_RES( STR_CHARS_SPACING_TIGHT ) ), MIB_RADIOCHECK );
-    appendEntry( 2, String( SVX_RES( STR_CHARS_SPACING_NORMAL ) ), MIB_RADIOCHECK );
-    appendEntry( 3, String( SVX_RES( STR_CHARS_SPACING_LOOSE ) ), MIB_RADIOCHECK );
+    appendEntry( 1, String( SVX_RES( STR_CHARS_SPACING_TIGHT      ) ), MIB_RADIOCHECK );
+    appendEntry( 2, String( SVX_RES( STR_CHARS_SPACING_NORMAL     ) ), MIB_RADIOCHECK );
+    appendEntry( 3, String( SVX_RES( STR_CHARS_SPACING_LOOSE      ) ), MIB_RADIOCHECK );
     appendEntry( 4, String( SVX_RES( STR_CHARS_SPACING_VERY_LOOSE ) ), MIB_RADIOCHECK );
-    appendEntry( 5, String( SVX_RES( STR_CHARS_SPACING_CUSTOM ) ), MIB_RADIOCHECK );
+    appendEntry( 5, String( SVX_RES( STR_CHARS_SPACING_CUSTOM     ) ), MIB_RADIOCHECK );
     appendSeparator();
-    appendEntry( 6, String( SVX_RES( STR_CHARS_SPACING_KERN_PAIRS ) ), MIB_CHECKABLE );
+    appendEntry( 6, String( SVX_RES( STR_CHARS_SPACING_KERN_PAIRS ) ), MIB_CHECKABLE  );
 
     SetOutputSizePixel( getMenuSize() );
 
diff --git a/svx/source/tbxctrls/fontworkgallery.src b/svx/source/tbxctrls/fontworkgallery.src
index e5f52158b4b6..ffa1e7c9f3f0 100644
--- a/svx/source/tbxctrls/fontworkgallery.src
+++ b/svx/source/tbxctrls/fontworkgallery.src
@@ -130,101 +130,51 @@ DockingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT
         ImageBitmap = Bitmap { File = "fontworkalignleft_16.png"; };
         MASKCOLOR
     };
-    Image IMG_FONTWORK_ALIGN_LEFT_16_H
-    {
-        ImageBitmap = Bitmap { File = "fontworkalignleft_16_h.png"; };
-        MASKCOLOR
-    };
     Image IMG_FONTWORK_ALIGN_LEFT_26
     {
         ImageBitmap = Bitmap { File = "fontworkalignleft_26.png"; };
         MASKCOLOR
     };
-    Image IMG_FONTWORK_ALIGN_LEFT_26_H
-    {
-        ImageBitmap = Bitmap { File = "fontworkalignleft_26_h.png"; };
-        MASKCOLOR
-    };
     Image IMG_FONTWORK_ALIGN_CENTER_16
     {
         ImageBitmap = Bitmap { File = "fontworkaligncentered_16.png"; };
         MASKCOLOR
     };
-    Image IMG_FONTWORK_ALIGN_CENTER_16_H
-    {
-        ImageBitmap = Bitmap { File = "fontworkaligncentered_16_h.png"; };
-        MASKCOLOR
-    };
     Image IMG_FONTWORK_ALIGN_CENTER_26
     {
         ImageBitmap = Bitmap { File = "fontworkaligncentered_26.png"; };
         MASKCOLOR
     };
-    Image IMG_FONTWORK_ALIGN_CENTER_26_H
-    {
-        ImageBitmap = Bitmap { File = "fontworkaligncentered_26_h.png"; };
-        MASKCOLOR
-    };
     Image IMG_FONTWORK_ALIGN_RIGHT_16
     {
         ImageBitmap = Bitmap { File = "fontworkalignright_16.png"; };
         MASKCOLOR
     };
-    Image IMG_FONTWORK_ALIGN_RIGHT_16_H
-    {
-        ImageBitmap = Bitmap { File = "fontworkalignright_16_h.png"; };
-        MASKCOLOR
-    };
     Image IMG_FONTWORK_ALIGN_RIGHT_26
     {
         ImageBitmap = Bitmap { File = "fontworkalignright_26.png"; };
         MASKCOLOR
     };
-    Image IMG_FONTWORK_ALIGN_RIGHT_26_H
-    {
-        ImageBitmap = Bitmap { File = "fontworkalignright_26_h.png"; };
-        MASKCOLOR
-    };
     Image IMG_FONTWORK_ALIGN_WORD_16
     {
         ImageBitmap = Bitmap { File = "fontworkalignjustified_16.png"; };
         MASKCOLOR
     };
-    Image IMG_FONTWORK_ALIGN_WORD_16_H
-    {
-        ImageBitmap = Bitmap { File = "fontworkalignjustified_16_h.png"; };
-        MASKCOLOR
-    };
     Image IMG_FONTWORK_ALIGN_WORD_26
     {
         ImageBitmap = Bitmap { File = "fontworkalignjustified_26.png"; };
         MASKCOLOR
     };
-    Image IMG_FONTWORK_ALIGN_WORD_26_H
-    {
-        ImageBitmap = Bitmap { File = "fontworkalignjustified_26_h.png"; };
-        MASKCOLOR
-    };
     Image IMG_FONTWORK_ALIGN_STRETCH_16
     {
         ImageBitmap = Bitmap { File = "fontworkalignstretch_16.png"; };
         MASKCOLOR
     };
-    Image IMG_FONTWORK_ALIGN_STRETCH_16_H
-    {
-        ImageBitmap = Bitmap { File = "fontworkalignstretch_16_h.png"; };
-        MASKCOLOR
-    };
     Image IMG_FONTWORK_ALIGN_STRETCH_26
     {
         ImageBitmap = Bitmap { File = "fontworkalignstretch_26.png"; };
         MASKCOLOR
     };
-    Image IMG_FONTWORK_ALIGN_STRETCH_26_H
-    {
-        ImageBitmap = Bitmap { File = "fontworkalignstretch_26_h.png"; };
-        MASKCOLOR
-    };
 };
 
 DockingWindow RID_SVXFLOAT_FONTWORK_CHARSPACING
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 0d9728067d27..cd94a9156acd 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -253,21 +253,20 @@ struct CommandToRID
 {
     const char* pCommand;
     USHORT      nResId;
-    USHORT      nHCResId;
 };
 
-static USHORT ImplGetRID( const OUString& aCommand, bool bHighContrast )
+static USHORT ImplGetRID( const OUString& aCommand )
 {
     static const CommandToRID aImplCommandToResMap[] =
     {
-        { ".uno:GrafRed", RID_SVXIMG_GRAF_RED, RID_SVXIMG_GRAF_RED_H },
-        { ".uno:GrafGreen", RID_SVXIMG_GRAF_GREEN, RID_SVXIMG_GRAF_GREEN_H },
-        { ".uno:GrafBlue", RID_SVXIMG_GRAF_BLUE, RID_SVXIMG_GRAF_BLUE_H },
-        { ".uno:GrafLuminance", RID_SVXIMG_GRAF_LUMINANCE, RID_SVXIMG_GRAF_LUMINANCE_H },
-        { ".uno:GrafContrast", RID_SVXIMG_GRAF_CONTRAST, RID_SVXIMG_GRAF_CONTRAST_H },
-        { ".uno:GrafGamma", RID_SVXIMG_GRAF_GAMMA, RID_SVXIMG_GRAF_GAMMA_H },
-        { ".uno:GrafTransparence", RID_SVXIMG_GRAF_TRANSPARENCE, RID_SVXIMG_GRAF_TRANSPARENCE_H },
-        { 0, 0, 0 }
+        { ".uno:GrafRed",           RID_SVXIMG_GRAF_RED             },
+        { ".uno:GrafGreen",         RID_SVXIMG_GRAF_GREEN           },
+        { ".uno:GrafBlue",          RID_SVXIMG_GRAF_BLUE            },
+        { ".uno:GrafLuminance",     RID_SVXIMG_GRAF_LUMINANCE       },
+        { ".uno:GrafContrast",      RID_SVXIMG_GRAF_CONTRAST        },
+        { ".uno:GrafGamma",         RID_SVXIMG_GRAF_GAMMA           },
+        { ".uno:GrafTransparence",  RID_SVXIMG_GRAF_TRANSPARENCE    },
+        { 0, 0 }
     };
 
     USHORT nRID = 0;
@@ -277,10 +276,7 @@ static USHORT ImplGetRID( const OUString& aCommand, bool bHighContrast )
     {
         if ( aCommand.equalsAscii( aImplCommandToResMap[ i ].pCommand ))
         {
-            if ( bHighContrast )
-                nRID = aImplCommandToResMap[ i ].nHCResId;
-            else
-                nRID = aImplCommandToResMap[ i ].nResId;
+            nRID = aImplCommandToResMap[ i ].nResId;
             break;
         }
         ++i;
@@ -313,23 +309,23 @@ public:
 
 // -----------------------------------------------------------------------------
 
-ImplGrafControl::ImplGrafControl( Window* pParent, USHORT nSlotId, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame ) :
-    Control( pParent, WB_TABSTOP ),
-    maImage     ( this ),
-    maField     ( this, rCmd, rFrame )
+ImplGrafControl::ImplGrafControl(
+    Window* pParent,
+    USHORT nSlotId,
+    const rtl::OUString& rCmd,
+    const Reference< XFrame >& rFrame
+)   : Control( pParent, WB_TABSTOP )
+    , maImage( this )
+    , maField( this, rCmd, rFrame )
 {
-    ResId   aResId( ImplGetRID( rCmd, false ), DIALOG_MGR() ) ;
+    ResId   aResId( ImplGetRID( rCmd ), DIALOG_MGR() ) ;
     Image   aImage( aResId );
 
-    ResId   aResIdHC( ImplGetRID( rCmd, true ), DIALOG_MGR() ) ;
-    Image   aImageHC( aResIdHC );
-
     Size    aImgSize( aImage.GetSizePixel() );
     Size    aFldSize( maField.GetSizePixel() );
     long    nFldY, nImgY;
 
     maImage.SetImage( aImage );
-    maImage.SetModeImage( aImageHC, BMP_COLOR_HIGHCONTRAST );
     maImage.SetSizePixel( aImgSize );
     // we want to see the backbround of the toolbox, not of the FixedImage or Control
     maImage.SetBackground( Wallpaper( COL_TRANSPARENT ) );
@@ -401,9 +397,9 @@ ImplGrafModeControl::ImplGrafModeControl( Window* pParent, const Reference< XFra
 {
     SetSizePixel( Size( 100, 260 ) );
 
-    InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_STANDARD ) );
-    InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_GREYS ) );
-    InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_MONO ) );
+    InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_STANDARD  ) );
+    InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_GREYS     ) );
+    InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_MONO      ) );
     InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_WATERMARK ) );
 
     Show();
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index c031f6b87fc2..056392c1de71 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -72,7 +72,6 @@ using namespace ::com::sun::star::beans;
 
 SvxLineBox::SvxLineBox( Window* pParent, const Reference< XFrame >& rFrame, WinBits nBits ) :
     LineLB( pParent, nBits ),
-    meBmpMode   ( GetSettings().GetStyleSettings().GetHighContrastMode() ? BMP_COLOR_HIGHCONTRAST : BMP_COLOR_NORMAL ),
     nCurPos     ( 0 ),
     aLogicalSize(40,140),
     bRelease    ( TRUE ),
@@ -116,8 +115,6 @@ void SvxLineBox::Select()
     {
         XLineStyle eXLS;
         USHORT nPos = GetSelectEntryPos();
-//      SfxDispatcher* pDisp = rBindings.GetDispatcher();
-        //DBG_ASSERT( pDisp, "invalid Dispatcher" );
 
         switch ( nPos )
         {
@@ -152,7 +149,6 @@ void SvxLineBox::Select()
                     SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ),
                                                  ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineDash" )),
                                                  aArgs );
-//                    pDisp->Execute( SID_ATTR_LINE_DASH, SFX_CALLMODE_RECORD, &aLineDashItem, 0L );
                 }
             }
             break;
@@ -167,7 +163,6 @@ void SvxLineBox::Select()
         SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ),
                                      ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:XLineStyle" )),
                                      aArgs );
-//      pDisp->Execute( SID_ATTR_LINE_STYLE, SFX_CALLMODE_RECORD, &aLineStyleItem, 0L );
 
         nCurPos = GetSelectEntryPos();
         ReleaseFocus_Impl();
@@ -248,9 +243,7 @@ void SvxLineBox::ReleaseFocus_Impl()
             pShellWnd->GrabFocus();
     }
 }
-/* -----------------------------08.03.2002 15:39------------------------------
 
- ---------------------------------------------------------------------------*/
 void SvxLineBox::DataChanged( const DataChangedEvent& rDCEvt )
 {
     if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
@@ -259,20 +252,9 @@ void SvxLineBox::DataChanged( const DataChangedEvent& rDCEvt )
         SetSizePixel(LogicToPixel(aLogicalSize, MAP_APPFONT));
         Size aDropSize( aLogicalSize.Width(), LOGICAL_EDIT_HEIGHT);
         SetDropDownSizePixel(LogicToPixel(aDropSize, MAP_APPFONT));
-   }
+    }
 
     LineLB::DataChanged( rDCEvt );
-
-    if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
-         (rDCEvt.GetFlags() & SETTINGS_STYLE) )
-    {
-        BmpColorMode eMode = GetSettings().GetStyleSettings().GetHighContrastMode() ? BMP_COLOR_HIGHCONTRAST : BMP_COLOR_NORMAL;
-        if( eMode != meBmpMode )
-        {
-            meBmpMode = eMode;
-            FillControl();
-        }
-     }
 }
 
 void SvxLineBox::FillControl()
@@ -287,10 +269,8 @@ void SvxLineBox::FillControl()
         if ( pItem )
             Fill( pItem->GetDashList() );
     }
-
-
-//  rBindings.Invalidate( SID_ATTR_LINE_DASH );
 }
+
 //========================================================================
 // SvxColorBox
 //========================================================================
@@ -332,7 +312,6 @@ IMPL_LINK( SvxColorBox, DelayHdl_Impl, Timer *, EMPTYARG )
         const SvxColorTableItem* pItem = (const SvxColorTableItem*)( pSh->GetItem( SID_COLOR_TABLE ) );
         if ( pItem )
             Fill( pItem->GetColorTable() );
-//      rBindings.Invalidate( nId );
     }
     return 0;
 }
@@ -373,7 +352,6 @@ void SvxColorBox::Select()
         SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ),
                                      maCommand,
                                      aArgs );
-//        rBindings.GetDispatcher()->Execute( nId, SFX_CALLMODE_RECORD, &aLineColorItem, 0L );
 
         nCurPos = GetSelectEntryPos();
         ReleaseFocus_Impl();
@@ -436,9 +414,7 @@ long SvxColorBox::Notify( NotifyEvent& rNEvt )
     }
     return nHandled;
 }
-/* -----------------------------08.03.2002 15:35------------------------------
 
- ---------------------------------------------------------------------------*/
 void SvxColorBox::DataChanged( const DataChangedEvent& rDCEvt )
 {
     if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
@@ -532,7 +508,6 @@ void SvxMetricField::Modify()
     SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ),
                                  ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineWidth" )),
                                  aArgs );
-//  rBindings.GetDispatcher()->Execute( SID_ATTR_LINE_WIDTH, SFX_CALLMODE_RECORD, &aLineWidthItem, 0L );
 }
 
 // -----------------------------------------------------------------------
@@ -638,9 +613,7 @@ long SvxMetricField::Notify( NotifyEvent& rNEvt )
     }
     return nHandled;
 }
-/* -----------------------------08.03.2002 15:32------------------------------
 
- ---------------------------------------------------------------------------*/
 void SvxMetricField::DataChanged( const DataChangedEvent& rDCEvt )
 {
     if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 17484f021167..c67194929ce9 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -382,7 +382,7 @@ void TableWindow::TableDialog( const Sequence< PropertyValue >& rArgs )
     {
         com::sun::star::util::URL aTargetURL;
         Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
-                    rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))),
                 UNO_QUERY );
         aTargetURL.Complete = maCommand;
         xTrans->parseStrict( aTargetURL );
@@ -511,14 +511,10 @@ void ColumnsWindow::MouseMove( const MouseEvent& rMEvt )
         nNewCol = 20;
     UpdateSize_Impl( nNewCol );
 }
-/* -----------------------------21.05.2002 16:16------------------------------
 
- ---------------------------------------------------------------------------*/
 void ColumnsWindow::UpdateSize_Impl( long nNewCol )
 {
     Size    aWinSize = GetOutputSizePixel();
-    long    nMinCol = 0;
-    long    nMaxCol = 0;
     Point   aWinPos;// = GetPosPixel();
 
     if ( nWidth <= nNewCol )
@@ -549,6 +545,8 @@ void ColumnsWindow::UpdateSize_Impl( long nNewCol )
         Invalidate( Rectangle( 0, aWinSize.Height()-nTextHeight+2,
                                aWinSize.Width(), aWinSize.Height() ) );
 
+        long nMinCol = 0, nMaxCol = 0;
+
         if ( nNewCol < nCol )
         {
             nMinCol = nNewCol;
@@ -573,9 +571,7 @@ void ColumnsWindow::MouseButtonDown( const MouseEvent& rMEvt )
     SfxPopupWindow::MouseButtonDown( rMEvt );
     CaptureMouse();
 }
-/* -----------------------------21.05.2002 16:11------------------------------
 
- ---------------------------------------------------------------------------*/
 void ColumnsWindow::KeyInput( const KeyEvent& rKEvt )
 {
     BOOL bHandled = FALSE;
@@ -836,9 +832,7 @@ SfxPopupWindow* SvxColumnsToolBoxControl::CreatePopupWindowCascading()
     }
     return pWin;
 }
-/* -----------------18.11.99 16:38-------------------
 
- --------------------------------------------------*/
 void SvxColumnsToolBoxControl::StateChanged( USHORT nSID,
                                               SfxItemState eState,
                                               const SfxPoolItem* pState )
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 8ae28bffc82c..159489adec0c 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -276,15 +276,8 @@ public:
                                   const SfxPoolItem* pState );
     virtual SfxPopupWindow* Clone() const;
     virtual void    DataChanged( const DataChangedEvent& rDCEvt );
-
-    inline BOOL     IsHighContrast( void ) const;
 };
 
-inline BOOL SvxFrameWindow_Impl::IsHighContrast( void ) const
-{
-    return GetSettings().GetStyleSettings().GetHighContrastMode();
-}
-
 //========================================================================
 // class SvxLineWindow_Impl ---------------------------------------------------
 //========================================================================
@@ -440,16 +433,16 @@ void SvxStyleBox_Impl::Select()
 
             Sequence< PropertyValue > aArgs( 2 );
             aArgs[0].Value  = makeAny( OUString( aSelEntry ) );
-            aArgs[1].Name   = OUString::createFromAscii( "Family" );
+            aArgs[1].Name   = OUString(RTL_CONSTASCII_USTRINGPARAM("Family"));
             aArgs[1].Value  = makeAny( sal_Int16( eStyleFamily ));
             if( bCreateNew )
             {
-                aArgs[0].Name   = OUString::createFromAscii( "Param" );
+                aArgs[0].Name   = OUString(RTL_CONSTASCII_USTRINGPARAM("Param"));
                 SfxToolBoxControl::Dispatch( m_xDispatchProvider, String::CreateFromAscii(".uno:StyleNewByExample"), aArgs);
             }
             else
             {
-                aArgs[0].Name   = OUString::createFromAscii( "Template" );
+                aArgs[0].Name   = OUString(RTL_CONSTASCII_USTRINGPARAM("Template"));
                 SfxToolBoxControl::Dispatch( m_xDispatchProvider, m_aCommand, aArgs );
             }
         }
@@ -511,9 +504,7 @@ long SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt )
     }
     return nHandled ? nHandled : ComboBox::Notify( rNEvt );
 }
-/* -----------------------------08.03.2002 13:03------------------------------
 
- ---------------------------------------------------------------------------*/
 void SvxStyleBox_Impl::DataChanged( const DataChangedEvent& rDCEvt )
 {
     if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
@@ -1066,7 +1057,7 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >&
     BindListener();
     String sCommand(String::CreateFromAscii( ".uno:BorderReducedMode" ));
     AddStatusListener( sCommand );
-    aImgList = ImageList( SVX_RES( IsHighContrast()? RID_SVXIL_FRAME_HC : RID_SVXIL_FRAME ) );
+    aImgList = ImageList( SVX_RES( RID_SVXIL_FRAME ) );
 
     /*
      *  1       2        3         4
@@ -1097,9 +1088,7 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >&
     SetText( SVX_RESSTR(RID_SVXSTR_FRAME) );
     aFrameSet.Show();
 }
-/*-- 22.09.2004 12:27:50---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SvxFrameWindow_Impl::~SvxFrameWindow_Impl()
 {
     UnbindListener();
@@ -1127,7 +1116,7 @@ void SvxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt )
 
     if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
     {
-        aImgList = ImageList( SVX_RES( IsHighContrast()? RID_SVXIL_FRAME_HC : RID_SVXIL_FRAME ) );
+        aImgList = ImageList( SVX_RES( RID_SVXIL_FRAME ) );
 
         USHORT  nNumOfItems = aFrameSet.GetItemCount();
 
diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
index f3e068f56226..acdd4586e619 100644
--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.src
@@ -40,11 +40,13 @@ Image RID_SVX_RELOAD_NORMAL
     ImageBitmap = Bitmap { File = "reload.bmp" ; };
     MASKCOLOR
 };
+
 Image RID_SVX_RELOAD_SPECIAL
 {
     ImageBitmap = Bitmap { File = "reloads.bmp" ; };
     MASKCOLOR
 };
+
 ImageList RID_SVXIL_FRAME
 {
     Prefix = "fr";
@@ -52,33 +54,32 @@ ImageList RID_SVXIL_FRAME
     IdCount = { 12 ; };
     MASKCOLOR
 };
-ImageList RID_SVXIL_FRAME_HC
-{
-    Prefix = "frh";
-    IdList = { 1 ; 2 ; 3 ; 4 ; 5 ; 6 ; 7 ; 8 ; 9 ; 10 ; 11 ; 12 ; };
-    IdCount = { 12 ; };
-    MASKCOLOR
-};
+
 String RID_SVXSTR_TRANSPARENT
 {
     Text [ en-US ] = "No Fill" ;
 };
 String RID_SVXSTR_FILLPATTERN
+
 {
     Text [ en-US ] = "Pattern" ;
 };
+
 String RID_SVXSTR_FRAME
 {
     Text [ en-US ] = "Borders" ;
 };
+
 String RID_SVXSTR_FRAME_STYLE
 {
     Text [ en-US ] = "Border Style" ;
 };
+
 String RID_SVXSTR_FRAME_COLOR
 {
     Text [ en-US ] = "Border Color" ;
 };
+
 ComboBox RID_SVXTBX_STYLE
 {
     HelpId = HID_STYLE_LISTBOX ;
@@ -90,22 +91,27 @@ ComboBox RID_SVXTBX_STYLE
     Border = TRUE ;
     Hide = TRUE ;
 };
+
 String RID_SVXSTR_EXTRAS_CHARBACKGROUND
 {
     Text [ en-US ] = "Highlighting" ;
 };
+
 String RID_SVXSTR_BACKGROUND
 {
     Text [ en-US ] = "Background";
 };
+
 String RID_SVXSTR_AUTOMATIC
 {
     Text [ en-US ] = "Automatic";
 };
+
 String RID_SVXSTR_PAGES
 {
     Text [ en-US ] = "Pages";
 };
+
 Image RID_SVXIMG_GRAF_RED
 {
     ImageBitmap = Bitmap { File = "sc10865.bmp" ; };
@@ -141,45 +147,12 @@ Image RID_SVXIMG_GRAF_TRANSPARENCE
     ImageBitmap = Bitmap { File = "sc10869.bmp" ; };
     MASKCOLOR
 };
-Image RID_SVXIMG_GRAF_RED_H
-{
-    ImageBitmap = Bitmap { File = "sch10865.bmp" ; };
-    MASKCOLOR
-};
-Image RID_SVXIMG_GRAF_GREEN_H
-{
-    ImageBitmap = Bitmap { File = "sch10866.bmp" ; };
-    MASKCOLOR
-};
-Image RID_SVXIMG_GRAF_BLUE_H
-{
-    ImageBitmap = Bitmap { File = "sch10867.bmp" ; };
-    MASKCOLOR
-};
-Image RID_SVXIMG_GRAF_LUMINANCE_H
-{
-    ImageBitmap = Bitmap { File = "sch10863.bmp" ; };
-    MASKCOLOR
-};
-Image RID_SVXIMG_GRAF_CONTRAST_H
-{
-    ImageBitmap = Bitmap { File = "sch10864.bmp" ; };
-    MASKCOLOR
-};
-Image RID_SVXIMG_GRAF_GAMMA_H
-{
-    ImageBitmap = Bitmap { File = "sch10868.bmp" ; };
-    MASKCOLOR
-};
-Image RID_SVXIMG_GRAF_TRANSPARENCE_H
-{
-    ImageBitmap = Bitmap { File = "sch10869.bmp" ; };
-    MASKCOLOR
-};
+
 String RID_SVXSTR_CLEARFORM
 {
     Text [ en-US ] = "Clear formatting";
 };
+
 String RID_SVXSTR_MORE
 {
     Text [ en-US ] = "More...";
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index a416636bed3d..c775a967c112 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -46,16 +46,16 @@
 namespace svx
 {
 
-static const ::rtl::OUString SEARCHITEM_SEARCHSTRING   = ::rtl::OUString::createFromAscii("SearchItem.SearchString");
-static const ::rtl::OUString SEARCHITEM_SEARCHBACKWARD = ::rtl::OUString::createFromAscii("SearchItem.Backward");
+static const ::rtl::OUString SEARCHITEM_SEARCHSTRING( RTL_CONSTASCII_USTRINGPARAM( "SearchItem.SearchString" ) );
+static const ::rtl::OUString SEARCHITEM_SEARCHBACKWARD( RTL_CONSTASCII_USTRINGPARAM( "SearchItem.Backward" ) );
 
-static const ::rtl::OUString COMMAND_EXECUTESEARCH = ::rtl::OUString::createFromAscii(".uno:ExecuteSearch");
-static const ::rtl::OUString COMMAND_FINDTEXT   = ::rtl::OUString::createFromAscii(".uno:FindText")  ;
-static const ::rtl::OUString COMMAND_DOWNSEARCH = ::rtl::OUString::createFromAscii(".uno:DownSearch");
-static const ::rtl::OUString COMMAND_UPSEARCH   = ::rtl::OUString::createFromAscii(".uno:UpSearch")  ;
-static const ::rtl::OUString COMMAND_APPENDSEARCHHISTORY   = ::rtl::OUString::createFromAscii("AppendSearchHistory");
+static const ::rtl::OUString COMMAND_EXECUTESEARCH( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExecuteSearch" ) );
+static const ::rtl::OUString COMMAND_FINDTEXT( RTL_CONSTASCII_USTRINGPARAM( ".uno:FindText" ) );
+static const ::rtl::OUString COMMAND_DOWNSEARCH( RTL_CONSTASCII_USTRINGPARAM(".uno:DownSearch") );
+static const ::rtl::OUString COMMAND_UPSEARCH( RTL_CONSTASCII_USTRINGPARAM(".uno:UpSearch") );
+static const ::rtl::OUString COMMAND_APPENDSEARCHHISTORY( RTL_CONSTASCII_USTRINGPARAM( "AppendSearchHistory") );
 
-static const ::rtl::OUString SERVICENAME_URLTRANSFORMER = ::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer");
+static const ::rtl::OUString SERVICENAME_URLTRANSFORMER( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer") );
 static const sal_Int32       REMEMBER_SIZE = 10;
 
 void impl_executeSearch( const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr, const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Sequence< css::beans::PropertyValue >& lArgs )
@@ -801,12 +801,12 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css
             return;
 
         css::uno::Reference< css::frame::XLayoutManager > xLayoutManager;
-        css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString::createFromAscii("LayoutManager") );
+        css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )) );
         aValue >>= xLayoutManager;
         if (!xLayoutManager.is())
             return;
 
-        const ::rtl::OUString sResourceURL = ::rtl::OUString::createFromAscii("private:resource/toolbar/findbar");
+        const ::rtl::OUString sResourceURL = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/findbar" ));
         css::uno::Reference< css::ui::XUIElement > xUIElement = xLayoutManager->getElement(sResourceURL);
         if (!xUIElement.is())
             return;
diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx
index 428a57fc0817..a4d528a70eca 100644
--- a/svx/source/tbxctrls/tbxalign.cxx
+++ b/svx/source/tbxctrls/tbxalign.cxx
@@ -118,7 +118,7 @@ void SAL_CALL SvxTbxCtlAlign::functionSelected( const ::rtl::OUString& aCommand
         if ( aCommand.getLength() > 0 )
         {
             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( getFrameInterface());
-            Image aImage = GetImage( xFrame, aCommand, hasBigImages(), isHighContrast() );
+            Image aImage = GetImage( xFrame, aCommand, hasBigImages() );
             if ( !!aImage )
                 GetToolBox().SetItemImage( GetId(), aImage );
         }
@@ -133,7 +133,7 @@ void SAL_CALL SvxTbxCtlAlign::updateImage() throw (::com::sun::star::uno::Runtim
     if ( m_aCommand.getLength() > 0 )
     {
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( getFrameInterface());
-        Image aImage = GetImage( xFrame, m_aCommand, hasBigImages(), isHighContrast() );
+        Image aImage = GetImage( xFrame, m_aCommand, hasBigImages() );
         if ( !!aImage )
             GetToolBox().SetItemImage( GetId(), aImage );
     }
diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx
index 3bbe2ca67e53..1f43c5c0f4d1 100644
--- a/svx/source/tbxctrls/verttexttbxctrl.cxx
+++ b/svx/source/tbxctrls/verttexttbxctrl.cxx
@@ -41,8 +41,6 @@
 SFX_IMPL_TOOLBOX_CONTROL(SvxCTLTextTbxCtrl, SfxBoolItem);
 SFX_IMPL_TOOLBOX_CONTROL(SvxVertTextTbxCtrl, SfxBoolItem);
 
-// -----------------------------27.04.01 15:50--------------------------------
-
 SvxCTLTextTbxCtrl::SvxCTLTextTbxCtrl(USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
     SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx )
 {
@@ -64,15 +62,10 @@ SvxVertCTLTextTbxCtrl::SvxVertCTLTextTbxCtrl( USHORT nSlotId, USHORT nId, ToolBo
 {
 }
 
-/* -----------------------------27.04.01 15:53--------------------------------
-
- ---------------------------------------------------------------------------*/
 SvxVertCTLTextTbxCtrl::~SvxVertCTLTextTbxCtrl( )
 {
 }
-/* -----------------------------27.04.01 15:50--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SvxVertCTLTextTbxCtrl::StateChanged(
     USHORT nSID,
     SfxItemState eState,
@@ -118,8 +111,5 @@ void SvxVertCTLTextTbxCtrl::StateChanged(
         }
     }
 }
-/* -----------------------------27.04.01 15:50--------------------------------
-
- ---------------------------------------------------------------------------*/
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 6d8ab7793caa..0c57f0459bb3 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -492,7 +492,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent )
 
     SvtLinguConfig  aLngCfg;
     sal_Bool bValue = sal_Bool();
-    Any aAny( aLngCfg.GetProperty( rtl::OUString::createFromAscii( UPN_IS_REVERSE_MAPPING ) ) );
+    Any aAny( aLngCfg.GetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_REVERSE_MAPPING )) ) );
     if( aAny >>= bValue )
         m_aCB_Reverse.Check( bValue );
 
@@ -511,7 +511,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent )
         {
             Reference< linguistic2::XConversionDictionaryList > xDictionaryList(
                                 m_xFactory->createInstanceWithContext(
-                                    rtl::OUString::createFromAscii("com.sun.star.linguistic2.ConversionDictionaryList")
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.ConversionDictionaryList"))
                                     , m_xContext), uno::UNO_QUERY);
             if( xDictionaryList.is() )
             {
@@ -520,17 +520,17 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent )
                 {
                     try
                     {
-                        rtl::OUString aNameTo_Simplified( rtl::OUString::createFromAscii("ChineseT2S") );
-                        rtl::OUString aNameTo_Traditional( rtl::OUString::createFromAscii("ChineseS2T") );
+                        rtl::OUString aNameTo_Simplified( RTL_CONSTASCII_USTRINGPARAM("ChineseT2S") );
+                        rtl::OUString aNameTo_Traditional( RTL_CONSTASCII_USTRINGPARAM("ChineseS2T") );
                         lang::Locale aLocale;
-                        aLocale.Language = rtl::OUString::createFromAscii("zh");
+                        aLocale.Language = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("zh") );
 
                         if( xContainer->hasByName( aNameTo_Simplified ) )
                             xDictionary_To_Simplified = Reference< linguistic2::XConversionDictionary >(
                                     xContainer->getByName( aNameTo_Simplified ), UNO_QUERY );
                         else
                         {
-                            aLocale.Country = rtl::OUString::createFromAscii("TW");
+                            aLocale.Country = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TW") );
                             xDictionary_To_Simplified = Reference< linguistic2::XConversionDictionary >(
                                     xDictionaryList->addNewDictionary( aNameTo_Simplified
                                     , aLocale, linguistic2::ConversionDictionaryType::SCHINESE_TCHINESE
@@ -545,7 +545,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent )
                                     xContainer->getByName( aNameTo_Traditional ), UNO_QUERY );
                         else
                         {
-                            aLocale.Country = rtl::OUString::createFromAscii("CN");
+                            aLocale.Country = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CN") );
                             xDictionary_To_Traditional = Reference< linguistic2::XConversionDictionary >(
                                     xDictionaryList->addNewDictionary( aNameTo_Traditional
                                     , aLocale, linguistic2::ConversionDictionaryType::SCHINESE_TCHINESE
@@ -850,7 +850,7 @@ short ChineseDictionaryDialog::Execute()
         SvtLinguConfig  aLngCfg;
         Any aAny;
         aAny <<= sal_Bool( !!m_aCB_Reverse.IsChecked() );
-        aLngCfg.SetProperty( rtl::OUString::createFromAscii( UPN_IS_REVERSE_MAPPING ), aAny );
+        aLngCfg.SetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_REVERSE_MAPPING )), aAny );
 
         m_aCT_DictionaryToSimplified.save();
         m_aCT_DictionaryToTraditional.save();
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
index 288b6d2967a2..dbc47e20aebb 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
@@ -52,8 +52,8 @@ namespace textconversiondlgs
 //.............................................................................
 using namespace ::com::sun::star;
 
-#define SERVICE_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.linguistic2.ChineseTranslationDialog")
-#define SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.linguistic2.ChineseTranslationDialog")
+#define SERVICE_IMPLEMENTATION_NAME ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.linguistic2.ChineseTranslationDialog"))
+#define SERVICE_NAME ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.ChineseTranslationDialog"))
 
 #define C2U(cChar) rtl::OUString::createFromAscii(cChar)
 
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
index 683c93f6bbbf..2a8a32bee32b 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
@@ -77,14 +77,14 @@ ChineseTranslationDialog::ChineseTranslationDialog( Window* pParent )
 
     SvtLinguConfig  aLngCfg;
     sal_Bool bValue = sal_Bool();
-    Any aAny( aLngCfg.GetProperty( rtl::OUString::createFromAscii( UPN_IS_DIRECTION_TO_SIMPLIFIED ) ) );
+    Any aAny( aLngCfg.GetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_DIRECTION_TO_SIMPLIFIED )) ) );
     aAny >>= bValue;
     if( bValue )
         m_aRB_To_Simplified.Check();
     else
         m_aRB_To_Traditional.Check();
 
-    aAny = aLngCfg.GetProperty( rtl::OUString::createFromAscii( UPN_IS_USE_CHARACTER_VARIANTS ) );
+    aAny = aLngCfg.GetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_USE_CHARACTER_VARIANTS )) );
     if( aAny >>= bValue )
         m_aCB_Use_Variants.Check( bValue );
 
@@ -96,7 +96,7 @@ ChineseTranslationDialog::ChineseTranslationDialog( Window* pParent )
     m_aCB_Use_Variants.Enable( sal_False );
     m_aCB_Use_Variants.Show( sal_False );
 
-    aAny = aLngCfg.GetProperty( rtl::OUString::createFromAscii( UPN_IS_TRANSLATE_COMMON_TERMS ) );
+    aAny = aLngCfg.GetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_TRANSLATE_COMMON_TERMS )) );
     if( aAny >>= bValue )
         m_aCB_Translate_Commonterms.Check( bValue );
 
@@ -154,11 +154,11 @@ IMPL_LINK( ChineseTranslationDialog, OkHdl, void*, EMPTYARG )
     SvtLinguConfig  aLngCfg;
     Any aAny;
     aAny <<= sal_Bool( !!m_aRB_To_Simplified.IsChecked() );
-    aLngCfg.SetProperty( rtl::OUString::createFromAscii( UPN_IS_DIRECTION_TO_SIMPLIFIED ), aAny );
+    aLngCfg.SetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_DIRECTION_TO_SIMPLIFIED )), aAny );
     aAny <<= sal_Bool( !!m_aCB_Use_Variants.IsChecked() );
-    aLngCfg.SetProperty( rtl::OUString::createFromAscii( UPN_IS_USE_CHARACTER_VARIANTS ), aAny );
+    aLngCfg.SetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_USE_CHARACTER_VARIANTS )), aAny );
     aAny <<= sal_Bool( !!m_aCB_Translate_Commonterms.IsChecked() );
-    aLngCfg.SetProperty( rtl::OUString::createFromAscii( UPN_IS_TRANSLATE_COMMON_TERMS ), aAny );
+    aLngCfg.SetProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_TRANSLATE_COMMON_TERMS )), aAny );
 
     EndDialog( RET_OK );
     return 0;
diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx
index e9ac73c05451..a210192ade6e 100644
--- a/svx/source/unodraw/UnoNameItemTable.cxx
+++ b/svx/source/unodraw/UnoNameItemTable.cxx
@@ -160,7 +160,7 @@ void SAL_CALL SvxUnoNameItemTable::removeByName( const OUString& aApiName )
             maItemSetVector.erase( aIter );
             return;
         }
-        aIter++;
+        ++aIter;
     }
 
     if( !hasByName( Name ) )
@@ -195,7 +195,7 @@ void SAL_CALL SvxUnoNameItemTable::replaceByName( const OUString& aApiName, cons
             (*aIter)->Put( *pNewItem );
             return;
         }
-        aIter++;
+        ++aIter;
     }
 
     // if it is not in our own sets, modify the pool!
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index 6f010ad688b9..e7e000d54b0d 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -45,8 +45,8 @@
 //===============================================
 // const
 
-#define IMPLEMENTATIONNAME_RECOVERYUI       ::rtl::OUString::createFromAscii("com.sun.star.comp.svx.RecoveryUI")
-#define SERVICENAME_RECOVERYUI              ::rtl::OUString::createFromAscii("com.sun.star.dialog.RecoveryUI")
+#define IMPLEMENTATIONNAME_RECOVERYUI       ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.svx.RecoveryUI"))
+#define SERVICENAME_RECOVERYUI              ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.dialog.RecoveryUI"))
 
 //===============================================
 // namespace
@@ -191,16 +191,16 @@ static OUString GetCrashConfigDir()
 {
 
 #if defined(WNT) || defined(OS2)
-    OUString    ustrValue = OUString::createFromAscii("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}");
+    OUString    ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}"));
 #elif defined(MACOSX)
-    OUString    ustrValue = OUString::createFromAscii("~");
+    OUString    ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("~"));
 #else
-    OUString    ustrValue = OUString::createFromAscii("$SYSUSERCONFIG");
+    OUString    ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("$SYSUSERCONFIG"));
 #endif
     Bootstrap::expandMacros( ustrValue );
 
 #if defined(WNT) || defined(OS2)
-    ustrValue += OUString::createFromAscii("/user/crashdata");
+    ustrValue += OUString(RTL_CONSTASCII_USTRINGPARAM("/user/crashdata"));
 #endif
     return ustrValue;
 }
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 6765b586cf29..43b7ad2c02ee 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -123,7 +123,7 @@ bool SvxOle2Shape::setPropertyValueImpl( const ::rtl::OUString& rName, const Sfx
                     {
                         SfxObjectShell* pPersist = mpModel->GetPersist();
                         ::rtl::OUString aPersistName;
-                        Any aAny( getPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ) ) );
+                        Any aAny( getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_OLE2_PERSISTNAME )) ) );
                         aAny >>= aPersistName;
 
                         //TODO/LATER: how to cope with creation failure?!
@@ -131,7 +131,7 @@ bool SvxOle2Shape::setPropertyValueImpl( const ::rtl::OUString& rName, const Sfx
                         if( xObj.is() )
                         {
                             aAny <<= aPersistName;
-                            setPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ), aAny );
+                            setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_OLE2_PERSISTNAME )), aAny );
                             pOle2->SetObjRef( xObj );
 
                             Rectangle aRect = pOle2->GetLogicRect();
@@ -469,7 +469,7 @@ sal_Bool SvxOle2Shape::createObject( const SvGlobalName &aClassName )
     ::comphelper::IEmbeddedHelper*     pPersist = mpModel->GetPersist();
     ::rtl::OUString              aPersistName;
     OUString            aTmpStr;
-    if( getPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ) ) >>= aTmpStr )
+    if( getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_OLE2_PERSISTNAME )) ) >>= aTmpStr )
         aPersistName = aTmpStr;
 
     //TODO/LATER: how to cope with creation failure?!
@@ -500,7 +500,7 @@ sal_Bool SvxOle2Shape::createObject( const SvGlobalName &aClassName )
         }
 
         // connect the object after the visual area is set
-        setPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ), Any( aTmpStr = aPersistName ) );
+        setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_OLE2_PERSISTNAME )), Any( aTmpStr = aPersistName ) );
 
         // the object is inserted during setting of PersistName property usually
         if( pOle2Obj->IsEmpty() )
@@ -523,7 +523,7 @@ sal_Bool SvxOle2Shape::createLink( const ::rtl::OUString& aLinkURL )
     ::comphelper::IEmbeddedHelper* pPersist = mpModel->GetPersist();
 
     uno::Sequence< beans::PropertyValue > aMediaDescr( 1 );
-    aMediaDescr[0].Name = ::rtl::OUString::createFromAscii( "URL" );
+    aMediaDescr[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"));
     aMediaDescr[0].Value <<= aLinkURL;
 
     uno::Reference< task::XInteractionHandler > xInteraction = pPersist->getInteractionHandler();
@@ -563,7 +563,7 @@ sal_Bool SvxOle2Shape::createLink( const ::rtl::OUString& aLinkURL )
         }
 
         // connect the object after the visual area is set
-        setPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ), uno::makeAny( aPersistName ) );
+        setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_OLE2_PERSISTNAME )), uno::makeAny( aPersistName ) );
 
         // the object is inserted during setting of PersistName property usually
         if ( pOle2Obj->IsEmpty() )
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 2c57a016db09..2ed5d88d3d7a 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -471,14 +471,12 @@ void SvxShape::Create( SdrObject* pNewObj, SvxDrawPage* /*pNewPage*/ )
     OSL_ENSURE( ( mpImpl->mpCreatedObj == NULL ) || ( mpImpl->mpCreatedObj == pNewObj ),
         "SvxShape::Create: the same shape used for two different objects?! Strange ..." );
 
-    // --> CL, OD 2005-07-19 #i52126# - correct condition
+    // Correct condition (#i52126#)
     if ( mpImpl->mpCreatedObj != pNewObj )
-    // <--
     {
         DBG_ASSERT( pNewObj->GetModel(), "no model for SdrObject?" );
-        // --> CL, OD 2005-07-19 #i52126#
+        // Correct condition (#i52126#)
         mpImpl->mpCreatedObj = pNewObj;
-        // <--
 
         if( mpObj.is() && mpObj->GetModel() )
         {
@@ -527,12 +525,11 @@ void SvxShape::ChangeModel( SdrModel* pNewModel )
         }
     }
 
-    // --> CL, OD 2005-07-19 #i52126# - always listen to new model
+    // Always listen to new model (#i52126#)
     if( pNewModel )
     {
         StartListening( *pNewModel );
     }
-    // <--
 
     // HACK #i53696# ChangeModel should be virtual, but it isn't. can't change that for 2.0.1
     SvxShapeText* pShapeText = dynamic_cast< SvxShapeText* >( this );
@@ -576,8 +573,7 @@ void SvxShape::ForceMetricToItemPoolMetric(Pair& rPoint) const throw()
     }
 }
 
-//----------------------------------------------------------------------
-// --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051
+// Reintroduction of fix for issue i59051 (#i108851#)
 void SvxShape::ForceMetricToItemPoolMetric(basegfx::B2DPolyPolygon& rPolyPolygon) const throw()
 {
     DBG_TESTSOLARMUTEX();
@@ -634,8 +630,7 @@ void SvxShape::ForceMetricTo100th_mm(Pair& rPoint) const throw()
     }
 }
 
-//----------------------------------------------------------------------
-// --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051
+// Reintroduction of fix for issue i59051 (#i108851#)
 void SvxShape::ForceMetricTo100th_mm(basegfx::B2DPolyPolygon& rPolyPolygon) const throw()
 {
     DBG_TESTSOLARMUTEX();
@@ -2555,11 +2550,10 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
                     {
                         Point aPoint( aUnoPoint.X, aUnoPoint.Y );
 
-                        // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051
+                        // Reintroduction of fix for issue i59051 (#i108851#)
                         // perform metric change before applying anchor position,
                         // because the anchor position is in pool metric.
                         ForceMetricToItemPoolMetric( aPoint );
-                        // <--
                         if( mpModel->IsWriter() )
                             aPoint += mpObj->GetAnchorPos();
 
@@ -2586,9 +2580,8 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
                     if ( rValue >>= aPolyPoly )
                     {
                         basegfx::B2DPolyPolygon aNewPolyPolygon( SvxConvertPolyPolygonBezierToB2DPolyPolygon( &aPolyPoly ) );
-                        // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051
+                        // Reintroduction of fix for issue i59051 (#i108851#)
                         ForceMetricToItemPoolMetric( aNewPolyPolygon );
-                        // <--
                         if( mpModel->IsWriter() )
                         {
                             Point aPoint( mpObj->GetAnchorPos() );
@@ -2611,9 +2604,8 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
         {
             Point aPoint( aUnoPoint.X, aUnoPoint.Y );
 
-            // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue i59051
+            // Reintroduction of fix for issue #i59051# (#i108851#)
             ForceMetricToItemPoolMetric( aPoint );
-            // <--
             if( mpModel->IsWriter() )
                 aPoint += mpObj->GetAnchorPos();
 
@@ -3040,9 +3032,8 @@ bool SvxShape::getPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
                         Point aPoint( mpObj->GetAnchorPos() );
                         aPolyPoly.transform(basegfx::tools::createTranslateB2DHomMatrix(-aPoint.X(), -aPoint.Y()));
                     }
-                    // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue 59051
+                    // Reintroduction of fix for issue #i59051# (#i108851#)
                     ForceMetricTo100th_mm( aPolyPoly );
-                    // <--
                     drawing::PolyPolygonBezierCoords aRetval;
                     SvxConvertB2DPolyPolygonToPolyPolygonBezier( aPolyPoly, aRetval);
                     rValue <<= aRetval;
@@ -3063,9 +3054,8 @@ bool SvxShape::getPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
             if( mpModel->IsWriter() )
                 aPoint -= mpObj->GetAnchorPos();
 
-            // --> OD 2010-02-19 #i108851# - reintroduction of fix for issue 59051
+            // Reintroduction of fix for issue #i59051# (#i108851#)
             ForceMetricTo100th_mm( aPoint );
-            // <--
             awt::Point aUnoPoint( aPoint.X(), aPoint.Y() );
 
             rValue <<= aUnoPoint;
diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx
index a872009650ca..9f053a57a405 100644
--- a/svx/source/xml/xmlexport.cxx
+++ b/svx/source/xml/xmlexport.cxx
@@ -228,7 +228,7 @@ sal_Bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInpu
             aParserInput.aInputStream = xInputStream;
 
             // get parser
-            Reference< xml::sax::XParser > xParser( xServiceFactory->createInstance( OUString::createFromAscii("com.sun.star.xml.sax.Parser") ), UNO_QUERY );
+            Reference< xml::sax::XParser > xParser( xServiceFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) ), UNO_QUERY );
             DBG_ASSERT( xParser.is(), "Can't create parser" );
 
             // prepare filter arguments
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 1e4b8a5958f0..7fd3325cc4d8 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -605,7 +605,7 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt
                 xProps->setPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ), aAny );
             }
 
-            const sal_Bool bCompressed = ( ( 0 == aMimeType.getLength() ) || ( aMimeType == ::rtl::OUString::createFromAscii( "image/tiff" ) ) );
+            const sal_Bool bCompressed = ( ( 0 == aMimeType.getLength() ) || ( aMimeType == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("image/tiff")) ) );
             aAny <<= bCompressed;
             xProps->setPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "Compressed" ) ), aAny );
 
@@ -946,7 +946,7 @@ Reference< XOutputStream > SAL_CALL SvXMLGraphicHelper::createOutputStream()
 
                 if( aId.getLength() )
                 {
-                    aRet = ::rtl::OUString::createFromAscii( XML_GRAPHICOBJECT_URL_BASE );
+                    aRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_GRAPHICOBJECT_URL_BASE ));
                     aRet += aId;
                 }
             }
diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx
index 441c3b8dca7b..3883b812610a 100644
--- a/svx/source/xoutdev/_xpoly.cxx
+++ b/svx/source/xoutdev/_xpoly.cxx
@@ -1385,9 +1385,8 @@ void XPolygon::Distort(const Rectangle& rRefRect,
     pImpXPolygon->CheckPointDelete();
     CheckReference();
 
-    long    Xr, Wr, X1, X2, X3, X4;
-    long    Yr, Hr, Y1, Y2, Y3, Y4;
-    double  fTx, fTy, fUx, fUy;
+    long    Xr, Wr;
+    long    Yr, Hr;
 
     Xr = rRefRect.Left();
     Yr = rRefRect.Top();
@@ -1396,6 +1395,8 @@ void XPolygon::Distort(const Rectangle& rRefRect,
 
     if ( Wr && Hr )
     {
+        long    X1, X2, X3, X4;
+        long    Y1, Y2, Y3, Y4;
         DBG_ASSERT(rDistortedRect.pImpXPolygon->nPoints >= 4,
                    "Distort-Rechteck zu klein");
 
@@ -1412,6 +1413,7 @@ void XPolygon::Distort(const Rectangle& rRefRect,
 
         for (USHORT i = 0; i < nPntCnt; i++)
         {
+            double  fTx, fTy, fUx, fUy;
             Point& rPnt = pImpXPolygon->pPointAry[i];
 
             fTx = (double)(rPnt.X() - Xr) / Wr;
diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx
index fbf3587e82b0..14df77175275 100644
--- a/svx/workben/msview/msview.cxx
+++ b/svx/workben/msview/msview.cxx
@@ -1159,8 +1159,8 @@ void MSViewerWorkWindow::Resize()
 
         // Init UCB
         uno::Sequence< uno::Any > aArgs( 2 );
-        aArgs[ 0 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );
-        aArgs[ 1 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );
+        aArgs[ 0 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL ));
+        aArgs[ 1 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE ));
         sal_Bool bSuccess = ::ucb::ContentBroker::initialize( xMSF, aArgs );
         if ( !bSuccess )
         {
diff --git a/svx/workben/msview/xmlconfig.cxx b/svx/workben/msview/xmlconfig.cxx
index c65729bc4621..62f414c15460 100644
--- a/svx/workben/msview/xmlconfig.cxx
+++ b/svx/workben/msview/xmlconfig.cxx
@@ -328,7 +328,7 @@ void load_config( const OUString& rPath )
         // get parser
         Reference< XParser > xParser(
             comphelper::getProcessServiceFactory()->createInstance(
-                OUString::createFromAscii("com.sun.star.xml.sax.Parser") ),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) ),
             UNO_QUERY_THROW );
 
         // get filter
diff --git a/sw/inc/HandleAnchorNodeChg.hxx b/sw/inc/HandleAnchorNodeChg.hxx
index 9b8fffba0ef4..bc76cb0cf859 100644
--- a/sw/inc/HandleAnchorNodeChg.hxx
+++ b/sw/inc/HandleAnchorNodeChg.hxx
@@ -32,7 +32,6 @@ class SwFlyFrmFmt;
 class SwFmtAnchor;
 class SwFlyFrm;
 
-// OD 2006-02-28 #125892#
 // helper class to track change of anchor node of at-paragraph respectively
 // at-character anchored fly frames
 // if such a change happens, it has to be checked, if the count of the anchor
diff --git a/sw/inc/IDocumentContentOperations.hxx b/sw/inc/IDocumentContentOperations.hxx
index 08ac070fd891..879eefe432e3 100644
--- a/sw/inc/IDocumentContentOperations.hxx
+++ b/sw/inc/IDocumentContentOperations.hxx
@@ -93,7 +93,7 @@
 
     /** complete delete of a given PaM
 
-        OD 2009-08-20 #i100466#
+        #i100466#
         Add optional parameter <bForceJoinNext>, default value <false>
         Needed for hiding of deletion redlines
     */
diff --git a/sw/inc/IDocumentDrawModelAccess.hxx b/sw/inc/IDocumentDrawModelAccess.hxx
index 9d247673ece2..36e1d354321d 100644
--- a/sw/inc/IDocumentDrawModelAccess.hxx
+++ b/sw/inc/IDocumentDrawModelAccess.hxx
@@ -54,13 +54,11 @@ public:
     virtual SdrLayerID GetInvisibleControlsId() const = 0;
 
     /** method to notify drawing page view about the invisible layers
-        OD 26.06.2003 #108784#
         @author OD
     */
     virtual void NotifyInvisibleLayers( SdrPageView& _rSdrPageView ) = 0;
 
     /** method to determine, if a layer ID belongs to the visible ones.
-        OD 25.06.2003 #108784#
         Note: If given layer ID is unknown, method asserts and returns <false>.
         @author OD
 
@@ -74,7 +72,6 @@ public:
 
     /** method to determine, if the corresponding visible layer ID for a invisible one.
 
-        OD 25.06.2003 #108784#
         Note: If given layer ID is a visible one, method returns given layer ID.
         Note: If given layer ID is unknown, method returns given layer ID.
 
@@ -90,7 +87,6 @@ public:
 
     /** method to determine, if the corresponding invisible layer ID for a visible one.
 
-        OD 25.06.2003 #108784#
         Note: If given layer ID is a invisible one, method returns given layer ID.
         Note: If given layer ID is unknown, method returns given layer ID.
 
diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx
index d5b3ec4aa7f5..dd5801e97cad 100644
--- a/sw/inc/IDocumentFieldsAccess.hxx
+++ b/sw/inc/IDocumentFieldsAccess.hxx
@@ -82,7 +82,6 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
     */
     virtual void InsDeletedFldType(SwFieldType &) = 0;
 
-    // #111840#
     /**
        Puts a value into a field at a certain position.
 
@@ -99,7 +98,6 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
 
     // rufe das Update der Expression Felder auf; alle Ausdruecke werden
     // neu berechnet.
-    // #111840#
 
     /** Updates a field.
 
diff --git a/sw/inc/IDocumentLinksAdministration.hxx b/sw/inc/IDocumentLinksAdministration.hxx
index 449316fa0729..d627cae9901d 100644
--- a/sw/inc/IDocumentLinksAdministration.hxx
+++ b/sw/inc/IDocumentLinksAdministration.hxx
@@ -56,7 +56,7 @@ namespace sfx2 { class SvLinkSource;  class LinkManager; }
     */
     virtual const sfx2::LinkManager& GetLinkManager() const = 0;
 
-    /** FME 2005-02-25 #i42634# Moved common code of SwReader::Read() and
+    /** #i42634# Moved common code of SwReader::Read() and
         SwDocShell::UpdateLinks() to new SwDoc::UpdateLinks():
     */
     virtual void UpdateLinks(BOOL bUI) = 0;
diff --git a/sw/inc/IDocumentListsAccess.hxx b/sw/inc/IDocumentListsAccess.hxx
index b5f47031d9e3..7685a0bd6568 100644
--- a/sw/inc/IDocumentListsAccess.hxx
+++ b/sw/inc/IDocumentListsAccess.hxx
@@ -46,11 +46,9 @@ class IDocumentListsAccess
         virtual SwList* createListForListStyle( const String sListStyleName ) = 0;
         virtual SwList* getListForListStyle( const String sListStyleName ) const = 0;
         virtual void deleteListForListStyle( const String sListStyleName ) = 0;
-        // --> OD 2008-07-08 #i91400#
+        // #i91400#
         virtual void trackChangeOfListStyleName( const String sListStyleName,
                                                  const String sNewListStyleName ) = 0;
-        // <--
-
     protected:
         virtual ~IDocumentListsAccess() {};
 };
diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx
index 2b120901f6ba..931c2266536d 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -77,9 +77,8 @@ namespace com { namespace sun { namespace star { namespace i18n { struct Forbidd
          USE_OLD_PRINTER_METRICS,
          TABS_RELATIVE_TO_INDENT,
          PROTECT_FORM,
-         // --> OD 2008-06-05 #i89181#
+         // #i89181#
          TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST,
-         // <--
      INVERT_BORDER_SPACING,
          COLLAPSE_EMPTY_CELL_PARA,
          // COMPATIBILITY FLAGS END
diff --git a/sw/inc/IDocumentUndoRedo.hxx b/sw/inc/IDocumentUndoRedo.hxx
index 45f33f58dc1b..4dcc0d2a0809 100644
--- a/sw/inc/IDocumentUndoRedo.hxx
+++ b/sw/inc/IDocumentUndoRedo.hxx
@@ -78,7 +78,7 @@ public:
         0 letzte Aktion, sonst Aktionen bis zum Start der Klammerung nUndoId
         In rUndoRange wird der restaurierte Bereich gesetzt.
     */
-    virtual bool Undo( SwUndoIter& ) = 0; // -> #111827#
+    virtual bool Undo( SwUndoIter& ) = 0;
 
     /** Opens undo block.
 
@@ -109,7 +109,7 @@ public:
     */
     virtual SwUndoId EndUndo( SwUndoId eUndoId, const SwRewriter * pRewriter) = 0;
 
-    /** <- #111827#
+    /**
         loescht die gesamten UndoObjecte ( fuer Methoden die am Nodes
         Array drehen ohne entsprechendes Undo !!)
     */
@@ -137,7 +137,7 @@ public:
 
     virtual SwUndo* RemoveLastUndo(SwUndoId eUndoId) = 0;
 
-    /** 2002-05-31 dvo, #95884#: To prevent an undo array overflow when
+    /** To prevent an undo array overflow when
         doing nested undos, undo may have to be disabled. Undo-intensive
         actions (like auto-format) should check this manually.
     */
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 946492a3b794..2a3b6d956e13 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -169,7 +169,6 @@ class SwPostItMgr: public SfxListener
         typedef std::list<sw::sidebarwindows::SwSidebarWin*>::iterator  SwSidebarWin_iterator;
 
         void            AddPostIts(bool bCheckExistance = true,bool bFocus = true);
-        //void          AddRedlineComments(bool bCheckExistance, bool bFocus);
         void            RemoveSidebarWin();
         void            PreparePageContainer();
         void            Scroll(const long lScroll,const unsigned long aPage );
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index 7720c387b7ea..83389d6f0442 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -51,7 +51,6 @@ class SwEditWin;
 class SwView;
 class Edit;
 class MenuButton;
-//class SwRedline;
 class SwFrm;
 
 
@@ -239,36 +238,6 @@ class SwSidebarWin : public Window
 
 } } // eof namespace sw::sidebarwindows
 
-
-// implementation for change tracking comments, fully functional, but not yet used
-/*
-class SwRedComment : public SwSidebarWin
-{
-    private:
-        SwRedline*      pRedline;
-
-    protected:
-        virtual void    MouseButtonDown( const MouseEvent& rMEvt );
-    public:
-        SwRedComment( Window* pParent, WinBits nBits,SwPostItMgr* aMgr,SwPostItBits aBits,SwRedline* pRed);
-        virtual ~SwRedComment() {};
-
-        virtual void    UpdateData();
-        virtual void    SetPostItText();
-        virtual void    Delete();
-        virtual void    GotoPos();
-        virtual void    SetPopup();
-        virtual void    ActivatePostIt();
-        virtual void    DeactivatePostIt();
-
-        virtual String  GetAuthor();
-        virtual Date    GetDate();
-        virtual Time    GetTime();
-
-        virtual bool    IsProtected();
-};
-*/
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwNodeNum.hxx b/sw/inc/SwNodeNum.hxx
index 69cf305cd0e0..e9ca0ea05871 100644
--- a/sw/inc/SwNodeNum.hxx
+++ b/sw/inc/SwNodeNum.hxx
@@ -39,10 +39,9 @@ class SwNumFmt;
 class SW_DLLPUBLIC SwNodeNum : public SwNumberTreeNode
 {
 public:
-    // --> OD 2008-02-19 #refactorlists#
+
     explicit SwNodeNum( SwTxtNode* pTxtNode );
     explicit SwNodeNum( SwNumRule* pNumRule );
-    // <--
     virtual ~SwNodeNum();
 
     SwNumRule* GetNumRule() const;
@@ -61,11 +60,8 @@ public:
 
     virtual SwNumberTree::tSwNumTreeNumber GetStartValue() const;
 
-//    String ToString() const;
-
     SwPosition GetPosition() const;
 
-    // --> OD 2006-03-07 #131436#
     // The number tree root node is deleted, when the corresponding numbering
     // rule is deleted. In this situation the number tree should be empty -
     // still registered text nodes aren't allowed. But it is possible, that
@@ -74,11 +70,10 @@ public:
     // Text nodes of the document nodes array aren't allowed to be registered
     // in this situation - this will be asserted.
     static void HandleNumberTreeRootNodeDelete( SwNodeNum& rNodeNum );
-    // <--
 
     /** determines the <SwNodeNum> instance, which is preceding the given text node
 
-        OD 2007-09-06 #i81002#
+        #i81002#
 
         @author OD
     */
@@ -87,24 +82,20 @@ public:
 protected:
     virtual SwNumberTreeNode * Create() const;
 
-    // --> OD 2006-04-26 #i64010#
+    // --> #i64010#
     virtual bool HasCountedChildren() const;
     virtual bool IsCountedForNumbering() const;
     // <--
 
-    // --> OD 2008-02-19 #refactorlists#
     // method called before this tree node has been added to the list tree
     virtual void PreAdd();
     // method called at a child after this child has been removed from the list tree
     virtual void PostRemove();
-    // <--
 private:
     SwTxtNode * mpTxtNode;
     SwNumRule * mpNumRule;
 
-    // --> OD 2006-03-07 #131436#
     static void _UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum );
-    // <--
 
     SwNodeNum( const SwNodeNum& );              // no copy constructor
     SwNodeNum& operator=( const SwNodeNum& );   // no assignment operator
diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx
index 78abfd5138fb..c31404136071 100644
--- a/sw/inc/SwNumberTree.hxx
+++ b/sw/inc/SwNumberTree.hxx
@@ -144,8 +144,6 @@ public:
     /**
        Remove a child.
 
-       OD 2008-02-19 #refactorlists# - no longer virtual
-
        @param pChild     child to be removed
      */
     void RemoveChild( SwNumberTreeNode* pChild );
@@ -174,9 +172,7 @@ public:
      */
     SwNumberTree::tSwNumTreeNumber GetNumber( bool bValidate = true ) const;
 
-    // --> OD 2008-11-26 #158694#
     bool IsContinueingPreviousSubTree() const;
-    // <--
 
     /**
        Returns level numbers of this node.
@@ -241,7 +237,6 @@ public:
 
     /** set level of this node
 
-        OD 2008-03-13 #refactorlists#
         precondition: node is already member of a list tree
 
         @author OD
@@ -277,13 +272,13 @@ public:
        All iterators holding the last valid node in the according list
        of childs are set to the end of this list, thereby stating all
        children in the list are invalid.
-       OD 2007-10-26 #i83479# - made public
+       #i83479# - made public
      */
     void InvalidateTree() const;
 
     /**
        Notifies all invalid children of this node.
-       OD 2007-10-26 #i83479# - made public
+       #i83479# - made public
      */
     void NotifyInvalidChildren();
 
@@ -313,15 +308,14 @@ public:
     */
     void NotifyInvalidSiblings();
 
-    /** notification of all nodes in the list tree on certain list level
-
-        OD 2008-04-17 #refactorlists#
+    /**
+       notification of all nodes in the list tree on certain list level
     */
     void NotifyNodesOnListLevel( const int nListLevel );
 
     /** Invalidation and notification of complete numbering tree
 
-        OD 2006-04-26 #i64010#
+        #i64010#
         Usage: on <IsCounted()> state change its needed to invalidate the
                complete numbering tree due to wide influence of this change.
     */
@@ -344,7 +338,7 @@ public:
 
     /** determines the node, which is preceding the node
 
-        OD 2007-09-06 #i81002#
+        #i81002#
         The search for the preceding node is performed for the tree below the
         <this> node. To search the complete tree, the method has been called for
         the root of the tree.
@@ -353,30 +347,7 @@ public:
     */
     const SwNumberTreeNode* GetPrecedingNodeOf( const SwNumberTreeNode& rNode ) const;
 
-//    /**
-//       Returns a string representation of this node.
-
-//       @return the string representation of this node
-//     */
-//    virtual String ToString() const = 0;
-
-//    /**
-//       Print this subtree.
-
-//       @param o              output stream to direct output to
-//       @param rIndent        additional indent for the children of this node
-//       @param rMyIndent      indent to use for this node
-//       @param nDepth         number of levels to print (-1 means all levels)
-
-//       @return output stream after output of this subtree
-//     */
-//    String print(const String & rIndent = String("  ",
-//                                                 RTL_TEXTENCODING_ASCII_US),
-//                 const String & rMyIndent = String("  ",
-//                                                   RTL_TEXTENCODING_ASCII_US),
-//                 int nDepth = -1) const;
-
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     static unsigned long GetInstances();
     unsigned long GetSerial();
 #endif
@@ -423,20 +394,16 @@ protected:
      */
     tSwNumberTreeChildren::size_type GetChildCount() const;
 
-    // --> OD 2006-04-26 #i64010# - made pure virtual
+    // #i64010# - made pure virtual
     virtual bool HasCountedChildren() const = 0;
-    // <--
 
-    // --> OD 2006-04-26 #i64010#
+    // #i64010#
     virtual bool IsCountedForNumbering() const = 0;
-    // <--
 
-    // --> OD 2008-02-19 #refactorlists#
     // method called before this tree node has been added to the list tree
     virtual void PreAdd() = 0;
     // method called after this tree node has been removed from the list tree
     virtual void PostRemove() = 0;
-    // <--
 
 #ifdef __SW_NUMBER_TREE_SANITY_CHECK
     /**
@@ -461,7 +428,6 @@ protected:
     */
     mutable SwNumberTree::tSwNumTreeNumber mnNumber;
 
-    // --> OD 2008-11-26 #158694#
     // boolean indicating, that a node of a not counted parent node is continueing
     // the numbering of parent's previous node sub tree.
     // Example:
@@ -470,7 +436,6 @@ protected:
     //      sdfjlksaf <-- not counted parent node
     //     1.2. lfjlaskf <-- <mbContinueingPreviousSubTree = true>
     mutable bool mbContinueingPreviousSubTree;
-    // <--
 
     /**
        true     this node is a phantom
@@ -485,7 +450,7 @@ protected:
      */
     mutable tSwNumberTreeChildren::iterator mItLastValid;
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     /**
        Counter for the number of created instances.
      */
@@ -522,7 +487,6 @@ protected:
 
     /** Invalidation of all children
 
-        OD 2005-10-19 #126009#
         Usage: on <IsCounted()> state change the children have to be invalidated
     */
     inline void InvalidateChildren()
@@ -532,7 +496,6 @@ protected:
 
     /** Invalidation of parent node, if its not counted.
 
-        OD 2005-10-19 #126009#
         Usage: on <IsCounted()> state change the parent have to be invalidated
     */
     inline void InvalidateNotCountedParent()
@@ -587,7 +550,6 @@ protected:
 
     /** Notification of parent node siblings, if its not counted.
 
-        OD 2005-10-19 #126009#
         Usage: on <IsCounted()> state change the parent node and its siblings
                have to be notified.
     */
@@ -601,8 +563,6 @@ protected:
 
     /** notification of children nodes on certain depth
 
-        OD 2008-04-17 #refactorlists#
-
         @author OD
     */
     void NotifyChildrenOnDepth( const int nDepth );
@@ -680,8 +640,6 @@ protected:
     /**
        Return if phantoms are counted.
 
-       OD 2008-02-19 #refactorlists# - pure virtual now
-
        @retval true phantoms are counted
        @retval false else
      */
@@ -695,9 +653,7 @@ protected:
      */
     bool HasOnlyPhantoms() const;
 
-    // --> OD 2005-10-27 #126009#
     bool HasPhantomCountedParent() const;
-    // <--
 
     /**
         HB, OD : return node, if it isn't a phantom, otherwise return first
@@ -728,7 +684,6 @@ protected:
     /** Moves all children of this node that are greater than a given node
         to the destination node.
 
-        OD 2005-10-14 #125991#
         distinguish between node for comparing, whose children are greater,
         and the destination node.
 
diff --git a/sw/inc/SwSmartTagMgr.hxx b/sw/inc/SwSmartTagMgr.hxx
index d06293ad82bb..cd184928726c 100644
--- a/sw/inc/SwSmartTagMgr.hxx
+++ b/sw/inc/SwSmartTagMgr.hxx
@@ -56,13 +56,6 @@ public:
       virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw(::com::sun::star::uno::RuntimeException);
 };
 
-/*
-namespace SwSmartTagMgr
-{
-    SmartTagMgr& Get();
-}
-*/
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwUndoFmt.hxx b/sw/inc/SwUndoFmt.hxx
index 3b11b548261a..d5da4ffcb1c2 100644
--- a/sw/inc/SwUndoFmt.hxx
+++ b/sw/inc/SwUndoFmt.hxx
@@ -93,7 +93,6 @@ class SwUndoRenameFmt : public SwUndo
 protected:
     String sOldName, sNewName;
     SwDoc * pDoc;
-//    SwUndoId nId;
 
 public:
     SwUndoRenameFmt(SwUndoId nUndoId, const String & sOldName,
diff --git a/sw/inc/SwUndoPageDesc.hxx b/sw/inc/SwUndoPageDesc.hxx
index 4b52347198a7..29004b3941e0 100644
--- a/sw/inc/SwUndoPageDesc.hxx
+++ b/sw/inc/SwUndoPageDesc.hxx
@@ -58,12 +58,12 @@ public:
 
 class SwUndoPageDescCreate : public SwUndo
 {
-    const SwPageDesc * pDesc; // #116530#
+    const SwPageDesc * pDesc;
     SwPageDescExt aNew;
     SwDoc * pDoc;
 
 public:
-    SwUndoPageDescCreate(const SwPageDesc * pNew, SwDoc * pDoc); // #116530#
+    SwUndoPageDescCreate(const SwPageDesc * pNew, SwDoc * pDoc);
     virtual ~SwUndoPageDescCreate();
 
     virtual void Undo(SwUndoIter & rIt);
diff --git a/sw/inc/SwXMLSectionList.hxx b/sw/inc/SwXMLSectionList.hxx
index 7a9971f8f875..046786473813 100644
--- a/sw/inc/SwXMLSectionList.hxx
+++ b/sw/inc/SwXMLSectionList.hxx
@@ -45,7 +45,6 @@ protected:
 public:
     SvStrings & rSectionList;
 
-    // #110680#
     SwXMLSectionList(
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
         SvStrings & rNewSectionList );
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 93692b635357..21165327e3b3 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -67,12 +67,8 @@ class Window;
 #define ACC_STATE_OPAQUE 0x02
 
 // pseudo states for events
-// --> OD 2009-01-07 #i88069# - pseudo state for event TEXT_ATTRIBUTE_CHANGED
 #define ACC_STATE_TEXT_ATTRIBUTE_CHANGED 0x0200
-// <--
-// --> OD 2005-12-12 #i27301# - pseudo state for event TEXT_SELECTION_CHANGED
 #define ACC_STATE_TEXT_SELECTION_CHANGED 0x0100
-// <--
 #define ACC_STATE_CARET 0x80
 #define ACC_STATE_RELATION_FROM 0x40
 #define ACC_STATE_RELATION_TO 0x20
@@ -81,9 +77,7 @@ class Window;
 
 #define ACC_STATE_MASK 0x1F
 
-// --> OD 2005-12-12 #i27301# - introduce type definition of states
 typedef sal_uInt16 tAccessibleStates;
-// <--
 
 class SwAccessibleMap : public accessibility::IAccessibleViewForwarder,
                         public accessibility::IAccessibleParent
@@ -95,10 +89,9 @@ class SwAccessibleMap : public accessibility::IAccessibleViewForwarder,
     SwShapeList_Impl *mpShapes;
     SwAccessibleEventList_Impl *mpEvents;
     SwAccessibleEventMap_Impl *mpEventMap;
-    // --> OD 2005-12-13 #i27301# - data structure to keep information about
+    // #i27301 data structure to keep information about
     // accessible paragraph, which have a selection.
     SwAccessibleSelectedParas_Impl* mpSelectedParas;
-    // <--
     ViewShell *mpVSh;
     /// for page preview: store preview data, VisArea, and mapping of
     /// preview-to-display coordinates
@@ -133,7 +126,6 @@ class SwAccessibleMap : public accessibility::IAccessibleViewForwarder,
     /** method to build up a new data structure of the accessible pararaphs,
         which have a selection
 
-        OD 2005-12-13 #i27301#
         Important note: method has to used inside a mutual exclusive section
 
         @author OD
@@ -148,8 +140,6 @@ public:
     ::com::sun::star::uno::Reference<
         ::com::sun::star::accessibility::XAccessible> GetDocumentView();
 
-    // OD 15.01.2003 #103492# - complete re-factoring of method due to new
-    // page/print preview functionality.
     ::com::sun::star::uno::Reference<
         ::com::sun::star::accessibility::XAccessible> GetDocumentPreview(
                             const std::vector<PrevwPage*>& _rPrevwPages,
@@ -184,10 +174,6 @@ public:
 
     /** get size of a dedicated preview page
 
-        OD 15.01.2003 #103492#
-        complete re-factoring of previous method due to new page/print preview
-        functionality.
-
         @author OD
 
         @param _nPrevwPageNum
@@ -213,9 +199,7 @@ public:
 
     void InvalidateContent( const SwFrm *pFrm );
 
-    // --> OD 2009-01-06 #i88069#
     void InvalidateAttr( const SwTxtFrm& rTxtFrm );
-    // <--
 
     void InvalidateCursorPosition( const SwFrm *pFrm );
     void InvalidateFocus();
@@ -225,7 +209,6 @@ public:
 
     // Invalidate state of whole tree. If an action is open, this call
     // is processed when the last action ends.
-    // --> OD 2005-12-12 #i27301# - use new type definition for <_nStates>
     void InvalidateStates( tAccessibleStates _nStates,
                            const SwFrm* _pFrm = 0 );
 
@@ -233,8 +216,6 @@ public:
 
     /** invalidation CONTENT_FLOWS_FROM/_TO relation of a paragraph
 
-        OD 2005-12-01 #i27138#
-
         @author OD
 
         @param _rTxtFrm
@@ -250,16 +231,12 @@ public:
 
     /** invalidation of text selection of a paragraph
 
-        OD 2005-12-12 #i27301#
-
         @author OD
     */
     void InvalidateParaTextSelection( const SwTxtFrm& _rTxtFrm );
 
     /** invalidation of text selection of all paragraphs
 
-        OD 2005-12-13 #i27301#
-
         @author OD
     */
     void InvalidateTextSelectionOfAllParas();
@@ -268,8 +245,6 @@ public:
                              Window& rChild ) const;
 
     // update preview data (and fire events if necessary)
-    // OD 15.01.2003 #103492# - complete re-factoring of method due to new
-    // page/print preview functionality.
     void UpdatePreview( const std::vector<PrevwPage*>& _rPrevwPages,
                         const Fraction&  _rScale,
                         const SwPageFrm* _pSelectedPageFrm,
@@ -306,7 +281,6 @@ public:
 private:
     /** get mapping mode for LogicToPixel and PixelToLogic conversions
 
-        OD 15.01.2003 #103492#
         Replacement method <PreviewAdjust(..)> by new method <GetMapMode>.
         Method returns mapping mode of current output device and adjusts it,
         if the shell is in page/print preview.
diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx
index 47594915644e..ae3a3b1592e3 100644
--- a/sw/inc/anchoreddrawobject.hxx
+++ b/sw/inc/anchoreddrawobject.hxx
@@ -33,8 +33,6 @@
 
 /** class for the positioning of drawing objects
 
-    OD 2004-03-25 #i26791#
-
     @author OD
 */
 class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
@@ -45,7 +43,6 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
         bool mbValidPos;
 
         // rectangle, keeping the last object rectangle after the postioning
-        // --> OD 2004-09-29 #i34748# - change <maLastObjRect> to a pointer
         Rectangle* mpLastObjRect;
 
         // boolean, indicating that anchored drawing object hasn't been attached
@@ -53,23 +50,21 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
         // boolean changes its state.
         bool mbNotYetAttachedToAnchorFrame;
 
-        // --> OD 2004-08-09 #i28749# - boolean, indicating that anchored
+        // boolean, indicating that anchored
         // drawing object hasn't been positioned yet. Once, it's positioned the
         // boolean changes its state.
         bool mbNotYetPositioned;
 
-        // --> OD 2006-03-17 #i62875#
         // boolean, indicating that after change of layout direction the
         // anchored drawing object has to be captured on the page, if it exceeds
         // the left or right page margin.
         // Needed for compatibility option <DoNotCaptureDrawObjsOnPage>
         bool mbCaptureAfterLayoutDirChange;
-        // <--
 
         /** method for the intrinsic positioning of a at-paragraph|at-character
             anchored drawing object
 
-            OD 2004-08-12 #i32795# - helper method for method <MakeObjPos>
+            helper method for method <MakeObjPos>
 
             @author OD
         */
@@ -78,7 +73,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
         /** method for the intrinsic positioning of a at-page|at-frame anchored
             drawing object
 
-            OD 2004-08-12 #i32795# - helper method for method <MakeObjPos>
+            helper method for method <MakeObjPos>
 
             @author OD
         */
@@ -86,7 +81,6 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
 
             /** method to set positioning attributes (not for as-character anchored)
 
-            OD 2004-10-20 #i35798#
             During load the positioning attributes aren't set.
             Thus, the positioning attributes are set by the current object geometry.
             This method is also used for the conversion for drawing objects
@@ -104,7 +98,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
             instance has to be set.
             Note: This adjustment is not be done for as-character anchored
             drawing object - the positioning code takes care of this.
-            OD 2004-07-29 #i31698# - API for drawing objects in Writer has
+            #i31698# - API for drawing objects in Writer has
             been adjusted. Thus, this method will only set the internal anchor
             position of the <SdrObject> instance to the anchor position given
             by its anchor frame.
@@ -115,8 +109,6 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
 
         /** method to invalidate the given page frame
 
-            OD 2004-07-02 #i28701#
-
             @author OD
         */
         void _InvalidatePage( SwPageFrm* _pPageFrm );
@@ -127,20 +119,15 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
         /** method to assure that anchored object is registered at the correct
             page frame
 
-            OD 2004-07-02 #i28701#
-
             @author OD
         */
         virtual void RegisterAtCorrectPage();
 
-        // --> OD 2006-08-10 #i68520#
         virtual bool _SetObjTop( const SwTwips _nTop);
         virtual bool _SetObjLeft( const SwTwips _nLeft);
-        // <--
 
-        // --> OD 2006-10-05 #i70122#
         virtual const SwRect GetObjBoundRect() const;
-        // <--
+
     public:
         TYPEINFO();
 
@@ -161,23 +148,18 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
 
         // accessors to the object area and its position
         virtual const SwRect GetObjRect() const;
-        // --> OD 2004-09-29 #i34748# - change return type to a pointer.
         // Return value can be NULL.
         const Rectangle* GetLastObjRect() const;
-        // <--
-        // --> OD 2004-09-29 #i34748# - change method
+
         void SetLastObjRect( const Rectangle& _rNewObjRect );
-        // <--
 
         /** adjust positioning and alignment attributes for new anchor frame
 
-            OD 2004-04-21
             Set horizontal and vertical position/alignment to manual position
             relative to anchor frame area using the anchor position of the
             new anchor frame and the current absolute drawing object position.
             Note: For correct Undo/Redo method should only be called inside a
             Undo-/Redo-action.
-            OD 2004-08-24 #i33313# - add second optional parameter <_pNewObjRect>
 
             @author OD
 
@@ -193,29 +175,21 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
 
         /** method to notify background of drawing object
 
-            OD 2004-06-30 #i28701#
-
             @author OD
         */
         virtual void NotifyBackground( SwPageFrm* _pPageFrm,
                                        const SwRect& _rRect,
                                        PrepareHint _eHint );
 
-        // --> OD 2005-08-16 #i53320#
         inline bool NotYetPositioned() const
         {
             return mbNotYetPositioned;
         }
-        // <--
 
-        // --> OD 2006-03-17 #i62875#
         // change of layout direction needs to be tracked
         // for setting <mbCaptureAfterLayoutDirChange>.
         virtual void UpdateLayoutDir();
-        // <--
-        // --> OD 2006-03-17 #i62875#
         bool IsOutsidePage() const;
-        // <--
 
         // new Loop control
         void ValidateThis() { mbValidPos = true; }
diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index 66311bc4e84d..ce5ef72c4445 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.hxx
@@ -35,19 +35,16 @@
 class SdrObject;
 class SwFrm;
 class SwLayoutFrm;
-// --> OD 2004-07-14 #117380#
 class SwTxtFrm;
-// <--
-// --> OD 2004-06-30 #i28701#
+
 class SwPageFrm;
 class SwObjPositioningInProgress;
-// <--
+
 class SwFrmFmt;
 class SwFmtAnchor;
 
 /** wrapper class for the positioning of Writer fly frames and drawing objects
 
-    OD 2004-03-22 #i26791#
     Purpose of this class is to provide a unified interface for the positioning
     of Writer fly frames (derived classes of <SwFlyFrm>) and of drawing objects
     (derived classes of <SwDrawFrm>).
@@ -61,10 +58,9 @@ class SW_DLLPUBLIC SwAnchoredObject
         SdrObject* mpDrawObj;
         // frame the object is anchored at
         SwFrm* mpAnchorFrm;
-        // --> OD 2004-06-30 #i28701# - page frame the object is registered at
+        // #i28701 - page frame the object is registered at
         // note: no page frame for as-character anchored objects
         SwPageFrm* mpPageFrm;
-        // <--
         // current relative position (relative to anchor position of anchor frame)
         Point maRelPos;
 
@@ -86,34 +82,32 @@ class SW_DLLPUBLIC SwAnchoredObject
         // a following layout frame in the text flow.
         const SwLayoutFrm* mpVertPosOrientFrm;
 
-        // --> OD 2004-06-30 #i28701# - boolean, indicating that the object
+        // i#i28701 boolean, indicating that the object
         // positioning algorithm is in progress.
         bool mbPositioningInProgress;
-        // <--
 
-        // --> OD 2004-06-29 #i28701# - Booleans needed for the layout process.
+        // Booleans needed for the layout process.
         // Values only of relevance for to-paragraph and to-character anchored
         // floating screen object, for whose the 'straight-forward positioning
         // process are applied
         // Otherwise value of <mbConsiderForTextWrap> is treated as <true>,
         // value of <mbPositionLocked> is treated as <false> and
         // value of <mbRestartLayoutProcess> is treated as <false>.
-        // --> OD 2004-10-22 #i35911# - add boolean <mbClearEnvironment>
+        // i#35911 - add boolean <mbClearEnvironment>
         // Indicates that due to its position and wrapping style its layout
         // environment is cleared - all content is moved forward.
         // Treated as <false>, if not the 'straight-forward positioning process"
         // is applied.
         bool mbConsiderForTextWrap;
         bool mbPositionLocked;
-        // --> OD 2005-01-10 #i40147# - boolean needed to keep position of
+        // boolean needed to keep position of
         // anchored object locked due to special object positioning for sections.
         bool mbKeepPositionLockedForSection;
-        // <--
+
         bool mbRestartLayoutProcess;
         bool mbClearedEnvironment;
-        // <--
 
-        // --> OD 2004-08-25 #i3317# - boolean, indicating that temporarly
+        // i#i3317 - boolean, indicating that temporarly
         // the wrapping style influence of the anchored object has to be
         // considered during its positioning.
         // This boolean is used, if compatibility option 'Consider wrapping style
@@ -123,13 +117,10 @@ class SW_DLLPUBLIC SwAnchoredObject
         // The boolean is reset to <false>, when the layout process for a
         // page frame starts - see class <NotifyLayoutOfPageInProgress>.
         bool mbTmpConsiderWrapInfluence;
-        // <--
 
-        // --> OD 2006-06-21 #i68520#
         mutable SwRect maObjRectWithSpaces;
         mutable bool mbObjRectWithSpacesValid;
         mutable SwRect maLastObjRect;
-        // <--
 
         /** method to indicate, that positioning of anchored object is in progress
 
@@ -146,12 +137,10 @@ class SW_DLLPUBLIC SwAnchoredObject
 
         /** check anchor character rectangle
 
-            OD 2004-03-25 #i26791#
             helper method for method <CheckCharRectAndTopOfLine()>
             For to-character anchored Writer fly frames the member <maLastCharRect>
             is updated. This is checked for change and depending on the applied
             positioning, it's decided, if the Writer fly frame has to be invalidated.
-            OD 2004-07-14 #117380#
             improvement - add second parameter <_rAnchorCharFrm>
 
             @author OD
@@ -168,13 +157,10 @@ class SW_DLLPUBLIC SwAnchoredObject
 
         /** check top of line
 
-            OD 2004-03-25 #i26791#
             helper method for method <CheckCharRectAndTopOfLine()>
             For to-character anchored Writer fly frames the member <mnLastTopOfLine>
             is updated. This is checked for change and depending on the applied
             positioning, it's decided, if the Writer fly frame has to be invalidated.
-            OD 2004-07-14 #117380#
-            improvement - add second parameter <_rAnchorCharFrm>
 
             @author OD
 
@@ -188,7 +174,6 @@ class SW_DLLPUBLIC SwAnchoredObject
         void _CheckTopOfLine( const SwFmtAnchor& _rAnch,
                               const SwTxtFrm& _rAnchorCharFrm );
 
-        // --> OD 2005-03-30 #120729# - needed for the hotfix
         // method <lcl_HideObj(..)> sets needed data structure values for the
         // object positioning
         friend bool lcl_HideObj( const SwTxtFrm& _rFrm,
@@ -204,8 +189,6 @@ class SW_DLLPUBLIC SwAnchoredObject
         /** method to assure that anchored object is registered at the correct
             page frame
 
-            OD 2004-07-02 #i28701#
-
             @author OD
         */
         virtual void RegisterAtCorrectPage() = 0;
@@ -219,8 +202,6 @@ class SW_DLLPUBLIC SwAnchoredObject
         /** method to determine, if other anchored objects, also attached at
             to the anchor frame, have to consider its wrap influence.
 
-            // --> OD 2005-02-22 #i43255#
-
             @author OD
         */
         bool ConsiderObjWrapInfluenceOfOtherObjs() const;
@@ -228,20 +209,14 @@ class SW_DLLPUBLIC SwAnchoredObject
         /** method to apply temporary consideration of wrapping style influence
             to the anchored objects, which are anchored at the same anchor frame
 
-            OD 2006-07-24 #b6449874#
-
             @author OD
         */
         void SetTmpConsiderWrapInfluenceOfOtherObjs( const bool bTmpConsiderWrapInfluence );
 
-        // --> OD 2006-08-10 #i68520#
         virtual bool _SetObjTop( const SwTwips _nTop) = 0;
         virtual bool _SetObjLeft( const SwTwips _nLeft) = 0;
-        // <--
 
-        // --> OD 2006-10-05 #i70122#
         virtual const SwRect GetObjBoundRect() const = 0;
-        // <--
     public:
         TYPEINFO();
 
@@ -258,7 +233,6 @@ class SW_DLLPUBLIC SwAnchoredObject
         void ChgAnchorFrm( SwFrm* _pNewAnchorFrm );
         /** determine anchor frame containing the anchor position
 
-            OD 2004-10-08 #i26945#
             the anchor frame, which is determined, is <mpAnchorFrm>
             for an at-page, at-frame or at-paragraph anchored object
             and the anchor character frame for an at-character and as-character
@@ -268,17 +242,13 @@ class SW_DLLPUBLIC SwAnchoredObject
         */
         SwFrm* GetAnchorFrmContainingAnchPos();
 
-        // --> OD 2004-06-30 #i28701# - accessors to member <mpPageFrm>
         SwPageFrm* GetPageFrm();
         const SwPageFrm* GetPageFrm() const;
         void SetPageFrm( SwPageFrm* _pNewPageFrm );
-        // <--
 
         /** method to determine the page frame, on which the 'anchor' of
             the given anchored object is.
 
-            OD 2004-07-02 #i28701#
-            OD 2004-09-23 #i33751#, #i34060#
             Adjust meaning of method and thus its name: If the anchored object
             or its anchor isn't correctly inserted in the layout, no page frame
             can be found. Thus, the return type changed to be a pointer and can
@@ -298,8 +268,6 @@ class SW_DLLPUBLIC SwAnchoredObject
         /** get frame, which contains the anchor character, if the object
             is anchored at-character or as-character.
 
-            OD 2004-10-04 #i26945#
-
             @author OD
 
             @return SwTxtFrm*
@@ -314,22 +282,18 @@ class SW_DLLPUBLIC SwAnchoredObject
         {
             return mpVertPosOrientFrm;
         }
-        // --> OD 2004-11-29 #115759# - method to clear member <mpVertPosOrientFrm>
+        // method to clear member <mpVertPosOrientFrm>
         inline void ClearVertPosOrientFrm()
         {
             mpVertPosOrientFrm = 0L;
         }
-        // <--
 
         /** check anchor character rectangle and top of line
 
-            OD 2004-03-25 #i26791#
             For to-character anchored Writer fly frames the members <maLastCharRect>
             and <maLastTopOfLine> are updated. These are checked for change and
             depending on the applied positioning, it's decided, if the Writer fly
             frame has to be invalidated.
-            OD 2004-07-15 #117380#
-            add parameter <_bCheckForParaPorInf>, default value <true>
 
             @author OD
 
@@ -348,13 +312,10 @@ class SW_DLLPUBLIC SwAnchoredObject
 
         // accessor to member <nmLastTopOfLine>
         SwTwips GetLastTopOfLine() const;
-        // OD 2004-05-18 #i28701# - follow-up of #i22341#
         void AddLastTopOfLineY( SwTwips _nDiff );
 
         /** reset members <maLastCharRect> and <mnLastTopOfLine>
 
-            OD 2004-06-29 #i27801#
-
             @author OD
         */
         void ClearCharRectAndTopOfLine();
@@ -377,8 +338,6 @@ class SW_DLLPUBLIC SwAnchoredObject
 
         /** method to determine, if invalidation of position is allowed
 
-            OD 2004-07-01 #i28701#
-
             @author OD
         */
         bool InvalidationOfPosAllowed() const;
@@ -393,16 +352,12 @@ class SW_DLLPUBLIC SwAnchoredObject
             objects, for whose the wrapping style influence has to be considered
             on the object positioning.
 
-            OD 2004-06-30 #i28701#
-
             @author OD
         */
         void InvalidateObjPosForConsiderWrapInfluence( const bool _bNotifyBackgrd );
 
         /** method to trigger notification of 'background'
 
-            OD 2004-07-01 #i28701#
-
             @author OD
         */
         virtual void NotifyBackground( SwPageFrm* _pPageFrm,
@@ -420,19 +375,15 @@ class SW_DLLPUBLIC SwAnchoredObject
 
         // accessors to the object area and its position
         virtual const SwRect GetObjRect() const = 0;
-        // --> OD 2006-08-10 #i68520#
+
         void SetObjTop( const SwTwips _nTop);
         void SetObjLeft( const SwTwips _nLeft);
-        // <--
 
         /** method update layout direction the layout direction, the anchored
             object is assigned to
 
-            OD 2004-07-27 #i31698#
             method has typically to be called, if the anchored object gets its
             anchor frame assigned and if the anchor frame changes its layout direction
-            OD 2006-03-17 #i62875#
-            made virtual, because it's needed to be overloaded by <SwAnchoredDrawObject>
 
             @author OD
         */
@@ -440,24 +391,18 @@ class SW_DLLPUBLIC SwAnchoredObject
 
         /** method to determine object area inclusive its spacing
 
-            OD 2004-06-30 #i28701#
-            OD 2006-08-10 #i68520# - return constant reference
-
             @author OD
         */
         const SwRect& GetObjRectWithSpaces() const;
 
-        // --> OD 2006-08-10 #i68520#
         inline void InvalidateObjRectWithSpaces() const
         {
             mbObjRectWithSpacesValid = false;
         }
-        // <--
 
         /** method to determine, if wrapping style influence of the anchored
             object has to be considered on the object positioning
 
-            OD 2004-06-30 #i28701#
             Note: result of this method also decides, if the boolean for the
             layout process are of relevance.
 
@@ -465,7 +410,7 @@ class SW_DLLPUBLIC SwAnchoredObject
         */
         bool ConsiderObjWrapInfluenceOnObjPos() const;
 
-        // --> OD 2004-06-29 #i28701# - accessors to booleans for layout process
+        // accessors to booleans for layout process
         bool ConsiderForTextWrap() const;
         void SetConsiderForTextWrap( const bool _bConsiderForTextWrap );
         bool PositionLocked() const;
@@ -480,19 +425,19 @@ class SW_DLLPUBLIC SwAnchoredObject
                 mbPositionLocked = false;
             }
         }
-        // --> OD 2005-01-10 #i40147#
+
         inline void SetKeepPosLocked( const bool _bKeepPosLocked )
         {
             mbKeepPositionLockedForSection = _bKeepPosLocked;
         }
-        // <--
+
         bool RestartLayoutProcess() const;
         void SetRestartLayoutProcess( const bool _bRestartLayoutProcess );
-        // --> OD 2004-10-22 #i35911# - accessors for <mbClearedEnvironment>
+        // accessors for <mbClearedEnvironment>
         bool ClearedEnvironment() const;
         void SetClearedEnvironment( const bool _bClearedEnvironment );
-        // <--
-        // --> OD 2005-03-03 #i43913# - reset booleans for layout process
+
+        // reset booleans for layout process
         inline void ResetLayoutProcessBools()
         {
             mbPositioningInProgress = false;
@@ -503,20 +448,16 @@ class SW_DLLPUBLIC SwAnchoredObject
             mbClearedEnvironment = false;
             mbTmpConsiderWrapInfluence = false;
         }
-        // <--
 
         /** method to determine, if due to anchored object size and wrapping
             style, its layout environment is cleared.
 
-            OD 2004-10-22 #i35911#
-
             @author OD
         */
         bool HasClearedEnvironment() const;
 
         /** method to update anchored object in the <SwSortedObjs> lists
 
-            OD 2004-07-01 #i28701#
             Method is not proposed to be called during a layout process is
             running. It has been used on the change of the anchored object
             attributes, which belongs the sort criteria of <SwSortedObjs>.
@@ -531,7 +472,6 @@ class SW_DLLPUBLIC SwAnchoredObject
 
         /** method to determine, if a format on the anchored object is possible
 
-            OD 2004-07-23 #i28701#
             A format isn't possible, if anchored object is in an invisible layer.
             Note: method is virtual to refine the conditions for the sub-classes.
 
@@ -539,15 +479,13 @@ class SW_DLLPUBLIC SwAnchoredObject
         */
         virtual bool IsFormatPossible() const;
 
-        // --> OD 2004-08-25 #i3317# - accessors to member <mbTmpConsiderWrapInfluence>
+        // accessors to member <mbTmpConsiderWrapInfluence>
         void SetTmpConsiderWrapInfluence( const bool _bTmpConsiderWrapInfluence );
         bool IsTmpConsiderWrapInfluence() const;
-        // <--
 
         /** method to determine, if the anchored object is overlapping with a
             previous column
 
-            OD 2004-08-25 #i3317#
             overlapping with a previous column means, that the object overlaps
             with a column, which is a previous one of the column its anchor
             frame is in.
@@ -560,7 +498,6 @@ class SW_DLLPUBLIC SwAnchoredObject
         /** method to determine position of anchored object relative to
             anchor frame
 
-            OD 2005-01-06 #i30669#
             Usage: Needed layout information for WW8 export
 
             @author OD
@@ -572,10 +509,8 @@ class SW_DLLPUBLIC SwAnchoredObject
         /** method to determine position of anchored object relative to
             page frame
 
-            OD 2005-01-06 #i30669#
             Usage: Needed layout information for WW8 export
-            OD 2005-01-27 #i33818# - add parameters <_bFollowTextFlow> and
-            <_obRelToTableCell>
+
             If <_bFollowTextFlow> is set and object is anchored inside table,
             the position relative to the table cell is determined. Output
             parameter <_obRelToTableCell> reflects this situation
@@ -598,7 +533,6 @@ class SW_DLLPUBLIC SwAnchoredObject
         /** method to determine position of anchored object relative to
             anchor character
 
-            OD 2005-01-06 #i30669#
             Usage: Needed layout information for WW8 export
 
             @author OD
@@ -610,7 +544,6 @@ class SW_DLLPUBLIC SwAnchoredObject
         /** method to determine position of anchored object relative to
             top of line
 
-            OD 2005-01-06 #i30669#
             Usage: Needed layout information for WW8 export
 
             @author OD
@@ -621,18 +554,16 @@ class SW_DLLPUBLIC SwAnchoredObject
 };
 
 // ============================================================================
-// OD 2004-04-13 #i26791#, #i28701#
 // helper class for notify that positioning of an anchored object is in progress
 // ============================================================================
 class SwObjPositioningInProgress
 {
     private:
         SwAnchoredObject* mpAnchoredObj;
-        // --> OD 2005-08-09 #i52904# - introduce boolean indicating old state
+        // boolean indicating old state
         // of anchored object regarding positioning in progress in order to
         // consider nested usage of class <SwObjPositioningInProgress>
         bool mbOldObjPositioningInProgress;
-        // <--
 
     public:
         SwObjPositioningInProgress( SdrObject& _rSdrObj );
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index 5155673ba074..d6242c6301f9 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.hxx
@@ -36,9 +36,7 @@
 #include <svl/svstdarr.hxx>
 
 class SwAuthDataArr;
-/* -----------------21.09.99 13:32-------------------
 
- --------------------------------------------------*/
 class SwAuthEntry
 {
     String      aAuthFields[AUTH_FIELD_END];
@@ -56,9 +54,7 @@ public:
     void            RemoveRef()             { --nRefCount; }
     USHORT          GetRefCount()           { return nRefCount; }
 };
-/* -----------------20.10.99 16:49-------------------
 
- --------------------------------------------------*/
 struct SwTOXSortKey
 {
     ToxAuthorityField   eField;
@@ -68,9 +64,6 @@ struct SwTOXSortKey
         bSortAscending(TRUE){}
 };
 
-/* -----------------14.09.99 16:15-------------------
-
- --------------------------------------------------*/
 class SwAuthorityField;
 class SortKeyArr;
 
@@ -160,9 +153,7 @@ public:
     void            SetSortAlgorithm(const String& rSet) {m_sSortAlgorithm = rSet;}
 
 };
-/* -----------------14.09.99 16:15-------------------
 
- --------------------------------------------------*/
 class SwAuthorityField : public SwField
 {
     long            m_nHandle;
diff --git a/sw/inc/bparr.hxx b/sw/inc/bparr.hxx
index 2032300ea0dc..32f4e751b5e3 100644
--- a/sw/inc/bparr.hxx
+++ b/sw/inc/bparr.hxx
@@ -54,41 +54,41 @@ typedef BigPtrEntry* ElementPtr;
 
 typedef BOOL (*FnForEach)( const ElementPtr&, void* pArgs );
 
-// 1000 Eintr„ge pro Block = etwas weniger als 4K
+// 1000 entries per Block = a bit less then 4K
 #define MAXENTRY 1000
 
 
-// Anzahl Eintraege, die bei der Kompression frei bleiben duerfen
-// dieser Wert ist fuer den Worst Case, da wir MAXBLOCK mit ca 25%
-// Overhead definiert haben, reichen 80% = 800 Eintraege vollkommen aus
-// Will mann voellige Kompression haben, muss eben 100 angegeben werden.
-
+// number of entries that may remain free during compression
+// this value is for the worst case; because we defined MAXBLOCK with ca 25%
+// overhead, 80% = 800 entries are enough
+// if complete compression is desired, 100 has to be specified
 #define COMPRESSLVL 80
 
-struct BlockInfo {                  // Block-Info:
-    BigPtrArray* pBigArr;           // in diesem Array steht der Block
-    ElementPtr* pData;              // Datenblock
-    ULONG nStart, nEnd;             // Start- und EndIndex
-    USHORT nElem;                   // Anzahl Elemente
+struct BlockInfo {                  // block info:
+    BigPtrArray* pBigArr;           // in this array the block is located
+    ElementPtr* pData;              // data block
+    ULONG nStart, nEnd;             // start- and end index
+    USHORT nElem;                   // number of elements
 };
 
 class SW_DLLPUBLIC BigPtrArray
 {
-    BlockInfo** ppInf;              // Block-Infos
-    ULONG       nSize;              // Anzahl Elemente
-    USHORT      nMaxBlock;          // akt. max Anzahl Bloecke
-    USHORT      nBlock;             // Anzahl Bloecke
-    USHORT      nCur;               // letzter Block
+    BlockInfo** ppInf;              // block info
+    ULONG       nSize;              // number of elements
+    USHORT      nMaxBlock;          // current max. number of blocks
+    USHORT      nBlock;             // number of blocks
+    USHORT      nCur;               // last block
 
-    USHORT      Index2Block( ULONG ) const; // Blocksuche
-    BlockInfo*  InsBlock( USHORT );         // Block einfuegen
-    void        BlockDel( USHORT );         // es wurden Bloecke geloescht
-    void        UpdIndex( USHORT );         // Indexe neu berechnen
+    USHORT      Index2Block( ULONG ) const; // block search
+    BlockInfo*  InsBlock( USHORT );         // insert block
+    void        BlockDel( USHORT );         // some blocks were deleted
+    void        UpdIndex( USHORT );         // recalculate indices
 
 protected:
-    // fuelle alle Bloecke auf.
-    // Der short gibt in Prozent an, wie voll die Bloecke werden sollen.
-    // Der ReturnWert besagt, das irgendetwas "getan" wurde
+    // fill all blocks
+    // the short parameter specifies in percent, how full the blocks should be
+    // made
+    // the return value specifies that something was done
     USHORT Compress( short = COMPRESSLVL );
 
 public:
@@ -114,7 +114,7 @@ public:
 
 inline ULONG BigPtrEntry::GetPos() const
 {
-    DBG_ASSERT( this == pBlock->pData[ nOffset ], "Element nicht im Block" );
+    DBG_ASSERT( this == pBlock->pData[ nOffset ], "element not in the block" );
     return pBlock->nStart + nOffset;
 }
 
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index 86fded93098b..8708f923fcb6 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -27,23 +27,19 @@
  ************************************************************************/
 
 /*************************************************************
-#* Service-Klassen
+#* service classes
  *************************************************************/
 
 /*
-#* Aendert sich ein Attribut in einem Format, so muss diese
-#* Aenderung an alle abhaengigen Formate und ueber sie an
-#* alle betroffenen Nodes propagiert werden. Dabei muss
-#* festgestellt werden, ob die Aenderung einen Effekt haben
-#* kann, oder ob das geaenderte Attribut von dem abhaengigen
-#* Format ueberdefiniert wird (so dass ohnehin der
-#* Attributwert des abhaengigen Formates den geaenderten
-#* Wert verdeckt). Weiterhin kann der betroffene Node
-#* feststellen, ob er von dem geaenderten Attribut Gebrauch
-#* macht (Beispiel: Linienabstand fuer Unterstreichung wurde
-#* geaendert, das Attribut Unterstreichung wurde aber nicht
-#* verwendet). So wird bei Aenderungen der minimale Aufwand
-#* zum Reformatieren erkannt.
+ * When an attribute in a format is changed, this change has to be propagated
+ * to all dependent formats and over them to all concerned nodes.
+ * In doing so it has to be decided whether the change can have an effect or
+ * whether the dependent format redefines the changed attribute (such that the
+ * attribute value of the dependent format occludes the changed value).
+ * Furthermore, the concerned node can decide whether it makes use of the
+ * changed attribute (for example: line distance for underlining was changed,
+ * but the underlining attribute was not used). This way, the minimal effort
+ * for reformatting is identified.
  */
 #ifndef _CALBCK_HXX
 #define _CALBCK_HXX
@@ -65,15 +61,17 @@ class SW_DLLPUBLIC SwClient
     friend class SwModify;
     friend class SwClientIter;
 
-    SwClient *pLeft, *pRight;           // fuer die AVL-Sortierung
-    BOOL bModifyLocked : 1;             // wird in SwModify::Modify benutzt,
-                                        // eigentlich ein Member des SwModify
-                                        // aber aus Platzgruenden hier.
-    BOOL bInModify  : 1;                // ist in einem Modify. (Debug!!!)
-    BOOL bInDocDTOR : 1;                // Doc wird zerstoert, nicht "abmelden"
-    BOOL bInCache   : 1;                // Ist im BorderAttrCache des Layout,
-                                        // Traegt sich dann im Modify aus!
-    BOOL bInSwFntCache : 1;             // Ist im SwFont-Cache der Formatierung
+    SwClient *pLeft, *pRight;           // for AVL sorting
+    BOOL bModifyLocked : 1;             // used in SwModify::Modify,
+                                        // is really a member of SwModify
+                                        // but here for lack of space
+
+    BOOL bInModify  : 1;                // is in a modify. (Debug!!!)
+    BOOL bInDocDTOR : 1;                // Doc gets destroyed,
+                                        // do not "unsubscribe"
+    BOOL bInCache   : 1;                // is in BorderAttrCache of the layout,
+                                        // unsubscribes itself then in Modify!
+    BOOL bInSwFntCache : 1;             // is in SwFont cache of the formatting
 
 protected:
     SwModify *pRegisteredIn;
@@ -88,9 +86,8 @@ public:
     virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
     const SwModify* GetRegisteredIn() const { return pRegisteredIn; }
 
-    //rtti, abgeleitete moegens gleichtun oder nicht. Wenn sie es gleichtun
-    //kann ueber die Abhaengigkeitsliste eines Modify typsicher gecastet
-    //werden.
+    //rtti, derived classes may do likewise or not. When they do, it can be
+    //casted typesafely via the dependency list of a Modify
     TYPEINFO();
 
     void LockModify()                   { bModifyLocked = TRUE;  }
@@ -102,7 +99,7 @@ public:
     BOOL IsInCache()      const         { return bInCache;       }
     BOOL IsInSwFntCache()  const        { return bInSwFntCache;  }
 
-        // erfrage vom Client Informationen
+    // get client Information
     virtual BOOL GetInfo( SfxPoolItem& ) const;
 
 private:
@@ -119,7 +116,7 @@ inline SwClient::SwClient() :
 // SwModify
 // ----------
 
-// Klasse hat eine doppelt Verkette Liste fuer die Abhaengigen.
+// class has a doubly linked list for dependencies
 
 class SW_DLLPUBLIC SwModify: public SwClient
 {
@@ -144,7 +141,7 @@ public:
 
     const SwClient* GetDepends() const  { return pRoot; }
 
-        // erfrage vom Client Informationen
+    // get client information
     virtual BOOL GetInfo( SfxPoolItem& ) const;
 
     void SetInDocDTOR() { bInDocDTOR = TRUE; }
@@ -170,9 +167,9 @@ protected:
 // ----------
 
 /*
- * Sehr sinnvolle Klasse, wenn ein Objekt von mehreren Objekten
- * abhaengig ist. Diese sollte fuer jede Abhaengigkeit ein Objekt
- * der Klasse SwDepend als Member haben.
+ * Very useful class when an object depends on multiple objects.
+ * This should have an object of the class SwDepend as member for each
+ * dependency.
  */
 class SW_DLLPUBLIC SwDepend: public SwClient
 {
@@ -185,7 +182,7 @@ public:
     SwClient* GetToTell() { return pToTell; }
     virtual void Modify( SfxPoolItem *pOldValue, SfxPoolItem *pNewValue );
 
-        // erfrage vom Client Informationen
+    // get Client information
     virtual BOOL GetInfo( SfxPoolItem & ) const;
 
 private:
@@ -197,18 +194,18 @@ private:
 
 class SwClientIter
 {
-    friend SwClient* SwModify::_Remove(SwClient *); // fuer Ptr-Korrektur
-    friend void SwModify::Add(SwClient *);          // nur fuer ASSERT !
+    friend SwClient* SwModify::_Remove(SwClient *); // for ptr correction
+    friend void SwModify::Add(SwClient *);          // only for OSL_ENSURE !
 
     SwModify const& rRoot;
     SwClient *pAkt, *pDelNext;
-    // fuers Updaten der aller Iteratoren beim Einfuegen/Loeschen von
-    // Clients, wenn der Iterator gerade draufsteht.
+    // for updating of all iterators when inserting/deleting clients, while the
+    // iterator points on it
     SwClientIter *pNxtIter;
 
     SwClient* mpWatchClient;    // if set, SwModify::_Remove checks if this client is removed
 
-    TypeId aSrchId;             // fuer First/Next - suche diesen Type
+    TypeId aSrchId;             // for First/Next - look for this type
 
 public:
     SW_DLLPUBLIC SwClientIter( SwModify const& );
@@ -217,16 +214,16 @@ public:
     const SwModify& GetModify() const       { return rRoot; }
 
 #ifndef CFRONT
-    SwClient* operator++(int);  // zum Naechsten
-    SwClient* operator--(int);  // zum Vorherigen
+    SwClient* operator++(int);
+    SwClient* operator--(int);
 #endif
-    SwClient* operator++();     // zum Naechsten
-    SwClient* operator--();     // zum Vorherigen
+    SwClient* operator++();
+    SwClient* operator--();
 
-    SwClient* GoStart();        // zum Anfang
-    SwClient* GoEnd();          // zum Ende
+    SwClient* GoStart();
+    SwClient* GoEnd();
 
-    inline SwClient* GoRoot();      // wieder ab Root (==Start) anfangen
+    inline SwClient* GoRoot();      // restart from root
 
     SwClient* operator()() const
         { return pDelNext == pAkt ? pAkt : pDelNext; }
@@ -240,7 +237,7 @@ public:
     void SetWatchClient( SwClient* pWatch ) { mpWatchClient = pWatch; }
 };
 
-inline SwClient* SwClientIter::GoRoot()     // wieder ab Root anfangen
+inline SwClient* SwClientIter::GoRoot()
 {
     pAkt = rRoot.pRoot;
     return (pDelNext = pAkt);
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index 36614e6725f5..da6d79990637 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -41,7 +41,7 @@ class LocaleDataWrapper;
 class SwFieldType;
 class SwDoc;
 
-#define TBLSZ 47                // sollte Primzahl sein, wegen HashTable
+#define TBLSZ 47                // should be a prime, because of hash table
 
 const sal_Unicode cListDelim    = '|';
 
@@ -107,22 +107,20 @@ extern const sal_Char __FAR_DATA sCalc_Date[];
 enum SwCalcError
 {
     CALC_NOERR=0,
-    CALC_SYNTAX,        //  Syntax Fehler
-    CALC_ZERODIV,       //  Division durch Null
-    CALC_BRACK,         //  Fehlerhafte Klammerung
-    CALC_POWERR,        //  Ueberlauf in Quadratfunktion
-    CALC_VARNFND,       //  Variable wurde nicht gefunden
-    CALC_OVERFLOW,      //  Ueberlauf
-    CALC_WRONGTIME      //  falsches Zeitformat
+    CALC_SYNTAX,        //  syntax error
+    CALC_ZERODIV,       //  division by zero
+    CALC_BRACK,         //  faulty brackets
+    CALC_POWERR,        //  overflow in power function
+    CALC_VARNFND,       //  variable was not found
+    CALC_OVERFLOW,      //  overflow
+    CALC_WRONGTIME      //  wrong time format
 };
 
 class SwSbxValue : public SbxValue
 {
     bool bVoid;
 public:
-    //JP 03.02.99: immer auf eine Zahl defaulten, damit auch gerechnet wird.
-    //              Ansonsten wird daraus ein SbxEMPTY und damit ist nichts
-    //              anzufangen.
+    // always default to a number. otherwise it will become a SbxEMPTY
     SwSbxValue( long n = 0 ) : bVoid(false)  { PutLong( n ); }
     SwSbxValue( const double& rD ) : bVoid(false) { PutDouble( rD ); }
     SwSbxValue( const SwSbxValue& rVal ) :
@@ -133,9 +131,7 @@ public:
     virtual ~SwSbxValue();
 
 
-    // Strings sonderbehandeln
     BOOL GetBool() const;
-    // Strings sonderbehandeln BOOLs sonderbehandeln
     double GetDouble() const;
     SwSbxValue& MakeDouble();
 
@@ -144,7 +140,7 @@ public:
 };
 
 /******************************************************************************
- *          Calculate HashTables fuer VarTable und Operations
+ *          Calculate HashTables for VarTable und Operations
  ******************************************************************************/
 struct SwHash
 {
@@ -168,7 +164,7 @@ SwHash* Find( const String& rSrch, SwHash** ppTable,
 
 void DeleteHashTable( SwHash** ppTable, USHORT nTblSize );
 
-// falls _CalcOp != 0, dann ist das ein gueltiger Operator
+// if _CalcOp != 0, this is a valid operator
 struct _CalcOp;
 _CalcOp* FindOperator( const String& rSearch );
 
diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index 96d67dedd50c..5a44c3a2bc5e 100644
--- a/sw/inc/ccoll.hxx
+++ b/sw/inc/ccoll.hxx
@@ -47,7 +47,6 @@
 //***********************************************************
 
 struct CollName {
-//      const char* pStr;
         ULONG nCnd;
         ULONG nSubCond;
     };
diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index 27aae1368c83..b899c2573780 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -37,12 +37,12 @@
 
 class SW_DLLPUBLIC SwTblBoxNumFormat : public SfxUInt32Item
 {
-    BOOL bAuto;     // automatisch vergebenes Flag
+    BOOL bAuto;     // automatically given flag
 public:
     SwTblBoxNumFormat( UINT32 nFormat = NUMBERFORMAT_TEXT,
                         BOOL bAuto = FALSE );
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
 
@@ -59,21 +59,19 @@ public:
 
 class SwTblBoxFormula : public SfxPoolItem, public SwTableFormula
 {
-    SwModify* pDefinedIn;   // Modify-Object, in dem die Formel steht
-                            // kann nur TablenBoxFormat sein
+    SwModify* pDefinedIn;   // Modify object where the formula is located
+                            // can only be TableBoxFormat
 
 public:
     SwTblBoxFormula( const String& rFormula );
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
 
-    // erfrage und setze den Modify-Pointer
     inline const SwModify* GetDefinedIn() const { return pDefinedIn; }
     inline void ChgDefinedIn( const SwModify* pNew )
                                             { pDefinedIn = (SwModify*)pNew; }
-    // suche den Node, in dem die Formel steht:
     //  BoxAttribut -> BoxStartNode
     virtual const SwNode* GetNodeOfFormula() const;
 
@@ -81,9 +79,7 @@ public:
     const SwTableBox* GetTableBox() const
         { return ((SwTblBoxFormula*)this)->GetTableBox(); }
 
-    // Status aendern
     void ChangeState( const SfxPoolItem* pItem );
-    // berechne die Formel
     void Calc( SwTblCalcPara& rCalcPara, double& rValue );
 };
 
@@ -94,7 +90,7 @@ public:
     SwTblBoxValue();
     SwTblBoxValue( const double aVal );
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
 
diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx
index efdccf488995..e806e215d5d4 100644
--- a/sw/inc/cellfml.hxx
+++ b/sw/inc/cellfml.hxx
@@ -47,9 +47,9 @@ class SwTblCalcPara
     USHORT nStackCnt, nMaxSize;
 
 public:
-    SwTableSortBoxes *pBoxStk;  // Stack fuers erkennen von Rekursionen !
-    SwCalc& rCalc;              // akt. Calculator
-    const SwTable* pTbl;        // akt. Tabelle
+    SwTableSortBoxes *pBoxStk;  // stack for recognizing recursion
+    SwCalc& rCalc;              // current Calculator
+    const SwTable* pTbl;        // current table
 
     SwTblCalcPara( SwCalc& rCalculator, const SwTable& rTable );
     ~SwTblCalcPara();
@@ -97,14 +97,14 @@ typedef void (SwTableFormula:: *FnScanFormel)( const SwTable&, String&,
 protected:
     enum NameType { EXTRNL_NAME, INTRNL_NAME, REL_NAME };
 
-    String      sFormel;            // akt. Formel
-    NameType    eNmType;            // akt. Darstellungs Art
-    bool               bValidValue;            // TRUE: Formel neu berechnen
+    String      sFormel;            // current formula
+    NameType    eNmType;            // current display method
+    bool               bValidValue; // TRUE: recalculate formula
 
-    // suche den Node, in dem die Formel steht:
+    // find the node in which the formula is located
     //  TextFeld    -> TextNode,
     //  BoxAttribut -> BoxStartNode
-    // !!! MUSS VON JEDER ABLEITUNG UEBERLADEN WERDEN !!!
+    // !!! has to be overloaded by every derivation !!!
     virtual const SwNode* GetNodeOfFormula() const = 0;
 
     SwTableFormula( const String& rFormel );
@@ -129,21 +129,18 @@ public:
                                     return *this;
         }
 
-    // erzeuge aus der internen (fuer CORE) die externe (fuer UI) Formel
+    // create from the internal formula (for CORE) the external formula (for UI)
     void PtrToBoxNm( const SwTable* pTbl );
-    // erzeuge aus der externen (fuer UI) die interne (fuer CORE) Formel
+    // create from the external formula the internal
     void BoxNmToPtr( const SwTable* pTbl );
-    // erzeuge aus der externen/internen Formel die relative Formel
+    // create from the external/internal formula the relative formula
     void ToRelBoxNm( const SwTable* pTbl );
-    // wird vorm/nach dem mergen/splitten von Tabellen rerufen
+    // gets called before/after merging/splitting of tables
     void ToSplitMergeBoxNm( SwTableFmlUpdate& rTblUpd );
 
-    // ist gerade eine intern Darstellung aktiv
     bool IsIntrnlName() const                  { return eNmType == INTRNL_NAME; }
-    // erfrage die akt. Darstellung der Formel
     NameType GetNameType() const        { return eNmType; }
 
-    // erfrage/setze das Flag, ob der akt. Wert gueltig ist
     bool               IsValid() const                         { return bValidValue; }
     inline void        ChgValid( bool bNew )           { bValidValue = bNew; }
 
@@ -156,7 +153,7 @@ public:
         }
 
     USHORT GetBoxesOfFormula( const SwTable& rTbl, SwSelBoxes& rBoxes );
-    // sind alle Boxen gueltig, auf die sich die Formel bezieht?
+    // are all boxes valid which this formula relies on?
     bool HasValidBoxes() const;
 };
 
diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx
index 3480af7cade8..5e4a397ea648 100644
--- a/sw/inc/charatr.hxx
+++ b/sw/inc/charatr.hxx
@@ -29,13 +29,10 @@
 #define _CHARATR_HXX
 
 #include <format.hxx>
-#include <hintids.hxx>      // fuer die WhichIds
+#include <hintids.hxx>
 
 
-/******************************************************************************
- *  Implementierung der Charakter-Attribut Methoden vom SwAttrSet
- *  AMA 12.10.94: Umstellung auf SvxItems.
- ******************************************************************************/
+// implementation of the character attribute methods of SwAttrSet
 
 inline const SvxPostureItem      &SwAttrSet::GetPosture(BOOL bInP) const
     {   return (const SvxPostureItem&)Get( RES_CHRATR_POSTURE,bInP); }
@@ -112,10 +109,7 @@ inline const SvxCharReliefItem  &SwAttrSet::GetCharRelief( BOOL bInP ) const
 inline const SvxCharHiddenItem  &SwAttrSet::GetCharHidden( BOOL bInP ) const
     {   return (const SvxCharHiddenItem&)Get( RES_CHRATR_HIDDEN, bInP ); }
 
-/******************************************************************************
- *  Implementierung der Charakter-Attribut Methoden vom SwFmt
- *  AMA: 12.10.94: Umstellung auf SvxItems.
- ******************************************************************************/
+// implementation of the character attribute methods of SwFmt
 
 inline const SvxPostureItem          &SwFmt::GetPosture(BOOL bInP) const
     {   return aSet.GetPosture(bInP); }
diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx
index 39837e16ddd7..8d288fba8703 100644
--- a/sw/inc/charfmt.hxx
+++ b/sw/inc/charfmt.hxx
@@ -46,7 +46,7 @@ class SwCharFmt : public SwFmt
 
 
 public:
-    TYPEINFO();    //Bereits in Basisklasse Client drin.
+    TYPEINFO();    // already in base class Client
 };
 
 namespace CharFmt
diff --git a/sw/inc/chcmprse.hxx b/sw/inc/chcmprse.hxx
index 30e322eb99a1..1a1d79b7e10b 100644
--- a/sw/inc/chcmprse.hxx
+++ b/sw/inc/chcmprse.hxx
@@ -35,8 +35,4 @@ enum SwCharCompressType{    CHARCOMPRESS_NONE,
 
 
 #endif
-
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx
index fe37e4c465a9..d4f0c2a7bb76 100644
--- a/sw/inc/chpfld.hxx
+++ b/sw/inc/chpfld.hxx
@@ -39,18 +39,14 @@ class SwTxtNode;
 enum SwChapterFormat
 {
     CF_BEGIN,
-    CF_NUMBER = CF_BEGIN,       // nur die Kapitelnummer
-    CF_TITLE,                   // nur die "Ueberschrift"
-    CF_NUM_TITLE,               // Kapitelnummer und "Ueberschrift"
-    CF_NUMBER_NOPREPST,         // nur die Kapitelnummer ohne Post/Prefix
-    CF_NUM_NOPREPST_TITLE,      // Kapitelnummer ohne Post/Prefix und "Ueberschrift"
+    CF_NUMBER = CF_BEGIN,       // only the chapter number
+    CF_TITLE,                   // only the title
+    CF_NUM_TITLE,               // number and title
+    CF_NUMBER_NOPREPST,         // only chapter number without post-/prefix
+    CF_NUM_NOPREPST_TITLE,      // chapter number without post-/prefix and title
     CF_END
 };
 
-/*--------------------------------------------------------------------
-    Beschreibung: Kapitel
- --------------------------------------------------------------------*/
-
 class SwChapterFieldType : public SwFieldType
 {
 public:
@@ -60,11 +56,6 @@ public:
 
 };
 
-
-
-/*--------------------------------------------------------------------
-    Beschreibung: Kapitelnummer
- --------------------------------------------------------------------*/
 class SW_DLLPUBLIC SwChapterField : public SwField
 {
     friend class SwChapterFieldType;
@@ -73,14 +64,10 @@ class SW_DLLPUBLIC SwChapterField : public SwField
 public:
     SwChapterField(SwChapterFieldType*, sal_uInt32 nFmt = 0);
 
-    // --> OD 2008-02-14 #i53420#
-//    void ChangeExpansion( const SwFrm*,
-//                          const SwTxtNode*,
-//                          BOOL bSrchNum = FALSE);
+    // #i53420#
     void ChangeExpansion( const SwFrm*,
                           const SwCntntNode*,
         BOOL bSrchNum = FALSE);
-    // <--
     void ChangeExpansion(const SwTxtNode &rNd, BOOL bSrchNum);
 
     virtual String   Expand() const;
diff --git a/sw/inc/chrdlg.hrc b/sw/inc/chrdlg.hrc
index 447229eb8965..9b94db2029ff 100644
--- a/sw/inc/chrdlg.hrc
+++ b/sw/inc/chrdlg.hrc
@@ -40,19 +40,18 @@
 #define DLG_DRAWCHAR            (RC_CHRDLG_BEGIN +  9)
 #define DLG_DRAWPARA            (RC_CHRDLG_BEGIN + 10)
 
-// Tabpages -> jetzt in globals.hrc
+// Tabpages -> now in globals.hrc
 
 #define STR_TEXTCOLL_HEADER     (RC_CHRDLG_BEGIN +  2)
 #define STR_PAGEFMT_HEADER      (RC_CHRDLG_BEGIN +  4)
 #define SW_STR_NONE             (RC_CHRDLG_BEGIN +  5)
-//#define STR_NUMFMT            (RC_CHRDLG_BEGIN +  6)
 
 #define MSG_ILLEGAL_PAGENUM     (RC_CHRDLG_BEGIN +  1)
 
 #define CHRDLG_ACT_END  DLG_DRAWPARA
 
 #if CHRDLG_ACT_END > RC_CHRDLG_END
-#error Resource-Id Ueberlauf in #file, #line
+#error Resource-Id overflow in #file, #line
 #endif
 
 #define DLG_SWDROPCAPS            (RC_CHRDLG_BEGIN + 11)
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index cd8cc254a72b..d9f13e1324a1 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -27,8 +27,8 @@
  ************************************************************************/
 
 /******************************************************************************
-Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
-         erlaubt, da es von swicli.c included wird!
+Attention : "In this file C++ style // comments are not allowed as it will be
+included in c-context files, so c++ style stuff will cause problems.
 ******************************************************************************/
 
 #ifndef INCLUDED_SW_CMDID_H
@@ -40,12 +40,10 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 #include <unomid.h>
 #endif
 
-/* Flags die mittels des Disable-Features in den Slot-Definitionen ausgenutzt
- * werden */
+/* Flags that are being used in the slot definitions for the disable-features */
 #define SW_DISABLE_ON_PROTECTED_CURSOR  0x00000001
 #define SW_DISABLE_ON_MAILBOX_EDITOR    0x00000002
 
-
 #define FN_FILE                 SID_SW_START
 #define FN_EDIT                 (SID_SW_START +  100)
 #define FN_VIEW                 (SID_SW_START +  200)
@@ -79,137 +77,126 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 #define FN_UNO_RANGE_BEGIN      FN_FORMAT2
 #define FN_UNO_RANGE_END        (FN_PARAM2 + 199)
 
-
 #define HELP_OFFSET                 1100
 #define CMD_STR_OFFSET              2200
 #define CMD_STR_OFFSET_MULTILANG    3300
 #define CMDID_END                   5500
 
 /*--------------------------------------------------------------------
-    Bereich: Datei
+    Region: File
  --------------------------------------------------------------------*/
-#define FN_CLOSE_FILE           (FN_FILE + 1 )    /* Schliessen */
-#define FN_LAUNCH_REGISTRY      (FN_FILE + 2 )    /* Ablage */
+#define FN_CLOSE_FILE           (FN_FILE + 1 )    /* Close */
+#define FN_LAUNCH_REGISTRY      (FN_FILE + 2 )    /* Registry */
 
-
-#define FN_NEW_GLOBAL_DOC       (FN_FILE + 4 )    /* Globaldokument erzeugen */
-#define FN_NEW_FILE             (FN_FILE + 5 )    /* Neu */
-#define FN_NEW_FILE_DLG         (FN_FILE + 6 )    /* Neu Dialog */
-#define FN_OPEN_FILE            (FN_FILE + 7 )    /* Oeffnen */
-#define FN_EDIT_FILE            (FN_FILE + 8 )    /* Oeffnen oder ToTop */
+#define FN_NEW_GLOBAL_DOC       (FN_FILE + 4 )    /* Create Global Document */
+#define FN_NEW_FILE             (FN_FILE + 5 )    /* New */
+#define FN_NEW_FILE_DLG         (FN_FILE + 6 )    /* New dialog */
+#define FN_OPEN_FILE            (FN_FILE + 7 )    /* Open */
+#define FN_EDIT_FILE            (FN_FILE + 8 )    /* Open or ToTop */
 
 #define FN_INETFILE             (FN_FILE + 9 )    /* Internet File-Dialog */
 
-#define FN_PRINT_FILE           (FN_FILE + 10)    /* Drucken */
-#define FN_PRINT_FILE_OPTIONS   (FN_FILE + 11)    /* Drucken Optionen */
-#define FN_SAVE_FILE_AS         (FN_FILE + 12)    /* Speichern unter */
-#define FN_SAVE_FILE            (FN_FILE + 13)    /* Speichern */
-#define FN_SETUP_PRINTER        (FN_FILE + 14)    /* Druckereinstellung */
-#define FN_SETUP_PRINTER_DLG    (FN_FILE + 15)    /* Druckereinstellung */
-#define FN_SHOW_PREVIEW         (FN_FILE + 16)    /* Druckbild */
-#define FN_EXIT                 (FN_FILE + 17)    /* Writer beenden */
-#define FN_PRINT_CFG_DLG        (FN_FILE + 18)    /* Optionen Drucken */
-
+#define FN_PRINT_FILE           (FN_FILE + 10)    /* Print */
+#define FN_PRINT_FILE_OPTIONS   (FN_FILE + 11)    /* Print file options */
+#define FN_SAVE_FILE_AS         (FN_FILE + 12)    /* Save as */
+#define FN_SAVE_FILE            (FN_FILE + 13)    /* Save */
+#define FN_SETUP_PRINTER        (FN_FILE + 14)    /* Printer setup */
+#define FN_SETUP_PRINTER_DLG    (FN_FILE + 15)    /* Printer setup dialog */
+#define FN_SHOW_PREVIEW         (FN_FILE + 16)    /* Print preview */
+#define FN_EXIT                 (FN_FILE + 17)    /* Close Writer */
+#define FN_PRINT_CFG_DLG        (FN_FILE + 18)    /* Print configuration dialog */
 
+#define FN_SAVE_ALL             (FN_FILE + 23)    /* Save all files */
+#define FN_NEW_FILE_DEFAULT     (FN_FILE + 24)    /* New file with default template */
+#define FN_PRINT_FILE_DEFAULT   (FN_FILE + 25)    /* Print with default settings */
+#define FN_LAUNCH_EQ_EDITOR     (FN_FILE + 26)    /* Equation editor */
+#define FN_CHANGE_PRINTER       (FN_FILE + 27)    /* Select printer */
+#define FN_FAX_END              (FN_FILE + 29)    /* Ready to fax, Id for PostMessage */
 
-#define FN_SAVE_ALL             (FN_FILE + 23)    /* Alle Files speichern */
-#define FN_NEW_FILE_DEFAULT     (FN_FILE + 24)    /* Neue Datei mit Standardvorlage */
-#define FN_PRINT_FILE_DEFAULT   (FN_FILE + 25)    /* Drucken mit Defaults */
-#define FN_LAUNCH_EQ_EDITOR     (FN_FILE + 26)    /* Formel Editor */
-#define FN_CHANGE_PRINTER       (FN_FILE + 27)    /* Drucker einstellen */
-#define FN_FAX_END              (FN_FILE + 29)    /* Faxen fertig, Id fuer PostMessage */
+#define FN_SELECT_DATABASE      (FN_FILE + 30)    /* Database selection */
+#define FN_DOC_INFO_DLG         (FN_FILE + 31)    /* Document information dialog */
+#define FN_DOC_MGR_DLG          (FN_FILE + 32)    /* Document-Manager */
 
-#define FN_SELECT_DATABASE      (FN_FILE + 30)    /* Selektion Datenbank */
-#define FN_DOC_INFO_DLG         (FN_FILE + 31)    /* Dokumentinfo */
-#define FN_DOC_MGR_DLG          (FN_FILE + 32)    /* Dokument-Manager */
+#define FN_GET_DOCSTAT          (FN_FILE + 33)    /* Get document statistics */
 
-#define FN_GET_DOCSTAT          (FN_FILE + 33)    /* Dokumentstatistik einzeln auslesen */
+#define FN_SAVE_SELECTION       (FN_FILE + 35)    /* Save selection */
 
+#define FN_OUTLINE_TO_IMPRESS   (FN_FILE + 36)  /* Send outline to impress */
+#define FN_OUTLINE_TO_CLIPBOARD (FN_FILE + 37)  /* Send outline to clipboard */
 
-#define FN_SAVE_SELECTION       (FN_FILE + 35)    /* Selektion speichern */
+#define FN_NEW_HTML_DOC         (FN_FILE + 40 ) /* Create HTML document */
 
-#define FN_OUTLINE_TO_IMPRESS   (FN_FILE + 36)  /* Outline zu StarImpress senden */
-#define FN_OUTLINE_TO_CLIPBOARD (FN_FILE + 37)  /* Outline in das Clipboad copieren */
-
-#define FN_NEW_HTML_DOC         (FN_FILE + 40 ) /* HTML-Dokument "erzeugen" */
-
-#define FN_APP_START            (FN_FILE + 98)  /* fuer Makro bei App.Start */
-#define FN_APP_END              (FN_FILE + 99)  /* fuer Makro bei App.Ende */
+#define FN_APP_START            (FN_FILE + 98)  /* Macro for App.Start */
+#define FN_APP_END              (FN_FILE + 99)  /* Macro for App.End */
 
 /*--------------------------------------------------------------------
-    Bereich: Bearbeiten
+    Region: Edit
  --------------------------------------------------------------------*/
-#define FN_CLEAR                (FN_EDIT + 1 )    /* Loeschen */
-#define FN_COPY                 (FN_EDIT + 2 )    /* Kopieren */
-#define FN_CUT                  (FN_EDIT + 3 )    /* Ausschneiden */
-#define FN_EDIT_FIELD           (FN_EDIT + 4 )    /* Textbefehl bearbeiten */
-#define FN_EDIT_FIELD_DLG       (FN_EDIT + 5 )    /* Textbefehl bearbeiten */
-#define FN_EDIT_FILE_INFO       (FN_EDIT + 6 )    /* Dokumentinfo */
-#define FN_EDIT_FILE_INFO_DLG   (FN_EDIT + 7 )    /* Dokumentinfo Dialog */
-#define FN_EDIT_LINK            (FN_EDIT + 8 )    /* Verknuepfungen */
-#define FN_EDIT_LINK_DLG        (FN_EDIT + 9 )    /* Verknuepfungen */
-#define FN_GOTO                 (FN_EDIT + 11)    /* Gehe zu */
-
-#define FN_PASTE                (FN_EDIT + 13)    /* Einfuegen */
-#define FN_PASTESPECIAL_DLG     (FN_EDIT + 15)    /* Verknuepfung einfuegen */
+#define FN_CLEAR                (FN_EDIT + 1 )    /* Clear */
+#define FN_COPY                 (FN_EDIT + 2 )    /* Copy */
+#define FN_CUT                  (FN_EDIT + 3 )    /* Cut */
+#define FN_EDIT_FIELD           (FN_EDIT + 4 )    /* Edit field */
+#define FN_EDIT_FIELD_DLG       (FN_EDIT + 5 )    /* Edit field dialog */
+#define FN_EDIT_FILE_INFO       (FN_EDIT + 6 )    /* Document information */
+#define FN_EDIT_FILE_INFO_DLG   (FN_EDIT + 7 )    /* Document information Dialog */
+#define FN_EDIT_LINK            (FN_EDIT + 8 )    /* Edit link */
+#define FN_EDIT_LINK_DLG        (FN_EDIT + 9 )    /* Edit link dialog */
+#define FN_GOTO                 (FN_EDIT + 11)    /* Go to */
+
+#define FN_PASTE                (FN_EDIT + 13)    /* Paste */
+#define FN_PASTESPECIAL_DLG     (FN_EDIT + 15)    /* Paste special dialog */
 #define FN_NUMBER_BULLETS       (FN_EDIT + 21)    /* Bullets */
-#define FN_REPEAT               (FN_EDIT + 22)    /* Letzten Befehl wiederholen */
-#define FN_EDIT_IDX_ENTRY_DLG   (FN_EDIT + 23)    /* Index-Entry bearbeiten */
-#define FN_UPDATE_FIELDS        (FN_EDIT + 26)    /* Feldinhalte erneuern */
-#define FN_EXECUTE_MACROFIELD   (FN_EDIT + 27)    /* Macrofeld ausfuehren */
-#define FN_EDIT_FORMULA         (FN_EDIT + 28)    /* Formel in RibbonBar bearbeiten */
-#define FN_CALC_TABLE           (FN_EDIT + 29)    /* Tabelle durchrechnen */
+#define FN_REPEAT               (FN_EDIT + 22)    /* Repeat last */
+#define FN_EDIT_IDX_ENTRY_DLG   (FN_EDIT + 23)    /* Edit Index-Entry */
+#define FN_UPDATE_FIELDS        (FN_EDIT + 26)    /* Update fields */
+#define FN_EXECUTE_MACROFIELD   (FN_EDIT + 27)    /* Execute macrofield */
+#define FN_EDIT_FORMULA         (FN_EDIT + 28)    /* Edit formula in RibbonBar */
+#define FN_CALC_TABLE           (FN_EDIT + 29)
 
 /*--------------------------------------------------------------------
-    Bereich: Bullets
+    Region: Bullets
  --------------------------------------------------------------------*/
-#define FN_NUM_BULLET_DOWN      (FN_EDIT + 30)  /* Runterstufen */
-#define FN_NUM_BULLET_UP        (FN_EDIT + 31)  /* Raufstufen */
-#define FN_NUM_BULLET_PREV      (FN_EDIT + 32)  /* zum vorigen Eintrag */
-#define FN_NUM_BULLET_NEXT      (FN_EDIT + 33)  /* zum naechsten Eintrag */
-#define FN_NUM_BULLET_MOVEUP    (FN_EDIT + 34)  /* nach oben schieben */
-#define FN_NUM_BULLET_MOVEDOWN  (FN_EDIT + 35)  /* nach unten schieben */
-#define FN_NUM_BULLET_NONUM     (FN_EDIT + 36)  /* Eintrag ohne Nummer */
+#define FN_NUM_BULLET_DOWN      (FN_EDIT + 30)  /* Bullet down */
+#define FN_NUM_BULLET_UP        (FN_EDIT + 31)  /* Bullet up */
+#define FN_NUM_BULLET_PREV      (FN_EDIT + 32)  /* to previous bullet */
+#define FN_NUM_BULLET_NEXT      (FN_EDIT + 33)  /* to next bullet */
+#define FN_NUM_BULLET_MOVEUP    (FN_EDIT + 34)  /* move bullet up */
+#define FN_NUM_BULLET_MOVEDOWN  (FN_EDIT + 35)  /* move bullet down */
+#define FN_NUM_BULLET_NONUM     (FN_EDIT + 36)  /* bullet without number */
 #ifndef FN_NUM_BULLET_OFF //in SVX already
-#define FN_NUM_BULLET_OFF       (FN_EDIT + 37)  /* Numerierung aus */
+#define FN_NUM_BULLET_OFF       (FN_EDIT + 37)  /* turn off numbering */
 #endif
 
+#define FN_NUM_BULLET_OUTLINE_DOWN      (FN_EDIT + 39)  /* reduce in rank with sub points */
+#define FN_NUM_BULLET_OUTLINE_UP        (FN_EDIT + 40)  /* increase in rank with sub-items */
+#define FN_NUM_BULLET_OUTLINE_MOVEUP    (FN_EDIT + 41)  /* Push up with sub-items */
+#define FN_NUM_BULLET_OUTLINE_MOVEDOWN  (FN_EDIT + 42)  /* Push down with sub-items */
+#define FN_UPDATE_INPUTFIELDS           (FN_EDIT + 43)  /* Update input fields */
 
-// schon im SVX
-//#define FN_NUM_BULLET_ON      (FN_EDIT + 38)  /* Numerierung mit Bullets an */
-
-#define FN_NUM_BULLET_OUTLINE_DOWN      (FN_EDIT + 39)  /* Runterstufen mit Unterpunkten */
-#define FN_NUM_BULLET_OUTLINE_UP        (FN_EDIT + 40)  /* Raufstufen mit Unterpunkten */
-#define FN_NUM_BULLET_OUTLINE_MOVEUP    (FN_EDIT + 41)  /* nach oben schieben mit Unterpunkten */
-#define FN_NUM_BULLET_OUTLINE_MOVEDOWN  (FN_EDIT + 42)  /* nach unten schieben mit Unterpunkten */
-#define FN_UPDATE_INPUTFIELDS           (FN_EDIT + 43)  /* Eingabefelder updaten */
-// schon im SVX
-//#define FN_NUM_NUMBERING_ON   (FN_EDIT + 44)  /* Numerierung an */
-
-#define FN_NUM_OR_NONUM         (FN_EDIT + 46)  /* Nummer ein-/aus */
+#define FN_NUM_OR_NONUM         (FN_EDIT + 46)  /* Number on/off */
 
-#define FN_GOTO_NEXT_INPUTFLD   (FN_EDIT + 47)  /* zum naechsten EingabeFeld    */
-#define FN_GOTO_PREV_INPUTFLD   (FN_EDIT + 48)  /* zum vorherigen EingabeFeld   */
+#define FN_GOTO_NEXT_INPUTFLD   (FN_EDIT + 47)  /* go to next inputfield */
+#define FN_GOTO_PREV_INPUTFLD   (FN_EDIT + 48)  /* go to previous inputfield    */
 
-#define FN_REPEAT_SEARCH        (FN_EDIT + 50)  /* Suche wiederholen */
-#define FN_REPEAT_REPLACE       (FN_EDIT + 51)  /* Ersetzen wiederholen */
-#define FN_UPDATE_GRAFIC        (FN_EDIT + 53)  /* Grafik aendern */
-#define FN_SETTAB_ATCURPOS      (FN_EDIT + 54)  /* Tab an der aktuellen Pos setzen */
-#define FN_SET_LR_IND_ATCURPOS  (FN_EDIT + 55)  /* EZE und LR setzen */
-#define FN_FRMCNT_TO_BODY       (FN_EDIT + 56)  /* Rahmeninhalt zu Text */
-#define FN_UPDATE_TOXBASE       (FN_EDIT + 57)  /* Naechstes Verzeichnis erneuern */
+#define FN_REPEAT_SEARCH        (FN_EDIT + 50)  /* Search again */
+#define FN_REPEAT_REPLACE       (FN_EDIT + 51)  /* Repeat replace */
+#define FN_UPDATE_GRAFIC        (FN_EDIT + 53)  /* Change graphic */
+#define FN_SETTAB_ATCURPOS      (FN_EDIT + 54)  /* Set Tab at the current position */
+#define FN_SET_LR_IND_ATCURPOS  (FN_EDIT + 55)  /* EZE and LR set */
+#define FN_FRMCNT_TO_BODY       (FN_EDIT + 56)  /* Frame content to text */
+#define FN_UPDATE_TOXBASE       (FN_EDIT + 57)  /* Next TOC list refresh */
 
-#define FN_REPAGINATE           (FN_EDIT + 61)  /* Neuformatierung erzwingen */
-#define FN_EDIT_FOOTNOTE        (FN_EDIT + 62)  /* Fussnote bearbeiten */
+#define FN_REPAGINATE           (FN_EDIT + 61)  /* Force repagination */
+#define FN_EDIT_FOOTNOTE        (FN_EDIT + 62)  /* Edit footnote */
 
-#define FN_EDIT_REGION          (FN_EDIT + 65)  /* Bereiche bearbeiten  */
-#define FN_GOTO_REFERENCE       (FN_EDIT + 66)  /* Von der Refmark zur Referenz */
+#define FN_EDIT_REGION          (FN_EDIT + 65)  /* Edit region */
+#define FN_GOTO_REFERENCE       (FN_EDIT + 66)  /* From Refmark to the reference */
 
-// schon im Svx definiert
+// already defined in SVX
 #define FN_NEXT_BOOKMARK        (FN_EDIT + 68)  /*  */
 #define FN_PREV_BOOKMARK        (FN_EDIT + 69)  /*  */
 
-/*Navigator ToolBoxen*/
+/*Navigator ToolBoxes*/
 #define FN_SELECT_BOOKMARK           (FN_EDIT + 70)  /**/
 #define FN_ITEM_DOWN                 (FN_EDIT + 71)  /**/
 #define FN_ITEM_LEFT                 (FN_EDIT + 72)  /**/
@@ -228,31 +215,22 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 #define FN_SELECT_INDEX              (FN_EDIT + 85)  /**/
 #define FN_UP                        (FN_EDIT + 86)  /**/
 
+#define FN_SELECT_PARA               (FN_EDIT + 97) /* select paragraph*/
 
-//#define FN_DELETE_REGION           (FN_EDIT + 89) /* Bereiche loeschen    */
+#define FN_SELECT_CONTENT            (FN_EDIT + 99) /* Navigator - Content Type */
 
+#define FN_UPDATE_ALL_LINKS          (FN_EDIT2 + 24) /* update all links */
 
-#define FN_SELECT_PARA               (FN_EDIT + 97) /* Absatz selektieren */
-
-#define FN_SELECT_CONTENT            (FN_EDIT + 99) /* Navigator - Inhaltstyp */
-
-
-
-
-//#define FN_REDLINE_PROTECT           (FN_EDIT2 + 23) /* Redlining password */     ->moved to SVX
-#define FN_UPDATE_ALL_LINKS          (FN_EDIT2 + 24) /* alle Links updaten */
-
-//#define FN_REDLINE_ON              (FN_EDIT2 + 25) /* Redlining anschalten */     -> moved to SVX
-#define FN_REDLINE_SHOW              (FN_EDIT2 + 26) /* Redlining anzeigen */
-#define FN_REDLINE_COMMENT           (FN_EDIT2 + 27) /* Redlining kommentieren */
+#define FN_REDLINE_SHOW              (FN_EDIT2 + 26) /* show Redlining */
+#define FN_REDLINE_COMMENT           (FN_EDIT2 + 27) /* comment Redlining */
 
 #define FN_UPDATE_ALL                (FN_EDIT2 + 28) /* FN_UPDATE_ALL_LINKS,
                                                         FN_UPDATE_FIELDS,
                                                         FN_UPDATE_TOX,
                                                         CalcLayout */
 
-#define FN_REDLINE_ACCEPT            (FN_EDIT2 + 29) /* Redlining annehmen/ablehnen */
-#define FN_ATTR_COLUMNS              (FN_EDIT2 + 31) /* SlotId fuer SwFmtCol */
+#define FN_REDLINE_ACCEPT            (FN_EDIT2 + 29) /* Redlining Accept/Reject */
+#define FN_ATTR_COLUMNS              (FN_EDIT2 + 31) /* SlotId for SwFmtCol */
 #define FN_EDIT_CURRENT_TOX          (FN_EDIT2 + 32) /* edit current index */
 #define FN_EDIT_AUTH_ENTRY_DLG       (FN_EDIT2 + 33) /* edit authorities entry*/
 #define FN_UPDATE_CHARTS             (FN_EDIT2 + 34) /* update all charts */
@@ -265,155 +243,146 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 #define FN_COPY_HYPERLINK_LOCATION   (FN_EDIT2 + 40)    /* copy hyperlink URL to clipboard */
 
 /*--------------------------------------------------------------------
-    Bereich: Bearbeiten
+    Region: Edit
  --------------------------------------------------------------------*/
 
 #define FN_REFRESH_VIEW         (FN_VIEW + 1)   /* Refresh/Redraw */
-#define FN_SHOW_OUTLINE_VIEW    (FN_VIEW + 2)   /* Gliederungsansicht */
+#define FN_SHOW_OUTLINE_VIEW    (FN_VIEW + 2)   /* Show outline */
 
 #define FN_DRAW_WRAP_DLG        (FN_VIEW + 3)   /* Draw Umlauf-Dlg */
 
-#define FN_RULER                (FN_VIEW + 11)  /* Horizontales Lineal */
+#define FN_RULER                (FN_VIEW + 11)  /* Horizontal ruler */
 
-#define FN_VIEW_GRAPHIC         (FN_VIEW + 13)  /* Grafiken anzeigen */
-#define FN_VIEW_BOUNDS          (FN_VIEW + 14)  /* Begrenzungen */
-#define FN_VIEW_FIELDS          (FN_VIEW + 15)  /* Textbefehle */
-#define FN_VLINEAL              (FN_VIEW + 16)  /* Vertikales Lineal */
-#define FN_VSCROLLBAR           (FN_VIEW + 17)  /* Vertikaler Scrollbar */
-#define FN_HSCROLLBAR           (FN_VIEW + 18)  /* Horizontaler Scrollbar */
-#define FN_TOOLBOX_TOGGLE       (FN_VIEW + 19)  /* Toolboxinhalte umschalten */
-#define FN_VIEWOPTIONS_ON       (FN_VIEW + 20)  /* Gruppe Viewoptions an */
-#define FN_VIEWOPTIONS_OFF      (FN_VIEW + 21)  /* Gruppe Viewoptions aus */
-#define FN_CONTROLS_ON          (FN_VIEW + 22)  /* Gruppe Bedienelemte an */
-#define FN_CONTROLS_OFF         (FN_VIEW + 23)  /* Gruppe Bedienelemte aus */
+#define FN_VIEW_GRAPHIC         (FN_VIEW + 13)  /* View graphic */
+#define FN_VIEW_BOUNDS          (FN_VIEW + 14)  /* View bounds */
+#define FN_VIEW_FIELDS          (FN_VIEW + 15)  /* View fields */
+#define FN_VLINEAL              (FN_VIEW + 16)  /* Vertical Liner */
+#define FN_VSCROLLBAR           (FN_VIEW + 17)  /* Vertical Scrollbar */
+#define FN_HSCROLLBAR           (FN_VIEW + 18)  /* Horizontal Scrollbar */
+#define FN_TOOLBOX_TOGGLE       (FN_VIEW + 19)  /* Toggle toolbox */
+#define FN_VIEWOPTIONS_ON       (FN_VIEW + 20)  /* Viewoptions group on */
+#define FN_VIEWOPTIONS_OFF      (FN_VIEW + 21)  /* Viewoptions group off */
+#define FN_CONTROLS_ON          (FN_VIEW + 22)  /* Controls group on */
+#define FN_CONTROLS_OFF         (FN_VIEW + 23)  /* Controls group off */
 
-#define FN_VIEW_META_CHARS      (FN_VIEW + 24)  /* Sonderzeichen anzeigen */
-#define FN_VIEW_MARKS           (FN_VIEW + 25)  /* Markierungen anzeigen */
-#define FN_VIEW_FIELDNAME       (FN_VIEW + 26)  /* Feldname anzeigen */
-#define FN_VIEW_TABLEGRID       (FN_VIEW + 27)  /* Tabellenbegrenzungen anzeigen */
+#define FN_VIEW_META_CHARS      (FN_VIEW + 24)  /* View meta chars */
+#define FN_VIEW_MARKS           (FN_VIEW + 25)  /* View marks */
+#define FN_VIEW_FIELDNAME       (FN_VIEW + 26)  /* View field names */
+#define FN_VIEW_TABLEGRID       (FN_VIEW + 27)  /* View tablegrid */
 
-#define FN_SET_PAGE             (FN_VIEW + 29)  /* Seitenvorlage am Absatz setzen */
+#define FN_SET_PAGE             (FN_VIEW + 29)  /* Set page template to paragraph */
 
-#define FN_TOOLBOX_SWITCH       (FN_VIEW + 30)  /* Auf Textshell umschalten */
+#define FN_TOOLBOX_SWITCH       (FN_VIEW + 30)  /* Shell switch to text */
 
-
-//noch mehr Navigator
+// more Navigator
 #define FN_CONTENT_LB           (FN_VIEW + 32)  /**/
 #define FN_SHOW_CONTENT_BOX     (FN_VIEW + 33)  /**/
 #define FN_SHOW_ROOT            (FN_VIEW + 34)  /**/
 #define FN_DROP_REGION          (FN_VIEW + 35)  /**/
 #define FN_OUTLINE_LEVEL        (FN_VIEW + 36)  /**/
 
-#define FN_PRINT_LAYOUT         (FN_VIEW + 37)  /* invertierter BrowseMode */
+#define FN_PRINT_LAYOUT         (FN_VIEW + 37)  /* print layout */
 
 #define FN_DROP_REGION_LINK     (FN_VIEW + 38)  /**/
 #define FN_DROP_REGION_COPY     (FN_VIEW + 39)  /**/
 
-#define FN_SCROLL_NAVIGATION    (FN_VIEW + 40)  /* Navigationscontroller am Scrollbar*/
-#define FN_SCROLL_NEXT_PREV     (FN_VIEW + 41)  /* arbeitet den MoveType ab */
+#define FN_SCROLL_NAVIGATION    (FN_VIEW + 40)  /* Navigation Controller in the scrollbar */
+#define FN_SCROLL_NEXT_PREV     (FN_VIEW + 41)  /* processes MoveType */
 
-#define FN_VIEW_HIDDEN_PARA     (FN_VIEW + 42)  /* Versteckte Absaetze */
+#define FN_VIEW_HIDDEN_PARA     (FN_VIEW + 42)  /* View hidden paragraphs */
 #define FN_VIEW_SMOOTH_SCROLL   (FN_VIEW + 43)
 
-#define FN_GLOBAL_SWITCH        (FN_VIEW + 44)  /* umschalten zw. Global und Inhalt*/
-#define FN_GLOBAL_EDIT          (FN_VIEW + 45)  /* bearbeiten */
-#define FN_GLOBAL_UPDATE        (FN_VIEW + 46)  /* aktualisieren */
-#define FN_GLOBAL_OPEN          (FN_VIEW + 47)  /* oeffnen */
-#define FN_GLOBAL_SAVE_CONTENT  (FN_VIEW + 48)  /* Inhalt der Verknuepfung mitspeichern */
-#define FN_CREATE_NAVIGATION    (FN_VIEW + 49)  /* Navigations-Controller erzeugen */
-#define FN_PREVIEW_ZOOM          (FN_VIEW + 51)  /* der Tabellencontroller fuer den Zoom */
+#define FN_GLOBAL_SWITCH        (FN_VIEW + 44)  /* Toggle between Global and Content */
+#define FN_GLOBAL_EDIT          (FN_VIEW + 45)  /* edit */
+#define FN_GLOBAL_UPDATE        (FN_VIEW + 46)  /* update */
+#define FN_GLOBAL_OPEN          (FN_VIEW + 47)  /* open */
+#define FN_GLOBAL_SAVE_CONTENT  (FN_VIEW + 48)  /* save content of link */
+#define FN_CREATE_NAVIGATION    (FN_VIEW + 49)  /* create Navigations-Controller */
+#define FN_PREVIEW_ZOOM          (FN_VIEW + 51)  /* create table controller for zoom */
 
-#define FN_SET_MODOPT_TBLNUMFMT  (FN_VIEW + 52) /* Zahlenerkennung in Tabellen */
+#define FN_SET_MODOPT_TBLNUMFMT  (FN_VIEW + 52) /* Number recognition in tables */
 #define FN_HSCROLL_METRIC        (FN_VIEW + 53) /* Metric horizontal scrollbar */
 #define FN_VSCROLL_METRIC        (FN_VIEW + 54) /* Metric vertical scrollbar */
 #define FN_VIEW_NOTES            (FN_VIEW + 55)
 
 /*--------------------------------------------------------------------
-    Bereich: Einfuegen
+    Region: Insert
  --------------------------------------------------------------------*/
-// schon im Svx definiert
-#define FN_INSERT_BOOKMARK      (FN_INSERT + 2 )  /* Sprungmarke einfuegen */
 
-// schon im SVX unter der gleichen Id
-//#define FN_INSERT_BREAK       (FN_INSERT + 3 )  /* Umbruch */
+#define FN_INSERT_BOOKMARK      (FN_INSERT + 2 )  /* Bookmark */
 
-#define FN_INSERT_BREAK_DLG     (FN_INSERT + 4 )  /* Umbruch */
-#define FN_INSERT_COLUMN_BREAK  (FN_INSERT + 5 )  /* Spaltenumbruch */
-#define FN_INSERT_DATE_TIME     (FN_INSERT + 6 )  /* Datum/Uhrzeit */
+#define FN_INSERT_BREAK_DLG     (FN_INSERT + 4 )  /* Break */
+#define FN_INSERT_COLUMN_BREAK  (FN_INSERT + 5 )  /* Column break */
+#define FN_INSERT_DATE_TIME     (FN_INSERT + 6 )  /* Date / Time */
 #define FN_INSERT_FIELD         (FN_INSERT + 8 )  /* Textbefehl */
-#define FN_CHANGE_DBFIELD       (FN_INSERT + 9 )  /* Datenbankfeld aendern */
+#define FN_CHANGE_DBFIELD       (FN_INSERT + 9 )  /* Change the database field */
 
-#define FN_INSERT_CAPTION       (FN_INSERT + 10)    /* Beschriftung */
-#define FN_INSERT_DBFIELD       (FN_INSERT + 11)    /* Insert database field - for recording */
-#define FN_INSERT_FOOTNOTE_DLG  (FN_INSERT + 12)    /* Dialog Fussnote */
+#define FN_INSERT_CAPTION       (FN_INSERT + 10)  /* Caption */
+#define FN_INSERT_DBFIELD       (FN_INSERT + 11)  /* Insert database field - for recording */
+#define FN_INSERT_FOOTNOTE_DLG  (FN_INSERT + 12)  /* Footnote Dialog */
 
-#define FN_INSERT_REF_FIELD     (FN_INSERT + 13)  /* Refernzfeld einfuegen */
+#define FN_INSERT_REF_FIELD     (FN_INSERT + 13)  /* Insert Reference Field */
 
-#define FN_INSERT_HYPERLINK     (FN_INSERT + 14)    /* Zeichendialog/HyperlinkPage*/
+#define FN_INSERT_HYPERLINK     (FN_INSERT + 14)  /* Character dialogue / hyperlink page */
 
-#define FN_INSERT_INDEX         (FN_INSERT + 16)    /* Stichworteintrag */
-#define FN_INSERT_INDEX_DLG     (FN_INSERT + 17)    /* Stichworteintrag */
-#define FN_INSERT_LINEBREAK     (FN_INSERT + 18)    /* Zeilenumbruch */
-#define FN_INSERT_FIELD_DATA_ONLY (FN_INSERT + 19)  /* field dialog for mail merge*/
+#define FN_INSERT_INDEX         (FN_INSERT + 16)  /* Index entry */
+#define FN_INSERT_INDEX_DLG     (FN_INSERT + 17)    /* Index entry */
+#define FN_INSERT_LINEBREAK     (FN_INSERT + 18)    /* Newline */
+#define FN_INSERT_FIELD_DATA_ONLY (FN_INSERT + 19)  /* Field dialog for mail merge*/
 #define FN_INSERT_OBJECT        (FN_INSERT + 21)    /* Object */
 #define FN_INSERT_OBJECT_DLG    (FN_INSERT + 22)    /* Object */
-#define FN_INSERT_PAGEBREAK     (FN_INSERT + 23)    /* Seitenumbruch */
-#define FN_INSERT_PAGENO        (FN_INSERT + 24)    /* Seitennummer */
-#define FN_INSERT_PARAGRAPH     (FN_INSERT + 25)    /* Absatz */
-#define FN_INSERT_RECORD        (FN_INSERT + 26)    /* Datensatz einfuegen */
-#define FN_MERGE_RECORD         (FN_INSERT + 27)    /* Datensatz mischen */
-#define FN_INSERT_SYMBOL        (FN_INSERT + 28)    /* Sonderzeichen */
-#define FN_POSTIT               (FN_INSERT + 29)    /* PostIt einfuegen/bearbeiten */
-#define FN_INSERT_TABLE         (FN_INSERT + 30)    /* Tabelle */
+#define FN_INSERT_PAGEBREAK     (FN_INSERT + 23)    /* Page break*/
+#define FN_INSERT_PAGENO        (FN_INSERT + 24)    /* Page Number */
+#define FN_INSERT_PARAGRAPH     (FN_INSERT + 25)    /* Paragraph */
+#define FN_INSERT_RECORD        (FN_INSERT + 26)    /* Insert record */
+#define FN_MERGE_RECORD         (FN_INSERT + 27)    /* Merge record */
+#define FN_INSERT_SYMBOL        (FN_INSERT + 28)    /* Special characters */
+#define FN_POSTIT               (FN_INSERT + 29)    /* Insert/edit PostIt */
+#define FN_INSERT_TABLE         (FN_INSERT + 30)    /* Insert Table */
 #define FN_INSERT_STRING        (FN_INSERT+31)
-#define FN_INSERT_COLS          (FN_INSERT + 32)    /* Spalten einfuegen */
-#define FN_INSERT_FRAME_INTERACT (FN_INSERT + 33)   /* Rahmen einfuegen aktiv */
-#define FN_INSERT_FRAME         (FN_INSERT + 34)    /* Rahmen einfuegen */
+#define FN_INSERT_COLS          (FN_INSERT + 32)    /* Insert Columns */
+#define FN_INSERT_FRAME_INTERACT (FN_INSERT + 33)   /* Insert interactive frame */
+#define FN_INSERT_FRAME         (FN_INSERT + 34)    /* Insert Frame */
 
-#define FN_INSERT_IDX_ENTRY_DLG (FN_INSERT + 35)    /* Verzeichniseintrag einfuegen */
+#define FN_INSERT_IDX_ENTRY_DLG (FN_INSERT + 35)    /* insert index entry */
 #define FN_INSERT_FRAME_INTERACT_NOCOL (FN_INSERT + 36) /*insert interactive non column frame*/
 
-//#define FN_INSERT_SOFT_HYPHEN  (FN_INSERT + 43)    /* weicher Trenner */
-//#define FN_INSERT_HARD_SPACE   (FN_INSERT + 44)    /* hartes Space */
-
+#define FN_TOOL_GROUP           (FN_INSERT + 47)    /* Group objects */
+#define FN_TOOL_UNGROUP         (FN_INSERT + 48)    /* Remove Grouping */
 
-#define FN_TOOL_GROUP           (FN_INSERT + 47)    /* Objekte gruppieren */
-#define FN_TOOL_UNGROUP         (FN_INSERT + 48)    /* Gruppierng aufheben */
-
-#define FN_TOOL_ANKER           (FN_INSERT + 49)    /* Draw-Objekt umankern */
-#define FN_TOOL_ANKER_PAGE      (FN_INSERT + 50)    /* Draw-Objekt an Seite verankern */
-#define FN_TOOL_ANKER_PARAGRAPH (FN_INSERT + 51)    /* Draw-Objekt am Absatz verankern */
-#define FN_TOOL_HIERARCHIE      (FN_INSERT + 52)    /* Hierarchie aendern */
+#define FN_TOOL_ANKER           (FN_INSERT + 49)    /* Draw Anchor for object */
+#define FN_TOOL_ANKER_PAGE      (FN_INSERT + 50)    /* anchor Draw object to page */
+#define FN_TOOL_ANKER_PARAGRAPH (FN_INSERT + 51)    /* anchor Draw object to paragraph */
+#define FN_TOOL_HIERARCHIE      (FN_INSERT + 52)    /* change hierarchy */
 
 #define FN_MAILMERGE_WIZARD     (FN_INSERT + 64)    /* mail merge wizard */
-#define FN_QRY_OPEN_TABLE       (FN_INSERT + 65)    /* Datenbank oeffnen (Basic) */
-#define FN_TOOL_ANKER_FRAME     (FN_INSERT + 66)    /* Draw-Objekt am Rahmen verankern */
-#define FN_QRY_MERGE            (FN_INSERT + 67)    /* Datensatz einfuegen (Serienbrief) */
+#define FN_QRY_OPEN_TABLE       (FN_INSERT + 65)    /* open database (Basic) */
+#define FN_TOOL_ANKER_FRAME     (FN_INSERT + 66)    /* anchor Draw-Object to frame*/
+#define FN_QRY_MERGE            (FN_INSERT + 67)    /* insert record (serial letter) */
 #define FN_MAILMERGE_CHILDWINDOW (FN_INSERT + 68)    /* back-to-mail-merge-wizard child window*/
-#define FN_INSERT_SMA           (FN_INSERT + 69)    /* Einfuegen StarMath  */
+#define FN_INSERT_SMA           (FN_INSERT + 69)    /* insert StarMath  */
 
-#define FN_QRY_GET_COLUMN_NAME  (FN_INSERT + 70)    /* Anzahl der Spalten (Basic) */
-#define FN_QRY_GET_COLUMN_TYPE  (FN_INSERT + 71)    /* Type des Datenbankfeldes ermitteln (Basic) */
-#define FN_QRY_GET_COLUMN_TEXT  (FN_INSERT + 72)    /* Inhalt des aktuellen Datensatzes (Basic) */
-#define FN_QRY_DEL_DEFINED_DB   (FN_INSERT + 75)    /* Datenbankdefinition loeschen (Basic) */
+#define FN_QRY_GET_COLUMN_NAME  (FN_INSERT + 70)    /* number of columns (Basic) */
+#define FN_QRY_GET_COLUMN_TYPE  (FN_INSERT + 71)    /* retrieve type of database field (Basic) */
+#define FN_QRY_GET_COLUMN_TEXT  (FN_INSERT + 72)    /* content of current record (Basic) */
+#define FN_QRY_DEL_DEFINED_DB   (FN_INSERT + 75)    /* delete database definition */
 
-#define FN_DRAWTEXT_ATTR_DLG    (FN_INSERT + 76)    /* DrawText positionieren */
+#define FN_DRAWTEXT_ATTR_DLG    (FN_INSERT + 76)    /* position DrawText */
 
-#define FN_QRY_APPEND_RECORD    (FN_INSERT + 77)    /* Neuen Datensatz anhaengen */
-#define FN_QRY_UPDATE_RECORD    (FN_INSERT + 78)    /* Datensatzspalte aendern */
-#define FN_QRY_DELETE_RECORD    (FN_INSERT + 79)    /* Datensatz loeschen */
-#define FN_QRY_GET_PHYS_RECORD_ID (FN_INSERT + 80)  /* Physikalische (absolute) Datensatznummer erfragen (Basic) */
+#define FN_QRY_APPEND_RECORD    (FN_INSERT + 77)    /* append new record */
+#define FN_QRY_UPDATE_RECORD    (FN_INSERT + 78)    /* change record row */
+#define FN_QRY_DELETE_RECORD    (FN_INSERT + 79)    /* delete record */
+#define FN_QRY_GET_PHYS_RECORD_ID (FN_INSERT + 80)  /* get physical (absolute) record number (Basic) */
 
-#define FN_TOOL_ANKER_CHAR       (FN_INSERT + 84)   /* DrawObject zeichengebunden */
-//#define FN_INSERT_HARDHYPHEN    (FN_INSERT + 85)   /* Bindestrich ohne Umbruch*/
+#define FN_TOOL_ANKER_CHAR       (FN_INSERT + 84)   /* anchor Draw object to charater */
 
-#define FN_QRY_INSERT           (FN_INSERT + 86)    /* Datensatz-Selektion in Text einfuegen */
-#define FN_QRY_MERGE_FIELD      (FN_INSERT + 87)    /* Datensatz-Selektion in Felder einfuegen */
-#define FN_QRY_INSERT_FIELD     (FN_INSERT + 88)    /* Datenbankfeld einfuegen */
+#define FN_QRY_INSERT           (FN_INSERT + 86)    /* insert record selection in to text */
+#define FN_QRY_MERGE_FIELD      (FN_INSERT + 87)    /* insert record selection into fields */
+#define FN_QRY_INSERT_FIELD     (FN_INSERT + 88)    /* insert database field */
 
-#define FN_INSERT_CTRL          (FN_INSERT + 89)    /* Werkzeugleistencontroller Einfuegen*/
-#define FN_INSERT_OBJ_CTRL      (FN_INSERT + 90)    /* Werkzeugleistencontroller Einfuegen/Objekt*/
-#define FN_INSERT_FIELD_CTRL    (FN_INSERT + 91)    /* Werkzeugleistencontroller Einfuegen/Feldbefehle*/
+#define FN_INSERT_CTRL          (FN_INSERT + 89)    /* toolbar controller insert*/
+#define FN_INSERT_OBJ_CTRL      (FN_INSERT + 90)    /* toolbar controller (insert/object) */
+#define FN_INSERT_FIELD_CTRL    (FN_INSERT + 91)    /* toolbar controller insert/field commands */
 
 #define FN_INSERT_FLD_DATE      (FN_INSERT + 92)
 #define FN_INSERT_FLD_TIME      (FN_INSERT + 93)
@@ -425,253 +394,243 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 #define FN_INSERT_FOOTNOTE      (FN_INSERT + 99)
 
 /*--------------------------------------------------------------------
-    Bereich: Einfuegen (2.Teil)
+    Region: Paste (Part 2)
  --------------------------------------------------------------------*/
 
-#define FN_QRY_GET_ALL_DBNAME   (FN_INSERT2 + 1)    /* Alle konfigurierten Datenabanknamen ermitteln */
-#define FN_QRY_GET_DBNAME_COUNT (FN_INSERT2 + 2)    /* Anzahl aller konfigurierten Datenabanknamen */
-#define FN_QRY_GET_TABLE_NAME   (FN_INSERT2 + 3)    /* Tabellenname einer Datenbank ermitteln */
-#define FN_QRY_GET_TABLE_COUNT  (FN_INSERT2 + 4)    /* Anzahl aller Tabellen einer Datenbank ermitteln */
+#define FN_QRY_GET_ALL_DBNAME   (FN_INSERT2 + 1)    /* retrieve all configured database names */
+#define FN_QRY_GET_DBNAME_COUNT (FN_INSERT2 + 2)    /* retrieve number of all configured database names */
+#define FN_QRY_GET_TABLE_NAME   (FN_INSERT2 + 3)    /* retrieve table name of a database */
+#define FN_QRY_GET_TABLE_COUNT  (FN_INSERT2 + 4)    /* retrieve number of tables of a database */
 #define FN_MAILMERGE_SENDMAIL_CHILDWINDOW (FN_INSERT2 + 5)  /* child window provided by mailmerge */
 
+#define FN_SBA_BRW_UPDATE       (FN_INSERT2 + 7)    /* insert records into fields */
+#define FN_SBA_BRW_INSERT       (FN_INSERT2 + 8)    /* insert records into text */
+#define FN_SBA_BRW_MERGE        (FN_INSERT2 + 9)    /* serial letter print */
+#define FN_JAVAEDIT             (FN_INSERT2 + 10)   /* edit script field */
+#define FN_INSERT_HRULER        (FN_INSERT2 + 11)   /* insert horizontal ruler */
+#define FN_TOOL_ANKER_AT_CHAR   (FN_INSERT2 + 12)   /* anchor object to character*/
 
-#define FN_SBA_BRW_UPDATE       (FN_INSERT2 + 7)    /* Datensaetze in Felder einfuegen */
-#define FN_SBA_BRW_INSERT       (FN_INSERT2 + 8)    /* Datensaetze in Text einfuegen */
-#define FN_SBA_BRW_MERGE        (FN_INSERT2 + 9)    /* Serienbriefdruck */
-#define FN_JAVAEDIT             (FN_INSERT2 + 10)   /* Scriptfeld bearbeiten */
-#define FN_INSERT_HRULER        (FN_INSERT2 + 11)   /* horiz. Grafiklinie einfuegen */
-#define FN_TOOL_ANKER_AT_CHAR   (FN_INSERT2 + 12)   /* Object zeichengebunden */
-
-#define FN_INSERT_PAGEHEADER    (FN_INSERT2 + 13)   /* Standard Kopfzeile einfuegen */
-#define FN_INSERT_PAGEFOOTER    (FN_INSERT2 + 14)   /* Standard Fusszeile einfuegen */
+#define FN_INSERT_PAGEHEADER    (FN_INSERT2 + 13)   /* insert default header */
+#define FN_INSERT_PAGEFOOTER    (FN_INSERT2 + 14)   /* insert default footer */
 
-#define FN_INSERT_ENDNOTE           (FN_INSERT2 + 18)   /* Endnote einfuegen*/
+#define FN_INSERT_ENDNOTE           (FN_INSERT2 + 18)   /* insert endnote*/
 #define FN_INSERT_REGION            (FN_INSERT2 + 19)   /* Insert section */
 
 #define FN_INSERT_MULTI_TOX         (FN_INSERT2 + 20)   /* insert any TOX */
 #define FN_INSERT_AUTH_ENTRY_DLG    (FN_INSERT2 + 21)   /* insert entry for table of authorities*/
 
 /*--------------------------------------------------------------------
-    Bereich: Format
+    Region: Format
  --------------------------------------------------------------------*/
 
-#define FN_AUTOFORMAT_APPLY     (FN_FORMAT + 1 ) /* Autoformat-Optionen anwenden */
-#define FN_AUTOFORMAT_AUTO      (FN_FORMAT + 2 ) /* Autoformat waehrend der Eingabe */
-#define FN_GROW_FONT_SIZE       (FN_FORMAT + 3 ) /* Groesse */
-#define FN_SHRINK_FONT_SIZE     (FN_FORMAT + 4 ) /* Groesse */
-#define FN_UNDERLINE_DOUBLE     (FN_FORMAT + 5 ) /* Doppelt unterstreichen */
-#define FN_AUTOFORMAT_REDLINE_APPLY (FN_FORMAT + 6 ) /* Autoformat mit Redlining anwenden */
-#define FN_SET_SUPER_SCRIPT     (FN_FORMAT + 11) /* Hochstellung */
-#define FN_SET_SUB_SCRIPT       (FN_FORMAT + 12) /* Tiefstellung */
+#define FN_AUTOFORMAT_APPLY     (FN_FORMAT + 1 ) /* apply autoformat options */
+#define FN_AUTOFORMAT_AUTO      (FN_FORMAT + 2 ) /* apply autoformat during user input */
+#define FN_GROW_FONT_SIZE       (FN_FORMAT + 3 ) /* size */
+#define FN_SHRINK_FONT_SIZE     (FN_FORMAT + 4 ) /* size */
+#define FN_UNDERLINE_DOUBLE     (FN_FORMAT + 5 ) /* double underline */
+#define FN_AUTOFORMAT_REDLINE_APPLY (FN_FORMAT + 6 ) /* apply autoformat with Redlining */
+#define FN_SET_SUPER_SCRIPT     (FN_FORMAT + 11) /* superscript */
+#define FN_SET_SUB_SCRIPT       (FN_FORMAT + 12) /* subscript */
 
 #define FN_SET_CASEMAP          (FN_FORMAT + 14) /* CaseMap */
-#define FN_SET_LANGUAGE         (FN_FORMAT + 15) /* Sprache */
+#define FN_SET_LANGUAGE         (FN_FORMAT + 15) /* language */
 #define FN_SET_KERNING          (FN_FORMAT + 16) /* Kerning */
 
-#define FN_INDENT_TO_TABSTOP    (FN_FORMAT + 17) /* Einrueckung auf die naechste Tabpostion */
-//schon in svxids.hrc
-//#define FN_SET_JUSTIFY_PARA   (FN_FORMAT + 21) /* Ausrichtung Absatz */
-#define FN_FLIP_HORZ_GRAFIC     (FN_FORMAT + 25) /* Spiegeln horizontal */
-#define FN_FLIP_VERT_GRAFIC     (FN_FORMAT + 26) /* Spiegeln vertikal */
-#define FN_SET_LINE_SPACE       (FN_FORMAT + 27) /* Zeilenabstand parametrisiert */
-#define FN_SET_ADJUST           (FN_FORMAT + 28) /* Ausrichtung parametrisiert */
-#define FN_SET_LRMARGIN         (FN_FORMAT + 29) /* linker/rechter Rand */
-#define FN_SET_ULMARGIN         (FN_FORMAT + 30) /* oberer/unterer Rand */
-#define FN_UNINDENT_TO_TABSTOP  (FN_FORMAT + 31) /* Einrueckung auf die vorgige Tabpostion */
-
-#define FN_SET_HYPHEN_ZONE      (FN_FORMAT + 32) /* Silbentrennung */
-#define FN_SET_KEEP_TOGETHER    (FN_FORMAT + 34) /* nicht trennen */
-#define FN_SET_KEEP_WITH_NEXT   (FN_FORMAT + 35) /* mit folgendem zus. */
+#define FN_INDENT_TO_TABSTOP    (FN_FORMAT + 17) /* indent to tabstop */
+#define FN_FLIP_HORZ_GRAFIC     (FN_FORMAT + 25) /* mirror horizontally */
+#define FN_FLIP_VERT_GRAFIC     (FN_FORMAT + 26) /* mirror vertically */
+#define FN_SET_LINE_SPACE       (FN_FORMAT + 27) /* parametrized line distance */
+#define FN_SET_ADJUST           (FN_FORMAT + 28) /* parametrized alignemnt */
+#define FN_SET_LRMARGIN         (FN_FORMAT + 29) /* left/right margin */
+#define FN_SET_ULMARGIN         (FN_FORMAT + 30) /* upper/lower margin */
+#define FN_UNINDENT_TO_TABSTOP  (FN_FORMAT + 31) /* indent to previous tabstop */
+
+#define FN_SET_HYPHEN_ZONE      (FN_FORMAT + 32) /* hyphenation */
+#define FN_SET_KEEP_TOGETHER    (FN_FORMAT + 34) /* no hyphenation */
+#define FN_SET_KEEP_WITH_NEXT   (FN_FORMAT + 35) /* keep together with following */
 #define FN_SET_WIDOW            (FN_FORMAT + 36) /* Widows */
 #define FN_SET_ORPHAN           (FN_FORMAT + 37) /* Orphans */
 
-
 #define FN_REGISTER_COLLECTION  (FN_FORMAT + 43)  /* Referenzvorlage an der Seite */
-#define FN_REGISTER_MODE        (FN_FORMAT + 44)  /* Registermodus an/aus */
-#define FN_NUM_FORMAT_TABLE_DLG     (FN_FORMAT + 45)  /* Zahlenformat in Tabelle */
-#define FN_FORMAT_BORDER_DLG        (FN_FORMAT + 48)  /* Umrandung */
-#define FN_FORMAT_PAGE_COLUMN_DLG   (FN_FORMAT + 49)  /* Spalten pro Seite */
-#define FN_FORMAT_BACKGROUND_DLG    (FN_FORMAT + 50)  /* Hintergrund */
-#define FN_FORMAT_PAGE              (FN_FORMAT + 51)  /* Seite */
-#define FN_FORMAT_PAGE_DLG          (FN_FORMAT + 52)  /* Seite */
-#define FN_FORMAT_COLUMN            (FN_FORMAT + 53)  /* Spalten */
-#define FN_FORMAT_DROPCAPS          (FN_FORMAT + 54)  /* Initialien */
-#define FN_FORMAT_FRAME             (FN_FORMAT + 55)  /* Rahmen */
-#define FN_FORMAT_FRAME_DLG         (FN_FORMAT + 56)  /* Rahmen */
-#define FN_FORMAT_GRAFIC            (FN_FORMAT + 57)  /* Grafik */
-#define FN_FORMAT_GRAFIC_DLG        (FN_FORMAT + 58)  /* Grafik */
-#define FN_FORMAT_TABLE             (FN_FORMAT + 59)  /* Tabelle */
-#define FN_FORMAT_TABLE_DLG         (FN_FORMAT + 60)  /* Tabelle */
-#define FN_FORMAT_OLE_DLG           (FN_FORMAT + 61)  /* OLE bearbeiten */
-
-#define FN_NEW_STYLE_BY_EXAMPLE     (FN_FORMAT + 62)  /* Vorlage erzeugen by Example */
-#define FN_UPDATE_STYLE_BY_EXAMPLE  (FN_FORMAT + 63)  /* Vorlage aktualisieren */
-#define FN_STYLE_SHEET_FRAME_DLG    (FN_FORMAT + 64)  /* Rahmenvorlage */
-#define FN_STYLE_SHEET_DOC_DLG      (FN_FORMAT + 65)  /* Dokumentvorlage */
-#define FN_STYLE_SHEET_GRAFIK_DLG   (FN_FORMAT + 66)  /* Dokumentvorlage */
-#define FN_FORMAT_FOOTNOTE          (FN_FORMAT + 67)  /* Fussnoten */
-#define FN_FORMAT_FOOTNOTE_DLG      (FN_FORMAT + 68)  /* Fussnoten-Dialog */
-
-// schon im Svx definiert
-//#define FN_FORMAT_RESET           (FN_FORMAT + 69)  /* Format zuruecksetzen */
-
-#define FN_FRAME_TO_TOP             (FN_FORMAT + 70)  /* Rahmen nach oben */
-#define FN_FRAME_TO_BOTTOM          (FN_FORMAT + 71)  /* Rahmen nach unten */
-
-#define FN_FRAME_NOWRAP             (FN_FORMAT + 72)  /* Rahmen kein Umlauf */
-#define FN_FRAME_WRAP               (FN_FORMAT + 73)  /* Rahmen Umlauf */
-#define FN_FRAME_WRAPTHRU           (FN_FORMAT + 74)  /* Rahmen Durchlauf */
-
-#define FN_FRAME_ALIGN_HORZ_LEFT    (FN_FORMAT + 75)  /* Rahmen horz. links */
-#define FN_FRAME_ALIGN_HORZ_RIGHT   (FN_FORMAT + 76)  /* Rahmen horz. rechts */
-#define FN_FRAME_ALIGN_HORZ_CENTER  (FN_FORMAT + 77)  /* Rahmen horz. zentriert */
-#define FN_FRAME_ALIGN_VERT_TOP     (FN_FORMAT + 78)  /* Rahmen vert. oben */
-#define FN_FRAME_ALIGN_VERT_BOTTOM  (FN_FORMAT + 79)  /* Rahmen vert. unten */
-#define FN_FRAME_ALIGN_VERT_CENTER  (FN_FORMAT + 80)  /* Rahmen vert. zentriert */
-
-#define FN_SET_FRM_POSITION         (FN_FORMAT + 82)/* Rahmenposition -- " -- */
-#define FN_SET_FRM_OPTIONS          (FN_FORMAT + 86)/* Rahmenoptionen -- " -- */
-
-#define FN_SET_PAGE_STYLE           (FN_FORMAT + 93)  /* Anwenden Seitenv. */
+#define FN_REGISTER_MODE        (FN_FORMAT + 44)  /* Register mode on/off */
+#define FN_NUM_FORMAT_TABLE_DLG     (FN_FORMAT + 45)  /* number format in table */
+#define FN_FORMAT_BORDER_DLG        (FN_FORMAT + 48)  /* */
+#define FN_FORMAT_PAGE_COLUMN_DLG   (FN_FORMAT + 49)  /* columns per page */
+#define FN_FORMAT_BACKGROUND_DLG    (FN_FORMAT + 50)  /* background */
+#define FN_FORMAT_PAGE              (FN_FORMAT + 51)  /* page */
+#define FN_FORMAT_PAGE_DLG          (FN_FORMAT + 52)  /* page */
+#define FN_FORMAT_COLUMN            (FN_FORMAT + 53)  /* columns */
+#define FN_FORMAT_DROPCAPS          (FN_FORMAT + 54)  /* initials */
+#define FN_FORMAT_FRAME             (FN_FORMAT + 55)  /* frame */
+#define FN_FORMAT_FRAME_DLG         (FN_FORMAT + 56)  /* frame */
+#define FN_FORMAT_GRAFIC            (FN_FORMAT + 57)  /* graphic */
+#define FN_FORMAT_GRAFIC_DLG        (FN_FORMAT + 58)  /* graphic */
+#define FN_FORMAT_TABLE             (FN_FORMAT + 59)  /* table */
+#define FN_FORMAT_TABLE_DLG         (FN_FORMAT + 60)  /* table */
+#define FN_FORMAT_OLE_DLG           (FN_FORMAT + 61)  /* edit OLE */
+
+#define FN_NEW_STYLE_BY_EXAMPLE     (FN_FORMAT + 62)  /* create style by example */
+#define FN_UPDATE_STYLE_BY_EXAMPLE  (FN_FORMAT + 63)  /* update style */
+#define FN_STYLE_SHEET_FRAME_DLG    (FN_FORMAT + 64)  /* frame style */
+#define FN_STYLE_SHEET_DOC_DLG      (FN_FORMAT + 65)  /* document style */
+#define FN_STYLE_SHEET_GRAFIK_DLG   (FN_FORMAT + 66)  /* document style */
+#define FN_FORMAT_FOOTNOTE          (FN_FORMAT + 67)  /* footnotes */
+#define FN_FORMAT_FOOTNOTE_DLG      (FN_FORMAT + 68)  /* footnote dialog */
+
+// already defined in Svx
+//#define FN_FORMAT_RESET           (FN_FORMAT + 69)
+
+#define FN_FRAME_TO_TOP             (FN_FORMAT + 70)
+#define FN_FRAME_TO_BOTTOM          (FN_FORMAT + 71)
+
+#define FN_FRAME_NOWRAP             (FN_FORMAT + 72)
+#define FN_FRAME_WRAP               (FN_FORMAT + 73)
+#define FN_FRAME_WRAPTHRU           (FN_FORMAT + 74)
+
+#define FN_FRAME_ALIGN_HORZ_LEFT    (FN_FORMAT + 75)
+#define FN_FRAME_ALIGN_HORZ_RIGHT   (FN_FORMAT + 76)
+#define FN_FRAME_ALIGN_HORZ_CENTER  (FN_FORMAT + 77)
+#define FN_FRAME_ALIGN_VERT_TOP     (FN_FORMAT + 78)
+#define FN_FRAME_ALIGN_VERT_BOTTOM  (FN_FORMAT + 79)
+#define FN_FRAME_ALIGN_VERT_CENTER  (FN_FORMAT + 80)
+
+#define FN_SET_FRM_POSITION         (FN_FORMAT + 82)/* frame position -- " -- */
+#define FN_SET_FRM_OPTIONS          (FN_FORMAT + 86)/* frame position -- " -- */
+
+#define FN_SET_PAGE_STYLE           (FN_FORMAT + 93)  /* apply page style */
 
 #define FN_FORMAT_TITLEPAGE_DLG     (FN_FORMAT + 98)  /* Title Page */
 
-
 #define FN_TABLE_REP                (FN_FORMAT + 99)  /* TableRepresentation */
-#define FN_CONVERT_TEXT_TABLE       (FN_FORMAT + 100)  /* Konvertierung Text <-> Tabelle */
-#define FN_TABLE_INSERT_ROW         (FN_FORMAT + 101)  /* Tabelle: Zeile einfuegen */
-#define FN_TABLE_INSERT_COL         (FN_FORMAT + 102)  /* Tabelle: Spalte einfuegen */
-#define FN_TABLE_DELETE_ROW         (FN_FORMAT + 103)  /* Tabelle: Zeile loeschen */
-#define FN_TABLE_DELETE_COL         (FN_FORMAT + 104)  /* Tabelle: Spalte loeschen */
-#define FN_TABLE_SPLIT_CELLS        (FN_FORMAT + 105)  /* Tabelle: Zellen teilen */
-#define FN_TABLE_MERGE_CELLS        (FN_FORMAT + 106)  /* Tabelle: Zellen verbinden */
-#define FN_TABLE_SET_ROW_HEIGHT     (FN_FORMAT + 107)  /* Tabelle: Zeilenhoehe setzen */
-#define FN_TABLE_SET_COL_WIDTH      (FN_FORMAT + 108)  /* Tabelle: Spaltenbreite setzen */
-#define FN_TABLE_SET_ULSPACE        (FN_FORMAT + 109)  /* Tabelle: oberen / unteren Abstand einstellen */
-#define FN_OPTIMIZE_TABLE           (FN_FORMAT + 110)  /* ToolBoxItem fuer Optimierung in Tabellen  */
-#define FN_TABLE_SET_SHADOW         (FN_FORMAT + 111)  /* Tabelle: Schatten einstellen */
-#define FN_TABLE_GOTO_CELL          (FN_FORMAT + 112)  /* Tabelle: Zelle anspringen */
-#define FN_TABLE_SELECT_ROW         (FN_FORMAT + 113)  /* Tabelle: Zeile selektieren */
-#define FN_TABLE_SELECT_COL         (FN_FORMAT + 114)  /* Tabelle: Spalte selektieren */
-#define FN_TABLE_SELECT_ALL         (FN_FORMAT + 115)  /* Tabelle: Tabelle selektieren */
-#define FN_TABLE_SET_READ_ONLY      (FN_FORMAT + 116)  /* Tabelle: Tabelle schuetzen */
-#define FN_TABLE_SET_READ_ONLY_CELLS (FN_FORMAT + 117)  /* Tabelle: Tabellezellen schuetzen */
-#define FN_TABLE_UNSET_READ_ONLY_CELLS  (FN_FORMAT + 119)  /* Tabelle: Tabellezellen schuetzen aufheben */
+#define FN_CONVERT_TEXT_TABLE       (FN_FORMAT + 100)  /* convert text <-> table */
+#define FN_TABLE_INSERT_ROW         (FN_FORMAT + 101)  /* */
+#define FN_TABLE_INSERT_COL         (FN_FORMAT + 102)  /* */
+#define FN_TABLE_DELETE_ROW         (FN_FORMAT + 103)  /* */
+#define FN_TABLE_DELETE_COL         (FN_FORMAT + 104)  /* */
+#define FN_TABLE_SPLIT_CELLS        (FN_FORMAT + 105)  /* */
+#define FN_TABLE_MERGE_CELLS        (FN_FORMAT + 106)  /* */
+#define FN_TABLE_SET_ROW_HEIGHT     (FN_FORMAT + 107)  /* */
+#define FN_TABLE_SET_COL_WIDTH      (FN_FORMAT + 108)  /* */
+#define FN_TABLE_SET_ULSPACE        (FN_FORMAT + 109)  /* table: set upper / lower offset */
+#define FN_OPTIMIZE_TABLE           (FN_FORMAT + 110)  /* ToolBoxItem for optimizing tables */
+#define FN_TABLE_SET_SHADOW         (FN_FORMAT + 111)  /* */
+#define FN_TABLE_GOTO_CELL          (FN_FORMAT + 112)  /* */
+#define FN_TABLE_SELECT_ROW         (FN_FORMAT + 113)  /* */
+#define FN_TABLE_SELECT_COL         (FN_FORMAT + 114)  /* */
+#define FN_TABLE_SELECT_ALL         (FN_FORMAT + 115)  /* */
+#define FN_TABLE_SET_READ_ONLY      (FN_FORMAT + 116)  /* protect table */
+#define FN_TABLE_SET_READ_ONLY_CELLS (FN_FORMAT + 117)  /* protect table cells */
+#define FN_TABLE_UNSET_READ_ONLY_CELLS  (FN_FORMAT + 119)  /* undo table cell protection */
 #define FN_TABLE_HEADLINE_REPEAT    (FN_FORMAT + 120)   /* also used in SwXTextTable*/
-#define FN_TABLE_ADJUST_CELLS       (FN_FORMAT + 121)  /* Tabelle: Zellen anpassen */
+#define FN_TABLE_ADJUST_CELLS       (FN_FORMAT + 121)  /* */
 
-#define FN_FRAME_UP                 (FN_FORMAT + 122)  /* Rahmen um eine Ebene nach oben */
-#define FN_FRAME_DOWN               (FN_FORMAT + 123)  /* Rahmen um eine Ebene nach unten */
+#define FN_FRAME_UP                 (FN_FORMAT + 122)  /* frame by one level up */
+#define FN_FRAME_DOWN               (FN_FORMAT + 123)  /* frame by one level down */
 
 #define FN_TABLE_INSERT_CHART       (FN_FORMAT + 124)
 
-#define FN_SET_FRM_LRSPACE          (FN_FORMAT + 125)  /* Rahmen Seitenabstand           */
-#define FN_SET_FRM_ULSPACE          (FN_FORMAT + 126)  /* Rahmen Kopf-/Fussabstand      */
+#define FN_SET_FRM_LRSPACE          (FN_FORMAT + 125)  /* frame page offset */
+#define FN_SET_FRM_ULSPACE          (FN_FORMAT + 126)  /* frame head-/foot offset */
 #define FN_TABLE_SET_LRSPACE        (FN_FORMAT + 127)  /* Tabelle: linker / rechter Abstand einstellen */
-#define FN_TABLE_OPTIMAL_HEIGHT     (FN_FORMAT + 128)  /* Zellenhoehe optimal*/
+#define FN_TABLE_OPTIMAL_HEIGHT     (FN_FORMAT + 128)  /* optimal cell height */
 #define FN_TABLE_DELETE_TABLE       (FN_FORMAT + 129)  /* remove current table*/
 #define FN_TABLE_SELECT_CELL        (FN_FORMAT + 130)  /* selects the current table cell */
 #define FN_CONVERT_TEXT_TO_TABLE    (FN_FORMAT + 131)  /* convert selected text to table */
 #define FN_CONVERT_TABLE_TO_TEXT    (FN_FORMAT + 132)  /* convert a table to text */
 #define FN_TABLE_SORT_DIALOG        (FN_FORMAT + 133)  /* sorting in tables*/
+
 /*--------------------------------------------------------------------
-    Bereich: Seitenvorlage
+    Region: Page Template
  --------------------------------------------------------------------*/
-
-#define FN_NEW_PAGE_STYLE           (FN_FORMAT + 129) /* Anlegen Seitenvorlage */
-#define FN_PAGE_STYLE_SET_LR_MARGIN (FN_FORMAT + 130) /* linker / rechter Rand */
-#define FN_PAGE_STYLE_SET_UL_MARGIN (FN_FORMAT + 131) /* oberer / unterer Rand */
-#define FN_PAGE_STYLE_SET_PAGE      (FN_FORMAT + 134) /* linke, rechte...  */
-#define FN_PAGE_STYLE_SET_PAPER_SIZE (FN_FORMAT + 135) /* Papiergroesse */
-#define FN_PAGE_STYLE_SET_PAPER_BIN (FN_FORMAT + 136) /* Druckerschacht */
-#define FN_PAGE_STYLE_SET_NUMBER_FORMAT (FN_FORMAT + 137) /* Numerierungsart */
-#define FN_PAGE_STYLE_SET_COLS      (FN_FORMAT + 138) /* Spaltenanzahl */
-
-
-/* OS: Diese Ids werden nur noch fuer die Hilfe benoetigt und sind fuer den
- Dialog durch die Ids ohne _DLG ersetzt*/
-#define FN_TABLE_INSERT_COL_DLG     (FN_FORMAT + 142)  /* Tabelle: Dlg. Spalte einfuegen */
-#define FN_TABLE_INSERT_ROW_DLG     (FN_FORMAT + 143)  /* Tabelle: Dlg. Zeile einfuegen */
+#define FN_NEW_PAGE_STYLE           (FN_FORMAT + 129) /* create page style */
+#define FN_PAGE_STYLE_SET_LR_MARGIN (FN_FORMAT + 130) /* left / right margin */
+#define FN_PAGE_STYLE_SET_UL_MARGIN (FN_FORMAT + 131) /* upper / lower margin */
+#define FN_PAGE_STYLE_SET_PAGE      (FN_FORMAT + 134) /* */
+#define FN_PAGE_STYLE_SET_PAPER_SIZE (FN_FORMAT + 135) /* */
+#define FN_PAGE_STYLE_SET_PAPER_BIN (FN_FORMAT + 136) /* paper tray */
+#define FN_PAGE_STYLE_SET_NUMBER_FORMAT (FN_FORMAT + 137) /* */
+#define FN_PAGE_STYLE_SET_COLS      (FN_FORMAT + 138) /* number of columns */
+
+/* these Ids are only required by Help and are replaced by the Ids without _DLG
+ * for the dialog */
+#define FN_TABLE_INSERT_COL_DLG     (FN_FORMAT + 142)  /* */
+#define FN_TABLE_INSERT_ROW_DLG     (FN_FORMAT + 143)  /* */
 
 #define FN_GOTO_NEXT_CELL           (FN_FORMAT + 145)  /* Table: go to next cell */
 #define FN_GOTO_PREV_CELL           (FN_FORMAT + 146)  /* Table: go to previous cell */
 
-
 #define FN_TABLE_HEADLINE_COUNT     (FN_FORMAT + 147) /* number of repeated headlines of tables */
-//hier geht's weiter !
+
 /*--------------------------------------------------------------------
-    Bereich: Ribbon
+    Region: Ribbon
  --------------------------------------------------------------------*/
 
-#define FN_SET_BACKGROUND_COLOR     (FN_FORMAT + 150)  /* Hintergrundfarbe */
-
-#define FN_SET_BORDER_POS           (FN_FORMAT + 152)  /* Position Umrandung */
-#define FN_SET_BORDER_LINES         (FN_FORMAT + 153)  /* Linienart Umrandung */
-#define FN_SET_BORDER_COLOR         (FN_FORMAT + 154)  /* Farbe Umrandung */
-
-#define FN_FORMULA_CALC             (FN_FORMAT + 156)  /* Formelauswahl */
-#define FN_FORMULA_CANCEL           (FN_FORMAT + 157)  /* Formel nicht uebernehmen */
-#define FN_FORMULA_APPLY            (FN_FORMAT + 158)  /* Formel uebernehmen */
+#define FN_SET_BACKGROUND_COLOR     (FN_FORMAT + 150)  /* */
 
-#define FN_TABLE_UNSET_READ_ONLY    (FN_FORMAT + 159)  /* Zellenschutz fuer Tab. aufheben */
+#define FN_SET_BORDER_POS           (FN_FORMAT + 152)  /* */
+#define FN_SET_BORDER_LINES         (FN_FORMAT + 153)  /* */
+#define FN_SET_BORDER_COLOR         (FN_FORMAT + 154)  /* */
 
-#define FN_FORMULA_POSITION         (FN_FORMAT + 160)  /* Positionsanzeige */
-#define FN_FORMULA_EDIT             (FN_FORMAT + 161)  /* Editfeld */
+#define FN_FORMULA_CALC             (FN_FORMAT + 156)  /* select formula */
+#define FN_FORMULA_CANCEL           (FN_FORMAT + 157)  /* don't apply formula */
+#define FN_FORMULA_APPLY            (FN_FORMAT + 158)  /* apply formula */
 
+#define FN_TABLE_UNSET_READ_ONLY    (FN_FORMAT + 159)  /* undo cell protection for table */
 
-#define FN_FRAME_WRAP_IDEAL         (FN_FORMAT + 163)  /* Rahmen Idealer Umlauf */
-#define FN_FRAME_WRAPTHRU_TRANSP    (FN_FORMAT + 164)  /* Rahmen Transparenter Durchlauf */
+#define FN_FORMULA_POSITION         (FN_FORMAT + 160)  /* position display*/
+#define FN_FORMULA_EDIT             (FN_FORMAT + 161)  /* edit-field */
 
-#define FN_FRAME_ALIGN_VERT_ROW_TOP     (FN_FORMAT + 165)  /* Rahmen vert. Zeile oben */
-#define FN_FRAME_ALIGN_VERT_ROW_BOTTOM  (FN_FORMAT + 166)  /* Rahmen vert. Zeile unten */
-#define FN_FRAME_ALIGN_VERT_ROW_CENTER  (FN_FORMAT + 167)  /* Rahmen vert. Zeile zentriert */
+#define FN_FRAME_WRAP_IDEAL         (FN_FORMAT + 163)  /* frame ideal wrapping */
+#define FN_FRAME_WRAPTHRU_TRANSP    (FN_FORMAT + 164)  /* frame transparent wrapping */
 
-#define FN_FRAME_ALIGN_VERT_CHAR_TOP    (FN_FORMAT + 168)  /* Rahmen vert. Zeichen oben */
-#define FN_FRAME_ALIGN_VERT_CHAR_BOTTOM (FN_FORMAT + 169)  /* Rahmen vert. Zeichen unten */
-#define FN_FRAME_ALIGN_VERT_CHAR_CENTER (FN_FORMAT + 170)  /* Rahmen vert. Zeichen zentriert */
+#define FN_FRAME_ALIGN_VERT_ROW_TOP     (FN_FORMAT + 165)  /* */
+#define FN_FRAME_ALIGN_VERT_ROW_BOTTOM  (FN_FORMAT + 166)  /* */
+#define FN_FRAME_ALIGN_VERT_ROW_CENTER  (FN_FORMAT + 167)  /* */
 
-#define FN_TABLE_SET_DEF_BORDER         (FN_FORMAT + 171)  /* vordefinierte Umrandungen setzen */
+#define FN_FRAME_ALIGN_VERT_CHAR_TOP    (FN_FORMAT + 168)  /* */
+#define FN_FRAME_ALIGN_VERT_CHAR_BOTTOM (FN_FORMAT + 169)  /* */
+#define FN_FRAME_ALIGN_VERT_CHAR_CENTER (FN_FORMAT + 170)  /* */
 
-#define FN_FRAME_WRAP_LEFT              (FN_FORMAT + 172)  /* Rahmen Umlauf links */
-#define FN_FRAME_WRAP_RIGHT             (FN_FORMAT + 173)  /* Rahmen Umlauf links */
+#define FN_TABLE_SET_DEF_BORDER         (FN_FORMAT + 171)  /* set predefined border */
 
-#define FN_TABLE_SET_ROW_AUTOHEIGHT (FN_FORMAT + 174)  /* Tabelle: Minimale automatische Zeilenhoehe setzen */
+#define FN_FRAME_WRAP_LEFT              (FN_FORMAT + 172)  /* */
+#define FN_FRAME_WRAP_RIGHT             (FN_FORMAT + 173)  /* */
 
+#define FN_TABLE_SET_ROW_AUTOHEIGHT (FN_FORMAT + 174)  /* table: set minimal automatic row height */
 
-#define FN_WRAP_ANCHOR_ONLY         (FN_FORMAT + 181)  /* Umlauf nur fuer ersten Absatz */
+#define FN_WRAP_ANCHOR_ONLY         (FN_FORMAT + 181)  /* wrap only for first paragraph */
 
-#define FN_TABLE_BALANCE_CELLS      (FN_FORMAT + 182)  /* Spalten gleichmaessig verteilen */
-#define FN_TABLE_BALANCE_ROWS       (FN_FORMAT + 183)  /* Zeilen gleichmaessig verteilen */
+#define FN_TABLE_BALANCE_CELLS      (FN_FORMAT + 182)  /* evenly distribute columns */
+#define FN_TABLE_BALANCE_ROWS       (FN_FORMAT + 183)  /* evenly distribute rows */
 
-#define FN_FRAME_WRAP_CONTOUR       (FN_FORMAT + 184)  /* Rahmen Kunturumlauf */
+#define FN_FRAME_WRAP_CONTOUR       (FN_FORMAT + 184)  /* */
 
-#define FN_TABLE_VERT_NONE          (FN_FORMAT + 185)  /* vertikale Ausrichtung in Tabellenzellen */
-#define FN_TABLE_VERT_CENTER        (FN_FORMAT + 186)  /*   -"-  */
+#define FN_TABLE_VERT_NONE          (FN_FORMAT + 185)  /* vertical alignment in table cells */
+#define FN_TABLE_VERT_CENTER        (FN_FORMAT + 186)  /*  -"-  */
 #define FN_TABLE_VERT_BOTTOM        (FN_FORMAT + 187)  /*  -"-  */
 #define FN_TABLE_SET_VERT_ALIGN     (FN_FORMAT + 188)  /*  -"-  */
-#define FN_TABLE_MODE_FIX           (FN_FORMAT + 189)  /* Tabellenmodus */
+#define FN_TABLE_MODE_FIX           (FN_FORMAT + 189)  /* table mode */
 #define FN_TABLE_MODE_FIX_PROP      (FN_FORMAT + 190)  /*  -"-  */
 #define FN_TABLE_MODE_VARIABLE      (FN_FORMAT + 191)  /*  -"-  */
 #define FN_TABLE_BOX_TEXTDIRECTION  (FN_FORMAT + 192)  /*  text direction of table cells */
 
-#define FN_TABLE_AUTOSUM            (FN_FORMAT + 195)  /* Autosumme*/
-#define FN_SET_CONTROL_HANDLER      (FN_FORMAT + 199)  /* Macro setzen */
+#define FN_TABLE_AUTOSUM            (FN_FORMAT + 195)  /* */
+#define FN_SET_CONTROL_HANDLER      (FN_FORMAT + 199)  /* set macro */
 
-#define FN_IS_IMAGE                  (FN_FORMAT2 + 6)   /* Numerierung : mit Grafik?*/
+#define FN_IS_IMAGE                  (FN_FORMAT2 + 6)   /* numbering: with graphic? */
 
-#define FN_GOTO_NEXT_REGION          (FN_FORMAT2 + 9)   /* Naechsten Bereich anspringen */
-#define FN_GOTO_PREV_REGION          (FN_FORMAT2 + 10)  /* Vorherigen " */
+#define FN_GOTO_NEXT_REGION          (FN_FORMAT2 + 9)   /* */
+#define FN_GOTO_PREV_REGION          (FN_FORMAT2 + 10)  /* */
+
+#define FN_GET_SBXCONTROL            (FN_FORMAT2 + 11)  /* */
+#define FN_ABSTRACT_NEWDOC           (FN_FORMAT2 + 12)  /* abstract in new document */
+#define FN_ABSTRACT_STARIMPRESS      (FN_FORMAT2 + 13)  /* abstract to StarImpress */
 
-#define FN_GET_SBXCONTROL            (FN_FORMAT2 + 11)  /* SbxObject rausreichen */
-#define FN_ABSTRACT_NEWDOC           (FN_FORMAT2 + 12)  /* Abstract in neuem Doc */
-#define FN_ABSTRACT_STARIMPRESS      (FN_FORMAT2 + 13)  /* Abstract an StarImpress */
-/* OD 2006-03-09 #i51726# - all drawing objects can be named now. */
 #define FN_NAME_SHAPE                (FN_FORMAT2 + 14)  /* Name shapes */
 
-// #i68101#
 #define FN_TITLE_DESCRIPTION_SHAPE   (FN_FORMAT2 + 15)  /* shape title and description */
 
-#define FN_NUMBER_FORMAT                    (FN_FORMAT2 + 120) /* Boxen/NumberFormatter eistellen */
+#define FN_NUMBER_FORMAT                    (FN_FORMAT2 + 120) /* set Boxen/NumberFormatter */
 #define FN_NUMBER_STANDARD                  (FN_FORMAT2 + 121)
 #define FN_NUMBER_TWODEC                    (FN_FORMAT2 + 123)
 #define FN_NUMBER_SCIENTIFIC                (FN_FORMAT2 + 124)
@@ -680,8 +639,6 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 #define FN_NUMBER_CURRENCY                  (FN_FORMAT2 + 127)
 #define FN_NUMBER_PERCENT                   (FN_FORMAT2 + 128)
 
-
-
 #define FN_FRAME_CHAIN                      (FN_FORMAT2 + 136)
 #define FN_FRAME_UNCHAIN                    (FN_FORMAT2 + 137)
 
@@ -696,9 +653,9 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 
 #define FN_FORMAT_LINENUMBER                (FN_FORMAT2 + 144)
 
-#define FN_TABLE_RELATIVE_WIDTH             (FN_FORMAT2 + 147)  /* Tabelle: relative Breite - UNO */
-#define FN_TABLE_WIDTH                      (FN_FORMAT2 + 148)  /* Tabelle: Breite - UNO */
-#define FN_TABLE_IS_RELATIVE_WIDTH          (FN_FORMAT2 + 149)  /* Tabelle: ist Breite relativ?- UNO */
+#define FN_TABLE_RELATIVE_WIDTH             (FN_FORMAT2 + 147)  /* UNO */
+#define FN_TABLE_WIDTH                      (FN_FORMAT2 + 148)  /* UNO */
+#define FN_TABLE_IS_RELATIVE_WIDTH          (FN_FORMAT2 + 149)  /* UNO */
 
 #define FN_INC_INDENT_OFFSET                (FN_FORMAT2 + 150)
 #define FN_DEC_INDENT_OFFSET                (FN_FORMAT2 + 151)
@@ -716,84 +673,75 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 #define FN_SAVE_GRAPHIC                     (FN_FORMAT2 + 160)
 
 /*--------------------------------------------------------------------
-    Bereich: Extras
+    Region: Extras
  --------------------------------------------------------------------*/
 
-#define FN_LINE_NUMBERING_DLG       (FN_EXTRA + 2 )   /* Zeilennumerierung */
-#define FN_HYPHENATE_OPT_DLG        (FN_EXTRA + 5 )   /* Silbentrennung */
-#define FN_ADD_UNKNOWN              (FN_EXTRA + 6 )   /* Woerter lernen */
-#define FN_DICTIONARY_DLG           (FN_EXTRA + 8 )   /* Woerterbuecher */
-#define FN_NUMBERING                (FN_EXTRA + 9 )   /* Nummerierung/Bullets */
-#define FN_NUMBERING_DLG            (FN_EXTRA + 10)   /* Nummerierung/Bullets */
-#define FN_NUMBERING_OUTLINE        (FN_EXTRA + 11)   /* Gliederungsnumerierung */
-#define FN_NUMBERING_OUTLINE_DLG    (FN_EXTRA + 12)   /* Gliederungsnumerierung */
-#define FN_SORTING_DLG              (FN_EXTRA + 14)   /* Sortieren */
-#define FN_CALCULATE                (FN_EXTRA + 15)   /* Berechnen */
-#define FN_GENERATE_TOC_DLG         (FN_EXTRA + 16)   /* Inhaltsverzeichnis */
-#define FN_GENERATE_INDEX_DLG       (FN_EXTRA + 17)   /* Stichwortverzeichnis */
-#define FN_GENERATE_DIR_DLG         (FN_EXTRA + 18)   /* Verzeichnis */
-#define FN_GLOSSARY_DLG             (FN_EXTRA + 20)   /* Textbausteine */
-#define FN_MACRO_CHOOSER            (FN_EXTRA + 21)   /* Makro aufnehmen */
-
-
-#define FN_PLAY_MACRO               (FN_EXTRA + 23)   /* Makro abspielen */
-#define FN_LAUNCH_BASIC             (FN_EXTRA + 25)   /* Makro abspielen */
-#define FN_EXPAND_GLOSSARY          (FN_EXTRA + 28)   /* Textbausteine expandieren */
-#define FN_CONFIG_TOOLBOX           (FN_EXTRA + 29)   /* Konfiguration Toolbox */
-#define FN_CONFIG_MENU              (FN_EXTRA + 30)   /* Konfiguration Menu */
-#define FN_CONFIG_KEY               (FN_EXTRA + 31)   /* Konfiguration Tastatur */
-#define FN_CHANGE_PAGENUM           (FN_EXTRA + 34)   /* Seitennummer aendern */
-
-#define FN_MACRO_POPUP              (FN_EXTRA + 37)   /* Alle Macrofunktionen */
-#define FN_BULLET                   (FN_EXTRA + 38)   /* Bullet-Liste */
-
-
-//  Bereich: Gloassaries
-
-// schon im Svx definiert
-
-//#define FN_GET_GLOSSARY_GROUP_COUNT (FN_EXTRA + 42)     /* Anzahl der Bausteingruppen */
-
-#define FN_AUTO_CORRECT             (FN_EXTRA + 49 )  /* Autocorrect aus Basic */
-
-
-#define FN_UPDATE_TOX               (FN_EXTRA + 53)   /* alle Verzeichnisse aktualisieren */
-#define FN_UPDATE_CUR_TOX           (FN_EXTRA + 54)   /* aktuelles Verzeichnisse aktualisieren */
+#define FN_LINE_NUMBERING_DLG       (FN_EXTRA + 2 )   /* */
+#define FN_HYPHENATE_OPT_DLG        (FN_EXTRA + 5 )   /* */
+#define FN_ADD_UNKNOWN              (FN_EXTRA + 6 )   /* learn words */
+#define FN_DICTIONARY_DLG           (FN_EXTRA + 8 )   /* dictionaries */
+#define FN_NUMBERING                (FN_EXTRA + 9 )   /* numbering/bullets*/
+#define FN_NUMBERING_DLG            (FN_EXTRA + 10)   /* numbering/bullets */
+#define FN_NUMBERING_OUTLINE        (FN_EXTRA + 11)   /* */
+#define FN_NUMBERING_OUTLINE_DLG    (FN_EXTRA + 12)   /* */
+#define FN_SORTING_DLG              (FN_EXTRA + 14)   /* */
+#define FN_CALCULATE                (FN_EXTRA + 15)   /* */
+#define FN_GENERATE_TOC_DLG         (FN_EXTRA + 16)   /* table of contents */
+#define FN_GENERATE_INDEX_DLG       (FN_EXTRA + 17)   /* index */
+#define FN_GENERATE_DIR_DLG         (FN_EXTRA + 18)   /* */
+#define FN_GLOSSARY_DLG             (FN_EXTRA + 20)   /* text building blocks */
+#define FN_MACRO_CHOOSER            (FN_EXTRA + 21)   /* record macro */
+
+#define FN_PLAY_MACRO               (FN_EXTRA + 23)   /* run macro */
+#define FN_LAUNCH_BASIC             (FN_EXTRA + 25)   /* run macro */
+#define FN_EXPAND_GLOSSARY          (FN_EXTRA + 28)   /* expand text building blocks */
+#define FN_CONFIG_TOOLBOX           (FN_EXTRA + 29)   /* configure toolbox*/
+#define FN_CONFIG_MENU              (FN_EXTRA + 30)   /* configure menu */
+#define FN_CONFIG_KEY               (FN_EXTRA + 31)   /* configure keyboard */
+#define FN_CHANGE_PAGENUM           (FN_EXTRA + 34)   /* change page numbers*/
+
+#define FN_MACRO_POPUP              (FN_EXTRA + 37)   /* all macro functions*/
+#define FN_BULLET                   (FN_EXTRA + 38)   /* bullet list */
+
+//  Region: Glossary
+
+#define FN_AUTO_CORRECT             (FN_EXTRA + 49 )  /* Autocorrect from Basic */
+
+#define FN_UPDATE_TOX               (FN_EXTRA + 53)   /* update all indices */
+#define FN_UPDATE_CUR_TOX           (FN_EXTRA + 54)   /* update current index */
 #define FN_REMOVE_CUR_TOX           (FN_EXTRA + 55)  /* remove the current TOX*/
 
-#define FN_NAVIGATION_PI_GOTO_PAGE  (FN_EXTRA + 59 )  /* Seitenanwahl aus Navi-PI */
-
+#define FN_NAVIGATION_PI_GOTO_PAGE  (FN_EXTRA + 59 )  /* goto page from navigation-PI */
 
 #define FN_LETTER_WIZZARD           (FN_EXTRA + 60 )
 #define FN_FAX_WIZZARD              (FN_EXTRA + 61 )
 #define FN_MEMO_WIZZARD             (FN_EXTRA + 62 )
 #define FN_AGENDA_WIZZARD           (FN_EXTRA + 63 )
 
-#define FN_SET_BASIC_METRIC         (FN_EXTRA + 80) /* Defaultmetrik Basic setzen */
+#define FN_SET_BASIC_METRIC         (FN_EXTRA + 80) /* set default metric Basic */
 
-#define FN_RESERVED_9               (FN_EXTRA + 86)   /* Platzhalter */
-#define FN_RESERVED_8               (FN_EXTRA + 87)   /* Platzhalter */
-#define FN_RESERVED_7               (FN_EXTRA + 88)   /* Platzhalter */
-#define FN_RESERVED_6               (FN_EXTRA + 89)   /* Platzhalter */
-#define FN_RESERVED_5               (FN_EXTRA + 90)   /* Platzhalter */
-#define FN_RESERVED_4               (FN_EXTRA + 91)   /* Platzhalter */
-#define FN_RESERVED_3               (FN_EXTRA + 92)   /* Platzhalter */
-#define FN_RESERVED_2               (FN_EXTRA + 93)   /* Platzhalter */
-#define FN_RESERVED_1               (FN_EXTRA + 94)   /* Platzhalter */
+#define FN_RESERVED_9               (FN_EXTRA + 86)   /* place holder */
+#define FN_RESERVED_8               (FN_EXTRA + 87)   /* place holder */
+#define FN_RESERVED_7               (FN_EXTRA + 88)   /* place holder */
+#define FN_RESERVED_6               (FN_EXTRA + 89)   /* place holder */
+#define FN_RESERVED_5               (FN_EXTRA + 90)   /* place holder */
+#define FN_RESERVED_4               (FN_EXTRA + 91)   /* place holder */
+#define FN_RESERVED_3               (FN_EXTRA + 92)   /* place holder */
+#define FN_RESERVED_2               (FN_EXTRA + 93)   /* place holder */
+#define FN_RESERVED_1               (FN_EXTRA + 94)   /* place holder */
 
 #define FN_COLLECTION_GROUP_CNT     (FN_EXTRA + 96)
 #define FN_COLLECTION_GROUP_IDX     (FN_EXTRA + 97)
-#define FN_COLL_TYPE                (FN_EXTRA + 98)   /* Typ fuer GlobalDoc-Collection*/
+#define FN_COLL_TYPE                (FN_EXTRA + 98)   /* type for GlobalDoc-Collection*/
 #define FN_COLL_ADD                 (FN_EXTRA + 99)
 
-#define FN_COLL_TITLE               (FN_EXTRA2 + 1)  /*  Bereichsname oder Index-Title */
-#define FN_SHADOWCURSOR             (FN_EXTRA2 + 4)  /* Shadow Cursor ein/ausschalten */
-
+#define FN_COLL_TITLE               (FN_EXTRA2 + 1)  /*  area name or index title */
+#define FN_SHADOWCURSOR             (FN_EXTRA2 + 4)  /* enable/disable Shadow Cursor */
 
-#define FN_VIEW_IN_FRAME            (FN_EXTRA2 + 8)  /* die View befindet sich in einem FrameDoc*/
+#define FN_VIEW_IN_FRAME            (FN_EXTRA2 + 8)  /* the view is in a FrameDoc */
 
-#define FN_UNO_PARA_STYLE           (FN_EXTRA2 + 9)  // jetzt kommen diverse UNO-Ids fuer die
-#define FN_UNO_PAGE_STYLE           (FN_EXTRA2 + 10)  // PropertyMap
+#define FN_UNO_PARA_STYLE           (FN_EXTRA2 + 9)  // starting here are UNI-Ids for the PropertyMap listed
+#define FN_UNO_PAGE_STYLE           (FN_EXTRA2 + 10)
 
 #define FN_UNO_FRAME_STYLE_NAME     (FN_EXTRA2 + 12)
 #define FN_UNO_NUM_START_VALUE      (FN_EXTRA2 + 13)
@@ -888,8 +836,6 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 #define FN_UNO_COMPONENT                    (FN_EXTRA2 + 97)
 #define FN_WORDCOUNT_DIALOG                 (FN_EXTRA2 + 98)
 
-//#define FN_UNO_DEFAULT_OUTLINE_LEVEL        (FN_EXTRA2 + 99)//#outline level,removed by zahojianwei
-
 #define FN_XFORMS_DESIGN_MODE               (FN_EXTRA2 + 100)
 
 #define FN_UNO_PARA_STYLE_CONDITIONS        (FN_EXTRA2 + 101)
@@ -900,9 +846,7 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 #define FN_UNO_TABLE_BORDER_DISTANCES       (FN_EXTRA2 + 104)
 #define FN_SPELL_GRAMMAR_DIALOG             (FN_EXTRA2 + 105)
 #define FN_UNO_STREAM_NAME                  (FN_EXTRA2 + 106)
-// --> OD 2008-07-14 #i91601#
 #define FN_UNO_LIST_ID                      (FN_EXTRA2 + 107)
-// <--
 #define FN_UNO_REPLACEMENT_GRAPHIC          (FN_EXTRA2 + 108)
 
 #define FN_UNO_PARA_CONT_PREV_SUBTREE       (FN_EXTRA2 + 109)
@@ -911,14 +855,12 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 #define FN_UNO_META                         (FN_EXTRA2 + 112)
 #define FN_UNO_NESTED_TEXT_CONTENT          (FN_EXTRA2 + 113)
 
-/*--------------------------------------------------------------------
-    Bereich: Hilfe
- --------------------------------------------------------------------*/
-
-/*--------------------------------------------------------------------
-    Bereich: Traveling & Selektion
- --------------------------------------------------------------------*/
-
+/*------------------------------------------------ --------------------
+    Area: Help
+ -------------------------------------------------- ------------------*/
+/*------------------------------------------------ --------------------
+    Region: Traveling & Selection
+ -------------------------------------------------- ------------------*/
 #define FN_CHAR_LEFT                (FN_SELECTION + 1 ) /* */
 #define FN_CHAR_RIGHT               (FN_SELECTION + 2 ) /* */
 #define FN_LINE_UP                  (FN_SELECTION + 3 ) /* */
@@ -926,8 +868,6 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 #define FN_START_OF_LINE            (FN_SELECTION + 5 ) /* StartOfLine */
 #define FN_END_OF_LINE              (FN_SELECTION + 6 ) /* EndOfLine */
 #define FN_START_OF_DOCUMENT        (FN_SELECTION + 7 ) /* StartOfDocument */
-//schon in svxids.hrc
-//#define FN_END_OF_DOCUMENT            (FN_SELECTION + 8 ) /* EndOfDocument */
 #define FN_START_OF_NEXT_PAGE       (FN_SELECTION + 9 ) /* StartOfNextPage ??? */
 #define FN_END_OF_NEXT_PAGE         (FN_SELECTION + 10) /* ??? */
 #define FN_START_OF_PREV_PAGE       (FN_SELECTION + 11) /* StartOfPrevPage ??? */
@@ -955,62 +895,56 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 #define FN_DELETE_PARA              (FN_SELECTION + 33) /* DeleteToEndOfPara */
 #define FN_DELETE_BACK_PARA         (FN_SELECTION + 34) /* DeleteToStartOfPara */
 #define FN_DELETE_WHOLE_LINE        (FN_SELECTION + 35) /* DeleteLine ??? */
-#define FN_SET_INS_MODE             (FN_SELECTION + 36) /* Einfuegemodus / Overwrite */
+#define FN_SET_INS_MODE             (FN_SELECTION + 36) /* Insertmode / Overwrite */
 #define FN_PAGEUP                   (FN_SELECTION + 37) /* PageUpWithCursor */
 #define FN_PAGEDOWN                 (FN_SELECTION + 38) /* PageDownWithCursor */
 #define FN_SET_ADD_MODE             (FN_SELECTION + 39) /* Selektionsmodus */
 #define FN_SET_EXT_MODE             (FN_SELECTION + 40) /* Selektionsmodus */
 #define FN_ESCAPE                   (FN_SELECTION + 41) /* Normal */
-#define FN_SHIFT_BACKSPACE          (FN_SELECTION + 42) /* wie Backspace */
-#define FN_SELECT_WORD              (FN_SELECTION + 43) /* Wort selektieren */
+#define FN_SHIFT_BACKSPACE          (FN_SELECTION + 42) /* like Backspace */
+#define FN_SELECT_WORD              (FN_SELECTION + 43) /* select word*/
 
-#define FN_GOTO_NEXT_OBJ            (FN_SELECTION + 44)   /* N�chstes Objekt anspringen */
-#define FN_GOTO_PREV_OBJ            (FN_SELECTION + 45)   /* Vorhergehendes Objekt anspringen */
+#define FN_GOTO_NEXT_OBJ            (FN_SELECTION + 44)   /* Goto next object */
+#define FN_GOTO_PREV_OBJ            (FN_SELECTION + 45)   /* Go to previous object */
 
-#define FN_START_TABLE              (FN_SELECTION + 47) /* an den Anfang der Tabelle */
-#define FN_END_TABLE                (FN_SELECTION + 48) /* an das Ende der Tabelle */
-#define FN_NEXT_TABLE               (FN_SELECTION + 49) /* zur vorhergehenden Tabelle */
-#define FN_PREV_TABLE               (FN_SELECTION + 50) /* zur naechsten Tabelle */
+#define FN_START_TABLE              (FN_SELECTION + 47) /* to the beginning of the table */
+#define FN_END_TABLE                (FN_SELECTION + 48) /* to the end of the table */
+#define FN_NEXT_TABLE               (FN_SELECTION + 49) /* to the next table */
+#define FN_PREV_TABLE               (FN_SELECTION + 50) /* to the previous table */
 
-#define FN_START_OF_NEXT_COLUMN     (FN_SELECTION + 51) /* zum Anfang der naechsten Spalte */
-#define FN_END_OF_NEXT_COLUMN       (FN_SELECTION + 52) /* zum Ende der naechsten Spalte */
-#define FN_START_OF_PREV_COLUMN     (FN_SELECTION + 53) /* zum Anfang der vorhergehenden Spalte */
-#define FN_END_OF_PREV_COLUMN       (FN_SELECTION + 54) /* zum Ende der vorhergehenden Spalte */
+#define FN_START_OF_NEXT_COLUMN     (FN_SELECTION + 51) /* to the start of the next column */
+#define FN_END_OF_NEXT_COLUMN       (FN_SELECTION + 52) /* to the end of the next column */
+#define FN_START_OF_PREV_COLUMN     (FN_SELECTION + 53) /* to the start of the previous column */
+#define FN_END_OF_PREV_COLUMN       (FN_SELECTION + 54) /* to the end of the previous column */
 
-#define FN_FOOTNOTE_TO_ANCHOR       (FN_SELECTION + 55) /* aus der Fussnote zum Anchor */
-#define FN_NEXT_FOOTNOTE            (FN_SELECTION + 56) /* zur naechsten Fussnote */
-#define FN_PREV_FOOTNOTE            (FN_SELECTION + 57) /* zur vorhergehenden Fussnote */
+#define FN_FOOTNOTE_TO_ANCHOR       (FN_SELECTION + 55) /* from the footnote to the anchor */
+#define FN_NEXT_FOOTNOTE            (FN_SELECTION + 56) /* to the next footnote */
+#define FN_PREV_FOOTNOTE            (FN_SELECTION + 57) /* to the previous footnote */
 
-#define FN_CNTNT_TO_NEXT_FRAME      (FN_SELECTION + 58) /* aus dem Inhalt zum naechsten Rahmen */
-#define FN_FRAME_TO_ANCHOR          (FN_SELECTION + 59) /* vom Rahmen zum Anker */
+#define FN_CNTNT_TO_NEXT_FRAME      (FN_SELECTION + 58) /* from content to the next frame */
+#define FN_FRAME_TO_ANCHOR          (FN_SELECTION + 59) /* from frame to the anchor */
 
-#define FN_TO_HEADER                (FN_SELECTION + 60) /* Toggle zwischen Content und Kopfzeile */
-#define FN_TO_FOOTER                (FN_SELECTION + 61) /* Toggle zwischen Content und Fusszeile */
+#define FN_TO_HEADER                (FN_SELECTION + 60) /* toggle between content and header */
+#define FN_TO_FOOTER                (FN_SELECTION + 61) /* toggle between content and footer */
 
-#define FN_IDX_MARK_TO_IDX          (FN_SELECTION + 62) /* von der Verzeichnismarkierung zum Verzeichnis */
+#define FN_IDX_MARK_TO_IDX          (FN_SELECTION + 62) /* from the index mark to the index */
 
 #define FN_TO_FOOTNOTE_AREA         (FN_SELECTION + 63) /* jump into the appropriate footnote area */
 
 #define FN_SET_BLOCK_MODE           (FN_SELECTION + 64) /* selection mode: block */
 
-
-
 #define FN_PREV_PARA                (FN_SELECTION + 74)
 #define FN_NEXT_PARA                (FN_SELECTION + 75)
 
-#define FN_GOTO_NEXT_MARK           (FN_SELECTION + 76)   /* N�chsten Platzhalter anspringen */
-#define FN_GOTO_PREV_MARK           (FN_SELECTION + 77)   /* Vorhergehenden Platzhalter anspringen */
+#define FN_GOTO_NEXT_MARK           (FN_SELECTION + 76)   /* Go to next marker */
+#define FN_GOTO_PREV_MARK           (FN_SELECTION + 77)   /* Go to previous marker */
 
-// schon im SVX unter der gleichen Id
-//#define FN_START_DOC_DIRECT           (FN_SELECTION + 78)   /* Direkt zum Dokanfang springen */
-//#define FN_END_DOC_DIRECT         (FN_SELECTION + 79)   /* Direkt zum Dokanfang springen */
-
-#define FN_NEXT_TOXMARK             (FN_SELECTION + 83)   /* zur naechsten Verz. Markierung */
-#define FN_PREV_TOXMARK             (FN_SELECTION + 84)   /* zur vorherigen Verz. Markierung */
-#define FN_NEXT_TBLFML              (FN_SELECTION + 85)   /* zur naechsten Tabellenformel */
-#define FN_PREV_TBLFML              (FN_SELECTION + 86)   /* zur vorherigen Tabellenformel */
-#define FN_NEXT_TBLFML_ERR          (FN_SELECTION + 87)   /* zur naechsten fehl. Tabellenformel */
-#define FN_PREV_TBLFML_ERR          (FN_SELECTION + 88)   /* zur vorherigen fehl. Tabellenformel */
+#define FN_NEXT_TOXMARK             (FN_SELECTION + 83)   /* to the next index mark */
+#define FN_PREV_TOXMARK             (FN_SELECTION + 84)   /* to the previous index mark */
+#define FN_NEXT_TBLFML              (FN_SELECTION + 85)   /* to the next table formula */
+#define FN_PREV_TBLFML              (FN_SELECTION + 86)   /* to the previous table formula */
+#define FN_NEXT_TBLFML_ERR          (FN_SELECTION + 87)   /* to the next broken table formula */
+#define FN_PREV_TBLFML_ERR          (FN_SELECTION + 88)   /* to the previous broken table formula */
 
 #define FN_READONLY_SELECTION_MODE  (FN_SELECTION + 89)   /* switches text selection mode in readonly documents*/
 #define FN_SELECTION_MODE_DEFAULT   (FN_SELECTION + 90)   /* use default selection mode - not block mode */
@@ -1020,28 +954,19 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
     QUERY-Block
  --------------------------------------------------------------------*/
 
-
-
-#define FN_IS_MODIFIED              (FN_QUERY +16)      /* Dokument geaendert? */
-#define FN_RESET_MODIFIED           (FN_QUERY +17)      /* Geaendert-Flag zuruecksetzen */
+#define FN_IS_MODIFIED              (FN_QUERY +16)      /* Was the document modified? */
+#define FN_RESET_MODIFIED           (FN_QUERY +17)      /* Reset modified flag */
 
 #define FN_GET_DOC_INFO             (FN_QUERY +22)      /* Wert Dokumentinfo erfragen */
-#define FN_GET_ERRNO                (FN_QUERY +26)      /* Error-Nummer abfragen */
-#define FN_GET_DOCMAN_PATH          (FN_QUERY +27)      /* Pfad zu einer Gruppe im Docmgr erfragen */
+#define FN_GET_ERRNO                (FN_QUERY +26)      /* Get error number */
+#define FN_GET_DOCMAN_PATH          (FN_QUERY +27)      /* Get path to a group in Docmgr */
 
 #define FN_TXTATR_INET              (FN_QUERY +29)      /* INet-Attribut */
-#define FN_EXECUTE_DRAG             (FN_QUERY +30)      /* D&D starten */
-
-#define FN_GET_PRINT_AREA           (FN_QUERY +32)      /* Attribut fuer druckbaren Seitenbereich besorgen */
-
-
+#define FN_EXECUTE_DRAG             (FN_QUERY +30)      /* Start drag and drop */
 
-// #define FN_IS_START_OF_PAGE         (FN_QUERY +40)       /**/
-// #define FN_IS_END_OF_PAGE           (FN_QUERY +41)       /**/
+#define FN_GET_PRINT_AREA           (FN_QUERY +32)      /* Get attribute for printable area of page */
 
-#define FN_GET_PARAGRAPH            (FN_QUERY +48)      /*  Paragraph-Object von der Textshell
-                                                            an die View weiterreichen*/
-// hier ist Schluss!!!
+#define FN_GET_PARAGRAPH            (FN_QUERY +48)      /* Get Paragraph-Object from the text shell to the view */
 
 #define FN_DB_FORM_LETTER               (FN_QUERY2 + 0)     /* form letter */
 #define FN_DB_INSERT_CONTENT            (FN_QUERY2 + 1)     /* merge data into fields*/
@@ -1056,7 +981,7 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 #define FN_DB_DATA_CURSOR_ANY           (FN_QUERY2 + 10)
 
 /*--------------------------------------------------------------------
-    Bereich: Envelope
+    Region: Envelope
  --------------------------------------------------------------------*/
 
 #define FN_ENVELOP                  (FN_ENVELP    )
@@ -1071,9 +996,8 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 #define FN_DELETE_COMMENT           (FN_NOTES+6)
 #define FN_REPLY                    (FN_NOTES+7)
 
-
 /*--------------------------------------------------------------------
-    Bereich: Parameter
+    Region: Parameter
  --------------------------------------------------------------------*/
 
 #define FN_PARAM_TABLE_COLS         (FN_PARAM)
@@ -1108,7 +1032,6 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 #define FN_PARAM_REGION_EDIT_IN_READONLY (FN_PARAM+28)
 
 #define FN_PARAM_INSERT_AFTER           (FN_PARAM+29)
-//#define FN_PARAM_FILTER               (FN_PARAM+30) already defined in svx/svxids.hrc
 #define FN_PARAM_INDEX_NAME             (FN_PARAM+31)
 #define FN_PARAM_INDEX_OPTIONS          (FN_PARAM+32)
 #define FN_PARAM_INDEX_FORMAT           (FN_PARAM+33)
@@ -1135,11 +1058,9 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 
 #define FN_PARAM_GRF_CONNECT            (FN_PARAM+53)
 #define FN_PARAM_FIELD_TYPE             (FN_PARAM+54)
-//already defined in svxids.hrc: #define FN_PARAM_FIELD_CONTENT           (FN_PARAM+55)
 #define FN_PARAM_FIELD_SUBTYPE          (FN_PARAM+56)
 #define FN_PARAM_FIELD_FORMAT           (FN_PARAM+57)
 
-
 #define FN_PARAM_EVENT                  (FN_PARAM+68)
 #define FN_PARAM_URL                    (FN_PARAM+69)
 #define FN_PARAM_GRF_REALSIZE           (FN_PARAM+70)
@@ -1147,34 +1068,33 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 #define FN_PARAM_GRF_CLIENTMAP          (FN_PARAM+74) /* ClientMap */
 #define FN_PARAM_GRF_SERVERMAP          (FN_PARAM+75) /* ServerMap */
 #define FN_PARAM_GRF_TARGETFRAME        (FN_PARAM+76) /* TargetFrame */
-#define FN_INET_FIELD_MACRO             (FN_PARAM+77) /* Id fuer URL-Feld-Macros*/
+#define FN_INET_FIELD_MACRO             (FN_PARAM+77) /* Id for URL-Field-Macros*/
 
-#define FN_PARAM_PRINTER                (FN_PARAM+78) /* Drucker* */
+#define FN_PARAM_PRINTER                (FN_PARAM+78) /* Printer */
 #define FN_PARAM_STDFONTS               (FN_PARAM+79) /* ConfigItem Standardfonts */
 
 #define FN_PARAM_WRTSHELL               (FN_PARAM2) /* SwWrtShell */
 
-#define FN_COND_COLL                    (FN_PARAM2+1) /* Item fuer bed. Vorlagen */
-#define FN_PARAM_SELECTION              (FN_PARAM2+2) /* selektiertes Wort fuer Format/Zeichen/Hyperlink */
+#define FN_COND_COLL                    (FN_PARAM2+1) /* Item for conditional templates */
+#define FN_PARAM_SELECTION              (FN_PARAM2+2) /* selected word for format/character/hyperlink */
 
 #define FN_PARAM_ACT_NUMBER             (FN_PARAM2+3) /* PointerItem die aktuelle NumRule */
-#define FN_PARAM_CHILD_LEVELS           (FN_PARAM2+4) /* Werden Child-Levels benutzt ?*/
+#define FN_PARAM_CHILD_LEVELS           (FN_PARAM2+4) /* are child levels used? */
 
-#define FN_PARAM_NUM_PRESET             (FN_PARAM2+5) /* vorgewaehlte Numerierung*/
+#define FN_PARAM_NUM_PRESET             (FN_PARAM2+5) /* predefined numbering */
 
-#define FN_PARAM_HEIGHT                 (FN_PARAM2+6) /* Param fuer Hoehe */
-#define FN_PARAM_DIST                   (FN_PARAM2+7) /* und Breite, wg. metrischer Umwandlung */
+#define FN_PARAM_HEIGHT                 (FN_PARAM2+6) /* Param for height */
+#define FN_PARAM_DIST                   (FN_PARAM2+7) /* and width, for metric transformation */
 
-#define FN_PARAM_SHADOWCURSOR           (FN_PARAM2+8) /* Fuer ShadowCursor Optionen */
+#define FN_PARAM_SHADOWCURSOR           (FN_PARAM2+8) /* for ShadowCursor options */
 
-#define FN_PARAM_ACT_NUMLEVEL           (FN_PARAM2+9) /* BYTE-Item mit aktuellen NumLevel */
+#define FN_PARAM_ACT_NUMLEVEL           (FN_PARAM2+9) /* BYTE-Item with current NumLevel */
 
-#define FN_PARAM_9                      (FN_PARAM2+10)
 #define FN_PARAM_10                     (FN_PARAM2+11)
 
 #define FN_TEXT_RANGE                   (FN_PARAM2+12) /* TextRange Property*/
 
-#define FN_PARAM_CRSR_IN_PROTECTED      (FN_PARAM2+13) /* Cursor in geschuetzten Bereichen*/
+#define FN_PARAM_CRSR_IN_PROTECTED      (FN_PARAM2+13) /* Cursor in protected areas */
 #define FN_PARAM_TOX_TYPE               (FN_PARAM2+14) /* TOX type in tox dialog*/
 #define FN_PARAM_LINK_DISPLAY_NAME      (FN_PARAM2+15) /* LinkDisplayName property*/
 #define FN_PARAM_NUM_LEVEL              (FN_PARAM2+16) /* rtf filter*/
@@ -1186,17 +1106,11 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 #define FN_PARAM_CHAIN_PREVIOUS         (FN_PARAM2+20) /* Name of frame to be added as chain successor */
 #define FN_PARAM_CHAIN_NEXT             (FN_PARAM2+21) /* Name of frame to be added as chain predecessor */
 #define FN_PARAM_DATABASE_PROPERTIES    (FN_PARAM2+22) /* transport a Sequence<PropertyValue> containing database properties*/
-// --> OD 2004-08-06 #i28749#
-// com::sun::star::text::Shape::TransformationInHoriL2R property
 #define FN_SHAPE_TRANSFORMATION_IN_HORI_L2R (FN_PARAM2+23)
-// com::sun::star::text::Shape::PositionLayoutDir property
 #define FN_SHAPE_POSITION_LAYOUT_DIR    (FN_PARAM2+24)
-// <--
-// --> OD 2004-10-28 #i36248#
 #define FN_SHAPE_STARTPOSITION_IN_HORI_L2R (FN_PARAM2+25)
 #define FN_SHAPE_ENDPOSITION_IN_HORI_L2R   (FN_PARAM2+26)
 
-// <--
 /*--------------------------------------------------------------------
     Bereich: Druckoptionen
  --------------------------------------------------------------------*/
@@ -1213,7 +1127,7 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 #define FN_PRNOPT_END    FN_PRNOPT_POSTITS
 
 /*--------------------------------------------------------------------
-    Beschreibung: Status : nicht mehr als 19!
+    Description: Status: not more than 19!
  --------------------------------------------------------------------*/
 
 #define FN_STAT_PAGE                (FN_STAT + 1)
@@ -1222,14 +1136,13 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 #define FN_STAT_INSOVER             (FN_STAT + 4)
 #define FN_STAT_SELMODE             (FN_STAT + 5)
 #define FN_STAT_CONTEXT             (FN_STAT + 7)
-#define FN_STAT_BOOKMARK            (FN_STAT + 8)  /* Fuer Popup Bookmarks*/
+#define FN_STAT_BOOKMARK            (FN_STAT + 8)  /* For Popup Bookmarks*/
 
 /*--------------------------------------------------------------------
-    Bereich: Seitenvorschau
+    Region: Page preview
  --------------------------------------------------------------------*/
 
 #define FN_SHOW_TWO_PAGES           (FN_PGPREVIEW + 1)
-//already in svx/svxids.hrc
 #ifndef FN_SHOW_MULTIPLE_PAGES
 #define FN_SHOW_MULTIPLE_PAGES      (FN_PGPREVIEW + 2)
 #endif
@@ -1238,7 +1151,7 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 #define FN_SHOW_BOOKVIEW            (FN_PGPREVIEW + 5)
 
 /*--------------------------------------------------------------------
-    Bereich: Rahmenattribute
+    Region: Setting Attributes
  --------------------------------------------------------------------*/
 
 #define FN_OPAQUE                       (FN_FRAME + 1)
@@ -1257,13 +1170,10 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 #define FN_IID_COLRIGHT                 (FN_FRAME + 17)
 
 #define FN_SET_FRM_ALT_NAME             (FN_FRAME + 18)
-// --> OD 2009-07-13 #i73249#
 #define FN_UNO_TITLE                    (FN_FRAME + 19)
 #define FN_UNO_DESCRIPTION              (FN_FRAME + 20)
-// <--
-
 
-//Member-Ids fuer Fill/SetVariable an Items
+//Member IDs for Fill / SetVariable of items
 #define         MID_STYLE       0xe0
 #define         MID_PWIDTH      0xe1
 #define         MID_ADJUST      0xe2
@@ -1297,11 +1207,11 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 #define SID_SW_DOCMAN_PATH                              (SID_OFASLOTS_START +   6)
 #endif
 
-// defines fuer Event-Zuweisung per Macro
+// defines for Event-assignments per Macro
 #define MAC_EVENT_MOUSEOVER         0x01            //
-#define MAC_EVENT_MOUSECLICK        0x02            // Hyperlink ausloesen
+#define MAC_EVENT_MOUSECLICK        0x02            //
 #define MAC_EVENT_MOUSEOUT          0x03            //
-#define MAC_EVENT_OBJECT_SELECT     0x04            // Obj. selektieren
+#define MAC_EVENT_OBJECT_SELECT     0x04            //
 #define MAC_EVENT_KEYINPUT_ALPHA    0x05            //
 #define MAC_EVENT_KEYINPUT_NOALPHA  0x06            //
 #define MAC_EVENT_FRM_RESIZE        0x07            //
diff --git a/sw/inc/comcore.hrc b/sw/inc/comcore.hrc
index 981c89ef37db..494baae50466 100644
--- a/sw/inc/comcore.hrc
+++ b/sw/inc/comcore.hrc
@@ -30,7 +30,7 @@
 #include "rcid.hrc"
 
 // ---------------
-// die Strings
+// Strings
 // ---------------
 
 #define STR_COMCORE_READERROR               (RC_COMCORE_BEGIN + 0)
@@ -52,7 +52,7 @@
 #define STR_HYPH_TITLE                      (RC_COMCORE_BEGIN + 16)
 #define MSG_DISABLE_UNDO_QUESTION           (RC_COMCORE_BEGIN + 17)
 #define MSG_DISABLE_READLINE_QUESTION       (RC_COMCORE_BEGIN + 18)
-// -> #111827#
+
 #define STR_REDLINE_INSERT                  (RC_COMCORE_BEGIN + 19)
 #define STR_REDLINE_DELETE                  (RC_COMCORE_BEGIN + 20)
 #define STR_REDLINE_FORMAT                  (RC_COMCORE_BEGIN + 21)
@@ -68,8 +68,7 @@
 #define STR_REDLINE_MULTIPLE                (RC_COMCORE_BEGIN + 31)
 #define STR_N_REDLINES                      (RC_COMCORE_BEGIN + 32)
 #define STR_FIELD                           (RC_COMCORE_BEGIN + 33)
-// <- #111827#
-// -> #115575#
+
 #define STR_FRAME                           (RC_COMCORE_BEGIN + 34)
 #define STR_OLE                             (RC_COMCORE_BEGIN + 35)
 #define STR_MATH_FORMULA                    (RC_COMCORE_BEGIN + 36)
@@ -84,13 +83,8 @@
 #define STR_DRAWING_OBJECTS                 (RC_COMCORE_BEGIN + 45)
 #define STR_TABLE_NAME                      (RC_COMCORE_BEGIN + 46)
 #define STR_PARAGRAPH_UNDO                  (RC_COMCORE_BEGIN + 47)
-// <- #115575#
-// -> PB #146850#
-#define RID_GRAPHIC_REPLACEBMP_HC           (RC_COMCORE_BEGIN + 48)
-#define RID_GRAPHIC_ERRORBMP_HC             (RC_COMCORE_BEGIN + 49)
-// <- #146850#
 
-// defines fuer die Autoformat Redline Kommentare
+// defines for the Autoformat Redline Comments
 #define STR_AUTOFMTREDL_DEL_EMPTY_PARA          0
 #define STR_AUTOFMTREDL_USE_REPLACE             1
 #define STR_AUTOFMTREDL_CPTL_STT_WORD           2
@@ -113,7 +107,7 @@
 #define STR_AUTOFMTREDL_SET_NUMBULET            19
 #define STR_AUTOFMTREDL_DEL_MORELINES           20
 #define STR_AUTOFMTREDL_NON_BREAK_SPACE         21
-// !!!!!!!!!!!!!!!!!!!!!!!!!!  das Ende immer richtig setzen !!!!!!!!!!!!
+// !!!!!!!!!!!!!!!!!!!!!!!!!!  alwats set the correct end !!!!!!!!!!!!
 #define STR_AUTOFMTREDL_END                     22
 
 
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 307b353979e2..d4f1c6a10880 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -34,11 +34,11 @@
 #include <tools/link.hxx>
 #include <tools/rtti.hxx>
 #include "swdllapi.h"
-#include <swtypes.hxx>          // fuer SWPOSDOC
-#include <viewsh.hxx>           // fuer ViewShell
-#include <calbck.hxx>           // fuer SwClient
-#include <cshtyp.hxx>           // fuer die CursorShell Typen
-#include <crstate.hxx>          // fuer die CursorMove-Staties
+#include <swtypes.hxx>          // for SWPOSDOC
+#include <viewsh.hxx>           // for ViewShell
+#include <calbck.hxx>           // for SwClient
+#include <cshtyp.hxx>           // for CursorShell types
+#include <crstate.hxx>          // for CursorMove-States
 #include <toxe.hxx>             // SwTOXSearchDir
 #include <tblsel.hxx>               //SwTblSearchType
 #include <viscrs.hxx>
@@ -46,9 +46,6 @@
 #include <tblsel.hxx>
 #include <IDocumentMarkAccess.hxx>
 
-
-// einige Forward Deklarationen
-
 class KeyCode;
 class SfxItemSet;
 class SfxPoolItem;
@@ -74,10 +71,10 @@ class SwCellFrms;
 class SwTOXMark;
 class SwRedline;
 class IBlockCursor;
-class SwCntntNode; //  #i23726#
-// --> OD 2008-06-19 #i90516#
+class SwCntntNode;
+
 class SwPostItField;
-// <--
+
 struct SwPosition;
 
 namespace com { namespace sun { namespace star { namespace util {
@@ -92,7 +89,7 @@ namespace com { namespace sun { namespace star { namespace container {
     class XStringKeyMap;
 }}}}
 
-// enum und struktur, um ueber die Doc-Position Informationen zu erfragen
+// enum and struct to get informations via the Doc-Position
 
 struct SwContentAtPos
 {
@@ -108,11 +105,11 @@ struct SwContentAtPos
         SW_OUTLINE          = 0x0040,
         SW_TOXMARK          = 0x0080,
         SW_REFMARK          = 0x0100,
-        SW_NUMLABEL         = 0x0200, // #i23726#
-        SW_CONTENT_CHECK    = 0x0400, // #i43742#
+        SW_NUMLABEL         = 0x0200,
+        SW_CONTENT_CHECK    = 0x0400,
         SW_SMARTTAG         = 0x0800,
         SW_FORMCTRL         = 0x1000
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         ,SW_CURR_ATTRS      = 0x4000        // only for debugging
         ,SW_TABLEBOXVALUE   = 0x8000        // only for debugging
 #endif
@@ -122,11 +119,11 @@ struct SwContentAtPos
         const SwField* pFld;
         const SfxPoolItem* pAttr;
         const SwRedline* pRedl;
-        SwCntntNode * pNode; // #i23726#
+        SwCntntNode * pNode;
         const sw::mark::IFieldmark* pFldmark;
     } aFnd;
 
-    int nDist; // #i23726#
+    int nDist;
 
     String sStr;
     const SwTxtAttr* pFndTxtAttr;
@@ -139,20 +136,18 @@ struct SwContentAtPos
         nDist = 0; // #i23726#
     }
 
-    // befindet sich der Node in einem geschuetzten Bereich?
     BOOL IsInProtectSect() const;
     bool     IsInRTLText()const;
 };
 
-// ReturnWerte von SetCrsr (werden verodert)
-const int CRSR_POSOLD = 0x01,   // Cursor bleibt an alter Doc-Position
-          CRSR_POSCHG = 0x02;   // Position vom Layout veraendert
+// return values of SetCrsr (can be combined via ||)
+const int CRSR_POSOLD = 0x01,   // cursor stays at old position
+          CRSR_POSCHG = 0x02;   // position changed by the layout
 
 // Helperfunction to resolve backward references in regular expressions
 
 String *ReplaceBackReferences( const com::sun::star::util::SearchOptions& rSearchOpt, SwPaM* pPam );
 
-// die Cursor - Shell
 class SW_DLLPUBLIC SwCrsrShell : public ViewShell, public SwModify
 {
     friend class SwCallLink;
@@ -160,50 +155,47 @@ class SW_DLLPUBLIC SwCrsrShell : public ViewShell, public SwModify
     friend class SwSelPaintRects;
     friend class SwChgLinkFlag;
 
-    //Braucht den Crsr als IntrnlCrsr.
+    // requires the Crsr as InternalCrsr
     friend BOOL GetAutoSumSel( const SwCrsrShell&, SwCellFrms& );
 
-public:     // public, damit defaultet werden kann !!
+public:
 
-    /* ein enum fuer den Aufruf von UpdateCrsr */
+    /* for calling UpdateCrsr */
     enum CrsrFlag {
-        UPDOWN      = (1 << 0),     // Up/Down auf Spalte halten
-        SCROLLWIN   = (1 << 1),     // Window Scrollen
-        CHKRANGE    = (1 << 2),     // ueberpruefen von ueberlappenden PaM's
-        NOCALRECT   = (1 << 3),     // CharRect nicht neu berechnen
-        READONLY    = (1 << 4)      // Sichtbar machen trotz Readonly
+        UPDOWN      = (1 << 0),     // keep Up/Down on columns
+        SCROLLWIN   = (1 << 1),     // scroll window
+        CHKRANGE    = (1 << 2),     // check overlapping PaMs
+        NOCALRECT   = (1 << 3),     // don't recalculate CharRect
+        READONLY    = (1 << 4)      // make visible in spite of Readonly
     };
 
 private:
 
-    SwRect  aCharRect;          // Char-SRectangle auf dem der Cursor steht
-    Point   aCrsrHeight;        // Hohe&Offset von sichtbaren Cursor
-    Point   aOldRBPos;          // Right/Bottom von letzter VisArea
-                                // (wird im Invalidate vom Cursor benutzt)
+    SwRect  aCharRect;          // Char-SRectangle on which the cursor is located
+    Point   aCrsrHeight;        // height & offset from visible Cursor
+    Point   aOldRBPos;          // Right/Bottom of last VisArea
+                                // (used in Invalidate by Cursor)
 
-
-    // um event. Macro was anhaengt auszufuehren.
     Link aFlyMacroLnk;          // Link will be called, if the Crsr is set
                                 // into a fly. A macro can be then becalled
     Link aChgLnk;               // link will be called by every attribut/
                                 // format changes at cursor position.
-    Link aGrfArrivedLnk;        // Link calls to UI if a grafik is arrived
-
+    Link aGrfArrivedLnk;        // Link calls to UI if a graphic is arrived
 
-    SwShellCrsr* pCurCrsr;      // der aktuelle Cursor
-    SwShellCrsr* pCrsrStk;      // Stack fuer den Cursor
-    SwVisCrsr *pVisCrsr;        // der Sichtbare-Cursor
+    SwShellCrsr* pCurCrsr;      // current cursor
+    SwShellCrsr* pCrsrStk;      // stack for the cursor
+    SwVisCrsr *pVisCrsr;        // the visible cursor
 
     IBlockCursor *pBlockCrsr;   // interface of cursor for block (=rectangular) selection
 
-    SwShellTableCrsr* pTblCrsr; // Tabellen-Crsr; nur in Tabellen, wenn
-                                // die Selection ueber 2 Spalten liegt
+    SwShellTableCrsr* pTblCrsr; // table Crsr; only in tables when the
+                                // selection lays over 2 columns
 
-    SwNodeIndex* pBoxIdx;       // fuers erkennen der veraenderten
-    SwTableBox* pBoxPtr;        // Tabellen-Zelle
+    SwNodeIndex* pBoxIdx;       // for recognizing of the changed
+    SwTableBox* pBoxPtr;        // table row
 
-    long nUpDownX;              // versuche den Cursor bei Up/Down immer in
-                                // der gleichen Spalte zu bewegen
+    long nUpDownX;              // try to move the cursor on up/down always
+                                // in the same column
     long nLeftFrmPos;
     ULONG nAktNode;             // save CursorPos at Start-Action
     xub_StrLen nAktCntnt;
@@ -211,44 +203,40 @@ private:
     bool bAktSelection;
 
     /*
-     * Mit den Methoden SttCrsrMove und EndCrsrMove wird dieser Zaehler
-     * Inc-/Decrementiert. Solange der Zaehler ungleich 0 ist, erfolgt
-     * auf den akt. Cursor kein Update. Dadurch koennen "komplizierte"
-     * Cursorbewegungen (ueber Find()) realisiert werden.
+     * Via the Method SttCrsrMove and EndCrsrMove this counter gets
+     * incremented/decremented. As long as the counter is inequal to 0, the
+     * current Cursor gets no update. This way, "complicated" cursor movements
+     * (via Find()) can be realised.
      */
     USHORT nCrsrMove;
-    USHORT nBasicActionCnt;     // Actions, die vom Basic geklammert wurden
-    CrsrMoveState eMvState;     // Status fuers Crsr-Travelling - GetCrsrOfst
+    USHORT nBasicActionCnt;     // Actions which are parenthesized by Basic
+    CrsrMoveState eMvState;     // Status for Crsr-Travelling - GetCrsrOfst
 
-    // --> OD 2008-04-02 #refactorlists#
     String sMarkedListId;
     int nMarkedListLevel;
-    // <--
-
-    BOOL bHasFocus : 1;         // Shell ist in einem Window "aktiv"
-    BOOL bSVCrsrVis : 1;        // SV-Cursor Un-/Sichtbar
-    BOOL bChgCallFlag : 1;      // Attributaenderung innerhalb von
-                                // Start- und EndAction
-    BOOL bVisPortChgd : 1;      // befindet sich im VisPortChg-Aufruf
-                                // (wird im Invalidate vom Cursor benutzt)
-
-    BOOL bCallChgLnk : 1;       // Flag fuer abgeleitete Klassen:
-                                // TRUE -> ChgLnk callen
-                                // Zugriff nur ueber SwChgLinkFlag
-    BOOL bAllProtect : 1;       // Flag fuer Bereiche
-                                // TRUE -> alles geschuetzt / versteckt
-    BOOL bInCMvVisportChgd : 1; // Flag fuer CrsrMoves
-                                // TRUE -> die Sicht wurde verschoben
+
+    BOOL bHasFocus : 1;         // Shell is "active" in a window
+    BOOL bSVCrsrVis : 1;        // SV-Cursor visible/invisible
+    BOOL bChgCallFlag : 1;      // attribute change inside Start- and EndAction
+    BOOL bVisPortChgd : 1;      // in VisPortChg-Call
+                                // (used in Invalidate by the Cursor)
+
+    BOOL bCallChgLnk : 1;       // flag for derived classes
+                                // TRUE -> call ChgLnk
+                                // access only via SwChgLinkFlag
+    BOOL bAllProtect : 1;       // Flag for areas
+                                // TRUE -> everything protected / hidden
+    BOOL bInCMvVisportChgd : 1; // Flag for CrsrMoves
+                                // TRUE -> view was moved
     BOOL bGCAttr : 1;           // TRUE -> es existieren nichtaufgespannte Attr.
-    BOOL bIgnoreReadonly : 1;   // TRUE -> Beim naechsten EndAction trotz
-                                // Readonly den Crsr sichtbar machen.
-    BOOL bSelTblCells : 1;      // TRUE -> Zellen uebers InputWin selektieren
-    BOOL bAutoUpdateCells : 1;  // TRUE -> Zellen werden autoformatiert
-    BOOL bBasicHideCrsr : 1;    // TRUE -> HideCrsr vom Basic
-    BOOL bSetCrsrInReadOnly : 1;// TRUE -> Cursor darf in ReadOnly-Bereiche
+    BOOL bIgnoreReadonly : 1;   // TRUE -> make the cursor visible on next
+                                // EndAction in spite of Readonly
+    BOOL bSelTblCells : 1;      // TRUE -> select cells over the InputWin
+    BOOL bAutoUpdateCells : 1;  // TRUE -> autoformat cells
+    BOOL bBasicHideCrsr : 1;    // TRUE -> HideCrsr from Basic
+    BOOL bSetCrsrInReadOnly : 1;// TRUE -> Cursor is allowed in ReadOnly-Areas
     BOOL bOverwriteCrsr : 1;    // TRUE -> show Overwrite Crsr
 
-    // OD 11.02.2003 #100556# - flag to allow/avoid execution of marcos (default: true)
     bool mbMacroExecAllowed : 1;
 
     SW_DLLPRIVATE void UpdateCrsr( USHORT eFlags
@@ -257,11 +245,8 @@ private:
 
     SW_DLLPRIVATE void _ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing );
 
-    // -> #i27615#
-
     /** Mark a certain list level of a certain list
 
-        OD 2008-04-02 #refactorlists#
         levels of a certain lists are marked now
 
         @param sListId    list Id of the list whose level is marked
@@ -271,7 +256,6 @@ private:
      */
     SW_DLLPRIVATE void MarkListLevel( const String& sListId,
                                       const int nLevel );
-    // <- #i27615#
 
     // private method(s) accessed from public inline method(s) must be exported.
                   BOOL LeftRight( BOOL, USHORT, USHORT, BOOL );
@@ -305,17 +289,13 @@ protected:
     };
     int CompareCursor( CrsrCompareType eType ) const;
 
-    // Setzt alle PaMs in OldNode auf NewPos + Offset
+    // set all PaMs in OldNode to NewPos + Offset
     void PaMCorrAbs(const SwNodeIndex &rOldNode, const SwPosition &rNewPos,
                     const xub_StrLen nOffset = 0 );
 
-    // --> FME 2004-07-30 #i32329# Enhanced table selection
     BOOL _SelTblRowOrCol( bool bRow, bool bRowSimple = false );
-    // <--
 
-    // --> FME 2005-01-31 #i41424# Only update the marked number levels if necessary
     bool SetInFrontOfLabel( BOOL bNew );
-    // <--
 
     void RefreshBlockCursor();
 
@@ -326,17 +306,17 @@ protected:
 public:
     TYPEINFO();
     SwCrsrShell( SwDoc& rDoc, Window *pWin, const SwViewOption *pOpt = 0 );
-    // verkleideter Copy-Constructor
+    // disguised copy constructor
     SwCrsrShell( SwCrsrShell& rShell, Window *pWin );
     virtual ~SwCrsrShell();
 
     virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
 
-    // neuen Cusror erzeugen und den alten anhaengen
+    // create new cursor and append the old one
     SwPaM * CreateCrsr();
-    // loesche den aktuellen Cursor und der folgende wird zum Aktuellen
+    // delete the current cursor and make the following into the current
     BOOL DestroyCrsr();
-    // TableCursor in normale Cursor verwandeln, Tablemode aufheben
+    // transform TableCursor to normal cursor, nullify Tablemode
     void TblCrsrToCursor();
     // enter block mode, change normal cursor into block cursor
     void CrsrToBlockCrsr();
@@ -350,27 +330,26 @@ public:
 
     SwPaM* GetCrsr( BOOL bMakeTblCrsr = TRUE ) const;
     inline SwCursor* GetSwCrsr( BOOL bMakeTblCrsr = TRUE ) const;
-    // nur den akt. Cursor returnen
+    // return only the current cursor
           SwShellCrsr* _GetCrsr()                       { return pCurCrsr; }
     const SwShellCrsr* _GetCrsr() const                 { return pCurCrsr; }
 
-    // uebergebenen Cursor anzeigen - fuer UNO
+    // show passed cursor - for UNO
     void    SetSelection(const SwPaM& rCrsr);
 
-    // alle Cursor aus den ContentNodes entfernen und auf 0 setzen.
-    // Wurde aus der FEShell hierher verschoben.
+    // remove all cursors from ContentNodes and set to 0
     void ParkCrsr( const SwNodeIndex &rIdx );
 
-    // gebe den akt. Cursor-Stack zurueck.
-    // ( Wird in der EditShell beim Loeschen von Inhalten benoetigt! )
+    // return the current cursor stack
+    // (required in EditShell when deleting contents)
     inline SwPaM* GetStkCrsr() const;
 
-    // Start der Klammerung, SV-Cursor und selektierte Bereiche hiden
+    // start parenthesing, hide SV-Cursor and selected areas
     void StartAction();
-    // Ende der Klammerung, SV-Cursor und selektierte Bereiche anzeigen
+    // end parenthesing, show SV-Cursor and selected areas
     void EndAction( const BOOL bIdleEnd = FALSE );
 
-    // Basiscursortravelling
+    // basic cursor travelling
     long GetUpDownX() const             { return nUpDownX; }
 
     BOOL Left( USHORT nCnt, USHORT nMode, BOOL bAllowVisual = FALSE )
@@ -390,7 +369,6 @@ public:
     BOOL MoveColumn( SwWhichColumn, SwPosColumn );
     BOOL MoveRegion( SwWhichRegion, SwPosRegion );
 
-    // die Suchfunktionen
     ULONG Find( const com::sun::star::util::SearchOptions& rSearchOpt,
                 BOOL bSearchInNotes,
                 SwDocPositions eStart, SwDocPositions eEnde,
@@ -409,28 +387,25 @@ public:
                 const com::sun::star::util::SearchOptions* pSearchOpt = 0,
                 const SfxItemSet* rReplSet = 0 );
 
-    // Positionieren des Cursors
-    // returnt
-    //  CRSR_POSCHG: wenn der ob der SPoint vom Layout korrigiert wurde.
-    //  CRSR_POSOLD: wenn der Crsr nicht veraendert wurde
+    //  Position the Cursor
+    //  return values:
+    //      CRSR_POSCHG: when cursor was corrected from SPoint by the layout
+    //      CRSR_POSOLD: when the cursor was not changed
     int SetCrsr( const Point &rPt, BOOL bOnlyText = FALSE, bool bBlock = true );
 
-
     /*
-     * Benachrichtung, dass der sichtbare Bereich sich geaendert
-     * hat. aVisArea wird neu gesetzt, anschliessend wird
-     * gescrollt. Das uebergebene Rectangle liegt auf
-     * Pixelgrenzen, um Pixelfehler beim Scrollen zu vermeiden.
+     * Notification that the visible area was changed. aVisArea is reset, then
+     * scrolling is done. The passed Rectangle lays on pixel borders to avoid
+     * pixel errors.
      */
     virtual void VisPortChgd( const SwRect & );
 
     /*
-     * Virtuelle PaintMethode, damit die Selection nach dem Paint wieder
-     * sichtbar wird.
+     * virtual paint method to make selection visible again after Paint
      */
     void Paint( const Rectangle & rRect );
 
-    // Bereiche
+    // Areas
     inline void SetMark();
     inline BOOL HasMark();
 
@@ -447,33 +422,33 @@ public:
 
     void SwapPam();
     BOOL ChgCurrPam( const Point & rPt,
-                     BOOL bTstOnly = TRUE,      //Nur testen, nicht setzen
-                     BOOL bTstHit  = FALSE );   //Nur genaue Treffer
+                     BOOL bTstOnly = TRUE,      // test only, don't set
+                     BOOL bTstHit  = FALSE );   // only exact matches
     void KillPams();
 
-    // erzeuge eine Kopie vom Cursor und speicher diese im Stack
+    // story a copy of the cursor in the stack
     void Push();
     /*
-     *  Loescht einen Cursor (gesteuert durch bOldCrsr)
-     *      - vom Stack oder    ( bOldCrsr = TRUE )
-     *      - den aktuellen und der auf dem Stack stehende wird zum aktuellen
-     *
-     *  Return:  es war auf dem Stack noch einer vorhanden
+     * Delete a cursor (controlled by bOldCrsr)
+     *      - from stack or (bOldCrsr = TRUE)
+     *      - delete the current one and replace it with the cursor from the
+     *      stack
+     * Return: whether there was one left one the stack
      */
     BOOL Pop( BOOL bOldCrsr = TRUE );
     /*
-     * Verbinde zwei Cursor miteinander.
-     * Loesche vom Stack den obersten und setzen dessen Mark im Aktuellen.
+     * Combine 2 Cursors.
+     * Delete the topmost from the stack and move its Mark into the current.
      */
     void Combine();
 
-#if !defined(DBG_UTIL)
+#if OSL_DEBUG_LEVEL > 1
+    void SttCrsrMove();
+    void EndCrsrMove( const BOOL bIdleEnd = FALSE );
+#else
     void SttCrsrMove() { ++nCrsrMove; StartAction(); }
     void EndCrsrMove( const BOOL bIdleEnd = FALSE )
             { EndAction( bIdleEnd ); --nCrsrMove; }
-#else
-    void SttCrsrMove();
-    void EndCrsrMove( const BOOL bIdleEnd = FALSE );
 #endif
 
     /*
@@ -591,21 +566,20 @@ public:
     ::sw::mark::IFieldmark* GetFieldmarkBefore();
     bool GotoFieldmark( const ::sw::mark::IFieldmark* const pMark );
 
-    // aktualisiere den Crsrs, d.H. setze ihn wieder in den Content.
-    // Das sollte nur aufgerufen werden, wenn der Cursor z.B. beim
-    // Loeschen von Rahmen irgendwohin gesetzt wurde. Die Position
-    // ergibt sich aus seiner aktuellen Position im Layout !!
+    // update Cursr, i.e. reset it into content should only be called when the
+    // cursor was set to a random position e.g. when deleting frames
     void UpdateCrsrPos();
 
-    // returne den am akt. Cursor selektierten Text. Dieser wird mit
-    // Felder etc. aufgefuellt!!
+    // get the selected text at the current cursor. it will be filled with
+    // fields etc.
     String GetSelTxt() const;
-    // gebe nur den Text ab der akt. Cursor Position zurueck (bis zum NodeEnde)
+    // return only the text starting from the current cursor position (to the
+    // end of the node)
     String GetText() const;
 
     // pruefe ob vom aktuellen Crsr der SPoint/Mark in einer Tabelle stehen
     inline const SwTableNode* IsCrsrInTbl( BOOL bIsPtInTbl = TRUE ) const;
-    // erfrage die Document - Layout - Position vom akt. Crsr
+    //
     inline Point& GetCrsrDocPos( BOOL bPoint = TRUE ) const;
     inline BOOL IsCrsrPtAtEnd() const;
 
@@ -614,41 +588,37 @@ public:
 
     BOOL IsTblComplex() const;
     BOOL IsTblComplexForChart();
-    // erfrage die akt. TabellenSelektion als Text
+    // get current table selection as text
     String GetBoxNms() const;
 
-    // setze Crsr in die naechsten/vorherigen Celle
+    // set Crsr to the next/previous cell
     BOOL GoNextCell( BOOL bAppendLine = TRUE );
     BOOL GoPrevCell();
-    // gehe zu dieser Box (wenn vorhanden und in Tabelle!)
+    // go to this box (if available and inside of table)
     BOOL GotoTable( const String& rName );
 
     // select a table row, column or box (based on the current cursor)
     BOOL SelTblRow() { return _SelTblRowOrCol( true  ); }
     BOOL SelTblCol() { return _SelTblRowOrCol( false ); }
     BOOL SelTblBox();
-    // --> FME 2004-07-30 #i32329# Enhanced table selection
+
     BOOL SelTbl();
-    // <--
 
-    // zum naechsten/vorhergehenden Punkt auf gleicher Ebene
     BOOL GotoNextNum();
     BOOL GotoPrevNum();
 
-        // zu diesem Gliederungspunkt
     BOOL GotoOutline( const String& rName );
-        // zum naechsten/vorhergehenden oder angegebenen OultineNode
+    // to the next/previous or the given OutlineNode
     void GotoOutline( USHORT nIdx );
-        // suche die "Outline-Position" im Nodes-Array vom akt. Kaiptel
+    // find the "outline position" in the nodes array of the current chapter
     USHORT GetOutlinePos( BYTE nLevel = UCHAR_MAX );
-        // selektiere den angeben Bereich von OutlineNodes. Optional
-        // inclusive der Childs. Die USHORT sind die Positionen im
-        // OutlineNds-Array!! (EditShell)
+    // select the given range of OutlineNodes. Optionally including the children
+    // the USHORTs are the positions in OutlineNodes-Array (EditShell)
     BOOL MakeOutlineSel( USHORT nSttPos, USHORT nEndPos,
                         BOOL bWithChilds = FALSE );
 
-    BOOL GotoNextOutline();         // naechster Node mit Outline-Num.
-    BOOL GotoPrevOutline();         // vorheriger Node mit Outline-Num.
+    BOOL GotoNextOutline();
+    BOOL GotoPrevOutline();
 
     /** Delivers the current shell cursor
 
@@ -672,55 +642,49 @@ public:
     const IBlockCursor* GetBlockCrsr() const { return pBlockCrsr; }
     IBlockCursor* GetBlockCrsr() { return pBlockCrsr; }
 
-        // ist der Crsr in einer Tabelle und ist die Selection ueber
-        // zwei Spalten
+    // is the Crsr in a table and is the selection over 2 columns
     BOOL IsTableMode() const { return 0 != pTblCrsr; }
 
-        // erfrage den Tabellen Crsr; ausserhalb von Tabellen immer 0
     const SwShellTableCrsr* GetTableCrsr() const { return pTblCrsr; }
     SwShellTableCrsr* GetTableCrsr() { return pTblCrsr; }
     USHORT UpdateTblSelBoxes();
 
-    BOOL GotoFtnTxt();      // springe aus dem Content zur Fussnote
-    BOOL GotoFtnAnchor();   // springe aus der Fussnote zum Anker
+    BOOL GotoFtnTxt();      // jump from content to footnote
+    BOOL GotoFtnAnchor();   // jump from footnote to anchor
     BOOL GotoPrevFtnAnchor();
     BOOL GotoNextFtnAnchor();
 
-    BOOL GotoFlyAnchor();       // springe aus dem Rahmen zum Anker
-    BOOL GotoHeaderTxt();       // springe aus dem Content zum Header
-    BOOL GotoFooterTxt();       // springe aus dem Content zum Footer
-    // springe in den Header/Footer des angegebenen oder akt. PageDesc
+    BOOL GotoFlyAnchor();       // jump from the frame to the anchor
+    BOOL GotoHeaderTxt();       // jump from the content to the header
+    BOOL GotoFooterTxt();       // jump from the content to the footer
+    // jump to the header/footer of the given or current PageDesc
     BOOL SetCrsrInHdFt( USHORT nDescNo = USHRT_MAX,
                             BOOL bInHeader = TRUE );
     // is point of cursor in header/footer. pbInHeader return TRUE if it is
     // in a headerframe otherwise in a footerframe
     BOOL IsInHeaderFooter( BOOL* pbInHeader = 0 ) const;
 
-    // springe zum naechsten Verzeichnis [mit dem Namen]
     BOOL GotoNextTOXBase( const String* = 0 );
-    // springe zum vorherigen Verzeichnis [mit dem Namen]
     BOOL GotoPrevTOXBase( const String* = 0 );
-    BOOL GotoTOXMarkBase();     // springe zum Verzeichnis vom TOXMark
-    // springe zum naechsten (vorherigen) Verzeichniseintrag
+    BOOL GotoTOXMarkBase();
+    // jump to the next or previous index entry
     BOOL GotoNxtPrvTOXMark( BOOL bNext = TRUE );
-    // Zur naechsten/ vorherigen Verzeichnismarke dieses Typs traveln
+    // jump to the next/previous index mark of this type
     const SwTOXMark& GotoTOXMark( const SwTOXMark& rStart, SwTOXSearch eDir );
 
-    // springe zum naechsten (vorherigen) Tabellenformel
-    // optional auch nur zu kaputten Formeln springen
+    // jump to the next or previous table formula
+    // optionally only to broken formulas
     BOOL GotoNxtPrvTblFormula( BOOL bNext = TRUE,
                                     BOOL bOnlyErrors = FALSE );
     // jump to the next / previous hyperlink - inside text and also
     // on graphics
     BOOL SelectNxtPrvHyperlink( BOOL bNext = TRUE );
 
-    // springe zu dieser Refmark
     BOOL GotoRefMark( const String& rRefMark, USHORT nSubType = 0,
                             USHORT nSeqNo = 0 );
 
-    // hole vom Start/Ende der akt. Selection das nte Zeichen
+    // get the nth character from the start or end of the  current selection
     sal_Unicode GetChar( BOOL bEnd = TRUE, long nOffset = 0 );
-    // erweiter die akt. Selection am Anfang/Ende um n Zeichen
     BOOL ExtendSelection( BOOL bEnd = TRUE, xub_StrLen nCount = 1 );
     // setze nur den sichtbaren Cursor an die angegebene Dokument-Pos.
     // returnt FALSE: wenn der ob der SPoint vom Layout korrigiert wurde.
@@ -728,18 +692,17 @@ public:
     BOOL SetVisCrsr( const Point &rPt );
     inline void UnSetVisCrsr();
 
-    // springe zum nachsten/vorherigen Feld des entsprechenden Types
+    // jump to the next or previous field of the corresponding type
     BOOL MoveFldType( const SwFieldType* pFldType, BOOL bNext,
                                             USHORT nSubType = USHRT_MAX,
                                             USHORT nResType = USHRT_MAX );
-    // springe genau zu diesem Feld
     BOOL GotoFld( const SwFmtFld& rFld );
 
     // returne die Anzahl der Cursor im Ring (Flag besagt ob man nur
     // aufgepspannte haben will - sprich etwas selektiert ist (Basic))
     USHORT GetCrsrCnt( BOOL bAll = TRUE ) const;
 
-    // Char Travelling - Methoden (in crstrvl1.cxx)
+    // Char Travelling - methods (in crstrvl1.cxx)
     BOOL GoStartWord();
     BOOL GoEndWord();
     BOOL GoNextWord();
@@ -751,7 +714,7 @@ public:
     BOOL SelectWord( const Point* pPt = 0 );
     BOOL ExpandToSentenceBorders();
 
-    // Position vom akt. Cursor erfragen
+    // get position from current cursor
     BOOL IsStartWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES )const;
     BOOL IsEndWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const;
     BOOL IsInWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const;
@@ -765,10 +728,10 @@ public:
     BOOL IsAtLeftMargin()   const       { return IsAtLRMargin( TRUE ); }
     BOOL IsAtRightMargin(BOOL bAPI = FALSE) const   { return IsAtLRMargin( FALSE, bAPI ); }
 
-    // loesche alle erzeugten Crsr, setze den Tabellen-Crsr und den letzten
-    // Cursor auf seinen TextNode (oder StartNode?).
-    // Beim naechsten ::GetCrsr werden sie wieder alle erzeugt.
-    // Wird fuers Drag&Drop/ClipBorad-Paste in Tabellen benoetigt.
+    // delete all created cursors, set the table cursor and the last cursor to
+    // its TextNode (or StartNode?)
+    // They all get created on the next ::GetCrsr again
+    // Used for Drag&Drop/Clipboard-Paste in tables
     BOOL ParkTblCrsr();
 
     // gibt es nicht aufgespannte Attribute?
@@ -776,7 +739,7 @@ public:
     void ClearGCAttr() { bGCAttr = FALSE; }
     void    UpdateAttr() {  bGCAttr = TRUE; }
 
-    // ist das gesamte Dokument geschuetzt/versteckt?? (fuer UI,..)
+    // is the whole document protected/hidden (for UI...)
     BOOL IsAllProtect() const { return bAllProtect; }
 
 #ifdef SW_CRSR_TIMER
@@ -787,13 +750,12 @@ public:
 
     BOOL BasicActionPend() const    { return nBasicActionCnt != nStartAction; }
 
-        // springe zum benannten Bereich
     BOOL GotoRegion( const String& rName );
 
-    // zeige die aktuelle Selektion an
+    // show the current selection
     virtual void MakeSelVisible();
 
-    // setzte den Cursor auf einen NICHT geschuetzten/versteckten Node
+    // set the cursor to a NOT protected/hidden node
     BOOL FindValidCntntNode( BOOL bOnlyText = FALSE );
 
     BOOL GetContentAtPos( const Point& rPt,
@@ -801,9 +763,7 @@ public:
                             BOOL bSetCrsr = FALSE,
                             SwRect* pFldRect = 0 );
 
-    // --> OD 2008-06-19 #i90516#
     const SwPostItField* GetPostItFieldAtCursor() const;
-    // <--
 
     // get smart tags at point position
     void GetSmartTagTerm( const Point& rPt,
@@ -819,7 +779,6 @@ public:
 
     BOOL IsPageAtPos( const Point &rPt ) const;
 
-        // Attribut selelktieren
     BOOL SelectTxtAttr( USHORT nWhich, BOOL bExpand, const SwTxtAttr* pAttr = 0 );
     BOOL GotoINetAttr( const SwTxtINetFmt& rAttr );
     const SwFmtINetFmt* FindINetAttr( const String& rName ) const;
@@ -829,8 +788,8 @@ public:
     void ClearTblBoxCntnt();
     BOOL EndAllTblBoxEdit();
 
-    // wird gerufen, wenn eine Tabellenselektion im UpdateCrsr erzeugt wird,
-    // ohne das die UI davon etaws weiss
+    // gets called when a table selection gets created in UpdateCrsr without
+    // the UI knowing of it
     virtual void NewCoreSelection();
 
     void SetSelTblCells( BOOL bFlag )           { bSelTblCells = bFlag; }
@@ -859,7 +818,6 @@ public:
     // remove all invalid cursors
     void ClearUpCrsrs();
 
-    // OD 11.02.2003 #100556# - set/get flag to allow/avoid execution of macros
     inline void SetMacroExecAllowed( const bool _bMacroExecAllowed )
     {
         mbMacroExecAllowed = _bMacroExecAllowed;
@@ -869,7 +827,6 @@ public:
         return mbMacroExecAllowed;
     }
 
-    // #111827#
     /**
        Returns textual description of the current selection.
 
@@ -884,7 +841,6 @@ public:
     SwRect GetRectOfCurrentChar();
 };
 
-
 // Cursor Inlines:
 inline SwMoveFnCollection* SwCrsrShell::MakeFindRange(
             USHORT nStt, USHORT nEnd, SwPaM* pPam ) const
diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx
index e3710a39c7df..00595afbcb8c 100644
--- a/sw/inc/crstate.hxx
+++ b/sw/inc/crstate.hxx
@@ -36,21 +36,21 @@
 
 enum SwFillMode
 {
-    FILL_TAB,       // default, Auffuellen mit Tabulatoren
-    FILL_SPACE,     // ... mit Tabulatoren und Spaces
-    FILL_MARGIN,    // nur links, zentriert, rechts Ausrichten
-    FILL_INDENT     // durch linken Absatzeinzug
+    FILL_TAB,       // default, fill with tabs
+    FILL_SPACE,     // fill with spaces and tabs
+    FILL_MARGIN,    // only align left, center, right
+    FILL_INDENT     // by left paragraph indention
 };
 
 struct SwFillCrsrPos
 {
-    SwRect aCrsr;           // Position und Groesse des Shadowcursors
-    USHORT nParaCnt;        // Anzahl der einzufuegenden Absaetze
-    USHORT nTabCnt;         // Anzahl der Tabs bzw. Groesse des Einzugs
-    USHORT nSpaceCnt;       // Anzahl der einzufuegenden Leerzeichen
-    USHORT nColumnCnt;      // Anzahl der notwendigen Spaltenumbrueche
-    sal_Int16 eOrient;      // Absatzausrichtung
-    SwFillMode eMode;       // Gewuenschte Auffuellregel
+    SwRect aCrsr;           // position and size of the ShadowCursor
+    USHORT nParaCnt;        // number of paragraphs to insert
+    USHORT nTabCnt;         // number of tabs respectively size of indentation
+    USHORT nSpaceCnt;       // number of spaces to insert
+    USHORT nColumnCnt;      // number of necessary column breaks
+    sal_Int16 eOrient;      // paragraph alignment
+    SwFillMode eMode;       // desired fill-up rule
     SwFillCrsrPos( SwFillMode eMd = FILL_TAB ) :
         nParaCnt( 0 ), nTabCnt( 0 ), nSpaceCnt( 0 ), nColumnCnt( 0 ),
         eOrient( com::sun::star::text::HoriOrientation::NONE ), eMode( eMd )
@@ -120,36 +120,35 @@ struct SwSpecialPos
     {}
 };
 
-// CrsrTravelling-Staties (fuer GetCrsrOfst)
+// CrsrTravelling-States (for GetCrsrOfst)
 enum CrsrMoveState
 {
     MV_NONE,            // default
     MV_UPDOWN,          // Crsr Up/Down
-    MV_RIGHTMARGIN,     // an rechten Rand
-    MV_LEFTMARGIN,      // an linken Rand
-    MV_SETONLYTEXT,     // mit dem Cursr nur im Text bleiben
-    MV_TBLSEL           // nicht in wiederholte Headlines
+    MV_RIGHTMARGIN,     // at right margin
+    MV_LEFTMARGIN,      // at left margin
+    MV_SETONLYTEXT,     // stay with the cursor inside text
+    MV_TBLSEL           // not in repeated headlines
 };
 
-// struct fuer spaetere Erweiterungen
+// struct for later extensions
 struct SwCrsrMoveState
 {
-    SwFillCrsrPos   *pFill;     // fuer das automatische Auffuellen mit Tabs etc.
+    SwFillCrsrPos   *pFill;     // for automatic filling with tabs etc
     Sw2LinesPos     *p2Lines;   // for selections inside/around 2line portions
     SwSpecialPos*   pSpecialPos; // for positions inside fields
-    Point aRealHeight;          // enthaelt dann die Position/Hoehe des Cursors
+    Point aRealHeight;          // contains then the position/height of the cursor
     CrsrMoveState eState;
     BYTE            nCursorBidiLevel;
     BOOL bStop          :1;
-    BOOL bRealHeight    :1;     // Soll die reale Hoehe berechnet werden?
-    BOOL bFieldInfo     :1;     // Sollen Felder erkannt werden?
-    BOOL bPosCorr       :1;     // Point musste korrigiert werden
-    BOOL bFtnNoInfo     :1;     // Fussnotennumerierung erkannt
-    BOOL bExactOnly     :1;     // GetCrsrOfst nur nach Exakten Treffern
-                                // suchen lassen, sprich niemals in das
-                                // GetCntntPos laufen.
-    BOOL bFillRet       :1;     // wird nur im FillModus temp. genutzt
-    BOOL bSetInReadOnly :1;     // ReadOnlyBereiche duerfen betreten werden
+    BOOL bRealHeight    :1;     // should the real height be calculated?
+    BOOL bFieldInfo     :1;     // should be fields recognized?
+    BOOL bPosCorr       :1;     // Point had to be corrected
+    BOOL bFtnNoInfo     :1;     // recognized footnote numbering
+    BOOL bExactOnly     :1;     // let GetCrsrOfst look for exact matches only,
+                                // i.e. never let it run into GetCntntPos
+    BOOL bFillRet       :1;     // only used temporary in FillMode
+    BOOL bSetInReadOnly :1;     // ReadOnly areas may be entered
     BOOL bRealWidth     :1;     // Calculation of the width required
     BOOL b2Lines        :1;     // Check 2line portions and fill p2Lines
     BOOL bNoScroll      :1;     // No scrolling of undersized textframes
@@ -184,7 +183,7 @@ struct SwCrsrMoveState
         b2Lines( FALSE ),
         bNoScroll( FALSE ),
         bPosMatchesBounds( FALSE ),
-        bCntntCheck( FALSE ), // --> FME 2005-05-13 #i43742# <--
+        bCntntCheck( FALSE ), // #i43742#
         bInFrontOfLabel( FALSE ), // #i27615#
         bInNumPortion(FALSE), // #i26726#
         nInNumPostionOffset(0) // #i26726#
@@ -205,7 +204,7 @@ struct SwCrsrMoveState
         b2Lines( FALSE ),
         bNoScroll( FALSE ),
         bPosMatchesBounds( FALSE ),
-        bCntntCheck( FALSE ), // --> FME 2005-05-13 #i43742# <--
+        bCntntCheck( FALSE ), // #i43742#
         bInFrontOfLabel( FALSE ), // #i27615#
         bInNumPortion(FALSE), // #i23726#
         nInNumPostionOffset(0) // #i23726#
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index 7cc143514541..01ccfc04bda4 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.hxx
@@ -132,7 +132,7 @@ public:
 inline  void SwDBField::SetExpansion(const String& rStr)
     { aContent = rStr; }
 
-// wird von UpdateExpFlds gesetzt (dort ist die Node-Position bekannt)
+// set from UpdateExpFlds (the Node-Position is known there)
 inline void SwDBField::ChgBodyTxtFlag( BOOL bIsInBody )
     { bIsInBodyTxt = bIsInBody; }
 
@@ -156,7 +156,7 @@ public:
     inline const SwDBData&  GetRealDBData() { return aDBData; }
 
     SwDBData                GetDBData(SwDoc* pDoc);
-    void                    SetDBData(const SwDBData& rDBData); // #111840#
+    void                    SetDBData(const SwDBData& rDBData);
 
     // Name oder Inhalt
     virtual String          GetCntnt(BOOL bName = FALSE) const;
@@ -166,7 +166,6 @@ public:
     virtual void            SetSubType(USHORT nType);
 };
 
-
 /*--------------------------------------------------------------------
     Beschreibung: Datenbankfeld Naechster Satz
  --------------------------------------------------------------------*/
@@ -179,7 +178,6 @@ public:
     virtual SwFieldType*    Copy() const;
 };
 
-
 /*--------------------------------------------------------------------
     Beschreibung: Naechsten Datensatz mit Bedingung
  --------------------------------------------------------------------*/
@@ -225,7 +223,6 @@ public:
     virtual SwFieldType*    Copy() const;
 };
 
-
 /*--------------------------------------------------------------------
     Beschreibung: Datensatz mit Nummer xxx
                   Die Nummer steht in nFormat
@@ -335,7 +332,6 @@ inline long SwDBSetNumberField::GetSetNumber() const
 inline void SwDBSetNumberField::SetSetNumber(long nNum)
     { nNumber = nNum; }
 
-
 #endif // _DBFLD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx
index ce751a65f4d7..db18da0216ef 100644
--- a/sw/inc/dbgoutsw.hxx
+++ b/sw/inc/dbgoutsw.hxx
@@ -82,7 +82,6 @@ SW_DLLPUBLIC const char * dbg_out(const SfxPoolItem & rItem);
 SW_DLLPUBLIC const char * dbg_out(const SfxPoolItem * pItem);
 SW_DLLPUBLIC const char * dbg_out(const SfxItemSet & rSet);
 SW_DLLPUBLIC const char * dbg_out(SwNodes & rNodes);
-// const char * dbg_out(SwOutlineNodes & rNodes);
 SW_DLLPUBLIC const char * dbg_out(const SwPosition & rPos);
 SW_DLLPUBLIC const char * dbg_out(const SwPaM & rPam);
 SW_DLLPUBLIC const char * dbg_out(const SwNodeNum & rNum);
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index e7feeb92e69a..29b4327ab2ae 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -83,7 +83,7 @@
 // Bitmaps ------------------------------------------------------------------
 
 
-// Elemente -----------------------------------------------------------------
+// Elements -----------------------------------------------------------------
 
 #define TLB_DBLIST          1
 #define BTN_OK              2
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index b49f241a0538..0af79aba1a53 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -29,14 +29,10 @@
 #define _DCONTACT_HXX
 
 #include <svx/svdobj.hxx>
-// OD 14.05.2003 #108784#
 #include <svx/svdovirt.hxx>
-// OD 2004-01-16 #110582#
 #include <swtypes.hxx>
 #include <fmtanchr.hxx>
 #include <frmfmt.hxx>
-
-// OD 17.06.2003 #108784#
 #include <list>
 
 #include "calbck.hxx"
@@ -51,12 +47,10 @@ class SwVirtFlyDrawObj;
 class SwFmtAnchor;
 class SwFlyDrawObj;
 class SwRect;
-// OD 17.06.2003 #108784# - forward declaration for class <SwDrawVirtObj>
+// forward declaration for class <SwDrawVirtObj>
 class SwDrawContact;
-// OD 2004-01-16 #110582#
 struct SwPosition;
 class SwIndex;
-// OD 2004-03-25 #i26791#
 #include <anchoreddrawobject.hxx>
 
 //Der Umgekehrte Weg: Sucht das Format zum angegebenen Objekt.
@@ -77,12 +71,9 @@ void setContextWritingMode( SdrObject* pObj, SwFrm* pAnchor );
 void ClrContourCache( const SdrObject *pObj );
 
 // liefert BoundRect inklusive Abstand
-// --> OD 2006-08-15 #i68520# - change naming
 SwRect GetBoundRectOfAnchoredObj( const SdrObject* pObj );
-// <--
 
 //Liefert den UserCall ggf. vom Gruppenobjekt
-// OD 2004-03-31 #i26791# - change return type
 SwContact* GetUserCall( const SdrObject* );
 
 // liefert TRUE falls das SrdObject ein Marquee-Object (Lauftext) ist
@@ -91,14 +82,13 @@ BOOL IsMarqueeTextObj( const SdrObject& rObj );
 //Basisklasse fuer die folgenden KontaktObjekte (Rahmen+Zeichenobjekte)
 class SwContact : public SdrObjUserCall, public SwClient
 {
-    // OD 05.09.2003 #112039# - boolean, indicating destruction of contact object
+    // boolean, indicating destruction of contact object
     // important note: boolean has to be set at the beginning of each destructor
     //                 in the subclasses using method <SetInDTOR()>.
     bool mbInDTOR;
 
     /** method to move object to visible/invisible layer
 
-        OD 21.08.2003 #i18447#
         Implementation for the public method <MoveObjToVisibleLayer(..)>
         and <MoveObjToInvisibleLayer(..)>
         If object is in invisble respectively visible layer, its moved to
@@ -108,7 +98,6 @@ class SwContact : public SdrObjUserCall, public SwClient
         aren't on the same layer as the group object, and
         <SdrObjGroup::SetLayer(..)|NbcSetLayer(..)> sets also the layer of
         the members.
-        OD 2004-01-15 #110582# - moved from subclass <SwDrawContact>
 
         @author OD
 
@@ -124,7 +113,6 @@ class SwContact : public SdrObjUserCall, public SwClient
                           SdrObject* _pDrawObj );
 
 protected:
-    // OD 05.09.2003 #112039# - accessor to set member <mbInDTOR>
     void SetInDTOR();
 
 public:
@@ -134,12 +122,9 @@ public:
     SwContact( SwFrmFmt *pToRegisterIn );
     virtual ~SwContact();
 
-    // OD 2004-03-29 #i26791#
     virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const = 0;
     virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj ) = 0;
 
-    // OD 13.05.2003 #108784# - made methods virtual and not inline
-    // OD 2004-04-01 #i26791# - made methods pure virtual
     virtual const SdrObject *GetMaster() const = 0;
     virtual SdrObject *GetMaster() = 0;
     virtual void SetMaster( SdrObject* _pNewMaster ) = 0;
@@ -148,14 +133,11 @@ public:
     const SwFrmFmt  *GetFmt() const
         { return (const SwFrmFmt*)GetRegisteredIn(); }
 
-    // OD 05.09.2003 #112039# - accessor for member <mbInDTOR>
     bool IsInDTOR() const;
 
     /** method to move drawing object to corresponding visible layer
 
-        OD 21.08.2003 #i18447#
         uses method <_MoveObjToLayer(..)>
-        OD 2004-01-15 #110582# - moved from subclass <SwDrawContact> and made virtual
 
         @author OD
 
@@ -166,9 +148,7 @@ public:
 
     /** method to move drawing object to corresponding invisible layer
 
-        OD 21.08.2003 #i18447#
         uses method <_MoveObjToLayer(..)>
-        OD 2004-01-15 #110582# - moved from subclass <SwDrawContact> and made virtual.
 
         @author OD
 
@@ -178,11 +158,11 @@ public:
     virtual void MoveObjToInvisibleLayer( SdrObject* _pDrawObj );
 
     // -------------------------------------------------------------------------
-    // OD 2004-01-16 #110582# - some virtual helper methods for information
+    // some virtual helper methods for information
     // about the object (Writer fly frame resp. drawing object)
     const SwFmtAnchor& GetAnchorFmt() const
     {
-        ASSERT( GetFmt(),
+        OSL_ENSURE( GetFmt(),
                 "<SwContact::GetAnchorFmt()> - no frame format -> crash" );
 
         return GetFmt()->GetAnchor();
@@ -197,7 +177,7 @@ public:
 
     const SwPosition&  GetCntntAnchor() const
     {
-        ASSERT( GetAnchorFmt().GetCntntAnchor(),
+        OSL_ENSURE( GetAnchorFmt().GetCntntAnchor(),
                 "<SwContact::GetCntntAnchor()> - no content anchor -> crash" );
 
         return *(GetAnchorFmt().GetCntntAnchor());
@@ -209,25 +189,16 @@ public:
 
     /** get data collection of anchored objects, handled by with contact
 
-        OD 2004-08-23 #110810#
-
-        @author
     */
     virtual void GetAnchoredObjs( std::vector<SwAnchoredObject*>& _roAnchoredObjs ) const = 0;
 
     /** get minimum order number of anchored objects handled by with contact
 
-        OD 2004-08-24 #110810#
-
-        @author
     */
     sal_uInt32 GetMinOrdNum() const;
 
     /** get maximum order number of anchored objects handled by with contact
 
-        OD 2004-08-24 #110810#
-
-        @author
     */
     sal_uInt32 GetMaxOrdNum() const;
 };
@@ -238,12 +209,10 @@ public:
 class SW_DLLPUBLIC SwFlyDrawContact : public SwContact
 {
 private:
-    // OD 2004-04-01 #i26791#
     SwFlyDrawObj* mpMasterObj;
 
     /** method to determine new order number for new instance of <SwVirtFlyDrawObj>
 
-        OD 2004-08-16 #i27030#
         Used in method <CreateNewRef(..)>.
 
         @author OD
@@ -257,21 +226,19 @@ public:
     SwFlyDrawContact( SwFlyFrmFmt* pToRegisterIn, SdrModel* pMod );
     virtual ~SwFlyDrawContact();
 
-    // OD 2004-03-29 #i26791#
     virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const;
     virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj );
 
-    // OD 2004-04-01 #i26791#
     virtual const SdrObject* GetMaster() const;
     virtual SdrObject* GetMaster();
     virtual void SetMaster( SdrObject* _pNewMaster );
 
     SwVirtFlyDrawObj* CreateNewRef( SwFlyFrm* pFly );
 
-    // virtuelle Methoden von SwClient
+    // virtual methods from SwClient
     virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew );
 
-    // OD 2004-01-16 #110582# - override methods to control Writer fly frames,
+    // override methods to control Writer fly frames,
     // which are linked, and to assure that all objects anchored at/inside the
     // Writer fly frame are also made visible/invisible.
     virtual void MoveObjToVisibleLayer( SdrObject* _pDrawObj );
@@ -279,20 +246,17 @@ public:
 
     /** get data collection of anchored objects handled by with contact
 
-        OD 2004-08-23 #110810#
-
-        @author
     */
     virtual void GetAnchoredObjs( std::vector<SwAnchoredObject*>& _roAnchoredObjs ) const;
 };
 
-// OD 16.05.2003 #108784# - new class for re-direct methods calls at a 'virtual'
+// new class for re-direct methods calls at a 'virtual'
 //      drawing object to its referenced object.
 class SwDrawVirtObj : public SdrVirtObj
 {
     private:
         // data for connection to writer layout
-        // OD 2004-03-25 #i26791# - anchored drawing object instance for the
+        // anchored drawing object instance for the
         // 'virtual' drawing object
         SwAnchoredDrawObject maAnchoredDrawObj;
 
@@ -317,14 +281,12 @@ class SwDrawVirtObj : public SdrVirtObj
         virtual ~SwDrawVirtObj();
 
         // access to offset
-        // OD 30.06.2003 #108784# - virtual!!!
         virtual const Point GetOffset() const;
 
         virtual SdrObject* Clone() const;
         virtual void operator=( const SdrObject& rObj );
 
         // connection to writer layout
-        // OD 2004-03-29 #i26791#
         const SwAnchoredObject* GetAnchoredObj() const;
         SwAnchoredObject* AnchoredObj();
         const SwFrm* GetAnchorFrm() const;
@@ -341,7 +303,6 @@ class SwDrawVirtObj : public SdrVirtObj
 
         virtual void NbcSetAnchorPos(const Point& rPnt);
 
-        // #108784#
         // All overloaded methods which need to use the offset
         virtual void RecalcBoundRect();
         virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const;
@@ -369,10 +330,8 @@ class SwDrawVirtObj : public SdrVirtObj
         virtual Point GetPoint(sal_uInt32 i) const;
         virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i);
 
-        // #108784#
         virtual bool HasTextEdit() const;
 
-        // OD 17.06.2003 #108784# - overload 'layer' methods
         virtual SdrLayerID GetLayer() const;
         virtual void NbcSetLayer(SdrLayerID nLayer);
         virtual void SetLayer(SdrLayerID nLayer);
@@ -381,43 +340,38 @@ class SwDrawVirtObj : public SdrVirtObj
         virtual bool supportsFullDrag() const;
         virtual SdrObject* getFullDragClone() const;
 
-        // #i97197#
         virtual void SetBoundRectDirty();
         virtual const Rectangle& GetCurrentBoundRect() const;
         virtual const Rectangle& GetLastBoundRect() const;
 };
 
-// OD 26.06.2003 #108784#
 bool CheckControlLayer( const SdrObject *pObj );
 
 //KontactObjekt fuer die Verbindung von Formaten als Repraesentanten der
 //Zeichenobjekte im StarWriter (SwClient) und den Objekten selbst im Drawing
 //(SdrObjUserCall).
 
-// --> OD 2006-01-18 #129959#
 class NestedUserCallHdl;
-// <--
 
 class SwDrawContact : public SwContact
 {
     private:
-        // OD 2004-03-25 #i26791# - anchored drawing object instance for the
+        // anchored drawing object instance for the
         // 'master' drawing object
         SwAnchoredDrawObject maAnchoredDrawObj;
 
-        // OD 16.05.2003 #108784# - data structure for collecting 'virtual'
+        // data structure for collecting 'virtual'
         // drawing object supporting drawing objects in headers/footers.
         std::list<SwDrawVirtObj*> maDrawVirtObjs;
 
-        // OD 2004-04-01 #i26791# - boolean indicating set 'master' drawing
+        // boolean indicating set 'master' drawing
         // object has been cleared.
         bool mbMasterObjCleared : 1;
 
-        // OD 10.10.2003 #112299# - internal flag to indicate that disconnect
+        // internal flag to indicate that disconnect
         // from layout is in progress
         bool mbDisconnectInProgress : 1;
 
-        // --> OD 2006-01-18 #129959#
         // Needed data for handling of nested <SdrObjUserCall> events in
         // method <_Changed(..)>
         bool mbUserCallActive : 1;
@@ -426,7 +380,6 @@ class SwDrawContact : public SwContact
         SdrUserCallType meEventTypeOfCurrentUserCall;
 
         friend class NestedUserCallHdl;
-        // <--
 
         // unary function used by <list> iterator to find a disconnected 'virtual'
         // drawing object
@@ -456,41 +409,32 @@ class SwDrawContact : public SwContact
             bool operator() ( const SwDrawVirtObj* _pDrawVirtObj );
         };
 
-        // OD 16.05.2003 #108784# - method for adding/removing 'virtual' drawing object.
+        // method for adding/removing 'virtual' drawing object.
         SwDrawVirtObj* CreateVirtObj();
         void DestroyVirtObj( SwDrawVirtObj* pVirtObj );
         void RemoveAllVirtObjs();
 
-        // OD 2004-03-31 #i26791#
         void _InvalidateObjs( const bool _bUpdateSortedObjsList = false );
 
-        // --> OD 2006-01-23 #124157#
         // no copy-constructor and no assignment operator
         SwDrawContact( const SwDrawContact& );
         SwDrawContact& operator=( const SwDrawContact& );
-        // <--
     public:
         TYPEINFO();
 
         SwDrawContact( SwFrmFmt *pToRegisterIn, SdrObject *pObj );
         virtual ~SwDrawContact();
 
-        // OD 2004-03-29 #i26791#
-        // --> OD 2005-01-06 #i30669# - no default value for parameter <_pSdrObj>
         virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const;
         virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj );
-        // <--
 
-        // OD 2004-04-01 #i26791#
         virtual const SdrObject* GetMaster() const;
         virtual SdrObject* GetMaster();
         virtual void SetMaster( SdrObject* _pNewMaster );
 
-        // OD 2004-03-29 #i26791#
         const SwFrm* GetAnchorFrm( const SdrObject* _pDrawObj = 0L ) const;
         SwFrm* GetAnchorFrm( SdrObject* _pDrawObj = 0L );
 
-        // --> OD 2004-06-30 #i28701# - page frame is now stored at member <maAnchoredDrawObj>
         inline const SwPageFrm* GetPageFrm() const
         {
             return maAnchoredDrawObj.GetPageFrm();
@@ -503,7 +447,6 @@ class SwDrawContact : public SwContact
         {
             return maAnchoredDrawObj.SetPageFrm( _pNewPageFrm );
         }
-        // <--
         void ChkPage();
         SwPageFrm* FindPage( const SwRect &rRect );
 
@@ -511,15 +454,15 @@ class SwDrawContact : public SwContact
         //Der Anker wird Anhand des Attributes SwFmtAnchor bestimmt.
         //Das Objekt wird ggf. beim alten Anker abgemeldet.
         void ConnectToLayout( const SwFmtAnchor *pAnch = 0 );
-        // OD 27.06.2003 #108784# - method to insert 'master' drawing object
+        // method to insert 'master' drawing object
         // into drawing page
         void InsertMasterIntoDrawPage();
 
         void DisconnectFromLayout( bool _bMoveMasterToInvisibleLayer = true );
-        // OD 19.06.2003 #108784# - disconnect for a dedicated drawing object -
+        // disconnect for a dedicated drawing object -
         // could be 'master' or 'virtual'.
         void DisconnectObjFromLayout( SdrObject* _pDrawObj );
-        // OD 26.06.2003 #108784# - method to remove 'master' drawing object
+        // method to remove 'master' drawing object
         // from drawing page.
         // To be used by the undo for delete of object. Call it after method
         // <DisconnectFromLayout( bool = true )> is already performed.
@@ -527,7 +470,7 @@ class SwDrawContact : public SwContact
         // drawing object from drawing page.
         void RemoveMasterFromDrawPage();
 
-        // OD 19.06.2003 #108784# - get drawing object ('master' or 'virtual')
+        // get drawing object ('master' or 'virtual')
         // by frame.
         SdrObject* GetDrawObjectByAnchorFrm( const SwFrm& _rAnchorFrm );
 
@@ -544,17 +487,12 @@ class SwDrawContact : public SwContact
         //Moved alle SW-Verbindungen zu dem neuen Master.
         void ChangeMasterObject( SdrObject *pNewMaster );
 
-        // OD 19.06.2003 #108784#
         SwDrawVirtObj* AddVirtObj();
 
-        // OD 20.06.2003 #108784#
         void NotifyBackgrdOfAllVirtObjs( const Rectangle* pOldBoundRect );
 
         /** get data collection of anchored objects, handled by with contact
 
-            OD 2004-08-23 #110810#
-
-            @author
         */
         virtual void GetAnchoredObjs( std::vector<SwAnchoredObject*>& _roAnchoredObjs ) const;
 };
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index ebdb3be92dae..5160ab395318 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -47,15 +47,13 @@
 #include <IDocumentLayoutAccess.hxx>
 #include <IDocumentTimerAccess.hxx>
 #include <IDocumentChartDataProviderAccess.hxx>
-// --> OD 2007-10-26 #i83479#
 #include <IDocumentOutlineNodes.hxx>
 #include <IDocumentListItems.hxx>
 #include <set>
-// <--
-// --> OD 2008-03-12 #refactorlists#
+
 #include <IDocumentListsAccess.hxx>
 class SwList;
-// <--
+
 #include <IDocumentExternalData.hxx>
 #define _SVSTDARR_STRINGSDTOR
 #include <svl/svstdarr.hxx>
@@ -251,7 +249,7 @@ namespace sfx2 {
 typedef SwPageDesc* SwPageDescPtr;
 SV_DECL_PTRARR_DEL( SwPageDescs, SwPageDescPtr, 4, 4 )
 
-// forward declartion
+// forward declaration
 void SetAllScriptItem( SfxItemSet& rSet, const SfxPoolItem& rItem );
 
 // global function to start grammar checking in the document
@@ -274,13 +272,9 @@ class SW_DLLPUBLIC SwDoc :
     public IDocumentLayoutAccess,
     public IDocumentTimerAccess,
     public IDocumentChartDataProviderAccess,
-    // --> OD 2007-10-26 #i83479#
     public IDocumentListItems,
     public IDocumentOutlineNodes,
-    // <--
-    // --> OD 2008-03-12 #refactorlists#
     public IDocumentListsAccess,
-    // <--
     public IDocumentExternalData
 {
 
@@ -290,11 +284,10 @@ class SW_DLLPUBLIC SwDoc :
     //---------------- private Member --------------------------------
 
     // -------------------------------------------------------------------
-    // die Objecte
-    SwNodes     aNodes;                 // Inhalt des Dokumentes
-    SwNodes     aUndoNodes;             // Inhalt fuer das Undo
-    SwAttrPool* mpAttrPool;             // der Attribut Pool
-    SwPageDescs aPageDescs;             // PageDescriptoren
+    SwNodes     aNodes;                 // document content
+    SwNodes     aUndoNodes;             // content for undo
+    SwAttrPool* mpAttrPool;             // attribute pool
+    SwPageDescs aPageDescs;             // PageDescriptors
     Link        aOle2Link;              // OLE 2.0-Benachrichtigung
     /* @@@MAINTAINABILITY-HORROR@@@
        Timer should not be members of the model
@@ -316,13 +309,13 @@ class SW_DLLPUBLIC SwDoc :
     // die Pointer
                                 //Defaultformate
     SwFrmFmt        *pDfltFrmFmt;
-     SwFrmFmt       *pEmptyPageFmt;     // Format fuer die Default-Leerseite.
+     SwFrmFmt       *pEmptyPageFmt;     // Format for the default empty page
     SwFrmFmt        *pColumnContFmt;    // Format fuer Spaltencontainer
     SwCharFmt       *pDfltCharFmt;
     SwTxtFmtColl    *pDfltTxtFmtColl;   // Defaultformatcollections
     SwGrfFmtColl    *pDfltGrfFmtColl;
 
-    SwFrmFmts       *pFrmFmtTbl;        // Formattabellen
+    SwFrmFmts       *pFrmFmtTbl;        // Format table
     SwCharFmts      *pCharFmtTbl;
     SwSpzFrmFmts    *pSpzFrmFmtTbl;
     SwSectionFmts   *pSectionFmtTbl;
@@ -375,13 +368,11 @@ class SW_DLLPUBLIC SwDoc :
     // Hash map to find numrules by name
     mutable std::hash_map<String, SwNumRule *, StringHash> maNumRuleMap;
 
-    // --> OD 2008-03-12 #refactorlists#
     typedef std::hash_map< String, SwList*, StringHash > tHashMapForLists;
     // container to hold the lists of the text document
     tHashMapForLists maLists;
     // relation between list style and its default list
     tHashMapForLists maListStyleLists;
-    // <--
 
     SwRedlineTbl    *pRedlineTbl;           // Liste aller Redlines
     String          *pAutoFmtRedlnComment;  // Kommentar fuer Redlines, die
@@ -410,7 +401,6 @@ class SW_DLLPUBLIC SwDoc :
     rtl::Reference<SvxForbiddenCharactersTable> xForbiddenCharsTable;
     com::sun::star::uno::Reference< com::sun::star::script::vba::XVBAEventProcessor > mxVbaEvents;
     com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> m_xTemplateToProjectCache;
-    // --> OD 2007-10-26 #i83479#
 public:
     struct lessThanNodeNum
     {
@@ -421,13 +411,12 @@ public:
     typedef ::std::set< const SwNodeNum*, lessThanNodeNum > tImplSortedNodeNumList;
 private:
     tImplSortedNodeNumList* mpListItemsList;
-    // <--
 
     ::std::auto_ptr< ::sfx2::IXmlIdRegistry > m_pXmlIdRegistry;
 
     // -------------------------------------------------------------------
-    // sonstige
-    sal_uInt16  nUndoPos;           // akt. Undo-InsertPosition (fuers Redo!)
+    // other
+    sal_uInt16  nUndoPos;           // akt. Undo-InsertPosition (for Redo!)
     sal_uInt16  nUndoSavePos;       // Position im Undo-Array, ab der das Doc
                                     // nicht als modifiziert gilt
     sal_uInt16  nUndoCnt;           // Anzahl von Undo Aktionen
@@ -494,24 +483,22 @@ private:
     bool mbPurgeOLE              : 1;    // TRUE: Purge OLE-Objects
     bool mbKernAsianPunctuation  : 1;    // TRUE: kerning also for ASIAN punctuation
     bool mbReadlineChecked       : 1;    // TRUE: if the query was already shown
-    bool mbLinksUpdated          : 1;    // OD 2005-02-11 #i38810#
+    bool mbLinksUpdated          : 1;    // #i38810#
                                          // flag indicating, that the links have been updated.
     bool mbClipBoard             : 1;    // true: this document represents the clipboard
     bool mbColumnSelection       : 1;    // true: this content has bee created by a column selection
                                          //       (clipboard docs only)
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     bool mbXMLExport : 1;                // TRUE: during XML export
 #endif
 
-    // --> OD 2006-03-21 #b6375613#
     // Document flag to trigger conversion, which applys the workaround for documents,
     // which uses a certain layout defect in OOo 1.x to layout the documents.
     // This conversion is performed, when the frames for the layout are created.
     // Thus, this document flag has to be set after load a document and before
     // creating the document view.
     bool mbApplyWorkaroundForB6375613 : 1;
-    // <--
 
     //
     // COMPATIBILITY FLAGS START
@@ -581,32 +568,31 @@ private:
     bool mbAddFlyOffsets                    : 1;
     bool mbAddExternalLeading               : 1;
     bool mbUseHiResolutionVirtualDevice     : 1;
-    bool mbOldLineSpacing                   : 1;    // OD  2004-01-06 #i11859#
-    bool mbAddParaSpacingToTableCells       : 1;    // OD  2004-02-16 #106629#
-    bool mbUseFormerObjectPos               : 1;    // OD  2004-03-12 #i11860#
-    bool mbUseFormerTextWrapping            : 1;    // FME 2005-05-11 #108724#
-    bool mbConsiderWrapOnObjPos             : 1;    // OD  2004-05-05 #i28701#
+    bool mbOldLineSpacing                   : 1;    // #i11859#
+    bool mbAddParaSpacingToTableCells       : 1;
+    bool mbUseFormerObjectPos               : 1;    // #i11860#
+    bool mbUseFormerTextWrapping            : 1;
+    bool mbConsiderWrapOnObjPos             : 1;    // #i28701#
                                                     // TRUE: object positioning algorithm has consider the wrapping style of                                                    //       the floating screen objects as given by its attribute 'WrapInfluenceOnObjPos'
 
     // non-ui-compatibility flags:
-    bool mbOldNumbering                             : 1;   // HBRINKM #111955#
-    bool mbIgnoreFirstLineIndentInNumbering         : 1;   // FME 2005-05-30# i47448#
-    bool mbDoNotJustifyLinesWithManualBreak         : 1;   // FME 2005-06-08 #i49277#
-    bool mbDoNotResetParaAttrsForNumFont            : 1;   // FME 2005-08-11 #i53199#
-    bool mbTableRowKeep                             : 1;   // FME 2006-02-10 #131283#
-    bool mbIgnoreTabsAndBlanksForLineCalculation    : 1;   // FME 2006-03-01 #i3952#
-    bool mbDoNotCaptureDrawObjsOnPage               : 1;   // OD 2006-03-14 #i62875#
+    bool mbOldNumbering                             : 1;
+    bool mbIgnoreFirstLineIndentInNumbering         : 1;   // #i47448#
+    bool mbDoNotJustifyLinesWithManualBreak         : 1;   // #i49277#
+    bool mbDoNotResetParaAttrsForNumFont            : 1;   // #i53199#
+    bool mbTableRowKeep                             : 1;
+    bool mbIgnoreTabsAndBlanksForLineCalculation    : 1;   // #i3952#
+    bool mbDoNotCaptureDrawObjsOnPage               : 1;   // #i62875#
     bool mbOutlineLevelYieldsOutlineRule            : 1;
-    bool mbClipAsCharacterAnchoredWriterFlyFrames   : 1;   // OD 2006-04-13 #b6402800#
-    bool mbUnixForceZeroExtLeading                  : 1;   // FME 2006-10-09 #i60945#
-    bool mbOldPrinterMetrics                        : 1;   // FME 2007-05-14 #147385#
+    bool mbClipAsCharacterAnchoredWriterFlyFrames   : 1;   // #b6402800#
+    bool mbUnixForceZeroExtLeading                  : 1;   // #i60945#
+    bool mbOldPrinterMetrics                        : 1;
     bool mbTabRelativeToIndent                      : 1;   // #i24363# tab stops relative to indent
     bool mbProtectForm                              : 1;
     bool mbInvertBorderSpacing                      : 1;
     bool mbCollapseEmptyCellPara                    : 1;
-    bool mbTabAtLeftIndentForParagraphsInList;             // OD 2008-06-05 #i89181# - see above
+    bool mbTabAtLeftIndentForParagraphsInList;             // #i89181# - see above
 
-    // #i78591#
     sal_uInt32  n32DummyCompatabilityOptions1;
     sal_uInt32  n32DummyCompatabilityOptions2;
     //
@@ -618,7 +604,7 @@ private:
     static SwAutoCompleteWord *pACmpltWords;    // Liste aller Worte fuers AutoComplete
     static sal_uInt16 nUndoActions;     // anzahl von Undo ::com::sun::star::chaos::Action
 
-    //---------------- private Methoden ------------------------------
+    //---------------- private Methods ------------------------------
     void checkRedlining(RedlineMode_t& _rReadlineMode);
 
     sal_Bool DelUndoObj( sal_uInt16 nEnde  );   // loescht alle UndoObjecte vom Anfang
@@ -649,9 +635,7 @@ private:
                             const bool bCopyFlyAtFly = false ) const;
     sal_Int8 SetFlyFrmAnchor( SwFrmFmt& rFlyFmt, SfxItemSet& rSet, sal_Bool bNewFrms );
 
-    // --> OD 2005-01-13 #i40550#
     typedef SwFmt* (SwDoc:: *FNCopyFmt)( const String&, SwFmt*, BOOL, BOOL );
-    // <--
     SwFmt* CopyFmt( const SwFmt& rFmt, const SvPtrarr& rFmtArr,
                         FNCopyFmt fnCopyFmt, const SwFmt& rDfltFmt );
     void CopyFmtArr( const SvPtrarr& rSourceArr, SvPtrarr& rDestArr,
@@ -698,8 +682,7 @@ private:
     // falls keine angegeben ist, nehme die Kapitelvorlage der 1. Ebene
     sal_Bool SplitDoc( sal_uInt16 eDocType, const String& rPath,
                         const SwTxtFmtColl* pSplitColl );
-    sal_Bool SplitDoc( sal_uInt16 eDocType, const String& rPath, int nOutlineLevel = 0 ); //#outline level,add by zhaijianwei.
-
+    sal_Bool SplitDoc( sal_uInt16 eDocType, const String& rPath, int nOutlineLevel = 0 );
 
     // Charts der angegebenen Tabelle updaten
     void _UpdateCharts( const SwTable& rTbl, ViewShell& rVSh ) const;
@@ -839,7 +822,6 @@ public:
     virtual void setUndoNoModifiedPosition( SwUndoNoModifiedPosition );
     virtual SwUndoNoModifiedPosition getUndoNoModifiedPosition() const;
 
-
     /** abfragen/setzen der Anzahl von wiederherstellbaren Undo-Actions */
     static sal_uInt16 GetUndoActionCount();
     static void SetUndoActionCount(sal_uInt16 nNew);
@@ -905,12 +887,11 @@ public:
     virtual void DeleteSection(SwNode* pNode);
     virtual bool DeleteRange(SwPaM&);
     virtual bool DelFullPara(SwPaM&);
-    // --> OD 2009-08-20 #i100466#
     // Add optional parameter <bForceJoinNext>, default value <false>
     // Needed for hiding of deletion redlines
     virtual bool DeleteAndJoin( SwPaM&,
                                 const bool bForceJoinNext = false );
-    // <--
+
     virtual bool MoveRange(SwPaM&, SwPosition&, SwMoveFlags);
     virtual bool MoveNodeRange(SwNodeRange&, SwNodeIndex&, SwMoveFlags);
     virtual bool MoveAndJoin(SwPaM&, SwPosition&, SwMoveFlags);
@@ -1020,8 +1001,6 @@ public:
     virtual SwChartLockController_Helper & GetChartControllerHelper();
 
     /** IDocumentListItems
-
-        OD 2007-10-26 #i83479#
     */
     virtual void addListItem( const SwNodeNum& rNodeNum );
     virtual void removeListItem( const SwNodeNum& rNodeNum );
@@ -1032,8 +1011,6 @@ public:
     virtual void getNumItems( IDocumentListItems::tSortedNodeNumList& orNodeNumList ) const;
 
     /** IDocumentOutlineNodes
-
-        OD 2007-11-15 #i83479#
     */
     virtual sal_Int32 getOutlineNodesCount() const;
     virtual int getOutlineLevel( const sal_Int32 nIdx ) const;
@@ -1044,8 +1021,6 @@ public:
     virtual void getOutlineNodes( IDocumentOutlineNodes::tSortedOutlineNodeList& orOutlineNodeList ) const;
 
     /** IDocumentListsAccess
-
-        OD 2008-03-26 #refactorlists#
     */
     virtual SwList* createList( String sListId,
                                 const String sDefaultListStyleName );
@@ -1054,17 +1029,14 @@ public:
     virtual SwList* createListForListStyle( const String sListStyleName );
     virtual SwList* getListForListStyle( const String sListStyleName ) const;
     virtual void deleteListForListStyle( const String sListStyleName );
-    // --> OD 2008-07-08 #i91400#
     virtual void trackChangeOfListStyleName( const String sListStyleName,
                                              const String sNewListStyleName );
-    // <--
 
     /** IDocumentExternalData */
     virtual void setExternalData(::sw::tExternalDataType eType,
                                  ::sw::tExternalDataPointer pPayload);
     virtual ::sw::tExternalDataPointer getExternalData(::sw::tExternalDataType eType);
 
-
     /** INextInterface here
     */
 
@@ -1075,9 +1047,9 @@ public:
     */
     bool IsOLEPrtNotifyPending() const  { return mbOLEPrtNotifyPending; }
     inline void SetOLEPrtNotifyPending( bool bSet = true );
-    void PrtOLENotify( sal_Bool bAll ); //Alle oder nur Markierte
+    void PrtOLENotify( sal_Bool bAll ); //All or only marked
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     bool InXMLExport() const            { return mbXMLExport; }
     void SetXMLExport( bool bFlag )     { mbXMLExport = bFlag; }
 #endif
@@ -1094,11 +1066,11 @@ public:
     SwFlyFrmFmt  *MakeFlyFrmFmt (const String &rFmtName, SwFrmFmt *pDerivedFrom);
     SwDrawFrmFmt *MakeDrawFrmFmt(const String &rFmtName, SwFrmFmt *pDerivedFrom);
 
-    // JP 08.05.98: fuer Flys muss jetzt diese Schnittstelle benutzt
-    //              werden. pAnchorPos muss gesetzt sein, wenn keine
-    //              Seitenbindung vorliegt UND der ::com::sun::star::chaos::Anchor nicht schon
-    //              im FlySet/FrmFmt mit gueltiger CntntPos gesetzt ist
-    /* #109161# new parameter bCalledFromShell
+    // fuer Flys muss jetzt diese Schnittstelle benutzt
+    // werden. pAnchorPos muss gesetzt sein, wenn keine
+    // Seitenbindung vorliegt UND der ::com::sun::star::chaos::Anchor nicht schon
+    // im FlySet/FrmFmt mit gueltiger CntntPos gesetzt ist
+    /* new parameter bCalledFromShell
 
        TRUE: An existing adjust item at pAnchorPos is propagated to
        the content node of the new fly section. That propagation only
@@ -1127,16 +1099,14 @@ public:
 
     sal_Bool SetFrmFmtToFly( SwFrmFmt& rFlyFmt, SwFrmFmt& rNewFmt,
                         SfxItemSet* pSet = 0, sal_Bool bKeepOrient = sal_False );
-    // --> OD 2009-07-20 #i73249#
     void SetFlyFrmTitle( SwFlyFrmFmt& rFlyFrmFmt,
                          const String& sNewTitle );
     void SetFlyFrmDescription( SwFlyFrmFmt& rFlyFrmFmt,
                                const String& sNewDescription );
-    // <--
 
     /** Footnotes
     */
-    // Fussnoten Informationen
+    // Footnote information
     const SwFtnInfo& GetFtnInfo() const         { return *pFtnInfo; }
     void SetFtnInfo(const SwFtnInfo& rInfo);
     const SwEndNoteInfo& GetEndNoteInfo() const { return *pEndNoteInfo; }
@@ -1164,7 +1134,6 @@ public:
     // count words in pam
     void CountWords( const SwPaM& rPaM, SwDocStat& rStat ) const;
 
-
     /** ???
     */
     // Textbaustein Dokument?
@@ -1218,14 +1187,12 @@ public:
 
         //Zuruecksetzen der Attribute; es werden alle TxtHints und bei
         //vollstaendiger Selektion harte Formatierung (AUTO-Formate) entfernt
-    // --> OD 2008-11-28 #i96644#
     // introduce new optional parameter <bSendDataChangedEvents> in order to
     // control, if the side effect "send data changed events" is triggered or not.
     void ResetAttrs( const SwPaM &rRg,
                      sal_Bool bTxtAttr = sal_True,
                      const SvUShortsSort* = 0,
                      const bool bSendDataChangedEvents = true );
-    // <--
     void RstTxtAttrs(const SwPaM &rRg, BOOL bInclRefToxMark = FALSE );
 
         // Setze das Attribut im angegebenen Format. Ist Undo aktiv, wird
@@ -1233,11 +1200,9 @@ public:
     void SetAttr( const SfxPoolItem&, SwFmt& );
     void SetAttr( const SfxItemSet&, SwFmt& );
 
-    // --> OD 2008-02-12 #newlistlevelattrs#
     // method to reset a certain attribute at the given format
     void ResetAttrAtFormat( const USHORT nWhichId,
                             SwFmt& rChangedFormat );
-    // <--
 
         // Setze das Attribut als neues default Attribut in diesem Dokument.
         // Ist Undo aktiv, wird das alte in die Undo-History aufgenommen
@@ -1279,11 +1244,9 @@ public:
     SwFrmFmt* FindFrmFmtByName( const String& rName ) const
         {   return (SwFrmFmt*)FindFmtByName( (SvPtrarr&)*pFrmFmtTbl, rName ); }
 
-    // --> OD 2005-01-13 #i40550#
     SwCharFmt *MakeCharFmt(const String &rFmtName, SwCharFmt *pDerivedFrom,
                            BOOL bBroadcast = FALSE,
                            BOOL bAuto = TRUE );
-    // <--
     void       DelCharFmt(sal_uInt16 nFmt, BOOL bBroadcast = FALSE);
     void       DelCharFmt(SwCharFmt* pFmt, BOOL bBroadcast = FALSE);
     SwCharFmt* FindCharFmtByName( const String& rName ) const
@@ -1293,18 +1256,15 @@ public:
     // TXT
     const SwTxtFmtColl* GetDfltTxtFmtColl() const { return pDfltTxtFmtColl; }
     const SwTxtFmtColls *GetTxtFmtColls() const { return pTxtFmtCollTbl; }
-    // --> OD 2005-01-13 #i40550#
     SwTxtFmtColl *MakeTxtFmtColl( const String &rFmtName,
                                   SwTxtFmtColl *pDerivedFrom,
                                   BOOL bBroadcast = FALSE,
                                   BOOL bAuto = TRUE );
-    // <--
     SwConditionTxtFmtColl* MakeCondTxtFmtColl( const String &rFmtName,
                                                SwTxtFmtColl *pDerivedFrom,
                                                BOOL bBroadcast = FALSE);
     void DelTxtFmtColl(sal_uInt16 nFmt, BOOL bBroadcast = FALSE);
     void DelTxtFmtColl( SwTxtFmtColl* pColl, BOOL bBroadcast = FALSE );
-    // --> OD 2007-11-06 #i62675#
     // Add 4th optional parameter <bResetListAttrs>.
     // 'side effect' of <SetTxtFmtColl> with <bReset = true> is that the hard
     // attributes of the affected text nodes are cleared, except the break
@@ -1315,7 +1275,6 @@ public:
     sal_Bool SetTxtFmtColl( const SwPaM &rRg, SwTxtFmtColl *pFmt,
                             bool bReset = true,
                             bool bResetListAttrs = false );
-    // <--
     SwTxtFmtColl* FindTxtFmtCollByName( const String& rName ) const
         {   return (SwTxtFmtColl*)FindFmtByName( (SvPtrarr&)*pTxtFmtCollTbl, rName ); }
 
@@ -1343,7 +1302,6 @@ public:
     sal_uInt16 GetFlyCount( FlyCntType eType = FLYCNTTYPE_ALL) const;
     SwFrmFmt* GetFlyNum(sal_uInt16 nIdx, FlyCntType eType = FLYCNTTYPE_ALL);
 
-
     // kopiere die Formate in die eigenen Arrays und returne diese
     SwFrmFmt  *CopyFrmFmt ( const SwFrmFmt& );
     SwCharFmt *CopyCharFmt( const SwCharFmt& );
@@ -1411,25 +1369,19 @@ public:
     void ChgPageDesc( const String & rName, const SwPageDesc& );
     void ChgPageDesc( sal_uInt16 i, const SwPageDesc& );
     BOOL FindPageDesc( const String & rName, sal_uInt16 * pFound );
-    // -> #116530#
     void DelPageDesc( const String & rName, BOOL bBroadcast = FALSE);
     void DelPageDesc( sal_uInt16 i, BOOL bBroadcast = FALSE );
-    // <- #116530#
-    void PreDelPageDesc(SwPageDesc * pDel); // #i7983#
-    // -> #116530#
+    void PreDelPageDesc(SwPageDesc * pDel);
     sal_uInt16 MakePageDesc( const String &rName, const SwPageDesc* pCpy = 0,
                              BOOL bRegardLanguage = TRUE,
                              BOOL bBroadcast = FALSE);
     void BroadcastStyleOperation(String rName, SfxStyleFamily eFamily,
                                  USHORT nOp);
-    // <- #116530#
 
-
-    // --> FME 2005-03-16 #i44963# The html import sometimes overwrites the
+    // The html import sometimes overwrites the
     // page sizes set in the page descriptions. This function is used to
     // correct this.
     void CheckDefaultPageFmt();
-    // <--
 
         // Methoden fuer die Verzeichnisse:
         // - Verzeichnismarke einfuegen loeschen travel
@@ -1496,7 +1448,7 @@ public:
 
         // korrigiere die im Dokument angemeldeten SwPosition-Objecte,
         // wie z.B. die ::com::sun::star::text::Bookmarks oder die Verzeichnisse.
-        // JP 22.06.95: ist bMoveCrsr gesetzt, verschiebe auch die Crsr
+        // ist bMoveCrsr gesetzt, verschiebe auch die Crsr
 
         // Setzt alles in rOldNode auf rNewPos + Offset
     void CorrAbs( const SwNodeIndex& rOldNode, const SwPosition& rNewPos,
@@ -1512,12 +1464,10 @@ public:
                     const xub_StrLen nOffset = 0, sal_Bool bMoveCrsr = sal_False );
 
         // GliederungsRegeln erfragen / setzen
-    // --> OD 2005-11-02 #i51089 - TUNING#
     inline SwNumRule* GetOutlineNumRule() const
     {
         return pOutlineRule;
     }
-    // <--
     void SetOutlineNumRule( const SwNumRule& rRule );
     void PropagateOutlineRule();
 
@@ -1531,13 +1481,11 @@ public:
 
         // setzt, wenn noch keine Numerierung, sonst wird geaendert
         // arbeitet mit alten und neuen Regeln, nur Differenzen aktualisieren
-    // --> OD 2005-02-18 #i42921# - re-use unused 3rd parameter
-    // --> OD 2008-02-08 #newlistlevelattrs#
+    // re-use unused 3rd parameter
     // Add optional parameter <bResetIndentAttrs> - default value FALSE.
     // If <bResetIndentAttrs> equals true, the indent attributes "before text"
     // and "first line indent" are additionally reset at the provided PaM, if
     // the list style makes use of the new list level attributes.
-    // --> OD 2008-03-17 #refactorlists#
     // introduce parameters <bCreateNewList> and <sContinuedListId>
     // <bCreateNewList> indicates, if a new list is created by applying the
     // given list style.
@@ -1547,20 +1495,8 @@ public:
                      const String sContinuedListId = String(),
                      sal_Bool bSetItem = sal_True,
                      const bool bResetIndentAttrs = false );
-    // <--
     void SetCounted( const SwPaM&, bool bCounted);
 
-    // --> OD 2009-08-25 #i86492#
-    // no longer needed.
-    // SwDoc::SetNumRule( rPaM, rNumRule, false, <ListId>, sal_True, true ) have to be used instead.
-//    /**
-//       Replace numbering rules in a PaM by another numbering rule.
-
-//       \param rPaM         PaM to replace the numbering rules in
-//       \param rNumRule     numbering rule to replace the present numbering rules
-//     */
-//    void ReplaceNumRule(const SwPaM & rPaM, const SwNumRule & rNumRule);
-
     void MakeUniqueNumRules(const SwPaM & rPaM);
 
     void SetNumRuleStart( const SwPosition& rPos, sal_Bool bFlag = sal_True );
@@ -1570,7 +1506,6 @@ public:
 
     const SwNumRuleTbl& GetNumRuleTbl() const { return *pNumRuleTbl; }
 
-    // #i36749#
     /**
        Add numbering rule to document.
 
@@ -1578,26 +1513,22 @@ public:
     */
     void AddNumRule(SwNumRule * pRule);
 
-    // --> OD 2008-02-11 #newlistlevelattrs#
     // add optional parameter <eDefaultNumberFormatPositionAndSpaceMode>
     sal_uInt16 MakeNumRule( const String &rName,
         const SwNumRule* pCpy = 0,
         BOOL bBroadcast = FALSE,
         const SvxNumberFormat::SvxNumPositionAndSpaceMode eDefaultNumberFormatPositionAndSpaceMode =
             SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
-    // <--
     sal_uInt16 FindNumRule( const String& rName ) const;
     SwNumRule* FindNumRulePtr( const String& rName ) const;
 
     // loeschen geht nur, wenn die ::com::sun::star::chaos::Rule niemand benutzt!
-    // #106897#
     sal_Bool RenameNumRule(const String & aOldName, const String & aNewName,
                            BOOL bBroadcast = FALSE);
     sal_Bool DelNumRule( const String& rName, BOOL bBroadCast = FALSE );
     String GetUniqueNumRuleName( const String* pChkStr = 0, sal_Bool bAutoNum = sal_True ) const;
 
     void UpdateNumRule();   // alle invaliden Updaten
-    // #106897#
     void ChgNumRuleFmts( const SwNumRule& rRule, const String * pOldName = 0 );
     sal_Bool ReplaceNumRule( const SwPosition& rPos, const String& rOldRule,
                         const String& rNewRule );
@@ -1608,11 +1539,10 @@ public:
     sal_Bool GotoPrevNum( SwPosition&, sal_Bool bOverUpper = sal_True,
                         sal_uInt8* pUpper = 0, sal_uInt8* pLower = 0 );
 
-    // #i23731#
     /** Searches for a text node with a numbering rule.
 
-       OD 2005-10-24 #i55391# - add optional parameter <bInvestigateStartNode>
-       OD 2008-03-18 #refactorlists# - add output parameter <sListId>
+       add optional parameter <bInvestigateStartNode>
+       add output parameter <sListId>
 
        \param rPos         position to start search
        \param bForward     - TRUE:  search forward
@@ -1653,18 +1583,17 @@ public:
         // Bewegt selektierte Absaetze (nicht nur Numerierungen)
         // entsprechend des Offsets. (negativ: zum Doc-Anf.)
     sal_Bool MoveParagraph( const SwPaM&, long nOffset = 1, sal_Bool bIsOutlMv = sal_False );
-        // No-/Numerierung ueber Delete/Backspace ein/abschalten #115901#
+        // No-/Numerierung ueber Delete/Backspace ein/abschalten
     sal_Bool NumOrNoNum( const SwNodeIndex& rIdx, sal_Bool bDel = sal_False);
         // Animation der Grafiken stoppen
     void StopNumRuleAnimations( OutputDevice* );
 
         // fuege eine neue Tabelle auf der Position rPos ein. (es
         // wird vor dem Node eingefuegt !!)
-        //JP 28.10.96:
         //  fuer AutoFormat bei der Eingabe: dann muessen die Spalten
         //  auf die vordefinierten Breite gesetzt werden. Im Array stehen die
         //  Positionen der Spalten!! (nicht deren Breite!)
-    /* #109161# new parameter bCalledFromShell:
+    /* new parameter bCalledFromShell:
 
        TRUE: called from shell -> propagate existing adjust item at
        rPos to every new cell. A existing adjust item in the table
@@ -1727,7 +1656,6 @@ public:
     void SetTabRows( const SwTabCols &rNew, BOOL bCurColOnly, const SwCursor* pCrsr,
                      const SwCellFrm* pBoxFrm = 0 );
 
-
     // Direktzugriff fuer Uno
     void SetTabCols(SwTable& rTab, const SwTabCols &rNew, const SwTabCols &rOld,
                                     const SwTableBox *pStart, sal_Bool bCurRowOnly);
@@ -1870,7 +1798,6 @@ public:
     void SpellItAgainSam( sal_Bool bInvalid, sal_Bool bOnlyWrong, sal_Bool bSmartTags );
     void InvalidateAutoCompleteFlag();
 
-    // <--
     void SetCalcFieldValueHdl(Outliner* pOutliner);
 
     // erfrage ob die ::com::sun::star::util::URL besucht war. Uebers Doc, falls nur ein ::com::sun::star::text::Bookmark
@@ -1913,10 +1840,10 @@ public:
     // falls keine angegeben ist, nehme die Kapitelvorlage der 1. Ebene
     sal_Bool GenerateGlobalDoc( const String& rPath,
                                 const SwTxtFmtColl* pSplitColl = 0 );
-    sal_Bool GenerateGlobalDoc( const String& rPath, int nOutlineLevel = 0 );   //#outline level,add by zhaojianwei
+    sal_Bool GenerateGlobalDoc( const String& rPath, int nOutlineLevel = 0 );
     sal_Bool GenerateHTMLDoc( const String& rPath,
                                 const SwTxtFmtColl* pSplitColl = 0 );
-    sal_Bool GenerateHTMLDoc( const String& rPath, int nOutlineLevel = 0 ); //#outline level,add by zhaojianwei
+    sal_Bool GenerateHTMLDoc( const String& rPath, int nOutlineLevel = 0 );
 
     //  vergleiche zwei Dokument miteinander
     long CompareDoc( const SwDoc& rDoc );
@@ -1947,7 +1874,7 @@ public:
     void SetPreViewPrtData( const SwPagePreViewPrtData* pData );
 
     // update all modified OLE-Objects. The modification is called over the
-    // StarOne - Interface              --> Bug 67026
+    // StarOne - Interface
     void SetOLEObjModified()
     {   if( GetRootFrm() ) aOLEModifiedTimer.Start(); }
 
@@ -1992,7 +1919,6 @@ public:
     //
     // -------------------- FeShell - Schnittstellen Ende ------------------
 
-
     // Schnittstelle fuer die TextInputDaten - ( fuer die Texteingabe
     // von japanischen/chinesischen Zeichen)
     SwExtTextInput* CreateExtTextInput( const SwPaM& rPam );
@@ -2028,10 +1954,8 @@ public:
 
     IGrammarContact* getGrammarContact() const { return mpGrammarContact; }
 
-    // -> #i27615#
     /** Marks/Unmarks a list level of a certain list
 
-        OD 2008-04-02 #refactorlists#
         levels of a certain lists are marked now
 
         @param sListId    list Id of the list whose level has to be marked/unmarked
@@ -2045,7 +1969,6 @@ public:
 
     /** Marks/Unmarks a list level of a certain list
 
-        OD 2008-04-02 #refactorlists#
         levels of a certain lists are marked now
 
         @param rList      list whose level has to be marked/unmarked
@@ -2056,7 +1979,6 @@ public:
     void MarkListLevel( SwList& rList,
                         const int nListLevel,
                         const BOOL bValue );
-    // <- #i27615#
 
     // Change a format undoable.
     void ChgFmt(SwFmt & rFmt, const SfxItemSet & rSet);
@@ -2067,7 +1989,6 @@ public:
     // Change a TOX undoable.
     void ChgTOX(SwTOXBase & rTOX, const SwTOXBase & rNew);
 
-    // #111827#
     /**
        Returns a textual description of a PaM.
 
@@ -2087,11 +2008,9 @@ public:
      */
     String GetPaMDescr(const SwPaM & rPaM) const;
 
-    // -> #i23726#
     BOOL IsFirstOfNumRule(SwPosition & rPos);
-    // <- #i23726#
 
-    // --> #i31958# access methods for XForms model(s)
+    // access methods for XForms model(s)
 
     /// access container for XForms model; will be NULL if !isXForms()
     com::sun::star::uno::Reference<com::sun::star::container::XNameContainer>
@@ -2104,21 +2023,18 @@ public:
 
     /// initialize XForms models; turn this into an XForms document
     void initXForms( bool bCreateDefaultModel );
-    // <-- #i31958# access methods for XForms model(s)
+    // access methods for XForms model(s)
 
-    // --> OD 2006-03-21 #b6375613#
     inline bool ApplyWorkaroundForB6375613() const
     {
         return mbApplyWorkaroundForB6375613;
     }
     void SetApplyWorkaroundForB6375613( bool p_bApplyWorkaroundForB6375613 );
-    // <--
 
     //Update all the page masters
     void SetDefaultPageMode(bool bSquaredPageMode);
     sal_Bool IsSquaredPageMode() const;
 
-    // i#78591#
     void Setn32DummyCompatabilityOptions1( sal_uInt32 CompatabilityOptions1 )
     {
         n32DummyCompatabilityOptions1 = CompatabilityOptions1;
@@ -2143,14 +2059,10 @@ public:
     SfxObjectShell* CreateCopy(bool bCallInitNew) const;
 };
 
-
 // Diese Methode wird im Dtor vom SwDoc gerufen und loescht den Cache
 // der Konturobjekte
 void ClrContourCache();
 
-
-//------------------ inline impl. ---------------------------------
-
 inline const SwTableNode* SwDoc::IsIdxInTbl( const SwNodeIndex& rIdx ) const
 {
     return ((SwDoc*)this)->IsIdxInTbl( rIdx );
@@ -2175,14 +2087,11 @@ inline void SwDoc::SetOLEPrtNotifyPending( bool bSet )
         mbAllOLENotify = sal_False;
 }
 
-// --> OD 2006-03-14 #i62875#
 // namespace <docfunc> for functions and procedures working on a Writer document.
 namespace docfunc
 {
     /** method to check, if given Writer document contains at least one drawing object
 
-        OD 2006-03-17 #i62875#
-
         @author OD
 
         @param p_rDoc
@@ -2193,8 +2102,6 @@ namespace docfunc
     /** method to check, if given Writer document contains only drawing objects,
         which are completely on its page.
 
-        OD 2006-03-17 #i62875#
-
         @author OD
 
         @param p_rDoc
@@ -2204,7 +2111,7 @@ namespace docfunc
 
     /** method to check, if the outline style has to written as a normal list style
 
-        OD 2006-09-27 #i69627#
+        #i69627#
         The outline style has to written as a normal list style, if a parent
         paragraph style of one of the paragraph styles, which are assigned to
         the list levels of the outline style, has a list style set or inherits
@@ -2221,7 +2128,6 @@ namespace docfunc
     */
     bool HasOutlineStyleToBeWrittenAsNormalListStyle( SwDoc& rDoc );
 }
-// <--
 #endif  //_DOC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 2c5e509dc74e..3972a422d79a 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -80,7 +80,6 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
                                             // Grafik-Links. Sind alle da,
                                             // dann ist Doc voll. geladen
 
-    //SvPersistRef            xOLEChildList;  // fuers RemoveOLEObjects
     comphelper::EmbeddedObjectContainer*    pOLEChildList;
     sal_Int16               nUpdateDocMode; // contains the com::sun::star::document::UpdateDocMode
     bool                    bInUpdateFontList; //prevent nested calls of UpdateFontList
@@ -213,7 +212,7 @@ public:
                         USHORT nIdx2 = INDEX_IGNORE,
                         USHORT nIdx3 = INDEX_IGNORE);
 
-    virtual Bitmap      GetStyleFamilyBitmap( SfxStyleFamily eFamily, BmpColorMode eColorMode );
+    virtual Bitmap      GetStyleFamilyBitmap( SfxStyleFamily eFamily );
 
     // View setzen fuer Aktionen ueber Shell
     void          SetView(SwView* pVw);
@@ -258,15 +257,12 @@ public:
                         BOOL bColumn = FALSE,
                         SwWrtShell*     pActShell = 0 );
 
-    // --> OD 2006-11-07 #i59688#
+    // #i59688#
     // linked graphics are now loaded on demand.
     // Thus, loading of linked graphics no longer needed and necessary for
     // the load of document being finished.
-//    // Timer starten fuers ueberpruefen der Grafik-Links. Sind alle
-//    // vollstaendig geladen, dann ist das Doc fertig
-//    void StartLoadFinishedTimer();
+
     void LoadingFinished();
-    // <--
 
     // eine Uebertragung wird abgebrochen (wird aus dem SFX gerufen)
     virtual void CancelTransfers();
@@ -291,15 +287,14 @@ public:
 
     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString >  GetEventNames();
 
-    // --> FME 2004-08-05 #i20883# Digital Signatures and Encryption
+    // #i20883# Digital Signatures and Encryption
     virtual sal_uInt16 GetHiddenInformationState( sal_uInt16 nStates );
-    // <--
 
-    // --> FME 2005-02-25 #i42634# Overwrites SfxObjectShell::UpdateLinks
+
+    // #i42634# Overwrites SfxObjectShell::UpdateLinks
     // This new function is necessary to trigger update of links in docs
     // read by the binary filter:
     virtual void UpdateLinks();
-    // <--
 
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >
                                 GetController();
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index c7b0d4fde10f..cf902e76910b 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -110,21 +110,17 @@ public:
     BOOL                    IsPhysical() const              { return bPhysical; }
     void                    SetPhysical(BOOL bPhys);
 
-    // --> OD 2008-02-11 #newlistlevelattrs#
     // add optional parameter <bResetIndentAttrsAtParagraphStyle>, default value FALSE,
     // which indicates that the indent attributes at a paragraph style should
     // be reset in case that a list style is applied to the paragraph style and
     // no indent attributes are applied.
     void                    SetItemSet( const SfxItemSet& rSet,
                                         const bool bResetIndentAttrsAtParagraphStyle = false );
-    // <--
 
     virtual SfxItemSet&     GetItemSet();
-    // --> OD 2008-02-12 #newlistlevelattrs#
     // new method for paragraph styles to merge indent attributes of applied list
     // style into the given item set, if the list style indent attributes are applicable.
     void MergeIndentAttrsOfListStyle( SfxItemSet& rSet );
-    // <--
     virtual const String&   GetParent() const;
     virtual const String&   GetFollow() const;
 
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index ca3707496435..2bc174fb47fe 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -184,7 +184,6 @@ public:
     virtual void        SetPar2(const String& rStr);
 
     virtual USHORT      GetSubType() const;
-    // virtual void        SetSubType(USHORT nSub); // OM: entfernt, da unbenoetigt und gefaehrlich
     virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
 
@@ -398,7 +397,7 @@ public:
 
 
     virtual USHORT      GetSubType() const;
-    // virtual void        SetSubType(USHORT nSub); // OM: entfernt, da unbenoetigt und gefaehrlich
+
     virtual bool        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
 };
diff --git a/sw/inc/drawdoc.hxx b/sw/inc/drawdoc.hxx
index f08dbcfdac6c..200ce214a1f6 100644
--- a/sw/inc/drawdoc.hxx
+++ b/sw/inc/drawdoc.hxx
@@ -54,10 +54,9 @@ public:
     virtual SdrLayerID GetControlExportLayerId( const SdrObject & ) const;
 
 protected:
-    // --> OD 2006-03-01 #b6382898#
+    //  #b6382898#
     // overload of <SdrModel::createUnoModel()> is needed to provide corresponding uno model.
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel();
-    // <--
 };
 
 
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index c84d3b24e542..ce5e3a58473d 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -72,7 +72,6 @@ class SwAutoCompleteWord;
 class SwFmtRefMark;
 
 class SwNumRule;        // Numerierung
-//class SwNodeNum;      // Numerierung
 
 class SwUndoIds;        // fuer Undo
 class SwTxtFmtColl;
@@ -228,7 +227,6 @@ public:
     //  alle Cursor. Copy und Paste muss aufgrund der FlyFrames in
     //  der FEShell stehen!
     // kopiere alle Selectionen und das Doc
-    //JP 21.10.96: und fuer die SVX-Autokorrektur
     BOOL _CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pNdInsPos = 0 );
 
     long SplitNode( BOOL bAutoFormat = FALSE, BOOL bCheckTableStart = TRUE );
@@ -246,10 +244,7 @@ public:
     // Anwenden / Entfernen von Attributen
     // liefert Attribute im angeforderten AttributSet. Wenn nicht eindeutig
     // steht im Set ein DONT_CARE !!
-    // --> OD 2008-01-16 #newlistlevelattrs#
-    // Renaming method to <GetCurAttr(..)> indicating that the attributes at
-    // the current cursors are retrieved.
-    // Introduce 2nd optional parameter <bMergeIndentValuesOfNumRule>.
+    // 2nd optional parameter <bMergeIndentValuesOfNumRule>.
     // If <bMergeIndentValuesOfNumRule> == TRUE, the indent attributes of
     // the corresponding list level of an applied list style is merged into
     // the requested item set as a LR-SPACE item, if corresponding node has not
@@ -257,7 +252,6 @@ public:
     // level is SvxNumberFormat::LABEL_ALIGNMENT.
     BOOL GetCurAttr( SfxItemSet& ,
                      const bool bMergeIndentValuesOfNumRule = false ) const;
-    // <--
     void SetAttr( const SfxPoolItem&, USHORT nFlags = 0 );
     void SetAttr( const SfxItemSet&, USHORT nFlags = 0 );
 
@@ -305,11 +299,10 @@ public:
     USHORT GetTxtFmtCollCount() const;
     SwTxtFmtColl& GetTxtFmtColl( USHORT nTxtFmtColl) const;
     SwTxtFmtColl* GetCurTxtFmtColl() const;
-    // --> OD 2007-11-06 #i62675#
+    // #i62675#
     // Add 2nd optional parameter <bResetListAttrs> - see also <SwDoc::SetTxtFmtColl(..)>
     void SetTxtFmtColl( SwTxtFmtColl*,
                         bool bResetListAttrs = false );
-    // <--
     SwTxtFmtColl *MakeTxtFmtColl(const String &rFmtCollName,
         SwTxtFmtColl *pDerivedFrom = 0);
     void FillByEx(SwTxtFmtColl*, BOOL bReset = FALSE);
@@ -439,12 +432,10 @@ public:
 
     // setzt, wenn noch keine Numerierung, sonst wird geaendert
     // arbeitet mit alten und neuen Regeln, nur Differenzen aktualisieren
-    // --> OD 2008-02-08 #newlistlevelattrs#
     // Add optional parameter <bResetIndentAttrs> (default value FALSE).
     // If <bResetIndentAttrs> equals true, the indent attributes "before text"
     // and "first line indent" are additionally reset at the current selection,
     // if the list style makes use of the new list level attributes.
-    // --> OD 2008-03-17 #refactorlists#
     // introduce parameters <bCreateNewList> and <sContinuedListId>
     // <bCreateNewList> indicates, if a new list is created by applying the
     // given list style.
@@ -454,7 +445,6 @@ public:
                         const bool bCreateNewList /*= false*/,
                         const String sContinuedListId = String(),
                         const bool bResetIndentAttrs = false );
-    // <--
     // Absaetze ohne Numerierung, aber mit Einzuegen
     BOOL NoNum();
     // Loeschen, Splitten der Aufzaehlungsliste
@@ -464,28 +454,25 @@ public:
     // Hoch-/Runtermoven sowohl innerhalb als auch ausserhalb von Numerierungen
     BOOL MoveParagraph( long nOffset = 1);
     BOOL MoveNumParas( BOOL bUpperLower, BOOL bUpperLeft );
-    // No-/Numerierung ueber Delete/Backspace ein/abschalten #115901#
+    // No-/Numerierung ueber Delete/Backspace ein/abschalten
     BOOL NumOrNoNum( BOOL bDelete = FALSE, BOOL bChkStart = TRUE);
-    // -> #i23726#
-    // --> OD 2008-06-09 #i90078#
+    // #i23726#
+    // #i90078#
     // Remove unused default parameter <nLevel> and <bRelative>.
     // Adjust method name and parameter name
     void ChangeIndentOfAllListLevels( short nDiff );
     // Adjust method name
     void SetIndent(short nIndent, const SwPosition & rPos);
-    // <--
     BOOL IsFirstOfNumRule() const;
     BOOL IsFirstOfNumRule(const SwPaM & rPaM) const;
-    // <- #i23726#
 
     BOOL IsNoNum( BOOL bChkStart = TRUE ) const;
     // returne den Num-Level des Nodes, in dem sich der Point vom
     // Cursor befindet. Return kann sein :
     // - NO_NUMBERING, 0..MAXLEVEL-1, NO_NUMLEVEL .. NO_NUMLEVEL|MAXLEVEL-1
-    // --> OD 2008-02-29 #refactorlists# - removed <pHasChilds>
-//    BYTE GetNumLevel( BOOL* pHasChilds = 0 ) const;
+
     BYTE GetNumLevel() const;
-    // <--
+
     // detect highest and lowest level to check moving of outline levels
     void GetCurrentOutlineLevels( sal_uInt8& rUpper, sal_uInt8& rLower );
 
@@ -493,10 +480,9 @@ public:
     // get Outline level of current paragraph
     int GetCurrentParaOutlineLevel( ) const;// #outlinelevel add by zhaojianwei
 
-    // -> i29560
+    // i29560
     BOOL HasNumber() const;
     BOOL HasBullet() const;
-    // <- i29560
 
     String GetUniqueNumRuleName( const String* pChkStr = 0, BOOL bAutoNum = TRUE ) const;
     void ChgNumRuleFmts( const SwNumRule& rRule );
@@ -505,12 +491,11 @@ public:
     void SetNumRuleStart( BOOL bFlag = TRUE );
     BOOL IsNumRuleStart() const;
     void SetNodeNumStart( USHORT nStt );
-    // --> OD 2008-02-29 #refactorlists#
+
     USHORT GetNodeNumStart() const;
-    // <--
+
     BOOL ReplaceNumRule( const String& rOldRule, const String& rNewRule );
     // Searches for a text node with a numbering rule.
-    // --> OD 2008-03-18 #refactorlists# - add output parameter <sListId>
     // in case a list style is found, <sListId> holds the list id, to which the
     // text node belongs, which applies the found list style.
     const SwNumRule * SearchNumRule(const bool bForward,
@@ -518,7 +503,6 @@ public:
                                     const bool bOutline,
                                     int nNonEmptyAllowed,
                                     String& sListId );
-    // <--
 
     // Undo
     // UndoHistory am Dokument pflegen
@@ -589,10 +573,10 @@ public:
      * SwGrfNode zeigt (und Mark nicht gesetzt ist oder auf die
      * gleiche Graphic zeigt), sonst gibt's was auf die Finger
      */
-    // --> OD 2005-02-09 #119353# - robust
+
     const Graphic* GetGraphic( BOOL bWait = TRUE ) const;
     const GraphicObject* GetGraphicObj() const;
-    // <--
+
     BOOL IsGrfSwapOut( BOOL bOnlyLinked = FALSE ) const;
     USHORT GetGraphicType() const;
 
@@ -623,16 +607,12 @@ public:
                   const Graphic* pGraphic = 0,
                   const GraphicObject* pGrafObj = 0 );
 
-//    // alternativen Text einer Grafik/OLe-Objectes abfragen/setzen
-//    const String& GetAlternateText() const;
-//    void SetAlternateText( const String& rTxt );
-
     //eindeutige Identifikation des Objektes (fuer ImageMapDlg)
     void    *GetIMapInventor() const;
-    // --> OD 2007-03-01 #i73788#
+    // #i73788#
     // remove default parameter, because method always called this default value
     Graphic GetIMapGraphic() const; //liefert eine Graphic fuer alle Flys!
-    // <--
+
     const SwFlyFrmFmt* FindFlyByName( const String& rName, BYTE nNdTyp = 0 ) const;
 
     //liefert ein ClientObject, wenn CurCrsr->Point() auf einen
@@ -928,7 +908,6 @@ public:
     // von japanischen/chinesischen Zeichen)
     SwExtTextInput* CreateExtTextInput(LanguageType eInputLanguage);
     String DeleteExtTextInput( SwExtTextInput* pDel = 0, BOOL bInsText = TRUE);
-//  SwExtTextInput* GetExtTextInput() const;
     void SetExtTextInputData( const CommandExtTextInputData& );
 
     // Schnistelle fuer den Zugriff auf die AutoComplete-Liste
diff --git a/sw/inc/envelp.hrc b/sw/inc/envelp.hrc
index bc54ac9a626c..b77e92e86cce 100644
--- a/sw/inc/envelp.hrc
+++ b/sw/inc/envelp.hrc
@@ -79,14 +79,11 @@
 #define STR_BTN_NEWDOC           (RC_ENVLOP_BEGIN + 65)
 #define STR_SENDER_TOKENS        (RC_ENVLOP_BEGIN + 66)
 
-#define RC_ENVPRT_HC_BEGIN       (RC_ENVLOP_BEGIN + 70)
-#define RC_ENVPRT_HC_END         (RC_ENVLOP_BEGIN + 82)
-
 // Ueberlaufpruefung ----------------------------------------------------------
 
 #define ENVELP_ACT_END  STR_SENDER_TOKENS
 
-#if ENVELP_ACT_END > RC_ENVPRT_HC_END
+#if ENVELP_ACT_END > STR_SENDER_TOKENS
 #error Resource-Ueberlauf in #file, #line
 #endif
 
diff --git a/sw/inc/errhdl.hxx b/sw/inc/errhdl.hxx
index 867c187286f4..20e734966523 100644
--- a/sw/inc/errhdl.hxx
+++ b/sw/inc/errhdl.hxx
@@ -28,13 +28,13 @@
 #ifndef _ERRHDL_HXX
 #define _ERRHDL_HXX
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
 #include <tools/solar.h>
 #include <sal/types.h>
 #include "swdllapi.h"
 
-extern BOOL bAssert;                // TRUE, wenn eine ASSERT-Box hochkam
+extern BOOL bAssert;                // TRUE, wenn eine ASSERT Box hochkam
 
 
 // -----------------------------------------------------------------------
@@ -42,15 +42,7 @@ extern BOOL bAssert;                // TRUE, wenn eine ASSERT-Box hochkam
 // wo der Fehler auftrat.
 // Die Funktion darf nicht direkt benutzt werden!
 // -----------------------------------------------------------------------
-SW_DLLPUBLIC void AssertFail( const sal_Char*, const sal_Char*, USHORT );
-SW_DLLPUBLIC void AssertFail( USHORT, const sal_Char*, USHORT );
-
-#define ASSERT( cond, message ) \
-    if( !(cond) ) { \
-        const char   *_pErrorText = #message; \
-        const char   *_pFileName  = __FILE__; \
-       ::AssertFail( _pErrorText, _pFileName, __LINE__ ); \
-    }
+SW_DLLPUBLIC void AssertFail( USHORT, const sal_Char* );
 
 // -----------------------------------------------------------------------
 // Prueft ob die angegebene Bedingung wahr ist, wenn nicht wird eine
@@ -59,7 +51,7 @@ SW_DLLPUBLIC void AssertFail( USHORT, const sal_Char*, USHORT );
 #define ASSERT_ID( cond, id ) \
     if( !(cond) ) { \
         const char   *_pFileName  = __FILE__; \
-       ::AssertFail( (USHORT)id, _pFileName, __LINE__ ); \
+       ::AssertFail( (USHORT)id, _pFileName ); \
     }
 
 
@@ -68,7 +60,6 @@ SW_DLLPUBLIC void AssertFail( USHORT, const sal_Char*, USHORT );
 // ignoriert
 // -----------------------------------------------------------------------
 #else
-#define ASSERT( cond, message )     ;
 #define ASSERT_ID( cond, id )       ;
 #endif // PRODUCT
 
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index 8ad32b06ab70..34ab59ce71da 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -161,7 +161,6 @@ class SW_DLLPUBLIC SwSetExpFieldType : public SwValueFieldType
 {
     String      sName;
     const SwNode* pOutlChgNd;
-//  sal_Unicode cDelim;
     String      sDelim;
     USHORT      nType;
     BYTE        nLevel;
@@ -193,8 +192,6 @@ public:
     String MakeSeqName( USHORT nSeqNo );
 
     // Seqencefelder ggfs. Kapitelweise numerieren
-//  sal_Unicode GetDelimiter() const        { return cDelim; }
-//  void SetDelimiter( sal_Unicode c )      { cDelim = c; }
     const String& GetDelimiter() const      { return sDelim; }
     void SetDelimiter( const String& s )    { sDelim = s; }
     BYTE GetOutlineLvl() const              { return nLevel; }
@@ -396,11 +393,6 @@ public:
 };
 
 
-// MSC will den hier nicht
-//typedef void (SwField:: *FnScanFormel)( const SwTable&, String&,
-//                                   String&, String* = 0, void* = 0 );
-
-
 class SwTblField : public SwValueField, public SwTableFormula
 {
     String      sExpand;
diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx
index 3f1bc140dae0..ef4c42f18d3f 100644
--- a/sw/inc/fchrfmt.hxx
+++ b/sw/inc/fchrfmt.hxx
@@ -61,7 +61,7 @@ public:
 
     TYPEINFO();
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 80e4deed29ad..7c0cdacf1e58 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -36,7 +36,6 @@
 #include <editsh.hxx>
 #include <flyenum.hxx>
 
-// OD 25.06.2003 #108784#
 #include <svx/svdtypes.hxx>
 
 #include <svtools/embedhlp.hxx>
@@ -171,7 +170,7 @@ struct SwGetCurColNumPara
 #define SW_TABCOL_VERT          2
 #define SW_TABROW_HORI          3
 #define SW_TABROW_VERT          4
-// --> FME 2004-07-30 #i32329# Enhanced table selection
+
 #define SW_TABSEL_HORI          5
 #define SW_TABSEL_HORI_RTL      6
 #define SW_TABROWSEL_HORI       7
@@ -180,7 +179,6 @@ struct SwGetCurColNumPara
 #define SW_TABSEL_VERT          10
 #define SW_TABROWSEL_VERT       11
 #define SW_TABCOLSEL_VERT       12
-// <--
 
 class SdrDropMarkerOverlay;
 
@@ -197,7 +195,6 @@ class SW_DLLPUBLIC SwFEShell : public SwEditShell
 
     SW_DLLPRIVATE void ScrollTo( const Point &rPt );
 
-    // OD 25.06.2003 #108784# - correct type of 1st parameter
     SW_DLLPRIVATE void ChangeOpaque( SdrLayerID nLayerId );
 
     // Used for mouse operations on a table:
@@ -273,7 +270,6 @@ public:
     bool IsObjSelectable( const Point& rPt );
     int IsInsideSelectedObj( const Point& rPt );    //!! returns enum values
 
-    // #107513#
     // Test if there is a draw object at that position and if it should be selected.
     // The 'should' is aimed at Writer text fly frames which may be in front of
     // the draw object.
@@ -293,7 +289,7 @@ public:
     USHORT GetFrmType( const Point *pPt, BOOL bStopAtFly ) const;
     USHORT GetSelFrmType() const;               //Selektion (Drawing)
 
-    /** #108784# check whether selected frame contains a control;
+    /** check whether selected frame contains a control;
      * companion method to GetSelFrmType, used for preventing
      * drag&drop of controls into header */
     bool IsSelContainsControl() const;
@@ -305,11 +301,10 @@ public:
     SwRect  GetObjRect() const;
     //Zum Verschieben von Flys mit der Tastatur
     SwRect  GetFlyRect() const;
-    // OD 18.09.2003 #i17567#, #108749#, #110354# - adjustments to allow
-    //          negative vertical positions for fly frames anchored
+    // i#17567 - adjustments to allow negative vertical positions for fly frames anchored
     //          to paragraph or to character.
-    // OD 02.10.2003 #i18732# - adjustments for new option 'FollowTextFlow'
-    // OD 12.11.2003 #i22341# - adjustments for new vertical alignment at top of line
+    // i#18732 - adjustments for new option 'FollowTextFlow'
+    // i#22341 - adjustments for new vertical alignment at top of line
     void CalcBoundRect( SwRect& _orRect,
                         const RndStdIds _nAnchorId,
                         const sal_Int16 _eHoriRelOrient = com::sun::star::text::RelOrientation::FRAME,
@@ -356,12 +351,10 @@ public:
     const Graphic *GetGrfAtPos( const Point &rDocPos,
                                 String &rName, BOOL &rbLink ) const;
 
-    // --> OD 2009-07-13 #i73249#
     const String GetObjTitle() const;
     void SetObjTitle( const String& rTitle );
     const String GetObjDescription() const;
     void SetObjDescription( const String& rDescription );
-    // <--
 
 //SS fuer Rahmen --------------------------------------------
 
@@ -501,7 +494,7 @@ public:
     BOOL IsDrawCreate() const;
     void CreateDefaultShape( UINT16 /*SdrObjKind ?*/ eSdrObjectKind, const Rectangle& rRect, USHORT nSlotId);
 
-    // Funktionen f�r Rubberbox, um Draw-Objekte zu selektieren
+    // Functions for Rubberbox, ti select Draw-Objects
     BOOL BeginMark( const Point &rPos );
     void MoveMark ( const Point &rPos );
     BOOL EndMark  ();
@@ -513,7 +506,6 @@ public:
     void UnGroupSelection();    //Die Einzelobjekte sind Selektiert
                                 //Es koennen noch immer Gruppen dabei sein.
 
-    // OD 27.06.2003 #108784# - change return type.
     bool IsGroupAllowed() const;
 
     void MirrorSelection( BOOL bHorizontal );   //Bei FALSE Vertikal
@@ -654,12 +646,9 @@ public:
     void SetMouseTabCols( const SwTabCols &rNew, BOOL bCurRowOnly,
                           const Point &rPt );
 
-    // --> FME 2004-07-30 #i20126# Enhanced table selection
     // pEnd will be used during MouseMove
     bool SelTblRowCol( const Point& rPt, const Point* pEnd = 0, bool bRowDrag = false );
-    // <--
 
-    // #i24134# adjustment of table rows via Ruler
     void GetTabRows( SwTabCols &rToFill ) const;
     void SetTabRows( const SwTabCols &rNew, BOOL bCurColOnly );
     void GetMouseTabRows( SwTabCols &rToFill, const Point &rPt ) const;
@@ -744,7 +733,6 @@ public:
 
     /** SwFEShell::GetShapeBackgrd
 
-        OD 02.09.2002 for #102450#:
         method determines background color of the page the selected drawing
         object is on and returns this color.
         If no color is found, because no drawing object is selected or ...,
@@ -759,7 +747,6 @@ public:
 
     /** Is default horizontal text direction for selected drawing object right-to-left
 
-        OD 09.12.2002 #103045#
         Because drawing objects only painted for each page only, the default
         horizontal text direction of a drawing object is given by the corresponding
         page property.
@@ -773,14 +760,11 @@ public:
 
     void ParkCursorInTab();
 
-    // -> #i23726#
     SwTxtNode * GetNumRuleNodeAtPos(const Point &rPot);
     BOOL IsNumLabel( const Point &rPt, int nMaxOffset = -1 );
-    // <- #i23726#
-    // --> OD 2005-02-21 #i42921#
+
     bool IsVerticalModeAtNdAndPos( const SwTxtNode& _rTxtNode,
                                    const Point& _rDocPos ) const;
-    // <--
 
 };
 
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 882555a00dad..fd58b89a98a3 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -248,8 +248,6 @@ extern USHORT __FAR_DATA aTypeTab[];
 
 String  GetResult(double nVal, sal_uInt32 nNumFmt, USHORT nLang = LANGUAGE_SYSTEM);
 void    SetErrorStr(const String& rStr);
-//String    ExpandDate(const Date& rDate, ULONG nFmt, USHORT nLang);
-//String    ExpandTime(const Time& rTime, ULONG nFmt, USHORT nLang);
 String  FormatNumber(USHORT nNum, sal_uInt32 nFormat);
 
 /*--------------------------------------------------------------------
@@ -276,7 +274,7 @@ protected:
 
 public:
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     virtual ~SwFieldType();
 #endif
     static  const String&   GetTypeStr( USHORT nTypeId );
@@ -307,7 +305,7 @@ inline void SwFieldType::UpdateFlds() const
 class SW_DLLPUBLIC SwField
 {
 private:
-    mutable String      m_Cache; /// #i85766# cached expansion (for clipboard)
+    mutable String      m_Cache; // cached expansion (for clipboard)
     USHORT              nLang;  // Immer ueber SetLanguage aendern!
     BOOL                bIsAutomaticLanguage;
     sal_uInt32          nFormat;
@@ -344,10 +342,10 @@ public:
 
     // ResId
     USHORT              Which() const
-#ifndef DBG_UTIL
-        { return pType->Which(); }
+#if OSL_DEBUG_LEVEL > 1
+        ;       // implemented in fldbas.cxx
 #else
-        ;       // in fldbas.cxx implementiert
+        { return pType->Which(); }
 #endif
 
     // TYP_ID
@@ -421,7 +419,6 @@ public:
 class SW_DLLPUBLIC SwValueField : public SwField
 {
     double fValue;
-//  String sExpand;
 
 protected:
     SwValueField( SwValueFieldType* pFldType, sal_uInt32 nFmt = 0, USHORT nLang = LANGUAGE_SYSTEM, const double fVal = 0.0 );
@@ -432,8 +429,6 @@ public:
 
     virtual SwFieldType*    ChgTyp( SwFieldType* );
     virtual void            SetLanguage(USHORT nLng);
-//  os: wozu war das denn da?
-//  virtual void            ChangeFormat(ULONG n);
 
     inline SwDoc*           GetDoc() const          { return ((SwValueFieldType*)GetTyp())->GetDoc(); }
 
diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx
index ddb950b35ae2..8db24243b4e1 100644
--- a/sw/inc/flddat.hxx
+++ b/sw/inc/flddat.hxx
@@ -44,7 +44,7 @@ class Time;
 enum SwDateFormat
 {
     DF_BEGIN,
-    //neue Formate:
+    // new formats
     DFF_SSYS = DF_BEGIN,
     DFF_LSYS ,
     DFF_DMY ,
@@ -63,7 +63,7 @@ enum SwDateFormat
     DFF_YMD ,
     DFF_YYMD ,
     DF_END ,
-//  Kompatibilitaet:
+    // Compatibility
     DF_SSYS     = DFF_SSYS,
     DF_LSYS     = DFF_LSYS,
     DF_SHORT    = DFF_DMY,
@@ -114,7 +114,7 @@ public:
 class SW_DLLPUBLIC SwDateTimeField : public SwValueField
 {
         USHORT              nSubType;
-        long                nOffset;    // Offset in Minuten
+        long                nOffset;    // Offset in Minutes
 
 public:
         SwDateTimeField(SwDateTimeFieldType* pType, USHORT nSubType = DATEFLD,
diff --git a/sw/inc/flypos.hxx b/sw/inc/flypos.hxx
index c0c358b79ed6..ccc2ad73452b 100644
--- a/sw/inc/flypos.hxx
+++ b/sw/inc/flypos.hxx
@@ -39,7 +39,6 @@ class SwNodeIndex;
 class SW_DLLPUBLIC SwPosFlyFrm
 {
     const SwFrmFmt* pFrmFmt;    // das FlyFrmFmt
-//  SwPosition* pPos;           // Position in den ContentNode
     SwNodeIndex* pNdIdx;        // es reicht ein Index auf den Node
     UINT32 nOrdNum;
 public:
diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx
index ab6cc9d91af1..6dc4f08f10e0 100644
--- a/sw/inc/fmtanchr.hxx
+++ b/sw/inc/fmtanchr.hxx
@@ -48,7 +48,7 @@ class SW_DLLPUBLIC SwFmtAnchor: public SfxPoolItem
     RndStdIds  nAnchorId;
     USHORT     nPageNum;        //Seitennummer bei Seitengeb. Rahmen.
 
-    // OD 2004-05-05 #i28701# - getting anchor positions ordered
+    // #i28701# - getting anchor positions ordered
     sal_uInt32 mnOrder;
     static sal_uInt32 mnOrderCounter;
 
@@ -60,7 +60,7 @@ public:
     //  Zuweisungsoperator
     SwFmtAnchor &operator=( const SwFmtAnchor& );
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -75,7 +75,7 @@ public:
     RndStdIds GetAnchorId() const { return nAnchorId; }
     USHORT GetPageNum() const { return nPageNum; }
     const SwPosition *GetCntntAnchor() const { return pCntntAnchor; }
-    // OD 2004-05-05 #i28701#
+    // #i28701#
     sal_uInt32 GetOrder() const;
 
     void SetType( RndStdIds nRndId ) { nAnchorId = nRndId; }
diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx
index 9d8775f6f121..ba97935d3c92 100644
--- a/sw/inc/fmtclbl.hxx
+++ b/sw/inc/fmtclbl.hxx
@@ -40,7 +40,7 @@ public:
     SwFmtNoBalancedColumns( BOOL bFlag = FALSE )
         : SfxBoolItem( RES_COLUMNBALANCE, bFlag ) {}
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
 };
 
diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx
index 45acfcfc0597..4eb70e3fe58e 100644
--- a/sw/inc/fmtclds.hxx
+++ b/sw/inc/fmtclds.hxx
@@ -78,7 +78,6 @@ enum SwColLineAdj
 
 class SW_DLLPUBLIC SwFmtCol : public SfxPoolItem
 {
-//  Pen      aPen;          //Pen fuer die Linine zwischen den Spalten
     ULONG   nLineWidth;     //width of the separator line
     Color   aLineColor;     //color of the separator line
 
@@ -107,7 +106,7 @@ public:
 
     SwFmtCol& operator=( const SwFmtCol& );
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -122,7 +121,7 @@ public:
     const SwColumns &GetColumns() const { return aColumns; }
           SwColumns &GetColumns()       { return aColumns; }
     USHORT           GetNumCols() const { return aColumns.Count(); }
-//  const Pen&       GetLinePen() const { return aPen; }
+
     ULONG           GetLineWidth() const  { return nLineWidth;}
     const Color&    GetLineColor() const { return aLineColor;}
 
@@ -136,7 +135,6 @@ public:
     //Return die kleinste Breite wenn bMin True ist.
     USHORT GetGutterWidth( BOOL bMin = FALSE ) const;
 
-//  void SetLinePen( const Pen& rNew )  { aPen = rNew; }
     void SetLineWidth(ULONG nLWidth)        { nLineWidth = nLWidth;}
     void SetLineColor(const Color& rCol )   { aLineColor = rCol;}
     void SetLineHeight( BYTE nNew )     { nLineHeight = nNew; }
diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx
index ef5fbf6e4970..acfe46844cf3 100644
--- a/sw/inc/fmtcnct.hxx
+++ b/sw/inc/fmtcnct.hxx
@@ -51,7 +51,7 @@ public:
 
     inline SwFmtChain &operator=( const SwFmtChain& );
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx
index 39cf3c51e27f..07163c955b1a 100644
--- a/sw/inc/fmtcntnt.hxx
+++ b/sw/inc/fmtcntnt.hxx
@@ -44,12 +44,11 @@ class SW_DLLPUBLIC SwFmtCntnt: public SfxPoolItem
     SwFmtCntnt &operator=( const SwFmtCntnt & ); //Kopieren verboten
 
 public:
-//  SwFmtCntnt( const SwNodeIndex *pStartNodeIdx = 0 );
     SwFmtCntnt( const SwStartNode* pStartNode = 0 );
     SwFmtCntnt( const SwFmtCntnt &rCpy );
     ~SwFmtCntnt();
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
 
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 34f2e64db731..10357a0fa96e 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -50,27 +50,23 @@ protected:
           : SwFmt( rPool, rFmtName, pWhichRanges, pDerFrom, nFmtWhich )
     { SetAuto( FALSE ); }
 
-
 private:
     // erstmal wird nicht kopiert und nicht zugewiesen
     SwFmtColl(const SwFmtColl & );
     const SwFmtColl &operator=(const SwFmtColl &);
 };
 
-
 class SW_DLLPUBLIC SwTxtFmtColl: public SwFmtColl
 {
     friend class SwDoc;
 
     SwTxtFmtColl(const SwTxtFmtColl & rRef);
 
-    // --> OD 2007-01-24 #i73790#
     bool mbStayAssignedToListLevelOfOutlineStyle;
-    // <--
 
 protected:
-    //BYTE nOutlineLevel;        //<-#outline level, removed by zhaojianwei
-    bool mbAssignedToOutlineStyle;//<-#outline level added by zhaojianwei
+
+    bool mbAssignedToOutlineStyle;
 
     SwTxtFmtColl *pNextTxtFmtColl;
 
@@ -79,11 +75,9 @@ protected:
                     USHORT nFmtWh = RES_TXTFMTCOLL )
         : SwFmtColl( rPool, pFmtCollName, aTxtFmtCollSetRange,
                         pDerFrom, nFmtWh ),
-          // --> OD 2007-01-24 #i73790#
           mbStayAssignedToListLevelOfOutlineStyle( false ),
-          // <--
-          //nOutlineLevel( NO_NUMBERING )   //<-#outline level,removed by zhaojianwei
-          mbAssignedToOutlineStyle(false)   //<-#outline level,added by zhaojianwei
+
+          mbAssignedToOutlineStyle(false)
     { pNextTxtFmtColl = this; }
 
     SwTxtFmtColl( SwAttrPool& rPool, const String &rFmtCollName,
@@ -91,11 +85,10 @@ protected:
                     USHORT nFmtWh = RES_TXTFMTCOLL )
         : SwFmtColl( rPool, rFmtCollName, aTxtFmtCollSetRange,
                         pDerFrom, nFmtWh ),
-          // --> OD 2007-01-24 #i73790#
+
           mbStayAssignedToListLevelOfOutlineStyle( false ),
-          // <--
-          //nOutlineLevel( NO_NUMBERING )   //<-#outline level,removed by zhaojianwei
-          mbAssignedToOutlineStyle(false)   //<-#outline level,added by zhaojianwei
+
+          mbAssignedToOutlineStyle(false)
     { pNextTxtFmtColl = this; }
 public:
 
@@ -109,8 +102,6 @@ public:
 
     BOOL IsAtDocNodeSet() const;
 
-    // --> OD 2006-11-22 #i71574#
-   //<-#outline level,zhaojianwei
     void SetAttrOutlineLevel( int );
     int  GetAttrOutlineLevel() const;
     int  GetAssignedOutlineStyleLevel() const;
@@ -120,18 +111,13 @@ public:
     }
     void AssignToListLevelOfOutlineStyle(const int nAssignedListLevel);
     void DeleteAssignmentToListLevelOfOutlineStyle();
-    //<-end
-    // <--
 
-    // --> OD 2008-03-04 #refactorlists#
     // override to recognize changes on the <SwNumRuleItem> and register/unregister
     // the paragragh style at the corresponding <SwNumRule> instance
     virtual BOOL SetFmtAttr( const SfxPoolItem& rAttr );
     virtual BOOL SetFmtAttr( const SfxItemSet& rSet );
     virtual BOOL ResetFmtAttr( USHORT nWhich1, USHORT nWhich2 = 0 );
-    // <--
 
-    // --> OD 2007-01-24 #i73790#
     // override <ResetAllFmtAttr()> to stay assigned to list level of outline style
     virtual USHORT ResetAllFmtAttr();
 
@@ -139,13 +125,10 @@ public:
     {
         return mbStayAssignedToListLevelOfOutlineStyle;
     }
-    // <--
 
-    // --> OD 2008-02-13 #newlistleveattrs#
     bool AreListLevelIndentsApplicable() const;
-    // <--
 
-/*----------------- JP 09.08.94 17:36 -------------------
+/*
  wird die Funktionalitaet von Zeichenvorlagen an Absatzvorlagen
  ueberhaupt benoetigt ??
 
@@ -173,7 +156,6 @@ inline SwCharFmt* SwTxtFmtColl::GetCharFmt() const
 typedef SwTxtFmtColl* SwTxtFmtCollPtr;
 SV_DECL_PTRARR(SwTxtFmtColls,SwTxtFmtCollPtr,2,4)
 
-
 class SwGrfFmtColl: public SwFmtColl
 {
     friend class SwDoc;
@@ -197,8 +179,6 @@ public:
 typedef SwGrfFmtColl* SwGrfFmtCollPtr;
 SV_DECL_PTRARR(SwGrfFmtColls,SwGrfFmtCollPtr,2,4)
 
-
-
 //FEATURE::CONDCOLL
 // --------- Bedingte Vorlagen -------------------------------
 
@@ -218,7 +198,6 @@ enum Master_CollConditions
     USRFLD_EXPRESSION   = (int)0x8000
 };
 
-
 class SW_DLLPUBLIC SwCollCondition : public SwClient
 {
     ULONG nCondition;
@@ -231,7 +210,6 @@ class SW_DLLPUBLIC SwCollCondition : public SwClient
 public:
     TYPEINFO();     //Bereits in Basisklasse Client drin.
 
-
     SwCollCondition( SwTxtFmtColl* pColl, ULONG nMasterCond,
                     ULONG nSubCond = 0 );
     SwCollCondition( SwTxtFmtColl* pColl, ULONG nMasterCond,
@@ -258,7 +236,6 @@ public:
     SwTxtFmtColl* GetTxtFmtColl() const     { return (SwTxtFmtColl*)GetRegisteredIn(); }
 };
 
-
 typedef SwCollCondition* SwCollConditionPtr;
 SV_DECL_PTRARR_DEL( SwFmtCollConditions, SwCollConditionPtr, 0, 5 )
 
@@ -282,9 +259,6 @@ public:
 
     virtual ~SwConditionTxtFmtColl();
 
-    // zum "abfischen" von Aenderungen
-//  virtual void Modify( SfxPoolItem*, SfxPoolItem* );
-
     const SwCollCondition* HasCondition( const SwCollCondition& rCond ) const;
     const SwFmtCollConditions& GetCondColls() const     { return aCondColls; }
     void InsertCondition( const SwCollCondition& rCond );
diff --git a/sw/inc/fmtcolfunc.hxx b/sw/inc/fmtcolfunc.hxx
index 87dec890101a..296a45c79791 100644
--- a/sw/inc/fmtcolfunc.hxx
+++ b/sw/inc/fmtcolfunc.hxx
@@ -38,7 +38,7 @@ namespace TxtFmtCollFunc
     /** Checks, if assignment of paragraph style to list level of outline style
         has to be deleted, and deletes the assignment, if needed.
 
-        OD 2006-11-22 #i71574#
+        #i71574#
         The assignment of a paragraph style to a list level of the outline style
         has to be deleted, if the numbering rule, which is set at the paragraph
         style isn't the outline style.
@@ -51,8 +51,6 @@ namespace TxtFmtCollFunc
 
     /** determines the list style, which directly set at the given paragraph style
 
-        OD 2008-03-04 #refactorlists#
-
         @author OD
 
         @param rTxtFmtColl
@@ -65,7 +63,6 @@ namespace TxtFmtCollFunc
 
     /** adds the given paragraph style at the directly set list style
 
-        OD 2008-03-04 #refactorlists#
         Note: If the given paragraph style has no directly set list style, nothing happens
 
         @param rTxtFmtColl
@@ -77,7 +74,6 @@ namespace TxtFmtCollFunc
 
     /** removes te given paragraph style from the directly set list style
 
-        OD 2008-03-04 #refactorlists#
         Note: If the given paragraph style has no directly set list style, nothing happens
 
         @param rTxtFmtColl
diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx
index c8ba2f4538a8..5880557e0704 100644
--- a/sw/inc/fmteiro.hxx
+++ b/sw/inc/fmteiro.hxx
@@ -42,7 +42,7 @@ public:
     SwFmtEditInReadonly( USHORT nId = RES_EDIT_IN_READONLY,
                      BOOL bPrt = FALSE ) : SfxBoolItem( nId, bPrt ) {}
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methos" of SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx
index f40452edf101..fd8921650d2f 100644
--- a/sw/inc/fmtflcnt.hxx
+++ b/sw/inc/fmtflcnt.hxx
@@ -40,12 +40,12 @@ class SwFmtFlyCnt : public SfxPoolItem
     friend class SwTxtFlyCnt;
     SwTxtFlyCnt* pTxtAttr;      // mein TextAttribut
     SwFrmFmt* pFmt;             // mein Fly/DrawFrame-Format
-    // geschuetzter CopyCtor
+    // protected CopyCtor
     SwFmtFlyCnt& operator=(const SwFmtFlyCnt& rFlyCnt);
 
 public:
     SwFmtFlyCnt( SwFrmFmt *pFrmFmt );
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
 
@@ -57,7 +57,6 @@ public:
     const SwTxtFlyCnt *GetTxtFlyCnt() const { return pTxtAttr; }
           SwTxtFlyCnt *GetTxtFlyCnt()       { return pTxtAttr; }
 
-    // OD 27.06.2003 #108784#
     bool Sw3ioExportAllowed() const;
 };
 
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index 991a12d27aa5..33ebafb5068d 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -50,7 +50,7 @@ class SW_DLLPUBLIC SwFmtFld : public SfxPoolItem, public SwClient, public SfxBro
 
     SwFmtFld();             // das default-Attibut
 
-    // geschuetzter CopyCtor
+    // protected CopyCtor
     // @@@ copy construction allowed, but copy assignment is not? @@@
     SwFmtFld& operator=(const SwFmtFld& rFld);
 
@@ -65,7 +65,7 @@ public:
 
     virtual ~SwFmtFld();
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
 
@@ -75,7 +75,6 @@ public:
     const SwField *GetFld() const   { return pField; }
     SwField *GetFld()               { return pField; }
 
-    // #111840#
     /**
        Sets current field.
 
diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx
index fa7cb6ee84ab..ab0bc99a46b0 100644
--- a/sw/inc/fmtfollowtextflow.hxx
+++ b/sw/inc/fmtfollowtextflow.hxx
@@ -44,7 +44,7 @@ public:
 
     TYPEINFO();
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx
index 7e97e669f614..4410dbc83dff 100644
--- a/sw/inc/fmtfordr.hxx
+++ b/sw/inc/fmtfordr.hxx
@@ -50,7 +50,7 @@ public:
     SwFmtFillOrder( SwFillOrder = ATT_TOP_DOWN );
     inline SwFmtFillOrder &operator=( const SwFmtFillOrder &rCpy );
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual USHORT          GetValueCount() const;
 
diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx
index 7af1d51f4ff0..660f33dc7fb7 100644
--- a/sw/inc/fmtfsize.hxx
+++ b/sw/inc/fmtfsize.hxx
@@ -73,7 +73,7 @@ public:
                   SwTwips nWidth = 0, SwTwips nHeight = 0 );
     SwFmtFrmSize& operator=( const SwFmtFrmSize& rCpy );
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx
index a1d8f3692e55..85f9ca390ca6 100644
--- a/sw/inc/fmtftn.hxx
+++ b/sw/inc/fmtftn.hxx
@@ -40,12 +40,12 @@ class SwTxtFtn;
 class SW_DLLPUBLIC SwFmtFtn: public SfxPoolItem
 {
     friend class SwTxtFtn;
-    SwTxtFtn* pTxtAttr;     //mein TextAttribut
-    String  aNumber;        //Benutzerdefinierte 'Nummer'
-    USHORT  nNumber;        //Automatische Nummerierung
+    SwTxtFtn* pTxtAttr;     //my TextAttribute
+    String  aNumber;        //user-defined 'Number'
+    USHORT  nNumber;        //automatic numbering
     bool    m_bEndNote;     // is it an End note?
 
-    // geschuetzter CopyCtor
+    // protected CopyCtor
     SwFmtFtn& operator=(const SwFmtFtn& rFtn);
     SwFmtFtn( const SwFmtFtn& );
 
@@ -53,7 +53,7 @@ public:
     SwFmtFtn( bool bEndNote = false );
     virtual ~SwFmtFtn();
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
 
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index ddfe8825c502..f59b77955f8f 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -69,13 +69,6 @@ public:
     virtual bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
     virtual bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
 
-// will be used at time??
-//  void                    FillVariable( SbxVariable &rVar,
-//                                        SfxMapUnit eCoreMetric,
-//                                        SfxMapUnit eUserMetric ) const;
-//  virtual SfxArgumentError SetVariable( const SbxVariable &rVal,
-//                                        SfxMapUnit eCoreMetric,
-//                                        SfxMapUnit eUserMetric );
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx
index 1059c43bd316..3ae0cedfcf5f 100644
--- a/sw/inc/fmthdft.hxx
+++ b/sw/inc/fmthdft.hxx
@@ -37,8 +37,8 @@ class SwFrmFmt;
 class IntlWrapper;
 
 
-//Kopfzeile, fuer Seitenformate
-//Client von FrmFmt das den Header beschreibt.
+//Header, for PageFormats
+//Client of FrmFmt discribing the header.
 
 class SW_DLLPUBLIC SwFmtHeader: public SfxPoolItem, public SwClient
 {
@@ -53,7 +53,7 @@ public:
 
     TYPEINFO();
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -69,8 +69,8 @@ public:
     void SetActive( BOOL bNew = TRUE ) { bActive = bNew; }
 };
 
-//Fusszeile, fuer Seitenformate
-//Client von FrmFmt das den Footer beschreibt.
+//Footer, for pageformats
+//Client of FrmFmt describing the footer
 
 class SW_DLLPUBLIC SwFmtFooter: public SfxPoolItem, public SwClient
 {
@@ -85,7 +85,7 @@ public:
 
     TYPEINFO();
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx
index 17ded9853de4..332c0e0961ad 100644
--- a/sw/inc/fmtinfmt.hxx
+++ b/sw/inc/fmtinfmt.hxx
@@ -43,13 +43,13 @@ class SW_DLLPUBLIC SwFmtINetFmt: public SfxPoolItem
 {
     friend class SwTxtINetFmt;
 
-    String aURL;                    // die URL
+    String aURL;                    // URL
     String aTargetFrame;            // in diesen Frame soll die URL
     String aINetFmt;
     String aVisitedFmt;
-    String aName;                   // Name des Links
+    String aName;                   // name of the link
     SvxMacroTableDtor* pMacroTbl;
-    SwTxtINetFmt* pTxtAttr;         // mein TextAttribut
+    SwTxtINetFmt* pTxtAttr;         // my TextAttribute
     USHORT nINetId;
     USHORT nVisitedId;
 public:
@@ -60,7 +60,7 @@ public:
 
     TYPEINFO();
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -97,11 +97,11 @@ public:
     USHORT GetVisitedFmtId() const          { return nVisitedId; }
     void SetVisitedFmtId( USHORT nNew )     { nVisitedId = nNew; }
 
-    // setze eine neue oder loesche die akt. MakroTabelle
+    // set a new MacroTable or clear the current one
     void SetMacroTbl( const SvxMacroTableDtor* pTbl = 0 );
     const SvxMacroTableDtor* GetMacroTbl() const    { return pMacroTbl; }
 
-    // setze / erfrage ein Makro
+    // Macro getter and setter
     void SetMacro( USHORT nEvent, const SvxMacro& rMacro );
     const SvxMacro* GetMacro( USHORT nEvent ) const;
 };
diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx
index cdd0c349f629..4c3658bc9468 100644
--- a/sw/inc/fmtline.hxx
+++ b/sw/inc/fmtline.hxx
@@ -47,7 +47,7 @@ public:
 
     TYPEINFO();
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx
index b700cc3a8046..99126a0ba2eb 100644
--- a/sw/inc/fmtlsplt.hxx
+++ b/sw/inc/fmtlsplt.hxx
@@ -40,7 +40,7 @@ class SW_DLLPUBLIC SwFmtLayoutSplit : public SfxBoolItem
 public:
     SwFmtLayoutSplit( BOOL bSplit = TRUE ) : SfxBoolItem( RES_LAYOUT_SPLIT, bSplit ) {}
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx
index 58351442b4f3..c7cdc895b70a 100644
--- a/sw/inc/fmtornt.hxx
+++ b/sw/inc/fmtornt.hxx
@@ -53,7 +53,7 @@ public:
                      sal_Int16 eRel = com::sun::star::text::RelOrientation::PRINT_AREA );
     inline SwFmtVertOrient &operator=( const SwFmtVertOrient &rCpy );
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -73,7 +73,7 @@ public:
     void    SetPos( SwTwips nNew ) { nYPos = nNew; }
 };
 
-//SwFmtHoriOrient, wie und woran orientiert --
+//  SwFmtHoriOrient, wie und woran orientiert --
 //  sich der FlyFrm in der Hoizontalen ----------
 
 #define IVER_HORIORIENT_TOGGLE ((USHORT)0x0001)
@@ -91,7 +91,7 @@ public:
         sal_Int16 eRel = com::sun::star::text::RelOrientation::PRINT_AREA, BOOL bPos = FALSE );
     inline SwFmtHoriOrient &operator=( const SwFmtHoriOrient &rCpy );
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx
index 5ed51fd6817d..505aa3b2b0fd 100644
--- a/sw/inc/fmtpdsc.hxx
+++ b/sw/inc/fmtpdsc.hxx
@@ -65,7 +65,7 @@ public:
 
     TYPEINFO();
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx
index 4682c51bd46f..1eb7232d82da 100644
--- a/sw/inc/fmtrfmrk.hxx
+++ b/sw/inc/fmtrfmrk.hxx
@@ -41,7 +41,7 @@ class SwFmtRefMark : public SfxPoolItem
     friend class SwTxtRefMark;
     SwTxtRefMark* pTxtAttr;     // mein TextAttribut
 
-    // geschuetzter CopyCtor
+    // protected CopyCtor
     SwFmtRefMark& operator=(const SwFmtRefMark& rRefMark);
     String aRefName;
 
@@ -50,7 +50,7 @@ public:
     SwFmtRefMark( const SwFmtRefMark& rRefMark );
     ~SwFmtRefMark( );
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
 
diff --git a/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx
index 6b01ba4777aa..3ac1b2a2e527 100644
--- a/sw/inc/fmtrowsplt.hxx
+++ b/sw/inc/fmtrowsplt.hxx
@@ -40,7 +40,7 @@ class SW_DLLPUBLIC SwFmtRowSplit : public SfxBoolItem
 public:
     SwFmtRowSplit( BOOL bSplit = TRUE ) : SfxBoolItem( RES_ROW_SPLIT, bSplit ) {}
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx
index 1e30ad697938..81f0de4907ed 100644
--- a/sw/inc/fmtruby.hxx
+++ b/sw/inc/fmtruby.hxx
@@ -52,7 +52,7 @@ public:
 
     SwFmtRuby& operator=( const SwFmtRuby& rAttr );
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
 
diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx
index 7f06c3d6f4cc..d33fd859bdeb 100644
--- a/sw/inc/fmtsrnd.hxx
+++ b/sw/inc/fmtsrnd.hxx
@@ -33,10 +33,7 @@
 #include <format.hxx>
 #include <svl/eitem.hxx>
 
-// --> OD 2006-08-15 #i68520# - refactoring
-// separate enumeration <SwSurround> in own header file
 #include <fmtsrndenum.hxx>
-// <--
 class IntlWrapper;
 
 //SwFmtSurround, wie soll sich der ---------------
@@ -52,7 +49,7 @@ public:
     SwFmtSurround( const SwFmtSurround & );
     inline SwFmtSurround &operator=( const SwFmtSurround &rCpy );
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual Methods" of SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
     virtual USHORT          GetValueCount() const;
diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx
index f9661580e5b5..17bb84a43782 100644
--- a/sw/inc/fmturl.hxx
+++ b/sw/inc/fmturl.hxx
@@ -41,8 +41,8 @@ class IntlWrapper;
 class SW_DLLPUBLIC SwFmtURL: public SfxPoolItem
 {
     String    sTargetFrameName; // in diesen Frame soll die URL
-    String    sURL;             //Einfache URL
-    String    sName;            // Name des Anchors
+    String    sURL;             // simple URL
+    String    sName;            // Name of the anchor
     ImageMap *pMap;             //ClientSide Images
 
     BOOL      bIsServerMap;     //mit der URL eine ServerSideImageMap
@@ -57,7 +57,7 @@ public:
 
     virtual ~SwFmtURL();
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -70,7 +70,7 @@ public:
 
     void SetTargetFrameName( const String& rStr ) { sTargetFrameName = rStr; }
     void SetURL( const String &rURL, BOOL bServerMap );
-    void SetMap( const ImageMap *pM );  //Pointer wird kopiert!
+    void SetMap( const ImageMap *pM );  //Pointer will be copied
 
     const String   &GetTargetFrameName()const { return sTargetFrameName; }
     const String   &GetURL()            const { return sURL; }
diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx
index d7b0a1176961..e7e0bc22eb58 100644
--- a/sw/inc/fmtwrapinfluenceonobjpos.hxx
+++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx
@@ -41,11 +41,10 @@ private:
 public:
     TYPEINFO();
 
-    // --> OD 2004-10-18 #i35017# - constant name has changed
+    // #i35017# - constant name has changed
     SwFmtWrapInfluenceOnObjPos(
             sal_Int16 _nWrapInfluenceOnPosition =
             com::sun::star::text::WrapInfluenceOnPosition::ONCE_CONCURRENT );
-    // <--
     SwFmtWrapInfluenceOnObjPos(
             const SwFmtWrapInfluenceOnObjPos& _rCpy );
     ~SwFmtWrapInfluenceOnObjPos();
@@ -62,11 +61,10 @@ public:
 
     // direct accessors to data
     void SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition );
-    // --> OD 2004-10-18 #i35017# - add parameter <_bIterativeAsOnceConcurrent>
+    // #i35017# - add parameter <_bIterativeAsOnceConcurrent>
     // to control, if value <ITERATIVE> has to be treated as <ONCE_CONCURRENT>
     sal_Int16 GetWrapInfluenceOnObjPos(
                         const bool _bIterativeAsOnceConcurrent = false ) const;
-    // <--
 };
 
 inline const SwFmtWrapInfluenceOnObjPos& SwAttrSet::GetWrapInfluenceOnObjPos(BOOL bInP) const
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index ecb2de67cfbb..ef5c8da16bfa 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -45,8 +45,6 @@ class SwDoc;
 
 class SW_DLLPUBLIC SwFmt : public SwModify
 {
-//  friend class SwSwgReader;
-//  friend class SwSwgWriter;
 
     String aFmtName;
     SwAttrSet aSet;
@@ -101,19 +99,14 @@ public:
                                           BOOL bInParents = TRUE ) const;
     inline SfxItemState GetItemState( USHORT nWhich, BOOL bSrchInParent = TRUE,
                                     const SfxPoolItem **ppItem = 0 ) const;
-    // --> OD 2008-03-03 #refactorlists#
-    // methods renamed and made virtual
     virtual BOOL SetFmtAttr( const SfxPoolItem& rAttr );
     virtual BOOL SetFmtAttr( const SfxItemSet& rSet );
     virtual BOOL ResetFmtAttr( USHORT nWhich1, USHORT nWhich2 = 0 );
-    // <--
 
-    // --> OD 2007-01-24 #i73790#
-    // Method renamed and made virtual
+
     // Nimmt alle Hints aus dem Delta-Array,
     // liefert die Anzahl der geloeschten Hints
     virtual USHORT ResetAllFmtAttr();
-    // <--
 
     inline SwFmt* DerivedFrom() const { return (SwFmt*)pRegisteredIn; }
     inline BOOL IsDefault() const { return DerivedFrom() == 0; }
@@ -187,7 +180,6 @@ public:
     //              den Parents gesucht werden soll. Wird nichts gefunden,
     //              wird das deflt. Attribut returnt.
     // Charakter-Attribute  - impl. steht im charatr.hxx
-    // AMA 12.10.94: Umstellung von SwFmt... auf Svx...
     inline const SvxPostureItem      &GetPosture( BOOL = TRUE ) const;
     inline const SvxWeightItem       &GetWeight( BOOL = TRUE ) const;
     inline const SvxShadowedItem     &GetShadowed( BOOL = TRUE ) const;
@@ -264,9 +256,9 @@ public:
     inline const SvxFrameDirectionItem    &GetFrmDir( BOOL = TRUE ) const;
     inline const SwTextGridItem         &GetTextGrid( BOOL = TRUE ) const;
     inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( BOOL = TRUE ) const;
-    // OD 18.09.2003 #i18732#
+    // #i18732#
     inline const SwFmtFollowTextFlow    &GetFollowTextFlow(BOOL = TRUE) const;
-    // OD 2004-05-05 #i28701#
+    // #i28701#
     inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(BOOL = TRUE) const;
 
     // Grafik-Attribute - impl. steht im grfatr.hxx
@@ -306,9 +298,8 @@ public:
     inline  const SwTblBoxFormula       &GetTblBoxFormula( BOOL = TRUE ) const;
     inline  const SwTblBoxValue         &GetTblBoxValue( BOOL = TRUE ) const;
 
-    /** SwFmt::IsBackgroundTransparent - for feature #99657#
+    /** SwFmt::IsBackgroundTransparent
 
-        OD 22.08.2002
         Virtual method to determine, if background of format is transparent.
         Default implementation returns false. Thus, subclasses have to overload
         method, if the specific subclass can have a transparent background.
@@ -319,9 +310,8 @@ public:
     */
     virtual sal_Bool IsBackgroundTransparent() const;
 
-    /** SwFmt::IsShadowTransparent - for feature #99657#
+    /** SwFmt::IsShadowTransparent
 
-        OD 22.08.2002
         Virtual method to determine, if shadow of format is transparent.
         Default implementation returns false. Thus, subclasses have to overload
         method, if the specific subclass can have a transparent shadow.
@@ -333,7 +323,7 @@ public:
     virtual sal_Bool IsShadowTransparent() const;
 };
 
-// --------------- inline Implementierungen ------------------------
+// --------------- inline Implementations ------------------------
 
 inline const SfxPoolItem& SwFmt::GetFmtAttr( USHORT nWhich,
                                              BOOL bInParents ) const
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 8427b69a25b3..84e8265ee5ab 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -28,9 +28,7 @@
 #ifndef _FRMFMT_HXX
 #define _FRMFMT_HXX
 
-// --> OD 2004-08-06 #i28749#
 #include <com/sun/star/text/PositionLayoutDir.hpp>
-// <--
 
 #include <cppuhelper/weakref.hxx>
 
@@ -118,7 +116,6 @@ public:
 
     BOOL IsLowerOf( const SwFrmFmt& rFmt ) const;
 
-    // --> OD 2004-07-27 #i31698#
     enum tLayoutDir
     {
         HORI_L2R,
@@ -129,12 +126,9 @@ public:
 
     virtual SwFrmFmt::tLayoutDir GetLayoutDir() const;
     virtual void SetLayoutDir( const SwFrmFmt::tLayoutDir _eLayoutDir );
-    // <--
 
-    // --> OD 2004-08-06 #i28749#
     virtual sal_Int16 GetPositionLayoutDir() const;
     virtual void SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir );
-    // <--
 
     virtual String GetDescription() const;
 
@@ -185,18 +179,16 @@ public:
 
     virtual BOOL GetInfo( SfxPoolItem& rInfo ) const;
 
-    // --> OD 2009-07-14 #i73249#
     const String GetObjTitle() const;
     void SetObjTitle( const String& rTitle,
                       bool bBroadcast = false );
     const String GetObjDescription() const;
     void SetObjDescription( const String& rDescription,
                             bool bBroadcast = false );
-    // <--
 
-    /** SwFlyFrmFmt::IsBackgroundTransparent - for #99657#
+    /** SwFlyFrmFmt::IsBackgroundTransparent
 
-        OD 22.08.2002 - overloading virtual method and its default implementation,
+        overloading virtual method and its default implementation,
         because format of fly frame provides transparent backgrounds.
         Method determines, if background of fly frame is transparent.
 
@@ -207,9 +199,9 @@ public:
     */
     virtual sal_Bool IsBackgroundTransparent() const;
 
-    /** SwFlyFrmFmt::IsBackgroundBrushInherited - for #103898#
+    /** SwFlyFrmFmt::IsBackgroundBrushInherited
 
-        OD 08.10.2002 - method to determine, if the brush for drawing the
+        method to determine, if the brush for drawing the
         background is "inherited" from its parent/grandparent.
         This is the case, if no background graphic is set and the background
         color is "no fill"/"auto fill"
@@ -236,46 +228,34 @@ class SW_DLLPUBLIC SwDrawFrmFmt: public SwFrmFmt
     SwDrawFrmFmt( const SwDrawFrmFmt &rCpy );
     SwDrawFrmFmt &operator=( const SwDrawFrmFmt &rCpy );
 
-    // --> OD 2004-07-27 #i31698#
     SwFrmFmt::tLayoutDir meLayoutDir;
-    // <--
-    // --> OD 2004-08-06 #i28749#
+
     sal_Int16 mnPositionLayoutDir;
-    // <--
-    // --> OD 2005-03-11 #i44334#, #i44681#
+
     bool mbPosAttrSet;
-    // <--
+
 protected:
     SwDrawFrmFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
                     SwFrmFmt *pDrvdFrm )
         : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_DRAWFRMFMT ),
           pSdrObjCached(NULL),
-          // --> OD 2004-07-28 #i31698#
+
           meLayoutDir( SwFrmFmt::HORI_L2R ),
-          // <--
-          // --> OD 2004-08-06 #i28749#
-          // --> OD 2005-03-10 #i44344#, #i44681# - undo change of issue #i36010#
+
           mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ),
-          // <--
-          // --> OD 2005-03-11 #i44334#, #i44681#
+
           mbPosAttrSet( false )
-          // <--
 
     {}
     SwDrawFrmFmt( SwAttrPool& rPool, const String &rFmtNm,
                     SwFrmFmt *pDrvdFrm )
         : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_DRAWFRMFMT ),
           pSdrObjCached(NULL),
-          // --> OD 2004-07-28 #i31698#
           meLayoutDir( SwFrmFmt::HORI_L2R ),
-          // <--
-          // --> OD 2004-08-06 #i28749#
-          // --> OD 2005-03-10 #i44344#, #i44681# - undo change of issue #i36010#
+
           mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ),
-          // <--
-          // --> OD 2005-03-11 #i44334#, #i44681#
+
           mbPosAttrSet( false )
-          // <--
     {}
 
 public:
@@ -292,27 +272,19 @@ public:
 
     virtual Graphic MakeGraphic( ImageMap* pMap = NULL );
 
-    // --> OD 2004-07-27 #i31698#
     virtual SwFrmFmt::tLayoutDir GetLayoutDir() const;
     virtual void SetLayoutDir( const SwFrmFmt::tLayoutDir _eLayoutDir );
-    // <--
 
-    // --> OD 2004-08-06 #i28749#
     virtual sal_Int16 GetPositionLayoutDir() const;
     virtual void SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir );
-    // <--
 
-    // --> OD 2005-03-11 #i44334#, #i44681#
     inline bool IsPosAttrSet() const { return mbPosAttrSet; }
     inline void PosAttrSet() { mbPosAttrSet = true; }
-    // <--
 
-    // --> OD 2005-08-16 #i53320#
     inline void ResetPosAttr()
     {
         mbPosAttrSet = false;
     }
-    // <--
 
     virtual String GetDescription() const;
 
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 709a25692cd7..e2ab03362728 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -29,8 +29,6 @@
 #define _GLOBALS_HRC
 
 
-// Versions-Definition wie in solar.h und swtypes.hxx
-//#define SW_FILEFORMAT_40 3580
 
 #include "rcid.hrc"
 
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index 89d3f156f149..e22b31da6965 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -64,10 +64,10 @@ public:
         bGrfToggle( rMirrorGrf.IsGrfToggle() )
     {}
 
-    // pure virtual-Methoden von SfxPoolItem
+    // pure virtual methods of SfxPoolItem
     virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
 
-    // pure virtual-Methiden von SfxEnumItem
+    // pure virtual methods of SfxEnumItem
     virtual USHORT          GetValueCount() const;
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -105,7 +105,7 @@ public:
     SwCropGrf(  sal_Int32 nLeft,    sal_Int32 nRight,
                 sal_Int32 nTop,     sal_Int32 nBottom );
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual SfxPoolItem*        Clone( SfxItemPool *pPool = 0 ) const;
 };
 
@@ -120,7 +120,7 @@ public:
         : SfxUInt16Item( RES_GRFATR_ROTATION, nVal ), aUnrotatedSize( rSz )
     {}
 
-    // pure virtual-Methiden from SfxInt16Item
+    // pure virtual methods from SfxInt16Item
     virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -144,7 +144,7 @@ public:
         : SfxInt16Item( RES_GRFATR_LUMINANCE, nVal )
     {}
 
-    // pure virtual-Methiden from SfxInt16Item
+    // pure virtual methods from SfxInt16Item
     virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -160,7 +160,7 @@ public:
         : SfxInt16Item( RES_GRFATR_CONTRAST, nVal )
     {}
 
-    // pure virtual-Methiden from SfxInt16Item
+    // pure virtual methods from SfxInt16Item
     virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -177,7 +177,7 @@ protected:
     {}
 
 public:
-    // pure virtual-Methiden from SfxInt16Item
+    // pure virtual methods from SfxInt16Item
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
@@ -228,7 +228,7 @@ public:
             return *this;
         }
 
-    // pure virtual-Methiden von SfxEnumItem
+    // pure virtual methods from SfxEnumItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -254,7 +254,7 @@ public:
         : SfxBoolItem( RES_GRFATR_INVERT, bVal )
     {}
 
-    // pure virtual-Methiden from SfxInt16Item
+    // pure virtual methods from SfxInt16Item
     virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -270,7 +270,7 @@ public:
         : SfxByteItem( RES_GRFATR_TRANSPARENCY, nVal )
     {}
 
-    // pure virtual-Methiden from SfxInt16Item
+    // pure virtual methods from SfxInt16Item
     virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -290,10 +290,10 @@ public:
         : SfxEnumItem( RES_GRFATR_DRAWMODE, nMode )
     {}
 
-    // pure virtual-Methoden von SfxPoolItem
+    // pure virtual methods of SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
 
-    // pure virtual-Methiden von SfxEnumItem
+    // pure virtual methods of SfxEnumItem
     virtual USHORT          GetValueCount() const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 049abfa1afd3..3eb2c7ada8e9 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -220,7 +220,7 @@
 #define HID_MULTI_TOX_DLG           (HID_BASE + 305)
 #define HID_ASCII_FILTER            (HID_BASE + 306)
 #define HID_GLBLTREE_EDIT_LINK      (HID_BASE + 307)
-#define HID_FORMAT_NAME_OBJECT_NAME (HID_BASE + 308)// #100286#
+#define HID_FORMAT_NAME_OBJECT_NAME (HID_BASE + 308)
 #define HID_REFSELECTION_TOOLTIP    (HID_BASE + 309)    // #i83479#
 
 
diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx
index 77b4b0abc6dd..6dd5efbde153 100644
--- a/sw/inc/hfspacingitem.hxx
+++ b/sw/inc/hfspacingitem.hxx
@@ -41,7 +41,7 @@ public:
     SwHeaderAndFooterEatSpacingItem( USHORT nId = RES_HEADER_FOOTER_EAT_SPACING,
                                      BOOL bPrt = FALSE ) : SfxBoolItem( nId, bPrt ) {}
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index bcf7eae151eb..961ae8be2c6b 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -64,7 +64,6 @@ class SwHHCWrapper : public editeng::HangulHanjaConversion
     sal_Bool    bIsConvSpecial; // true if special regions: header, footer, ... should be converted
     sal_Bool    bStartDone;
     sal_Bool    bEndDone;
-//    sal_Bool    bLastRet;
 
     // from SvxSpellWrapper copied and modified
     sal_Bool    ConvNext_impl();        // former SpellNext
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index fe6ed9563db1..af0b83b148c4 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -28,12 +28,12 @@
 #ifndef _HINTIDS_HXX
 #define _HINTIDS_HXX
 
-#include <tools/solar.h>        // fuer __FAR_DATA
+#include <tools/solar.h>        // for __FAR_DATA
 #include <sal/types.h>          // for sal_Unicode
 #include "swdllapi.h"
 
 // fuer SwTxtHints ohne Endindex wird folgendes Zeichen eingefuegt:
-//JP 24.05.00: for the new UniCode Version:
+
 #define CH_TXTATR_BREAKWORD     ((sal_Unicode)0x01)
 #define CH_TXTATR_INWORD        ((sal_Unicode)0x02)
 #define CH_TXTATR_TAB           ((sal_Unicode)'\t')
@@ -45,7 +45,7 @@
 #define CH_TXT_ATR_FORMELEMENT ((sal_Unicode)0x06)
 
 /*
- * Hier kommen erst mal die enums fuer die Hints
+ * Enums for the hints
  */
 
 #define HINT_BEGIN  1
@@ -101,7 +101,7 @@ RES_CHRATR_BEGIN = HINT_BEGIN,
 RES_CHRATR_END
 };
 
-// diese Attribute stehen nur im SwpAttr-Array vom TextNode
+// this Attribute used only in a TextNodes SwpAttr-Array
 enum RES_TXTATR
 {
 RES_TXTATR_BEGIN = RES_CHRATR_END,
@@ -135,7 +135,7 @@ RES_TXTATR_WITHEND_BEGIN = RES_TXTATR_BEGIN ,
     RES_TXTATR_DUMMY5,                              // 50
 RES_TXTATR_WITHEND_END,
 
-// alle TextAttribute ohne ein Ende
+// all TextAttributes without an end
 RES_TXTATR_NOEND_BEGIN = RES_TXTATR_WITHEND_END,
     RES_TXTATR_FIELD = RES_TXTATR_NOEND_BEGIN,      // 51
     RES_TXTATR_FLYCNT,                              // 52
@@ -171,7 +171,6 @@ RES_PARATR_BEGIN = RES_TXTATR_END,
 RES_PARATR_END
 };
 
-// --> OD 2008-02-25 #refactorlists#
 // list attributes for paragraphs.
 // intentionally these list attributes are not contained in paragraph styles
 enum RES_PARATR_LIST
@@ -184,7 +183,6 @@ RES_PARATR_LIST_BEGIN = RES_PARATR_END,
     RES_PARATR_LIST_ISCOUNTED,                      // 79
 RES_PARATR_LIST_END
 };
-// <--
 
 enum RES_FRMATR
 {
@@ -224,12 +222,8 @@ RES_FRMATR_BEGIN = RES_PARATR_LIST_END,
     RES_FRAMEDIR,                                   // 112
     RES_HEADER_FOOTER_EAT_SPACING,                  // 113
     RES_ROW_SPLIT,                                  // 114
-    // OD 18.09.2003 #i18732# - insert new item and 5 dummies
     RES_FOLLOW_TEXT_FLOW,                           // 115
-// --> collapsing borders FME 2005-05-27 #i29550#
     RES_COLLAPSING_BORDERS,                         // 116
-// <-- collapsing
-    // OD 2004-05-04 #i28701# - use dummy1 for new item
     RES_WRAP_INFLUENCE_ON_OBJPOS,                   // 117
     RES_AUTO_STYLE,                                 // 118
     RES_FRMATR_STYLE_NAME,                          // 119
@@ -280,7 +274,7 @@ RES_UNKNOWNATR_END
 
 
 
-// ID-s fuer die Formate
+// Format IDs
 enum RES_FMT
 {
 RES_FMT_BEGIN = RES_UNKNOWNATR_END,
@@ -294,7 +288,7 @@ RES_FMT_BEGIN = RES_UNKNOWNATR_END,
 RES_FMT_END
 };
 
-// die ID's fuer Messages in den Formaten
+// ID's for Messages in the Formats
 enum RES_MSG
 {
 RES_MSG_BEGIN = RES_FMT_END,
@@ -325,9 +319,6 @@ RES_MSG_BEGIN = RES_FMT_END,
     RES_HIDDENPARA_PRINT,
     RES_CONDCOLL_CONDCHG,
     RES_VIRTPAGENUM_INFO,
-    // --> OD 2008-02-25 #refactorlists#
-//    RES_GETNUMNODES,
-    // <--
     RES_GETLOWERNUMLEVEL,
     RES_RESET_FMTWRITTEN,
     RES_REMOVE_UNO_OBJECT,
@@ -447,38 +438,38 @@ SW_DLLPUBLIC const SfxPoolItem* GetDfltAttr( USHORT nWhich );
 
 SW_DLLPUBLIC USHORT GetWhichOfScript( USHORT nWhich, USHORT nScript );
 
-// return for the given TextAttribut without an end the correct character.
+// return for the given TextAttribute without an end the correct character.
 // This function returns
-//      CH_TXTATR_BREAKWORD for Textattribut which breaks a word (default)
-//      CH_TXTATR_INWORD    for Textattribut which dont breaks a word
+//      CH_TXTATR_BREAKWORD for Textattribute which breaks a word (default)
+//      CH_TXTATR_INWORD    for Textattribute which dont breaks a word
 class SwTxtAttr;
 sal_Unicode GetCharOfTxtAttr( const SwTxtAttr& rAttr );
 
-// alle Sets stehen im init.cxx
+// all Sets defined in init.cxx
 
-// AttrSet-Range fuer die 3 Break-Attribute
+// AttrSet-Range for the 3 Break-Attribute
 extern USHORT __FAR_DATA aBreakSetRange[];
-// AttrSet-Range fuer die TxtFmtColl
+// AttrSet-Range for TxtFmtColl
 extern USHORT __FAR_DATA aTxtFmtCollSetRange[];
-// AttrSet-Range fuer die GrfFmtColl
+// AttrSet-Range for GrfFmtColl
 extern USHORT __FAR_DATA aGrfFmtCollSetRange[];
-// AttrSet-Range fuer die TextNode
+// AttrSet-Range for TextNode
 SW_DLLPUBLIC extern USHORT __FAR_DATA aTxtNodeSetRange[];
-// AttrSet-Range fuer die NoTxtNode
+// AttrSet-Range for NoTxtNode
 extern USHORT __FAR_DATA aNoTxtNodeSetRange[];
-// AttrSet-Range fuer die SwTable
+// AttrSet-Range for SwTable
 extern USHORT __FAR_DATA aTableSetRange[];
-// AttrSet-Range fuer die SwTableLine
+// AttrSet-Range for SwTableLine
 extern USHORT __FAR_DATA aTableLineSetRange[];
-// AttrSet-Range fuer die SwTableBox
+// AttrSet-Range for SwTableBox
 extern USHORT __FAR_DATA aTableBoxSetRange[];
-// AttrSet-Range fuer die SwFrmFmt
+// AttrSet-Range for SwFrmFmt
 SW_DLLPUBLIC extern USHORT __FAR_DATA aFrmFmtSetRange[];
-// AttrSet-Range fuer die SwCharFmt
+// AttrSet-Range for SwCharFmt
 extern USHORT __FAR_DATA aCharFmtSetRange[];
-// AttrSet-Range fuer die character autostyles
+// AttrSet-Range for the autostyles
 extern USHORT __FAR_DATA aCharAutoFmtSetRange[];
-// AttrSet-Range fuer die SwPageDescFmt
+// AttrSet-Range for SwPageDescFmt
 extern USHORT __FAR_DATA aPgFrmFmtSetRange[];
 
 // check if ID is InRange of AttrSet-Ids
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index a1b74979a63b..9381893d4de9 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -196,10 +196,10 @@ public:
 
     USHORT Count() const { return pChgSet->Count(); }
     void ClearItem( USHORT nWhichL = 0 )
-#ifndef DBG_UTIL
-    { pChgSet->ClearItem( nWhichL ); }
-#else
+#if OSL_DEBUG_LEVEL > 1
         ;
+#else
+    { pChgSet->ClearItem( nWhichL ); }
 #endif
 };
 
diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index 70e30c4a5128..58a5aeec2663 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -34,7 +34,7 @@
 #include <editeng/svxenum.hxx>
 
 #include "swtypes.hxx"
-#include "node.hxx"     // Fuer SwStartNode
+#include "node.hxx"     // For SwStartNode
 
 
 class SwTableBox;
@@ -92,8 +92,6 @@ public:
     BOOL HasNoBreakTag() const { return bNoBreakTag; }
 };
 
-/*  */
-
 class SwHTMLTableLayoutCell
 {
     SwHTMLTableLayoutCnts *pContents;       // der Inhalt der Zelle
@@ -131,8 +129,6 @@ public:
     BOOL HasNoWrapOption() const { return bNoWrapOption; }
 };
 
-/*  */
-
 class SwHTMLTableLayoutColumn
 {
     // Zwischenwerte von AutoLayoutPass1
@@ -185,8 +181,6 @@ public:
     BOOL HasLeftBorder() const { return bLeftBorder; }
 };
 
-/*  */
-
 class SwHTMLTableLayout
 {
     Timer aResizeTimer;             // Timer fuer DelayedResize
@@ -250,9 +244,6 @@ class SwHTMLTableLayout
     BOOL bMustNotRecalc : 1;        // Tabelle darf nicht an Inhalt angepasst
                                     // werden
 
-//  USHORT GetLeftBorderWidth( USHORT nCol ) const;
-//  USHORT GetRightBorderWidth( USHORT nCol, USHORT nColSpan ) const;
-
     void AddBorderWidth( ULONG &rMin, ULONG &rMax, ULONG& rAbsMin,
                          USHORT nCol, USHORT nColSpan,
                          BOOL bSwBorders=TRUE ) const;
@@ -378,8 +369,6 @@ public:
     BOOL MayBeInFlyFrame() const { return bMayBeInFlyFrame; }
 };
 
-/*  */
-
 inline void SwHTMLTableLayoutCell::SetProtected()
 {
     nRowSpan = 1;
@@ -388,8 +377,6 @@ inline void SwHTMLTableLayoutCell::SetProtected()
     pContents = 0;
 }
 
-/*  */
-
 inline void SwHTMLTableLayoutColumn::MergeMinMaxNoAlign( ULONG nCMin,
     ULONG nCMax,    ULONG nAbsMin )
 {
@@ -429,8 +416,6 @@ inline void SwHTMLTableLayoutColumn::SetMinMax( ULONG nMn, ULONG nMx )
     nMax = nMx;
 }
 
-/*  */
-
 inline USHORT SwHTMLTableLayout::GetInhCellSpace( USHORT nCol,
                                                   USHORT nColSpan ) const
 {
diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx
index b2e0642eb199..8a18d2d09996 100644
--- a/sw/inc/index.hxx
+++ b/sw/inc/index.hxx
@@ -41,17 +41,17 @@ class SwIndex;
 class SwIndexReg;
 struct SwPosition;
 
-#ifndef DBG_UTIL
-#define INLINE inline
-#else
+#if OSL_DEBUG_LEVEL > 1
 #define INLINE
+#else
+#define INLINE inline
 #endif
 
 class SW_DLLPUBLIC SwIndex
 {
     friend class SwIndexReg;
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     static int nSerial;
     int MySerial;
 #endif
@@ -148,7 +148,7 @@ public:
     void MoveTo( SwIndexReg& rArr );
 };
 
-#ifndef DBG_UTIL
+#if !defined(OSL_DEBUG_LEVEL) || OSL_DEBUG_LEVEL < 2
 
 inline xub_StrLen SwIndex::operator++()
 {
diff --git a/sw/inc/io.hxx b/sw/inc/io.hxx
index 7db22fc9de19..2a2cc76eed61 100644
--- a/sw/inc/io.hxx
+++ b/sw/inc/io.hxx
@@ -46,25 +46,6 @@
 #include <vcl/keycod.hxx>
 #include <tools/stream.hxx>
 
-/*$
-class BinaryFile {
-    int fd;
-public:
-    enum IO_OpenMode {
-        BF_READ = O_RDONLY,
-        BF_WRITE = O_RDWR,
-        BF_CREATE = O_CREAT,
-        BF_TRUNC = O_TRUNC
-    };
-        // ctor oeffnet File im BinearMode, dtor schliesst es
-    BinaryFile(const String &, int eOpenMode);
-    ~BinaryFile();
-    BOOL Ok() const {
-        return -1 != fd;
-    }
-    operator int() const { return fd; }
-};
-*/
 
 class SwIOin {
 private:
diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx
index 1fbf9b82262c..eb15b77cc747 100644
--- a/sw/inc/iodetect.hxx
+++ b/sw/inc/iodetect.hxx
@@ -33,15 +33,15 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <osl/endian.h>
-#include <errhdl.hxx>       // for ASSERT
+//#include <errhdl.hxx>     // for ASSERT
 #include <tools/string.hxx>
 #include <swdllapi.h>
 
-#define FILTER_RTF      "RTF"       // RTF-Filter
+#define FILTER_RTF      "RTF"       // RTF filter
 #define sRtfWH          "WH_RTF"
-#define FILTER_TEXT     "TEXT"      // Text-Filter mit Default-CodeSet
-#define FILTER_BAS      "BAS"       // StarBasic (identisch mit ANSI)
-#define FILTER_WW8      "CWW8"      // WinWord 97-Filter
+#define FILTER_TEXT     "TEXT"      // text filter with default codeset
+#define FILTER_BAS      "BAS"       // StarBasic (identical to ANSI)
+#define FILTER_WW8      "CWW8"      // WinWord 97 filter
 #define FILTER_TEXT_DLG "TEXT_DLG"  // text filter with encoding dialog
 #define FILTER_XML      "CXML"      // XML filter
 #define FILTER_XMLV     "CXMLV"     // XML filter
@@ -89,27 +89,27 @@ enum ReaderWriterEnum {
 
 extern SwIoDetect aFilterDetect[];
 
-// Die folgende Klasse ist ein Wrappe fuer die Basic-I/O-Funktionen
-// des Writer 3.0. Alles ist statisch. Alle u.a. Filternamen sind die
-// Writer-internen Namen, d.h. die namen, die in INSTALL.INI vor dem
-// Gleichheitszeichen stehen, z.b. SWG oder ASCII.
+// The following class is a wrapper for basic i/o functions of Writer 3.0.
+// Everything is static. All filter names mentioned are Writer-internal
+// names, i.e. the names in front of the equality sign in INSTALL.INI, like SWG
+// or ASCII.
 
 class SwIoSystem
 {
 public:
-    // suche ueber den internen FormatNamen den Filtereintrag
+    // find for an internal format name the corresponding filter entry
     SW_DLLPUBLIC static const SfxFilter* GetFilterOfFormat( const String& rFormat,
             const SfxFilterContainer* pCnt = 0 );
 
-    // Feststellen des zu verwendenden Filters fuer die uebergebene
-    // Datei. Der Filtername wird zurueckgeliefert. Konnte kein Filter
-    // zurueckgeliefert werden, wird der Name des ASCII-Filters geliefert!
+    // Detect for the given file which filter should be used. The filter name
+    // is returned. If no filter could be found, the name of the ASCII filter
+    // is returned!
     static const SfxFilter* GetFileFilter( const String& rFileName,
             const String& rPrefFltName,
             SfxMedium* pMedium = 0 );
 
-    // Feststellen ob das File in dem vorgegebenen Format vorliegt.
-    // Z.z werden nur unsere eigene Filter unterstuetzt!!
+    // Detect whether the given file is in the given format.
+    // For now, only our own filters are supported!
     static BOOL IsFileFilter( SfxMedium& rMedium, const String& rFmtName,
             const SfxFilter** ppFlt = 0 );
 
@@ -118,7 +118,6 @@ public:
 
     static bool IsDetectableText( const sal_Char* pBuf, ULONG &rLen,
             CharSet *pCharSet=0, bool *pSwap=0, LineEnd *pLineEnd=0, bool bEncodedFilter = false );
-    //    static bool IsDetectableW4W(const String& rFileName, const String& rUserData);
 
     static const SfxFilter* GetTextFilter( const sal_Char* pBuf, ULONG nLen );
 
diff --git a/sw/inc/itabenum.hxx b/sw/inc/itabenum.hxx
index 919e296593ef..a260659b2626 100644
--- a/sw/inc/itabenum.hxx
+++ b/sw/inc/itabenum.hxx
@@ -34,8 +34,6 @@ namespace tabopts
 {
     const USHORT DEFAULT_BORDER     = 0x01;
     const USHORT HEADLINE           = 0x02;
-//    const USHORT REPEAT             = 0x04;
-//    const USHORT HEADLINE_REPEAT    = 0x06;  // Headline + Repeat
     const USHORT SPLIT_LAYOUT       = 0x08;
     const USHORT HEADLINE_NO_BORDER = HEADLINE | SPLIT_LAYOUT;
     const USHORT ALL_TBL_INS_ATTR   = DEFAULT_BORDER | HEADLINE | SPLIT_LAYOUT;
diff --git a/sw/inc/list.hxx b/sw/inc/list.hxx
index 4bfc4d3ca1c7..659d9c119242 100644
--- a/sw/inc/list.hxx
+++ b/sw/inc/list.hxx
@@ -61,10 +61,6 @@ class SwList
 
         bool IsListLevelMarked( const int nListLevel ) const;
 
-//        void ContinueList( SwList& rList );
-//        const SwList* GetContinuedList() const;
-//        void ClearContinuation();
-
     private:
         // no copy constructor and no assignment operator
         SwList( const SwList& );
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx
index 6018065b23a4..ac142f37c7d5 100644
--- a/sw/inc/modcfg.hxx
+++ b/sw/inc/modcfg.hxx
@@ -41,7 +41,6 @@
 #include <tools/globname.hxx>
 class SwModuleOptions;
 
-//-----------------------------------------------------------------------------
 class InsCaptionOpt;
 typedef InsCaptionOpt* InsCaptionOptPtr;
 SV_DECL_PTRARR_SORT_DEL(InsCapOptArr, InsCaptionOptPtr, 0, 5)
@@ -54,9 +53,6 @@ protected:
     InsCaptionOpt* Find(const SwCapObjType eType, const SvGlobalName *pOleId = 0) const;
 };
 
-/* -----------------------------10.10.00 16:14--------------------------------
-
- ---------------------------------------------------------------------------*/
 class SwRevisionConfig : public utl::ConfigItem
 {
     friend class SwModuleOptions;
@@ -80,9 +76,7 @@ class SwRevisionConfig : public utl::ConfigItem
     void                    Load();
     void                    SetModified(){ConfigItem::SetModified();}
 };
-/* -----------------------------11.10.00 09:00--------------------------------
 
- ---------------------------------------------------------------------------*/
 class SwInsertConfig : public utl::ConfigItem
 {
     friend class SwModuleOptions;
@@ -94,10 +88,7 @@ class SwInsertConfig : public utl::ConfigItem
 
     sal_Bool            bInsWithCaption;       //Insert/Caption/Automatic   // Objekte beschriftet einfuegen
     sal_Bool            bCaptionOrderNumberingFirst; //#i61007# caption order starting with numbering
-//  sal_uInt16          nInsTblFlags;           //Insert/Table/Header       // Flags fuer Tabellen einfuegen
-                                                //Insert/Table/RepeatHeader
-                                                //Insert/Table/Split
-                                                //Insert/Table/Border
+
     SwInsertTableOptions    aInsTblOpts;
     sal_Bool            bIsWeb;
 
@@ -111,9 +102,7 @@ class SwInsertConfig : public utl::ConfigItem
     void                    Load();
     void                    SetModified(){ConfigItem::SetModified();}
 };
-/* -----------------------------11.10.00 09:00--------------------------------
 
- ---------------------------------------------------------------------------*/
 class SwTableConfig : public utl::ConfigItem
 {
     friend class SwModuleOptions;
@@ -138,9 +127,7 @@ class SwTableConfig : public utl::ConfigItem
     void                    Load();
     void                    SetModified(){ConfigItem::SetModified();}
 };
-/* -----------------------------18.01.01 16:57--------------------------------
 
- ---------------------------------------------------------------------------*/
 class SwMiscConfig : public utl::ConfigItem
 {
     friend class SwModuleOptions;
@@ -169,9 +156,6 @@ class SwMiscConfig : public utl::ConfigItem
     void                    SetModified(){ConfigItem::SetModified();}
 };
 
-/* ---------------------------------------------------------------------------
-
- ---------------------------------------------------------------------------*/
 class SW_DLLPUBLIC SwModuleOptions
 {
     SwRevisionConfig                aRevisionConfig;
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index f9f524bae7b5..a2018ae53151 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -39,7 +39,6 @@
 #include <bparr.hxx>
 #include <ndtyp.hxx>
 
-
 class Graphic;
 class GraphicObject;
 class String;
@@ -73,7 +72,6 @@ class SwUndoTblToTxt;
 class SwUndoTxtToTbl;
 struct SwPosition;
 
-
 // --------------------
 // class SwNodes
 // --------------------
@@ -91,13 +89,10 @@ class SW_DLLPUBLIC SwNodes: private BigPtrArray
 
     SwNodeIndex* pRoot;                 // Liste aller Indizies auf Nodes
 
-    // --> OD 2008-05-14 #refactorlists# - removed <bSyncNumberAndNumRule>
     void InsertNode( const SwNodePtr pNode,
                      const SwNodeIndex& rPos );
     void InsertNode( const SwNodePtr pNode,
                      ULONG nPos );
-    // <--
-
 
     SwDoc* pMyDoc;                      // in diesem Doc ist das Nodes-Array
 
@@ -142,8 +137,8 @@ public:
     SwNodePtr operator[]( ULONG n ) const
         { return (SwNodePtr)BigPtrArray::operator[] ( n ); }
 
-//JP 29.09.97: impl. steht im ndindex.hxx - sollte moeglichst bald auf die
-//              neue Schnittstelle angepasst werden
+    // impl. steht im ndindex.hxx - sollte moeglichst bald auf die
+    // neue Schnittstelle angepasst werden
     inline SwNodePtr operator[]( const SwNodeIndex& rIdx ) const;
 
     ULONG Count() const { return BigPtrArray::Count(); }
@@ -259,8 +254,7 @@ public:
         // fuege die Nodes fuer die Tabelle ein
         // wenn Lines angegeben, erzeuge die Matrix aus Lines & Boxen
         // ansonsten nur die Anzahl von Boxen.
-    /* #109161#
-
+    /*
        New parameter pAttrSet: If pAttrSet is non-null and contains an
        adjust item it is propagated to the table cells. If there is an
        adjust in pCntntTxtColl or pHeadlineTxtColl this adjust item
@@ -339,17 +333,13 @@ public:
     SwNode* FindPrvNxtFrmNode( SwNodeIndex& rFrmIdx,
                                 const SwNode* pEnd = 0 ) const;
 
-    //-> #112139#
     SwNode * DocumentSectionStartNode(SwNode * pNode) const;
     SwNode * DocumentSectionEndNode(SwNode * pNode) const;
-    //<- #112139#
 private:
     // privater Constructor, weil nie kopiert werden darf !!
     SwNodes( const SwNodes & rNodes );
 };
 
-
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index d98c30fde1f1..ba462e514670 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -30,14 +30,10 @@
 #include <sfx2/lnkbase.hxx>
 #include <svtools/grfmgr.hxx>
 #include <ndnotxt.hxx>
-// --> OD, MAV 2005-08-17 #i53025#
 #include <com/sun/star/embed/XStorage.hpp>
-// <--
-// --> OD 2007-03-28 #i73788#
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 class SwAsyncRetrieveInputStreamThreadConsumer;
-// <--
 
 class SwGrfFmtColl;
 class SwDoc;
@@ -53,7 +49,6 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
     GraphicObject aGrfObj;
     ::sfx2::SvBaseLinkRef refLink;       // falls Grafik nur als Link, dann Pointer gesetzt
     Size nGrfSize;
-//  String aStrmName;           // SW3: Name des Storage-Streams fuer Embedded
     String aNewStrmName;        // SW3/XML: new stream name (either SW3 stream
                                 // name or package url)
     String aLowResGrf;          // HTML: LowRes Grafik (Ersatzdarstellung bis
@@ -69,12 +64,10 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
                                     //SwapIn zu verhindern.
     BOOL bScaleImageMap         :1; //Image-Map in SetTwipSize skalieren
 
-    // --> OD 2007-01-19 #i73788#
     boost::shared_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer;
     bool mbLinkedInputStreamReady;
     com::sun::star::uno::Reference<com::sun::star::io::XInputStream> mxInputStream;
     sal_Bool mbIsStreamReadOnly;
-    // <--
 
     SwGrfNode( const SwNodeIndex& rWhere,
                const String& rGrfName, const String& rFltName,
@@ -94,21 +87,19 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
     void InsertLink( const String& rGrfName, const String& rFltName );
     BOOL ImportGraphic( SvStream& rStrm );
     BOOL HasStreamName() const { return aGrfObj.HasUserData(); }
-    // --> OD 2005-05-04 #i48434# - adjust return type and rename method to
+    // adjust return type and rename method to
     // indicate that its an private one.
-    // --> OD 2005-08-17 #i53025#
+
     // embedded graphic stream couldn't be inside a 3.1 - 5.2 storage any more.
     // Thus, return value isn't needed any more.
     void _GetStreamStorageNames( String& rStrmName, String& rStgName ) const;
-    // <--
+
     void DelStreamName();
     DECL_LINK( SwapGraphic, GraphicObject* );
 
     /** helper method to determine stream for the embedded graphic.
 
-        OD 2005-05-04 #i48434#
         Important note: caller of this method has to handle the thrown exceptions
-        OD, MAV 2005-08-17 #i53025#
         Storage, which should contain the stream of the embedded graphic, is
         provided via parameter. Otherwise the returned stream will be closed
         after the the method returns, because its parent stream is closed and deleted.
@@ -133,7 +124,6 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
 
     /** helper method to get a substorage of the document storage for readonly access.
 
-        OD, MAV 2005-08-17 #i53025#
         A substorage with the specified name will be opened readonly. If the provided
         name is empty the root storage will be returned.
 
@@ -175,7 +165,7 @@ public:
     inline BOOL IsScaleImageMap() const         { return bScaleImageMap; }
     inline void SetScaleImageMap( BOOL b )      { bScaleImageMap = b; }
 #endif
-        // steht in ndcopy.cxx
+        // in ndcopy.cxx
     virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const;
 #ifndef _FESHVIEW_ONLY_INLINE_NEEDED
 
@@ -217,7 +207,6 @@ public:
     GraphicAttr& GetGraphicAttr( GraphicAttr&, const SwFrm* pFrm ) const;
 
 #endif
-    // --> OD 2007-01-18 #i73788#
     boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > GetThreadConsumer();
     bool IsLinkedInputStreamReady() const;
     void TriggerAsyncRetrieveInputStream();
@@ -225,15 +214,11 @@ public:
         com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream,
         const sal_Bool bIsStreamReadOnly );
     void UpdateLinkWithInputStream();
-    // <--
-    // --> OD 2008-07-21 #i90395#
     bool IsAsyncRetrieveInputStreamPossible() const;
-    // <--
 };
 
-
 // ----------------------------------------------------------------------
-// Inline Metoden aus Node.hxx - erst hier ist der TxtNode bekannt !!
+// Inline methods from Node.hxx - erst hier ist der TxtNode bekannt !!
 inline       SwGrfNode   *SwNode::GetGrfNode()
 {
      return ND_GRFNODE == nNodeType ? (SwGrfNode*)this : 0;
@@ -254,7 +239,6 @@ inline BOOL SwGrfNode::IsLinkedDDE() const
 }
 #endif
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx
index 7d0769c9c2f7..29e8c13bd214 100644
--- a/sw/inc/ndhints.hxx
+++ b/sw/inc/ndhints.hxx
@@ -113,7 +113,7 @@ public:
         { return m_HintStarts[nIdx]; }
     inline USHORT Count() const { return m_HintStarts.Count(); }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     bool Check() const;
 #endif
 };
diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx
index 5a5b4867193c..cc0300793f61 100644
--- a/sw/inc/ndindex.hxx
+++ b/sw/inc/ndindex.hxx
@@ -43,7 +43,7 @@ class SW_DLLPUBLIC SwNodeIndex
     friend void SwNodes::DeRegisterIndex( SwNodeIndex& );
     friend void SwNodes::RemoveNode( ULONG, ULONG, BOOL );
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     static int nSerial;
     int MySerial;
 #endif
@@ -242,8 +242,8 @@ inline SwNodeIndex& SwNodeIndex::operator=( ULONG nWert )
 
 
 
-//JP 29.09.97: impl. steht im ndindex.hxx - sollte moeglichst bald auf die
-//              neue Schnittstelle angepasst werden
+// impl. steht im ndindex.hxx - sollte moeglichst bald auf die
+// neue Schnittstelle angepasst werden
 inline SwNode* SwNodes::operator[]( const SwNodeIndex& rIdx ) const
 {
     return &rIdx.GetNode();
diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx
index 2fd16508dc7b..d49752849339 100644
--- a/sw/inc/ndnotxt.hxx
+++ b/sw/inc/ndnotxt.hxx
@@ -41,8 +41,6 @@ class SW_DLLPUBLIC SwNoTxtNode : public SwCntntNode
     friend class SwNodes;
     friend class SwNoTxtFrm;
 
-//    String aAlternateText;      // alternativer Text  (HTML)
-
     PolyPolygon *pContour;      // Polygon fuer Konturumlauf
     BOOL bAutomaticContour : 1; // automatic contour polygon, not manipulated
     BOOL bContourMapModeValid : 1; // contour map mode is not the graphics's
@@ -80,10 +78,6 @@ public:
     void SetDescription( const String& rDescription,
                          bool bBroadcast = false );
 
-//    const String GetAlternateText() const;
-//    void SetAlternateText( const String& rTxt,
-//                           sal_Bool bBroadcast=sal_False );
-
     void               SetContour( const PolyPolygon *pPoly,
                                    BOOL bAutomatic = FALSE );
     const PolyPolygon *HasContour() const;
diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx
index ef9adde86338..c7c4d1d3a949 100644
--- a/sw/inc/ndole.hxx
+++ b/sw/inc/ndole.hxx
@@ -122,7 +122,6 @@ public:
 
     Graphic* GetGraphic();
 
-    Graphic* GetHCGraphic(); // tries to retrieve HighContrast representation if possible
     void GetNewReplacement();
 
     virtual BOOL SavePersistentData();
@@ -147,9 +146,9 @@ public:
 
     void CheckFileLink_Impl();
 
-    // --> OD 2009-03-05 #i99665#
+    // #i99665#
     bool IsChart() const;
-    // <--
+
 
 #ifndef _FESHVIEW_ONLY_INLINE_NEEDED
     const String& GetChartTblName() const       { return sChartTblName; }
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 2127e389e99e..0e62ce77e0f1 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -45,15 +45,10 @@
 #include <vector>
 #include <set>
 
-
 class SwNumRule;
 class SwNodeNum;
-// --> OD 2008-05-06 #refactorlists#
 class SwList;
-// <--
-// --> OD 2008-12-02 #i96772#
 class SvxLRSpaceItem;
-// <--
 
 namespace utl {
     class TransliterationWrapper;
@@ -65,7 +60,6 @@ class SwTxtFld;          // Fuer GetTxtFld()
 class SfxItemSet;
 class SwUndoTransliterate;
 
-
 struct SwSpellArgs;             // for Spell(), splargs.hxx
 struct SwConversionArgs;        // for Convert(), splargs.hxx
 class SwInterHyphInfo;          // for Hyphenate(), splargs.hxx
@@ -101,9 +95,8 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
     //Also niemals direkt zugreifen!
     SwpHints    *m_pSwpHints;
 
-    // --> OD 2005-11-02 #i51089 - TUNING#
     mutable SwNodeNum* mpNodeNum;  // Numerierung fuer diesen Absatz
-    // <--
+
     XubString   m_Text;
 
     SwParaIdleData_Impl* m_pParaIdleData_Impl;
@@ -120,21 +113,16 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
     bool m_bNotifiable;
 
     // BYTE nOutlineLevel; //#outline level, removed by zhaojianwei.
-    // --> OD 2008-11-19 #i70748#
     bool mbEmptyListStyleSetDueToSetOutlineLevelAttr;
-    // <--
 
-    // --> OD 2008-03-27 #refactorlists#
     // boolean, indicating that a <SetAttr(..)> or <ResetAttr(..)> or
     // <ResetAllAttr(..)> method is running.
     // Needed to avoid duplicate handling of attribute change actions.
     bool mbInSetOrResetAttr;
-    // <--
-    // --> OD 2008-05-06 #refactorlists#
+
     // pointer to the list, to whose the text node is added to
     SwList* mpList;
-    // <--
-    /// #i111677# cached expansion (for clipboard)
+
     ::std::auto_ptr< ::rtl::OUString > m_pNumStringCache;
 
     ::com::sun::star::uno::WeakReference<
@@ -195,9 +183,6 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
 
     /** create number for this text node, if not already existing
 
-        OD 2005-11-02 #i51089 - TUNING#
-        OD 2007-10-26 #i83479# - made private
-
         @return number of this node
     */
     SwNodeNum* CreateNum() const;
@@ -219,9 +204,7 @@ public:
     void SetAutoCompleteWordDirty( bool bNew ) const;
     void SetWrong( SwWrongList* pNew, bool bDelete = true );
     SwWrongList* GetWrong();
-    // --> OD 2008-05-23 #i71360#
     const SwWrongList* GetWrong() const;
-    // <--
     void SetGrammarCheck( SwGrammarMarkUp* pNew, bool bDelete = true );
     SwGrammarMarkUp* GetGrammarCheck();
     // SMARTTAGS
@@ -253,14 +236,12 @@ public:
     void GetMinMaxSize( ULONG nIndex, ULONG& rMin, ULONG &rMax, ULONG &rAbs,
                         OutputDevice* pOut = 0 ) const;
 
-    // --> OD 2008-03-13 #refactorlists#
     // overriding to handle change of certain paragraph attributes
     virtual BOOL SetAttr( const SfxPoolItem& );
     virtual BOOL SetAttr( const SfxItemSet& rSet );
     virtual BOOL ResetAttr( USHORT nWhich1, USHORT nWhich2 = 0 );
     virtual BOOL ResetAttr( const SvUShorts& rWhichArr );
     virtual USHORT ResetAllAttr();
-    // <--
 
     /// insert text content
     void InsertText( const XubString & rStr, const SwIndex & rIdx,
@@ -293,7 +274,7 @@ public:
     // loesche das Text-Attribut (muss beim Pool abgemeldet werden!)
     void    DestroyAttr( SwTxtAttr* pAttr );
 
-    // loesche alle Attribute aus dem SwpHintsArray.
+    // delete all attributes from SwpHintsArray.
     void    ClearSwpHintsArr( bool bDelFields );
 
     /// Insert pAttr into hints array. @return true iff inserted successfully
@@ -311,7 +292,6 @@ public:
                   xub_StrLen nStt, xub_StrLen nEnd,
                   const SetAttrMode nMode = nsSetAttrMode::SETATTR_DEFAULT );
     // erfrage die Attribute vom TextNode ueber den Bereich
-    // --> OD 2008-01-16 #newlistlevelattrs#
     // Introduce 4th optional parameter <bMergeIndentValuesOfNumRule>.
     // If <bMergeIndentValuesOfNumRule> == TRUE, the indent attributes of
     // the corresponding list level of an applied list style is merged into
@@ -322,7 +302,6 @@ public:
                   BOOL bOnlyTxtAttr  = FALSE,
                   BOOL bGetFromChrFmt = TRUE,
                   const bool bMergeIndentValuesOfNumRule = false ) const;
-    // <--
 
     // uebertrage Attribute eines AttrSets ( AutoFmt ) in das SwpHintsArray
     void FmtToTxtAttr( SwTxtNode* pNd );
@@ -334,7 +313,6 @@ public:
     void DeleteAttribute ( SwTxtAttr * const pTxtAttr );
 
     // Aktionen auf Text und Attributen
-    // --> OD 2008-11-18 #i96213#
     // introduce optional parameter to control, if all attributes have to be copied.
     void CopyText( SwTxtNode * const pDest,
                const SwIndex &rStart,
@@ -345,7 +323,6 @@ public:
                const SwIndex &rStart,
                xub_StrLen nLen,
                const bool bForceCopyOfAllAttrs = false );
-    // <--
 
     void        CutText(SwTxtNode * const pDest,
                     const SwIndex & rStart, const xub_StrLen nLen);
@@ -454,9 +431,7 @@ public:
 
     void UpdateOutlineState();
 
-    /** -> #i23730#
-
-        Returns if this text node may be numbered.
+    /** Returns if this text node may be numbered.
 
         A text node may be numbered if
           - it has no SwNodeNum
@@ -475,7 +450,6 @@ public:
 
     /** Returns outline of numbering string
 
-        OD 2005-11-17 #128041#
         Introduce parameter <_bInclPrefixAndSuffixStrings> in order to control,
         if the prefix and the suffix strings have to been included or not.
 
@@ -511,17 +485,12 @@ public:
      */
     BOOL GetFirstLineOfsWithNum( short& rFirstOffset ) const;
 
-    // --> OD 2010-01-05 #b6884103#
     SwTwips GetAdditionalIndentForStartingNewList() const;
-    // <--
 
-    // --> OD 2008-12-02 #i96772#
     void ClearLRSpaceItemDueToListLevelIndents( SvxLRSpaceItem& o_rLRSpaceItem ) const;
-    // <--
 
     /** return left margin for tab stop position calculation
 
-        OD 2008-06-30 #i91133#
         Needed for text formatting
         Method considers new list level attributes, which also can provide a left margin value
 
@@ -529,8 +498,7 @@ public:
     */
     long GetLeftMarginForTabCalculation() const;
 
-    /** -> #i29560
-        Returns if this text node has a number.
+    /** Returns if this text node has a number.
 
         This text node has a number if it has a SwNodeNum and a
         numbering rule and the numbering format specified for the
@@ -541,8 +509,7 @@ public:
      */
     BOOL HasNumber() const;
 
-    /** -> #i29560
-        Returns if this text node has a bullet.
+    /** Returns if this text node has a bullet.
 
         This text node has a bullet if it has a SwNodeNum and a
         numbering rule and the numbering format specified for the
@@ -553,8 +520,7 @@ public:
      */
     BOOL HasBullet() const;
 
-    /** -> #i27615#
-        Returns is this text node is numbered.
+    /** Returns is this text node is numbered.
 
         This node is numbered if it has a SwNodeNum and it has a
         numbering rule and has not a hidden SwNodeNum.
@@ -567,8 +533,7 @@ public:
      */
     BOOL IsNumbered() const;
 
-    /** -> #i27615#
-        Returns if this text node has a marked label.
+    /** Returns if this text node has a marked label.
 
         @retval true       This text node has a marked label.
         @retval false      else
@@ -631,14 +596,11 @@ public:
 
        NOTE: This is subject to change, see GetOutlineLevel.
      */
-    //void SetOutlineLevel(int nLevel);
-      void SetAttrOutlineLevel(int nLevel);//#OutlineLevel,added by zhaojianwei
+    void SetAttrOutlineLevel(int nLevel);//#OutlineLevel,added by zhaojianwei
 
-    // --> OD 2008-11-19 #i70748#
     bool IsEmptyListStyleDueToSetOutlineLevelAttr();
     void SetEmptyListStyleDueToSetOutlineLevelAttr();
     void ResetEmptyListStyleDueToResetOutlineLevelAttr();
-    // <--
 
     /**
        Returns the width of leading tabs/blanks in this paragraph.
@@ -649,7 +611,6 @@ public:
      */
     USHORT GetWidthOfLeadingTabs() const;
 
-
     /**
        Returns if the paragraph has a visible numbering or bullet.
        This includes all kinds of numbering/bullet/outlines.
@@ -660,15 +621,12 @@ public:
      */
     bool HasVisibleNumberingOrBullet() const;
 
-    // --> OD 2008-02-19 #refactorlists#
     void SetListId( const String sListId );
     String GetListId() const;
-    // <--
 
     /** Determines, if the list level indent attributes can be applied to the
         paragraph.
 
-        OD 2008-01-17 #newlistlevelattrs#
         The list level indents can be applied to the paragraph under the one
         of following conditions:
         - the list style is directly applied to the paragraph and the paragraph
@@ -687,8 +645,6 @@ public:
     /** Retrieves the list tab stop position, if the paragraph's list level defines
         one and this list tab stop has to merged into the tap stops of the paragraph
 
-        OD 2008-01-17 #newlistlevelattrs#
-
         @author OD
 
         @param nListTabStopPosition
@@ -701,8 +657,6 @@ public:
     /** Retrieves the character following the list label, if the paragraph's
         list level defines one.
 
-        OD 2008-01-17 #newlistlevelattrs#
-
         @author OD
 
         @return XubString - the list tab stop position
@@ -718,7 +672,7 @@ public:
     USHORT GetLang( const xub_StrLen nBegin, const xub_StrLen nLen = 0,
                     USHORT nScript = 0 ) const;
 
-    // steht in ndcopy.cxx
+    // in ndcopy.cxx
     BOOL IsSymbol( const xub_StrLen nBegin ) const; // steht in itratr.cxx
     virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const;
 
@@ -726,7 +680,6 @@ public:
     BOOL Hyphenate( SwInterHyphInfo &rHyphInf );
     void DelSoftHyph( const xub_StrLen nStart, const xub_StrLen nEnd );
 
-    // --> OD 2007-11-15 #i83479#
     // add 4th optional parameter <bAddSpaceAfterListLabelStr> indicating,
     // when <bWithNum = true> that a space is inserted after the string for
     // the list label.
@@ -738,15 +691,11 @@ public:
                             const bool bWithNum = false,
                             const bool bAddSpaceAfterListLabelStr = false,
                             const bool bWithSpacesForLevel = false ) const;
-    // <--
     BOOL GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx = 0,
                         xub_StrLen nIdx = 0, xub_StrLen nLen = STRING_LEN,
                        BOOL bWithNum = FALSE, BOOL bWithFtn = TRUE,
                        BOOL bReplaceTabsWithSpaces = FALSE ) const;
 
-    /*
-     *
-     */
     const ModelToViewHelper::ConversionMap*
             BuildConversionMap( rtl::OUString& rExpandText ) const;
 
@@ -785,7 +734,6 @@ public:
     inline void SetCalcHiddenCharFlags() const
         { m_bRecalcHiddenCharFlags = true; }
 
-// --> FME 2004-06-08 #i12836# enhanced pdf
     //
     // Returns if the node is hidden due to
     // 1. HiddenParaField
@@ -793,7 +741,6 @@ public:
     // 3. HiddenSection
     //
     bool IsHidden() const;
-// <--
 
     TYPEINFO(); // fuer rtti
 
@@ -820,9 +767,7 @@ public:
     bool IsNotifiable() const;
 
     void SetListRestart( bool bRestart );
-    // --> OD 2005-11-02 #i51089 - TUNING#
     bool IsListRestart() const;
-    // <--
 
     void SetAttrListRestartValue( SwNumberTree::tSwNumTreeNumber nNum );
     bool HasAttrListRestartValue() const;
@@ -832,13 +777,9 @@ public:
     void SetCountedInList( bool bCounted );
     bool IsCountedInList() const;
 
-    // --> OD 2008-03-13 #refactorlists#
-//    void SyncNumberAndNumRule();
-//    void UnregisterNumber();
     void AddToList();
     void RemoveFromList();
     bool IsInList() const;
-    // <--
 
     bool IsFirstOfNumRule() const;
 
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 2fbad0b0ce12..5ec02976bfe0 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -44,7 +44,7 @@
 #include <fmtcol.hxx>
 
 // ---------------------
-// forward Deklarationen
+// forward declarations
 // ---------------------
 
 class SvUShorts;
@@ -82,9 +82,7 @@ class IDocumentLineNumberAccess;
 class IDocumentLinksAdministration;
 class IDocumentFieldsAccess;
 class IDocumentContentOperations;
-// --> OD 2007-10-31 #i83479#
 class IDocumentListItems;
-// <--
 
 // --------------------
 // class SwNode
@@ -93,14 +91,13 @@ class SW_DLLPUBLIC SwNode : private /* public*/ BigPtrEntry
 {
     friend class SwNodes;
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     static long nSerial;
     long nMySerial;
 #endif
 
     BYTE nNodeType;
 
-    // JP 28.03.96
     // fuer Textnodes: Stufungslevel der Autoformatierung. Ist erstmal hier
     //                  gelandet, weil noch Bits frei sind
     BYTE nAFmtNumLvl : 3;
@@ -112,13 +109,13 @@ protected:
 
     SwNode( const SwNodeIndex &rWhere, const BYTE nNodeId );
 
-    // fuer den initialen StartNode
+    // for the initial StartNode
     SwNode( SwNodes& rNodes, ULONG nPos, const BYTE nNodeId );
 
 public:
     virtual ~SwNode();
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     long int GetSerial() const { return nMySerial; }
 #endif
 
@@ -270,8 +267,6 @@ public:
 
     /** Provides access to the document's numbered items interface
 
-        OD 2007-10-31 #i83479#
-
         @author OD
     */
     IDocumentListItems& getIDocumentListItems();
@@ -287,7 +282,7 @@ public:
     // suche den PageDesc, mit dem dieser Node formatiert ist. Wenn das
     // Layout vorhanden ist wird ueber das gesucht, ansonsten gibt es nur
     // die harte Tour ueber die Nodes nach vorne suchen!!
-    // OD 18.03.2003 #106326#
+
     const SwPageDesc* FindPageDesc( BOOL bCalcLay, sal_uInt32* pPgDescNdIdx = 0 ) const;
 
     // falls der Node in einem Fly steht, dann wird das entsprechende Format
@@ -317,12 +312,12 @@ class SwStartNode: public SwNode
 {
     friend class SwNode;
     friend class SwNodes;
-    friend class SwEndNode;     // um theEndOfSection zu setzen !!
+    friend class SwEndNode;     // to set the theEndOfSection !!
 
     SwEndNode* pEndOfSection;
     SwStartNodeType eSttNdTyp;
 
-    // fuer den initialen StartNode
+    // for the initial StartNode
     SwStartNode( SwNodes& rNodes, ULONG nPos );
 
 protected:
@@ -353,7 +348,7 @@ class SwEndNode : public SwNode
     friend class SwTableNode;       // um seinen EndNode anlegen zukoennen
     friend class SwSectionNode;     // um seinen EndNode anlegen zukoennen
 
-    // fuer den initialen StartNode
+    // for the initial StartNode
     SwEndNode( SwNodes& rNodes, ULONG nPos, SwStartNode& rSttNd );
 
 protected:
@@ -373,9 +368,6 @@ private:
 // --------------------
 class SW_DLLPUBLIC SwCntntNode: public SwModify, public SwNode, public SwIndexReg
 {
-    // Der Reader darf NewAttrSet() aufrufen!
-//  friend class SwSwgReader;
-//  friend class Sw3IoImp;
 
 //FEATURE::CONDCOLL
     SwDepend* pCondColl;
@@ -451,7 +443,7 @@ public:
     virtual xub_StrLen Len() const;
 
     virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const = 0;
-        // erfrage vom Client Informationen
+    // erfrage vom Client Informationen
     virtual BOOL GetInfo( SfxPoolItem& ) const;
 
     // SS fuer die PoolItems: (Harte-(Fmt)Attrbutierung)
@@ -459,14 +451,12 @@ public:
     // Ist bInParent FALSE, wird nur in diesem Node nach dem Attribut gesucht.
     const SfxPoolItem& GetAttr( USHORT nWhich, BOOL bInParent=TRUE ) const;
     BOOL GetAttr( SfxItemSet& rSet, BOOL bInParent=TRUE ) const;
-    // --> OD 2008-03-13 #refactorlists#
     // made virtual
     virtual BOOL SetAttr( const SfxPoolItem& );
     virtual BOOL SetAttr( const SfxItemSet& rSet );
     virtual BOOL ResetAttr( USHORT nWhich1, USHORT nWhich2 = 0 );
     virtual BOOL ResetAttr( const SvUShorts& rWhichArr );
     virtual USHORT ResetAllAttr();
-    // <--
 
     // liefert das Attribut, das nicht ueber die bedingte Vorlage kommt!
     const SfxPoolItem* GetNoCondAttr( USHORT nWhich, BOOL bInParents ) const;
@@ -493,11 +483,10 @@ public:
     // spaetestend in EndAction einer Shell geupdatet
     BOOL InvalidateNumRule();
 
-    // --> OD 2005-02-21 #i42921# - determines the text direction for a certain
+    // determines the text direction for a certain
     // position. Return -1, if text direction could *not* be determined.
     short GetTextDirection( const SwPosition& rPos,
                             const Point* pPt ) const;
-    // <--
 
     inline void SetModifyAtAttr( bool bSetModifyAtAttr ) const { mbSetModifyAtAttr = bSetModifyAtAttr; }
     inline bool GetModifyAtAttr() const { return mbSetModifyAtAttr; }
@@ -604,7 +593,6 @@ public:
 
 
 
-// ---------------------- einige inline Methoden ----------------------
 inline       SwEndNode   *SwNode::GetEndNode()
 {
      return ND_ENDNODE == nNodeType ? (SwEndNode*)this : 0;
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 1fe2560cdfaa..21fc2abf5a63 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -36,22 +36,16 @@
 #include "swdllapi.h"
 #include <swtypes.hxx>
 #include <calbck.hxx>
-#include <errhdl.hxx>       // Fuer die inline-ASSERTs
-#include <error.h>          // Fuer die inline-ASSERTs
+#include <errhdl.hxx>       // Fuer die inline ASSERT
+#include <error.h>          // Fuer die inline ASSERT
 #include <hints.hxx>
 #include <hash_map>
 #include <stringhash.hxx>
-// --> OD 2008-02-21 #refactorlists#
 class SwNodeNum;
 #include <SwNumberTreeTypes.hxx>
-// <--
-// --> OD 2008-02-19 #refactorlists#
 #include <vector>
 class SwTxtFmtColl;
-// <--
-// --> OD 2008-07-08 #i91400#
 class IDocumentListsAccess;
-// <--
 
 class Font;
 class SvxBrushItem;
@@ -98,56 +92,42 @@ public:
     virtual sal_Int16   GetVertOrient() const;
     const SwFmtVertOrient*      GetGraphicOrientation() const;
 
-    BOOL IsEnumeration() const; // #i22362#
-    BOOL IsItemize() const; // #i29560#
+    BOOL IsEnumeration() const;
+    BOOL IsItemize() const;
 };
 
 class SwPaM;
 enum SwNumRuleType { OUTLINE_RULE = 0, NUM_RULE = 1, RULE_END = 2 };
 class SW_DLLPUBLIC SwNumRule
 {
-// --> OD 2008-02-19 #refactorlists#
+
 public:
     typedef std::vector< SwTxtNode* > tTxtNodeList;
     typedef std::vector< SwTxtFmtColl* > tParagraphStyleList;
-// <--
 private:
     friend void _FinitCore();
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     long int nSerial;
     static long int nInstances;
 #endif
 
     static SwNumFmt* aBaseFmts [ RULE_END ][ MAXLEVEL ];
     static USHORT aDefNumIndents[ MAXLEVEL ];
-    // --> OD 2008-02-11 #newlistlevelattrs#
     // default list level properties for position-and-space mode LABEL_ALIGNMENT
     static SwNumFmt* aLabelAlignmentBaseFmts [ RULE_END ][ MAXLEVEL ];
-    // <--
     static USHORT nRefCount;
     static char* pDefOutlineName;
 
     SwNumFmt* aFmts[ MAXLEVEL ];
 
-    /** container for associated text nodes
-
-    */
-    // --> OD 2008-02-19 #refactorlists#
-//    SwTxtNodeTable* pTxtNodeList;
+    /** container for associated text nodes */
     tTxtNodeList maTxtNodeList;
-    // <--
 
-    /** container for associated paragraph styles
-
-        OD 2008-03-03 #refactorlists#
-    */
+    /** container for associated paragraph styles */
     tParagraphStyleList maParagraphStyleList;
 
-    // #i36749#
-    /**
-       hash_map containing "name->rule" relation
-     */
+    /** hash_map containing "name->rule" relation */
     std::hash_map<String, SwNumRule *, StringHash> * pNumRuleMap;
 
     String sName;
@@ -161,19 +141,13 @@ private:
     BOOL bAbsSpaces : 1;    // die Ebenen repraesentieren absol. Einzuege
     bool mbCountPhantoms;
 
-    // --> OD 2008-02-11 #newlistlevelattrs#
     const SvxNumberFormat::SvxNumPositionAndSpaceMode meDefaultNumberFormatPositionAndSpaceMode;
-    // <--
-
-    // --> OD 2008-04-03 #refactorlists#
     String msDefaultListId;
-    // <--
 
     // forbidden and not implemented.
     SwNumRule();
 
 public:
-    // --> OD 2008-02-08 #newlistlevelattrs#
     // add parameter <eDefaultNumberFormatPositionAndSpaceMode>
     SwNumRule( const String& rNm,
                const SvxNumberFormat::SvxNumPositionAndSpaceMode eDefaultNumberFormatPositionAndSpaceMode,
@@ -194,42 +168,30 @@ public:
     void Set( USHORT i, const SwNumFmt& );
     String MakeNumString( const SwNodeNum&, BOOL bInclStrings = TRUE,
                             BOOL bOnlyArabic = FALSE ) const;
-    // --> OD 2005-10-17 #126238#
     // - add optional parameter <_nRestrictToThisLevel> in order to
     //   restrict returned string to this level.
     String MakeNumString( const SwNumberTree::tNumberVector & rNumVector,
                           const BOOL bInclStrings = TRUE,
                           const BOOL bOnlyArabic = FALSE,
                           const unsigned int _nRestrictToThisLevel = MAXLEVEL ) const;
-    // <--
-    // --> OD 2007-08-24 #i81002#
     String MakeRefNumString( const SwNodeNum& rNodeNum,
                              const bool bInclSuperiorNumLabels = false,
                              const sal_uInt8 nRestrictInclToThisLevel = 0 ) const;
-    // <--
 
     /** Returns list of associated text nodes.
 
-       OD 2008-02-19 #refactorlists#
-
        @return list of associated text nodes
     */
-//    const SwTxtNodeTable * GetTxtNodeList() const { return pTxtNodeList; }
     void GetTxtNodeList( SwNumRule::tTxtNodeList& rTxtNodeList ) const;
     SwNumRule::tTxtNodeList::size_type GetTxtNodeListSize() const;
 
-    // --> OD 2008-02-19 #refactorlists#
     void AddTxtNode( SwTxtNode& rTxtNode );
     void RemoveTxtNode( SwTxtNode& rTxtNode );
-    // <--
 
-    // --> OD 2008-03-03 #refactorlists#
     SwNumRule::tParagraphStyleList::size_type GetParagraphStyleListSize() const;
     void AddParagraphStyle( SwTxtFmtColl& rTxtFmtColl );
     void RemoveParagraphStyle( SwTxtFmtColl& rTxtFmtColl );
-    // <--
 
-    // --> OD 2008-04-03 #refactorlists#
     inline void SetDefaultListId( const String sDefaultListId )
     {
         msDefaultListId = sDefaultListId;
@@ -238,8 +200,6 @@ public:
     {
         return msDefaultListId;
     }
-    // <--
-    // #i36749#
     /**
        Register this rule in a "name->numrule" map.
 
@@ -267,10 +227,9 @@ public:
     void CheckCharFmts( SwDoc* pDoc );
 
     const String& GetName() const       { return sName; }
-    // --> OD 2008-07-08 #i91400#
+
     void SetName( const String& rNm,
-                  IDocumentListsAccess& rDocListAccess ); // #i36749#
-    // <--
+                  IDocumentListsAccess& rDocListAccess );
 
     BOOL IsAutoRule() const             { return bAutoRuleFlag; }
     void SetAutoRule( BOOL bFlag )      { bAutoRuleFlag = bFlag; }
@@ -284,7 +243,6 @@ public:
     BOOL IsAbsSpaces() const            { return bAbsSpaces; }
     void SetAbsSpaces( BOOL bFlag )     { bAbsSpaces = bFlag; }
 
-    // #115901#
     BOOL IsOutlineRule() const { return eRuleType == OUTLINE_RULE; }
 
     bool IsCountPhantoms() const;
@@ -303,12 +261,6 @@ public:
     void        SetSvxRule(const SvxNumRule&, SwDoc* pDoc);
     SvxNumRule  MakeSvxNumRule() const;
 
-    // #i23726#, #i23725#
-    // --> OD 2008-06-09 #i90078#
-    // refactoring: provide certain method for certain purpose
-//    void        Indent(short aAmount, int nLevel = -1,
-//                       int nReferenceLevel = -1, BOOL bRelative = TRUE,
-//                       BOOL bFirstLine = TRUE, BOOL bCheckGtZero = TRUE);
     // change indent of all list levels by given difference
     void ChangeIndent( const short nDiff );
     // set indent of certain list level to given value
@@ -317,12 +269,10 @@ public:
     // set indent of first list level to given value and change other list level's
     // indents accordingly
     void SetIndentOfFirstListLevelAndChangeOthers( const short nNewIndent );
-    // <--
 
     void Validate();
 };
 
-// --> OD 2006-06-27 #b6440955#
 // namespace for static functions and methods for numbering and bullets
 namespace numfunc
 {
@@ -334,7 +284,6 @@ namespace numfunc
 
     /** determine if default bullet font is user defined
 
-        OD 2008-06-06 #i63395#
         The default bullet font is user defined, if it is given in the user configuration
 
         @author OD
@@ -358,15 +307,11 @@ namespace numfunc
         The same for <SHIFT-TAB>-key at the same position for decreasing the
         indent of the complete list or only promotes this list item.
 
-        OD 2007-10-01 #b6600435#
-
         @author OD
     */
     sal_Bool ChangeIndentOnTabAtFirstPosOfFirstListItem();
 
     /**
-        OD 2008-06-06 #i89178#
-
         @author OD
     */
     SvxNumberFormat::SvxNumPositionAndSpaceMode GetDefaultPositionAndSpaceMode();
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index 173e299a6f00..15630e958db1 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -255,39 +255,31 @@ inline void SwPageDesc::ChgHeaderShare( BOOL bNew )
 {
     if ( bNew )
         eUse = (UseOnPage) (eUse | nsUseOnPage::PD_HEADERSHARE);
-        // (USHORT&)eUse |= (USHORT)nsUseOnPage::PD_HEADERSHARE;
     else
         eUse = (UseOnPage) (eUse & nsUseOnPage::PD_NOHEADERSHARE);
-        // (USHORT&)eUse &= (USHORT)nsUseOnPage::PD_NOHEADERSHARE;
 }
 inline void SwPageDesc::ChgFooterShare( BOOL bNew )
 {
     if ( bNew )
         eUse = (UseOnPage) (eUse | nsUseOnPage::PD_FOOTERSHARE);
-        // (USHORT&)eUse |= (USHORT)nsUseOnPage::PD_FOOTERSHARE;
     else
         eUse = (UseOnPage) (eUse & nsUseOnPage::PD_NOFOOTERSHARE);
-        // (USHORT&)eUse &= (USHORT)nsUseOnPage::PD_NOFOOTERSHARE;
 }
 inline void SwPageDesc::SetUseOn( UseOnPage eNew )
 {
     UseOnPage eTmp = nsUseOnPage::PD_NONE;
     if ( eUse & nsUseOnPage::PD_HEADERSHARE )
         eTmp = nsUseOnPage::PD_HEADERSHARE;
-        // (USHORT&)eTmp |= (USHORT)nsUseOnPage::PD_HEADERSHARE;
     if ( eUse & nsUseOnPage::PD_FOOTERSHARE )
         eTmp = (UseOnPage) (eTmp | nsUseOnPage::PD_FOOTERSHARE);
-        // (USHORT&)eTmp |= (USHORT)nsUseOnPage::PD_FOOTERSHARE;
     eUse = (UseOnPage) (eTmp | eNew);
-    // (USHORT&)eUse = eTmp | eNew;
+
 }
 inline UseOnPage SwPageDesc::GetUseOn() const
 {
     UseOnPage eRet = eUse;
     eRet = (UseOnPage) (eRet & nsUseOnPage::PD_NOHEADERSHARE);
-    // (USHORT&)eRet &= (USHORT)nsUseOnPage::PD_NOHEADERSHARE;
     eRet = (UseOnPage) (eRet & nsUseOnPage::PD_NOFOOTERSHARE);
-    // (USHORT&)eRet &= (USHORT)nsUseOnPage::PD_NOFOOTERSHARE;
     return eRet;
 }
 
diff --git a/sw/inc/pagepreviewlayout.hxx b/sw/inc/pagepreviewlayout.hxx
index f936ab878fda..200ad618279d 100644
--- a/sw/inc/pagepreviewlayout.hxx
+++ b/sw/inc/pagepreviewlayout.hxx
@@ -20,8 +20,6 @@ struct PrevwPage;
 // =============================================================================
 /** page preview functionality in the writer
 
-    OD 11.12.2002 #103492# - class <SwPagePreviewLayout>
-
     @author OD
 */
 class SwPagePreviewLayout
@@ -55,8 +53,7 @@ private:
     sal_uInt16  mnCols;
     sal_uInt16  mnRows;
     sal_uInt16  mnPages;
-    // OD 19.02.2003 #107369# - new flag for leaving blank left-top-corner
-    // OD 2004-03-05 #i18143# - the book preview is controlled by this flag
+    // #i18143# - the book preview is controlled by this flag
     bool        mbBookPreview;
     bool        mbBookPreviewModeToggled;
 
@@ -81,7 +78,7 @@ private:
 
     std::vector<PrevwPage*> maPrevwPages;
 
-    // OD 07.11.2003 #i22014# - internal booleans to indicate, that a new print
+    // #i22014# - internal booleans to indicate, that a new print
     // preview layout has been created during a paint.
     mutable bool mbInPaint;
     mutable bool mbNewLayoutDuringPaint;
@@ -90,40 +87,30 @@ private:
 
     /** clear internal data about current page preview
 
-        OD 11.12.2002 #103492#
-
         @author OD
     */
     void _Clear();
 
     /** helper method to clear preview page layout sizes
 
-        OD 18.12.2002 #103492#
-
         @author OD
     */
     void _ClearPrevwLayoutSizes();
 
     /** helper method to clear data in preview page vectors
 
-        OD 13.12.2002 #103492#
-
         @author OD
     */
     void _ClearPrevwPageData();
 
     /** calculate page preview layout sizes
 
-        OD 18.12.2002 #103492#
-
         @author OD
     */
     void _CalcPrevwLayoutSizes();
 
     /** apply new zoom at given view shell
 
-        OD 11.12.2002 #103492#
-
         @author OD
 
         @param _aNewZoom
@@ -133,7 +120,6 @@ private:
 
     /** calculate additional paint offset
 
-        OD 12.12.2002 #103492#
         helper method called by <Prepare> in order to calculate an additional
         paint offset to center output in given window size.
         The booleans <mbDoesLayoutRowsFitIntoWindow> and <mbDoesLayoutColsFitIntoWindow>
@@ -150,7 +136,6 @@ private:
 
     /** calculate painted preview document rectangle
 
-        OD 12.12.2002 #103492#
         helper method called by <Prepare> in order to calculate the rectangle,
         which will be painted for the document arranged by the given preview
         layout.
@@ -165,7 +150,6 @@ private:
 
     /** determines preview data for a given page and a given preview offset
 
-        OD 13.12.2002 #103492#
 
         @author OD
 
@@ -189,7 +173,6 @@ private:
 
     /** calculate preview pages
 
-        OD 12.12.2002 #103492#
         helper method called by <Prepare> in order to determine which pages
         will be visible in the current preview and calculate the data needed
         to paint these pages. Also the accessible pages with its needed data
@@ -201,8 +184,6 @@ private:
 
     /** get preview page by physical page number
 
-        OD 17.12.2002 #103492#
-
         @author OD
 
         @param _nPageNum
@@ -216,8 +197,6 @@ private:
 
     /** paint selection mark at page
 
-        OD 17.12.2002 #103492#
-
         @author OD
     */
     void _PaintSelectMarkAtPage( const PrevwPage* _aSelectedPrevwPage ) const;
@@ -225,8 +204,6 @@ private:
 public:
     /** constructor of <SwPagePreviewLayout>
 
-        OD 11.12.2002 #103492#
-
         @author OD
 
         @param _rParentViewShell
@@ -247,8 +224,6 @@ public:
 
     /** destructor of <SwPagePreviewLayout>
 
-        OD 17.12.2002 #103492#
-
         @author
     */
     inline ~SwPagePreviewLayout()
@@ -258,7 +233,6 @@ public:
 
     /** init page preview layout
 
-        OD 11.12.2002 #103492#
         initialize the page preview settings for a given layout.
         side effects:
         (1) If parameter <_bCalcScale> is true, mapping mode with calculated
@@ -292,8 +266,6 @@ public:
 
     /** method to adjust page preview layout to document changes
 
-        OD 18.12.2002 #103492#
-
         @author OD
 
         @return boolean, indicating, if preview layout is successful initialized.
@@ -302,7 +274,6 @@ public:
 
     /** prepare paint of page preview
 
-        OD 12.12.2002 #103492#
         With the valid preview layout settings - calculated and set by method
         <Init(..)> - the paint of a specific part of the virtual preview
         document is prepared. The corresponding part is given by either
@@ -310,7 +281,6 @@ public:
         (parameter <_aProposedStartPoint>).
         The accessibility preview will also be updated via a corresponding
         method call.
-        OD 21.03.2003 #108282# - delete parameter _onStartPageVirtNum
 
         @author OD
 
@@ -351,8 +321,6 @@ public:
 
     /** get selected page number
 
-        OD 13.12.2002 #103492#
-
         @author OD
     */
     inline sal_uInt16 SelectedPage()
@@ -362,8 +330,6 @@ public:
 
     /** set selected page number
 
-        OD 14.01.2003 #103492#
-
         @author OD
     */
     inline void SetSelectedPage( sal_uInt16 _nSelectedPageNum )
@@ -373,8 +339,6 @@ public:
 
     /** paint prepared preview
 
-        OD 12.12.2002 #103492#
-
         @author OD
 
         @param _aOutRect
@@ -386,7 +350,6 @@ public:
 
     /** repaint pages on page preview
 
-        OD 18.12.2002 #103492#
         method to invalidate visible pages due to changes in a different
         view shell.
 
@@ -396,7 +359,6 @@ public:
 
     /** paint to mark new selected page
 
-        OD 17.12.2002 #103492#
         Perform paint for current selected page in order to unmark it.
         Set new selected page and perform paint to mark this page.
 
@@ -409,7 +371,6 @@ public:
 
     /** calculate start position for new scale
 
-        OD 12.12.2002 #103492#
         calculate new start position for a new scale. Calculation bases on the
         current visible part of the document arranged in the given preview layout.
         preconditions:
@@ -425,8 +386,6 @@ public:
 
     /** determines, if page with given page number is visible in preview
 
-        OD 12.12.2002 #103492#
-
         @author OD
 
         @param _nPageNum
@@ -440,8 +399,6 @@ public:
 
     /** calculate data to bring new selected page into view.
 
-        OD 12.12.2002 #103492#
-
         @author OD
 
         @param _nHoriMove
@@ -471,8 +428,6 @@ public:
 
     /** checks, if given position is inside a shown document page
 
-        OD 17.12.2002 #103492#
-
         @author OD
 
         @param _aPrevwPos
@@ -517,8 +472,6 @@ public:
 
     /** determine preview window page scroll amount
 
-        OD 17.12.2002 #103492#
-
         @author OD
 
         @param _nWinPagesToScroll
@@ -532,8 +485,6 @@ public:
 
     /** determine row the page with the given number is in
 
-        OD 17.01.2003 #103492#
-
         @author OD
 
         @param _nPageNum
@@ -546,8 +497,6 @@ public:
 
     /** determine column the page with the given number is in
 
-        OD 17.01.2003 #103492#
-
         @author OD
 
         @param _nPageNum
@@ -558,13 +507,10 @@ public:
     */
     sal_uInt16 GetColOfPage( sal_uInt16 _nPageNum ) const;
 
-    // OD 18.12.2002 #103492#
     Size GetPrevwDocSize() const;
 
     /** get size of a preview page by its physical page number
 
-        OD 15.01.2003 #103492#
-
         @author OD
 
         @param _nPageNum
@@ -577,8 +523,6 @@ public:
 
     /** get virtual page number by its physical page number
 
-        OD 21.03.2003 #108282#
-
         @author OD
 
         @param _nPageNum
@@ -592,8 +536,6 @@ public:
 
     /** enable/disable book preview
 
-        OD 2004-03-04 #i18143#
-
         @author OD
     */
     bool SetBookPreviewMode( const bool  _bEnableBookPreview,
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 79e3fa0dfdff..8d04419ed2ef 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -66,7 +66,6 @@ struct SW_DLLPUBLIC SwPosition
     SwPosition( const SwPosition & );
     SwPosition &operator=(const SwPosition &);
 
-    // #111827#
     /**
        Returns the document this position is in.
 
@@ -190,8 +189,10 @@ public:
             m_pMark = m_pPoint;
         }
     }
-#ifndef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
+    void Exchange();
 
+#else
     void Exchange()
     {
         if (m_pPoint != m_pMark)
@@ -201,8 +202,6 @@ public:
             m_pMark = pTmp;
         }
     }
-#else
-    void Exchange();
 #endif
 
     /** A PaM marks a selection if Point and Mark are distinct positions.
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index 5355e440a6a3..42fda6e21315 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -72,7 +72,7 @@ private:
     SwFmtDrop & operator= (const SwFmtDrop &);
 public:
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -118,7 +118,7 @@ public:
     // @@@ public copy assignment, but no copy ctor?
     inline SwRegisterItem& operator=( const SwRegisterItem& rRegister );
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
@@ -143,7 +143,6 @@ class SW_DLLPUBLIC SwNumRuleItem : public SfxStringItem
 public:
     TYPEINFO();
 
-    // --> OD 2008-03-04 #refactorlists# - removed <pDefinedIn>
     SwNumRuleItem()
         : SfxStringItem( RES_PARATR_NUMRULE, aEmptyStr ) {}
 
@@ -155,9 +154,8 @@ public:
 
     SwNumRuleItem& operator=( const SwNumRuleItem& rCpy )
     { SetValue( rCpy.GetValue() ); return *this; }
-    // <--
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -180,7 +178,7 @@ public:
     // @@@ public copy assignment, but no copy ctor?
     inline SwParaConnectBorderItem& operator=( const SwParaConnectBorderItem& rConnect );
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
                                     SfxMapUnit eCoreMetric,
diff --git a/sw/inc/pausethreadstarting.hxx b/sw/inc/pausethreadstarting.hxx
index 62d2c91a33f3..55e9fd712cf2 100644
--- a/sw/inc/pausethreadstarting.hxx
+++ b/sw/inc/pausethreadstarting.hxx
@@ -31,7 +31,7 @@
 /** Helper class to pause starting of threads during existence of an instance
     of this class
 
-    OD 2007-03-16 #i73788#
+    #i73788#
 
     @author OD
 */
diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx
index 94553a44a48f..e235cf1ee504 100644
--- a/sw/inc/poolfmt.hxx
+++ b/sw/inc/poolfmt.hxx
@@ -91,7 +91,6 @@ const USHORT POOLGRP_CHARFMT        = (0 << 11) + POOLGRP_NOCOLLID;
 const USHORT POOLGRP_FRAMEFMT       = (1 << 11) + POOLGRP_NOCOLLID;
 const USHORT POOLGRP_PAGEDESC       = (2 << 11) + POOLGRP_NOCOLLID;
 const USHORT POOLGRP_NUMRULE        = (3 << 11) + POOLGRP_NOCOLLID;
-//const USHORT POOLGRP_GRFFMT           = (4 << 11) + POOLGRP_NOCOLLID; // ?
 
 // fuer Erkennung ob Benutzer-Vorlage oder nicht:
 const USHORT POOL_IDUSER_FMT =
@@ -432,14 +431,6 @@ inline BOOL IsConditionalByPoolId(USHORT nId)
     {
         return RES_POOLCOLL_TEXT == nId;
     }
-// die Id's fuer die Grafik-Formate
-/*enum RES_POOL_GRFFMT_TYPE
-{
-RES_POOLGRF_BEGIN = RES_POOLPAR_END,
-RES_POOLGRF_1 = RES_POOLGRF_BEGIN,
-RES_POOLGRF_END
-};
-*/
 
 #endif
 
diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx
index 2eaa37542688..9884a140b312 100644
--- a/sw/inc/postithelper.hxx
+++ b/sw/inc/postithelper.hxx
@@ -112,27 +112,6 @@ public:
                                                                 SwPostItMgr& aMgr,
                                                                 SwPostItBits aBits) = 0;
 };
-/*
-class SwRedCommentItem: public SwSidebarItem
-{
-private:
-    SwRedline* pRedline;
-public:
-
-    SwRedCommentItem( SwRedline* pRed, bool aShow, bool aFocus)
-        : SwSidebarItem(aShow,aFocus),
-        pRedline(pRed) {}
-    virtual ~SwRedCommentItem() {}
-    virtual SwPosition GetAnchorPosition() const;
-    virtual bool UseElement();
-    virtual SwFmtFld* GetFmtFld() const {return 0; }
-    virtual SfxBroadcaster* GetBroadCaster() const { return dynamic_cast<SfxBroadcaster *> (pRedline); }
-    virtual sw::sidebarwindows::SwSidebarWin* GetSidebarWindow( SwEditWin& rEditWin,
-                                                                WinBits nBits,
-                                                                SwPostItMgr& aMgr,
-                                                                SwPostItBits aBits);
-};
-*/
 
 class SwAnnotationItem: public SwSidebarItem
 {
diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index f2170b0d4721..866ebc19534d 100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -71,9 +71,9 @@ public:
              bPrintLeftPages, bPrintRightPages, bPrintReverse, bPrintProspect,
              bPrintProspectRTL,
              bPrintSingleJobs, bPaperFromSetup,
-             // --> FME 2005-12-13 #b6354161# Print empty pages
+             // #b6354161# Print empty pages
              bPrintEmptyPages,
-             // <--
+
              // #i56195# no field update while printing mail merge documents
              bUpdateFieldsInPrinting,
              bModified;
@@ -207,7 +207,7 @@ public:
     bool IsPrintWithBlackTextColor() const      { return getBoolValue( "PrintBlackFonts",      m_rDefaultPrintData.bPrintBlackFont ); }
     sal_Int16 GetPrintPostItsType() const       { return static_cast< sal_Int16 >(getIntValue( "PrintAnnotationMode", m_rDefaultPrintData.nPrintPostIts )); }
     bool IsPaperFromSetup() const               { return getBoolValue( "PrintPaperFromSetup",  m_rDefaultPrintData.bPaperFromSetup ); }
-    bool IsPrintReverse() const                 { return false; /*handled by print dialog now*/ /*getBoolValue( "PrintReversed",        m_rDefaultPrintData.bPrintReverse );*/ }
+    bool IsPrintReverse() const                 { return false; /*handled by print dialog now*/ }
 
     bool IsPrintLeftPages() const;
     bool IsPrintRightPages() const;
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 2a3f088dfe61..39f3c62a2385 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -268,7 +268,6 @@ public:
     void PushData( const SwRedline& rRedl, BOOL bOwnAsNext = TRUE );
     BOOL PopData();
 
-    // #111827#
     /**
        Returns textual description of this a redline data element of
        this redline.
diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx
index e82fbf2b87c1..6233dfb6372f 100644
--- a/sw/inc/reffld.hxx
+++ b/sw/inc/reffld.hxx
@@ -56,7 +56,7 @@ enum REFERENCEMARK
     REF_ONLYNUMBER,
     REF_ONLYCAPTION,
     REF_ONLYSEQNO,
-    // --> OD 2007-08-24 #i81002#
+    // --> #i81002#
     // new reference format types for referencing bookmarks and set references
     REF_NUMBER,
     REF_NUMBER_NO_CONTEXT,
@@ -100,11 +100,11 @@ private:
     USHORT nSubType;
     USHORT nSeqNo;
 
-    // --> OD 2007-08-24 #i81002#
+    // #i81002#
     String MakeRefNumStr( const SwTxtNode& rTxtNodeOfField,
                           const SwTxtNode& rTxtNodeOfReferencedItem,
                           const sal_uInt32 nRefNumFormat ) const;
-    // <--
+
 public:
     SwGetRefField( SwGetRefFieldType*, const String& rSetRef,
                     USHORT nSubType, USHORT nSeqNo, ULONG nFmt );
@@ -117,7 +117,7 @@ public:
 
     const String&       GetSetRefName() const { return sSetRefName; }
 
-    // --> OD 2007-09-06 #i81002#
+    // #i81002#
     // The <SwTxtFld> instance, which represents the text attribute for the
     // <SwGetRefField> instance, has to be passed to the method.
     // This <SwTxtFld> instance is needed for the reference format type REF_UPDOWN
@@ -125,21 +125,21 @@ public:
     // Note: This instance may be NULL (field in Undo/Redo). This will cause
     // no update for these reference format types.
     void                UpdateField( const SwTxtFld* pFldTxtAttr );
-    // <--
+
     void                SetExpand( const String& rStr ) { sTxt = rStr; }
 
     // SubType erfragen/setzen
     virtual USHORT      GetSubType() const;
     virtual void        SetSubType( USHORT n );
 
-    // --> OD 2007-11-09 #i81002#
+    // --> #i81002#
     bool IsRefToHeadingCrossRefBookmark() const;
     bool IsRefToNumItemCrossRefBookmark() const;
     const SwTxtNode* GetReferencedTxtNode() const;
     // <--
-    // --> OD 2008-01-09 #i85090#
+    // #i85090#
     String GetExpandedTxtOfReferencedTxtNode() const;
-    // <--
+
 
     // SequenceNo erfragen/setzen (nur fuer REF_SEQUENCEFLD interressant)
     USHORT              GetSeqNo() const        { return nSeqNo; }
diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index 6c99b0f2ae21..8637f4d43cd3 100644
--- a/sw/inc/ring.hxx
+++ b/sw/inc/ring.hxx
@@ -28,9 +28,10 @@
 #ifndef _RING_HXX
 #define _RING_HXX
 
+#include <swdllapi.h>
 #include <swtypes.hxx>
 
-class Ring
+class SW_DLLPUBLIC Ring
 {
     Ring *pNext;
     Ring* pPrev;    // zur Optimierung, damit das ein/ausketten schneller geht!
diff --git a/sw/inc/rolbck.hxx b/sw/inc/rolbck.hxx
index 1623972b0d6e..5a40d1ce13bb 100644
--- a/sw/inc/rolbck.hxx
+++ b/sw/inc/rolbck.hxx
@@ -70,13 +70,10 @@ class SwCharFmt;
 #include <tox.hxx>
 
 #include <SwNumberTreeTypes.hxx>
-// --> OD 2007-10-17 #i81002#
 #include <IDocumentMarkAccess.hxx>
-// <--
 
 #include <memory>
 
-
 enum HISTORY_HINT {
     HSTRY_SETFMTHNT,
     HSTRY_RESETFMTHNT,
@@ -93,7 +90,7 @@ enum HISTORY_HINT {
     HSTRY_RESETATTRSET,
     HSTRY_CHGFLYANCHOR,
     HSTRY_CHGFLYCHAIN,
-    HSTRY_CHGCHARFMT, // #i27615#
+    HSTRY_CHGCHARFMT,
     HSTRY_END
 };
 
@@ -128,9 +125,7 @@ class SwHistoryResetFmt : public SwHistoryHint
     const USHORT m_nWhich;
 
 public:
-    // --> OD 2008-02-27 #refactorlists# - removed <rDoc>
     SwHistoryResetFmt( const SfxPoolItem* pFmtHt, ULONG nNodeIdx );
-    // <--
     virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet );
 
 };
@@ -268,7 +263,6 @@ class SwHistoryBookmark : public SwHistoryHint
         bool IsEqualBookmark(const ::sw::mark::IMark& rBkmk);
         const ::rtl::OUString& GetName() const;
 
-
     private:
         const ::rtl::OUString m_aName;
         ::rtl::OUString m_aShortName;
@@ -297,7 +291,6 @@ public:
 
 };
 
-
 class SwHistoryResetAttrSet : public SwHistoryHint
 {
     const ULONG m_nNodeIndex;
@@ -339,7 +332,6 @@ public:
     virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet );
 };
 
-// #i27615#
 class SwHistoryChangeCharFmt : public SwHistoryHint
 {
     const SfxItemSet m_OldSet;
@@ -351,7 +343,6 @@ public:
 
 };
 
-
 #endif
 
 typedef SwHistoryHint* SwHistoryHintPtr;
@@ -377,17 +368,15 @@ public:
     // call all objects between nStart and TmpEnd; store nStart as TmpEnd
     bool TmpRollback( SwDoc* pDoc, USHORT nStart, bool ToFirst = true );
 
-    // --> OD 2008-02-27 #refactorlists# - removed <rDoc>
     void Add( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue,
               ULONG nNodeIdx );
-    // <--
     void Add( SwTxtAttr* pTxtHt, ULONG nNodeIdx, bool bNewAttr = true );
     void Add( SwFmtColl*, ULONG nNodeIdx, BYTE nWhichNd );
     void Add( const ::sw::mark::IMark&, bool bSavePos, bool bSaveOtherPos );
     void Add( SwFrmFmt& rFmt );
     void Add( SwFlyFrmFmt&, USHORT& rSetPos );
     void Add( const SwTxtFtn& );
-    void Add( const SfxItemSet & rSet, const SwCharFmt & rCharFmt); // #i27615#
+    void Add( const SfxItemSet & rSet, const SwCharFmt & rCharFmt);
 
     USHORT Count() const { return m_SwpHstry.Count(); }
     USHORT GetTmpEnd() const { return m_SwpHstry.Count() - m_nEndDiff; }
@@ -410,9 +399,7 @@ public:
     // used by Undo classes (Delete/Overwrite/Inserts)
     void CopyAttr( SwpHints* pHts, ULONG nNodeIdx, xub_StrLen nStart,
                     xub_StrLen nEnd, bool bFields );
-    // --> OD 2008-02-27 #refactorlists# - removed <rDoc>
     void CopyFmtAttr( const SfxItemSet& rSet, ULONG nNodeIdx );
-    // <--
 };
 
 #ifndef ROLBCK_HISTORY_ONLY
@@ -427,15 +414,14 @@ private:
     void _MakeSetWhichIds();
 
 public:
-    // --> OD 2008-02-27 #refactorlists# - removed <rDoc>
+
     SwRegHistory( SwHistory* pHst );
-    // <--
     SwRegHistory( const SwNode& rNd, SwHistory* pHst );
     SwRegHistory( SwModify* pRegIn, const SwNode& rNd, SwHistory* pHst );
 
     virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew );
 
-    /// @return true iff at least 1 item was inserted
+    /// @return true if at least 1 item was inserted
     bool InsertItems( const SfxItemSet& rSet,
         xub_StrLen const nStart, xub_StrLen const nEnd,
         SetAttrMode const nFlags );
@@ -448,7 +434,6 @@ public:
 
 #endif
 
-
 #endif // _ROLBCK_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index 23c4ed535e75..e62735c0a2c3 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -65,12 +65,6 @@ enum SectionType { CONTENT_SECTION,
                     TOX_CONTENT_SECTION,
                     DDE_LINK_SECTION    = OBJECT_CLIENT_DDE,
                     FILE_LINK_SECTION   = OBJECT_CLIENT_FILE
-/*
-// verbleiben noch:
-    OBJECT_CLIENT_SO            = 0x80,
-    OBJECT_CLIENT_OLE           = 0x82,
-    OBJECT_CLIENT_OLE_CACHE     = 0x83,
-*/
                     };
 
 enum LinkCreateType
@@ -88,7 +82,7 @@ private:
     String m_sSectionName;
     String m_sCondition;
     String m_sLinkFileName;
-    String m_sLinkFilePassword; // JP 27.02.2001: must be changed to Sequence
+    String m_sLinkFilePassword; // must be changed to Sequence
     ::com::sun::star::uno::Sequence <sal_Int8> m_Password;
 
     /// it seems this flag caches the current final "hidden" state
@@ -98,9 +92,9 @@ private:
     /// format attr has value for this section, while flag is
     /// effectively ORed with parent sections!
     bool m_bProtectFlag         : 1;
-    // --> FME 2004-06-22 #114856# edit in readonly sections
+    // edit in readonly sections
     bool m_bEditInReadonlyFlag  : 1;
-    // <--
+
     bool m_bHidden              : 1; // all paragraphs hidden?
     bool m_bCondHiddenFlag      : 1; // Hiddenflag for condition
     bool m_bConnectFlag         : 1; // connected to server?
@@ -127,11 +121,9 @@ public:
     bool IsProtectFlag() const { return m_bProtectFlag; }
     SW_DLLPRIVATE void
         SetProtectFlag(bool const bFlag) { m_bProtectFlag = bFlag; }
-    // --> FME 2004-06-22 #114856# edit in readonly sections
     bool IsEditInReadonlyFlag() const { return m_bEditInReadonlyFlag; }
     void SetEditInReadonlyFlag(bool const bFlag)
         { m_bEditInReadonlyFlag = bFlag; }
-    // <--
 
     void SetCondHidden(bool const bFlag = true) { m_bCondHiddenFlag = bFlag; };
     bool IsCondHidden() const { return m_bCondHiddenFlag; }
@@ -205,18 +197,14 @@ public:
     void SetHidden (bool const bFlag = true);
     bool IsProtect() const;
     void SetProtect(bool const bFlag = true);
-    // --> FME 2004-06-22 #114856# edit in readonly sections
     bool IsEditInReadonly() const;
     void SetEditInReadonly(bool const bFlag = true);
-    // <--
 
     // erfrage die internen Flags (Zustand inklusive Parents nicht, was
     // aktuell an der Section gesetzt ist!!)
     bool IsHiddenFlag()  const { return m_Data.IsHiddenFlag(); }
     bool IsProtectFlag() const { return m_Data.IsProtectFlag(); }
-    // --> FME 2004-06-22 #114856# edit in readonly sections
     bool IsEditInReadonlyFlag() const { return m_Data.IsEditInReadonlyFlag(); }
-    // <--
 
     void SetCondHidden(bool const bFlag = true);
     bool IsCondHidden() const { return m_Data.IsCondHidden(); }
@@ -275,9 +263,8 @@ public:
     // return the TOX base class if the section is a TOX section
     const SwTOXBase* GetTOXBase() const;
 
-    // --> OD 2007-02-14 #b6521322#
+    // #b6521322#
     void BreakLink();
-    // <--
 
 };
 
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 125f7cadfb7d..de3556ac600a 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -61,7 +61,6 @@ class SvStream;
 class SvStrings;
 class SvxFontItem;
 class SvxMacroTableDtor;
-//class Sw3Io;
 class SwCntntNode;
 class SwCrsrShell;
 class SwDoc;
@@ -175,18 +174,15 @@ class SwReader: public SwDocFac
 public:
     /*
      * Initiales Einlesen. Dokument wird erst beim Read(..) angelegt.
-     * JP 25.04.95: oder falls es mitgegeben wird, in dieses.
+     *  oder falls es mitgegeben wird, in dieses.
      *              Sonderfall fuer Load mit Sw3Reader
      */
-    //SwReader( SotStorage&, const String& rFilename, SwDoc *pDoc = 0 );
-    //SwReader( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String& rFilename, SwDoc *pDoc = 0 );
     SwReader( SfxMedium&, const String& rFilename, SwDoc *pDoc = 0 );
     /*
      * In ein existierendes Dokument einlesen, Dokument und
      * Position im Dokument werden aus dem SwPaM uebernommen.
      */
     SwReader( SvStream&, const String& rFilename, const String& rBaseURL, SwPaM& );
-    //SwReader( SotStorage&, const String& rFilename, SwPaM& );
     SwReader( SfxMedium&, const String& rFilename, SwPaM& );
     SwReader( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String& rFilename, SwPaM& );
 
@@ -209,7 +205,6 @@ protected:
 
 
 
-/*  */
 /****************  SPEZIELLE Reader ************************/
 
 // spezielle - Reader koennen beides sein !! (Excel, W4W, .. )
@@ -221,7 +216,6 @@ class SW_DLLPUBLIC Reader
     friend class SwReader;
     SwDoc* pTemplate;
     String aTemplateNm;
-    //String sBaseURL;
 
     Date aDStamp;
     Time aTStamp;
@@ -306,11 +300,6 @@ public:
     AsciiReader(): Reader() {}
 };
 
-/*class SwgReader: public Reader
-{
-    virtual ULONG Read( SwDoc &, const String& rBaseURL, SwPaM &,const String &);
-};
-*/
 class SW_DLLPUBLIC StgReader : public Reader
 {
     String aFltName;
@@ -325,22 +314,6 @@ public:
 };
 
 
-/*class Sw3Reader : public StgReader
-{
-    Sw3Io* pIO;
-    virtual ULONG Read( SwDoc &, const String& rBaseURL, SwPaM &,const String &);
-public:
-    Sw3Reader() : pIO( 0 ) {}
-
-    void   SetSw3Io( Sw3Io* pIo )     { pIO = pIo; }
-
-    // read the sections of the document, which is equal to the medium.
-    // returns the count of it
-    virtual USHORT GetSectionList( SfxMedium& rMedium,
-                                SvStrings& rStrings ) const;
-};*/
-
-/*  */
 ////////////////////////////////////////////////////////////////////////////
 
 // Der uebergebene Stream muss dynamisch angelegt werden und
@@ -351,8 +324,6 @@ class SwImpBlocks;
 
 class SW_DLLPUBLIC SwTextBlocks
 {
-//  friend class Sw2TextBlocks;
-//  friend class Sw3IoImp;
     SwImpBlocks* pImp;
     ULONG        nErr;
 
@@ -413,7 +384,6 @@ extern void _FinitFilter();
 
 extern SwRead ReadAscii, /*ReadSwg, ReadSw3, */ReadHTML, ReadXML;
 
-//SW_DLLPUBLIC SwRead SwGetReaderSw3();
 SW_DLLPUBLIC SwRead SwGetReaderXML();
 
 // END source/filter/basflt/fltini.cxx
@@ -422,7 +392,6 @@ SW_DLLPUBLIC SwRead SwGetReaderXML();
 extern BOOL SetHTMLTemplate( SwDoc &rDoc ); //Fuer Vorlagen aus HTML.vor laden shellio.cxx
 
 
-/*  */
 /////////////////////////////////////////////////////////////////////////////
 
 /*
@@ -495,7 +464,6 @@ public:
     virtual void SetPasswd( const String& );
     virtual void SetVersion( const String&, long );
     virtual BOOL IsStgWriter() const;
-//  virtual BOOL IsSw3Writer() const;
 
     void SetShowProgress( BOOL bFlag = FALSE )  { bShowProgress = bFlag; }
 
@@ -578,22 +546,6 @@ public:
     SotStorage& GetStorage() const       { return *pStg; }
 };
 
-/*class Sw3Writer : public StgWriter
-{
-    Sw3Io* pIO;
-    BOOL bSaveAs : 1;
-
-    virtual ULONG WriteStorage();
-    virtual ULONG WriteMedium( SfxMedium& );
-
-public:
-    Sw3Writer() : pIO( 0 ), bSaveAs( FALSE ) {}
-
-    virtual BOOL IsSw3Writer() const;
-};
-
-*/
-
 // Schnittstellenklasse fuer den allgemeinen Zugriff auf die
 // speziellen Writer
 
@@ -608,8 +560,6 @@ class SwWriter
     SwCrsrShell *pShell;
     SwDoc &rDoc;
 
-    //String sBaseURL;
-
     BOOL bWriteAll;
 
 public:
@@ -619,19 +569,13 @@ public:
     SwWriter( SvStream&, SwDoc & );
     SwWriter( SvStream&, SwPaM &, BOOL bWriteAll = FALSE );
 
-//  SwWriter( SotStorage&, SwCrsrShell &,BOOL bWriteAll = FALSE );
     SwWriter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, SwDoc& );
-//  SwWriter( SotStorage&, SwPaM&, BOOL bWriteAll = FALSE );
 
     SwWriter( SfxMedium&, SwCrsrShell &,BOOL bWriteAll = FALSE );
     SwWriter( SfxMedium&, SwDoc & );
-//  SwWriter( SfxMedium&, SwPaM&, BOOL bWriteAll = FALSE );
-
-    //const String&       GetBaseURL() const { return sBaseURL;}
 };
 
 
-/*  */
 /////////////////////////////////////////////////////////////////////////////
 
 typedef Reader* (*FnGetReader)();
@@ -671,7 +615,6 @@ namespace SwReaderWriter
 
 void GetRTFWriter( const String&, const String&, WriterRef& );
 void GetASCWriter( const String&, const String&, WriterRef& );
-//void GetSw3Writer( const String&, const String&, WriterRef& );
 void GetHTMLWriter( const String&, const String&, WriterRef& );
 void GetXMLWriter( const String&, const String&, WriterRef& );
 void GetWW8Writer( const String&, const String&, WriterRef& );
diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx
index 443ec8f800d3..ee88b661457a 100644
--- a/sw/inc/shellres.hxx
+++ b/sw/inc/shellres.hxx
@@ -58,10 +58,8 @@ struct SW_DLLPUBLIC ShellResource : public Resource
     // fuers GetRefFeld - oben/unten
     String          aGetRefFld_Up;
     String          aGetRefFld_Down;
-    // --> OD 2007-09-13 #i81002#
     // for GetRefField - referenced item not found
     String          aGetRefFld_RefItemNotFound;
-    // <--
     // fuer dynamisches Menu - String "alle"
     String          aStrAllPageHeadFoot;
     // fuer einige Listboxen - String "keine"
@@ -84,10 +82,6 @@ struct SW_DLLPUBLIC ShellResource : public Resource
 
     SvStringsDtor   aDocInfoLst;
 
-    // Fly-Anker Bmps
-//  Bitmap          aAnchorBmp;
-//  Bitmap          aDragAnchorBmp;
-
     // die AutoFormat-Redline-Kommentare
     inline const SvStringsDtor& GetAutoFmtNameLst() const;
 
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index abad91650b66..6544f2623bba 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -101,12 +101,10 @@ class SwFmtNoBalancedColumns;
 class SvxFrameDirectionItem;
 class SwTextGridItem;
 class SwHeaderAndFooterEatSpacingItem;
-// OD 18.09.2003 #i18732#
 class SwFmtFollowTextFlow;
-// OD 2004-05-05 #i28701#
 class SwFmtWrapInfluenceOnObjPos;
 
-// Grafik-Attribute
+// Graphic attributes
 class SwMirrorGrf;
 class SwCropGrf;
 class SwRotationGrf;
@@ -120,7 +118,7 @@ class SwInvertGrf;
 class SwTransparencyGrf;
 class SwDrawModeGrf;
 
-// Paragraph-Attribute
+// Paragraph attributes
 class SvxLineSpacingItem;
 class SvxAdjustItem;
 class SvxFmtSplitItem;
@@ -138,7 +136,7 @@ class SvxParaVertAlignItem;
 class SvxParaGridItem;
 class SwParaConnectBorderItem;
 
-// TabellenBox-Attribute
+// TableBox attributes
 class SwTblBoxNumFormat;
 class SwTblBoxFormula;
 class SwTblBoxValue;
@@ -151,7 +149,7 @@ class SwAttrPool : public SfxItemPool
     static USHORT* pVersionMap2;
     static USHORT* pVersionMap3;
     static USHORT* pVersionMap4;
-    // OD 2004-01-21 #i18732# - due to extension of attribute set a new version
+    // due to extension of attribute set a new version
     // map for binary filter is necessary (version map 5).
     static USHORT* pVersionMap5;
     static USHORT* pVersionMap6;
@@ -176,7 +174,7 @@ public:
 
 class SW_DLLPUBLIC SwAttrSet : public SfxItemSet
 {
-    // Pointer fuers Modify-System
+    // Pointer for Modify-System
     SwAttrSet *pOldSet, *pNewSet;
 
     // Notification-Callback
@@ -226,7 +224,6 @@ public:
     //              den Parents gesucht werden soll. Wird nichts gefunden,
     //              wird das deflt. Attribut returnt.
     // Charakter-Attribute  - impl. steht im charatr.hxx
-    // AMA 12.10.94: Umstellung von SwFmt... auf Svx...
     inline const SvxPostureItem           &GetPosture( BOOL = TRUE ) const;
     inline const SvxWeightItem          &GetWeight( BOOL = TRUE ) const;
     inline const SvxShadowedItem        &GetShadowed( BOOL = TRUE ) const;
@@ -302,12 +299,10 @@ public:
     inline const SvxFrameDirectionItem    &GetFrmDir( BOOL = TRUE ) const;
     inline const SwTextGridItem         &GetTextGrid( BOOL = TRUE ) const;
     inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( BOOL = TRUE ) const;
-    // OD 18.09.2003 #i18732#
     inline const SwFmtFollowTextFlow    &GetFollowTextFlow(BOOL = TRUE) const;
-    // OD 2004-05-05 #i28701#
     inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(BOOL = TRUE) const;
 
-    // Grafik-Attribute - impl. steht im grfatr.hxx
+    // Graphic attributes   - implementation in grfatr.hxx
     inline const SwMirrorGrf            &GetMirrorGrf( BOOL = TRUE ) const;
     inline const SwCropGrf            &GetCropGrf( BOOL = TRUE ) const;
     inline const SwRotationGrf            &GetRotationGrf(BOOL = TRUE ) const;
@@ -321,7 +316,7 @@ public:
     inline const SwTransparencyGrf        &GetTransparencyGrf(BOOL = TRUE ) const;
     inline const SwDrawModeGrf            &GetDrawModeGrf(BOOL = TRUE ) const;
 
-    // Paragraph-Attribute  - impl. steht im paratr.hxx
+    // Paragraph attributes - implementation in paratr.hxx
     inline const SvxLineSpacingItem       &GetLineSpacing( BOOL = TRUE ) const;
     inline const SvxAdjustItem            &GetAdjust( BOOL = TRUE ) const;
     inline const SvxFmtSplitItem      &GetSplit( BOOL = TRUE ) const;
@@ -339,7 +334,7 @@ public:
     inline const SvxParaGridItem        &GetParaGrid(BOOL = TRUE) const;
     inline const SwParaConnectBorderItem &GetParaConnectBorder(BOOL = TRUE ) const;
 
-    // TabellenBox-Attribute    - impl. steht im cellatr.hxx
+    // Tablebox attributes  - implementation in cellatr.hxx
     inline  const SwTblBoxNumFormat       &GetTblBoxNumFmt( BOOL = TRUE ) const;
     inline  const SwTblBoxFormula     &GetTblBoxFormula( BOOL = TRUE ) const;
     inline  const SwTblBoxValue           &GetTblBoxValue( BOOL = TRUE ) const;
diff --git a/sw/inc/swdbtoolsclient.hxx b/sw/inc/swdbtoolsclient.hxx
index ee4d59651f9f..11bdcee9dc58 100644
--- a/sw/inc/swdbtoolsclient.hxx
+++ b/sw/inc/swdbtoolsclient.hxx
@@ -33,9 +33,9 @@
 #include <osl/module.h>
 #include "swdllapi.h"
 
-/* -----------------------------30.08.2001 11:01------------------------------
+/*
     Client to use the dbtools library as load-on-call
- ---------------------------------------------------------------------------*/
+*/
 class SW_DLLPUBLIC SwDbtoolsClient
 {
 private:
diff --git a/sw/inc/swerror.h b/sw/inc/swerror.h
index 81a1309c91fb..6fe24e7db9b5 100644
--- a/sw/inc/swerror.h
+++ b/sw/inc/swerror.h
@@ -40,7 +40,7 @@
 #define WARN_SW_WRITE_BASE      (WARN_SW_BASE | ERRCODE_CLASS_WRITE )
 
 
-// Import Fehler
+// Import Errors
 #define ERR_SWG_FILE_FORMAT_ERROR     (ERROR_SW_READ_BASE | 1 )
 #define ERR_SWG_READ_ERROR              (ERROR_SW_READ_BASE   | 2 )
 
@@ -59,17 +59,17 @@
 
 #define ERR_FORMAT_FILE_ROWCOL          (ERROR_SW_READ_BASE | 15)
 
-// Export Fehler
+// Export errors
 #define ERR_SWG_WRITE_ERROR               (ERROR_SW_WRITE_BASE | 30 )
 #define   ERR_SWG_OLD_GLOSSARY            (ERROR_SW_WRITE_BASE | 31 )
 #define ERR_WRITE_ERROR_FILE            (ERROR_SW_WRITE_BASE | 35 )
 
-// Import/Export Fehler
+// Import/Export errors
 #define ERR_SWG_INTERNAL_ERROR            (ERROR_SW_BASE  | 50 )
 
 #define ERR_TXTBLOCK_NEWFILE_ERROR      (ERROR_SW_BASE|ERRCODE_CLASS_LOCKING | 55 )
 
-// weitere Fehler und Fehlerklassen
+// other errors and errorclasses
 #define ERR_AUTOPATH_ERROR              (ERROR_SW_BASE|ERRCODE_CLASS_PATH | 55 )
 #define ERR_TBLSPLIT_ERROR              (ERROR_SW_BASE|ERRCODE_CLASS_NONE| 56 )
 #define ERR_TBLINSCOL_ERROR             (ERROR_SW_BASE|ERRCODE_CLASS_NONE| 57 )
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 420a9d2d9aa5..6dcb67029666 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -269,9 +269,9 @@ inline void SwModule::SetLngSvcEvtListener(
 }
 
 
-/*-----------------08.07.97 10.33-------------------
+/*
     Zugriff auf das SwModule, die ::com::sun::star::sdbcx::View und die Shell
---------------------------------------------------*/
+*/
 
 #define SW_MOD() ( *(SwModule**) GetAppData(SHL_WRITER))
 
diff --git a/sw/inc/swrect.hxx b/sw/inc/swrect.hxx
index 82dddd49cecc..325c0cdd940b 100644
--- a/sw/inc/swrect.hxx
+++ b/sw/inc/swrect.hxx
@@ -28,6 +28,7 @@
 #ifndef _SWRECT_HXX
 #define _SWRECT_HXX
 #include "errhdl.hxx"
+#include <osl/diagnose.h>
 #include <tools/gen.hxx>
 class SvStream;
 
@@ -44,10 +45,10 @@ public:
     inline SwRect( const Point& rLT, const Point& rRB );
     inline SwRect( long X, long Y, long Width, long Height );
 
-        //SV-SS z.B. SwRect( pWin->GetClipRect() );
+        //SV-SS e.g. SwRect( pWin->GetClipRect() );
     SwRect( const Rectangle &rRect );
 
-    //Set-Methoden
+    //Set-Methods
     inline void Chg( const Point& rNP, const Size &rNS );
     inline void Pos(  const Point& rNew );
     inline void Pos( const long nNewX, const long nNewY );
@@ -60,7 +61,7 @@ public:
     inline void Top( const long nTop );
     inline void Bottom( const long nBottom );
 
-    //Get-Methoden
+    //Get-Methods
     inline const Point &Pos()  const;
     inline const Size  &SSize() const;
     inline long Width()  const;
@@ -104,13 +105,9 @@ public:
     inline SwRect &operator+=( const Size &rSz );
     inline SwRect &operator-=( const Size &rSz );
 
-    //SV-SS z.B. pWin->DrawRect( aSwRect.SVRect() );
+    //SV-SS e.g. pWin->DrawRect( aSwRect.SVRect() );
     inline Rectangle  SVRect() const;
 
-    //Zortech wuerde hier fehlerhaften Code erzeugen.
-//  inline operator SRectangle()  const;
-//  inline operator Rectangle() const { return Rectangle( aPos, aSize ); }
-
     // Ausgabeoperator fuer die Debugging-Gemeinde
     friend SvStream &operator<<( SvStream &rStream, const SwRect &rRect );
 
@@ -158,7 +155,7 @@ public:
     BOOL OverStepRight( long ) const;
 };
 
-// Implementation in in swrect.cxx
+// Implementation in swrect.cxx
 extern SvStream &operator<<( SvStream &rStream, const SwRect &rRect );
 
 typedef void (SwRect:: *SwRectSet)( const long nNew );
@@ -170,7 +167,7 @@ typedef long (SwRect:: *SwRectDist)( long ) const;
 typedef void (SwRect:: *SwRectSetTwice)( long, long );
 typedef void (SwRect:: *SwRectSetPos)( const Point& );
 
-//---------------------------------- Set-Methoden
+//  Set-Methods
 inline void SwRect::Chg( const Point& rNP, const Size &rNS )
 {
     m_Point = rNP;
@@ -221,7 +218,7 @@ inline void SwRect::Bottom( const long nBottom )
     m_Size.setHeight(nBottom - m_Point.getY() + 1);
 }
 
-//----------------------------------- Get-Methoden
+// Get-Methods
 inline const Point &SwRect::Pos()  const
 {
     return m_Point;
@@ -263,7 +260,7 @@ inline long SwRect::Bottom() const
     return m_Size.getHeight() ? m_Point.getY() + m_Size.getHeight() - 1 : m_Point.getY();
 }
 
-//----------------------------------- operatoren
+// operators
 inline SwRect &SwRect::operator = ( const SwRect &rRect )
 {
     m_Point = rRect.m_Point;
@@ -304,10 +301,10 @@ inline SwRect &SwRect::operator-=( const Size &rSz )
 }
 
 
-//--------------------------- Sonstiges
+// other
 inline Rectangle SwRect::SVRect() const
 {
-    ASSERT( !IsEmpty(), "SVRect() without Width or Height" );
+    OSL_ENSURE( !IsEmpty(), "SVRect() without Width or Height" );
     return Rectangle( m_Point.getX(), m_Point.getY(),
         m_Point.getX() + m_Size.getWidth() - 1,         //Right()
         m_Point.getY() + m_Size.getHeight() - 1 );      //Bottom()
@@ -334,7 +331,7 @@ inline void SwRect::Clear()
     m_Size.setHeight(0);
 }
 
-//-------------------------- CToren
+// constructors
 inline SwRect::SwRect() :
     m_Point( 0, 0 ),
     m_Size( 0, 0 )
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 600d5cd3949c..d6581a60d56b 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -34,12 +34,13 @@
 #include <swtypes.hxx>
 #include <calbck.hxx>
 #include <swrect.hxx>
-#ifndef DBG_UTIL
-#include <node.hxx>         // fuer StartNode->GetMyIndex
-#else
+
+#if OSL_DEBUG_LEVEL > 1
 class SwStartNode;
 #include <memory>
 #include <boost/noncopyable.hpp>
+#else
+#include <node.hxx>         // fuer StartNode->GetMyIndex
 #endif
 
 class Color;
@@ -109,7 +110,7 @@ protected:
 
     BOOL        bModifyLocked   :1;
     BOOL        bNewModel       :1; // FALSE: old SubTableModel; TRUE: new RowSpanModel
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     bool bDontChangeModel;  // This is set by functions (like Merge()) to forbid a laet model change
 #endif
 
@@ -208,7 +209,7 @@ public:
     BOOL Merge( SwDoc* pDoc, const SwSelBoxes& rBoxes, const SwSelBoxes& rMerged,
                 SwTableBox* pMergeBox, SwUndoTblMerge* pUndo = 0 )
     {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         bDontChangeModel = true;
 #endif
         return bNewModel ? NewMerge( pDoc, rBoxes, rMerged, pMergeBox, pUndo ) :
@@ -217,7 +218,7 @@ public:
     BOOL SplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt=1,
                    BOOL bSameHeight = FALSE )
     {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         bDontChangeModel = true;
 #endif
         return bNewModel ? NewSplitRow( pDoc, rBoxes, nCnt, bSameHeight ) :
@@ -249,19 +250,17 @@ public:
 
         // lese die 1. Nummer und loesche sie aus dem String
         // (wird von GetTblBox und SwTblFld benutzt)
-    // --> OD 2007-08-03 #i80314#
+    // #i80314#
     // add 3rd parameter in order to control validation check on <rStr>
     static USHORT _GetBoxNum( String& rStr,
                               BOOL bFirst = FALSE,
                               const bool bPerformValidCheck = false );
-    // <--
         // suche die Inhaltstragende Box mit dem Namen
-    // --> OD 2007-08-03 #i80314#
+    // #i80314#
     // add 2nd parameter in order to control validation check in called method
     // <_GetBoxNum(..)>
     const SwTableBox* GetTblBox( const String& rName,
                                  const bool bPerformValidCheck = false ) const;
-    // <--
         // kopiere die selektierten Boxen in ein anderes Dokument.
     BOOL MakeCopy( SwDoc*, const SwPosition&, const SwSelBoxes&,
                     BOOL bCpyNds = TRUE, BOOL bCpyName = FALSE ) const;
@@ -321,7 +320,7 @@ public:
                         SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo );
     BOOL SetRowHeight( SwTableBox& rAktBox, USHORT eType,
                         SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     void CheckConsistency() const;
 #endif
 };
@@ -410,10 +409,10 @@ public:
 
     const SwStartNode *GetSttNd() const { return pSttNd; }
     ULONG GetSttIdx() const
-#ifndef DBG_UTIL
-        { return pSttNd ? pSttNd->GetIndex() : 0; }
-#else
+#if OSL_DEBUG_LEVEL > 1
         ;
+#else
+        { return pSttNd ? pSttNd->GetIndex() : 0; }
 #endif
 
     // suche nach der naechsten/vorherigen Box mit Inhalt
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 23d3a2b0cd78..d911bad31b1d 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -41,8 +41,6 @@
 #include <com/sun/star/uno/Reference.h>
 #include "swdllapi.h"
 #include <i18npool/lang.h>
-// wenn das hier geaendert wird, dann auch im globals.hrc aendern!!!
-//#define SW_FILEFORMAT_40 SOFFICE_FILEFORMAT_40
 
 namespace com { namespace sun { namespace star {
     namespace linguistic2{
@@ -75,7 +73,7 @@ typedef long SwTwips;
 #define TWIPS_MAX       (LONG_MAX - 1)
 
 #define MM50   283  // 1/2 cm in TWIPS
-// --> OD 2004-06-18 #i19922# - constant for minimal page header/footer height of 1mm
+
 const SwTwips cMinHdFtHeight = 56;
 
 #define MINFLY 23   //Minimalgroesse fuer FlyFrms
@@ -120,8 +118,6 @@ enum SwLabelType
 const BYTE OLD_MAXLEVEL = 5;
 const BYTE MAXLEVEL = 10;       //Ehemals numrule.hxx
 const BYTE NO_NUM       = 200;  //Ehemals numrule.hxx
-//const BYTE NO_NUMBERING = 201;  //Ehemals numrule.hxx //#outline level,removed by zhaojianwei
-//const BYTE NO_INIT        = 202;  //Ehemals numrule.hxx
 
 // fuer Absaetze mit NO_NUM aber auf unterschiedlichen Leveln
 // DAMIT entfaellt das NO_NUM !!!!
@@ -145,13 +141,11 @@ extern SwPathFinder *pPathFinder;
 // (fuer die weiteren Ebenen sind die Werte mit den Ebenen+1 zu
 //  multiplizieren; Ebenen 0..4 !!!)
 
-// -> #i30312#
 const USHORT lBullIndent = 1440/4;
 const short lBullFirstLineOffset = -lBullIndent;
 const USHORT lNumIndent = 1440/4;
 const short lNumFirstLineOffset = -lNumIndent;
 const short lOutlineMinTextDistance = 216; // 0.15 inch = 0.38 cm
-// <- #i30312#
 
 // Anzahl der SystemField-Types vom SwDoc
 #define INIT_FLDTYPES   32
@@ -278,7 +272,6 @@ SW_DLLPUBLIC CollatorWrapper& GetAppCaseCollator();
 
 SW_DLLPUBLIC const ::utl::TransliterationWrapper& GetAppCmpStrIgnore();
 
-// --> OD 2004-06-30 #i28701# - moved from <frame.hxx>
 //fuer Prepare() zur Benachrichtigung des Inhaltes durch das Layout auf
 //dem kurzen Dienstweg.
 //Der Inhalt sorgt dafuer, dass beim naechsten Aufruf von ::Format() das
@@ -334,7 +327,6 @@ enum PrepareHint
     PREP_ERGOSUM,           //wg. Bewegung in FtnFrms QuoVadis/ErgoSum pruefen
     PREP_END                //END
 };
-// <--
 
 #endif
 
diff --git a/sw/inc/swundo.hxx b/sw/inc/swundo.hxx
index f8d00a182f81..ae89b213e222 100644
--- a/sw/inc/swundo.hxx
+++ b/sw/inc/swundo.hxx
@@ -77,10 +77,8 @@ enum SwUndoId
     UNDO_MERGE_TABLE,                       // 38
     UNDO_TRANSLITERATE,                     // 39
 
-    // -> #111827#
-    UNDO_PASTE_CLIPBOARD,                           // 40
+    UNDO_PASTE_CLIPBOARD,                   // 40
     UNDO_TYPING,                           // 41
-    // <- #111827#
     UNDO_REPEAT_DUMMY_6,                    // 42
     UNDO_REPEAT_DUMMY_7,                    // 43
     UNDO_REPEAT_DUMMY_8,                    // 44
@@ -128,13 +126,13 @@ enum SwUndoId
     UNDO_SETFLYFRMFMT,                      // 84
     UNDO_SETRUBYATTR,                       // 85
 
-    UNDO_TMPAUTOCORR,                       // 86 #102505#
+    UNDO_TMPAUTOCORR,                       // 86
     UNDO_TOXCHANGE,                         // 87
     UNDO_CREATE_PAGEDESC,                           // 88
     UNDO_CHANGE_PAGEDESC,                           // 89
     UNDO_DELETE_PAGEDESC,                           // 90
     UNDO_HEADER_FOOTER,                           // 91 #i7983#
-    UNDO_FIELD,                             // 92 #111840#
+    UNDO_FIELD,                             // 92
     UNDO_TXTFMTCOL_CREATE,                   // 93
     UNDO_TXTFMTCOL_DELETE,                   // 94
     UNDO_TXTFMTCOL_RENAME, // 95
@@ -154,7 +152,7 @@ enum SwUndoId
     UNDO_ROW_DELETE, // 109
     UNDO_RENAME_PAGEDESC, // 110
     UNDO_NUMDOWN, // 111
-    // --> OD 2009-07-16 #i73249#
+    // --> #i73249#
     UNDO_FLYFRMFMT_TITLE,           // 112
     UNDO_FLYFRMFMT_DESCRIPTION,     // 113
     // <--
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index f391cb862d5a..58610145cb2c 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -30,7 +30,7 @@
 /*************************************************************************
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-JP 20.07.95:
+
 
     Die akt. Struktur der Autoformatierung darf nicht mehr veraendert werden.
     Diese wird durch unterschiedlichen Code vom StartWriter und vom StarCalc
@@ -247,7 +247,7 @@ public:
     BOOL Save( SvStream& rStream ) const;
 
 #ifdef READ_OLDVERS
-    // lade alte Version
+    // load old versions
     BOOL LoadOld( SvStream& rStream, USHORT aLoadVer[] );
 #endif
 };
diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx
index a00aa747a9ff..8178cdc47746 100644
--- a/sw/inc/tgrditem.hxx
+++ b/sw/inc/tgrditem.hxx
@@ -56,7 +56,7 @@ public:
     SwTextGridItem();
     virtual ~SwTextGridItem();
 
-    // "pure virtual Methoden" vom SfxPoolItem
+    // "pure virtual methods" of SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
     virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 7c8805416c5f..4d286ace6949 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -32,6 +32,7 @@
 
 #include <i18npool/lang.h>
 #include <tools/string.hxx>
+#include <osl/diagnose.h>
 
 #include <editeng/svxenum.hxx>
 #include <svl/svarray.hxx>
@@ -250,16 +251,6 @@ struct SW_DLLPUBLIC SwFormToken
     String GetString() const;
 };
 
-// -> #i21237#
-/**
-    Functor that is true when a given token has a certain token type.
-
-    @param _eType  the type to check for
-    @param rToken  the token to check
-
-    @retval TRUE   the token has the given type
-    @retval FALSE  else
-*/
 struct SwFormTokenEqualToFormTokenType
 {
     FormTokenType eType;
@@ -354,7 +345,6 @@ public:
     */
     const SwFormTokens & GetTokens() const { return aTokens; }
 };
-// <- #i21237#
 
 class SW_DLLPUBLIC SwForm
 {
@@ -364,8 +354,6 @@ class SW_DLLPUBLIC SwForm
     TOXTypes    eType;
     USHORT      nFormMaxLevel;
 
-    //USHORT    nFirstTabPos; -> Value in tab token
-//  BOOL    bHasFirstTabPos : 1;
     BOOL    bGenerateTabPos : 1;
     BOOL    bIsRelTabPos : 1;
     BOOL    bCommaSeparated : 1;
@@ -466,11 +454,10 @@ namespace nsSwTOOElements
     const SwTOOElements TOO_CHART           = 0x02;
     const SwTOOElements TOO_CALC            = 0x08;
     const SwTOOElements TOO_DRAW_IMPRESS    = 0x10;
-//  const SwTOOElements TOO_IMPRESS         = 0x20;
     const SwTOOElements TOO_OTHER           = 0x80;
 }
 
-#define TOX_STYLE_DELIMITER ((sal_Unicode)0x01)     //JP 19.07.00: use a control char
+#define TOX_STYLE_DELIMITER ((sal_Unicode)0x01)
 
 /*--------------------------------------------------------------------
      Description:  Class for all indexes
@@ -619,73 +606,73 @@ inline void SwTOXMark::SetAlternativeText(const String& rAlt)
 
 inline void SwTOXMark::SetLevel( USHORT nLvl )
 {
-    ASSERT( !GetTOXType() || GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp");
+    OSL_ENSURE( !GetTOXType() || GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp");
     nLevel = nLvl;
 }
 
 inline void SwTOXMark::SetPrimaryKey( const String& rKey )
 {
-    ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
+    OSL_ENSURE( GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
     aPrimaryKey = rKey;
 }
 
 inline void SwTOXMark::SetSecondaryKey( const String& rKey )
 {
-    ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
+    OSL_ENSURE(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
     aSecondaryKey = rKey;
 }
 
 inline void SwTOXMark::SetTextReading( const String& rTxt )
 {
-    ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
+    OSL_ENSURE(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
     aTextReading = rTxt;
 }
 
 inline void SwTOXMark::SetPrimaryKeyReading( const String& rKey )
 {
-    ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
+    OSL_ENSURE(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
     aPrimaryKeyReading = rKey;
 }
 
 inline void SwTOXMark::SetSecondaryKeyReading( const String& rKey )
 {
-    ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
+    OSL_ENSURE(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
     aSecondaryKeyReading = rKey;
 }
 
 inline USHORT SwTOXMark::GetLevel() const
 {
-    ASSERT( !GetTOXType() || GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp");
+    OSL_ENSURE( !GetTOXType() || GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp");
     return nLevel;
 }
 
 inline const String& SwTOXMark::GetPrimaryKey() const
 {
-    ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
+    OSL_ENSURE(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
     return aPrimaryKey;
 }
 
 inline const String& SwTOXMark::GetSecondaryKey() const
 {
-    ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
+    OSL_ENSURE(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
     return aSecondaryKey;
 }
 
 inline const String& SwTOXMark::GetTextReading() const
 {
-    ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
+    OSL_ENSURE(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
     return aTextReading;
 }
 
 inline const String& SwTOXMark::GetPrimaryKeyReading() const
 {
-    ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
+    OSL_ENSURE(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
     return aPrimaryKeyReading;
 }
 
 inline const String& SwTOXMark::GetSecondaryKeyReading() const
 {
-    ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
+    OSL_ENSURE(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
     return aSecondaryKeyReading;
 }
 
@@ -694,13 +681,13 @@ inline const String& SwTOXMark::GetSecondaryKeyReading() const
 //
 inline void SwForm::SetTemplate(USHORT nLevel, const String& rTemplate)
 {
-    ASSERT(nLevel < GetFormMax(), "Index >= FORM_MAX");
+    OSL_ENSURE(nLevel < GetFormMax(), "Index >= FORM_MAX");
     aTemplate[nLevel] = rTemplate;
 }
 
 inline const String& SwForm::GetTemplate(USHORT nLevel) const
 {
-    ASSERT(nLevel < GetFormMax(), "Index >= FORM_MAX");
+    OSL_ENSURE(nLevel < GetFormMax(), "Index >= FORM_MAX");
     return aTemplate[nLevel];
 }
 
@@ -758,35 +745,31 @@ inline TOXTypes SwTOXBase::GetType() const
 
 inline void SwTOXBase::SetLevel(USHORT nLev)
 {
-    ASSERT(GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp");
+    OSL_ENSURE(GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp");
     aData.nLevel = nLev;
 }
 
 inline USHORT SwTOXBase::GetLevel() const
 {
-    ASSERT(GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp");
+    OSL_ENSURE(GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp");
     return aData.nLevel;
 }
 
 inline void SwTOXBase::SetTemplateName(const String& rName)
 {
-//  ASSERT(GetTOXType()->GetType() == TOX_USER, "Falscher Feldtyp");
-//  ASSERT(aData.pTemplateName, "pTemplateName == 0");
-//  (*aData.pTemplateName) = rName;
     DBG_WARNING("SwTOXBase::SetTemplateName obsolete");
     aStyleNames[0] = rName;
-
 }
 
 inline USHORT SwTOXBase::GetOptions() const
 {
-    ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
+    OSL_ENSURE(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
     return aData.nOptions;
 }
 
 inline void SwTOXBase::SetOptions(USHORT nOpt)
 {
-    ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
+    OSL_ENSURE(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
     aData.nOptions = nOpt;
 }
 
diff --git a/sw/inc/toxe.hxx b/sw/inc/toxe.hxx
index 2fee68929875..121fae2981eb 100644
--- a/sw/inc/toxe.hxx
+++ b/sw/inc/toxe.hxx
@@ -98,7 +98,6 @@ enum ToxAuthorityField
     AUTH_FIELD_HOWPUBLISHED,
     AUTH_FIELD_INSTITUTION,
     AUTH_FIELD_JOURNAL,
-//  AUTH_FIELD_KEY, // BiBTeX - Field
     AUTH_FIELD_MONTH,
     AUTH_FIELD_NOTE,
     AUTH_FIELD_NUMBER,
diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx
index c5835a377164..53851003620d 100644
--- a/sw/inc/txatbase.hxx
+++ b/sw/inc/txatbase.hxx
@@ -152,7 +152,7 @@ inline const xub_StrLen* SwTxtAttr::GetAnyEnd() const
 
 inline const SfxPoolItem& SwTxtAttr::GetAttr() const
 {
-    ASSERT( m_pAttr, "SwTxtAttr: where is my attribute?" );
+    OSL_ENSURE( m_pAttr, "SwTxtAttr: where is my attribute?" );
     return *m_pAttr;
 }
 
@@ -174,69 +174,69 @@ inline void SwTxtAttr::SetDontExpand( bool bDontExpand )
 
 inline const SwFmtCharFmt& SwTxtAttr::GetCharFmt() const
 {
-    ASSERT( m_pAttr && m_pAttr->Which() == RES_TXTATR_CHARFMT,
+    OSL_ENSURE( m_pAttr && m_pAttr->Which() == RES_TXTATR_CHARFMT,
         "Wrong attribute" );
     return (const SwFmtCharFmt&)(*m_pAttr);
 }
 
 inline const SwFmtAutoFmt& SwTxtAttr::GetAutoFmt() const
 {
-    ASSERT( m_pAttr && m_pAttr->Which() == RES_TXTATR_AUTOFMT,
+    OSL_ENSURE( m_pAttr && m_pAttr->Which() == RES_TXTATR_AUTOFMT,
         "Wrong attribute" );
     return (const SwFmtAutoFmt&)(*m_pAttr);
 }
 
 inline const SwFmtFld& SwTxtAttr::GetFld() const
 {
-    ASSERT( m_pAttr && m_pAttr->Which() == RES_TXTATR_FIELD,
+    OSL_ENSURE( m_pAttr && m_pAttr->Which() == RES_TXTATR_FIELD,
         "Wrong attribute" );
     return (const SwFmtFld&)(*m_pAttr);
 }
 
 inline const SwFmtFtn& SwTxtAttr::GetFtn() const
 {
-    ASSERT( m_pAttr && m_pAttr->Which() == RES_TXTATR_FTN, "Wrong attribute" );
+    OSL_ENSURE( m_pAttr && m_pAttr->Which() == RES_TXTATR_FTN, "Wrong attribute" );
     return (const SwFmtFtn&)(*m_pAttr);
 }
 
 inline const SwFmtFlyCnt& SwTxtAttr::GetFlyCnt() const
 {
-    ASSERT( m_pAttr && m_pAttr->Which() == RES_TXTATR_FLYCNT,
+    OSL_ENSURE( m_pAttr && m_pAttr->Which() == RES_TXTATR_FLYCNT,
         "Wrong attribute" );
     return (const SwFmtFlyCnt&)(*m_pAttr);
 }
 
 inline const SwTOXMark& SwTxtAttr::GetTOXMark() const
 {
-    ASSERT( m_pAttr && m_pAttr->Which() == RES_TXTATR_TOXMARK,
+    OSL_ENSURE( m_pAttr && m_pAttr->Which() == RES_TXTATR_TOXMARK,
         "Wrong attribute" );
     return (const SwTOXMark&)(*m_pAttr);
 }
 
 inline const SwFmtRefMark& SwTxtAttr::GetRefMark() const
 {
-    ASSERT( m_pAttr && m_pAttr->Which() == RES_TXTATR_REFMARK,
+    OSL_ENSURE( m_pAttr && m_pAttr->Which() == RES_TXTATR_REFMARK,
         "Wrong attribute" );
     return (const SwFmtRefMark&)(*m_pAttr);
 }
 
 inline const SwFmtINetFmt& SwTxtAttr::GetINetFmt() const
 {
-    ASSERT( m_pAttr && m_pAttr->Which() == RES_TXTATR_INETFMT,
+    OSL_ENSURE( m_pAttr && m_pAttr->Which() == RES_TXTATR_INETFMT,
         "Wrong attribute" );
     return (const SwFmtINetFmt&)(*m_pAttr);
 }
 
 inline const SwFmtRuby& SwTxtAttr::GetRuby() const
 {
-    ASSERT( m_pAttr && m_pAttr->Which() == RES_TXTATR_CJK_RUBY,
+    OSL_ENSURE( m_pAttr && m_pAttr->Which() == RES_TXTATR_CJK_RUBY,
         "Wrong attribute" );
     return (const SwFmtRuby&)(*m_pAttr);
 }
 
 inline const SwFmtMeta& SwTxtAttr::GetMeta() const
 {
-    ASSERT( m_pAttr && (m_pAttr->Which() == RES_TXTATR_META ||
+    OSL_ENSURE( m_pAttr && (m_pAttr->Which() == RES_TXTATR_META ||
                         m_pAttr->Which() == RES_TXTATR_METAFIELD),
         "Wrong attribute" );
     return (const SwFmtMeta&)(*m_pAttr);
diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx
index 97d24acd49a0..2e14cf50377e 100644
--- a/sw/inc/txtatr.hxx
+++ b/sw/inc/txtatr.hxx
@@ -112,7 +112,7 @@ public:
 
 inline const SwTxtNode& SwTxtRuby::GetTxtNode() const
 {
-    ASSERT( m_pTxtNode, "SwTxtRuby: where is my TxtNode?" );
+    OSL_ENSURE( m_pTxtNode, "SwTxtRuby: where is my TxtNode?" );
     return *m_pTxtNode;
 }
 
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx
index 1a883de7326e..f5748117bf93 100644
--- a/sw/inc/txtfld.hxx
+++ b/sw/inc/txtfld.hxx
@@ -57,18 +57,16 @@ public:
     // enable notification that field content has changed and needs reformatting
     void NotifyContentChange(SwFmtFld& rFmtFld);
 
-    // #111840#
     /**
        Returns position of this field.
 
        @return position of this field. Has to be deleted explicitly.
     */
-//    SwPosition * GetPosition() const;
 };
 
 inline SwTxtNode& SwTxtFld::GetTxtNode() const
 {
-    ASSERT( m_pTxtNode, "SwTxtFld:: where is my TxtNode?" );
+    OSL_ENSURE( m_pTxtNode, "SwTxtFld:: where is my TxtNode?" );
     return *m_pTxtNode;
 }
 
diff --git a/sw/inc/txtftn.hxx b/sw/inc/txtftn.hxx
index da75ceb3abfe..55eaa777b3c7 100644
--- a/sw/inc/txtftn.hxx
+++ b/sw/inc/txtftn.hxx
@@ -74,7 +74,7 @@ public:
 
 inline const SwTxtNode& SwTxtFtn::GetTxtNode() const
 {
-    ASSERT( m_pTxtNode, "SwTxtFtn: where is my TxtNode?" );
+    OSL_ENSURE( m_pTxtNode, "SwTxtFtn: where is my TxtNode?" );
     return *m_pTxtNode;
 }
 
diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx
index 4b5b34d31da9..48096c4f5cb3 100644
--- a/sw/inc/txtinet.hxx
+++ b/sw/inc/txtinet.hxx
@@ -74,7 +74,7 @@ public:
 
 inline const SwTxtNode& SwTxtINetFmt::GetTxtNode() const
 {
-    ASSERT( m_pTxtNode, "SwTxtINetFmt: where is my TxtNode?" );
+    OSL_ENSURE( m_pTxtNode, "SwTxtINetFmt: where is my TxtNode?" );
     return *m_pTxtNode;
 }
 
diff --git a/sw/inc/txtrfmrk.hxx b/sw/inc/txtrfmrk.hxx
index 0c06db1ff67a..c7507798be87 100644
--- a/sw/inc/txtrfmrk.hxx
+++ b/sw/inc/txtrfmrk.hxx
@@ -54,7 +54,7 @@ public:
 
 inline const SwTxtNode& SwTxtRefMark::GetTxtNode() const
 {
-    ASSERT( m_pTxtNode, "SwTxtRefMark: where is my TxtNode?" );
+    OSL_ENSURE( m_pTxtNode, "SwTxtRefMark: where is my TxtNode?" );
     return *m_pTxtNode;
 }
 
diff --git a/sw/inc/txttxmrk.hxx b/sw/inc/txttxmrk.hxx
index 3cc790002087..e70c28305082 100644
--- a/sw/inc/txttxmrk.hxx
+++ b/sw/inc/txttxmrk.hxx
@@ -58,7 +58,7 @@ public:
 
 inline const SwTxtNode& SwTxtTOXMark::GetTxtNode() const
 {
-    ASSERT( m_pTxtNode, "SwTxtTOXMark: where is my TxtNode?" );
+    OSL_ENSURE( m_pTxtNode, "SwTxtTOXMark: where is my TxtNode?" );
     return *m_pTxtNode;
 }
 
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 4811404a7517..2ce39c8320cd 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -46,7 +46,7 @@
 #endif
 #include <svl/itemset.hxx>
 
-#include <svx/svdundo.hxx> // #111827#
+#include <svx/svdundo.hxx>
 
 #include <numrule.hxx>
 #include <itabenum.hxx>
@@ -56,7 +56,6 @@
 #include <IMark.hxx>
 #include <IDocumentContentOperations.hxx>
 
-
 class SwUndoIter;
 class SwHistory;
 class SwIndex;
@@ -115,7 +114,6 @@ namespace utl {
     class TransliterationWrapper;
 }
 
-
 const String UNDO_ARG1("$1", RTL_TEXTENCODING_ASCII_US);
 const String UNDO_ARG2("$2", RTL_TEXTENCODING_ASCII_US);
 const String UNDO_ARG3("$3", RTL_TEXTENCODING_ASCII_US);
@@ -142,7 +140,6 @@ protected:
                                 const SwRedlineSaveDatas& rCheck,
                                 BOOL bCurrIsEnd );
 
-    // #111827#
     /**
        Returns the rewriter for this object.
 
@@ -159,7 +156,6 @@ public:
     virtual void Redo( SwUndoIter& ) = 0;
     virtual void Repeat( SwUndoIter& );
 
-    // #111827#
     /**
        Returns textual comment for this undo object.
 
@@ -240,7 +236,6 @@ public:
     ~SwUndoSaveCntnt();
 };
 
-
 // sicher eine vollstaendige Section im Nodes-Array
 class SwUndoSaveSection : private SwUndoSaveCntnt
 {
@@ -266,7 +261,6 @@ public:
           SwHistory* GetHistory()       { return pHistory; }
 };
 
-
 // Diese Klasse speichert den Pam als USHORT's und kann diese wieder zu
 // einem PaM zusammensetzen
 class SwUndRng
@@ -283,7 +277,6 @@ public:
     void SetPaM( SwUndoIter&, BOOL bCorrToCntnt = FALSE ) const;
 };
 
-
 class SwUndoStart: public SwUndo
 {
     // Um innerhalb von Undo zuerkennen, wann ein Start vorliegt, gibt
@@ -301,11 +294,9 @@ public:
     virtual void Redo( SwUndoIter& );
     virtual void Repeat( SwUndoIter& );
 
-    // -> #111827#
     virtual String GetComment() const;
     void SetRewriter(const SwRewriter & rRewriter);
     virtual SwRewriter GetRewriter() const;
-    // <- #111827#
 
     virtual SwUndoId GetEffectiveId() const;
     SwUndoId GetUserId() const { return nUserId; }
@@ -331,11 +322,9 @@ public:
     virtual void Redo( SwUndoIter& );
     virtual void Repeat( SwUndoIter& );
 
-    // -> #111827#
     virtual String GetComment() const;
     void SetRewriter(const SwRewriter & rRewriter);
     virtual SwRewriter GetRewriter() const;
-    // <- #111827#
 
     virtual SwUndoId GetEffectiveId() const;
     SwUndoId GetUserId() const { return nUserId; }
@@ -377,7 +366,6 @@ public:
     virtual void Redo( SwUndoIter& );
     virtual void Repeat( SwUndoIter& );
 
-    // #111827#
     /**
        Returns rewriter for this undo object.
 
@@ -391,11 +379,9 @@ public:
      */
     virtual SwRewriter GetRewriter() const;
 
-
     DECL_FIXEDMEMPOOL_NEWDEL(SwUndoInsert)
 };
 
-
 class SwUndoDelete: public SwUndo, private SwUndRng, private SwUndoSaveCntnt
 {
     SwNodeIndex* pMvStt;            // Position der Nodes im UndoNodes-Array
@@ -431,7 +417,6 @@ public:
     virtual void Redo( SwUndoIter& );
     virtual void Repeat( SwUndoIter& );
 
-    // #111827#
     /**
        Returns rewriter for this undo object.
 
@@ -449,7 +434,7 @@ public:
 
     void SetTblDelLastNd()      { bTblDelLastNd = TRUE; }
 
-    // fuer die PageDesc/PageBreak Attribute einer Tabelle
+    // for PageDesc/PageBreak Attribute of a table
     void SetPgBrkFlags( BOOL bPageBreak, BOOL bPageDesc )
         { bResetPgDesc = bPageDesc; bResetPgBrk = bPageBreak; }
 
@@ -463,14 +448,13 @@ public:
     DECL_FIXEDMEMPOOL_NEWDEL(SwUndoDelete)
 };
 
-
 class SwUndoOverwrite: public SwUndo, private SwUndoSaveCntnt
 {
     String aDelStr, aInsStr;
     SwRedlineSaveDatas* pRedlSaveData;
     ULONG nSttNode;
     xub_StrLen nSttCntnt;
-    BOOL bInsChar : 1;      // kein Overwrite mehr; sondern Insert
+    BOOL bInsChar : 1;      // no more OverWrite; use Insert
     BOOL bGroup : 1;        // TRUE: ist schon eine Gruppe; wird in
                             //       CanGrouping() ausgwertet !!
 public:
@@ -480,7 +464,6 @@ public:
     virtual void Redo( SwUndoIter& );
     virtual void Repeat( SwUndoIter& );
 
-    // #111827#
     /**
        Returns the rewriter of this undo object.
 
@@ -497,7 +480,6 @@ public:
     BOOL CanGrouping( SwDoc*, SwPosition&, sal_Unicode cIns );
 };
 
-
 class SwUndoSplitNode: public SwUndo
 {
     SwHistory* pHistory;
@@ -515,7 +497,6 @@ public:
     void SetTblFlag()       { bTblFlag = TRUE; }
 };
 
-
 class SwUndoMove : public SwUndo, private SwUndRng, private SwUndoSaveCntnt
 {
     // nDest.. - Bereich, in den verschoben wurde (nach dem Move!)
@@ -552,7 +533,6 @@ public:
 
 };
 
-
 class SwUndoAttr : public SwUndo, private SwUndRng
 {
     SfxItemSet m_AttrSet;                           // attributes for Redo
@@ -607,7 +587,6 @@ class SwUndoFmtAttr : public SwUndo
 
     bool IsFmtInDoc( SwDoc* );   //is the attribute format still in the Doc?
     void SaveFlyAnchor( bool bSaveDrawPt = false );
-    // --> OD 2004-10-26 #i35443# - Add return value, type <bool>.
     // Return value indicates, if anchor attribute is restored.
     // Notes: - If anchor attribute is restored, all other existing attributes
     //          are also restored.
@@ -616,26 +595,22 @@ class SwUndoFmtAttr : public SwUndo
     //          aren't restored.
     //          This situation occurs for undo of styles.
     bool RestoreFlyAnchor( SwUndoIter& rIter );
-    // <--
-    // --> OD 2008-02-27 #refactorlists# - removed <rAffectedItemSet>
+
     void Init();
-    // <--
 
 public:
     // register at the Format and save old attributes
-    // --> OD 2008-02-27 #refactorlists# - removed <rNewSet>
     SwUndoFmtAttr( const SfxItemSet& rOldSet,
                    SwFmt& rFmt,
                    bool bSaveDrawPt = true );
-    // <--
     SwUndoFmtAttr( const SfxPoolItem& rItem,
                    SwFmt& rFmt,
                    bool bSaveDrawPt = true );
     virtual ~SwUndoFmtAttr();
     virtual void Undo( SwUndoIter& );
-    // --> OD 2004-10-26 #i35443# - <Redo(..)> calls <Undo(..)> - nothing else
+
     virtual void Redo( SwUndoIter& );
-    // <--
+
     virtual void Repeat( SwUndoIter& );
     virtual SwRewriter GetRewriter() const;
 
@@ -643,7 +618,6 @@ public:
     SwFmt* GetFmt( SwDoc& rDoc );   // checks if it is still in the Doc!
 };
 
-// --> OD 2008-02-12 #newlistlevelattrs#
 class SwUndoFmtResetAttr : public SwUndo
 {
     public:
@@ -662,7 +636,6 @@ class SwUndoFmtResetAttr : public SwUndo
         // old attribute which has been reset - needed for undo.
         ::std::auto_ptr<SfxPoolItem> m_pOldItem;
 };
-// <--
 
 class SwUndoDontExpandFmt : public SwUndo
 {
@@ -692,33 +665,27 @@ public:
     SwUndoFmtAttr* ReleaseUndo()    { return m_pUndo.release(); }
 };
 
-
 class SwUndoFmtColl : public SwUndo, private SwUndRng
 {
     String aFmtName;
     SwHistory* pHistory;
     SwFmtColl* pFmtColl;
-    // --> OD 2008-04-15 #refactorlists# - for correct <ReDo(..)> and <Repeat(..)>
     // boolean, which indicates that the attributes are reseted at the nodes
     // before the format has been applied.
     const bool mbReset;
     // boolean, which indicates that the list attributes had been reseted at
     // the nodes before the format has been applied.
     const bool mbResetListAttrs;
-    // <--
 public:
-    // --> OD 2008-04-15 #refactorlists#
-//    SwUndoFmtColl( const SwPaM&, SwFmtColl* );
+
     SwUndoFmtColl( const SwPaM&, SwFmtColl*,
                    const bool bReset,
                    const bool bResetListAttrs );
-    // <--
     virtual ~SwUndoFmtColl();
     virtual void Undo( SwUndoIter& );
     virtual void Redo( SwUndoIter& );
     virtual void Repeat( SwUndoIter& );
 
-    // #111827#
     /**
        Returns the rewriter for this undo object.
 
@@ -738,7 +705,6 @@ public:
 
 };
 
-
 class SwUndoMoveLeftMargin : public SwUndo, private SwUndRng
 {
     const ::std::auto_ptr<SwHistory> m_pHistory;
@@ -932,7 +898,6 @@ public:
     void SaveSection( SwStartNode* pSttNd );
     void ReNewBoxes( const SwSelBoxes& rBoxes );
 
-
     void SetColWidthParam( ULONG nBoxIdx, USHORT nMode, USHORT nType,
                             SwTwips nAbsDif, SwTwips nRelDif )
     {
@@ -970,7 +935,6 @@ public:
 
 };
 
-
 class SwUndoTblNumFmt : public SwUndo
 {
     SfxItemSet *pBoxSet;
@@ -1073,7 +1037,6 @@ public:
     void SaveFormula( SwHistory& rHistory );
 };
 
-
 class SwUndoBookmark : public SwUndo
 {
     const ::std::auto_ptr<SwHistoryBookmark> m_pHistoryBookmark;
@@ -1087,7 +1050,6 @@ protected:
 public:
     virtual ~SwUndoBookmark();
 
-    // #111827#
     /**
        Returns the rewriter for this undo object.
 
@@ -1103,7 +1065,6 @@ public:
     virtual SwRewriter GetRewriter() const;
 };
 
-
 class SwUndoInsBookmark : public SwUndoBookmark
 {
 public:
@@ -1112,7 +1073,6 @@ public:
     virtual void Redo( SwUndoIter& );
 };
 
-
 /*--------------------------------------------------------------------
     Beschreibung: Undo auf Sorting
  --------------------------------------------------------------------*/
@@ -1170,8 +1130,6 @@ public:
 
 };
 
-
-
 //--------------------------------------------------------------------
 
 class SwUndoFlyBase : public SwUndo, private SwUndoSaveSection
@@ -1231,7 +1189,6 @@ public:
 
 };
 
-
 class SwUndoSetFlyFmt : public SwUndo, public SwClient
 {
     SwFrmFmt* pFrmFmt;                  // das gespeicherte FlyFormat
@@ -1277,7 +1234,6 @@ public:
     virtual void Undo( SwUndoIter& );
     virtual void Redo( SwUndoIter& );
 
-    // #111827#
     /**
        Returns the rewriter of this undo object.
 
@@ -1307,10 +1263,8 @@ public:
 
 };
 
-
 //--------------------------------------------------------------------
 
-
 class SwUndoTblHeadline : public SwUndo
 {
     ULONG nTblNd;
@@ -1323,8 +1277,7 @@ public:
     virtual void Repeat( SwUndoIter& );
 };
 
-
-//------------ Undo von Insert-/Delete-Sections ----------------------
+//------------ Undo of Insert-/Delete-Sections ----------------------
 
 class SwUndoInsSection : public SwUndo, private SwUndRng
 {
@@ -1358,7 +1311,6 @@ SW_DLLPRIVATE SwUndo * MakeUndoDelSection(SwSectionFmt const&);
 
 SW_DLLPRIVATE SwUndo * MakeUndoUpdateSection(SwSectionFmt const&, bool const);
 
-
 //------------ Undo von verschieben/stufen von Gliederung ----------------
 
 class SwUndoOutlineLeftRight : public SwUndo, private SwUndRng
@@ -1387,7 +1339,7 @@ public:
 };
 
 //--------------------------------------------------------------------
-// ---------- Undo fuer Numerierung ----------------------------------
+// ---------- Undo for Numbering ----------------------------------
 
 class SwUndoInsNum : public SwUndo, private SwUndRng
 {
@@ -1485,7 +1437,7 @@ public:
 };
 
 //--------------------------------------------------------------------
-// ---------- Undo fuer DrawObjecte ----------------------------------
+// ---------- Undo for DrawObjecte ----------------------------------
 
 class SwSdrUndo : public SwUndo
 {
@@ -1516,7 +1468,6 @@ public:
     void SetGroupFmt( SwDrawFrmFmt* );
 };
 
-// --> OD 2006-11-01 #130889#
 // Action "ungroup drawing object" is now splitted into three parts - see
 // method <SwDoc::UnGroupSelection(..)>:
 // - creation for <SwDrawFrmFmt> instances for the group members of the
@@ -1543,7 +1494,6 @@ public:
     void AddObj( USHORT nPos, SwDrawFrmFmt* );
 };
 
-// --> OD 2006-11-01 #130889#
 class SwUndoDrawUnGroupConnectToLayout : public SwUndo
 {
     private:
@@ -1558,8 +1508,6 @@ class SwUndoDrawUnGroupConnectToLayout : public SwUndo
         void AddFmtAndObj( SwDrawFrmFmt* pDrawFrmFmt,
                            SdrObject* pDrawObject );
 };
-// <--
-
 
 class SwUndoDrawDelete : public SwUndo
 {
@@ -1603,24 +1551,21 @@ class SwUndoInsertLabel : public SwUndo
 {
     union {
         struct {
-            // fuer NoTxtFrms
+            // for NoTxtFrms
             SwUndoInsLayFmt* pUndoFly;
             SwUndoFmtAttr* pUndoAttr;
         } OBJECT;
         struct {
-            // fuer Tabelle/TextRahmen
+            // for Tables/TextBoxes
             SwUndoDelete* pUndoInsNd;
             ULONG nNode;
         } NODE;
     };
 
     String sText;
-    // --> PB 2005-01-06 #i39983# - the separator will be drawed with a character style
     String sSeparator;
-    // <--
     String sNumberSeparator;
     String sCharacterStyle;
-    // OD 2004-04-15 #i26791# - re-store of drawing object position no longer needed
     USHORT nFldId;
     SwLabelType eType;
     BYTE nLayerId;              // fuer Zeichen-Objekte
@@ -1630,10 +1575,8 @@ class SwUndoInsertLabel : public SwUndo
 
 public:
     SwUndoInsertLabel( const SwLabelType eTyp, const String &rText,
-    // --> PB 2005-01-06 #i39983# - the separator will be drawed with a character style
                         const String& rSeparator,
-    // <--
-                        const String& rNumberSeparator, //#i61007# order of captions
+                        const String& rNumberSeparator,
                         const BOOL bBefore, const USHORT nId,
                         const String& rCharacterStyle,
                         const BOOL bCpyBrd );
@@ -1643,7 +1586,6 @@ public:
     virtual void Redo( SwUndoIter& );
     virtual void Repeat( SwUndoIter& );
 
-    // #111827#
     /**
        Returns the rewriter of this undo object.
 
@@ -1711,7 +1653,6 @@ public:
     virtual void Redo( SwUndoIter& );
 };
 
-
 //--------------------------------------------------------------------
 
 struct _UndoTransliterate_Data;
@@ -1824,7 +1765,6 @@ public:
     virtual void Redo( SwUndoIter& );
 };
 
-
 //--------------------------------------------------------------------
 
 // Object der als Iterator durch die Undo-Liste laeuft, bis die
@@ -1866,8 +1806,6 @@ public:
     void ClearSelections()  { pSelFmt = 0; pMarkList = 0; }
 };
 
-
-// -> #111827#
 const int nUndoStringLength = 20;
 
 /**
@@ -1894,9 +1832,7 @@ const int nUndoStringLength = 20;
    @return the shortened string
  */
 String ShortenString(const String & rStr, xub_StrLen nLength, const String & rFillStr);
-// <- #111827#
 
-// #16487#
 /**
    Denotes special characters in a string.
 
diff --git a/sw/inc/unoatxt.hxx b/sw/inc/unoatxt.hxx
index 4e23effa5072..929dc3529ea4 100644
--- a/sw/inc/unoatxt.hxx
+++ b/sw/inc/unoatxt.hxx
@@ -105,9 +105,6 @@ public:
 
 };
 
-/* -----------------26.05.98 15:55-------------------
- *
- * --------------------------------------------------*/
 class SwXAutoTextGroup : public cppu::WeakImplHelper6
 <
     ::com::sun::star::text::XAutoTextGroup,
@@ -127,7 +124,7 @@ protected:
     virtual ~SwXAutoTextGroup();    // ref-counted objects are not to be deleted from outside -> protected dtor
 
 public:
-        SwXAutoTextGroup(const rtl::OUString& rName, SwGlossaries*  pGloss/*SwTextBlocks* pGroup*/);
+        SwXAutoTextGroup(const rtl::OUString& rName, SwGlossaries* pGloss);
 
 
     static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
@@ -176,9 +173,6 @@ public:
     void    Invalidate();
 };
 
-/* -----------------17.06.98 12:03-------------------
- *
- * --------------------------------------------------*/
 class SwXAutoTextEntry
         :public SfxListener
         ,public cppu::WeakImplHelper5
diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx
index 28ea05d5a3cf..e49568b6256f 100644
--- a/sw/inc/unobaseclass.hxx
+++ b/sw/inc/unobaseclass.hxx
@@ -46,10 +46,6 @@ typedef ::cppu::WeakImplHelper2
 >
 SwSimpleEnumeration_Base;
 
-
-/* -----------------29.04.98 07:35-------------------
- *
- * --------------------------------------------------*/
 enum CursorType
 {
     CURSOR_INVALID,
@@ -67,9 +63,9 @@ enum CursorType
     CURSOR_META,         // meta/meta-field
 };
 
-/*-----------------04.03.98 11:54-------------------
+/*
     Start/EndAction or Start/EndAllAction
-  -------------------------------------------------- */
+*/
 class UnoActionContext
 {
     private:
@@ -82,9 +78,9 @@ class UnoActionContext
         void InvalidateDocument() { m_pDoc = 0; }
 };
 
-/* -----------------07.07.98 12:03-------------------
+/*
     interrupt Actions for a little while
-   -------------------------------------------------- */
+*/
 class UnoActionRemoveContext
 {
     private:
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx
index 8ac484dfe59d..006f78e7a3d3 100644
--- a/sw/inc/unocoll.hxx
+++ b/sw/inc/unocoll.hxx
@@ -63,9 +63,7 @@ class SwSectionFmt;
 class SwFmtRefMark;
 class SwXReferenceMark;
 class SwXBookmark;
-/*-----------------11.03.98 11:19-------------------
 
---------------------------------------------------*/
 class SwUnoCollection
 {
     SwDoc*      pDoc;
@@ -83,9 +81,6 @@ class SwUnoCollection
     SwDoc*          GetDoc() const {return pDoc;}
 };
 
-/******************************************************************************
- *
- ******************************************************************************/
 #define SW_SERVICE_TYPE_TEXTTABLE                       0
 #define SW_SERVICE_TYPE_TEXTFRAME                       1
 #define SW_SERVICE_TYPE_GRAPHIC                         2
@@ -276,9 +271,7 @@ public:
     static ::com::sun::star::uno::Sequence<rtl::OUString>   GetAllServiceNames();
 
 };
-/*-----------------11.12.97 09:38-------------------
 
---------------------------------------------------*/
 typedef
 cppu::WeakImplHelper3
 <
@@ -361,9 +354,6 @@ public:
 
 };
 
-/*-----------------20.02.98 10:51-------------------
-
---------------------------------------------------*/
 class SwXTextFrames : public SwXFrames
 {
 protected:
@@ -372,8 +362,6 @@ public:
     SwXTextFrames(SwDoc* pDoc);
 
 
-//  SMART_UNO_DECLARATION( SwXTextFrames, UsrObject );
-
     //XServiceInfo
     virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
     virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
@@ -381,9 +369,6 @@ public:
 
 };
 
-/*-----------------20.02.98 10:55-------------------
-
---------------------------------------------------*/
 class SwXTextGraphicObjects : public SwXFrames
 {
 protected:
@@ -391,9 +376,6 @@ protected:
 public:
         SwXTextGraphicObjects(SwDoc* pDoc);
 
-
-//  SMART_UNO_DECLARATION( SwXTextGraphicObjects, UsrObject );
-
     //XServiceInfo
     virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
     virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
@@ -401,9 +383,6 @@ public:
 
 };
 
-/*-----------------20.02.98 10:57-------------------
-
---------------------------------------------------*/
 class SwXTextEmbeddedObjects :  public SwXFrames
 {
 protected:
@@ -412,8 +391,6 @@ public:
     SwXTextEmbeddedObjects(SwDoc* pDoc);
 
 
-//  SMART_UNO_DECLARATION( SwXTextEmbeddedObjects, UsrObject );
-
     //XServiceInfo
     virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
     virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
@@ -421,9 +398,6 @@ public:
 
 };
 
-/*-----------------12.02.98 07:58-------------------
-
---------------------------------------------------*/
 class SwXTextSections : public SwCollectionBaseClass,
                         public SwUnoCollection
 {
@@ -453,9 +427,7 @@ public:
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection> GetObject( SwSectionFmt& rFmt );
 };
-/*-----------------12.02.98 07:51-------------------
 
---------------------------------------------------*/
 class SwXBookmarks : public SwCollectionBaseClass,
     public SwUnoCollection
 {
@@ -506,10 +478,6 @@ public:
     virtual sal_Bool SAL_CALL hasElements(  ) throw(::com::sun::star::uno::RuntimeException);
 };
 
-/*-----------------12.02.98 08:01-------------------
-
---------------------------------------------------*/
-
 typedef
 cppu::WeakImplHelper2
 <
@@ -544,9 +512,6 @@ public:
     static ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote> GetObject( SwDoc& rDoc, const SwFmtFtn& rFmt );
 };
 
-/* -----------------27.08.98 13:10-------------------
- *
- * --------------------------------------------------*/
 class SwXReferenceMarks : public SwCollectionBaseClass,
     public SwUnoCollection
 {
diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx
index c0fc440ca5dd..0b1f93e9b057 100644
--- a/sw/inc/unocrsr.hxx
+++ b/sw/inc/unocrsr.hxx
@@ -44,8 +44,6 @@ public:
     // @@@ semantic: no copy ctor.
     SwUnoCrsr( SwUnoCrsr& );
 private:
-    // forbidden and not implemented.
-    //SwUnoCrsr( const SwUnoCrsr& );
     SwUnoCrsr & operator= ( const SwUnoCrsr& );
 
 protected:
@@ -56,8 +54,6 @@ protected:
 
 public:
 
-//  virtual SwCursor* Create( SwPaM* pRing = 0 ) const;
-
     // gibt es eine Selection vom Content in die Tabelle
     // Return Wert gibt an, ob der Crsr auf der alten Position verbleibt
     virtual BOOL IsSelOvr( int eFlags =
@@ -101,8 +97,6 @@ public:
     SwUnoTableCrsr( const SwPosition& rPos );
     virtual ~SwUnoTableCrsr();
 
-//  virtual SwCursor* Create( SwPaM* pRing = 0 ) const;
-
     // gibt es eine Selection vom Content in die Tabelle
     // Return Wert gibt an, ob der Crsr auf der alten Position verbleibt
     virtual BOOL IsSelOvr( int eFlags =
diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx
index 982f11834ff6..befe97aac662 100644
--- a/sw/inc/unocrsrhelper.hxx
+++ b/sw/inc/unocrsrhelper.hxx
@@ -61,9 +61,6 @@ namespace com{ namespace sun{ namespace star{
     }
 }}}
 
-/* -----------------03.12.98 12:16-------------------
- *
- * --------------------------------------------------*/
 enum SwGetPropertyStatesCaller
 {
     SW_PROPERTY_STATE_CALLER_DEFAULT,
@@ -72,9 +69,6 @@ enum SwGetPropertyStatesCaller
     SW_PROPERTY_STATE_CALLER_SWX_TEXT_PORTION_TOLERANT
 };
 
-/* -----------------------------14.12.00 15:06--------------------------------
-
- ---------------------------------------------------------------------------*/
 namespace SwUnoCursorHelper
 {
     //  keep Any's mapped by (WhichId << 16 ) + (MemberId)
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 5dcaf6605b43..32c50297415f 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -32,20 +32,16 @@
 #include <calbck.hxx>
 #include <frmfmt.hxx>
 #include <com/sun/star/text/XTextContent.hpp>
-// --> OD 2009-01-13 #i59051#
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
-// <--
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <cppuhelper/implbase3.hxx> // helper for implementations
 #include <cppuhelper/implbase4.hxx> // helper for implementations
-// --> OD 2004-07-22 #i31698#
 #include <cppuhelper/implbase6.hxx> // helper for implementations
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/drawing/HomogenMatrix3.hpp>
-// <--
 #include <svl/itemprop.hxx>
 
 class SdrMarkList;
@@ -70,7 +66,6 @@ public:
 
     const SdrMarkList&  PreGroup(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > & xShapes);
     void                PreUnGroup(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup >   xShapeGroup);
-//  void                PostGroup(); ?? wird es noch gebraucht ??
 
     SdrView*            GetDrawView() {return mpView;}
     SdrPageView*        GetPageView();
@@ -131,9 +126,7 @@ public:
     // renamed and outlined to detect where it's called
     void    InvalidateSwDoc(); // {pDoc = 0;}
 };
-/* -----------------22.01.99 10:20-------------------
- *
- * --------------------------------------------------*/
+
 class SwShapeDescriptor_Impl;
 class SwXGroupShape;
 typedef
@@ -144,9 +137,7 @@ cppu::WeakAggImplHelper6
     ::com::sun::star::text::XTextContent,
     ::com::sun::star::lang::XServiceInfo,
     ::com::sun::star::lang::XUnoTunnel,
-    // --> OD 2004-07-22 #i31698#
     ::com::sun::star::drawing::XShape
-    // <--
 >
 SwXShapeBaseClass;
 class SwXShape : public SwXShapeBaseClass,
@@ -158,10 +149,9 @@ class SwXShape : public SwXShapeBaseClass,
     friend class SwXDrawPage;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > xShapeAgg;
-    // --> OD 2004-07-23 #i31698# - reference to <XShape>, determined in the
+    // reference to <XShape>, determined in the
     // constructor by <queryAggregation> at <xShapeAgg>.
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape;
-    // <--
 
     const SfxItemPropertySet*           m_pPropSet;
     const SfxItemPropertyMapEntry*      m_pPropertyMapEntries;
@@ -177,16 +167,12 @@ class SwXShape : public SwXShapeBaseClass,
 
     /** method to determine top group object
 
-        OD 2004-08-03 #i31698#
-
         @author OD
     */
     SdrObject* _GetTopGroupObj( SvxShape* _pSvxShape = 0L );
 
     /** method to determine position according to the positioning attributes
 
-        OD 2004-08-03 #i31698#
-
         @author OD
     */
     com::sun::star::awt::Point _GetAttrPosition();
@@ -194,8 +180,6 @@ class SwXShape : public SwXShapeBaseClass,
     /** method to convert the position (translation) of the drawing object to
         the layout direction horizontal left-to-right.
 
-        OD 2004-07-27 #i31698#
-
         @author OD
     */
     ::com::sun::star::awt::Point _ConvertPositionToHoriL2R(
@@ -205,8 +189,6 @@ class SwXShape : public SwXShapeBaseClass,
     /** method to convert the transformation of the drawing object to the layout
         direction, the drawing object is in
 
-        OD 2004-07-27 #i31698#
-
         @author OD
     */
     ::com::sun::star::drawing::HomogenMatrix3 _ConvertTransformationToLayoutDir(
@@ -214,8 +196,6 @@ class SwXShape : public SwXShapeBaseClass,
 
     /** method to adjust the positioning properties
 
-        OD 2004-08-02 #i31698#
-
         @author OD
 
         @param _aPosition
@@ -228,8 +208,6 @@ class SwXShape : public SwXShapeBaseClass,
     /** method to convert start or end position of the drawing object to the
         Writer specific position, which is the attribute position in layout direction
 
-        OD 2009-01-12 #i59051#
-
         @author OD
     */
     ::com::sun::star::awt::Point _ConvertStartOrEndPosToLayoutDir(
@@ -238,8 +216,6 @@ class SwXShape : public SwXShapeBaseClass,
     /** method to convert PolyPolygonBezier of the drawing object to the
         Writer specific position, which is the attribute position in layout direction
 
-        OD 2009-01-13 #i59051#
-
         @author OD
     */
     ::com::sun::star::drawing::PolyPolygonBezierCoords _ConvertPolyPolygonBezierToLayoutDir(
@@ -247,8 +223,6 @@ class SwXShape : public SwXShapeBaseClass,
 
     /** method to get property from aggregation object
 
-        OD 2004-10-28 #i36248#
-
         @author OD
     */
     ::com::sun::star::uno::Any _getPropAtAggrObj( const ::rtl::OUString& _rPropertyName )
@@ -301,15 +275,11 @@ public:
     virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
     virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
 
-    // --> OD 2004-07-22 #i31698# XShape
     virtual ::com::sun::star::awt::Point SAL_CALL getPosition(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::awt::Size SAL_CALL getSize(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException);
-    // <--
-    // --> OD 2004-07-22 #i31698# XShapeDescriptor - superclass of XShape
     virtual ::rtl::OUString SAL_CALL getShapeType(  ) throw (::com::sun::star::uno::RuntimeException);
-    // <--
 
     //SwClient
     virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
@@ -320,9 +290,7 @@ public:
     // helper
     static void AddExistingShapeToFmt( SdrObject& _rObj );
 };
-/* -----------------------------31.05.01 09:54--------------------------------
 
- ---------------------------------------------------------------------------*/
 class SwXGroupShape :
     public SwXShape,
     public ::com::sun::star::drawing::XShapes
diff --git a/sw/inc/unoevtlstnr.hxx b/sw/inc/unoevtlstnr.hxx
index c66568dbee53..fb9387e40dcb 100644
--- a/sw/inc/unoevtlstnr.hxx
+++ b/sw/inc/unoevtlstnr.hxx
@@ -37,9 +37,9 @@ namespace com{namespace sun{namespace star{
             class XEventListener;
         }
 }}}
-/* -----------------22.04.99 11:18-------------------
+/*
  *  Verwaltung der EventListener
- * --------------------------------------------------*/
+ * */
 typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > *  XEventListenerPtr;
 SV_DECL_PTRARR(SwEvtLstnrArray, XEventListenerPtr, 4, 4)
 
diff --git a/sw/inc/unofield.hxx b/sw/inc/unofield.hxx
index f5adfba99cbf..9004db4250ea 100644
--- a/sw/inc/unofield.hxx
+++ b/sw/inc/unofield.hxx
@@ -47,9 +47,6 @@ class SwField;
 class SwSetExpField;
 class SwTextAPIObject;
 
-/* -----------------04.12.98 12:49-------------------
- *
- * --------------------------------------------------*/
 class SwXFieldMaster : public cppu::WeakImplHelper4
 <
     ::com::sun::star::beans::XPropertySet,
@@ -123,9 +120,6 @@ public:
     sal_uInt16      GetResId() const {return nResTypeId;}
 };
 
-/* -----------------04.12.98 12:49-------------------
- *
- * --------------------------------------------------*/
 struct SwFieldProperties_Impl;
 class SwXTextField : public cppu::WeakImplHelper5
 <
@@ -213,10 +207,6 @@ public:
 /// @return a SwXTextField, either an already existing one or a new one
 SwXTextField * CreateSwXTextField(SwDoc & rDoc, SwFmtFld const& rFmt);
 
-
-/* -----------------21.12.98 10:26-------------------
- *
- * --------------------------------------------------*/
 typedef
 cppu::WeakImplHelper2
 <
@@ -251,9 +241,6 @@ public:
     static sal_Bool getInstanceName(const SwFieldType& rFldType, String& rName);
 };
 
-/* -----------------21.12.98 10:26-------------------
- *
- * --------------------------------------------------*/
 typedef
 cppu::WeakImplHelper3
 <
@@ -293,9 +280,6 @@ public:
     virtual void    Invalidate();
 };
 
-/* -----------------21.12.98 14:49-------------------
- *
- * --------------------------------------------------*/
 class SwXFieldEnumeration : public cppu::WeakImplHelper2
 <
     ::com::sun::star::container::XEnumeration,
diff --git a/sw/inc/unofootnote.hxx b/sw/inc/unofootnote.hxx
index 63032d13807c..51675722a765 100644
--- a/sw/inc/unofootnote.hxx
+++ b/sw/inc/unofootnote.hxx
@@ -45,10 +45,6 @@ class SwDoc;
 class SwModify;
 class SwFmtFtn;
 
-
-/*-----------------12.02.98 08:01-------------------
-
---------------------------------------------------*/
 typedef ::cppu::WeakImplHelper5
 <   ::com::sun::star::lang::XUnoTunnel
 ,   ::com::sun::star::lang::XServiceInfo
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index 1c81a60af0b9..f0cfa979c0ca 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -57,9 +57,6 @@ class SwFmt;
 class SwFlyFrmFmt;
 
 
-/*-----------------12.02.98 11:21-------------------
-
---------------------------------------------------*/
 class BaseFrameProperties_Impl;
 class SwXFrame : public cppu::WeakImplHelper6
 <
@@ -133,7 +130,7 @@ public:
     //XShapeDescriptor
     virtual rtl::OUString SAL_CALL getShapeType(void) throw( ::com::sun::star::uno::RuntimeException );
 
-    //Basisimplementierung
+    //Base implementation
     //XComponent
     virtual void SAL_CALL dispose(  ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
@@ -162,11 +159,9 @@ public:
     void            ResetDescriptor();
     //copy text from a given source PaM
     void            SetSelection(SwPaM& rCopySource);
-    static SdrObject *GetOrCreateSdrObject( SwFlyFrmFmt *pFmt );
+    static SW_DLLPUBLIC SdrObject *GetOrCreateSdrObject( SwFlyFrmFmt *pFmt );
 };
-/*-----------------20.02.98 11:28-------------------
 
---------------------------------------------------*/
 typedef cppu::WeakImplHelper3
 <
     ::com::sun::star::text::XTextFrame,
@@ -245,9 +240,7 @@ public:
     void * SAL_CALL operator new( size_t ) throw();
     void SAL_CALL operator delete( void * ) throw();
 };
-/*-----------------20.02.98 11:28-------------------
 
---------------------------------------------------*/
 typedef cppu::WeakImplHelper2
 <
     ::com::sun::star::text::XTextContent,
@@ -291,9 +284,7 @@ public:
     void * SAL_CALL operator new( size_t ) throw();
     void SAL_CALL operator delete( void * ) throw();
 };
-/*-----------------20.02.98 11:28-------------------
 
---------------------------------------------------*/
 class SwOLENode;
 typedef cppu::WeakImplHelper3
 <
@@ -357,8 +348,7 @@ class SwXOLEListener : public cppu::WeakImplHelper1
     public SwClient
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xOLEModel;
-//    SfxObjectShell* GetObjShell( const SwFmt& rFmt,
-//                                    SwOLENode** ppNd = 0 ) const;
+
     SwFmt*       GetFmt() const    {  return (SwFmt*)GetRegisteredIn(); }
 public:
     SwXOLEListener(SwFmt& rOLEFmt, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xOLE);
diff --git a/sw/inc/unoidx.hxx b/sw/inc/unoidx.hxx
index 8d5a5b7c52bb..a975cdac55a8 100644
--- a/sw/inc/unoidx.hxx
+++ b/sw/inc/unoidx.hxx
@@ -47,10 +47,6 @@ class SwTOXBaseSection;
 class SwTOXMark;
 class SwTOXType;
 
-/* -----------------07.12.98 10:08-------------------
- *
- * --------------------------------------------------*/
-
 typedef ::cppu::ImplInheritanceHelper5
 <   ::sfx2::MetadatableMixin
 ,   ::com::sun::star::lang::XUnoTunnel
@@ -191,9 +187,6 @@ public:
 
 };
 
-/* -----------------07.12.98 10:08-------------------
- *
- * --------------------------------------------------*/
 typedef ::cppu::WeakImplHelper4
 <   ::com::sun::star::lang::XUnoTunnel
 ,   ::com::sun::star::lang::XServiceInfo
@@ -319,9 +312,6 @@ public:
 
 };
 
-/* -----------------05.05.99 12:27-------------------
- *
- * --------------------------------------------------*/
 class SwXDocumentIndexes
     : public SwCollectionBaseClass
     , public SwUnoCollection
diff --git a/sw/inc/unomailmerge.hxx b/sw/inc/unomailmerge.hxx
index 6539fcefec4c..cdfb12748a1a 100644
--- a/sw/inc/unomailmerge.hxx
+++ b/sw/inc/unomailmerge.hxx
@@ -106,7 +106,6 @@ class SwXMailMerge :
     cppu::OInterfaceContainerHelper     aMergeListeners;
     OPropertyListenerContainerHelper    aPropListeners;
 
-    //SfxItemPropertySet          aPropSet;
     const SfxItemPropertySet*   pPropSet;
 
     SfxObjectShellRef xDocSh;   // the document
diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx
index e87954c16180..7e29591c91fb 100644
--- a/sw/inc/unomap.hxx
+++ b/sw/inc/unomap.hxx
@@ -189,7 +189,6 @@
 #define WID_LEVEL_FORMAT                        1021
 #define WID_LEVEL_PARAGRAPH_STYLES              1022
 #define WID_RECALC_TAB_STOPS                    1023
-//#define WID_???                               1024
 #define WID_MAIN_ENTRY_CHARACTER_STYLE_NAME     1025
 #define WID_CREATE_FROM_TABLES                  1026
 #define WID_CREATE_FROM_TEXT_FRAMES             1027
@@ -250,9 +249,7 @@
 #define WID_DOC_HAS_VALID_SIGNATURES            1017
 #define WID_DOC_BUILDID                         1024
 #define WID_DOC_ISTEMPLATEID                        1025
-// --> OD 2006-03-21 #b6375613#
 #define WID_APPLY_WORKAROUND_FOR_B6375613       1070
-// <--
 
 //MailMerge
 #define WID_SELECTION                           1071
@@ -318,9 +315,6 @@
 #define WID_TXTCOL_IS_AUTOMATIC         5
 #define WID_TXTCOL_AUTO_DISTANCE        6
 
-/* -----------------04.07.98 11:41-------------------
- *
- * --------------------------------------------------*/
 class SwItemPropertySet : public SfxItemPropertySet
 {
 protected:
@@ -329,9 +323,6 @@ public:
     SwItemPropertySet( const SfxItemPropertyMapEntry *pMap ) :
         SfxItemPropertySet( pMap ){}
 };
-/* -----------------04.07.98 11:41-------------------
- *
- * --------------------------------------------------*/
 class SwUnoPropertyMapProvider
 {
     SfxItemPropertyMapEntry*        aMapEntriesArr[PROPERTY_MAP_END];
diff --git a/sw/inc/unomid.h b/sw/inc/unomid.h
index 7533de2526ef..c7b15f5c59f2 100644
--- a/sw/inc/unomid.h
+++ b/sw/inc/unomid.h
@@ -152,7 +152,7 @@
 #define MID_ENV_SHIFT_RIGHT     12
 #define MID_ENV_SHIFT_DOWN      13
 
-// OD 2004-05-04 #i28701# - SwFmtWrapInfluenceOnObjPos
+// SwFmtWrapInfluenceOnObjPos
 #define MID_WRAP_INFLUENCE      0
 
 #endif
diff --git a/sw/inc/unomod.hxx b/sw/inc/unomod.hxx
index deae3934d03d..983e16908086 100644
--- a/sw/inc/unomod.hxx
+++ b/sw/inc/unomod.hxx
@@ -49,10 +49,6 @@ class SwDoc;
 /******************************************************************************
  *
  ******************************************************************************/
-/*-----------------15.03.98 13:21-------------------
-
---------------------------------------------------*/
-
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL SwXModule_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & );
 
 class SwXModule : public cppu::WeakImplHelper4
@@ -133,9 +129,7 @@ public:
     virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void)
         throw( ::com::sun::star::uno::RuntimeException );
 };
-/*-----------------15.03.98 13:21-------------------
 
---------------------------------------------------*/
 class SwXViewSettings : public comphelper::ChainableHelperNoState
 {
 
@@ -179,35 +173,7 @@ public:
     sal_Bool    IsValid() const {return bObjectValid;}
     void    Invalidate() {bObjectValid = sal_False;}
 };
-/* -----------------24.09.98 10:47-------------------
- *
- * --------------------------------------------------*/
-/*class SwXTerminateListener : public ::com::sun::star::frame::XTerminateListener,
-                                public UsrObject
-{
-public:
-    SwXTerminateListener();
-    virtual ~SwXTerminateListener();
-
-    SMART_UNO_DECLARATION( SwXTerminateListener, UsrObject );
-
-    virtual UString                 getClassName();
-// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen!
-//  virtual ::com::sun::star::uno::XInterface *         queryInterface( ::com::sun::star::uno::Uik aUik);
-
-// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen!
-//  virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > >  getIdlClasses(void);
-
-
-    //XTerminateListener
-    virtual void queryTermination(const ::com::sun::star::lang::EventObject& aEvent);
-    virtual void notifyTermination(const ::com::sun::star::lang::EventObject& aEvent);
-
-    //XEventListener
-    virtual void disposing(const ::com::sun::star::lang::EventObject& Source);
-};
 
-*/
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/unoparaframeenum.hxx b/sw/inc/unoparaframeenum.hxx
index a49efeb1fc56..686f00f6e5be 100644
--- a/sw/inc/unoparaframeenum.hxx
+++ b/sw/inc/unoparaframeenum.hxx
@@ -66,16 +66,11 @@ typedef ::std::deque< ::boost::shared_ptr<SwDepend> >
     FrameDependList_t;
 
 
-// OD 2004-05-07 #i28701# - adjust 4th parameter
+// #i28701# - adjust 4th parameter
 void CollectFrameAtNode( SwClient& rClnt, const SwNodeIndex& rIdx,
                          FrameDependSortList_t & rFrames,
                          const bool _bAtCharAnchoredObjs );
 
-
-/* -----------------23.03.99 12:57-------------------
- *
- * --------------------------------------------------*/
-
 enum ParaFrameMode
 {
     PARAFRAME_PORTION_PARAGRAPH,
diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx
index 629de6e54fb7..95e47ae29755 100644
--- a/sw/inc/unoparagraph.hxx
+++ b/sw/inc/unoparagraph.hxx
@@ -58,9 +58,6 @@ class SwTable;
 class SwXText;
 
 
-/*-----------------07.04.98 08:15-------------------
-
---------------------------------------------------*/
 typedef ::cppu::ImplInheritanceHelper10
 <   ::sfx2::MetadatableMixin
 ,   ::com::sun::star::lang::XUnoTunnel
@@ -317,9 +314,6 @@ public:
 };
 
 
-/*-----------------07.04.98 08:10-------------------
-
---------------------------------------------------*/
 class SwXParagraphEnumeration
     : public SwSimpleEnumeration_Base
 {
diff --git a/sw/inc/unoport.hxx b/sw/inc/unoport.hxx
index 7498b353f8b6..4b4f95abaee8 100644
--- a/sw/inc/unoport.hxx
+++ b/sw/inc/unoport.hxx
@@ -61,17 +61,12 @@ typedef ::std::deque<
     ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > >
     TextRangeList_t;
 
-
-/* -----------------29.05.98 14:42-------------------
- *
- * --------------------------------------------------*/
 enum SwTextPortionType
 {
     PORTION_TEXT,
     PORTION_FIELD,
     PORTION_FRAME,
     PORTION_FOOTNOTE,
-// obsolete!    PORTION_CONTROL_CHAR,
     PORTION_REFMARK_START,
     PORTION_REFMARK_END,
     PORTION_TOXMARK_START,
@@ -136,7 +131,6 @@ private:
 
 protected:
 
-    //SfxItemPropertySet& GetPropSet() { return aPropSet; }
 
     void SAL_CALL SetPropertyValues_Impl(
         const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames,
@@ -146,9 +140,6 @@ protected:
         const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
-//    ::com::sun::star::uno::Any  GetPropertyValue( const SfxItemPropertyMap *pEntry,
-//                                    SwUnoCrsr *pUnoCrsr,
-//                                    SfxItemSet *pSet );
     void        GetPropertyValues( const ::rtl::OUString *pPropertyNames,
                                     ::com::sun::star::uno::Any *pValues,
                                     sal_Int32 nLength );
@@ -186,7 +177,6 @@ public:
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
 
     //XMultiPropertySet
-//    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
@@ -266,9 +256,6 @@ public:
     {return static_cast<SwUnoCrsr*>(const_cast<SwModify*>(GetRegisteredIn()));}
 };
 
-/* -----------------29.05.98 14:42-------------------
- *
- * --------------------------------------------------*/
 class SwXTextPortionEnumeration
     : public ::cppu::WeakImplHelper3
         < ::com::sun::star::container::XEnumeration
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index d9cf68de8d29..54bde1ecd1d6 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -28,7 +28,6 @@
 #ifndef _UNOPRNMS_HXX
 #define _UNOPRNMS_HXX
 
-
 #include <sal/types.h>
 #include <tools/solar.h>
 #include "swdllapi.h"
@@ -705,27 +704,25 @@ enum SwPropNameIds
 /* 0662 */  UNO_NAME_SELITEM,
 /* 0663 */  UNO_NAME_IS_SPLIT_ALLOWED,
 /* 0664 */  UNO_NAME_CHAR_HIDDEN,
-// OD 18.09.2003 #i18732#
+
 /* 0665 */  UNO_NAME_IS_FOLLOWING_TEXT_FLOW,
 /* 0666 */  UNO_NAME_WIDTH_TYPE,
 /* 0667 */  UNO_NAME_SCRIPT_URL,
 /* 0668 */  UNO_NAME_RUNTIME_UID,
 /* 0669 */  UNO_NAME_COLLAPSING_BORDERS,
-// OD 2004-05-05 #i28701#
+
 /* 0670 */  UNO_NAME_WRAP_INFLUENCE_ON_POSITION,
 /* 0671 */  UNO_NAME_DATA_BASE_URL,
 /* 0672 */  UNO_NAME_DATA_BASE_RESOURCE,
-// --> OD 2004-08-06 #i28749#
+
 /* 0673 */  UNO_NAME_TRANSFORMATION_IN_HORI_L2R,
 /* 0674 */  UNO_NAME_POSITION_LAYOUT_DIR,
-// <--
+
 /* 0675 */  UNO_NAME_NUMBERING_IS_OUTLINE,
-///* 0676 */  UNO_NAME_DEFAULT_OUTLINE_LEVEL,   //#outline level, removed by zhaojianwei
-// --> OD 2004-10-28 #i36248#
+
 /* 0677 */  UNO_NAME_STARTPOSITION_IN_HORI_L2R,
 /* 0678 */  UNO_NAME_ENDPOSITION_IN_HORI_L2R,
-// <--
-// --> OS 2004-12-13 #30916#
+
 /* 0679 */  UNO_NAME_SUBJECT,
 /* 0680 */  UNO_NAME_ADDRESS_FROM_COLUMN,
 /* 0681 */  UNO_NAME_SEND_AS_HTML,
@@ -740,79 +737,77 @@ enum SwPropNameIds
 /* 0690 */  UNO_NAME_BLIND_COPIES_TO,
 /* 0691 */  UNO_NAME_IN_SERVER_PASSWORD,
 /* 0692 */  UNO_NAME_OUT_SERVER_PASSWORD,
-// <--
+
 /* 0693 */  UNO_NAME_SAVE_FILTER_OPTIONS,
 /* 0694 */  UNO_NAME_SAVE_FILTER_DATA,
 /* 0695 */  UNO_NAME_LOCK_UPDATES,
-// --> TL 2005-02-14 #i37766#
+
 /* 0696 */  UNO_NAME_PAGE_COUNT,
 /* 0697 */  UNO_NAME_LINE_COUNT,
 /* 0698 */  UNO_NAME_IS_CONSTANT_SPELLCHECK,
 /* 0699 */  UNO_NAME_IS_HIDE_SPELL_MARKS,       // deprecated #i91949
-// <--
+
 /* 0700 */  UNO_NAME_IS_FIELD_USED,
 /* 0701 */  UNO_NAME_IS_FIELD_DISPLAYED,
 /* 0702 */  UNO_NAME_BUILDID,
 /* 0703 */  UNO_NAME_PARA_STYLE_CONDITIONS,
-// --> FME 2005-12-13 #b6354161# Print empty pages
+
 /* 0704 */  UNO_NAME_PRINT_EMPTY_PAGES,
-// <--
-// --> BM 2006 New Chart (chart2)
+
 /* 0705 */  UNO_NAME_ROLE,
-// <--
+
 /* 0706 */  UNO_NAME_FIELD_CODE,
 /* 0707 */  UNO_NAME_HAS_VALID_SIGNATURES,
-// --> AMA #i65476# automatic styles
+
 /* 0708 */   UNO_NAME_CHAR_AUTO_STYLE_NAME,
 /* 0709 */   UNO_NAME_PARA_AUTO_STYLE_NAME,
-// --> OD 2006-03-21 #b6375613#
+
 /* 0710 */  UNO_NAME_APPLY_WORKAROUND_FOR_B6375613,
 /* 0711 */  UNO_NAME_LAYOUT_SIZE,
-// --> HB #144146#
+
 /* 0712 */  UNO_NAME_HELP,
 /* 0713 */  UNO_NAME_TOOLTIP,
-// --> #i73329# / 2007-01-11 / frank.schoenheit@sun.com
+
 /* 0714 */  UNO_NAME_DIALOG_LIBRARIES,
 /* 0715 */  UNO_NAME_HEADER_ROW_COUNT,
 /* 0716 */  UNO_NAME_INPUT,
 /* 0717 */  UNO_NAME_ROW_SPAN,
-// --> OD 2008-01-15 #newlistlevelattrs#
+
 /* 0718 */  UNO_NAME_POSITION_AND_SPACE_MODE,
 /* 0719 */  UNO_NAME_LABEL_FOLLOWED_BY,
 /* 0720 */  UNO_NAME_LISTTAB_STOP_POSITION,
 /* 0721 */  UNO_NAME_FIRST_LINE_INDENT,
 /* 0722 */  UNO_NAME_INDENT_AT,
-// --> #i52420# / 2008-02-07 / beppec56@openoffice.org
+
 /* 0723 */  UNO_NAME_CHAPTER_LEVEL,
-// --> 2007-03-27 text grid enhancement for better CJK support
+
 /* 0724 */  UNO_NAME_GRID_BASE_WIDTH,
 /* 0725 */  UNO_NAME_GRID_SNAP_TO_CHARS,
 /* 0726 */  UNO_NAME_GRID_STANDARD_PAGE_MODE,
 /* 0727 */  UNO_NAME_TABLE_BORDER_DISTANCES,
-// --> OD 2008-04-22 #refactorlists#
+
 /* 0728 */  UNO_NAME_LIST_ID,
 /* 0729 */  UNO_NAME_DEFAULT_LIST_ID,
-// <--
+
 /* 0730 */  UNO_NAME_STREAM_NAME,
-// --> OD 2008-11-26 #158694#
+
 /* 0731 */  UNO_NAME_PARA_CONTINUEING_PREVIOUS_SUB_TREE,
 /* 0732 */  UNO_NAME_PARA_LIST_LABEL_STRING,
-// <--
+
 /* 0733 */  UNO_NAME_CHAR_OVERLINE,
 /* 0734 */  UNO_NAME_CHAR_OVERLINE_COLOR,
 /* 0735 */  UNO_NAME_CHAR_OVERLINE_HAS_COLOR,
-/* 0736 */  UNO_NAME_OUTLINE_LEVEL,  //#outline level,add<-zhaojianwei outlinelevel
-// --> OD 2009-07-13 #i73249#
+/* 0736 */  UNO_NAME_OUTLINE_LEVEL,
+
 /* 0737 */  UNO_NAME_DESCRIPTION,
-// <--
-/* 0738 */  UNO_NAME_META,       // #i91565#
+
+/* 0738 */  UNO_NAME_META,
 /* 0739 */  UNO_NAME_IS_TEMPLATE,
 /* 0740 */  UNO_NAME_VBA_DOCOBJ,
-/* 0741 */  UNO_NAME_NESTED_TEXT_CONTENT, // #i109601#
+/* 0741 */  UNO_NAME_NESTED_TEXT_CONTENT,
 /* 0742 */  SW_PROPNAME_END
 };
 
-
 struct SwPropNameLen
 {
     const char* pName;
@@ -820,8 +815,6 @@ struct SwPropNameLen
     operator const char*() const { return pName; }
 };
 
-
-
 typedef const SwPropNameLen SwPropNameTab[ SW_PROPNAME_END - SW_PROPNAME_BEGIN ];
 extern const SwPropNameTab aPropNameTab;
 
@@ -840,7 +833,6 @@ SW_DLLPUBLIC const SwPropNameLen& SwGetPropName( USHORT nId );
 #define SW_PROP_NAME_STR(nId) \
     GetPropName( nId ).pName
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx
index c3b6ae51f648..b059647d5f8d 100644
--- a/sw/inc/unoredline.hxx
+++ b/sw/inc/unoredline.hxx
@@ -34,10 +34,6 @@
 
 class SwRedline;
 
-/* -----------------------------19.12.00 11:35--------------------------------
-
- ---------------------------------------------------------------------------*/
-
 /**
  * SwXRedlineText provides an XText which may be used to write
  * directly into a redline node. It got implemented to enable XML
@@ -72,9 +68,7 @@ public:
     virtual ::com::sun::star::uno::Type SAL_CALL getElementType(  ) throw(::com::sun::star::uno::RuntimeException);
     virtual sal_Bool SAL_CALL hasElements(  ) throw(::com::sun::star::uno::RuntimeException);
 };
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 class SwXRedlinePortion : public SwXTextPortion
 {
     const SwRedline*    pRedline;
@@ -100,9 +94,7 @@ public:
     static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > CreateRedlineProperties( const SwRedline& rRedline, sal_Bool bIsStart ) throw();
 
 };
-/* -----------------------------11.01.01 16:52--------------------------------
 
- ---------------------------------------------------------------------------*/
 typedef
 cppu::WeakImplHelper1
 <
diff --git a/sw/inc/unoredlines.hxx b/sw/inc/unoredlines.hxx
index 37763f1a028f..9da490b8c6ef 100644
--- a/sw/inc/unoredlines.hxx
+++ b/sw/inc/unoredlines.hxx
@@ -73,9 +73,7 @@ public:
 
     static ::com::sun::star::beans::XPropertySet*           GetObject( SwRedline& rRedline, SwDoc& rDoc );
 };
-/* -----------------------------12.01.01 14:58--------------------------------
 
- ---------------------------------------------------------------------------*/
 class SwXRedlineEnumeration
     : public SwSimpleEnumeration_Base
     , public SwClient
diff --git a/sw/inc/unorefmark.hxx b/sw/inc/unorefmark.hxx
index 900f561c2424..e0c88758cf4b 100644
--- a/sw/inc/unorefmark.hxx
+++ b/sw/inc/unorefmark.hxx
@@ -44,10 +44,6 @@ class SwDoc;
 class SwModify;
 class SwFmtRefMark;
 
-
-/* -----------------27.08.98 15:11-------------------
- *
- * --------------------------------------------------*/
 typedef ::cppu::WeakImplHelper5
 <   ::com::sun::star::lang::XUnoTunnel
 ,   ::com::sun::star::lang::XServiceInfo
diff --git a/sw/inc/unosection.hxx b/sw/inc/unosection.hxx
index 4cf88ce54773..d1447b0750d9 100644
--- a/sw/inc/unosection.hxx
+++ b/sw/inc/unosection.hxx
@@ -48,10 +48,6 @@
 class SwSectionFmt;
 
 
-/*-----------------09.03.98 13:57-------------------
-
---------------------------------------------------*/
-
 
 struct SwTextSectionProperties_Impl;
 
diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index e04b2e17d80e..192445dde742 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -51,9 +51,6 @@ class SwNumRule;
 /******************************************************************************
  *
  ******************************************************************************/
-/* -----------------04.05.98 12:28-------------------
- *
- * --------------------------------------------------*/
 class SwXFootnoteProperties : public cppu::WeakAggImplHelper2
 <
     ::com::sun::star::beans::XPropertySet,
@@ -85,9 +82,6 @@ public:
     void            Invalidate() {pDoc = 0;}
 };
 
-/* -----------------04.05.98 12:28-------------------
- *
- * --------------------------------------------------*/
 class SwXEndnoteProperties : public cppu::WeakAggImplHelper2
 <
     ::com::sun::star::beans::XPropertySet,
@@ -119,9 +113,6 @@ public:
     void            Invalidate() {pDoc = 0;}
 };
 
-/* -----------------04.05.98 12:28-------------------
- *
- * --------------------------------------------------*/
 class SwXLineNumberingProperties : public cppu::WeakAggImplHelper2
 <
     ::com::sun::star::beans::XPropertySet,
@@ -153,9 +144,6 @@ public:
     void            Invalidate() {pDoc = 0;}
 };
 
-/* -----------------25.05.98 08:21-------------------
- *
- * --------------------------------------------------*/
 class SwXNumberingRules : public cppu::WeakAggImplHelper5
 <
     ::com::sun::star::container::XIndexReplace,
@@ -235,9 +223,7 @@ public:
     void    Invalidate()    {pDocShell = 0;}
     const String&           GetCreatedNumRuleName() const{return sCreatedNumRuleName; }
 };
-/*-----------------12.02.98 08:27-------------------
 
---------------------------------------------------*/
 class SwXChapterNumbering : public SwXNumberingRules
 {
 protected:
@@ -255,9 +241,6 @@ public:
 
 };
 
-/* -----------------27.05.98 15:44-------------------
- *
- * --------------------------------------------------*/
 class SwXTextColumns : public cppu::WeakAggImplHelper4
 <
 
diff --git a/sw/inc/unosrch.hxx b/sw/inc/unosrch.hxx
index d298ae54b56f..dd060fb308bf 100644
--- a/sw/inc/unosrch.hxx
+++ b/sw/inc/unosrch.hxx
@@ -47,9 +47,6 @@ namespace com{namespace sun{namespace star{namespace util{
 }}}}
 
 
-/*-----------------19.12.97 12:58-------------------
-
---------------------------------------------------*/
 class SwXTextSearch : public cppu::WeakImplHelper3
 <
     ::com::sun::star::util::XPropertyReplace,
@@ -72,7 +69,6 @@ class SwXTextSearch : public cppu::WeakImplHelper3
     sal_Bool                    bBack : 1;
     sal_Bool                    bExpr : 1;
     sal_Bool                    bCase : 1;
-//  sal_Bool                    bInSel: 1;  // wie geht Suchen in Selektionen?
     sal_Bool                    bStyles:1;
     sal_Bool                    bSimilarity : 1;
     sal_Bool                    bLevRelax       :1;
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index 971f9881d2d4..0bbf6447bc58 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.hxx
@@ -45,7 +45,6 @@
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #include <calbck.hxx>
 
-
 #include <com/sun/star/style/XAutoStyleFamily.hpp>
 #include <com/sun/star/style/XAutoStyles.hpp>
 #include <com/sun/star/style/XAutoStyle.hpp>
@@ -64,9 +63,7 @@ typedef boost::shared_ptr<SfxItemSet> SfxItemSet_Pointer_t;
 /******************************************************************************
  *
  ******************************************************************************/
-/*-----------------12.02.98 08:27-------------------
 
---------------------------------------------------*/
 class SwXStyleFamilies :  public cppu::WeakImplHelper4
 <
     ::com::sun::star::container::XIndexAccess,
@@ -88,7 +85,6 @@ protected:
 public:
     SwXStyleFamilies(SwDocShell& rDocShell);
 
-
     //XNameAccess
     virtual ::com::sun::star::uno::Any SAL_CALL getByName(const rtl::OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
     virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException );
@@ -106,16 +102,12 @@ public:
     virtual void SAL_CALL loadStylesFromURL(const rtl::OUString& rURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aOptions) throw( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException );
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getStyleLoaderOptions(void) throw( ::com::sun::star::uno::RuntimeException );
 
-
     //XServiceInfo
     virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
     virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
     virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
 };
 
-/* -----------------26.05.98 10:56-------------------
- *
- * --------------------------------------------------*/
 class SwXStyleFamily : public cppu::WeakImplHelper4
 <
     ::com::sun::star::container::XNameContainer,
@@ -125,9 +117,8 @@ class SwXStyleFamily : public cppu::WeakImplHelper4
 >,
     public SfxListener
 {
-    SfxStyleFamily              eFamily;        // Familie
+    SfxStyleFamily              eFamily;
     SfxStyleSheetBasePool*      pBasePool;
-//  const SfxItemPropertyMap*   _pPropMap;
     SwDocShell*                 pDocShell;
 
     SwXStyle*               _FindStyle(const String& rStyleName) const;
@@ -170,9 +161,7 @@ public:
     virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
     virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
 };
-/* -----------------20.05.98 09:51-------------------
- *
- * --------------------------------------------------*/
+
 class SwXStyle : public cppu::WeakImplHelper7
 <
     ::com::sun::star::style::XStyle,
@@ -190,7 +179,7 @@ class SwXStyle : public cppu::WeakImplHelper7
     SwDoc*                  m_pDoc;
     String                  sStyleName;
     SfxStyleSheetBasePool*  pBasePool;
-    SfxStyleFamily          eFamily;    // fuer Notify
+    SfxStyleFamily          eFamily;    // for Notify
 
     sal_Bool                    bIsDescriptor  : 1;
     sal_Bool                    bIsConditional : 1;
@@ -216,8 +205,8 @@ public:
     SwXStyle(SwDoc* pDoc, SfxStyleFamily eFam = SFX_STYLE_FAMILY_PARA, BOOL bConditional = FALSE);
     SwXStyle(SfxStyleSheetBasePool& rPool, SfxStyleFamily eFam,
                                 SwDoc*  pDoc,
-                                const String& rStyleName);//,
-                                    //const SfxItemPropertyMap* _pMap);
+                                const String& rStyleName);
+
     ~SwXStyle();
 
     TYPEINFO();
@@ -247,7 +236,6 @@ public:
     virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     //XMultiPropertySet
-//    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
@@ -261,7 +249,6 @@ public:
     virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     //XMultiPropertyStates
-    //virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setAllPropertiesToDefault(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
@@ -289,9 +276,7 @@ public:
     SwDoc*                GetDoc() const { return m_pDoc; }
     virtual void    Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
 };
-/* -----------------------------15.12.00 14:25--------------------------------
 
- ---------------------------------------------------------------------------*/
 class SwXFrameStyle : public SwXStyle,
                         public com::sun::star::document::XEventsSupplier
 {
@@ -313,9 +298,7 @@ public:
 
     friend class SwFrameStyleEventDescriptor;
 };
-/* -----------------24.08.98 16:04-------------------
- *
- * --------------------------------------------------*/
+
 class SwXPageStyle : public SwXStyle
 {
     SwDocShell*     pDocShell;
@@ -326,8 +309,7 @@ protected:
 
 public:
     SwXPageStyle(SfxStyleSheetBasePool& rPool, SwDocShell* pDocSh, SfxStyleFamily eFam,
-                                const String& rStyleName);//,
-                                    //const SfxItemPropertyMap* _pMap);
+                                const String& rStyleName);
     SwXPageStyle(SwDocShell* pDocSh);
     ~SwXPageStyle();
 
@@ -338,9 +320,8 @@ public:
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException);
 
 };
-/*-- 19.05.2006 11:20:22---------------------------------------------------
-    access to all automatic style families
-  -----------------------------------------------------------------------*/
+
+// access to all automatic style families
 class SwXAutoStyles :
     public cppu::WeakImplHelper1< ::com::sun::star::style::XAutoStyles >,
     public SwUnoCollection
@@ -369,9 +350,8 @@ public:
     virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw( ::com::sun::star::uno::RuntimeException );
 
 };
-/*-- 19.05.2006 11:20:12---------------------------------------------------
-    access to a family of automatic styles (character or paragraph or ...)
-  -----------------------------------------------------------------------*/
+
+// access to a family of automatic styles (character or paragraph or ...)
 class SwXAutoStyleFamily : public cppu::WeakImplHelper1< com::sun::star::style::XAutoStyleFamily >,
     public SwClient
 {
@@ -408,10 +388,8 @@ public:
     virtual ::com::sun::star::uno::Any SAL_CALL nextElement(  ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
 };
-/*-- 19.05.2006 11:20:02---------------------------------------------------
-    an automatic style
-  -----------------------------------------------------------------------*/
 
+// an automatic style
 class SwXAutoStyle : public cppu::WeakImplHelper3
 <
     ::com::sun::star::beans::XPropertySet,
@@ -441,7 +419,6 @@ public:
     virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     //XMultiPropertySet
-    // virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
@@ -455,7 +432,6 @@ public:
     virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     //XMultiPropertyStates
-    // virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setAllPropertiesToDefault(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
@@ -465,5 +441,4 @@ public:
 };
 #endif
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index 6cefbe95188e..479b0b45ff81 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -65,9 +65,6 @@ class SwChartDataProvider;
 class SwFrmFmt;
 
 
-/* -----------------------------22.09.00 11:10--------------------------------
-
- ---------------------------------------------------------------------------*/
 class SwChartEventListenerContainer : public SwEventListenerContainer
 {
     public:
@@ -75,9 +72,7 @@ class SwChartEventListenerContainer : public SwEventListenerContainer
             SwEventListenerContainer(pxParentL){}
         void ChartDataChanged();
 };
-/* ---------------------------------------------------------------------------
 
- ---------------------------------------------------------------------------*/
 typedef
 cppu::WeakImplHelper4
 <
@@ -179,9 +174,7 @@ public:
 
     SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
 };
-/* -----------------27.06.98 15:40-------------------
- *
- * --------------------------------------------------*/
+
 class SwXTextTableRow : public cppu::WeakImplHelper2
 <
     ::com::sun::star::beans::XPropertySet,
@@ -221,9 +214,7 @@ public:
     const SwTableLine*  GetTblRow() const {return pLine;}
     static SwTableLine* FindLine(SwTable* pTable, SwTableLine* pLine);
 };
-/* -----------------20.07.98 13:03-------------------
- *
- * --------------------------------------------------*/
+
 typedef cppu::WeakImplHelper3<
                                 ::com::sun::star::text::XTextTableCursor,
                                 ::com::sun::star::lang::XServiceInfo,
@@ -236,8 +227,6 @@ class SW_DLLPUBLIC SwXTextTableCursor : public SwXTextTableCursor_Base
     SwDepend                aCrsrDepend;
     const SfxItemPropertySet*   m_pPropSet;
 
-    //  SwUnoCrsr*      GetCrsr() const { return (SwUnoCrsr*)aCrsrDepend.GetRegisteredIn(); }
-
 protected:
     virtual ~SwXTextTableCursor();
 public:
@@ -288,9 +277,6 @@ public:
     SwFrmFmt*       GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
 };
 
-/*-----------------11.12.97 09:38-------------------
-
---------------------------------------------------*/
 struct SwRangeDescriptor
 {
     sal_Int32 nTop;
@@ -424,9 +410,6 @@ public:
     SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
 };
 
-/* -----------------27.04.98 16:41-------------------
- *
- * --------------------------------------------------*/
 class SwXCellRange : public cppu::WeakImplHelper7
 <
     ::com::sun::star::table::XCellRange,
@@ -520,9 +503,7 @@ public:
             sal_Bool bForceNumberResults = sal_False ) throw (::com::sun::star::uno::RuntimeException);
 
 };
-/* -----------------03.02.99 07:31-------------------
- *
- * --------------------------------------------------*/
+
 class SwXTableRows : public cppu::WeakImplHelper2
 <
     ::com::sun::star::table::XTableRows,
@@ -540,14 +521,6 @@ public:
 
     TYPEINFO();
 
-// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen!
-//  virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass >  > getIdlClasses(void) throw( ::com::sun::star::uno::RuntimeException );
-
-// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen!
-//  virtual sal_Bool        queryInterface( ::com::sun::star::uno::Uik aUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  & rOut );
-
-//  SMART_UNO_DECLARATION( SwXTableRows, UsrObject );
-
     //XIndexAccess
     virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException );
     virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
@@ -569,9 +542,6 @@ public:
     virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
 };
 
-/* -----------------03.02.99 07:31-------------------
- *
- * --------------------------------------------------*/
 class SwXTableColumns : public cppu::WeakImplHelper2
 <
     ::com::sun::star::table::XTableColumns,
@@ -588,13 +558,6 @@ public:
 
 
     TYPEINFO();
-// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen!
-//  virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass >  > getIdlClasses(void) throw( ::com::sun::star::uno::RuntimeException );
-
-// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen!
-//  virtual sal_Bool        queryInterface( ::com::sun::star::uno::Uik aUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  & rOut );
-
-//  SMART_UNO_DECLARATION( SwXTableColumns, UsrObject );
 
     //XIndexAccess
     virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException );
diff --git a/sw/inc/unotext.hxx b/sw/inc/unotext.hxx
index b1d17b187f88..5e1543acfcde 100644
--- a/sw/inc/unotext.hxx
+++ b/sw/inc/unotext.hxx
@@ -55,9 +55,6 @@ class OTextCursorHelper;
 class SwXTextRange;
 
 
-/* -----------------03.12.98 12:22-------------------
- *
- * --------------------------------------------------*/
 
 class SwXText
     : public ::com::sun::star::lang::XTypeProvider
diff --git a/sw/inc/unotextbodyhf.hxx b/sw/inc/unotextbodyhf.hxx
index e08b8eac4850..4a4ca2cb2913 100644
--- a/sw/inc/unotextbodyhf.hxx
+++ b/sw/inc/unotextbodyhf.hxx
@@ -120,9 +120,6 @@ public:
 };
 
 
-/* -----------------25.08.98 11:02-------------------
- *
- * --------------------------------------------------*/
 typedef ::cppu::WeakImplHelper2
 <   ::com::sun::star::lang::XServiceInfo
 ,   ::com::sun::star::container::XEnumerationAccess
diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx
index a581814ea9de..eab9d4591f85 100644
--- a/sw/inc/unotextrange.hxx
+++ b/sw/inc/unotextrange.hxx
@@ -52,9 +52,6 @@ class SwPaM;
 class SwUnoCrsr;
 class SwFrmFmt;
 
-/* -----------------29.04.98 07:35-------------------
- *
- * --------------------------------------------------*/
 class SwUnoInternalPaM
     : public SwPaM
 {
@@ -275,10 +272,6 @@ public:
 
 };
 
-/* -----------------15.05.98 08:29-------------------
- *
- * --------------------------------------------------*/
-
 typedef ::cppu::WeakImplHelper3
 <   ::com::sun::star::lang::XUnoTunnel
 ,   ::com::sun::star::lang::XServiceInfo
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 7b5ffaefbf71..4b54cf25a796 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -331,9 +331,6 @@ public:
     // css::text::XTextEmbeddedObjectsSupplier
     virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getEmbeddedObjects(void) throw( css::uno::RuntimeException );
 
-//  // css::text::XTextShapesSupplier
-//    virtual css::uno::Reference< css::container::XIndexAccess >  getShapes(void) throw( css::uno::RuntimeException );
-
     // css::text::XBookmarksSupplier
     virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getBookmarks(void) throw( css::uno::RuntimeException );
 
@@ -444,9 +441,7 @@ public:
     void SAL_CALL operator delete( void * ) throw();
 
 };
-/* -----------------25.10.99 11:02-------------------
 
- --------------------------------------------------*/
 class SwXLinkTargetSupplier : public cppu::WeakImplHelper2
 <
     css::container::XNameAccess,
@@ -483,9 +478,7 @@ public:
     //
     void    Invalidate() {pxDoc = 0;}
 };
-/* -----------------26.10.99 09:05-------------------
 
- --------------------------------------------------*/
 class SwXLinkNameAccessWrapper : public cppu::WeakImplHelper4
 <
     css::beans::XPropertySet,
@@ -536,9 +529,7 @@ public:
     virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException );
 
 };
-/* -----------------26.10.99 15:46-------------------
 
- --------------------------------------------------*/
 class SwXOutlineTarget : public cppu::WeakImplHelper2
 <
     css::beans::XPropertySet,
@@ -589,8 +580,7 @@ public:
 };
 
 
-/*-- 06.01.2004 15:08:34---------------------------------------------------
-    The class SwViewOptionAdjust_Impl is used to adjust the SwViewOption of
+/*  The class SwViewOptionAdjust_Impl is used to adjust the SwViewOption of
     the current ViewShell so that fields are not printed as commands and
     hidden characters are always invisible. Hidden text and place holders
     should be printed according to the current print options.
@@ -600,8 +590,6 @@ class SwViewOptionAdjust_Impl
 {
     SwWrtShell &    m_rShell;
     SwViewOption    m_aOldViewOptions;
-//    SwViewOption    m_aRenderViewOptions;   // view options to use when rendering for PDF export or printing
-//    bool            m_bRestoreViewOptions;
 
 public:
     SwViewOptionAdjust_Impl( SwWrtShell& rSh, const SwViewOption &rViewOptions );
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index fbf374b6d80b..f160e4e81910 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -42,7 +42,6 @@ class ViewShell;
 class SwDocShell;
 namespace svtools{ class ColorConfig;}
 
-//#define VIEWOPT_1_IDLE             0x00000001L  no longer used, see new member 'bIdle'
 #define VIEWOPT_1_TAB           0x00000002L
 #define VIEWOPT_1_BLANK         0x00000004L
 #define VIEWOPT_1_HARDBLANK     0x00000008L
@@ -54,8 +53,6 @@ namespace svtools{ class ColorConfig;}
 
 #define VIEWOPT_1_REF           0x00000400L
 #define VIEWOPT_1_FLDNAME       0x00000800L
-//#define           0x00001000L
-//#define      0x00002000L
 #define VIEWOPT_1_POSTITS       0x00004000L
 #define VIEWOPT_1_FLD_HIDDEN    0x00008000L
 #define VIEWOPT_1_CHAR_HIDDEN   0x00010000L
@@ -63,13 +60,11 @@ namespace svtools{ class ColorConfig;}
 #define VIEWOPT_1_TABLE         0x00040000L
 #define VIEWOPT_1_DRAW          0x00080000L
 #define VIEWOPT_1_CONTROL       0x00100000L
-//#define  0x00200000L
 #define VIEWOPT_1_CROSSHAIR     0x00400000L
 #define VIEWOPT_1_SNAP          0x00800000L
 #define VIEWOPT_1_SYNCHRONIZE   0x01000000L
 #define VIEWOPT_1_GRIDVISIBLE   0x02000000L
 #define VIEWOPT_1_ONLINESPELL   0x04000000L
-//#define VIEWOPT_1_HIDESPELL     0x08000000L   /* removed #i91949 */
 #define VIEWOPT_1_RESERVED1     0x10000000L
 #define VIEWOPT_1_VIEWMETACHARS 0x20000000L
 #define VIEWOPT_1_PAGEBACK      0x40000000L
@@ -159,9 +154,7 @@ protected:
     BOOL            bStarOneSetting : 1;// prevent from UI automatics (no scrollbars in readonly documents)
     BOOL            bIsPagePreview : 1; // the preview mustn't print field/footnote/... shadings
     BOOL            bSelectionInReadonly : 1; //determines whether selection is switched on in readonly documents
-    // --> FME 2004-06-29 #114856# Formular view
     BOOL            bFormView : 1;
-    // <--
     BOOL            bBookview : 1;      // view mode for page preview
     BOOL            mbViewLayoutBookMode : 1; // book view mode for edit view
     sal_Bool        bShowPlaceHolderFields : 1; //only used in printing!
@@ -390,11 +383,6 @@ public:
     inline void SetPrinting(BOOL b)
         { (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_PRINTING) : (nCore2Options &= ~VIEWOPT_CORE2_PRINTING);}
 
-/*---------------------------------------------------------------------------
-
-----------------------------------------------------------------------------*/
-
-
     inline short GetDivisionX() const   { return nDivisionX; }
     inline void  SetDivisionX( short n ){ nDivisionX = n; }
     inline short GetDivisionY() const   { return nDivisionY; }
@@ -410,17 +398,14 @@ public:
     BOOL         IsSelectionInReadonly() const {return bSelectionInReadonly;}
     void         SetSelectionInReadonly(BOOL bSet) {bSelectionInReadonly = bSet;}
 
-    // --> FME 2004-06-29 #114856# Formular view
     BOOL         IsFormView() const { return bFormView; }
     void         SetFormView( BOOL bSet ) { bFormView = bSet; }
-    // <--
 
     inline BOOL  IsPagePrevBookview() const { return bBookview; }
     inline void  SetPagePrevBookview(BOOL bSet) { bBookview = bSet; }
 
     BOOL IsAutoCompleteWords() const;
 
-    // PAGES01
     bool   IsViewLayoutBookMode() const { return mbViewLayoutBookMode; }
     void   SetViewLayoutBookMode( bool bNew ) { mbViewLayoutBookMode = bNew; }
     USHORT GetViewLayoutColumns() const { return mnViewLayoutColumns; }
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 9160c33917ba..6d0a1cc13389 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -55,10 +55,8 @@ class IDocumentContentOperations;
 class IDocumentStylePoolAccess;
 class IDocumentStatistics;
 class IDocumentUndoRedo;
-// --> OD 2007-11-14 #i83479#
 class IDocumentListItems;
 class IDocumentOutlineNodes;
-// <--
 class SfxPrinter;
 class SfxProgress;
 class SwRootFrm;
@@ -94,7 +92,6 @@ namespace vcl
 }
 
 
-//JP 19.07.98: - Bug 52312
 // define fuer Flags, die im CTOR oder den darunter liegenden Schichten
 // benoetigt werden.
 // Zur Zeit wird fuer die DrawPage das PreView Flag benoetigt
@@ -110,17 +107,15 @@ class SW_DLLPUBLIC ViewShell : public Ring
     friend class SwViewImp;
     friend class SwLayIdle;
 
-    // OD 12.12.2002 #103492# - for setting visible area for page preview paint
+    // for setting visible area for page preview paint
     friend class SwPagePreviewLayout;
 
     //Umsetzen der SwVisArea, damit vor dem Drucken sauber formatiert
     //werden kann.
     friend void SetSwVisArea( ViewShell *pSh, const SwRect &, BOOL bPDFExport = FALSE );
 
-    // --> PB 2007-05-30 #146850#
     static BitmapEx*    pReplaceBmp;    // replaced display of still loaded images
     static BitmapEx*    pErrorBmp;      // error display of missed images
-    // <--
 
     static sal_Bool bLstAct;            // sal_True wenn Das EndAction der letzten Shell
                                     // laeuft; also die EndActions der
@@ -164,10 +159,9 @@ class SW_DLLPUBLIC ViewShell : public Ring
 
                                 //Device (etwa beim Browsen)
 
-    // OD 2004-06-01 #i26791# - boolean, indicating that class in in constructor
+    // boolean, indicating that class in in constructor
     bool mbInConstructor:1;
 
-    // #i74769#
     SdrPaintWindow*         mpTargetPaintWindow;
     OutputDevice*           mpBufferedOut;
 
@@ -338,7 +332,6 @@ public:
      */
     IDocumentUndoRedo* getIDocumentUndoRedoAccess();
 
-    // --> OD 2007-11-14 #i83479#
     const IDocumentListItems* getIDocumentListItemsAccess() const;
     const IDocumentOutlineNodes* getIDocumentOutlineNodesAccess() const;
     // <--
@@ -402,26 +395,22 @@ public:
     // formatting by virtual device or printer
     void SetUseVirDev( bool nNew );
 
-    // OD 2004-02-16 #106629# - adding paragraph and table spacing at bottom
+    // adding paragraph and table spacing at bottom
     // of table cells
     void SetAddParaSpacingToTableCells( bool _bAddParaSpacingToTableCells );
 
-    // OD 06.01.2004 #i11859# - former formatting of text lines with
+    // former formatting of text lines with
     // proportional line spacing or not
     void SetUseFormerLineSpacing( bool _bUseFormerLineSpacing );
 
-    // OD 2004-03-12 #i11860# - former object positioning
+    // former object positioning
     void SetUseFormerObjectPositioning( bool _bUseFormerObjPos );
 
-    // OD 2004-05-05 #i28701#
     void SetConsiderWrapOnObjPos( bool _bConsiderWrapOnObjPos );
 
-    // --> FME #108724#
     void SetUseFormerTextWrapping( bool _bUseFormerTextWrapping );
 
-    // -> PB 2007-06-11 #i45491#
     void SetDoNotJustifyLinesWithManualBreak( bool _bDoNotJustifyLinesWithManualBreak );
-    // <--
 
     //
     // DOCUMENT COMPATIBILITY FLAGS END
@@ -454,12 +443,10 @@ public:
     // Selektion der Draw ::com::sun::star::script::Engine geaendert
     virtual void DrawSelChanged();
 
-    // OD 12.12.2002 #103492#
     SwPagePreviewLayout* PagePreviewLayout();
 
     /** adjust view options for page preview
 
-        OD 09.01.2003 #i6467#
         Because page preview should show the document as it is printed -
         page preview is print preview -, the view options are adjusted to the
         same as for printing.
@@ -512,8 +499,6 @@ public:
 
     ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
 
-    // OD 15.01.2003 #103492# - change method signature due to new page preview
-    // functionality.
     ::com::sun::star::uno::Reference<
         ::com::sun::star::accessibility::XAccessible >
             CreateAccessiblePreview();
@@ -526,8 +511,6 @@ public:
 
     /** invalidate CONTENT_FLOWS_FROM/_TO relation for paragraphs
 
-        OD 2005-12-01 #i27138#
-
         @author OD
 
         @param _pFromTxtFrm
@@ -545,16 +528,13 @@ public:
 
     /** invalidate text selection for paragraphs
 
-        OD 2005-12-12 #i27301#
-
         @author OD
     */
     void InvalidateAccessibleParaTextSelection();
 
     /** invalidate attributes for paragraphs and paragraph's characters
 
-        OD 2009-01-06 #i88069#
-        OD 2010-02-16 #i104008# - usage also for changes of the attributes of
+        usage also for changes of the attributes of
         paragraph's characters.
 
         @author OD
@@ -573,16 +553,12 @@ public:
                long nFlags = 0 );
     virtual ~ViewShell();
 
-    // --> FME 2004-06-15 #i12836# enhanced pdf export
     sal_Int32 GetPageNumAndSetOffsetForPDF( OutputDevice& rOut, const SwRect& rRect ) const;
-    // <--
 
     inline bool IsInConstructor() const { return mbInConstructor; }
 
-    // --> PB 2007-05-30 #146850#
     static const BitmapEx& GetReplacementBitmap( bool bIsErrorState );
     static void DeleteReplacementBitmaps();
-    // <--
 
     const SwPostItMgr* GetPostItMgr() const { return (const_cast<ViewShell*>(this))->GetPostItMgr(); }
     SwPostItMgr* GetPostItMgr();
diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index 5702e0b516b8..07f082e0c8c3 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -79,7 +79,6 @@ public:
 
 // ------ Ab hier Klassen / Methoden fuer die Selectionen -------
 
-// #i75172# predefines
 namespace sdr { namespace overlay { class OverlayObject; }}
 
 class SwSelPaintRects : public SwRects
@@ -90,16 +89,14 @@ class SwSelPaintRects : public SwRects
     static long nPixPtX, nPixPtY;
     static MapMode *pMapMode;
 
-    // die Shell
     const SwCrsrShell* pCShell;
 
     virtual void Paint( const Rectangle& rRect );
     virtual void FillRects() = 0;
 
-    // #i75172#
     sdr::overlay::OverlayObject*    mpCursorOverlay;
 
-    // #i75172# access to mpCursorOverlay for swapContent
+    // access to mpCursorOverlay for swapContent
     sdr::overlay::OverlayObject* getCursorOverlay() const { return mpCursorOverlay; }
     void setCursorOverlay(sdr::overlay::OverlayObject* pNew) { mpCursorOverlay = pNew; }
 
@@ -107,7 +104,7 @@ public:
     SwSelPaintRects( const SwCrsrShell& rCSh );
     virtual ~SwSelPaintRects();
 
-    // #i75172# in SwCrsrShell::CreateCrsr() the content of SwSelPaintRects is exchanged. To
+    // in SwCrsrShell::CreateCrsr() the content of SwSelPaintRects is exchanged. To
     // make a complete swap access to mpCursorOverlay is needed there
     void swapContent(SwSelPaintRects& rSwap);
 
@@ -165,9 +162,9 @@ public:
     // TRUE: an die Position kann der Cursor gesetzt werden
     virtual BOOL IsAtValidPos( BOOL bPoint = TRUE ) const;
 
-#ifdef DBG_UTIL
-// JP 05.03.98: zum Testen des UNO-Crsr Verhaltens hier die Implementierung
-//              am sichtbaren Cursor
+#if OSL_DEBUG_LEVEL > 1
+    // zum Testen des UNO-Crsr Verhaltens hier die Implementierung
+    // am sichtbaren Cursor
     virtual BOOL IsSelOvr( int eFlags =
                                 ( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION |
                                   nsSwCursorSelOverFlags::SELOVER_TOGGLE |
@@ -209,9 +206,9 @@ public:
     // TRUE: an die Position kann der Cursor gesetzt werden
     virtual BOOL IsAtValidPos( BOOL bPoint = TRUE ) const;
 
-#ifdef DBG_UTIL
-// JP 05.03.98: zum Testen des UNO-Crsr Verhaltens hier die Implementierung
-//              am sichtbaren Cursor
+#if OSL_DEBUG_LEVEL > 1
+    // zum Testen des UNO-Crsr Verhaltens hier die Implementierung
+    // am sichtbaren Cursor
     virtual BOOL IsSelOvr( int eFlags =
                                 ( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION |
                                   nsSwCursorSelOverFlags::SELOVER_TOGGLE |
diff --git a/sw/prj/build.lst b/sw/prj/build.lst
index 64894fd75857..eb29984a79ca 100755
--- a/sw/prj/build.lst
+++ b/sw/prj/build.lst
@@ -1,4 +1,4 @@
-sw      sw      :    filter l10n connectivity OOo:writerperfect OOo:lotuswordpro vbahelper svx stoc writerfilter NULL
+sw      sw      :    filter l10n connectivity writerperfect lotuswordpro vbahelper svx stoc writerfilter NULL
 sw	sw										usr1	-	all	sw_mkout NULL
 sw	sw\inc									nmake		-	all	sw_inc NULL
 sw	sw\uiconfig\layout									nmake	-	all	sw_layout NULL
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx
index 255e03a8cb18..cad245d97bb8 100644
--- a/sw/source/core/SwNumberTree/SwNodeNum.cxx
+++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx
@@ -74,7 +74,7 @@ SwNumRule * SwNodeNum::GetNumRule() const
 
 void SwNodeNum::ChangeNumRule( SwNumRule& rNumRule )
 {
-    ASSERT( GetNumRule() && GetTxtNode(),
+    OSL_ENSURE( GetNumRule() && GetTxtNode(),
             "<SwNodeNum::ChangeNumRule(..)> - missing list style and/or text node. Serious defect -> please informm OD." );
     if ( GetNumRule() && GetTxtNode() )
     {
@@ -91,7 +91,7 @@ void SwNodeNum::ChangeNumRule( SwNumRule& rNumRule )
 
 SwPosition SwNodeNum::GetPosition() const
 {
-    ASSERT( GetTxtNode(),
+    OSL_ENSURE( GetTxtNode(),
             "<SwNodeNum::GetPosition()> - no text node set at <SwNodeNum> instance" );
     return SwPosition(*mpTxtNode);
 }
@@ -110,13 +110,13 @@ SwNumberTreeNode * SwNodeNum::Create() const
 // --> OD 2008-02-19 #refactorlists#
 void SwNodeNum::PreAdd()
 {
-    ASSERT( GetTxtNode(),
+    OSL_ENSURE( GetTxtNode(),
             "<SwNodeNum::PreAdd()> - no text node set at <SwNodeNum> instance" );
     if ( !GetNumRule() && GetTxtNode() )
     {
         mpNumRule = GetTxtNode()->GetNumRule();
     }
-    ASSERT( GetNumRule(),
+    OSL_ENSURE( GetNumRule(),
             "<SwNodeNum::PreAdd()> - no list style set at <SwNodeNum> instance" );
     if ( GetNumRule() && GetTxtNode() )
     {
@@ -135,9 +135,9 @@ void SwNodeNum::PreAdd()
 
 void SwNodeNum::PostRemove()
 {
-    ASSERT( GetTxtNode(),
+    OSL_ENSURE( GetTxtNode(),
             "<SwNodeNum::PostRemove()> - no text node set at <SwNodeNum> instance" );
-    ASSERT( GetNumRule(),
+    OSL_ENSURE( GetNumRule(),
             "<SwNodeNum::PostRemove()> - no list style set at <SwNodeNum> instance" );
 
     if ( GetTxtNode() )
@@ -191,7 +191,7 @@ bool SwNodeNum::IsContinuous() const
     }
     else
     {
-        ASSERT( false, "<SwNodeNum::IsContinuous()> - OD debug" );
+        OSL_ENSURE( false, "<SwNodeNum::IsContinuous()> - OD debug" );
     }
     // <--
 
@@ -232,7 +232,7 @@ bool SwNodeNum::HasCountedChildren() const
     for (aIt = mChildren.begin(); aIt != mChildren.end(); aIt++)
     {
         SwNodeNum* pChild( dynamic_cast<SwNodeNum*>(*aIt) );
-        ASSERT( pChild,
+        OSL_ENSURE( pChild,
                 "<SwNodeNum::HasCountedChildren()> - unexcepted type of child -> please inform OD" );
         if ( pChild &&
              ( pChild->IsCountedForNumbering() ||
@@ -348,7 +348,7 @@ bool SwNodeNum::IsCountPhantoms() const
                   mpNumRule->IsCountPhantoms();
     else
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "<SwNodeNum::IsCountPhantoms(): missing numbering rule - please inform OD" );
     }
     // <--
@@ -471,7 +471,7 @@ void SwNodeNum::_UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum )
         SwNodeNum* pChildNode( dynamic_cast<SwNodeNum*>((*rNodeNum.mChildren.begin())) );
         if ( !pChildNode )
         {
-            ASSERT( false,
+            OSL_ENSURE( false,
                     "<SwNodeNum::_UnregisterMeAndChildrenDueToRootDelete(..)> - unknown number tree node child" );
             ++nAllowedChildCount;
             continue;
diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx
index 00b2b0abc296..d144c4115135 100644
--- a/sw/source/core/SwNumberTree/SwNumberTree.cxx
+++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx
@@ -37,7 +37,7 @@
 using std::vector;
 using std::find;
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 unsigned long SwNumberTreeNode::nInstances = 0;
 #endif
 
@@ -53,7 +53,7 @@ SwNumberTreeNode::SwNumberTreeNode()
 {
     mItLastValid = mChildren.end();
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     mnSerial = nInstances;
     nInstances++;
 #endif
@@ -72,19 +72,19 @@ SwNumberTreeNode::~SwNumberTreeNode()
         }
         else
         {
-            ASSERT(false, "lost children!");
+            OSL_ENSURE(false, "lost children!");
         }
     }
 
-    ASSERT( IsPhantom() || mpParent == NULL, ": I'm not supposed to have a parent.");
+    OSL_ENSURE( IsPhantom() || mpParent == NULL, ": I'm not supposed to have a parent.");
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     nInstances--;
 #endif
 
     mpParent = (SwNumberTreeNode *) 0xdeadbeef;
 
-    ASSERT(mChildren.empty(), "children left!");
+    OSL_ENSURE(mChildren.empty(), "children left!");
 }
 
 SwNumberTreeNode * SwNumberTreeNode::CreatePhantom()
@@ -94,7 +94,7 @@ SwNumberTreeNode * SwNumberTreeNode::CreatePhantom()
     if (! mChildren.empty() &&
         (*mChildren.begin())->IsPhantom())
     {
-        ASSERT(false, "phantom already present");
+        OSL_ENSURE(false, "phantom already present");
     }
     else
     {
@@ -107,7 +107,7 @@ SwNumberTreeNode * SwNumberTreeNode::CreatePhantom()
 
         if (! aInsert.second)
         {
-            ASSERT(false, "insert of phantom failed!");
+            OSL_ENSURE(false, "insert of phantom failed!");
 
             delete pNew;
             pNew = NULL;
@@ -158,7 +158,7 @@ void SwNumberTreeNode::ValidateHierarchical(const SwNumberTreeNode * pNode) cons
 
     if (aValidateIt != mChildren.end())
     {
-        ASSERT((*aValidateIt)->mpParent == this, "wrong parent");
+       OSL_ENSURE((*aValidateIt)->mpParent == this, "wrong parent");
 
         tSwNumberTreeChildren::iterator aIt = mItLastValid;
 
@@ -298,7 +298,7 @@ void SwNumberTreeNode::ValidateContinuous(const SwNumberTreeNode * pNode) const
             nTmpNumber = GetStartValue();
         }
         else
-            aIt++;
+            ++aIt;
 
         if (aIt != mChildren.end())
         {
@@ -371,7 +371,7 @@ void SwNumberTreeNode::ValidateTree()
         {
             tSwNumberTreeChildren::iterator aIt;
 
-            for (aIt = mChildren.begin(); aIt != mChildren.end(); aIt++)
+            for (aIt = mChildren.begin(); aIt != mChildren.end(); ++aIt)
                 (*aIt)->ValidateTree();
         }
     }
@@ -429,7 +429,7 @@ void SwNumberTreeNode::MoveGreaterChildren( SwNumberTreeNode& _rCompareNode,
     if (aItUpper != mChildren.end())
     {
         tSwNumberTreeChildren::iterator aIt;
-        for (aIt = aItUpper; aIt != mChildren.end(); aIt++)
+        for (aIt = aItUpper; aIt != mChildren.end(); ++aIt)
             (*aIt)->mpParent = &_rDestNode;
 
         _rDestNode.mChildren.insert(aItUpper, mChildren.end());
@@ -489,7 +489,7 @@ void SwNumberTreeNode::MoveChildren(SwNumberTreeNode * pDest)
         }
 
         tSwNumberTreeChildren::iterator aIt;
-        for (aIt = mChildren.begin(); aIt != mChildren.end(); aIt++)
+        for (aIt = mChildren.begin(); aIt != mChildren.end(); ++aIt)
             (*aIt)->mpParent = pDest;
 
         pDest->mChildren.insert(mChildren.begin(), mChildren.end());
@@ -501,10 +501,10 @@ void SwNumberTreeNode::MoveChildren(SwNumberTreeNode * pDest)
         // <--
     }
 
-    ASSERT (mChildren.empty(), "MoveChildren failed!");
+   OSL_ENSURE(mChildren.empty(), "MoveChildren failed!");
 
 #ifdef __SW_NUMBER_TREE_SANITY_CHECK
-    ASSERT(IsSane(false) && pDest->IsSane(false), "insanity!");
+    OSL_ENSURE(IsSane(false) && pDest->IsSane(false), "insanity!");
 #endif
 }
 
@@ -539,7 +539,7 @@ void SwNumberTreeNode::AddChild( SwNumberTreeNode * pChild,
     // --> OD 2008-03-13 #refactorlists#
     if ( nDepth < 0 )
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "<SwNumberTreeNode::AddChild(..)> - parameter <nDepth> out of valid range. Serious defect -> please inform OD." );
         return;
     }
@@ -547,7 +547,7 @@ void SwNumberTreeNode::AddChild( SwNumberTreeNode * pChild,
 
     if ( pChild->GetParent() != NULL || pChild->GetChildCount() > 0 )
     {
-        ASSERT(false, "only orphans allowed.");
+        OSL_ENSURE(false, "only orphans allowed.");
         return;
     }
 
@@ -556,7 +556,7 @@ void SwNumberTreeNode::AddChild( SwNumberTreeNode * pChild,
         tSwNumberTreeChildren::iterator aInsertDeepIt =
             mChildren.upper_bound(pChild);
 
-        ASSERT(! (aInsertDeepIt != mChildren.end() &&
+        OSL_ENSURE(! (aInsertDeepIt != mChildren.end() &&
                   (*aInsertDeepIt)->IsPhantom()), " unexspected phantom");
 
 
@@ -571,7 +571,7 @@ void SwNumberTreeNode::AddChild( SwNumberTreeNode * pChild,
         }
         else
         {
-            aInsertDeepIt--;
+            --aInsertDeepIt;
             (*aInsertDeepIt)->AddChild(pChild, nDepth - 1);
         }
 
@@ -593,7 +593,7 @@ void SwNumberTreeNode::AddChild( SwNumberTreeNode * pChild,
             if (aInsertedIt != mChildren.begin())
             {
                 tSwNumberTreeChildren::iterator aPredIt = aInsertedIt;
-                aPredIt--;
+                --aPredIt;
 
                 // --> OD 2005-10-14 #125991#
                 // Move greater children of previous node to new child.
@@ -684,7 +684,7 @@ void SwNumberTreeNode::RemoveChild(SwNumberTreeNode * pChild)
 
     if (pChild->IsPhantom())
     {
-        ASSERT(false, "not applicable to phantoms!");
+        OSL_ENSURE(false, "not applicable to phantoms!");
 
         return;
     }
@@ -711,8 +711,7 @@ void SwNumberTreeNode::RemoveChild(SwNumberTreeNode * pChild)
         else
         {
             aItPred = aRemoveIt;
-
-            aItPred--;
+            --aItPred;
         }
 
         if (! pRemove->mChildren.empty())
@@ -744,7 +743,7 @@ void SwNumberTreeNode::RemoveChild(SwNumberTreeNode * pChild)
     }
     else
     {
-        ASSERT(false, "RemoveChild: failed!");
+        OSL_ENSURE(false, "RemoveChild: failed!");
     }
 
     // --> OD 2008-02-19 #refactorlists#
@@ -857,7 +856,7 @@ bool SwNumberTreeNode::HasPhantomCountedParent() const
 {
     bool bRet( false );
 
-    ASSERT( IsPhantom(),
+    OSL_ENSURE( IsPhantom(),
             "<SwNumberTreeNode::HasPhantomCountedParent()> - wrong usage of method - it's only for phantoms" );
     if ( IsPhantom() && mpParent )
     {
@@ -884,7 +883,7 @@ bool SwNumberTreeNode::IsFirst(const SwNumberTreeNode * pNode) const
     tSwNumberTreeChildren::iterator aIt = mChildren.begin();
 
     if ((*aIt)->IsPhantom())
-        aIt++;
+        ++aIt;
 
     return *aIt == pNode;
 }
@@ -934,19 +933,19 @@ void SwNumberTreeNode::SetLevelInListTree( const int nLevel )
 {
     if ( nLevel < 0 )
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "<SwNumberTreeNode::SetLevelInListTree(..)> - parameter <nLevel> out of valid range. Serious defect -> please inform OD." );
         return;
     }
 
-    ASSERT( GetParent(),
+    OSL_ENSURE( GetParent(),
             "<SwNumberTreeNode::SetLevelInListTree(..)> - can only be called for number tree nodes in a list tree" );
     if ( GetParent() )
     {
         if ( nLevel != GetLevelInListTree() )
         {
             SwNumberTreeNode* pRootTreeNode = GetRoot();
-            ASSERT( pRootTreeNode,
+            OSL_ENSURE( pRootTreeNode,
                     "<SwNumberTreeNode::SetLevelInListTree(..)> - no root tree node found. Serious defect -> please inform OD." );
 
             RemoveMe();
@@ -988,14 +987,14 @@ bool SwNumberTreeNode::IsSane(bool bRecursive,
 
     if (find(rParents.begin(), rParents.end(), this) != rParents.end())
     {
-        ASSERT(false, " I'm my own ancestor!");
+        OSL_ENSURE(false, " I'm my own ancestor!");
 
         bResult = false;
     }
 
     if (! rParents.empty() && rParents.back() != mpParent)
     {
-        ASSERT(false, " I'm a bastard!");
+        OSL_ENSURE(false, " I'm a bastard!");
 
         bResult = false;
     }
@@ -1003,7 +1002,7 @@ bool SwNumberTreeNode::IsSane(bool bRecursive,
     rParents.push_back(this);
 
     bool bFirst = true;
-    for (aIt = mChildren.begin(); aIt != mChildren.end(); aIt++)
+    for (aIt = mChildren.begin(); aIt != mChildren.end(); ++aIt)
     {
         if (*aIt)
         {
@@ -1016,7 +1015,7 @@ bool SwNumberTreeNode::IsSane(bool bRecursive,
 
                 if (! bFirst)
                 {
-                    ASSERT(false, " found phantom not at first position.");
+                    OSL_ENSURE(false, " found phantom not at first position.");
 
                     bResult = false;
                 }
@@ -1024,7 +1023,7 @@ bool SwNumberTreeNode::IsSane(bool bRecursive,
 
             if ((*aIt)->mpParent != (SwNumberTreeNode *) this)
             {
-                ASSERT(false, "found a bastard");
+                OSL_ENSURE(false, "found a bastard");
 
                 bResult = false;
             }
@@ -1033,7 +1032,7 @@ bool SwNumberTreeNode::IsSane(bool bRecursive,
             {
                 if  (!(*aIt)->IsPhantom() && (*aIt)->LessThan(*this))
                 {
-                    ASSERT(false, " found child less than me");
+                    OSL_ENSURE(false, " found child less than me");
 
                     bResult = false;
                 }
@@ -1041,7 +1040,7 @@ bool SwNumberTreeNode::IsSane(bool bRecursive,
         }
         else
         {
-            ASSERT(false, "found child that is NULL");
+            OSL_ENSURE(false, "found child that is NULL");
             bResult = false;
         }
 
@@ -1061,7 +1060,7 @@ SwNumberTreeNode::GetIterator(const SwNumberTreeNode * pChild) const
     tSwNumberTreeChildren::iterator aItResult =
         mChildren.find(const_cast<SwNumberTreeNode *>(pChild));
 
-    ASSERT( aItResult != mChildren.end(),
+    OSL_ENSURE( aItResult != mChildren.end(),
             "something went wrong getting the iterator for a child");
 
     return aItResult;
@@ -1093,7 +1092,7 @@ SwNumberTreeNode::GetIterator(const SwNumberTreeNode * pChild) const
 //  return aStr;
 //}
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 unsigned long SwNumberTreeNode::GetInstances()
 {
     return nInstances;
@@ -1157,7 +1156,7 @@ SwNumberTreeNode * SwNumberTreeNode::GetPred(bool bSibling) const
         }
         else
         {
-            aIt--;
+            --aIt;
 
             if ( !bSibling )
                 pResult = (*aIt)->GetLastDescendant();
@@ -1176,7 +1175,7 @@ void SwNumberTreeNode::SetLastValid
                     ( SwNumberTreeNode::tSwNumberTreeChildren::iterator aItValid,
                       bool bValidating ) const
 {
-    ASSERT( (aItValid == mChildren.end() || GetIterator(*aItValid) != mChildren.end()),
+    OSL_ENSURE( (aItValid == mChildren.end() || GetIterator(*aItValid) != mChildren.end()),
             "last-valid iterator");
 
     if (
@@ -1212,7 +1211,7 @@ void SwNumberTreeNode::SetLastValid
             tSwNumberTreeChildren::iterator aIt = mItLastValid;
 
             if (aIt != mChildren.end())
-                aIt++;
+                ++aIt;
             else
                 aIt = mChildren.begin();
 
@@ -1220,7 +1219,7 @@ void SwNumberTreeNode::SetLastValid
             {
                 (*aIt)->InvalidateTree();
 
-                aIt++;
+                ++aIt;
             }
 
             SetLastValid(bValidating);
@@ -1245,7 +1244,7 @@ void SwNumberTreeNode::InvalidateTree() const
 
     tSwNumberTreeChildren::iterator aIt;
 
-    for (aIt = mChildren.begin(); aIt != mChildren.end(); aIt++)
+    for (aIt = mChildren.begin(); aIt != mChildren.end(); ++aIt)
         (*aIt)->InvalidateTree();
 }
 
@@ -1256,7 +1255,7 @@ void SwNumberTreeNode::Invalidate(SwNumberTreeNode * pChild)
         tSwNumberTreeChildren::iterator aIt = GetIterator(pChild);
 
         if (aIt != mChildren.begin())
-            aIt--;
+            --aIt;
         else
             aIt = mChildren.end();
 
@@ -1286,7 +1285,7 @@ void SwNumberTreeNode::Notify()
 
         tSwNumberTreeChildren::iterator aIt;
 
-        for (aIt = mChildren.begin(); aIt != mChildren.end(); aIt++)
+        for (aIt = mChildren.begin(); aIt != mChildren.end(); ++aIt)
             (*aIt)->Notify();
     }
 }
@@ -1300,13 +1299,13 @@ void SwNumberTreeNode::NotifyInvalidChildren()
         if (aIt == mChildren.end())
             aIt = mChildren.begin();
         else
-            aIt++;
+            ++aIt;
 
         while (aIt != mChildren.end())
         {
             (*aIt)->Notify();
 
-            aIt++;
+            ++aIt;
         }
         // --> OD 2005-10-19 #126009# - notification of next not counted node
         // is also needed.
@@ -1376,7 +1375,7 @@ void SwNumberTreeNode::NotifyNodesOnListLevel( const int nListLevel )
 {
     if ( nListLevel < 0 )
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "<SwNumberTreeNode::NotifyNodesOnListLevel(..)> - invalid list level provided" );
         return;
     }
@@ -1388,7 +1387,7 @@ void SwNumberTreeNode::NotifyNodesOnListLevel( const int nListLevel )
 
 void SwNumberTreeNode::NotifyChildrenOnDepth( const int nDepth )
 {
-    ASSERT( nDepth >= 0,
+    OSL_ENSURE( nDepth >= 0,
             "<SwNumberTreeNode::NotifyChildrenOnDepth(..)> - misusage" );
 
     SwNumberTreeNode::tSwNumberTreeChildren::iterator aChildIter =
diff --git a/sw/source/core/SwNumberTree/makefile.mk b/sw/source/core/SwNumberTree/makefile.mk
index d67a3f321a01..a7cfff9cecd2 100644
--- a/sw/source/core/SwNumberTree/makefile.mk
+++ b/sw/source/core/SwNumberTree/makefile.mk
@@ -38,10 +38,10 @@ TARGET=SwNumberTree
 # --- Files --------------------------------------------------------
 
 SLOFILES =	\
-        $(SLO)$/SwNumberTree.obj \
-        $(SLO)$/SwNodeNum.obj
+        $(EXCEPTIONSFILES)
 
 EXCEPTIONSFILES = \
+        $(SLO)$/SwNodeNum.obj \
         $(SLO)$/SwNumberTree.obj 
 
 # --- Tagets -------------------------------------------------------
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index d0ba1db4e124..dbd1b5196593 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -100,7 +100,7 @@ void SwAccessibleCell::GetStates( ::utl::AccessibleStateSetHelper& rStateSet )
     if( IsSelected() )
     {
         rStateSet.AddState( AccessibleStateType::SELECTED );
-        ASSERT( bIsSelected, "bSelected out of sync" );
+        OSL_ENSURE( bIsSelected, "bSelected out of sync" );
         ::rtl::Reference < SwAccessibleContext > xThis( this );
         GetMap()->SetCursorContext( xThis );
     }
@@ -160,8 +160,8 @@ sal_Bool SwAccessibleCell::_InvalidateChildrenCursorPos( const SwFrm *pFrm )
                     GetMap()->GetContextImpl( pLower, sal_False ) );
                 if( xAccImpl.is() )
                 {
-                    ASSERT( xAccImpl->GetFrm()->IsCellFrm(),
-                             "table child is not a cell frame" )
+                    OSL_ENSURE( xAccImpl->GetFrm()->IsCellFrm(),
+                             "table child is not a cell frame" );
                     bChanged |= static_cast< SwAccessibleCell *>(
                             xAccImpl.get() )->_InvalidateMyCursorPos();
                 }
@@ -186,7 +186,7 @@ void SwAccessibleCell::_InvalidateCursorPos()
 {
 
     const SwFrm *pParent = GetParent( SwAccessibleChild(GetFrm()), IsInPagePreview() );
-    ASSERT( pParent->IsTabFrm(), "parent is not a tab frame" );
+    OSL_ENSURE( pParent->IsTabFrm(), "parent is not a tab frame" );
     const SwTabFrm *pTabFrm = static_cast< const SwTabFrm * >( pParent );
     if( pTabFrm->IsFollow() )
         pTabFrm = pTabFrm->FindMaster();
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index 5ecac81f9a89..979157ad0644 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -127,11 +127,11 @@ Window *SwAccessibleContext::GetWindow()
     if( GetMap() )
     {
         const ViewShell *pVSh = GetMap()->GetShell();
-        ASSERT( pVSh, "no view shell" );
+        OSL_ENSURE( pVSh, "no view shell" );
         if( pVSh )
             pWin = pVSh->GetWin();
 
-        ASSERT( pWin, "no window" );
+        OSL_ENSURE( pWin, "no window" );
     }
 
     return pWin;
@@ -142,7 +142,7 @@ SwCrsrShell* SwAccessibleContext::GetCrsrShell()
 {
     SwCrsrShell* pCrsrShell;
     ViewShell* pViewShell = GetMap() ? GetMap()->GetShell() : 0;
-    ASSERT( pViewShell, "no view shell" );
+    OSL_ENSURE( pViewShell, "no view shell" );
     if( pViewShell && pViewShell->ISA( SwCrsrShell ) )
         pCrsrShell = static_cast<SwCrsrShell*>( pViewShell );
     else
@@ -156,7 +156,7 @@ const SwCrsrShell* SwAccessibleContext::GetCrsrShell() const
     // just like non-const GetCrsrShell
     const SwCrsrShell* pCrsrShell;
     const ViewShell* pViewShell = GetMap() ? GetMap()->GetShell() : 0;
-    ASSERT( pViewShell, "no view shell" );
+    OSL_ENSURE( pViewShell, "no view shell" );
     if( pViewShell && pViewShell->ISA( SwCrsrShell ) )
         pCrsrShell = static_cast<const SwCrsrShell*>( pViewShell );
     else
@@ -226,7 +226,7 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm,
             {
                 if ( rLower.GetSwFrm() )
                 {
-                    ASSERT( !rLower.AlwaysIncludeAsChild(),
+                    OSL_ENSURE( !rLower.AlwaysIncludeAsChild(),
                             "<SwAccessibleContext::ChildrenScrolled(..)> - always included child not considered!" );
                     const SwFrm* pLower( rLower.GetSwFrm() );
                     ::rtl::Reference< SwAccessibleContext > xAccImpl =
@@ -259,7 +259,7 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm,
                 }
                 else if ( rLower.GetDrawObject() )
                 {
-                    ASSERT( !rLower.AlwaysIncludeAsChild(),
+                    OSL_ENSURE( !rLower.AlwaysIncludeAsChild(),
                             "<SwAccessibleContext::ChildrenScrolled(..)> - always included child not considered!" );
                     ::rtl::Reference< ::accessibility::AccessibleShape > xAccImpl =
                         GetMap()->GetContextImpl( rLower.GetDrawObject(),
@@ -297,7 +297,7 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm,
                 else if ( rLower.GetWindow() )
                 {
                     // nothing to do - as such children are always included as children.
-                    ASSERT( rLower.AlwaysIncludeAsChild(),
+                    OSL_ENSURE( rLower.AlwaysIncludeAsChild(),
                             "<SwAccessibleContext::ChildrenScrolled(..)> - not always included child not considered!" );
                 }
             }
@@ -347,7 +347,7 @@ void SwAccessibleContext::ScrolledIn()
     // This accessible should be freshly created, because it
     // was not visisble before. Therefor, its vis area must already
     // reflect the scrolling.
-    ASSERT( GetVisArea() == GetMap()->GetVisArea(),
+    OSL_ENSURE( GetVisArea() == GetMap()->GetVisArea(),
             "Vis area of child is wrong. Did it exist already?" );
 
     // Send child event at parent. That's all we have to do here.
@@ -483,7 +483,7 @@ void SwAccessibleContext::_InvalidateFocus()
 
 void SwAccessibleContext::FireAccessibleEvent( AccessibleEventObject& rEvent )
 {
-    ASSERT( GetFrm(), "fire event for diposed frame?" );
+    OSL_ENSURE( GetFrm(), "fire event for diposed frame?" );
     if( !GetFrm() )
         return;
 
@@ -653,13 +653,13 @@ uno::Reference< XAccessible> SAL_CALL SwAccessibleContext::getAccessibleParent (
     CHECK_FOR_DEFUNC( XAccessibleContext )
 
     const SwFrm *pUpper = GetParent();
-    ASSERT( pUpper != 0 || bDisposing, "no upper found" );
+    OSL_ENSURE( pUpper != 0 || bDisposing, "no upper found" );
 
     uno::Reference< XAccessible > xAcc;
     if( pUpper )
         xAcc = GetMap()->GetContext( pUpper, !bDisposing );
 
-    ASSERT( xAcc.is() || bDisposing, "no parent found" );
+    OSL_ENSURE( xAcc.is() || bDisposing, "no parent found" );
 
     // Remember the parent as weak ref.
     {
@@ -678,14 +678,14 @@ sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleIndexInParent (void)
     CHECK_FOR_DEFUNC( XAccessibleContext )
 
     const SwFrm *pUpper = GetParent();
-    ASSERT( pUpper != 0 || bDisposing, "no upper found" );
+    OSL_ENSURE( pUpper != 0 || bDisposing, "no upper found" );
 
     sal_Int32 nIndex = -1;
     if( pUpper )
     {
         ::rtl::Reference < SwAccessibleContext > xAccImpl(
             GetMap()->GetContextImpl( pUpper, !bDisposing )  );
-        ASSERT( xAccImpl.is() || bDisposing, "no parent found" );
+        OSL_ENSURE( xAccImpl.is() || bDisposing, "no parent found" );
         if( xAccImpl.is() )
             nIndex = xAccImpl->GetChildIndex( *(GetMap()), SwAccessibleChild(GetFrm()) );
     }
@@ -702,7 +702,7 @@ sal_Int16 SAL_CALL SwAccessibleContext::getAccessibleRole (void)
 OUString SAL_CALL SwAccessibleContext::getAccessibleDescription (void)
         throw (uno::RuntimeException)
 {
-    ASSERT( !this, "description needs to be overloaded" );
+    OSL_ENSURE( !this, "description needs to be overloaded" );
     THROW_RUNTIME_EXCEPTION( XAccessibleContext, "internal error (method must be overloaded)" );
 }
 
@@ -873,7 +873,7 @@ awt::Rectangle SAL_CALL SwAccessibleContext::getBoundsImpl(sal_Bool bRelative)
     CHECK_FOR_DEFUNC( XAccessibleComponent )
 
     const SwFrm *pParent = GetParent();
-    ASSERT( pParent, "no Parent found" );
+    OSL_ENSURE( pParent, "no Parent found" );
     Window *pWin = GetWindow();
 
     CHECK_FOR_WINDOW( XAccessibleComponent, pWin && pParent )
@@ -883,7 +883,7 @@ awt::Rectangle SAL_CALL SwAccessibleContext::getBoundsImpl(sal_Bool bRelative)
     if( GetFrm()->IsPageFrm() &&
         static_cast < const SwPageFrm * >( GetFrm() )->IsEmptyPage() )
     {
-        ASSERT( GetShell()->IsPreView(), "empty page accessible?" );
+        OSL_ENSURE( GetShell()->IsPreView(), "empty page accessible?" );
         if( GetShell()->IsPreView() )
         {
             // OD 15.01.2003 #103492# - adjust method call <GetMap()->GetPreViewPageSize()>
@@ -1016,7 +1016,7 @@ sal_Int32 SAL_CALL SwAccessibleContext::getBackground()
 OUString SAL_CALL SwAccessibleContext::getImplementationName()
         throw( uno::RuntimeException )
 {
-    ASSERT( !this, "implementation name needs to be overloaded" );
+    OSL_ENSURE( !this, "implementation name needs to be overloaded" );
 
     THROW_RUNTIME_EXCEPTION( lang::XServiceInfo, "implementation name needs to be overloaded" )
 }
@@ -1025,14 +1025,14 @@ sal_Bool SAL_CALL
     SwAccessibleContext::supportsService (const ::rtl::OUString& )
         throw (uno::RuntimeException)
 {
-    ASSERT( !this, "supports service needs to be overloaded" );
+    OSL_ENSURE( !this, "supports service needs to be overloaded" );
     THROW_RUNTIME_EXCEPTION( lang::XServiceInfo, "supports service needs to be overloaded" )
 }
 
 uno::Sequence< OUString > SAL_CALL SwAccessibleContext::getSupportedServiceNames()
         throw( uno::RuntimeException )
 {
-    ASSERT( !this, "supported services names needs to be overloaded" );
+    OSL_ENSURE( !this, "supported services names needs to be overloaded" );
     THROW_RUNTIME_EXCEPTION( lang::XServiceInfo, "supported services needs to be overloaded" )
 }
 
@@ -1081,8 +1081,8 @@ void SwAccessibleContext::Dispose( sal_Bool bRecursive )
 {
     SolarMutexGuard aGuard;
 
-    ASSERT( GetFrm() && GetMap(), "already disposed" );
-    ASSERT( GetMap()->GetVisArea() == GetVisArea(),
+    OSL_ENSURE( GetFrm() && GetMap(), "already disposed" );
+    OSL_ENSURE( GetMap()->GetVisArea() == GetVisArea(),
                 "invalid vis area for dispose" );
 
     bDisposing = sal_True;
@@ -1174,7 +1174,7 @@ void SwAccessibleContext::InvalidatePosOrSize( const SwRect& )
 {
     SolarMutexGuard aGuard;
 
-    ASSERT( GetFrm() && !GetFrm()->Frm().IsEmpty(), "context should have a size" );
+    OSL_ENSURE( GetFrm() && !GetFrm()->Frm().IsEmpty(), "context should have a size" );
 
     sal_Bool bIsOldShowingState;
     sal_Bool bIsNewShowingState = IsShowing( *(GetMap()) );
@@ -1213,7 +1213,7 @@ void SwAccessibleContext::InvalidateChildPosOrSize(
 {
     SolarMutexGuard aGuard;
 
-    ASSERT( !rChildFrmOrObj.GetSwFrm() ||
+    OSL_ENSURE( !rChildFrmOrObj.GetSwFrm() ||
             !rChildFrmOrObj.GetSwFrm()->Frm().IsEmpty(),
             "child context should have a size" );
 
@@ -1254,7 +1254,7 @@ void SwAccessibleContext::InvalidateChildPosOrSize(
                 }
                 else
                 {
-                    ASSERT( false ,
+                    OSL_ENSURE( false ,
                             "<SwAccessibleContext::InvalidateChildPosOrSize(..)> - no accessible shape found." );
                 }
                 // <--
@@ -1295,7 +1295,7 @@ void SwAccessibleContext::InvalidateChildPosOrSize(
             }
             else if ( rChildFrmOrObj.GetWindow() )
             {
-                ASSERT( false,
+                OSL_ENSURE( false,
                         "<SwAccessibleContext::InvalidateChildPosOrSize(..)> - not expected to handle dispose of child of type <Window>." );
             }
         }
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 68a9e824e70a..956198146914 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -99,7 +99,7 @@ void SwAccessibleDocumentBase::AddChild( Window *pWin, sal_Bool bFireEvent )
 {
     SolarMutexGuard aGuard;
 
-    ASSERT( !mpChildWin, "only one child window is supported" );
+    OSL_ENSURE( !mpChildWin, "only one child window is supported" );
     if( !mpChildWin )
     {
         mpChildWin = pWin;
@@ -118,7 +118,7 @@ void SwAccessibleDocumentBase::RemoveChild( Window *pWin )
 {
     SolarMutexGuard aGuard;
 
-    ASSERT( !mpChildWin || pWin == mpChildWin, "invalid child window to remove" );
+    OSL_ENSURE( !mpChildWin || pWin == mpChildWin, "invalid child window to remove" );
     if( mpChildWin && pWin == mpChildWin )
     {
         AccessibleEventObject aEvent;
@@ -338,7 +338,7 @@ SwAccessibleDocument::~SwAccessibleDocument()
 
 void SwAccessibleDocument::Dispose( sal_Bool bRecursive )
 {
-    ASSERT( GetFrm() && GetMap(), "already disposed" );
+    OSL_ENSURE( GetFrm() && GetMap(), "already disposed" );
 
     Window *pWin = GetMap() ? GetMap()->GetShell()->GetWin() : 0;
     if( pWin )
diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx
index d0e76d103ba7..4bb48d0b826d 100644
--- a/sw/source/core/access/accframe.cxx
+++ b/sw/source/core/access/accframe.cxx
@@ -361,7 +361,7 @@ sal_Bool SwAccessibleFrame::IsEditable( ViewShell *pVSh ) const
     if( !pFrm )
         return sal_False;
 
-    ASSERT( pVSh, "no view shell" );
+    OSL_ENSURE( pVSh, "no view shell" );
     if( pVSh && (pVSh->GetViewOptions()->IsReadonly() ||
                  pVSh->IsPreView()) )
         return sal_False;
@@ -378,7 +378,7 @@ sal_Bool SwAccessibleFrame::IsOpaque( ViewShell *pVSh ) const
     if( !aFrm.GetSwFrm() )
         return sal_False;
 
-    ASSERT( pVSh, "no view shell" );
+    OSL_ENSURE( pVSh, "no view shell" );
     if( !pVSh )
         return sal_False;
 
diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx
index b5ce138c7ada..5ab12b068678 100644
--- a/sw/source/core/access/accframebase.cxx
+++ b/sw/source/core/access/accframebase.cxx
@@ -90,7 +90,7 @@ void SwAccessibleFrameBase::GetStates(
     if( IsSelected() )
     {
         rStateSet.AddState( AccessibleStateType::SELECTED );
-        ASSERT( bIsSelected, "bSelected out of sync" );
+        OSL_ENSURE( bIsSelected, "bSelected out of sync" );
         ::rtl::Reference < SwAccessibleContext > xThis( this );
         GetMap()->SetCursorContext( xThis );
 
@@ -199,7 +199,7 @@ void SwAccessibleFrameBase::_InvalidateFocus()
             osl::MutexGuard aGuard( aMutex );
             bSelected = bIsSelected;
         }
-        ASSERT( bSelected, "focus object should be selected" );
+        OSL_ENSURE( bSelected, "focus object should be selected" );
 
         FireStateChangedEvent( AccessibleStateType::FOCUSED,
                                pWin->HasFocus() && bSelected );
@@ -227,16 +227,16 @@ void SwAccessibleFrameBase::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew)
         if(  pFlyFrm )
         {
             const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt();
-            ASSERT( pFrmFmt == GetRegisteredIn(), "invalid frame" );
+            OSL_ENSURE( pFrmFmt == GetRegisteredIn(), "invalid frame" );
 
             OUString sOldName( GetName() );
-            ASSERT( !pOld ||
+            OSL_ENSURE( !pOld ||
                     static_cast < SwStringMsgPoolItem * >( pOld )->GetString() == String( sOldName ),
                     "invalid old name" );
 
             const String& rNewName = pFrmFmt->GetName();
             SetName( rNewName );
-            ASSERT( !pNew ||
+            OSL_ENSURE( !pNew ||
                     static_cast < SwStringMsgPoolItem * >( pNew )->GetString() == rNewName,
                     "invalid new name" );
 
diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx
index a63e9e09d4d9..1e72847fbe3f 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -98,7 +98,7 @@ SwAccessibleChild::SwAccessibleChild( const SwFrm* pFrm,
     {
         Init( pWindow );
     }
-    ASSERT( (!pFrm || pFrm == mpFrm) &&
+    OSL_ENSURE( (!pFrm || pFrm == mpFrm) &&
             (!pDrawObj || pDrawObj == mpDrawObj) &&
             (!pWindow || pWindow == mpWindow),
             "invalid frame/object/window combination" );
@@ -347,7 +347,7 @@ const SwFrm* SwAccessibleChild::GetParent( const sal_Bool bInPagePreview ) const
             {
                 // For FLY_AS_CHAR the parent is the anchor
                 pParent = pFly->GetAnchorFrm();
-                ASSERT( SwAccessibleChild( pParent ).IsAccessible( bInPagePreview ),
+                OSL_ENSURE( SwAccessibleChild( pParent ).IsAccessible( bInPagePreview ),
                         "parent is not accessible" );
             }
             else
@@ -374,16 +374,16 @@ const SwFrm* SwAccessibleChild::GetParent( const sal_Bool bInPagePreview ) const
     {
         const SwDrawContact *pContact =
             static_cast< const SwDrawContact* >( GetUserCall( mpDrawObj ) );
-        ASSERT( pContact, "sdr contact is missing" );
+        OSL_ENSURE( pContact, "sdr contact is missing" );
         if( pContact )
         {
             const SwFrmFmt *pFrmFmt = pContact->GetFmt();
-            ASSERT( pFrmFmt, "frame format is missing" );
+            OSL_ENSURE( pFrmFmt, "frame format is missing" );
             if( pFrmFmt && FLY_AS_CHAR == pFrmFmt->GetAnchor().GetAnchorId() )
             {
                 // For FLY_AS_CHAR the parent is the anchor
                 pParent = pContact->GetAnchorFrm();
-                ASSERT( SwAccessibleChild( pParent ).IsAccessible( bInPagePreview ),
+                OSL_ENSURE( SwAccessibleChild( pParent ).IsAccessible( bInPagePreview ),
                         "parent is not accessible" );
 
             }
diff --git a/sw/source/core/access/accfrmobjmap.cxx b/sw/source/core/access/accfrmobjmap.cxx
index 3ace3e1a9667..e7fd8644da77 100644
--- a/sw/source/core/access/accfrmobjmap.cxx
+++ b/sw/source/core/access/accfrmobjmap.cxx
@@ -71,7 +71,7 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea,
 
     if ( rFrm.IsPageFrm() )
     {
-        ASSERT( bVisibleChildrenOnly, "page frame within tab frame???" );
+        OSL_ENSURE( bVisibleChildrenOnly, "page frame within tab frame???" );
         const SwPageFrm *pPgFrm =
             static_cast< const SwPageFrm * >( &rFrm );
         const SwSortedObjs *pObjs = pPgFrm->GetSortedObjs();
diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx
index cf681c0c6380..6b239b04e0e2 100644
--- a/sw/source/core/access/acchyperlink.cxx
+++ b/sw/source/core/access/acchyperlink.cxx
@@ -94,7 +94,7 @@ sal_Bool SAL_CALL SwAccessibleHyperlink::doAccessibleAction( sal_Int32 nIndex )
             {
                 LoadURL( rINetFmt.GetValue(), pVSh, URLLOAD_NOFILTER,
                          &rINetFmt.GetTargetFrame() );
-                ASSERT( pTxtAttr == rINetFmt.GetTxtINetFmt(),
+                OSL_ENSURE( pTxtAttr == rINetFmt.GetTxtINetFmt(),
                          "lost my txt attr" );
                 const SwTxtINetFmt* pTxtAttr2 = rINetFmt.GetTxtINetFmt();
                 if( pTxtAttr2 )
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 2d48e504e9ab..f8215eac6e9f 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -95,12 +95,12 @@ class SwAccessibleContextMap_Impl: public _SwAccessibleContextMap_Impl
 {
 public:
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     sal_Bool mbLocked;
 #endif
 
     SwAccessibleContextMap_Impl()
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         : mbLocked( sal_False )
 #endif
     {}
@@ -165,7 +165,7 @@ void SwDrawModellListener_Impl::Notify( SfxBroadcaster& /*rBC*/,
         return;
     }
 
-    ASSERT( mpDrawModel, "draw model listener is disposed" );
+    OSL_ENSURE( mpDrawModel, "draw model listener is disposed" );
     if( !mpDrawModel )
         return;
 
@@ -218,11 +218,11 @@ class SwAccessibleShapeMap_Impl: public _SwAccessibleShapeMap_Impl
 
 public:
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     sal_Bool mbLocked;
 #endif
     SwAccessibleShapeMap_Impl( SwAccessibleMap *pMap )
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         : mbLocked( sal_False )
 #endif
     {
@@ -296,7 +296,7 @@ SwAccessibleObjShape_Impl
             }
             ++aIter;
         }
-        ASSERT( pSelShape == pShape, "copying shapes went wrong!" );
+        OSL_ENSURE( pSelShape == pShape, "copying shapes went wrong!" );
     }
 
     if( pSelStart )
@@ -345,7 +345,7 @@ public:
           meType( eT ),
           mnStates( 0 )
     {
-        ASSERT( SwAccessibleEvent_Impl::DISPOSE == meType,
+        OSL_ENSURE( SwAccessibleEvent_Impl::DISPOSE == meType,
                 "wrong event constructor, DISPOSE only" );
     }
 
@@ -353,7 +353,7 @@ public:
         : meType( eT ),
           mnStates( 0 )
     {
-        ASSERT( SwAccessibleEvent_Impl::SHAPE_SELECTION == meType,
+        OSL_ENSURE( SwAccessibleEvent_Impl::SHAPE_SELECTION == meType,
                 "wrong event constructor, SHAPE_SELECTION only" );
     }
 
@@ -367,7 +367,7 @@ public:
           meType( eT ),
           mnStates( 0 )
     {
-        ASSERT( SwAccessibleEvent_Impl::CHILD_POS_CHANGED == meType ||
+        OSL_ENSURE( SwAccessibleEvent_Impl::CHILD_POS_CHANGED == meType ||
                 SwAccessibleEvent_Impl::POS_CHANGED == meType,
                 "wrong event constructor, (CHILD_)POS_CHANGED only" );
     }
@@ -381,7 +381,7 @@ public:
           meType( eT ),
           mnStates( _nStates )
     {
-        ASSERT( SwAccessibleEvent_Impl::CARET_OR_STATES == meType,
+        OSL_ENSURE( SwAccessibleEvent_Impl::CARET_OR_STATES == meType,
                 "wrong event constructor, CARET_OR_STATES only" );
     }
 
@@ -679,7 +679,7 @@ void SwAccPreviewData::Update( const SwAccessibleMap& rAccMap,
 void SwAccPreviewData::InvalidateSelection( const SwPageFrm* _pSelectedPageFrm )
 {
     mpSelPage = _pSelectedPageFrm;
-    ASSERT( mpSelPage, "selected page not found" );
+    OSL_ENSURE( mpSelPage, "selected page not found" );
 }
 
 struct ContainsPredicate
@@ -815,7 +815,7 @@ void SwAccessibleMap::FireEvent( const SwAccessibleEvent_Impl& rEvent )
                                        rEvent.GetOldBox() );
             break;
         case SwAccessibleEvent_Impl::DISPOSE:
-            ASSERT( xAccImpl.is(),
+            OSL_ENSURE( xAccImpl.is(),
                     "dispose event has been stored" );
             break;
         case SwAccessibleEvent_Impl::INVALID_ATTR:
@@ -867,7 +867,7 @@ void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent )
     {
         // While events are fired new ones are generated. They have to be fired
         // now. This does not work for DISPOSE events!
-        ASSERT( rEvent.GetType() != SwAccessibleEvent_Impl::DISPOSE,
+        OSL_ENSURE( rEvent.GetType() != SwAccessibleEvent_Impl::DISPOSE,
                 "dispose event while firing events" );
         FireEvent( rEvent );
     }
@@ -879,7 +879,7 @@ void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent )
         if( aIter != mpEventMap->end() )
         {
             SwAccessibleEvent_Impl aEvent( *(*aIter).second );
-            ASSERT( aEvent.GetType() != SwAccessibleEvent_Impl::DISPOSE,
+            OSL_ENSURE( aEvent.GetType() != SwAccessibleEvent_Impl::DISPOSE,
                     "dispose events should not be stored" );
             sal_Bool bAppendEvent = sal_True;
             switch( rEvent.GetType() )
@@ -888,7 +888,7 @@ void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent )
                 // A CARET_OR_STATES event is added to any other
                 // event only. It is broadcasted after any other event, so the
                 // event should be put to the back.
-                ASSERT( aEvent.GetType() != SwAccessibleEvent_Impl::CHILD_POS_CHANGED,
+                OSL_ENSURE( aEvent.GetType() != SwAccessibleEvent_Impl::CHILD_POS_CHANGED,
                         "invalid event combination" );
                 aEvent.SetStates( rEvent.GetAllStates() );
                 break;
@@ -898,7 +898,7 @@ void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent )
                 // POS_CHANGED event.
                 // Therefor, the event's type has to be adapted and the event
                 // has to be put at the end.
-                ASSERT( aEvent.GetType() != SwAccessibleEvent_Impl::CHILD_POS_CHANGED,
+                OSL_ENSURE( aEvent.GetType() != SwAccessibleEvent_Impl::CHILD_POS_CHANGED,
                         "invalid event combination" );
                 if( aEvent.GetType() == SwAccessibleEvent_Impl::CARET_OR_STATES )
                     aEvent.SetType( SwAccessibleEvent_Impl::INVALID_CONTENT );
@@ -908,7 +908,7 @@ void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent )
                 // flags) as well as INVALID_CONTENT. The old box position
                 // has to be stored however if the old event is not a
                 // POS_CHANGED itself.
-                ASSERT( aEvent.GetType() != SwAccessibleEvent_Impl::CHILD_POS_CHANGED,
+                OSL_ENSURE( aEvent.GetType() != SwAccessibleEvent_Impl::CHILD_POS_CHANGED,
                         "invalid event combination" );
                 if( aEvent.GetType() != SwAccessibleEvent_Impl::POS_CHANGED )
                     aEvent.SetOldBox( rEvent.GetOldBox() );
@@ -919,11 +919,11 @@ void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent )
                 // events. The only action that needs to be done again is
                 // to put the old event to the back. The new one cannot be used,
                 // because we are interested in the old frame bounds.
-                ASSERT( aEvent.GetType() == SwAccessibleEvent_Impl::CHILD_POS_CHANGED,
+                OSL_ENSURE( aEvent.GetType() == SwAccessibleEvent_Impl::CHILD_POS_CHANGED,
                         "invalid event combination" );
                 break;
             case SwAccessibleEvent_Impl::SHAPE_SELECTION:
-                ASSERT( aEvent.GetType() == SwAccessibleEvent_Impl::SHAPE_SELECTION,
+                OSL_ENSURE( aEvent.GetType() == SwAccessibleEvent_Impl::SHAPE_SELECTION,
                         "invalid event combination" );
                 break;
             case SwAccessibleEvent_Impl::DISPOSE:
@@ -934,7 +934,7 @@ void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent )
                 bAppendEvent = sal_False;
                 break;
             case SwAccessibleEvent_Impl::INVALID_ATTR:
-                ASSERT( aEvent.GetType() == SwAccessibleEvent_Impl::INVALID_ATTR,
+                OSL_ENSURE( aEvent.GetType() == SwAccessibleEvent_Impl::INVALID_ATTR,
                         "invalid event combination" );
                 break;
             }
@@ -963,8 +963,8 @@ void SwAccessibleMap::InvalidateCursorPosition(
 {
     SwAccessibleContext *pAccImpl =
         static_cast< SwAccessibleContext *>( rAcc.get() );
-    ASSERT( pAccImpl, "no caret context" );
-    ASSERT( pAccImpl->GetFrm(), "caret context is disposed" );
+    OSL_ENSURE( pAccImpl, "no caret context" );
+    OSL_ENSURE( pAccImpl->GetFrm(), "caret context is disposed" );
     if( GetShell()->ActionPend() )
     {
         SwAccessibleEvent_Impl aEvent( SwAccessibleEvent_Impl::CARET_OR_STATES,
@@ -1175,8 +1175,8 @@ SwAccessibleMap::~SwAccessibleMap()
 
     {
         osl::MutexGuard aGuard( maMutex );
-#ifdef DBG_UTIL
-        ASSERT( !mpFrmMap || mpFrmMap->empty(),
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( !mpFrmMap || mpFrmMap->empty(),
                 "Frame map should be empty after disposing the root frame" );
         if( mpFrmMap )
         {
@@ -1193,7 +1193,7 @@ SwAccessibleMap::~SwAccessibleMap()
                 ++aIter;
             }
         }
-        ASSERT( !mpShapeMap || mpShapeMap->empty(),
+        OSL_ENSURE( !mpShapeMap || mpShapeMap->empty(),
                 "Object map should be empty after disposing the root frame" );
         if( mpShapeMap )
         {
@@ -1226,8 +1226,8 @@ SwAccessibleMap::~SwAccessibleMap()
 
     {
         osl::MutexGuard aGuard( maEventMutex );
-#ifdef DBG_UTIL
-        ASSERT( !(mpEvents || mpEventMap), "pending events" );
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( !(mpEvents || mpEventMap), "pending events" );
         if( mpEvents )
         {
             SwAccessibleEventList_Impl::iterator aIter = mpEvents->begin();
@@ -1265,13 +1265,13 @@ uno::Reference< XAccessible > SwAccessibleMap::_GetDocumentView(
         if( !mpFrmMap )
         {
             mpFrmMap = new SwAccessibleContextMap_Impl;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
             mpFrmMap->mbLocked = sal_False;
 #endif
         }
 
-#ifdef DBG_UTIL
-        ASSERT( !mpFrmMap->mbLocked, "Map is locked" );
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( !mpFrmMap->mbLocked, "Map is locked" );
         mpFrmMap->mbLocked = sal_True;
 #endif
 
@@ -1302,7 +1302,7 @@ uno::Reference< XAccessible > SwAccessibleMap::_GetDocumentView(
             }
         }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         mpFrmMap->mbLocked = sal_False;
 #endif
     }
@@ -1418,7 +1418,7 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm,
                 }
                 xAcc = pAcc;
 
-                ASSERT( xAcc.is(), "unknown frame type" );
+                OSL_ENSURE( xAcc.is(), "unknown frame type" );
                 if( xAcc.is() )
                 {
                     if( aIter != mpFrmMap->end() )
@@ -1519,7 +1519,7 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext(
                 }
                 xAcc = pAcc;
 
-                ASSERT( xAcc.is(), "unknown shape type" );
+                OSL_ENSURE( xAcc.is(), "unknown shape type" );
                 if( xAcc.is() )
                 {
                     pAcc->Init();
@@ -1580,7 +1580,7 @@ void SwAccessibleMap::RemoveContext( const SwFrm *pFrm )
             {
                 SwAccessibleContext *pOldAccImpl =
                     static_cast< SwAccessibleContext *>( xOldAcc.get() );
-                ASSERT( pOldAccImpl->GetFrm(), "old caret context is disposed" );
+                OSL_ENSURE( pOldAccImpl->GetFrm(), "old caret context is disposed" );
                 if( pOldAccImpl->GetFrm() == pFrm )
                 {
                     xOldAcc.clear();    // get an empty ref
@@ -1634,7 +1634,7 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm,
     // because that's the one that is evaluated in the layout. The frame
     // might not be accessible anyway. That's the case for cell frames that
     // contain further cells.
-    ASSERT( !aFrmOrObj.GetSwFrm() || aFrmOrObj.GetSwFrm()->IsAccessibleFrm(),
+    OSL_ENSURE( !aFrmOrObj.GetSwFrm() || aFrmOrObj.GetSwFrm()->IsAccessibleFrm(),
             "non accessible frame should be disposed" );
 
     if( aFrmOrObj.IsAccessible( GetShell()->IsPreView() ) )
@@ -1931,7 +1931,7 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
             const SwFrm *pFlyFrm = pFESh->GetCurrFlyFrm();
             if( pFlyFrm )
             {
-                ASSERT( !pFrm || pFrm->FindFlyFrm() == pFlyFrm,
+                OSL_ENSURE( !pFrm || pFrm->FindFlyFrm() == pFlyFrm,
                         "cursor is not contained in fly frame" );
                 aFrmOrObj = pFlyFrm;
             }
@@ -1943,7 +1943,7 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
         }
     }
 
-    ASSERT( bShapeSelected || aFrmOrObj.IsAccessible(GetShell()->IsPreView()),
+    OSL_ENSURE( bShapeSelected || aFrmOrObj.IsAccessible(GetShell()->IsPreView()),
             "frame is not accessible" );
 
     uno::Reference < XAccessible > xOldAcc;
@@ -2633,7 +2633,7 @@ SwAccessibleSelectedParas_Impl* SwAccessibleMap::_BuildSelectedParas()
                          pFrm;
                          pFrm = (SwFrm*)aIter.Next() )
                     {
-                        ASSERT( dynamic_cast<SwTxtFrm*>(pFrm),
+                        OSL_ENSURE( dynamic_cast<SwTxtFrm*>(pFrm),
                                 "<SwAccessibleMap::_BuildSelectedParas()> - unexpected frame type" );
                         SwTxtFrm* pTxtFrm( dynamic_cast<SwTxtFrm*>(pFrm) );
                         if ( pTxtFrm )
@@ -2734,7 +2734,7 @@ void SwAccessibleMap::InvalidateTextSelectionOfAllParas()
                     {
                         const SwTxtFrm* pTxtFrm(
                             dynamic_cast<const SwTxtFrm*>(xAccImpl->GetFrm()) );
-                        ASSERT( pTxtFrm,
+                        OSL_ENSURE( pTxtFrm,
                                 "<SwAccessibleMap::_SubmitTextSelectionChangedEvents()> - unexcepted type of frame" );
                         if ( pTxtFrm )
                         {
@@ -2762,7 +2762,7 @@ void SwAccessibleMap::InvalidateTextSelectionOfAllParas()
                 {
                     const SwTxtFrm* pTxtFrm(
                             dynamic_cast<const SwTxtFrm*>(xAccImpl->GetFrm()) );
-                    ASSERT( pTxtFrm,
+                    OSL_ENSURE( pTxtFrm,
                             "<SwAccessibleMap::_SubmitTextSelectionChangedEvents()> - unexcepted type of frame" );
                     if ( pTxtFrm )
                     {
diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index e5790414e24c..44590d5d5962 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -106,7 +106,7 @@ void SwAccessibleNoTextFrame::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew)
     }
 
     const SwNoTxtNode *pNd = GetNoTxtNode();
-    ASSERT( pNd == aDepend.GetRegisteredIn(), "invalid frame" );
+    OSL_ENSURE( pNd == aDepend.GetRegisteredIn(), "invalid frame" );
     switch( nWhich )
     {
         // --> OD 2009-07-14 #i73249#
@@ -158,20 +158,6 @@ void SwAccessibleNoTextFrame::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew)
             }
         }
         break;
-        // <--
-        /*
-    case RES_OBJECTDYING:
-        if( aDepend.GetRegisteredIn() ==
-                static_cast< SwModify *>( static_cast< SwPtrMsgPoolItem * >( pOld )->pObject ) )
-            const_cast < SwModify *>( aDepend.GetRegisteredIn()->Remove( aDepend );
-        break;
-
-    case RES_FMT_CHG:
-        if( static_cast< SwFmtChg * >(pNew)->pChangedFmt == GetRegisteredIn() &&
-            static_cast< SwFmtChg * >(pOld)->pChangedFmt->IsFmtInDTOR() )
-            pRegisteredIn->Remove( this );
-        break;
-    */
     }
 }
 
diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx
index 0cee1c1f2b5e..2b5886e026d2 100644
--- a/sw/source/core/access/accpage.cxx
+++ b/sw/source/core/access/accpage.cxx
@@ -69,7 +69,7 @@ void SwAccessiblePage::GetStates(
     // FOCUSED
     if( IsSelected() )
     {
-        ASSERT( bIsSelected, "bSelected out of sync" );
+        OSL_ENSURE( bIsSelected, "bSelected out of sync" );
         ::rtl::Reference < SwAccessibleContext > xThis( this );
         GetMap()->SetCursorContext( xThis );
 
@@ -117,7 +117,7 @@ void SwAccessiblePage::_InvalidateFocus()
             osl::MutexGuard aGuard( aMutex );
             bSelected = bIsSelected;
         }
-        ASSERT( bSelected, "focus object should be selected" );
+        OSL_ENSURE( bSelected, "focus object should be selected" );
 
         FireStateChangedEvent( AccessibleStateType::FOCUSED,
                                pWin->HasFocus() && bSelected );
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 1da057ee7b70..8a1a24ea02ec 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -484,7 +484,7 @@ void SwAccessibleParagraph::_InvalidateFocus()
             osl::MutexGuard aGuard( aMutex );
             nPos = nOldCaretPos;
         }
-        ASSERT( nPos != -1, "focus object should be selected" );
+        OSL_ENSURE( nPos != -1, "focus object should be selected" );
 
         FireStateChangedEvent( AccessibleStateType::FOCUSED,
                                pWin->HasFocus() && nPos != -1 );
@@ -877,7 +877,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleParagraph::getAccess
     utl::AccessibleRelationSetHelper* pHelper = new utl::AccessibleRelationSetHelper();
 
     const SwTxtFrm* pTxtFrm = dynamic_cast<const SwTxtFrm*>(GetFrm());
-    ASSERT( pTxtFrm,
+    OSL_ENSURE( pTxtFrm,
             "<SwAccessibleParagraph::getAccessibleRelationSet()> - missing text frame");
     if ( pTxtFrm )
     {
@@ -1147,7 +1147,7 @@ sal_Int32 SwAccessibleParagraph::getCaretPosition()
     sal_Int32 nRet = GetCaretPos();
     {
         osl::MutexGuard aOldCaretPosGuard( aMutex );
-        ASSERT( nRet == nOldCaretPos, "caret pos out of sync" );
+        OSL_ENSURE( nRet == nOldCaretPos, "caret pos out of sync" );
         nOldCaretPos = nRet;
     }
     if( -1 != nRet )
@@ -1256,37 +1256,6 @@ uno::Sequence<PropertyValue> SwAccessibleParagraph::getCharacterAttributes(
         ++i;
     }
 
-//    // create a (dummy) text portion for the sole purpose of calling
-//    // getPropertyValues on it
-//    Reference<XMultiPropertySet> xPortion = CreateUnoPortion( nIndex, nIndex + 1 );
-
-//    // get values
-//    Sequence<OUString> aNames = getAttributeNames();
-//    sal_Int32 nLength = aNames.getLength();
-//    Sequence<Any> aAnys( nLength );
-//    aAnys = xPortion->getPropertyValues( aNames );
-
-//    // copy names + anys into return sequence
-//    Sequence<PropertyValue> aValues( aNames.getLength() );
-//    const OUString* pNames = aNames.getConstArray();
-//    const Any* pAnys = aAnys.getConstArray();
-//    PropertyValue* pValues = aValues.getArray();
-//    for( sal_Int32 i = 0; i < nLength; i++ )
-//    {
-//        PropertyValue& rValue = pValues[i];
-//        rValue.Name = pNames[i];
-//        rValue.Value = pAnys[i];
-//        rValue.Handle = -1;                         // handle not supported
-//        rValue.State = PropertyState_DIRECT_VALUE;  // states not supported
-//    }
-
-//    // adjust background color if we're in a gray portion
-//    DBG_ASSERT( pValues[CHAR_BACK_COLOR_POS].Name.
-//                equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CharBackColor")),
-//                "Please adjust CHAR_BACK_COLOR_POS constant." );
-//    if( GetPortionData().IsInGrayPortion( nIndex ) )
-//        pValues[CHAR_BACK_COLOR_POS].Value <<= SwViewOption::GetFieldShadingsColor().GetColor();
-
     return aValues;
 }
 
@@ -1330,7 +1299,7 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl(
         pSet->Put( aParaSet );
     }
     // get default character attributes and merge these into <pSet>
-    ASSERT( pTxtNode->GetTxtColl(),
+    OSL_ENSURE( pTxtNode->GetTxtColl(),
             "<SwAccessibleParagraph::_getDefaultAttributesImpl(..)> - missing paragraph style. Serious defect, please inform OD!" );
     if ( pTxtNode->GetTxtColl() )
     {
@@ -2384,9 +2353,7 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL
 
     uno::Reference< XAccessibleHyperlink > xRet;
 
-    // --> OD 2007-06-27 #i77108# - provide hyperlinks also in editable documents.
-//    if( !IsEditableState() )
-    // <--
+    // #i77108#
     {
         const SwTxtFrm *pTxtFrm = static_cast<const SwTxtFrm*>( GetFrm() );
         SwHyperlinkIter_Impl aHIter( pTxtFrm );
@@ -2445,9 +2412,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkIndex( sal_Int32 nCharInde
     }
 
     sal_Int32 nRet = -1;
-    // --> OD 2007-06-27 #i77108# - provide hyperlinks also in editable documents.
-//    if( !IsEditableState() )
-    // <--
+    // #i77108#
     {
         const SwTxtFrm *pTxtFrm = static_cast<const SwTxtFrm*>( GetFrm() );
         SwHyperlinkIter_Impl aHIter( pTxtFrm );
diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx
index 65119ef1710a..bdfbf6fcda0a 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -466,9 +466,7 @@ size_t SwAccessiblePortionData::FindLastBreak(
     size_t nResult = FindBreak( rPositions, nValue );
 
     // skip 'zero-length' portions
-    // --> OD 2006-10-19 #i70538#
-    // consider size of <rPosition> and ignore last entry
-//    while( rPositions[nResult+1] <= nValue )
+    // #i70538# consider size of <rPosition> and ignore last entry
     while ( nResult < rPositions.size() - 2 &&
             rPositions[nResult+1] <= nValue )
     {
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index 70e3a246fdc4..8b903b9b7032 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -237,17 +237,17 @@ sal_Bool SwAccessibleTableData_Impl::FindCell(
     {
         const SwAccessibleChild& rLower = *aIter;
         const SwFrm *pLower = rLower.GetSwFrm();
-        ASSERT( pLower, "child should be a frame" );
+        OSL_ENSURE( pLower, "child should be a frame" );
         if( pLower )
         {
             if( rLower.IsAccessible( mbIsInPagePreview ) )
             {
-                ASSERT( pLower->IsCellFrm(), "lower is not a cell frame" );
+                OSL_ENSURE( pLower->IsCellFrm(), "lower is not a cell frame" );
                 const SwRect& rFrm = pLower->Frm();
                 if( rFrm.Right() >= rPos.X() && rFrm.Bottom() >= rPos.Y() )
                 {
                     // We have found the cell
-                    ASSERT( rFrm.Left() <= rPos.X() && rFrm.Top() <= rPos.Y(),
+                    OSL_ENSURE( rFrm.Left() <= rPos.X() && rFrm.Top() <= rPos.Y(),
                             "find frame moved to far!" );
                     bFound = sal_True;
                     if( !bExact ||
@@ -289,13 +289,13 @@ void SwAccessibleTableData_Impl::GetSelection(
     {
         const SwAccessibleChild& rLower = *aIter;
         const SwFrm *pLower = rLower.GetSwFrm();
-        ASSERT( pLower, "child should be a frame" );
+        OSL_ENSURE( pLower, "child should be a frame" );
         const SwRect& rBox = rLower.GetBox( mrAccMap );
         if( pLower && rBox.IsOver( rArea ) )
         {
             if( rLower.IsAccessible( mbIsInPagePreview ) )
             {
-                ASSERT( pLower->IsCellFrm(), "lower is not a cell frame" );
+                OSL_ENSURE( pLower->IsCellFrm(), "lower is not a cell frame" );
                 const SwCellFrm *pCFrm =
                         static_cast < const SwCellFrm * >( pLower );
                 SwTableBox *pBox =
@@ -561,7 +561,7 @@ inline SwAccAllTableSelHander_Impl::SwAccAllTableSelHander_Impl( sal_Int32 nSize
 
 uno::Sequence < sal_Int32 > SwAccAllTableSelHander_Impl::GetSelSequence()
 {
-    ASSERT( nCount >= 0, "underflow" );
+    OSL_ENSURE( nCount >= 0, "underflow" );
     uno::Sequence < sal_Int32 > aRet( nCount );
     sal_Int32 *pRet = aRet.getArray();
     sal_Int32 nPos = 0;
@@ -575,7 +575,7 @@ uno::Sequence < sal_Int32 > SwAccAllTableSelHander_Impl::GetSelSequence()
         }
     }
 
-    ASSERT( nPos == nCount, "count is wrong" );
+    OSL_ENSURE( nPos == nCount, "count is wrong" );
 
     return aRet;
 }
@@ -583,9 +583,9 @@ uno::Sequence < sal_Int32 > SwAccAllTableSelHander_Impl::GetSelSequence()
 void SwAccAllTableSelHander_Impl::Unselect( sal_Int32 nRowOrCol,
                                             sal_Int32 nExt )
 {
-    ASSERT( static_cast< size_t >( nRowOrCol ) < aSelected.size(),
+    OSL_ENSURE( static_cast< size_t >( nRowOrCol ) < aSelected.size(),
              "index to large" );
-    ASSERT( static_cast< size_t >( nRowOrCol+nExt ) <= aSelected.size(),
+    OSL_ENSURE( static_cast< size_t >( nRowOrCol+nExt ) <= aSelected.size(),
              "extent to large" );
     while( nExt )
     {
@@ -751,7 +751,7 @@ void SwAccessibleTable::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew)
         if( pTabFrm )
         {
             const SwFrmFmt *pFrmFmt = pTabFrm->GetFmt();
-            ASSERT( pFrmFmt == GetRegisteredIn(), "invalid frame" );
+            OSL_ENSURE( pFrmFmt == GetRegisteredIn(), "invalid frame" );
 
             OUString sOldName( GetName() );
 
@@ -919,7 +919,7 @@ OUString SAL_CALL SwAccessibleTable::getAccessibleRowDescription(
     {
         uno::Reference< XAccessible > xRowHeaderCell =
                         xTableRowHeader->getAccessibleCellAt( nRow, 0 );
-        ASSERT( xRowHeaderCell.is(),
+        OSL_ENSURE( xRowHeaderCell.is(),
                 "<SwAccessibleTable::getAccessibleRowDescription(..)> - missing row header cell -> serious issue." );
         uno::Reference< XAccessibleContext > xRowHeaderCellContext =
                                     xRowHeaderCell->getAccessibleContext();
@@ -955,7 +955,7 @@ OUString SAL_CALL SwAccessibleTable::getAccessibleColumnDescription(
     {
         uno::Reference< XAccessible > xColumnHeaderCell =
                         xTableColumnHeader->getAccessibleCellAt( 0, nColumn );
-        ASSERT( xColumnHeaderCell.is(),
+        OSL_ENSURE( xColumnHeaderCell.is(),
                 "<SwAccessibleTable::getAccessibleColumnDescription(..)> - missing column header cell -> serious issue." );
         uno::Reference< XAccessibleContext > xColumnHeaderCellContext =
                                     xColumnHeaderCell->getAccessibleContext();
@@ -1271,7 +1271,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRow( sal_Int32 nChildIndex )
     }
     else
     {
-        ASSERT( !aCell.IsValid(), "SwAccessibleTable::getAccessibleColumn:"
+        OSL_ENSURE( !aCell.IsValid(), "SwAccessibleTable::getAccessibleColumn:"
                 "aCell not expected to be valid.");
 
         throw lang::IndexOutOfBoundsException();
@@ -1310,7 +1310,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumn(
     }
     else
     {
-        ASSERT( !aCell.IsValid(), "SwAccessibleTable::getAccessibleColumn:"
+        OSL_ENSURE( !aCell.IsValid(), "SwAccessibleTable::getAccessibleColumn:"
                 "aCell not expected to be valid.");
 
         throw lang::IndexOutOfBoundsException();
@@ -1372,7 +1372,7 @@ void SwAccessibleTable::DisposeChild( const SwAccessibleChild& rChildFrmOrObj,
     SolarMutexGuard aGuard;
 
     const SwFrm *pFrm = rChildFrmOrObj.GetSwFrm();
-    ASSERT( pFrm, "frame expected" );
+    OSL_ENSURE( pFrm, "frame expected" );
     if( HasTableData() )
     {
         FireTableChangeEvent( GetTableData() );
@@ -1396,7 +1396,7 @@ void SwAccessibleTable::InvalidateChildPosOrSize( const SwAccessibleChild& rChil
 
     if( HasTableData() )
     {
-        ASSERT( !HasTableData() ||
+        OSL_ENSURE( !HasTableData() ||
                 GetFrm()->Frm().Pos() == GetTableData().GetTablePos(),
                 "table has invalid position" );
         if( HasTableData() )
@@ -1478,14 +1478,6 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild(
     const SwStartNode* pStartNode = pBox->GetSttNd();
     if( pSelectedTable == NULL || !pCrsrShell->GetTblCrs() )
     {
-        // if we're in the wrong table, or there's no table selection
-        // at all, then select the current table cell.
-//      SwPaM* pPaM = pCrsrShell->GetCrsr();
-//      pPaM->DeleteMark();
-//      *(pPaM->GetPoint()) = SwPosition( *pStartNode );
-//      pPaM->Move( fnMoveForward, fnGoNode );
-// //   pCrsrShell->SelTblBox();
-
         pCrsrShell->StartAction();
         // Set cursor into current cell. This deletes any table cursor.
         SwPaM aPaM( *pStartNode );
@@ -1515,20 +1507,6 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild(
         *(aPaM.GetMark()) = *pPaM->GetMark();
         Select( aPaM );
 
-        // if only one box is selected, we select this one in
-        // order to maintain our table selection
-//        if( aPaM.GetPoint()->nNode.GetNode().FindTableBoxStartNode() ==
-//           aPaM.GetMark()->nNode.GetNode().FindTableBoxStartNode() )
-//        {
-// //            pCrsrShell->SelTblBox();
-//         }
-//         else
-//         {
-            // finally; set the selection. This will call UpdateCursor
-            // on the cursor shell, too.
-//            pCrsrShell->KillPams();
- //           pCrsrShell->SetSelection( aPaM );
-//         }
     }
 }
 
diff --git a/sw/source/core/access/parachangetrackinginfo.cxx b/sw/source/core/access/parachangetrackinginfo.cxx
index e3b9c4fd1b86..8dd2af0a0dd0 100644
--- a/sw/source/core/access/parachangetrackinginfo.cxx
+++ b/sw/source/core/access/parachangetrackinginfo.cxx
@@ -57,7 +57,7 @@ namespace {
 
         if ( !rTxtFrm.GetTxtNode() )
         {
-            ASSERT( false,
+            OSL_ENSURE( false,
                     "<initChangeTrackTextMarkupLists(..) - missing <SwTxtNode> instance!" );
             return;
         }
@@ -66,7 +66,7 @@ namespace {
         const IDocumentRedlineAccess* pIDocChangeTrack( rTxtNode.getIDocumentRedlineAccess() );
         if ( !pIDocChangeTrack )
         {
-            ASSERT( false,
+            OSL_ENSURE( false,
                     "<initChangeTrackTextMarkupLists(..) - missing <IDocumentRedlineAccess> instance!" );
             return;
         }
@@ -194,9 +194,9 @@ const SwWrongList* SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList( co
 
     if ( mpChangeTrackInsertionTextMarkupList == 0 )
     {
-        ASSERT( mpChangeTrackDeletionTextMarkupList == 0,
+        OSL_ENSURE( mpChangeTrackDeletionTextMarkupList == 0,
                 "<SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList(..) - <mpChangeTrackDeletionTextMarkupList> expected to be NULL." );
-        ASSERT( mpChangeTrackFormatChangeTextMarkupList == 0,
+        OSL_ENSURE( mpChangeTrackFormatChangeTextMarkupList == 0,
                 "<SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList(..) - <mpChangeTrackFormatChangeTextMarkupList> expected to be NULL." );
         initChangeTrackTextMarkupLists( mrTxtFrm,
                                         mpChangeTrackInsertionTextMarkupList,
@@ -223,7 +223,7 @@ const SwWrongList* SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList( co
         break;
         default:
         {
-            ASSERT( false,
+            OSL_ENSURE( false,
                     "<SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList(..)> - misusage - unexpected text markup type for change tracking." );
         }
     }
diff --git a/sw/source/core/access/textmarkuphelper.cxx b/sw/source/core/access/textmarkuphelper.cxx
index a56e76e33309..c8e09da350db 100644
--- a/sw/source/core/access/textmarkuphelper.cxx
+++ b/sw/source/core/access/textmarkuphelper.cxx
@@ -162,7 +162,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp
         }
         else
         {
-            ASSERT( false,
+            OSL_ENSURE( false,
                     "<SwTextMarkupHelper::getTextMarkup(..)> - missing <SwWrongArea> instance" );
         }
     }
@@ -204,7 +204,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp
         {
             const SwWrongArea* pTextMarkup =
                     pTextMarkupList->GetElement( static_cast<USHORT>(nTextMarkupIdx) );
-            ASSERT( pTextMarkup,
+            OSL_ENSURE( pTextMarkup,
                     "<SwTextMarkupHelper::getTextMarkup(..)> - missing <SwWrongArea> instance" );
             if ( pTextMarkup &&
                  pTextMarkup->mnPos <= nCoreCharIndex &&
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index 2ac6a31d8400..246b7ecfda4b 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -36,7 +36,7 @@
 #include <swcache.hxx>
 #include <swfntcch.hxx>
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 #include <unotextmarkup.hxx>
 #endif
 
@@ -107,7 +107,7 @@ SwClient::~SwClient()
     if( pRegisteredIn && pRegisteredIn->GetDepends() )
         pRegisteredIn->Remove( this );
 
-    ASSERT( !IsModifyLocked(), "Modify destroyed but locked." );
+    OSL_ENSURE( !IsModifyLocked(), "Modify destroyed but locked." );
 }
 
 
@@ -209,9 +209,7 @@ void SwModify::Modify( SfxPoolItem* pOldValue, SfxPoolItem* pNewValue )
 
     LockModify();
 
-#ifndef DBG_UTIL
-    bInModify = TRUE;
-#else
+#if OSL_DEBUG_LEVEL > 1
     if( !pOldValue )
         bInModify = TRUE;
     else
@@ -232,6 +230,8 @@ void SwModify::Modify( SfxPoolItem* pOldValue, SfxPoolItem* pNewValue )
         default:
             bInModify = TRUE;
         }
+#else
+    bInModify = TRUE;
 #endif
 
     SwClientIter aIter( *this );
@@ -280,16 +280,16 @@ BOOL SwModify::GetInfo( SfxPoolItem& rInfo ) const
 
 void SwModify::Add(SwClient *pDepend)
 {
-    ASSERT( !bInModify, "Client innerhalb des eigenen Modifies einfuegen?" );
+    OSL_ENSURE( !bInModify, "Client innerhalb des eigenen Modifies einfuegen?" );
 
     // nur wenn das hier noch nicht eingetragen ist einfuegen
     if(pDepend->pRegisteredIn != this )
     {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         SwClientIter* pTmp = pClientIters;
         while( pTmp )
         {
-            ASSERT( &pTmp->rRoot != pRoot,
+            OSL_ENSURE( &pTmp->rRoot != pRoot,
                 "Client beim angemeldeten ClientIter einfuegen?" );
             pTmp = pTmp->pNxtIter;
         }
@@ -331,7 +331,9 @@ void SwModify::Add(SwClient *pDepend)
 SwClient *SwModify::_Remove(SwClient * pDepend)
 {
     // FME 2007-07-16 #i79641# SwXTextMarkup is allowed to be removed ...
-    ASSERT( !bInModify || 0 != dynamic_cast<SwXTextMarkup*>(pDepend), "Client innerhalb des eigenen Modifies loeschen?" );
+#if OSL_DEBUG_LEVEL > 1
+    OSL_ENSURE( !bInModify || 0 != dynamic_cast<SwXTextMarkup*>(pDepend), "Client innerhalb des eigenen Modifies loeschen?" );
+#endif
 
     // loesche das Object aus der Liste und setze den
     // Registrierungs-Pointer zurueck
@@ -366,7 +368,7 @@ SwClient *SwModify::_Remove(SwClient * pDepend)
         pDepend->pRight = 0;
     }
     else {
-        ASSERT( FALSE, "SwModify::Remove(): pDepend nicht gefunden");
+        OSL_ENSURE( FALSE, "SwModify::Remove(): pDepend nicht gefunden");
     }
     pDepend->pRegisteredIn = 0;
     return pDepend;
@@ -495,7 +497,7 @@ SwClientIter::~SwClientIter()
             while( pTmp->pNxtIter != this )
                 if( 0 == ( pTmp = pTmp->pNxtIter ) )
                 {
-                    ASSERT( this, "wo ist mein Pointer" );
+                    OSL_ENSURE( this, "wo ist mein Pointer" );
                     return ;
                 }
             pTmp->pNxtIter = pNxtIter;
diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx
index 0d15e336957f..57a507cd66ad 100644
--- a/sw/source/core/attr/cellatr.cxx
+++ b/sw/source/core/attr/cellatr.cxx
@@ -60,7 +60,7 @@ SwTblBoxNumFormat::SwTblBoxNumFormat( UINT32 nFormat, BOOL bFlag )
 
 int SwTblBoxNumFormat::operator==( const SfxPoolItem& rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+    OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
     return GetValue() == ((SwTblBoxNumFormat&)rAttr).GetValue() &&
             bAuto == ((SwTblBoxNumFormat&)rAttr).bAuto;
 }
@@ -88,7 +88,7 @@ SwTblBoxFormula::SwTblBoxFormula( const String& rFormula )
 
 int SwTblBoxFormula::operator==( const SfxPoolItem& rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+    OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
     return GetFormula() == ((SwTblBoxFormula&)rAttr).GetFormula() &&
             pDefinedIn == ((SwTblBoxFormula&)rAttr).pDefinedIn;
 }
@@ -158,9 +158,6 @@ void SwTblBoxFormula::ChangeState( const SfxPoolItem* pItem )
             // setze das Value-Flag zurueck
             // JP 17.06.96: interne Darstellung auf alle Formeln
             //              (Referenzen auf andere Tabellen!!!)
-//          if( VF_CMD & pFld->GetFormat() )
-//              pFld->PtrToBoxNm( pUpdtFld->pTbl );
-//          else
                 ChgValid( FALSE );
             break;
         case TBL_BOXNAME:
@@ -251,7 +248,7 @@ SwTblBoxValue::SwTblBoxValue( const double nVal )
 
 int SwTblBoxValue::operator==( const SfxPoolItem& rAttr ) const
 {
-    ASSERT(SfxPoolItem::operator==(rAttr), "SwTblBoxValue: item not equal");
+    OSL_ENSURE(SfxPoolItem::operator==(rAttr), "SwTblBoxValue: item not equal");
     SwTblBoxValue const& rOther( static_cast<SwTblBoxValue const&>(rAttr) );
     // items with NaN should be equal to enable pooling
     return ::rtl::math::isNan(nValue)
diff --git a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
index 70668990a8af..d7e50547f509 100644
--- a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
+++ b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
@@ -65,7 +65,7 @@ SwFmtWrapInfluenceOnObjPos& SwFmtWrapInfluenceOnObjPos::operator=(
 
 int SwFmtWrapInfluenceOnObjPos::operator==( const SfxPoolItem& _rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( _rAttr ), "keine gleichen Attribute" );
+    OSL_ENSURE( SfxPoolItem::operator==( _rAttr ), "keine gleichen Attribute" );
     return ( mnWrapInfluenceOnPosition ==
                     static_cast<const SwFmtWrapInfluenceOnObjPos&>(_rAttr).
                                                 GetWrapInfluenceOnObjPos() );
@@ -88,7 +88,7 @@ bool SwFmtWrapInfluenceOnObjPos::QueryValue( Any& rVal, BYTE nMemberId ) const
         }
         break;
         default:
-            ASSERT( false, "<SwFmtWrapInfluenceOnObjPos::QueryValue()> - unknown MemberId" );
+            OSL_ENSURE( false, "<SwFmtWrapInfluenceOnObjPos::QueryValue()> - unknown MemberId" );
             bRet = false;
     }
 
@@ -117,13 +117,13 @@ bool SwFmtWrapInfluenceOnObjPos::PutValue( const Any& rVal, BYTE nMemberId )
             }
             else
             {
-                ASSERT( false, "<SwFmtWrapInfluenceOnObjPos::PutValue(..)> - invalid attribute value" );
+                OSL_ENSURE( false, "<SwFmtWrapInfluenceOnObjPos::PutValue(..)> - invalid attribute value" );
                 bRet = false;
             }
         }
         break;
         default:
-            ASSERT( false, "<SwFmtWrapInfluenceOnObjPos::QueryValue()> - unknown MemberId" );
+            OSL_ENSURE( false, "<SwFmtWrapInfluenceOnObjPos::QueryValue()> - unknown MemberId" );
             bRet = false;
     }
 
@@ -143,7 +143,7 @@ void SwFmtWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInflu
     }
     else
     {
-        ASSERT( false, "<SwFmtWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos(..)> - invalid attribute value" );
+        OSL_ENSURE( false, "<SwFmtWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos(..)> - invalid attribute value" );
     }
 }
 
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 5095a971cdaf..d9acc6b71bea 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -165,7 +165,7 @@ SwFmt &SwFmt::operator=(const SwFmt& rFmt)
 
 void SwFmt::SetName( const String& rNewName, sal_Bool bBroadcast )
 {
-    ASSERT(!IsDefault(), "SetName: Defaultformat" );
+    OSL_ENSURE(!IsDefault(), "SetName: Defaultformat" );
     if( bBroadcast )
     {
         SwStringMsgPoolItem aOld( RES_NAME_CHANGED, aFmtName );
@@ -253,7 +253,7 @@ SwFmt::~SwFmt()
     /* alle Abhaengigen auf DerivedFrom umhaengen */
     if( GetDepends() )
     {
-        ASSERT(DerivedFrom(), "SwFmt::~SwFmt: Def Abhaengige!" );
+        OSL_ENSURE(DerivedFrom(), "SwFmt::~SwFmt: Def Abhaengige!" );
 
         bFmtInDTOR = TRUE;
 
@@ -372,9 +372,9 @@ void SwFmt::Modify( SfxPoolItem* pOldValue, SfxPoolItem* pNewValue )
             {
 // wie finde ich heraus, ob nicht ich die Message versende ??
 // aber wer ruft das hier ????
-//ASSERT( FALSE, "Modify ohne Absender verschickt" );
+// OSL_ENSURE( FALSE, "Modify ohne Absender verschickt" );
 //JP 11.06.96: DropCaps koennen hierher kommen
-ASSERT( RES_PARATR_DROP == nWhich, "Modify ohne Absender verschickt" );
+                OSL_ENSURE( RES_PARATR_DROP == nWhich, "Modify ohne Absender verschickt" );
                 bWeiter = FALSE;
             }
 
@@ -414,7 +414,7 @@ BOOL SwFmt::SetDerivedFrom(SwFmt *pDerFrom)
     if ( (pDerFrom == DerivedFrom()) || (pDerFrom == this) )
         return FALSE;
 
-    ASSERT( Which()==pDerFrom->Which()
+    OSL_ENSURE( Which()==pDerFrom->Which()
             || ( Which()==RES_CONDTXTFMTCOLL && pDerFrom->Which()==RES_TXTFMTCOLL)
             || ( Which()==RES_TXTFMTCOLL && pDerFrom->Which()==RES_CONDTXTFMTCOLL)
             || ( Which()==RES_FLYFRMFMT && pDerFrom->Which()==RES_FRMFMT ),
diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index 74db76467d8b..8753c5d1639c 100644
--- a/sw/source/core/attr/hints.cxx
+++ b/sw/source/core/attr/hints.cxx
@@ -84,7 +84,7 @@ SwRefMarkFldUpdate::SwRefMarkFldUpdate( const OutputDevice* pOutput )
     : SwMsgPoolItem( RES_REFMARKFLD_UPDATE ),
     pOut( pOutput )
 {
-    ASSERT( pOut, "es muss ein OutputDevice-Pointer gesetzt werden!" );
+    OSL_ENSURE( pOut, "es muss ein OutputDevice-Pointer gesetzt werden!" );
 }
 
 
@@ -103,7 +103,7 @@ SwTableFmlUpdate::SwTableFmlUpdate( const SwTable* pNewTbl )
 {
     DATA.pDelTbl = 0;
     bModified = bBehindSplitLine = FALSE;
-    ASSERT( pTbl, "es muss ein Table-Pointer gesetzt werden!" );
+    OSL_ENSURE( pTbl, "es muss ein Table-Pointer gesetzt werden!" );
 }
 
 
@@ -137,11 +137,11 @@ SwAttrSetChg::~SwAttrSetChg()
 }
 
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
 void SwAttrSetChg::ClearItem( USHORT nWhch )
 {
-    ASSERT( bDelSet, "der Set darf nicht veraendert werden!" );
+    OSL_ENSURE( bDelSet, "der Set darf nicht veraendert werden!" );
     pChgSet->ClearItem( nWhch );
 }
 
@@ -156,14 +156,14 @@ SwMsgPoolItem::SwMsgPoolItem( USHORT nWhch )
 // "Overhead" vom SfxPoolItem
 int SwMsgPoolItem::operator==( const SfxPoolItem& ) const
 {
-    ASSERT( FALSE, "SwMsgPoolItem kennt kein ==" );
+    OSL_ENSURE( FALSE, "SwMsgPoolItem kennt kein ==" );
     return 0;
 }
 
 
 SfxPoolItem* SwMsgPoolItem::Clone( SfxItemPool* ) const
 {
-    ASSERT( FALSE, "SwMsgPoolItem kennt kein Clone" );
+    OSL_ENSURE( FALSE, "SwMsgPoolItem kennt kein Clone" );
     return 0;
 }
 
@@ -173,21 +173,21 @@ SfxPoolItem* SwMsgPoolItem::Clone( SfxItemPool* ) const
  * Ist keines vorhanden, returnt ein 0-Pointer !!!
  * Used to be inlined (hintids.hxx) in PRODUCT.
  ******************************************************************************/
-#ifndef DBG_UTIL
-const SfxPoolItem* GetDfltAttr( USHORT nWhich )
-{
-    return aAttrTab[ nWhich - POOLATTR_BEGIN ];
-}
-#else
+#if OSL_DEBUG_LEVEL > 1
 const SfxPoolItem* GetDfltAttr( USHORT nWhich )
 {
     ASSERT_ID( nWhich < POOLATTR_END && nWhich >= POOLATTR_BEGIN,
                ERR_OUTOFSCOPE );
 
     SfxPoolItem *pHt = aAttrTab[ nWhich - POOLATTR_BEGIN ];
-    ASSERT( pHt, "GetDfltFmtAttr(): Dflt == 0" );
+    OSL_ENSURE( pHt, "GetDfltFmtAttr(): Dflt == 0" );
     return pHt;
 }
+#else
+const SfxPoolItem* GetDfltAttr( USHORT nWhich )
+{
+    return aAttrTab[ nWhich - POOLATTR_BEGIN ];
+}
 #endif
 
 
@@ -206,17 +206,6 @@ SwVirtPageNumInfo::SwVirtPageNumInfo( const SwPageFrm *pPg ) :
 {
 }
 
-// --> OD 2008-02-19 #refactorlists#
-//SwNumRuleInfo::SwNumRuleInfo( const String& rRuleName )
-//    : SwMsgPoolItem( RES_GETNUMNODES ), rName( rRuleName )
-//{
-//}
-
-//void SwNumRuleInfo::AddNode( SwTxtNode& rNd )
-//{
-//    aList.Insert(rNd.GetIndex(), &rNd);
-//}
-
 
 SwFindNearestNode::SwFindNearestNode( const SwNode& rNd )
     : SwMsgPoolItem( RES_FINDNEARESTNODE ), pNd( &rNd ), pFnd( 0 )
diff --git a/sw/source/core/attr/makefile.mk b/sw/source/core/attr/makefile.mk
index a3827d4776e0..baf327dcac36 100644
--- a/sw/source/core/attr/makefile.mk
+++ b/sw/source/core/attr/makefile.mk
@@ -40,15 +40,18 @@ AUTOSEG=true
 
 # --- Files --------------------------------------------------------
 
-SLOFILES =  \
-        $(SLO)$/calbck.obj \
+EXCEPTIONSFILES = \
         $(SLO)$/cellatr.obj \
-                $(SLO)$/fmtfollowtextflow.obj \
-                $(SLO)$/fmtwrapinfluenceonobjpos.obj \
-                $(SLO)$/format.obj \
+        $(SLO)$/format.obj \
         $(SLO)$/hints.obj \
         $(SLO)$/swatrset.obj
 
+SLOFILES =  \
+        $(EXCEPTIONSFILES) \
+        $(SLO)$/calbck.obj \
+        $(SLO)$/fmtfollowtextflow.obj \
+        $(SLO)$/fmtwrapinfluenceonobjpos.obj
+
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index a74bd1376702..d2d8ba190205 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -158,7 +158,7 @@ USHORT SwAttrSet::ClearItem_BC( USHORT nWhich,
 USHORT SwAttrSet::ClearItem_BC( USHORT nWhich1, USHORT nWhich2,
                         SwAttrSet* pOld, SwAttrSet* pNew )
 {
-    ASSERT( nWhich1 <= nWhich2, "kein gueltiger Bereich" );
+    OSL_ENSURE( nWhich1 <= nWhich2, "kein gueltiger Bereich" );
     pNewSet = pNew;
     pOldSet = pOld;
     USHORT nRet = 0;
@@ -383,9 +383,9 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
             // <--
         }
     }
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     else
-        ASSERT( !this, "weder Format noch ContentNode - keine Attribute kopiert");
+        OSL_ENSURE( !this, "weder Format noch ContentNode - keine Attribute kopiert");
 #endif
 }
 
diff --git a/sw/source/core/bastyp/SwSmartTagMgr.cxx b/sw/source/core/bastyp/SwSmartTagMgr.cxx
index d550ae2f9ee7..2e773d532e41 100644
--- a/sw/source/core/bastyp/SwSmartTagMgr.cxx
+++ b/sw/source/core/bastyp/SwSmartTagMgr.cxx
@@ -82,14 +82,4 @@ void SwSmartTagMgr::changesOccurred( const util::ChangesEvent& rEvent ) throw( R
     SmartTagMgr::changesOccurred( rEvent );
 }
 
-/*
-SmartTagMgr& SwSmartTagMgr::Get()
-{
-    if ( !pSmartTagMgr )
-        pSmartTagMgr = new SmartTagMgr( SwDocShell::Factory().GetModuleName() );
-
-     return *pSmartTagMgr;
-}
-*/
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/bastyp/bparr.cxx b/sw/source/core/bastyp/bparr.cxx
index 7a52488a055b..4e448882ab9e 100644
--- a/sw/source/core/bastyp/bparr.cxx
+++ b/sw/source/core/bastyp/bparr.cxx
@@ -39,11 +39,7 @@
 // immer ~ 20 * MAXENTRY == 20000 Eintraege
 const USHORT nBlockGrowSize = 20;
 
-#ifndef DBG_UTIL
-
-#define CHECKIDX( p, n, i, c )
-
-#else
+#if OSL_DEBUG_LEVEL > 2
 
 #define CHECKIDX( p, n, i, c ) CheckIdx( p, n, i, c );
 
@@ -63,6 +59,10 @@ void CheckIdx( BlockInfo** ppInf, USHORT nBlock, ULONG nSize, USHORT nCur )
     DBG_ASSERT( nIdx == nSize, "BigPtrArray: Anzahl ungueltig" );
 }
 
+#else
+
+#define CHECKIDX( p, n, i, c )
+
 #endif
 
 
diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx
index 3805541242ab..b47b18e5f6a4 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -68,18 +68,6 @@ SwBreakIt::SwBreakIt(
       aForbiddenLang( LANGUAGE_DONTKNOW)
 {
     DBG_ASSERT( m_xMSF.is(), "SwBreakIt: no MultiServiceFactory" );
-    //if ( m_xMSF.is() )
-    //{
- //       xBreak = uno::Reference< i18n::XBreakIterator >(
-    //      m_xMSF->createInstance(
-    //          rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")) ),
- //           uno::UNO_QUERY);
-
- //       xCTLDetect = uno::Reference< i18n::XScriptTypeDetector >(
- //           m_xMSF->createInstance(
- //                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.ScriptTypeDetector")) ),
- //           uno::UNO_QUERY);
- //   }
 }
 
 SwBreakIt::~SwBreakIt()
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index f075e16fc12a..af405bce9ad2 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -398,11 +398,6 @@ static ULONG SwDocStat::* __READONLY_DATA aDocStat2[ 4 ] =
     sTmpStr.AssignAscii( sNTypeTab[ 25 ] );
     VarTable[ aHashValue[ 25 ] ]->pNext = new SwCalcExp( sTmpStr, nVal, 0 );
 
-// at time its better not to use "graph", because then the im-/export have
-// to change in all formulas this name.
-//  nVal.PutLong( rDocStat.*aDocStat1[ 1 ]  );
-//  VarTable[ aHashValue[ 26 ] ]->pNext = new SwCalcExp(
-//                                              sNTypeTab[ 26 ], nVal, 0 );
 }
 
 /******************************************************************************
@@ -606,7 +601,7 @@ SwCalcExp* SwCalc::VarLook( const String& rStr, USHORT ins )
             pMgr->OpenDataSource(sSourceName, sTableName, -1, false))
         {
             String sColumnName( GetColumnName( sTmpName ));
-            ASSERT (sColumnName.Len(), "DB-Spaltenname fehlt!");
+           OSL_ENSURE(sColumnName.Len(), "DB-Spaltenname fehlt!");
 
             String sDBNum( SwFieldType::GetTypeStr(TYP_DBSETNUMBERFLD) );
             pCharClass->toLower(sDBNum);
@@ -656,7 +651,7 @@ SwCalcExp* SwCalc::VarLook( const String& rStr, USHORT ins )
     VarTable[ ii ] = pNewExp;
 
     String sColumnName( GetColumnName( sTmpName ));
-    ASSERT( sColumnName.Len(), "DB-Spaltenname fehlt!" );
+    OSL_ENSURE( sColumnName.Len(), "DB-Spaltenname fehlt!" );
     if( sColumnName.EqualsIgnoreCaseAscii(
                             SwFieldType::GetTypeStr( TYP_DBSETNUMBERFLD ) ))
     {
@@ -737,7 +732,7 @@ BOOL SwCalc::Push( const VoidPtr pPtr )
 
 void SwCalc::Pop( const VoidPtr )
 {
-    ASSERT( aRekurStk.Count(), "SwCalc: Pop auf ungueltigen Ptr" );
+    OSL_ENSURE( aRekurStk.Count(), "SwCalc: Pop auf ungueltigen Ptr" );
 
     aRekurStk.Remove( aRekurStk.Count() - 1 );
 }
@@ -1101,8 +1096,7 @@ else
                     }
                     break;
 
-        default:    if( ch && pCharClass->isLetter( sCommand, nCommandPos - 1)
-                            || '_' == ch )
+        default:    if (ch && (pCharClass->isLetter( sCommand, nCommandPos - 1) || '_' == ch))
                     {
                         xub_StrLen nStt = nCommandPos-1;
                         while( 0 != (ch = NextCh( sCommand, nCommandPos )) &&
@@ -1177,10 +1171,6 @@ SwSbxValue SwCalc::Term()
 
         switch( eCurrOper )
         {
-// wir haben kein Bitweises verodern, oder ?
-//          case CALC_AND:  eSbxOper = SbxAND;  break;
-//          case CALC_OR:   eSbxOper = SbxOR;   break;
-//          case CALC_XOR:  eSbxOper = SbxXOR;  break;
             case CALC_AND:  {
                                 GetToken();
                                 BOOL bB = Prim().GetBool();
@@ -1308,33 +1298,8 @@ SwSbxValue SwCalc::Term()
                             }
                             break;
 
-/*
-// removed here because of #77448# (=2*3^2 != 18)
-            case CALC_POW:  {
-                                GetToken();
-                                double fraction, integer;
-                                double right = Prim().GetDouble(),
-                                       dleft = left.GetDouble();
+//#77448# (=2*3^2 != 18)
 
-                                fraction = modf( right, &integer );
-                                if( ( dleft < 0.0 && 0.0 != fraction ) ||
-                                    ( 0.0 == dleft && right < 0.0 ) )
-                                {
-                                    eError = CALC_OVERFLOW;
-                                    left.Clear();
-                                    return left;
-                                }
-                                dleft = pow(dleft, right );
-                                if( dleft == HUGE_VAL )
-                                {
-                                    eError = CALC_POWERR;
-                                    left.Clear();
-                                    return left;
-                                }
-                                left.PutDouble( dleft );
-                            }
-                            break;
-*/
             default:        return left;
         }
 
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index 7aa09308a7cd..a249a21ec2a6 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -37,7 +37,7 @@
 #include "index.hxx"
 #include "error.h"              // fuers ASSERT
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 int SwIndex::nSerial = 0;
 #endif
 
@@ -53,7 +53,7 @@ TYPEINIT0(SwIndexReg);  // rtti
 
 void SwIndexReg::ChkArr()
 {
-    ASSERT( (pFirst && pLast) || (!pFirst && !pLast),
+    OSL_ENSURE( (pFirst && pLast) || (!pFirst && !pLast),
             "Array falsch Indiziert" );
 
     if( !pFirst )
@@ -61,15 +61,15 @@ void SwIndexReg::ChkArr()
 
     xub_StrLen nVal = 0;
     const SwIndex* pIdx = pFirst, *pPrev = 0;
-    ASSERT( !pIdx->pPrev, "Array-pFirst nicht am Anfang" );
+    OSL_ENSURE( !pIdx->pPrev, "Array-pFirst nicht am Anfang" );
 
     while( pIdx != pLast )
     {
-        ASSERT( pIdx->pPrev != pIdx && pIdx->pNext != pIdx,
-                "Index zeigt auf sich selbst" )
+        OSL_ENSURE( pIdx->pPrev != pIdx && pIdx->pNext != pIdx,
+                "Index zeigt auf sich selbst" );
 
-        ASSERT( pIdx->nIndex >= nVal, "Reihenfolge stimmt nicht" );
-        ASSERT( pPrev == pIdx->pPrev, "Verkettung stimmt nicht" );
+        OSL_ENSURE( pIdx->nIndex >= nVal, "Reihenfolge stimmt nicht" );
+        OSL_ENSURE( pPrev == pIdx->pPrev, "Verkettung stimmt nicht" );
         pPrev = pIdx;
         pIdx = pIdx->pNext;
         nVal = pPrev->nIndex;
@@ -101,7 +101,7 @@ SwIndex::SwIndex(SwIndexReg *const pArr, xub_StrLen const nIdx)
     else
         ChgValue( *pArray->pFirst, nIdx );
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     MySerial = ++nSerial;       // nur in der nicht PRODUCT-Version
 #endif
 IDX_CHK_ARRAY
@@ -113,7 +113,7 @@ SwIndex::SwIndex( const SwIndex& rIdx, short nIdx )
 {
     ChgValue( rIdx, rIdx.nIndex + nIdx );
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     MySerial = ++nSerial;       // nur in der nicht PRODUCT-Version
 #endif
 IDX_CHK_ARRAY
@@ -124,7 +124,7 @@ SwIndex::SwIndex( const SwIndex& rIdx )
     : nIndex( rIdx.nIndex ), pArray( rIdx.pArray ), pNext( 0 ), pPrev( 0 )
 {
     ChgValue( rIdx, rIdx.nIndex );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     MySerial = ++nSerial;       // nur in der nicht PRODUCT-Version
 #endif
 IDX_CHK_ARRAY
@@ -321,7 +321,7 @@ SwIndexReg::SwIndexReg()
 
 SwIndexReg::~SwIndexReg()
 {
-    ASSERT( !pFirst || !pLast, "Es sind noch Indizies angemeldet" );
+    OSL_ENSURE( !pFirst || !pLast, "Es sind noch Indizies angemeldet" );
 }
 
 
@@ -369,7 +369,7 @@ void SwIndexReg::Update( SwIndex const & rIdx, const xub_StrLen nDiff,
 ARR_CHK_ARRAY
 }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 #ifndef CFRONT
 
 /*************************************************************************
@@ -505,7 +505,7 @@ xub_StrLen SwIndex::operator-=( const SwIndex & rIndex )
 
 BOOL SwIndex::operator<( const SwIndex & rIndex ) const
 {
-    ASSERT( pArray == rIndex.pArray, "Attempt to compare indices into different arrays.");
+    OSL_ENSURE( pArray == rIndex.pArray, "Attempt to compare indices into different arrays.");
     return nIndex < rIndex.nIndex;
 }
 
@@ -521,7 +521,7 @@ BOOL SwIndex::operator<( const SwIndex & rIndex ) const
 
 BOOL SwIndex::operator<=( const SwIndex & rIndex ) const
 {
-    ASSERT( pArray == rIndex.pArray, "Attempt to compare indices into different arrays.");
+    OSL_ENSURE( pArray == rIndex.pArray, "Attempt to compare indices into different arrays.");
     return nIndex <= rIndex.nIndex;
 }
 
@@ -537,7 +537,7 @@ BOOL SwIndex::operator<=( const SwIndex & rIndex ) const
 
 BOOL SwIndex::operator>( const SwIndex & rIndex ) const
 {
-    ASSERT( pArray == rIndex.pArray, "Attempt to compare indices into different arrays.");
+    OSL_ENSURE( pArray == rIndex.pArray, "Attempt to compare indices into different arrays.");
     return nIndex > rIndex.nIndex;
 }
 
@@ -553,7 +553,7 @@ BOOL SwIndex::operator>( const SwIndex & rIndex ) const
 
 BOOL SwIndex::operator>=( const SwIndex & rIndex ) const
 {
-    ASSERT( pArray == rIndex.pArray, "Attempt to compare indices into different arrays.");
+    OSL_ENSURE( pArray == rIndex.pArray, "Attempt to compare indices into different arrays.");
     return nIndex >= rIndex.nIndex;
 }
 
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 51da1b2028f5..c05825e2c5c6 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -732,9 +732,6 @@ void _InitCore()
 
     SwBreakIt::_Create( xMSF );
     pCheckIt = NULL;
-    /*pAppCharClass = new CharClass(
-        xMSF, SwBreakIt::Get()->GetLocale( (LanguageType)GetAppLanguage() ));*/
-    //pCalendarWrapper = new SwCalendarWrapper( xMSF );
 
     _FrmInit();
     _TextInit();
@@ -776,7 +773,7 @@ void _FinitCore()
 
     delete SwEditShell::pAutoFmtFlags;
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     //Defaultattribut freigeben lassen um asserts zu vermeiden.
     if ( aAttrTab[0]->GetRefCount() )
         SfxItemPool::ReleaseDefaults( aAttrTab, POOLATTR_END-POOLATTR_BEGIN, FALSE);
diff --git a/sw/source/core/bastyp/makefile.mk b/sw/source/core/bastyp/makefile.mk
index 8333dabd5f37..513e34ba7635 100644
--- a/sw/source/core/bastyp/makefile.mk
+++ b/sw/source/core/bastyp/makefile.mk
@@ -56,21 +56,21 @@ CXXFILES = \
         SwSmartTagMgr.cxx
 
 SLOFILES =	\
+        $(EXCEPTIONSFILES) \
         $(SLO)$/bparr.obj \
-        $(SLO)$/breakit.obj \
-        $(SLO)$/calc.obj \
         $(SLO)$/checkit.obj \
         $(SLO)$/index.obj \
-        $(SLO)$/init.obj \
         $(SLO)$/ring.obj \
         $(SLO)$/swcache.obj \
         $(SLO)$/swrect.obj \
-        $(SLO)$/swregion.obj \
-        $(SLO)$/swtypes.obj \
-        $(SLO)$/tabcol.obj \
-        $(SLO)$/SwSmartTagMgr.obj
+        $(SLO)$/swregion.obj
 
 EXCEPTIONSFILES = \
+        $(SLO)$/SwSmartTagMgr.obj \
+        $(SLO)$/breakit.obj \
+        $(SLO)$/calc.obj \
+        $(SLO)$/init.obj \
+        $(SLO)$/swtypes.obj \
         $(SLO)$/tabcol.obj
 
 # --- Tagets -------------------------------------------------------
diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx
index 1a962bb9c47e..090dde75164b 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -36,10 +36,10 @@
 
 SV_IMPL_PTRARR(SwCacheObjArr,SwCacheObj*);
 
-#ifndef DBG_UTIL
-#define INCREMENT( nVar )
-#else
+#if OSL_DEBUG_LEVEL > 1
 #define INCREMENT( nVar )   ++nVar
+#else
+#define INCREMENT( nVar )
 #endif
 
 /*************************************************************************
@@ -51,7 +51,7 @@ SV_IMPL_PTRARR(SwCacheObjArr,SwCacheObj*);
 |*
 |*************************************************************************/
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
 void SwCache::Check()
 {
@@ -59,8 +59,8 @@ void SwCache::Check()
         return;
 
     //Konsistenspruefung.
-    ASSERT( !pLast->GetNext(), "Last but not last." );
-    ASSERT( !pRealFirst->GetPrev(), "First but not first." );
+    OSL_ENSURE( !pLast->GetNext(), "Last but not last." );
+    OSL_ENSURE( !pRealFirst->GetPrev(), "First but not first." );
     USHORT nCnt = 0;
     BOOL bFirstFound = FALSE;
     SwCacheObj *pObj = pRealFirst;
@@ -71,24 +71,24 @@ void SwCache::Check()
         SwCacheObj *pTmp = pLast;
         while ( pTmp && pTmp != pObj )
             pTmp = pTmp->GetPrev();
-        ASSERT( pTmp, "Objekt not found." );
+        OSL_ENSURE( pTmp, "Objekt not found." );
 
         ++nCnt;
         if ( pObj == pFirst )
             bFirstFound = TRUE;
         if ( !pObj->GetNext() )
-            ASSERT( pObj == pLast, "Last not Found." );
+            OSL_ENSURE( pObj == pLast, "Last not Found." );
         pObj = pObj->GetNext();
-        ASSERT( pObj != pRekursive, "Recursion in SwCache." );
+        OSL_ENSURE( pObj != pRekursive, "Recursion in SwCache." );
     }
-    ASSERT( bFirstFound, "First not Found." );
-    ASSERT( (nCnt + aFreePositions.Count()) == Count(), "Lost Chain." );
+    OSL_ENSURE( bFirstFound, "First not Found." );
+    OSL_ENSURE( (nCnt + aFreePositions.Count()) == Count(), "Lost Chain." );
     if ( Count() == nCurMax )
-        ASSERT( (nCurMax - nCnt) == aFreePositions.Count(), "Lost FreePositions." );
+        OSL_ENSURE( (nCurMax - nCnt) == aFreePositions.Count(), "Lost FreePositions." );
 }
 #endif
 
-#if defined(DBG_UTIL) && defined(MADEBUG)
+#if OSL_DEBUG_LEVEL > 1
 #define CHECK Check();
 #else
 #define CHECK
@@ -105,7 +105,7 @@ void SwCache::Check()
 
 
 SwCache::SwCache( const USHORT nInitSize, const USHORT nGrowSize
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     , const ByteString &rNm
 #endif
     ) :
@@ -116,7 +116,7 @@ SwCache::SwCache( const USHORT nInitSize, const USHORT nGrowSize
     pLast( 0 ),
     nMax( nInitSize ),
     nCurMax( nInitSize )
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     , aName( rNm ),
     nAppend( 0 ),
     nInsertFree( 0 ),
@@ -135,7 +135,7 @@ SwCache::SwCache( const USHORT nInitSize, const USHORT nGrowSize
 {
 }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
 
 SwCache::~SwCache()
@@ -195,10 +195,10 @@ void SwCache::Flush( const BYTE )
     SwCacheObj *pTmp;
     while ( pObj )
     {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         if ( pObj->IsLocked() )
         {
-            ASSERT( TRUE, "Flushing locked objects." );
+            OSL_ENSURE( TRUE, "Flushing locked objects." );
             if ( !pRealFirst )
             {
                 pRealFirst = pFirst = pLast = pObj;
@@ -250,7 +250,7 @@ void SwCache::ToTop( SwCacheObj *pObj )
 
     if ( !pRealFirst )
     {   //Der erste wird eingetragen.
-        ASSERT( !pFirst && !pLast, "First not first." );
+        OSL_ENSURE( !pFirst && !pLast, "First not first." );
         pRealFirst = pFirst = pLast = pObj;
         CHECK;
         return;
@@ -259,7 +259,7 @@ void SwCache::ToTop( SwCacheObj *pObj )
     //Ausschneiden.
     if ( pObj == pLast )
     {
-        ASSERT( pObj->GetPrev(), "Last but no Prev." );
+        OSL_ENSURE( pObj->GetPrev(), "Last but no Prev." );
         pLast = pObj->GetPrev();
         pLast->SetNext( 0 );
     }
@@ -282,7 +282,7 @@ void SwCache::ToTop( SwCacheObj *pObj )
     }
     else
     {
-        ASSERT( pFirst, "ToTop, First ist not RealFirst an Empty." );
+        OSL_ENSURE( pFirst, "ToTop, First ist not RealFirst an Empty." );
 
         if ( pFirst->GetPrev() )
         {
@@ -320,7 +320,7 @@ SwCacheObj *SwCache::Get( const void *pOwner, const USHORT nIndex,
             ToTop( pRet );
     }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         if ( pRet )
             ++nGetSuccess;
         else
@@ -344,7 +344,7 @@ SwCacheObj *SwCache::Get( const void *pOwner, const BOOL bToTop )
     if ( bToTop && pRet && pRet != pFirst )
         ToTop( pRet );
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     if ( pRet )
         ++nGetSuccess;
     else
@@ -367,7 +367,7 @@ SwCacheObj *SwCache::Get( const void *pOwner, const BOOL bToTop )
 void SwCache::DeleteObj( SwCacheObj *pObj )
 {
     CHECK;
-    ASSERT( !pObj->IsLocked(), "SwCache::Delete: Object ist Locked." );
+    OSL_ENSURE( !pObj->IsLocked(), "SwCache::Delete: Object ist Locked." );
     if ( pObj->IsLocked() )
         return;
 
@@ -415,20 +415,6 @@ void SwCache::DeleteObj( SwCacheObj *pObj )
     CHECK;
 }
 
-/*
-
-
-void SwCache::Delete( const void *pOwner, const USHORT nIndex )
-{
-    INCREMENT( nDelete );
-    SwCacheObj *pObj;
-    if ( 0 != (pObj = Get( pOwner, nIndex, FALSE )) )
-        DeleteObj( pObj );
-}
-*/
-
-
-
 void SwCache::Delete( const void *pOwner )
 {
     INCREMENT( nDelete );
@@ -451,7 +437,7 @@ void SwCache::Delete( const void *pOwner )
 BOOL SwCache::Insert( SwCacheObj *pNew )
 {
     CHECK;
-    ASSERT( !pNew->GetPrev() && !pNew->GetNext(), "New but not new." );
+    OSL_ENSURE( !pNew->GetPrev() && !pNew->GetNext(), "New but not new." );
 
     USHORT nPos;//Wird hinter den if's zum setzen am Obj benutzt.
     if ( Count() < nCurMax )
@@ -480,13 +466,13 @@ BOOL SwCache::Insert( SwCacheObj *pNew )
             pObj = pObj->GetPrev();
         if ( !pObj )
         {
-            ASSERT( FALSE, "Cache overflow." );
+            OSL_ENSURE( FALSE, "Cache overflow." );
             return FALSE;
         }
 
         nPos = pObj->GetCachePos();
         if ( pObj == pLast )
-        {   ASSERT( pObj->GetPrev(), "Last but no Prev" );
+        { OSL_ENSURE( pObj->GetPrev(), "Last but no Prev" );
             pLast = pObj->GetPrev();
             pLast->SetNext( 0 );
         }
@@ -514,7 +500,7 @@ BOOL SwCache::Insert( SwCacheObj *pNew )
         pNew->SetNext( pFirst );
     }
     else
-    {   ASSERT( !pLast, "Last but no First." );
+    { OSL_ENSURE( !pLast, "Last but no First." );
         pLast = pNew;
     }
     if ( pFirst == pRealFirst )
@@ -586,13 +572,13 @@ SwCacheObj::~SwCacheObj()
 |*
 |*************************************************************************/
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
 
 
 void SwCacheObj::Lock()
 {
-    ASSERT( nLock < UCHAR_MAX, "To many Locks for CacheObject." );
+    OSL_ENSURE( nLock < UCHAR_MAX, "To many Locks for CacheObject." );
     ++nLock;
 }
 
@@ -600,7 +586,7 @@ void SwCacheObj::Lock()
 
 void SwCacheObj::Unlock()
 {
-    ASSERT( nLock, "No more Locks available." );
+    OSL_ENSURE( nLock, "No more Locks available." );
     --nLock;
 }
 #endif
@@ -624,7 +610,7 @@ SwCacheAccess::~SwCacheAccess()
 
 void SwCacheAccess::_Get()
 {
-    ASSERT( !pObj, "SwCacheAcces Obj already available." );
+    OSL_ENSURE( !pObj, "SwCacheAcces Obj already available." );
 
     pObj = NewObj();
     if ( !rCache.Insert( pObj ) )
diff --git a/sw/source/core/bastyp/swrect.cxx b/sw/source/core/bastyp/swrect.cxx
index 8e64cef74564..7372c443db16 100644
--- a/sw/source/core/bastyp/swrect.cxx
+++ b/sw/source/core/bastyp/swrect.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_sw.hxx"
 
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 #include <tools/stream.hxx>
 #endif
 #include <stdlib.h>
@@ -69,13 +69,6 @@ Point SwRect::Center() const
 {
     return Point( Left() + Width()  / 2,
                   Top()  + Height() / 2 );
-
-/*  Wer ruft schon ein Center auf ein "falsches" Rechteck?
-    const long nRight = Right();
-    const long nBottom= Bottom();
-    return Point( min( Left(), nRight ) + long(abs( (nRight - Left())/2) ),
-                  min( Top(),  nBottom) + long(abs( (nBottom - Top())/2)));
-*/
 }
 
 /*************************************************************************
@@ -317,7 +310,7 @@ void SwRect::SetUpperRightCorner(  const Point& rNew )
 void SwRect::SetLowerLeftCorner(  const Point& rNew )
     { m_Point = Point(rNew.nA, rNew.nB - m_Size.getHeight()); }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 /*************************************************************************
  *                  operator<<( ostream&, SwRect&)
  *************************************************************************/
diff --git a/sw/source/core/bastyp/tabcol.cxx b/sw/source/core/bastyp/tabcol.cxx
index f1a818687d39..a7117d13ce56 100644
--- a/sw/source/core/bastyp/tabcol.cxx
+++ b/sw/source/core/bastyp/tabcol.cxx
@@ -61,11 +61,11 @@ SwTabCols::SwTabCols( const SwTabCols& rCpy ) :
         SwTabColsEntry aEntry2 = rCpy.GetData()[i];
         (void) aEntry1;
         (void) aEntry2;
-        ASSERT( aEntry1.nPos == aEntry2.nPos &&
+        OSL_ENSURE( aEntry1.nPos == aEntry2.nPos &&
                 aEntry1.nMin == aEntry2.nMin &&
                 aEntry1.nMax == aEntry2.nMax &&
                 aEntry1.bHidden == aEntry2.bHidden,
-                "CopyContructor of SwTabColsEntries did not succeed!" )
+                "CopyContructor of SwTabColsEntries did not succeed!" );
     }
 #endif
 }
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 458a0d62c1cc..c0b3eb224b0a 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -96,6 +96,7 @@ namespace
         if ( aEndMark && ( ch_end != aEndMark ) )
         {
             io_pDoc->InsertString(aEndPaM, aEndMark);
+            rEnd.nContent++;
         }
         io_pDoc->EndUndo(UNDO_UI_REPLACE, NULL);
     };
@@ -119,19 +120,17 @@ namespace sw { namespace mark
 
     bool MarkBase::IsCoveringPosition(const SwPosition& rPos) const
     {
-        return GetMarkStart() <= rPos && rPos <= GetMarkEnd();
+        return GetMarkStart() <= rPos && rPos < GetMarkEnd();
     }
 
     void MarkBase::SetMarkPos(const SwPosition& rNewPos)
     {
         ::boost::scoped_ptr<SwPosition>(new SwPosition(rNewPos)).swap(m_pPos1);
-        //lcl_FixPosition(*m_pPos1);
     }
 
     void MarkBase::SetOtherMarkPos(const SwPosition& rNewPos)
     {
         ::boost::scoped_ptr<SwPosition>(new SwPosition(rNewPos)).swap(m_pPos2);
-        //lcl_FixPosition(*m_pPos2);
     }
 
     rtl::OUString MarkBase::ToString( ) const
@@ -334,13 +333,13 @@ namespace sw { namespace mark
     }
     void CheckboxFieldmark::SetChecked(bool checked)
     {
-        (*GetParameters())[::rtl::OUString::createFromAscii(ODF_FORMCHECKBOX_RESULT)] = makeAny(checked);
+        (*GetParameters())[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMCHECKBOX_RESULT))] = makeAny(checked);
     }
 
     bool CheckboxFieldmark::IsChecked() const
     {
         bool bResult = false;
-        parameter_map_t::const_iterator pResult = GetParameters()->find(::rtl::OUString::createFromAscii(ODF_FORMCHECKBOX_RESULT));
+        parameter_map_t::const_iterator pResult = GetParameters()->find(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMCHECKBOX_RESULT)));
         if(pResult != GetParameters()->end())
             pResult->second >>= bResult;
         return bResult;
diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx
index cb1c2edcd334..1abc4fb46918 100644
--- a/sw/source/core/crsr/callnk.cxx
+++ b/sw/source/core/crsr/callnk.cxx
@@ -244,7 +244,7 @@ SwCallLink::~SwCallLink()
         0 != ( pFlyFrm = pFrm->FindFlyFrm() ) && !rShell.IsTableMode() )
     {
         const SwNodeIndex* pIndex = pFlyFrm->GetFmt()->GetCntnt().GetCntntIdx();
-        ASSERT( pIndex, "Fly ohne Cntnt" );
+        OSL_ENSURE( pIndex, "Fly ohne Cntnt" );
 
         if (!pIndex)
             return;
diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx
index d9c733598036..33a2c686ebaa 100644
--- a/sw/source/core/crsr/crbm.cxx
+++ b/sw/source/core/crsr/crbm.cxx
@@ -252,8 +252,8 @@ bool SwCrsrShell::GotoFieldmark(::sw::mark::IFieldmark const * const pMark)
     // watch Crsr-Moves
     CrsrStateHelper aCrsrSt(*this);
     aCrsrSt.SetCrsrToMark(pMark);
-    //aCrsrSt.m_pCrsr->GetPoint()->nContent--;
-    //aCrsrSt.m_pCrsr->GetMark()->nContent++;
+    aCrsrSt.m_pCrsr->GetPoint()->nContent++;
+    aCrsrSt.m_pCrsr->GetMark()->nContent--;
     if(aCrsrSt.RollbackIfIllegal()) return false;
 
     UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY);
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 770981a97ac1..362a6aca1dd7 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -133,7 +133,7 @@ void CheckRange( SwCursor* pCurCrsr )
 SwPaM * SwCrsrShell::CreateCrsr()
 {
     // Innerhalb der Tabellen-SSelection keinen neuen Crsr anlegen
-    ASSERT( !IsTableMode(), "in Tabellen SSelection" );
+    OSL_ENSURE( !IsTableMode(), "in Tabellen SSelection" );
 
     // neuen Cursor als Kopie vom akt. und in den Ring aufnehmen
     // Verkettung zeigt immer auf den zuerst erzeugten, also vorwaerts
@@ -142,9 +142,7 @@ SwPaM * SwCrsrShell::CreateCrsr()
     // hier den akt. Pam nur logisch Hiden, weil sonst die Invertierung
     // vom kopierten Pam aufgehoben wird !!
 
-    // #i75172# to be able to make a complete content swap, i moved this to a method
-    // pNew->Insert( pCurCrsr, 0 );
-    // pCurCrsr->Remove( 0, pCurCrsr->Count() );
+    // #i75172#
     pNew->swapContent(*pCurCrsr);
 
     pCurCrsr->DeleteMark();
@@ -160,7 +158,7 @@ SwPaM * SwCrsrShell::CreateCrsr()
 BOOL SwCrsrShell::DestroyCrsr()
 {
     // Innerhalb der Tabellen-SSelection keinen neuen Crsr loeschen
-    ASSERT( !IsTableMode(), "in Tabellen SSelection" );
+    OSL_ENSURE( !IsTableMode(), "in Tabellen SSelection" );
 
     // ist ueberhaupt ein naechtser vorhanden ?
     if(pCurCrsr->GetNext() == pCurCrsr)
@@ -226,16 +224,6 @@ void SwCrsrShell::StartAction()
 
 void SwCrsrShell::EndAction( const BOOL bIdleEnd )
 {
-/*
-//OS: Wird z.B. eine Basic-Action im Hintergrund ausgefuehrt, geht es so nicht
-    if( !bHasFocus )
-    {
-        // hat die Shell nicht den Focus, dann nur das EndAction an
-        // die ViewShell weitergeben.
-        ViewShell::EndAction( bIdleEnd );
-        return;
-    }
-*/
 
     BOOL bVis = bSVCrsrVis;
 
@@ -330,18 +318,18 @@ if( GetWin() )
 }
 
 
-#if defined(DBG_UTIL)
+#if OSL_DEBUG_LEVEL > 1
 
 void SwCrsrShell::SttCrsrMove()
 {
-    ASSERT( nCrsrMove < USHRT_MAX, "To many nested CrsrMoves." );
+    OSL_ENSURE( nCrsrMove < USHRT_MAX, "To many nested CrsrMoves." );
     ++nCrsrMove;
     StartAction();
 }
 
 void SwCrsrShell::EndCrsrMove( const BOOL bIdleEnd )
 {
-    ASSERT( nCrsrMove, "EndCrsrMove() ohne SttCrsrMove()." );
+    OSL_ENSURE( nCrsrMove, "EndCrsrMove() ohne SttCrsrMove()." );
     EndAction( bIdleEnd );
     if( !--nCrsrMove )
         bInCMvVisportChgd = FALSE;
@@ -449,8 +437,8 @@ void SwCrsrShell::UpdateMarkedListLevel()
         {
             if ( pTxtNd->IsInList() )
             {
-                ASSERT( pTxtNd->GetActualListLevel() >= 0 &&
-                        pTxtNd->GetActualListLevel() < MAXLEVEL, "Which level?")
+                OSL_ENSURE( pTxtNd->GetActualListLevel() >= 0 &&
+                        pTxtNd->GetActualListLevel() < MAXLEVEL, "Which level?");
                 MarkListLevel( pTxtNd->GetListId(),
                                pTxtNd->GetActualListLevel() );
             }
@@ -790,13 +778,13 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, BOOL bOnlyText, bool bBlock )
 
 void SwCrsrShell::TblCrsrToCursor()
 {
-    ASSERT( pTblCrsr, "TblCrsrToCursor: Why?" );
+    OSL_ENSURE( pTblCrsr, "TblCrsrToCursor: Why?" );
     delete pTblCrsr, pTblCrsr = 0;
 }
 
 void SwCrsrShell::BlockCrsrToCrsr()
 {
-    ASSERT( pBlockCrsr, "BlockCrsrToCrsr: Why?" );
+    OSL_ENSURE( pBlockCrsr, "BlockCrsrToCrsr: Why?" );
     if( pBlockCrsr && !HasSelection() )
     {
         SwPaM& rPam = pBlockCrsr->getShellCrsr();
@@ -1220,12 +1208,6 @@ void SwCrsrShell::VisPortChgd( const SwRect & rRect )
     //angezeigt werden, deshalb wird der Aufruf hier geklammert.
     ViewShell::VisPortChgd( rRect );        // Bereich verschieben
 
-/*
-    SwRect aRect( rRect );
-    if( VisArea().IsOver( aRect ) )
-        pCurCrsr->Invalidate( aRect );
-*/
-
     if( bSVCrsrVis && bVis )    // auch SV-Cursor wieder anzeigen
         pVisCrsr->Show();
 
@@ -1282,7 +1264,7 @@ static void lcl_CheckHiddenSection( SwNodeIndex& rIdx )
 
 #if OSL_DEBUG_LEVEL > 1
         (void) pFrmNd;
-        ASSERT( pFrmNd, "keinen Node mit Frames gefunden" );
+        OSL_ENSURE( pFrmNd, "keinen Node mit Frames gefunden" );
 #endif
         rIdx = aTmp;
     }
@@ -1330,9 +1312,6 @@ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
 
     ClearUpCrsrs();
 
-    // erfrage den Count fuer die Start-/End-Actions und ob die Shell
-    // ueberhaupt den Focus hat
-//  if( ActionPend() /*|| !bHasFocus*/ )
     //JP 12.01.98: Bug #46496# - es muss innerhalb einer BasicAction der
     //              Cursor geupdatet werden; um z.B. den TabellenCursor zu
     //              erzeugen. Im EndAction wird jetzt das UpdateCrsr gerufen!
@@ -1388,7 +1367,7 @@ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
         SwCntntFrm *pTblFrm = pPos->nNode.GetNode().GetCntntNode()->
                                                 GetFrm( &aTmpPt, pPos );
 
-        ASSERT( pTblFrm, "Tabelle Crsr nicht im Content ??" );
+        OSL_ENSURE( pTblFrm, "Tabelle Crsr nicht im Content ??" );
 
         // --> FME 2005-12-02 #126107# Make code robust. The table
         // cursor may point to a table in a currently inactive header.
@@ -1404,12 +1383,12 @@ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
             if ( !bInRepeatedHeadline )
             {
                 SwCntntFrm* pMarkTblFrm = pITmpCrsr->GetCntntNode( FALSE )->GetFrm( &aTmpMk, pITmpCrsr->GetMark() );
-                ASSERT( pMarkTblFrm, "Tabelle Crsr nicht im Content ??" );
+                OSL_ENSURE( pMarkTblFrm, "Tabelle Crsr nicht im Content ??" );
 
                 if ( pMarkTblFrm )
                 {
                     SwTabFrm* pMarkTab = pMarkTblFrm->FindTabFrm();
-                    ASSERT( pMarkTab, "Tabelle Crsr nicht im Content ??" );
+                    OSL_ENSURE( pMarkTab, "Tabelle Crsr nicht im Content ??" );
 
                     // --> FME 2005-11-28 #120360# Make code robust:
                     if ( pMarkTab )
@@ -1465,14 +1444,13 @@ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
                 Point aCentrPt( aCharRect.Center() );
                 aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
                 pTblFrm->GetCrsrOfst( pTblCrsr->GetPoint(), aCentrPt, &aTmpState );
-#ifndef DBG_UTIL
-                pTblFrm->GetCharRect( aCharRect, *pTblCrsr->GetPoint() );
-#else
+#if OSL_DEBUG_LEVEL > 1
                 if ( !pTblFrm->GetCharRect( aCharRect, *pTblCrsr->GetPoint() ) )
-                    ASSERT( !this, "GetCharRect failed." );
+                    OSL_ENSURE( !this, "GetCharRect failed." );
+#else
+                pTblFrm->GetCharRect( aCharRect, *pTblCrsr->GetPoint() );
 #endif
             }
-//          ALIGNRECT( aCharRect );
 
             pVisCrsr->Hide();       // sichtbaren Cursor immer verstecken
             // Curosr in den sichtbaren Bereich scrollen
@@ -1699,7 +1677,6 @@ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
                 rPt = aCharRect.Center();
                 pFrm->GetCrsrOfst( pShellCrsr->GetPoint(), rPt, &aTmpState );
             }
-//          ALIGNRECT( aCharRect );
 
             if( !pShellCrsr->HasMark() )
                 aCrsrHeight = aTmpState.aRealHeight;
@@ -1724,7 +1701,7 @@ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
         // siehe Bug: 29658
         if( !--nLoopCnt )
         {
-            ASSERT( !this, "Endlosschleife? CharRect != OldCharRect ");
+            OSL_ENSURE( !this, "Endlosschleife? CharRect != OldCharRect ");
             break;
         }
         aOld = aCharRect;
@@ -1809,7 +1786,7 @@ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
 
 void SwCrsrShell::RefreshBlockCursor()
 {
-    ASSERT( pBlockCrsr, "Don't call me without a block cursor" );
+    OSL_ENSURE( pBlockCrsr, "Don't call me without a block cursor" );
     SwShellCrsr &rBlock = pBlockCrsr->getShellCrsr();
     Point aPt = rBlock.GetPtPos();
     SwCntntFrm* pFrm = rBlock.GetCntntNode()->GetFrm( &aPt, rBlock.GetPoint() );
@@ -1846,7 +1823,7 @@ void SwCrsrShell::RefreshBlockCursor()
 
         std::list<SwPaM*>::iterator pStart = aSelList.getStart();
         std::list<SwPaM*>::iterator pPam = aSelList.getEnd();
-        ASSERT( pPam != pStart, "FillSelection should deliver at least one PaM" )
+        OSL_ENSURE( pPam != pStart, "FillSelection should deliver at least one PaM" );
         pCurCrsr->SetMark();
         --pPam;
         // If there is only one text portion inside the rectangle, a simple
@@ -2013,11 +1990,11 @@ void SwCrsrShell::Combine()
     SwCrsrSaveState aSaveState( *pCurCrsr );
     if( pCrsrStk->HasMark() )           // nur wenn GetMark gesetzt wurde
     {
-#ifndef DBG_UTIL
-        CheckNodesRange( pCrsrStk->GetMark()->nNode, pCurCrsr->GetPoint()->nNode, TRUE );
-#else
+#if OSL_DEBUG_LEVEL > 1
         if( !CheckNodesRange( pCrsrStk->GetMark()->nNode, pCurCrsr->GetPoint()->nNode, TRUE ))
-            ASSERT( !this, "StackCrsr & akt. Crsr nicht in gleicher Section." );
+            OSL_ENSURE( !this, "StackCrsr & akt. Crsr nicht in gleicher Section." );
+#else
+        CheckNodesRange( pCrsrStk->GetMark()->nNode, pCurCrsr->GetPoint()->nNode, TRUE );
 #endif
         // kopiere das GetMark
         if( !pCurCrsr->HasMark() )
@@ -2266,7 +2243,7 @@ BOOL SwCrsrShell::ExtendSelection( BOOL bEnd, xub_StrLen nCount )
 
     SwPosition* pPos = bEnd ? pCurCrsr->End() : pCurCrsr->Start();
     SwTxtNode* pTxtNd = pPos->nNode.GetNode().GetTxtNode();
-    ASSERT( pTxtNd, "kein TextNode, wie soll erweitert werden?" );
+    OSL_ENSURE( pTxtNd, "kein TextNode, wie soll erweitert werden?" );
 
     xub_StrLen nPos = pPos->nContent.GetIndex();
     if( bEnd )
@@ -2322,7 +2299,6 @@ BOOL SwCrsrShell::SetVisCrsr( const Point &rPt )
     SwRect aTmp( aCharRect );
 
     pFrm->GetCharRect( aCharRect, aPos, &aTmpState );
-//  ALIGNRECT( aCharRect );
 
     if( aTmp == aCharRect &&        // BUG 10137: bleibt der Cursor auf der
         pVisCrsr->IsVisible() )     // Position nicht hidden & showen
@@ -2335,9 +2311,6 @@ BOOL SwCrsrShell::SetVisCrsr( const Point &rPt )
         pCurCrsr->Show();
     }
 
-    // Bug 29584: bei Rahmenselektion ist der Cursor versteckt, aber den
-    //          D&D-Cursor will man trotzdem haben
-//  if( bSVCrsrVis )
     {
         if( aTmpState.bRealHeight )
             aCrsrHeight = aTmpState.aRealHeight;
@@ -2589,7 +2562,6 @@ SwCrsrShell::SwCrsrShell( SwCrsrShell& rShell, Window *pInitWin )
     bCallChgLnk = bHasFocus = bSVCrsrVis = bAutoUpdateCells = TRUE;
     bSetCrsrInReadOnly = TRUE;
     pVisCrsr = new SwVisCrsr( this );
-//  UpdateCrsr( 0 );
     // OD 11.02.2003 #100556#
     mbMacroExecAllowed = rShell.IsMacroExecAllowed();
 }
@@ -2633,7 +2605,6 @@ SwCrsrShell::SwCrsrShell( SwDoc& rDoc, Window *pInitWin,
     bSetCrsrInReadOnly = TRUE;
 
     pVisCrsr = new SwVisCrsr( this );
-//  UpdateCrsr( 0 );
     // OD 11.02.2003 #100556#
     mbMacroExecAllowed = true;
 }
@@ -2711,7 +2682,7 @@ USHORT SwCrsrShell::UpdateTblSelBoxes()
 // zeige das akt. selektierte "Object" an
 void SwCrsrShell::MakeSelVisible()
 {
-    ASSERT( bHasFocus, "kein Focus aber Cursor sichtbar machen?" );
+    OSL_ENSURE( bHasFocus, "kein Focus aber Cursor sichtbar machen?" );
     if( aCrsrHeight.Y() < aCharRect.Height() && aCharRect.Height() > VisArea().Height() )
     {
         SwRect aTmp( aCharRect );
@@ -2749,7 +2720,7 @@ BOOL SwCrsrShell::FindValidCntntNode( BOOL bOnlyText )
 {
     if( pTblCrsr )      // was soll ich jetzt machen ??
     {
-        ASSERT( !this, "TabellenSelection nicht aufgehoben!" );
+        OSL_ENSURE( !this, "TabellenSelection nicht aufgehoben!" );
         return FALSE;
     }
 
@@ -2907,7 +2878,6 @@ BOOL SwCrsrShell::FindValidCntntNode( BOOL bOnlyText )
     if( bOk )
     {
         pCNd = rNdIdx.GetNode().GetCntntNode();
-//      USHORT nCntnt = Min( pCNd->Len(), pCurCrsr->GetPoint()->nContent.GetIndex() );
         xub_StrLen nCntnt = rNdIdx.GetIndex() < nNdIdx ? pCNd->Len() : 0;
         pCurCrsr->GetPoint()->nContent.Assign( pCNd, nCntnt );
     }
@@ -2991,26 +2961,17 @@ void SwCrsrShell::SetReadOnlyAvailable( BOOL bFlag )
 BOOL SwCrsrShell::HasReadonlySel() const
 {
     BOOL bRet = FALSE;
-    if( IsReadOnlyAvailable() ||
-        // --> FME 2004-06-29 #114856# Formular view
-        GetViewOptions()->IsFormView() )
-        // <--
+    if( IsReadOnlyAvailable() || GetViewOptions()->IsFormView() )
     {
         if( pTblCrsr )
             bRet = pTblCrsr->HasReadOnlyBoxSel() ||
-                   pTblCrsr->HasReadonlySel(
-                            // --> FME 2004-06-29 #114856# Formular view
-                            GetViewOptions()->IsFormView() );
-                            // <--
+                   pTblCrsr->HasReadonlySel( GetViewOptions()->IsFormView() );
         else
         {
             const SwPaM* pCrsr = pCurCrsr;
 
             do {
-                if( pCrsr->HasReadonlySel(
-                        // --> FME 2004-06-29 #114856# Formular view
-                        GetViewOptions()->IsFormView() ) )
-                        // <--
+                if( pCrsr->HasReadonlySel( GetViewOptions()->IsFormView() ) )
                     bRet = TRUE;
             } while( !bRet && pCurCrsr != ( pCrsr = (SwPaM*)pCrsr->GetNext() ));
         }
@@ -3100,8 +3061,6 @@ bool SwCrsrShell::SelectHiddenRange()
     return bRet;
 }
 
-/*  */
-
     // die Suchfunktionen
 ULONG SwCrsrShell::Find( const SearchOptions& rSearchOpt, BOOL bSearchInNotes,
                             SwDocPositions eStart, SwDocPositions eEnde,
@@ -3179,7 +3138,7 @@ void SwCrsrShell::SetSelection( const SwPaM& rCrsr )
 
 void lcl_RemoveMark( SwPaM* pPam )
 {
-    ASSERT( pPam->HasMark(), "Don't remove pPoint!" )
+    OSL_ENSURE( pPam->HasMark(), "Don't remove pPoint!" );
     pPam->GetMark()->nContent.Assign( 0, 0 );
     pPam->GetMark()->nNode = 0;
     pPam->DeleteMark();
@@ -3272,7 +3231,7 @@ void SwCrsrShell::ClearUpCrsrs()
         }
         bool bFound = (pNode != NULL);
 
-        ASSERT(bFound, "no content node found");
+        OSL_ENSURE(bFound, "no content node found");
 
         if (bFound)
         {
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 15e8a8b375b4..ad854c4b4964 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -315,9 +315,6 @@ BOOL SwCrsrShell::GotoNextTOXBase( const String* pName )
             0 != ( pSectNd = pSect->GetFmt()->GetSectionNode() ) &&
              pCurCrsr->GetPoint()->nNode < pSectNd->GetIndex() &&
             ( !pFnd || pFnd->GetIndex() > pSectNd->GetIndex() ) &&
-// JP 10.12.96: solange wir nur 3 Typen kennen und UI-seitig keine anderen
-//              einstellbar sind, muss ueber den Titel gesucht werden!
-//          ( !pName || *pName == ((SwTOXBaseSection*)pSect)->GetTypeName() ) &&
             ( !pName || *pName == ((SwTOXBaseSection*)pSect)->GetTOXName() )
             )
         {
@@ -365,9 +362,6 @@ BOOL SwCrsrShell::GotoPrevTOXBase( const String* pName )
             0 != ( pSectNd = pSect->GetFmt()->GetSectionNode() ) &&
             pCurCrsr->GetPoint()->nNode > pSectNd->EndOfSectionIndex() &&
             ( !pFnd || pFnd->GetIndex() < pSectNd->GetIndex() ) &&
-// JP 10.12.96: solange wir nur 3 Typen kennen und UI-seitig keine anderen
-//              einstellbar sind, muss ueber den Titel gesucht werden!
-//          ( !pName || *pName == ((SwTOXBaseSection*)pSect)->GetTypeName() ) &&
             ( !pName || *pName == ((SwTOXBaseSection*)pSect)->GetTOXName() )
             )
         {
@@ -707,7 +701,7 @@ BOOL SwCrsrShell::MoveFldType( const SwFieldType* pFldType, BOOL bNext,
         const SwPosition& rPos = *pCrsr->GetPoint();
 
         SwTxtNode* pTNd = rPos.nNode.GetNode().GetTxtNode();
-        ASSERT( pTNd, "Wo ist mein CntntNode?" );
+        OSL_ENSURE( pTNd, "Wo ist mein CntntNode?" );
 
         SwTxtFld * pTxtFld = static_cast<SwTxtFld *>(
             pTNd->GetTxtAttrForCharAt(rPos.nContent.GetIndex(),
@@ -903,7 +897,6 @@ USHORT SwCrsrShell::GetOutlinePos( BYTE nLevel )
     {
         pNd = rNds.GetOutLineNds()[ nPos ];
 
-        //if( ((SwTxtNode*)pNd)->GetTxtColl()->GetOutlineLevel() <= nLevel )//#outline level,zhaojianwei
         if( ((SwTxtNode*)pNd)->GetAttrOutlineLevel()-1 <= nLevel )//<-end,zhaojianwei
             return nPos;
 
@@ -925,7 +918,7 @@ BOOL SwCrsrShell::MakeOutlineSel( USHORT nSttPos, USHORT nEndPos,
 
     if( nSttPos > nEndPos )         // sollte jemand das vertauscht haben?
     {
-        ASSERT( !this, "Start- > Ende-Position im Array" );
+        OSL_ENSURE( !this, "Start- > Ende-Position im Array" );
         USHORT nTmp = nSttPos;
         nSttPos = nEndPos;
         nEndPos = nTmp;
@@ -936,12 +929,10 @@ BOOL SwCrsrShell::MakeOutlineSel( USHORT nSttPos, USHORT nEndPos,
 
     if( bWithChilds )
     {
-        //BYTE nLevel = pEndNd->GetTxtNode()->GetTxtColl()->GetOutlineLevel();//#outline level,zhaojianwei
         const int nLevel = pEndNd->GetTxtNode()->GetAttrOutlineLevel()-1;//<-end.zhaojianwei
         for( ++nEndPos; nEndPos < rOutlNds.Count(); ++nEndPos )
         {
             pEndNd = rOutlNds[ nEndPos ];
-            //BYTE nNxtLevel = pEndNd->GetTxtNode()->GetTxtColl()->GetOutlineLevel();//#outline level,zhaojianwei
             const int nNxtLevel = pEndNd->GetTxtNode()->GetAttrOutlineLevel()-1;//<-end,zhaojianwei
             if( nNxtLevel <= nLevel )
                 break;          // EndPos steht jetzt auf dem naechsten
@@ -1104,14 +1095,7 @@ BOOL SwCrsrShell::GetContentAtPos( const Point& rPt,
                         }
                         if( bRet )
                         {
-//                          rCntntAtPos.sStr = pTxtNd->GetExpandTxt(
-//                                      *pTxtAttr->GetStart(),
-//                                      *pTxtAttr->GetEnd() - *pTxtAttr->GetStart(),
-//                                      FALSE );
-
-//                          rCntntAtPos.aFnd.pAttr = &pTxtAttr->GetAttr();
                             rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_SMARTTAG;
-//                          rCntntAtPos.pFndTxtAttr = pTxtAttr;
 
                             if( pFldRect && 0 != ( pFrm = pTxtNd->GetFrm( &aPt ) ) )
                                 pFrm->GetCharRect( *pFldRect, aPos, &aTmpState );
@@ -1360,7 +1344,7 @@ BOOL SwCrsrShell::GetContentAtPos( const Point& rPt,
 
             if( !bRet && (
                 SwContentAtPos::SW_TABLEBOXFML & rCntntAtPos.eCntntAtPos
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
                 || SwContentAtPos::SW_TABLEBOXVALUE & rCntntAtPos.eCntntAtPos
 #endif
                 ))
@@ -1372,7 +1356,7 @@ BOOL SwCrsrShell::GetContentAtPos( const Point& rPt,
                 if( pSttNd && 0 != ( pTblNd = pTxtNd->FindTableNode()) &&
                     0 != ( pBox = pTblNd->GetTable().GetTblBox(
                                     pSttNd->GetIndex() )) &&
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
                     ( SFX_ITEM_SET == pBox->GetFrmFmt()->GetItemState(
                         RES_BOXATR_FORMULA, FALSE, &pItem ) ||
                       SFX_ITEM_SET == pBox->GetFrmFmt()->GetItemState(
@@ -1406,7 +1390,7 @@ BOOL SwCrsrShell::GetContentAtPos( const Point& rPt,
                         // erzeuge aus der internen (fuer CORE)
                         // die externe (fuer UI) Formel
                         rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_TABLEBOXFML;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
                         if( RES_BOXATR_VALUE == pItem->Which() )
                             rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_TABLEBOXVALUE;
                         else
@@ -1440,7 +1424,7 @@ BOOL SwCrsrShell::GetContentAtPos( const Point& rPt,
                 }
             }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
             if( !bRet && SwContentAtPos::SW_CURR_ATTRS & rCntntAtPos.eCntntAtPos )
             {
                 xub_StrLen n = aPos.nContent.GetIndex();
@@ -1784,9 +1768,6 @@ BOOL SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
                 {
                     *pCurCrsr->GetPoint() = aPos;
                     GetDoc()->SetTxtFmtColl( *pCurCrsr, pNextFmt, false );
-                    //JP 04.11.97: erstmal keine Folgevorlage der
-                    //              Folgevorlage beachten
-                    // pNextFmt = pNextFmt->GetNextTxtFmtColl();
                 }
                 if( n < aFPos.nColumnCnt )
                 {
@@ -1820,7 +1801,7 @@ BOOL SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
                     GetDoc()->InsertItemSet( *pCurCrsr, aSet, 0 );
                 }
                 else {
-                    ASSERT( !this, "wo ist mein CntntNode?" );
+                    OSL_ENSURE( !this, "wo ist mein CntntNode?" );
                 }
                 break;
 
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index 1388e61eb577..b8ea9a26aea1 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -435,12 +435,9 @@ int SwAttrCheckArr::SetAttrFwd( const SwTxtAttr& rAttr )
                 // vorhanden, auf den Stack. Aber nur wenn es noch grosser ist
                 if( pCmp->nEnd > aTmp.nEnd )
                 {
-                    ASSERT( !pStackArr[ nWhch - nArrStart ].nWhich,
+                    OSL_ENSURE( !pStackArr[ nWhch - nArrStart ].nWhich,
                                     "Stack-Platz ist noch belegt" );
 
-        // ---------
-        // JP 22.08.96: nur Ende manipulieren reicht nicht. Bug 30547
-        //          pCmp->nStt = aTmp.nEnd;
                     if( aTmp.nStt <= pCmp->nStt )
                         pCmp->nStt = aTmp.nEnd;
                     else
@@ -591,12 +588,9 @@ int SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr )
                 // vorhanden, auf den Stack. Aber nur wenn es noch grosser ist
                 if( pCmp->nStt < aTmp.nStt )
                 {
-                    ASSERT( !pStackArr[ nWhch - nArrStart ].nWhich,
+                    OSL_ENSURE( !pStackArr[ nWhch - nArrStart ].nWhich,
                             "Stack-Platz ist noch belegt" );
 
-// ---------
-// JP 22.08.96: nur Ende manipulieren reicht nicht. Bug 30547
-//          pCmp->nEnd = aTmp.nStt;
                     if( aTmp.nEnd <= pCmp->nEnd )
                         pCmp->nEnd = aTmp.nStt;
                     else
@@ -673,7 +667,7 @@ int SwAttrCheckArr::CheckStack()
         {
             // alle die "offen" sind, heisst ueber die Start Position ragen,
             // im FndSet setzen
-            ASSERT( !pFndArr[ n ].nWhich, "Array-Platz ist noch belegt" );
+            OSL_ENSURE( !pFndArr[ n ].nWhich, "Array-Platz ist noch belegt" );
             pFndArr[ n ] = *pArrPtr;
             pArrPtr->nWhich = 0;
             nFound++;
@@ -865,10 +859,7 @@ int lcl_Search( const SwCntntNode& rCNd, const SfxItemSet& rCmpSet, BOOL bNoColl
         else
         {
             nWhich = pItem->Which();
-//JP 27.02.95: wenn nach defaults gesucht wird, dann muss man bis zum Pool
-//              runter
-//          if( SFX_ITEM_SET != rNdSet.GetItemState( nWhich, !bNoColls, &pNdItem )
-//              || *pNdItem != *pItem )
+
             if( !CmpAttr( rNdSet.Get( nWhich, !bNoColls ), *pItem ))
                 return FALSE;
         }
@@ -1147,36 +1138,6 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
             else if( !pSet->Count() )
                 return FIND_NOT_FOUND;      // nur Text und nicht gefunden
 
-/*          // --> FME 2007-4-12 #i74765 # Why should we move the position?
-            Moving the position results in bugs when there are two adjacent
-            portions which both have the requested attributes set. I suspect this
-            should be only be an optimization. Therefore I boldly remove it now!
-
-            // JP: und wieder neu aufsetzen, aber eine Position weiter
-            //JP 04.11.97: Bug 44897 - aber den Mark wieder aufheben, damit
-            //              weiterbewegt werden kann!
-            {
-                BOOL bCheckRegion = TRUE;
-                SwPosition* pPos = aSrchPam.GetPoint();
-                if( !(*fnMove->fnNd)( &pPos->nNode.GetNode(),
-                                        &pPos->nContent, CRSR_SKIP_CHARS ))
-                {
-                    if( (*fnMove->fnNds)( &pPos->nNode, FALSE ))
-                    {
-                        SwCntntNode *pNd = pPos->nNode.GetNode().GetCntntNode();
-                        xub_StrLen nCPos;
-                        if( fnMove == fnMoveForward )
-                            nCPos = 0;
-                        else
-                            nCPos = pNd->Len();
-                        pPos->nContent.Assign( pNd, nCPos );
-                    }
-                    else
-                        bCheckRegion = FALSE;
-                }
-                if( !bCheckRegion || *aRegion.GetPoint() <= *pPos )
-                    return FIND_NOT_FOUND;      // nicht gefunden
-            }*/
             *aRegion.GetMark() = *aSrchPam.GetPoint();
         }
 
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index d95b4857054f..4964ee905a71 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -161,7 +161,7 @@ String& lcl_CleanStr( const SwTxtNode& rNd, xub_StrLen nStart,
                        }
                        break;
                    default:
-                    ASSERT( false, "unknown case in lcl_CleanStr" )
+                    OSL_ENSURE( false, "unknown case in lcl_CleanStr" );
                     break;
                 }
             }
@@ -585,10 +585,6 @@ int SwFindParaText::Find( SwPaM* pCrsr, SwMoveFn fnMove,
 
     BOOL bFnd = (BOOL)pCrsr->Find( rSearchOpt, bSearchInNotes, aSTxt, fnMove, pRegion, bInReadOnly );
 
-    /*   #i80135# if we found something in a note, Mark and Point is the same
-    if( bFnd && *pCrsr->GetMark() == *pCrsr->GetPoint() )
-        return FIND_NOT_FOUND;
-    */
 
     if( bFnd && bReplace )          // String ersetzen ??
     {
diff --git a/sw/source/core/crsr/makefile.mk b/sw/source/core/crsr/makefile.mk
index a2571901c068..c5c59b8ba120 100644
--- a/sw/source/core/crsr/makefile.mk
+++ b/sw/source/core/crsr/makefile.mk
@@ -45,16 +45,11 @@ CDEFS+=-Dmydebug
 # --- Files --------------------------------------------------------
 
 EXCEPTIONSFILES=    \
-    $(SLO)$/crbm.obj \
-    $(SLO)$/crsrsh.obj \
-    $(SLO)$/bookmrk.obj \
-    $(SLO)$/viscrs.obj
-
-SLOFILES =	\
     $(SLO)$/BlockCursor.obj \
     $(SLO)$/bookmrk.obj \
     $(SLO)$/callnk.obj \
     $(SLO)$/crbm.obj \
+    $(SLO)$/crossrefbookmark.obj \
     $(SLO)$/crsrsh.obj \
     $(SLO)$/crstrvl.obj \
     $(SLO)$/crstrvl1.obj \
@@ -70,8 +65,10 @@ SLOFILES =	\
     $(SLO)$/trvlreg.obj \
     $(SLO)$/trvltbl.obj \
     $(SLO)$/unocrsr.obj \
-    $(SLO)$/viscrs.obj \
-    $(SLO)$/crossrefbookmark.obj
+    $(SLO)$/viscrs.obj
+
+SLOFILES =	\
+    $(EXCEPTIONSFILES)
 
 .IF "$(mydebug)" != ""
 SLOFILES +=  \
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index faa7d1774b26..847275d31208 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -551,7 +551,7 @@ void SwPaM::SetMark()
     (*m_pMark) = (*m_pPoint);
 }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
 void SwPaM::Exchange()
 {
@@ -690,24 +690,18 @@ BOOL SwPaM::HasReadonlySel( bool bFormView ) const
     else
         pFrm = 0;
 
-    // --> FME 2004-06-29 #114856# Formular view
     // Will be set if point/mark are inside edit-in-readonly environment
     const SwFrm* pSttEIRFrm = 0;
     const SwFrm* pEndEIRFrm = 0;
 
     if( pFrm && ( pFrm->IsProtected() ||
-                  // --> FME 2004-06-29 #114856# Formular view
-                  ( bFormView &&
-                     0 == ( pSttEIRFrm = lcl_FindEditInReadonlyFrm( *pFrm ) ) ) ) )
-                  // <--
+                  ( bFormView && 0 == ( pSttEIRFrm = lcl_FindEditInReadonlyFrm( *pFrm ) ) ) ) )
         bRet = TRUE;
     else if( pNd )
     {
         const SwSectionNode* pSNd = pNd->GetSectionNode();
         if( pSNd && ( pSNd->GetSection().IsProtectFlag() ||
-                      // --> FME 2004-06-29 #114856# Formular view
                       (bFormView && !pSNd->GetSection().IsEditInReadonlyFlag()) ) )
-                      // <--
             bRet = TRUE;
     }
 
@@ -719,22 +713,16 @@ BOOL SwPaM::HasReadonlySel( bool bFormView ) const
             pFrm = 0;
 
         if( pFrm && ( pFrm->IsProtected() ||
-                  // --> FME 2004-06-29 #114856# Formular view
-                  ( bFormView &&
-                     0 == ( pEndEIRFrm = lcl_FindEditInReadonlyFrm( *pFrm ) ) ) ) )
-                  // <--
+                  ( bFormView && 0 == ( pEndEIRFrm = lcl_FindEditInReadonlyFrm( *pFrm ) ) ) ) )
             bRet = TRUE;
         else if( pNd )
         {
             const SwSectionNode* pSNd = pNd->GetSectionNode();
             if( pSNd && ( pSNd->GetSection().IsProtectFlag() ||
-                          // --> FME 2004-06-29 #114856# Formular view
                           (bFormView && !pSNd->GetSection().IsEditInReadonlyFlag()) ) )
-                          // <--
                 bRet = TRUE;
         }
 
-        // --> FME 2004-06-29 #114856# Formular view
         if ( !bRet && bFormView )
         {
            // Check if start and end frame are inside the _same_
@@ -742,7 +730,6 @@ BOOL SwPaM::HasReadonlySel( bool bFormView ) const
            if ( pSttEIRFrm != pEndEIRFrm )
                 bRet = TRUE;
         }
-        // <--
 
         // oder sollte eine geschuetzte Section innerhalb der
         // Selektion liegen?
@@ -769,7 +756,7 @@ BOOL SwPaM::HasReadonlySel( bool bFormView ) const
                     if( pFmt->GetProtect().IsCntntProtected() )
                     {
                         const SwFmtCntnt& rCntnt = pFmt->GetCntnt(FALSE);
-                        ASSERT( rCntnt.GetCntntIdx(), "wo ist der SectionNode?" );
+                        OSL_ENSURE( rCntnt.GetCntntIdx(), "wo ist der SectionNode?" );
                         ULONG nIdx = rCntnt.GetCntntIdx()->GetIndex();
                         if( nSttIdx <= nIdx && nEndIdx >= nIdx &&
                             rCntnt.GetCntntIdx()->GetNode().GetNodes().IsDocNodes() )
@@ -930,12 +917,6 @@ SwCntntNode* GetNode( SwPaM & rPam, BOOL& rbFirst, SwMoveFn fnMove,
                             ( !bInReadOnly && pFrm->IsProtected() ) ||
                             ( pFrm->IsTxtFrm() &&
                                 ((SwTxtFrm*)pFrm)->IsHiddenNow() ) )
-
-//                          rNodes[ rNodes.EndOfAutotext ]->StartOfSection().GetIndex()
-//                          < aPos.nNode.GetIndex() && aPos.nNode.GetIndex()
-//                          < rNodes.EndOfAutotext.GetIndex() &&
-//                          0 == ( pFrm = pNd->GetFrm()) &&
-//                          pFrm->IsProtected() )
                         {
                             pNd = 0;
                             continue;       // suche weiter
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index bb5feab0125f..c2e61f4c60e4 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -326,7 +326,7 @@ BOOL SwCursor::IsSelOvr( int eFlags )
                 if( rProtect.IsCntntProtected() )
                 {
                     const SwFmtCntnt& rCntnt = pFmt->GetCntnt(FALSE);
-                    ASSERT( rCntnt.GetCntntIdx(), "wo ist der SectionNode?" );
+                    OSL_ENSURE( rCntnt.GetCntntIdx(), "wo ist der SectionNode?" );
                     ULONG nIdx = rCntnt.GetCntntIdx()->GetIndex();
                     if( nSttIdx <= nIdx && nEndIdx >= nIdx )
                     {
@@ -536,7 +536,7 @@ BOOL SwCursor::IsInProtectTable( BOOL bMove, BOOL bChgCrsr )
     // Check for convered cell:
     bool bInCoveredCell = false;
     const SwStartNode* pTmpSttNode = pCNd->FindTableBoxStartNode();
-    ASSERT( pTmpSttNode, "In table, therefore I expect to get a SwTableBoxStartNode" )
+    OSL_ENSURE( pTmpSttNode, "In table, therefore I expect to get a SwTableBoxStartNode" );
     const SwTableBox* pBox = pTmpSttNode ? pTableNode->GetTable().GetTblBox( pTmpSttNode->GetIndex() ) : 0; //Robust #151355
     if ( pBox && pBox->getRowSpan() < 1 ) // Robust #151270
         bInCoveredCell = true;
@@ -1379,6 +1379,7 @@ BOOL SwCursor::SelectWordWT( sal_Int16 nWordType, const Point* pPt )
             const SwPosition rStart = pMark->GetMarkStart();
             GetPoint()->nNode = rStart.nNode;
             GetPoint()->nContent = rStart.nContent;
+            GetPoint()->nContent++; // Don't select the start delimiter
 
             const SwPosition rEnd = pMark->GetMarkEnd();
 
@@ -1387,6 +1388,7 @@ BOOL SwCursor::SelectWordWT( sal_Int16 nWordType, const Point* pPt )
                 SetMark();
                 GetMark()->nNode = rEnd.nNode;
                 GetMark()->nContent = rEnd.nContent;
+                GetMark()->nContent--; //Don't select the end delimiter
             }
             bRet = TRUE;
         }
@@ -1639,7 +1641,7 @@ BOOL SwCursor::LeftRight( BOOL bLeft, USHORT nCnt, USHORT nMode,
     else
         fnGo = CRSR_SKIP_CELLS == nMode ? fnGoCntntCells : fnGoCntnt;
 
-    // ASSERT( not in covered cell )
+    // OSL_ENSURE( not in covered cell )
 
     while( nCnt )
     {
@@ -1833,7 +1835,7 @@ BOOL SwCursor::UpDown( BOOL bUp, USHORT nCnt,
             // set the point to the last frame in the table box. This is
             // only necessary if we do not already have a table selection
             const SwStartNode* pTblNd = GetNode( TRUE )->FindTableBoxStartNode();
-            ASSERT( pTblNd, "pTblCrsr without SwTableNode?" )
+            OSL_ENSURE( pTblNd, "pTblCrsr without SwTableNode?" );
 
             if ( pTblNd ) // safety first
             {
@@ -2094,12 +2096,6 @@ BOOL SwCursor::MoveSection( SwWhichSection fnWhichSect,
                        nsSwCursorSelOverFlags::SELOVER_CHANGEPOS );
 }
 
-/*
-    BOOL MoveTable( SwWhichTable, SwPosTable );
-    BOOL MoveColumn( SwWhichColumn, SwPosColumn );
-    BOOL MoveRegion( SwWhichRegion, SwPosRegion );
-*/
-
 void SwCursor::RestoreSavePos()     // Point auf die SavePos setzen
 {
     if( pSavePos )
@@ -2215,19 +2211,6 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr )
             if( bDel )
             {
                 SwPaM* pDel = (SwPaM*)pCur->GetPrev();
-/*
-JP 20.07.98: der alte Code geht mit dem UNO-TableCrsr nicht
-                if( pDel == pAktCrsr )
-                {
-                    if( pAktCrsr->GetNext() == pAktCrsr )
-                    {
-                        pAktCrsr->DeleteMark();
-                        break;      // es gibt nichts mehr zu loeschen!
-                    }
-                    pAktCrsr = (SwCursor*)pDel->GetPrev();
-                }
-                delete pDel;
-*/
 
                 if( pDel == pAktCrsr )
                     pAktCrsr->DeleteMark();
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index fc24a5a64cc4..85452f10ae9f 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -99,7 +99,7 @@ BOOL SwCrsrShell::GoNextCell( BOOL bAppendLine )
                                     pCrsr->GetPoint()->nNode.GetNode().
                                     StartOfSectionIndex() );
 
-                ASSERT( pTableBox, "Box steht nicht in dieser Tabelle" );
+                OSL_ENSURE( pTableBox, "Box steht nicht in dieser Tabelle" );
                 SwSelBoxes aBoxes;
 
                 //Das Dokument veraendert sich evtl. ohne Action wuerden die Sichten
@@ -305,7 +305,7 @@ BOOL SwCrsrShell::SelTblBox()
     const SwStartNode* pStartNode =
         pCurCrsr->GetPoint()->nNode.GetNode().FindTableBoxStartNode();
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     // the old code checks whether we're in a table by asking the
     // frame. This should yield the same result as searching for the
     // table box start node, right?
@@ -365,7 +365,7 @@ bool lcl_FindNextCell( SwNodeIndex& rIdx, BOOL bInReadOnly )
 
     if ( !pTblNd )
     {
-        ASSERT( false, "lcl_FindNextCell not celled with table start node!" )
+        OSL_ENSURE( false, "lcl_FindNextCell not celled with table start node!" );
         return false;
     }
 
@@ -443,7 +443,7 @@ bool lcl_FindPrevCell( SwNodeIndex& rIdx, BOOL bInReadOnly  )
 
     if ( !pTblNd )
     {
-        ASSERT( false, "lcl_FindPrevCell not celled with table start node!" )
+        OSL_ENSURE( false, "lcl_FindPrevCell not celled with table start node!" );
         return false;
     }
 
@@ -756,7 +756,7 @@ String SwCrsrShell::GetBoxNms() const
             pFrm = pFrm->GetUpper();
         } while ( pFrm && !pFrm->IsCellFrm() );
 
-        ASSERT( pFrm, "kein Frame zur Box" );
+        OSL_ENSURE( pFrm, "kein Frame zur Box" );
         sNm = ((SwCellFrm*)pFrm)->GetTabBox()->GetName();
         sNm += ':';
         pPos = pTblCrsr->End();
diff --git a/sw/source/core/crsr/unocrsr.cxx b/sw/source/core/crsr/unocrsr.cxx
index 4cbd70adec8d..9311ba482e43 100644
--- a/sw/source/core/crsr/unocrsr.cxx
+++ b/sw/source/core/crsr/unocrsr.cxx
@@ -68,7 +68,7 @@ SwUnoCrsr::~SwUnoCrsr()
         if( USHRT_MAX != nDelPos )
             rTbl.Remove( nDelPos );
         else {
-            ASSERT( !this, "UNO Cursor nicht mehr im Array" );
+            OSL_ENSURE( !this, "UNO Cursor nicht mehr im Array" );
         }
     }
 
@@ -227,14 +227,6 @@ SwUnoTableCrsr::~SwUnoTableCrsr()
         delete aTblSel.GetNext();           // und loeschen
 }
 
-
-/*
-SwCursor* SwUnoTableCrsr::Create( SwPaM* pRing ) const
-{
-    return SwUnoCrsr::Create( pRing );
-}
-*/
-
 BOOL SwUnoTableCrsr::IsSelOvr( int eFlags )
 {
     BOOL bRet = SwUnoCrsr::IsSelOvr( eFlags );
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 93c3ea53d4c4..4cafe1110970 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -298,7 +298,7 @@ void SwVisCrsr::Hide()
 
 void __EXPORT SwVisCrsr::Timeout()
 {
-    ASSERT( !bIsDragCrsr, "Timer vorher abschalten" );
+    OSL_ENSURE( !bIsDragCrsr, "Timer vorher abschalten" );
     if( bIsVisible )
     {
         if ( !pCrsrShell->GetWin() ) //SwFrmFmt::GetGraphic setzt das Win temp aus!
@@ -756,7 +756,7 @@ BOOL SwShellCrsr::UpDown( BOOL bUp, USHORT nCnt )
                             &GetPtPos(), GetShell()->GetUpDownX() );
 }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
 // JP 05.03.98: zum Testen des UNO-Crsr Verhaltens hier die Implementierung
 //              am sichtbaren Cursor
@@ -853,7 +853,7 @@ void SwShellTableCrsr::FillRects()
         while( pFrm && !pFrm->IsCellFrm() )
             pFrm = pFrm->GetUpper();
 
-        ASSERT( pFrm, "Node nicht in einer Tabelle" );
+        OSL_ENSURE( pFrm, "Node nicht in einer Tabelle" );
 
         while ( pFrm )
         {
@@ -888,14 +888,14 @@ BOOL SwShellTableCrsr::IsInside( const Point& rPt ) const
         SwFrm* pFrm = pCNd->GetFrm( &GetPtPos() );
         while( pFrm && !pFrm->IsCellFrm() )
             pFrm = pFrm->GetUpper();
-        ASSERT( pFrm, "Node nicht in einer Tabelle" );
+        OSL_ENSURE( pFrm, "Node nicht in einer Tabelle" );
         if( pFrm && pFrm->Frm().IsInside( rPt ) )
             return TRUE;
     }
     return FALSE;
 }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
 // JP 05.03.98: zum Testen des UNO-Crsr Verhaltens hier die Implementierung
 //              am sichtbaren Cursor
diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx
index e13699ffecea..13346087e1cd 100644
--- a/sw/source/core/doc/acmplwrd.cxx
+++ b/sw/source/core/doc/acmplwrd.cxx
@@ -55,7 +55,7 @@ class SwAutoCompleteClient : public SwClient
 {
     SwAutoCompleteWord* pAutoCompleteWord;
     SwDoc*              pDoc;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     static ULONG nSwAutoCompleteClientCount;
 #endif
 public:
@@ -67,7 +67,7 @@ public:
 
     virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
     const SwDoc& GetDoc(){return *pDoc;}
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     static ULONG GetElementCount() {return nSwAutoCompleteClientCount;}
 #endif
 };
@@ -89,7 +89,7 @@ typedef const SwDoc* SwDocPtr;
 typedef std::vector<SwDocPtr> SwDocPtrVector;
 class SwAutoCompleteString : public String
 {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     static ULONG nSwAutoCompleteStringCount;
 #endif
     SwDocPtrVector aSourceDocs;
@@ -100,11 +100,11 @@ class SwAutoCompleteString : public String
         void        AddDocument(const SwDoc& rDoc);
         //returns true if last document reference has been removed
         sal_Bool     RemoveDocument(const SwDoc& rDoc);
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     static ULONG GetElementCount() {return nSwAutoCompleteStringCount;}
 #endif
 };
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     ULONG SwAutoCompleteClient::nSwAutoCompleteClientCount = 0;
     ULONG SwAutoCompleteString::nSwAutoCompleteStringCount = 0;
 #endif
@@ -114,7 +114,7 @@ SwAutoCompleteClient::SwAutoCompleteClient(SwAutoCompleteWord& rToTell, SwDoc& r
         pDoc(&rSwDoc)
 {
     pDoc->GetPageDescFromPool(RES_POOLPAGE_STANDARD)->Add(this);
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     ++nSwAutoCompleteClientCount;
 #endif
 }
@@ -125,14 +125,14 @@ SwAutoCompleteClient::SwAutoCompleteClient(const SwAutoCompleteClient& rClient)
     pDoc(rClient.pDoc)
 {
     pDoc->GetPageDescFromPool(RES_POOLPAGE_STANDARD)->Add(this);
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     ++nSwAutoCompleteClientCount;
 #endif
 }
 
 SwAutoCompleteClient::~SwAutoCompleteClient()
 {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     --nSwAutoCompleteClientCount;
 #endif
 }
@@ -189,14 +189,14 @@ void SwAutoCompleteWord_Impl::RemoveDocument(const SwDoc& rDoc)
 SwAutoCompleteString::SwAutoCompleteString(const String& rStr, xub_StrLen nPos, xub_StrLen nLen) :
             String( rStr, nPos, nLen )
 {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     ++nSwAutoCompleteStringCount;
 #endif
 }
 
 SwAutoCompleteString::~SwAutoCompleteString()
 {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     --nSwAutoCompleteStringCount;
 #endif
 }
@@ -245,7 +245,7 @@ SwAutoCompleteWord::~SwAutoCompleteWord()
         delete pCurrent;
     }
     delete pImpl;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     ULONG nStrings = SwAutoCompleteString::GetElementCount();
     ULONG nClients = SwAutoCompleteClient::GetElementCount();
     DBG_ASSERT(!nStrings && !nClients, "AutoComplete: clients or string count mismatch");
@@ -310,7 +310,7 @@ BOOL SwAutoCompleteWord::InsertWord( const String& rWord, SwDoc& rDoc )
             pCurrent->AddDocument(rDoc);
 
             nInsPos = aLRULst.GetPos( (void*)pNew );
-            ASSERT( USHRT_MAX != nInsPos, "String nicht gefunden" );
+            OSL_ENSURE( USHRT_MAX != nInsPos, "String nicht gefunden" );
             if( nInsPos )
             {
                 void** ppData = (void**)aLRULst.GetData();
@@ -331,7 +331,7 @@ void SwAutoCompleteWord::SetMaxCount( USHORT nNewMax )
         while( nNewMax < aWordLst.Count() && nLRUIndex < aLRULst.Count())
         {
             USHORT nPos = aWordLst.GetPos( (String*)aLRULst[ nLRUIndex++ ] );
-            ASSERT( USHRT_MAX != nPos, "String nicht gefunden" );
+            OSL_ENSURE( USHRT_MAX != nPos, "String nicht gefunden" );
             void * pDel = aWordLst[nPos];
             aWordLst.Remove(nPos);
             delete (SwAutoCompleteString*)pDel;
@@ -357,7 +357,7 @@ void SwAutoCompleteWord::SetMinWordLen( USHORT n )
                 aWordLst.Remove(nPos);
 
                 USHORT nDelPos = aLRULst.GetPos( pDel );
-                ASSERT( USHRT_MAX != nDelPos, "String nicht gefunden" );
+                OSL_ENSURE( USHRT_MAX != nDelPos, "String nicht gefunden" );
                 aLRULst.Remove( nDelPos );
                 --nPos;
                 delete (SwAutoCompleteString*)pDel;
@@ -395,7 +395,7 @@ void SwAutoCompleteWord::CheckChangedList( const SvStringsISortDtor& rNewLst )
             aWordLst.Remove(nMyPos);
 
             USHORT nPos = aLRULst.GetPos( pDel );
-            ASSERT( USHRT_MAX != nPos, "String nicht gefunden" );
+            OSL_ENSURE( USHRT_MAX != nPos, "String nicht gefunden" );
             aLRULst.Remove( nPos );
             delete (SwAutoCompleteString*)pDel;
             if( nMyPos >= --nMyLen )
@@ -410,7 +410,7 @@ void SwAutoCompleteWord::CheckChangedList( const SvStringsISortDtor& rNewLst )
         {
             void* pDel = aWordLst[ nNewPos ];
             USHORT nPos = aLRULst.GetPos( pDel );
-            ASSERT( USHRT_MAX != nPos, "String nicht gefunden" );
+            OSL_ENSURE( USHRT_MAX != nPos, "String nicht gefunden" );
             aLRULst.Remove( nPos );
             delete (SwAutoCompleteString*)pDel;
         }
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
index 678fb880e6c6..6dc857f6a5f0 100644
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -550,7 +550,7 @@ String lcl_dbg_out(const SwNode & rNode)
     aTmpStr += String::CreateFromInt32(rNode.GetIndex());
     aTmpStr += String("\"", RTL_TEXTENCODING_ASCII_US);
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     aTmpStr += String(" serial=\"", RTL_TEXTENCODING_ASCII_US);
     aTmpStr += String::CreateFromInt32(rNode.GetSerial());
     aTmpStr += String("\"", RTL_TEXTENCODING_ASCII_US);
@@ -638,7 +638,6 @@ String lcl_dbg_out(const SwNode & rNode)
 
             aTmpStr += String("(", RTL_TEXTENCODING_ASCII_US);
             aTmpStr += String::CreateFromInt32
-                //(static_cast<SwTxtFmtColl *>(pColl)->GetOutlineLevel());//#outline level,zhaojianwei
                 (static_cast<SwTxtFmtColl *>(pColl)->GetAssignedOutlineStyleLevel());//<-end,zhaojianwei
 
             const SwNumRuleItem & rItem =
@@ -1043,7 +1042,7 @@ String lcl_TokenType2Str(FormTokenType nType)
         return String("??", RTL_TEXTENCODING_ASCII_US);
     }
 
-    ASSERT(false, "should not be reached");
+    OSL_ENSURE(false, "should not be reached");
 
     return  String("??", RTL_TEXTENCODING_ASCII_US);
 }
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 610383cbca1f..2d6b2abf4a81 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -142,7 +142,7 @@ SV_IMPL_PTRARR( SwFldTypes, SwFldTypePtr)
 /* IInterface */
 sal_Int32 SwDoc::acquire()
 {
-    OSL_ASSERT(mReferenceCount >= 0 && "Negative reference count detected! This is a sign for unbalanced acquire/release calls.");
+    OSL_ENSURE(mReferenceCount >= 0, "Negative reference count detected! This is a sign for unbalanced acquire/release calls.");
     return osl_incrementInterlockedCount(&mReferenceCount);
 }
 
@@ -154,7 +154,7 @@ sal_Int32 SwDoc::release()
 
 sal_Int32 SwDoc::getReferenceCount() const
 {
-    OSL_ASSERT(mReferenceCount >= 0 && "Negative reference count detected! This is a sign for unbalanced acquire/release calls.");
+    OSL_ENSURE(mReferenceCount >= 0, "Negative reference count detected! This is a sign for unbalanced acquire/release calls.");
     return mReferenceCount;
 }
 
@@ -206,7 +206,7 @@ bool SwDoc::get(/*[in]*/ DocumentSettingId id) const
         case KERN_ASIAN_PUNCTUATION: return mbKernAsianPunctuation;
         case DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT: return mbDoNotResetParaAttrsForNumFont;
         default:
-            ASSERT(false, "Invalid setting id");
+            OSL_ENSURE(false, "Invalid setting id");
     }
     return false;
 }
@@ -360,7 +360,7 @@ void SwDoc::set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value)
             break;
 
         default:
-            ASSERT(false, "Invalid setting id");
+            OSL_ENSURE(false, "Invalid setting id");
     }
 }
 
@@ -643,6 +643,8 @@ void SwDoc::setJobsetup(/*[in]*/ const JobSetup &rJobSetup )
 
 SwPrintData* SwDoc::getPrintData() const
 {
+    if(!pPrtData)
+        ((SwDoc*)this)->pPrtData = new SwPrintData;
     return pPrtData;
 }
 
@@ -771,7 +773,7 @@ bool SwDoc::SplitNode( const SwPosition &rPos, bool bChkTableStart )
     _SaveCntntIdx( this, rPos.nNode.GetIndex(), rPos.nContent.GetIndex(),
                     aBkmkArr, SAVEFLY_SPLIT );
     // FIXME: only SwTxtNode has a valid implementation of SplitCntntNode!
-    ASSERT(pNode->IsTxtNode(), "splitting non-text node?");
+    OSL_ENSURE(pNode->IsTxtNode(), "splitting non-text node?");
     pNode = pNode->SplitCntntNode( rPos );
     if (pNode)
     {
@@ -1339,7 +1341,6 @@ void SwDoc::CalculatePagesForPrinting(
     OUString aPageRange;
     if (bIsPDFExport)
     {
-        // ?? rOptions.getValue( C2U("Selection") );
         aPageRange = rOptions.getStringValue( "PageRange", OUString() );
     }
     else
@@ -2081,7 +2082,7 @@ BOOL lcl_CheckSmartTagsAgain( const SwNodePtr& rpNd, void*  )
  ************************************************************************/
 void SwDoc::SpellItAgainSam( BOOL bInvalid, BOOL bOnlyWrong, BOOL bSmartTags )
 {
-    ASSERT( GetRootFrm(), "SpellAgain: Where's my RootFrm?" );
+    OSL_ENSURE( GetRootFrm(), "SpellAgain: Where's my RootFrm?" );
     if( bInvalid )
     {
         SwPageFrm *pPage = (SwPageFrm*)GetRootFrm()->Lower();
@@ -2155,8 +2156,7 @@ void SwDoc::Summary( SwDoc* pExtDoc, BYTE nLevel, BYTE nPara, BOOL bImpress )
         {
             ::SetProgressState( i, GetDocShell() );
             const ULONG nIndex = rOutNds[ i ]->GetIndex();
-            //BYTE nLvl = ((SwTxtNode*)GetNodes()[ nIndex ])->GetTxtColl()//#outline level,zhaojianwei
-                        // ->GetOutlineLevel();
+
             const int nLvl = ((SwTxtNode*)GetNodes()[ nIndex ])->GetAttrOutlineLevel()-1;//<-end,zhaojianwei
             if( nLvl > nLevel )
                 continue;
@@ -2195,7 +2195,7 @@ void SwDoc::Summary( SwDoc* pExtDoc, BYTE nLevel, BYTE nPara, BOOL bImpress )
                 if( bImpress )
                 {
                     SwTxtFmtColl* pMyColl = pNd->GetTxtColl();
-                    //USHORT nHeadLine = static_cast<USHORT>(pMyColl->GetOutlineLevel()==NO_NUMBERING ?//#outlinelevel,zhaojianwei
+
                     const USHORT nHeadLine = static_cast<USHORT>(
                                 !pMyColl->IsAssignedToListLevelOfOutlineStyle() //<-end,zhaojianwei
                                 ? RES_POOLCOLL_HEADLINE2
diff --git a/sw/source/core/doc/docbasic.cxx b/sw/source/core/doc/docbasic.cxx
index 8f7f374da5b8..598e8e5c7c83 100644
--- a/sw/source/core/doc/docbasic.cxx
+++ b/sw/source/core/doc/docbasic.cxx
@@ -134,12 +134,6 @@ BOOL SwDoc::ExecMacro( const SvxMacro& rMacro, String* pRet, SbxArray* pArgs )
             eErr = pDocShell->CallXScript(
                 rMacro.GetMacName(), *pUnoArgs, aRet, aOutArgsIndex, aOutArgs);
 
-            //*pRet = pRetValue->GetString();
-            // use the AnyConverter to return a String if appropriate?
-
-            // need to call something like lcl_translateUno2Basic
-            // pArgs = lcl_translateUno2Basic( pUnoArgs );
-
             delete pUnoArgs;
             break;
         }
@@ -254,12 +248,6 @@ USHORT SwDoc::CallEvent( USHORT nEvent, const SwCallMouseEvent& rCallEvent,
                 nRet += 0 == pDocShell->CallXScript(
                     rMacro.GetMacName(), *pUnoArgs,aRet, aOutArgsIndex, aOutArgs) ? 1 : 0;
 
-                //*pRet = pRetValue->GetString();
-                // use the AnyConverter to return a String if appropriate?
-
-                // need to call something like lcl_translateUno2Basic
-                // pArgs = lcl_translateUno2Basic( pUnoArgs );
-
                 delete pUnoArgs;
             }
             // JavaScript calls are ignored
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 6b2148f0508d..a803161855e9 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -353,28 +353,28 @@ namespace sw { namespace mark
         switch(eType)
         {
             case IDocumentMarkAccess::TEXT_FIELDMARK:
-                pMark = shared_ptr<IMark>(new TextFieldmark(rPaM));
+                pMark = boost::shared_ptr<IMark>(new TextFieldmark(rPaM));
                 break;
             case IDocumentMarkAccess::CHECKBOX_FIELDMARK:
-                pMark = shared_ptr<IMark>(new CheckboxFieldmark(rPaM));
+                pMark = boost::shared_ptr<IMark>(new CheckboxFieldmark(rPaM));
                 break;
             case IDocumentMarkAccess::NAVIGATOR_REMINDER:
-                pMark = shared_ptr<IMark>(new NavigatorReminder(rPaM));
+                pMark = boost::shared_ptr<IMark>(new NavigatorReminder(rPaM));
                 break;
             case IDocumentMarkAccess::BOOKMARK:
-                pMark = shared_ptr<IMark>(new Bookmark(rPaM, KeyCode(), rName, ::rtl::OUString()));
+                pMark = boost::shared_ptr<IMark>(new Bookmark(rPaM, KeyCode(), rName, ::rtl::OUString()));
                 break;
             case IDocumentMarkAccess::DDE_BOOKMARK:
-                pMark = shared_ptr<IMark>(new DdeBookmark(rPaM));
+                pMark = boost::shared_ptr<IMark>(new DdeBookmark(rPaM));
                 break;
             case IDocumentMarkAccess::CROSSREF_HEADING_BOOKMARK:
-                pMark = shared_ptr<IMark>(new CrossRefHeadingBookmark(rPaM, KeyCode(), rName, ::rtl::OUString()));
+                pMark = boost::shared_ptr<IMark>(new CrossRefHeadingBookmark(rPaM, KeyCode(), rName, ::rtl::OUString()));
                 break;
             case IDocumentMarkAccess::CROSSREF_NUMITEM_BOOKMARK:
-                pMark = shared_ptr<IMark>(new CrossRefNumItemBookmark(rPaM, KeyCode(), rName, ::rtl::OUString()));
+                pMark = boost::shared_ptr<IMark>(new CrossRefNumItemBookmark(rPaM, KeyCode(), rName, ::rtl::OUString()));
                 break;
             case IDocumentMarkAccess::UNO_BOOKMARK:
-                pMark = shared_ptr<IMark>(new UnoMark(rPaM));
+                pMark = boost::shared_ptr<IMark>(new UnoMark(rPaM));
                 break;
         }
         OSL_ENSURE(pMark.get(),
@@ -396,12 +396,10 @@ namespace sw { namespace mark
             case IDocumentMarkAccess::BOOKMARK:
             case IDocumentMarkAccess::CROSSREF_NUMITEM_BOOKMARK:
             case IDocumentMarkAccess::CROSSREF_HEADING_BOOKMARK:
-            // if(dynamic_cast<IBookmark*>)
                 lcl_InsertMarkSorted(m_vBookmarks, pMark);
                 break;
             case IDocumentMarkAccess::TEXT_FIELDMARK:
             case IDocumentMarkAccess::CHECKBOX_FIELDMARK:
-            // if(dynamic_cast<IFieldmark*>
                 lcl_InsertMarkSorted(m_vFieldmarks, pMark);
                 break;
             case IDocumentMarkAccess::NAVIGATOR_REMINDER:
@@ -669,7 +667,7 @@ namespace sw { namespace mark
         }
 
         // we just remembered the iterators to delete, so we do not need to search
-        // for the shared_ptr<> (the entry in m_vMarks) again
+        // for the boost::shared_ptr<> (the entry in m_vMarks) again
         // reverse iteration, since erasing an entry invalidates iterators
         // behind it (the iterators in vMarksToDelete are sorted)
         for(vector<const_iterator_t>::reverse_iterator pppMark = vMarksToDelete.rbegin();
@@ -706,7 +704,6 @@ namespace sw { namespace mark
             }
             case IDocumentMarkAccess::TEXT_FIELDMARK:
             case IDocumentMarkAccess::CHECKBOX_FIELDMARK:
-            // if(dynamic_cast<IFieldmark*>
             {
                 IDocumentMarkAccess::iterator_t ppFieldmark = lcl_FindMark(m_vFieldmarks, *ppMark);
                 OSL_ENSURE(ppFieldmark != m_vFieldmarks.end(),
@@ -749,7 +746,7 @@ namespace sw { namespace mark
         iterator_t pMarkHigh = m_vMarks.end();
         iterator_t pMarkFound = find_if(
             pMarkLow, pMarkHigh,
-            bind(equal_to<const IMark*>(), bind(&shared_ptr<IMark>::get, _1), pMark));
+            bind(equal_to<const IMark*>(), bind(&boost::shared_ptr<IMark>::get, _1), pMark));
         if(pMarkFound != pMarkHigh)
             deleteMark(pMarkFound);
     }
@@ -840,10 +837,6 @@ namespace sw { namespace mark
 }} // namespace ::sw::mark
 
 
-// old implementation
-
-//SV_IMPL_OP_PTRARR_SORT(SwBookmarks, SwBookmarkPtr)
-
 #define PCURCRSR (_pCurrCrsr)
 #define FOREACHPAM_START(pSttCrsr) \
     {\
diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx
index a6baec896d9b..3a8f5b86c6d9 100644
--- a/sw/source/core/doc/docchart.cxx
+++ b/sw/source/core/doc/docchart.cxx
@@ -79,7 +79,7 @@ BOOL SwTable::IsTblComplexForChart( const String& rSelection,
         if( '>' == sBox.GetChar( sBox.Len()-1  ) ) sBox.Erase( sBox.Len()-1 );
 
         xub_StrLen nTrenner = sBox.Search( ':' );
-        ASSERT( STRING_NOTFOUND != nTrenner, "keine gueltige Selektion" );
+        OSL_ENSURE( STRING_NOTFOUND != nTrenner, "keine gueltige Selektion" );
 
         pSttBox = GetTblBox( sBox.Copy( 0, nTrenner ));
         pEndBox = GetTblBox( sBox.Copy( nTrenner+1 ));
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 4cdfc46a311b..11030e68ea8a 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -369,7 +369,7 @@ void Hash::CalcHashValue( CompareData& rData )
         for( ULONG n = 0; n < rData.GetLineCount(); ++n )
         {
             const CompareLine* pLine = rData.GetLine( n );
-            ASSERT( pLine, "wo ist die Line?" );
+            OSL_ENSURE( pLine, "wo ist die Line?" );
             ULONG nH = pLine->GetHashValue();
 
             ULONG* pFound = &pHashArr[ nH % nPrime ];
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 27fcbf0c8cb6..7b1956b1c204 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -196,7 +196,7 @@ void lcl_DescSetAttr( const SwFrmFmt &rSource, SwFrmFmt &rDest,
 
 void SwDoc::ChgPageDesc( USHORT i, const SwPageDesc &rChged )
 {
-    ASSERT( i < aPageDescs.Count(), "PageDescs ueberindiziert." );
+    OSL_ENSURE( i < aPageDescs.Count(), "PageDescs ueberindiziert." );
 
     SwPageDesc *pDesc = aPageDescs[i];
 
@@ -485,7 +485,7 @@ void SwDoc::PreDelPageDesc(SwPageDesc * pDel)
                     ((SwFmt*)pMod)->SetFmtAttr( aDfltDesc );
                 else
                 {
-                    ASSERT( !this, "was ist das fuer ein Mofify-Obj?" );
+                    OSL_ENSURE( !this, "was ist das fuer ein Mofify-Obj?" );
                     aPageDescs[0]->Add( pLast );
                 }
             }
@@ -554,8 +554,8 @@ void SwDoc::BroadcastStyleOperation(String rName, SfxStyleFamily eFamily,
 
 void SwDoc::DelPageDesc( USHORT i, BOOL bBroadcast )
 {
-    ASSERT( i < aPageDescs.Count(), "PageDescs ueberindiziert." );
-    ASSERT( i != 0, "Default Pagedesc loeschen is nicht." );
+    OSL_ENSURE( i < aPageDescs.Count(), "PageDescs ueberindiziert." );
+    OSL_ENSURE( i != 0, "Default Pagedesc loeschen is nicht." );
     if ( i == 0 )
         return;
 
@@ -661,8 +661,8 @@ void SwDoc::PrtDataChanged()
 //!!!!!!!! Bei Aenderungen hier bitte ggf. InJobSetup im Sw3io mitpflegen
 
     // --> FME 2005-01-21 #i41075#
-    ASSERT( get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) ||
-            0 != getPrinter( sal_False ), "PrtDataChanged will be called recursive!" )
+    OSL_ENSURE( get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) ||
+            0 != getPrinter( sal_False ), "PrtDataChanged will be called recursive!" );
     // <--
 
     SwWait *pWait = 0;
@@ -822,19 +822,6 @@ void SwDoc::PrtOLENotify( BOOL bAll )
                 //Wenn es keine Benachrichtigung wuenscht
                 if ( xObj.is() )
                 {
-                    //TODO/LATER: needs MiscStatus for ResizeOnPrinterChange
-                    /*
-                    if ( SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE & xRef->GetMiscStatus())
-                    {
-                        if ( pOLENd->GetFrm() )
-                        {
-                            xObj->OnDocumentPrinterChanged( pPrt );
-                            pShell->CalcAndSetScale( xObj );//Client erzeugen lassen.
-                        }
-                        else
-                            pOLENd->SetOLESizeInvalid( TRUE );
-                    }
-                    else */
                         pGlobalOLEExcludeList->Insert(
                                 new SvGlobalName( aName ),
                                 pGlobalOLEExcludeList->Count() );
@@ -885,20 +872,6 @@ IMPL_LINK( SwDoc, DoUpdateModifiedOLE, Timer *, )
                 //Wenn es keine Benachrichtigung wuenscht
                 if( pOLENd->GetOLEObj().GetOleRef().is() ) //Kaputt?
                 {
-                    //TODO/LATER: needs MiscStatus for ResizeOnPrinterChange
-                    /*
-                    if( SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE &
-                            xRef->GetMiscStatus() )
-                    {
-                        if( pOLENd->GetFrm() )
-                        {
-                            xRef->OnDocumentPrinterChanged( pPrt );
-                            pSh->CalcAndSetScale( xRef );//Client erzeugen lassen.
-                        }
-                        else
-                            pOLENd->SetOLESizeInvalid( TRUE );
-                    }*/
-                    // repaint it
                     pOLENd->Modify( &aMsgHint, &aMsgHint );
                 }
             }
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 64df9b62b499..cb68a34eb7b0 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -96,14 +96,14 @@ void lcl_AdjustPositioningAttr( SwDrawFrmFmt* _pFrmFmt,
                                 const SdrObject& _rSdrObj )
 {
     const SwContact* pContact = GetUserCall( &_rSdrObj );
-    ASSERT( pContact, "<lcl_AdjustPositioningAttr(..)> - missing contact object." );
+    OSL_ENSURE( pContact, "<lcl_AdjustPositioningAttr(..)> - missing contact object." );
 
     // determine position of new group object relative to its anchor frame position
     SwTwips nHoriRelPos = 0;
     SwTwips nVertRelPos = 0;
     {
         const SwFrm* pAnchorFrm = pContact->GetAnchoredObj( &_rSdrObj )->GetAnchorFrm();
-        ASSERT( !pAnchorFrm ||
+        OSL_ENSURE( !pAnchorFrm ||
                 !pAnchorFrm->IsTxtFrm() ||
                 !static_cast<const SwTxtFrm*>(pAnchorFrm)->IsFollow(),
                 "<lcl_AdjustPositioningAttr(..)> - anchor frame is a follow. Please inform OD." );
@@ -136,7 +136,7 @@ void lcl_AdjustPositioningAttr( SwDrawFrmFmt* _pFrmFmt,
                     // vertical from left-to-right - not supported yet
                     bVert = true;
                     bR2L = true;
-                    ASSERT( false,
+                    OSL_ENSURE( false,
                             "<lcl_AdjustPositioningAttr(..)> - vertical from left-to-right not supported." );
                 }
                 break;
@@ -241,10 +241,10 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView )
             SwDrawContact *pContact = (SwDrawContact*)GetUserCall(pObj);
 
             // --> OD 2005-08-16 #i53320#
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
             SwAnchoredDrawObject* pAnchoredDrawObj =
                 static_cast<SwAnchoredDrawObject*>(pContact->GetAnchoredObj( pObj ));
-            ASSERT( bGroupMembersNotPositioned == pAnchoredDrawObj->NotYetPositioned(),
+            OSL_ENSURE( bGroupMembersNotPositioned == pAnchoredDrawObj->NotYetPositioned(),
                     "<SwDoc::GroupSelection(..)> - group members have different positioning status!" );
 #endif
             // <--
@@ -278,7 +278,7 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView )
         // <--
 
         rDrawView.GroupMarked();
-        ASSERT( rMrkList.GetMarkCount() == 1, "GroupMarked more or none groups." );
+        OSL_ENSURE( rMrkList.GetMarkCount() == 1, "GroupMarked more or none groups." );
 
         SdrObject* pNewGroupObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj();
         pNewContact = new SwDrawContact( pFmt, pNewGroupObj );
@@ -308,7 +308,7 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView )
             ClearRedo();
 
         rDrawView.GroupMarked();
-        ASSERT( rMrkList.GetMarkCount() == 1, "GroupMarked more or none groups." );
+        OSL_ENSURE( rMrkList.GetMarkCount() == 1, "GroupMarked more or none groups." );
     }
 
     return pNewContact;
@@ -365,19 +365,6 @@ void SwDoc::UnGroupSelection( SdrView& rDrawView )
                         // --> OD 2004-10-25 #i36010# - set layout direction of the position
                         pFmt->SetPositionLayoutDir(
                             text::PositionLayoutDir::PositionInLayoutDirOfAnchor );
-                        // <--
-                        // --> OD 2006-11-01 #130889#
-                        // creation of <SwDrawContact> instances for the group
-                        // members and its connection to the Writer layout is
-                        // done after intrinsic ungrouping.
-//                        SwDrawContact* pContact = new SwDrawContact( pFmt, pSubObj );
-//                        // --> OD 2004-11-22 #i35635#
-//                        pContact->MoveObjToVisibleLayer( pSubObj );
-//                        // <--
-//                        pContact->ConnectToLayout();
-//                        // OD 2004-04-07 #i26791# - Adjust positioning and
-//                        // alignment attributes.
-//                        lcl_AdjustPositioningAttr( pFmt, *pSubObj );
                         pFmtsAndObjs[i].push_back( std::pair< SwDrawFrmFmt*, SdrObject* >( pFmt, pSubObj ) );
                         // <--
 
@@ -496,7 +483,7 @@ BOOL SwDoc::DeleteSelection( SwDrawView& rDrawView )
                         // Thus, assert, if a <SwDrawVirt>-object is found in the mark list.
                         if ( pObj->ISA(SwDrawVirtObj) )
                         {
-                            ASSERT( false,
+                            OSL_ENSURE( false,
                                     "<SwDrawVirtObj> is still marked for delete. application will crash!" );
                         }
                         //loescht sich selbst!
@@ -563,7 +550,7 @@ _ZSortFly::_ZSortFly( const SwFrmFmt* pFrmFmt, const SwFmtAnchor* pFlyAn,
             nOrdNum = ((SwDrawContact*)aIter())->GetMaster()->GetOrdNum();
     }
     else {
-        ASSERT( !this, "was ist das fuer ein Format?" );
+        OSL_ENSURE( !this, "was ist das fuer ein Format?" );
     }
 }
 
@@ -721,7 +708,7 @@ bool SwDoc::IsVisibleLayerId( const SdrLayerID& _nLayerId ) const
     }
     else
     {
-        ASSERT( false, "<SwDoc::IsVisibleLayerId(..)> - unknown layer ID." );
+        OSL_ENSURE( false, "<SwDoc::IsVisibleLayerId(..)> - unknown layer ID." );
         bRetVal = false;
     }
 
@@ -756,12 +743,12 @@ SdrLayerID SwDoc::GetVisibleLayerIdByInvisibleOne( const SdrLayerID& _nInvisible
               _nInvisibleLayerId == GetHellId() ||
               _nInvisibleLayerId == GetControlsId() )
     {
-        ASSERT( false, "<SwDoc::GetVisibleLayerIdByInvisibleOne(..)> - given layer ID already an invisible one." );
+        OSL_ENSURE( false, "<SwDoc::GetVisibleLayerIdByInvisibleOne(..)> - given layer ID already an invisible one." );
         nVisibleLayerId = _nInvisibleLayerId;
     }
     else
     {
-        ASSERT( false, "<SwDoc::GetVisibleLayerIdByInvisibleOne(..)> - given layer ID is unknown." );
+        OSL_ENSURE( false, "<SwDoc::GetVisibleLayerIdByInvisibleOne(..)> - given layer ID is unknown." );
         nVisibleLayerId = _nInvisibleLayerId;
     }
 
@@ -796,12 +783,12 @@ SdrLayerID SwDoc::GetInvisibleLayerIdByVisibleOne( const SdrLayerID& _nVisibleLa
               _nVisibleLayerId == GetInvisibleHellId() ||
               _nVisibleLayerId == GetInvisibleControlsId() )
     {
-        ASSERT( false, "<SwDoc::GetInvisibleLayerIdByVisibleOne(..)> - given layer ID already an invisible one." );
+        OSL_ENSURE( false, "<SwDoc::GetInvisibleLayerIdByVisibleOne(..)> - given layer ID already an invisible one." );
         nInvisibleLayerId = _nVisibleLayerId;
     }
     else
     {
-        ASSERT( false, "<SwDoc::GetInvisibleLayerIdByVisibleOne(..)> - given layer ID is unknown." );
+        OSL_ENSURE( false, "<SwDoc::GetInvisibleLayerIdByVisibleOne(..)> - given layer ID is unknown." );
         nInvisibleLayerId = _nVisibleLayerId;
     }
 
@@ -820,9 +807,9 @@ void SwDoc::ReleaseDrawModel()
         delete pDrawModel; pDrawModel = 0;
         SfxItemPool *pSdrPool = GetAttrPool().GetSecondaryPool();
 
-        ASSERT( pSdrPool, "missing Pool" );
+        OSL_ENSURE( pSdrPool, "missing Pool" );
         SfxItemPool *pEEgPool = pSdrPool->GetSecondaryPool();
-        ASSERT( !pEEgPool->GetSecondaryPool(), "i don't accept additional pools");
+        OSL_ENSURE( !pEEgPool->GetSecondaryPool(), "i don't accept additional pools");
         pSdrPool->Delete();                 //Erst die Items vernichten lassen,
                                             //dann erst die Verkettung loesen
         GetAttrPool().SetSecondaryPool( 0 );    //Der ist ein muss!
@@ -837,7 +824,7 @@ void SwDoc::ReleaseDrawModel()
 
 SdrModel* SwDoc::_MakeDrawModel()
 {
-    ASSERT( !pDrawModel, "_MakeDrawModel: Why?" );
+    OSL_ENSURE( !pDrawModel, "_MakeDrawModel: Why?" );
     InitDrawModel();
     if ( pLayout && pLayout->GetCurrShell() )
     {
@@ -1030,7 +1017,7 @@ namespace docfunc
                         {
                             if ( !pAnchoredDrawObj )
                             {
-                                ASSERT( false,
+                                OSL_ENSURE( false,
                                         "<docfunc::AllDrawObjsOnPage() - missing anchored draw object" );
                                 bAllDrawObjsOnPage = false;
                                 break;
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index d12c3b0ff9da..3b651d450e97 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -284,7 +284,6 @@ void _SaveFlyInRange( const SwPaM& rPam, const SwNodeIndex& rInsPos,
                     SwFmtAnchor aAnchor( *pAnchor );
                     aAnchor.SetAnchor( &aPos );
                     pFmt->SetFmtAttr( aAnchor );
-//                  ((SwFmtAnchor*)pAnchor)->SetAnchor( &aPos );
                 }
             }
             else if( ( rSttNdIdx.GetIndex() + nSttOff <= pAPos->nNode.GetIndex()
@@ -593,7 +592,6 @@ void lcl_SaveRedlines( const SwNodeRange& rRg, _SaveRedlines& rArr )
                             pTmpPos->nNode.GetNode().GetCntntNode(), 0 );
 
                 _SaveRedline* pSave = new _SaveRedline( pNewRedl, rRg.aStart );
-//              rArr.Insert( pSave, rArr.Count() );
                 rArr.C40_INSERT( _SaveRedline, pSave, rArr.Count() );
 
                 pTmpPos = pTmp->End();
@@ -617,7 +615,6 @@ void lcl_SaveRedlines( const SwNodeRange& rRg, _SaveRedlines& rArr )
             {
                 // gesamt verschieben
                 _SaveRedline* pSave = new _SaveRedline( pTmp, rRg.aStart );
-//              rArr.Insert( pSave, rArr.Count() );
                 rArr.C40_INSERT( _SaveRedline, pSave, rArr.Count() );
             }
             else
@@ -630,7 +627,6 @@ void lcl_SaveRedlines( const SwNodeRange& rRg, _SaveRedlines& rArr )
                             pTmpPos->nNode.GetNode().GetCntntNode(), 0 );
 
                 _SaveRedline* pSave = new _SaveRedline( pNewRedl, rRg.aStart );
-//              rArr.Insert( pSave, rArr.Count() );
                 rArr.C40_INSERT( _SaveRedline, pSave, rArr.Count() );
 
                 pTmpPos = pTmp->Start();
@@ -718,7 +714,7 @@ void _SaveRedlEndPosForRestore::_Restore()
 // Der uebergebene Node steht irgendwo in der gewuenschten Section
 void SwDoc::DeleteSection( SwNode *pNode )
 {
-    ASSERT( pNode, "Kein Node uebergeben." );
+    OSL_ENSURE( pNode, "Kein Node uebergeben." );
     SwStartNode* pSttNd = pNode->IsStartNode() ? (SwStartNode*)pNode
                                                : pNode->StartOfSectionNode();
     SwNodeIndex aSttIdx( *pSttNd ), aEndIdx( *pNode->EndOfSectionNode() );
@@ -1004,7 +1000,7 @@ bool SwDoc::MoveRange( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
     else
         rPaM.DeleteMark();
 
-    ASSERT( *aSavePam.GetMark() == rPos ||
+    OSL_ENSURE( *aSavePam.GetMark() == rPos ||
             ( aSavePam.GetMark()->nNode.GetNode().GetCntntNode() == NULL ),
             "PaM wurde nicht verschoben, am Anfang/Ende keine ContentNodes?" );
     *aSavePam.GetMark() = rPos;
@@ -1046,7 +1042,6 @@ bool SwDoc::MoveRange( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
             }
             bJoin = sal_False;
         }
-//      else if( !bCorrSavePam && !pSavePam->Move( fnMoveForward, fnGoCntnt ))
         else if ( !aSavePam.Move( fnMoveForward, fnGoCntnt ) )
         {
             aSavePam.GetPoint()->nNode++;
@@ -1264,7 +1259,7 @@ SvUShorts * lcl_RangesToUShorts(USHORT * pRanges)
     int i = 0;
     while (pRanges[i] != 0)
     {
-        ASSERT(pRanges[i+1] != 0, "malformed ranges");
+        OSL_ENSURE(pRanges[i+1] != 0, "malformed ranges");
 
         for (USHORT j = pRanges[i]; j < pRanges[i+1]; j++)
             pResult->Insert(j, pResult->Count());
@@ -1316,7 +1311,7 @@ void lcl_GetJoinFlags( SwPaM& rPam, sal_Bool& rJoinTxt, sal_Bool& rJoinPrev )
                 if( bExchange )
                     rPam.Exchange();
                 rJoinPrev = rPam.GetPoint() == pStt;
-                ASSERT( !pStt->nContent.GetIndex() &&
+                OSL_ENSURE( !pStt->nContent.GetIndex() &&
                     pEndNd->GetTxt().Len() != pEnd->nContent.GetIndex()
                     ? rPam.GetPoint()->nNode < rPam.GetMark()->nNode
                     : rPam.GetPoint()->nNode > rPam.GetMark()->nNode,
@@ -1480,7 +1475,7 @@ lcl_CalcBreaks( ::std::vector<xub_StrLen> & rBreaks, SwPaM const & rPam )
             SwTxtAttr const * const pAttr( pTxtNode->GetTxtAttrForCharAt(i) );
             if (pAttr && pAttr->GetEnd() && (*pAttr->GetEnd() > nEnd))
             {
-                ASSERT(pAttr->HasDummyChar(), "GetTxtAttrForCharAt broken?");
+                OSL_ENSURE(pAttr->HasDummyChar(), "GetTxtAttrForCharAt broken?");
                 rBreaks.push_back(i);
             }
         }
@@ -1535,7 +1530,7 @@ bool lcl_DoWithBreaks(SwDoc & rDoc, SwPaM & rPam,
 
 bool SwDoc::DeleteAndJoinWithRedlineImpl( SwPaM & rPam, const bool )
 {
-    ASSERT( IsRedlineOn(), "DeleteAndJoinWithRedline: redline off" );
+    OSL_ENSURE( IsRedlineOn(), "DeleteAndJoinWithRedline: redline off" );
 
     {
         sal_uInt16 nUndoSize = 0;
@@ -2057,8 +2052,8 @@ SwHyphArgs::SwHyphArgs( const SwPaM *pPam, const Point &rCrsrPos,
     // Folgende Bedingungen muessen eingehalten werden:
     // 1) es gibt mindestens eine Selektion
     // 2) SPoint() == Start()
-    ASSERT( pPam->HasMark(), "SwDoc::Hyphenate: blowing in the wind");
-    ASSERT( *pPam->GetPoint() <= *pPam->GetMark(),
+    OSL_ENSURE( pPam->HasMark(), "SwDoc::Hyphenate: blowing in the wind");
+    OSL_ENSURE( *pPam->GetPoint() <= *pPam->GetMark(),
             "SwDoc::Hyphenate: New York, New York");
 
     const SwPosition *pPoint = pPam->GetPoint();
@@ -2093,7 +2088,7 @@ void SwHyphArgs::SetPam( SwPaM *pPam ) const
         pPam->GetMark()->nNode = nNode;
         pPam->GetMark()->nContent.Assign( pNode->GetCntntNode(),
                                           nWordStart + nWordLen );
-        ASSERT( nNode == pNode->GetIndex(),
+        OSL_ENSURE( nNode == pNode->GetIndex(),
                 "SwHyphArgs::SetPam: Pam desaster" );
     }
 }
@@ -2141,7 +2136,7 @@ uno::Reference< XHyphenatedWord >  SwDoc::Hyphenate(
                             SwPaM *pPam, const Point &rCrsrPos,
                              sal_uInt16* pPageCnt, sal_uInt16* pPageSt )
 {
-    ASSERT(this == pPam->GetDoc(), "SwDoc::Hyphenate: strangers in the night");
+    OSL_ENSURE(this == pPam->GetDoc(), "SwDoc::Hyphenate: strangers in the night");
 
     if( *pPam->GetPoint() > *pPam->GetMark() )
         pPam->Exchange();
@@ -2201,7 +2196,7 @@ bool SwDoc::ReplaceRange( SwPaM& rPam, const String& rStr,
     {
         aPam.Move(fnMoveBackward);
     }
-    ASSERT((aPam.GetPoint()->nNode == aPam.GetMark()->nNode), "invalid pam?");
+   OSL_ENSURE((aPam.GetPoint()->nNode == aPam.GetMark()->nNode), "invalid pam?");
 
     lcl_CalcBreaks(Breaks, aPam);
 
@@ -2227,7 +2222,7 @@ bool SwDoc::ReplaceRange( SwPaM& rPam, const String& rStr,
     bool bRet( true );
     // iterate from end to start, to avoid invalidating the offsets!
     ::std::vector<xub_StrLen>::reverse_iterator iter( Breaks.rbegin() );
-    ASSERT(aPam.GetPoint() == aPam.End(), "wrong!");
+    OSL_ENSURE(aPam.GetPoint() == aPam.End(), "wrong!");
     SwPosition & rEnd( *aPam.End() );
     SwPosition & rStart( *aPam.Start() );
 
@@ -2249,7 +2244,7 @@ bool SwDoc::ReplaceRange( SwPaM& rPam, const String& rStr,
     }
 
     rStart = *rPam.Start(); // set to original start
-    ASSERT(rEnd.nContent > rStart.nContent, "replace part empty!");
+    OSL_ENSURE(rEnd.nContent > rStart.nContent, "replace part empty!");
     if (rEnd.nContent > rStart.nContent) // check if part is empty
     {
         bRet &= ReplaceRangeImpl(aPam, rStr, bRegExReplace);
@@ -2280,7 +2275,7 @@ bool SwDoc::ReplaceRangeImpl( SwPaM& rPam, const String& rStr,
 
         SwPosition *pStt = (SwPosition*)aDelPam.Start(),
                    *pEnd = (SwPosition*)aDelPam.End();
-        ASSERT( pStt->nNode == pEnd->nNode ||
+        OSL_ENSURE( pStt->nNode == pEnd->nNode ||
                 ( pStt->nNode.GetIndex() + 1 == pEnd->nNode.GetIndex() &&
                     !pEnd->nContent.GetIndex() ),
                 "invalid range: Point and Mark on different nodes" );
@@ -2529,11 +2524,7 @@ bool SwDoc::DelFullPara( SwPaM& rPam )
     if( pTblNd && pNd->IsCntntNode() )
     {
         SwFrmFmt* pTableFmt = pTblNd->GetTable().GetFrmFmt();
-//JP 24.08.98: will man wirklich den PageDesc/Break vom
-//              nachfolgen Absatz ueberbuegeln?
-//      const SwAttrSet& rAttrSet = pTableFmt->GetAttrSet();
-//      if( SFX_ITEM_SET != rAttrSet.GetItemState( RES_PAGEDESC ) &&
-//          SFX_ITEM_SET != rAttrSet.GetItemState( RES_BREAK ))
+
         {
             const SfxPoolItem *pItem;
             const SfxItemSet* pSet = ((SwCntntNode*)pNd)->GetpSwAttrSet();
@@ -2600,7 +2591,7 @@ bool SwDoc::DelFullPara( SwPaM& rPam )
             rPam.Exchange();
             if( !rPam.Move( fnMoveBackward, fnGoNode ))
             {
-                ASSERT( sal_False, "kein Node mehr vorhanden" );
+                OSL_ENSURE( sal_False, "kein Node mehr vorhanden" );
                 return sal_False;
             }
         }
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 3d6e797dca5e..2846187e6d6f 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -174,7 +174,7 @@ void SwDoc::InsDeletedFldType( SwFieldType& rFldTyp )
     USHORT nSize = pFldTypes->Count(), nFldWhich = rFldTyp.Which();
     USHORT i = INIT_FLDTYPES;
 
-    ASSERT( RES_SETEXPFLD == nFldWhich ||
+    OSL_ENSURE( RES_SETEXPFLD == nFldWhich ||
             RES_USERFLD == nFldWhich ||
             RES_DDEFLD == nFldWhich, "Falscher FeldTyp" );
 
@@ -227,7 +227,7 @@ void SwDoc::InsDeletedFldType( SwFieldType& rFldTyp )
  --------------------------------------------------------------------*/
 void SwDoc::RemoveFldType(USHORT nFld)
 {
-    ASSERT( INIT_FLDTYPES <= nFld,  "keine InitFields loeschen" );
+    OSL_ENSURE( INIT_FLDTYPES <= nFld,  "keine InitFields loeschen" );
     /*
      * Abheangige Felder vorhanden -> ErrRaise
      */
@@ -260,7 +260,7 @@ void SwDoc::RemoveFldType(USHORT nFld)
 
         if( nWhich )
         {
-            ASSERT( !pTmp->GetDepends(), "Abhaengige vorh.!" );
+            OSL_ENSURE( !pTmp->GetDepends(), "Abhaengige vorh.!" );
             // Feldtype loschen
             delete pTmp;
         }
@@ -423,7 +423,7 @@ void SwDoc::UpdateRefFlds( SfxPoolItem* pHt )
 
 void SwDoc::UpdateTblFlds( SfxPoolItem* pHt )
 {
-    ASSERT( !pHt || RES_TABLEFML_UPDATE  == pHt->Which(),
+    OSL_ENSURE( !pHt || RES_TABLEFML_UPDATE  == pHt->Which(),
             "Was ist das fuer ein MessageItem?" );
 
     SwFieldType* pFldType(0);
@@ -584,11 +584,11 @@ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt )
                     {
                         if( aPara.CalcWithStackOverflow() )
                             pFld->CalcField( aPara );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
                         else
                         {
                             // mind. ein ASSERT
-                            ASSERT( !this, "die Kettenformel konnte nicht errechnet werden" );
+                            OSL_ENSURE( !this, "die Kettenformel konnte nicht errechnet werden" );
                         }
 #endif
                     }
@@ -652,11 +652,11 @@ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt )
                     {
                         if( aPara.CalcWithStackOverflow() )
                             pFml->Calc( aPara, nValue );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
                         else
                         {
                             // mind. ein ASSERT
-                            ASSERT( !this, "die Kettenformel konnte nicht errechnet werden" );
+                            OSL_ENSURE( !this, "die Kettenformel konnte nicht errechnet werden" );
                         }
 #endif
                     }
@@ -882,8 +882,8 @@ void _SetGetExpFld::SetBodyPos( const SwCntntFrm& rFrm )
         SwNodeIndex aIdx( *rFrm.GetNode() );
         SwDoc& rDoc = *aIdx.GetNodes().GetDoc();
         SwPosition aPos( aIdx );
-#ifdef DBG_UTIL
-        ASSERT( ::GetBodyTxtNode( rDoc, aPos, rFrm ), "wo steht das Feld" );
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( ::GetBodyTxtNode( rDoc, aPos, rFrm ), "wo steht das Feld" );
 #else
         ::GetBodyTxtNode( rDoc, aPos, rFrm );
 #endif
@@ -1299,15 +1299,6 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
     // aktuelle Datensatznummer schon vorher einstellen
     SwNewDBMgr* pMgr = GetNewDBMgr();
     pMgr->CloseAll(FALSE);
-/*
-    if(pMgr && pMgr->OpenDB(DBMGR_STD, GetDBDesc(), FALSE))
-    {
-        if(!pMgr->IsInMerge() )
-            pMgr->ToFirstSelectedRecord(DBMGR_STD);
-
-        aCalc.VarChange( sDBNumNm, pMgr->GetCurSelectedRecordId(DBMGR_STD));
-    }
-*/
 
     String aNew;
     const _SetGetExpFldPtr* ppSortLst = pUpdtFlds->GetSortLst()->GetData();
@@ -1316,9 +1307,7 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
         SwSection* pSect = (SwSection*)(*ppSortLst)->GetSection();
         if( pSect )
         {
-            //!SECTION
 
-//          if( pGFld->IsInBodyTxt() )
             SwSbxValue aValue = aCalc.Calculate(
                                         pSect->GetCondition() );
             if(!aValue.IsVoidValue())
@@ -1329,7 +1318,7 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
         SwTxtFld* pTxtFld = (SwTxtFld*)(*ppSortLst)->GetFld();
         if( !pTxtFld )
         {
-            ASSERT( !this, "was ist es denn nun" );
+            OSL_ENSURE( !this, "was ist es denn nun" );
             continue;
         }
 
@@ -1619,7 +1608,7 @@ void SwDoc::_InitFieldTypes()       // wird vom CTOR gerufen!!
     pFldTypes->Insert( new SwSetExpFieldType(this,
                 SW_RESSTR(STR_POOLCOLL_LABEL_DRAWING), nsSwGetSetExpType::GSE_SEQ),nFldType++);
 
-    ASSERT( nFldType == INIT_FLDTYPES, "Bad initsize: SwFldTypes" );
+    OSL_ENSURE( nFldType == INIT_FLDTYPES, "Bad initsize: SwFldTypes" );
 }
 
 void SwDoc::InsDelFldInFldLst( bool bIns, const SwTxtFld& rFld )
@@ -2140,9 +2129,7 @@ bool SwDoc::SetFieldsDirty( bool b, const SwNode* pChk, ULONG nLen )
             const SwTxtNode* pTNd = rNds[ nStt++ ]->GetTxtNode();
             if( pTNd )
             {
-                if( //pTNd->GetFmtColl() &&     //#outline level,zhaojianwei
-                //  MAXLEVEL > pTNd->GetTxtColl()->GetOutlineLevel() )
-                    pTNd->GetAttrOutlineLevel() != 0 )//<-end,zhaojianwei
+                if( pTNd->GetAttrOutlineLevel() != 0 )
                     // Kapitelfelder aktualisieren
                     b = TRUE;
                 else if( pTNd->GetpSwpHints() && pTNd->GetSwpHints().Count() )
@@ -2288,13 +2275,13 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
         for( n = nArrStt; n < aTmpArr.Count(); ++n )
         {
             pSectNd = rDoc.GetNodes()[ aTmpArr[ n ] ]->GetSectionNode();
-            ASSERT( pSectNd, "Wo ist mein SectionNode" );
+            OSL_ENSURE( pSectNd, "Wo ist mein SectionNode" );
             pSectNd->GetSection().SetCondHidden( FALSE );
         }
         for( n = 0; n < nArrStt; ++n )
         {
             pSectNd = rDoc.GetNodes()[ aTmpArr[ n ] ]->GetSectionNode();
-            ASSERT( pSectNd, "Wo ist mein SectionNode" );
+            OSL_ENSURE( pSectNd, "Wo ist mein SectionNode" );
             pSectNd->GetSection().SetCondHidden( FALSE );
         }
 
@@ -2338,18 +2325,6 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
                 break;
 
             case RES_SETEXPFLD:
-                /// OD 04.10.2002 #102894#
-                /// fields of subtype <string> have also been add
-                /// for calculation (eGetMode == GETFLD_CALC).
-                /// Thus, add fields of subtype <string> in all modes
-                ///     (eGetMode == GETFLD_EXPAND||GETFLD_CALC||GETFLD_ALL)
-                /// and fields of other subtypes only in the modes
-                ///     (eGetMode == GETFLD_CALC||GETFLD_ALL)
-                /* "old" if construct - not deleted for history and code review
-                if( ( nsSwGetSetExpType::GSE_STRING & pFld->GetSubType()
-                        ? GETFLD_EXPAND : GETFLD_CALC )
-                        & eGetMode )
-                */
                 if ( !(eGetMode == GETFLD_EXPAND) ||
                      (nsSwGetSetExpType::GSE_STRING & pFld->GetSubType()) )
                 {
@@ -2485,8 +2460,8 @@ void SwDocUpdtFld::GetBodyNode( const SwTxtFld& rTFld, USHORT nFldWhich )
     {
         // einen Index fuers bestimmen vom TextNode anlegen
         SwPosition aPos( rDoc.GetNodes().GetEndOfPostIts() );
-#ifdef DBG_UTIL
-        ASSERT( GetBodyTxtNode( rDoc, aPos, *pFrm ), "wo steht das Feld" );
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( GetBodyTxtNode( rDoc, aPos, *pFrm ), "wo steht das Feld" );
 #else
         GetBodyTxtNode( rDoc, aPos, *pFrm );
 #endif
@@ -2533,8 +2508,8 @@ void SwDocUpdtFld::GetBodyNode( const SwSectionNode& rSectNd )
             if( !pFrm )
                 break;
 
-#ifdef DBG_UTIL
-            ASSERT( GetBodyTxtNode( rDoc, aPos, *pFrm ), "wo steht das Feld" );
+#if OSL_DEBUG_LEVEL > 1
+            OSL_ENSURE( GetBodyTxtNode( rDoc, aPos, *pFrm ), "wo steht das Feld" );
 #else
             GetBodyTxtNode( rDoc, aPos, *pFrm );
 #endif
@@ -2562,7 +2537,7 @@ void SwDocUpdtFld::InsertFldType( const SwFieldType& rType )
         sFldName = ((SwSetExpFieldType&)rType).GetName();
         break;
     default:
-        ASSERT( !this, "kein gueltiger FeldTyp" );
+        OSL_ENSURE( !this, "kein gueltiger FeldTyp" );
     }
 
     if( sFldName.Len() )
@@ -2641,7 +2616,7 @@ bool SwDoc::UpdateFld(SwTxtFld * pDstTxtFld, SwField & rSrcFld,
                       SwMsgPoolItem * pMsgHnt,
                       bool bUpdateFlds)
 {
-    ASSERT(pDstTxtFld, "no field to update!");
+    OSL_ENSURE(pDstTxtFld, "no field to update!");
 
     BOOL bTblSelBreak = FALSE;
 
@@ -2662,10 +2637,6 @@ bool SwDoc::UpdateFld(SwTxtFld * pDstTxtFld, SwField & rSrcFld,
                                               pMsgHnt, bUpdateFlds));
         }
 
-        // Das gefundene Feld wird angepasst ...
-        //pDstFld->ChangeFormat( rSrcFld.GetFormat() );
-        //pDstFld->SetLanguage( rSrcFld.GetLanguage() );
-
         SwField * pNewFld = rSrcFld.CopyField();
         pDstFmtFld->SetFld(pNewFld);
 
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 583868285695..ff79efddc707 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -262,13 +262,13 @@ sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrmFmt& rFmt, SfxItemSet& rSet, BOOL bNewFrms
         //Verbindung zwischen Attribut und Format.
         const SwPosition *pPos = rOldAnch.GetCntntAnchor();
         SwTxtNode *pTxtNode = pPos->nNode.GetNode().GetTxtNode();
-        ASSERT( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
+        OSL_ENSURE( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
         const xub_StrLen nIdx = pPos->nContent.GetIndex();
         SwTxtAttr * const  pHnt =
             pTxtNode->GetTxtAttrForCharAt( nIdx, RES_TXTATR_FLYCNT );
-        ASSERT( pHnt && pHnt->Which() == RES_TXTATR_FLYCNT,
+        OSL_ENSURE( pHnt && pHnt->Which() == RES_TXTATR_FLYCNT,
                     "Missing FlyInCnt-Hint." );
-        ASSERT( pHnt && pHnt->GetFlyCnt().GetFrmFmt() == &rFmt,
+        OSL_ENSURE( pHnt && pHnt->GetFlyCnt().GetFrmFmt() == &rFmt,
                     "Wrong TxtFlyCnt-Hint." );
         const_cast<SwFmtFlyCnt&>(pHnt->GetFlyCnt()).SetFlyFmt();
 
@@ -292,7 +292,7 @@ sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrmFmt& rFmt, SfxItemSet& rSet, BOOL bNewFrms
         {
             const SwPosition *pPos = aNewAnch.GetCntntAnchor();
             SwTxtNode *pNd = pPos->nNode.GetNode().GetTxtNode();
-            ASSERT( pNd, "Crsr steht nicht auf TxtNode." );
+            OSL_ENSURE( pNd, "Crsr steht nicht auf TxtNode." );
 
             SwFmtFlyCnt aFmt( static_cast<SwFlyFrmFmt*>(&rFmt) );
             pNd->InsertItem( aFmt, pPos->nContent.GetIndex(), 0 );
@@ -417,7 +417,7 @@ BOOL SwDoc::SetFlyFrmAttr( SwFrmFmt& rFlyFmt, SfxItemSet& rSet )
         case RES_PAGEDESC:
         case RES_CNTNT:
         case RES_FOOTER:
-            ASSERT( !this, ":-) Unbekanntes Attribut fuer Fly." );
+            OSL_ENSURE( !this, ":-) Unbekanntes Attribut fuer Fly." );
             // kein break;
         case RES_CHAIN:
             rSet.ClearItem( nWhich );
@@ -641,7 +641,7 @@ sal_Bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
                            const sal_Bool _bSameOnly,
                            const sal_Bool _bPosCorr )
 {
-    ASSERT( GetRootFrm(), "Ohne Layout geht gar nichts" );
+    OSL_ENSURE( GetRootFrm(), "Ohne Layout geht gar nichts" );
 
     if ( !_rMrkList.GetMarkCount() ||
          _rMrkList.GetMark( 0 )->GetMarkedSdrObj()->GetUpGroup() )
@@ -665,11 +665,11 @@ sal_Bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
             // Continue with next selected object and assert, if this isn't excepted.
             if ( !pContact )
             {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
                 bool bNoUserCallExcepted =
                         pObj->ISA(SwDrawVirtObj) &&
                         !static_cast<SwDrawVirtObj*>(pObj)->IsConnected();
-                ASSERT( bNoUserCallExcepted, "SwDoc::ChgAnchor(..) - no contact at selected drawing object" );
+                OSL_ENSURE( bNoUserCallExcepted, "SwDoc::ChgAnchor(..) - no contact at selected drawing object" );
 #endif
                 continue;
             }
@@ -817,14 +817,14 @@ sal_Bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
                     // 'center to baseline'
                     SetAttr( SwFmtVertOrient( 0, text::VertOrientation::CENTER, text::RelOrientation::FRAME ), *pContact->GetFmt() );
                     SwTxtNode *pNd = aPos.nNode.GetNode().GetTxtNode();
-                    ASSERT( pNd, "Cursor not positioned at TxtNode." );
+                    OSL_ENSURE( pNd, "Cursor not positioned at TxtNode." );
 
                     SwFmtFlyCnt aFmt( pContact->GetFmt() );
                     pNd->InsertItem( aFmt, aPos.nContent.GetIndex(), 0 );
                 }
                 break;
             default:
-                ASSERT( !this, "unexpected AnchorId." );
+                OSL_ENSURE( !this, "unexpected AnchorId." );
             }
 
             if ( (FLY_AS_CHAR != _eAnchorType) &&
@@ -865,8 +865,8 @@ sal_Bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
                 //Verbindung zwischen Attribut und Format.
                 const xub_StrLen nIndx( pOldAsCharAnchorPos->nContent.GetIndex() );
                 SwTxtNode* pTxtNode( pOldAsCharAnchorPos->nNode.GetNode().GetTxtNode() );
-                ASSERT( pTxtNode, "<SwDoc::ChgAnchor(..)> - missing previous anchor text node for as-character anchored object" );
-                ASSERT( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
+                OSL_ENSURE( pTxtNode, "<SwDoc::ChgAnchor(..)> - missing previous anchor text node for as-character anchored object" );
+                OSL_ENSURE( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
                 SwTxtAttr * const pHnt =
                     pTxtNode->GetTxtAttrForCharAt( nIndx, RES_TXTATR_FLYCNT );
                 const_cast<SwFmtFlyCnt&>(pHnt->GetFlyCnt()).SetFlyFmt();
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index ddd0b62bd3cb..9a805f5280e8 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -246,9 +246,7 @@ BOOL lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs )
         // <--
 
         const SfxPoolItem* pItem;
-  //      USHORT __READONLY_DATA aSavIds[ 3 ] = { RES_PAGEDESC, RES_BREAK,  //#outline level,removed by zhaojianwei
-  //                                              RES_PARATR_NUMRULE };
-        //for( USHORT n = 0; n < 3; ++n )
+
         USHORT __READONLY_DATA aSavIds[ 4 ] = { RES_PAGEDESC, RES_BREAK,    //->add by zhaojianwei
                                                 RES_PARATR_NUMRULE,
                                                 RES_PARATR_OUTLINELEVEL };
@@ -308,7 +306,7 @@ BOOL lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs )
             if( pPara->pDelSet && pPara->pDelSet->Count() )
             {
                 // --> OD 2008-04-15 #refactorlists#
-                ASSERT( !bKeepAttributes,
+                OSL_ENSURE( !bKeepAttributes,
                         "<lcl_RstAttr(..)> - certain attributes are kept, but not needed. -> please inform OD" );
                 // <--
                 SfxItemIter aIter( *pPara->pDelSet );
@@ -689,7 +687,7 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM &rRg, const SfxItemSet& rChgSet,
             // --> OD 2005-10-24 #126346# - make code robust:
             if ( !pNumRule )
             {
-                ASSERT( false,
+                OSL_ENSURE( false,
                         "<InsAttr(..)> - PaM in front of label, but text node has no numbering rule set. This is a serious defect, please inform OD." );
                 DELETECHARSETS
                 return false;
@@ -1413,7 +1411,7 @@ void SwDoc::DelCharFmt(USHORT nFmt, BOOL bBroadcast)
 void SwDoc::DelCharFmt( SwCharFmt *pFmt, BOOL bBroadcast )
 {
     USHORT nFmt = pCharFmtTbl->GetPos( pFmt );
-    ASSERT( USHRT_MAX != nFmt, "Fmt not found," );
+    OSL_ENSURE( USHRT_MAX != nFmt, "Fmt not found," );
 
     DelCharFmt( nFmt, bBroadcast );
 }
@@ -1422,7 +1420,7 @@ void SwDoc::DelFrmFmt( SwFrmFmt *pFmt, BOOL bBroadcast )
 {
     if( pFmt->ISA( SwTableBoxFmt ) || pFmt->ISA( SwTableLineFmt ))
     {
-        ASSERT( !this, "Format steht nicht mehr im DocArray, "
+        OSL_ENSURE( !this, "Format steht nicht mehr im DocArray, "
                        "kann per delete geloescht werden" );
         delete pFmt;
     }
@@ -1451,7 +1449,7 @@ void SwDoc::DelFrmFmt( SwFrmFmt *pFmt, BOOL bBroadcast )
         else
         {
             nPos = GetSpzFrmFmts()->GetPos( pFmt );
-            ASSERT( nPos != USHRT_MAX, "FrmFmt not found." );
+            OSL_ENSURE( nPos != USHRT_MAX, "FrmFmt not found." );
             if( USHRT_MAX != nPos )
                 GetSpzFrmFmts()->DeleteAndDestroy( nPos );
         }
@@ -1461,7 +1459,7 @@ void SwDoc::DelFrmFmt( SwFrmFmt *pFmt, BOOL bBroadcast )
 void SwDoc::DelTblFrmFmt( SwTableFmt *pFmt )
 {
     USHORT nPos = pTblFrmFmtTbl->GetPos( pFmt );
-    ASSERT( USHRT_MAX != nPos, "Fmt not found," );
+    OSL_ENSURE( USHRT_MAX != nPos, "Fmt not found," );
     pTblFrmFmtTbl->DeleteAndDestroy( nPos );
 }
 
@@ -1683,7 +1681,7 @@ SwGrfFmtColl* SwDoc::MakeGrfFmtColl( const String &rFmtName,
 
 void SwDoc::DelTxtFmtColl(USHORT nFmtColl, BOOL bBroadcast)
 {
-    ASSERT( nFmtColl, "Remove fuer Coll 0." );
+    OSL_ENSURE( nFmtColl, "Remove fuer Coll 0." );
 
     // Wer hat die zu loeschende als Next
     SwTxtFmtColl *pDel = (*pTxtFmtCollTbl)[nFmtColl];
@@ -1714,7 +1712,7 @@ void SwDoc::DelTxtFmtColl(USHORT nFmtColl, BOOL bBroadcast)
 void SwDoc::DelTxtFmtColl( SwTxtFmtColl *pColl, BOOL bBroadcast )
 {
     USHORT nFmt = pTxtFmtCollTbl->GetPos( pColl );
-    ASSERT( USHRT_MAX != nFmt, "Collection not found," );
+    OSL_ENSURE( USHRT_MAX != nFmt, "Collection not found," );
     DelTxtFmtColl( nFmt, bBroadcast );
 }
 
@@ -1746,7 +1744,7 @@ BOOL lcl_SetTxtFmtColl( const SwNodePtr& rpNode, void* pArgs )
                 // Check, if the list style of the paragraph will change.
                 bool bChangeOfListStyleAtParagraph( true );
                 SwTxtNode* pTNd( dynamic_cast<SwTxtNode*>(pCNd) );
-                ASSERT( pTNd,
+                OSL_ENSURE( pTNd,
                         "<lcl_SetTxtFmtColl(..)> - text node expected -> crash" );
                 {
                     SwNumRule* pNumRuleAtParagraph( pTNd->GetNumRule() );
@@ -1928,9 +1926,6 @@ SwTxtFmtColl* SwDoc::CopyTxtColl( const SwTxtFmtColl& rColl )
     // kopiere jetzt noch die Auto-Formate oder kopiere die Attribute
     pNewColl->CopyAttrs( rColl, TRUE );
 
-    // setze noch den Outline-Level
-    //if( NO_NUMBERING != rColl.GetOutlineLevel() ) //#outline level,zhaojianwei
-    //  pNewColl->SetOutlineLevel( rColl.GetOutlineLevel() );
     if(rColl.IsAssignedToListLevelOfOutlineStyle())
         pNewColl->AssignToListLevelOfOutlineStyle(rColl.GetAssignedOutlineStyleLevel());//<-end,zhaojianwei
     //<-end
@@ -2041,13 +2036,9 @@ void SwDoc::CopyFmtArr( const SvPtrarr& rSourceArr,
 
         pDest = FindFmtByName( rDestArr, pSrc->GetName() );
         pDest->SetAuto( FALSE );
-//      pDest->ResetAllAttr();
-//      pDest->CopyAttrs( *pSrc, TRUE );            // kopiere Attribute
+
 //JP 19.02.96: ist so wohl optimaler - loest ggfs. kein Modify aus!
         pDest->DelDiffs( *pSrc );
-        // --> OD 2009-03-23 #i94285#
-        // copy existing <SwFmtPageDesc> instance, before copying attributes
-//        pDest->SetFmtAttr( pSrc->GetAttrSet() );      // kopiere Attribute
         //JP 18.08.98: Bug 55115 - copy PageDescAttribute in this case
         const SfxPoolItem* pItem;
         if( &GetAttrPool() != pSrc->GetAttrSet().GetPool() &&
@@ -2063,7 +2054,6 @@ void SwDoc::CopyFmtArr( const SvPtrarr& rSourceArr,
                 pPageDesc = aPageDescs[ MakePageDesc( rNm ) ];
             }
             pPageDesc->Add( &aPageDesc );
-//            pDest->SetFmtAttr( aPageDesc );
             SwAttrSet aTmpAttrSet( pSrc->GetAttrSet() );
             aTmpAttrSet.Put( aPageDesc );
             pDest->SetFmtAttr( aTmpAttrSet );
@@ -2092,9 +2082,6 @@ void SwDoc::CopyFmtArr( const SvPtrarr& rSourceArr,
                 pDstColl->SetNextTxtFmtColl( *(SwTxtFmtColl*)FindFmtByName(
                     rDestArr, pSrcColl->GetNextTxtFmtColl().GetName() ) );
 
-            // setze noch den Outline-Level
-            //if( NO_NUMBERING != pSrcColl->GetOutlineLevel() ) //#outline level,zhaojianwei
-            //  pDstColl->SetOutlineLevel( pSrcColl->GetOutlineLevel() );
             if(pSrcColl->IsAssignedToListLevelOfOutlineStyle())
                 pDstColl->AssignToListLevelOfOutlineStyle(pSrcColl->GetAssignedOutlineStyleLevel());//<-end,zhaojianwei
             //<-end
@@ -2439,13 +2426,11 @@ void SwDoc::_CreateNumberFormatter()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722",  "SwDoc::_CreateNumberFormatter" );
 
-    ASSERT( !pNumberFormatter, "ist doch schon vorhanden" );
+    OSL_ENSURE( !pNumberFormatter, "ist doch schon vorhanden" );
 
 
-    LanguageType eLang = LANGUAGE_SYSTEM; //System::GetLanguage();
-/*              ((const SvxLanguageItem&)GetAttrPool().
-                    GetDefaultItem( RES_CHRATR_LANGUAGE )).GetLanguage();
-*/
+    LanguageType eLang = LANGUAGE_SYSTEM;
+
     Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
     pNumberFormatter = new SvNumberFormatter( xMSF, eLang );
     pNumberFormatter->SetEvalDateFormat( NF_EVALDATEFORMAT_FORMAT_INTL );
@@ -2534,19 +2519,6 @@ void SwDoc::SetFmtItemByAutoFmt( const SwPaM& rPam, const SfxItemSet& rSet )
         // in den Node gesetzt werden. Also muss man die Differenz nehmen
         SwRedlineExtraData_Format aExtraData( rSet );
 
-/*
-        if( pSet && pTNd->HasSwAttrSet() )
-        {
-            SfxItemSet aTmp( *pTNd->GetpSwAttrSet() );
-            aTmp.Differentiate( *pSet );
-            // das Adjust Item behalten wir extra
-            const SfxPoolItem* pItem;
-            if( SFX_ITEM_SET == pTNd->GetpSwAttrSet()->GetItemState(
-                    RES_PARATR_ADJUST, FALSE, &pItem ))
-                aTmp.Put( *pItem );
-            aExtraData.SetItemSet( aTmp );
-        }
-*/
         pRedl->SetExtraData( &aExtraData );
 
 // !!!!!!!!! Undo fehlt noch !!!!!!!!!!!!!!!!!!
@@ -2654,7 +2626,6 @@ namespace docfunc
                 SwTxtFmtColl* pTxtFmtColl = (*pTxtFmtColls)[i];
 
                 if ( pTxtFmtColl->IsDefault() ||
-                   //  pTxtFmtColl->GetOutlineLevel() == NO_NUMBERING ) //#outline level,zhaojianwei
                     ! pTxtFmtColl->IsAssignedToListLevelOfOutlineStyle() )  //<-end,zhaojianwei
                 {
                     continue;
diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx
index a8cf79c40b7a..4c1d642c8a61 100644
--- a/sw/source/core/doc/docftn.cxx
+++ b/sw/source/core/doc/docftn.cxx
@@ -423,8 +423,7 @@ bool SwDoc::SetCurFtn( const SwPaM& rPam, const String& rNumStr,
                 nSttCnt <= *pTxtFtn->GetStart() ) )
         {
             const SwFmtFtn& rFtn = pTxtFtn->GetFtn();
-            if( /*rFtn.GetNumber() != nNumber ||*/
-                rFtn.GetNumStr() != rNumStr ||
+            if( rFtn.GetNumStr() != rNumStr ||
                 rFtn.IsEndNote() != bIsEndNote )
             {
                 bChg = TRUE;
@@ -455,8 +454,7 @@ bool SwDoc::SetCurFtn( const SwPaM& rPam, const String& rNumStr,
             nEndCnt >= *pTxtFtn->GetStart() ) )
         {
             const SwFmtFtn& rFtn = pTxtFtn->GetFtn();
-            if( /*rFtn.GetNumber() != nNumber ||*/
-                rFtn.GetNumStr() != rNumStr ||
+            if( rFtn.GetNumStr() != rNumStr ||
                 rFtn.IsEndNote() != bIsEndNote )
             {
                 bChg = TRUE;
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index c6402512c887..a8cbcc440626 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -93,7 +93,6 @@ BOOL SwDoc::GenerateHTMLDoc( const String& rPath,
         BYTE nLvl = 1;
         const SwTxtFmtColls& rFmtColls =*GetTxtFmtColls();
         for( USHORT n = rFmtColls.Count(); n; )
-            //if( nLvl == rFmtColls[ --n ]->GetOutlineLevel() )//#outline level,zhaojianwei
             if( nLvl == rFmtColls[ --n ]->GetAttrOutlineLevel() -1 )//<-end,zhaojianwei 0814
             {
                 pSplitColl = rFmtColls[ n ];
@@ -129,7 +128,6 @@ BOOL SwDoc::SplitDoc( USHORT eDocType, const String& rPath,
     {
         // wenn keine OutlineNumerierung ist, dann benutze eigenes Array
         // und sammel die Nodes zusammen.
-        //if( NO_NUMBERING == pSplitColl->GetOutlineLevel() )//#outline level,zhaojianwei
         if( pSplitColl->GetAttrOutlineLevel() == 0 )//<-end,zhaojianwei, 0814
         {
             pOutlNds = new SwOutlineNodes( 8, 8 );
@@ -151,7 +149,6 @@ BOOL SwDoc::SplitDoc( USHORT eDocType, const String& rPath,
         // dann suche die Gliederungs - Vorlage, der 1. Ebene
         const SwTxtFmtColls& rFmtColls =*GetTxtFmtColls();
         for( USHORT n = rFmtColls.Count(); n; )
-            //if( !rFmtColls[ --n ]->GetOutlineLevel() )//#outline level,zhaojianwei
             if ( rFmtColls[ --n ]->GetAttrOutlineLevel() == 1 )//<-end,zhaojianwei
             {
                 pSplitColl = rFmtColls[ n ];
@@ -171,7 +168,6 @@ BOOL SwDoc::SplitDoc( USHORT eDocType, const String& rPath,
         break;
 
     default:
-//  case SPLITDOC_TO_GLOBALDOC:
         pFilter = SwIoSystem::GetFilterOfFormat(
                                     String::CreateFromAscii( FILTER_XML ));
         eDocType = SPLITDOC_TO_GLOBALDOC;
@@ -231,11 +227,6 @@ BOOL SwDoc::SplitDoc( USHORT eDocType, const String& rPath,
                 pNd = pOutlNds->GetObject( nOutl );
                 SwTxtFmtColl* pTColl = pNd->GetTxtNode()->GetTxtColl();
 
-                //if( ( pTColl == pSplitColl ||     //#outline level,zhaojianwei
-                //  (   NO_NUMBERING != pSplitColl->GetOutlineLevel() &&
-                //      pTColl->GetOutlineLevel() <
-                //      pSplitColl->GetOutlineLevel() )) &&
-                //  !pNd->FindTableNode() )
                 if( ( pTColl == pSplitColl ||
                     (   pSplitColl->GetAttrOutlineLevel() > 0 &&
                         pTColl->GetAttrOutlineLevel() > 0     &&
@@ -358,7 +349,7 @@ BOOL SwDoc::SplitDoc( USHORT eDocType, const String& rPath,
                                 aTmp.Exchange();
                                 if( !aTmp.Move( fnMoveBackward, fnGoNode ))
                                 {
-                                    ASSERT( FALSE, "kein Node mehr vorhanden" );
+                                    OSL_ENSURE( FALSE, "kein Node mehr vorhanden" );
                                 }
                             }
                                 // Bookmarks usw. verschieben
@@ -476,7 +467,6 @@ BOOL SwDoc::SplitDoc( USHORT eDocType, const String& rPath,
         }
     } while( pSttNd );
 
-//  if( pOutlNds != (SwOutlineNodes*)&GetNodes().GetOutLineNds();
     if( pOutlNds != &GetNodes().GetOutLineNds() )
         delete pOutlNds;
 
@@ -494,7 +484,6 @@ BOOL SwDoc::SplitDoc( USHORT eDocType, const String& rPath,
         }
         break;
 
-//  case SPLITDOC_TO_GLOBALDOC:
     default:
         // dann das Globaldoc speichern
         set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true);
@@ -532,7 +521,6 @@ BOOL SwDoc::SplitDoc( USHORT eDocType, const String& rPath, int nOutlineLevel )
         break;
 
     default:
-//  case SPLITDOC_TO_GLOBALDOC:
         pFilter = SwIoSystem::GetFilterOfFormat(
                                     String::CreateFromAscii( FILTER_XML ));
         eDocType = SPLITDOC_TO_GLOBALDOC;
@@ -670,7 +658,6 @@ BOOL SwDoc::SplitDoc( USHORT eDocType, const String& rPath, int nOutlineLevel )
                     if( SPLITDOC_TO_HTML == eDocType &&
                         pDoc->GetSpzFrmFmts()->Count() )
                     {
-                        /* SfxViewFrame* pFrame = */
                             SfxViewFrame::LoadHiddenDocument( *xDocSh, 0 );
                     }
                     xDocSh->DoSaveAs( *pTmpMed );
@@ -709,7 +696,7 @@ BOOL SwDoc::SplitDoc( USHORT eDocType, const String& rPath, int nOutlineLevel )
                                 aTmp.Exchange();
                                 if( !aTmp.Move( fnMoveBackward, fnGoNode ))
                                 {
-                                    ASSERT( FALSE, "kein Node mehr vorhanden" );
+                                    OSL_ENSURE( FALSE, "kein Node mehr vorhanden" );
                                 }
                             }
                                 // Bookmarks usw. verschieben
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 4c536704b686..b3deda6d28db 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -199,18 +199,18 @@ SwFrmFmt *SwDoc::MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet )
         }
         break;
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     case FLY_AT_PAGE:
     case FLY_AT_CHAR:
     case FLY_AT_FLY:
     case FLY_AT_PARA:
     case FLY_AS_CHAR:
-        ASSERT( false, "use new interface instead: SwDoc::MakeFlySection!" );
+        OSL_ENSURE( false, "use new interface instead: SwDoc::MakeFlySection!" );
         break;
 #endif
 
     default:
-        ASSERT( !this,
+        OSL_ENSURE( !this,
                 "Layoutformat mit ungueltigem Request angefordert." );
 
     }
@@ -253,18 +253,6 @@ void SwDoc::DelLayoutFmt( SwFrmFmt *pFmt )
         SwOLENode* pOLENd = GetNodes()[ pCntIdx->GetIndex()+1 ]->GetOLENode();
         if( pOLENd && pOLENd->GetOLEObj().IsOleRef() )
         {
-            /*
-            SwDoc* pDoc = (SwDoc*)pFmt->GetDoc();
-            if( pDoc )
-            {
-                SfxObjectShell* p = pDoc->GetPersist();
-                if( p )     // muss da sein
-                {
-                    SvInfoObjectRef aRef( p->Find( pOLENd->GetOLEObj().GetName() ) );
-                    if( aRef.Is() )
-                        aRef->SetObj(0);
-                }
-            } */
 
             // TODO/MBA: the old object closed the object, cleared all references to it, but didn't remove it from the container.
             // I have no idea, why, nobody could explain it - so I do my very best to mimic this behavior
@@ -280,7 +268,6 @@ void SwDoc::DelLayoutFmt( SwFrmFmt *pFmt )
                 }
             }
 
-            //pOLENd->GetOLEObj().GetOleRef() = 0;
         }
     }
 
@@ -392,7 +379,7 @@ SwFrmFmt *SwDoc::CopyLayoutFmt( const SwFrmFmt& rSource,
 {
     const bool bFly = RES_FLYFRMFMT == rSource.Which();
     const bool bDraw = RES_DRAWFRMFMT == rSource.Which();
-    ASSERT( bFly || bDraw, "this method only works for fly or draw" );
+    OSL_ENSURE( bFly || bDraw, "this method only works for fly or draw" );
 
     SwDoc* pSrcDoc = (SwDoc*)rSource.GetDoc();
 
@@ -499,7 +486,7 @@ SwFrmFmt *SwDoc::CopyLayoutFmt( const SwFrmFmt& rSource,
     }
     else
     {
-        ASSERT( RES_DRAWFRMFMT == rSource.Which(), "Weder Fly noch Draw." );
+        OSL_ENSURE( RES_DRAWFRMFMT == rSource.Which(), "Weder Fly noch Draw." );
         // OD 2005-08-02 #i52780# - Note: moving object to visible layer not needed.
         SwDrawContact* pSourceContact = (SwDrawContact *)rSource.FindContactObj();
 
@@ -689,7 +676,7 @@ SwFlyFrmFmt* SwDoc::_MakeFlySection( const SwPosition& rAnchPos,
         xub_StrLen nStt = rAnchPos.nContent.GetIndex();
         SwTxtNode * pTxtNode = rAnchPos.nNode.GetNode().GetTxtNode();
 
-        ASSERT(pTxtNode!= 0, "There should be a SwTxtNode!");
+        OSL_ENSURE(pTxtNode!= 0, "There should be a SwTxtNode!");
 
         if (pTxtNode != NULL)
         {
@@ -809,7 +796,7 @@ SwFlyFrmFmt* SwDoc::MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet,
     {
         do {        // middle check loop
             const SwFmtCntnt &rCntnt = pFmt->GetCntnt();
-            ASSERT( rCntnt.GetCntntIdx(), "Kein Inhalt vorbereitet." );
+            OSL_ENSURE( rCntnt.GetCntntIdx(), "Kein Inhalt vorbereitet." );
             SwNodeIndex aIndex( *(rCntnt.GetCntntIdx()), 1 );
             SwCntntNode *pNode = aIndex.GetNode().GetCntntNode();
 
@@ -858,7 +845,7 @@ SwFlyFrmFmt* SwDoc::MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet,
 
                 // wenn Tabelle im Rahmen, dann ohne nachfolgenden TextNode
                 aIndex = rCntnt.GetCntntIdx()->GetNode().EndOfSectionIndex() - 1;
-                ASSERT( aIndex.GetNode().GetTxtNode(),
+                OSL_ENSURE( aIndex.GetNode().GetTxtNode(),
                         "hier sollte ein TextNode stehen" );
                 aPos.nContent.Assign( 0, 0 );       // Index abmelden !!
                 GetNodes().Delete( aIndex, 1 );
@@ -870,15 +857,6 @@ if( DoesUndo() )    // werden erstmal alle Undo - Objecte geloescht.
             }
             else
             {
-/*
-                // alle Pams verschieben
-                SwPaM* pTmp = (SwPaM*)&rPam;
-                do {
-                    if( pTmp->HasMark() &&
-                        *pTmp->GetPoint() != *pTmp->GetMark() )
-                        MoveAndJoin( *pTmp, aPos );
-                } while( &rPam != ( pTmp = (SwPaM*)pTmp->GetNext() ) );
-*/
                 // copy all Pams and then delete all
                 SwPaM* pTmp = (SwPaM*)&rPam;
                 BOOL bOldFlag = mbCopyIsMove, bOldUndo = mbUndo;
@@ -1018,26 +996,6 @@ SwDrawFrmFmt* SwDoc::Insert( const SwPaM &rRg,
     return pFmt;
 }
 
-/*************************************************************************
-|*
-|*  SwDoc::GetAllFlyFmts
-|*
-|*  Ersterstellung      MA 14. Jul. 93
-|*  Letzte Aenderung    MD 23. Feb. 95
-|*
-|*************************************************************************/
-/*sal_Bool TstFlyRange( const SwPaM* pPam, sal_uInt32 nFlyPos )
-{
-    sal_Bool bOk = sal_False;
-    const SwPaM* pTmp = pPam;
-    do {
-        bOk = pTmp->Start()->nNode.GetIndex() < nFlyPos &&
-                pTmp->End()->nNode.GetIndex() > nFlyPos;
-    } while( !bOk && pPam != ( pTmp = (const SwPaM*)pTmp->GetNext() ));
-    return bOk;
-}
-*/
-
 /* -----------------------------04.04.00 10:55--------------------------------
     paragraph frames - o.k. if the PaM includes the paragraph from the beginning
                        to the beginning of the next paragraph at least
@@ -1204,11 +1162,11 @@ void lcl_CpyAttr( SfxItemSet &rNewSet, const SfxItemSet &rOldSet, sal_uInt16 nWh
                     rNewSet.Put( *pOldItem );
             }
             else {
-                ASSERT(0, "What am I doing here?");
+                OSL_ENSURE(0, "What am I doing here?");
             }
         }
         else {
-            ASSERT(0, "What am I doing here?");
+            OSL_ENSURE(0, "What am I doing here?");
         }
     }
 
@@ -1234,9 +1192,9 @@ SwFlyFrmFmt* SwDoc::InsertLabel( const SwLabelType eType, const String &rTxt, co
 
     //Erstmal das Feld bauen, weil ueber den Namen die TxtColl besorgt werden
     //muss
-    ASSERT( nId == USHRT_MAX  || nId < GetFldTypes()->Count(), "FldType ueberindiziert." );
+    OSL_ENSURE( nId == USHRT_MAX  || nId < GetFldTypes()->Count(), "FldType ueberindiziert." );
     SwFieldType *pType = nId != USHRT_MAX ? (*GetFldTypes())[nId] : NULL;
-    ASSERT( !pType || pType->Which() == RES_SETEXPFLD, "Falsche Id fuer Label" );
+    OSL_ENSURE( !pType || pType->Which() == RES_SETEXPFLD, "Falsche Id fuer Label" );
 
     SwTxtFmtColl *pColl = NULL;
     if( pType )
@@ -1268,7 +1226,7 @@ SwFlyFrmFmt* SwDoc::InsertLabel( const SwLabelType eType, const String &rTxt, co
             //einfuegen (Frame wird automatisch erzeugt).
             {
                 SwStartNode *pSttNd = GetNodes()[nNdIdx]->GetStartNode();
-                ASSERT( pSttNd, "Kein StartNode in InsertLabel." );
+                OSL_ENSURE( pSttNd, "Kein StartNode in InsertLabel." );
                 ULONG nNode;
                 if( bBefore )
                 {
@@ -1301,7 +1259,7 @@ SwFlyFrmFmt* SwDoc::InsertLabel( const SwLabelType eType, const String &rTxt, co
 
                 //Erstmal das Format zum Fly besorgen und das Layout entkoppeln.
                 SwFrmFmt *pOldFmt = GetNodes()[nNdIdx]->GetFlyFmt();
-                ASSERT( pOldFmt, "Format des Fly nicht gefunden." );
+                OSL_ENSURE( pOldFmt, "Format des Fly nicht gefunden." );
                 pOldFmt->DelFrms();
 
                 pNewFmt = MakeFlyFrmFmt( GetUniqueFrameName(),
@@ -1380,14 +1338,14 @@ SwFlyFrmFmt* SwDoc::InsertLabel( const SwLabelType eType, const String &rTxt, co
                 {
                     const SwPosition *pPos = rAnchor.GetCntntAnchor();
                     SwTxtNode *pTxtNode = pPos->nNode.GetNode().GetTxtNode();
-                    ASSERT( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
+                    OSL_ENSURE( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
                     const xub_StrLen nIdx = pPos->nContent.GetIndex();
                     SwTxtAttr * const pHnt =
                         pTxtNode->GetTxtAttrForCharAt(nIdx, RES_TXTATR_FLYCNT);
 
-                    ASSERT( pHnt && pHnt->Which() == RES_TXTATR_FLYCNT,
+                    OSL_ENSURE( pHnt && pHnt->Which() == RES_TXTATR_FLYCNT,
                                 "Missing FlyInCnt-Hint." );
-                    ASSERT( pHnt && pHnt->GetFlyCnt().GetFrmFmt() == pOldFmt,
+                    OSL_ENSURE( pHnt && pHnt->GetFlyCnt().GetFrmFmt() == pOldFmt,
                                 "Wrong TxtFlyCnt-Hint." );
 
                     const_cast<SwFmtFlyCnt&>(pHnt->GetFlyCnt()).SetFlyFmt(
@@ -1443,9 +1401,9 @@ SwFlyFrmFmt* SwDoc::InsertLabel( const SwLabelType eType, const String &rTxt, co
             break;
 
         default:
-            ASSERT( !this, "Neuer LabelType?." );
+            OSL_ENSURE( !this, "Neuer LabelType?." );
     }
-    ASSERT( pNew, "No Label inserted" );
+    OSL_ENSURE( pNew, "No Label inserted" );
     if( pNew )
     {
         //#i61007# order of captions
@@ -1546,7 +1504,7 @@ SwFlyFrmFmt* SwDoc::InsertDrawLabel( const String &rTxt,
 {
 
     SwDrawContact* pContact = (SwDrawContact*)GetUserCall( &rSdrObj );
-    ASSERT( RES_DRAWFRMFMT == pContact->GetFmt()->Which(),
+    OSL_ENSURE( RES_DRAWFRMFMT == pContact->GetFmt()->Which(),
             "Kein DrawFrmFmt" );
     if ( !pContact )
         return 0;
@@ -1569,9 +1527,9 @@ SwFlyFrmFmt* SwDoc::InsertDrawLabel( const String &rTxt,
 
     // Erstmal das Feld bauen, weil ueber den Namen die TxtColl besorgt
     // werden muss
-    ASSERT( nId == USHRT_MAX  || nId < GetFldTypes()->Count(), "FldType overflow" );
+    OSL_ENSURE( nId == USHRT_MAX  || nId < GetFldTypes()->Count(), "FldType overflow" );
     SwFieldType *pType = nId != USHRT_MAX ? (*GetFldTypes())[nId] : 0;
-    ASSERT( !pType || pType->Which() == RES_SETEXPFLD, "Wrong label id" );
+    OSL_ENSURE( !pType || pType->Which() == RES_SETEXPFLD, "Wrong label id" );
 
     SwTxtFmtColl *pColl = NULL;
     if( pType )
@@ -1679,15 +1637,15 @@ SwFlyFrmFmt* SwDoc::InsertDrawLabel( const String &rTxt,
     {
         const SwPosition *pPos = rAnchor.GetCntntAnchor();
         SwTxtNode *pTxtNode = pPos->nNode.GetNode().GetTxtNode();
-        ASSERT( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
+        OSL_ENSURE( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
         const xub_StrLen nIdx = pPos->nContent.GetIndex();
         SwTxtAttr * const pHnt =
             pTxtNode->GetTxtAttrForCharAt( nIdx, RES_TXTATR_FLYCNT );
 
-#ifdef DBG_UTIL
-        ASSERT( pHnt && pHnt->Which() == RES_TXTATR_FLYCNT,
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( pHnt && pHnt->Which() == RES_TXTATR_FLYCNT,
                     "Missing FlyInCnt-Hint." );
-        ASSERT( pHnt && ((SwFmtFlyCnt&)pHnt->GetFlyCnt()).
+        OSL_ENSURE( pHnt && ((SwFmtFlyCnt&)pHnt->GetFlyCnt()).
                     GetFrmFmt() == (SwFrmFmt*)pOldFmt,
                     "Wrong TxtFlyCnt-Hint." );
 #endif
@@ -1735,7 +1693,7 @@ SwFlyFrmFmt* SwDoc::InsertDrawLabel( const String &rTxt,
     //wir vorhanden Methoden (insb. fuer InCntFlys etwas aufwendig).
     pNewFmt->MakeFrms();
 
-    ASSERT( pNew, "No Label inserted" );
+    OSL_ENSURE( pNew, "No Label inserted" );
 
     if( pNew )
     {
@@ -1868,8 +1826,8 @@ IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer )
             BOOL bIsOnlineSpell = pSh->GetViewOptions()->IsOnlineSpell();
 
             sal_Bool bIsAutoGrammar = sal_False;
-            SvtLinguConfig().GetProperty( ::rtl::OUString::createFromAscii(
-                        UPN_IS_GRAMMAR_AUTO ) ) >>= bIsAutoGrammar;
+            SvtLinguConfig().GetProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        UPN_IS_GRAMMAR_AUTO )) ) >>= bIsAutoGrammar;
 
             if (bIsOnlineSpell && bIsAutoGrammar)
                 StartGrammarChecking( *this );
@@ -2204,7 +2162,7 @@ sal_Bool SwDoc::IsInHeaderFooter( const SwNodeIndex& rIdx ) const
         }
         if( n >= GetSpzFrmFmts()->Count() )
         {
-            ASSERT( mbInReading, "Fly-Section aber kein Format gefunden" );
+            OSL_ENSURE( mbInReading, "Fly-Section aber kein Format gefunden" );
             return sal_False;
         }
     }
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 9dc7ebe4459a..eb878a1372a5 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -329,7 +329,7 @@ SwDoc::SwDoc() :
     mbInsOnlyTxtGlssry =
     mbContains_MSVBasic =
     mbKernAsianPunctuation =
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     mbXMLExport =
 #endif
     // --> OD 2006-03-21 #b6375613#
@@ -605,7 +605,7 @@ SwDoc::~SwDoc()
     pFtnColl = pEndNoteInfo->GetFtnTxtColl();
     if ( pFtnColl ) pFtnColl->Remove(pEndNoteInfo);
 
-    ASSERT( pDfltTxtFmtColl == (*pTxtFmtCollTbl)[0],
+    OSL_ENSURE( pDfltTxtFmtColl == (*pTxtFmtCollTbl)[0],
             "Default-Text-Collection muss immer am Anfang stehen" );
 
     // JP 27.01.98: opt.: ausgehend davon, das Standard als 2. im Array
@@ -616,7 +616,7 @@ SwDoc::~SwDoc()
     pTxtFmtCollTbl->DeleteAndDestroy( 1, pTxtFmtCollTbl->Count()-1 );
     delete pTxtFmtCollTbl;
 
-    ASSERT( pDfltGrfFmtColl == (*pGrfFmtCollTbl)[0],
+    OSL_ENSURE( pDfltGrfFmtColl == (*pGrfFmtCollTbl)[0],
             "Default-Grf-Collection muss immer am Anfang stehen" );
 
     pGrfFmtCollTbl->DeleteAndDestroy( 1, pGrfFmtCollTbl->Count()-1 );
@@ -720,10 +720,10 @@ VirtualDevice& SwDoc::CreateVirtualDevice_() const
 
 SfxPrinter& SwDoc::CreatePrinter_() const
 {
-    ASSERT( ! pPrt, "Do not call CreatePrinter_(), call getPrinter() instead" )
+    OSL_ENSURE( ! pPrt, "Do not call CreatePrinter_(), call getPrinter() instead" );
 
 #if OSL_DEBUG_LEVEL > 1
-    ASSERT( false, "Printer will be created!" )
+    OSL_ENSURE( false, "Printer will be created!" );
 #endif
 
     // wir erzeugen einen default SfxPrinter.
@@ -752,7 +752,7 @@ void SwDoc::SetDocShell( SwDocShell* pDSh )
         {
             ((SwDrawDocument*)pDrawModel)->SetObjectShell( pDocShell );
             pDrawModel->SetPersist( pDocShell );
-            ASSERT( pDrawModel->GetPersist() == GetPersist(),
+            OSL_ENSURE( pDrawModel->GetPersist() == GetPersist(),
                     "draw model's persist is out of sync" );
         }
     }
@@ -791,7 +791,7 @@ void SwDoc::ClearDoc()
     USHORT n;
     while ( 0 != (n = GetSpzFrmFmts()->Count()) )
         DelLayoutFmt((*pSpzFrmFmtTbl)[n-1]);
-    ASSERT( !pDrawModel || !pDrawModel->GetPage(0)->GetObjCount(),
+    OSL_ENSURE( !pDrawModel || !pDrawModel->GetPage(0)->GetObjCount(),
                 "not all DrawObjects removed from the page" );
 
     pRedlineTbl->DeleteAndDestroy( 0, pRedlineTbl->Count() );
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 3911ba8b5711..1bbbf01edad6 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -134,7 +134,6 @@ void SwDoc::PropagateOutlineRule()
     {
         SwTxtFmtColl *pColl = (*pTxtFmtCollTbl)[n];
 
-       // if (NO_NUMBERING != pColl->GetOutlineLevel())//#outline level,zhaojianwei
         if(pColl->IsAssignedToListLevelOfOutlineStyle())//<-end,zhaojianwei
         {
             SwClientIter aIter(*pColl);
@@ -190,9 +189,6 @@ BOOL SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
 
     for( n = 0; n < pTxtFmtCollTbl->Count(); ++n )
     {
-        //BYTE nLevel = (*pTxtFmtCollTbl)[ n ]->GetOutlineLevel();//#outline level,zhaojianwei
-        //if( nLevel < MAXLEVEL )
-        //  aCollArr[ nLevel ] = (*pTxtFmtCollTbl)[ n ];
         if((*pTxtFmtCollTbl)[ n ]->IsAssignedToListLevelOfOutlineStyle())
         {
             const int nLevel = (*pTxtFmtCollTbl)[ n ]->GetAssignedOutlineStyleLevel();
@@ -220,7 +216,6 @@ BOOL SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
             SwTxtFmtColl *aTmpColl =
                 GetTxtCollFromPool(static_cast<sal_uInt16>(RES_POOLCOLL_HEADLINE1 + n));
 
-            //if (aTmpColl->GetOutlineLevel() == n)//#outline level,zhaojianwei
             if( aTmpColl->IsAssignedToListLevelOfOutlineStyle() &&
                 aTmpColl->GetAssignedOutlineStyleLevel() == n )//<-end,zhaojianwei
             {
@@ -330,9 +325,7 @@ BOOL SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
     {
         SwTxtNode* pTxtNd = rOutlNds[ n ]->GetTxtNode();
         SwTxtFmtColl* pColl = pTxtNd->GetTxtColl();
-//        int nLevel = pColl->GetOutlineLevel();//#outline level,zhaojianwei
-//        if (aMoveArr[nLevel] == -1)
-//          bMoveApplicable = false;
+
         if( pColl->IsAssignedToListLevelOfOutlineStyle() )
         {
             const int nLevel = pColl->GetAssignedOutlineStyleLevel();
@@ -372,12 +365,9 @@ BOOL SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
 
         if( pColl->IsAssignedToListLevelOfOutlineStyle() )
         {
-        // ASSERT(pColl->GetOutlineLevel() < MAXLEVEL,  //#outline level,removed by zhaojianwei
-        //         "non outline node in outline nodes?");
-        //int nLevel = pColl->GetOutlineLevel();
             const int nLevel = pColl->GetAssignedOutlineStyleLevel();//#outline level,add by zhaojianwei
 
-            ASSERT(aMoveArr[nLevel] >= 0,
+            OSL_ENSURE(aMoveArr[nLevel] >= 0,
                 "move table: current TxtColl not found when building table!");
 
 
@@ -425,11 +415,9 @@ BOOL SwDoc::MoveOutlinePara( const SwPaM& rPam, short nOffset )
     USHORT nAktPos = 0;
     SwNodeIndex aSttRg( rStt.nNode ), aEndRg( rEnd.nNode );
 
-    //BYTE nOutLineLevel = NO_NUMBERING;    //#outline level,zhaojianwei
     int nOutLineLevel = MAXLEVEL;           //<-end,zhaojianwei
     SwNode* pSrch = &aSttRg.GetNode();
-    //if( pSrch->IsTxtNode() )              //#outline level,zhaojianwei
-    //     nOutLineLevel = static_cast<BYTE>(((SwTxtNode*)pSrch)->GetOutlineLevel());
+
    if( pSrch->IsTxtNode())
         nOutLineLevel = static_cast<BYTE>(((SwTxtNode*)pSrch)->GetAttrOutlineLevel()-1);//<-end,zhaojianwei
     SwNode* pEndSrch = &aEndRg.GetNode();
@@ -453,7 +441,6 @@ BOOL SwDoc::MoveOutlinePara( const SwPaM& rPam, short nOffset )
     if( GetNodes().GetOutLineNds().Seek_Entry( pEndSrch, &nTmpPos ) )
     {
         if( !pEndSrch->IsTxtNode() || pEndSrch == pSrch ||
-            //nOutLineLevel < ((SwTxtNode*)pEndSrch)->GetOutlineLevel() )//#outline level,zhaojianwei
             nOutLineLevel < ((SwTxtNode*)pEndSrch)->GetAttrOutlineLevel()-1 )//<-end,zhaojianwei
             ++nTmpPos; // For sub outlines only!
     }
@@ -465,7 +452,7 @@ BOOL SwDoc::MoveOutlinePara( const SwPaM& rPam, short nOffset )
         nAktPos = nTmpPos;
     if( aEndRg == aSttRg )
     {
-        ASSERT( false, "Moving outlines: Surprising selection" );
+        OSL_ENSURE( false, "Moving outlines: Surprising selection" );
         aEndRg++;
     }
 
@@ -547,7 +534,7 @@ BOOL SwDoc::MoveOutlinePara( const SwPaM& rPam, short nOffset )
     if( pNd->FindTableNode() )
         return FALSE;
 
-    ASSERT( aSttRg.GetIndex() > nNewPos || nNewPos >= aEndRg.GetIndex(),
+    OSL_ENSURE( aSttRg.GetIndex() > nNewPos || nNewPos >= aEndRg.GetIndex(),
                 "Position liegt im MoveBereich" );
 
     // wurde ein Position in den Sonderbereichen errechnet, dann
@@ -642,16 +629,12 @@ USHORT lcl_FindOutlineNum( const SwNodes& rNds, String& rName )
     for( ; nPos < rOutlNds.Count(); ++nPos )
     {
         pNd = rOutlNds[ nPos ]->GetTxtNode();
-        //BYTE nLvl = pNd->GetTxtColl()->GetOutlineLevel(); //#outline level,zhaojianwei
         const int nLvl = pNd->GetAttrOutlineLevel()-1;   //<-end,zhaojianwei
         if( nLvl == nLevel - 1)
         {
-            // check for the outline num
-            // --> OD 2005-11-02 #i51089 - TUNING#
-            // --> OD 2006-09-22 #i68289#
+            // #i51089#, #i68289#
             // Assure, that text node has the correct numbering level. Otherwise,
             // its number vector will not fit to the searched level.
-//            if ( pNd->GetNum() )
             if ( pNd->GetNum() &&
                  pNd->GetActualListLevel() == ( nLevel - 1 ) )
             // <--
@@ -676,7 +659,7 @@ USHORT lcl_FindOutlineNum( const SwNodes& rNds, String& rName )
                 // has as hard attribute 'no numbering' set, has an outline level,
                 // but no numbering tree node. Thus, consider this situation in
                 // the assertion condition.
-                ASSERT( !pNd->GetNumRule(),
+                OSL_ENSURE( !pNd->GetNumRule(),
                         "<lcl_FindOutlineNum(..)> - text node with outline level and numbering rule, but without numbering tree node. This is a serious defect -> inform OD" );
             }
         }
@@ -763,88 +746,10 @@ BOOL SwDoc::GotoOutline( SwPosition& rPos, const String& rName ) const
     return FALSE;
 }
 
-// --- Nummerierung -----------------------------------------
-
-// --> OD 2008-02-19 #refactorlists#
-//void SwNumRuleInfo::MakeList( SwDoc& rDoc, BOOL )
-//{
-//    SwNumRule* pRule = rDoc.FindNumRulePtr(rName);
-
-//    // no rule, no fun.
-//    if ( !pRule )
-//        return;
-
-//    //
-//    // 1. Case: Information already available at pRule:
-//    //
-//    if (pRule->GetTxtNodeList())
-//    {
-//        // copy list to own pList pointer:
-//        aList = *pRule->GetTxtNodeList();
-//        return;
-//    }
-
-//    //
-//    // 2. Case: Information has to be generated from scratch:
-//    //
-
-//    if (pRule->IsOutlineRule())
-//    {
-//        const SwOutlineNodes & rOutlineNodes = rDoc.GetNodes().GetOutLineNds();
-
-//        for (USHORT i = 0; i < rOutlineNodes.Count(); ++i)
-//        {
-//            SwTxtNode & aNode = *((SwTxtNode *) rOutlineNodes[i]);
-
-//            if (pRule == aNode.GetNumRule())
-//                AddNode(aNode);
-//        }
-//    }
-//    {
-//        SwModify* pMod;
-//        const SfxPoolItem* pItem;
-//        USHORT i, nMaxItems = rDoc.GetAttrPool().GetItemCount
-//            ( RES_PARATR_NUMRULE);
-//        for( i = 0; i < nMaxItems; ++i )
-//        {
-//            pItem = rDoc.GetAttrPool().GetItem( RES_PARATR_NUMRULE, i );
-//            if( 0 != pItem)
-//            {
-//                pMod = (SwModify*)((SwNumRuleItem*)pItem)->GetDefinedIn();
-//                if (0 != pMod &&
-//                    ((SwNumRuleItem*)pItem)->GetValue().Len() &&
-//                    ((SwNumRuleItem*)pItem)->GetValue() == rName )
-//                {
-//                    if( pMod->IsA( TYPE( SwFmt )) )
-//                        pMod->GetInfo( *this );
-//                    else
-//                    {
-//                        SwTxtNode* pModTxtNode = (SwTxtNode*)pMod;
-
-//                        // #115901#
-//                        if( pModTxtNode->GetNodes().IsDocNodes())
-//                        {
-//                            AddNode( *pModTxtNode );
-//                        }
-//                    }
-//                }
-//            }
-//        }
-//    }
-
-//    // --> FME 2004-11-03 #i36571# The numrule and this info structure should
-//    // have different instances of the list:
-//    // --> OD 2006-09-12 #i69145#
-//    // method <SwNumRule::SetList(..)> copies content of list provided by the parameter
-//    pRule->SetTxtNodeList( aList );
-//    // <--
-//}
-// <--
-
 void lcl_ChgNumRule( SwDoc& rDoc, const SwNumRule& rRule )
 {
     SwNumRule* pOld = rDoc.FindNumRulePtr( rRule.GetName() );
-    ASSERT( pOld, "ohne die alte NumRule geht gar nichts" );
+    OSL_ENSURE( pOld, "ohne die alte NumRule geht gar nichts" );
 
     USHORT nChgFmtLevel = 0, nMask = 1;
     BYTE n;
@@ -869,8 +774,6 @@ void lcl_ChgNumRule( SwDoc& rDoc, const SwNumRule& rRule )
         pOld->CheckCharFmts( &rDoc );
         pOld->SetContinusNum( rRule.IsContinusNum() );
 
-        // Do NOT change list style type
-//        pOld->SetRuleType( rRule.GetRuleType() );
         if ( bInvalidateNumRule )
         {
             pOld->SetInvalidRule(TRUE);
@@ -879,24 +782,6 @@ void lcl_ChgNumRule( SwDoc& rDoc, const SwNumRule& rRule )
         return ;
     }
 
-//    SwNumRuleInfo* pUpd = new SwNumRuleInfo( rRule.GetName() );
-//    pUpd->MakeList( rDoc );
-
-//    BYTE nLvl;
-//    for( ULONG nFirst = 0, nLast = pUpd->GetList().Count();
-//        nFirst < nLast; ++nFirst )
-//    {
-//        SwTxtNode* pTxtNd = pUpd->GetList().GetObject( nFirst );
-//        nLvl = static_cast<BYTE>(pTxtNd->GetLevel());
-
-//        if( nLvl < MAXLEVEL )
-//        {
-//            if( nChgFmtLevel & ( 1 << nLvl ))
-//            {
-//                pTxtNd->NumRuleChgd();
-//            }
-//        }
-//    }
     SwNumRule::tTxtNodeList aTxtNodeList;
     pOld->GetTxtNodeList( aTxtNodeList );
     BYTE nLvl( 0 );
@@ -922,10 +807,6 @@ void lcl_ChgNumRule( SwDoc& rDoc, const SwNumRule& rRule )
     pOld->CheckCharFmts( &rDoc );
     pOld->SetInvalidRule(TRUE);
     pOld->SetContinusNum( rRule.IsContinusNum() );
-    // Do NOT change list style type
-//    pOld->SetRuleType( rRule.GetRuleType() );
-
-//    delete pUpd;
 
     rDoc.UpdateNumRule();
 }
@@ -987,7 +868,7 @@ void SwDoc::SetNumRule( const SwPaM& rPam,
             {
                 // create new list and apply its list id
                 SwList* pNewList = createList( String(), pNew->GetName() );
-                ASSERT( pNewList,
+                OSL_ENSURE( pNewList,
                         "<SwDoc::SetNumRule(..)> - could not create new list. Serious defect -> please inform OD." );
                 sListId = pNewList->GetListId();
             }
@@ -1060,16 +941,7 @@ void SwDoc::SetNumRule( const SwPaM& rPam,
 
 void SwDoc::SetCounted(const SwPaM & rPam, bool bCounted)
 {
-//    ULONG nStartPos = rPam.Start()->nNode.GetIndex();
-//    ULONG nEndPos = rPam.End()->nNode.GetIndex();
-
-//    for (ULONG n = nStartPos; n <= nEndPos; n++)
-//    {
-//        SwTxtNode * pNd = GetNodes()[n]->GetTxtNode();
 
-//        if (pNd)
-//            pNd->SetCountedInList(bCounted);
-//    }
     if ( bCounted )
     {
         SvUShortsSort aResetAttrsArray;
@@ -1083,30 +955,6 @@ void SwDoc::SetCounted(const SwPaM & rPam, bool bCounted)
     }
 }
 
-//void SwDoc::ReplaceNumRule(const SwPaM & rPaM, const SwNumRule & rNumRule)
-//{
-//    if (DoesUndo())
-//        StartUndo(UNDO_START, NULL);
-
-//  ULONG nStt = rPaM.Start()->nNode.GetIndex();
-//  ULONG nEnd = rPaM.End()->nNode.GetIndex();
-
-//    for (ULONG n = nStt; n <= nEnd; n++)
-//    {
-//        SwTxtNode * pCNd = GetNodes()[n]->GetTxtNode();
-
-//        if (pCNd && NULL != pCNd->GetNumRule())
-//        {
-//            SwPaM aPam(*pCNd);
-
-//            InsertPoolItem(aPam, SwNumRuleItem(rNumRule.GetName()), 0);
-//        }
-//    }
-
-//    if (DoesUndo())
-//        EndUndo(UNDO_START, NULL);
-//}
-
 void SwDoc::SetNumRuleStart( const SwPosition& rPos, BOOL bFlag )
 {
     SwTxtNode* pTxtNd = rPos.nNode.GetNode().GetTxtNode();
@@ -1135,18 +983,6 @@ void SwDoc::SetNodeNumStart( const SwPosition& rPos, USHORT nStt )
 
     if (pTxtNd)
     {
-//        const SwNumRule* pRule = pTxtNd->GetNumRule();
-//        if( pRule && nStt != pTxtNd->GetListRestartValue() )
-//        {
-//            if( DoesUndo() )
-//            {
-//                ClearRedo();
-//                AppendUndo( new SwUndoNumRuleStart( rPos, nStt ));
-//            }
-//        }
-//        pTxtNd->SetListRestartValue(nStt);
-
-//        SetModified();
         if ( !pTxtNd->HasAttrListRestartValue() ||
              pTxtNd->GetAttrListRestartValue() != nStt )
         {
@@ -1169,7 +1005,7 @@ BOOL SwDoc::DelNumRule( const String& rName, BOOL bBroadcast )
 
     if ( (*pNumRuleTbl)[ nPos ] == GetOutlineNumRule() )
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "<SwDoc::DelNumRule(..)> - No deletion of outline list style. This is serious defect - please inform OD" );
         return FALSE;
     }
@@ -1260,19 +1096,13 @@ sal_Bool SwDoc::RenameNumRule(const String & rOldName, const String & rNewName,
             AppendUndo(pUndo);
         }
 
-//        SwNumRuleInfo aInfo(rOldName);
-//        aInfo.MakeList(*this);
         SwNumRule::tTxtNodeList aTxtNodeList;
         pNumRule->GetTxtNodeList( aTxtNodeList );
 
         pNumRule->SetName( rNewName, *this );
 
         SwNumRuleItem aItem(rNewName);
-//        for (ULONG nI = 0; nI < aInfo.GetList().Count(); ++nI)
-//        {
-//            SwTxtNode * pTxtNd = aInfo.GetList().GetObject(nI);
-//            pTxtNd->SwCntntNode::SetAttr(aItem);
-//        }
+
         for ( SwNumRule::tTxtNodeList::iterator aIter = aTxtNodeList.begin();
               aIter != aTxtNodeList.end(); ++aIter )
         {
@@ -1294,19 +1124,6 @@ void SwDoc::StopNumRuleAnimations( OutputDevice* pOut )
 {
     for( USHORT n = GetNumRuleTbl().Count(); n; )
     {
-//        SwNumRuleInfo aUpd( GetNumRuleTbl()[ --n ]->GetName() );
-//        aUpd.MakeList( *this );
-
-//        for( ULONG nFirst = 0, nLast = aUpd.GetList().Count();
-//                nFirst < nLast; ++nFirst )
-//        {
-//            SwTxtNode* pTNd = aUpd.GetList().GetObject( nFirst );
-//            SwClientIter aIter( *pTNd );
-//            for( SwFrm* pFrm = (SwFrm*)aIter.First( TYPE(SwFrm) );
-//                    pFrm; pFrm = (SwFrm*)aIter.Next() )
-//                if( ((SwTxtFrm*)pFrm)->HasAnimation() )
-//                    ((SwTxtFrm*)pFrm)->StopAnimation( pOut );
-//        }
         SwNumRule::tTxtNodeList aTxtNodeList;
         GetNumRuleTbl()[ --n ]->GetTxtNodeList( aTxtNodeList );
         for ( SwNumRule::tTxtNodeList::iterator aTxtNodeIter = aTxtNodeList.begin();
@@ -1338,47 +1155,10 @@ BOOL SwDoc::ReplaceNumRule( const SwPosition& rPos,
             AppendUndo( pUndo = new SwUndoInsNum( rPos, *pNewRule, rOldRule ) );
         }
 
-        // apply new list style <pNewRule> to all text nodes, which have the
-        // old list style <pOldNRule> applied and belong to the same list as
-        // the text node of the given <SwPosition>.
-//        SwNumRuleInfo aUpd( rOldRule );
-//        aUpd.MakeList( *this );
-
-//        if (aUpd.GetList().Count() > 0)    // #106897#
         SwNumRule::tTxtNodeList aTxtNodeList;
         pOldRule->GetTxtNodeList( aTxtNodeList );
         if ( aTxtNodeList.size() > 0 )
         {
-//            // Position suchen und bestimme ob ein Node davor oder dahinter
-//            // einen Start erzwingt
-//            SwTxtNode* pTxtNd;
-//            ULONG nFndPos, nFirst, nLast;
-
-//            if( TABLE_ENTRY_NOTFOUND != aUpd.GetList().SearchKey(
-//                                                                 rPos.nNode.GetIndex(), &nFndPos ))
-//                ++nFndPos;
-
-//            for( nLast = nFndPos; nLast < aUpd.GetList().Count(); ++nLast )
-//            {
-//                pTxtNd = aUpd.GetList().GetObject( nLast );
-//                if(pTxtNd->IsRestart())
-//                    break;
-//            }
-//            for( nFirst = nFndPos; nFirst; )
-//            {
-//                pTxtNd = aUpd.GetList().GetObject( --nFirst );
-//                if( pTxtNd->IsRestart() )
-//                    break;
-//            }
-//            // dann neue Numerierung ueber diesen Bereich
-//            // definieren und den Start am Anfang/Ende zurueck setzen
-//            pTxtNd = aUpd.GetList().GetObject( nFirst );
-//            if( pTxtNd->IsRestart() )
-//            {
-//                pTxtNd->SetRestart(false);
-//                if( pUndo )
-//                    pUndo->SetSttNum( pTxtNd->GetIndex() );
-//            }
 
             SwRegHistory aRegH( pUndo ? pUndo->GetHistory() : 0 );
             USHORT nChgFmtLevel = 0;
@@ -1394,15 +1174,7 @@ BOOL SwDoc::ReplaceNumRule( const SwPosition& rPos,
 
             const SwTxtNode* pGivenTxtNode = rPos.nNode.GetNode().GetTxtNode();
             SwNumRuleItem aRule( rNewRule );
-//            for( ; nFirst < nLast; ++nFirst )
-//            {
-//                pTxtNd = aUpd.GetList().GetObject( nFirst );
 
-//                aRegH.RegisterInModify( pTxtNd, *pTxtNd );
-
-//                pTxtNd->SwCntntNode::SetAttr( aRule );
-//                pTxtNd->NumRuleChgd();
-//            }
             for ( SwNumRule::tTxtNodeList::iterator aIter = aTxtNodeList.begin();
                   aIter != aTxtNodeList.end(); ++aIter )
             {
@@ -1445,9 +1217,8 @@ namespace
 
 void SwDoc::MakeUniqueNumRules(const SwPaM & rPaM)
 {
-    ASSERT( rPaM.GetDoc() == this, "need same doc" );
+    OSL_ENSURE( rPaM.GetDoc() == this, "need same doc" );
 
-//    map<SwNumRule *, SwNumRule *> aMyNumRuleMap;
     ::std::map<SwNumRule *, ListStyleData> aMyNumRuleMap;
 
      ULONG nStt = rPaM.Start()->nNode.GetIndex();
@@ -1465,10 +1236,8 @@ void SwDoc::MakeUniqueNumRules(const SwPaM & rPaM)
 
             if (pRule && pRule->IsAutoRule() && ! pRule->IsOutlineRule())
             {
-//                SwNumRule * pReplaceNumRule = aMyNumRuleMap[pRule];
                 ListStyleData aListStyleData = aMyNumRuleMap[pRule];
 
-//                if (! pReplaceNumRule)
                 if ( aListStyleData.pReplaceNumRule == 0 )
                 {
                     if (bFirst)
@@ -1481,11 +1250,8 @@ void SwDoc::MakeUniqueNumRules(const SwPaM & rPaM)
                                             aListStyleData.sListId, true ));
                     }
 
-//                    if (! pReplaceNumRule)
                     if ( aListStyleData.pReplaceNumRule == 0 )
                     {
-//                        pReplaceNumRule = new SwNumRule(*pRule);
-//                        pReplaceNumRule->SetName(GetUniqueNumRuleName());
                         aListStyleData.pReplaceNumRule = new SwNumRule(*pRule);
 
                         aListStyleData.pReplaceNumRule->SetName(
@@ -1494,7 +1260,6 @@ void SwDoc::MakeUniqueNumRules(const SwPaM & rPaM)
                         aListStyleData.bCreateNewList = true;
                     }
 
-//                    aMyNumRuleMap[pRule] = pReplaceNumRule;
                     aMyNumRuleMap[pRule] = aListStyleData;
                 }
 
@@ -1591,8 +1356,7 @@ void SwDoc::DelNumRules( const SwPaM& rPam )
 
             if( RES_CONDTXTFMTCOLL == pTNd->GetFmtColl()->Which() )
                 pTNd->ChkCondColl();
-            //else if( !pOutlNd && NO_NUMBERING != //#outline level,zhaojianwei
-            //  ((SwTxtFmtColl*)pTNd->GetFmtColl())->GetOutlineLevel() )
+
             else if( !pOutlNd &&
                 ((SwTxtFmtColl*)pTNd->GetFmtColl())->IsAssignedToListLevelOfOutlineStyle() )//<-end,zhaojianwei
                 pOutlNd = pTNd;
@@ -1616,7 +1380,7 @@ void SwDoc::InvalidateNumRules()
 BOOL lcl_IsNumOk( BYTE nSrchNum, BYTE& rLower, BYTE& rUpper,
                     BOOL bOverUpper, BYTE nNumber )
 {
-    ASSERT( nNumber < MAXLEVEL,
+    OSL_ENSURE( nNumber < MAXLEVEL,
             "<lcl_IsNumOk(..)> - misusage of method" );
 
     BOOL bRet = FALSE;
@@ -2174,7 +1938,7 @@ BOOL SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, BOOL bIsOutlMv )
                    the previous content node. */
                 SwPaM aInsPam(aInsPos);
                 BOOL bMoved = aInsPam.Move(fnMoveBackward);
-                ASSERT(bMoved, "No content node found!");
+                OSL_ENSURE(bMoved, "No content node found!");
 
                 if (bMoved)
                 {
@@ -2355,7 +2119,6 @@ SwNumRule* SwDoc::GetCurrNumRule( const SwPosition& rPos ) const
 
     if( pTNd )
     {
-//        pTNd->SyncNumberAndNumRule();
         pRet = pTNd->GetNumRule();
     }
 
@@ -2583,7 +2346,7 @@ void SwDoc::addListItem( const SwNodeNum& rNodeNum )
 
     const bool bAlreadyInserted(
             mpListItemsList->find( &rNodeNum ) != mpListItemsList->end() );
-    ASSERT( !bAlreadyInserted,
+    OSL_ENSURE( !bAlreadyInserted,
             "<SwDoc::InsertListItem(..)> - <SwNodeNum> instance already registered as numbered item!" );
     if ( !bAlreadyInserted )
     {
@@ -2601,7 +2364,7 @@ void SwDoc::removeListItem( const SwNodeNum& rNodeNum )
     const tImplSortedNodeNumList::size_type nDeleted = mpListItemsList->erase( &rNodeNum );
     if ( nDeleted > 1 )
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "<SwDoc::RemoveListItem(..)> - <SwNodeNum> was registered more than once as numbered item!" );
     }
 }
@@ -2698,7 +2461,7 @@ SwList* SwDoc::createList( String sListId,
 
     if ( getListByName( sListId ) )
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "<SwDoc::createList(..)> - provided list id already used. Serious defect -> please inform OD." );
         return 0;
     }
@@ -2706,7 +2469,7 @@ SwList* SwDoc::createList( String sListId,
     SwNumRule* pDefaultNumRuleForNewList = FindNumRulePtr( sDefaultListStyleName );
     if ( !pDefaultNumRuleForNewList )
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "<SwDoc::createList(..)> - for provided default list style name no list style is found. Serious defect -> please inform OD." );
         return 0;
     }
@@ -2745,14 +2508,14 @@ SwList* SwDoc::createListForListStyle( const String sListStyleName )
 {
     if ( sListStyleName.Len() == 0 )
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "<SwDoc::createListForListStyle(..)> - no list style name provided. Serious defect -> please inform OD." );
         return 0;
     }
 
     if ( getListForListStyle( sListStyleName ) )
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "<SwDoc::createListForListStyle(..)> - a list for the provided list style name already exists. Serious defect -> please inform OD." );
         return 0;
     }
@@ -2760,7 +2523,7 @@ SwList* SwDoc::createListForListStyle( const String sListStyleName )
     SwNumRule* pNumRule = FindNumRulePtr( sListStyleName );
     if ( !pNumRule )
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "<SwDoc::createListForListStyle(..)> - for provided list style name no list style is found. Serious defect -> please inform OD." );
         return 0;
     }
@@ -2796,7 +2559,7 @@ void SwDoc::deleteListForListStyle( const String sListStyleName )
     String sListId;
     {
         SwList* pList = getListForListStyle( sListStyleName );
-        ASSERT( pList,
+        OSL_ENSURE( pList,
                 "<SwDoc::deleteListForListStyle(..)> - misusage of method: no list found for given list style name" );
         if ( pList )
         {
@@ -2814,7 +2577,7 @@ void SwDoc::trackChangeOfListStyleName( const String sListStyleName,
                                         const String sNewListStyleName )
 {
     SwList* pList = getListForListStyle( sListStyleName );
-    ASSERT( pList,
+    OSL_ENSURE( pList,
             "<SwDoc::changeOfListStyleName(..)> - misusage of method: no list found for given list style name" );
 
     if ( pList != 0 )
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index e71f8787a990..efd16bbfa724 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -55,14 +55,9 @@ using namespace com::sun::star;
 
 TYPEINIT1(SwRedlineHint, SfxHint);
 
-#ifndef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
-    #define _CHECK_REDLINE( pDoc )
-    #define _DEBUG_REDLINE( pDoc )
-
-#else
-
-#define _ERROR_PREFIX "redline table corrupted: "
+    #define _ERROR_PREFIX "redline table corrupted: "
 
     // helper function for lcl_CheckRedline
     // 1. make sure that pPos->nContent points into pPos->nNode
@@ -152,6 +147,12 @@ TYPEINIT1(SwRedlineHint, SfxHint);
 
     #define _DEBUG_REDLINE( pDoc ) lcl_DebugRedline( pDoc );
 
+
+#else
+
+    #define _CHECK_REDLINE( pDoc )
+    #define _DEBUG_REDLINE( pDoc )
+
 #endif
 
 SV_IMPL_OP_PTRARR_SORT( _SwRedlineTbl, SwRedlinePtr )
@@ -703,7 +704,6 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
                     case POS_COLLIDE_START:
                     case POS_COLLIDE_END:
                         if( pRedl->IsOwnRedline( *pNewRedl ) &&
-//                          1 == pRedl->GetStackCount() &&
                             pRedl->CanCombine( *pNewRedl ) )
                         {
                             if( IsHideChanges( eRedlineMode ))
@@ -1024,14 +1024,12 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
                         // insert the pNew part (if it exists)
                         if( pNew )
                         {
-                            // AppendRedline( pNew, bCallDelete );
-                            //sal_Bool bRet =
                             pRedlineTbl->Insert( pNew );
 
                             // pNew must be deleted if Insert() wasn't
                             // successful. But that can't happen, since pNew is
                             // part of the original pRedl redline.
-                            // ASSERT( bRet, "Can't insert existing redline?" );
+                            // OSL_ENSURE( bRet, "Can't insert existing redline?" );
 
                             // restart (now with pRedl being split up)
                             n = 0;
@@ -2637,7 +2635,7 @@ BOOL SwRedlineTbl::Insert( SwRedlinePtr& p, BOOL bIns )
         bRet = InsertWithValidRanges( p );
     else
     {
-        ASSERT( !this, "Redline: falscher Bereich" );
+        OSL_ENSURE( !this, "Redline: falscher Bereich" );
     }
     return bRet;
 }
@@ -2654,7 +2652,7 @@ BOOL SwRedlineTbl::Insert( SwRedlinePtr& p, USHORT& rP, BOOL bIns )
         bRet = InsertWithValidRanges( p, &rP );
     else
     {
-        ASSERT( !this, "Redline: falscher Bereich" );
+        OSL_ENSURE( !this, "Redline: falscher Bereich" );
     }
     return bRet;
 }
@@ -3317,7 +3315,7 @@ void SwRedline::CalcStartEnd( ULONG nNdIdx, USHORT& nStart, USHORT& nEnd ) const
         }
         else
         {
-            ASSERT( pREnd->nNode == nNdIdx,
+            OSL_ENSURE( pREnd->nNode == nNdIdx,
                 "SwRedlineItr::Seek: GetRedlinePos Error" );
             nStart = 0;             // Absatz wird vorne ueberlappt
             nEnd = pREnd->nContent.GetIndex();
@@ -3541,7 +3539,7 @@ void SwRedline::DelCopyOfSection()
                 // current ones can be affected.
                 const SwRedlineTbl& rTbl = pDoc->GetRedlineTbl();
                 USHORT n = rTbl.GetPos( this );
-                ASSERT( n != USHRT_MAX, "How strange. We don't exist!" );
+                OSL_ENSURE( n != USHRT_MAX, "How strange. We don't exist!" );
                 for( BOOL bBreak = FALSE; !bBreak && n > 0; )
                 {
                     --n;
@@ -3589,7 +3587,7 @@ void SwRedline::MoveFromSection()
         const SwRedlineTbl& rTbl = pDoc->GetRedlineTbl();
         SvPtrarr aBeforeArr( 16, 16 ), aBehindArr( 16, 16 );
         USHORT nMyPos = rTbl.GetPos( this );
-        ASSERT( this, "this nicht im Array?" );
+        OSL_ENSURE( this, "this nicht im Array?" );
         BOOL bBreak = FALSE;
         USHORT n;
 
@@ -3717,9 +3715,9 @@ void SwRedline::SetContentIdx( const SwNodeIndex* pIdx )
         delete pCntntSect, pCntntSect = 0;
         bIsVisible = FALSE;
     }
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     else
-        ASSERT( !this, "das ist keine gueltige Operation" );
+        OSL_ENSURE( !this, "das ist keine gueltige Operation" );
 #endif
 }
 
@@ -3731,8 +3729,6 @@ BOOL SwRedline::CanCombine( const SwRedline& rRedl ) const
 
 void SwRedline::PushData( const SwRedline& rRedl, BOOL bOwnAsNext )
 {
-//  SwRedlineData* pNew = new SwRedlineData( rRedl.GetType(),
-//                                           rRedl.GetAuthor() );
     SwRedlineData* pNew = new SwRedlineData( *rRedl.pRedlineData, FALSE );
     if( bOwnAsNext )
     {
@@ -3822,7 +3818,7 @@ const SwRedlineData & SwRedline::GetRedlineData(USHORT nPos) const
         nPos--;
     }
 
-    ASSERT( 0 == nPos, "Pos angabe ist zu gross" );
+    OSL_ENSURE( 0 == nPos, "Pos angabe ist zu gross" );
 
     return *pCur;
 }
diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx
index e09e74c3db03..759002c3ac4e 100644
--- a/sw/source/core/doc/docruby.cxx
+++ b/sw/source/core/doc/docruby.cxx
@@ -298,28 +298,7 @@ BOOL SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, USHORT )
 
         case UnicodeType::OTHER_LETTER:
             bChkNxtWrd = TRUE;
-            // no break!
-//      case UnicodeType::UNASSIGNED:
-//      case UnicodeType::MODIFIER_LETTER:
-//      case UnicodeType::NON_SPACING_MARK:
-//      case UnicodeType::ENCLOSING_MARK:
-//      case UnicodeType::COMBINING_SPACING_MARK:
-//      case UnicodeType::LETTER_NUMBER:
-//      case UnicodeType::OTHER_NUMBER:
-//      case UnicodeType::LINE_SEPARATOR:
-//      case UnicodeType::PARAGRAPH_SEPARATOR:
-//      case UnicodeType::FORMAT:
-//      case UnicodeType::SURROGATE:
-//      case UnicodeType::DASH_PUNCTUATION:
-//      case UnicodeType::CONNECTOR_PUNCTUATION:
-///*?? */case UnicodeType::OTHER_PUNCTUATION:
-//--> char '!' is to ignore!
-//      case UnicodeType::MATH_SYMBOL:
-//      case UnicodeType::CURRENCY_SYMBOL:
-//      case UnicodeType::MODIFIER_SYMBOL:
-//      case UnicodeType::OTHER_SYMBOL:
-//      case UnicodeType::INITIAL_PUNCTUATION:
-//      case UnicodeType::FINAL_PUNCTUATION:
+
         default:
                 bIsAlphaNum = FALSE;
                 break;
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index 62983a13b2a7..81b8726a0671 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -77,7 +77,7 @@ SV_IMPL_OP_PTRARR_SORT( SwSortElements, SwSortElementPtr );
 void SwSortElement::Init( SwDoc* pD, const SwSortOptions& rOpt,
                             FlatFndBox* pFltBx )
 {
-    ASSERT( !pDoc && !pOptions && !pBox, "wer hat das Finit vergessen?" );
+    OSL_ENSURE( !pDoc && !pOptions && !pBox, "wer hat das Finit vergessen?" );
     pDoc = pD;
     pOptions = new SwSortOptions( rOpt );
     pBox = pFltBx;
@@ -94,8 +94,6 @@ void SwSortElement::Init( SwDoc* pD, const SwSortOptions& rOpt,
 
     pSortCollator = new CollatorWrapper(
                                 ::comphelper::getProcessServiceFactory() );
-//  pSortCollator->loadCollatorAlgorithm( sAlgorithm, aLocale,
-//                      rOpt.bIgnoreCase ? SW_COLLATOR_IGNORES : 0 );
 }
 
 void SwSortElement::Finit()
@@ -267,7 +265,7 @@ String SwSortBoxElement::GetKey(USHORT nKey) const
     if( pFndBox )
     {   // StartNode holen und ueberlesen
         const SwTableBox* pMyBox = pFndBox->GetBox();
-        ASSERT(pMyBox, "Keine atomare Box");
+        OSL_ENSURE(pMyBox, "Keine atomare Box");
 
         if( pMyBox->GetSttNd() )
         {
@@ -487,7 +485,7 @@ BOOL SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
 BOOL SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
 {
     // uebers SwDoc fuer Undo !!
-    ASSERT( rBoxes.Count(), "keine gueltige Box-Liste" );
+    OSL_ENSURE( rBoxes.Count(), "keine gueltige Box-Liste" );
     SwTableNode* pTblNd = (SwTableNode*)rBoxes[0]->GetSttNd()->FindTableNode();
     if( !pTblNd )
         return FALSE;
@@ -714,7 +712,7 @@ void MoveCol(SwDoc* pDoc, const FlatFndBox& rBox, USHORT nS, USHORT nT,
 void MoveCell(SwDoc* pDoc, const SwTableBox* pSource, const SwTableBox* pTar,
               BOOL bMovedBefore, SwUndoSort* pUD)
 {
-    ASSERT(pSource && pTar,"Fehlende Quelle oder Ziel");
+    OSL_ENSURE(pSource && pTar,"Fehlende Quelle oder Ziel");
 
     if(pSource == pTar)
         return;
@@ -744,7 +742,7 @@ void MoveCell(SwDoc* pDoc, const SwTableBox* pSource, const SwTableBox* pTar,
     BOOL bDelFirst = FALSE;
     if( nCount == 2 )
     {
-        ASSERT( pNd->GetCntntNode(), "Kein ContentNode");
+        OSL_ENSURE( pNd->GetCntntNode(), "Kein ContentNode");
         bDelFirst = !pNd->GetCntntNode()->Len() && bMovedBefore;
     }
 
@@ -971,13 +969,13 @@ const _FndBox* FlatFndBox::GetBox(USHORT n_Col, USHORT n_Row) const
     USHORT nOff = n_Row * nCols + n_Col;
     const _FndBox* pTmp = *(pArr + nOff);
 
-    ASSERT(n_Col < nCols && n_Row < nRows && pTmp, "unzulaessiger Array-Zugriff");
+    OSL_ENSURE(n_Col < nCols && n_Row < nRows && pTmp, "unzulaessiger Array-Zugriff");
     return pTmp;
 }
 
 const SfxItemSet* FlatFndBox::GetItemSet(USHORT n_Col, USHORT n_Row) const
 {
-    ASSERT( !ppItemSets || ( n_Col < nCols && n_Row < nRows), "unzulaessiger Array-Zugriff");
+    OSL_ENSURE( !ppItemSets || ( n_Col < nCols && n_Row < nRows), "unzulaessiger Array-Zugriff");
 
     return ppItemSets ? *(ppItemSets + (n_Row * nCols + n_Col )) : 0;
 }
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index b00b8bc5f808..49b3e3618d7d 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -181,10 +181,10 @@ void SwDoc::DeleteTOXMark( const SwTOXMark* pTOXMark )
 {
     // hole den TextNode und
     const SwTxtTOXMark* pTxtTOXMark = pTOXMark->GetTxtTOXMark();
-    ASSERT( pTxtTOXMark, "Kein TxtTOXMark, kann nicht geloescht werden" );
+    OSL_ENSURE( pTxtTOXMark, "Kein TxtTOXMark, kann nicht geloescht werden" );
 
     SwTxtNode& rTxtNd = const_cast<SwTxtNode&>(pTxtTOXMark->GetTxtNode());
-    ASSERT( rTxtNd.GetpSwpHints(), "kann nicht geloescht werden" );
+    OSL_ENSURE( rTxtNd.GetpSwpHints(), "kann nicht geloescht werden" );
 
     if( DoesUndo() )
     {
@@ -220,20 +220,20 @@ public:
     CompareNodeCntnt( ULONG nNd, xub_StrLen nCnt )
         : nNode( nNd ), nCntnt( nCnt ) {}
 
-    int operator==( const CompareNodeCntnt& rCmp )
+    int operator==( const CompareNodeCntnt& rCmp ) const
         { return nNode == rCmp.nNode && nCntnt == rCmp.nCntnt; }
-    int operator!=( const CompareNodeCntnt& rCmp )
+    int operator!=( const CompareNodeCntnt& rCmp ) const
         { return nNode != rCmp.nNode || nCntnt != rCmp.nCntnt; }
-    int operator< ( const CompareNodeCntnt& rCmp )
+    int operator< ( const CompareNodeCntnt& rCmp ) const
         { return nNode < rCmp.nNode ||
             ( nNode == rCmp.nNode && nCntnt < rCmp.nCntnt); }
-    int operator<=( const CompareNodeCntnt& rCmp )
+    int operator<=( const CompareNodeCntnt& rCmp ) const
         { return nNode < rCmp.nNode ||
             ( nNode == rCmp.nNode && nCntnt <= rCmp.nCntnt); }
-    int operator> ( const CompareNodeCntnt& rCmp )
+    int operator> ( const CompareNodeCntnt& rCmp ) const
         { return nNode > rCmp.nNode ||
             ( nNode == rCmp.nNode && nCntnt > rCmp.nCntnt); }
-    int operator>=( const CompareNodeCntnt& rCmp )
+    int operator>=( const CompareNodeCntnt& rCmp ) const
         { return nNode > rCmp.nNode ||
             ( nNode == rCmp.nNode && nCntnt >= rCmp.nCntnt); }
 };
@@ -242,7 +242,7 @@ const SwTOXMark& SwDoc::GotoTOXMark( const SwTOXMark& rCurTOXMark,
                                     SwTOXSearch eDir, BOOL bInReadOnly )
 {
     const SwTxtTOXMark* pMark = rCurTOXMark.GetTxtTOXMark();
-    ASSERT(pMark, "pMark==0 Ungueltige TxtTOXMark");
+    OSL_ENSURE(pMark, "pMark==0 Ungueltige TxtTOXMark");
 
     const SwTxtNode *pTOXSrc = pMark->GetpTxtNd();
 
@@ -459,7 +459,7 @@ const SwTOXBase* SwDoc::GetCurTOX( const SwPosition& rPos ) const
         SectionType eT = pSectNd->GetSection().GetType();
         if( TOX_CONTENT_SECTION == eT )
         {
-            ASSERT( pSectNd->GetSection().ISA( SwTOXBaseSection ),
+            OSL_ENSURE( pSectNd->GetSection().ISA( SwTOXBaseSection ),
                     "keine TOXBaseSection!" );
             SwTOXBaseSection& rTOXSect = (SwTOXBaseSection&)
                                                 pSectNd->GetSection();
@@ -472,10 +472,10 @@ const SwTOXBase* SwDoc::GetCurTOX( const SwPosition& rPos ) const
 
 const SwAttrSet& SwDoc::GetTOXBaseAttrSet(const SwTOXBase& rTOXBase) const
 {
-    ASSERT( rTOXBase.ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
+    OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
     const SwTOXBaseSection& rTOXSect = (const SwTOXBaseSection&)rTOXBase;
     SwSectionFmt* pFmt = rTOXSect.GetFmt();
-    ASSERT( pFmt, "invalid TOXBaseSection!" );
+    OSL_ENSURE( pFmt, "invalid TOXBaseSection!" );
     return pFmt->GetAttrSet();
 }
 
@@ -526,7 +526,7 @@ BOOL SwDoc::DeleteTOX( const SwTOXBase& rTOXBase, BOOL bDelNodes )
 {
     // its only delete the TOX, not the nodes
     BOOL bRet = FALSE;
-    ASSERT( rTOXBase.ISA( SwTOXBaseSection ), "keine TOXBaseSection!" );
+    OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ), "keine TOXBaseSection!" );
 
     const SwTOXBaseSection& rTOXSect = (const SwTOXBaseSection&)rTOXBase;
     SwSectionFmt* pFmt = rTOXSect.GetFmt();
@@ -697,7 +697,7 @@ String SwDoc::GetUniqueTOXBaseName( const SwTOXType& rType,
 
 BOOL SwDoc::SetTOXBaseName(const SwTOXBase& rTOXBase, const String& rName)
 {
-    ASSERT( rTOXBase.ISA( SwTOXBaseSection ),
+    OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ),
                     "keine TOXBaseSection!" );
     SwTOXBaseSection* pTOX = (SwTOXBaseSection*)&rTOXBase;
 
@@ -726,7 +726,7 @@ const SwTxtNode* lcl_FindChapterNode( const SwNode& rNd, BYTE nLvl = 0 )
         {
             SwPosition aPos( *pNd );
             pNd = GetBodyTxtNode( *pNd->GetDoc(), aPos, *pFrm );
-            ASSERT( pNd,    "wo steht der Absatz" );
+            OSL_ENSURE( pNd,    "wo steht der Absatz" );
         }
     }
     return pNd ? pNd->FindOutlineNodeOfLevel( nLvl ) : 0;
@@ -1246,8 +1246,7 @@ void SwTOXBaseSection::UpdateOutline( const SwTxtNode* pOwnChapterNode )
         ::SetProgressState( 0, pDoc->GetDocShell() );
         SwTxtNode* pTxtNd = rOutlNds[ n ]->GetTxtNode();
         if( pTxtNd && pTxtNd->Len() && pTxtNd->GetDepends() &&
-            //USHORT(pTxtNd->GetTxtColl()->GetOutlineLevel()+1) <= GetLevel() &&    //#outline level,zhaojianwei
-            USHORT( pTxtNd->GetAttrOutlineLevel()) <= GetLevel() && //<-end,zhaojianwei
+            USHORT( pTxtNd->GetAttrOutlineLevel()) <= GetLevel() &&
             pTxtNd->GetFrm() &&
            !pTxtNd->HasHiddenParaField() &&
            !pTxtNd->HasHiddenCharAttribute( true ) &&
@@ -1279,8 +1278,7 @@ void SwTOXBaseSection::UpdateTemplate( const SwTxtNode* pOwnChapterNode )
             if( !pColl ||
                 ( TOX_CONTENT == SwTOXBase::GetType() &&
                   GetCreateType() & nsSwTOXElement::TOX_OUTLINELEVEL &&
-                  //NO_NUMBERING != pColl->GetOutlineLevel() ) )//#outline level,zhaojianwei
-                    pColl->IsAssignedToListLevelOfOutlineStyle()) )//<-end,zhaojianwei
+                    pColl->IsAssignedToListLevelOfOutlineStyle()) )
                   continue;
 
             SwClientIter aIter( *pColl );
@@ -1361,11 +1359,8 @@ void SwTOXBaseSection::UpdateAuthorities( const SwTOXInternational& rIntl )
         const SwTxtNode& rTxtNode = pTxtFld->GetTxtNode();
         ::SetProgressState( 0, pDoc->GetDocShell() );
 
-//      const SwTxtNode* pChapterCompareNode = 0;
-
         if( rTxtNode.GetTxt().Len() && rTxtNode.GetFrm() &&
-            rTxtNode.GetNodes().IsDocNodes() /*&&
-            (!IsFromChapter() || pChapterCompareNode == pOwnChapterNode) */)
+            rTxtNode.GetNodes().IsDocNodes() )
         {
             //#106485# the body node has to be used!
             SwCntntFrm *pFrm = rTxtNode.GetFrm();
@@ -1509,9 +1504,6 @@ void SwTOXBaseSection::UpdateCntnt( SwTOXElement eMyType,
                                                         MAXLEVEL - 1 );
                 if( pOutlNd )
                 {
-                    //USHORT nTmp = pOutlNd->GetTxtColl()->GetOutlineLevel();//#outline level,zhaojianwei
-                    //if( nTmp < NO_NUMBERING )
-                    //  nSetLevel = nTmp + 1;
                     if( pOutlNd->GetTxtColl()->IsAssignedToListLevelOfOutlineStyle())
                         nSetLevel = pOutlNd->GetTxtColl()->GetAttrOutlineLevel() ;//<-end,zhaojianwei
                 }
@@ -1567,9 +1559,6 @@ void SwTOXBaseSection::UpdateTable( const SwTxtNode* pOwnChapterNode )
                             ::lcl_FindChapterNode( *pCNd, MAXLEVEL - 1 );
                         if( pOutlNd )
                         {
-                            //USHORT nTmp = pOutlNd->GetTxtColl()->GetOutlineLevel();//#outline level,zhaojianwei
-                            //if( nTmp < NO_NUMBERING )
-                            //  pNew->SetLevel( nTmp + 1 );
                             if( pOutlNd->GetTxtColl()->IsAssignedToListLevelOfOutlineStyle())
                             {
                                 const int nTmp = pOutlNd->GetTxtColl()->GetAttrOutlineLevel();
@@ -1630,7 +1619,7 @@ void SwTOXBaseSection::GenerateText( USHORT nArrayIdx,
         // String mit dem Pattern aus der Form initialisieren
         const SwTOXSortTabBase& rBase = *aSortArr[nIndex];
         USHORT nLvl = rBase.GetLevel();
-        ASSERT( nLvl < GetTOXForm().GetFormMax(), "ungueltiges FORM_LEVEL");
+        OSL_ENSURE( nLvl < GetTOXForm().GetFormMax(), "ungueltiges FORM_LEVEL");
 
         SvxTabStopItem aTStops( 0, 0, SVX_TAB_ADJUST_DEFAULT, RES_PARATR_TABSTOP );
         xub_StrLen nLinkStartPosition = STRING_NOTFOUND;
@@ -1769,9 +1758,6 @@ void SwTOXBaseSection::GenerateText( USHORT nArrayIdx,
                         aInsStr += cEndPageNum;
                         rTxt.Append( aInsStr );
                     }
-//                      // Tab entfernen, wenn keine Seitennummer
-//                  else if( rTxt.Len() && '\t' == rTxt.GetChar( rTxt.Len() - 1 ))
-//                      rTxt.Erase( rTxt.Len()-1, 1 );
                 }
                 break;
 
@@ -1783,8 +1769,6 @@ void SwTOXBaseSection::GenerateText( USHORT nArrayIdx,
                         pTOXSource = &rBase.aTOXSources[0];
 
                     // --> OD 2008-02-14 #i53420#
-//                    if( pTOXSource && pTOXSource->pNd
-//                        pTOXSource->pNd->IsTxtNode() )
                     if ( pTOXSource && pTOXSource->pNd &&
                          pTOXSource->pNd->IsCntntNode() )
                     // <--
@@ -1796,7 +1780,6 @@ void SwTOXBaseSection::GenerateText( USHORT nArrayIdx,
                             SwChapterField aFld( &aFldTyp, aToken.nChapterFormat );
                             aFld.SetLevel( static_cast<BYTE>(aToken.nOutlineLevel - 1) );
                             // --> OD 2008-02-14 #i53420#
-//                            aFld.ChangeExpansion( pFrm, (SwTxtNode*)pTOXSource->pNd, TRUE );
                             aFld.ChangeExpansion( pFrm,
                                 dynamic_cast<const SwCntntNode*>(pTOXSource->pNd),
                                 TRUE );
@@ -1964,7 +1947,7 @@ void SwTOXBaseSection::UpdatePageNum()
                 if( rTOXSource.pNd )
                 {
                     SwCntntFrm* pFrm = rTOXSource.pNd->GetFrm();
-                    ASSERT( pFrm || pDoc->IsUpdateTOX(), "TOX, no Frame found");
+                    OSL_ENSURE( pFrm || pDoc->IsUpdateTOX(), "TOX, no Frame found");
                     if( !pFrm )
                         continue;
                     if( pFrm->IsTxtFrm() && ((SwTxtFrm*)pFrm)->HasFollow() )
@@ -2007,7 +1990,7 @@ void SwTOXBaseSection::UpdatePageNum()
             if(pBase->pTOXNd)
             {
                 const SwTxtNode* pTxtNd = pBase->pTOXNd->GetTxtNode();
-                ASSERT( pTxtNd, "kein TextNode, falsches Verzeichnis" );
+                OSL_ENSURE( pTxtNd, "kein TextNode, falsches Verzeichnis" );
 
                 _UpdatePageNum( (SwTxtNode*)pTxtNd, aNums, aDescs, pMainNums,
                                 aIntl );
@@ -2277,7 +2260,7 @@ void SwTOXBaseSection::InsertSorted(SwTOXSortTabBase* pNew)
                 delete pNew;
                 return;
             }
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
             else
                 DBG_ERROR("Bibliography entries cannot be found here");
 #endif
@@ -2311,7 +2294,7 @@ Range SwTOXBaseSection::GetKeyRange(const String& rStr, const String& rStrReadin
         sToCompare.Erase( 0, 1 ).Insert( sUpper, 0 );
     }
 
-    ASSERT(rRange.Min() >= 0 && rRange.Max() >= 0, "Min Max < 0");
+    OSL_ENSURE(rRange.Min() >= 0 && rRange.Max() >= 0, "Min Max < 0");
 
     const USHORT nMin = (USHORT)rRange.Min();
     const USHORT nMax = (USHORT)rRange.Max();
diff --git a/sw/source/core/doc/extinput.cxx b/sw/source/core/doc/extinput.cxx
index ea7d7cc75e30..fdfe5ca10310 100644
--- a/sw/source/core/doc/extinput.cxx
+++ b/sw/source/core/doc/extinput.cxx
@@ -287,7 +287,7 @@ SwExtTextInput* SwDoc::GetExtTextInput( const SwNode& rNd,
 
 SwExtTextInput* SwDoc::GetExtTextInput() const
 {
-    ASSERT( !pExtInputRing || pExtInputRing == pExtInputRing->GetNext(),
+    OSL_ENSURE( !pExtInputRing || pExtInputRing == pExtInputRing->GetNext(),
             "more then one InputEngine available" );
     return (SwExtTextInput*)pExtInputRing;
 }
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index cdbcbcda6f45..26504c1c17a2 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -70,14 +70,13 @@ namespace TxtFmtCollFunc
         if ( !pTxtFmtColl )
         {
     #if OSL_DEBUG_LEVEL > 1
-            ASSERT( false,
+            OSL_ENSURE( false,
                     "<TxtFmtCollFunc::CheckTxtFmtCollFuncForDeletionOfAssignmentToOutlineStyle> - misuse of method - it's only for instances of <SwTxtFmtColl>" );
     #endif
             return;
         }
 
         // --> OD 2007-01-24 #i73790#
-    //    if ( pTxtFmtColl->AssignedToListLevelOfOutlineStyle() )
         if ( !pTxtFmtColl->StayAssignedToListLevelOfOutlineStyle() &&
              pTxtFmtColl->IsAssignedToListLevelOfOutlineStyle() )
         // <--
@@ -502,7 +501,7 @@ bool SwTxtFmtColl::AreListLevelIndentsApplicable() const
             }
 
             pColl = dynamic_cast<const SwTxtFmtColl*>(pColl->DerivedFrom());
-            ASSERT( pColl,
+            OSL_ENSURE( pColl,
                     "<SwTxtFmtColl::AreListLevelIndentsApplicable()> - something wrong in paragraph style hierarchy. The applied list style is not found." );
         }
     }
@@ -662,7 +661,7 @@ void SwConditionTxtFmtColl::SetConditions( const SwFmtCollConditions& rCndClls )
 //#outline level, zhaojianwei
 void SwTxtFmtColl::SetAttrOutlineLevel( int nLevel)
 {
-    ASSERT( 0 <= nLevel && nLevel <= MAXLEVEL ,"SwTxtFmtColl: Level Out Of Range" );
+    OSL_ENSURE( 0 <= nLevel && nLevel <= MAXLEVEL ,"SwTxtFmtColl: Level Out Of Range" );
     SetFmtAttr( SfxUInt16Item( RES_PARATR_OUTLINELEVEL,
                             static_cast<UINT16>(nLevel) ) );
 }
@@ -674,7 +673,7 @@ int SwTxtFmtColl::GetAttrOutlineLevel() const
 
 int SwTxtFmtColl::GetAssignedOutlineStyleLevel() const
 {
-    ASSERT( IsAssignedToListLevelOfOutlineStyle(),
+    OSL_ENSURE( IsAssignedToListLevelOfOutlineStyle(),
         "<SwTxtFmtColl::GetAssignedOutlineStyleLevel()> - misuse of method");
     return GetAttrOutlineLevel() - 1;
 }
diff --git a/sw/source/core/doc/gctable.cxx b/sw/source/core/doc/gctable.cxx
index 9d6e02e1344e..6e49dc8108d5 100644
--- a/sw/source/core/doc/gctable.cxx
+++ b/sw/source/core/doc/gctable.cxx
@@ -397,7 +397,7 @@ BOOL lcl_MergeGCLine( const SwTableLine*& rpLine, void* pPara )
             SwTableLines& rLns = *pGCPara->pLns;
             const SwTableLine* pTmp = pLn;
             USHORT nInsPos = rLns.GetPos( pTmp );
-            ASSERT( USHRT_MAX != nInsPos, "Line nicht gefunden!" );
+            OSL_ENSURE( USHRT_MAX != nInsPos, "Line nicht gefunden!" );
 
             SwTableBox* pUpper = pLn->GetUpper();
 
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index d1b6800ad3dc..4eeff2a0ec0e 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -273,7 +273,7 @@ USHORT SwHTMLTableLayout::GetLeftCellSpace( USHORT nCol, USHORT nColSpan,
         else if( nCol+nColSpan == nCols && nRightBorderWidth &&
                  nSpace < MIN_BORDER_DIST )
         {
-            ASSERT( !nCellPadding, "GetLeftCellSpace: CELLPADDING!=0" );
+            OSL_ENSURE( !nCellPadding, "GetLeftCellSpace: CELLPADDING!=0" );
             // Wenn die Gegenueberliegende Seite umrandet ist muessen
             // wir zumindest den minimalen Abstand zum Inhalt
             // beruecksichtigen. (Koennte man zusaetzlich auch an
@@ -299,7 +299,7 @@ USHORT SwHTMLTableLayout::GetRightCellSpace( USHORT nCol, USHORT nColSpan,
     else if( bSwBorders && GetColumn(nCol)->HasLeftBorder() &&
              nSpace < MIN_BORDER_DIST )
     {
-        ASSERT( !nCellPadding, "GetRightCellSpace: CELLPADDING!=0" );
+        OSL_ENSURE( !nCellPadding, "GetRightCellSpace: CELLPADDING!=0" );
         // Wenn die Gegenueberliegende Seite umrandet ist muessen
         // wir zumindest den minimalen Abstand zum Inhalt
         // beruecksichtigen. (Koennte man zusaetzlich auch an
@@ -438,9 +438,9 @@ const SwStartNode *SwHTMLTableLayout::GetAnyBoxStartNode() const
     const SwTableBox* pBox = pSwTable->GetTabLines()[0]->GetTabBoxes()[0];
     while( 0 == (pBoxSttNd = pBox->GetSttNd()) )
     {
-        ASSERT( pBox->GetTabLines().Count() > 0,
+        OSL_ENSURE( pBox->GetTabLines().Count() > 0,
                 "Box ohne Start-Node und Lines" );
-        ASSERT( pBox->GetTabLines()[0]->GetTabBoxes().Count() > 0,
+        OSL_ENSURE( pBox->GetTabLines()[0]->GetTabBoxes().Count() > 0,
                 "Line ohne Boxen" );
         pBox = pBox->GetTabLines()[0]->GetTabBoxes()[0];
     }
@@ -451,7 +451,7 @@ const SwStartNode *SwHTMLTableLayout::GetAnyBoxStartNode() const
 SwFrmFmt *SwHTMLTableLayout::FindFlyFrmFmt() const
 {
     const SwTableNode *pTblNd = GetAnyBoxStartNode()->FindTableNode();
-    ASSERT( pTblNd, "Kein Table-Node?" );
+    OSL_ENSURE( pTblNd, "Kein Table-Node?" );
     return pTblNd->GetFlyFmt();
 }
 
@@ -464,9 +464,9 @@ static void lcl_GetMinMaxSize( ULONG& rMinNoAlignCnts, ULONG& rMaxNoAlignCnts,
 {
     pTxtNd->GetMinMaxSize( nIdx, rMinNoAlignCnts, rMaxNoAlignCnts,
                            rAbsMinNoAlignCnts );
-    ASSERT( rAbsMinNoAlignCnts <= rMinNoAlignCnts,
+    OSL_ENSURE( rAbsMinNoAlignCnts <= rMinNoAlignCnts,
             "GetMinMaxSize: absmin > min" );
-    ASSERT( rMinNoAlignCnts <= rMaxNoAlignCnts,
+    OSL_ENSURE( rMinNoAlignCnts <= rMaxNoAlignCnts,
             "GetMinMaxSize: max > min" );
 
     //Bei einen <PRE>-Absatz entspricht die maximale Breite der
@@ -615,7 +615,7 @@ void SwHTMLTableLayout::AutoLayoutPass1()
                     }
                     else
                     {
-                        ASSERT( !this, "Sub tables in HTML import?" )
+                        OSL_ENSURE( !this, "Sub tables in HTML import?" );
                         SwHTMLTableLayout *pChild = pCnts->GetTable();
                         pChild->AutoLayoutPass1();
                         ULONG nMaxTableCnts = pChild->nMax;
@@ -770,9 +770,9 @@ void SwHTMLTableLayout::AutoLayoutPass1()
             }
         }
 
-        ASSERT( nMinColSpan>0 && nColSkip>0 && nColSkip <= nMinColSpan,
+        OSL_ENSURE( nMinColSpan>0 && nColSkip>0 && nColSkip <= nMinColSpan,
                 "Layout Pass 1: Da werden Spalten vergessen!" );
-        ASSERT( nMinColSpan!=USHRT_MAX,
+        OSL_ENSURE( nMinColSpan!=USHRT_MAX,
                 "Layout Pass 1: unnoetiger Schleifendurchlauf oder Bug" );
 
         if( 1==nMinColSpan )
@@ -890,7 +890,7 @@ void SwHTMLTableLayout::AutoLayoutPass1()
                                              : nDiff;
                     nColMin += nAdd;
                     nMin += nColMin;
-                    ASSERT( nDiff >= nAdd, "Ooops: nDiff stimmt nicht mehr" );
+                    OSL_ENSURE( nDiff >= nAdd, "Ooops: nDiff stimmt nicht mehr" );
                     nDiff -= nAdd;
 
                     if( nColMax < nColMin )
@@ -918,8 +918,8 @@ void SwHTMLTableLayout::AutoLayoutPass1()
 
                     pColumn->AddToMin( nDiff );
 
-                    ASSERT( pColumn->GetMax() >= pColumn->GetMin(),
-                            "Wieso ist die SPalte auf einmal zu schmal?" )
+                    OSL_ENSURE( pColumn->GetMax() >= pColumn->GetMin(),
+                            "Wieso ist die SPalte auf einmal zu schmal?" );
 
                     nMin += nDiff;
                     nMinD -= nDiff;
@@ -991,7 +991,7 @@ void SwHTMLTableLayout::AutoLayoutPass1()
                     }
                 }
             }
-            ASSERT( 0==nRel || nQuot!=ULONG_MAX,
+            OSL_ENSURE( 0==nRel || nQuot!=ULONG_MAX,
                     "Wo sind die relativen Spalten geblieben?" );
             for( i=0; i<nCols; i++ )
             {
@@ -1002,7 +1002,7 @@ void SwHTMLTableLayout::AutoLayoutPass1()
                         pColumn->SetMax( pColumn->GetMax() / nQuot );
                     else
                         pColumn->SetMax( pColumn->GetMin() );
-                    ASSERT( pColumn->GetMax() >= pColumn->GetMin(),
+                    OSL_ENSURE( pColumn->GetMax() >= pColumn->GetMin(),
                             "Maximale Spaltenbreite kleiner als Minimale" );
                     nMax += pColumn->GetMax();
                 }
@@ -1015,7 +1015,7 @@ void SwHTMLTableLayout::AutoLayoutPass1()
             ULONG nRelMax = 0;      // Anteil am Maximum dieser Spalten
             for( i=0; i<nCols; i++ )
             {
-                ASSERT( nRel<=100, "relative Breite aller Spalten>100%" );
+                OSL_ENSURE( nRel<=100, "relative Breite aller Spalten>100%" );
                 SwHTMLTableLayoutColumn *pColumn = GetColumn( i );
                 if( pColumn->IsRelWidthOption() && pColumn->GetWidthOption() )
                 {
@@ -1102,7 +1102,7 @@ void SwHTMLTableLayout::AutoLayoutPass1()
                     pColumn->SetMax( pColumn->GetMin() );
             }
             // und durch den Quotienten teilen
-            ASSERT( nQuotMax!=ULONG_MAX, "Wo sind die relativen Spalten geblieben?" );
+            OSL_ENSURE( nQuotMax!=ULONG_MAX, "Wo sind die relativen Spalten geblieben?" );
             for( i=0; i<nCols; i++ )
             {
                 SwHTMLTableLayoutColumn *pColumn = GetColumn( i );
@@ -1111,7 +1111,7 @@ void SwHTMLTableLayout::AutoLayoutPass1()
                     if( pColumn->GetWidthOption() )
                     {
                         pColumn->SetMax( pColumn->GetMax() / nQuotMax );
-                        ASSERT( pColumn->GetMax() >= pColumn->GetMin(),
+                        OSL_ENSURE( pColumn->GetMax() >= pColumn->GetMin(),
                                 "Minimalbreite ein Spalte Groesser Maximum" );
                         if( pColumn->GetMax() < pColumn->GetMin() )
                             pColumn->SetMax( pColumn->GetMin() );
@@ -1138,16 +1138,16 @@ void SwHTMLTableLayout::AutoLayoutPass2( USHORT nAbsAvail, USHORT nRelAvail,
 
     // Eine abolute zur Verfuegung stehende Breite muss immer uebergeben
     // werden.
-    ASSERT( nAbsAvail, "AutoLayout Pass 2: Keine absolute Breite gegeben" );
+    OSL_ENSURE( nAbsAvail, "AutoLayout Pass 2: Keine absolute Breite gegeben" );
 
     // Eine realtive zur Verfuegung stehende Breite darf nur und muss fuer
     // Tabellen in Tabellen uebergeben
-    ASSERT( IsTopTable() == (nRelAvail==0),
+    OSL_ENSURE( IsTopTable() == (nRelAvail==0),
             "AutoLayout Pass 2: Rel. Breite bei Tab in Tab oder umgekehrt" );
 
     // Die Minimalbreite der Tabelle darf natuerlich nie groesser sein
     // als das die Maximalbreite.
-    ASSERT( nMin<=nMax, "AutoLayout Pass2: nMin > nMax" );
+    OSL_ENSURE( nMin<=nMax, "AutoLayout Pass2: nMin > nMax" );
 
     // Die verfuegbare Breite, fuer die die Tabelle berechnet wurde, merken.
     // (Dies ist ein guter Ort, denn hier kommer wir bei der Erstberechnung
@@ -1216,7 +1216,7 @@ void SwHTMLTableLayout::AutoLayoutPass2( USHORT nAbsAvail, USHORT nRelAvail,
     {
         if( bPrcWidthOption )
         {
-            ASSERT( nWidthOption<=100, "Prozentangabe zu gross" );
+            OSL_ENSURE( nWidthOption<=100, "Prozentangabe zu gross" );
             if( nWidthOption > 100 )
                 nWidthOption = 100;
 
@@ -1254,9 +1254,9 @@ void SwHTMLTableLayout::AutoLayoutPass2( USHORT nAbsAvail, USHORT nRelAvail,
         }
     }
 
-    ASSERT( IsTopTable() || nAbsTabWidth<=nAbsAvail,
+    OSL_ENSURE( IsTopTable() || nAbsTabWidth<=nAbsAvail,
             "AutoLayout Pass2: nAbsTabWidth > nAbsAvail fuer Tab in Tab" );
-    ASSERT( !nRelAvail || nAbsTabWidth<=nAbsAvail,
+    OSL_ENSURE( !nRelAvail || nAbsTabWidth<=nAbsAvail,
             "AutoLayout Pass2: nAbsTabWidth > nAbsAvail fuer relative Breite" );
 
     // Catch fuer die beiden Asserts von oben (man weiss ja nie!)
@@ -1380,7 +1380,7 @@ void SwHTMLTableLayout::AutoLayoutPass2( USHORT nAbsAvail, USHORT nRelAvail,
         // Eine Top-Table darf auch beriter werden als der verfuegbare Platz.
         if( nAbsTabWidth > nAbsAvail )
         {
-            ASSERT( IsTopTable(),
+            OSL_ENSURE( IsTopTable(),
                     "Tabelle in Tabelle soll breiter werden als umgebende Zelle" );
             nAbsAvail = nAbsTabWidth;
         }
@@ -1447,7 +1447,7 @@ void SwHTMLTableLayout::AutoLayoutPass2( USHORT nAbsAvail, USHORT nRelAvail,
             // absoluten Breiten. nFixMax entspricht an dieser Stelle
             // nAbs, so dass man gleich nFixMax haette nehmen koennen.
             // Der Code ist so aber verstaendlicher.
-            ASSERT( nFixMax == nAbs, "Zwei Schleifen, zwei Summen?" )
+            OSL_ENSURE( nFixMax == nAbs, "Zwei Schleifen, zwei Summen?" );
             ULONG nDistMax = nMax - nFixMax;
             USHORT nDistAbsTabWidth = nAbsTabWidth - nAbs;
             USHORT nDistRelTabWidth = nRelTabWidth - nRel;
@@ -1476,7 +1476,7 @@ void SwHTMLTableLayout::AutoLayoutPass2( USHORT nAbsAvail, USHORT nRelAvail,
                     nRel = nRel + pColumn->GetRelColWidth();
                 }
             }
-            ASSERT( nCols==nFixedCols, "Spalte vergessen!" );
+            OSL_ENSURE( nCols==nFixedCols, "Spalte vergessen!" );
         }
         else
         {
@@ -1503,7 +1503,7 @@ void SwHTMLTableLayout::AutoLayoutPass2( USHORT nAbsAvail, USHORT nRelAvail,
 
         if( nAbsTabWidth > nAbsAvail )
         {
-            ASSERT( IsTopTable(),
+            OSL_ENSURE( IsTopTable(),
                     "Tabelle in Tabelle soll breiter werden als Platz da ist" );
             nAbsAvail = nAbsTabWidth;
         }
@@ -1575,9 +1575,9 @@ void SwHTMLTableLayout::AutoLayoutPass2( USHORT nAbsAvail, USHORT nRelAvail,
             break;
         }
 
-        ASSERT( !pLeftFillerBox || nRelLeftFill>0,
+        OSL_ENSURE( !pLeftFillerBox || nRelLeftFill>0,
                 "Fuer linke Filler-Box ist keine Breite da!" );
-        ASSERT( !pRightFillerBox || nRelRightFill>0,
+        OSL_ENSURE( !pRightFillerBox || nRelRightFill>0,
                 "Fuer rechte Filler-Box ist keine Breite da!" );
 
         // Filler-Breiten werden auf die ausseren Spalten geschlagen, wenn
@@ -1634,14 +1634,14 @@ static BOOL lcl_ResizeBox( const SwTableBox*& rpBox, void* pPara )
 static BOOL lcl_ResizeLine( const SwTableLine*& rpLine, void* pPara )
 {
     USHORT *pWidth = (USHORT *)pPara;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     USHORT nOldWidth = *pWidth;
 #endif
     *pWidth = 0;
     ((SwTableLine *)rpLine)->GetTabBoxes().ForEach( &lcl_ResizeBox, pWidth );
 
-#ifdef DBG_UTIL
-    ASSERT( !nOldWidth || Abs(*pWidth-nOldWidth) < COLFUZZY,
+#if OSL_DEBUG_LEVEL > 1
+    OSL_ENSURE( !nOldWidth || Abs(*pWidth-nOldWidth) < COLFUZZY,
             "Zeilen einer Box sind unterschiedlich lang" );
 #endif
 
@@ -1715,7 +1715,7 @@ void SwHTMLTableLayout::SetWidths( BOOL bCallPass2, USHORT nAbsAvail,
         USHORT nCalcTabWidth = 0;
         ((SwTable *)pSwTable)->GetTabLines().ForEach( &lcl_ResizeLine,
                                                       &nCalcTabWidth );
-        ASSERT( Abs( nRelTabWidth-nCalcTabWidth ) < COLFUZZY,
+        OSL_ENSURE( Abs( nRelTabWidth-nCalcTabWidth ) < COLFUZZY,
                 "Tabellebreite stimmt nicht mit Zeilenbreite ueberein." );
 
         // Beim Anpassen des Tabellen-Formats dieses locken, weil sonst
@@ -1751,7 +1751,7 @@ void SwHTMLTableLayout::SetWidths( BOOL bCallPass2, USHORT nAbsAvail,
             }
         }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         {
             // steht im tblrwcl.cxx
             extern void _CheckBoxWidth( const SwTableLine&, SwTwips );
@@ -1818,7 +1818,7 @@ BOOL SwHTMLTableLayout::Resize( USHORT nAbsAvail, BOOL bRecalc,
 {
     if( 0 == nAbsAvail )
         return FALSE;
-    ASSERT( IsTopTable(), "Resize darf nur an Top-Tabellen aufgerufen werden" );
+    OSL_ENSURE( IsTopTable(), "Resize darf nur an Top-Tabellen aufgerufen werden" );
 
     // Darf die Tabelle uberhaupt Resized werden oder soll sie es trotzdem?
     if( bMustNotResize && !bForce )
diff --git a/sw/source/core/doc/lineinfo.cxx b/sw/source/core/doc/lineinfo.cxx
index 3a28a6011ac5..3d6b872522ee 100644
--- a/sw/source/core/doc/lineinfo.cxx
+++ b/sw/source/core/doc/lineinfo.cxx
@@ -134,7 +134,7 @@ SwCharFmt* SwLineNumberInfo::GetCharFmt( IDocumentStylePoolAccess& rIDSPA ) cons
 
 void SwLineNumberInfo::SetCharFmt( SwCharFmt *pChFmt )
 {
-    ASSERT( pChFmt, "SetCharFmt, 0 is not a valid pointer" );
+    OSL_ENSURE( pChFmt, "SetCharFmt, 0 is not a valid pointer" );
     pChFmt->Add( this );
 }
 
diff --git a/sw/source/core/doc/list.cxx b/sw/source/core/doc/list.cxx
index 259d6f06e646..69883e3af67f 100644
--- a/sw/source/core/doc/list.cxx
+++ b/sw/source/core/doc/list.cxx
@@ -290,17 +290,4 @@ bool SwList::IsListLevelMarked( const int nListLevel ) const
     return mpListImpl->IsListLevelMarked( nListLevel );
 }
 
-//void SwList::ContinueList( SwList& rList )
-//{
-//    mpListImpl->ContinueList( rList );
-//}
-//const SwList* SwList::GetContinuedList() const
-//{
-//    return mpListImpl->GetContinuedList();
-//}
-//void SwList::ClearContinuation()
-//{
-//    mpListImpl->ClearContinuation();
-//}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/makefile.mk b/sw/source/core/doc/makefile.mk
index 5a65b2de24e1..3399c694b8fc 100644
--- a/sw/source/core/doc/makefile.mk
+++ b/sw/source/core/doc/makefile.mk
@@ -42,49 +42,49 @@ EXCEPTIONSFILES = \
     $(SLO)$/acmplwrd.obj \
     $(SLO)$/dbgoutsw.obj \
     $(SLO)$/doc.obj \
+    $(SLO)$/docbasic.obj \
     $(SLO)$/docbm.obj \
+    $(SLO)$/docchart.obj \
     $(SLO)$/doccomp.obj \
+    $(SLO)$/doccorr.obj \
+    $(SLO)$/docdde.obj \
+    $(SLO)$/docdesc.obj \
     $(SLO)$/docdraw.obj \
     $(SLO)$/docedt.obj \
+    $(SLO)$/docfld.obj \
+    $(SLO)$/docfly.obj \
     $(SLO)$/docfmt.obj \
+    $(SLO)$/docftn.obj \
     $(SLO)$/docglbl.obj \
     $(SLO)$/docglos.obj \
     $(SLO)$/doclay.obj \
-    $(SLO)$/docxforms.obj \
     $(SLO)$/docnew.obj \
     $(SLO)$/docnum.obj \
-    $(SLO)$/docsort.obj \
-    $(SLO)$/doctxm.obj \
-    $(SLO)$/number.obj \
-    $(SLO)$/swstylemanager.obj \
-    $(SLO)$/tblcpy.obj \
-    $(SLO)$/tblrwcl.obj \
-    $(SLO)$/list.obj
-
-SLOFILES =	$(EXCEPTIONSFILES) \
-    $(SLO)$/docbasic.obj \
-    $(SLO)$/docchart.obj \
-    $(SLO)$/doccorr.obj \
-    $(SLO)$/docdde.obj \
-    $(SLO)$/docdesc.obj \
-    $(SLO)$/docfld.obj \
-    $(SLO)$/docfly.obj \
-    $(SLO)$/docftn.obj \
     $(SLO)$/docredln.obj \
     $(SLO)$/docruby.obj \
-    $(SLO)$/docstat.obj \
+    $(SLO)$/docsort.obj \
+    $(SLO)$/doctxm.obj \
+    $(SLO)$/docxforms.obj \
     $(SLO)$/extinput.obj \
     $(SLO)$/fmtcol.obj \
     $(SLO)$/ftnidx.obj \
     $(SLO)$/gctable.obj \
+    $(SLO)$/htmltbl.obj \
     $(SLO)$/lineinfo.obj \
+    $(SLO)$/list.obj \
     $(SLO)$/notxtfrm.obj \
+    $(SLO)$/number.obj \
     $(SLO)$/poolfmt.obj \
-    $(SLO)$/sortopt.obj \
     $(SLO)$/swserv.obj \
+    $(SLO)$/swstylemanager.obj \
     $(SLO)$/tblafmt.obj \
-    $(SLO)$/visiturl.obj \
-    $(SLO)$/htmltbl.obj
+    $(SLO)$/tblcpy.obj \
+    $(SLO)$/tblrwcl.obj \
+    $(SLO)$/visiturl.obj
+
+SLOFILES =	$(EXCEPTIONSFILES) \
+    $(SLO)$/docstat.obj \
+    $(SLO)$/sortopt.obj
 
 # --- Tagets -------------------------------------------------------
 
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 97d58b1129b6..ccae89dce66a 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -937,7 +937,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
                     else
                         pVout = 0;
 
-                    ASSERT( OUTDEV_VIRDEV != pOut->GetOutDevType() ||
+                    OSL_ENSURE( OUTDEV_VIRDEV != pOut->GetOutDevType() ||
                             pShell->GetViewOptions()->IsPDFExport(),
                             "pOut sollte kein virtuelles Device sein" );
 
@@ -1019,14 +1019,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
         //TODO/LATER: is it a problem that the JopSetup isn't used?
         //xRef->DoDraw( pOut, aAlignedGrfArea.Pos(), aAlignedGrfArea.SSize(), *pJobSetup );
 
-        // get hi-contrast image, but never for printing
-        Graphic* pGraphic = NULL;
-        if (pOut && !bPrn && Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
-            pGraphic = pOLENd->GetHCGraphic();
-
-        // when it is not possible to get HC-representation, the original image should be used
-        if ( !pGraphic )
-               pGraphic = pOLENd->GetGraphic();
+        Graphic* pGraphic = pOLENd->GetGraphic();
 
         if ( pGraphic && pGraphic->GetType() != GRAPHIC_NONE )
         {
@@ -1050,7 +1043,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
                 nMiscStatus & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE )
         {
             const SwFlyFrm *pFly = FindFlyFrm();
-            ASSERT( pFly, "OLE not in FlyFrm" );
+            OSL_ENSURE( pFly, "OLE not in FlyFrm" );
             ((SwFEShell*)pShell)->ConnectObj( pOLENd->GetOLEObj().GetObject(), pFly->Prt(), pFly->Frm());
         }
 
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 5a4c3a856869..cfc7b4c98256 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -175,14 +175,14 @@ void SwNumRule::SetNumRuleMap(std::hash_map<String, SwNumRule *, StringHash> *
 
 USHORT SwNumRule::GetNumIndent( BYTE nLvl )
 {
-    ASSERT( MAXLEVEL > nLvl, "NumLevel is out of range" );
+    OSL_ENSURE( MAXLEVEL > nLvl, "NumLevel is out of range" );
     return aDefNumIndents[ nLvl ];
 }
 
 
 USHORT SwNumRule::GetBullIndent( BYTE nLvl )
 {
-    ASSERT( MAXLEVEL > nLvl, "NumLevel is out of range" );
+    OSL_ENSURE( MAXLEVEL > nLvl, "NumLevel is out of range" );
     return aDefNumIndents[ nLvl ];
 }
 
@@ -253,31 +253,6 @@ BOOL SwNumFmt::IsEnumeration() const
     // using this code. Therefore HBRINKM and I agreed upon defining
     // IsEnumeration() as !IsItemize()
     return !IsItemize();
-    // <--
-
-    /*
-    BOOL bResult;
-
-    switch(GetNumberingType())
-    {
-    case SVX_NUM_CHARS_UPPER_LETTER:
-    case SVX_NUM_CHARS_LOWER_LETTER:
-    case SVX_NUM_ROMAN_UPPER:
-    case SVX_NUM_ROMAN_LOWER:
-    case SVX_NUM_ARABIC:
-    case SVX_NUM_PAGEDESC:
-    case SVX_NUM_CHARS_UPPER_LETTER_N:
-    case SVX_NUM_CHARS_LOWER_LETTER_N:
-        bResult = TRUE;
-
-        break;
-
-    default:
-        bResult = FALSE;
-    }
-
-    return bResult;
-     */
 }
 
 
@@ -387,33 +362,6 @@ void SwNumFmt::UpdateNumNodes( SwDoc* pDoc )
         for( BYTE i = 0; i < MAXLEVEL; ++i )
             if( pRule->GetNumFmt( i ) == this )
             {
-                // --> OD 2008-02-19 #refactorlists#
-//                const String& rRuleNm = pRule->GetName();
-
-//                SwModify* pMod;
-//                const SfxPoolItem* pItem;
-//                USHORT k, nMaxItems = pDoc->GetAttrPool().GetItemCount(
-//                                                    RES_PARATR_NUMRULE );
-//                for( k = 0; k < nMaxItems; ++k )
-//                    if( 0 != (pItem = pDoc->GetAttrPool().GetItem(
-//                        RES_PARATR_NUMRULE, k ) ) &&
-//                        0 != ( pMod = (SwModify*)((SwNumRuleItem*)pItem)->
-//                                GetDefinedIn()) &&
-//                        ((SwNumRuleItem*)pItem)->GetValue() == rRuleNm )
-//                    {
-//                        if( pMod->IsA( TYPE( SwFmt )) )
-//                        {
-//                            SwNumRuleInfo aInfo( rRuleNm );
-//                            pMod->GetInfo( aInfo );
-
-//                            for( ULONG nFirst = 0, nLast = aInfo.GetList().Count();
-//                                nFirst < nLast; ++nFirst )
-//                                lcl_SetRuleChgd(
-//                                    *aInfo.GetList().GetObject( nFirst ), i );
-//                        }
-//                        else if( ((SwTxtNode*)pMod)->GetNodes().IsDocNodes() )
-//                            lcl_SetRuleChgd( *(SwTxtNode*)pMod, i );
-//                    }
                 SwNumRule::tTxtNodeList aTxtNodeList;
                 pRule->GetTxtNodeList( aTxtNodeList );
                 for ( SwNumRule::tTxtNodeList::iterator aIter = aTxtNodeList.begin();
@@ -443,7 +391,7 @@ const SwFmtVertOrient*      SwNumFmt::GetGraphicOrientation() const
     }
 }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 long int SwNumRule::nInstances = 0;
 #endif
 
@@ -468,7 +416,7 @@ SwNumRule::SwNumRule( const String& rNm,
     meDefaultNumberFormatPositionAndSpaceMode( eDefaultNumberFormatPositionAndSpaceMode ),
     msDefaultListId()
 {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     nSerial = nInstances++;
 #endif
 
@@ -550,7 +498,7 @@ SwNumRule::SwNumRule( const String& rNm,
         }
     }
     memset( aFmts, 0, sizeof( aFmts ));
-    ASSERT( sName.Len(), "NumRule ohne Namen!" );
+    OSL_ENSURE( sName.Len(), "NumRule ohne Namen!" );
 }
 
 SwNumRule::SwNumRule( const SwNumRule& rNumRule )
@@ -570,7 +518,7 @@ SwNumRule::SwNumRule( const SwNumRule& rNumRule )
       meDefaultNumberFormatPositionAndSpaceMode( rNumRule.meDefaultNumberFormatPositionAndSpaceMode ),
       msDefaultListId( rNumRule.msDefaultListId )
 {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     nSerial = nInstances++;
 #endif
 
@@ -676,7 +624,7 @@ BOOL SwNumRule::operator==( const SwNumRule& rRule ) const
 
 void SwNumRule::Set( USHORT i, const SwNumFmt& rNumFmt )
 {
-    ASSERT( i < MAXLEVEL, "Serious defect, please inform OD" )
+    OSL_ENSURE( i < MAXLEVEL, "Serious defect, please inform OD" );
     if( i < MAXLEVEL )
     {
         if( !aFmts[ i ] || !(rNumFmt == Get( i )) )
@@ -690,7 +638,7 @@ void SwNumRule::Set( USHORT i, const SwNumFmt& rNumFmt )
 
 void SwNumRule::Set( USHORT i, const SwNumFmt* pNumFmt )
 {
-    ASSERT( i < MAXLEVEL, "Serious defect, please inform OD" )
+    OSL_ENSURE( i < MAXLEVEL, "Serious defect, please inform OD" );
     if( i >= MAXLEVEL )
         return;
     SwNumFmt* pOld = aFmts[ i ];
@@ -737,8 +685,7 @@ String SwNumRule::MakeNumString( const SwNumberTree::tNumberVector & rNumVector,
     if (nLevel < MAXLEVEL)
     {
         const SwNumFmt& rMyNFmt = Get( static_cast<USHORT>(nLevel) );
-        // - levels with numbering none has to provide prefix and suffix string
-//        if( SVX_NUM_NUMBER_NONE != rMyNFmt.GetNumberingType() )
+
         {
             BYTE i = static_cast<BYTE>(nLevel);
 
@@ -916,18 +863,14 @@ void SwNumRule::SetInvalidRule(BOOL bFlag)
 {
     if (bFlag)
     {
-//        tPamAndNums::iterator aIt;
-//        for (aIt = aNumberRanges.begin(); aIt != aNumberRanges.end(); aIt++)
-//            (*aIt).second->InvalidateTree();
         std::set< SwList* > aLists;
         tTxtNodeList::iterator aIter;
         for ( aIter = maTxtNodeList.begin(); aIter != maTxtNodeList.end(); ++aIter )
         {
             const SwTxtNode* pTxtNode = *aIter;
             // --> OD 2010-06-04 #i111681# - applying patch from cmc
-//            aLists.insert( pTxtNode->GetDoc()->getListByName( pTxtNode->GetListId() ) );
             SwList* pList = pTxtNode->GetDoc()->getListByName( pTxtNode->GetListId() );
-            ASSERT( pList, "<SwNumRule::SetInvalidRule(..)> - list at which the text node is registered at does not exist. This is a serious issue --> please inform OD.");
+            OSL_ENSURE( pList, "<SwNumRule::SetInvalidRule(..)> - list at which the text node is registered at does not exist. This is a serious issue --> please inform OD.");
             if ( pList )
             {
                 aLists.insert( pList );
@@ -942,71 +885,6 @@ void SwNumRule::SetInvalidRule(BOOL bFlag)
     bInvalidRuleFlag = bFlag;
 }
 
-// --> OD 2008-06-16 #i90078#
-// #i23725#, #i23726#
-//void SwNumRule::Indent(short nAmount, int nLevel, int nReferenceLevel,
-//                       BOOL bRelative, BOOL bFirstLine, BOOL bCheckGtZero)
-//{
-//    int nStartLevel = 0;
-//    int nEndLevel = MAXLEVEL - 1;
-//    BOOL bGotInvalid = FALSE;
-
-//    if (nLevel >= 0)
-//        nStartLevel = nEndLevel = nLevel;
-
-//    int i;
-//    short nRealAmount =  nAmount;
-
-//    if (! bRelative)
-//    {
-//        if (bFirstLine)
-//        {
-//            if (nReferenceLevel >= 0)
-//                nAmount = nAmount - Get(static_cast<USHORT>(nReferenceLevel)).GetFirstLineOffset();
-//            else
-//                nAmount = nAmount - Get(static_cast<USHORT>(nStartLevel)).GetFirstLineOffset();
-//        }
-
-//        BOOL bFirst = TRUE;
-
-//        if (nReferenceLevel >= 0)
-//            nRealAmount = nAmount - Get(static_cast<USHORT>(nReferenceLevel)).GetAbsLSpace();
-//        else
-//            for (i = nStartLevel; i < nEndLevel + 1; i++)
-//            {
-//                short nTmp = nAmount - Get(static_cast<USHORT>(i)).GetAbsLSpace();
-
-//                if (bFirst || nTmp > nRealAmount)
-//                {
-//                    nRealAmount = nTmp;
-//                    bFirst = FALSE;
-//                }
-//            }
-//    }
-
-//    if (nRealAmount < 0)
-//        for (i = nStartLevel; i < nEndLevel + 1; i++)
-//            if (Get(static_cast<USHORT>(i)).GetAbsLSpace() + nRealAmount < 0)
-//                nRealAmount = -Get(static_cast<USHORT>(i)).GetAbsLSpace();
-
-//    for (i = nStartLevel; i < nEndLevel + 1; i++)
-//    {
-//        short nNew = Get(static_cast<USHORT>(i)).GetAbsLSpace() + nRealAmount;
-
-//        if (bCheckGtZero && nNew < 0)
-//            nNew = 0;
-
-//        SwNumFmt aTmpNumFmt(Get(static_cast<USHORT>(i)));
-//        aTmpNumFmt.SetAbsLSpace(nNew);
-
-//        Set(static_cast<USHORT>(i), aTmpNumFmt);
-
-//        bGotInvalid = TRUE;
-//    }
-
-//    if (bGotInvalid)
-//        SetInvalidRule(bGotInvalid);
-//}
 
 // change indent of all list levels by given difference
 void SwNumRule::ChangeIndent( const short nDiff )
@@ -1104,9 +982,6 @@ void SwNumRule::SetIndentOfFirstListLevelAndChangeOthers( const short nNewIndent
 
 void SwNumRule::Validate()
 {
-//    tPamAndNums::iterator aIt;
-//    for (aIt = aNumberRanges.begin(); aIt != aNumberRanges.end(); aIt++)
-//        (*aIt).second->NotifyInvalidChildren();
     std::set< SwList* > aLists;
     tTxtNodeList::iterator aIter;
     for ( aIter = maTxtNodeList.begin(); aIter != maTxtNodeList.end(); ++aIter )
@@ -1287,25 +1162,12 @@ namespace numfunc
 
     void SwDefBulletConfig::SetToDefault()
     {
-        // default bullet font name is now OpenSymbol
-//        msFontname = String::CreateFromAscii("StarSymbol");
         msFontname = String::CreateFromAscii("OpenSymbol");
         mbUserDefinedFontname = false;
         // <--
         meFontWeight = WEIGHT_DONTKNOW;
         meFontItalic = ITALIC_NONE;
 
-        // new bullet characters
-//        mnLevelChars[0] = 0x25cf;
-//        mnLevelChars[1] = 0x25cb;
-//        mnLevelChars[2] = 0x25a0;
-//        mnLevelChars[3] = 0x25cf;
-//        mnLevelChars[4] = 0x25cb;
-//        mnLevelChars[5] = 0x25a0;
-//        mnLevelChars[6] = 0x25cf;
-//        mnLevelChars[7] = 0x25cb;
-//        mnLevelChars[8] = 0x25a0;
-//        mnLevelChars[9] = 0x25cf;
         mnLevelChars[0] = 0x2022;
         mnLevelChars[1] = 0x25e6;
         mnLevelChars[2] = 0x25aa;
@@ -1345,8 +1207,8 @@ namespace numfunc
         uno::Sequence<uno::Any> aValues =
                                                     GetProperties( aPropNames );
         const uno::Any* pValues = aValues.getConstArray();
-        ASSERT( aValues.getLength() == aPropNames.getLength(),
-                "<SwDefBulletConfig::SwDefBulletConfig()> - GetProperties failed")
+        OSL_ENSURE( aValues.getLength() == aPropNames.getLength(),
+                "<SwDefBulletConfig::SwDefBulletConfig()> - GetProperties failed");
         if ( aValues.getLength() == aPropNames.getLength() )
         {
             for ( int nProp = 0; nProp < aPropNames.getLength(); ++nProp )
@@ -1533,8 +1395,8 @@ namespace numfunc
         com::sun::star::uno::Sequence<com::sun::star::uno::Any> aValues =
                                                     GetProperties( aPropNames );
         const com::sun::star::uno::Any* pValues = aValues.getConstArray();
-        ASSERT( aValues.getLength() == aPropNames.getLength(),
-                "<SwNumberingUIBehaviorConfig::LoadConfig()> - GetProperties failed")
+        OSL_ENSURE( aValues.getLength() == aPropNames.getLength(),
+                "<SwNumberingUIBehaviorConfig::LoadConfig()> - GetProperties failed");
         if ( aValues.getLength() == aPropNames.getLength() )
         {
             for ( int nProp = 0; nProp < aPropNames.getLength(); ++nProp )
@@ -1550,8 +1412,8 @@ namespace numfunc
                         break;
                         default:
                         {
-                            ASSERT( false,
-                                    "<SwNumberingUIBehaviorConfig::LoadConfig()> - unknown configuration property")
+                            OSL_ENSURE( false,
+                                    "<SwNumberingUIBehaviorConfig::LoadConfig()> - unknown configuration property");
                         }
                     }
                 }
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index e4491945bb36..0fb3feef4a71 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -225,7 +225,6 @@ void lcl_SetHeadline( SwDoc* pDoc, SwTxtFmtColl* pColl,
     {
         if( !( nOutLvlBits & ( 1 << nLevel )) )
         {
-            //pColl->SetOutlineLevel( nLevel );          //#outline level zhaojianwei
             pColl->AssignToListLevelOfOutlineStyle(nLevel);//<-end,zhaojianwei
             if( !bHTMLMode )
             {
@@ -320,7 +319,7 @@ SvxFrameDirection GetDefaultFrameDirection(ULONG nLanguage)
 
 SwTxtFmtColl* SwDoc::GetTxtCollFromPool( USHORT nId, bool bRegardLanguage )
 {
-    ASSERT(
+    OSL_ENSURE(
         (RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END) ||
         (RES_POOLCOLL_LISTS_BEGIN <= nId && nId < RES_POOLCOLL_LISTS_END) ||
         (RES_POOLCOLL_EXTRA_BEGIN <= nId && nId < RES_POOLCOLL_EXTRA_END) ||
@@ -337,8 +336,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( USHORT nId, bool bRegardLanguage )
         {
             return pNewColl;
         }
-        //if( pNewColl->GetOutlineLevel() < MAXLEVEL )          //#outline level,zhaojianwei
-        //nOutLvlBits |= ( 1 << pNewColl->GetOutlineLevel() );
+
         if( pNewColl->IsAssignedToListLevelOfOutlineStyle())
             nOutLvlBits |= ( 1 << pNewColl->GetAssignedOutlineStyleLevel() );//<-end,zhaojianwei
     }
@@ -358,7 +356,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( USHORT nId, bool bRegardLanguage )
     else if (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END)
         nResId = RC_POOLCOLL_HTML_BEGIN - RES_POOLCOLL_HTML_BEGIN;
 
-    ASSERT( nResId, "Ungueltige Pool-ID" );
+    OSL_ENSURE( nResId, "Ungueltige Pool-ID" );
     if( !nResId )
         return GetTxtCollFromPool( RES_POOLCOLL_STANDARD );
 
@@ -970,7 +968,6 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( USHORT nId, bool bRegardLanguage )
             aLR.SetLeft( GetMetricVal( CM_1 ));
             aLR.SetRight( GetMetricVal( CM_1 ));
             aSet.Put( aLR );
-//          aSet.Put( SvxAdjustItem( SVX_ADJUST_BLOCK, RES_PARATR_ADJUST ) );
             SvxULSpaceItem aUL( RES_UL_SPACE );
             aUL = pNewColl->GetULSpace();
             aUL.SetLower( HTML_PARSPACE );
@@ -1049,9 +1046,6 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( USHORT nId, bool bRegardLanguage )
     {
         {
             pNewColl->SetFmtAttr( aSet );
-            // JP 31.08.95: erzeugen einer PoolVorlage ist keine Modifikation
-            //              (Bug: 18545)
-            // SetModified();
         }
     }
     return pNewColl;
@@ -1063,7 +1057,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( USHORT nId, bool bRegardLanguage )
     // benutzt wird
 bool SwDoc::IsPoolTxtCollUsed( USHORT nId ) const
 {
-    ASSERT(
+    OSL_ENSURE(
         (RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END) ||
         (RES_POOLCOLL_LISTS_BEGIN <= nId && nId < RES_POOLCOLL_LISTS_END) ||
         (RES_POOLCOLL_EXTRA_BEGIN <= nId && nId < RES_POOLCOLL_EXTRA_END) ||
@@ -1117,7 +1111,7 @@ SwFmt* SwDoc::GetFmtFromPool( USHORT nId )
             //          -> returne das erste
             if( RES_POOLCHR_BEGIN > nId || nId >= RES_POOLCHR_END )
             {
-                ASSERT( !this, "ungueltige Id" );
+                OSL_ENSURE( !this, "ungueltige Id" );
                 nId = RES_POOLCHR_BEGIN;
             }
         }
@@ -1135,7 +1129,7 @@ SwFmt* SwDoc::GetFmtFromPool( USHORT nId )
             //          -> returne das erste
             if( RES_POOLFRM_BEGIN > nId || nId >= RES_POOLFRM_END )
             {
-                ASSERT( !this, "ungueltige Id" );
+                OSL_ENSURE( !this, "ungueltige Id" );
                 nId = RES_POOLFRM_BEGIN;
             }
         }
@@ -1143,10 +1137,10 @@ SwFmt* SwDoc::GetFmtFromPool( USHORT nId )
 
     default:
         // Fehlerfall, unbekanntes Format
-        ASSERT( nId, "ungueltige Id" );
+        OSL_ENSURE( nId, "ungueltige Id" );
         return 0;
     }
-    ASSERT( nRCId, "ungueltige Id" );
+    OSL_ENSURE( nRCId, "ungueltige Id" );
 
     while( nArrCnt-- )
         for( USHORT n = 0; n < (*pArray[nArrCnt]).Count(); ++n )
@@ -1213,10 +1207,6 @@ SwFmt* SwDoc::GetFmtFromPool( USHORT nId )
             SetAllScriptItem( aSet, SvxFontItem( rBulletFont.GetFamily(),
                       rBulletFont.GetName(), rBulletFont.GetStyleName(),
                         rBulletFont.GetPitch(), rBulletFont.GetCharSet(), RES_CHRATR_FONT ));
-            // --> OD 2008-06-02 #i63395#
-            // no font and no font size any more
-//            SetAllScriptItem( aSet, SvxFontHeightItem( PT_9, 100, RES_CHRATR_FONTSIZE ));
-            // <--
         }
         break;
 
@@ -1286,10 +1276,6 @@ SwFmt* SwDoc::GetFmtFromPool( USHORT nId )
    case RES_POOLCHR_VERT_NUM:
             aSet.Put( SvxCharRotateItem( 900, sal_False, RES_CHRATR_ROTATE ) );
     break;
-//nichts besonderes
-//  case RES_POOLCHR_HTML_DEFINSTANCE:
-//          break;
-
 
     case RES_POOLFRM_FRAME:
         {
@@ -1377,9 +1363,6 @@ SwFmt* SwDoc::GetFmtFromPool( USHORT nId )
     {
         {
             pNewFmt->SetFmtAttr( aSet );
-            // JP 31.08.95: erzeugen einer PoolVorlage ist keine Modifikation
-            //              (Bug: 18545)
-            // SetModified();
         }
     }
     return pNewFmt;
@@ -1416,7 +1399,7 @@ bool SwDoc::IsPoolFmtUsed( USHORT nId ) const
     }
     else
     {
-        ASSERT( FALSE, "ungueltige Id" );
+        OSL_ENSURE( FALSE, "ungueltige Id" );
         bFnd = FALSE;
     }
 
@@ -1461,7 +1444,7 @@ void lcl_GetStdPgSize( SwDoc* pDoc, SfxItemSet& rSet )
 
 SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
 {
-    ASSERT( RES_POOLPAGE_BEGIN <= nId && nId < RES_POOLPAGE_END,
+    OSL_ENSURE( RES_POOLPAGE_BEGIN <= nId && nId < RES_POOLPAGE_END,
             "Falsche AutoFormat-Id" );
 
     SwPageDesc *pNewPgDsc;
@@ -1476,7 +1459,7 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
     // Fehlerfall: unbekannte Poolvorlage
     if( RES_POOLPAGE_BEGIN > nId ||  nId >= RES_POOLPAGE_END )
     {
-        ASSERT( !this, "ungueltige Id" );
+        OSL_ENSURE( !this, "ungueltige Id" );
         nId = RES_POOLPAGE_BEGIN;
     }
 
@@ -1626,9 +1609,6 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
             if( bSetLeft )
                 pNewPgDsc->GetLeft().SetFmtAttr( aSet );
             pNewPgDsc->GetMaster().SetFmtAttr( aSet );
-            // JP 31.08.95: erzeugen einer PoolVorlage ist keine Modifikation
-            //              (Bug: 18545)
-            // SetModified();
         }
     }
     return pNewPgDsc;
@@ -1636,7 +1616,7 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
 
 SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
 {
-    ASSERT( RES_POOLNUMRULE_BEGIN <= nId && nId < RES_POOLNUMRULE_END,
+    OSL_ENSURE( RES_POOLNUMRULE_BEGIN <= nId && nId < RES_POOLNUMRULE_END,
             "Falsche AutoFormat-Id" );
 
     SwNumRule* pNewRule;
@@ -1651,7 +1631,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
     // Fehlerfall: unbekannte Poolvorlage
     if( RES_POOLNUMRULE_BEGIN > nId ||  nId >= RES_POOLNUMRULE_END )
     {
-        ASSERT( !this, "ungueltige Id" );
+        OSL_ENSURE( !this, "ungueltige Id" );
         nId = RES_POOLNUMRULE_BEGIN;
     }
 
@@ -2341,7 +2321,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
     // benutzt wird
 bool SwDoc::IsPoolPageDescUsed( USHORT nId ) const
 {
-    ASSERT( RES_POOLPAGE_BEGIN <= nId && nId < RES_POOLPAGE_END,
+    OSL_ENSURE( RES_POOLPAGE_BEGIN <= nId && nId < RES_POOLPAGE_END,
             "Falsche AutoFormat-Id" );
     SwPageDesc *pNewPgDsc = 0;
     BOOL bFnd = FALSE;
@@ -2374,36 +2354,6 @@ sal_Bool SwDoc::IsUsed( const SwModify& rModify ) const
 // erfrage ob die NumRule benutzt wird
 sal_Bool SwDoc::IsUsed( const SwNumRule& rRule ) const
 {
-    // --> OD 2008-03-04 #refactorlists#
-//    // dann teste mal, ob es abhaengige ContentNodes im Nodes Array gibt
-//    // (auch indirekte fuer Format-Ableitung! )
-//    sal_Bool bUsed = FALSE;
-//    SwAutoFmtGetDocNode aGetHt( &aNodes );
-//    SwModify* pMod;
-//    const SfxPoolItem* pItem;
-//    USHORT i, nMaxItems = GetAttrPool().GetItemCount( RES_PARATR_NUMRULE);
-//    for( i = 0; i < nMaxItems; ++i )
-//    {
-//        if( 0 != (pItem = GetAttrPool().GetItem( RES_PARATR_NUMRULE, i ) ) &&
-//            0 != ( pMod = (SwModify*)((SwNumRuleItem*)pItem)->GetDefinedIn()) &&
-//            ((SwNumRuleItem*)pItem)->GetValue().Len() &&
-//            ((SwNumRuleItem*)pItem)->GetValue() == rRule.GetName() )
-//        {
-//            if( pMod->IsA( TYPE( SwFmt )) )
-//            {
-//                bUsed = !pMod->GetInfo( aGetHt );
-//                if( bUsed )
-//                    break;
-//            }
-//            else if( ((SwTxtNode*)pMod)->GetNodes().IsDocNodes() )
-//            {
-//                bUsed = TRUE;
-//                break;
-//            }
-//        }
-//    }
-
-//    return bUsed;
     sal_Bool bUsed = rRule.GetTxtNodeListSize() > 0 ||
                      rRule.GetParagraphStyleListSize() > 0;
 
@@ -2415,7 +2365,7 @@ sal_Bool SwDoc::IsUsed( const SwNumRule& rRule ) const
     // dann fuege neu ein
 USHORT SwDoc::SetDocPattern( const String& rPatternName )
 {
-    ASSERT( rPatternName.Len(), "kein Dokument-Vorlagenname" );
+    OSL_ENSURE( rPatternName.Len(), "kein Dokument-Vorlagenname" );
 
     USHORT nNewPos = aPatternNms.Count();
     for( USHORT n = 0; n < aPatternNms.Count(); ++n )
diff --git a/sw/source/core/doc/swserv.cxx b/sw/source/core/doc/swserv.cxx
index faf2f4e8d79e..27cca42ac203 100644
--- a/sw/source/core/doc/swserv.cxx
+++ b/sw/source/core/doc/swserv.cxx
@@ -162,10 +162,6 @@ void SwServerObject::SendDataChanged( const SwPosition& rPos )
             SvLinkSource::NotifyDataChanged();
         }
     }
-    // sonst melden wir uns ab !!
-// ????? JP 27.06.95: geht das so ????
-//  else
-//      Closed();
 }
 
 
@@ -205,10 +201,6 @@ void SwServerObject::SendDataChanged( const SwPaM& rRange )
             SvLinkSource::NotifyDataChanged();
         }
     }
-    // sonst melden wir uns ab !!
-// ????? JP 27.06.95: geht das so ????
-//  else
-//      Closed();
 }
 
 
@@ -259,10 +251,6 @@ BOOL SwServerObject::IsLinkInServer( const SwBaseLink* pChkLnk ) const
 // um Rekursionen zu Verhindern: ServerType umsetzen!
 SwServerObject::ServerModes eSave = eType;
 if( !pChkLnk )
-// sowas sollte man nicht tun, wer weiss schon, wie gross ein enum ist
-// ICC nimmt keinen int
-// #41723#
-//  *((int*)&eType) = SECTION_SERVER+1;
     ((SwServerObject*)this)->eType = NONE_SERVER;
         for( USHORT n = rLnks.Count(); n; )
         {
diff --git a/sw/source/core/doc/swstylemanager.cxx b/sw/source/core/doc/swstylemanager.cxx
index 3ec13c0edbcd..b430cf2307a3 100644
--- a/sw/source/core/doc/swstylemanager.cxx
+++ b/sw/source/core/doc/swstylemanager.cxx
@@ -148,7 +148,7 @@ StylePool::SfxItemSet_Pointer_t SwStyleManager::getByName( const rtl::OUString&
     {
         // Ok, ok, it's allowed to ask for uncached styles (from UNO) but it should not be done
         // during loading a document
-        ASSERT( false, "Don't ask for uncached styles" );
+        OSL_ENSURE( false, "Don't ask for uncached styles" );
         rpCache->addCompletePool( rAutoPool );
         pStyle = rpCache->getByName( rName );
     }
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index a01999b97f20..b6642ed22aed 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -586,7 +586,7 @@ SwTableAutoFmt::~SwTableAutoFmt()
 
 void SwTableAutoFmt::SetBoxFmt( const SwBoxAutoFmt& rNew, BYTE nPos )
 {
-    ASSERT( nPos < 16, "falscher Bereich" );
+    OSL_ENSURE( nPos < 16, "falscher Bereich" );
 
     SwBoxAutoFmt* pFmt = aBoxAutoFmt[ nPos ];
     if( pFmt )      // ist gesetzt -> kopieren
@@ -598,7 +598,7 @@ void SwTableAutoFmt::SetBoxFmt( const SwBoxAutoFmt& rNew, BYTE nPos )
 
 const SwBoxAutoFmt& SwTableAutoFmt::GetBoxFmt( BYTE nPos ) const
 {
-    ASSERT( nPos < 16, "falscher Bereich" );
+    OSL_ENSURE( nPos < 16, "falscher Bereich" );
 
     SwBoxAutoFmt* pFmt = aBoxAutoFmt[ nPos ];
     if( pFmt )      // ist gesetzt -> kopieren
@@ -619,7 +619,7 @@ SwBoxAutoFmt& SwTableAutoFmt::UpdateFromSet( BYTE nPos,
                                             UpdateFlags eFlags,
                                             SvNumberFormatter* pNFmtr )
 {
-    ASSERT( nPos < 16, "falscher Bereich" );
+    OSL_ENSURE( nPos < 16, "falscher Bereich" );
 
     SwBoxAutoFmt* pFmt = aBoxAutoFmt[ nPos ];
     if( !pFmt )     // ist gesetzt -> kopieren
@@ -997,7 +997,7 @@ BOOL SwTableAutoFmtTbl::Load( SvStream& rStream )
 //                  rStream >> nFileVers;
                 if( rStream.Tell() != ULONG(nPos + nCnt) )
                 {
-                    ASSERT( !this, "Der Header enthaelt mehr/neuere Daten" );
+                    OSL_ENSURE( !this, "Der Header enthaelt mehr/neuere Daten" );
                     rStream.Seek( nPos + nCnt );
                 }
                 rStream.SetStreamCharSet( (CharSet)nChrSet );
@@ -1079,9 +1079,7 @@ BOOL SwTableAutoFmtTbl::Save( SvStream& rStream ) const
         rStream << nVal
                 << (BYTE)2      // Anzahl von Zeichen des Headers incl. diesem
                 << (BYTE)GetStoreCharSet( ::gsl_getSystemTextEncoding() );
-//              << (BYTE)4      // Anzahl von Zeichen des Headers incl. diesem
-//              << (BYTE)::GetSystemCharSet()
-//              << (UNIT16)SOFFICE_FILEFORMAT_NOW;
+
         bRet = 0 == rStream.GetError();
 
         //-----------------------------------------------------------
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index fed817eecbe4..fdc56a2c572d 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -141,7 +141,7 @@ namespace
             for( USHORT nLine = 0; nLine < rBox.GetTabLines().Count(); ++nLine )
                 pStartLn = insertSubLine( rSubTable, *rBox.GetTabLines()[nLine],
                            pStartLn );
-            ASSERT( pStartLn == pEndLn, "Sub line confusion" );
+            OSL_ENSURE( pStartLn == pEndLn, "Sub line confusion" );
         }
         else
         {
@@ -506,19 +506,6 @@ namespace
                     if( pBox && pBox->getRowSpan() > 0 )
                         lcl_CpyBox( rSource, rInfo.mpCopy, rDstTbl, pBox,
                                     TRUE, pUndo );
-                    /* Idea: If target cell is a covered cell, append content
-                             to master cell.
-                    BOOL bReplace = TRUE;
-                    if( pBox->getRowSpan() < 0 )
-                    {
-                        if( rInfo.mpCopy->getRowSpan() < 0 )
-                            continue;
-                        pBox = &pBox->FindStartOfRowSpan( rDstTbl );
-                        bReplace = FALSE;
-                    }
-                    lcl_CpyBox( rSource, rInfo.mpCopy, rDstTbl, pBox,
-                                bReplace, pUndo );
-                    */
                 }
             }
         }
@@ -540,7 +527,7 @@ void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
                     SwTable& rDstTbl, SwTableBox* pDstBox,
                     BOOL bDelCntnt, SwUndoTblCpyTbl* pUndo )
 {
-    ASSERT( ( !pCpyBox || pCpyBox->GetSttNd() ) && pDstBox->GetSttNd(),
+    OSL_ENSURE( ( !pCpyBox || pCpyBox->GetSttNd() ) && pDstBox->GetSttNd(),
             "Keine inhaltstragende Box" );
 
     SwDoc* pCpyDoc = rCpyTbl.GetFrmFmt()->GetDoc();
@@ -616,7 +603,6 @@ void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
             }
 
             if( pCNd &&
-                /*RES_POOLCOLL_TABLE == */
                 RES_POOLCOLL_TABLE_HDLN !=
                     pCNd->GetFmtColl()->GetPoolFmtId() )
                 bReplaceColl = FALSE;
@@ -770,7 +756,7 @@ BOOL SwTable::InsTable( const SwTable& rCpyTbl, const SwNodeIndex& rSttBox,
     SwTableBox* pMyBox = (SwTableBox*)GetTblBox(
             rSttBox.GetNode().FindTableBoxStartNode()->GetIndex() );
 
-    ASSERT( pMyBox, "Index steht nicht in dieser Tabelle in einer Box" );
+    OSL_ENSURE( pMyBox, "Index steht nicht in dieser Tabelle in einer Box" );
 
     // loesche erstmal die Frames der Tabelle
     _FndBox aFndBox( 0, 0 );
@@ -840,14 +826,14 @@ BOOL SwTable::InsTable( const SwTable& rCpyTbl, const SwNodeIndex& rSttBox,
 BOOL SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
                         SwUndoTblCpyTbl* pUndo )
 {
-    ASSERT( rSelBoxes.Count(), "Missing selection" )
+    OSL_ENSURE( rSelBoxes.Count(), "Missing selection" );
 
     SetHTMLTableLayout( 0 );    // MIB 9.7.97: HTML-Layout loeschen
 
     if( IsNewModel() || rCpyTbl.IsNewModel() )
         return InsNewTable( rCpyTbl, rSelBoxes, pUndo );
 
-    ASSERT( !rCpyTbl.IsTblComplex(), "Table too complex" )
+    OSL_ENSURE( !rCpyTbl.IsTblComplex(), "Table too complex" );
 
             SwDoc* pDoc = GetFrmFmt()->GetDoc();
     SwDoc* pCpyDoc = rCpyTbl.GetFrmFmt()->GetDoc();
@@ -923,7 +909,7 @@ BOOL SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
                 // es ist also Platz fuer das zu kopierende vorhanden, also
                 // fuege entsprechend neue Zeilen ein.
                 SwTableBox* pInsBox = pLastLn->GetTabBoxes()[ nSttBox ];
-                ASSERT( pInsBox && pInsBox->GetSttNd(),
+                OSL_ENSURE( pInsBox && pInsBox->GetSttNd(),
                     "kein CntntBox oder steht nicht in dieser Tabelle" );
                 SwSelBoxes aBoxes;
 
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index f077a632eaa9..aa0182948c86 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -72,15 +72,11 @@ using namespace com::sun::star::uno;
 
 using namespace ::com::sun::star;
 
-#ifndef DBG_UTIL
-#define CHECK_TABLE(t)
-#else
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 2
 #define CHECK_TABLE(t) (t).CheckConsistency();
 #else
 #define CHECK_TABLE(t)
 #endif
-#endif
 
 typedef SwTableLine* SwTableLinePtr;
 SV_DECL_PTRARR_SORT( SwSortTableLines, SwTableLinePtr, 16, 16 )
@@ -195,7 +191,7 @@ BOOL lcl_DelOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
 
 typedef BOOL (*FN_lcl_SetBoxWidth)(SwTableLine*, CR_SetBoxWidth&, SwTwips, BOOL );
 
-#if defined(DBG_UTIL) || defined( JP_DEBUG )
+#if OSL_DEBUG_LEVEL > 1
 
 void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize );
 
@@ -221,8 +217,8 @@ void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize );
                     if ( pFrm &&                                    \
                          ((SwRowFrm*)pFrm)->GetTabLine() == GetTabLines()[i] ) \
                     {                                               \
-                        ASSERT( pFrm->GetUpper()->IsTabFrm(),       \
-                                "Table layout does not match table structure" )       \
+                        OSL_ENSURE( pFrm->GetUpper()->IsTabFrm(),       \
+                                "Table layout does not match table structure" );       \
                     }                                               \
                 } while ( 0 != ( pLast = aIter++ ) );               \
             }                                                       \
@@ -397,7 +393,6 @@ BOOL lcl_CopyCol( const _FndBox*& rpFndBox, void* pPara )
         else
         {
             aFindFrm = pCpyPara->rTabFrmArr[ nFndPos ];
-//          aFindFrm.pNewFrmFmt->Add( pBox );
             pBox->ChgFrmFmt( (SwTableBoxFmt*)aFindFrm.pNewFrmFmt );
         }
     }
@@ -534,7 +529,7 @@ SwRowFrm* GetRowFrm( SwTableLine& rLine )
 
 BOOL SwTable::InsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt, BOOL bBehind )
 {
-    ASSERT( rBoxes.Count() && nCnt, "keine gueltige Box-Liste" );
+    OSL_ENSURE( rBoxes.Count() && nCnt, "keine gueltige Box-Liste" );
     SwTableNode* pTblNd = (SwTableNode*)rBoxes[0]->GetSttNd()->FindTableNode();
     if( !pTblNd )
         return FALSE;
@@ -574,8 +569,8 @@ BOOL SwTable::InsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt, BOO
         //Layout updaten
         aFndBox.MakeFrms( *this );
 
-        CHECKBOXWIDTH
-        CHECKTABLELAYOUT
+        CHECKBOXWIDTH;
+        CHECKTABLELAYOUT;
         bRes = TRUE;
     }
 
@@ -590,7 +585,7 @@ BOOL SwTable::InsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt, BOO
 BOOL SwTable::_InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes,
                         USHORT nCnt, BOOL bBehind )
 {
-    ASSERT( pDoc && rBoxes.Count() && nCnt, "keine gueltige Box-Liste" );
+    OSL_ENSURE( pDoc && rBoxes.Count() && nCnt, "keine gueltige Box-Liste" );
     SwTableNode* pTblNd = (SwTableNode*)rBoxes[0]->GetSttNd()->FindTableNode();
     if( !pTblNd )
         return FALSE;
@@ -675,8 +670,8 @@ BOOL SwTable::_InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes,
             aFndBox.MakeNewFrms( *this, nCnt, bBehind );
     }
 
-    CHECKBOXWIDTH
-    CHECKTABLELAYOUT
+    CHECKBOXWIDTH;
+    CHECKTABLELAYOUT;
 
     SwChartDataProvider *pPCD = pDoc->GetChartDataProvider();
     if (pPCD && nCnt)
@@ -774,8 +769,8 @@ BOOL SwTable::AppendRow( SwDoc* pDoc, USHORT nCnt )
     // TL_CHART2: need to inform chart of probably changed cell names
     pDoc->UpdateCharts( GetFrmFmt()->GetName() );
 
-    CHECKBOXWIDTH
-    CHECKTABLELAYOUT
+    CHECKBOXWIDTH;
+    CHECKTABLELAYOUT;
 
     return TRUE;
 }
@@ -1087,7 +1082,7 @@ BOOL SwTable::DeleteSel(
     const SwSelBoxes* pMerged, SwUndo* pUndo,
     const BOOL bDelMakeFrms, const BOOL bCorrBorder )
 {
-    ASSERT( pDoc, "No doc?" );
+    OSL_ENSURE( pDoc, "No doc?" );
     SwTableNode* pTblNd = 0;
     if( rBoxes.Count() )
     {
@@ -1149,8 +1144,8 @@ BOOL SwTable::DeleteSel(
     // TL_CHART2: now inform chart that sth has changed
     pDoc->UpdateCharts( GetFrmFmt()->GetName() );
 
-    CHECKTABLELAYOUT
-    CHECK_TABLE( *this )
+    CHECKTABLELAYOUT;
+    CHECK_TABLE( *this );
 
     return TRUE;
 }
@@ -1158,7 +1153,7 @@ BOOL SwTable::DeleteSel(
 BOOL SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt,
                         BOOL bSameHeight )
 {
-    ASSERT( pDoc && rBoxes.Count() && nCnt, "keine gueltigen Werte" );
+    OSL_ENSURE( pDoc && rBoxes.Count() && nCnt, "keine gueltigen Werte" );
     SwTableNode* pTblNd = (SwTableNode*)rBoxes[0]->GetSttNd()->FindTableNode();
     if( !pTblNd )
         return FALSE;
@@ -1180,7 +1175,7 @@ BOOL SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt,
         {
             SwTableBox* pSelBox = *( rBoxes.GetData() + n );
             const SwRowFrm* pRow = GetRowFrm( *pSelBox->GetUpper() );
-            ASSERT( pRow, "wo ist der Frm von der SwTableLine?" )
+            OSL_ENSURE( pRow, "wo ist der Frm von der SwTableLine?" );
             SWRECTFN( pRow )
             pRowHeights[ n ] = (pRow->Frm().*fnRect->fnGetHeight)();
         }
@@ -1194,7 +1189,7 @@ BOOL SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt,
     for( USHORT n = 0; n < rBoxes.Count(); ++n )
     {
         SwTableBox* pSelBox = *( rBoxes.GetData() + n );
-        ASSERT( pSelBox, "Box steht nicht in der Tabelle" );
+        OSL_ENSURE( pSelBox, "Box steht nicht in der Tabelle" );
 
         // dann fuege in die Box nCnt neue Zeilen ein
         SwTableLine* pInsLine = pSelBox->GetUpper();
@@ -1301,7 +1296,7 @@ BOOL SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt,
 
 BOOL SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt )
 {
-    ASSERT( pDoc && rBoxes.Count() && nCnt, "keine gueltigen Werte" );
+    OSL_ENSURE( pDoc && rBoxes.Count() && nCnt, "keine gueltigen Werte" );
     SwTableNode* pTblNd = (SwTableNode*)rBoxes[0]->GetSttNd()->FindTableNode();
     if( !pTblNd )
         return FALSE;
@@ -1327,7 +1322,7 @@ BOOL SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt )
     for( USHORT n = 0; n < aSelBoxes.Count(); ++n )
     {
         SwTableBox* pSelBox = *( aSelBoxes.GetData() + n );
-        ASSERT( pSelBox, "Box steht nicht in der Tabelle" );
+        OSL_ENSURE( pSelBox, "Box steht nicht in der Tabelle" );
 
         // We don't want to split small table cells into very very small cells
         if( pSelBox->GetFrmFmt()->GetFrmSize().GetWidth()/( nCnt + 1 ) < 10 )
@@ -1453,10 +1448,10 @@ void lcl_CalcWidth( SwTableBox* pBox )
 {
     // Annahme: jede Line in der Box ist gleich gross
     SwFrmFmt* pFmt = pBox->ClaimFrmFmt();
-    ASSERT( pBox->GetTabLines().Count(), "Box hat keine Lines" );
+    OSL_ENSURE( pBox->GetTabLines().Count(), "Box hat keine Lines" );
 
     SwTableLine* pLine = pBox->GetTabLines()[0];
-    ASSERT( pLine, "Box steht in keiner Line" );
+    OSL_ENSURE( pLine, "Box steht in keiner Line" );
 
     long nWidth = 0;
     for( USHORT n = 0; n < pLine->GetTabBoxes().Count(); ++n )
@@ -1578,8 +1573,6 @@ BOOL lcl_Merge_MoveLine( const _FndLine*& rpFndLine, void* pPara )
         USHORT nLeft = pFndLn->GetTabBoxes().C40_GETPOS( SwTableBox, pLBx );
         USHORT nRight = pFndLn->GetTabBoxes().C40_GETPOS( SwTableBox, pRBx );
 
-//      if( ( nLeft && nRight+1 < pFndLn->GetTabBoxes().Count() ) ||
-//          ( !nLeft && nRight+1 >= pFndLn->GetTabBoxes().Count() ) )
         if( !nLeft || nRight == pFndLn->GetTabBoxes().Count() )
         {
             if( pULPara->bUL )  // Upper ?
@@ -1709,7 +1702,7 @@ BOOL lcl_Merge_MoveLine( const _FndLine*& rpFndLine, void* pPara )
             lcl_CalcWidth( pRMBox );        // bereche die Breite der Box
         }
         else {
-            ASSERT( FALSE , "Was denn nun" );
+            OSL_ENSURE( FALSE , "Was denn nun" );
         }
     }
     // Left/Right
@@ -1742,7 +1735,7 @@ BOOL lcl_Merge_MoveLine( const _FndLine*& rpFndLine, void* pPara )
 BOOL SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
                         SwTableBox* pMergeBox, SwUndoTblMerge* pUndo )
 {
-    ASSERT( rBoxes.Count() && pMergeBox, "keine gueltigen Werte" );
+    OSL_ENSURE( rBoxes.Count() && pMergeBox, "keine gueltigen Werte" );
     SwTableNode* pTblNd = (SwTableNode*)rBoxes[0]->GetSttNd()->FindTableNode();
     if( !pTblNd )
         return FALSE;
@@ -2203,11 +2196,11 @@ BOOL SwTable::CopyHeadlineIntoTable( SwTableNode& rTblNd )
     {   // The copied line must not contain any row span attributes > 1
         SwTableLine* pLine = rTblNd.GetTable().GetTabLines()[0];
         USHORT nColCount = pLine->GetTabBoxes().Count();
-        ASSERT( nColCount, "Empty Table Line" )
+        OSL_ENSURE( nColCount, "Empty Table Line" );
         for( USHORT nCurrCol = 0; nCurrCol < nColCount; ++nCurrCol )
         {
             SwTableBox* pTableBox = pLine->GetTabBoxes()[nCurrCol];
-            ASSERT( pTableBox, "Missing Table Box" );
+            OSL_ENSURE( pTableBox, "Missing Table Box" );
             pTableBox->setRowSpan( 1 );
         }
     }
@@ -2247,7 +2240,7 @@ BOOL SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
     SwNodeIndex aIdx( rPos.nNode, -1 );
     SwTableNode* pTblNd = aIdx.GetNode().FindTableNode();
     aIdx++;
-    ASSERT( pTblNd, "wo ist denn nun der TableNode?" );
+    OSL_ENSURE( pTblNd, "wo ist denn nun der TableNode?" );
 
     pTblNd->GetTable().SetRowsToRepeat( GetRowsToRepeat() );
 
@@ -2257,7 +2250,7 @@ BOOL SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
         // ist im neuen Dokument ueberhaupt der FeldTyp vorhanden ?
         SwFieldType* pFldType = pInsDoc->InsertFldType(
                                     *((SwDDETable*)this)->GetDDEFldType() );
-        ASSERT( pFldType, "unbekannter FieldType" );
+        OSL_ENSURE( pFldType, "unbekannter FieldType" );
 
         // tauschen am Node den Tabellen-Pointer aus
         pNewTbl = new SwDDETable( *pNewTbl,
@@ -2375,7 +2368,7 @@ SwTableBox* SwTableLine::FindNextBox( const SwTable& rTbl,
     if( GetUpper() )
     {
         nFndPos = GetUpper()->GetTabLines().GetPos( pLine );
-        ASSERT( USHRT_MAX != nFndPos, "Line nicht in der Tabelle" );
+        OSL_ENSURE( USHRT_MAX != nFndPos, "Line nicht in der Tabelle" );
         // gibts eine weitere Line
         if( nFndPos+1 >= GetUpper()->GetTabLines().Count() )
             return GetUpper()->GetUpper()->FindNextBox( rTbl, GetUpper(), bOvrTblLns );
@@ -2426,7 +2419,7 @@ SwTableBox* SwTableLine::FindPreviousBox( const SwTable& rTbl,
     if( GetUpper() )
     {
         nFndPos = GetUpper()->GetTabLines().GetPos( pLine );
-        ASSERT( USHRT_MAX != nFndPos, "Line nicht in der Tabelle" );
+        OSL_ENSURE( USHRT_MAX != nFndPos, "Line nicht in der Tabelle" );
         // gibts eine weitere Line
         if( !nFndPos )
             return GetUpper()->GetUpper()->FindPreviousBox( rTbl, GetUpper(), bOvrTblLns );
@@ -2796,7 +2789,7 @@ BOOL lcl_InsSelBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
                 }
                 else
                 {
-                    ASSERT( pBox->GetSttNd(), "Das muss eine EndBox sein!");
+                    OSL_ENSURE( pBox->GetSttNd(), "Das muss eine EndBox sein!");
 
                     if( !rParam.bLeft && 3 != nCmp )
                         ++n;
@@ -3397,7 +3390,7 @@ BOOL lcl_DelSelBox( SwTableLine* pTabLine, CR_SetBoxWidth& rParam,
                             break;
 
                         default:
-                            ASSERT( !pBox, "hier sollte man nie hinkommen" );
+                            OSL_ENSURE( !pBox, "hier sollte man nie hinkommen" );
                             break;
                         }
                     }
@@ -3469,7 +3462,7 @@ void lcl_AjustLines( SwTableLine* pLine, CR_SetBoxWidth& rParam )
     }
 }
 
-#if defined(DBG_UTIL) || defined( JP_DEBUG )
+#if OSL_DEBUG_LEVEL > 1
 
 void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize )
 {
@@ -3527,7 +3520,7 @@ _FndBox* lcl_SaveInsDelData( CR_SetBoxWidth& rParam, SwUndo** ppUndo,
     {
         _FndPara aPara( rParam.aBoxes, pFndBox );
         rTbl.GetTabLines().ForEach( &_FndLineCopyCol, &aPara );
-        ASSERT( pFndBox->GetLines().Count(), "Wo sind die Boxen" );
+        OSL_ENSURE( pFndBox->GetLines().Count(), "Wo sind die Boxen" );
         pFndBox->SetTableLines( rTbl );
 
         if( ppUndo )
@@ -4044,7 +4037,7 @@ _FndBox* lcl_SaveInsDelData( CR_SetLineHeight& rParam, SwUndo** ppUndo,
     // suche alle Boxen / Lines
     SwTable& rTbl = rParam.pTblNd->GetTable();
 
-    ASSERT( rParam.aBoxes.Count(), "ohne Boxen ist nichts zu machen!" );
+    OSL_ENSURE( rParam.aBoxes.Count(), "ohne Boxen ist nichts zu machen!" );
 
     // loeschen der gesamten Tabelle verhindern
     if( !rParam.bBigger && rParam.aBoxes.Count() ==
@@ -4058,7 +4051,7 @@ _FndBox* lcl_SaveInsDelData( CR_SetLineHeight& rParam, SwUndo** ppUndo,
     {
         _FndPara aPara( rParam.aBoxes, pFndBox );
         rTbl.GetTabLines().ForEach( &_FndLineCopyCol, &aPara );
-        ASSERT( pFndBox->GetLines().Count(), "Wo sind die Boxen" );
+        OSL_ENSURE( pFndBox->GetLines().Count(), "Wo sind die Boxen" );
         pFndBox->SetTableLines( rTbl );
 
         if( ppUndo )
@@ -4077,7 +4070,7 @@ void SetLineHeight( SwTableLine& rLine, SwTwips nOldHeight, SwTwips nNewHeight,
                     BOOL bMinSize )
 {
     SwLayoutFrm* pLineFrm = GetRowFrm( rLine );
-    ASSERT( pLineFrm, "wo ist der Frm von der SwTableLine?" );
+    OSL_ENSURE( pLineFrm, "wo ist der Frm von der SwTableLine?" );
 
     SwFrmFmt* pFmt = rLine.ClaimFrmFmt();
 
@@ -4124,7 +4117,7 @@ BOOL lcl_SetSelLineHeight( SwTableLine* pLine, CR_SetLineHeight& rParam,
     {
         // anhand der alten Size die neue relative errechnen
         SwLayoutFrm* pLineFrm = GetRowFrm( *pLine );
-        ASSERT( pLineFrm, "wo ist der Frm von der SwTableLine?" );
+        OSL_ENSURE( pLineFrm, "wo ist der Frm von der SwTableLine?" );
         SwTwips nRstHeight = CalcRowRstHeight( pLineFrm );
         if( (nRstHeight + ROWFUZZY) < nDist )
             bRet = FALSE;
@@ -4142,7 +4135,7 @@ BOOL lcl_SetOtherLineHeight( SwTableLine* pLine, CR_SetLineHeight& rParam,
         {
             // anhand der alten Size die neue relative errechnen
             SwLayoutFrm* pLineFrm = GetRowFrm( *pLine );
-            ASSERT( pLineFrm, "wo ist der Frm von der SwTableLine?" );
+            OSL_ENSURE( pLineFrm, "wo ist der Frm von der SwTableLine?" );
 
             if( TBLFIX_CHGPROP == rParam.nMode )
             {
@@ -4159,7 +4152,7 @@ BOOL lcl_SetOtherLineHeight( SwTableLine* pLine, CR_SetLineHeight& rParam,
         if( TBLFIX_CHGPROP == rParam.nMode )
         {
             SwLayoutFrm* pLineFrm = GetRowFrm( *pLine );
-            ASSERT( pLineFrm, "wo ist der Frm von der SwTableLine?" );
+            OSL_ENSURE( pLineFrm, "wo ist der Frm von der SwTableLine?" );
 
             // aus der alten Size die neue relative errechnen
             // Wird die selektierte Box groesser ueber den MaxSpace anpassen,
@@ -4405,7 +4398,7 @@ BOOL SwTable::SetRowHeight( SwTableBox& rAktBox, USHORT eType,
                     for( n = nStt; n < nEnd; ++n )
                     {
                         SwLayoutFrm* pLineFrm = GetRowFrm( *(*pLines)[ n ] );
-                        ASSERT( pLineFrm, "wo ist der Frm von der SwTableLine?" );
+                        OSL_ENSURE( pLineFrm, "wo ist der Frm von der SwTableLine?" );
                         aParam.nMaxSpace += CalcRowRstHeight( pLineFrm );
                         aParam.nMaxHeight += pLineFrm->Frm().Height();
                     }
@@ -4604,10 +4597,6 @@ SwFrmFmt* SwShareBoxFmts::GetFormat( const SwFrmFmt& rFmt,
 
 void SwShareBoxFmts::AddFormat( const SwFrmFmt& rOld, const SwFrmFmt& rNew )
 {
-    // wenn das Format nicht geshared ist, braucht es auch nicht in die
-    // Liste aufgenommen werden. Denn es gibt keinen 2. der es sucht.
-//leider werden auch die CellFrms gefunden
-//  if( !rOld.IsLastDepend() )
     {
         USHORT nPos;
         SwShareBoxFmt* pEntry;
diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx
index 7ae3cbb4d14b..8fd06b84bfa2 100644
--- a/sw/source/core/docnode/finalthreadmanager.cxx
+++ b/sw/source/core/docnode/finalthreadmanager.cxx
@@ -241,14 +241,14 @@ void TerminateOfficeThread::PerformOfficeTermination()
         css::uno::UNO_QUERY );
     if ( !xTasksSupplier.is() )
     {
-        ASSERT( false, "<TerminateOfficeThread::PerformOfficeTermination()> - no XFramesSupplier!" );
+        OSL_ENSURE( false, "<TerminateOfficeThread::PerformOfficeTermination()> - no XFramesSupplier!" );
         return;
     }
 
     css::uno::Reference< css::container::XElementAccess > xList( xTasksSupplier->getFrames(), css::uno::UNO_QUERY );
     if ( !xList.is() )
     {
-        ASSERT( false, "<TerminateOfficeThread::PerformOfficeTermination()> - no XElementAccess!" );
+        OSL_ENSURE( false, "<TerminateOfficeThread::PerformOfficeTermination()> - no XElementAccess!" );
         return;
     }
 
@@ -317,7 +317,7 @@ FinalThreadManager::~FinalThreadManager()
 
     if ( !maThreads.empty() )
     {
-        ASSERT( false, "<FinalThreadManager::~FinalThreadManager()> - still registered jobs are existing -> perform cancellation" );
+        OSL_ENSURE( false, "<FinalThreadManager::~FinalThreadManager()> - still registered jobs are existing -> perform cancellation" );
         cancelAllJobs();
     }
 
@@ -325,7 +325,7 @@ FinalThreadManager::~FinalThreadManager()
     {
         if ( !mpCancelJobsThread->allJobsCancelled() )
         {
-            ASSERT( false, "<FinalThreadManager::~FinalThreadManager()> - cancellation of registered jobs not yet finished -> wait for its finish" );
+            OSL_ENSURE( false, "<FinalThreadManager::~FinalThreadManager()> - cancellation of registered jobs not yet finished -> wait for its finish" );
         }
 
         mpCancelJobsThread->stopWhenAllJobsCancelled();
@@ -396,8 +396,6 @@ void SAL_CALL FinalThreadManager::cancelAllJobs() throw (css::uno::RuntimeExcept
             mpCancelJobsThread = new CancelJobsThread( aThreads );;
             if ( !mpCancelJobsThread->create() )
             {
-                // error handling
-                // ASSERT( false, "<FinalThreadManager::cancelAllJobs()> - thread to cancel jobs can't be setup --> synchron cancellation of jobs" );
                 delete mpCancelJobsThread;
                 mpCancelJobsThread = 0;
                 while ( !aThreads.empty() )
@@ -450,7 +448,6 @@ void SAL_CALL FinalThreadManager::queryTermination( const css::lang::EventObject
                                                  m_xContext );
         if ( !mpTerminateOfficeThread->create() )
         {
-            // ASSERT( false, "FinalThreadManager::queryTermination(..) - thread to terminate office can't be started!" );
             delete mpTerminateOfficeThread;
             mpTerminateOfficeThread = 0;
         }
@@ -480,7 +477,6 @@ void SAL_CALL FinalThreadManager::notifyTermination( const css::lang::EventObjec
     {
         if ( mpTerminateOfficeThread->isRunning() )
         {
-            // ASSERT( false, "<FinalThreadManager::notifyTermination()> - office termination thread still running!" );
             mpTerminateOfficeThread->StopOfficeTermination(); // thread kills itself.
         }
         else
@@ -492,17 +488,11 @@ void SAL_CALL FinalThreadManager::notifyTermination( const css::lang::EventObjec
 
     if ( !maThreads.empty() )
     {
-        // ASSERT( false, "<FinalThreadManager::notifyTermination()> - still registered jobs are existing" );
         cancelAllJobs();
     }
 
     if ( mpCancelJobsThread != 0 )
     {
-        if ( !mpCancelJobsThread->allJobsCancelled() )
-        {
-            // ASSERT( false, "<FinalThreadManager::notifyTermination()> - cancellation of registered jobs not yet finished -> wait for its finish" );
-        }
-
         mpCancelJobsThread->stopWhenAllJobsCancelled();
         mpCancelJobsThread->join();
         delete mpCancelJobsThread;
diff --git a/sw/source/core/docnode/makefile.mk b/sw/source/core/docnode/makefile.mk
index d3e5df64b6cd..e188c8d6ec9c 100644
--- a/sw/source/core/docnode/makefile.mk
+++ b/sw/source/core/docnode/makefile.mk
@@ -42,17 +42,7 @@ EXCEPTIONSFILES=        \
         $(SLO)$/cancellablejob.obj \
         $(SLO)$/finalthreadmanager.obj \
         $(SLO)$/ndcopy.obj \
-        $(SLO)$/ndtbl.obj \
-        $(SLO)$/node.obj \
-        $(SLO)$/observablethread.obj \
-        $(SLO)$/retrieveinputstream.obj \
-        $(SLO)$/retrievedinputstreamdata.obj \
-        $(SLO)$/swbaslnk.obj \
-        $(SLO)$/threadmanager.obj
-
-SLOFILES =	\
         $(SLO)$/ndindex.obj \
-        $(SLO)$/ndcopy.obj \
         $(SLO)$/ndnotxt.obj \
         $(SLO)$/ndnum.obj \
         $(SLO)$/ndsect.obj \
@@ -61,19 +51,20 @@ SLOFILES =	\
         $(SLO)$/node.obj \
         $(SLO)$/node2lay.obj \
         $(SLO)$/nodes.obj \
-        $(SLO)$/section.obj \
-        $(SLO)$/swbaslnk.obj \
-        $(SLO)$/retrievedinputstreamdata.obj \
         $(SLO)$/observablethread.obj \
-        $(SLO)$/cancellablejob.obj \
+        $(SLO)$/retrievedinputstreamdata.obj \
         $(SLO)$/retrieveinputstream.obj \
         $(SLO)$/retrieveinputstreamconsumer.obj \
-        $(SLO)$/threadlistener.obj \
-        $(SLO)$/threadmanager.obj \
+        $(SLO)$/section.obj \
+        $(SLO)$/swbaslnk.obj \
         $(SLO)$/swthreadmanager.obj \
-        $(SLO)$/swthreadjoiner.obj \
+        $(SLO)$/threadlistener.obj \
+        $(SLO)$/threadmanager.obj
+
+SLOFILES =	\
+        $(EXCEPTIONSFILES) \
         $(SLO)$/pausethreadstarting.obj \
-        $(SLO)$/finalthreadmanager.obj
+        $(SLO)$/swthreadjoiner.obj
 
 
 # --- Targets -------------------------------------------------------
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
index e3d0432cb114..5c1ce7cdbc9e 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -57,15 +57,12 @@
 #include <pagedesc.hxx>
 #include <poolfmt.hxx>
 #include <SwNodeNum.hxx>
-#ifndef DBG_UTIL
-#define CHECK_TABLE(t)
-#else
-#ifdef DEBUG
+
+#if OSL_DEBUG_LEVEL > 1
 #define CHECK_TABLE(t) (t).CheckConsistency();
 #else
 #define CHECK_TABLE(t)
 #endif
-#endif
 
 namespace
 {
@@ -364,7 +361,7 @@ BOOL lcl_CopyTblBox( const SwTableBox*& rpBox, void* pPara )
     {
         SwNodeIndex aNewIdx( *pCT->pTblNd,
                             rpBox->GetSttIdx() - pCT->nOldTblSttIdx );
-        ASSERT( aNewIdx.GetNode().IsStartNode(), "Index nicht auf einem StartNode" );
+        OSL_ENSURE( aNewIdx.GetNode().IsStartNode(), "Index nicht auf einem StartNode" );
         pNewBox = new SwTableBox( pBoxFmt, aNewIdx, pCT->pInsLine );
         pNewBox->setRowSpan( rpBox->getRowSpan() );
     }
@@ -420,17 +417,6 @@ SwTableNode* SwTableNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
     SwNodes& rNds = (SwNodes&)GetNodes();
 
     {
-        // nicht in Fussnoten kopieren !!
-/*
-!! Mal ohne Frames
-        SwCntntNode* pCNd = pDoc->GetNodes()[ rIdx ]->GetCntntNode();
-        SwFrm* pFrm;
-        if( (pCNd && 0 != ( pFrm = pCNd->GetFrm()))
-                ? pFrm->FindFtnFrm()
-                : rIdx < pDoc->GetNodes().EndOfInserts &&
-                    pDoc->GetNodes()[pDoc->GetNodes().EndOfInserts]->StartOfSection()
-                    < rIdx )
-*/
         if( rIdx < pDoc->GetNodes().GetEndOfInserts().GetIndex() &&
             rIdx >= pDoc->GetNodes().GetEndOfInserts().StartOfSectionIndex() )
             return 0;
@@ -472,7 +458,7 @@ SwTableNode* SwTableNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
             pDoc->InsDeletedFldType( *pDDEType );
         else
             pDDEType = (SwDDEFieldType*)pDoc->InsertFldType( *pDDEType );
-        ASSERT( pDDEType, "unbekannter FieldType" );
+        OSL_ENSURE( pDDEType, "unbekannter FieldType" );
 
         // tauschen am Node den Tabellen-Pointer aus
         SwDDETable* pNewTable = new SwDDETable( pTblNd->GetTable(), pDDEType );
@@ -733,8 +719,8 @@ SwDoc::CopyRange( SwPaM& rPam, SwPosition& rPos, const bool bCopyAll ) const
     }
     else
     {
-        ASSERT( this == pDoc, " falscher Copy-Zweig!" );
-        ASSERT(false, "mst: i thought this could be dead code;"
+        OSL_ENSURE( this == pDoc, " falscher Copy-Zweig!" );
+        OSL_ENSURE(false, "mst: i thought this could be dead code;"
                 "please tell me what you did to get here!");
         pDoc->SetRedlineMode_intern((RedlineMode_t)(eOld | nsRedlineMode_t::REDLINE_IGNORE));
 
@@ -1298,9 +1284,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
 
     if ( pNumRuleToPropagate )
     {
-        // --> OD 2009-08-25 #i86492#
-        // use <SwDoc::SetNumRule(..)>, because it also handles the <ListId>
-//        pDoc->ReplaceNumRule(aCpyPam, *pNumRuleToPropagate);
+        // #i86492# - use <SwDoc::SetNumRule(..)>, because it also handles the <ListId>
         pDoc->SetNumRule( aCpyPam, *pNumRuleToPropagate, false,
                           aListIdToPropagate, sal_True, true );
     }
@@ -1331,7 +1315,7 @@ void SwDoc::CopyWithFlyInFly( const SwNodeRange& rRg, const xub_StrLen nEndConte
 
     aRedlRest.Restore();
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     {
         //JP 17.06.99: Bug 66973 - check count only if the selection is in
         //              the same (or no) section. Becaus not full selected
@@ -1343,9 +1327,9 @@ void SwDoc::CopyWithFlyInFly( const SwNodeRange& rRg, const xub_StrLen nEndConte
             !rRg.aStart.GetNode().IsSectionNode() &&
             !aTmpI.GetNode().IsEndNode() )
         {
-            ASSERT( rInsPos.GetIndex() - aSavePos.GetIndex() ==
+            OSL_ENSURE( rInsPos.GetIndex() - aSavePos.GetIndex() ==
                     rRg.aEnd.GetIndex() - rRg.aStart.GetIndex(),
-                    "Es wurden zu wenig Nodes kopiert!" )
+                    "Es wurden zu wenig Nodes kopiert!" );
         }
     }
 #endif
@@ -1508,7 +1492,7 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange& rRg,
             {
                 // This case can *not* happen, but to be robust take the first
                 // text node in the destination document.
-                ASSERT( false,
+                OSL_ENSURE( false,
                         "<SwDoc::_CopyFlyInFly(..)> - anchor text node in copied range not found" );
                 nAnchorTxtNdNumInRange = 1;
             }
@@ -1534,7 +1518,7 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange& rRg,
             {
                 // This case can *not* happen, but to be robust take the first
                 // text node in the destination document.
-                ASSERT( false,
+                OSL_ENSURE( false,
                         "<SwDoc::_CopyFlyInFly(..)> - found anchor node index isn't a text node" );
                 aAnchorNdIdx = rStartIdx;
                 while ( !aAnchorNdIdx.GetNode().IsTxtNode() )
@@ -1590,7 +1574,7 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange& rRg,
 
     //Alle chains, die im Original vorhanden sind, soweit wie moeglich wieder
     //aufbauen.
-    ASSERT( aArr.Count() == aNewArr.Count(), "Missing new Flys" );
+    OSL_ENSURE( aArr.Count() == aNewArr.Count(), "Missing new Flys" );
     if ( aArr.Count() == aNewArr.Count() )
     {
         for ( USHORT n = 0; n < aArr.Count(); ++n )
diff --git a/sw/source/core/docnode/ndindex.cxx b/sw/source/core/docnode/ndindex.cxx
index 191260b3aed3..4e830f37b66c 100644
--- a/sw/source/core/docnode/ndindex.cxx
+++ b/sw/source/core/docnode/ndindex.cxx
@@ -35,7 +35,7 @@
 #include "error.h"              // fuers ASSERT
 #include "ndindex.hxx"
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 int SwNodeIndex::nSerial = 0;
 #endif
 
@@ -69,7 +69,7 @@ SwNodeIndex::SwNodeIndex( SwNodes& rNds, ULONG nIdx )
 {
     rNds.RegisterIndex( *this );
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     MySerial = ++nSerial;       // nur in der nicht PRODUCT-Version
 #endif
 }
@@ -84,7 +84,7 @@ SwNodeIndex::SwNodeIndex( const SwNodeIndex& rIdx, long nDiff )
         pNd = rIdx.pNd;
 
     pNd->GetNodes().RegisterIndex( *this );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     MySerial = ++nSerial;       // nur in der nicht PRODUCT-Version
 #endif
 }
@@ -99,7 +99,7 @@ SwNodeIndex::SwNodeIndex( const SwNode& rNd, long nDiff )
         pNd = (SwNode*)&rNd;
 
     pNd->GetNodes().RegisterIndex( *this );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     MySerial = ++nSerial;       // nur in der nicht PRODUCT-Version
 #endif
 }
diff --git a/sw/source/core/docnode/ndnotxt.cxx b/sw/source/core/docnode/ndnotxt.cxx
index c9595da17716..aeb4dcb8e797 100644
--- a/sw/source/core/docnode/ndnotxt.cxx
+++ b/sw/source/core/docnode/ndnotxt.cxx
@@ -76,7 +76,7 @@ SwNoTxtNode::~SwNoTxtNode()
 // fuer Frame- und Grafik-Attributen
 void SwNoTxtNode::NewAttrSet( SwAttrPool& rPool )
 {
-    ASSERT( !mpAttrSet.get(), "AttrSet ist doch gesetzt" );
+    OSL_ENSURE( !mpAttrSet.get(), "AttrSet ist doch gesetzt" );
     SwAttrSet aNewAttrSet( rPool, aNoTxtNodeSetRange );
 
     // put names of parent style and conditional style:
@@ -121,7 +121,7 @@ void SwNoTxtNode::SetContour( const PolyPolygon *pPoly, BOOL bAutomatic )
 
 void SwNoTxtNode::CreateContour()
 {
-    ASSERT( !pContour, "Contour available." );
+    OSL_ENSURE( !pContour, "Contour available." );
     pContour = new PolyPolygon(SvxContourDlg::CreateAutoContour(GetGraphic()));
     bAutomaticContour = TRUE;
     bContourMapModeValid = TRUE;
@@ -137,7 +137,7 @@ const PolyPolygon *SwNoTxtNode::HasContour() const
         const MapMode aContourMap( bPixelGrf ? MAP_PIXEL : MAP_100TH_MM );
         if( bPixelGrf ? !bPixelContour : aGrfMap != aContourMap )
         {
-            ASSERT( !bPixelGrf || aGrfMap == aContourMap,
+            OSL_ENSURE( !bPixelGrf || aGrfMap == aContourMap,
                     "scale factor for pixel unsupported" );
             OutputDevice* pOutDev =
                 (bPixelGrf || bPixelContour) ? Application::GetDefaultDevice()
@@ -171,7 +171,7 @@ const PolyPolygon *SwNoTxtNode::HasContour() const
 
 void SwNoTxtNode::GetContour( PolyPolygon &rPoly ) const
 {
-    ASSERT( pContour, "Contour not available." );
+    OSL_ENSURE( pContour, "Contour not available." );
     rPoly = *HasContour();
 }
 
@@ -195,7 +195,7 @@ BOOL SwNoTxtNode::GetContourAPI( PolyPolygon &rContour ) const
     {
         const MapMode aGrfMap( GetGraphic().GetPrefMapMode() );
         const MapMode aContourMap( MAP_100TH_MM );
-        ASSERT( aGrfMap.GetMapUnit() != MAP_PIXEL ||
+        OSL_ENSURE( aGrfMap.GetMapUnit() != MAP_PIXEL ||
                 aGrfMap == MapMode( MAP_PIXEL ),
                     "scale factor for pixel unsupported" );
         if( aGrfMap.GetMapUnit() != MAP_PIXEL &&
@@ -246,7 +246,7 @@ Graphic SwNoTxtNode::GetGraphic() const
     }
     else
     {
-        ASSERT( GetOLENode(), "new type of Node?" );
+        OSL_ENSURE( GetOLENode(), "new type of Node?" );
         aRet = *((SwOLENode*)this)->SwOLENode::GetGraphic();
     }
     return aRet;
@@ -257,7 +257,7 @@ void SwNoTxtNode::SetTitle( const String& rTitle, bool bBroadcast )
 {
     // Title attribute of <SdrObject> replaces own AlternateText attribute
     SwFlyFrmFmt* pFlyFmt = dynamic_cast<SwFlyFrmFmt*>(GetFlyFmt());
-    ASSERT( pFlyFmt,
+    OSL_ENSURE( pFlyFmt,
             "<SwNoTxtNode::SetTitle(..)> - missing <SwFlyFrmFmt> instance" );
     if ( !pFlyFmt )
     {
@@ -270,7 +270,7 @@ void SwNoTxtNode::SetTitle( const String& rTitle, bool bBroadcast )
 const String SwNoTxtNode::GetTitle() const
 {
     const SwFlyFrmFmt* pFlyFmt = dynamic_cast<const SwFlyFrmFmt*>(GetFlyFmt());
-    ASSERT( pFlyFmt,
+    OSL_ENSURE( pFlyFmt,
             "<SwNoTxtNode::GetTitle(..)> - missing <SwFlyFrmFmt> instance" );
     if ( !pFlyFmt )
     {
@@ -283,7 +283,7 @@ const String SwNoTxtNode::GetTitle() const
 void SwNoTxtNode::SetDescription( const String& rDescription, bool bBroadcast )
 {
     SwFlyFrmFmt* pFlyFmt = dynamic_cast<SwFlyFrmFmt*>(GetFlyFmt());
-    ASSERT( pFlyFmt,
+    OSL_ENSURE( pFlyFmt,
             "<SwNoTxtNode::SetDescription(..)> - missing <SwFlyFrmFmt> instance" );
     if ( !pFlyFmt )
     {
@@ -296,7 +296,7 @@ void SwNoTxtNode::SetDescription( const String& rDescription, bool bBroadcast )
 const String SwNoTxtNode::GetDescription() const
 {
     const SwFlyFrmFmt* pFlyFmt = dynamic_cast<const SwFlyFrmFmt*>(GetFlyFmt());
-    ASSERT( pFlyFmt,
+    OSL_ENSURE( pFlyFmt,
             "<SwNoTxtNode::GetDescription(..)> - missing <SwFlyFrmFmt> instance" );
     if ( !pFlyFmt )
     {
diff --git a/sw/source/core/docnode/ndnum.cxx b/sw/source/core/docnode/ndnum.cxx
index a4a2a6b6541d..0a7f120de313 100644
--- a/sw/source/core/docnode/ndnum.cxx
+++ b/sw/source/core/docnode/ndnum.cxx
@@ -48,13 +48,13 @@ BOOL SwOutlineNodes::Seek_Entry( const SwNodePtr rSrch, USHORT* pFndPos ) const
 //JP 17.03.98: aufgrund des Bug 48592 - wo unter anderem nach Undo/Redo
 //              Nodes aus dem falschen NodesArray im OutlineArray standen,
 //              jetzt mal einen Check eingebaut.
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         {
             for( USHORT n = 1; n < nO; ++n )
                 if( &(*this)[ n-1 ]->GetNodes() !=
                     &(*this)[ n ]->GetNodes() )
                 {
-                    ASSERT( !this, "Node im falschen Outline-Array" );
+                    OSL_ENSURE( !this, "Node im falschen Outline-Array" );
                 }
         }
 #endif
@@ -106,7 +106,7 @@ void SwNodes::UpdateOutlineNode(SwNode & rNd)
                 }
                 else
                 {
-                    ASSERT( false,
+                    OSL_ENSURE( false,
                             "<SwNodes::UpdateOutlineNode(..)> - given text node isn't in the correct nodes array. This is a serious defect -> inform OD" );
                 }
                 // <--
@@ -125,83 +125,6 @@ void SwNodes::UpdateOutlineNode(SwNode & rNd)
     }
 }
 
-//void SwNodes::UpdateOutlineNode( const SwNode& rNd, BYTE nOldLevel, //#outline level,removed by zhaojianwei
-//                                 BYTE nNewLevel )
-//{
-//  const SwNodePtr pSrch = (SwNodePtr)&rNd;
-//  USHORT nSttPos;
-//  BOOL bSeekIdx = pOutlineNds->Seek_Entry( pSrch, &nSttPos );
-//
-//  //if( NO_NUMBERING == nOldLevel )   //#outline level,zhaojianwei
-//  if( 0 == nOldLevel )                //<-end, zhaojianwei
-//  {
-//      // nicht vorhanden, also einfuegen
-//      //ASSERT( !bSeekIdx, "Der Node ist schon als OutlineNode vorhanden" );
-//
-//      //JP 12.03.99: 63293 - Nodes vom RedlineBereich NIE aufnehmen
-//      ULONG nNd = rNd.GetIndex();
-//      if( nNd < GetEndOfRedlines().GetIndex() &&
-//            nNd > GetEndOfRedlines().StartOfSectionNode()->GetIndex() )
-//          return ;
-//
-//      // jetzt noch alle nachfolgende Outline-Nodes updaten
-//        if (! bSeekIdx)
-//        {
-//            // --> OD 2005-11-03 #125329#
-//            // assure that node <pSrch> is in the correct nodes array
-//            if ( &(pSrch->GetNodes()) == this )
-//            {
-//                pOutlineNds->Insert( pSrch );
-//            }
-//            else
-//            {
-//                ASSERT( false,
-//                        "<SwNodes::UpdateOutlineNode(..)> - node <pSrch> isn't in correct nodes array. This is a serious defect -> inform OD" );
-//            }
-//            // <--
-//        }
-//
-//  }
-//  //else if( NO_NUMBERING == nNewLevel )  //#outline level,removed by zhaojianwei
-//  else if( 0 == nNewLevel )               //<-end,added by zhaojianwei    // Level entfernen
-//  {
-//      if( !bSeekIdx )
-//          return;
-//
-//      // jetzt noch alle nachfolgende Outline-Nodes updaten
-//      pOutlineNds->Remove( nSttPos );
-//  }
-//  else if( !bSeekIdx )        // Update und Index nicht gefunden ??
-//      return ;
-//
-//    {
-//        SwTxtNode & rTxtNd = (SwTxtNode &) rNd;
-//        SwPaM aPam(rTxtNd); // #115901#
-//
-//        //if (nNewLevel != NO_NUMBERING) //#outline level,zhaojianwei // #115901#
-//      if (nNewLevel != 0)              //<-end,zhaojianwei // #115901#
-//        {
-//            //rTxtNd.SetLevel(rTxtNd.GetTxtColl()->GetOutlineLevel());    //#outline level,zhaojianwei
-//          //rTxtNd.NumRuleChgd();
-//          if(rTxtNd.GetTxtColl()->IsAssignedToListLevelOfOutlineStyle())
-//          {
-//              rTxtNd.SetLevel(rTxtNd.GetTxtColl()->GetAssignedOutlineStyleLevel());
-//              rTxtNd.NumRuleChgd();
-//          }//<-end,zhaojianwei
-//
-//            //GetDoc()->SetNumRule(aPam, *GetDoc()->GetOutlineNumRule());
-//        }
-//        else
-//        {
-//            GetDoc()->DelNumRules(aPam);
-//        }
-//    }
-//
-//  // die Gliederungs-Felder Updaten
-//  GetDoc()->GetSysFldType( RES_CHAPTERFLD )->UpdateFlds();
-//    GetDoc()->ChkCondColls();
-//}//<-end,zhaojianwei
-
 void SwNodes::UpdtOutlineIdx( const SwNode& rNd )
 {
     if( !pOutlineNds->Count() )     // keine OutlineNodes vorhanden ?
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index 679f6a6682ae..281c280091de 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -93,7 +93,7 @@ bool lcl_IsInSameTblBox( SwNodes& _rNds,
                  ? !_rNds.GoPrevSection( &aChkIdx, FALSE, FALSE )
                  : !_rNds.GoNextSection( &aChkIdx, FALSE, FALSE ) )
             {
-                ASSERT( false, "<lcl_IsInSameTblBox(..)> - no previous/next!" );
+                OSL_ENSURE( false, "<lcl_IsInSameTblBox(..)> - no previous/next!" );
                 return false;
             }
             else
@@ -166,7 +166,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
     if( rRange.HasMark() &&
         0 == ( nRegionRet = IsInsRegionAvailable( rRange, &pPrvNd ) ))
     {
-        ASSERT( !this, "Selection ueber verschiedene Sections" );
+        OSL_ENSURE( !this, "Selection ueber verschiedene Sections" );
         return 0;
     }
 
@@ -212,7 +212,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData,
                     *pEndPos = (SwPosition*)rRange.End();
         if( pPrvNd && 3 == nRegionRet )
         {
-            ASSERT( pPrvNd, "der SectionNode fehlt" );
+            OSL_ENSURE( pPrvNd, "der SectionNode fehlt" );
             SwNodeIndex aStt( pSttPos->nNode ), aEnd( pEndPos->nNode, +1 );
             while( pPrvNd != aStt.GetNode().StartOfSectionNode() )
                 aStt--;
@@ -464,7 +464,6 @@ USHORT SwDoc::IsInsRegionAvailable( const SwPaM& rRange,
                         aIdx++;
                     } while( aIdx.GetNode().IsEndNode() &&
                                 0 != aIdx.GetNode().FindSectionNode() );
-//                  if( !aIdx.GetNode().IsEndNode() )
                     {
                         nRet = 2;
                         if( ppSttNd )
@@ -833,7 +832,7 @@ SwSectionNode* SwNodes::InsertTextSection(SwNodeIndex const& rNdIdx,
     if( !pEnde )        // kein Bereich also neue Section davor/hinter anlegen
     {
         // #i26762#
-        ASSERT(!pEnde || rNdIdx <= *pEnde,
+        OSL_ENSURE(!pEnde || rNdIdx <= *pEnde,
                "Section start and end in wrong order!");
 
         if( bInsAtStart )
@@ -1056,7 +1055,7 @@ SwFrm* SwClearDummies( SwFrm* pFrm )
     SwFrm* pTmp = pFrm;
     while( pTmp )
     {
-        ASSERT( !pTmp->GetUpper(), "SwClearDummies: No Upper allowed!" );
+        OSL_ENSURE( !pTmp->GetUpper(), "SwClearDummies: No Upper allowed!" );
         if( pTmp->IsSctFrm() )
         {
             SwSectionFrm* pSectFrm = (SwSectionFrm*)pFrm;
@@ -1150,7 +1149,7 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx )
             SwFrm *pFrm, *pNew;
             while( 0 != (pFrm = aNode2Layout.NextFrm()) )
             {
-                ASSERT( pFrm->IsSctFrm(), "Depend von Section keine Section." );
+                OSL_ENSURE( pFrm->IsSctFrm(), "Depend von Section keine Section." );
                 pNew = rIdx.GetNode().GetCntntNode()->MakeFrm();
 
                 SwSectionNode* pS = rIdx.GetNode().FindSectionNode();
@@ -1180,7 +1179,7 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx )
                     SwLayoutFrm* pUp = pSct;
                     while( pUp->Lower() )  // for columned sections
                     {
-                        ASSERT( pUp->Lower()->IsLayoutFrm(),"Who's in there?" );
+                        OSL_ENSURE( pUp->Lower()->IsLayoutFrm(),"Who's in there?" );
                         pUp = (SwLayoutFrm*)pUp->Lower();
                     }
                     pNew->Paste( pUp, NULL );
@@ -1240,7 +1239,7 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx )
 
 void SwSectionNode::MakeFrms( SwNodeIndex* pIdxBehind, SwNodeIndex* pEndIdx )
 {
-    ASSERT( pIdxBehind, "kein Index" );
+    OSL_ENSURE( pIdxBehind, "kein Index" );
     SwNodes& rNds = GetNodes();
     SwDoc* pDoc = rNds.GetDoc();
 
@@ -1264,8 +1263,6 @@ void SwSectionNode::DelFrms()
     ULONG nStt = GetIndex()+1, nEnd = EndOfSectionIndex();
     if( nStt >= nEnd )
     {
-        // unser Flag muessen wir noch aktualisieren
-        // pSection->bHiddenFlag = TRUE;
         return ;
     }
 
@@ -1310,7 +1307,7 @@ SwSectionNode* SwSectionNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) c
     ::std::auto_ptr<SwTOXBase> pTOXBase;
     if (TOX_CONTENT_SECTION == GetSection().GetType())
     {
-        ASSERT( GetSection().ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
+        OSL_ENSURE( GetSection().ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
         SwTOXBaseSection const& rTBS(
             dynamic_cast<SwTOXBaseSection const&>(GetSection()));
         pTOXBase.reset( new SwTOXBase(rTBS, pDoc) );
@@ -1378,7 +1375,7 @@ SwSectionNode* SwSectionNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) c
 
 BOOL SwSectionNode::IsCntntHidden() const
 {
-    ASSERT( !m_pSection->IsHidden(),
+    OSL_ENSURE( !m_pSection->IsHidden(),
             "That's simple: Hidden Section => Hidden Content" );
     SwNodeIndex aTmp( *this, 1 );
     ULONG nEnd = EndOfSectionIndex();
@@ -1395,7 +1392,7 @@ BOOL SwSectionNode::IsCntntHidden() const
         {
             if( aTmp.GetNode().IsCntntNode() || aTmp.GetNode().IsTableNode() )
                 return FALSE; // Nicht versteckter Inhalt wurde gefunden
-            ASSERT( aTmp.GetNode().IsEndNode(), "EndNode expected" );
+            OSL_ENSURE( aTmp.GetNode().IsEndNode(), "EndNode expected" );
         }
         aTmp++;
     }
@@ -1439,7 +1436,7 @@ void SwSectionNode::NodesArrChgd()
         // verschieben vom Nodes- ins UndoNodes-Array?
         if( rNds.IsDocNodes() )
         {
-            ASSERT( pDoc == GetDoc(),
+            OSL_ENSURE( pDoc == GetDoc(),
                     "verschieben in unterschiedliche Documente?" );
             if (m_pSection->IsLinkType())
             {
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 961383c7de8f..55566a169e6d 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -100,17 +100,11 @@
 // <--
 #include <fldupde.hxx>
 
-
-#ifndef DBG_UTIL
-#define CHECK_TABLE(t)
-#else
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
 #define CHECK_TABLE(t) (t).CheckConsistency();
 #else
 #define CHECK_TABLE(t)
 #endif
-#endif
-
 
 using namespace ::com::sun::star;
 
@@ -278,7 +272,7 @@ BOOL SwNodes::InsBoxen( SwTableNode* pTblNd,
 {
     if( !nCnt )
         return FALSE;
-    ASSERT( pLine, "keine gueltige Zeile" );
+    OSL_ENSURE( pLine, "keine gueltige Zeile" );
 
     // Index hinter die letzte Box der Line
     ULONG nIdxPos = 0;
@@ -342,7 +336,6 @@ BOOL SwNodes::InsBoxen( SwTableNode* pTblNd,
 
         rTabBoxes.C40_INSERT( SwTableBox, pPrvBox, nRealInsPos );
 
-        //if( NO_NUMBERING == pTxtColl->GetOutlineLevel()//#outline level,zhaojianwei
         if( ! pTxtColl->IsAssignedToListLevelOfOutlineStyle()//<-end,zhaojianwei
 //FEATURE::CONDCOLL
             && RES_CONDTXTFMTCOLL != pTxtColl->Which()
@@ -373,8 +366,8 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts,
                                    BOOL bCalledFromShell,
                                    BOOL bNewModel )
 {
-    ASSERT( nRows, "Tabelle ohne Zeile?" );
-    ASSERT( nCols, "Tabelle ohne Spalten?" );
+    OSL_ENSURE( nRows, "Tabelle ohne Zeile?" );
+    OSL_ENSURE( nCols, "Tabelle ohne Spalten?" );
 
     {
         // nicht in Fussnoten kopieren !!
@@ -516,10 +509,7 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts,
         for( USHORT i = 0; i < nBoxArrLen; ++i )
             aBoxFmtArr.Insert( (void*)0, i );
     }
-    // --> OD 2008-02-25 #refactorlists#
-//    SfxItemSet aCharSet( GetAttrPool(), RES_CHRATR_BEGIN, RES_PARATR_END-1 );
     SfxItemSet aCharSet( GetAttrPool(), RES_CHRATR_BEGIN, RES_PARATR_LIST_END-1 );
-    // <--
 
     SwNodeIndex aNdIdx( *pTblNd, 1 );   // auf den ersten Box-StartNode
     SwTableLines& rLines = pNdTbl->GetTabLines();
@@ -732,7 +722,7 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts,
 
     if( aRg.aEnd.GetIndex() == aRg.aStart.GetIndex() )
     {
-        ASSERT( FALSE, "Kein Bereich" );
+        OSL_ENSURE( FALSE, "Kein Bereich" );
         aRg.aEnd++;
     }
 
@@ -773,7 +763,7 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts,
             GetTxtCollFromPool( RES_POOLCOLL_STANDARD ), pUndo );
 
     SwTable * pNdTbl = &pTblNd->GetTable();
-    ASSERT( pNdTbl, "kein Tabellen-Node angelegt."  )
+    OSL_ENSURE( pNdTbl, "kein Tabellen-Node angelegt."  );
 
     const USHORT nRowsToRepeat =
             tabopts::HEADLINE == (rInsTblOpts.mnInsMode & tabopts::HEADLINE) ?
@@ -805,10 +795,8 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts,
                 aBoxFmtArr.Insert( (void*)0, i );
         }
 
-        // --> OD 2008-02-25 #refactorlists#
-//        SfxItemSet aCharSet( GetAttrPool(), RES_CHRATR_BEGIN, RES_PARATR_END-1 );
         SfxItemSet aCharSet( GetAttrPool(), RES_CHRATR_BEGIN, RES_PARATR_LIST_END-1 );
-        // <--
+
         SwHistory* pHistory = pUndo ? &pUndo->GetHistory() : 0;
 
         SwTableBoxFmt *pBoxF = 0;
@@ -950,7 +938,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange& rRange, sal_Unicode cCh,
         aSttIdx += 2, nLines++, nBoxes = 0 )
     {
         SwTxtNode* pTxtNd = aSttIdx.GetNode().GetTxtNode();
-        ASSERT( pTxtNd, "nur TextNodes in der Tabelle aufnehmen" );
+        OSL_ENSURE( pTxtNd, "nur TextNodes in der Tabelle aufnehmen" );
 
         if( !nLines && 0x0b == cCh )
         {
@@ -972,8 +960,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange& rRange, sal_Unicode cCh,
                     }
                 }
 
-                aPosArr.Insert( /*aFInfo.GetFrm()->Frm().Left() +*/
-                                static_cast<USHORT>(aFInfo.GetFrm()->IsVertical() ?
+                aPosArr.Insert( static_cast<USHORT>(aFInfo.GetFrm()->IsVertical() ?
                                 aFInfo.GetFrm()->Prt().Bottom() :
                                 aFInfo.GetFrm()->Prt().Right()),
                                 aPosArr.Count() );
@@ -987,9 +974,6 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange& rRange, sal_Unicode cCh,
         const SfxItemSet* pSet = pTxtNd->GetpSwAttrSet();
         if( pSet )
         {
-// das entfernen der PageBreaks erst nach dem erzeugen der Tabelle
-// erfolgen, denn sonst stehen sie falsch in der History !!!
-//          SwRegHistory aRegH( pTxtNd, *pTxtNd, pHistory );
             const SfxPoolItem* pItem;
             if( SFX_ITEM_SET == pSet->GetItemState( RES_BREAK, FALSE, &pItem ) )
             {
@@ -1111,7 +1095,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange& rRange, sal_Unicode cCh,
 
         // damit die Tabelle die richtige Groesse bekommt, im BoxFormat die
         // Groesse nach "oben" transportieren.
-        ASSERT( !pBoxFmt->GetDepends(), "wer ist in dem Format noch angemeldet" );
+        OSL_ENSURE( !pBoxFmt->GetDepends(), "wer ist in dem Format noch angemeldet" );
         pBoxFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, nLastPos ));
     }
     else
@@ -1120,9 +1104,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange& rRange, sal_Unicode cCh,
     // das wars doch wohl ??
     return pTblNd;
 }
-/*-- 18.05.2006 10:30:29---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> >& rTableNodes )
 {
     /* #106283# Save first node in the selection if it is a content node. */
@@ -1149,10 +1131,6 @@ const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> >
     SwUndoTxtToTbl* pUndo = 0;
     if( DoesUndo() )
     {
-//        StartUndo( UNDO_TEXTTOTABLE );
-//        pUndo = new SwUndoTxtToTbl( aOriginal, rInsTblOpts, cCh, eAdjust, pTAFmt );
-//        AppendUndo( pUndo );
-
         // das Splitten vom TextNode nicht in die Undohistory aufnehmen
         DoUndo( FALSE );
     }
@@ -1186,7 +1164,7 @@ const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> >
 
     if( aRg.aEnd.GetIndex() == aRg.aStart.GetIndex() )
     {
-        ASSERT( FALSE, "Kein Bereich" );
+        OSL_ENSURE( FALSE, "Kein Bereich" );
         aRg.aEnd++;
     }
 
@@ -1204,8 +1182,6 @@ const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> >
     pLineFmt->SetFmtAttr( SwFmtFillOrder( ATT_LEFT_TO_RIGHT ));
     // die Tabelle bekommt USHRT_MAX als default SSize
     pTableFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, USHRT_MAX ));
-//    if( !(rInsTblOpts.mnInsMode & tabopts::SPLIT_LAYOUT) )
-//        pTableFmt->SetAttr( SwFmtLayoutSplit( FALSE ));
 
     /* #106283# If the first node in the selection is a context node and if it
        has an item FRAMEDIR set (no default) propagate the item to the
@@ -1227,15 +1203,9 @@ const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> >
             GetTxtCollFromPool( RES_POOLCOLL_STANDARD )/*, pUndo*/ );
 
     SwTable * pNdTbl = &pTblNd->GetTable();
-    ASSERT( pNdTbl, "kein Tabellen-Node angelegt."  )
+    OSL_ENSURE( pNdTbl, "kein Tabellen-Node angelegt."  );
    pTableFmt->Add( pNdTbl );       // das Frame-Format setzen
 
-//    const USHORT nRowsToRepeat =
-//            tabopts::HEADLINE == (rInsTblOpts.mnInsMode & tabopts::HEADLINE) ?
-//            rInsTblOpts.mnRowsToRepeat :
-//            0;
-//    pNdTbl->SetRowsToRepeat( nRowsToRepeat );
-
     BOOL bUseBoxFmt = FALSE;
     if( !pBoxFmt->GetDepends() )
     {
@@ -1244,28 +1214,11 @@ const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> >
         bUseBoxFmt = TRUE;
         pTableFmt->SetFmtAttr( pBoxFmt->GetFrmSize() );
         delete pBoxFmt;
-//        eAdjust = HORI_NONE;
     }
 
-    //Orientation am Fmt der Table setzen
-//    pTableFmt->SetAttr( SwFmtHoriOrient( 0, eAdjust ) );
-//    pTableFmt->Add( pNdTbl );       // das Frame-Format setzen
-
-
     ULONG nIdx = pTblNd->GetIndex();
     aNode2Layout.RestoreUpperFrms( GetNodes(), nIdx, nIdx + 1 );
 
-    {
-//        SwPaM& rTmp = (SwPaM&)rRange;   // Point immer an den Anfang
-//        rTmp.DeleteMark();
-//        rTmp.GetPoint()->nNode = *pTblNd;
-//        SwCntntNode* pCNd = GetNodes().GoNext( &rTmp.GetPoint()->nNode );
-//        rTmp.GetPoint()->nContent.Assign( pCNd, 0 );
-    }
-
-//    if( pUndo )
-//        EndUndo( UNDO_TEXTTOTABLE );
-
     SetModified();
     SetFieldsDirty( true, NULL, 0 );
     return pNdTbl;
@@ -1333,9 +1286,6 @@ SwNodeRange * SwNodes::ExpandRangeForTableBox(const SwNodeRange & rRange)
     return pResult;
 }
 
-/*-- 18.05.2006 08:23:28---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t & rTableNodes,
                                     SwTableFmt* pTblFmt,
                                     SwTableLineFmt* pLineFmt,
@@ -1370,9 +1320,6 @@ SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t & rTableNodes,
     SwTableBox* pBox;
     USHORT nBoxes, nLines, nMaxBoxes = 0;
 
-//    SwHistory* pHistory = pUndo ? &pUndo->GetHistory() : 0;
-
-
     SwNodeIndex aNodeIndex = rTableNodes.begin()->begin()->aStart;
     // delete frames of all contained content nodes
     for( nLines = 0; aNodeIndex <= rTableNodes.rbegin()->rbegin()->aEnd; ++aNodeIndex,++nLines )
@@ -1386,15 +1333,11 @@ SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t & rTableNodes,
                 SwTxtNode& rTxtNode = static_cast<SwTxtNode&>(rNode);
                 // setze den bei allen TextNode in der Tabelle den TableNode
                 // als StartNode
-// FIXME: this is setting wrong node StartOfSections in nested tables.
-//                rTxtNode.pStartOfSection = pTblNd;
+
                 // remove PageBreaks/PageDesc/ColBreak
                 const SwAttrSet* pSet = rTxtNode.GetpSwAttrSet();
                 if( pSet )
                 {
-        // das entfernen der PageBreaks erst nach dem erzeugen der Tabelle
-        // erfolgen, denn sonst stehen sie falsch in der History !!!
-        //          SwRegHistory aRegH( pTxtNd, *pTxtNd, pHistory );
                     const SfxPoolItem* pItem;
                     if( SFX_ITEM_SET == pSet->GetItemState( RES_BREAK, FALSE, &pItem ) )
                     {
@@ -1417,38 +1360,18 @@ SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t & rTableNodes,
         }
     }
 
-//    SwNodeIndex aSttIdx( *pTblNd, 1 );
-//    SwNodeIndex aEndIdx( rlNodes.rbegin()->aEnd, -1 );
     std::vector<std::vector < SwNodeRange > >::const_iterator aRowIter = rTableNodes.begin();
     for( nLines = 0, nBoxes = 0;
         aRowIter != rTableNodes.end();
-        ++aRowIter, /*aSttIdx += 2, */nLines++, nBoxes = 0 )
+        ++aRowIter, nLines++, nBoxes = 0 )
     {
-//        SwTxtNode* pTxtNd = aSttIdx.GetNode().GetTxtNode();
-//        ASSERT( pTxtNd, "nur TextNodes in der Tabelle aufnehmen" );
-
         pLine = new SwTableLine( pLineFmt, 1, 0 );
         pTable->GetTabLines().C40_INSERT( SwTableLine, pLine, nLines );
 
-//        SwStartNode* pSttNd;
-//        SwPosition aCntPos( aSttIdx, SwIndex( pTxtNd ));
-
         std::vector< SwNodeRange >::const_iterator aCellIter = aRowIter->begin();
-//        SvULongs aBkmkArr( 15, 15 );
-//        _SaveCntntIdx( pDoc, aCellIter->aStart.GetIndex(), pTxtNd->GetTxt().Len(), aBkmkArr );
-//        const sal_Unicode* pTxt = pTxtNd->GetTxt().GetBuffer();
 
         for( ; aCellIter != aRowIter->end(); ++aCellIter )
         {
-//            aCellIter->aStart aCellIter->aEnd
-//                aCntPos.nContent = nChPos;
-//                SwCntntNode* pNewNd = pTxtNd->SplitNode( aCntPos );
-
-//        auch f?rs undo?
-//                if( aBkmkArr.Count() )
-//                    _RestoreCntntIdx( aBkmkArr, *pNewNd, nChPos,
-//                                        nChPos + 1 );
-
                 const SwNodeIndex aTmpIdx( aCellIter->aStart, 0 );
 
                SwNodeIndex aCellEndIdx(aCellIter->aEnd);
@@ -1496,7 +1419,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t & rTableNodes,
 
         // damit die Tabelle die richtige Groesse bekommt, im BoxFormat die
         // Groesse nach "oben" transportieren.
-        ASSERT( !pBoxFmt->GetDepends(), "wer ist in dem Format noch angemeldet" );
+        OSL_ENSURE( !pBoxFmt->GetDepends(), "wer ist in dem Format noch angemeldet" );
         pBoxFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, nLastPos ));
     }
     else
@@ -1579,7 +1502,7 @@ BOOL lcl_DelBox( const SwTableBox*&, void *pPara );
 
 BOOL lcl_DelLine( const SwTableLine*& rpLine, void* pPara )
 {
-    ASSERT( pPara, "die Parameter fehlen" );
+    OSL_ENSURE( pPara, "die Parameter fehlen" );
     _DelTabPara aPara( *(_DelTabPara*)pPara );
     ((SwTableLine*&)rpLine)->GetTabBoxes().ForEach( &lcl_DelBox, &aPara );
     if( rpLine->GetUpper() )        // gibt es noch eine uebergeordnete Box ??
@@ -1591,7 +1514,7 @@ BOOL lcl_DelLine( const SwTableLine*& rpLine, void* pPara )
 
 BOOL lcl_DelBox( const SwTableBox*& rpBox, void* pPara )
 {
-    ASSERT( pPara, "die Parameter fehlen" );
+    OSL_ENSURE( pPara, "die Parameter fehlen" );
 
     // loesche erstmal die Lines der Box
     _DelTabPara* pDelPara = (_DelTabPara*)pPara;
@@ -1787,7 +1710,7 @@ BOOL SwDoc::InsertCol( const SwCursor& rCursor, USHORT nCnt, BOOL bBehind )
 BOOL SwDoc::InsertCol( const SwSelBoxes& rBoxes, USHORT nCnt, BOOL bBehind )
 {
     // uebers SwDoc fuer Undo !!
-    ASSERT( rBoxes.Count(), "keine gueltige Box-Liste" );
+    OSL_ENSURE( rBoxes.Count(), "keine gueltige Box-Liste" );
     SwTableNode* pTblNd = (SwTableNode*)rBoxes[0]->GetSttNd()->FindTableNode();
     if( !pTblNd )
         return FALSE;
@@ -1852,7 +1775,7 @@ BOOL SwDoc::InsertRow( const SwCursor& rCursor, USHORT nCnt, BOOL bBehind )
 BOOL SwDoc::InsertRow( const SwSelBoxes& rBoxes, USHORT nCnt, BOOL bBehind )
 {
     // uebers SwDoc fuer Undo !!
-    ASSERT( rBoxes.Count(), "keine gueltige Box-Liste" );
+    OSL_ENSURE( rBoxes.Count(), "keine gueltige Box-Liste" );
     SwTableNode* pTblNd = (SwTableNode*)rBoxes[0]->GetSttNd()->FindTableNode();
     if( !pTblNd )
         return FALSE;
@@ -2043,7 +1966,7 @@ BOOL SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
         return FALSE;
 
     // uebers SwDoc fuer Undo !!
-    ASSERT( rBoxes.Count(), "keine gueltige Box-Liste" );
+    OSL_ENSURE( rBoxes.Count(), "keine gueltige Box-Liste" );
     SwTableNode* pTblNd = (SwTableNode*)rBoxes[0]->GetSttNd()->FindTableNode();
     if( !pTblNd )
         return FALSE;
@@ -2136,11 +2059,6 @@ BOOL SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
             SwCntntNode* pNextNd = GetNodes()[ nNextNd ]->GetCntntNode();
             if( pNextNd )
             {
-//JP 24.08.98: will man wirklich den PageDesc/Break vom
-//              nachfolgen Absatz ueberbuegeln?
-//              const SwAttrSet& rAttrSet = pNextNd->GetSwAttrSet();
-//              if( SFX_ITEM_SET != rAttrSet.GetItemState( RES_PAGEDESC ) &&
-//                  SFX_ITEM_SET != rAttrSet.GetItemState( RES_BREAK ))
                 {
                     SwFrmFmt* pTableFmt = pTblNd->GetTable().GetFrmFmt();
                     const SfxPoolItem *pItem;
@@ -2258,7 +2176,7 @@ BOOL SwDoc::SplitTbl( const SwSelBoxes& rBoxes, sal_Bool bVert, USHORT nCnt,
                       sal_Bool bSameHeight )
 {
     // uebers SwDoc fuer Undo !!
-    ASSERT( rBoxes.Count() && nCnt, "keine gueltige Box-Liste" );
+    OSL_ENSURE( rBoxes.Count() && nCnt, "keine gueltige Box-Liste" );
     SwTableNode* pTblNd = (SwTableNode*)rBoxes[0]->GetSttNd()->FindTableNode();
     if( !pTblNd )
         return FALSE;
@@ -2472,7 +2390,7 @@ void SwTableNode::MakeFrms(const SwNodeIndex & rIdx )
     SwFrm *pFrm, *pNew;
     SwCntntNode * pNode = rIdx.GetNode().GetCntntNode();
 
-    ASSERT( pNode, "Kein Contentnode oder Copy-Node und neuer Node identisch.");
+    OSL_ENSURE( pNode, "Kein Contentnode oder Copy-Node und neuer Node identisch.");
 
     BOOL bBefore = rIdx < GetIndex();
 
@@ -2496,7 +2414,7 @@ void SwTableNode::MakeFrms(const SwNodeIndex & rIdx )
 
 void SwTableNode::MakeFrms( SwNodeIndex* pIdxBehind )
 {
-    ASSERT( pIdxBehind, "kein Index" );
+    OSL_ENSURE( pIdxBehind, "kein Index" );
     *pIdxBehind = *this;
     SwNode *pNd = GetNodes().FindPrvNxtFrmNode( *pIdxBehind, EndOfSectionNode() );
     if( !pNd )
@@ -2621,7 +2539,7 @@ void SwDoc::GetTabCols( SwTabCols &rFill, const SwCursor* pCrsr,
     }
     else if( !pCrsr && !pBoxFrm )
     {
-        ASSERT( !this, "einer von beiden muss angegeben werden!" );
+        OSL_ENSURE( !this, "einer von beiden muss angegeben werden!" );
         return ;
     }
 
@@ -2675,7 +2593,7 @@ bool lcl_IsFrmInColumn( const SwCellFrm& rFrm, SwSelBoxes& rBoxes )
 void SwDoc::GetTabRows( SwTabCols &rFill, const SwCursor* ,
                         const SwCellFrm* pBoxFrm ) const
 {
-    ASSERT( pBoxFrm, "GetTabRows called without pBoxFrm" )
+    OSL_ENSURE( pBoxFrm, "GetTabRows called without pBoxFrm" );
 
     // --> FME 2005-09-12 #121591# Make code robust:
     if ( !pBoxFrm )
@@ -2700,14 +2618,14 @@ void SwDoc::GetTabRows( SwTabCols &rFill, const SwCursor* ,
     // --> FME 2005-09-12 #121591# Make code robust:
     if ( aDelCheck.HasBeenDeleted() )
     {
-        ASSERT( false, "Current box has been deleted during GetTabRows()" )
+        OSL_ENSURE( false, "Current box has been deleted during GetTabRows()" );
         return;
     }
     // <--
 
     // --> FME 2005-09-12 #121591# Make code robust:
     const SwTabFrm* pTab = pBoxFrm->FindTabFrm();
-    ASSERT( pTab, "GetTabRows called without a table" )
+    OSL_ENSURE( pTab, "GetTabRows called without a table" );
     if ( !pTab )
         return;
     // <--
@@ -2804,7 +2722,7 @@ void SwDoc::GetTabRows( SwTabCols &rFill, const SwCursor* ,
     }
 
     // delete first and last entry
-    ASSERT( rFill.Count(), "Deleting from empty vector. Fasten your seatbelts!" )
+    OSL_ENSURE( rFill.Count(), "Deleting from empty vector. Fasten your seatbelts!" );
     // --> FME 2006-01-19 #i60818# There may be only one entry in rFill. Make
     // code robust by checking count of rFill.
     if ( rFill.Count() ) rFill.Remove( 0, 1 );
@@ -2846,7 +2764,7 @@ void SwDoc::SetTabCols( const SwTabCols &rNew, BOOL bCurRowOnly,
     }
     else if( !pCrsr && !pBoxFrm )
     {
-        ASSERT( !this, "einer von beiden muss angegeben werden!" );
+        OSL_ENSURE( !this, "einer von beiden muss angegeben werden!" );
         return ;
     }
 
@@ -2895,7 +2813,7 @@ void SwDoc::SetTabRows( const SwTabCols &rNew, BOOL bCurColOnly, const SwCursor*
     const SwTableBox* pBox;
     SwTabFrm *pTab;
 
-    ASSERT( pBoxFrm, "SetTabRows called without pBoxFrm" )
+    OSL_ENSURE( pBoxFrm, "SetTabRows called without pBoxFrm" );
 
     pTab = ((SwFrm*)pBoxFrm)->ImplFindTabFrm();
     pBox = pBoxFrm->GetTabBox();
@@ -2932,7 +2850,7 @@ void SwDoc::SetTabRows( const SwTabCols &rNew, BOOL bCurColOnly, const SwCursor*
     // check for differences between aOld and rNew:
     const USHORT nCount = rNew.Count();
     const SwTable* pTable = pTab->GetTable();
-    ASSERT( pTable, "My colleague told me, this couldn't happen" );
+    OSL_ENSURE( pTable, "My colleague told me, this couldn't happen" );
 
     for ( USHORT i = 0; i <= nCount; ++i )
     {
@@ -3276,9 +3194,6 @@ BOOL SwDoc::SplitTable( const SwPosition& rPos, USHORT eHdlnMode,
     aFndBox.SetTableLines( rTbl );
     aFndBox.DelFrms( rTbl );
 
-    // TL_CHART2: need to inform chart of probably changed cell names
-    //pDoc->UpdateCharts( rTbl.GetFrmFmt()->GetName() );
-
     SwTableNode* pNew = GetNodes().SplitTable( rPos.nNode, FALSE, bCalcNewSize );
 
     if( pNew )
@@ -3507,7 +3422,7 @@ SwTableNode* SwNodes::SplitTable( const SwNodeIndex& rPos, BOOL bAfter,
     SwTableNode * pNewTblNd;
     {
         SwEndNode* pOldTblEndNd = (SwEndNode*)pTNd->EndOfSectionNode()->GetEndNode();
-        ASSERT( pOldTblEndNd, "wo ist der EndNode?" )
+        OSL_ENSURE( pOldTblEndNd, "wo ist der EndNode?" );
 
         SwNodeIndex aIdx( *pBox->GetSttNd() );
         new SwEndNode( aIdx, *pTNd );
@@ -3519,7 +3434,7 @@ SwTableNode* SwNodes::SplitTable( const SwNodeIndex& rPos, BOOL bAfter,
 
         SwNode* pBoxNd = aIdx.GetNode().GetStartNode();
         do {
-            ASSERT( pBoxNd->IsStartNode(), "das muss ein StartNode sein!" );
+            OSL_ENSURE( pBoxNd->IsStartNode(), "das muss ein StartNode sein!" );
             pBoxNd->pStartOfSection = pNewTblNd;
             pBoxNd = (*this)[ pBoxNd->EndOfSectionIndex() + 1 ];
         } while( pBoxNd != pOldTblEndNd );
@@ -3647,10 +3562,10 @@ BOOL SwNodes::MergeTable( const SwNodeIndex& rPos, BOOL bWithPrev,
                             USHORT nMode, SwHistory* )
 {
     SwTableNode* pDelTblNd = rPos.GetNode().GetTableNode();
-    ASSERT( pDelTblNd, "wo ist der TableNode geblieben?" );
+    OSL_ENSURE( pDelTblNd, "wo ist der TableNode geblieben?" );
 
     SwTableNode* pTblNd = (*this)[ rPos.GetIndex() - 1]->FindTableNode();
-    ASSERT( pTblNd, "wo ist der TableNode geblieben?" );
+    OSL_ENSURE( pTblNd, "wo ist der TableNode geblieben?" );
 
     if( !pDelTblNd || !pTblNd )
         return FALSE;
@@ -3721,7 +3636,7 @@ BOOL SwNodes::MergeTable( const SwNodeIndex& rPos, BOOL bWithPrev,
 
     SwNode* pBoxNd = aIdx.GetNode().GetStartNode();
     do {
-        ASSERT( pBoxNd->IsStartNode(), "das muss ein StartNode sein!" );
+        OSL_ENSURE( pBoxNd->IsStartNode(), "das muss ein StartNode sein!" );
         pBoxNd->pStartOfSection = pTblNd;
         pBoxNd = (*this)[ pBoxNd->EndOfSectionIndex() + 1 ];
     } while( pBoxNd != pTblEndNd );
@@ -3844,7 +3759,7 @@ BOOL lcl_SetAFmtBox( const _FndBox*& rpBox, void *pPara )
         // AutoFormat fuer die Tabelle/TabellenSelection
 BOOL SwDoc::SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNew )
 {
-    ASSERT( rBoxes.Count(), "keine gueltige Box-Liste" );
+    OSL_ENSURE( rBoxes.Count(), "keine gueltige Box-Liste" );
     SwTableNode* pTblNd = (SwTableNode*)rBoxes[0]->GetSttNd()->FindTableNode();
     if( !pTblNd )
         return FALSE;
@@ -3919,7 +3834,7 @@ BOOL SwDoc::SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNe
         // Erfrage wie attributiert ist
 BOOL SwDoc::GetTableAutoFmt( const SwSelBoxes& rBoxes, SwTableAutoFmt& rGet )
 {
-    ASSERT( rBoxes.Count(), "keine gueltige Box-Liste" );
+    OSL_ENSURE( rBoxes.Count(), "keine gueltige Box-Liste" );
     SwTableNode* pTblNd = (SwTableNode*)rBoxes[0]->GetSttNd()->FindTableNode();
     if( !pTblNd )
         return FALSE;
@@ -4207,9 +4122,6 @@ void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, BOOL bCallUpdate )
             // alle Zahlenformate entfernen
             USHORT nWhich1 = RES_BOXATR_FORMULA;
             if( !bIsEmptyTxtNd )
-                //JP 15.01.99: dieser Teil wurde doch schon oben abgeprueft!
-                /* && pFmtItem && !GetNumberFormatter()->
-                IsTextFormat( ((SwTblBoxNumFormat*)pFmtItem)->GetValue() ) )*/
             {
                 nWhich1 = RES_BOXATR_FORMAT;
 
@@ -4463,7 +4375,7 @@ BOOL SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
             {
                 SwTableBox* pBox = pInsTblNd->GetTable().GetTblBox(
                                         pSttNd->GetIndex() );
-                ASSERT( pBox, "Box steht nicht in dieser Tabelle" );
+                OSL_ENSURE( pBox, "Box steht nicht in dieser Tabelle" );
                 aBoxes.Insert( pBox );
                 pBoxes = &aBoxes;
             }
diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx
index a2a824ebf782..573a29de8b2e 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -111,7 +111,7 @@ void SwTblFmtCmp::Delete( SvPtrarr &rArr )
 void lcl_GetStartEndCell( const SwCursor& rCrsr,
                         SwLayoutFrm *&prStart, SwLayoutFrm *&prEnd )
 {
-    ASSERT( rCrsr.GetCntntNode() && rCrsr.GetCntntNode( FALSE ),
+    OSL_ENSURE( rCrsr.GetCntntNode() && rCrsr.GetCntntNode( FALSE ),
             "Tabselection nicht auf Cnt." );
 
     Point aPtPos, aMkPos;
@@ -573,7 +573,7 @@ void lcl_CollectCells( SvPtrarr &rArr, const SwRect &rUnion,
         // uns erst wieder zur Zelle hochhangeln
         while ( !pCell->IsCellFrm() )
             pCell = pCell->GetUpper();
-        ASSERT( pCell, "Frame ist keine Zelle." );
+        OSL_ENSURE( pCell, "Frame ist keine Zelle." );
         if ( rUnion.IsOver( pCell->Frm() ) )
             ::InsertCell( rArr, (SwCellFrm*)pCell );
         //Dafuer sorgen, dass die Zelle auch verlassen wird (Bereiche)
@@ -1234,7 +1234,7 @@ BOOL SwDoc::GetBoxAttr( const SwCursor& rCursor, SfxPoolItem& rToFill ) const
 #***********************************************************************/
 void SwDoc::SetBoxAlign( const SwCursor& rCursor, USHORT nAlign )
 {
-    ASSERT( nAlign == text::VertOrientation::NONE   ||
+    OSL_ENSURE( nAlign == text::VertOrientation::NONE   ||
             nAlign == text::VertOrientation::CENTER ||
             nAlign == text::VertOrientation::BOTTOM, "wrong alignment" );
     SwFmtVertOrient aVertOri( 0, nAlign );
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index f3ef7451bc75..6708247de071 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -116,8 +116,8 @@ void SetParent( boost::shared_ptr<const SfxItemSet>& mrpAttrSet,
                 const SwFmt* pConditionalFmt )
 {
     const SwAttrSet* pAttrSet = static_cast<const SwAttrSet*>(mrpAttrSet.get());
-    ASSERT( pAttrSet, "no SwAttrSet" )
-    ASSERT( pParentFmt || !pConditionalFmt, "ConditionalFmt without ParentFmt?" )
+    OSL_ENSURE( pAttrSet, "no SwAttrSet" );
+    OSL_ENSURE( pParentFmt || !pConditionalFmt, "ConditionalFmt without ParentFmt?" );
 
     const SwAttrSet* pParentSet = pParentFmt ? &pParentFmt->GetAttrSet() : 0;
 
@@ -337,7 +337,7 @@ USHORT SwNode::GetSectionLevel() const
 |*
 *******************************************************************/
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 long SwNode::nSerial = 0;
 #endif
 
@@ -369,7 +369,7 @@ SwNode::SwNode( const SwNodeIndex &rWhere, const BYTE nNdType )
         pStartOfSection = (SwStartNode*)this;
     }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     nMySerial = nSerial;
     nSerial++;
 #endif
@@ -402,7 +402,7 @@ SwNode::SwNode( SwNodes& rNodes, ULONG nPos, const BYTE nNdType )
         pStartOfSection = (SwStartNode*)this;
     }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     nMySerial = nSerial;
     nSerial++;
 #endif
@@ -641,7 +641,7 @@ const SwPageDesc* SwNode::FindPageDesc( BOOL bCalcLay,
                         }
                         if( n >= rFmts.Count() )
                         {
-                            ASSERT( !this, "Fly-Section aber kein Format gefunden" );
+                            OSL_ENSURE( !this, "Fly-Section aber kein Format gefunden" );
                             return FALSE;
                         }
                     }
@@ -727,7 +727,7 @@ const SwPageDesc* SwNode::FindPageDesc( BOOL bCalcLay,
                     // kann jetzt nur noch ein Seitengebundener Fly sein
                     // oder irgendetwas neueres.
                     // Hier koennen wir nur noch den Standard returnen
-                    ASSERT( pNd->FindFlyStartNode(),
+                    OSL_ENSURE( pNd->FindFlyStartNode(),
                             "wo befindet sich dieser Node?" );
 
                     pPgDesc = &pDoc->GetPageDesc( 0 );
@@ -878,7 +878,6 @@ const SwTxtNode* SwNode::FindOutlineNodeOfLevel( BYTE nLvl ) const
             // oder ans Feld und von dort holen !!
             while( nPos &&
                    nLvl < ( pRet = rONds[nPos]->GetTxtNode() )
-                    //->GetTxtColl()->GetOutlineLevel() )//#outline level,zhaojianwei
                     ->GetAttrOutlineLevel() - 1 )  //<-end,zhaojianwei
                 --nPos;
 
@@ -916,9 +915,7 @@ BYTE SwNode::HasPrevNextLayNode() const
         // <--
         if( IsValidNextPrevNd( aIdx.GetNode() ))
             nRet |= ND_HAS_PREV_LAYNODE;
-        // --> OD 2007-06-04 #i77805#
-        // skip section start and end nodes
-//        aIdx += 2;
+        // #i77805# - skip section start and end nodes
         aIdx = SwNodeIndex( *this, +1 );
         while ( aIdx.GetNode().IsSectionNode() ||
                 ( aIdx.GetNode().IsEndNode() &&
@@ -926,7 +923,6 @@ BYTE SwNode::HasPrevNextLayNode() const
         {
             ++aIdx;
         }
-        // <--
         if( IsValidNextPrevNd( aIdx.GetNode() ))
             nRet |= ND_HAS_NEXT_LAYNODE;
     }
@@ -1195,7 +1191,7 @@ xub_StrLen SwCntntNode::Len() const { return 0; }
 
 SwFmtColl *SwCntntNode::ChgFmtColl( SwFmtColl *pNewColl )
 {
-    ASSERT( pNewColl, "Collectionpointer ist 0." );
+    OSL_ENSURE( pNewColl, "Collectionpointer ist 0." );
     SwFmtColl *pOldColl = GetFmtColl();
 
     if( pNewColl != pOldColl )
@@ -1339,7 +1335,7 @@ BOOL SwCntntNode::GoPrevious(SwIndex * pIdx, USHORT nMode ) const
 
 void SwCntntNode::MakeFrms( SwCntntNode& rNode )
 {
-    ASSERT( &rNode != this,
+    OSL_ENSURE( &rNode != this,
             "Kein Contentnode oder Copy-Node und neuer Node identisch." );
 
     if( !GetDepends() || &rNode == this )   // gibt es ueberhaupt Frames ??
@@ -1348,7 +1344,7 @@ void SwCntntNode::MakeFrms( SwCntntNode& rNode )
     SwFrm *pFrm, *pNew;
     SwLayoutFrm *pUpper;
     // Frames anlegen fuer Nodes, die vor oder hinter der Tabelle stehen ??
-    ASSERT( FindTableNode() == rNode.FindTableNode(), "Table confusion" )
+    OSL_ENSURE( FindTableNode() == rNode.FindTableNode(), "Table confusion" );
 
     SwNode2Layout aNode2Layout( *this, rNode.GetIndex() );
 
@@ -1430,12 +1426,12 @@ void SwCntntNode::DelFrms()
             !pFrm->GetIndPrev() )
         {
             SwFtnFrm *pFtn = pFrm->FindFtnFrm();
-            ASSERT( pFtn, "You promised a FtnFrm?" );
+            OSL_ENSURE( pFtn, "You promised a FtnFrm?" );
             SwCntntFrm* pCFrm;
             if( !pFtn->GetFollow() && !pFtn->GetMaster() &&
                 0 != ( pCFrm = pFtn->GetRefFromAttr()) && pCFrm->IsFollow() )
             {
-                ASSERT( pCFrm->IsTxtFrm(), "NoTxtFrm has Footnote?" );
+                OSL_ENSURE( pCFrm->IsTxtFrm(), "NoTxtFrm has Footnote?" );
                 ((SwTxtFrm*)pCFrm->FindMaster())->Prepare( PREP_FTN_GONE );
             }
         }
@@ -1484,25 +1480,6 @@ BOOL SwCntntNode::GetInfo( SfxPoolItem& rInfo ) const
             return FALSE;
         }
         break;
-    // --> OD 2008-02-19 #refactorlists#
-//    case RES_GETNUMNODES:
-//        // #111955# only numbered nodes in rInfo
-//        if( IsTxtNode())
-//        {
-//            SwTxtNode * pTxtNode = (SwTxtNode*)this;
-//            pItem = (SwNumRuleItem*)GetNoCondAttr(RES_PARATR_NUMRULE, TRUE );
-
-//            if (0 != pItem  &&
-//                pItem->GetValue().Len() &&
-//                pItem->GetValue() == ((SwNumRuleInfo&)rInfo).GetName() &&
-//                GetNodes().IsDocNodes())
-//            {
-//                ((SwNumRuleInfo&)rInfo).AddNode( *pTxtNode );
-//            }
-//        }
-
-//        return TRUE;
-    // <--
 
     case RES_FINDNEARESTNODE:
         if( ((SwFmtPageDesc&)GetAttr( RES_PAGEDESC )).GetPageDesc() )
@@ -1527,7 +1504,7 @@ BOOL SwCntntNode::SetAttr(const SfxPoolItem& rAttr )
     if( !GetpSwAttrSet() )            // lasse von den entsprechenden Nodes die
         NewAttrSet( GetDoc()->GetAttrPool() );      // AttrSets anlegen
 
-    ASSERT( GetpSwAttrSet(), "warum wurde kein AttrSet angelegt?" );
+    OSL_ENSURE( GetpSwAttrSet(), "warum wurde kein AttrSet angelegt?" );
 
     if ( IsInCache() )
     {
@@ -1568,7 +1545,7 @@ BOOL SwCntntNode::SetAttr( const SfxItemSet& rSet )
     const SfxPoolItem* pFnd = 0;
     if( SFX_ITEM_SET == rSet.GetItemState( RES_AUTO_STYLE, FALSE, &pFnd ) )
     {
-        ASSERT( rSet.Count() == 1, "SetAutoStyle mixed with other attributes?!" );
+        OSL_ENSURE( rSet.Count() == 1, "SetAutoStyle mixed with other attributes?!" );
         const SwFmtAutoFmt* pTmp = static_cast<const SwFmtAutoFmt*>(pFnd);
 
         // If there already is an attribute set (usually containing a numbering
@@ -1784,7 +1761,7 @@ USHORT SwCntntNode::ClearItemsFromAttrSet( const std::vector<USHORT>& rWhichIds
     if ( 0 == rWhichIds.size() )
         return nRet;
 
-    ASSERT( GetpSwAttrSet(), "no item set" )
+    OSL_ENSURE( GetpSwAttrSet(), "no item set" );
     SwAttrSet aNewAttrSet( *GetpSwAttrSet() );
     for ( std::vector<USHORT>::const_iterator aIter = rWhichIds.begin();
           aIter != rWhichIds.end();
diff --git a/sw/source/core/docnode/node2lay.cxx b/sw/source/core/docnode/node2lay.cxx
index f74621dfb9bf..6f8f495d213c 100644
--- a/sw/source/core/docnode/node2lay.cxx
+++ b/sw/source/core/docnode/node2lay.cxx
@@ -115,7 +115,7 @@ SwNode2LayImpl::SwNode2LayImpl( const SwNode& rNode, ULONG nIdx, BOOL bSearch )
             pMod = (SwModify*)pNd->GetCntntNode();
         else
         {
-            ASSERT( pNd->IsTableNode(), "For Tablenodes only" );
+            OSL_ENSURE( pNd->IsTableNode(), "For Tablenodes only" );
             pMod = pNd->GetTableNode()->GetTable().GetFrmFmt();
         }
         pIter = new SwClientIter( *pMod );
@@ -150,7 +150,7 @@ SwFrm* SwNode2LayImpl::NextFrm()
     while( pRet )
     {
         SwFlowFrm* pFlow = SwFlowFrm::CastFlowFrm( pRet );
-        ASSERT( pFlow, "Cntnt or Table expected?!" );
+        OSL_ENSURE( pFlow, "Cntnt or Table expected?!" );
         // Follows sind fluechtige Gestalten, deshalb werden sie ignoriert.
         // Auch wenn wir hinter dem Frame eingefuegt werden sollen, nehmen wir
         // zunaechst den Master, hangeln uns dann aber zum letzten Follow durch.
@@ -172,9 +172,9 @@ SwFrm* SwNode2LayImpl::NextFrm()
                 // und nicht ausserhalb liegt.
                 if( !pRet->IsInFtn() || pSct->IsInFtn() )
                 {
-                    ASSERT( pSct && pSct->GetSection(), "Where's my section?" );
+                    OSL_ENSURE( pSct && pSct->GetSection(), "Where's my section?" );
                     SwSectionNode* pNd = pSct->GetSection()->GetFmt()->GetSectionNode();
-                    ASSERT( pNd, "Lost SectionNode" );
+                    OSL_ENSURE( pNd, "Lost SectionNode" );
                     // Wenn der erhaltene Frame in einem Bereichsframe steht,
                     // dessen Bereich den Ausgangsnode nicht umfasst, so kehren
                     // wir mit dem SectionFrm zurueck, sonst mit dem Cntnt/TabFrm
@@ -247,11 +247,11 @@ SwLayoutFrm* SwNode2LayImpl::UpperFrm( SwFrm* &rpFrm, const SwNode &rNode )
                     {
                         pFrm = static_cast<SwLayoutFrm*>(pFrm)->Lower();
                     }
-                    ASSERT( pFrm->IsLayoutFrm(),
+                    OSL_ENSURE( pFrm->IsLayoutFrm(),
                             "<SwNode2LayImpl::UpperFrm(..)> - expected upper frame isn't a layout frame." );
                     rpFrm = bMaster ? NULL
                                     : static_cast<SwLayoutFrm*>(pFrm)->Lower();
-                    ASSERT( !rpFrm || rpFrm->IsFlowFrm(),
+                    OSL_ENSURE( !rpFrm || rpFrm->IsFlowFrm(),
                             "<SwNode2LayImpl::UpperFrm(..)> - expected sibling isn't a flow frame." );
                     return static_cast<SwLayoutFrm*>(pFrm);
                 }
@@ -280,7 +280,7 @@ SwLayoutFrm* SwNode2LayImpl::UpperFrm( SwFrm* &rpFrm, const SwNode &rNode )
 
 void SwNode2LayImpl::RestoreUpperFrms( SwNodes& rNds, ULONG nStt, ULONG nEnd )
 {
-    ASSERT( pUpperFrms, "RestoreUpper without SaveUpper?" )
+    OSL_ENSURE( pUpperFrms, "RestoreUpper without SaveUpper?" );
     SwNode* pNd;
     SwDoc *pDoc = rNds.GetDoc();
     BOOL bFirst = TRUE;
@@ -316,7 +316,7 @@ void SwNode2LayImpl::RestoreUpperFrms( SwNodes& rNds, ULONG nStt, ULONG nEnd )
                 else
                     pNxt = pUp->Lower();
                 pNew = ((SwTableNode*)pNd)->MakeFrm();
-                ASSERT( pNew->IsTabFrm(), "Table exspected" );
+                OSL_ENSURE( pNew->IsTabFrm(), "Table exspected" );
                 pNew->Paste( pUp, pNxt );
                 ((SwTabFrm*)pNew)->RegistFlys();
                 (*pUpperFrms)[x-2] = pNew;
@@ -330,7 +330,7 @@ void SwNode2LayImpl::RestoreUpperFrms( SwNodes& rNds, ULONG nStt, ULONG nEnd )
                 if( bFirst && pNxt && pNxt->IsSctFrm() )
                     ((SwSectionFrm*)pNxt)->UnlockJoin();
                 pUp = (SwLayoutFrm*)(*pUpperFrms)[x++];
-                ASSERT( pUp->GetUpper() || pUp->IsFlyFrm(), "Lost Upper" );
+                OSL_ENSURE( pUp->GetUpper() || pUp->IsFlyFrm(), "Lost Upper" );
                 ::_InsertCnt( pUp, pDoc, pNd->GetIndex(), FALSE, nStt+1, pNxt );
                 pNxt = pUp->GetLastLower();
                 (*pUpperFrms)[x-2] = pNxt;
@@ -377,7 +377,7 @@ SwNode2Layout::SwNode2Layout( const SwNode& rNd )
 
 void SwNode2Layout::RestoreUpperFrms( SwNodes& rNds, ULONG nStt, ULONG nEnd )
 {
-    ASSERT( pImpl, "RestoreUpperFrms without SaveUpperFrms" );
+    OSL_ENSURE( pImpl, "RestoreUpperFrms without SaveUpperFrms" );
     pImpl->RestoreUpperFrms( rNds, nStt, nEnd );
 }
 
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index d084163ee4f8..9c9dc6d81dd5 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -81,7 +81,7 @@ SwNodes::SwNodes( SwDoc* pDocument )
 {
     bInNodesDel = bInDelUpdOutl = bInDelUpdNum = FALSE;
 
-    ASSERT( pMyDoc, "in welchem Doc stehe ich denn?" );
+    OSL_ENSURE( pMyDoc, "in welchem Doc stehe ich denn?" );
 
     ULONG nPos = 0;
     SwStartNode* pSttNd = new SwStartNode( *this, nPos++ );
@@ -183,12 +183,9 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, ULONG nSz,
             if ( rNd.IsTxtNode() )
             {
                 SwTxtNode* pTxtNode = rNd.GetTxtNode();
-                // --> OD 2008-03-13 #refactorlists#
-//                pTxtNode->UnregisterNumber();
+
                 pTxtNode->RemoveFromList();
-                // <--
 
-                //if ( pTxtNode->GetTxtColl()->GetOutlineLevel() != NO_NUMBERING )//#outline level,zhaojianwei
                 if ( pTxtNode->GetAttrOutlineLevel() != 0 )//<-end,zhaojianwei
                 {
                     const SwNodePtr pSrch = (SwNodePtr)&rNd;
@@ -202,13 +199,10 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, ULONG nSz,
             if( rNd.IsTxtNode() )
             {
                 SwTxtNode& rTxtNd = (SwTxtNode&)rNd;
-                // --> OD 2008-03-13 #refactorlists#
-//                rTxtNd.SyncNumberAndNumRule();
+
                 rTxtNd.AddToList();
-                // <--
 
                 if( bInsOutlineIdx &&
-                    //NO_NUMBERING != rTxtNd.GetTxtColl()->GetOutlineLevel() )//#outline level,zhaojianwei
                     0 != rTxtNd.GetAttrOutlineLevel() )//<-end,zhaojianwei
                 {
                     const SwNodePtr pSrch = (SwNodePtr)&rNd;
@@ -250,7 +244,6 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, ULONG nSz,
                 SwTxtNode* pTxtNd = (SwTxtNode*)pNd;
 
                 // loesche die Gliederungs-Indizies aus dem alten Nodes-Array
-                //if( NO_NUMBERING != pTxtNd->GetTxtColl()->GetOutlineLevel() )//#outline level,zhaojianwei
                 if( 0 != pTxtNd->GetAttrOutlineLevel() )//<-end,zhaojianwei
                     pOutlineNds->Remove( pNd );
 
@@ -289,19 +282,14 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, ULONG nSz,
                 if( pTxtNd )
                 {
                     SwpHints * const pHts = pTxtNd->GetpSwpHints();
-                    // setze die OultineNodes im neuen Nodes-Array
-                    //if( bInsOutlineIdx && NO_NUMBERING != //#outline level,removed by zhaojianwei
-                    //  pTxtNd->GetTxtColl()->GetOutlineLevel() )
+                    // OultineNodes set the new nodes in the array
                     if( bInsOutlineIdx &&
                         0 != pTxtNd->GetAttrOutlineLevel() ) //#outline level,added by zhaojianwei
                     {
                         rNds.pOutlineNds->Insert( pTxtNd );
                     }
 
-                    // --> OD 2008-03-13 #refactorlists#
-//                    pTxtNd->SyncNumberAndNumRule();
                     pTxtNd->AddToList();
-                    // <--
 
                     // Sonderbehandlung fuer die Felder!
                     if( pHts && pHts->Count() )
@@ -407,15 +395,15 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, ULONG nSz,
 
         if( !pFrmNd && aFrmNdIdx > rNds.GetEndOfExtras().GetIndex() )
         {
-            ASSERT( !this, "ob das so richtig ist ??" );
+            OSL_ENSURE( !this, "ob das so richtig ist ??" );
             aFrmNdIdx = rNds.GetEndOfContent();
             pFrmNd = rNds.GoPrevSection( &aFrmNdIdx, TRUE, FALSE );
             if( pFrmNd && !((SwCntntNode*)pFrmNd)->GetDepends() )
                 pFrmNd = 0;
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
             if( !pFrmNd )
-                ASSERT( !this, "ChgNode() - kein FrameNode gefunden" );
+                OSL_ENSURE( !this, "ChgNode() - kein FrameNode gefunden" );
 #endif
         }
         if( pFrmNd )
@@ -506,14 +494,10 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
 
     // setze den Start-Index
     SwNodeIndex  aIdx( aIndex );
-/*
-    --- JP 17.11.94: sollte ueberholt sein, wird im ChgNode schon erledigt!
-    BOOL bCorrNum = pSect && pSect->aStart.GetIndex() == aIdx.GetIndex();
-*/
 
     SwStartNode* pStartNode = aIdx.GetNode().pStartOfSection;
     aSttNdStack.C40_INSERT( SwStartNode, pStartNode, 0 );
-//  aSttNdStack.Insert( rNodes[ aIdx ]->pStartOfSection, 0 );
+
     SwNodeRange aOrigInsPos( aIdx, -1, aIdx );      // Originale Insert Pos
 
     //JP 16.01.98: SectionNodes: DelFrms/MakeFrms beim obersten SectionNode!
@@ -571,22 +555,16 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
                                 if( pTmpNd->IsTxtNode() )
                                     ((SwTxtNode*)pTmpNd)->RemoveFromList();
 
-//                              if( bNewFrms )
-//                                  pCNd->DelFrms();
-
                                 // setze bei Start/EndNodes die richtigen Indizies
                                 // loesche die Gliederungs-Indizies aus
                                 // dem alten Nodes-Array
-                                //if( pCNd->IsTxtNode() && NO_NUMBERING !=      //#outline level,zhaojianwei
-                                //  ((SwTxtNode*)pCNd)->GetTxtColl()->GetOutlineLevel() )
                                 if( pCNd->IsTxtNode() && 0 !=
                                     ((SwTxtNode*)pCNd)->GetAttrOutlineLevel() )//<-end,by zhaojianwei
                                     pOutlineNds->Remove( pCNd );
                                 else
                                     pCNd = 0;
                             }
-//                          else if( bNewFrms && pTmpNd->IsSectionNode() )
-//                              ((SwSectionNode*)pTmpNd)->DelFrms();
+
                             BigPtrArray::Move( aMvIdx.GetIndex(), aIdx.GetIndex() );
 
                             if( bInsOutlineIdx && pCNd )
@@ -610,16 +588,7 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
                         for( ULONG n = 0; n < nInsPos; ++n )
                         {
                             SwNode* pNd = &aMvIdx.GetNode();
-/*                          if( bNewFrms )
-                            {
-                                if( pNd->IsCntntNode() )
-                                    ((SwCntntNode*)pNd)->DelFrms();
-                                else if( pNd->IsSectionNode() )
-                                    ((SwSectionNode*)pNd)->DelFrms();
-                            }
-*/
-                            //BOOL bOutlNd = pNd->IsTxtNode() && NO_NUMBERING !=//#outline level,zhaojianwei
-                            //  ((SwTxtNode*)pNd)->GetTxtColl()->GetOutlineLevel();
+
                             const bool bOutlNd = pNd->IsTxtNode() &&
                                     0 != ((SwTxtNode*)pNd)->GetAttrOutlineLevel();//<-end,zhaojianwei
                             // loesche die Gliederungs-Indizies aus
@@ -837,7 +806,7 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
                 }
                 else                // es wurden alle Nodes innerhalb eines
                 {                   // Start- und End-Nodes verschoben
-                    ASSERT( pAktNode == aSttNdStack[nLevel] ||
+                    OSL_ENSURE( pAktNode == aSttNdStack[nLevel] ||
                             ( pAktNode->IsStartNode() &&
                                 aSttNdStack[nLevel]->IsSectionNode()),
                              "falscher StartNode" );
@@ -848,7 +817,6 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
                     nInsPos = 0;
 
                     // loesche nur noch den Pointer aus dem Nodes-Array.
-//                  RemoveNode( aRg.aEnd.GetIndex(), 1, FALSE );
                     RemoveNode( aRg.aEnd.GetIndex(), 1, TRUE );
                     aRg.aEnd--;
 
@@ -872,7 +840,6 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
                     DelNodes( aRg.aEnd, 2 );
                     aRg.aEnd--;
                 }
-//              aRg.aEnd--;
             }
             break;
 
@@ -919,13 +886,13 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
                 }
             }
             else {
-                ASSERT( FALSE, "wie kommt diser Node ins Nodes-Array??" );
+                OSL_ENSURE( FALSE, "wie kommt diser Node ins Nodes-Array??" );
             }
             aRg.aEnd--;
             break;
 
         default:
-            ASSERT( FALSE, "was ist das fuer ein Node??" );
+            OSL_ENSURE( FALSE, "was ist das fuer ein Node??" );
             break;
         }
 
@@ -1307,8 +1274,6 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, ULONG nNodes)
 
                     if( pNd->IsTxtNode() )
                     {
-                        //if( NO_NUMBERING !=                   //#outline level,zhaojianwei
-                        //  ((SwTxtNode*)pNd)->GetTxtColl()->GetOutlineLevel() &&
                         if( 0 != ((SwTxtNode*)pNd)->GetAttrOutlineLevel() &&//<-end,zhaojianwei
                                 pOutlineNds->Seek_Entry( pNd, &nIdxPos ))
                         {
@@ -1697,7 +1662,6 @@ void SwNodes::DelNodes( const SwNodeIndex & rStart, ULONG nCnt )
             SwNode* pNd = (*this)[ n ];
 
             if( pNd->IsTxtNode() &&
-                //NO_NUMBERING != ((SwTxtNode*)pNd)->GetTxtColl()->GetOutlineLevel() )//#outline level,zhaojianwei
                 0 != ((SwTxtNode*)pNd)->GetAttrOutlineLevel() ) //<-end,zhaojianwei
             {                   // loesche die Gliederungs-Indizies.
                 USHORT nIdxPos;
@@ -2007,7 +1971,7 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
     if ( &pStt->nNode.GetNode() == &GetEndOfContent() )
     {
         const bool bSuccess = GoPrevious( &pStt->nNode );
-        ASSERT( bSuccess, "Move() - no ContentNode here" );
+        OSL_ENSURE( bSuccess, "Move() - no ContentNode here" );
         (void) bSuccess;
     }
     pStt->nContent.Assign( (*this)[ pStt->nNode ]->GetCntntNode(),
@@ -2226,12 +2190,12 @@ void SwNodes::_CopyNodes( const SwNodeRange& rRange,
                     aInsPos++;  // ueberspringen
             }
             else {
-                ASSERT( FALSE, "wie kommt diser Node ins Nodes-Array??" );
+                OSL_ENSURE( FALSE, "wie kommt diser Node ins Nodes-Array??" );
             }
             break;
 
         default:
-            ASSERT( FALSE, "weder Start-/End-/Content-Node, unbekannter Typ" );
+            OSL_ENSURE( FALSE, "weder Start-/End-/Content-Node, unbekannter Typ" );
         }
         aRg.aStart++;
     }
@@ -2576,10 +2540,7 @@ void SwNodes::RemoveNode( ULONG nDelPos, ULONG nSz, BOOL bDel )
 
             if (pTxtNd)
             {
-                // --> OD 2008-03-13 #refactorlists#
-//                pTxtNd->UnregisterNumber();
                 pTxtNd->RemoveFromList();
-                // <--
             }
         }
     }
@@ -2688,12 +2649,6 @@ SwNode * SwNodes::DocumentSectionEndNode(SwNode * pNode) const
     return DocumentSectionStartNode(pNode)->EndOfSectionNode();
 }
 
-//SwNode * SwNodes::operator[](int n) const
-//{
-//    return operator[]((ULONG) n);
-//}
-// <-#112139#
-
 sal_Bool SwNodes::IsDocNodes() const
 {
     return this == &pMyDoc->GetNodes();
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index c6dec763586d..335bdcd0df86 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -76,7 +76,6 @@ using namespace ::com::sun::star;
 
 SV_IMPL_REF( SwServerObject )
 
-//static const char __FAR_DATA sSectionFmtNm[] = "Section";
 #define sSectionFmtNm aEmptyStr
 
 class SwIntrnlSectRefLink : public SwBaseLink
@@ -291,8 +290,6 @@ void SwSection::SetSectionData(SwSectionData const& rData)
 {
     bool const bOldHidden( m_Data.IsHidden() );
     m_Data = rData;
-    // now update format and reflink with new data
-//    SetLinkFileName(m_Data.GetLinkFileName()); // old code did not do this?
     // next 2 may actually overwrite m_Data.m_b{Protect,EditInReadonly}Flag
     // in Modify, which should result in same flag value as the old code!
     SetProtect(m_Data.IsProtectFlag());
@@ -323,7 +320,7 @@ bool SwSection::DataEquals(SwSectionData const& rCmp) const
 void SwSection::ImplSetHiddenFlag(bool const bTmpHidden, bool const bCondition)
 {
     SwSectionFmt* pFmt = GetFmt();
-    ASSERT(pFmt, "ImplSetHiddenFlag: no format?");
+    OSL_ENSURE(pFmt, "ImplSetHiddenFlag: no format?");
     if( pFmt )
     {
         const bool bHide = bTmpHidden && bCondition;
@@ -376,7 +373,7 @@ BOOL SwSection::CalcHiddenFlag() const
 bool SwSection::IsProtect() const
 {
     SwSectionFmt *const pFmt( GetFmt() );
-    ASSERT(pFmt, "SwSection::IsProtect: no format?");
+    OSL_ENSURE(pFmt, "SwSection::IsProtect: no format?");
     return (pFmt)
         ?   pFmt->GetProtect().IsCntntProtected()
         :   IsProtectFlag();
@@ -386,7 +383,7 @@ bool SwSection::IsProtect() const
 bool SwSection::IsEditInReadonly() const
 {
     SwSectionFmt *const pFmt( GetFmt() );
-    ASSERT(pFmt, "SwSection::IsEditInReadonly: no format?");
+    OSL_ENSURE(pFmt, "SwSection::IsEditInReadonly: no format?");
     return (pFmt)
         ?   pFmt->GetEditInReadonly().GetValue()
         :   IsEditInReadonlyFlag();
@@ -406,7 +403,7 @@ void SwSection::SetHidden(bool const bFlag)
 void SwSection::SetProtect(bool const bFlag)
 {
     SwSectionFmt *const pFormat( GetFmt() );
-    ASSERT(pFormat, "SwSection::SetProtect: no format?");
+    OSL_ENSURE(pFormat, "SwSection::SetProtect: no format?");
     if (pFormat)
     {
         SvxProtectItem aItem( RES_PROTECT );
@@ -424,7 +421,7 @@ void SwSection::SetProtect(bool const bFlag)
 void SwSection::SetEditInReadonly(bool const bFlag)
 {
     SwSectionFmt *const pFormat( GetFmt() );
-    ASSERT(pFormat, "SwSection::SetEditInReadonly: no format?");
+    OSL_ENSURE(pFormat, "SwSection::SetEditInReadonly: no format?");
     if (pFormat)
     {
         SwFmtEditInReadonly aItem;
@@ -733,7 +730,7 @@ SwSection * SwSectionFmt::GetSection() const
         return (SwSectionPtr)aIter.First( TYPE(SwSection) );
     }
 
-    ASSERT( FALSE, "keine Section als Client." )
+    OSL_ENSURE( FALSE, "keine Section als Client." );
     return 0;
 }
 
@@ -992,7 +989,7 @@ extern "C" {
     {
         const SwSectionFmt* pFSectFmt = (*(SwSectionPtr*)pFirst)->GetFmt();
         const SwSectionFmt* pSSectFmt = (*(SwSectionPtr*)pSecond)->GetFmt();
-        ASSERT( pFSectFmt && pSSectFmt &&
+        OSL_ENSURE( pFSectFmt && pSSectFmt &&
                 pFSectFmt->GetCntnt(FALSE).GetCntntIdx() &&
                 pSSectFmt->GetCntnt(FALSE).GetCntntIdx(),
                     "ungueltige Sections" );
@@ -1011,7 +1008,7 @@ extern "C" {
     {
         const SwSectionPtr pFSect = *(SwSectionPtr*)pFirst;
         const SwSectionPtr pSSect = *(SwSectionPtr*)pSecond;
-        ASSERT( pFSect && pSSect, "ungueltige Sections" );
+        OSL_ENSURE( pFSect && pSSect, "ungueltige Sections" );
         StringCompare const eCmp =
             pFSect->GetSectionName().CompareTo( pSSect->GetSectionName() );
         return eCmp == COMPARE_EQUAL ? 0
@@ -1234,14 +1231,14 @@ void lcl_BreakSectionLinksInSect( const SwSectionNode& rSectNd )
 {
     if ( !rSectNd.GetDoc() )
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "method <lcl_RemoveSectionLinksInSect(..)> - no Doc at SectionNode" );
         return;
     }
 
     if ( !rSectNd.GetSection().IsConnected() )
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "method <lcl_RemoveSectionLinksInSect(..)> - no Link at Section of SectionNode" );
         return;
     }
@@ -1751,7 +1748,7 @@ void SwIntrnlSectRefLink::Closed()
 void SwSection::CreateLink( LinkCreateType eCreateType )
 {
     SwSectionFmt* pFmt = GetFmt();
-    ASSERT(pFmt, "SwSection::CreateLink: no format?");
+    OSL_ENSURE(pFmt, "SwSection::CreateLink: no format?");
     if (!pFmt || (CONTENT_SECTION == m_Data.GetType()))
         return ;
 
@@ -1797,7 +1794,7 @@ void SwSection::CreateLink( LinkCreateType eCreateType )
         }
         break;
     default:
-        ASSERT( !this, "Was ist das fuer ein Link?" )
+        OSL_ENSURE( !this, "Was ist das fuer ein Link?" );
     }
 
     switch( eCreateType )
@@ -1829,7 +1826,7 @@ void SwSection::BreakLink()
     if (m_RefLink.Is())
     {
         SwSectionFmt *const pFormat( GetFmt() );
-        ASSERT(pFormat, "SwSection::BreakLink: no format?");
+        OSL_ENSURE(pFormat, "SwSection::BreakLink: no format?");
         if (pFormat)
         {
             pFormat->GetDoc()->GetLinkManager().Remove( m_RefLink );
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index 55219115fdd3..1d0ee8bccddc 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -100,7 +100,7 @@ void SwBaseLink::DataChanged( const String& rMimeType,
 {
     if( !pCntntNode )
     {
-        ASSERT(!this, "DataChanged ohne ContentNode" );
+        OSL_ENSURE(!this, "DataChanged ohne ContentNode" );
         return ;
     }
 
@@ -408,36 +408,16 @@ BOOL SwBaseLink::SwapIn( BOOL bWaitForData, BOOL bNativFormat )
     }
 #endif
 
-    // --> OD 2005-04-11 #i46300# - deactivate fix for issues i9861 and i33293
-//    TestBalloonInputStream* pTBIS = 0;
-//    if(!m_xInputStreamToLoadFrom.is()) {
-//        if ( !pCntntNode->IsGrfNode() ||
-//             static_cast<SwGrfNode*>(pCntntNode)->GetGrfObj().GetType()
-//                    != GRAPHIC_DEFAULT )
-//        {
-//            pTBIS = new TestBalloonInputStream();
-//            m_xInputStreamToLoadFrom = pTBIS;
-//        }
-//    }
-    // <--
-
     if( GetObj() )
     {
-        // --> OD 2005-04-11 #i46300# - deactivate fix for issues i9861 and i33293
-//        GetObj()->setStreamToLoadFrom(m_xInputStreamToLoadFrom,m_bIsReadOnly);
-        // <--
         String aMimeType( SotExchange::GetFormatMimeType( GetContentType() ));
 
-//!! ??? what have we here to do ????
-//!!        if( bNativFormat )
-//!!            aData.SetAspect( aData.GetAspect() | ASPECT_ICON );
-
         uno::Any aValue;
         GetObj()->GetData( aValue, aMimeType, !IsSynchron() && bWaitForData );
 
         if( bWaitForData && !GetObj() )
         {
-            ASSERT( !this, "das SvxFileObject wurde in einem GetData geloescht!" );
+            OSL_ENSURE( !this, "das SvxFileObject wurde in einem GetData geloescht!" );
             bRes = FALSE;
         }
         else if( 0 != ( bRes = aValue.hasValue() ) )
@@ -460,17 +440,6 @@ BOOL SwBaseLink::SwapIn( BOOL bWaitForData, BOOL bNativFormat )
 
     bSwapIn = FALSE;
 
-    // --> OD 2005-04-11 #i46300# - deactivate fix for issues i9861 and i33293
-//    if ( pTBIS && pTBIS->isTouched() )
-//    {
-//        // --> OD 2005-04-11 #i46300# - determine correct URL for the graphic
-//        String sGrfNm;
-//        GetLinkManager()->GetDisplayNames( this, 0, &sGrfNm, 0, 0 );
-//        (m_pReReadThread = new ReReadThread(
-//                this, sGrfNm, bWaitForData, bNativFormat))->create();
-//        // <--
-//    }
-    // <--
     return bRes;
 }
 
@@ -506,7 +475,7 @@ const SwNode* SwBaseLink::GetAnchor() const
         }
     }
 
-    ASSERT( !this, "GetAnchor nicht ueberlagert" );
+    OSL_ENSURE( !this, "GetAnchor nicht ueberlagert" );
     return 0;
 }
 
diff --git a/sw/source/core/docnode/threadmanager.cxx b/sw/source/core/docnode/threadmanager.cxx
index 77056d4be0e2..a1f829963a40 100644
--- a/sw/source/core/docnode/threadmanager.cxx
+++ b/sw/source/core/docnode/threadmanager.cxx
@@ -148,7 +148,7 @@ void ThreadManager::RemoveThread( const oslInterlockedCount nThreadID,
             }
             else
             {
-                ASSERT( false, "<ThreadManager::RemoveThread(..)> - ThreadJoiner already gone!" );
+                OSL_ENSURE( false, "<ThreadManager::RemoveThread(..)> - ThreadJoiner already gone!" );
             }
         }
 
@@ -201,7 +201,7 @@ bool ThreadManager::StartThread( const tThreadData& rThreadData )
         }
         else
         {
-            ASSERT( false, "<ThreadManager::StartThread(..)> - ThreadJoiner already gone!" );
+            OSL_ENSURE( false, "<ThreadManager::StartThread(..)> - ThreadJoiner already gone!" );
         }
     }
     else
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 08ca727dc5d3..bdc5b3be1ded 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -121,12 +121,6 @@ SwFrmFmt *FindFrmFmt( SdrObject *pObj )
             pRetval = pContact->GetFmt();
         }
     }
-/* SJ: after prior consultation with OD we decided to remove this Assertion
-#if OSL_DEBUG_LEVEL > 1
-    ASSERT( pRetval,
-            "<::FindFrmFmt(..)> - no frame format found for given object. Please inform OD." );
-#endif
-*/
     return pRetval;
 }
 
@@ -176,7 +170,7 @@ SwContact* GetUserCall( const SdrObject* pObj )
     SdrObject *pTmp;
     while ( !pObj->GetUserCall() && 0 != (pTmp = pObj->GetUpGroup()) )
         pObj = pTmp;
-    ASSERT( !pObj->GetUserCall() || pObj->GetUserCall()->ISA(SwContact),
+    OSL_ENSURE( !pObj->GetUserCall() || pObj->GetUserCall()->ISA(SwContact),
             "<::GetUserCall(..)> - wrong type of found object user call." );
     return static_cast<SwContact*>(pObj->GetUserCall());
 }
@@ -243,7 +237,7 @@ void SwContact::MoveObjToVisibleLayer( SdrObject* _pDrawObj )
     if ( bNotify )
     {
         SwAnchoredObject* pAnchoredObj = GetAnchoredObj( _pDrawObj );
-        ASSERT( pAnchoredObj,
+        OSL_ENSURE( pAnchoredObj,
                 "<SwContact::MoveObjToInvisibleLayer(..)> - missing anchored object" );
         if ( pAnchoredObj )
         {
@@ -280,7 +274,7 @@ void SwContact::MoveObjToInvisibleLayer( SdrObject* _pDrawObj )
     if ( bNotify )
     {
         SwAnchoredObject* pAnchoredObj = GetAnchoredObj( _pDrawObj );
-        ASSERT( pAnchoredObj,
+        OSL_ENSURE( pAnchoredObj,
                 "<SwContact::MoveObjToInvisibleLayer(..)> - missing anchored object" );
         // Note: as-character anchored objects aren't registered at a page frame and
         //       a notification of its background isn't needed.
@@ -306,20 +300,20 @@ void SwContact::_MoveObjToLayer( const bool _bToVisible,
 {
     if ( !_pDrawObj )
     {
-        ASSERT( false, "SwDrawContact::_MoveObjToLayer(..) - no drawing object!" );
+        OSL_ENSURE( false, "SwDrawContact::_MoveObjToLayer(..) - no drawing object!" );
         return;
     }
 
     if ( !pRegisteredIn )
     {
-        ASSERT( false, "SwDrawContact::_MoveObjToLayer(..) - no drawing frame format!" );
+        OSL_ENSURE( false, "SwDrawContact::_MoveObjToLayer(..) - no drawing frame format!" );
         return;
     }
 
     const IDocumentDrawModelAccess* pIDDMA = static_cast<SwFrmFmt*>(pRegisteredIn)->getIDocumentDrawModelAccess();
     if ( !pIDDMA )
     {
-        ASSERT( false, "SwDrawContact::_MoveObjToLayer(..) - no writer document!" );
+        OSL_ENSURE( false, "SwDrawContact::_MoveObjToLayer(..) - no writer document!" );
         return;
     }
 
@@ -424,7 +418,7 @@ sal_uInt32 SwContact::GetMinOrdNum() const
         aObjs.pop_back();
     }
 
-    ASSERT( nMinOrdNum != SAL_MAX_UINT32,
+    OSL_ENSURE( nMinOrdNum != SAL_MAX_UINT32,
             "<SwContact::GetMinOrdNum()> - no order number found." );
     return nMinOrdNum;
 }
@@ -491,11 +485,11 @@ SwFlyDrawContact::~SwFlyDrawContact()
 // OD 2004-03-29 #i26791#
 const SwAnchoredObject* SwFlyDrawContact::GetAnchoredObj( const SdrObject* _pSdrObj ) const
 {
-    ASSERT( _pSdrObj,
+    OSL_ENSURE( _pSdrObj,
             "<SwFlyDrawContact::GetAnchoredObj(..)> - no object provided" );
-    ASSERT( _pSdrObj->ISA(SwVirtFlyDrawObj),
+    OSL_ENSURE( _pSdrObj->ISA(SwVirtFlyDrawObj),
             "<SwFlyDrawContact::GetAnchoredObj(..)> - wrong object type object provided" );
-    ASSERT( GetUserCall( _pSdrObj ) == const_cast<SwFlyDrawContact*>(this),
+    OSL_ENSURE( GetUserCall( _pSdrObj ) == const_cast<SwFlyDrawContact*>(this),
             "<SwFlyDrawContact::GetAnchoredObj(..)> - provided object doesn't belongs to this contact" );
 
     const SwAnchoredObject* pRetAnchoredObj = 0L;
@@ -510,11 +504,11 @@ const SwAnchoredObject* SwFlyDrawContact::GetAnchoredObj( const SdrObject* _pSdr
 
 SwAnchoredObject* SwFlyDrawContact::GetAnchoredObj( SdrObject* _pSdrObj )
 {
-    ASSERT( _pSdrObj,
+    OSL_ENSURE( _pSdrObj,
             "<SwFlyDrawContact::GetAnchoredObj(..)> - no object provided" );
-    ASSERT( _pSdrObj->ISA(SwVirtFlyDrawObj),
+    OSL_ENSURE( _pSdrObj->ISA(SwVirtFlyDrawObj),
             "<SwFlyDrawContact::GetAnchoredObj(..)> - wrong object type provided" );
-    ASSERT( GetUserCall( _pSdrObj ) == this,
+    OSL_ENSURE( GetUserCall( _pSdrObj ) == this,
             "<SwFlyDrawContact::GetAnchoredObj(..)> - provided object doesn't belongs to this contact" );
 
     SwAnchoredObject* pRetAnchoredObj = 0L;
@@ -539,7 +533,7 @@ SdrObject* SwFlyDrawContact::GetMaster()
 
 void SwFlyDrawContact::SetMaster( SdrObject* _pNewMaster )
 {
-    ASSERT( _pNewMaster->ISA(SwFlyDrawObj),
+    OSL_ENSURE( _pNewMaster->ISA(SwFlyDrawObj),
             "<SwFlyDrawContact::SetMaster(..)> - wrong type of new master object" );
     mpMasterObj = static_cast<SwFlyDrawObj *>(_pNewMaster);
 }
@@ -644,7 +638,7 @@ void SwFlyDrawContact::Modify( SfxPoolItem *, SfxPoolItem * )
 // Writer fly frame are also made visible.
 void SwFlyDrawContact::MoveObjToVisibleLayer( SdrObject* _pDrawObj )
 {
-    ASSERT( _pDrawObj->ISA(SwVirtFlyDrawObj),
+    OSL_ENSURE( _pDrawObj->ISA(SwVirtFlyDrawObj),
             "<SwFlyDrawContact::MoveObjToVisibleLayer(..)> - wrong SdrObject type -> crash" );
 
     if ( GetFmt()->getIDocumentDrawModelAccess()->IsVisibleLayerId( _pDrawObj->GetLayer() ) )
@@ -683,7 +677,7 @@ void SwFlyDrawContact::MoveObjToVisibleLayer( SdrObject* _pDrawObj )
 // Writer fly frame are also made invisible.
 void SwFlyDrawContact::MoveObjToInvisibleLayer( SdrObject* _pDrawObj )
 {
-    ASSERT( _pDrawObj->ISA(SwVirtFlyDrawObj),
+    OSL_ENSURE( _pDrawObj->ISA(SwVirtFlyDrawObj),
             "<SwFlyDrawContact::MoveObjToInvisibleLayer(..)> - wrong SdrObject type -> crash" );
 
     if ( !GetFmt()->getIDocumentDrawModelAccess()->IsVisibleLayerId( _pDrawObj->GetLayer() ) )
@@ -828,12 +822,12 @@ const SwAnchoredObject* SwDrawContact::GetAnchoredObj( const SdrObject* _pSdrObj
         _pSdrObj = GetMaster();
     }
 
-    ASSERT( _pSdrObj,
+    OSL_ENSURE( _pSdrObj,
             "<SwDrawContact::GetAnchoredObj(..)> - no object provided" );
-    ASSERT( _pSdrObj->ISA(SwDrawVirtObj) ||
+    OSL_ENSURE( _pSdrObj->ISA(SwDrawVirtObj) ||
             ( !_pSdrObj->ISA(SdrVirtObj) && !_pSdrObj->ISA(SwDrawVirtObj) ),
             "<SwDrawContact::GetAnchoredObj(..)> - wrong object type object provided" );
-    ASSERT( GetUserCall( _pSdrObj ) == const_cast<SwDrawContact*>(this) ||
+    OSL_ENSURE( GetUserCall( _pSdrObj ) == const_cast<SwDrawContact*>(this) ||
             _pSdrObj == GetMaster(),
             "<SwDrawContact::GetAnchoredObj(..)> - provided object doesn't belongs to this contact" );
 
@@ -862,12 +856,12 @@ SwAnchoredObject* SwDrawContact::GetAnchoredObj( SdrObject* _pSdrObj )
         _pSdrObj = GetMaster();
     }
 
-    ASSERT( _pSdrObj,
+    OSL_ENSURE( _pSdrObj,
             "<SwDrawContact::GetAnchoredObj(..)> - no object provided" );
-    ASSERT( _pSdrObj->ISA(SwDrawVirtObj) ||
+    OSL_ENSURE( _pSdrObj->ISA(SwDrawVirtObj) ||
             ( !_pSdrObj->ISA(SdrVirtObj) && !_pSdrObj->ISA(SwDrawVirtObj) ),
             "<SwDrawContact::GetAnchoredObj(..)> - wrong object type object provided" );
-    ASSERT( GetUserCall( _pSdrObj ) == this || _pSdrObj == GetMaster(),
+    OSL_ENSURE( GetUserCall( _pSdrObj ) == this || _pSdrObj == GetMaster(),
             "<SwDrawContact::GetAnchoredObj(..)> - provided object doesn't belongs to this contact" );
 
     SwAnchoredObject* pRetAnchoredObj = 0L;
@@ -911,7 +905,7 @@ void SwDrawContact::SetMaster( SdrObject* _pNewMaster )
     if ( _pNewMaster )
     {
 #if OSL_DEBUG_LEVEL > 1
-        ASSERT( false, "debug notification - master replaced!" );
+        OSL_ENSURE( false, "debug notification - master replaced!" );
 #endif
         maAnchoredDrawObj.SetDrawObj( *_pNewMaster );
     }
@@ -937,8 +931,8 @@ const SwFrm* SwDrawContact::GetAnchorFrm( const SdrObject* _pDrawObj ) const
     }
     else
     {
-        ASSERT( false,
-                "<SwDrawContact::GetAnchorFrm(..)> - unknown drawing object." )
+        OSL_ENSURE( false,
+                "<SwDrawContact::GetAnchorFrm(..)> - unknown drawing object." );
     }
 
     return pAnchorFrm;
@@ -955,8 +949,8 @@ SwFrm* SwDrawContact::GetAnchorFrm( SdrObject* _pDrawObj )
     }
     else
     {
-        ASSERT( _pDrawObj->ISA(SwDrawVirtObj),
-                "<SwDrawContact::GetAnchorFrm(..)> - unknown drawing object." )
+        OSL_ENSURE( _pDrawObj->ISA(SwDrawVirtObj),
+                "<SwDrawContact::GetAnchorFrm(..)> - unknown drawing object." );
         pAnchorFrm = static_cast<SwDrawVirtObj*>(_pDrawObj)->AnchorFrm();
     }
 
@@ -1284,7 +1278,7 @@ class NestedUserCallHdl
             mpDrawContact = 0;
         }
 
-        bool IsNestedUserCall()
+        bool IsNestedUserCall() const
         {
             return mbParentUserCallActive;
         }
@@ -1315,7 +1309,7 @@ class NestedUserCallHdl
 
                 if ( bTmpAssert )
                 {
-                    ASSERT( false,
+                    OSL_ENSURE( false,
                             "<SwDrawContact::_Changed(..)> - unknown nested <UserCall> event. This is serious, please inform OD." );
                 }
             }
@@ -1375,7 +1369,7 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
                 // OD 10.10.2003 #112299#
                 if ( mbDisconnectInProgress )
                 {
-                    ASSERT( false,
+                    OSL_ENSURE( false,
                             "<SwDrawContact::_Changed(..)> - Insert event during disconnection from layout is invalid." );
                 }
                 else
@@ -1512,7 +1506,7 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
                     break;
                     default:
                     {
-                        ASSERT( false,
+                        OSL_ENSURE( false,
                                 "<SwDrawContact::_Changed(..)> - unsupported layout direction" );
                     }
                 }
@@ -1565,22 +1559,6 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
                     // <--
                 }
             }
-            // --> OD 2006-01-18 #129959#
-            // It reveals that the following code causes several defects -
-            // on copying or on ungrouping a group shape containing edge objects.
-            // Testing fix for #i53320# also reveal that the following code
-            // isn't necessary.
-//            // --> OD 2005-08-15 #i53320# - reset positioning attributes,
-//            // if anchored drawing object isn't yet positioned.
-//            else if ( pAnchoredDrawObj->NotYetPositioned() &&
-//                      static_cast<const SwDrawFrmFmt&>(pAnchoredDrawObj->GetFrmFmt()).IsPosAttrSet() )
-//            {
-//                const_cast<SwDrawFrmFmt&>(
-//                    static_cast<const SwDrawFrmFmt&>(pAnchoredDrawObj->GetFrmFmt()))
-//                        .ResetPosAttr();
-//            }
-//            // <--
-            // <--
         }
         break;
         case SDRUSERCALL_CHGATTR:
@@ -1625,7 +1603,7 @@ namespace
 void SwDrawContact::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
 {
     // OD 10.10.2003 #112299#
-    ASSERT( !mbDisconnectInProgress,
+    OSL_ENSURE( !mbDisconnectInProgress,
             "<SwDrawContact::Modify(..)> called during disconnection.");
 
     USHORT nWhich = pNew ? pNew->Which() : 0;
@@ -1661,7 +1639,7 @@ void SwDrawContact::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
                 const SwFmtAnchor* pOldAnchorFmt = pOld ? lcl_getAnchorFmt( *pOld ) : NULL;
                 if ( !pOldAnchorFmt || ( pOldAnchorFmt->GetAnchorId() != pNewAnchorFmt->GetAnchorId() ) )
                 {
-                    ASSERT( maAnchoredDrawObj.DrawObj(), "SwDrawContact::Modify: no draw object here?" );
+                    OSL_ENSURE( maAnchoredDrawObj.DrawObj(), "SwDrawContact::Modify: no draw object here?" );
                     if ( maAnchoredDrawObj.DrawObj() )
                     {
                         // --> OD 2009-07-10 #i102752#
@@ -1734,7 +1712,7 @@ void SwDrawContact::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
 #if OSL_DEBUG_LEVEL > 1
         else
         {
-            ASSERT( false,
+            OSL_ENSURE( false,
                     "<SwDrawContact::Modify(..)> - unhandled attribute? - please inform od@openoffice.org" );
         }
 #endif
@@ -1934,7 +1912,7 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
     // layout.
     if ( mbDisconnectInProgress )
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "<SwDrawContact::ConnectToLayout(..)> called during disconnection.");
         return;
     }
@@ -1943,7 +1921,7 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
     // object isn't inserted in the drawing page
     if ( !GetMaster()->IsInserted() )
     {
-        ASSERT( false, "<SwDrawContact::ConnectToLayout(..)> - master drawing object not inserted -> no connect to layout. Please inform od@openoffice.org" );
+        OSL_ENSURE( false, "<SwDrawContact::ConnectToLayout(..)> - master drawing object not inserted -> no connect to layout. Please inform od@openoffice.org" );
         return;
     }
     // <--
@@ -2062,7 +2040,7 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
                         if ( FLY_AT_FLY == pAnch->GetAnchorId() && !pFrm->IsFlyFrm() )
                         {
                             pFrm = pFrm->FindFlyFrm();
-                            ASSERT( pFrm,
+                            OSL_ENSURE( pFrm,
                                     "<SwDrawContact::ConnectToLayout(..)> - missing fly frame -> crash." );
                         }
 
@@ -2092,8 +2070,6 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
                             }
                             pFrm->AppendDrawObj( *(pDrawVirtObj->AnchoredObj()) );
 
-                            // for repaint, use new ActionChanged()
-                            // pDrawVirtObj->SendRepaintBroadcast();
                             pDrawVirtObj->ActionChanged();
                         }
 
@@ -2106,7 +2082,7 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch )
             }
             break;
         default:
-            ASSERT( FALSE, "Unknown Anchor." )
+            OSL_ENSURE( FALSE, "Unknown Anchor." );
             break;
     }
     if ( GetAnchorFrm() )
@@ -2153,7 +2129,7 @@ void SwDrawContact::ChkPage()
     // OD 10.10.2003 #112299#
     if ( mbDisconnectInProgress )
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "<SwDrawContact::ChkPage()> called during disconnection." );
         return;
     }
@@ -2336,7 +2312,7 @@ namespace sdr
 
         drawinglayer::primitive2d::Primitive2DSequence VOCOfDrawVirtObj::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const
         {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
             // #i101734#
             static bool bCheckOtherThanTranslate(false);
             static double fShearX(0.0);
@@ -2355,7 +2331,7 @@ namespace sdr
 
             if(aLocalOffset.X() || aLocalOffset.Y())
             {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
                 // #i101734# added debug code to check more complex transformations
                 // than just a translation
                 if(bCheckOtherThanTranslate)
@@ -2605,8 +2581,6 @@ void SwDrawVirtObj::RecalcBoundRect()
     // OD 2004-04-05 #i26791# - switch order of calling <GetOffset()> and
     // <ReferencedObj().GetCurrentBoundRect()>, because <GetOffset()> calculates
     // its value by the 'BoundRect' of the referenced object.
-    //aOutRect = rRefObj.GetCurrentBoundRect();
-    //aOutRect += GetOffset();
 
     const Point aOffset(GetOffset());
     aOutRect = ReferencedObj().GetCurrentBoundRect() + aOffset;
@@ -2677,10 +2651,6 @@ void SwDrawVirtObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVSh
 void SwDrawVirtObj::Move(const Size& rSiz)
 {
     SdrObject::Move( rSiz );
-//    Rectangle aBoundRect0; if(pUserCall) aBoundRect0 = GetLastBoundRect();
-//    rRefObj.Move( rSiz );
-//    SetRectsDirty();
-//    SendUserCall(SDRUSERCALL_RESIZE, aBoundRect0);
 }
 
 void SwDrawVirtObj::Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
diff --git a/sw/source/core/draw/dobjfac.cxx b/sw/source/core/draw/dobjfac.cxx
index 31493841903b..f769ed84cc63 100644
--- a/sw/source/core/draw/dobjfac.cxx
+++ b/sw/source/core/draw/dobjfac.cxx
@@ -48,7 +48,7 @@ IMPL_LINK( SwObjectFactory, MakeObject, SdrObjFactory*, pObjFactory )
     if ( pObjFactory->nInventor == SWGInventor )
     {
         //Kein switch, derzeit gibt es nur einen.
-        ASSERT( pObjFactory->nIdentifier == SwFlyDrawObjIdentifier,
+        OSL_ENSURE( pObjFactory->nIdentifier == SwFlyDrawObjIdentifier,
                                         "Falscher Inventor oder identifier." );
         pObjFactory->pNewObj = new SwFlyDrawObj();
     }
diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx
index cfcd29057c9b..541dc5d7a681 100644
--- a/sw/source/core/draw/dpage.cxx
+++ b/sw/source/core/draw/dpage.cxx
@@ -85,7 +85,7 @@ SwDPage::~SwDPage()
 SdrObject*  SwDPage::ReplaceObject( SdrObject* pNewObj, ULONG nObjNum )
 {
     SdrObject *pOld = GetObj( nObjNum );
-    ASSERT( pOld, "Oups, Object not replaced" );
+    OSL_ENSURE( pOld, "Oups, Object not replaced" );
     SdrObjUserCall* pContact;
     if ( 0 != ( pContact = GetUserCall(pOld) ) &&
          RES_DRAWFRMFMT == ((SwContact*)pContact)->GetFmt()->Which())
@@ -242,9 +242,7 @@ BOOL SwDPage::RequestHelp( Window* pWindow, SdrView* pView,
 
     return bWeiter;
 }
-/* -----------------------------27.11.00 07:35--------------------------------
 
- ---------------------------------------------------------------------------*/
 Reference< XInterface > SwDPage::createUnoPage()
 {
     Reference < XInterface > xRet;
diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx
index 3d5d2df32dcf..08a6e7890742 100644
--- a/sw/source/core/draw/drawdoc.cxx
+++ b/sw/source/core/draw/drawdoc.cxx
@@ -227,7 +227,7 @@ uno::Reference< uno::XInterface > SwDrawDocument::createUnoModel()
     }
     catch( uno::RuntimeException& )
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "<SwDrawDocument::createUnoModel()> - could *not* retrieve model at <SwDocShell>" );
     }
 
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index 88bcc513fa2f..5aaa936431e2 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -246,7 +246,7 @@ void SwDrawView::AddCustomHdl()
     SwFrmFmt* pFrmFmt( ::FindFrmFmt( pObj ) );
     if ( !pFrmFmt )
     {
-        ASSERT( false, "<SwDrawView::AddCustomHdl()> - missing frame format!" );
+        OSL_ENSURE( false, "<SwDrawView::AddCustomHdl()> - missing frame format!" );
         return;
     }
     const SwFmtAnchor &rAnchor = pFrmFmt->GetAnchor();
@@ -405,7 +405,7 @@ sal_uInt32 SwDrawView::_GetMaxChildOrdNum( const SwFlyFrm& _rParentObj,
     sal_uInt32 nMaxChildOrdNum = _rParentObj.GetDrawObj()->GetOrdNum();
 
     const SdrPage* pDrawPage = _rParentObj.GetDrawObj()->GetPage();
-    ASSERT( pDrawPage,
+    OSL_ENSURE( pDrawPage,
             "<SwDrawView::_GetMaxChildOrdNum(..) - missing drawing page at parent object - crash!" );
 
     sal_uInt32 nObjCount = pDrawPage->GetObjCount();
@@ -444,7 +444,7 @@ void SwDrawView::_MoveRepeatedObjs( const SwAnchoredObject& _rMovedAnchoredObj,
     std::vector<SwAnchoredObject*> aAnchoredObjs;
     {
         const SwContact* pContact = ::GetUserCall( _rMovedAnchoredObj.GetDrawObj() );
-        ASSERT( pContact,
+        OSL_ENSURE( pContact,
                 "SwDrawView::_MoveRepeatedObjs(..) - missing contact object -> crash." );
         pContact->GetAnchoredObjs( aAnchoredObjs );
     }
@@ -487,7 +487,7 @@ void SwDrawView::_MoveRepeatedObjs( const SwAnchoredObject& _rMovedAnchoredObj,
             SdrObject* pChildObj = (*aObjIter);
             {
                 const SwContact* pContact = ::GetUserCall( pChildObj );
-                ASSERT( pContact,
+                OSL_ENSURE( pContact,
                         "SwDrawView::_MoveRepeatedObjs(..) - missing contact object -> crash." );
                 pContact->GetAnchoredObjs( aAnchoredObjs );
             }
@@ -889,7 +889,6 @@ void SwDrawView::ShowDragAnchor()
     {
         CalcAnchor();
         pHdl->SetPos(aAnchorPoint);
-        //OLMRefreshAllIAOManagers();
     }
 }
 
@@ -944,7 +943,7 @@ void SwDrawView::ModelHasChanged()
 
 void SwDrawView::MakeVisible( const Rectangle &rRect, Window & )
 {
-    ASSERT( rImp.GetShell()->GetWin(), "MakeVisible, unknown Window");
+    OSL_ENSURE( rImp.GetShell()->GetWin(), "MakeVisible, unknown Window");
     rImp.GetShell()->MakeVisible( SwRect( rRect ) );
 }
 
@@ -1005,7 +1004,7 @@ void SwDrawView::CheckPossibilities()
             SwFrmFmt* pFrmFmt( ::FindFrmFmt( const_cast<SdrObject*>(pObj) ) );
             if ( !pFrmFmt )
             {
-                ASSERT( false,
+                OSL_ENSURE( false,
                         "<SwDrawView::CheckPossibilities()> - missing frame format" );
                 bProtect = TRUE;
             }
@@ -1097,16 +1096,6 @@ void SwDrawView::DeleteMarked()
         pDoc->GetRootFrm()->EndAllAction();
 }
 
-/********
-JP 02.10.98: sollte als Fix fuer 57153 gelten, hatte aber Nebenwirkungen,
-            wie Bug 57475
-const SdrMarkList& SwDrawView::GetMarkedObjectList() const
-{
-    FlushComeBackTimer();
-    return FmFormView::GetMarkedObjectList();
-}
-*************/
-
 
 
 
diff --git a/sw/source/core/draw/makefile.mk b/sw/source/core/draw/makefile.mk
index a57b1b530e7f..71d0cbdd25fb 100644
--- a/sw/source/core/draw/makefile.mk
+++ b/sw/source/core/draw/makefile.mk
@@ -42,17 +42,15 @@ AUTOSEG=true
 # --- Files --------------------------------------------------------
 
 SLOFILES =  \
-        $(SLO)$/dview.obj	\
-        $(SLO)$/dcontact.obj	\
-        $(SLO)$/dflyobj.obj \
-        $(SLO)$/drawdoc.obj \
-        $(SLO)$/dobjfac.obj \
-        $(SLO)$/dpage.obj
+        $(EXCEPTIONSFILES)
 
 EXCEPTIONSFILES= \
-                $(SLO)$/dview.obj	\
-                $(SLO)$/dcontact.obj	\
-                $(SLO)$/drawdoc.obj
+        $(SLO)$/dcontact.obj	\
+        $(SLO)$/dflyobj.obj	\
+        $(SLO)$/dobjfac.obj	\
+        $(SLO)$/dpage.obj	\
+        $(SLO)$/drawdoc.obj	\
+        $(SLO)$/dview.obj	\
 
 # --- Tagets -------------------------------------------------------
 
diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx
index 5c03318fc0bd..a20611fcd67f 100644
--- a/sw/source/core/edit/acorrect.cxx
+++ b/sw/source/core/edit/acorrect.cxx
@@ -184,10 +184,6 @@ BOOL SwAutoCorrDoc::Replace( xub_StrLen nPos, const String& rTxt )
     {
         SwDoc* pDoc = rEditSh.GetDoc();
 
-//      if( !pDoc->IsAutoFmtRedline() &&
-//          pPam != &rCrsr )    // nur an akt. Position das Redline sichern
-//          pDoc->SetRedlineMode_intern( eOld | REDLINE_IGNORE );
-
         if( pDoc->IsAutoFmtRedline() )
         {
             if( nPos == pNd->GetTxt().Len() )       // am Ende erfolgt ein Insert
@@ -287,7 +283,6 @@ const String* SwAutoCorrDoc::GetPrevPara( BOOL bAtNormalPos )
         (*pIdx)--;
         pTNd = pIdx->GetNode().GetTxtNode();
     }
-    //if( pTNd && NO_NUMBERING == pTNd->GetTxtColl()->GetOutlineLevel() )
     if( pTNd && 0 == pTNd->GetAttrOutlineLevel() )//#outline level,zhaojianwei
         pStr = &pTNd->GetTxt();
 
@@ -307,7 +302,7 @@ BOOL SwAutoCorrDoc::ChgAutoCorrWord( xub_StrLen & rSttPos, xub_StrLen nEndPos,
     // Absatz-Anfang oder ein Blank gefunden, suche nach dem Wort
     // Kuerzel im Auto
     SwTxtNode* pTxtNd = rCrsr.GetNode()->GetTxtNode();
-    ASSERT( pTxtNd, "wo ist denn der TextNode?" );
+    OSL_ENSURE( pTxtNd, "wo ist denn der TextNode?" );
 
     BOOL bRet = FALSE;
     if( nEndPos == rSttPos )
@@ -351,7 +346,7 @@ BOOL SwAutoCorrDoc::ChgAutoCorrWord( xub_StrLen & rSttPos, xub_StrLen nEndPos,
 
                 if( ppPara )
                 {
-                    ASSERT( !pIdx, "wer hat seinen Index nicht geloescht?" );
+                    OSL_ENSURE( !pIdx, "wer hat seinen Index nicht geloescht?" );
                     pIdx = new SwNodeIndex( rCrsr.GetPoint()->nNode, -1 );
                 }
 
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 3b60bd562632..763babdb9f39 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -268,7 +268,7 @@ SwTxtFrm* SwAutoFormat::GetFrm( const SwTxtNode& rTxtNd ) const
 {
     // besorge mal den Frame
     const SwCntntFrm *pFrm = rTxtNd.GetFrm();
-    ASSERT( pFrm, "zum Autoformat muss das Layout vorhanden sein" );
+    OSL_ENSURE( pFrm, "zum Autoformat muss das Layout vorhanden sein" );
     if( aFlags.bAFmtByInput && !pFrm->IsValid() )
     {
         SwRect aTmpFrm( pFrm->Frm() );
@@ -565,12 +565,9 @@ BOOL SwAutoFormat::DoUnderline()
     xub_StrLen nCnt = 0;
     while( *pStr )
     {
-//JP 29.03.96: Spaces unterbrechen die Umrandung!
-//      if( !IsSpace( *pStr ) )
+        int eTmp = 0;
+        switch( *pStr )
         {
-            int eTmp = 0;
-            switch( *pStr )
-            {
             case '-': eTmp = 1; break;
             case '_': eTmp = 2; break;
             case '=': eTmp = 3; break;
@@ -579,13 +576,13 @@ BOOL SwAutoFormat::DoUnderline()
             case '#': eTmp = 6; break;
             default:
                 return FALSE;
-            }
-            if( 0 == eState )
-                eState = eTmp;
-            else if( eState != eTmp )
-                return FALSE;
-            ++nCnt;
         }
+        if( 0 == eState )
+            eState = eTmp;
+        else if( eState != eTmp )
+            return FALSE;
+        ++nCnt;
+
         ++pStr;
     }
 
@@ -595,8 +592,6 @@ BOOL SwAutoFormat::DoUnderline()
         DelEmptyLine( FALSE );
         aDelPam.SetMark();
         aDelPam.GetMark()->nContent = 0;
-//JP 19.03.96: kein Underline sondern eine Umrandung setzen!
-//      pDoc->Insert( aDelPam, SvxUnderlineItem( eState ) );
 
         SvxBorderLine aLine;
         switch( eState )
@@ -857,7 +852,6 @@ USHORT SwAutoFormat::GetDigitLevel( const SwTxtNode& rNd, xub_StrLen& rPos,
             // roemische Zeichen sind "mdclxvi". Da man aber eher mal eine
             // Numerierung mit c oder d anfangen will, werden diese erstmal
             // zu chars und spaeter ggfs. zu romischen Zeichen!
-//          if( strchr( "mdclxvi", cLow ))
 #ifdef WITH_ALPHANUM_AS_NUMFMT
             //detection of 'c' and 'd' a ROMAN numbering should not be done here
             if( 256 > cLow  &&( (eScan & (LOWER_ROMAN|UPPER_ROMAN))
@@ -1084,8 +1078,6 @@ BOOL SwAutoFormat::HasSelBlanks( SwPaM& rPam ) const
     SwTxtNode* pTxtNd = pPos->nNode.GetNode().GetTxtNode();
     if( nBlnkPos && nBlnkPos-- < pTxtNd->GetTxt().Len() &&
         ( ' ' == pTxtNd->GetTxt().GetChar( nBlnkPos ) ))
-// JP 23.08.95: keine Tabs stehen lassen, diese in Blanks wandeln
-//        ( ' ' == ( cCh = pTxtNd->GetTxt()[ nBlnkPos ] ) || '\t' == cCh ))
         pPos->nContent--;
     else
     {
@@ -1094,8 +1086,6 @@ BOOL SwAutoFormat::HasSelBlanks( SwPaM& rPam ) const
         pTxtNd = pPos->nNode.GetNode().GetTxtNode();
         if( nBlnkPos < pTxtNd->GetTxt().Len() &&
             ( ' ' == pTxtNd->GetTxt().GetChar( nBlnkPos )))
-// JP 23.08.95: keine Tabs stehen lassen, diese in Blanks wandeln
-//            ( ' ' == ( cCh = pTxtNd->GetTxt()[ nBlnkPos ] ) || '\t' == cCh ))
             pPos->nContent++;
         else
             return FALSE;
@@ -1470,7 +1460,6 @@ void SwAutoFormat::BuildEnum( USHORT nLvl, USHORT nDigitLevel )
                     IsBlanksInString( *pAktTxtNd ) ||
                     IsSentenceAtEnd( *pAktTxtNd );
     sal_Bool bRTL = pEditShell->IsInRightToLeftText();
-//  SetColl( RES_POOLCOLL_NUM_LEVEL1 + ( nLvl * 4 ) );
     DeleteAktPara( TRUE, TRUE );
 
     BOOL bChgBullet = FALSE, bChgEnum = FALSE;
@@ -1491,7 +1480,6 @@ void SwAutoFormat::BuildEnum( USHORT nLvl, USHORT nDigitLevel )
     const String& rStr = pAktTxtNd->GetTxt();
     xub_StrLen nTxtStt = 0, nOrigTxtStt = 0;
     const sal_Unicode* pFndBulletChr;
-//  if( aFlags.bAFmtByInput ? aFlags.bSetNumRule : aFlags.bChgEnumNum &&
     if( aFlags.bChgEnumNum &&
         2 < rStr.Len() &&
         0 != ( pFndBulletChr = StrChr( pBulletChar, rStr.GetChar( nTxtStt ) ))
@@ -2086,12 +2074,7 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos )
             case '?':
                 if( aFlags.bCptlSttSntnc )
                     bFirstSent = TRUE;
-//alle Wortrenner loesen die Autokorrektur aus!
-//              break;
             default:
-//alle Wortrenner loesen die Autokorrektur aus!
-//          case ' ':
-//          case '\t':
                 if( !( rAppCC.isLetterNumeric( *pTxt, nPos )
                         || '/' == cChar )) //  '/' should not be a word seperator (e.g. '1/2' needs to be handled as one word for replacement)
                 {
@@ -2199,7 +2182,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
     pCharClass( 0 ),
     nRedlAutoFmtSeqId( 0 )
 {
-    ASSERT( (pSttNd && pEndNd) || (!pSttNd && !pEndNd),
+    OSL_ENSURE( (pSttNd && pEndNd) || (!pSttNd && !pEndNd),
             "Kein Bereich angegeben" );
 
     if( aFlags.bSetNumRule && !aFlags.bAFmtByInput )
@@ -2459,10 +2442,6 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
                     if( !bNxtEmpty && HasBreakAttr( *pNxtNd ) )
                         bNxtEmpty = TRUE;
 
-                    // fuer z.B. selbst definierte Einzuege oder
-                    // rechts/zentierte Ausrichtung
-//                  if( !nLevel && 0 != aFInfo.GetLineStart() )
-//                      nLevel = 1;
                 }
                 else
                 {
@@ -2501,13 +2480,6 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
                 // nicht, dann teste auf Ueberschrift
                 if( ':' == sEndClrStr.GetChar( nLen - 1 ) )
                 {
-//---------------------------------------------------------------------------
-// Wie ist denn nun die Bedingung fuer die Ueberschrift auf Ebene 3 ??
-// Zur Zeit: generell wenn am Ende ein ':' ist.
-//
-//                  if( bNxtEmpty || bNxtAlpha )
-//                      !IsEnumericChar( *pNxtNd ) )
-//---------------------------------------------------------------------------
                     {
                         BuildHeadLine( 2 );
                         eStat = READ_NEXT_PARA;
@@ -2520,16 +2492,8 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
                     if( bNxtEmpty || bNxtAlpha
                         || ( pNxtNd && IsEnumericChar( *pNxtNd ))
 
-//---------------------------------------------------------------------------
-// ist zum Verwechseln mit neg. Einzug !!
-                        /*|| nLevel < nNxtLevel*/
-//---------------------------------------------------------------------------
-
                         )
                     {
-                        // wurde Level vom Text vorgegeben ?
-//                      if( USHRT_MAX != nDigitLvl )
-//                          nLevel = nDigitLvl;
 
                         // eine Ebene runter ?
                         if( nLevel >= MAXLEVEL )
@@ -2571,9 +2535,6 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
                     BuildEnum( nLevel, nDigitLvl );
                     eStat = READ_NEXT_PARA;
                 }
-//JP 25.03.96: Vorlagen fuer Einzug zulassen
-//              else if( aFlags.bAFmtByInput )
-//                  eStat = READ_NEXT_PARA;
                 else if( bReplaceStyles )
                     eStat = nLevel ? TST_IDENT : TST_NEG_IDENT;
                 else
diff --git a/sw/source/core/edit/edatmisc.cxx b/sw/source/core/edit/edatmisc.cxx
index d2edcc2ebd99..930b31e52f8c 100644
--- a/sw/source/core/edit/edatmisc.cxx
+++ b/sw/source/core/edit/edatmisc.cxx
@@ -53,7 +53,7 @@ void SwEditShell::ResetAttr( const SvUShortsSort* pAttrs )
         GetDoc()->StartUndo(UNDO_RESETATTR, NULL);
 
         FOREACHPAM_START(this)
-            // if ( PCURCRSR->HasMark() )
+
                 GetDoc()->ResetAttrs(*PCURCRSR, sal_True, pAttrs);
         FOREACHPAM_END()
 
@@ -67,10 +67,6 @@ void SwEditShell::ResetAttr( const SvUShortsSort* pAttrs )
 
 void SwEditShell::GCAttr()
 {
-//JP 04.02.97: wozu eine Action-Klammerung - ein Formatierung sollte nicht
-//              ausgeloest werden, so dass es hier ueberfluessig ist.
-//              Sonst Probleme im MouseBut.DownHdl - Bug 35562
-//  StartAllAction();
     FOREACHPAM_START(this)
         SwTxtNode *pTxtNode;
         if ( !PCURCRSR->HasMark() )
@@ -92,7 +88,6 @@ void SwEditShell::GCAttr()
                     aIdx <= rEnd );
         }
     FOREACHPAM_END()
-//  EndAllAction();
 }
 
 // Setze das Attribut als neues default Attribut im Dokument.
@@ -106,17 +101,6 @@ void SwEditShell::SetDefault( const SfxPoolItem& rFmtHint )
     EndAllAction();
 }
 
-/*
-
-void SwEditShell::SetDefault( const SfxItemSet& rSet )
-{
-    // 7502: Action-Klammerung
-    StartAllAction();
-    GetDoc()->SetDefault( rSet );
-    EndAllAction();
-}
-*/
-
 // Erfrage das Default Attribut in diesem Dokument.
 
 const SfxPoolItem& SwEditShell::GetDefault( USHORT nFmtHint ) const
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index ef700dde7166..091f77f1adf1 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -258,21 +258,6 @@ bool SwEditShell::SetCurFtn( const SwFmtFtn& rFillFtn )
 }
 
 
-
-/*USHORT SwEditShell::GetFtnCnt( BOOL bEndNotes = FALSE ) const
-{
-    const SwFtnIdxs &rIdxs = pDoc->GetFtnIdxs();
-    USHORT nCnt = 0;
-    for ( USHORT i = 0; i < rIdxs.Count(); ++i )
-    {
-        const SwFmtFtn &rFtn = rIdxs[i]->GetFtn();
-        if ( bEndNotes == rFtn.IsEndNote() )
-            nCnt++;
-    }
-    return nCnt;
-} */
-
-
 bool SwEditShell::HasFtns( bool bEndNotes ) const
 {
     const SwFtnIdxs &rIdxs = pDoc->GetFtnIdxs();
@@ -431,7 +416,7 @@ BOOL lcl_IsNoEndTxtAttrAtPos( const SwTxtNode& rTNd, xub_StrLen nPos,
         // --> OD 2008-03-19 #refactorlists#
         if ( rTNd.IsInList() )
         {
-            ASSERT( rTNd.GetNumRule(),
+            OSL_ENSURE( rTNd.GetNumRule(),
                     "<lcl_IsNoEndTxtAttrAtPos(..)> - no list style found at text node. Serious defect -> please inform OD." );
             const SwNumRule* pNumRule = rTNd.GetNumRule();
             const SwNumFmt &rNumFmt = pNumRule->Get( static_cast<USHORT>(rTNd.GetActualListLevel()) );
@@ -491,7 +476,7 @@ BOOL lcl_IsNoEndTxtAttrAtPos( const SwTxtNode& rTNd, xub_StrLen nPos,
 USHORT SwEditShell::GetScriptType() const
 {
     USHORT nRet = 0;
-    //if( pBreakIt->GetBreakIter().is() )
+
     {
         FOREACHPAM_START(this)
 
@@ -552,7 +537,7 @@ USHORT SwEditShell::GetScriptType() const
                                                 ? pEnd->nContent.GetIndex()
                                                 : rTxt.Len();
 
-                        ASSERT( nEndPos <= rTxt.Len(), "Index outside the range - endless loop!" );
+                        OSL_ENSURE( nEndPos <= rTxt.Len(), "Index outside the range - endless loop!" );
                         if( nEndPos > rTxt.Len() )
                             nEndPos = rTxt.Len();
 
@@ -626,7 +611,7 @@ USHORT SwEditShell::GetScalingOfSelectedText() const
     const SwPaM* pCrsr = GetCrsr();
     const SwPosition* pStt = pCrsr->Start();
     const SwTxtNode* pTNd = pStt->nNode.GetNode().GetTxtNode();
-    ASSERT( pTNd, "no textnode available" );
+    OSL_ENSURE( pTNd, "no textnode available" );
 
     USHORT nScaleWidth;
     if( pTNd )
diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx
index 30229a59ff92..f1d24f6c4511 100644
--- a/sw/source/core/edit/eddel.cxx
+++ b/sw/source/core/edit/eddel.cxx
@@ -279,9 +279,9 @@ long SwEditShell::Copy( SwEditShell* pDestShell )
 {
     SwPaM* pCmp = (SwPaM*)pDestShell->GetCrsr();        // sicher den Pointer auf Cursor
     do {
-        ASSERT( pCmp->GetPoint()->nContent.GetIdxReg()
+        OSL_ENSURE( pCmp->GetPoint()->nContent.GetIdxReg()
                     == pCmp->GetCntntNode(), "Point im falschen Node" );
-        ASSERT( pCmp->GetMark()->nContent.GetIdxReg()
+        OSL_ENSURE( pCmp->GetMark()->nContent.GetIdxReg()
                     == pCmp->GetCntntNode(FALSE), "Mark im falschen Node" );
         BOOL bTst = *pCmp->GetPoint() == *pCmp->GetMark();
         (void) bTst;
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index af24cbf23349..6b45e1188245 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -102,7 +102,7 @@ SwTxtFmtColl* SwEditShell::MakeTxtFmtColl(const String& rFmtCollName,
         pParent = &GetTxtFmtColl(0);
     if (  (pColl=GetDoc()->MakeTxtFmtColl(rFmtCollName, pParent)) == 0 )
     {
-        ASSERT( FALSE, "MakeTxtFmtColl failed" )
+        OSL_ENSURE( FALSE, "MakeTxtFmtColl failed" );
     }
     return pColl;
 
diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx
index 69af0dfc54b9..e94760f9d321 100644
--- a/sw/source/core/edit/edfld.cxx
+++ b/sw/source/core/edit/edfld.cxx
@@ -267,7 +267,7 @@ void SwEditShell::Insert2(SwField& rFld, const bool bForceExpandHints)
 
     FOREACHPAM_START(this)                      // fuer jeden PaM
         bool bSuccess(GetDoc()->InsertPoolItem(*PCURCRSR, aFld, nInsertFlags));
-        ASSERT( bSuccess, "Doc->Insert(Field) failed");
+        OSL_ENSURE( bSuccess, "Doc->Insert(Field) failed");
         (void) bSuccess;
     FOREACHPAM_END()                      // fuer jeden PaM
 
@@ -376,11 +376,6 @@ void SwEditShell::UpdateFlds( SwField &rFld )
         SwTxtFld *pTxtFld;
         SwFmtFld *pFmtFld;
 
-//      if( pCrsr->GetNext() == pCrsr && !pCrsr->HasMark() &&
-//          ( 0 != ( pTxtFld = GetDocTxtFld( pCrsr->Start() ) ) ||
-//            0 != ( pTxtFld = lcl_FindInputFld( GetDoc(), rFld ) ) ) &&
-//          ( pFmtFld = (SwFmtFld*)&pTxtFld->GetFld())->GetFld()
-//              ->GetTyp()->Which() == rFld.GetTyp()->Which() )
         if ( pCrsr->GetNext() == pCrsr && !pCrsr->HasMark())
         {
             pTxtFld = GetDocTxtFld(pCrsr->Start());
@@ -553,16 +548,12 @@ BOOL SwEditShell::IsLabelDoc() const
 {
     return getIDocumentSettingAccess()->get(IDocumentSettingAccess::LABEL_DOCUMENT);
 }
-/* -----------------------------21.12.99 12:53--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwEditShell::ChangeAuthorityData(const SwAuthEntry* pNewData)
 {
     GetDoc()->ChangeAuthorityData(pNewData);
 }
-/* -----------------------------03.08.2001 12:04------------------------------
 
- ---------------------------------------------------------------------------*/
 BOOL SwEditShell::IsAnyDatabaseFieldInDoc()const
 {
     const SwFldTypes * pFldTypes = GetDoc()->GetFldTypes();
diff --git a/sw/source/core/edit/edfldexp.cxx b/sw/source/core/edit/edfldexp.cxx
index a16f84281154..01eb838957c8 100644
--- a/sw/source/core/edit/edfldexp.cxx
+++ b/sw/source/core/edit/edfldexp.cxx
@@ -45,9 +45,6 @@
 using namespace com::sun::star;
 using ::rtl::OUString;
 
-/* -----------------28.11.2002 17:53-----------------
- *
- * --------------------------------------------------*/
 BOOL SwEditShell::IsFieldDataSourceAvailable(String& rUsedDataSource) const
 {
     const SwFldTypes * pFldTypes = GetDoc()->GetFldTypes();
diff --git a/sw/source/core/edit/edglbldc.cxx b/sw/source/core/edit/edglbldc.cxx
index ccc764e6da14..15b1a45f072d 100644
--- a/sw/source/core/edit/edglbldc.cxx
+++ b/sw/source/core/edit/edglbldc.cxx
@@ -85,7 +85,7 @@ USHORT SwEditShell::GetGlobalDocContent( SwGlblDocContents& rArr ) const
             {
             case TOX_HEADER_SECTION:    break;      // ignore
             case TOX_CONTENT_SECTION:
-                ASSERT( pSect->ISA( SwTOXBaseSection ), "keine TOXBaseSection!" );
+                OSL_ENSURE( pSect->ISA( SwTOXBaseSection ), "keine TOXBaseSection!" );
                 pNew = new SwGlblDocContent( (SwTOXBaseSection*)pSect );
                 break;
 
diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx
index 054860f03f87..a35eb7848b39 100644
--- a/sw/source/core/edit/edglss.cxx
+++ b/sw/source/core/edit/edglss.cxx
@@ -182,7 +182,7 @@ USHORT SwEditShell::SaveGlossaryDoc( SwTextBlocks& rBlock,
 
 BOOL SwEditShell::_CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pSttNd )
 {
-    ASSERT( pInsDoc, "kein Ins.Dokument"  );
+    OSL_ENSURE( pInsDoc, "kein Ins.Dokument"  );
 
     SwNodes& rNds = pInsDoc->GetNodes();
 
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 0451b807b672..ed40a2465367 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -85,7 +85,7 @@ void SwEditShell::Insert( sal_Unicode c, BOOL bOnlyCurrCrsr )
     FOREACHPAM_START(this)
 
         const bool bSuccess = GetDoc()->InsertString(*PCURCRSR, c);
-        ASSERT( bSuccess, "Doc->Insert() failed." );
+        OSL_ENSURE( bSuccess, "Doc->Insert() failed." );
         (void) bSuccess;
 
         SaveTblBoxCntnt( PCURCRSR->GetPoint() );
@@ -119,7 +119,7 @@ void SwEditShell::Insert2(const String &rStr, const bool bForceExpandHints )
             //OPT: GetSystemCharSet
             const bool bSuccess =
                 GetDoc()->InsertString(*_pStartCrsr, rStr, nInsertFlags);
-            ASSERT( bSuccess, "Doc->Insert() failed." );
+            OSL_ENSURE( bSuccess, "Doc->Insert() failed." );
             (void) bSuccess;
 
             SaveTblBoxCntnt( _pStartCrsr->GetPoint() );
@@ -187,7 +187,7 @@ void SwEditShell::Overwrite(const String &rStr)
     FOREACHPAM_START(this)
         if( !GetDoc()->Overwrite(*PCURCRSR, rStr ) )
         {
-            ASSERT( FALSE, "Doc->Overwrite(Str) failed." )
+            OSL_ENSURE( FALSE, "Doc->Overwrite(Str) failed." );
         }
         SaveTblBoxCntnt( PCURCRSR->GetPoint() );
     FOREACHPAM_END()
@@ -221,9 +221,6 @@ long SwEditShell::SplitNode( BOOL bAutoFormat, BOOL bCheckTableStart )
     return(1L);
 }
 
-/*-- 11.05.2004 09:41:20---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 sal_Bool SwEditShell::AppendTxtNode()
 {
     sal_Bool bRet = sal_False;
@@ -281,8 +278,8 @@ const Graphic* SwEditShell::GetGraphic( BOOL bWait ) const
             if( pGrf->IsSwapOut() ||
                 ( pGrfNode->IsLinkedFile() && GRAPHIC_DEFAULT == pGrf->GetType() ) )
             {
-#ifdef DBG_UTIL
-                ASSERT( pGrfNode->SwapIn( bWait ) || !bWait, "Grafik konnte nicht geladen werden" );
+#if OSL_DEBUG_LEVEL > 1
+                OSL_ENSURE( pGrfNode->SwapIn( bWait ) || !bWait, "Grafik konnte nicht geladen werden" );
 #else
                 pGrfNode->SwapIn( bWait );
 #endif
@@ -292,8 +289,8 @@ const Graphic* SwEditShell::GetGraphic( BOOL bWait ) const
         {
             if ( pGrf->IsSwapOut() && !pGrfNode->IsLinkedFile() )
             {
-#ifdef DBG_UTIL
-                ASSERT( pGrfNode->SwapIn( bWait ) || !bWait, "Grafik konnte nicht geladen werden" );
+#if OSL_DEBUG_LEVEL > 1
+                OSL_ENSURE( pGrfNode->SwapIn( bWait ) || !bWait, "Grafik konnte nicht geladen werden" );
 #else
                 pGrfNode->SwapIn( bWait );
 #endif
@@ -374,7 +371,7 @@ void SwEditShell::ReRead( const String& rGrfName, const String& rFltName,
 void SwEditShell::GetGrfNms( String* pGrfName, String* pFltName,
                             const SwFlyFrmFmt* pFmt ) const
 {
-    ASSERT( pGrfName || pFltName, "was wird denn nun erfragt?" );
+    OSL_ENSURE( pGrfName || pFltName, "was wird denn nun erfragt?" );
     if( pFmt )
         GetDoc()->GetGrfNms( *pFmt, pGrfName, pFltName );
     else
@@ -386,30 +383,6 @@ void SwEditShell::GetGrfNms( String* pGrfName, String* pFltName,
 }
 
 
-// alternativen Text abfragen/setzen
-//const String& SwEditShell::GetAlternateText() const
-//{
-//    SwPaM* pCrsr = GetCrsr();
-//    const SwNoTxtNode* pNd;
-//    if( !pCrsr->HasMark() && 0 != ( pNd = pCrsr->GetNode()->GetNoTxtNode()) )
-//        return pNd->GetAlternateText();
-
-//    return aEmptyStr;
-//}
-
-
-//void SwEditShell::SetAlternateText( const String& rTxt )
-//{
-//    SwPaM* pCrsr = GetCrsr();
-//    SwNoTxtNode* pNd;
-//    if( !pCrsr->HasMark() && 0 != ( pNd = pCrsr->GetNode()->GetNoTxtNode()) )
-//    {
-//        pNd->SetAlternateText( rTxt, sal_True );
-//        GetDoc()->SetModified();
-//    }
-//}
-
-
 const PolyPolygon *SwEditShell::GetGraphicPolygon() const
 {
     SwNoTxtNode *pNd = GetCrsr()->GetNode()->GetNoTxtNode();
@@ -433,7 +406,7 @@ void SwEditShell::SetGraphicPolygon( const PolyPolygon *pPoly )
 void SwEditShell::ClearAutomaticContour()
 {
     SwNoTxtNode *pNd = GetCrsr()->GetNode()->GetNoTxtNode();
-    ASSERT( pNd, "is no NoTxtNode!" );
+    OSL_ENSURE( pNd, "is no NoTxtNode!" );
     if( pNd->HasAutomaticContour() )
     {
         StartAllAction();
@@ -457,14 +430,14 @@ void SwEditShell::ClearAutomaticContour()
 
 svt::EmbeddedObjectRef& SwEditShell::GetOLEObject() const
 {
-    ASSERT(  CNT_OLE == GetCntType(), "GetOLEObj: kein OLENode." );
-    ASSERT( !GetCrsr()->HasMark() ||
+    OSL_ENSURE(  CNT_OLE == GetCntType(), "GetOLEObj: kein OLENode." );
+    OSL_ENSURE( !GetCrsr()->HasMark() ||
             (GetCrsr()->HasMark() &&
                 GetCrsr()->GetPoint()->nNode == GetCrsr()->GetMark()->nNode),
             "GetOLEObj: kein OLENode." );
 
     SwOLENode *pOLENode = GetCrsr()->GetNode()->GetOLENode();
-    ASSERT( pOLENode, "GetOLEObj: kein OLENode." );
+    OSL_ENSURE( pOLENode, "GetOLEObj: kein OLENode." );
     SwOLEObj& rOObj = pOLENode->GetOLEObj();
     return rOObj.GetObject();
 }
@@ -492,7 +465,7 @@ BOOL SwEditShell::HasOLEObj( const String &rName ) const
 void SwEditShell::SetChartName( const String &rName )
 {
     SwOLENode *pONd = GetCrsr()->GetNode()->GetOLENode();
-    ASSERT( pONd, "ChartNode not found" );
+    OSL_ENSURE( pONd, "ChartNode not found" );
     pONd->SetChartTblName( rName );
 }
 
@@ -613,7 +586,7 @@ void SwEditShell::ReplaceDropTxt( const String &rStr )
         SwPaM aPam( rNd, rStr.Len(), rNd, 0 );
         if( !GetDoc()->Overwrite( aPam, rStr ) )
         {
-            ASSERT( FALSE, "Doc->Overwrite(Str) failed." );
+            OSL_ENSURE( FALSE, "Doc->Overwrite(Str) failed." );
         }
 
         EndAllAction();
@@ -724,8 +697,8 @@ Graphic SwEditShell::GetIMapGraphic() const
             if( rGrf.IsSwapOut() || ( ((SwGrfNode*)pNd)->IsLinkedFile() &&
                                     GRAPHIC_DEFAULT == rGrf.GetType() ) )
             {
-#ifdef DBG_UTIL
-                ASSERT( ((SwGrfNode*)pNd)->SwapIn( TRUE ) || !TRUE, "Grafik konnte nicht geladen werden" );
+#if OSL_DEBUG_LEVEL > 1
+                OSL_ENSURE( ((SwGrfNode*)pNd)->SwapIn( TRUE ) || !TRUE, "Grafik konnte nicht geladen werden" );
 #else
                 ((SwGrfNode*)pNd)->SwapIn( TRUE );
 #endif
@@ -986,16 +959,16 @@ USHORT SwEditShell::GetLineCount( BOOL bActPos )
                 SwFrm* pFrm = pCntFrm;
                 while( pFrm && !(pFrm->GetType() & nTyp) )
                     pFrm = pFrm->GetUpper();
-                ASSERT( pFrm, "Wo bin ich?" );
+                OSL_ENSURE( pFrm, "Wo bin ich?" );
                 if( pFrm && ( pFrm->GetType() & FRM_FOOTER ) )
                     pTmp = pCNd->FindFooterStartNode();
                 else
                     pTmp = pCNd->FindHeaderStartNode();
             }
-            ASSERT( pTmp, "Missing StartNode" );
+            OSL_ENSURE( pTmp, "Missing StartNode" );
             aStart  = *pTmp;
         }
-        ASSERT( pCNd && pCntFrm, "Missing Layout-Information" );
+        OSL_ENSURE( pCNd && pCntFrm, "Missing Layout-Information" );
     }
 
     while( 0 != ( pCNd = GetDoc()->GetNodes().GoNextSection(
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index f5b637898431..e7d43c1a5d96 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -216,7 +216,7 @@ const SwTxtNode *pLinguNode;
 SwLinguIter::SwLinguIter()
     : pSh( 0 ), pStart( 0 ), pEnd( 0 ), pCurr( 0 ), pCurrX( 0 )
 {
-    // @@@ es fehlt: Sicherstellen der Reentrance, ASSERTs etc.
+    // @@@ es fehlt: Sicherstellen der Reentrance, OSL_ENSURE( etc.
 }
 
 /*************************************************************************
@@ -238,12 +238,10 @@ void SwLinguIter::_Start( SwEditShell *pShell, SwDocPositions eStart,
 
     SET_CURR_SHELL( pSh );
 
-    ASSERT( !pEnd, "LinguStart ohne End?");
+    OSL_ENSURE( !pEnd, "LinguStart ohne End?");
 
     SwPaM *pCrsr = pSh->GetCrsr();
 
-    // pStk->SetCurCrsr();
-//  if( pCrsr->HasMark() || pCrsr != pCrsr->GetNext() )
     if( pShell->HasSelection() || pCrsr != pCrsr->GetNext() )
     {
         bSetCurr = 0 != GetCurr();
@@ -299,7 +297,7 @@ void SwLinguIter::_End(bool bRestoreSelection)
     if( !pSh )
         return;
 
-    ASSERT( pEnd, "SwEditShell::SpellEnd() ohne Start?");
+    OSL_ENSURE( pEnd, "SwEditShell::SpellEnd() ohne Start?");
     if(bRestoreSelection)
     {
         while( nCrsrCnt-- )
@@ -358,9 +356,7 @@ uno::Any SwSpellIter::Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt )
     if( !pMySh )
         return aSpellRet;
 
-//  const SwPosition *pEnd = GetEnd();
-
-    ASSERT( GetEnd(), "SwEditShell::SpellContinue() ohne Start?");
+    OSL_ENSURE( GetEnd(), "SwEditShell::SpellContinue() ohne Start?");
 
     uno::Reference< uno::XInterface >  xSpellRet;
     sal_Bool bGoOn = sal_True;
@@ -434,9 +430,7 @@ uno::Any SwConvIter::Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt )
     if( !pMySh )
         return aConvRet;
 
-//  const SwPosition *pEnd = GetEnd();
-
-    ASSERT( GetEnd(), "SwConvIter::Continue() ohne Start?");
+    OSL_ENSURE( GetEnd(), "SwConvIter::Continue() ohne Start?");
 
     rtl::OUString aConvText;
     sal_Bool bGoOn = sal_True;
@@ -523,7 +517,7 @@ void SwHyphIter::Start( SwEditShell *pShell, SwDocPositions eStart, SwDocPositio
     // robust
     if( GetSh() || GetEnd() )
     {
-        ASSERT( !GetSh(), "+SwEditShell::HyphStart: missing HyphEnd()" );
+        OSL_ENSURE( !GetSh(), "+SwEditShell::HyphStart: missing HyphEnd()" );
         return;
     }
 
@@ -567,7 +561,7 @@ uno::Any SwHyphIter::Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt )
     do {
         SwPaM *pCrsr;
         do {
-            ASSERT( GetEnd(), "SwEditShell::SpellContinue() ohne Start?" );
+            OSL_ENSURE( GetEnd(), "SwEditShell::SpellContinue() ohne Start?" );
             pCrsr = pMySh->GetCrsr();
             if ( !pCrsr->HasMark() )
                 pCrsr->SetMark();
@@ -653,7 +647,7 @@ void SwHyphIter::DelSoftHyph( SwPaM &rPam )
 void SwHyphIter::InsertSoftHyph( const xub_StrLen nHyphPos )
 {
     SwEditShell *pMySh = GetSh();
-    ASSERT( pMySh,  "+SwEditShell::InsertSoftHyph: missing HyphStart()");
+    OSL_ENSURE( pMySh,  "+SwEditShell::InsertSoftHyph: missing HyphStart()");
     if( !pMySh )
         return;
 
@@ -666,9 +660,9 @@ void SwHyphIter::InsertSoftHyph( const xub_StrLen nHyphPos )
 
     if( pSttPos->nNode != pEndPos->nNode || !nLastHyphLen )
     {
-        ASSERT( pSttPos->nNode == pEndPos->nNode,
+        OSL_ENSURE( pSttPos->nNode == pEndPos->nNode,
                 "+SwEditShell::InsertSoftHyph: node warp during hyphenation" );
-        ASSERT(nLastHyphLen, "+SwEditShell::InsertSoftHyph: missing HyphContinue()");
+        OSL_ENSURE(nLastHyphLen, "+SwEditShell::InsertSoftHyph: missing HyphContinue()");
         *pSttPos = *pEndPos;
         return;
     }
@@ -753,14 +747,14 @@ void SwEditShell::SpellStart(
     // do not spell if interactive spelling is active elsewhere
     if (!pConvArgs && !pSpellIter)
     {
-        ASSERT( !pSpellIter, "wer ist da schon am spellen?" );
+        OSL_ENSURE( !pSpellIter, "wer ist da schon am spellen?" );
         pSpellIter = new SwSpellIter;
         pLinguIter = pSpellIter;
     }
     // do not do text conversion if it is active elsewhere
     if (pConvArgs && !pConvIter)
     {
-        ASSERT( !pConvIter, "text conversion already active!" );
+        OSL_ENSURE( !pConvIter, "text conversion already active!" );
         pConvIter = new SwConvIter( *pConvArgs );
         pLinguIter = pConvIter;
     }
@@ -791,13 +785,13 @@ void SwEditShell::SpellEnd( SwConversionArgs *pConvArgs, bool bRestoreSelection
 {
     if (!pConvArgs && pSpellIter && pSpellIter->GetSh() == this)
     {
-        ASSERT( pSpellIter, "wo ist mein Iterator?" );
+        OSL_ENSURE( pSpellIter, "wo ist mein Iterator?" );
         pSpellIter->_End(bRestoreSelection);
         delete pSpellIter, pSpellIter = 0;
     }
     if (pConvArgs && pConvIter && pConvIter->GetSh() == this)
     {
-        ASSERT( pConvIter, "wo ist mein Iterator?" );
+        OSL_ENSURE( pConvIter, "wo ist mein Iterator?" );
         pConvIter->_End();
         delete pConvIter, pConvIter = 0;
     }
@@ -828,8 +822,8 @@ uno::Any SwEditShell::SpellContinue(
             ::StartProgress( STR_STATSTR_SPELL, 0, nEndPage, GetDoc()->GetDocShell() );
     }
 
-    ASSERT(  pConvArgs || pSpellIter, "SpellIter missing" );
-    ASSERT( !pConvArgs || pConvIter,  "ConvIter missing" );
+    OSL_ENSURE(  pConvArgs || pSpellIter, "SpellIter missing" );
+    OSL_ENSURE( !pConvArgs || pConvIter,  "ConvIter missing" );
     //JP 18.07.95: verhinder bei Fehlermeldungen die Anzeige der Selektionen
     //              KEIN StartAction, da damit auch die Paints abgeschaltet
     //              werden !!!!!
@@ -894,7 +888,7 @@ void SwEditShell::HyphStart( SwDocPositions eStart, SwDocPositions eEnd )
     // do not hyphenate if interactive hyphenationg is active elsewhere
     if (!pHyphIter)
     {
-        ASSERT( !pHyphIter, "wer ist da schon am hyphinieren?" );
+        OSL_ENSURE( !pHyphIter, "wer ist da schon am hyphinieren?" );
         pHyphIter = new SwHyphIter;
         pHyphIter->Start( this, eStart, eEnd );
     }
@@ -912,7 +906,7 @@ void SwEditShell::HyphEnd()
 {
     if (pHyphIter->GetSh() == this)
     {
-        ASSERT( pHyphIter, "wo ist mein Iterator?" );
+        OSL_ENSURE( pHyphIter, "wo ist mein Iterator?" );
         pHyphIter->End();
         delete pHyphIter, pHyphIter = 0;
     }
@@ -946,7 +940,7 @@ uno::Reference< uno::XInterface >
             *pPageSt = 1;   // das StatLineStartPercent
     }
 
-    ASSERT( pHyphIter, "wo ist mein Iterator?" );
+    OSL_ENSURE( pHyphIter, "wo ist mein Iterator?" );
     //JP 18.07.95: verhinder bei Fehlermeldungen die Anzeige der Selektionen
     //              KEIN StartAction, da damit auch die Paints abgeschaltet
     //              werden !!!!!
@@ -972,7 +966,7 @@ uno::Reference< uno::XInterface >
 
 void SwEditShell::InsertSoftHyph( const xub_StrLen nHyphPos )
 {
-    ASSERT( pHyphIter, "wo ist mein Iterator?" );
+    OSL_ENSURE( pHyphIter, "wo ist mein Iterator?" );
     pHyphIter->InsertSoftHyph( nHyphPos );
 }
 
@@ -985,7 +979,7 @@ void SwEditShell::InsertSoftHyph( const xub_StrLen nHyphPos )
 
 void SwEditShell::HyphIgnore()
 {
-    ASSERT( pHyphIter, "wo ist mein Iterator?" );
+    OSL_ENSURE( pHyphIter, "wo ist mein Iterator?" );
     //JP 18.07.95: verhinder bei Fehlermeldungen die Anzeige der Selektionen
     //              KEIN StartAction, da damit auch die Paints abgeschaltet
     //              werden !!!!!
@@ -1166,12 +1160,6 @@ bool SwEditShell::GetGrammarCorrection(
                 sal_Int32 nEndOfSentence = ModelToViewHelper::ConvertToViewPosition( pConversionMap, pWrong->getSentenceEnd( nBegin ) );
                 if( nEndOfSentence == STRING_LEN )
                 {
-/*                    if( nStartOfSentence == 0 )
-                    {
-                        nStartOfSentence = -1;
-                        nEndOfSentence = -1;
-                    }
-                    else */
                         nEndOfSentence = aExpandText.getLength();
                 }
 
@@ -1206,10 +1194,6 @@ bool SwEditShell::GetGrammarCorrection(
                 xub_StrLen nLineEnd = GetCrsr()->GetPoint()->nContent.GetIndex();
                 Pop(FALSE);
 
-#if OSL_DEBUG_LEVEL > 1
-//                pNode->GetGrammarCheck()->Invalidate( 0, STRING_LEN );
-//                pNode->SetGrammarCheckDirty( true );
-#endif
                 // make sure the selection build later from the
                 // data below does not include footnotes and other
                 // "in word" character to the left and right in order
@@ -1256,12 +1240,9 @@ bool SwEditShell::GetGrammarCorrection(
     return bRes;
 }
 
-/*-- 18.09.2003 15:08:18---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 bool SwEditShell::SpellSentence(::svx::SpellPortions& rPortions, bool bIsGrammarCheck)
 {
-    ASSERT(  pSpellIter, "SpellIter missing" );
+    OSL_ENSURE(  pSpellIter, "SpellIter missing" );
     if(!pSpellIter)
         return false;
     bool bRet = pSpellIter->SpellSentence(rPortions, bIsGrammarCheck);
@@ -1277,14 +1258,12 @@ bool SwEditShell::SpellSentence(::svx::SpellPortions& rPortions, bool bIsGrammar
   -----------------------------------------------------------------------*/
 void SwEditShell::PutSpellingToSentenceStart()
 {
-    ASSERT(  pSpellIter, "SpellIter missing" );
+    OSL_ENSURE(  pSpellIter, "SpellIter missing" );
     if(!pSpellIter)
         return;
     pSpellIter->ToSentenceStart();
 }
-/*-- 02.02.2005 14:34:41---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_uInt32 lcl_CountRedlines(
                             const ::svx::SpellPortions& rLastPortions)
 {
@@ -1297,9 +1276,6 @@ sal_uInt32 lcl_CountRedlines(
     }
     return nRet;
 }
-/*-- 18.09.2003 15:08:20---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 
 void SwEditShell::MoveContinuationPosToEndOfCheckedSentence()
 {
@@ -1318,15 +1294,15 @@ void SwEditShell::ApplyChangedSentence(const ::svx::SpellPortions& rNewPortions,
     // Note: rNewPortions.size() == 0 is valid and happens when the whole
     // sentence got removed in the dialog
 
-    ASSERT(  pSpellIter, "SpellIter missing" );
+    OSL_ENSURE(  pSpellIter, "SpellIter missing" );
     if(pSpellIter &&
        pSpellIter->GetLastPortions().size() > 0)    // no portions -> no text to be changed
     {
         const SpellPortions& rLastPortions = pSpellIter->GetLastPortions();
         const SpellContentPositions  rLastPositions = pSpellIter->GetLastPositions();
-        ASSERT(rLastPortions.size() > 0 &&
+        OSL_ENSURE(rLastPortions.size() > 0 &&
                 rLastPortions.size() == rLastPositions.size(),
-                "last vectors of spelling results are not set or not equal")
+                "last vectors of spelling results are not set or not equal");
 
         // iterate over the new portions, beginning at the end to take advantage of the previously
         // saved content positions
@@ -1521,9 +1497,7 @@ void lcl_CutRedlines( SpellContentPositions& aDeletedRedlines, SwEditShell* pSh
         }
     }
 }
-/*-- 02.02.2005 11:43:00---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SpellContentPosition  lcl_FindNextDeletedRedline(
         const SpellContentPositions& rDeletedRedlines,
         xub_StrLen nSearchFrom )
@@ -1543,9 +1517,7 @@ SpellContentPosition  lcl_FindNextDeletedRedline(
     }
     return aRet;
 }
-/*-- 18.09.2003 15:08:20---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 bool SwSpellIter::SpellSentence(::svx::SpellPortions& rPortions, bool bIsGrammarCheck)
 {
     bool bRet = false;
@@ -1556,7 +1528,7 @@ bool SwSpellIter::SpellSentence(::svx::SpellPortions& rPortions, bool bIsGrammar
     if( !pMySh )
         return false;
 
-    ASSERT( GetEnd(), "SwEditShell::SpellSentence() ohne Start?");
+    OSL_ENSURE( GetEnd(), "SwEditShell::SpellSentence() ohne Start?");
 
     uno::Reference< XSpellAlternatives >  xSpellRet;
     linguistic2::ProofreadingResult aGrammarResult;
@@ -1748,16 +1720,11 @@ bool SwSpellIter::SpellSentence(::svx::SpellPortions& rPortions, bool bIsGrammar
     return bRet;
 }
 
-/*-- 08.09.2008 09:37:15---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 void SwSpellIter::ToSentenceStart()
 {
     bBackToStartOfSentence = true;
 }
-/*-- 08.10.2003 08:49:56---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 LanguageType lcl_GetLanguage(SwEditShell& rSh)
 {
     USHORT nScriptType = rSh.GetScriptType();
@@ -1822,9 +1789,7 @@ void SwSpellIter::CreatePortion(uno::Reference< XSpellAlternatives > xAlt,
         aLastPositions.push_back(aPosition);
     }
 }
-/*-- 19.09.2003 13:05:43---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void    SwSpellIter::AddPortion(uno::Reference< XSpellAlternatives > xAlt,
                                 linguistic2::ProofreadingResult* pGrammarResult,
                                 const SpellContentPositions& rDeletedRedlines)
@@ -1943,9 +1908,7 @@ void    SwSpellIter::AddPortion(uno::Reference< XSpellAlternatives > xAlt,
         }
     }
 }
-/*-- 07.08.2008 15:01:25---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwEditShell::IgnoreGrammarErrorAt( SwPaM& rErrorPosition )
 {
     SwTxtNode *pNode;
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index 6ae13009ba74..a30f01d29b8f 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -341,13 +341,9 @@ void SwEditShell::SetIndent(short nIndent, const SwPosition & rPos)
         SwTxtNode * pTxtNode = aPaM.GetNode()->GetTxtNode();
 
         // --> OD 2008-06-09 #i90078#
-//        int nLevel = -1;
-//        int nReferenceLevel = pTxtNode->GetActualListLevel();
-//        if (! IsFirstOfNumRule(aPaM))
-//            nLevel = nReferenceLevel;
 
         SwNumRule aRule(*pCurNumRule);
-//        aRule.ChangeIndent(nIndent, nLevel, nReferenceLevel, FALSE);
+
         if ( IsFirstOfNumRule() )
         {
             aRule.SetIndentOfFirstListLevelAndChangeOthers( nIndent );
@@ -559,15 +555,11 @@ BOOL SwEditShell::IsProtectedOutlinePara() const
         {
             SwNodePtr pTmpNd = rOutlNd[ nPos ];
 
-            // --> OD 2008-04-02 #refactorlists#
-//            BYTE nTmpLvl = GetRealLevel( pTmpNd->GetTxtNode()->
-//                                    GetTxtColl()->GetOutlineLevel() );
- //           int nTmpLvl = pTmpNd->GetTxtNode()->GetOutlineLevel();//#outline level,zhaojianwei
             int nTmpLvl = pTmpNd->GetTxtNode()->GetAttrOutlineLevel();
- //           ASSERT( nTmpLvl >= 0 && nTmpLvl < MAXLEVEL,
-            ASSERT( nTmpLvl >= 0 && nTmpLvl <= MAXLEVEL,            //<-end,zhaojianwei
+
+            OSL_ENSURE( nTmpLvl >= 0 && nTmpLvl <= MAXLEVEL,
                     "<SwEditShell::IsProtectedOutlinePara()>" );
-            // <--
+
             if( bFirst )
             {
                 nLvl = nTmpLvl;
@@ -583,10 +575,10 @@ BOOL SwEditShell::IsProtectedOutlinePara() const
             }
         }
     }
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     else
     {
-        ASSERT(!this, "Cursor not on an outline node" );
+        OSL_ENSURE(!this, "Cursor not on an outline node" );
     }
 #endif
     return bRet;
@@ -658,14 +650,13 @@ BOOL SwEditShell::IsNoNum( BOOL bChkStart ) const
 BYTE SwEditShell::GetNumLevel() const
 {
     // gebe die akt. Ebene zurueck, auf der sich der Point vom Cursor befindet
-    //BYTE nLevel = NO_NUMBERING;   //#outline level,zhaojianwei
     BYTE nLevel = MAXLEVEL;     //end,zhaojianwei
 
     SwPaM* pCrsr = GetCrsr();
     const SwTxtNode* pTxtNd = pCrsr->GetNode()->GetTxtNode();
 
     // --> FME 2005-09-12 #124972# Made code robust:
-    ASSERT( pTxtNd, "GetNumLevel() without text node" )
+    OSL_ENSURE( pTxtNd, "GetNumLevel() without text node" );
     if ( !pTxtNd )
         return nLevel;
     // <--
@@ -819,9 +810,6 @@ USHORT SwEditShell::GetNodeNumStart() const
     // <--
 }
 
-/*-- 26.08.2005 14:47:17---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 // --> OD 2008-03-18 #refactorlists#
 const SwNumRule * SwEditShell::SearchNumRule( const bool bForward,
                                               const bool bNum,
diff --git a/sw/source/core/edit/edsect.cxx b/sw/source/core/edit/edsect.cxx
index 3a80c7075be0..4e92b31d3097 100644
--- a/sw/source/core/edit/edsect.cxx
+++ b/sw/source/core/edit/edsect.cxx
@@ -115,11 +115,11 @@ const SwSection* SwEditShell::GetAnySection( BOOL bOutOfTab, const Point* pPt )
     if( pFrm && pFrm->IsInSct() )
     {
         SwSectionFrm* pSect = pFrm->FindSctFrm();
-        ASSERT( pSect, "GetAnySection: Where's my Sect?" );
+        OSL_ENSURE( pSect, "GetAnySection: Where's my Sect?" );
         if( pSect->IsInFtn() && pSect->GetUpper()->IsInSct() )
         {
             pSect = pSect->GetUpper()->FindSctFrm();
-            ASSERT( pSect, "GetAnySection: Where's my SectFrm?" );
+            OSL_ENSURE( pSect, "GetAnySection: Where's my SectFrm?" );
         }
         return pSect->GetSection();
     }
@@ -144,8 +144,8 @@ BOOL SwEditShell::IsAnySectionInDoc( BOOL bChkReadOnly, BOOL bChkHidden, BOOL bC
         const SwSectionFmt* pFmt = rFmts[ n ];
         if( pFmt->IsInNodesArr() &&
             (bChkTOX  ||
-                (eTmpType = pFmt->GetSection()->GetType()) != TOX_CONTENT_SECTION
-                && TOX_HEADER_SECTION != eTmpType ))
+                ((eTmpType = pFmt->GetSection()->GetType()) != TOX_CONTENT_SECTION
+                && TOX_HEADER_SECTION != eTmpType )))
         {
             const SwSection& rSect = *rFmts[ n ]->GetSection();
             if( (!bChkReadOnly && !bChkHidden ) ||
@@ -401,9 +401,7 @@ const SwNode* lcl_SpecialInsertNode(const SwPosition* pCurrentPos)
             pReturn = pInnermostNode->EndOfSectionNode();
         else if ( bStart )
             pReturn = pInnermostNode;
-        // else pReturn = NULL;
     }
-    // else: pReturn = NULL
 
 
     DBG_ASSERT( ( pReturn == NULL ) || pReturn->IsStartNode() ||
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index e24254102014..dcbe73d83d22 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -113,40 +113,30 @@ USHORT SwEditShell::GetCurTOXMarks(SwTOXMarks& rMarks) const
     return GetDoc()->GetCurTOXMark( *GetCrsr()->Start(), rMarks );
 }
 
-/* -----------------01.09.99 16:05-------------------
-
- --------------------------------------------------*/
 BOOL SwEditShell::IsTOXBaseReadonly(const SwTOXBase& rTOXBase) const
 {
-    ASSERT( rTOXBase.ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
+    OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
     const SwTOXBaseSection& rTOXSect = (const SwTOXBaseSection&)rTOXBase;
     return  rTOXSect.IsProtect();
 }
-/* -----------------18.10.99 15:53-------------------
 
- --------------------------------------------------*/
 void SwEditShell::SetTOXBaseReadonly(const SwTOXBase& rTOXBase, BOOL bReadonly)
 {
-    ASSERT( rTOXBase.ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
+    OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
     const SwTOXBaseSection& rTOXSect = (const SwTOXBaseSection&)rTOXBase;
     ((SwTOXBase&)rTOXBase).SetProtected(bReadonly);
-    ASSERT( rTOXSect.SwSection::GetType() == TOX_CONTENT_SECTION, "not a TOXContentSection" );
+    OSL_ENSURE( rTOXSect.SwSection::GetType() == TOX_CONTENT_SECTION, "not a TOXContentSection" );
 
     SwSectionData aSectionData(rTOXSect);
     aSectionData.SetProtectFlag(bReadonly);
     UpdateSection( GetSectionFmtPos( *rTOXSect.GetFmt()  ), aSectionData, 0 );
 }
 
-/* -----------------02.09.99 07:47-------------------
-
- --------------------------------------------------*/
 const SwTOXBase*    SwEditShell::GetDefaultTOXBase( TOXTypes eTyp, BOOL bCreate )
 {
     return GetDoc()->GetDefaultTOXBase( eTyp, bCreate );
 }
-/* -----------------02.09.99 08:05-------------------
 
- --------------------------------------------------*/
 void    SwEditShell::SetDefaultTOXBase(const SwTOXBase& rBase)
 {
     GetDoc()->SetDefaultTOXBase(rBase);
@@ -168,7 +158,7 @@ void SwEditShell::InsertTableOf( const SwTOXBase& rTOX, const SfxItemSet* pSet )
     // Einfuegen des Verzeichnisses
     const SwTOXBaseSection* pTOX = pDoc->InsertTableOf(
                                         *GetCrsr()->GetPoint(), rTOX, pSet, TRUE );
-    ASSERT(pTOX, "Kein aktuelles Verzeichnis");
+    OSL_ENSURE(pTOX, "Kein aktuelles Verzeichnis");
 
     // Formatierung anstossen
     CalcLayout();
@@ -192,9 +182,9 @@ BOOL SwEditShell::UpdateTableOf( const SwTOXBase& rTOX, const SfxItemSet* pSet )
 {
     BOOL bRet = FALSE;
 
-    ASSERT( rTOX.ISA( SwTOXBaseSection ),  "keine TOXBaseSection!" );
+    OSL_ENSURE( rTOX.ISA( SwTOXBaseSection ),  "keine TOXBaseSection!" );
     SwTOXBaseSection* pTOX = (SwTOXBaseSection*)&rTOX;
-    ASSERT(pTOX, "Keine aktuelles Verzeichnis");
+    OSL_ENSURE(pTOX, "Keine aktuelles Verzeichnis");
     const SwSectionNode* pSectNd;
     if( pTOX && 0 != ( pSectNd = pTOX->GetFmt()->GetSectionNode() ) )
     {
@@ -290,7 +280,7 @@ const SwTOXBase* SwEditShell::GetTOX( USHORT nPos ) const
             pSect->GetFmt()->GetSectionNode() &&
             nCnt++ == nPos )
         {
-            ASSERT( pSect->ISA( SwTOXBaseSection ), "keine TOXBaseSection!" );
+            OSL_ENSURE( pSect->ISA( SwTOXBaseSection ), "keine TOXBaseSection!" );
             return (SwTOXBaseSection*)pSect;
         }
     }
@@ -310,23 +300,16 @@ BOOL SwEditShell::IsUpdateTOX() const
     return GetDoc()->IsUpdateTOX();
 }
 
-/* -----------------26.08.99 13:49-------------------
-
- --------------------------------------------------*/
 const String&   SwEditShell::GetTOIAutoMarkURL() const
 {
     return GetDoc()->GetTOIAutoMarkURL();
 }
-/* -----------------26.08.99 13:49-------------------
 
- --------------------------------------------------*/
 void SwEditShell::SetTOIAutoMarkURL(const String& rSet)
 {
     GetDoc()->SetTOIAutoMarkURL(rSet);
 }
-/* -----------------26.08.99 09:29-------------------
 
- --------------------------------------------------*/
 void SwEditShell::ApplyAutoMark()
 {
     StartAllAction();
@@ -362,8 +345,6 @@ void SwEditShell::ApplyAutoMark()
         //
         // SearchOptions to be used in loop below
         //
-        //SearchAlgorithms eSrchType    = SearchAlgorithms_ABSOLUTE;
-        //OUString aSrchStr = rText;
         BOOL bCaseSensitive = TRUE;
         BOOL bWordOnly      = FALSE;
         BOOL bSrchInSel     = FALSE;
@@ -424,13 +405,11 @@ void SwEditShell::ApplyAutoMark()
                     //
                     if (!bCaseSensitive)
                     {
-                        //nSrchFlags |= SearchFlags::ALL_IGNORE_CASE;
                         aSearchOpt.transliterateFlags |=
                                      TransliterationModules_IGNORE_CASE;
                     }
                     else
                     {
-                        //aSearchOpt.searchFlag &= ~SearchFlags::ALL_IGNORE_CASE;
                         aSearchOpt.transliterateFlags &=
                                     ~TransliterationModules_IGNORE_CASE;
                     }
diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx
index a84af1d6485a..1e6f3ae4a5a8 100644
--- a/sw/source/core/edit/edundo.cxx
+++ b/sw/source/core/edit/edundo.cxx
@@ -261,8 +261,8 @@ void SwEditShell::SetUndoActionCount( USHORT nNew )
 void lcl_SelectSdrMarkList( SwEditShell* pShell,
                             const SdrMarkList* pSdrMarkList )
 {
-    ASSERT( pShell != NULL, "need shell!" );
-    ASSERT( pSdrMarkList != NULL, "need mark list" );
+    OSL_ENSURE( pShell != NULL, "need shell!" );
+    OSL_ENSURE( pSdrMarkList != NULL, "need mark list" );
 
     if( pShell->ISA( SwFEShell ) )
     {
@@ -275,7 +275,7 @@ void lcl_SelectSdrMarkList( SwEditShell* pShell,
         // the old implementation would always unselect
         // objects, even if no new ones were selected. If this
         // is a problem, we need to re-work this a little.
-        ASSERT( pSdrMarkList->GetMarkCount() != 0, "empty mark list" );
+        OSL_ENSURE( pSdrMarkList->GetMarkCount() != 0, "empty mark list" );
     }
 }
 
diff --git a/sw/source/core/edit/edws.cxx b/sw/source/core/edit/edws.cxx
index 834ad0d9676a..f50ed630642b 100644
--- a/sw/source/core/edit/edws.cxx
+++ b/sw/source/core/edit/edws.cxx
@@ -177,7 +177,7 @@ sal_uInt16 SwEditShell::GetCntType() const
         case ND_OLENODE:    nRet = CNT_OLE; break;
         }
 
-    ASSERT( nRet, ERR_OUTOFSCOPE );
+    ASSERT_ID( nRet, ERR_OUTOFSCOPE );
     return nRet;
 }
 
diff --git a/sw/source/core/edit/makefile.mk b/sw/source/core/edit/makefile.mk
index a7820b405842..355d667b823c 100644
--- a/sw/source/core/edit/makefile.mk
+++ b/sw/source/core/edit/makefile.mk
@@ -41,29 +41,29 @@ AUTOSEG=true
 # --- Files --------------------------------------------------------
 
 EXCEPTIONSFILES=\
-        $(SLO)$/eddel.obj \
-        $(SLO)$/edlingu.obj \
-        $(SLO)$/edfldexp.obj \
-        $(SLO)$/edtab.obj
-
-SLOFILES =	\
-        $(EXCEPTIONSFILES)\
         $(SLO)$/acorrect.obj \
         $(SLO)$/autofmt.obj \
         $(SLO)$/edatmisc.obj \
         $(SLO)$/edattr.obj \
+        $(SLO)$/eddel.obj \
         $(SLO)$/edfcol.obj \
         $(SLO)$/edfld.obj \
+        $(SLO)$/edfldexp.obj \
         $(SLO)$/edfmt.obj \
         $(SLO)$/edglbldc.obj \
         $(SLO)$/edglss.obj \
         $(SLO)$/editsh.obj \
+        $(SLO)$/edlingu.obj \
         $(SLO)$/ednumber.obj \
         $(SLO)$/edredln.obj \
+        $(SLO)$/edsect.obj \
+        $(SLO)$/edtab.obj \
         $(SLO)$/edtox.obj \
         $(SLO)$/edundo.obj \
-        $(SLO)$/edws.obj \
-        $(SLO)$/edsect.obj
+        $(SLO)$/edws.obj
+
+SLOFILES =	\
+        $(EXCEPTIONSFILES)
 
 # --- Targets -------------------------------------------------------
 
diff --git a/sw/source/core/except/dbgloop.cxx b/sw/source/core/except/dbgloop.cxx
index a46ce89585d0..4bc9d568701b 100644
--- a/sw/source/core/except/dbgloop.cxx
+++ b/sw/source/core/except/dbgloop.cxx
@@ -29,8 +29,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-#ifndef DBG_UTIL
-#error Wer fummelt denn an den makefiles rum?
+#if !defined(OSL_DEBUG_LEVEL) || OSL_DEBUG_LEVEL == 0
+#error Who broke the makefiles?
 #endif
 #include <tools/stream.hxx>
 #include "dbgloop.hxx"
@@ -73,7 +73,7 @@ void DbgLoopStack::Push( const void *pThis )
     if( DBG_MAX_STACK > nPtr )
     {
         // Wenn eine loop entdeckt wird, wird der counter wieder zurueckgesetzt.
-        ASSERT( DBG_MAX_LOOP > aCount[nPtr], "DbgLoopStack::Push: loop detected" );
+        OSL_ENSURE( DBG_MAX_LOOP > aCount[nPtr], "DbgLoopStack::Push: loop detected" );
         if( DBG_MAX_LOOP > aCount[nPtr] )
             ++(aCount[nPtr]);
         else
@@ -89,9 +89,9 @@ void DbgLoopStack::Pop()
 {
     if( DBG_MAX_STACK > nPtr )
     {
-        ASSERT( nPtr, "DbgLoopStack::Pop: can't pop the stack" );
+        OSL_ENSURE( nPtr, "DbgLoopStack::Pop: can't pop the stack" );
 
-        ASSERT( aCount[nPtr], "DbgLoopStack::Pop: can't dec the count" );
+        OSL_ENSURE( aCount[nPtr], "DbgLoopStack::Pop: can't dec the count" );
         if( DBG_MAX_STACK > nPtr + 1 )
             aCount[nPtr + 1] = 0;
     }
diff --git a/sw/source/core/except/errhdl.cxx b/sw/source/core/except/errhdl.cxx
index 7cada1bd7383..9d0cfbd5cac2 100644
--- a/sw/source/core/except/errhdl.cxx
+++ b/sw/source/core/except/errhdl.cxx
@@ -30,10 +30,7 @@
 #include "precompiled_sw.hxx"
 #define _ERRHDL_CXX
 
-
 #include "stdlib.h"
-#ifdef WIN
-#endif
 #include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/sound.hxx>
@@ -51,68 +48,17 @@
 #define CVBREAK
 #endif
 
-BOOL bAssertFail = FALSE;           // ist gerade eine Assertbox oben ?
-BOOL bAssert = FALSE;               // TRUE, wenn mal ein ASSERT kam.
-
-/*------------------------------------------------------------------------
-    Ausgabe einer Fehlermeldung inkl. Bedingung, Dateiname und Zeilennummer
-    wo der Fehler auftrat.
-    Die Funktion wird durch das ASSERT Makro gerufen!
-    Parameter:
-                char    *pError     Fehlermeldung
-                char    *pFileName  Filename in dem der Fehler auftrat
-                USHORT  nLine       Zeilennummer in dem der Fehler auftrat
-------------------------------------------------------------------------*/
-
-void AssertFail( const sal_Char* pError, const sal_Char* pFileName, USHORT nLine )
-{
-    CVBREAK;
-    // NOTE4("ASSERT: %s at %d: %s\n", pFileName, nLine, pError);
-    bAssert = TRUE;
-
-    if( !bAssertFail && GetpApp() && GetpApp()->IsInMain() )
-    {
-        bAssertFail = TRUE;
-        ByteString  aErr;
-        aErr = "Assertion failed\n==================\nFILE      :  ";
-        aErr += pFileName;
-        aErr += " at line ";
-        aErr += ByteString::CreateFromInt32( nLine );
-        aErr += "\nERROR :  ";
-        aErr += pError;
-
-        ByteString aTmp( getenv( "SW_NOBEEP" ) );
-        if ( aTmp != "TRUE" )
-            Sound::Beep(SOUND_ERROR);
-
-#if defined( UNX ) && !defined( DBG_UTIL )
-        DBG_ERROR( aErr.GetBuffer() ); // DbgErr ist in UNIX-nicht Produkt-Versionen nicht definiert
-#else
-        DbgError( aErr.GetBuffer() );
-#endif
-        bAssertFail = FALSE;
-    }
-    else
-    {
-        Sound::Beep(SOUND_ERROR);
-        Sound::Beep(SOUND_ERROR);
-        Sound::Beep(SOUND_ERROR);
-        if( !bAssertFail )
-            *(short *)0 = 4711;         // UAE ausloesen
-    }
-}
-
 /*------------------------------------------------------------------------
     Ausgabe einer Fehlermeldung inkl. Bedingung, Dateiname und Zeilennummer
     wo der Fehler auftrat.
-    Die Funktion wird durch das ASSERT Makro gerufen!
+    Die Funktion wird durch das OSL_ENSURE(Makro gerufen!
     Parameter:
                 USHORT  nErrorId    Id fuer Fehlermeldung
                 char    *pFileName  Filename in dem der Fehler auftrat
                 USHORT  nLine       Zeilennummer in dem der Fehler auftrat
 ------------------------------------------------------------------------*/
 
-void AssertFail( USHORT nErrorId, const sal_Char* pFileName, USHORT nLine )
+void AssertFail( USHORT nErrorId, const sal_Char* pFileName )
 {
     // Umsetzung der ErrorId in eine Fehlermeldung
     static const sal_Char
@@ -136,7 +82,7 @@ void AssertFail( USHORT nErrorId, const sal_Char* pFileName, USHORT nLine )
     else
         pMsg = sERR_UNKNOWN;
 
-    AssertFail( pMsg, pFileName, nLine );
+    OSL_ENSURE( pMsg, pFileName );
 }
 
 
diff --git a/sw/source/core/except/makefile.mk b/sw/source/core/except/makefile.mk
index 19450849b59d..022862b3c2b4 100644
--- a/sw/source/core/except/makefile.mk
+++ b/sw/source/core/except/makefile.mk
@@ -45,7 +45,7 @@ PRJPCH=
 
 CXXFILES =
 
-.IF "$(dbgutil)"!=""
+.IF "$(DBG_LEVEL)">="2"
 CXXFILES += \
         errhdl.cxx			\
         dbgloop.cxx
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
index afca869d7dc1..f1b9b3f01018 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -73,10 +73,6 @@ typedef SwTOXSortKey* TOXSortKeyPtr;
 SV_DECL_PTRARR_DEL( SortKeyArr, TOXSortKeyPtr, 5, 5 )
 SV_IMPL_PTRARR( SortKeyArr, TOXSortKeyPtr )
 
-
-/* -----------------16.09.99 11:53-------------------
-
- --------------------------------------------------*/
 SwAuthEntry::SwAuthEntry(const SwAuthEntry& rCopy)
     : nRefCount(0)
 {
@@ -93,9 +89,6 @@ BOOL    SwAuthEntry::operator==(const SwAuthEntry& rComp)
 }
 // --------------------------------------------------------
 
-/* -----------------14.09.99 16:15-------------------
-
- --------------------------------------------------*/
 SwAuthorityFieldType::SwAuthorityFieldType(SwDoc* pDoc)
     : SwFieldType( RES_AUTHORITY ),
     m_pDoc(pDoc),
@@ -126,30 +119,22 @@ SwAuthorityFieldType::SwAuthorityFieldType( const SwAuthorityFieldType& rFType)
         m_pSortKeyArr->Insert((*rFType.m_pSortKeyArr)[i], i);
 }
 
-/* -----------------17.09.99 13:52-------------------
-
- --------------------------------------------------*/
 SwAuthorityFieldType::~SwAuthorityFieldType()
 {
-//  DBG_ASSERT(!m_pDataArr->Count(), "Array is not empty");
     m_pSortKeyArr->DeleteAndDestroy(0, m_pSortKeyArr->Count());
     delete m_pSortKeyArr;
     delete m_pSequArr;
     delete m_pDataArr;
 }
-/*-- 14.09.99 16:22:09---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwFieldType*    SwAuthorityFieldType::Copy()  const
 {
     return new SwAuthorityFieldType(m_pDoc);
 }
-/* -----------------17.09.99 13:43-------------------
 
- --------------------------------------------------*/
 void    SwAuthorityFieldType::RemoveField(long nHandle)
 {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     BOOL bRemoved = FALSE;
 #endif
     for(USHORT j = 0; j < m_pDataArr->Count(); j++)
@@ -158,7 +143,7 @@ void    SwAuthorityFieldType::RemoveField(long nHandle)
         long nRet = (long)(void*)pTemp;
         if(nRet == nHandle)
         {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
             bRemoved = TRUE;
 #endif
             pTemp->RemoveRef();
@@ -171,13 +156,11 @@ void    SwAuthorityFieldType::RemoveField(long nHandle)
             break;
         }
     }
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     DBG_ASSERT(bRemoved, "Field unknown" );
 #endif
 }
-/* -----------------17.09.99 13:43-------------------
 
- --------------------------------------------------*/
 long    SwAuthorityFieldType::AddField(const String& rFieldContents)
 {
     long nRet = 0;
@@ -207,9 +190,7 @@ long    SwAuthorityFieldType::AddField(const String& rFieldContents)
     }
     return nRet;
 }
-/* -----------------17.09.99 14:18-------------------
 
- --------------------------------------------------*/
 BOOL SwAuthorityFieldType::AddField(long nHandle)
 {
     BOOL bRet = FALSE;
@@ -229,9 +210,7 @@ BOOL SwAuthorityFieldType::AddField(long nHandle)
     DBG_ASSERT(bRet, "::AddField(long) failed");
     return bRet;
 }
-/* -----------------17.09.99 14:52-------------------
 
- --------------------------------------------------*/
 const SwAuthEntry*  SwAuthorityFieldType::GetEntryByHandle(long nHandle) const
 {
     const SwAuthEntry* pRet = 0;
@@ -245,12 +224,10 @@ const SwAuthEntry*  SwAuthorityFieldType::GetEntryByHandle(long nHandle) const
             break;
         }
     }
-    ASSERT( pRet, "invalid Handle" );
+    OSL_ENSURE( pRet, "invalid Handle" );
     return pRet;
 }
-/* -----------------21.09.99 13:34-------------------
 
- --------------------------------------------------*/
 void SwAuthorityFieldType::GetAllEntryIdentifiers(
                 SvStringsDtor& rToFill )const
 {
@@ -261,9 +238,7 @@ void SwAuthorityFieldType::GetAllEntryIdentifiers(
                     AUTH_FIELD_IDENTIFIER )), rToFill.Count() );
     }
 }
-/* -----------------21.09.99 13:34-------------------
 
- --------------------------------------------------*/
 const SwAuthEntry*  SwAuthorityFieldType::GetEntryByIdentifier(
                                 const String& rIdentifier)const
 {
@@ -279,9 +254,7 @@ const SwAuthEntry*  SwAuthorityFieldType::GetEntryByIdentifier(
     }
     return pRet;
 }
-/* -----------------------------21.12.99 13:20--------------------------------
 
- ---------------------------------------------------------------------------*/
 bool SwAuthorityFieldType::ChangeEntryContent(const SwAuthEntry* pNewEntry)
 {
     bool bChanged = false;
@@ -324,9 +297,6 @@ USHORT  SwAuthorityFieldType::AppendField( const SwAuthEntry& rInsert )
     return nRet;
 }
 
-/*-- 11.10.99 08:49:24---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 long    SwAuthorityFieldType::GetHandle(USHORT nPos)
 {
     long nRet = 0;
@@ -337,13 +307,11 @@ long    SwAuthorityFieldType::GetHandle(USHORT nPos)
     }
     return nRet;
 }
-/* -----------------19.10.99 13:46-------------------
 
- --------------------------------------------------*/
 USHORT  SwAuthorityFieldType::GetSequencePos(long nHandle)
 {
     //find the field in a sorted array of handles,
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     sal_Bool bCurrentFieldWithoutTextNode = sal_False;
 #endif
     if(m_pSequArr->Count() && m_pSequArr->Count() != m_pDataArr->Count())
@@ -361,7 +329,7 @@ USHORT  SwAuthorityFieldType::GetSequencePos(long nHandle)
             const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld();
             if(!pTxtFld || !pTxtFld->GetpTxtNode())
             {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
                 if(nHandle == ((SwAuthorityField*)pFmtFld->GetFld())->GetHandle())
                     bCurrentFieldWithoutTextNode = sal_True;
 #endif
@@ -433,12 +401,12 @@ USHORT  SwAuthorityFieldType::GetSequencePos(long nHandle)
             break;
         }
     }
-    ASSERT(bCurrentFieldWithoutTextNode || nRet, "Handle not found")
+#if OSL_DEBUG_LEVEL > 1
+    OSL_ENSURE(bCurrentFieldWithoutTextNode || nRet, "Handle not found");
+#endif
     return nRet;
 }
-/* -----------------------------15.11.00 17:33--------------------------------
 
- ---------------------------------------------------------------------------*/
 bool    SwAuthorityFieldType::QueryValue( Any& rVal, USHORT nWhichId ) const
 {
     switch( nWhichId )
@@ -493,9 +461,7 @@ bool    SwAuthorityFieldType::QueryValue( Any& rVal, USHORT nWhichId ) const
     }
     return true;
 }
-/* -----------------------------15.11.00 17:33--------------------------------
 
- ---------------------------------------------------------------------------*/
 bool    SwAuthorityFieldType::PutValue( const Any& rAny, USHORT nWhichId )
 {
     bool bRet = true;
@@ -568,25 +534,19 @@ bool    SwAuthorityFieldType::PutValue( const Any& rAny, USHORT nWhichId )
     }
     return bRet;
 }
-/* -----------------19.10.99 13:25-------------------
 
- --------------------------------------------------*/
 void SwAuthorityFieldType::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
 {
     //re-generate positions of the fields
     DelSequenceArray();
     SwModify::Modify( pOld, pNew );
 }
-/* -----------------20.10.99 13:38-------------------
 
- --------------------------------------------------*/
 USHORT SwAuthorityFieldType::GetSortKeyCount() const
 {
     return m_pSortKeyArr->Count();
 }
-/* -----------------20.10.99 13:38-------------------
 
- --------------------------------------------------*/
 const SwTOXSortKey*  SwAuthorityFieldType::GetSortKey(USHORT nIdx) const
 {
     SwTOXSortKey* pRet = 0;
@@ -595,9 +555,7 @@ const SwTOXSortKey*  SwAuthorityFieldType::GetSortKey(USHORT nIdx) const
     DBG_ASSERT(pRet, "Sort key not found");
     return pRet;
 }
-/* -----------------20.10.99 13:38-------------------
 
- --------------------------------------------------*/
 void SwAuthorityFieldType::SetSortKeys(USHORT nKeyCount, SwTOXSortKey aKeys[])
 {
     m_pSortKeyArr->DeleteAndDestroy(0, m_pSortKeyArr->Count());
@@ -607,9 +565,6 @@ void SwAuthorityFieldType::SetSortKeys(USHORT nKeyCount, SwTOXSortKey aKeys[])
             m_pSortKeyArr->Insert(new SwTOXSortKey(aKeys[i]), nArrIdx++);
 }
 
-/* -----------------14.09.99 16:15-------------------
-
- --------------------------------------------------*/
 SwAuthorityField::SwAuthorityField( SwAuthorityFieldType* pInitType,
                                     const String& rFieldContents )
     : SwField(pInitType),
@@ -617,9 +572,7 @@ SwAuthorityField::SwAuthorityField( SwAuthorityFieldType* pInitType,
 {
     m_nHandle = pInitType->AddField( rFieldContents );
 }
-/* -----------------17.09.99 14:24-------------------
 
- --------------------------------------------------*/
 SwAuthorityField::SwAuthorityField( SwAuthorityFieldType* pInitType,
                                                 long nSetHandle )
     : SwField( pInitType ),
@@ -628,16 +581,12 @@ SwAuthorityField::SwAuthorityField( SwAuthorityFieldType* pInitType,
 {
     pInitType->AddField( m_nHandle );
 }
-/* -----------------15.09.99 15:00-------------------
 
- --------------------------------------------------*/
 SwAuthorityField::~SwAuthorityField()
 {
     ((SwAuthorityFieldType* )GetTyp())->RemoveField(m_nHandle);
 }
-/*-- 14.09.99 16:20:59---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 String  SwAuthorityField::Expand() const
 {
     SwAuthorityFieldType* pAuthType = (SwAuthorityFieldType*)GetTyp();
@@ -663,45 +612,32 @@ String  SwAuthorityField::Expand() const
         sRet += pAuthType->GetSuffix();
     return sRet;
 }
-/*-- 14.09.99 16:21:00---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SwField* SwAuthorityField::Copy() const
 {
     SwAuthorityFieldType* pAuthType = (SwAuthorityFieldType*)GetTyp();
     return new SwAuthorityField(pAuthType, m_nHandle);
 }
-/* -----------------21.09.99 12:55-------------------
 
- --------------------------------------------------*/
 const String&   SwAuthorityField::GetFieldText(ToxAuthorityField eField) const
 {
     SwAuthorityFieldType* pAuthType = (SwAuthorityFieldType*)GetTyp();
     const SwAuthEntry* pEntry = pAuthType->GetEntryByHandle( m_nHandle );
     return pEntry->GetAuthorField( eField );
 }
-/* -----------------21.09.99 14:57-------------------
 
- --------------------------------------------------*/
 void    SwAuthorityField::SetPar1(const String& rStr)
 {
     SwAuthorityFieldType* pInitType = (SwAuthorityFieldType* )GetTyp();
     pInitType->RemoveField(m_nHandle);
     m_nHandle = pInitType->AddField(rStr);
 }
-/* -----------------11.10.99 09:43-------------------
 
- --------------------------------------------------*/
 String SwAuthorityField::GetDescription() const
 {
     return SW_RES(STR_AUTHORITY_ENTRY);
 }
 
-
-
-/* -----------------------------15.11.00 17:33--------------------------------
-
- ---------------------------------------------------------------------------*/
 const char* aFieldNames[] =
 {
     "Identifier",
@@ -736,9 +672,7 @@ const char* aFieldNames[] =
     "Custom5",
     "ISBN"
 };
-/* -----------------------------16.11.00 12:27--------------------------------
 
- ---------------------------------------------------------------------------*/
 bool    SwAuthorityField::QueryValue( Any& rAny, USHORT /*nWhichId*/ ) const
 {
     if(!GetTyp())
@@ -761,9 +695,7 @@ bool    SwAuthorityField::QueryValue( Any& rAny, USHORT /*nWhichId*/ ) const
     /* FIXME: it is weird that we always return false here */
     return false;
 }
-/* -----------------------------15.11.00 17:33--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Int16 lcl_Find(const OUString& rFieldName)
 {
     for(sal_Int16 i = 0; i < AUTH_FIELD_END; i++)
@@ -808,9 +740,7 @@ bool    SwAuthorityField::PutValue( const Any& rAny, USHORT /*nWhichId*/ )
     /* FIXME: it is weird that we always return false here */
     return false;
 }
-/* -----------------11.10.99 09:43-------------------
 
- --------------------------------------------------*/
 SwFieldType* SwAuthorityField::ChgTyp( SwFieldType* pFldTyp )
 {
     SwAuthorityFieldType* pSrcTyp = (SwAuthorityFieldType*)GetTyp(),
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index 27ee4aef13ac..c611471bd80b 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -389,7 +389,7 @@ void SwTableFormula::RelNmsToBoxNms( const SwTable& rTbl, String& rNewStr,
 {
     // relativen Namen zu Box-Namen (externe Darstellung)
     SwNode* pNd = (SwNode*)pPara;
-    ASSERT( pNd, "Feld steht in keinem TextNode" );
+    OSL_ENSURE( pNd, "Feld steht in keinem TextNode" );
     const SwTableBox *pRelBox, *pBox = (SwTableBox *)rTbl.GetTblBox(
                     pNd->FindTableBoxStartNode()->GetIndex() );
 
@@ -419,7 +419,7 @@ void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, String& rNewStr,
 {
     // relativen Namen zu Box-Pointern (interne Darstellung)
     SwNode* pNd = (SwNode*)pPara;
-    ASSERT( pNd, "Feld steht in keinem Node" );
+    OSL_ENSURE( pNd, "Feld steht in keinem Node" );
     const SwTableBox *pRelBox, *pBox = (SwTableBox*)rTbl.GetTblBox(
                     pNd->FindTableBoxStartNode()->GetIndex() );
 
@@ -450,7 +450,7 @@ void SwTableFormula::BoxNmsToRelNm( const SwTable& rTbl, String& rNewStr,
 {
     // Box-Namen (externe Darstellung) zu relativen Namen
     SwNode* pNd = (SwNode*)pPara;
-    ASSERT( pNd, "Feld steht in keinem Node" );
+    OSL_ENSURE( pNd, "Feld steht in keinem Node" );
     const SwTableNode* pTblNd = pNd->FindTableNode();
 
     String sRefBoxNm;
@@ -458,7 +458,7 @@ void SwTableFormula::BoxNmsToRelNm( const SwTable& rTbl, String& rNewStr,
     {
         const SwTableBox *pBox = rTbl.GetTblBox(
                 pNd->FindTableBoxStartNode()->GetIndex() );
-        ASSERT( pBox, "Feld steht in keiner Tabelle" );
+        OSL_ENSURE( pBox, "Feld steht in keiner Tabelle" );
         sRefBoxNm = pBox->GetName();
     }
 
@@ -673,7 +673,7 @@ String SwTableFormula::ScanString( FnScanFormel fnFormel, const SwTable& rTbl,
                         if( pFnd )
                             pTbl = pFnd;
                         // ??
-                        ASSERT( pFnd, "Tabelle nicht gefunden, was nun?" );
+                        OSL_ENSURE( pFnd, "Tabelle nicht gefunden, was nun?" );
                     }
                 }
             }
@@ -725,23 +725,9 @@ const SwTable* SwTableFormula::FindTable( SwDoc& rDoc, const String& rNm ) const
 
 const SwFrm* lcl_GetBoxFrm( const SwTableBox& rBox )
 {
-/*
-
-    // oder besser ueber die Box den Frame suchen
-
-    SwClientIter aIter( *pBox->GetFrmFmt() );
-    ULONG nMinPos = ULONG_MAX;
-    const SwFrm* pFnd = 0;
-    for( SwFrm* pF = (SwFrm*)aIter.First( TYPE( SwCellFrm )); pF;
-            pF = (SwFrm*)aIter.Next() )
-    {
-        if( pF->Frm().Y() <
-    }
-*/
-
     SwNodeIndex aIdx( *rBox.GetSttNd() );
     SwCntntNode* pCNd = aIdx.GetNodes().GoNext( &aIdx );
-    ASSERT( pCNd, "Box hat keinen TextNode" );
+    OSL_ENSURE( pCNd, "Box hat keinen TextNode" );
     Point aPt;      // den im Layout 1. Frame returnen - Tab.Kopfzeile !!
     return pCNd->GetFrm( &aPt, NULL, FALSE );
 }
diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx
index 77bf051f9d02..34d72fe29f4c 100644
--- a/sw/source/core/fields/chpfld.cxx
+++ b/sw/source/core/fields/chpfld.cxx
@@ -102,27 +102,12 @@ SwField* SwChapterField::Copy() const
     return pTmp;
 }
 
-// --> OD 2008-02-14 #i53420#
-//void SwChapterField::ChangeExpansion( const SwFrm* pFrm,
-//                                      const SwTxtNode* pTxtNd,
-//                                      sal_Bool bSrchNum )
-//{
-//    ASSERT( pFrm, "in welchem Frame stehe ich denn?" )
-//    SwDoc* pDoc = (SwDoc*)pTxtNd->GetDoc();
-//    SwPosition aPos( pDoc->GetNodes().GetEndOfContent() );
-
-//    if( pFrm->IsInDocBody() )
-//        aPos.nNode = *pTxtNd;
-//    else if( 0 == (pTxtNd = GetBodyTxtNode( *pDoc, aPos, *pFrm )) )
-//        // kein TxtNode (Formatierung Kopf/Fusszeile)
-//        return;
-//    ChangeExpansion(*pTxtNd, bSrchNum);
-//}
+// #i53420#
 void SwChapterField::ChangeExpansion(const SwFrm* pFrm,
                                       const SwCntntNode* pCntntNode,
                                       sal_Bool bSrchNum )
 {
-    ASSERT( pFrm, "in welchem Frame stehe ich denn?" )
+    OSL_ENSURE( pFrm, "in welchem Frame stehe ich denn?" );
     SwDoc* pDoc = (SwDoc*)pCntntNode->GetDoc();
 
     const SwTxtNode* pTxtNode = dynamic_cast<const SwTxtNode*>(pCntntNode);
@@ -137,7 +122,6 @@ void SwChapterField::ChangeExpansion(const SwFrm* pFrm,
         ChangeExpansion( *pTxtNode, bSrchNum );
     }
 }
-// <--
 
 void SwChapterField::ChangeExpansion(const SwTxtNode &rTxtNd, sal_Bool bSrchNum)
 {
@@ -153,16 +137,9 @@ void SwChapterField::ChangeExpansion(const SwTxtNode &rTxtNd, sal_Bool bSrchNum)
                 {
                     BYTE nPrevLvl = nLevel;
 
-                    // --> OD 2008-04-02 #refactorlists#
-//                    nLevel = GetRealLevel( pONd->GetTxtColl()->
-//                                            GetOutlineLevel() );
-                    //ASSERT( pONd->GetOutlineLevel() >= 0 && pONd->GetOutlineLevel() < MAXLEVEL,   //#outline level,zhaojianwei
-                    //        "<SwChapterField::ChangeExpansion(..)> - outline node with inconsistent outline level. Serious defect -> please inform OD." );
-                    //nLevel = static_cast<BYTE>(pONd->GetOutlineLevel());
-                    ASSERT( pONd->GetAttrOutlineLevel() >= 0 && pONd->GetAttrOutlineLevel() <= MAXLEVEL,
+                    OSL_ENSURE( pONd->GetAttrOutlineLevel() >= 0 && pONd->GetAttrOutlineLevel() <= MAXLEVEL,
                             "<SwChapterField::ChangeExpansion(..)> - outline node with inconsistent outline level. Serious defect -> please inform OD." );
-                    nLevel = static_cast<BYTE>(pONd->GetAttrOutlineLevel());                            //<-end,zhaojianwei
-                    // <--
+                    nLevel = static_cast<BYTE>(pONd->GetAttrOutlineLevel());
 
                     if( nPrevLvl < nLevel )
                         nLevel = nPrevLvl;
@@ -225,9 +202,6 @@ void SwChapterField::ChangeExpansion(const SwTxtNode &rTxtNd, sal_Bool bSrchNum)
     }
 }
 
-/*-----------------05.03.98 16:19-------------------
-
---------------------------------------------------*/
 bool SwChapterField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     switch( nWhichId )
@@ -261,9 +235,7 @@ bool SwChapterField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
     }
     return true;
 }
-/*-----------------05.03.98 16:19-------------------
 
---------------------------------------------------*/
 bool SwChapterField::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     BOOL bRet = TRUE;
@@ -294,7 +266,7 @@ bool SwChapterField::PutValue( const uno::Any& rAny, USHORT nWhichId )
                 case text::ChapterFormat::DIGIT:
                         SetFormat(CF_NUMBER_NOPREPST);
                 break;
-                //case text::ChapterFormat::NAME_NUMBER:
+
                 default:        SetFormat(CF_NUM_TITLE);
             }
         }
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index c778146aa486..4582d6cd23d7 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -111,7 +111,7 @@ const String& SwDBFieldType::GetName() const
 
 void SwDBFieldType::ReleaseRef()
 {
-    ASSERT(nRefCnt > 0, "RefCount kleiner 0!");
+    OSL_ENSURE(nRefCnt > 0, "RefCount kleiner 0!");
 
     if (--nRefCnt <= 0)
     {
@@ -125,9 +125,6 @@ void SwDBFieldType::ReleaseRef()
     }
 }
 
-/* -----------------24.02.99 14:51-------------------
- *
- * --------------------------------------------------*/
 bool SwDBFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     switch( nWhichId )
@@ -149,9 +146,7 @@ bool SwDBFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
     }
     return true;
 }
-/* -----------------24.02.99 14:51-------------------
- *
- * --------------------------------------------------*/
+
 bool SwDBFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     switch( nWhichId )
@@ -283,10 +278,7 @@ String SwDBField::GetCntnt(BOOL bName) const
     if(bName)
     {
         const String& rDBName = ((SwDBFieldType*)GetTyp())->GetName();
-        //TODO/CLEANUP
-        //Funktion tut nichts!
-        //String sContent( SFX_APP()->LocalizeDBName(INI2NATIONAL,
-        //                                    rDBName.GetToken(0, DB_DELIM)));
+
         String sContent( rDBName.GetToken(0, DB_DELIM) );
 
         if (sContent.Len() > 1)
@@ -312,10 +304,6 @@ void SwDBField::ChgValue( double d, BOOL bVal )
         aContent = ((SwValueFieldType*)GetTyp())->ExpandValue(d, GetFormat(), GetLanguage());
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 SwFieldType* SwDBField::ChgTyp( SwFieldType* pNewType )
 {
     SwFieldType* pOld = SwValueField::ChgTyp( pNewType );
@@ -399,27 +387,16 @@ const String& SwDBField::GetPar1() const
     return ((SwDBFieldType*)GetTyp())->GetName();
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 USHORT SwDBField::GetSubType() const
 {
     return nSubType;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 void SwDBField::SetSubType(USHORT nType)
 {
     nSubType = nType;
 }
 
-/*-----------------06.03.98 16:15-------------------
-
---------------------------------------------------*/
 bool SwDBField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     switch( nWhichId )
@@ -451,9 +428,7 @@ bool SwDBField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
     return true;
 
 }
-/*-----------------06.03.98 16:15-------------------
 
---------------------------------------------------*/
 bool SwDBField::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     switch( nWhichId )
@@ -561,9 +536,6 @@ String SwDBNameInfField::GetCntnt(BOOL bName) const
     return lcl_DBTrennConv(sStr);
 }
 
-/*-----------------06.03.98 16:55-------------------
-
---------------------------------------------------*/
 bool SwDBNameInfField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     switch( nWhichId )
@@ -588,9 +560,7 @@ bool SwDBNameInfField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
     }
     return true;
 }
-/*-----------------06.03.98 16:55-------------------
 
---------------------------------------------------*/
 bool SwDBNameInfField::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     switch( nWhichId )
@@ -622,16 +592,12 @@ bool SwDBNameInfField::PutValue( const uno::Any& rAny, USHORT nWhichId )
     }
     return true;
 }
-/* -----------------4/10/2003 15:03------------------
 
- --------------------------------------------------*/
 USHORT SwDBNameInfField::GetSubType() const
 {
     return nSubType;
 }
-/* -----------------4/10/2003 15:03------------------
 
- --------------------------------------------------*/
 void SwDBNameInfField::SetSubType(USHORT nType)
 {
     nSubType = nType;
@@ -706,9 +672,7 @@ void SwDBNextSetField::SetPar1(const String& rStr)
 {
     aCond = rStr;
 }
-/*-----------------06.03.98 16:16-------------------
 
---------------------------------------------------*/
 bool SwDBNextSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     bool bRet = true;
@@ -722,9 +686,7 @@ bool SwDBNextSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
     }
     return bRet;
 }
-/*-----------------06.03.98 16:16-------------------
 
---------------------------------------------------*/
 bool SwDBNextSetField::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     bool bRet = true;
@@ -740,21 +702,6 @@ bool SwDBNextSetField::PutValue( const uno::Any& rAny, USHORT nWhichId )
 }
 
 /*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-/*
-String SwDBNextSetField::GetPar2() const
-{
-    return GetDBName();
-}
-
-void SwDBNextSetField::SetPar2(const String& rStr)
-{
-    GetDBName() = rStr;
-}
-*/
-
-/*--------------------------------------------------------------------
     Beschreibung: Datensatz mit bestimmter ID
  --------------------------------------------------------------------*/
 
@@ -842,9 +789,7 @@ void SwDBNumSetField::SetPar2(const String& rStr)
 {
     aPar2 = rStr;
 }
-/*-----------------06.03.98 16:16-------------------
 
---------------------------------------------------*/
 bool SwDBNumSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     bool bRet = true;
@@ -861,9 +806,7 @@ bool SwDBNumSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
     }
     return bRet;
 }
-/*-----------------06.03.98 16:16-------------------
 
---------------------------------------------------*/
 bool    SwDBNumSetField::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     bool bRet = true;
@@ -943,16 +886,11 @@ SwField* SwDBNameField::Copy() const
     return pTmp;
 }
 
-/*-----------------06.03.98 16:16-------------------
-
---------------------------------------------------*/
 bool SwDBNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     return SwDBNameInfField::QueryValue(rAny, nWhichId );
 }
-/*-----------------06.03.98 16:16-------------------
 
---------------------------------------------------*/
 bool SwDBNameField::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     return SwDBNameInfField::PutValue(rAny, nWhichId );
@@ -1022,9 +960,7 @@ SwField* SwDBSetNumberField::Copy() const
     pTmp->SetSubType(GetSubType());
     return pTmp;
 }
-/*-----------------06.03.98 16:15-------------------
 
---------------------------------------------------*/
 bool SwDBSetNumberField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     bool bRet = true;
@@ -1041,9 +977,7 @@ bool SwDBSetNumberField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
     }
     return bRet;
 }
-/*-----------------06.03.98 16:15-------------------
 
---------------------------------------------------*/
 bool SwDBSetNumberField::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     bool bRet = true;
@@ -1056,8 +990,6 @@ bool SwDBSetNumberField::PutValue( const uno::Any& rAny, USHORT nWhichId )
             if(nSet < (INT16) SVX_NUMBER_NONE )
                 SetFormat(nSet);
             else {
-                //exception(wrong_value)
-                ;
             }
         }
         break;
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index 1fc45a292c79..8587234df37f 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -109,7 +109,7 @@ void SwIntrnlRefLink::DataChanged( const String& rMimeType,
         return;
     }
 
-    ASSERT( rFldType.GetDoc(), "Kein pDoc" );
+    OSL_ENSURE( rFldType.GetDoc(), "Kein pDoc" );
 
     // keine Abhaengigen mehr?
     if( rFldType.GetDepends() && !rFldType.IsModifyLocked() && !ChkNoDataFlag() )
@@ -299,7 +299,7 @@ void SwDDEFieldType::SetDoc( SwDoc* pNewDoc )
 
     if( pDoc && refLink.Is() )
     {
-        ASSERT( !nRefCnt, "wie kommen die Referenzen rueber?" );
+        OSL_ENSURE( !nRefCnt, "wie kommen die Referenzen rueber?" );
         pDoc->GetLinkManager().Remove( refLink );
     }
 
@@ -327,9 +327,7 @@ void SwDDEFieldType::_RefCntChgd()
         pDoc->GetLinkManager().Remove( refLink );
     }
 }
-/* -----------------------------28.08.00 16:23--------------------------------
 
- ---------------------------------------------------------------------------*/
 bool SwDDEFieldType::QueryValue( uno::Any& rVal, USHORT nWhichId ) const
 {
     BYTE nPart = 0;
@@ -354,9 +352,7 @@ bool SwDDEFieldType::QueryValue( uno::Any& rVal, USHORT nWhichId ) const
         rVal <<= OUString(GetCmd().GetToken(nPart-1, sfx2::cTokenSeperator));
     return true;
 }
-/* -----------------------------28.08.00 16:23--------------------------------
 
- ---------------------------------------------------------------------------*/
 bool SwDDEFieldType::PutValue( const uno::Any& rVal, USHORT nWhichId )
 {
     BYTE nPart = 0;
diff --git a/sw/source/core/fields/ddetbl.cxx b/sw/source/core/fields/ddetbl.cxx
index 29b9a9e0e52d..b7ed6b0dcaa3 100644
--- a/sw/source/core/fields/ddetbl.cxx
+++ b/sw/source/core/fields/ddetbl.cxx
@@ -102,12 +102,12 @@ void SwDDETable::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
 
 void SwDDETable::ChangeContent()
 {
-    ASSERT( GetFrmFmt(), "Kein FrameFormat" );
+    OSL_ENSURE( GetFrmFmt(), "Kein FrameFormat" );
 
     // Stehen wir im richtigen NodesArray (Wegen UNDO)
     if( !aLines.Count() )
         return;
-    ASSERT( GetTabSortBoxes().Count(), "Tabelle ohne Inhalt?" );
+    OSL_ENSURE( GetTabSortBoxes().Count(), "Tabelle ohne Inhalt?" );
     if( !GetTabSortBoxes()[0]->GetSttNd()->GetNodes().IsDocNodes() )
         return;
 
@@ -124,10 +124,10 @@ void SwDDETable::ChangeContent()
         for( USHORT i = 0; i < pLine->GetTabBoxes().Count(); ++i )
         {
             SwTableBox* pBox = pLine->GetTabBoxes()[ i ];
-            ASSERT( pBox->GetSttIdx(), "keine InhaltsBox" );
+            OSL_ENSURE( pBox->GetSttIdx(), "keine InhaltsBox" );
             SwNodeIndex aNdIdx( *pBox->GetSttNd(), 1 );
             SwTxtNode* pTxtNode = aNdIdx.GetNode().GetTxtNode();
-            ASSERT( pTxtNode, "Kein Node" );
+            OSL_ENSURE( pTxtNode, "Kein Node" );
             SwIndex aCntIdx( pTxtNode, 0 );
             pTxtNode->EraseText( aCntIdx );
             pTxtNode->InsertText( aLine.GetToken( i, '\t' ), aCntIdx );
@@ -153,19 +153,19 @@ SwDDEFieldType* SwDDETable::GetDDEFldType()
 BOOL SwDDETable::NoDDETable()
 {
     // suche den TabellenNode
-    ASSERT( GetFrmFmt(), "Kein FrameFormat" );
+    OSL_ENSURE( GetFrmFmt(), "Kein FrameFormat" );
     SwDoc* pDoc = GetFrmFmt()->GetDoc();
 
     // Stehen wir im richtigen NodesArray (Wegen UNDO)
     if( !aLines.Count() )
         return FALSE;
-    ASSERT( GetTabSortBoxes().Count(), "Tabelle ohne Inhalt?" );
+    OSL_ENSURE( GetTabSortBoxes().Count(), "Tabelle ohne Inhalt?" );
     SwNode* pNd = (SwNode*)GetTabSortBoxes()[0]->GetSttNd();
     if( !pNd->GetNodes().IsDocNodes() )
         return FALSE;
 
     SwTableNode* pTblNd = pNd->FindTableNode();
-    ASSERT( pTblNd, "wo steht denn die Tabelle ?");
+    OSL_ENSURE( pTblNd, "wo steht denn die Tabelle ?");
 
     SwTable* pNewTbl = new SwTable( *this );
 
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index c67cdf68a111..4ebf1c874b00 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -250,9 +250,6 @@ sal_uInt16 SwPageNumberField::GetSubType() const
     return nSubType;
 }
 
-/*-----------------05.03.98 10:25-------------------
-
---------------------------------------------------*/
 bool SwPageNumberField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     switch( nWhichId )
@@ -283,9 +280,7 @@ bool SwPageNumberField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
     }
     return true;
 }
-/*-----------------05.03.98 10:25-------------------
 
---------------------------------------------------*/
 bool SwPageNumberField::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     bool bRet = true;
@@ -299,8 +294,6 @@ bool SwPageNumberField::PutValue( const uno::Any& rAny, USHORT nWhichId )
         if(nSet <= SVX_NUM_PAGEDESC )
             SetFormat(nSet);
         else {
-            //exception(wrong_value)
-            ;
         }
         break;
     case FIELD_PROP_USHORT1:
@@ -384,9 +377,6 @@ SwField* SwAuthorField::Copy() const
     return pTmp;
 }
 
-/*-----------------05.03.98 11:15-------------------
-
---------------------------------------------------*/
 bool SwAuthorField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     bool bVal;
@@ -411,9 +401,7 @@ bool SwAuthorField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
     }
     return true;
 }
-/*-----------------05.03.98 11:15-------------------
 
---------------------------------------------------*/
 bool SwAuthorField::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     switch( nWhichId )
@@ -530,9 +518,6 @@ SwField* SwFileNameField::Copy() const
     return pTmp;
 }
 
-/*-----------------05.03.98 08:59-------------------
-
---------------------------------------------------*/
 bool SwFileNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     switch( nWhichId )
@@ -572,9 +557,7 @@ bool SwFileNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
     }
     return true;
 }
-/*-----------------05.03.98 09:01-------------------
 
---------------------------------------------------*/
 bool SwFileNameField::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     switch( nWhichId )
@@ -634,7 +617,7 @@ SwTemplNameFieldType::SwTemplNameFieldType(SwDoc *pDocument)
 
 String SwTemplNameFieldType::Expand(ULONG nFmt) const
 {
-    ASSERT( nFmt < FF_END, "Expand: kein guelt. Fmt!" );
+    OSL_ENSURE( nFmt < FF_END, "Expand: kein guelt. Fmt!" );
 
     String aRet;
     SwDocShell *pDocShell(pDoc->GetDocShell());
@@ -706,9 +689,6 @@ SwField* SwTemplNameField::Copy() const
     return pTmp;
 }
 
-/*-----------------05.03.98 08:59-------------------
-
---------------------------------------------------*/
 bool SwTemplNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     switch ( nWhichId )
@@ -734,9 +714,7 @@ bool SwTemplNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
     }
     return true;
 }
-/*-----------------05.03.98 09:01-------------------
 
---------------------------------------------------*/
 bool SwTemplNameField::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     switch ( nWhichId )
@@ -804,7 +782,7 @@ String SwDocStatFieldType::Expand(sal_uInt16 nSubType, sal_uInt32 nFmt) const
                 nFmt = (sal_uInt32)nNumberingType;
             break;
         default:
-            ASSERT( sal_False, "SwDocStatFieldType::Expand: unbekannter SubType" );
+            OSL_ENSURE( sal_False, "SwDocStatFieldType::Expand: unbekannter SubType" );
     }
 
     String sRet;
@@ -861,9 +839,6 @@ void SwDocStatField::ChangeExpansion( const SwFrm* pFrm )
                 pFrm->FindPageFrm()->GetPageDesc()->GetNumType().GetNumberingType() );
 }
 
-/*-----------------05.03.98 11:38-------------------
-
---------------------------------------------------*/
 bool SwDocStatField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     switch ( nWhichId )
@@ -876,9 +851,7 @@ bool SwDocStatField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
     }
     return true;
 }
-/*-----------------05.03.98 11:38-------------------
 
---------------------------------------------------*/
 bool SwDocStatField::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     bool bRet = false;
@@ -1456,7 +1429,7 @@ String SwHiddenTxtField::Expand() const
 
 void SwHiddenTxtField::Evaluate(SwDoc* pDoc)
 {
-    ASSERT(pDoc, Wo ist das Dokument Seniore);
+    OSL_ENSURE(pDoc, "Wo ist das Dokument Seniore");
 
     if( TYP_CONDTXTFLD == nSubType )
     {
@@ -1749,9 +1722,7 @@ SwField* SwHiddenParaField::Copy() const
 
     return pFld;
 }
-/*-----------------05.03.98 13:25-------------------
 
---------------------------------------------------*/
 bool SwHiddenParaField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     switch ( nWhichId )
@@ -1771,9 +1742,7 @@ bool SwHiddenParaField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
     }
     return true;
 }
-/*-----------------05.03.98 13:25-------------------
 
---------------------------------------------------*/
 bool SwHiddenParaField::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     switch ( nWhichId )
@@ -1914,9 +1883,6 @@ sal_uInt32 SwPostItField::GetNumberOfParagraphs() const
     return (mpText) ? mpText->Count() : 1;
 }
 
-/*-----------------05.03.98 13:42-------------------
-
---------------------------------------------------*/
 bool SwPostItField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     switch( nWhichId )
@@ -1977,10 +1943,6 @@ bool SwPostItField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
     return true;
 }
 
-
-/*-----------------05.03.98 13:42-------------------
-
---------------------------------------------------*/
 bool SwPostItField::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     switch( nWhichId )
@@ -1999,7 +1961,6 @@ bool SwPostItField::PutValue( const uno::Any& rAny, USHORT nWhichId )
         break;
     case FIELD_PROP_TEXT:
         DBG_ERROR("Not implemented!");
-        // ::GetString( rAny, sTxt );
         break;
     case FIELD_PROP_DATE:
         if( rAny.getValueType() == ::getCppuType((util::Date*)0) )
@@ -2070,7 +2031,7 @@ String SwExtUserFieldType::Expand(sal_uInt16 nSub, sal_uInt32 ) const
     case EU_STATE:          nRet = USER_OPT_STATE;          break;
     case EU_FATHERSNAME:    nRet = USER_OPT_FATHERSNAME;    break;
     case EU_APARTMENT:      nRet = USER_OPT_APARTMENT;      break;
-    default:                ASSERT( !this, "Field unknown");
+    default:             OSL_ENSURE( !this, "Field unknown");
     }
     if( USHRT_MAX != nRet )
     {
@@ -2122,9 +2083,6 @@ void SwExtUserField::SetSubType(sal_uInt16 nSub)
     nType = nSub;
 }
 
-/*-----------------05.03.98 14:14-------------------
-
---------------------------------------------------*/
 bool SwExtUserField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     switch( nWhichId )
@@ -2150,9 +2108,7 @@ bool SwExtUserField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
     }
     return true;
 }
-/*-----------------05.03.98 14:14-------------------
 
---------------------------------------------------*/
 bool SwExtUserField::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     switch( nWhichId )
@@ -2242,9 +2198,6 @@ void SwRefPageSetField::SetPar2(const String& rStr)
     SetOffset( (short) rStr.ToInt32() );
 }
 
-/*-----------------05.03.98 14:52-------------------
-
---------------------------------------------------*/
 bool SwRefPageSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     switch( nWhichId )
@@ -2260,9 +2213,7 @@ bool SwRefPageSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
     }
     return true;
 }
-/*-----------------05.03.98 14:52-------------------
 
---------------------------------------------------*/
 bool SwRefPageSetField::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     switch( nWhichId )
@@ -2357,8 +2308,8 @@ sal_uInt16 SwRefPageGetFieldType::MakeSetList( _SetGetExpFlds& rTmpLst )
                 {
                     // einen sdbcx::Index fuers bestimmen vom TextNode anlegen
                     SwPosition aPos( pDoc->GetNodes().GetEndOfPostIts() );
-#ifdef DBG_UTIL
-                    ASSERT( GetBodyTxtNode( *pDoc, aPos, *pFrm ),
+#if OSL_DEBUG_LEVEL > 1
+                    OSL_ENSURE( GetBodyTxtNode( *pDoc, aPos, *pFrm ),
                             "wo steht das Feld" );
 #else
                     GetBodyTxtNode( *pDoc, aPos, *pFrm );
@@ -2467,7 +2418,7 @@ void SwRefPageGetField::ChangeExpansion( const SwFrm* pFrm,
 
     sTxt.Erase();
 
-    ASSERT( !pFrm->IsInDocBody(), "Flag ist nicht richtig, Frame steht im DocBody" );
+    OSL_ENSURE( !pFrm->IsInDocBody(), "Flag ist nicht richtig, Frame steht im DocBody" );
 
     // sammel erstmal alle SetPageRefFelder ein.
     _SetGetExpFlds aTmpLst( 10, 5 );
@@ -2513,9 +2464,7 @@ void SwRefPageGetField::ChangeExpansion( const SwFrm* pFrm,
         pGetFld->SetText( FormatNumber( nPageNum, nTmpFmt ) );
     }
 }
-/*-----------------05.03.98 14:52-------------------
 
---------------------------------------------------*/
 bool SwRefPageGetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     switch( nWhichId )
@@ -2531,9 +2480,7 @@ bool SwRefPageGetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
     }
     return true;
 }
-/*-----------------05.03.98 14:52-------------------
 
---------------------------------------------------*/
 bool SwRefPageGetField::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     switch( nWhichId )
@@ -2545,8 +2492,6 @@ bool SwRefPageGetField::PutValue( const uno::Any& rAny, USHORT nWhichId )
             if(nSet <= SVX_NUM_PAGEDESC )
                 SetFormat(nSet);
             else {
-                //exception(wrong_value)
-                ;
             }
         }
         break;
@@ -2649,9 +2594,6 @@ void SwJumpEditField::SetPar2(const String& rStr)
     sHelp = rStr;
 }
 
-/*-----------------05.03.98 15:00-------------------
-
---------------------------------------------------*/
 bool SwJumpEditField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     switch( nWhichId )
@@ -2665,7 +2607,6 @@ bool SwJumpEditField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
             case JE_FMT_FRAME:  nRet = text::PlaceholderType::TEXTFRAME; break;
             case JE_FMT_GRAPHIC:nRet = text::PlaceholderType::GRAPHIC; break;
             case JE_FMT_OLE:    nRet = text::PlaceholderType::OBJECT; break;
-//          case JE_FMT_TEXT:
             default:
                 nRet = text::PlaceholderType::TEXT; break;
             }
@@ -2683,9 +2624,7 @@ bool SwJumpEditField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
     }
     return true;
 }
-/*-----------------05.03.98 15:00-------------------
 
---------------------------------------------------*/
 bool SwJumpEditField::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     switch( nWhichId )
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 1d96f6eb0f3f..f070db9a8c33 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -143,7 +143,7 @@ SwTxtNode* GetFirstTxtNode( const SwDoc& rDoc, SwPosition& rPos,
         while( 0 != (pCNd = rNodes.GoNext( &rPos.nNode ) ) &&
                 0 == ( pTxtNode = pCNd->GetTxtNode() ) )
                         ;
-        ASSERT( pTxtNode, "wo ist der 1.TextNode" );
+        OSL_ENSURE( pTxtNode, "wo ist der 1.TextNode" );
         rPos.nContent.Assign( pTxtNode, 0 );
     }
     else if ( !pCFrm->IsValid() )
@@ -172,7 +172,7 @@ const SwTxtNode* GetBodyTxtNode( const SwDoc& rDoc, SwPosition& rPos,
         {
             // hole das FlyFormat
             SwFrmFmt* pFlyFmt = ((SwFlyFrm*)pLayout)->GetFmt();
-            ASSERT( pFlyFmt, "kein FlyFormat gefunden, wo steht das Feld" );
+            OSL_ENSURE( pFlyFmt, "kein FlyFormat gefunden, wo steht das Feld" );
 
             const SwFmtAnchor &rAnchor = pFlyFmt->GetAnchor();
 
@@ -187,7 +187,7 @@ const SwTxtNode* GetBodyTxtNode( const SwDoc& rDoc, SwPosition& rPos,
                      (FLY_AT_CHAR == rAnchor.GetAnchorId()) ||
                      (FLY_AS_CHAR == rAnchor.GetAnchorId()))
             {
-                ASSERT( rAnchor.GetCntntAnchor(), "keine gueltige Position" );
+                OSL_ENSURE( rAnchor.GetCntntAnchor(), "keine gueltige Position" );
                 rPos = *rAnchor.GetCntntAnchor();
                 pTxtNode = rPos.nNode.GetNode().GetTxtNode();
                 if ( FLY_AT_PARA == rAnchor.GetAnchorId() )
@@ -340,7 +340,7 @@ void SwGetExpField::ChangeExpansion( const SwFrm& rFrm, const SwTxtFld& rFld )
     if( bIsInBodyTxt )      // nur Felder in Footer, Header, FootNote, Flys
         return;
 
-    ASSERT( !rFrm.IsInDocBody(), "Flag ist nicht richtig, Frame steht im DocBody" );
+    OSL_ENSURE( !rFrm.IsInDocBody(), "Flag ist nicht richtig, Frame steht im DocBody" );
 
     // bestimme mal das Dokument (oder geht es noch einfacher?)
     const SwTxtNode* pTxtNode = &rFld.GetTxtNode();
@@ -421,9 +421,6 @@ void SwGetExpField::SetLanguage(USHORT nLng)
         SwValueField::SetLanguage(nLng);
 }
 
-/*-----------------07.03.98 16:08-------------------
-
---------------------------------------------------*/
 bool SwGetExpField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     switch( nWhichId )
@@ -460,9 +457,7 @@ bool SwGetExpField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
     }
     return true;
 }
-/*-----------------07.03.98 16:08-------------------
 
---------------------------------------------------*/
 bool SwGetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     sal_Int32 nTmp = 0;
@@ -646,16 +641,13 @@ void SwSetExpFieldType::SetChapter( SwSetExpField& rFld, const SwNode& rNd )
             }
             else
             {
-                ASSERT( false,
+                OSL_ENSURE( false,
                         "<SwSetExpFieldType::SetChapter(..)> - text node with numbering rule, but without number. This is a serious defect -> inform OD" );
             }
         }
     }
 }
 
-/* -----------------24.03.99 09:44-------------------
- *
- * --------------------------------------------------*/
 bool SwSetExpFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     switch( nWhichId )
@@ -1067,9 +1059,6 @@ String SwInputField::Expand() const
     return sRet;
 }
 
-/*-----------------06.03.98 11:12-------------------
-
---------------------------------------------------*/
 bool SwInputField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     switch( nWhichId )
@@ -1091,9 +1080,7 @@ bool SwInputField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
     }
     return true;
 }
-/*-----------------06.03.98 11:12-------------------
 
---------------------------------------------------*/
 bool SwInputField::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     switch( nWhichId )
@@ -1177,9 +1164,7 @@ void SwInputField::SetSubType(USHORT nSub)
 {
     nSubType = nSub;
 }
-/*-----------------05.03.98 17:22-------------------
 
---------------------------------------------------*/
 bool SwSetExpField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     switch( nWhichId )
@@ -1244,9 +1229,7 @@ bool SwSetExpField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
     }
     return true;
 }
-/*-----------------05.03.98 17:22-------------------
 
---------------------------------------------------*/
 bool SwSetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     sal_Int32 nTmp32 = 0;
@@ -1270,8 +1253,6 @@ bool SwSetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId )
             if(nTmp16 <= SVX_NUMBER_NONE )
                 SetFormat(nTmp16);
             else {
-                //exception(wrong_value)
-                ;
             }
         }
         break;
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 83eb027c37a6..c3c9f643bfe9 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -159,7 +159,7 @@ SwFieldType::SwFieldType( USHORT nWhichId )
     DBG_CTOR( SwFieldType, 0 );
 }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
 SwFieldType::~SwFieldType()
 {
@@ -193,7 +193,7 @@ SwField::SwField(SwFieldType* pTyp, sal_uInt32 nFmt, USHORT nLng) :
     bIsAutomaticLanguage(TRUE),
     nFormat(nFmt)
 {
-    ASSERT( pTyp, "SwField: ungueltiger SwFieldType" );
+    OSL_ENSURE( pTyp, "SwField: ungueltiger SwFieldType" );
     pType = pTyp;
 }
 
@@ -205,18 +205,14 @@ SwField::~SwField()
     Beschreibung: Statt Umweg ueber den Typ
  --------------------------------------------------------------------*/
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 USHORT SwField::Which() const
 {
-    ASSERT(pType, "Kein Typ vorhanden");
+    OSL_ENSURE(pType, "Kein Typ vorhanden");
     return pType->Which();
 }
 #endif
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 USHORT SwField::GetTypeId() const
 {
 
@@ -312,13 +308,11 @@ void SwField::SetPar2(const String& )
 
 USHORT SwField::GetSubType() const
 {
-//  ASSERT(0, "Sorry Not implemented");
     return 0;
 }
 
 void SwField::SetSubType(USHORT )
 {
-//  ASSERT(0, "Sorry Not implemented");
 }
 
 bool  SwField::QueryValue( uno::Any& rVal, USHORT nWhichId ) const
@@ -362,7 +356,7 @@ bool SwField::PutValue( const uno::Any& rVal, USHORT nWhichId )
 
 SwFieldType* SwField::ChgTyp( SwFieldType* pNewType )
 {
-    ASSERT( pNewType && pNewType->Which() == pType->Which(),
+    OSL_ENSURE( pNewType && pNewType->Which() == pType->Which(),
             "kein Typ oder ungleiche Typen" );
 
     SwFieldType* pOld = pType;
@@ -459,7 +453,7 @@ String FormatNumber(USHORT nNum, sal_uInt32 nFormat)
         return  String::CreateFromInt32( nNum );
     SvxNumberType aNumber;
 
-    ASSERT(nFormat != SVX_NUM_NUMBER_NONE, "Falsches Nummern-Format" );
+    OSL_ENSURE(nFormat != SVX_NUM_NUMBER_NONE, "Falsches Nummern-Format" );
 
     aNumber.SetNumberingType((sal_Int16)nFormat);
     return aNumber.GetNumStr(nNum);
@@ -523,7 +517,7 @@ String SwValueFieldType::ExpandValue( const double& rVal,
             else
                 nFmt = nNewFormat;
         }
-        ASSERT(pEntry, "Unbekanntes Zahlenformat!");
+        OSL_ENSURE(pEntry, "Unbekanntes Zahlenformat!");
     }
 
     if( pFormatter->IsTextFormat( nFmt ) )
@@ -538,10 +532,6 @@ String SwValueFieldType::ExpandValue( const double& rVal,
     return sExpand;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 void SwValueFieldType::DoubleToString( String &rValue, const double &rVal,
                                         sal_uInt32 nFmt) const
 {
@@ -552,10 +542,6 @@ void SwValueFieldType::DoubleToString( String &rValue, const double &rVal,
         DoubleToString(rValue, rVal, pEntry->GetLanguage());
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 void SwValueFieldType::DoubleToString( String &rValue, const double &rVal,
                                         USHORT nLng ) const
 {
@@ -686,17 +672,13 @@ void SwValueField::SetLanguage( USHORT nLng )
                 }
                 SetFormat( nNewFormat );
             }
-            ASSERT(pEntry, "Unbekanntes Zahlenformat!");
+            OSL_ENSURE(pEntry, "Unbekanntes Zahlenformat!");
         }
     }
 
     SwField::SetLanguage(nLng);
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 double SwValueField::GetValue() const
 {
     return fValue;
@@ -722,19 +704,11 @@ SwFormulaField::SwFormulaField( const SwFormulaField& rFld )
 {
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 String SwFormulaField::GetFormula() const
 {
     return sFormula;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 void SwFormulaField::SetFormula(const String& rStr)
 {
     sFormula = rStr;
@@ -750,10 +724,6 @@ void SwFormulaField::SetFormula(const String& rStr)
     }
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 void SwFormulaField::SetExpandedFormula( const String& rStr )
 {
     sal_uInt32 nFmt(GetFormat());
@@ -776,10 +746,6 @@ void SwFormulaField::SetExpandedFormula( const String& rStr )
     sFormula = rStr;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 String SwFormulaField::GetExpandedFormula() const
 {
     sal_uInt32 nFmt(GetFormat());
diff --git a/sw/source/core/fields/flddat.cxx b/sw/source/core/fields/flddat.cxx
index 6bc6bc5421d4..f9f092c04861 100644
--- a/sw/source/core/fields/flddat.cxx
+++ b/sw/source/core/fields/flddat.cxx
@@ -46,10 +46,6 @@ SwDateTimeFieldType::SwDateTimeFieldType(SwDoc* pInitDoc)
     : SwValueFieldType( pInitDoc, RES_DATETIMEFLD )
 {}
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 SwFieldType* SwDateTimeFieldType::Copy() const
 {
     SwDateTimeFieldType *pTmp = new SwDateTimeFieldType(GetDoc());
@@ -80,10 +76,6 @@ SwDateTimeField::SwDateTimeField(SwDateTimeFieldType* pInitType, USHORT nSub, UL
     }
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 String SwDateTimeField::Expand() const
 {
     double fVal;
@@ -102,10 +94,6 @@ String SwDateTimeField::Expand() const
     return ExpandValue(fVal, GetFormat(), GetLanguage());
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 SwField* SwDateTimeField::Copy() const
 {
     SwDateTimeField *pTmp =
@@ -119,36 +107,21 @@ SwField* SwDateTimeField::Copy() const
     return pTmp;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 USHORT SwDateTimeField::GetSubType() const
 {
     return nSubType;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 void SwDateTimeField::SetSubType(USHORT nType)
 {
     nSubType = nType;
 }
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
 
 void SwDateTimeField::SetPar2(const String& rStr)
 {
     nOffset = rStr.ToInt32();
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 String SwDateTimeField::GetPar2() const
 {
     if (nOffset)
@@ -157,19 +130,11 @@ String SwDateTimeField::GetPar2() const
         return aEmptyStr;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 void SwDateTimeField::SetDateTime(const DateTime& rDT)
 {
     SetValue(GetDateTime(GetDoc(), rDT));
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 double SwDateTimeField::GetDateTime(SwDoc* pDoc, const DateTime& rDT)
 {
     SvNumberFormatter* pFormatter = pDoc->GetNumberFormatter();
@@ -180,10 +145,6 @@ double SwDateTimeField::GetDateTime(SwDoc* pDoc, const DateTime& rDT)
     return fResult;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 double SwDateTimeField::GetValue() const
 {
     if (IsFixed())
@@ -192,10 +153,6 @@ double SwDateTimeField::GetValue() const
         return GetDateTime(GetDoc(), DateTime());
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 Date SwDateTimeField::GetDate(BOOL bUseOffset) const
 {
     SvNumberFormatter* pFormatter = GetDoc()->GetNumberFormatter();
@@ -211,10 +168,6 @@ Date SwDateTimeField::GetDate(BOOL bUseOffset) const
     return aDate;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 Time SwDateTimeField::GetTime(BOOL bUseOffset) const
 {
     double fDummy;
@@ -226,9 +179,6 @@ Time SwDateTimeField::GetTime(BOOL bUseOffset) const
     return (Time)aDT;
 }
 
-/*-----------------04.03.98 11:05-------------------
-
---------------------------------------------------*/
 bool SwDateTimeField::QueryValue( uno::Any& rVal, USHORT nWhichId ) const
 {
     switch( nWhichId )
@@ -271,9 +221,7 @@ bool SwDateTimeField::QueryValue( uno::Any& rVal, USHORT nWhichId ) const
     }
     return true;
 }
-/*-----------------04.03.98 11:05-------------------
 
---------------------------------------------------*/
 bool SwDateTimeField::PutValue( const uno::Any& rVal, USHORT nWhichId )
 {
     sal_Int32 nTmp = 0;
diff --git a/sw/source/core/fields/fldlst.cxx b/sw/source/core/fields/fldlst.cxx
index 87bf21dd8f93..6f704a34a25b 100644
--- a/sw/source/core/fields/fldlst.cxx
+++ b/sw/source/core/fields/fldlst.cxx
@@ -115,7 +115,7 @@ USHORT SwInputFieldList::Count() const
 SwField* SwInputFieldList::GetField(USHORT nId)
 {
     const SwTxtFld* pTxtFld = (*pSrtLst)[ nId ]->GetFld();
-    ASSERT( pTxtFld, "kein TextFld" );
+    OSL_ENSURE( pTxtFld, "kein TextFld" );
     return (SwField*)pTxtFld->GetFld().GetFld();
 }
 
diff --git a/sw/source/core/fields/macrofld.cxx b/sw/source/core/fields/macrofld.cxx
index 5aef3045b2f7..3b8104b9b31b 100644
--- a/sw/source/core/fields/macrofld.cxx
+++ b/sw/source/core/fields/macrofld.cxx
@@ -176,9 +176,6 @@ String SwMacroField::GetPar2() const
     return aText;
 }
 
-/*-----------------05.03.98 13:38-------------------
-
---------------------------------------------------*/
 bool SwMacroField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     switch( nWhichId )
@@ -200,9 +197,7 @@ bool SwMacroField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
     }
     return true;
 }
-/*-----------------05.03.98 13:38-------------------
 
---------------------------------------------------*/
 bool SwMacroField::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     String sTmp;
diff --git a/sw/source/core/fields/makefile.mk b/sw/source/core/fields/makefile.mk
index 280fff6aae88..358b3f7afcd8 100644
--- a/sw/source/core/fields/makefile.mk
+++ b/sw/source/core/fields/makefile.mk
@@ -63,7 +63,10 @@ CXXFILES = \
 
 
 SLOFILES =	\
-        $(SLO)$/textapi.obj \
+        $(EXCEPTIONSFILES) \
+        $(SLO)$/scrptfld.obj
+
+EXCEPTIONSFILES = \
         $(SLO)$/authfld.obj \
         $(SLO)$/cellfml.obj \
         $(SLO)$/chpfld.obj \
@@ -76,18 +79,13 @@ SLOFILES =	\
         $(SLO)$/flddat.obj \
         $(SLO)$/flddropdown.obj \
         $(SLO)$/fldlst.obj \
-        $(SLO)$/scrptfld.obj \
         $(SLO)$/macrofld.obj \
         $(SLO)$/postithelper.obj \
         $(SLO)$/reffld.obj \
         $(SLO)$/tblcalc.obj \
+        $(SLO)$/textapi.obj \
         $(SLO)$/usrfld.obj
 
-EXCEPTIONSFILES = \
-        $(SLO)$/flddropdown.obj \
-        $(SLO)$/postithelper.obj \
-        $(SLO)$/docufld.obj 
-
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/sw/source/core/fields/postithelper.cxx b/sw/source/core/fields/postithelper.cxx
index fbef95352834..fb57eebdeef3 100644
--- a/sw/source/core/fields/postithelper.cxx
+++ b/sw/source/core/fields/postithelper.cxx
@@ -65,9 +65,9 @@ struct LayoutInfoOrder
         else
         {
             // corresponding <SwFrm> instances are in different repeating table header rows
-            ASSERT( rLayoutInfo.mpAnchorFrm->FindTabFrm(),
+            OSL_ENSURE( rLayoutInfo.mpAnchorFrm->FindTabFrm(),
                     "<LayoutInfoOrder::operator()> - table frame not found" );
-            ASSERT( rNewLayoutInfo.mpAnchorFrm->FindTabFrm(),
+            OSL_ENSURE( rNewLayoutInfo.mpAnchorFrm->FindTabFrm(),
                     "<LayoutInfoOrder::operator()> - table frame not found" );
             const SwTabFrm* pLayoutInfoTabFrm( rLayoutInfo.mpAnchorFrm->FindTabFrm() );
             const SwTabFrm* pNewLayoutInfoTabFrm( rNewLayoutInfo.mpAnchorFrm->FindTabFrm() );
@@ -206,21 +206,4 @@ sw::sidebarwindows::SwSidebarWin* SwAnnotationItem::GetSidebarWindow(
                                                 pFmtFld );
 }
 
-/*
-SwPosition SwRedCommentItem::GetAnchorPosition()
-{
-    return *pRedline->Start();
-}
-
-SwSidebarWin* SwRedCommentItem::GetSidebarWindow(Window* pParent, WinBits nBits,SwPostItMgr* aMgr,SwPostItBits aBits)
-{
-    return new SwRedComment(pParent,nBits,aMgr,aBits,pRedline);
-}
-
-bool SwRedCommentItem::UseElement()
-{
-    return true;
-}
-*/
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 6158a5c55392..f94eba3112b6 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -482,7 +482,7 @@ String SwGetRefField::MakeRefNumStr( const SwTxtNode& rTxtNodeOfField,
     if ( rTxtNodeOfReferencedItem.HasNumber() &&
          rTxtNodeOfReferencedItem.IsCountedInList() )
     {
-        ASSERT( rTxtNodeOfReferencedItem.GetNum(),
+        OSL_ENSURE( rTxtNodeOfReferencedItem.GetNum(),
                 "<SwGetRefField::MakeRefNumStr(..)> - referenced paragraph has number, but no <SwNodeNum> instance --> please inform OD!" );
 
         // Determine, up to which level the superior list labels have to be
@@ -538,7 +538,7 @@ String SwGetRefField::MakeRefNumStr( const SwTxtNode& rTxtNodeOfField,
             ( nRestrictInclToThisLevel < rTxtNodeOfReferencedItem.GetActualListLevel() &&
               ( nRefNumFormat == REF_NUMBER || nRefNumFormat == REF_NUMBER_FULL_CONTEXT ) ) );
 
-        ASSERT( rTxtNodeOfReferencedItem.GetNumRule(),
+        OSL_ENSURE( rTxtNodeOfReferencedItem.GetNumRule(),
                 "<SwGetRefField::MakeRefNumStr(..)> - referenced numbered paragraph has no numbering rule set --> please inform OD!" );
         return rTxtNodeOfReferencedItem.GetNumRule()->MakeRefNumString(
                                             *(rTxtNodeOfReferencedItem.GetNum()),
@@ -581,9 +581,6 @@ String SwGetRefField::GetPar2() const
     return Expand();
 }
 
-/*-----------------06.03.98 13:34-------------------
-
---------------------------------------------------*/
 bool SwGetRefField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     switch( nWhichId )
@@ -655,9 +652,7 @@ bool SwGetRefField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
     }
     return true;
 }
-/*-----------------06.03.98 13:34-------------------
 
---------------------------------------------------*/
 bool SwGetRefField::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     String sTmp;
@@ -732,9 +727,7 @@ bool SwGetRefField::PutValue( const uno::Any& rAny, USHORT nWhichId )
     }
     return true;
 }
-/* -----------------------------11.01.2002 12:50------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwGetRefField::ConvertProgrammaticToUIName()
 {
     if(GetTyp() && REF_SEQUENCEFLD == nSubType)
@@ -816,7 +809,7 @@ SwTxtNode* SwGetRefFieldType::FindAnchor( SwDoc* pDoc, const String& rRefMark,
                                         USHORT nSubType, USHORT nSeqNo,
                                         USHORT* pStt, USHORT* pEnd )
 {
-    ASSERT( pStt, "warum wird keine StartPos abgefragt?" );
+    OSL_ENSURE( pStt, "warum wird keine StartPos abgefragt?" );
 
     SwTxtNode* pTxtNd = 0;
     switch( nSubType )
@@ -877,7 +870,7 @@ SwTxtNode* SwGetRefFieldType::FindAnchor( SwDoc* pDoc, const String& rRefMark,
                         // --> OD 2007-10-18 #i81002#
                         if(dynamic_cast< ::sw::mark::CrossRefBookmark const *>(pBkmk))
                         {
-                            ASSERT( pTxtNd,
+                            OSL_ENSURE( pTxtNd,
                                     "<SwGetRefFieldType::FindAnchor(..)> - node marked by cross-reference bookmark isn't a text node --> crash" );
                             *pEnd = pTxtNd->Len();
                         }
diff --git a/sw/source/core/fields/scrptfld.cxx b/sw/source/core/fields/scrptfld.cxx
index 9d5e808d985a..540b5390a150 100644
--- a/sw/source/core/fields/scrptfld.cxx
+++ b/sw/source/core/fields/scrptfld.cxx
@@ -105,9 +105,7 @@ String SwScriptField::GetPar2() const
 {
     return sCode;
 }
-/*-----------------05.03.98 15:00-------------------
 
---------------------------------------------------*/
 bool SwScriptField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     switch( nWhichId )
@@ -126,9 +124,7 @@ bool SwScriptField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
     }
     return true;
 }
-/*-----------------05.03.98 15:00-------------------
 
---------------------------------------------------*/
 bool SwScriptField::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     switch( nWhichId )
diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx
index 5ffe9084ba7b..d0f338100af0 100644
--- a/sw/source/core/fields/tblcalc.cxx
+++ b/sw/source/core/fields/tblcalc.cxx
@@ -189,10 +189,6 @@ void SwTblField::SetPar2(const String& rStr)
     SetFormula( rStr );
 }
 
-
-/*-----------------04.03.98 10:33-------------------
-
---------------------------------------------------*/
 bool SwTblField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     bool bRet = true;
@@ -224,9 +220,7 @@ bool SwTblField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
     }
     return bRet;
 }
-/*-----------------04.03.98 10:33-------------------
 
---------------------------------------------------*/
 bool SwTblField::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     bool bRet = true;
diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx
index c267b03d52d0..7f6d93688665 100644
--- a/sw/source/core/fields/usrfld.cxx
+++ b/sw/source/core/fields/usrfld.cxx
@@ -128,9 +128,6 @@ void SwUserField::SetSubType(sal_uInt16 nSub)
     nSubType = nSub & 0xff00;
 }
 
-/*-----------------09.03.98 08:04-------------------
-
---------------------------------------------------*/
 bool SwUserField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     switch( nWhichId )
@@ -155,9 +152,7 @@ bool SwUserField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
     }
     return true;
 }
-/*-----------------09.03.98 08:04-------------------
 
---------------------------------------------------*/
 bool SwUserField::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     switch( nWhichId )
@@ -308,9 +303,6 @@ void SwUserFieldType::SetContent( const String& rStr, sal_uInt32 nFmt )
     }
 }
 
-/*-----------------04.03.98 17:05-------------------
-
---------------------------------------------------*/
 bool SwUserFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
 {
     switch( nWhichId )
@@ -332,9 +324,7 @@ bool SwUserFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
     }
     return true;
 }
-/*-----------------04.03.98 17:05-------------------
 
---------------------------------------------------*/
 bool SwUserFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId )
 {
     switch( nWhichId )
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 65817f3ed00c..3cf877e4eaaf 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -103,7 +103,7 @@ using namespace ::com::sun::star;
 
 BOOL SwFEShell::Copy( SwDoc* pClpDoc, const String* pNewClpTxt )
 {
-    ASSERT( pClpDoc, "kein Clipboard-Dokument"  );
+    OSL_ENSURE( pClpDoc, "kein Clipboard-Dokument"  );
 
     pClpDoc->DoUndo( FALSE );       // immer auf FALSE !!
 
@@ -169,7 +169,7 @@ BOOL SwFEShell::Copy( SwDoc* pClpDoc, const String* pNewClpTxt )
         if( rSpzFrmFmts[ 0 ] != pFlyFmt )
         {
             USHORT nPos = rSpzFrmFmts.GetPos( pFlyFmt );
-            ASSERT( nPos != USHRT_MAX, "Fly steht nicht im Spz-Array" );
+            OSL_ENSURE( nPos != USHRT_MAX, "Fly steht nicht im Spz-Array" );
 
             rSpzFrmFmts.Remove( nPos );
             rSpzFrmFmts.Insert( pFlyFmt, 0 );
@@ -468,8 +468,8 @@ BOOL SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
 {
     BOOL bRet = FALSE;
 
-    ASSERT( pDestShell, "Copy ohne DestShell." );
-    ASSERT( this == pDestShell || !pDestShell->IsObjSelected(),
+    OSL_ENSURE( pDestShell, "Copy ohne DestShell." );
+    OSL_ENSURE( this == pDestShell || !pDestShell->IsObjSelected(),
             "Dest-Shell darf nie im Obj-Modus sein" );
 
     SET_CURR_SHELL( pDestShell );
@@ -550,7 +550,7 @@ BOOL SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
                 aNewAnch = pPg->Frm().Pos();
         }
         else {
-            ASSERT( !this, "was fuer ein Anchor ist es denn?" );
+            OSL_ENSURE( !this, "was fuer ein Anchor ist es denn?" );
         }
 
         if( bRet )
@@ -707,7 +707,7 @@ namespace {
 BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames )
 {
     SET_CURR_SHELL( this );
-    ASSERT( pClpDoc, "kein Clipboard-Dokument"  );
+    OSL_ENSURE( pClpDoc, "kein Clipboard-Dokument"  );
     const USHORT nStartPageNumber = GetPhyPageNum();
     // dann bis zum Ende vom Nodes Array
     SwNodeIndex aIdx( pClpDoc->GetNodes().GetEndOfExtras(), 2 );
@@ -773,7 +773,7 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames )
         while( nCount )
         {
             --nCount;
-            ASSERT( aIdx.GetNode().GetCntntNode(), "Who filled the clipboard?!" )
+            OSL_ENSURE( aIdx.GetNode().GetCntntNode(), "Who filled the clipboard?!" );
             if( aIdx.GetNode().GetCntntNode() ) // robust
             {
                 Insertion aInsertion( PaMPtr( new SwPaM( aIdx ) ),
@@ -874,7 +874,7 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames )
                 // dann die Tabelle "relativ" kopieren
                 SwTableBox* pBox = pDestNd->GetTable().GetTblBox(
                                         pSttNd->GetIndex() );
-                ASSERT( pBox, "Box steht nicht in dieser Tabelle" );
+                OSL_ENSURE( pBox, "Box steht nicht in dieser Tabelle" );
                 aBoxes.Insert( pBox );
             }
 
@@ -1011,7 +1011,7 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames )
                         }
                         else
                         {
-                            ASSERT( RES_DRAWFRMFMT == pNew->Which(), "Neues Format.");
+                            OSL_ENSURE( RES_DRAWFRMFMT == pNew->Which(), "Neues Format.");
                             // --> OD 2005-09-01 #i52780# - drawing object has
                             // to be made visible on paste.
                             {
@@ -1131,9 +1131,6 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames )
     return bRet;
 }
 
-/*-- 14.06.2004 13:31:17---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 BOOL SwFEShell::PastePages( SwFEShell& rToFill, USHORT nStartPage, USHORT nEndPage)
 {
     Push();
@@ -1223,7 +1220,7 @@ BOOL SwFEShell::PastePages( SwFEShell& rToFill, USHORT nStartPage, USHORT nEndPa
 
 BOOL SwFEShell::GetDrawObjGraphic( ULONG nFmt, Graphic& rGrf ) const
 {
-    ASSERT( Imp()->HasDrawView(), "GetDrawObjGraphic without DrawView?" );
+    OSL_ENSURE( Imp()->HasDrawView(), "GetDrawObjGraphic without DrawView?" );
     const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkedObjectList();
     BOOL bConvert = TRUE;
     if( rMrkList.GetMarkCount() )
@@ -1438,7 +1435,7 @@ void SwFEShell::Paste( SvStream& rStrm, USHORT nAction, const Point* pPt )
                         const SwTxtFrm* pTmp = (SwTxtFrm*)pAnchor;
                         do {
                             pTmp = pTmp->FindMaster();
-                            ASSERT( pTmp, "Where's my Master?" );
+                            OSL_ENSURE( pTmp, "Where's my Master?" );
                         } while( pTmp->IsFollow() );
                         pAnchor = pTmp;
                     }
diff --git a/sw/source/core/frmedt/fedesc.cxx b/sw/source/core/frmedt/fedesc.cxx
index 4a27225c34e0..b24461fab3b2 100644
--- a/sw/source/core/frmedt/fedesc.cxx
+++ b/sw/source/core/frmedt/fedesc.cxx
@@ -68,14 +68,14 @@ USHORT SwFEShell::GetPageDescCnt() const
 
 void SwFEShell::ChgCurPageDesc( const SwPageDesc& rDesc )
 {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     //Die SS veraendert keinen PageDesc, sondern setzt nur das Attribut.
     //Der Pagedesc muss im Dokument vorhanden sein!
     BOOL bFound = FALSE;
     for ( USHORT nTst = 0; nTst < GetPageDescCnt(); ++nTst )
         if ( &rDesc == &GetPageDesc( nTst ) )
             bFound = TRUE;
-    ASSERT( bFound, "ChgCurPageDesc mit ungueltigem Descriptor." );
+    OSL_ENSURE( bFound, "ChgCurPageDesc mit ungueltigem Descriptor." );
 #endif
 
     StartAllAction();
@@ -84,7 +84,7 @@ void SwFEShell::ChgCurPageDesc( const SwPageDesc& rDesc )
     const SwFrm *pFlow = 0;
     USHORT nPageNmOffset = 0;
 
-    ASSERT( !GetCrsr()->HasMark(), "ChgCurPageDesc nur ohne Selektion!");
+    OSL_ENSURE( !GetCrsr()->HasMark(), "ChgCurPageDesc nur ohne Selektion!");
 
     SET_CURR_SHELL( this );
     while ( pPage )
@@ -112,7 +112,7 @@ void SwFEShell::ChgCurPageDesc( const SwPageDesc& rDesc )
         {
             pPage   = (SwPageFrm*)pPage->GetNext();
             pFlow = pPage->FindFirstBodyCntnt();
-            ASSERT( pFlow, "Dokuemnt ohne Inhalt?!?" );
+            OSL_ENSURE( pFlow, "Dokuemnt ohne Inhalt?!?" );
         }
     }
 
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 0c000889ecaf..5428345e1d1f 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -195,7 +195,7 @@ BOOL lcl_FindAnchorPos( SwDoc& rDoc, const Point& rPt, const SwFrm& rFrm,
         break;
 
     default:
-        ASSERT( !&rDoc, "Falsche ID fuer neuen Anker." );
+        OSL_ENSURE( !&rDoc, "Falsche ID fuer neuen Anker." );
     }
 
     rSet.Put( aNewAnch );
@@ -218,8 +218,8 @@ sal_Bool lcl_ChkAndSetNewAnchor( const SwFlyFrm& rFly, SfxItemSet& rSet )
 
     SwDoc* pDoc = (SwDoc*)rFmt.GetDoc();
 
-#ifdef DBG_UTIL
-    ASSERT( !(nNew == FLY_AT_PAGE &&
+#if OSL_DEBUG_LEVEL > 1
+    OSL_ENSURE( !(nNew == FLY_AT_PAGE &&
         (FLY_AT_PARA==nOld || FLY_AT_CHAR==nOld || FLY_AS_CHAR==nOld ) &&
         pDoc->IsInHeaderFooter( rOldAnch.GetCntntAnchor()->nNode )),
             "Unerlaubter Ankerwechsel in Head/Foot." );
@@ -242,7 +242,7 @@ void SwFEShell::SelectFlyFrm( SwFlyFrm& rFrm, sal_Bool bNew )
     SwViewImp *pImpl = Imp();
     if( GetWin() && (bNew || !pImpl->GetDrawView()->AreObjectsMarked()) )
     {
-        ASSERT( rFrm.IsFlyFrm(), "SelectFlyFrm will einen Fly" );
+        OSL_ENSURE( rFrm.IsFlyFrm(), "SelectFlyFrm will einen Fly" );
 
         //Wenn der Fly bereits selektiert ist gibt es hier ja wohl nichts
         //zu tun.
@@ -253,13 +253,6 @@ void SwFEShell::SelectFlyFrm( SwFlyFrm& rFrm, sal_Bool bNew )
         if( rFrm.IsFlyInCntFrm() && rFrm.GetAnchorFrm() )
              rFrm.GetAnchorFrm()->SetCompletePaint();
 
-        // --> OD 2004-06-11 #i28701# - no format at all.
-//        //Hier wurde immer kalkuliert. Leider ist der Sonderfall Fly in Fly mit
-//        //Spalten u.U. sehr kritisch wenn der innenliegende zuerst formatiert
-//        //wird. Um kein Risiko einzugehen entschaerfen wir nur diesen Sonderfall.
-//        if( !rFrm.GetAnchorFrm()->IsInFly() )
-//            rFrm.Calc();
-
         if( pImpl->GetDrawView()->AreObjectsMarked() )
             pImpl->GetDrawView()->UnmarkAll();
 
@@ -337,8 +330,8 @@ const SwFrmFmt* SwFEShell::IsFlyInFly()
         const SwFrm* pFly = pObj->ISA(SwVirtFlyDrawObj) ?
             ((SwVirtFlyDrawObj*)pObj)->GetFlyFrm()->GetAnchorFrm() :
             ((SwDrawContact*)GetUserCall(pObj))->GetAnchorFrm( pObj );
-        ASSERT( pFly, "IsFlyInFly: Where's my anchor?" );
-        ASSERT( pFly->IsFlyFrm(), "IsFlyInFly: Funny anchor!" );
+        OSL_ENSURE( pFly, "IsFlyInFly: Where's my anchor?" );
+        OSL_ENSURE( pFly->IsFlyFrm(), "IsFlyInFly: Funny anchor!" );
         return ((SwFlyFrm*)pFly)->GetFmt();
     }
 
@@ -352,9 +345,7 @@ const SwFrmFmt* SwFEShell::IsFlyInFly()
         Point aPoint( aTmpPos );
         aPoint.X() -= 1;                    //nicht im Fly landen!!
         GetLayout()->GetCrsrOfst( &aPos, aPoint, &aState );
-        // OD 01.07.2003 #108784# - determine text frame by left-top-corner
-        // of object
-        //pTxtFrm = aPos.nNode.GetNode().GetCntntNode()->GetFrm( 0, 0, sal_False );
+        // #108784# - determine text frame by left-top-corner of object
         pTxtFrm = aPos.nNode.GetNode().GetCntntNode()->GetFrm( &aTmpPos, 0, sal_False );
     }
     const SwFrm *pTmp = ::FindAnchor( pTxtFrm, aTmpPos );
@@ -395,8 +386,6 @@ void SwFEShell::SetFlyPos( const Point& rAbsPos )
     else
     {
             const SwFrm *pAnch = pFly->GetAnchorFrm();
-            // --> OD 2004-06-11 #i28701# - no format here
-//          pAnch->Calc();
             Point aOrient( pAnch->Frm().Pos() );
 
         if ( pFly->IsFlyInCntFrm() )
@@ -407,8 +396,6 @@ void SwFEShell::SetFlyPos( const Point& rAbsPos )
         aOrient.Y() = rAbsPos.Y() - aOrient.Y();
         pFly->ChgRelPos( aOrient );
     }
-    // --> OD 2004-06-11 #i28701# - no format here
-//    pFly->Calc();
     CallChgLnk();       // rufe das AttrChangeNotify auf der UI-Seite.
 }
 
@@ -608,11 +595,11 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, sal_Bool bMoveIt )
             SwRect aTmpRect( aRet, rAbsPos );
             if( aTmpRect.HasArea() )
                 MakeVisible( aTmpRect );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
             //TODO: That doesn't seem to be intended
             if( Color(COL_TRANSPARENT) != GetOut()->GetLineColor() )
             {
-                ASSERT( FALSE, "Hey, Joe: Where's my Null Pen?" );
+                OSL_ENSURE( FALSE, "Hey, Joe: Where's my Null Pen?" );
                 GetOut()->SetLineColor( Color(COL_TRANSPARENT) );
             }
 #endif
@@ -656,9 +643,6 @@ const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, sal_Bool bAnchVali
             // we better get the current pCurCrsr instead of working with the
             // deleted one:
             pCrsr = GetCrsr();
-            // <--
-
-//          KillPams();
         }
         else
             bMoveCntnt = sal_False;
@@ -695,7 +679,7 @@ const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, sal_Bool bAnchVali
         break;
 
     default:
-        ASSERT( !this, "Was sollte das fuer ein Fly werden?" )
+        OSL_ENSURE( !this, "Was sollte das fuer ein Fly werden?" );
         break;
     }
 
@@ -861,7 +845,7 @@ void SwFEShell::Insert( const String& rGrfName, const String& rFltName,
                                 rFltName, pGraphic,
                                 pFlyAttrSet,
                                 pGrfAttrSet, pFrmFmt );
-        ASSERT( pFmt, "Doc->Insert(notxt) failed." );
+        OSL_ENSURE( pFmt, "Doc->Insert(notxt) failed." );
 
     } while( (pCursor = dynamic_cast<SwShellCrsr*>(pCursor->GetNext()))
              != pStartCursor );
@@ -891,7 +875,7 @@ SwFlyFrmFmt* SwFEShell::InsertObject( const svt::EmbeddedObjectRef&  xObj,
         FOREACHPAM_START( this )
             pFmt = GetDoc()->Insert(*PCURCRSR, xObj,
                                     pFlyAttrSet, pGrfAttrSet, pFrmFmt );
-            ASSERT( pFmt, "Doc->Insert(notxt) failed." );
+            OSL_ENSURE( pFmt, "Doc->Insert(notxt) failed." );
 
         FOREACHPAM_END()
     EndAllAction();
@@ -1057,7 +1041,7 @@ sal_Bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const
         SwFrm* pCurrFrm( GetCurrFrm() );
         if ( !pCurrFrm )
         {
-            ASSERT( false,
+            OSL_ENSURE( false,
                     "<SwFEShell::GetFlyFrmAttr(..)> - missing current frame. This is a serious defect, please inform OD." );
             return sal_False;
         }
@@ -1065,7 +1049,7 @@ sal_Bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const
         pFly = GetCurrFrm()->FindFlyFrm();
         if ( !pFly )
         {
-            ASSERT( !this, "GetFlyFrmAttr, no Fly selected." );
+            OSL_ENSURE( !this, "GetFlyFrmAttr, no Fly selected." );
             return sal_False;
         }
     }
@@ -1087,7 +1071,6 @@ sal_Bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const
         {
             // OD 12.11.2003 #i22341# - content anchor of anchor item is needed.
             // Thus, don't overwrite anchor item by default contructed anchor item.
-            //rSet.Put( SwFmtAnchor( eType ) );
             if ( FLY_AS_CHAR == eType )
             {
                 rSet.ClearItem( RES_OPAQUE );
@@ -1121,9 +1104,9 @@ sal_Bool SwFEShell::SetFlyFrmAttr( SfxItemSet& rSet )
         SwFlyFrm *pFly = FindFlyFrm();
         if( !pFly )
         {
-            ASSERT( GetCurrFrm(), "Crsr in parking zone" );
+            OSL_ENSURE( GetCurrFrm(), "Crsr in parking zone" );
             pFly = GetCurrFrm()->FindFlyFrm();
-            ASSERT( pFly, "SetFlyFrmAttr, no Fly selected." );
+            OSL_ENSURE( pFly, "SetFlyFrmAttr, no Fly selected." );
         }
         if( pFly )
         {
@@ -1149,9 +1132,7 @@ sal_Bool SwFEShell::SetFlyFrmAttr( SfxItemSet& rSet )
     }
     return bRet;
 }
-/*-- 30.03.2004 15:05:07---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SwFEShell::SetDrawingAttr( SfxItemSet& rSet )
 {
     sal_Bool bRet = sal_False;
@@ -1212,9 +1193,9 @@ sal_Bool SwFEShell::ResetFlyFrmAttr( sal_uInt16 nWhich, const SfxItemSet* pSet )
         SwFlyFrm *pFly = FindFlyFrm();
         if( !pFly )
         {
-            ASSERT( GetCurrFrm(), "Crsr in parking zone" );
+            OSL_ENSURE( GetCurrFrm(), "Crsr in parking zone" );
             pFly = GetCurrFrm()->FindFlyFrm();
-            ASSERT( pFly, "SetFlyFrmAttr, no Fly selected." );
+            OSL_ENSURE( pFly, "SetFlyFrmAttr, no Fly selected." );
         }
 
         if( pFly )
@@ -1282,7 +1263,7 @@ void SwFEShell::SetFrmFmt( SwFrmFmt *pNewFmt, sal_Bool bKeepOrient, Point* pDocP
     }
     else
         pFly = FindFlyFrm();
-    ASSERT( pFly, "SetFrmFmt: kein Frame" );
+    OSL_ENSURE( pFly, "SetFrmFmt: kein Frame" );
     if( pFly )
     {
         StartAllAction();
@@ -1490,9 +1471,9 @@ Size SwFEShell::RequestObjectResize( const SwRect &rRect, const uno::Reference <
         aResult = pFly->ChgSize( aSz );
 
         //Wenn sich das Objekt aendert ist die Kontur hoechstwahrscheinlich daneben.
-        ASSERT( pFly->Lower()->IsNoTxtFrm(), "Request ohne NoTxt" );
+        OSL_ENSURE( pFly->Lower()->IsNoTxtFrm(), "Request ohne NoTxt" );
         SwNoTxtNode *pNd = ((SwCntntFrm*)pFly->Lower())->GetNode()->GetNoTxtNode();
-        ASSERT( pNd, "Request ohne Node" );
+        OSL_ENSURE( pNd, "Request ohne Node" );
         pNd->SetContour( 0 );
         ClrContourCache();
     }
@@ -1573,7 +1554,7 @@ void SwFEShell::SetFlyName( const String& rName )
     if( pFly )
         GetDoc()->SetFlyName( *(SwFlyFrmFmt*)pFly->GetFmt(), rName );
     else {
-        ASSERT( !this, "kein FlyFrame selektiert" )
+        OSL_ENSURE( !this, "kein FlyFrame selektiert" );
     }
 }
 
@@ -1583,7 +1564,7 @@ const String& SwFEShell::GetFlyName() const
     if( pFly )
         return pFly->GetFmt()->GetName();
 
-    ASSERT( !this, "kein FlyFrame selektiert" )
+    OSL_ENSURE( !this, "kein FlyFrame selektiert" );
     return aEmptyStr;
 }
 
@@ -1807,7 +1788,7 @@ ObjCntType SwFEShell::GetObjCntType( const SdrObject& rObj ) const
         SwDrawContact* pDrawContact( dynamic_cast<SwDrawContact*>(GetUserCall( pInvestigatedObj ) ) );
         if ( !pDrawContact )
         {
-            ASSERT( false,
+            OSL_ENSURE( false,
                     "<SwFEShell::GetObjCntType(..)> - missing draw contact object" );
             eType = OBJCNT_NONE;
         }
@@ -1816,7 +1797,7 @@ ObjCntType SwFEShell::GetObjCntType( const SdrObject& rObj ) const
             SwFrmFmt* pFrmFmt( pDrawContact->GetFmt() );
             if ( !pFrmFmt )
             {
-                ASSERT( false,
+                OSL_ENSURE( false,
                         "<SwFEShell::GetObjCntType(..)> - missing frame format" );
                 eType = OBJCNT_NONE;
             }
@@ -1931,11 +1912,6 @@ sal_Bool SwFEShell::ReplaceSdrObj( const String& rGrfName, const String& rFltNam
 
         pFmt = GetDoc()->Insert( *GetCrsr(), rGrfName, rFltName, pGrf, &aFrmSet, NULL, NULL );
 
-        // die Ordnungsnummer (Z-Order) noch uebertragen
-        // JP 04.07.98: klappt aber nicht richtig!
-        //SdrObject* pNewObj = ::FindSdrObject( pFmt );
-        //pNewObj->SetOrdNum( nOrdNum );
-
         EndUndo();
         EndAllAction();
         bRet = sal_True;
@@ -1945,7 +1921,7 @@ sal_Bool SwFEShell::ReplaceSdrObj( const String& rGrfName, const String& rFltNam
 
 static USHORT SwFmtGetPageNum(const SwFlyFrmFmt * pFmt)
 {
-    ASSERT(pFmt != NULL, "invalid argument");
+    OSL_ENSURE(pFmt != NULL, "invalid argument");
 
     SwFlyFrm * pFrm = pFmt->GetFrm();
 
diff --git a/sw/source/core/frmedt/feflyole.cxx b/sw/source/core/frmedt/feflyole.cxx
index 7bc8ab6156c8..24332a60917a 100644
--- a/sw/source/core/frmedt/feflyole.cxx
+++ b/sw/source/core/frmedt/feflyole.cxx
@@ -87,7 +87,7 @@ SwFlyFrm *SwFEShell::FindFlyFrm( const uno::Reference < embed::XEmbeddedObject >
             nSttIdx = pStNd->EndOfSectionIndex() + 1;
         }
 
-        ASSERT( bExist, "OLE-Object unknown and FlyFrm not found." );
+        OSL_ENSURE( bExist, "OLE-Object unknown and FlyFrm not found." );
     }
     return pFly;
 }
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 415b0247725b..f0aa92e7dc3a 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -215,7 +215,7 @@ BOOL SwFEShell::SelectObj( const Point& rPt, BYTE nFlag, SdrObject *pObj )
 
     if ( pObj )
     {
-        ASSERT( !bEnterGroup, "SW_ENTER_GROUP is not supported" );
+        OSL_ENSURE( !bEnterGroup, "SW_ENTER_GROUP is not supported" );
         pDView->MarkObj( pObj, Imp()->GetPageView() );
     }
     else
@@ -248,7 +248,7 @@ BOOL SwFEShell::SelectObj( const Point& rPt, BYTE nFlag, SdrObject *pObj )
         if ( GetCntType() & CNT_GRF )
         {
             const SwFlyFrm *pTmp = GetFlyFromMarked( &rMrkList, this );
-            ASSERT( pTmp, "Graphic without Fly" );
+            OSL_ENSURE( pTmp, "Graphic without Fly" );
             if ( ((SwNoTxtFrm*)pTmp->Lower())->HasAnimation() )
                 ((SwNoTxtFrm*)pTmp->Lower())->StopAnimation( GetOut() );
         }
@@ -345,7 +345,7 @@ sal_Bool SwFEShell::MoveAnchor( USHORT nDir )
         switch ( nAnchorId ) {
             case FLY_AT_PAGE:
             {
-                ASSERT( pOld->IsPageFrm(), "Wrong anchor, page exspected." );
+                OSL_ENSURE( pOld->IsPageFrm(), "Wrong anchor, page exspected." );
                 if( SW_MOVE_UP == nDir )
                     pNew = pOld->GetPrev();
                 else if( SW_MOVE_DOWN == nDir )
@@ -359,7 +359,7 @@ sal_Bool SwFEShell::MoveAnchor( USHORT nDir )
             }
             case FLY_AT_CHAR:
             {
-                ASSERT( pOld->IsCntntFrm(), "Wrong anchor, page exspected." );
+                OSL_ENSURE( pOld->IsCntntFrm(), "Wrong anchor, page exspected." );
                 if( SW_MOVE_LEFT == nDir || SW_MOVE_RIGHT == nDir )
                 {
                     SwPosition *pPos = (SwPosition*)aAnch.GetCntntAnchor();
@@ -393,7 +393,7 @@ sal_Bool SwFEShell::MoveAnchor( USHORT nDir )
             } // no break!
             case FLY_AT_PARA:
             {
-                ASSERT( pOld->IsCntntFrm(), "Wrong anchor, page exspected." );
+                OSL_ENSURE( pOld->IsCntntFrm(), "Wrong anchor, page exspected." );
                 if( SW_MOVE_UP == nDir )
                     pNew = pOld->FindPrev();
                 else if( SW_MOVE_DOWN == nDir )
@@ -419,9 +419,9 @@ sal_Bool SwFEShell::MoveAnchor( USHORT nDir )
             }
             case FLY_AT_FLY:
             {
-                ASSERT( pOld->IsFlyFrm(), "Wrong anchor, fly frame exspected.");
+                OSL_ENSURE( pOld->IsFlyFrm(), "Wrong anchor, fly frame exspected.");
                 SwPageFrm* pPage = pOld->FindPageFrm();
-                ASSERT( pPage, "Where's my page?" );
+                OSL_ENSURE( pPage, "Where's my page?" );
                 SwFlyFrm* pNewFly = NULL;
                 if( pPage->GetSortedObjs() )
                 {
@@ -578,7 +578,7 @@ USHORT SwFEShell::GetSelFrmType() const
                 eType = FRMTYPE_FLY_ATCNT;
             else
             {
-                ASSERT( pFly->IsFlyInCntFrm(), "Neuer Rahmentyp?" );
+                OSL_ENSURE( pFly->IsFlyInCntFrm(), "Neuer Rahmentyp?" );
                 eType = FRMTYPE_FLY_INCNT;
             }
         }
@@ -623,7 +623,6 @@ void SwFEShell::ScrollTo( const Point &rPt )
          (!Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount() ||
           Imp()->IsDragPossible( rPt )) )
     {
-        //SwSaveHdl aSave( Imp() );
         ScrollMDI( this, aRect, SCROLLVAL, SCROLLVAL );
     }
 }
@@ -659,7 +658,7 @@ long SwFEShell::BeginDrag( const Point* pPt, BOOL )
     {
         delete pChainFrom; delete pChainTo; pChainFrom = pChainTo = 0;
         SdrHdl* pHdl = pView->PickHandle( *pPt );
-        pView->BegDragObj( *pPt, 0 /*GetWin()*/, pHdl );
+        pView->BegDragObj( *pPt, 0, pHdl );
         ::FrameNotify( this, FLY_DRAG );
         return 1;
     }
@@ -676,7 +675,7 @@ long SwFEShell::BeginDrag( const Point* pPt, BOOL )
 
 long SwFEShell::Drag( const Point *pPt, BOOL )
 {
-    ASSERT( Imp()->HasDrawView(), "Drag without DrawView?" );
+    OSL_ENSURE( Imp()->HasDrawView(), "Drag without DrawView?" );
     if ( Imp()->GetDrawView()->IsDragObj() )
     {
         ScrollTo( *pPt );
@@ -699,7 +698,7 @@ long SwFEShell::Drag( const Point *pPt, BOOL )
 
 long SwFEShell::EndDrag( const Point *, BOOL )
 {
-    ASSERT( Imp()->HasDrawView(), "EndDrag without DrawView?" );
+    OSL_ENSURE( Imp()->HasDrawView(), "EndDrag without DrawView?" );
     SdrView *pView = Imp()->GetDrawView();
     if ( pView->IsDragObj() )
     {
@@ -752,7 +751,7 @@ long SwFEShell::EndDrag( const Point *, BOOL )
 
 void SwFEShell::BreakDrag()
 {
-    ASSERT( Imp()->HasDrawView(), "BreakDrag without DrawView?" );
+    OSL_ENSURE( Imp()->HasDrawView(), "BreakDrag without DrawView?" );
     if ( Imp()->GetDrawView()->IsDragObj() )
         Imp()->GetDrawView()->BrkDragObj();
     SetChainMarker();
@@ -778,8 +777,6 @@ const SwFrmFmt* SwFEShell::SelFlyGrabCrsr()
 
         if( pFly )
         {
-            // --> OD 2004-06-11 #i28701# - no format here
-//            pFly->GetAnchorFrm()->Calc();
             SwCntntFrm *pCFrm = pFly->ContainsCntnt();
             if ( pCFrm )
             {
@@ -900,9 +897,9 @@ void lcl_NotifyNeighbours( const SdrMarkList *pLst )
 
 void SwFEShell::SelectionToTop( BOOL bTop )
 {
-    ASSERT( Imp()->HasDrawView(), "SelectionToTop without DrawView?" );
+    OSL_ENSURE( Imp()->HasDrawView(), "SelectionToTop without DrawView?" );
     const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkedObjectList();
-    ASSERT( rMrkList.GetMarkCount(), "Kein Object Selektiert." );
+    OSL_ENSURE( rMrkList.GetMarkCount(), "Kein Object Selektiert." );
 
     SwFlyFrm *pFly = ::GetFlyFromMarked( &rMrkList, this );
     if ( pFly && pFly->IsFlyInCntFrm() )
@@ -920,9 +917,9 @@ void SwFEShell::SelectionToTop( BOOL bTop )
 
 void SwFEShell::SelectionToBottom( BOOL bBottom )
 {
-    ASSERT( Imp()->HasDrawView(), "SelectionToBottom without DrawView?" );
+    OSL_ENSURE( Imp()->HasDrawView(), "SelectionToBottom without DrawView?" );
     const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkedObjectList();
-    ASSERT( rMrkList.GetMarkCount(), "Kein Object Selektiert." );
+    OSL_ENSURE( rMrkList.GetMarkCount(), "Kein Object Selektiert." );
 
     SwFlyFrm *pFly = ::GetFlyFromMarked( &rMrkList, this );
     if ( pFly && pFly->IsFlyInCntFrm() )
@@ -1000,7 +997,7 @@ void SwFEShell::ChangeOpaque( SdrLayerID nLayerId )
             // --> OD 2010-09-14 #i113730#
             // consider that a member of a drawing group has been selected.
             const SwContact* pContact = ::GetUserCall( pObj );
-            ASSERT( pContact && pContact->GetMaster(), "<SwFEShell::ChangeOpaque(..)> - missing contact or missing master object at contact!" );
+            OSL_ENSURE( pContact && pContact->GetMaster(), "<SwFEShell::ChangeOpaque(..)> - missing contact or missing master object at contact!" );
             const bool bControlObj = ( pContact && pContact->GetMaster() )
                                      ? ::CheckControlLayer( pContact->GetMaster() )
                                      : ::CheckControlLayer( pObj );
@@ -1082,7 +1079,7 @@ void SwFEShell::EndTextEdit()
     //keinen Text mehr enthaelt und keine Attribute traegt) wird das
     //Objekt gel�scht. Alle anderen markierten Objekte bleiben erhalten.
 
-    ASSERT( Imp()->HasDrawView() && Imp()->GetDrawView()->IsTextEdit(),
+    OSL_ENSURE( Imp()->HasDrawView() && Imp()->GetDrawView()->IsTextEdit(),
             "EndTextEdit an no Object" );
 
     StartAllAction();
@@ -1334,7 +1331,7 @@ namespace
     };
 }
 
-const SdrObject* SwFEShell::GetBestObject( BOOL bNext, USHORT /*GOTOOBJ_...*/ eType, BOOL bFlat, const ::svx::ISdrObjectFilter* pFilter )
+const SdrObject* SwFEShell::GetBestObject( BOOL bNext, USHORT eType, BOOL bFlat, const ::svx::ISdrObjectFilter* pFilter )
 {
     if( !Imp()->HasDrawView() )
         return NULL;
@@ -1399,7 +1396,7 @@ const SdrObject* SwFEShell::GetBestObject( BOOL bNext, USHORT /*GOTOOBJ_...*/ eT
         }
 
 
-        ASSERT( pList, "No object list to iterate" )
+        OSL_ENSURE( pList, "No object list to iterate" );
 
         SdrObjListIter aObjIter( *pList, bFlat ? IM_FLAT : IM_DEEPNOGROUPS );
         while ( aObjIter.IsMore() )
@@ -1478,10 +1475,10 @@ const SdrObject* SwFEShell::GetBestObject( BOOL bNext, USHORT /*GOTOOBJ_...*/ eT
                 break;
             }
 
-            if( (bNext? (aPos.Y() < aCurPos.Y()) :          // nur unter mir
+            if(((bNext? (aPos.Y() < aCurPos.Y()) :          // nur unter mir
                         (aPos.Y() > aCurPos.Y())) &&        // " reverse
                 (bNext? (aBestPos.Y() > aCurPos.Y()) :      // naeher drunter
-                        (aBestPos.Y() < aCurPos.Y())) ||    // " reverse
+                        (aBestPos.Y() < aCurPos.Y()))) ||   // " reverse
                         (aBestPos.Y() == aCurPos.Y() &&
                 (bNext? (aBestPos.X() > aCurPos.X()) :      // weiter links
                         (aBestPos.X() < aCurPos.X()))))     // " reverse
@@ -1568,7 +1565,7 @@ BOOL SwFEShell::BeginCreate( UINT16 /*SdrObjKind ?*/  eSdrObjectKind, const Poin
     return bRet;
 }
 
-BOOL SwFEShell::BeginCreate( UINT16 /*SdrObjKind ?*/  eSdrObjectKind, UINT32 eObjInventor,
+BOOL SwFEShell::BeginCreate( UINT16 eSdrObjectKind, UINT32 eObjInventor,
                              const Point &rPos )
 {
     BOOL bRet = FALSE;
@@ -1597,7 +1594,7 @@ BOOL SwFEShell::BeginCreate( UINT16 /*SdrObjKind ?*/  eSdrObjectKind, UINT32 eOb
 
 void SwFEShell::MoveCreate( const Point &rPos )
 {
-    ASSERT( Imp()->HasDrawView(), "MoveCreate without DrawView?" );
+    OSL_ENSURE( Imp()->HasDrawView(), "MoveCreate without DrawView?" );
     if ( GetPageNumber( rPos ) )
     {
         ScrollTo( rPos );
@@ -1620,7 +1617,7 @@ BOOL SwFEShell::EndCreate( UINT16 eSdrCreateCmd )
     // JP 18.08.95: Damit das Undo-Object aus der DrawEngine nicht bei uns
     // gespeichert wird, (wir erzeugen ein eigenes Undo-Object!) hier kurz
     // das Undo abschalten
-    ASSERT( Imp()->HasDrawView(), "EndCreate without DrawView?" );
+    OSL_ENSURE( Imp()->HasDrawView(), "EndCreate without DrawView?" );
     if( !Imp()->GetDrawView()->IsGroupEntered() )
         GetDoc()->SetNoDrawUndoObj( TRUE );
     BOOL bCreate = Imp()->GetDrawView()->EndCreateObj(
@@ -1644,7 +1641,7 @@ BOOL SwFEShell::EndCreate( UINT16 eSdrCreateCmd )
 
 BOOL SwFEShell::ImpEndCreate()
 {
-    ASSERT( Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount() == 1,
+    OSL_ENSURE( Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount() == 1,
             "Neues Object nicht selektiert." );
 
     SdrObject& rSdrObj = *Imp()->GetDrawView()->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj();
@@ -1823,7 +1820,7 @@ BOOL SwFEShell::ImpEndCreate()
             SwTxtFrm* pTmp = (SwTxtFrm*)pAnch;
             do {
                 pTmp = pTmp->FindMaster();
-                ASSERT( pTmp, "Where's my Master?" );
+                OSL_ENSURE( pTmp, "Where's my Master?" );
                 // OD 2004-03-30 #i26791# - correction: add frame area height
                 // of master frames.
                 nYOffset += pTmp->IsVertical() ?
@@ -1916,7 +1913,7 @@ BOOL SwFEShell::ImpEndCreate()
             SwTxtFrm* pTmp = (SwTxtFrm*)pAnch;
             do {
                 pTmp = pTmp->FindMaster();
-                ASSERT( pTmp, "Where's my Master?" );
+                OSL_ENSURE( pTmp, "Where's my Master?" );
                 nYOffset += pTmp->IsVertical() ?
                             pTmp->Prt().Width() : pTmp->Prt().Height();
             } while ( pTmp->IsFollow() );
@@ -1938,7 +1935,7 @@ BOOL SwFEShell::ImpEndCreate()
         // <--
         if( bCharBound )
         {
-            ASSERT( aAnch.GetAnchorId() == FLY_AS_CHAR, "wrong AnchorType" );
+            OSL_ENSURE( aAnch.GetAnchorId() == FLY_AS_CHAR, "wrong AnchorType" );
             SwTxtNode *pNd = aAnch.GetCntntAnchor()->nNode.GetNode().GetTxtNode();
             SwFmtFlyCnt aFmt( pFmt );
             pNd->InsertItem(aFmt,
@@ -1952,7 +1949,7 @@ BOOL SwFEShell::ImpEndCreate()
             SwTxtFrm* pTmp = (SwTxtFrm*)pAnch;
             do {
                 pTmp = pTmp->FindMaster();
-                ASSERT( pTmp, "Where's my Master?" );
+                OSL_ENSURE( pTmp, "Where's my Master?" );
             } while( pTmp->IsFollow() );
             pAnch = pTmp;
         }
@@ -1995,7 +1992,7 @@ BOOL SwFEShell::ImpEndCreate()
 
 void SwFEShell::BreakCreate()
 {
-    ASSERT( Imp()->HasDrawView(), "BreakCreate without DrawView?" );
+    OSL_ENSURE( Imp()->HasDrawView(), "BreakCreate without DrawView?" );
     Imp()->GetDrawView()->BrkCreateObj();
     ::FrameNotify( this, FLY_DRAG_END );
 }
@@ -2052,13 +2049,12 @@ BOOL SwFEShell::BeginMark( const Point &rPos )
 
 void SwFEShell::MoveMark( const Point &rPos )
 {
-    ASSERT( Imp()->HasDrawView(), "MoveMark without DrawView?" );
+    OSL_ENSURE( Imp()->HasDrawView(), "MoveMark without DrawView?" );
 
     if ( GetPageNumber( rPos ) )
     {
         ScrollTo( rPos );
         SwDrawView* pDView = Imp()->GetDrawView();
-//      Imp()->GetDrawView()->MovMarkObj( rPos );
 
         if (pDView->IsInsObjPoint())
             pDView->MovInsObjPoint( rPos );
@@ -2081,7 +2077,7 @@ void SwFEShell::MoveMark( const Point &rPos )
 BOOL SwFEShell::EndMark()
 {
     BOOL bRet = FALSE;
-    ASSERT( Imp()->HasDrawView(), "EndMark without DrawView?" );
+    OSL_ENSURE( Imp()->HasDrawView(), "EndMark without DrawView?" );
 
     if (Imp()->GetDrawView()->IsMarkObj())
     {
@@ -2104,7 +2100,6 @@ BOOL SwFEShell::EndMark()
                     {
                         if ( !bShowHdl )
                         {
-                            //HMHpDView->HideMarkHdl();
                             bShowHdl = TRUE;
                         }
                         rMrkList.DeleteMark( i );
@@ -2116,7 +2111,6 @@ BOOL SwFEShell::EndMark()
             {
                 pDView->MarkListHasChanged();
                 pDView->AdjustMarkHdl();
-                //HMHpDView->ShowMarkHdl();
             }
 
             if ( rMrkList.GetMarkCount() )
@@ -2148,7 +2142,7 @@ BOOL SwFEShell::EndMark()
 
 void SwFEShell::BreakMark()
 {
-    ASSERT( Imp()->HasDrawView(), "BreakMark without DrawView?" );
+    OSL_ENSURE( Imp()->HasDrawView(), "BreakMark without DrawView?" );
     Imp()->GetDrawView()->BrkMarkObj();
 }
 
@@ -2202,7 +2196,7 @@ short SwFEShell::GetAnchorId() const
 
 void SwFEShell::ChgAnchor( int eAnchorId, BOOL bSameOnly, BOOL bPosCorr )
 {
-    ASSERT( Imp()->HasDrawView(), "ChgAnchor without DrawView?" );
+    OSL_ENSURE( Imp()->HasDrawView(), "ChgAnchor without DrawView?" );
     const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkedObjectList();
     if( rMrkList.GetMarkCount() &&
         !rMrkList.GetMark( 0 )->GetMarkedSdrObj()->GetUpGroup() )
@@ -2229,7 +2223,7 @@ void SwFEShell::ChgAnchor( int eAnchorId, BOOL bSameOnly, BOOL bPosCorr )
 
 void SwFEShell::DelSelectedObj()
 {
-    ASSERT( Imp()->HasDrawView(), "DelSelectedObj(), no DrawView available" );
+    OSL_ENSURE( Imp()->HasDrawView(), "DelSelectedObj(), no DrawView available" );
     if ( Imp()->HasDrawView() )
     {
         StartAllAction();
@@ -2266,7 +2260,7 @@ Size SwFEShell::GetObjSize() const
 Point SwFEShell::GetAnchorObjDiff() const
 {
     const SdrView *pView = Imp()->GetDrawView();
-    ASSERT( pView, "GetAnchorObjDiff without DrawView?" );
+    OSL_ENSURE( pView, "GetAnchorObjDiff without DrawView?" );
 
     Rectangle aRect;
     if ( Imp()->GetDrawView()->IsAction() )
@@ -2294,7 +2288,7 @@ Point SwFEShell::GetAnchorObjDiff() const
 
 Point SwFEShell::GetObjAbsPos() const
 {
-    ASSERT( Imp()->GetDrawView(), "GetObjAbsPos() without DrawView?" );
+    OSL_ENSURE( Imp()->GetDrawView(), "GetObjAbsPos() without DrawView?" );
     return Imp()->GetDrawView()->GetDragStat().GetActionRect().TopLeft();
 }
 
@@ -2359,7 +2353,7 @@ bool SwFEShell::IsGroupAllowed() const
                 SwFrmFmt* pFrmFmt( ::FindFrmFmt( const_cast<SdrObject*>(pObj) ) );
                 if ( !pFrmFmt )
                 {
-                    ASSERT( false,
+                    OSL_ENSURE( false,
                             "<SwFEShell::IsGroupAllowed()> - missing frame format" );
                     bIsGroupAllowed = false;
                 }
@@ -2503,7 +2497,7 @@ static BYTE __READONLY_DATA aChkArr[ 4 ] = {
         SwFlyFrm* pFrm = (SwFlyFrm*)aIter.First( TYPE( SwFlyFrm ));
         if( pFrm )
         {
-            ASSERT( pFrm->IsFlyFrm(), "Wrong FrmType" );
+            OSL_ENSURE( pFrm->IsFlyFrm(), "Wrong FrmType" );
             if( bSelFrm )
             {
                 SelectObj( pFrm->Frm().Pos(), 0, ((SwFlyFrm*)pFrm)->GetVirtDrawObj() );
@@ -2512,8 +2506,6 @@ static BYTE __READONLY_DATA aChkArr[ 4 ] = {
             }
             else
             {
-                // --> OD 2004-06-11 #i28701# - no format here
-//                pFrm->GetAnchorFrm()->Calc();
                 SwCntntFrm *pCFrm = pFrm->ContainsCntnt();
                 if ( pCFrm )
                 {
@@ -2629,7 +2621,7 @@ BOOL SwFEShell::GetObjAttr( SfxItemSet &rSet ) const
         SdrObject *pObj = rMrkList.GetMark( i )->GetMarkedSdrObj();
         SwDrawContact *pContact = (SwDrawContact*)GetUserCall(pObj);
         // --> OD 2007-07-24 #143008# - make code robust
-        ASSERT( pContact, "<SwFEShell::GetObjAttr(..)> - missing <pContact> - please inform OD." );
+        OSL_ENSURE( pContact, "<SwFEShell::GetObjAttr(..)> - missing <pContact> - please inform OD." );
         if ( pContact )
         {
             if ( i )
@@ -2647,7 +2639,7 @@ BOOL SwFEShell::SetObjAttr( const SfxItemSet& rSet )
     SET_CURR_SHELL( this );
 
     if ( !rSet.Count() )
-    {   ASSERT( !this, "SetObjAttr, empty set." );
+    { OSL_ENSURE( !this, "SetObjAttr, empty set." );
         return FALSE;
     }
 
@@ -2711,7 +2703,7 @@ void SwFEShell::CheckUnboundObjects()
             }
             if ( !pPage )
                 pPage = pLast;
-            ASSERT( pPage, "Page not found." );
+            OSL_ENSURE( pPage, "Page not found." );
 
             //Fremde Identifier sollen in den Default laufen.
             //Ueberschneidungen sind moeglich!!
@@ -2799,9 +2791,7 @@ int SwFEShell::Chainable( SwRect &rRect, const SwFrmFmt &rSource,
     }
     return SW_CHAIN_NOT_FOUND;
 }
-/* -----------------------------09.08.2002 07:40------------------------------
 
- ---------------------------------------------------------------------------*/
 int SwFEShell::Chain( SwFrmFmt &rSource, const SwFrmFmt &rDest )
 {
     return GetDoc()->Chain(rSource, rDest);
@@ -2931,10 +2921,8 @@ long SwFEShell::GetSectionWidth( SwFmt& rFmt ) const
     }
     return 0;
 }
-/* -----------------------------2002/06/24 15:07------------------------------
 
- ---------------------------------------------------------------------------*/
-void SwFEShell::CreateDefaultShape( UINT16 /*SdrObjKind ?*/ eSdrObjectKind, const Rectangle& rRect,
+void SwFEShell::CreateDefaultShape( UINT16 eSdrObjectKind, const Rectangle& rRect,
                 USHORT nSlotId)
 {
     SdrView* pDrawView = GetDrawView();
@@ -3134,29 +3122,29 @@ const Color SwFEShell::GetShapeBackgrd() const
     Color aRetColor;
 
     // check, if a draw view exists
-    ASSERT( Imp()->GetDrawView(), "wrong usage of SwFEShell::GetShapeBackgrd - no draw view!");
+    OSL_ENSURE( Imp()->GetDrawView(), "wrong usage of SwFEShell::GetShapeBackgrd - no draw view!");
     if( Imp()->GetDrawView() )
     {
         // determine list of selected objects
         const SdrMarkList* pMrkList = &Imp()->GetDrawView()->GetMarkedObjectList();
         // check, if exactly one object is selected.
-        ASSERT( pMrkList->GetMarkCount() == 1, "wrong usage of SwFEShell::GetShapeBackgrd - no selected object!");
+        OSL_ENSURE( pMrkList->GetMarkCount() == 1, "wrong usage of SwFEShell::GetShapeBackgrd - no selected object!");
         if ( pMrkList->GetMarkCount() == 1)
         {
             // get selected object
             const SdrObject *pSdrObj = pMrkList->GetMark( 0 )->GetMarkedSdrObj();
             // check, if selected object is a shape (drawing object)
-            ASSERT( !pSdrObj->ISA(SwVirtFlyDrawObj), "wrong usage of SwFEShell::GetShapeBackgrd - selected object is not a drawing object!");
+            OSL_ENSURE( !pSdrObj->ISA(SwVirtFlyDrawObj), "wrong usage of SwFEShell::GetShapeBackgrd - selected object is not a drawing object!");
             if ( !pSdrObj->ISA(SwVirtFlyDrawObj) )
             {
                 // determine page frame of the frame the shape is anchored.
                 const SwFrm* pAnchorFrm =
                         static_cast<SwDrawContact*>(GetUserCall(pSdrObj))->GetAnchorFrm( pSdrObj );
-                ASSERT( pAnchorFrm, "inconsistent modell - no anchor at shape!");
+                OSL_ENSURE( pAnchorFrm, "inconsistent modell - no anchor at shape!");
                 if ( pAnchorFrm )
                 {
                     const SwPageFrm* pPageFrm = pAnchorFrm->FindPageFrm();
-                    ASSERT( pPageFrm, "inconsistent modell - no page!");
+                    OSL_ENSURE( pPageFrm, "inconsistent modell - no page!");
                     if ( pPageFrm )
                     {
                         aRetColor = pPageFrm->GetDrawBackgrdColor();
@@ -3186,29 +3174,29 @@ bool SwFEShell::IsShapeDefaultHoriTextDirR2L() const
     bool bRet = false;
 
     // check, if a draw view exists
-    ASSERT( Imp()->GetDrawView(), "wrong usage of SwFEShell::GetShapeBackgrd - no draw view!");
+    OSL_ENSURE( Imp()->GetDrawView(), "wrong usage of SwFEShell::GetShapeBackgrd - no draw view!");
     if( Imp()->GetDrawView() )
     {
         // determine list of selected objects
         const SdrMarkList* pMrkList = &Imp()->GetDrawView()->GetMarkedObjectList();
         // check, if exactly one object is selected.
-        ASSERT( pMrkList->GetMarkCount() == 1, "wrong usage of SwFEShell::GetShapeBackgrd - no selected object!");
+        OSL_ENSURE( pMrkList->GetMarkCount() == 1, "wrong usage of SwFEShell::GetShapeBackgrd - no selected object!");
         if ( pMrkList->GetMarkCount() == 1)
         {
             // get selected object
             const SdrObject *pSdrObj = pMrkList->GetMark( 0 )->GetMarkedSdrObj();
             // check, if selected object is a shape (drawing object)
-            ASSERT( !pSdrObj->ISA(SwVirtFlyDrawObj), "wrong usage of SwFEShell::GetShapeBackgrd - selected object is not a drawing object!");
+            OSL_ENSURE( !pSdrObj->ISA(SwVirtFlyDrawObj), "wrong usage of SwFEShell::GetShapeBackgrd - selected object is not a drawing object!");
             if ( !pSdrObj->ISA(SwVirtFlyDrawObj) )
             {
                 // determine page frame of the frame the shape is anchored.
                 const SwFrm* pAnchorFrm =
                         static_cast<SwDrawContact*>(GetUserCall(pSdrObj))->GetAnchorFrm( pSdrObj );
-                ASSERT( pAnchorFrm, "inconsistent modell - no anchor at shape!");
+                OSL_ENSURE( pAnchorFrm, "inconsistent modell - no anchor at shape!");
                 if ( pAnchorFrm )
                 {
                     const SwPageFrm* pPageFrm = pAnchorFrm->FindPageFrm();
-                    ASSERT( pPageFrm, "inconsistent modell - no page!");
+                    OSL_ENSURE( pPageFrm, "inconsistent modell - no page!");
                     if ( pPageFrm )
                     {
                         bRet = pPageFrm->IsRightToLeft() ? true : false;
@@ -3220,9 +3208,7 @@ bool SwFEShell::IsShapeDefaultHoriTextDirR2L() const
 
     return bRet;
 }
-/* -----------------20.03.2003 14:35-----------------
 
- --------------------------------------------------*/
 Point SwFEShell::GetRelativePagePosition(const Point& rDocPos)
 {
     Point aRet(-1, -1);
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 1ea82bcfd1dd..d519ddc8ccb8 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -117,7 +117,7 @@ void SwFEShell::ParkCursorInTab()
 {
     SwCursor * pSwCrsr = GetSwCrsr();
 
-    ASSERT(pSwCrsr, "no SwCursor");
+    OSL_ENSURE(pSwCrsr, "no SwCursor");
 
     SwPosition aStartPos = *pSwCrsr->GetPoint(), aEndPos = aStartPos;
 
@@ -582,10 +582,6 @@ void SwFEShell::_GetTabCols( SwTabCols &rToFill, const SwFrm *pBox ) const
                 {
                     pLastCols->SetLeftMin( nLeftMin );
 
-                    //ASSERT( bVert ||
-                    //        pLastCols->GetLeftMin() == (pTab->Frm().*fnRect->fnGetLeft)(),
-                    //        "GetTabCols: wrong result" )
-
                     pColumnCacheLastTabFrm = pTab;
                 }
                 else
@@ -721,9 +717,6 @@ void SwFEShell::GetTabCols( SwTabCols &rToFill ) const
     _GetTabCols( rToFill, pFrm );
 }
 
-/*-- 19.01.2004 08:56:42---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 void SwFEShell::GetTabRows( SwTabCols &rToFill ) const
 {
     const SwFrm *pFrm = GetCurrFrm();
@@ -735,9 +728,7 @@ void SwFEShell::GetTabRows( SwTabCols &rToFill ) const
 
     _GetTabRows( rToFill, pFrm );
 }
-/*-- 19.01.2004 08:56:44---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwFEShell::SetTabRows( const SwTabCols &rNew, BOOL bCurColOnly )
 {
     SwFrm *pBox = GetCurrFrm();
@@ -754,18 +745,14 @@ void SwFEShell::SetTabRows( const SwTabCols &rNew, BOOL bCurColOnly )
     GetDoc()->SetTabRows( rNew, bCurColOnly, 0, (SwCellFrm*)pBox );
     EndAllActionAndCall();
 }
-/*-- 19.01.2004 08:59:45---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwFEShell::GetMouseTabRows( SwTabCols &rToFill, const Point &rPt ) const
 {
     const SwFrm *pBox = GetBox( rPt );
     if ( pBox )
         _GetTabRows( rToFill, pBox );
 }
-/*-- 19.01.2004 08:59:45---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwFEShell::SetMouseTabRows( const SwTabCols &rNew, BOOL bCurColOnly, const Point &rPt )
 {
     const SwFrm *pBox = GetBox( rPt );
@@ -999,9 +986,7 @@ BOOL SwFEShell::HasBoxSelection() const
     if( IsTableMode() )
         return TRUE;
     SwPaM* pPam = GetCrsr();
-        // leere Boxen gelten auch ohne Selektion als selektiert
-//  if( !pPam->HasMark() )
-//      return FALSE;
+        // empty boxes are also selected as the absence of selection
     BOOL bChg = FALSE;
     if( pPam->GetPoint() == pPam->End())
     {
@@ -1020,7 +1005,7 @@ BOOL SwFEShell::HasBoxSelection() const
             if( !pCNd )
             {
                 pCNd = GetDoc()->GetNodes().GoPrevious( &aIdx );
-                ASSERT( pCNd, "kein ContentNode in der Box ??" );
+                OSL_ENSURE( pCNd, "kein ContentNode in der Box ??" );
             }
             if( pPam->GetMark()->nContent == pCNd->Len() )
             {
@@ -1445,7 +1430,7 @@ USHORT SwFEShell::GetCurTabColNum() const
     USHORT nRet = 0;
 
     SwFrm *pFrm = GetCurrFrm();
-    ASSERT( pFrm, "Crsr geparkt?" );
+    OSL_ENSURE( pFrm, "Crsr geparkt?" );
 
     // pruefe ob vom aktuellen Crsr der SPoint/Mark in einer Tabelle stehen
     if( pFrm && pFrm->IsInTab() )
@@ -1569,7 +1554,7 @@ const SwCellFrm *lcl_FindFrm( const SwLayoutFrm *pLay, const Point &rPt,
 
                     // We first check if the given point is 'close' to the left or top
                     // border of the table frame:
-                    ASSERT( pFrm, "Nested table frame without outer table" )
+                    OSL_ENSURE( pFrm, "Nested table frame without outer table" );
                     SWRECTFN( pFrm )
                     const bool bRTL = pFrm->IsRightToLeft();
 
@@ -1667,7 +1652,7 @@ const SwCellFrm *lcl_FindFrm( const SwLayoutFrm *pLay, const Point &rPt,
                 if ( !bMouseMoveRowCols )
                 {
 
-                    ASSERT( pbCol && pbRow, "pbCol or pbRow missing" )
+                    OSL_ENSURE( pbCol && pbRow, "pbCol or pbRow missing" );
 
                     if ( bCloseToRow || bCloseToCol )
                     {
@@ -1716,7 +1701,7 @@ const SwCellFrm *lcl_FindFrm( const SwLayoutFrm *pLay, const Point &rPt,
     }
 
     // robust:
-    ASSERT( !pRet || pRet->IsCellFrm(), "lcl_FindFrm() is supposed to find a cell frame!" )
+    OSL_ENSURE( !pRet || pRet->IsCellFrm(), "lcl_FindFrm() is supposed to find a cell frame!" );
     return pRet && pRet->IsCellFrm() ? static_cast<const SwCellFrm*>(pRet) : 0;
 }
 
@@ -1888,7 +1873,7 @@ Point lcl_ProjectOntoClosestTableFrm( const SwTabFrm& rTab, const Point& rPoint,
         else if ( aRet.Y() < aMin1.Y() )
             aRet.Y() = aMin1.Y();
     }
-    else //if ( bTop )
+    else
     {
         aRet.Y() = aMin1.Y();
         if ( aRet.X() > aMin2.X() )
@@ -2216,7 +2201,7 @@ USHORT SwFEShell::GetCurMouseTabColNum( const Point &rPt ) const
     USHORT nRet = 0;
 
     const SwFrm *pFrm = GetBox( rPt );
-    ASSERT( pFrm, "Table not found" );
+    OSL_ENSURE( pFrm, "Table not found" );
     if( pFrm )
     {
         const long nX = pFrm->Frm().Left();
@@ -2283,13 +2268,13 @@ void SwFEShell::SetTblAttr( const SfxItemSet &rNew )
  */
 bool lcl_GoTableRow( SwCrsrShell* pShell, bool bUp )
 {
-    ASSERT( pShell != NULL, "need shell" );
+    OSL_ENSURE( pShell != NULL, "need shell" );
 
     bool bRet = false;
 
     SwPaM* pPam = pShell->GetCrsr();
     const SwStartNode* pTableBox = pPam->GetNode()->FindTableBoxStartNode();
-    ASSERT( pTableBox != NULL, "I'm living in a box... NOT!" );
+    OSL_ENSURE( pTableBox != NULL, "I'm living in a box... NOT!" );
 
     // move cursor to start node of table box
     pPam->GetPoint()->nNode = pTableBox->GetIndex();
@@ -2538,24 +2523,12 @@ BOOL SwFEShell::GetAutoSum( String& rFml ) const
         if( nW )
         {
             rFml += ')';
-
-/*
-            // TabellenSelektion erzeugen??
-            SwTblBoxFormula aTmp( rFml );
-            SwSelBoxes aBoxes;
-            for( USHORT nSelBoxes = aTmp.GetBoxesOfFormula( rTbl,aBoxes );
-                    nSelBoxes; )
-            {
-            }
-*/
         }
     }
 
     return TRUE;
 }
-/* -----------------------------22.08.2002 12:50------------------------------
 
- ---------------------------------------------------------------------------*/
 BOOL SwFEShell::IsTableRightToLeft() const
 {
     SwFrm *pFrm = GetCurrFrm();
@@ -2565,20 +2538,14 @@ BOOL SwFEShell::IsTableRightToLeft() const
     return pFrm->ImplFindTabFrm()->IsRightToLeft();
 }
 
-/* -----------------------------22.08.2002 12:50------------------------------
-
- ---------------------------------------------------------------------------*/
 BOOL SwFEShell::IsMouseTableRightToLeft(const Point &rPt) const
 {
     SwFrm *pFrm = (SwFrm *)GetBox( rPt );
     const SwTabFrm*  pTabFrm = pFrm ? pFrm->ImplFindTabFrm() : 0;
-    ASSERT( pTabFrm, "Table not found" );
+    OSL_ENSURE( pTabFrm, "Table not found" );
     return pTabFrm ? pTabFrm->IsRightToLeft() : FALSE;
 }
 
-/* -----------------------------11.02.2004 12:50------------------------------
-
- ---------------------------------------------------------------------------*/
 BOOL SwFEShell::IsTableVertical() const
 {
     SwFrm *pFrm = GetCurrFrm();
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index 7e6813767771..706f8aeab68b 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -157,14 +157,14 @@ const SwRect& SwFEShell::GetAnyCurRect( CurRectType eType, const Point* pPt,
         case RECT_OUTTABSECTION :   if( pFrm->IsInTab() )
                                         pFrm = pFrm->FindTabFrm();
                                     else {
-                                        ASSERT( FALSE, "Missing Table" );
+                                        OSL_ENSURE( FALSE, "Missing Table" );
                                     }
                                     /* KEIN BREAK */
         case RECT_SECTION_PRT:
         case RECT_SECTION:          if( pFrm->IsInSct() )
                                         pFrm = pFrm->FindSctFrm();
                                     else {
-                                        ASSERT( FALSE, "Missing section" );
+                                        OSL_ENSURE( FALSE, "Missing section" );
                                     }
 
                                     if( RECT_OUTTABSECTION_PRT == eType ||
@@ -301,7 +301,7 @@ USHORT SwFEShell::GetFrmType( const Point *pPt, BOOL bStopAtFly ) const
                                     nReturn |= FRMTYPE_FLY_ATCNT;
                                 else
                                 {
-                                    ASSERT( ((SwFlyFrm*)pFrm)->IsFlyInCntFrm(),
+                                    OSL_ENSURE( ((SwFlyFrm*)pFrm)->IsFlyInCntFrm(),
                                             "Neuer Rahmentyp?" );
                                     nReturn |= FRMTYPE_FLY_INCNT;
                                 }
@@ -353,7 +353,6 @@ void SwFEShell::ShLooseFcs()
         Imp()->GetDrawView()->hideMarkHandles();
         FrameNotify( this, FLY_DRAG_END );
     }
-//  ::ResetShell();
 }
 
 /*************************************************************************
@@ -397,7 +396,7 @@ USHORT SwFEShell::GetVirtPageNum( const BOOL bCalcFrm )
 void lcl_SetAPageOffset( USHORT nOffset, SwPageFrm* pPage, SwFEShell* pThis )
 {
     pThis->StartAllAction();
-    ASSERT( pPage->FindFirstBodyCntnt(),
+    OSL_ENSURE( pPage->FindFirstBodyCntnt(),
             "SwFEShell _SetAPageOffset() ohne CntntFrm" );
 
     SwFmtPageDesc aDesc( pPage->GetPageDesc() );
@@ -496,7 +495,6 @@ void SwFEShell::InsertLabel( const SwLabelType eType, const String &rTxt, const
                 //Bei Flys den Index auf den StartNode herunterreichen.
                 nIdx = pCnt->FindFlyFrm()->
                             GetFmt()->GetCntnt().GetCntntIdx()->GetIndex();
-//warum?? Bug 61913     ParkCrsr( GetCrsr()->GetPoint()->nNode );
             }
             break;
         case LTYPE_TABLE:
@@ -545,7 +543,7 @@ void SwFEShell::InsertLabel( const SwLabelType eType, const String &rTxt, const
             }
             break;
         default:
-            ASSERT( !this, "Crsr weder in Tabelle noch in Fly." );
+            OSL_ENSURE( !this, "Crsr weder in Tabelle noch in Fly." );
         }
 
         if( nIdx )
@@ -582,7 +580,7 @@ BOOL SwFEShell::Sort(const SwSortOptions& rOpt)
         // Tabelle sortieren
         // pruefe ob vom aktuellen Crsr der SPoint/Mark in einer Tabelle stehen
         SwFrm *pFrm = GetCurrFrm( FALSE );
-        ASSERT( pFrm->FindTabFrm(), "Crsr nicht in Tabelle." );
+        OSL_ENSURE( pFrm->FindTabFrm(), "Crsr nicht in Tabelle." );
 
         // lasse ueber das Layout die Boxen suchen
         SwSelBoxes  aBoxes;
@@ -693,7 +691,7 @@ USHORT SwFEShell::_GetCurColNum( const SwFrm *pFrm,
 
 USHORT SwFEShell::GetCurColNum( SwGetCurColNumPara* pPara ) const
 {
-    ASSERT( GetCurrFrm(), "Crsr geparkt?" );
+    OSL_ENSURE( GetCurrFrm(), "Crsr geparkt?" );
     return _GetCurColNum( GetCurrFrm(), pPara );
 }
 
@@ -701,12 +699,12 @@ USHORT SwFEShell::GetCurOutColNum( SwGetCurColNumPara* pPara ) const
 {
     USHORT nRet = 0;
     SwFrm* pFrm = GetCurrFrm();
-    ASSERT( pFrm, "Crsr geparkt?" );
+    OSL_ENSURE( pFrm, "Crsr geparkt?" );
     if( pFrm )
     {
         pFrm = pFrm->IsInTab() ? (SwFrm*)pFrm->FindTabFrm()
                                : (SwFrm*)pFrm->FindSctFrm();
-        ASSERT( pFrm, "No Tab, no Sect" );
+        OSL_ENSURE( pFrm, "No Tab, no Sect" );
         if( pFrm )
             nRet = _GetCurColNum( pFrm, pPara );
     }
@@ -939,7 +937,7 @@ void SwFEShell::CalcBoundRect( SwRect& _orRect,
             }
             else
             {
-                ASSERT( rVertEnvironLayFrm.IsPageFrm(),
+                OSL_ENSURE( rVertEnvironLayFrm.IsPageFrm(),
                         "<SwFEShell::CalcBoundRect(..)> - not following text flow, but vertical environment *not* page!" );
                 aVertEnvironRect = rVertEnvironLayFrm.Frm();
                 // OD 19.09.2003 #i18732# - adjustment vertical 'virtual' anchor position
@@ -1237,9 +1235,7 @@ Size SwFEShell::GetGraphicDefaultSize() const
     }
     return aRet;
 }
-/* -----------------------------12.08.2002 12:51------------------------------
 
- ---------------------------------------------------------------------------*/
 BOOL SwFEShell::IsFrmVertical(BOOL bEnvironment, BOOL& bRTL) const
 {
     BOOL bVert = FALSE;
@@ -1255,7 +1251,7 @@ BOOL SwFEShell::IsFrmVertical(BOOL bEnvironment, BOOL& bRTL) const
         // --> OD 2006-01-06 #123831# - make code robust:
         if ( !pObj )
         {
-            ASSERT( false,
+            OSL_ENSURE( false,
                     "<SwFEShell::IsFrmVertical(..)> - missing SdrObject instance in marked object list -> This is a serious situation, please inform OD" );
             return bVert;
         }
@@ -1265,7 +1261,7 @@ BOOL SwFEShell::IsFrmVertical(BOOL bEnvironment, BOOL& bRTL) const
         // --> OD 2006-01-06 #123831# - make code robust:
         if ( !pContact )
         {
-            ASSERT( false,
+            OSL_ENSURE( false,
                     "<SwFEShell::IsFrmVertical(..)> - missing SwContact instance at marked object -> This is a serious situation, please inform OD" );
             return bVert;
         }
@@ -1274,7 +1270,7 @@ BOOL SwFEShell::IsFrmVertical(BOOL bEnvironment, BOOL& bRTL) const
         // --> OD 2006-01-06 #123831# - make code robust:
         if ( !pRef )
         {
-            ASSERT( false,
+            OSL_ENSURE( false,
                     "<SwFEShell::IsFrmVertical(..)> - missing anchor frame at marked object -> This is a serious situation, please inform OD" );
             return bVert;
         }
diff --git a/sw/source/core/frmedt/makefile.mk b/sw/source/core/frmedt/makefile.mk
index 8b277f899425..57baf675aa8e 100644
--- a/sw/source/core/frmedt/makefile.mk
+++ b/sw/source/core/frmedt/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -57,18 +57,18 @@ CXXFILES = \
 
 
 
-SLOFILES =  $(EXCEPTIONSFILES) \
+SLOFILES =  $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES=\
+        $(SLO)$/fecopy.obj \
         $(SLO)$/fedesc.obj \
+        $(SLO)$/fefly1.obj \
         $(SLO)$/feflyole.obj \
         $(SLO)$/feshview.obj \
         $(SLO)$/fetab.obj \
+        $(SLO)$/fews.obj \
         $(SLO)$/tblsel.obj
-        
-EXCEPTIONSFILES=\
-        $(SLO)$/fecopy.obj \
-        $(SLO)$/fefly1.obj \
-        $(SLO)$/fews.obj
-        
+
 
 # --- Tagets -------------------------------------------------------
 
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index 64af948a4472..e559683b08ac 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -216,7 +216,7 @@ void GetTblSel( const SwCursor& rCrsr, SwSelBoxes& rBoxes,
                 const SwTblSearchType eSearchType )
 {
     //Start- und Endzelle besorgen und den naechsten fragen.
-    ASSERT( rCrsr.GetCntntNode() && rCrsr.GetCntntNode( FALSE ),
+    OSL_ENSURE( rCrsr.GetCntntNode() && rCrsr.GetCntntNode( FALSE ),
             "Tabselection nicht auf Cnt." );
 
     // Zeilen-Selektion:
@@ -248,14 +248,14 @@ void GetTblSel( const SwCursor& rCrsr, SwSelBoxes& rBoxes,
         const ULONG nMarkSectionStart = pMarkNode->StartOfSectionIndex();
         const SwTableBox* pMarkBox = rTbl.GetTblBox( nMarkSectionStart );
 
-        ASSERT( pMarkBox, "Point in table, mark outside?" )
+        OSL_ENSURE( pMarkBox, "Point in table, mark outside?" );
 
         const SwTableLine* pLine = pMarkBox ? pMarkBox->GetUpper() : 0;
         USHORT nSttPos = rLines.GetPos( pLine );
-        ASSERT( USHRT_MAX != nSttPos, "Wo ist meine Zeile in der Tabelle?" );
+        OSL_ENSURE( USHRT_MAX != nSttPos, "Wo ist meine Zeile in der Tabelle?" );
         pLine = rTbl.GetTblBox( rCrsr.GetNode( TRUE )->StartOfSectionIndex() )->GetUpper();
         USHORT nEndPos = rLines.GetPos( pLine );
-        ASSERT( USHRT_MAX != nEndPos, "Wo ist meine Zeile in der Tabelle?" );
+        OSL_ENSURE( USHRT_MAX != nEndPos, "Wo ist meine Zeile in der Tabelle?" );
         // pb: #i20193# if tableintable then nSttPos == nEndPos == USHRT_MAX
         if ( nSttPos != USHRT_MAX && nEndPos != USHRT_MAX )
         {
@@ -307,7 +307,7 @@ void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
     const SwTabFrm* pStartTab = pStart->FindTabFrm();
     if ( !pStartTab )
     {
-        ASSERT( false, "GetTblSel without start table" )
+        OSL_ENSURE( false, "GetTblSel without start table" );
         return;
     }
 
@@ -371,7 +371,7 @@ void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
                             break;
                         }
 
-                        ASSERT( pCell->IsCellFrm(), "Frame ohne Celle" );
+                        OSL_ENSURE( pCell->IsCellFrm(), "Frame ohne Celle" );
                         if( ::IsFrmInTblSel( pUnion->GetUnion(), pCell ) )
                         {
                             SwTableBox* pBox = (SwTableBox*)
@@ -468,7 +468,7 @@ void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
         // been deleted due to the formatting of the table:
         if ( aDelCheck.HasBeenDeleted() )
         {
-            ASSERT( false, "Current box has been deleted during GetTblSel()" )
+            OSL_ENSURE( false, "Current box has been deleted during GetTblSel()" );
             break;
         }
         // <--
@@ -478,7 +478,7 @@ void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
         --nLoopMax;
 
     } while( TRUE );
-    ASSERT( nLoopMax, "das Layout der Tabelle wurde nicht valide!" );
+    OSL_ENSURE( nLoopMax, "das Layout der Tabelle wurde nicht valide!" );
 }
 
 
@@ -506,7 +506,7 @@ BOOL ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd,
             return FALSE;
 
     const SwLayoutFrm *pStart = pCNd ? pCNd->GetFrm( &aNullPos )->GetUpper() : 0;
-    ASSERT( pStart, "ohne Frame geht gar nichts" );
+    OSL_ENSURE( pStart, "ohne Frame geht gar nichts" );
 
     aIdx = rEndNd;
     pCNd = aIdx.GetNode().GetCntntNode();
@@ -520,7 +520,7 @@ BOOL ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd,
     }
 
     const SwLayoutFrm *pEnd = pCNd ? pCNd->GetFrm( &aNullPos )->GetUpper() : 0;
-    ASSERT( pEnd, "ohne Frame geht gar nichts" );
+    OSL_ENSURE( pEnd, "ohne Frame geht gar nichts" );
 
 
     BOOL bTblIsValid, bValidChartSel;
@@ -583,7 +583,7 @@ BOOL ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd,
                             break;
                         }
 
-                        ASSERT( pCell->IsCellFrm(), "Frame ohne Celle" );
+                        OSL_ENSURE( pCell->IsCellFrm(), "Frame ohne Celle" );
                         const SwRect& rUnion = pUnion->GetUnion(),
                                     & rFrmRect = pCell->Frm();
 
@@ -737,7 +737,7 @@ BOOL ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd,
             pGetCLines->DeleteAndDestroy( 0, pGetCLines->Count() );
     } while( TRUE );
 
-    ASSERT( nLoopMax, "das Layout der Tabelle wurde nicht valide!" );
+    OSL_ENSURE( nLoopMax, "das Layout der Tabelle wurde nicht valide!" );
 
     if( !bValidChartSel && pGetCLines )
         pGetCLines->DeleteAndDestroy( 0, pGetCLines->Count() );
@@ -748,7 +748,7 @@ BOOL ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd,
 
 BOOL IsFrmInTblSel( const SwRect& rUnion, const SwFrm* pCell )
 {
-    ASSERT( pCell->IsCellFrm(), "Frame ohne Gazelle" );
+    OSL_ENSURE( pCell->IsCellFrm(), "Frame ohne Gazelle" );
 
     if( pCell->FindTabFrm()->IsVertical() )
         return ( rUnion.Right() >= pCell->Frm().Right() &&
@@ -828,7 +828,7 @@ BOOL GetAutoSumSel( const SwCrsrShell& rShell, SwCellFrms& rBoxes )
                         break;
                     }
 
-                    ASSERT( pCell->IsCellFrm(), "Frame ohne Celle" );
+                    OSL_ENSURE( pCell->IsCellFrm(), "Frame ohne Celle" );
                     if( ::IsFrmInTblSel( pUnion->GetUnion(), pCell ) )
                         pUpperCell = (SwCellFrm*)pCell;
 
@@ -897,7 +897,7 @@ BOOL GetAutoSumSel( const SwCrsrShell& rShell, SwCellFrms& rBoxes )
                             break;
                         }
 
-                        ASSERT( pCell->IsCellFrm(), "Frame ohne Celle" );
+                        OSL_ENSURE( pCell->IsCellFrm(), "Frame ohne Celle" );
                         if( ::IsFrmInTblSel( pUnion->GetUnion(), pCell ) )
                         {
                             const SwCellFrm* pC = (SwCellFrm*)pCell;
@@ -947,7 +947,7 @@ _CmpLPt::_CmpLPt( const Point& rPt, const SwTableBox* pBox, BOOL bVertical )
 void lcl_InsTblBox( SwTableNode* pTblNd, SwDoc* pDoc, SwTableBox* pBox,
                         USHORT nInsPos, USHORT nCnt = 1 )
 {
-    ASSERT( pBox->GetSttNd(), "Box ohne Start-Node" );
+    OSL_ENSURE( pBox->GetSttNd(), "Box ohne Start-Node" );
     SwCntntNode* pCNd = pDoc->GetNodes()[ pBox->GetSttIdx() + 1 ]
                                 ->GetCntntNode();
     if( pCNd && pCNd->IsTxtNode() )
@@ -1007,13 +1007,12 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
         rBoxes.Remove( USHORT(0), rBoxes.Count() );
 
     //Zuerst lassen wir uns die Tabellen und die Rechtecke heraussuchen.
-    ASSERT( rPam.GetCntntNode() && rPam.GetCntntNode( FALSE ),
+    OSL_ENSURE( rPam.GetCntntNode() && rPam.GetCntntNode( FALSE ),
             "Tabselection nicht auf Cnt." );
 
 //JP 24.09.96: Merge mit wiederholenden TabellenHeadline funktioniert nicht
 //              richtig. Warum nicht Point 0,0 benutzen? Dann ist garantiert,
 //              das die 1. Headline mit drin ist.
-//  Point aPt( rShell.GetCharRect().Pos() );
     Point aPt( 0, 0 );
     const SwLayoutFrm *pStart = rPam.GetCntntNode()->GetFrm(
                                                         &aPt )->GetUpper(),
@@ -1055,7 +1054,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
 
                 while ( pCell && pRow->IsAnLower( pCell ) )
                 {
-                    ASSERT( pCell->IsCellFrm(), "Frame ohne Celle" );
+                    OSL_ENSURE( pCell->IsCellFrm(), "Frame ohne Celle" );
                         // in der vollen Breite ueberlappend ?
                     if( rUnion.Top() <= pCell->Frm().Top() &&
                         rUnion.Bottom() >= pCell->Frm().Bottom() )
@@ -1480,7 +1479,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
 
         // in der MergeBox sollte jetzt der gesamte Text stehen
         // loesche jetzt noch den initialen TextNode
-        ASSERT( (*ppMergeBox)->GetSttIdx()+2 <
+        OSL_ENSURE( (*ppMergeBox)->GetSttIdx()+2 <
                 (*ppMergeBox)->GetSttNd()->EndOfSectionIndex(),
                     "leere Box" );
         SwNodeIndex aIdx( *(*ppMergeBox)->GetSttNd()->EndOfSectionNode(), -1 );
@@ -1603,31 +1602,6 @@ SwTwips lcl_CalcWish( const SwLayoutFrm *pCell, long nWish,
     return nRet;
 }
 
-/*  MA: 20. Sep. 93 wird nicht mehr gebraucht.
-static const SwLayoutFrm *GetPrevCell( const SwLayoutFrm *pCell )
-{
-    const SwLayoutFrm *pLay = pCell->GetPrevLayoutLeaf();
-    if ( pLay && pLay->IsLayoutFrm() && !pLay->IsTab() )
-    {
-        //GetPrevLayoutLeaf() liefert ggf. auch die Umgebung einer Tab zurueck
-        //(naehmlich genau dann, wenn die Zelle noch Vorgaenger hat).
-        const SwFrm *pFrm = pLay->Lower();
-        while ( pFrm->GetNext() )
-            pFrm = pFrm->GetNext();
-        pLay = pFrm->IsTabFrm() ? (SwLayoutFrm*)pFrm : 0;
-    }
-    if ( pLay && pLay->IsTabFrm() )
-    {
-        //GetPrevLayoutLeaf() liefert ggf. auch Tabellen zurueck die letzte
-        //Zelle dieser Tabelle ist das das gesuchte Blatt.
-        pLay = ((SwTabFrm*)pLay)->FindLastCntnt()->GetUpper();
-        while ( !pLay->IsCellFrm() )
-            pLay = pLay->GetUpper();
-    }
-    return pLay;
-}
-*/
-
 void lcl_FindStartEndRow( const SwLayoutFrm *&rpStart,
                              const SwLayoutFrm *&rpEnd,
                              const int bChkProtected )
@@ -1723,7 +1697,7 @@ void lcl_FindStartEndCol( const SwLayoutFrm *&rpStart,
     while ( pTab->IsFollow() )
     {
         const SwFrm *pTmp = pTab->FindPrev();
-        ASSERT( pTmp->IsTabFrm(), "Vorgaenger vom Follow nicht der Master." );
+        OSL_ENSURE( pTmp->IsTabFrm(), "Vorgaenger vom Follow nicht der Master." );
         pTab = (const SwTabFrm*)pTmp;
     }
 
@@ -1748,8 +1722,8 @@ void lcl_FindStartEndCol( const SwLayoutFrm *&rpStart,
             (!pTmp->IsCellFrm() ||
              ( ( ! bRTL && (pTmp->Frm().*fnRect->fnGetLeft)() < nSX &&
                            (pTmp->Frm().*fnRect->fnGetRight)()< nSX2 ) ||
-                   bRTL && (pTmp->Frm().*fnRect->fnGetLeft)() > nSX &&
-                           (pTmp->Frm().*fnRect->fnGetRight)()> nSX2 ) ) )
+                   (bRTL && (pTmp->Frm().*fnRect->fnGetLeft)() > nSX &&
+                           (pTmp->Frm().*fnRect->fnGetRight)()> nSX2) ) ) )
         pTmp = pTmp->GetNextLayoutLeaf();
 
     if ( pTmp )
@@ -1846,7 +1820,7 @@ void lcl_FindStartEndCol( const SwLayoutFrm *&rpStart,
         if ( !pTmpLeaf || !pTmpTab->IsAnLower( pTmpLeaf ) )
         {
             pTmpTab = (const SwTabFrm*)pTmpTab->FindPrev();
-            ASSERT( pTmpTab->IsTabFrm(), "Vorgaenger vom Follow nicht der Master.");
+            OSL_ENSURE( pTmpTab->IsTabFrm(), "Vorgaenger vom Follow nicht der Master.");
             rpEnd = pTmpTab->FindLastCntnt()->GetUpper();
             while( !rpEnd->IsCellFrm() )
                 rpEnd = rpEnd->GetUpper();
@@ -1870,7 +1844,7 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrm *pStart,
     // #112697# Robust:
     if ( !pStart || !pEnd )
     {
-        ASSERT( false, "MakeSelUnions with pStart or pEnd not in CellFrm" )
+        OSL_ENSURE( false, "MakeSelUnions with pStart or pEnd not in CellFrm" );
         return;
     }
 
@@ -1884,7 +1858,7 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrm *pStart,
     {
         if ( !pTable->IsAnFollow( pEndTable ) )
         {
-            ASSERT( pEndTable->IsAnFollow( pTable ), "Tabkette verknotet." );
+            OSL_ENSURE( pEndTable->IsAnFollow( pTable ), "Tabkette verknotet." );
             bExchange = TRUE;
         }
     }
@@ -2008,7 +1982,7 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrm *pStart,
                     pTmpCell = static_cast<const SwRowFrm*>(pTmpRow)->Lower();
                     pTmpRow  = static_cast<const SwCellFrm*>(pTmpCell)->Lower();
                 }
-                ASSERT( !pTmpCell || pTmpCell->IsCellFrm(), "Lower of rowframe != cellframe?!" )
+                OSL_ENSURE( !pTmpCell || pTmpCell->IsCellFrm(), "Lower of rowframe != cellframe?!" );
             }
             // <--
 
@@ -2114,7 +2088,7 @@ BOOL CheckSplitCells( const SwCursor& rCrsr, USHORT nDiv,
 
                 while ( pCell && pRow->IsAnLower( pCell ) )
                 {
-                    ASSERT( pCell->IsCellFrm(), "Frame ohne Celle" );
+                    OSL_ENSURE( pCell->IsCellFrm(), "Frame ohne Celle" );
                     if( ::IsFrmInTblSel( pUnion->GetUnion(), pCell ) )
                     {
                         if( (pCell->Frm().*fnRect->fnGetWidth)() < nMinValue )
@@ -2226,7 +2200,7 @@ void _FndBox::SetTableLines( const SwSelBoxes &rBoxes, const SwTable &rTable )
         const USHORT nPos = rTable.GetTabLines().GetPos(
                     (const SwTableLine*&)pLine ) + 1;
 
-        ASSERT( nPos != USHRT_MAX, "TableLine not found." );
+        OSL_ENSURE( nPos != USHRT_MAX, "TableLine not found." );
 
         if( nStPos > nPos )
             nStPos = nPos;
@@ -2254,13 +2228,13 @@ void _FndBox::SetTableLines( const SwTable &rTable )
 
     SwTableLine* pTmpLine = GetLines()[0]->GetLine();
     USHORT nPos = rTable.GetTabLines().C40_GETPOS( SwTableLine, pTmpLine );
-    ASSERT( USHRT_MAX != nPos, "Line steht nicht in der Tabelle" );
+    OSL_ENSURE( USHRT_MAX != nPos, "Line steht nicht in der Tabelle" );
     if( nPos )
         pLineBefore = rTable.GetTabLines()[ nPos - 1 ];
 
     pTmpLine = GetLines()[GetLines().Count()-1]->GetLine();
     nPos = rTable.GetTabLines().C40_GETPOS( SwTableLine, pTmpLine );
-    ASSERT( USHRT_MAX != nPos, "Line steht nicht in der Tabelle" );
+    OSL_ENSURE( USHRT_MAX != nPos, "Line steht nicht in der Tabelle" );
     if( ++nPos < rTable.GetTabLines().Count() )
         pLineBehind = rTable.GetTabLines()[nPos];
 }
@@ -2286,7 +2260,7 @@ void _FndBox::DelFrms( SwTable &rTable )
     {
         nStPos = rTable.GetTabLines().GetPos(
                         (const SwTableLine*&)pLineBefore );
-        ASSERT( nStPos != USHRT_MAX, "Fuchs Du hast die Line gestohlen!" );
+        OSL_ENSURE( nStPos != USHRT_MAX, "Fuchs Du hast die Line gestohlen!" );
         ++nStPos;
     }
     if( rTable.IsNewModel() && pLineBehind )
@@ -2295,7 +2269,7 @@ void _FndBox::DelFrms( SwTable &rTable )
     {
         nEndPos = rTable.GetTabLines().GetPos(
                         (const SwTableLine*&)pLineBehind );
-        ASSERT( nEndPos != USHRT_MAX, "Fuchs Du hast die Line gestohlen!" );
+        OSL_ENSURE( nEndPos != USHRT_MAX, "Fuchs Du hast die Line gestohlen!" );
         --nEndPos;
     }
 
@@ -2339,7 +2313,7 @@ void _FndBox::DelFrms( SwTable &rTable )
                         if ( pPrev )
                         {
                             SwFrm *pTmp = pPrev->FindPrev();
-                            ASSERT( pTmp->IsTabFrm(),
+                            OSL_ENSURE( pTmp->IsTabFrm(),
                                     "Vorgaenger vom Follow kein Master.");
                             pPrev = (SwTabFrm*)pTmp;
                         }
@@ -2415,7 +2389,7 @@ BOOL lcl_IsLineOfTblFrm( const SwTabFrm& rTable, const SwFrm& rChk )
  */
 void lcl_UpdateRepeatedHeadlines( SwTabFrm& rTabFrm, bool bCalcLowers )
 {
-    ASSERT( rTabFrm.IsFollow(), "lcl_UpdateRepeatedHeadlines called for non-follow tab" )
+    OSL_ENSURE( rTabFrm.IsFollow(), "lcl_UpdateRepeatedHeadlines called for non-follow tab" );
 
     // Delete remaining headlines:
     SwRowFrm* pLower = 0;
@@ -2454,7 +2428,7 @@ void _FndBox::MakeFrms( SwTable &rTable )
     {
         nStPos = rTable.GetTabLines().GetPos(
                         (const SwTableLine*&)pLineBefore );
-        ASSERT( nStPos != USHRT_MAX, "Fuchs Du hast die Line gestohlen!" );
+        OSL_ENSURE( nStPos != USHRT_MAX, "Fuchs Du hast die Line gestohlen!" );
         ++nStPos;
 
     }
@@ -2462,7 +2436,7 @@ void _FndBox::MakeFrms( SwTable &rTable )
     {
         nEndPos = rTable.GetTabLines().GetPos(
                         (const SwTableLine*&)pLineBehind );
-        ASSERT( nEndPos != USHRT_MAX, "Fuchs Du hast die Line gestohlen!" );
+        OSL_ENSURE( nEndPos != USHRT_MAX, "Fuchs Du hast die Line gestohlen!" );
         --nEndPos;
     }
     //Jetzt die grosse Einfuegeoperation fuer alle Tabllen.
@@ -2655,8 +2629,8 @@ void _FndBox::MakeNewFrms( SwTable &rTable, const USHORT nNumber,
                     lcl_UpdateRepeatedHeadlines( *pTable, true );
                 }
 
-                ASSERT( ((SwRowFrm*)pTable->Lower())->GetTabLine() ==
-                        rTable.GetTabLines()[0], "MakeNewFrms: Table corruption!" )
+                OSL_ENSURE( ((SwRowFrm*)pTable->Lower())->GetTabLine() ==
+                        rTable.GetTabLines()[0], "MakeNewFrms: Table corruption!" );
             }
         }
     }
@@ -2689,7 +2663,7 @@ BOOL _FndBox::AreLinesToRestore( const SwTable &rTable ) const
 
     if ( nBfPos == nBhPos ) //Duerfte eigentlich nie vorkommen.
     {
-        ASSERT( FALSE, "Table, Loeschen auf keinem Bereich !?!" );
+        OSL_ENSURE( FALSE, "Table, Loeschen auf keinem Bereich !?!" );
         return FALSE;
     }
 
diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx
index b3c92a5ca399..f482de2d4c8c 100644
--- a/sw/source/core/graphic/grfatr.cxx
+++ b/sw/source/core/graphic/grfatr.cxx
@@ -107,7 +107,7 @@ bool SwMirrorGrf::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
                    GetValue() == RES_MIRROR_GRAPH_BOTH;
             break;
         default:
-            ASSERT( !this, "unknown MemberId" );
+            OSL_ENSURE( !this, "unknown MemberId" );
             bRet = false;
     }
     rVal.setValue( &bVal, ::getBooleanCppuType() );
@@ -156,7 +156,7 @@ bool SwMirrorGrf::PutValue( const uno::Any& rVal, BYTE nMemberId )
             }
             break;
         default:
-            ASSERT( !this, "unknown MemberId" );
+            OSL_ENSURE( !this, "unknown MemberId" );
             bRet = false;
     }
     return bRet;
@@ -332,10 +332,6 @@ SfxPoolItem* SwDrawModeGrf::Clone( SfxItemPool * ) const
 
 USHORT SwDrawModeGrf::GetValueCount() const
 {
-    // GRAPHICDRAWMODE_STANDARD = 0,
-    // GRAPHICDRAWMODE_GREYS = 1,
-    // GRAPHICDRAWMODE_MONO = 2,
-    // GRAPHICDRAWMODE_WATERMARK = 3
     return GRAPHICDRAWMODE_WATERMARK + 1;
 }
 
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 0e6d055c5289..7c5d23b6454b 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -150,13 +150,13 @@ BOOL SwGrfNode::ReRead(
 {
     BOOL bReadGrf = FALSE, bSetTwipSize = TRUE;
 
-    ASSERT( pGraphic || pGrfObj || rGrfName.Len(),
+    OSL_ENSURE( pGraphic || pGrfObj || rGrfName.Len(),
             "GraphicNode without a name, Graphic or GraphicObject" );
 
     // ReadRead mit Namen
     if( refLink.Is() )
     {
-        ASSERT( !bInSwapIn, "ReRead: stehe noch im SwapIn" );
+        OSL_ENSURE( !bInSwapIn, "ReRead: stehe noch im SwapIn" );
 
         if( rGrfName.Len() )
         {
@@ -287,10 +287,7 @@ BOOL SwGrfNode::ReRead(
                 // der neue Kink nicht geladen werden konnte.
                 Graphic aGrf; aGrf.SetDefaultType();
                 aGrfObj.SetGraphic( aGrf, rGrfName );
-                // --> OD 2006-11-03 #i59688#
-                // do not load linked graphic, if it isn't a new linked graphic.
-//                //TODO refLink->setInputStream(getInputStream());
-//                ((SwBaseLink*)&refLink)->SwapIn();
+                // #i59688# - do not load linked graphic, if it isn't a new linked graphic.
                 if ( bNewGrf )
                 {
                     ((SwBaseLink*)&refLink)->SwapIn();
@@ -325,7 +322,7 @@ SwGrfNode::~SwGrfNode()
     SwDoc* pDoc = GetDoc();
     if( refLink.Is() )
     {
-        ASSERT( !bInSwapIn, "DTOR: stehe noch im SwapIn" );
+        OSL_ENSURE( !bInSwapIn, "DTOR: stehe noch im SwapIn" );
         pDoc->GetLinkManager().Remove( refLink );
         refLink->Disconnect();
     }
@@ -365,7 +362,7 @@ SwGrfNode * SwNodes::MakeGrfNode( const SwNodeIndex & rWhere,
                                 SwAttrSet* pAutoAttr,
                                 BOOL bDelayed )
 {
-    ASSERT( pGrfColl, "MakeGrfNode: Formatpointer ist 0." );
+    OSL_ENSURE( pGrfColl, "MakeGrfNode: Formatpointer ist 0." );
     SwGrfNode *pNode;
     // Delayed erzeugen nur aus dem SW/G-Reader
     if( bDelayed )
@@ -382,7 +379,7 @@ SwGrfNode * SwNodes::MakeGrfNode( const SwNodeIndex & rWhere,
                                 SwGrfFmtColl* pGrfColl,
                                 SwAttrSet* pAutoAttr )
 {
-    ASSERT( pGrfColl, "MakeGrfNode: Formatpointer ist 0." );
+    OSL_ENSURE( pGrfColl, "MakeGrfNode: Formatpointer ist 0." );
     return new SwGrfNode( rWhere, rGrfObj, pGrfColl, pAutoAttr );
 }
 
@@ -459,10 +456,7 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
             // --> OD 2005-05-04 #i48434# - usage of new method <_GetStreamForEmbedGrf(..)>
             try
             {
-                // --> OD, MAV 2005-08-17 #i53025# - needed correction of new
-                // method <_GetStreamForEmbedGrf(..)>
-//                bool bGraphic(false);
-//                SvStream* pStrm = _GetStreamForEmbedGrf( bGraphic );
+                // #i53025# - needed correction of new method <_GetStreamForEmbedGrf(..)>
                 String aStrmName, aPicStgName;
                 _GetStreamStorageNames( aStrmName, aPicStgName );
                 uno::Reference < embed::XStorage > refPics = _GetDocSubstorageOrRoot( aPicStgName );
@@ -478,7 +472,7 @@ short SwGrfNode::SwapIn( BOOL bWaitForData )
             catch ( uno::Exception& )
             {
                 // --> OD 2005-04-25 #i48434#
-                ASSERT( false, "<SwGrfNode::SwapIn(..)> - unhandled exception!" );
+                OSL_ENSURE( false, "<SwGrfNode::SwapIn(..)> - unhandled exception!" );
                 // <--
             }
             // <--
@@ -561,7 +555,7 @@ BOOL SwGrfNode::SavePersistentData()
 {
     if( refLink.Is() )
     {
-        ASSERT( !bInSwapIn, "SavePersistentData: stehe noch im SwapIn" );
+        OSL_ENSURE( !bInSwapIn, "SavePersistentData: stehe noch im SwapIn" );
         GetDoc()->GetLinkManager().Remove( refLink );
         return TRUE;
     }
@@ -640,8 +634,6 @@ void SwGrfNode::ReleaseLink()
 {
     if( refLink.Is() )
     {
-        // erst die Grafik reinswappen!
-//      if( aGraphic.IsSwapOut() || !refLink->IsSynchron() )
         {
             bInSwapIn = TRUE;
             SwBaseLink* pLink = (SwBaseLink*)(::sfx2::SvBaseLink*) refLink;
@@ -698,7 +690,7 @@ void SwGrfNode::ScaleImageMap()
         nWidth -= rBox.CalcLineSpace(BOX_LINE_LEFT) +
                   rBox.CalcLineSpace(BOX_LINE_RIGHT);
 
-        ASSERT( nWidth>0, "Gibt es 0 twip breite Grafiken!?" );
+        OSL_ENSURE( nWidth>0, "Gibt es 0 twip breite Grafiken!?" );
 
         if( nGrfSize.Width() != nWidth )
         {
@@ -713,7 +705,7 @@ void SwGrfNode::ScaleImageMap()
         nHeight -= rBox.CalcLineSpace(BOX_LINE_TOP) +
                    rBox.CalcLineSpace(BOX_LINE_BOTTOM);
 
-        ASSERT( nHeight>0, "Gibt es 0 twip hohe Grafiken!?" );
+        OSL_ENSURE( nHeight>0, "Gibt es 0 twip hohe Grafiken!?" );
 
         if( nGrfSize.Height() != nHeight )
         {
@@ -753,7 +745,7 @@ void SwGrfNode::DelStreamName()
             catch ( uno::Exception& )
             {
                 // --> OD 2005-04-25 #i48434#
-                ASSERT( false, "<SwGrfNode::DelStreamName()> - unhandled exception!" );
+                OSL_ENSURE( false, "<SwGrfNode::DelStreamName()> - unhandled exception!" );
                 // <--
             }
         }
@@ -772,7 +764,7 @@ uno::Reference< embed::XStorage > SwGrfNode::_GetDocSubstorageOrRoot( const Stri
 {
     uno::Reference < embed::XStorage > refStor =
         const_cast<SwGrfNode*>(this)->GetDoc()->GetDocStorage();
-    ASSERT( refStor.is(), "Kein Storage am Doc" );
+    OSL_ENSURE( refStor.is(), "Kein Storage am Doc" );
 
     if ( aStgName.Len() )
     {
@@ -837,7 +829,7 @@ SvStream* SwGrfNode::_GetStreamForEmbedGrf(
         }
         else
         {
-            ASSERT( false, "<SwGrfNode::_GetStreamForEmbedGrf(..)> - embedded graphic file not found!" );
+            OSL_ENSURE( false, "<SwGrfNode::_GetStreamForEmbedGrf(..)> - embedded graphic file not found!" );
         }
     }
 
@@ -861,7 +853,7 @@ void SwGrfNode::_GetStreamStorageNames( String& rStrmName,
         aUserData=aNewStrmName;
     }
 
-    String aProt( RTL_CONSTASCII_STRINGPARAM( "vnd.sun.star.Package:" ) );
+    String aProt( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" ) );
     if( 0 == aUserData.CompareTo( aProt, aProt.Len() ) )
     {
         // 6.0 (XML) Package
@@ -881,10 +873,10 @@ void SwGrfNode::_GetStreamStorageNames( String& rStrmName,
     }
     else
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "<SwGrfNode::_GetStreamStorageNames(..)> - unknown graphic URL type. Code for handling 3.1 - 5.2 storages has been deleted by issue i53025." );
     }
-    ASSERT( STRING_NOTFOUND == rStrmName.Search( '/' ),
+    OSL_ENSURE( STRING_NOTFOUND == rStrmName.Search( '/' ),
             "invalid graphic stream name" );
 }
 // <--
@@ -901,10 +893,7 @@ SwCntntNode* SwGrfNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
         // --> OD 2005-05-04 #i48434# - usage of new method <_GetStreamForEmbedGrf(..)>
         try
         {
-            // --> OD, MAV 2005-08-17 #i53025# - needed correction of new
-            // method <_GetStreamForEmbedGrf(..)>
-//            bool bGraphic(false);
-//            SvStream* pStrm = _GetStreamForEmbedGrf( bGraphic );
+            // #i53025# - needed correction of new method <_GetStreamForEmbedGrf(..)>
             String aStrmName, aPicStgName;
             _GetStreamStorageNames( aStrmName, aPicStgName );
             uno::Reference < embed::XStorage > refPics = _GetDocSubstorageOrRoot( aPicStgName );
@@ -919,7 +908,7 @@ SwCntntNode* SwGrfNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
         catch ( uno::Exception& )
         {
             // --> OD 2005-04-25 #i48434#
-            ASSERT( false, "<SwGrfNode::MakeCopy(..)> - unhandled exception!" );
+            OSL_ENSURE( false, "<SwGrfNode::MakeCopy(..)> - unhandled exception!" );
             // <--
         }
         // <--
@@ -988,10 +977,7 @@ IMPL_LINK( SwGrfNode, SwapGraphic, GraphicObject*, pGrfObj )
             // --> OD 2005-05-04 #i48434# - usage of new method <_GetStreamForEmbedGrf(..)>
             try
             {
-                // --> OD, MAV 2005-08-17 #i53025# - needed correction of new
-                // method <_GetStreamForEmbedGrf(..)>
-//                bool bGraphic(false);
-//                SvStream* pStrm = _GetStreamForEmbedGrf( bGraphic );
+                // #i53025# - needed correction of new method <_GetStreamForEmbedGrf(..)>
                 String aStrmName, aPicStgName;
                 _GetStreamStorageNames( aStrmName, aPicStgName );
                 uno::Reference < embed::XStorage > refPics = _GetDocSubstorageOrRoot( aPicStgName );
@@ -1014,7 +1000,7 @@ IMPL_LINK( SwGrfNode, SwapGraphic, GraphicObject*, pGrfObj )
             catch ( uno::Exception& )
             {
                 // --> OD 2005-04-25 #i48434#
-                ASSERT( false, "<SwapGraphic> - unhandled exception!" );
+                OSL_ENSURE( false, "<SwapGraphic> - unhandled exception!" );
                 // <--
             }
             // <--
@@ -1146,7 +1132,7 @@ void SwGrfNode::TriggerAsyncRetrieveInputStream()
 {
     if ( !IsLinkedFile() )
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "<SwGrfNode::TriggerAsyncLoad()> - Method is misused. Method call is only valid for graphic nodes, which refer a linked graphic file" );
         return;
     }
@@ -1212,7 +1198,7 @@ bool SwGrfNode::IsAsyncRetrieveInputStreamPossible() const
     {
         String sGrfNm;
         refLink->GetLinkManager()->GetDisplayNames( refLink, 0, &sGrfNm, 0, 0 );
-        String sProtocol( RTL_CONSTASCII_STRINGPARAM( "vnd.sun.star.pkg:" ) );
+        String sProtocol( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.pkg:" ) );
         if ( sGrfNm.CompareTo( sProtocol, sProtocol.Len() ) != 0 )
         {
             bRet = true;
diff --git a/sw/source/core/inc/dbg_lay.hxx b/sw/source/core/inc/dbg_lay.hxx
index 9f91e43250b0..141d55d41946 100644
--- a/sw/source/core/inc/dbg_lay.hxx
+++ b/sw/source/core/inc/dbg_lay.hxx
@@ -64,7 +64,7 @@
 #define SNAP_FLYFRAMES   0x00000002
 #define SNAP_TABLECONT   0x00000004
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
 #include "swtypes.hxx"
 
diff --git a/sw/source/core/inc/dbgloop.hxx b/sw/source/core/inc/dbgloop.hxx
index 5dee5dc1bf19..da803ac9479b 100644
--- a/sw/source/core/inc/dbgloop.hxx
+++ b/sw/source/core/inc/dbgloop.hxx
@@ -29,7 +29,7 @@
 #ifndef _DBGLOOP_HXX
 #define _DBGLOOP_HXX
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
 #include <tools/solar.h>
 
diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx
index a7431ea526f0..2a790120e7f1 100644
--- a/sw/source/core/inc/doctxm.hxx
+++ b/sw/source/core/inc/doctxm.hxx
@@ -110,9 +110,7 @@ public:
 
     BOOL SetPosAtStartEnd( SwPosition& rPos, BOOL bAtStart = TRUE ) const;
 };
-/* -----------------02.09.99 07:52-------------------
 
- --------------------------------------------------*/
 struct SwDefTOXBase_Impl
 {
     SwTOXBase* pContBase;
diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx
index 9edb30829809..abc70caa34cb 100644
--- a/sw/source/core/inc/drawfont.hxx
+++ b/sw/source/core/inc/drawfont.hxx
@@ -95,7 +95,7 @@ class SwDrawTextInfo
     SwDrawTextInfo();       // nicht zulaessig
 public:
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     BOOL bPos   : 1;            // These flags should control, that the appropriate
     BOOL bWrong : 1;            // Set-function has been called before calling
     BOOL bGrammarCheck : 1;     //  the Get-function of a member
@@ -158,7 +158,7 @@ public:
         bUpper = FALSE;
         bDrawSpace = FALSE;
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         // these flags control, whether the matching member variables have
         // been set by using the Set-function before they may be accessed
         // by their Get-function:
@@ -199,13 +199,17 @@ public:
 
     const Point &GetPos() const
     {
-        ASSERT( bPos, "DrawTextInfo: Undefined Position" );
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( bPos, "DrawTextInfo: Undefined Position" );
+#endif
         return *pPos;
     }
 
     xub_StrLen *GetHyphPos() const
     {
-        ASSERT( bHyph, "DrawTextInfo: Undefined Hyph Position" );
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( bHyph, "DrawTextInfo: Undefined Hyph Position" );
+#endif
         return pHyphPos;
     }
 
@@ -216,13 +220,17 @@ public:
 
     const SwWrongList* GetWrong() const
     {
-        ASSERT( bWrong, "DrawTextInfo: Undefined WrongList" );
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( bWrong, "DrawTextInfo: Undefined WrongList" );
+#endif
         return pWrong;
     }
 
     const SwWrongList* GetGrammarCheck() const
     {
-        ASSERT( bGrammarCheck, "DrawTextInfo: Undefined GrammarCheck List" );
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( bGrammarCheck, "DrawTextInfo: Undefined GrammarCheck List" );
+#endif
         return pGrammarCheck;
     }
 
@@ -233,13 +241,17 @@ public:
 
     const Size &GetSize() const
     {
-        ASSERT( bSize, "DrawTextInfo: Undefined Size" );
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( bSize, "DrawTextInfo: Undefined Size" );
+#endif
         return *pSize;
     }
 
     SwFont* GetFont() const
     {
-        ASSERT( bFnt, "DrawTextInfo: Undefined Font" );
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( bFnt, "DrawTextInfo: Undefined Font" );
+#endif
         return pFnt;
     }
 
@@ -260,7 +272,9 @@ public:
 
     xub_StrLen GetOfst() const
     {
-        ASSERT( bOfst, "DrawTextInfo: Undefined Offset" );
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( bOfst, "DrawTextInfo: Undefined Offset" );
+#endif
         return nOfst;
     }
 
@@ -271,19 +285,25 @@ public:
 
     long GetLeft() const
     {
-        ASSERT( bLeft, "DrawTextInfo: Undefined left range" );
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( bLeft, "DrawTextInfo: Undefined left range" );
+#endif
         return nLeft;
     }
 
     long GetRight() const
     {
-        ASSERT( bRight, "DrawTextInfo: Undefined right range" );
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( bRight, "DrawTextInfo: Undefined right range" );
+#endif
         return nRight;
     }
 
     long GetKanaDiff() const
     {
-        ASSERT( bKana, "DrawTextInfo: Undefined kana difference" );
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( bKana, "DrawTextInfo: Undefined kana difference" );
+#endif
         return nKanaDiff;
     }
 
@@ -294,7 +314,9 @@ public:
 
     USHORT GetAscent() const
     {
-        ASSERT( bAscent, "DrawTextInfo: Undefined Ascent" );
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( bAscent, "DrawTextInfo: Undefined Ascent" );
+#endif
         return nAscent;
     }
 
@@ -305,7 +327,9 @@ public:
 
     long GetSperren() const
     {
-        ASSERT( bSperr, "DrawTextInfo: Undefined >Sperren<" );
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( bSperr, "DrawTextInfo: Undefined >Sperren<" );
+#endif
         return nSperren;
     }
 
@@ -316,13 +340,17 @@ public:
 
     long GetSpace() const
     {
-        ASSERT( bSpace, "DrawTextInfo: Undefined Spacing" );
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( bSpace, "DrawTextInfo: Undefined Spacing" );
+#endif
         return nSpace;
     }
 
     xub_StrLen GetNumberOfBlanks() const
     {
-        ASSERT( bNumberOfBlanks, "DrawTextInfo::Undefined NumberOfBlanks" );
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( bNumberOfBlanks, "DrawTextInfo::Undefined NumberOfBlanks" );
+#endif
         return nNumberOfBlanks;
     }
 
@@ -338,13 +366,17 @@ public:
 
     BOOL GetUpper() const
     {
-        ASSERT( bUppr, "DrawTextInfo: Undefined Upperflag" );
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( bUppr, "DrawTextInfo: Undefined Upperflag" );
+#endif
         return bUpper;
     }
 
     BOOL GetDrawSpace() const
     {
-        ASSERT( bDrawSp, "DrawTextInfo: Undefined DrawSpaceflag" );
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( bDrawSp, "DrawTextInfo: Undefined DrawSpaceflag" );
+#endif
         return bDrawSpace;
     }
 
@@ -381,7 +413,7 @@ public:
     void SetPos( const Point &rNew )
     {
         pPos = &rNew;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         bPos = TRUE;
 #endif
     }
@@ -389,7 +421,7 @@ public:
     void SetHyphPos( xub_StrLen *pNew )
     {
         pHyphPos = pNew;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         bHyph = TRUE;
 #endif
     }
@@ -402,7 +434,7 @@ public:
     void SetWrong( const SwWrongList* pNew )
     {
         pWrong = pNew;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         bWrong = TRUE;
 #endif
     }
@@ -410,7 +442,7 @@ public:
     void SetGrammarCheck( const SwWrongList* pNew )
     {
         pGrammarCheck = pNew;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         bGrammarCheck = TRUE;
 #endif
     }
@@ -423,7 +455,7 @@ public:
     void SetSize( const Size &rNew )
     {
         pSize = &rNew;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         bSize = TRUE;
 #endif
     }
@@ -431,7 +463,7 @@ public:
     void SetFont( SwFont* pNew )
     {
         pFnt = pNew;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         bFnt = TRUE;
 #endif
     }
@@ -449,7 +481,7 @@ public:
     void SetOfst( xub_StrLen nNew )
     {
         nOfst = nNew;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         bOfst = TRUE;
 #endif
     }
@@ -457,7 +489,7 @@ public:
     void SetLeft( long nNew )
     {
         nLeft = nNew;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         bLeft = TRUE;
 #endif
     }
@@ -465,7 +497,7 @@ public:
     void SetRight( long nNew )
     {
         nRight = nNew;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         bRight = TRUE;
 #endif
     }
@@ -473,7 +505,7 @@ public:
     void SetKanaDiff( long nNew )
     {
         nKanaDiff = nNew;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         bKana = TRUE;
 #endif
     }
@@ -486,7 +518,7 @@ public:
     void SetAscent( USHORT nNew )
     {
         nAscent = nNew;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         bAscent = TRUE;
 #endif
     }
@@ -508,7 +540,7 @@ public:
             nSpace = nNew;
             nSperren = 0;
         }
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         bSpace = TRUE;
         bSperr = TRUE;
 #endif
@@ -516,7 +548,7 @@ public:
 
     void SetNumberOfBlanks( xub_StrLen nNew )
     {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         bNumberOfBlanks = TRUE;
 #endif
         nNumberOfBlanks = nNew;
@@ -545,7 +577,7 @@ public:
     void SetUpper( BOOL bNew )
     {
         bUpper = bNew;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         bUppr = TRUE;
 #endif
     }
@@ -553,7 +585,7 @@ public:
     void SetDrawSpace( BOOL bNew )
     {
         bDrawSpace = bNew;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         bDrawSp = TRUE;
 #endif
     }
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index 55316aff08ff..699d90d3816e 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -166,7 +166,7 @@ public:
 
     virtual void  CheckDirection( BOOL bVert );
     virtual void Cut();
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 );
 #endif
 
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index cad2a89f1700..caca5826484a 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -52,7 +52,7 @@ class SwFntCache : public SwCache
 public:
 
     inline SwFntCache() : SwCache(50,50
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     , ByteString( RTL_CONSTASCII_STRINGPARAM(
                         "Globaler Font-Cache pFntCache" ))
 #endif
diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx
index b6bb5feb5cae..b1543e5c4383 100644
--- a/sw/source/core/inc/ftnfrm.hxx
+++ b/sw/source/core/inc/ftnfrm.hxx
@@ -72,7 +72,7 @@ class SwFtnFrm: public SwLayoutFrm
     // --> OD 2005-05-18 #i49383# - control unlock of position of lower anchored objects.
     bool mbUnlockPosOfLowerObjs : 1;
     // <--
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 protected:
     virtual SwTwips ShrinkFrm( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE );
     virtual SwTwips GrowFrm  ( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE );
@@ -87,14 +87,14 @@ public:
 
     BOOL operator<( const SwTxtFtn* pTxtFtn ) const;
 
-#ifndef DBG_UTIL
-    const SwCntntFrm *GetRef() const    { return pRef; }
-         SwCntntFrm  *GetRef()          { return pRef; }
-#else
-    //JP 15.10.2001: in a non pro version test if the attribute has the same
-    //              meaning which his reference is
+#if OSL_DEBUG_LEVEL > 1
+    // in a non pro version test if the attribute has the same
+    // meaning which his reference is
     const SwCntntFrm *GetRef() const;
          SwCntntFrm  *GetRef();
+#else
+    const SwCntntFrm *GetRef() const    { return pRef; }
+         SwCntntFrm  *GetRef()          { return pRef; }
 #endif
     const SwCntntFrm *GetRefFromAttr()  const;
           SwCntntFrm *GetRefFromAttr();
diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx
index 7e954db58921..2a0a01be4461 100644
--- a/sw/source/core/inc/layact.hxx
+++ b/sw/source/core/inc/layact.hxx
@@ -210,13 +210,13 @@ class SwLayIdle
     BOOL        bPageValid;     // Konnte die Seite alles validiert werden?
     BOOL        bAllValid;      // Konnte alles validiert werden?
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     BOOL bIndicator;
 #endif
 
 #ifdef _LAYACT_CXX
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     void ShowIdle( ColorData eName );
 #endif
 
diff --git a/sw/source/core/inc/laycache.hxx b/sw/source/core/inc/laycache.hxx
index a58c45a76d9c..71a2ec530196 100644
--- a/sw/source/core/inc/laycache.hxx
+++ b/sw/source/core/inc/laycache.hxx
@@ -70,7 +70,7 @@ public:
           return pImpl; }
     void UnlockImpl() { --nLockCount; }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     sal_Bool CompareLayout( const SwDoc& rDoc ) const;
 #endif
 };
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index 0f83039ce7a7..266d669e91cf 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -201,7 +201,7 @@ public:
     virtual void  Paint( const SwRect&, const SwPrtOptions *pPrintData = NULL ) const;
     virtual SwTwips ShrinkFrm( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE );
     virtual SwTwips GrowFrm  ( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     virtual void Cut();
     virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 );
 #endif
@@ -311,8 +311,8 @@ public:
     void InsertEmptySct( SwSectionFrm* pDel );
     void DeleteEmptySct() { if( pDestroy ) _DeleteEmptySct(); }
     void RemoveFromList( SwSectionFrm* pSct ) { if( pDestroy ) _RemoveFromList( pSct ); }
-#ifdef DBG_UTIL
-    // Wird zur Zeit nur fuer ASSERTs benutzt:
+#if OSL_DEBUG_LEVEL > 1
+    // Wird zur Zeit nur fuer OSL_ENSURE( benutzt:
     BOOL IsInDelList( SwSectionFrm* pSct ) const; // Ist der SectionFrm in der Liste enthalten?
 #endif
 
diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx
index 00687bf6ae15..71eea577f4e3 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -360,56 +360,56 @@ inline void SwScriptInfo::SetInvalidity( const xub_StrLen nPos )
 inline USHORT SwScriptInfo::CountScriptChg() const { return aScriptChg.Count(); }
 inline xub_StrLen SwScriptInfo::GetScriptChg( const USHORT nCnt ) const
 {
-    ASSERT( nCnt < aScriptChg.Count(),"No ScriptChange today!");
+    OSL_ENSURE( nCnt < aScriptChg.Count(),"No ScriptChange today!");
     return aScriptChg[ nCnt ];
 }
 inline BYTE SwScriptInfo::GetScriptType( const xub_StrLen nCnt ) const
 {
-    ASSERT( nCnt < aScriptChg.Count(),"No ScriptType today!");
+    OSL_ENSURE( nCnt < aScriptChg.Count(),"No ScriptType today!");
     return aScriptType[ nCnt ];
 }
 
 inline USHORT SwScriptInfo::CountDirChg() const { return aDirChg.Count(); }
 inline xub_StrLen SwScriptInfo::GetDirChg( const USHORT nCnt ) const
 {
-    ASSERT( nCnt < aDirChg.Count(),"No DirChange today!");
+    OSL_ENSURE( nCnt < aDirChg.Count(),"No DirChange today!");
     return aDirChg[ nCnt ];
 }
 inline BYTE SwScriptInfo::GetDirType( const xub_StrLen nCnt ) const
 {
-    ASSERT( nCnt < aDirChg.Count(),"No DirType today!");
+    OSL_ENSURE( nCnt < aDirChg.Count(),"No DirType today!");
     return aDirType[ nCnt ];
 }
 
 inline USHORT SwScriptInfo::CountKashida() const { return aKashida.Count(); }
 inline xub_StrLen SwScriptInfo::GetKashida( const USHORT nCnt ) const
 {
-    ASSERT( nCnt < aKashida.Count(),"No Kashidas today!");
+    OSL_ENSURE( nCnt < aKashida.Count(),"No Kashidas today!");
     return aKashida[ nCnt ];
 }
 
 inline USHORT SwScriptInfo::CountCompChg() const { return aCompChg.Count(); };
 inline xub_StrLen SwScriptInfo::GetCompStart( const USHORT nCnt ) const
 {
-    ASSERT( nCnt < aCompChg.Count(),"No CompressionStart today!");
+    OSL_ENSURE( nCnt < aCompChg.Count(),"No CompressionStart today!");
     return aCompChg[ nCnt ];
 }
 inline xub_StrLen SwScriptInfo::GetCompLen( const USHORT nCnt ) const
 {
-    ASSERT( nCnt < aCompChg.Count(),"No CompressionLen today!");
+    OSL_ENSURE( nCnt < aCompChg.Count(),"No CompressionLen today!");
     return aCompLen[ nCnt ];
 }
 
 inline BYTE SwScriptInfo::GetCompType( const USHORT nCnt ) const
 {
-    ASSERT( nCnt < aCompChg.Count(),"No CompressionType today!");
+    OSL_ENSURE( nCnt < aCompChg.Count(),"No CompressionType today!");
     return aCompType[ nCnt ];
 }
 
 inline USHORT SwScriptInfo::CountHiddenChg() const { return aHiddenChg.Count(); };
 inline xub_StrLen SwScriptInfo::GetHiddenChg( const USHORT nCnt ) const
 {
-    ASSERT( nCnt < aHiddenChg.Count(),"No HiddenChg today!");
+    OSL_ENSURE( nCnt < aHiddenChg.Count(),"No HiddenChg today!");
     return aHiddenChg[ nCnt ];
 }
 
diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx
index 895b027ece0e..48cc9ef8a284 100644
--- a/sw/source/core/inc/swcache.hxx
+++ b/sw/source/core/inc/swcache.hxx
@@ -58,7 +58,7 @@
  *
  */
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 #include <tools/string.hxx>
 #endif
 
@@ -90,7 +90,7 @@ class SwCache : public SwCacheObjArr
 
     void DeleteObj( SwCacheObj *pObj );
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     ByteString aName;
     long nAppend;           //Anzahl der Eintragungen durch Erweiterung.
     long nInsertFree;       //Anzahl der Eintragungen auf freie Plaetze.
@@ -112,7 +112,7 @@ class SwCache : public SwCacheObjArr
 public:
 
     //nur BYTE hineinstecken!!!
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     SwCache( const USHORT nInitSize, const USHORT nGrowSize,
             const ByteString &rNm );
     ~SwCache();
@@ -193,12 +193,12 @@ public:
 
     inline BOOL IsLocked() const { return 0 != nLock; }
 
-#ifndef DBG_UTIL
-    inline void Lock() { ++nLock; }
-    inline void Unlock() { --nLock; }
-#else
+#if OSL_DEBUG_LEVEL > 1
     void Lock();
     void Unlock();
+#else
+    inline void Lock() { ++nLock; }
+    inline void Unlock() { --nLock; }
 #endif
 
     SwCacheObj *Next() { return pNext; }
@@ -245,7 +245,7 @@ public:
 inline void SwCache::IncreaseMax( const USHORT nAdd )
 {
     nCurMax = nCurMax + sal::static_int_cast< USHORT >(nAdd);
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     ++nIncreaseMax;
 #endif
 }
@@ -253,7 +253,7 @@ inline void SwCache::DecreaseMax( const USHORT nSub )
 {
     if ( nCurMax > nSub )
         nCurMax = nCurMax - sal::static_int_cast< USHORT >(nSub);
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     ++nDecreaseMax;
 #endif
 }
diff --git a/sw/source/core/inc/swfntcch.hxx b/sw/source/core/inc/swfntcch.hxx
index beb6126e66ce..e57b6f7b1a41 100644
--- a/sw/source/core/inc/swfntcch.hxx
+++ b/sw/source/core/inc/swfntcch.hxx
@@ -47,7 +47,7 @@ class SwFontCache : public SwCache
 public:
 
     inline SwFontCache() : SwCache(50,50
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     , "Globaler AttributSet/Font-Cache pSwFontCache"
 #endif
     ) {}
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index ac4deb0a0c48..9e8d2e15fd5b 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -831,7 +831,7 @@ public:
 
     SwFont& GetFont()
     {
-        ASSERT( pFnt, "No underline font" )
+        OSL_ENSURE( pFnt, "No underline font" );
         return *pFnt;
     }
     const Point& GetPos() const { return aPos; }
@@ -844,9 +844,7 @@ public:
  *                      class SvStatistics
  *************************************************************************/
 
-#ifndef DBG_UTIL
-#define SV_STAT(nWhich)
-#else
+#if OSL_DEBUG_LEVEL > 1
 
 class SvStatistics
 {
@@ -892,7 +890,9 @@ inline void SvStatistics::PrintOn( SvStream &rOS ) const //$ ostream
         rOS << "\tnDrawStretchText: "   << nDrawStretchText << '\n';        if( nChangeFont )
         rOS << "\tnChangeFont: "    << nChangeFont  << '\n';        if( nGetFontMetric  )
         rOS << "\tnGetFontMetric: " << nGetFontMetric   << '\n';        rOS << "}"  << '\n';    }
-#endif  /*  PRODUCT */
+#else
+#define SV_STAT(nWhich)
+#endif  /*  DEBUG   */
 
 #endif
 
diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx
index 5977d9347ab1..d4dae4dc4435 100644
--- a/sw/source/core/inc/tblrwcl.hxx
+++ b/sw/source/core/inc/tblrwcl.hxx
@@ -67,7 +67,7 @@ BOOL lcl_BoxSetHeadCondColl( const SwTableBox*& rpBox, void* pPara );
 BOOL lcl_LineSetHeadCondColl( const SwTableLine*& rpLine, void* pPara );
 
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize );
 #endif
 
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index fedc219b6bf3..371d8b43e8c8 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -402,10 +402,10 @@ public:
     inline sal_Bool IsSwapped() const { return bIsSwapped; }
 
     // Hat der Frm eine lokale Fussnote (in diesem Frm bzw. Follow)?
-#ifndef DBG_UTIL
-    void CalcFtnFlag();
+#if OSL_DEBUG_LEVEL > 1
+    void CalcFtnFlag( xub_StrLen nStop = STRING_LEN );//For testing SplitFrm
 #else
-    void CalcFtnFlag( xub_StrLen nStop = STRING_LEN );//Fuer den Test von SplitFrm
+    void CalcFtnFlag();
 #endif
 
     // Hidden
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx
index 9c8bb36365fa..91c56da85517 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -304,7 +304,7 @@ void SwAnchoredDrawObject::MakeObjPos()
     // to anchor frame
     if ( mbNotYetAttachedToAnchorFrame )
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "<SwAnchoredDrawObject::MakeObjPos() - drawing object not yet attached to anchor frame -> no positioning" );
         return;
     }
@@ -377,7 +377,7 @@ void SwAnchoredDrawObject::MakeObjPos()
             break;
             default:
             {
-                ASSERT( false, "<SwAnchoredDrawObject::MakeObjPos()> - unknown anchor type - please inform OD." );
+                OSL_ENSURE( false, "<SwAnchoredDrawObject::MakeObjPos()> - unknown anchor type - please inform OD." );
             }
         }
 
@@ -680,13 +680,13 @@ void SwAnchoredDrawObject::InvalidateObjPos()
 
 SwFrmFmt& SwAnchoredDrawObject::GetFrmFmt()
 {
-    ASSERT( static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFmt(),
+    OSL_ENSURE( static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFmt(),
             "<SwAnchoredDrawObject::GetFrmFmt()> - missing frame format -> crash." );
     return *(static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFmt());
 }
 const SwFrmFmt& SwAnchoredDrawObject::GetFrmFmt() const
 {
-    ASSERT( static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFmt(),
+    OSL_ENSURE( static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFmt(),
             "<SwAnchoredDrawObject::GetFrmFmt()> - missing frame format -> crash." );
     return *(static_cast<SwDrawContact*>(GetUserCall(GetDrawObj()))->GetFmt());
 }
@@ -838,7 +838,7 @@ void SwAnchoredDrawObject::_SetPositioningAttr()
                 break;
                 default:
                 {
-                    ASSERT( false,
+                    OSL_ENSURE( false,
                             "<SwAnchoredDrawObject::_SetPositioningAttr()> - unsupported layout direction" );
                 }
             }
@@ -852,13 +852,7 @@ void SwAnchoredDrawObject::_SetPositioningAttr()
         GetFrmFmt().SetFmtAttr( aHori );
 
         SwFmtVertOrient aVert( GetFrmFmt().GetVertOrient() );
-        // --> OD 2007-01-03 #i73079# - vertical position already correct
-//        if ( aVert.GetRelationOrient() == text::RelOrientation::CHAR ||
-//             aVert.GetRelationOrient() == text::RelOrientation::TEXT_LINE )
-//        {
-//            nVertPos = -nVertPos;
-//        }
-        // <--
+
         aVert.SetPos( nVertPos );
         GetFrmFmt().SetFmtAttr( aVert );
         // <--
diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx
index 656e8bdce592..ebbe5e4f3e0d 100644
--- a/sw/source/core/layout/anchoredobject.cxx
+++ b/sw/source/core/layout/anchoredobject.cxx
@@ -646,7 +646,7 @@ bool SwAnchoredObject::HasClearedEnvironment() const
     bool bHasClearedEnvironment( false );
 
     // --> OD 2005-03-03 #i43913# - layout frame, vertical position is orient at, has to be set.
-    ASSERT( GetVertPosOrientFrm(),
+    OSL_ENSURE( GetVertPosOrientFrm(),
             "<SwAnchoredObject::HasClearedEnvironment()> - layout frame missing, at which the vertical position is oriented at." );
     if ( GetVertPosOrientFrm() &&
          GetAnchorFrm()->IsTxtFrm() &&
@@ -691,7 +691,7 @@ const SwRect& SwAnchoredObject::GetObjRectWithSpaces() const
     if ( mbObjRectWithSpacesValid &&
          maLastObjRect != GetObjRect() )
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "<SwAnchoredObject::GetObjRectWithSpaces> - cache for object rectangle inclusive spaces marked as valid, but it couldn't be. Missing invalidation of cache. Please inform OD." );
         InvalidateObjRectWithSpaces();
     }
@@ -966,7 +966,7 @@ Point SwAnchoredObject::GetRelPosToAnchorFrm() const
 {
     Point aRelPos;
 
-    ASSERT( GetAnchorFrm(),
+    OSL_ENSURE( GetAnchorFrm(),
             "<SwAnchoredObject::GetRelPosToAnchorFrm()> - missing anchor frame." );
     aRelPos = GetObjRect().Pos();
     aRelPos -= GetAnchorFrm()->Frm().Pos();
@@ -993,9 +993,9 @@ Point SwAnchoredObject::GetRelPosToPageFrm( const bool _bFollowTextFlow,
     Point aRelPos;
     _obRelToTableCell = false;
 
-    ASSERT( GetAnchorFrm(),
+    OSL_ENSURE( GetAnchorFrm(),
             "<SwAnchoredObject::GetRelPosToPageFrm()> - missing anchor frame." );
-    ASSERT( GetAnchorFrm()->FindPageFrm(),
+    OSL_ENSURE( GetAnchorFrm()->FindPageFrm(),
             "<SwAnchoredObject::GetRelPosToPageFrm()> - missing page frame." );
 
     aRelPos = GetObjRect().Pos();
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 40ccb529b4c4..dc4e603c2e41 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -246,7 +246,7 @@ void DelHFFormat( SwClient *pToRemove, SwFrmFmt *pFmt )
             sal_Bool bDoesUndo = pDoc->DoesUndo();
             pDoc->DoUndo( sal_False );
 
-            ASSERT( pNode, "Ein grosses Problem." );
+            OSL_ENSURE( pNode, "Ein grosses Problem." );
             pDoc->DeleteSection( pNode );
 
             if( bDoesUndo )
@@ -280,7 +280,7 @@ SwFmtFrmSize& SwFmtFrmSize::operator=( const SwFmtFrmSize& rCpy )
 
 int  SwFmtFrmSize::operator==( const SfxPoolItem& rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+    OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
     return( eFrmHeightType  == ((SwFmtFrmSize&)rAttr).eFrmHeightType &&
             eFrmWidthType  == ((SwFmtFrmSize&)rAttr).eFrmWidthType &&
             aSize           == ((SwFmtFrmSize&)rAttr).GetSize()&&
@@ -293,10 +293,6 @@ SfxPoolItem*  SwFmtFrmSize::Clone( SfxItemPool* ) const
     return new SwFmtFrmSize( *this );
 }
 
-
-/* -----------------24.04.98 11:36-------------------
- *
- * --------------------------------------------------*/
 bool SwFmtFrmSize::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 {
     // hier wird immer konvertiert!
@@ -355,9 +351,6 @@ bool SwFmtFrmSize::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
     return true;
 }
 
-/* -----------------24.04.98 11:36-------------------
- *
- * --------------------------------------------------*/
 bool SwFmtFrmSize::PutValue( const uno::Any& rVal, BYTE nMemberId )
 {
     sal_Bool bConvert = 0 != (nMemberId&CONVERT_TWIPS);
@@ -536,7 +529,7 @@ SwFmtHeader::SwFmtHeader( sal_Bool bOn )
 
 int  SwFmtHeader::operator==( const SfxPoolItem& rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+    OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
     return ( pRegisteredIn == ((SwFmtHeader&)rAttr).GetRegisteredIn() &&
              bActive == ((SwFmtHeader&)rAttr).IsActive() );
 }
@@ -578,7 +571,7 @@ SwFmtFooter::SwFmtFooter( sal_Bool bOn )
 
 int  SwFmtFooter::operator==( const SfxPoolItem& rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+    OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
     return ( pRegisteredIn == ((SwFmtFooter&)rAttr).GetRegisteredIn() &&
              bActive == ((SwFmtFooter&)rAttr).IsActive() );
 }
@@ -617,7 +610,7 @@ void SwFmtCntnt::SetNewCntntIdx( const SwNodeIndex *pIdx )
 
 int  SwFmtCntnt::operator==( const SfxPoolItem& rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+    OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
     if( (long)pStartNode ^ (long)((SwFmtCntnt&)rAttr).pStartNode )
         return 0;
     if( pStartNode )
@@ -655,7 +648,7 @@ SwFmtPageDesc::SwFmtPageDesc( const SwPageDesc *pDesc )
 
 int  SwFmtPageDesc::operator==( const SfxPoolItem& rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+    OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
     return  ( pDefinedIn == ((SwFmtPageDesc&)rAttr).pDefinedIn ) &&
             ( nNumOffset == ((SwFmtPageDesc&)rAttr).nNumOffset ) &&
             ( GetPageDesc() == ((SwFmtPageDesc&)rAttr).GetPageDesc() );
@@ -679,19 +672,19 @@ void SwFmtPageDesc::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
                 //mich also bei meinem Format aus.
                 //Dabei werden ich Deletet!!!
             if( IS_TYPE( SwFmt, pDefinedIn ))
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
             {
                 sal_Bool bDel = ((SwFmt*)pDefinedIn)->ResetFmtAttr( RES_PAGEDESC );
-                ASSERT( bDel, ";-) FmtPageDesc nicht zerstoert." );
+                OSL_ENSURE( bDel, ";-) FmtPageDesc nicht zerstoert." );
             }
 #else
                 ((SwFmt*)pDefinedIn)->ResetFmtAttr( RES_PAGEDESC );
 #endif
             else if( IS_TYPE( SwCntntNode, pDefinedIn ))
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
             {
                 sal_Bool bDel = ((SwCntntNode*)pDefinedIn)->ResetAttr( RES_PAGEDESC );
-                ASSERT( bDel, ";-) FmtPageDesc nicht zerstoert." );
+                OSL_ENSURE( bDel, ";-) FmtPageDesc nicht zerstoert." );
             }
 #else
                 ((SwCntntNode*)pDefinedIn)->ResetAttr( RES_PAGEDESC );
@@ -728,7 +721,7 @@ bool SwFmtPageDesc::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
             }
             break;
         default:
-            ASSERT( !this, "unknown MemberId" );
+            OSL_ENSURE( !this, "unknown MemberId" );
             bRet = false;
     }
     return bRet;
@@ -757,7 +750,7 @@ bool SwFmtPageDesc::PutValue( const uno::Any& rVal, BYTE nMemberId )
              * Der Pointer waere aber ueber den Namen nur vom Dokument zu erfragen.
              */
         default:
-            ASSERT( !this, "unknown MemberId" );
+            OSL_ENSURE( !this, "unknown MemberId" );
             bRet = false;
     }
     return bRet;
@@ -835,7 +828,7 @@ SwFmtCol::SwFmtCol()
 
 int SwFmtCol::operator==( const SfxPoolItem& rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+    OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
     const SwFmtCol &rCmp = (const SwFmtCol&)rAttr;
     if( !(nLineWidth        == rCmp.nLineWidth  &&
           aLineColor        == rCmp.aLineColor  &&
@@ -933,7 +926,7 @@ void SwFmtCol::SetOrtho( sal_Bool bNew, sal_uInt16 nGutterWidth, sal_uInt16 nAct
 
 sal_uInt16 SwFmtCol::CalcColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const
 {
-    ASSERT( nCol < aColumns.Count(), ":-( ColumnsArr ueberindiziert." );
+    OSL_ENSURE( nCol < aColumns.Count(), ":-( ColumnsArr ueberindiziert." );
     if ( nWidth != nAct )
     {
         long nW = aColumns[nCol]->GetWishWidth();
@@ -947,7 +940,7 @@ sal_uInt16 SwFmtCol::CalcColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const
 
 sal_uInt16 SwFmtCol::CalcPrtColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const
 {
-    ASSERT( nCol < aColumns.Count(), ":-( ColumnsArr ueberindiziert." );
+    OSL_ENSURE( nCol < aColumns.Count(), ":-( ColumnsArr ueberindiziert." );
     sal_uInt16 nRet = CalcColWidth( nCol, nAct );
     SwColumn *pCol = aColumns[nCol];
     nRet = nRet - pCol->GetLeft();
@@ -1084,7 +1077,7 @@ bool SwFmtCol::PutValue( const uno::Any& rVal, BYTE nMemberId )
                     case 0: eAdj = COLADJ_TOP;  break;  //VerticalAlignment_TOP
                     case 1: eAdj = COLADJ_CENTER;break; //VerticalAlignment_MIDDLE
                     case 2: eAdj = COLADJ_BOTTOM;break; //VerticalAlignment_BOTTOM
-                    default: ASSERT( !this, "unknown alignment" ); break;
+                    default: OSL_ENSURE( !this, "unknown alignment" ); break;
                 }
             }
         }
@@ -1112,7 +1105,7 @@ SwFmtSurround::SwFmtSurround( const SwFmtSurround &rCpy ) :
 
 int  SwFmtSurround::operator==( const SfxPoolItem& rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+    OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
     return ( GetValue() == ((SwFmtSurround&)rAttr).GetValue() &&
              bAnchorOnly== ((SwFmtSurround&)rAttr).bAnchorOnly &&
              bContour== ((SwFmtSurround&)rAttr).bContour &&
@@ -1159,7 +1152,7 @@ bool SwFmtSurround::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
         }
                 break;
         default:
-            ASSERT( !this, "unknown MemberId" );
+            OSL_ENSURE( !this, "unknown MemberId" );
             bRet = false;
     }
     return bRet;
@@ -1194,7 +1187,7 @@ bool SwFmtSurround::PutValue( const uno::Any& rVal, BYTE nMemberId )
             SetOutside( *(sal_Bool*)rVal.getValue() );
             break;
         default:
-            ASSERT( !this, "unknown MemberId" );
+            OSL_ENSURE( !this, "unknown MemberId" );
             bRet = false;
     }
     return bRet;
@@ -1213,7 +1206,7 @@ SwFmtVertOrient::SwFmtVertOrient( SwTwips nY, sal_Int16 eVert,
 
 int  SwFmtVertOrient::operator==( const SfxPoolItem& rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+    OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
     return ( nYPos     == ((SwFmtVertOrient&)rAttr).nYPos &&
              eOrient   == ((SwFmtVertOrient&)rAttr).eOrient &&
              eRelation == ((SwFmtVertOrient&)rAttr).eRelation );
@@ -1257,7 +1250,7 @@ bool SwFmtVertOrient::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
                 rVal <<= (sal_Int32)TWIP_TO_MM100(GetPos());
                 break;
         default:
-            ASSERT( !this, "unknown MemberId" );
+            OSL_ENSURE( !this, "unknown MemberId" );
             bRet = false;
     }
     return bRet;
@@ -1304,7 +1297,7 @@ bool SwFmtVertOrient::PutValue( const uno::Any& rVal, BYTE nMemberId )
         }
         break;
         default:
-            ASSERT( !this, "unknown MemberId" );
+            OSL_ENSURE( !this, "unknown MemberId" );
             bRet = false;
     }
     return bRet;
@@ -1326,7 +1319,7 @@ SwFmtHoriOrient::SwFmtHoriOrient( SwTwips nX, sal_Int16 eHori,
 
 int  SwFmtHoriOrient::operator==( const SfxPoolItem& rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+    OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
     return ( nXPos == ((SwFmtHoriOrient&)rAttr).nXPos &&
              eOrient == ((SwFmtHoriOrient&)rAttr).eOrient &&
              eRelation == ((SwFmtHoriOrient&)rAttr).eRelation &&
@@ -1379,7 +1372,7 @@ bool SwFmtHoriOrient::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
         }
                 break;
         default:
-            ASSERT( !this, "unknown MemberId" );
+            OSL_ENSURE( !this, "unknown MemberId" );
             bRet = false;
     }
     return bRet;
@@ -1430,7 +1423,7 @@ bool SwFmtHoriOrient::PutValue( const uno::Any& rVal, BYTE nMemberId )
                 SetPosToggle( *(sal_Bool*)rVal.getValue());
             break;
         default:
-            ASSERT( !this, "unknown MemberId" );
+            OSL_ENSURE( !this, "unknown MemberId" );
             bRet = false;
     }
     return bRet;
@@ -1494,7 +1487,7 @@ SwFmtAnchor& SwFmtAnchor::operator=(const SwFmtAnchor& rAnchor)
 
 int  SwFmtAnchor::operator==( const SfxPoolItem& rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+    OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
     // OD 2004-05-05 #i28701# - Note: <mnOrder> hasn't to be considered.
     return ( nAnchorId == ((SwFmtAnchor&)rAttr).GetAnchorId() &&
              nPageNum == ((SwFmtAnchor&)rAttr).GetPageNum()   &&
@@ -1520,9 +1513,6 @@ sal_uInt32 SwFmtAnchor::GetOrder() const
     return mnOrder;
 }
 
-/*-----------------16.02.98 15:21-------------------
-
---------------------------------------------------*/
 bool SwFmtAnchor::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
 {
     // hier wird immer konvertiert!
@@ -1571,7 +1561,7 @@ bool SwFmtAnchor::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
         }
         break;
         default:
-            ASSERT( !this, "unknown MemberId" );
+            OSL_ENSURE( !this, "unknown MemberId" );
             bRet = false;
     }
     return bRet;
@@ -1641,7 +1631,7 @@ bool SwFmtAnchor::PutValue( const uno::Any& rVal, BYTE nMemberId )
         case MID_ANCHOR_ANCHORFRAME:
         //no break here!;
         default:
-            ASSERT( !this, "unknown MemberId" );
+            OSL_ENSURE( !this, "unknown MemberId" );
             bRet = false;
     }
     return bRet;
@@ -1675,7 +1665,7 @@ SwFmtURL::~SwFmtURL()
 
 int SwFmtURL::operator==( const SfxPoolItem &rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+    OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
     const SwFmtURL &rCmp = (SwFmtURL&)rAttr;
     sal_Bool bRet = bIsServerMap     == rCmp.IsServerMap() &&
                 sURL             == rCmp.GetURL() &&
@@ -1755,7 +1745,7 @@ bool SwFmtURL::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
         }
             break;
         default:
-            ASSERT( !this, "unknown MemberId" );
+            OSL_ENSURE( !this, "unknown MemberId" );
             bRet = false;
     }
     return bRet;
@@ -1808,7 +1798,7 @@ bool SwFmtURL::PutValue( const uno::Any& rVal, BYTE nMemberId )
             bIsServerMap = *(sal_Bool*)rVal.getValue();
             break;
         default:
-            ASSERT( !this, "unknown MemberId" );
+            OSL_ENSURE( !this, "unknown MemberId" );
             bRet = false;
     }
     return bRet;
@@ -2001,7 +1991,7 @@ SfxPoolItem* SwFmtEndAtTxtEnd::Clone( SfxItemPool* ) const
 
 int SwFmtChain::operator==( const SfxPoolItem &rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+    OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
 
     return GetPrev() == ((SwFmtChain&)rAttr).GetPrev() &&
            GetNext() == ((SwFmtChain&)rAttr).GetNext();
@@ -2055,7 +2045,7 @@ bool SwFmtChain::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
                 aRet = GetNext()->GetName();
             break;
         default:
-            ASSERT( !this, "unknown MemberId" );
+            OSL_ENSURE( !this, "unknown MemberId" );
             bRet = false;
     }
     rVal <<= OUString(aRet);
@@ -2080,7 +2070,7 @@ SwFmtLineNumber::~SwFmtLineNumber()
 
 int SwFmtLineNumber::operator==( const SfxPoolItem &rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+    OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
 
     return nStartValue  == ((SwFmtLineNumber&)rAttr).GetStartValue() &&
            bCountLines  == ((SwFmtLineNumber&)rAttr).IsCount();
@@ -2108,7 +2098,7 @@ bool SwFmtLineNumber::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
             rVal <<= (sal_Int32)GetStartValue();
             break;
         default:
-            ASSERT( !this, "unknown MemberId" );
+            OSL_ENSURE( !this, "unknown MemberId" );
             bRet = false;
     }
     return bRet;
@@ -2134,7 +2124,7 @@ bool SwFmtLineNumber::PutValue( const uno::Any& rVal, BYTE nMemberId )
         }
         break;
         default:
-            ASSERT( !this, "unknown MemberId" );
+            OSL_ENSURE( !this, "unknown MemberId" );
             bRet = false;
     }
     return bRet;
@@ -2158,7 +2148,7 @@ SwTextGridItem::~SwTextGridItem()
 
 int SwTextGridItem::operator==( const SfxPoolItem& rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+    OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
     return eGridType == ((SwTextGridItem&)rAttr).GetGridType() &&
            nLines == ((SwTextGridItem&)rAttr).GetLines() &&
            nBaseHeight == ((SwTextGridItem&)rAttr).GetBaseHeight() &&
@@ -2502,7 +2492,7 @@ void SwFrmFmt::DelFrms()
 
 void SwFrmFmt::MakeFrms()
 {
-    ASSERT( !this, "Sorry not implemented." );
+    OSL_ENSURE( !this, "Sorry not implemented." );
 }
 
 
@@ -2633,7 +2623,7 @@ sal_Bool SwFrmFmt::IsLowerOf( const SwFrmFmt& rFmt ) const
             }
             if( n >= rFmts.Count() )
             {
-                ASSERT( !this, "Fly-Section aber kein Format gefunden" );
+                OSL_ENSURE( !this, "Fly-Section aber kein Format gefunden" );
                 return sal_False;
             }
         }
@@ -2869,7 +2859,7 @@ void SwFlyFrmFmt::MakeFrms()
                     pFly = new SwFlyInCntFrm( this, pFrm );
                     break;
                 default:
-                    ASSERT( !this, "Neuer Ankertyp" )
+                    OSL_ENSURE( !this, "Neuer Ankertyp" );
                     break;
                 }
                 pFrm->AppendFly( pFly );
@@ -2922,7 +2912,7 @@ sal_Bool SwFlyFrmFmt::GetInfo( SfxPoolItem& rInfo ) const
 void SwFlyFrmFmt::SetObjTitle( const String& rTitle, bool bBroadcast )
 {
     SdrObject* pMasterObject = FindSdrObject();
-    ASSERT( pMasterObject,
+    OSL_ENSURE( pMasterObject,
             "<SwNoTxtNode::SetObjTitle(..)> - missing <SdrObject> instance" );
     if ( !pMasterObject )
     {
@@ -2945,7 +2935,7 @@ void SwFlyFrmFmt::SetObjTitle( const String& rTitle, bool bBroadcast )
 const String SwFlyFrmFmt::GetObjTitle() const
 {
     const SdrObject* pMasterObject = FindSdrObject();
-    ASSERT( pMasterObject,
+    OSL_ENSURE( pMasterObject,
             "<SwFlyFrmFmt::GetObjTitle(..)> - missing <SdrObject> instance" );
     if ( !pMasterObject )
     {
@@ -2958,7 +2948,7 @@ const String SwFlyFrmFmt::GetObjTitle() const
 void SwFlyFrmFmt::SetObjDescription( const String& rDescription, bool bBroadcast )
 {
     SdrObject* pMasterObject = FindSdrObject();
-    ASSERT( pMasterObject,
+    OSL_ENSURE( pMasterObject,
             "<SwFlyFrmFmt::SetDescription(..)> - missing <SdrObject> instance" );
     if ( !pMasterObject )
     {
@@ -2981,7 +2971,7 @@ void SwFlyFrmFmt::SetObjDescription( const String& rDescription, bool bBroadcast
 const String SwFlyFrmFmt::GetObjDescription() const
 {
     const SdrObject* pMasterObject = FindSdrObject();
-    ASSERT( pMasterObject,
+    OSL_ENSURE( pMasterObject,
             "<SwNoTxtNode::GetDescription(..)> - missing <SdrObject> instance" );
     if ( !pMasterObject )
     {
@@ -3176,7 +3166,7 @@ void SwDrawFrmFmt::SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir )
         break;
         default:
         {
-            ASSERT( false,
+            OSL_ENSURE( false,
                     "<SwDrawFrmFmt::SetPositionLayoutDir(..)> - invalid attribute value." );
         }
     }
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index b8412d39f815..7d653854cfdb 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -122,7 +122,7 @@ BOOL SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL, BOOL & )
                 SwSectionFrm *pSect = pNewUpper->FindSctFrm();
                 while( pSect && pSect->IsInFtn() )
                     pSect = pSect->GetUpper()->FindSctFrm();
-                ASSERT( pSect, "Escaping footnote" );
+                OSL_ENSURE( pSect, "Escaping footnote" );
                 if( pSect != pMySect )
                     return FALSE;
             }
@@ -293,7 +293,7 @@ void SwFrm::PrepareMake()
     {
         if ( lcl_IsCalcUpperAllowed( *this ) )
             GetUpper()->Calc();
-        ASSERT( GetUpper(), ":-( Layoutgeruest wackelig (Upper wech)." );
+        OSL_ENSURE( GetUpper(), ":-( Layoutgeruest wackelig (Upper wech)." );
         if ( !GetUpper() )
             return;
 
@@ -338,7 +338,7 @@ void SwFrm::PrepareMake()
             SwFrm *pFrm = GetUpper()->Lower();
             while ( pFrm != this )
             {
-                ASSERT( pFrm, ":-( Layoutgeruest wackelig (this not found)." );
+                OSL_ENSURE( pFrm, ":-( Layoutgeruest wackelig (this not found)." );
                 if ( !pFrm )
                     return; //Oioioioi ...
 
@@ -378,14 +378,14 @@ void SwFrm::PrepareMake()
                         pFrm = pCnt;
                 }
             }
-            ASSERT( GetUpper(), "Layoutgeruest wackelig (Upper wech II)." );
+            OSL_ENSURE( GetUpper(), "Layoutgeruest wackelig (Upper wech II)." );
             if ( !GetUpper() )
                 return;
 
             if ( lcl_IsCalcUpperAllowed( *this ) )
                 GetUpper()->Calc();
 
-            ASSERT( GetUpper(), "Layoutgeruest wackelig (Upper wech III)." );
+            OSL_ENSURE( GetUpper(), "Layoutgeruest wackelig (Upper wech III)." );
         }
 
         if ( bTab && !bOldTabLock )
@@ -402,7 +402,7 @@ void SwFrm::OptPrepareMake()
     // <--
     {
         GetUpper()->Calc();
-        ASSERT( GetUpper(), ":-( Layoutgeruest wackelig (Upper wech)." );
+        OSL_ENSURE( GetUpper(), ":-( Layoutgeruest wackelig (Upper wech)." );
         if ( !GetUpper() )
             return;
     }
@@ -425,7 +425,7 @@ void SwFrm::PrepareCrsr()
         GetUpper()->PrepareCrsr();
         GetUpper()->Calc();
 
-        ASSERT( GetUpper(), ":-( Layoutgeruest wackelig (Upper wech)." );
+        OSL_ENSURE( GetUpper(), ":-( Layoutgeruest wackelig (Upper wech)." );
         if ( !GetUpper() )
             return;
 
@@ -452,7 +452,7 @@ void SwFrm::PrepareCrsr()
         SwFrm *pFrm = GetUpper()->Lower();
         while ( pFrm != this )
         {
-            ASSERT( pFrm, ":-( Layoutgeruest wackelig (this not found)." );
+            OSL_ENSURE( pFrm, ":-( Layoutgeruest wackelig (this not found)." );
             if ( !pFrm )
                 return; //Oioioioi ...
 
@@ -482,13 +482,13 @@ void SwFrm::PrepareCrsr()
                     pFrm = pCnt;
             }
         }
-        ASSERT( GetUpper(), "Layoutgeruest wackelig (Upper wech II)." );
+        OSL_ENSURE( GetUpper(), "Layoutgeruest wackelig (Upper wech II)." );
         if ( !GetUpper() )
             return;
 
         GetUpper()->Calc();
 
-        ASSERT( GetUpper(), "Layoutgeruest wackelig (Upper wech III)." );
+        OSL_ENSURE( GetUpper(), "Layoutgeruest wackelig (Upper wech III)." );
 
         if ( bTab && !bOldTabLock )
             ::PrepareUnlock( (SwTabFrm*)this );
@@ -795,7 +795,7 @@ void SwPageFrm::MakeAll()
                             else
                             {
                                 // OD 30.10.2002 #97265# - assert invalid lower property
-                                ASSERT( !(pFrm->Frm().Height() < pFrm->Prt().Height()),
+                                OSL_ENSURE( !(pFrm->Frm().Height() < pFrm->Prt().Height()),
                                         "SwPageFrm::MakeAll(): Lower with frame height < printing height" );
                                 nTmp += pFrm->Frm().Height() - pFrm->Prt().Height();
                             }
@@ -849,12 +849,12 @@ void SwPageFrm::MakeAll()
     if ( Frm() != aOldRect && GetUpper() )
         static_cast<SwRootFrm*>(GetUpper())->CheckViewLayout( 0, 0 );
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     //Der Upper (Root) muss mindestens so breit
     //sein, dass er die breiteste Seite aufnehmen kann.
     if ( GetUpper() )
     {
-        ASSERT( GetUpper()->Prt().Width() >= aFrm.Width(), "Rootsize" );
+        OSL_ENSURE( GetUpper()->Prt().Width() >= aFrm.Width(), "Rootsize" );
     }
 #endif
 }
@@ -1153,8 +1153,8 @@ inline void ValidateSz( SwFrm *pFrm )
 
 void SwCntntFrm::MakeAll()
 {
-    ASSERT( GetUpper(), "keinen Upper?" );
-    ASSERT( IsTxtFrm(), "MakeAll(), NoTxt" );
+    OSL_ENSURE( GetUpper(), "keinen Upper?" );
+    OSL_ENSURE( IsTxtFrm(), "MakeAll(), NoTxt" );
 
     if ( !IsFollow() && StackHack::IsLocked() )
         return;
@@ -1162,13 +1162,13 @@ void SwCntntFrm::MakeAll()
     if ( IsJoinLocked() )
         return;
 
-    ASSERT( !((SwTxtFrm*)this)->IsSwapped(), "Calculation of a swapped frame" );
+    OSL_ENSURE( !((SwTxtFrm*)this)->IsSwapped(), "Calculation of a swapped frame" );
 
     StackHack aHack;
 
     if ( ((SwTxtFrm*)this)->IsLocked() )
     {
-        ASSERT( FALSE, "Format fuer gelockten TxtFrm." );
+        OSL_ENSURE( FALSE, "Format fuer gelockten TxtFrm." );
         return;
     }
 
@@ -1179,14 +1179,14 @@ void SwCntntFrm::MakeAll()
     // <--
     PROTOCOL_ENTER( this, PROT_MAKEALL, 0, 0 )
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     const SwDoc *pDoc = GetAttrSet()->GetDoc();
     if( pDoc )
     {
         static sal_Bool bWarn = sal_False;
         if( pDoc->InXMLExport() )
         {
-            ASSERT( bWarn, "Formatting during XML-export!" );
+            OSL_ENSURE( bWarn, "Formatting during XML-export!" );
             bWarn = sal_True;
         }
         else
@@ -1346,7 +1346,7 @@ void SwCntntFrm::MakeAll()
                     //nach dem hin und her fliessen sparen.
                     GetUpper()->ResetCompletePaint();
                     //Der Vorgaenger wurde Invalidiert, das ist jetzt auch obsolete.
-                    ASSERT( pPre, "missing old Prev" );
+                    OSL_ENSURE( pPre, "missing old Prev" );
                     if( !pPre->IsSctFrm() )
                         ::ValidateSz( pPre );
                 }
@@ -1466,33 +1466,12 @@ void SwCntntFrm::MakeAll()
 #if OSL_DEBUG_LEVEL > 1
             else
             {
-                ASSERT( false, "debug assertion: <SwCntntFrm::MakeAll()> - format of text frame suppressed by fix b6448963" );
+                OSL_ENSURE( false, "debug assertion: <SwCntntFrm::MakeAll()> - format of text frame suppressed by fix b6448963" );
             }
 #endif
             // <--
         }
 
-        // FME 16.07.2003 #i16930# - removed this code because it did not work
-
-        // OD 04.04.2003 #108446# - react on the situation detected in the text
-        // formatting - see <SwTxtFrm::FormatAdjust(..)>:
-        // text frame has to move forward, because its text formatting stopped,
-        // created a follow and detected, that it contains no content.
-/*        if ( IsTxtFrm() && bValidPos && bValidSize && bValidPrtArea &&
-             (Frm().*fnRect->fnGetHeight)() == 0 &&
-             HasFollow()
-           )
-        {
-            SwFrm* pOldUpper = GetUpper();
-            MoveFwd( TRUE, FALSE );
-            if ( GetUpper() != pOldUpper )
-            {
-                bMovedFwd = TRUE;
-                SWREFRESHFN( this )
-                continue;
-            }
-        } */
-
         //Wenn ich der erste einer Kette bin koennte ich mal sehen ob
         //ich zurueckfliessen kann (wenn ich mich ueberhaupt bewegen soll).
         //Damit es keine Oszillation gibt, darf ich nicht gerade vorwaerts
@@ -1735,10 +1714,10 @@ void SwCntntFrm::MakeAll()
                       ( !bSct || !FindSctFrm()->IsColLocked() ) )
                     bMoveOrFit = TRUE;
             }
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
             else
             {
-                ASSERT( FALSE, "+TxtFrm hat WouldFit-Versprechen nicht eingehalten." );
+                OSL_ENSURE( FALSE, "+TxtFrm hat WouldFit-Versprechen nicht eingehalten." );
             }
 #endif
         }
@@ -1791,7 +1770,7 @@ void SwCntntFrm::MakeAll()
             }
 
 #if OSL_DEBUG_LEVEL > 1
-            ASSERT( false, "LoopControl in SwCntntFrm::MakeAll" )
+            OSL_ENSURE( false, "LoopControl in SwCntntFrm::MakeAll" );
 #endif
         }
         if ( bMovedBwd && GetUpper() )
@@ -1903,7 +1882,7 @@ void MakeNxt( SwFrm *pFrm, SwFrm *pNxt )
 
 BOOL lcl_IsNextFtnBoss( const SwFrm *pFrm, const SwFrm* pNxt )
 {
-    ASSERT( pFrm && pNxt, "lcl_IsNextFtnBoss: No Frames?" );
+    OSL_ENSURE( pFrm && pNxt, "lcl_IsNextFtnBoss: No Frames?" );
     pFrm = pFrm->FindFtnBossFrm();
     pNxt = pNxt->FindFtnBossFrm();
     // Falls pFrm eine letzte Spalte ist, wird stattdessen die Seite genommen
@@ -2098,7 +2077,7 @@ BOOL SwCntntFrm::_WouldFit( SwTwips nSpace,
                 // doesn't makes sense. Thus, return TRUE.
                 if ( IsAnFollow( pFrm ) && !pFrm->IsValid() )
                 {
-                    ASSERT( false, "Only a warning for task 108824:/n<SwCntntFrm::_WouldFit(..) - follow not valid!" );
+                    OSL_ENSURE( false, "Only a warning for task 108824:/n<SwCntntFrm::_WouldFit(..) - follow not valid!" );
                     return TRUE;
                 }
             }
diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx
index 38b902980bdc..e40fd45a5065 100644
--- a/sw/source/core/layout/colfrm.cxx
+++ b/sw/source/core/layout/colfrm.cxx
@@ -92,14 +92,14 @@ SwColumnFrm::~SwColumnFrm()
 
 void MA_FASTCALL lcl_RemoveColumns( SwLayoutFrm *pCont, USHORT nCnt )
 {
-    ASSERT( pCont && pCont->Lower() && pCont->Lower()->IsColumnFrm(),
+    OSL_ENSURE( pCont && pCont->Lower() && pCont->Lower()->IsColumnFrm(),
             "Keine Spalten zu entfernen." );
 
     SwColumnFrm *pColumn = (SwColumnFrm*)pCont->Lower();
     ::lcl_RemoveFtns( pColumn, TRUE, TRUE );
     while ( pColumn->GetNext() )
     {
-        ASSERT( pColumn->GetNext()->IsColumnFrm(),
+        OSL_ENSURE( pColumn->GetNext()->IsColumnFrm(),
                 "Nachbar von ColFrm kein ColFrm." );
         pColumn = (SwColumnFrm*)pColumn->GetNext();
     }
@@ -245,7 +245,7 @@ void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew,
     if( nOldNum != nNewNum || bChgFtn )
     {
         SwDoc *pDoc = GetFmt()->GetDoc();
-        ASSERT( pDoc, "FrmFmt gibt kein Dokument her." );
+        OSL_ENSURE( pDoc, "FrmFmt gibt kein Dokument her." );
         // SaveCntnt wuerde auch den Inhalt der Fussnotencontainer aufsaugen
         // und im normalen Textfluss unterbringen.
         if( IsPageBodyFrm() )
@@ -311,7 +311,7 @@ void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew,
     //unnuetzte Aktionen beim Einstellen zur Folge haben.
     if ( pSave )
     {
-        ASSERT( Lower() && Lower()->IsLayoutFrm() &&
+        OSL_ENSURE( Lower() && Lower()->IsLayoutFrm() &&
                 ((SwLayoutFrm*)Lower())->Lower() &&
                 ((SwLayoutFrm*)Lower())->Lower()->IsLayoutFrm(),
                 "Gesucht: Spaltenbody (Tod oder Lebend)." );   // ColumnFrms jetzt mit BodyFrm
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 6ebadedd1044..3315f206c9f2 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -104,8 +104,8 @@
  *
  * --------------------------------------------------*/
 
-#ifndef DBG_UTIL
-#error Wer fummelt denn an den makefiles rum?
+#if !defined(OSL_DEBUG_LEVEL) || OSL_DEBUG_LEVEL <= 1
+#error Who broken the makefiles?
 #endif
 
 
@@ -137,7 +137,7 @@ SwImplProtocol* SwProtocol::pImpl = NULL;
 
 ULONG lcl_GetFrameId( const SwFrm* pFrm )
 {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     static BOOL bFrameId = FALSE;
     if( bFrameId )
         return pFrm->GetFrmId();
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index 2a6c50eee635..9944ccce1a4b 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -270,8 +270,8 @@ BOOL SwLayoutFrm::IsAnLower( const SwFrm *pAssumed ) const
 */
 bool SwLayoutFrm::IsBefore( const SwLayoutFrm* _pCheckRefLayFrm ) const
 {
-    ASSERT( !IsRootFrm() , "<IsBefore> called at a <SwRootFrm>.");
-    ASSERT( !_pCheckRefLayFrm->IsRootFrm() , "<IsBefore> called with a <SwRootFrm>.");
+    OSL_ENSURE( !IsRootFrm() , "<IsBefore> called at a <SwRootFrm>.");
+    OSL_ENSURE( !_pCheckRefLayFrm->IsRootFrm() , "<IsBefore> called with a <SwRootFrm>.");
 
     bool bReturn;
 
@@ -477,8 +477,8 @@ SwRootFrm* SwFrm::FindRootFrm()
     // Casting the GetDep() result instead of the frame itself (that has
     // been done before) makes it save to use that method in constructors
     // and destructors.
-    ASSERT( GetDep(), "frame is not registered any longer" );
-    ASSERT( IsLayoutFrm() || IsCntntFrm(), "invalid frame type" );
+    OSL_ENSURE( GetDep(), "frame is not registered any longer" );
+    OSL_ENSURE( IsLayoutFrm() || IsCntntFrm(), "invalid frame type" );
     SwDoc *pDoc = IsLayoutFrm()
                         ? static_cast < SwFrmFmt * >( GetDep() )->GetDoc()
                         : static_cast < SwCntntNode * >( GetDep() )->GetDoc();
@@ -532,7 +532,7 @@ SwFtnBossFrm* SwFrm::FindFtnBossFrm( BOOL bFootnotes )
         !pRet->GetNext() && !pRet->GetPrev() )
     {
         SwSectionFrm* pSct = pRet->FindSctFrm();
-        ASSERT( pSct, "FindFtnBossFrm: Single column outside section?" );
+        OSL_ENSURE( pSct, "FindFtnBossFrm: Single column outside section?" );
         if( !pSct->IsFtnAtEnd() )
             return pSct->FindFtnBossFrm( TRUE );
     }
@@ -653,7 +653,7 @@ const SwPageFrm* SwRootFrm::GetPageAtPos( const Point& rPt, const Size* pSize, b
             pPage = pPage->GetNext();
     }
 
-    ASSERT( GetPageNum() <= maPageRects.size(), "number of pages differes from page rect array size" )
+    OSL_ENSURE( GetPageNum() <= maPageRects.size(), "number of pages differes from page rect array size" );
     USHORT nPageIdx = 0;
 
     while ( pPage && !pRet )
@@ -793,7 +793,7 @@ SwFrm *SwFrm::_FindNext()
         SwLayoutFrm *pUp = pThis->GetUpper();
         while ( !pUp->IsCellFrm() )
             pUp = pUp->GetUpper();
-        ASSERT( pUp, "Cntnt in Tabelle aber nicht in Zelle." );
+        OSL_ENSURE( pUp, "Cntnt in Tabelle aber nicht in Zelle." );
         SwFrm* pNxt = ((SwCellFrm*)pUp)->GetFollowCell();
         if ( pNxt )
             pNxt = ((SwCellFrm*)pNxt)->ContainsCntnt();
@@ -932,7 +932,7 @@ SwCntntFrm *SwFrm::_FindNextCnt( const bool _bInSameFtn )
                 // Assure that found next content frame belongs to the same footnotes
                 const SwFtnFrm* pFtnFrmOfNext( pNxtCnt->FindFtnFrm() );
                 const SwFtnFrm* pFtnFrmOfCurr( pThis->FindFtnFrm() );
-                ASSERT( pFtnFrmOfCurr,
+                OSL_ENSURE( pFtnFrmOfCurr,
                         "<SwFrm::_FindNextCnt() - unknown layout situation: current frame has to have an upper footnote frame." );
                 if ( pFtnFrmOfNext == pFtnFrmOfCurr )
                 {
@@ -1113,9 +1113,9 @@ SwCntntFrm* SwFrm::_FindPrevCnt( const bool _bInSameFtn )
                     //       neither <pCurrCntntFrm> nor <pPrevCntntFrm> are
                     //       inside a fly frame.
                     //       Thus, method <FindFooterOrHeader()> can be used.
-                    ASSERT( pCurrCntntFrm->FindFooterOrHeader(),
+                    OSL_ENSURE( pCurrCntntFrm->FindFooterOrHeader(),
                             "<SwFrm::_FindPrevCnt()> - unknown layout situation: current frame should be in page header or page footer" );
-                    ASSERT( !pPrevCntntFrm->IsInFly(),
+                    OSL_ENSURE( !pPrevCntntFrm->IsInFly(),
                             "<SwFrm::_FindPrevCnt()> - unknown layout situation: found previous frame should *not* be inside a fly frame." );
                     if ( pPrevCntntFrm->FindFooterOrHeader() !=
                                             pCurrCntntFrm->FindFooterOrHeader() )
@@ -1157,7 +1157,7 @@ SwFrm *SwFrm::_FindPrev()
             SwLayoutFrm *pUp = pThis->GetUpper();
             while ( !pUp->IsCellFrm() )
                 pUp = pUp->GetUpper();
-            ASSERT( pUp, "Cntnt in Tabelle aber nicht in Zelle." );
+            OSL_ENSURE( pUp, "Cntnt in Tabelle aber nicht in Zelle." );
             if ( pUp->IsAnLower( pPrvCnt ) )
                 return pPrvCnt;
         }
@@ -1464,7 +1464,7 @@ void SwFrm::SetDirFlags( BOOL bVert )
             const SwFrm* pAsk = IsFlyFrm() ?
                           ((SwFlyFrm*)this)->GetAnchorFrm() : GetUpper();
 
-            ASSERT( pAsk != this, "Autsch! Stack overflow is about to happen" )
+            OSL_ENSURE( pAsk != this, "Autsch! Stack overflow is about to happen" );
 
             if( pAsk )
             {
@@ -1487,7 +1487,7 @@ void SwFrm::SetDirFlags( BOOL bVert )
             const SwFrm* pAsk = IsFlyFrm() ?
                           ((SwFlyFrm*)this)->GetAnchorFrm() : GetUpper();
 
-            ASSERT( pAsk != this, "Autsch! Stack overflow is about to happen" )
+            OSL_ENSURE( pAsk != this, "Autsch! Stack overflow is about to happen" );
 
             if( pAsk )
                 bRightToLeft = pAsk->IsRightToLeft() ? 1 : 0;
@@ -1504,7 +1504,7 @@ SwLayoutFrm* SwFrm::GetNextCellLeaf( MakePageType )
     while ( !pTmpFrm->IsCellFrm() )
         pTmpFrm = pTmpFrm->GetUpper();
 
-    ASSERT( pTmpFrm, "SwFrm::GetNextCellLeaf() without cell" )
+    OSL_ENSURE( pTmpFrm, "SwFrm::GetNextCellLeaf() without cell" );
     return ((SwCellFrm*)pTmpFrm)->GetFollowCell();
 }
 
@@ -1514,7 +1514,7 @@ SwLayoutFrm* SwFrm::GetPrevCellLeaf( MakePageType )
     while ( !pTmpFrm->IsCellFrm() )
         pTmpFrm = pTmpFrm->GetUpper();
 
-    ASSERT( pTmpFrm, "SwFrm::GetNextPreviousLeaf() without cell" )
+    OSL_ENSURE( pTmpFrm, "SwFrm::GetNextPreviousLeaf() without cell" );
     return ((SwCellFrm*)pTmpFrm)->GetPreviousCell();
 }
 
@@ -1533,13 +1533,13 @@ SwCellFrm* lcl_FindCorrespondingCellFrm( const SwRowFrm& rOrigRow,
         pCorrCell = (SwCellFrm*)pCorrCell->GetNext();
     }
 
-    ASSERT( pCell && pCorrCell, "lcl_FindCorrespondingCellFrm does not work" )
+    OSL_ENSURE( pCell && pCorrCell, "lcl_FindCorrespondingCellFrm does not work" );
 
     if ( pCell != &rOrigCell )
     {
         // rOrigCell must be a lower of pCell. We need to recurse into the rows:
-        ASSERT( pCell->Lower() && pCell->Lower()->IsRowFrm(),
-                "lcl_FindCorrespondingCellFrm does not work" )
+        OSL_ENSURE( pCell->Lower() && pCell->Lower()->IsRowFrm(),
+                "lcl_FindCorrespondingCellFrm does not work" );
 
         SwRowFrm* pRow = (SwRowFrm*)pCell->Lower();
         while ( !pRow->IsAnLower( &rOrigCell ) )
@@ -1629,7 +1629,7 @@ SwCellFrm* SwCellFrm::GetPreviousCell() const
     while( !pRow->IsRowFrm() || !pRow->GetUpper()->IsTabFrm() )
         pRow = pRow->GetUpper();
 
-    ASSERT( pRow->GetUpper() && pRow->GetUpper()->IsTabFrm(), "GetPreviousCell without Table" );
+    OSL_ENSURE( pRow->GetUpper() && pRow->GetUpper()->IsTabFrm(), "GetPreviousCell without Table" );
 
     SwTabFrm* pTab = (SwTabFrm*)pRow->GetUpper();
 
@@ -1665,10 +1665,10 @@ const SwCellFrm& SwCellFrm::FindStartEndOfRowSpanCell( bool bStart, bool bCurren
     if ( !bStart && pTableFrm->IsFollow() && pTableFrm->IsInHeadline( *this ) )
         return *this;
 
-    ASSERT( pTableFrm &&
+    OSL_ENSURE( pTableFrm &&
             (  bStart && GetTabBox()->getRowSpan() < 1 ||
               !bStart && GetLayoutRowSpan() > 1 ),
-            "SwCellFrm::FindStartRowSpanCell: No rowspan, no table, no cookies" )
+            "SwCellFrm::FindStartRowSpanCell: No rowspan, no table, no cookies" );
 
     if ( pTableFrm )
     {
@@ -1713,7 +1713,7 @@ const SwCellFrm& SwCellFrm::FindStartEndOfRowSpanCell( bool bStart, bool bCurren
 
         for ( SwClient* pLast = aIter.First( TYPE( SwFrm ) ); pLast; pLast = aIter.Next() )
         {
-            ASSERT( ((SwFrm*)pLast)->IsCellFrm(), "Non-row frame registered in table line" )
+            OSL_ENSURE( ((SwFrm*)pLast)->IsCellFrm(), "Non-row frame registered in table line" );
             const SwCellFrm* pMasterCell = static_cast<const SwCellFrm*>(pLast);
 
             if ( pMasterCell->GetTabBox() == &rMasterBox )
@@ -1742,7 +1742,7 @@ const SwCellFrm& SwCellFrm::FindStartEndOfRowSpanCell( bool bStart, bool bCurren
         }
     }
 
-    ASSERT( pRet, "SwCellFrm::FindStartRowSpanCell: No result" )
+    OSL_ENSURE( pRet, "SwCellFrm::FindStartRowSpanCell: No result" );
 
     return *pRet;
 }
@@ -1750,7 +1750,7 @@ const SwCellFrm& SwCellFrm::FindStartEndOfRowSpanCell( bool bStart, bool bCurren
 
 const SwRowFrm* SwFrm::IsInSplitTableRow() const
 {
-    ASSERT( IsInTab(), "IsInSplitTableRow should only be called for frames in tables" )
+    OSL_ENSURE( IsInTab(), "IsInSplitTableRow should only be called for frames in tables" );
 
     const SwFrm* pRow = this;
 
@@ -1760,7 +1760,7 @@ const SwRowFrm* SwFrm::IsInSplitTableRow() const
 
     if ( !pRow ) return NULL;
 
-    ASSERT( pRow->GetUpper()->IsTabFrm(), "Confusion in table layout" )
+    OSL_ENSURE( pRow->GetUpper()->IsTabFrm(), "Confusion in table layout" );
 
     const SwTabFrm* pTab = (SwTabFrm*)pRow->GetUpper();
     // --> OD 2006-06-28 #b6443897#
@@ -1777,14 +1777,14 @@ const SwRowFrm* SwFrm::IsInSplitTableRow() const
     // skip headline
     const SwRowFrm* pFollowRow = pTab->GetFollow()->GetFirstNonHeadlineRow();
 
-    ASSERT( pFollowRow, "SwFrm::IsInSplitTableRow() does not work" )
+    OSL_ENSURE( pFollowRow, "SwFrm::IsInSplitTableRow() does not work" );
 
     return pFollowRow;
 }
 
 const SwRowFrm* SwFrm::IsInFollowFlowRow() const
 {
-    ASSERT( IsInTab(), "IsInSplitTableRow should only be called for frames in tables" )
+    OSL_ENSURE( IsInTab(), "IsInSplitTableRow should only be called for frames in tables" );
 
     // find most upper row frame
     const SwFrm* pRow = this;
@@ -1793,7 +1793,7 @@ const SwRowFrm* SwFrm::IsInFollowFlowRow() const
 
     if ( !pRow ) return NULL;
 
-    ASSERT( pRow->GetUpper()->IsTabFrm(), "Confusion in table layout" )
+    OSL_ENSURE( pRow->GetUpper()->IsTabFrm(), "Confusion in table layout" );
 
     const SwTabFrm* pTab = (SwTabFrm*)pRow->GetUpper();
 
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index e19d71dafac6..89c7a26d7e5f 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -209,8 +209,8 @@ BOOL SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldKeep
                     ( !rThis.IsInTab() || rThis.IsTabFrm() ) &&
                     rAttrs.GetKeep().GetValue() );
 
-    ASSERT( !bCheckIfLastRowShouldKeep || rThis.IsTabFrm(),
-            "IsKeep with bCheckIfLastRowShouldKeep should only be used for tabfrms" )
+    OSL_ENSURE( !bCheckIfLastRowShouldKeep || rThis.IsTabFrm(),
+            "IsKeep with bCheckIfLastRowShouldKeep should only be used for tabfrms" );
 
     // Ignore keep attribute if there are break situations:
     if ( bKeep )
@@ -267,7 +267,7 @@ BOOL SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldKeep
                     if ( ! pSet )
                         pSet = pNxt->GetAttrSet();
 
-                    ASSERT( pSet, "No AttrSet to check keep attribute" )
+                    OSL_ENSURE( pSet, "No AttrSet to check keep attribute" );
 
                     if ( pSet->GetPageDesc().GetPageDesc() )
                         bKeep = FALSE;
@@ -383,7 +383,7 @@ BYTE SwFlowFrm::BwdMoveNecessary( const SwPageFrm *pPage, const SwRect &rRect )
                                         GetFmt())->GetSectionNode();
                             else
                             {
-                                ASSERT( rThis.IsTabFrm(), "new FowFrm?" );
+                                OSL_ENSURE( rThis.IsTabFrm(), "new FowFrm?" );
                                 pNode = ((SwTabFrm&)rThis).GetTable()->
                                     GetTabSortBoxes()[0]->GetSttNd()->FindTableNode();
                             }
@@ -467,7 +467,7 @@ SwLayoutFrm *SwFlowFrm::CutTree( SwFrm *pStart )
                 //Kann sein, dass der CntFrm gelockt ist, wir wollen hier nicht
                 //in eine endlose Seitenwanderung hineinlaufen und rufen das
                 //Calc garnicht erst!
-                ASSERT( pCnt->IsTxtFrm(), "Die Graphic ist gelandet." );
+                OSL_ENSURE( pCnt->IsTxtFrm(), "Die Graphic ist gelandet." );
                 if ( ((SwTxtFrm*)pCnt)->IsLocked() ||
                      ((SwTxtFrm*)pCnt)->GetFollow() == pStart )
                     break;
@@ -601,8 +601,8 @@ BOOL SwFlowFrm::PasteTree( SwFrm *pStart, SwLayoutFrm *pParent, SwFrm *pSibling,
 
 void SwFlowFrm::MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling )
 {
-    ASSERT( pParent, "Kein Parent uebergeben." );
-    ASSERT( rThis.GetUpper(), "Wo kommen wir denn her?" );
+    OSL_ENSURE( pParent, "Kein Parent uebergeben." );
+    OSL_ENSURE( rThis.GetUpper(), "Wo kommen wir denn her?" );
 
     //Sparsamer benachrichtigen wenn eine Action laeuft.
     ViewShell *pSh = rThis.GetShell();
@@ -716,7 +716,7 @@ BOOL SwFlowFrm::IsAnFollow( const SwFlowFrm *pAssumed ) const
 
 SwTxtFrm* SwCntntFrm::FindMaster() const
 {
-    ASSERT( IsFollow(), "SwCntntFrm::FindMaster(): !IsFollow" );
+    OSL_ENSURE( IsFollow(), "SwCntntFrm::FindMaster(): !IsFollow" );
 
     const SwCntntFrm* pCnt = GetPrevCntntFrm();
 
@@ -724,19 +724,19 @@ SwTxtFrm* SwCntntFrm::FindMaster() const
     {
         if ( pCnt->HasFollow() && pCnt->GetFollow() == this )
         {
-            ASSERT( pCnt->IsTxtFrm(), "NoTxtFrm with follow found" )
+            OSL_ENSURE( pCnt->IsTxtFrm(), "NoTxtFrm with follow found" );
             return (SwTxtFrm*)pCnt;
         }
         pCnt = pCnt->GetPrevCntntFrm();
     }
 
-    ASSERT( FALSE, "Follow ist lost in Space." );
+    OSL_ENSURE( FALSE, "Follow ist lost in Space." );
     return 0;
 }
 
 SwSectionFrm* SwSectionFrm::FindMaster() const
 {
-    ASSERT( IsFollow(), "SwSectionFrm::FindMaster(): !IsFollow" );
+    OSL_ENSURE( IsFollow(), "SwSectionFrm::FindMaster(): !IsFollow" );
 
     SwClientIter aIter( *pSection->GetFmt() );
     SwClient *pLast = aIter.GoStart();
@@ -745,8 +745,8 @@ SwSectionFrm* SwSectionFrm::FindMaster() const
     {
         if ( pLast->ISA( SwFrm ) )
         {
-            ASSERT( ((SwFrm*)pLast)->IsSctFrm(),
-                    "Non-section frame registered in section format" )
+            OSL_ENSURE( ((SwFrm*)pLast)->IsSctFrm(),
+                    "Non-section frame registered in section format" );
             SwSectionFrm* pSect = (SwSectionFrm*)pLast;
             if( pSect->GetFollow() == this )
                 return pSect;
@@ -754,13 +754,13 @@ SwSectionFrm* SwSectionFrm::FindMaster() const
         pLast = aIter++;
     }
 
-    ASSERT( FALSE, "Follow ist lost in Space." );
+    OSL_ENSURE( FALSE, "Follow ist lost in Space." );
     return 0;
 }
 
 SwTabFrm* SwTabFrm::FindMaster( bool bFirstMaster ) const
 {
-    ASSERT( IsFollow(), "SwTabFrm::FindMaster(): !IsFollow" );
+    OSL_ENSURE( IsFollow(), "SwTabFrm::FindMaster(): !IsFollow" );
 
     SwClientIter aIter( *GetTable()->GetFrmFmt() );
     SwClient* pLast = aIter.GoStart();
@@ -769,8 +769,8 @@ SwTabFrm* SwTabFrm::FindMaster( bool bFirstMaster ) const
     {
         if ( pLast->ISA( SwFrm ) )
         {
-            ASSERT( ((SwFrm*)pLast)->IsTabFrm(),
-                    "Non-table frame registered in table format" )
+            OSL_ENSURE( ((SwFrm*)pLast)->IsTabFrm(),
+                    "Non-table frame registered in table format" );
             SwTabFrm* pTab = (SwTabFrm*)pLast;
 
             if ( bFirstMaster )
@@ -800,7 +800,7 @@ SwTabFrm* SwTabFrm::FindMaster( bool bFirstMaster ) const
         pLast = aIter++;
     }
 
-    ASSERT( FALSE, "Follow ist lost in Space." );
+    OSL_ENSURE( FALSE, "Follow ist lost in Space." );
     return 0;
 }
 
@@ -983,8 +983,8 @@ BOOL SwFrm::WrongPageDesc( SwPageFrm* pNew )
 
 SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage )
 {
-    ASSERT( !IsInFtn(), "GetNextLeaf(), don't call me for Ftn." );
-    ASSERT( !IsInSct(), "GetNextLeaf(), don't call me for Sections." );
+    OSL_ENSURE( !IsInFtn(), "GetNextLeaf(), don't call me for Ftn." );
+    OSL_ENSURE( !IsInSct(), "GetNextLeaf(), don't call me for Sections." );
 
     const BOOL bBody = IsInDocBody();       //Wenn ich aus dem DocBody komme
                                             //Will ich auch im Body landen.
@@ -1127,7 +1127,7 @@ SwLayoutFrm *SwFrm::GetNextLeaf( MakePageType eMakePage )
 
 SwLayoutFrm *SwFrm::GetPrevLeaf( MakePageType )
 {
-    ASSERT( !IsInFtn(), "GetPrevLeaf(), don't call me for Ftn." );
+    OSL_ENSURE( !IsInFtn(), "GetPrevLeaf(), don't call me for Ftn." );
 
     const BOOL bBody = IsInDocBody();       //Wenn ich aus dem DocBody komme
                                             //will ich auch im Body landen.
@@ -1181,7 +1181,7 @@ BOOL SwFlowFrm::IsPrevObjMove() const
 
     if ( pPre && pPre->GetDrawObjs() )
     {
-        ASSERT( SwFlowFrm::CastFlowFrm( pPre ), "new flowfrm?" );
+        OSL_ENSURE( SwFlowFrm::CastFlowFrm( pPre ), "new flowfrm?" );
         if( SwFlowFrm::CastFlowFrm( pPre )->IsAnFollow( this ) )
             return FALSE;
         SwLayoutFrm* pPreUp = pPre->GetUpper();
@@ -1266,7 +1266,7 @@ BOOL SwFlowFrm::IsPageBreak( BOOL bAct ) const
 
         if ( pPrev )
         {
-            ASSERT( pPrev->IsInDocBody(), "IsPageBreak: Not in DocBody?" );
+            OSL_ENSURE( pPrev->IsInDocBody(), "IsPageBreak: Not in DocBody?" );
             if ( bAct )
             {   if ( rThis.FindPageFrm() == pPrev->FindPageFrm() )
                     return FALSE;
@@ -1373,7 +1373,7 @@ BOOL SwFlowFrm::HasParaSpaceAtPages( BOOL bSct ) const
                 return FALSE;
             pTmp = pTmp->GetUpper();
         }
-        ASSERT( FALSE, "HasParaSpaceAtPages: Where's my page?" );
+        OSL_ENSURE( FALSE, "HasParaSpaceAtPages: Where's my page?" );
         return FALSE;
     }
     if( !rThis.IsInDocBody() || ( rThis.IsInTab() && !rThis.IsTabFrm()) ||
@@ -1684,7 +1684,7 @@ SwTwips SwFlowFrm::_GetUpperSpaceAmountConsideredForPageGrid(
                 nUpperSpaceAmountConsideredForPageGrid =
                         nNewUpperSpace - _nUpperSpaceWithoutGrid;
 
-                ASSERT( nUpperSpaceAmountConsideredForPageGrid >= 0,
+                OSL_ENSURE( nUpperSpaceAmountConsideredForPageGrid >= 0,
                         "<SwFlowFrm::GetUpperSpaceAmountConsideredForPageGrid(..)> - negative space considered for page grid!" );
             }
         }
@@ -2057,7 +2057,7 @@ BOOL SwFlowFrm::MoveFwd( BOOL bMakePage, BOOL bPageBreak, BOOL bMoveAlways )
                 (pOldBoss->Frm().*fnRect->fnGetBottom)() );
             SwCntntFrm* pStart = rThis.IsCntntFrm() ?
                 (SwCntntFrm*)&rThis : ((SwLayoutFrm&)rThis).ContainsCntnt();
-            ASSERT( pStart || ( rThis.IsTabFrm() && !((SwTabFrm&)rThis).Lower() ),
+            OSL_ENSURE( pStart || ( rThis.IsTabFrm() && !((SwTabFrm&)rThis).Lower() ),
                     "MoveFwd: Missing Content" );
             SwLayoutFrm* pBody = pStart ? ( pStart->IsTxtFrm() ?
                 (SwLayoutFrm*)((SwTxtFrm*)pStart)->FindBodyFrm() : 0 ) : 0;
@@ -2209,7 +2209,7 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat )
             pRef = pFtn->GetRef();
         // <--
 
-        ASSERT( pRef, "MoveBwd: Endnote for an empty section?" );
+        OSL_ENSURE( pRef, "MoveBwd: Endnote for an empty section?" );
 
         if( !bEndnote )
             pOldBoss = pOldBoss->FindFtnBossFrm( TRUE );
@@ -2545,7 +2545,7 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat )
                 }
                 pIndNext = pIndNext->GetIndNext();
             }
-            ASSERT( !pIndNext || pIndNext->ISA(SwTxtFrm),
+            OSL_ENSURE( !pIndNext || pIndNext->ISA(SwTxtFrm),
                     "<SwFlowFrm::MovedBwd(..)> - incorrect next found." );
             if ( pIndNext && pIndNext->IsFlowFrm() &&
                  SwFlowFrm::CastFlowFrm(pIndNext)->IsJoinLocked() )
@@ -2570,7 +2570,7 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat )
                                     : MAKEPAGE_NONE,
                                     TRUE );
         // --> OD 2007-01-10 #i73194# - make code robust
-        ASSERT( pNextNewUpper, "<SwFlowFrm::MoveBwd(..)> - missing next new upper" );
+        OSL_ENSURE( pNextNewUpper, "<SwFlowFrm::MoveBwd(..)> - missing next new upper" );
         if ( pNextNewUpper &&
              ( pNextNewUpper == rThis.GetUpper() ||
                pNextNewUpper->GetType() != rThis.GetUpper()->GetType() ) )
@@ -2578,14 +2578,14 @@ BOOL SwFlowFrm::MoveBwd( BOOL &rbReformat )
         {
             pNewUpper = 0L;
 #if OSL_DEBUG_LEVEL > 1
-            ASSERT( false,
+            OSL_ENSURE( false,
                     "<SwFlowFrm::MoveBwd(..)> - layout loop control for layout action <Move Backward> applied!" );
 #endif
         }
     }
     // <--
 
-    ASSERT( pNewUpper != rThis.GetUpper(),
+    OSL_ENSURE( pNewUpper != rThis.GetUpper(),
             "<SwFlowFrm::MoveBwd(..)> - moving backward to the current upper frame!? -> Please inform OD." );
     if ( pNewUpper )
     {
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index cf2713b10526..03607d8a3ad0 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -207,7 +207,7 @@ void SwFlyFrm::Chain( SwFrm* _pAnch )
             SwFlyFrm* pFollow = FindChainNeighbour( *rChain.GetNext(), _pAnch );
             if ( pFollow )
             {
-                ASSERT( !pFollow->GetPrevLink(), "wrong chain detected" );
+                OSL_ENSURE( !pFollow->GetPrevLink(), "wrong chain detected" );
                 if ( !pFollow->GetPrevLink() )
                     SwFlyFrm::ChainFrames( this, pFollow );
             }
@@ -217,7 +217,7 @@ void SwFlyFrm::Chain( SwFrm* _pAnch )
             SwFlyFrm *pMaster = FindChainNeighbour( *rChain.GetPrev(), _pAnch );
             if ( pMaster )
             {
-                ASSERT( !pMaster->GetNextLink(), "wrong chain detected" );
+                OSL_ENSURE( !pMaster->GetNextLink(), "wrong chain detected" );
                 if ( !pMaster->GetNextLink() )
                     SwFlyFrm::ChainFrames( pMaster, this );
             }
@@ -231,7 +231,7 @@ void SwFlyFrm::InsertCnt()
     if ( !GetPrevLink() )
     {
         const SwFmtCntnt& rCntnt = GetFmt()->GetCntnt();
-        ASSERT( rCntnt.GetCntntIdx(), ":-( no content prepared." );
+        OSL_ENSURE( rCntnt.GetCntntIdx(), ":-( no content prepared." );
         ULONG nIndex = rCntnt.GetCntntIdx()->GetIndex();
         // Lower() bedeutet SwColumnFrm, eingefuegt werden muss der Inhalt dann in den (Column)BodyFrm
         ::_InsertCnt( Lower() ? (SwLayoutFrm*)((SwLayoutFrm*)Lower())->Lower() : (SwLayoutFrm*)this,
@@ -253,7 +253,7 @@ void SwFlyFrm::InsertCnt()
     // Check, if column are allowed.
     // Columns are not allowed for fly frames, which represent graphics or embedded objects.
     const SwFmtCntnt& rCntnt = GetFmt()->GetCntnt();
-    ASSERT( rCntnt.GetCntntIdx(), "<SwFlyFrm::InsertColumns()> - no content prepared." );
+    OSL_ENSURE( rCntnt.GetCntntIdx(), "<SwFlyFrm::InsertColumns()> - no content prepared." );
     SwNodeIndex aFirstCntnt( *(rCntnt.GetCntntIdx()), 1 );
     if ( aFirstCntnt.GetNode().IsNoTxtNode() )
     {
@@ -399,7 +399,7 @@ void SwFlyFrm::InitDrawObj( BOOL bNotify )
                                           pIDDMA->GetOrCreateDrawModel() );
         // <--
     }
-    ASSERT( pContact, "InitDrawObj failed" );
+    OSL_ENSURE( pContact, "InitDrawObj failed" );
     // OD 2004-03-22 #i26791#
     SetDrawObj( *(pContact->CreateNewRef( this )) );
 
@@ -491,9 +491,9 @@ void SwFlyFrm::FinitDrawObj()
 
 void SwFlyFrm::ChainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow )
 {
-    ASSERT( pMaster && pFollow, "uncomplete chain" );
-    ASSERT( !pMaster->GetNextLink(), "link can not be changed" );
-    ASSERT( !pFollow->GetPrevLink(), "link can not be changed" );
+    OSL_ENSURE( pMaster && pFollow, "uncomplete chain" );
+    OSL_ENSURE( !pMaster->GetNextLink(), "link can not be changed" );
+    OSL_ENSURE( !pFollow->GetPrevLink(), "link can not be changed" );
 
     pMaster->pNextLink = pFollow;
     pFollow->pPrevLink = pMaster;
@@ -522,7 +522,7 @@ void SwFlyFrm::ChainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow )
         //Es gibt nur noch den Inhalt des Masters, der Inhalt vom Follow
         //hat keine Frames mehr (sollte immer nur genau ein leerer TxtNode sein).
         SwFrm *pFrm = pFollow->ContainsCntnt();
-        ASSERT( !pFrm->IsTabFrm() && !pFrm->FindNext(), "follow in chain contains content" );
+        OSL_ENSURE( !pFrm->IsTabFrm() && !pFrm->FindNext(), "follow in chain contains content" );
         pFrm->Cut();
         delete pFrm;
     }
@@ -547,7 +547,7 @@ void SwFlyFrm::UnchainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow )
         {
             pUpper = static_cast<SwLayoutFrm*>(pUpper->GetLastLower());
             pUpper = static_cast<SwLayoutFrm*>(pUpper->Lower()); // der (Column)BodyFrm
-            ASSERT( pUpper && pUpper->IsColBodyFrm(), "Missing ColumnBody" );
+            OSL_ENSURE( pUpper && pUpper->IsColBodyFrm(), "Missing ColumnBody" );
         }
         SwFlyFrm *pFoll = pFollow;
         while ( pFoll )
@@ -563,7 +563,7 @@ void SwFlyFrm::UnchainFrames( SwFlyFrm *pMaster, SwFlyFrm *pFollow )
 
     //Der Follow muss mit seinem eigenen Inhalt versorgt werden.
     const SwFmtCntnt &rCntnt = pFollow->GetFmt()->GetCntnt();
-    ASSERT( rCntnt.GetCntntIdx(), ":-( Kein Inhalt vorbereitet." );
+    OSL_ENSURE( rCntnt.GetCntntIdx(), ":-( Kein Inhalt vorbereitet." );
     ULONG nIndex = rCntnt.GetCntntIdx()->GetIndex();
     // Lower() bedeutet SwColumnFrm, dieser beinhaltet wieder einen SwBodyFrm
     ::_InsertCnt( pFollow->Lower() ? (SwLayoutFrm*)((SwLayoutFrm*)pFollow->Lower())->Lower()
@@ -626,7 +626,7 @@ SwFlyFrm *SwFlyFrm::FindChainNeighbour( SwFrmFmt &rChain, SwFrm *pAnch )
     }
     else if ( pFly )
     {
-        ASSERT( !aIter.Next(), "chain with more than one inkarnation" );
+        OSL_ENSURE( !aIter.Next(), "chain with more than one inkarnation" );
     }
     return pFly;
 }
@@ -1201,7 +1201,7 @@ void SwFlyFrm::ChgRelPos( const Point &rNewPos )
                     aVert.SetVertOrient( text::VertOrientation::NONE );
                     xub_StrLen nOfs =
                         pFmt->GetAnchor().GetCntntAnchor()->nContent.GetIndex();
-                    ASSERT( GetAnchorFrm()->IsTxtFrm(), "TxtFrm expected" );
+                    OSL_ENSURE( GetAnchorFrm()->IsTxtFrm(), "TxtFrm expected" );
                     pAutoFrm = (SwTxtFrm*)GetAnchorFrm();
                     while( pAutoFrm->GetFollow() &&
                            pAutoFrm->GetFollow()->GetOfst() <= nOfs )
@@ -1258,7 +1258,7 @@ void SwFlyFrm::ChgRelPos( const Point &rNewPos )
                         {
                             xub_StrLen nOfs = pFmt->GetAnchor().GetCntntAnchor()
                                           ->nContent.GetIndex();
-                            ASSERT( GetAnchorFrm()->IsTxtFrm(), "TxtFrm expected");
+                            OSL_ENSURE( GetAnchorFrm()->IsTxtFrm(), "TxtFrm expected");
                             pAutoFrm = (SwTxtFrm*)GetAnchorFrm();
                             while( pAutoFrm->GetFollow() &&
                                    pAutoFrm->GetFollow()->GetOfst() <= nOfs )
@@ -1290,7 +1290,7 @@ void SwFlyFrm::ChgRelPos( const Point &rNewPos )
 
 void SwFlyFrm::Format( const SwBorderAttrs *pAttrs )
 {
-    ASSERT( pAttrs, "FlyFrm::Format, pAttrs ist 0." );
+    OSL_ENSURE( pAttrs, "FlyFrm::Format, pAttrs ist 0." );
 
     ColLock();
 
@@ -1316,8 +1316,8 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs )
         const SwFmtFrmSize &rFrmSz = GetFmt()->GetFrmSize();
               Size aRelSize( CalcRel( rFrmSz ) );
 
-        ASSERT( pAttrs->GetSize().Height() != 0 || rFrmSz.GetHeightPercent(), "Hoehe des RahmenAttr ist 0." );
-        ASSERT( pAttrs->GetSize().Width()  != 0 || rFrmSz.GetWidthPercent(), "Breite des RahmenAttr ist 0." );
+        OSL_ENSURE( pAttrs->GetSize().Height() != 0 || rFrmSz.GetHeightPercent(), "Hoehe des RahmenAttr ist 0." );
+        OSL_ENSURE( pAttrs->GetSize().Width()  != 0 || rFrmSz.GetWidthPercent(), "Breite des RahmenAttr ist 0." );
 
         SWRECTFN( this )
         if( !HasFixSize() )
@@ -1428,7 +1428,7 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs )
 
         if ( !bFormatHeightOnly )
         {
-            ASSERT( aRelSize == CalcRel( rFrmSz ), "SwFlyFrm::Format CalcRel problem" )
+            OSL_ENSURE( aRelSize == CalcRel( rFrmSz ), "SwFlyFrm::Format CalcRel problem" );
             SwTwips nNewSize = bVert ? aRelSize.Height() : aRelSize.Width();
 
             if ( rFrmSz.GetWidthSizeType() != ATT_FIX_SIZE )
@@ -1635,7 +1635,7 @@ void CalcCntnt( SwLayoutFrm *pLay,
                             bAgain = true;
                             if ( pAgainObj2 == pAnchoredObj )
                             {
-                                ASSERT( false,
+                                OSL_ENSURE( false,
                                         "::CalcCntnt(..) - loop detected, perform attribute changes to avoid the loop" );
                                 //Oszillation unterbinden.
                                 SwFrmFmt& rFmt = pAnchoredObj->GetFrmFmt();
@@ -1720,7 +1720,7 @@ void CalcCntnt( SwLayoutFrm *pLay,
                         continue;
 
 #if OSL_DEBUG_LEVEL > 1
-                    ASSERT( false, "LoopControl in CalcCntnt" )
+                    OSL_ENSURE( false, "LoopControl in CalcCntnt" );
 #endif
                 }
             }
@@ -2103,7 +2103,7 @@ Size SwFlyFrm::ChgSize( const Size& aNewSize )
 
 BOOL SwFlyFrm::IsLowerOf( const SwLayoutFrm* pUpperFrm ) const
 {
-    ASSERT( GetAnchorFrm(), "8-( Fly is lost in Space." );
+    OSL_ENSURE( GetAnchorFrm(), "8-( Fly is lost in Space." );
     const SwFrm* pFrm = GetAnchorFrm();
     do
     {
@@ -2232,7 +2232,7 @@ void SwFrm::AppendDrawObj( SwAnchoredObject& _rNewObj )
 {
     if ( !_rNewObj.ISA(SwAnchoredDrawObject) )
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "SwFrm::AppendDrawObj(..) - anchored object of unexcepted type -> object not appended" );
         return;
     }
@@ -2462,7 +2462,7 @@ void SwLayoutFrm::NotifyLowerObjs( const bool _bUnlockPosOfObjs )
             }
             else
             {
-                ASSERT( pObj->ISA(SwAnchoredDrawObject),
+                OSL_ENSURE( pObj->ISA(SwAnchoredDrawObject),
                         "<SwLayoutFrm::NotifyFlys() - anchored object of unexcepted type" );
                 // --> OD 2004-10-08 #i26945# - use <pAnchorFrm> to check, if
                 // fly frame is lower of layout frame resp. if fly frame is
@@ -2683,7 +2683,7 @@ BOOL SwFlyFrm::GetContour( PolyPolygon&   rContour,
             pGrfObj = new GraphicObject( pNd->GetGraphic() );
             bGrfObjCreated = sal_True;
         }
-        ASSERT( pGrfObj, "SwFlyFrm::GetContour() - No Graphic/GraphicObject found at <SwNoTxtNode>." );
+        OSL_ENSURE( pGrfObj, "SwFlyFrm::GetContour() - No Graphic/GraphicObject found at <SwNoTxtNode>." );
         if ( pGrfObj && pGrfObj->GetType() != GRAPHIC_NONE )
         {
             if( !pNd->HasContour() )
@@ -2692,7 +2692,7 @@ BOOL SwFlyFrm::GetContour( PolyPolygon&   rContour,
                 // during paint. Thus, return (value of <bRet> should be <FALSE>).
                 if ( pGrfNd && _bForPaint )
                 {
-                    ASSERT( false, "SwFlyFrm::GetContour() - No Contour found at <SwNoTxtNode> during paint." );
+                    OSL_ENSURE( false, "SwFlyFrm::GetContour() - No Contour found at <SwNoTxtNode> during paint." );
                     return bRet;
                 }
                 pNd->CreateContour();
@@ -2786,13 +2786,13 @@ void SwFlyFrm::InvalidateObjPos()
 
 SwFrmFmt& SwFlyFrm::GetFrmFmt()
 {
-    ASSERT( GetFmt(),
+    OSL_ENSURE( GetFmt(),
             "<SwFlyFrm::GetFrmFmt()> - missing frame format -> crash." );
     return *GetFmt();
 }
 const SwFrmFmt& SwFlyFrm::GetFrmFmt() const
 {
-    ASSERT( GetFmt(),
+    OSL_ENSURE( GetFmt(),
             "<SwFlyFrm::GetFrmFmt()> - missing frame format -> crash." );
     return *GetFmt();
 }
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index 9304930f4be9..018ab61ea58d 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -123,7 +123,7 @@ void SwFlyAtCntFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
 
     if( pAnch )
     {
-        ASSERT( pAnch->GetAnchorId() == GetFmt()->GetAnchor().GetAnchorId(),
+        OSL_ENSURE( pAnch->GetAnchorId() == GetFmt()->GetAnchor().GetAnchorId(),
                 "Unzulaessiger Wechsel des Ankertyps." );
 
         //Abmelden, neuen Anker besorgen und 'dranhaengen.
@@ -196,7 +196,7 @@ void SwFlyAtCntFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
         {
             SwCntntNode *pNode = aNewIdx.GetNode().GetCntntNode();
             pCntnt = pNode->GetFrm( &pOldAnchor->Frm().Pos(), 0, FALSE );
-            ASSERT( pCntnt, "Neuen Anker nicht gefunden" );
+            OSL_ENSURE( pCntnt, "Neuen Anker nicht gefunden" );
         }
         //Flys haengen niemals an einem Follow sondern immer am
         //Master, den suchen wir uns jetzt.
@@ -457,7 +457,7 @@ void SwFlyAtCntFrm::MakeAll()
                 {
                     SwTxtFrm* pAnchPosAnchorFrm =
                             dynamic_cast<SwTxtFrm*>(GetAnchorFrmContainingAnchPos());
-                    ASSERT( pAnchPosAnchorFrm,
+                    OSL_ENSURE( pAnchPosAnchorFrm,
                             "<SwFlyAtCntFrm::MakeAll()> - anchor frame of wrong type -> crash" );
                     // --> OD 2006-01-27 #i58182# - For the usage of new method
                     // <SwObjectFormatterTxtFrm::CheckMovedFwdCondition(..)>
@@ -534,7 +534,7 @@ void SwFlyAtCntFrm::MakeAll()
                                 pFmt->UnlockModify();
                                 bOsz = false;
 #if OSL_DEBUG_LEVEL > 1
-                                ASSERT( false,
+                                OSL_ENSURE( false,
                                         "<SwFlyAtCntFrm::MakeAll()> - special loop prevention for dedicated document of b6403541 applied" );
 #endif
                             }
@@ -1429,64 +1429,6 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew )
                              FALSE );
 }
 
-// OD 2004-08-12 #i32795# - Note: method no longer used in <flyincnt.cxx>
-//void DeepCalc( const SwFrm *pFrm )
-//{
-//    if( pFrm->IsSctFrm() ||
-//        ( pFrm->IsFlyFrm() && ((SwFlyFrm*)pFrm)->IsFlyInCntFrm() ) )
-//      return;
-//    const SwFlowFrm *pFlow = SwFlowFrm::CastFlowFrm( pFrm );
-//    if( pFlow && pFlow->IsAnyJoinLocked() )
-//        return;
-
-//    USHORT nCnt = 0;
-
-//  BOOL bContinue = FALSE;
-//  do
-//    {
-//        if ( ++nCnt == 10 )
-//      {
-//          ASSERT( !nCnt, "DeepCalc: Loop detected1?" );
-//          break;
-//      }
-
-//      const BOOL bSetComplete = !pFrm->IsValid();
-//      const SwRect aOldFrm( pFrm->Frm() );
-//      const SwRect aOldPrt( pFrm->Prt() );
-
-//      const SwFrm *pUp = pFrm->GetUpper();
-//      if ( pUp )
-//      {
-//          //Nicht weiter wenn der Up ein Fly mit Spalten ist.
-//          if( ( !pUp->IsFlyFrm() || !((SwLayoutFrm*)pUp)->Lower() ||
-//               !((SwLayoutFrm*)pUp)->Lower()->IsColumnFrm() ) &&
-//               !pUp->IsSctFrm() )
-//          {
-//                SWRECTFN( pUp )
-//                const Point aPt( (pUp->Frm().*fnRect->fnGetPos)() );
-//              ::DeepCalc( pUp );
-//                bContinue = aPt != (pUp->Frm().*fnRect->fnGetPos)();
-//          }
-//      }
-//      else
-//          pUp = pFrm;
-
-//      pFrm->Calc();
-//      if ( bSetComplete && (aOldFrm != pFrm->Frm() || aOldPrt != pFrm->Prt()))
-//          pFrm->SetCompletePaint();
-
-//      if ( pUp->IsFlyFrm() )
-//      {
-//          if ( ((SwFlyFrm*)pUp)->IsLocked() ||
-//               (((SwFlyFrm*)pUp)->IsFlyAtCntFrm() &&
-//                SwOszControl::IsInProgress( (const SwFlyFrm*)pUp )) )
-//          {
-//              bContinue = FALSE;
-//          }
-//      }
-//  } while ( bContinue );
-//}
-
 /** method to assure that anchored object is registered at the correct
     page frame
 
diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx
index 7e1d0cabd276..51f1d3a0929c 100644
--- a/sw/source/core/layout/flyincnt.cxx
+++ b/sw/source/core/layout/flyincnt.cxx
@@ -93,7 +93,7 @@ void SwFlyInCntFrm::SetRefPoint( const Point& rPoint,
                                  const Point& rRelPos )
 {
     // OD 2004-05-27 #i26791# - member <aRelPos> moved to <SwAnchoredObject>
-    ASSERT( rPoint != aRef || rRelAttr != GetCurrRelPos(), "SetRefPoint: no change" );
+    OSL_ENSURE( rPoint != aRef || rRelAttr != GetCurrRelPos(), "SetRefPoint: no change" );
     SwFlyNotify *pNotify = NULL;
     // No notify at a locked fly frame, if a fly frame is locked, there's
     // already a SwFlyNotify object on the stack (MakeAll).
@@ -275,7 +275,7 @@ void SwFlyInCntFrm::RegistFlys()
 {
     // vgl. SwRowFrm::RegistFlys()
     SwPageFrm *pPage = FindPageFrm();
-    ASSERT( pPage, "Flys ohne Seite anmelden?" );
+    OSL_ENSURE( pPage, "Flys ohne Seite anmelden?" );
     ::RegistFlys( pPage, this );
 }
 
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index 844ee422298e..d8d19bc82ac5 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -210,21 +210,6 @@ void SwFlyFreeFrm::MakeAll()
             if ( !bValidSize )
             {
                 bValidPrtArea = FALSE;
-/*
-                // This is also done in the Format function, so I think
-                // this code is not necessary anymore:
-                const Size aRelSize( CalcRel( *pSz ) );
-                const SwTwips nMin = MINFLY + rAttrs.CalcLeftLine()+rAttrs.CalcRightLine();
-                long nDiff = bVert ? aRelSize.Height() : aRelSize.Width();
-                if( nDiff < nMin )
-                    nDiff = nMin;
-                nDiff -= (aFrm.*fnRect->fnGetWidth)();
-                if( nDiff )
-                {
-                    (aFrm.*fnRect->fnAddRight)( nDiff );
-                    bValidPos = FALSE;
-                }
-*/
             }
 
             if ( !bValidPrtArea )
@@ -264,7 +249,7 @@ void SwFlyFreeFrm::MakeAll()
             ++nLoopControlRuns;
 
 #if OSL_DEBUG_LEVEL > 1
-            ASSERT( nLoopControlRuns < nLoopControlMax, "LoopControl in SwFlyFreeFrm::MakeAll" )
+            OSL_ENSURE( nLoopControlRuns < nLoopControlMax, "LoopControl in SwFlyFreeFrm::MakeAll" );
 #endif
 
             if ( nLoopControlRuns < nLoopControlMax )
@@ -275,9 +260,9 @@ void SwFlyFreeFrm::MakeAll()
     }
     Unlock();
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     SWRECTFN( this )
-    ASSERT( bHeightClipped || ( (Frm().*fnRect->fnGetHeight)() > 0 &&
+    OSL_ENSURE( bHeightClipped || ( (Frm().*fnRect->fnGetHeight)() > 0 &&
             (Prt().*fnRect->fnGetHeight)() > 0),
             "SwFlyFreeFrm::Format(), flipping Fly." );
 
@@ -522,7 +507,7 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz )
     }
 
     // --> OD 2004-10-14 #i26945#
-    ASSERT( Frm().Height() >= 0,
+    OSL_ENSURE( Frm().Height() >= 0,
             "<SwFlyFreeFrm::CheckClip(..)> - fly frame has negative height now." );
     // <--
 }
@@ -587,7 +572,7 @@ void SwFlyLayFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
 
     if( pAnch )
     {
-        ASSERT( pAnch->GetAnchorId() ==
+        OSL_ENSURE( pAnch->GetAnchorId() ==
                 GetFmt()->GetAnchor().GetAnchorId(),
                 "8-) Unzulaessiger Wechsel des Ankertyps." );
 
@@ -670,7 +655,7 @@ void SwPageFrm::AppendFlyToPage( SwFlyFrm *pNew )
     }
 
     SdrObject* pObj = pNew->GetVirtDrawObj();
-    ASSERT( pNew->GetAnchorFrm(), "Fly without Anchor" );
+    OSL_ENSURE( pNew->GetAnchorFrm(), "Fly without Anchor" );
     const SwFlyFrm* pFly = pNew->GetAnchorFrm()->FindFlyFrm();
     if ( pFly && pObj->GetOrdNum() < pFly->GetVirtDrawObj()->GetOrdNum() )
     {
@@ -696,12 +681,12 @@ void SwPageFrm::AppendFlyToPage( SwFlyFrm *pNew )
 #endif
         pSortedObjs->Insert( *pNew );
 #if OSL_DEBUG_LEVEL > 1
-        ASSERT( bSucessInserted, "Fly nicht in Sorted eingetragen." )
+        OSL_ENSURE( bSucessInserted, "Fly nicht in Sorted eingetragen." );
         (void) bSucessInserted;
 #endif
 
         // --> OD 2008-04-22 #i87493#
-        ASSERT( pNew->GetPageFrm() == 0 || pNew->GetPageFrm() == this,
+        OSL_ENSURE( pNew->GetPageFrm() == 0 || pNew->GetPageFrm() == this,
                 "<SwPageFrm::AppendFlyToPage(..)> - anchored fly frame seems to be registered at another page frame. Serious defect -> please inform OD." );
         // <--
         // --> OD 2004-06-30 #i28701# - use new method <SetPageFrm(..)>
@@ -867,7 +852,7 @@ void SwPageFrm::MoveFly( SwFlyFrm *pToMove, SwPageFrm *pDest )
 #endif
     pDest->GetSortedObjs()->Insert( *pToMove );
 #if OSL_DEBUG_LEVEL > 1
-    ASSERT( bSucessInserted, "Fly nicht in Sorted eingetragen." )
+    OSL_ENSURE( bSucessInserted, "Fly nicht in Sorted eingetragen." );
     (void) bSucessInserted;
 #endif
 
@@ -930,7 +915,7 @@ void SwPageFrm::AppendDrawObjToPage( SwAnchoredObject& _rNewObj )
 {
     if ( !_rNewObj.ISA(SwAnchoredDrawObject) )
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "SwPageFrm::AppendDrawObjToPage(..) - anchored object of unexcepted type -> object not appended" );
         return;
     }
@@ -940,7 +925,7 @@ void SwPageFrm::AppendDrawObjToPage( SwAnchoredObject& _rNewObj )
         ((SwRootFrm*)GetUpper())->InvalidateBrowseWidth();
     }
 
-    ASSERT( _rNewObj.GetAnchorFrm(), "anchored draw object without anchor" );
+    OSL_ENSURE( _rNewObj.GetAnchorFrm(), "anchored draw object without anchor" );
     const SwFlyFrm* pFlyFrm = _rNewObj.GetAnchorFrm()->FindFlyFrm();
     if ( pFlyFrm &&
          _rNewObj.GetDrawObj()->GetOrdNum() < pFlyFrm->GetVirtDrawObj()->GetOrdNum() )
@@ -964,13 +949,13 @@ void SwPageFrm::AppendDrawObjToPage( SwAnchoredObject& _rNewObj )
     }
     if ( !pSortedObjs->Insert( _rNewObj ) )
     {
-#ifdef DBG_UTIL
-        ASSERT( pSortedObjs->Contains( _rNewObj ),
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( pSortedObjs->Contains( _rNewObj ),
                 "Drawing object not appended into list <pSortedObjs>." );
 #endif
     }
     // --> OD 2008-04-22 #i87493#
-    ASSERT( _rNewObj.GetPageFrm() == 0 || _rNewObj.GetPageFrm() == this,
+    OSL_ENSURE( _rNewObj.GetPageFrm() == 0 || _rNewObj.GetPageFrm() == this,
             "<SwPageFrm::AppendDrawObjToPage(..)> - anchored draw object seems to be registered at another page frame. Serious defect -> please inform OD." );
     // <--
     _rNewObj.SetPageFrm( this );
@@ -983,7 +968,7 @@ void SwPageFrm::RemoveDrawObjFromPage( SwAnchoredObject& _rToRemoveObj )
 {
     if ( !_rToRemoveObj.ISA(SwAnchoredDrawObject) )
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "SwPageFrm::RemoveDrawObjFromPage(..) - anchored object of unexcepted type -> object not removed" );
         return;
     }
@@ -1023,7 +1008,7 @@ void SwPageFrm::PlaceFly( SwFlyFrm* pFly, SwFlyFrmFmt* pFmt )
 {
     // --> OD 2005-06-09 #i50432# - consider the case that page is an empty page:
     // In this case append the fly frame at the next page
-    ASSERT( !IsEmptyPage() || GetNext(),
+    OSL_ENSURE( !IsEmptyPage() || GetNext(),
             "<SwPageFrm::PlaceFly(..)> - empty page with no next page! -> fly frame appended at empty page" );
     if ( IsEmptyPage() && GetNext() )
     {
@@ -1036,7 +1021,7 @@ void SwPageFrm::PlaceFly( SwFlyFrm* pFly, SwFlyFrmFmt* pFmt )
         if ( pFly )
             AppendFly( pFly );
         else
-        {   ASSERT( pFmt, ":-( kein Format fuer Fly uebergeben." );
+        {   OSL_ENSURE( pFmt, ":-( kein Format fuer Fly uebergeben." );
             pFly = new SwFlyLayFrm( (SwFlyFrmFmt*)pFmt, this );
             AppendFly( pFly );
             ::RegistFlys( this, pFly );
@@ -1116,7 +1101,7 @@ BOOL CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, BOOL bMove )
             const SwFrm* pVertPosOrientFrm = pFly->GetVertPosOrientFrm();
             if ( !pVertPosOrientFrm )
             {
-                ASSERT( false,
+                OSL_ENSURE( false,
                         "::CalcClipRect(..) - frame, vertical position is oriented at, is missing .");
                 pVertPosOrientFrm = pFly->GetAnchorFrm();
             }
@@ -1337,7 +1322,7 @@ BOOL CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, BOOL bMove )
             const SwFrm* pAnchorFrm = pC->GetAnchorFrm( pSdrObj );
             if( !pAnchorFrm )
             {
-                ASSERT( false, "<::CalcClipRect(..)> - missing anchor frame." );
+                OSL_ENSURE( false, "<::CalcClipRect(..)> - missing anchor frame." );
                 ((SwDrawContact*)pC)->ConnectToLayout();
                 pAnchorFrm = pC->GetAnchorFrm();
             }
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 2ec7d2dbe9f5..992e09afce22 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -330,7 +330,7 @@ SwFrmNotify::~SwFrmNotify()
                             }
                             if ( pPageFrm != pFlyPageFrm )
                             {
-                                ASSERT( pFlyPageFrm, "~SwFrmNotify: Fly from Nowhere" );
+                                OSL_ENSURE( pFlyPageFrm, "~SwFrmNotify: Fly from Nowhere" );
                                 if( pFlyPageFrm )
                                     pFlyPageFrm->MoveFly( pFlyFrm, pPageFrm );
                                 else
@@ -402,7 +402,7 @@ SwFrmNotify::~SwFrmNotify()
                     }
                     else
                     {
-                        ASSERT( false,
+                        OSL_ENSURE( false,
                                 "<SwCntntNotify::~SwCntntNotify()> - unknown anchored object type. Please inform OD." );
                     }
                 }
@@ -888,7 +888,7 @@ SwCntntNotify::~SwCntntNotify()
         SwLayoutFrm* pCell = pCnt->GetUpper();
         while( !pCell->IsCellFrm() && pCell->GetUpper() )
             pCell = pCell->GetUpper();
-        ASSERT( pCell->IsCellFrm(), "Where's my cell?" );
+        OSL_ENSURE( pCell->IsCellFrm(), "Where's my cell?" );
         if ( text::VertOrientation::NONE != pCell->GetFmt()->GetVertOrient().GetVertOrient() )
             pCell->InvalidatePrt(); //fuer vertikale Ausrichtung.
     }
@@ -954,7 +954,7 @@ SwCntntNotify::~SwCntntNotify()
                  (pNd->GetOLEObj().IsOleRef() ||
                   pNd->IsOLESizeInvalid()) )
             {
-                ASSERT( pCnt->IsInFly(), "OLE not in FlyFrm" );
+                OSL_ENSURE( pCnt->IsInFly(), "OLE not in FlyFrm" );
                 SwFlyFrm *pFly = pCnt->FindFlyFrm();
                 svt::EmbeddedObjectRef& xObj = pNd->GetOLEObj().GetObject();
                 SwFEShell *pFESh = 0;
@@ -1049,7 +1049,7 @@ SwCntntNotify::~SwCntntNotify()
                         bCheckPos = TRUE;
                         if (FLY_AT_PAGE == rAnch.GetAnchorId())
                         {
-                            ASSERT( false, "<SwCntntNotify::~SwCntntNotify()> - to page anchored object with content position. Please inform OD." );
+                            OSL_ENSURE( false, "<SwCntntNotify::~SwCntntNotify()> - to page anchored object with content position. Please inform OD." );
                             SwFmtAnchor aAnch( rAnch );
                             aAnch.SetAnchor( 0 );
                             aAnch.SetPageNum( pPage->GetPhyPageNum() );
@@ -1145,7 +1145,7 @@ void AppendObjs( const SwSpzFrmFmts *pTbl, ULONG nIndex,
                 SdrObject* pSdrObj = 0;
                 if ( bSdrObj && 0 == (pSdrObj = pFmt->FindSdrObject()) )
                 {
-                    ASSERT( !bSdrObj, "DrawObject not found." );
+                    OSL_ENSURE( !bSdrObj, "DrawObject not found." );
                     pFmt->GetDoc()->DelFrmFmt( pFmt );
                     --i;
                     continue;
@@ -1220,7 +1220,7 @@ BOOL MA_FASTCALL lcl_ObjConnected( SwFrmFmt *pFmt )
 */
 bool lcl_InHeaderOrFooter( SwFrmFmt& _rFmt )
 {
-    ASSERT( lcl_ObjConnected( &_rFmt ),
+    OSL_ENSURE( lcl_ObjConnected( &_rFmt ),
             "::lcl_InHeaderOrFooter(..) - <SwFrmFmt> has no connected object" );
 
     bool bRetVal = false;
@@ -1374,7 +1374,7 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
             ( !pLay->IsInTab() || pSct->IsInTab() ) )
         {
             pActualSection = new SwActualSection( 0, pSct, 0 );
-            ASSERT( !pLay->Lower() || !pLay->Lower()->IsColumnFrm(),
+            OSL_ENSURE( !pLay->Lower() || !pLay->Lower()->IsColumnFrm(),
                 "_InsertCnt: Wrong Call" );
         }
     }
@@ -1577,8 +1577,8 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
         }
         else if ( pNd->IsEndNode() && pNd->StartOfSectionNode()->IsSectionNode() )
         {
-            ASSERT( pActualSection, "Sectionende ohne Anfang?" );
-            ASSERT( pActualSection->GetSectionNode() == pNd->StartOfSectionNode(),
+            OSL_ENSURE( pActualSection, "Sectionende ohne Anfang?" );
+            OSL_ENSURE( pActualSection->GetSectionNode() == pNd->StartOfSectionNode(),
                             "Sectionende mit falschen Start Node?" );
 
             //Section schliessen, ggf. die umgebende Section wieder
@@ -1693,7 +1693,7 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
         delete pPageMaker;
         if( pDoc->GetLayoutCache() )
         {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 #if OSL_DEBUG_LEVEL > 1
             pDoc->GetLayoutCache()->CompareLayout( *pDoc );
 #endif
@@ -1761,14 +1761,14 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx,
                 SwFrm *pMove = pFrm;
                 SwFrm *pPrev = pFrm->GetPrev();
                 SwFlowFrm *pTmp = SwFlowFrm::CastFlowFrm( pMove );
-                ASSERT( pTmp, "Missing FlowFrm" );
+                OSL_ENSURE( pTmp, "Missing FlowFrm" );
 
                 if ( bApres )
                 {
                     // Wir wollen, dass der Rest der Seite leer ist, d.h.
                     // der naechste muss auf die naechste Seite wandern.
                     // Dieser kann auch in der naechsten Spalte stehen!
-                    ASSERT( !pTmp->HasFollow(), "Follows forbidden" );
+                    OSL_ENSURE( !pTmp->HasFollow(), "Follows forbidden" );
                     pPrev = pFrm;
                     // Wenn unser umgebender SectionFrm einen Next besitzt,
                     // so soll dieser ebenfalls gemoved werden!
@@ -1823,7 +1823,7 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx,
                 }
                 else
                 {
-                    ASSERT( !pTmp->IsFollow(), "Follows really forbidden" );
+                    OSL_ENSURE( !pTmp->IsFollow(), "Follows really forbidden" );
                     // Bei Bereichen muss natuerlich der Inhalt auf die Reise
                     // geschickt werden.
                     if( pMove->IsSctFrm() )
@@ -2543,7 +2543,7 @@ const SdrObject *SwOrderIter::Prev()
 // at-fly anchored objects from page
 void MA_FASTCALL lcl_RemoveObjsFromPage( SwFrm* _pFrm )
 {
-    ASSERT( _pFrm->GetDrawObjs(), "Keine DrawObjs fuer lcl_RemoveFlysFromPage." );
+    OSL_ENSURE( _pFrm->GetDrawObjs(), "Keine DrawObjs fuer lcl_RemoveFlysFromPage." );
     SwSortedObjs &rObjs = *_pFrm->GetDrawObjs();
     for ( USHORT i = 0; i < rObjs.Count(); ++i )
     {
@@ -2663,7 +2663,7 @@ SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart )
                     }
                 }
                 else {
-                    ASSERT( !pFloat, "Neuer Float-Frame?" );
+                    OSL_ENSURE( !pFloat, "Neuer Float-Frame?" );
                 }
             }
             if ( pFloat->GetNext()  )
@@ -2711,7 +2711,7 @@ SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart )
 // anchored objects to page
 void MA_FASTCALL lcl_AddObjsToPage( SwFrm* _pFrm, SwPageFrm* _pPage )
 {
-    ASSERT( _pFrm->GetDrawObjs(), "Keine DrawObjs fuer lcl_AddFlysToPage." );
+    OSL_ENSURE( _pFrm->GetDrawObjs(), "Keine DrawObjs fuer lcl_AddFlysToPage." );
     SwSortedObjs &rObjs = *_pFrm->GetDrawObjs();
     for ( USHORT i = 0; i < rObjs.Count(); ++i )
     {
@@ -2767,7 +2767,7 @@ void MA_FASTCALL lcl_AddObjsToPage( SwFrm* _pFrm, SwPageFrm* _pPage )
 
 void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGrow )
 {
-    ASSERT( pSav && pParent, "Kein Save oder Parent fuer Restore." );
+    OSL_ENSURE( pSav && pParent, "Kein Save oder Parent fuer Restore." );
     SWRECTFN( pParent )
 
     //Wenn es bereits FlowFrms unterhalb des neuen Parent gibt, so wird die
@@ -2902,7 +2902,7 @@ SwPageFrm * MA_FASTCALL InsertNewPage( SwPageDesc &rDesc, SwFrm *pUpper,
     if ( !pFmt )
     {
         pFmt = bOdd ? rDesc.GetLeftFmt() : rDesc.GetRightFmt();
-        ASSERT( pFmt, "Descriptor without any format?!" );
+        OSL_ENSURE( pFmt, "Descriptor without any format?!" );
         bInsertEmpty = !bInsertEmpty;
     }
     if( bInsertEmpty )
@@ -3391,7 +3391,7 @@ BOOL Is_Lower_Of( const SwFrm *pCurrFrm, const SdrObject* pObj )
         pFrm = ( (SwDrawContact*)GetUserCall(pObj) )->GetAnchorFrm();
         aPos = pObj->GetCurrentBoundRect().TopLeft();
     }
-    ASSERT( pFrm, "8-( Fly is lost in Space." );
+    OSL_ENSURE( pFrm, "8-( Fly is lost in Space." );
     pFrm = GetVirtualUpper( pFrm, aPos );
     do
     {   if ( pFrm == pCurrFrm )
@@ -3693,7 +3693,7 @@ void GetSpacingValuesOfFrm( const SwFrm& rFrm,
                 static_cast<const SwTxtFrm&>(rFrm).GetLineSpace( true ) == 0;
         }
 
-        ASSERT( onLowerSpacing >= 0 && onLineSpacing >= 0,
+        OSL_ENSURE( onLowerSpacing >= 0 && onLineSpacing >= 0,
                 "<GetSpacingValuesOfFrm(..)> - spacing values aren't positive!" );
     }
 }
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index e476a73025b5..4683db4e5ac5 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -81,13 +81,13 @@ ULONG MA_FASTCALL lcl_FindFtnPos( const SwDoc *pDoc, const SwTxtFtn *pAttr )
         rFtnIdxs[k+1]->pFtn->GetTxtNode().GetIndex(aIdx2);
         if ( aIdx1.GetIndex() > aIdx2.GetIndex() )
         {
-            ASSERT( !rFtnIdxs.Count(), "FtnIdxs not up to date" );
+            OSL_ENSURE( !rFtnIdxs.Count(), "FtnIdxs not up to date" );
         }
         else if ( aIdx1.GetIndex() == aIdx2.GetIndex() )
         {
             SwTxtFtn *p1 = rFtnIdxs[k];
             SwTxtFtn *p2 = rFtnIdxs[k+1];
-            ASSERT( *p1->GetStart() < *p2->GetStart(),
+            OSL_ENSURE( *p1->GetStart() < *p2->GetStart(),
                     "FtnIdxs not up to date" );
         }
     }
@@ -101,14 +101,14 @@ ULONG MA_FASTCALL lcl_FindFtnPos( const SwDoc *pDoc, const SwTxtFtn *pAttr )
             return ULONG(nRet) + ENDNOTE;
         return nRet;
     }
-    ASSERT( !pDoc, "FtnPos not found." );
+    OSL_ENSURE( !pDoc, "FtnPos not found." );
     return 0;
 }
 
 BOOL SwFtnFrm::operator<( const SwTxtFtn* pTxtFtn ) const
 {
     const SwDoc* pDoc = GetFmt()->GetDoc();
-    ASSERT( pDoc, "SwFtnFrm: Missing doc!" );
+    OSL_ENSURE( pDoc, "SwFtnFrm: Missing doc!" );
     return lcl_FindFtnPos( pDoc, GetAttr() ) <
            lcl_FindFtnPos( pDoc, pTxtFtn );
 }
@@ -140,7 +140,7 @@ BOOL lcl_NextFtnBoss( SwFtnBossFrm* &rpBoss, SwPageFrm* &rpPage,
             SwSectionFrm* pSct = rpBoss->FindSctFrm()->GetFollow();
             if( pSct )
             {
-                ASSERT( pSct->Lower() && pSct->Lower()->IsColumnFrm(),
+                OSL_ENSURE( pSct->Lower() && pSct->Lower()->IsColumnFrm(),
                         "Where's the column?" );
                 rpBoss = (SwColumnFrm*)pSct->Lower();
                 SwPageFrm* pOld = rpPage;
@@ -354,9 +354,9 @@ SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL )
     //moeglich.
     //Wenn die Seite eine spezielle Fussnotenseite ist, so nehmen wir uns auch
     //soviel Platz wie eben moeglich.
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     if ( !GetUpper() || !GetUpper()->IsFtnBossFrm() )
-    {   ASSERT( !this, "Keine FtnBoss." );
+    { OSL_ENSURE( !this, "Keine FtnBoss." );
         return 0;
     }
 #endif
@@ -370,7 +370,7 @@ SwTwips SwFtnContFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL )
     if( IsInSct() )
     {
         SwSectionFrm* pSect = FindSctFrm();
-        ASSERT( pSect, "GrowFrm: Missing SectFrm" );
+        OSL_ENSURE( pSect, "GrowFrm: Missing SectFrm" );
         // In a section, which has to maximize, a footnotecontainer is allowed
         // to grow, when the section can't grow anymore.
         if( !bTst && !pSect->IsColLocked() &&
@@ -560,7 +560,7 @@ void SwFtnFrm::InvalidateNxtFtnCnts( SwPageFrm *pPage )
     }
 }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
 SwTwips SwFtnFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
 {
@@ -669,11 +669,11 @@ void SwFtnFrm::Cut()
 
 void SwFtnFrm::Paste(  SwFrm* pParent, SwFrm* pSibling )
 {
-    ASSERT( pParent, "Kein Parent fuer Paste." );
-    ASSERT( pParent->IsLayoutFrm(), "Parent ist CntntFrm." );
-    ASSERT( pParent != this, "Bin selbst der Parent." );
-    ASSERT( pSibling != this, "Bin mein eigener Nachbar." );
-    ASSERT( !GetPrev() && !GetNext() && !GetUpper(),
+    OSL_ENSURE( pParent, "Kein Parent fuer Paste." );
+    OSL_ENSURE( pParent->IsLayoutFrm(), "Parent ist CntntFrm." );
+    OSL_ENSURE( pParent != this, "Bin selbst der Parent." );
+    OSL_ENSURE( pSibling != this, "Bin mein eigener Nachbar." );
+    OSL_ENSURE( !GetPrev() && !GetNext() && !GetUpper(),
             "Bin noch irgendwo angemeldet." );
 
     //In den Baum einhaengen.
@@ -693,7 +693,7 @@ void SwFtnFrm::Paste(  SwFrm* pParent, SwFrm* pSibling )
     //Wenn mein Vorgaenger mein Master ist und/oder wenn mein Nachfolger mein
     //Follow ist so kann ich deren Inhalt uebernehmen und sie vernichten.
     if ( GetPrev() && GetPrev() == GetMaster() )
-    {   ASSERT( SwFlowFrm::CastFlowFrm( GetPrev()->GetLower() ),
+    { OSL_ENSURE( SwFlowFrm::CastFlowFrm( GetPrev()->GetLower() ),
                 "Fussnote ohne Inhalt?" );
         (SwFlowFrm::CastFlowFrm( GetPrev()->GetLower()))->
             MoveSubTree( this, GetLower() );
@@ -702,23 +702,23 @@ void SwFtnFrm::Paste(  SwFrm* pParent, SwFrm* pSibling )
         delete pDel;
     }
     if ( GetNext() && GetNext() == GetFollow() )
-    {   ASSERT( SwFlowFrm::CastFlowFrm( GetNext()->GetLower() ),
+    { OSL_ENSURE( SwFlowFrm::CastFlowFrm( GetNext()->GetLower() ),
                 "Fussnote ohne Inhalt?" );
         (SwFlowFrm::CastFlowFrm( GetNext()->GetLower()))->MoveSubTree( this );
         SwFrm *pDel = GetNext();
         pDel->Cut();
         delete pDel;
     }
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     SwDoc *pDoc = GetFmt()->GetDoc();
     if ( GetPrev() )
     {
-        ASSERT( lcl_FindFtnPos( pDoc, ((SwFtnFrm*)GetPrev())->GetAttr() ) <=
+        OSL_ENSURE( lcl_FindFtnPos( pDoc, ((SwFtnFrm*)GetPrev())->GetAttr() ) <=
                 lcl_FindFtnPos( pDoc, GetAttr() ), "Prev ist not FtnPrev" );
     }
     if ( GetNext() )
     {
-        ASSERT( lcl_FindFtnPos( pDoc, GetAttr() ) <=
+        OSL_ENSURE( lcl_FindFtnPos( pDoc, GetAttr() ) <=
                 lcl_FindFtnPos( pDoc, ((SwFtnFrm*)GetNext())->GetAttr() ),
                 "Next is not FtnNext" );
     }
@@ -755,7 +755,7 @@ SwLayoutFrm *SwFrm::GetNextFtnLeaf( MakePageType eMakePage )
             SwLayoutFrm* pNxt = pOldBoss->GetNextSctLeaf( eMakePage );
             if( pNxt )
             {
-                ASSERT( pNxt->IsColBodyFrm(), "GetNextFtnLeaf: Funny Leaf" );
+                OSL_ENSURE( pNxt->IsColBodyFrm(), "GetNextFtnLeaf: Funny Leaf" );
                 pBoss = (SwFtnBossFrm*)pNxt->GetUpper();
                 pPage = pBoss->FindPageFrm();
             }
@@ -893,7 +893,7 @@ SwLayoutFrm *SwFrm::GetPrevFtnLeaf( MakePageType eMakeFtn )
                         pSect = (SwSectionFrm*)pSect->FindMaster();
                         if( !pSect || !pSect->Lower() )
                             return 0;
-                        ASSERT( pSect->Lower()->IsColumnFrm(),
+                        OSL_ENSURE( pSect->Lower()->IsColumnFrm(),
                                 "GetPrevFtnLeaf: Where's the column?" );
                         pNxtBoss = (SwFtnBossFrm*)pSect->Lower();
                         pBody = pSect;
@@ -1024,7 +1024,7 @@ void lcl_RemoveFtns( SwFtnBossFrm* pBoss, BOOL bPageOnly, BOOL bEndNotes )
         if ( pCont )
         {
             SwFtnFrm *pFtn = (SwFtnFrm*)pCont->Lower();
-            ASSERT( pFtn, "FtnCont ohne Ftn." );
+            OSL_ENSURE( pFtn, "FtnCont ohne Ftn." );
             if ( bPageOnly )
                 while ( pFtn->GetMaster() )
                     pFtn = pFtn->GetMaster();
@@ -1140,9 +1140,9 @@ SwFtnContFrm *SwFtnBossFrm::MakeFtnCont()
     //immer direkt hinter dem Bodytext.
     //Sein FrmFmt ist immer das DefaultFrmFmt.
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     if ( FindFtnCont() )
-    {   ASSERT( !this, "Fussnotencontainer bereits vorhanden." );
+    {   OSL_ENSURE( !this, "Fussnotencontainer bereits vorhanden." );
         return 0;
     }
 #endif
@@ -1169,14 +1169,14 @@ SwFtnContFrm *SwFtnBossFrm::FindFtnCont()
     while( pFrm && !pFrm->IsFtnContFrm() )
         pFrm = pFrm->GetNext();
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     if ( pFrm )
     {
         SwFrm *pFtn = pFrm->GetLower();
-        ASSERT( pFtn, "Cont ohne Fussnote." );
+        OSL_ENSURE( pFtn, "Cont ohne Fussnote." );
         while ( pFtn )
         {
-            ASSERT( pFtn->IsFtnFrm(), "Nachbar von Fussnote keine Fussnote." );
+            OSL_ENSURE( pFtn->IsFtnFrm(), "Nachbar von Fussnote keine Fussnote." );
             pFtn = pFtn->GetNext();
         }
     }
@@ -1249,7 +1249,7 @@ SwFtnFrm *SwFtnBossFrm::FindFirstFtn()
     if( pRet )
     {
         pBoss = pRet->GetRef()->FindFtnBossFrm();
-        ASSERT( pBoss, "FindFirstFtn: No boss found" );
+        OSL_ENSURE( pBoss, "FindFirstFtn: No boss found" );
         if( !pBoss )
             return FALSE; // ?There must be a bug, but no GPF
         pPage = pBoss->FindPageFrm();
@@ -1366,7 +1366,7 @@ void SwFtnBossFrm::ResetFtn( const SwFtnFrm *pCheck )
 {
     //Vernichten der Inkarnationen von Fussnoten zum Attribut, wenn sie nicht
     //zu pAssumed gehoeren.
-    ASSERT( !pCheck->GetMaster(), "Master not an Master." );
+    OSL_ENSURE( !pCheck->GetMaster(), "Master not an Master." );
 
     SwNodeIndex aIdx( *pCheck->GetAttr()->GetStartNode(), 1 );
     SwCntntNode *pNd = aIdx.GetNode().GetCntntNode();
@@ -1414,14 +1414,6 @@ void SwFtnBossFrm::ResetFtn( const SwFtnFrm *pCheck )
 
 void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
 {
-#if (OSL_DEBUG_LEVEL > 1) && defined(DBG_UTIL)
-    static USHORT nStop = 0;
-    if ( nStop == pNew->GetFrmId() )
-    {
-        int bla = 5;
-        (void)bla;
-    }
-#endif
     //Die Fussnote haben wir, sie muss jetzt nur noch irgendwo
     //hin und zwar vor die Fussnote, deren Attribut vor das
     //der neuen zeigt (Position wird ueber das Doc ermittelt)
@@ -1527,7 +1519,7 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
             //werden.
             pSibling = (SwFtnFrm*)pParent->Lower();
             if ( !pSibling )
-            {   ASSERT( !this, "Keinen Platz fuer Fussnote gefunden.");
+            { OSL_ENSURE( !this, "Keinen Platz fuer Fussnote gefunden.");
                 return;
             }
             nCmpPos  = ::lcl_FindFtnPos( pDoc, pSibling->GetAttr() );
@@ -1546,7 +1538,7 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
                 if ( pSibling->GetNext() )
                 {
                     pSibling = (SwFtnFrm*)pSibling->GetNext();
-                    ASSERT( !pSibling->GetMaster() || ( ENDNOTE > nStPos &&
+                    OSL_ENSURE( !pSibling->GetMaster() || ( ENDNOTE > nStPos &&
                             pSibling->GetAttr()->GetFtn().IsEndNote() ),
                             "InsertFtn: Master expected I" );
                 }
@@ -1568,7 +1560,7 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
                 if ( pSibling )
                 {
                     nCmpPos = ::lcl_FindFtnPos( pDoc, pSibling->GetAttr() );
-                    ASSERT( nCmpPos > nLastPos, "InsertFtn: Order of FtnFrm's buggy" );
+                    OSL_ENSURE( nCmpPos > nLastPos, "InsertFtn: Order of FtnFrm's buggy" );
                 }
             }
             // pLastSib ist jetzt die letzte Fussnote vor uns,
@@ -1588,7 +1580,7 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
                 pSibling = pLastSib;
                 while( pSibling->GetFollow() )
                     pSibling = pSibling->GetFollow();
-                ASSERT( !pSibling->GetNext(), "InsertFtn: Who's that guy?" );
+                OSL_ENSURE( !pSibling->GetNext(), "InsertFtn: Who's that guy?" );
             }
         }
     }
@@ -1667,7 +1659,7 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
             {
                 if( ENDNOTE > nCmpPos || nStPos >= ENDNOTE )
                 {
-                    ASSERT( FALSE, "InsertFtn: Master expected II" );
+                    OSL_ENSURE( FALSE, "InsertFtn: Master expected II" );
                     do
                         pSibling = pSibling->GetMaster();
                     while ( pSibling->GetMaster() );
@@ -1676,7 +1668,7 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
             pParent = (SwFtnContFrm*)pSibling->GetUpper();
         }
     }
-    ASSERT( pParent, "paste in space?" );
+    OSL_ENSURE( pParent, "paste in space?" );
     pNew->Paste( pParent, pSibling );
 }
 
@@ -1748,7 +1740,7 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
                     SwFtnContFrm *pCont = pNxt->FindFtnCont();
                     if ( pCont && pCont->Lower() )
                     {
-                        ASSERT( pCont->Lower()->IsFtnFrm(), "Keine Ftn im Container" );
+                        OSL_ENSURE( pCont->Lower()->IsFtnFrm(), "Keine Ftn im Container" );
                         if ( nStPos > ::lcl_FindFtnPos( pDoc,
                                         ((SwFtnFrm*)pCont->Lower())->GetAttr()))
                         {
@@ -1791,7 +1783,7 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
                 SwFtnContFrm *pCont = pNxt->FindFtnCont();
                 if ( pCont && pCont->Lower() )
                 {
-                    ASSERT( pCont->Lower()->IsFtnFrm(), "Keine Ftn im Container" );
+                    OSL_ENSURE( pCont->Lower()->IsFtnFrm(), "Keine Ftn im Container" );
                     if ( nStPos > ::lcl_FindFtnPos( pDoc,
                                         ((SwFtnFrm*)pCont->Lower())->GetAttr()))
                     {
@@ -1807,7 +1799,7 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
 
     //Erstmal eine Fussnote und die benoetigten CntntFrms anlegen.
     if ( !pAttr->GetStartNode() )
-    {   ASSERT( !this, "Kein Fussnoteninhalt." );
+    { OSL_ENSURE( !this, "Kein Fussnoteninhalt." );
         return;
     }
 
@@ -1841,7 +1833,7 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
     if( bChgPage )
     {
         SwLayoutFrm* pBody = pPage->FindBodyCont();
-        ASSERT( pBody, "AppendFtn: NoPageBody?" );
+        OSL_ENSURE( pBody, "AppendFtn: NoPageBody?" );
         if( pBody->Lower() && pBody->Lower()->IsColumnFrm() )
             pBoss = (SwFtnBossFrm*)pBody->Lower();
         else
@@ -1928,7 +1920,7 @@ void SwFtnBossFrm::AppendFtn( SwCntntFrm *pRef, SwTxtFtn *pAttr )
 SwFtnFrm *SwFtnBossFrm::FindFtn( const SwCntntFrm *pRef, const SwTxtFtn *pAttr )
 {
     //Der einfachste und sicherste Weg geht ueber das Attribut.
-    ASSERT( pAttr->GetStartNode(), "FtnAtr ohne StartNode." );
+    OSL_ENSURE( pAttr->GetStartNode(), "FtnAtr ohne StartNode." );
     SwNodeIndex aIdx( *pAttr->GetStartNode(), 1 );
     SwCntntNode *pNd = aIdx.GetNode().GetCntntNode();
     if ( !pNd )
@@ -1991,7 +1983,7 @@ void SwFtnBossFrm::RemoveFtn( const SwCntntFrm *pRef, const SwTxtFtn *pAttr,
         } while ( pFtn );
         if( bPrep && pRef->IsFollow() )
         {
-            ASSERT( pRef->IsTxtFrm(), "NoTxtFrm has Footnote?" );
+            OSL_ENSURE( pRef->IsTxtFrm(), "NoTxtFrm has Footnote?" );
             SwTxtFrm* pMaster = (SwTxtFrm*)pRef->FindMaster();
             if( !pMaster->IsLocked() )
                 pMaster->Prepare( PREP_FTN_GONE );
@@ -2118,7 +2110,7 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm*   _pRef,
     // OD 03.04.2003 #108446# - assert, that no reference footnote boss frame
     // is set, in spite of the order, that only previous footnotes has to be
     // collected.
-    ASSERT( !_bCollectOnlyPreviousFtns || _pRefFtnBossFrm,
+    OSL_ENSURE( !_bCollectOnlyPreviousFtns || _pRefFtnBossFrm,
             "<SwFtnBossFrm::_CollectFtns(..)> - No reference footnote boss frame for collecting only previous footnotes set.\nCrash will be caused!" );
 
     //Alle Fussnoten die von pRef referenziert werden nacheinander
@@ -2137,7 +2129,7 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm*   _pRef,
     //Hier sollte keiner mit einer Follow-Ftn ankommen, es sei denn er hat
     //ernste Absichten (:-)); spricht er kommt mit einer Ftn an die vor der
     //ersten der Referenz liegt.
-    ASSERT( !_pFtn->GetMaster() || _pFtn->GetRef() != _pRef, "FollowFtn moven?" );
+    OSL_ENSURE( !_pFtn->GetMaster() || _pFtn->GetRef() != _pRef, "FollowFtn moven?" );
     while ( _pFtn->GetMaster() )
         _pFtn = _pFtn->GetMaster();
 
@@ -2177,13 +2169,13 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm*   _pRef,
             } while( !pNxtFtn && pBoss );
         }
         else if( !pNxtFtn->GetAttr()->GetFtn().IsEndNote() )
-        {   ASSERT( !pNxtFtn->GetMaster(), "_CollectFtn: Master exspected" );
+        { OSL_ENSURE( !pNxtFtn->GetMaster(), "_CollectFtn: Master exspected" );
             while ( pNxtFtn->GetMaster() )
                 pNxtFtn = pNxtFtn->GetMaster();
         }
         if ( pNxtFtn == _pFtn )
         {
-            ASSERT( FALSE, "_CollectFtn: Devil's circle" );
+            OSL_ENSURE( FALSE, "_CollectFtn: Devil's circle" );
             pNxtFtn = 0;
         }
 
@@ -2194,7 +2186,7 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm*   _pRef,
             if ( _bCollectOnlyPreviousFtns )
             {
                 SwFtnBossFrm* pBossOfFoundFtn = _pFtn->FindFtnBossFrm( sal_True );
-                ASSERT( pBossOfFoundFtn,
+                OSL_ENSURE( pBossOfFoundFtn,
                         "<SwFtnBossFrm::_CollectFtns(..)> - footnote boss frame of found footnote frame missing.\nWrong layout!" );
                 if ( !pBossOfFoundFtn ||    // don't crash, if no footnote boss is found.
                      pBossOfFoundFtn->IsBefore( _pRefFtnBossFrm )
@@ -2211,7 +2203,7 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm*   _pRef,
 
         if ( bCollectFoundFtn )
         {
-            ASSERT( !_pFtn->GetMaster(), "FollowFtn moven?" );
+            OSL_ENSURE( !_pFtn->GetMaster(), "FollowFtn moven?" );
             SwFtnFrm *pNxt = _pFtn->GetFollow();
             while ( pNxt )
             {
@@ -2226,7 +2218,7 @@ void SwFtnBossFrm::_CollectFtns( const SwCntntFrm*   _pRef,
                     } while ( pCnt );
                 }
                 else
-                {   ASSERT( !pNxt, "Fussnote ohne Inhalt?" );
+                { OSL_ENSURE( !pNxt, "Fussnote ohne Inhalt?" );
                     pNxt->Cut();
                     delete pNxt;
                 }
@@ -2392,7 +2384,7 @@ void SwFtnBossFrm::_MoveFtns( SvPtrarr &rFtnArr, BOOL bCalc )
             }
         }
         else
-        {   ASSERT( !pFtn->GetMaster() && !pFtn->GetFollow(),
+        { OSL_ENSURE( !pFtn->GetMaster() && !pFtn->GetFollow(),
                     "DelFtn und Master/Follow?" );
             delete pFtn;
             // --> OD 2004-06-10 #i21478#
@@ -2487,7 +2479,7 @@ void SwFtnBossFrm::MoveFtns( const SwCntntFrm *pSrc, SwCntntFrm *pDest,
         || pAttr->GetFtn().IsEndNote() )
         return;
 
-    ASSERT( this == pSrc->FindFtnBossFrm( TRUE ),
+    OSL_ENSURE( this == pSrc->FindFtnBossFrm( TRUE ),
             "SwPageFrm::MoveFtns: source frame isn't on that FtnBoss" );
 
     SwFtnFrm *pFtn = FindFirstFtn();
@@ -2495,7 +2487,7 @@ void SwFtnBossFrm::MoveFtns( const SwCntntFrm *pSrc, SwCntntFrm *pDest,
     {
         ChangeFtnRef( pSrc, pAttr, pDest );
         SwFtnBossFrm *pDestBoss = pDest->FindFtnBossFrm( TRUE );
-        ASSERT( pDestBoss, "+SwPageFrm::MoveFtns: no destination boss" );
+        OSL_ENSURE( pDestBoss, "+SwPageFrm::MoveFtns: no destination boss" );
         if( pDestBoss )     // robust
         {
             SvPtrarr aFtnArr( 5, 5 );
@@ -2661,7 +2653,7 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips nDeadLine, const BOOL bLock,
                             !pFtnFrm->IsColLocked() )
                         {
                             // --> OD 2005-08-10 #i49383#
-                            ASSERT( pLastFtnFrm == pFtnFrm,
+                            OSL_ENSURE( pLastFtnFrm == pFtnFrm,
                                     "<SwFtnBossFrm::RearrangeFtns(..)> - <pLastFtnFrm> != <pFtnFrm>" );
                             pLastFtnFrm = 0L;
                             // --> OD 2006-02-02 #i57914# - adjust fix #i49383#
@@ -2879,7 +2871,7 @@ SwTwips SwFtnBossFrm::GetVarSpace() const
     // die ganze Seite/Spalte ein.
 
     const SwPageFrm* pPg = FindPageFrm();
-    ASSERT( pPg || IsInSct(), "Footnote lost page" );
+    OSL_ENSURE( pPg || IsInSct(), "Footnote lost page" );
 
     const SwFrm *pBody = FindBodyCont();
     SwTwips nRet;
@@ -2896,7 +2888,7 @@ SwTwips SwFtnBossFrm::GetVarSpace() const
             // the bottom of the last contentfrm
             if( pSect->IsEndnAtEnd() ) // endnotes allowed?
             {
-                ASSERT( !Lower() || !Lower()->GetNext() || Lower()->GetNext()->
+                OSL_ENSURE( !Lower() || !Lower()->GetNext() || Lower()->GetNext()->
                         IsFtnContFrm(), "FtnContainer exspected" );
                 const SwFtnContFrm* pCont = Lower() ?
                     (SwFtnContFrm*)Lower()->GetNext() : 0;
@@ -2966,18 +2958,18 @@ BYTE SwFtnBossFrm::_NeighbourhoodAdjustment( const SwFrm* ) const
             nRet = NA_GROW_SHRINK;
         else
         {
-            ASSERT( GetUpper()->IsSctFrm(), "NeighbourhoodAdjustment: Unexspected Upper" );
+            OSL_ENSURE( GetUpper()->IsSctFrm(), "NeighbourhoodAdjustment: Unexspected Upper" );
             if( !GetNext() && !GetPrev() )
                 nRet = NA_GROW_ADJUST; // section with a single column (FtnAtEnd)
             else
             {
                 const SwFrm* pTmp = Lower();
-                ASSERT( pTmp, "NeighbourhoodAdjustment: Missing Lower()" );
+                OSL_ENSURE( pTmp, "NeighbourhoodAdjustment: Missing Lower()" );
                 if( !pTmp->GetNext() )
                     nRet = NA_GROW_SHRINK;
                 else if( !GetUpper()->IsColLocked() )
                     nRet = NA_ADJUST_GROW;
-                ASSERT( !pTmp->GetNext() || pTmp->GetNext()->IsFtnContFrm(),
+                OSL_ENSURE( !pTmp->GetNext() || pTmp->GetNext()->IsFtnContFrm(),
                         "NeighbourhoodAdjustment: Who's that guy?" );
             }
         }
@@ -3052,7 +3044,7 @@ BOOL SwLayoutFrm::MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss,
         pStart = pStart->GetNextCntntFrm();
     }
 
-    ASSERT( pOldBoss->IsInSct() == pNewBoss->IsInSct(),
+    OSL_ENSURE( pOldBoss->IsInSct() == pNewBoss->IsInSct(),
             "MoveLowerFtns: Section confusion" );
     SvPtrarr *pFtnArr;
     SwLayoutFrm* pNewChief = 0;
@@ -3117,7 +3109,7 @@ BOOL SwLayoutFrm::MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss,
 
 BOOL SwCntntFrm::MoveFtnCntFwd( BOOL bMakePage, SwFtnBossFrm *pOldBoss )
 {
-    ASSERT( IsInFtn(), "Keine Ftn." );
+    OSL_ENSURE( IsInFtn(), "Keine Ftn." );
     SwLayoutFrm *pFtn = FindFtnFrm();
 
     // The first paragraph in the first footnote in the first column in the
@@ -3176,7 +3168,7 @@ BOOL SwCntntFrm::MoveFtnCntFwd( BOOL bMakePage, SwFtnBossFrm *pOldBoss )
         SwFtnFrm* pTmpFtn = pNewUpper->IsFtnFrm() ? ((SwFtnFrm*)pNewUpper) : 0;
         if( !pTmpFtn )
         {
-            ASSERT( pNewUpper->IsFtnContFrm(), "Neuer Upper kein FtnCont.");
+            OSL_ENSURE( pNewUpper->IsFtnContFrm(), "Neuer Upper kein FtnCont.");
             SwFtnContFrm *pCont = (SwFtnContFrm*)pNewUpper;
 
             //Fussnote erzeugen.
@@ -3198,7 +3190,7 @@ BOOL SwCntntFrm::MoveFtnCntFwd( BOOL bMakePage, SwFtnBossFrm *pOldBoss )
             pTmpFtn->Paste( pCont, pNx );
             pTmpFtn->Calc();
         }
-        ASSERT( pTmpFtn->GetAttr() == FindFtnFrm()->GetAttr(), "Wrong Footnote!" );
+        OSL_ENSURE( pTmpFtn->GetAttr() == FindFtnFrm()->GetAttr(), "Wrong Footnote!" );
         // Bereiche in Fussnoten beduerfen besonderer Behandlung
         SwLayoutFrm *pNewUp = pTmpFtn;
         if( IsInSct() )
@@ -3230,7 +3222,7 @@ BOOL SwCntntFrm::MoveFtnCntFwd( BOOL bMakePage, SwFtnBossFrm *pOldBoss )
                             pTmpNxt = (SwSectionFrm*)pTmp;
                         else
                         {
-                            ASSERT( pTmp->IsTabFrm(), "GetNextSctLeaf: Wrong Type" );
+                            OSL_ENSURE( pTmp->IsTabFrm(), "GetNextSctLeaf: Wrong Type" );
                             pTmpNxt = (SwTabFrm*)pTmp;
                         }
                         pTmpNxt->MoveSubTree( pTmpFtn, pNewUp->GetNext() );
@@ -3276,7 +3268,7 @@ SwSaveFtnHeight::~SwSaveFtnHeight()
 }
 
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 //JP 15.10.2001: in a non pro version test if the attribute has the same
 //              meaning which his reference is
 
@@ -3288,7 +3280,7 @@ SwSaveFtnHeight::~SwSaveFtnHeight()
 const SwCntntFrm* SwFtnFrm::GetRef() const
 {
     const SwCntntFrm* pRefAttr = GetRefFromAttr();
-    ASSERT( pRef == pRefAttr || pRef->IsAnFollow( pRefAttr )
+    OSL_ENSURE( pRef == pRefAttr || pRef->IsAnFollow( pRefAttr )
             || pRefAttr->IsAnFollow( pRef ),
             "access to deleted Frame? pRef != pAttr->GetRef()" );
     return pRef;
@@ -3297,7 +3289,7 @@ const SwCntntFrm* SwFtnFrm::GetRef() const
 SwCntntFrm* SwFtnFrm::GetRef()
 {
     const SwCntntFrm* pRefAttr = GetRefFromAttr();
-    ASSERT( pRef == pRefAttr || pRef->IsAnFollow( pRefAttr )
+    OSL_ENSURE( pRef == pRefAttr || pRef->IsAnFollow( pRefAttr )
             || pRefAttr->IsAnFollow( pRef ),
             "access to deleted Frame? pRef != pAttr->GetRef()" );
     return pRef;
@@ -3313,7 +3305,7 @@ const SwCntntFrm* SwFtnFrm::GetRefFromAttr()  const
 
 SwCntntFrm* SwFtnFrm::GetRefFromAttr()
 {
-    ASSERT( pAttr, "invalid Attribute" );
+    OSL_ENSURE( pAttr, "invalid Attribute" );
     SwTxtNode& rTNd = (SwTxtNode&)pAttr->GetTxtNode();
     SwPosition aPos( rTNd, SwIndex( &rTNd, *pAttr->GetStart() ));
     SwCntntFrm* pCFrm = rTNd.GetFrm( 0, &aPos, FALSE );
diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx
index ee34ff024577..1af53c9ab927 100644
--- a/sw/source/core/layout/hffrm.cxx
+++ b/sw/source/core/layout/hffrm.cxx
@@ -126,7 +126,7 @@ SwHeadFootFrm::SwHeadFootFrm( SwFrmFmt * pFmt, USHORT nTypeIn)
 
     const SwFmtCntnt &rCnt = pFmt->GetCntnt();
 
-    ASSERT( rCnt.GetCntntIdx(), "Kein Inhalt fuer Header." );
+    OSL_ENSURE( rCnt.GetCntntIdx(), "Kein Inhalt fuer Header." );
 
     //Fuer Header Footer die Objekte gleich erzeugen lassen.
     BOOL bOld = bObjsDirect;
@@ -282,7 +282,7 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs)
                     // --> OD 2005-05-03 #i46941# - frame has to be valid.
                     // Note: frame could be invalid after calling its format,
                     //       if it's locked
-                    ASSERT( StackHack::IsLocked() || !pFrm->IsTxtFrm() ||
+                    OSL_ENSURE( StackHack::IsLocked() || !pFrm->IsTxtFrm() ||
                             pFrm->IsValid() ||
                             static_cast<SwTxtFrm*>(pFrm)->IsJoinLocked(),
                             "<SwHeadFootFrm::FormatSize(..)> - text frame invalid and not locked." );
@@ -418,7 +418,7 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs)
 
 void SwHeadFootFrm::Format(const SwBorderAttrs * pAttrs)
 {
-    ASSERT( pAttrs, "SwFooterFrm::Format, pAttrs ist 0." );
+    OSL_ENSURE( pAttrs, "SwFooterFrm::Format, pAttrs ist 0." );
 
     if ( bValidPrtArea && bValidSize )
         return;
@@ -459,7 +459,7 @@ SwTwips SwHeadFootFrm::GrowFrm( SwTwips nDist, BOOL bTst,  BOOL bInfo )
 
         SwBorderAttrAccess * pAccess =
             new SwBorderAttrAccess( SwFrm::GetCache(), this );
-        ASSERT(pAccess, "no border attributes");
+        OSL_ENSURE(pAccess, "no border attributes");
 
         SwBorderAttrs * pAttrs = pAccess->Get();
 
@@ -592,7 +592,7 @@ SwTwips SwHeadFootFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
 
             SwBorderAttrAccess * pAccess =
                 new SwBorderAttrAccess( SwFrm::GetCache(), this );
-            ASSERT(pAccess, "no border attributes");
+            OSL_ENSURE(pAccess, "no border attributes");
 
             SwBorderAttrs * pAttrs = pAccess->Get();
 
@@ -662,7 +662,7 @@ SwTwips SwHeadFootFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
 BOOL SwHeadFootFrm::GetEatSpacing() const
 {
     const SwFrmFmt * pFmt = GetFmt();
-    ASSERT(pFmt, "SwHeadFootFrm: no format?");
+    OSL_ENSURE(pFmt, "SwHeadFootFrm: no format?");
 
     if (pFmt->GetHeaderAndFooterEatSpacing().GetValue())
         return TRUE;
@@ -715,7 +715,7 @@ void SwPageFrm::PrepareHeader()
 
     if ( bOn && rH.IsActive() )
     {   //Header einsetzen, vorher entfernen falls vorhanden.
-        ASSERT( rH.GetHeaderFmt(), "FrmFmt fuer Header nicht gefunden." );
+        OSL_ENSURE( rH.GetHeaderFmt(), "FrmFmt fuer Header nicht gefunden." );
 
         if ( pLay->GetFmt() == (SwFrmFmt*)rH.GetHeaderFmt() )
             return; //Der Footer ist bereits der richtige
@@ -727,7 +727,7 @@ void SwPageFrm::PrepareHeader()
             pDel->Cut();
             delete pDel;
         }
-        ASSERT( pLay, "Wohin mit dem Header?" );
+        OSL_ENSURE( pLay, "Wohin mit dem Header?" );
         SwHeaderFrm *pH = new SwHeaderFrm( (SwFrmFmt*)rH.GetHeaderFmt() );
         pH->Paste( this, pLay );
         if ( GetUpper() )
@@ -765,7 +765,7 @@ void SwPageFrm::PrepareFooter()
 
     if ( bOn && rF.IsActive() )
     {   //Footer einsetzen, vorher entfernen falls vorhanden.
-        ASSERT( rF.GetFooterFmt(), "FrmFmt fuer Footer nicht gefunden." );
+        OSL_ENSURE( rF.GetFooterFmt(), "FrmFmt fuer Footer nicht gefunden." );
 
         if ( pLay->GetFmt() == (SwFrmFmt*)rF.GetFooterFmt() )
             return; //Der Footer ist bereits der richtige.
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 7a93d4edc55e..ed0ffef89ea3 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -112,7 +112,7 @@
 
 
 //Sparen von Schreibarbeit um den Zugriff auf zerstoerte Seiten zu vermeiden.
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
 static void BreakPoint()
 {
@@ -400,7 +400,7 @@ SwLayAction::SwLayAction( SwRootFrm *pRt, SwViewImp *pI ) :
 
 SwLayAction::~SwLayAction()
 {
-    ASSERT( !pWait, "Wait object not destroyed" );
+    OSL_ENSURE( !pWait, "Wait object not destroyed" );
     pImp->pLayAct = 0;      //Abmelden
 }
 
@@ -589,7 +589,7 @@ class NotifyLayoutOfPageInProgress
 
 void SwLayAction::InternalAction()
 {
-    ASSERT( pRoot->Lower()->IsPageFrm(), ":-( Keine Seite unterhalb der Root.");
+    OSL_ENSURE( pRoot->Lower()->IsPageFrm(), ":-( Keine Seite unterhalb der Root.");
 
     pRoot->Calc();
 
@@ -720,7 +720,8 @@ void SwLayAction::InternalAction()
                             if ( ++nLoopControlRuns_1 > nLoopControlMax )
                             {
 #if OSL_DEBUG_LEVEL > 1
-                                ASSERT( false, "LoopControl_1 in SwLayAction::InternalAction" )
+                                OSL_ENSURE( false, "LoopControl_1 in SwLayAction::InternalAction" );
+
 #endif
                                 break;
                             }
@@ -914,7 +915,7 @@ void SwLayAction::InternalAction()
                     if ( ++nLoopControlRuns_3 > nLoopControlMax )
                     {
 #if OSL_DEBUG_LEVEL > 1
-                        ASSERT( false, "LoopControl_3 in Interrupt formatting in SwLayAction::InternalAction" )
+                        OSL_ENSURE( false, "LoopControl_3 in Interrupt formatting in SwLayAction::InternalAction" );
 #endif
                         break;
                     }
@@ -939,7 +940,7 @@ void SwLayAction::InternalAction()
                     if ( ++nLoopControlRuns_2 > nLoopControlMax )
                     {
 #if OSL_DEBUG_LEVEL > 1
-                        ASSERT( false, "LoopControl_2 in Interrupt formatting in SwLayAction::InternalAction" )
+                        OSL_ENSURE( false, "LoopControl_2 in Interrupt formatting in SwLayAction::InternalAction" );
 #endif
                         break;
                     }
@@ -1086,7 +1087,7 @@ static bool lcl_IsInvaLay( const SwFrm *pFrm, long nBottom )
 
 static const SwFrm *lcl_FindFirstInvaLay( const SwFrm *pFrm, long nBottom )
 {
-    ASSERT( pFrm->IsLayoutFrm(), "FindFirstInvaLay, no LayFrm" );
+    OSL_ENSURE( pFrm->IsLayoutFrm(), "FindFirstInvaLay, no LayFrm" );
 
     if (lcl_IsInvaLay(pFrm, nBottom))
         return pFrm;
@@ -1156,7 +1157,7 @@ static const SwFrm *lcl_FindFirstInvaCntnt( const SwLayoutFrm *pLay, long nBotto
 static const SwAnchoredObject* lcl_FindFirstInvaObj( const SwPageFrm* _pPage,
                                               long _nBottom )
 {
-    ASSERT( _pPage->GetSortedObjs(), "FindFirstInvaObj, no Objs" )
+    OSL_ENSURE( _pPage->GetSortedObjs(), "FindFirstInvaObj, no Objs" );
 
     for ( USHORT i = 0; i < _pPage->GetSortedObjs()->Count(); ++i )
     {
@@ -1417,7 +1418,7 @@ BOOL SwLayAction::IsShortCut( SwPageFrm *&prPage )
 // OD 15.11.2002 #105155# - introduce support for vertical layout
 BOOL SwLayAction::FormatLayout( SwLayoutFrm *pLay, BOOL bAddRect )
 {
-    ASSERT( !IsAgain(), "Ungueltige Seite beachten." );
+    OSL_ENSURE( !IsAgain(), "Ungueltige Seite beachten." );
     if ( IsAgain() )
         return FALSE;
 
@@ -1632,7 +1633,7 @@ BOOL SwLayAction::FormatLayout( SwLayoutFrm *pLay, BOOL bAddRect )
 
 BOOL SwLayAction::FormatLayoutFly( SwFlyFrm* pFly )
 {
-    ASSERT( !IsAgain(), "Ungueltige Seite beachten." );
+    OSL_ENSURE( !IsAgain(), "Ungueltige Seite beachten." );
     if ( IsAgain() )
         return FALSE;
 
@@ -1682,7 +1683,7 @@ BOOL SwLayAction::FormatLayoutFly( SwFlyFrm* pFly )
 // Implement vertical layout support
 BOOL SwLayAction::FormatLayoutTab( SwTabFrm *pTab, BOOL bAddRect )
 {
-    ASSERT( !IsAgain(), "8-) Ungueltige Seite beachten." );
+    OSL_ENSURE( !IsAgain(), "8-) Ungueltige Seite beachten." );
     if ( IsAgain() || !pTab->Lower() )
         return FALSE;
 
@@ -2142,7 +2143,7 @@ BOOL SwLayAction::IsStopPrt() const
 |*************************************************************************/
 BOOL SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt, IdleJobType eJob )
 {
-    ASSERT( pCnt->IsTxtFrm(), "NoTxt neighbour of Txt" );
+    OSL_ENSURE( pCnt->IsTxtFrm(), "NoTxt neighbour of Txt" );
     // robust against misuse by e.g. #i52542#
     if( !pCnt->IsTxtFrm() )
         return FALSE;
@@ -2280,7 +2281,7 @@ BOOL SwLayIdle::DoIdleJob( IdleJobType eJob, BOOL bVisAreaOnly )
                 !SwSmartTagMgr::Get().IsSmartTagsEnabled() )
                 return FALSE;
             break;
-        default: ASSERT( false, "Unknown idle job type" )
+        default: OSL_ENSURE( false, "Unknown idle job type" );
     }
 
     SwPageFrm *pPage;
@@ -2345,7 +2346,7 @@ BOOL SwLayIdle::DoIdleJob( IdleJobType eJob, BOOL bVisAreaOnly )
 }
 
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 #if OSL_DEBUG_LEVEL > 1
 
 /*************************************************************************
@@ -2394,7 +2395,7 @@ void SwLayIdle::ShowIdle( ColorData eColorData )
 SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
     pRoot( pRt ),
     pImp( pI )
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 #if OSL_DEBUG_LEVEL > 1
     , bIndicator( FALSE )
 #endif
@@ -2578,7 +2579,7 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
     if( pImp->IsAccessible() )
         pImp->FireAccessibleEvents();
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 #if OSL_DEBUG_LEVEL > 1
     if ( bIndicator && pImp->GetShell()->GetWin() )
     {
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index db86b90031f3..aceadd8c91bf 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -252,7 +252,7 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc )
                                     pSub = pSub->GetNext();
                                 }
                                 pTab = pTab->GetFollow();
-                                ASSERT( pTab, "Table follow without master" );
+                                OSL_ENSURE( pTab, "Table follow without master" );
                             }
                         }
                         do
@@ -290,7 +290,7 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc )
                                     SwPageFrm *pTabPage = pTab->FindPageFrm();
                                     if( pTabPage != pPage )
                                     {
-                                        ASSERT( pPage->GetPhyPageNum() <
+                                        OSL_ENSURE( pPage->GetPhyPageNum() <
                                                 pTabPage->GetPhyPageNum(),
                                                 "Looping Tableframes" );
                                         pPage = pTabPage;
@@ -345,7 +345,7 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc )
     }
 }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 sal_Bool SwLayoutCache::CompareLayout( const SwDoc& rDoc ) const
 {
     sal_Bool bRet = sal_True;
@@ -472,7 +472,7 @@ void SwLayoutCache::ClearImpl()
 
 SwLayoutCache::~SwLayoutCache()
 {
-    ASSERT( !nLockCount, "Deleting a locked SwLayoutCache!?" );
+    OSL_ENSURE( !nLockCount, "Deleting a locked SwLayoutCache!?" );
     delete pImpl;
 }
 
@@ -541,7 +541,7 @@ SwLayHelper::~SwLayHelper()
 {
     if( pImpl )
     {
-        ASSERT( pDoc && pDoc->GetLayoutCache(), "Missing layoutcache" );
+        OSL_ENSURE( pDoc && pDoc->GetLayoutCache(), "Missing layoutcache" );
         pDoc->GetLayoutCache()->UnlockImpl();
     }
 }
@@ -659,18 +659,18 @@ BOOL SwLayHelper::CheckInsertPage()
                          bNextPageOdd, bInsertEmpty, FALSE, rpPage->GetNext() );
         if ( bEnd )
         {
-            ASSERT( rpPage->GetNext(), "Keine neue Seite?" );
+            OSL_ENSURE( rpPage->GetNext(), "Keine neue Seite?" );
             do
             {   rpPage = (SwPageFrm*)rpPage->GetNext();
             } while ( rpPage->GetNext() );
         }
         else
         {
-            ASSERT( rpPage->GetNext(), "Keine neue Seite?" );
+            OSL_ENSURE( rpPage->GetNext(), "Keine neue Seite?" );
             rpPage = (SwPageFrm*)rpPage->GetNext();
             if ( rpPage->IsEmptyPage() )
             {
-                ASSERT( rpPage->GetNext(), "Keine neue Seite?" );
+                OSL_ENSURE( rpPage->GetNext(), "Keine neue Seite?" );
                 rpPage = (SwPageFrm*)rpPage->GetNext();
             }
         }
@@ -892,7 +892,7 @@ BOOL SwLayHelper::CheckInsert( ULONG nNodeIndex )
                                 SwRowFrm* pHeadline = 0;
                                 while( nRowIdx < nRepeat )
                                 {
-                                    ASSERT( pTab->GetTable()->GetTabLines()[ nRowIdx ], "Table ohne Zeilen?" );
+                                    OSL_ENSURE( pTab->GetTable()->GetTabLines()[ nRowIdx ], "Table ohne Zeilen?" );
                                     pHeadline =
                                         new SwRowFrm( *pTab->GetTable()->GetTabLines()[ nRowIdx ] );
                                     pHeadline->SetRepeatedHeadline( true );
@@ -1025,59 +1025,6 @@ void SwLayHelper::_CheckFlyCache( SwPageFrm* pPage )
         SwSortedObjs &rObjs = *pPage->GetSortedObjs();
         USHORT nPgNum = pPage->GetPhyPageNum();
 
-/*
-
-        //
-        // NOTE: This code assumes that all objects have already been
-        // inserted into the drawing layout, so that the cached objects
-        // can be identified by their ordnum. Unfortunately this function
-        // is called with page n if page n+1 has been inserted. Thus
-        // not all the objects have been inserted and the ordnums cannot
-        // be used to identify the objects.
-        //
-
-        for ( USHORT i = 0; i < rObjs.Count(); ++i )  // check objects
-        {
-            SdrObject *pO = rObjs[i];
-            if ( pO->ISA(SwVirtFlyDrawObj) )  // a text frame?
-            {
-                SwFlyFrm *pFly = ((SwVirtFlyDrawObj*)pO)->GetFlyFrm();
-                if( pFly->Frm().Left() == WEIT_WECH && pFly->GetAnchor() &&
-                    !pFly->GetAnchor()->FindFooterOrHeader() )
-                {   // Only frame with default position and not in header/footer
-                    const SwContact *pC = (SwContact*)GetUserCall(pO);
-                    if( pC )
-                    {
-                        ULONG nOrdNum = pO->GetOrdNum(); // the Id
-                        SwFlyCache* pFlyC;
-                        while( nFlyIdx < nFlyCount && ( pFlyC = pImpl->
-                               GetFlyCache(nFlyIdx) )->nPageNum < nPgNum)
-                            ++nFlyIdx;
-                        if( nFlyIdx < nFlyCount &&
-                            pFlyC->nPageNum == nPgNum )
-                        {
-                            USHORT nIdx = nFlyIdx;
-                            while( nIdx < nFlyCount && ( pFlyC = pImpl->
-                                   GetFlyCache( nIdx ) )->nPageNum == nPgNum &&
-                                   pFlyC->nOrdNum != nOrdNum )
-                                ++nIdx;
-                            if( nIdx < nFlyCount && pFlyC->nPageNum == nPgNum &&
-                                pFlyC->nOrdNum == nOrdNum )
-                            {   // we get the stored information
-                                pFly->Frm().Pos().X() = pFlyC->Left() +
-                                                        pPage->Frm().Left();
-                                pFly->Frm().Pos().Y() = pFlyC->Top() +
-                                                        pPage->Frm().Top();
-                                pFly->Frm().Width( pFlyC->Width() );
-                                pFly->Frm().Height( pFlyC->Height() );
-                            }
-                        }
-                    }
-                }
-            }
-        }
- */
-
         //
         // NOTE: Here we do not use the absolute ordnums but
         // relative ordnums for the objects on this page.
@@ -1240,7 +1187,7 @@ BOOL SwLayCacheIoImpl::OpenRec( BYTE cType )
 {
     BOOL bRes = TRUE;
     UINT16 nLvl = aRecTypes.Count();
-    ASSERT( nLvl == aRecSizes.Count(), "OpenRec: Level" );
+    OSL_ENSURE( nLvl == aRecSizes.Count(), "OpenRec: Level" );
     UINT32 nPos = pStream->Tell();
     if( bWriteMode )
     {
@@ -1259,8 +1206,8 @@ BOOL SwLayCacheIoImpl::OpenRec( BYTE cType )
         if( !nVal || cRecTyp != cType ||
             pStream->GetErrorCode() != SVSTREAM_OK || pStream->IsEof() )
         {
-            ASSERT( nVal, "OpenRec: Record-Header is 0" );
-            ASSERT( cRecTyp == cType,
+            OSL_ENSURE( nVal, "OpenRec: Record-Header is 0" );
+            OSL_ENSURE( cRecTyp == cType,
                     "OpenRec: Wrong Record Type" );
             aRecTypes[nLvl] = 0;
             aRecSizes[nLvl] = pStream->Tell();
@@ -1277,8 +1224,8 @@ BOOL SwLayCacheIoImpl::CloseRec( BYTE )
 {
     BOOL bRes = TRUE;
     UINT16 nLvl = aRecTypes.Count();
-    ASSERT( nLvl == aRecSizes.Count(), "CloseRec: wrong Level" );
-    ASSERT( nLvl, "CloseRec: no levels" );
+    OSL_ENSURE( nLvl == aRecSizes.Count(), "CloseRec: wrong Level" );
+    OSL_ENSURE( nLvl, "CloseRec: no levels" );
     if( nLvl )
     {
         nLvl--;
@@ -1297,7 +1244,7 @@ BOOL SwLayCacheIoImpl::CloseRec( BYTE )
         else
         {
             UINT32 n = aRecSizes[nLvl];
-            ASSERT( n >= nPos, "CloseRec: to much data read" );
+            OSL_ENSURE( n >= nPos, "CloseRec: to much data read" );
             if( n != nPos )
             {
                 pStream->Seek( n );
@@ -1360,7 +1307,7 @@ void SwLayCacheIoImpl::SkipRec()
 
 BYTE SwLayCacheIoImpl::OpenFlagRec()
 {
-    ASSERT( !bWriteMode, "OpenFlagRec illegal in write  mode" );
+    OSL_ENSURE( !bWriteMode, "OpenFlagRec illegal in write  mode" );
     BYTE cFlags;
     *pStream >> cFlags;
     nFlagRecEnd = pStream->Tell() + ( cFlags & 0x0F );
@@ -1369,9 +1316,9 @@ BYTE SwLayCacheIoImpl::OpenFlagRec()
 
 void SwLayCacheIoImpl::OpenFlagRec( BYTE nFlags, BYTE nLen )
 {
-    ASSERT( bWriteMode, "OpenFlagRec illegal in read  mode" );
-    ASSERT( (nFlags & 0xF0) == 0, "illegal flags set" );
-    ASSERT( nLen < 16, "wrong flag record length" );
+    OSL_ENSURE( bWriteMode, "OpenFlagRec illegal in read  mode" );
+    OSL_ENSURE( (nFlags & 0xF0) == 0, "illegal flags set" );
+    OSL_ENSURE( nLen < 16, "wrong flag record length" );
     BYTE cFlags = (nFlags << 4) + nLen;
     *pStream << cFlags;
     nFlagRecEnd = pStream->Tell() + nLen;
@@ -1381,11 +1328,11 @@ void SwLayCacheIoImpl::CloseFlagRec()
 {
     if( bWriteMode )
     {
-        ASSERT( pStream->Tell() == nFlagRecEnd, "Wrong amount of data written" );
+        OSL_ENSURE( pStream->Tell() == nFlagRecEnd, "Wrong amount of data written" );
     }
     else
     {
-        ASSERT( pStream->Tell() <= nFlagRecEnd, "To many data read" );
+        OSL_ENSURE( pStream->Tell() <= nFlagRecEnd, "To many data read" );
         if( pStream->Tell() != nFlagRecEnd )
             pStream->Seek( nFlagRecEnd );
     }
diff --git a/sw/source/core/layout/layouter.cxx b/sw/source/core/layout/layouter.cxx
index 69eadae34689..ceea99885a5e 100644
--- a/sw/source/core/layout/layouter.cxx
+++ b/sw/source/core/layout/layouter.cxx
@@ -80,7 +80,7 @@ public:
 
 void SwEndnoter::CollectEndnotes( SwSectionFrm* pSct )
 {
-    ASSERT( pSct, "CollectEndnotes: Which section?" );
+    OSL_ENSURE( pSct, "CollectEndnotes: Which section?" );
     if( !pSect )
         pSect = pSct;
     else if( pSct != pSect )
@@ -110,7 +110,7 @@ void SwEndnoter::CollectEndnote( SwFtnFrm* pFtn )
                 } while ( pCnt );
             }
             else
-            {   ASSERT( pNxt->Lower() && pNxt->Lower()->IsSctFrm(),
+            { OSL_ENSURE( pNxt->Lower() && pNxt->Lower()->IsSctFrm(),
                         "Endnote without content?" );
                 pNxt->Cut();
                 delete pNxt;
@@ -147,7 +147,7 @@ void SwEndnoter::InsertEndnotes()
         pSect = NULL;
         return;
     }
-    ASSERT( pSect->Lower() && pSect->Lower()->IsFtnBossFrm(),
+    OSL_ENSURE( pSect->Lower() && pSect->Lower()->IsFtnBossFrm(),
             "InsertEndnotes: Where's my column?" );
     SwFrm* pRef = pSect->FindLastCntnt( FINDMODE_MYLAST );
     SwFtnBossFrm *pBoss = pRef ? pRef->FindFtnBossFrm()
@@ -160,7 +160,7 @@ void SwEndnoter::InsertEndnotes()
 
 SwLooping::SwLooping( SwPageFrm* pPage )
 {
-    ASSERT( pPage, "Where's my page?" );
+    OSL_ENSURE( pPage, "Where's my page?" );
     nMinPage = pPage->GetPhyPageNum();
     nMaxPage = nMinPage;
     nCount = 0;
@@ -199,7 +199,7 @@ void SwLooping::Control( SwPageFrm* pPage )
     }
     else if( ++nCount > LOOP_DETECT )
     {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 #if OSL_DEBUG_LEVEL > 1
         static BOOL bNoLouie = FALSE;
         if( bNoLouie )
@@ -209,9 +209,9 @@ void SwLooping::Control( SwPageFrm* pPage )
 
         // FME 2007-08-30 #i81146# new loop control
 #if OSL_DEBUG_LEVEL > 1
-        ASSERT( 0 != mnLoopControlStage, "Looping Louie: Stage 1!" );
-        ASSERT( 1 != mnLoopControlStage, "Looping Louie: Stage 2!!" );
-        ASSERT( 2 >  mnLoopControlStage, "Looping Louie: Stage 3!!!" );
+        OSL_ENSURE( 0 != mnLoopControlStage, "Looping Louie: Stage 1!" );
+        OSL_ENSURE( 1 != mnLoopControlStage, "Looping Louie: Stage 2!!" );
+        OSL_ENSURE( 2 >  mnLoopControlStage, "Looping Louie: Stage 3!!!" );
 #endif
 
         Drastic( pPage->Lower() );
@@ -286,7 +286,7 @@ void SwLayouter::InsertEndnotes( SwSectionFrm* pSect )
 
 void SwLayouter::LoopControl( SwPageFrm* pPage, BYTE )
 {
-    ASSERT( pLooping, "Looping: Lost control" );
+    OSL_ENSURE( pLooping, "Looping: Lost control" );
     pLooping->Control( pPage );
 }
 
@@ -295,7 +295,7 @@ void SwLayouter::LoopingLouieLight( const SwDoc& rDoc, const SwTxtFrm& rFrm )
     if ( pLooping && pLooping->IsLoopingLouieLight() )
     {
 #if OSL_DEBUG_LEVEL > 1
-        ASSERT( false, "Looping Louie (Light): Fixating fractious frame" )
+        OSL_ENSURE( false, "Looping Louie (Light): Fixating fractious frame" );
 #endif
         SwLayouter::InsertMovedFwdFrm( rDoc, rFrm, rFrm.FindPageFrm()->GetPhyPageNum() );
     }
@@ -317,7 +317,7 @@ void SwLayouter::EndLoopControl()
 
 void SwLayouter::CollectEndnotes( SwDoc* pDoc, SwSectionFrm* pSect )
 {
-    ASSERT( pDoc, "No doc, no fun" );
+    OSL_ENSURE( pDoc, "No doc, no fun" );
     if( !pDoc->GetLayouter() )
         pDoc->SetLayouter( new SwLayouter() );
     pDoc->GetLayouter()->_CollectEndnotes( pSect );
@@ -341,7 +341,7 @@ BOOL SwLayouter::Collecting( SwDoc* pDoc, SwSectionFrm* pSect, SwFtnFrm* pFtn )
 
 BOOL SwLayouter::StartLoopControl( SwDoc* pDoc, SwPageFrm *pPage )
 {
-    ASSERT( pDoc, "No doc, no fun" );
+    OSL_ENSURE( pDoc, "No doc, no fun" );
     if( !pDoc->GetLayouter() )
         pDoc->SetLayouter( new SwLayouter() );
     return !pDoc->GetLayouter()->pLooping &&
diff --git a/sw/source/core/layout/makefile.mk b/sw/source/core/layout/makefile.mk
index 7019203aa20f..e986ec8cf4ae 100644
--- a/sw/source/core/layout/makefile.mk
+++ b/sw/source/core/layout/makefile.mk
@@ -48,23 +48,8 @@ CDEFS+=-DDEBUG
 
 EXCEPTIONSFILES = \
     $(SLO)$/anchoreddrawobject.obj \
-    $(SLO)$/flycnt.obj \
-    $(SLO)$/laycache.obj \
-    $(SLO)$/layouter.obj \
-    $(SLO)$/movedfwdfrmsbyobjpos.obj \
-    $(SLO)$/newfrm.obj \
-    $(SLO)$/objectformatter.obj \
-    $(SLO)$/objstmpconsiderwrapinfl.obj \
-    $(SLO)$/paintfrm.obj \
-    $(SLO)$/softpagebreak.obj \
-    $(SLO)$/sortedobjsimpl.obj \
-    $(SLO)$/pagechg.obj
-
-
-SLOFILES =  \
-    $(SLO)$/atrfrm.obj \
     $(SLO)$/anchoredobject.obj \
-    $(SLO)$/anchoreddrawobject.obj \
+    $(SLO)$/atrfrm.obj \
     $(SLO)$/calcmove.obj \
     $(SLO)$/colfrm.obj \
     $(SLO)$/findfrm.obj \
@@ -83,25 +68,28 @@ SLOFILES =  \
     $(SLO)$/movedfwdfrmsbyobjpos.obj \
     $(SLO)$/newfrm.obj \
     $(SLO)$/objectformatter.obj \
-    $(SLO)$/objectformattertxtfrm.obj \
-    $(SLO)$/objectformatterlayfrm.obj \
     $(SLO)$/objstmpconsiderwrapinfl.obj \
     $(SLO)$/pagechg.obj \
     $(SLO)$/pagedesc.obj \
     $(SLO)$/paintfrm.obj \
     $(SLO)$/sectfrm.obj \
     $(SLO)$/softpagebreak.obj \
-    $(SLO)$/sortedobjs.obj \
     $(SLO)$/sortedobjsimpl.obj \
     $(SLO)$/ssfrm.obj \
-    $(SLO)$/swselectionlist.obj \
     $(SLO)$/tabfrm.obj \
     $(SLO)$/trvlfrm.obj \
-    $(SLO)$/unusedf.obj \
     $(SLO)$/virtoutp.obj \
     $(SLO)$/wsfrm.obj
 
-.IF "$(dbgutil)"!=""
+SLOFILES =  \
+    $(EXCEPTIONSFILES) \
+    $(SLO)$/objectformattertxtfrm.obj \
+    $(SLO)$/objectformatterlayfrm.obj \
+    $(SLO)$/sortedobjs.obj \
+    $(SLO)$/swselectionlist.obj \
+    $(SLO)$/unusedf.obj
+
+.IF "$(DBG_LEVEL)">="2"
 SLOFILES +=  \
         $(SLO)$/dbg_lay.obj
 .ENDIF
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index 4d3cfe3917f5..e3deaad3569e 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -309,7 +309,7 @@ void _FrmInit()
 {
     SwRootFrm::pVout = new SwLayVout();
     SwCache *pNew = new SwCache( 100, 100
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     , "static SwBorderAttrs::pCache"
 #endif
     );
@@ -320,13 +320,13 @@ void _FrmInit()
 
 void _FrmFinit()
 {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     // im Chache duerfen nur noch 0-Pointer stehen
     for( USHORT n = SwFrm::GetCachePtr()->Count(); n; )
         if( (*SwFrm::GetCachePtr())[ --n ] )
         {
             SwCacheObj* pObj = (*SwFrm::GetCachePtr())[ n ];
-            ASSERT( !pObj, "Wer hat sich nicht ausgetragen?")
+            OSL_ENSURE( !pObj, "Wer hat sich nicht ausgetragen?");
         }
 #endif
     delete SwRootFrm::pVout;
@@ -348,7 +348,7 @@ SV_IMPL_PTRARR_SORT(SwCurrShells,CurrShellPtr)
 
 CurrShell::CurrShell( ViewShell *pNew )
 {
-    ASSERT( pNew, "0-Shell einsetzen?" );
+    OSL_ENSURE( pNew, "0-Shell einsetzen?" );
     pRoot = pNew->GetLayout();
     if ( pRoot )
     {
@@ -561,7 +561,7 @@ SwRootFrm::~SwRootFrm()
 
     delete pCurrShells;
 
-    ASSERT( 0==nAccessibleShells, "Some accessible shells are left" );
+    OSL_ENSURE( 0==nAccessibleShells, "Some accessible shells are left" );
 }
 
 /*************************************************************************
diff --git a/sw/source/core/layout/objectformatter.cxx b/sw/source/core/layout/objectformatter.cxx
index f059bd1db87f..984f3379ec6d 100644
--- a/sw/source/core/layout/objectformatter.cxx
+++ b/sw/source/core/layout/objectformatter.cxx
@@ -118,7 +118,7 @@ class SwPageNumAndTypeOfAnchors
             return bRetObj;
         }
 
-        inline sal_uInt32 GetPageNum( sal_uInt32 _nIndex )
+        inline sal_uInt32 GetPageNum( sal_uInt32 _nIndex ) const
         {
             sal_uInt32 nRetPgNum = 0L;
 
@@ -191,7 +191,7 @@ SwObjectFormatter* SwObjectFormatter::CreateObjFormatter(
     }
     else
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "<SwObjectFormatter::CreateObjFormatter(..)> - unexcepted type of anchor frame" );
     }
 
@@ -233,11 +233,11 @@ bool SwObjectFormatter::FormatObj( SwAnchoredObject& _rAnchoredObj,
 {
     bool bSuccess( true );
 
-    ASSERT( _pAnchorFrm || _rAnchoredObj.GetAnchorFrm(),
+    OSL_ENSURE( _pAnchorFrm || _rAnchoredObj.GetAnchorFrm(),
             "<SwObjectFormatter::FormatObj(..)> - missing anchor frame" );
     SwFrm& rAnchorFrm = _pAnchorFrm ? *(_pAnchorFrm) : *(_rAnchoredObj.AnchorFrm());
 
-    ASSERT( _pPageFrm || rAnchorFrm.FindPageFrm(),
+    OSL_ENSURE( _pPageFrm || rAnchorFrm.FindPageFrm(),
             "<SwObjectFormatter::FormatObj(..)> - missing page frame" );
     const SwPageFrm& rPageFrm = _pPageFrm ? *(_pPageFrm) : *(rAnchorFrm.FindPageFrm());
 
@@ -409,7 +409,7 @@ void SwObjectFormatter::_FormatObj( SwAnchoredObject& _rAnchoredObj )
             if ( ++nLoopControlRuns >= nLoopControlMax )
             {
 #if OSL_DEBUG_LEVEL > 1
-                ASSERT( false, "LoopControl in SwObjectFormatter::_FormatObj: Stage 3!!!" );
+                OSL_ENSURE( false, "LoopControl in SwObjectFormatter::_FormatObj: Stage 3!!!" );
 #endif
                 rFlyFrm.ValidateThisAndAllLowers( 2 );
                 nLoopControlRuns = 0;
@@ -491,7 +491,7 @@ bool SwObjectFormatter::_FormatObjsAtFrm( SwTxtFrm* _pMasterTxtFrm )
         // is replaced by method <FindPageFrmOfAnchor()>. It's return value
         // have to be checked.
         SwPageFrm* pPageFrmOfAnchor = pAnchoredObj->FindPageFrmOfAnchor();
-        ASSERT( pPageFrmOfAnchor,
+        OSL_ENSURE( pPageFrmOfAnchor,
                 "<SwObjectFormatter::_FormatObjsAtFrm()> - missing page frame." );
         // --> OD 2004-10-08 #i26945#
         if ( pPageFrmOfAnchor && pPageFrmOfAnchor == &mrPageFrm )
diff --git a/sw/source/core/layout/objectformatterlayfrm.cxx b/sw/source/core/layout/objectformatterlayfrm.cxx
index 1eb33065ba5b..b8c0086fb542 100644
--- a/sw/source/core/layout/objectformatterlayfrm.cxx
+++ b/sw/source/core/layout/objectformatterlayfrm.cxx
@@ -61,7 +61,7 @@ SwObjectFormatterLayFrm* SwObjectFormatterLayFrm::CreateObjFormatter(
     if ( !_rAnchorLayFrm.IsPageFrm() &&
          !_rAnchorLayFrm.IsFlyFrm() )
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "<SwObjectFormatterLayFrm::CreateObjFormatter(..)> - unexcepted type of anchor frame " );
         return 0L;
     }
@@ -130,7 +130,7 @@ bool SwObjectFormatterLayFrm::_AdditionalFormatObjsOnPage()
 {
     if ( !GetAnchorFrm().IsPageFrm() )
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "<SwObjectFormatterLayFrm::_AdditionalFormatObjsOnPage()> - mis-usage of method, call only for anchor frames of type page frame" );
         return true;
     }
@@ -172,8 +172,8 @@ bool SwObjectFormatterLayFrm::_AdditionalFormatObjsOnPage()
         SwPageFrm* pPageFrmOfAnchor = pAnchoredObj->FindPageFrmOfAnchor();
         // --> OD 2004-10-08 #i26945# - check, if the page frame of the
         // object's anchor frame isn't the given page frame
-        ASSERT( pPageFrmOfAnchor,
-                "<SwObjectFormatterLayFrm::_AdditionalFormatObjsOnPage()> - missing page frame" )
+        OSL_ENSURE( pPageFrmOfAnchor,
+                "<SwObjectFormatterLayFrm::_AdditionalFormatObjsOnPage()> - missing page frame" );
         if ( pPageFrmOfAnchor &&
              // --> OD 2004-10-22 #i35911#
              pPageFrmOfAnchor->GetPhyPageNum() < rPageFrm.GetPhyPageNum() )
diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx
index 5a01043971de..b71529f97739 100644
--- a/sw/source/core/layout/objectformattertxtfrm.cxx
+++ b/sw/source/core/layout/objectformattertxtfrm.cxx
@@ -103,7 +103,7 @@ SwObjectFormatterTxtFrm* SwObjectFormatterTxtFrm::CreateObjFormatter(
     if ( _rAnchorTxtFrm.IsFollow() )
     {
         pMasterOfAnchorFrm = _rAnchorTxtFrm.FindMaster();
-        while ( pMasterOfAnchorFrm->IsFollow() )
+        while ( pMasterOfAnchorFrm && pMasterOfAnchorFrm->IsFollow() )
         {
             pMasterOfAnchorFrm = pMasterOfAnchorFrm->FindMaster();
         }
@@ -240,7 +240,7 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
                     }
                     else
                     {
-                        ASSERT( false,
+                        OSL_ENSURE( false,
                                 "<SwObjectFormatterTxtFrm::DoFormatObj(..)> - anchor frame not marked to move forward" );
                     }
                 }
@@ -252,7 +252,7 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
                 // index of anchored object in collection of page numbers and
                 // anchor types
                 sal_uInt32 nIdx( CountOfCollected() );
-                ASSERT( nIdx > 0,
+                OSL_ENSURE( nIdx > 0,
                         "<SwObjectFormatterTxtFrm::DoFormatObj(..)> - anchored object not collected!?" );
                 --nIdx;
 
@@ -300,7 +300,7 @@ bool SwObjectFormatterTxtFrm::DoFormatObj( SwAnchoredObject& _rAnchoredObj,
                     }
                     else
                     {
-                        ASSERT( false,
+                        OSL_ENSURE( false,
                                 "<SwObjectFormatterTxtFrm::DoFormatObj(..)> - anchor frame not marked to move forward" );
                     }
                     // <--
@@ -341,7 +341,7 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs()
         else
         {
             // the anchor text frame has to be valid, thus assert.
-            ASSERT( false,
+            OSL_ENSURE( false,
                     "<SwObjectFormatterTxtFrm::DoFormatObjs()> called for invalidate anchor text frame." );
         }
 
@@ -357,7 +357,7 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs()
         // are registered at the 'master' anchor text frame.
         // Thus, format the other floating screen objects through the 'master'
         // anchor text frame
-        ASSERT( mpMasterAnchorTxtFrm,
+        OSL_ENSURE( mpMasterAnchorTxtFrm,
                 "SwObjectFormatterTxtFrm::DoFormatObjs() - missing 'master' anchor text frame" );
         bSuccess = _FormatObjsAtFrm( mpMasterAnchorTxtFrm );
 
@@ -442,7 +442,7 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs()
                 }
                 else
                 {
-                    ASSERT( false,
+                    OSL_ENSURE( false,
                             "<SwObjectFormatterTxtFrm::DoFormatObjs(..)> - anchor frame not marked to move forward" );
                 }
             }
@@ -485,7 +485,7 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs()
             }
             else
             {
-                ASSERT( false,
+                OSL_ENSURE( false,
                         "<SwObjectFormatterTxtFrm::DoFormatObjs(..)> - anchor frame not marked to move forward" );
             }
             // <--
@@ -573,7 +573,7 @@ SwAnchoredObject* SwObjectFormatterTxtFrm::_GetFirstObjWithMovedFwdAnchor(
                                     bool& _boInFollow )
 {
     // --> OD 2004-10-18 #i35017# - constant names have changed
-    ASSERT( _nWrapInfluenceOnPosition == text::WrapInfluenceOnPosition::ONCE_SUCCESSIVE ||
+    OSL_ENSURE( _nWrapInfluenceOnPosition == text::WrapInfluenceOnPosition::ONCE_SUCCESSIVE ||
             _nWrapInfluenceOnPosition == text::WrapInfluenceOnPosition::ONCE_CONCURRENT,
             "<SwObjectFormatterTxtFrm::_GetFirstObjWithMovedFwdAnchor(..)> - invalid value for parameter <_nWrapInfluenceOnPosition>" );
     // <--
@@ -658,7 +658,7 @@ bool SwObjectFormatterTxtFrm::CheckMovedFwdCondition(
          (_rAnchoredObj.GetFrmFmt().GetAnchor().GetAnchorId() == FLY_AT_PARA)))
     {
         SwFrm* pAnchorFrm = _rAnchoredObj.GetAnchorFrmContainingAnchPos();
-        ASSERT( pAnchorFrm->IsTxtFrm(),
+        OSL_ENSURE( pAnchorFrm->IsTxtFrm(),
                 "<SwObjectFormatterTxtFrm::CheckMovedFwdCondition(..) - wrong type of anchor frame>" );
         SwTxtFrm* pAnchorTxtFrm = static_cast<SwTxtFrm*>(pAnchorFrm);
         bool bCheck( false );
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 12556b2091ed..0f8bc6d667ee 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -346,11 +346,7 @@ void SwPageFrm::CheckDirection( BOOL bVert )
             bVertical = 0;
         else
             bVertical = 1;
-/*
-        if( pDesc && pDesc->GetName().GetChar(0)=='x')
-            bReverse = 1;
-        else
- */
+
             bReverse = 0;
         bInvalidVert = 0;
     }
@@ -419,7 +415,7 @@ void MA_FASTCALL lcl_MakeObjs( const SwSpzFrmFmts &rTbl, SwPageFrm *pPage )
             pSdrObj = 0;
             if ( bSdrObj  && 0 == (pSdrObj = pFmt->FindSdrObject()) )
             {
-                ASSERT( FALSE, "DrawObject not found." );
+                OSL_ENSURE( FALSE, "DrawObject not found." );
                 pFmt->GetDoc()->DelFrmFmt( pFmt );
                 --i;
                 continue;
@@ -592,17 +588,17 @@ void SwPageFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew,
             //Abgesehen von den Grossenverhaeltnissen sind noch andere
             //Dinge betroffen.
             //1. Spaltigkeit.
-            ASSERT( pOld && pNew, "FMT_CHG Missing Format." );
+            OSL_ENSURE( pOld && pNew, "FMT_CHG Missing Format." );
             const SwFmt* pOldFmt = ((SwFmtChg*)pOld)->pChangedFmt;
             const SwFmt* pNewFmt = ((SwFmtChg*)pNew)->pChangedFmt;
-            ASSERT( pOldFmt && pNewFmt, "FMT_CHG Missing Format." );
+            OSL_ENSURE( pOldFmt && pNewFmt, "FMT_CHG Missing Format." );
 
             const SwFmtCol &rOldCol = pOldFmt->GetCol();
             const SwFmtCol &rNewCol = pNewFmt->GetCol();
             if( rOldCol != rNewCol )
             {
                 SwLayoutFrm *pB = FindBodyCont();
-                ASSERT( pB, "Seite ohne Body." );
+                OSL_ENSURE( pB, "Seite ohne Body." );
                 pB->ChgColumns( rOldCol, rNewCol );
                 rInvFlags |= 0x20;
             }
@@ -670,7 +666,7 @@ void SwPageFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew,
         case RES_COL:
         {
             SwLayoutFrm *pB = FindBodyCont();
-            ASSERT( pB, "Seite ohne Body." );
+            OSL_ENSURE( pB, "Seite ohne Body." );
             pB->ChgColumns( *(const SwFmtCol*)pOld, *(const SwFmtCol*)pNew );
             rInvFlags |= 0x22;
         }
@@ -836,7 +832,7 @@ SwPageDesc *SwPageFrm::FindPageDesc()
                               ->GetPageDesc( 0 ));
 
 
-    ASSERT( pRet, "Kein Descriptor gefunden." );
+    OSL_ENSURE( pRet, "Kein Descriptor gefunden." );
     return pRet;
 }
 
@@ -948,11 +944,11 @@ void SwPageFrm::Cut()
 |*************************************************************************/
 void SwPageFrm::Paste( SwFrm* pParent, SwFrm* pSibling )
 {
-    ASSERT( pParent->IsRootFrm(), "Parent ist keine Root." );
-    ASSERT( pParent, "Kein Parent fuer Paste." );
-    ASSERT( pParent != this, "Bin selbst der Parent." );
-    ASSERT( pSibling != this, "Bin mein eigener Nachbar." );
-    ASSERT( !GetPrev() && !GetNext() && !GetUpper(),
+    OSL_ENSURE( pParent->IsRootFrm(), "Parent ist keine Root." );
+    OSL_ENSURE( pParent, "Kein Parent fuer Paste." );
+    OSL_ENSURE( pParent != this, "Bin selbst der Parent." );
+    OSL_ENSURE( pSibling != this, "Bin mein eigener Nachbar." );
+    OSL_ENSURE( !GetPrev() && !GetNext() && !GetUpper(),
             "Bin noch irgendwo angemeldet." );
 
     //In den Baum einhaengen.
@@ -1065,7 +1061,7 @@ void SwPageFrm::PrepareRegisterChg()
 |*************************************************************************/
 void SwFrm::CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields )
 {
-    ASSERT( pStart, "Keine Startpage." );
+    OSL_ENSURE( pStart, "Keine Startpage." );
 
     ViewShell *pSh   = pStart->GetShell();
     SwViewImp *pImp  = pSh ? pSh->Imp() : 0;
@@ -1192,10 +1188,10 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields )
                 if ( pPage->GetFmt() != pFmtWish )
                     pPage->SetFrmFmt( pFmtWish );
             }
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
             else
             {
-                ASSERT( FALSE, "CheckPageDescs, missing solution" );
+                OSL_ENSURE( FALSE, "CheckPageDescs, missing solution" );
             }
 #endif
         }
@@ -1235,7 +1231,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields )
         pDoc->UpdatePageFlds( &aMsgHnt );
     }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     //Ein paar Pruefungen muessen schon erlaubt sein.
 
     //1. Keine zwei EmptyPages hintereinander.
@@ -1248,7 +1244,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields )
         {
             if ( bEmpty )
             {
-                ASSERT( FALSE, "Doppelte Leerseiten." );
+                OSL_ENSURE( FALSE, "Doppelte Leerseiten." );
                 break;  //Einmal reicht.
             }
             bEmpty = TRUE;
@@ -1260,7 +1256,7 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, BOOL bNotifyFields )
 //moeglich: Ein paar Seiten, auf der ersten 'erste Seite' anwenden,
 //rechte als folge der ersten, linke als folge der rechten, rechte als
 //folge der linken.
-//      ASSERT( pPg->GetPageDesc() == pPg->FindPageDesc(),
+//   OSL_ENSURE( pPg->GetPageDesc() == pPg->FindPageDesc(),
 //              "Seite mit falschem Descriptor." );
 
         pPg = (SwPageFrm*)pPg->GetNext();
@@ -1305,7 +1301,7 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, BOOL bFtn )
     if ( !pDesc )
         pDesc = pPrevPage->GetPageDesc()->GetFollow();
 
-    ASSERT( pDesc, "Missing PageDesc" );
+    OSL_ENSURE( pDesc, "Missing PageDesc" );
     if( !(bWishedOdd ? pDesc->GetRightFmt() : pDesc->GetLeftFmt()) )
         bWishedOdd = !bWishedOdd;
 
@@ -1336,7 +1332,7 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, BOOL bFtn )
             bCheckPages = TRUE;
     }
     pFmt = bWishedOdd ? pDesc->GetRightFmt() : pDesc->GetLeftFmt();
-    ASSERT( pFmt, "Descriptor without format." );
+    OSL_ENSURE( pFmt, "Descriptor without format." );
     SwPageFrm *pPage = new SwPageFrm( pFmt, pDesc );
     pPage->Paste( pRoot, pSibling );
     pPage->PreparePage( bFtn );
@@ -1432,8 +1428,8 @@ SwTwips SwRootFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL )
 |*************************************************************************/
 SwTwips SwRootFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL )
 {
-    ASSERT( nDist >= 0, "nDist < 0." );
-    ASSERT( nDist <= Frm().Height(), "nDist > als aktuelle Groesse." );
+    OSL_ENSURE( nDist >= 0, "nDist < 0." );
+    OSL_ENSURE( nDist <= Frm().Height(), "nDist > als aktuelle Groesse." );
 
     if ( !bTst )
         Frm().SSize().Height() -= nDist;
@@ -1519,7 +1515,7 @@ void SwRootFrm::RemoveSuperfluous()
                 while ( pPage->IsFtnPage() )
                 {
                     pPage = (SwPageFrm*)pPage->GetPrev();
-                    ASSERT( pPage, "Nur noch Endnotenseiten uebrig." );
+                    OSL_ENSURE( pPage, "Nur noch Endnotenseiten uebrig." );
                 }
                 continue;
             }
@@ -1672,14 +1668,14 @@ void SwRootFrm::AssertPageFlys( SwPageFrm *pPage )
                     {
                         //Umhaengen kann er sich selbst, indem wir ihm
                         //einfach ein Modify mit seinem AnkerAttr schicken.
-#ifndef DBG_UTIL
-                        rFmt.SwModify::Modify( 0, (SwFmtAnchor*)&rAnch );
-#else
+#if OSL_DEBUG_LEVEL > 1
                         const sal_uInt32 nCnt = pPage->GetSortedObjs()->Count();
                         rFmt.SwModify::Modify( 0, (SwFmtAnchor*)&rAnch );
-                        ASSERT( !pPage->GetSortedObjs() ||
+                        OSL_ENSURE( !pPage->GetSortedObjs() ||
                                 nCnt != pPage->GetSortedObjs()->Count(),
                                 "Kann das Obj nicht umhaengen." );
+#else
+                        rFmt.SwModify::Modify( 0, (SwFmtAnchor*)&rAnch );
 #endif
                         --i;
                     }
@@ -1759,7 +1755,7 @@ void SwRootFrm::ImplInvalidateBrowseWidth()
 |*************************************************************************/
 void SwRootFrm::ImplCalcBrowseWidth()
 {
-    ASSERT( GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE),
+    OSL_ENSURE( GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE),
             "CalcBrowseWidth and not in BrowseView" );
 
     //Die (minimale) Breite wird von Rahmen, Tabellen und Zeichenobjekten
@@ -2127,7 +2123,7 @@ void SwRootFrm::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVi
     }
     else
     {
-        ASSERT( pViewOpt, "CheckViewLayout required ViewOptions" )
+        OSL_ENSURE( pViewOpt, "CheckViewLayout required ViewOptions" );
 
         const USHORT nColumns =  pViewOpt->GetViewLayoutColumns();
         const bool   bBookMode = pViewOpt->IsViewLayoutBookMode();
@@ -2281,11 +2277,9 @@ void SwRootFrm::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVi
             // first page in book mode is always special:
             if ( bFirstRow && mbBookMode )
             {
-                // --> OD 2008-04-08 #i88036#
-//                nCurrentRowWidth += pStartOfRow->Frm().Width() + nSidebarWidth;
+                // #i88036#
                 nCurrentRowWidth +=
                     pStartOfRow->GetFormatPage().Frm().Width() + nSidebarWidth;
-                // <--
             }
 
             // center page if possible
@@ -2301,10 +2295,8 @@ void SwRootFrm::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVi
 
             if ( bFirstRow && mbBookMode )
             {
-                // --> OD 2008-04-08 #i88036#
-//                nX += pStartOfRow->Frm().Width() + nSidebarWidth;
+                // #i88036#
                 nX += pStartOfRow->GetFormatPage().Frm().Width() + nSidebarWidth;
-                // <--
             }
 
             SwPageFrm* pEndOfRow = pPageFrm;
@@ -2455,16 +2447,6 @@ bool SwRootFrm::IsLeftToRightViewLayout() const
     // <--
 }
 
-/*const SwRect SwRootFrm::GetExtendedPageArea( USHORT nPageNumber ) const
-{
-    SwRect aRet;
-    ASSERT( nPageNumber < maPageRects.size(), "No extended page area available" )
-    if ( nPageNumber < maPageRects.size() )
-        aRet = maPageRects[ nPageNumber ];
-    return aRet;
-}*/
-
-
 const SwPageFrm& SwPageFrm::GetFormatPage() const
 {
     const SwPageFrm* pRet = this;
@@ -2489,7 +2471,7 @@ const SwPageFrm& SwPageFrm::GetFormatPage() const
                 pRet = static_cast<const SwPageFrm*>( GetNext() );
             }
         }
-        ASSERT( pRet,
+        OSL_ENSURE( pRet,
                 "<SwPageFrm::GetFormatPage()> - inconsistent layout: empty page without previous and next page frame --> crash." );
         // <--
     }
diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx
index 91a3c957a813..4e9315ec9822 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -177,14 +177,9 @@ void SwPageDesc::ResetAllAttr( sal_Bool bLeft )
     // erfrage vom Modify Informationen
 BOOL SwPageDesc::GetInfo( SfxPoolItem & rInfo ) const
 {
-//    if( RES_AUTOFMT_DOCNODE == rInfo.Which() )
-//    {
-        // dann weiter zum Format
-        if( !aMaster.GetInfo( rInfo ) )
-            return FALSE;       // gefunden
-        return aLeft.GetInfo( rInfo );
-//    }
-//    return TRUE;        // weiter suchen
+    if( !aMaster.GetInfo( rInfo ) )
+        return FALSE;       // gefunden
+    return aLeft.GetInfo( rInfo );
 }
 
 /*************************************************************************
@@ -344,13 +339,13 @@ const SwFrmFmt* SwPageDesc::GetPageFmtOfNode( const SwNode& rNd,
         const SwPageDesc* pPd = bCheckForThisPgDc ? this :
                                 ((SwPageFrm*)pChkFrm)->GetPageDesc();
         pRet = &pPd->GetMaster();
-        ASSERT( ((SwPageFrm*)pChkFrm)->GetPageDesc() == pPd,
+        OSL_ENSURE( ((SwPageFrm*)pChkFrm)->GetPageDesc() == pPd,
                 "Falcher Node fuers erkennen des Seitenformats" );
         // an welchem Format haengt diese Seite?
         if( pRet != pChkFrm->GetRegisteredIn() )
         {
             pRet = &pPd->GetLeft();
-            ASSERT( pRet == pChkFrm->GetRegisteredIn(),
+            OSL_ENSURE( pRet == pChkFrm->GetRegisteredIn(),
                     "Falcher Node fuers erkennen des Seitenformats" );
         }
     }
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 2a2fcd78658c..3cd31a66884d 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -530,7 +530,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
             if ( rL2.GetTab() != rL1.GetTab() ||
                  rL2.IsPainted()              ||
                  rL2.IsLocked()               ||
-                 bVert == rL2.Height() > rL2.Width() )
+                 bVert == (rL2.Height() > rL2.Width()) )
                 continue;
 
             long nL2a, nL2b, nL2c, nL2d;
@@ -704,12 +704,12 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
             if ( rLine.IsLocked () )
                 continue;
 
-            if ( !bVerticalSubs == rLine.Height() > rLine.Width() ) //gleiche Ausrichtung?
+            if ( !bVerticalSubs == (rLine.Height() > rLine.Width()) ) // same direction?
                 continue;
 
             if ( aSubsRect.IsOver( rLine ) )
             {
-                if ( bVerticalSubs ) //Vertikal?
+                if ( bVerticalSubs ) // Vertical?
                 {
                     if ( aSubsRect.Left()  <= rLine.Right() &&
                          aSubsRect.Right() >= rLine.Left() )
@@ -949,7 +949,7 @@ void SwSubsRects::PaintSubsidiary( OutputDevice *pOut,
                 SwLineRect &rLk = operator[](k);
                 if ( rLi.SSize() == rLk.SSize() )
                 {
-                    if ( bVerticalSubs == rLk.Height() > rLk.Width() )
+                    if ( bVerticalSubs == (rLk.Height() > rLk.Width()) )
                     {
                         if ( bVerticalSubs )
                         {
@@ -1400,12 +1400,12 @@ void MA_FASTCALL lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage,
             continue;
 
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         //Flys, die innerhalb des eigenen verankert sind, muessen eine
         //groessere OrdNum haben oder Zeichengebunden sein.
         if ( pSelfFly && bLowerOfSelf )
         {
-            ASSERT( pFly->IsFlyInCntFrm() ||
+            OSL_ENSURE( pFly->IsFlyInCntFrm() ||
                     pSdrObj->GetOrdNumDirect() > pSelfFly->GetVirtDrawObj()->GetOrdNumDirect(),
                     "Fly with wrong z-Order" );
         }
@@ -1863,7 +1863,7 @@ void MA_FASTCALL DrawGraphic( const SvxBrushItem *pBrush,
         bDraw = FALSE;
         break;
 
-    default: ASSERT( !pOutDev, "new Graphic position?" );
+    default: OSL_ENSURE( !pOutDev, "new Graphic position?" );
     }
 
     /// OD 02.09.2002 #99657#
@@ -2084,35 +2084,35 @@ void lcl_AdjustRectToPixelSize( SwRect& io_aSwRect, const OutputDevice &aOut )
 
     io_aSwRect = SwRect( aSizedRect );
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     Rectangle aTestOrgPxRect = aOut.LogicToPixel( io_aSwRect.SVRect() );
     Rectangle aTestNewPxRect = aOut.LogicToPixel( aSizedRect );
-    ASSERT( aTestOrgPxRect == aTestNewPxRect,
+    OSL_ENSURE( aTestOrgPxRect == aTestNewPxRect,
             "Error in lcl_AlignRectToPixelSize(..): Adjusted rectangle has incorrect position or size");
 #if OSL_DEBUG_LEVEL > 1
     Rectangle aTestNewRect( aSizedRect );
     /// check Left()
     --aSizedRect.Left();
     aTestNewPxRect = aOut.LogicToPixel( aSizedRect );
-    ASSERT( aTestOrgPxRect.Left() >= (aTestNewPxRect.Left()+1),
+    OSL_ENSURE( aTestOrgPxRect.Left() >= (aTestNewPxRect.Left()+1),
             "Error in lcl_AlignRectToPixelSize(..): Left() not correct adjusted");
     ++aSizedRect.Left();
     /// check Right()
     ++aSizedRect.Right();
     aTestNewPxRect = aOut.LogicToPixel( aSizedRect );
-    ASSERT( aTestOrgPxRect.Right() <= (aTestNewPxRect.Right()-1),
+    OSL_ENSURE( aTestOrgPxRect.Right() <= (aTestNewPxRect.Right()-1),
             "Error in lcl_AlignRectToPixelSize(..): Right() not correct adjusted");
     --aSizedRect.Right();
     /// check Top()
     --aSizedRect.Top();
     aTestNewPxRect = aOut.LogicToPixel( aSizedRect );
-    ASSERT( aTestOrgPxRect.Top() >= (aTestNewPxRect.Top()+1),
+    OSL_ENSURE( aTestOrgPxRect.Top() >= (aTestNewPxRect.Top()+1),
             "Error in lcl_AlignRectToPixelSize(..): Top() not correct adjusted");
     ++aSizedRect.Top();
     /// check Bottom()
     ++aSizedRect.Bottom();
     aTestNewPxRect = aOut.LogicToPixel( aSizedRect );
-    ASSERT( aTestOrgPxRect.Bottom() <= (aTestNewPxRect.Bottom()-1),
+    OSL_ENSURE( aTestOrgPxRect.Bottom() <= (aTestNewPxRect.Bottom()-1),
             "Error in lcl_AlignRectToPixelSize(..): Bottom() not correct adjusted");
     --aSizedRect.Bottom();
 #endif
@@ -2505,7 +2505,7 @@ void SwTabFrmPainter::FindStylesForLine( const Point& rStartPoint,
     // pStyles[ 6 ] = bHori ? aRFromB : BFromR,
 
     SwLineEntryMapConstIter aMapIter = maVertLines.find( rStartPoint.X() );
-    ASSERT( aMapIter != maVertLines.end(), "FindStylesForLine: Error" )
+    OSL_ENSURE( aMapIter != maVertLines.end(), "FindStylesForLine: Error" );
     const SwLineEntrySet& rVertSet = (*aMapIter).second;
     SwLineEntrySetConstIter aIter = rVertSet.begin();
 
@@ -2530,7 +2530,7 @@ void SwTabFrmPainter::FindStylesForLine( const Point& rStartPoint,
     }
 
     aMapIter = maHoriLines.find( rStartPoint.Y() );
-    ASSERT( aMapIter != maHoriLines.end(), "FindStylesForLine: Error" )
+    OSL_ENSURE( aMapIter != maHoriLines.end(), "FindStylesForLine: Error" );
     const SwLineEntrySet& rHoriSet = (*aMapIter).second;
     aIter = rHoriSet.begin();
 
@@ -2557,7 +2557,7 @@ void SwTabFrmPainter::FindStylesForLine( const Point& rStartPoint,
     if ( bHori )
     {
         aMapIter = maVertLines.find( rEndPoint.X() );
-        ASSERT( aMapIter != maVertLines.end(), "FindStylesForLine: Error" )
+        OSL_ENSURE( aMapIter != maVertLines.end(), "FindStylesForLine: Error" );
         const SwLineEntrySet& rVertSet2 = (*aMapIter).second;
         aIter = rVertSet2.begin();
 
@@ -2574,7 +2574,7 @@ void SwTabFrmPainter::FindStylesForLine( const Point& rStartPoint,
     else
     {
         aMapIter = maHoriLines.find( rEndPoint.Y() );
-        ASSERT( aMapIter != maHoriLines.end(), "FindStylesForLine: Error" )
+        OSL_ENSURE( aMapIter != maHoriLines.end(), "FindStylesForLine: Error" );
         const SwLineEntrySet& rHoriSet2 = (*aMapIter).second;
         aIter = rHoriSet2.begin();
 
@@ -2680,7 +2680,7 @@ void SwTabFrmPainter::Insert( SwLineEntry& rNew, bool bHori )
 
         if ( SwLineEntry::OVERLAP1 == nOverlapType )
         {
-            ASSERT( rNew.mnStartPos >= rOld.mnStartPos, "Overlap type 3? How this?" )
+            OSL_ENSURE( rNew.mnStartPos >= rOld.mnStartPos, "Overlap type 3? How this?" );
 
             // new left segment
             const SwLineEntry aLeft( nKey, rOld.mnStartPos, rNew.mnStartPos, rOldAttr );
@@ -2774,7 +2774,7 @@ void SwTabFrmPainter::Insert( SwLineEntry& rNew, bool bHori )
 
 void SwRootFrm::Paint( const SwRect& rRect, const SwPrtOptions *pPrintData ) const
 {
-        ASSERT( Lower() && Lower()->IsPageFrm(), "Lower der Root keine Seite." );
+        OSL_ENSURE( Lower() && Lower()->IsPageFrm(), "Lower der Root keine Seite." );
 
     PROTOCOL( this, PROT_FILE_INIT, 0, 0)
 
@@ -2894,20 +2894,6 @@ void SwRootFrm::Paint( const SwRect& rRect, const SwPrtOptions *pPrintData ) con
 
                 aPaintRect._Intersection( aRect );
 
-                // --> OD 2007-11-14 #i82616#
-                // Invalidate area for extra data (line numbers or change tracking
-                // marks), if painting on a window and the paint is trigger by an
-                // end action. The inefficient and simple enlargement of the
-                // paint area is replaced by this invalidation.
-    //            if ( bExtraData )
-    //            {
-    //                //Ja, das ist grob, aber wie macht man es besser?
-    //                SWRECTFN( pPage )
-    //                (aPaintRect.*fnRect->fnSetLeftAndWidth)(
-    //                    (pPage->Frm().*fnRect->fnGetLeft)(),
-    //                    (pPage->Frm().*fnRect->fnGetWidth)() );
-    //                aPaintRect._Intersection( pSh->VisArea() );
-    //            }
                 if ( bExtraData &&
                      pSh->GetWin() && pSh->IsInEndAction() )
                 {
@@ -3095,7 +3081,7 @@ void SwRootFrm::Paint( const SwRect& rRect, const SwPrtOptions *pPrintData ) con
             }
         }
 
-        ASSERT( !pPage->GetNext() || pPage->GetNext()->IsPageFrm(),
+        OSL_ENSURE( !pPage->GetNext() || pPage->GetNext()->IsPageFrm(),
                 "Nachbar von Seite keine Seite." );
         pPage = (SwPageFrm*)pPage->GetNext();
     }
@@ -3142,9 +3128,9 @@ void SwRootFrm::HackPrepareLongTblPaint( int nMode )
 {
     switch ( nMode )
     {
-        case HACK_TABLEMODE_INIT       : ASSERT( !pLines, "HackPrepare: already prepared" );
+        case HACK_TABLEMODE_INIT       : OSL_ENSURE( !pLines, "HackPrepare: already prepared" );
                                          pLines = new SwLineRects;
-                                         ASSERT( !pGlobalShell, "old GlobalShell lost" );
+                                         OSL_ENSURE( !pGlobalShell, "old GlobalShell lost" );
                                          pGlobalShell = GetShell();
                                          bTableHack = TRUE;
                                          break;
@@ -3489,7 +3475,7 @@ BOOL SwFlyFrm::IsPaint( SdrObject *pObj, const ViewShell *pSh )
                 // OD 02.07.2003 #108784# - debug assert
                 if ( !pObj->ISA(SdrObjGroup) )
                 {
-                    ASSERT( false, "<SwFlyFrm::IsPaint(..)> - paint of drawing object without anchor frame!?" );
+                    OSL_ENSURE( false, "<SwFlyFrm::IsPaint(..)> - paint of drawing object without anchor frame!?" );
                 }
             }
         }
@@ -3972,7 +3958,7 @@ void SwFrm::PaintShadow( const SwRect& rRect, SwRect& rOutRect,
             }
             break;
         default:
-            ASSERT( !this, "new ShadowLocation() ?" )
+            OSL_ENSURE( !this, "new ShadowLocation() ?" );
             break;
     }
 
@@ -4510,8 +4496,8 @@ void lcl_PaintTopBottomLine( const sal_Bool         _bTop,
 
 const SwFrm* lcl_HasNextCell( const SwFrm& rFrm )
 {
-    ASSERT( rFrm.IsCellFrm(),
-            "lcl_HasNextCell( const SwFrm& rFrm ) should be called with SwCellFrm" )
+    OSL_ENSURE( rFrm.IsCellFrm(),
+            "lcl_HasNextCell( const SwFrm& rFrm ) should be called with SwCellFrm" );
 
     const SwFrm* pTmpFrm = &rFrm;
     do
@@ -4564,7 +4550,7 @@ const SwFrm* lcl_GetCellFrmForBorderAttrs( const SwFrm*         _pCellFrm,
                                            const SwBorderAttrs& _rCellBorderAttrs,
                                            const bool           _bTop )
 {
-    ASSERT( _pCellFrm, "No cell frame available, dying soon" )
+    OSL_ENSURE( _pCellFrm, "No cell frame available, dying soon" );
 
     // determine, if cell frame is at bottom/top border of a table frame and
     // the table frame has/is a follow.
@@ -4593,7 +4579,7 @@ const SwFrm* lcl_GetCellFrmForBorderAttrs( const SwFrm*         _pCellFrm,
             }
         }
     }
-    ASSERT( pTmpFrm && pTmpFrm->IsRowFrm(), "No RowFrm available" );
+    OSL_ENSURE( pTmpFrm && pTmpFrm->IsRowFrm(), "No RowFrm available" );
 
     const SwLayoutFrm* pParentRowFrm = static_cast<const SwLayoutFrm*>(pTmpFrm);
     const SwTabFrm* pParentTabFrm =
@@ -4659,7 +4645,7 @@ const SwFrm* lcl_GetCellFrmForBorderAttrs( const SwFrm*         _pCellFrm,
                 {
                     pLowerCell = pLowerCell->GetLower();
                 }
-                ASSERT( pLowerCell && pLowerCell->IsCellFrm(), "No CellFrm available" );
+                OSL_ENSURE( pLowerCell && pLowerCell->IsCellFrm(), "No CellFrm available" );
                 pRet = pLowerCell;
             }
             else if ( !_bTop && !_rCellBorderAttrs.GetBox().GetBottom() )
@@ -4691,7 +4677,7 @@ const SwFrm* lcl_GetCellFrmForBorderAttrs( const SwFrm*         _pCellFrm,
                     }
                     pLowerCell = pLowerCell->GetLower();
                 }
-                ASSERT( pLowerCell && pLowerCell->IsCellFrm(), "No CellFrm available" );
+                OSL_ENSURE( pLowerCell && pLowerCell->IsCellFrm(), "No CellFrm available" );
                 pRet = pLowerCell;
             }
         }
@@ -4905,7 +4891,7 @@ void SwFtnContFrm::PaintLine( const SwRect& rRect,
         case FTNADJ_LEFT:
             /* do nothing */; break;
         default:
-            ASSERT( !this, "Neues Adjustment fuer Fussnotenlinie?" );
+            OSL_ENSURE( !this, "Neues Adjustment fuer Fussnotenlinie?" );
     }
     SwTwips nLineWidth = rInf.GetLineWidth();
     const SwRect aLineRect = bVert ?
@@ -4952,7 +4938,7 @@ void SwLayoutFrm::PaintColLines( const SwRect &rRect, const SwFmtCol &rFmtCol,
         case COLADJ_BOTTOM:
             break;
         default:
-            ASSERT( !this, "Neues Adjustment fuer Spaltenlinie?" );
+            OSL_ENSURE( !this, "Neues Adjustment fuer Spaltenlinie?" );
     }
 
     if( nTop )
@@ -6040,7 +6026,7 @@ void MA_FASTCALL lcl_RefreshLine( const SwLayoutFrm *pLay,
                                   SwLineRects* _pSubsLines )
 {
     //In welche Richtung gehts? Kann nur Horizontal oder Vertikal sein.
-    ASSERT( ((rP1.X() == rP2.X()) || (rP1.Y() == rP2.Y())),
+    OSL_ENSURE( ((rP1.X() == rP2.X()) || (rP1.Y() == rP2.Y())),
             "Schraege Hilfslinien sind nicht erlaubt." );
     const PointPtr pDirPt = rP1.X() == rP2.X() ? pY : pX;
     const PointPtr pOthPt = pDirPt == pX ? pY : pX;
@@ -6305,7 +6291,7 @@ void SwLayoutFrm::PaintSubsidiaryLines( const SwPageFrm *pPage,
 void SwPageFrm::RefreshExtraData( const SwRect &rRect ) const
 {
     const SwLineNumberInfo &rInfo = GetFmt()->GetDoc()->GetLineNumberInfo();
-    BOOL bLineInFly = rInfo.IsPaintLineNumbers() && rInfo.IsCountInFlys()
+    BOOL bLineInFly = (rInfo.IsPaintLineNumbers() && rInfo.IsCountInFlys())
         || (sal_Int16)SW_MOD()->GetRedlineMarkPos() != text::HoriOrientation::NONE;
 
     SwRect aRect( rRect );
@@ -6434,8 +6420,8 @@ void SwFrm::Retouche( const SwPageFrm * pPage, const SwRect &rRect ) const
     if ( bFlyMetafile )
         return;
 
-    ASSERT( GetUpper(), "Retoucheversuch ohne Upper." );
-    ASSERT( GetShell() && pGlobalShell->GetWin(), "Retouche auf dem Drucker?" );
+    OSL_ENSURE( GetUpper(), "Retoucheversuch ohne Upper." );
+    OSL_ENSURE( GetShell() && pGlobalShell->GetWin(), "Retouche auf dem Drucker?" );
 
     SwRect aRetouche( GetUpper()->PaintArea() );
     aRetouche.Top( Frm().Top() + Frm().Height() );
@@ -6674,7 +6660,7 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap )
             SFX_ITEM_SET != GetAttrSet().GetItemState( RES_URL, TRUE );
         if( bNoteURL )
         {
-            ASSERT( !pNoteURL, "MakeGraphic: pNoteURL already used? " );
+            OSL_ENSURE( !pNoteURL, "MakeGraphic: pNoteURL already used? " );
             pNoteURL = new SwNoteURL;
         }
         SwFlyFrm *pFly = (SwFlyFrm*)pFirst;
@@ -6754,7 +6740,7 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap )
 
         if( bNoteURL )
         {
-            ASSERT( pNoteURL, "MakeGraphic: Good Bye, NoteURL." );
+            OSL_ENSURE( pNoteURL, "MakeGraphic: Good Bye, NoteURL." );
             pNoteURL->FillImageMap( pMap, pFly->Frm().Pos(), aMap );
             delete pNoteURL;
             pNoteURL = NULL;
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index dd7e61cc3060..d93f614957b7 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -126,7 +126,7 @@ SwSectionFrm::SwSectionFrm( SwSectionFrm &rSect, BOOL bMaster ) :
 //       frame and its insert in the layout.
 void SwSectionFrm::Init()
 {
-    ASSERT( GetUpper(), "SwSectionFrm::Init before insertion?!" );
+    OSL_ENSURE( GetUpper(), "SwSectionFrm::Init before insertion?!" );
     SWRECTFN( this )
     long nWidth = (GetUpper()->Prt().*fnRect->fnGetWidth)();
     (Frm().*fnRect->fnSetWidth)( nWidth );
@@ -191,7 +191,7 @@ void SwSectionFrm::DelEmpty( BOOL bRemove )
 {
     if( IsColLocked() )
     {
-        ASSERT( !bRemove, "Don't delete locked SectionFrms" );
+        OSL_ENSURE( !bRemove, "Don't delete locked SectionFrms" );
         return;
     }
     SwFrm* pUp = GetUpper();
@@ -262,7 +262,7 @@ void SwSectionFrm::Cut()
 
 void SwSectionFrm::_Cut( BOOL bRemove )
 {
-    ASSERT( GetUpper(), "Cut ohne Upper()." );
+    OSL_ENSURE( GetUpper(), "Cut ohne Upper()." );
 
     PROTOCOL( this, PROT_CUT, 0, GetUpper() )
 
@@ -347,11 +347,11 @@ void SwSectionFrm::_Cut( BOOL bRemove )
 
 void SwSectionFrm::Paste( SwFrm* pParent, SwFrm* pSibling )
 {
-    ASSERT( pParent, "Kein Parent fuer Paste." );
-    ASSERT( pParent->IsLayoutFrm(), "Parent ist CntntFrm." );
-    ASSERT( pParent != this, "Bin selbst der Parent." );
-    ASSERT( pSibling != this, "Bin mein eigener Nachbar." );
-    ASSERT( !GetPrev() && !GetUpper(),
+    OSL_ENSURE( pParent, "Kein Parent fuer Paste." );
+    OSL_ENSURE( pParent->IsLayoutFrm(), "Parent ist CntntFrm." );
+    OSL_ENSURE( pParent != this, "Bin selbst der Parent." );
+    OSL_ENSURE( pSibling != this, "Bin mein eigener Nachbar." );
+    OSL_ENSURE( !GetPrev() && !GetUpper(),
             "Bin noch irgendwo angemeldet." );
 
     PROTOCOL( this, PROT_PASTE, 0, GetUpper() )
@@ -547,7 +547,7 @@ void SwSectionFrm::MergeNext( SwSectionFrm* pNxt )
 
 BOOL SwSectionFrm::SplitSect( SwFrm* pFrm, BOOL bApres )
 {
-    ASSERT( pFrm, "SplitSect: Why?" );
+    OSL_ENSURE( pFrm, "SplitSect: Why?" );
     SwFrm* pOther = bApres ? pFrm->FindNext() : pFrm->FindPrev();
     if( !pOther )
         return FALSE;
@@ -556,7 +556,7 @@ BOOL SwSectionFrm::SplitSect( SwFrm* pFrm, BOOL bApres )
         return FALSE;
     // Den Inhalt zur Seite stellen
     SwFrm* pSav = ::SaveCntnt( this, bApres ? pOther : pFrm );
-    ASSERT( pSav, "SplitSect: What's on?" );
+    OSL_ENSURE( pSav, "SplitSect: What's on?" );
     if( pSav ) // Robust
     {   // Einen neuen SctFrm anlegen, nicht als Follow/Master
         SwSectionFrm* pNew = new SwSectionFrm( *pSect->GetSection() );
@@ -776,7 +776,7 @@ void SwSectionFrm::MoveCntntAndDelete( SwSectionFrm* pDel, BOOL bSave )
     // jetzt koennen eventuell zwei Teile des uebergeordneten Bereich verschmelzen
     if( pPrvSct && !pPrvSct->IsJoinLocked() )
     {
-        ASSERT( pNxtSct, "MoveCntnt: No Merge" );
+        OSL_ENSURE( pNxtSct, "MoveCntnt: No Merge" );
         pPrvSct->MergeNext( pNxtSct );
     }
 }
@@ -787,7 +787,9 @@ void SwSectionFrm::MakeAll()
         return;
     if( !pSection ) // Durch DelEmpty
     {
-        ASSERT( GetFmt()->GetDoc()->GetRootFrm()->IsInDelList( this ), "SectionFrm without Section" );
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( GetFmt()->GetDoc()->GetRootFrm()->IsInDelList( this ), "SectionFrm without Section" );
+#endif
         if( !bValidPos )
         {
             if( GetUpper() )
@@ -840,7 +842,7 @@ void SwSectionFrm::MakeAll()
 
 BOOL SwSectionFrm::ShouldBwdMoved( SwLayoutFrm *, BOOL , BOOL & )
 {
-    ASSERT( FALSE, "Hups, wo ist meine Tarnkappe?" );
+    OSL_ENSURE( FALSE, "Hups, wo ist meine Tarnkappe?" );
     return FALSE;
 }
 
@@ -957,7 +959,7 @@ SwFtnFrm* lcl_FindEndnote( SwSectionFrm* &rpSect, BOOL &rbEmpty,
     SwSectionFrm* pSect = rbEmpty ? rpSect->GetFollow() : rpSect;
     while( pSect )
     {
-       ASSERT( (pSect->Lower() && pSect->Lower()->IsColumnFrm()) || pSect->GetUpper()->IsFtnFrm(),
+       OSL_ENSURE( (pSect->Lower() && pSect->Lower()->IsColumnFrm()) || pSect->GetUpper()->IsFtnFrm(),
                 "InsertEndnotes: Where's my column?" );
 
         // i73332: Columned section in endnote
@@ -1026,9 +1028,9 @@ void lcl_ColumnRefresh( SwSectionFrm* pSect, BOOL bFollow )
 
 void SwSectionFrm::CollectEndnotes( SwLayouter* pLayouter )
 {
-    ASSERT( IsColLocked(), "CollectEndnotes: You love the risk?" );
+    OSL_ENSURE( IsColLocked(), "CollectEndnotes: You love the risk?" );
     // i73332: Section in footnode does not have columns!
-    ASSERT( (Lower() && Lower()->IsColumnFrm()) || GetUpper()->IsFtnFrm(), "Where's my column?" );
+    OSL_ENSURE( (Lower() && Lower()->IsColumnFrm()) || GetUpper()->IsFtnFrm(), "Where's my column?" );
 
     SwSectionFrm* pSect = this;
     SwFtnFrm* pFtn;
@@ -1153,7 +1155,7 @@ void SwSectionFrm::SimpleFormat()
 {
     if ( IsJoinLocked() || IsColLocked() )
         return;
-    // ASSERT( pFollow, "SimpleFormat: Follow required" );
+    // OSL_ENSURE( pFollow, "SimpleFormat: Follow required" );
     LockJoin();
     SWRECTFN( this )
     if( GetPrev() || GetUpper() )
@@ -1333,8 +1335,10 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr )
 {
     if( !pSection ) // Durch DelEmpty
     {
-        ASSERT( GetFmt()->GetDoc()->GetRootFrm()->IsInDelList( this ),
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( GetFmt()->GetDoc()->GetRootFrm()->IsInDelList( this ),
                  "SectionFrm without Section" );
+#endif
         bValidSize = bValidPos = bValidPrtArea = TRUE;
         return;
     }
@@ -1584,7 +1588,7 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage )
 //  SwSectionFrm *pSect = GetUpper()->FindSctFrm();
     SwSectionFrm *pSect = FindSctFrm();
     BOOL bWrongPage = FALSE;
-    ASSERT( pSect, "GetNextSctLeaf: Missing SectionFrm" );
+    OSL_ENSURE( pSect, "GetNextSctLeaf: Missing SectionFrm" );
 
     // Hier eine Abkuerzung fuer Bereiche mit Follows,
     // dieser kann akzeptiert werden, wenn keine Spalten oder Seiten (ausser Dummyseiten)
@@ -1753,7 +1757,7 @@ SwLayoutFrm *SwFrm::GetNextSctLeaf( MakePageType eMakePage )
                         pNxt = (SwSectionFrm*)pTmp;
                     else
                     {
-                        ASSERT( pTmp->IsTabFrm(), "GetNextSctLeaf: Wrong Type" );
+                        OSL_ENSURE( pTmp->IsTabFrm(), "GetNextSctLeaf: Wrong Type" );
                         pNxt = (SwTabFrm*)pTmp;
                     }
                     while( !pNxtCntnt && 0 != ( pTmp = pTmp->GetNext() ) )
@@ -1843,7 +1847,7 @@ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType )
     // nur ein Spaltenwechsel erfolgen, eine der oberen Abkuerzungen haette
     // zuschlagen muessen, ebenso wenn der Bereich einen pPrev hat.
     // Jetzt ziehen wir sogar eine leere Spalte in Betracht...
-    ASSERT( FindSctFrm(), "GetNextSctLeaf: Missing SectionFrm" );
+    OSL_ENSURE( FindSctFrm(), "GetNextSctLeaf: Missing SectionFrm" );
     if( ( IsInTab() && !IsTabFrm() ) || FindFooterOrHeader() )
         return pCol;
 
@@ -2314,7 +2318,7 @@ SwFrm* SwFrm::_GetIndPrev() const
     // could be an empty section frame. The caller has to assure, that the
     // frame has no direct previous frame or only empty section frames as
     // previous frames.
-    ASSERT( /*!pPrev &&*/ IsInSct(), "Why?" );
+    OSL_ENSURE( /*!pPrev &&*/ IsInSct(), "Why?" );
     // <--
     const SwFrm* pSct = GetUpper();
     if( !pSct )
@@ -2328,8 +2332,8 @@ SwFrm* SwFrm::_GetIndPrev() const
         const SwFrm* pCol = GetUpper()->GetUpper()->GetPrev();
         while( pCol )
         {
-            ASSERT( pCol->IsColumnFrm(), "GetIndPrev(): ColumnFrm expected" );
-            ASSERT( pCol->GetLower() && pCol->GetLower()->IsBodyFrm(),
+            OSL_ENSURE( pCol->IsColumnFrm(), "GetIndPrev(): ColumnFrm expected" );
+            OSL_ENSURE( pCol->GetLower() && pCol->GetLower()->IsBodyFrm(),
                     "GetIndPrev(): Where's the body?");
             if( ((SwLayoutFrm*)((SwLayoutFrm*)pCol)->Lower())->Lower() )
                 return NULL;
@@ -2346,7 +2350,7 @@ SwFrm* SwFrm::_GetIndPrev() const
 
 SwFrm* SwFrm::_GetIndNext()
 {
-    ASSERT( !pNext && IsInSct(), "Why?" );
+    OSL_ENSURE( !pNext && IsInSct(), "Why?" );
     SwFrm* pSct = GetUpper();
     if( !pSct )
         return NULL;
@@ -2358,8 +2362,8 @@ SwFrm* SwFrm::_GetIndNext()
         SwFrm* pCol = GetUpper()->GetUpper()->GetNext();
         while( pCol )
         {
-            ASSERT( pCol->IsColumnFrm(), "GetIndNext(): ColumnFrm expected" );
-            ASSERT( pCol->GetLower() && pCol->GetLower()->IsBodyFrm(),
+            OSL_ENSURE( pCol->IsColumnFrm(), "GetIndNext(): ColumnFrm expected" );
+            OSL_ENSURE( pCol->GetLower() && pCol->GetLower()->IsBodyFrm(),
                     "GetIndNext(): Where's the body?");
             if( ((SwLayoutFrm*)((SwLayoutFrm*)pCol)->Lower())->Lower() )
                 return NULL;
@@ -2630,7 +2634,7 @@ SwFtnContFrm* SwSectionFrm::ContainsFtnCont( const SwFtnContFrm* pCont ) const
     if( pCont )
     {
         pLay = pCont->FindFtnBossFrm( 0 );
-        ASSERT( IsAnLower( pLay ), "ConatainsFtnCont: Wrong FtnContainer" );
+        OSL_ENSURE( IsAnLower( pLay ), "ConatainsFtnCont: Wrong FtnContainer" );
         pLay = (SwLayoutFrm*)pLay->GetNext();
     }
     else if( Lower() && Lower()->IsColumnFrm() )
@@ -2641,11 +2645,11 @@ SwFtnContFrm* SwSectionFrm::ContainsFtnCont( const SwFtnContFrm* pCont ) const
     {
         if( pLay->Lower() && pLay->Lower()->GetNext() )
         {
-            ASSERT( pLay->Lower()->GetNext()->IsFtnContFrm(),
+            OSL_ENSURE( pLay->Lower()->GetNext()->IsFtnContFrm(),
                     "ToMaximize: Unexspected Frame" );
             pRet = (SwFtnContFrm*)pLay->Lower()->GetNext();
         }
-        ASSERT( !pLay->GetNext() || pLay->GetNext()->IsLayoutFrm(),
+        OSL_ENSURE( !pLay->GetNext() || pLay->GetNext()->IsLayoutFrm(),
                 "ToMaximize: ColFrm exspected" );
         pLay = (SwLayoutFrm*)pLay->GetNext();
     }
@@ -2741,12 +2745,12 @@ void SwRootFrm::InsertEmptySct( SwSectionFrm* pDel )
 
 void SwRootFrm::_DeleteEmptySct()
 {
-    ASSERT( pDestroy, "Keine Liste, keine Kekse" );
+    OSL_ENSURE( pDestroy, "Keine Liste, keine Kekse" );
     while( pDestroy->Count() )
     {
         SwSectionFrm* pSect = (*pDestroy)[0];
         pDestroy->Remove( USHORT(0) );
-        ASSERT( !pSect->IsColLocked() && !pSect->IsJoinLocked(),
+        OSL_ENSURE( !pSect->IsColLocked() && !pSect->IsJoinLocked(),
                 "DeleteEmptySct: Locked SectionFrm" );
         if( !pSect->Frm().HasArea() && !pSect->ContainsCntnt() )
         {
@@ -2766,20 +2770,20 @@ void SwRootFrm::_DeleteEmptySct()
             }
         }
         else {
-            ASSERT( pSect->GetSection(), "DeleteEmptySct: Halbtoter SectionFrm?!" );
+            OSL_ENSURE( pSect->GetSection(), "DeleteEmptySct: Halbtoter SectionFrm?!" );
         }
     }
 }
 
 void SwRootFrm::_RemoveFromList( SwSectionFrm* pSct )
 {
-    ASSERT( pDestroy, "Where's my list?" );
+    OSL_ENSURE( pDestroy, "Where's my list?" );
     USHORT nPos;
     if( pDestroy->Seek_Entry( pSct, &nPos ) )
         pDestroy->Remove( nPos );
 }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
 BOOL SwRootFrm::IsInDelList( SwSectionFrm* pSct ) const
 {
diff --git a/sw/source/core/layout/sortedobjsimpl.cxx b/sw/source/core/layout/sortedobjsimpl.cxx
index 10e3df04585c..10ed749e840b 100644
--- a/sw/source/core/layout/sortedobjsimpl.cxx
+++ b/sw/source/core/layout/sortedobjsimpl.cxx
@@ -67,7 +67,7 @@ SwAnchoredObject* SwSortedObjsImpl::operator[]( sal_uInt32 _nIndex )
 
     if ( _nIndex >= Count() )
     {
-        ASSERT( false, "<SwSortedObjsImpl::operator[]> - index out of range" );
+        OSL_ENSURE( false, "<SwSortedObjsImpl::operator[]> - index out of range" );
     }
     else
     {
@@ -220,7 +220,7 @@ bool SwSortedObjsImpl::Insert( SwAnchoredObject& _rAnchoredObj )
     {
         // list already contains object
 #if OSL_DEBUG_LEVEL > 1
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "<SwSortedObjsImpl::Insert()> - already contains object" );
 #endif
         return true;
@@ -250,7 +250,7 @@ bool SwSortedObjsImpl::Remove( SwAnchoredObject& _rAnchoredObj )
         // object not found.
         bRet = false;
 #if OSL_DEBUG_LEVEL > 1
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "<SwSortedObjsImpl::Remove()> - object not found" );
 #endif
     }
@@ -275,7 +275,7 @@ bool SwSortedObjsImpl::Update( SwAnchoredObject& _rAnchoredObj )
     if ( !Contains( _rAnchoredObj ) )
     {
         // given anchored object not found in list
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "<SwSortedObjsImpl::Update(..) - sorted list doesn't contain given anchored object" );
         return false;
     }
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index 088de32e1858..357844aacc4d 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -379,7 +379,7 @@ SwFrm::~SwFrm()
             ViewShell *pVSh = pRootFrm->GetCurrShell();
             if( pVSh && pVSh->Imp() )
             {
-                ASSERT( !GetLower(), "Lowers should be dispose already!" );
+                OSL_ENSURE( !GetLower(), "Lowers should be dispose already!" );
                 pVSh->Imp()->DisposeAccessibleFrm( this );
             }
         }
@@ -397,7 +397,7 @@ SwFrm::~SwFrm()
                 SdrObject* pSdrObj = pAnchoredObj->DrawObj();
                 SwDrawContact* pContact =
                         static_cast<SwDrawContact*>(pSdrObj->GetUserCall());
-                ASSERT( pContact,
+                OSL_ENSURE( pContact,
                         "<SwFrm::~SwFrm> - missing contact for drawing object" );
                 if ( pContact )
                 {
@@ -409,7 +409,7 @@ SwFrm::~SwFrm()
             delete pDrawObjs;
     }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     // JP 15.10.2001: for detection of access to deleted frames
     pDrawObjs = (SwSortedObjs*)0x33333333;
 #endif
@@ -523,7 +523,7 @@ SwLayoutFrm::~SwLayoutFrm()
                     SdrObject* pSdrObj = pAnchoredObj->DrawObj();
                     SwDrawContact* pContact =
                             static_cast<SwDrawContact*>(pSdrObj->GetUserCall());
-                    ASSERT( pContact,
+                    OSL_ENSURE( pContact,
                             "<SwFrm::~SwFrm> - missing contact for drawing object" );
                     if ( pContact )
                     {
@@ -556,7 +556,7 @@ SwLayoutFrm::~SwLayoutFrm()
                 SdrObject* pSdrObj = pAnchoredObj->DrawObj();
                 SwDrawContact* pContact =
                         static_cast<SwDrawContact*>(pSdrObj->GetUserCall());
-                ASSERT( pContact,
+                OSL_ENSURE( pContact,
                         "<SwFrm::~SwFrm> - missing contact for drawing object" );
                 if ( pContact )
                 {
@@ -624,7 +624,7 @@ const SwRect SwFrm::PaintArea() const
             else
                 nTmpRight = (pNxt->Frm().*fnRect->fnGetRight)();
         }
-        ASSERT( pTmp, "PaintArea lost in time and space" );
+        OSL_ENSURE( pTmp, "PaintArea lost in time and space" );
         if( pTmp->IsPageFrm() || pTmp->IsFlyFrm() ||
             pTmp->IsCellFrm() || pTmp->IsRowFrm() || //nobody leaves a table!
             pTmp->IsRootFrm() )
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 3157fc054729..1ba72b2906db 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -125,7 +125,7 @@ SwTabFrm::SwTabFrm( SwTable &rTab ):
         else
             delete pNew;
     }
-    ASSERT( Lower() && Lower()->IsRowFrm(), "SwTabFrm::SwTabFrm: No rows." );
+    OSL_ENSURE( Lower() && Lower()->IsRowFrm(), "SwTabFrm::SwTabFrm: No rows." );
 }
 
 SwTabFrm::SwTabFrm( SwTabFrm &rTab ) :
@@ -200,7 +200,7 @@ void SwTabFrm::JoinAndDelFollows()
 |*************************************************************************/
 void SwTabFrm::RegistFlys()
 {
-    ASSERT( Lower() && Lower()->IsRowFrm(), "Keine Zeilen." );
+    OSL_ENSURE( Lower() && Lower()->IsRowFrm(), "Keine Zeilen." );
 
     SwPageFrm *pPage = FindPageFrm();
     if ( pPage )
@@ -271,7 +271,7 @@ SwTwips lcl_GetHeightOfRows( const SwFrm* pStart, long nCount )
 //
 SwRowFrm* lcl_InsertNewFollowFlowLine( SwTabFrm& rTab, const SwFrm& rTmpRow, bool bRowSpanLine )
 {
-    ASSERT( rTmpRow.IsRowFrm(), "No row frame to copy for FollowFlowLine" )
+    OSL_ENSURE( rTmpRow.IsRowFrm(), "No row frame to copy for FollowFlowLine" );
     const SwRowFrm& rRow = (SwRowFrm&)rTmpRow;
 
     rTab.SetFollowFlowLine( TRUE );
@@ -293,7 +293,7 @@ void lcl_InvalidateLowerObjs( SwLayoutFrm& _rLayoutFrm,
     if ( !_pPageFrm )
     {
         _pPageFrm = _rLayoutFrm.FindPageFrm();
-        ASSERT( _pPageFrm,
+        OSL_ENSURE( _pPageFrm,
                 "<lcl_InvalidateLowerObjs(..)> - missing page frame -> no move of lower objects out of range" );
         if ( !_pPageFrm )
         {
@@ -460,7 +460,7 @@ void lcl_MoveRowContent( SwRowFrm& rSourceLine, SwRowFrm& rDestLine )
                     while ( pTmpDestRow->GetNext() )
                         pTmpDestRow = (SwRowFrm*)pTmpDestRow->GetNext();
 
-                    ASSERT( pTmpDestRow->GetFollowRow() == pTmpSourceRow, "Knoten in der Tabelle" )
+                    OSL_ENSURE( pTmpDestRow->GetFollowRow() == pTmpSourceRow, "Knoten in der Tabelle" );
 
                     lcl_MoveRowContent( *pTmpSourceRow, *pTmpDestRow );
                     pTmpDestRow->SetFollowRow( pTmpSourceRow->GetFollowRow() );
@@ -650,7 +650,7 @@ void lcl_PostprocessRowsInCells( SwTabFrm& rTab, SwRowFrm& rLastLine )
 
             if ( NULL != pRowFrm->GetPrev() && !pRowFrm->ContainsCntnt() )
             {
-                ASSERT( pRowFrm->GetFollowRow(), "Deleting row frame without follow" )
+                OSL_ENSURE( pRowFrm->GetFollowRow(), "Deleting row frame without follow" );
 
                 // The footnotes have to be moved:
                 lcl_MoveFootnotes( rTab, *rTab.GetFollow(), *pRowFrm );
@@ -734,32 +734,6 @@ bool lcl_RecalcSplitLine( SwRowFrm& rLastLine, SwRowFrm& rFollowLine,
     }
 
     //
-    // TODO: e.g., for i71806: What shall we do if the table already
-    // exceeds its upper? I think we have to adjust the heights of the
-    // table, rLastRow and all cells in rLastRow
-    //
-    /*SwTwips nDistanceToUpperPrtBottom =
-            (rTab.Frm().*fnRect->fnBottomDist)( (rTab.GetUpper()->*fnRect->fnGetPrtBottom)());
-
-    if ( nDistanceToUpperPrtBottom < 0 )
-    {
-        (rTab.Frm().*fnRect->fnAddBottom)( nDistanceToUpperPrtBottom );
-        (rTab.Prt().*fnRect->fnAddBottom)( nDistanceToUpperPrtBottom );
-
-        (rLastLine.Frm().*fnRect->fnAddBottom)( nDistanceToUpperPrtBottom );
-        (rLastLine.Prt().*fnRect->fnAddBottom)( nDistanceToUpperPrtBottom );
-
-        SwFrm* pTmpCell = rLastLine.Lower();
-        while ( pTmpCell )
-        {
-            (pTmpCell->Frm().*fnRect->fnAddBottom)( nDistanceToUpperPrtBottom );
-            (pTmpCell->Prt().*fnRect->fnAddBottom)( nDistanceToUpperPrtBottom );
-
-            pTmpCell = pTmpCell->GetNext();
-        }
-    }*/
-
-    //
     // Do the recalculation
     //
     lcl_RecalcRow( rLastLine, LONG_MAX );
@@ -944,9 +918,9 @@ bool SwTabFrm::RemoveFollowFlowLine()
     // find last row in master
     SwFrm* pLastLine = GetLastLower();
 
-    ASSERT( HasFollowFlowLine() &&
+    OSL_ENSURE( HasFollowFlowLine() &&
             pFollowFlowLine &&
-            pLastLine, "There should be a flowline in the follow" )
+            pLastLine, "There should be a flowline in the follow" );
 
     // We have to reset the flag here, because lcl_MoveRowContent
     // calls a GrowFrm(), which has a different bahavior if
@@ -1053,9 +1027,6 @@ bool SwTabFrm::Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKee
     bool bRet = true;
 
     SWRECTFN( this )
-    //ASSERT( bVert ? nCutPos >= Frm().Left() &&
-    //                nCutPos <= Frm().Left() + Frm().Width() :
-    //                nCutPos >= Frm().Top() && nCutPos <= Frm().Bottom(), "SplitLine out of table." );
 
     // --> OD 2004-10-14 #i26745# - format row and cell frames of table
     {
@@ -1132,7 +1103,7 @@ bool SwTabFrm::Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKee
         // At least one more non-heading row has to stay in this table in
         // order to avoid loops:
         //
-        ASSERT( !GetIndPrev(), "Table is supposed to be at beginning" )
+        OSL_ENSURE( !GetIndPrev(), "Table is supposed to be at beginning" );
         bKeepNextRow = true;
     }
     else if ( !GetIndPrev() && nRepeat == nRowCount )
@@ -1410,7 +1381,7 @@ bool SwTabFrm::Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKee
 
 bool SwTabFrm::Join()
 {
-    ASSERT( !HasFollowFlowLine(), "Joining follow flow line" )
+    OSL_ENSURE( !HasFollowFlowLine(), "Joining follow flow line" );
 
     SwTabFrm *pFoll = GetFollow();
     SwTwips nHeight = 0;    //Gesamthoehe der eingefuegten Zeilen als Return.
@@ -1592,7 +1563,7 @@ bool MA_FASTCALL lcl_CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeav
             // to format the floating screen objects
             // --> OD 2005-05-03 #i46941# - frame has to be valid
             // Note: frame could be invalid after calling its format, if it's locked.
-            ASSERT( !pCnt->IsTxtFrm() ||
+            OSL_ENSURE( !pCnt->IsTxtFrm() ||
                     pCnt->IsValid() ||
                     static_cast<SwTxtFrm*>(pCnt)->IsJoinLocked(),
                     "<lcl_CalcLowers(..)> - text frame invalid and not locked." );
@@ -1620,7 +1591,7 @@ bool MA_FASTCALL lcl_CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeav
                     }
 
 #if OSL_DEBUG_LEVEL > 1
-                    ASSERT( false, "LoopControl in lcl_CalcLowers" )
+                    OSL_ENSURE( false, "LoopControl in lcl_CalcLowers" );
 #endif
                 }
             }
@@ -1710,9 +1681,9 @@ void MA_FASTCALL lcl_RecalcRow( SwRowFrm& rRow, long nBottom )
             if ( ++nLoopControlRuns_2 > nLoopControlMax )
             {
 #if OSL_DEBUG_LEVEL > 1
-                ASSERT( 0 != nLoopControlStage_2, "LoopControl_2 in lcl_RecalcRow: Stage 1!" );
-                ASSERT( 1 != nLoopControlStage_2, "LoopControl_2 in lcl_RecalcRow: Stage 2!!" );
-                ASSERT( 2 >  nLoopControlStage_2, "LoopControl_2 in lcl_RecalcRow: Stage 3!!!" );
+                OSL_ENSURE( 0 != nLoopControlStage_2, "LoopControl_2 in lcl_RecalcRow: Stage 1!" );
+                OSL_ENSURE( 1 != nLoopControlStage_2, "LoopControl_2 in lcl_RecalcRow: Stage 2!!" );
+                OSL_ENSURE( 2 >  nLoopControlStage_2, "LoopControl_2 in lcl_RecalcRow: Stage 3!!!" );
 #endif
                 rRow.ValidateThisAndAllLowers( nLoopControlStage_2++ );
                 nLoopControlRuns_2 = 0;
@@ -1759,9 +1730,9 @@ void MA_FASTCALL lcl_RecalcRow( SwRowFrm& rRow, long nBottom )
                 if ( ++nLoopControlRuns_1 > nLoopControlMax )
                 {
 #if OSL_DEBUG_LEVEL > 1
-                    ASSERT( 0 != nLoopControlStage_1, "LoopControl_1 in lcl_RecalcRow: Stage 1!" );
-                    ASSERT( 1 != nLoopControlStage_1, "LoopControl_1 in lcl_RecalcRow: Stage 2!!" );
-                    ASSERT( 2 >  nLoopControlStage_1, "LoopControl_1 in lcl_RecalcRow: Stage 3!!!" );
+                    OSL_ENSURE( 0 != nLoopControlStage_1, "LoopControl_1 in lcl_RecalcRow: Stage 1!" );
+                    OSL_ENSURE( 1 != nLoopControlStage_1, "LoopControl_1 in lcl_RecalcRow: Stage 2!!" );
+                    OSL_ENSURE( 2 >  nLoopControlStage_1, "LoopControl_1 in lcl_RecalcRow: Stage 3!!!" );
 #endif
                     rRow.ValidateThisAndAllLowers( nLoopControlStage_1++ );
                     nLoopControlRuns_1 = 0;
@@ -1896,8 +1867,8 @@ void SwTabFrm::MakeAll()
     if ( HasFollow() )
     {
         SwTabFrm* pFollowFrm = (SwTabFrm*)GetFollow();
-        ASSERT( !pFollowFrm->IsJoinLocked() || !pFollowFrm->IsRebuildLastLine(),
-                "SwTabFrm::MakeAll for master while follow is in RebuildLastLine()" )
+        OSL_ENSURE( !pFollowFrm->IsJoinLocked() || !pFollowFrm->IsRebuildLastLine(),
+                "SwTabFrm::MakeAll for master while follow is in RebuildLastLine()" );
         if ( pFollowFrm->IsJoinLocked() && pFollowFrm->IsRebuildLastLine() )
             return;
     }
@@ -2720,7 +2691,7 @@ void SwTabFrm::MakeAll()
 #if OSL_DEBUG_LEVEL > 1
             else
             {
-                ASSERT( false, "debug assertion: <SwTabFrm::MakeAll()> - format of table lowers suppressed by fix i44910" );
+                OSL_ENSURE( false, "debug assertion: <SwTabFrm::MakeAll()> - format of table lowers suppressed by fix i44910" );
             }
 #endif
             // <--
@@ -2916,7 +2887,7 @@ BOOL SwTabFrm::CalcFlyOffsets( SwTwips& rUpper,
 |*************************************************************************/
 void SwTabFrm::Format( const SwBorderAttrs *pAttrs )
 {
-    ASSERT( pAttrs, "TabFrm::Format, pAttrs ist 0." );
+    OSL_ENSURE( pAttrs, "TabFrm::Format, pAttrs ist 0." );
 
     SWRECTFN( this )
     if ( !bValidSize )
@@ -3121,7 +3092,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs )
                 }
                 break;
             default:
-                ASSERT( FALSE, "Ungueltige orientation fuer Table." );
+                OSL_ENSURE( FALSE, "Ungueltige orientation fuer Table." );
         }
 
         // --> OD 2004-07-15 #i26250# - extend bottom printing area, if table
@@ -3496,10 +3467,10 @@ SwCntntFrm *SwTabFrm::FindLastCntnt()
             // Spalten abklappern, dies erledigt SwSectionFrm::FindLastCntnt
             if( pRet->IsColBodyFrm() )
             {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
                 SwSectionFrm* pSect = pRet->FindSctFrm();
-                ASSERT( pSect, "Wo kommt denn die Spalte her?")
-                ASSERT( IsAnLower( pSect ), "Gespaltene Zelle?" );
+                OSL_ENSURE( pSect, "Wo kommt denn die Spalte her?");
+                OSL_ENSURE( IsAnLower( pSect ), "Gespaltene Zelle?" );
 #endif
                 return pRet->FindSctFrm()->FindLastCntnt();
             }
@@ -3508,7 +3479,7 @@ SwCntntFrm *SwTabFrm::FindLastCntnt()
             // pRet may be a cell frame without a lower (cell has been split).
             // We have to find the last content the hard way:
             //
-            ASSERT( pRet->IsCellFrm(), "SwTabFrm::FindLastCntnt failed" )
+            OSL_ENSURE( pRet->IsCellFrm(), "SwTabFrm::FindLastCntnt failed" );
             const SwFrm* pRow = pRet->GetUpper();
             while ( pRow && !pRow->GetUpper()->IsTabFrm() )
                 pRow = pRow->GetUpper();
@@ -3685,7 +3656,7 @@ BOOL SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL, BOOL &rReformat )
 |*************************************************************************/
 void SwTabFrm::Cut()
 {
-    ASSERT( GetUpper(), "Cut ohne Upper()." );
+    OSL_ENSURE( GetUpper(), "Cut ohne Upper()." );
 
     SwPageFrm *pPage = FindPageFrm();
     InvalidatePage( pPage );
@@ -3743,7 +3714,7 @@ void SwTabFrm::Cut()
     Remove();
     if ( pUp )
     {
-        ASSERT( !pUp->IsFtnFrm(), "Tabelle in Fussnote." );
+        OSL_ENSURE( !pUp->IsFtnFrm(), "Tabelle in Fussnote." );
         SwSectionFrm *pSct = 0;
         // --> OD 2006-01-04 #126020# - adjust check for empty section
         // --> OD 2006-02-01 #130797# - correct fix #126020#
@@ -3780,11 +3751,11 @@ void SwTabFrm::Cut()
 |*************************************************************************/
 void SwTabFrm::Paste( SwFrm* pParent, SwFrm* pSibling )
 {
-    ASSERT( pParent, "Kein Parent fuer Paste." );
-    ASSERT( pParent->IsLayoutFrm(), "Parent ist CntntFrm." );
-    ASSERT( pParent != this, "Bin selbst der Parent." );
-    ASSERT( pSibling != this, "Bin mein eigener Nachbar." );
-    ASSERT( !GetPrev() && !GetNext() && !GetUpper(),
+    OSL_ENSURE( pParent, "Kein Parent fuer Paste." );
+    OSL_ENSURE( pParent->IsLayoutFrm(), "Parent ist CntntFrm." );
+    OSL_ENSURE( pParent != this, "Bin selbst der Parent." );
+    OSL_ENSURE( pSibling != this, "Bin mein eigener Nachbar." );
+    OSL_ENSURE( !GetPrev() && !GetNext() && !GetUpper(),
             "Bin noch irgendwo angemeldet." );
 
     //In den Baum einhaengen.
@@ -4193,7 +4164,7 @@ SwTwips MA_FASTCALL lcl_CalcMinRowHeight( const SwRowFrm* _pRow,
 
     if ( _pRow->HasFixSize() && !_pRow->IsRowSpanLine() )
     {
-        ASSERT( ATT_FIX_SIZE == rSz.GetHeightSizeType(), "pRow claims to have fixed size" )
+        OSL_ENSURE( ATT_FIX_SIZE == rSz.GetHeightSizeType(), "pRow claims to have fixed size" );
         return rSz.GetHeight();
     }
 
@@ -4337,7 +4308,7 @@ USHORT lcl_GetBottomLineDist( const SwRowFrm& rRow )
 void SwRowFrm::Format( const SwBorderAttrs *pAttrs )
 {
     SWRECTFN( this )
-    ASSERT( pAttrs, "SwRowFrm::Format ohne Attrs." );
+    OSL_ENSURE( pAttrs, "SwRowFrm::Format ohne Attrs." );
 
     const BOOL bFix = bFixSize;
 
@@ -4407,8 +4378,8 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs )
                 SwClient* pLast;
                 for ( pLast = aIter.First( TYPE( SwFrm ) ); pLast; pLast = aIter.Next() )
                 {
-                    ASSERT( ((SwFrm*)pLast)->IsRowFrm(),
-                                "Non-row frame registered in table line" )
+                    OSL_ENSURE( ((SwFrm*)pLast)->IsRowFrm(),
+                                "Non-row frame registered in table line" );
                     SwRowFrm* pRow = (SwRowFrm*)pLast;
                     // --> OD 2004-11-23 #115759# - do *not* take repeated
                     // headlines, because during split of table it can be
@@ -4463,11 +4434,11 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs )
     {
         bValidSize = TRUE;
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         if ( HasFixSize() )
         {
             const SwFmtFrmSize &rFrmSize = GetFmt()->GetFrmSize();
-            ASSERT( rFrmSize.GetSize().Height() > 0, "Hat ihn" );
+            OSL_ENSURE( rFrmSize.GetSize().Height() > 0, "Hat ihn" );
         }
 #endif
         const SwTwips nDiff = (Frm().*fnRect->fnGetHeight)() -
@@ -4640,7 +4611,7 @@ void SwRowFrm::Cut()
                 SwFrm* pCellFrm( GetLower() );
                 while ( pCellFrm )
                 {
-                    ASSERT( pCellFrm->IsCellFrm(),
+                    OSL_ENSURE( pCellFrm->IsCellFrm(),
                             "<SwRowFrm::Cut()> - unexpected type of SwRowFrm lower." );
                     pVSh->Imp()->DisposeAccessibleFrm( pCellFrm );
 
@@ -4681,10 +4652,10 @@ SwTwips SwRowFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
     }
     else
     {
-        ASSERT( GetUpper()->IsCellFrm(), "RowFrm->GetUpper neither table nor cell" )
+        OSL_ENSURE( GetUpper()->IsCellFrm(), "RowFrm->GetUpper neither table nor cell" );
         bRestrictTableGrowth = GetFollowRow() && bHasFollowFlowLine;
-        ASSERT( !bRestrictTableGrowth || !GetNext(),
-                "GetFollowRow for row frame that has a Next" )
+        OSL_ENSURE( !bRestrictTableGrowth || !GetNext(),
+                "GetFollowRow for row frame that has a Next" );
 
         //
         // There may still be some space left in my direct upper:
@@ -4765,7 +4736,7 @@ SwTwips SwRowFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
         if( nMinHeight < (Frm().*fnRect->fnGetHeight)() )
         {
             // --> OD 2004-10-04 #i26945#
-            ASSERT( FindTabFrm(), "<SwRowFrm::ShrinkFrm(..)> - no table frame -> crash." );
+            OSL_ENSURE( FindTabFrm(), "<SwRowFrm::ShrinkFrm(..)> - no table frame -> crash." );
             const bool bConsiderObjs( FindTabFrm()->IsConsiderObjsForMinCellHeight() );
             // <--
             nMinHeight = lcl_CalcMinRowHeight( this, bConsiderObjs );
@@ -4839,7 +4810,7 @@ bool SwRowFrm::IsRowSplitAllowed() const
     // Fixed size rows are never allowed to split:
     if ( HasFixSize() )
     {
-        ASSERT( ATT_FIX_SIZE == GetFmt()->GetFrmSize().GetHeightSizeType(), "pRow claims to have fixed size" )
+        OSL_ENSURE( ATT_FIX_SIZE == GetFmt()->GetFrmSize().GetHeightSizeType(), "pRow claims to have fixed size" );
         return false;
     }
 
@@ -5136,7 +5107,7 @@ BOOL lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, BOOL bInva )
                     }
                     else
                     {
-                        ASSERT( false,
+                        OSL_ENSURE( false,
                                 "<lcl_ArrangeLowers(..)> - unknown type of anchored object!" );
                     }
                 }
@@ -5174,7 +5145,7 @@ BOOL lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, BOOL bInva )
 
 void SwCellFrm::Format( const SwBorderAttrs *pAttrs )
 {
-    ASSERT( pAttrs, "CellFrm::Format, pAttrs ist 0." );
+    OSL_ENSURE( pAttrs, "CellFrm::Format, pAttrs ist 0." );
     const SwTabFrm* pTab = FindTabFrm();
     SWRECTFN( pTab )
 
@@ -5233,9 +5204,9 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs )
             const SwTwips nWish = pTab->GetFmt()->GetFrmSize().GetWidth();
             nWidth = pAttrs->GetSize().Width();
 
-            ASSERT( nWish, "Tabelle ohne Breite?" );
-            ASSERT( nWidth <= nWish, "Zelle breiter als Tabelle." );
-            ASSERT( nWidth > 0, "Box without width" );
+            OSL_ENSURE( nWish, "Tabelle ohne Breite?" );
+            OSL_ENSURE( nWidth <= nWish, "Zelle breiter als Tabelle." );
+            OSL_ENSURE( nWidth > 0, "Box without width" );
 
             const long nPrtWidth = (pTab->Prt().*fnRect->fnGetWidth)();
             if ( nWish != nPrtWidth )
@@ -5287,7 +5258,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs )
         }
         else
         {
-            ASSERT( pAttrs->GetSize().Width() > 0, "Box without width" );
+            OSL_ENSURE( pAttrs->GetSize().Width() > 0, "Box without width" );
             nWidth = (GetUpper()->Prt().*fnRect->fnGetWidth)();
             SwFrm *pPre = GetUpper()->Lower();
             while ( pPre != this )
@@ -5344,8 +5315,8 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs )
     {
         if ( !Lower()->IsCntntFrm() && !Lower()->IsSctFrm() && !Lower()->IsTabFrm() )
         {
-            //ASSERT fuer HTML-Import!
-            ASSERT( !this, "VAlign an Zelle ohne Inhalt" );
+            // OSL_ENSURE(fuer HTML-Import!
+            OSL_ENSURE( !this, "VAlign an Zelle ohne Inhalt" );
             return;
         }
         BOOL bVertDir = TRUE;
@@ -5559,8 +5530,8 @@ void SwCellFrm::Cut()
  */
 bool SwTabFrm::IsInHeadline( const SwFrm& rFrm ) const
 {
-    ASSERT( IsAnLower( &rFrm ) && rFrm.IsInTab(),
-             "SwTabFrm::IsInHeadline called for frame not lower of table" )
+    OSL_ENSURE( IsAnLower( &rFrm ) && rFrm.IsInTab(),
+             "SwTabFrm::IsInHeadline called for frame not lower of table" );
 
     const SwFrm* pTmp = &rFrm;
     while ( !pTmp->GetUpper()->IsTabFrm() )
@@ -5623,10 +5594,10 @@ bool SwTabFrm::IsLayoutSplitAllowed() const
 
 USHORT SwTabFrm::GetBottomLineSize() const
 {
-    ASSERT( IsCollapsingBorders(),
-            "BottomLineSize only required for collapsing borders" )
+    OSL_ENSURE( IsCollapsingBorders(),
+            "BottomLineSize only required for collapsing borders" );
 
-    ASSERT( Lower(), "Warning! Trying to prevent a crash, please inform FME" )
+    OSL_ENSURE( Lower(), "Warning! Trying to prevent a crash, please inform FME" );
 
     const SwFrm* pTmp = GetLastLower();
 
@@ -5812,7 +5783,7 @@ SwTwips SwTabFrm::CalcHeightOfFirstContentLine() const
     SwTwips nTmpHeight = 0;
 
     pFirstRow = GetFirstNonHeadlineRow();
-    ASSERT( !IsFollow() || pFirstRow, "FollowTable without Lower" )
+    OSL_ENSURE( !IsFollow() || pFirstRow, "FollowTable without Lower" );
 
     // NEW TABLES
     if ( pFirstRow && pFirstRow->IsRowSpanLine() && pFirstRow->GetNext() )
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index a0bb16e01af5..bb69a94899b3 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -211,7 +211,7 @@ BOOL SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
             if ( pCMS && pCMS->bStop )
                 return FALSE;
 
-            ASSERT( pCnt, "Crsr is gone to a Black hole" );
+            OSL_ENSURE( pCnt, "Crsr is gone to a Black hole" );
             if( pCMS && pCMS->pFill && pCnt->IsTxtFrm() )
                 bRet = pCnt->GetCrsrOfst( pPos, rPoint, pCMS );
             else
@@ -305,7 +305,7 @@ BOOL SwRootFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
 {
     sal_Bool bOldAction = IsCallbackActionEnabled();
     ((SwRootFrm*)this)->SetCallbackActionEnabled( FALSE );
-    ASSERT( (Lower() && Lower()->IsPageFrm()), "Keinen PageFrm gefunden." );
+    OSL_ENSURE( (Lower() && Lower()->IsPageFrm()), "Keinen PageFrm gefunden." );
     if( pCMS && pCMS->pFill )
         ((SwCrsrMoveState*)pCMS)->bFillRet = FALSE;
     Point aOldPoint = rPoint;
@@ -580,10 +580,10 @@ const SwCntntFrm * MA_FASTCALL lcl_MissProtectedFrames( const SwCntntFrm *pCnt,
             while ( pCell && !pCell->IsCellFrm() )
                 pCell = pCell->GetUpper();
             if ( !pCell ||
-                    ( ( bInReadOnly || !pCell->GetFmt()->GetProtect().IsCntntProtected() ) &&
+                    (( ( bInReadOnly || !pCell->GetFmt()->GetProtect().IsCntntProtected() ) &&
                       ( !bMissHeadline || !lcl_IsInRepeatedHeadline( pCell ) ) &&
                       ( !bMissFollowFlowLine || !pCell->IsInFollowFlowRow() ) ) &&
-                        !pCell->IsCoveredCell() )
+                        !pCell->IsCoveredCell()) )
                 bProtect = FALSE;
             else
                 pCnt = (*fnNxtPrv)( pCnt );
@@ -599,7 +599,7 @@ const SwCntntFrm * MA_FASTCALL lcl_MissProtectedFrames( const SwCntntFrm *pCnt,
 BOOL MA_FASTCALL lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart,
                     GetNxtPrvCnt fnNxtPrv, BOOL bInReadOnly )
 {
-    ASSERT( pPam->GetNode() == (SwCntntNode*)pStart->GetNode(),
+    OSL_ENSURE( pPam->GetNode() == (SwCntntNode*)pStart->GetNode(),
             "lcl_UpDown arbeitet nicht fuer andere." );
 
     const SwCntntFrm *pCnt = 0;
@@ -678,7 +678,7 @@ BOOL MA_FASTCALL lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart,
             const SwFrm *pCell = pStart->GetUpper();
             while ( pCell && !pCell->IsCellFrm() )
                 pCell = pCell->GetUpper();
-            ASSERT( pCell, "Zelle nicht gefunden." );
+            OSL_ENSURE( pCell, "Zelle nicht gefunden." );
             nX =  (pCell->Frm().*fnRect->fnGetLeft)() +
                   (pCell->Frm().*fnRect->fnGetWidth)() / 2;
 
@@ -702,14 +702,14 @@ BOOL MA_FASTCALL lcl_UpDown( SwPaM *pPam, const SwCntntFrm *pStart,
             const long nPrtLeft = bRTL ?
                                 (pTable->*fnRect->fnGetPrtRight)() :
                                 (pTable->*fnRect->fnGetPrtLeft)();
-            if ( bRTL != nX < nPrtLeft )
+            if ( bRTL != (nX < nPrtLeft) )
                 nX = nPrtLeft;
             else
             {
                    const long nPrtRight = bRTL ?
                                     (pTable->*fnRect->fnGetPrtLeft)() :
                                     (pTable->*fnRect->fnGetPrtRight)();
-                if ( bRTL != nX > nPrtRight )
+                if ( bRTL != (nX > nPrtRight) )
                     nX = nPrtRight;
             }
         }
@@ -892,7 +892,7 @@ BOOL SwCntntFrm::UnitDown( SwPaM* pPam, const SwTwips, BOOL bInReadOnly ) const
 |*************************************************************************/
 USHORT SwRootFrm::GetCurrPage( const SwPaM *pActualCrsr ) const
 {
-    ASSERT( pActualCrsr, "Welche Seite soll's denn sein?" );
+    OSL_ENSURE( pActualCrsr, "Welche Seite soll's denn sein?" );
     const SwFrm *pActFrm = GetFmt()->GetDoc()->GetNodes()[pActualCrsr->GetPoint()->nNode]->
                                     GetCntntNode()->GetFrm( 0,
                                                     pActualCrsr->GetPoint(),
@@ -916,7 +916,7 @@ USHORT SwRootFrm::GetCurrPage( const SwPaM *pActualCrsr ) const
 |*************************************************************************/
 USHORT SwRootFrm::SetCurrPage( SwCursor* pToSet, USHORT nPageNum )
 {
-    ASSERT( Lower() && Lower()->IsPageFrm(), "Keine Seite vorhanden." );
+    OSL_ENSURE( Lower() && Lower()->IsPageFrm(), "Keine Seite vorhanden." );
 
     SwPageFrm *pPage = (SwPageFrm*)Lower();
     BOOL bEnd =FALSE;
@@ -1284,10 +1284,10 @@ const SwCntntFrm *SwLayoutFrm::GetCntntPos( Point& rPoint,
             break;
     }
 
-#ifdef DBG_UTIL
-    ASSERT( pActual, "Keinen Cntnt gefunden." );
+#if OSL_DEBUG_LEVEL > 1
+    OSL_ENSURE( pActual, "Keinen Cntnt gefunden." );
     if ( bBodyOnly )
-        ASSERT( pActual->IsInDocBody(), "Cnt nicht im Body." );
+        OSL_ENSURE( pActual->IsInDocBody(), "Cnt nicht im Body." );
 #endif
 
     //Spezialfall fuer das selektieren von Tabellen, nicht in wiederholte
@@ -1433,7 +1433,7 @@ void SwPageFrm::GetCntntPosition( const Point &rPt, SwPosition &rPos ) const
     {
         // CntntFrm nicht formatiert -> immer auf Node-Anfang
         SwCntntNode* pCNd = (SwCntntNode*)pAct->GetNode();
-        ASSERT( pCNd, "Wo ist mein CntntNode?" );
+        OSL_ENSURE( pCNd, "Wo ist mein CntntNode?" );
         rPos.nNode = *pCNd;
         rPos.nContent.Assign( pCNd, 0 );
     }
@@ -1578,7 +1578,7 @@ Point SwRootFrm::GetNextPrevCntntPos( const Point& rPoint, BOOL bNext ) const
 |*************************************************************************/
 Point SwRootFrm::GetPagePos( USHORT nPageNum ) const
 {
-    ASSERT( Lower() && Lower()->IsPageFrm(), "Keine Seite vorhanden." );
+    OSL_ENSURE( Lower() && Lower()->IsPageFrm(), "Keine Seite vorhanden." );
 
     const SwPageFrm *pPage = (const SwPageFrm*)Lower();
     while ( TRUE )
@@ -1764,7 +1764,7 @@ BOOL SwFrm::WannaRightPage() const
             pDesc = (SwPageDesc*)&pDoc->GetPageDesc( 0 );
         }
     }
-    ASSERT( pDesc, "No pagedescriptor" );
+    OSL_ENSURE( pDesc, "No pagedescriptor" );
     BOOL bOdd;
     if( nPgNum )
         bOdd = nPgNum % 2 ? TRUE : FALSE;
@@ -1855,7 +1855,7 @@ USHORT SwFrm::GetVirtPageNum() const
 bool SwRootFrm::MakeTblCrsrs( SwTableCursor& rTblCrsr )
 {
     //Union-Rects und Tabellen (Follows) der Selektion besorgen.
-    ASSERT( rTblCrsr.GetCntntNode() && rTblCrsr.GetCntntNode( FALSE ),
+    OSL_ENSURE( rTblCrsr.GetCntntNode() && rTblCrsr.GetCntntNode( FALSE ),
             "Tabselection nicht auf Cnt." );
 
     bool bRet = false;
@@ -1885,7 +1885,7 @@ bool SwRootFrm::MakeTblCrsrs( SwTableCursor& rTblCrsr )
     const SwLayoutFrm* pStart = pTmpStartFrm ? pTmpStartFrm->GetUpper() : 0;
     const SwLayoutFrm* pEnd   = pTmpEndFrm   ? pTmpEndFrm->GetUpper() : 0;
 
-    ASSERT( pStart && pEnd, "MakeTblCrsrs: Good to have the code robust here!" )
+    OSL_ENSURE( pStart && pEnd, "MakeTblCrsrs: Good to have the code robust here!" );
     // <--
 
     /* #109590# Only change table boxes if the frames are
@@ -1918,7 +1918,7 @@ bool SwRootFrm::MakeTblCrsrs( SwTableCursor& rTblCrsr )
 
                     while ( pCell && pRow->IsAnLower( pCell ) )
                     {
-                        ASSERT( pCell->IsCellFrm(), "Frame ohne Celle" );
+                        OSL_ENSURE( pCell->IsCellFrm(), "Frame ohne Celle" );
                         if( IsFrmInTblSel( pUnion->GetUnion(), pCell ) &&
                             (bReadOnlyAvailable ||
                              !pCell->GetFmt()->GetProtect().IsCntntProtected()))
@@ -1946,7 +1946,7 @@ bool SwRootFrm::MakeTblCrsrs( SwTableCursor& rTblCrsr )
                                 while( !pCell->IsCellFrm() )
                                 {
                                     pCell = pCell->GetUpper();
-                                    ASSERT( pCell, "Where's my cell?" );
+                                    OSL_ENSURE( pCell, "Where's my cell?" );
                                 }
                             }
                         }
@@ -2030,19 +2030,6 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode )
           ( !pEndPos->nNode.GetNode().IsCntntNode() ||
             !pEndPos->nNode.GetNode().GetCntntNode()->GetFrm() ) ) )
     {
-        /* For SelectAll we will need something like this later on...
-        const SwFrm* pPageFrm = GetLower();
-        while( pPageFrm )
-        {
-            SwRect aTmp( pPageFrm->Prt() );
-            aTmp.Pos() += pPageFrm->Frm().Pos();
-            Sub( aRegion, aTmp );
-            pPageFrm = pPageFrm->GetNext();
-        }
-        aRegion.Invert();
-        rCrsr.Remove( 0, rCrsr.Count() );
-        rCrsr.Insert( &aRegion, 0 );
-        */
         return;
     }
 
@@ -2054,7 +2041,7 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode )
     const SwCntntFrm *pEndFrm   = rNds[ pEndPos->nNode ]->
         GetCntntNode()->GetFrm( &rCrsr.GetEndPos(), pEndPos );
 
-    ASSERT( (pStartFrm && pEndFrm), "Keine CntntFrms gefunden." );
+    OSL_ENSURE( (pStartFrm && pEndFrm), "Keine CntntFrms gefunden." );
 
     //Damit die FlyFrms, in denen selektierte Frames stecken, nicht
     //abgezogen werden
@@ -2062,10 +2049,10 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode )
     if ( pStartFrm->IsInFly() )
     {
         const SwAnchoredObject* pObj = pStartFrm->FindFlyFrm();
-        ASSERT( pObj, "No Start Object." );
+        OSL_ENSURE( pObj, "No Start Object." );
         if (pObj) aSortObjs.Insert( *(const_cast<SwAnchoredObject*>(pObj)) );
         const SwAnchoredObject* pObj2 = pEndFrm->FindFlyFrm();
-        ASSERT( pObj2, "No Start Object." );
+        OSL_ENSURE( pObj2, "No Start Object." );
         if (pObj2) aSortObjs.Insert( *(const_cast<SwAnchoredObject*>(pObj2)) );
     }
 
@@ -2100,7 +2087,7 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode )
             if( !pEndLFrm )
                 break;
 
-            ASSERT( pEndLFrm->GetType() == pSttLFrm->GetType(),
+            OSL_ENSURE( pEndLFrm->GetType() == pSttLFrm->GetType(),
                     "Selection ueber unterschiedliche Inhalte" );
             switch( pSttLFrm->GetType() )
             {
@@ -2311,12 +2298,14 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode )
                         (aTmp.*fnRectX->fnSetTop)( nTmp );
                         if( (aEndRect.*fnRectX->fnGetTop)() !=
                             (pEnd2Pos->aPortion.*fnRectX->fnGetTop)() )
-                        if( bPorR2L )
-                            (aTmp.*fnRectX->fnSetLeft)(
-                                (pEnd2Pos->aPortion.*fnRectX->fnGetLeft)() );
-                        else
-                            (aTmp.*fnRectX->fnSetRight)(
-                                (pEnd2Pos->aPortion.*fnRectX->fnGetRight)() );
+                        {
+                            if( bPorR2L )
+                                (aTmp.*fnRectX->fnSetLeft)(
+                                    (pEnd2Pos->aPortion.*fnRectX->fnGetLeft)() );
+                            else
+                                (aTmp.*fnRectX->fnSetRight)(
+                                    (pEnd2Pos->aPortion.*fnRectX->fnGetRight)() );
+                        }
                         aTmp.Intersection( aEndFrm );
                         Sub( aRegion, aTmp );
                     }
@@ -2515,7 +2504,7 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode )
             // --> OD 2006-01-24 #123908# - introduce robust code:
             // The stacktrace issue reveals that <pCntnt> could be NULL.
             // One root cause found by AMA - see #130650#
-            ASSERT( pCntnt,
+            OSL_ENSURE( pCntnt,
                     "<SwRootFrm::CalcFrmRects(..)> - no content frame. This is a serious defect -> please inform OD" );
             while ( pCntnt && pCntnt != pEndFrm )
             // <--
@@ -2556,7 +2545,7 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode )
                 }
                 pCntnt = pCntnt->GetNextCntntFrm();
                 // --> OD 2006-01-24 #123908#
-                ASSERT( pCntnt,
+                OSL_ENSURE( pCntnt,
                         "<SwRootFrm::CalcFrmRects(..)> - no content frame. This is a serious defect -> please inform OD" );
                 // <--
             }
@@ -2621,7 +2610,7 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode )
                     const UINT32 nPos = pObj->GetOrdNum();
                     for ( USHORT k = 0; bSub && k < aSortObjs.Count(); ++k )
                     {
-                        ASSERT( aSortObjs[k]->ISA(SwFlyFrm),
+                        OSL_ENSURE( aSortObjs[k]->ISA(SwFlyFrm),
                                 "<SwRootFrm::CalcFrmRects(..)> - object in <aSortObjs> of unexcepted type" );
                         const SwFlyFrm* pTmp = static_cast<SwFlyFrm*>(aSortObjs[k]);
                         do
diff --git a/sw/source/core/layout/unusedf.cxx b/sw/source/core/layout/unusedf.cxx
index 61415f16e213..d231535c5c87 100644
--- a/sw/source/core/layout/unusedf.cxx
+++ b/sw/source/core/layout/unusedf.cxx
@@ -39,47 +39,47 @@
 
 void SwFrm::Format( const SwBorderAttrs * )
 {
-    ASSERT( FALSE, "Format() der Basisklasse gerufen." );
+    OSL_ENSURE( FALSE, "Format() der Basisklasse gerufen." );
 }
 
 void SwFrm::Paint(const SwRect &, const SwPrtOptions * ) const
 {
-    ASSERT( FALSE, "Paint() der Basisklasse gerufen." );
+    OSL_ENSURE( FALSE, "Paint() der Basisklasse gerufen." );
 }
 
 sal_Bool SwCntntFrm::WouldFit( SwTwips &, sal_Bool&, sal_Bool )
 {
-    ASSERT( FALSE, "WouldFit des CntntFrm gerufen." );
+    OSL_ENSURE( FALSE, "WouldFit des CntntFrm gerufen." );
     return FALSE;
 }
 
 bool SwFrm::FillSelection( SwSelectionList& , const SwRect& ) const
 {
-    ASSERT( false, "Don't call this function at the base class!" );
+    OSL_ENSURE( false, "Don't call this function at the base class!" );
     return false;
 }
 
 BOOL SwFrm::GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState*  ) const
 {
-    ASSERT( FALSE, "GetCrsrOfst der Basisklasse, hi!" );
+    OSL_ENSURE( FALSE, "GetCrsrOfst der Basisklasse, hi!" );
     return FALSE;
 }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
 void SwRootFrm::Cut()
 {
-    ASSERT( FALSE, "Cut() des RootFrm gerufen." );
+    OSL_ENSURE( FALSE, "Cut() des RootFrm gerufen." );
 }
 
 void SwRootFrm::Paste( SwFrm *, SwFrm * )
 {
-    ASSERT( FALSE, "Paste() des RootFrm gerufen." );
+    OSL_ENSURE( FALSE, "Paste() des RootFrm gerufen." );
 }
 
 void SwFlyFrm::Paste( SwFrm *, SwFrm * )
 {
-    ASSERT( FALSE, "Paste() des FlyFrm gerufen." );
+    OSL_ENSURE( FALSE, "Paste() des FlyFrm gerufen." );
 }
 
 #endif
@@ -87,7 +87,7 @@ void SwFlyFrm::Paste( SwFrm *, SwFrm * )
 BOOL SwFrm::GetCharRect( SwRect&, const SwPosition&,
                          SwCrsrMoveState* ) const
 {
-    ASSERT( FALSE, "GetCharRect() der Basis gerufen." );
+    OSL_ENSURE( FALSE, "GetCharRect() der Basis gerufen." );
     return FALSE;
 }
 
diff --git a/sw/source/core/layout/virtoutp.cxx b/sw/source/core/layout/virtoutp.cxx
index 5e53273e34cb..4a56c37497c2 100644
--- a/sw/source/core/layout/virtoutp.cxx
+++ b/sw/source/core/layout/virtoutp.cxx
@@ -40,7 +40,7 @@
 // OD 12.11.2002 #96272# - include declaration for <SetMappingForVirtDev>
 #include "setmapvirtdev.hxx"
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
 /*************************************************************************
  *                          class DbgRect
@@ -210,7 +210,7 @@ void SwLayVout::Enter(  ViewShell *pShell, SwRect &rRect, BOOL bOn )
         aTmp.SSize().Height()+= aPixSz.Height()/2 + 1;
         Rectangle aTmpRect( pO->LogicToPixel( aTmp.SVRect() ) );
 
-        ASSERT( !pSh->GetWin()->IsReallyVisible() ||
+        OSL_ENSURE( !pSh->GetWin()->IsReallyVisible() ||
                 aTmpRect.GetWidth() <= pSh->GetWin()->GetOutputSizePixel().Width() + 2,
                 "Paintwidth bigger than visarea?" );
         // Passt das Rechteck in unseren Buffer ?
@@ -246,7 +246,7 @@ void SwLayVout::Enter(  ViewShell *pShell, SwRect &rRect, BOOL bOn )
 
 void SwLayVout::_Flush()
 {
-    ASSERT( pVirDev, "SwLayVout::DrawOut: nothing left Toulouse" );
+    OSL_ENSURE( pVirDev, "SwLayVout::DrawOut: nothing left Toulouse" );
     Rectangle aTmp( aRect.SVRect() );
     pOut->DrawOutDev( aRect.Pos(), aRect.SSize(),
                       aRect.Pos(), aRect.SSize(), *pVirDev );
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index dff9c796032f..901a742ecdb4 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -103,11 +103,11 @@ SwFrm::SwFrm( SwModify *pMod ) :
     , bInfFtn ( FALSE )
     , bInfSct ( FALSE )
 {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     bFlag01 = bFlag02 = bFlag03 = bFlag04 = bFlag05 = 0;
 #endif
 
-    ASSERT( pMod, "Kein Frameformat uebergeben." );
+    OSL_ENSURE( pMod, "Kein Frameformat uebergeben." );
     bInvalidR2L = bInvalidVert = 1;
     bDerivedR2L = bDerivedVert = bRightToLeft = bVertical = bReverse = 0;
     bValidPos = bValidPrtArea = bValidSize = bValidLineNum = bRetouche =
@@ -337,7 +337,7 @@ void SwFrm::_UpdateAttrFrm( SfxPoolItem *pOld, SfxPoolItem *pNew,
             break;
         }
         case RES_COL:
-            ASSERT( FALSE, "Spalten fuer neuen FrmTyp?" );
+            OSL_ENSURE( FALSE, "Spalten fuer neuen FrmTyp?" );
             break;
 
         default:
@@ -571,8 +571,8 @@ Size SwFrm::ChgSize( const Size& aNewSize )
 |*************************************************************************/
 void SwFrm::InsertBefore( SwLayoutFrm* pParent, SwFrm* pBehind )
 {
-    ASSERT( pParent, "Kein Parent fuer Insert." );
-    ASSERT( (!pBehind || (pBehind && pParent == pBehind->GetUpper())),
+    OSL_ENSURE( pParent, "Kein Parent fuer Insert." );
+    OSL_ENSURE( (!pBehind || (pBehind && pParent == pBehind->GetUpper())),
             "Framebaum inkonsistent." );
 
     pUpper = pParent;
@@ -612,8 +612,8 @@ void SwFrm::InsertBefore( SwLayoutFrm* pParent, SwFrm* pBehind )
 |*************************************************************************/
 void SwFrm::InsertBehind( SwLayoutFrm *pParent, SwFrm *pBefore )
 {
-    ASSERT( pParent, "Kein Parent fuer Insert." );
-    ASSERT( (!pBefore || (pBefore && pParent == pBefore->GetUpper())),
+    OSL_ENSURE( pParent, "Kein Parent fuer Insert." );
+    OSL_ENSURE( (!pBefore || (pBefore && pParent == pBefore->GetUpper())),
             "Framebaum inkonsistent." );
 
     pUpper = pParent;
@@ -661,8 +661,8 @@ void SwFrm::InsertBehind( SwLayoutFrm *pParent, SwFrm *pBefore )
 |*************************************************************************/
 void SwFrm::InsertGroupBefore( SwFrm* pParent, SwFrm* pBehind, SwFrm* pSct )
 {
-    ASSERT( pParent, "Kein Parent fuer Insert." );
-    ASSERT( (!pBehind || (pBehind && ( pParent == pBehind->GetUpper())
+    OSL_ENSURE( pParent, "Kein Parent fuer Insert." );
+    OSL_ENSURE( (!pBehind || (pBehind && ( pParent == pBehind->GetUpper())
             || ( pParent->IsSctFrm() && pBehind->GetUpper()->IsColBodyFrm() ) ) ),
             "Framebaum inkonsistent." );
     if( pSct )
@@ -705,9 +705,9 @@ void SwFrm::InsertGroupBefore( SwFrm* pParent, SwFrm* pBehind, SwFrm* pSct )
             SwLayoutFrm* pTmp = (SwLayoutFrm*)pSct;
             if( pTmp->Lower() )
             {
-                ASSERT( pTmp->Lower()->IsColumnFrm(), "InsertGrp: Used SectionFrm" );
+                OSL_ENSURE( pTmp->Lower()->IsColumnFrm(), "InsertGrp: Used SectionFrm" );
                 pTmp = (SwLayoutFrm*)((SwLayoutFrm*)pTmp->Lower())->Lower();
-                ASSERT( pTmp, "InsertGrp: Missing ColBody" );
+                OSL_ENSURE( pTmp, "InsertGrp: Missing ColBody" );
             }
             pBehind->pUpper = pTmp;
             pBehind->GetUpper()->pLower = pBehind;
@@ -720,7 +720,7 @@ void SwFrm::InsertGroupBefore( SwFrm* pParent, SwFrm* pBehind, SwFrm* pSct )
         }
         else
         {
-            ASSERT( pSct->IsSctFrm(), "InsertGroup: For SectionFrms only" );
+            OSL_ENSURE( pSct->IsSctFrm(), "InsertGroup: For SectionFrms only" );
             delete ((SwSectionFrm*)pSct);
         }
     }
@@ -767,14 +767,14 @@ void SwFrm::InsertGroupBefore( SwFrm* pParent, SwFrm* pBehind, SwFrm* pSct )
 |*************************************************************************/
 void SwFrm::Remove()
 {
-    ASSERT( pUpper, "Removen ohne Upper?" );
+    OSL_ENSURE( pUpper, "Removen ohne Upper?" );
 
     if( pPrev )
         // einer aus der Mitte wird removed
         pPrev->pNext = pNext;
     else
     {   // der erste in einer Folge wird removed
-        ASSERT( pUpper->pLower == this, "Layout inkonsistent." );
+        OSL_ENSURE( pUpper->pLower == this, "Layout inkonsistent." );
         pUpper->pLower = pNext;
     }
     if( pNext )
@@ -794,14 +794,14 @@ void SwFrm::Remove()
 |*************************************************************************/
 void SwCntntFrm::Paste( SwFrm* pParent, SwFrm* pSibling)
 {
-    ASSERT( pParent, "Kein Parent fuer Paste." );
-    ASSERT( pParent->IsLayoutFrm(), "Parent ist CntntFrm." );
-    ASSERT( pParent != this, "Bin selbst der Parent." );
-    ASSERT( pSibling != this, "Bin mein eigener Nachbar." );
-    ASSERT( !GetPrev() && !GetNext() && !GetUpper(),
+    OSL_ENSURE( pParent, "Kein Parent fuer Paste." );
+    OSL_ENSURE( pParent->IsLayoutFrm(), "Parent ist CntntFrm." );
+    OSL_ENSURE( pParent != this, "Bin selbst der Parent." );
+    OSL_ENSURE( pSibling != this, "Bin mein eigener Nachbar." );
+    OSL_ENSURE( !GetPrev() && !GetNext() && !GetUpper(),
             "Bin noch irgendwo angemeldet." );
-    ASSERT( !pSibling || pSibling->IsFlowFrm(),
-            "<SwCntntFrm::Paste(..)> - sibling not of expected type." )
+    OSL_ENSURE( !pSibling || pSibling->IsFlowFrm(),
+            "<SwCntntFrm::Paste(..)> - sibling not of expected type." );
 
     //In den Baum einhaengen.
     InsertBefore( (SwLayoutFrm*)pParent, pSibling );
@@ -902,7 +902,7 @@ void SwCntntFrm::Paste( SwFrm* pParent, SwFrm* pSibling)
 |*************************************************************************/
 void SwCntntFrm::Cut()
 {
-    ASSERT( GetUpper(), "Cut ohne Upper()." );
+    OSL_ENSURE( GetUpper(), "Cut ohne Upper()." );
 
     SwPageFrm *pPage = FindPageFrm();
     InvalidatePage( pPage );
@@ -1095,11 +1095,11 @@ void SwCntntFrm::Cut()
 |*************************************************************************/
 void SwLayoutFrm::Paste( SwFrm* pParent, SwFrm* pSibling)
 {
-    ASSERT( pParent, "Kein Parent fuer Paste." );
-    ASSERT( pParent->IsLayoutFrm(), "Parent ist CntntFrm." );
-    ASSERT( pParent != this, "Bin selbst der Parent." );
-    ASSERT( pSibling != this, "Bin mein eigener Nachbar." );
-    ASSERT( !GetPrev() && !GetNext() && !GetUpper(),
+    OSL_ENSURE( pParent, "Kein Parent fuer Paste." );
+    OSL_ENSURE( pParent->IsLayoutFrm(), "Parent ist CntntFrm." );
+    OSL_ENSURE( pParent != this, "Bin selbst der Parent." );
+    OSL_ENSURE( pSibling != this, "Bin mein eigener Nachbar." );
+    OSL_ENSURE( !GetPrev() && !GetNext() && !GetUpper(),
             "Bin noch irgendwo angemeldet." );
 
     //In den Baum einhaengen.
@@ -1265,7 +1265,7 @@ void SwLayoutFrm::Cut()
 |*************************************************************************/
 SwTwips SwFrm::Grow( SwTwips nDist, BOOL bTst, BOOL bInfo )
 {
-    ASSERT( nDist >= 0, "Negatives Wachstum?" );
+    OSL_ENSURE( nDist >= 0, "Negatives Wachstum?" );
 
     PROTOCOL_ENTER( this, bTst ? PROT_GROW_TST : PROT_GROW, 0, &nDist )
 
@@ -1317,7 +1317,7 @@ SwTwips SwFrm::Grow( SwTwips nDist, BOOL bTst, BOOL bInfo )
 |*************************************************************************/
 SwTwips SwFrm::Shrink( SwTwips nDist, BOOL bTst, BOOL bInfo )
 {
-    ASSERT( nDist >= 0, "Negative Verkleinerung?" );
+    OSL_ENSURE( nDist >= 0, "Negative Verkleinerung?" );
 
     PROTOCOL_ENTER( this, bTst ? PROT_SHRINK_TST : PROT_SHRINK, 0, &nDist )
 
@@ -1651,14 +1651,14 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, BOOL bTst )
         if( ( IsHeaderFrm() || IsFooterFrm() ) && pBoss->GetDrawObjs() )
         {
             const SwSortedObjs &rObjs = *pBoss->GetDrawObjs();
-            ASSERT( pBoss->IsPageFrm(), "Header/Footer out of page?" );
+            OSL_ENSURE( pBoss->IsPageFrm(), "Header/Footer out of page?" );
             for ( USHORT i = 0; i < rObjs.Count(); ++i )
             {
                 SwAnchoredObject* pAnchoredObj = rObjs[i];
                 if ( pAnchoredObj->ISA(SwFlyFrm) )
                 {
                     SwFlyFrm* pFly = static_cast<SwFlyFrm*>(pAnchoredObj);
-                    ASSERT( !pFly->IsFlyInCntFrm(), "FlyInCnt at Page?" );
+                    OSL_ENSURE( !pFly->IsFlyInCntFrm(), "FlyInCnt at Page?" );
                     const SwFmtVertOrient &rVert =
                                         pFly->GetFmt()->GetVertOrient();
                    // Wann muss invalidiert werden?
@@ -1768,7 +1768,7 @@ void SwFrm::ImplInvalidateLineNum()
     if ( _InvalidationAllowed( INVALID_LINENUM ) )
     {
         bValidLineNum = FALSE;
-        ASSERT( IsTxtFrm(), "line numbers are implemented for text only" );
+        OSL_ENSURE( IsTxtFrm(), "line numbers are implemented for text only" );
         InvalidatePage();
 
         // OD 2004-05-19 #i28701#
@@ -1996,8 +1996,8 @@ SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
 SwTwips SwCntntFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
 {
     SWRECTFN( this )
-    ASSERT( nDist >= 0, "nDist < 0" );
-    ASSERT( nDist <= (Frm().*fnRect->fnGetHeight)(),
+    OSL_ENSURE( nDist >= 0, "nDist < 0" );
+    OSL_ENSURE( nDist <= (Frm().*fnRect->fnGetHeight)(),
             "nDist > als aktuelle Grosse." );
 
     if ( !bTst )
@@ -2583,7 +2583,7 @@ SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
     if( !(GetType() & nTmpType) && HasFixSize() )
         return 0;
 
-    ASSERT( nDist >= 0, "nDist < 0" );
+    OSL_ENSURE( nDist >= 0, "nDist < 0" );
     SWRECTFN( this )
     SwTwips nFrmHeight = (Frm().*fnRect->fnGetHeight)();
     if ( nDist > nFrmHeight )
@@ -2639,7 +2639,7 @@ SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
                                             + nRealDist - nReal );
                 if( bChgPos )
                     Frm().Pos().X() += nRealDist - nReal;
-                ASSERT( !IsAccessibleFrm(), "bMoveAccFrm has to be set!" );
+                OSL_ENSURE( !IsAccessibleFrm(), "bMoveAccFrm has to be set!" );
             }
         }
     }
@@ -2652,7 +2652,7 @@ SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo )
                                           + nReal - nTmp );
             if( bChgPos )
                 Frm().Pos().X() += nTmp - nReal;
-            ASSERT( !IsAccessibleFrm(), "bMoveAccFrm has to be set!" );
+            OSL_ENSURE( !IsAccessibleFrm(), "bMoveAccFrm has to be set!" );
             nReal = nTmp;
         }
     }
@@ -3041,7 +3041,7 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize )
                              ( IsColumnFrm() && IsInSct() )
                            )
                         {
-                            ASSERT( pLowerFrm->IsBodyFrm() || pLowerFrm->IsFtnContFrm(),
+                            OSL_ENSURE( pLowerFrm->IsBodyFrm() || pLowerFrm->IsFtnContFrm(),
                                     "ChgLowersProp - only for body or foot note container" );
                             if ( pLowerFrm->IsBodyFrm() || pLowerFrm->IsFtnContFrm() )
                             {
@@ -3053,7 +3053,7 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize )
                                     if ( nNewHeight < 0)
                                     {
                                         // OD 01.04.2003 #108446# - adjust assertion condition and text
-                                        ASSERT( !( IsPageFrm() &&
+                                        OSL_ENSURE( !( IsPageFrm() &&
                                                    (pLowerFrm->Frm().Height()>0) &&
                                                    (pLowerFrm->IsValid()) ),
                                                     "ChgLowersProg - negative height for lower.");
@@ -3126,19 +3126,19 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize )
     // Finally adjust the columns if width is set to auto
     // Possible optimisation: execute this code earlier in this function and
     // return???
-    if ( ( bVert && bHeightChgd || ! bVert && bWidthChgd ) &&
+    if ( ( (bVert && bHeightChgd) || (!bVert && bWidthChgd) ) &&
            Lower()->IsColumnFrm() )
     {
         // get column attribute
         const SwFmtCol* pColAttr = NULL;
         if ( IsPageBodyFrm() )
         {
-            ASSERT( GetUpper()->IsPageFrm(), "Upper is not page frame" )
+            OSL_ENSURE( GetUpper()->IsPageFrm(), "Upper is not page frame" );
             pColAttr = &GetUpper()->GetFmt()->GetCol();
         }
         else
         {
-            ASSERT( IsFlyFrm() || IsSctFrm(), "Columns not in fly or section" )
+            OSL_ENSURE( IsFlyFrm() || IsSctFrm(), "Columns not in fly or section" );
             pColAttr = &GetFmt()->GetCol();
         }
 
@@ -3159,7 +3159,7 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize )
 |*************************************************************************/
 void SwLayoutFrm::Format( const SwBorderAttrs *pAttrs )
 {
-    ASSERT( pAttrs, "LayoutFrm::Format, pAttrs ist 0." );
+    OSL_ENSURE( pAttrs, "LayoutFrm::Format, pAttrs ist 0." );
 
     if ( bValidPrtArea && bValidSize )
         return;
@@ -3251,7 +3251,7 @@ void SwLayoutFrm::Format( const SwBorderAttrs *pAttrs )
 |*************************************************************************/
 static void InvaPercentFlys( SwFrm *pFrm, SwTwips nDiff )
 {
-    ASSERT( pFrm->GetDrawObjs(), "Can't find any Objects" );
+    OSL_ENSURE( pFrm->GetDrawObjs(), "Can't find any Objects" );
     for ( USHORT i = 0; i < pFrm->GetDrawObjs()->Count(); ++i )
     {
         SwAnchoredObject* pAnchoredObj = (*pFrm->GetDrawObjs())[i];
@@ -3297,7 +3297,7 @@ void SwLayoutFrm::InvaPercentLowers( SwTwips nDiff )
             if ( pFrm->IsInTab() && !IsTabFrm() )
             {
                 SwFrm *pTmp = pFrm->FindTabFrm();
-                ASSERT( pTmp, "Where's my TabFrm?" );
+                OSL_ENSURE( pTmp, "Where's my TabFrm?" );
                 if( IsAnLower( pTmp ) )
                     pFrm = pTmp;
             }
@@ -3354,7 +3354,7 @@ long MA_FASTCALL lcl_CalcMinColDiff( SwLayoutFrm *pLayFrm )
 {
     long nDiff = 0, nFirstDiff = 0;
     SwLayoutFrm *pCol = (SwLayoutFrm*)pLayFrm->Lower();
-    ASSERT( pCol, "Where's the columnframe?" );
+    OSL_ENSURE( pCol, "Where's the columnframe?" );
     SwFrm *pFrm = pCol->Lower();
     do
     {
@@ -3569,7 +3569,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs,
             ::CalcCntnt( this );
 
             pCol = (SwLayoutFrm*)Lower();
-            ASSERT( pCol && pCol->GetNext(), ":-( Spalten auf Urlaub?");
+            OSL_ENSURE( pCol && pCol->GetNext(), ":-( Spalten auf Urlaub?");
             // bMinDiff wird gesetzt, wenn es keine leere Spalte gibt
             BOOL bMinDiff = TRUE;
             // OD 28.03.2003 #108446# - check for all column content and all columns
@@ -3603,7 +3603,7 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs,
                 {
                     bFoundLower = TRUE;
                     pLay = (SwLayoutFrm*)pLay->GetNext();
-                    ASSERT( pLay->IsFtnContFrm(),"FtnContainer exspected" );
+                    OSL_ENSURE( pLay->IsFtnContFrm(),"FtnContainer exspected" );
                     nInnerHeight += pLay->InnerHeight();
                     nInnerHeight += (pLay->Frm().*fnRect->fnGetHeight)() -
                                     (pLay->Prt().*fnRect->fnGetHeight)();
@@ -3845,9 +3845,9 @@ void lcl_InvalidateCntnt( SwCntntFrm *pCnt, BYTE nInv )
                 if( pLastSctCnt == pCnt )
                     pLastSctCnt = NULL;
             }
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
             else
-                ASSERT( !pLastSctCnt, "Where's the last SctCntnt?" );
+                OSL_ENSURE( !pLastSctCnt, "Where's the last SctCntnt?" );
 #endif
         }
         if( nInv & INV_TABLE )
@@ -3873,9 +3873,9 @@ void lcl_InvalidateCntnt( SwCntntFrm *pCnt, BYTE nInv )
                     pLastSctCnt = NULL;
                 }
             }
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
             else
-                ASSERT( !pLastTabCnt, "Where's the last TabCntnt?" );
+                OSL_ENSURE( !pLastTabCnt, "Where's the last TabCntnt?" );
 #endif
         }
 
diff --git a/sw/source/core/makefile.mk b/sw/source/core/makefile.mk
index 2701445fb888..04022c30cb58 100644
--- a/sw/source/core/makefile.mk
+++ b/sw/source/core/makefile.mk
@@ -69,7 +69,7 @@ SUBLIBS3= \
                 $(SLB)$/SwNumberTree.lib \
                 $(SLB)$/tablecore.lib
 
-.IF "$(dbgutil)"!=""
+.IF "$(DBG_LEVEL)">="2"
 SUBLIBS3+= \
         $(SLB)$/except.lib
 .ENDIF
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index 84735025bd1e..29004a0e68f3 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -75,7 +75,7 @@ SwAnchoredObjectPosition::SwAnchoredObjectPosition( SdrObject& _rDrawObj )
             ( !mrDrawObj.ISA(SdrVirtObj) &&    // 'master' drawing object
               !mrDrawObj.ISA(SwFlyDrawObj) );  // - indirectly checked
     (void) bObjOfExceptedType;
-    ASSERT( bObjOfExceptedType,
+    OSL_ENSURE( bObjOfExceptedType,
             "SwAnchoredObjectPosition(..) - object of unexcepted type!" );
 #endif
 
@@ -100,7 +100,7 @@ void SwAnchoredObjectPosition::_GetInfoAboutObj()
     // determine contact object
     {
         mpContact = static_cast<SwContact*>(GetUserCall( &mrDrawObj ));
-        ASSERT( mpContact,
+        OSL_ENSURE( mpContact,
                 "SwAnchoredObjectPosition::_GetInfoAboutObj() - missing SwContact-object." );
     }
 
@@ -108,7 +108,7 @@ void SwAnchoredObjectPosition::_GetInfoAboutObj()
     {
         // OD 2004-03-30 #i26791#
         mpAnchoredObj = mpContact->GetAnchoredObj( &mrDrawObj );
-        ASSERT( mpAnchoredObj,
+        OSL_ENSURE( mpAnchoredObj,
                 "SwAnchoredObjectPosition::_GetInfoAboutObj() - missing anchored object." );
     }
 
@@ -116,7 +116,7 @@ void SwAnchoredObjectPosition::_GetInfoAboutObj()
     {
         // OD 2004-03-23 #i26791#
         mpAnchorFrm = mpAnchoredObj->AnchorFrm();
-        ASSERT( mpAnchorFrm,
+        OSL_ENSURE( mpAnchorFrm,
                 "SwAnchoredObjectPosition::_GetInfoAboutObj() - missing anchor frame." );
     }
 
@@ -124,7 +124,7 @@ void SwAnchoredObjectPosition::_GetInfoAboutObj()
     {
         // --> OD 2004-07-01 #i28701#
         mpFrmFmt = &mpAnchoredObj->GetFrmFmt();
-        ASSERT( mpFrmFmt,
+        OSL_ENSURE( mpFrmFmt,
                 "<SwAnchoredObjectPosition::_GetInfoAboutObj() - missing frame format." );
     }
 
@@ -305,7 +305,7 @@ void SwAnchoredObjectPosition::_GetVertAlignmentValues(
             }
             else
             {
-                ASSERT( false,
+                OSL_ENSURE( false,
                         "<SwAnchoredObjectPosition::_GetVertAlignmentValues(..)> - invalid relative alignment" );
             }
         }
@@ -320,19 +320,15 @@ void SwAnchoredObjectPosition::_GetVertAlignmentValues(
             }
             else
             {
-                ASSERT( false,
+                OSL_ENSURE( false,
                         "<SwAnchoredObjectPosition::_GetVertAlignmentValues(..)> - invalid relative alignment" );
             }
         }
         break;
         // no break here, because text::RelOrientation::CHAR is invalid, if !mbAnchorToChar
         default:
-        //case text::RelOrientation::PAGE_LEFT:     not valid for vertical alignment
-        //case text::RelOrientation::PAGE_RIGHT:    not valid for vertical alignment
-        //case text::RelOrientation::FRAME_LEFT:    not valid for vertical alignment
-        //case text::RelOrientation::FRAME_RIGHT:   not valid for vertical alignment
         {
-            ASSERT( false,
+            OSL_ENSURE( false,
                     "<SwAnchoredObjectPosition::_GetVertAlignmentValues(..)> - invalid relative alignment" );
         }
     }
@@ -390,7 +386,7 @@ SwTwips SwAnchoredObjectPosition::_GetVertRelPos(
         break;
         default:
         {
-            ASSERT( false,
+            OSL_ENSURE( false,
                     "<SwAnchoredObjectPosition::_GetVertRelPos(..) - invalid vertical positioning" );
         }
     }
@@ -469,17 +465,9 @@ SwTwips SwAnchoredObjectPosition::_ImplAdjustVertRelPos( const SwTwips _nTopOfAn
         // OD 2004-07-22 #i31805# - consider value of <_bCheckBottom>
         if ( _bCheckBottom &&
              _nTopOfAnch + nAdjustedRelPosY + aObjSize.Height() >
-                // --> OD 2006-01-13 #129959#
-                // Do not mix usage of <top + height> and <bottom>
-//                aPgAlignArea.Bottom() )
                 aPgAlignArea.Top() + aPgAlignArea.Height() )
-                // <--
         {
-            // --> OD 2006-01-13 #129959#
-            // Do not mix usage of <top + height> and <bottom>
-//            nAdjustedRelPosY = aPgAlignArea.Bottom() -
             nAdjustedRelPosY = aPgAlignArea.Top() + aPgAlignArea.Height() -
-            // <--
                                _nTopOfAnch -
                                aObjSize.Height();
         }
@@ -626,8 +614,6 @@ void SwAnchoredObjectPosition::_GetHoriAlignmentValues( const SwFrm&  _rHoriOrie
             // align at right border of anchor frame
             // OD 19.08.2003 #110978# - unify and simplify
             nWidth = (_rHoriOrientFrm.*fnRect->fnGetRightMargin)();
-            //nOffset = (_rHoriOrientFrm.Frm().*fnRect->fnGetWidth)() -
-            //          nWidth;
             nOffset = (_rHoriOrientFrm.Prt().*fnRect->fnGetRight)();
         }
         break;
@@ -838,40 +824,6 @@ SwTwips SwAnchoredObjectPosition::_CalcRelPosX(
         nRelPosX += (*fnRect->fnXDiff)( nLeftOrient, nLeftAnchor );
     }
 
-    // OD 2004-05-21 #i28701# - deactivate follow code
-//    // adjust relative horizontal position, if object is manual horizontal
-//    // positioned (not 'page' aligned) and orients not at the anchor frame,
-//    // but it overlaps anchor frame.
-//    if ( _rHoriOrient.GetHoriOrient() == text::HoriOrientation::NONE && !bAlignedRelToPage &&
-//         &rAnchorFrm != &_rHoriOrientFrm )
-//    {
-//        // E.g.: consider a columned page/section with an horizontal
-//        //       negative positioned object.
-//        // OD 2004-03-23 #i26791#
-//        const SwRect& rObjRect = GetAnchoredObj().GetObjRect();
-//        if( bVert )
-//        {
-//            if( _rHoriOrientFrm.Frm().Top() > rAnchorFrm.Frm().Bottom() &&
-//                rObjRect.Right() > rAnchorFrm.Frm().Left() )
-//            {
-//                const SwTwips nProposedPosX = nRelPosX + rAnchorFrm.Frm().Top();
-//                if ( nProposedPosX < rAnchorFrm.Frm().Bottom() )
-//                    nRelPosX = rAnchorFrm.Frm().Height() + 1;
-//            }
-//        }
-//        else
-//        {
-//            if( _rHoriOrientFrm.Frm().Left() > rAnchorFrm.Frm().Right() &&
-//                rObjRect.Top() < rAnchorFrm.Frm().Bottom() )
-//            {
-//                // OD 04.08.2003 #110978# - correction: use <nRelPosX>
-//                // instead of <aRelPos.X()>
-//                const SwTwips nProposedPosX = nRelPosX + rAnchorFrm.Frm().Left();
-//                if ( nProposedPosX < rAnchorFrm.Frm().Right() )
-//                    nRelPosX = rAnchorFrm.Frm().Width() + 1;
-//            }
-//        }
-//    }
     // adjust calculated relative horizontal position, in order to
     // keep object inside 'page' alignment layout frame
     const SwFrm& rEnvironmentLayFrm =
@@ -924,7 +876,7 @@ SwTwips SwAnchoredObjectPosition::_AdjustHoriRelPosForDrawAside(
     if ( !GetAnchorFrm().ISA(SwTxtFrm) ||
          !GetAnchoredObj().ISA(SwFlyAtCntFrm) )
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "<SwAnchoredObjectPosition::_AdjustHoriRelPosForDrawAside(..) - usage for wrong anchor type" );
         return _nProposedRelPosX;
     }
diff --git a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
index c7e7833ac0ea..a5facaf474b9 100644
--- a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
@@ -84,7 +84,7 @@ SwAsCharAnchoredObjectPosition::~SwAsCharAnchoredObjectPosition()
 */
 const SwTxtFrm& SwAsCharAnchoredObjectPosition::GetAnchorTxtFrm() const
 {
-    ASSERT( GetAnchorFrm().ISA(SwTxtFrm),
+    OSL_ENSURE( GetAnchorFrm().ISA(SwTxtFrm),
             "SwAsCharAnchoredObjectPosition::GetAnchorTxtFrm() - wrong anchor frame type" );
 
     return static_cast<const SwTxtFrm&>(GetAnchorFrm());
@@ -289,7 +289,7 @@ void SwAsCharAnchoredObjectPosition::CalcPosition()
             rAnchorFrm.SwitchHorizontalToVertical( aAnchorPos );
 
         // --> OD 2005-03-09 #i44347# - keep last object rectangle at anchored object
-        ASSERT ( GetAnchoredObj().ISA(SwAnchoredDrawObject),
+       OSL_ENSURE( GetAnchoredObj().ISA(SwAnchoredDrawObject),
                  "<SwAsCharAnchoredObjectPosition::CalcPosition()> - wrong type of anchored object." );
         SwAnchoredDrawObject& rAnchoredDrawObj =
                         static_cast<SwAnchoredDrawObject&>( GetAnchoredObj() );
@@ -317,7 +317,7 @@ void SwAsCharAnchoredObjectPosition::CalcPosition()
             aRelAttr = Point( 0, nRelPos );
 
         // OD 2004-03-23 #i26791#
-        ASSERT( GetAnchoredObj().ISA(SwFlyInCntFrm),
+        OSL_ENSURE( GetAnchoredObj().ISA(SwFlyInCntFrm),
                 "<SwAsCharAnchoredObjectPosition::CalcPosition()> - wrong anchored object." );
         const SwFlyInCntFrm& rFlyInCntFrm =
                 static_cast<const SwFlyInCntFrm&>(GetAnchoredObj());
@@ -338,7 +338,7 @@ void SwAsCharAnchoredObjectPosition::CalcPosition()
                 aObjBoundRect.Height( aObjBoundRect.Height() + rULSpace.GetLower() );
             }
         }
-        ASSERT( (rFlyInCntFrm.Frm().*fnRect->fnGetHeight)(),
+        OSL_ENSURE( (rFlyInCntFrm.Frm().*fnRect->fnGetHeight)(),
             "SwAnchoredObjectPosition::CalcPosition(..) - fly frame has an invalid height" );
     }
 
diff --git a/sw/source/core/objectpositioning/environmentofanchoredobject.cxx b/sw/source/core/objectpositioning/environmentofanchoredobject.cxx
index 065f6676897b..a6585414f92b 100644
--- a/sw/source/core/objectpositioning/environmentofanchoredobject.cxx
+++ b/sw/source/core/objectpositioning/environmentofanchoredobject.cxx
@@ -70,12 +70,12 @@ const SwLayoutFrm& SwEnvironmentOfAnchoredObject::GetHoriEnvironmentLayoutFrm(
                 !pHoriEnvironmentLayFrm->IsPageFrm() )
         {
             pHoriEnvironmentLayFrm = pHoriEnvironmentLayFrm->GetUpper();
-            ASSERT( pHoriEnvironmentLayFrm,
+            OSL_ENSURE( pHoriEnvironmentLayFrm,
                     "SwEnvironmentOfAnchoredObject::GetHoriEnvironmentLayoutFrm(..) - no page|fly|cell frame found" );
         }
     }
 
-    ASSERT( pHoriEnvironmentLayFrm->ISA(SwLayoutFrm),
+    OSL_ENSURE( pHoriEnvironmentLayFrm->ISA(SwLayoutFrm),
                 "SwEnvironmentOfAnchoredObject::GetHoriEnvironmentLayoutFrm(..) - found frame isn't a layout frame" );
 
     return static_cast<const SwLayoutFrm&>(*pHoriEnvironmentLayFrm);
@@ -110,12 +110,12 @@ const SwLayoutFrm& SwEnvironmentOfAnchoredObject::GetVertEnvironmentLayoutFrm(
                 !pVertEnvironmentLayFrm->IsPageFrm() )
         {
             pVertEnvironmentLayFrm = pVertEnvironmentLayFrm->GetUpper();
-            ASSERT( pVertEnvironmentLayFrm,
+            OSL_ENSURE( pVertEnvironmentLayFrm,
                     "SwEnvironmentOfAnchoredObject::GetVertEnvironmentLayoutFrm(..) - proposed frame not found" );
         }
     }
 
-    ASSERT( pVertEnvironmentLayFrm->ISA(SwLayoutFrm),
+    OSL_ENSURE( pVertEnvironmentLayFrm->ISA(SwLayoutFrm),
                 "SwEnvironmentOfAnchoredObject::GetVertEnvironmentLayoutFrm(..) - found frame isn't a layout frame" );
 
     return static_cast<const SwLayoutFrm&>(*pVertEnvironmentLayFrm);
diff --git a/sw/source/core/objectpositioning/makefile.mk b/sw/source/core/objectpositioning/makefile.mk
index 4192414d9b73..59d5e0201f0e 100644
--- a/sw/source/core/objectpositioning/makefile.mk
+++ b/sw/source/core/objectpositioning/makefile.mk
@@ -47,11 +47,14 @@ CDEFS+=-DDEBUG
 # --- Files --------------------------------------------------------
 
 SLOFILES =  \
-                $(SLO)$/anchoredobjectposition.obj \
+                $(EXCEPTIONSFILES) \
                 $(SLO)$/ascharanchoredobjectposition.obj \
-                $(SLO)$/tolayoutanchoredobjectposition.obj \
-                $(SLO)$/tocntntanchoredobjectposition.obj \
-                $(SLO)$/environmentofanchoredobject.obj
+                $(SLO)$/environmentofanchoredobject.obj \
+                $(SLO)$/tolayoutanchoredobjectposition.obj
+
+EXCEPTIONSFILES = \
+                $(SLO)$/anchoredobjectposition.obj \
+                $(SLO)$/tocntntanchoredobjectposition.obj
 
 # --- Targets -------------------------------------------------------
 
diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
index c5dca18a1d25..63169790f317 100644
--- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
@@ -94,7 +94,7 @@ SwTwips SwToCntntAnchoredObjectPosition::ToCharTopOfLine() const
 
 SwTxtFrm& SwToCntntAnchoredObjectPosition::GetAnchorTxtFrm() const
 {
-    ASSERT( GetAnchorFrm().ISA(SwTxtFrm),
+    OSL_ENSURE( GetAnchorFrm().ISA(SwTxtFrm),
             "SwToCntntAnchoredObjectPosition::GetAnchorTxtFrm() - wrong anchor frame type" );
 
     return static_cast<SwTxtFrm&>(GetAnchorFrm());
@@ -311,7 +311,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
                     }
                     else
                     {
-                        ASSERT( false,
+                        OSL_ENSURE( false,
                                 "<SwToCntntAnchoredObjectPosition::CalcPosition()> - unknown combination of vertical position and vertical alignment." );
                     }
                 }
@@ -331,7 +331,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
                     }
                     else
                     {
-                        ASSERT( false,
+                        OSL_ENSURE( false,
                                 "<SwToCntntAnchoredObjectPosition::CalcPosition()> - unknown combination of vertical position and vertical alignment." );
                     }
                 }
@@ -372,7 +372,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
                     }
                     else
                     {
-                        ASSERT( false,
+                        OSL_ENSURE( false,
                                 "<SwToCntntAnchoredObjectPosition::CalcPosition()> - unknown combination of vertical position and vertical alignment." );
                     }
                 }
@@ -697,7 +697,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
                                     else
                                     {
 #if OSL_DEBUG_LEVEL > 1
-                                        ASSERT( false, "<SwToCntntAnchoredObjectPosition::CalcPosition()> - code under investigation by OD, please inform OD about this assertion!" );
+                                        OSL_ENSURE( false, "<SwToCntntAnchoredObjectPosition::CalcPosition()> - code under investigation by OD, please inform OD about this assertion!" );
 #endif
                                         nRelDiff = nRelPosY;
                                         nRelPosY = 0;
diff --git a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
index c785525cdc95..69f457f3d44d 100644
--- a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
@@ -118,7 +118,7 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition()
         // anchor position, depending on layout-direction
         if( bVert )
         {
-            ASSERT( !bRev, "<SwToLayoutAnchoredObjectPosition::CalcPosition()> - reverse layout set." );
+            OSL_ENSURE( !bRev, "<SwToLayoutAnchoredObjectPosition::CalcPosition()> - reverse layout set." );
             aRelPos.X() = -nRelPosY - aObjBoundRect.Width();
             maOffsetToFrmAnchorPos.X() = nVertOffsetToFrmAnchorPos;
         }
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index e72792083804..1ba058310fe4 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -223,8 +223,6 @@ void SwEmbedObjectLink::DataChanged( const String& ,
     }
 
     pOleNode->GetNewReplacement();
-    // Initiate repainting
-    // pObj->SetChanged();
 }
 
 // -----------------------------------------------------------------------------
@@ -280,15 +278,10 @@ Graphic* SwOLENode::GetGraphic()
     return pGraphic;
 }
 
-Graphic* SwOLENode::GetHCGraphic()
-{
-    return aOLEObj.xOLERef.GetHCGraphic();
-}
-
 SwCntntNode *SwOLENode::SplitCntntNode( const SwPosition & )
 {
     // OLE-Objecte vervielfaeltigen ??
-    ASSERT( FALSE, "OleNode: can't split." );
+    OSL_ENSURE( FALSE, "OleNode: can't split." );
     return this;
 }
 
@@ -305,7 +298,7 @@ BOOL SwOLENode::RestorePersistentData()
         {
             // TODO/LATER: reicht hier nicht ein EmbeddedObjectContainer? Was passiert mit
             // diesem Dokument?
-            ASSERT( !this, "warum wird hier eine DocShell angelegt?" );
+            OSL_ENSURE( !this, "warum wird hier eine DocShell angelegt?" );
             p = new SwDocShell( GetDoc(), SFX_CREATE_MODE_INTERNAL );
             p->DoInitNew( NULL );
         }
@@ -383,7 +376,7 @@ SwOLENode * SwNodes::MakeOLENode( const SwNodeIndex & rWhere,
                                     SwGrfFmtColl* pGrfColl,
                                     SwAttrSet* pAutoAttr )
 {
-    ASSERT( pGrfColl,"SwNodes::MakeOLENode: Formatpointer ist 0." );
+    OSL_ENSURE( pGrfColl,"SwNodes::MakeOLENode: Formatpointer ist 0." );
 
     SwOLENode *pNode =
         new SwOLENode( rWhere, xObj, pGrfColl, pAutoAttr );
@@ -405,7 +398,7 @@ SwOLENode * SwNodes::MakeOLENode( const SwNodeIndex & rWhere,
 SwOLENode * SwNodes::MakeOLENode( const SwNodeIndex & rWhere,
     const String &rName, sal_Int64 nAspect, SwGrfFmtColl* pGrfColl, SwAttrSet* pAutoAttr )
 {
-    ASSERT( pGrfColl,"SwNodes::MakeOLENode: Formatpointer ist 0." );
+    OSL_ENSURE( pGrfColl,"SwNodes::MakeOLENode: Formatpointer ist 0." );
 
     SwOLENode *pNode =
         new SwOLENode( rWhere, rName, nAspect, pGrfColl, pAutoAttr );
@@ -437,8 +430,8 @@ SwCntntNode* SwOLENode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
     {
         // TODO/LATER: reicht hier nicht ein EmbeddedObjectContainer? Was passiert mit
         // diesem Dokument?
-        ASSERT( pDoc->GetRefForDocShell(),
-                        "wo ist die Ref-Klasse fuer die DocShell?")
+        OSL_ENSURE( pDoc->GetRefForDocShell(),
+                        "wo ist die Ref-Klasse fuer die DocShell?");
         p = new SwDocShell( pDoc, SFX_CREATE_MODE_INTERNAL );
         *pDoc->GetRefForDocShell() = p;
         p->DoInitNew( NULL );
@@ -513,9 +506,6 @@ BOOL SwOLENode::IsOLEObjectDeleted() const
         if( p )     // muss da sein
         {
             return !p->GetEmbeddedObjectContainer().HasEmbeddedObject( aOLEObj.aName );
-            //SvInfoObjectRef aRef( p->Find( aOLEObj.aName ) );
-            //if( aRef.Is() )
-            //    bRet = aRef->IsDeleted();
         }
     }
     return bRet;
@@ -746,7 +736,7 @@ void SwOLEObj::SetNode( SwOLENode* pNode )
         {
             // TODO/LATER: reicht hier nicht ein EmbeddedObjectContainer? Was passiert mit
             // diesem Dokument?
-            ASSERT( !this, "warum wird hier eine DocShell angelegt?" );
+            OSL_ENSURE( !this, "warum wird hier eine DocShell angelegt?" );
             p = new SwDocShell( pDoc, SFX_CREATE_MODE_INTERNAL );
             p->DoInitNew( NULL );
         }
@@ -781,10 +771,10 @@ uno::Reference < embed::XEmbeddedObject > SwOLEObj::GetOleRef()
     if( !xOLERef.is() )
     {
         SfxObjectShell* p = pOLENd->GetDoc()->GetPersist();
-        ASSERT( p, "kein SvPersist vorhanden" );
+        OSL_ENSURE( p, "kein SvPersist vorhanden" );
 
         uno::Reference < embed::XEmbeddedObject > xObj = p->GetEmbeddedObjectContainer().GetEmbeddedObject( aName );
-        ASSERT( !xOLERef.is(), "rekursiver Aufruf von GetOleRef() ist nicht erlaubt" )
+        OSL_ENSURE( !xOLERef.is(), "rekursiver Aufruf von GetOleRef() ist nicht erlaubt" );
 
         if ( !xObj.is() )
         {
@@ -837,9 +827,6 @@ svt::EmbeddedObjectRef& SwOLEObj::GetObject()
 BOOL SwOLEObj::UnloadObject()
 {
     BOOL bRet = TRUE;
-    //Nicht notwendig im Doc DTor (MM)
-    //ASSERT( pOLERef && pOLERef->Is() && 1 < (*pOLERef)->GetRefCount(),
-    //        "Falscher RefCount fuers Unload" );
     if ( pOLENd )
     {
         const SwDoc* pDoc = pOLENd->GetDoc();
@@ -953,8 +940,6 @@ void SwOLELRUCache::Load()
     {
         sal_Int32 nVal = 0;
         *pValues >>= nVal;
-        //if( 20 > nVal )
-        //    nVal = 20;
 
         {
             if( nVal < nLRU_InitSize )
diff --git a/sw/source/core/para/makefile.mk b/sw/source/core/para/makefile.mk
index 7005bf0e9889..aee61949b530 100644
--- a/sw/source/core/para/makefile.mk
+++ b/sw/source/core/para/makefile.mk
@@ -46,6 +46,9 @@ CXXFILES = \
 
 
 SLOFILES =  \
+        $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
         $(SLO)$/paratr.obj
 
 # --- Tagets -------------------------------------------------------
diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx
index f32386ec4d60..b202bd1c6c54 100644
--- a/sw/source/core/para/paratr.cxx
+++ b/sw/source/core/para/paratr.cxx
@@ -145,7 +145,7 @@ sal_Bool SwFmtDrop::GetInfo( SfxPoolItem& ) const
 
 int SwFmtDrop::operator==( const SfxPoolItem& rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+    OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
     return ( nLines == ((SwFmtDrop&)rAttr).GetLines() &&
              nChars == ((SwFmtDrop&)rAttr).GetChars() &&
              nDistance ==  ((SwFmtDrop&)rAttr).GetDistance() &&
@@ -230,8 +230,6 @@ bool SwFmtDrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
                 nDistance   = MM100_TO_TWIP(pDrop->Distance);
             }
             else {
-                //exception( wrong_type)
-                ;
             }
         }
         break;
@@ -260,23 +258,19 @@ SfxPoolItem* SwNumRuleItem::Clone( SfxItemPool * ) const
 }
 int SwNumRuleItem::operator==( const SfxPoolItem& rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+    OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
     // --> OD 2008-03-04 #refactorlists# - removed <pDefinedIn>
     return GetValue() == ((SwNumRuleItem&)rAttr).GetValue();
     // <--
 }
-/* -----------------------------27.06.00 11:05--------------------------------
 
- ---------------------------------------------------------------------------*/
 bool    SwNumRuleItem::QueryValue( uno::Any& rVal, BYTE ) const
 {
     rtl::OUString sRet = SwStyleNameMapper::GetProgName(GetValue(), nsSwGetPoolIdFromName::GET_POOLID_NUMRULE );
     rVal <<= sRet;
     return true;
 }
-/* -----------------------------27.06.00 11:05--------------------------------
 
- ---------------------------------------------------------------------------*/
 bool    SwNumRuleItem::PutValue( const uno::Any& rVal, BYTE )
 {
     rtl::OUString uName;
@@ -284,9 +278,7 @@ bool    SwNumRuleItem::PutValue( const uno::Any& rVal, BYTE )
     SetValue(SwStyleNameMapper::GetUIName(uName, nsSwGetPoolIdFromName::GET_POOLID_NUMRULE));
     return true;
 }
-/* -----------------19.05.2003 10:44-----------------
 
- --------------------------------------------------*/
 SfxPoolItem* SwParaConnectBorderItem::Clone( SfxItemPool * ) const
 {
     return new SwParaConnectBorderItem( *this );
diff --git a/sw/source/core/sw3io/makefile.mk b/sw/source/core/sw3io/makefile.mk
index 01a50f5df733..352953e85b57 100644
--- a/sw/source/core/sw3io/makefile.mk
+++ b/sw/source/core/sw3io/makefile.mk
@@ -38,9 +38,12 @@ TARGET=sw3io
 
 # --- Files --------------------------------------------------------
 
+EXCEPTIONSFILES = \
+  $(SLO)$/sw3convert.obj \
+  $(SLO)$/swacorr.obj
+
 SLOFILES = \
-  $(SLO)$/swacorr.obj \
-  $(SLO)$/sw3convert.obj
+  $(EXCEPTIONSFILES)
 
 
 # --- Targets -------------------------------------------------------
diff --git a/sw/source/core/sw3io/sw3convert.cxx b/sw/source/core/sw3io/sw3convert.cxx
index 8702e58a8ab5..bcd9e21a3071 100644
--- a/sw/source/core/sw3io/sw3convert.cxx
+++ b/sw/source/core/sw3io/sw3convert.cxx
@@ -378,8 +378,6 @@ SW_DLLPUBLIC void sw3io_ConvertToOldField( const SwField* pFld, USHORT& rWhich,
                     break;
 
                 default:
-                // case REF_UPDOWN:
-                // case REF_PAGE_PGDESC:
                     rFmt = REF_PAGE;
                     break;
                 }
diff --git a/sw/source/core/sw3io/swacorr.cxx b/sw/source/core/sw3io/swacorr.cxx
index 72adec54aad9..b5377cb5345f 100644
--- a/sw/source/core/sw3io/swacorr.cxx
+++ b/sw/source/core/sw3io/swacorr.cxx
@@ -59,7 +59,7 @@ BOOL SwAutoCorrect::GetLongText( const uno::Reference < embed::XStorage >& rStg,
         nRet = aBlk.GetText( rShort, rLong );
     }
     else {
-        ASSERT ( rStg.is(), "Someone passed SwAutoCorrect::GetLongText a dud storage!");
+       OSL_ENSURE( rStg.is(), "Someone passed SwAutoCorrect::GetLongText a dud storage!");
     }
     return !IsError( nRet ) && rLong.Len();
 }
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index 2e6d3405f901..9a807fd8ff11 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -474,7 +474,7 @@ BOOL SwXMLTextBlocks::PutMuchEntries( BOOL bOn )
     {
         if( bInPutMuchBlocks )
         {
-            ASSERT( !this, "verschachtelte Aufrufe sind nicht erlaubt" );
+            OSL_ENSURE( !this, "verschachtelte Aufrufe sind nicht erlaubt" );
         }
         else if( !IsFileChanged() )
         {
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index 2f2f7eb10cad..4a90f3006c70 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -110,7 +110,7 @@ ULONG SwXMLTextBlocks::GetDoc( USHORT nIdx )
 
             uno::Reference< lang::XMultiServiceFactory > xServiceFactory =
                 comphelper::getProcessServiceFactory();
-            ASSERT( xServiceFactory.is(), "XMLReader::Read: got no service manager" );
+            OSL_ENSURE( xServiceFactory.is(), "XMLReader::Read: got no service manager" );
             if( !xServiceFactory.is() )
             {
                 // Throw an exception ?
@@ -124,7 +124,7 @@ ULONG SwXMLTextBlocks::GetDoc( USHORT nIdx )
             // get parser
             uno::Reference< XInterface > xXMLParser = xServiceFactory->createInstance(
                     OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")));
-            ASSERT( xXMLParser.is(),
+            OSL_ENSURE( xXMLParser.is(),
                     "XMLReader::Read: com.sun.star.xml.sax.Parser service missing" );
             if( !xXMLParser.is() )
             {
@@ -335,7 +335,7 @@ ULONG SwXMLTextBlocks::GetBlockText( const String& rShort, String& rText )
         uno::Reference < io::XStream > xContents = xRoot->openStreamElement( aStreamName, embed::ElementModes::READ );
         uno::Reference< lang::XMultiServiceFactory > xServiceFactory =
             comphelper::getProcessServiceFactory();
-        ASSERT( xServiceFactory.is(), "XMLReader::Read: got no service manager" );
+        OSL_ENSURE( xServiceFactory.is(), "XMLReader::Read: got no service manager" );
         if( !xServiceFactory.is() )
         {
             // Throw an exception ?
@@ -348,7 +348,7 @@ ULONG SwXMLTextBlocks::GetBlockText( const String& rShort, String& rText )
         // get parser
         uno::Reference< XInterface > xXMLParser = xServiceFactory->createInstance(
         OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) );
-        ASSERT( xXMLParser.is(),
+        OSL_ENSURE( xXMLParser.is(),
                 "XMLReader::Read: com.sun.star.xml.sax.Parser service missing" );
         if( !xXMLParser.is() )
         {
@@ -386,7 +386,7 @@ ULONG SwXMLTextBlocks::GetBlockText( const String& rShort, String& rText )
     }
     catch ( uno::Exception& )
     {
-        ASSERT( sal_False, "Tried to open non-existent folder or stream!");
+        OSL_ENSURE( sal_False, "Tried to open non-existent folder or stream!");
     }
 
     return n;
@@ -408,7 +408,7 @@ ULONG SwXMLTextBlocks::PutBlockText( const String& rShort, const String& ,
 
     uno::Reference< lang::XMultiServiceFactory > xServiceFactory =
         comphelper::getProcessServiceFactory();
-    ASSERT( xServiceFactory.is(),
+    OSL_ENSURE( xServiceFactory.is(),
             "XMLReader::Read: got no service manager" );
     if( !xServiceFactory.is() )
     {
@@ -488,7 +488,7 @@ void SwXMLTextBlocks::ReadInfo( void )
     {
         uno::Reference< lang::XMultiServiceFactory > xServiceFactory =
                 comphelper::getProcessServiceFactory();
-        ASSERT( xServiceFactory.is(),
+        OSL_ENSURE( xServiceFactory.is(),
                 "XMLReader::Read: got no service manager" );
         if( !xServiceFactory.is() )
         {
@@ -504,7 +504,7 @@ void SwXMLTextBlocks::ReadInfo( void )
         // get parser
         uno::Reference< XInterface > xXMLParser = xServiceFactory->createInstance(
         OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")));
-        ASSERT( xXMLParser.is(),
+        OSL_ENSURE( xXMLParser.is(),
             "XMLReader::Read: com.sun.star.xml.sax.Parser service missing" );
         if( !xXMLParser.is() )
         {
@@ -618,7 +618,7 @@ ULONG SwXMLTextBlocks::SetMacroTable(
 
     uno::Reference< lang::XMultiServiceFactory > xServiceFactory =
         comphelper::getProcessServiceFactory();
-    ASSERT( xServiceFactory.is(),
+    OSL_ENSURE( xServiceFactory.is(),
             "XML autotext event write:: got no service manager" );
     if( !xServiceFactory.is() )
         return ERR_SWG_WRITE_ERROR;
@@ -626,7 +626,7 @@ ULONG SwXMLTextBlocks::SetMacroTable(
     // Get model
     uno::Reference< lang::XComponent > xModelComp(
         pDoc->GetDocShell()->GetModel(), UNO_QUERY );
-    ASSERT( xModelComp.is(), "XMLWriter::Write: got no model" );
+    OSL_ENSURE( xModelComp.is(), "XMLWriter::Write: got no model" );
     if( !xModelComp.is() )
         return ERR_SWG_WRITE_ERROR;
 
@@ -662,7 +662,7 @@ ULONG SwXMLTextBlocks::SetMacroTable(
                 xServiceFactory->createInstance(
                 OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer")) ),
                 UNO_QUERY );
-            ASSERT( xSaxWriter.is(), "can't instantiate XML writer" );
+            OSL_ENSURE( xSaxWriter.is(), "can't instantiate XML writer" );
             if( xSaxWriter.is() )
             {
 
@@ -688,7 +688,7 @@ ULONG SwXMLTextBlocks::SetMacroTable(
                 uno::Reference< document::XExporter > xExporter(
                     xServiceFactory->createInstanceWithArguments(
                         sFilterComponent, aParams), UNO_QUERY);
-                ASSERT( xExporter.is(),
+                OSL_ENSURE( xExporter.is(),
                         "can't instantiate export filter component" );
                 if( xExporter.is() )
                 {
diff --git a/sw/source/core/swg/makefile.mk b/sw/source/core/swg/makefile.mk
index c7aa25ec5d24..4c838b45cbae 100644
--- a/sw/source/core/swg/makefile.mk
+++ b/sw/source/core/swg/makefile.mk
@@ -40,21 +40,16 @@ TARGET=swg
 
 # --- Files --------------------------------------------------------
 SLOFILES =  \
-        $(SLO)$/swblocks.obj    \
-        $(SLO)$/SwXMLBlockImport.obj	\
-        $(SLO)$/SwXMLSectionList.obj	\
-        $(SLO)$/SwXMLBlockExport.obj	\
-        $(SLO)$/SwXMLBlockListContext.obj	\
-        $(SLO)$/SwXMLTextBlocks.obj \
-        $(SLO)$/SwXMLTextBlocks1.obj
+        $(EXCEPTIONSFILES)
 
 EXCEPTIONSFILES = \
-        $(SLO)$/SwXMLBlockImport.obj	\
-        $(SLO)$/SwXMLSectionList.obj	\
         $(SLO)$/SwXMLBlockExport.obj	\
+        $(SLO)$/SwXMLBlockImport.obj	\
         $(SLO)$/SwXMLBlockListContext.obj	\
-        $(SLO)$/SwXMLTextBlocks.obj \
-        $(SLO)$/SwXMLTextBlocks1.obj
+        $(SLO)$/SwXMLSectionList.obj	\
+        $(SLO)$/SwXMLTextBlocks.obj	\
+        $(SLO)$/SwXMLTextBlocks1.obj	\
+        $(SLO)$/swblocks.obj
 
 # --- Tagets -------------------------------------------------------
 
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx
index 8a2763fdaf6d..0463b21b7c3e 100644
--- a/sw/source/core/swg/swblocks.cxx
+++ b/sw/source/core/swg/swblocks.cxx
@@ -522,7 +522,7 @@ USHORT SwTextBlocks::Rename( USHORT n, const String* s, const String* l )
             aLong = *l;
         if( !aNew.Len() )
         {
-            ASSERT( !this, "Kein Kurzname in Rename angegeben" );
+            OSL_ENSURE( !this, "Kein Kurzname in Rename angegeben" );
             nErr = ERR_SWG_INTERNAL_ERROR; return (USHORT) -1;
         }
 
@@ -756,7 +756,7 @@ BOOL SwTextBlocks::IsOnlyTextBlock( const String& rShort ) const
         return IsOnlyTextBlock( nIdx );
     }
 
-    ASSERT( !this, "ungueltiger Name" );
+    OSL_ENSURE( !this, "ungueltiger Name" );
     return FALSE;
 }
 
@@ -791,9 +791,6 @@ void SwTextBlocks::EndPutMuchBlockEntries()
         pImp->PutMuchEntries( FALSE );
 }
 
-/*-- 20.09.2004 10:25:33---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 String    SwTextBlocks::GetBaseURL() const
 {
     String sRet;
@@ -801,9 +798,7 @@ String    SwTextBlocks::GetBaseURL() const
         sRet = pImp->GetBaseURL();
     return sRet;
 }
-/*-- 20.09.2004 10:25:33---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwTextBlocks::SetBaseURL( const String& rURL )
 {
     if(pImp)
diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx
index 8300a0eb9427..ed3cafb5dd65 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -48,15 +48,11 @@
 #include <editeng/protitem.hxx>
 #include <swtblfmt.hxx>
 
-#ifndef DBG_UTIL
-#define CHECK_TABLE(t)
-#else
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
 #define CHECK_TABLE(t) (t).CheckConsistency();
 #else
 #define CHECK_TABLE(t)
 #endif
-#endif
 
 // ---------------------------------------------------------------
 
@@ -134,7 +130,7 @@ void lcl_CheckMinMax( long& rMin, long& rMax, const SwTableLine& rLine, USHORT n
     ++nCheck;
     if( rLine.GetTabBoxes().Count() < nCheck )
     {   // robust
-        ASSERT( false, "Box out of table line" );
+        OSL_ENSURE( false, "Box out of table line" );
         nCheck = rLine.GetTabBoxes().Count();
     }
 
@@ -143,7 +139,7 @@ void lcl_CheckMinMax( long& rMin, long& rMax, const SwTableLine& rLine, USHORT n
     for( USHORT nCurrBox = 0; nCurrBox < nCheck; ++nCurrBox )
     {
         SwTableBox* pBox = rLine.GetTabBoxes()[nCurrBox];
-        ASSERT( pBox, "Missing table box" );
+        OSL_ENSURE( pBox, "Missing table box" );
         nWidth = pBox->GetFrmFmt()->GetFrmSize().GetWidth();
         nNew += nWidth;
     }
@@ -177,12 +173,12 @@ long lcl_Box2LeftBorder( const SwTableBox& rBox )
     for( USHORT nCurrBox = 0; nCurrBox < nCount; ++nCurrBox )
     {
         SwTableBox* pBox = rLine.GetTabBoxes()[nCurrBox];
-        ASSERT( pBox, "Missing table box" );
+        OSL_ENSURE( pBox, "Missing table box" );
         if( pBox == &rBox )
             return nLeft;
         nLeft += pBox->GetFrmFmt()->GetFrmSize().GetWidth();
     }
-    ASSERT( false, "Box not found in own upper?" );
+    OSL_ENSURE( false, "Box not found in own upper?" );
     return nLeft;
 }
 
@@ -211,15 +207,15 @@ SwTableBox* lcl_LeftBorder2Box( long nLeft, const SwTableLine* pLine )
     for( USHORT nCurrBox = 0; nCurrBox < nCount; ++nCurrBox )
     {
         SwTableBox* pBox = pLine->GetTabBoxes()[nCurrBox];
-        ASSERT( pBox, "Missing table box" );
+        OSL_ENSURE( pBox, "Missing table box" );
         if( nCurrLeft >= nLeft && pBox->GetFrmFmt()->GetFrmSize().GetWidth() )
         {
-            ASSERT( nCurrLeft == nLeft, "Wrong box found" );
+            OSL_ENSURE( nCurrLeft == nLeft, "Wrong box found" );
             return pBox;
         }
         nCurrLeft += pBox->GetFrmFmt()->GetFrmSize().GetWidth();
     }
-    ASSERT( false, "Didn't found wished box" );
+    OSL_ENSURE( false, "Didn't found wished box" );
     return 0;
 }
 
@@ -257,7 +253,7 @@ void lcl_ChangeRowSpan( const SwTable& rTable, const long nDiff,
 {
     if( !nDiff || nRowIdx >= rTable.GetTabLines().Count() )
         return;
-    ASSERT( !bSingle || nDiff > 0, "Don't set bSingle when deleting lines!" );
+    OSL_ENSURE( !bSingle || nDiff > 0, "Don't set bSingle when deleting lines!" );
     bool bGoOn;
     // nDistance is the distance between the current row and the critical row,
     // e.g. the deleted rows or the inserted rows.
@@ -326,7 +322,7 @@ void lcl_ChangeRowSpan( const SwTable& rTable, const long nDiff,
 
 SwBoxSelection* SwTable::CollectBoxSelection( const SwPaM& rPam ) const
 {
-    ASSERT( bNewModel, "Don't call me for old tables" );
+    OSL_ENSURE( bNewModel, "Don't call me for old tables" );
     if( !aLines.Count() )
         return 0;
     const SwNode* pStartNd = rPam.Start()->nNode.GetNode().FindTableBoxStartNode();
@@ -341,12 +337,12 @@ SwBoxSelection* SwTable::CollectBoxSelection( const SwPaM& rPam ) const
     for( USHORT nRow = 0; nFound < 2 && nRow < nLines; ++nRow )
     {
         SwTableLine* pLine = aLines[nRow];
-        ASSERT( pLine, "Missing table line" );
+        OSL_ENSURE( pLine, "Missing table line" );
         USHORT nCols = pLine->GetTabBoxes().Count();
         for( USHORT nCol = 0; nCol < nCols; ++nCol )
         {
             SwTableBox* pBox = pLine->GetTabBoxes()[nCol];
-            ASSERT( pBox, "Missing table box" );
+            OSL_ENSURE( pBox, "Missing table box" );
             if( nFound )
             {
                 if( pBox->GetSttNd() == pEndNd )
@@ -381,7 +377,7 @@ SwBoxSelection* SwTable::CollectBoxSelection( const SwPaM& rPam ) const
     for( USHORT nRow = nTop; nRow <= nBottom && bOkay; ++nRow )
     {
         SwTableLine* pLine = aLines[nRow];
-        ASSERT( pLine, "Missing table line" );
+        OSL_ENSURE( pLine, "Missing table line" );
         SwSelBoxes *pBoxes = new SwSelBoxes();
         long nLeft = 0;
         long nRight = 0;
@@ -390,7 +386,7 @@ SwBoxSelection* SwTable::CollectBoxSelection( const SwPaM& rPam ) const
         for( USHORT nCurrBox = 0; nCurrBox < nCount; ++nCurrBox )
         {
             SwTableBox* pBox = pLine->GetTabBoxes()[nCurrBox];
-            ASSERT( pBox, "Missing table box" );
+            OSL_ENSURE( pBox, "Missing table box" );
             nLeft = nRight;
             nRight += pBox->GetFrmFmt()->GetFrmSize().GetWidth();
             nRowSpan = pBox->getRowSpan();
@@ -624,7 +620,7 @@ long lcl_InsertPosition( SwTable &rTable, std::vector<USHORT>& rInsPos,
         nAddWidth += nWidth;
         USHORT nCurrBox = pLine->GetTabBoxes().C40_GETPOS(SwTableBox, pBox );
         USHORT nCurrLine = rTable.GetTabLines().C40_GETPOS(SwTableLine, pLine );
-        ASSERT( nCurrLine != USHRT_MAX, "Time to say Good-Bye.." );
+        OSL_ENSURE( nCurrLine != USHRT_MAX, "Time to say Good-Bye.." );
         if( rInsPos[ nCurrLine ] == USHRT_MAX )
         {
             rInsPos[ nCurrLine ] = nCurrBox;
@@ -706,7 +702,7 @@ BOOL SwTable::NewInsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes,
     {
         SwTableLine* pLine = aLines[ i ];
         USHORT nInsPos = aInsPos[i];
-        ASSERT( nInsPos != USHRT_MAX, "Didn't found insert position" );
+        OSL_ENSURE( nInsPos != USHRT_MAX, "Didn't found insert position" );
         SwTableBox* pBox = pLine->GetTabBoxes()[ nInsPos ];
         if( bBehind )
             ++nInsPos;
@@ -777,13 +773,13 @@ BOOL SwTable::NewInsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes,
 
     aFndBox.MakeFrms( *this );
 //  aFndBox.RestoreChartData( *this );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     {
         const SwTableBoxes &rTabBoxes = aLines[0]->GetTabBoxes();
         long nNewWidth = 0;
         for( USHORT i = 0; i < rTabBoxes.Count(); ++i )
             nNewWidth += rTabBoxes[i]->GetFrmFmt()->GetFrmSize().GetWidth();
-        ASSERT( nNewWidth > 0, "Very small" );
+        OSL_ENSURE( nNewWidth > 0, "Very small" );
     }
 #endif
     CHECK_TABLE( *this )
@@ -985,7 +981,7 @@ void SwTable::_FindSuperfluousRows( SwSelBoxes& rBoxes,
     for( USHORT nRow = nFirstLn; nRow <= nLastLn; ++nRow )
     {
         SwTableLine* pLine = aLines[nRow];
-        ASSERT( pLine, "Missing table line" );
+        OSL_ENSURE( pLine, "Missing table line" );
         USHORT nCols = pLine->GetTabBoxes().Count();
         bool bSuperfl = true;
         for( USHORT nCol = 0; nCol < nCols; ++nCol )
@@ -1070,7 +1066,7 @@ SwTableBox& SwTableBox::FindEndOfRowSpan( const SwTable& rTable, USHORT nMaxStep
 void lcl_getAllMergedBoxes( const SwTable& rTable, SwSelBoxes& rBoxes, SwTableBox& rBox )
 {
     SwTableBox* pBox = &rBox;
-    ASSERT( pBox == &rBox.FindStartOfRowSpan( rTable, USHRT_MAX ), "Not a master box" );
+    OSL_ENSURE( pBox == &rBox.FindStartOfRowSpan( rTable, USHRT_MAX ), "Not a master box" );
     rBoxes.Insert( pBox );
     if( pBox->getRowSpan() == 1 )
         return;
@@ -1158,7 +1154,7 @@ void lcl_FillSelBoxes( SwSelBoxes &rBoxes, SwTableLine &rLine )
 void SwTable::InsertSpannedRow( SwDoc* pDoc, USHORT nRowIdx, USHORT nCnt )
 {
     CHECK_TABLE( *this )
-    ASSERT( nCnt && nRowIdx < GetTabLines().Count(), "Wrong call of InsertSpannedRow" );
+    OSL_ENSURE( nCnt && nRowIdx < GetTabLines().Count(), "Wrong call of InsertSpannedRow" );
     SwSelBoxes aBoxes;
     SwTableLine& rLine = *GetTabLines()[ nRowIdx ];
     lcl_FillSelBoxes( aBoxes, rLine );
@@ -1213,7 +1209,7 @@ void lcl_SophisticatedFillLineIndices( SwLineOffsetArray &rArr,
     for( USHORT i = 0; i < rBoxes.Count(); ++i )
     {   // Collect all end line indices and the row spans
         const SwTableBox &rBox = rBoxes[ i ]->FindStartOfRowSpan( rTable );
-        ASSERT( rBox.getRowSpan() > 0, "Didn't I say 'StartOfRowSpan' ??" )
+        OSL_ENSURE( rBox.getRowSpan() > 0, "Didn't I say 'StartOfRowSpan' ??" );
         if( nCnt > rBox.getRowSpan() )
         {
             const SwTableLine *pLine = rBox.GetUpper();
@@ -1249,7 +1245,7 @@ void lcl_SophisticatedFillLineIndices( SwLineOffsetArray &rArr,
                      aLnOfs.second < pCurr->second )
                 aLnOfs.second = pCurr->second; // Found a smaller row span
         }
-        ASSERT( aLnOfs.second < nCnt, "Clean-up failed" )
+        OSL_ENSURE( aLnOfs.second < nCnt, "Clean-up failed" );
         aLnOfs.second = nCnt - aLnOfs.second; // the number of rows to insert
         rArr.insert( rArr.end(),
             SwLineOffset( aLnOfs.first - nSum, aLnOfs.second ) );
@@ -1312,7 +1308,7 @@ USHORT lcl_CalculateSplitLineHeights( SwSplitLines &rCurr, SwSplitLines &rNew,
     for( USHORT i = 0; i < rBoxes.Count(); ++i )
     {   // Collect all pairs (start+end) of line indices to split
         const SwTableBox &rBox = rBoxes[ i ]->FindStartOfRowSpan( rTable );
-        ASSERT( rBox.getRowSpan() > 0, "Didn't I say 'StartOfRowSpan' ??" )
+        OSL_ENSURE( rBox.getRowSpan() > 0, "Didn't I say 'StartOfRowSpan' ??" );
         const SwTableLine *pLine = rBox.GetUpper();
         const USHORT nStart = rTable.GetTabLines().C40_GETPOS( SwTableLine, pLine );
         const USHORT nEnd = USHORT( rBox.getRowSpan() + nStart - 1 );
@@ -1465,7 +1461,7 @@ BOOL SwTable::NewSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt,
     std::set< USHORT> aIndices;
     for( USHORT i = 0; i < rBoxes.Count(); ++i )
     {
-        ASSERT( rBoxes[i]->getRowSpan() != 1, "Forgot to split?" )
+        OSL_ENSURE( rBoxes[i]->getRowSpan() != 1, "Forgot to split?" );
         if( rBoxes[i]->getRowSpan() > 1 )
             aIndices.insert( i );
     }
@@ -1562,14 +1558,14 @@ void SwTable::PrepareDelBoxes( const SwSelBoxes& rBoxes )
                 long nLeft = lcl_Box2LeftBorder( *pBox );
                 SwTableLine *pLine = pBox->GetUpper();
                 USHORT nLinePos = GetTabLines().C40_GETPOS(SwTableLine, pLine);
-                ASSERT( nLinePos < USHRT_MAX, "Box/table mismatch" )
+                OSL_ENSURE( nLinePos < USHRT_MAX, "Box/table mismatch" );
                 if( nRowSpan > 1 )
                 {
                     if( ++nLinePos < GetTabLines().Count() )
                     {
                         pLine = GetTabLines()[ nLinePos ];
                         pBox = lcl_LeftBorder2Box( nLeft, pLine );
-                        ASSERT( pBox, "RowSpan irritation I" )
+                        OSL_ENSURE( pBox, "RowSpan irritation I" );
                         if( pBox )
                             pBox->setRowSpan( --nRowSpan );
                     }
@@ -1580,7 +1576,7 @@ void SwTable::PrepareDelBoxes( const SwSelBoxes& rBoxes )
                     {
                         pLine = GetTabLines()[ --nLinePos ];
                         pBox = lcl_LeftBorder2Box( nLeft, pLine );
-                        ASSERT( pBox, "RowSpan irritation II" )
+                        OSL_ENSURE( pBox, "RowSpan irritation II" );
                         if( pBox )
                         {
                             nRowSpan = pBox->getRowSpan();
@@ -1617,7 +1613,7 @@ void lcl_SearchSelBox( const SwTable &rTable, SwSelBoxes& rBoxes, long nMin, lon
     for( USHORT nCurrBox = 0; nCurrBox < nCount; ++nCurrBox )
     {
         SwTableBox* pBox = rLine.GetTabBoxes()[nCurrBox];
-        ASSERT( pBox, "Missing table box" );
+        OSL_ENSURE( pBox, "Missing table box" );
         long nWidth = pBox->GetFrmFmt()->GetFrmSize().GetWidth();
         nRight += nWidth;
         if( nRight > nMin )
@@ -1657,7 +1653,7 @@ void lcl_SearchSelBox( const SwTable &rTable, SwSelBoxes& rBoxes, long nMin, lon
 void SwTable::CreateSelection(  const SwPaM& rPam, SwSelBoxes& rBoxes,
     const SearchType eSearch, bool bChkProtected ) const
 {
-    ASSERT( bNewModel, "Don't call me for old tables" );
+    OSL_ENSURE( bNewModel, "Don't call me for old tables" );
     if( !aLines.Count() )
         return;
     const SwNode* pStartNd = rPam.GetPoint()->nNode.GetNode().FindTableBoxStartNode();
@@ -1695,12 +1691,12 @@ void SwTable::CreateSelection( const SwNode* pStartNd, const SwNode* pEndNd,
     for( USHORT nRow = 0; nFound < 2 && nRow < nLines; ++nRow )
     {
         SwTableLine* pLine = aLines[nRow];
-        ASSERT( pLine, "Missing table line" );
+        OSL_ENSURE( pLine, "Missing table line" );
         USHORT nCols = pLine->GetTabBoxes().Count();
         for( USHORT nCol = 0; nCol < nCols; ++nCol )
         {
             SwTableBox* pBox = pLine->GetTabBoxes()[nCol];
-            ASSERT( pBox, "Missing table box" );
+            OSL_ENSURE( pBox, "Missing table box" );
             if( pBox->GetSttNd() == pEndNd || pBox->GetSttNd() == pStartNd )
             {
                 if( !bChkProtected ||
@@ -1740,12 +1736,12 @@ void SwTable::CreateSelection( const SwNode* pStartNd, const SwNode* pEndNd,
         for( USHORT nRow = nTop; nRow <= nBottom; ++nRow )
         {
             SwTableLine* pLine = aLines[nRow];
-            ASSERT( pLine, "Missing table line" );
+            OSL_ENSURE( pLine, "Missing table line" );
             USHORT nCount = pLine->GetTabBoxes().Count();
             for( USHORT nCurrBox = 0; nCurrBox < nCount; ++nCurrBox )
             {
                 SwTableBox* pBox = pLine->GetTabBoxes()[nCurrBox];
-                ASSERT( pBox, "Missing table box" );
+                OSL_ENSURE( pBox, "Missing table box" );
                 if( pBox->getRowSpan() > 0 && ( !bChkProtected ||
                     !pBox->GetFrmFmt()->GetProtect().IsCntntProtected() ) )
                     rBoxes.Insert( pBox );
@@ -1848,7 +1844,7 @@ void SwTable::CreateSelection( const SwNode* pStartNd, const SwNode* pEndNd,
 
 void SwTable::ExpandColumnSelection( SwSelBoxes& rBoxes, long &rMin, long &rMax ) const
 {
-    ASSERT( bNewModel, "Don't call me for old tables" );
+    OSL_ENSURE( bNewModel, "Don't call me for old tables" );
     rMin = 0;
     rMax = 0;
     if( !aLines.Count() || !rBoxes.Count() )
@@ -1860,12 +1856,12 @@ void SwTable::ExpandColumnSelection( SwSelBoxes& rBoxes, long &rMin, long &rMax
     for( USHORT nRow = 0; nRow < nLineCnt && nBox < nBoxCnt; ++nRow )
     {
         SwTableLine* pLine = aLines[nRow];
-        ASSERT( pLine, "Missing table line" );
+        OSL_ENSURE( pLine, "Missing table line" );
         USHORT nCols = pLine->GetTabBoxes().Count();
         for( USHORT nCol = 0; nCol < nCols; ++nCol )
         {
             SwTableBox* pBox = pLine->GetTabBoxes()[nCol];
-            ASSERT( pBox, "Missing table box" );
+            OSL_ENSURE( pBox, "Missing table box" );
             if( pBox == rBoxes[nBox] )
             {
                 lcl_CheckMinMax( rMin, rMax, *pLine, nCol, nBox == 0 );
@@ -1897,7 +1893,7 @@ void SwTable::ExpandColumnSelection( SwSelBoxes& rBoxes, long &rMin, long &rMax
 */
 void SwTable::PrepareDeleteCol( long nMin, long nMax )
 {
-    ASSERT( bNewModel, "Don't call me for old tables" );
+    OSL_ENSURE( bNewModel, "Don't call me for old tables" );
     if( !aLines.Count() || nMax < nMin )
         return;
     long nMid = nMin ? ( nMin + nMax ) / 2 : 0;
@@ -1968,9 +1964,9 @@ void SwTable::ExpandSelection( SwSelBoxes& rBoxes ) const
 
 void SwTable::CheckRowSpan( SwTableLinePtr &rpLine, bool bUp ) const
 {
-    ASSERT( IsNewModel(), "Don't call me for old tables" );
+    OSL_ENSURE( IsNewModel(), "Don't call me for old tables" );
     USHORT nLineIdx = GetTabLines().C40_GETPOS( SwTableLine, rpLine );
-    ASSERT( nLineIdx < GetTabLines().Count(), "Start line out of range" );
+    OSL_ENSURE( nLineIdx < GetTabLines().Count(), "Start line out of range" );
     bool bChange = true;
     if( bUp )
     {
@@ -2033,12 +2029,12 @@ SwSaveRowSpan::SwSaveRowSpan( SwTableBoxes& rBoxes, USHORT nSplitLn )
 {
     bool bDontSave = true; // nothing changed, nothing to save
     USHORT nColCount = rBoxes.Count();
-    ASSERT( nColCount, "Empty Table Line" )
+    OSL_ENSURE( nColCount, "Empty Table Line" );
     mnRowSpans.resize( nColCount );
     for( USHORT nCurrCol = 0; nCurrCol < nColCount; ++nCurrCol )
     {
         SwTableBox* pBox = rBoxes[nCurrCol];
-        ASSERT( pBox, "Missing Table Box" );
+        OSL_ENSURE( pBox, "Missing Table Box" );
         long nRowSp = pBox->getRowSpan();
         mnRowSpans[ nCurrCol ] = nRowSp;
         if( nRowSp < 0 )
@@ -2059,24 +2055,24 @@ void SwTable::RestoreRowSpan( const SwSaveRowSpan& rSave )
     if( !IsNewModel() ) // for new model only
         return;
     USHORT nLineCount = GetTabLines().Count();
-    ASSERT( rSave.mnSplitLine < nLineCount, "Restore behind last line?" )
+    OSL_ENSURE( rSave.mnSplitLine < nLineCount, "Restore behind last line?" );
     if( rSave.mnSplitLine < nLineCount )
     {
         SwTableLine* pLine = GetTabLines()[rSave.mnSplitLine];
         USHORT nColCount = pLine->GetTabBoxes().Count();
-        ASSERT( nColCount, "Empty Table Line" )
-        ASSERT( nColCount == rSave.mnRowSpans.size(), "Wrong row span store" )
+        OSL_ENSURE( nColCount, "Empty Table Line" );
+        OSL_ENSURE( nColCount == rSave.mnRowSpans.size(), "Wrong row span store" );
         if( nColCount == rSave.mnRowSpans.size() )
         {
             for( USHORT nCurrCol = 0; nCurrCol < nColCount; ++nCurrCol )
             {
                 SwTableBox* pBox = pLine->GetTabBoxes()[nCurrCol];
-                ASSERT( pBox, "Missing Table Box" );
+                OSL_ENSURE( pBox, "Missing Table Box" );
                 long nRowSp = pBox->getRowSpan();
                 if( nRowSp != rSave.mnRowSpans[ nCurrCol ] )
                 {
-                    ASSERT( -nRowSp == rSave.mnRowSpans[ nCurrCol ], "Pardon me?!" )
-                    ASSERT( rSave.mnRowSpans[ nCurrCol ] < 0, "Pardon me?!" )
+                    OSL_ENSURE( -nRowSp == rSave.mnRowSpans[ nCurrCol ], "Pardon me?!" );
+                    OSL_ENSURE( rSave.mnRowSpans[ nCurrCol ] < 0, "Pardon me?!" );
                     pBox->setRowSpan( -nRowSp );
 
                     USHORT nLine = rSave.mnSplitLine;
@@ -2129,11 +2125,11 @@ void SwTable::CleanUpBottomRowSpan( USHORT nDelLines )
     USHORT nLastLine = GetTabLines().Count()-1;
     SwTableLine* pLine = GetTabLines()[nLastLine];
     USHORT nColCount = pLine->GetTabBoxes().Count();
-    ASSERT( nColCount, "Empty Table Line" )
+    OSL_ENSURE( nColCount, "Empty Table Line" );
     for( USHORT nCurrCol = 0; nCurrCol < nColCount; ++nCurrCol )
     {
         SwTableBox* pBox = pLine->GetTabBoxes()[nCurrCol];
-        ASSERT( pBox, "Missing Table Box" );
+        OSL_ENSURE( pBox, "Missing Table Box" );
         long nRowSp = pBox->getRowSpan();
         if( nRowSp < 0 )
             nRowSp = -nRowSp;
@@ -2145,7 +2141,7 @@ void SwTable::CleanUpBottomRowSpan( USHORT nDelLines )
     }
 }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
 struct RowSpanCheck
 {
@@ -2167,25 +2163,25 @@ void SwTable::CheckConsistency() const
     {
         SwTwips nWidth = 0;
         SwTableLine* pLine = GetTabLines()[nCurrLine];
-        ASSERT( pLine, "Missing Table Line" )
+        OSL_ENSURE( pLine, "Missing Table Line" );
         USHORT nColCount = pLine->GetTabBoxes().Count();
-        ASSERT( nColCount, "Empty Table Line" )
+        OSL_ENSURE( nColCount, "Empty Table Line" );
         for( USHORT nCurrCol = 0; nCurrCol < nColCount; ++nCurrCol )
         {
             SwTableBox* pBox = pLine->GetTabBoxes()[nCurrCol];
-            ASSERT( pBox, "Missing Table Box" );
+            OSL_ENSURE( pBox, "Missing Table Box" );
             SwTwips nNewWidth = pBox->GetFrmFmt()->GetFrmSize().GetWidth() + nWidth;
             long nRowSp = pBox->getRowSpan();
             if( nRowSp < 0 )
             {
-                ASSERT( aIter != aRowSpanCells.end(), "Missing master box" )
-#ifdef DBG_UTIL
+                OSL_ENSURE( aIter != aRowSpanCells.end(), "Missing master box" );
+#if OSL_DEBUG_LEVEL > 1
                 //RowSpanCheck &rCheck = *aIter;
 #endif
-                ASSERT( aIter->nLeft == nWidth && aIter->nRight == nNewWidth,
+                OSL_ENSURE( aIter->nLeft == nWidth && aIter->nRight == nNewWidth,
                     "Wrong position/size of overlapped table box" );
                 --(aIter->nRowSpan);
-                ASSERT( aIter->nRowSpan == -nRowSp, "Wrong row span value" );
+                OSL_ENSURE( aIter->nRowSpan == -nRowSp, "Wrong row span value" );
                 if( nRowSp == -1 )
                 {
                     std::list< RowSpanCheck >::iterator aEraseIter = aIter;
@@ -2197,7 +2193,7 @@ void SwTable::CheckConsistency() const
             }
             else if( nRowSp != 1 )
             {
-                ASSERT( nRowSp, "Zero row span?!" );
+                OSL_ENSURE( nRowSp, "Zero row span?!" );
                 RowSpanCheck aEntry;
                 aEntry.nLeft = nWidth;
                 aEntry.nRight = nNewWidth;
@@ -2208,14 +2204,14 @@ void SwTable::CheckConsistency() const
         }
         if( !nCurrLine )
             nLineWidth = nWidth;
-        ASSERT( nWidth == nLineWidth, "Different Line Widths" )
-        ASSERT( nWidth == nTabSize, "Boxen der Line zu klein/gross" )
-        ASSERT( nWidth >= 0 && nWidth <= USHRT_MAX, "Width out of range" )
-        ASSERT( aIter == aRowSpanCells.end(), "Missing overlapped box" )
+        OSL_ENSURE( nWidth == nLineWidth, "Different Line Widths" );
+        OSL_ENSURE( nWidth == nTabSize, "Boxen der Line zu klein/gross" );
+        OSL_ENSURE( nWidth >= 0 && nWidth <= USHRT_MAX, "Width out of range" );
+        OSL_ENSURE( aIter == aRowSpanCells.end(), "Missing overlapped box" );
         aIter = aRowSpanCells.begin();
     }
     bool bEmpty = aRowSpanCells.empty();
-    ASSERT( bEmpty, "Open row span detected" )
+    OSL_ENSURE( bEmpty, "Open row span detected" );
 }
 
 #endif
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index f1e0c71b1daf..7ba5d35ddffd 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -74,15 +74,11 @@
 #include <redline.hxx>
 #include <list>
 
-#ifndef DBG_UTIL
-#define CHECK_TABLE(t)
-#else
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
 #define CHECK_TABLE(t) (t).CheckConsistency();
 #else
 #define CHECK_TABLE(t)
 #endif
-#endif
 
 using namespace com::sun::star;
 
@@ -221,12 +217,12 @@ void _InsTblBox( SwDoc* pDoc, SwTableNode* pTblNd,
                         SwTableBox* pBox,
                         USHORT nInsPos, USHORT nCnt )
 {
-    ASSERT( pBox->GetSttNd(), "Box ohne Start-Node" );
+    OSL_ENSURE( pBox->GetSttNd(), "Box ohne Start-Node" );
     SwNodeIndex aIdx( *pBox->GetSttNd(), +1 );
     SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
     if( !pCNd )
         pCNd = pDoc->GetNodes().GoNext( &aIdx );
-    ASSERT( pCNd, "Box ohne ContentNode" );
+    OSL_ENSURE( pCNd, "Box ohne ContentNode" );
 
     if( pCNd->IsTxtNode() )
     {
@@ -406,7 +402,7 @@ void lcl_ModifyBoxes( SwTableBoxes &rBoxes, const long nOld,
             }
         }
         else {
-            ASSERT( false, "Rounding error" );
+            OSL_ENSURE( false, "Rounding error" );
         }
         nSum += nBox;
     }
@@ -434,7 +430,7 @@ void SwTable::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
     {
         if ( !IsModifyLocked() )
         {
-            ASSERT( pOldSize && pOldSize->Which() == RES_FRM_SIZE &&
+            OSL_ENSURE( pOldSize && pOldSize->Which() == RES_FRM_SIZE &&
                     pNewSize && pNewSize->Which() == RES_FRM_SIZE,
                     "Kein Old oder New fuer FmtFrmSize-Modify der SwTable." );
             AdjustWidths( pOldSize->GetWidth(), pNewSize->GetWidth() );
@@ -949,7 +945,7 @@ void SwTable::SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld,
 
     Parm aParm( rNew, rOld );
 
-    ASSERT( rOld.Count() == rNew.Count(), "Columnanzahl veraendert.");
+    OSL_ENSURE( rOld.Count() == rNew.Count(), "Columnanzahl veraendert.");
 
     //Raender verarbeiten. Groesse der Tabelle und ein paar Boxen mussen
     //angepasst werden. Bei der Groesseneinstellung darf allerdings das
@@ -1084,7 +1080,7 @@ void SwTable::SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld,
         }
     }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     {
 // steht im tblrwcl.cxx
 extern void _CheckBoxWidth( const SwTableLine&, SwTwips );
@@ -1191,7 +1187,7 @@ static void lcl_CalcNewWidths( std::list<USHORT> &rSpanPos, ChangeList& rChanges
         USHORT nPos = (USHORT)nSum;
         while( pCurr != rChanges.end() && pCurr->first < nPos )
         {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
             USHORT nTemp = pCurr->first;
             nTemp = pCurr->second;
 #endif
@@ -1291,7 +1287,7 @@ static void lcl_CalcNewWidths( std::list<USHORT> &rSpanPos, ChangeList& rChanges
 void SwTable::NewSetTabCols( Parm &rParm, const SwTabCols &rNew,
     const SwTabCols &rOld, const SwTableBox *pStart, BOOL bCurRowOnly )
 {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     static int nCallCount = 0;
     ++nCallCount;
 #endif
@@ -1509,7 +1505,7 @@ const SwTableBox* SwTable::GetTblBox( const String& rName,
     // Box ist ??
     if( pBox && !pBox->GetSttNd() )
     {
-        ASSERT( FALSE, "Box ohne Inhalt, suche die naechste !!" );
+        OSL_ENSURE( FALSE, "Box ohne Inhalt, suche die naechste !!" );
         // "herunterfallen lassen" bis zur ersten Box
         while( pBox->GetTabLines().Count() )
             pBox = pBox->GetTabLines()[0]->GetTabBoxes()[0];
@@ -1761,7 +1757,7 @@ SwTableBox::SwTableBox( SwTableBoxFmt* pFmt, const SwNodeIndex &rIdx,
 
     // an der Table eintragen
     const SwTableNode* pTblNd = pSttNd->FindTableNode();
-    ASSERT( pTblNd, "in welcher Tabelle steht denn die Box?" );
+    OSL_ENSURE( pTblNd, "in welcher Tabelle steht denn die Box?" );
     SwTableSortBoxes& rSrtArr = (SwTableSortBoxes&)pTblNd->GetTable().
                                 GetTabSortBoxes();
     SwTableBox* p = this;   // error: &this
@@ -1779,7 +1775,7 @@ SwTableBox::SwTableBox( SwTableBoxFmt* pFmt, const SwStartNode& rSttNd, SwTableL
 
     // an der Table eintragen
     const SwTableNode* pTblNd = pSttNd->FindTableNode();
-    ASSERT( pTblNd, "in welcher Tabelle steht denn die Box?" );
+    OSL_ENSURE( pTblNd, "in welcher Tabelle steht denn die Box?" );
     SwTableSortBoxes& rSrtArr = (SwTableSortBoxes&)pTblNd->GetTable().
                                 GetTabSortBoxes();
     SwTableBox* p = this;   // error: &this
@@ -1793,7 +1789,7 @@ SwTableBox::~SwTableBox()
     {
         // an der Table austragen
         const SwTableNode* pTblNd = pSttNd->FindTableNode();
-        ASSERT( pTblNd, "in welcher Tabelle steht denn die Box?" );
+        OSL_ENSURE( pTblNd, "in welcher Tabelle steht denn die Box?" );
         SwTableSortBoxes& rSrtArr = (SwTableSortBoxes&)pTblNd->GetTable().
                                     GetTabSortBoxes();
         SwTableBox *p = this;   // error: &this
@@ -1995,7 +1991,7 @@ BOOL SwTableBox::IsInHeadline( const SwTable* pTbl ) const
     return pTbl->GetTabLines()[ 0 ] == pLine;
 }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
 ULONG SwTableBox::GetSttIdx() const
 {
@@ -2340,7 +2336,7 @@ void SwTableBoxFmt::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
                 SwTableBox* pBox = (SwTableBox*)aIter.First( TYPE( SwTableBox ) );
                 if( pBox )
                 {
-                    ASSERT( !aIter.Next(), "keine Box oder mehrere am Format" );
+                    OSL_ENSURE( !aIter.Next(), "keine Box oder mehrere am Format" );
 
                     ULONG nNewFmt;
                     if( pNewFmt )
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 7edfe7c0be88..6a99d9f78a02 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -100,7 +100,7 @@ FrmTagIdMap SwEnhancedPDFExportHelper::aFrmTagIdMap;
 
 LanguageType SwEnhancedPDFExportHelper::eLanguageDefault = 0;
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
 static std::vector< USHORT > aStructStack;
 
@@ -289,7 +289,7 @@ SwTaggedPDFHelper::SwTaggedPDFHelper( const Num_Info* pNumInfo,
 
     if ( mpPDFExtOutDevData && mpPDFExtOutDevData->GetIsExportTaggedPDF() )
     {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         sal_Int32 nCurrentStruct = mpPDFExtOutDevData->GetCurrentStructureElement();
         lcl_DBGCheckStack();
 #endif
@@ -302,7 +302,7 @@ SwTaggedPDFHelper::SwTaggedPDFHelper( const Num_Info* pNumInfo,
         else
             BeginTag( vcl::PDFWriter::NonStructElement, aEmptyString );
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         nCurrentStruct = mpPDFExtOutDevData->GetCurrentStructureElement();
         lcl_DBGCheckStack();
 #endif
@@ -317,13 +317,13 @@ SwTaggedPDFHelper::~SwTaggedPDFHelper()
 {
     if ( mpPDFExtOutDevData && mpPDFExtOutDevData->GetIsExportTaggedPDF() )
     {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         sal_Int32 nCurrentStruct = mpPDFExtOutDevData->GetCurrentStructureElement();
         lcl_DBGCheckStack();
 #endif
         EndStructureElements();
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         nCurrentStruct = mpPDFExtOutDevData->GetCurrentStructureElement();
         lcl_DBGCheckStack();
 #endif
@@ -390,9 +390,9 @@ bool SwTaggedPDFHelper::CheckReopenTag()
     {
         nRestoreCurrentTag = mpPDFExtOutDevData->GetCurrentStructureElement();
         const bool bSuccess = mpPDFExtOutDevData->SetCurrentStructureElement( nReopenTag );
-        ASSERT( bSuccess, "Failed to reopen tag" )
+        OSL_ENSURE( bSuccess, "Failed to reopen tag" );
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         aStructStack.push_back( 99 );
 #endif
 
@@ -413,9 +413,9 @@ bool SwTaggedPDFHelper::CheckRestoreTag() const
     {
         const bool bSuccess = mpPDFExtOutDevData->SetCurrentStructureElement( nRestoreCurrentTag );
         (void)bSuccess;
-        ASSERT( bSuccess, "Failed to restore reopened tag" )
+        OSL_ENSURE( bSuccess, "Failed to restore reopened tag" );
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         aStructStack.pop_back();
 #endif
 
@@ -435,7 +435,7 @@ void SwTaggedPDFHelper::BeginTag( vcl::PDFWriter::StructElement eType, const Str
     const sal_Int32 nId = mpPDFExtOutDevData->BeginStructureElement( eType, rtl::OUString( rString ) );
     ++nEndStructureElement;
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     aStructStack.push_back( static_cast<USHORT>(eType) );
 #endif
 
@@ -495,7 +495,7 @@ void SwTaggedPDFHelper::EndTag()
 {
     mpPDFExtOutDevData->EndStructureElement();
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     aStructStack.pop_back();
 #endif
 }
@@ -656,7 +656,7 @@ void SwTaggedPDFHelper::SetAttributes( vcl::PDFWriter::StructElement eType )
 
         if ( bTextIndent )
         {
-            ASSERT( pFrm->IsTxtFrm(), "Frame type <-> tag attribute mismatch" )
+            OSL_ENSURE( pFrm->IsTxtFrm(), "Frame type <-> tag attribute mismatch" );
             const SvxLRSpaceItem &rSpace =
                 static_cast<const SwTxtFrm*>(pFrm)->GetTxtNode()->GetSwAttrSet().GetLRSpace();
             nVal =  rSpace.GetTxtFirstLineOfst();
@@ -666,7 +666,7 @@ void SwTaggedPDFHelper::SetAttributes( vcl::PDFWriter::StructElement eType )
 
         if ( bTextAlign )
         {
-            ASSERT( pFrm->IsTxtFrm(), "Frame type <-> tag attribute mismatch" )
+            OSL_ENSURE( pFrm->IsTxtFrm(), "Frame type <-> tag attribute mismatch" );
             const SwAttrSet& aSet = static_cast<const SwTxtFrm*>(pFrm)->GetTxtNode()->GetSwAttrSet();
             const SvxAdjust nAdjust = aSet.GetAdjust().GetAdjust();
             if ( SVX_ADJUST_BLOCK == nAdjust || SVX_ADJUST_CENTER == nAdjust ||
@@ -685,7 +685,7 @@ void SwTaggedPDFHelper::SetAttributes( vcl::PDFWriter::StructElement eType )
 
         if ( bAlternateText )
         {
-            ASSERT( pFrm->IsFlyFrm(), "Frame type <-> tag attribute mismatch" )
+            OSL_ENSURE( pFrm->IsFlyFrm(), "Frame type <-> tag attribute mismatch" );
             const SwFlyFrm* pFly = static_cast<const SwFlyFrm*>(pFrm);
             if ( pFly->Lower() && pFly->Lower()->IsNoTxtFrm() )
             {
@@ -741,7 +741,7 @@ void SwTaggedPDFHelper::SetAttributes( vcl::PDFWriter::StructElement eType )
                 const TableColumnsMapEntry::const_iterator aLeftIter =  rCols.find( nLeft );
                 const TableColumnsMapEntry::const_iterator aRightIter = rCols.find( nRight );
 
-                ASSERT( aLeftIter != rCols.end() && aRightIter != rCols.end(), "Colspan trouble" )
+                OSL_ENSURE( aLeftIter != rCols.end() && aRightIter != rCols.end(), "Colspan trouble" );
                 if ( aLeftIter != rCols.end() && aRightIter != rCols.end() )
                 {
                     nVal = std::distance( aLeftIter, aRightIter );
@@ -863,12 +863,12 @@ void SwTaggedPDFHelper::SetAttributes( vcl::PDFWriter::StructElement eType )
  */
 void SwTaggedPDFHelper::BeginNumberedListStructureElements()
 {
-    ASSERT( mpNumInfo, "List without mpNumInfo?" )
+    OSL_ENSURE( mpNumInfo, "List without mpNumInfo?" );
     if ( !mpNumInfo )
         return;
 
     const SwFrm& rFrm = mpNumInfo->mrFrm;
-    ASSERT( rFrm.IsTxtFrm(), "numbered only for text frames" )
+    OSL_ENSURE( rFrm.IsTxtFrm(), "numbered only for text frames" );
     const SwTxtFrm& rTxtFrm = static_cast<const SwTxtFrm&>(rFrm);
 
     //
@@ -971,7 +971,7 @@ void SwTaggedPDFHelper::BeginNumberedListStructureElements()
             nRestoreCurrentTag = mpPDFExtOutDevData->GetCurrentStructureElement();
             mpPDFExtOutDevData->SetCurrentStructureElement( nReopenTag );
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
             aStructStack.push_back( 99 );
 #endif
         }
@@ -1102,7 +1102,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
                     static_cast<const SwTxtFrm*>(pFrm)->GetTxtNode();
 
                 const SwFmt* pTxtFmt = pTxtNd->GetFmtColl();
-                const SwFmt* pParentTxtFmt = pTxtFmt->DerivedFrom();
+                const SwFmt* pParentTxtFmt = pTxtFmt ? pTxtFmt->DerivedFrom() : NULL;
 
                 String sStyleName;
                 String sParentStyleName;
@@ -1526,7 +1526,7 @@ SwEnhancedPDFExportHelper::SwEnhancedPDFExportHelper( SwEditShell& rSh,
     aNumListBodyIdMap.clear();
     aFrmTagIdMap.clear();
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     aStructStack.clear();
 #endif
 
@@ -1599,7 +1599,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
                 {
                     const SwTxtNode* pTNd =
                         (SwTxtNode*)((SwFmtFld*)pFirst)->GetTxtFld()->GetpTxtNode();
-                    ASSERT( 0 != pTNd, "Enhanced pdf export - text node is missing" )
+                    OSL_ENSURE( 0 != pTNd, "Enhanced pdf export - text node is missing" );
 
                     // 1. Check if the whole paragraph is hidden
                     // 2. Move to the field
@@ -1655,10 +1655,10 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
         for( sal_uInt16 n = 0; n < nHyperLinkCount; ++n )
         {
             SwGetINetAttr* p = aArr[ n ];
-            ASSERT( 0 != p, "Enhanced pdf export - SwGetINetAttr is missing" )
+            OSL_ENSURE( 0 != p, "Enhanced pdf export - SwGetINetAttr is missing" );
 
             const SwTxtNode* pTNd = p->rINetAttr.GetpTxtNode();
-            ASSERT( 0 != pTNd, "Enhanced pdf export - text node is missing" )
+            OSL_ENSURE( 0 != pTNd, "Enhanced pdf export - text node is missing" );
 
             // 1. Check if the whole paragraph is hidden
             // 2. Move to the hyperlink
@@ -1689,7 +1689,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
                     // be deleted again in JumpToSwMark.
                     SwRects aTmp;
                     aTmp.Insert( mrSh.SwCrsrShell::_GetCrsr(), 0 );
-                    ASSERT( aTmp.Count() > 0, "Enhanced pdf export - rectangles are missing" )
+                    OSL_ENSURE( aTmp.Count() > 0, "Enhanced pdf export - rectangles are missing" );
 
                     // Create the destination for internal links:
                     sal_Int32 nDestId = -1;
@@ -1841,7 +1841,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
             {
                 const SwTxtNode* pTNd =
                     (SwTxtNode*)((SwFmtFld*)pFirst)->GetTxtFld()->GetpTxtNode();
-               ASSERT( 0 != pTNd, "Enhanced pdf export - text node is missing" )
+               OSL_ENSURE( 0 != pTNd, "Enhanced pdf export - text node is missing" );
 
                 // 1. Check if the whole paragraph is hidden
                 // 2. Move to the field
@@ -1857,7 +1857,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
                     // Link Rectangles
                     SwRects aTmp;
                     aTmp.Insert( mrSh.SwCrsrShell::_GetCrsr(), 0 );
-                    ASSERT( aTmp.Count() > 0, "Enhanced pdf export - rectangles are missing" )
+                    OSL_ENSURE( aTmp.Count() > 0, "Enhanced pdf export - rectangles are missing" );
 
                     mrSh.SwCrsrShell::ClearMark();
 
@@ -1948,7 +1948,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
             // Link Rectangle
             SwRects aTmp;
             aTmp.Insert( mrSh.SwCrsrShell::_GetCrsr(), 0 );
-            ASSERT( aTmp.Count() > 0, "Enhanced pdf export - rectangles are missing" )
+            OSL_ENSURE( aTmp.Count() > 0, "Enhanced pdf export - rectangles are missing" );
             const SwRect aLinkRect( aTmp[ 0 ] );
 
             mrSh._GetCrsr()->RestoreSavePos();
@@ -2003,7 +2003,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
             {
                 // Check if outline is hidden
                 const SwTxtNode* pTNd = mrSh.GetNodes().GetOutLineNds()[ i ]->GetTxtNode();
-                ASSERT( 0 != pTNd, "Enhanced pdf export - text node is missing" )
+                OSL_ENSURE( 0 != pTNd, "Enhanced pdf export - text node is missing" );
 
                 if ( pTNd->IsHidden() ||
                      // --> FME 2005-01-10 #i40292# Skip empty outlines:
diff --git a/sw/source/core/text/atrhndl.hxx b/sw/source/core/text/atrhndl.hxx
index cfd6e48bf191..c22dbeef3e9e 100644
--- a/sw/source/core/text/atrhndl.hxx
+++ b/sw/source/core/text/atrhndl.hxx
@@ -158,16 +158,16 @@ public:
 
 inline const SfxPoolItem& SwAttrHandler::GetDefault( const USHORT nAttribID ) const
 {
-    ASSERT( nAttribID < RES_TXTATR_END,
+    OSL_ENSURE( nAttribID < RES_TXTATR_END,
             "this attrib does not ex."
             );
-    ASSERT( pDefaultArray[ StackPos[ nAttribID ] ], "array not initialized" );
+    OSL_ENSURE( pDefaultArray[ StackPos[ nAttribID ] ], "array not initialized" );
     return *pDefaultArray[ StackPos[ nAttribID ] ];
 }
 
 inline void SwAttrHandler::ResetFont( SwFont& rFnt ) const
 {
-    ASSERT( pFnt, "ResetFont without a font" );
+    OSL_ENSURE( pFnt, "ResetFont without a font" );
     if ( pFnt )
         rFnt = *pFnt;
 };
diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx
index 2f545d2f8a91..c950e57942db 100644
--- a/sw/source/core/text/atrstck.cxx
+++ b/sw/source/core/text/atrstck.cxx
@@ -333,7 +333,7 @@ void SwAttrHandler::SwAttrStack::Insert( const SwTxtAttr& rAttr, const USHORT nP
         }
     }
 
-    ASSERT( nPos <= nCount, "wrong position for insert operation");
+    OSL_ENSURE( nPos <= nCount, "wrong position for insert operation");
 
     if ( nPos < nCount )
         memmove( pArray + nPos + 1, pArray + nPos,
@@ -521,7 +521,7 @@ void SwAttrHandler::PushAndChg( const SwTxtAttr& rAttr, SwFont& rFnt )
 
 sal_Bool SwAttrHandler::Push( const SwTxtAttr& rAttr, const SfxPoolItem& rItem )
 {
-    ASSERT( rItem.Which() < RES_TXTATR_WITHEND_END,
+    OSL_ENSURE( rItem.Which() < RES_TXTATR_WITHEND_END,
             "I do not want this attribute, nWhich >= RES_TXTATR_WITHEND_END" );
 
     // robust
@@ -542,7 +542,7 @@ sal_Bool SwAttrHandler::Push( const SwTxtAttr& rAttr, const SfxPoolItem& rItem )
     }
 
     USHORT nPos = aAttrStack[ nStack ].Count();
-    ASSERT( nPos, "empty stack?" );
+    OSL_ENSURE( nPos, "empty stack?" );
     aAttrStack[ nStack ].Insert( rAttr, nPos - 1 );
     return sal_False;
 }
@@ -599,7 +599,7 @@ void SwAttrHandler::PopAndChg( const SwTxtAttr& rAttr, SwFont& rFnt )
 
 void SwAttrHandler::Pop( const SwTxtAttr& rAttr )
 {
-    ASSERT( rAttr.Which() < RES_TXTATR_WITHEND_END,
+    OSL_ENSURE( rAttr.Which() < RES_TXTATR_WITHEND_END,
             "I do not have this attribute, nWhich >= RES_TXTATR_WITHEND_END" );
 
     if ( rAttr.Which() < RES_TXTATR_WITHEND_END )
@@ -613,7 +613,7 @@ void SwAttrHandler::Pop( const SwTxtAttr& rAttr )
  *************************************************************************/
 void SwAttrHandler::ActivateTop( SwFont& rFnt, const USHORT nAttr )
 {
-    ASSERT( nAttr < RES_TXTATR_WITHEND_END,
+    OSL_ENSURE( nAttr < RES_TXTATR_WITHEND_END,
             "I cannot activate this attribute, nWhich >= RES_TXTATR_WITHEND_END" );
 
     const USHORT nStackPos = StackPos[ nAttr ];
@@ -945,7 +945,7 @@ void SwAttrHandler::FontChg(const SfxPoolItem& rItem, SwFont& rFnt, sal_Bool bPu
 void SwAttrHandler::GetDefaultAscentAndHeight( ViewShell* pShell, OutputDevice& rOut,
                                                USHORT& nAscent, USHORT& nHeight ) const
 {
-    ASSERT( pFnt, "No font available for GetDefaultAscentAndHeight" )
+    OSL_ENSURE( pFnt, "No font available for GetDefaultAscentAndHeight" );
 
     if ( pFnt )
     {
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 92cd369759e9..fcc1815c6764 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -114,7 +114,7 @@ SwTxtFrm *GetAdjFrmAtPos( SwTxtFrm *pFrm, const SwPosition &rPos,
             pFrmAtPos->GetFormatted();
             pFrmAtPos = pFrmAtPos->FindMaster();
         }
-        ASSERT( pFrmAtPos, "+GetCharRect: no frame with my rightmargin" );
+        OSL_ENSURE( pFrmAtPos, "+GetCharRect: no frame with my rightmargin" );
     }
     return pFrmAtPos ? pFrmAtPos : pFrm;
 }
@@ -122,7 +122,7 @@ SwTxtFrm *GetAdjFrmAtPos( SwTxtFrm *pFrm, const SwPosition &rPos,
 sal_Bool lcl_ChangeOffset( SwTxtFrm* pFrm, xub_StrLen nNew )
 {
     // In Bereichen und ausserhalb von Flies wird nicht mehr gescrollt.
-    ASSERT( !pFrm->IsFollow(), "Illegal Scrolling by Follow!" );
+    OSL_ENSURE( !pFrm->IsFollow(), "Illegal Scrolling by Follow!" );
     if( pFrm->GetOfst() != nNew && !pFrm->IsInSct() )
     {
         SwFlyFrm *pFly = pFrm->FindFlyFrm();
@@ -201,7 +201,7 @@ SwTxtFrm *SwTxtFrm::GetFrmAtPos( const SwPosition &rPos )
 sal_Bool SwTxtFrm::GetCharRect( SwRect& rOrig, const SwPosition &rPos,
                             SwCrsrMoveState *pCMS ) const
 {
-    ASSERT( ! IsVertical() || ! IsSwapped(),"SwTxtFrm::GetCharRect with swapped frame" );
+    OSL_ENSURE( ! IsVertical() || ! IsSwapped(),"SwTxtFrm::GetCharRect with swapped frame" );
 
     if( IsLocked() || IsHiddenNow() )
         return sal_False;
@@ -354,7 +354,7 @@ sal_Bool SwTxtFrm::GetCharRect( SwRect& rOrig, const SwPosition &rPos,
     if( bRet )
     {
         SwPageFrm *pPage = pFrm->FindPageFrm();
-        ASSERT( pPage, "Text esaped from page?" );
+        OSL_ENSURE( pPage, "Text esaped from page?" );
         const SwTwips nOrigTop = (rOrig.*fnRect->fnGetTop)();
         const SwTwips nPageTop = (pPage->Frm().*fnRect->fnGetTop)();
         const SwTwips nPageBott = (pPage->Frm().*fnRect->fnGetBottom)();
@@ -885,14 +885,16 @@ sal_Bool SwTxtFrm::_UnitUp( SwPaM *pPam, const SwTwips nOffset,
                 aCharBox.Pos().X() = aCharBox.Pos().X() - 150;
 
                 // siehe Kommentar in SwTxtFrm::GetCrsrOfst()
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
                 const ULONG nOldNode = pPam->GetPoint()->nNode.GetIndex();
 #endif
                 // Der Node soll nicht gewechselt werden
                 xub_StrLen nTmpOfst = aLine.GetCrsrOfst( pPam->GetPoint(),
                                                          aCharBox.Pos(), sal_False );
-                ASSERT( nOldNode == pPam->GetPoint()->nNode.GetIndex(),
-                        "SwTxtFrm::UnitUp: illegal node change" )
+#if OSL_DEBUG_LEVEL > 1
+                OSL_ENSURE( nOldNode == pPam->GetPoint()->nNode.GetIndex(),
+                        "SwTxtFrm::UnitUp: illegal node change" );
+#endif
 
                 // 7684: Wir stellen sicher, dass wir uns nach oben bewegen.
                 if( nTmpOfst >= nStart && nStart && !bSecondOfDouble )
@@ -1251,7 +1253,7 @@ sal_Bool SwTxtFrm::_UnitDown(SwPaM *pPam, const SwTwips nOffset,
             if( pNextLine || bFirstOfDouble )
             {
                 aCharBox.SSize().Width() /= 2;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
                 // siehe Kommentar in SwTxtFrm::GetCrsrOfst()
                 const ULONG nOldNode = pPam->GetPoint()->nNode.GetIndex();
 #endif
@@ -1260,8 +1262,10 @@ sal_Bool SwTxtFrm::_UnitDown(SwPaM *pPam, const SwTwips nOffset,
 
                 xub_StrLen nTmpOfst = aLine.GetCrsrOfst( pPam->GetPoint(),
                                  aCharBox.Pos(), sal_False );
-                ASSERT( nOldNode == pPam->GetPoint()->nNode.GetIndex(),
-                    "SwTxtFrm::UnitDown: illegal node change" )
+#if OSL_DEBUG_LEVEL > 1
+                OSL_ENSURE( nOldNode == pPam->GetPoint()->nNode.GetIndex(),
+                    "SwTxtFrm::UnitDown: illegal node change" );
+#endif
 
                 // 7684: Wir stellen sicher, dass wir uns nach unten bewegen.
                 if( nTmpOfst <= nStart && ! bFirstOfDouble )
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 1529ee6fea0f..73f788ab6bbe 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -130,7 +130,7 @@ void SwTxtFrm::ValidateFrm()
     ValidateTxt( this );
 
     //MA: mindestens das MustFit-Flag muessen wir retten!
-    ASSERT( HasPara(), "ResetPreps(), missing ParaPortion." );
+    OSL_ENSURE( HasPara(), "ResetPreps(), missing ParaPortion." );
     SwParaPortion *pPara = GetPara();
     const sal_Bool bMustFit = pPara->IsPrepMustFit();
     ResetPreps();
@@ -186,7 +186,7 @@ sal_Bool SwTxtFrm::_GetDropRect( SwRect &rRect ) const
 {
     SWAP_IF_NOT_SWAPPED( this )
 
-    ASSERT( HasPara(), "SwTxtFrm::_GetDropRect: try again next year." );
+    OSL_ENSURE( HasPara(), "SwTxtFrm::_GetDropRect: try again next year." );
     SwTxtSizeInfo aInf( (SwTxtFrm*)this );
     SwTxtMargin aLine( (SwTxtFrm*)this, &aInf );
     if( aLine.GetDropLines() )
@@ -234,7 +234,7 @@ sal_Bool SwTxtFrm::CalcFollow( const xub_StrLen nTxtOfst )
 {
     SWAP_IF_SWAPPED( this )
 
-    ASSERT( HasFollow(), "CalcFollow: missing Follow." );
+    OSL_ENSURE( HasFollow(), "CalcFollow: missing Follow." );
 
     SwTxtFrm* pMyFollow = GetFollow();
 
@@ -246,7 +246,7 @@ sal_Bool SwTxtFrm::CalcFollow( const xub_StrLen nTxtOfst )
         ( pMyFollow->IsVertical() && !pMyFollow->Prt().Width() ) ||
         ( ! pMyFollow->IsVertical() && !pMyFollow->Prt().Height() ) )
     {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         const SwFrm *pOldUp = GetUpper();
 #endif
 
@@ -333,12 +333,12 @@ sal_Bool SwTxtFrm::CalcFollow( const xub_StrLen nTxtOfst )
                     pMyFollow->Calc();
                     // Der Follow merkt anhand seiner Frm().Height(), dass was schief
                     // gelaufen ist.
-                    ASSERT( !pMyFollow->GetPrev(), "SwTxtFrm::CalcFollow: cheesy follow" );
+                    OSL_ENSURE( !pMyFollow->GetPrev(), "SwTxtFrm::CalcFollow: cheesy follow" );
                     if( pMyFollow->GetPrev() )
                     {
                         pMyFollow->Prepare( PREP_CLEAR );
                         pMyFollow->Calc();
-                        ASSERT( !pMyFollow->GetPrev(), "SwTxtFrm::CalcFollow: very cheesy follow" );
+                        OSL_ENSURE( !pMyFollow->GetPrev(), "SwTxtFrm::CalcFollow: very cheesy follow" );
                     }
 
                     // OD 14.03.2003 #i11760# - reset control flag for follow format.
@@ -375,8 +375,8 @@ sal_Bool SwTxtFrm::CalcFollow( const xub_StrLen nTxtOfst )
                 pPage->ValidateCntnt();
         }
 
-#ifdef DBG_UTIL
-        ASSERT( pOldUp == GetUpper(), "SwTxtFrm::CalcFollow: heavy follow" );
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( pOldUp == GetUpper(), "SwTxtFrm::CalcFollow: heavy follow" );
 #endif
 
         const long nRemaining =
@@ -482,7 +482,7 @@ void SwTxtFrm::AdjustFrm( const SwTwips nChgHght, sal_Bool bHasToFit )
         SwTwips nRstHeight;
         if ( IsVertical() )
         {
-            ASSERT( ! IsSwapped(),"Swapped frame while calculating nRstHeight" );
+            OSL_ENSURE( ! IsSwapped(),"Swapped frame while calculating nRstHeight" );
             nRstHeight = Frm().Left() + Frm().Width() -
                          ( GetUpper()->Frm().Left() + GetUpper()->Prt().Left() );
         }
@@ -503,7 +503,7 @@ void SwTxtFrm::AdjustFrm( const SwTwips nChgHght, sal_Bool bHasToFit )
         {
             long nAdd = (*fnRect->fnYDiff)( (GetUpper()->Lower()->Frm().*fnRect->fnGetTop)(),
                                             (GetUpper()->*fnRect->fnGetPrtTop)() );
-            ASSERT( nAdd >= 0, "Ey" );
+            OSL_ENSURE( nAdd >= 0, "Ey" );
             nRstHeight += nAdd;
         }
 
@@ -579,7 +579,7 @@ void SwTxtFrm::_AdjustFollow( SwTxtFormatter &rLine,
         {
             if( ((SwTxtFrm*)GetFollow())->IsLocked() )
             {
-                ASSERT( sal_False, "+SwTxtFrm::JoinFrm: Follow ist locked." );
+                OSL_ENSURE( sal_False, "+SwTxtFrm::JoinFrm: Follow ist locked." );
                 return;
             }
             JoinFrm();
@@ -627,7 +627,7 @@ void SwTxtFrm::_AdjustFollow( SwTxtFormatter &rLine,
 
 SwCntntFrm *SwTxtFrm::JoinFrm()
 {
-    ASSERT( GetFollow(), "+SwTxtFrm::JoinFrm: no follow" );
+    OSL_ENSURE( GetFollow(), "+SwTxtFrm::JoinFrm: no follow" );
     SwTxtFrm  *pFoll = GetFollow();
 
     SwTxtFrm *pNxt = pFoll->GetFollow();
@@ -665,12 +665,12 @@ SwCntntFrm *SwTxtFrm::JoinFrm()
         }
     }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     else if ( pFoll->GetValidPrtAreaFlag() ||
               pFoll->GetValidSizeFlag() )
     {
         pFoll->CalcFtnFlag();
-        ASSERT( !pFoll->HasFtn(), "Missing FtnFlag." );
+        OSL_ENSURE( !pFoll->HasFtn(), "Missing FtnFlag." );
     }
 #endif
 
@@ -765,11 +765,11 @@ SwCntntFrm *SwTxtFrm::SplitFrm( const xub_StrLen nTxtPos )
         }
     }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     else
     {
         CalcFtnFlag( nTxtPos-1 );
-        ASSERT( !HasFtn(), "Missing FtnFlag." );
+        OSL_ENSURE( !HasFtn(), "Missing FtnFlag." );
     }
 #endif
 
@@ -793,7 +793,7 @@ void SwTxtFrm::_SetOfst( const xub_StrLen nNewOfst )
 #ifdef DBGTXT
     // Es gibt tatsaechlich einen Sonderfall, in dem ein SetOfst(0)
     // zulaessig ist: bug 3496
-    ASSERT( nNewOfst, "!SwTxtFrm::SetOfst: missing JoinFrm()." );
+    OSL_ENSURE( nNewOfst, "!SwTxtFrm::SetOfst: missing JoinFrm()." );
 #endif
 
     // Die Invalidierung unseres Follows ist nicht noetig.
@@ -817,7 +817,7 @@ void SwTxtFrm::_SetOfst( const xub_StrLen nNewOfst )
 
 sal_Bool SwTxtFrm::CalcPreps()
 {
-    ASSERT( ! IsVertical() || ! IsSwapped(), "SwTxtFrm::CalcPreps with swapped frame" );
+    OSL_ENSURE( ! IsVertical() || ! IsSwapped(), "SwTxtFrm::CalcPreps with swapped frame" );
     SWRECTFN( this );
 
     SwParaPortion *pPara = GetPara();
@@ -840,7 +840,7 @@ sal_Bool SwTxtFrm::CalcPreps()
         {
             if( !GetFollow() )
             {
-                ASSERT( GetFollow(), "+SwTxtFrm::CalcPreps: no credits" );
+                OSL_ENSURE( GetFollow(), "+SwTxtFrm::CalcPreps: no credits" );
                 return sal_False;
             }
 
@@ -876,7 +876,7 @@ sal_Bool SwTxtFrm::CalcPreps()
             }
             else
             {
-                ASSERT( nChgHeight < (Prt().*fnRect->fnGetHeight)(),
+                OSL_ENSURE( nChgHeight < (Prt().*fnRect->fnGetHeight)(),
                         "+SwTxtFrm::CalcPrep: wanna shrink" );
 
                 nChgHeight = (Prt().*fnRect->fnGetHeight)() - nChgHeight;
@@ -1209,7 +1209,7 @@ void SwTxtFrm::FormatAdjust( SwTxtFormatter &rLine,
 
 sal_Bool SwTxtFrm::FormatLine( SwTxtFormatter &rLine, const sal_Bool bPrev )
 {
-    ASSERT( ! IsVertical() || IsSwapped(),
+    OSL_ENSURE( ! IsVertical() || IsSwapped(),
             "SwTxtFrm::FormatLine( rLine, bPrev) with unswapped frame" );
     SwParaPortion *pPara = rLine.GetInfo().GetParaPortion();
     // Nach rLine.FormatLine() haelt nStart den neuen Wert,
@@ -1229,9 +1229,9 @@ sal_Bool SwTxtFrm::FormatLine( SwTxtFormatter &rLine, const sal_Bool bPrev )
 
     const xub_StrLen nNewStart = rLine.FormatLine( rLine.GetStart() );
 
-    ASSERT( Frm().Pos().Y() + Prt().Pos().Y() == rLine.GetFirstPos(),
+    OSL_ENSURE( Frm().Pos().Y() + Prt().Pos().Y() == rLine.GetFirstPos(),
             "SwTxtFrm::FormatLine: frame leaves orbit." );
-    ASSERT( rLine.GetCurr()->Height(),
+    OSL_ENSURE( rLine.GetCurr()->Height(),
             "SwTxtFrm::FormatLine: line height is zero" );
 
     // Das aktuelle Zeilenumbruchobjekt.
@@ -1355,7 +1355,7 @@ sal_Bool SwTxtFrm::FormatLine( SwTxtFormatter &rLine, const sal_Bool bPrev )
 void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
                         const sal_Bool bAdjust )
 {
-    ASSERT( ! IsVertical() || IsSwapped(),"SwTxtFrm::_Format with unswapped frame" );
+    OSL_ENSURE( ! IsVertical() || IsSwapped(),"SwTxtFrm::_Format with unswapped frame" );
 
     SwParaPortion *pPara = rLine.GetInfo().GetParaPortion();
     rLine.SetUnclipped( sal_False );
@@ -1512,7 +1512,7 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
         const SwLineLayout* pLine;
         {
             SwTxtFrm *pMaster = FindMaster();
-            ASSERT( pMaster, "SwTxtFrm::Format: homeless follow" );
+            OSL_ENSURE( pMaster, "SwTxtFrm::Format: homeless follow" );
             if( !pMaster->HasPara() )
                 pMaster->GetFormatted();
             SwTxtSizeInfo aInf( pMaster );
@@ -1684,7 +1684,7 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
 
 void SwTxtFrm::FormatOnceMore( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
 {
-    ASSERT( ! IsVertical() || IsSwapped(),
+    OSL_ENSURE( ! IsVertical() || IsSwapped(),
             "A frame is not swapped in SwTxtFrm::FormatOnceMore" );
 
     SwParaPortion *pPara = rLine.GetInfo().GetParaPortion();
@@ -1779,7 +1779,7 @@ void SwTxtFrm::_Format( SwParaPortion *pPara )
         pPara->SetPrepMustFit( bMustFit );
     }
 
-    ASSERT( ! IsSwapped(), "A frame is swapped before _Format" );
+    OSL_ENSURE( ! IsSwapped(), "A frame is swapped before _Format" );
 
     if ( IsVertical() )
         SwapWidthAndHeight();
@@ -1798,7 +1798,7 @@ void SwTxtFrm::_Format( SwParaPortion *pPara )
     if ( IsVertical() )
         SwapWidthAndHeight();
 
-    ASSERT( ! IsSwapped(), "A frame is swapped after _Format" );
+    OSL_ENSURE( ! IsSwapped(), "A frame is swapped after _Format" );
 
     if( 1 < aLine.GetDropLines() )
     {
@@ -1841,7 +1841,7 @@ void SwTxtFrm::Format( const SwBorderAttrs * )
     const SwFrm *pDbgFtnCont = (const SwFrm*)(FindPageFrm()->FindFtnCont());
     (void)pDbgFtnCont;
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     // nStopAt laesst sich vom CV bearbeiten.
     static MSHORT nStopAt = 0;
     if( nStopAt == GetFrmId() )
@@ -1864,7 +1864,7 @@ void SwTxtFrm::Format( const SwBorderAttrs * )
             if( nFtnPageNr > nDbgPageNr )
             {
                 SwTxtFrmLocker aLock(this);
-                ASSERT( nFtnPageNr <= nDbgPageNr, "!Ftn steht vor der Referenz." );
+                OSL_ENSURE( nFtnPageNr <= nDbgPageNr, "!Ftn steht vor der Referenz." );
                 MSHORT i = 0;
             }
         }
@@ -1966,7 +1966,7 @@ void SwTxtFrm::Format( const SwBorderAttrs * )
         else if( bSetOfst && IsFollow() )
         {
             SwTxtFrm *pMaster = FindMaster();
-            ASSERT( pMaster, "SwTxtFrm::Format: homeless follow" );
+            OSL_ENSURE( pMaster, "SwTxtFrm::Format: homeless follow" );
             if( pMaster )
                 pMaster->Prepare( PREP_FOLLOW_FOLLOWS );
             SwTwips nMaxY = (GetUpper()->*fnRect->fnGetPrtBottom)();
@@ -2079,7 +2079,7 @@ void SwTxtFrm::Format( const SwBorderAttrs * )
 
 sal_Bool SwTxtFrm::FormatQuick( bool bForceQuickFormat )
 {
-    ASSERT( ! IsVertical() || ! IsSwapped(),
+    OSL_ENSURE( ! IsVertical() || ! IsSwapped(),
             "SwTxtFrm::FormatQuick with swapped frame" );
 
     DBG_LOOP;
@@ -2087,7 +2087,7 @@ sal_Bool SwTxtFrm::FormatQuick( bool bForceQuickFormat )
     const XubString aXXX = GetTxtNode()->GetTxt();
     const SwTwips nDbgY = Frm().Top();
     (void)nDbgY;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     // nStopAt laesst sich vom CV bearbeiten.
     static MSHORT nStopAt = 0;
     if( nStopAt == GetFrmId() )
@@ -2133,7 +2133,7 @@ sal_Bool SwTxtFrm::FormatQuick( bool bForceQuickFormat )
         //DBG_LOOP; shadows declaration above.
         //resolved into:
 #if OSL_DEBUG_LEVEL > 1
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         DbgLoop aDbgLoop2( (const void*) this );
 #endif
 #endif
@@ -2151,7 +2151,7 @@ sal_Bool SwTxtFrm::FormatQuick( bool bForceQuickFormat )
     if( !bForceQuickFormat && nNewHeight != nOldHeight && !IsUndersized() )
     {
         // Achtung: Durch FormatLevel==12 kann diese Situation auftreten, don't panic!
-        // ASSERT( nNewHeight == nOldHeight, "!FormatQuick: rosebud" );
+        // OSL_ENSURE( nNewHeight == nOldHeight, "!FormatQuick: rosebud" );
         const xub_StrLen nStrt = GetOfst();
         _InvalidateRange( SwCharRange( nStrt, nEnd - nStrt) );
         return sal_False;
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index 320538e58158..d8da5de1351e 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -142,7 +142,7 @@ SwExtraPainter::SwExtraPainter( const SwTxtFrm *pFrm, ViewShell *pVwSh,
         nDivider = rLineInf.GetDivider().Len() ? rLineInf.GetDividerCountBy() : 0;
         nX = pFrm->Frm().Left();
         SwCharFmt* pFmt = rLineInf.GetCharFmt( const_cast<IDocumentStylePoolAccess&>(*pFrm->GetNode()->getIDocumentStylePoolAccess()) );
-        ASSERT( pFmt, "PaintExtraData without CharFmt" );
+        OSL_ENSURE( pFmt, "PaintExtraData without CharFmt" );
         pFnt = new SwFont( &pFmt->GetAttrSet(), pFrm->GetTxtNode()->getIDocumentSettingAccess() );
         pFnt->Invalidate();
         pFnt->ChgPhysFnt( pSh, *pSh->GetOut() );
@@ -438,7 +438,7 @@ SwRect SwTxtFrm::Paint()
 #endif
 
     // finger layout
-    ASSERT( GetValidPosFlag(), "+SwTxtFrm::Paint: no Calc()" );
+    OSL_ENSURE( GetValidPosFlag(), "+SwTxtFrm::Paint: no Calc()" );
 
     SwRect aRet( Prt() );
     if ( IsEmpty() || !HasPara() )
@@ -630,7 +630,7 @@ void SwTxtFrm::Paint( const SwRect &rRect, const SwPrtOptions * /*pPrintData*/ )
         //Informationen entzogen hat.
         if( !HasPara() )
         {
-            ASSERT( GetValidPosFlag(), "+SwTxtFrm::Paint: no Calc()" );
+            OSL_ENSURE( GetValidPosFlag(), "+SwTxtFrm::Paint: no Calc()" );
 
             // --> FME 2004-10-29 #i29062# pass info that we are currently
             // painting.
@@ -643,7 +643,7 @@ void SwTxtFrm::Paint( const SwRect &rRect, const SwPrtOptions * /*pPrintData*/ )
             }
             if( !HasPara() )
             {
-                ASSERT( !this, "+SwTxtFrm::Paint: missing format information" );
+                OSL_ENSURE( !this, "+SwTxtFrm::Paint: missing format information" );
                 return;
             }
         }
@@ -678,7 +678,7 @@ void SwTxtFrm::Paint( const SwRect &rRect, const SwPrtOptions * /*pPrintData*/ )
         // die Laenge ist immer wieder interessant.
 
         // Rectangle
-        ASSERT( ! IsSwapped(), "A frame is swapped before Paint" );
+        OSL_ENSURE( ! IsSwapped(), "A frame is swapped before Paint" );
         SwRect aOldRect( rRect );
 
         SWAP_IF_NOT_SWAPPED( this )
@@ -725,7 +725,7 @@ void SwTxtFrm::Paint( const SwRect &rRect, const SwPrtOptions * /*pPrintData*/ )
                 //DBG_LOOP; shadows declaration above.
                 //resolved into:
 #if  OSL_DEBUG_LEVEL > 1
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
                 DbgLoop aDbgLoop2( (const void*) this );
 #endif
 #endif
@@ -744,7 +744,7 @@ void SwTxtFrm::Paint( const SwRect &rRect, const SwPrtOptions * /*pPrintData*/ )
         UNDO_SWAP( this )
         (SwRect&)rRect = aOldRect;
 
-        ASSERT( ! IsSwapped(), "A frame is swapped after Paint" );
+        OSL_ENSURE( ! IsSwapped(), "A frame is swapped after Paint" );
     }
 }
 
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index 25c9fbc099dd..f145a8e7c1cc 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -33,7 +33,7 @@
 #include <ctype.h>
 #include <editeng/unolingu.hxx>
 #include <tools/shl.hxx>    // needed for SW_MOD() macro
-#include <errhdl.hxx>   // ASSERTs
+#include <errhdl.hxx>   //OSL_ENSURE
 #include <dlelstnr.hxx>
 #include <swmodule.hxx>
 #include <IDocumentSettingAccess.hxx>
@@ -74,10 +74,10 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
     if( !rInf.GetLen() || !rInf.GetTxt().Len() )
         return sal_False;
 
-    ASSERT( rInf.GetIdx() < rInf.GetTxt().Len(),
+    OSL_ENSURE( rInf.GetIdx() < rInf.GetTxt().Len(),
             "+SwTxtGuess::Guess: invalid SwTxtFormatInfo" );
 
-    ASSERT( nPorHeight, "+SwTxtGuess::Guess: no height" );
+    OSL_ENSURE( nPorHeight, "+SwTxtGuess::Guess: no height" );
 
     USHORT nMinSize;
     USHORT nMaxSizeDiff;
@@ -174,12 +174,12 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
     {
         nCutPos = rInf.GetTxtBreak( nLineWidth, nMaxLen, nMaxComp );
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         if ( STRING_LEN != nCutPos )
         {
             rInf.GetTxtSize( &rSI, rInf.GetIdx(), nCutPos - rInf.GetIdx(),
                              nMaxComp, nMinSize, nMaxSizeDiff );
-            ASSERT( nMinSize <= nLineWidth, "What a Guess!!!" );
+            OSL_ENSURE( nMinSize <= nLineWidth, "What a Guess!!!" );
         }
 #endif
     }
@@ -330,7 +330,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
             {
                 USHORT nScript = pBreakIt->GetRealScriptOfText( rInf.GetTxt(),
                                                                 nLangIndex );
-                ASSERT( nScript, "Script is not between 1 and 4" );
+                OSL_ENSURE( nScript, "Script is not between 1 and 4" );
 
                 // compare current script with script from last "real" character
                 if ( nScript - 1 != rInf.GetFont()->GetActual() )
@@ -423,7 +423,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
         }
         else if ( !bHyph && nBreakPos >= rInf.GetLineStart() )
         {
-            ASSERT( nBreakPos != STRING_LEN, "we should have found a break pos" );
+            OSL_ENSURE( nBreakPos != STRING_LEN, "we should have found a break pos" );
 
             // found break position within line
             xHyphWord = NULL;
@@ -452,7 +452,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
             // no line break found, setting nBreakPos to STRING_LEN
             // causes a break cut
             nBreakPos = STRING_LEN;
-            ASSERT( nCutPos >= rInf.GetIdx(), "Deep cut" );
+            OSL_ENSURE( nCutPos >= rInf.GetIdx(), "Deep cut" );
             nPorLen = nCutPos - rInf.GetIdx();
         }
 
@@ -461,7 +461,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
             const xub_StrLen nHangingLen = nBreakPos - nCutPos;
             SwPosSize aTmpSize = rInf.GetTxtSize( &rSI, nCutPos,
                                                   nHangingLen, 0 );
-            ASSERT( !pHanging, "A hanging portion is hanging around" );
+            OSL_ENSURE( !pHanging, "A hanging portion is hanging around" );
             pHanging = new SwHangingPortion( aTmpSize );
             pHanging->SetLen( nHangingLen );
             nPorLen = nCutPos - rInf.GetIdx();
@@ -478,11 +478,11 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
                 nBreakPos = nOldIdx - 1;
             else if ( STRING_LEN != nBreakPos )
             {
-                ASSERT( nBreakPos >= nFieldDiff, "I've got field trouble!" );
+                OSL_ENSURE( nBreakPos >= nFieldDiff, "I've got field trouble!" );
                 nBreakPos = nBreakPos - nFieldDiff;
             }
 
-            ASSERT( nCutPos >= rInf.GetIdx() && nCutPos >= nFieldDiff,
+            OSL_ENSURE( nCutPos >= rInf.GetIdx() && nCutPos >= nFieldDiff,
                     "I've got field trouble, part2!" );
             nCutPos = nCutPos - nFieldDiff;
 
@@ -492,7 +492,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
             rInf.SetIdx( nOldIdx );
 
 #if OSL_DEBUG_LEVEL > 1
-            ASSERT( aDebugString == rInf.GetTxt(),
+            OSL_ENSURE( aDebugString == rInf.GetTxt(),
                     "Somebody, somebody, somebody put something in my string" );
 #endif
         }
@@ -545,7 +545,7 @@ sal_Bool SwTxtGuess::AlternativeSpelling( const SwTxtFormatInfo &rInf,
 
     // check, if word has alternative spelling
     Reference< XHyphenator >  xHyph( ::GetHyphenator() );
-    ASSERT( xHyph.is(), "Hyphenator is missing");
+    OSL_ENSURE( xHyph.is(), "Hyphenator is missing");
     //! subtract 1 since the UNO-interface is 0 based
     xHyphWord = xHyph->queryAlternativeSpelling( OUString(aTxt),
                         pBreakIt->GetLocale( rInf.GetFont()->GetLanguage() ),
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 98913595f3a7..c0d9709fdd35 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -112,7 +112,7 @@ namespace numfunc
 }
 // <--
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 // Test2: WYSIWYG++
 // Test4: WYSIWYG debug
 static sal_Bool bDbgLow = sal_False;
@@ -222,7 +222,7 @@ void SwTxtInfo::CtorInitTxtInfo( SwTxtFrm *pFrm )
     nTxtStart = pFrm->GetOfst();
     if( !pPara )
     {
-        ASSERT( pPara, "+SwTxtInfo::CTOR: missing paragraph information" );
+        OSL_ENSURE( pPara, "+SwTxtInfo::CTOR: missing paragraph information" );
         pFrm->Format();
         pPara = pFrm->GetPara();
     }
@@ -234,7 +234,7 @@ SwTxtInfo::SwTxtInfo( const SwTxtInfo &rInf )
 { }
 
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 /*************************************************************************
  *                      ChkOutDev()
  *************************************************************************/
@@ -246,7 +246,7 @@ void ChkOutDev( const SwTxtSizeInfo &rInf )
 
     const OutputDevice* pOut = rInf.GetOut();
     const OutputDevice* pRef = rInf.GetRefDev();
-    ASSERT( pOut && pRef, "ChkOutDev: invalid output devices" )
+    OSL_ENSURE( pOut && pRef, "ChkOutDev: invalid output devices" );
 }
 #endif  // PRODUCT
 
@@ -287,7 +287,7 @@ SwTxtSizeInfo::SwTxtSizeInfo( const SwTxtSizeInfo &rNew )
       bSnapToGrid( rNew.SnapToGrid() ),
       nDirection( rNew.GetDirection() )
 {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     ChkOutDev( *this );
 #endif
 }
@@ -324,7 +324,7 @@ void SwTxtSizeInfo::CtorInitTxtSizeInfo( SwTxtFrm *pFrame, SwFont *pNewFnt,
         pRef = pOut;
     }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     ChkOutDev( *this );
 #endif
 
@@ -412,7 +412,7 @@ SwTxtSizeInfo::SwTxtSizeInfo( const SwTxtSizeInfo &rNew, const XubString &rTxt,
       bSnapToGrid( rNew.SnapToGrid() ),
       nDirection( rNew.GetDirection() )
 {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     ChkOutDev( *this );
 #endif
     SetLen( GetMinLen( *this ) );
@@ -441,8 +441,8 @@ void SwTxtSizeInfo::NoteAnimation() const
     if( OnWin() )
         SwRootFrm::FlushVout();
 
-    ASSERT( pOut == pVsh->GetOut(),
-            "SwTxtSizeInfo::NoteAnimation() changed pOut" )
+    OSL_ENSURE( pOut == pVsh->GetOut(),
+            "SwTxtSizeInfo::NoteAnimation() changed pOut" );
 }
 
 /*************************************************************************
@@ -519,7 +519,7 @@ xub_StrLen SwTxtSizeInfo::GetTxtBreak( const long nLineWidth,
     const SwScriptInfo& rScriptInfo =
                      ( (SwParaPortion*)GetParaPortion() )->GetScriptInfo();
 
-    ASSERT( pRef == pOut, "GetTxtBreak is supposed to use the RefDev" )
+    OSL_ENSURE( pRef == pOut, "GetTxtBreak is supposed to use the RefDev" );
     SwDrawTextInfo aDrawInf( pVsh, *pOut, &rScriptInfo,
                              *pTxt, GetIdx(), nMaxLen );
     aDrawInf.SetFrm( pFrm );
@@ -543,7 +543,7 @@ xub_StrLen SwTxtSizeInfo::GetTxtBreak( const long nLineWidth,
     const SwScriptInfo& rScriptInfo =
                      ( (SwParaPortion*)GetParaPortion() )->GetScriptInfo();
 
-    ASSERT( pRef == pOut, "GetTxtBreak is supposed to use the RefDev" )
+    OSL_ENSURE( pRef == pOut, "GetTxtBreak is supposed to use the RefDev" );
     SwDrawTextInfo aDrawInf( pVsh, *pOut, &rScriptInfo,
                              *pTxt, GetIdx(), nMaxLen );
     aDrawInf.SetFrm( pFrm );
@@ -570,10 +570,10 @@ void SwTxtPaintInfo::CtorInitTxtPaintInfo( SwTxtFrm *pFrame, const SwRect &rPain
     pGrammarCheckList = NULL;
     pSmartTags = NULL;  // SMARTTAGS
 
-#ifndef DBG_UTIL
-    pBrushItem = 0;
-#else
+#if OSL_DEBUG_LEVEL > 1
     pBrushItem = ((SvxBrushItem*)-1);
+#else
+    pBrushItem = 0;
 #endif
 }
 
@@ -710,7 +710,7 @@ void SwTxtPaintInfo::_DrawText( const XubString &rText, const SwLinePortion &rPo
     const sal_Bool bTmpGrammarCheck = bGrammarCheck && OnWin() && bCfgIsAutoGrammar && GetOpt().IsOnlineSpell();
     const sal_Bool bTmpSmart = bSmartTag && OnWin() && !GetOpt().IsPagePreview() && SwSmartTagMgr::Get().IsSmartTagsEnabled(); // SMARTTAGS
 
-    ASSERT( GetParaPortion(), "No paragraph!");
+    OSL_ENSURE( GetParaPortion(), "No paragraph!");
     SwDrawTextInfo aDrawInf( pFrm->GetShell(), *pOut, pSI, rText, nStart, nLength,
                              rPor.Width(), bBullet );
 
@@ -917,7 +917,7 @@ static void lcl_DrawSpecial( const SwTxtPaintInfo& rInf, const SwLinePortion& rP
         nMaxWidth = rRect.Height();
         break;
     default:
-        ASSERT( sal_False, "Unknown direction set at font" )
+        OSL_ENSURE( sal_False, "Unknown direction set at font" );
         break;
     }
 
@@ -995,7 +995,7 @@ void SwTxtPaintInfo::DrawRect( const SwRect &rRect, sal_Bool bNoGraphic,
             pOut->DrawRect( rRect.SVRect() );
         else
         {
-            ASSERT( ((SvxBrushItem*)-1) != pBrushItem, "DrawRect: Uninitialized BrushItem!" );
+            OSL_ENSURE( ((SvxBrushItem*)-1) != pBrushItem, "DrawRect: Uninitialized BrushItem!" );
             ::DrawGraphic( pBrushItem, pOut, aItemRect, rRect );
         }
     }
@@ -1174,7 +1174,7 @@ void SwTxtPaintInfo::DrawCheckBox( const SwFieldFormPortion &rPor, bool checked)
  *************************************************************************/
 void SwTxtPaintInfo::DrawBackground( const SwLinePortion &rPor ) const
 {
-    ASSERT( OnWin(), "SwTxtPaintInfo::DrawBackground: printer polution ?" );
+    OSL_ENSURE( OnWin(), "SwTxtPaintInfo::DrawBackground: printer polution ?" );
 
     SwRect aIntersect;
     CalcRect( rPor, 0, &aIntersect );
@@ -1243,7 +1243,7 @@ void SwTxtPaintInfo::_DrawBackBrush( const SwLinePortion &rPor ) const
     }
     if( !pFnt->GetBackColor() ) return;
 
-    ASSERT( pFnt->GetBackColor(), "DrawBackBrush: Lost Color" );
+    OSL_ENSURE( pFnt->GetBackColor(), "DrawBackBrush: Lost Color" );
 
     SwRect aIntersect;
     CalcRect( rPor, 0, &aIntersect );
@@ -1301,7 +1301,7 @@ void SwTxtPaintInfo::DrawViewOpt( const SwLinePortion &rPor,
             case POR_BLANK:     if ( GetOpt().IsHardBlank())bDraw = sal_True; break;
             default:
             {
-                ASSERT( !this, "SwTxtPaintInfo::DrawViewOpt: don't know how to draw this" );
+                OSL_ENSURE( !this, "SwTxtPaintInfo::DrawViewOpt: don't know how to draw this" );
                 break;
             }
         }
@@ -1316,7 +1316,7 @@ void SwTxtPaintInfo::DrawViewOpt( const SwLinePortion &rPor,
 
 void SwTxtPaintInfo::_NotifyURL( const SwLinePortion &rPor ) const
 {
-    ASSERT( pNoteURL, "NotifyURL: pNoteURL gone with the wind!" );
+    OSL_ENSURE( pNoteURL, "NotifyURL: pNoteURL gone with the wind!" );
 
     SwRect aIntersect;
     CalcRect( rPor, 0, &aIntersect );
@@ -1671,7 +1671,7 @@ xub_StrLen SwTxtFormatInfo::ScanPortionEnd( const xub_StrLen nStart,
             {
                 if( cTabDec == cPos )
                 {
-                    ASSERT( cPos, "Unexpected end of string" );
+                    OSL_ENSURE( cPos, "Unexpected end of string" );
                     if( cPos ) // robust
                     {
                         cHookChar = cPos;
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 676c1fba2f1a..e97389d9d2f3 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -380,7 +380,7 @@ public:
         { return ( pKanaComp && nKanaIdx < pKanaComp->Count() )
                    ? (*pKanaComp)[nKanaIdx] : 0; }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     sal_Bool IsOptCalm() const;
     sal_Bool IsOptLow() const;
     sal_Bool IsOptDbg() const;
@@ -423,11 +423,11 @@ class SwTxtPaintInfo : public SwTxtSizeInfo
     void _DrawBackBrush( const SwLinePortion &rPor ) const;
 
 protected:
-#ifndef DBG_UTIL
-    SwTxtPaintInfo() { pFrm = 0; pWrongList = 0; pGrammarCheckList = 0; pWrongList = 0; pSmartTags = 0; pSpaceAdd = 0; pBrushItem = 0;}
-#else
+#if OSL_DEBUG_LEVEL > 1
     SwTxtPaintInfo() { pFrm = 0; pWrongList = 0; pGrammarCheckList = 0; pSmartTags = 0; pSpaceAdd = 0;
                        pBrushItem = ((SvxBrushItem*)-1);}
+#else
+    SwTxtPaintInfo() { pFrm = 0; pWrongList = 0; pGrammarCheckList = 0; pWrongList = 0; pSmartTags = 0; pSpaceAdd = 0; pBrushItem = 0;}
 #endif
 public:
     SwTxtPaintInfo( const SwTxtPaintInfo &rInf );
@@ -812,13 +812,13 @@ public:
 
 inline KSHORT SwTxtSizeInfo::GetAscent() const
 {
-    ASSERT( GetOut(), "SwTxtSizeInfo::GetAscent() without pOut" )
+    OSL_ENSURE( GetOut(), "SwTxtSizeInfo::GetAscent() without pOut" );
     return ((SwFont*)GetFont())->GetAscent( pVsh, *GetOut() );
 }
 
 inline KSHORT SwTxtSizeInfo::GetTxtHeight() const
 {
-    ASSERT( GetOut(), "SwTxtSizeInfo::GetTxtHeight() without pOut" )
+    OSL_ENSURE( GetOut(), "SwTxtSizeInfo::GetTxtHeight() without pOut" );
     return ((SwFont*)GetFont())->GetHeight( pVsh, *GetOut() );
 }
 
diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx
index ba08613b1eae..d495574a2cfb 100644
--- a/sw/source/core/text/itradj.cxx
+++ b/sw/source/core/text/itradj.cxx
@@ -270,9 +270,9 @@ bool lcl_CheckKashidaWidth ( SwScriptInfo& rSI, SwTxtSizeInfo& rInf, SwTxtIter&
 void SwTxtAdjuster::CalcNewBlock( SwLineLayout *pCurrent,
                                   const SwLinePortion *pStopAt, SwTwips nReal, bool bSkipKashida )
 {
-    ASSERT( GetInfo().IsMulti() || SVX_ADJUST_BLOCK == GetAdjust(),
+    OSL_ENSURE( GetInfo().IsMulti() || SVX_ADJUST_BLOCK == GetAdjust(),
             "CalcNewBlock: Why?" );
-    ASSERT( pCurrent->Height(), "SwTxtAdjuster::CalcBlockAdjust: missing CalcLine()" );
+    OSL_ENSURE( pCurrent->Height(), "SwTxtAdjuster::CalcBlockAdjust: missing CalcLine()" );
 
     pCurrent->InitSpaceAdd();
     xub_StrLen nGluePortion = 0;
@@ -422,8 +422,8 @@ void SwTxtAdjuster::CalcNewBlock( SwLineLayout *pCurrent,
 
 SwTwips SwTxtAdjuster::CalcKanaAdj( SwLineLayout* pCurrent )
 {
-    ASSERT( pCurrent->Height(), "SwTxtAdjuster::CalcBlockAdjust: missing CalcLine()" );
-    ASSERT( !pCurrent->GetpKanaComp(), "pKanaComp already exists!!" );
+    OSL_ENSURE( pCurrent->Height(), "SwTxtAdjuster::CalcBlockAdjust: missing CalcLine()" );
+    OSL_ENSURE( !pCurrent->GetpKanaComp(), "pKanaComp already exists!!" );
 
     SvUShorts *pNewKana = new SvUShorts;
     pCurrent->SetKanaComp( pNewKana );
@@ -713,7 +713,7 @@ void SwTxtAdjuster::CalcFlyAdjust( SwLineLayout *pCurrent )
 
 void SwTxtAdjuster::CalcAdjLine( SwLineLayout *pCurrent )
 {
-    ASSERT( pCurrent->IsFormatAdj(), "CalcAdjLine: Why?" );
+    OSL_ENSURE( pCurrent->IsFormatAdj(), "CalcAdjLine: Why?" );
 
     pCurrent->SetFormatAdj(sal_False);
 
@@ -814,8 +814,8 @@ SwFlyPortion *SwTxtAdjuster::CalcFlyPortion( const long nRealWidth,
 
 void SwTxtAdjuster::CalcDropAdjust()
 {
-    ASSERT( 1<GetDropLines() && SVX_ADJUST_LEFT!=GetAdjust() && SVX_ADJUST_BLOCK!=GetAdjust(),
-            "CalcDropAdjust: No reason for DropAdjustment." )
+    OSL_ENSURE( 1<GetDropLines() && SVX_ADJUST_LEFT!=GetAdjust() && SVX_ADJUST_BLOCK!=GetAdjust(),
+            "CalcDropAdjust: No reason for DropAdjustment." );
 
     const MSHORT nLineNumber = GetLineNr();
 
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index 1f21d3b46cb8..1fc277d439ed 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -73,7 +73,7 @@ using namespace ::com::sun::star;
 
 void SwAttrIter::Chg( SwTxtAttr *pHt )
 {
-    ASSERT( pHt && pFnt, "No attribute of font available for change");
+    OSL_ENSURE( pHt && pFnt, "No attribute of font available for change");
     if( pRedln && pRedln->IsOn() )
         pRedln->ChangeTxtAttr( pFnt, *pHt, sal_True );
     else
@@ -87,7 +87,7 @@ void SwAttrIter::Chg( SwTxtAttr *pHt )
 
 void SwAttrIter::Rst( SwTxtAttr *pHt )
 {
-    ASSERT( pHt && pFnt, "No attribute of font available for reset");
+    OSL_ENSURE( pHt && pFnt, "No attribute of font available for reset");
     // get top from stack after removing pHt
     if( pRedln && pRedln->IsOn() )
         pRedln->ChangeTxtAttr( pFnt, *pHt, sal_False );
@@ -469,7 +469,7 @@ sal_Bool lcl_MinMaxNode( const SwFrmFmtPtr& rpNd, void* pArgs )
     {
         const SwMinMaxNodeArgs *pIn = (const SwMinMaxNodeArgs*)pArgs;
         const SwPosition *pPos = rFmtA.GetCntntAnchor();
-        ASSERT(pPos && pIn, "Unexpected NULL arguments");
+        OSL_ENSURE(pPos && pIn, "Unexpected NULL arguments");
         if (!pPos || !pIn || pIn->nIndx != pPos->nNode.GetIndex())
             bCalculate = false;
     }
@@ -846,7 +846,7 @@ USHORT SwTxtNode::GetScalingOfSelectedText( xub_StrLen nStt, xub_StrLen nEnd )
             pOut = getIDocumentDeviceAccess()->getReferenceDevice( true );
     }
 
-    ASSERT( pOut, "GetScalingOfSelectedText without outdev" )
+    OSL_ENSURE( pOut, "GetScalingOfSelectedText without outdev" );
 
     MapMode aOldMap( pOut->GetMapMode() );
     pOut->SetMapMode( MapMode( MAP_TWIP ) );
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 9f3d28d43b53..6ff7777fd6ff 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -78,7 +78,7 @@ void lcl_GetCharRectInsideField( SwTxtSizeInfo& rInf, SwRect& rOrig,
                                  const SwCrsrMoveState& rCMS,
                                  const SwLinePortion& rPor )
 {
-    ASSERT( rCMS.pSpecialPos, "Information about special pos missing" )
+    OSL_ENSURE( rCMS.pSpecialPos, "Information about special pos missing" );
 
     if ( rPor.InFldGrp() && ((SwFldPortion&)rPor).GetExp().Len() )
     {
@@ -110,7 +110,7 @@ void lcl_GetCharRectInsideField( SwTxtSizeInfo& rInf, SwRect& rOrig,
 
         } while ( TRUE );
 
-        ASSERT( nCharOfst >= nFldIdx, "Request of position inside field failed" )
+        OSL_ENSURE( nCharOfst >= nFldIdx, "Request of position inside field failed" );
         USHORT nLen = nCharOfst - nFldIdx + 1;
 
         if ( pString )
@@ -288,7 +288,7 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf )
                     case SVX_LINE_SPACE_FIX:
                         nFirstLineOfs = pSpace->GetLineHeight();
                     break;
-                    default: ASSERT( sal_False, ": unknown LineSpaceRule" );
+                    default: OSL_ENSURE( sal_False, ": unknown LineSpaceRule" );
                 }
                 switch( pSpace->GetInterLineSpaceRule() )
                 {
@@ -314,7 +314,7 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf )
                         nFirstLineOfs += pSpace->GetInterLineSpace();
                         break;
                     }
-                    default: ASSERT( sal_False, ": unknown InterLineSpaceRule" );
+                    default: OSL_ENSURE( sal_False, ": unknown InterLineSpaceRule" );
                 }
             }
         }
@@ -499,7 +499,7 @@ sal_Bool SwTxtCursor::GetEndCharRect( SwRect* pOrig, const xub_StrLen nOfst,
             pCMS->aRealHeight.X() = nTmpAscent - nPorAscent;
         else
             pCMS->aRealHeight.X() = 0;
-        ASSERT( nPorHeight, "GetCharRect: Missing Portion-Height" );
+        OSL_ENSURE( nPorHeight, "GetCharRect: Missing Portion-Height" );
         pCMS->aRealHeight.Y() = nPorHeight;
     }
 
@@ -964,7 +964,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst,
 
         if( pPor )
         {
-            ASSERT( !pPor->InNumberGrp() || bInsideFirstField, "Number surprise" );
+            OSL_ENSURE( !pPor->InNumberGrp() || bInsideFirstField, "Number surprise" );
             sal_Bool bEmptyFld = sal_False;
             if( pPor->InFldGrp() && pPor->GetLen() )
             {
@@ -975,7 +975,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst,
                     SwLinePortion *pNext = pTmp->GetPortion();
                     while( pNext && !pNext->InFldGrp() )
                     {
-                        ASSERT( !pNext->GetLen(), "Where's my field follow?" );
+                        OSL_ENSURE( !pNext->GetLen(), "Where's my field follow?" );
                         nAddX = nAddX + pNext->Width();
                         pNext = pNext->GetPortion();
                     }
@@ -1152,8 +1152,8 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst,
                     const SwLinePortion *pLast = rLineLayout.FindLastPortion();
                     if ( pLast->IsMultiPortion() )
                     {
-                        ASSERT( ((SwMultiPortion*)pLast)->IsBidi(),
-                                 "Non-BidiPortion inside BidiPortion" )
+                        OSL_ENSURE( ((SwMultiPortion*)pLast)->IsBidi(),
+                                 "Non-BidiPortion inside BidiPortion" );
                         pOrig->Pos().X() += pLast->Width() +
                                             pLast->CalcSpacing( nSpaceAdd, aInf );
                     }
@@ -1182,7 +1182,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst,
                 pCMS->aRealHeight.X() = nTmpAscent - nPorAscent;
             else
                 pCMS->aRealHeight.X() = 0;
-            ASSERT( nPorHeight, "GetCharRect: Missing Portion-Height" );
+            OSL_ENSURE( nPorHeight, "GetCharRect: Missing Portion-Height" );
             if ( nTmpHeight > nPorHeight )
                 pCMS->aRealHeight.Y() = nPorHeight;
             else
@@ -1209,8 +1209,8 @@ sal_Bool SwTxtCursor::GetCharRect( SwRect* pOrig, const xub_StrLen nOfst,
     {
         const BYTE nExtendRange = pCMS->pSpecialPos->nExtendRange;
 
-        ASSERT( ! pCMS->pSpecialPos->nLineOfst || SP_EXTEND_RANGE_BEFORE != nExtendRange,
-                "LineOffset AND Number Portion?" )
+        OSL_ENSURE( ! pCMS->pSpecialPos->nLineOfst || SP_EXTEND_RANGE_BEFORE != nExtendRange,
+                "LineOffset AND Number Portion?" );
 
         // portions which are behind the string
         if ( SP_EXTEND_RANGE_BEHIND == nExtendRange )
@@ -1629,7 +1629,7 @@ xub_StrLen SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
                         ((SwDropPortion*)pPor)->GetFnt() : NULL );
 
                 SwParaPortion* pPara = (SwParaPortion*)GetInfo().GetParaPortion();
-                ASSERT( pPara, "No paragraph!" );
+                OSL_ENSURE( pPara, "No paragraph!" );
 
                 SwDrawTextInfo aDrawInf( aSizeInf.GetVsh(),
                                          *aSizeInf.GetOut(),
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index c315e2ec7e59..c6ec608a1df1 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -108,7 +108,7 @@ void SwTxtFormatter::CtorInitTxtFormatter( SwTxtFrm *pNewFrm, SwTxtFormatInfo *p
 
     if( nStart > GetInfo().GetTxt().Len() )
     {
-        ASSERT( !this, "+SwTxtFormatter::CTOR: bad offset" );
+        OSL_ENSURE( !this, "+SwTxtFormatter::CTOR: bad offset" );
         nStart = GetInfo().GetTxt().Len();
     }
 
@@ -218,7 +218,7 @@ SwLinePortion *SwTxtFormatter::UnderFlow( SwTxtFormatInfo &rInf )
                     pTmpPrev->Move( rInf );
                     rInf.SetLast( pTmpPrev );
                     pTmpPrev = pTmpPrev->GetPortion();
-                    ASSERT( pTmpPrev, "UnderFlow: Loosing control!" );
+                    OSL_ENSURE( pTmpPrev, "UnderFlow: Loosing control!" );
                 };
             }
             pPor = pPor->GetPortion();
@@ -236,7 +236,7 @@ SwLinePortion *SwTxtFormatter::UnderFlow( SwTxtFormatInfo &rInf )
     }
 
     // Was? Die Unterlaufsituation ist nicht in der Portion-Kette ?
-    ASSERT( pPor, "SwTxtFormatter::UnderFlow: overflow but underflow" );
+    OSL_ENSURE( pPor, "SwTxtFormatter::UnderFlow: overflow but underflow" );
 
     // OD 2004-05-26 #i29529# - correction: no delete of footnotes
 //    if( rInf.IsFtnInside() && pPor && !rInf.IsQuick() )
@@ -380,7 +380,7 @@ void SwTxtFormatter::InsertPortion( SwTxtFormatInfo &rInf,
 
 void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
 {
-    ASSERT( rInf.GetTxt().Len() < STRING_LEN,
+    OSL_ENSURE( rInf.GetTxt().Len() < STRING_LEN,
             "SwTxtFormatter::BuildPortions: bad text length in info" );
 
     rInf.ChkNoHyph( CntEndHyph(), CntMidHyph() );
@@ -391,7 +391,7 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
     rInf.SetLast( pCurr );
     rInf.ForcedLeftMargin( 0 );
 
-    ASSERT( pCurr->FindLastPortion() == pCurr, "pLast supposed to equal pCurr" );
+    OSL_ENSURE( pCurr->FindLastPortion() == pCurr, "pLast supposed to equal pCurr" );
 
     if( !pCurr->GetAscent() && !pCurr->Height() )
         CalcAscent( rInf, pCurr );
@@ -399,7 +399,7 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
     SeekAndChg( rInf );
 
     // In CalcFlyWidth wird Width() verkuerzt, wenn eine FlyPortion vorliegt.
-    ASSERT( !rInf.X() || pMulti, "SwTxtFormatter::BuildPortion X=0?" );
+    OSL_ENSURE( !rInf.X() || pMulti, "SwTxtFormatter::BuildPortion X=0?" );
     CalcFlyWidth( rInf );
     SwFlyPortion *pFly = rInf.GetFly();
     if( pFly )
@@ -432,7 +432,7 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
 
     while( pPor && !rInf.IsStop() )
     {
-        ASSERT( rInf.GetLen() < STRING_LEN &&
+        OSL_ENSURE( rInf.GetLen() < STRING_LEN &&
                 rInf.GetIdx() <= rInf.GetTxt().Len(),
                 "SwTxtFormatter::BuildPortions: bad length in info" );
         DBG_LOOP;
@@ -668,7 +668,7 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
             if ( nRestWidth > 0 && SW_CJK != nCurrScript &&
                 ! rInf.IsUnderFlow() && ( bFull || SW_CJK == nNextScript ) )
             {
-                ASSERT( pGridKernPortion, "No GridKernPortion available" )
+                OSL_ENSURE( pGridKernPortion, "No GridKernPortion available" );
 
                 // calculate size
                 SwLinePortion* pTmpPor = pGridKernPortion->GetPortion();
@@ -687,8 +687,8 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
                                                 nRestWidth );
                 const USHORT nKernWidth_1 = (USHORT)(nKernWidth / 2);
 
-                ASSERT( nKernWidth <= nRestWidth,
-                        "Not enough space left for adjusting non-asian text in grid mode" )
+                OSL_ENSURE( nKernWidth <= nRestWidth,
+                        "Not enough space left for adjusting non-asian text in grid mode" );
 
                 pGridKernPortion->Width( pGridKernPortion->Width() + nKernWidth_1 );
                 rInf.X( rInf.X() + nKernWidth_1 );
@@ -1062,8 +1062,8 @@ SwLinePortion *SwTxtFormatter::WhichFirstPortion(SwTxtFormatInfo &rInf)
         // 5) Die Fussnotenzahlen
         if( !rInf.IsFtnDone() )
         {
-            ASSERT( ( ! rInf.IsMulti() && ! pMulti ) || pMulti->HasRotation(),
-                     "Rotated number portion trouble" )
+            OSL_ENSURE( ( ! rInf.IsMulti() && ! pMulti ) || pMulti->HasRotation(),
+                     "Rotated number portion trouble" );
 
             sal_Bool bFtnNum = pFrm->IsFtnNumFrm();
             rInf.GetParaPortion()->SetFtnNum( bFtnNum );
@@ -1084,8 +1084,8 @@ SwLinePortion *SwTxtFormatter::WhichFirstPortion(SwTxtFormatInfo &rInf)
         // 7) Die Numerierungen
         if( !rInf.IsNumDone() && !pPor )
         {
-            ASSERT( ( ! rInf.IsMulti() && ! pMulti ) || pMulti->HasRotation(),
-                     "Rotated number portion trouble" )
+            OSL_ENSURE( ( ! rInf.IsMulti() && ! pMulti ) || pMulti->HasRotation(),
+                     "Rotated number portion trouble" );
 
             // Wenn wir im Follow stehen, dann natuerlich nicht.
             if( GetTxtFrm()->GetTxtNode()->GetNumRule() )
@@ -1161,7 +1161,7 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
     rInf.SetStopUnderFlow( sal_False );
     if( rInf.GetUnderFlow() )
     {
-        ASSERT( rInf.IsFull(), "SwTxtFormatter::NewPortion: underflow but not full" );
+        OSL_ENSURE( rInf.IsFull(), "SwTxtFormatter::NewPortion: underflow but not full" );
         return UnderFlow( rInf );
     }
 
@@ -1348,7 +1348,7 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
                   if ( GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::TAB_COMPAT) /*rInf.GetVsh()->IsTabCompat();*/ &&
                          POR_TABDECIMAL == pLastTabPortion->GetWhichPor() )
                     {
-                        ASSERT( rInf.X() >= pLastTabPortion->Fix(), "Decimal tab stop position cannot be calculated" )
+                        OSL_ENSURE( rInf.X() >= pLastTabPortion->Fix(), "Decimal tab stop position cannot be calculated" );
                         const USHORT nWidthOfPortionsUpToDecimalPosition = (USHORT)(rInf.X() - pLastTabPortion->Fix() );
                         static_cast<SwTabDecimalPortion*>(pLastTabPortion)->SetWidthOfPortionsUpToDecimalPosition( nWidthOfPortionsUpToDecimalPosition );
                         rInf.SetTabDecimal( 0 );
@@ -1461,12 +1461,12 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
     // Werte bereithalten muss:
     if( !pCurr->Height() )
     {
-        ASSERT( pCurr->Height(), "SwTxtFormatter::NewPortion: limbo dance" );
+        OSL_ENSURE( pCurr->Height(), "SwTxtFormatter::NewPortion: limbo dance" );
         pCurr->Height( pPor->Height() );
         pCurr->SetAscent( pPor->GetAscent() );
     }
 
-    ASSERT( !pPor || pPor->Height(),
+    OSL_ENSURE( !pPor || pPor->Height(),
             "SwTxtFormatter::NewPortion: something went wrong");
     if( pPor->IsPostItsPortion() && rInf.X() >= rInf.Width() && rInf.GetFly() )
     {
@@ -1482,7 +1482,7 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
 
 xub_StrLen SwTxtFormatter::FormatLine( const xub_StrLen nStartPos )
 {
-    ASSERT( ! pFrm->IsVertical() || pFrm->IsSwapped(),
+    OSL_ENSURE( ! pFrm->IsVertical() || pFrm->IsSwapped(),
             "SwTxtFormatter::FormatLine( nStartPos ) with unswapped frame" );
 
     // For the formatting routines, we set pOut to the reference device.
@@ -1786,7 +1786,7 @@ pCurr->GetAscent() )
                     pInf->GetParaPortion()->SetFixLineHeight();
                 }
                 break;
-                default: ASSERT( sal_False, ": unknown LineSpaceRule" );
+                default: OSL_ENSURE( sal_False, ": unknown LineSpaceRule" );
             }
             if( !IsParaLine() )
                 switch( pSpace->GetInterLineSpaceRule() )
@@ -1813,7 +1813,7 @@ pCurr->GetAscent() )
                         nLineHeight = nLineHeight + pSpace->GetInterLineSpace();
                         break;
                     }
-                    default: ASSERT( sal_False, ": unknown InterLineSpaceRule" );
+                    default: OSL_ENSURE( sal_False, ": unknown InterLineSpaceRule" );
                 }
         }
 #if OSL_DEBUG_LEVEL > 1
@@ -2081,7 +2081,7 @@ long SwTxtFormatter::CalcOptRepaint( xub_StrLen nOldLineEnd,
                 CH_BLANK == GetInfo().GetChar( nReformat ) )
             --nReformat;
 
-        ASSERT( nReformat < GetInfo().GetIdx(), "Reformat too small for me!" );
+        OSL_ENSURE( nReformat < GetInfo().GetIdx(), "Reformat too small for me!" );
         SwRect aRect;
 
         // Note: GetChareRect is not const. It definitely changes the
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 21e3e26d1054..4383d2827df1 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -101,10 +101,10 @@ void SwTxtPainter::CtorInitTxtPainter( SwTxtFrm *pNewFrm, SwTxtPaintInfo *pNewIn
     pInf = pNewInf;
     SwFont *pMyFnt = GetFnt();
     GetInfo().SetFont( pMyFnt );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     if( ALIGN_BASELINE != pMyFnt->GetAlign() )
     {
-        ASSERT( ALIGN_BASELINE == pMyFnt->GetAlign(),
+        OSL_ENSURE( ALIGN_BASELINE == pMyFnt->GetAlign(),
                 "+SwTxtPainter::CTOR: font alignment revolution" );
         pMyFnt->SetAlign( ALIGN_BASELINE );
     }
@@ -538,8 +538,8 @@ void SwTxtPainter::CheckSpecialUnderline( const SwLinePortion* pPor,
     Range aRange( 0, GetInfo().GetTxt().Len() );
     MultiSelection aUnderMulti( aRange );
 
-    ASSERT( GetFnt() && UNDERLINE_NONE != GetFnt()->GetUnderline(),
-            "CheckSpecialUnderline without underlined font" )
+    OSL_ENSURE( GetFnt() && UNDERLINE_NONE != GetFnt()->GetUnderline(),
+            "CheckSpecialUnderline without underlined font" );
     const SwFont* pParaFnt = GetAttrHandler().GetFont();
     if( pParaFnt && pParaFnt->GetUnderline() == GetFnt()->GetUnderline() )
         aUnderMulti.SelectAll();
diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx
index 69bced28345f..431ee467a595 100644
--- a/sw/source/core/text/itrtxt.cxx
+++ b/sw/source/core/text/itrtxt.cxx
@@ -69,7 +69,7 @@ void SwTxtIter::CtorInitTxtIter( SwTxtFrm *pNewFrm, SwTxtInfo *pNewInf )
 
     SwTxtNode *pNode = pNewFrm->GetTxtNode();
 
-    ASSERT( pNewFrm->GetPara(), "No paragraph" );
+    OSL_ENSURE( pNewFrm->GetPara(), "No paragraph" );
 
     CtorInitAttrIter( *pNode, pNewFrm->GetPara()->GetScriptInfo(), pNewFrm );
 
@@ -359,7 +359,7 @@ USHORT SwTxtCursor::AdjustBaseLine( const SwLineLayout& rLine,
                 nOfst = nOfst + nPorAscent;
                 break;
             case SvxParaVertAlignItem::CENTER :
-                ASSERT( rLine.Height() >= nPorHeight, "Portion height > Line height");
+                OSL_ENSURE( rLine.Height() >= nPorHeight, "Portion height > Line height");
                 nOfst += ( rLine.Height() - nPorHeight ) / 2 + nPorAscent;
                 break;
             case SvxParaVertAlignItem::BOTTOM :
@@ -510,7 +510,7 @@ SwHookOut::SwHookOut( SwTxtSizeInfo& rInfo ) :
      pOut( rInfo.GetOut() ),
      bOnWin( rInfo.OnWin() )
 {
-    ASSERT( rInfo.GetRefDev(), "No reference device for text formatting" )
+    OSL_ENSURE( rInfo.GetRefDev(), "No reference device for text formatting" );
 
     // set new values
     rInfo.SetOut( rInfo.GetRefDev() );
diff --git a/sw/source/core/text/makefile.mk b/sw/source/core/text/makefile.mk
index 0076a1748741..c14046214a20 100644
--- a/sw/source/core/text/makefile.mk
+++ b/sw/source/core/text/makefile.mk
@@ -47,8 +47,20 @@ CFLAGS+=-DENABLE_GRAPHITE
 # --- Files --------------------------------------------------------
 
 SLOFILES =  \
-                $(SLO)$/atrstck.obj \
-                $(SLO)$/EnhancedPDFExportHelper.obj \
+        $(EXCEPTIONSFILES) \
+        $(SLO)$/txtcache.obj \
+        $(SLO)$/txtinit.obj
+
+.IF "$(DBG_LEVEL)">="2"
+SLOFILES +=  \
+        $(SLO)$/txtio.obj
+.ENDIF
+
+EXCEPTIONSFILES = \
+        $(SLO)$/EnhancedPDFExportHelper.obj \
+        $(SLO)$/SwGrammarMarkUp.obj \
+        $(SLO)$/atrstck.obj \
+        $(SLO)$/blink.obj \
         $(SLO)$/frmcrsr.obj \
         $(SLO)$/frmform.obj \
         $(SLO)$/frminf.obj \
@@ -61,6 +73,7 @@ SLOFILES =  \
         $(SLO)$/itrform2.obj \
         $(SLO)$/itrpaint.obj \
         $(SLO)$/itrtxt.obj \
+        $(SLO)$/noteurl.obj \
         $(SLO)$/porexp.obj \
         $(SLO)$/porfld.obj \
         $(SLO)$/porfly.obj \
@@ -73,45 +86,17 @@ SLOFILES =  \
         $(SLO)$/portox.obj \
         $(SLO)$/portxt.obj \
         $(SLO)$/redlnitr.obj \
-        $(SLO)$/txtcache.obj \
         $(SLO)$/txtdrop.obj \
         $(SLO)$/txtfld.obj \
         $(SLO)$/txtfly.obj \
         $(SLO)$/txtfrm.obj \
         $(SLO)$/txtftn.obj \
         $(SLO)$/txthyph.obj \
-        $(SLO)$/txtinit.obj \
         $(SLO)$/txtpaint.obj \
         $(SLO)$/txttab.obj \
         $(SLO)$/widorp.obj \
-        $(SLO)$/blink.obj \
-        $(SLO)$/noteurl.obj \
-        $(SLO)$/SwGrammarMarkUp.obj \
         $(SLO)$/wrong.obj
 
-.IF "$(dbgutil)"!=""
-SLOFILES +=  \
-        $(SLO)$/txtio.obj
-.ENDIF
-
-EXCEPTIONSFILES = \
-        $(SLO)$/EnhancedPDFExportHelper.obj \
-        $(SLO)$/inftxt.obj \
-        $(SLO)$/itradj.obj \
-        $(SLO)$/itrcrsr.obj \
-        $(SLO)$/porlay.obj \
-        $(SLO)$/pormulti.obj \
-        $(SLO)$/SwGrammarMarkUp.obj \
-        $(SLO)$/txtfly.obj \
-        $(SLO)$/wrong.obj
-
-
-.IF "$(CPUNAME)" == "SPARC"
-.IF "$(OS)" == "NETBSD"
-NOOPTFILES = \
-    $(SLO)$/txtftn.obj
-.ENDIF
-.ENDIF
 
 # --- Tagets -------------------------------------------------------
 
diff --git a/sw/source/core/text/noteurl.cxx b/sw/source/core/text/noteurl.cxx
index dc3152852711..2e5cbcc692a7 100644
--- a/sw/source/core/text/noteurl.cxx
+++ b/sw/source/core/text/noteurl.cxx
@@ -64,7 +64,7 @@ void SwNoteURL::InsertURLNote( const XubString& rURL, const XubString& rTarget,
 void SwNoteURL::FillImageMap( ImageMap *pMap, const Point &rPos,
     const MapMode& rMap )
 {
-    ASSERT( pMap, "FillImageMap: No ImageMap, no cookies!" );
+    OSL_ENSURE( pMap, "FillImageMap: No ImageMap, no cookies!" );
     MSHORT nCount = Count();
     if( nCount )
     {
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 15114c66fc88..2d127388b7aa 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -84,7 +84,7 @@ SwFldPortion *SwFldPortion::Clone( const XubString &rExpand ) const
 
 void SwFldPortion::TakeNextOffset( const SwFldPortion* pFld )
 {
-    ASSERT( pFld, "TakeNextOffset: Missing Source" );
+    OSL_ENSURE( pFld, "TakeNextOffset: Missing Source" );
     nNextOffset = pFld->GetNextOffset();
     aExpand.Erase( 0, nNextOffset );
     bFollow = sal_True;
@@ -455,7 +455,7 @@ void SwFldPortion::Paint( const SwTxtPaintInfo &rInf ) const
 {
     SwFontSave aSave( rInf, pFnt );
 
-    ASSERT( GetLen() <= 1, "SwFldPortion::Paint: rest-portion polution?" );
+    OSL_ENSURE( GetLen() <= 1, "SwFldPortion::Paint: rest-portion polution?" );
     if( Width() && ( !bPlaceHolder || rInf.GetOpt().IsShowPlaceHolderFields() ) )
     {
         // Dies ist eine freizuegige Auslegung der Hintergrundbelegung ...
@@ -595,7 +595,7 @@ sal_Bool SwNumberPortion::Format( SwTxtFormatInfo &rInf )
     if( rInf.IsNumDone() )
     {
 //        SetAscent( rInf.GetAscent() );
-        ASSERT( Height() && nAscent, "NumberPortions without Height | Ascent" );
+        OSL_ENSURE( Height() && nAscent, "NumberPortions without Height | Ascent" );
 
         long nDiff( 0 );
         // --> OD 2008-01-23 #newlistlevelattrs#
@@ -1093,7 +1093,7 @@ void SwGrfNumPortion::SetBase( long nLnAscent, long nLnDescent,
 
 void SwTxtFrm::StopAnimation( OutputDevice* pOut )
 {
-    ASSERT( HasAnimation(), "SwTxtFrm::StopAnimation: Which Animation?" );
+    OSL_ENSURE( HasAnimation(), "SwTxtFrm::StopAnimation: Which Animation?" );
     if( HasPara() )
     {
         SwLineLayout *pLine = GetPara();
@@ -1156,7 +1156,7 @@ SwCombinedPortion::SwCombinedPortion( const XubString &rTxt )
 
 void SwCombinedPortion::Paint( const SwTxtPaintInfo &rInf ) const
 {
-    ASSERT( GetLen() <= 1, "SwFldPortion::Paint: rest-portion polution?" );
+    OSL_ENSURE( GetLen() <= 1, "SwFldPortion::Paint: rest-portion polution?" );
     if( Width() )
     {
         rInf.DrawBackBrush( *this );
@@ -1169,7 +1169,7 @@ void SwCombinedPortion::Paint( const SwTxtPaintInfo &rInf ) const
         USHORT nCount = aExpand.Len();
         if( !nCount )
             return;
-        ASSERT( nCount < 7, "Too much combined characters" );
+        OSL_ENSURE( nCount < 7, "Too much combined characters" );
 
         // the first character of the second row
         USHORT nTop = ( nCount + 1 ) / 2;
@@ -1221,7 +1221,7 @@ sal_Bool SwCombinedPortion::Format( SwTxtFormatInfo &rInf )
         return sal_False;
     }
 
-    ASSERT( nCount < 7, "Too much combined characters" );
+    OSL_ENSURE( nCount < 7, "Too much combined characters" );
     // If there are leading "weak"-scripttyped characters in this portion,
     // they get the actual scripttype.
     USHORT i = 0;
@@ -1233,7 +1233,7 @@ sal_Bool SwCombinedPortion::Format( SwTxtFormatInfo &rInf )
         i = 0;
         while( i < aExpand.Len() )
         {
-            ASSERT( aScrType[i] < SW_SCRIPTS, "Combined: Script fault" );
+            OSL_ENSURE( aScrType[i] < SW_SCRIPTS, "Combined: Script fault" );
             if( !aWidth[ aScrType[i] ] )
             {
                 rInf.GetOut()->SetFont( rInf.GetFont()->GetFnt( aScrType[i] ) );
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx
index e3455c0ba6aa..30e5b231f50a 100644
--- a/sw/source/core/text/porfly.cxx
+++ b/sw/source/core/text/porfly.cxx
@@ -69,7 +69,7 @@ void SwFlyPortion::Paint( const SwTxtPaintInfo& ) const
  *************************************************************************/
 sal_Bool SwFlyPortion::Format( SwTxtFormatInfo &rInf )
 {
-    ASSERT( Fix() >= rInf.X(), "SwFlyPortion::Format: rush hour" );
+    OSL_ENSURE( Fix() >= rInf.X(), "SwFlyPortion::Format: rush hour" );
     // 8537: Tabs muessen expandiert werden.
     if( rInf.GetLastTab() )
         ((SwLinePortion*)rInf.GetLastTab())->FormatEOL( rInf );
@@ -79,7 +79,7 @@ sal_Bool SwFlyPortion::Format( SwTxtFormatInfo &rInf )
     PrtWidth( static_cast<USHORT>(Fix() - rInf.X() + PrtWidth()) );
     if( !Width() )
     {
-        ASSERT( Width(), "+SwFlyPortion::Format: a fly is a fly is a fly" );
+        OSL_ENSURE( Width(), "+SwFlyPortion::Format: a fly is a fly is a fly" );
         Width(1);
     }
 
@@ -205,7 +205,7 @@ void SwTxtFrm::MoveFlyInCnt( SwTxtFrm *pNew, xub_StrLen nStart, xub_StrLen nEnd
 xub_StrLen SwTxtFrm::CalcFlyPos( SwFrmFmt* pSearch )
 {
     SwpHints* pHints = GetTxtNode()->GetpSwpHints();
-    ASSERT( pHints, "CalcFlyPos: Why me?" );
+    OSL_ENSURE( pHints, "CalcFlyPos: Why me?" );
     if( !pHints )
         return STRING_LEN;
     SwTxtAttr* pFound = NULL;
@@ -219,7 +219,7 @@ xub_StrLen SwTxtFrm::CalcFlyPos( SwFrmFmt* pSearch )
                 pFound = pHt;
         }
     }
-    ASSERT( pHints, "CalcFlyPos: Not Found!" );
+    OSL_ENSURE( pHints, "CalcFlyPos: Not Found!" );
     if( !pFound )
         return STRING_LEN;
     return *pFound->GetStart();
@@ -277,8 +277,8 @@ void SwFlyCntPortion::Paint( const SwTxtPaintInfo &rInf ) const
             ((SwTxtPaintInfo&)rInf).SelectFont();
 
             // I want to know if this can really happen. So here comes a new
-            ASSERT( ! rInf.GetVsh() || rInf.GetVsh()->GetOut() == rInf.GetOut(),
-                    "SwFlyCntPortion::Paint: Outdev has changed" )
+            OSL_ENSURE( ! rInf.GetVsh() || rInf.GetVsh()->GetOut() == rInf.GetOut(),
+                    "SwFlyCntPortion::Paint: Outdev has changed" );
             if( rInf.GetVsh() )
                 ((SwTxtPaintInfo&)rInf).SetOut( rInf.GetVsh()->GetOut() );
         }
@@ -302,7 +302,7 @@ SwFlyCntPortion::SwFlyCntPortion( const SwTxtFrm& rFrm,
     bMax( sal_False ),
     nAlign( 0 )
 {
-    ASSERT( pFly, "SwFlyCntPortion::SwFlyCntPortion: no SwFlyInCntFrm!" );
+    OSL_ENSURE( pFly, "SwFlyCntPortion::SwFlyCntPortion: no SwFlyInCntFrm!" );
     nLineLength = 1;
     nFlags |= AS_CHAR_ULSPACE | AS_CHAR_INIT;
     SetBase( rFrm, rBase, nLnAscent, nLnDescent, nFlyAsc, nFlyDesc, nFlags );
@@ -320,7 +320,7 @@ SwFlyCntPortion::SwFlyCntPortion( const SwTxtFrm& rFrm,
     bMax( sal_False ),
     nAlign( 0 )
 {
-    ASSERT( pDrawContact, "SwFlyCntPortion::SwFlyCntPortion: no SwDrawContact!" );
+    OSL_ENSURE( pDrawContact, "SwFlyCntPortion::SwFlyCntPortion: no SwDrawContact!" );
     if( !pDrawContact->GetAnchorFrm() )
     {
         // OD 2004-04-01 #i26791# - no direct positioning needed any more
@@ -365,7 +365,7 @@ void SwFlyCntPortion::SetBase( const SwTxtFrm& rFrm, const Point &rBase,
         pSdrObj = GetDrawContact()->GetDrawObjectByAnchorFrm( rFrm );
         if ( !pSdrObj )
         {
-            ASSERT( false, "SwFlyCntPortion::SetBase(..) - No drawing object found by <GetDrawContact()->GetDrawObjectByAnchorFrm( rFrm )>" );
+            OSL_ENSURE( false, "SwFlyCntPortion::SetBase(..) - No drawing object found by <GetDrawContact()->GetDrawObjectByAnchorFrm( rFrm )>" );
             pSdrObj = GetDrawContact()->GetMaster();
         }
         // --> OD 2007-11-29 #i65798#
@@ -449,7 +449,7 @@ xub_StrLen SwFlyCntPortion::GetFlyCrsrOfst( const KSHORT nOfst,
 
 xub_StrLen SwFlyCntPortion::GetCrsrOfst( const KSHORT nOfst ) const
 {
-    // ASSERT( !this, "SwFlyCntPortion::GetCrsrOfst: use GetFlyCrsrOfst()" );
+    // OSL_ENSURE( !this, "SwFlyCntPortion::GetCrsrOfst: use GetFlyCrsrOfst()" );
     return SwLinePortion::GetCrsrOfst( nOfst );
 }
 
diff --git a/sw/source/core/text/porglue.cxx b/sw/source/core/text/porglue.cxx
index 7075aa591b2c..cf23eedec633 100644
--- a/sw/source/core/text/porglue.cxx
+++ b/sw/source/core/text/porglue.cxx
@@ -112,9 +112,9 @@ void SwGluePortion::Paint( const SwTxtPaintInfo &rInf ) const
 
     if( rInf.OnWin() && rInf.GetOpt().IsBlank() && rInf.IsNoSymbol() )
     {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         const xub_Unicode cChar = rInf.GetChar( rInf.GetIdx() );
-        ASSERT( CH_BLANK  == cChar || CH_BULLET == cChar,
+        OSL_ENSURE( CH_BLANK  == cChar || CH_BULLET == cChar,
                 "SwGluePortion::Paint: blank expected" );
 #endif
         if( 1 == GetLen() )
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 5f2805beac49..057d0a2a668d 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -453,7 +453,7 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
             while( pPos )
             {
                 DBG_LOOP;
-                ASSERT( POR_LIN != pPos->GetWhichPor(),
+                OSL_ENSURE( POR_LIN != pPos->GetWhichPor(),
                         "SwLineLayout::CalcLine: don't use SwLinePortions !" );
 
                 // Null-Portions werden eliminiert. Sie koennen entstehen,
@@ -501,7 +501,7 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
                 KSHORT nPosHeight = pPos->Height();
                 KSHORT nPosAscent = pPos->GetAscent();
 
-                ASSERT( nPosHeight >= nPosAscent,
+                OSL_ENSURE( nPosHeight >= nPosAscent,
                         "SwLineLayout::CalcLine: bad ascent or height" );
 
                 if( pPos->IsHangingPortion() )
@@ -655,7 +655,7 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf )
     // Robust:
     if( nLineWidth < Width() )
         Width( nLineWidth );
-    ASSERT( nLineWidth >= Width(), "SwLineLayout::CalcLine: line is bursting" );
+    OSL_ENSURE( nLineWidth >= Width(), "SwLineLayout::CalcLine: line is bursting" );
     SetDummy( bTmpDummy );
     SetRedline( rLine.GetRedln() &&
         rLine.GetRedln()->CheckLine( rLine.GetStart(), rLine.GetEnd() ) );
@@ -760,7 +760,7 @@ SwScriptInfo::~SwScriptInfo()
  *************************************************************************/
 BYTE SwScriptInfo::WhichFont( xub_StrLen nIdx, const String* pTxt, const SwScriptInfo* pSI )
 {
-    ASSERT( pTxt || pSI,"How should I determine the script type?" );
+    OSL_ENSURE( pTxt || pSI,"How should I determine the script type?" );
     USHORT nScript;
 
     // First we try to use our SwScriptInfo
@@ -776,7 +776,7 @@ BYTE SwScriptInfo::WhichFont( xub_StrLen nIdx, const String* pTxt, const SwScrip
         case i18n::ScriptType::COMPLEX : return SW_CTL;
     }
 
-    ASSERT( sal_False, "Somebody tells lies about the script type!" );
+    OSL_ENSURE( sal_False, "Somebody tells lies about the script type!" );
     return SW_LATIN;
 }
 
@@ -855,7 +855,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
         // if change position = 0 we do not use any data from the arrays
         // because by deleting all characters of the first group at the beginning
         // of a paragraph nScript is set to a wrong value
-        ASSERT( CountScriptChg(), "Where're my changes of script?" );
+        OSL_ENSURE( CountScriptChg(), "Where're my changes of script?" );
         while( nCnt < CountScriptChg() )
         {
             if ( nChg > GetScriptChg( nCnt ) )
@@ -968,7 +968,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
 
         nScript = (BYTE)GetI18NScriptTypeOfLanguage( (USHORT)GetAppLanguage() );
 
-        ASSERT( i18n::ScriptType::LATIN == nScript ||
+        OSL_ENSURE( i18n::ScriptType::LATIN == nScript ||
                 i18n::ScriptType::ASIAN == nScript ||
                 i18n::ScriptType::COMPLEX == nScript, "Wrong default language" );
 
@@ -993,9 +993,9 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
 
     while ( nChg < rTxt.Len() || ( !aScriptChg.Count() && !rTxt.Len() ) )
     {
-        ASSERT( i18n::ScriptType::WEAK != nScript,
+        OSL_ENSURE( i18n::ScriptType::WEAK != nScript,
                 "Inserting WEAK into SwScriptInfo structure" );
-        ASSERT( STRING_LEN != nChg, "65K? Strange length of script section" );
+        OSL_ENSURE( STRING_LEN != nChg, "65K? Strange length of script section" );
 
         xub_StrLen nSearchStt = nChg;
         nChg = (xub_StrLen)pBreakIt->GetBreakIter()->endOfScript( rTxt, nSearchStt, nScript );
@@ -1175,7 +1175,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
                              ( isHahChar ( cCh ) && nIdx == nWordLen - 1))  // Hah (dual joining) only at end of word
                         {
 
-                            ASSERT( 0 != cPrevCh, "No previous character" )
+                            OSL_ENSURE( 0 != cPrevCh, "No previous character" );
                             // check if character is connectable to previous character,
                             if ( lcl_ConnectToPrev( cCh, cPrevCh ) )
                             {
@@ -1195,7 +1195,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
                               isGafChar ( cCh ) )
                               && nIdx == nWordLen - 1))  // only at end of word
                         {
-                            ASSERT( 0 != cPrevCh, "No previous character" )
+                            OSL_ENSURE( 0 != cPrevCh, "No previous character" );
                             // check if character is connectable to previous character,
                             if ( lcl_ConnectToPrev( cCh, cPrevCh ) )
                             {
@@ -1215,7 +1215,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
                             xub_Unicode cNextCh = rWord.GetChar( nIdx + 1 );
                             if ( isRehChar ( cNextCh ) || isYehChar ( cNextCh ))
                            {
-                                ASSERT( 0 != cPrevCh, "No previous character" )
+                                OSL_ENSURE( 0 != cPrevCh, "No previous character" );
                                 // check if character is connectable to previous character,
                                 if ( lcl_ConnectToPrev( cCh, cPrevCh ) )
                                 {
@@ -1237,7 +1237,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
                                 isFeChar  ( cCh ) )   // Feh (dual joining)
                                 && nIdx == nWordLen - 1))  // only at end of word
                         {
-                            ASSERT( 0 != cPrevCh, "No previous character" )
+                            OSL_ENSURE( 0 != cPrevCh, "No previous character" );
                             // check if character is connectable to previous character,
                             if ( lcl_ConnectToPrev( cCh, cPrevCh ) )
                             {
@@ -1257,7 +1257,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
                              ( 0x60C <= cCh && 0x6FE >= cCh // all others
                               && nIdx == nWordLen - 1))   // only at end of word
                         {
-                            ASSERT( 0 != cPrevCh, "No previous character" )
+                            OSL_ENSURE( 0 != cPrevCh, "No previous character" );
                             // check if character is connectable to previous character,
                             if ( lcl_ConnectToPrev( cCh, cPrevCh ) )
                             {
@@ -1288,7 +1288,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
         nLastKashida = nChg;
     };
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     // check kashida data
     long nTmpKashidaPos = -1;
     sal_Bool bWrongKash = sal_False;
@@ -1302,7 +1302,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
         }
         nTmpKashidaPos = nCurrKashidaPos;
     }
-    ASSERT( ! bWrongKash, "Kashida array contains wrong data" )
+    OSL_ENSURE( ! bWrongKash, "Kashida array contains wrong data" );
 #endif
 
     // remove invalid entries from direction information arrays
@@ -1352,8 +1352,8 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
                 const xub_StrLen nStartPosOfGroup = nScriptIdx ? GetScriptChg( nScriptIdx - 1 ) : 0;
                 const BYTE nScriptTypeOfGroup = GetScriptType( nScriptIdx );
 
-                ASSERT( nStartPosOfGroup <= nStart && GetScriptChg( nScriptIdx ) > nStart,
-                        "Script override with CTL font trouble" )
+                OSL_ENSURE( nStartPosOfGroup <= nStart && GetScriptChg( nScriptIdx ) > nStart,
+                        "Script override with CTL font trouble" );
 
                 // Check if we have to insert a new script change at
                 // position nStart. If nStartPosOfGroup < nStart,
@@ -1388,9 +1388,9 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
                 {
                     nScriptChg = GetScriptChg( i2 );
                     nScriptType = GetScriptType( i2 );
-                    ASSERT( nLastScriptType != nScriptType &&
+                    OSL_ENSURE( nLastScriptType != nScriptType &&
                             nLastScriptChg < nScriptChg,
-                            "Heavy InitScriptType() confusion" )
+                            "Heavy InitScriptType() confusion" );
                 }
 #endif
             }
@@ -1511,7 +1511,7 @@ USHORT SwScriptInfo::MaskHiddenRanges( const SwTxtNode& rNode, XubString& rText,
                                        const xub_StrLen nStt, const xub_StrLen nEnd,
                                        const xub_Unicode cChar )
 {
-    ASSERT( rNode.GetTxt().Len() == rText.Len(), "MaskHiddenRanges, string len mismatch" )
+    OSL_ENSURE( rNode.GetTxt().Len() == rText.Len(), "MaskHiddenRanges, string len mismatch" );
 
     PositionList aList;
     xub_StrLen nHiddenStart;
@@ -1762,8 +1762,8 @@ long SwScriptInfo::Compress( sal_Int32* pKernArray, xub_StrLen nIdx, xub_StrLen
                              const USHORT nCompress, const USHORT nFontHeight,
                              Point* pPoint ) const
 {
-    ASSERT( nCompress, "Compression without compression?!" );
-    ASSERT( nLen, "Compression without text?!" );
+    OSL_ENSURE( nCompress, "Compression without compression?!" );
+    OSL_ENSURE( nLen, "Compression without text?!" );
     USHORT nCompCount = CountCompChg();
 
     // In asian typography, there are full width and half width characters.
@@ -1798,7 +1798,7 @@ long SwScriptInfo::Compress( sal_Int32* pKernArray, xub_StrLen nIdx, xub_StrLen
     {
         USHORT nType = GetCompType( nCompIdx );
 #if OSL_DEBUG_LEVEL > 1
-        ASSERT( nType == CompType( nIdx ), "Gimme the right type!" );
+        OSL_ENSURE( nType == CompType( nIdx ), "Gimme the right type!" );
 #endif
         nCompLen = nCompLen + nIdx;
         if( nCompLen > nLen )
@@ -1813,7 +1813,7 @@ long SwScriptInfo::Compress( sal_Int32* pKernArray, xub_StrLen nIdx, xub_StrLen
         {
             while( nIdx < nCompLen )
             {
-                ASSERT( SwScriptInfo::NONE != nType, "None compression?!" );
+                OSL_ENSURE( SwScriptInfo::NONE != nType, "None compression?!" );
 
                 // nLast is width of current character
                 nLast -= pKernArray[ nI ];
@@ -1885,7 +1885,7 @@ USHORT SwScriptInfo::KashidaJustify( sal_Int32* pKernArray,
                                     xub_StrLen nLen,
                                     long nSpaceAdd ) const
 {
-    ASSERT( nLen, "Kashida justification without text?!" )
+    OSL_ENSURE( nLen, "Kashida justification without text?!" );
 
     if( !IsKashidaLine(nStt))
         return STRING_LEN;
@@ -2165,7 +2165,7 @@ void SwScriptInfo::ClearNoKashidaLine ( xub_StrLen nStt, xub_StrLen nLen )
 // mark the given character indices as invalid kashida positions
 bool SwScriptInfo::MarkKashidasInvalid ( xub_StrLen nCnt, xub_StrLen* pKashidaPositions )
 {
-   ASSERT( pKashidaPositions && nCnt > 0, "Where are kashidas?" )
+   OSL_ENSURE( pKashidaPositions && nCnt > 0, "Where are kashidas?" );
 
    USHORT nCntKash = 0;
    xub_StrLen nKashidaPosIdx = 0;
@@ -2198,7 +2198,7 @@ USHORT SwScriptInfo::ThaiJustify( const XubString& rTxt, sal_Int32* pKernArray,
                                   xub_StrLen nLen, xub_StrLen nNumberOfBlanks,
                                   long nSpaceAdd )
 {
-    ASSERT( nStt + nLen <= rTxt.Len(), "String in ThaiJustify too small" )
+    OSL_ENSURE( nStt + nLen <= rTxt.Len(), "String in ThaiJustify too small" );
 
     SwTwips nNumOfTwipsToDistribute = nSpaceAdd * nNumberOfBlanks /
                                       SPACING_PRECISION_FACTOR;
@@ -2361,7 +2361,7 @@ SwTwips SwLineLayout::_GetHangingMargin() const
 
 SwTwips SwTxtFrm::HangingMargin() const
 {
-    ASSERT( HasPara(), "Don't call me without a paraportion" );
+    OSL_ENSURE( HasPara(), "Don't call me without a paraportion" );
     if( !GetPara()->IsMargin() )
         return 0;
     const SwLineLayout* pLine = GetPara();
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index 790d1b2e2f64..49fbc280796a 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -256,7 +256,7 @@ public:
                            const SwLinePortion* _pDontConsiderPortion = NULL,
                            const bool _bNoFlyCntPorAndLinePor = false ) const;
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     void DebugPortions( SvStream &rOs, const XubString &rTxt,
                         const xub_StrLen nStart ); //$ ostream
 #endif
diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx
index 3b06b4c21728..cf8b4e528c9b 100644
--- a/sw/source/core/text/porlin.cxx
+++ b/sw/source/core/text/porlin.cxx
@@ -43,7 +43,7 @@
 #include "porglue.hxx"
 #include "inftxt.hxx"
 #include "blink.hxx"
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
 sal_Bool ChkChain( SwLinePortion *pStart )
 {
@@ -52,7 +52,7 @@ sal_Bool ChkChain( SwLinePortion *pStart )
     while( pPor )
     {
         ++nCount;
-        ASSERT( nCount < 200 && pPor != pStart,
+        OSL_ENSURE( nCount < 200 && pPor != pStart,
                 "ChkChain(): lost in chains" );
         if( nCount >= 200 || pPor == pStart )
         {
@@ -107,8 +107,8 @@ SwLinePortion::SwLinePortion( ) :
 void SwLinePortion::PrePaint( const SwTxtPaintInfo& rInf,
                               const SwLinePortion* pLast ) const
 {
-    ASSERT( rInf.OnWin(), "SwLinePortion::PrePaint: don't prepaint on a printer");
-    ASSERT( !Width(), "SwLinePortion::PrePaint: For Width()==0 only!");
+    OSL_ENSURE( rInf.OnWin(), "SwLinePortion::PrePaint: don't prepaint on a printer");
+    OSL_ENSURE( !Width(), "SwLinePortion::PrePaint: For Width()==0 only!");
 
     const KSHORT nViewWidth = GetViewWidth( rInf );
 
@@ -191,7 +191,7 @@ void SwLinePortion::_Truncate()
 {
     SwLinePortion *pPos = pPortion;
     do
-    {   ASSERT( pPos != this, "SwLinePortion::Truncate: loop" );
+    { OSL_ENSURE( pPos != this, "SwLinePortion::Truncate: loop" );
         SwLinePortion *pLast = pPos;
         pPos = pPos->GetPortion();
         pLast->SetPortion( 0 );
@@ -212,7 +212,7 @@ SwLinePortion *SwLinePortion::Insert( SwLinePortion *pIns )
 {
     pIns->FindLastPortion()->SetPortion( pPortion );
     SetPortion( pIns );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     ChkChain( this );
 #endif
     return pIns;
@@ -243,7 +243,7 @@ SwLinePortion *SwLinePortion::Append( SwLinePortion *pIns )
     SwLinePortion *pPos = FindLastPortion();
     pPos->SetPortion( pIns );
     pIns->SetPortion( 0 );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     ChkChain( this );
 #endif
     return pIns;
@@ -256,7 +256,7 @@ SwLinePortion *SwLinePortion::Append( SwLinePortion *pIns )
 SwLinePortion *SwLinePortion::Cut( SwLinePortion *pVictim )
 {
     SwLinePortion *pPrev = pVictim->FindPrevPortion( this );
-    ASSERT( pPrev, "SwLinePortion::Cut(): can't cut" );
+    OSL_ENSURE( pPrev, "SwLinePortion::Cut(): can't cut" );
     pPrev->SetPortion( pVictim->GetPortion() );
     pVictim->SetPortion(0);
     return pVictim;
@@ -268,14 +268,14 @@ SwLinePortion *SwLinePortion::Cut( SwLinePortion *pVictim )
 
 SwLinePortion *SwLinePortion::FindPrevPortion( const SwLinePortion *pRoot )
 {
-    ASSERT( pRoot != this, "SwLinePortion::FindPrevPortion(): invalid root" );
+    OSL_ENSURE( pRoot != this, "SwLinePortion::FindPrevPortion(): invalid root" );
     SwLinePortion *pPos = (SwLinePortion*)pRoot;
     while( pPos->GetPortion() && pPos->GetPortion() != this )
     {
         DBG_LOOP;
         pPos = pPos->GetPortion();
     }
-    ASSERT( pPos->GetPortion(),
+    OSL_ENSURE( pPos->GetPortion(),
             "SwLinePortion::FindPrevPortion: blowing in the wind");
     return pPos;
 }
@@ -298,12 +298,12 @@ xub_StrLen SwLinePortion::GetCrsrOfst( const KSHORT nOfst ) const
 
 SwPosSize SwLinePortion::GetTxtSize( const SwTxtSizeInfo & ) const
 {
-    ASSERT( !this, "SwLinePortion::GetTxtSize: don't ask me about sizes, "
+    OSL_ENSURE( !this, "SwLinePortion::GetTxtSize: don't ask me about sizes, "
                    "I'm only a stupid SwLinePortion" );
     return SwPosSize();
 }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
 /*************************************************************************
  *                virtual SwLinePortion::Check()
diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index 9a381a705bf6..1d6fcbfa92bd 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -40,7 +40,7 @@ class SwPortionHandler;
 // Das CLASSIO-Makro implementiert die 'freischwebende' Funktion.
 // Auf diese Weise erhaelt man beide Vorteile: virtuelle Ausgabeoperatoren
 // und allgemeine Verwendbarkeit.
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 #define OUTPUT_OPERATOR  virtual SvStream &operator<<( SvStream & aOs ) const;
 #else
 #define OUTPUT_OPERATOR
@@ -175,7 +175,7 @@ public:
     virtual void Paint( const SwTxtPaintInfo &rInf ) const = 0;
     void PrePaint( const SwTxtPaintInfo &rInf, const SwLinePortion *pLast ) const;
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     virtual sal_Bool Check( SvStream &rOs, SwTxtSizeInfo &rInfo ); //$ ostream
 #endif
 
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index a8b2a7dbbf58..e965f78a3031 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -80,7 +80,7 @@ SwMultiPortion::~SwMultiPortion()
 
 void SwMultiPortion::Paint( const SwTxtPaintInfo & ) const
 {
-    ASSERT( FALSE,
+    OSL_ENSURE( FALSE,
     "Don't try SwMultiPortion::Paint, try SwTxtPainter::PaintMultiPortion" );
 }
 
@@ -624,8 +624,8 @@ SwRubyPortion::SwRubyPortion( const SwMultiCreator& rCreate, const SwFont& rFnt,
      : SwMultiPortion( nEnd )
 {
     SetRuby();
-    ASSERT( SW_MC_RUBY == rCreate.nId, "Ruby expected" );
-    ASSERT( RES_TXTATR_CJK_RUBY == rCreate.pAttr->Which(), "Wrong attribute" );
+    OSL_ENSURE( SW_MC_RUBY == rCreate.nId, "Ruby expected" );
+    OSL_ENSURE( RES_TXTATR_CJK_RUBY == rCreate.pAttr->Which(), "Wrong attribute" );
     const SwFmtRuby& rRuby = rCreate.pAttr->GetRuby();
     nAdjustment = rRuby.GetAdjustment();
     nRubyOffset = nOffs;
@@ -749,7 +749,7 @@ void SwRubyPortion::_Adjust( SwTxtFormatInfo &rInf )
             }
             break;
         }
-        default: ASSERT( sal_False, "New ruby adjustment" );
+        default: OSL_ENSURE( sal_False, "New ruby adjustment" );
     }
     if( nLeft || nRight )
     {
@@ -888,7 +888,7 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( xub_StrLen &rPos,
     BYTE nCurrLevel;
     if ( pMulti )
     {
-        ASSERT( pMulti->IsBidi(), "Nested MultiPortion is not BidiPortion" )
+        OSL_ENSURE( pMulti->IsBidi(), "Nested MultiPortion is not BidiPortion" );
         // level associated with bidi-portion;
         nCurrLevel = ((SwBidiPortion*)pMulti)->GetLevel();
     }
@@ -1398,8 +1398,8 @@ void SwTxtPainter::PaintMultiPortion( const SwRect &rPaint,
     {
         // these values are needed for the calculation of the x coordinate
         // and the layout mode
-        ASSERT( ! pEnvPor || pEnvPor->IsBidi(),
-                "Oh no, I expected a BidiPortion" )
+        OSL_ENSURE( ! pEnvPor || pEnvPor->IsBidi(),
+                "Oh no, I expected a BidiPortion" );
         nFrmDir = GetInfo().GetTxtFrm()->IsRightToLeft() ? 1 : 0;
         nEnvDir = pEnvPor ? ((SwBidiPortion*)pEnvPor)->GetLevel() % 2 : nFrmDir;
         nThisDir = ((SwBidiPortion&)rMulti).GetLevel() % 2;
@@ -1503,8 +1503,8 @@ void SwTxtPainter::PaintMultiPortion( const SwRect &rPaint,
     sal_Bool bRest = pLay->IsRest();
     sal_Bool bFirst = sal_True;
 
-    ASSERT( 0 == GetInfo().GetUnderFnt() || rMulti.IsBidi(),
-            " Only BiDi portions are allowed to use the common underlining font" )
+    OSL_ENSURE( 0 == GetInfo().GetUnderFnt() || rMulti.IsBidi(),
+            " Only BiDi portions are allowed to use the common underlining font" );
 
     do
     {
@@ -1596,7 +1596,7 @@ void SwTxtPainter::PaintMultiPortion( const SwRect &rPaint,
         if( pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->IsBidi() )
         {
             // but we do allow nested bidi portions
-            ASSERT( rMulti.IsBidi(), "Only nesting of bidi portions is allowed" )
+            OSL_ENSURE( rMulti.IsBidi(), "Only nesting of bidi portions is allowed" );
             PaintMultiPortion( rPaint, (SwMultiPortion&)*pPor, &rMulti );
         }
         else
@@ -1795,7 +1795,7 @@ BOOL SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf,
         // We set nTmpX (which is used for portion calculating) to the
         // current Y value
         const SwPageFrm* pPage = pFrm->FindPageFrm();
-        ASSERT( pPage, "No page in frame!");
+        OSL_ENSURE( pPage, "No page in frame!");
         const SwLayoutFrm* pUpperFrm = pPage;
 
         if ( pFrm->IsInTab() )
@@ -1803,7 +1803,7 @@ BOOL SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf,
             pUpperFrm = pFrm->GetUpper();
             while ( pUpperFrm && !pUpperFrm->IsCellFrm() )
                 pUpperFrm = pUpperFrm->GetUpper();
-            ASSERT( pUpperFrm, "pFrm is in table but does not have an upper cell frame" )
+            OSL_ENSURE( pUpperFrm, "pFrm is in table but does not have an upper cell frame" );
             const SwTableLine* pLine = ((SwRowFrm*)pUpperFrm->GetUpper())->GetTabLine();
             const SwFmtFrmSize& rFrmFmtSize = pLine->GetFrmFmt()->GetFrmSize();
             if ( ATT_VAR_SIZE == rFrmFmtSize.GetHeightSizeType() )
@@ -1900,7 +1900,7 @@ BOOL SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf,
 
         if( pFirstRest )
         {
-            ASSERT( pFirstRest->InFldGrp(), "BuildMulti: Fieldrest expected");
+            OSL_ENSURE( pFirstRest->InFldGrp(), "BuildMulti: Fieldrest expected");
             SwFldPortion *pFld =
                 ((SwFldPortion*)pFirstRest)->Clone(
                     ((SwFldPortion*)pFirstRest)->GetExp() );
@@ -1947,7 +1947,7 @@ BOOL SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf,
                 pNextFirst = aInf.GetRest();
                 if( pSecondRest )
                 {
-                    ASSERT( pSecondRest->InFldGrp(), "Fieldrest expected");
+                    OSL_ENSURE( pSecondRest->InFldGrp(), "Fieldrest expected");
                     SwFldPortion *pFld = ((SwFldPortion*)pSecondRest)->Clone(
                                     ((SwFldPortion*)pSecondRest)->GetExp() );
                     pFld->SetFollow( sal_True );
@@ -2085,7 +2085,7 @@ BOOL SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf,
     // line break has to be performed!
     if( bRet )
     {
-        ASSERT( !pNextFirst || pNextFirst->InFldGrp(),
+        OSL_ENSURE( !pNextFirst || pNextFirst->InFldGrp(),
             "BuildMultiPortion: Surprising restportion, field expected" );
         SwMultiPortion *pTmp;
         if( rMulti.IsDouble() )
@@ -2093,7 +2093,7 @@ BOOL SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf,
                                             nMultiLen + rInf.GetIdx() );
         else if( rMulti.IsRuby() )
         {
-            ASSERT( !pNextSecond || pNextSecond->InFldGrp(),
+            OSL_ENSURE( !pNextSecond || pNextSecond->InFldGrp(),
                 "BuildMultiPortion: Surprising restportion, field expected" );
 
             if ( rInf.GetIdx() == rInf.GetLineStart() )
@@ -2230,7 +2230,7 @@ SwLinePortion* SwTxtFormatter::MakeRestPortion( const SwLineLayout* pLine,
         }
         else if( pPor->IsMultiPortion() )
         {
-            ASSERT( !pHelpMulti || pHelpMulti->IsBidi(),
+            OSL_ENSURE( !pHelpMulti || pHelpMulti->IsBidi(),
                     "Nested multiportions are forbidden." );
 
             pFld = NULL;
@@ -2290,7 +2290,7 @@ SwLinePortion* SwTxtFormatter::MakeRestPortion( const SwLineLayout* pLine,
 
     if ( !pCreate )
     {
-        ASSERT( !pHelpMulti->GetLen(), "Multiportion without attribut?" );
+        OSL_ENSURE( !pHelpMulti->GetLen(), "Multiportion without attribut?" );
         if ( nMultiPos )
             --nMultiPos;
         pCreate = GetInfo().GetMultiCreator( --nMultiPos, 0 );
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 52fd25767f25..e8ac921d3e29 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -245,7 +245,7 @@ SwTwips SwTxtFrm::EmptyHeight() const
             return 1;
         }
     }
-    ASSERT( ! IsVertical() || ! IsSwapped(),"SwTxtFrm::EmptyHeight with swapped frame" );
+    OSL_ENSURE( ! IsVertical() || ! IsSwapped(),"SwTxtFrm::EmptyHeight with swapped frame" );
 
     SwFont *pFnt;
     const SwTxtNode& rTxtNode = *GetTxtNode();
@@ -308,7 +308,7 @@ SwTwips SwTxtFrm::EmptyHeight() const
 
 sal_Bool SwTxtFrm::FormatEmpty()
 {
-    ASSERT( ! IsVertical() || ! IsSwapped(),"SwTxtFrm::FormatEmpty with swapped frame" );
+    OSL_ENSURE( ! IsVertical() || ! IsSwapped(),"SwTxtFrm::FormatEmpty with swapped frame" );
 
     if ( HasFollow() || GetTxtNode()->GetpSwpHints() ||
         0 != GetTxtNode()->GetNumRule() ||
@@ -442,8 +442,8 @@ sal_Bool SwTxtFrm::FillRegister( SwTwips& rRegStart, KSHORT& rRegDiff )
                                         rRegDiff = rSpace.GetLineHeight();
                                     break;
                                 }
-                                default: ASSERT(
-                                sal_False, ": unknown LineSpaceRule" );
+                                default:
+                                    OSL_ENSURE( sal_False, ": unknown LineSpaceRule" );
                             }
                             switch( rSpace.GetInterLineSpaceRule() )
                             {
@@ -468,7 +468,7 @@ sal_Bool SwTxtFrm::FillRegister( SwTwips& rRegStart, KSHORT& rRegDiff )
                                     nNettoHeight = rRegDiff;
                                     break;
                                 }
-                                default: ASSERT( sal_False, ": unknown InterLineSpaceRule" );
+                                default: OSL_ENSURE( sal_False, ": unknown InterLineSpaceRule" );
                             }
                             pDesc->SetRegHeight( rRegDiff );
                             pDesc->SetRegAscent( rRegDiff - nNettoHeight +
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index f3e26614b1e1..735288d73a80 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -327,7 +327,7 @@ sal_Bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf )
             // this should usually be true but
             aGuess.AlternativeSpelling( rInf, rInf.GetSoftHyphPos() - 1 );
             bFull = CreateHyphen( rInf, aGuess );
-            ASSERT( bFull, "Problem with hyphenation!!!" );
+            OSL_ENSURE( bFull, "Problem with hyphenation!!!" );
         }
         rInf.ChgHyph( bHyph );
         rInf.SetSoftHyphPos( 0 );
@@ -435,7 +435,7 @@ sal_Bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf )
 
             SetLen( aGuess.BreakPos() - rInf.GetIdx() );
 
-            ASSERT( aGuess.BreakStart() >= aGuess.FieldDiff(),
+            OSL_ENSURE( aGuess.BreakStart() >= aGuess.FieldDiff(),
                     "Trouble with expanded field portions during line break" );
             const xub_StrLen nRealStart = aGuess.BreakStart() - aGuess.FieldDiff();
             if( aGuess.BreakPos() < nRealStart && !InExpGrp() )
@@ -491,9 +491,9 @@ sal_Bool SwTxtPortion::Format( SwTxtFormatInfo &rInf )
         return sal_True;
     }
 
-    ASSERT( rInf.RealWidth() || (rInf.X() == rInf.Width()),
+    OSL_ENSURE( rInf.RealWidth() || (rInf.X() == rInf.Width()),
         "SwTxtPortion::Format: missing real width" );
-    ASSERT( Height(), "SwTxtPortion::Format: missing height" );
+    OSL_ENSURE( Height(), "SwTxtPortion::Format: missing height" );
 
     return _Format( rInf );
 }
@@ -551,7 +551,7 @@ void SwTxtPortion::FormatEOL( SwTxtFormatInfo &rInf )
 
 xub_StrLen SwTxtPortion::GetCrsrOfst( const KSHORT nOfst ) const
 {
-    ASSERT( !this, "SwTxtPortion::GetCrsrOfst: don't use this method!" );
+    OSL_ENSURE( !this, "SwTxtPortion::GetCrsrOfst: don't use this method!" );
     return SwLinePortion::GetCrsrOfst( nOfst );
 }
 
@@ -790,12 +790,12 @@ namespace {
     {
         const IFieldmark::parameter_map_t* const pParameters = pBM->GetParameters();
         sal_Int32 nCurrentIdx = 0;
-        const IFieldmark::parameter_map_t::const_iterator pResult = pParameters->find(::rtl::OUString::createFromAscii(ODF_FORMDROPDOWN_RESULT));
+        const IFieldmark::parameter_map_t::const_iterator pResult = pParameters->find(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMDROPDOWN_RESULT)));
         if(pResult != pParameters->end())
             pResult->second >>= nCurrentIdx;
         if(io_pCurrentText)
         {
-            const IFieldmark::parameter_map_t::const_iterator pListEntries = pParameters->find(::rtl::OUString::createFromAscii(ODF_FORMDROPDOWN_LISTENTRY));
+            const IFieldmark::parameter_map_t::const_iterator pListEntries = pParameters->find(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMDROPDOWN_LISTENTRY)));
             if(pListEntries != pParameters->end())
             {
                 uno::Sequence< ::rtl::OUString > vListEntries;
@@ -851,7 +851,7 @@ sal_Bool SwFieldFormPortion::Format( SwTxtFormatInfo & rInf )
     SwIndex aIndex( pNd, rInf.GetIdx(  ) );
     SwPosition aPosition( *pNd, aIndex );
     IFieldmark *pBM = doc->getIDocumentMarkAccess( )->getFieldmarkFor( aPosition );
-    ASSERT( pBM != NULL, "Where is my form field bookmark???" );
+    OSL_ENSURE( pBM != NULL, "Where is my form field bookmark???" );
     if ( pBM != NULL )
     {
         if ( pBM->GetFieldname( ).equalsAscii( ODF_FORMCHECKBOX ) )
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index f66d8dc176a1..e94bdc873d5a 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -100,7 +100,7 @@ void SwAttrIter::CtorInitAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, S
     aMagicNo[SW_LATIN] = aMagicNo[SW_CJK] = aMagicNo[SW_CTL] = NULL;
 
     // determine script changes if not already done for current paragraph
-    ASSERT( pScriptInfo, "No script info available");
+    OSL_ENSURE( pScriptInfo, "No script info available");
     if ( pScriptInfo->GetInvalidity() != STRING_LEN )
          pScriptInfo->InitScriptInfo( rTxtNode, bRTL );
 
@@ -318,7 +318,7 @@ void SwRedlineItr::FillHints( MSHORT nAuthor, RedlineType_t eType )
 
 void SwRedlineItr::ChangeTxtAttr( SwFont* pFnt, SwTxtAttr &rHt, sal_Bool bChg )
 {
-    ASSERT( IsOn(), "SwRedlineItr::ChangeTxtAttr: Off?" );
+    OSL_ENSURE( IsOn(), "SwRedlineItr::ChangeTxtAttr: Off?" );
 
     if( !bShow && !pExt )
         return;
@@ -332,14 +332,14 @@ void SwRedlineItr::ChangeTxtAttr( SwFont* pFnt, SwTxtAttr &rHt, sal_Bool bChg )
     }
     else
     {
-        ASSERT( ! pExt || ! pExt->IsOn(), "Pop of attribute during opened extension" )
+        OSL_ENSURE( ! pExt || ! pExt->IsOn(), "Pop of attribute during opened extension" );
         rAttrHandler.PopAndChg( rHt, *pFnt );
     }
 }
 
 void SwRedlineItr::_Clear( SwFont* pFnt )
 {
-    ASSERT( bOn, "SwRedlineItr::Clear: Off?" );
+    OSL_ENSURE( bOn, "SwRedlineItr::Clear: Off?" );
     bOn = sal_False;
     while( aHints.Count() )
     {
@@ -445,8 +445,8 @@ void SwExtend::ActualizeFont( SwFont &rFnt, MSHORT nAttr )
 
 short SwExtend::Enter( SwFont& rFnt, xub_StrLen nNew )
 {
-    ASSERT( !Inside(), "SwExtend: Enter without Leave" );
-    ASSERT( !pFnt, "SwExtend: Enter with Font" );
+    OSL_ENSURE( !Inside(), "SwExtend: Enter without Leave" );
+    OSL_ENSURE( !pFnt, "SwExtend: Enter with Font" );
     nPos = nNew;
     if( Inside() )
     {
@@ -459,7 +459,7 @@ short SwExtend::Enter( SwFont& rFnt, xub_StrLen nNew )
 
 sal_Bool SwExtend::_Leave( SwFont& rFnt, xub_StrLen nNew )
 {
-    ASSERT( Inside(), "SwExtend: Leave without Enter" );
+    OSL_ENSURE( Inside(), "SwExtend: Leave without Enter" );
     MSHORT nOldAttr = rArr[ nPos - nStart ];
     nPos = nNew;
     if( Inside() )
diff --git a/sw/source/core/text/redlnitr.hxx b/sw/source/core/text/redlnitr.hxx
index 0a465ab6b9c7..13c701ca8d3d 100644
--- a/sw/source/core/text/redlnitr.hxx
+++ b/sw/source/core/text/redlnitr.hxx
@@ -113,7 +113,7 @@ public:
         { return pExt->Leave(rFnt, nNew ); }
     inline sal_Bool ExtOn() { if( pExt ) return pExt->IsOn(); return sal_False; }
     inline void UpdateExtFont( SwFont &rFnt ) {
-        ASSERT( ExtOn(), "UpdateExtFont without ExtOn" )
+        OSL_ENSURE( ExtOn(), "UpdateExtFont without ExtOn" );
         pExt->UpdateFont( rFnt ); }
 };
 
diff --git a/sw/source/core/text/txtcache.cxx b/sw/source/core/text/txtcache.cxx
index 490783632b85..defef8067aaa 100644
--- a/sw/source/core/text/txtcache.cxx
+++ b/sw/source/core/text/txtcache.cxx
@@ -184,7 +184,7 @@ SwParaPortion *SwTxtFrm::GetPara()
 
 void SwTxtFrm::ClearPara()
 {
-    ASSERT( !IsLocked(), "+SwTxtFrm::ClearPara: this is locked." );
+    OSL_ENSURE( !IsLocked(), "+SwTxtFrm::ClearPara: this is locked." );
     if ( !IsLocked() && GetCacheIdx() != MSHRT_MAX )
     {
         SwTxtLine *pTxtLine = (SwTxtLine*)SwTxtFrm::GetTxtCache()->
@@ -223,7 +223,7 @@ void SwTxtFrm::SetPara( SwParaPortion *pNew, sal_Bool bDelete )
         }
         else
         {
-            ASSERT( !pNew, "+SetPara: Losing SwParaPortion" );
+            OSL_ENSURE( !pNew, "+SetPara: Losing SwParaPortion" );
             nCacheIdx = MSHRT_MAX;
         }
     }
@@ -234,7 +234,7 @@ void SwTxtFrm::SetPara( SwParaPortion *pNew, sal_Bool bDelete )
             nCacheIdx = pTxtLine->GetCachePos();
         else
         {
-            ASSERT( sal_False, "+SetPara: InsertCache failed." );
+            OSL_ENSURE( sal_False, "+SetPara: InsertCache failed." );
         }
     }
 }
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index b46f198704b6..826ad3848f19 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -242,7 +242,7 @@ bool SwTxtNode::GetDropSize(int& rFontHeight, int& rDropHeight, int& rDropDescen
             if ( !((SwTxtFrm*)pLastFrm)->IsEmpty() )
             {
                 const SwParaPortion* pPara = ((SwTxtFrm*)pLastFrm)->GetPara();
-                ASSERT( pPara, "GetDropSize could not find the ParaPortion, I'll guess the drop cap size" )
+                OSL_ENSURE( pPara, "GetDropSize could not find the ParaPortion, I'll guess the drop cap size" );
 
                 if ( pPara )
                 {
@@ -293,7 +293,7 @@ void SwDropPortion::PaintTxt( const SwTxtPaintInfo &rInf ) const
         !rInf.GetOpt().IsPagePreview() && !rInf.GetOpt().IsReadonly() && SwViewOption::IsFieldShadings()    )
         rInf.DrawBackground( *this );
 
-    ASSERT( nDropHeight && pPart && nLines != 1, "Drop Portion painted twice" );
+    OSL_ENSURE( nDropHeight && pPart && nLines != 1, "Drop Portion painted twice" );
 
     const SwDropPortionPart* pCurrPart = GetPart();
     const xub_StrLen nOldLen = GetLen();
@@ -527,7 +527,7 @@ void SwTxtFormatter::CalcDropHeight( const MSHORT nLines )
     {
         if( !Next() )
         {
-            ASSERT( !this, "SwTxtFormatter::_CalcDropHeight: left Toulouse" );
+            OSL_ENSURE( !this, "SwTxtFormatter::_CalcDropHeight: left Toulouse" );
             break;
         }
     }
@@ -545,7 +545,7 @@ void SwTxtFormatter::CalcDropHeight( const MSHORT nLines )
 
 void SwTxtFormatter::GuessDropHeight( const MSHORT nLines )
 {
-    ASSERT( nLines, "GuessDropHeight: Give me more Lines!" );
+    OSL_ENSURE( nLines, "GuessDropHeight: Give me more Lines!" );
     KSHORT nAscent = 0;
     KSHORT nHeight = 0;
     SetDropLines( nLines );
@@ -606,7 +606,7 @@ SwDropPortion *SwTxtFormatter::NewDropPortion( SwTxtFormatInfo &rInf )
     }
 
     // build DropPortionParts:
-    ASSERT( ! rInf.GetIdx(), "Drop Portion not at 0 position!" );
+    OSL_ENSURE( ! rInf.GetIdx(), "Drop Portion not at 0 position!" );
     xub_StrLen nNextChg = 0;
     const SwCharFmt* pFmt = pDropFmt->GetCharFmt();
     SwDropPortionPart* pCurrPart = 0;
@@ -660,7 +660,7 @@ SwDropPortion *SwTxtFormatter::NewDropPortion( SwTxtFormatInfo &rInf )
 void SwTxtPainter::PaintDropPortion()
 {
     const SwDropPortion *pDrop = GetInfo().GetParaPortion()->FindDropPortion();
-    ASSERT( pDrop, "DrapCop-Portion not available." );
+    OSL_ENSURE( pDrop, "DrapCop-Portion not available." );
     if( !pDrop )
         return;
 
@@ -758,7 +758,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTxtFormatInfo &rInf )
     const void* pFntNo = 0;
     MSHORT nTmpIdx = 0;
 
-    ASSERT( pDrop->GetPart(),"DropPortion without part during font calculation");
+    OSL_ENSURE( pDrop->GetPart(),"DropPortion without part during font calculation");
 
     SwDropPortionPart* pCurrPart = pDrop->GetPart();
     const sal_Bool bUseCache = ! pCurrPart->GetFollow();
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index e06a942551e9..3ee641cb39e9 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -82,7 +82,7 @@
 #include <svx/svdoedge.hxx>
 #include "doc.hxx"
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 #include "viewopt.hxx"  // SwViewOptions, nur zum Testen (Test2)
 #endif
 
@@ -129,8 +129,8 @@ using namespace ::com::sun::star;
 
 void SwTxtFormatter::CalcUnclipped( SwTwips& rTop, SwTwips& rBottom )
 {
-    ASSERT( ! pFrm->IsVertical() || pFrm->IsSwapped(),
-            "SwTxtFormatter::CalcUnclipped with unswapped frame" )
+    OSL_ENSURE( ! pFrm->IsVertical() || pFrm->IsSwapped(),
+            "SwTxtFormatter::CalcUnclipped with unswapped frame" );
 
     long nFlyAsc, nFlyDesc;
     // OD 08.01.2004 #i11859# - use new method <SwLineLayout::MaxAscentDescent(..)>
@@ -150,8 +150,8 @@ void SwTxtFormatter::CalcUnclipped( SwTwips& rTop, SwTwips& rBottom )
 void SwTxtFormatter::UpdatePos( SwLineLayout *pCurrent, Point aStart,
     xub_StrLen nStartIdx, sal_Bool bAllWays ) const
 {
-    ASSERT( ! pFrm->IsVertical() || pFrm->IsSwapped(),
-            "SwTxtFormatter::UpdatePos with unswapped frame" )
+    OSL_ENSURE( ! pFrm->IsVertical() || pFrm->IsSwapped(),
+            "SwTxtFormatter::UpdatePos with unswapped frame" );
 
     if( GetInfo().IsTest() )
         return;
@@ -237,14 +237,14 @@ void SwTxtFormatter::UpdatePos( SwLineLayout *pCurrent, Point aStart,
         }
         if( pPos->IsMultiPortion() && ((SwMultiPortion*)pPos)->HasFlyInCntnt() )
         {
-            ASSERT( !GetMulti(), "Too much multi" );
+            OSL_ENSURE( !GetMulti(), "Too much multi" );
             ((SwTxtFormatter*)this)->pMulti = (SwMultiPortion*)pPos;
             SwLineLayout *pLay = &GetMulti()->GetRoot();
             Point aSt( aTmpInf.X(), aStart.Y() );
 
             if ( GetMulti()->HasBrackets() )
             {
-                ASSERT( GetMulti()->IsDouble(), "Brackets only for doubles");
+                OSL_ENSURE( GetMulti()->IsDouble(), "Brackets only for doubles");
                 aSt.X() += ((SwDoubleLinePortion*)GetMulti())->PreWidth();
             }
             else if( GetMulti()->HasRotation() )
@@ -281,8 +281,8 @@ void SwTxtFormatter::UpdatePos( SwLineLayout *pCurrent, Point aStart,
 
 void SwTxtFormatter::AlignFlyInCntBase( long nBaseLine ) const
 {
-    ASSERT( ! pFrm->IsVertical() || pFrm->IsSwapped(),
-            "SwTxtFormatter::AlignFlyInCntBase with unswapped frame" )
+    OSL_ENSURE( ! pFrm->IsVertical() || pFrm->IsSwapped(),
+            "SwTxtFormatter::AlignFlyInCntBase with unswapped frame" );
 
     if( GetInfo().IsTest() )
         return;
@@ -340,7 +340,7 @@ void SwTxtFormatter::AlignFlyInCntBase( long nBaseLine ) const
 
 sal_Bool SwTxtFormatter::ChkFlyUnderflow( SwTxtFormatInfo &rInf ) const
 {
-    ASSERT( rInf.GetTxtFly()->IsOn(), "SwTxtFormatter::ChkFlyUnderflow: why?" );
+    OSL_ENSURE( rInf.GetTxtFly()->IsOn(), "SwTxtFormatter::ChkFlyUnderflow: why?" );
     if( GetCurr() )
     {
         // Erst pruefen wir, ob ueberhaupt ein Fly mit der Zeile ueberlappt.
@@ -848,7 +848,7 @@ sal_Bool SwTxtFly::IsAnyFrm() const
 {
     SWAP_IF_SWAPPED( pCurrFrm )
 
-    ASSERT( bOn, "IsAnyFrm: Why?" );
+    OSL_ENSURE( bOn, "IsAnyFrm: Why?" );
     SwRect aRect( pCurrFrm->Frm().Pos() + pCurrFrm->Prt().Pos(),
         pCurrFrm->Prt().SSize() );
 
@@ -869,7 +869,7 @@ sal_Bool SwTxtFly::IsAnyFrm() const
 
 sal_Bool SwTxtFly::IsAnyObj( const SwRect &rRect ) const
 {
-    ASSERT ( bOn, "SwTxtFly::IsAnyObj: Who's knocking?" );
+   OSL_ENSURE( bOn, "SwTxtFly::IsAnyObj: Who's knocking?" );
 
     SwRect aRect( rRect );
     if ( aRect.IsEmpty() )
@@ -956,7 +956,7 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo &rInf )
                             ? mpCurrAnchoredObj->GetDrawObj()->GetOrdNum()
                             : SAL_MAX_UINT32;
     // <--
-    ASSERT( !bTopRule, "DrawTextOpaque: Wrong TopRule" );
+    OSL_ENSURE( !bTopRule, "DrawTextOpaque: Wrong TopRule" );
 
     // --> OD 2006-08-15 #i68520#
     SwAnchoredObjList::size_type nCount( bOn ? GetAnchoredObjList()->size() : 0 );
@@ -1062,7 +1062,7 @@ void SwTxtFly::DrawFlyRect( OutputDevice* pOut, const SwRect &rRect,
         const SwTxtPaintInfo &rInf, sal_Bool bNoGraphic )
 {
     SwRegionRects aRegion( rRect );
-    ASSERT( !bTopRule, "DrawFlyRect: Wrong TopRule" );
+    OSL_ENSURE( !bTopRule, "DrawFlyRect: Wrong TopRule" );
     // --> OD 2006-08-15 #i68520#
     SwAnchoredObjList::size_type nCount( bOn ? GetAnchoredObjList()->size() : 0 );
     if ( bOn && nCount > 0 )
@@ -1121,7 +1121,7 @@ void SwTxtFly::DrawFlyRect( OutputDevice* pOut, const SwRect &rRect,
             pOut->DrawRect( aRegion[i].SVRect() );
         else
         {
-            ASSERT( ((SvxBrushItem*)-1) != rInf.GetBrushItem(),
+            OSL_ENSURE( ((SvxBrushItem*)-1) != rInf.GetBrushItem(),
                     "DrawRect: Uninitialized BrushItem!" );
             ::DrawGraphic( rInf.GetBrushItem(), pOut, rInf.GetBrushRect(),
                        aRegion[i] );
@@ -1271,7 +1271,7 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj,
             // --> OD 2004-10-06 #i26945#
             const SwFmtAnchor& rNewA = _pAnchoredObj->GetFrmFmt().GetAnchor();
             // <--
-            ASSERT( FLY_AS_CHAR != rNewA.GetAnchorId(),
+            OSL_ENSURE( FLY_AS_CHAR != rNewA.GetAnchorId(),
                     "Don't call GetTop with a FlyInCntFrm" );
             if (FLY_AT_PAGE == rNewA.GetAnchorId())
                 return sal_True;  // Seitengebundenen wird immer ausgewichen.
@@ -1413,9 +1413,9 @@ struct AnchoredObjOrder
 // --> OD 2006-08-15 #i68520#
 SwAnchoredObjList* SwTxtFly::InitAnchoredObjList()
 {
-    ASSERT( pCurrFrm, "InitFlyList: No Frame, no FlyList" );
+    OSL_ENSURE( pCurrFrm, "InitFlyList: No Frame, no FlyList" );
     // --> OD 2006-08-15 #i68520#
-    ASSERT( !mpAnchoredObjList, "InitFlyList: FlyList already initialized" );
+    OSL_ENSURE( !mpAnchoredObjList, "InitFlyList: FlyList already initialized" );
     // <--
 
     SWAP_IF_SWAPPED( pCurrFrm )
@@ -1674,7 +1674,7 @@ SwContourCache::~SwContourCache()
 
 void SwContourCache::ClrObject( MSHORT nPos )
 {
-    ASSERT( pTextRanger[ nPos ], "ClrObject: Allready cleared. Good Bye!" );
+    OSL_ENSURE( pTextRanger[ nPos ], "ClrObject: Allready cleared. Good Bye!" );
     nPntCnt -= pTextRanger[ nPos ]->GetPointCount();
     delete pTextRanger[ nPos ];
     --nObjCnt;
@@ -1877,7 +1877,7 @@ const SwRect SwContourCache::ContourRect( const SwFmt* pFmt,
  *                      SwContourCache::ShowContour()
  * zeichnet die PolyPolygone des Caches zu Debugzwecken.
  *************************************************************************/
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
 void SwContourCache::ShowContour( OutputDevice* pOut, const SdrObject* pObj,
     const Color& rClosedColor, const Color& rOpenColor )
@@ -1928,7 +1928,7 @@ void SwContourCache::ShowContour( OutputDevice* pOut, const SdrObject* pObj,
  *                      SwTxtFly::ShowContour()
  * zeichnet die PolyPolygone des Caches zu Debugzwecken.
  *************************************************************************/
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
 void SwTxtFly::ShowContour( OutputDevice* pOut )
 {
@@ -2084,8 +2084,8 @@ void SwTxtFly::CalcRightMargin( SwRect &rFly,
                                 const SwRect &rLine ) const
 {
     // Normalerweise ist der rechte Rand der rechte Rand der Printarea.
-    ASSERT( ! pCurrFrm->IsVertical() || ! pCurrFrm->IsSwapped(),
-            "SwTxtFly::CalcRightMargin with swapped frame" )
+    OSL_ENSURE( ! pCurrFrm->IsVertical() || ! pCurrFrm->IsSwapped(),
+            "SwTxtFly::CalcRightMargin with swapped frame" );
     SWRECTFN( pCurrFrm )
     // --> OD 2004-12-14 #118796# - correct determination of right of printing area
     SwTwips nRight = (pCurrFrm->*fnRect->fnGetPrtRight)();
@@ -2188,8 +2188,8 @@ void SwTxtFly::CalcLeftMargin( SwRect &rFly,
                                SwAnchoredObjList::size_type nFlyPos,
                                const SwRect &rLine ) const
 {
-    ASSERT( ! pCurrFrm->IsVertical() || ! pCurrFrm->IsSwapped(),
-            "SwTxtFly::CalcLeftMargin with swapped frame" )
+    OSL_ENSURE( ! pCurrFrm->IsVertical() || ! pCurrFrm->IsSwapped(),
+            "SwTxtFly::CalcLeftMargin with swapped frame" );
     SWRECTFN( pCurrFrm )
     // --> OD 2004-12-14 #118796# - correct determination of left of printing area
     SwTwips nLeft = (pCurrFrm->*fnRect->fnGetPrtLeft)();
@@ -2423,7 +2423,7 @@ sal_Bool SwTxtFly::IsAnyFrm( const SwRect &rLine ) const
 
     SWAP_IF_SWAPPED( pCurrFrm )
 
-    ASSERT( bOn, "IsAnyFrm: Why?" );
+    OSL_ENSURE( bOn, "IsAnyFrm: Why?" );
 
     const sal_Bool bRet = ForEach( rLine, NULL, sal_False );
     UNDO_SWAP( pCurrFrm )
diff --git a/sw/source/core/text/txtfly.hxx b/sw/source/core/text/txtfly.hxx
index d2be8f7aa26b..c3708badee1a 100644
--- a/sw/source/core/text/txtfly.hxx
+++ b/sw/source/core/text/txtfly.hxx
@@ -100,7 +100,7 @@ public:
                                        const long nXPos,
                                        const sal_Bool bRight );
     // <--
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     void ShowContour( OutputDevice* pOut, const SdrObject* pObj,
                       const Color& rClosedColor, const Color& rOpenColor );
 #endif
@@ -233,7 +233,7 @@ public:
     }
     // <--
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     void ShowContour( OutputDevice* pOut );
 #endif
 };
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 2e7a30b9082c..2e563c681243 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -312,7 +312,7 @@ SwDigitModeModifier::~SwDigitModeModifier()
 
 void SwTxtFrm::Init()
 {
-    ASSERT( !IsLocked(), "+SwTxtFrm::Init: this ist locked." );
+    OSL_ENSURE( !IsLocked(), "+SwTxtFrm::Init: this ist locked." );
     if( !IsLocked() )
     {
         ClearPara();
@@ -394,7 +394,7 @@ sal_Bool SwTxtFrm::IsHiddenNow() const
     if( !Frm().Width() && IsValid() && GetUpper()->IsValid() )
                                        //bei Stackueberlauf (StackHack) invalid!
     {
-//        ASSERT( false, "SwTxtFrm::IsHiddenNow: thin frame" );
+//        OSL_ENSURE( false, "SwTxtFrm::IsHiddenNow: thin frame" );
         return sal_True;
     }
 
@@ -426,7 +426,7 @@ sal_Bool SwTxtFrm::IsHiddenNow() const
 
 void SwTxtFrm::HideHidden()
 {
-    ASSERT( !GetFollow() && IsHiddenNow(),
+    OSL_ENSURE( !GetFollow() && IsHiddenNow(),
             "HideHidden on visible frame of hidden frame has follow" );
 
     const xub_StrLen nEnd = STRING_LEN;
@@ -606,7 +606,7 @@ void SwTxtFrm::HideAndShowObjects()
                 }
                 else
                 {
-                    ASSERT( false,
+                    OSL_ENSURE( false,
                             "<SwTxtFrm::HideAndShowObjects()> - object not anchored at/inside paragraph!?" );
                 }
             }
@@ -739,8 +739,8 @@ void SwTxtFrm::_InvalidateRange( const SwCharRange &aRange, const long nD)
 
 void SwTxtFrm::CalcLineSpace()
 {
-    ASSERT( ! IsVertical() || ! IsSwapped(),
-            "SwTxtFrm::CalcLineSpace with swapped frame!" )
+    OSL_ENSURE( ! IsVertical() || ! IsSwapped(),
+            "SwTxtFrm::CalcLineSpace with swapped frame!" );
 
     if( IsLocked() || !HasPara() )
         return;
@@ -1381,7 +1381,7 @@ sal_Bool SwTxtFrm::GetInfo( SfxPoolItem &rHnt ) const
 
 void SwTxtFrm::PrepWidows( const MSHORT nNeed, sal_Bool bNotify )
 {
-    ASSERT(GetFollow() && nNeed, "+SwTxtFrm::Prepare: lost all friends");
+    OSL_ENSURE(GetFollow() && nNeed, "+SwTxtFrm::Prepare: lost all friends");
 
     SwParaPortion *pPara = GetPara();
     if ( !pPara )
@@ -1535,7 +1535,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
     if( !HasPara() && PREP_MUST_FIT != ePrep )
     {
         SetInvalidVert( TRUE );  // Test
-        ASSERT( !IsLocked(), "SwTxtFrm::Prepare: three of a perfect pair" );
+        OSL_ENSURE( !IsLocked(), "SwTxtFrm::Prepare: three of a perfect pair" );
         if ( bNotify )
             InvalidateSize();
         else
@@ -1778,7 +1778,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
                 // letzte Zeile formatiert werden, damit ggf. die erste Zeile des Follows
                 // hochrutschen kann, die extra auf die naechste Seite gerutscht war, um mit
                 // der Fussnote zusammen zu sein, insbesondere bei spaltigen Bereichen.
-                ASSERT( GetFollow(), "PREP_FTN_GONE darf nur vom Follow gerufen werden" );
+                OSL_ENSURE( GetFollow(), "PREP_FTN_GONE darf nur vom Follow gerufen werden" );
                 xub_StrLen nPos = GetFollow()->GetOfst();
                 if( IsFollow() && GetOfst() == nPos )       // falls wir gar keine Textmasse besitzen,
                     FindMaster()->Prepare( PREP_FTN_GONE ); // rufen wir das Prepare unseres Masters
@@ -1800,7 +1800,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
             if( pVoid )
             {
                 xub_StrLen nWhere = CalcFlyPos( (SwFrmFmt*)pVoid );
-                ASSERT( STRING_LEN != nWhere, "Prepare: Why me?" );
+                OSL_ENSURE( STRING_LEN != nWhere, "Prepare: Why me?" );
                 InvalidateRange( SwCharRange( nWhere, 1 ) );
                 return;
             }
@@ -1894,7 +1894,7 @@ SwTestFormat::SwTestFormat( SwTxtFrm* pTxtFrm, const SwFrm* pPre, SwTwips nMaxHe
     pOldPara = pFrm->HasPara() ? pFrm->GetPara() : NULL;
     pFrm->SetPara( new SwParaPortion(), sal_False );
 
-    ASSERT( ! pFrm->IsSwapped(), "A frame is swapped before _Format" );
+    OSL_ENSURE( ! pFrm->IsSwapped(), "A frame is swapped before _Format" );
 
     if ( pFrm->IsVertical() )
         pFrm->SwapWidthAndHeight();
@@ -1907,7 +1907,7 @@ SwTestFormat::SwTestFormat( SwTxtFrm* pTxtFrm, const SwFrm* pPre, SwTwips nMaxHe
     if ( pFrm->IsVertical() )
         pFrm->SwapWidthAndHeight();
 
-    ASSERT( ! pFrm->IsSwapped(), "A frame is swapped after _Format" );
+    OSL_ENSURE( ! pFrm->IsSwapped(), "A frame is swapped after _Format" );
 }
 
 SwTestFormat::~SwTestFormat()
@@ -1947,7 +1947,7 @@ sal_Bool SwTxtFrm::TestFormat( const SwFrm* pPrv, SwTwips &rMaxHeight, sal_Bool
 
 sal_Bool SwTxtFrm::WouldFit( SwTwips &rMaxHeight, sal_Bool &bSplit, sal_Bool bTst )
 {
-    ASSERT( ! IsVertical() || ! IsSwapped(),
+    OSL_ENSURE( ! IsVertical() || ! IsSwapped(),
             "SwTxtFrm::WouldFit with swapped frame" );
     SWRECTFN( this );
 
@@ -1979,7 +1979,7 @@ sal_Bool SwTxtFrm::WouldFit( SwTwips &rMaxHeight, sal_Bool &bSplit, sal_Bool bTs
     // In sehr unguenstigen Faellen kann GetPara immer noch 0 sein.
     // Dann returnen wir sal_True, um auf der neuen Seite noch einmal
     // anformatiert zu werden.
-    ASSERT( HasPara() || IsHiddenNow(), "WouldFit: GetFormatted() and then !HasPara()" );
+    OSL_ENSURE( HasPara() || IsHiddenNow(), "WouldFit: GetFormatted() and then !HasPara()" );
     if( !HasPara() || ( !(Frm().*fnRect->fnGetHeight)() && IsHiddenNow() ) )
         return sal_True;
 
@@ -2053,8 +2053,8 @@ sal_Bool SwTxtFrm::WouldFit( SwTwips &rMaxHeight, sal_Bool &bSplit, sal_Bool bTs
 
 KSHORT SwTxtFrm::GetParHeight() const
 {
-    ASSERT( ! IsVertical() || ! IsSwapped(),
-            "SwTxtFrm::GetParHeight with swapped frame" )
+    OSL_ENSURE( ! IsVertical() || ! IsSwapped(),
+            "SwTxtFrm::GetParHeight with swapped frame" );
 
     if( !HasPara() )
     {   // Fuer nichtleere Absaetze ist dies ein Sonderfall, da koennen wir
@@ -2271,7 +2271,7 @@ void SwTxtFrm::_CalcHeightOfLastLine( const bool _bUseFont )
     // <--
     // determine output device
     ViewShell* pVsh = GetShell();
-    ASSERT( pVsh, "<SwTxtFrm::_GetHeightOfLastLineForPropLineSpacing()> - no ViewShell" );
+    OSL_ENSURE( pVsh, "<SwTxtFrm::_GetHeightOfLastLineForPropLineSpacing()> - no ViewShell" );
     // --> OD 2007-07-02 #i78921# - make code robust, according to provided patch
     // There could be no <ViewShell> instance in the case of loading a binary
     // StarOffice file format containing an embedded Writer document.
@@ -2286,7 +2286,7 @@ void SwTxtFrm::_CalcHeightOfLastLine( const bool _bUseFont )
     {
         pOut = GetTxtNode()->getIDocumentDeviceAccess()->getReferenceDevice( true );
     }
-    ASSERT( pOut, "<SwTxtFrm::_GetHeightOfLastLineForPropLineSpacing()> - no OutputDevice" );
+    OSL_ENSURE( pOut, "<SwTxtFrm::_GetHeightOfLastLineForPropLineSpacing()> - no OutputDevice" );
     // --> OD 2007-07-02 #i78921# - make code robust, according to provided patch
     if ( !pOut )
     {
@@ -2349,7 +2349,7 @@ void SwTxtFrm::_CalcHeightOfLastLine( const bool _bUseFont )
 
             if ( bCalcHeightOfLastLine )
             {
-                ASSERT( HasPara(),
+                OSL_ENSURE( HasPara(),
                         "<SwTxtFrm::_CalcHeightOfLastLine()> - missing paragraph portions." );
                 const SwLineLayout* pLineLayout = GetPara();
                 while ( pLineLayout && pLineLayout->GetNext() )
@@ -2703,8 +2703,8 @@ SwTwips lcl_CalcFlyBasePos( const SwTxtFrm& rFrm, SwRect aFlyRect,
 
 void SwTxtFrm::CalcBaseOfstForFly()
 {
-    ASSERT( !IsVertical() || !IsSwapped(),
-            "SwTxtFrm::CalcBasePosForFly with swapped frame!" )
+    OSL_ENSURE( !IsVertical() || !IsSwapped(),
+            "SwTxtFrm::CalcBasePosForFly with swapped frame!" );
 
     const SwNode* pNode = GetTxtNode();
     if ( !pNode->getIDocumentSettingAccess()->get(IDocumentSettingAccess::ADD_FLY_OFFSETS) )
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 1b663475bbfb..70edfdab8e60 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -102,10 +102,10 @@ SwTxtFrm *SwTxtFrm::FindFtnRef( const SwTxtFtn *pFtn )
  *                              CalcFtnFlag()
  *************************************************************************/
 
-#ifndef DBG_UTIL
-void SwTxtFrm::CalcFtnFlag()
+#if OSL_DEBUG_LEVEL > 1
+void SwTxtFrm::CalcFtnFlag( xub_StrLen nStop )//For testing the SplitFrm
 #else
-void SwTxtFrm::CalcFtnFlag( xub_StrLen nStop )//Fuer den Test von SplitFrm
+void SwTxtFrm::CalcFtnFlag()
 #endif
 {
     bFtn = sal_False;
@@ -116,11 +116,11 @@ void SwTxtFrm::CalcFtnFlag( xub_StrLen nStop )//Fuer den Test von SplitFrm
 
     const USHORT nSize = pHints->Count();
 
-#ifndef DBG_UTIL
-    const xub_StrLen nEnd = GetFollow() ? GetFollow()->GetOfst() : STRING_LEN;
-#else
+#if OSL_DEBUG_LEVEL > 1
     const xub_StrLen nEnd = nStop != STRING_LEN ? nStop
                         : GetFollow() ? GetFollow()->GetOfst() : STRING_LEN;
+#else
+    const xub_StrLen nEnd = GetFollow() ? GetFollow()->GetOfst() : STRING_LEN;
 #endif
 
     for ( USHORT i = 0; i < nSize; ++i )
@@ -146,7 +146,7 @@ void SwTxtFrm::CalcFtnFlag( xub_StrLen nStop )//Fuer den Test von SplitFrm
 
 sal_Bool SwTxtFrm::CalcPrepFtnAdjust()
 {
-    ASSERT( HasFtn(), "Wer ruft mich da?" );
+    OSL_ENSURE( HasFtn(), "Wer ruft mich da?" );
     SwFtnBossFrm *pBoss = FindFtnBossFrm( sal_True );
     const SwFtnFrm *pFtn = pBoss->FindFirstFtn( this );
     if( pFtn && FTNPOS_CHAPTER != GetNode()->GetDoc()->GetFtnInfo().ePos &&
@@ -195,7 +195,7 @@ SwTwips lcl_GetFtnLower( const SwTxtFrm* pFrm, SwTwips nLower )
     // containing the footnote.
     SWRECTFN( pFrm )
 
-    ASSERT( !pFrm->IsVertical() || !pFrm->IsSwapped(),
+    OSL_ENSURE( !pFrm->IsVertical() || !pFrm->IsSwapped(),
             "lcl_GetFtnLower with swapped frame" );
 
     SwTwips nAdd;
@@ -221,8 +221,8 @@ SwTwips lcl_GetFtnLower( const SwTxtFrm* pFrm, SwTwips nLower )
             pRow = pRow->GetUpper();
         const SwTabFrm* pTabFrm = (SwTabFrm*)pRow->GetUpper();
 
-        ASSERT( pTabFrm && pRow &&
-                pRow->GetUpper()->IsTabFrm(), "Upper of row should be tab" )
+        OSL_ENSURE( pTabFrm && pRow &&
+                pRow->GetUpper()->IsTabFrm(), "Upper of row should be tab" );
 
         const BOOL bDontSplit = !pTabFrm->IsFollow() &&
                                 !pTabFrm->IsLayoutSplitAllowed();
@@ -252,11 +252,11 @@ SwTwips lcl_GetFtnLower( const SwTxtFrm* pFrm, SwTwips nLower )
     // #i10770#: If there are fly frames anchored at previous paragraphs,
     // the deadline should consider their lower borders.
     const SwFrm* pStartFrm = pFrm->GetUpper()->GetLower();
-    ASSERT( pStartFrm, "Upper has no lower" )
+    OSL_ENSURE( pStartFrm, "Upper has no lower" );
     SwTwips nFlyLower = bVert ? LONG_MAX : 0;
     while ( pStartFrm != pFrm )
     {
-        ASSERT( pStartFrm, "Frame chain is broken" )
+        OSL_ENSURE( pStartFrm, "Frame chain is broken" );
         if ( pStartFrm->GetDrawObjs() )
         {
             const SwSortedObjs &rObjs = *pStartFrm->GetDrawObjs();
@@ -293,8 +293,8 @@ SwTwips lcl_GetFtnLower( const SwTxtFrm* pFrm, SwTwips nLower )
 
 SwTwips SwTxtFrm::GetFtnLine( const SwTxtFtn *pFtn ) const
 {
-    ASSERT( ! IsVertical() || ! IsSwapped(),
-            "SwTxtFrm::GetFtnLine with swapped frame" )
+    OSL_ENSURE( ! IsVertical() || ! IsSwapped(),
+            "SwTxtFrm::GetFtnLine with swapped frame" );
 
     SwTxtFrm *pThis = (SwTxtFrm*)this;
 
@@ -336,7 +336,7 @@ SwTwips SwTxtFrm::GetFtnLine( const SwTxtFtn *pFtn ) const
 
 SwTwips SwTxtFrm::_GetFtnFrmHeight() const
 {
-    ASSERT( !IsFollow() && IsInFtn(), "SwTxtFrm::SetFtnLine: moon walk" );
+    OSL_ENSURE( !IsFollow() && IsInFtn(), "SwTxtFrm::SetFtnLine: moon walk" );
 
     const SwFtnFrm *pFtnFrm = FindFtnFrm();
     const SwTxtFrm *pRef = (const SwTxtFrm *)pFtnFrm->GetRef();
@@ -360,7 +360,7 @@ SwTwips SwTxtFrm::_GetFtnFrmHeight() const
         SwTwips nTmp = (*fnRect->fnYDiff)( (pCont->*fnRect->fnGetPrtBottom)(),
                                            (Frm().*fnRect->fnGetTop)() );
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         if( nTmp < 0 )
         {
             sal_Bool bInvalidPos = sal_False;
@@ -373,7 +373,7 @@ SwTwips SwTxtFrm::_GetFtnFrmHeight() const
                     break;
                 pTmp = pTmp->GetUpper();
             }
-            ASSERT( bInvalidPos, "Hanging below FtnCont" );
+            OSL_ENSURE( bInvalidPos, "Hanging below FtnCont" );
         }
 #endif
 
@@ -510,7 +510,7 @@ void SwTxtFrm::RemoveFtn( const xub_StrLen nStart, const xub_StrLen nLen )
                 // Wir loeschen nicht, sondern wollen die Ftn verschieben.
                 // Drei Faelle koennen auftreten:
                 // 1) Es gibt weder Follow noch PrevFollow
-                //    -> RemoveFtn()  (vielleicht sogar ein ASSERT wert)
+                //    -> RemoveFtn()  (vielleicht sogar ein OSL_ENSURE(wert)
                 // 2) nStart > GetOfst, ich habe einen Follow
                 //    -> Ftn wandert in den Follow
                 // 3) nStart < GetOfst, ich bin ein Follow
@@ -538,7 +538,7 @@ void SwTxtFrm::RemoveFtn( const xub_StrLen nStart, const xub_StrLen nLen )
                         while( pDest->GetFollow() && ((SwTxtFrm*)pDest->
                                GetFollow())->GetOfst() <= nIdx )
                             pDest = pDest->GetFollow();
-                        ASSERT( !pDest->FindFtnBossFrm( !bEndn )->FindFtn(
+                        OSL_ENSURE( !pDest->FindFtnBossFrm( !bEndn )->FindFtn(
                             pDest,pFtn),"SwTxtFrm::RemoveFtn: footnote exists");
 
                         //Nicht ummelden sondern immer Moven.
@@ -567,7 +567,7 @@ void SwTxtFrm::RemoveFtn( const xub_StrLen nStart, const xub_StrLen nLen )
                         }
                         ((SwTxtFrm*)pDest)->SetFtn( sal_True );
 
-                        ASSERT( pDest->FindFtnBossFrm( !bEndn )->FindFtn( pDest,
+                        OSL_ENSURE( pDest->FindFtnBossFrm( !bEndn )->FindFtn( pDest,
                            pFtn),"SwTxtFrm::RemoveFtn: footnote ChgRef failed");
                     }
                     else
@@ -581,7 +581,7 @@ void SwTxtFrm::RemoveFtn( const xub_StrLen nStart, const xub_StrLen nLen )
                             else
                                 pFtnBoss->RemoveFtn( this, pFtn );
                             bRemove = bRemove || !bEndDoc;
-                            ASSERT( bEndn ? !pEndBoss->FindFtn( this, pFtn ) :
+                            OSL_ENSURE( bEndn ? !pEndBoss->FindFtn( this, pFtn ) :
                                     !pFtnBoss->FindFtn( this, pFtn ),
                             "SwTxtFrm::RemoveFtn: can't get off that footnote" );
                         }
@@ -631,7 +631,7 @@ void SwTxtFrm::RemoveFtn( const xub_StrLen nStart, const xub_StrLen nLen )
 
 void SwTxtFrm::ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine )
 {
-    ASSERT( !IsVertical() || !IsSwapped(),
+    OSL_ENSURE( !IsVertical() || !IsSwapped(),
             "SwTxtFrm::ConnectFtn with swapped frame" );
 
     bFtn = sal_True;
@@ -849,7 +849,7 @@ void SwTxtFrm::ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine )
 SwFtnPortion *SwTxtFormatter::NewFtnPortion( SwTxtFormatInfo &rInf,
                                              SwTxtAttr *pHint )
 {
-    ASSERT( ! pFrm->IsVertical() || pFrm->IsSwapped(),
+    OSL_ENSURE( ! pFrm->IsVertical() || pFrm->IsSwapped(),
             "NewFtnPortion with unswapped frame" );
 
     if( !pFrm->IsFtnAllowed() )
@@ -996,7 +996,7 @@ SwFtnPortion *SwTxtFormatter::NewFtnPortion( SwTxtFormatInfo &rInf,
 
 SwNumberPortion *SwTxtFormatter::NewFtnNumPortion( SwTxtFormatInfo &rInf ) const
 {
-    ASSERT( pFrm->IsInFtn() && !pFrm->GetIndPrev() && !rInf.IsFtnDone(),
+    OSL_ENSURE( pFrm->IsInFtn() && !pFrm->GetIndPrev() && !rInf.IsFtnDone(),
             "This is the wrong place for a ftnnumber" );
     if( rInf.GetTxtStart() != nStart ||
         rInf.GetTxtStart() != rInf.GetIdx() )
@@ -1052,7 +1052,7 @@ SwNumberPortion *SwTxtFormatter::NewFtnNumPortion( SwTxtFormatInfo &rInf ) const
 
 XubString lcl_GetPageNumber( const SwPageFrm* pPage )
 {
-    ASSERT( pPage, "GetPageNumber: Homeless TxtFrm" );
+    OSL_ENSURE( pPage, "GetPageNumber: Homeless TxtFrm" );
     MSHORT nVirtNum = pPage->GetVirtPageNum();
     const SvxNumberType& rNum = pPage->GetPageDesc()->GetNumType();
     return rNum.GetNumStr( nVirtNum );
@@ -1093,7 +1093,7 @@ SwErgoSumPortion *SwTxtFormatter::NewErgoSumPortion( SwTxtFormatInfo &rInf ) con
 
 xub_StrLen SwTxtFormatter::FormatQuoVadis( const xub_StrLen nOffset )
 {
-    ASSERT( ! pFrm->IsVertical() || ! pFrm->IsSwapped(),
+    OSL_ENSURE( ! pFrm->IsVertical() || ! pFrm->IsSwapped(),
             "SwTxtFormatter::FormatQuoVadis with swapped frame" );
 
     if( !pFrm->IsInFtn() || pFrm->ImplFindFtnFrm()->GetAttr()->GetFtn().IsEndNote() )
@@ -1167,8 +1167,8 @@ xub_StrLen SwTxtFormatter::FormatQuoVadis( const xub_StrLen nOffset )
         rInf.SetRest( 0 );
         pCurrPor->Move( rInf );
 
-        ASSERT( pFollow->IsQuoVadisPortion(),
-                "Quo Vadis, rest of QuoVadisPortion" )
+        OSL_ENSURE( pFollow->IsQuoVadisPortion(),
+                "Quo Vadis, rest of QuoVadisPortion" );
 
         // format the rest and append it to the other QuoVadis parts
         pFollow->Format( rInf );
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index 4d1fbfee156e..dfba164b9dcc 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -45,7 +45,7 @@
 #include <guess.hxx>    //
 #include <splargs.hxx>  // SwInterHyphInfo
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 extern const sal_Char *GetLangName( const MSHORT nLang );
 #endif
 
@@ -65,7 +65,7 @@ Reference< XHyphenatedWord >  SwTxtFormatInfo::HyphWord(
 {
     if( rTxt.Len() < 4 || pFnt->IsSymbol(pVsh) )
         return 0;
-//  ASSERT( IsHyphenate(), "SwTxtFormatter::HyphWord: why?" );
+// OSL_ENSURE( IsHyphenate(), "SwTxtFormatter::HyphWord: why?" );
     Reference< XHyphenator >  xHyph = ::GetHyphenator();
     Reference< XHyphenatedWord > xHyphWord;
 
@@ -85,12 +85,12 @@ Reference< XHyphenatedWord >  SwTxtFormatInfo::HyphWord(
 
 sal_Bool SwTxtFrm::Hyphenate( SwInterHyphInfo &rHyphInf )
 {
-    ASSERT( ! IsVertical() || ! IsSwapped(),"swapped frame at SwTxtFrm::Hyphenate" );
+    OSL_ENSURE( ! IsVertical() || ! IsSwapped(),"swapped frame at SwTxtFrm::Hyphenate" );
 
     if( !pBreakIt->GetBreakIter().is() )
         return sal_False;;
     // Wir machen den Laden erstmal dicht:
-    ASSERT( !IsLocked(), "SwTxtFrm::Hyphenate: this is locked" );
+    OSL_ENSURE( !IsLocked(), "SwTxtFrm::Hyphenate: this is locked" );
     // 4935: Der frame::Frame muss eine gueltige SSize haben!
     Calc();
     GetFormatted();
@@ -149,7 +149,7 @@ sal_Bool SwTxtFrm::Hyphenate( SwInterHyphInfo &rHyphInf )
 
 void SetParaPortion( SwTxtInfo *pInf, SwParaPortion *pRoot )
 {
-    ASSERT( pRoot, "SetParaPortion: no root anymore" );
+    OSL_ENSURE( pRoot, "SetParaPortion: no root anymore" );
     pInf->pPara = pRoot;
 }
 
@@ -182,7 +182,7 @@ sal_Bool SwTxtFormatter::Hyphenate( SwInterHyphInfo &rHyphInf )
         SwParaPortion *pPara = new SwParaPortion();
         SetParaPortion( &rInf, pPara );
         pCurr = pPara;
-        ASSERT( IsParaLine(), "SwTxtFormatter::Hyphenate: not the first" );
+        OSL_ENSURE( IsParaLine(), "SwTxtFormatter::Hyphenate: not the first" );
     }
     else
         pCurr = new SwLineLayout();
@@ -235,7 +235,7 @@ sal_Bool SwTxtFormatter::Hyphenate( SwInterHyphInfo &rHyphInf )
     if( pOldCurr->IsParaPortion() )
     {
         SetParaPortion( &rInf, (SwParaPortion*)pOldCurr );
-        ASSERT( IsParaLine(), "SwTxtFormatter::Hyphenate: even not the first" );
+        OSL_ENSURE( IsParaLine(), "SwTxtFormatter::Hyphenate: even not the first" );
     }
 
     if( nWrdStart )
@@ -300,11 +300,11 @@ sal_Bool SwTxtFormatter::Hyphenate( SwInterHyphInfo &rHyphInf )
 #ifdef DEBUGGY
             if( OPTDBG( rInf ) )
             {
-                ASSERT( aSelTxt == aHyphWord,
+                OSL_ENSURE( aSelTxt == aHyphWord,
                         "!SwTxtFormatter::Hyphenate: different words, different planets" );
                 aDbstream << "Diff: \"" << aSelTxt.GetStr() << "\" != \""
                           << aHyphWord.GetStr() << "\"" << endl;
-                ASSERT( bRet, "!SwTxtFormatter::Hyphenate: three of a perfect pair" );
+                OSL_ENSURE( bRet, "!SwTxtFormatter::Hyphenate: three of a perfect pair" );
                 aDbstream << "Hyphenate: ";
             }
 #endif
@@ -321,8 +321,8 @@ sal_Bool SwTxtPortion::CreateHyphen( SwTxtFormatInfo &rInf, SwTxtGuess &rGuess )
 {
     Reference< XHyphenatedWord >  xHyphWord = rGuess.HyphWord();
 
-    ASSERT( !pPortion, "SwTxtPortion::CreateHyphen(): another portion, another planet..." )
-    ASSERT( xHyphWord.is(), "SwTxtPortion::CreateHyphen(): You are lucky! The code is robust here." )
+    OSL_ENSURE( !pPortion, "SwTxtPortion::CreateHyphen(): another portion, another planet..." );
+    OSL_ENSURE( xHyphWord.is(), "SwTxtPortion::CreateHyphen(): You are lucky! The code is robust here." );
 
     if( rInf.IsHyphForbud() ||
         pPortion || // robust
@@ -340,7 +340,7 @@ sal_Bool SwTxtPortion::CreateHyphen( SwTxtFormatInfo &rInf, SwTxtGuess &rGuess )
     {
         SvxAlternativeSpelling aAltSpell;
         aAltSpell = SvxGetAltSpelling( xHyphWord );
-        ASSERT( aAltSpell.bIsAltSpelling, "no alternatve spelling" );
+        OSL_ENSURE( aAltSpell.bIsAltSpelling, "no alternatve spelling" );
 
         XubString  aAltTxt   = aAltSpell.aReplacement;
         nPorEnd = aAltSpell.nChangedPos + rGuess.BreakStart() - rGuess.FieldDiff();
diff --git a/sw/source/core/text/txtinit.cxx b/sw/source/core/text/txtinit.cxx
index f31f1cd72119..f8ffbbe7dc3f 100644
--- a/sw/source/core/text/txtinit.cxx
+++ b/sw/source/core/text/txtinit.cxx
@@ -77,7 +77,7 @@ void _TextInit()
     pFntCache = new SwFntCache;                     // Cache for SwSubFont -> SwFntObj = { Font aFont, Font* pScrFont, Font* pPrtFont, OutputDevice* pPrinter, ... }
     pSwFontCache = new SwFontCache;                 // Cache for SwTxtFmtColl -> SwFontObj = { SwFont aSwFont, SfxPoolItem* pDefaultArray }
     SwCache *pTxtCache = new SwCache( 250, 100      // Cache for SwTxtFrm -> SwTxtLine = { SwParaPortion* pLine }
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     , "static SwTxtFrm::pTxtCache"
 #endif
     );
diff --git a/sw/source/core/text/txtio.cxx b/sw/source/core/text/txtio.cxx
index eaeefba1cb3b..e0c727c88f26 100644
--- a/sw/source/core/text/txtio.cxx
+++ b/sw/source/core/text/txtio.cxx
@@ -30,8 +30,8 @@
 #include "precompiled_sw.hxx"
 
 
-#ifndef DBG_UTIL
-#error Wer fummelt denn an den makefiles?
+#if !defined(OSL_DEBUG_LEVEL) || OSL_DEBUG_LEVEL == 0
+#error Who broke the makefiles?
 #endif
 
 #include "viewsh.hxx"       // IsDbg()
@@ -294,7 +294,7 @@ sal_Bool IsDbg( const SwTxtFrm *pFrm )
     if( pFrm && pFrm->GetShell() )
         return pFrm->GetShell()->GetViewOptions()->IsTest4();
     else
-#else
+#endif
         return sal_False;
 }
 
@@ -304,7 +304,7 @@ static void Error()
 {
     // wegen PM und BCC
     sal_Bool bFalse = sal_False;
-    ASSERT( bFalse, "txtio: No debug version" );
+    OSL_ENSURE( bFalse, "txtio: No debug version" );
 }
 
 #define IMPL_OUTOP(class) \
@@ -465,7 +465,7 @@ const char *GetPrepName( const PrepareHint ePrep )
         pPREP_UL_SPACE, pPREP_MUST_FIT, pPREP_WIDOWS, pPREP_QUOVADIS,
         pPREP_PAGE
     };
-    ASSERT( ePrep < PREP_END, "GetPrepName: unknown PrepareHint" );
+    OSL_ENSURE( ePrep < PREP_END, "GetPrepName: unknown PrepareHint" );
     return( ppNameArr[ePrep] );
 }
 
diff --git a/sw/source/core/text/txtpaint.cxx b/sw/source/core/text/txtpaint.cxx
index 2f9a003bd6b4..54069949423d 100644
--- a/sw/source/core/text/txtpaint.cxx
+++ b/sw/source/core/text/txtpaint.cxx
@@ -120,7 +120,7 @@ void SwSaveClip::_ChgClip( const SwRect &rRect, const SwTxtFrm* pFrm,
 #endif
         }
 #if OSL_DEBUG_LEVEL > 1
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         static sal_Bool bDbg = sal_False;
         if( bDbg )
         {
diff --git a/sw/source/core/text/txtpaint.hxx b/sw/source/core/text/txtpaint.hxx
index 752405e5d440..0a7a36beda48 100644
--- a/sw/source/core/text/txtpaint.hxx
+++ b/sw/source/core/text/txtpaint.hxx
@@ -69,7 +69,7 @@ inline SwSaveClip::~SwSaveClip()
     Reset();
 }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
 /*************************************************************************
  *                          class SwDbgOut
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index 75908c1efde0..0a2b980eb0ea 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -268,7 +268,7 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto )
             nNextPos = nForced;
         }
         nNextPos += bRTL ? nLinePos - nTabLeft : nTabLeft - nLinePos;
-        ASSERT( nNextPos >= 0, "GetTabStop: Don't go back!" );
+        OSL_ENSURE( nNextPos >= 0, "GetTabStop: Don't go back!" );
         nNewTabPos = KSHORT(nNextPos);
     }
 
@@ -301,7 +301,7 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto )
             }
             default:
             {
-                   ASSERT( SVX_TAB_ADJUST_LEFT == eAdj || SVX_TAB_ADJUST_DEFAULT == eAdj,
+                   OSL_ENSURE( SVX_TAB_ADJUST_LEFT == eAdj || SVX_TAB_ADJUST_DEFAULT == eAdj,
                         "+SwTxtFormatter::NewTabPortion: unknown adjustment" );
                 pTabPor = new SwTabLeftPortion( nNewTabPos, cFill );
                 break;
@@ -328,10 +328,10 @@ SwTabPortion::SwTabPortion( const KSHORT nTabPosition, const xub_Unicode cFillCh
     : SwFixPortion( 0, 0 ), nTabPos(nTabPosition), cFill(cFillChar)
 {
     nLineLength = 1;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     if( IsFilled() )
     {
-        ASSERT( ' ' != cFill, "SwTabPortion::CTOR: blanks ?!" );
+        OSL_ENSURE( ' ' != cFill, "SwTabPortion::CTOR: blanks ?!" );
     }
 #endif
     SetWhichPor( POR_TAB );
@@ -373,7 +373,7 @@ void SwTabPortion::FormatEOL( SwTxtFormatInfo &rInf )
 
 sal_Bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf )
 {
-    ASSERT( rInf.X() <= GetTabPos(), "SwTabPortion::PreFormat: rush hour" );
+    OSL_ENSURE( rInf.X() <= GetTabPos(), "SwTabPortion::PreFormat: rush hour" );
 
     // Hier lassen wir uns nieder...
     Fix( static_cast<USHORT>(rInf.X()) );
@@ -445,7 +445,7 @@ sal_Bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf )
 
                 break;
             }
-            default: ASSERT( !this, "SwTabPortion::PreFormat: unknown adjustment" );
+            default: OSL_ENSURE( !this, "SwTabPortion::PreFormat: unknown adjustment" );
         }
     }
 
@@ -501,7 +501,7 @@ sal_Bool SwTabPortion::PostFormat( SwTxtFormatInfo &rInf )
     }
 
     const MSHORT nWhich = GetWhichPor();
-    ASSERT( POR_TABLEFT != nWhich, "SwTabPortion::PostFormat: already formatted" );
+    OSL_ENSURE( POR_TABLEFT != nWhich, "SwTabPortion::PostFormat: already formatted" );
     const bool bTabCompat = rInf.GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::TAB_COMPAT);
 
     // --> FME 2005-12-19 #127428# Abandon dec. tab position if line is full:
@@ -563,7 +563,7 @@ sal_Bool SwTabPortion::PostFormat( SwTxtFormatInfo &rInf )
 
 void SwTabPortion::Paint( const SwTxtPaintInfo &rInf ) const
 {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     // Wir wollen uns die Fixbreite anzeigen
     if( rInf.OnWin() && OPTDBG( rInf ) &&
         !rInf.GetOpt().IsPagePreview() && \
@@ -633,7 +633,7 @@ void SwTabPortion::Paint( const SwTxtPaintInfo &rInf ) const
         XubString aTxt( cFill );
         const KSHORT nCharWidth = rInf.GetTxtSize( aTxt ).Width();
 #if OSL_DEBUG_LEVEL > 1
-        ASSERT( nCharWidth, "!SwTabPortion::Paint: sophisticated tabchar" );
+        OSL_ENSURE( nCharWidth, "!SwTabPortion::Paint: sophisticated tabchar" );
 #endif
         // robust:
         if( nCharWidth )
diff --git a/sw/source/core/text/widorp.cxx b/sw/source/core/text/widorp.cxx
index 265aa763f710..5576cff68fb6 100644
--- a/sw/source/core/text/widorp.cxx
+++ b/sw/source/core/text/widorp.cxx
@@ -61,7 +61,7 @@
 // Ein Follow, der auf der selben Seite steht, wie sein Master ist nasty.
 inline sal_Bool IsNastyFollow( const SwTxtFrm *pFrm )
 {
-    ASSERT( !pFrm->IsFollow() || !pFrm->GetPrev() ||
+    OSL_ENSURE( !pFrm->IsFollow() || !pFrm->GetPrev() ||
             ((const SwTxtFrm*)pFrm->GetPrev())->GetFollow() == pFrm,
             "IsNastyFollow: Was ist denn hier los?" );
     return  pFrm->IsFollow() && pFrm->GetPrev();
@@ -323,7 +323,7 @@ sal_Bool WidowsAndOrphans::FindBreak( SwTxtFrm *pFrame, SwTxtMargin &rLine,
 {
     // OD 2004-02-25 #i16128# - Why member <pFrm> _*and*_ parameter <pFrame>??
     // Thus, assertion on situation, that these are different to figure out why.
-    ASSERT( pFrm == pFrame, "<WidowsAndOrphans::FindBreak> - pFrm != pFrame" );
+    OSL_ENSURE( pFrm == pFrame, "<WidowsAndOrphans::FindBreak> - pFrm != pFrame" );
 
     SWAP_IF_SWAPPED( pFrm )
 
@@ -378,8 +378,8 @@ sal_Bool WidowsAndOrphans::FindBreak( SwTxtFrm *pFrame, SwTxtMargin &rLine,
 
 sal_Bool WidowsAndOrphans::FindWidows( SwTxtFrm *pFrame, SwTxtMargin &rLine )
 {
-    ASSERT( ! pFrame->IsVertical() || ! pFrame->IsSwapped(),
-            "WidowsAndOrphans::FindWidows with swapped frame" )
+    OSL_ENSURE( ! pFrame->IsVertical() || ! pFrame->IsSwapped(),
+            "WidowsAndOrphans::FindWidows with swapped frame" );
 
     if( !nWidLines || !pFrame->IsFollow() )
         return sal_False;
@@ -388,7 +388,7 @@ sal_Bool WidowsAndOrphans::FindWidows( SwTxtFrm *pFrame, SwTxtMargin &rLine )
 
     // Wir koennen noch was abzwacken
     SwTxtFrm *pMaster = pFrame->FindMaster();
-    ASSERT(pMaster, "+WidowsAndOrphans::FindWidows: Widows in a master?");
+    OSL_ENSURE(pMaster, "+WidowsAndOrphans::FindWidows: Widows in a master?");
     if( !pMaster )
         return sal_False;
 
@@ -512,7 +512,7 @@ sal_Bool WidowsAndOrphans::WouldFit( SwTxtMargin &rLine, SwTwips &rMaxHeight, sa
     // IsInside() takes care for itself
 
     // Wir erwarten, dass rLine auf der letzten Zeile steht!!
-    ASSERT( !rLine.GetNext(), "WouldFit: aLine::Bottom missed!" );
+    OSL_ENSURE( !rLine.GetNext(), "WouldFit: aLine::Bottom missed!" );
     MSHORT nLineCnt = rLine.GetLineNr();
 
     // Erstmal die Orphansregel und den Initialenwunsch erfuellen ...
diff --git a/sw/source/core/text/wrong.cxx b/sw/source/core/text/wrong.cxx
index 6a86baee7079..0bd7d126ebf2 100644
--- a/sw/source/core/text/wrong.cxx
+++ b/sw/source/core/text/wrong.cxx
@@ -561,7 +561,7 @@ void SwWrongList::Remove(USHORT nIdx, USHORT nLen )
     maList.erase(i1, i2);
 
 #if OSL_DEBUG_LEVEL > 1
-    ASSERT( Count() + nLen == nOldSize, "SwWrongList::Remove() trouble" )
+    OSL_ENSURE( Count() + nLen == nOldSize, "SwWrongList::Remove() trouble" );
 #endif
 }
 
diff --git a/sw/source/core/tox/makefile.mk b/sw/source/core/tox/makefile.mk
index 60de3744917f..3bbc9866b56e 100644
--- a/sw/source/core/tox/makefile.mk
+++ b/sw/source/core/tox/makefile.mk
@@ -43,13 +43,12 @@ CDEFS+=-Dmydebug
 # --- Files --------------------------------------------------------
 
 SLOFILES =  \
-        $(SLO)$/tox.obj \
-        $(SLO)$/toxhlp.obj \
-        $(SLO)$/txmsrt.obj
+        $(EXCEPTIONSFILES)
 
 EXCEPTIONSFILES= \
+        $(SLO)$/tox.obj \
         $(SLO)$/toxhlp.obj \
-        $(SLO)$/tox.obj
+        $(SLO)$/txmsrt.obj
 
 # --- Tagets -------------------------------------------------------
 
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 7c554fb423f9..301f93ce1cd1 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -80,9 +80,6 @@ SV_IMPL_PTRARR(SwTOXMarks, SwTOXMark*)
 
 TYPEINIT2( SwTOXMark, SfxPoolItem, SwClient );    // fuers rtti
 
-/* -----------------23.09.99 13:59-------------------
-
- --------------------------------------------------*/
 struct PatternIni
 {
     USHORT n1;
@@ -125,9 +122,7 @@ const PatternIni aPatternIni[] =
     {AUTH_FIELD_AUTHOR, AUTH_FIELD_TITLE, AUTH_FIELD_YEAR, USHRT_MAX, USHRT_MAX},     //AUTH_FIELD_CUSTOM5,
     {USHRT_MAX, USHRT_MAX, USHRT_MAX, USHRT_MAX, USHRT_MAX}
 };
-/* -----------------23.09.99 13:58-------------------
 
- --------------------------------------------------*/
 // -> #i21237#
 SwFormTokens lcl_GetAuthPattern(USHORT nTypeId)
 {
@@ -220,7 +215,7 @@ SwTOXMark::~SwTOXMark()
 
 int SwTOXMark::operator==( const SfxPoolItem& rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+    OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
     return GetRegisteredIn() == ((SwTOXMark&)rAttr).GetRegisteredIn();
 }
 
@@ -255,7 +250,7 @@ String SwTOXMark::GetText() const
     else if( pTxtAttr && pTxtAttr->GetpTxtNd() )
     {
         xub_StrLen* pEndIdx = pTxtAttr->GetEnd();
-        ASSERT( pEndIdx, "TOXMark ohne Mark!!");
+        OSL_ENSURE( pEndIdx, "TOXMark ohne Mark!!");
         if( pEndIdx )
         {
             const xub_StrLen nStt = *pTxtAttr->GetStart();
@@ -313,7 +308,7 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237#
     case TOX_TABLES       : nPoolId = STR_POOLCOLL_TOX_TABLESH; break;
     case TOX_AUTHORITIES  : nPoolId = STR_POOLCOLL_TOX_AUTHORITIESH;    break;
     default:
-        ASSERT( !this, "ungueltiger TOXTyp");
+        OSL_ENSURE( !this, "ungueltiger TOXTyp");
         return ;
     }
 
@@ -922,7 +917,7 @@ FormTokenType SwFormTokensHelper::GetTokenType(const String & sToken,
             break;
         }
 
-    ASSERT( pNm, "wrong token" );
+    OSL_ENSURE( pNm, "wrong token" );
     if (pTokenLen)
         *pTokenLen = nTokenLen;
 
@@ -933,13 +928,13 @@ FormTokenType SwFormTokensHelper::GetTokenType(const String & sToken,
 
 void SwForm::SetPattern(USHORT nLevel, const SwFormTokens& rTokens)
 {
-    ASSERT(nLevel < GetFormMax(), "Index >= FORM_MAX");
+    OSL_ENSURE(nLevel < GetFormMax(), "Index >= FORM_MAX");
     aPattern[nLevel] = rTokens;
 }
 
 void SwForm::SetPattern(USHORT nLevel, const String & rStr)
 {
-    ASSERT(nLevel < GetFormMax(), "Index >= FORM_MAX");
+    OSL_ENSURE(nLevel < GetFormMax(), "Index >= FORM_MAX");
 
     SwFormTokensHelper aHelper(rStr);
     aPattern[nLevel] = aHelper.GetTokens();
@@ -947,7 +942,7 @@ void SwForm::SetPattern(USHORT nLevel, const String & rStr)
 
 const SwFormTokens& SwForm::GetPattern(USHORT nLevel) const
 {
-    ASSERT(nLevel < GetFormMax(), "Index >= FORM_MAX");
+    OSL_ENSURE(nLevel < GetFormMax(), "Index >= FORM_MAX");
     return aPattern[nLevel];
 }
 
diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx
index 9d30baadbaab..fb9b97a265b4 100644
--- a/sw/source/core/tox/toxhlp.cxx
+++ b/sw/source/core/tox/toxhlp.cxx
@@ -58,12 +58,12 @@ IndexEntrySupplierWrapper::IndexEntrySupplierWrapper()
         }
     }
     catch ( UNO_NMSPC::Exception&
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         e
 #endif
         )
     {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         ByteString aMsg( "IndexEntrySupplierWrapper: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -84,12 +84,12 @@ String IndexEntrySupplierWrapper::GetIndexKey( const String& rTxt,
         sRet = xIES->getIndexKey( rTxt, rTxtReading, rLocale );
     }
     catch ( UNO_NMSPC::Exception&
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         e
 #endif
         )
     {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         ByteString aMsg( "getIndexKey: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -105,12 +105,12 @@ String IndexEntrySupplierWrapper::GetFollowingText( BOOL bMorePages ) const
         sRet = xIES->getIndexFollowPageWord( bMorePages, aLcl );
     }
     catch ( UNO_NMSPC::Exception&
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         e
 #endif
         )
     {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         ByteString aMsg( "getIndexFollowPageWord: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -128,12 +128,12 @@ IndexEntrySupplierWrapper::GetAlgorithmList( const STAR_NMSPC::lang::Locale& rLc
         sRet = xIES->getAlgorithmList( rLcl );
     }
     catch ( UNO_NMSPC::Exception&
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         e
 #endif
         )
     {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         ByteString aMsg( "getAlgorithmList: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -151,12 +151,12 @@ sal_Bool IndexEntrySupplierWrapper::LoadAlgorithm(
         bRet = xIES->loadAlgorithm( rLcl, sSortAlgorithm, nOptions );
     }
     catch ( UNO_NMSPC::Exception&
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         e
 #endif
         )
     {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         ByteString aMsg( "loadAlgorithm: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
@@ -177,12 +177,12 @@ sal_Int16 IndexEntrySupplierWrapper::CompareIndexEntry(
                                         rTxt2, rTxtReading2, rLocale2 );
     }
     catch ( UNO_NMSPC::Exception&
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         e
 #endif
         )
     {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         ByteString aMsg( "compareIndexEntry: Exception caught\n" );
         aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
         DBG_ERRORFILE( aMsg.GetBuffer() );
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index ceb7c5adaea9..ee06e8d46d4e 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -187,8 +187,8 @@ SwTOXSortTabBase::SwTOXSortTabBase( TOXSortType nTyp, const SwCntntNode* pNd,
                 {
                     SwPosition aPos( *pNd );
                     const SwDoc& rDoc = *pNd->GetDoc();
-#ifdef DBG_UTIL
-                    ASSERT( GetBodyTxtNode( rDoc, aPos, *pFrm ),
+#if OSL_DEBUG_LEVEL > 1
+                    OSL_ENSURE( GetBodyTxtNode( rDoc, aPos, *pFrm ),
                             "wo steht der Absatz" );
 #else
                     GetBodyTxtNode( rDoc, aPos, *pFrm );
@@ -341,7 +341,7 @@ BOOL SwTOXIndex::operator==( const SwTOXSortTabBase& rCmpBase )
     if(GetLevel() != rCmp.GetLevel() || nKeyLevel != rCmp.nKeyLevel)
         return FALSE;
 
-    ASSERT(pTxtMark, "pTxtMark == 0, Kein Stichwort");
+    OSL_ENSURE(pTxtMark, "pTxtMark == 0, Kein Stichwort");
 
     String sMyTxt;
     String sMyTxtReading;
@@ -371,7 +371,7 @@ BOOL SwTOXIndex::operator<( const SwTOXSortTabBase& rCmpBase )
 {
     SwTOXIndex& rCmp = (SwTOXIndex&)rCmpBase;
 
-    ASSERT(pTxtMark, "pTxtMark == 0, Kein Stichwort");
+    OSL_ENSURE(pTxtMark, "pTxtMark == 0, Kein Stichwort");
 
     String sMyTxt;
     String sMyTxtReading;
@@ -404,7 +404,7 @@ BOOL SwTOXIndex::operator<( const SwTOXSortTabBase& rCmpBase )
 
 void SwTOXIndex::_GetText( String& rTxt, String& rTxtReading )
 {
-    ASSERT(pTxtMark, "pTxtMark == 0, Kein Stichwort");
+    OSL_ENSURE(pTxtMark, "pTxtMark == 0, Kein Stichwort");
     const SwTOXMark& rTOXMark = pTxtMark->GetTOXMark();
     switch(nKeyLevel)
     {
@@ -462,7 +462,7 @@ void SwTOXIndex::FillText( SwTxtNode& rNd, const SwIndex& rInsPos, USHORT ) cons
 
 USHORT SwTOXIndex::GetLevel() const
 {
-    ASSERT(pTxtMark, "pTxtMark == 0, Kein Stichwort");
+    OSL_ENSURE(pTxtMark, "pTxtMark == 0, Kein Stichwort");
 
     USHORT nForm = FORM_PRIMARY_KEY;
 
@@ -644,7 +644,7 @@ void SwTOXPara::_GetText( String& rTxt, String& )
                 rTxt = pFly->GetName();
             else
             {
-                ASSERT( !this, "Grafik/Object ohne Namen" )
+                OSL_ENSURE( !this, "Grafik/Object ohne Namen" );
                 USHORT nId = nsSwTOXElement::TOX_OLE == eType
                                 ? STR_OBJECT_DEFNAME
                                 : nsSwTOXElement::TOX_GRAPHIC == eType
@@ -741,7 +741,7 @@ String SwTOXPara::GetURL() const
 //                        }
 //                        else
 //                        {
-//                            ASSERT( false,
+//                            OSL_ENSURE( false,
 //                                    "<SwTOXPara::GetURL()> - text node with numbering rule, but without number. This is a serious defect -> inform OD" );
 //                        }
 //                    }
@@ -809,7 +809,7 @@ void SwTOXTable::_GetText( String& rTxt, String& )
     }
     else
     {
-        ASSERT( !this, "Wo ist meine Tabelle geblieben?" )
+        OSL_ENSURE( !this, "Wo ist meine Tabelle geblieben?" );
         rTxt = SW_RESSTR( STR_TABLE_DEFNAME );
     }
 }
@@ -835,9 +835,6 @@ String SwTOXTable::GetURL() const
     }
     return aTxt;
 }
-/*-- 15.09.99 14:28:08---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 
 SwTOXAuthority::SwTOXAuthority( const SwCntntNode& rNd,
                 SwFmtFld& rField, const SwTOXInternational& rIntl ) :
@@ -864,9 +861,7 @@ USHORT SwTOXAuthority::GetLevel() const
         nRet = 1;
     return nRet;
 }
-/*-- 15.09.99 14:28:08---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwTOXAuthority::_GetText( String& rTxt, String& )
 {
     bool const isClipBoard(
@@ -874,9 +869,6 @@ void SwTOXAuthority::_GetText( String& rTxt, String& )
     rTxt = m_rField.GetFld()->ExpandField(isClipBoard);
 }
 
-/* -----------------21.09.99 12:50-------------------
-
- --------------------------------------------------*/
 void    SwTOXAuthority::FillText( SwTxtNode& rNd,
                         const SwIndex& rInsPos, USHORT nAuthField ) const
 {
@@ -903,18 +895,14 @@ void    SwTOXAuthority::FillText( SwTxtNode& rNd,
         sText = (pField->GetFieldText((ToxAuthorityField) nAuthField));
     rNd.InsertText( sText, rInsPos );
 }
-/* -----------------14.10.99 09:35-------------------
 
- --------------------------------------------------*/
 BOOL    SwTOXAuthority::operator==( const SwTOXSortTabBase& rCmp)
 {
     return nType == rCmp.nType &&
             ((SwAuthorityField*)m_rField.GetFld())->GetHandle() ==
                 ((SwAuthorityField*)((SwTOXAuthority&)rCmp).m_rField.GetFld())->GetHandle();
 }
-/* -----------------21.10.99 09:52-------------------
 
- --------------------------------------------------*/
 BOOL    SwTOXAuthority::operator<( const SwTOXSortTabBase& rBase)
 {
     BOOL bRet = FALSE;
diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx
index bedc79b1db86..ddc5725ddc08 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -139,7 +139,7 @@ void SwFmtFld::SetFld(SwField * _pField)
 
 int SwFmtFld::operator==( const SfxPoolItem& rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+    OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
     // OD 2004-05-14 #i29146# - correction: check, if <pField> and
     // <((SwFmtFld&)rAttr).GetFld()> are set.
     // OD 2004-05-14 #i29146# - items are equal, if both fields aren't set.
@@ -164,7 +164,7 @@ void SwFmtFld::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
         return;
 
     SwTxtNode* pTxtNd = (SwTxtNode*)&pTxtAttr->GetTxtNode();
-    ASSERT( pTxtNd, "wo ist denn mein Node?" );
+    OSL_ENSURE( pTxtNd, "wo ist denn mein Node?" );
     if( pNew )
     {
         switch( pNew->Which() )
@@ -292,7 +292,7 @@ SwTxtFld::~SwTxtFld( )
 void SwTxtFld::Expand() const
 {
     // Wenn das expandierte Feld sich nicht veraendert hat, wird returnt
-    ASSERT( m_pTxtNode, "SwTxtFld: where is my TxtNode?" );
+    OSL_ENSURE( m_pTxtNode, "SwTxtFld: where is my TxtNode?" );
 
     const SwField* pFld = GetFld().GetFld();
     XubString aNewExpand(
@@ -334,8 +334,8 @@ void SwTxtFld::Expand() const
 
 void SwTxtFld::CopyFld( SwTxtFld *pDest ) const
 {
-    ASSERT( m_pTxtNode, "SwTxtFld: where is my TxtNode?" );
-    ASSERT( pDest->m_pTxtNode, "SwTxtFld: where is pDest's TxtNode?" );
+    OSL_ENSURE( m_pTxtNode, "SwTxtFld: where is my TxtNode?" );
+    OSL_ENSURE( pDest->m_pTxtNode, "SwTxtFld: where is pDest's TxtNode?" );
 
     IDocumentFieldsAccess* pIDFA = m_pTxtNode->getIDocumentFieldsAccess();
     IDocumentFieldsAccess* pDestIDFA = pDest->m_pTxtNode->getIDocumentFieldsAccess();
@@ -364,7 +364,7 @@ void SwTxtFld::CopyFld( SwTxtFld *pDest ) const
             ((SwDDEFieldType*)pFldType)->IncRefCnt();
         }
 
-        ASSERT( pFldType, "unbekannter FieldType" );
+        OSL_ENSURE( pFldType, "unbekannter FieldType" );
         pFldType->Add( &rFmtFld );          // ummelden
         rFmtFld.GetFld()->ChgTyp( pFldType );
     }
@@ -387,9 +387,6 @@ void SwTxtFld::CopyFld( SwTxtFld *pDest ) const
     }
 }
 
-/* -----------------26.06.2003 13:54-----------------
-
- --------------------------------------------------*/
 void SwTxtFld::NotifyContentChange(SwFmtFld& rFmtFld)
 {
     //if not in undo section notify the change
diff --git a/sw/source/core/txtnode/atrflyin.cxx b/sw/source/core/txtnode/atrflyin.cxx
index fb997f83d066..bd765b43e937 100644
--- a/sw/source/core/txtnode/atrflyin.cxx
+++ b/sw/source/core/txtnode/atrflyin.cxx
@@ -57,7 +57,7 @@ SwFmtFlyCnt::SwFmtFlyCnt( SwFrmFmt *pFrmFmt )
 
 int __EXPORT SwFmtFlyCnt::operator==( const SfxPoolItem& rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+    OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
     return( pTxtAttr && ((SwFmtFlyCnt&)rAttr).pTxtAttr &&
             *pTxtAttr->GetStart() == *((SwFmtFlyCnt&)rAttr).pTxtAttr->GetStart() &&
             pFmt == ((SwFmtFlyCnt&)rAttr).GetFrmFmt() );
@@ -113,7 +113,7 @@ SwTxtFlyCnt::SwTxtFlyCnt( SwFmtFlyCnt& rAttr, xub_StrLen nStartPos )
 void SwTxtFlyCnt::CopyFlyFmt( SwDoc* pDoc )
 {
     SwFrmFmt* pFmt = GetFlyCnt().GetFrmFmt();
-    ASSERT( pFmt, "von welchem Format soll ich eine Kopie erzeugen?" )
+    OSL_ENSURE( pFmt, "von welchem Format soll ich eine Kopie erzeugen?" );
     // Das FlyFrmFmt muss dupliziert werden.
     // In CopyLayoutFmt (siehe doclay.cxx) wird das FlyFrmFmt erzeugt
     // und der Inhalt dupliziert.
@@ -142,7 +142,7 @@ void SwTxtFlyCnt::CopyFlyFmt( SwDoc* pDoc )
         else
         {
             pPos->nContent.Assign( 0, 0 );
-            ASSERT( !this, "CopyFlyFmt: Was fuer ein Anker?" );
+            OSL_ENSURE( !this, "CopyFlyFmt: Was fuer ein Anker?" );
         }
     }
 
@@ -235,12 +235,12 @@ SwFlyInCntFrm *SwTxtFlyCnt::_GetFlyFrm( const SwFrm *pCurrFrm )
     SwFrmFmt* pFrmFmt = GetFlyCnt().GetFrmFmt();
     if( RES_DRAWFRMFMT == pFrmFmt->Which() )
     {
-        ASSERT(  !this, "SwTxtFlyCnt::_GetFlyFrm: DrawInCnt-Baustelle!" );
+        OSL_ENSURE(  !this, "SwTxtFlyCnt::_GetFlyFrm: DrawInCnt-Baustelle!" );
         return NULL;
     }
 
     SwClientIter aIter( *GetFlyCnt().pFmt );
-    ASSERT( pCurrFrm->IsTxtFrm(), "SwTxtFlyCnt::_GetFlyFrm for TxtFrms only." );
+    OSL_ENSURE( pCurrFrm->IsTxtFrm(), "SwTxtFlyCnt::_GetFlyFrm for TxtFrms only." );
 
     if( aIter.GoStart() )
     {
diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx
index 56d866911d7a..d9be255d1d02 100644
--- a/sw/source/core/txtnode/atrftn.cxx
+++ b/sw/source/core/txtnode/atrftn.cxx
@@ -35,7 +35,7 @@
 #define _SVSTDARR_USHORTSSORT
 #include <svl/svstdarr.hxx>
 #include <doc.hxx>
-#include <cntfrm.hxx>       // ASSERT in ~SwTxtFtn()
+#include <cntfrm.hxx>       // OSL_ENSURE(in ~SwTxtFtn()
 #include <pagefrm.hxx>      // RemoveFtn()
 #include <fmtftn.hxx>
 #include <txtftn.hxx>
@@ -71,7 +71,7 @@ SwFmtFtn::SwFmtFtn( bool bEndNote )
 
 int SwFmtFtn::operator==( const SfxPoolItem& rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+    OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
     return nNumber  == ((SwFmtFtn&)rAttr).nNumber &&
            aNumber  == ((SwFmtFtn&)rAttr).aNumber &&
            m_bEndNote == ((SwFmtFtn&)rAttr).m_bEndNote;
@@ -271,7 +271,7 @@ void SwTxtFtn::SetNumber( const USHORT nNewNum, const XubString* pStr )
         rFtn.aNumber = aEmptyStr;
     }
 
-    ASSERT( m_pTxtNode, "SwTxtFtn: where is my TxtNode?" );
+    OSL_ENSURE( m_pTxtNode, "SwTxtFtn: where is my TxtNode?" );
     SwNodes &rNodes = m_pTxtNode->GetDoc()->GetNodes();
     m_pTxtNode->Modify( 0, &rFtn );
     if ( m_pStartNode )
@@ -366,7 +366,7 @@ void SwTxtFtn::MakeNewTextSection( SwNodes& rNodes )
 void SwTxtFtn::DelFrms()
 {
     // delete the FtnFrames from the pages
-    ASSERT( m_pTxtNode, "SwTxtFtn: where is my TxtNode?" );
+    OSL_ENSURE( m_pTxtNode, "SwTxtFtn: where is my TxtNode?" );
     if ( !m_pTxtNode )
         return;
 
@@ -405,7 +405,7 @@ void SwTxtFtn::DelFrms()
                 SwFtnFrm *pFtn = (SwFtnFrm*)pFrm;
                 while ( pFtn && pFtn->GetMaster() )
                     pFtn = pFtn->GetMaster();
-                ASSERT( pFtn->GetAttr() == this, "Ftn mismatch error." );
+                OSL_ENSURE( pFtn->GetAttr() == this, "Ftn mismatch error." );
 
                 while ( pFtn )
                 {
diff --git a/sw/source/core/txtnode/atrref.cxx b/sw/source/core/txtnode/atrref.cxx
index 65cfac27bdb6..b9c66e4b782f 100644
--- a/sw/source/core/txtnode/atrref.cxx
+++ b/sw/source/core/txtnode/atrref.cxx
@@ -62,7 +62,7 @@ SwFmtRefMark::SwFmtRefMark( const SwFmtRefMark& rAttr )
 
 int SwFmtRefMark::operator==( const SfxPoolItem& rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+    OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
     return aRefName == ((SwFmtRefMark&)rAttr).aRefName;
 }
 
diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx
index faa408065dcb..2d27ec119286 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -101,7 +101,7 @@ SwFmtCharFmt::~SwFmtCharFmt() {}
 
 int SwFmtCharFmt::operator==( const SfxPoolItem& rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+    OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
     return GetCharFmt() == ((SwFmtCharFmt&)rAttr).GetCharFmt();
 }
 
@@ -167,7 +167,7 @@ SwFmtAutoFmt::~SwFmtAutoFmt()
 
 int SwFmtAutoFmt::operator==( const SfxPoolItem& rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( rAttr ), "different attributes" );
+    OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "different attributes" );
     return mpHandle == ((SwFmtAutoFmt&)rAttr).mpHandle;
 }
 
@@ -242,7 +242,7 @@ SwFmtINetFmt::~SwFmtINetFmt()
 
 int SwFmtINetFmt::operator==( const SfxPoolItem& rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+    OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
     BOOL bRet = SfxPoolItem::operator==( (SfxPoolItem&) rAttr )
                 && aURL == ((SwFmtINetFmt&)rAttr).aURL
                 && aName == ((SwFmtINetFmt&)rAttr).aName
@@ -491,7 +491,7 @@ SwFmtRuby& SwFmtRuby::operator=( const SwFmtRuby& rAttr )
 
 int SwFmtRuby::operator==( const SfxPoolItem& rAttr ) const
 {
-    ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+    OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
     return sRubyTxt == ((SwFmtRuby&)rAttr).sRubyTxt &&
            sCharFmtName == ((SwFmtRuby&)rAttr).sCharFmtName &&
            nCharFmtId == ((SwFmtRuby&)rAttr).nCharFmtId &&
@@ -594,7 +594,7 @@ SwFmtMeta::SwFmtMeta(const USHORT i_nWhich)
     , m_pMeta()
     , m_pTxtAttr( 0 )
 {
-    ASSERT((RES_TXTATR_META == i_nWhich) || (RES_TXTATR_METAFIELD == i_nWhich),
+   OSL_ENSURE((RES_TXTATR_META == i_nWhich) || (RES_TXTATR_METAFIELD == i_nWhich),
             "ERROR: SwFmtMeta: invalid which id!");
 }
 
@@ -604,9 +604,9 @@ SwFmtMeta::SwFmtMeta( ::boost::shared_ptr< ::sw::Meta > const & i_pMeta,
     , m_pMeta( i_pMeta )
     , m_pTxtAttr( 0 )
 {
-    ASSERT((RES_TXTATR_META == i_nWhich) || (RES_TXTATR_METAFIELD == i_nWhich),
+   OSL_ENSURE((RES_TXTATR_META == i_nWhich) || (RES_TXTATR_METAFIELD == i_nWhich),
             "ERROR: SwFmtMeta: invalid which id!");
-    ASSERT(m_pMeta, "SwFmtMeta: no Meta ?");
+    OSL_ENSURE(m_pMeta, "SwFmtMeta: no Meta ?");
     // DO NOT call m_pMeta->SetFmtMeta(this) here; only from SetTxtAttr!
 }
 
@@ -620,7 +620,7 @@ SwFmtMeta::~SwFmtMeta()
 
 int SwFmtMeta::operator==( const SfxPoolItem & i_rOther ) const
 {
-    ASSERT( SfxPoolItem::operator==( i_rOther ), "i just copied this assert" );
+    OSL_ENSURE( SfxPoolItem::operator==( i_rOther ), "i just copied this assert" );
     return SfxPoolItem::operator==( i_rOther )
         && (m_pMeta == static_cast<SwFmtMeta const &>( i_rOther ).m_pMeta);
 }
@@ -634,12 +634,12 @@ SfxPoolItem * SwFmtMeta::Clone( SfxItemPool * /*pPool*/ ) const
 
 void SwFmtMeta::SetTxtAttr(SwTxtMeta * const i_pTxtAttr)
 {
-    ASSERT(!(m_pTxtAttr && i_pTxtAttr),
+    OSL_ENSURE(!(m_pTxtAttr && i_pTxtAttr),
         "SwFmtMeta::SetTxtAttr: already has text attribute?");
-    ASSERT(  m_pTxtAttr || i_pTxtAttr ,
+    OSL_ENSURE(  m_pTxtAttr || i_pTxtAttr ,
         "SwFmtMeta::SetTxtAttr: no attribute to remove?");
     m_pTxtAttr = i_pTxtAttr;
-    ASSERT(m_pMeta, "inserted SwFmtMeta has no sw::Meta?");
+    OSL_ENSURE(m_pMeta, "inserted SwFmtMeta has no sw::Meta?");
     // the sw::Meta must be able to find the current text attribute!
     if (i_pTxtAttr && m_pMeta)
     {
@@ -651,7 +651,7 @@ void SwFmtMeta::NotifyChangeTxtNode(SwTxtNode *const pTxtNode)
 {
     // N.B.: do not reset m_pTxtAttr here: see call in nodes.cxx,
     // where the hint is not deleted!
-    ASSERT(m_pMeta, "NotifyRemoval: no meta ?");
+    OSL_ENSURE(m_pMeta, "NotifyRemoval: no meta ?");
     if (m_pMeta)
     {
         if (!pTxtNode)
@@ -671,7 +671,7 @@ void SwFmtMeta::NotifyChangeTxtNode(SwTxtNode *const pTxtNode)
 // and if it is not called when copying, total chaos will undoubtedly ensue
 void SwFmtMeta::DoCopy(SwFmtMeta & rOriginalMeta)
 {
-    ASSERT(m_pMeta, "DoCopy called for SwFmtMeta with no sw::Meta?");
+    OSL_ENSURE(m_pMeta, "DoCopy called for SwFmtMeta with no sw::Meta?");
     if (m_pMeta)
     {
         const ::boost::shared_ptr< ::sw::Meta> pOriginal( m_pMeta );
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 78713022f247..8296d7c7822d 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -308,7 +308,7 @@ USHORT SwFntObj::GetFontAscent( const ViewShell *pSh, const OutputDevice& rOut )
     if ( pSh && lcl_IsFontAdjustNecessary( rOut, rRefDev ) )
     {
         CreateScrFont( *pSh, rOut );
-        ASSERT( USHRT_MAX != nScrAscent, "nScrAscent is going berzerk" )
+        OSL_ENSURE( USHRT_MAX != nScrAscent, "nScrAscent is going berzerk" );
         nRet = nScrAscent;
     }
     else
@@ -331,7 +331,7 @@ USHORT SwFntObj::GetFontAscent( const ViewShell *pSh, const OutputDevice& rOut )
     nRet += GetFontLeading( pSh, rRefDev );
 #endif
 
-    ASSERT( USHRT_MAX != nRet, "GetFontAscent returned USHRT_MAX" )
+    OSL_ENSURE( USHRT_MAX != nRet, "GetFontAscent returned USHRT_MAX" );
     return nRet;
 }
 
@@ -355,7 +355,7 @@ USHORT SwFntObj::GetFontHeight( const ViewShell* pSh, const OutputDevice& rOut )
     if ( pSh && lcl_IsFontAdjustNecessary( rOut, rRefDev ) )
     {
         CreateScrFont( *pSh, rOut );
-        ASSERT( USHRT_MAX != nScrHeight, "nScrHeight is going berzerk" )
+        OSL_ENSURE( USHRT_MAX != nScrHeight, "nScrHeight is going berzerk" );
         nRet = nScrHeight + GetFontLeading( pSh, rRefDev );
     }
     else
@@ -373,7 +373,7 @@ USHORT SwFntObj::GetFontHeight( const ViewShell* pSh, const OutputDevice& rOut )
             long nTmpPrtHeight = (USHORT)aOutMet.GetAscent() + aOutMet.GetDescent();
             (void) nTmpPrtHeight;
             // #i106098#: do not compare with == here due to rounding error
-            ASSERT( abs(nTmpPrtHeight - nPrtHeight) < 3,
+            OSL_ENSURE( abs(nTmpPrtHeight - nPrtHeight) < 3,
                     "GetTextHeight != Ascent + Descent" );
 #endif
 
@@ -383,7 +383,7 @@ USHORT SwFntObj::GetFontHeight( const ViewShell* pSh, const OutputDevice& rOut )
         nRet = nPrtHeight + GetFontLeading( pSh, rRefDev );
     }
 
-    ASSERT( USHRT_MAX != nRet, "GetFontHeight returned USHRT_MAX" )
+    OSL_ENSURE( USHRT_MAX != nRet, "GetFontHeight returned USHRT_MAX" );
     return nRet;
 }
 
@@ -415,7 +415,7 @@ USHORT SwFntObj::GetFontLeading( const ViewShell *pSh, const OutputDevice& rOut
             nRet = nGuessedLeading;
     }
 
-    ASSERT( USHRT_MAX != nRet, "GetFontLeading returned USHRT_MAX" )
+    OSL_ENSURE( USHRT_MAX != nRet, "GetFontLeading returned USHRT_MAX" );
     return nRet;
 }
 
@@ -579,7 +579,7 @@ void SwFntObj::GuessLeading( const ViewShell&
                     aWinMet.GetAscent() - rMet.GetAscent() - nTmpLeading );
                 if( nDiff > 0 )
                 {
-                    ASSERT( nPrtAscent < USHRT_MAX, "GuessLeading: PrtAscent-Fault" );
+                    OSL_ENSURE( nPrtAscent < USHRT_MAX, "GuessLeading: PrtAscent-Fault" );
                     if ( nPrtAscent < USHRT_MAX )
                         nPrtAscent = nPrtAscent + (USHORT)(( 2 * nDiff ) / 5);
                 }
@@ -817,7 +817,7 @@ static void lcl_DrawLineForWrongListData(
 
 void SwFntObj::DrawText( SwDrawTextInfo &rInf )
 {
-    ASSERT( rInf.GetShell(), "SwFntObj::DrawText without shell" )
+    OSL_ENSURE( rInf.GetShell(), "SwFntObj::DrawText without shell" );
 
     OutputDevice& rRefDev = rInf.GetShell()->GetRefDev();
     OutputDevice* pWin = rInf.GetShell()->GetWin();
@@ -861,7 +861,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
     // a window. Therefore bUseSrcFont is always 0 in this case.
     //
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
     const BOOL bNoAdjust = bPrt ||
             (  pWin &&
@@ -873,15 +873,15 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
         // Printer output
         if ( OUTDEV_PRINTER == rRefDev.GetOutDevType() )
         {
-            ASSERT( bNoAdjust == 1 && bUseScrFont == 0, "Outdev Check failed" )
+            OSL_ENSURE( bNoAdjust == 1 && bUseScrFont == 0, "Outdev Check failed" );
         }
         else if ( OUTDEV_VIRDEV == rRefDev.GetOutDevType() )
         {
-            ASSERT( bNoAdjust == 0 && bUseScrFont == 1, "Outdev Check failed" )
+            OSL_ENSURE( bNoAdjust == 0 && bUseScrFont == 1, "Outdev Check failed" );
         }
         else
         {
-            ASSERT( sal_False, "Outdev Check failed" )
+            OSL_ENSURE( sal_False, "Outdev Check failed" );
         }
     }
     else if ( OUTDEV_VIRDEV == rInf.GetOut().GetOutDevType() && ! pWin )
@@ -889,15 +889,15 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
         // PDF export
         if ( OUTDEV_PRINTER == rRefDev.GetOutDevType() )
         {
-            ASSERT( bNoAdjust == 0 && bUseScrFont == 1, "Outdev Check failed" )
+            OSL_ENSURE( bNoAdjust == 0 && bUseScrFont == 1, "Outdev Check failed" );
         }
         else if ( OUTDEV_VIRDEV == rRefDev.GetOutDevType() )
         {
-            ASSERT( bNoAdjust == 0 && bUseScrFont == 1, "Outdev Check failed" )
+            OSL_ENSURE( bNoAdjust == 0 && bUseScrFont == 1, "Outdev Check failed" );
         }
         else
         {
-            ASSERT( sal_False, "Outdev Check failed" )
+            OSL_ENSURE( sal_False, "Outdev Check failed" );
         }
     }
     else if ( OUTDEV_WINDOW == rInf.GetOut().GetOutDevType() ||
@@ -906,30 +906,30 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
         // Window or virtual window
         if ( OUTDEV_PRINTER == rRefDev.GetOutDevType() )
         {
-            ASSERT( bNoAdjust == 0 && bUseScrFont == 1, "Outdev Check failed" )
+            OSL_ENSURE( bNoAdjust == 0 && bUseScrFont == 1, "Outdev Check failed" );
         }
         else if ( OUTDEV_VIRDEV == rRefDev.GetOutDevType() )
         {
-            ASSERT( bNoAdjust == 0 && bUseScrFont == 1, "Outdev Check failed" )
+            OSL_ENSURE( bNoAdjust == 0 && bUseScrFont == 1, "Outdev Check failed" );
         }
         else if ( OUTDEV_WINDOW == rRefDev.GetOutDevType() )
         {
-            ASSERT( bNoAdjust == 1 && bUseScrFont == 0, "Outdev Check failed" )
+            OSL_ENSURE( bNoAdjust == 1 && bUseScrFont == 0, "Outdev Check failed" );
         }
         else
         {
-            ASSERT( sal_False, "Outdev Check failed" )
+            OSL_ENSURE( sal_False, "Outdev Check failed" );
         }
     }
     else
     {
-            ASSERT( sal_False, "Outdev Check failed" )
+            OSL_ENSURE( sal_False, "Outdev Check failed" );
     }
 
 #endif
 
     // robust: better use the printer font instead of using no font at all
-    ASSERT( pTmpFont, "No screen or printer font?" );
+    OSL_ENSURE( pTmpFont, "No screen or printer font?" );
     if ( ! pTmpFont )
         pTmpFont = pPrtFont;
 
@@ -1457,7 +1457,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
                                     rInf.GetIdx(), rInf.GetLen() );
 
         // OLE: no printer available
-        // ASSERT( pPrinter, "DrawText needs pPrinter" )
+        // OSL_ENSURE( pPrinter, "DrawText needs pPrinter" )
         if ( pPrinter )
         {
             // pTmpFont has already been set as current font for rInf.GetOut()
@@ -1648,7 +1648,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
             {
                 nCh = rInf.GetText().GetChar( rInf.GetIdx() + i );
 
-                ASSERT( pScrArray, "Where is the screen array?" )
+                OSL_ENSURE( pScrArray, "Where is the screen array?" );
                 long nScr;
                 nScr = pScrArray[ i ] - pScrArray[ i - 1 ];
 
@@ -1912,9 +1912,9 @@ Size SwFntObj::GetTextSize( SwDrawTextInfo& rInf )
             aTxtSize.Width() =
                     pOutDev->GetTextWidth( rInf.GetText(), rInf.GetIdx(), nLn );
 
-            ASSERT( !rInf.GetShell() ||
+            OSL_ENSURE( !rInf.GetShell() ||
                     ( USHRT_MAX != GetGuessedLeading() && USHRT_MAX != GetExtLeading() ),
-                "Leading values should be already calculated" )
+                "Leading values should be already calculated" );
             aTxtSize.Height() = pOutDev->GetTextHeight() +
                                 GetFontLeading( rInf.GetShell(), rInf.GetOut() );
 
@@ -1973,7 +1973,7 @@ Size SwFntObj::GetTextSize( SwDrawTextInfo& rInf )
                            rInf.GetScriptInfo()->CountCompChg() &&
                            lcl_IsMonoSpaceFont( rInf.GetOut() );
 
-    ASSERT( !bCompress || ( rInf.GetScriptInfo() && rInf.GetScriptInfo()->
+    OSL_ENSURE( !bCompress || ( rInf.GetScriptInfo() && rInf.GetScriptInfo()->
             CountCompChg()), "Compression without info" );
 
     // This is the part used e.g., for cursor travelling
@@ -2076,9 +2076,9 @@ Size SwFntObj::GetTextSize( SwDrawTextInfo& rInf )
     if ( rInf.GetKern() && nLn )
         aTxtSize.Width() += ( nLn - 1 ) * long( rInf.GetKern() );
 
-    ASSERT( !rInf.GetShell() ||
+    OSL_ENSURE( !rInf.GetShell() ||
             ( USHRT_MAX != GetGuessedLeading() && USHRT_MAX != GetExtLeading() ),
-              "Leading values should be already calculated" )
+              "Leading values should be already calculated" );
     aTxtSize.Height() += GetFontLeading( rInf.GetShell(), rInf.GetOut() );
     return aTxtSize;
 }
@@ -2378,14 +2378,14 @@ SwFntAccess::SwFntAccess( const void* &rMagic,
             // SwFont sein, spaeter wird als Owner die "MagicNumber" gehalten.
             SwCacheAccess::pOwner = pOwn;
             pFntObj = Get(); // hier wird via NewObj() angelegt und gelockt.
-            ASSERT(pFntObj, "No Font, no Fun.");
+            OSL_ENSURE(pFntObj, "No Font, no Fun.");
         }
         else  // Font has been found, so we lock it.
         {
             pFntObj->Lock();
             if( pFntObj->pPrinter != pOut ) // Falls bis dato kein Drucker bekannt
             {
-                ASSERT( !pFntObj->pPrinter, "SwFntAccess: Printer Changed" );
+                OSL_ENSURE( !pFntObj->pPrinter, "SwFntAccess: Printer Changed" );
                 pFntObj->CreatePrtFont( *pOut );
                 pFntObj->pPrinter = pOut;
                 pFntObj->pScrFont = NULL;
@@ -2428,7 +2428,7 @@ xub_StrLen SwFont::GetTxtBreak( SwDrawTextInfo& rInf, long nTextWidth )
                            rInf.GetScriptInfo()->CountCompChg() &&
                            lcl_IsMonoSpaceFont( rInf.GetOut() );
 
-    ASSERT( !bCompress || ( rInf.GetScriptInfo() && rInf.GetScriptInfo()->
+    OSL_ENSURE( !bCompress || ( rInf.GetScriptInfo() && rInf.GetScriptInfo()->
             CountCompChg()), "Compression without info" );
 
     USHORT nTxtBreak = 0;
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index f8efc733165a..38d69deb2c63 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -88,7 +88,7 @@ xub_StrLen lcl_CalcCaseMap( const SwFont& rFnt,
 {
     int j = 0;
     const xub_StrLen nEnd = nOfst + nLen;
-    ASSERT( nEnd <= rOrigString.Len(), "lcl_CalcCaseMap: Wrong parameters" )
+    OSL_ENSURE( nEnd <= rOrigString.Len(), "lcl_CalcCaseMap: Wrong parameters" );
 
     // special case for title case:
     const bool bTitle = SVX_CASEMAP_TITEL == rFnt.GetCaseMap() &&
@@ -319,7 +319,7 @@ void SwDoDrawCapital::Do()
         rInf.SetBullet( bOldBullet );
     }
 
-    ASSERT( pUpperFnt, "No upper font, dying soon!");
+    OSL_ENSURE( pUpperFnt, "No upper font, dying soon!");
     rInf.Shift( pUpperFnt->GetFont()->GetOrientation() );
     rInf.SetWidth( nOrgWidth );
 }
@@ -557,7 +557,7 @@ void SwSubFont::DrawStretchCapital( SwDrawTextInfo &rInf )
 
 void SwSubFont::DoOnCapitals( SwDoCapitals &rDo )
 {
-    ASSERT( pLastFont, "SwFont::DoOnCapitals: No LastFont?!" );
+    OSL_ENSURE( pLastFont, "SwFont::DoOnCapitals: No LastFont?!" );
 
     Size aPartSize;
     long nKana = 0;
@@ -696,8 +696,8 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo )
                pBreakIt->GetLocale( eLng ), CharType::LOWERCASE_LETTER);
         if( nPos == STRING_LEN || nPos > nMaxPos )
             nPos = nMaxPos;
-        ASSERT( nPos, "nextCharBlock not implemented?" );
-#ifdef DBG_UTIL
+        OSL_ENSURE( nPos, "nextCharBlock not implemented?" );
+#if OSL_DEBUG_LEVEL > 1
         if( !nPos )
             nPos = nMaxPos;
 #endif
@@ -810,8 +810,8 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo )
                pBreakIt->GetLocale( eLng ), CharType::LOWERCASE_LETTER);
         if( nPos == STRING_LEN || nPos > nMaxPos )
             nPos = nMaxPos;
-        ASSERT( nPos, "endOfCharBlock not implemented?" );
-#ifdef DBG_UTIL
+        OSL_ENSURE( nPos, "endOfCharBlock not implemented?" );
+#if OSL_DEBUG_LEVEL > 1
         if( !nPos )
             nPos = nMaxPos;
 #endif
diff --git a/sw/source/core/txtnode/makefile.mk b/sw/source/core/txtnode/makefile.mk
index f03f96c42674..066abd7517ac 100644
--- a/sw/source/core/txtnode/makefile.mk
+++ b/sw/source/core/txtnode/makefile.mk
@@ -43,39 +43,30 @@ CDEFS+=-Dmydebug
 # --- Files --------------------------------------------------------
 
 SLOFILES =  \
+        $(EXCEPTIONSFILES) \
+        $(SLO)$/atrref.obj \
+        $(SLO)$/chrfmt.obj \
+        $(SLO)$/modeltoviewhelper.obj \
+        $(SLO)$/ndhints.obj \
+        $(SLO)$/txatbase.obj
+
+EXCEPTIONSFILES = \
+        $(SLO)$/SwGrammarContact.obj \
         $(SLO)$/atrfld.obj \
         $(SLO)$/atrflyin.obj \
         $(SLO)$/atrftn.obj \
-        $(SLO)$/atrref.obj \
         $(SLO)$/atrtox.obj \
-        $(SLO)$/chrfmt.obj \
         $(SLO)$/fmtatr2.obj \
-        $(SLO)$/fntcap.obj \
         $(SLO)$/fntcache.obj \
-        $(SLO)$/swfntcch.obj \
-        $(SLO)$/SwGrammarContact.obj \
-                $(SLO)$/modeltoviewhelper.obj \
-                $(SLO)$/ndhints.obj \
+        $(SLO)$/fntcap.obj \
         $(SLO)$/ndtxt.obj \
+        $(SLO)$/swfntcch.obj \
         $(SLO)$/swfont.obj \
         $(SLO)$/thints.obj \
-        $(SLO)$/txatbase.obj \
         $(SLO)$/txatritr.obj \
         $(SLO)$/txtatr2.obj \
-                $(SLO)$/txtedt.obj
-
-
-EXCEPTIONSFILES = \
-        $(SLO)$/fmtatr2.obj \
-        $(SLO)$/atrtox.obj \
-        $(SLO)$/atrflyin.obj \
-        $(SLO)$/docnew.obj \
-        $(SLO)$/fntcache.obj \
-        $(SLO)$/ndtxt.obj \
-        $(SLO)$/thints.obj \
         $(SLO)$/txtedt.obj
 
-
 .IF "$(dbutil)" != ""
 OFILES+=$(SLO)$/dbchratr.$(QBJX)
 .ENDIF
diff --git a/sw/source/core/txtnode/ndhints.cxx b/sw/source/core/txtnode/ndhints.cxx
index b6806be5917b..48293a96584f 100644
--- a/sw/source/core/txtnode/ndhints.cxx
+++ b/sw/source/core/txtnode/ndhints.cxx
@@ -35,7 +35,7 @@
 #include "ndhints.hxx"
 #include <txtatr.hxx>
 
-#ifndef PRODUCT
+#if OSL_DEBUG_LEVEL > 1
 #include <pam.hxx>
 #endif
 
@@ -48,7 +48,7 @@ _SV_IMPL_SORTAR_ALG( SwpHtEnd, SwTxtAttr* )
 void DumpHints( const SwpHtStart &rHtStart,
                 const SwpHtEnd &rHtEnd )
 {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     aDbstream << "DumpHints:" << endl;
     (aDbstream << "\tStarts:" ).WriteNumber(rHtStart.Count()) << endl;
     for( USHORT i = 0; i < rHtStart.Count(); ++i )
@@ -114,7 +114,7 @@ static BOOL lcl_IsLessStart( const SwTxtAttr &rHt1, const SwTxtAttr &rHt2 )
                 {
                     const USHORT nS1 = static_cast<const SwTxtCharFmt&>(rHt1).GetSortNumber();
                     const USHORT nS2 = static_cast<const SwTxtCharFmt&>(rHt2).GetSortNumber();
-                    ASSERT( nS1 != nS2, "AUTOSTYLES: lcl_IsLessStart trouble" )
+                    OSL_ENSURE( nS1 != nS2, "AUTOSTYLES: lcl_IsLessStart trouble" );
                     if ( nS1 != nS2 ) // robust
                         return nS1 < nS2;
                 }
@@ -150,7 +150,7 @@ static BOOL lcl_IsLessEnd( const SwTxtAttr &rHt1, const SwTxtAttr &rHt2 )
                 {
                     const USHORT nS1 = static_cast<const SwTxtCharFmt&>(rHt1).GetSortNumber();
                     const USHORT nS2 = static_cast<const SwTxtCharFmt&>(rHt2).GetSortNumber();
-                    ASSERT( nS1 != nS2, "AUTOSTYLES: lcl_IsLessEnd trouble" )
+                    OSL_ENSURE( nS1 != nS2, "AUTOSTYLES: lcl_IsLessEnd trouble" );
                     if ( nS1 != nS2 ) // robust
                         return nS1 > nS2;
                 }
@@ -245,16 +245,16 @@ BOOL SwpHtEnd::Seek_Entry( const SwTxtAttr *pElement, USHORT *pPos ) const
 void SwpHintsArray::Insert( const SwTxtAttr *pHt )
 {
     Resort();
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     USHORT nPos;
-    ASSERT(!m_HintStarts.Seek_Entry( pHt, &nPos ),
+    OSL_ENSURE(!m_HintStarts.Seek_Entry( pHt, &nPos ),
             "Insert: hint already in HtStart");
-    ASSERT(!m_HintEnds.Seek_Entry( pHt, &nPos ),
+    OSL_ENSURE(!m_HintEnds.Seek_Entry( pHt, &nPos ),
             "Insert: hint already in HtEnd");
 #endif
     m_HintStarts.Insert( pHt );
     m_HintEnds.Insert( pHt );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 #ifdef NIE
     (aDbstream << "Insert: " ).WriteNumber( long( pHt ) ) << endl;
     DumpHints( m_HintStarts, m_HintEnds );
@@ -273,7 +273,7 @@ void SwpHintsArray::DeleteAtPos( const USHORT nPos )
     USHORT nEndPos;
     m_HintEnds.Seek_Entry( pHt, &nEndPos );
     m_HintEnds.Remove( nEndPos );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 #ifdef NIE
     (aDbstream << "DeleteAtPos: " ).WriteNumber( long( pHt ) ) << endl;
     DumpHints( m_HintStarts, m_HintEnds );
@@ -281,7 +281,7 @@ void SwpHintsArray::DeleteAtPos( const USHORT nPos )
 #endif
 }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
 /*************************************************************************
  *                      SwpHintsArray::Check()
@@ -291,7 +291,7 @@ void SwpHintsArray::DeleteAtPos( const USHORT nPos )
 #define CHECK_ERR(cond, text) \
         if(!(cond)) \
         { \
-            ASSERT(!this, text); \
+            OSL_ENSURE(!this, text); \
             DumpHints(m_HintStarts, m_HintEnds); \
             return !(const_cast<SwpHintsArray*>(this))->Resort(); \
         }
@@ -447,8 +447,8 @@ bool SwpHintsArray::Resort()
         if( pLast && !lcl_IsLessStart( *pLast, *pHt ) )
         {
 #ifdef NIE
-#ifdef DBG_UTIL
-//            ASSERT( bResort, "!Resort/Start: correcting hints-array" );
+#if OSL_DEBUG_LEVEL > 1
+//            OSL_ENSURE( bResort, "!Resort/Start: correcting hints-array" );
             aDbstream << "Resort: Starts" << endl;
             DumpHints( m_HintStarts, m_HintEnds );
 #endif
@@ -470,7 +470,7 @@ bool SwpHintsArray::Resort()
         if( pLast && !lcl_IsLessEnd( *pLast, *pHt ) )
         {
 #ifdef NIE
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
             aDbstream << "Resort: Ends" << endl;
             DumpHints( m_HintStarts, m_HintEnds );
 #endif
@@ -486,7 +486,7 @@ bool SwpHintsArray::Resort()
         }
         pLast = pHt;
     }
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 #ifdef NIE
     aDbstream << "Resorted:" << endl;
     DumpHints( m_HintStarts, m_HintEnds );
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 61faf03c4cf4..a242e6cd8633 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -103,7 +103,7 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1)
 // Leider ist das SwpHints nicht ganz wasserdicht:
 // Jeder darf an den Hints rumfummeln, ohne die Sortierreihenfolge
 // und Verkettung sicherstellen zu muessen.
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 #define CHECK_SWPHINTS(pNd)  { if( pNd->GetpSwpHints() && \
                                    !pNd->GetDoc()->IsInReading() ) \
                                   pNd->GetpSwpHints()->Check(); }
@@ -115,7 +115,7 @@ SwTxtNode *SwNodes::MakeTxtNode( const SwNodeIndex & rWhere,
                                  SwTxtFmtColl *pColl,
                                  SwAttrSet* pAutoAttr )
 {
-    ASSERT( pColl, "Collectionpointer ist 0." );
+    OSL_ENSURE( pColl, "Collectionpointer ist 0." );
 
     SwTxtNode *pNode = new SwTxtNode( rWhere, pColl, pAutoAttr );
 
@@ -312,7 +312,7 @@ void lcl_ChangeFtnRef( SwTxtNode &rNode )
                         return;
                 }
                 SwTxtFtn *pAttr = (SwTxtFtn*)pHt;
-                ASSERT( pAttr->GetStartNode(), "FtnAtr ohne StartNode." );
+                OSL_ENSURE( pAttr->GetStartNode(), "FtnAtr ohne StartNode." );
                 SwNodeIndex aIdx( *pAttr->GetStartNode(), 1 );
                 SwCntntNode *pNd = aIdx.GetNode().GetCntntNode();
                 if ( !pNd )
@@ -324,7 +324,7 @@ void lcl_ChangeFtnRef( SwTxtNode &rNode )
                 SwCntntFrm* pCntnt = (SwCntntFrm*)aIter.First(TYPE(SwCntntFrm));
                 if( pCntnt )
                 {
-                    ASSERT( pCntnt->FindRootFrm() == pFrm->FindRootFrm(),
+                    OSL_ENSURE( pCntnt->FindRootFrm() == pFrm->FindRootFrm(),
                             "lcl_ChangeFtnRef: Layout double?" );
                     SwFtnFrm *pFtn = pCntnt->FindFtnFrm();
                     if( pFtn && pFtn->GetAttr() == pAttr )
@@ -340,11 +340,11 @@ void lcl_ChangeFtnRef( SwTxtNode &rNode )
                             ((SwTxtFrm*)pFrm)->SetFtn( TRUE );
                         }
                     }
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
                     while( 0 != (pCntnt = (SwCntntFrm*)aIter.Next()) )
                     {
                         SwFtnFrm *pDbgFtn = pCntnt->FindFtnFrm();
-                        ASSERT( !pDbgFtn || pDbgFtn->GetRef() == pFrm,
+                        OSL_ENSURE( !pDbgFtn || pDbgFtn->GetRef() == pFrm,
                                 "lcl_ChangeFtnRef: Who's that guy?" );
                     }
 #endif
@@ -607,7 +607,7 @@ SwCntntNode *SwTxtNode::SplitCntntNode( const SwPosition &rPos )
 
 void SwTxtNode::MoveTxtAttr_To_AttrSet()
 {
-    ASSERT( m_pSwpHints, "MoveTxtAttr_To_AttrSet without SwpHints?" );
+    OSL_ENSURE( m_pSwpHints, "MoveTxtAttr_To_AttrSet without SwpHints?" );
     for ( USHORT i = 0; m_pSwpHints && i < m_pSwpHints->Count(); ++i )
     {
         SwTxtAttr *pHt = m_pSwpHints->GetTextHint(i);
@@ -723,7 +723,7 @@ SwCntntNode *SwTxtNode::JoinNext()
         InvalidateNumRule();
     }
     else {
-        ASSERT( FALSE, "kein TxtNode." );
+        OSL_ENSURE( FALSE, "kein TxtNode." );
     }
 
     return this;
@@ -818,7 +818,7 @@ SwCntntNode *SwTxtNode::JoinPrev()
         InvalidateNumRule();
     }
     else {
-        ASSERT( FALSE, "kein TxtNode." );
+        OSL_ENSURE( FALSE, "kein TxtNode." );
     }
 
     return this;
@@ -827,7 +827,7 @@ SwCntntNode *SwTxtNode::JoinPrev()
 // erzeugt einen AttrSet mit Bereichen fuer Frame-/Para/Char-Attributen
 void SwTxtNode::NewAttrSet( SwAttrPool& rPool )
 {
-    ASSERT( !mpAttrSet.get(), "AttrSet ist doch gesetzt" );
+    OSL_ENSURE( !mpAttrSet.get(), "AttrSet ist doch gesetzt" );
     SwAttrSet aNewAttrSet( rPool, aTxtNodeSetRange );
 
     // put names of parent style and conditional style:
@@ -930,7 +930,7 @@ void SwTxtNode::Update( SwIndex const & rPos, const xub_StrLen nChangeLen,
                         USHORT nWhPos;
                         const USHORT nWhich = pHint->Which();
 
-                        ASSERT(!isCHRATR(nWhich), "Update: char attr hint?");
+                        OSL_ENSURE(!isCHRATR(nWhich), "Update: char attr hint?");
                         if (isCHRATR(nWhich) || isTXTATR_WITHEND(nWhich))
                         {
                             nWhPos = static_cast<USHORT>(nWhich -
@@ -1077,7 +1077,7 @@ void SwTxtNode::_ChgTxtCollUpdateNum( const SwTxtFmtColl *pOldColl,
                                         const SwTxtFmtColl *pNewColl)
 {
     SwDoc* pDoc = GetDoc();
-    ASSERT( pDoc, "Kein Doc?" );
+    OSL_ENSURE( pDoc, "Kein Doc?" );
     // erfrage die OutlineLevel und update gegebenenfalls das Nodes-Array,
     // falls sich die Level geaendert haben !
     const int nOldLevel = pOldColl && pOldColl->IsAssignedToListLevelOfOutlineStyle() ?
@@ -1200,7 +1200,7 @@ lcl_GetTxtAttrs(
         }
 
         xub_StrLen const*const pEndIdx = pHint->GetEnd();
-        ASSERT(pEndIdx || pHint->HasDummyChar(),
+        OSL_ENSURE(pEndIdx || pHint->HasDummyChar(),
                 "hint with no end and no dummy char?");
             // Wenn bExpand gesetzt ist, wird das Verhalten bei Eingabe
             // simuliert, d.h. der Start wuede verschoben, das Ende expandiert,
@@ -1243,7 +1243,7 @@ SwTxtAttr *
 SwTxtNode::GetTxtAttrAt(xub_StrLen const nIndex, RES_TXTATR const nWhich,
                         enum GetTxtAttrMode const eMode) const
 {
-    ASSERT(    (nWhich == RES_TXTATR_META)
+    OSL_ENSURE(    (nWhich == RES_TXTATR_META)
             || (nWhich == RES_TXTATR_METAFIELD)
             || (nWhich == RES_TXTATR_AUTOFMT)
             || (nWhich == RES_TXTATR_INETFMT)
@@ -1279,12 +1279,12 @@ SwCharFmt* lcl_FindCharFmt( const SwCharFmts* pCharFmts, const XubString& rName
 void lcl_CopyHint( const USHORT nWhich, const SwTxtAttr * const pHt,
     SwTxtAttr *const pNewHt, SwDoc *const pOtherDoc, SwTxtNode *const pDest )
 {
-    ASSERT( nWhich == pHt->Which(), "Falsche Hint-Id" );
+    OSL_ENSURE( nWhich == pHt->Which(), "Falsche Hint-Id" );
     switch( nWhich )
     {
         // copy nodesarray section with footnote content
         case RES_TXTATR_FTN :
-            ASSERT(pDest, "lcl_CopyHint: no destination text node?");
+            OSL_ENSURE(pDest, "lcl_CopyHint: no destination text node?");
             static_cast<const SwTxtFtn*>(pHt)->CopyFtn(
                 *static_cast<SwTxtFtn*>(pNewHt), *pDest);
             break;
@@ -1385,8 +1385,8 @@ void lcl_CopyHint( const USHORT nWhich, const SwTxtAttr * const pHt,
         }
         case RES_TXTATR_META:
         case RES_TXTATR_METAFIELD:
-            ASSERT(pNewHt, "copying META should not fail! cannot call DoCopy");
-            ASSERT(pDest && (CH_TXTATR_INWORD ==
+            OSL_ENSURE(pNewHt, "copying META should not fail! cannot call DoCopy");
+            OSL_ENSURE(pDest && (CH_TXTATR_INWORD ==
                                 pDest->GetTxt().GetChar(*pNewHt->GetStart())),
                    "missing CH_TXTATR?");
             if (pNewHt)
@@ -1727,8 +1727,8 @@ void SwTxtNode::CopyText( SwTxtNode *const pDest,
 void SwTxtNode::InsertText( const XubString & rStr, const SwIndex & rIdx,
         const IDocumentContentOperations::InsertFlags nMode )
 {
-    ASSERT( rIdx <= m_Text.Len(), "SwTxtNode::InsertText: invalid index." );
-    ASSERT( (ULONG)m_Text.Len() + (ULONG)rStr.Len() <= STRING_LEN,
+    OSL_ENSURE( rIdx <= m_Text.Len(), "SwTxtNode::InsertText: invalid index." );
+    OSL_ENSURE( (ULONG)m_Text.Len() + (ULONG)rStr.Len() <= STRING_LEN,
             "SwTxtNode::InsertText: node text with insertion > STRING_LEN." );
 
     xub_StrLen aPos = rIdx.GetIndex();
@@ -1843,7 +1843,7 @@ void SwTxtNode::CutText( SwTxtNode * const pDest,
     }
     else
     {
-        ASSERT(false,
+        OSL_ENSURE(false,
             "mst: entering dead and bitrotted code; fasten your seatbelts!");
         EraseText( rStart, nLen );
     }
@@ -1855,7 +1855,7 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
 {
     if(!pDest)
     {
-        ASSERT(false,
+        OSL_ENSURE(false,
             "mst: entering dead and bitrotted code; fasten your seatbelts!");
         EraseText( rStart, nLen );
         return;
@@ -1864,7 +1864,7 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
     // nicht im Dokument verschieben ?
     if( GetDoc() != pDest->GetDoc() )
     {
-        ASSERT(false,
+        OSL_ENSURE(false,
             "mst: entering dead and bitrotted code; fasten your seatbelts!");
         CopyText( pDest, rDestStart, rStart, nLen);
         EraseText(rStart, nLen);
@@ -1886,7 +1886,7 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
     // wird in sich selbst verschoben, muss es gesondert behandelt werden !!
     if( pDest == this )
     {
-        ASSERT(false,
+        OSL_ENSURE(false,
             "mst: entering dead and bitrotted code; fasten your seatbelts!");
         m_Text.Insert( m_Text, nTxtStartIdx, nLen, nDestStart );
         m_Text.Erase( nTxtStartIdx + (nDestStart<nTxtStartIdx ? nLen : 0), nLen );
@@ -2050,7 +2050,7 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
         const bool bUndoNodes =
             !pOtherDoc && GetDoc()->GetUndoNds() == &GetNodes();
 
-        ASSERT(!pOtherDoc,
+        OSL_ENSURE(!pOtherDoc,
             "mst: entering dead and bitrotted code; fasten your seatbelts!");
 
         // harte Absatz umspannende Attribute kopieren
@@ -2216,7 +2216,7 @@ void SwTxtNode::CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart,
 void SwTxtNode::EraseText(const SwIndex &rIdx, const xub_StrLen nCount,
         const IDocumentContentOperations::InsertFlags nMode )
 {
-    ASSERT( rIdx <= m_Text.Len(), "SwTxtNode::EraseText: invalid index." );
+    OSL_ENSURE( rIdx <= m_Text.Len(), "SwTxtNode::EraseText: invalid index." );
 
     const xub_StrLen nStartIdx = rIdx.GetIndex();
     const xub_StrLen nCnt = (STRING_LEN == nCount)
@@ -2246,7 +2246,7 @@ void SwTxtNode::EraseText(const SwIndex &rIdx, const xub_StrLen nCount,
 
         if( !pHtEndIdx )
         {
-            ASSERT(pHt->HasDummyChar(),
+            OSL_ENSURE(pHt->HasDummyChar(),
                     "attribute with neither end nor CH_TXTATR?");
             if (isTXTATR(nWhich) &&
                 (nHintStart >= nStartIdx) && (nHintStart < nEndIdx))
@@ -2258,7 +2258,7 @@ void SwTxtNode::EraseText(const SwIndex &rIdx, const xub_StrLen nCount,
             continue;
         }
 
-        ASSERT (!( (nHintStart < nEndIdx) && (*pHtEndIdx > nEndIdx)
+       OSL_ENSURE(!( (nHintStart < nEndIdx) && (*pHtEndIdx > nEndIdx)
                     && pHt->HasDummyChar() )
                 // next line: deleting exactly dummy char: DeleteAttributes
                 || ((nHintStart == nStartIdx) && (nHintStart + 1 == nEndIdx)),
@@ -2290,7 +2290,7 @@ void SwTxtNode::EraseText(const SwIndex &rIdx, const xub_StrLen nCount,
         }
     }
 
-    ASSERT(rIdx.GetIndex() == nStartIdx, "huh? start index has changed?");
+    OSL_ENSURE(rIdx.GetIndex() == nStartIdx, "huh? start index has changed?");
 
     TryDeleteSwpHints();
 
@@ -2307,7 +2307,7 @@ void SwTxtNode::EraseText(const SwIndex &rIdx, const xub_StrLen nCount,
         SwModify::Modify( 0, &aHint );
     }
 
-    ASSERT(rIdx.GetIndex() == nStartIdx, "huh? start index has changed?");
+    OSL_ENSURE(rIdx.GetIndex() == nStartIdx, "huh? start index has changed?");
 
     // By deleting a character, the hidden flags
     // at the TxtNode can become invalid:
@@ -3263,7 +3263,7 @@ XubString SwTxtNode::GetRedlineTxt( xub_StrLen nIdx, xub_StrLen nLen,
 void SwTxtNode::ReplaceText( const SwIndex& rStart, const xub_StrLen nDelLen,
                              const XubString& rText )
 {
-    ASSERT( rStart.GetIndex() < m_Text.Len() &&
+    OSL_ENSURE( rStart.GetIndex() < m_Text.Len() &&
             rStart.GetIndex() + nDelLen <= m_Text.Len(),
             "SwTxtNode::ReplaceText: index out of bounds" );
     const xub_StrLen nStartPos = rStart.GetIndex();
@@ -3277,7 +3277,7 @@ void SwTxtNode::ReplaceText( const SwIndex& rStart, const xub_StrLen nDelLen,
             SwTxtAttr *const pHint = GetTxtAttrForCharAt( nPos );
             if (pHint)
             {
-                ASSERT (!( pHint->GetEnd() && pHint->HasDummyChar()
+               OSL_ENSURE(!( pHint->GetEnd() && pHint->HasDummyChar()
                             && (*pHint->GetStart() < nEndPos)
                             && (*pHint->GetEnd()   > nEndPos) ),
                     "ReplaceText: ERROR: "
@@ -3464,7 +3464,7 @@ namespace {
                             String::CreateFromAscii( SwNumRule::GetOutlineRuleName() ) )
                     {
                         // --> OD 2008-09-10 #i70748#
-                        ASSERT( rTxtNode.GetTxtColl()->IsAssignedToListLevelOfOutlineStyle(),
+                        OSL_ENSURE( rTxtNode.GetTxtColl()->IsAssignedToListLevelOfOutlineStyle(),
                                 "<HandleModifyAtTxtNode()> - text node with outline style, but its paragraph style is not assigned to outline style." );
                         int nNewListLevel =
                             rTxtNode.GetTxtColl()->GetAssignedOutlineStyleLevel();
@@ -3558,8 +3558,8 @@ void SwTxtNode::Modify( SfxPoolItem* pOldValue, SfxPoolItem* pNewValue )
 
 SwFmtColl* SwTxtNode::ChgFmtColl( SwFmtColl *pNewColl )
 {
-    ASSERT( pNewColl,"ChgFmtColl: Collectionpointer ist 0." );
-    ASSERT( HAS_BASE( SwTxtFmtColl, pNewColl ),
+    OSL_ENSURE( pNewColl,"ChgFmtColl: Collectionpointer ist 0." );
+    OSL_ENSURE( HAS_BASE( SwTxtFmtColl, pNewColl ),
                 "ChgFmtColl: ist kein Text-Collectionpointer." );
 
     SwTxtFmtColl *pOldColl = GetTxtColl();
@@ -3570,8 +3570,8 @@ SwFmtColl* SwTxtNode::ChgFmtColl( SwFmtColl *pNewColl )
         // --> OD 2008-03-27 #refactorlists#
 //        NumRuleChgd();
 #if OSL_DEBUG_LEVEL > 1
-        ASSERT( !mbInSetOrResetAttr,
-                "DEBUG ASSERTION - <SwTxtNode::ChgFmtColl(..)> called during <Set/ResetAttr(..)>" )
+        OSL_ENSURE( !mbInSetOrResetAttr,
+                "DEBUG OSL_ENSURE(ON - <SwTxtNode::ChgFmtColl(..)> called during <Set/ResetAttr(..)>" );
 #endif
         if ( !mbInSetOrResetAttr )
         {
@@ -3654,7 +3654,7 @@ int SwTxtNode::GetAttrOutlineLevel() const
 }
 void SwTxtNode::SetAttrOutlineLevel(int nLevel)
 {
-    ASSERT( 0 <= nLevel && nLevel <= MAXLEVEL ,"SwTxtNode: Level Out Of Range" );//#outline level,zhaojianwei
+    OSL_ENSURE( 0 <= nLevel && nLevel <= MAXLEVEL ,"SwTxtNode: Level Out Of Range" );//#outline level,zhaojianwei
     if ( 0 <= nLevel && nLevel <= MAXLEVEL )
     {
         SetAttr( SfxUInt16Item( RES_PARATR_OUTLINELEVEL,
@@ -3694,7 +3694,7 @@ void SwTxtNode::SetAttrListLevel( int nLevel )
 {
     if ( nLevel < 0 || nLevel >= MAXLEVEL )
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "<SwTxtNode::SetAttrListLevel()> - value of parameter <nLevel> is out of valid range" );
         return;
     }
@@ -3818,7 +3818,7 @@ bool SwTxtNode::HasAttrListRestartValue() const
 // <--
 SwNumberTree::tSwNumTreeNumber SwTxtNode::GetAttrListRestartValue() const
 {
-    ASSERT( HasAttrListRestartValue(),
+    OSL_ENSURE( HasAttrListRestartValue(),
             "<SwTxtNode::GetAttrListRestartValue()> - only ask for list restart value, if attribute is set at text node." );
 
     const SfxInt16Item& aListRestartValueItem =
@@ -3900,7 +3900,7 @@ void SwTxtNode::AddToList()
 {
     if ( IsInList() )
     {
-        ASSERT( false,
+        OSL_ENSURE( false,
                 "<SwTxtNode::AddToList()> - the text node is already added to a list. Serious defect -> please inform OD" );
         return;
     }
@@ -3918,7 +3918,7 @@ void SwTxtNode::AddToList()
                 pList = GetDoc()->createList( sListId, GetNumRule()->GetName() );
             }
         }
-        ASSERT( pList != 0,
+        OSL_ENSURE( pList != 0,
                 "<SwTxtNode::AddToList()> - no list for given list id. Serious defect -> please inform OD" );
         if ( pList )
         {
@@ -4061,7 +4061,7 @@ bool SwTxtNode::AreListLevelIndentsApplicable() const
             }
 
             pColl = dynamic_cast<const SwTxtFmtColl*>(pColl->DerivedFrom());
-            ASSERT( pColl,
+            OSL_ENSURE( pColl,
                     "<SwTxtNode::AreListLevelIndentsApplicable()> - something wrong in paragraph's style hierarchy. The applied list style is not found." );
         }
     }
@@ -4155,7 +4155,7 @@ XubString SwTxtNode::GetLabelFollowedBy() const
                 break;
                 default:
                 {
-                    ASSERT( false,
+                    OSL_ENSURE( false,
                             "<SwTxtNode::GetLabelFollowedBy()> - unknown SvxNumberFormat::GetLabelFollowedBy() return value" );
                 }
             }
@@ -4272,7 +4272,7 @@ namespace {
             {
                 const SfxStringItem& pListIdItem =
                                         dynamic_cast<const SfxStringItem&>(pItem);
-                ASSERT( pListIdItem.GetValue().Len() > 0,
+                OSL_ENSURE( pListIdItem.GetValue().Len() > 0,
                         "<HandleSetAttrAtTxtNode(..)> - empty list id attribute not excepted. Serious defect -> please inform OD." );
                 const String sListIdOfTxtNode = rTxtNode.GetListId();
                 if ( pListIdItem.GetValue() != sListIdOfTxtNode )
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index 1c56676eadb7..28f483a3f6ae 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -78,7 +78,7 @@
 #define FNT_ATM_HACK
 #endif
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 // globale Variable
 SvStatistics aSvStat;
 #endif
@@ -115,7 +115,7 @@ USHORT MapDirection( USHORT nDir, const BOOL bVertFormat )
             break;
 #if OSL_DEBUG_LEVEL > 1
         default :
-            ASSERT( sal_False, "Unsupported direction" );
+            OSL_ENSURE( sal_False, "Unsupported direction" );
             break;
 #endif
         }
@@ -142,7 +142,7 @@ USHORT UnMapDirection( USHORT nDir, const BOOL bVertFormat )
             break;
 #if OSL_DEBUG_LEVEL > 1
         default :
-            ASSERT( sal_False, "Unsupported direction" );
+            OSL_ENSURE( sal_False, "Unsupported direction" );
             break;
 #endif
         }
@@ -419,7 +419,7 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet,
     }
     bPaintBlank = FALSE;
     bPaintWrong = FALSE;
-    ASSERT( aSub[SW_LATIN].IsTransparent(), "SwFont: Transparent revolution" );
+    OSL_ENSURE( aSub[SW_LATIN].IsTransparent(), "SwFont: Transparent revolution" );
 }
 
 /*************************************************************************
@@ -1162,8 +1162,10 @@ void SwSubFont::CalcEsc( SwDrawTextInfo& rInf, Point& rPos )
 // used during painting of small capitals
 void SwDrawTextInfo::Shift( USHORT nDir )
 {
-    ASSERT( bPos, "DrawTextInfo: Undefined Position" );
-    ASSERT( bSize, "DrawTextInfo: Undefined Width" );
+#if OSL_DEBUG_LEVEL > 1
+    OSL_ENSURE( bPos, "DrawTextInfo: Undefined Position" );
+    OSL_ENSURE( bSize, "DrawTextInfo: Undefined Width" );
+#endif
 
     const BOOL bBidiPor = ( GetFrm() && GetFrm()->IsRightToLeft() ) !=
                           ( 0 != ( TEXT_LAYOUT_BIDI_RTL & GetpOut()->GetLayoutMode() ) );
@@ -1178,7 +1180,7 @@ void SwDrawTextInfo::Shift( USHORT nDir )
         ((Point*)pPos)->X() += GetSize().Width();
         break;
     case 900 :
-        ASSERT( ((Point*)pPos)->Y() >= GetSize().Width(), "Going underground" );
+        OSL_ENSURE( ((Point*)pPos)->Y() >= GetSize().Width(), "Going underground" );
         ((Point*)pPos)->Y() -= GetSize().Width();
         break;
     case 1800 :
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index bc395138e5e9..a04fd4ea2404 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -86,7 +86,7 @@
 #include <algorithm>
 #include <map>
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 #define CHECK    Check();
 #else
 #define CHECK
@@ -173,7 +173,7 @@ bool isSelfNestable(const USHORT nWhich)
     if ((RES_TXTATR_INETFMT  == nWhich) ||
         (RES_TXTATR_CJK_RUBY == nWhich))
         return false;
-    ASSERT((RES_TXTATR_META  == nWhich) ||
+   OSL_ENSURE((RES_TXTATR_META  == nWhich) ||
            (RES_TXTATR_METAFIELD  == nWhich), "???");
     return true;
 }
@@ -184,7 +184,7 @@ bool isSplittable(const USHORT nWhich)
     if ((RES_TXTATR_INETFMT  == nWhich) ||
         (RES_TXTATR_CJK_RUBY == nWhich))
         return true;
-    ASSERT((RES_TXTATR_META  == nWhich) ||
+   OSL_ENSURE((RES_TXTATR_META  == nWhich) ||
            (RES_TXTATR_METAFIELD  == nWhich), "???");
     return false;
 }
@@ -254,7 +254,7 @@ MakeTxtAttrNesting(SwTxtNode & rNode, SwTxtAttrNesting & rNesting,
             break;
         }
         default:
-            ASSERT(false, "MakeTxtAttrNesting: what the hell is that?");
+            OSL_ENSURE(false, "MakeTxtAttrNesting: what the hell is that?");
             break;
     }
     return static_cast<SwTxtAttrNesting*>(pNew);
@@ -371,7 +371,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
 //???    const bool bNoLengthAttribute( nNewStart == nNewEnd );
     const bool bNewSelfNestable( isSelfNestable(nNewWhich) );
 
-    ASSERT( (RES_TXTATR_INETFMT   == nNewWhich) ||
+    OSL_ENSURE( (RES_TXTATR_INETFMT   == nNewWhich) ||
             (RES_TXTATR_CJK_RUBY  == nNewWhich) ||
             (RES_TXTATR_META      == nNewWhich) ||
             (RES_TXTATR_METAFIELD == nNewWhich),
@@ -411,7 +411,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
                             static_cast<SwTxtAttrNesting*>(pOther));
                         break;
                     default:
-                        ASSERT(false, "bad code monkey");
+                        OSL_ENSURE(false, "bad code monkey");
                         break;
                 }
             }
@@ -427,7 +427,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
                 {
                     if (rNewHint.HasDummyChar())
                     {
-                        ASSERT(false,
+                        OSL_ENSURE(false,
                                 "ERROR: inserting duplicate CH_TXTATR hint");
                         return false;
                     } else if (nNewEnd < nOtherEnd) {
@@ -437,7 +437,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
                         // in SwXMeta::createEnumeration
                         // SplitNew is sorted, so this is the first split
                         xub_StrLen *const pStart(SplitNew.front()->GetStart());
-                        ASSERT(*pStart == nNewStart, "how did that happen?");
+                        OSL_ENSURE(*pStart == nNewStart, "how did that happen?");
                         *pStart = nNewStart + 1;
                     }
                 }
@@ -445,7 +445,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
         }
     }
 
-    ASSERT (isSplittable(nNewWhich) || SplitNew.size() == 1,
+   OSL_ENSURE(isSplittable(nNewWhich) || SplitNew.size() == 1,
             "splitting the unsplittable ???");
 
     // pass 2: split existing hints that overlap/nest with new hint
@@ -476,14 +476,14 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
             {
                 case POS_INSIDE:
                     {
-                        ASSERT(!bRemoveOverlap,
+                        OSL_ENSURE(!bRemoveOverlap,
                             "this one should be in OverwrittenExisting?");
                     }
                     break;
                 case POS_OUTSIDE:
                 case POS_EQUAL:
                     {
-                        ASSERT(false, "existing hint inside new hint: why?");
+                        OSL_ENSURE(false, "existing hint inside new hint: why?");
                     }
                     break;
                 case POS_OVERLAP_BEFORE:
@@ -495,7 +495,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
                         {
                             if ( USHRT_MAX == Count() )
                             {
-                                ASSERT(false, "hints array full :-(");
+                                OSL_ENSURE(false, "hints array full :-(");
                                 return false;
                             }
                             SwTxtAttrNesting * const pOtherLeft(
@@ -514,7 +514,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
                         {
                             if ( USHRT_MAX == Count() )
                             {
-                                ASSERT(false, "hints array full :-(");
+                                OSL_ENSURE(false, "hints array full :-(");
                                 return false;
                             }
                             SwTxtAttrNesting * const pOtherRight(
@@ -532,7 +532,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
 
     if ( USHRT_MAX - SplitNew.size() <= Count() )
     {
-        ASSERT(false, "hints array full :-(");
+        OSL_ENSURE(false, "hints array full :-(");
         return false;
     }
 
@@ -560,7 +560,7 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
         }
         else
         {
-            ASSERT((nOtherStart < nNewStart) && (nNewEnd < nOtherEnd), "huh?");
+           OSL_ENSURE((nOtherStart < nNewStart) && (nNewEnd < nOtherEnd), "huh?");
         // scenario: there is a RUBY, and contained within that a META;
         // now a RUBY is inserted within the META => the exising RUBY is split:
         // here it is not possible to simply insert the left/right fragment
@@ -568,12 +568,12 @@ SwpHints::TryInsertNesting( SwTxtNode & rNode, SwTxtAttrNesting & rNewHint )
             Delete( *itOther ); // this also does NoteInHistory!
             *(*itOther)->GetEnd() = nNewStart;
             bool bSuccess( TryInsertNesting(rNode, **itOther) );
-            ASSERT(bSuccess, "recursive call 1 failed?");
+            OSL_ENSURE(bSuccess, "recursive call 1 failed?");
             SwTxtAttrNesting * const pOtherRight(
                 MakeTxtAttrNesting(
                     rNode, **itOther, nNewEnd, nOtherEnd ) );
             bSuccess = TryInsertNesting(rNode, *pOtherRight);
-            ASSERT(bSuccess, "recursive call 2 failed?");
+            OSL_ENSURE(bSuccess, "recursive call 2 failed?");
         }
 
     }
@@ -602,7 +602,7 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
     std::vector<SwTxtAttr*> aInsDelHints;
     std::vector<SwTxtAttr*>::iterator aIter;
 
-    ASSERT( RES_TXTATR_CHARFMT == rNewHint.Which() ||
+    OSL_ENSURE( RES_TXTATR_CHARFMT == rNewHint.Which() ||
             RES_TXTATR_AUTOFMT == rNewHint.Which(),
             "Expecting CHARFMT or AUTOFMT" );
 
@@ -664,7 +664,7 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
         }
     }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     if( !rNode.GetDoc()->IsInReading() )
         CHECK;
 #endif
@@ -705,7 +705,7 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
     //
     while ( aStartIter != aEndIter || bNoLengthAttribute )
     {
-        ASSERT( bNoLengthAttribute || nPorStart < *aStartIter, "AUTOSTYLES: BuildPortion trouble" )
+        OSL_ENSURE( bNoLengthAttribute || nPorStart < *aStartIter, "AUTOSTYLES: BuildPortion trouble" );
 
         const xub_StrLen nPorEnd = bNoLengthAttribute ? nPorStart : *aStartIter;
         aInsDelHints.clear();
@@ -726,7 +726,7 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
 
             if ( pOther->GetEnd() && *pOther->GetEnd() == nPorEnd && nOtherStart == nPorStart )
             {
-                ASSERT( *pOther->GetEnd() == nPorEnd, "AUTOSTYLES: BuildPortion trouble" )
+                OSL_ENSURE( *pOther->GetEnd() == nPorEnd, "AUTOSTYLES: BuildPortion trouble" );
                 aInsDelHints.push_back( pOther );
             }
         }
@@ -768,7 +768,7 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
                 {
                     // remove all attributes from auto styles, which are explicitely set in
                     // the new character format:
-                    ASSERT( RES_TXTATR_AUTOFMT == (*aIter)->Which(), "AUTOSTYLES - Misc trouble" )
+                    OSL_ENSURE( RES_TXTATR_AUTOFMT == (*aIter)->Which(), "AUTOSTYLES - Misc trouble" );
                     SwTxtAttr* pOther = *aIter;
                     boost::shared_ptr<SfxItemSet> pOldStyle = static_cast<const SwFmtAutoFmt&>(pOther->GetAttr()).GetStyleHandle();
 
@@ -983,7 +983,7 @@ SwTxtAttr* MakeRedlineTxtAttr( SwDoc & rDoc, SfxPoolItem & rAttr )
         case RES_CHRATR_BACKGROUND:
             break;
         default:
-            ASSERT(false, "unsupported redline attribute");
+            OSL_ENSURE(false, "unsupported redline attribute");
             break;
     }
 
@@ -1081,7 +1081,7 @@ SwTxtAttr* MakeTxtAttr( SwDoc & rDoc, SfxPoolItem& rAttr,
         pNew = new SwTxtMeta( static_cast<SwFmtMeta&>(rNew), nStt, nEnd );
         break;
     default:
-        ASSERT(RES_TXTATR_AUTOFMT == rNew.Which(), "unknown attribute");
+        OSL_ENSURE(RES_TXTATR_AUTOFMT == rNew.Which(), "unknown attribute");
         pNew = new SwTxtAttrEnd( rNew, nStt, nEnd );
         break;
     }
@@ -1138,9 +1138,9 @@ void SwTxtNode::DestroyAttr( SwTxtAttr* pAttr )
                 const SwField* pFld = pAttr->GetFld().GetFld();
 
                 //JP 06-08-95: DDE-Felder bilden eine Ausnahme
-                ASSERT( RES_DDEFLD == pFld->GetTyp()->Which() ||
+                OSL_ENSURE( RES_DDEFLD == pFld->GetTyp()->Which() ||
                         this == ((SwTxtFld*)pAttr)->GetpTxtNode(),
-                        "Wo steht denn dieses Feld?" )
+                        "Wo steht denn dieses Feld?" );
 
                 // bestimmte Felder mussen am Doc das Calculations-Flag updaten
                 switch( pFld->GetTyp()->Which() )
@@ -1209,7 +1209,7 @@ SwTxtNode::InsertItem( SfxPoolItem& rAttr,
       const xub_StrLen nStart, const xub_StrLen nEnd, const SetAttrMode nMode )
 {
    // character attributes will be inserted as automatic styles:
-    ASSERT( !isCHRATR(rAttr.Which()), "AUTOSTYLES - "
+    OSL_ENSURE( !isCHRATR(rAttr.Which()), "AUTOSTYLES - "
         "SwTxtNode::InsertItem should not be called with character attributes");
 
     SwTxtAttr* const pNew = MakeTxtAttr( *GetDoc(), rAttr, nStart, nEnd );
@@ -1234,8 +1234,8 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
 {
     BOOL bHiddenPara = FALSE;
 
-    ASSERT( pAttr && *pAttr->GetStart() <= Len(), "StartIdx out of bounds!" );
-    ASSERT( !pAttr->GetEnd() || (*pAttr->GetEnd() <= Len()),
+    OSL_ENSURE( pAttr && *pAttr->GetStart() <= Len(), "StartIdx out of bounds!" );
+    OSL_ENSURE( !pAttr->GetEnd() || (*pAttr->GetEnd() <= Len()),
             "EndIdx out of bounds!" );
 
     // translate from SetAttrMode to InsertMode (for hints with CH_TXTATR)
@@ -1310,7 +1310,7 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
                         if( nsSetAttrMode::SETATTR_NOTXTATRCHR & nInsMode )
                         {
                             // loesche das Zeichen aus dem String !
-                            ASSERT( ( CH_TXTATR_BREAKWORD ==
+                            OSL_ENSURE( ( CH_TXTATR_BREAKWORD ==
                                         m_Text.GetChar(*pAttr->GetStart() ) ||
                                       CH_TXTATR_INWORD ==
                                         m_Text.GetChar(*pAttr->GetStart())),
@@ -1348,7 +1348,7 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
                     if( nsSetAttrMode::SETATTR_NOTXTATRCHR & nInsMode )
                     {
                         // loesche das Zeichen aus dem String !
-                        ASSERT( ( CH_TXTATR_BREAKWORD ==
+                        OSL_ENSURE( ( CH_TXTATR_BREAKWORD ==
                                       m_Text.GetChar(*pAttr->GetStart() ) ||
                                   CH_TXTATR_INWORD ==
                                       m_Text.GetChar(*pAttr->GetStart())),
@@ -1422,12 +1422,12 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
                 // FussNote im Redline-Bereich NICHT ins FtnArray einfuegen!
                 if( StartOfSectionIndex() > rNodes.GetEndOfRedlines().GetIndex() )
                 {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
                     const BOOL bSuccess =
 #endif
                         pDoc->GetFtnIdxs().Insert( pTxtFtn );
-#ifdef DBG_UTIL
-                    ASSERT( bSuccess, "FtnIdx nicht eingetragen." );
+#if OSL_DEBUG_LEVEL > 1
+                    OSL_ENSURE( bSuccess, "FtnIdx nicht eingetragen." );
 #endif
                 }
                 SwNodeIndex aTmpIndex( *this );
@@ -1478,7 +1478,7 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode )
         // resulting in infinite recursion
         if ( !(nsSetAttrMode::SETATTR_NOTXTATRCHR & nMode) )
         {
-            ASSERT( ( CH_TXTATR_BREAKWORD == m_Text.GetChar(nStart) ||
+            OSL_ENSURE( ( CH_TXTATR_BREAKWORD == m_Text.GetChar(nStart) ||
                       CH_TXTATR_INWORD    == m_Text.GetChar(nStart) ),
                     "where is my attribute character?" );
             SwIndex aIdx( this, nStart );
@@ -1503,7 +1503,7 @@ void SwTxtNode::DeleteAttribute( SwTxtAttr * const pAttr )
 {
     if ( !HasHints() )
     {
-        ASSERT(false, "DeleteAttribute called, but text node without hints?");
+        OSL_ENSURE(false, "DeleteAttribute called, but text node without hints?");
         return;
     }
 
@@ -1550,7 +1550,7 @@ void SwTxtNode::DeleteAttributes( const USHORT nWhich,
         {
             if ( nWhich == RES_CHRATR_HIDDEN  )
             {
-                ASSERT(false, "hey, that's a CHRATR! how did that get in?");
+                OSL_ENSURE(false, "hey, that's a CHRATR! how did that get in?");
                 SetCalcHiddenCharFlags();
             }
             else if ( nWhich == RES_TXTATR_CHARFMT )
@@ -1685,7 +1685,7 @@ BOOL SwTxtNode::SetAttr( const SfxItemSet& rSet, xub_StrLen nStt,
         if ( pItem && (reinterpret_cast<SfxPoolItem*>(-1) != pItem))
         {
             const USHORT nWhich = pItem->Which();
-            ASSERT( isCHRATR(nWhich) || isTXTATR(nWhich),
+            OSL_ENSURE( isCHRATR(nWhich) || isTXTATR(nWhich),
                     "SwTxtNode::SetAttr(): unknown attribute" );
             if ( isCHRATR(nWhich) || isTXTATR(nWhich) )
             {
@@ -1713,7 +1713,7 @@ BOOL SwTxtNode::SetAttr( const SfxItemSet& rSet, xub_StrLen nStt,
                         {
                             if ( nEnd != nStt && !pNew->GetEnd() )
                             {
-                                ASSERT(false,
+                                OSL_ENSURE(false,
                                     "Attribut without end, but area marked");
                                 DestroyAttr( pNew ); // do not insert
                             }
@@ -1953,7 +1953,7 @@ BOOL SwTxtNode::GetAttr( SfxItemSet& rSet, xub_StrLen nStt, xub_StrLen nEnd,
                     while ( pItem )
                     {
                         const USHORT nHintWhich = pItem->Which();
-                        ASSERT(!isUNKNOWNATR(nHintWhich),
+                        OSL_ENSURE(!isUNKNOWNATR(nHintWhich),
                                 "SwTxtNode::GetAttr(): unkonwn attribute?");
 
                         if ( !pAttrArr.get() )
@@ -2103,7 +2103,7 @@ struct RemovePresentAttrs
         const SwTxtAttr* const pAutoStyle(i_rAttrSpan.second);
         SfxItemIter aIter(m_rAttrSet);
         const SfxPoolItem* pItem(aIter.GetCurItem());
-        while (true)
+        while (pItem)
         {
             const USHORT nWhich(pItem->Which());
             if (CharFmt::IsItemIncluded(nWhich, pAutoStyle))
@@ -2171,7 +2171,7 @@ lcl_FillWhichIds(const SfxItemSet& i_rAttrSet, std::vector<USHORT>& o_rClearIds)
     o_rClearIds.reserve(i_rAttrSet.Count());
     SfxItemIter aIter(i_rAttrSet);
     const SfxPoolItem* pItem(aIter.GetCurItem());
-    while (true)
+    while (pItem)
     {
         o_rClearIds.push_back(pItem->Which());
 
@@ -2595,7 +2595,7 @@ bool SwpHints::TryInsertHint( SwTxtAttr* const pHint, SwTxtNode &rNode,
 {
     if ( USHRT_MAX == Count() ) // we're sorry, this flight is overbooked...
     {
-        ASSERT(false, "hints array full :-(");
+        OSL_ENSURE(false, "hints array full :-(");
         return false;
     }
 
@@ -2791,7 +2791,7 @@ bool SwpHints::TryInsertHint( SwTxtAttr* const pHint, SwTxtNode &rNode,
     {
         SwpHintsArray::Insert( pHint );
         CalcFlags();
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         if( !rNode.GetDoc()->IsInReading() )
             CHECK;
 #endif
@@ -2809,7 +2809,7 @@ bool SwpHints::TryInsertHint( SwTxtAttr* const pHint, SwTxtNode &rNode,
 
     if( *pHtEnd < nHtStart )
     {
-        ASSERT( *pHtEnd >= nHtStart,
+        OSL_ENSURE( *pHtEnd >= nHtStart,
                     "+SwpHints::Insert: invalid hint, end < start" );
 
         // Wir drehen den Quatsch einfach um:
@@ -2841,10 +2841,10 @@ bool SwpHints::TryInsertHint( SwTxtAttr* const pHint, SwTxtNode &rNode,
          ( RES_TXTATR_AUTOFMT == nWhich ||
            RES_TXTATR_CHARFMT == nWhich ) )
     {
-        ASSERT( nWhich != RES_TXTATR_AUTOFMT ||
+        OSL_ENSURE( nWhich != RES_TXTATR_AUTOFMT ||
                 static_cast<const SwFmtAutoFmt&>(pHint->GetAttr()).GetStyleHandle()->GetPool() ==
                 &rNode.GetDoc()->GetAttrPool(),
-                "AUTOSTYLES - Pool mismatch" )
+                "AUTOSTYLES - Pool mismatch" );
 
         BuildPortions( rNode, *pHint, nMode );
 
@@ -2884,7 +2884,7 @@ bool SwpHints::TryInsertHint( SwTxtAttr* const pHint, SwTxtNode &rNode,
         rNode.Modify( 0, &aHint );
     }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     if( !bNoHintAdjustMode && !rNode.GetDoc()->IsInReading() )
         CHECK;
 #endif
@@ -2929,13 +2929,13 @@ void SwpHints::DeleteAtPos( const USHORT nPos )
 }
 
 // Ist der Hint schon bekannt, dann suche die Position und loesche ihn.
-// Ist er nicht im Array, so gibt es ein ASSERT !!
+// Ist er nicht im Array, so gibt es ein OSL_ENSURE(!!
 
 void SwpHints::Delete( SwTxtAttr* pTxtHt )
 {
     // Attr 2.0: SwpHintsArr::Delete( pTxtHt );
     const USHORT nPos = GetStartOf( pTxtHt );
-    ASSERT( USHRT_MAX != nPos, "Attribut nicht im Attribut-Array!" );
+    OSL_ENSURE( USHRT_MAX != nPos, "Attribut nicht im Attribut-Array!" );
     if( USHRT_MAX != nPos )
         DeleteAtPos( nPos );
 }
@@ -3057,7 +3057,7 @@ sal_Unicode GetCharOfTxtAttr( const SwTxtAttr& rAttr )
             break;
 
         default:
-            ASSERT(false, "GetCharOfTxtAttr: unknown attr");
+            OSL_ENSURE(false, "GetCharOfTxtAttr: unknown attr");
             break;
     }
     return cRet;
diff --git a/sw/source/core/txtnode/txtatr2.cxx b/sw/source/core/txtnode/txtatr2.cxx
index 0285bdb89d63..0e4434679d7b 100644
--- a/sw/source/core/txtnode/txtatr2.cxx
+++ b/sw/source/core/txtnode/txtatr2.cxx
@@ -71,7 +71,7 @@ SwTxtCharFmt::~SwTxtCharFmt( )
 void SwTxtCharFmt::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
 {
     USHORT nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0;
-    ASSERT(  isCHRATR(nWhich) || (RES_OBJECTDYING == nWhich)
+    OSL_ENSURE(  isCHRATR(nWhich) || (RES_OBJECTDYING == nWhich)
              || (RES_ATTRSET_CHG == nWhich) || (RES_FMT_CHG == nWhich),
         "SwTxtCharFmt::Modify(): unknown Modify");
 
@@ -190,7 +190,7 @@ SwCharFmt* SwTxtINetFmt::GetCharFmt()
 void SwTxtINetFmt::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
 {
     USHORT nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0;
-    ASSERT(  isCHRATR(nWhich) || (RES_OBJECTDYING == nWhich)
+    OSL_ENSURE(  isCHRATR(nWhich) || (RES_OBJECTDYING == nWhich)
              || (RES_ATTRSET_CHG == nWhich) || (RES_FMT_CHG == nWhich),
         "SwTxtINetFmt::Modify(): unknown Modify");
 
@@ -239,7 +239,7 @@ SwTxtRuby::~SwTxtRuby()
 void SwTxtRuby::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
 {
     USHORT nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0;
-    ASSERT(  isCHRATR(nWhich) || (RES_OBJECTDYING == nWhich)
+    OSL_ENSURE(  isCHRATR(nWhich) || (RES_OBJECTDYING == nWhich)
              || (RES_ATTRSET_CHG == nWhich) || (RES_FMT_CHG == nWhich),
         "SwTxtRuby::Modify(): unknown Modify");
 
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 20888cb5116e..d203e045d7ed 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -334,7 +334,7 @@ static bool lcl_HaveCommonAttributes( IStyleAccess& rStyleAccess,
 
     if ( !pSet1 )
     {
-        ASSERT( nWhichId, "lcl_HaveCommonAttributes not used correctly" )
+        OSL_ENSURE( nWhichId, "lcl_HaveCommonAttributes not used correctly" );
         if ( SFX_ITEM_SET == rSet2.GetItemState( nWhichId, FALSE ) )
         {
             pNewSet = rSet2.Clone( TRUE );
@@ -634,7 +634,7 @@ void SwTxtNode::RstAttr(const SwIndex &rIdx, xub_StrLen nLen, USHORT nWhich,
 
 XubString SwTxtNode::GetCurWord( xub_StrLen nPos ) const
 {
-    ASSERT( nPos <= m_Text.Len(), "SwTxtNode::GetCurWord: invalid index." );
+    OSL_ENSURE( nPos <= m_Text.Len(), "SwTxtNode::GetCurWord: invalid index." );
 
     if (!m_Text.Len())
         return m_Text;
@@ -675,7 +675,7 @@ SwScanner::SwScanner( const SwTxtNode& rNd, const String& rTxt, const LanguageTy
                       USHORT nType, xub_StrLen nStart, xub_StrLen nEnde, BOOL bClp )
     : rNode( rNd ), rText( rTxt), pLanguage( pLang ), pConversionMap( pConvMap ), nLen( 0 ), nWordType( nType ), bClip( bClp )
 {
-    ASSERT( rText.Len(), "SwScanner: EmptyString" );
+    OSL_ENSURE( rText.Len(), "SwScanner: EmptyString" );
     nStartPos = nBegin = nStart;
     nEndPos = nEnde;
 
@@ -749,7 +749,7 @@ BOOL SwScanner::NextWord()
     // we have to differenciate between these cases:
     if ( aBound.startPos <= nBegin )
     {
-        ASSERT( aBound.endPos >= nBegin, "Unexpected aBound result" )
+        OSL_ENSURE( aBound.endPos >= nBegin, "Unexpected aBound result" );
 
         // restrict boundaries to script boundaries and nEndPos
         const USHORT nCurrScript =
@@ -1475,9 +1475,9 @@ BOOL SwTxtNode::Hyphenate( SwInterHyphInfo &rHyphInf )
     {
         // 4935: Seit der Trennung ueber Sonderbereiche sind Faelle
         // moeglich, in denen kein Frame zum Node vorliegt.
-        // Also kein ASSERT!
+        // Also keinOSL_ENSURE
 #if OSL_DEBUG_LEVEL > 1
-        ASSERT( pFrm, "!SwTxtNode::Hyphenate: can't find any frame" );
+        OSL_ENSURE( pFrm, "!SwTxtNode::Hyphenate: can't find any frame" );
 #endif
         return FALSE;
     }
@@ -1864,116 +1864,129 @@ void SwTxtNode::ReplaceTextOnly( xub_StrLen nPos, xub_StrLen nLen,
 void SwTxtNode::CountWords( SwDocStat& rStat,
                             xub_StrLen nStt, xub_StrLen nEnd ) const
 {
+    sal_Bool isCountAll = ( (0 == nStt) && (GetTxt().Len() == nEnd) );
+
     ++rStat.nAllPara; // #i93174#: count _all_ paragraphs
-    if( nStt < nEnd )
+    if( nStt >= nEnd )
+    {   // empty node or empty selection or bad call
+        return;
+    }
+    if ( IsHidden() )
+    {   // not counting hidden paras
+        return;
+    }
+    // Shortcut when counting whole paragraph and current count is clean
+    if ( isCountAll && !IsWordCountDirty() )
     {
-        if ( !IsHidden() )
-        {
-            ++rStat.nPara;
-            ULONG nTmpWords = 0;
-            ULONG nTmpChars = 0;
-            ULONG nTmpCharsExcludingSpaces = 0;  // Number of characters in actual words (i.e. excluding spaces)
-
-            // Shortcut: Whole paragraph should be considered and cached values
-            // are valid:
-            if ( 0 == nStt && GetTxt().Len() == nEnd && !IsWordCountDirty() )
-            {
-                nTmpWords = GetParaNumberOfWords();
-                nTmpChars = GetParaNumberOfChars();
-                nTmpCharsExcludingSpaces = GetParaNumberOfCharsExcludingSpaces();
-            }
-            else
-            {
-                String aOldStr( m_Text );
-                String& rCastStr = const_cast<String&>(m_Text);
-
-                // fills the deleted redlines and hidden ranges with cChar:
-                const xub_Unicode cChar(' ');
-                const USHORT nNumOfMaskedChars =
-                        lcl_MaskRedlinesAndHiddenText( *this, rCastStr, nStt, nEnd, cChar, false );
-
-                // expand fields
-                rtl::OUString aExpandText;
-                const ModelToViewHelper::ConversionMap* pConversionMap =
-                        BuildConversionMap( aExpandText );
+        // accumulate into DocStat record to return the values
+        rStat.nWord += GetParaNumberOfWords();
+        rStat.nChar += GetParaNumberOfChars();
+        rStat.nCharExcludingSpaces += GetParaNumberOfCharsExcludingSpaces();
+        return;
+    }
 
-                const sal_uInt32 nExpandBegin = ModelToViewHelper::ConvertToViewPosition( pConversionMap, nStt );
-                const sal_uInt32 nExpandEnd   = ModelToViewHelper::ConvertToViewPosition( pConversionMap, nEnd );
+    // make a copy of the text
+    String& rTextCopy = const_cast<String&>(m_Text);
 
-                const bool bCount = aExpandText.getLength() > 0;
+    // mask out the redlined and hidden text with ' '
+    const xub_Unicode cChar(' ');
+    const USHORT nNumOfMaskedChars = lcl_MaskRedlinesAndHiddenText( *this, rTextCopy, nStt, nEnd, cChar, false );
 
-                // count words in 'regular' text:
-                if( bCount && pBreakIt->GetBreakIter().is() )
-                {
-                    const String aScannerText( aExpandText );
-                    SwScanner aScanner( *this, aScannerText, 0, pConversionMap,
-                                        i18n::WordType::WORD_COUNT,
-                                        (xub_StrLen)nExpandBegin, (xub_StrLen)nExpandEnd );
+    // expand text into pConversionMap for scanner
+    rtl::OUString aExpandText;
+    const ModelToViewHelper::ConversionMap* pConversionMap = BuildConversionMap( aExpandText );
 
-                    const rtl::OUString aBreakWord( CH_TXTATR_BREAKWORD );
+    // map start and end points onto the ConversionMap
+    const sal_uInt32 nExpandBegin = ModelToViewHelper::ConvertToViewPosition( pConversionMap, nStt );
+    const sal_uInt32 nExpandEnd   = ModelToViewHelper::ConvertToViewPosition( pConversionMap, nEnd );
 
-                    while ( aScanner.NextWord() )
-                    {
-                        if( aScanner.GetLen()  > 1 ||
-                            CH_TXTATR_BREAKWORD != aExpandText.match(aBreakWord, aScanner.GetBegin() ))
-                            ++nTmpWords;
+    if ( aExpandText.getLength() <= 0 )
+    {
+        OSL_ENSURE(aExpandText.getLength() >= 0, "Node text expansion error: length < 0." );
+        return;
+    }
 
-                        if( CH_TXTATR_BREAKWORD != aExpandText.match(aBreakWord, aScanner.GetBegin() ))
-                            nTmpCharsExcludingSpaces += aScanner.GetLen();
+    //do the count
+    // all counts exclude hidden paras and hidden+redlined within para
+    // definition of space/white chars in SwScanner (and BreakIter!)
+    // uses both lcl_IsSkippableWhiteSpace and BreakIter getWordBoundary in SwScanner
+    sal_uInt32 nTmpWords = 0;        // count of all contiguous blocks of non-white chars
+    sal_uInt32 nTmpChars = 0;        // count of all chars
+    sal_uInt32 nTmpCharsExcludingSpaces = 0;  // all non-white chars
 
-                    }
-                }
+    ++rStat.nPara;      // count of non-empty paras
 
-                ASSERT( aExpandText.getLength() >= nNumOfMaskedChars,
-                        "More characters hidden that characters in string!" )
-                nTmpChars = nExpandEnd - nExpandBegin - nNumOfMaskedChars;
+    // count words in masked and expanded text:
+    if( pBreakIt->GetBreakIter().is() )
+    {
+        const String aScannerText( aExpandText );
+        // zero is NULL for pLanguage -----------v               last param = true for clipping
+        SwScanner aScanner( *this, aScannerText, 0, pConversionMap, i18n::WordType::WORD_COUNT,
+                            (xub_StrLen)nExpandBegin, (xub_StrLen)nExpandEnd, true );
 
-                // count words in numbering string:
-                if ( nStt == 0 && bCount )
-                {
-                    // add numbering label
-                    const String aNumString = GetNumString();
-                    const xub_StrLen nNumStringLen = aNumString.Len();
-                    if ( nNumStringLen > 0 )
-                    {
-                        LanguageType aLanguage = GetLang( 0 );
+        // used to filter out scanner returning almost empty strings (len=1; unichar=0x0001)
+        const rtl::OUString aBreakWord( CH_TXTATR_BREAKWORD );
 
-                        SwScanner aScanner( *this, aNumString, &aLanguage, 0,
-                                            i18n::WordType::WORD_COUNT,
-                                            0, nNumStringLen );
+        while ( aScanner.NextWord() )
+        {
+            //  1 is len(CH_TXTATR_BREAKWORD) : match returns length of match
+            if( 1 != aExpandText.match(aBreakWord, aScanner.GetBegin() ))
+            {
+                ++nTmpWords;
+                nTmpCharsExcludingSpaces += aScanner.GetLen();
+            }
+        }
+    }
 
-                        while ( aScanner.NextWord() )
-                            ++nTmpWords;
+    nTmpChars = nExpandEnd - nExpandBegin - nNumOfMaskedChars;
 
-                        nTmpChars += nNumStringLen;
-                    }
-                    else if ( HasBullet() )
-                    {
-                        ++nTmpWords;
-                        ++nTmpChars;
-                    }
-                }
+    // no nTmpCharsExcludingSpaces adjust needed neither for blanked out MaskedChars
+    // nor for mid-word selection - set scanner bClip = true at creation
 
-                delete pConversionMap;
+    // count words in numbering string if started at beginning of para:
+    if ( nStt == 0 )
+    {
+        // count outline number label - ? no expansion into map
+        // always counts all of number-ish label
+        const String aNumString = GetNumString();
+        const xub_StrLen nNumStringLen = aNumString.Len();
+        if ( nNumStringLen > 0 )
+        {
+            LanguageType aLanguage = GetLang( 0 );
 
-                rCastStr = aOldStr;
+            SwScanner aScanner( *this, aNumString, &aLanguage, 0,
+                                i18n::WordType::WORD_COUNT, 0, nNumStringLen, true );
 
-                // If the whole paragraph has been calculated, update cached
-                // values:
-                if ( 0 == nStt && GetTxt().Len() == nEnd )
-                {
-                    SetParaNumberOfWords( nTmpWords );
-                    SetParaNumberOfChars( nTmpChars );
-                    SetParaNumberOfCharsExcludingSpaces( nTmpCharsExcludingSpaces );
-                    SetWordCountDirty( false );
-                }
+            while ( aScanner.NextWord() )
+            {
+                ++nTmpWords;
+                nTmpCharsExcludingSpaces += aScanner.GetLen();
             }
 
-            rStat.nWord += nTmpWords;
-            rStat.nChar += nTmpChars;
-            rStat.nCharExcludingSpaces += nTmpCharsExcludingSpaces;
+            nTmpChars += nNumStringLen;
         }
+        else if ( HasBullet() )
+        {
+            ++nTmpWords;
+            ++nTmpChars;
+            ++nTmpCharsExcludingSpaces;
+        }
+    }
+
+    delete pConversionMap;
+
+    // If counting the whole para then update cached values and mark clean
+    if ( isCountAll )
+    {
+        SetParaNumberOfWords( nTmpWords );
+        SetParaNumberOfChars( nTmpChars );
+        SetParaNumberOfCharsExcludingSpaces( nTmpCharsExcludingSpaces );
+        SetWordCountDirty( false );
     }
+    // accumulate into DocStat record to return the values
+    rStat.nWord += nTmpWords;
+    rStat.nChar += nTmpChars;
+    rStat.nCharExcludingSpaces += nTmpCharsExcludingSpaces;
 }
 
 //
@@ -1981,17 +1994,17 @@ void SwTxtNode::CountWords( SwDocStat& rStat,
 //
 struct SwParaIdleData_Impl
 {
-    SwWrongList* pWrong;            // for spell checking
+    SwWrongList* pWrong;                // for spell checking
     SwGrammarMarkUp* pGrammarCheck;     // for grammar checking /  proof reading
     SwWrongList* pSmartTags;
     ULONG nNumberOfWords;
     ULONG nNumberOfChars;
     ULONG nNumberOfCharsExcludingSpaces;
-    bool bWordCountDirty        : 1;
-    bool bWrongDirty            : 1;    // Ist das Wrong-Feld auf invalid?
-    bool bGrammarCheckDirty     : 1;
-    bool bSmartTagDirty         : 1;
-    bool bAutoComplDirty        : 1;    // die ACompl-Liste muss angepasst werden
+    bool bWordCountDirty;
+    bool bWrongDirty;                   // Ist das Wrong-Feld auf invalid?
+    bool bGrammarCheckDirty;
+    bool bSmartTagDirty;
+    bool bAutoComplDirty;               // die ACompl-Liste muss angepasst werden
 
     SwParaIdleData_Impl() :
         pWrong              ( 0 ),
@@ -1999,7 +2012,7 @@ struct SwParaIdleData_Impl
         pSmartTags          ( 0 ),
         nNumberOfWords      ( 0 ),
         nNumberOfChars      ( 0 ),
-        nNumberOfCharsExcludingSpaces      ( 0 ),
+        nNumberOfCharsExcludingSpaces ( 0 ),
         bWordCountDirty     ( true ),
         bWrongDirty         ( true ),
         bGrammarCheckDirty  ( true ),
@@ -2066,8 +2079,8 @@ SwGrammarMarkUp* SwTxtNode::GetGrammarCheck()
 
 void SwTxtNode::SetSmartTags( SwWrongList* pNew, bool bDelete )
 {
-    ASSERT( !pNew || SwSmartTagMgr::Get().IsSmartTagsEnabled(),
-            "Weird - we have a smart tag list without any recognizers?" )
+    OSL_ENSURE( !pNew || SwSmartTagMgr::Get().IsSmartTagsEnabled(),
+            "Weird - we have a smart tag list without any recognizers?" );
 
     if ( m_pParaIdleData_Impl )
     {
diff --git a/sw/source/core/undo/SwUndoField.cxx b/sw/source/core/undo/SwUndoField.cxx
index 546716318724..6cded2ec458e 100644
--- a/sw/source/core/undo/SwUndoField.cxx
+++ b/sw/source/core/undo/SwUndoField.cxx
@@ -73,9 +73,9 @@ SwUndoFieldFromDoc::SwUndoFieldFromDoc(const SwPosition & rPos,
     , pHnt(_pHnt)
     , bUpdate(_bUpdate)
 {
-    ASSERT(pOldField, "No old field!");
-    ASSERT(pNewField, "No new field!");
-    ASSERT(pDoc, "No document!");
+    OSL_ENSURE(pOldField, "No old field!");
+    OSL_ENSURE(pNewField, "No new field!");
+    OSL_ENSURE(pDoc, "No document!");
 }
 
 SwUndoFieldFromDoc::~SwUndoFieldFromDoc()
diff --git a/sw/source/core/undo/SwUndoPageDesc.cxx b/sw/source/core/undo/SwUndoPageDesc.cxx
index bc51ce3fcd98..bb80176b7e6f 100644
--- a/sw/source/core/undo/SwUndoPageDesc.cxx
+++ b/sw/source/core/undo/SwUndoPageDesc.cxx
@@ -149,7 +149,7 @@ SwUndoPageDesc::SwUndoPageDesc(const SwPageDesc & _aOld,
               UNDO_CHANGE_PAGEDESC ),
       aOld(_aOld, _pDoc), aNew(_aNew, _pDoc), pDoc(_pDoc), bExchange( false )
 {
-    ASSERT(0 != pDoc, "no document?");
+    OSL_ENSURE(0 != pDoc, "no document?");
 
 #ifdef DEBUG
     DebugHeaderFooterContent( (SwPageDesc&)aOld );
@@ -228,7 +228,7 @@ SwUndoPageDesc::~SwUndoPageDesc()
 
 void SwUndoPageDesc::ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDest )
 {
-    ASSERT( bExchange, "You shouldn't do that." );
+    OSL_ENSURE( bExchange, "You shouldn't do that." );
     const SwFmtHeader& rDestHead = rDest.GetMaster().GetHeader();
     const SwFmtHeader& rSourceHead = rSource.GetMaster().GetHeader();
     if( rDestHead.IsActive() )
@@ -373,7 +373,7 @@ SwUndoPageDescCreate::SwUndoPageDescCreate(const SwPageDesc * pNew,
     : SwUndo(UNDO_CREATE_PAGEDESC), pDesc(pNew), aNew(*pNew, _pDoc),
       pDoc(_pDoc)
 {
-    ASSERT(0 != pDoc, "no document?");
+    OSL_ENSURE(0 != pDoc, "no document?");
 }
 
 SwUndoPageDescCreate::~SwUndoPageDescCreate()
@@ -433,7 +433,7 @@ SwUndoPageDescDelete::SwUndoPageDescDelete(const SwPageDesc & _aOld,
                                            SwDoc * _pDoc)
     : SwUndo(UNDO_DELETE_PAGEDESC), aOld(_aOld, _pDoc), pDoc(_pDoc)
 {
-    ASSERT(0 != pDoc, "no document?");
+    OSL_ENSURE(0 != pDoc, "no document?");
 }
 
 SwUndoPageDescDelete::~SwUndoPageDescDelete()
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx
index 3fa944475319..00a11f7eea95 100644
--- a/sw/source/core/undo/docundo.cxx
+++ b/sw/source/core/undo/docundo.cxx
@@ -164,14 +164,14 @@ void SwDoc::AppendUndo( SwUndo* pUndo )
     case UNDO_START:        ++nUndoSttEnd;
                             break;
 
-    case UNDO_END:          ASSERT( nUndoSttEnd, "Undo-Ende ohne Start" );
+    case UNDO_END:          OSL_ENSURE( nUndoSttEnd, "Undo-Ende ohne Start" );
                             --nUndoSttEnd;
                             // kein break !!!
     default:
         if( pUndos->Count() != nUndoPos && UNDO_END != pUndo->GetId() )
             ClearRedo();
         else {
-            ASSERT( pUndos->Count() == nUndoPos || UNDO_END == pUndo->GetId(),
+            OSL_ENSURE( pUndos->Count() == nUndoPos || UNDO_END == pUndo->GetId(),
                     "Redo history not deleted!" );
         }
         if( !nUndoSttEnd )
@@ -199,7 +199,7 @@ void SwDoc::AppendUndo( SwUndo* pUndo )
     USHORT nEnde = UNDO_ACTION_LIMIT;
 
 // nur zum Testen der neuen DOC-Member
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 {
     SwUndoId nId = UNDO_EMPTY;
     USHORT nUndosCnt = 0, nSttEndCnt = 0;
@@ -212,8 +212,8 @@ void SwDoc::AppendUndo( SwUndo* pUndo )
         if( !nSttEndCnt )
             ++nUndosCnt;
     }
-    ASSERT( nSttEndCnt == nUndoSttEnd, "Start-Ende Count ungleich" );
-    ASSERT( nUndosCnt == nUndoCnt, "Undo Count ungleich" );
+    OSL_ENSURE( nSttEndCnt == nUndoSttEnd, "Start-Ende Count ungleich" );
+    OSL_ENSURE( nUndosCnt == nUndoCnt, "Undo Count ungleich" );
 }
 #endif
 
@@ -309,7 +309,7 @@ BOOL SwDoc::DelUndoObj( USHORT nEnde )
             --nEnde, --nUndoCnt;
     }
 
-    ASSERT( nCnt < nUndoPos || nUndoPos == pUndos->Count(),
+    OSL_ENSURE( nCnt < nUndoPos || nUndoPos == pUndos->Count(),
             "Undo-Del-Ende liegt in einer Redo-Aktion" );
 
     // dann setze ab Ende bis Undo-Ende bei allen Undo-Objecte die Werte um
@@ -496,7 +496,7 @@ SwUndoId SwDoc::EndUndo(SwUndoId eUndoId, const SwRewriter * pRewriter)
         // kann eigentlich nur beim Abspielen von Macros passieren, die
         // Undo/Redo/Repeat benutzen und die eine exitierende Selection
         // durch Einfuegen loeschen
-        ASSERT( !this, "kein entsprechendes Ende gefunden" );
+        OSL_ENSURE( !this, "kein entsprechendes Ende gefunden" );
         // kein entsprechenden Start gefunden -> Ende nicht einfuegen
         // und die Member am Doc updaten
 
@@ -547,7 +547,7 @@ SwUndoId SwDoc::EndUndo(SwUndoId eUndoId, const SwRewriter * pRewriter)
     pUndoEnd->SetSttOffset( nSize );
 
 // nur zum Testen der Start/End-Verpointerung vom Start/End Undo
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     {
         USHORT nEndCnt = 1, nCnt = pUndos->Count();
         SwUndoId nTmpId = UNDO_EMPTY;
@@ -566,7 +566,7 @@ SwUndoId SwDoc::EndUndo(SwUndoId eUndoId, const SwRewriter * pRewriter)
             else if( !nEndCnt )
                 break;
         }
-        ASSERT( nCnt == pUndos->Count() - nSize,
+        OSL_ENSURE( nCnt == pUndos->Count() - nSize,
                 "Start-Ende falsch geklammert" );
     }
 #endif
@@ -601,9 +601,6 @@ String SwDoc::GetUndoIdsStr( String* pStr, SwUndoIds *pUndoIds) const
     return aTmpStr;
 }
 
-/*-- 24.11.2004 16:11:21---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 sal_Bool SwDoc::RestoreInvisibleContent()
 {
     sal_Bool bRet = sal_False;
@@ -657,7 +654,7 @@ SwUndoIdAndName * lcl_GetUndoIdAndName(const SwUndos & rUndos, sal_uInt16 nPos )
     SwUndoId nId = UNDO_EMPTY;
     String sStr("??", RTL_TEXTENCODING_ASCII_US);
 
-    ASSERT( nPos < rUndos.Count(), "nPos out of range");
+    OSL_ENSURE( nPos < rUndos.Count(), "nPos out of range");
 
     switch (pUndo->GetId())
     {
@@ -673,12 +670,9 @@ SwUndoIdAndName * lcl_GetUndoIdAndName(const SwUndos & rUndos, sal_uInt16 nPos )
                    for first objects that is not a UNDO_END.
                  */
                 int nTmpPos = nPos + pUndoStart->GetEndOffset();
-                int nSubstitute = -1;
-
-                // --> OD 2009-09-30 #i105457#
-                if ( nTmpPos > 0 )
-                // <--
+                if ( nTmpPos > 0 ) // #i105457# Segmentation Fault opening graphics placeholder
                 {
+                    int nSubstitute = -1;
                     SwUndo * pTmpUndo;
                     do
                     {
@@ -717,11 +711,11 @@ SwUndoIdAndName * lcl_GetUndoIdAndName(const SwUndos & rUndos, sal_uInt16 nPos )
                  */
 
                 int nTmpPos = nPos;
-                int nUndoStart = nTmpPos - pUndoEnd->GetSttOffset();
-                int nSubstitute = -1;
 
                 if (nTmpPos > 0)
                 {
+                    int nUndoStart = nTmpPos - pUndoEnd->GetSttOffset();
+                    int nSubstitute = -1;
                     SwUndo * pTmpUndo;
 
                     do
@@ -1007,7 +1001,7 @@ SwUndo* SwDoc::RemoveLastUndo( SwUndoId eUndoId )
     else
     {
         pUndo = 0;
-        ASSERT( !this, "falsches Undo-Object" );
+        OSL_ENSURE( !this, "falsches Undo-Object" );
     }
     return pUndo;
 }
diff --git a/sw/source/core/undo/makefile.mk b/sw/source/core/undo/makefile.mk
index c381761adba1..d48ec2d4bbf7 100644
--- a/sw/source/core/undo/makefile.mk
+++ b/sw/source/core/undo/makefile.mk
@@ -46,17 +46,9 @@ SRC1FILES =  \
 
 EXCEPTIONSFILES = \
         $(SLO)$/SwRewriter.obj \
-        $(SLO)$/unattr.obj \
-        $(SLO)$/undobj.obj \
-        $(SLO)$/undraw.obj \
-        $(SLO)$/unovwr.obj \
-        $(SLO)$/untbl.obj
-
-SLOFILES =	\
-        $(SLO)$/SwRewriter.obj \
         $(SLO)$/SwUndoField.obj \
-        $(SLO)$/SwUndoPageDesc.obj \
         $(SLO)$/SwUndoFmt.obj \
+        $(SLO)$/SwUndoPageDesc.obj \
         $(SLO)$/SwUndoTOXChange.obj \
         $(SLO)$/docundo.obj \
         $(SLO)$/rolbck.obj \
@@ -65,7 +57,7 @@ SLOFILES =	\
         $(SLO)$/undel.obj \
         $(SLO)$/undobj.obj \
         $(SLO)$/undobj1.obj \
-                $(SLO)$/undoflystrattr.obj \
+        $(SLO)$/undoflystrattr.obj \
         $(SLO)$/undraw.obj \
         $(SLO)$/unfmco.obj \
         $(SLO)$/unins.obj \
@@ -80,6 +72,9 @@ SLOFILES =	\
         $(SLO)$/untbl.obj \
         $(SLO)$/untblk.obj
 
+SLOFILES =	\
+        $(EXCEPTIONSFILES)
+
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index 317636bf1b10..43418fb58a98 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -252,7 +252,7 @@ void SwHistorySetTxt::SetInDoc( SwDoc* pDoc, bool )
     }
 
     SwTxtNode * pTxtNd = pDoc->GetNodes()[ m_nNodeIndex ]->GetTxtNode();
-    ASSERT( pTxtNd, "SwHistorySetTxt::SetInDoc: not a TextNode" );
+    OSL_ENSURE( pTxtNd, "SwHistorySetTxt::SetInDoc: not a TextNode" );
 
     if ( pTxtNd )
     {
@@ -314,7 +314,7 @@ void SwHistorySetTxtFld::SetInDoc( SwDoc* pDoc, bool )
     m_pFld->GetFld()->ChgTyp( pNewFldType ); // change field type
 
     SwTxtNode * pTxtNd = pDoc->GetNodes()[ m_nNodeIndex ]->GetTxtNode();
-    ASSERT( pTxtNd, "SwHistorySetTxtFld: no TextNode" );
+    OSL_ENSURE( pTxtNd, "SwHistorySetTxtFld: no TextNode" );
 
     if ( pTxtNd )
     {
@@ -338,7 +338,7 @@ SwHistorySetRefMark::SwHistorySetRefMark( SwTxtRefMark* pTxtHt, ULONG nNodePos )
 void SwHistorySetRefMark::SetInDoc( SwDoc* pDoc, bool )
 {
     SwTxtNode * pTxtNd = pDoc->GetNodes()[ m_nNodeIndex ]->GetTxtNode();
-    ASSERT( pTxtNd, "SwHistorySetRefMark: no TextNode" );
+    OSL_ENSURE( pTxtNd, "SwHistorySetRefMark: no TextNode" );
     if ( !pTxtNd )
         return;
 
@@ -370,7 +370,7 @@ SwHistorySetTOXMark::SwHistorySetTOXMark( SwTxtTOXMark* pTxtHt, ULONG nNodePos )
 void SwHistorySetTOXMark::SetInDoc( SwDoc* pDoc, bool )
 {
     SwTxtNode * pTxtNd = pDoc->GetNodes()[ m_nNodeIndex ]->GetTxtNode();
-    ASSERT( pTxtNd, "SwHistorySetTOXMark: no TextNode" );
+    OSL_ENSURE( pTxtNd, "SwHistorySetTOXMark: no TextNode" );
     if ( !pTxtNd )
         return;
 
@@ -424,7 +424,7 @@ SwHistoryResetTxt::SwHistoryResetTxt( USHORT nWhich,
 void SwHistoryResetTxt::SetInDoc( SwDoc* pDoc, bool )
 {
     SwTxtNode * pTxtNd = pDoc->GetNodes()[ m_nNodeIndex ]->GetTxtNode();
-    ASSERT( pTxtNd, "SwHistoryResetTxt: no TextNode" );
+    OSL_ENSURE( pTxtNd, "SwHistoryResetTxt: no TextNode" );
     if ( pTxtNd )
     {
         pTxtNd->DeleteAttributes( m_nAttr, m_nStart, m_nEnd );
@@ -440,7 +440,7 @@ SwHistorySetFootnote::SwHistorySetFootnote( SwTxtFtn* pTxtFtn, ULONG nNodePos )
     , m_nStart( *pTxtFtn->GetStart() )
     , m_bEndNote( pTxtFtn->GetFtn().IsEndNote() )
 {
-    ASSERT( pTxtFtn->GetStartNode(),
+    OSL_ENSURE( pTxtFtn->GetStartNode(),
             "SwHistorySetFootnote: Footnote without Section" );
 
     // merke die alte NodePos, denn wer weiss was alles in der SaveSection
@@ -465,7 +465,7 @@ SwHistorySetFootnote::SwHistorySetFootnote( const SwTxtFtn &rTxtFtn )
     , m_nStart( *rTxtFtn.GetStart() )
     , m_bEndNote( rTxtFtn.GetFtn().IsEndNote() )
 {
-    ASSERT( rTxtFtn.GetStartNode(),
+    OSL_ENSURE( rTxtFtn.GetStartNode(),
             "SwHistorySetFootnote: Footnote without Section" );
 }
 
@@ -482,7 +482,7 @@ SwHistorySetFootnote::~SwHistorySetFootnote()
 void SwHistorySetFootnote::SetInDoc( SwDoc* pDoc, bool )
 {
     SwTxtNode * pTxtNd = pDoc->GetNodes()[ m_nNodeIndex ]->GetTxtNode();
-    ASSERT( pTxtNd, "SwHistorySetFootnote: no TextNode" );
+    OSL_ENSURE( pTxtNd, "SwHistorySetFootnote: no TextNode" );
     if ( !pTxtNd )
         return;
 
@@ -538,7 +538,7 @@ SwHistoryChangeFmtColl::SwHistoryChangeFmtColl( SwFmtColl* pFmtColl, ULONG nNd,
 void SwHistoryChangeFmtColl::SetInDoc( SwDoc* pDoc, bool )
 {
     SwCntntNode * pCntntNd = pDoc->GetNodes()[ m_nNodeIndex ]->GetCntntNode();
-    ASSERT( pCntntNd, "SwHistoryChangeFmtColl: no ContentNode" );
+    OSL_ENSURE( pCntntNd, "SwHistoryChangeFmtColl: no ContentNode" );
 
     // before setting the format, check if it is still available in the
     // document. if it has been deleted, there is no undo!
@@ -565,7 +565,7 @@ SwHistoryTxtFlyCnt::SwHistoryTxtFlyCnt( SwFrmFmt* const pFlyFmt )
     : SwHistoryHint( HSTRY_FLYCNT )
     , m_pUndo( new SwUndoDelLayFmt( pFlyFmt ) )
 {
-    ASSERT( pFlyFmt, "SwHistoryTxtFlyCnt: no Format" );
+    OSL_ENSURE( pFlyFmt, "SwHistoryTxtFlyCnt: no Format" );
     m_pUndo->ChgShowSel( FALSE );
 }
 
@@ -843,7 +843,7 @@ SwHistoryResetAttrSet::SwHistoryResetAttrSet( const SfxItemSet& rSet,
             case RES_TXTATR_FTN:
             case RES_TXTATR_META:
             case RES_TXTATR_METAFIELD:
-                ASSERT(rSet.Count() == 1,
+                OSL_ENSURE(rSet.Count() == 1,
                     "text attribute with CH_TXTATR, but not the only one:"
                     "\nnot such a good idea");
                 break;
@@ -880,7 +880,7 @@ void SwHistoryResetAttrSet::SetInDoc( SwDoc* pDoc, bool )
     pDoc->DoUndo( FALSE );
 
     SwCntntNode * pCntntNd = pDoc->GetNodes()[ m_nNodeIndex ]->GetCntntNode();
-    ASSERT( pCntntNd, "SwHistoryResetAttrSet: no CntntNode" );
+    OSL_ENSURE( pCntntNd, "SwHistoryResetAttrSet: no CntntNode" );
 
     if (pCntntNd)
     {
@@ -937,7 +937,7 @@ void SwHistoryChangeFlyAnchor::SetInDoc( SwDoc* pDoc, bool )
         SwPosition aPos( *pNd );
         if ( STRING_MAXLEN != m_nOldContentIndex )
         {
-            ASSERT(pCNd, "SwHistoryChangeFlyAnchor: no ContentNode");
+            OSL_ENSURE(pCNd, "SwHistoryChangeFlyAnchor: no ContentNode");
             if (pCNd)
             {
                 aPos.nContent.Assign( pCNd, m_nOldContentIndex );
@@ -1050,7 +1050,7 @@ void SwHistory::Add( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue,
                      ULONG nNodeIdx )
 // <--
 {
-    ASSERT( !m_nEndDiff, "History was not deleted after REDO" );
+    OSL_ENSURE( !m_nEndDiff, "History was not deleted after REDO" );
 
     USHORT nWhich = pNewValue->Which();
     if( (nWhich >= POOLATTR_END) || (nWhich == RES_TXTATR_FIELD) )
@@ -1072,7 +1072,7 @@ void SwHistory::Add( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue,
 
 void SwHistory::Add( SwTxtAttr* pHint, ULONG nNodeIdx, bool bNewAttr )
 {
-    ASSERT( !m_nEndDiff, "History was not deleted after REDO" );
+    OSL_ENSURE( !m_nEndDiff, "History was not deleted after REDO" );
 
     SwHistoryHint * pHt;
     USHORT nAttrWhich = pHint->Which();
@@ -1117,7 +1117,7 @@ void SwHistory::Add( SwTxtAttr* pHint, ULONG nNodeIdx, bool bNewAttr )
 
 void SwHistory::Add( SwFmtColl* pColl, ULONG nNodeIdx, BYTE nWhichNd )
 {
-    ASSERT( !m_nEndDiff, "History was not deleted after REDO" );
+    OSL_ENSURE( !m_nEndDiff, "History was not deleted after REDO" );
 
     SwHistoryHint * pHt =
         new SwHistoryChangeFmtColl( pColl, nNodeIdx, nWhichNd );
@@ -1127,7 +1127,7 @@ void SwHistory::Add( SwFmtColl* pColl, ULONG nNodeIdx, BYTE nWhichNd )
 
 void SwHistory::Add(const ::sw::mark::IMark& rBkmk, bool bSavePos, bool bSaveOtherPos)
 {
-    ASSERT( !m_nEndDiff, "History was not deleted after REDO" );
+    OSL_ENSURE( !m_nEndDiff, "History was not deleted after REDO" );
 
     SwHistoryHint * pHt = new SwHistoryBookmark(rBkmk, bSavePos, bSaveOtherPos);
     m_SwpHstry.Insert( pHt, Count() );
@@ -1142,7 +1142,7 @@ void SwHistory::Add( SwFrmFmt& rFmt )
 
 void SwHistory::Add( SwFlyFrmFmt& rFmt, USHORT& rSetPos )
 {
-    ASSERT( !m_nEndDiff, "History was not deleted after REDO" );
+    OSL_ENSURE( !m_nEndDiff, "History was not deleted after REDO" );
 
     SwHistoryHint * pHint;
     const USHORT nWh = rFmt.Which();
@@ -1261,7 +1261,7 @@ void SwHistory::Delete( USHORT nStart )
 
 USHORT SwHistory::SetTmpEnd( USHORT nNewTmpEnd )
 {
-    ASSERT( nNewTmpEnd <= Count(),  "SwHistory::SetTmpEnd: out of bounds" );
+    OSL_ENSURE( nNewTmpEnd <= Count(),  "SwHistory::SetTmpEnd: out of bounds" );
 
     USHORT nOld = Count() - m_nEndDiff;
     m_nEndDiff = Count() - nNewTmpEnd;
@@ -1436,7 +1436,7 @@ bool SwRegHistory::InsertItems( const SfxItemSet& rSet,
     SwTxtNode * const pTxtNode =
         dynamic_cast<SwTxtNode *>(const_cast<SwModify *>(GetRegisteredIn()));
 
-    ASSERT(pTxtNode, "SwRegHistory not registered at text node?");
+    OSL_ENSURE(pTxtNode, "SwRegHistory not registered at text node?");
     if (!pTxtNode)
         return false;
 
diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index 7f55159e41ec..01bd9f37256c 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -555,13 +555,13 @@ bool SwUndoFmtAttr::RestoreFlyAnchor( SwUndoIter& rIter )
         //Verbindung zwischen Attribut und Format.
         const SwPosition *pPos = rOldAnch.GetCntntAnchor();
         SwTxtNode *pTxtNode = (SwTxtNode*)&pPos->nNode.GetNode();
-        ASSERT( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
+        OSL_ENSURE( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
         const xub_StrLen nIdx = pPos->nContent.GetIndex();
         SwTxtAttr * const pHnt =
             pTxtNode->GetTxtAttrForCharAt( nIdx, RES_TXTATR_FLYCNT );
-        ASSERT( pHnt && pHnt->Which() == RES_TXTATR_FLYCNT,
+        OSL_ENSURE( pHnt && pHnt->Which() == RES_TXTATR_FLYCNT,
                     "Missing FlyInCnt-Hint." );
-        ASSERT( pHnt && pHnt->GetFlyCnt().GetFrmFmt() == pFrmFmt,
+        OSL_ENSURE( pHnt && pHnt->GetFlyCnt().GetFrmFmt() == pFrmFmt,
                     "Wrong TxtFlyCnt-Hint." );
         const_cast<SwFmtFlyCnt&>(pHnt->GetFlyCnt()).SetFlyFmt();
 
@@ -600,7 +600,7 @@ bool SwUndoFmtAttr::RestoreFlyAnchor( SwUndoIter& rIter )
 
         if( pCont->GetAnchorFrm() && !pObj->IsInserted() )
         {
-            ASSERT( pDoc->GetDrawModel(), "RestoreFlyAnchor without DrawModel" );
+            OSL_ENSURE( pDoc->GetDrawModel(), "RestoreFlyAnchor without DrawModel" );
             pDoc->GetDrawModel()->GetPage( 0 )->InsertObject( pObj );
         }
         pObj->SetRelativePos( aDrawSavePt );
@@ -614,7 +614,7 @@ bool SwUndoFmtAttr::RestoreFlyAnchor( SwUndoIter& rIter )
     {
         const SwPosition* pPos = aNewAnchor.GetCntntAnchor();
         SwTxtNode* pTxtNd = pPos->nNode.GetNode().GetTxtNode();
-        ASSERT( pTxtNd, "no Text Node at position." );
+        OSL_ENSURE( pTxtNd, "no Text Node at position." );
         SwFmtFlyCnt aFmt( pFrmFmt );
         pTxtNd->InsertItem( aFmt, pPos->nContent.GetIndex(), 0 );
     }
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index 8832fb9cc3b6..c8ab7076b826 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -139,7 +139,7 @@ SwUndoDelete::SwUndoDelete( SwPaM& rPam, BOOL bFullPara, BOOL bCalledByTblCpy )
     // Step 1. deletion/record of content indizes
     if( bDelFullPara )
     {
-        ASSERT( rPam.HasMark(), "PaM ohne Mark" );
+        OSL_ENSURE( rPam.HasMark(), "PaM ohne Mark" );
         DelCntntIndex( *rPam.GetMark(), *rPam.GetPoint(),
                         DelCntntType(nsDelCntntType::DELCNT_ALL | nsDelCntntType::DELCNT_CHKNOCNTNT) );
 
@@ -892,7 +892,7 @@ void SwUndoDelete::Redo( SwUndoIter& rUndoIter )
 
         if( bDelFullPara )
         {
-            ASSERT( rPam.HasMark(), "PaM ohne Mark" );
+            OSL_ENSURE( rPam.HasMark(), "PaM ohne Mark" );
             DelCntntIndex( *rPam.GetMark(), *rPam.GetPoint(),
                             DelCntntType(nsDelCntntType::DELCNT_ALL | nsDelCntntType::DELCNT_CHKNOCNTNT) );
 
@@ -908,7 +908,7 @@ void SwUndoDelete::Redo( SwUndoIter& rUndoIter )
     {
         if( bDelFullPara )
         {
-            ASSERT( rPam.HasMark(), "PaM ohne Mark" );
+            OSL_ENSURE( rPam.HasMark(), "PaM ohne Mark" );
             DelCntntIndex( *rPam.GetMark(), *rPam.GetPoint(),
                             DelCntntType(nsDelCntntType::DELCNT_ALL | nsDelCntntType::DELCNT_CHKNOCNTNT) );
 
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index c4beaa10f7ad..3362c0ed3a05 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -62,7 +62,7 @@ public:
     SwNodeIndex* GetMvSttIdx() const
         { return SwUndoSaveSection::GetMvSttIdx(); }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     USHORT nRedlineCount;
 #endif
 };
@@ -435,7 +435,7 @@ void SwUndoSaveCntnt::MoveFromUndoNds( SwDoc& rDoc, ULONG nNodeIdx,
 
     }
     else {
-        ASSERT( FALSE, "was ist es denn nun?" );
+        OSL_ENSURE( FALSE, "was ist es denn nun?" );
     }
 
     rDoc.DoUndo( bUndo );
@@ -536,7 +536,7 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& rMark,
                     pHistory = new SwHistory;
                 SwTxtAttr* const pFtnHnt =
                     pTxtNd->GetTxtAttrForCharAt( nFtnSttIdx );
-                ASSERT( pFtnHnt, "kein FtnAttribut" );
+                OSL_ENSURE( pFtnHnt, "kein FtnAttribut" );
                 SwIndex aIdx( pTxtNd, nFtnSttIdx );
                 pHistory->Add( pFtnHnt, pTxtNd->GetIndex(), false );
                 pTxtNd->EraseText( aIdx, 1 );
@@ -560,7 +560,7 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& rMark,
                     pHistory = new SwHistory;
                 SwTxtAttr* const pFtnHnt =
                     pTxtNd->GetTxtAttrForCharAt( nFtnSttIdx );
-                ASSERT( pFtnHnt, "kein FtnAttribut" );
+                OSL_ENSURE( pFtnHnt, "kein FtnAttribut" );
                 SwIndex aIdx( pTxtNd, nFtnSttIdx );
                 pHistory->Add( pFtnHnt, pTxtNd->GetIndex(), false );
                 pTxtNd->EraseText( aIdx, 1 );
@@ -599,7 +599,7 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& rMark,
                         SwTxtNode* pTxtNd = pDoc->GetNodes()[ pAPos->nNode]->GetTxtNode();
                         SwTxtAttr* const pFlyHnt = pTxtNd->GetTxtAttrForCharAt(
                             pAPos->nContent.GetIndex());
-                        ASSERT( pFlyHnt, "kein FlyAttribut" );
+                        OSL_ENSURE( pFlyHnt, "kein FlyAttribut" );
                         pHistory->Add( pFlyHnt, 0, false );
                         // n wieder zurueck, damit nicht ein Format uebesprungen wird !
                         n = n >= rSpzArr.Count() ? rSpzArr.Count() : n+1;
@@ -879,7 +879,7 @@ void SwUndoSaveSection::RestoreSection( SwDoc* pDoc, SwNodeIndex* pIdx,
     {
         // ueberpruefe, ob der Inhalt an der alten Position steht
         SwNodeIndex aSttIdx( pDoc->GetNodes(), nStartPos );
-        ASSERT( !pDoc->GetNodes()[ aSttIdx ]->GetCntntNode(),
+        OSL_ENSURE( !pDoc->GetNodes()[ aSttIdx ]->GetCntntNode(),
                 "Position in irgendeiner Section" );
 
         // move den Inhalt aus dem UndoNodes-Array in den Fly
@@ -1046,7 +1046,7 @@ SwRedlineSaveData::SwRedlineSaveData( SwComparePosition eCmpPos,
     : SwUndRng( rRedl ),
     SwRedlineData( rRedl.GetRedlineData(), bCopyNext )
 {
-    ASSERT( POS_OUTSIDE == eCmpPos ||
+    OSL_ENSURE( POS_OUTSIDE == eCmpPos ||
             !rRedl.GetContentIdx(), "Redline mit Content" );
 
     switch( eCmpPos )
@@ -1080,10 +1080,10 @@ SwRedlineSaveData::SwRedlineSaveData( SwComparePosition eCmpPos,
         break;
 
     default:
-        ASSERT( !this, "keine gueltigen Daten!" )
+        OSL_ENSURE( !this, "keine gueltigen Daten!" );
     }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     nRedlineCount = rSttPos.nNode.GetNode().GetDoc()->GetRedlineTbl().Count();
 #endif
 }
@@ -1114,7 +1114,7 @@ void SwRedlineSaveData::RedlineToDoc( SwPaM& rPam )
     RedlineMode_t eOld = rDoc.GetRedlineMode();
     rDoc.SetRedlineMode_intern((RedlineMode_t)(eOld | nsRedlineMode_t::REDLINE_DONTCOMBINE_REDLINES));
     //#i92154# let UI know about a new redline with comment
-    if (rDoc.GetDocShell() && (pRedl->GetComment() != String(::rtl::OUString::createFromAscii(""))) )
+    if (rDoc.GetDocShell() && (pRedl->GetComment() != String()) )
         rDoc.GetDocShell()->Broadcast(SwRedlineHint(pRedl,SWREDLINE_INSERTED));
     //
 #if OSL_DEBUG_LEVEL > 0
@@ -1197,10 +1197,12 @@ void SwUndo::SetSaveData( SwDoc& rDoc, const SwRedlineSaveDatas& rSData )
     for( USHORT n = rSData.Count(); n; )
         rSData[ --n ]->RedlineToDoc( aPam );
 
+#if OSL_DEBUG_LEVEL > 1
     // check redline count against count saved in RedlineSaveData object
-    DBG_ASSERT( (rSData.Count() == 0) ||
+    OSL_ENSURE( (rSData.Count() == 0) ||
                 (rSData[0]->nRedlineCount == rDoc.GetRedlineTbl().Count()),
                 "redline count not restored properly" );
+#endif
 
     rDoc.SetRedlineMode_intern( eOld );
 }
@@ -1254,7 +1256,7 @@ BOOL SwUndo::CanRedlineGroup( SwRedlineSaveDatas& rCurr,
 // #111827#
 String ShortenString(const String & rStr, xub_StrLen nLength, const String & rFillStr)
 {
-    ASSERT( nLength - rFillStr.Len() >= 2, "improper arguments")
+    OSL_ENSURE( nLength - rFillStr.Len() >= 2, "improper arguments");
 
     String aResult;
 
diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx
index 5c1d23370d20..08673ba275e5 100644
--- a/sw/source/core/undo/undobj1.cxx
+++ b/sw/source/core/undo/undobj1.cxx
@@ -125,7 +125,7 @@ void SwUndoFlyBase::InsFly( SwUndoIter& rUndoIter, BOOL bShowSelFrm )
     {
         // es muss mindestens das Attribut im TextNode stehen
         SwCntntNode* pCNd = aAnchor.GetCntntAnchor()->nNode.GetNode().GetCntntNode();
-        ASSERT( pCNd->IsTxtNode(), "no Text Node at position." );
+        OSL_ENSURE( pCNd->IsTxtNode(), "no Text Node at position." );
         SwFmtFlyCnt aFmt( pFrmFmt );
         static_cast<SwTxtNode*>(pCNd)->InsertItem( aFmt, nCntPos, nCntPos );
     }
@@ -176,7 +176,7 @@ void SwUndoFlyBase::DelFly( SwDoc* pDoc )
     {
         // gibt es ueberhaupt Inhalt, dann sicher diesen
         const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt();
-        ASSERT( rCntnt.GetCntntIdx(), "Fly ohne Inhalt" );
+        OSL_ENSURE( rCntnt.GetCntntIdx(), "Fly ohne Inhalt" );
 
         SaveSection( pDoc, *rCntnt.GetCntntIdx() );
         ((SwFmtCntnt&)rCntnt).SetNewCntntIdx( (const SwNodeIndex*)0 );
@@ -201,7 +201,7 @@ void SwUndoFlyBase::DelFly( SwDoc* pDoc )
         nNdPgPos = pPos->nNode.GetIndex();
         nCntPos = pPos->nContent.GetIndex();
         SwTxtNode *pTxtNd = pDoc->GetNodes()[ pPos->nNode ]->GetTxtNode();
-        ASSERT( pTxtNd, "Kein Textnode gefunden" );
+        OSL_ENSURE( pTxtNd, "Kein Textnode gefunden" );
         SwTxtFlyCnt* const pAttr = static_cast<SwTxtFlyCnt*>(
             pTxtNd->GetTxtAttrForCharAt( nCntPos, RES_TXTATR_FLYCNT ) );
         // Attribut steht noch im TextNode, loeschen
@@ -263,7 +263,7 @@ SwUndoInsLayFmt::SwUndoInsLayFmt( SwFrmFmt* pFormat, ULONG nNodeIdx, xub_StrLen
         }
         break;
     default:
-        ASSERT( FALSE, "Was denn fuer ein FlyFrame?" );
+        OSL_ENSURE( FALSE, "Was denn fuer ein FlyFrame?" );
     }
 }
 
@@ -343,7 +343,7 @@ void SwUndoInsLayFmt::Repeat( SwUndoIter& rUndoIter )
                                         rUndoIter.pAktPam ));
     }
     else {
-        ASSERT( FALSE, "was fuer ein Anker ist es denn nun?" );
+        OSL_ENSURE( FALSE, "was fuer ein Anker ist es denn nun?" );
     }
 
     SwFrmFmt* pFlyFmt = pDoc->CopyLayoutFmt( *pFrmFmt, aAnchor, true, true );
@@ -574,13 +574,13 @@ void SwUndoSetFlyFmt::Undo( SwUndoIter& rIter )
                 // Attribut und Format.
                 const SwPosition *pPos = rOldAnch.GetCntntAnchor();
                 SwTxtNode *pTxtNode = pPos->nNode.GetNode().GetTxtNode();
-                ASSERT( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
+                OSL_ENSURE( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
                 const xub_StrLen nIdx = pPos->nContent.GetIndex();
                 SwTxtAttr * pHnt = pTxtNode->GetTxtAttrForCharAt(
                         nIdx, RES_TXTATR_FLYCNT );
-                ASSERT( pHnt && pHnt->Which() == RES_TXTATR_FLYCNT,
+                OSL_ENSURE( pHnt && pHnt->Which() == RES_TXTATR_FLYCNT,
                             "Missing FlyInCnt-Hint." );
-                ASSERT( pHnt && pHnt->GetFlyCnt().GetFrmFmt() == pFrmFmt,
+                OSL_ENSURE( pHnt && pHnt->GetFlyCnt().GetFrmFmt() == pFrmFmt,
                             "Wrong TxtFlyCnt-Hint." );
                 const_cast<SwFmtFlyCnt&>(pHnt->GetFlyCnt()).SetFlyFmt();
 
@@ -639,7 +639,7 @@ void SwUndoSetFlyFmt::PutAttr( USHORT nWhich, const SfxPoolItem* pItem )
         if( RES_ANCHOR == nWhich )
         {
             // nur den 1. Ankerwechsel vermerken
-            ASSERT( !bAnchorChgd, "mehrfacher Ankerwechsel nicht erlaubt!" );
+            OSL_ENSURE( !bAnchorChgd, "mehrfacher Ankerwechsel nicht erlaubt!" );
 
             bAnchorChgd = TRUE;
 
diff --git a/sw/source/core/undo/undoflystrattr.cxx b/sw/source/core/undo/undoflystrattr.cxx
index af5a451737aa..3facce917f88 100644
--- a/sw/source/core/undo/undoflystrattr.cxx
+++ b/sw/source/core/undo/undoflystrattr.cxx
@@ -41,7 +41,7 @@ SwUndoFlyStrAttr::SwUndoFlyStrAttr( SwFlyFrmFmt& rFlyFrmFmt,
       msOldStr( sOldStr ),
       msNewStr( sNewStr )
 {
-    ASSERT( eUndoId == UNDO_FLYFRMFMT_TITLE ||
+    OSL_ENSURE( eUndoId == UNDO_FLYFRMFMT_TITLE ||
             eUndoId == UNDO_FLYFRMFMT_DESCRIPTION,
             "<SwUndoFlyStrAttr::SwUndoFlyStrAttr(..)> - unexpected undo id --> Undo will not work" );
 }
diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx
index 3590ba623632..81f6dce132b1 100644
--- a/sw/source/core/undo/undraw.cxx
+++ b/sw/source/core/undo/undraw.cxx
@@ -149,7 +149,7 @@ void lcl_SaveAnchor( SwFrmFmt* pFmt, ULONG& rNodePos )
 
             // TextAttribut zerstoeren
             SwTxtNode *pTxtNd = pFmt->GetDoc()->GetNodes()[ rNodePos ]->GetTxtNode();
-            ASSERT( pTxtNd, "Kein Textnode gefunden" );
+            OSL_ENSURE( pTxtNd, "Kein Textnode gefunden" );
             SwTxtFlyCnt* pAttr = static_cast<SwTxtFlyCnt*>(
                 pTxtNd->GetTxtAttrForCharAt( nCntntPos, RES_TXTATR_FLYCNT ));
             // Attribut steht noch im TextNode, loeschen
@@ -196,7 +196,7 @@ void lcl_RestoreAnchor( SwFrmFmt* pFmt, ULONG& rNodePos )
         if (FLY_AS_CHAR == rAnchor.GetAnchorId())
         {
             SwTxtNode *pTxtNd = aIdx.GetNode().GetTxtNode();
-            ASSERT( pTxtNd, "no Text Node" );
+            OSL_ENSURE( pTxtNd, "no Text Node" );
             SwFmtFlyCnt aFmt( pFmt );
             pTxtNd->InsertItem( aFmt, nCntntPos, nCntntPos );
         }
@@ -264,7 +264,7 @@ void SwUndoDrawGroup::Undo( SwUndoIter& )
         // <--
         // --> OD 2005-05-10 #i45952# - notify that position attributes
         // are already set
-        ASSERT( rSave.pFmt->ISA(SwDrawFrmFmt),
+        OSL_ENSURE( rSave.pFmt->ISA(SwDrawFrmFmt),
                 "<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object" );
         if ( rSave.pFmt->ISA(SwDrawFrmFmt) )
         {
@@ -315,7 +315,7 @@ void SwUndoDrawGroup::Redo( SwUndoIter& )
     // <--
     // --> OD 2005-05-10 #i45952# - notify that position attributes
     // are already set
-    ASSERT( pObjArr->pFmt->ISA(SwDrawFrmFmt),
+    OSL_ENSURE( pObjArr->pFmt->ISA(SwDrawFrmFmt),
             "<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object" );
     if ( pObjArr->pFmt->ISA(SwDrawFrmFmt) )
     {
@@ -431,7 +431,7 @@ void SwUndoDrawUnGroup::Undo( SwUndoIter& rIter )
     // <--
     // --> OD 2005-05-10 #i45952# - notify that position attributes
     // are already set
-    ASSERT( pObjArr->pFmt->ISA(SwDrawFrmFmt),
+    OSL_ENSURE( pObjArr->pFmt->ISA(SwDrawFrmFmt),
             "<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object" );
     if ( pObjArr->pFmt->ISA(SwDrawFrmFmt) )
     {
@@ -482,7 +482,7 @@ void SwUndoDrawUnGroup::Redo( SwUndoIter& )
         // <--
         // --> OD 2005-05-10 #i45952# - notify that position attributes
         // are already set
-        ASSERT( rSave.pFmt->ISA(SwDrawFrmFmt),
+        OSL_ENSURE( rSave.pFmt->ISA(SwDrawFrmFmt),
                 "<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object" );
         if ( rSave.pFmt->ISA(SwDrawFrmFmt) )
         {
@@ -517,7 +517,7 @@ void SwUndoDrawUnGroupConnectToLayout::Undo( SwUndoIter& )
     {
         SdrObject* pObj( aDrawFmtsAndObjs[i].second );
         SwDrawContact* pDrawContact( dynamic_cast<SwDrawContact*>(pObj->GetUserCall()) );
-        ASSERT( pDrawContact,
+        OSL_ENSURE( pDrawContact,
                 "<SwUndoDrawUnGroupConnectToLayout::Undo(..)> -- missing SwDrawContact instance" );
         if ( pDrawContact )
         {
@@ -589,7 +589,7 @@ void SwUndoDrawDelete::Undo( SwUndoIter &rIter )
         // <--
         // --> OD 2005-05-10 #i45952# - notify that position attributes
         // are already set
-        ASSERT( rSave.pFmt->ISA(SwDrawFrmFmt),
+        OSL_ENSURE( rSave.pFmt->ISA(SwDrawFrmFmt),
                 "<SwUndoDrawGroup::Undo(..)> - wrong type of frame format for drawing object" );
         if ( rSave.pFmt->ISA(SwDrawFrmFmt) )
         {
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 4a0b94401247..8fd74df0151f 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -233,7 +233,7 @@ SwUndoInsert::~SwUndoInsert()
         if( pPos->nContent.GetIndex() )         // nicht den gesamten Node loeschen
         {
             SwTxtNode* pTxtNd = pPos->nNode.GetNode().GetTxtNode();
-            ASSERT( pTxtNd, "kein TextNode, aus dem geloescht werden soll" );
+            OSL_ENSURE( pTxtNd, "kein TextNode, aus dem geloescht werden soll" );
             pTxtNd->EraseText( pPos->nContent );
             pPos->nNode++;
         }
@@ -367,7 +367,7 @@ void SwUndoInsert::Redo( SwUndoIter& rUndoIter )
             if( pTxt )
             {
                 SwTxtNode *const pTxtNode = pCNd->GetTxtNode();
-                ASSERT( pTxtNode, "where is my textnode ?" );
+                OSL_ENSURE( pTxtNode, "where is my textnode ?" );
                 pTxtNode->InsertText( *pTxt, pPam->GetMark()->nContent,
                       m_nInsertFlags );
                 DELETEZ( pTxt );
@@ -541,7 +541,7 @@ void SwUndoReplace::Redo( SwUndoIter& rUndoIter )
     // Count neu
     if( rUndoIter.pLastUndoObj != this )
     {
-        ASSERT( !nAktPos, "Redo ohne vorheriges Undo??" );
+        OSL_ENSURE( !nAktPos, "Redo ohne vorheriges Undo??" );
         rUndoIter.pLastUndoObj = this;
         bOldIterFlag = rUndoIter.bWeiter;
         rUndoIter.bWeiter = TRUE;
@@ -632,7 +632,7 @@ _UnReplaceData::_UnReplaceData( const SwPaM& rPam, const String& rIns,
     m_bSplitNext = m_nSttNd != pEnd->nNode.GetIndex();
 
     SwTxtNode* pNd = pStt->nNode.GetNode().GetTxtNode();
-    ASSERT( pNd, "wo ist der TextNode" );
+    OSL_ENSURE( pNd, "wo ist der TextNode" );
 
     pHistory = new SwHistory;
     DelCntntIndex( *rPam.GetMark(), *rPam.GetPoint() );
@@ -685,7 +685,7 @@ void _UnReplaceData::Undo( SwUndoIter& rIter )
     rPam.DeleteMark();
 
     SwTxtNode* pNd = pDoc->GetNodes()[ m_nSttNd - m_nOffset ]->GetTxtNode();
-    ASSERT( pNd, "Wo ist der TextNode geblieben?" )
+    OSL_ENSURE( pNd, "Wo ist der TextNode geblieben?" );
 
     SwAutoCorrExceptWord* pACEWord = pDoc->GetAutoCorrExceptWord();
     if( pACEWord )
@@ -714,7 +714,7 @@ void _UnReplaceData::Undo( SwUndoIter& rIter )
         pDoc->DeleteAndJoin( rPam );
         rPam.DeleteMark();
         pNd = rPam.GetNode()->GetTxtNode();
-        ASSERT( pNd, "Wo ist der TextNode geblieben?" );
+        OSL_ENSURE( pNd, "Wo ist der TextNode geblieben?" );
         aIdx.Assign( pNd, m_nSttCnt );
     }
 
@@ -774,7 +774,7 @@ void _UnReplaceData::Redo( SwUndoIter& rIter )
     rPam.GetPoint()->nNode = m_nSttNd;
 
     SwTxtNode* pNd = rPam.GetPoint()->nNode.GetNode().GetTxtNode();
-    ASSERT( pNd, "Wo ist der TextNode geblieben?" )
+    OSL_ENSURE( pNd, "Wo ist der TextNode geblieben?" );
     rPam.GetPoint()->nContent.Assign( pNd, m_nSttCnt );
     rPam.SetMark();
     if( m_bSplitNext )
@@ -945,7 +945,7 @@ void SwUndoInsertLabel::Undo( SwUndoIter& rIter )
 
     if( LTYPE_OBJECT == eType || LTYPE_DRAW == eType )
     {
-        ASSERT( OBJECT.pUndoAttr && OBJECT.pUndoFly, "Pointer nicht initialisiert" )
+        OSL_ENSURE( OBJECT.pUndoAttr && OBJECT.pUndoFly, "Pointer nicht initialisiert" );
         SwFrmFmt* pFmt;
         SdrObject *pSdrObj = 0;
         if( OBJECT.pUndoAttr &&
@@ -985,7 +985,7 @@ void SwUndoInsertLabel::Redo( SwUndoIter& rIter )
 
     if( LTYPE_OBJECT == eType || LTYPE_DRAW == eType )
     {
-        ASSERT( OBJECT.pUndoAttr && OBJECT.pUndoFly, "Pointer nicht initialisiert" )
+        OSL_ENSURE( OBJECT.pUndoAttr && OBJECT.pUndoFly, "Pointer nicht initialisiert" );
         SwFrmFmt* pFmt;
         SdrObject *pSdrObj = 0;
         if( OBJECT.pUndoAttr &&
diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx
index 0e17ddf9c6c5..c6f76dc63efc 100644
--- a/sw/source/core/undo/unnum.cxx
+++ b/sw/source/core/undo/unnum.cxx
@@ -230,7 +230,7 @@ void SwUndoDelNum::Undo( SwUndoIter& rUndoIter )
     for( USHORT n = 0; n < aNodeIdx.Count(); ++n )
     {
         SwTxtNode* pNd = rDoc.GetNodes()[ aNodeIdx[ n ] ]->GetTxtNode();
-        ASSERT( pNd, "wo ist der TextNode geblieben?" );
+        OSL_ENSURE( pNd, "wo ist der TextNode geblieben?" );
         pNd->SetAttrListLevel(aLevels[ n ] );
 
         if( pNd->GetCondFmtColl() )
diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx
index 522bc62e9665..eb1ff8b846ec 100644
--- a/sw/source/core/undo/unovwr.cxx
+++ b/sw/source/core/undo/unovwr.cxx
@@ -84,7 +84,7 @@ SwUndoOverwrite::SwUndoOverwrite( SwDoc* pDoc, SwPosition& rPos,
     nSttCntnt = rPos.nContent.GetIndex();
 
     SwTxtNode* pTxtNd = rPos.nNode.GetNode().GetTxtNode();
-    ASSERT( pTxtNd, "Overwrite nicht im TextNode?" );
+    OSL_ENSURE( pTxtNd, "Overwrite nicht im TextNode?" );
 
     bInsChar = TRUE;
     xub_StrLen nTxtNdLen = pTxtNd->GetTxt().Len();
@@ -208,7 +208,7 @@ void SwUndoOverwrite::Undo( SwUndoIter& rUndoIter )
     pAktPam->DeleteMark();
     pAktPam->GetPoint()->nNode = nSttNode;
     SwTxtNode* pTxtNd = pAktPam->GetNode()->GetTxtNode();
-    ASSERT( pTxtNd, "Overwrite nicht im TextNode?" );
+    OSL_ENSURE( pTxtNd, "Overwrite nicht im TextNode?" );
     SwIndex& rIdx = pAktPam->GetPoint()->nContent;
     rIdx.Assign( pTxtNd, nSttCntnt );
 
@@ -293,7 +293,7 @@ void SwUndoOverwrite::Redo( SwUndoIter& rUndoIter )
     pAktPam->DeleteMark();
     pAktPam->GetPoint()->nNode = nSttNode;
     SwTxtNode* pTxtNd = pAktPam->GetNode()->GetTxtNode();
-    ASSERT( pTxtNd, "Overwrite nicht im TextNode?" );
+    OSL_ENSURE( pTxtNd, "Overwrite nicht im TextNode?" );
     SwIndex& rIdx = pAktPam->GetPoint()->nContent;
 
     if( pRedlSaveData )
diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx
index 05c8f001aed1..a994e5e1faa9 100644
--- a/sw/source/core/undo/unredln.cxx
+++ b/sw/source/core/undo/unredln.cxx
@@ -260,7 +260,7 @@ void SwUndoRedlineSort::_Undo( SwUndoIter& rIter )
         USHORT nFnd = rDoc.GetRedlinePos(
                             *rDoc.GetNodes()[ nSttNode + 1 ],
                             nsRedlineType_t::REDLINE_INSERT );
-        ASSERT( USHRT_MAX != nFnd && nFnd+1 < rDoc.GetRedlineTbl().Count(),
+        OSL_ENSURE( USHRT_MAX != nFnd && nFnd+1 < rDoc.GetRedlineTbl().Count(),
                     "kein Insert Object gefunden" );
         ++nFnd;
         rDoc.GetRedlineTbl()[nFnd]->Show( 1 );
diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx
index 57ae1d4f36e5..a78f911f30f0 100644
--- a/sw/source/core/undo/unsect.cxx
+++ b/sw/source/core/undo/unsect.cxx
@@ -131,7 +131,7 @@ void SwUndoInsSection::Undo( SwUndoIter& rUndoIter )
 
     SwSectionNode *const pNd =
         rDoc.GetNodes()[ m_nSectionNodePos ]->GetSectionNode();
-    ASSERT( pNd, "wo ist mein SectionNode?" );
+    OSL_ENSURE( pNd, "wo ist mein SectionNode?" );
 
     if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() ))
         rDoc.DeleteRedline( *pNd, true, USHRT_MAX );
@@ -245,7 +245,7 @@ void SwUndoInsSection::Join( SwDoc& rDoc, ULONG nNode )
 {
     SwNodeIndex aIdx( rDoc.GetNodes(), nNode );
     SwTxtNode* pTxtNd = aIdx.GetNode().GetTxtNode();
-    ASSERT( pTxtNd, "wo ist mein TextNode?" );
+    OSL_ENSURE( pTxtNd, "wo ist mein TextNode?" );
 
     {
         RemoveIdxRel( nNode + 1, SwPosition( aIdx,
@@ -390,7 +390,7 @@ void SwUndoDelSection::Redo( SwUndoIter& rUndoIter )
 
     SwSectionNode *const pNd =
         rDoc.GetNodes()[ m_nStartNode ]->GetSectionNode();
-    ASSERT( pNd, "wo ist mein SectionNode?" );
+    OSL_ENSURE( pNd, "wo ist mein SectionNode?" );
     // einfach das Format loeschen, der Rest erfolgt automatisch
     rDoc.DelSectionFmt( pNd->GetSection().GetFmt() );
 }
@@ -442,7 +442,7 @@ void SwUndoUpdateSection::Undo( SwUndoIter& rUndoIter )
     SwDoc& rDoc = rUndoIter.GetDoc();
     SwSectionNode *const pSectNd =
         rDoc.GetNodes()[ m_nStartNode ]->GetSectionNode();
-    ASSERT( pSectNd, "wo ist mein SectionNode?" );
+    OSL_ENSURE( pSectNd, "wo ist mein SectionNode?" );
 
     SwSection& rNdSect = pSectNd->GetSection();
     SwFmt* pFmt = rNdSect.GetFmt();
diff --git a/sw/source/core/undo/unspnd.cxx b/sw/source/core/undo/unspnd.cxx
index fa42ea36a5e0..f1fd1fda60da 100644
--- a/sw/source/core/undo/unspnd.cxx
+++ b/sw/source/core/undo/unspnd.cxx
@@ -59,7 +59,7 @@ SwUndoSplitNode::SwUndoSplitNode( SwDoc* pDoc, const SwPosition& rPos,
         bTblFlag( FALSE ), bChkTblStt( bChkTable )
 {
     SwTxtNode* pTxtNd = pDoc->GetNodes()[ rPos.nNode ]->GetTxtNode();
-    ASSERT( pTxtNd, "nur beim TextNode rufen!" );
+    OSL_ENSURE( pTxtNd, "nur beim TextNode rufen!" );
     if( pTxtNd->GetpSwpHints() )
     {
         pHistory = new SwHistory;
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index acd218da341a..e6e450088b22 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -64,21 +64,17 @@
 #include <comcore.hrc>
 #include <unochart.hxx>
 
-#ifndef DBG_UTIL
-#define CHECK_TABLE(t)
-#else
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
 #define CHECK_TABLE(t) (t).CheckConsistency();
 #else
 #define CHECK_TABLE(t)
 #endif
-#endif
 
-#ifndef DBG_UTIL
-    #define _DEBUG_REDLINE( pDoc )
-#else
+#if OSL_DEBUG_LEVEL > 1
     void lcl_DebugRedline( const SwDoc* pDoc );
     #define _DEBUG_REDLINE( pDoc ) lcl_DebugRedline( pDoc );
+#else
+    #define _DEBUG_REDLINE( pDoc )
 #endif
 
 inline SwDoc& SwUndoIter::GetDoc() const { return *pAktPam->GetDoc(); }
@@ -192,14 +188,11 @@ public:
 void InsertSort( SvUShorts& rArr, USHORT nIdx, USHORT* pInsPos = 0 );
 void InsertSort( SvULongs& rArr, ULONG nIdx, USHORT* pInsPos = 0 );
 
-#if defined( JP_DEBUG ) && defined(DBG_UTIL)
+#if OSL_DEBUG_LEVEL > 1
 #include "shellio.hxx"
-void DumpDoc( SwDoc* pDoc, const String& rFileNm );
 void CheckTable( const SwTable& );
-#define DUMPDOC(p,s)    DumpDoc( p, s);
 #define CHECKTABLE(t) CheckTable( t );
 #else
-#define DUMPDOC(p,s)
 #define CHECKTABLE(t)
 #endif
 
@@ -282,7 +275,7 @@ void SwUndoInsTbl::Undo( SwUndoIter& rUndoIter )
     SwNodeIndex aIdx( rDoc.GetNodes(), nSttNode );
 
     SwTableNode* pTblNd = aIdx.GetNode().GetTableNode();
-    ASSERT( pTblNd, "kein TabellenNode" );
+    OSL_ENSURE( pTblNd, "kein TabellenNode" );
     pTblNd->DelFrms();
 
     if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() ))
@@ -585,7 +578,7 @@ SwTableNode* SwNodes::UndoTableToText( ULONG nSttNd, ULONG nEndNd,
         {
             // an der ContentPosition splitten, das vorherige Zeichen
             // loeschen (ist der Trenner!)
-            ASSERT( pTxtNd, "Wo ist der TextNode geblieben?" );
+            OSL_ENSURE( pTxtNd, "Wo ist der TextNode geblieben?" );
             SwIndex aCntPos( pTxtNd, pSave->m_nCntnt - 1 );
 
             pTxtNd->EraseText( aCntPos, 1 );
@@ -668,7 +661,7 @@ void SwUndoTblToTxt::Redo( SwUndoIter& rUndoIter )
     pPam->DeleteMark();
 
     SwTableNode* pTblNd = pPam->GetNode()->GetTableNode();
-    ASSERT( pTblNd, "keinen TableNode gefunden" );
+    OSL_ENSURE( pTblNd, "keinen TableNode gefunden" );
 
     if( pTblNd->GetTable().IsA( TYPE( SwDDETable )) )
         pDDEFldType = (SwDDEFieldType*)((SwDDETable&)pTblNd->GetTable()).
@@ -681,7 +674,7 @@ void SwUndoTblToTxt::Redo( SwUndoIter& rUndoIter )
     if( !pCNd && 0 == ( pCNd = rDoc.GetNodes().GoNext( &aSaveIdx ) ) &&
         0 == ( pCNd = rDoc.GetNodes().GoPrevious( &aSaveIdx )) )
     {
-        ASSERT( FALSE, "wo steht denn nun der TextNode" );
+        OSL_ENSURE( FALSE, "wo steht denn nun der TextNode" );
     }
 
     pPam->GetPoint()->nNode = aSaveIdx;
@@ -755,7 +748,7 @@ void SwUndoTxtToTbl::Undo( SwUndoIter& rUndoIter )
         ++nTblNd;       // Node wurde vorher gesplittet
     SwNodeIndex aIdx( rDoc.GetNodes(), nTblNd );
     SwTableNode* pTNd = rDoc.GetNodes()[ aIdx ]->GetTableNode();
-    ASSERT( pTNd, "keinen Tabellen-Node gefunden" );
+    OSL_ENSURE( pTNd, "keinen Tabellen-Node gefunden" );
 
     RemoveIdxFromSection( rDoc, nTblNd );
 
@@ -776,7 +769,7 @@ void SwUndoTxtToTbl::Undo( SwUndoIter& rUndoIter )
             if( pBox )
                 ::_DeleteBox( rTbl, pBox, 0, FALSE, FALSE );
             else {
-                ASSERT( !this, "Wo ist die Box geblieben?" );
+                OSL_ENSURE( !this, "Wo ist die Box geblieben?" );
             }
         }
     }
@@ -868,9 +861,9 @@ SwUndoTblHeadline::SwUndoTblHeadline( const SwTable& rTbl, USHORT nOldHdl,
     nOldHeadline( nOldHdl ),
     nNewHeadline( nNewHdl )
 {
-    ASSERT( rTbl.GetTabSortBoxes().Count(), "Tabelle ohne Inhalt" );
+    OSL_ENSURE( rTbl.GetTabSortBoxes().Count(), "Tabelle ohne Inhalt" );
     const SwStartNode *pSttNd = rTbl.GetTabSortBoxes()[ 0 ]->GetSttNd();
-    ASSERT( pSttNd, "Box ohne Inhalt" );
+    OSL_ENSURE( pSttNd, "Box ohne Inhalt" );
 
     nTblNd = pSttNd->StartOfSectionIndex();
 }
@@ -880,7 +873,7 @@ void SwUndoTblHeadline::Undo( SwUndoIter& rUndoIter )
 {
     SwDoc& rDoc = rUndoIter.GetDoc();
     SwTableNode* pTNd = rDoc.GetNodes()[ nTblNd ]->GetTableNode();
-    ASSERT( pTNd, "keinen Tabellen-Node gefunden" );
+    OSL_ENSURE( pTNd, "keinen Tabellen-Node gefunden" );
 
     rDoc.SetRowsToRepeat( pTNd->GetTable(), nOldHeadline );
 }
@@ -891,7 +884,7 @@ void SwUndoTblHeadline::Redo( SwUndoIter& rUndoIter )
     SwDoc& rDoc = rUndoIter.GetDoc();
 
     SwTableNode* pTNd = rDoc.GetNodes()[ nTblNd ]->GetTableNode();
-    ASSERT( pTNd, "keinen Tabellen-Node gefunden" );
+    OSL_ENSURE( pTNd, "keinen Tabellen-Node gefunden" );
 
     rDoc.SetRowsToRepeat( pTNd->GetTable(), nNewHeadline );
 }
@@ -1009,7 +1002,7 @@ void _SaveTable::RestoreAttr( SwTable& rTbl, BOOL bMdfyBox )
     {
         if( !pLn )
         {
-            ASSERT( !this, "Anzahl der Lines hat sich veraendert" );
+            OSL_ENSURE( !this, "Anzahl der Lines hat sich veraendert" );
             break;
         }
 
@@ -1206,7 +1199,7 @@ void _SaveLine::RestoreAttr( SwTableLine& rLine, _SaveTable& rSTbl )
     {
         if( !pBx )
         {
-            ASSERT( !this, "Anzahl der Boxen hat sich veraendert" );
+            OSL_ENSURE( !this, "Anzahl der Boxen hat sich veraendert" );
             break;
         }
         pBx->RestoreAttr( *rLine.GetTabBoxes()[ n ], rSTbl );
@@ -1239,7 +1232,7 @@ void _SaveLine::CreateNew( SwTable& rTbl, SwTableBox& rParent, _SaveTable& rSTbl
     // HB, #127868# robustness: in some cases - which I
     // cannot reproduce nor see from the code - pNew seems
     // to be set to NULL in C40_INSERT.
-    ASSERT(pNew, "Table line just created set to NULL in C40_INSERT");
+    OSL_ENSURE(pNew, "Table line just created set to NULL in C40_INSERT");
 
     if (pNew)
     {
@@ -1295,7 +1288,7 @@ void _SaveBox::RestoreAttr( SwTableBox& rBox, _SaveTable& rSTbl )
     {
         if( !rBox.GetTabLines().Count() )
         {
-            ASSERT( !this, "Anzahl der Lines hat sich veraendert" );
+            OSL_ENSURE( !this, "Anzahl der Lines hat sich veraendert" );
         }
         else
         {
@@ -1304,7 +1297,7 @@ void _SaveBox::RestoreAttr( SwTableBox& rBox, _SaveTable& rSTbl )
             {
                 if( !pLn )
                 {
-                    ASSERT( !this, "Anzahl der Lines hat sich veraendert" );
+                    OSL_ENSURE( !this, "Anzahl der Lines hat sich veraendert" );
                     break;
                 }
 
@@ -1343,7 +1336,7 @@ void _SaveBox::RestoreAttr( SwTableBox& rBox, _SaveTable& rSTbl )
     }
     else
     {
-        ASSERT( !this, "Box nicht mehr am gleichen Node" );
+        OSL_ENSURE( !this, "Box nicht mehr am gleichen Node" );
     }
 }
 
@@ -1403,7 +1396,7 @@ void _SaveBox::CreateNew( SwTable& rTbl, SwTableLine& rParent, _SaveTable& rSTbl
     {
         // Box zum StartNode in der alten Tabelle suchen
         SwTableBox* pBox = rTbl.GetTblBox( nSttNode );
-        ASSERT( pBox, "Wo ist meine TabellenBox geblieben?" );
+        OSL_ENSURE( pBox, "Wo ist meine TabellenBox geblieben?" );
 
         SwFrmFmt* pOld = pBox->GetFrmFmt();
         pFmt->Add( pBox );
@@ -1450,7 +1443,7 @@ void SwUndoAttrTbl::Undo( SwUndoIter& rUndoIter )
 {
     SwDoc& rDoc = rUndoIter.GetDoc();
     SwTableNode* pTblNd = rDoc.GetNodes()[ nSttNode ]->GetTableNode();
-    ASSERT( pTblNd, "kein TabellenNode" );
+    OSL_ENSURE( pTblNd, "kein TabellenNode" );
 
     if (pTblNd)
     {
@@ -1513,7 +1506,7 @@ void SwUndoTblAutoFmt::UndoRedo( BOOL bUndo, SwUndoIter& rUndoIter )
 {
     SwDoc& rDoc = rUndoIter.GetDoc();
     SwTableNode* pTblNd = rDoc.GetNodes()[ nSttNode ]->GetTableNode();
-    ASSERT( pTblNd, "kein TabellenNode" );
+    OSL_ENSURE( pTblNd, "kein TabellenNode" );
 
     _SaveTable* pOrig = new _SaveTable( pTblNd->GetTable() );
         // dann auch noch ueber die ContentNodes der EndBoxen und
@@ -1620,7 +1613,7 @@ void SwUndoTblNdsChg::SaveNewBoxes( const SwTableNode& rTblNd,
     USHORT n;
     USHORT i;
 
-    ASSERT( ! IsDelBox(), "falsche Action" );
+    OSL_ENSURE( ! IsDelBox(), "falsche Action" );
     Ptrs.pNewSttNds = new SvULongs( (BYTE)(rTblBoxes.Count() - rOld.Count()), 5 );
 
     for( n = 0, i = 0; n < rOld.Count(); ++i )
@@ -1673,12 +1666,12 @@ void SwUndoTblNdsChg::SaveNewBoxes( const SwTableNode& rTblNd,
     const SwTable& rTbl = rTblNd.GetTable();
     const SwTableSortBoxes& rTblBoxes = rTbl.GetTabSortBoxes();
 
-    ASSERT( ! IsDelBox(), "falsche Action" );
+    OSL_ENSURE( ! IsDelBox(), "falsche Action" );
     Ptrs.pNewSttNds = new SvULongs( (BYTE)(rTblBoxes.Count() - rOld.Count()), 5 );
 
-    ASSERT( rTbl.IsNewModel() || rOld.Count() + nCount * rBoxes.Count() == rTblBoxes.Count(),
+    OSL_ENSURE( rTbl.IsNewModel() || rOld.Count() + nCount * rBoxes.Count() == rTblBoxes.Count(),
         "unexpected boxes" );
-    ASSERT( rOld.Count() <= rTblBoxes.Count(), "more unexpected boxes" );
+    OSL_ENSURE( rOld.Count() <= rTblBoxes.Count(), "more unexpected boxes" );
     for( USHORT n = 0, i = 0; i < rTblBoxes.Count(); ++i )
     {
         if( ( n < rOld.Count() ) &&
@@ -1722,7 +1715,7 @@ void SwUndoTblNdsChg::SaveNewBoxes( const SwTableNode& rTblNd,
             // find the line number difference
             // (to help determine bNodesMoved flag below)
             nLineDiff = nLineDiff - nLineNo;
-            ASSERT( pSourceBox, "Splitted source box not found!" );
+            OSL_ENSURE( pSourceBox, "Splitted source box not found!" );
             // find out how many nodes the source box used to have
             // (to help determine bNodesMoved flag below)
             USHORT nNdsPos = 0;
@@ -1754,7 +1747,7 @@ void SwUndoTblNdsChg::SaveNewBoxes( const SwTableNode& rTblNd,
 
 void SwUndoTblNdsChg::SaveSection( SwStartNode* pSttNd )
 {
-    ASSERT( IsDelBox(), "falsche Action" );
+    OSL_ENSURE( IsDelBox(), "falsche Action" );
     if( !Ptrs.pDelSects )
         Ptrs.pDelSects = new SwUndoSaveSections( 10, 5 );
 
@@ -1773,7 +1766,7 @@ void SwUndoTblNdsChg::Undo( SwUndoIter& rUndoIter )
     SwNodeIndex aIdx( rDoc.GetNodes(), nSttNode );
 
     SwTableNode* pTblNd = rDoc.GetNodes()[ aIdx ]->GetTableNode();
-    ASSERT( pTblNd, "kein TabellenNode" );
+    OSL_ENSURE( pTblNd, "kein TabellenNode" );
 
     SwTableFmlUpdate aMsgHnt( &pTblNd->GetTable() );
     aMsgHnt.eFlags = TBL_BOXPTR;
@@ -1819,7 +1812,7 @@ void SwUndoTblNdsChg::Undo( SwUndoIter& rUndoIter )
             // Box aus der Tabellen-Struktur entfernen
             ULONG nIdx = aTmp[ --n ];
             SwTableBox* pBox = pTblNd->GetTable().GetTblBox( nIdx );
-            ASSERT( pBox, "Wo ist meine TabellenBox geblieben?" );
+            OSL_ENSURE( pBox, "Wo ist meine TabellenBox geblieben?" );
 
             // TL_CHART2: notify chart about box to be removed
             if (pPCD)
@@ -1857,7 +1850,7 @@ void SwUndoTblNdsChg::Undo( SwUndoIter& rUndoIter )
         {
             ULONG nIdx = (*Ptrs.pNewSttNds)[ --n ];
             SwTableBox* pBox = pTblNd->GetTable().GetTblBox( nIdx );
-            ASSERT( pBox, "Where's my table box?" );
+            OSL_ENSURE( pBox, "Where's my table box?" );
             // TL_CHART2: notify chart about box to be removed
             if (pPCD)
                 pPCD->DeleteBox( &pTblNd->GetTable(), *pBox );
@@ -1891,7 +1884,7 @@ void SwUndoTblNdsChg::Redo( SwUndoIter& rUndoIter )
     SwDoc& rDoc = rUndoIter.GetDoc();
 
     SwTableNode* pTblNd = rDoc.GetNodes()[ nSttNode ]->GetTableNode();
-    ASSERT( pTblNd, "kein TabellenNode" );
+    OSL_ENSURE( pTblNd, "kein TabellenNode" );
     CHECK_TABLE( pTblNd->GetTable() )
 
     SwSelBoxes aSelBoxes;
@@ -2006,7 +1999,7 @@ SwUndoTblMerge::SwUndoTblMerge( const SwPaM& rTblSel )
     : SwUndo( UNDO_TABLE_MERGE ), SwUndRng( rTblSel ), pHistory( 0 )
 {
     const SwTableNode* pTblNd = rTblSel.GetNode()->FindTableNode();
-    ASSERT( pTblNd, "Wo ist TabllenNode" )
+    OSL_ENSURE( pTblNd, "Wo ist TabllenNode" );
     pSaveTbl = new _SaveTable( pTblNd->GetTable() );
     pMoves = new SwUndoMoves;
     nTblNode = pTblNd->GetIndex();
@@ -2027,7 +2020,7 @@ void SwUndoTblMerge::Undo( SwUndoIter& rUndoIter )
     SwNodeIndex aIdx( rDoc.GetNodes(), nTblNode );
 
     SwTableNode* pTblNd = rDoc.GetNodes()[ aIdx ]->GetTableNode();
-    ASSERT( pTblNd, "kein TabellenNode" );
+    OSL_ENSURE( pTblNd, "kein TabellenNode" );
 
     SwTableFmlUpdate aMsgHnt( &pTblNd->GetTable() );
     aMsgHnt.eFlags = TBL_BOXPTR;
@@ -2044,7 +2037,6 @@ void SwUndoTblMerge::Undo( SwUndoIter& rUndoIter )
     SwTableBox *pBox, *pCpyBox = pTblNd->GetTable().GetTabSortBoxes()[0];
     SwTableBoxes& rLnBoxes = pCpyBox->GetUpper()->GetTabBoxes();
 
-DUMPDOC( &rDoc, "d:\\tmp\\tab_a.db" )
 CHECKTABLE(pTblNd->GetTable())
 
     SwSelBoxes aSelBoxes;
@@ -2063,7 +2055,6 @@ CHECKTABLE(pTblNd->GetTable())
         aSelBoxes.Insert( pBox );
     }
 
-DUMPDOC( &rDoc, "d:\\tmp\\tab_b.db" )
 CHECKTABLE(pTblNd->GetTable())
 
     SwChartDataProvider *pPCD = rDoc.GetChartDataProvider();
@@ -2078,7 +2069,7 @@ CHECKTABLE(pTblNd->GetTable())
         {
             nIdx = aNewSttNds[ --n ];
             pBox = pTblNd->GetTable().GetTblBox( nIdx );
-            ASSERT( pBox, "Wo ist meine TabellenBox geblieben?" );
+            OSL_ENSURE( pBox, "Wo ist meine TabellenBox geblieben?" );
 
             if( !pSaveTbl->IsNewModel() )
                 rDoc.GetNodes().MakeTxtNode( SwNodeIndex(
@@ -2120,11 +2111,7 @@ CHECKTABLE(pTblNd->GetTable())
                     // das Trennzeichen loeschen
                     pTxtNd->EraseText( aTmpIdx, 1 );
                 }
-//              delete pUndo;
-DUMPDOC( &rDoc, String( "d:\\tmp\\tab_") + String( aNewSttNds.Count() - i ) +
-                String(".db") )
             }
-//          pMoves->Remove( 0, pMoves->Count() );
             nIdx = pBox->GetSttIdx();
         }
         else
@@ -2152,7 +2139,6 @@ DUMPDOC( &rDoc, String( "d:\\tmp\\tab_") + String( aNewSttNds.Count() - i ) +
             rDoc.DeleteSection( rDoc.GetNodes()[ nIdx ] );
         }
     }
-DUMPDOC( &rDoc, "d:\\tmp\\tab_z.db" )
 CHECKTABLE(pTblNd->GetTable())
 
 
@@ -2311,15 +2297,15 @@ SwUndoTblNumFmt::~SwUndoTblNumFmt()
 
 void SwUndoTblNumFmt::Undo( SwUndoIter& rIter )
 {
-    ASSERT( pBoxSet, "Where's the stored item set?" )
+    OSL_ENSURE( pBoxSet, "Where's the stored item set?" );
 
     SwDoc& rDoc = rIter.GetDoc();
     SwStartNode* pSttNd = rDoc.GetNodes()[ nNode ]->
                             FindSttNodeByType( SwTableBoxStartNode );
-    ASSERT( pSttNd, "ohne StartNode kein TabellenBox" );
+    OSL_ENSURE( pSttNd, "ohne StartNode kein TabellenBox" );
     SwTableBox* pBox = pSttNd->FindTableNode()->GetTable().GetTblBox(
                                     pSttNd->GetIndex() );
-    ASSERT( pBox, "keine TabellenBox gefunden" );
+    OSL_ENSURE( pBox, "keine TabellenBox gefunden" );
 
     SwTableBoxFmt* pFmt = rDoc.MakeTableBoxFmt();
     pFmt->SetFmtAttr( *pBoxSet );
@@ -2416,10 +2402,10 @@ void SwUndoTblNumFmt::Redo( SwUndoIter& rIter )
 
     SwNode* pNd = rDoc.GetNodes()[ pPam->GetPoint()->nNode ];
     SwStartNode* pSttNd = pNd->FindSttNodeByType( SwTableBoxStartNode );
-    ASSERT( pSttNd, "ohne StartNode kein TabellenBox" );
+    OSL_ENSURE( pSttNd, "ohne StartNode kein TabellenBox" );
     SwTableBox* pBox = pSttNd->FindTableNode()->GetTable().GetTblBox(
                                     pSttNd->GetIndex() );
-    ASSERT( pBox, "keine TabellenBox gefunden" );
+    OSL_ENSURE( pBox, "keine TabellenBox gefunden" );
 
     SwFrmFmt* pBoxFmt = pBox->ClaimFrmFmt();
     if( bNewFmt || bNewFml || bNewValue )
@@ -3207,7 +3193,7 @@ void InsertSort( SvUShorts& rArr, USHORT nIdx, USHORT* pInsPos )
             nM = nU + ( nO - nU ) / 2;
             if( *(rArr.GetData() + nM) == nIdx )
             {
-                ASSERT( FALSE, "Index ist schon vorhanden, darf nie sein!" );
+                OSL_ENSURE( FALSE, "Index ist schon vorhanden, darf nie sein!" );
                 return;
             }
             if( *(rArr.GetData() + nM) < nIdx )
@@ -3234,7 +3220,7 @@ void InsertSort( SvULongs& rArr, ULONG nIdx, USHORT* pInsPos )
             nM = nU + ( nO - nU ) / 2;
             if( *(rArr.GetData() + nM) == nIdx )
             {
-                ASSERT( FALSE, "Index ist schon vorhanden, darf nie sein!" );
+                OSL_ENSURE( FALSE, "Index ist schon vorhanden, darf nie sein!" );
                 return;
             }
             if( *(rArr.GetData() + nM) < nIdx )
@@ -3250,35 +3236,18 @@ void InsertSort( SvULongs& rArr, ULONG nIdx, USHORT* pInsPos )
         *pInsPos = nU;
 }
 
-#if defined( JP_DEBUG ) && defined(DBG_UTIL)
+#if OSL_DEBUG_LEVEL > 1
 
 
-void DumpDoc( SwDoc* pDoc, const String& rFileNm )
-{
-    Writer* pWrt = SwIoSystem::GetWriter( "DEBUG" );
-    if( pWrt )
-    {
-        SvFileStream aStream( rFileNm, STREAM_STD_WRITE );
-        SwPaM* pPam = new SwPaM( pDoc, SwPosition( pDoc->GetNodes().EndOfContent ,
-                                                 pDoc->GetNodes().EndOfContent ));
-        pPam->Move( fnMoveBackward, fnGoDoc );
-        pPam->SetMark();
-        pPam->Move( fnMoveForward, fnGoDoc );
-
-        pWrt->Write( pPam, *pDoc, aStream, rFileNm.GetStr() );
-
-        delete pPam;
-    }
-}
 void CheckTable( const SwTable& rTbl )
 {
     const SwNodes& rNds = rTbl.GetFrmFmt()->GetDoc()->GetNodes();
-    const SwTableSortBoxes& rSrtArr = pTblNd->GetTable().GetTabSortBoxes();
+    const SwTableSortBoxes& rSrtArr = rTbl.GetTabSortBoxes();
     for( USHORT n = 0; n < rSrtArr.Count(); ++n )
     {
         const SwTableBox* pBox = rSrtArr[ n ];
         const SwNode* pNd = pBox->GetSttNd();
-        ASSERT( rNds[ *pBox->GetSttIdx() ] == pNd, "Box mit falchem StartNode"  );
+        OSL_ENSURE( rNds[ pBox->GetSttIdx() ] == pNd, "Box mit falchem StartNode"  );
     }
 }
 #endif
diff --git a/sw/source/core/undo/untblk.cxx b/sw/source/core/undo/untblk.cxx
index d842bdfdb1a2..f3d7dbecb785 100644
--- a/sw/source/core/undo/untblk.cxx
+++ b/sw/source/core/undo/untblk.cxx
@@ -154,7 +154,7 @@ SwUndoInserts::~SwUndoInserts()
         if( pPos->nContent.GetIndex() )         // nicht den gesamten Node loeschen
         {
             SwTxtNode* pTxtNd = pPos->nNode.GetNode().GetTxtNode();
-            ASSERT( pTxtNd, "kein TextNode, aus dem geloescht werden soll" );
+            OSL_ENSURE( pTxtNd, "kein TextNode, aus dem geloescht werden soll" );
             if( pTxtNd ) // Robust
             {
                 pTxtNd->EraseText( pPos->nContent );
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index 656e2f9b1c6a..83a4667eecd4 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -65,7 +65,7 @@ sal_Int32 GetEnumAsInt32( const UNO_NMSPC::Any& rVal )
     catch( UNO_NMSPC::Exception & )
     {
         eVal = 0;
-        ASSERT( FALSE, "can't get EnumAsInt32" );
+        OSL_ENSURE( FALSE, "can't get EnumAsInt32" );
     }
     return eVal;
 }
@@ -87,7 +87,7 @@ BOOL UCB_DeleteFile( const String& rURL )
     catch( UNO_NMSPC::Exception& )
     {
         bRemoved = FALSE;
-        ASSERT( FALSE, "Exeception from executeCommand( delete )" );
+        OSL_ENSURE( FALSE, "Exeception from executeCommand( delete )" );
     }
     return bRemoved;
 }
@@ -118,7 +118,7 @@ BOOL UCB_CopyFile( const String& rURL, const String& rNewURL, BOOL bCopyIsMove )
     }
     catch( UNO_NMSPC::Exception& )
     {
-        ASSERT( FALSE, "Exeception from executeCommand( transfer )" );
+        OSL_ENSURE( FALSE, "Exeception from executeCommand( transfer )" );
         bCopyCompleted = FALSE;
     }
     return bCopyCompleted;
@@ -152,7 +152,7 @@ BOOL UCB_IsCaseSensitiveFileName( const String& rURL )
     catch( UNO_NMSPC::Exception& )
     {
         bCaseSensitive = FALSE;
-        ASSERT( FALSE, "Exeception from compareContentIds()" );
+        OSL_ENSURE( FALSE, "Exeception from compareContentIds()" );
     }
     return bCaseSensitive;
 }
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 845a41684cb0..83fd55e1d90a 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -145,7 +145,7 @@ public:
             // need to find the page ( and index )  for this control
             uno::Reference< drawing::XDrawPageSupplier > xSupplier( mpDocShell->GetModel(), uno::UNO_QUERY_THROW );
             uno::Reference< container::XIndexAccess > xIndex( xSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
-            sal_Int32 nLen = xIndex->getCount();
+
             bool bMatched = false;
             uno::Sequence< script::ScriptEventDescriptor > aFakeEvents;
                 try
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index d9466327b126..f3a9f1893b2c 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -202,11 +202,11 @@ public:
     {
         return xTextRange;
     }
-    sal_Bool    IsOpaque()
+    sal_Bool    IsOpaque() const
         {
             return bOpaque;
         }
-    const sal_Bool&    GetOpaque()
+    const sal_Bool&    GetOpaque() const
         {
             return bOpaque;
         }
@@ -247,7 +247,7 @@ public:
             break;
             default:
             {
-                ASSERT( false,
+                OSL_ENSURE( false,
                         "<SwShapeDescriptor_Impl::SetPositionLayoutDir(..)> - invalid attribute value." );
             }
         }
@@ -368,7 +368,7 @@ uno::Reference< drawing::XShape >  SwFmDrawPage::_CreateShape( SdrObject *pObj )
             }
             else
             {
-                ASSERT( false,
+                OSL_ENSURE( false,
                         "<SwFmDrawPage::_CreateShape(..)> - could not retrieve type. Thus, no shape created." );
                 return xRet;
             }
@@ -953,7 +953,7 @@ SwXShape::SwXShape(uno::Reference< uno::XInterface > & xShape) :
             if ( xShapeAgg.is() )
             {
                 xShapeAgg->queryAggregation( ::getCppuType((uno::Reference< drawing::XShape >*)0) ) >>= mxShape;
-                ASSERT( mxShape.is(),
+                OSL_ENSURE( mxShape.is(),
                         "<SwXShape::SwXShape(..)> - no XShape found at <xShapeAgg>" );
             }
             // <--
@@ -1231,7 +1231,7 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A
                                 //To prevent this the connection between format and attribute has to be broken before.
                                 const SwPosition *pPos = aAnchor.GetCntntAnchor();
                                 SwTxtNode *pTxtNode = pPos->nNode.GetNode().GetTxtNode();
-                                ASSERT( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
+                                OSL_ENSURE( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
                                 const xub_StrLen nIdx = pPos->nContent.GetIndex();
                                 SwTxtAttr * const pHnt =
                                     pTxtNode->GetTxtAttrForCharAt(
@@ -1318,7 +1318,7 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A
                             //To prevent this the connection between format and attribute has to be broken before.
                             const SwPosition *pPos = rOldAnchor.GetCntntAnchor();
                             SwTxtNode *pTxtNode = pPos->nNode.GetNode().GetTxtNode();
-                            ASSERT( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
+                            OSL_ENSURE( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
                             const xub_StrLen nIdx = pPos->nContent.GetIndex();
                             SwTxtAttr * const pHnt =
                                 pTxtNode->GetTxtAttrForCharAt(
@@ -2118,7 +2118,7 @@ void SwXShape::dispose(void) throw( uno::RuntimeException )
         // a 'virtual' drawing object.
         // OD 25.08.2003 #111713# - refine assertion for safety reason.
         // --> OD 2005-02-02 #119236# - correct assertion and refine it.
-        ASSERT( !pObj ||
+        OSL_ENSURE( !pObj ||
                 pObj->ISA(SwDrawVirtObj) ||
                 pObj->GetUpGroup() ||
                 pObj == pFmt->FindSdrObject(),
@@ -2277,7 +2277,7 @@ awt::Point SAL_CALL SwXShape::getPosition() throw ( uno::RuntimeException )
 //                break;
 //                default:
 //                {
-//                    ASSERT( false,
+//                    OSL_ENSURE( false,
 //                            "<SwXShape::getPosition()> - unsupported layout direction" );
 //                }
 //            }
@@ -2530,7 +2530,7 @@ awt::Point SwXShape::_ConvertPositionToHoriL2R( const awt::Point _aObjPos,
             break;
             default:
             {
-                ASSERT( false,
+                OSL_ENSURE( false,
                         "<SwXShape::_ConvertPositionToHoriL2R(..)> - unsupported layout direction" );
             }
         }
@@ -2554,13 +2554,13 @@ drawing::HomogenMatrix3 SwXShape::_ConvertTransformationToLayoutDir(
     // --> OD 2005-03-10 #i44334#, #i44681# - direct manipulation of the
     // tranformation structure isn't valid, if it contains rotation.
     SvxShape* pSvxShape = GetSvxShape();
-    ASSERT( pSvxShape,
-            "<SwXShape::_ConvertTransformationToLayoutDir(..)> - no SvxShape found!")
+    OSL_ENSURE( pSvxShape,
+            "<SwXShape::_ConvertTransformationToLayoutDir(..)> - no SvxShape found!");
     if ( pSvxShape )
     {
         const SdrObject* pObj = pSvxShape->GetSdrObject();
-        ASSERT( pObj,
-                "<SwXShape::_ConvertTransformationToLayoutDir(..)> - no SdrObject found!")
+        OSL_ENSURE( pObj,
+                "<SwXShape::_ConvertTransformationToLayoutDir(..)> - no SdrObject found!");
         if ( pObj )
         {
             // get position of object in Writer coordinate system.
@@ -2705,13 +2705,13 @@ void SwXShape::_AdjustPositionProperties( const awt::Point _aPosition )
     awt::Point aConvertedPos( aStartOrEndPos );
 
     SvxShape* pSvxShape = GetSvxShape();
-    ASSERT( pSvxShape,
-            "<SwXShape::_ConvertStartOrEndPosToLayoutDir(..)> - no SvxShape found!")
+    OSL_ENSURE( pSvxShape,
+            "<SwXShape::_ConvertStartOrEndPosToLayoutDir(..)> - no SvxShape found!");
     if ( pSvxShape )
     {
         const SdrObject* pObj = pSvxShape->GetSdrObject();
-        ASSERT( pObj,
-                "<SwXShape::_ConvertStartOrEndPosToLayoutDir(..)> - no SdrObject found!")
+        OSL_ENSURE( pObj,
+                "<SwXShape::_ConvertStartOrEndPosToLayoutDir(..)> - no SdrObject found!");
         if ( pObj )
         {
             // get position of object in Writer coordinate system.
@@ -2743,13 +2743,13 @@ void SwXShape::_AdjustPositionProperties( const awt::Point _aPosition )
     drawing::PolyPolygonBezierCoords aConvertedPath( aPath );
 
     SvxShape* pSvxShape = GetSvxShape();
-    ASSERT( pSvxShape,
-            "<SwXShape::_ConvertStartOrEndPosToLayoutDir(..)> - no SvxShape found!")
+    OSL_ENSURE( pSvxShape,
+            "<SwXShape::_ConvertStartOrEndPosToLayoutDir(..)> - no SvxShape found!");
     if ( pSvxShape )
     {
         const SdrObject* pObj = pSvxShape->GetSdrObject();
-        ASSERT( pObj,
-                "<SwXShape::_ConvertStartOrEndPosToLayoutDir(..)> - no SdrObject found!")
+        OSL_ENSURE( pObj,
+                "<SwXShape::_ConvertStartOrEndPosToLayoutDir(..)> - no SdrObject found!");
         if ( pObj )
         {
             // get position of object in Writer coordinate system.
@@ -2795,7 +2795,7 @@ void SwXShape::_AdjustPositionProperties( const awt::Point _aPosition )
 SwXGroupShape::SwXGroupShape(uno::Reference< XInterface > & xShape) :
         SwXShape(xShape)
 {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     uno::Reference<XShapes> xShapes(xShapeAgg, uno::UNO_QUERY);
     DBG_ASSERT(xShapes.is(), "no SvxShape found or shape is not a group shape");
 #endif
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index bfab44604125..65f926e5a2d9 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -194,7 +194,7 @@ sal_uInt16 lcl_ServiceIdToResId(sal_uInt16 nServiceId)
     const ServiceIdResId* pMap = aServiceToRes;
     while( USHRT_MAX != pMap->nServiceId && nServiceId != pMap->nServiceId )
             ++pMap;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     if( USHRT_MAX == pMap->nServiceId )
         DBG_ERROR("service id not found");
 #endif
@@ -274,7 +274,7 @@ sal_uInt16 lcl_GetServiceForField( const SwField& rFld )
                 break;
             }
     }
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     if( USHRT_MAX == nSrvId )
         DBG_ERROR("resid not found");
 #endif
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 35599daecf94..0b6646db640b 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -964,7 +964,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
             throw beans::PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
 
         SwDoc* pDoc = pFmt->GetDoc();
-        if ((eType == FLYCNTTYPE_GRF) && isGRFATR(pEntry->nWID) ||
+        if ( ((eType == FLYCNTTYPE_GRF) && isGRFATR(pEntry->nWID)) ||
             (FN_PARAM_COUNTOUR_PP        == pEntry->nWID) ||
             (FN_UNO_IS_AUTOMATIC_CONTOUR == pEntry->nWID) ||
             (FN_UNO_IS_PIXEL_CONTOUR     == pEntry->nWID) )
@@ -1045,7 +1045,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
         else if( FN_UNO_TITLE == pEntry->nWID )
         {
             SwFlyFrmFmt* pFlyFmt = dynamic_cast<SwFlyFrmFmt*>(pFmt);
-            ASSERT( pFmt,
+            OSL_ENSURE( pFmt,
                     "unexpected type of <pFmt> --> crash" );
             OUString uTemp;
             aValue >>= uTemp;
@@ -1058,7 +1058,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
         else if( FN_UNO_DESCRIPTION == pEntry->nWID )
         {
             SwFlyFrmFmt* pFlyFmt = dynamic_cast<SwFlyFrmFmt*>(pFmt);
-            ASSERT( pFmt,
+            OSL_ENSURE( pFmt,
                     "unexpected type of <pFmt> --> crash" );
             OUString uTemp;
             aValue >>= uTemp;
@@ -1505,7 +1505,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
                 }
                 else
                 {
-                    String sPrefix( RTL_CONSTASCII_STRINGPARAM(sGraphicObjectProtocol) );
+                    String sPrefix( RTL_CONSTASCII_USTRINGPARAM(sGraphicObjectProtocol) );
                     String sId( pGrfNode->GetGrfObj().GetUniqueID(),
                                 RTL_TEXTENCODING_ASCII_US );
                     (sGrfName = sPrefix) += sId;
@@ -1552,7 +1552,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
         else if( FN_UNO_TITLE == pEntry->nWID )
         {
             SwFlyFrmFmt* pFlyFmt = dynamic_cast<SwFlyFrmFmt*>(pFmt);
-            ASSERT( pFmt,
+            OSL_ENSURE( pFmt,
                     "unexpected type of <pFmt> --> crash" );
             // assure that <SdrObject> instance exists.
             GetOrCreateSdrObject( pFlyFmt );
@@ -1562,7 +1562,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
         else if( FN_UNO_DESCRIPTION == pEntry->nWID )
         {
             SwFlyFrmFmt* pFlyFmt = dynamic_cast<SwFlyFrmFmt*>(pFmt);
-            ASSERT( pFmt,
+            OSL_ENSURE( pFmt,
                     "unexpected type of <pFmt> --> crash" );
             // assure that <SdrObject> instance exists.
             GetOrCreateSdrObject( pFlyFmt );
@@ -1827,7 +1827,7 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName )
             else if( FN_UNO_TITLE == pEntry->nWID )
             {
                 SwFlyFrmFmt* pFlyFmt = dynamic_cast<SwFlyFrmFmt*>(pFmt);
-                ASSERT( pFmt,
+                OSL_ENSURE( pFmt,
                         "unexpected type of <pFmt> --> crash" );
                 // assure that <SdrObject> instance exists.
                 GetOrCreateSdrObject( pFlyFmt );
@@ -1837,7 +1837,7 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName )
             else if( FN_UNO_DESCRIPTION == pEntry->nWID )
             {
                 SwFlyFrmFmt* pFlyFmt = dynamic_cast<SwFlyFrmFmt*>(pFmt);
-                ASSERT( pFmt,
+                OSL_ENSURE( pFmt,
                         "unexpected type of <pFmt> --> crash" );
                 // assure that <SdrObject> instance exists.
                 GetOrCreateSdrObject( pFlyFmt );
@@ -2266,7 +2266,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
                     sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT;
                     ::svt::EmbeddedObjectRef xObjRef( xIPObj, nAspect );
                     pFmt2 = pDoc->Insert(aPam, xObjRef, &aFrmSet, NULL, NULL );
-                    ASSERT( pFmt2, "Doc->Insert(notxt) failed." );
+                    OSL_ENSURE( pFmt2, "Doc->Insert(notxt) failed." );
 
                     pDoc->EndUndo(UNDO_INSERT, NULL);
                     pFmt2->Add(this);
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index 7340237918a9..99e2d89a545c 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -65,9 +65,6 @@ using namespace ::comphelper;
 
 SwUnoPropertyMapProvider aSwMapProvider;
 
-/* -----------------24.06.98 18:12-------------------
- *
- * --------------------------------------------------*/
 SwUnoPropertyMapProvider::SwUnoPropertyMapProvider()
 {
     for( sal_uInt16 i = 0; i < PROPERTY_MAP_END; i++ )
@@ -77,9 +74,6 @@ SwUnoPropertyMapProvider::SwUnoPropertyMapProvider()
     }
 }
 
-/* -----------------19.02.99 08:31-------------------
- *
- * --------------------------------------------------*/
 SwUnoPropertyMapProvider::~SwUnoPropertyMapProvider()
 {
 }
@@ -132,9 +126,6 @@ SwUnoPropertyMapProvider::~SwUnoPropertyMapProvider()
     {SW_PROP_NMID(UNO_NAME_REDLINE_TEXT), 0, CPPU_E2T(CPPUTYPE_REFTEXT),                    PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},\
     {SW_PROP_NMID(UNO_NAME_MERGE_LAST_PARA), 0, CPPU_E2T(CPPUTYPE_BOOLEAN),                             PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, 0},
 
-/* -----------------24.06.98 18:12-------------------
- *
- * --------------------------------------------------*/
 #define COMMON_CRSR_PARA_PROPERTIES_FN_ONLY \
         { SW_PROP_NMID(UNO_NAME_PARA_STYLE_NAME), FN_UNO_PARA_STYLE,        CPPU_E2T(CPPUTYPE_OUSTRING),                PropertyAttribute::MAYBEVOID,     0},                                                       \
         { SW_PROP_NMID(UNO_NAME_PAGE_STYLE_NAME), FN_UNO_PAGE_STYLE,        CPPU_E2T(CPPUTYPE_OUSTRING),         PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY,   0},                       \
@@ -2513,9 +2504,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
     }
     return aMapEntriesArr[nPropertyId];
 }
-/*-- 17.02.2009 15:29:58---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 const SfxItemPropertySet*  SwUnoPropertyMapProvider::GetPropertySet( sal_uInt16 nPropertyId)
 {
     if( !aPropertySetArr[nPropertyId] )
@@ -3110,9 +3099,6 @@ const SfxItemPropertySet*  SwUnoPropertyMapProvider::GetPropertySet( sal_uInt16
     return aPropertySetArr[nPropertyId];
 }
 
-/* -----------------04.07.98 11:42-------------------
- *
- * --------------------------------------------------*/
 sal_Bool SwItemPropertySet::FillItem(SfxItemSet& /*rSet*/, sal_uInt16 /*nWhich*/, sal_Bool /*bGetProperty*/) const
 {
     sal_Bool bRet = sal_False;
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 9a195670e758..bfd6cd94bc44 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -914,14 +914,14 @@ lcl_ForceIntoMeta(SwPaM & rCursor,
 {
     sal_Bool bRet( sal_True ); // means not forced in META_CHECK_BOTH
     SwXMeta const * const pXMeta( dynamic_cast<SwXMeta*>(xParentText.get()) );
-    ASSERT(pXMeta, "no parent?");
+    OSL_ENSURE(pXMeta, "no parent?");
     if (!pXMeta)
         throw uno::RuntimeException();
     SwTxtNode * pTxtNode;
     xub_StrLen nStart;
     xub_StrLen nEnd;
     const bool bSuccess( pXMeta->SetContentRange(pTxtNode, nStart, nEnd) );
-    ASSERT(bSuccess, "no pam?");
+    OSL_ENSURE(bSuccess, "no pam?");
     if (!bSuccess)
         throw uno::RuntimeException();
     // force the cursor back into the meta if it has moved outside
@@ -958,7 +958,7 @@ bool SwXTextCursor::IsAtEndOfMeta() const
         SwUnoCrsr const * const pCursor( m_pImpl->GetCursor() );
         SwXMeta const*const pXMeta(
                 dynamic_cast<SwXMeta*>(m_pImpl->m_xParentText.get()) );
-        ASSERT(pXMeta, "no meta?");
+        OSL_ENSURE(pXMeta, "no meta?");
         if (pCursor && pXMeta)
         {
             SwTxtNode * pTxtNode;
@@ -966,7 +966,7 @@ bool SwXTextCursor::IsAtEndOfMeta() const
             xub_StrLen nEnd;
             const bool bSuccess(
                     pXMeta->SetContentRange(pTxtNode, nStart, nEnd) );
-            ASSERT(bSuccess, "no pam?");
+            OSL_ENSURE(bSuccess, "no pam?");
             if (bSuccess)
             {
                 const SwPosition end(*pTxtNode, nEnd);
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 64d7dbdbbdbb..5fe6c75b37aa 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -187,7 +187,7 @@ void DeepCopyPaM(SwPaM const & rSource, SwPaM & rTarget)
 struct FrameDependSortListLess
 {
     bool operator() (FrameDependSortListEntry const& r1,
-                     FrameDependSortListEntry const& r2)
+                     FrameDependSortListEntry const& r2) const
     {
         return  (r1.nIndex <  r2.nIndex)
             || ((r1.nIndex == r2.nIndex) && (r1.nOrder < r2.nOrder));
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index fadb1ec1e11f..6ad69d206f96 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -112,7 +112,7 @@ namespace
     struct BookmarkCompareStruct
     {
         bool operator () ( const SwXBookmarkPortion_ImplSharedPtr &r1,
-                           const SwXBookmarkPortion_ImplSharedPtr &r2 )
+                           const SwXBookmarkPortion_ImplSharedPtr &r2 ) const
         {
             // #i16896# for bookmark portions at the same position, the start should
             // always precede the end. Hence compare positions, and use bookmark type
@@ -329,13 +329,13 @@ lcl_ExportFieldMark(
     SwDoc* pDoc = pUnoCrsr->GetDoc();
     //flr: maybe its a good idea to add a special hint to the hints array and rely on the hint segmentation....
     const xub_StrLen start = pUnoCrsr->Start()->nContent.GetIndex();
-    ASSERT(pUnoCrsr->End()->nContent.GetIndex() == start,
+    OSL_ENSURE(pUnoCrsr->End()->nContent.GetIndex() == start,
                "hmm --- why is this different");
 
     pUnoCrsr->Right(1, CRSR_SKIP_CHARS, FALSE, FALSE);
     if ( *pUnoCrsr->GetMark() == *pUnoCrsr->GetPoint() )
     {
-        ASSERT(false, "cannot move cursor?");
+        OSL_ENSURE(false, "cannot move cursor?");
         return 0;
     }
 
@@ -384,7 +384,7 @@ lcl_ExportFieldMark(
     }
     else
     {
-        ASSERT(false, "no fieldmark found?");
+        OSL_ENSURE(false, "no fieldmark found?");
     }
     return xRef;
 }
@@ -657,7 +657,7 @@ lcl_ExportHints(
                     case RES_TXTATR_META:
                     case RES_TXTATR_METAFIELD:
                     {
-                        ASSERT(*pAttr->GetStart() != *pAttr->GetEnd(),
+                        OSL_ENSURE(*pAttr->GetStart() != *pAttr->GetEnd(),
                                 "empty meta?");
                         if ((i_nStartPos > 0) &&
                             (*pAttr->GetStart() < i_nStartPos))
@@ -676,7 +676,7 @@ lcl_ExportHints(
                         PortionList_t Top = rPortionStack.top();
                         if (Top.second != pAttr)
                         {
-                            ASSERT(false, "ExportHints: stack error" );
+                            OSL_ENSURE(false, "ExportHints: stack error" );
                         }
                         else
                         {
@@ -1114,7 +1114,7 @@ lcl_CreatePortions(
                         bCursorMoved, nNextAttrIndex);
             if (PortionStack.empty())
             {
-                ASSERT(false, "CreatePortions: stack underflow");
+                OSL_ENSURE(false, "CreatePortions: stack underflow");
                 return;
             }
         }
@@ -1131,7 +1131,7 @@ lcl_CreatePortions(
         }
         else
         {
-            ASSERT(!FieldMarks.size() ||
+            OSL_ENSURE(!FieldMarks.size() ||
                    (FieldMarks.front() != nCurrentIndex),
                    "fieldmark and hint with CH_TXTATR at same pos?");
         }
@@ -1163,7 +1163,7 @@ lcl_CreatePortions(
         }
     }
 
-    ASSERT((PortionStack.size() == 1) && !PortionStack.top().second,
+   OSL_ENSURE((PortionStack.size() == 1) && !PortionStack.top().second,
             "CreatePortions: stack error" );
 }
 
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index 953a975b93ff..4c362ff3276e 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -829,7 +829,7 @@ bool SwXMeta::CheckForOwnMemberMeta(const SwPaM & rPam, const bool bAbsorb)
     xub_StrLen nMetaStart;
     xub_StrLen nMetaEnd;
     const bool bSuccess( SetContentRange(pTxtNode, nMetaStart, nMetaEnd) );
-    ASSERT(bSuccess, "no pam?");
+    OSL_ENSURE(bSuccess, "no pam?");
     if (!bSuccess)
         throw lang::DisposedException();
 
@@ -974,7 +974,7 @@ SwXMeta::dispose() throw (uno::RuntimeException)
         xub_StrLen nMetaStart;
         xub_StrLen nMetaEnd;
         const bool bSuccess(SetContentRange(pTxtNode, nMetaStart, nMetaEnd));
-        ASSERT(bSuccess, "no pam?");
+        OSL_ENSURE(bSuccess, "no pam?");
         if (bSuccess)
         {
             // -1 because of CH_TXTATR
@@ -1062,7 +1062,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
     }
     if (!pTxtAttr)
     {
-        ASSERT(false, "meta inserted, but has no text attribute?");
+        OSL_ENSURE(false, "meta inserted, but has no text attribute?");
         throw uno::RuntimeException(
             C2S("SwXMeta::attach(): cannot create meta"),
                 static_cast< ::cppu::OWeakObject* >(this));
@@ -1104,7 +1104,7 @@ SwXMeta::getAnchor() throw (uno::RuntimeException)
     xub_StrLen nMetaStart;
     xub_StrLen nMetaEnd;
     const bool bSuccess(SetContentRange(pTxtNode, nMetaStart, nMetaEnd));
-    ASSERT(bSuccess, "no pam?");
+    OSL_ENSURE(bSuccess, "no pam?");
     if (!bSuccess)
     {
         throw lang::DisposedException(
@@ -1271,7 +1271,7 @@ SwXMeta::createEnumeration() throw (uno::RuntimeException)
     xub_StrLen nMetaStart;
     xub_StrLen nMetaEnd;
     const bool bSuccess(SetContentRange(pTxtNode, nMetaStart, nMetaEnd));
-    ASSERT(bSuccess, "no pam?");
+    OSL_ENSURE(bSuccess, "no pam?");
     if (!bSuccess)
         throw lang::DisposedException();
 
@@ -1322,7 +1322,7 @@ SwXMetaField::SwXMetaField(SwDoc *const pDoc, ::sw::Meta *const pMeta,
         TextRangeList_t const*const pPortions)
     : SwXMetaField_Base(pDoc, pMeta, xParentText, pPortions)
 {
-    ASSERT(pMeta && dynamic_cast< ::sw::MetaField* >(pMeta),
+    OSL_ENSURE(pMeta && dynamic_cast< ::sw::MetaField* >(pMeta),
         "SwXMetaField created for wrong hint!");
 }
 
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 0007fe436eff..139bb9524fa5 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -2253,7 +2253,7 @@ Any SwXNumberingRules::getPropertyValue( const OUString& rPropertyName )
     // --> OD 2008-04-23 #refactorlists#
     else if(rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_DEFAULT_LIST_ID)))
     {
-        ASSERT( pRule->GetDefaultListId().Len() != 0,
+        OSL_ENSURE( pRule->GetDefaultListId().Len() != 0,
                 "<SwXNumberingRules::getPropertyValue(..)> - no default list id found. Serious defect -> please inform OD." );
         aRet <<= OUString(pRule->GetDefaultListId());
     }
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index e64397faa3dc..1a617a6ccd8e 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1775,8 +1775,8 @@ void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
                             if(
                                 pCharStyleNames[i] != SwXNumberingRules::GetInvalidStyle() &&
                                 ((pCharStyleNames[i].Len() && !pFmt->GetCharFmt()) ||
-                                pCharStyleNames[i].Len() &&
-                                            pFmt->GetCharFmt()->GetName() != pCharStyleNames[i] ))
+                                (pCharStyleNames[i].Len() &&
+                                            pFmt->GetCharFmt()->GetName() != pCharStyleNames[i]) ))
                             {
 
                                 SwCharFmt* pCharFmt = 0;
@@ -1808,8 +1808,8 @@ void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
                             //jetzt nochmal fuer Fonts
                             if(pBulletFontNames[i] != SwXNumberingRules::GetInvalidStyle() &&
                                 ((pBulletFontNames[i].Len() && !pFmt->GetBulletFont()) ||
-                                pBulletFontNames[i].Len() &&
-                                        pFmt->GetBulletFont()->GetName() != pBulletFontNames[i] ))
+                                (pBulletFontNames[i].Len() &&
+                                        pFmt->GetBulletFont()->GetName() != pBulletFontNames[i]) ))
                             {
                                 const SvxFontListItem* pFontListItem =
                                         (const SvxFontListItem* )pDoc->GetDocShell()
@@ -3440,8 +3440,8 @@ MakeObject:
                 {
                     const SwPageDesc& rDesc = aBase.GetOldPageDesc();
                     const SwFrmFmt* pFrmFmt = 0;
-                    sal_Bool bShare = bHeader && rDesc.IsHeaderShared()||
-                                    !bHeader && rDesc.IsFooterShared();
+                    sal_Bool bShare = (bHeader && rDesc.IsHeaderShared()) ||
+                                     (!bHeader && rDesc.IsFooterShared());
                     // TextLeft returns the left content if there is one,
                     // Text and TextRight return the master content.
                     // TextRight does the same as Text and is for
@@ -3735,11 +3735,11 @@ uno::Reference< style::XAutoStyle > SwXAutoStyleFamily::insertStyle(
         }
         catch (beans::UnknownPropertyException &)
         {
-            ASSERT( false, "Unknown property" );
+            OSL_ENSURE( false, "Unknown property" );
         }
         catch (lang::IllegalArgumentException &)
         {
-            ASSERT( false, "Illegal argument" );
+            OSL_ENSURE( false, "Illegal argument" );
         }
     }
 
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 335e1143c907..881e091756e4 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -101,6 +101,7 @@
 #include <unochart.hxx>
 #include <sortopt.hxx>
 #include <rtl/math.hxx>
+#include <editeng/frmdiritem.hxx>
 
 using namespace ::com::sun::star;
 using ::rtl::OUString;
@@ -1044,26 +1045,53 @@ void SwXCell::setPropertyValue(const OUString& rPropertyName, const uno::Any& aV
     SolarMutexGuard aGuard;
     if(IsValid())
     {
-        const SfxItemPropertySimpleEntry* pEntry =
-            m_pPropSet->getPropertyMap()->getByName(rPropertyName);
-        if( !pEntry )
+        // Hack to support hidden property to transfer textDirection
+        if  ( rPropertyName.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FRMDirection") ) ) )
         {
-            beans::UnknownPropertyException aEx;
-            aEx.Message = rPropertyName;
-            throw( aEx );
-        }
-        if( pEntry->nWID == FN_UNO_CELL_ROW_SPAN )
-        {
-            sal_Int32 nRowSpan = 0;
-            if( aValue >>= nRowSpan )
-                pBox->setRowSpan( nRowSpan );
+            SvxFrameDirection eDir = FRMDIR_ENVIRONMENT;
+            sal_Int16 nNum = 0;
+            aValue >>= nNum;
+            OSL_TRACE("FRMDirection val %d", nNum );
+            switch (nNum)
+            {
+                case 0:
+                    eDir = FRMDIR_HORI_LEFT_TOP;
+                    break;
+                case 1:
+                    eDir = FRMDIR_HORI_RIGHT_TOP;
+                    break;
+                case 2:
+                    eDir = FRMDIR_VERT_TOP_RIGHT;
+                    break;
+                default:
+                    OSL_ENSURE( false, "unknown direction code, maybe its a bitfield");
+            }
+            SvxFrameDirectionItem aItem( eDir, RES_FRAMEDIR);
+            pBox->GetFrmFmt()->SetFmtAttr(aItem);
         }
         else
         {
-            SwFrmFmt* pBoxFmt = pBox->ClaimFrmFmt();
-            SwAttrSet aSet(pBoxFmt->GetAttrSet());
-            m_pPropSet->setPropertyValue(rPropertyName, aValue, aSet);
-            pBoxFmt->GetDoc()->SetAttr(aSet, *pBoxFmt);
+            const SfxItemPropertySimpleEntry* pEntry =
+                m_pPropSet->getPropertyMap()->getByName(rPropertyName);
+            if( !pEntry )
+            {
+                beans::UnknownPropertyException aEx;
+                aEx.Message = rPropertyName;
+                throw( aEx );
+            }
+            if( pEntry->nWID == FN_UNO_CELL_ROW_SPAN )
+            {
+                sal_Int32 nRowSpan = 0;
+                if( aValue >>= nRowSpan )
+                    pBox->setRowSpan( nRowSpan );
+            }
+            else
+            {
+                SwFrmFmt* pBoxFmt = pBox->ClaimFrmFmt();
+                SwAttrSet aSet(pBoxFmt->GetAttrSet());
+                m_pPropSet->setPropertyValue(rPropertyName, aValue, aSet);
+                pBoxFmt->GetDoc()->SetAttr(aSet, *pBoxFmt);
+            }
         }
     }
 }
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index ea247230d8bf..408372ff72f3 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -175,7 +175,7 @@ SwXText::PrepareForAttach(uno::Reference< text::XTextRange > &, const SwPaM &)
 bool SwXText::CheckForOwnMemberMeta(const SwPaM &, const bool)
     throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
-    ASSERT(CURSOR_META != m_pImpl->m_eType, "should not be called!");
+    OSL_ENSURE(CURSOR_META != m_pImpl->m_eType, "should not be called!");
     return false;
 }
 
diff --git a/sw/source/core/unocore/unotextmarkup.cxx b/sw/source/core/unocore/unotextmarkup.cxx
index bfc0d1d7d5a6..a4260ed63d19 100644
--- a/sw/source/core/unocore/unotextmarkup.cxx
+++ b/sw/source/core/unocore/unotextmarkup.cxx
@@ -101,7 +101,7 @@ void SAL_CALL SwXTextMarkup::commitTextMarkup(
         if( pGrammarContact )
         {
             pWList = pGrammarContact->getGrammarCheck( *mpTxtNode, true );
-            ASSERT( pWList, "GrammarContact _has_ to deliver a wrong list" )
+            OSL_ENSURE( pWList, "GrammarContact _has_ to deliver a wrong list" );
         }
         else
         {
@@ -127,7 +127,7 @@ void SAL_CALL SwXTextMarkup::commitTextMarkup(
     }
     else
     {
-        ASSERT( false, "Unknown mark-up type" )
+        OSL_ENSURE( false, "Unknown mark-up type" );
         return;
     }
 
@@ -241,7 +241,7 @@ void lcl_commitGrammarMarkUp(
     ::sal_Int32 nLength,
     const uno::Reference< container::XStringKeyMap > & xMarkupInfoContainer)
 {
-    ASSERT( nType == text::TextMarkupType::PROOFREADING || nType == text::TextMarkupType::SENTENCE, "Wrong mark-up type" )
+    OSL_ENSURE( nType == text::TextMarkupType::PROOFREADING || nType == text::TextMarkupType::SENTENCE, "Wrong mark-up type" );
     const ModelToViewHelper::ModelPosition aStartPos =
             ModelToViewHelper::ConvertToModelPosition( pConversionMap, nStart );
     const ModelToViewHelper::ModelPosition aEndPos   =
@@ -373,7 +373,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
     if( pGrammarContact )
     {
         pWList = pGrammarContact->getGrammarCheck( *mpTxtNode, true );
-        ASSERT( pWList, "GrammarContact _has_ to deliver a wrong list" )
+        OSL_ENSURE( pWList, "GrammarContact _has_ to deliver a wrong list" );
     }
     else
     {
diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx
index 487f56240309..92c93a47e3d8 100644
--- a/sw/source/core/view/pagepreviewlayout.cxx
+++ b/sw/source/core/view/pagepreviewlayout.cxx
@@ -189,13 +189,13 @@ bool SwPagePreviewLayout::Init( const sal_uInt16 _nCols,
     // check environment and parameters
     {
         bool bColsRowsValid = (_nCols != 0) && (_nRows != 0);
-        ASSERT( bColsRowsValid, "preview layout parameters not correct - preview layout can *not* be initialized" );
+        OSL_ENSURE( bColsRowsValid, "preview layout parameters not correct - preview layout can *not* be initialized" );
         if ( !bColsRowsValid )
             return false;
 
         bool bPxWinSizeValid = (_rPxWinSize.Width() >= 0) &&
                                (_rPxWinSize.Height() >= 0);
-        ASSERT( bPxWinSizeValid, "no window size - preview layout can *not* be initialized" );
+        OSL_ENSURE( bPxWinSizeValid, "no window size - preview layout can *not* be initialized" );
         if ( !bPxWinSizeValid )
             return false;
     }
@@ -266,7 +266,7 @@ bool SwPagePreviewLayout::ReInit()
     // check environment and parameters
     {
         bool bLayoutSettingsValid = mbLayoutInfoValid && mbLayoutSizesValid;
-        ASSERT( bLayoutSettingsValid,
+        OSL_ENSURE( bLayoutSettingsValid,
                 "no valid preview layout info/sizes - no re-init of page preview layout");
         if ( !bLayoutSettingsValid )
             return false;
@@ -295,13 +295,13 @@ bool SwPagePreviewLayout::Prepare( const sal_uInt16 _nProposedStartPageNum,
     // check environment and parameters
     {
         bool bLayoutSettingsValid = mbLayoutInfoValid && mbLayoutSizesValid;
-        ASSERT( bLayoutSettingsValid,
+        OSL_ENSURE( bLayoutSettingsValid,
                 "no valid preview layout info/sizes - no prepare of preview paint");
         if ( !bLayoutSettingsValid )
             return false;
 
         bool bStartPageRangeValid = nProposedStartPageNum <= mnPages;
-        ASSERT( bStartPageRangeValid,
+        OSL_ENSURE( bStartPageRangeValid,
                 "proposed start page not existing - no prepare of preview paint");
         if ( !bStartPageRangeValid )
             return false;
@@ -310,13 +310,13 @@ bool SwPagePreviewLayout::Prepare( const sal_uInt16 _nProposedStartPageNum,
                 _aProposedStartPos.X() >= 0 && _aProposedStartPos.Y() >= 0 &&
                 _aProposedStartPos.X() <= maPreviewDocRect.Right() &&
                 _aProposedStartPos.Y() <= maPreviewDocRect.Bottom();
-        ASSERT( bStartPosRangeValid,
+        OSL_ENSURE( bStartPosRangeValid,
                 "proposed start position out of range - no prepare of preview paint");
         if ( !bStartPosRangeValid )
             return false;
 
         bool bWinSizeValid = _rPxWinSize.Width() != 0 && _rPxWinSize.Height() != 0;
-        ASSERT ( bWinSizeValid, "no window size - no prepare of preview paint");
+       OSL_ENSURE( bWinSizeValid, "no window size - no prepare of preview paint");
         if ( !bWinSizeValid )
             return false;
 
@@ -819,7 +819,7 @@ bool SwPagePreviewLayout::CalcStartValuesForSelectedPageMove(
     {
         if ( _nHoriMove != 0 && _nVertMove != 0 )
         {
-            ASSERT( false, "missing implementation for moving preview selected page horizontal AND vertical");
+            OSL_ENSURE( false, "missing implementation for moving preview selected page horizontal AND vertical");
             return false;
         }
 
@@ -977,7 +977,7 @@ bool SwPagePreviewLayout::Paint( const Rectangle  _aOutRect ) const
              !mrParentViewShell.GetOut()->GetConnectMetaFile() )
             return false;
 
-        ASSERT( mbPaintInfoValid,
+        OSL_ENSURE( mbPaintInfoValid,
                 "invalid preview settings - no paint of preview" );
         if ( !mbPaintInfoValid )
             return false;
@@ -1133,7 +1133,7 @@ void SwPagePreviewLayout::Repaint( const Rectangle _aInvalidCoreRect ) const
              !mrParentViewShell.GetOut()->GetConnectMetaFile() )
             return;
 
-        ASSERT( mbPaintInfoValid,
+        OSL_ENSURE( mbPaintInfoValid,
                 "invalid preview settings - no paint of preview" );
         if ( !mbPaintInfoValid )
             return;
@@ -1325,7 +1325,7 @@ sal_uInt16 SwPagePreviewLayout::GetColOfPage( sal_uInt16 _nPageNum ) const
 
 Size SwPagePreviewLayout::GetPrevwDocSize() const
 {
-    ASSERT( PreviewLayoutValid(), "PagePreviewLayout not valid" );
+    OSL_ENSURE( PreviewLayoutValid(), "PagePreviewLayout not valid" );
     return maPreviewDocRect.GetSize();
 }
 
diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx
index e4a03fece7b9..351382dbdb00 100644
--- a/sw/source/core/view/vdraw.cxx
+++ b/sw/source/core/view/vdraw.cxx
@@ -41,7 +41,7 @@
 
 #include <svx/svdoutl.hxx>
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 #include <svx/fmglob.hxx>
 #endif
 
@@ -127,7 +127,7 @@ void SwViewImp::PaintLayer( const SdrLayerID _nLayerID,
         if ( (_nLayerID == pIDDMA->GetHellId()) ||
              (_nLayerID == pIDDMA->GetHeavenId()) )
         {
-            ASSERT( _pPageBackgrdColor,
+            OSL_ENSURE( _pPageBackgrdColor,
                     "incorrect usage of SwViewImp::PaintLayer: pPageBackgrdColor have to be set for painting layer <hell> or <heaven>");
             if ( _pPageBackgrdColor )
             {
@@ -217,7 +217,7 @@ void SwViewImp::NotifySizeChg( const Size &rNewSz )
     if ( !bCheckDrawObjs )
         return;
 
-    ASSERT( pSh->getIDocumentDrawModelAccess()->GetDrawModel(), "NotifySizeChg without DrawModel" );
+    OSL_ENSURE( pSh->getIDocumentDrawModelAccess()->GetDrawModel(), "NotifySizeChg without DrawModel" );
     SdrPage* pPage = pSh->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage( 0 );
     const ULONG nObjs = pPage->GetObjCount();
     for( ULONG nObj = 0; nObj < nObjs; ++nObj )
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index 42942d67783a..9dd089c1df4d 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -58,7 +58,7 @@
 
 void SwViewImp::Init( const SwViewOption *pNewOpt )
 {
-    ASSERT( pDrawView, "SwViewImp::Init without DrawView" );
+    OSL_ENSURE( pDrawView, "SwViewImp::Init without DrawView" );
     //Now create the page view if it does not exist.
     SwRootFrm *pRoot = pSh->getIDocumentLayoutAccess()->GetRootFrm();
     if ( !pSdrPageView )
@@ -131,8 +131,8 @@ SwViewImp::~SwViewImp()
 
     DelRegion();
 
-    ASSERT( !pLayAct, "Have action for the rest of your life." );
-    ASSERT( !pIdleAct,"Be idle for the rest of your life." );
+    OSL_ENSURE( !pLayAct, "Have action for the rest of your life." );
+    OSL_ENSURE( !pIdleAct,"Be idle for the rest of your life." );
 }
 
 void SwViewImp::DelRegion()
@@ -249,7 +249,7 @@ void SwViewImp::MakeDrawView()
         {
             bool bIsReadOnly(pSwViewOption->IsReadonly());
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
             // add test possibilities
             static bool bAlwaysActivateForTest(false);
             if(bAlwaysActivateForTest && bIsReadOnly)
@@ -286,7 +286,7 @@ Color SwViewImp::GetRetoucheColor() const
 
 void SwViewImp::InitPagePreviewLayout()
 {
-    ASSERT( pSh->GetLayout(), "no layout - page preview layout can not be created.");
+    OSL_ENSURE( pSh->GetLayout(), "no layout - page preview layout can not be created.");
     if ( pSh->GetLayout() )
         mpPgPrevwLayout = new SwPagePreviewLayout( *pSh, *(pSh->GetLayout()) );
 }
@@ -296,8 +296,8 @@ void SwViewImp::UpdateAccessible()
     // We require a layout and an XModel to be accessible.
     IDocumentLayoutAccess* pIDLA = GetShell()->getIDocumentLayoutAccess();
     Window *pWin = GetShell()->GetWin();
-    ASSERT( pIDLA->GetRootFrm(), "no layout, no access" );
-    ASSERT( pWin, "no window, no access" );
+    OSL_ENSURE( pIDLA->GetRootFrm(), "no layout, no access" );
+    OSL_ENSURE( pWin, "no window, no access" );
 
     if( IsAccessible() && pIDLA->GetRootFrm() && pWin )
         GetAccessibleMap().GetDocumentView();
@@ -307,7 +307,7 @@ void SwViewImp::DisposeAccessible( const SwFrm *pFrm,
                                    const SdrObject *pObj,
                                    sal_Bool bRecursive )
 {
-    ASSERT( !pFrm || pFrm->IsAccessibleFrm(), "frame is not accessible" );
+    OSL_ENSURE( !pFrm || pFrm->IsAccessibleFrm(), "frame is not accessible" );
     ViewShell *pVSh = GetShell();
     ViewShell *pTmp = pVSh;
     do
@@ -321,7 +321,7 @@ void SwViewImp::DisposeAccessible( const SwFrm *pFrm,
 void SwViewImp::MoveAccessible( const SwFrm *pFrm, const SdrObject *pObj,
                                 const SwRect& rOldFrm )
 {
-    ASSERT( !pFrm || pFrm->IsAccessibleFrm(), "frame is not accessible" );
+    OSL_ENSURE( !pFrm || pFrm->IsAccessibleFrm(), "frame is not accessible" );
     ViewShell *pVSh = GetShell();
     ViewShell *pTmp = pVSh;
     do
@@ -335,7 +335,7 @@ void SwViewImp::MoveAccessible( const SwFrm *pFrm, const SdrObject *pObj,
 
 void SwViewImp::InvalidateAccessibleFrmContent( const SwFrm *pFrm )
 {
-    ASSERT( pFrm->IsAccessibleFrm(), "frame is not accessible" );
+    OSL_ENSURE( pFrm->IsAccessibleFrm(), "frame is not accessible" );
     ViewShell *pVSh = GetShell();
     ViewShell *pTmp = pVSh;
     do
@@ -467,7 +467,7 @@ void SwViewImp::InvalidateAccessiblePreViewSelection( sal_uInt16 nSelPage )
 
 SwAccessibleMap *SwViewImp::CreateAccessibleMap()
 {
-    ASSERT( !pAccMap, "accessible map exists" )
+    OSL_ENSURE( !pAccMap, "accessible map exists" );
     pAccMap = new SwAccessibleMap( GetShell() );
     return pAccMap;
 }
diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx
index 2d43da843ae6..2656b9bd84c2 100644
--- a/sw/source/core/view/viewpg.cxx
+++ b/sw/source/core/view/viewpg.cxx
@@ -74,7 +74,7 @@ void ViewShell::AdjustOptionsForPagePreview( const SwPrtOptions &_rPrintOptions
 {
     if ( !IsPreView() )
     {
-        ASSERT( false, "view shell doesn't belongs to a page preview - no adjustment of its view options");
+        OSL_ENSURE( false, "view shell doesn't belongs to a page preview - no adjustment of its view options");
         return;
     }
 
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index f8c536859e98..d3e89444c868 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -515,10 +515,10 @@ void ViewShell::MakeVisible( const SwRect &rRect )
                     EndAction();
                 } while( nOldH != pRoot->Frm().Height() && nLoopCnt-- );
             }
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
             else
             {
-                ASSERT( !this, "MakeVisible fuer Drucker wird doch gebraucht?" );
+                OSL_ENSURE( !this, "MakeVisible fuer Drucker wird doch gebraucht?" );
             }
 
 #endif
@@ -940,15 +940,15 @@ void ViewShell::SizeChgNotify()
 
 void ViewShell::VisPortChgd( const SwRect &rRect)
 {
-    ASSERT( GetWin(), "VisPortChgd ohne Window." );
+    OSL_ENSURE( GetWin(), "VisPortChgd ohne Window." );
 
     if ( rRect == VisArea() )
         return;
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     if ( bInEndAction )
     {
-        ASSERT( !this, "Scroll waehrend einer EndAction." );
+        OSL_ENSURE( !this, "Scroll waehrend einer EndAction." );
     }
 #endif
 
@@ -1799,7 +1799,7 @@ void ViewShell::CheckBrowseView( BOOL bBrowseChgd )
 
     SET_CURR_SHELL( this );
 
-    ASSERT( GetLayout(), "Layout not ready" );
+    OSL_ENSURE( GetLayout(), "Layout not ready" );
 
     // Wenn das Layout noch nicht einmal eine Hoehe hat,
     // ist sowieso nichts formatiert.
@@ -1941,7 +1941,7 @@ void ViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
     Window *pMyWin = GetWin();
     if( !pMyWin )
     {
-        ASSERT( pMyWin, "ViewShell::ApplyViewOptions: no window" );
+        OSL_ENSURE( pMyWin, "ViewShell::ApplyViewOptions: no window" );
         return;
     }
 
@@ -2157,8 +2157,8 @@ uno::Reference< ::com::sun::star::accessibility::XAccessible > ViewShell::Create
     SwDoc *pMyDoc = GetDoc();
 
     // We require a layout and an XModel to be accessible.
-    ASSERT( pMyDoc->GetRootFrm(), "no layout, no access" );
-    ASSERT( GetWin(), "no window, no access" );
+    OSL_ENSURE( pMyDoc->GetRootFrm(), "no layout, no access" );
+    OSL_ENSURE( GetWin(), "no window, no access" );
 
     if( pMyDoc->GetRootFrm() && GetWin() )
         xAcc = Imp()->GetAccessibleMap().GetDocumentView();
@@ -2173,8 +2173,8 @@ ViewShell::CreateAccessiblePreview()
                 "Can't create accessible preview for non-preview ViewShell" );
 
     // We require a layout and an XModel to be accessible.
-    ASSERT( pDoc->GetRootFrm(), "no layout, no access" );
-    ASSERT( GetWin(), "no window, no access" );
+    OSL_ENSURE( pDoc->GetRootFrm(), "no layout, no access" );
+    OSL_ENSURE( GetWin(), "no window, no access" );
 
     if ( IsPreView() && pDoc->GetRootFrm() && GetWin() )
     {
@@ -2264,7 +2264,7 @@ void ViewShell::SetCareWin( Window* pNew )
 // #i12836# enhanced pdf export
 sal_Int32 ViewShell::GetPageNumAndSetOffsetForPDF( OutputDevice& rOut, const SwRect& rRect ) const
 {
-    ASSERT( GetLayout(), "GetPageNumAndSetOffsetForPDF assumes presence of layout" )
+    OSL_ENSURE( GetLayout(), "GetPageNumAndSetOffsetForPDF assumes presence of layout" );
 
     sal_Int32 nRet = -1;
 
@@ -2275,7 +2275,7 @@ sal_Int32 ViewShell::GetPageNumAndSetOffsetForPDF( OutputDevice& rOut, const SwR
     const SwPageFrm* pPage = GetLayout()->GetPageAtPos( aRect.Center() );
     if ( pPage )
     {
-        ASSERT( pPage, "GetPageNumAndSetOffsetForPDF: No page found" )
+        OSL_ENSURE( pPage, "GetPageNumAndSetOffsetForPDF: No page found" );
 
         Point aOffset( pPage->Frm().Pos() );
         aOffset.X() = -aOffset.X();
@@ -2294,26 +2294,21 @@ sal_Int32 ViewShell::GetPageNumAndSetOffsetForPDF( OutputDevice& rOut, const SwR
 const BitmapEx& ViewShell::GetReplacementBitmap( bool bIsErrorState )
 {
     BitmapEx** ppRet;
-    USHORT nResId = 0, nHCResId = 0;
+    USHORT nResId = 0;
     if( bIsErrorState )
     {
         ppRet = &pErrorBmp;
         nResId = RID_GRAPHIC_ERRORBMP;
-        nHCResId = RID_GRAPHIC_ERRORBMP_HC;
     }
     else
     {
         ppRet = &pReplaceBmp;
         nResId = RID_GRAPHIC_REPLACEBMP;
-        nHCResId = RID_GRAPHIC_REPLACEBMP_HC;
     }
 
     if( !*ppRet )
     {
-        USHORT nBmpResId =
-            Application::GetSettings().GetStyleSettings().GetHighContrastMode()
-                ? nHCResId : nResId;
-        *ppRet = new BitmapEx( SW_RES( nBmpResId ) );
+        *ppRet = new BitmapEx( SW_RES( nResId ) );
     }
     return **ppRet;
 }
diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx
index 50b9d20d5a5b..c0aaf60485e4 100644
--- a/sw/source/core/view/vnew.cxx
+++ b/sw/source/core/view/vnew.cxx
@@ -283,7 +283,7 @@ ViewShell::~ViewShell()
                         for( SwFrm* pFrm = (SwFrm*)aIter.First( TYPE(SwFrm) );
                             pFrm; pFrm = (SwFrm*)aIter.Next() )
                         {
-                            ASSERT( pFrm->IsNoTxtFrm(), "GraphicNode with Text?" );
+                            OSL_ENSURE( pFrm->IsNoTxtFrm(), "GraphicNode with Text?" );
                             ((SwNoTxtFrm*)pFrm)->StopAnimation( pOut );
                         }
                     }
@@ -312,7 +312,7 @@ ViewShell::~ViewShell()
 
         SwPaintQueue::Remove( this );
 
-        ASSERT( !nStartAction, "EndAction() pending." );
+        OSL_ENSURE( !nStartAction, "EndAction() pending." );
     }
 
     if ( pDoc )
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index 3f0bd8809f55..dcd8ac49feab 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -194,7 +194,7 @@ void SwPaintQueue::Remove( ViewShell *pSh )
 
 void SetSwVisArea( ViewShell *pSh, const SwRect &rRect, BOOL /*bPDFExport*/ )
 {
-    ASSERT( !pSh->GetWin(), "Drucken mit Window?" );
+    OSL_ENSURE( !pSh->GetWin(), "Drucken mit Window?" );
     pSh->aVisArea = rRect;
     pSh->Imp()->SetFirstVisPageInvalid();
     Point aPt( rRect.Pos() );
@@ -241,7 +241,7 @@ void ViewShell::InitPrt( OutputDevice *pOutDev )
 
 void ViewShell::ChgAllPageOrientation( USHORT eOri )
 {
-    ASSERT( nStartAction, "missing an Action" );
+    OSL_ENSURE( nStartAction, "missing an Action" );
     SET_CURR_SHELL( this );
 
     USHORT nAll = GetDoc()->GetPageDescCnt();
@@ -277,7 +277,7 @@ void ViewShell::ChgAllPageOrientation( USHORT eOri )
 
 void ViewShell::ChgAllPageSize( Size &rSz )
 {
-    ASSERT( nStartAction, "missing an Action" );
+    OSL_ENSURE( nStartAction, "missing an Action" );
     SET_CURR_SHELL( this );
 
     SwDoc* pMyDoc = GetDoc();
@@ -344,7 +344,7 @@ void ViewShell::CalcPagesForPrint( USHORT nMax )
 
 SwDoc * ViewShell::CreatePrtDoc( SfxObjectShellRef &rDocShellRef)
 {
-    ASSERT( this->IsA( TYPE(SwFEShell) ),"ViewShell::Prt for FEShell only");
+    OSL_ENSURE( this->IsA( TYPE(SwFEShell) ),"ViewShell::Prt for FEShell only");
     SwFEShell* pFESh = (SwFEShell*)this;
 
     SwDoc *pPrtDoc = new SwDoc;
@@ -388,7 +388,7 @@ SwDoc * ViewShell::CreatePrtDoc( SfxObjectShellRef &rDocShellRef)
     }
 
     const SwPageFrm* pPage = GetLayout()->GetPageAtPos( aSelPoint );
-    ASSERT( pPage, "no page found!" );
+    OSL_ENSURE( pPage, "no page found!" );
 
     // get page descriptor - fall back to the first one if pPage could not be found
     const SwPageDesc* pPageDesc = pPage ? pPrtDoc->FindPageDescByName(
@@ -438,7 +438,7 @@ SwDoc * ViewShell::CreatePrtDoc( SfxObjectShellRef &rDocShellRef)
 
 SwDoc * ViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt)
 {
-    ASSERT( this->IsA( TYPE(SwFEShell) ),"ViewShell::Prt for FEShell only");
+    OSL_ENSURE( this->IsA( TYPE(SwFEShell) ),"ViewShell::Prt for FEShell only");
     SwFEShell* pFESh = (SwFEShell*)this;
     pPrtDoc->LockExpFlds();
 
@@ -483,7 +483,7 @@ SwDoc * ViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt)
     }
 
     const SwPageFrm* pPage = GetLayout()->GetPageAtPos( aSelPoint );
-    ASSERT( pPage, "no page found!" );
+    OSL_ENSURE( pPage, "no page found!" );
 
     // get page descriptor - fall back to the first one if pPage could not be found
     const SwPageDesc* pPageDesc = pPage ? pPrtDoc->FindPageDescByName(
diff --git a/sw/source/filter/ascii/ascatr.cxx b/sw/source/filter/ascii/ascatr.cxx
index 0c1601abcd28..2a21ee899db5 100644
--- a/sw/source/filter/ascii/ascatr.cxx
+++ b/sw/source/filter/ascii/ascatr.cxx
@@ -206,8 +206,8 @@ static Writer& OutASC_SwTxtNode( Writer& rWrt, SwCntntNode& rNode )
     } while( nStrPos < nEnde );
 
     if( !bLastNd ||
-        ( !rWrt.bWriteClipboardDoc && !rWrt.bASCII_NoLastLineEnd )
-            && !nStrPos && nEnde == nNodeEnde )
+        (( !rWrt.bWriteClipboardDoc && !rWrt.bASCII_NoLastLineEnd )
+            && !nStrPos && nEnde == nNodeEnde ))
         rWrt.Strm().WriteUnicodeOrByteText( ((SwASCWriter&)rWrt).GetLineEnd());
 
     return rWrt;
diff --git a/sw/source/filter/ascii/makefile.mk b/sw/source/filter/ascii/makefile.mk
index e2bd2bef2569..4bc8bfacd49e 100644
--- a/sw/source/filter/ascii/makefile.mk
+++ b/sw/source/filter/ascii/makefile.mk
@@ -43,13 +43,14 @@ CXXFILES = \
         parasc.cxx \
         wrtasc.cxx
 
-
-
-SLOFILES =	\
+EXCEPTIONSFILES = \
         $(SLO)$/ascatr.obj \
         $(SLO)$/parasc.obj \
         $(SLO)$/wrtasc.obj
 
+SLOFILES =	\
+        $(EXCEPTIONSFILES)
+
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index 64057950315a..4e62d79fe417 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -82,7 +82,7 @@ ULONG AsciiReader::Read( SwDoc &rDoc, const String&, SwPaM &rPam, const String &
 {
     if( !pStrm )
     {
-        ASSERT( !this, "ASCII-Read ohne Stream" );
+        OSL_ENSURE( !this, "ASCII-Read ohne Stream" );
         return ERR_SWG_READ_ERROR;
     }
 
@@ -254,7 +254,7 @@ ULONG SwASCIIParser::CallParser()
                                     pInsPam->GetCntntNode(), nSttCntnt );
 
                 // !!!!!
-                ASSERT( !this, "Have to change - hard attr. to para. style" );
+                OSL_ENSURE( !this, "Have to change - hard attr. to para. style" );
                 pDoc->InsertItemSet( *pInsPam, *pItemSet, 0 );
             }
         }
@@ -287,7 +287,7 @@ ULONG SwASCIIParser::ReadChars()
         nOrig = nLen = rInput.Read(pArr, ASC_BUFFLEN);
         CharSet eCharSet;
         bool bRet = SwIoSystem::IsDetectableText(pArr, nLen, &eCharSet, &bSwapUnicode);
-        ASSERT(bRet, "Autodetect of text import without nag dialog must "
+        OSL_ENSURE(bRet, "Autodetect of text import without nag dialog must "
             "have failed");
         if (bRet && eCharSet != RTL_TEXTENCODING_DONTKNOW)
         {
@@ -307,7 +307,7 @@ ULONG SwASCIIParser::ReadChars()
         if( currentCharSet == RTL_TEXTENCODING_DONTKNOW )
                 currentCharSet = RTL_TEXTENCODING_ASCII_US;
         hConverter = rtl_createTextToUnicodeConverter( currentCharSet );
-        ASSERT( hConverter, "no string convert avaiable" );
+        OSL_ENSURE( hConverter, "no string convert avaiable" );
         if (!hConverter)
             return ERROR_SW_READ_BASE;
         bSwapUnicode = false;
@@ -405,12 +405,6 @@ ULONG SwASCIIParser::ReadChars()
         bool bIns = true, bSplitNode = false;
         switch( *pStt )
         {
-//JP 12.11.2001: task 94636 - don't ignore all behind the zero character,
-//                            change it to the default "control character"
-//      case 0:
-//                  pEnd = pStt;
-//                  bIns = false ;
-//                  break;
 
         case 0x0a:  if( LINEEND_LF == pUseMe->GetParaFlags() )
                     {
@@ -456,8 +450,6 @@ ULONG SwASCIIParser::ReadChars()
                         *pStt++ = 0;
                         if( nLineLen )
                         {
-                            // Change to charset system!!!!
-                            //rOpt.GetCharSet();
                             InsertText( String( pLastStt ));
                         }
                         pDoc->SplitNode( *pPam->GetPoint(), false );
diff --git a/sw/source/filter/ascii/wrtasc.cxx b/sw/source/filter/ascii/wrtasc.cxx
index a2403bf4ae19..3962e094e84b 100644
--- a/sw/source/filter/ascii/wrtasc.cxx
+++ b/sw/source/filter/ascii/wrtasc.cxx
@@ -180,7 +180,6 @@ ULONG SwASCWriter::WriteStream()
                                     BYTE(0xBF);
                                 break;
                             case RTL_TEXTENCODING_UCS2:
-                                //Strm().StartWritingUnicodeText();
                                 Strm().SetEndianSwap(FALSE);
 #ifdef OSL_LITENDIAN
                                 Strm() << BYTE(0xFF) << BYTE(0xFE);
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index a69686cbd358..2bbafd0e30fc 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -122,11 +122,6 @@ void SwReaderWriterEntry::GetWriter( const String& rNm, const String& rBaseURL,
         xWrt = WriterRef(0);
 }
 
-/*SwRead SwGetReaderSw3() // SW_DLLPUBLIC
-{
-    return ReadSw3;
-}
-*/
 SwRead SwGetReaderXML() // SW_DLLPUBLIC
 {
     return ReadXML;
@@ -208,19 +203,10 @@ SwRead GetReader( const String& rFltName )
 
 /*  */
 
-/////////////// die Storage Reader/Writer ////////////////////////////////
-
-/*void GetSw3Writer( const String&, const String& rBaseURL, WriterRef& xRet )
-{
-    DBG_ERROR( "Shouldn't happen!");
-    xRet = new Sw3Writer;
-}
-*/
-
 ULONG StgReader::OpenMainStream( SvStorageStreamRef& rRef, USHORT& rBuffSize )
 {
     ULONG nRet = ERR_SWG_READ_ERROR;
-    ASSERT( pStg, "wo ist mein Storage?" );
+    OSL_ENSURE( pStg, "wo ist mein Storage?" );
     const SfxFilter* pFltr = SwIoSystem::GetFilterOfFormat( aFltName );
     if( pFltr )
     {
@@ -243,82 +229,6 @@ ULONG StgReader::OpenMainStream( SvStorageStreamRef& rRef, USHORT& rBuffSize )
     return nRet;
 }
 
-/*  */
-/*
-ULONG Sw3Reader::Read( SwDoc &rDoc, SwPaM &rPam, const String & )
-{
-    ULONG nRet;
-    if( pStg && pIO )
-    {
-        // TRUE: Vorlagen ueberschreiben
-        pIO->SetReadOptions( aOpt,TRUE );
-        if( !bInsertMode )
-        {
-            // Im Laden-Modus darf der PaM-Content-Teil nicht
-            // in den Textbereich zeigen (Nodes koennen geloescht werden)
-            rPam.GetBound( TRUE ).nContent.Assign( 0, 0 );
-            rPam.GetBound( FALSE ).nContent.Assign( 0, 0 );
-        }
-        nRet = pIO->Load( pStg, bInsertMode ? &rPam : 0 );
-        aOpt.ResetAllFmtsOnly();
-        pIO->SetReadOptions( aOpt, TRUE );
-    }
-    else
-    {
-        ASSERT( !this, "Sw3-Read ohne Storage und/oder IO-System" );
-        nRet = ERR_SWG_READ_ERROR;
-    }
-    return nRet;
-}
-
-    // read the sections of the document, which is equal to the medium.
-    // returns the count of it
-USHORT Sw3Reader::GetSectionList( SfxMedium& rMedium,
-                                    SvStrings& rStrings ) const
-{
-    SvStorageRef aStg( rMedium.GetStorage() );
-    const SfxFilter* pFlt = rMedium.GetFilter();
-    ASSERT( pFlt && pFlt->GetVersion(),
-                                "Kein Filter oder Filter ohne FF-Version" );
-    if( pFlt && pFlt->GetVersion() )
-        aStg->SetVersion( (long)pFlt->GetVersion() );
-
-    if( pIO )
-        pIO->GetSectionList( &aStg, rStrings );
-    return rStrings.Count();
-    return 0;
-}
-*/
-
-/*ULONG Sw3Writer::WriteStorage()
-{
-    ULONG nRet;
-    if( pIO )
-    {
-        // der gleiche Storage -> Save, sonst SaveAs aufrufen
-        if( !bSaveAs )
-            nRet = pIO->Save( pOrigPam, bWriteAll );
-        else
-            nRet = pIO->SaveAs( pStg, pOrigPam, bWriteAll );
-
-        pIO = 0;        // nach dem Schreiben ist der Pointer ungueltig !!
-    }
-    else
-    {
-        ASSERT( !this, "Sw3-Writer ohne IO-System" )
-        nRet = ERR_SWG_WRITE_ERROR;
-    }
-    return nRet;
-}
-
-ULONG Sw3Writer::WriteMedium( SfxMedium& )
-{
-    DBG_ERROR( "Shouldn't be used currently!");
-    return WriteStorage();
-}
-
-BOOL Sw3Writer::IsSw3Writer() const { return TRUE; }
-*/
 
 void Writer::SetPasswd( const String& ) {}
 
@@ -327,7 +237,6 @@ void Writer::SetVersion( const String&, long ) {}
 
 
 BOOL Writer::IsStgWriter() const { return FALSE; }
-//BOOL Writer::IsSw3Writer() const { return FALSE; }
 
 BOOL StgWriter::IsStgWriter() const { return TRUE; }
 
@@ -491,18 +400,6 @@ void SwRelNumRuleSpaces::SetNumRelSpaces( SwDoc& rDoc )
             // Rule noch gueltig und am Doc vorhanden?
             if( USHRT_MAX != rDoc.GetNumRuleTbl().GetPos( pRule ))
             {
-                // --> OD 2008-02-19 #refactorlists#
-//                SwNumRuleInfo aUpd( pRule->GetName() );
-//                aUpd.MakeList( rDoc );
-
-//                // bei allen nmumerierten Absaetzen vom linken Rand
-//                // den absoluten Wert des NumFormates abziehen
-//                for( ULONG nUpdPos = 0; nUpdPos < aUpd.GetList().Count();
-//                    ++nUpdPos )
-//                {
-//                    SwTxtNode* pNd = aUpd.GetList().GetObject( nUpdPos );
-//                    SetNumLSpace( *pNd, *pRule );
-//                }
                 SwNumRule::tTxtNodeList aTxtNodeList;
                 pRule->GetTxtNodeList( aTxtNodeList );
                 for ( SwNumRule::tTxtNodeList::iterator aIter = aTxtNodeList.begin();
@@ -511,7 +408,6 @@ void SwRelNumRuleSpaces::SetNumRelSpaces( SwDoc& rDoc )
                     SwTxtNode* pNd = *aIter;
                     SetNumLSpace( *pNd, *pRule );
                 }
-                // <--
             }
         }
     }
@@ -551,16 +447,14 @@ void SwRelNumRuleSpaces::SetOultineRelSpaces( const SwNodeIndex& rStt,
 void SwRelNumRuleSpaces::SetNumLSpace( SwTxtNode& rNd, const SwNumRule& rRule )
 {
     BOOL bOutlineRule = OUTLINE_RULE == rRule.GetRuleType();
-    // --> OD 2005-11-18 #128056#
-    // correction of refactoring done by cws swnumtree:
+    // #128056# correction of refactoring done by cws swnumtree:
     // - assure a correct level for retrieving numbering format.
-//    BYTE nLvl = rNd.GetLevel();
     BYTE nLvl = 0;
     if ( rNd.GetActualListLevel() >= 0 && rNd.GetActualListLevel() < MAXLEVEL )
     {
         nLvl = static_cast< BYTE >(rNd.GetActualListLevel());
     }
-    // <--
+
     const SwNumFmt& rFmt = rRule.Get( nLvl );
     const SvxLRSpaceItem& rLR = rNd.GetSwAttrSet().GetLRSpace();
 
@@ -857,7 +751,7 @@ rtl_TextEncoding CharSetFromName(const String& rChrSetStr)
         }
     }
 
-    ASSERT(nRet != pStart->eCode, "TXT: That was an unknown language!");
+    OSL_ENSURE(nRet != pStart->eCode, "TXT: That was an unknown language!");
 
     return nRet;
 }
@@ -880,7 +774,7 @@ String NameFromCharSet(rtl_TextEncoding nChrSet)
         }
     }
 
-    ASSERT(pRet != pStart->pName, "TXT: That was an unknown language!");
+    OSL_ENSURE(pRet != pStart->pName, "TXT: That was an unknown language!");
 
     return String::CreateFromAscii(pRet);
 }
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index c1ae8efa39c9..596b2eeb5ba2 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -194,17 +194,15 @@ BOOL SwIoSystem::IsValidStgFilter(SotStorage& rStg, const SfxFilter& rFilter)
                 bRet = !(nByte & 1);
             }
         }
-        //      else if( !rFilter.GetUserData().EqualsAscii(sCExcel) )
-        //          bRet = rFilter.GetFormat() == nStgFmtId;
     }
     return bRet;
 }
 
 void TerminateBuffer(sal_Char *pBuffer, ULONG nBytesRead, ULONG nBufferLen)
 {
-    ASSERT(nBytesRead <= nBufferLen - 2,
+    OSL_ENSURE(nBytesRead <= nBufferLen - 2,
             "what you read must be less than the max + null termination");
-    ASSERT(!(nBufferLen & 0x00000001), "nMaxReadBuf must be an even number");
+    OSL_ENSURE(!(nBufferLen & 0x00000001), "nMaxReadBuf must be an even number");
     if (nBytesRead <= nBufferLen - 2)
     {
         pBuffer[nBytesRead] = '\0';
@@ -392,18 +390,6 @@ const SfxFilter* SwIoSystem::GetFileFilter(const String& rFileName,
         nBytesRead = pIStrm->Read(aBuffer, nMaxRead);
         pIStrm->Seek( nCurrPos );
     }
-    /*
-       else
-       {
-       SvFileStream aStrm( rFileName, STREAM_READ );
-
-    // ohne FileName oder ohne Stream gibts nur den ANSI-Filter
-    if( !rFileName.Len() || SVSTREAM_OK != aStrm.GetError() )
-    return 0;
-
-    nBytesRead = aStrm.Read(aBuffer, nMaxRead);
-    aStrm.Close();
-    }*/
 
     TerminateBuffer(aBuffer, nBytesRead, sizeof(aBuffer));
 
diff --git a/sw/source/filter/basflt/makefile.mk b/sw/source/filter/basflt/makefile.mk
index 7713d1265707..e52622717426 100644
--- a/sw/source/filter/basflt/makefile.mk
+++ b/sw/source/filter/basflt/makefile.mk
@@ -43,14 +43,13 @@ CDEFS+=-Dmydebug
 # --- Files --------------------------------------------------------
 
 SLOFILES = \
-        $(SLO)$/docfact.obj \
-        $(SLO)$/fltini.obj \
-        $(SLO)$/shellio.obj \
-        $(SLO)$/iodetect.obj
+        $(EXCEPTIONSFILES) \
 
 EXCEPTIONSFILES = \
+        $(SLO)$/docfact.obj \
         $(SLO)$/fltini.obj \
-        $(SLO)$/iodetect.obj
+        $(SLO)$/iodetect.obj \
+        $(SLO)$/shellio.obj
 
 # --- Tagets -------------------------------------------------------
 
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index 8be6ead5cd68..4ce1295453e1 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -95,12 +95,6 @@ ULONG SwReader::Read( const Reader& rOptions )
 
     GetDoc();
 
-    // am Sw3-Reader noch den pIo-Pointer "loeschen"
-    /*
-    if( po == ReadSw3 && pDoc->GetDocShell() &&
-        ((Sw3Reader*)po)->GetSw3Io() != pDoc->GetDocShell()->GetIoSystem() )
-            ((Sw3Reader*)po)->SetSw3Io( pDoc->GetDocShell()->GetIoSystem() );*/
-
     // waehrend des einlesens kein OLE-Modified rufen
     Link aOLELink( pDoc->GetOle2Link() );
     pDoc->SetOle2Link( Link() );
@@ -403,10 +397,6 @@ ULONG SwReader::Read( const Reader& rOptions )
     {
         pDoc->SetModified();
     }
-    // <--
-
-//  if( po == ReadSw3 )         // am Sw3-Reader noch den pIo-Pointer "loeschen"
-//      ((Sw3Reader*)po)->SetSw3Io( 0 );
 
     po->SetReadUTF8( FALSE );
     po->SetBlockMode( FALSE );
@@ -421,20 +411,6 @@ ULONG SwReader::Read( const Reader& rOptions )
  * Konstruktoren, Destruktor
  */
 
-// Initiales Einlesben
-
-                                       /*
-SwReader::SwReader(SvStorage& rStg, const String& rFileName, SwDoc *pDoc)
-    : SwDocFac(pDoc), pStrm(0), pStg(&rStg), pMedium(0), pCrsr(0),
-    aFileName(rFileName)
-{
-}
-
-SwReader::SwReader(const uno::Reference < embed::XStorage >& rStg, const String& rFileName, SwDoc *pDoc)
-    : SwDocFac(pDoc), pStrm(0), pMedium(0), pCrsr(0), xStg( rStg ), aFileName(rFileName)
-{
-}
-                                         */
 SwReader::SwReader(SfxMedium& rMedium, const String& rFileName, SwDoc *pDocument)
     : SwDocFac(pDocument), pStrm(0), pMedium(&rMedium), pCrsr(0),
     aFileName(rFileName)
@@ -450,13 +426,7 @@ SwReader::SwReader(SvStream& rStrm, const String& rFileName, const String& rBase
 {
     SetBaseURL( rBaseURL );
 }
-/*
-SwReader::SwReader(SvStorage& rStg, const String& rFileName, SwPaM& rPam)
-    : SwDocFac(rPam.GetDoc()), pStrm(0), pStg(&rStg), pMedium(0), pCrsr(&rPam),
-    aFileName(rFileName)
-{
-}
-*/
+
 SwReader::SwReader(SfxMedium& rMedium, const String& rFileName, SwPaM& rPam)
     : SwDocFac(rPam.GetDoc()), pStrm(0), pMedium(&rMedium),
     pCrsr(&rPam), aFileName(rFileName)
@@ -530,7 +500,7 @@ SwDoc* Reader::GetTemplateDoc()
         if( bLoad )
         {
             ClearTemplate();
-            ASSERT( !pTemplate, "Who holds the template doc?" );
+            OSL_ENSURE( !pTemplate, "Who holds the template doc?" );
 
                 // #95605#: If the writer module is not installed,
                 // we cannot create a SwDocShell. We could create a
@@ -561,7 +531,7 @@ SwDoc* Reader::GetTemplateDoc()
                 }
         }
 
-        ASSERT( !pTemplate || FStatHelper::IsDocument( aFileName ) ||
+        OSL_ENSURE( !pTemplate || FStatHelper::IsDocument( aFileName ) ||
                 aTemplateNm.EqualsAscii( "$$Dummy$$" ),
                 "TemplatePtr but no template exist!" );
     }
@@ -620,7 +590,7 @@ void Reader::MakeHTMLDummyTemplateDoc()
 // muessen die Methode ueberladen
 int Reader::SetStrmStgPtr()
 {
-    ASSERT( pMedium, "Wo ist das Medium??" );
+    OSL_ENSURE( pMedium, "Wo ist das Medium??" );
 
     if( pMedium->IsStorage() )
     {
@@ -683,7 +653,7 @@ void Reader::ResetFrmFmts( SwDoc& rDoc )
         switch (i)
         {
             default:
-                ASSERT(i == 0, "Impossible");
+                OSL_ENSURE(i == 0, "Impossible");
                 //fallthrough
             case 0:
                 nPoolId = RES_POOLFRM_FRAME;
@@ -836,7 +806,7 @@ ULONG SwWriter::Write( WriterRef& rxWriter, const String* pRealFileName )
         SwTableNode* pTblNd = (SwTableNode*)aBoxes[0]->GetSttNd()->StartOfSectionNode();
         SwNodeIndex aIdx( pDoc->GetNodes().GetEndOfExtras(), 2 );
         SwCntntNode *pNd = aIdx.GetNode().GetCntntNode();
-        ASSERT( pNd, "Node not found" );
+        OSL_ENSURE( pNd, "Node not found" );
         SwPosition aPos( aIdx, SwIndex( pNd ) );
         pTblNd->GetTable().MakeCopy( pDoc, aPos, aBoxes );
     }
diff --git a/sw/source/filter/html/SwAppletImpl.cxx b/sw/source/filter/html/SwAppletImpl.cxx
index 6caa08440fbe..3c10b4c30aa9 100644
--- a/sw/source/filter/html/SwAppletImpl.cxx
+++ b/sw/source/filter/html/SwAppletImpl.cxx
@@ -191,7 +191,6 @@ SwApplet_Impl::~SwApplet_Impl()
 }
 void SwApplet_Impl::FinishApplet()
 {
-    //xApplet->EnableSetModified( TRUE );
     uno::Reference < beans::XPropertySet > xSet( xApplet->getComponent(), uno::UNO_QUERY );
     if ( xSet.is() )
     {
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 2abe0733d60c..5711ca98317b 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -338,7 +338,7 @@ static void AddUnitPropertyValue( long nVal, FieldUnit eUnit, ByteString& rOut )
     switch( eUnit )
     {
     case FUNIT_100TH_MM:
-        ASSERT( FUNIT_MM == eUnit, "Masseinheit wird nicht unterstuetzt" );
+        OSL_ENSURE( FUNIT_MM == eUnit, "Masseinheit wird nicht unterstuetzt" );
     case FUNIT_MM:
         // 0.01mm = 0.57twip
         nMul = 25400;   // 25.4 * 1000
@@ -349,7 +349,7 @@ static void AddUnitPropertyValue( long nVal, FieldUnit eUnit, ByteString& rOut )
 
     case FUNIT_M:
     case FUNIT_KM:
-        ASSERT( FUNIT_CM == eUnit, "Masseinheit wird nicht unterstuetzt" );
+        OSL_ENSURE( FUNIT_CM == eUnit, "Masseinheit wird nicht unterstuetzt" );
     case FUNIT_CM:
 #ifdef EXACT_VALUES
         // 0.001cm = 0.57twip
@@ -366,7 +366,7 @@ static void AddUnitPropertyValue( long nVal, FieldUnit eUnit, ByteString& rOut )
         break;
 
     case FUNIT_TWIP:
-        ASSERT( FUNIT_POINT == eUnit, "Masseinheit wird nicht unterstuetzt" );
+        OSL_ENSURE( FUNIT_POINT == eUnit, "Masseinheit wird nicht unterstuetzt" );
     case FUNIT_POINT:
 #ifdef EXACT_VALUES
         // 0.01pt = 0.2twip
@@ -404,7 +404,7 @@ static void AddUnitPropertyValue( long nVal, FieldUnit eUnit, ByteString& rOut )
     case FUNIT_PERCENT:
     case FUNIT_INCH:
     default:
-        ASSERT( FUNIT_INCH == eUnit, "Masseinheit wird nicht unterstuetzt" );
+        OSL_ENSURE( FUNIT_INCH == eUnit, "Masseinheit wird nicht unterstuetzt" );
 #ifdef EXACT_VALUES
         // 0.0001in = 0.144twip
         nMul = 100000;
@@ -879,7 +879,7 @@ USHORT SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken,
 
             // Wenn eine PoolId gesetzt ist, entspricht der Name der
             // Vorlage dem szugehoerigen Token
-            ASSERT( rRefPoolId != 0 == rToken.Len() > 0,
+            OSL_ENSURE( (rRefPoolId != 0) == (rToken.Len() > 0),
                     "Token missing" );
         }
         else
@@ -1106,7 +1106,7 @@ const SwFmt *SwHTMLWriter::GetTemplateFmt( USHORT nPoolFmtId,
 
     if( pTemplate )
     {
-        ASSERT( !(USER_FMT & nPoolFmtId),
+        OSL_ENSURE( !(USER_FMT & nPoolFmtId),
                 "In der Dok-Vorlage gibt es keine Benutzer-Vorlagen" );
         if( POOLGRP_NOCOLLID & nPoolFmtId )
             pRefFmt = pTemplate->GetCharFmtFromPool( nPoolFmtId );
@@ -1119,7 +1119,7 @@ const SwFmt *SwHTMLWriter::GetTemplateFmt( USHORT nPoolFmtId,
 
 const SwFmt *SwHTMLWriter::GetParentFmt( const SwFmt& rFmt, USHORT nDeep )
 {
-    ASSERT( nDeep != USHRT_MAX, "GetParent fuer HTML-Vorlage aufgerufen!" );
+    OSL_ENSURE( nDeep != USHRT_MAX, "GetParent fuer HTML-Vorlage aufgerufen!" );
     const SwFmt *pRefFmt = 0;
 
     if( nDeep > 0 )
@@ -1151,7 +1151,7 @@ void SwHTMLWriter::SubtractItemSet( SfxItemSet& rItemSet,
                                     BOOL bClearSame,
                                      const SfxItemSet *pRefScriptItemSet )
 {
-    ASSERT( bSetDefaults || bClearSame,
+    OSL_ENSURE( bSetDefaults || bClearSame,
             "SwHTMLWriter::SubtractItemSet: Bei diesen Flags passiert nix" );
     SfxItemSet aRefItemSet( *rRefItemSet.GetPool(), rRefItemSet.GetRanges() );
     aRefItemSet.Set( rRefItemSet );
@@ -2160,10 +2160,10 @@ void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt,
                 BOOL bOutXPos = FALSE, bOutYPos = FALSE;
                 if( RES_DRAWFRMFMT == rFrmFmt.Which() )
                 {
-                    ASSERT( pSdrObj, "Kein SdrObject uebergeben. Ineffizient" );
+                    OSL_ENSURE( pSdrObj, "Kein SdrObject uebergeben. Ineffizient" );
                     if( !pSdrObj )
                         pSdrObj = rFrmFmt.FindSdrObject();
-                    ASSERT( pSdrObj, "Wo ist das SdrObject" );
+                    OSL_ENSURE( pSdrObj, "Wo ist das SdrObject" );
                     if( pSdrObj )
                     {
                         Point aPos( pSdrObj->GetRelativePos() );
@@ -2227,10 +2227,10 @@ void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt,
     {
         if( RES_DRAWFRMFMT == rFrmFmt.Which() )
         {
-            ASSERT( pSdrObj, "Kein SdrObject uebergeben. Ineffizient" );
+            OSL_ENSURE( pSdrObj, "Kein SdrObject uebergeben. Ineffizient" );
             if( !pSdrObj )
                 pSdrObj = rFrmFmt.FindSdrObject();
-            ASSERT( pSdrObj, "Wo ist das SdrObject" );
+            OSL_ENSURE( pSdrObj, "Wo ist das SdrObject" );
             if( pSdrObj )
             {
                 Size aTwipSz( pSdrObj->GetLogicRect().GetSize() );
@@ -2254,9 +2254,9 @@ void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt,
         }
         else
         {
-            ASSERT( HTML_FRMOPT_ABSSIZE & nFrmOpts,
+            OSL_ENSURE( HTML_FRMOPT_ABSSIZE & nFrmOpts,
                     "Absolute Groesse wird exportiert" );
-            ASSERT( HTML_FRMOPT_ANYSIZE & nFrmOpts,
+            OSL_ENSURE( HTML_FRMOPT_ANYSIZE & nFrmOpts,
                     "Jede Groesse wird exportiert" );
             USHORT nMode = 0;
             if( nFrmOpts & HTML_FRMOPT_S_WIDTH )
@@ -2426,7 +2426,7 @@ void SwHTMLWriter::OutCSS1_FrmFmtBackground( const SwFrmFmt& rFrmFmt )
 
     // Schliesslich bleibt noch der Hintergrund der Seite uebrig und als
     // letzte Rettung das Item der Config.
-    ASSERT( pCurrPageDesc, "Keine Seiten-Vorlage gemerkt" );
+    OSL_ENSURE( pCurrPageDesc, "Keine Seiten-Vorlage gemerkt" );
     if( !OutCSS1_FrmFmtBrush( *this,
                               pCurrPageDesc->GetMaster().GetBackground() ) )
     {
@@ -2478,7 +2478,7 @@ static Writer& OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( Writer& rWrt,
             {
                 // das geht auch in HTML und muss nicht als STYLE-Option
                 // und darf nicht als Hint geschrieben werden
-                ASSERT( !rHTMLWrt.IsCSS1Source(CSS1_OUTMODE_HINT),
+                OSL_ENSURE( !rHTMLWrt.IsCSS1Source(CSS1_OUTMODE_HINT),
                         "Underline als Hint schreiben?" );
                 pUStr = sCSS1_PV_underline;
             }
@@ -2501,7 +2501,7 @@ static Writer& OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( Writer& rWrt,
             {
                 // das geht auch in HTML und muss nicht als STYLE-Option
                 // und darf nicht als Hint geschrieben werden
-                ASSERT( !rHTMLWrt.IsCSS1Source(CSS1_OUTMODE_HINT),
+                OSL_ENSURE( !rHTMLWrt.IsCSS1Source(CSS1_OUTMODE_HINT),
                         "Overline als Hint schreiben?" );
                 pOStr = sCSS1_PV_overline;
             }
@@ -2524,7 +2524,7 @@ static Writer& OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( Writer& rWrt,
             {
                 // das geht auch in HTML und muss nicht als STYLE-Option
                 // und darf nicht als Hint geschrieben werden
-                ASSERT( !rHTMLWrt.IsCSS1Source(CSS1_OUTMODE_HINT),
+                OSL_ENSURE( !rHTMLWrt.IsCSS1Source(CSS1_OUTMODE_HINT),
                         "CrossedOut als Hint schreiben?" );
                 pCOStr = sCSS1_PV_line_through;
             }
@@ -2543,7 +2543,7 @@ static Writer& OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( Writer& rWrt,
         {
             // das geht auch in HTML und muss nicht als STYLE-Option
             // und darf nicht als Hint geschrieben werden
-            ASSERT( !rHTMLWrt.IsCSS1Source(CSS1_OUTMODE_HINT),
+            OSL_ENSURE( !rHTMLWrt.IsCSS1Source(CSS1_OUTMODE_HINT),
                     "Blink als Hint schreiben?" );
             pBStr = sCSS1_PV_blink;
         }
@@ -2617,7 +2617,7 @@ static Writer& OutCSS1_SvxColor( Writer& rWrt, const SfxPoolItem& rHt )
     if( rHTMLWrt.IsCSS1Source( CSS1_OUTMODE_PARA ) &&
         !rHTMLWrt.bCfgPreferStyles )
         return rWrt;
-    ASSERT( !rHTMLWrt.IsCSS1Source(CSS1_OUTMODE_HINT),
+    OSL_ENSURE( !rHTMLWrt.IsCSS1Source(CSS1_OUTMODE_HINT),
             "Farbe wirklich als Hint ausgeben?" );
 
     Color aColor( ((const SvxColorItem&)rHt).GetValue() );
@@ -2662,7 +2662,7 @@ static Writer& OutCSS1_SvxFont( Writer& rWrt, const SfxPoolItem& rHt )
     if( !rHTMLWrt.IsCSS1Script( nScript ) )
         return rWrt;
 
-    ASSERT( !rHTMLWrt.IsCSS1Source(CSS1_OUTMODE_HINT),
+    OSL_ENSURE( !rHTMLWrt.IsCSS1Source(CSS1_OUTMODE_HINT),
             "Font wirklich als Hint ausgeben?" );
 
     String sOut;
@@ -2736,7 +2736,7 @@ static Writer& OutCSS1_SvxPosture( Writer& rWrt, const SfxPoolItem& rHt )
         {
             // das geht auch in HTML und muss nicht als STYLE-Option
             // und darf nicht als Hint geschrieben werden
-            ASSERT( !rHTMLWrt.IsCSS1Source(CSS1_OUTMODE_HINT),
+            OSL_ENSURE( !rHTMLWrt.IsCSS1Source(CSS1_OUTMODE_HINT),
                     "Italic als Hint schreiben?" );
             pStr = sCSS1_PV_italic;
         }
@@ -2804,7 +2804,7 @@ static Writer& OutCSS1_SvxLanguage( Writer& rWrt, const SfxPoolItem& rHt )
     if( !rHTMLWrt.IsCSS1Script( nScript ) )
         return rWrt;
 
-    ASSERT( !rHTMLWrt.IsCSS1Source(CSS1_OUTMODE_HINT),
+    OSL_ENSURE( !rHTMLWrt.IsCSS1Source(CSS1_OUTMODE_HINT),
             "Language wirklich als Hint ausgeben?" );
 
     LanguageType eLang = ((const SvxLanguageItem &)rHt).GetLanguage();
@@ -2870,7 +2870,7 @@ static Writer& OutCSS1_SvxFontWeight( Writer& rWrt, const SfxPoolItem& rHt )
         {
             // das geht auch in HTML und muss nicht als STYLE-Option
             // und darf nicht als Hint geschrieben werden
-            ASSERT( !rHTMLWrt.IsCSS1Source(CSS1_OUTMODE_HINT),
+            OSL_ENSURE( !rHTMLWrt.IsCSS1Source(CSS1_OUTMODE_HINT),
                     "Fett als Hint schreiben?" );
             pStr = sCSS1_PV_bold;
         }
@@ -3123,7 +3123,7 @@ static Writer& OutCSS1_SwFmtFrmSize( Writer& rWrt, const SfxPoolItem& rHt,
             bOutHeight = (nMode & CSS1_FRMSIZE_VARHEIGHT) != 0;
             break;
         default:
-            ASSERT( bOutHeight, "Hoehe wird nicht exportiert" );
+            OSL_ENSURE( bOutHeight, "Hoehe wird nicht exportiert" );
             break;
         }
 
@@ -3382,7 +3382,7 @@ static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt,
     {
         // Fuer Seitenvorlagen wurde der Grafik-Name uebergeben. Es wird
         // nur ein Attribut ausgegeben, wenn die Grafik nicht gekachelt ist.
-        ASSERT( pLink, "Wo ist der Grafik-Name der Seitenvorlage?" );
+        OSL_ENSURE( pLink, "Wo ist der Grafik-Name der Seitenvorlage?" );
         if( !pLink || !pLink->Len() || GPOS_TILED==ePos )
             return rWrt;
     }
@@ -3629,11 +3629,6 @@ Writer& OutCSS1_SvxBox( Writer& rWrt, const SfxPoolItem& rHt )
 {
     SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt;
 
-    // Das Zeichen-Attribut wird nicht ausgegeben, wenn gerade
-    // Optionen ausgegeben werden
-//    if( !rHTMLWrt.IsHTMLMode(HTMLMODE_PARA_BORDER))
-//        return rWrt;
-
     const SvxBoxItem& rBoxItem = (const SvxBoxItem&)rHt;
     const SvxBorderLine *pTop = rBoxItem.GetTop();
     const SvxBorderLine *pBottom = rBoxItem.GetBottom();
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 99c8b6eb160a..92aed538fb86 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -145,7 +145,7 @@ static Writer& OutHTML_SvxAdjust( Writer& rWrt, const SfxPoolItem& rHt );
 
 static Writer& OutHTML_HoriSpacer( Writer& rWrt, INT16 nSize )
 {
-    ASSERT( nSize>0, "horizontaler SPACER mit negativem Wert?" )
+    OSL_ENSURE( nSize>0, "horizontaler SPACER mit negativem Wert?" );
     if( nSize <= 0 )
         return rWrt;
 
@@ -363,9 +363,9 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
     // Den Selektor des Formats holen
     USHORT nDeep = SwHTMLWriter::GetCSS1Selector( pFmt, aToken, aClass,
                                                   nRefPoolId );
-    ASSERT( nDeep ? aToken.Len()>0 : aToken.Len()==0,
+    OSL_ENSURE( nDeep ? aToken.Len()>0 : aToken.Len()==0,
             "Hier stimmt doch was mit dem Token nicht!" );
-    ASSERT( nDeep ? nRefPoolId : !nRefPoolId,
+    OSL_ENSURE( nDeep ? nRefPoolId : !nRefPoolId,
             "Hier stimmt doch was mit der Vergleichs-Vorlage nicht!" );
 
     BOOL bTxtColl = pFmt->Which() == RES_TXTFMTCOLL ||
@@ -576,7 +576,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
                     const SfxItemSet *pNodeItemSet,
                     SwHTMLTxtCollOutputInfo& rInfo )
 {
-    ASSERT( RES_CONDTXTFMTCOLL==rFmt.Which() || RES_TXTFMTCOLL==rFmt.Which(),
+    OSL_ENSURE( RES_CONDTXTFMTCOLL==rFmt.Which() || RES_TXTFMTCOLL==rFmt.Which(),
             "keine Absatz-Vorlage" );
 
     SwHTMLWriter & rHWrt = (SwHTMLWriter&)rWrt;
@@ -619,9 +619,9 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
         bNumbered = aNumInfo.IsNumbered();
         BYTE nLvl = aNumInfo.GetLevel();
 
-        ASSERT( pTxtNd->GetActualListLevel() == nLvl,
+        OSL_ENSURE( pTxtNd->GetActualListLevel() == nLvl,
                 "Gemerkter Num-Level ist falsch" );
-        ASSERT( bNumbered == static_cast< BOOL >(pTxtNd->IsCountedInList()),
+        OSL_ENSURE( bNumbered == static_cast< BOOL >(pTxtNd->IsCountedInList()),
                 "Gemerkter Numerierungs-Zustand ist falsch" );
 
         if( bNumbered )
@@ -674,13 +674,13 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
         // der erste Buchstabe reicht meistens
         switch( rInfo.aToken.GetChar( 0 ) )
         {
-        case 'A':   ASSERT( rInfo.aToken.Equals(OOO_STRING_SVTOOLS_HTML_address),
+        case 'A': OSL_ENSURE( rInfo.aToken.Equals(OOO_STRING_SVTOOLS_HTML_address),
                             "Doch kein ADDRESS?" );
                     rInfo.bParaPossible = TRUE;
                     rHWrt.bNoAlign = TRUE;
                     break;
 
-        case 'B':   ASSERT( rInfo.aToken.Equals(OOO_STRING_SVTOOLS_HTML_blockquote),
+        case 'B': OSL_ENSURE( rInfo.aToken.Equals(OOO_STRING_SVTOOLS_HTML_blockquote),
                             "Doch kein BLOCKQUOTE?" );
                     rInfo.bParaPossible = TRUE;
                     rHWrt.bNoAlign = TRUE;
@@ -692,7 +692,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
                     }
                     else
                     {
-                        ASSERT( rInfo.aToken.Equals(OOO_STRING_SVTOOLS_HTML_preformtxt),
+                        OSL_ENSURE( rInfo.aToken.Equals(OOO_STRING_SVTOOLS_HTML_preformtxt),
                                 "Doch kein PRE?" );
                         if( HTML_PREFORMTXT_ON == rHWrt.nLastParaToken )
                         {
@@ -707,7 +707,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
                     }
                     break;
 
-        case 'D':   ASSERT( rInfo.aToken.Equals(OOO_STRING_SVTOOLS_HTML_dt) ||
+        case 'D': OSL_ENSURE( rInfo.aToken.Equals(OOO_STRING_SVTOOLS_HTML_dt) ||
                             rInfo.aToken.Equals(OOO_STRING_SVTOOLS_HTML_dd),
                             "Doch kein DD/DT?" );
                     bDT = rInfo.aToken.Equals(OOO_STRING_SVTOOLS_HTML_dt);
@@ -729,7 +729,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
     // Falls noetig, die harte Attributierung der Vorlage uebernehmen
     if( pFmtInfo->pItemSet )
     {
-        ASSERT( !rInfo.pItemSet, "Wo kommt der Item-Set her?" );
+        OSL_ENSURE( !rInfo.pItemSet, "Wo kommt der Item-Set her?" );
         rInfo.pItemSet = new SfxItemSet( *pFmtInfo->pItemSet );
     }
 
@@ -858,7 +858,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
     // ggf. eine Aufzaehlung- oder Numerierungsliste beginnen
     if( rInfo.bInNumBulList )
     {
-        ASSERT( !rHWrt.nDefListLvl, "DL in OL geht nicht!" );
+        OSL_ENSURE( !rHWrt.nDefListLvl, "DL in OL geht nicht!" );
         OutHTML_NumBulListStart( rHWrt, aNumInfo );
 
         if( bNumbered )
@@ -1115,8 +1115,8 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
 
     if( nBulletGrfLvl != 255 )
     {
-        ASSERT( aNumInfo.GetNumRule(), "Wo ist die Numerierung geblieben???" );
-        ASSERT( nBulletGrfLvl < MAXLEVEL, "So viele Ebenen gibt's nicht" );
+        OSL_ENSURE( aNumInfo.GetNumRule(), "Wo ist die Numerierung geblieben???" );
+        OSL_ENSURE( nBulletGrfLvl < MAXLEVEL, "So viele Ebenen gibt's nicht" );
         const SwNumFmt& rNumFmt = aNumInfo.GetNumRule()->Get(nBulletGrfLvl);
 
         OutHTML_BulletImage( rWrt, OOO_STRING_SVTOOLS_HTML_image, 0,
@@ -1340,7 +1340,7 @@ USHORT HTMLEndPosLst::_FindStartPos( const HTMLSttEndPos *pPos ) const
     for( i = 0; i < aStartLst.Count() && aStartLst[i] != pPos;  i++ )
         ;
 
-    ASSERT( i != aStartLst.Count(), "Item nicht in Start-Liste gefunden!" );
+    OSL_ENSURE( i != aStartLst.Count(), "Item nicht in Start-Liste gefunden!" );
 
     return i==aStartLst.Count() ? USHRT_MAX : i;
 }
@@ -1352,7 +1352,7 @@ USHORT HTMLEndPosLst::_FindEndPos( const HTMLSttEndPos *pPos ) const
     for( i = 0; i < aEndLst.Count() && aEndLst[i] != pPos;  i++ )
         ;
 
-    ASSERT( i != aEndLst.Count(), "Item nicht in Ende-Liste gefunden" );
+    OSL_ENSURE( i != aEndLst.Count(), "Item nicht in Ende-Liste gefunden" );
 
     return i==aEndLst.Count() ? USHRT_MAX : i;
 }
@@ -1529,10 +1529,6 @@ HTMLOnOffState HTMLEndPosLst::GetHTMLItemState( const SfxPoolItem& rItem )
     case RES_PARATR_DROP:
         eState = HTML_DROPCAP_VALUE;
         break;
-
-//  default:
-//      eState = HTML_NOT_SUPPORTED;
-//      break;
     }
 
     return eState;
@@ -1805,8 +1801,8 @@ HTMLEndPosLst::HTMLEndPosLst( SwDoc *pD, SwDoc* pTempl,
 
 HTMLEndPosLst::~HTMLEndPosLst()
 {
-    ASSERT( !aStartLst.Count(), "Start-Liste im Destruktor nicht leer" );
-    ASSERT( !aEndLst.Count(), "End-Liste im Destruktor nicht leer" );
+    OSL_ENSURE( !aStartLst.Count(), "Start-Liste im Destruktor nicht leer" );
+    OSL_ENSURE( !aEndLst.Count(), "End-Liste im Destruktor nicht leer" );
 }
 
 
@@ -1858,7 +1854,7 @@ void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem,
 
         case HTML_CHRFMT_VALUE:
             {
-                ASSERT( RES_TXTATR_CHARFMT == rItem.Which(),
+                OSL_ENSURE( RES_TXTATR_CHARFMT == rItem.Which(),
                         "Doch keine Zeichen-Vorlage" );
                 const SwFmtCharFmt& rChrFmt = (const SwFmtCharFmt&)rItem;
                 const SwCharFmt* pFmt = rChrFmt.GetCharFmt();
@@ -1891,7 +1887,7 @@ void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem,
             // Eine Vordergrund-Farbe als Absatz-Attribut wird nur
             // exportiert, wenn sie nicht der Default-Farbe entspricht.
             {
-                ASSERT( RES_CHRATR_COLOR == rItem.Which(),
+                OSL_ENSURE( RES_CHRATR_COLOR == rItem.Which(),
                         "Doch keine Vordergrund-Farbe" );
                 Color aColor( ((const SvxColorItem&)rItem).GetValue() );
                 if( COL_AUTO == aColor.GetColor() )
@@ -1903,7 +1899,7 @@ void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem,
 
         case HTML_DROPCAP_VALUE:
             {
-                ASSERT( RES_PARATR_DROP == rItem.Which(),
+                OSL_ENSURE( RES_PARATR_DROP == rItem.Which(),
                         "Doch kein Drop-Cap" );
                 const SwFmtDrop& rDrop = (const SwFmtDrop&)rItem;
                 nEnd = nStart + rDrop.GetChars();
@@ -2085,7 +2081,7 @@ sal_uInt16 HTMLEndPosLst::GetScriptAtPos( xub_StrLen nPos ,
     sal_uInt16 i=0;
     while( i < nScriptChgs && nPos >= aScriptChgLst[i] )
         i++;
-    ASSERT( i < nScriptChgs, "script list is to short" );
+    OSL_ENSURE( i < nScriptChgs, "script list is to short" );
     if( i < nScriptChgs )
     {
         if( i18n::ScriptType::WEAK == aScriptLst[i] )
@@ -2165,7 +2161,7 @@ void HTMLEndPosLst::OutEndAttrs( SwHTMLWriter& rHWrt, xub_StrLen nPos,
         {
             // Das Attribut wird vor der aktuellen Position beendet. Das
             // darf nicht sein, aber wie koennen trotzdem damit umgehen
-            ASSERT( nEnd >= nPos,
+            OSL_ENSURE( nEnd >= nPos,
                     "Das Attribut sollte schon laengst beendet sein" );
             i++;
         }
@@ -2582,7 +2578,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
                     else
                     {
                         // Hints ohne-Ende werden als letztes ausgebeben
-                        ASSERT( !pTxtHt,
+                        OSL_ENSURE( !pTxtHt,
                                 "Wieso gibt es da schon ein Attribut ohne Ende?" );
                         if( rHTMLWrt.nTxtAttrsToIgnore>0 )
                         {
@@ -2688,7 +2684,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
     if( bFlysLeft )
         bFlysLeft = rHTMLWrt.OutFlyFrm( rNode.GetIndex(),
                                        nEnde, HTML_POS_INSIDE );
-    ASSERT( !bFlysLeft, "Es wurden nicht alle Rahmen gespeichert!" );
+    OSL_ENSURE( !bFlysLeft, "Es wurden nicht alle Rahmen gespeichert!" );
 
     rHTMLWrt.bTxtAttr = FALSE;
 
@@ -2793,11 +2789,6 @@ static Writer& OutHTML_SvxColor( Writer& rWrt, const SfxPoolItem& rHt )
     if( rHTMLWrt.bOutOpts )
         return rWrt;
 
-    // die Default-Farbe nur Schreiben, wenn sie als Hint vorkommt
-    //if( rHTMLWrt.bTagOn && !rHTMLWrt.bTxtAttr && rHTMLWrt.pDfltColor
-    //  && rColor == *rHTMLWrt.pDfltColor )
-    //  return rWrt;
-
     if( !rHTMLWrt.bTxtAttr && rHTMLWrt.bCfgOutStyles && rHTMLWrt.bCfgPreferStyles )
     {
         // Font-Farbe nicht als Tag schreiben, wenn Styles normalen Tags
@@ -3216,7 +3207,7 @@ static Writer& OutHTML_SwFmtINetFmt( Writer& rWrt, const SfxPoolItem& rHt )
         // das
         OutHTML_INetFmt( rWrt, rINetFmt, FALSE );
 
-        ASSERT( rHTMLWrt.aINetFmts.Count(), "da fehlt doch ein URL-Attribut" );
+        OSL_ENSURE( rHTMLWrt.aINetFmts.Count(), "da fehlt doch ein URL-Attribut" );
         if( rHTMLWrt.aINetFmts.Count() )
         {
             // das eigene Attribut vom Stack holen
@@ -3260,7 +3251,7 @@ static Writer& OutHTML_SwTxtCharFmt( Writer& rWrt, const SfxPoolItem& rHt )
         return rWrt;
 
     const SwHTMLFmtInfo *pFmtInfo = rHTMLWrt.aChrFmtInfos[nPos];
-    ASSERT( pFmtInfo, "Wieso gint es keine Infos ueber die Zeichenvorlage?" );
+    OSL_ENSURE( pFmtInfo, "Wieso gint es keine Infos ueber die Zeichenvorlage?" );
 
     if( rHTMLWrt.bTagOn )
     {
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index fb2a44943fa7..0d8afd27af9c 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -103,10 +103,6 @@ void SwHTMLParser::EndScript()
     bIgnoreRawData = FALSE;
     aScriptSource.ConvertLineEnd();
 
-//  MIB 23.5.97: SGML-Kommentare brauchen nicht mehr entfernt zu werden,
-//  weil JS das jetzt selber kann.
-//  RemoveSGMLComment( aScriptSource, TRUE );
-
     // Ausser StarBasic und unbenutzem JavaScript jedes Script oder den
     // Modulnamen in einem Feld merken merken
     if( bInsSrcIntoFld && !bIgnoreHTMLComments )
@@ -255,12 +251,12 @@ void SwHTMLParser::InsertBasicDocEvent( rtl::OUString aEvent, const String& rNam
                                         ScriptType eScrType,
                                         const String& rScrType )
 {
-    ASSERT( rName.Len(), "InsertBasicDocEvent() ohne Macro gerufen" );
+    OSL_ENSURE( rName.Len(), "InsertBasicDocEvent() ohne Macro gerufen" );
     if( !rName.Len() )
         return;
 
     SwDocShell *pDocSh = pDoc->GetDocShell();
-    ASSERT( pDocSh, "Wo ist die DocShell?" );
+    OSL_ENSURE( pDocSh, "Wo ist die DocShell?" );
     if( !pDocSh )
         return;
 
@@ -285,7 +281,7 @@ void SwHTMLWriter::OutBasic()
     SFX_APP()->EnterBasicCall();
 
     BasicManager *pBasicMan = pDoc->GetDocShell()->GetBasicManager();
-    ASSERT( pBasicMan, "Wo ist der Basic-Manager?" );
+    OSL_ENSURE( pBasicMan, "Wo ist der Basic-Manager?" );
     //JP 17.07.96: Bug 29538 - nur das DocumentBasic schreiben
     if( !pBasicMan || pBasicMan == SFX_APP()->GetBasicManager() )
     {
@@ -304,7 +300,7 @@ void SwHTMLWriter::OutBasic()
         for( USHORT j=0; j<pModules->Count(); j++ )
         {
             const SbModule *pModule = PTR_CAST( SbModule, pModules->Get(j) );
-            ASSERT( pModule, "Wo ist das Modul?" );
+            OSL_ENSURE( pModule, "Wo ist das Modul?" );
 
             String sLang(
                     String::CreateFromAscii( SVX_MACRO_LANGUAGE_STARBASIC ) );
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index 4db44baed94c..e3bc2dc02816 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -114,7 +114,7 @@ void SwCSS1Parser::ChgPageDesc( const SwPageDesc *pPageDesc,
             return;
         }
 
-    ASSERT( i<nPageDescs, "Seitenvorlage nicht gefunden" );
+    OSL_ENSURE( i<nPageDescs, "Seitenvorlage nicht gefunden" );
 }
 
 SwCSS1Parser::SwCSS1Parser( SwDoc *pD, sal_uInt32 aFHeights[7], const String& rBaseURL, BOOL bNewDoc ) :
@@ -175,9 +175,6 @@ BOOL SwCSS1Parser::SetFmtBreak( SfxItemSet& rItemSet,
     case SVX_CSS1_PBREAK_AUTO:
         bSetBreak = bSetPageDesc = TRUE;
         break;
-//  case SVX_CSS1_PBREAK_AVOID:
-        // Hier koennte man SvxKeepItem am Absatz davor einfuegen
-//      break;
     default:
         ;
     }
@@ -242,7 +239,7 @@ static void SetCharFmtAttrs( SwCharFmt *pCharFmt, SfxItemSet& rItemSet )
 
 void SwCSS1Parser::SetLinkCharFmts()
 {
-    ASSERT( !bLinkCharFmtsSet, "Aufruf von SetLinkCharFmts unnoetig" );
+    OSL_ENSURE( !bLinkCharFmtsSet, "Aufruf von SetLinkCharFmts unnoetig" );
 
     SvxCSS1MapEntry *pStyleEntry =
         GetTag( String::CreateFromAscii(OOO_STRING_SVTOOLS_HTML_anchor) );
@@ -362,7 +359,7 @@ static void SetTxtCollAttrs( SwTxtFmtColl *pColl, SfxItemSet& rItemSet,
 
 void SwCSS1Parser::SetTableTxtColl( BOOL bHeader )
 {
-    ASSERT( !(bHeader ? bTableHeaderTxtCollSet : bTableTxtCollSet),
+    OSL_ENSURE( !(bHeader ? bTableHeaderTxtCollSet : bTableTxtCollSet),
             "Aufruf von SetTableTxtColl unnoetig" );
 
     USHORT nPoolId;
@@ -659,7 +656,7 @@ static CSS1SelectorType GetTokenAndClass( const CSS1Selector *pSelector,
     if( CSS1_SELTYPE_ELEM_CLASS==eType  )
     {
         xub_StrLen nPos = rToken.Search( '.' );
-        ASSERT( nPos != STRING_NOTFOUND, "kein Punkt in Class-Selektor???" );
+        OSL_ENSURE( nPos != STRING_NOTFOUND, "kein Punkt in Class-Selektor???" );
         if( nPos != STRING_NOTFOUND )
         {
             rClass = rToken.Copy( nPos+1 );
@@ -705,7 +702,7 @@ static void RemoveScriptItems( SfxItemSet& rItemSet, sal_uInt16 nScript,
     case CSS1_SCRIPT_ALL:
         break;
     default:
-        ASSERT( aClearItems[0], "unknown script type" );
+        OSL_ENSURE( aClearItems[0], "unknown script type" );
         break;
        }
 
@@ -763,13 +760,12 @@ BOOL SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
             (pNext->GetString().EqualsIgnoreCaseAscii(sCSS1_left) ||
              pNext->GetString().EqualsIgnoreCaseAscii(sCSS1_right) ||
              pNext->GetString().EqualsIgnoreCaseAscii(sCSS1_first)) ) )
-            // || CSS1_SELTYPE_ELEMENT == pNext->GetType() )
         {
             String aName;
             if( pNext )
                 aName = pNext->GetString();
             InsertPage( aName,
-                        pNext != 0 /*CSS1_SELTYPE_PSEUDO == pNext->GetType()*/,
+                        pNext != 0,
                         rItemSet, rPropInfo );
         }
     }
@@ -1231,7 +1227,7 @@ SwCharFmt* SwCSS1Parser::GetChrFmt( USHORT nToken2, const String& rClass ) const
         }
     }
 
-    ASSERT( pCFmt, "Keine Zeichen-Vorlage???" );
+    OSL_ENSURE( pCFmt, "Keine Zeichen-Vorlage???" );
 
     // Wenn es eine Klasse gibt, die Klassen-Vorlage suchen aber nicht
     // neu anlegen.
@@ -1325,7 +1321,7 @@ SwTxtFmtColl *SwCSS1Parser::GetTxtFmtColl( USHORT nTxtColl,
     String sName;
     if( USER_FMT & nTxtColl )       // eine vom Reader angelegte
     {
-        ASSERT( !this, "Wo kommt die Benutzer-Vorlage her?" );
+        OSL_ENSURE( !this, "Wo kommt die Benutzer-Vorlage her?" );
         pColl = GetTxtCollFromPool( RES_POOLCOLL_STANDARD );
     }
     else
@@ -1333,7 +1329,7 @@ SwTxtFmtColl *SwCSS1Parser::GetTxtFmtColl( USHORT nTxtColl,
         pColl = GetTxtCollFromPool( nTxtColl );
     }
 
-    ASSERT( pColl, "Keine Absatz-Vorlage???" );
+    OSL_ENSURE( pColl, "Keine Absatz-Vorlage???" );
     if( aClass.Len() )
     {
         String aTmp( pColl->GetName() );
@@ -1422,7 +1418,7 @@ const SwPageDesc *SwCSS1Parser::GetPageDesc( USHORT nPoolId, BOOL bCreate )
 
         // dazu brauchen wir auch die Nummer der neuen Vorlage
         pPageDesc = FindPageDesc( pDoc, nPoolId, nPage );
-        ASSERT( pPageDesc==pNewPageDesc, "Seitenvorlage nicht gefunden" );
+        OSL_ENSURE( pPageDesc==pNewPageDesc, "Seitenvorlage nicht gefunden" );
 
         pDoc->CopyPageDesc( *pMasterPageDesc, *pNewPageDesc, FALSE );
 
@@ -1516,11 +1512,7 @@ BOOL SwCSS1Parser::MayBePositioned( const SvxCSS1PropertyInfo& rPropInfo,
 
 void SwCSS1Parser::AddClassName( String& rFmtName, const String& rClass )
 {
-    ASSERT( rClass.Len(), "Style-Klasse ohne Laenge?" );
-
-// ??????????
-//  String aTmp( rClass );
-//  GetpApp()->GetAppInternational().ToLower( aTmp );
+    OSL_ENSURE( rClass.Len(), "Style-Klasse ohne Laenge?" );
 
     (rFmtName += '.') += rClass;
 }
@@ -1810,7 +1802,7 @@ BOOL SwHTMLParser::FileDownload( const String& rURL,
 #endif
         CallStartAction( pOldVSh );
 #if OSL_DEBUG_LEVEL > 1
-    ASSERT( pOldVSh == pVSh, "FileDownload: ViewShell wurde ausgetauscht" );
+    OSL_ENSURE( pOldVSh == pVSh, "FileDownload: ViewShell wurde ausgetauscht" );
     (void) pVSh;
 #endif
 
@@ -1822,13 +1814,13 @@ void SwHTMLParser::InsertLink()
     BOOL bFinishDownload = FALSE;
     if( pPendStack )
     {
-        ASSERT( ShouldFinishFileDownload(),
+        OSL_ENSURE( ShouldFinishFileDownload(),
                 "Pending-Stack ohne File-Download?" );
 
         SwPendingStack* pTmp = pPendStack->pNext;
         delete pPendStack;
         pPendStack = pTmp;
-        ASSERT( !pPendStack, "Wo kommt der Pending-Stack her?" );
+        OSL_ENSURE( !pPendStack, "Wo kommt der Pending-Stack her?" );
 
         bFinishDownload = TRUE;
     }
@@ -1919,13 +1911,6 @@ BOOL SwCSS1Parser::ParseStyleSheet( const String& rIn )
                           pPageEntry->GetPropertyInfo() );
         SetPageDescAttrs( GetRightPageDesc(), pPageEntry->GetItemSet(),
                           pPageEntry->GetPropertyInfo() );
-//      if( pNamedPageDescs )
-//      {
-//          for( USHORT i=0; i<pNamedPageDescs->Count(); i++ )
-//              SetPageDescAttrs( (*pNamedPageDescs)[i],
-//                                pPageEntry->GetItemSet(),
-//                                pPageEntry->GetPropertyInfo() );
-//      }
 
     }
 
@@ -1950,29 +1935,6 @@ BOOL SwCSS1Parser::ParseStyleSheet( const String& rIn )
         SetPageDescAttrs( GetLeftPageDesc(TRUE), pPageEntry->GetItemSet(),
                           pPageEntry->GetPropertyInfo() );
 
-    // und jetzt noch die benannten Vorlagen
-//  for( USHORT i=0; i < GetPageCount(); i++ )
-//  {
-//      pPageEntry = GetPage( i );
-//      const String& rKey = pPageEntry->GetKey();
-//      if( !rKey.Len() || rKey.GetChar(0) == ':' )
-//          continue;
-//
-//      String aName( rKey );
-//      GetpApp()->GetAppInternational().ToLower( aName );
-//      USHORT nPage = pDoc->MakePageDesc( aName );
-//      SwPageDesc *pPageDesc = &pDoc->_GetPageDesc( nPage );
-//
-//      // Die neue Seitenvorlage entsteht aus dem Master durch kopieren.
-//      pDoc->CopyPageDesc( *pMasterPageDesc, *pPageDesc );
-//      SetPageDescAttrs( pPageDesc, pPageEntry->GetItemSet(),
-//                        pPageEntry->GetPropertyInfo() );
-//
-//      if( !pNamedPageDescs )
-//          pNamedPageDescs = new SwHTMLPageDescs;
-//      pNamedPageDescs->Insert( pPageDesc, pNamedPageDescs->Count() );
-//  }
-
     return TRUE;
 }
 
diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx
index 1cb1ca15255f..f69256f453c6 100644
--- a/sw/source/filter/html/htmlctxt.cxx
+++ b/sw/source/filter/html/htmlctxt.cxx
@@ -150,7 +150,7 @@ void SwHTMLParser::SplitAttrTab( const SwPosition& rNewPos )
 {
     // Hier darf es keine vorlauefigen Absatz-Attribute geben, den die
     // koennten jetzt gesetzt werden und dann sind die Zeiger ungueltig!!!
-    ASSERT( !aParaAttrs.Count(),
+    OSL_ENSURE( !aParaAttrs.Count(),
         "Hoechste Gefahr: Es gibt noch nicht-endgueltige Absatz-Attribute" );
     if( aParaAttrs.Count() )
         aParaAttrs.Remove( 0, aParaAttrs.Count() );
@@ -193,7 +193,7 @@ void SwHTMLParser::SplitAttrTab( const SwPosition& rNewPos )
                 nOldEndCnt = pPam->GetPoint()->nContent.GetIndex();
             }
 
-            if( RES_PARATR_BEGIN <= nWhich && bMoveBack ||
+            if( (RES_PARATR_BEGIN <= nWhich && bMoveBack) ||
                 pAttr->GetSttParaIdx() < pOldEndPara->GetIndex() ||
                 (pAttr->GetSttPara() == *pOldEndPara &&
                  pAttr->GetSttCnt() != nOldEndCnt) )
@@ -358,7 +358,7 @@ void SwHTMLParser::EndContext( _HTMLAttrContext *pContext )
         while( aContexts.Count() > nContextStMin )
         {
             _HTMLAttrContext *pCntxt = PopContext();
-            ASSERT( pCntxt != pContext,
+            OSL_ENSURE( pCntxt != pContext,
                     "Kontext noch im Stack" );
             if( pCntxt == pContext )
                 break;
@@ -414,10 +414,10 @@ void SwHTMLParser::ClearContext( _HTMLAttrContext *pContext )
         DeleteAttr( rAttrs[i] );
     }
 
-    ASSERT( !pContext->GetSpansSection(),
+    OSL_ENSURE( !pContext->GetSpansSection(),
             "Bereich kann nicht mehr verlassen werden" );
 
-    ASSERT( !pContext->HasSaveDocContext(),
+    OSL_ENSURE( !pContext->HasSaveDocContext(),
             "Rahmen kann nicht mehr verlassen werden" );
 
     // PRE-/LISTING- und XMP-Umgebungen wieder starten
@@ -543,7 +543,7 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
         pCSS1Parser->SetFmtBreak( rItemSet, rPropInfo );
 // /Feature: PrintExt
 
-    ASSERT( aContexts.Count() <= nContextStAttrMin ||
+    OSL_ENSURE( aContexts.Count() <= nContextStAttrMin ||
             aContexts[aContexts.Count()-1] != pContext,
             "SwHTMLParser::InsertAttrs: Kontext doch schon auf dem Stack" );
 
@@ -588,7 +588,7 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
                 // eingefuegt.
                 if( rPropInfo.bLeftMargin )
                 {
-                    ASSERT( rPropInfo.nLeftMargin < 0 ||
+                    OSL_ENSURE( rPropInfo.nLeftMargin < 0 ||
                             rPropInfo.nLeftMargin == pLRItem->GetTxtLeft(),
                             "linker Abstand stimmt nicht mit Item ueberein" );
                     if( rPropInfo.nLeftMargin < 0 &&
@@ -599,7 +599,7 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
                 }
                 if( rPropInfo.bRightMargin )
                 {
-                    ASSERT( rPropInfo.nRightMargin < 0 ||
+                    OSL_ENSURE( rPropInfo.nRightMargin < 0 ||
                             rPropInfo.nRightMargin == pLRItem->GetRight(),
                             "rechter Abstand stimmt nicht mit Item ueberein" );
                     if( rPropInfo.nRightMargin < 0 &&
diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx
index 1163ae9ac409..3e47fe1b4aa6 100644
--- a/sw/source/filter/html/htmldraw.cxx
+++ b/sw/source/filter/html/htmldraw.cxx
@@ -278,7 +278,7 @@ static void PutEEPoolItem( SfxItemSet &rEEItemSet,
 void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
 {
 
-    ASSERT( !pMarquee, "Marquee in Marquee???" );
+    OSL_ENSURE( !pMarquee, "Marquee in Marquee???" );
     aContents.Erase();
 
     String aId, aStyle, aClass;
@@ -569,7 +569,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
 
 void SwHTMLParser::EndMarquee()
 {
-    ASSERT( pMarquee && OBJ_TEXT==pMarquee->GetObjIdentifier(),
+    OSL_ENSURE( pMarquee && OBJ_TEXT==pMarquee->GetObjIdentifier(),
             "kein Marquee oder falscher Typ" );
 
     if( bFixMarqueeWidth )
@@ -597,7 +597,7 @@ void SwHTMLParser::EndMarquee()
 
 void SwHTMLParser::InsertMarqueeText()
 {
-    ASSERT( pMarquee && OBJ_TEXT==pMarquee->GetObjIdentifier(),
+    OSL_ENSURE( pMarquee && OBJ_TEXT==pMarquee->GetObjIdentifier(),
             "kein Marquee oder falscher Typ" );
 
     // das akteulle Textstueck an den Text anhaengen
@@ -606,7 +606,7 @@ void SwHTMLParser::InsertMarqueeText()
 
 void SwHTMLParser::ResizeDrawObject( SdrObject* pObj, SwTwips nWidth )
 {
-    ASSERT( OBJ_TEXT==pObj->GetObjIdentifier(),
+    OSL_ENSURE( OBJ_TEXT==pObj->GetObjIdentifier(),
             "kein Marquee oder falscher Typ" );
 
     if( OBJ_TEXT!=pObj->GetObjIdentifier() )
@@ -693,7 +693,7 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt,
 {
     SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt;
 
-    ASSERT( rWrt.pDoc->GetDrawModel(), "Da gibt's ein Draw-Obj ohne ein Draw-Model zu haben?" );
+    OSL_ENSURE( rWrt.pDoc->GetDrawModel(), "Da gibt's ein Draw-Obj ohne ein Draw-Model zu haben?" );
     const SdrTextObj *pTextObj = (const SdrTextObj *)&rSdrObject;
 
     // Gibt es ueberhaupt auszugebenden Text
@@ -710,10 +710,10 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt,
 
     // BEHAVIOUR
     SdrTextAniKind eAniKind = pTextObj->GetTextAniKind();
-    ASSERT( SDRTEXTANI_SCROLL==eAniKind ||
+    OSL_ENSURE( SDRTEXTANI_SCROLL==eAniKind ||
             SDRTEXTANI_ALTERNATE==eAniKind ||
             SDRTEXTANI_SLIDE==eAniKind,
-            "Text-Draw-Objekt nicht fuer Marquee geeignet" )
+            "Text-Draw-Objekt nicht fuer Marquee geeignet" );
 
     const sal_Char *pStr = 0;
     switch( eAniKind )
diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx
index 6138e28ae191..511fcbb27c43 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -559,25 +559,25 @@ void SwHTMLParser::EndField()
         switch( pField->Which() )
         {
         case RES_DOCINFOFLD:
-            ASSERT( ((SwDocInfoField*)pField)->IsFixed(),
+            OSL_ENSURE( ((SwDocInfoField*)pField)->IsFixed(),
                     "DokInfo-Feld haette nicht gemerkt werden muessen" );
             ((SwDocInfoField*)pField)->SetExpansion( aContents );
             break;
 
         case RES_EXTUSERFLD:
-            ASSERT( ((SwExtUserField*)pField)->IsFixed(),
+            OSL_ENSURE( ((SwExtUserField*)pField)->IsFixed(),
                     "ExtUser-Feld haette nicht gemerkt werden muessen" );
             ((SwExtUserField*)pField)->SetExpansion( aContents );
             break;
 
         case RES_AUTHORFLD:
-            ASSERT( ((SwAuthorField*)pField)->IsFixed(),
+            OSL_ENSURE( ((SwAuthorField*)pField)->IsFixed(),
                     "Author-Feld haette nicht gemerkt werden muessen" );
             ((SwAuthorField*)pField)->SetExpansion( aContents );
             break;
 
         case RES_FILENAMEFLD:
-            ASSERT( ((SwFileNameField*)pField)->IsFixed(),
+            OSL_ENSURE( ((SwFileNameField*)pField)->IsFixed(),
                     "FileName-Feld haette nicht gemerkt werden muessen" );
             ((SwFileNameField*)pField)->SetExpansion( aContents );
             break;
diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx
index 800077d2dacc..e86060f85d59 100644
--- a/sw/source/filter/html/htmlfldw.cxx
+++ b/sw/source/filter/html/htmlfldw.cxx
@@ -115,7 +115,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
                 default:
                     ;
             }
-            ASSERT( pSubStr, "ubekannter Subtyp fuer SwExtUserField" );
+            OSL_ENSURE( pSubStr, "ubekannter Subtyp fuer SwExtUserField" );
             bFixed = ((const SwExtUserField*)pFld)->IsFixed();
             break;
 
@@ -126,7 +126,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
                 case AF_NAME:     pFmtStr = OOO_STRING_SW_HTML_FF_name;     break;
                 case AF_SHORTCUT:  pFmtStr = OOO_STRING_SW_HTML_FF_shortcut;    break;
             }
-            ASSERT( pFmtStr, "ubekanntes Format fuer SwAuthorField" );
+            OSL_ENSURE( pFmtStr, "ubekanntes Format fuer SwAuthorField" );
             bFixed = ((const SwAuthorField*)pFld)->IsFixed();
             break;
 
@@ -150,7 +150,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
                     case PG_NEXT:       pSubStr = OOO_STRING_SW_HTML_FS_next;       break;
                     case PG_PREV:       pSubStr = OOO_STRING_SW_HTML_FS_prev;       break;
                 }
-                ASSERT( pSubStr, "ubekannter Subtyp fuer SwPageNumberField" );
+                OSL_ENSURE( pSubStr, "ubekannter Subtyp fuer SwPageNumberField" );
                 pFmtStr = SwHTMLWriter::GetNumFormat( static_cast< sal_uInt16 >(nFmt) );
 
                 if( (SvxExtNumType)nFmt==SVX_NUM_CHAR_SPECIAL )
@@ -217,7 +217,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
                     {
                         // Fuer ein fixes Feld och den Num-Value ausgeben.
                         // Fixe Felder ohne Zahlenformate sollte es
-                        // eigentlich nicht geben. ASSERT ist unten.
+                        // eigentlich nicht geben. OSL_ENSURE(ist unten.
                         dNumValue = ((const SwDocInfoField*)pFld)->GetValue();
                         bNumValue = TRUE;
                     }
@@ -262,7 +262,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
                     ;
             }
             bFixed = ((const SwFileNameField*)pFld)->IsFixed();
-            ASSERT( pFmtStr, "unbekanntes Format fuer SwFileNameField" );
+            OSL_ENSURE( pFmtStr, "unbekanntes Format fuer SwFileNameField" );
             break;
     }
 
@@ -292,7 +292,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
         }
         if( bNumFmt )
         {
-            ASSERT( nFmt, "Zahlenformat ist 0" );
+            OSL_ENSURE( nFmt, "Zahlenformat ist 0" );
             sOut = HTMLOutFuncs::CreateTableDataOptionsValNum( sOut,
                         bNumValue, dNumValue, nFmt,
                         *rHTMLWrt.pDoc->GetNumberFormatter(),
@@ -529,7 +529,7 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt )
     else
     {
         const SwTxtFld *pTxtFld = rFld.GetTxtFld();
-        ASSERT( pTxtFld, "Where is the txt fld?" );
+        OSL_ENSURE( pTxtFld, "Where is the txt fld?" );
         if( pTxtFld )
             OutHTML_SwField( rWrt, pFld, pTxtFld->GetTxtNode(),
                              *pTxtFld->GetStart()  );
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index 98812e1646e4..672a57f1a13a 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -311,7 +311,7 @@ USHORT SwHTMLWriter::GuessFrmType( const SwFrmFmt& rFrmFmt,
 
 void SwHTMLWriter::CollectFlyFrms()
 {
-    ASSERT( HTML_CFG_MAX+1 == MAX_BROWSERS,
+    OSL_ENSURE( HTML_CFG_MAX+1 == MAX_BROWSERS,
             "number of browser configurations has changed" );
 
     BYTE nSz = (BYTE)Min( pDoc->GetSpzFrmFmts()->Count(), USHORT(255) );
@@ -488,7 +488,7 @@ void SwHTMLWriter::OutFrmFmt( BYTE nMode, const SwFrmFmt& rFrmFmt,
     switch( nOutMode )
     {
     case HTML_OUT_TBLNODE:      // OK
-        ASSERT( !pCntnrStr, "Table: Container ist hier nicht vorgesehen" );
+        OSL_ENSURE( !pCntnrStr, "Table: Container ist hier nicht vorgesehen" );
         OutHTML_FrmFmtTableNode( *this, rFrmFmt );
         break;
     case HTML_OUT_GRFNODE:      // OK
@@ -502,14 +502,14 @@ void SwHTMLWriter::OutFrmFmt( BYTE nMode, const SwFrmFmt& rFrmFmt,
         break;
     case HTML_OUT_DIV:
     case HTML_OUT_SPAN:
-        ASSERT( !pCntnrStr, "Div: Container ist hier nicht vorgesehen" );
+        OSL_ENSURE( !pCntnrStr, "Div: Container ist hier nicht vorgesehen" );
         OutHTML_FrmFmtAsDivOrSpan( *this, rFrmFmt, HTML_OUT_SPAN==nOutMode );
         break;
     case HTML_OUT_MULTICOL:     // OK
         OutHTML_FrmFmtAsMulticol( *this, rFrmFmt, pCntnrStr != 0 );
         break;
     case HTML_OUT_SPACER:       // OK
-        ASSERT( !pCntnrStr, "Spacer: Container ist hier nicht vorgesehen" );
+        OSL_ENSURE( !pCntnrStr, "Spacer: Container ist hier nicht vorgesehen" );
         OutHTML_FrmFmtAsSpacer( *this, rFrmFmt );
         break;
     case HTML_OUT_CONTROL:      // OK
@@ -521,7 +521,7 @@ void SwHTMLWriter::OutFrmFmt( BYTE nMode, const SwFrmFmt& rFrmFmt,
         OutHTML_FrmFmtAsMarquee( *this, rFrmFmt, *pSdrObject );
         break;
     case HTML_OUT_MARQUEE:
-        ASSERT( !pCntnrStr, "Marquee: Container ist hier nicht vorgesehen" );
+        OSL_ENSURE( !pCntnrStr, "Marquee: Container ist hier nicht vorgesehen" );
         OutHTML_DrawFrmFmtAsMarquee( *this,
                     (const SwDrawFrmFmt &)rFrmFmt, *pSdrObject );
         break;
@@ -710,7 +710,7 @@ void SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
                       (nPrcHeight ? 0
                                   : pFSItem->GetHeight()-aTwipSpc.Height()) );
 
-        ASSERT( aTwipSz.Width() >= 0 && aTwipSz.Height() >= 0,
+        OSL_ENSURE( aTwipSz.Width() >= 0 && aTwipSz.Height() >= 0,
                 "Rahmengroesse minus Abstand < 0!!!???" );
         if( aTwipSz.Width() < 0 )
             aTwipSz.Width() = 0;
@@ -898,7 +898,6 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
         } while( bFound );
 
         BOOL bScale = FALSE;
-        //Size aGrfSize( rNode.GetTwipSize() );
         Fraction aScaleX( 1, 1 );
         Fraction aScaleY( 1, 1 );
 
@@ -911,7 +910,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
             nWidth -= ( rBox.CalcLineSpace(BOX_LINE_LEFT) +
                         rBox.CalcLineSpace(BOX_LINE_RIGHT) );
 
-            ASSERT( nWidth>0, "Gibt es 0 twip breite Grafiken!?" );
+            OSL_ENSURE( nWidth>0, "Gibt es 0 twip breite Grafiken!?" );
             if( nWidth<=0 ) // sollte nicht passieren
                 nWidth = 1;
 
@@ -927,7 +926,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
             nHeight -= ( rBox.CalcLineSpace(BOX_LINE_TOP) +
                          rBox.CalcLineSpace(BOX_LINE_BOTTOM) );
 
-            ASSERT( nHeight>0, "Gibt es 0 twip hohe Grafiken!?" );
+            OSL_ENSURE( nHeight>0, "Gibt es 0 twip hohe Grafiken!?" );
             if( nHeight<=0 )
                 nHeight = 1;
 
@@ -1341,11 +1340,11 @@ static Writer& OutHTML_FrmFmtTableNode( Writer& rWrt, const SwFrmFmt& rFrmFmt )
         bTopCaption = TRUE;
         pTblNd = rHTMLWrt.pDoc->GetNodes()[nStt+1]->GetTableNode();
     }
-    ASSERT( pTblNd, "Rahmen enthaelt keine Tabelle" );
+    OSL_ENSURE( pTblNd, "Rahmen enthaelt keine Tabelle" );
     if( pTblNd )
     {
         ULONG nTblEnd = pTblNd->EndOfSectionIndex();
-        ASSERT( nTblEnd == nEnd - 1 ||
+        OSL_ENSURE( nTblEnd == nEnd - 1 ||
                 (nTblEnd == nEnd - 2 && !bTopCaption),
                 "Ungeuelter Rahmen-Inhalt fuer Tabelle" );
 
@@ -1427,7 +1426,7 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
     const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt();
     ULONG nStt = rFlyCntnt.GetCntntIdx()->GetIndex();
     const SwStartNode* pSttNd = rWrt.pDoc->GetNodes()[nStt]->GetStartNode();
-    ASSERT( pSttNd, "Wo ist der Start-Node" );
+    OSL_ENSURE( pSttNd, "Wo ist der Start-Node" );
 
     {
         // in einem Block damit rechtzeitig vor dem Ende der alte Zustand
@@ -1439,8 +1438,6 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
         rHTMLWrt.Out_SwDoc( rWrt.pCurPam );
     }
 
-//  rHTMLWrt.ChangeParaToken( 0 );  // MIB 8.7.97: Passiert jetzt in Out_SwDoc
-
     rHTMLWrt.DecIndentLevel();  // den Inhalt von Multicol einruecken;
     if( rHTMLWrt.bLFPossible )
         rHTMLWrt.OutNewLine();
@@ -1518,7 +1515,7 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
     rHTMLWrt.OutFlyFrm( nStt, 0, HTML_POS_ANY );
 
     const SwStartNode* pSttNd = rWrt.pDoc->GetNodes()[nStt]->GetStartNode();
-    ASSERT( pSttNd, "Wo ist der Start-Node" );
+    OSL_ENSURE( pSttNd, "Wo ist der Start-Node" );
 
     {
         // in einem Block damit rechtzeitig vor dem Ende der alte Zustand
@@ -1582,7 +1579,7 @@ static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
     const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt();
     ULONG nStt = rFlyCntnt.GetCntntIdx()->GetIndex()+1;
     SwGrfNode *pGrfNd = rHTMLWrt.pDoc->GetNodes()[ nStt ]->GetGrfNode();
-    ASSERT( pGrfNd, "Grf-Node erwartet" );
+    OSL_ENSURE( pGrfNd, "Grf-Node erwartet" );
     if( !pGrfNd )
         return rWrt;
 
@@ -1709,7 +1706,7 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
     const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt();
     ULONG nStt = rFlyCntnt.GetCntntIdx()->GetIndex();
     const SwStartNode* pSttNd = rWrt.pDoc->GetNodes()[nStt]->GetStartNode();
-    ASSERT( pSttNd, "Wo ist der Start-Node" );
+    OSL_ENSURE( pSttNd, "Wo ist der Start-Node" );
 
     if( !bHeader && aSpacer.Len() )
     {
@@ -1892,7 +1889,7 @@ SwHTMLPosFlyFrm::SwHTMLPosFlyFrm( const SwPosFlyFrm& rPosFly,
         // Auto-gebundene Rahmen werden ein Zeichen weiter hinten
         // ausgegeben, weil dann die Positionierung mit Netscape
         // uebereinstimmt.
-        ASSERT( rAnchor.GetCntntAnchor(), "Keine Anker-Position?" );
+        OSL_ENSURE( rAnchor.GetCntntAnchor(), "Keine Anker-Position?" );
         if( rAnchor.GetCntntAnchor() )
         {
             nCntntIdx = rAnchor.GetCntntAnchor()->nContent.GetIndex();
@@ -1901,7 +1898,7 @@ SwHTMLPosFlyFrm::SwHTMLPosFlyFrm( const SwPosFlyFrm& rPosFly,
             if( text::RelOrientation::FRAME == eHoriRel || text::RelOrientation::PRINT_AREA == eHoriRel )
             {
                 const SwCntntNode *pCNd = pNdIdx->GetNode().GetCntntNode();
-                ASSERT( pCNd, "Kein Content-Node an PaM-Position" );
+                OSL_ENSURE( pCNd, "Kein Content-Node an PaM-Position" );
                 if( pCNd && nCntntIdx < pCNd->Len() )
                     nCntntIdx++;
             }
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 7da2a1dfe0e5..21468fd64b04 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -217,7 +217,7 @@ public:
         pDocSh( pDSh ),
         pHeaderAttrs( pDSh ? pDSh->GetHeaderAttributes() : 0 )
     {
-        ASSERT( pDocSh, "Keine DocShell, keine Controls" );
+        OSL_ENSURE( pDocSh, "Keine DocShell, keine Controls" );
     }
 
     const uno::Reference< XMultiServiceFactory >& GetServiceFactory();
@@ -286,7 +286,7 @@ const uno::Reference< XMultiServiceFactory >& SwHTMLForm_Impl::GetServiceFactory
         xServiceFactory =
             uno::Reference< XMultiServiceFactory >( pDocSh->GetBaseModel(),
                                                UNO_QUERY );
-        ASSERT( xServiceFactory.is(),
+        OSL_ENSURE( xServiceFactory.is(),
                 "XServiceFactory nicht vom Model erhalten" );
     }
     return xServiceFactory;
@@ -299,10 +299,10 @@ const uno::Reference< drawing::XDrawPage >& SwHTMLForm_Impl::GetDrawPage()
     {
         uno::Reference< drawing::XDrawPageSupplier > xTxtDoc( pDocSh->GetBaseModel(),
                                                          UNO_QUERY );
-        ASSERT( xTxtDoc.is(),
+        OSL_ENSURE( xTxtDoc.is(),
                 "drawing::XDrawPageSupplier nicht vom XModel erhalten" );
         xDrawPage = xTxtDoc->getDrawPage();
-        ASSERT( xDrawPage.is(), "drawing::XDrawPage nicht erhalten" );
+        OSL_ENSURE( xDrawPage.is(), "drawing::XDrawPage nicht erhalten" );
     }
     return xDrawPage;
 }
@@ -315,7 +315,7 @@ const uno::Reference< container::XIndexContainer >& SwHTMLForm_Impl::GetForms()
         if( xDrawPage.is() )
         {
             uno::Reference< XFormsSupplier > xFormsSupplier( xDrawPage, UNO_QUERY );
-            ASSERT( xFormsSupplier.is(),
+            OSL_ENSURE( xFormsSupplier.is(),
                     "XFormsSupplier nicht vom drawing::XDrawPage erhalten" );
 
             uno::Reference< container::XNameContainer > xNameCont =
@@ -323,7 +323,7 @@ const uno::Reference< container::XIndexContainer >& SwHTMLForm_Impl::GetForms()
             xForms = uno::Reference< container::XIndexContainer >( xNameCont,
                                                               UNO_QUERY );
 
-            ASSERT( xForms.is(), "XForms nicht erhalten" );
+            OSL_ENSURE( xForms.is(), "XForms nicht erhalten" );
         }
     }
     return xForms;
@@ -338,7 +338,7 @@ const uno::Reference< drawing::XShapes > & SwHTMLForm_Impl::GetShapes()
         if( xDrawPage.is() )
         {
             xShapes = uno::Reference< drawing::XShapes >( xDrawPage, UNO_QUERY );
-            ASSERT( xShapes.is(),
+            OSL_ENSURE( xShapes.is(),
                     "XShapes nicht vom drawing::XDrawPage erhalten" );
         }
     }
@@ -352,7 +352,7 @@ const uno::Reference< script::XEventAttacherManager >&
     {
         xControlEventManager =
             uno::Reference< script::XEventAttacherManager >( xFormComps, UNO_QUERY );
-        ASSERT( xControlEventManager.is(),
+        OSL_ENSURE( xControlEventManager.is(),
     "uno::Reference< XEventAttacherManager > nicht von xFormComps erhalten" );
     }
 
@@ -369,7 +369,7 @@ const uno::Reference< script::XEventAttacherManager >&
         {
             xFormEventManager =
                 uno::Reference< script::XEventAttacherManager >( xForms, UNO_QUERY );
-            ASSERT( xFormEventManager.is(),
+            OSL_ENSURE( xFormEventManager.is(),
         "uno::Reference< XEventAttacherManager > nicht von xForms erhalten" );
         }
     }
@@ -438,7 +438,7 @@ SwHTMLImageWatcher::SwHTMLImageWatcher(
     uno::Reference< awt::XControlModel > xControlModel(
             xControlShape->getControl() );
     xSrc = uno::Reference< XImageProducerSupplier >( xControlModel, UNO_QUERY );
-    ASSERT( xSrc.is(), "Kein XImageProducerSupplier" );
+    OSL_ENSURE( xSrc.is(), "Kein XImageProducerSupplier" );
 
     // Als Event-Listener am Shape anmelden, damit wir es beim dispose
     // loslassen ko”nnen ...
@@ -477,7 +477,7 @@ void SwHTMLImageWatcher::clear()
 void SwHTMLImageWatcher::init( sal_Int32 Width, sal_Int32 Height )
     throw( uno::RuntimeException )
 {
-    ASSERT( bSetWidth || bSetHeight,
+    OSL_ENSURE( bSetWidth || bSetHeight,
             "Breite oder Hoehe muss angepasst werden" );
 
     // Wenn keine Breite oder Hoehe angegeben ist, ist das das init von
@@ -535,7 +535,7 @@ void SwHTMLImageWatcher::init( sal_Int32 Width, sal_Int32 Height )
                     xTunnel->getSomething(SwXShape::getUnoTunnelId()) ))
                 : 0;
 
-        ASSERT( pSwShape, "Wo ist das SW-Shape?" );
+        OSL_ENSURE( pSwShape, "Wo ist das SW-Shape?" );
         if( pSwShape )
         {
             SwFrmFmt *pFrmFmt = pSwShape->GetFrmFmt();
@@ -684,14 +684,14 @@ public:
 
 void SwHTMLParser::SetPendingControlSize( int nToken )
 {
-    ASSERT( pPendStack, "Wo ist der Pending Stack?" );
+    OSL_ENSURE( pPendStack, "Wo ist der Pending Stack?" );
     SwHTMLFormPendingStackData_Impl *pData =
         (SwHTMLFormPendingStackData_Impl *)pPendStack->pData;
 
     SwPendingStack* pTmp = pPendStack->pNext;
     delete pPendStack;
     pPendStack = pTmp;
-    ASSERT( !pPendStack, "Wo kommt der Pending-Stack her?" );
+    OSL_ENSURE( !pPendStack, "Wo kommt der Pending-Stack her?" );
 
     SetControlSize( pData->GetShape(), pData->GetTextSize(),
                     pData->IsMinWidth(), pData->IsMinHeight(),
@@ -742,16 +742,16 @@ void SwHTMLParser::SetControlSize( const uno::Reference< drawing::XShape >& rSha
             xTunnel->getSomething(SwXShape::getUnoTunnelId()) ))
         : 0;
 
-    ASSERT( pSwShape, "Wo ist das SW-Shape?" );
+    OSL_ENSURE( pSwShape, "Wo ist das SW-Shape?" );
 
     // es muss ein Draw-Format sein
     SwFrmFmt *pFrmFmt = pSwShape->GetFrmFmt();
-    ASSERT( RES_DRAWFRMFMT == pFrmFmt->Which(), "Kein DrawFrmFmt" );
+    OSL_ENSURE( RES_DRAWFRMFMT == pFrmFmt->Which(), "Kein DrawFrmFmt" );
 
     // Schauen, ob es ein SdrObject dafuer gibt
     const SdrObject *pObj = pFrmFmt->FindSdrObject();
-    ASSERT( pObj, "SdrObject nicht gefunden" );
-    ASSERT( FmFormInventor == pObj->GetObjInventor(), "falscher Inventor" );
+    OSL_ENSURE( pObj, "SdrObject nicht gefunden" );
+    OSL_ENSURE( FmFormInventor == pObj->GetObjInventor(), "falscher Inventor" );
 
     const SdrView* pDrawView = pVSh ? pVSh->GetDrawView() : 0;
 
@@ -778,7 +778,7 @@ void SwHTMLParser::SetControlSize( const uno::Reference< drawing::XShape >& rSha
         if( rTextSz.Width() || rTextSz.Height())
         {
             uno::Reference< awt::XTextLayoutConstrains > xLC( xControl, UNO_QUERY );
-            ASSERT( xLC.is(), "kein XTextLayoutConstrains" );
+            OSL_ENSURE( xLC.is(), "kein XTextLayoutConstrains" );
             if( xLC.is() )
             {
                 awt::Size aTmpSz( rTextSz.Width(), rTextSz.Height() );
@@ -1758,7 +1758,7 @@ void SwHTMLParser::InsertInput()
     case HTML_IT_RADIO:
         {
             if( !bValue )
-                aTmp <<= OUString::createFromAscii( OOO_STRING_SVTOOLS_HTML_on );
+                aTmp <<= OUString(RTL_CONSTASCII_USTRINGPARAM( OOO_STRING_SVTOOLS_HTML_on ));
             xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("RefValue")),
                                         aTmp );
             aTmp <<= OUString();
@@ -1894,7 +1894,7 @@ void SwHTMLParser::InsertInput()
             aNewSz = Application::GetDefaultDevice()
                         ->PixelToLogic( aNewSz, MapMode( MAP_100TH_MM ) );
             aSz.Width() = aNewSz.Width();
-            ASSERT( !aTextSz.Width(), "Text-Breite ist gegeben" );
+            OSL_ENSURE( !aTextSz.Width(), "Text-Breite ist gegeben" );
             bMinWidth = sal_False;
         }
     }
@@ -1952,7 +1952,7 @@ void SwHTMLParser::InsertInput()
                                              bHidden );
     if( aTextSz.Width() || aTextSz.Height() || bMinWidth || bMinHeight )
     {
-        ASSERT( !(bSetGrfWidth || bSetGrfHeight), "Grafikgroesse anpassen???" );
+        OSL_ENSURE( !(bSetGrfWidth || bSetGrfHeight), "Grafikgroesse anpassen???" );
         SetControlSize( xShape, aTextSz, bMinWidth, bMinHeight, HTML_INPUT );
     }
 
@@ -1989,8 +1989,8 @@ void SwHTMLParser::NewTextArea()
         return;
     }
 
-    ASSERT( !bTextArea, "TextArea in TextArea???" );
-    ASSERT( !pFormImpl || !pFormImpl->GetFCompPropSet().is(),
+    OSL_ENSURE( !bTextArea, "TextArea in TextArea???" );
+    OSL_ENSURE( !pFormImpl || !pFormImpl->GetFCompPropSet().is(),
             "TextArea in Control???" );
 
     if( !pFormImpl || !pFormImpl->GetFormComps().is() )
@@ -2162,7 +2162,7 @@ void SwHTMLParser::NewTextArea()
                                     aTmp );
     }
 
-    ASSERT( !pFormImpl->GetText().Len(), "Text ist nicht leer!" );
+    OSL_ENSURE( !pFormImpl->GetText().Len(), "Text ist nicht leer!" );
 
     if( !nCols )
         nCols = 20;
@@ -2218,8 +2218,8 @@ void SwHTMLParser::NewTextArea()
 
 void SwHTMLParser::EndTextArea()
 {
-    ASSERT( bTextArea, "keine TextArea oder falscher Typ" );
-    ASSERT( pFormImpl && pFormImpl->GetFCompPropSet().is(),
+    OSL_ENSURE( bTextArea, "keine TextArea oder falscher Typ" );
+    OSL_ENSURE( pFormImpl && pFormImpl->GetFCompPropSet().is(),
             "TextArea fehlt" );
 
     const uno::Reference< beans::XPropertySet > & rPropSet =
@@ -2248,8 +2248,8 @@ void SwHTMLParser::EndTextArea()
 
 void SwHTMLParser::InsertTextAreaText( sal_uInt16 nToken )
 {
-    ASSERT( bTextArea, "keine TextArea oder falscher Typ" );
-    ASSERT( pFormImpl && pFormImpl->GetFCompPropSet().is(),
+    OSL_ENSURE( bTextArea, "keine TextArea oder falscher Typ" );
+    OSL_ENSURE( pFormImpl && pFormImpl->GetFCompPropSet().is(),
             "TextArea fehlt" );
 
     String& rText = pFormImpl->GetText();
@@ -2284,8 +2284,8 @@ void SwHTMLParser::NewSelect()
         return;
     }
 
-    ASSERT( !bSelect, "Select in Select???" );
-    ASSERT( !pFormImpl || !pFormImpl->GetFCompPropSet().is(),
+    OSL_ENSURE( !bSelect, "Select in Select???" );
+    OSL_ENSURE( !pFormImpl || !pFormImpl->GetFCompPropSet().is(),
             "Select in Control???" );
 
     if( !pFormImpl || !pFormImpl->GetFormComps().is() )
@@ -2510,8 +2510,8 @@ void SwHTMLParser::EndSelect()
         return;
     }
 
-    ASSERT( bSelect, "keine Select" );
-    ASSERT( pFormImpl && pFormImpl->GetFCompPropSet().is(),
+    OSL_ENSURE( bSelect, "keine Select" );
+    OSL_ENSURE( pFormImpl && pFormImpl->GetFCompPropSet().is(),
             "kein Select-Control" );
 
     const uno::Reference< beans::XPropertySet > & rPropSet =
@@ -2581,7 +2581,7 @@ void SwHTMLParser::EndSelect()
 
     if( bFixSelectWidth )
     {
-        ASSERT( pFormImpl->GetShape().is(), "Kein Shape gemerkt" );
+        OSL_ENSURE( pFormImpl->GetShape().is(), "Kein Shape gemerkt" );
         Size aTextSz( -1, 0 );
         SetControlSize( pFormImpl->GetShape(), aTextSz, sal_False, sal_False,
                         HTML_SELECT_OFF );
@@ -2603,8 +2603,8 @@ void SwHTMLParser::EndSelect()
 
 void SwHTMLParser::InsertSelectOption()
 {
-    ASSERT( bSelect, "keine Select" );
-    ASSERT( pFormImpl && pFormImpl->GetFCompPropSet().is(),
+    OSL_ENSURE( bSelect, "keine Select" );
+    OSL_ENSURE( pFormImpl && pFormImpl->GetFCompPropSet().is(),
             "kein Select-Control" );
 
     bLBEntrySelected = sal_False;
@@ -2640,8 +2640,8 @@ void SwHTMLParser::InsertSelectOption()
 
 void SwHTMLParser::InsertSelectText()
 {
-    ASSERT( bSelect, "keine Select" );
-    ASSERT( pFormImpl && pFormImpl->GetFCompPropSet().is(),
+    OSL_ENSURE( bSelect, "keine Select" );
+    OSL_ENSURE( pFormImpl && pFormImpl->GetFCompPropSet().is(),
             "kein Select-Control" );
 
     sal_uInt16 nEntryCnt = pFormImpl->GetStringList().Count();
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index f0c217621637..67e4e3020a74 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -130,7 +130,7 @@ void lcl_html_outEvents( SvStream& rStrm,
 {
     uno::Reference< container::XChild > xChild( rFormComp, uno::UNO_QUERY );
     uno::Reference< uno::XInterface > xParentIfc = xChild->getParent();
-    ASSERT( xParentIfc.is(), "lcl_html_outEvents: no parent interface" );
+    OSL_ENSURE( xParentIfc.is(), "lcl_html_outEvents: no parent interface" );
     if( !xParentIfc.is() )
         return;
     uno::Reference< container::XIndexAccess > xIndexAcc( xParentIfc, uno::UNO_QUERY );
@@ -144,7 +144,7 @@ void lcl_html_outEvents( SvStream& rStrm,
     for( nPos = 0 ; nPos < nCount; nPos++ )
     {
         uno::Any aTmp = xIndexAcc->getByIndex(nPos);
-        ASSERT( aTmp.getValueType() ==
+        OSL_ENSURE( aTmp.getValueType() ==
                         ::getCppuType( (uno::Reference<form::XFormComponent>*)0 ) ||
                 aTmp.getValueType() ==
                         ::getCppuType( (uno::Reference<form::XForm>*)0 ),
@@ -401,27 +401,27 @@ void SwHTMLWriter::OutHiddenForms()
 
     uno::Reference< drawing::XDrawPageSupplier > xDPSupp( pDocSh->GetBaseModel(),
                                                      uno::UNO_QUERY );
-    ASSERT( xDPSupp.is(), "XTextDocument nicht vom XModel erhalten" );
+    OSL_ENSURE( xDPSupp.is(), "XTextDocument nicht vom XModel erhalten" );
     uno::Reference< drawing::XDrawPage > xDrawPage = xDPSupp->getDrawPage();
 
-    ASSERT( xDrawPage.is(), "XDrawPage nicht erhalten" );
+    OSL_ENSURE( xDrawPage.is(), "XDrawPage nicht erhalten" );
     if( !xDrawPage.is() )
         return;
 
     uno::Reference< form::XFormsSupplier > xFormsSupplier( xDrawPage, uno::UNO_QUERY );
-    ASSERT( xFormsSupplier.is(),
+    OSL_ENSURE( xFormsSupplier.is(),
             "XFormsSupplier nicht vom XDrawPage erhalten" );
 
     uno::Reference< container::XNameContainer > xTmp = xFormsSupplier->getForms();
-    ASSERT( xTmp.is(), "XForms nicht erhalten" );
+    OSL_ENSURE( xTmp.is(), "XForms nicht erhalten" );
     uno::Reference< container::XIndexContainer > xForms( xTmp, uno::UNO_QUERY );
-    ASSERT( xForms.is(), "XForms ohne container::XIndexContainer?" );
+    OSL_ENSURE( xForms.is(), "XForms ohne container::XIndexContainer?" );
 
     sal_Int32 nCount = xForms->getCount();
     for( sal_Int32 i=0; i<nCount; i++)
     {
         uno::Any aTmp = xForms->getByIndex( i );
-        ASSERT( aTmp.getValueType() ==
+        OSL_ENSURE( aTmp.getValueType() ==
                         ::getCppuType((uno::Reference< form::XForm >*)0),
                 "OutHiddenForms: falsche Reflection" );
         if( aTmp.getValueType() ==
@@ -441,7 +441,7 @@ void SwHTMLWriter::OutHiddenForm( const uno::Reference< form::XForm > & rForm )
     for( sal_Int32 i=0; i<nCount; i++ )
     {
         uno::Any aTmp = xFormComps->getByIndex( i );
-        ASSERT( aTmp.getValueType() ==
+        OSL_ENSURE( aTmp.getValueType() ==
                         ::getCppuType((uno::Reference<form::XFormComponent>*)0),
                 "OutHiddenForm: falsche Reflection" );
         if( aTmp.getValueType() !=
@@ -606,7 +606,7 @@ void SwHTMLWriter::OutHiddenControls(
         for( nPos=0; !bDone && nPos < nCount; nPos++ )
         {
             uno::Any aTmp = rFormComps->getByIndex( nPos );
-            ASSERT( aTmp.getValueType() ==
+            OSL_ENSURE( aTmp.getValueType() ==
                         ::getCppuType((uno::Reference< form::XFormComponent>*)0),
                     "OutHiddenControls: falsche Reflection" );
             bDone = aTmp.getValueType() ==
@@ -619,7 +619,7 @@ void SwHTMLWriter::OutHiddenControls(
     for( ; nPos < nCount; nPos++ )
     {
         uno::Any aTmp = rFormComps->getByIndex( nPos );
-        ASSERT( aTmp.getValueType() ==
+        OSL_ENSURE( aTmp.getValueType() ==
                         ::getCppuType((uno::Reference< form::XFormComponent>*)0),
                 "OutHiddenControls: falsche Reflection" );
         if( aTmp.getValueType() !=
@@ -687,7 +687,7 @@ void SwHTMLWriter::OutHiddenControls(
 const SdrObject *SwHTMLWriter::GetHTMLControl( const SwDrawFrmFmt& rFmt )
 {
     // es muss ein Draw-Format sein
-    ASSERT( RES_DRAWFRMFMT == rFmt.Which(),
+    OSL_ENSURE( RES_DRAWFRMFMT == rFmt.Which(),
             "GetHTMLControl nuer fuer Draw-Formate erlaubt" );
 
     // Schauen, ob es ein SdrObject dafuer gibt
@@ -699,7 +699,7 @@ const SdrObject *SwHTMLWriter::GetHTMLControl( const SwDrawFrmFmt& rFmt )
     uno::Reference< awt::XControlModel >  xControlModel =
             pFormObj->GetUnoControlModel();
 
-    ASSERT( xControlModel.is(), "UNO-Control ohne Model" );
+    OSL_ENSURE( xControlModel.is(), "UNO-Control ohne Model" );
     if( !xControlModel.is() )
         return 0;
 
@@ -730,11 +730,11 @@ static void GetControlSize( const SdrObject& rSdrObj, Size& rSz,
     SdrUnoObj *pFormObj = PTR_CAST( SdrUnoObj, &rSdrObj );
     uno::Reference< awt::XControl >  xControl;
     SdrView* pDrawView = pVSh->GetDrawView();
-    ASSERT( pDrawView && pVSh->GetWin(), "no DrawView or window!" );
+    OSL_ENSURE( pDrawView && pVSh->GetWin(), "no DrawView or window!" );
     if ( pDrawView && pVSh->GetWin() )
         xControl = pFormObj->GetUnoControl( *pDrawView, *pVSh->GetWin() );
     uno::Reference< awt::XTextLayoutConstrains > xLC( xControl, uno::UNO_QUERY );
-    ASSERT( xLC.is(), "kein XTextLayoutConstrains" );
+    OSL_ENSURE( xLC.is(), "kein XTextLayoutConstrains" );
     if( !xLC.is() )
         return;
 
@@ -755,7 +755,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
     uno::Reference< awt::XControlModel > xControlModel =
         pFormObj->GetUnoControlModel();
 
-    ASSERT( xControlModel.is(), "UNO-Control ohne Model" );
+    OSL_ENSURE( xControlModel.is(), "UNO-Control ohne Model" );
     if( !xControlModel.is() )
         return rWrt;
 
@@ -763,8 +763,6 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
     uno::Reference< beans::XPropertySetInfo > xPropSetInfo =
             xPropSet->getPropertySetInfo();
 
-//!!!   if( rHTMLWrt.pForm != pVCSbxCtrl->GetVCForm() )
-//!!!       rHTMLWrt.nWarn = 1; // Control wird falscher Form zugeordnet
     rHTMLWrt.nFormCntrlCnt++;
 
     enum Tag { TAG_INPUT, TAG_SELECT, TAG_TEXTAREA, TAG_NONE };
@@ -1080,7 +1078,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
         sOut.Erase();
     }
 
-    ASSERT( !bInCntnr, "Container wird fuer Controls nicht unterstuertzt" );
+    OSL_ENSURE( !bInCntnr, "Container wird fuer Controls nicht unterstuertzt" );
     if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_DRAW ) && !bInCntnr )
     {
         // Wenn Zeichen-Objekte nicht absolut positioniert werden duerfen,
@@ -1357,7 +1355,7 @@ static void AddControl( HTMLControls& rControls,
                         sal_uInt32 nNodeIdx )
 {
     SdrUnoObj *pFormObj = PTR_CAST( SdrUnoObj, pSdrObj );
-    ASSERT( pFormObj, "Doch kein FormObj" );
+    OSL_ENSURE( pFormObj, "Doch kein FormObj" );
     uno::Reference< awt::XControlModel > xControlModel =
             pFormObj->GetUnoControlModel();
     if( !xControlModel.is() )
@@ -1367,7 +1365,7 @@ static void AddControl( HTMLControls& rControls,
     uno::Reference< uno::XInterface >  xIfc = xFormComp->getParent();
     uno::Reference< form::XForm >  xForm(xIfc, uno::UNO_QUERY);
 
-    ASSERT( xForm.is(), "Wo ist die Form?" );
+    OSL_ENSURE( xForm.is(), "Wo ist die Form?" );
     if( xForm.is() )
     {
         uno::Reference< container::XIndexContainer >  xFormComps( xForm, uno::UNO_QUERY );
@@ -1402,7 +1400,7 @@ void SwHTMLWriter::GetControls()
                 continue;
 
             const SdrObject *pSdrObj = pPosFlyFrm->GetSdrObject();
-            ASSERT( pSdrObj, "Wo ist das SdrObject?" );
+            OSL_ENSURE( pSdrObj, "Wo ist das SdrObject?" );
             if( !pSdrObj )
                 continue;
 
diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx
index 4b956d6c71e9..342b63d3674c 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -302,7 +302,7 @@ Writer& OutHTML_SwFmtFtn( Writer& rWrt, const SfxPoolItem& rHt )
     if( rFmtFtn.IsEndNote() )
     {
         nPos = rHTMLWrt.pFootEndNotes ? rHTMLWrt.pFootEndNotes->Count() : 0;
-        ASSERT( nPos == rHTMLWrt.nFootNote + rHTMLWrt.nEndNote,
+        OSL_ENSURE( nPos == rHTMLWrt.nFootNote + rHTMLWrt.nEndNote,
                 "OutHTML_SwFmtFtn: Position falsch" );
         sClass.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdendnote_anc );
         sFtnName.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdendnote );
@@ -347,12 +347,12 @@ Writer& OutHTML_SwFmtFtn( Writer& rWrt, const SfxPoolItem& rHt )
 
 void SwHTMLWriter::OutFootEndNotes()
 {
-    ASSERT( pFootEndNotes,
+    OSL_ENSURE( pFootEndNotes,
             "SwHTMLWriter::OutFootEndNotes(): unnoetiger Aufruf" );
     if( !pFootEndNotes )
         return;
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     USHORT nFtn = nFootNote, nEn = nEndNote;
 #endif
     nFootNote = 0, nEndNote = 0;
@@ -387,9 +387,9 @@ void SwHTMLWriter::OutFootEndNotes()
         bLFPossible = TRUE;
         IncIndentLevel();   // Inhalt von <DIV> einruecken
 
-        ASSERT( pTxtFtn, "SwHTMLWriter::OutFootEndNotes: SwTxtFtn fehlt" );
+        OSL_ENSURE( pTxtFtn, "SwHTMLWriter::OutFootEndNotes: SwTxtFtn fehlt" );
         SwNodeIndex *pSttNdIdx = pTxtFtn->GetStartNode();
-        ASSERT( pSttNdIdx,
+        OSL_ENSURE( pSttNdIdx,
                 "SwHTMLWriter::OutFootEndNotes: StartNode-Index fehlt" );
         if( pSttNdIdx )
         {
@@ -404,7 +404,7 @@ void SwHTMLWriter::OutFootEndNotes()
         HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_division, FALSE );
         bLFPossible = TRUE;
 
-        ASSERT( !pFmtFtn,
+        OSL_ENSURE( !pFmtFtn,
                 "SwHTMLWriter::OutFootEndNotes: Ftn wurde nicht ausgegeben" );
         if( pFmtFtn )
         {
@@ -417,10 +417,10 @@ void SwHTMLWriter::OutFootEndNotes()
         }
     }
 
-#ifdef DBG_UTIL
-    ASSERT( nFtn == nFootNote,
+#if OSL_DEBUG_LEVEL > 1
+    OSL_ENSURE( nFtn == nFootNote,
             "SwHTMLWriter::OutFootEndNotes: Anzahl Fussnoten stimmt nicht" );
-    ASSERT( nEn == nEndNote,
+    OSL_ENSURE( nEn == nEndNote,
             "SwHTMLWriter::OutFootEndNotes: Anzahl Endnoten stimmt nicht" );
 #endif
 
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index c0b6c0dc9888..6d8ca94e77c2 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -111,7 +111,7 @@ ImageMap *SwHTMLParser::FindImageMap( const String& rName ) const
 {
     ImageMap *pMap = 0;
 
-    ASSERT( rName.GetChar(0) != '#', "FindImageName: Name beginnt mit #!" );
+    OSL_ENSURE( rName.GetChar(0) != '#', "FindImageName: Name beginnt mit #!" );
 
     if( pImageMaps )
     {
@@ -456,7 +456,7 @@ IMAGE_SETEVENT:
 
         if( pTxtNode && ! pTxtNode->IsCountedInList())
         {
-            ASSERT( pTxtNode->GetActualListLevel() == GetNumInfo().GetLevel(),
+            OSL_ENSURE( pTxtNode->GetActualListLevel() == GetNumInfo().GetLevel(),
                     "Numerierungs-Ebene stimmt nicht" );
 
             pTxtNode->SetCountedInList( true );
@@ -691,7 +691,7 @@ IMAGE_SETEVENT:
     // min. Werte einhalten !!
     if( nPrcWidth )
     {
-        ASSERT( !aTwipSz.Width(),
+        OSL_ENSURE( !aTwipSz.Width(),
                 "Wieso ist da trotz %-Angabe eine Breite gesetzt?" );
         aTwipSz.Width() = aGrfSz.Width() ? aGrfSz.Width()
                                          : HTML_DFLT_IMG_WIDTH;
@@ -704,7 +704,7 @@ IMAGE_SETEVENT:
     }
     if( nPrcHeight )
     {
-        ASSERT( !aTwipSz.Height(),
+        OSL_ENSURE( !aTwipSz.Height(),
                 "Wieso ist da trotz %-Angabe eine Hoehe gesetzt?" );
         aTwipSz.Height() = aGrfSz.Height() ? aGrfSz.Height()
                                            : HTML_DFLT_IMG_HEIGHT;
@@ -895,9 +895,6 @@ void SwHTMLParser::InsertBodyOptions()
                 break;
 
             case HTML_O_ONERROR:
-//              if( bAnyStarBasic )
-//                  InsertBasicDocEvent( SFX_EVENT_ACTIVATEDOC,
-//                                       pOption->GetString() );
                 break;
 
             case HTML_O_STYLE:
@@ -1386,7 +1383,7 @@ void SwHTMLParser::StripTrailingPara()
                     SwCntntNode* pNd = pDoc->GetNodes().GoPrevious(&nNewNdIdx);
                     if(!pNd)
                     {
-                        ASSERT(!this, "Hoppla, wo ist mein Vorgaenger-Node");
+                        OSL_ENSURE(!this, "Hoppla, wo ist mein Vorgaenger-Node");
                         return;
                     }
                     // --> OD 2007-09-27 #i81002# - refactoring
diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx
index 7e4fdba47520..0bdb94d65f70 100644
--- a/sw/source/filter/html/htmlnum.cxx
+++ b/sw/source/filter/html/htmlnum.cxx
@@ -75,9 +75,6 @@ static HTMLOptionEnum __FAR_DATA aHTMLULTypeTable[] =
 
 void SwHTMLNumRuleInfo::Set( const SwTxtNode& rTxtNd )
 {
-    // --> OD 2006-06-12 #b6435904#
-    // export all numberings, except the outline numbering.
-//    if( rTxtNd.GetNumRule() && ! rTxtNd.IsOutline())
     const SwNumRule* pTxtNdNumRule( rTxtNd.GetNumRule() );
     if ( pTxtNdNumRule &&
          pTxtNdNumRule != rTxtNd.GetDoc()->GetOutlineNumRule() )
@@ -92,8 +89,6 @@ void SwHTMLNumRuleInfo::Set( const SwTxtNode& rTxtNd )
         // text node and the start value equals <USHRT_MAX>.
         // Start value <USHRT_MAX> indicates, that at this text node the numbering
         // is restarted with the value given at the corresponding level.
-//        bRestart = rTxtNd.IsListRestart() &&
-//                   GetNum() && rTxtNd.GetNum()->GetStartValue() == USHRT_MAX;
         bRestart = rTxtNd.IsListRestart() && !rTxtNd.HasAttrListRestartValue();
         // <--
     }
@@ -309,11 +304,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
     // den aktuellen Absatz erst einmal nicht numerieren
     {
         BYTE nLvl = nLevel;
-        // --> OD 2008-04-02 #refactorlists#
-//        SetNoNum(&nLvl, TRUE); // #115962#
-//        SetNodeNum( nLvl );
         SetNodeNum( nLvl, false );
-        // <--
     }
 
     // einen neuen Kontext anlegen
@@ -470,9 +461,7 @@ void SwHTMLParser::EndNumBulList( int nToken )
         }
         else
         {
-            // den naechsten Absatz erstmal nicht numerieren
-            // --> OD 2008-04-02 #refactorlists#
-//            SetNodeNum( rInfo.GetLevel() | NO_NUMLEVEL );
+            // the next paragraph not numbered first
             SetNodeNum( rInfo.GetLevel(), false );
             // <--
         }
@@ -576,7 +565,7 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
 
         pDoc->MakeNumRule( aNumRuleName, &aNumRule );
 
-        ASSERT( !nOpenParaToken,
+        OSL_ENSURE( !nOpenParaToken,
                 "Jetzt geht ein offenes Absatz-Element verloren" );
         // Wir tun so, als ob wir in einem Absatz sind. Dann wird
         // beim naechsten Absatz wenigstens die Numerierung
@@ -588,9 +577,8 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
     SwTxtNode* pTxtNode = pPam->GetNode()->GetTxtNode();
     ((SwCntntNode *)pTxtNode)->SetAttr( SwNumRuleItem(aNumRuleName) );
     pTxtNode->SetAttrListLevel(nLevel);
-    // --> OD 2005-11-14 #i57656#
-    // <IsCounted()> state of text node has to be adjusted accordingly.
-    if ( /*nLevel >= 0 &&*/ nLevel < MAXLEVEL )
+    // #i57656# - <IsCounted()> state of text node has to be adjusted accordingly.
+    if ( nLevel < MAXLEVEL )
     {
         // --> OD 2008-04-02 #refactorlists#
         pTxtNode->SetCountedInList( bCountedInList );
@@ -687,28 +675,14 @@ void SwHTMLParser::EndNumBulListItem( int nToken, sal_Bool bSetColl,
 void SwHTMLParser::SetNodeNum( sal_uInt8 nLevel, bool bCountedInList )
 {
     SwTxtNode* pTxtNode = pPam->GetNode()->GetTxtNode();
-    ASSERT( pTxtNode, "Kein Text-Node an PaM-Position" );
+    OSL_ENSURE( pTxtNode, "Kein Text-Node an PaM-Position" );
 
-    ASSERT( GetNumInfo().GetNumRule(), "Kein Numerierungs-Regel" );
+    OSL_ENSURE( GetNumInfo().GetNumRule(), "Kein Numerierungs-Regel" );
     const String& rName = GetNumInfo().GetNumRule()->GetName();
     ((SwCntntNode *)pTxtNode)->SetAttr( SwNumRuleItem(rName) );
 
-    // --> OD 2008-04-02 #refactorlists#
-//    // --> OD 2005-11-14 #i57656#
-//    // consider usage of NO_NUMLEVEL - see implementation of <SwTxtNode::SetLevel(..)>
-//    if ( /*nLevel >= 0 &&*/ ( nLevel & NO_NUMLEVEL ) )
-//    {
-//        pTxtNode->SetAttrListLevel( nLevel & ~NO_NUMLEVEL );
-//        pTxtNode->SetCountedInList( false );
-//    }
-//    else
-//    {
-//        pTxtNode->SetAttrListLevel( nLevel );
-//        pTxtNode->SetCountedInList( true );
-//    }
     pTxtNode->SetAttrListLevel( nLevel );
     pTxtNode->SetCountedInList( bCountedInList );
-    // <--
 
     // NumRule invalidieren, weil sie durch ein EndAction bereits
     // auf valid geschaltet worden sein kann.
@@ -810,7 +784,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
                                 break;
                             }
 
-                            ASSERT(! pTxtNd->IsOutline(),
+                            OSL_ENSURE(! pTxtNd->IsOutline(),
                                    "outline not expected");
 
                             if( pTxtNd->GetActualListLevel() + 1 <
@@ -924,7 +898,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
                 }
                 else
                 {
-                    ASSERT( false,
+                    OSL_ENSURE( false,
                             "<OutHTML_NumBulListStart(..) - text node has no number." );
                 }
             }
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index 47cc5b420900..0571ed9e6b39 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -442,8 +442,6 @@ void SwHTMLParser::InsertEmbed()
             aCmdLst.FillSequence( aProps );
             xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginCommands")), uno::makeAny( aProps ) );
 
-            // TODO/LATER: EnableSetModified?!
-            //pPlugin->EnableSetModified( TRUE );
         }
     }
 
@@ -896,7 +894,6 @@ void SwHTMLParser::InsertFloatingFrame()
     ::rtl::OUString aObjName;
     uno::Reference < embed::XEmbeddedObject > xObj = aCnt.CreateEmbeddedObject( SvGlobalName( SO3_IFRAME_CLASSID ).GetByteSequence(), aObjName );
 
-    //pFrame->EnableSetModified( FALSE );
     try
     {
         // TODO/MBA: testing
@@ -920,12 +917,8 @@ void SwHTMLParser::InsertFloatingFrame()
                     xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsScrollingMode")),
                         uno::makeAny( (sal_Bool) ( eScroll == ScrollingYes) ) );
 
-                //if ( aFrmDescr.IsFrameBorderSet() )
                 xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsBorder")),
                         uno::makeAny( bHasBorder ) );
-                /*else
-                    xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoBorder")),
-                        uno::makeAny( sal_True ) );*/
 
                 xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginWidth")),
                     uno::makeAny( sal_Int32( aMargin.Width() ) ) );
@@ -939,8 +932,6 @@ void SwHTMLParser::InsertFloatingFrame()
     {
     }
 
-    //pFrame->EnableSetModified( TRUE );
-
     SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() );
     SvxCSS1PropertyInfo aPropInfo;
     if( HasStyleOptions( aStyle, aId, aClass ) )
@@ -979,89 +970,6 @@ void SwHTMLParser::InsertFloatingFrame()
 
 /*  */
 
-/*
-#define SWHTML_OPTTYPE_IGNORE 0
-#define SWHTML_OPTTYPE_TAG 1
-#define SWHTML_OPTTYPE_PARAM 2
-
-
-static USHORT GetOptionType( const String& rName, BOOL bApplet )
-{
-    USHORT nType = bApplet ? SWHTML_OPTTYPE_PARAM : SWHTML_OPTTYPE_TAG;
-
-    switch( rName.GetChar(0) )
-    {
-    case 'A':
-    case 'a':
-        if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_align ) ||
-            rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_alt ) )
-            nType = SWHTML_OPTTYPE_IGNORE;
-        else if( bApplet &&
-                 (rName.EqualsIgnoreCaseAscii( sHTML_O_archive ) ||
-                 rName.EqualsIgnoreCaseAscii( sHTML_O_Archives )) )
-            nType = SWHTML_OPTTYPE_TAG;
-        break;
-    case 'C':
-    case 'c':
-        if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_class ) ||
-            (bApplet && (rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_code ) ||
-                         rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_codebase ))) )
-            nType = SWHTML_OPTTYPE_IGNORE;
-        break;
-    case 'H':
-    case 'h':
-        if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_height ) ||
-            rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_hspace ) ||
-            (!bApplet && rName.EqualsIgnoreCaseAscii( OOO_STRING_SW_HTML_O_Hidden )) )
-            nType = SWHTML_OPTTYPE_IGNORE;
-        break;
-    case 'I':
-    case 'i':
-        if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_id ) )
-            nType = SWHTML_OPTTYPE_IGNORE;
-        break;
-    case 'M':
-    case 'm':
-        if( bApplet && rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_mayscript ) )
-            nType = SWHTML_OPTTYPE_IGNORE;
-        break;
-    case 'N':
-    case 'n':
-        if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_name ) )
-            nType = SWHTML_OPTTYPE_IGNORE;
-        break;
-    case 'O':
-    case 'o':
-        if( bApplet && rName.EqualsIgnoreCaseAscii( sHTML_O_Object ) )
-            nType = SWHTML_OPTTYPE_TAG;
-        break;
-    case 'S':
-    case 's':
-        if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_style ) ||
-            (!bApplet && rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_src )) )
-            nType = SWHTML_OPTTYPE_IGNORE;
-        break;
-    case 'T':
-    case 't':
-        if( !bApplet && rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_type ) )
-            nType = SWHTML_OPTTYPE_IGNORE;
-        break;
-    case 'V':
-    case 'v':
-        if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_vspace ) )
-            nType = SWHTML_OPTTYPE_IGNORE;
-        break;
-    case 'W':
-    case 'w':
-        if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_width ) )
-            nType = SWHTML_OPTTYPE_IGNORE;
-        break;
-    }
-
-    return nType;
-}
-*/
-
 USHORT SwHTMLWriter::GuessOLENodeFrmType( const SwNode& rNode )
 {
     SwOLEObj& rObj = ((SwOLENode*)rNode.GetOLENode())->GetOLEObj();
@@ -1097,7 +1005,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
     ULONG nStt = rFlyCntnt.GetCntntIdx()->GetIndex()+1;
     SwOLENode *pOLENd = rHTMLWrt.pDoc->GetNodes()[ nStt ]->GetOLENode();
 
-    ASSERT( pOLENd, "OLE-Node erwartet" );
+    OSL_ENSURE( pOLENd, "OLE-Node erwartet" );
     if( !pOLENd )
         return rWrt;
 
@@ -1361,16 +1269,11 @@ Writer& OutHTML_FrmFmtOLENodeGrf( Writer& rWrt, const SwFrmFmt& rFrmFmt,
     ULONG nStt = rFlyCntnt.GetCntntIdx()->GetIndex()+1;
     SwOLENode *pOLENd = rHTMLWrt.pDoc->GetNodes()[ nStt ]->GetOLENode();
 
-    ASSERT( pOLENd, "OLE-Node erwartet" );
+    OSL_ENSURE( pOLENd, "OLE-Node erwartet" );
     if( !pOLENd )
         return rWrt;
 
-    // Inhalt des Nodes als Grafik speichern
-    //uno::Reference < embed::XEmbeddedObject > xObj = pOLENd->GetOLEObj().GetOleRef();
-    //GDIMetaFile aPic;
-    //if( xObj.is() && xRef->GetGDIMetaFile( aPic ).GetActionCount() )
     {
-        //Graphic aGrf( aPic );
         Graphic aGrf( *pOLENd->GetGraphic() );
         String aGrfNm;
         const String* pTempFileName = rHTMLWrt.GetOrigFileName();
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index 748da920e894..46d8d6a0c05f 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -67,7 +67,6 @@
 #define CONTEXT_FLAGS_MULTICOL (HTML_CNTXT_STRIP_PARA |  \
                                 HTML_CNTXT_KEEP_NUMRULE | \
                                 HTML_CNTXT_KEEP_ATTRS)
-//#define CONTEXT_FLAGS_HDRFTR (HTML_CNTXT_STRIP_PARA|HTML_CNTXT_PROTECT_STACK)
 #define CONTEXT_FLAGS_HDRFTR (CONTEXT_FLAGS_MULTICOL)
 #define CONTEXT_FLAGS_FTN (CONTEXT_FLAGS_MULTICOL)
 
@@ -431,7 +430,7 @@ void SwHTMLParser::FixHeaderFooterDistance( sal_Bool bHeader,
     SwFrmFmt *pHdFtFmt =
         bHeader ? (SwFrmFmt*)rPageFmt.GetHeader().GetHeaderFmt()
                 : (SwFrmFmt*)rPageFmt.GetFooter().GetFooterFmt();
-    ASSERT( pHdFtFmt, "Doch keine Kopf- oder Fusszeile" );
+    OSL_ENSURE( pHdFtFmt, "Doch keine Kopf- oder Fusszeile" );
 
     const SwFmtCntnt& rFlyCntnt = pHdFtFmt->GetCntnt();
     const SwNodeIndex& rCntntStIdx = *rFlyCntnt.GetCntntIdx();
@@ -526,7 +525,7 @@ sal_Bool SwHTMLParser::EndSection( sal_Bool bLFStripped )
         return sal_True;
     }
 
-    ASSERT( !this, "Falsche PaM Position Beenden eines Bereichs" );
+    OSL_ENSURE( !this, "Falsche PaM Position Beenden eines Bereichs" );
 
     return sal_False;
 }
@@ -817,7 +816,7 @@ void SwHTMLParser::MovePageDescAttrs( SwNode *pSrcNd,
     SwCntntNode* pDestCntntNd =
         pDoc->GetNodes()[nDestIdx]->GetCntntNode();
 
-    ASSERT( pDestCntntNd, "Wieso ist das Ziel kein Content-Node?" );
+    OSL_ENSURE( pDestCntntNd, "Wieso ist das Ziel kein Content-Node?" );
 
     if( pSrcNd->IsCntntNode() )
     {
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index f4a1d1f9078e..6d734d93b929 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -730,7 +730,7 @@ void HTMLTableCnts::Add( HTMLTableCnts* pNewCnts )
 
 inline void HTMLTableCnts::SetTableBox( SwTableBox *pBox )
 {
-    ASSERT( pLayoutInfo, "Da sit noch keine Layout-Info" );
+    OSL_ENSURE( pLayoutInfo, "Da sit noch keine Layout-Info" );
     if( pLayoutInfo )
         pLayoutInfo->SetTableBox( pBox );
 }
@@ -860,7 +860,7 @@ HTMLTableRow::HTMLTableRow( sal_uInt16 nCells ):
         pCells->Insert( new HTMLTableCell, pCells->Count() );
     }
 
-    ASSERT( nCells==pCells->Count(),
+    OSL_ENSURE( nCells==pCells->Count(),
             "Zellenzahl in neuer HTML-Tabellenzeile stimmt nicht" );
 }
 
@@ -878,7 +878,7 @@ inline void HTMLTableRow::SetHeight( sal_uInt16 nHght )
 
 inline HTMLTableCell *HTMLTableRow::GetCell( sal_uInt16 nCell ) const
 {
-    ASSERT( nCell<pCells->Count(),
+    OSL_ENSURE( nCell<pCells->Count(),
         "ungueltiger Zellen-Index in HTML-Tabellenzeile" );
     return (*pCells)[nCell];
 }
@@ -900,15 +900,15 @@ void HTMLTableRow::Expand( sal_uInt16 nCells, sal_Bool bOneCell )
         nColSpan--;
     }
 
-    ASSERT( nCells==pCells->Count(),
+    OSL_ENSURE( nCells==pCells->Count(),
             "Zellenzahl in expandierter HTML-Tabellenzeile stimmt nicht" );
 }
 
 void HTMLTableRow::Shrink( sal_uInt16 nCells )
 {
-    ASSERT( nCells < pCells->Count(), "Anzahl Zellen falsch" );
+    OSL_ENSURE( nCells < pCells->Count(), "Anzahl Zellen falsch" );
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
      sal_uInt16 nEnd = pCells->Count();
 #endif
     // The colspan of empty cells at the end has to be fixed to the new
@@ -919,22 +919,24 @@ void HTMLTableRow::Shrink( sal_uInt16 nCells )
         HTMLTableCell *pCell = (*pCells)[--i];
         if( !pCell->GetContents() )
         {
-            ASSERT( pCell->GetColSpan() == nEnd - i,
+#if OSL_DEBUG_LEVEL > 1
+            OSL_ENSURE( pCell->GetColSpan() == nEnd - i,
                     "invalid col span for empty cell at row end" );
+#endif
             pCell->SetColSpan( nCells-i);
         }
         else
             break;
     }
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     for( i=nCells; i<nEnd; i++ )
     {
         HTMLTableCell *pCell = (*pCells)[i];
-        ASSERT( pCell->GetRowSpan() == 1,
+        OSL_ENSURE( pCell->GetRowSpan() == 1,
                 "RowSpan von zu loesender Zelle ist falsch" );
-        ASSERT( pCell->GetColSpan() == nEnd - i,
+        OSL_ENSURE( pCell->GetColSpan() == nEnd - i,
                     "ColSpan von zu loesender Zelle ist falsch" );
-        ASSERT( !pCell->GetContents(), "Zu loeschende Zelle hat Inhalt" );
+        OSL_ENSURE( !pCell->GetContents(), "Zu loeschende Zelle hat Inhalt" );
     }
 #endif
 
@@ -973,7 +975,7 @@ inline SwHTMLTableLayoutColumn *HTMLTableColumn::CreateLayoutInfo()
 inline sal_uInt16 HTMLTableColumn::GetFrmFmtIdx( sal_Bool bBorderLine,
                                              sal_Int16 eVertOrient ) const
 {
-    ASSERT( text::VertOrientation::TOP != eVertOrient, "Top ist nicht erlaubt" );
+    OSL_ENSURE( text::VertOrientation::TOP != eVertOrient, "Top ist nicht erlaubt" );
     sal_uInt16 n = bBorderLine ? 3 : 0;
     switch( eVertOrient )
     {
@@ -1302,7 +1304,7 @@ const SwStartNode* HTMLTable::GetPrevBoxStartNode( sal_uInt16 nRow, sal_uInt16 n
             }
         }
     }
-    ASSERT( pPrevCnts, "keine gefuellte Vorgaenger-Zelle gefunden" );
+    OSL_ENSURE( pPrevCnts, "keine gefuellte Vorgaenger-Zelle gefunden" );
     if( !pPrevCnts )
     {
         pPrevCnts = GetCell(0,0)->GetContents();
@@ -1352,7 +1354,7 @@ sal_uInt16 HTMLTable::GetTopCellSpace( sal_uInt16 nRow, sal_uInt16 nRowSpan,
     else if( bSwBorders && ((*pRows)[nRow+nRowSpan-1])->bBottomBorder &&
              nSpace < MIN_BORDER_DIST )
     {
-        ASSERT( !nCellPadding, "GetTopCellSpace: CELLPADDING!=0" );
+        OSL_ENSURE( !nCellPadding, "GetTopCellSpace: CELLPADDING!=0" );
         // Wenn die Gegenueberliegende Seite umrandet ist muessen
         // wir zumindest den minimalen Abstand zum Inhalt
         // beruecksichtigen. (Koennte man zusaetzlich auch an
@@ -1390,9 +1392,9 @@ sal_uInt16 HTMLTable::GetBottomCellSpace( sal_uInt16 nRow, sal_uInt16 nRowSpan,
         }
         else if( nRow==0 && bTopBorder && nSpace < MIN_BORDER_DIST )
         {
-            ASSERT( GetBorderWidth( aTopBorderLine, sal_True ) > 0,
+            OSL_ENSURE( GetBorderWidth( aTopBorderLine, sal_True ) > 0,
                     "GetBottomCellSpace: |aTopLine| == 0" );
-            ASSERT( !nCellPadding, "GetBottomCellSpace: CELLPADDING!=0" );
+            OSL_ENSURE( !nCellPadding, "GetBottomCellSpace: CELLPADDING!=0" );
             // Wenn die Gegenueberliegende Seite umrandet ist muessen
             // wir zumindest den minimalen Abstand zum Inhalt
             // beruecksichtigen. (Koennte man zusaetzlich auch an
@@ -1608,7 +1610,7 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox,
             else
                 pFrmFmt->ResetFmtAttr( RES_BOXATR_FORMAT );
 
-            ASSERT( eVOri != text::VertOrientation::TOP, "text::VertOrientation::TOP ist nicht erlaubt!" );
+            OSL_ENSURE( eVOri != text::VertOrientation::TOP, "text::VertOrientation::TOP ist nicht erlaubt!" );
             if( text::VertOrientation::NONE != eVOri )
             {
                 pFrmFmt->SetFmtAttr( SwFmtVertOrient( 0, eVOri ) );
@@ -1629,7 +1631,7 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox,
     }
     else
     {
-        ASSERT( pBox->GetSttNd() ||
+        OSL_ENSURE( pBox->GetSttNd() ||
                 SFX_ITEM_SET!=pFrmFmt->GetAttrSet().GetItemState(
                                     RES_VERT_ORIENT, sal_False ),
                 "Box ohne Inhalt hat vertikale Ausrichtung" );
@@ -1696,7 +1698,7 @@ static void ResetLineFrmFmtAttrs( SwFrmFmt *pFrmFmt )
 {
     pFrmFmt->ResetFmtAttr( RES_FRM_SIZE );
     pFrmFmt->ResetFmtAttr( RES_BACKGROUND );
-    ASSERT( SFX_ITEM_SET!=pFrmFmt->GetAttrSet().GetItemState(
+    OSL_ENSURE( SFX_ITEM_SET!=pFrmFmt->GetAttrSet().GetItemState(
                                 RES_VERT_ORIENT, sal_False ),
             "Zeile hat vertikale Ausrichtung" );
 }
@@ -1781,15 +1783,15 @@ SwTableLine *HTMLTable::MakeTableLine( SwTableBox *pUpper,
         sal_Bool bSplitted = sal_False;
         while( !bSplitted )
         {
-            ASSERT( nCol < nRightCol, "Zu weit gelaufen" );
+            OSL_ENSURE( nCol < nRightCol, "Zu weit gelaufen" );
 
             HTMLTableCell *pCell = GetCell(nTopRow,nCol);
             const sal_Bool bSplit = 1 == pCell->GetColSpan();
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
             if( nCol == nRightCol-1 )
             {
-                ASSERT( bSplit, "Split-Flag falsch" );
+                OSL_ENSURE( bSplit, "Split-Flag falsch" );
             }
 #endif
             if( bSplit )
@@ -1840,7 +1842,7 @@ SwTableLine *HTMLTable::MakeTableLine( SwTableBox *pUpper,
                     bSplitted = sal_True;
                 }
 
-                ASSERT( pBox, "Colspan trouble" )
+                OSL_ENSURE( pBox, "Colspan trouble" );
 
                 if( pBox )
                     rBoxes.C40_INSERT( SwTableBox, pBox, rBoxes.Count() );
@@ -1953,7 +1955,7 @@ void HTMLTable::InheritBorders( const HTMLTable *pParent,
                                 sal_uInt16 nRowSpan, sal_uInt16 /*nColSpan*/,
                                 sal_Bool bFirstPara, sal_Bool bLastPara )
 {
-    ASSERT( nRows>0 && nCols>0 && nCurRow==nRows,
+    OSL_ENSURE( nRows>0 && nCols>0 && nCurRow==nRows,
             "Wurde CloseTable nicht aufgerufen?" );
 
     // Die Child-Tabelle muss einen Rahmen bekommen, wenn die umgebende
@@ -2064,7 +2066,7 @@ void HTMLTable::SetBorders()
     if( HTML_TF_BELOW==eFrame || HTML_TF_HSIDES==eFrame ||
         HTML_TF_BOX==eFrame )
         ((*pRows)[nRows-1])->bBottomBorder = sal_True;
-    if( /*bRightAlwd &&*/ (HTML_TF_RHS==eFrame || HTML_TF_VSIDES==eFrame ||
+    if( (HTML_TF_RHS==eFrame || HTML_TF_VSIDES==eFrame ||
                       HTML_TF_BOX==eFrame) )
         bRightBorder = sal_True;
     if( HTML_TF_LHS==eFrame || HTML_TF_VSIDES==eFrame || HTML_TF_BOX==eFrame )
@@ -2121,7 +2123,7 @@ sal_uInt16 HTMLTable::GetBorderWidth( const SvxBorderLine& rBLine,
 inline HTMLTableCell *HTMLTable::GetCell( sal_uInt16 nRow,
                                           sal_uInt16 nCell ) const
 {
-    ASSERT( nRow<pRows->Count(),
+    OSL_ENSURE( nRow<pRows->Count(),
         "ungueltiger Zeilen-Index in HTML-Tabelle" );
     return ((*pRows)[nRow])->GetCell( nCell );
 }
@@ -2147,7 +2149,7 @@ sal_Int16 HTMLTable::GetInheritedVertOri() const
     if( text::VertOrientation::TOP==eVOri )
         eVOri = eVertOri;
 
-    ASSERT( eVertOri != text::VertOrientation::TOP, "text::VertOrientation::TOP ist nicht erlaubt!" );
+    OSL_ENSURE( eVertOri != text::VertOrientation::TOP, "text::VertOrientation::TOP ist nicht erlaubt!" );
     return eVOri;
 }
 
@@ -2177,7 +2179,7 @@ void HTMLTable::InsertCell( HTMLTableCnts *pCnts,
         for( i=0; i<nRows; i++ )
             ((*pRows)[i])->Expand( nColsReq, i<nCurRow );
         nCols = nColsReq;
-        ASSERT( pColumns->Count()==nCols,
+        OSL_ENSURE( pColumns->Count()==nCols,
                 "Anzahl der Spalten nach Expandieren stimmt nicht" );
     }
     if( nColsReq > nFilledCols )
@@ -2190,7 +2192,7 @@ void HTMLTable::InsertCell( HTMLTableCnts *pCnts,
         for( i=nRows; i<nRowsReq; i++ )
             pRows->Insert( new HTMLTableRow(nCols), pRows->Count() );
         nRows = nRowsReq;
-        ASSERT( nRows==pRows->Count(), "Zeilenzahl in Insert stimmt nicht" );
+        OSL_ENSURE( nRows==pRows->Count(), "Zeilenzahl in Insert stimmt nicht" );
     }
 
     // Testen, ob eine Ueberschneidung vorliegt und diese
@@ -2273,11 +2275,10 @@ void HTMLTable::InsertCell( HTMLTableCnts *pCnts,
 inline void HTMLTable::CloseSection( sal_Bool bHead )
 {
     // die vorhergende Section beenden, falls es schon eine Zeile gibt
-    ASSERT( nCurRow<=nRows, "ungeultige aktuelle Zeile" );
+    OSL_ENSURE( nCurRow<=nRows, "ungeultige aktuelle Zeile" );
     if( nCurRow>0 && nCurRow<=nRows )
         ((*pRows)[nCurRow-1])->SetEndOfGroup();
-    if( bHead /*&& nCurRow==1*/ )
-//      bHeadlineRepeat = sal_True;
+    if( bHead )
         nHeadlineRepeat = nCurRow;
 }
 
@@ -2292,7 +2293,7 @@ void HTMLTable::OpenRow( SvxAdjust eAdjust, sal_Int16 eVertOrient,
         for( sal_uInt16 i=nRows; i<nRowsReq; i++ )
             pRows->Insert( new HTMLTableRow(nCols), pRows->Count() );
         nRows = nRowsReq;
-        ASSERT( nRows==pRows->Count(),
+        OSL_ENSURE( nRows==pRows->Count(),
                 "Zeilenzahl in OpenRow stimmt nicht" );
     }
 
@@ -2312,7 +2313,7 @@ void HTMLTable::OpenRow( SvxAdjust eAdjust, sal_Int16 eVertOrient,
 
 void HTMLTable::CloseRow( sal_Bool bEmpty )
 {
-    ASSERT( nCurRow<nRows, "aktulle Zeile hinter dem Tabellenende" );
+    OSL_ENSURE( nCurRow<nRows, "aktulle Zeile hinter dem Tabellenende" );
 
     // leere Zellen bekommen einfach einen etwas dickeren unteren Rand!
     if( bEmpty )
@@ -2353,7 +2354,7 @@ inline void HTMLTable::CloseColGroup( sal_uInt16 nSpan, sal_uInt16 _nWidth,
     if( nSpan )
         InsertCol( nSpan, _nWidth, bRelWidth, eAdjust, eVertOrient );
 
-    ASSERT( nCurCol<=nCols, "ungueltige Spalte" );
+    OSL_ENSURE( nCurCol<=nCols, "ungueltige Spalte" );
     if( nCurCol>0 && nCurCol<=nCols )
         ((*pColumns)[nCurCol-1])->SetEndOfGroup();
 }
@@ -2502,10 +2503,10 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
                            sal_uInt16 nRelAvail, sal_uInt16 nAbsLeftSpace,
                            sal_uInt16 nAbsRightSpace, sal_uInt16 nInhAbsSpace )
 {
-    ASSERT( nRows>0 && nCols>0 && nCurRow==nRows,
+    OSL_ENSURE( nRows>0 && nCols>0 && nCurRow==nRows,
             "Wurde CloseTable nicht aufgerufen?" );
 
-    ASSERT( (pLayoutInfo==0) == (this==pTopTable),
+    OSL_ENSURE( (pLayoutInfo==0) == (this==pTopTable),
             "Top-Tabelle hat keine Layout-Info oder umgekehrt" );
 
     if( this==pTopTable )
@@ -2601,7 +2602,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
         pFrmFmt->SetFmtAttr( SwFmtHoriOrient(0,eHoriOri) );
         if( text::HoriOrientation::LEFT_AND_WIDTH==eHoriOri )
         {
-            ASSERT( nLeftMargin || nRightMargin,
+            OSL_ENSURE( nLeftMargin || nRightMargin,
                     "Da gibt's wohl noch Reste von relativen Breiten" );
 
             // The right margin will be ignored anyway.
@@ -2644,7 +2645,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
         ( pLayoutInfo->GetRelLeftFill() > 0  ||
           pLayoutInfo->GetRelRightFill() > 0 ) )
     {
-        ASSERT( pBox, "kein TableBox fuer Tabelle in Tabelle" );
+        OSL_ENSURE( pBox, "kein TableBox fuer Tabelle in Tabelle" );
 
         SwTableLines& rLines = pBox->GetTabLines();
 
@@ -2748,7 +2749,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
                 // rechts umflossen werden soll, dann stacken wir sie
                 // in einem Rahmen mit 100%-Breite, damit ihre Groesse
                 // angepasst wird. Der Rahmen darf nicht angepasst werden.
-                ASSERT( HasToFly(), "Warum ist die Tabelle in einem Rahmen?" );
+                OSL_ENSURE( HasToFly(), "Warum ist die Tabelle in einem Rahmen?" );
                 sal_uInt32 nMin = pLayoutInfo->GetMin();
                 if( nMin > USHRT_MAX )
                     nMin = USHRT_MAX;
@@ -2885,7 +2886,7 @@ void _HTMLTableContext::RestorePREListingXMP( SwHTMLParser& rParser )
 const SwStartNode *SwHTMLParser::InsertTableSection
     ( const SwStartNode *pPrevStNd )
 {
-    ASSERT( pPrevStNd, "Start-Node ist NULL" );
+    OSL_ENSURE( pPrevStNd, "Start-Node ist NULL" );
 
     pCSS1Parser->SetTDTagStyles();
     SwTxtFmtColl *pColl = pCSS1Parser->GetTxtCollFromPool( RES_POOLCOLL_TABLE );
@@ -3002,14 +3003,6 @@ xub_StrLen SwHTMLParser::StripTrailingLF()
 
             if( nLFCount )
             {
-// MIB 6.6.97: Warum sollte man bei leeren Absaetzen nur ein LF loeschen?
-// Das stimmt doch irgendwi nicht ...
-//              if( nLFCount == nLen )
-//              {
-//                  // nur Lfs, dann nur ein LF loeschen
-//                  nLFCount = 1;
-//              }
-//              else if( nLFCount > 2 )
                 if( nLFCount > 2 )
                 {
                     // Bei Netscape entspricht ein Absatz-Ende zwei LFs
@@ -3155,7 +3148,7 @@ void _SectionSaveStruct::Restore( SwHTMLParser& rParser )
     rParser.nFontStHeadStart = nFontStHeadStartSave;
 
     // Der Kontext-Stack muss schon aufgeraeumt sein!
-    ASSERT( rParser.aContexts.Count() == rParser.nContextStMin &&
+    OSL_ENSURE( rParser.aContexts.Count() == rParser.nContextStMin &&
             rParser.aContexts.Count() == rParser.nContextStAttrMin,
             "Der Kontext-Stack wurde nicht aufgeraeumt" );
     rParser.nContextStMin = nContextStMinSave;
@@ -3390,7 +3383,7 @@ void _CellSaveStruct::AddContents( HTMLTableCnts *pNewCnts )
 void _CellSaveStruct::InsertCell( SwHTMLParser& rParser,
                                   HTMLTable *pCurTable )
 {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     // Die Attribute muessen schon beim Auefrauemen des Kontext-Stacks
     // entfernt worden sein, sonst ist etwas schiefgelaufen. Das
     // Checken wir mal eben ...
@@ -3413,7 +3406,7 @@ void _CellSaveStruct::InsertCell( SwHTMLParser& rParser,
         for( sal_uInt16 nCnt = sizeof( _HTMLAttrTable ) / sizeof( _HTMLAttr* );
             nCnt--; ++pTbl )
         {
-            ASSERT( !*pTbl, "Die Attribut-Tabelle ist nicht leer" );
+            OSL_ENSURE( !*pTbl, "Die Attribut-Tabelle ist nicht leer" );
         }
     }
 #endif
@@ -3503,9 +3496,7 @@ HTMLTableCnts *SwHTMLParser::InsertTableContents(
     {
         // 1. Absatz auf nicht numeriert setzen
         BYTE nLvl = GetNumInfo().GetLevel();
-        // --> OD 2008-04-02 #refactorlists#
-//        SetNoNum(&nLvl, TRUE);
-//        SetNodeNum( nLvl);
+
         SetNodeNum( nLvl, false );
     }
 
@@ -3521,7 +3512,7 @@ HTMLTableCnts *SwHTMLParser::InsertTableContents(
         _HTMLAttr *pAttr = *pTbl;
         while( pAttr )
         {
-            ASSERT( !pAttr->GetPrev(), "Attribut hat Previous-Liste" );
+            OSL_ENSURE( !pAttr->GetPrev(), "Attribut hat Previous-Liste" );
             pAttr->nSttPara = rSttPara;
             pAttr->nEndPara = rSttPara;
             pAttr->nSttCntnt = nSttCnt;
@@ -3647,16 +3638,8 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
                 // Entweder kommt die Tabelle in keinen Rahmen und befindet
                 // sich in keinem Rahmen (wird also durch Zellen simuliert),
                 // oder es gibt bereits Inhalt an der entsprechenden Stelle.
-                ASSERT( !bForceFrame || pCurTable->HasParentSection(),
+                OSL_ENSURE( !bForceFrame || pCurTable->HasParentSection(),
                         "Tabelle im Rahmen hat keine Umgebung!" );
-//              SCHOEN WAER'S, aber wie bekommen den Inhalt nicht zurueck
-//              in die umgebende Zelle
-//              if( bForceFrame && !pCurTable->HasParentSection() )
-//              {
-//                  pCurTable->SetParentContents(
-//                      InsertTableContents( sal_False, SVX_ADJUST_END ) );
-//                  pCurTable->SetHasParentSection( sal_True );
-//              }
 
                 sal_Bool bAppend = sal_False;
                 if( bForceFrame )
@@ -3832,18 +3815,13 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
                         pDoc->GetNodes().GoNext( &(pPam->GetPoint()->nNode) );
                     pPam->GetPoint()->nContent.Assign( pCNd, 0 );
 
-                    // automatisch verankerte Rahmen muessen noch um
-                    // eine Position nach vorne verschoben werden.
-                    //if( FLY_AUTO_CNTNT==eAnchorId )
-                    //  aMoveFlyFrms.C40_INSERT( SwFrmFmt, pFrmFmt,
-                    //                           aMoveFlyFrms.Count() );
                 }
 
                 // eine SwTable mit einer Box anlegen und den PaM in den
                 // Inhalt der Box-Section bewegen (der Ausrichtungs-Parameter
                 // ist erstmal nur ein Dummy und wird spaeter noch richtig
                 // gesetzt)
-                ASSERT( !pPam->GetPoint()->nContent.GetIndex(),
+                OSL_ENSURE( !pPam->GetPoint()->nContent.GetIndex(),
                         "Der Absatz hinter der Tabelle ist nicht leer!" );
                 const SwTable* pSwTable = pDoc->InsertTable(
                         SwInsertTableOptions( tabopts::HEADLINE_NO_BORDER, 1 ),
@@ -3870,7 +3848,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
                 {
                     SwTxtNode* pOldTxtNd =
                         pDoc->GetNodes()[pSavePos->nNode]->GetTxtNode();
-                    ASSERT( pOldTxtNd, "Wieso stehen wir in keinem Txt-Node?" );
+                    OSL_ENSURE( pOldTxtNd, "Wieso stehen wir in keinem Txt-Node?" );
                     SwFrmFmt *pFrmFmt = pSwTable->GetFrmFmt();
 
                     const SfxPoolItem* pItem2;
@@ -3912,7 +3890,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
                                      nLeftSpace, nRightSpace,
                                      pSwTable, bForceFrame );
 
-                ASSERT( !pPostIts, "ubenutzte PostIts" );
+                OSL_ENSURE( !pPostIts, "ubenutzte PostIts" );
             }
             else
             {
@@ -3971,7 +3949,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
 
         nToken = FilterToken( nToken );
 
-        ASSERT( pPendStack || !bCallNextToken || pSaveStruct->IsInSection(),
+        OSL_ENSURE( pPendStack || !bCallNextToken || pSaveStruct->IsInSection(),
                 "Wo ist die Section gebieben?" );
         if( !pPendStack && bCallNextToken && pSaveStruct->IsInSection() )
         {
@@ -4066,7 +4044,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
                     // nur wenn die Tabelle wirklich zu Ende ist!
                     if( pSubTable )
                     {
-                        ASSERT( pSubTable->GetTableAdjust(sal_False)!= SVX_ADJUST_LEFT &&
+                        OSL_ENSURE( pSubTable->GetTableAdjust(sal_False)!= SVX_ADJUST_LEFT &&
                                 pSubTable->GetTableAdjust(sal_False)!= SVX_ADJUST_RIGHT,
                                 "links oder rechts ausgerichtete Tabellen gehoehren in Rahmen" );
 
@@ -4075,7 +4053,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
                             pSubTable->GetParentContents();
                         if( pParentContents )
                         {
-                            ASSERT( !pSaveStruct->IsInSection(),
+                            OSL_ENSURE( !pSaveStruct->IsInSection(),
                                     "Wo ist die Section geblieben" );
 
                             // Wenn jetzt keine Tabelle kommt haben wir eine
@@ -4088,7 +4066,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
 
                         if( pSubTable->GetContext() )
                         {
-                            ASSERT( !pSubTable->GetContext()->GetFrmFmt(),
+                            OSL_ENSURE( !pSubTable->GetContext()->GetFrmFmt(),
                                     "Tabelle steht im Rahmen" );
 
                             if( pCapStNd && pSubTable->IsTopCaption() )
@@ -4172,7 +4150,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
             break;
         }
 
-        ASSERT( !bPending || !pPendStack,
+        OSL_ENSURE( !bPending || !pPendStack,
                 "SwHTMLParser::BuildTableCell: Es gibt wieder einen Pend-Stack" );
         bPending = sal_False;
         if( IsParserWorking() )
@@ -4199,7 +4177,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
     if( !pSaveStruct->GetFirstContents() ||
         (!pSaveStruct->IsInSection() && !pCurTable->HasColTags()) )
     {
-        ASSERT( pSaveStruct->GetFirstContents() ||
+        OSL_ENSURE( pSaveStruct->GetFirstContents() ||
                 !pSaveStruct->IsInSection(),
                 "Section oder nicht, das ist hier die Frage" );
         const SwStartNode *pStNd =
@@ -4376,7 +4354,7 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, sal_Bool bReadOptions,
 
         nToken = FilterToken( nToken );
 
-        ASSERT( pPendStack || !bCallNextToken ||
+        OSL_ENSURE( pPendStack || !bCallNextToken ||
                 pCurTable->GetContext() || pCurTable->HasParentSection(),
                 "Wo ist die Section gebieben?" );
         if( !pPendStack && bCallNextToken &&
@@ -4394,10 +4372,7 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, sal_Bool bReadOptions,
                 SkipToken( -1 );
                 bDone = sal_True;
             }
-//          else
-//          {
-//              NextToken( nToken );
-//          }
+
             break;
         case HTML_TABLEROW_ON:
         case HTML_THEAD_ON:
@@ -4463,7 +4438,7 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, sal_Bool bReadOptions,
             break;
         }
 
-        ASSERT( !bPending || !pPendStack,
+        OSL_ENSURE( !bPending || !pPendStack,
                 "SwHTMLParser::BuildTableRow: Es gibt wieder einen Pend-Stack" );
         bPending = sal_False;
         if( IsParserWorking() )
@@ -4555,7 +4530,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
 
         nToken = FilterToken( nToken );
 
-        ASSERT( pPendStack || !bCallNextToken ||
+        OSL_ENSURE( pPendStack || !bCallNextToken ||
                 pCurTable->GetContext() || pCurTable->HasParentSection(),
                 "Wo ist die Section gebieben?" );
         if( !pPendStack && bCallNextToken &&
@@ -4573,10 +4548,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
                 SkipToken( -1 );
                 bDone = sal_True;
             }
-//          else
-//          {
-//              NextToken( nToken );
-//          }
+
             break;
         case HTML_THEAD_ON:
         case HTML_TFOOT_ON:
@@ -4626,7 +4598,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
             NextToken( nToken );
         }
 
-        ASSERT( !bPending || !pPendStack,
+        OSL_ENSURE( !bPending || !pPendStack,
                 "SwHTMLParser::BuildTableSection: Es gibt wieder einen Pend-Stack" );
         bPending = sal_False;
         if( IsParserWorking() )
@@ -4753,7 +4725,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
 
         nToken = FilterToken( nToken );
 
-        ASSERT( pPendStack || !bCallNextToken ||
+        OSL_ENSURE( pPendStack || !bCallNextToken ||
                 pCurTable->GetContext() || pCurTable->HasParentSection(),
                 "Wo ist die Section gebieben?" );
         if( !pPendStack && bCallNextToken &&
@@ -4771,10 +4743,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
                 SkipToken( -1 );
                 bDone = sal_True;
             }
-//          else
-//          {
-//              NextToken( nToken );
-//          }
+
             break;
         case HTML_COLGROUP_ON:
         case HTML_THEAD_ON:
@@ -4846,7 +4815,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
             NextToken( nToken );
         }
 
-        ASSERT( !bPending || !pPendStack,
+        OSL_ENSURE( !bPending || !pPendStack,
                 "SwHTMLParser::BuildTableColGrp: Es gibt wieder einen Pend-Stack" );
         bPending = sal_False;
         if( IsParserWorking() )
@@ -4926,7 +4895,7 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
         delete pPendStack;
         pPendStack = pTmp;
         nToken = pPendStack ? pPendStack->nToken : GetSaveToken();
-        ASSERT( !pPendStack, "Wo kommt hier ein Pending-Stack her?" );
+        OSL_ENSURE( !pPendStack, "Wo kommt hier ein Pending-Stack her?" );
 
         SaveState( nToken );
     }
@@ -5030,7 +4999,7 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
                 delete pPendStack;
                 pPendStack = pTmp;
 
-                ASSERT( !pTmp, "weiter kann es nicht gehen!" );
+                OSL_ENSURE( !pTmp, "weiter kann es nicht gehen!" );
                 nNxtToken = 0;  // neu lesen
             }
 
@@ -5123,10 +5092,10 @@ void _TblSaveStruct::MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pDoc
     pCurTable->MakeTable( 0, nWidth );
 
     _HTMLTableContext *pTCntxt = pCurTable->GetContext();
-    ASSERT( pTCntxt, "Wo ist der Tabellen-Kontext" );
+    OSL_ENSURE( pTCntxt, "Wo ist der Tabellen-Kontext" );
 
     SwTableNode *pTblNd = pTCntxt->GetTableNode();
-    ASSERT( pTblNd, "Wo ist der Tabellen-Node" );
+    OSL_ENSURE( pTblNd, "Wo ist der Tabellen-Node" );
 
     if( pDoc->GetRootFrm() && pTblNd )
     {
@@ -5143,7 +5112,7 @@ void _TblSaveStruct::MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pDoc
         {
             pTblNd->DelFrms();
             SwNodeIndex aIdx( *pTblNd->EndOfSectionNode(), 1 );
-            ASSERT( aIdx.GetIndex() <= pTCntxt->GetPos()->nNode.GetIndex(),
+            OSL_ENSURE( aIdx.GetIndex() <= pTCntxt->GetPos()->nNode.GetIndex(),
                     "unerwarteter Node fuer das Tabellen-Layout" );
             pTblNd->MakeFrms( &aIdx );
         }
@@ -5351,7 +5320,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
 
         nToken = FilterToken( nToken );
 
-        ASSERT( pPendStack || !bCallNextToken ||
+        OSL_ENSURE( pPendStack || !bCallNextToken ||
                 pCurTable->GetContext() || pCurTable->HasParentSection(),
                 "Wo ist die Section gebieben?" );
         if( !pPendStack && bCallNextToken &&
@@ -5371,10 +5340,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
                 SkipToken( -1 );
                 bDone = sal_True;
             }
-//          else
-//          {
-//              NextToken( nToken );
-//          }
+
             break;
         case HTML_TABLE_OFF:
             bDone = sal_True;
@@ -5424,7 +5390,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
             break;
         }
 
-        ASSERT( !bPending || !pPendStack,
+        OSL_ENSURE( !bPending || !pPendStack,
                 "SwHTMLParser::BuildTable: Es gibt wieder einen Pend-Stack" );
         bPending = sal_False;
         if( IsParserWorking() )
@@ -5480,8 +5446,8 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
                     sal_Bool bTop = pTable->IsTopCaption();
                     SwStartNode *pTblStNd = pTCntxt->GetTableNode();
 
-                    ASSERT( pTblStNd, "Wo ist der Tabellen-Node" );
-                    ASSERT( pTblStNd==pPam->GetNode()->FindTableNode(),
+                    OSL_ENSURE( pTblStNd, "Wo ist der Tabellen-Node" );
+                    OSL_ENSURE( pTblStNd==pPam->GetNode()->FindTableNode(),
                             "Stehen wir in der falschen Tabelle?" );
 
                     SwNode* pNd;
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index 4ea8dea98e6d..c44f9c6d3f14 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -63,12 +63,11 @@
 #include <htmlnum.hxx>
 #include <wrthtml.hxx>
 #include <wrtswtbl.hxx>
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 #include <viewsh.hxx>
 #include <viewopt.hxx>
 #endif
 
-//#define MAX_DEPTH (USHRT_MAX)
 #define MAX_DEPTH (3)
 
 using namespace ::com::sun::star;
@@ -146,7 +145,7 @@ void SwHTMLWrtTable::PixelizeBorders()
 sal_Bool SwHTMLWrtTable::HasTabBackground( const SwTableBox& rBox,
                         sal_Bool bTop, sal_Bool bBottom, sal_Bool bLeft, sal_Bool bRight )
 {
-    ASSERT( bTop || bBottom || bLeft || bRight,
+    OSL_ENSURE( bTop || bBottom || bLeft || bRight,
             "HasTabBackground: darf nicht aufgerufen werden" );
 
     sal_Bool bRet = sal_False;
@@ -181,7 +180,7 @@ sal_Bool SwHTMLWrtTable::HasTabBackground( const SwTableBox& rBox,
 sal_Bool SwHTMLWrtTable::HasTabBackground( const SwTableLine& rLine,
                         sal_Bool bTop, sal_Bool bBottom, sal_Bool bLeft, sal_Bool bRight )
 {
-    ASSERT( bTop || bBottom || bLeft || bRight,
+    OSL_ENSURE( bTop || bBottom || bLeft || bRight,
             "HasTabBackground: darf nicht aufgerufen werden" );
 
     sal_Bool bRet = sal_False;
@@ -280,10 +279,11 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
     if ( !nRowSpan )
         return;
 
+#ifndef PURE_HTML
     SwWriteTableCol *pCol = aCols[nCol];
+#endif
 
-//  sal_Bool bOutWidth = nColSpan>1 || pCol->GetOutWidth();
-    sal_Bool bOutWidth = sal_True; //nColSpan==1 && pCol->GetOutWidth();
+    sal_Bool bOutWidth = sal_True;
 
     const SwStartNode* pSttNd = pBox->GetSttNd();
     sal_Bool bHead = sal_False;
@@ -674,7 +674,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
         }
         else
         {
-            ASSERT( Application::GetDefaultDevice(), "kein Application-Window!?" );
+            OSL_ENSURE( Application::GetDefaultDevice(), "kein Application-Window!?" );
             sOut += "100%";
         }
     }
@@ -729,9 +729,6 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
             case 4:  pFrame = OOO_STRING_SVTOOLS_HTML_TF_lhs        ;break;
             case 8:  pFrame = OOO_STRING_SVTOOLS_HTML_TF_rhs        ;break;
             case 12: pFrame = OOO_STRING_SVTOOLS_HTML_TF_vsides ;break;
-            //FRAME=BOX ist der default wenn BORDER>0
-            //case 15:
-            //default: pFrame = OOO_STRING_SVTOOLS_HTML_TF_box      ;break; // geht nicht
         };
         if( pFrame )
             (((sOut += ' ' ) += OOO_STRING_SVTOOLS_HTML_O_frame ) += '=') += pFrame;
@@ -1081,7 +1078,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
 
     if( bCheckDefList )
     {
-        ASSERT( !rHTMLWrt.GetNumInfo().GetNumRule() ||
+        OSL_ENSURE( !rHTMLWrt.GetNumInfo().GetNumRule() ||
                 rHTMLWrt.GetNextNumInfo(),
                 "NumInfo fuer naechsten Absatz fehlt!" );
         const SvxLRSpaceItem& aLRItem = pFmt->GetLRSpace();
diff --git a/sw/source/filter/html/makefile.mk b/sw/source/filter/html/makefile.mk
index b99cc6789424..f64a6d593fd2 100644
--- a/sw/source/filter/html/makefile.mk
+++ b/sw/source/filter/html/makefile.mk
@@ -44,8 +44,13 @@ CDEFS=$(CDEFS) -Dmydebug
 # --- Files --------------------------------------------------------
 
 SLOFILES =  \
-        $(SLO)$/css1atr.obj \
+        $(EXCEPTIONSFILES) \
         $(SLO)$/css1kywd.obj \
+        $(SLO)$/htmlflyt.obj
+
+EXCEPTIONSFILES = \
+        $(SLO)$/SwAppletImpl.obj \
+        $(SLO)$/css1atr.obj \
         $(SLO)$/htmlatr.obj \
         $(SLO)$/htmlbas.obj \
         $(SLO)$/htmlcss1.obj \
@@ -54,7 +59,6 @@ SLOFILES =  \
         $(SLO)$/htmlfld.obj \
         $(SLO)$/htmlfldw.obj \
         $(SLO)$/htmlfly.obj \
-        $(SLO)$/htmlflyt.obj \
         $(SLO)$/htmlform.obj \
         $(SLO)$/htmlforw.obj \
         $(SLO)$/htmlftn.obj \
@@ -67,14 +71,6 @@ SLOFILES =  \
         $(SLO)$/parcss1.obj \
         $(SLO)$/svxcss1.obj \
         $(SLO)$/swhtml.obj \
-        $(SLO)$/wrthtml.obj \
-        $(SLO)$/SwAppletImpl.obj \
-
-EXCEPTIONSFILES = \
-        $(SLO)$/htmlfld.obj \
-        $(SLO)$/htmlplug.obj \
-        $(SLO)$/htmlsect.obj \
-        $(SLO)$/swhtml.obj \
         $(SLO)$/wrthtml.obj
 
 # --- Tagets -------------------------------------------------------
diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx
index ab9f16c36cc7..008596015716 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -174,7 +174,7 @@ CSS1Token CSS1Parser::GetNextToken()
                     } while( ('A' <= cNextCh && cNextCh <= 'Z') ||
                              ('a' <= cNextCh && cNextCh <= 'z') ||
                              ('0' <= cNextCh && cNextCh <= '9') ||
-                             '-'==cNextCh && !IsEOF() );
+                             ('-'==cNextCh && !IsEOF()) );
 
                     aToken += String(sTmpBuffer.makeStringAndClear());
 
@@ -272,7 +272,7 @@ CSS1Token CSS1Parser::GetNextToken()
                     } while( ('A' <= cNextCh && cNextCh <= 'Z') ||
                              ('a' <= cNextCh && cNextCh <= 'z') ||
                              ('0' <= cNextCh && cNextCh <= '9') ||
-                             '-' == cNextCh && !IsEOF() );
+                             ('-' == cNextCh && !IsEOF()) );
 
                     aToken += String(sTmpBuffer.makeStringAndClear());
 
@@ -424,7 +424,7 @@ CSS1Token CSS1Parser::GetNextToken()
 
                         // Ist es eine Einheit?
                         const sal_Char *pCmp1 = 0, *pCmp2 = 0, *pCmp3 = 0;
-                        double nScale1 = 1., nScale2 = 1., nScale3 = 1.;
+                        double nScale1 = 1., nScale2 = 1.;
                         CSS1Token nToken1 = CSS1_LENGTH,
                                   nToken2 = CSS1_LENGTH,
                                   nToken3 = CSS1_LENGTH;
@@ -482,7 +482,7 @@ CSS1Token CSS1Parser::GetNextToken()
                         else if( pCmp3 &&
                                  aIdent.EqualsIgnoreCaseAscii(pCmp3) )
                         {
-                            nScale = nScale3;
+                            nScale =  1.; // nScale3
                             nRet = nToken3;
                         }
                         else
@@ -525,8 +525,6 @@ CSS1Token CSS1Parser::GetNextToken()
             nRet = bPrevWhiteSpace ? CSS1_DOT_W_WS : CSS1_DOT_WO_WS;
             break;
 
-        // case '/': siehe oben
-
         case '+': // '+'
             nRet = CSS1_PLUS;
             break;
@@ -1157,6 +1155,9 @@ CSS1Expression *CSS1Parser::ParseDeclaration( String& rProperty )
 /*  */
 
 CSS1Parser::CSS1Parser()
+    : nValue(0)
+    , eState(CSS1_PAR_ACCEPTED)
+    , nToken(CSS1_NULL)
 {
 }
 
@@ -1406,7 +1407,6 @@ BOOL CSS1Expression::GetColor( Color &rColor ) const
                         nColor += c;
                 }
             }
-            // bRet = i==6;
             bRet = TRUE;
         }
         break;
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index d588171c8720..d72231e467e5 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -856,8 +856,6 @@ BOOL SvxCSS1Parser::ParseStyleSheet( const String& rIn )
 
     BOOL bSuccess = CSS1Parser::ParseStyleSheet( rIn );
 
-    // die bisher geparsten Items auf die Styles verteilt werden
-//  pSheetPropInfo->CreateBoxItem( *pSheetItemSet, GetDfltBorderDist() );
     for( USHORT i=0; i<aSelectors.Count(); i++ )
     {
         StyleParsed( aSelectors[i], *pSheetItemSet, *pSheetPropInfo );
@@ -884,7 +882,6 @@ BOOL SvxCSS1Parser::ParseStyleOption( const String& rIn,
 
     BOOL bSuccess = CSS1Parser::ParseStyleOption( rIn );
     rItemSet.ClearItem( aItemIds.nDirection );
-//  pPropInfo->CreateBoxItem( *pItemSet, GetDfltBorderDist() );
 
     pItemSet = 0;
     pPropInfo = 0;
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 79003eaa671a..d56eba93d4e3 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <sfx2/sfx.hrc>
 #include <svx/svxids.hrc>
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 #include <stdlib.h>
 #endif
 #include <hintids.hxx>
@@ -193,7 +193,7 @@ String HTMLReader::GetTemplateName() const
     if( !bSet )
     {
         sTemplate.Erase();
-        ASSERT( !this,
+        OSL_ENSURE( !this,
             "Die html.vor befindet sich nicht mehr im definierten Directory!");
     }
 
@@ -202,7 +202,7 @@ String HTMLReader::GetTemplateName() const
 
 int HTMLReader::SetStrmStgPtr()
 {
-    ASSERT( pMedium, "Wo ist das Medium??" );
+    OSL_ENSURE( pMedium, "Wo ist das Medium??" );
 
     if( pMedium->IsRemote() || !pMedium->IsStorage() )
     {
@@ -218,7 +218,7 @@ ULONG HTMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPam, const
 {
     if( !pStrm )
     {
-        ASSERT( pStrm, "HTML-Read ohne Stream" );
+        OSL_ENSURE( pStrm, "HTML-Read ohne Stream" );
         return ERR_SWG_READ_ERROR;
     }
 
@@ -304,7 +304,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn,
     // <--
     nOpenParaToken( 0 ),
     eJumpTo( JUMPTO_NONE ),
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     nContinue( 0 ),
 #endif
     eParaAdjust( SVX_ADJUST_END ),
@@ -324,7 +324,6 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn,
     bSelect( FALSE ),
     bInFootEndNoteAnchor( FALSE ),
     bInFootEndNoteSymbol( FALSE ),
-//    bIgnoreHTMLComments( bNoHTMLComments )
     bIgnoreHTMLComments( bNoHTMLComments ),
     bRemoveHidden( FALSE ),
     pTempViewFrame(0)
@@ -434,8 +433,8 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn,
 
 __EXPORT SwHTMLParser::~SwHTMLParser()
 {
-#ifdef DBG_UTIL
-    ASSERT( !nContinue, "DTOR im Continue - Das geht schief!!!" );
+#if OSL_DEBUG_LEVEL > 1
+    OSL_ENSURE( !nContinue, "DTOR im Continue - Das geht schief!!!" );
 #endif
     BOOL bAsync = pDoc->IsInLoadAsynchron();
     pDoc->SetInLoadAsynchron( FALSE );
@@ -466,7 +465,7 @@ __EXPORT SwHTMLParser::~SwHTMLParser()
 
     if( aSetAttrTab.Count() )
     {
-        ASSERT( !aSetAttrTab.Count(),"Es stehen noch Attribute auf dem Stack" );
+        OSL_ENSURE( !aSetAttrTab.Count(),"Es stehen noch Attribute auf dem Stack" );
         aSetAttrTab.DeleteAndDestroy( 0, aSetAttrTab.Count() );
     }
 
@@ -476,11 +475,10 @@ __EXPORT SwHTMLParser::~SwHTMLParser()
     DeleteFormImpl();
     DeleteFootEndNoteImpl();
 
-    ASSERT( !pTable, "Es existiert noch eine offene Tabelle" );
+    OSL_ENSURE( !pTable, "Es existiert noch eine offene Tabelle" );
     delete pImageMaps;
-    //delete pTable;
 
-    ASSERT( !pPendStack,
+    OSL_ENSURE( !pPendStack,
             "SwHTMLParser::~SwHTMLParser: Hier sollte es keinen Pending-Stack mehr geben" );
     while( pPendStack )
     {
@@ -585,15 +583,15 @@ SvParserState __EXPORT SwHTMLParser::CallParser()
 
 void __EXPORT SwHTMLParser::Continue( int nToken )
 {
-#ifdef DBG_UTIL
-    ASSERT( !nContinue, "Continue im Continue - Das sollte doch nicht sein, oder?" );
+#if OSL_DEBUG_LEVEL > 1
+    OSL_ENSURE( !nContinue, "Continue im Continue - Das sollte doch nicht sein, oder?" );
     nContinue++;
 #endif
 
     // Wenn der Import (vom SFX) abgebrochen wurde, wird ein Fehler
     // gesetzt aber trotzdem noch weiter gemacht, damit vernuenftig
     // aufgeraeumt wird.
-    ASSERT( SVPAR_ERROR!=eState,
+    OSL_ENSURE( SVPAR_ERROR!=eState,
             "SwHTMLParser::Continue: bereits ein Fehler gesetzt" );
     if( pDoc->GetDocShell() && pDoc->GetDocShell()->IsAbortingImport() )
         eState = SVPAR_ERROR;
@@ -611,7 +609,7 @@ void __EXPORT SwHTMLParser::Continue( int nToken )
         bViewCreated = TRUE;
         pDoc->SetInLoadAsynchron( TRUE );
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         nContinue--;
 #endif
 
@@ -639,11 +637,11 @@ void __EXPORT SwHTMLParser::Continue( int nToken )
     // beendet wird.
     if( SVPAR_ERROR == eState )
     {
-        ASSERT( !pPendStack || pPendStack->nToken,
+        OSL_ENSURE( !pPendStack || pPendStack->nToken,
                 "SwHTMLParser::Continue: Pending-Stack ohne Token" );
         if( pPendStack && pPendStack->nToken )
             NextToken( pPendStack->nToken );
-        ASSERT( !pPendStack,
+        OSL_ENSURE( !pPendStack,
                 "SwHTMLParser::Continue: Es gibt wieder einen Pend-Stack" );
     }
     else
@@ -685,7 +683,7 @@ void __EXPORT SwHTMLParser::Continue( int nToken )
             while( GetNumInfo().GetNumRule() )
                 EndNumBulList();
 
-            ASSERT( !nContextStMin, "Es gibt geschuetzte Kontexte" );
+            OSL_ENSURE( !nContextStMin, "Es gibt geschuetzte Kontexte" );
             nContextStMin = 0;
             while( aContexts.Count() )
             {
@@ -721,11 +719,11 @@ void __EXPORT SwHTMLParser::Continue( int nToken )
                     pPam->GetPoint()->nContent.Assign( pTxtNode, nStt );
                 }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 // !!! sollte nicht moeglich sein, oder ??
-ASSERT( pSttNdIdx->GetIndex()+1 != pPam->GetBound( TRUE ).nNode.GetIndex(),
+OSL_ENSURE( pSttNdIdx->GetIndex()+1 != pPam->GetBound( TRUE ).nNode.GetIndex(),
             "Pam.Bound1 steht noch im Node" );
-ASSERT( pSttNdIdx->GetIndex()+1 != pPam->GetBound( FALSE ).nNode.GetIndex(),
+OSL_ENSURE( pSttNdIdx->GetIndex()+1 != pPam->GetBound( FALSE ).nNode.GetIndex(),
             "Pam.Bound2 steht noch im Node" );
 
 if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( TRUE ).nNode.GetIndex() )
@@ -919,7 +917,7 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( FALSE ).nNode.GetIndex() )
     // wieder rekonstruieren.
     CallEndAction( TRUE );
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     nContinue--;
 #endif
 }
@@ -941,7 +939,7 @@ void SwHTMLParser::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
 
 void SwHTMLParser::DocumentDetected()
 {
-    ASSERT( !bDocInitalized, "DocumentDetected mehrfach aufgerufen" );
+    OSL_ENSURE( !bDocInitalized, "DocumentDetected mehrfach aufgerufen" );
     bDocInitalized = TRUE;
     if( IsNewDoc() )
     {
@@ -968,13 +966,13 @@ void __EXPORT SwHTMLParser::NextToken( int nToken )
         // wurde der Import vom SFX abgebrochen? Wenn ein Pending-Stack
         // existiert den noch aufraumen
         eState = SVPAR_ERROR;
-        ASSERT( !pPendStack || pPendStack->nToken,
+        OSL_ENSURE( !pPendStack || pPendStack->nToken,
                 "SwHTMLParser::NextToken: Pending-Stack ohne Token" );
         if( 1 == pDoc->getReferenceCount() || !pPendStack )
             return ;
     }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     if( pPendStack )
     {
         switch( nToken )
@@ -991,7 +989,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken )
         case HTML_SELECT_OFF:
             break;
         default:
-            ASSERT( !pPendStack, "Unbekanntes Token fuer Pending-Stack" );
+            OSL_ENSURE( !pPendStack, "Unbekanntes Token fuer Pending-Stack" );
             break;
         }
     }
@@ -1101,7 +1099,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken )
                 break;
 
             default:
-                ASSERT( !this, "SwHTMLParser::NextToken: ungueltiges Tag" );
+                OSL_ENSURE( !this, "SwHTMLParser::NextToken: ungueltiges Tag" );
                 break;
             }
 
@@ -1700,7 +1698,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken )
         {
             if( nOpenParaToken )
                 EndPara();
-            ASSERT( !pTable, "Tabelle in Tabelle darf hier nicht vorkommen" );
+            OSL_ENSURE( !pTable, "Tabelle in Tabelle darf hier nicht vorkommen" );
             if( !pTable && (IsNewDoc() || !pPam->GetNode()->FindTableNode()) &&
                 (pPam->GetPoint()->nNode.GetIndex() >
                             pDoc->GetNodes().GetEndOfExtras().GetIndex() ||
@@ -2199,7 +2197,7 @@ BOOL SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, BOOL bUpdateNum )
                     {
                         const SwTxtNode *pTxtNd =
                             pAttr->GetSttPara().GetNode().GetTxtNode();
-                        ASSERT( pTxtNd, "No text node" );
+                        OSL_ENSURE( pTxtNd, "No text node" );
                         if( pTxtNd )
                         {
                             const String& rText = pTxtNd->GetTxt();
@@ -2284,11 +2282,7 @@ BOOL SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, BOOL bUpdateNum )
         if( GetNumInfo().GetDepth() )
         {
             BYTE nLvl = GetNumInfo().GetLevel();
-            // --> OD 2008-04-02 #refactorlists#
-//            SetNoNum (&nLvl, TRUE);
-//            SetNodeNum( nLvl);
             SetNodeNum( nLvl, false );
-            // <--
         }
         else
             pPam->GetNode()->GetTxtNode()->ResetAttr( RES_PARATR_NUMRULE );
@@ -2300,7 +2294,7 @@ BOOL SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, BOOL bUpdateNum )
     // Now it is time to get rid of all script dependent hints that are
     // equal to the settings in the style
     SwTxtNode *pTxtNd = rEndIdx.GetNode().GetTxtNode();
-    ASSERT( pTxtNd, "There is the txt node" );
+    OSL_ENSURE( pTxtNd, "There is the txt node" );
     sal_uInt16 nCntAttr = (pTxtNd  && pTxtNd->GetpSwpHints())
                             ? pTxtNd->GetSwpHints().Count() : 0;
     if( nCntAttr )
@@ -2367,7 +2361,7 @@ BOOL SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, BOOL bUpdateNum )
                 {
                     // The hint starts before another one ends.
                     // The hint in this case is not deleted
-                    ASSERT( pHt->GetEnd() && *pHt->GetEnd() <= aEndPos[nIdx],
+                    OSL_ENSURE( pHt->GetEnd() && *pHt->GetEnd() <= aEndPos[nIdx],
                             "hints aren't nested properly!" );
                 }
             }
@@ -2422,7 +2416,7 @@ void SwHTMLParser::Show()
     // - die eiegen View-Shell wieder gesetzt
     // - und Start-Action gerufen
 
-    ASSERT( SVPAR_WORKING==eState, "Show nicht im Working-State - Das kann ins Auge gehen" );
+    OSL_ENSURE( SVPAR_WORKING==eState, "Show nicht im Working-State - Das kann ins Auge gehen" );
     ViewShell *pOldVSh = CallEndAction();
 
     GetpApp()->Reschedule();
@@ -2452,7 +2446,7 @@ void SwHTMLParser::ShowStatline()
     // - die eiegen View-Shell wieder gesetzt
     // - ein Start/End-Action gerufen, wenn gescrollt wurde.
 
-    ASSERT( SVPAR_WORKING==eState, "ShowStatLine nicht im Working-State - Das kann ins Auge gehen" );
+    OSL_ENSURE( SVPAR_WORKING==eState, "ShowStatLine nicht im Working-State - Das kann ins Auge gehen" );
 
     // Laufbalkenanzeige
     if( !GetMedium() || !GetMedium()->IsRemote() )
@@ -2480,16 +2474,16 @@ void SwHTMLParser::ShowStatline()
 
 ViewShell *SwHTMLParser::CallStartAction( ViewShell *pVSh, BOOL bChkPtr )
 {
-    ASSERT( !pActionViewShell, "CallStartAction: ViewShell schon gesetzt" );
+    OSL_ENSURE( !pActionViewShell, "CallStartAction: ViewShell schon gesetzt" );
 
     if( !pVSh || bChkPtr )
     {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         ViewShell *pOldVSh = pVSh;
 #endif
         pDoc->GetEditShell( &pVSh );
-        ASSERT( !pVSh || !pOldVSh || pOldVSh == pVSh, "CallStartAction: Wer hat die ViewShell ausgetauscht?" );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( !pVSh || !pOldVSh || pOldVSh == pVSh, "CallStartAction: Wer hat die ViewShell ausgetauscht?" );
         if( pOldVSh && !pVSh )
             pVSh = 0;
 #endif
@@ -2513,7 +2507,7 @@ ViewShell *SwHTMLParser::CallEndAction( BOOL bChkAction, BOOL bChkPtr )
     {
         ViewShell *pVSh = 0;
         pDoc->GetEditShell( &pVSh );
-        ASSERT( !pVSh || pActionViewShell == pVSh,
+        OSL_ENSURE( !pVSh || pActionViewShell == pVSh,
                 "CallEndAction: Wer hat die ViewShell ausgetauscht?" );
 #if OSL_DEBUG_LEVEL > 1
         if( pActionViewShell && !pVSh )
@@ -2579,7 +2573,7 @@ ViewShell *SwHTMLParser::CheckActionViewShell()
 {
     ViewShell *pVSh = 0;
     pDoc->GetEditShell( &pVSh );
-    ASSERT( !pVSh || pActionViewShell == pVSh,
+    OSL_ENSURE( !pVSh || pActionViewShell == pVSh,
             "CheckActionViewShell: Wer hat die ViewShell ausgetauscht?" );
 #if OSL_DEBUG_LEVEL > 1
     if( pActionViewShell && !pVSh )
@@ -2650,7 +2644,7 @@ void SwHTMLParser::_SetAttr( BOOL bChkEnd, BOOL bBeforeTable,
             USHORT ii = aParaAttrs.Count();
             while( ii-- )
             {
-                ASSERT( pAttr != aParaAttrs[ii],
+                OSL_ENSURE( pAttr != aParaAttrs[ii],
                         "SetAttr: Attribut duerfte noch nicht gesetzt werden" );
                 aParaAttrs.Remove( ii );
             }
@@ -2691,7 +2685,7 @@ void SwHTMLParser::_SetAttr( BOOL bChkEnd, BOOL bBeforeTable,
                         pAttr->nSttCntnt = 0;
                     else
                     {
-                        ASSERT( !this, "SetAttr: GoNext() failed!" );
+                        OSL_ENSURE( !this, "SetAttr: GoNext() failed!" );
                         delete pAttr;
                         pAttr = pPrev;
                         continue; // break;
@@ -2719,7 +2713,7 @@ void SwHTMLParser::_SetAttr( BOOL bChkEnd, BOOL bBeforeTable,
                             pAttr->nEndCntnt = pCNd->Len();
                         else
                         {
-                            ASSERT( !this, "SetAttr: GoPrevious() failed!" );
+                            OSL_ENSURE( !this, "SetAttr: GoPrevious() failed!" );
                             pAttrPam->DeleteMark();
                             delete pAttr;
                             pAttr = pPrev;
@@ -2754,7 +2748,7 @@ void SwHTMLParser::_SetAttr( BOOL bChkEnd, BOOL bBeforeTable,
                         if( pAttrPam->GetMark()->nNode.GetIndex() !=
                             rEndIdx.GetIndex() )
                         {
-                            ASSERT( !pAttrPam->GetPoint()->nContent.GetIndex(),
+                            OSL_ENSURE( !pAttrPam->GetPoint()->nContent.GetIndex(),
                                     "Content-Position vor Tabelle nicht 0???" );
                             pAttrPam->Move( fnMoveBackward );
                         }
@@ -2821,7 +2815,7 @@ void SwHTMLParser::_SetAttr( BOOL bChkEnd, BOOL bBeforeTable,
                         pCNd->SetAttr( *pAttr->pItem );
                         break;
                     }
-                    ASSERT( !this,
+                    OSL_ENSURE( !this,
                             "LRSpace ueber mehrere Absaetze gesetzt!" );
                     // kein break (hier sollen wir trotzdem nie hinkommen;
                 default:
@@ -2850,7 +2844,7 @@ void SwHTMLParser::_SetAttr( BOOL bChkEnd, BOOL bBeforeTable,
         SwFrmFmt *pFrmFmt = aMoveFlyFrms[ --n ];
 
         const SwFmtAnchor& rAnchor = pFrmFmt->GetAnchor();
-        ASSERT( FLY_AT_PARA == rAnchor.GetAnchorId(),
+        OSL_ENSURE( FLY_AT_PARA == rAnchor.GetAnchorId(),
                 "Nur Auto-Rahmen brauchen eine Spezialbehandlung" );
         const SwPosition *pFlyPos = rAnchor.GetCntntAnchor();
         ULONG nFlyParaIdx = pFlyPos->nNode.GetIndex();
@@ -2910,8 +2904,8 @@ void SwHTMLParser::_SetAttr( BOOL bChkEnd, BOOL bBeforeTable,
         if( bBeforeTable &&
             pAttrPam->GetPoint()->nNode.GetIndex() == rEndIdx.GetIndex() )
         {
-            ASSERT( !bBeforeTable, "Aha, der Fall tritt also doch ein" );
-            ASSERT( !pAttrPam->GetPoint()->nContent.GetIndex(),
+            OSL_ENSURE( !bBeforeTable, "Aha, der Fall tritt also doch ein" );
+            OSL_ENSURE( !pAttrPam->GetPoint()->nContent.GetIndex(),
                     "Content-Position vor Tabelle nicht 0???" );
             // !!!
             pAttrPam->Move( fnMoveBackward );
@@ -2948,11 +2942,11 @@ void SwHTMLParser::NewAttr( _HTMLAttr **ppAttr, const SfxPoolItem& rItem )
 void SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr,
                             BOOL bChkEmpty )
 {
-    ASSERT( !ppDepAttr, "SwHTMLParser::EndAttr: ppDepAttr-Feature ungetestet?" );
+    OSL_ENSURE( !ppDepAttr, "SwHTMLParser::EndAttr: ppDepAttr-Feature ungetestet?" );
     // Der Listenkopf ist im Attribut gespeichert
     _HTMLAttr **ppHead = pAttr->ppHead;
 
-    ASSERT( ppHead, "keinen Attributs-Listenkopf gefunden!" );
+    OSL_ENSURE( ppHead, "keinen Attributs-Listenkopf gefunden!" );
 
     // die aktuelle Psoition als Ende-Position merken
     const SwNodeIndex* pEndIdx = &pPam->GetPoint()->nNode;
@@ -2972,17 +2966,12 @@ void SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr,
         while( pLast && pLast->GetNext() != pAttr )
             pLast = pLast->GetNext();
 
-        ASSERT( pLast, "Attribut nicht in eigener Liste gefunden!" );
-
-        // das Attribut nicht an der PaM-Psoition beenden, sondern da,
-        // wo das danch gestartete Attribut anfing???
-        //pEndIdx = &pPrev->GetSttPara();
-        //nEndCnt = pPrev->GetSttCnt();
+        OSL_ENSURE( pLast, "Attribut nicht in eigener Liste gefunden!" );
     }
 
     BOOL bMoveBack = FALSE;
     USHORT nWhich = pAttr->pItem->Which();
-    if( /*!pLast &&*/ !nEndCnt && RES_PARATR_BEGIN <= nWhich &&
+    if( !nEndCnt && RES_PARATR_BEGIN <= nWhich &&
         *pEndIdx != pAttr->GetSttPara() )
     {
         // dann eine Cntntnt Position zurueck!
@@ -3019,7 +3008,7 @@ void SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr,
     {
         const SwTxtNode *pTxtNd = pAttr->GetSttPara().GetNode()
                                             .GetTxtNode();
-        ASSERT( pTxtNd, "No text node" );
+        OSL_ENSURE( pTxtNd, "No text node" );
         const String& rText = pTxtNd->GetTxt();
         sal_uInt16 nScriptTxt = pBreakIt->GetBreakIter()->getScriptType(
                         rText, pAttr->GetSttCnt() );
@@ -3116,7 +3105,7 @@ void SwHTMLParser::DeleteAttr( _HTMLAttr* pAttr )
 {
     // Hier darf es keine vorlauefigen Absatz-Attribute geben, den die
     // koennten jetzt gesetzt werden und dann sind die Zeiger ungueltig!!!
-    ASSERT( !aParaAttrs.Count(),
+    OSL_ENSURE( !aParaAttrs.Count(),
             "Hoechste Gefahr: Es gibt noch nicht-endgueltige Absatz-Attribute" );
     if( aParaAttrs.Count() )
         aParaAttrs.Remove( 0, aParaAttrs.Count() );
@@ -3124,7 +3113,7 @@ void SwHTMLParser::DeleteAttr( _HTMLAttr* pAttr )
     // Der Listenkopf ist im Attribut gespeichert
     _HTMLAttr **ppHead = pAttr->ppHead;
 
-    ASSERT( ppHead, "keinen Attributs-Listenkopf gefunden!" );
+    OSL_ENSURE( ppHead, "keinen Attributs-Listenkopf gefunden!" );
 
     // Wird das zueltzt gestartete oder ein frueher gestartetes Attribut
     // entfernt?
@@ -3140,7 +3129,7 @@ void SwHTMLParser::DeleteAttr( _HTMLAttr* pAttr )
         while( pLast && pLast->GetNext() != pAttr )
             pLast = pLast->GetNext();
 
-        ASSERT( pLast, "Attribut nicht in eigener Liste gefunden!" );
+        OSL_ENSURE( pLast, "Attribut nicht in eigener Liste gefunden!" );
     }
 
     // nun das Attrubut entfernen
@@ -3172,7 +3161,7 @@ void SwHTMLParser::SaveAttrTab( _HTMLAttrTable& rNewAttrTab )
 {
     // Hier darf es keine vorlauefigen Absatz-Attribute geben, den die
     // koennten jetzt gesetzt werden und dann sind die Zeiger ungueltig!!!
-    ASSERT( !aParaAttrs.Count(),
+    OSL_ENSURE( !aParaAttrs.Count(),
             "Hoechste Gefahr: Es gibt noch nicht-endgueltige Absatz-Attribute" );
     if( aParaAttrs.Count() )
         aParaAttrs.Remove( 0, aParaAttrs.Count() );
@@ -3201,7 +3190,7 @@ void SwHTMLParser::SplitAttrTab( _HTMLAttrTable& rNewAttrTab,
 {
     // Hier darf es keine vorlauefigen Absatz-Attribute geben, den die
     // koennten jetzt gesetzt werden und dann sind die Zeiger ungueltig!!!
-    ASSERT( !aParaAttrs.Count(),
+    OSL_ENSURE( !aParaAttrs.Count(),
             "Hoechste Gefahr: Es gibt noch nicht-endgueltige Absatz-Attribute" );
     if( aParaAttrs.Count() )
         aParaAttrs.Remove( 0, aParaAttrs.Count() );
@@ -3305,7 +3294,7 @@ void SwHTMLParser::RestoreAttrTab( const _HTMLAttrTable& rNewAttrTab,
 {
     // Hier darf es keine vorlauefigen Absatz-Attribute geben, den die
     // koennten jetzt gesetzt werden und dann sind die Zeiger ungueltig!!!
-    ASSERT( !aParaAttrs.Count(),
+    OSL_ENSURE( !aParaAttrs.Count(),
             "Hoechste Gefahr: Es gibt noch nicht-endgueltige Absatz-Attribute" );
     if( aParaAttrs.Count() )
         aParaAttrs.Remove( 0, aParaAttrs.Count() );
@@ -3316,7 +3305,7 @@ void SwHTMLParser::RestoreAttrTab( const _HTMLAttrTable& rNewAttrTab,
     for( USHORT nCnt = sizeof( _HTMLAttrTable ) / sizeof( _HTMLAttr* );
         nCnt--; (++pTbl, ++pSaveTbl) )
     {
-        ASSERT( !*pTbl, "Die Attribut-Tabelle ist nicht leer!" );
+        OSL_ENSURE( !*pTbl, "Die Attribut-Tabelle ist nicht leer!" );
 
         const SwPosition *pPos = pPam->GetPoint();
         const SwNodeIndex& rSttPara = pPos->nNode;
@@ -3327,7 +3316,7 @@ void SwHTMLParser::RestoreAttrTab( const _HTMLAttrTable& rNewAttrTab,
         _HTMLAttr *pAttr = *pTbl;
         while( pAttr )
         {
-            ASSERT( !pAttr->GetPrev() || !pAttr->GetPrev()->ppHead,
+            OSL_ENSURE( !pAttr->GetPrev() || !pAttr->GetPrev()->ppHead,
                     "Previous-Attribut hat noch einen Header" );
             pAttr->SetHead( pTbl );
             if( bSetNewStart )
@@ -3474,12 +3463,12 @@ void SwHTMLParser::NewStdAttr( int nToken,
         InsertAttr( ppAttr ,rItem, pCntxt );
         if( pItem2 )
         {
-            ASSERT( ppAttr2, "missing table entry for item2" );
+            OSL_ENSURE( ppAttr2, "missing table entry for item2" );
             InsertAttr( ppAttr2, *pItem2, pCntxt );
         }
         if( pItem3 )
         {
-            ASSERT( ppAttr3, "missing table entry for item3" );
+            OSL_ENSURE( ppAttr3, "missing table entry for item3" );
             InsertAttr( ppAttr3, *pItem3, pCntxt );
         }
     }
@@ -3690,7 +3679,7 @@ void SwHTMLParser::NewFontAttr( int nToken )
             nFontHeight = aFontHeights[nSize-1];
     }
 
-    ASSERT( !nSize == !nFontHeight, "HTML-Font-Size != Font-Height" );
+    OSL_ENSURE( !nSize == !nFontHeight, "HTML-Font-Size != Font-Height" );
 
     String aFontName, aStyleName;
     FontFamily eFamily = FAMILY_DONTKNOW;   // Family und Pitch,
@@ -3868,7 +3857,7 @@ void SwHTMLParser::NewPara()
 
         if( ParseStyleOptions( aStyle, aId, aEmptyStr, aItemSet, aPropInfo, &aLang, &aDir ) )
         {
-            ASSERT( !aClass.Len() || !pCSS1Parser->GetClass( aClass ),
+            OSL_ENSURE( !aClass.Len() || !pCSS1Parser->GetClass( aClass ),
                     "Class wird nicht beruecksichtigt" );
             DoPositioning( aItemSet, aPropInfo, pCntxt );
             InsertAttrs( aItemSet, aPropInfo, pCntxt );
@@ -3887,7 +3876,7 @@ void SwHTMLParser::NewPara()
     // Laufbalkenanzeige
     ShowStatline();
 
-    ASSERT( !nOpenParaToken, "Jetzt geht ein offenes Absatz-Element verloren" );
+    OSL_ENSURE( !nOpenParaToken, "Jetzt geht ein offenes Absatz-Element verloren" );
     nOpenParaToken = HTML_PARABREAK_ON;
 }
 
@@ -3895,10 +3884,10 @@ void SwHTMLParser::EndPara( BOOL bReal )
 {
     if( HTML_LI_ON==nOpenParaToken && pTable )
     {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         const SwNumRule *pNumRule = pPam->GetNode()->GetTxtNode()->GetNumRule();
+        OSL_ENSURE( pNumRule, "Wo ist die Numrule geblieben" );
 #endif
-        ASSERT( pNumRule, "Wo ist die Numrule geblieben" );
     }
 
     // leere Absaetze werden von Netscape uebersprungen, von uns jetzt auch
@@ -4003,7 +3992,7 @@ void SwHTMLParser::NewHeading( int nToken )
 
         if( ParseStyleOptions( aStyle, aId, aEmptyStr, aItemSet, aPropInfo, &aLang, &aDir ) )
         {
-            ASSERT( !aClass.Len() || !pCSS1Parser->GetClass( aClass ),
+            OSL_ENSURE( !aClass.Len() || !pCSS1Parser->GetClass( aClass ),
                     "Class wird nicht beruecksichtigt" );
             DoPositioning( aItemSet, aPropInfo, pCntxt );
             InsertAttrs( aItemSet, aPropInfo, pCntxt );
@@ -4119,7 +4108,7 @@ void SwHTMLParser::NewTxtFmtColl( int nToken, USHORT nColl )
         eMode = AM_SOFTNOSPACE;
         break;
     default:
-        ASSERT( !this, "unbekannte Vorlage" );
+        OSL_ENSURE( !this, "unbekannte Vorlage" );
         break;
     }
     if( pPam->GetPoint()->nContent.GetIndex() )
@@ -4138,7 +4127,7 @@ void SwHTMLParser::NewTxtFmtColl( int nToken, USHORT nColl )
 
         if( ParseStyleOptions( aStyle, aId, aEmptyStr, aItemSet, aPropInfo, &aLang, &aDir ) )
         {
-            ASSERT( !aClass.Len() || !pCSS1Parser->GetClass( aClass ),
+            OSL_ENSURE( !aClass.Len() || !pCSS1Parser->GetClass( aClass ),
                     "Class wird nicht beruecksichtigt" );
             DoPositioning( aItemSet, aPropInfo, pCntxt );
             InsertAttrs( aItemSet, aPropInfo, pCntxt );
@@ -4172,7 +4161,7 @@ void SwHTMLParser::EndTxtFmtColl( int nToken )
         eMode = AM_SOFTNOSPACE;
         break;
     default:
-        ASSERT( !this, "unbekannte Vorlage" );
+        OSL_ENSURE( !this, "unbekannte Vorlage" );
         break;
     }
     if( pPam->GetPoint()->nContent.GetIndex() )
@@ -4354,7 +4343,7 @@ void SwHTMLParser::NewDefListItem( int nToken )
     if( !bInDefList )
     {
         nDefListDeep++;
-        ASSERT( !nOpenParaToken,
+        OSL_ENSURE( !nOpenParaToken,
                 "Jetzt geht ein offenes Absatz-Element verloren" );
         nOpenParaToken = static_cast< sal_uInt16 >(nToken);
     }
@@ -4753,7 +4742,7 @@ void SwHTMLParser::NewCharFmt( int nToken )
 
     // die Vorlage setzen und im Kontext merken
     SwCharFmt* pCFmt = pCSS1Parser->GetChrFmt( static_cast< sal_uInt16 >(nToken), aClass );
-    ASSERT( pCFmt, "keine Zeichenvorlage zu Token gefunden" );
+    OSL_ENSURE( pCFmt, "keine Zeichenvorlage zu Token gefunden" );
 
 
     // Styles parsen (zu Class siehe auch NewPara)
@@ -4764,7 +4753,7 @@ void SwHTMLParser::NewCharFmt( int nToken )
 
         if( ParseStyleOptions( aStyle, aId, aEmptyStr, aItemSet, aPropInfo, &aLang, &aDir ) )
         {
-            ASSERT( !aClass.Len() || !pCSS1Parser->GetClass( aClass ),
+            OSL_ENSURE( !aClass.Len() || !pCSS1Parser->GetClass( aClass ),
                     "Class wird nicht beruecksichtigt" );
             DoPositioning( aItemSet, aPropInfo, pCntxt );
             InsertAttrs( aItemSet, aPropInfo, pCntxt, TRUE );
@@ -5340,7 +5329,7 @@ void SwHTMLParser::InsertHorzRule()
 
     // den aktuellen Kontext vom Stack holen
     _HTMLAttrContext *pPoppedContext = PopContext( HTML_HORZRULE );
-    ASSERT( pPoppedContext==pCntxt, "wo kommt denn da ein HR-Kontext her?" );
+    OSL_ENSURE( pPoppedContext==pCntxt, "wo kommt denn da ein HR-Kontext her?" );
     delete pPoppedContext;
 
     pPam->Move( fnMoveForward );
@@ -5491,11 +5480,11 @@ void _HTMLAttr::Reset( const SwNodeIndex& rSttPara, USHORT nSttCnt,
 
 void _HTMLAttr::InsertPrev( _HTMLAttr *pPrv )
 {
-    ASSERT( !pPrv->pNext || pPrv->pNext == this,
+    OSL_ENSURE( !pPrv->pNext || pPrv->pNext == this,
             "_HTMLAttr::InsertPrev: pNext falsch" );
     pPrv->pNext = 0;
 
-    ASSERT( 0 == pPrv->ppHead || ppHead == pPrv->ppHead,
+    OSL_ENSURE( 0 == pPrv->ppHead || ppHead == pPrv->ppHead,
             "_HTMLAttr::InsertPrev: ppHead falsch" );
     pPrv->ppHead = 0;
 
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 3ea266bf3e6f..f6f7eac37b64 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -451,7 +451,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
     enum JumpToMarks { JUMPTO_NONE, JUMPTO_MARK, JUMPTO_TABLE, JUMPTO_FRAME,
                         JUMPTO_REGION, JUMPTO_GRAPHIC } eJumpTo;
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     sal_uInt16  nContinue;          // Tiefe der Continue-Aufrufe
 #endif
 
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index 2c9c19612187..94e7242ef645 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -157,7 +157,6 @@ ULONG SwHTMLWriter::WriteStream()
         nHTMLMode |= HTMLMODE_ABS_POS_FLY|HTMLMODE_ABS_POS_DRAW;
 
     if( HTML_CFG_WRITER==nExportMode )
-//      nHTMLMode |= HTMLMODE_FLY_MARGINS | HTMLMODE_FRSTLINE_IN_NUMBUL;
         nHTMLMode |= HTMLMODE_FLY_MARGINS;
 
     if( HTML_CFG_NS40==nExportMode )
@@ -193,14 +192,6 @@ ULONG SwHTMLWriter::WriteStream()
         rtl_getBestMimeCharsetFromTextEncoding( eDestEnc );
     eDestEnc = rtl_getTextEncodingFromMimeCharset( pCharSet );
 
-    // fuer Netscape optimieren heisst Spacer- und Multicol ausgeben
-//  bCfgMultiCol = pHtmlOptions->IsNetscape3();
-//  bCfgSpacer = pHtmlOptions->IsNetscape3();
-
-    // wenn Styles exportiert werden, wird ein Style einem HTML-Tag manchmal
-    // vorgezogen, wenn nicht fuer Netscape exportiert wird
-    // bCfgPreferStyles = bCfgOutStyles; // && !pHtmlOptions->IsNetscape3();
-
     // Nur noch fuer den MS-IE ziehen wir den Export von Styles vor.
     bCfgPreferStyles = HTML_CFG_MSIE==nExportMode;
 
@@ -213,7 +204,7 @@ ULONG SwHTMLWriter::WriteStream()
     sal_Bool bOldHTMLMode = sal_False;
     sal_uInt16 nOldTxtFmtCollCnt = 0, nOldCharFmtCnt = 0;
 
-    ASSERT( !pTemplate, "Wo kommt denn die HTML-Vorlage hier her?" );
+    OSL_ENSURE( !pTemplate, "Wo kommt denn die HTML-Vorlage hier her?" );
     pTemplate = ((HTMLReader*)ReadHTML)->GetTemplateDoc();
     if( pTemplate )
     {
@@ -305,7 +296,7 @@ ULONG SwHTMLWriter::WriteStream()
             }
             else
             {
-                ASSERT( FILE_LINK_SECTION != pSNd->GetSection().GetType(),
+                OSL_ENSURE( FILE_LINK_SECTION != pSNd->GetSection().GetType(),
                         "Export gelinkter Bereiche am Dok-Anfang ist nicht implemntiert" );
 
                 // nur das Tag fuer die Section merken
@@ -388,7 +379,7 @@ ULONG SwHTMLWriter::WriteStream()
 
     // loesche die Tabelle mit den freifliegenden Rahmen
     sal_uInt16 i;
-    ASSERT( !pHTMLPosFlyFrms, "Wurden nicht alle Rahmen ausgegeben" );
+    OSL_ENSURE( !pHTMLPosFlyFrms, "Wurden nicht alle Rahmen ausgegeben" );
     if( pHTMLPosFlyFrms )
     {
         pHTMLPosFlyFrms->DeleteAndDestroy( 0, pHTMLPosFlyFrms->Count() );
@@ -434,7 +425,7 @@ ULONG SwHTMLWriter::WriteStream()
     delete pxFormComps;
     pxFormComps = 0;
 
-    ASSERT( !pFootEndNotes,
+    OSL_ENSURE( !pFootEndNotes,
             "SwHTMLWriter::Write: Ftns nicht durch OutFootEndNotes geloescht" );
 
     pCurrPageDesc = 0;
@@ -456,13 +447,13 @@ ULONG SwHTMLWriter::WriteStream()
         sal_uInt16 nTxtFmtCollCnt = pTemplate->GetTxtFmtColls()->Count();
         while( nTxtFmtCollCnt > nOldTxtFmtCollCnt )
             pTemplate->DelTxtFmtColl( --nTxtFmtCollCnt );
-        ASSERT( pTemplate->GetTxtFmtColls()->Count() == nOldTxtFmtCollCnt,
+        OSL_ENSURE( pTemplate->GetTxtFmtColls()->Count() == nOldTxtFmtCollCnt,
                 "falsche Anzahl TxtFmtColls geloescht" );
 
         sal_uInt16 nCharFmtCnt = pTemplate->GetCharFmts()->Count();
         while( nCharFmtCnt > nOldCharFmtCnt )
             pTemplate->DelCharFmt( --nCharFmtCnt );
-        ASSERT( pTemplate->GetCharFmts()->Count() == nOldCharFmtCnt,
+        OSL_ENSURE( pTemplate->GetCharFmts()->Count() == nOldCharFmtCnt,
                 "falsche Anzahl CharFmts geloescht" );
 
         // HTML-Modus wieder restaurieren
@@ -529,7 +520,7 @@ void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt,
                                   const SwFmtCol *pCol,
                                   sal_Bool bContinued=sal_False )
 {
-    ASSERT( pCol || !bContinued, "Continuation of DIV" );
+    OSL_ENSURE( pCol || !bContinued, "Continuation of DIV" );
 
     if( rHTMLWrt.bLFPossible )
         rHTMLWrt.OutNewLine();
@@ -656,7 +647,7 @@ static Writer& OutHTML_Section( Writer& rWrt, const SwSectionNode& rSectNd )
 
     const SwSection& rSection = rSectNd.GetSection();
     const SwSectionFmt *pFmt = rSection.GetFmt();
-    ASSERT( pFmt, "Section without a format?" );
+    OSL_ENSURE( pFmt, "Section without a format?" );
 
     sal_Bool bStartTag = sal_True;
     sal_Bool bEndTag = sal_True;
@@ -755,7 +746,7 @@ void SwHTMLWriter::Out_SwDoc( SwPaM* pPam )
         {
             SwNode * pNd = pCurPam->GetNode();
 
-            ASSERT( !(pNd->IsGrfNode() || pNd->IsOLENode()),
+            OSL_ENSURE( !(pNd->IsGrfNode() || pNd->IsOLENode()),
                     "Grf- oder OLE-Node hier unerwartet" );
             if( pNd->IsTxtNode() )
             {
@@ -882,7 +873,7 @@ sal_uInt16 SwHTMLWriter::OutHeaderAttrs()
             0==(pTxtNd=pDoc->GetNodes()[nIdx]->GetTxtNode()) )
         nIdx++;
 
-    ASSERT( pTxtNd, "Kein Text-Node gefunden" );
+    OSL_ENSURE( pTxtNd, "Kein Text-Node gefunden" );
     if( !pTxtNd || !pTxtNd->HasHints() )
         return 0;
 
@@ -934,7 +925,6 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs )
     // DokumentInfo
     ByteString sIndent;
     GetIndentString( sIndent );
-//  OutNewLine();
     using namespace ::com::sun::star;
     uno::Reference<document::XDocumentProperties> xDocProps;
     SwDocShell *pDocShell(pDoc->GetDocShell());
@@ -955,8 +945,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs )
     OutFootEndNoteInfo();
 
     const SwPageDesc *pPageDesc = 0;
-    //if( !pDoc->IsHTMLMode() )
-    //{
+
         // In Nicht-HTML-Dokumenten wird die erste gesetzte Seitenvorlage
         // exportiert und wenn keine gesetzt ist die Standard-Vorlage
         ULONG nNodeIdx = pCurPam->GetPoint()->nNode.GetIndex();
@@ -982,12 +971,6 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs )
 
         if( !pPageDesc )
             pPageDesc = &const_cast<const SwDoc *>(pDoc)->GetPageDesc( 0 );
-    //}
-    //else
-    //{
-        // In HTML-Dokumenten nehmen wir immer die HTML-Vorlage
-    //  pPageDesc = pDoc->GetPageDescFromPool( RES_POOLPAGE_HTML );
-    //}
 
     // und nun ... das Style-Sheet!!!
     if( bCfgOutStyles )
diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx
index 881e5d50e7fe..ff6b588bd92d 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -566,8 +566,8 @@ public:
 // methoden zur verwaltung von styles:
     void BeginStyle(USHORT nUserCode, RES_POOL_COLLFMT_TYPE aType)
     {
-        ASSERT(nUserCode<sizeof(pColls)/sizeof(*pColls), "code out of bounds");
-        ASSERT(pColls[nUserCode] == NULL, "user codes dublicate");
+        OSL_ENSURE(nUserCode<sizeof(pColls)/sizeof(*pColls), "code out of bounds");
+        OSL_ENSURE(pColls[nUserCode] == NULL, "user codes dublicate");
         if (eSubMode == Style)
             EndStyle();
         pOut = pColls[nUserCode] = new SwFltFormatCollection(GetDoc(), aType);
@@ -576,8 +576,8 @@ public:
     }
     void BeginStyle( USHORT nUserCode, const String& rName )
     {
-        ASSERT(nUserCode<sizeof(pColls)/sizeof(*pColls), "code out of bounds");
-        ASSERT(pColls[nUserCode] == NULL, "user codes dublicate");
+        OSL_ENSURE(nUserCode<sizeof(pColls)/sizeof(*pColls), "code out of bounds");
+        OSL_ENSURE(pColls[nUserCode] == NULL, "user codes dublicate");
         if (eSubMode == Style)
             EndStyle();
         pOut = pColls[nUserCode] = new SwFltFormatCollection(GetDoc(), rName );
@@ -588,8 +588,8 @@ public:
         { return pColls[nUserCode] != 0; }
     void BaseStyle(USHORT nBased)
     {
-        ASSERT(eSubMode == Style, "wrong state for style");
-        ASSERT(pColls[nBased], "Style based on noexistent style" );
+        OSL_ENSURE(eSubMode == Style, "wrong state for style");
+        OSL_ENSURE(pColls[nBased], "Style based on noexistent style" );
         if( eSubMode == Style && pColls[nBased]->GetColl() )
             ((SwFltFormatCollection*)pOut)->Derived(pColls[nBased]->GetColl());
     }
@@ -597,7 +597,7 @@ public:
 
     void EndStyle()
     {
-//      ASSERT(eSubMode == Style, "wrong state for style");
+//   OSL_ENSURE(eSubMode == Style, "wrong state for style");
         nAktStyle = 0;
         pOut = pOutDoc;
         eSubMode = None;
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx
index 0872e3434656..2470797d8f33 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -119,7 +119,7 @@ namespace sw
             @author
                 <a href="mailto:mmaher@openoffice.org">Martin Maher</a
         */
-        ULONG MSDateTimeFormatToSwFormat(String& rParams, SvNumberFormatter *pFormatter, USHORT &rLang, bool bHijri);
+        ULONG MSDateTimeFormatToSwFormat(String& rParams, SvNumberFormatter *pFormatter, USHORT &rLang, bool bHijri, USHORT nDocLang);
 
         /** Used by MSDateTimeFormatToSwFormat to identify AM time fields
 
diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx
index bf758cfd336f..8bf5424e3408 100644
--- a/sw/source/filter/inc/wrtswtbl.hxx
+++ b/sw/source/filter/inc/wrtswtbl.hxx
@@ -260,7 +260,7 @@ protected:
 
     BOOL bRelWidths : 1;        // Breiten relativ ausgeben?
     BOOL bUseLayoutHeights : 1; // Layout zur Hoehenbestimmung nehmen?
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     BOOL bGetLineHeightCalled : 1;
 #endif
 
diff --git a/sw/source/filter/rtf/makefile.mk b/sw/source/filter/rtf/makefile.mk
index e7310f2d0f0e..5b073faa2c1c 100644
--- a/sw/source/filter/rtf/makefile.mk
+++ b/sw/source/filter/rtf/makefile.mk
@@ -44,17 +44,15 @@ CDEFS=$(CDEFS) -Dmydebug
 # --- Files --------------------------------------------------------
 
 EXCEPTIONSFILES=	\
+        $(SLO)$/rtffld.obj \
         $(SLO)$/rtffly.obj \
         $(SLO)$/rtfnum.obj \
+        $(SLO)$/rtftbl.obj \
         $(SLO)$/swparrtf.obj
 
 
 SLOFILES = \
-        $(SLO)$/rtffld.obj \
-        $(SLO)$/rtffly.obj \
-        $(SLO)$/rtfnum.obj \
-        $(SLO)$/rtftbl.obj \
-        $(SLO)$/swparrtf.obj
+        $(EXCEPTIONSFILES)
 
 # --- Tagets -------------------------------------------------------
 
diff --git a/sw/source/filter/rtf/rtffld.cxx b/sw/source/filter/rtf/rtffld.cxx
index c083f131162d..441ab30ba9bf 100644
--- a/sw/source/filter/rtf/rtffld.cxx
+++ b/sw/source/filter/rtf/rtffld.cxx
@@ -139,7 +139,7 @@ static RTF_FLD_TYPES _WhichFld( String& rName, String& rNext )
 
     String sNm( rName );
     sNm = sNm.EraseLeadingChars().GetToken(0, ' ');
-    ASSERT( sNm.Len(), "Feldname hat keine Laenge!" );
+    OSL_ENSURE( sNm.Len(), "Feldname hat keine Laenge!" );
     if( !sNm.Len() )
         return RTFFLD_UNKNOWN;
 
@@ -155,7 +155,6 @@ static RTF_FLD_TYPES _WhichFld( String& rName, String& rNext )
             ( !nFndPos || !isalpha(sNm.GetChar( static_cast< xub_StrLen >(nFndPos-1) )) ) &&
             ( nFndPos+nLen == sNm.Len() || !isalpha(sNm.GetChar( static_cast< xub_StrLen >(nFndPos+nLen) ) ) ) )
         {
-//          rName = sNm.Copy( nFndPos, nLen );
             rName = rName.Copy( nFndPos, static_cast< xub_StrLen >(nLen) );
             nFndPos += nTokenStt + static_cast< xub_StrLen >(nLen);
             while( rNext.GetChar( nFndPos ) == ' ' )    ++nFndPos;
@@ -181,7 +180,7 @@ static USHORT CheckNumberFmtStr( const String& rNStr )
         "\x04""PAGE"              /* PAGEDESC          */
     };
 
-    ASSERT(sizeof(aNumberTypeTab) / sizeof(sal_Char *)
+    OSL_ENSURE(sizeof(aNumberTypeTab) / sizeof(sal_Char *)
            >= SVX_NUM_PAGEDESC - SVX_NUM_CHARS_UPPER_LETTER, "impossible");
 
     for (USHORT n = SVX_NUM_CHARS_UPPER_LETTER;  n <= SVX_NUM_PAGEDESC; ++n)
@@ -407,9 +406,6 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr )
         break;
     case RTFFLD_IMPORT:
         {
-//JP 11.03.96: vertraegt sich nicht so ganz mit Internet!
-//            if( STRING_NOTFOUND != ( nPos = aSaveStr.Search( '.' )))
-//                aSaveStr.Erase( nPos+4 );
 
             aSaveStr.EraseLeadingAndTrailingChars();
             if( aSaveStr.Len() )
@@ -425,7 +421,7 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr )
                     INetURLObject(GetBaseURL()), aSaveStr,
                     URIHelper::GetMaybeFileHdl() );
             }
-//          SkipGroup();        // ueberlese den Rest
+
         }
         break;
 
@@ -502,7 +498,7 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr )
 
                 if( pFormatter )
                 {
-                    nFmtIdx = sw::ms::MSDateTimeFormatToSwFormat(aSaveStr, pFormatter, rLang, bHijri);
+                    nFmtIdx = sw::ms::MSDateTimeFormatToSwFormat(aSaveStr, pFormatter, rLang, bHijri, rLang);
                     if (nFmtIdx)
                         nNumFmtType = pFormatter->GetType(nFmtIdx);
                 }
@@ -687,7 +683,6 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr )
                 case 1:     aData.nJustificationCode = 3;   break;
                 case 2:     aData.nJustificationCode = 4;   break;
                 case 4:     aData.nJustificationCode = 2;   break;
-//              case 3:
                 default:    aData.nJustificationCode = 0;   break;
                 }
 
@@ -1048,7 +1043,7 @@ void SwRTFParser::ReadField()
                         {
                             const SwField *pFld = pFldAttr->GetFld().GetFld();
                             SwFieldType *pTyp = pFld ? pFld->GetTyp() : 0;
-                            ASSERT(pTyp->Which() == RES_USERFLD, "expected a user field");
+                            OSL_ENSURE(pTyp->Which() == RES_USERFLD, "expected a user field");
                             if (pTyp->Which() == RES_USERFLD)
                             {
                                 SwUserFieldType *pUsrTyp = (SwUserFieldType*)pTyp;
diff --git a/sw/source/filter/rtf/rtffly.cxx b/sw/source/filter/rtf/rtffly.cxx
index 35e8d46d5a96..725438bcc86d 100644
--- a/sw/source/filter/rtf/rtffly.cxx
+++ b/sw/source/filter/rtf/rtffly.cxx
@@ -61,6 +61,7 @@
 #include <txtflcnt.hxx>
 #include <fmtflcnt.hxx>
 #include <fltini.hxx>
+#include <unoframe.hxx>
 #include <deque>
 #include <map>
 #include <utility>
@@ -236,9 +237,9 @@ void SwRTFParser::SetFlysInDoc()
     {
         SwFlySave* pFlySave = aFlyArr[ n ];
 
-        ASSERT( !pFlySave->nSttNd.GetNode().FindFlyStartNode(),
+        OSL_ENSURE( !pFlySave->nSttNd.GetNode().FindFlyStartNode(),
                 "Content vom Fly steht in einem Fly" );
-        ASSERT( pFlySave->nSttNd.GetIndex() <= pFlySave->nEndNd.GetIndex(),
+        OSL_ENSURE( pFlySave->nSttNd.GetIndex() <= pFlySave->nEndNd.GetIndex(),
                 "Fly hat falschen Bereich" );
 
 
@@ -395,7 +396,7 @@ void SwRTFParser::SetFlysInDoc()
         // patch from cmc for #i52542#
         if (pSttNd->GetIndex() + 1 == pSttNd->EndOfSectionIndex())
         {
-            ASSERT(!this, "nothing in this frame, not legal");
+            OSL_ENSURE(!this, "nothing in this frame, not legal");
             delete pFlySave;
             continue;
         }
@@ -464,7 +465,6 @@ void SwRTFParser::SetFlysInDoc()
             if( !bSwPageDesc || 5430 < GetVersionNo() )
                 pFlySave->nSttNd++;
 
-//            if( !pFlySave->nSttNd.GetNode().IsCntntNode() )
             {
                 // Seitenumbrueche in den Bodybereich verschieben!
                 SwCntntNode* pSrcNd = aRg.aStart.GetNode().GetCntntNode();
@@ -980,16 +980,6 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
                 nTmp *= USHRT_MAX;
                 nTmp /= nWidth;
                 pCol->SetWishWidth( USHORT(nTmp) );
-/*
-    JP 07.07.95: der Dialog kennt nur eine Breite fuer alle Spalten
-                 darum hier nicht weiter beachten
-                nTmp = aColumns[ n+1 ];
-                if( nTmp )
-                    pCol->SetRight( USHORT(nTmp) );
-                else
-                    pCol->SetRight( 0 );
-                pCol->SetLeft( 0 );
-*/
             }
         }
         pSet->Put( aCol );
@@ -1112,8 +1102,6 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
         pPam->GetPoint()->nNode == pFlySave->nSttNd &&
         !pPam->GetPoint()->nContent.GetIndex() )
     {
-//      // dann erzeuge mindestens einen leeren TextNode
-//      pDoc->AppendTxtNode(*pPam);
         // dann zerstoere den FlySave wieder.
         aFlyArr.DeleteAndDestroy( --nFlyArrCnt );
 
@@ -1248,7 +1236,6 @@ void SwRTFParser::InsPicture( const String& rGrfNm, const Graphic* pGrf,
     SwGrfNode * pGrfNd;
     // --> OD 2008-12-22 #i83368#
     // Assure that graphic node is enclosed by fly frame node.
-//    if( bReadSwFly )
     if ( bReadSwFly && !mbReadCellWhileReadSwFly )
     // <--
     {
@@ -1276,8 +1263,7 @@ void SwRTFParser::InsPicture( const String& rGrfNm, const Graphic* pGrf,
     else
     {
         // wenn normale RTF-Grafik, dann steht diese im Textfluss !
-        SwAttrSet aFlySet( pDoc->GetAttrPool(), RES_OPAQUE, /*RES_OPAQUE,
-                                                RES_VERT_ORIENT,*/ RES_ANCHOR );
+        SwAttrSet aFlySet( pDoc->GetAttrPool(), RES_OPAQUE, RES_ANCHOR );
         const SwPosition* pPos = pPam->GetPoint();
 
         SwFmtAnchor aAnchor( FLY_AS_CHAR );
@@ -1293,7 +1279,7 @@ void SwRTFParser::InsPicture( const String& rGrfNm, const Graphic* pGrf,
             aFlySet.Put(aSurroundItem);
         }
 
-        SwFrmFmt* pFlyFmt = pDoc->Insert( *pPam,
+        SwFlyFrmFmt* pFlyFmt = pDoc->Insert( *pPam,
                     rGrfNm, aEmptyStr,      // Name der Graphic !!
                     pGrf,
                     &aFlySet,               // Attribute fuer den FlyFrm
@@ -1305,6 +1291,26 @@ void SwRTFParser::InsPicture( const String& rGrfNm, const Graphic* pGrf,
         _SetPictureSize( *pGrfNd, pPos->nNode,
                         (SfxItemSet&)pFlyFmt->GetAttrSet(),
                         pPicType );
+        if( pPicType )
+        {
+            PictPropertyNameValuePairs::const_iterator aIt = pPicType->aPropertyPairs.begin();
+            PictPropertyNameValuePairs::const_iterator aEnd = pPicType->aPropertyPairs.end();
+            while( aIt != aEnd)
+            {
+                if( aIt->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( "wzDescription") ))
+                {
+                    SwXFrame::GetOrCreateSdrObject( pFlyFmt );
+                    pDoc->SetFlyFrmDescription( *(pFlyFmt), aIt->second );
+                }
+                else if( aIt->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( "wzName") ))
+                {
+                    SwXFrame::GetOrCreateSdrObject( pFlyFmt );
+                    pDoc->SetFlyFrmTitle( *(pFlyFmt), aIt->second );
+                }
+                ++aIt;
+            }
+        }
+
     }
 
     if( pGrfAttrSet )
@@ -1387,33 +1393,6 @@ void SwRTFParser::_SetPictureSize( const SwNoTxtNode& rNd,
         BOOL bChg = FALSE;
         SwCropGrf aCrop;
 
-/*
- JP 28.07.99: Bug 67800 - no crop by MAC_QUICKDRAW. At time i dont know why
-                            it has been coded. But this has used for any
-                            RTF-File, but i dont found them.
-        if( SvxRTFPictureType::MAC_QUICKDRAW == pPicType->eStyle )
-        {
-            // evt. ein wenig Croppen ??
-            // IMMER auf 72 DPI bezogen, also 1pt == 20 Twip !!
-            long nTmp = pPicType->nWidth * 20;
-            if( nTmp != aSize.Width() )
-            {
-                // in der Breite (also rechts) croppen
-                aCrop.Right() = nTmp - aSize.Width();
-                aSize.Width() = nTmp;
-                bChg = TRUE;
-            }
-
-            nTmp = pPicType->nHeight * 20;
-            if( nTmp != aSize.Height() )
-            {
-                // in der Hoehe (also unten) croppen
-                aCrop.Bottom() = nTmp - aSize.Height();
-                aSize.Height() = nTmp;
-                bChg = TRUE;
-            }
-        }
-*/
         if( pPicType->nCropT )
         {
             aCrop.SetTop( pPicType->nCropT );
@@ -1446,7 +1425,7 @@ void SwRTFParser::_SetPictureSize( const SwNoTxtNode& rNd,
 
 void SwRTFParser::GetPageSize( Size& rSize )
 {
-    ASSERT(!maSegments.empty(), "not possible");
+    OSL_ENSURE(!maSegments.empty(), "not possible");
     if (maSegments.empty())
     {
         rSize.Width() = 12240 - 1800 - 1800;
diff --git a/sw/source/filter/rtf/rtfnum.cxx b/sw/source/filter/rtf/rtfnum.cxx
index cb147fa48afe..868ae1b09776 100644
--- a/sw/source/filter/rtf/rtfnum.cxx
+++ b/sw/source/filter/rtf/rtfnum.cxx
@@ -114,9 +114,6 @@ void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl )
                 // Unknown und alle bekannten nicht ausgewerteten Gruppen
                 // sofort ueberspringen
                 else if( RTF_UNKNOWNCONTROL != ( nToken = GetNextToken() ))
-//                      RTF_PANOSE != nToken && RTF_FALT != nToken &&
-//                      RTF_FALT != nToken && RTF_FNAME != nToken &&
-//                      RTF_FONTEMB != nToken && RTF_FONTFILE != nToken )
                     nToken = SkipToken( -2 );
                 else
                 {
@@ -326,9 +323,6 @@ void SwRTFParser::ReadListTable()
                 // Unknown und alle bekannten nicht ausgewerteten Gruppen
                 // sofort ueberspringen
                 else if( RTF_UNKNOWNCONTROL != ( nToken = GetNextToken() ))
-//                      RTF_PANOSE != nToken && RTF_FALT != nToken &&
-//                      RTF_FALT != nToken && RTF_FNAME != nToken &&
-//                      RTF_FONTEMB != nToken && RTF_FONTFILE != nToken )
                     nToken = SkipToken( -2 );
                 else
                 {
@@ -608,17 +602,7 @@ void SwRTFParser::ReadListOverrideTable()
         const SwNumRule *pNumRule = 0;
         SvxRTFStyleType* pStyle = GetStyleTbl().First();
         do {
-            // --> OD 2007-12-17 #151213#
-            // suppress deletion of outline list style.
-            // refactoring of code: no assignments in if-condition
-//            if( MAXLEVEL > pStyle->nOutlineNo &&
-//                0 != ( pColl = aTxtCollTbl.Get( (USHORT)GetStyleTbl().
-//                                                        GetCurKey() )) &&
-//                SFX_ITEM_SET == pColl->GetItemState( RES_PARATR_NUMRULE,
-//                                                    FALSE, &pItem ) &&
-//                USHRT_MAX != (nRulePos = pDoc->FindNumRule(
-//                                ((SwNumRuleItem*)pItem)->GetValue() )) &&
-//                (pNumRule = pDoc->GetNumRuleTbl()[ nRulePos ])->IsAutoRule() )
+            // #151213#
             if ( MAXLEVEL > pStyle->nOutlineNo )
             {
                 pColl = aTxtCollTbl.Get( (USHORT)GetStyleTbl().GetCurKey() );
@@ -701,10 +685,10 @@ void SwRTFParser::RemoveUnusedNumRule( SwNumRule* pRule )
         }
         pDoc->DelNumRule( pRule->GetName() );
     }
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     else
     {
-        ASSERT( pRule, "NumRulePointer 0 kann nicht geloescht werden" );
+        OSL_ENSURE( pRule, "NumRulePointer 0 kann nicht geloescht werden" );
     }
 #endif
 }
diff --git a/sw/source/filter/rtf/rtftbl.cxx b/sw/source/filter/rtf/rtftbl.cxx
index 280b93979cc4..7ad87cbdbfc5 100644
--- a/sw/source/filter/rtf/rtftbl.cxx
+++ b/sw/source/filter/rtf/rtftbl.cxx
@@ -115,7 +115,7 @@ static void SetRowBorder(SfxItemSet& rSet, const Row &rRow)
 void rtfSections::PrependedInlineNode(const SwPosition &rPos,
     const SwNode &rNode)
 {
-    ASSERT(!mrReader.IsNewDoc() || !maSegments.empty(),
+    OSL_ENSURE(!mrReader.IsNewDoc() || !maSegments.empty(),
         "should not be possible, must be at least one segment in a new document");
     if ((!maSegments.empty()) && (maSegments.back().maStart == rPos.nNode))
         maSegments.back().maStart = SwNodeIndex(rNode);
@@ -353,73 +353,6 @@ void SwRTFParser::ReadTable( int nToken )
                     aBox.SetDistance( static_cast< USHORT >(nTopCellPad), BOX_LINE_LEFT);
 
 
-                /*#106415# The Cell Borders are now balanced on import to
-                improve the layout of tables.
-                */
-/*
-                if ( aBoxFmts.Count()>1)
-                {
-
-                    SwTableBoxFmt* prevpFmt = aBoxFmts[ aBoxFmts.Count()-2 ];
-                    SvxBoxItem prevaBox(prevpFmt->GetBox());
-                    USHORT prevWidthRight=0;
-                    USHORT currWidthLeft=0;
-                    bool bDoubleLine=false;
-                    const SvxBorderLine*   brdrline ;
-                    const Color* pPrevRightColor;
-                    if(prevaBox.GetRight())
-                    {
-                        brdrline=prevaBox.GetRight();
-                        prevWidthRight = brdrline->GetOutWidth();
-                        pPrevRightColor = &brdrline->GetColor();
-                        if(brdrline->GetInWidth())
-                            bDoubleLine=true;
-                    }
-                    if(aBox.GetLeft())
-                    {
-                        brdrline=aBox.GetLeft();
-                        currWidthLeft = brdrline->GetOutWidth();
-                        if(brdrline->GetInWidth())
-                            bDoubleLine=true;
-                    }
-
-                    if((currWidthLeft >0 || prevWidthRight >0) &&
-                        !bDoubleLine)
-                    {
-                        USHORT newBorderWidth=(currWidthLeft+prevWidthRight)/2 ;
-                        if(newBorderWidth /2 ==DEF_LINE_WIDTH_0 )
-                        {
-                            newBorderWidth =DEF_LINE_WIDTH_0;
-                        }
-                        else if(newBorderWidth /2 >=(DEF_LINE_WIDTH_4-DEF_LINE_WIDTH_3))
-                        {
-                            newBorderWidth =DEF_LINE_WIDTH_4;
-                        }
-                        else if(newBorderWidth /2 >=(DEF_LINE_WIDTH_3-DEF_LINE_WIDTH_2))
-                        {
-                            newBorderWidth =DEF_LINE_WIDTH_3;
-                        }
-                        else if(newBorderWidth /2>=(DEF_LINE_WIDTH_2-DEF_LINE_WIDTH_1))
-                        {
-                            newBorderWidth =DEF_LINE_WIDTH_2;
-                        }
-                        else if(newBorderWidth /2>=(DEF_LINE_WIDTH_1 - DEF_LINE_WIDTH_0)  )
-                        {
-                            newBorderWidth =DEF_LINE_WIDTH_1;
-                        }
-                        else
-                        {
-                            newBorderWidth =DEF_LINE_WIDTH_0;
-                        }
-                        const SvxBorderLine  newbrdrline(pPrevRightColor, newBorderWidth,0,0);
-                        aBox.SetLine(&newbrdrline,BOX_LINE_LEFT);
-                        prevaBox.SetLine(&newbrdrline,BOX_LINE_RIGHT);
-                        prevpFmt->SetAttr(prevaBox);
-                    }
-
-                }
-*/
-
                 pFmt->SetFmtAttr(aBox);
 
                 bUseLeftCellPad = false;
@@ -786,7 +719,7 @@ void SwRTFParser::ReadTable( int nToken )
             aBoxFmts[0]->Add( pBox );
             SwTxtNode* pTNd = pDoc->GetNodes()[ pBox->GetSttIdx()+1 ]
                                             ->GetTxtNode();
-            ASSERT( pTNd, "wo ist der Textnode dieser Box?" );
+            OSL_ENSURE( pTNd, "wo ist der Textnode dieser Box?" );
             pTNd->ChgFmtColl( pColl );
             ++nStt;
             nRowsToRepeat=0;
@@ -829,7 +762,7 @@ void SwRTFParser::ReadTable( int nToken )
         }
     }
 
-    ASSERT(!bFailure, "RTF Table failure");
+    OSL_ENSURE(!bFailure, "RTF Table failure");
     if (bFailure)
     {
         SkipToken( -1 );            // zum Letzen gueltigen zurueck
@@ -875,7 +808,7 @@ void SwRTFParser::GotoNextBox()
 {
     nInsTblRow = USHRT_MAX;
 
-    ASSERT( pTableNode, "Kein Tabellennode, dann auch keine Box" );
+    OSL_ENSURE( pTableNode, "Kein Tabellennode, dann auch keine Box" );
 
     if (!pTableNode)
         return;
@@ -964,7 +897,6 @@ void SwRTFParser::NewTblLine()
         pLns = &pTableNode->GetTable().GetTabLines();
     }
     else
-//      pDoc->InsertRow( aBoxes );
         pTableNode->GetTable().AppendRow( pDoc );
 
     pBox = (*pLns)[ pLns->Count()-1 ]->GetTabBoxes()[0];
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx
index 21b755b01f13..d7c1c7a6ca6c 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -137,7 +137,7 @@ ULONG RtfReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPam, const S
 {
     if( !pStrm )
     {
-        ASSERT( FALSE, "RTF-Read ohne Stream" );
+        OSL_ENSURE( FALSE, "RTF-Read ohne Stream" );
         return ERR_SWG_READ_ERROR;
     }
 
@@ -380,12 +380,12 @@ void SwRTFParser::Continue( int nToken )
                 pPam->GetPoint()->nContent.Assign( pTxtNode, nStt );
             }
 
-#ifdef DBG_UTIL
-// !!! sollte nicht moeglich sein, oder ??
-ASSERT( pSttNdIdx->GetIndex()+1 != pPam->GetBound( TRUE ).nNode.GetIndex(),
-            "Pam.Bound1 steht noch im Node" );
-ASSERT( pSttNdIdx->GetIndex()+1 != pPam->GetBound( FALSE ).nNode.GetIndex(),
-            "Pam.Bound2 steht noch im Node" );
+#if OSL_DEBUG_LEVEL > 1
+            // !!! sollte nicht moeglich sein, oder ??
+            OSL_ENSURE( pSttNdIdx->GetIndex()+1 != pPam->GetBound( TRUE ).nNode.GetIndex(),
+                "Pam.Bound1 steht noch im Node" );
+            OSL_ENSURE( pSttNdIdx->GetIndex()+1 != pPam->GetBound( FALSE ).nNode.GetIndex(),
+                "Pam.Bound2 steht noch im Node" );
 
 if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( TRUE ).nNode.GetIndex() )
 {
@@ -747,10 +747,7 @@ void rtfSections::SetSegmentToPageDesc(const rtfSection &rSection,
 {
     SwPageDesc &rPage = bTitlePage ? *rSection.mpTitlePage : *rSection.mpPage;
 
-//    SetNumberingType(rSection, rPage);
-
     SwFrmFmt &rFmt = rPage.GetMaster();
-//    mrReader.SetDocumentGrid(rFmt, rSection);
 
     wwULSpaceData aULData;
     GetPageULData(rSection, bTitlePage, aULData);
@@ -790,20 +787,16 @@ void rtfSections::MoveFrom(SwPageDesc &rFrom, SwPageDesc &rDest)
     SwFrmFmt &rFromMaster = rFrom.GetMaster();
     rDestMaster.SetFmtAttr(rFromMaster.GetHeader());
     rDestMaster.SetFmtAttr(rFromMaster.GetFooter());
-    //rFromMaster.SetAttr(SwFmtHeader()); //$flr uncommented due to bug fix #117882#
-    //rFromMaster.SetAttr(SwFmtFooter()); //$flr uncommented due to bug fix #117882#
 
     SwFrmFmt &rDestLeft = rDest.GetLeft();
     SwFrmFmt &rFromLeft = rFrom.GetLeft();
     rDestLeft.SetFmtAttr(rFromLeft.GetHeader());
     rDestLeft.SetFmtAttr(rFromLeft.GetFooter());
-    //rFromLeft.SetAttr(SwFmtHeader()); //$flr uncommented due to bug fix #117882#
-    //rFromLeft.SetAttr(SwFmtFooter()); //$flr uncommented due to bug fix #117882#
 }
 
 void rtfSections::SetHdFt(rtfSection &rSection)
 {
-    ASSERT(rSection.mpPage, "makes no sense to call without a main page");
+    OSL_ENSURE(rSection.mpPage, "makes no sense to call without a main page");
     if (rSection.mpPage && rSection.maPageInfo.mpPageHdFt)
     {
         if (rSection.maPageInfo.mbPageHdFtUsed)
@@ -846,7 +839,7 @@ SwSectionFmt *rtfSections::InsertSection(SwPaM& rMyPaM, rtfSection &rSection)
 
     rSection.mpSection =
         mrReader.pDoc->InsertSwSection( rMyPaM, aSectionData, 0, &aSet );
-    ASSERT(rSection.mpSection, "section not inserted!");
+    OSL_ENSURE(rSection.mpSection, "section not inserted!");
     if (!rSection.mpSection)
         return 0;
 
@@ -859,7 +852,7 @@ SwSectionFmt *rtfSections::InsertSection(SwPaM& rMyPaM, rtfSection &rSection)
             break;
     }
 
-    ASSERT(pPage, "no page outside this section!");
+    OSL_ENSURE(pPage, "no page outside this section!");
 
     if (!pPage)
         pPage = &mrReader.pDoc->_GetPageDesc(0);
@@ -875,7 +868,7 @@ SwSectionFmt *rtfSections::InsertSection(SwPaM& rMyPaM, rtfSection &rSection)
     long nRight = rLR.GetRight();
 
     SwSectionFmt *pFmt = rSection.mpSection->GetFmt();
-    ASSERT(pFmt, "impossible");
+    OSL_ENSURE(pFmt, "impossible");
     if (!pFmt)
         return 0;
     SetCols(*pFmt, rSection, (USHORT)(nWidth - nLeft - nRight) );
@@ -933,7 +926,7 @@ void rtfSections::InsertSegments(bool bNewDoc)
                         , 0, false);
                     aIter->mpTitlePage = &mrReader.pDoc->_GetPageDesc(nPos);
                 }
-                ASSERT(aIter->mpTitlePage, "no page!");
+                OSL_ENSURE(aIter->mpTitlePage, "no page!");
                 if (!aIter->mpTitlePage)
                     continue;
 
@@ -955,7 +948,7 @@ void rtfSections::InsertSegments(bool bNewDoc)
                         aIter->mpTitlePage, false);
                 aIter->mpPage = &mrReader.pDoc->_GetPageDesc(nPos);
             }
-            ASSERT(aIter->mpPage, "no page!");
+            OSL_ENSURE(aIter->mpPage, "no page!");
             if (!aIter->mpPage)
                 continue;
 
@@ -985,7 +978,7 @@ void rtfSections::InsertSegments(bool bNewDoc)
                 SwTable& rTable =
                     aIter->maStart.GetNode().GetTableNode()->GetTable();
                 SwFrmFmt* pApply = rTable.GetFrmFmt();
-                ASSERT(pApply, "impossible");
+                OSL_ENSURE(pApply, "impossible");
                 if (pApply)
                     pApply->SetFmtAttr(aPgDesc);
             }
@@ -1081,7 +1074,7 @@ void InsertedTablesManager::DelAndMakeTblFrms()
         // exitiert schon ein Layout, dann muss an dieser Tabelle die BoxFrames
         // neu erzeugt
         SwTableNode *pTable = aIter->first->GetTableNode();
-        ASSERT(pTable, "Why no expected table");
+        OSL_ENSURE(pTable, "Why no expected table");
         if (pTable)
         {
             SwFrmFmt * pFrmFmt = pTable->GetTable().GetFrmFmt();
@@ -1241,15 +1234,7 @@ void SwRTFParser::ReadDrawingObject()
         }
     }
     SkipToken(-1);
-    /*
-    const Point aPointC1( 0, 0 );
-    const Point aPointC2( 100, 200 );
-    const Point aPointC3( 300, 400 );
-    XPolygon aPolygonC(3);
-    aPolygonC[0] = aPointC1;
-    aPolygonC[1] = aPointC2;
-    aPolygonC[2] = aPointC3;
-    */
+
     if(bPolygonActive && aPolygon.count())
     {
         SdrPathObj* pStroke = new SdrPathObj(OBJ_PLIN, ::basegfx::B2DPolyPolygon(aPolygon));
@@ -1260,10 +1245,7 @@ void SwRTFParser::ReadDrawingObject()
         aFlySet.Put( aSur );
         SwFmtFollowTextFlow aFollowTextFlow( FALSE );
         aFlySet.Put( aFollowTextFlow );
-        /*
-        sw::util::SetLayer aSetLayer(*pDoc);
-        aSetLayer.SendObjectToHeaven(*pStroke);
-        */
+
         SwFmtAnchor aAnchor( FLY_AT_PARA );
         aAnchor.SetAnchor( pPam->GetPoint() );
         aFlySet.Put( aAnchor );
@@ -1316,7 +1298,7 @@ void SwRTFParser::ReadDrawingObject()
 
         pStroke->SetSnapRect(aRect);
 
-        /* SwFrmFmt* pRetFrmFmt = */pDoc->Insert(*pPam, *pStroke, &aFlySet, NULL);
+        pDoc->Insert(*pPam, *pStroke, &aFlySet, NULL);
     }
 }
 
@@ -1348,7 +1330,7 @@ void SwRTFParser::InsertShpObject(SdrObject* pStroke, int _nZOrder)
         SdrPage* pDrawPg = pDrawModel->GetPage(0);
         pDrawPg->InsertObject(pStroke);
         pDrawPg->SetObjectOrdNum(pStroke->GetOrdNum(), _nZOrder);
-        /* SwFrmFmt* pRetFrmFmt = */pDoc->Insert(*pPam, *pStroke, &aFlySet, NULL);
+        pDoc->Insert(*pPam, *pStroke, &aFlySet, NULL);
 }
 
 ::basegfx::B2DPoint rotate(const ::basegfx::B2DPoint& rStart, const ::basegfx::B2DPoint& rEnd)
@@ -1376,6 +1358,7 @@ void SwRTFParser::ReadShapeObject()
     String shpTxt;
     bool bshpTxt=false;
     int txflTextFlow=0;
+    ::rtl::OUString sDescription, sName;
 
 
     while (level>0 && IsParserWorking())
@@ -1403,7 +1386,7 @@ void SwRTFParser::ReadShapeObject()
                 break;
             case RTF_SN:
                 nToken = GetNextToken();
-                ASSERT(nToken==RTF_TEXTTOKEN, "expected name");
+                OSL_ENSURE(nToken==RTF_TEXTTOKEN, "expected name");
                 sn=aToken;
                 break;
             case RTF_SV:
@@ -1433,7 +1416,14 @@ void SwRTFParser::ReadShapeObject()
                       {
                         txflTextFlow=aToken.ToInt32();
                       }
-
+                    else if (sn.EqualsAscii("wzDescription"))
+                    {
+                        sDescription = aToken;
+                    }
+                    else if(sn.EqualsAscii("wzName"))
+                    {
+                        sName = aToken;
+                    }
                 }
                 break;
             case RTF_PICT:
@@ -1459,6 +1449,7 @@ void SwRTFParser::ReadShapeObject()
     }
     SkipToken(-1);
 
+    SdrObject* pSdrObject = 0;
     switch(shapeType)
     {
         case 202: /* Text Box */
@@ -1478,6 +1469,7 @@ void SwRTFParser::ReadShapeObject()
 
             const Rectangle aRect(FRound(aRange.getMinX()), FRound(aRange.getMinY()), FRound(aRange.getMaxX()), FRound(aRange.getMaxY()));
             SdrRectObj* pStroke = new SdrRectObj(aRect);
+            pSdrObject = pStroke;
             pStroke->SetSnapRect(aRect);
             pDoc->GetOrCreateDrawModel(); // create model
             InsertShpObject(pStroke, this->nZOrder++);
@@ -1525,7 +1517,7 @@ void SwRTFParser::ReadShapeObject()
             aLine.append(aPointRightBottom);
 
             SdrPathObj* pStroke = new SdrPathObj(OBJ_PLIN, ::basegfx::B2DPolyPolygon(aLine));
-            //pStroke->SetSnapRect(aRect);
+            pSdrObject = pStroke;
 
             InsertShpObject(pStroke, this->nZOrder++);
             SfxItemSet aSet(pStroke->GetMergedItemSet());
@@ -1545,11 +1537,17 @@ void SwRTFParser::ReadShapeObject()
             const Rectangle aRect(FRound(aRange.getMinX()), FRound(aRange.getMinY()), FRound(aRange.getMaxX()), FRound(aRange.getMaxY()));
 
             SdrRectObj* pStroke = new SdrGrafObj(aGrf);
+            pSdrObject = pStroke;
             pStroke->SetSnapRect(aRect);
 
             InsertShpObject(pStroke, this->nZOrder++);
         }
     }
+    if( pSdrObject )
+    {
+        pSdrObject->SetDescription(sDescription);
+        pSdrObject->SetTitle(sName);
+    }
 }
 
 extern void sw3io_ConvertFromOldField( SwDoc& rDoc, USHORT& rWhich,
@@ -1558,7 +1556,6 @@ extern void sw3io_ConvertFromOldField( SwDoc& rDoc, USHORT& rWhich,
 
 USHORT SwRTFParser::ReadRevTbl()
 {
-    // rStr.Erase( 0 );
     int nNumOpenBrakets = 1, nToken;        // die erste wurde schon vorher erkannt !!
     USHORT nAuthorTableIndex = 0;
 
@@ -2114,7 +2111,7 @@ void SwRTFParser::SetEndPrevPara( SvxNodeIdx*& rpNodePos, xub_StrLen& rCntPos )
     SwCntntNode* pNode = pDoc->GetNodes().GoPrevious( &aIdx );
     if( !pNode )
     {
-        ASSERT( FALSE, "keinen vorherigen ContentNode gefunden" );
+        OSL_ENSURE( FALSE, "keinen vorherigen ContentNode gefunden" );
     }
 
     rpNodePos = new SwNodeIdx( aIdx );
@@ -2128,12 +2125,12 @@ void SwRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet )
 
     SwPaM aPam( *pPam->GetPoint() );
 
-#ifdef DBG_UTIL
-    ASSERT( nSNd <= nENd, "Start groesser als Ende" );
+#if OSL_DEBUG_LEVEL > 1
+    OSL_ENSURE( nSNd <= nENd, "Start groesser als Ende" );
     SwNode* pDebugNd = pDoc->GetNodes()[ nSNd ];
-    ASSERT( pDebugNd->IsCntntNode(), "Start kein ContentNode" );
+    OSL_ENSURE( pDebugNd->IsCntntNode(), "Start kein ContentNode" );
     pDebugNd = pDoc->GetNodes()[ nENd ];
-    ASSERT( pDebugNd->IsCntntNode(), "Ende kein ContentNode" );
+    OSL_ENSURE( pDebugNd->IsCntntNode(), "Ende kein ContentNode" );
 #endif
 
     SwCntntNode* pCNd = pDoc->GetNodes()[ nSNd ]->GetCntntNode();
@@ -2687,7 +2684,7 @@ void SwRTFParser::ReadDocControls( int nToken )
             pColl = pDoc->GetTxtCollFromPool(RES_POOLCOLL_STANDARD, false );
         }
 
-        ASSERT(pColl, "impossible to have no standard style");
+        OSL_ENSURE(pColl, "impossible to have no standard style");
 
         if (pColl)
         {
@@ -2716,11 +2713,8 @@ void SwRTFParser::MakeStyleTab()
         if( !IsNewDoc() )
         {
             // search all outlined collections
-            //BYTE nLvl;
             const SwTxtFmtColls& rColls = *pDoc->GetTxtFmtColls();
             for( USHORT n = rColls.Count(); n; )
-                //if( MAXLEVEL > (nLvl = rColls[ --n ]->GetOutlineLevel() ))//#outline level,zhaojianwei
-                //  nValidOutlineLevels |= 1 << nLvl;
                 if( rColls[ --n ]->IsAssignedToListLevelOfOutlineStyle())
                     nValidOutlineLevels |= 1 << rColls[ n ]->GetAssignedOutlineStyleLevel();//<-end,zhaojianwei
         }
@@ -2839,7 +2833,7 @@ void SwRTFParser::ReadSectControls( int nToken )
         return;
     }
 
-    ASSERT(!maSegments.empty(), "suspicious to have a section with no "
+    OSL_ENSURE(!maSegments.empty(), "suspicious to have a section with no "
         "page info, though probably legal");
     if (maSegments.empty())
     {
@@ -3000,7 +2994,7 @@ void SwRTFParser::ReadSectControls( int nToken )
                 }
                 if (!aNewSection.mpPageHdFt)
                 {
-                    String aName(RTL_CONSTASCII_STRINGPARAM("rtfHdFt"));
+                    String aName(RTL_CONSTASCII_USTRINGPARAM("rtfHdFt"));
                     aName += String::CreateFromInt32(maSegments.size());
                     sal_uInt16 nPageNo = pDoc->MakePageDesc(aName);
                     aNewSection.mpPageHdFt = &pDoc->_GetPageDesc(nPageNo);
@@ -3015,7 +3009,7 @@ void SwRTFParser::ReadSectControls( int nToken )
             case RTF_HEADERF:
                 if (!aNewSection.mpTitlePageHdFt)
                 {
-                    String aTitle(RTL_CONSTASCII_STRINGPARAM("rtfTitleHdFt"));
+                    String aTitle(RTL_CONSTASCII_USTRINGPARAM("rtfTitleHdFt"));
                     aTitle += String::CreateFromInt32(maSegments.size());
                     sal_uInt16 nPageNo = pDoc->MakePageDesc(aTitle);
                     aNewSection.mpTitlePageHdFt = &pDoc->_GetPageDesc(nPageNo);
@@ -3110,7 +3104,7 @@ void SwRTFParser::ReadSectControls( int nToken )
             case RTF_MARGT:
             case RTF_MARGB:
             case RTF_FACINGP:
-                ASSERT(!this, "why are these tokens found in this section?");
+                OSL_ENSURE(!this, "why are these tokens found in this section?");
                 ReadDocControls( nToken );
                 break;
             default:
@@ -3238,7 +3232,7 @@ void SwRTFParser::ReadPageDescTbl()
         case '}':
             if (1 == --nNumOpenBrakets)
             {
-                ASSERT(pPgFmt && pPg, "Serious problem here");
+                OSL_ENSURE(pPgFmt && pPg, "Serious problem here");
                 if (pPgFmt && pPg)
                 {
                     // PageDesc ist fertig, setze am Doc
@@ -3274,7 +3268,7 @@ void SwRTFParser::ReadPageDescTbl()
                 if (nPos != pDoc->MakePageDesc(
                     String::CreateFromInt32(nTokenValue)))
                 {
-                    ASSERT( FALSE, "PageDesc an falscher Position" );
+                    OSL_ENSURE( FALSE, "PageDesc an falscher Position" );
                 }
             }
             pPg = &pDoc->_GetPageDesc(nPos);
@@ -3437,7 +3431,7 @@ void SwRTFParser::ReadPageDescTbl()
         case RTF_TEXTTOKEN:
             if (!DelCharAtEnd(aToken, ';' ).Len())
                 break;
-            ASSERT(pPg, "Unexpected missing pPg");
+            OSL_ENSURE(pPg, "Unexpected missing pPg");
             if (pPg)
             {
                 pPg->SetName(aToken);
@@ -3499,20 +3493,6 @@ void SwRTFParser::ReadPageDescTbl()
     SkipToken( -1 );
 }
 
-// -------------- Methoden --------------------
-
-/*
-void SwRTFParser::ReadUnknownData()
-{
-    SvRTFParser::ReadUnknownData();
-}
-
-void SwRTFParser::ReadOLEData()
-{
-    SvRTFParser::ReadOLEData();
-}
-*/
-
 void SwRTFParser::ReadPrtData()
 {
     while( IsParserWorking() )
@@ -3527,7 +3507,7 @@ void SwRTFParser::ReadPrtData()
 
 static const SwNodeIndex* SetHeader(SwFrmFmt* pHdFtFmt, BOOL bReuseOld)
 {
-    ASSERT(pHdFtFmt, "Impossible, no header");
+    OSL_ENSURE(pHdFtFmt, "Impossible, no header");
     const SwFrmFmt* pExisting = bReuseOld ?
         pHdFtFmt->GetHeader().GetHeaderFmt() : 0;
     if (!pExisting)
@@ -3541,7 +3521,7 @@ static const SwNodeIndex* SetHeader(SwFrmFmt* pHdFtFmt, BOOL bReuseOld)
 
 static const SwNodeIndex* SetFooter(SwFrmFmt* pHdFtFmt, BOOL bReuseOld)
 {
-    ASSERT(pHdFtFmt, "Impossible, no footer");
+    OSL_ENSURE(pHdFtFmt, "Impossible, no footer");
     const SwFrmFmt* pExisting = bReuseOld ?
         pHdFtFmt->GetFooter().GetFooterFmt() : 0;
     if (!pExisting)
@@ -3556,7 +3536,7 @@ static const SwNodeIndex* SetFooter(SwFrmFmt* pHdFtFmt, BOOL bReuseOld)
 
 void SwRTFParser::ReadHeaderFooter( int nToken, SwPageDesc* pPageDesc )
 {
-    ASSERT( RTF_FOOTNOTE == nToken ||
+    OSL_ENSURE( RTF_FOOTNOTE == nToken ||
             RTF_FLY_INPARA == nToken ||
             pPageDesc, "PageDesc fehlt" );
 
@@ -3607,7 +3587,7 @@ void SwRTFParser::ReadHeaderFooter( int nToken, SwPageDesc* pPageDesc )
             pTxtAttr = pTxtNd->InsertItem( aFtnNote, nPos, nPos,
                         bDelFirstChar ? nsSetAttrMode::SETATTR_NOTXTATRCHR : 0 );
 
-            ASSERT( pTxtAttr, "konnte die Fussnote nicht einfuegen/finden" );
+            OSL_ENSURE( pTxtAttr, "konnte die Fussnote nicht einfuegen/finden" );
 
             if( pTxtAttr )
                 pSttIdx = ((SwTxtFtn*)pTxtAttr)->GetStartNode();
@@ -3634,7 +3614,7 @@ void SwRTFParser::ReadHeaderFooter( int nToken, SwPageDesc* pPageDesc )
 
             pTxtAttr = pPam->GetNode()->GetTxtNode()->GetTxtAttrForCharAt(
                                                 nPos, RES_TXTATR_FLYCNT );
-            ASSERT( pTxtAttr, "konnte den Fly nicht einfuegen/finden" );
+            OSL_ENSURE( pTxtAttr, "konnte den Fly nicht einfuegen/finden" );
 
             pSttIdx = pHdFtFmt->GetCntnt().GetCntntIdx();
             bSetFlyInDoc = FALSE;
@@ -3859,29 +3839,6 @@ void SwRTFParser::SetSwgValues( SfxItemSet& rSet )
 
     }
 
-
-/*
- ????????????????????????????????????????????????????????????????????
- ?? muss die LineSpacing Hoehe 200Twip betragen ??
- ?? in rtfitem.hxx wird es auf 0 defaultet. Wenn ja, dann muss hier
- ?? ein neues Item gesetzt werden!!!!
- ????????????????????????????????????????????????????????????????????
-
-    // LineSpacing korrigieren
-    if( SFX_ITEM_SET == rSet.GetItemState( RES_PARATR_LINESPACING, FALSE, &pItem ))
-    {
-        const SvxLineSpacingItem* pLS = (const SvxLineSpacingItem*)pItem;
-        SvxLineSpacingItem aNew;
-
-        aNew.SetInterLineSpace( pLS->GetInterLineSpace() );
-        aNew.GetLineSpaceRule() = pLS->GetLineSpaceRule();
-        aNew.SetPropLineSpace( pLS->GetPropLineSpace() );
-        aNew.GetInterLineSpaceRule() = pLS->GetInterLineSpaceRule();
-
-        rSet.Put( aNew );
-    }
-?????????????????????????????????????????????????????????????????? */
-
 }
 
 
@@ -3889,7 +3846,6 @@ SwTxtFmtColl* SwRTFParser::MakeColl(const String& rName, USHORT nPos,
     BYTE nOutlineLevel, bool& rbCollExist)
 {
     if( BYTE(-1) == nOutlineLevel )
-        //nOutlineLevel = NO_NUMBERING;
         nOutlineLevel = MAXLEVEL;//#outline level,zhaojianwei
 
     rbCollExist = false;
@@ -3897,11 +3853,10 @@ SwTxtFmtColl* SwRTFParser::MakeColl(const String& rName, USHORT nPos,
     String aNm( rName );
     if( !aNm.Len() )
     {
-        ASSERT(!this, "not a bug, but I (cmc) want to see an example of this");
+        OSL_ENSURE(!this, "not a bug, but I (cmc) want to see an example of this");
         if( !nPos )
         {
             pColl = pDoc->GetTxtCollFromPool( RES_POOLCOLL_STANDARD, false );
-            //pColl->SetOutlineLevel( nOutlineLevel );      //#outline level,removed by zhaojianwei
             if(nOutlineLevel < MAXLEVEL )                           //->add by zhaojianwei
                 pColl->AssignToListLevelOfOutlineStyle( nOutlineLevel );
             else
@@ -3929,7 +3884,6 @@ SwTxtFmtColl* SwRTFParser::MakeColl(const String& rName, USHORT nPos,
 
     if (!rbCollExist)
     {
-        //pColl->SetOutlineLevel( nOutlineLevel );  //#outline level,removed by zhaojianwei
         if(nOutlineLevel < MAXLEVEL)                        //->add by zhaojianwei
             pColl->AssignToListLevelOfOutlineStyle( nOutlineLevel );
         else
@@ -3947,7 +3901,7 @@ SwCharFmt* SwRTFParser::MakeCharFmt(const String& rName, USHORT nPos,
     String aNm( rName );
     if( !aNm.Len() )
     {
-        ASSERT(!this, "not a bug, but I (cmc) want to see an example of this");
+        OSL_ENSURE(!this, "not a bug, but I (cmc) want to see an example of this");
         aNm.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "NoName(" ));
         aNm += String::CreateFromInt32( nPos );
         aNm += ')';
@@ -4262,13 +4216,6 @@ void SwRTFParser::UnknownAttrToken( int nToken, SfxItemSet* pSet )
         }
         break;
 
-/*
-    case RTF_SBYS:
-    case RTF_EXPND:
-    case RTF_KEEP:
-    case RTF_KEEPN:
-*/
-
     }
 }
 
diff --git a/sw/source/filter/rtf/swparrtf.hxx b/sw/source/filter/rtf/swparrtf.hxx
index c6bd7bdbc44c..cd550691ecfc 100644
--- a/sw/source/filter/rtf/swparrtf.hxx
+++ b/sw/source/filter/rtf/swparrtf.hxx
@@ -29,15 +29,9 @@
 #ifndef _SWPARRTF_HXX
 #define _SWPARRTF_HXX
 
-#ifndef __SGI_STL_MAP
 #include <map>
-#endif
-#ifndef __SGI_STL_DEQUE
 #include <deque>
-#endif
-#ifndef __SGI_STL_VECTOR
 #include <vector>
-#endif
 
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_BOOLS
@@ -47,9 +41,7 @@
 #include <editeng/numitem.hxx>
 #include <editeng/boxitem.hxx>
 #include <redline.hxx>
-#ifndef __SGI_STL_ALGORITHM
 #include <algorithm>
-#endif
 #include <fltshell.hxx>         // fuer den Attribut Stack
 #include <ndindex.hxx>
 #include "../inc/msfilter.hxx"
diff --git a/sw/source/filter/writer/makefile.mk b/sw/source/filter/writer/makefile.mk
index d08caa9eb441..1c11b8498b40 100644
--- a/sw/source/filter/writer/makefile.mk
+++ b/sw/source/filter/writer/makefile.mk
@@ -44,10 +44,14 @@ CXXFILES = \
         wrtswtbl.cxx
 
 SLOFILES =  \
+        $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
         $(SLO)$/writer.obj \
         $(SLO)$/wrt_fn.obj \
         $(SLO)$/wrtswtbl.obj
 
+
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index 789c468b4957..9f9e5e8cc6e3 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -93,7 +93,7 @@ Writer_Impl::~Writer_Impl()
 
 void Writer_Impl::RemoveFontList( SwDoc& rDoc )
 {
-    ASSERT( pFontRemoveLst, "wo ist die FontListe?" );
+    OSL_ENSURE( pFontRemoveLst, "wo ist die FontListe?" );
     for( USHORT i = pFontRemoveLst->Count(); i; )
     {
         SvxFontItem* pItem = (SvxFontItem*)(*pFontRemoveLst)[ --i ];
@@ -232,7 +232,7 @@ SwPaM* Writer::NewSwPaM( SwDoc & rDoc, ULONG nStartIdx, ULONG nEndIdx,
     SwCntntNode* pCNode = aStt.GetNode().GetCntntNode();
     if( !pCNode && 0 == ( pCNode = pNds->GoNext( &aStt )) )
     {
-        ASSERT( false, "An StartPos kein ContentNode mehr" );
+        OSL_ENSURE( false, "An StartPos kein ContentNode mehr" );
     }
 
     SwPaM* pNew = new SwPaM( aStt );
@@ -241,7 +241,7 @@ SwPaM* Writer::NewSwPaM( SwDoc & rDoc, ULONG nStartIdx, ULONG nEndIdx,
     if( 0 == (pCNode = aStt.GetNode().GetCntntNode()) &&
         0 == (pCNode = pNds->GoPrevious( &aStt )) )
     {
-        ASSERT( false, "An StartPos kein ContentNode mehr" );
+        OSL_ENSURE( false, "An StartPos kein ContentNode mehr" );
     }
     pCNode->MakeEndIndex( &pNew->GetPoint()->nContent );
     pNew->GetPoint()->nNode = aStt;
@@ -253,7 +253,7 @@ SwPaM* Writer::NewSwPaM( SwDoc & rDoc, ULONG nStartIdx, ULONG nEndIdx,
 // Stream-spezifisches
 SvStream& Writer::Strm()
 {
-    ASSERT( m_pImpl->m_pStream, "Oh-oh. Writer with no Stream!" );
+    OSL_ENSURE( m_pImpl->m_pStream, "Oh-oh. Writer with no Stream!" );
     return *m_pImpl->m_pStream;
 }
 
@@ -345,13 +345,13 @@ ULONG Writer::Write( SwPaM& rPam, SfxMedium& rMed, const String* pFileName )
 
 ULONG Writer::Write( SwPaM& /*rPam*/, SvStorage&, const String* )
 {
-    ASSERT( !this, "Schreiben in Storages auf einem Stream?" );
+    OSL_ENSURE( !this, "Schreiben in Storages auf einem Stream?" );
     return ERR_SWG_WRITE_ERROR;
 }
 
 ULONG Writer::Write( SwPaM&, const uno::Reference < embed::XStorage >&, const String*, SfxMedium* )
 {
-    ASSERT( !this, "Schreiben in Storages auf einem Stream?" );
+    OSL_ENSURE( !this, "Schreiben in Storages auf einem Stream?" );
     return ERR_SWG_WRITE_ERROR;
 }
 
@@ -363,9 +363,6 @@ BOOL Writer::CopyLocalFileToINet( String& rFileNm )
     BOOL bRet = FALSE;
     INetURLObject aFileUrl( rFileNm ), aTargetUrl( *pOrigFileName );
 
-// JP 01.11.00: what is the correct question for the portal??
-//  if( aFileUrl.GetProtocol() == aFileUrl.GetProtocol() )
-//      return bRet;
 // this is our old without the Mail-Export
     if( ! ( INET_PROT_FILE == aFileUrl.GetProtocol() &&
             INET_PROT_FILE != aTargetUrl.GetProtocol() &&
@@ -427,8 +424,6 @@ void Writer::PutNumFmtFontsInAttrPool()
     const SwNumRuleTbl& rListTbl = pDoc->GetNumRuleTbl();
     const SwNumRule* pRule;
     const SwNumFmt* pFmt;
-    // --> OD 2006-06-27 #b644095#
-//    const Font *pFont, *pDefFont = &SwNumRule::GetDefBulletFont();
     const Font* pFont;
     const Font* pDefFont = &numfunc::GetDefBulletFont();
     // <--
@@ -537,7 +532,7 @@ void Writer::CreateBookmarkTbl()
 USHORT Writer::GetBookmarks(const SwCntntNode& rNd, xub_StrLen nStt,
     xub_StrLen nEnd, SvPtrarr& rArr)
 {
-    ASSERT( !rArr.Count(), "es sind noch Eintraege vorhanden" );
+    OSL_ENSURE( !rArr.Count(), "es sind noch Eintraege vorhanden" );
 
     ULONG nNd = rNd.GetIndex();
     SvPtrarr* pArr = (m_pImpl->pBkmkNodePos) ?
@@ -581,7 +576,7 @@ USHORT Writer::GetBookmarks(const SwCntntNode& rNd, xub_StrLen nStt,
 
 ULONG StgWriter::WriteStream()
 {
-    ASSERT( !this, "Schreiben in Streams auf einem Storage?" );
+    OSL_ENSURE( !this, "Schreiben in Streams auf einem Storage?" );
     return ERR_SWG_WRITE_ERROR;
 }
 
diff --git a/sw/source/filter/writer/wrt_fn.cxx b/sw/source/filter/writer/wrt_fn.cxx
index cf5e59ba783a..171d5d39bc11 100644
--- a/sw/source/filter/writer/wrt_fn.cxx
+++ b/sw/source/filter/writer/wrt_fn.cxx
@@ -42,7 +42,7 @@
 Writer& Out( const SwAttrFnTab pTab, const SfxPoolItem& rHt, Writer & rWrt )
 {
     USHORT nId = rHt.Which();
-    ASSERT(  nId < POOLATTR_END && nId >= POOLATTR_BEGIN, "SwAttrFnTab::Out()" );
+    OSL_ENSURE(  nId < POOLATTR_END && nId >= POOLATTR_BEGIN, "SwAttrFnTab::Out()" );
     FnAttrOut pOut;
     if( 0 != ( pOut = pTab[ nId - RES_CHRATR_BEGIN] ))
         (*pOut)( rWrt, rHt );
@@ -70,7 +70,7 @@ Writer& Out_SfxItemSet( const SwAttrFnTab pTab, Writer& rWrt,
     FnAttrOut pOut;
     if( !bDeep || !pSet->GetParent() )
     {
-        ASSERT( rSet.Count(), "Wurde doch schon behandelt oder?" );
+        OSL_ENSURE( rSet.Count(), "Wurde doch schon behandelt oder?" );
         SfxItemIter aIter( *pSet );
         pItem = aIter.GetCurItem();
         do {
@@ -119,7 +119,7 @@ Writer& Out( const SwNodeFnTab pTab, SwNode& rNode, Writer & rWrt )
             nId = RES_OLENODE;
             break;
         default:
-            ASSERT(false, "was fuer ein Node ist es denn nun?");
+            OSL_ENSURE(false, "was fuer ein Node ist es denn nun?");
             break;
     }
     FnNodeOut pOut;
diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx
index 7992301d1a76..5b466c217007 100644
--- a/sw/source/filter/writer/wrtswtbl.cxx
+++ b/sw/source/filter/writer/wrtswtbl.cxx
@@ -112,7 +112,7 @@ long SwWriteTable::GetBoxWidth( const SwTableBox *pBox )
 
 long SwWriteTable::GetLineHeight( const SwTableLine *pLine )
 {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     BOOL bOldGetLineHeightCalled = bGetLineHeightCalled;
     bGetLineHeightCalled = TRUE;
 #endif
@@ -133,8 +133,8 @@ long SwWriteTable::GetLineHeight( const SwTableLine *pLine )
         // <--
         bUseLayoutHeights = bLayoutAvailable; /*FALSE;*/
 
-#ifdef DBG_UTIL
-        ASSERT( bLayoutAvailable || !bOldGetLineHeightCalled, "Layout ungueltig?" );
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( bLayoutAvailable || !bOldGetLineHeightCalled, "Layout ungueltig?" );
 #endif
     }
 
@@ -362,7 +362,7 @@ USHORT SwWriteTable::GetAbsWidth( USHORT nCol, USHORT nColSpan ) const
 
     nWidth -= GetLeftSpace( nCol ) + GetRightSpace( nCol, nColSpan );
 
-    ASSERT( nWidth > 0, "Spaltenbreite <= 0. OK?" );
+    OSL_ENSURE( nWidth > 0, "Spaltenbreite <= 0. OK?" );
     return nWidth > 0 ? (USHORT)nWidth : 0;
 }
 
@@ -409,7 +409,7 @@ long SwWriteTable::GetAbsHeight( long nRawHeight, USHORT nRow,
             nRawHeight -= nBorder;
     }
 
-    ASSERT( nRawHeight > 0, "Zeilenheohe <= 0. OK?" );
+    OSL_ENSURE( nRawHeight > 0, "Zeilenheohe <= 0. OK?" );
     return nRawHeight > 0 ? nRawHeight : 0;
 }
 
@@ -429,7 +429,7 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos,
     BOOL bSubExpanded = FALSE;
     USHORT nLines = rLines.Count();
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     USHORT nEndCPos = 0;
 #endif
 
@@ -450,7 +450,7 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos,
                 layout, you may run into this robust code.
                 It's not allowed that subrows leaves their parentrow. If this would happen the line
                 height of subrow is reduced to a part of the remaining height */
-                ASSERT( FALSE, "Corrupt line height I" );
+                OSL_ENSURE( FALSE, "Corrupt line height I" );
                 nRPos -= nLineHeight;
                 nLineHeight = nStartRPos + nParentLineHeight - nRPos; // remaining parent height
                 nLineHeight /= nLines - nLine; // divided through the number of remaining sub rows
@@ -465,17 +465,17 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos,
         }
         else
         {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
             long nCheckPos = nRPos + GetLineHeight( pLine );
 #endif
             nRPos = nStartRPos + nParentLineHeight;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
             SwWriteTableRow aRow( nStartRPos + nParentLineHeight, bUseLayoutHeights );
-            ASSERT( aRows.Seek_Entry(&aRow),
+            OSL_ENSURE( aRows.Seek_Entry(&aRow),
                     "Parent-Zeile nicht gefunden" );
             SwWriteTableRow aRowCheckPos(nCheckPos,bUseLayoutHeights);
             SwWriteTableRow aRowRPos(nRPos,bUseLayoutHeights);
-            ASSERT( !bUseLayoutHeights ||
+            OSL_ENSURE( !bUseLayoutHeights ||
                     aRowCheckPos == aRowRPos,
                     "Hoehe der Zeilen stimmt nicht mit Parent ueberein" );
 #endif
@@ -505,14 +505,14 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos,
 
                 if( nBox==nBoxes-1 )
                 {
-                    ASSERT( nLine==0 && nParentLineWidth==0,
+                    OSL_ENSURE( nLine==0 && nParentLineWidth==0,
                             "Jetzt wird die Parent-Breite plattgemacht!" );
                     nParentLineWidth = nCPos-nStartCPos;
                 }
             }
             else
             {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
                 USHORT nCheckPos = nCPos + (USHORT)GetBoxWidth( pBox );
                 if( !nEndCPos )
                 {
@@ -520,17 +520,17 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos,
                 }
                 else
                 {
-                    ASSERT( SwWriteTableCol(nCheckPos) ==
+                    OSL_ENSURE( SwWriteTableCol(nCheckPos) ==
                                                 SwWriteTableCol(nEndCPos),
                     "Zelle enthaelt unterschiedlich breite Zeilen" );
                 }
 #endif
                 nCPos = nStartCPos + nParentLineWidth;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
                 SwWriteTableCol aCol( nStartCPos + nParentLineWidth );
-                ASSERT( aCols.Seek_Entry(&aCol),
+                OSL_ENSURE( aCols.Seek_Entry(&aCol),
                         "Parent-Zelle nicht gefunden" );
-                ASSERT( SwWriteTableCol(nCheckPos) ==
+                OSL_ENSURE( SwWriteTableCol(nCheckPos) ==
                                             SwWriteTableCol(nCPos),
                         "Breite der Zellen stimmt nicht mit Parent ueberein" );
 #endif
@@ -579,7 +579,7 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, USHORT nStartRow,
             if( nParentLineHeight && nStartRPos + nParentLineHeight <= nRPos )
             {
                 /* See comment in CollectTableRowCols */
-                ASSERT( FALSE, "Corrupt line height II" );
+                OSL_ENSURE( FALSE, "Corrupt line height II" );
                 nRPos -= nLineHeight;
                 nLineHeight = nStartRPos + nParentLineHeight - nRPos; // remaining parent height
                 nLineHeight /= nLines - nLine; // divided through the number of remaining sub rows
@@ -592,13 +592,15 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, USHORT nStartRow,
         // Und ihren Index
         USHORT nOldRow = nRow;
         SwWriteTableRow aRow( nRPos,bUseLayoutHeights );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         BOOL bFound =
 #endif
             aRows.Seek_Entry( &aRow, &nRow );
-        ASSERT( bFound, "Wo ist die Zeile geblieben?" );
+#if OSL_DEBUG_LEVEL > 1
+        OSL_ENSURE( bFound, "Wo ist die Zeile geblieben?" );
+#endif
 
-        ASSERT( nOldRow <= nRow, "Don't look back!" );
+        OSL_ENSURE( nOldRow <= nRow, "Don't look back!" );
         if( nOldRow > nRow )
         {
             nOldRow = nRow;
@@ -609,7 +611,6 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, USHORT nStartRow,
 
         SwWriteTableRow *pRow = aRows[nOldRow];
         SwWriteTableRow *pEndRow = aRows[nRow];
-//      if( nLine==0 && nParentLineHeight==0 )
         if( nLine+1==nNumOfHeaderRows && nParentLineHeight==0 )
             nHeadEndRow = nRow;
 
@@ -677,11 +678,13 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, USHORT nStartRow,
             // Und ihren Index
             USHORT nOldCol = nCol;
             SwWriteTableCol aCol( nCPos );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
             BOOL bFound2 =
 #endif
                 aCols.Seek_Entry( &aCol, &nCol );
-            ASSERT( bFound2, "Wo ist die Spalte geblieben?" );
+#if OSL_DEBUG_LEVEL > 1
+            OSL_ENSURE( bFound2, "Wo ist die Spalte geblieben?" );
+#endif
 
             if( !ShouldExpandSub( pBox, bSubExpanded, nDepth ) )
             {
@@ -712,7 +715,7 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, USHORT nStartRow,
                     if (!(nBorderMask & 4) && nOldCol < aCols.Count())
                     {
                         SwWriteTableCol *pCol = aCols[nOldCol];
-                        ASSERT(pCol, "No TableCol found, panic!");
+                        OSL_ENSURE(pCol, "No TableCol found, panic!");
                         if (pCol)
                             pCol->bLeftBorder = FALSE;
                     }
@@ -720,7 +723,7 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, USHORT nStartRow,
                     if (!(nBorderMask & 8))
                     {
                         SwWriteTableCol *pCol = aCols[nCol];
-                        ASSERT(pCol, "No TableCol found, panic!");
+                        OSL_ENSURE(pCol, "No TableCol found, panic!");
                         if (pCol)
                             pCol->bRightBorder = FALSE;
                     }
@@ -740,16 +743,6 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, USHORT nStartRow,
                         pEndRow->nBottomBorder = nBottomBorder;
                     }
                 }
-//              MIB: 13.12.2000: Why should a cell that contains a subtable
-//              not have borders? Moreover, switching them, off switches off
-//              the fill border lines between the columns and rows. (#74222#)
-//              else
-//              {
-//                  aCols[nOldCol]->bLeftBorder = FALSE;
-//                  aCols[nCol]->bRightBorder = FALSE;
-//                  pRow->bTopBorder = FALSE;
-//                  pEndRow->bBottomBorder = FALSE;
-//              }
             }
             else
             {
@@ -774,7 +767,7 @@ SwWriteTable::SwWriteTable(const SwTableLines& rLines, long nWidth,
     nInnerBorder(0), nBaseWidth(nBWidth), nHeadEndRow(USHRT_MAX),
      nLeftSub(nLSub), nRightSub(nRSub), nTabWidth(nWidth), bRelWidths(bRel),
     bUseLayoutHeights(true),
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     bGetLineHeightCalled(false),
 #endif
     bColsOption(false), bColTags(true), bLayoutExport(false),
@@ -801,7 +794,7 @@ SwWriteTable::SwWriteTable( const SwHTMLTableLayout *pLayoutInfo )
     nInnerBorder(0), nBaseWidth(pLayoutInfo->GetWidthOption()), nHeadEndRow(0),
     nLeftSub(0), nRightSub(0), nTabWidth(pLayoutInfo->GetWidthOption()),
     bRelWidths(pLayoutInfo->HasPrcWidthOption()), bUseLayoutHeights(false),
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     bGetLineHeightCalled(false),
 #endif
     bColsOption(pLayoutInfo->HasColsOption()),
@@ -872,7 +865,7 @@ SwWriteTable::SwWriteTable( const SwHTMLTableLayout *pLayoutInfo )
             USHORT nRowSpan = pLayoutCell->GetRowSpan();
             USHORT nColSpan = pLayoutCell->GetColSpan();
             const SwTableBox *pBox = pLayoutCnts->GetTableBox();
-            ASSERT( pBox,
+            OSL_ENSURE( pBox,
                     "Tabelle in Tabelle kann nicht ueber Layout exportiert werden" );
 
             long nHeight = bHeightExported ? 0 : GetLineHeight( pBox );
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index b05111271c36..8ea2525b75d4 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -86,7 +86,7 @@ static SwCntntNode* GetCntntNode(SwDoc* pDoc, SwNodeIndex& rIdx, BOOL bNext)
     {
         pCNd = bNext ? pDoc->GetNodes().GoPrevious(&rIdx)
                      : pDoc->GetNodes().GoNext(&rIdx);
-        ASSERT(pCNd, "kein ContentNode gefunden");
+        OSL_ENSURE(pCNd, "kein ContentNode gefunden");
     }
     return pCNd;
 }
@@ -161,7 +161,7 @@ BOOL SwFltStackEntry::MakeRegion(SwDoc* pDoc, SwPaM& rRegion, BOOL bCheck )
     }
     rRegion.GetPoint()->nContent.Assign(pCNd, nPtCntnt);
 #if OSL_DEBUG_LEVEL > 1
-    ASSERT( CheckNodesRange( rRegion.Start()->nNode,
+    OSL_ENSURE( CheckNodesRange( rRegion.Start()->nNode,
                              rRegion.End()->nNode, TRUE ),
              "Attribut oder AEhnliches ueber Bereichs-Grenzen" );
 #endif
@@ -180,7 +180,7 @@ SwFltControlStack::SwFltControlStack(SwDoc* pDo, ULONG nFieldFl)
 
 SwFltControlStack::~SwFltControlStack()
 {
-    ASSERT(!Count(), "noch Attribute auf dem Stack");
+    OSL_ENSURE(!Count(), "noch Attribute auf dem Stack");
 }
 
 // MoveAttrs() ist fuer folgendes Problem:
@@ -203,14 +203,14 @@ void SwFltControlStack::MoveAttrs( const SwPosition& rPos )
         if(( pEntry->nMkNode.GetIndex() + 1 == nPosNd )
            &&( pEntry->nMkCntnt >= nPosCt )){
             pEntry->nMkCntnt++;
-            ASSERT( pEntry->nMkCntnt
+            OSL_ENSURE( pEntry->nMkCntnt
                 <= pDoc->GetNodes()[nPosNd]->GetCntntNode()->Len(),
                     "Attribut-Anfang hinter Zeilenende" );
         }
         if(( pEntry->nPtNode.GetIndex() + 1 == nPosNd )
            &&( pEntry->nPtCntnt >= nPosCt )){
             pEntry->nPtCntnt++;
-            ASSERT( pEntry->nPtCntnt
+            OSL_ENSURE( pEntry->nPtCntnt
                 <= pDoc->GetNodes()[nPosNd]->GetCntntNode()->Len(),
                     "Attribut-Ende hinter Zeilenende" );
         }
@@ -236,7 +236,7 @@ void SwFltControlStack::NewAttr(const SwPosition& rPos, const SfxPoolItem & rAtt
 
 void SwFltControlStack::DeleteAndDestroy(Entries::size_type nCnt)
 {
-    ASSERT(nCnt < maEntries.size(), "Out of range!");
+    OSL_ENSURE(nCnt < maEntries.size(), "Out of range!");
     if (nCnt < maEntries.size())
     {
         myEIter aElement = maEntries.begin() + nCnt;
@@ -301,10 +301,10 @@ void SwFltControlStack::KillUnlockedAttrs(const SwPosition& pPos)
 void SwFltControlStack::SetAttr(const SwPosition& rPos, USHORT nAttrId,
                                 BOOL bTstEnde, long nHand, BOOL consumedByField )
 {
-    ASSERT(!nAttrId ||
+    OSL_ENSURE(!nAttrId ||
         (POOLATTR_BEGIN <= nAttrId && POOLATTR_END > nAttrId) ||
         (RES_FLTRATTR_BEGIN <= nAttrId && RES_FLTRATTR_END > nAttrId),
-        "Falsche Id fuers Attribut")
+        "Falsche Id fuers Attribut");
 
     USHORT nCnt = static_cast< USHORT >(Count());
 
@@ -370,9 +370,6 @@ static void MakeBookRegionOrPoint(SwFltStackEntry* pEntry, SwDoc* pDoc,
 {
     if (pEntry->MakeRegion(pDoc, rRegion, bCheck )){
         const SwNodes& rNds = pDoc->GetNodes();
-//      BOOL b1 = rNds[rRegion.GetPoint()->nNode]->FindTableNode() != 0;
-//      const SwStartNode* p1 = rNds[rRegion.GetPoint()->nNode]->FindTableBoxStartNode();
-//      const SwStartNode* p2 = rNds[rRegion.GetMark()->nNode]->FindTableBoxStartNode();
         if( rNds[rRegion.GetPoint()->nNode]->FindTableBoxStartNode()
               != rNds[rRegion.GetMark()->nNode]->FindTableBoxStartNode() ){
             rRegion.Exchange();         // Ungueltiger Bereich
@@ -632,7 +629,6 @@ const SfxPoolItem* SwFltControlStack::GetFmtAttr(const SwPosition& rPos, USHORT
         return (const SfxPoolItem*)pHt;
 
     // im Stack ist das Attribut nicht vorhanden, also befrage das Dokument
-//  SwCntntNode * pNd = rPaM.GetCntntNode();
     SwCntntNode * pNd = pDoc->GetNodes()[ rPos.nNode ]->GetCntntNode();
 
     if (!pNd)           // kein ContentNode, dann das dflt. Attribut
@@ -653,7 +649,7 @@ void SwFltControlStack::Delete(const SwPaM &rPam)
     USHORT nEndIdx = pEnd->nContent.GetIndex();
 
     //We don't support deleting content that is over one node, or removing a node.
-    ASSERT(aEndNode == aStartNode, "nodes must be the same, or this method extended");
+    OSL_ENSURE(aEndNode == aStartNode, "nodes must be the same, or this method extended");
     if (aEndNode != aStartNode)
         return;
 
@@ -1006,7 +1002,7 @@ SwFltShell::~SwFltShell()
 
 SwFltShell& SwFltShell::operator << ( const String& rStr )
 {
-    ASSERT(eSubMode != Style, "char insert while in style-mode");
+    OSL_ENSURE(eSubMode != Style, "char insert while in style-mode");
     GetDoc().InsertString( *pPaM, rStr );
     return *this;
 }
@@ -1043,7 +1039,7 @@ String SwFltShell::QuoteStr( const String& rIn )
 
 SwFltShell& SwFltShell::operator << ( const sal_Unicode c )
 {
-    ASSERT( eSubMode != Style, "char insert while in style-mode");
+    OSL_ENSURE( eSubMode != Style, "char insert while in style-mode");
     GetDoc().InsertString( *pPaM, c );
     return *this;
 }
@@ -1133,7 +1129,7 @@ SwFltShell& SwFltShell::SetStyle( USHORT nStyle )
     }
     else
     {
-        ASSERT( FALSE, "Ungueltiger SwFltStyleCode" );
+        OSL_ENSURE( FALSE, "Ungueltiger SwFltStyleCode" );
     }
     return *this;
 }
@@ -1156,7 +1152,7 @@ SwFltShell& SwFltShell::EndItem( USHORT nAttrId )
     switch( nAttrId )
     {
     case RES_FLTR_BOOKMARK:
-        ASSERT( FALSE, "Falscher Aufruf fuer Bookmark-Ende" );
+        OSL_ENSURE( FALSE, "Falscher Aufruf fuer Bookmark-Ende" );
         break;
 
     case RES_FLTR_TOX:
@@ -1289,64 +1285,64 @@ SwFltOutBase::SwFltOutBase(SwDoc& rDocu)
 
 const SfxPoolItem& SwFltOutBase::GetCellAttr(USHORT nWhich)
 {
-    ASSERT(FALSE, "GetCellAttr ausserhalb von normalem Text");
+    OSL_ENSURE(FALSE, "GetCellAttr ausserhalb von normalem Text");
     return GetDoc().GetAttrPool().GetDefaultItem(nWhich);
 }
 
 BOOL SwFltOutBase::BeginTable()
 {
-    ASSERT(FALSE, "BeginTable ausserhalb von normalem Text");
+    OSL_ENSURE(FALSE, "BeginTable ausserhalb von normalem Text");
     return FALSE;
 }
 
 void SwFltOutBase::NextTableCell()
 {
-    ASSERT(FALSE, "NextTableCell ausserhalb von normalem Text");
+    OSL_ENSURE(FALSE, "NextTableCell ausserhalb von normalem Text");
 }
 
 void SwFltOutBase::NextTableRow()
 {
-    ASSERT(FALSE, "NextTableRow ausserhalb von normalem Text");
+    OSL_ENSURE(FALSE, "NextTableRow ausserhalb von normalem Text");
 }
 
 void SwFltOutBase::SetTableWidth(SwTwips /*nW*/)
 {
-    ASSERT(FALSE, "SetTableWidth ausserhalb von normalem Text");
+    OSL_ENSURE(FALSE, "SetTableWidth ausserhalb von normalem Text");
 }
 
 void SwFltOutBase::SetTableOrient(sal_Int16 /*eOri*/)
 {
-    ASSERT(FALSE, "SetTableOrient ausserhalb von normalem Text");
+    OSL_ENSURE(FALSE, "SetTableOrient ausserhalb von normalem Text");
 }
 
 void SwFltOutBase::SetCellWidth(SwTwips /*nWidth*/, USHORT /*nCell*/)
 {
-    ASSERT(FALSE, "SetCellWidth ausserhalb von normalem Text");
+    OSL_ENSURE(FALSE, "SetCellWidth ausserhalb von normalem Text");
 }
 
 void SwFltOutBase::SetCellHeight(SwTwips /*nH*/)
 {
-    ASSERT(FALSE, "SetCellHeight ausserhalb von normalem Text");
+    OSL_ENSURE(FALSE, "SetCellHeight ausserhalb von normalem Text");
 }
 
 void SwFltOutBase::SetCellBorder(const SvxBoxItem& /*rFmtBox*/, USHORT /*nCell*/)
 {
-    ASSERT(FALSE, "SetCellBorder ausserhalb von normalem Text");
+    OSL_ENSURE(FALSE, "SetCellBorder ausserhalb von normalem Text");
 }
 
 void SwFltOutBase::SetCellSpace(USHORT /*nSp*/)
 {
-    ASSERT(FALSE, "SetCellSpace ausserhalb von normalem Text");
+    OSL_ENSURE(FALSE, "SetCellSpace ausserhalb von normalem Text");
 }
 
 void SwFltOutBase::DeleteCell(USHORT /*nCell*/)
 {
-    ASSERT(FALSE, "DeleteCell ausserhalb von normalem Text");
+    OSL_ENSURE(FALSE, "DeleteCell ausserhalb von normalem Text");
 }
 
 void SwFltOutBase::EndTable()
 {
-    ASSERT(FALSE, "EndTable ausserhalb von normalem Text");
+    OSL_ENSURE(FALSE, "EndTable ausserhalb von normalem Text");
 }
 
 /*virtual*/ BOOL SwFltOutDoc::IsInTable()
@@ -1360,7 +1356,7 @@ BOOL SwFltOutDoc::BeginTable()
         return FALSE;
 
     if (pTable){
-        ASSERT(FALSE, "BeginTable in Table");
+        OSL_ENSURE(FALSE, "BeginTable in Table");
         return FALSE;
     }
                             // Alle Attribute schliessen, da sonst Attribute
@@ -1369,7 +1365,7 @@ BOOL SwFltOutDoc::BeginTable()
     rEndStack.SetAttr( *pPaM->GetPoint(), 0, FALSE );
 
 // create table:
-    ASSERT(pTabSavedPos == NULL, "SwFltOutDoc");
+    OSL_ENSURE(pTabSavedPos == NULL, "SwFltOutDoc");
     pTabSavedPos = new SwPosition(*pPaM->GetPoint());
     pTable = GetDoc().InsertTable(
             SwInsertTableOptions( tabopts::HEADLINE_NO_BORDER, 1 ),
@@ -1386,7 +1382,7 @@ BOOL SwFltOutDoc::BeginTable()
 SwTableBox* SwFltOutDoc::GetBox(USHORT ny, USHORT nx /*= USHRT_MAX */)
 {
     if(!pTable){
-        ASSERT(pTable, "GetBox ohne Tabelle");
+        OSL_ENSURE(pTable, "GetBox ohne Tabelle");
         return 0;
     }
     if( nx == USHRT_MAX )   // aktuelle Zelle
@@ -1395,44 +1391,44 @@ SwTableBox* SwFltOutDoc::GetBox(USHORT ny, USHORT nx /*= USHRT_MAX */)
 // get structs to table cells
     const SwTableLines* pTableLines = &pTable->GetTabLines();
     if(!pTableLines){
-        ASSERT(FALSE, "SwFltOutDoc:GetBox:pTableLines");
+        OSL_ENSURE(FALSE, "SwFltOutDoc:GetBox:pTableLines");
         return 0;
     }
     if( ny >= pTableLines->Count() ){   // Notbremse
-        ASSERT( FALSE, "SwFltOutDoc:GetBox:ny >= Count()");
+        OSL_ENSURE( FALSE, "SwFltOutDoc:GetBox:ny >= Count()");
         ny = pTableLines->Count() - 1;
     }
     SwTableLine* pTableLine = (*pTableLines)[ny];
     if(!pTableLine){
-        ASSERT(FALSE, "SwFltOutDoc:GetBox:pTableLine");
+        OSL_ENSURE(FALSE, "SwFltOutDoc:GetBox:pTableLine");
         return 0;
     }
     SwTableBoxes* pTableBoxes = &pTableLine->GetTabBoxes();
     if(!pTableBoxes){
-        ASSERT(FALSE, "SwFltOutDoc:GetBox:pTableBoxes");
+        OSL_ENSURE(FALSE, "SwFltOutDoc:GetBox:pTableBoxes");
         return 0;
     }
     if( nx >= pTableBoxes->Count() ){   // Notbremse
-        ASSERT(FALSE, "SwFltOutDoc:GetBox:nx >= Count()");
+        OSL_ENSURE(FALSE, "SwFltOutDoc:GetBox:nx >= Count()");
         nx = pTableBoxes->Count() - 1;
     }
     SwTableBox* pTableBox = (*pTableBoxes)[nx];
 
-    ASSERT(pTableBox != 0, "SwFltOutDoc:GetBox:pTableBox");
+    OSL_ENSURE(pTableBox != 0, "SwFltOutDoc:GetBox:pTableBox");
     return pTableBox;
 }
 
 void SwFltOutDoc::NextTableCell()
 {
     if(!pTable){
-        ASSERT(pTable, "NextTableCell ohne Tabelle");
+        OSL_ENSURE(pTable, "NextTableCell ohne Tabelle");
         return;
     }
     const SwTableLines* pTableLines = &pTable->GetTabLines();
     SwTableLine* pTableLine = (*pTableLines)[usTableY];
     SwTableBoxes* pTableBoxes = &pTableLine->GetTabBoxes();
     SwTableBox* pTableBox = (*pTableBoxes)[usTableX];
-    ASSERT(pTableBox != 0, "SwFltOutDoc:NextTableCell:pTableBox");
+    OSL_ENSURE(pTableBox != 0, "SwFltOutDoc:NextTableCell:pTableBox");
     if(!pTableBox)
         return;
 //#pragma message(__FILE__ "(?) : Sw's const problem")
@@ -1447,7 +1443,7 @@ void SwFltOutDoc::NextTableCell()
          pTableBoxes->Count());
     SeekCell(usTableY, usTableX, TRUE);
     pTableBox = (*pTableBoxes)[usTableX];
-    ASSERT(pTableBox != 0, "SwFltOutDoc:pTableBox");
+    OSL_ENSURE(pTableBox != 0, "SwFltOutDoc:pTableBox");
     if(pTableBox)
         (*pTableBoxes)[usTableX]->ClaimFrmFmt();
 }
@@ -1471,10 +1467,10 @@ void SwFltOutDoc::NextTableRow()
 void SwFltOutDoc::SetTableWidth(SwTwips nSwWidth)
 {
     if(!pTable){
-        ASSERT(pTable, "SetTableWidth ohne Tabelle");
+        OSL_ENSURE(pTable, "SetTableWidth ohne Tabelle");
         return;
     }
-    ASSERT( nSwWidth > MINLAY, "Tabellenbreite <= MINLAY" );
+    OSL_ENSURE( nSwWidth > MINLAY, "Tabellenbreite <= MINLAY" );
     if( nSwWidth != nTableWidth ){
         if( nTableWidth )           // Nicht beim ersten Setzen
             SplitTable();
@@ -1486,7 +1482,7 @@ void SwFltOutDoc::SetTableWidth(SwTwips nSwWidth)
 void SwFltOutDoc::SetTableOrient(sal_Int16 eOri)
 {
     if(!pTable){
-        ASSERT(pTable, "SetTableOrient ohne Tabelle");
+        OSL_ENSURE(pTable, "SetTableOrient ohne Tabelle");
         return;
     }
     pTable->GetFrmFmt()->SetFmtAttr( SwFmtHoriOrient( 0, eOri ));
@@ -1495,10 +1491,10 @@ void SwFltOutDoc::SetTableOrient(sal_Int16 eOri)
 void SwFltOutDoc::SetCellWidth(SwTwips nWidth, USHORT nCell /* = USHRT_MAX */ )
 {
     if(!pTable){
-        ASSERT(pTable, "SetCellWidth ohne Tabelle");
+        OSL_ENSURE(pTable, "SetCellWidth ohne Tabelle");
         return;
     }
-    ASSERT( nWidth > MINLAY, "Tabellenzellenbreite <= MINLAY" );
+    OSL_ENSURE( nWidth > MINLAY, "Tabellenzellenbreite <= MINLAY" );
     if (nWidth < MINLAY)
         nWidth = MINLAY;
 
@@ -1513,7 +1509,7 @@ void SwFltOutDoc::SetCellWidth(SwTwips nWidth, USHORT nCell /* = USHRT_MAX */ )
 void SwFltOutDoc::SetCellHeight(SwTwips nHeight)
 {
     if(!pTable){
-        ASSERT(pTable, "SetCellHeight ohne Tabelle");
+        OSL_ENSURE(pTable, "SetCellHeight ohne Tabelle");
         return;
     }
 
@@ -1529,7 +1525,7 @@ void SwFltOutDoc::SetCellHeight(SwTwips nHeight)
 const SfxPoolItem& SwFltOutDoc::GetCellAttr(USHORT nWhich)
 {
     if (!pTable){
-        ASSERT(pTable, "GetCellAttr ohne Table");
+        OSL_ENSURE(pTable, "GetCellAttr ohne Table");
         return GetDoc().GetAttrPool().GetDefaultItem(nWhich);
     }
 
@@ -1551,7 +1547,7 @@ void SwFltOutDoc::SetCellBorder(const SvxBoxItem& rFmtBox,
 void SwFltOutDoc::SetCellSpace(USHORT nDist)
 {
     if(!pTable){
-        ASSERT(pTable, "SetCellSpace ohne Tabelle");
+        OSL_ENSURE(pTable, "SetCellSpace ohne Tabelle");
         return;
     }
     SwTableBox* pTableBox = GetBox(usTableY, usTableX);
@@ -1586,7 +1582,7 @@ void SwFltOutDoc::SplitTable()
 {
     if(!pTable)
     {
-        ASSERT(pTable, "SplitTable ohne Tabelle");
+        OSL_ENSURE(pTable, "SplitTable ohne Tabelle");
         return;
     }
     SwTableBox* pAktBox = GetBox(usTableY, usTableX);
@@ -1599,7 +1595,7 @@ void SwFltOutDoc::SplitTable()
 void SwFltOutDoc::EndTable()
 {
     if (!pTable){
-        ASSERT(pTable, "EndTable ohne Table");
+        OSL_ENSURE(pTable, "EndTable ohne Table");
         return;
     }
                             // Alle Attribute schliessen, da sonst Attribute
@@ -1632,7 +1628,7 @@ BOOL SwFltOutDoc::SeekCell(short nRow, short nCol, BOOL bPam)
 
     if ((USHORT)nRow >= pTableLines->Count())
     {
-        ASSERT((USHORT)nRow >= pTableLines->Count(), "SwFltOutDoc");
+       OSL_ENSURE((USHORT)nRow >= pTableLines->Count(), "SwFltOutDoc");
         return FALSE;
     }
     pTableLine = (*pTableLines)[nRow];
@@ -1642,7 +1638,7 @@ BOOL SwFltOutDoc::SeekCell(short nRow, short nCol, BOOL bPam)
     pTableBox = (*pTableBoxes)[nCol];
     if( !pTableBox->GetSttNd() )
     {
-        ASSERT(pTableBox->GetSttNd(), "SwFltOutDoc");
+        OSL_ENSURE(pTableBox->GetSttNd(), "SwFltOutDoc");
         return FALSE;
     }
     if(bPam)
@@ -1683,12 +1679,14 @@ SfxItemSet* SwFltOutBase::NewFlyDefaults()
 BOOL SwFltOutBase::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/,
                            BOOL bAbsolutePos /*= FALSE*/,
                            const SfxItemSet*
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
                                pMoreAttrs /*= 0*/
 #endif
                             )
 {
-    ASSERT(!pMoreAttrs, "SwFltOutBase:BeginFly mit pMoreAttrs" );
+#if OSL_DEBUG_LEVEL > 1
+    OSL_ENSURE(!pMoreAttrs, "SwFltOutBase:BeginFly mit pMoreAttrs" );
+#endif
     eFlyAnchor = eAnchor;
     bFlyAbsPos = bAbsolutePos;      // Bloedsinn eigentlich
     return TRUE;
@@ -1697,11 +1695,11 @@ BOOL SwFltOutBase::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/,
 /*virtual*/ void SwFltOutBase::SetFlyAnchor( RndStdIds eAnchor )
 {
     if( !IsInFly() ){
-        ASSERT( FALSE, "SetFlyAnchor() ohne Fly" );
+        OSL_ENSURE( FALSE, "SetFlyAnchor() ohne Fly" );
         return;
     }
     if ( eAnchor == FLY_AS_CHAR ){
-        ASSERT( FALSE, "SetFlyAnchor( FLY_AS_CHAR ) nicht implementiert" );
+        OSL_ENSURE( FALSE, "SetFlyAnchor( FLY_AS_CHAR ) nicht implementiert" );
         return;
     }
     SwFmtAnchor& rAnchor = (SwFmtAnchor&)GetFlyFrmAttr( RES_ANCHOR );
@@ -1732,9 +1730,9 @@ SwFrmFmt* SwFltOutDoc::MakeFly( RndStdIds eAnchor, SfxItemSet* pSet )
     return pFly;
 }
 
-BOOL SwFltOutDoc::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/,
-                           BOOL bAbsolutePos /*= FALSE*/,
-                           const SfxItemSet* pMoreAttrs /*= 0*/ )
+BOOL SwFltOutDoc::BeginFly( RndStdIds eAnchor,
+                           BOOL bAbsolutePos ,
+                           const SfxItemSet* pMoreAttrs)
 
 {
     SwFltOutBase::BeginFly( eAnchor, bAbsolutePos, 0 );
@@ -1746,7 +1744,7 @@ BOOL SwFltOutDoc::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/,
     rEndStack.SetAttr( *pPaM->GetPoint(), 0, FALSE );
 
 // create Fly:
-    ASSERT(pFlySavedPos == NULL, "BeginFly in Fly");    // rekursiv geht noch nicht
+    OSL_ENSURE(pFlySavedPos == NULL, "BeginFly in Fly");    // rekursiv geht noch nicht
     pFlySavedPos = new SwPosition(*pPaM->GetPoint());
 
 
@@ -1759,7 +1757,6 @@ BOOL SwFltOutDoc::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/,
 //  dieses NICHT bei Seitengebundenem Fly mit Seiten-NUMMER !
     aAnchor.SetAnchor(pPaM->GetPoint());    // braucht erstaunlicherweise
                                             // den Stack nicht
-//  aStack.NewAttr( *pPaM->GetPoint(), SwFltAnchor( pFly ) );
 
     pSet->Put( aAnchor );
     SwFrmFmt* pF = MakeFly( eAnchor, pSet );
@@ -1767,7 +1764,7 @@ BOOL SwFltOutDoc::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/,
 
 // set pam in Fly
     const SwFmtCntnt& rCntnt = pF->GetCntnt();
-    ASSERT( rCntnt.GetCntntIdx(), "Kein Inhalt vorbereitet." );
+    OSL_ENSURE( rCntnt.GetCntntIdx(), "Kein Inhalt vorbereitet." );
     pPaM->GetPoint()->nNode = rCntnt.GetCntntIdx()->GetIndex() + 1;
     SwCntntNode *pNode = pPaM->GetCntntNode();
     pPaM->GetPoint()->nContent.Assign( pNode, 0 );
@@ -1780,7 +1777,7 @@ BOOL SwFltOutDoc::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/,
     if (pFly){
         pFly->SetFmtAttr( rAttr );
     }else{
-        ASSERT(pFly, "SetFlyAttr ohne Doc-Fly");
+        OSL_ENSURE(pFly, "SetFlyAttr ohne Doc-Fly");
         return;
     }
 }
@@ -1790,7 +1787,7 @@ BOOL SwFltOutDoc::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/,
     if (pFly){
         return pFly->GetFmtAttr( nWhich );
     }else{
-        ASSERT(pFly, "GetFlyAttr ohne Fly");
+        OSL_ENSURE(pFly, "GetFlyAttr ohne Fly");
         return GetDoc().GetAttrPool().GetDefaultItem(nWhich);
     }
 }
@@ -1798,7 +1795,7 @@ BOOL SwFltOutDoc::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/,
 void SwFltOutDoc::EndFly()
 {
     if( pTable ){
-        ASSERT( FALSE, "SwFltOutDoc::EndFly() in Table" );
+        OSL_ENSURE( FALSE, "SwFltOutDoc::EndFly() in Table" );
         return;
     }
                         // Alle Attribute schliessen, da sonst Attribute
@@ -1831,16 +1828,15 @@ void SwFltOutDoc::EndFly()
 
 /*virtual*/ const SfxPoolItem& SwFltFormatCollection::GetFlyFrmAttr(USHORT nWhich)
 {
-//  ASSERT( pFlyAttrs, "GetFlyFrmAttr ohne Coll-FlyAttrs" );
     if( pFlyAttrs )
         return pFlyAttrs->Get( nWhich, FALSE );
     else
         return GetDoc().GetAttrPool().GetDefaultItem(nWhich);
 }
 
-BOOL SwFltFormatCollection::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/,
-                           BOOL bAbsolutePos /*= FALSE*/,
-                           const SfxItemSet* pMoreAttrs /*= 0*/ )
+BOOL SwFltFormatCollection::BeginFly( RndStdIds eAnchor,
+                           BOOL bAbsolutePos,
+                           const SfxItemSet* pMoreAttrs)
 
 {
     SwFltOutBase::BeginFly( eAnchor, bAbsolutePos, pMoreAttrs );
@@ -1854,8 +1850,8 @@ void SwFltFormatCollection::EndFly()    // Wird nie aufgerufen
 
 BOOL SwFltFormatCollection::BeginStyleFly( SwFltOutDoc* pOutDoc )
 {
-    ASSERT( pOutDoc, "BeginStyleFly ohne pOutDoc" );
-    ASSERT( pOutDoc && !pOutDoc->IsInFly(), "BeginStyleFly in Fly" );
+    OSL_ENSURE( pOutDoc, "BeginStyleFly ohne pOutDoc" );
+    OSL_ENSURE( pOutDoc && !pOutDoc->IsInFly(), "BeginStyleFly in Fly" );
     if( pOutDoc && !pOutDoc->IsInFly() )
         return pOutDoc->BeginFly( eFlyAnchor, bFlyAbsPos, pFlyAttrs );
     else
@@ -1866,16 +1862,16 @@ BOOL SwFltFormatCollection::BeginStyleFly( SwFltOutDoc* pOutDoc )
 // Flys in SwFltShell
 //-----------------------------------------------------------------------------
 
-BOOL SwFltShell::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/,
-                           BOOL bAbsolutePos /*= FALSE*/ )
+BOOL SwFltShell::BeginFly( RndStdIds eAnchor,
+                           BOOL bAbsolutePos)
 
 {
     if (pOut->IsInFly()){
-        ASSERT(FALSE, "BeginFly in Fly");
+        OSL_ENSURE(FALSE, "BeginFly in Fly");
         return FALSE;
     }
     if (pOutDoc->IsInTable()){
-        ASSERT(FALSE, "BeginFly in Table");
+        OSL_ENSURE(FALSE, "BeginFly in Table");
         return FALSE;
     }
     pOut->BeginFly( eAnchor, bAbsolutePos, pColls[nAktStyle]->GetpFlyAttrs() );
@@ -1883,14 +1879,14 @@ BOOL SwFltShell::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/,
     return TRUE;
 }
 
-void SwFltShell::SetFlyXPos( short nXPos, sal_Int16 eHRel /*= text::RelOrientation::FRAME*/,
-                             sal_Int16 eHAlign /*= text::HoriOrientation::NONE*/ )
+void SwFltShell::SetFlyXPos( short nXPos, sal_Int16 eHRel,
+                             sal_Int16 eHAlign)
 {
     SetFlyFrmAttr( SwFmtHoriOrient( nXPos, eHAlign, eHRel ) );
 }
 
-void SwFltShell::SetFlyYPos( short nYPos, sal_Int16 eVRel /*= text::RelOrientation::FRAME*/,
-                             sal_Int16 eVAlign /*= text::VertOrientation::NONE*/ )
+void SwFltShell::SetFlyYPos( short nYPos, sal_Int16 eVRel,
+                             sal_Int16 eVAlign)
 {
     SetFlyFrmAttr( SwFmtVertOrient( nYPos, eVAlign, eVRel ) );
 }
@@ -1899,11 +1895,11 @@ void SwFltShell::SetFlyYPos( short nYPos, sal_Int16 eVRel /*= text::RelOrientati
 void SwFltShell::EndFly()
 {
     if (!pOut->IsInFly()){
-        ASSERT(FALSE, "EndFly ohne Fly");
+        OSL_ENSURE(FALSE, "EndFly ohne Fly");
         return;
     }
     if (pOutDoc->IsInTable()){      // Table verschraenkt mit Fly macht keinen Sinn
-        ASSERT(FALSE, "EndFly in Table ( verschraenkt )");
+        OSL_ENSURE(FALSE, "EndFly in Table ( verschraenkt )");
         EndTable();     // -> Table beenden
     }
     pOut->EndFly();
@@ -1917,35 +1913,34 @@ void SwFltShell::EndFly()
 void SwFltShell::BeginFootnote()
 {
     if( pOut->IsInFly() ){          // Passiert z.B. bei Fussnote in Fly
-        ASSERT(FALSE, "Fussnote in Fly nicht erlaubt");
+        OSL_ENSURE(FALSE, "Fussnote in Fly nicht erlaubt");
         return;
     }
     if( pOutDoc->IsInTable() ){
-        ASSERT(FALSE, "Fussnote in Table z.Zt. nicht erlaubt");
+        OSL_ENSURE(FALSE, "Fussnote in Table z.Zt. nicht erlaubt");
         return;
     }
 
 // Alle Attribute schliessen, da sonst Attribute entstehen koennen,
 // die in Fussnoten reinragen
     aStack.SetAttr( *pPaM->GetPoint(), 0, FALSE );
-//  aEndStack.SetAttr( *pPaM->GetPoint(), 0, FALSE );
 //  EndStack erstmal nicht zwangs-Schliessen, damit Bookmarks ueber
 //  Fussnoten im PMW uebernommen werden
 
     SwFmtFtn aFtn;
     GetDoc().InsertPoolItem(*pPaM, aFtn, 0);
-    ASSERT(pSavedPos == NULL, "SwFltShell");
+    OSL_ENSURE(pSavedPos == NULL, "SwFltShell");
     pSavedPos = new SwPosition(*pPaM->GetPoint());
     pPaM->Move(fnMoveBackward, fnGoCntnt);
     SwTxtNode* pTxt = pPaM->GetNode()->GetTxtNode();
     SwTxtAttr *const pFN = pTxt->GetTxtAttrForCharAt(
         pPaM->GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN);
     if( !pFN ){         // Passiert z.B. bei Fussnote in Fly
-        ASSERT(pFN, "Probleme beim Anlegen des Fussnoten-Textes");
+        OSL_ENSURE(pFN, "Probleme beim Anlegen des Fussnoten-Textes");
         return;
     }
     const SwNodeIndex* pStartIndex = ((SwTxtFtn*)pFN)->GetStartNode();
-    ASSERT(pStartIndex, "Probleme beim Anlegen des Fussnoten-Textes");
+    OSL_ENSURE(pStartIndex, "Probleme beim Anlegen des Fussnoten-Textes");
     pPaM->GetPoint()->nNode = pStartIndex->GetIndex() + 1;
     pPaM->GetPoint()->nContent.Assign(pPaM->GetCntntNode(), 0);
     eSubMode = Footnote;
@@ -1958,7 +1953,6 @@ void SwFltShell::EndFootnote()
                         // Alle Attribute schliessen, da sonst Attribute
                         // entstehen koennen, die aus Fussnoten rausragen
     aStack.SetAttr( *pPaM->GetPoint(), 0, FALSE );
-//  aEndStack.SetAttr( *pPaM->GetPoint(), 0, FALSE );
 //  EndStack erstmal nicht zwangs-Schliessen, damit Bookmarks ueber
 //  Fussnoten im PMW uebernommen werden
 
@@ -1969,15 +1963,14 @@ void SwFltShell::EndFootnote()
 
 void SwFltShell::BeginHeader(SwPageDesc* /*pPD*/)
 {
-    SwFrmFmt* pFmt = &pCurrentPageDesc->GetMaster(
-     ); //(bUseLeft) ?  &pCurrentPageDesc->GetLeft() :
+    SwFrmFmt* pFmt = &pCurrentPageDesc->GetMaster();
     SwFrmFmt* pHdFtFmt;
     pFmt->SetFmtAttr(SwFmtHeader(TRUE));
     pHdFtFmt = (SwFrmFmt*)pFmt->GetHeader().GetHeaderFmt();
     const SwNodeIndex* pStartIndex = pHdFtFmt->GetCntnt().GetCntntIdx();
     if (!pStartIndex)
         return;
-    ASSERT(pSavedPos == NULL, "SwFltShell");
+    OSL_ENSURE(pSavedPos == NULL, "SwFltShell");
     pSavedPos = new SwPosition(*pPaM->GetPoint());
     pPaM->GetPoint()->nNode = pStartIndex->GetIndex() + 1;
     pPaM->GetPoint()->nContent.Assign(pPaM->GetCntntNode(), 0);
@@ -1986,15 +1979,14 @@ void SwFltShell::BeginHeader(SwPageDesc* /*pPD*/)
 
 void SwFltShell::BeginFooter(SwPageDesc* /*pPD*/)
 {
-    SwFrmFmt* pFmt =  &pCurrentPageDesc->GetMaster(
-     ); //(bUseLeft) ?  &pCurrentPageDesc->GetLeft() :
+    SwFrmFmt* pFmt =  &pCurrentPageDesc->GetMaster();
     SwFrmFmt* pHdFtFmt;
     pFmt->SetFmtAttr(SwFmtFooter(TRUE));
     pHdFtFmt = (SwFrmFmt*)pFmt->GetFooter().GetFooterFmt();
     const SwNodeIndex* pStartIndex = pHdFtFmt->GetCntnt().GetCntntIdx();
     if (!pStartIndex)
         return;
-    ASSERT(pSavedPos == NULL, "SwFltShell");
+    OSL_ENSURE(pSavedPos == NULL, "SwFltShell");
     pSavedPos = new SwPosition(*pPaM->GetPoint());
     pPaM->GetPoint()->nNode = pStartIndex->GetIndex() + 1;
     pPaM->GetPoint()->nContent.Assign(pPaM->GetCntntNode(), 0);
@@ -2064,8 +2056,8 @@ SwFltFormatCollection::SwFltFormatCollection(
 
 void SwFltShell::NextStyle(USHORT nWhich, USHORT nNext)
 {
-        ASSERT(pColls[nWhich], "Next style for noexistent style" );
-        ASSERT(pColls[nNext], "Next style to noexistent style" );
+        OSL_ENSURE(pColls[nWhich], "Next style for noexistent style" );
+        OSL_ENSURE(pColls[nNext], "Next style to noexistent style" );
         if( pColls[nWhich] && pColls[nNext] )
             pColls[nWhich]->GetColl()->SetNextTxtFmtColl(
                  *pColls[nNext]->GetColl() );
diff --git a/sw/source/filter/ww1/makefile.mk b/sw/source/filter/ww1/makefile.mk
index 4f751cbaea29..58930bdca9c7 100644
--- a/sw/source/filter/ww1/makefile.mk
+++ b/sw/source/filter/ww1/makefile.mk
@@ -43,15 +43,14 @@ CDEFS=$(CDEFS) -Dmydebug
 # --- Files --------------------------------------------------------
 
 EXCEPTIONSFILES=	\
+        $(SLO)$/fltshell.obj \
         $(SLO)$/w1filter.obj \
-        $(SLO)$/fltshell.obj
+        $(SLO)$/w1par.obj \
+        $(SLO)$/w1sprm.obj
 
 SLOFILES =  \
-        $(SLO)$/w1par.obj \
-        $(SLO)$/w1class.obj \
-        $(SLO)$/w1filter.obj \
-        $(SLO)$/w1sprm.obj \
-        $(SLO)$/fltshell.obj \
+        $(EXCEPTIONSFILES) \
+        $(SLO)$/w1class.obj
 
 
 # --- Targets -------------------------------------------------------
diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx
index 8c3f415486ab..2e999b73c0e2 100644
--- a/sw/source/filter/ww1/w1class.cxx
+++ b/sw/source/filter/ww1/w1class.cxx
@@ -501,7 +501,6 @@ USHORT Ww1SingleSprmByteSized::Size(BYTE* pSprm)
     USHORT nRet;
     nRet = SVBT8ToByte(pSprm);
     nRet += sizeof(SVBT8);  // var. l. byte-size
-//  pSprm += sizeof(SVBT8); // var. l. byte-size
     nRet = nRet + nCountBytes;
     return nRet;
 }
@@ -511,7 +510,6 @@ USHORT Ww1SingleSprmWordSized::Size(BYTE* pSprm)
     USHORT nRet;
     nRet = SVBT16ToShort(pSprm);
     nRet += sizeof(SVBT16);  // var. l. word-size
-//  pSprm += sizeof(SVBT16); // var. l. word-size
     nRet = nRet + nCountBytes;
     return nRet;
 }
@@ -520,7 +518,6 @@ static BYTE nLast = 0;
 static BYTE nCurrent = 0;
 USHORT Ww1Sprm::GetSize(BYTE nId, BYTE* pSprm)
 {
-    //DBG_ASSERT( nId < sizeof(aTab) / sizeof(*aTab), "Ww1Sprm" );
     USHORT nL = 0;
     nL = GetTab(nId).Size(pSprm);
     nLast = nCurrent;
@@ -530,7 +527,6 @@ USHORT Ww1Sprm::GetSize(BYTE nId, BYTE* pSprm)
 
 BOOL Ww1Sprm::Fill(USHORT index, BYTE& nId, USHORT& nL, BYTE*& pSprm)
 {
-    //DBG_ASSERT( nId < sizeof(aTab) / sizeof(*aTab), "Ww1Sprm");
     DBG_ASSERT(index < Count(), "Ww1Sprm");
     pSprm = p + pArr[index];
     nId = SVBT8ToByte(pSprm);
@@ -993,7 +989,6 @@ BOOL Ww1FkpPap::Fill(USHORT nIndex, BYTE*& p, USHORT& rnCountBytes)
     if (nOffset)
     {
         DBG_ASSERT(nOffset>(USHORT)(Count()*sizeof(SVBT32)), "calc error");
-//      rnCountBytes = SVBT8ToByte(aFkp+nOffset) * 2 + 1;  // SH: +1 ?????
         rnCountBytes = SVBT8ToByte(aFkp+nOffset) * 2;
         nOffset += sizeof(SVBT8);
         if( nOffset + rnCountBytes < 511 )  // SH: Assert schlug 1 zu frueh zu
@@ -1095,7 +1090,6 @@ ULONG Ww1Pap::Where( BOOL bSetIndex )
                 nFkpIndex = 0;
         }
     if (pPap != NULL)
-//      if (nFkpIndex < pPap->Count())
         if (nFkpIndex <= pPap->Count())
             ulRet = pPap->Where(nFkpIndex) - rFib.GetFIB().fcMinGet();
     return ulRet;
@@ -1104,7 +1098,6 @@ ULONG Ww1Pap::Where( BOOL bSetIndex )
 void Ww1Pap::operator++(int)
 {
     if (pPap != NULL)
-//      if (++nFkpIndex >= pPap->Count())
         if (++nFkpIndex > pPap->Count())
         {
             delete pPap;
@@ -1196,7 +1189,6 @@ ULONG Ww1Chp::Where( BOOL bSetIndex )
                 nFkpIndex = 0;
         }
     if (pChp != NULL)
-//      if (nFkpIndex < pChp->Count())
         if (nFkpIndex <= pChp->Count())
             ulRet = pChp->Where(nFkpIndex) -
                      rFib.GetFIB().fcMinGet() - ulOffset;
@@ -1206,7 +1198,6 @@ ULONG Ww1Chp::Where( BOOL bSetIndex )
 void Ww1Chp::operator++(int)
 {
     if (pChp != NULL)
-//      if (++nFkpIndex >= pChp->Count())
         if (++nFkpIndex > pChp->Count())
         {
             delete pChp;
diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx
index 07b570f44906..d494d20b85e8 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -253,7 +253,6 @@ void Ww1Manager::Out(Ww1Shell& rOut, sal_Unicode cUnknown)
         break;
         case 0x0b: // linebreak
             if (rOut.IsInTable())
-//              rOut.NextBand();    // war Stuss
                 ;
             else
                 rOut.NextLine();
@@ -402,7 +401,6 @@ void Ww1Footnotes::Stop(Ww1Shell& /*rOut*/, Ww1Manager& rMan, sal_Unicode& c)
     if (bStarted && rMan.Where() > Where())
     {
         DBG_ASSERT(nPlcIndex < Count(), "Ww1Footnotes");
-//      DBG_ASSERT(c==0x02, "Ww1Footnotes");    // scheint Stuss zu sein
         c = ' ';
         (*this)++;
     }
@@ -636,10 +634,7 @@ oncemore:
                 REF_BOOKMARK,
                 0,
                 REF_CONTENT );
-//          pField = new SwGetExpField((SwGetExpFieldType*)
-//           rOut.GetSysFldType(RES_GETEXPFLD), sFormel, nsSwGetSetExpType::GSE_STRING);
-//           ,
-//           nsSwGetSetExpType::GSE_STRING, VVF_SYS);
+
         break;
         case 6: // set command
         {
@@ -854,10 +849,6 @@ oncemore:
                 break;
             aFName.SearchAndReplaceAscii( "\\\\", String( '\\' ));
 
-//          char* pBook = FindNextPara( pNext, 0 );     //!! Bookmark/Feld-Name
-//                                                      //!! erstmal nicht
-
-//          ConvertFFileName( aPara, pFName );          //!! WW1 ????
             aFName = URIHelper::SmartRel2Abs(
                 INetURLObject(rOut.GetBaseURL()), aFName );
 
@@ -890,9 +881,6 @@ oncemore:
             pField = new SwSetExpField((SwSetExpFieldType*)pFT, aStr );
             ((SwSetExpField*)pField)->SetInputFlag( TRUE );
             ((SwSetExpField*)pField)->SetSubType(nsSwExtendedSubType::SUB_INVISIBLE);
-//          pField.SetPromptText( aQ ); //!! fehlt noch
-//          aFld.SetPar2( aDef );       //!! dito
-            // das Ignorieren des Bookmarks ist nicht implementiert
         }
         case 39: // fillin command
             pField = new SwInputField(
@@ -963,9 +951,6 @@ oncemore:
         case 4: // index entry
         // wwpar5: 1351/1454
         case 5: // footnote ref
-//          pField = new SwGetRefField(
-//           (SwGetRefFieldType*)rDoc.GetSysFldType(RES_GETREFFLD),
-//           sFormel, REF_FOOTNOTE, 0, REF_BEGIN);
         case 7: // if command
         case 8: // create index
         // wwpar5: 1351/1454
@@ -1076,7 +1061,6 @@ void Ww1Pap::Stop(Ww1Shell& rOut, Ww1Manager& rMan, sal_Unicode&)
             aSprm.Stop(rOut, rMan);
         }else{
             DBG_ASSERT( !nPlcIndex || rMan.IsStopAll(), "Pap-Attribut-Stop verloren" );
-//          rMan.IsStopAll() ist nicht schoen.
         }
     }
 }
@@ -1455,7 +1439,6 @@ SvxFontItem Ww1Fonts::GetFont(USHORT nFCode)
 void Ww1Dop::Out(Ww1Shell& rOut)
 {
     //~ mdt: fehlt
-    // aDop.fWidowControlGet(); // keine Absatztrennung fuer einzelne Zeilen
     long nDefTabSiz = aDop.dxaTabGet();
     if (nDefTabSiz < 56)
         nDefTabSiz = 709;
@@ -1487,7 +1470,6 @@ void Ww1Dop::Out(Ww1Shell& rOut)
     case 2: aInfo.ePos = FTNPOS_PAGE; break;
     default: aInfo.ePos = FTNPOS_CHAPTER; break;
     }
-//  aInfo.eNum = ( rDOP.fFtnRestartGet() ) ? FTNNUM_CHAPTER : FTNNUM_DOC;
     // Da Sw unter Chapter anscheinend was anderes versteht als PMW
     // hier also immer Doc !
     aInfo.eNum = FTNNUM_DOC;
@@ -1640,12 +1622,7 @@ void Ww1StyleSheet::OutOne(Ww1Shell& rOut, Ww1Manager& rMan, USHORT stc)
 {
     const RES_POOL_COLLFMT_TYPE RES_NONE = RES_POOLCOLL_DOC_END;
     RES_POOL_COLLFMT_TYPE aType = RES_NONE;
-//              aType = RES_POOLCOLL_JAKETADRESS; break;
-//              aType = RES_POOLCOLL_LISTS_BEGIN; break;
-//              aType = RES_POOLCOLL_SENDADRESS; break;
-//              aType = RES_POOLCOLL_SIGNATURE; break;
-//              aType = RES_POOLCOLL_TEXT_NEGIDENT; break;
-//              aType = RES_POOLCOLL_TOX_IDXH; break;
+
     switch (stc)
     {
     case 222: // Null
@@ -1718,7 +1695,6 @@ void Ww1StyleSheet::OutOne(Ww1Shell& rOut, Ww1Manager& rMan, USHORT stc)
         aType = RES_POOLCOLL_TEXT_IDENT; break;
     case 0: // Normal
         aType = RES_POOLCOLL_STANDARD; break;
-//      aType = RES_POOLCOLL_TEXT; break;       // Das ist "textkoerper"
     }
     if (aType == RES_NONE)
         rOut.BeginStyle(stc, GetStyle(stc).GetName() );
@@ -1727,7 +1703,6 @@ void Ww1StyleSheet::OutOne(Ww1Shell& rOut, Ww1Manager& rMan, USHORT stc)
     OutDefaults(rOut, rMan, stc);
     GetStyle(stc).Out(rOut, rMan);
     rOut.EndStyle();
-//  rMan.SetInApo(FALSE);
 }
 // OutOneWithBase() liest einen Style mit OutOne() einen Style ein
 // Jedoch liest er, wenn noch nicht geschehen, den Basisstyle rekursiv ein
@@ -1794,8 +1769,8 @@ void Ww1Picture::WriteBmp(SvStream& rOut)
     USHORT padx = ((maxx + 7) / 8) * 8;
     USHORT maxy = pPic->mfp.yExtGet();
 
-    /*USHORT unknown1 = SVBT16ToShort(p);*/ p+= sizeof(SVBT16); nSize -= sizeof(SVBT16);
-    /*USHORT unknown2 = SVBT16ToShort(p);*/ p+= sizeof(SVBT16); nSize -= sizeof(SVBT16);
+     p+= sizeof(SVBT16); nSize -= sizeof(SVBT16);
+     p+= sizeof(SVBT16); nSize -= sizeof(SVBT16);
 #if OSL_DEBUG_LEVEL > 1
     USHORT x = SVBT16ToShort(p);
     (void) x;
@@ -1955,13 +1930,11 @@ void Ww1Picture::Out(Ww1Shell& rOut, Ww1Manager& /*rMan*/)
         String aDir( (sal_Char*)pPic->rgbGet(),
                 (USHORT)(pPic->lcbGet() - (sizeof(*pPic)-sizeof(pPic->rgb))),
                 RTL_TEXTENCODING_MS_1252 );
-        //SvFileStream aOut(aDir, STREAM_READ|STREAM_WRITE|STREAM_TRUNC);
+
         rOut.AddGraphic( aDir );
     }
     break;
     case 97: // embedded bitmap
-//  case 99: // SH: bei meinem BspDoc 41738.doc auch embedded Bitmap,
-             // aber leider anderes Format
     {
         ULONG nSiz = GuessPicSize(pPic);
         SvMemoryStream aOut(nSiz, 8192);
@@ -2045,9 +2018,7 @@ void Ww1HeaderFooter::Start(Ww1Shell& rOut, Ww1Manager& rMan)
 
 void Ww1HeaderFooter::Stop(Ww1Shell& rOut, Ww1Manager& rMan, sal_Unicode&)
 {
-    if (!rMan.Pushed() && eHeaderFooterMode != None
-//   && rMan.GetText().Where() >= rMan.GetText().Count()
-    )
+    if (!rMan.Pushed() && eHeaderFooterMode != None)
     {
         Start(rOut, rMan);
     }
diff --git a/sw/source/filter/ww1/w1par.cxx b/sw/source/filter/ww1/w1par.cxx
index 472841432049..c90e39b173a7 100644
--- a/sw/source/filter/ww1/w1par.cxx
+++ b/sw/source/filter/ww1/w1par.cxx
@@ -73,7 +73,7 @@ static ULONG WW1_Read_FieldIniFlags()
 ULONG WW1Reader::Read(SwDoc& rDoc, const String& rBaseURL, SwPaM& rPam, const String& /*cName*/)
 {
     ULONG nRet = ERR_SWG_READ_ERROR;
-    ASSERT(pStrm!=NULL, "W1-Read ohne Stream");
+    OSL_ENSURE(pStrm!=NULL, "W1-Read ohne Stream");
     if (pStrm != NULL)
     {
         BOOL bNew = !bInsertMode;           // Neues Doc ( kein Einfuegen )
diff --git a/sw/source/filter/ww1/w1sprm.cxx b/sw/source/filter/ww1/w1sprm.cxx
index b1be9e59dcbc..920370622aee 100644
--- a/sw/source/filter/ww1/w1sprm.cxx
+++ b/sw/source/filter/ww1/w1sprm.cxx
@@ -66,7 +66,6 @@ using namespace ::com::sun::star;
 void Ww1Sprm::Stop( Ww1Shell& rOut, Ww1Manager& rMan)
 {
     if(IsUsed())
-//      for(USHORT i=0;i<Count();i++)
         for(short i=Count()-1;i>=0;i--){    // rueckwaerts
             BYTE nId;
             USHORT nSize;
@@ -103,7 +102,7 @@ void Ww1SingleSprm::Start(
 void Ww1SingleSprm::Stop(
     Ww1Shell&, BYTE, BYTE*, USHORT, Ww1Manager&)
 {
-//  ASSERT(FALSE, "Unknown Sprm");
+// OSL_ENSURE(FALSE, "Unknown Sprm");
 }
 
 ////////////////////////////////////////////////////////////////// STOP
@@ -214,7 +213,7 @@ SvxBorderLine* Ww1SingleSprmPBrc::SetBorder(SvxBorderLine* pLine, W1_BRC10* pBrc
     {
         switch(pBrc->dxpLine1WidthGet())
         {
-        default: ASSERT(FALSE, "unknown linewidth");
+        default: OSL_ENSURE(FALSE, "unknown linewidth");
         case 0: return 0;                           // keine Linie
         case 1: nCode = DEF_LINE_WIDTH_0; break;
         case 2: nCode = DEF_LINE_WIDTH_1; break;
@@ -238,20 +237,20 @@ SvxBorderLine* Ww1SingleSprmPBrc::SetBorder(SvxBorderLine* pLine, W1_BRC10* pBrc
     {
         switch(pBrc->dxpLine1WidthGet())
         {
-        default: ASSERT(FALSE, "unknown linewidth");
+        default: OSL_ENSURE(FALSE, "unknown linewidth");
         case 1: nCode = DEF_DOUBLE_LINE0_IN; break;
         }
         pLine->SetOutWidth(nCode);
         switch(pBrc->dxpLine2WidthGet())
         {
-        default: ASSERT(FALSE, "unknown linewidth");
+        default: OSL_ENSURE(FALSE, "unknown linewidth");
         case 1: nCode = DEF_DOUBLE_LINE0_OUT; break;
         }
         pLine->SetInWidth(nCode);
     }
     switch(pBrc->dxpLine1WidthGet())
     {
-    default: ASSERT(FALSE, "unknown space");
+    default: OSL_ENSURE(FALSE, "unknown space");
     case 0: nCode = DEF_DOUBLE_LINE0_DIST; break;
     case 1: nCode = DEF_DOUBLE_LINE1_DIST; break;
     case 2: nCode = DEF_DOUBLE_LINE2_DIST; break;
@@ -265,14 +264,16 @@ void Ww1SingleSprmPBrc::Start(
     Ww1Shell& rOut, BYTE,
     W1_BRC10* pBrc,
     USHORT
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     nSize
 #endif
     ,
     Ww1Manager& /*rMan*/,
     SvxBoxItem& aBox)
 {
-    ASSERT(sizeof(W1_BRC10) == nSize, "sizemissmatch");
+#if OSL_DEBUG_LEVEL > 1
+    OSL_ENSURE(sizeof(W1_BRC10) == nSize, "sizemissmatch");
+#endif
     if(pBrc->dxpSpaceGet())
         aBox.SetDistance(10 + 20 * pBrc->dxpSpaceGet());
             //??? Warum 10+... ????
@@ -308,7 +309,6 @@ void Ww1SingleSprmPBrc10::Start(
                      rOut.GetFlyFrmAttr(RES_BOX) :rOut.GetAttr(RES_BOX));
     const SvxBoxItem &rBoxItem = (const SvxBoxItem&)rItem;
     SvxBoxItem aBox( rBoxItem );
-//  rOut >> aBox;
     SvxBorderLine aLine;
     aBox.SetLine(SetBorder(&aLine, pBrc), nBrcTrans[nLine] );
     Ww1SingleSprmPBrc::Start(rOut, nId, pBrc, nSize, rMan, aBox);
@@ -366,12 +366,8 @@ void Ww1SingleSprmPDyaLine::Start(
 void Ww1SingleSprmPChgTabsPapx::Start(
     Ww1Shell& rOut, BYTE /*nId*/, BYTE* pSprm, USHORT /*nSize*/, Ww1Manager& /*rMan*/)
 {
-#if OSL_DEBUG_LEVEL > 1
-//  rOut << 'T';
-#endif
+
     short nLeftPMgn = 0;    // Koordinaten etwa gleich ??
-//  ( pAktColl ) ? pCollA[nAktColl].nLeftParaMgn
-//                                 : nLeftParaMgn;      // Absatz L-Space
 
     short i;
     BYTE nDel = pSprm[1];
@@ -465,14 +461,16 @@ void Ww1SingleSprmPFInTable::Start(
 
 void Ww1SingleSprmPFInTable::Stop(
     Ww1Shell&
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     rOut
 #endif
     ,
     BYTE, BYTE*, USHORT,
     Ww1Manager& rMan)
 {
-    ASSERT(rOut.IsInTable(), "");
+#if OSL_DEBUG_LEVEL > 1
+    OSL_ENSURE(rOut.IsInTable(), "");
+#endif
     rMan.SetInTtp( FALSE );
 }
 
@@ -501,8 +499,6 @@ void Ww1SingleSprmTDefTable10::Start(
 // Erstmal die Zellenpositionen einlesen
     short nPos = SVBT16ToShort( p );    // signed, kann auch neg. sein !!!
 
-//  if( !rOut.IsTableWidthSet() ){      // Muss Tabellenbreite und -Ausrichtung
-                                        // noch gesetzt werden ?
     {
         short nWholeWidth = SVBT16ToShort( p + 2 * nCount ) - nPos;
         rOut.SetTableWidth( (USHORT)nWholeWidth );  // Tabellenbreite setzen
@@ -548,7 +544,6 @@ void Ww1SingleSprmTDefTable10::Start(
         if( pTc0 ){                     // gibts TCs ueberhaupt ?
             W1_TC* pTc2 = (W1_TC*)pTc0;
             BOOL bMerged2 = pTc2->fMergedGet();
-//          ASSERT( !bMerged2, "Gemergte Tabellenzellen noch nicht vollstaendig implementiert" );
             if( !bMerged2 ){
 // und nun die Umrandungen
                 SvxBoxItem aBox( (SvxBoxItem&)rOut.GetCellAttr( RES_BOX ));
@@ -595,10 +590,9 @@ void Ww1SingleSprmPpc::Start(
     switch ( ( nPpc & 0x30 ) >> 4 ){        // Y - Bindung bestimmt Sw-Bindung
     case 0: eAnchor = FLY_AT_PARA;          // Vert Margin
             eVRel = text::RelOrientation::PRINT_AREA;
-//          if( nYPos < 0 )
-//              nYPos = 0;                  // koennen wir nicht
+
             break;
-/*  case 1:*/                               // Vert. Seite
+
     default:eAnchor = FLY_AT_PAGE;          // Vert Page oder unknown
             eVRel = text::RelOrientation::FRAME;
             break;                          // 2=Vert. Paragraph, 3=Use Default
@@ -608,9 +602,9 @@ void Ww1SingleSprmPpc::Start(
     case 0:                                 // Hor. Spalte
     case 1:                                 // Hor. Absatz
             eHRel = text::RelOrientation::PRINT_AREA;
-//          nXPos += nPgLeft;               // in Seiten-Koordinaten umrechnen
+
             break;
-/*  case 2:*/                               // Hor. Seite
+
     default:
             eHRel = text::RelOrientation::FRAME;
             break;
@@ -643,7 +637,7 @@ void Ww1SingleSprmPDxaAbs::Start(
     case -4:  eHAlign = text::HoriOrientation::CENTER; nXPos = 0; break; // zentriert
     case -8:                                           // rechts
     case -16: eHAlign = text::HoriOrientation::RIGHT; nXPos = 0; break;  // Mogel: aussen -> rechts
-//  default:  nXPos += (short)nIniFlyDx; break; // Korrekturen per Ini-Datei
+
     }
     rOut.SetFlyXPos( nXPos, eHRel, eHAlign );
 }
@@ -659,7 +653,7 @@ void Ww1SingleSprmPDyaAbs::Start(
     case -4:  eVAlign = text::VertOrientation::TOP; nYPos = 0; break; // oben
     case -8:  eVAlign = text::VertOrientation::CENTER; nYPos = 0; break;  // zentriert
     case -12: eVAlign = text::VertOrientation::BOTTOM; nYPos = 0; break;  // unten
-//  default:  nYPos += (short)nIniFlyDy; break; // Korrekturen per Ini-Datei
+
     }
     rOut.SetFlyYPos( nYPos, eVRel, eVAlign );
 }
diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx
index 2f0d5165321c..0400babd7380 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -206,7 +206,7 @@ GridColsPtr WW8TableNodeInfoInner::getGridColsOfRow(AttributeOutputBase & rBase)
     WidthsPtr pWidths(getWidthsOfRow());
 
     const SwFrmFmt *pFmt = getTable()->GetFrmFmt();
-    ASSERT(pFmt,"Impossible");
+    OSL_ENSURE(pFmt,"Impossible");
     if (!pFmt)
         return pResult;
 
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 40c31e79bde2..e8e3c8f39b7e 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -28,6 +28,7 @@
 
 #include "docxattributeoutput.hxx"
 #include "docxexport.hxx"
+#include "docxexportfilter.hxx"
 #include "docxfootnotes.hxx"
 #include "writerwordglue.hxx"
 #include "wrtww8.hxx"
@@ -90,12 +91,14 @@
 #include <editeng/frmdiritem.hxx>
 #include <editeng/blnkitem.hxx>
 #include <editeng/charhiddenitem.hxx>
+#include <editeng/opaqitem.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdobj.hxx>
 
 #include <docufld.hxx>
 #include <flddropdown.hxx>
 #include <format.hxx>
+#include <fmtanchr.hxx>
 #include <fmtclds.hxx>
 #include <fmtinfmt.hxx>
 #include <fmtfld.hxx>
@@ -296,9 +299,7 @@ void DocxAttributeOutput::StartParagraphProperties( const SwTxtNode& rNode )
         m_rExport.OutputSectionBreaks( &(pFmt->GetAttrSet()), *pTableNode );
     }
 
-    // postpone the output so that we can later [in EndParagraphProperties()]
-    // prepend the properties before the run
-    m_pSerializer->mark();
+    m_pSerializer->mark( );
 
     m_pSerializer->startElementNS( XML_w, XML_pPr, FSEND );
 
@@ -315,6 +316,56 @@ void DocxAttributeOutput::StartParagraphProperties( const SwTxtNode& rNode )
 void DocxAttributeOutput::InitCollectedParagraphProperties()
 {
     m_pSpacingAttrList = NULL;
+
+    // Write the elements in the spec order
+    static const sal_Int32 aOrder[] =
+    {
+        FSNS( XML_w, XML_pStyle ),
+        FSNS( XML_w, XML_keepNext ),
+        FSNS( XML_w, XML_keepLines ),
+        FSNS( XML_w, XML_pageBreakBefore ),
+        FSNS( XML_w, XML_framePr ),
+        FSNS( XML_w, XML_widowControl ),
+        FSNS( XML_w, XML_numPr ),
+        FSNS( XML_w, XML_suppressLineNumbers ),
+        FSNS( XML_w, XML_pBdr ),
+        FSNS( XML_w, XML_shd ),
+        FSNS( XML_w, XML_tabs ),
+        FSNS( XML_w, XML_suppressAutoHyphens ),
+        FSNS( XML_w, XML_kinsoku ),
+        FSNS( XML_w, XML_wordWrap ),
+        FSNS( XML_w, XML_overflowPunct ),
+        FSNS( XML_w, XML_topLinePunct ),
+        FSNS( XML_w, XML_autoSpaceDE ),
+        FSNS( XML_w, XML_autoSpaceDN ),
+        FSNS( XML_w, XML_bidi ),
+        FSNS( XML_w, XML_adjustRightInd ),
+        FSNS( XML_w, XML_snapToGrid ),
+        FSNS( XML_w, XML_spacing ),
+        FSNS( XML_w, XML_ind ),
+        FSNS( XML_w, XML_contextualSpacing ),
+        FSNS( XML_w, XML_mirrorIndents ),
+        FSNS( XML_w, XML_suppressOverlap ),
+        FSNS( XML_w, XML_jc ),
+        FSNS( XML_w, XML_textDirection ),
+        FSNS( XML_w, XML_textAlignment ),
+        FSNS( XML_w, XML_textboxTightWrap ),
+        FSNS( XML_w, XML_outlineLvl ),
+        FSNS( XML_w, XML_divId ),
+        FSNS( XML_w, XML_cnfStyle ),
+        FSNS( XML_w, XML_rPr ),
+        FSNS( XML_w, XML_sectPr ),
+        FSNS( XML_w, XML_pPrChange )
+    };
+
+    // postpone the output so that we can later [in EndParagraphProperties()]
+    // prepend the properties before the run
+    sal_Int32 len = sizeof ( aOrder ) / sizeof( sal_Int32 );
+    uno::Sequence< sal_Int32 > aSeqOrder( len );
+    for ( sal_Int32 i = 0; i < len; i++ )
+        aSeqOrder[i] = aOrder[i];
+
+    m_pSerializer->mark( aSeqOrder );
 }
 
 void DocxAttributeOutput::WriteCollectedParagraphProperties()
@@ -334,6 +385,9 @@ void DocxAttributeOutput::WriteCollectedParagraphProperties()
 
         m_pSerializer->singleElementNS( XML_w, XML_spacing, xAttrList );
     }
+
+    // Merge the marks for the ordered elements
+    m_pSerializer->mergeTopMarks( );
 }
 
 void DocxAttributeOutput::EndParagraphProperties()
@@ -392,7 +446,6 @@ void DocxAttributeOutput::EndRun()
         }
     }
 
-
     // write the run properties + the text, already in the correct order
     m_pSerializer->mergeTopMarks(); // merges with "postponed text", see above
 
@@ -566,7 +619,6 @@ void DocxAttributeOutput::CmdField_Impl( FieldInfos& rInfos )
 
     m_pSerializer->endElementNS( XML_w, XML_r );
 
-
     // Write the Field separator
     m_pSerializer->startElementNS( XML_w, XML_r, FSEND );
     m_pSerializer->singleElementNS( XML_w, XML_fldChar,
@@ -620,7 +672,6 @@ void DocxAttributeOutput::EndField_Impl( FieldInfos& rInfos )
           FSEND );
     m_pSerializer->endElementNS( XML_w, XML_r );
 
-
     // Write the ref field if a bookmark had to be set and the field
     // should be visible
     if ( rInfos.pField )
@@ -668,6 +719,61 @@ void DocxAttributeOutput::InitCollectedRunProperties()
     m_pFontsAttrList = NULL;
     m_pEastAsianLayoutAttrList = NULL;
     m_pCharLangAttrList = NULL;
+
+    // Write the elements in the spec order
+    static const sal_Int32 aOrder[] =
+    {
+        FSNS( XML_w, XML_rStyle ),
+        FSNS( XML_w, XML_rFonts ),
+        FSNS( XML_w, XML_b ),
+        FSNS( XML_w, XML_bCs ),
+        FSNS( XML_w, XML_i ),
+        FSNS( XML_w, XML_iCs ),
+        FSNS( XML_w, XML_caps ),
+        FSNS( XML_w, XML_smallCaps ),
+        FSNS( XML_w, XML_strike ),
+        FSNS( XML_w, XML_dstrike ),
+        FSNS( XML_w, XML_outline ),
+        FSNS( XML_w, XML_shadow ),
+        FSNS( XML_w, XML_emboss ),
+        FSNS( XML_w, XML_imprint ),
+        FSNS( XML_w, XML_noProof ),
+        FSNS( XML_w, XML_snapToGrid ),
+        FSNS( XML_w, XML_vanish ),
+        FSNS( XML_w, XML_webHidden ),
+        FSNS( XML_w, XML_color ),
+        FSNS( XML_w, XML_spacing ),
+        FSNS( XML_w, XML_w ),
+        FSNS( XML_w, XML_kern ),
+        FSNS( XML_w, XML_position ),
+        FSNS( XML_w, XML_sz ),
+        FSNS( XML_w, XML_szCs ),
+        FSNS( XML_w, XML_highlight ),
+        FSNS( XML_w, XML_u ),
+        FSNS( XML_w, XML_effect ),
+        FSNS( XML_w, XML_bdr ),
+        FSNS( XML_w, XML_shd ),
+        FSNS( XML_w, XML_fitText ),
+        FSNS( XML_w, XML_vertAlign ),
+        FSNS( XML_w, XML_rtl ),
+        FSNS( XML_w, XML_cs ),
+        FSNS( XML_w, XML_em ),
+        FSNS( XML_w, XML_lang ),
+        FSNS( XML_w, XML_eastAsianLayout ),
+        FSNS( XML_w, XML_specVanish ),
+        FSNS( XML_w, XML_oMath ),
+        FSNS( XML_w, XML_rPrChange )
+    };
+
+    // postpone the output so that we can later [in EndParagraphProperties()]
+    // prepend the properties before the run
+    sal_Int32 len = sizeof ( aOrder ) / sizeof( sal_Int32 );
+    uno::Sequence< sal_Int32 > aSeqOrder( len );
+    for ( sal_Int32 i = 0; i < len; i++ )
+        aSeqOrder[i] = aOrder[i];
+
+    m_pSerializer->mark( aSeqOrder );
+
 }
 
 void DocxAttributeOutput::WriteCollectedRunProperties()
@@ -696,6 +802,9 @@ void DocxAttributeOutput::WriteCollectedRunProperties()
 
         m_pSerializer->singleElementNS( XML_w, XML_lang, xAttrList );
     }
+
+    // Merge the marks for the ordered elements
+    m_pSerializer->mergeTopMarks();
 }
 
 void DocxAttributeOutput::EndRunProperties( const SwRedlineData* /*pRedlineData*/ )
@@ -799,12 +908,11 @@ void DocxAttributeOutput::StartRuby( const SwTxtNode& rNode, xub_StrLen nPos, co
                 rNode.GetLang( nPos ) ) );
     OUString sLang( aLocale.Language );
     if ( aLocale.Country.getLength( ) > 0 )
-        sLang += OUString::createFromAscii( "-" ) + OUString( aLocale.Country );
+        sLang += OUString(RTL_CONSTASCII_USTRINGPARAM( "-" )) + OUString( aLocale.Country );
     m_pSerializer->singleElementNS( XML_w, XML_lid,
             FSNS( XML_w, XML_val ),
             OUStringToOString( sLang, RTL_TEXTENCODING_UTF8 ).getStr( ), FSEND );
 
-
     OString sAlign ( "center" );
     switch ( rRuby.GetAdjustment( ) )
     {
@@ -1163,16 +1271,19 @@ static void impl_borderLine( FSHelperPtr pSerializer, sal_Int32 elementToken, co
     pSerializer->singleElementNS( XML_w, elementToken, xAttrs );
 }
 
-static void impl_pageBorders( FSHelperPtr pSerializer, const SvxBoxItem& rBox )
+static void impl_pageBorders( FSHelperPtr pSerializer, const SvxBoxItem& rBox, bool bUseStartEnd = false )
 {
     static const USHORT aBorders[] =
     {
         BOX_LINE_TOP, BOX_LINE_LEFT, BOX_LINE_BOTTOM, BOX_LINE_RIGHT
     };
 
-    static const USHORT aXmlElements[] =
+    const sal_Int32 aXmlElements[] =
     {
-        XML_top, XML_left, XML_bottom, XML_right
+        XML_top,
+        bUseStartEnd ? XML_start : XML_left,
+        XML_bottom,
+        bUseStartEnd ? XML_end : XML_right
     };
     const USHORT* pBrd = aBorders;
     for( int i = 0; i < 4; ++i, ++pBrd )
@@ -1189,10 +1300,13 @@ void DocxAttributeOutput::TableCellProperties( ww8::WW8TableNodeInfoInner::Point
 
     const SwTableBox *pTblBox = pTableTextNodeInfoInner->getTableBox( );
 
+    DocxExport& rExport = dynamic_cast< DocxExport& >( GetExport() );
+    bool bEcma = rExport.GetFilter().getVersion( ) == oox::core::ECMA_DIALECT;
+
     // The cell borders
     m_pSerializer->startElementNS( XML_w, XML_tcBorders, FSEND );
     SwFrmFmt *pFmt = pTblBox->GetFrmFmt( );
-    impl_pageBorders( m_pSerializer, pFmt->GetBox( ) );
+    impl_pageBorders( m_pSerializer, pFmt->GetBox( ), !bEcma );
     m_pSerializer->endElementNS( XML_w, XML_tcBorders );
 
     // Vertical merges
@@ -1238,9 +1352,12 @@ void DocxAttributeOutput::TableCellProperties( ww8::WW8TableNodeInfoInner::Point
         BOX_LINE_TOP, BOX_LINE_LEFT, BOX_LINE_BOTTOM, BOX_LINE_RIGHT
     };
 
-    static const USHORT aXmlElements[] =
+    const sal_Int32 aXmlElements[] =
     {
-        XML_top, XML_left, XML_bottom, XML_right
+        XML_top,
+        bEcma ? XML_left : XML_start,
+        XML_bottom,
+        bEcma ? XML_right : XML_end
     };
     const USHORT* pBrd = aBorders;
     for( int i = 0; i < 4; ++i, ++pBrd )
@@ -1327,7 +1444,6 @@ void DocxAttributeOutput::EndTableRow( )
     m_pSerializer->endElementNS( XML_w, XML_tr );
 }
 
-
 void DocxAttributeOutput::StartTableCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
 {
     if ( !m_pTableWrt )
@@ -1358,6 +1474,9 @@ void DocxAttributeOutput::TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t /*
 
 void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
 {
+    DocxExport& rExport = dynamic_cast< DocxExport& >( GetExport() );
+    bool bEcma = rExport.GetFilter().getVersion( ) == oox::core::ECMA_DIALECT;
+
     // Write the table properties
     m_pSerializer->startElementNS( XML_w, XML_tblPr, FSEND );
 
@@ -1389,13 +1508,19 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
             pJcVal = "center";
             break;
         case text::HoriOrientation::RIGHT:
-            pJcVal = "right";
+            if ( bEcma )
+                pJcVal = "right";
+            else
+                pJcVal = "end";
             break;
         default:
         case text::HoriOrientation::NONE:
         case text::HoriOrientation::LEFT_AND_WIDTH:
         {
-            pJcVal = "left";
+            if ( bEcma )
+                pJcVal = "left";
+            else
+                pJcVal = "start";
             nIndent = sal_Int32( pTblFmt->GetLRSpace( ).GetLeft( ) );
             break;
         }
@@ -1413,7 +1538,6 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
 
     m_pSerializer->endElementNS( XML_w, XML_tblPr );
 
-
     // Write the table grid infos
     m_pSerializer->startElementNS( XML_w, XML_tblGrid, FSEND );
 
@@ -1431,9 +1555,12 @@ void DocxAttributeOutput::TableDefaultBorders( ww8::WW8TableNodeInfoInner::Point
     const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox();
     const SwFrmFmt * pFrmFmt = pTabBox->GetFrmFmt();
 
+    DocxExport& rExport = dynamic_cast< DocxExport& >( GetExport() );
+    bool bEcma = rExport.GetFilter().getVersion( ) == oox::core::ECMA_DIALECT;
+
     // the defaults of the table are taken from the top-left cell
     m_pSerializer->startElementNS( XML_w, XML_tblBorders, FSEND );
-    impl_pageBorders( m_pSerializer, pFrmFmt->GetBox( ) );
+    impl_pageBorders( m_pSerializer, pFrmFmt->GetBox( ), !bEcma );
     m_pSerializer->endElementNS( XML_w, XML_tblBorders );
 }
 
@@ -1489,7 +1616,7 @@ void DocxAttributeOutput::TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t p
     const SwFrmFmt * pLineFmt = pTabLine->GetFrmFmt();
 
     const SwFmtRowSplit& rSplittable = pLineFmt->GetRowSplit( );
-    const char* pCantSplit = ( !rSplittable.GetValue( ) ) ? "on" : "off";
+    const char* pCantSplit = ( !rSplittable.GetValue( ) ) ? "true" : "false";
 
     m_pSerializer->singleElementNS( XML_w, XML_cantSplit,
            FSNS( XML_w, XML_val ), pCantSplit,
@@ -1504,7 +1631,7 @@ void DocxAttributeOutput::TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTabl
     if ( m_rExport.TrueFrameDirection( *pFrmFmt ) == FRMDIR_HORI_RIGHT_TOP )
     {
         m_pSerializer->singleElementNS( XML_w, XML_bidiVisual,
-                FSNS( XML_w, XML_val ), "on",
+                FSNS( XML_w, XML_val ), "true",
                 FSEND );
     }
 }
@@ -1614,10 +1741,51 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode& rGrfNode, const Size
 
     m_pSerializer->startElementNS( XML_w, XML_drawing,
             FSEND );
-    m_pSerializer->startElementNS( XML_wp, XML_inline,
-            XML_distT, "0", XML_distB, "0", XML_distL, "0", XML_distR, "0",
-            FSEND );
-
+    bool isAnchor = rGrfNode.GetFlyFmt()->GetAnchor().GetAnchorId() != FLY_AS_CHAR;
+    if( isAnchor )
+    {
+        m_pSerializer->startElementNS( XML_wp, XML_anchor,
+                XML_distT, "0", XML_distB, "0", XML_distL, "0", XML_distR, "0", XML_simplePos, "0",
+                XML_relativeHeight, "0", // TODO
+                XML_behindDoc, rGrfNode.GetFlyFmt()->GetOpaque().GetValue() ? "0" : "1",
+                XML_locked, "0", XML_layoutInCell, "1", XML_allowOverlap, "1", // TODO
+                FSEND );
+        m_pSerializer->singleElementNS( XML_wp, XML_simplePos, XML_x, "0", XML_y, "0", FSEND );
+        const char* relativeFromH;
+        const char* relativeFromV;
+        switch( rGrfNode.GetFlyFmt()->GetAnchor().GetAnchorId())
+        {
+            case FLY_AT_PAGE:
+                relativeFromV = relativeFromH = "page";
+                break;
+            case FLY_AT_PARA:
+                relativeFromH = "column";
+                relativeFromV = "paragraph";
+                break;
+            case FLY_AT_CHAR:
+            default:
+                relativeFromH = "character";
+                relativeFromV = "line";
+                break;
+        };
+        m_pSerializer->startElementNS( XML_wp, XML_positionH, XML_relativeFrom, relativeFromH, FSEND );
+        m_pSerializer->startElementNS( XML_wp, XML_align, FSEND );
+        m_pSerializer->write( "left" ); // TODO
+        m_pSerializer->endElementNS( XML_wp, XML_align );
+        m_pSerializer->endElementNS( XML_wp, XML_positionH );
+        m_pSerializer->startElementNS( XML_wp, XML_positionV, XML_relativeFrom, relativeFromV, FSEND );
+        m_pSerializer->startElementNS( XML_wp, XML_align, FSEND );
+        m_pSerializer->write( "top" ); // TODO
+        m_pSerializer->endElementNS( XML_wp, XML_align );
+        m_pSerializer->endElementNS( XML_wp, XML_positionV );
+    }
+    else
+    {
+        m_pSerializer->startElementNS( XML_wp, XML_inline,
+                XML_distT, "0", XML_distB, "0", XML_distL, "0", XML_distR, "0",
+                FSEND );
+    }
+    // now the common parts
     // extent of the image
     OString aWidth( OString::valueOf( TwipsToEMU( rSize.Width() ) ) );
     OString aHeight( OString::valueOf( TwipsToEMU( rSize.Height() ) ) );
@@ -1630,6 +1798,27 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode& rGrfNode, const Size
             XML_l, "0", XML_t, "0", XML_r, "0", XML_b, "0",
             FSEND );
 
+    if( isAnchor )
+    {
+        switch( rGrfNode.GetFlyFmt()->GetSurround().GetValue())
+        {
+            case SURROUND_NONE:
+                m_pSerializer->singleElementNS( XML_wp, XML_wrapTopAndBottom, FSEND );
+                break;
+            case SURROUND_THROUGHT:
+                m_pSerializer->singleElementNS( XML_wp, XML_wrapNone, FSEND );
+                break;
+            case SURROUND_PARALLEL:
+                m_pSerializer->singleElementNS( XML_wp, XML_wrapSquare,
+                    XML_wrapText, "bothSides", FSEND );
+                break;
+            case SURROUND_IDEAL:
+            default:
+                m_pSerializer->singleElementNS( XML_wp, XML_wrapSquare,
+                    XML_wrapText, "largest", FSEND );
+                break;
+        }
+    }
     // picture description
     // TODO the right image description
     m_pSerializer->startElementNS( XML_wp, XML_docPr,
@@ -1743,7 +1932,7 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode& rGrfNode, const Size
 
     m_pSerializer->endElementNS( XML_a, XML_graphicData );
     m_pSerializer->endElementNS( XML_a, XML_graphic );
-    m_pSerializer->endElementNS( XML_wp, XML_inline );
+    m_pSerializer->endElementNS( XML_wp, isAnchor ? XML_anchor : XML_inline );
 
     m_pSerializer->endElementNS( XML_w, XML_drawing );
 }
@@ -1756,7 +1945,7 @@ void DocxAttributeOutput::WriteOLE2Obj( const SdrObject* pSdrObj, const Size& rS
     {
         uno::Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY );
         if( xPropSet.is() )
-            xChartDoc.set( xPropSet->getPropertyValue( rtl::OUString::createFromAscii("Model") ), uno::UNO_QUERY );
+            xChartDoc.set( xPropSet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Model")) ), uno::UNO_QUERY );
     }
 
     if( xChartDoc.is() )
@@ -1781,7 +1970,7 @@ void DocxAttributeOutput::WriteOLE2Obj( const SdrObject* pSdrObj, const Size& rS
 
         // should get the unique id
         sal_Int32 nID = 1;
-        OUString sName = rtl::OUString::createFromAscii("Object 1");
+        OUString sName(RTL_CONSTASCII_USTRINGPARAM("Object 1"));
         uno::Reference< container::XNamed > xNamed( xShape, uno::UNO_QUERY );
         if( xNamed.is() )
             sName = xNamed->getName();
@@ -1802,8 +1991,6 @@ void DocxAttributeOutput::WriteOLE2Obj( const SdrObject* pSdrObj, const Size& rS
             XML_uri, "http://schemas.openxmlformats.org/drawingml/2006/chart",
             FSEND );
 
-
-
         OString aRelId;
         static sal_Int32 nChartCount = 0;
         nChartCount++;
@@ -1971,7 +2158,7 @@ void DocxAttributeOutput::PageBreakBefore( bool bBreak )
         m_pSerializer->singleElementNS( XML_w, XML_pageBreakBefore, FSEND );
     else
         m_pSerializer->singleElementNS( XML_w, XML_pageBreakBefore,
-                FSNS( XML_w, XML_val ), "off",
+                FSNS( XML_w, XML_val ), "false",
                 FSEND );
 }
 
@@ -2024,6 +2211,42 @@ void DocxAttributeOutput::StartSection()
 {
     m_pSerializer->startElementNS( XML_w, XML_sectPr, FSEND );
     m_bOpenedSectPr = true;
+
+    // Write the elements in the spec order
+    static const sal_Int32 aOrder[] =
+    {
+        FSNS( XML_w, XML_headerReference ),
+        FSNS( XML_w, XML_footerReference ),
+        FSNS( XML_w, XML_footnotePr ),
+        FSNS( XML_w, XML_endnotePr ),
+        FSNS( XML_w, XML_type ),
+        FSNS( XML_w, XML_pgSz ),
+        FSNS( XML_w, XML_pgMar ),
+        FSNS( XML_w, XML_paperSrc ),
+        FSNS( XML_w, XML_pgBorders ),
+        FSNS( XML_w, XML_lnNumType ),
+        FSNS( XML_w, XML_pgNumType ),
+        FSNS( XML_w, XML_cols ),
+        FSNS( XML_w, XML_formProt ),
+        FSNS( XML_w, XML_vAlign ),
+        FSNS( XML_w, XML_noEndnote ),
+        FSNS( XML_w, XML_titlePg ),
+        FSNS( XML_w, XML_textDirection ),
+        FSNS( XML_w, XML_bidi ),
+        FSNS( XML_w, XML_rtlGutter ),
+        FSNS( XML_w, XML_docGrid ),
+        FSNS( XML_w, XML_printerSettings ),
+        FSNS( XML_w, XML_sectPrChange )
+    };
+
+    // postpone the output so that we can later [in EndParagraphProperties()]
+    // prepend the properties before the run
+    sal_Int32 len = sizeof ( aOrder ) / sizeof( sal_Int32 );
+    uno::Sequence< sal_Int32 > aSeqOrder( len );
+    for ( sal_Int32 i = 0; i < len; i++ )
+        aSeqOrder[i] = aOrder[i];
+
+    m_pSerializer->mark( aSeqOrder );
 }
 
 void DocxAttributeOutput::EndSection()
@@ -2037,6 +2260,9 @@ void DocxAttributeOutput::EndSection()
         m_pSerializer->singleElementNS( XML_w, XML_pgMar, xAttrList );
     }
 
+    // Order the elements
+    m_pSerializer->mergeTopMarks( );
+
     m_pSerializer->endElementNS( XML_w, XML_sectPr );
     m_bOpenedSectPr = false;
 }
@@ -2047,7 +2273,7 @@ void DocxAttributeOutput::SectionFormProtection( bool bProtected )
         m_pSerializer->singleElementNS( XML_w, XML_formProt, FSEND );
     else
         m_pSerializer->singleElementNS( XML_w, XML_formProt,
-                FSNS( XML_w, XML_val ), "off", FSEND );
+                FSNS( XML_w, XML_val ), "false", FSEND );
 }
 
 void DocxAttributeOutput::SectionLineNumbering( ULONG /*nRestartNo*/, const SwLineNumberInfo& /*rLnNumInfo*/ )
@@ -2067,7 +2293,6 @@ void DocxAttributeOutput::SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmF
 {
     // Output the margins
 
-
     const SvxBoxItem& rBox = pFmt->GetBox( );
 
     const SvxBorderLine* pBottom = rBox.GetBottom( );
@@ -2278,7 +2503,7 @@ void DocxAttributeOutput::NumberingLevel( BYTE nLevel,
         const SfxItemSet *pOutSet,
         sal_Int16 nIndentAt,
         sal_Int16 nFirstLineIndex,
-        sal_Int16 /*nListTabPos*/,
+        sal_Int16 nListTabPos,
         const String &rNumberingString )
 {
     m_pSerializer->startElementNS( XML_w, XML_lvl,
@@ -2300,11 +2525,12 @@ void DocxAttributeOutput::NumberingLevel( BYTE nLevel,
 
     // justification
     const char *pJc;
+    bool ecmaDialect = ( m_rExport.GetFilter().getVersion() == oox::core::ECMA_DIALECT );
     switch ( eAdjust )
     {
         case SVX_ADJUST_CENTER: pJc = "center"; break;
-        case SVX_ADJUST_RIGHT:  pJc = "right";  break;
-        default:                pJc = "left";   break;
+        case SVX_ADJUST_RIGHT:  pJc = !ecmaDialect ? "end" : "right";  break;
+        default:                pJc = !ecmaDialect ? "start" : "left";   break;
     }
     m_pSerializer->singleElementNS( XML_w, XML_lvlJc,
             FSNS( XML_w, XML_val ), pJc,
@@ -2353,6 +2579,15 @@ void DocxAttributeOutput::NumberingLevel( BYTE nLevel,
 
     // indentation
     m_pSerializer->startElementNS( XML_w, XML_pPr, FSEND );
+    if( nListTabPos != 0 )
+    {
+        m_pSerializer->startElementNS( XML_w, XML_tabs, FSEND );
+        m_pSerializer->singleElementNS( XML_w, XML_tab,
+                FSNS( XML_w, XML_val ), "num",
+                FSNS( XML_w, XML_pos ), OString::valueOf( static_cast<sal_Int32>(nListTabPos) ).getStr(),
+                FSEND );
+        m_pSerializer->endElementNS( XML_w, XML_tabs );
+    }
     m_pSerializer->singleElementNS( XML_w, XML_ind,
             FSNS( XML_w, XML_left ), OString::valueOf( sal_Int32( nIndentAt ) ).getStr(),
             FSNS( XML_w, XML_hanging ), OString::valueOf( sal_Int32( -nFirstLineIndex ) ).getStr(),
@@ -2374,7 +2609,7 @@ void DocxAttributeOutput::NumberingLevel( BYTE nLevel,
                     FSNS( XML_w, XML_hint ), "default",
                     FSEND );
         }
-        m_rExport.OutputItemSet( *pOutSet, false, true, i18n::ScriptType::LATIN );
+        m_rExport.OutputItemSet( *pOutSet, false, true, i18n::ScriptType::LATIN, m_rExport.mbExportModeRTF );
 
         m_pSerializer->endElementNS( XML_w, XML_rPr );
     }
@@ -2395,8 +2630,8 @@ void DocxAttributeOutput::CharCaseMap( const SvxCaseMapItem& rCaseMap )
             m_pSerializer->singleElementNS( XML_w, XML_caps, FSEND );
             break;
         default: // Something that ooxml does not support
-            m_pSerializer->singleElementNS( XML_w, XML_smallCaps, FSNS( XML_w, XML_val ), "off", FSEND );
-            m_pSerializer->singleElementNS( XML_w, XML_caps, FSNS( XML_w, XML_val ), "off", FSEND );
+            m_pSerializer->singleElementNS( XML_w, XML_smallCaps, FSNS( XML_w, XML_val ), "false", FSEND );
+            m_pSerializer->singleElementNS( XML_w, XML_caps, FSNS( XML_w, XML_val ), "false", FSEND );
             break;
     }
 }
@@ -2417,7 +2652,7 @@ void DocxAttributeOutput::CharContour( const SvxContourItem& rContour )
     if ( rContour.GetValue() )
         m_pSerializer->singleElementNS( XML_w, XML_outline, FSEND );
     else
-        m_pSerializer->singleElementNS( XML_w, XML_outline, FSNS( XML_w, XML_val ), "off", FSEND );
+        m_pSerializer->singleElementNS( XML_w, XML_outline, FSNS( XML_w, XML_val ), "false", FSEND );
 }
 
 void DocxAttributeOutput::CharCrossedOut( const SvxCrossedOutItem& rCrossedOut )
@@ -2428,8 +2663,8 @@ void DocxAttributeOutput::CharCrossedOut( const SvxCrossedOutItem& rCrossedOut )
             m_pSerializer->singleElementNS( XML_w, XML_dstrike, FSEND );
             break;
         case STRIKEOUT_NONE:
-            m_pSerializer->singleElementNS( XML_w, XML_dstrike, FSNS( XML_w, XML_val ), "off", FSEND );
-            m_pSerializer->singleElementNS( XML_w, XML_strike, FSNS( XML_w, XML_val ), "off", FSEND );
+            m_pSerializer->singleElementNS( XML_w, XML_dstrike, FSNS( XML_w, XML_val ), "false", FSEND );
+            m_pSerializer->singleElementNS( XML_w, XML_strike, FSNS( XML_w, XML_val ), "false", FSEND );
             break;
         default:
             m_pSerializer->singleElementNS( XML_w, XML_strike, FSEND );
@@ -2538,7 +2773,7 @@ void DocxAttributeOutput::CharPosture( const SvxPostureItem& rPosture )
     if ( rPosture.GetPosture() != ITALIC_NONE )
         m_pSerializer->singleElementNS( XML_w, XML_i, FSEND );
     else
-        m_pSerializer->singleElementNS( XML_w, XML_i, FSNS( XML_w, XML_val ), "off", FSEND );
+        m_pSerializer->singleElementNS( XML_w, XML_i, FSNS( XML_w, XML_val ), "false", FSEND );
 }
 
 void DocxAttributeOutput::CharShadow( const SvxShadowedItem& rShadow )
@@ -2546,7 +2781,7 @@ void DocxAttributeOutput::CharShadow( const SvxShadowedItem& rShadow )
     if ( rShadow.GetValue() )
         m_pSerializer->singleElementNS( XML_w, XML_shadow, FSEND );
     else
-        m_pSerializer->singleElementNS( XML_w, XML_shadow, FSNS( XML_w, XML_val ), "off", FSEND );
+        m_pSerializer->singleElementNS( XML_w, XML_shadow, FSNS( XML_w, XML_val ), "false", FSEND );
 }
 
 void DocxAttributeOutput::CharUnderline( const SvxUnderlineItem& rUnderline )
@@ -2583,7 +2818,7 @@ void DocxAttributeOutput::CharWeight( const SvxWeightItem& rWeight )
     if ( rWeight.GetWeight() == WEIGHT_BOLD )
         m_pSerializer->singleElementNS( XML_w, XML_b, FSEND );
     else
-        m_pSerializer->singleElementNS( XML_w, XML_b, FSNS( XML_w, XML_val ), "off", FSEND );
+        m_pSerializer->singleElementNS( XML_w, XML_b, FSNS( XML_w, XML_val ), "false", FSEND );
 }
 
 void DocxAttributeOutput::CharAutoKern( const SvxAutoKernItem& )
@@ -2621,7 +2856,7 @@ void DocxAttributeOutput::CharPostureCJK( const SvxPostureItem& rPosture )
     if ( rPosture.GetPosture() != ITALIC_NONE )
         m_pSerializer->singleElementNS( XML_w, XML_i, FSEND );
     else
-        m_pSerializer->singleElementNS( XML_w, XML_i, FSNS( XML_w, XML_val ), "off", FSEND );
+        m_pSerializer->singleElementNS( XML_w, XML_i, FSNS( XML_w, XML_val ), "false", FSEND );
 }
 
 void DocxAttributeOutput::CharWeightCJK( const SvxWeightItem& rWeight )
@@ -2629,7 +2864,7 @@ void DocxAttributeOutput::CharWeightCJK( const SvxWeightItem& rWeight )
     if ( rWeight.GetWeight() == WEIGHT_BOLD )
         m_pSerializer->singleElementNS( XML_w, XML_b, FSEND );
     else
-        m_pSerializer->singleElementNS( XML_w, XML_b, FSNS( XML_w, XML_val ), "off", FSEND );
+        m_pSerializer->singleElementNS( XML_w, XML_b, FSNS( XML_w, XML_val ), "false", FSEND );
 }
 
 void DocxAttributeOutput::CharFontCTL( const SvxFontItem& rFont )
@@ -2647,7 +2882,7 @@ void DocxAttributeOutput::CharPostureCTL( const SvxPostureItem& rPosture)
     if ( rPosture.GetPosture() != ITALIC_NONE )
         m_pSerializer->singleElementNS( XML_w, XML_iCs, FSEND );
     else
-        m_pSerializer->singleElementNS( XML_w, XML_iCs, FSNS( XML_w, XML_val ), "off", FSEND );
+        m_pSerializer->singleElementNS( XML_w, XML_iCs, FSNS( XML_w, XML_val ), "false", FSEND );
 }
 
 void DocxAttributeOutput::CharWeightCTL( const SvxWeightItem& rWeight )
@@ -2655,7 +2890,7 @@ void DocxAttributeOutput::CharWeightCTL( const SvxWeightItem& rWeight )
     if ( rWeight.GetWeight() == WEIGHT_BOLD )
         m_pSerializer->singleElementNS( XML_w, XML_bCs, FSEND );
     else
-        m_pSerializer->singleElementNS( XML_w, XML_bCs, FSNS( XML_w, XML_val ), "off", FSEND );
+        m_pSerializer->singleElementNS( XML_w, XML_bCs, FSNS( XML_w, XML_val ), "false", FSEND );
 }
 
 void DocxAttributeOutput::CharRotate( const SvxCharRotateItem& rRotate)
@@ -2733,8 +2968,8 @@ void DocxAttributeOutput::CharRelief( const SvxCharReliefItem& rRelief )
             m_pSerializer->singleElementNS( XML_w, XML_imprint, FSEND );
             break;
         default:
-            m_pSerializer->singleElementNS( XML_w, XML_emboss, FSNS( XML_w, XML_val ), "off", FSEND );
-            m_pSerializer->singleElementNS( XML_w, XML_imprint, FSNS( XML_w, XML_val ), "off", FSEND );
+            m_pSerializer->singleElementNS( XML_w, XML_emboss, FSNS( XML_w, XML_val ), "false", FSEND );
+            m_pSerializer->singleElementNS( XML_w, XML_imprint, FSNS( XML_w, XML_val ), "false", FSEND );
             break;
     }
 }
@@ -2744,7 +2979,7 @@ void DocxAttributeOutput::CharHidden( const SvxCharHiddenItem& rHidden )
     if ( rHidden.GetValue() )
         m_pSerializer->singleElementNS( XML_w, XML_vanish, FSEND );
     else
-        m_pSerializer->singleElementNS( XML_w, XML_vanish, FSNS( XML_w, XML_val ), "off", FSEND );
+        m_pSerializer->singleElementNS( XML_w, XML_vanish, FSNS( XML_w, XML_val ), "false", FSEND );
 }
 
 void DocxAttributeOutput::TextINetFormat( const SwFmtINetFmt& rLink )
@@ -2981,7 +3216,7 @@ void DocxAttributeOutput::FootnotesEndnotes( bool bFootnotes )
 
 }
 
-void DocxAttributeOutput::ParaLineSpacing_Impl( short nSpace, short /*nMulti*/ )
+void DocxAttributeOutput::ParaLineSpacing_Impl( short nSpace, short nMulti )
 {
     if ( !m_pSpacingAttrList )
         m_pSpacingAttrList = m_pSerializer->createAttrList();
@@ -2991,6 +3226,11 @@ void DocxAttributeOutput::ParaLineSpacing_Impl( short nSpace, short /*nMulti*/ )
         m_pSpacingAttrList->add( FSNS( XML_w, XML_lineRule ), "exact" );
         m_pSpacingAttrList->add( FSNS( XML_w, XML_line ), OString::valueOf( sal_Int32( -nSpace ) ) );
     }
+    else if( nMulti )
+    {
+        m_pSpacingAttrList->add( FSNS( XML_w, XML_lineRule ), "auto" );
+        m_pSpacingAttrList->add( FSNS( XML_w, XML_line ), OString::valueOf( sal_Int32( nSpace ) ) );
+    }
     else if ( nSpace > 0 )
     {
         m_pSpacingAttrList->add( FSNS( XML_w, XML_lineRule ), "atLeast" );
@@ -3004,13 +3244,36 @@ void DocxAttributeOutput::ParaAdjust( const SvxAdjustItem& rAdjust )
 {
     const char *pAdjustString;
 
+    DocxExport& rExport = dynamic_cast< DocxExport& >( GetExport() );
+    bool bEcma = rExport.GetFilter().getVersion( ) == oox::core::ECMA_DIALECT;
+
+    const SfxItemSet* pItems = rExport.GetCurItemSet();
+    const SvxFrameDirectionItem* rFrameDir = static_cast< const SvxFrameDirectionItem* >( pItems->GetItem( RES_FRAMEDIR ) );
+
+    bool bRtl = false;
+    short nDir = rFrameDir->GetValue();
+    bRtl = ( nDir == FRMDIR_HORI_RIGHT_TOP );
+
+    if ( nDir == FRMDIR_ENVIRONMENT )
+        nDir = GetExport( ).GetDefaultFrameDirection( );
+
     switch ( rAdjust.GetAdjust() )
     {
         case SVX_ADJUST_LEFT:
-            pAdjustString = "left";
+            if ( bEcma )
+                pAdjustString = "left";
+            else if ( bRtl )
+                pAdjustString = "end";
+            else
+                pAdjustString = "start";
             break;
         case SVX_ADJUST_RIGHT:
-            pAdjustString = "right";
+            if ( bEcma )
+                pAdjustString = "right";
+            else if ( bRtl )
+                pAdjustString = "start";
+            else
+                pAdjustString = "end";
             break;
         case SVX_ADJUST_BLOCKLINE:
         case SVX_ADJUST_BLOCK:
@@ -3028,7 +3291,7 @@ void DocxAttributeOutput::ParaAdjust( const SvxAdjustItem& rAdjust )
 void DocxAttributeOutput::ParaSplit( const SvxFmtSplitItem& rSplit )
 {
     if (rSplit.GetValue())
-        m_pSerializer->singleElementNS( XML_w, XML_keepLines, FSNS( XML_w, XML_val ), "off", FSEND );
+        m_pSerializer->singleElementNS( XML_w, XML_keepLines, FSNS( XML_w, XML_val ), "false", FSEND );
     else
         m_pSerializer->singleElementNS( XML_w, XML_keepLines, FSEND );
 }
@@ -3038,7 +3301,7 @@ void DocxAttributeOutput::ParaWidows( const SvxWidowsItem& rWidows )
     if (rWidows.GetValue())
         m_pSerializer->singleElementNS( XML_w, XML_widowControl, FSEND );
     else
-        m_pSerializer->singleElementNS( XML_w, XML_widowControl, FSNS( XML_w, XML_val ), "off", FSEND );
+        m_pSerializer->singleElementNS( XML_w, XML_widowControl, FSNS( XML_w, XML_val ), "false", FSEND );
 }
 
 static void impl_WriteTabElement( FSHelperPtr pSerializer,
@@ -3200,7 +3463,6 @@ void DocxAttributeOutput::FormatFrameSize( const SwFmtFrmSize& rSize )
         if ( m_rExport.pAktPageDesc->GetLandscape( ) )
             attrList->add( FSNS( XML_w, XML_orient ), "landscape" );
 
-
         attrList->add( FSNS( XML_w, XML_w ), OString::valueOf( rSize.GetWidth( ) ) );
         attrList->add( FSNS( XML_w, XML_h ), OString::valueOf( rSize.GetHeight( ) ) );
 
@@ -3234,7 +3496,6 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
         if ( !m_pSpacingAttrList )
             m_pSpacingAttrList = m_pSerializer->createAttrList();
 
-
         USHORT nLDist, nRDist;
         const SfxPoolItem* pItem = m_rExport.HasItem( RES_BOX );
         if ( pItem )
@@ -3282,34 +3543,34 @@ void DocxAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace )
     }
     else if (m_rExport.bOutPageDescs )
     {
-        ASSERT( m_rExport.GetCurItemSet(), "Impossible" );
+        OSL_ENSURE( m_rExport.GetCurItemSet(), "Impossible" );
         if ( !m_rExport.GetCurItemSet() )
             return;
 
         HdFtDistanceGlue aDistances( *m_rExport.GetCurItemSet() );
 
+        sal_Int32 nHeader = 0;
         if ( aDistances.HasHeader() )
-        {
-            // Header top
-            m_pSpacingAttrList->add( FSNS( XML_w, XML_header ),
-                    OString::valueOf( sal_Int32( aDistances.dyaHdrTop ) ) );
-        }
+            nHeader = sal_Int32( aDistances.dyaHdrTop );
+        m_pSpacingAttrList->add( FSNS( XML_w, XML_header ), OString::valueOf( nHeader ) );
 
         // Page top
         m_pSpacingAttrList->add( FSNS( XML_w, XML_top ),
                 OString::valueOf( sal_Int32( aDistances.dyaTop ) ) );
 
+        sal_Int32 nFooter = 0;
         if ( aDistances.HasFooter() )
-        {
-            // Footer bottom
-            m_pSpacingAttrList->add( FSNS( XML_w, XML_footer ),
-                    OString::valueOf( sal_Int32( aDistances.dyaHdrBottom ) ) );
-        }
+            nFooter = sal_Int32( aDistances.dyaHdrBottom );
+        m_pSpacingAttrList->add( FSNS( XML_w, XML_footer ), OString::valueOf( nFooter ) );
 
         // Page Bottom
         m_pSpacingAttrList->add( FSNS( XML_w, XML_bottom ),
                 OString::valueOf( sal_Int32( aDistances.dyaBottom ) ) );
 
+        // FIXME Page Gutter is not handled ATM, setting to 0 as it's mandatory for OOXML
+        m_pSpacingAttrList->add( FSNS( XML_w, XML_gutter ),
+                OString::valueOf( sal_Int32( 0 ) ) );
+
     }
     else
     {
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 37ceb71897c8..6050823b0141 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -64,6 +64,7 @@ enum DocxColBreakStatus
     COLBRK_WRITE
 };
 
+/// The class that has handlers for various resource types when exporting as DOCX.
 class DocxAttributeOutput : public AttributeOutputBase
 {
 public:
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 9189c56a04fa..2df417d6b877 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -427,7 +427,7 @@ void DocxExport::PrepareNewPageDesc( const SfxItemSet* pSet,
     const SwSectionFmt* pFmt = GetSectionFormat( rNd );
     const ULONG nLnNm = GetSectionLineNo( pSet, rNd );
 
-    ASSERT( pNewPgDescFmt || pNewPgDesc, "Neither page desc format nor page desc provided." );
+    OSL_ENSURE( pNewPgDescFmt || pNewPgDesc, "Neither page desc format nor page desc provided." );
 
     if ( pNewPgDescFmt )
     {
diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx
index 2a7fcd024af8..1daeebc5e1b9 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -86,6 +86,9 @@ class DocxExport : public MSWordExportBase
     oox::vml::VMLExport *m_pVMLExport;
 
 public:
+
+    DocxExportFilter& GetFilter() { return *m_pFilter; };
+
     /// Access to the attribute output class.
     virtual AttributeOutputBase& AttrOutput() const;
 
diff --git a/sw/source/filter/ww8/docxexportfilter.cxx b/sw/source/filter/ww8/docxexportfilter.cxx
index 771e495f4aab..ed3d29a08c72 100644
--- a/sw/source/filter/ww8/docxexportfilter.cxx
+++ b/sw/source/filter/ww8/docxexportfilter.cxx
@@ -154,7 +154,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /* pServiceMan
         {
             uno::Reference< registry::XRegistryKey > xNewKey1(
                     static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey(
-                        OUString::createFromAscii( IMPL_NAME_RTFEXPORT "/UNO/SERVICES/" ) ) );
+                        OUString(RTL_CONSTASCII_USTRINGPARAM( IMPL_NAME_RTFEXPORT "/UNO/SERVICES/" )) ) );
             xNewKey1->createKey( RtfExport_getSupportedServiceNames().getConstArray()[0] );
 
             bRet = sal_True;
@@ -168,7 +168,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /* pServiceMan
         {
             uno::Reference< registry::XRegistryKey > xNewKey1(
                     static_cast< registry::XRegistryKey* >( pRegistryKey )->createKey(
-                        OUString::createFromAscii( IMPL_NAME_RTFIMPORT "/UNO/SERVICES/" ) ) );
+                        OUString(RTL_CONSTASCII_USTRINGPARAM( IMPL_NAME_RTFIMPORT "/UNO/SERVICES/" )) ) );
             xNewKey1->createKey( RtfExport_getSupportedServiceNames().getConstArray()[0] );
 
             bRet = sal_True;
@@ -202,7 +202,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplN
                     DocxExport_createInstance,
                     DocxExport_getSupportedServiceNames() ) );
     } else if ( rtl_str_compare( pImplName, IMPL_NAME_RTFEXPORT ) == 0 ) {
-        const OUString aServiceName( OUString::createFromAscii( IMPL_NAME_RTFEXPORT ) );
+        const OUString aServiceName(RTL_CONSTASCII_USTRINGPARAM( IMPL_NAME_RTFEXPORT));
 
         xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
                     reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
@@ -210,7 +210,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplN
                     RtfExport_createInstance,
                     RtfExport_getSupportedServiceNames() ) );
     } else if ( rtl_str_compare( pImplName, IMPL_NAME_RTFIMPORT ) == 0 ) {
-        const OUString aServiceName( OUString::createFromAscii( IMPL_NAME_RTFIMPORT ) );
+        const OUString aServiceName( OUString(RTL_CONSTASCII_USTRINGPARAM( IMPL_NAME_RTFIMPORT )) );
 
         xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
                     reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
diff --git a/sw/source/filter/ww8/dump/dump8a.cxx b/sw/source/filter/ww8/dump/dump8a.cxx
index f65dfe3f9032..f9c6fe779409 100644
--- a/sw/source/filter/ww8/dump/dump8a.cxx
+++ b/sw/source/filter/ww8/dump/dump8a.cxx
@@ -39,7 +39,7 @@
 #include "ww8darr.hxx"
 #include "ww8dout.hxx"
 
-#define ASSERT( a, b ) ( (a)?(void)0:(void)(*pOut<<endl1<<"ASSERTION failed "<< __FILE__<<__LINE__<< b <<endl1) )
+#define OSL_ENSURE( a, b ) ( (a)?(void)0:(void)(*pOut<<endl1<<"ASSERTION failed "<< __FILE__<<__LINE__<< b <<endl1) )
 
 
 #define nWW8MaxListLevel 9
@@ -1300,7 +1300,7 @@ static void DumpPLCF( long nPos, long nLen, ePLCFT ePlc )
                         ACHTUNG: im FILTER nicht "FALSE" sondern "!this()" schreiben,
                                             da sonst Warning unter OS/2
                     */
-                    ASSERT( FALSE, "Es wurde vergessen, nVersion zu kodieren!" );
+                    OSL_ENSURE( FALSE, "Es wurde vergessen, nVersion zu kodieren!" );
                     return;
     }
 
@@ -1351,7 +1351,7 @@ static void DumpPLCF( long nPos, long nLen, ePLCFT ePlc )
                                             ACHTUNG: im FILTER nicht "FALSE" sondern "!this()" schreiben,
                                                                 da sonst Warning unter OS/2
                                         */
-                                        ASSERT( FALSE, "Es wurde vergessen, nVersion zu kodieren!" );
+                                        OSL_ENSURE( FALSE, "Es wurde vergessen, nVersion zu kodieren!" );
                                         return;
                         }
 
@@ -2650,7 +2650,7 @@ int DoConvert( const String& rName, BYTE nVersion )
                         ACHTUNG: im FILTER nicht "FALSE" sondern "!this()" schreiben,
                                             da sonst Warning unter OS/2
                     */
-                    ASSERT( FALSE, "Es wurde vergessen, nVersion zu kodieren!" );
+                    OSL_ENSURE( FALSE, "Es wurde vergessen, nVersion zu kodieren!" );
                     return 1;
     }
 
diff --git a/sw/source/filter/ww8/dump/ww8scan.cxx b/sw/source/filter/ww8/dump/ww8scan.cxx
index bed9a5cbca4e..7ecb639a1b75 100644
--- a/sw/source/filter/ww8/dump/ww8scan.cxx
+++ b/sw/source/filter/ww8/dump/ww8scan.cxx
@@ -39,11 +39,11 @@
 #ifdef DUMP
 
 #define ERR_SWG_READ_ERROR 1234
-#define ASSERT( a, b )
+#define OSL_ENSURE( a, b )
 
 #else                       // dump
 #include <swerror.h>        // ERR_WW6_...
-#include <errhdl.hxx>       // ASSERT()
+#include <errhdl.hxx>       // OSL_ENSURE()
 #include <swtypes.hxx>      // DELETEZ
 
 #endif                      // dump
@@ -51,7 +51,7 @@
 #include "ww8scan.hxx"
 
 #define ASSERT_RET_ON_FAIL( aCon, aError, aRet ) \
-    ASSERT(aCon, aError); \
+    OSL_ENSURE(aCon, aError); \
     if (!(aCon)) \
         return aRet;
 
@@ -105,7 +105,7 @@ public:
     wwSortedArray(C *pWwSprmTab, size_t nNoElems)
         : mpWwSprmTab(pWwSprmTab), mnNoElems(nNoElems)
     {
-        ASSERT(mnNoElems && pWwSprmTab, "WW8: empty Array: Don't do that");
+        OSL_ENSURE(mnNoElems && pWwSprmTab, "WW8: empty Array: Don't do that");
         std::sort(mpWwSprmTab, mpWwSprmTab + mnNoElems);
 #ifdef DEBUG
         bool bBroken=false;
@@ -688,7 +688,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
 
 wwSprmParser::wwSprmParser(int nVersion) : mnVersion(nVersion)
 {
-    ASSERT((mnVersion >= 6 && mnVersion <= 8), "Impossible value for version");
+   OSL_ENSURE(mnVersion >= 6 && mnVersion <= 8), "Impossible value for version");
 
     mnDelta = (8 > mnVersion) ? 0 : 1;
 
@@ -706,7 +706,7 @@ SprmInfo wwSprmParser::GetSprmInfo(sal_uInt16 nId) const
     const SprmInfo* pFound = mpKnownSprms->search(aSrch);
     if (pFound == 0)
     {
-        ASSERT(mnVersion >= 8,
+        OSL_ENSURE(mnVersion >= 8,
            "Unknown ww6 sprm, dangerous, report to development");
 
         aSrch.nId = 0;
@@ -1091,7 +1091,7 @@ WW8PLCFx& WW8PLCFx_PCD::operator ++( int )
     if (pPcdI)
         (*pPcdI)++;
     else
-        ASSERT( !this, "pPcdI fehlt");
+        OSL_ENSURE( !this, "pPcdI fehlt");
     return *this;
 }
 
@@ -1102,11 +1102,11 @@ WW8_FC WW8PLCFx_PCD::AktPieceStartCp2Fc( WW8_CP nCp )
 
     if ( !pPcdI->Get(nCpStart, nCpEnd, pData) )
     {
-        ASSERT( !this, "AktPieceStartCp2Fc() with false Cp found (1)" );
+        OSL_ENSURE( !this, "AktPieceStartCp2Fc() with false Cp found (1)" );
         return LONG_MAX;
     }
 
-    ASSERT( nCp >= nCpStart && nCp < nCpEnd,
+    OSL_ENSURE( nCp >= nCpStart && nCp < nCpEnd,
         "AktPieceCp2Fc() with false Cp found (2)" );
 
     if( nCp < nCpStart )
@@ -1140,7 +1140,7 @@ WW8_CP WW8PLCFx_PCD::AktPieceStartFc2Cp( WW8_FC nStartPos )
     void* pData;
     if ( !pPcdI->Get( nCpStart, nCpEnd, pData ) )
     {
-         ASSERT( !this, "AktPieceStartFc2Cp() - Fehler" );
+         OSL_ENSURE( !this, "AktPieceStartFc2Cp() - Fehler" );
         return LONG_MAX;
     }
     bool bIsUnicode = false;
@@ -1430,7 +1430,7 @@ WW8_CP WW8ScannerBase::WW8Fc2Cp( WW8_FC nFcPos ) const
             void* pData;
             if( !pPieceIter->Get( nCpStart, nCpEnd, pData ) )
             {   // ausserhalb PLCFfpcd ?
-                ASSERT( !this, "PLCFpcd-WW8Fc2Cp() ging schief" );
+                OSL_ENSURE( !this, "PLCFpcd-WW8Fc2Cp() ging schief" );
                 break;
             }
             INT32 nFcStart  = SVBT32ToUInt32( ((WW8_PCD*)pData)->fc );
@@ -1498,7 +1498,7 @@ WW8_FC WW8ScannerBase::WW8Cp2Fc(WW8_CP nCpPos, bool* pIsUnicode,
             if( pTestFlag )
                 *pTestFlag = false;
             else
-                ASSERT( !this, "Falscher CP an WW8Cp2Fc() uebergeben" );
+                OSL_ENSURE( !this, "Falscher CP an WW8Cp2Fc() uebergeben" );
             return LONG_MAX;
         }
         long nCpStart, nCpEnd;
@@ -1508,7 +1508,7 @@ WW8_FC WW8ScannerBase::WW8Cp2Fc(WW8_CP nCpPos, bool* pIsUnicode,
             if( pTestFlag )
                 *pTestFlag = false;
             else
-                ASSERT( !this, "PLCFfpcd-Get ging schief" );
+                OSL_ENSURE( !this, "PLCFfpcd-Get ging schief" );
             return LONG_MAX;
         }
         if( pNextPieceCp )
@@ -1595,7 +1595,7 @@ WW8PLCFpcd* WW8ScannerBase::OpenPieceTable( SvStream* pStr, const WW8Fib* pWwF )
     // lies Piece Table PLCF ein
     INT32 nPLCFfLen;
     *pStr >> nPLCFfLen;
-    ASSERT( 65536 > nPLCFfLen, "PLCFfpcd ueber 64 k" );
+    OSL_ENSURE( 65536 > nPLCFfLen, "PLCFfpcd ueber 64 k" );
     return new WW8PLCFpcd( pStr, pStr->Tell(), nPLCFfLen, 8 );
 }
 
@@ -1713,7 +1713,7 @@ WW8ScannerBase::WW8ScannerBase( SvStream* pSt, SvStream* pTblSt,
             }
             break;
         default:
-            ASSERT( !this, "Es wurde vergessen, nVersion zu kodieren!" );
+            OSL_ENSURE( !this, "Es wurde vergessen, nVersion zu kodieren!" );
             break;
     }
 
@@ -2149,7 +2149,7 @@ bool WW8PLCFspecial::GetData(long nInIdx, long& rPos, void*& rpValue) const
 WW8PLCF::WW8PLCF( SvStream* pSt, long nFilePos, long nPLCF, long nStruct,
     long nStartPos ) :nIdx( 0 ), nStru( nStruct )
 {
-    ASSERT( nPLCF, "WW8PLCF: nPLCF ist Null!" );
+    OSL_ENSURE( nPLCF, "WW8PLCF: nPLCF ist Null!" );
 
     nIMax = ( nPLCF - 4 ) / ( 4 + nStruct );
 
@@ -2200,7 +2200,7 @@ void WW8PLCF::ReadPLCF( SvStream* pSt, long nFilePos, long nPLCF )
 
 void WW8PLCF::GeneratePLCF( SvStream* pSt, long nPN, long ncpN )
 {
-    ASSERT( nIMax < (long)ncpN, "Pcl.Fkp: Warum ist PLCF zu gross ?" );
+    OSL_ENSURE( nIMax < (long)ncpN, "Pcl.Fkp: Warum ist PLCF zu gross ?" );
     nIMax = ncpN;
     long nSiz = 6 * nIMax + 4;
     pPLCF_PosArray = new INT32[ ( nSiz + 3 ) / 4 ]; // Pointer auf Pos-Array
@@ -2611,7 +2611,7 @@ bool WW8PLCFx_Fc_FKP::WW8Fkp::HasSprm(USHORT nId,
 //-----------------------------------------
 void WW8PLCFx::GetSprms( WW8PLCFxDesc* p )
 {
-    ASSERT( !this, "Falsches GetSprms gerufen" );
+    OSL_ENSURE( !this, "Falsches GetSprms gerufen" );
     p->nStartPos = p->nEndPos = LONG_MAX;
     p->pMemPos = 0;
     p->nSprmsLen = 0;
@@ -2621,7 +2621,7 @@ void WW8PLCFx::GetSprms( WW8PLCFxDesc* p )
 
 long WW8PLCFx::GetNoSprms( long& rStart, long& rEnd, long& rLen )
 {
-    ASSERT( !this, "Falsches GetNoSprms gerufen" );
+    OSL_ENSURE( !this, "Falsches GetNoSprms gerufen" );
     rStart = rEnd = LONG_MAX;
     rLen = 0;
     return 0;
@@ -2674,7 +2674,7 @@ bool WW8PLCFx_Fc_FKP::NewFkp()
             break;
         default:
             // Programm-Fehler!
-            ASSERT( !this, "Es wurde vergessen, nVersion zu kodieren!" );
+            OSL_ENSURE( !this, "Es wurde vergessen, nVersion zu kodieren!" );
             return false;
     }
 
@@ -3124,7 +3124,7 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p)
                         {
                             if( !pPieceIter->Get( nCpStart, nCpEnd, pData ) )
                             {
-                                ASSERT( !this, "piece iter broken!" );
+                                OSL_ENSURE( !this, "piece iter broken!" );
                                 break;
                             }
                             bIsUnicode = false;
@@ -3611,7 +3611,7 @@ WW8PLCFx& WW8PLCFx_FLD::operator ++( int )
 
 bool WW8PLCFx_FLD::GetPara(long nIdx, WW8FieldDesc& rF)
 {
-    ASSERT( pPLCF, "Aufruf ohne Feld PLCFspecial" );
+    OSL_ENSURE( pPLCF, "Aufruf ohne Feld PLCFspecial" );
     if( !pPLCF )
         return false;
 
@@ -3683,7 +3683,7 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, UINT32 nStart, INT32 nLen,
         BYTE nBChar;
         if( nLen2 != nLen )
         {
-            ASSERT( nLen2 == nLen, "Fib length and read length are different" );
+            OSL_ENSURE( nLen2 == nLen, "Fib length and read length are different" );
             if (nLen > USHRT_MAX)
                 nLen = USHRT_MAX;
             else if (nLen < 2 )
@@ -3853,14 +3853,14 @@ long WW8PLCFx_Book::GetLen() const
 {
     if( nIsEnd )
     {
-        ASSERT( !this, "Falscher Aufruf (1) von PLCF_Book::GetLen()" );
+        OSL_ENSURE( !this, "Falscher Aufruf (1) von PLCF_Book::GetLen()" );
         return 0;
     }
     void * p;
     WW8_CP nStartPos;
     if( !pBook[0]->Get( nStartPos, p ) )
     {
-        ASSERT( !this, "Falscher Aufruf (2) von PLCF_Book::GetLen()" );
+        OSL_ENSURE( !this, "Falscher Aufruf (2) von PLCF_Book::GetLen()" );
         return 0;
     }
     USHORT nEndIdx = SVBT16ToShort( *((SVBT16*)p) );
@@ -3871,7 +3871,7 @@ long WW8PLCFx_Book::GetLen() const
 
 void WW8PLCFx_Book::SetStatus(USHORT nIndex, eBookStatus eStat )
 {
-    ASSERT(nIndex < nIMax, "set status of non existing bookmark!");
+    OSL_ENSURE(nIndex < nIMax, "set status of non existing bookmark!");
     pStatus[nIndex] = (eBookStatus)( pStatus[nIndex] | eStat );
 }
 
@@ -3915,7 +3915,7 @@ String WW8PLCFx_Book::GetBookmark(long nStart,long nEnd, USHORT &nIndex)
                 nEndIdx = SVBT16ToShort( *((SVBT16*)p) );
             else
             {
-                ASSERT( !this, "Bookmark-EndIdx nicht lesbar" );
+                OSL_ENSURE( !this, "Bookmark-EndIdx nicht lesbar" );
                 nEndIdx = i;
             }
 
@@ -3951,7 +3951,7 @@ bool WW8PLCFx_Book::MapName(String& rName)
             nEndIdx = SVBT16ToShort( *((SVBT16*)p) );
         else
         {
-            ASSERT( !this, "Bookmark-EndIdx nicht lesbar" );
+            OSL_ENSURE( !this, "Bookmark-EndIdx nicht lesbar" );
             nEndIdx = i;
         }
         nEndAkt = pBook[1]->GetPos( nEndIdx );
@@ -4028,7 +4028,7 @@ void WW8PLCFMan::AdjustEnds( WW8PLCFxDesc& rDesc )
 
 void WW8PLCFxDesc::ReduceByOffset()
 {
-    ASSERT((LONG_MAX == nStartPos) || (nStartPos <= nEndPos),
+   OSL_ENSURE(LONG_MAX == nStartPos) || (nStartPos <= nEndPos),
             "Attr-Anfang und -Ende ueber Kreuz" );
 
     if( nStartPos != LONG_MAX )
@@ -4046,7 +4046,7 @@ void WW8PLCFxDesc::ReduceByOffset()
     }
     if( nEndPos   != LONG_MAX )
     {
-        ASSERT(nCpOfs <= nEndPos,
+        OSL_ENSURE(nCpOfs <= nEndPos,
             "oh oh, so much for the subdocument piece theory");
         nEndPos   -= nCpOfs;
     }
@@ -4067,7 +4067,7 @@ void WW8PLCFMan::GetNewNoSprms( WW8PLCFxDesc& rDesc )
     rDesc.nCp2OrIdx = rDesc.pPLCFx->GetNoSprms(rDesc.nStartPos, rDesc.nEndPos,
         rDesc.nSprmsLen);
 
-    ASSERT((LONG_MAX == rDesc.nStartPos) || (rDesc.nStartPos <= rDesc.nEndPos),
+   OSL_ENSURE(LONG_MAX == rDesc.nStartPos) || (rDesc.nStartPos <= rDesc.nEndPos),
             "Attr-Anfang und -Ende ueber Kreuz" );
 
     rDesc.ReduceByOffset();
@@ -4282,7 +4282,7 @@ WW8PLCFMan::~WW8PLCFMan()
 // 2. CP, wo ist naechste Attr.-Aenderung
 USHORT WW8PLCFMan::WhereIdx(bool* pbStart, long* pPos) const
 {
-    ASSERT(nPLCF,"What the hell");
+    OSL_ENSURE(nPLCF,"What the hell");
     long nNext = LONG_MAX;  // SuchReihenfolge:
     USHORT nNextIdx = nPLCF;// first ending found ( CHP, PAP, ( SEP ) ),
     bool bStart = true;     // dann Anfaenge finden ( ( SEP ), PAP, CHP )
@@ -4405,7 +4405,7 @@ void WW8PLCFMan::GetSprmEnd( short nIdx, WW8PLCFManResult* pRes ) const
         pRes->nSprmId = p->pIdStk->top();       // get end position
     else
     {
-        ASSERT( !this, "No Id on the Stack" );
+        OSL_ENSURE( !this, "No Id on the Stack" );
         pRes->nSprmId = 0;
     }
 }
@@ -4576,7 +4576,7 @@ void WW8PLCFMan::AdvSprm(short nIdx, bool bStart)
                 p->nSprmsLen = 0;
                 GetNewSprms( *p );
             }
-            ASSERT( p->nStartPos <= p->nEndPos, "Attribut ueber Kreuz" );
+            OSL_ENSURE( p->nStartPos <= p->nEndPos, "Attribut ueber Kreuz" );
         }
     }
 }
@@ -4667,7 +4667,7 @@ bool WW8PLCFMan::Get(WW8PLCFManResult* pRes) const
 
     if( nIdx >= nPLCF )
     {
-        ASSERT( !this, "Position not found" );
+        OSL_ENSURE( !this, "Position not found" );
         return true;
     }
 
@@ -4705,7 +4705,7 @@ USHORT WW8PLCFMan::GetColl() const
         return  pPap->pPLCFx->GetIstd();
     else
     {
-        ASSERT( !this, "GetColl ohne PLCF_Pap" );
+        OSL_ENSURE( !this, "GetColl ohne PLCF_Pap" );
         return 0;
     }
 }
@@ -4867,7 +4867,7 @@ WW8Fib::WW8Fib( SvStream& rSt, BYTE nWantedVersion,UINT32 nOffset )
                 nFibMin = 0;            // Programm-Fehler!
                 nFibMax = 0;
                 nFib    = 1;
-                ASSERT( !this, "Es wurde vergessen, nVersion zu kodieren!" );
+                OSL_ENSURE( !this, "Es wurde vergessen, nVersion zu kodieren!" );
                 break;
         }
         if ( (nFib < nFibMin) || (nFib > nFibMax) )
@@ -5507,7 +5507,7 @@ bool WW8Fib::Write(SvStream& rStrm)
 
 rtl_TextEncoding WW8Fib::GetFIBCharset(UINT16 chs)
 {
-    ASSERT(chs <= 0x100, "overflowed winword charset set");
+    OSL_ENSURE(chs <= 0x100, "overflowed winword charset set");
     rtl_TextEncoding eCharSet =
         (0x0100 == chs)
         ? RTL_TEXTENCODING_APPLE_ROMAN
@@ -5702,7 +5702,7 @@ WW8_STD* WW8Style::Read1Style( short& rSkip, String* pString, short* pcbStd )
                     }
                     break;
                 default:
-                    ASSERT(!this, "Es wurde vergessen, nVersion zu kodieren!");
+                    OSL_ENSURE(!this, "Es wurde vergessen, nVersion zu kodieren!");
                     break;
             }
         }
@@ -5750,7 +5750,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib )
     // always in ANSI, even if eStructCharSet == CHARSET_MAC !!
     if( rFib.lcbSttbfffn <= 2 )
     {
-        ASSERT( !this, "Fonttabelle kaputt! (rFib.lcbSttbfffn < 2)" );
+        OSL_ENSURE( !this, "Fonttabelle kaputt! (rFib.lcbSttbfffn < 2)" );
         pFontA = 0;
         nMax = 0;
         return;
@@ -6516,7 +6516,7 @@ USHORT WW8DopTypography::GetConvertedLang() const
             nLang = LANGUAGE_CHINESE_TRADITIONAL;
             break;
         default:
-            ASSERT(!this, "Unknown MS Asian Typography language, report");
+            OSL_ENSURE(!this, "Unknown MS Asian Typography language, report");
             nLang = LANGUAGE_CHINESE;
             break;
         case 0:
@@ -6573,7 +6573,7 @@ USHORT wwSprmParser::GetSprmTailLen(sal_uInt16 nId, const sal_uInt8* pSprm)
                     nL = SVBT16ToShort( &pSprm[1 + mnDelta] ) + aSprm.nLen - 1;
                     break;
                 default:
-                    ASSERT(!this, "Unknown sprm varient");
+                    OSL_ENSURE(!this, "Unknown sprm varient");
                     break;
             }
             break;
diff --git a/sw/source/filter/ww8/fields.cxx b/sw/source/filter/ww8/fields.cxx
index 79e0a2898b11..8df80add18f3 100644
--- a/sw/source/filter/ww8/fields.cxx
+++ b/sw/source/filter/ww8/fields.cxx
@@ -30,7 +30,8 @@
 #include "precompiled_sw.hxx"
 
 #include "fields.hxx"
-#include <errhdl.hxx>   //ASSERT (use our own ww header later for asserts)
+#include <errhdl.hxx>
+#include <osl/diagnose.h>
 #include <sal/macros.h>
 #include <stddef.h>
 
@@ -144,7 +145,7 @@ namespace ww
         size_t nIndex = static_cast<size_t>(eIndex);
         if (nIndex >= SAL_N_ELEMENTS(aFieldNames))
             eIndex = eNONE;
-        ASSERT(eIndex != eNONE, "Unknown WinWord Field, let cmc know");
+        OSL_ENSURE(eIndex != eNONE, "Unknown WinWord Field, let cmc know");
         return aFieldNames[eIndex];
     }
 }
diff --git a/sw/source/filter/ww8/hash_wrap.hxx b/sw/source/filter/ww8/hash_wrap.hxx
index 7b63070e14ea..e089a15e1436 100644
--- a/sw/source/filter/ww8/hash_wrap.hxx
+++ b/sw/source/filter/ww8/hash_wrap.hxx
@@ -33,7 +33,7 @@
 
 #include <hash_set>
 #include <tools/debug.hxx>
-#include <errhdl.hxx>       // ASSERT()
+#include <errhdl.hxx>       // OSL_ENSURE()
 
 //simple wrapper around hash_set to behave like sorted array
 namespace ww
@@ -66,7 +66,7 @@ namespace ww
 
         WrappedHash(const C *pWwSprmTab, const size_t nNoElems)
         {
-            ASSERT(nNoElems && pWwSprmTab, "WW8: empty Array: Don't do that");
+            OSL_ENSURE(nNoElems && pWwSprmTab, "WW8: empty Array: Don't do that");
             const C *pIter = pWwSprmTab;
             const C *pEnd  = pWwSprmTab + nNoElems;
             while (pIter < pEnd)
diff --git a/sw/source/filter/ww8/makefile.mk b/sw/source/filter/ww8/makefile.mk
index ca9116c3cf51..9c9455be8b41 100644
--- a/sw/source/filter/ww8/makefile.mk
+++ b/sw/source/filter/ww8/makefile.mk
@@ -44,52 +44,31 @@ CDEFS=$(CDEFS) -Dmydebug
 # --- Files --------------------------------------------------------
 
 EXCEPTIONSFILES = \
-        $(SLO)$/wrtww8gr.obj \
-        $(SLO)$/ww8par2.obj \
-        $(SLO)$/ww8par3.obj \
-        $(SLO)$/ww8par5.obj \
-        $(SLO)$/tracer.obj \
-        $(SLO)$/fields.obj \
-        $(SLO)$/styles.obj \
-        $(SLO)$/ww8graf.obj \
-        $(SLO)$/ww8graf2.obj \
-        $(SLO)$/wrtw8esh.obj \
-        $(SLO)$/wrtw8nds.obj \
-        $(SLO)$/wrtw8num.obj \
-        $(SLO)$/wrtw8sty.obj \
-        $(SLO)$/wrtww8.obj \
-        $(SLO)$/docxattributeoutput.obj \
-        $(SLO)$/docxexportfilter.obj \
-        $(SLO)$/docxexport.obj \
-        $(SLO)$/ww8atr.obj \
-        $(SLO)$/ww8par.obj \
-        $(SLO)$/ww8par6.obj \
-        $(SLO)$/writerhelper.obj \
-        $(SLO)$/writerwordglue.obj \
-        $(SLO)$/ww8scan.obj \
-        $(SLO)$/WW8TableInfo.obj \
         $(SLO)$/WW8FFData.obj \
-        $(SLO)$/WW8Sttbf.obj \
-        $(SLO)$/ww8toolbar.obj \
         $(SLO)$/WW8FibData.obj \
+        $(SLO)$/WW8Sttbf.obj \
+        $(SLO)$/WW8TableInfo.obj \
+        $(SLO)$/docxattributeoutput.obj \
+        $(SLO)$/docxexport.obj \
+        $(SLO)$/docxexportfilter.obj \
+        $(SLO)$/fields.obj \
+        $(SLO)$/rtfattributeoutput.obj \
+        $(SLO)$/rtfexport.obj \
         $(SLO)$/rtfexportfilter.obj \
         $(SLO)$/rtfimportfilter.obj \
-        $(SLO)$/rtfattributeoutput.obj \
         $(SLO)$/rtfsdrexport.obj \
-        $(SLO)$/rtfexport.obj
-
-
-SLOFILES =	\
+        $(SLO)$/styles.obj \
+        $(SLO)$/tracer.obj \
+        $(SLO)$/writerhelper.obj \
+        $(SLO)$/writerwordglue.obj \
         $(SLO)$/wrtw8esh.obj \
         $(SLO)$/wrtw8nds.obj \
         $(SLO)$/wrtw8num.obj \
         $(SLO)$/wrtw8sty.obj \
         $(SLO)$/wrtww8.obj \
         $(SLO)$/wrtww8gr.obj \
-        $(SLO)$/docxattributeoutput.obj \
-        $(SLO)$/docxexportfilter.obj \
-        $(SLO)$/docxexport.obj \
         $(SLO)$/ww8atr.obj \
+        $(SLO)$/ww8glsy.obj \
         $(SLO)$/ww8graf.obj \
         $(SLO)$/ww8graf2.obj \
         $(SLO)$/ww8par.obj \
@@ -98,23 +77,12 @@ SLOFILES =	\
         $(SLO)$/ww8par4.obj \
         $(SLO)$/ww8par5.obj \
         $(SLO)$/ww8par6.obj \
-        $(SLO)$/ww8glsy.obj \
-        $(SLO)$/tracer.obj \
-        $(SLO)$/fields.obj \
-        $(SLO)$/styles.obj \
         $(SLO)$/ww8scan.obj \
-        $(SLO)$/writerhelper.obj \
-        $(SLO)$/writerwordglue.obj \
-        $(SLO)$/WW8TableInfo.obj \
-        $(SLO)$/WW8FFData.obj \
-        $(SLO)$/WW8Sttbf.obj \
-        $(SLO)$/ww8toolbar.obj \
-        $(SLO)$/WW8FibData.obj \
-        $(SLO)$/rtfexportfilter.obj \
-        $(SLO)$/rtfimportfilter.obj \
-        $(SLO)$/rtfattributeoutput.obj \
-        $(SLO)$/rtfsdrexport.obj \
-        $(SLO)$/rtfexport.obj
+        $(SLO)$/ww8toolbar.obj
+
+
+SLOFILES =	\
+        $(EXCEPTIONSFILES)
 
 
 # --- Tagets -------------------------------------------------------
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index ad87b8e070ff..891cefb9934e 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -280,7 +280,8 @@ void RtfAttributeOutput::StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pTextN
         if ( m_nTableDepth > 0 && !m_bTableCellOpen )
         {
             ww8::WW8TableNodeInfoInner::Pointer_t pDeepInner( pTextNodeInfo->getInnerForDepth( m_nTableDepth ) );
-            if ( pDeepInner->getCell() == 0 )
+            OSL_ENSURE( pDeepInner, "TableNodeInfoInner not found");
+            if ( pDeepInner && pDeepInner->getCell() == 0 )
                 StartTableRow( pDeepInner );
 
             StartTableCell( pDeepInner );
@@ -1393,7 +1394,7 @@ void RtfAttributeOutput::NumberingLevel( BYTE nLevel,
             m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_F;
             m_rExport.OutULong(m_rExport.maFontHelper.GetId(*pFont));
         }
-        m_rExport.OutputItemSet( *pOutSet, false, true, i18n::ScriptType::LATIN );
+        m_rExport.OutputItemSet( *pOutSet, false, true, i18n::ScriptType::LATIN, m_rExport.mbExportModeRTF );
         m_rExport.Strm() << m_aStyles.makeStringAndClear();
     }
 
@@ -1523,7 +1524,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi
             }
 
             if ( pGrfNode )
-                FlyFrameGraphic( *pGrfNode, rFrame.GetLayoutSize() );
+                FlyFrameGraphic( dynamic_cast<const SwFlyFrmFmt*>( &rFrame.GetFrmFmt() ), *pGrfNode, rFrame.GetLayoutSize() );
             break;
         case sw::Frame::eDrawing:
             {
@@ -1577,7 +1578,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi
                         uno::Reference<beans::XPropertySet> xPropSet(xControlModel, uno::UNO_QUERY);
                         uno::Reference<beans::XPropertySetInfo> xPropSetInfo = xPropSet->getPropertySetInfo();
                         OUString sName;
-                        if (xInfo->supportsService(C2U("com.sun.star.form.component.CheckBox")))
+                        if (xInfo->supportsService(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.CheckBox"))))
                         {
 
                             m_aRun.append(OUStringToOString(OUString(FieldString(ww::eFORMCHECKBOX)), m_rExport.eCurrentEncoding));
@@ -1587,7 +1588,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi
                             m_aRun.append(OOO_STRING_SVTOOLS_RTF_FFHPS "20");
 
                             OUString aStr;
-                            sName = C2U("Name");
+                            sName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"));
                             if (xPropSetInfo->hasPropertyByName(sName))
                             {
                                 xPropSet->getPropertyValue(sName) >>= aStr;
@@ -1596,7 +1597,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi
                                 m_aRun.append('}');
                             }
 
-                            sName = C2U("HelpText");
+                            sName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HelpText"));
                             if (xPropSetInfo->hasPropertyByName(sName))
                             {
                                 xPropSet->getPropertyValue(sName) >>= aStr;
@@ -1606,7 +1607,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi
                                 m_aRun.append('}');
                             }
 
-                            sName = C2U("HelpF1Text");
+                            sName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HelpF1Text"));
                             if (xPropSetInfo->hasPropertyByName(sName))
                             {
                                 xPropSet->getPropertyValue(sName) >>= aStr;
@@ -1617,10 +1618,10 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi
                             }
 
                             sal_Int16 nTemp = 0;
-                            xPropSet->getPropertyValue(C2U("DefaultState")) >>= nTemp;
+                            xPropSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultState"))) >>= nTemp;
                             m_aRun.append(OOO_STRING_SVTOOLS_RTF_FFDEFRES);
                             m_aRun.append((sal_Int32)nTemp);
-                            xPropSet->getPropertyValue(C2U("State")) >>= nTemp;
+                            xPropSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("State"))) >>= nTemp;
                             m_aRun.append(OOO_STRING_SVTOOLS_RTF_FFRES);
                             m_aRun.append((sal_Int32)nTemp);
 
@@ -1629,7 +1630,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi
                             // field result is empty, ffres already contains the form result
                             m_aRun.append("}{" OOO_STRING_SVTOOLS_RTF_FLDRSLT " ");
                         }
-                        else if (xInfo->supportsService(C2U("com.sun.star.form.component.TextField")))
+                        else if (xInfo->supportsService(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.TextField"))))
                         {
                             OStringBuffer aBuf;
                             OString aStr;
@@ -1639,12 +1640,12 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi
                             m_aRun.append(OUStringToOString(OUString(FieldString(ww::eFORMTEXT)), m_rExport.eCurrentEncoding));
                             m_aRun.append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_DATAFIELD " ");
                             for (int i = 0; i < 8; i++) aBuf.append((sal_Char)0x00);
-                            xPropSet->getPropertyValue(C2U("Name")) >>= aTmp;
+                            xPropSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"))) >>= aTmp;
                             aStr = OUStringToOString(aTmp, m_rExport.eCurrentEncoding);
                             aBuf.append((sal_Char)aStr.getLength());
                             aBuf.append(aStr);
                             aBuf.append((sal_Char)0x00);
-                            xPropSet->getPropertyValue(C2U("DefaultText")) >>= aTmp;
+                            xPropSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultText"))) >>= aTmp;
                             aStr = OUStringToOString(aTmp, m_rExport.eCurrentEncoding);
                             aBuf.append((sal_Char)aStr.getLength());
                             aBuf.append(aStr);
@@ -1655,11 +1656,11 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi
                                 m_aRun.append(m_rExport.OutHex(*pStr, 2));
                             m_aRun.append('}');
                             m_aRun.append("}{" OOO_STRING_SVTOOLS_RTF_FLDRSLT " ");
-                            xPropSet->getPropertyValue(C2U("Text")) >>= aTmp;
+                            xPropSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Text"))) >>= aTmp;
                             m_aRun.append(OUStringToOString(aTmp, m_rExport.eCurrentEncoding));
                             m_aRun.append('}');
                             m_aRun.append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FORMFIELD "{");
-                            sName = C2U("HelpText");
+                            sName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HelpText"));
                             if (xPropSetInfo->hasPropertyByName(sName))
                             {
                                 xPropSet->getPropertyValue(sName) >>= aTmp;
@@ -1669,7 +1670,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi
                                 m_aRun.append('}');
                             }
 
-                            sName = C2U("HelpF1Text");
+                            sName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HelpF1Text"));
                             if (xPropSetInfo->hasPropertyByName(sName))
                             {
                                 xPropSet->getPropertyValue(sName) >>= aTmp;
@@ -1680,7 +1681,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi
                             }
                             m_aRun.append("}");
                         }
-                        else if (xInfo->supportsService(C2U("com.sun.star.form.component.ListBox")))
+                        else if (xInfo->supportsService(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.ListBox"))))
                         {
                             OUString aStr;
                             uno::Sequence<sal_Int16> aIntSeq;
@@ -1689,18 +1690,25 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi
                             m_aRun.append(OUStringToOString(OUString(FieldString(ww::eFORMDROPDOWN)), m_rExport.eCurrentEncoding));
                             m_aRun.append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FORMFIELD "{");
                             m_aRun.append(OOO_STRING_SVTOOLS_RTF_FFTYPE "2"); // 2 = list
+                            m_aRun.append(OOO_STRING_SVTOOLS_RTF_FFHASLISTBOX);
 
-                            xPropSet->getPropertyValue(C2U("DefaultSelection")) >>= aIntSeq;
-                            m_aRun.append(OOO_STRING_SVTOOLS_RTF_FFDEFRES);
-                            // a dropdown list can have only one 'selected item by default'
-                            m_aRun.append((sal_Int32)aIntSeq[0]);
+                            xPropSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultSelection"))) >>= aIntSeq;
+                            if( aIntSeq.getLength() )
+                            {
+                                m_aRun.append(OOO_STRING_SVTOOLS_RTF_FFDEFRES);
+                                // a dropdown list can have only one 'selected item by default'
+                                m_aRun.append((sal_Int32)aIntSeq[0]);
+                            }
 
-                            xPropSet->getPropertyValue(C2U("SelectedItems")) >>= aIntSeq;
-                            m_aRun.append(OOO_STRING_SVTOOLS_RTF_FFRES);
-                            // a dropdown list can have only one 'currently selected item'
-                            m_aRun.append((sal_Int32)aIntSeq[0]);
+                            xPropSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SelectedItems"))) >>= aIntSeq;
+                            if( aIntSeq.getLength() )
+                            {
+                                m_aRun.append(OOO_STRING_SVTOOLS_RTF_FFRES);
+                                // a dropdown list can have only one 'currently selected item'
+                                m_aRun.append((sal_Int32)aIntSeq[0]);
+                            }
 
-                            sName = C2U("Name");
+                            sName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"));
                             if (xPropSetInfo->hasPropertyByName(sName))
                             {
                                 xPropSet->getPropertyValue(sName) >>= aStr;
@@ -1709,7 +1717,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi
                                 m_aRun.append('}');
                             }
 
-                            sName = C2U("HelpText");
+                            sName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HelpText"));
                             if (xPropSetInfo->hasPropertyByName(sName))
                             {
                                 xPropSet->getPropertyValue(sName) >>= aStr;
@@ -1719,7 +1727,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi
                                 m_aRun.append('}');
                             }
 
-                            sName = C2U("HelpF1Text");
+                            sName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HelpF1Text"));
                             if (xPropSetInfo->hasPropertyByName(sName))
                             {
                                 xPropSet->getPropertyValue(sName) >>= aStr;
@@ -1729,9 +1737,8 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi
                                 m_aRun.append('}');
                             }
 
-                            m_aRun.append(OOO_STRING_SVTOOLS_RTF_FFHASLISTBOX);
 
-                            xPropSet->getPropertyValue(C2U("StringItemList")) >>= aStrSeq;
+                            xPropSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StringItemList"))) >>= aStrSeq;
                             sal_uInt32 nListItems = aStrSeq.getLength();
                             for (sal_uInt32 i = 0; i < nListItems; i++)
                                 m_aRun.append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FFL " ")
@@ -1760,7 +1767,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi
                 {
                     SwNodeIndex aIdx(*rFrmFmt.GetCntnt().GetCntntIdx(), 1);
                     SwOLENode& rOLENd = *aIdx.GetNode().GetOLENode();
-                    FlyFrameOLE(rOLENd, rFrame.GetLayoutSize());
+                    FlyFrameOLE(dynamic_cast<const SwFlyFrmFmt*>( &rFrmFmt ), rOLENd, rFrame.GetLayoutSize());
                 }
             }
             break;
@@ -2455,13 +2462,10 @@ void RtfAttributeOutput::ParaNumRule_Impl( const SwTxtNode* pTxtNd, sal_Int32 nL
 
     const SwNumRule* pRule = pTxtNd->GetNumRule();
 
-    // --> OD 2008-03-18 #refactorlists#
-    //    if( pRule && MAXLEVEL > pTxtNd->GetActualListLevel() )
     if( pRule && pTxtNd->IsInList() )
-        // <--
     {
         // --> OD 2008-03-18 #refactorlists#
-        ASSERT( pTxtNd->GetActualListLevel() >= 0 && pTxtNd->GetActualListLevel() < MAXLEVEL,
+        OSL_ENSURE( pTxtNd->GetActualListLevel() >= 0 && pTxtNd->GetActualListLevel() < MAXLEVEL,
                 "<SwRTFWriter::OutListNum(..)> - text node does not have valid list level. Serious defect -> please inform OD" );
         // <--
 
@@ -2544,13 +2548,7 @@ void RtfAttributeOutput::ParaScriptSpace( const SfxBoolItem& rScriptSpace )
         case RES_PARATR_SCRIPTSPACE:
             m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ASPALPHA);
             break;
-        /* Is this needed?
-        case RES_PARATR_HANGINGPUNCTUATION:
-            m_aStyles.append(OOO_STRING_SVTOOLS_RTF_NOOVERFLOW);
-            break;
-        case RES_PARATR_FORBIDDEN_RULES:
-            m_aStyles.append(OOO_STRING_SVTOOLS_RTF_NOCWRAP);
-            break;*/
+
         default:
             break;
     }
@@ -2567,7 +2565,7 @@ void RtfAttributeOutput::ParaVerticalAlign( const SvxParaVertAlignItem& rAlign )
         case SvxParaVertAlignItem::BOTTOM:      pStr = OOO_STRING_SVTOOLS_RTF_FAVAR;        break;
         case SvxParaVertAlignItem::CENTER:      pStr = OOO_STRING_SVTOOLS_RTF_FACENTER;     break;
         case SvxParaVertAlignItem::BASELINE:    pStr = OOO_STRING_SVTOOLS_RTF_FAROMAN;      break;
-        // default == SvxParaVertAlignItem::AUTOMATIC
+
         default:                                pStr = OOO_STRING_SVTOOLS_RTF_FAAUTO;       break;
     }
     m_aStyles.append(pStr);
@@ -2665,15 +2663,32 @@ void RtfAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace )
     {
         if( m_rExport.bOutPageDescs )
         {
-            if( rULSpace.GetUpper() )
+            OSL_ENSURE( m_rExport.GetCurItemSet(), "Impossible" );
+            if ( !m_rExport.GetCurItemSet() )
+                return;
+
+            HdFtDistanceGlue aDistances( *m_rExport.GetCurItemSet() );
+
+            if ( aDistances.HasHeader() )
             {
-                m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_MARGTSXN);
-                m_aSectionBreaks.append((sal_Int32)rULSpace.GetUpper());
+                if( aDistances.dyaTop )
+                {
+                    m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_MARGTSXN);
+                    m_aSectionBreaks.append((sal_Int32)aDistances.dyaTop);
+                }
+                m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_HEADERY);
+                m_aSectionBreaks.append((sal_Int32)aDistances.dyaHdrTop);
             }
-            if( rULSpace.GetLower() )
+
+            if( aDistances.HasFooter() )
             {
-                m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_MARGBSXN);
-                m_aSectionBreaks.append((sal_Int32)rULSpace.GetLower());
+                if( aDistances.dyaBottom )
+                {
+                    m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_MARGBSXN);
+                    m_aSectionBreaks.append((sal_Int32)aDistances.dyaBottom);
+                }
+                m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_FOOTERY);
+                m_aSectionBreaks.append((sal_Int32)aDistances.dyaHdrBottom);
             }
             if (!m_bBufferSectionBreaks)
                 m_rExport.Strm() << m_aSectionBreaks.makeStringAndClear();
@@ -2814,7 +2829,7 @@ void RtfAttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
 
     if( !rBrush.GetColor().GetTransparency() )
     {
-        m_aStyles.append(OOO_STRING_SVTOOLS_RTF_CHCBPAT);
+        m_aStyles.append(OOO_STRING_SVTOOLS_RTF_CBPAT);
         m_aStyles.append((sal_Int32)m_rExport.GetColor(rBrush.GetColor()));
     }
 }
@@ -3175,9 +3190,23 @@ static OString WriteHex(OString sString)
     return aRet.makeStringAndClear();
 }
 
-static OString ExportPICT(const Size &rOrig, const Size &rRendered, const Size &rMapped,
+void lcl_AppendSP( OStringBuffer& rBuffer,
+    const char cName[],
+    const ::rtl::OUString& rValue,
+    const RtfExport& rExport )
+{
+    rBuffer.append( "{" OOO_STRING_SVTOOLS_RTF_SP "{" ); // "{\sp{"
+    rBuffer.append( OOO_STRING_SVTOOLS_RTF_SN " " );//" \sn "
+    rBuffer.append( cName ); //"PropName"
+    rBuffer.append( "}{" OOO_STRING_SVTOOLS_RTF_SV " " );
+// "}{ \sv "
+    rBuffer.append( rExport.OutString( rValue, rExport.eCurrentEncoding ) );
+    rBuffer.append( "}}" );
+}
+
+static OString ExportPICT( const SwFlyFrmFmt* pFlyFrmFmt, const Size &rOrig, const Size &rRendered, const Size &rMapped,
     const SwCropGrf &rCr, const char *pBLIPType, const sal_uInt8 *pGraphicAry,
-    unsigned long nSize)
+    unsigned long nSize, const RtfExport& rExport )
 {
     OStringBuffer aRet;
     bool bIsWMF = (const char *)pBLIPType == (const char *)OOO_STRING_SVTOOLS_RTF_WMETAFILE ? true : false;
@@ -3185,6 +3214,18 @@ static OString ExportPICT(const Size &rOrig, const Size &rRendered, const Size &
     {
         aRet.append("{" OOO_STRING_SVTOOLS_RTF_PICT);
 
+        if( pFlyFrmFmt )
+        {
+            String sDescription = pFlyFrmFmt->GetObjDescription();
+            //write picture properties - wzDescription at first
+            //looks like: "{\*\picprop{\sp{\sn PropertyName}{\sv PropertyValue}}}"
+            aRet.append( "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_PICPROP );//"{\*\picprop
+            lcl_AppendSP( aRet, "wzDescription", sDescription, rExport );
+            String sName = pFlyFrmFmt->GetObjTitle();
+            lcl_AppendSP( aRet, "wzName", sName, rExport );
+            aRet.append( "}" ); //"}"
+        }
+
         long nXCroppedSize = rOrig.Width()-(rCr.GetLeft() + rCr.GetRight());
         long nYCroppedSize = rOrig.Height()-(rCr.GetTop() + rCr.GetBottom());
         /* #127543#: Graphic with a zero height or width, typically copied from webpages, caused
@@ -3277,7 +3318,7 @@ void RtfAttributeOutput::FlyFrameOLEData( SwOLENode& rOLENode )
     }
 }
 
-void RtfAttributeOutput::FlyFrameOLE( SwOLENode& rOLENode, const Size& rSize )
+void RtfAttributeOutput::FlyFrameOLE( const SwFlyFrmFmt* pFlyFrmFmt, SwOLENode& rOLENode, const Size& rSize )
 {
     OSL_TRACE("%s", OSL_THIS_FUNC);
 
@@ -3313,11 +3354,11 @@ void RtfAttributeOutput::FlyFrameOLE( SwOLENode& rOLENode, const Size& rSize )
     nHeight-=nFontHeight/20;
     m_aRunText.append("{" OOO_STRING_SVTOOLS_RTF_DN).append(nHeight);
     m_aRunText.append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_SHPPICT);
-    m_aRunText.append(ExportPICT(aSize, aRendered, aMapped, rCr, pBLIPType, pGraphicAry, nSize));
+    m_aRunText.append(ExportPICT( pFlyFrmFmt, aSize, aRendered, aMapped, rCr, pBLIPType, pGraphicAry, nSize, m_rExport ));
     m_aRunText.append("}}}}");
 }
 
-void RtfAttributeOutput::FlyFrameGraphic( const SwGrfNode& rGrfNode, const Size& rSize )
+void RtfAttributeOutput::FlyFrameGraphic( const SwFlyFrmFmt* pFlyFrmFmt, const SwGrfNode& rGrfNode, const Size& rSize )
 {
     OSL_TRACE("%s", OSL_THIS_FUNC);
 
@@ -3390,7 +3431,7 @@ void RtfAttributeOutput::FlyFrameGraphic( const SwGrfNode& rGrfNode, const Size&
         m_aRunText.append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_SHPPICT);
 
     if (pBLIPType)
-        m_aRunText.append(ExportPICT(aSize, aRendered, aMapped, rCr, pBLIPType, pGraphicAry, nSize));
+        m_aRunText.append(ExportPICT( pFlyFrmFmt, aSize, aRendered, aMapped, rCr, pBLIPType, pGraphicAry, nSize, m_rExport));
     else
     {
         aStream.Seek(0);
@@ -3400,7 +3441,7 @@ void RtfAttributeOutput::FlyFrameGraphic( const SwGrfNode& rGrfNode, const Size&
         nSize = aStream.Tell();
         pGraphicAry = (sal_uInt8*)aStream.GetData();
 
-        m_aRunText.append(ExportPICT(aSize, aRendered, aMapped, rCr, pBLIPType, pGraphicAry, nSize));
+        m_aRunText.append(ExportPICT(pFlyFrmFmt, aSize, aRendered, aMapped, rCr, pBLIPType, pGraphicAry, nSize, m_rExport ));
     }
 
     if (!bIsWMF)
@@ -3414,7 +3455,7 @@ void RtfAttributeOutput::FlyFrameGraphic( const SwGrfNode& rGrfNode, const Size&
         nSize = aStream.Tell();
         pGraphicAry = (sal_uInt8*)aStream.GetData();
 
-        m_aRunText.append(ExportPICT(aSize, aRendered, aMapped, rCr, pBLIPType, pGraphicAry, nSize));
+        m_aRunText.append(ExportPICT(pFlyFrmFmt, aSize, aRendered, aMapped, rCr, pBLIPType, pGraphicAry, nSize, m_rExport ));
 
         m_aRunText.append('}');
     }
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 84c50b8d30c7..9b3923dc88c6 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -45,6 +45,7 @@ class RtfExport;
 class SwGrfNode;
 class SwOLENode;
 class SdrObject;
+class SwFlyFrmFmt;
 
 /// The class that has handlers for various resource types when exporting as RTF
 class RtfAttributeOutput : public AttributeOutputBase
@@ -431,8 +432,8 @@ protected:
 private:
 
     /// Output graphic fly frames.
-    void FlyFrameGraphic( const SwGrfNode& rGrfNode, const Size& rSize );
-    void FlyFrameOLE( SwOLENode& rOLENode, const Size& rSize );
+    void FlyFrameGraphic( const SwFlyFrmFmt* pFlyFrmFmt, const SwGrfNode& rGrfNode, const Size& rSize );
+    void FlyFrameOLE( const SwFlyFrmFmt* pFlyFrmFmt, SwOLENode& rOLENode, const Size& rSize );
     void FlyFrameOLEData( SwOLENode& rOLENode );
 
     /*
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index fe801644fd01..3d4157b91bf9 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -348,11 +348,31 @@ void RtfExport::DoComboBox(const rtl::OUString& /*rName*/,
     // this is handled in RtfAttributeOutput::OutputFlyFrame_Impl
 }
 
-void RtfExport::DoFormText(const SwInputField* /*pFld*/)
+void RtfExport::DoFormText(const SwInputField* pFld )
 {
     OSL_TRACE("%s", OSL_THIS_FUNC);
 
-    // this is hanled in RtfAttributeOutput::OutputFlyFrame_Impl
+    ::rtl::OUString sResult = pFld->ExpandField(pDoc->IsClipBoard());
+    ::rtl::OUString sHelp( pFld->GetHelp() );
+    ::rtl::OUString sName = pFld->GetPar2();
+    ::rtl::OUString sStatus = pFld->GetToolTip();
+    m_pAttrOutput->RunText().append("{" OOO_STRING_SVTOOLS_RTF_FIELD "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FLDINST "{ FORMTEXT }");
+    m_pAttrOutput->RunText().append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FORMFIELD " {" OOO_STRING_SVTOOLS_RTF_FFTYPE "0" );
+    if( sHelp.getLength() )
+        m_pAttrOutput->RunText().append( OOO_STRING_SVTOOLS_RTF_FFOWNHELP );
+    if( sStatus.getLength() )
+        m_pAttrOutput->RunText().append( OOO_STRING_SVTOOLS_RTF_FFOWNSTAT );
+    m_pAttrOutput->RunText().append( OOO_STRING_SVTOOLS_RTF_FFTYPETXT  "0" );
+
+    if( sName.getLength() )
+        m_pAttrOutput->RunText().append( "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FFNAME " ").append( OutString( sName, eDefaultEncoding )).append( "}" );
+    if( sHelp.getLength() )
+        m_pAttrOutput->RunText().append( "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FFHELPTEXT " ").append( OutString( sHelp, eDefaultEncoding )).append( "}" );
+    m_pAttrOutput->RunText().append( "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FFDEFTEXT " ").append( OutString( sResult, eDefaultEncoding )).append( "}" );
+    if( sStatus.getLength() )
+        m_pAttrOutput->RunText().append( "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FFSTATTEXT " ").append( OutString( sStatus, eDefaultEncoding )).append( "}");
+    m_pAttrOutput->RunText().append( "}}}{" OOO_STRING_SVTOOLS_RTF_FLDRSLT " " );
+    m_pAttrOutput->RunText().append( OutString( sResult, eDefaultEncoding )).append( "}}" );
 }
 
 ULONG RtfExport::ReplaceCr( BYTE )
@@ -629,7 +649,6 @@ void RtfExport::ExportDocument_Impl()
         {
             case FTNNUM_PAGE:       pOut = OOO_STRING_SVTOOLS_RTF_FTNRSTPG; break;
             case FTNNUM_DOC:        pOut = OOO_STRING_SVTOOLS_RTF_FTNRSTCONT;   break;
-            // case FTNNUM_CHAPTER:
             default:                pOut = OOO_STRING_SVTOOLS_RTF_FTNRESTART;   break;
         }
         Strm() << pOut;
@@ -643,7 +662,6 @@ void RtfExport::ExportDocument_Impl()
             case SVX_NUM_ROMAN_LOWER:           pOut = OOO_STRING_SVTOOLS_RTF_FTNNRLC;  break;
             case SVX_NUM_ROMAN_UPPER:           pOut = OOO_STRING_SVTOOLS_RTF_FTNNRUC;  break;
             case SVX_NUM_CHAR_SPECIAL:          pOut = OOO_STRING_SVTOOLS_RTF_FTNNCHI;  break;
-            // case SVX_NUM_ARABIC:
             default:                    pOut = OOO_STRING_SVTOOLS_RTF_FTNNAR;       break;
         }
         Strm() << pOut;
@@ -664,7 +682,6 @@ void RtfExport::ExportDocument_Impl()
             case SVX_NUM_ROMAN_LOWER:           pOut = OOO_STRING_SVTOOLS_RTF_AFTNNRLC; break;
             case SVX_NUM_ROMAN_UPPER:           pOut = OOO_STRING_SVTOOLS_RTF_AFTNNRUC; break;
             case SVX_NUM_CHAR_SPECIAL:          pOut = OOO_STRING_SVTOOLS_RTF_AFTNNCHI; break;
-            // case SVX_NUM_ARABIC:
             default:                    pOut = OOO_STRING_SVTOOLS_RTF_AFTNNAR;  break;
         }
         Strm() << pOut;
@@ -765,6 +782,7 @@ RtfExport::RtfExport( RtfExportFilter *pFilter, SwDoc *pDocument, SwPaM *pCurren
       eCurrentEncoding(eDefaultEncoding),
       bRTFFlySyntax(false)
 {
+    mbExportModeRTF = true;
     // the attribute output for the document
     m_pAttrOutput = new RtfAttributeOutput( *this );
     // that just causes problems for RTF
@@ -915,7 +933,7 @@ OString RtfExport::OutChar(sal_Unicode c, int *pUCMode, rtl_TextEncoding eDestEn
 OString RtfExport::OutString(const String &rStr, rtl_TextEncoding eDestEnc)
 {
     OSL_TRACE("%s, rStr = '%s'", OSL_THIS_FUNC,
-            OUStringToOString( OUString( rStr ), eCurrentEncoding ).getStr());
+            OUStringToOString( OUString( rStr ), eDestEnc ).getStr());
     OStringBuffer aBuf;
     int nUCMode = 1;
     for (xub_StrLen n = 0; n < rStr.Len(); ++n)
@@ -1186,7 +1204,6 @@ void RtfExport::OutPageDescription( const SwPageDesc& rPgDsc, BOOL bWriteReset,
     AttrOutput().SectionPageNumbering(pAktPageDesc->GetNumType().GetNumberingType(), 0);
 
     pAktPageDesc = pSave;
-    //bOutPageDesc = bOldOut;
     OSL_TRACE("%s end", OSL_THIS_FUNC);
 }
 
@@ -1207,9 +1224,6 @@ void RtfExport::WriteHeaderFooter(const SfxPoolItem& rItem, bool bHeader)
 
     OSL_TRACE("%s start", OSL_THIS_FUNC);
 
-    Strm() << (bHeader ? OOO_STRING_SVTOOLS_RTF_HEADERY : OOO_STRING_SVTOOLS_RTF_FOOTERY);
-    OutLong( pAktPageDesc->GetMaster().
-            GetULSpace().GetUpper() );
     const sal_Char* pStr = (bHeader ? OOO_STRING_SVTOOLS_RTF_HEADER : OOO_STRING_SVTOOLS_RTF_FOOTER);
     /* is this a title page? */
     if( pAktPageDesc->GetFollow() && pAktPageDesc->GetFollow() != pAktPageDesc )
diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx
index 2f6bfce29ae0..5d5a186d8862 100644
--- a/sw/source/filter/ww8/rtfexport.hxx
+++ b/sw/source/filter/ww8/rtfexport.hxx
@@ -82,7 +82,7 @@ public:
     virtual RtfSdrExport& SdrExporter() const;
 
     /// Hack, unfortunately necessary at some places for now.
-    virtual bool HackIsWW8OrHigher() const { return true; }
+    virtual bool HackIsWW8OrHigher() const { return false; }
 
     /// Guess the script (asian/western).
     virtual bool CollapseScriptsforWordOk( USHORT nScript, USHORT nWhich );
@@ -172,9 +172,9 @@ public:
     SvStream& OutLong( long nVal );
     void OutUnicode(const sal_Char *pToken, const String &rContent);
     void OutDateTime(const sal_Char* pStr, const util::DateTime& rDT );
-    rtl::OString OutChar(sal_Unicode c, int *pUCMode, rtl_TextEncoding eDestEnc);
-    rtl::OString OutString(const String &rStr, rtl_TextEncoding eDestEnc);
-    rtl::OString OutHex(ULONG nHex, BYTE nLen);
+    static rtl::OString OutChar(sal_Unicode c, int *pUCMode, rtl_TextEncoding eDestEnc);
+    static rtl::OString OutString(const String &rStr, rtl_TextEncoding eDestEnc);
+    static rtl::OString OutHex(ULONG nHex, BYTE nLen);
     void OutPageDescription( const SwPageDesc& rPgDsc, BOOL bWriteReset, BOOL bCheckForFirstPage );
 
     USHORT GetColor( const Color& rColor ) const;
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx
index cfe0d268c812..cdb75421951d 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -222,8 +222,9 @@ void RtfSdrExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRe
                     m_aShapeProps.insert(std::pair<OString,OString>(OString("fNoFillHitTest"), OString::valueOf(sal_Int32(1))));
                 break;
             case ESCHER_Prop_fNoLineDrawDash:
-                if (it->nPropValue)
-                    m_aShapeProps.insert(std::pair<OString,OString>(OString("fNoLineDrawDash"), OString::valueOf(sal_Int32(1))));
+                // for some reason the value is set to 0x90000 if lines are switched off
+                if( it->nPropValue == 0x90000 )
+                    m_aShapeProps.insert(std::pair<OString,OString>(OString("fLine"), OString::valueOf(sal_Int32(0))));
                 break;
             case ESCHER_Prop_lineColor:
                 m_aShapeProps.insert(std::pair<OString,OString>(OString("lineColor"), OString::valueOf(sal_Int32(it->nPropValue))));
@@ -447,6 +448,13 @@ void RtfSdrExport::AddShapeAttribute( sal_Int32 /*nAttribute*/, const rtl::OStri
 
 extern const char* pShapeTypes[];
 
+void lcl_AppendSP( ::rtl::OStringBuffer& rRunText, const char cName[], const ::rtl::OString& rValue)
+{
+    rRunText.append('{').append(OOO_STRING_SVTOOLS_RTF_SP)
+        .append('{').append(OOO_STRING_SVTOOLS_RTF_SN " ").append(cName).append('}')
+        .append('{').append(OOO_STRING_SVTOOLS_RTF_SV " ").append(rValue).append('}')
+        .append('}');
+}
 sal_Int32 RtfSdrExport::StartShape()
 {
     OSL_TRACE("%s", OSL_THIS_FUNC);
@@ -466,10 +474,10 @@ sal_Int32 RtfSdrExport::StartShape()
     m_rAttrOutput.RunText().append(OOO_STRING_SVTOOLS_RTF_SHPBYIGNORE);
 
     for(std::map<OString,OString>::reverse_iterator i = m_aShapeProps.rbegin(); i != m_aShapeProps.rend(); i++)
-        m_rAttrOutput.RunText().append('{').append(OOO_STRING_SVTOOLS_RTF_SP)
-            .append('{').append(OOO_STRING_SVTOOLS_RTF_SN " ").append((*i).first).append('}')
-            .append('{').append(OOO_STRING_SVTOOLS_RTF_SV " ").append((*i).second).append('}')
-            .append('}');
+        lcl_AppendSP(m_rAttrOutput.RunText(), (*i).first, (*i).second );
+
+    lcl_AppendSP(m_rAttrOutput.RunText(), "wzDescription", RtfExport::OutString( m_pSdrObject->GetDescription(), m_rExport.eCurrentEncoding));
+    lcl_AppendSP(m_rAttrOutput.RunText(), "wzName", RtfExport::OutString( m_pSdrObject->GetTitle(), m_rExport.eCurrentEncoding));
 
     // now check if we have some text
     const SdrTextObj* pTxtObj = PTR_CAST(SdrTextObj, m_pSdrObject);
diff --git a/sw/source/filter/ww8/rtfsdrexport.hxx b/sw/source/filter/ww8/rtfsdrexport.hxx
index de618d69abe5..b25f5196de4c 100644
--- a/sw/source/filter/ww8/rtfsdrexport.hxx
+++ b/sw/source/filter/ww8/rtfsdrexport.hxx
@@ -80,11 +80,13 @@ protected:
     /// Start the shape for which we just collected the information.
     ///
     /// Returns the element's tag number, -1 means we wrote nothing.
+    using EscherEx::StartShape;
     virtual sal_Int32   StartShape();
 
     /// End the shape.
     ///
     /// The parameter is just what we got from StartShape().
+    using EscherEx::EndShape;
     virtual void        EndShape( sal_Int32 nShapeElement );
 
     virtual void        Commit( EscherPropertyContainer& rProps, const Rectangle& rRect );
@@ -94,6 +96,7 @@ private:
     virtual void OpenContainer( UINT16 nEscherContainer, int nRecInstance = 0 );
     virtual void CloseContainer();
 
+    using EscherEx::EnterGroup;
     virtual UINT32 EnterGroup( const String& rShapeName, const Rectangle* pBoundRect = 0 );
     virtual void LeaveGroup();
 
diff --git a/sw/source/filter/ww8/sortedarray.hxx b/sw/source/filter/ww8/sortedarray.hxx
index 5525b272da2c..6147964e4d2f 100644
--- a/sw/source/filter/ww8/sortedarray.hxx
+++ b/sw/source/filter/ww8/sortedarray.hxx
@@ -30,7 +30,7 @@
 #define WW_SORTEDARRAY_HXX
 
 #include <algorithm>
-#include <errhdl.hxx>       // ASSERT()
+#include <errhdl.hxx>       // OSL_ENSURE()
 #include <tools/debug.hxx>
 
 //simple template that manages a static [] array by sorting at construction
@@ -69,7 +69,7 @@ namespace ww
         SortedArray(C *pWwSprmTab, size_t nNoElems)
             : mpWwSprmTab(pWwSprmTab), mnNoElems(nNoElems)
         {
-            ASSERT(mnNoElems && pWwSprmTab, "WW8: empty Array: Don't do that");
+            OSL_ENSURE(mnNoElems && pWwSprmTab, "WW8: empty Array: Don't do that");
             std::sort(mpWwSprmTab, mpWwSprmTab + mnNoElems);
 #if OSL_DEBUG_LEVEL > 1
             bool bBroken=false;
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 6fc8ebf0776b..f315ce1c3f00 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -104,7 +104,6 @@ namespace
         bool operator()(const SwTxtFmtColl *pA, const SwTxtFmtColl *pB) const
         {
             // --> OD 2009-02-04 #i98791#
-//            return pA->GetAttrOutlineLevel() < pB->GetAttrOutlineLevel();   //<-end,zhaojianwei
             bool bResult( false );
             const bool bIsAAssignedToOutlineStyle( pA->IsAssignedToListLevelOfOutlineStyle() );
             const bool bIsBAssignedToOutlineStyle( pB->IsAssignedToListLevelOfOutlineStyle() );
@@ -233,7 +232,7 @@ namespace sw
                 }
                 else
                 {
-                    ASSERT(!this, "Impossible");
+                    OSL_ENSURE(!this, "Impossible");
                     meWriterType = eTxtBox;
                 }
                 break;
@@ -248,7 +247,7 @@ namespace sw
                 }
                 else
                 {
-                    ASSERT(!this, "Impossible");
+                    OSL_ENSURE(!this, "Impossible");
                     meWriterType = eDrawing;
                 }
                 break;
@@ -296,14 +295,12 @@ namespace sw
             mxIPRef(rObj.GetObjRef()), mrPers(rPers),
             mpGraphic( rObj.GetGraphic() )
         {
-            //rObj.SetPersistName(String());
-            //rObj.SetObjRef(0);
             rObj.AbandonObject();
         }
 
         bool DrawingOLEAdaptor::TransferToDoc( ::rtl::OUString &rName )
         {
-            ASSERT(mxIPRef.is(), "Transferring invalid object to doc");
+            OSL_ENSURE(mxIPRef.is(), "Transferring invalid object to doc");
             if (!mxIPRef.is())
                 return false;
 
@@ -320,7 +317,6 @@ namespace sw
                                                                     rName,
                                                                     ::rtl::OUString() );
 
-                //mxIPRef->changeState( embed::EmbedStates::LOADED );
                 mxIPRef = 0;
             }
 
@@ -466,9 +462,21 @@ namespace sw
         }
         //SetLayer boilerplate end
 
-        void GetPoolItems(const SfxItemSet &rSet, PoolItems &rItems)
+        void GetPoolItems(const SfxItemSet &rSet, PoolItems &rItems, bool bExportParentItemSet )
         {
-            if (rSet.Count())
+            if( bExportParentItemSet )
+            {
+                USHORT nTotal = rSet.TotalCount();
+                for( USHORT nItem =0; nItem < nTotal; ++nItem )
+                {
+                    const SfxPoolItem* pItem = 0;
+                    if( SFX_ITEM_SET == rSet.GetItemState( rSet.GetWhichByPos( nItem ), true, &pItem ) )
+                    {
+                        rItems[pItem->Which()] = pItem;
+                    }
+                }
+            }
+            else if( rSet.Count())
             {
                 SfxItemIter aIter(rSet);
                 if (const SfxPoolItem *pItem = aIter.GetCurItem())
@@ -586,7 +594,7 @@ namespace sw
                 return &(pRule->Get( static_cast< USHORT >(rTxtNode.GetActualListLevel()) ));
             }
 
-            ASSERT(rTxtNode.GetDoc(), "No document for node?, suspicious");
+            OSL_ENSURE(rTxtNode.GetDoc(), "No document for node?, suspicious");
             if (!rTxtNode.GetDoc())
                 return 0;
 
@@ -624,7 +632,7 @@ namespace sw
         SwNoTxtNode *GetNoTxtNodeFromSwFrmFmt(const SwFrmFmt &rFmt)
         {
             const SwNodeIndex *pIndex = rFmt.GetCntnt().GetCntntIdx();
-            ASSERT(pIndex, "No NodeIndex in SwFrmFmt ?, suspicious");
+            OSL_ENSURE(pIndex, "No NodeIndex in SwFrmFmt ?, suspicious");
             if (!pIndex)
                 return 0;
             SwNodeIndex aIdx(*pIndex, 1);
@@ -638,7 +646,7 @@ namespace sw
             {
                 const SwTable& rTable = rNd.GetTableNode()->GetTable();
                 const SwFrmFmt* pApply = rTable.GetFrmFmt();
-                ASSERT(pApply, "impossible");
+                OSL_ENSURE(pApply, "impossible");
                 if (pApply)
                     pBreak = &(ItemGet<SvxFmtBreakItem>(*pApply, RES_BREAK));
             }
@@ -716,13 +724,13 @@ namespace sw
                 }
             }
 
-            ASSERT(aGrTwipSz.Width() && aGrTwipSz.Height(), "0 x 0 graphic ?");
+            OSL_ENSURE(aGrTwipSz.Width() && aGrTwipSz.Height(), "0 x 0 graphic ?");
             return aGrTwipSz;
         }
 
         void RedlineStack::open(const SwPosition& rPos, const SfxPoolItem& rAttr)
         {
-            ASSERT(rAttr.Which() == RES_FLTR_REDLINE, "not a redline");
+            OSL_ENSURE(rAttr.Which() == RES_FLTR_REDLINE, "not a redline");
             maStack.push_back(new SwFltStackEntry(rPos,rAttr.Clone()));
         }
 
@@ -833,12 +841,6 @@ namespace sw
             }
             return nRet;
         }
-/*
-        std::vector<String> WrtRedlineAuthor::GetNames()
-        {
-            return maAuthors;
-        }
-*/
     }
 }
 
diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx
index cc37949d6ff9..0e5edf1bb182 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -589,7 +589,7 @@ namespace sw
             @author
             <a href="mailto:cmc@openoffice.org">Caol&aacute;n McNamara</a>
         */
-        void GetPoolItems(const SfxItemSet &rSet, PoolItems &rItems);
+        void GetPoolItems(const SfxItemSet &rSet, PoolItems &rItems, bool bExportParentItemSet );
 
         const SfxPoolItem *SearchPoolItems(const PoolItems &rItems,
             sal_uInt16 eType);
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index 52684d5fcbb9..1c709be35a77 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -29,37 +29,34 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 #include <msfilter.hxx>
-#   include "writerwordglue.hxx"
+#include "writerwordglue.hxx"
 #include <doc.hxx>
-#   include "writerhelper.hxx"
+#include "writerhelper.hxx"
 
 #include <algorithm>                //std::find_if
 #include <functional>               //std::unary_function
 
 #include <unicode/ubidi.h>          //ubidi_getLogicalRun
-#   include <tools/tenccvt.hxx>     //GetExtendedTextEncoding
-#   include <i18nutil/unicode.hxx>  //unicode::getUnicodeScriptType
-#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_
-#   include <com/sun/star/i18n/ScriptType.hdl> //ScriptType
-#endif
-
-#ifndef SV_FONTCVT_HXX
-#   include <unotools/fontcvt.hxx>   //GetSubsFontName
-#endif
-#   include <editeng/paperinf.hxx>      //lA0Width...
-#   include <editeng/lrspitem.hxx>      //SvxLRSpaceItem
-#   include <editeng/ulspitem.hxx>      //SvxULSpaceItem
-#   include <editeng/boxitem.hxx>       //SvxBoxItem
-#   include <editeng/fontitem.hxx>      //SvxFontItem
-#   include <frmfmt.hxx>            //SwFrmFmt
-#   include <fmtclds.hxx>           //SwFmtCol
-#   include <hfspacingitem.hxx>     //SwHeaderAndFooterEatSpacingItem
-#   include <fmtfsize.hxx>          //SwFmtFrmSize
-#   include <swrect.hxx>            //SwRect
-#   include <fmthdft.hxx>           //SwFmtHeader/SwFmtFooter
-#   include <frmatr.hxx>            //GetLRSpace...
-#   include <ndtxt.hxx>             //SwTxtNode
-#   include <breakit.hxx>           //pBreakIt
+#include <tools/tenccvt.hxx>        //GetExtendedTextEncoding
+#include <i18nutil/unicode.hxx>     //unicode::getUnicodeScriptType
+#include <com/sun/star/i18n/ScriptType.hdl> //ScriptType
+
+#include <unotools/fontcvt.hxx>  //GetSubsFontName
+#include <editeng/paperinf.hxx>  //lA0Width...
+#include <editeng/lrspitem.hxx>  //SvxLRSpaceItem
+#include <editeng/ulspitem.hxx>  //SvxULSpaceItem
+#include <editeng/boxitem.hxx>   //SvxBoxItem
+#include <editeng/fontitem.hxx>  //SvxFontItem
+#include <frmfmt.hxx>            //SwFrmFmt
+#include <fmtclds.hxx>           //SwFmtCol
+#include <hfspacingitem.hxx>     //SwHeaderAndFooterEatSpacingItem
+#include <fmtfsize.hxx>          //SwFmtFrmSize
+#include <swrect.hxx>            //SwRect
+#include <fmthdft.hxx>           //SwFmtHeader/SwFmtFooter
+#include <frmatr.hxx>            //GetLRSpace...
+#include <ndtxt.hxx>             //SwTxtNode
+#include <breakit.hxx>           //pBreakIt
+#include <i18npool/mslangid.hxx>
 
 #define ASSIGN_CONST_ASC(s) AssignAscii(RTL_CONSTASCII_STRINGPARAM(s))
 
@@ -168,7 +165,7 @@ namespace myImplHelpers
         };
 
         const size_t nArrSize = (SAL_N_ELEMENTS(aArr));
-        ASSERT(nArrSize == 75, "Style Array has false size");
+        OSL_ENSURE(nArrSize == 75, "Style Array has false size");
 
         SwTxtFmtColl* pRet = 0;
         //If this is a built-in word style that has a built-in writer
@@ -531,7 +528,7 @@ namespace sw
             const String &rTxt = rTxtNd.GetTxt();
 
             bool bParaIsRTL = false;
-            ASSERT(rTxtNd.GetDoc(), "No document for node?, suspicious");
+            OSL_ENSURE(rTxtNd.GetDoc(), "No document for node?, suspicious");
             if (rTxtNd.GetDoc())
             {
                 if (FRMDIR_HORI_RIGHT_TOP ==
@@ -641,7 +638,6 @@ namespace sw
                         nScript);
                     if (nEnd2 < 0)
                         break;
-//                    nPos = writer_cast<xub_StrLen>(nEnd2);
                     nPos = static_cast< xub_StrLen >(nEnd2);
                     aScripts.push_back(ScriptEntry(nPos, nScript));
                     nScript = pBreakIt->GetBreakIter()->getScriptType(rTxt, nPos);
@@ -669,7 +665,6 @@ namespace sw
                 if (aBiDiIter != aBiDiEnd)
                 {
                     if (aBiDiIter->first < nMinPos)
-//                        nMinPos = writer_cast<xub_StrLen>(aBiDiIter->first);
                         nMinPos = static_cast< xub_StrLen >(aBiDiIter->first);
                     bCharIsRTL = aBiDiIter->second;
                 }
@@ -730,7 +725,7 @@ namespace sw
                 case RTL_TEXTENCODING_UTF7:
                 case RTL_TEXTENCODING_UTF8:
                 case RTL_TEXTENCODING_JAVA_UTF8:
-                    ASSERT(nRet != 0x80, "This method may be redundant");
+                    OSL_ENSURE(nRet != 0x80, "This method may be redundant");
                     nRet = 0x80;
                     break;
                 default:
@@ -806,7 +801,8 @@ namespace sw
         }
 
         ULONG MSDateTimeFormatToSwFormat(String& rParams,
-            SvNumberFormatter *pFormatter, USHORT &rLang, bool bHijri)
+            SvNumberFormatter *pFormatter, USHORT &rLang, bool bHijri,
+            USHORT nDocLang)
         {
             // tell the Formatter about the new entry
             UINT16 nCheckPos = 0;
@@ -815,9 +811,50 @@ namespace sw
 
             SwapQuotesInField(rParams);
 
-            //#102782#, #102815#, #108341# & #111944# have to work at the same time :-)
-            bool bForceJapanese(false);
-            bool bForceNatNum(false);
+            // Force to Japanese when finding one of 'geaE'
+            rtl::OUString sJChars(RTL_CONSTASCII_USTRINGPARAM("geE"));
+            bool bForceJapanese = ( STRING_NOTFOUND != rParams.SearchChar( sJChars.getStr() ) );
+            if ( bForceJapanese )
+            {
+                rParams.SearchAndReplaceAll( String::CreateFromAscii( "ee" ),
+                                             String::CreateFromAscii( "yyyy" ) );
+                rParams.SearchAndReplaceAll( String::CreateFromAscii( "EE" ),
+                                             String::CreateFromAscii( "YYYY" ) );
+            }
+            if (LANGUAGE_FRENCH != nDocLang)
+            {
+                // Handle the 'a' case here
+                xub_StrLen nLastPos = 0;
+                do
+                {
+                    xub_StrLen nPos = rParams.Search( 'a', nLastPos + 1 );
+                    bForceJapanese |= ( nPos != STRING_NOTFOUND && IsNotAM( rParams, nPos ) );
+                    nLastPos = nPos;
+                } while ( STRING_NOTFOUND != nLastPos );
+            }
+
+            // Force to NatNum when finding one of 'oOA'
+            String sOldParams( rParams );
+            rParams.SearchAndReplaceAll( String::CreateFromAscii( "o" ),
+                                         String::CreateFromAscii( "m" ) );
+            rParams.SearchAndReplaceAll( String::CreateFromAscii( "O" ),
+                                         String::CreateFromAscii( "M" ) );
+            bool bForceNatNum = !sOldParams.Equals( rParams );
+            if (LANGUAGE_FRENCH != nDocLang)
+            {
+                // Handle the 'A' case here
+                xub_StrLen nLastPos = 0;
+                do
+                {
+                    xub_StrLen nPos = rParams.Search( 'A', nLastPos + 1 );
+                    bool bIsCharA = ( nPos != STRING_NOTFOUND && IsNotAM( rParams, nPos ) );
+                    bForceNatNum |= bIsCharA;
+                    if ( bIsCharA )
+                        rParams.SetChar( nPos, 'D' );
+                    nLastPos = nPos;
+                } while ( STRING_NOTFOUND != nLastPos );
+            }
+
             xub_StrLen nLen = rParams.Len();
             xub_StrLen nI = 0;
             while (nI < nLen)
@@ -834,50 +871,21 @@ namespace sw
                 else //normal unquoted section
                 {
                     sal_Unicode nChar = rParams.GetChar(nI);
-                    if (nChar == 'O')
-                    {
-                        rParams.SetChar(nI, 'M');
-                        bForceNatNum = true;
-                    }
-                    else if (nChar == 'o')
-                    {
-                        rParams.SetChar(nI, 'm');
-                        bForceNatNum = true;
-                    }
-                    else if ((nChar == 'A') && IsNotAM(rParams, nI))
-                    {
-                        rParams.SetChar(nI, 'D');
-                        bForceNatNum = true;
-                    }
-                    else if ((nChar == 'g') || (nChar == 'G'))
-                        bForceJapanese = true;
-                    else if ((nChar == 'a') && IsNotAM(rParams, nI))
-                        bForceJapanese = true;
-                    else if (nChar == 'E')
-                    {
-                        if ((nI != nLen-1) && (rParams.GetChar(nI+1) == 'E'))
-                        {
-                            rParams.Replace(nI, 2, CREATE_CONST_ASC("YYYY"));
-                            nLen+=2;
-                            nI+=3;
-                        }
-                        bForceJapanese = true;
-                    }
-                    else if (nChar == 'e')
+
+                    // Change the localized word string to english
+                    switch ( nDocLang )
                     {
-                        if ((nI != nLen-1) && (rParams.GetChar(nI+1) == 'e'))
-                        {
-                            rParams.Replace(nI, 2, CREATE_CONST_ASC("yyyy"));
-                            nLen+=2;
-                            nI+=3;
-                        }
-                        bForceJapanese = true;
+                        case LANGUAGE_FRENCH:
+                            if ( ( nChar == 'a' || nChar == 'A' ) && IsNotAM(rParams, nI) )
+                                rParams.SetChar(nI, 'Y');
+                            break;
+                        default:
+                            ;
                     }
-                    else if (nChar == '/')
+                    if (nChar == '/')
                     {
                         // MM We have to escape '/' in case it's used as a char
                         rParams.Replace(nI, 1, CREATE_CONST_ASC("\\/"));
-                        // rParams.Insert( nI, '\\' );
                         nI++;
                         nLen++;
                     }
@@ -886,112 +894,114 @@ namespace sw
                     // Should be made with i18n framework.
                     // The list of the mappings and of those "special" locales is to be found at:
                     // http://l10n.openoffice.org/i18n_framework/LocaleData.html
-                    switch ( rLang )
+                    if ( !bForceJapanese && !bForceNatNum )
                     {
-                    case LANGUAGE_FINNISH:
+                        // Convert to the localized equivalent for OOo
+                        switch ( rLang )
                         {
-                            if (nChar == 'y' || nChar == 'Y')
-                                rParams.SetChar (nI, 'V');
-                            else if (nChar == 'm' || nChar == 'M')
-                                rParams.SetChar (nI, 'K');
-                            else if (nChar == 'd' || nChar == 'D')
-                                rParams.SetChar (nI, 'P');
-                            else if (nChar == 'h' || nChar == 'H')
-                                rParams.SetChar (nI, 'T');
-                        }
-                        break;
-                    case LANGUAGE_DANISH:
-                    case LANGUAGE_NORWEGIAN:
-                    case LANGUAGE_NORWEGIAN_BOKMAL:
-                    case LANGUAGE_NORWEGIAN_NYNORSK:
-                    case LANGUAGE_SWEDISH:
-                    case LANGUAGE_SWEDISH_FINLAND:
-                        {
-                            if (nChar == 'h' || nChar == 'H')
-                                rParams.SetChar (nI, 'T');
-                        }
-                        break;
-                    case LANGUAGE_PORTUGUESE:
-                    case LANGUAGE_PORTUGUESE_BRAZILIAN:
-                    case LANGUAGE_SPANISH_MODERN:
-                    case LANGUAGE_SPANISH_DATED:
-                    case LANGUAGE_SPANISH_MEXICAN:
-                    case LANGUAGE_SPANISH_GUATEMALA:
-                    case LANGUAGE_SPANISH_COSTARICA:
-                    case LANGUAGE_SPANISH_PANAMA:
-                    case LANGUAGE_SPANISH_DOMINICAN_REPUBLIC:
-                    case LANGUAGE_SPANISH_VENEZUELA:
-                    case LANGUAGE_SPANISH_COLOMBIA:
-                    case LANGUAGE_SPANISH_PERU:
-                    case LANGUAGE_SPANISH_ARGENTINA:
-                    case LANGUAGE_SPANISH_ECUADOR:
-                    case LANGUAGE_SPANISH_CHILE:
-                    case LANGUAGE_SPANISH_URUGUAY:
-                    case LANGUAGE_SPANISH_PARAGUAY:
-                    case LANGUAGE_SPANISH_BOLIVIA:
-                    case LANGUAGE_SPANISH_EL_SALVADOR:
-                    case LANGUAGE_SPANISH_HONDURAS:
-                    case LANGUAGE_SPANISH_NICARAGUA:
-                    case LANGUAGE_SPANISH_PUERTO_RICO:
-                        {
-                            if (nChar == 'a' || nChar == 'A')
-                                rParams.SetChar (nI, 'O');
-                            else if (nChar == 'y' || nChar == 'Y')
-                                rParams.SetChar (nI, 'A');
-                        }
-                        break;
-                    case LANGUAGE_DUTCH:
-                    case LANGUAGE_DUTCH_BELGIAN:
-                        {
-                            if (nChar == 'y' || nChar == 'Y')
-                                rParams.SetChar (nI, 'J');
-                            else if (nChar == 'u' || nChar == 'U')
-                                rParams.SetChar (nI, 'H');
-                        }
-                        break;
-                    case LANGUAGE_ITALIAN:
-                    case LANGUAGE_ITALIAN_SWISS:
-                        {
-                            if (nChar == 'a' || nChar == 'A')
-                                rParams.SetChar (nI, 'O');
-                            else if (nChar == 'g' || nChar == 'G')
-                                rParams.SetChar (nI, 'X');
-                            else if (nChar == 'y' || nChar == 'Y')
-                                rParams.SetChar(nI, 'A');
-                            else if (nChar == 'd' || nChar == 'D')
-                                rParams.SetChar (nI, 'G');
-                        }
-                        break;
-                    case LANGUAGE_GERMAN:
-                    case LANGUAGE_GERMAN_SWISS:
-                    case LANGUAGE_GERMAN_AUSTRIAN:
-                    case LANGUAGE_GERMAN_LUXEMBOURG:
-                    case LANGUAGE_GERMAN_LIECHTENSTEIN:
-                        {
-                            if (nChar == 'y' || nChar == 'Y')
-                                rParams.SetChar (nI, 'J');
-                            else if (nChar == 'd' || nChar == 'D')
-                                rParams.SetChar (nI, 'T');
-                        }
-                        break;
-                    case LANGUAGE_FRENCH:
-                    case LANGUAGE_FRENCH_BELGIAN:
-                    case LANGUAGE_FRENCH_CANADIAN:
-                    case LANGUAGE_FRENCH_SWISS:
-                    case LANGUAGE_FRENCH_LUXEMBOURG:
-                    case LANGUAGE_FRENCH_MONACO:
-                        {
-                            if (nChar == 'a' || nChar == 'A')
-                                rParams.SetChar (nI, 'O');
-                            else if (nChar == 'y' || nChar == 'Y')
-                                rParams.SetChar (nI, 'A');
-                            else if (nChar == 'd' || nChar == 'D')
-                                rParams.SetChar (nI, 'J');
-                        }
-                        break;
-                    default:
-                        {
-                            ; // Nothing
+                        case LANGUAGE_FINNISH:
+                            {
+                                if (nChar == 'y' || nChar == 'Y')
+                                    rParams.SetChar (nI, 'V');
+                                else if (nChar == 'm' || nChar == 'M')
+                                    rParams.SetChar (nI, 'K');
+                                else if (nChar == 'd' || nChar == 'D')
+                                    rParams.SetChar (nI, 'P');
+                                else if (nChar == 'h' || nChar == 'H')
+                                    rParams.SetChar (nI, 'T');
+                            }
+                            break;
+                        case LANGUAGE_DANISH:
+                        case LANGUAGE_NORWEGIAN:
+                        case LANGUAGE_NORWEGIAN_BOKMAL:
+                        case LANGUAGE_NORWEGIAN_NYNORSK:
+                        case LANGUAGE_SWEDISH:
+                        case LANGUAGE_SWEDISH_FINLAND:
+                            {
+                                if (nChar == 'h' || nChar == 'H')
+                                    rParams.SetChar (nI, 'T');
+                            }
+                            break;
+                        case LANGUAGE_PORTUGUESE:
+                        case LANGUAGE_PORTUGUESE_BRAZILIAN:
+                        case LANGUAGE_SPANISH_MODERN:
+                        case LANGUAGE_SPANISH_DATED:
+                        case LANGUAGE_SPANISH_MEXICAN:
+                        case LANGUAGE_SPANISH_GUATEMALA:
+                        case LANGUAGE_SPANISH_COSTARICA:
+                        case LANGUAGE_SPANISH_PANAMA:
+                        case LANGUAGE_SPANISH_DOMINICAN_REPUBLIC:
+                        case LANGUAGE_SPANISH_VENEZUELA:
+                        case LANGUAGE_SPANISH_COLOMBIA:
+                        case LANGUAGE_SPANISH_PERU:
+                        case LANGUAGE_SPANISH_ARGENTINA:
+                        case LANGUAGE_SPANISH_ECUADOR:
+                        case LANGUAGE_SPANISH_CHILE:
+                        case LANGUAGE_SPANISH_URUGUAY:
+                        case LANGUAGE_SPANISH_PARAGUAY:
+                        case LANGUAGE_SPANISH_BOLIVIA:
+                        case LANGUAGE_SPANISH_EL_SALVADOR:
+                        case LANGUAGE_SPANISH_HONDURAS:
+                        case LANGUAGE_SPANISH_NICARAGUA:
+                        case LANGUAGE_SPANISH_PUERTO_RICO:
+                            {
+                                if (nChar == 'a' || nChar == 'A')
+                                    rParams.SetChar (nI, 'O');
+                                else if (nChar == 'y' || nChar == 'Y')
+                                    rParams.SetChar (nI, 'A');
+                            }
+                            break;
+                        case LANGUAGE_DUTCH:
+                        case LANGUAGE_DUTCH_BELGIAN:
+                            {
+                                if (nChar == 'y' || nChar == 'Y')
+                                    rParams.SetChar (nI, 'J');
+                                else if (nChar == 'u' || nChar == 'U')
+                                    rParams.SetChar (nI, 'H');
+                            }
+                            break;
+                        case LANGUAGE_ITALIAN:
+                        case LANGUAGE_ITALIAN_SWISS:
+                            {
+                                if (nChar == 'a' || nChar == 'A')
+                                    rParams.SetChar (nI, 'O');
+                                else if (nChar == 'g' || nChar == 'G')
+                                    rParams.SetChar (nI, 'X');
+                                else if (nChar == 'y' || nChar == 'Y')
+                                    rParams.SetChar(nI, 'A');
+                                else if (nChar == 'd' || nChar == 'D')
+                                    rParams.SetChar (nI, 'G');
+                            }
+                            break;
+                        case LANGUAGE_GERMAN:
+                        case LANGUAGE_GERMAN_SWISS:
+                        case LANGUAGE_GERMAN_AUSTRIAN:
+                        case LANGUAGE_GERMAN_LUXEMBOURG:
+                        case LANGUAGE_GERMAN_LIECHTENSTEIN:
+                            {
+                                if (nChar == 'y' || nChar == 'Y')
+                                    rParams.SetChar (nI, 'J');
+                                else if (nChar == 'd' || nChar == 'D')
+                                    rParams.SetChar (nI, 'T');
+                            }
+                            break;
+                        case LANGUAGE_FRENCH:
+                        case LANGUAGE_FRENCH_BELGIAN:
+                        case LANGUAGE_FRENCH_CANADIAN:
+                        case LANGUAGE_FRENCH_SWISS:
+                        case LANGUAGE_FRENCH_LUXEMBOURG:
+                        case LANGUAGE_FRENCH_MONACO:
+                            {
+                                if (nChar == 'y' || nChar == 'Y' || nChar == 'a')
+                                    rParams.SetChar (nI, 'A');
+                                else if (nChar == 'd' || nChar == 'D' || nChar == 'j')
+                                    rParams.SetChar (nI, 'J');
+                            }
+                            break;
+                        default:
+                            {
+                                ; // Nothing
+                            }
                         }
                     }
                 }
@@ -1039,7 +1049,6 @@ namespace sw
             }
         }
 
-
     }
 }
 
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 0eee9d36929e..9c3ab53641e4 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -115,7 +115,7 @@ using namespace nsFieldFlags;
 //#110185# get a part fix for this type of element
 bool WW8Export::MiserableFormFieldExportHack(const SwFrmFmt& rFrmFmt)
 {
-    ASSERT(bWrtWW8, "Not allowed");
+    OSL_ENSURE(bWrtWW8, "Not allowed");
     if (!bWrtWW8)
         return false;
     bool bHack = false;
@@ -203,7 +203,7 @@ void WW8Export::DoComboBox(const rtl::OUString &rName,
                              const rtl::OUString &rSelected,
                              uno::Sequence<rtl::OUString> &rListItems)
 {
-    ASSERT(bWrtWW8, "Not allowed");
+    OSL_ENSURE(bWrtWW8, "Not allowed");
     if (!bWrtWW8)
         return;
     OutputField(0, ww::eFORMDROPDOWN, FieldString(ww::eFORMDROPDOWN),
@@ -516,7 +516,7 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
             }
             else
             {
-                ASSERT(pObj, "wo ist das SDR-Object?");
+                OSL_ENSURE(pObj, "wo ist das SDR-Object?");
                 if (pObj)
                 {
                     aRect = pObj->GetSnapRect();
@@ -618,7 +618,7 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
                     nFlags |= 0x0400 | nContour;
                     break;
                 default:
-                    ASSERT(!this, "Unsupported surround type for export");
+                    OSL_ENSURE(!this, "Unsupported surround type for export");
                     break;
             }
             if (pObj && (pObj->GetLayer() == rWrt.pDoc->GetHellId() ||
@@ -768,8 +768,8 @@ UINT32 WW8Export::GetSdrOrdNum( const SwFrmFmt& rFmt ) const
 void WW8Export::AppendFlyInFlys(const sw::Frame& rFrmFmt,
     const Point& rNdTopLeft)
 {
-    ASSERT(bWrtWW8, "this has gone horribly wrong");
-    ASSERT(!pEscher, "der EscherStream wurde schon geschrieben!");
+    OSL_ENSURE(bWrtWW8, "this has gone horribly wrong");
+    OSL_ENSURE(!pEscher, "der EscherStream wurde schon geschrieben!");
     if (pEscher)
         return ;
     PlcDrawObj *pDrwO;
@@ -786,7 +786,7 @@ void WW8Export::AppendFlyInFlys(const sw::Frame& rFrmFmt,
 
     WW8_CP nCP = Fc2Cp(Strm().Tell());
     bool bSuccess = pDrwO->Append(*this, nCP, rFrmFmt, rNdTopLeft);
-    ASSERT(bSuccess, "Couldn't export a graphical element!");
+    OSL_ENSURE(bSuccess, "Couldn't export a graphical element!");
 
     if (bSuccess)
     {
@@ -867,7 +867,6 @@ xub_StrLen MSWord_SdrAttrIter::SearchNext( xub_StrLen nStartPos )
             SetCharSet(rHt, true);
         }
 
-//??        if( pHt->GetEnd() )         // Attr mit Ende
         {
             nPos = rHt.nEnd;        // gibt letztes Attr-Zeichen + 1
             if( nPos >= nStartPos && nPos < nMinPos )
@@ -876,16 +875,7 @@ xub_StrLen MSWord_SdrAttrIter::SearchNext( xub_StrLen nStartPos )
                 SetCharSet(rHt, false);
             }
         }
-/*      else
-        {                                   // Attr ohne Ende
-            nPos = rHt.nStart + 1;  // Laenge 1 wegen CH_TXTATR im Text
-            if( nPos >= nStartPos && nPos < nMinPos )
-            {
-                nMinPos = nPos;
-                SetCharSet(rHt, false);
-            }
-        }
-*/
+
     }
     return nMinPos;
 }
@@ -1054,7 +1044,7 @@ const SfxPoolItem& MSWord_SdrAttrIter::GetItem( USHORT nWhich ) const
     {
         SfxItemSet aSet(pEditObj->GetParaAttribs(nPara));
         nWhich = GetSetWhichFromSwDocWhich(aSet, *m_rExport.pDoc, nWhich);
-        ASSERT(nWhich, "Impossible, catastrophic failure imminent");
+        OSL_ENSURE(nWhich, "Impossible, catastrophic failure imminent");
         pRet = &aSet.Get(nWhich);
     }
     return *pRet;
@@ -1099,7 +1089,7 @@ void MSWord_SdrAttrIter::OutParaAttr(bool bCharAttr)
 void WW8Export::WriteSdrTextObj(const SdrObject& rObj, BYTE nTyp)
 {
     const SdrTextObj* pTxtObj = PTR_CAST(SdrTextObj, &rObj);
-    ASSERT(pTxtObj, "That is no SdrTextObj!");
+    OSL_ENSURE(pTxtObj, "That is no SdrTextObj!");
     if (!pTxtObj)
         return;
 
@@ -1144,7 +1134,7 @@ void WW8Export::WriteOutliner(const OutlinerParaObject& rParaObj, BYTE nTyp)
 
         rtl_TextEncoding eChrSet = aAttrIter.GetNodeCharSet();
 
-        ASSERT( !pO->Count(), " pO ist am Zeilenanfang nicht leer" );
+        OSL_ENSURE( !pO->Count(), " pO ist am Zeilenanfang nicht leer" );
 
         String aStr( rEditObj.GetText( n ));
         xub_StrLen nAktPos = 0;
@@ -1181,7 +1171,7 @@ void WW8Export::WriteOutliner(const OutlinerParaObject& rParaObj, BYTE nTyp)
         }
         while( nAktPos < nEnd );
 
-        ASSERT( !pO->Count(), " pO ist am ZeilenEnde nicht leer" );
+        OSL_ENSURE( !pO->Count(), " pO ist am ZeilenEnde nicht leer" );
 
         pO->Insert( bNul, pO->Count() );        // Style # as short
         pO->Insert( bNul, pO->Count() );
@@ -1237,7 +1227,7 @@ void WW8Export::CreateEscher()
         GetItemState(RES_BACKGROUND);
     if (pHFSdrObjs->size() || pSdrObjs->size() || SFX_ITEM_SET == eBackSet)
     {
-        ASSERT( !pEscher, "wer hat den Pointer nicht geloescht?" );
+        OSL_ENSURE( !pEscher, "wer hat den Pointer nicht geloescht?" );
         SvMemoryStream* pEscherStrm = new SvMemoryStream;
         pEscherStrm->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
         pEscher = new SwEscherEx(pEscherStrm, *this);
@@ -1349,7 +1339,7 @@ INT32 SwBasicEscherEx::WriteGrfFlyFrame(const SwFrmFmt& rFmt, UINT32 nShapeId)
     INT32 nBorderThick=0;
     SwNoTxtNode *pNd = GetNoTxtNodeFromSwFrmFmt(rFmt);
     SwGrfNode *pGrfNd = pNd ? pNd->GetGrfNode() : 0;
-    ASSERT(pGrfNd, "No SwGrfNode ?, suspicious");
+    OSL_ENSURE(pGrfNd, "No SwGrfNode ?, suspicious");
     if (!pGrfNd)
         return nBorderThick;
 
@@ -1567,7 +1557,6 @@ INT32 SwBasicEscherEx::WriteOLEFlyFrame(const SwFrmFmt& rFmt, UINT32 nShapeId)
         instead ==> allows unicode text to be preserved
         */
 #ifdef OLE_PREVIEW_AS_EMF
-        //Graphic aGraphic = wwUtility::MakeSafeGDIMetaFile(xObj);
         Graphic* pGraphic = rOLENd.GetGraphic();
 #endif
         OpenContainer(ESCHER_SpContainer);
@@ -1943,7 +1932,7 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt)
         {
             INT32 nBorderThick=0;
             DrawObj *pObj = (*aIter);
-            ASSERT(pObj, "impossible");
+            OSL_ENSURE(pObj, "impossible");
             if (!pObj)
                 continue;
             const sw::Frame &rFrame = pObj->maCntnt;
@@ -1982,9 +1971,9 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt)
                         if (bSwapInPage)
                             (const_cast<SdrObject*>(pSdrObj))->SetPage(0);
                     }
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
                     else
-                        ASSERT( !this, "Where is the SDR-Object?" );
+                        OSL_ENSURE( !this, "Where is the SDR-Object?" );
 #endif
                 }
 
@@ -2019,13 +2008,6 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt)
             aPropOpt.AddOpt( ESCHER_Prop_shadowColor, 0x8000002 );
             aPropOpt.AddOpt( ESCHER_Prop_lineWidth, 0 );
 
-// winword defaults!
-//          aPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x100000 );
-//          aPropOpt.AddOpt( ESCHER_Prop_lineWidth, 0 );
-//          aPropOpt.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x80000 );
-//          aPropOpt.AddOpt( ESCHER_Prop_bWMode, 0x9 );
-//          aPropOpt.AddOpt( ESCHER_Prop_fBackground, 0x10001 );
-
             aPropOpt.Commit( *pStrm );
 
             AddAtom( 4, ESCHER_ClientData );
@@ -2204,7 +2186,7 @@ bool WinwordAnchoring::ConvertPosition( SwFmtHoriOrient& _iorHoriOri,
                 }
                 break;
                 default:
-                    ASSERT( false,
+                    OSL_ENSURE( false,
                             "<WinwordAnchoring::ConvertPosition(..)> - unknown horizontal relation" );
             }
         }
@@ -2318,7 +2300,7 @@ bool WinwordAnchoring::ConvertPosition( SwFmtHoriOrient& _iorHoriOri,
                 case text::RelOrientation::FRAME_LEFT:
                 case text::RelOrientation::FRAME_RIGHT:
                 default:
-                    ASSERT( false,
+                    OSL_ENSURE( false,
                             "<WinwordAnchoring::ConvertPosition(..)> - unknown vertical relation" );
             }
         }
@@ -2590,7 +2572,7 @@ USHORT FindPos(const SwFrmFmt &rFmt, unsigned int nHdFtIndex,
     for (DrawObjPointerIter aIter = rPVec.begin(); aIter != aEnd; ++aIter)
     {
         const DrawObj *pObj = (*aIter);
-        ASSERT(pObj, "Impossible");
+        OSL_ENSURE(pObj, "Impossible");
         if (!pObj)
             continue;
         if (
@@ -2629,7 +2611,7 @@ INT32 SwEscherEx::WriteTxtFlyFrame(const DrawObj &rObj, UINT32 nShapeId,
     switch (nDirection)
     {
         default:
-            ASSERT(!this, "unknown direction type");
+            OSL_ENSURE(!this, "unknown direction type");
         case FRMDIR_HORI_LEFT_TOP:
             nFlow=mso_txflHorzN;
         break;
@@ -2687,7 +2669,7 @@ void SwEscherEx::WriteOCXControl( const SwFrmFmt& rFmt, UINT32 nShapeId )
 
         SdrModel *pModel = rWrt.pDoc->GetDrawModel();
         OutputDevice *pDevice = Application::GetDefaultDevice();
-        ASSERT(pModel && pDevice, "no model or device");
+        OSL_ENSURE(pModel && pDevice, "no model or device");
 
         // #i71538# use complete SdrViews
         // SdrExchangeView aExchange(pModel, pDevice);
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 277387a7023c..eea153d284af 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -117,7 +117,7 @@ using namespace sw::mark;
 using namespace nsFieldFlags;
 
 static String lcl_getFieldCode( const IFieldmark* pFieldmark ) {
-    ASSERT(pFieldmark!=NULL, "where is my fieldmark???");
+    OSL_ENSURE(pFieldmark!=NULL, "where is my fieldmark???");
 
     if ( pFieldmark->GetFieldname( ).equalsAscii( ODF_FORMTEXT ) ) {
         return String::CreateFromAscii(" FORMTEXT ");
@@ -137,7 +137,7 @@ static String lcl_getFieldCode( const IFieldmark* pFieldmark ) {
 }
 
 ww::eField lcl_getFieldId( const IFieldmark* pFieldmark ) {
-    ASSERT(pFieldmark!=NULL, "where is my fieldmark???");
+    OSL_ENSURE(pFieldmark!=NULL, "where is my fieldmark???");
     if ( pFieldmark->GetFieldname( ).equalsAscii( ODF_FORMTEXT ) ) {
         return ww::eFORMTEXT;
     } else if ( pFieldmark->GetFieldname( ).equalsAscii( ODF_FORMDROPDOWN ) ) {
@@ -180,7 +180,7 @@ public:
 
 void SwWW8AttrIter::IterToCurrent()
 {
-    ASSERT(maCharRuns.begin() != maCharRuns.end(), "Impossible");
+    OSL_ENSURE(maCharRuns.begin() != maCharRuns.end(), "Impossible");
     mnScript = maCharRunIter->mnScript;
     meChrSet = maCharRunIter->meCharSet;
     mbCharIsRTL = maCharRunIter->mbRTL;
@@ -477,7 +477,7 @@ void SwWW8AttrIter::OutAttr( xub_StrLen nSwPos, bool bRuby )
         ClearOverridesFromSet( *pCharFmtItem, aExportSet );
 
     sw::PoolItems aExportItems;
-    GetPoolItems( aExportSet, aExportItems );
+    GetPoolItems( aExportSet, aExportItems, false );
 
     sw::cPoolItemIter aEnd = aRangeItems.end();
     for ( sw::cPoolItemIter aI = aRangeItems.begin(); aI != aEnd; ++aI )
@@ -499,7 +499,7 @@ void SwWW8AttrIter::OutAttr( xub_StrLen nSwPos, bool bRuby )
         m_rExport.pOutFmtNode = pOldMod;
     }
 
-    ASSERT( pFont, "must be *some* font associated with this txtnode" );
+    OSL_ENSURE( pFont, "must be *some* font associated with this txtnode" );
     if ( pFont )
     {
         SvxFontItem aFont( *pFont );
@@ -665,7 +665,7 @@ void WW8AttributeOutput::StartRuby( const SwTxtNode& rNode, xub_StrLen /*nPos*/,
             cDirective = 'd';
             break;
         default:
-            ASSERT( !this,"Unhandled Ruby justication code" );
+            OSL_ENSURE( !this,"Unhandled Ruby justication code" );
             break;
     }
     aStr += String::CreateFromInt32( nJC );
@@ -764,7 +764,7 @@ String &TruncateBookmark( String &rRet )
 {
     if ( rRet.Len() > 40 )
         rRet.Erase( 40 );
-    ASSERT( rRet.Len() <= 40, "Word cannot have bookmarks longer than 40 chars" );
+    OSL_ENSURE( rRet.Len() <= 40, "Word cannot have bookmarks longer than 40 chars" );
     return rRet;
 }
 
@@ -796,7 +796,7 @@ bool AttributeOutputBase::AnalyzeURL( const String& rUrl, const String& /*rTarge
 
                 if ( bkmkName == sLink )
                 {
-                    sMark = String( RTL_CONSTASCII_STRINGPARAM( "_toc" ) );
+                    sMark = String( RTL_CONSTASCII_USTRINGPARAM( "_toc" ) );
                     sMark += String::CreateFromInt32( aIter->second );
                 }
             }
@@ -923,7 +923,7 @@ bool WW8AttributeOutput::StartURL( const String &rUrl, const String &rTarget )
     SwWW8Writer::WriteLong( *m_rWW8Export.pDataStrm, nFlag );
 
     INetProtocol eProto = aURL.GetProtocol();
-    if ( eProto == INET_PROT_FILE )
+    if ( eProto == INET_PROT_FILE || eProto == INET_PROT_SMB )
     {
         // version 1 (for a document)
 
@@ -941,7 +941,7 @@ bool WW8AttributeOutput::StartURL( const String &rUrl, const String &rTarget )
 
         // save the links to files as relative
         sURL = URIHelper::simpleNormalizedMakeRelative( m_rWW8Export.GetWriter().GetBaseURL(), sURL );
-        if ( sURL.EqualsAscii( "/", 0, 1 ) )
+        if ( eProto == INET_PROT_FILE && sURL.EqualsAscii( "/", 0, 1 ) )
             sURL = aURL.PathToFileName();
 
         // special case for the absolute windows names
@@ -955,6 +955,15 @@ bool WW8AttributeOutput::StartURL( const String &rUrl, const String &rTarget )
             sURL.SearchAndReplaceAll( '/', '\\' );
         }
 
+        // n#261623 convert smb notation to '\\'
+        const char pSmb[] = "smb://";
+        if ( eProto == INET_PROT_SMB &&
+             sURL.EqualsAscii( pSmb, 0, sizeof( pSmb ) - 1 ) )
+        {
+            sURL.Erase( 0, sizeof( pSmb ) - 3 );
+            sURL.SearchAndReplaceAll( '/', '\\' );
+        }
+
         m_rWW8Export.pDataStrm->Write( MAGIC_C, sizeof(MAGIC_C) );
         SwWW8Writer::WriteLong( *m_rWW8Export.pDataStrm, sURL.Len()+1 );
         SwWW8Writer::WriteString8( *m_rWW8Export.pDataStrm, sURL, true,
@@ -1111,7 +1120,7 @@ void AttributeOutputBase::TOXMark( const SwTxtNode& rNode, const SwTOXMark& rAtt
             }
             break;
         default:
-            ASSERT( !this, "Unhandled option for toc export" );
+            OSL_ENSURE( !this, "Unhandled option for toc export" );
             break;
     }
 
@@ -1327,7 +1336,7 @@ short MSWordExportBase::TrueFrameDirection( const SwFrmFmt &rFlyFmt ) const
     else
         nRet = GetCurrentPageDirection();
 
-    ASSERT( nRet != FRMDIR_ENVIRONMENT, "leaving with environment direction" );
+    OSL_ENSURE( nRet != FRMDIR_ENVIRONMENT, "leaving with environment direction" );
     return nRet;
 }
 
@@ -1601,7 +1610,7 @@ xub_StrLen MSWordExportBase::GetNextPos( SwWW8AttrIter* aAttrIter, const SwTxtNo
     GetSortedBookmarks( rNode, nAktPos, nNextPos - nAktPos );
 
     xub_StrLen nNextBookmark = nNextPos;
-    NearestBookmark( nNextPos );
+    NearestBookmark( nNextPos, nAktPos, false );
 
     return std::min( nNextPos, nNextBookmark );
 }
@@ -1610,8 +1619,9 @@ void MSWordExportBase::UpdatePosition( SwWW8AttrIter* aAttrIter, xub_StrLen nAkt
 {
     xub_StrLen nNextPos;
 
-    // either no bookmark, or it is not at the current position
-    if ( !NearestBookmark( nNextPos ) || nNextPos > nAktPos )
+    // go to next attribute if no bookmark is found of if the bookmark is behind the next attribute position
+    bool bNextBookmark = NearestBookmark( nNextPos, nAktPos, true );
+    if( !bNextBookmark || nNextPos < aAttrIter->WhereNext() )
         aAttrIter->NextPos();
 }
 
@@ -1656,25 +1666,33 @@ public:
     }
 };
 
-bool MSWordExportBase::NearestBookmark( xub_StrLen& rNearest )
+bool MSWordExportBase::NearestBookmark( xub_StrLen& rNearest, const xub_StrLen nAktPos, bool bNextPositionOnly )
 {
     bool bHasBookmark = false;
 
     if ( m_rSortedMarksStart.size( ) > 0 )
     {
         IMark* pMarkStart = m_rSortedMarksStart.front();
-        rNearest = pMarkStart->GetMarkStart().nContent.GetIndex();
-        bHasBookmark = true;
+        xub_StrLen nNext = pMarkStart->GetMarkStart().nContent.GetIndex();
+        if( !bNextPositionOnly || (nNext > nAktPos ))
+        {
+            rNearest = nNext;
+            bHasBookmark = true;
+        }
     }
 
     if ( m_rSortedMarksEnd.size( ) > 0 )
     {
         IMark* pMarkEnd = m_rSortedMarksEnd[0];
-        if ( !bHasBookmark )
-            rNearest = pMarkEnd->GetMarkEnd().nContent.GetIndex();
-        else
-            rNearest = std::min( rNearest, pMarkEnd->GetMarkEnd().nContent.GetIndex() );
-        bHasBookmark = true;
+        xub_StrLen nNext = pMarkEnd->GetMarkEnd().nContent.GetIndex();
+        if( !bNextPositionOnly || nNext > nAktPos )
+        {
+            if ( !bHasBookmark )
+                rNearest = nNext;
+            else
+                rNearest = std::min( rNearest, nNext );
+            bHasBookmark = true;
+        }
     }
 
     return bHasBookmark;
@@ -1696,10 +1714,10 @@ void MSWordExportBase::GetSortedBookmarks( const SwTxtNode& rNode, xub_StrLen nA
             xub_StrLen nStart = pMark->GetMarkStart().nContent.GetIndex();
             xub_StrLen nEnd = pMark->GetMarkEnd().nContent.GetIndex();
 
-            if ( nStart > nAktPos )
+            if ( nStart > nAktPos && ( pMark->GetMarkStart().nNode == rNode.GetIndex()) )
                 aSortedStart.push_back( pMark );
 
-            if ( nEnd > nAktPos )
+            if ( nEnd > nAktPos && nEnd <= ( nAktPos + nLen ) && (pMark->GetMarkEnd().nNode == rNode.GetIndex()) )
                 aSortedEnd.push_back( pMark );
         }
 
@@ -1767,14 +1785,11 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
 
     if ( aAttrIter.RequiresImplicitBookmark() )
     {
-        String sBkmkName = String( RTL_CONSTASCII_STRINGPARAM( "_toc" ) );
+        String sBkmkName = String( RTL_CONSTASCII_USTRINGPARAM( "_toc" ) );
         sBkmkName += String::CreateFromInt32( rNode.GetIndex() );
         AppendWordBookmark( sBkmkName );
     }
 
-    //Would need to move into WW8Export, probably not worth it
-    //ASSERT( pO->Count(), " pO ist am Zeilenanfang nicht leer" );
-
     String aStr( rNode.GetTxt() );
 
     xub_StrLen nAktPos = 0;
@@ -1823,7 +1838,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
                 if ( pFieldmark->GetFieldname().equalsAscii( ODF_UNHANDLED ) )
                 {
                     IFieldmark::parameter_map_t::const_iterator it = pFieldmark->GetParameters()->find(
-                            rtl::OUString::createFromAscii( ODF_ID_PARAM ) );
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ODF_ID_PARAM )) );
                     if ( it != pFieldmark->GetParameters()->end() )
                     {
                         rtl::OUString sFieldId;
@@ -1832,7 +1847,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
                     }
 
                     it = pFieldmark->GetParameters()->find(
-                            rtl::OUString::createFromAscii( ODF_CODE_PARAM ) );
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ODF_CODE_PARAM )) );
                     if ( it != pFieldmark->GetParameters()->end() )
                     {
                         rtl::OUString sOUCode;
@@ -1851,7 +1866,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
                 {
                     // Check for the presence of a linked OLE object
                     IFieldmark::parameter_map_t::const_iterator it = pFieldmark->GetParameters()->find(
-                            rtl::OUString::createFromAscii( ODF_OLE_PARAM ) );
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ODF_OLE_PARAM )) );
                     if ( it != pFieldmark->GetParameters()->end() )
                     {
                         rtl::OUString sOleId;
@@ -1872,7 +1887,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
                 if ( pFieldmark->GetFieldname().equalsAscii( ODF_UNHANDLED ) )
                 {
                     IFieldmark::parameter_map_t::const_iterator it = pFieldmark->GetParameters()->find(
-                            rtl::OUString::createFromAscii( ODF_ID_PARAM ) );
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ODF_ID_PARAM )) );
                     if ( it != pFieldmark->GetParameters()->end() )
                     {
                         rtl::OUString sFieldId;
@@ -1924,7 +1939,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
         // Exception: footnotes at the end of line
         if ( nNextAttr == nEnd )
         {
-            ASSERT( nOpenAttrWithRange >= 0, "odd to see this happening, expected >= 0" );
+            OSL_ENSURE( nOpenAttrWithRange >= 0, "odd to see this happening, expected >= 0" );
             if ( !bTxtAtr && nOpenAttrWithRange <= 0 )
             {
                 if ( aAttrIter.IsRedlineAtEnd( nEnd ) )
@@ -1953,13 +1968,13 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
         // Exception: footnotes at the end of line
         if ( nNextAttr == nEnd )
         {
-            ASSERT(nOpenAttrWithRange >= 0,
+            OSL_ENSURE(nOpenAttrWithRange >= 0,
                 "odd to see this happening, expected >= 0");
             bool bAttrWithRange = (nOpenAttrWithRange > 0);
             if ( nAktPos != nEnd )
             {
                 nOpenAttrWithRange += aAttrIter.OutAttrWithRange(nEnd);
-                ASSERT(nOpenAttrWithRange == 0,
+                OSL_ENSURE(nOpenAttrWithRange == 0,
                     "odd to see this happening, expected 0");
             }
 
@@ -2298,7 +2313,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
             pOutFmtNode = &rNode;
 
             // Pap-Attrs, so script is not necessary
-            OutputItemSet( *pNewSet, true, false, i18n::ScriptType::LATIN);
+            OutputItemSet( *pNewSet, true, false, i18n::ScriptType::LATIN, false);
 
             pStyAttr = 0;
             pOutFmtNode = pOldMod;
@@ -2455,7 +2470,7 @@ void WW8Export::AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt*
 
 void WW8Export::OutWW6FlyFrmsInCntnt( const SwTxtNode& rNd )
 {
-    ASSERT(!bWrtWW8, "I shouldn't be needed for Word >=8");
+    OSL_ENSURE(!bWrtWW8, "I shouldn't be needed for Word >=8");
     if ( bWrtWW8 )
         return;
 
@@ -2533,7 +2548,7 @@ void WW8AttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point
 
     if (bUseEscher)
     {
-        ASSERT( m_rWW8Export.bWrtWW8, "this has gone horribly wrong" );
+        OSL_ENSURE( m_rWW8Export.bWrtWW8, "this has gone horribly wrong" );
         // write as escher
         m_rWW8Export.AppendFlyInFlys(rFmt, rNdTopLeft);
     }
@@ -2559,13 +2574,6 @@ void WW8AttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point
         }
         if( !bDone )
         {
-            // ein NICHT zeichengebundener Rahmen liegt vor
-
-            // --> OD 2007-04-19 #i43447# - removed
-//            const SwFmtFrmSize& rS = rFrmFmt.GetFrmSize();
-//            nFlyWidth  = rS.GetWidth();  // Fuer Anpassung Graphic-Groesse
-//            nFlyHeight = rS.GetHeight();
-            // <--
 
             m_rWW8Export.SaveData( nStt, nEnd );
 
@@ -2687,7 +2695,7 @@ void WW8AttributeOutput::Redline( const SwRedlineData* pRedline )
         }
         break;
     default:
-        ASSERT(!this, "Unhandled redline type for export");
+        OSL_ENSURE(!this, "Unhandled redline type for export");
         break;
     }
 
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index b8f8c36d2336..ab82a1ec8111 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -141,7 +141,7 @@ USHORT MSWordExportBase::GetId( const SwNumRule& rNumRule )
 //here in the ww export filter
 sal_Int16 GetWordFirstLineOffset(const SwNumFmt &rFmt)
 {
-    ASSERT( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION,
+    OSL_ENSURE( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION,
             "<GetWordFirstLineOffset> - misusage: position-and-space-mode does not equal LABEL_WIDTH_AND_POSITION" );
 
     short nFirstLineOffset;
@@ -267,7 +267,7 @@ void WW8AttributeOutput::NumberingLevel( BYTE /*nLevel*/,
             m_rWW8Export.InsUInt16( nFontID );
         }
 
-        m_rWW8Export.OutputItemSet( *pOutSet, false, true, i18n::ScriptType::LATIN );
+        m_rWW8Export.OutputItemSet( *pOutSet, false, true, i18n::ScriptType::LATIN, m_rWW8Export.mbExportModeRTF );
 
         m_rWW8Export.pO = pOldpO;
     }
@@ -359,7 +359,7 @@ void MSWordExportBase::AbstractNumberingDefinitions()
                     default:
                     {
                         nFollow = 0;
-                        ASSERT( false,
+                        OSL_ENSURE( false,
                                 "unknown GetLabelFollowedBy() return value" );
                     }
                 }
@@ -609,10 +609,7 @@ void WW8Export::Out_WwNumLvl( BYTE nWwLevel )
 
 void WW8Export::Out_SwNumLvl( BYTE nSwLevel )
 {
-    // --> OD 2008-04-02 #refactorlists#
-//    ASSERT(IsNum(nSwLevel), "numbered?");
-    ASSERT( nSwLevel < MAXLEVEL, "numbered?");
-    // <--
+    OSL_ENSURE( nSwLevel < MAXLEVEL, "numbered?");
     Out_WwNumLvl( nSwLevel + 1 );
 }
 
@@ -650,9 +647,7 @@ void WW8Export::BuildAnlvBulletBase(WW8_ANLV& rAnlv, BYTE*& rpCh,
 
     if (1 < rCharLen)
     {
-        // --> OD 2006-06-27 #b6440955#
-//        const Font& rFont = rFmt.GetBulletFont() ? *rFmt.GetBulletFont()
-//            : SwNumRule::GetDefBulletFont();
+        // --> #b6440955#
         const Font& rFont = rFmt.GetBulletFont()
                             ? *rFmt.GetBulletFont()
                             : numfunc::GetDefBulletFont();
@@ -895,7 +890,7 @@ bool WW8Export::Out_SwNum(const SwTxtNode* pNd)
 
     if (nLevel < 0 || nLevel >= MAXLEVEL)
     {
-        ASSERT(FALSE, "Invalid level");
+        OSL_ENSURE(FALSE, "Invalid level");
 
         return false;
     }
@@ -922,11 +917,7 @@ bool WW8Export::Out_SwNum(const SwTxtNode* pNd)
          aFmt.GetNumberingType() == SVX_NUM_BITMAP
        )
     {
-        // Aufzaehlung
-        // --> OD 2008-04-02 #refactorlists#
-//        Out_WwNumLvl(bNoNum ? 12 : 11);
         Out_WwNumLvl(11);
-        // <--
         Out_NumRuleAnld(*pRul, aFmt, 11);
         bRet = false;
     }
@@ -935,21 +926,13 @@ bool WW8Export::Out_SwNum(const SwTxtNode* pNd)
               (pRul->Get(1).GetIncludeUpperLevels() <= 1)
             )
     {
-        // Nummerierung
-        // --> OD 2008-04-02 #refactorlists#
-//        Out_WwNumLvl(bNoNum ? 12 : 10);
         Out_WwNumLvl(10);
-        // <--
         Out_NumRuleAnld(*pRul, aFmt, 10);
         bRet = false;
     }
     else
     {
-        // Gliederung
-        // --> OD 2008-04-02 #refactorlists#
-//        Out_SwNumLvl(bNoNum ? 12 : nSwLevel);
         Out_SwNumLvl(nSwLevel);
-        // <--
         Out_NumRuleAnld(*pRul, aFmt, nSwLevel);
     }
     return bRet;
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index be01cee8248a..1ae7c7192cc3 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -197,8 +197,6 @@ USHORT MSWordStyles::BuildGetSlot( const SwFmt& rFmt )
             nRet -= RES_POOLCOLL_HEADLINE1-1;
             break;
 
-        //case RES_POOLCHR_FOOTNOTE_ANCHOR:   nRet =
-        //case RES_POOLCHR_ENDNOTE_ANCHOR:
         default:
             nRet = nUsedSlots++;
             break;
@@ -430,12 +428,12 @@ void MSWordStyles::WriteProperties( const SwFmt* pFmt, bool bParProp, USHORT nPo
 {
     m_rExport.AttrOutput().StartStyleProperties( bParProp, nPos );
 
-    ASSERT( m_rExport.pCurrentStyle == NULL, "Current style not NULL" ); // set current style before calling out
+    OSL_ENSURE( m_rExport.pCurrentStyle == NULL, "Current style not NULL" ); // set current style before calling out
     m_rExport.pCurrentStyle = pFmt;
 
     m_rExport.OutputFormat( *pFmt, bParProp, !bParProp );
 
-    ASSERT( m_rExport.pCurrentStyle == pFmt, "current style was changed" );
+    OSL_ENSURE( m_rExport.pCurrentStyle == pFmt, "current style was changed" );
     // reset current style...
     m_rExport.pCurrentStyle = NULL;
 
@@ -966,7 +964,8 @@ WW8_WrPlcSepx::WW8_WrPlcSepx( MSWordExportBase& rExport )
     : MSWordSections( rExport ),
       aCps( 4, 4 ),
       pAttrs( 0 ),
-      pTxtPos( 0 )
+      pTxtPos( 0 ),
+      bNoMoreSections( false )
 {
     // to be in sync with the AppendSection() call in the MSWordSections
     // constructor
@@ -991,7 +990,7 @@ WW8_WrPlcSepx::~WW8_WrPlcSepx()
 
 sal_uInt16 MSWordSections::CurrentNumberOfColumns( const SwDoc &rDoc ) const
 {
-    ASSERT( aSects.Count(), "no segement inserted yet" );
+    OSL_ENSURE( aSects.Count(), "no segement inserted yet" );
     if ( !aSects.Count() )
         return 1;
 
@@ -1006,7 +1005,7 @@ sal_uInt16 MSWordSections::NumberOfColumns( const SwDoc &rDoc, const WW8_SepInfo
 
     if ( !pPd )
     {
-        ASSERT( pPd, "totally impossible" );
+        OSL_ENSURE( pPd, "totally impossible" );
         return 1;
     }
 
@@ -1042,9 +1041,12 @@ void MSWordSections::AppendSection( const SwPageDesc* pPd,
 void WW8_WrPlcSepx::AppendSep( WW8_CP nStartCp, const SwPageDesc* pPd,
     const SwSectionFmt* pSectionFmt, ULONG nLnNumRestartNo )
 {
-    aCps.Insert( nStartCp, aCps.Count() );
+    if ( !bNoMoreSections )
+    {
+        aCps.Insert( nStartCp, aCps.Count() );
 
-    AppendSection( pPd, pSectionFmt, nLnNumRestartNo );
+        AppendSection( pPd, pSectionFmt, nLnNumRestartNo );
+    }
 }
 
 void MSWordSections::AppendSection( const SwFmtPageDesc& rPD,
@@ -1059,9 +1061,12 @@ void MSWordSections::AppendSection( const SwFmtPageDesc& rPD,
 void WW8_WrPlcSepx::AppendSep( WW8_CP nStartCp, const SwFmtPageDesc& rPD,
     const SwNode& rNd, const SwSectionFmt* pSectionFmt, ULONG nLnNumRestartNo )
 {
-    aCps.Insert(nStartCp, aCps.Count());
+    if ( !bNoMoreSections )
+    {
+        aCps.Insert(nStartCp, aCps.Count());
 
-    AppendSection( rPD, rNd, pSectionFmt, nLnNumRestartNo );
+        AppendSection( rPD, rNd, pSectionFmt, nLnNumRestartNo );
+    }
 }
 
 // MSWordSections::SetNum() setzt in jeder Section beim 1. Aufruf den
@@ -1729,7 +1734,7 @@ bool WW8_WrPlcSepx::WriteKFTxt( WW8Export& rWrt )
     pAttrs = new WW8_PdAttrDesc[ aSects.Count() ];
     ULONG nCpStart = rWrt.Fc2Cp( rWrt.Strm().Tell() );
 
-    ASSERT( !pTxtPos, "wer hat den Pointer gesetzt?" );
+    OSL_ENSURE( !pTxtPos, "wer hat den Pointer gesetzt?" );
     pTxtPos = new WW8_WrPlc0( nCpStart );
 
     WriteFtnEndTxt( rWrt, nCpStart );
@@ -1746,6 +1751,8 @@ bool WW8_WrPlcSepx::WriteKFTxt( WW8Export& rWrt )
 
         WW8_SepInfo& rSepInfo = aSects[i];
         rWrt.SectionProperties( rSepInfo, pA );
+
+        bNoMoreSections = true;
     }
     rWrt.SetHdFtIndex( nOldIndex ); //0
 
@@ -1790,7 +1797,7 @@ void WW8_WrPlcSepx::WriteSepx( SvStream& rStrm ) const
 
 void WW8_WrPlcSepx::WritePlcSed( WW8Export& rWrt ) const
 {
-    ASSERT( aCps.Count() == aSects.Count() + 1, "WrPlcSepx: DeSync" );
+    OSL_ENSURE( aCps.Count() == aSects.Count() + 1, "WrPlcSepx: DeSync" );
     ULONG nFcStart = rWrt.pTableStrm->Tell();
 
     USHORT i;
@@ -1835,14 +1842,14 @@ void MSWordExportBase::WriteHeaderFooterText( const SwFmt& rFmt, bool bHeader )
     {
         bHasHdr = true;
         const SwFmtHeader& rHd = rFmt.GetHeader();
-        ASSERT( rHd.GetHeaderFmt(), "Header text is not here" );
+        OSL_ENSURE( rHd.GetHeaderFmt(), "Header text is not here" );
         pCntnt = &rHd.GetHeaderFmt()->GetCntnt();
     }
     else
     {
         bHasFtr = true;
         const SwFmtFooter& rFt = rFmt.GetFooter();
-        ASSERT( rFt.GetFooterFmt(), "Footer text is not here" );
+        OSL_ENSURE( rFt.GetFooterFmt(), "Footer text is not here" );
         pCntnt = &rFt.GetFooterFmt()->GetCntnt();
     }
 
@@ -1870,7 +1877,7 @@ void MSWordExportBase::WriteHeaderFooterText( const SwFmt& rFmt, bool bHeader )
     if ( !pSttIdx )
     {
         // es gibt keine Kopf-/Fusszeile, aber ein CR ist immer noch noetig
-        ASSERT( pSttIdx, "K/F-Text nicht richtig da" );
+        OSL_ENSURE( pSttIdx, "K/F-Text nicht richtig da" );
         AttrOutput().EmptyParagraph(); // CR ans Ende ( sonst mault WW )
     }
 }
@@ -1995,10 +2002,10 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export& rWrt, BYTE nTTyp,
                 else
                 {
                     const SwFrmFmt* pFmt = ::FindFrmFmt( &rObj );
-                    ASSERT( pFmt, "wo ist das Format geblieben?" );
+                    OSL_ENSURE( pFmt, "wo ist das Format geblieben?" );
 
                     const SwNodeIndex* pNdIdx = pFmt->GetCntnt().GetCntntIdx();
-                    ASSERT( pNdIdx, "wo ist der StartNode der Textbox?" );
+                    OSL_ENSURE( pNdIdx, "wo ist der StartNode der Textbox?" );
                     rWrt.WriteSpecialText( pNdIdx->GetIndex() + 1,
                                            pNdIdx->GetNode().EndOfSectionIndex(),
                                            nTTyp );
@@ -2046,7 +2053,7 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export& rWrt, BYTE nTTyp,
                 const SwFmtFtn* pFtn = (SwFmtFtn*)aCntnt[ i ];
                 rWrt.WriteFtnBegin( *pFtn );
                 const SwNodeIndex* pIdx = pFtn->GetTxtFtn()->GetStartNode();
-                ASSERT( pIdx, "wo ist der StartNode der Fuss-/EndNote?" );
+                OSL_ENSURE( pIdx, "wo ist der StartNode der Fuss-/EndNote?" );
                 rWrt.WriteSpecialText( pIdx->GetIndex() + 1,
                                        pIdx->GetNode().EndOfSectionIndex(),
                                        nTTyp );
@@ -2054,7 +2061,7 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export& rWrt, BYTE nTTyp,
             break;
 
         default:
-            ASSERT( !this, "was ist das fuer ein SubDocType?" );
+            OSL_ENSURE( !this, "was ist das fuer ein SubDocType?" );
     }
 
     pTxtPos->Append( rWrt.Fc2Cp( rWrt.Strm().Tell() ));
@@ -2078,7 +2085,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, BYTE nTTyp,
     if ( !nLen )
         return;
 
-    ASSERT( aCps.Count() + 2 == pTxtPos->Count(), "WritePlc: DeSync" );
+    OSL_ENSURE( aCps.Count() + 2 == pTxtPos->Count(), "WritePlc: DeSync" );
 
     ::std::vector<String> aStrArr;
     WW8Fib& rFib = *rWrt.pFib;              // n+1-te CP-Pos nach Handbuch
@@ -2155,9 +2162,8 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, BYTE nTTyp,
             {
                 pTxtPos->Write( *rWrt.pTableStrm );
                 const SvULongs* pShapeIds = GetShapeIdArr();
-                ASSERT( pShapeIds, "wo sind die ShapeIds?" );
+                OSL_ENSURE( pShapeIds, "wo sind die ShapeIds?" );
 
-                // nLen = pTxtPos->Count();
                 for ( i = 0; i < nLen; ++i )
                 {
                     // write textbox story - FTXBXS
@@ -2218,7 +2224,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, BYTE nTTyp,
                 //aStrArr is sorted
                 myiter aIter = ::std::lower_bound(aStrArr.begin(),
                         aStrArr.end(), rAtn.msOwner);
-                ASSERT(aIter != aStrArr.end() && *aIter == rAtn.msOwner,
+                OSL_ENSURE(aIter != aStrArr.end() && *aIter == rAtn.msOwner,
                         "Impossible");
                 sal_uInt16 nFndPos = static_cast< sal_uInt16 >(aIter - aStrArr.begin());
                 String sAuthor(*aIter);
@@ -2248,11 +2254,6 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, BYTE nTTyp,
                     SwWW8Writer::FillCount(*rWrt.pTableStrm, 9 - nNameLen);
                 }
 
-                //SVBT16 ibst;      // index into GrpXstAtnOwners
-                //SVBT16 ak;        // not used
-                //SVBT16 grfbmc;    // not used
-                //SVBT32 ITagBkmk;  // when not -1, this tag identifies the
-
                 SwWW8Writer::WriteShort( *rWrt.pTableStrm, nFndPos );
                 SwWW8Writer::WriteShort( *rWrt.pTableStrm, 0 );
                 SwWW8Writer::WriteShort( *rWrt.pTableStrm, 0 );
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 76f7ef185cf5..94c837776b67 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -209,7 +209,6 @@ public:
     void Write( WW8Export& rWrt );
     void MoveFieldMarks(ULONG nFrom,ULONG nTo);
 
-//  String GetWWBkmkName( const String& rName ) const;
 };
 
 #define ANZ_DEFAULT_STYLES 16
@@ -458,7 +457,7 @@ void WW8Export::ExportDopTypography(WW8DopTypography &rTypo)
     in OOo have been changed away from OUR defaults, and if one has then
     export that. If more than one has in the future we may hack in something
     which examines our document properties to see which language is used the
-    most and choose that, for now we choose the first and throw an ASSERT.
+    most and choose that, for now we choose the first and throw an ASSERT
     */
 
     /*Our default Japanese Level is 2, this is a special MS hack to set this*/
@@ -511,7 +510,7 @@ void WW8Export::ExportDopTypography(WW8DopTypography &rTypo)
         }
     }
 
-    ASSERT( nNoNeeded<=1, "Example of unexportable forbidden chars" );
+    OSL_ENSURE( nNoNeeded<=1, "Example of unexportable forbidden chars" );
     rTypo.reserved1=nUseReserved;
     if (rTypo.iLevelOfKinsoku)
     {
@@ -559,7 +558,7 @@ const SfxPoolItem* MSWordExportBase::HasItem( USHORT nWhich ) const
         pItem = pChpIter->HasTextItem( nWhich );
     else
     {
-        ASSERT( !this, "Wo ist mein ItemSet / pChpIter ?" );
+        OSL_ENSURE( !this, "Wo ist mein ItemSet / pChpIter ?" );
         pItem = 0;
     }
     return pItem;
@@ -574,14 +573,14 @@ const SfxPoolItem& MSWordExportBase::GetItem(USHORT nWhich) const
         // ourer own Ids. So the Id have to translate from our into the
         // EditEngine Range
         nWhich = sw::hack::GetSetWhichFromSwDocWhich(*pISet, *pDoc, nWhich);
-        ASSERT(nWhich != 0, "All broken, Impossible");
+        OSL_ENSURE(nWhich != 0, "All broken, Impossible");
         pItem = &pISet->Get(nWhich, true);
     }
     else if( pChpIter )
         pItem = &pChpIter->GetItem( nWhich );
     else
     {
-        ASSERT( !this, "Wo ist mein ItemSet / pChpIter ?" );
+        OSL_ENSURE( !this, "Wo ist mein ItemSet / pChpIter ?" );
         pItem = 0;
     }
     return *pItem;
@@ -604,7 +603,7 @@ WW8_WrPlc1::~WW8_WrPlc1()
 WW8_CP WW8_WrPlc1::Prev() const
 {
     USHORT nLen = aPos.Count();
-    ASSERT(nLen,"Prev called on empty list");
+    OSL_ENSURE(nLen,"Prev called on empty list");
     return nLen ? aPos[nLen-1] : 0;
 }
 
@@ -758,9 +757,9 @@ ULONG SwWW8Writer::FillUntil( SvStream& rStrm, ULONG nEndPos )
 
     if( nEndPos > nCurPos )
         SwWW8Writer::FillCount( rStrm, nEndPos - nCurPos );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     else
-        ASSERT( nEndPos == nCurPos, "Falsches FillUntil()" );
+        OSL_ENSURE( nEndPos == nCurPos, "Falsches FillUntil()" );
 #endif
     return rStrm.Tell();
 }
@@ -831,7 +830,7 @@ void WW8_WrPlcPn::AppendFkpEntry(WW8_FC nEndFc,short nVarLen,const BYTE* pSprms)
         aFkps.Insert( pF, aFkps.Count() );
         if( !pF->Append( nEndFc, nVarLen, pNewSprms ) )
         {
-            ASSERT( !this, "Sprm liess sich nicht einfuegen" );
+            OSL_ENSURE( !this, "Sprm liess sich nicht einfuegen" );
         }
     }
     if( pNewSprms != pSprms )   //Merge to new has created a new block
@@ -969,19 +968,19 @@ BYTE *WW8_WrFkp::CopyLastSprms(BYTE &rLen, bool bVer8)
 
 bool WW8_WrFkp::Append( WW8_FC nEndFc, USHORT nVarLen, const BYTE* pSprms )
 {
-    ASSERT( !nVarLen || pSprms, "Item-Pointer fehlt" );
-    ASSERT( nVarLen < ( ( ePlc == PAP ) ? 497U : 502U ), "Sprms zu lang !" );
+    OSL_ENSURE( !nVarLen || pSprms, "Item-Pointer fehlt" );
+    OSL_ENSURE( nVarLen < ( ( ePlc == PAP ) ? 497U : 502U ), "Sprms zu lang !" );
 
     if( bCombined )
     {
-        ASSERT( !this, "Fkp::Append: Fkp is already combined" );
+        OSL_ENSURE( !this, "Fkp::Append: Fkp is already combined" );
         return false;
     }
     INT32 n = ((INT32*)pFkp)[nIMax];        // letzter Eintrag
     if( nEndFc <= n )
     {
-        ASSERT( nEndFc >= n, "+Fkp: FC rueckwaerts" );
-        ASSERT( !nVarLen || !pSprms || nEndFc != n,
+        OSL_ENSURE( nEndFc >= n, "+Fkp: FC rueckwaerts" );
+        OSL_ENSURE( !nVarLen || !pSprms || nEndFc != n,
                                     "+Fkp: selber FC mehrfach benutzt" );
                         // selber FC ohne Sprm wird ohne zu mosern ignoriert.
 
@@ -1167,7 +1166,7 @@ void WW8_WrPct::AppendPc(WW8_FC nStartFc, bool bIsUnicode)
     {
         if ( 0 != pPcts->Count() )
         {
-            ASSERT( 1 == pPcts->Count(), "Leeres Piece !!");
+            OSL_ENSURE( 1 == pPcts->Count(), "Leeres Piece !!");
             pPcts->DeleteAndDestroy( pPcts->Count() - 1 , 1);
         }
     }
@@ -1239,14 +1238,14 @@ void WW8_WrPct::WritePc( WW8Export& rWrt )
 
 void WW8_WrPct::SetParaBreak()
 {
-    ASSERT( pPcts->Count(),"SetParaBreak : aPcts.Count = 0" );
+    OSL_ENSURE( pPcts->Count(),"SetParaBreak : aPcts.Count = 0" );
     pPcts->GetObject( pPcts->Count() - 1)->SetStatus();
 }
 
 WW8_CP WW8_WrPct::Fc2Cp( ULONG nFc ) const
 {
-    ASSERT( nFc >= (ULONG)nOldFc, "FilePos liegt vorm letzten Piece" );
-    ASSERT( pPcts->Count(), "Fc2Cp noch kein Piece vorhanden" );
+    OSL_ENSURE( nFc >= (ULONG)nOldFc, "FilePos liegt vorm letzten Piece" );
+    OSL_ENSURE( pPcts->Count(), "Fc2Cp noch kein Piece vorhanden" );
 
     nFc -= nOldFc;
     if( bIsUni )
@@ -1290,7 +1289,7 @@ void WW8_WrtBookmarks::Append( WW8_CP nStartCp, const String& rNm,  const ::sw::
     else
     {
         // old -> its the end position
-        ASSERT( aEndCps[ nPos ] == aSttCps[ nPos ], "end position is valid" );
+        OSL_ENSURE( aEndCps[ nPos ] == aSttCps[ nPos ], "end position is valid" );
 
         //If this bookmark was around a field in writer, then we want to move
         //it to the field result in word. The end is therefore one cp
@@ -1797,7 +1796,6 @@ void MSWordExportBase::SaveData( ULONG nStt, ULONG nEnd )
     bOutTable = false;
     // Caution: bIsInTable should not be set here
     bOutFlyFrmAttrs = false;
-//  pAttrSet = 0;
     bStartTOX = false;
     bInWriteTOX = false;
 
@@ -1856,14 +1854,14 @@ void WW8Export::RestoreData()
 
     GetWriter().bWriteAll = rData.bOldWriteAll;
 
-    ASSERT( !pO->Count(), "pO is not empty in WW8Export::RestoreData()" );
+    OSL_ENSURE( !pO->Count(), "pO is not empty in WW8Export::RestoreData()" );
     if ( rData.pOOld )
     {
         delete pO;
         pO = rData.pOOld;
     }
 
-    ASSERT( !mpTableAt || !mpTableAt->Count(), "mpTableAt is not empty in WW8Export::RestoreData()" );
+    OSL_ENSURE( !mpTableAt || !mpTableAt->Count(), "mpTableAt is not empty in WW8Export::RestoreData()" );
     if ( mpTableAt )
         delete mpTableAt;
     mpTableAt = rData.mpTableAtOld;
@@ -2059,7 +2057,7 @@ void WW8AttributeOutput::TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t
     const SwTable * pTable = pTableTextNodeInfoInner->getTable();
 
     const SwFrmFmt *pFmt = pTable->GetFrmFmt();
-    ASSERT(pFmt,"Impossible");
+    OSL_ENSURE(pFmt,"Impossible");
     if (!pFmt)
         return;
 
@@ -2161,7 +2159,7 @@ void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
      */
     //const bool bNewTableModel = pTbl->IsNewModel();
     const SwFrmFmt *pFmt = pTable->GetFrmFmt();
-    ASSERT(pFmt,"Impossible");
+    OSL_ENSURE(pFmt,"Impossible");
     if (!pFmt)
         return;
 
@@ -2265,7 +2263,7 @@ void AttributeOutputBase::GetTablePageSize( ww8::WW8TableNodeInfoInner * pTableT
     const SwTable *pTable = pTableTextNodeInfoInner->getTable( );
 
     const SwFrmFmt *pFmt = pTable->GetFrmFmt();
-    ASSERT(pFmt,"Impossible");
+    OSL_ENSURE(pFmt,"Impossible");
     if (!pFmt)
         return;
 
@@ -2278,7 +2276,7 @@ void AttributeOutputBase::GetTablePageSize( ww8::WW8TableNodeInfoInner * pTableT
     unsigned long nTblSz = static_cast<unsigned long>(rSize.GetWidth());
     if (nTblSz > USHRT_MAX/2 && !bRelBoxSize)
     {
-        ASSERT(bRelBoxSize, "huge table width but not relative, suspicious");
+        OSL_ENSURE(bRelBoxSize, "huge table width but not relative, suspicious");
         bRelBoxSize = true;
     }
 
@@ -2313,7 +2311,7 @@ void AttributeOutputBase::GetTablePageSize( ww8::WW8TableNodeInfoInner * pTableT
 
         }
 
-        ASSERT(nWidthPercent, "Impossible");
+        OSL_ENSURE(nWidthPercent, "Impossible");
         if (nWidthPercent)
         {
             nPageSize *= nWidthPercent;
@@ -2887,9 +2885,6 @@ void MSWordExportBase::ExportDocument( bool bWriteAll )
     pFlyOffset = 0;
     eNewAnchorType = FLY_AT_PAGE;
     nTxtTyp = TXT_MAINTEXT;
-    // --> OD 2007-04-19 #i43447# - removed
-//    nFlyWidth = nFlyHeight = 0;
-    // <--
     nStyleBeforeFly = nLastFmtId = 0;
     pStyAttr = 0;
     pCurrentStyle = NULL;
@@ -3325,6 +3320,7 @@ MSWordExportBase::MSWordExportBase( SwDoc *pDocument, SwPaM *pCurrentPam, SwPaM
     mnHdFtIndex(0), pAktPageDesc(0), pPapPlc(0), pChpPlc(0), pChpIter(0),
     pStyles( NULL ),
     bHasHdr(false), bHasFtr(false), bSubstituteBullets(true),
+    mbExportModeRTF( false ),
     pDoc( pDocument ),
     pCurPam( pCurrentPam ),
     pOrigPam( pOriginalPam )
@@ -3511,7 +3507,7 @@ void WW8SHDLong::Write( WW8Export& rExport )
 
 void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
 {
-    ASSERT( bWrtWW8, "No 95 export yet" );
+    OSL_ENSURE( bWrtWW8, "No 95 export yet" );
     if ( !bWrtWW8 )
         return;
 
@@ -3519,7 +3515,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
     const ::sw::mark::ICheckboxFieldmark* pAsCheckbox = dynamic_cast< const ::sw::mark::ICheckboxFieldmark* >( pFieldmark );
 
 
-    ASSERT(rFieldmark.GetFieldname().equalsAscii( ODF_FORMTEXT ) || rFieldmark.GetFieldname().equalsAscii( ODF_FORMDROPDOWN ) || rFieldmark.GetFieldname().equalsAscii( ODF_FORMCHECKBOX ), "Unknown field type!!!");
+    OSL_ENSURE(rFieldmark.GetFieldname().equalsAscii( ODF_FORMTEXT ) || rFieldmark.GetFieldname().equalsAscii( ODF_FORMDROPDOWN ) || rFieldmark.GetFieldname().equalsAscii( ODF_FORMCHECKBOX ), "Unknown field type!!!");
     if ( ! ( rFieldmark.GetFieldname().equalsAscii( ODF_FORMTEXT ) ||
                 rFieldmark.GetFieldname().equalsAscii( ODF_FORMDROPDOWN ) ||
                 rFieldmark.GetFieldname().equalsAscii( ODF_FORMCHECKBOX ) ) )
@@ -3565,7 +3561,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
         ffres = 1;
     else if ( type == 2 )
     {
-        ::sw::mark::IFieldmark::parameter_map_t::const_iterator pResParameter = rFieldmark.GetParameters()->find(::rtl::OUString::createFromAscii(ODF_FORMDROPDOWN));
+        ::sw::mark::IFieldmark::parameter_map_t::const_iterator pResParameter = rFieldmark.GetParameters()->find(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMDROPDOWN)));
         if(pResParameter != rFieldmark.GetParameters()->end())
             pResParameter->second >>= ffres;
         else
@@ -3578,7 +3574,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
     {
         aFldHeader[5] |= 0x80; // ffhaslistbox
         const ::sw::mark::IFieldmark::parameter_map_t* const pParameters = rFieldmark.GetParameters();
-        ::sw::mark::IFieldmark::parameter_map_t::const_iterator pListEntries = pParameters->find(::rtl::OUString::createFromAscii(ODF_FORMDROPDOWN_LISTENTRY));
+        ::sw::mark::IFieldmark::parameter_map_t::const_iterator pListEntries = pParameters->find(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMDROPDOWN_LISTENTRY)));
         if(pListEntries != pParameters->end())
         {
             uno::Sequence< ::rtl::OUString > vListEntries;
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index a1529b476359..23832e6e9016 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -228,6 +228,7 @@ class WW8_WrPlcSepx : public MSWordSections
     SvULongs aCps;              // PTRARR von CPs
     WW8_PdAttrDesc* pAttrs;
     WW8_WrPlc0* pTxtPos;        // Pos der einzelnen Header / Footer
+    bool bNoMoreSections;
 
     // No copy, no assign
     WW8_WrPlcSepx( const WW8_WrPlcSepx& );
@@ -544,6 +545,8 @@ public:
     BYTE bHasFtr : 1;
     BYTE bSubstituteBullets : 1; // true: SubstituteBullet() gets called
 
+    bool mbExportModeRTF;
+
     SwDoc *pDoc;
     SwPaM *pCurPam, *pOrigPam;
 
@@ -593,7 +596,7 @@ public:
     void AppendWordBookmark( const String& rName );
 
     /// Use OutputItem() on an item set according to the parameters.
-    void OutputItemSet( const SfxItemSet& rSet, bool bPapFmt, bool bChpFmt, USHORT nScript );
+    void OutputItemSet( const SfxItemSet& rSet, bool bPapFmt, bool bChpFmt, USHORT nScript, bool bExportParentItemSet );
 
     short GetDefaultFrameDirection( ) const;
 
@@ -800,7 +803,7 @@ protected:
     /// Find the nearest bookmark from the current position.
     ///
     /// Returns false when there is no bookmark.
-    bool NearestBookmark( xub_StrLen& rNearest );
+    bool NearestBookmark( xub_StrLen& rNearest, const xub_StrLen nAktPos, bool bNextPositionOnly );
 
     void GetSortedBookmarks( const SwTxtNode& rNd, xub_StrLen nAktPos,
                 xub_StrLen nLen );
@@ -1402,7 +1405,7 @@ public:
 
     bool IsTxtAttr(xub_StrLen nSwPos);
 
-    void NextPos() { nAktSwPos = SearchNext( nAktSwPos + 1 ); }
+    void NextPos() { if ( nAktSwPos < STRING_NOTFOUND ) nAktSwPos = SearchNext( nAktSwPos + 1 ); }
 
     void OutAttr( xub_StrLen nSwPos );
     virtual const SfxPoolItem* HasTextItem( USHORT nWhich ) const;
@@ -1463,7 +1466,7 @@ public:
     bool IsDropCap( int nSwPos );
     bool RequiresImplicitBookmark();
 
-    void NextPos() { nAktSwPos = SearchNext( nAktSwPos + 1 ); }
+    void NextPos() { if ( nAktSwPos < STRING_NOTFOUND ) nAktSwPos = SearchNext( nAktSwPos + 1 ); }
 
     void OutAttr( xub_StrLen nSwPos, bool bRuby = false );
     virtual const SfxPoolItem* HasTextItem( USHORT nWhich ) const;
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 948ba3f26f24..a0466b751374 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -104,7 +104,7 @@ using namespace nsFieldFlags;
 void WW8Export::OutputGrfNode( const SwGrfNode& /*rNode*/ )
 {
     OSL_TRACE("WW8Export::OutputGrfNode( const SwGrfNode& )\n" );
-    ASSERT( mpParentFrame, "frame not set!" );
+    OSL_ENSURE( mpParentFrame, "frame not set!" );
     if ( mpParentFrame )
     {
         OutGrf( *mpParentFrame );
@@ -697,21 +697,6 @@ void SwWW8WrGrf::WriteGrfFromGrfNode(SvStream& rStrm, const SwGrfNode &rGrfNd,
         String aFileN;
         rGrfNd.GetFileFilterNms( &aFileN, 0 );
 
-        // --> OD 2007-06-06 #i29408# - take the file URL as it is.
-//        aFileN = URIHelper::simpleNormalizedMakeRelative(rWrt.GetBaseURL(),
-//                                          aFileN);
-//        INetURLObject aUrl( aFileN );
-//        if( aUrl.GetProtocol() == INET_PROT_FILE )
-//            aFileN = aUrl.PathToFileName();
-        // <--
-
-//JP 05.12.98: nach einigen tests hat sich gezeigt, das WW mit 99 nicht
-//              klarkommt. Sie selbst schreiben aber bei Verknuepfunfen,
-//              egal um welchen Type es sich handelt, immer den Wert 94.
-//              Bug 59859
-//      if ( COMPARE_EQUAL == aFiltN.ICompare( "TIF", 3 ) )
-//          mm = 99;                    // 99 = TIFF
-//      else
             UINT16 mm = 94;                    // 94 = BMP, GIF
 
         WritePICFHeader(rStrm, rFly, mm, nWidth, nHeight,
@@ -781,7 +766,7 @@ void SwWW8WrGrf::WriteGraphicNode(SvStream& rStrm, const GraphicDetails &rItem)
         {
             const SwNode *pNode = rItem.maFly.GetContent();
             const SwGrfNode *pNd = pNode ? pNode->GetGrfNode() : 0;
-            ASSERT(pNd, "Impossible");
+            OSL_ENSURE(pNd, "Impossible");
             if (pNd)
                 WriteGrfFromGrfNode(rStrm, *pNd, rItem.maFly, nWidth, nHeight);
         }
@@ -791,11 +776,11 @@ void SwWW8WrGrf::WriteGraphicNode(SvStream& rStrm, const GraphicDetails &rItem)
 #ifdef OLE_PREVIEW_AS_EMF
             const SwNode *pNode = rItem.maFly.GetContent();
             const SwOLENode *pNd = pNode ? pNode->GetOLENode() : 0;
-            ASSERT(pNd, "Impossible");
+            OSL_ENSURE(pNd, "Impossible");
             if (!rWrt.bWrtWW8)
             {
                 SwOLENode *pOleNd = const_cast<SwOLENode*>(pNd);
-                ASSERT( pOleNd, " Wer hat den OleNode versteckt ?" );
+                OSL_ENSURE( pOleNd, " Wer hat den OleNode versteckt ?" );
                 SwOLEObj&                   rSObj= pOleNd->GetOLEObj();
                 uno::Reference < embed::XEmbeddedObject > rObj(  rSObj.GetOleRef() );
 
@@ -838,7 +823,7 @@ void SwWW8WrGrf::WriteGraphicNode(SvStream& rStrm, const GraphicDetails &rItem)
 #else
             // cast away const
             SwOLENode *pOleNd = const_cast<SwOLENode*>(pNd);
-            ASSERT( pOleNd, " Wer hat den OleNode versteckt ?" );
+            OSL_ENSURE( pOleNd, " Wer hat den OleNode versteckt ?" );
             SwOLEObj&                   rSObj= pOleNd->GetOLEObj();
 
             // TODO/LATER: do we need to load object?
@@ -864,7 +849,7 @@ void SwWW8WrGrf::WriteGraphicNode(SvStream& rStrm, const GraphicDetails &rItem)
         case sw::Frame::eDrawing:
         case sw::Frame::eTxtBox:
         case sw::Frame::eFormControl:
-            ASSERT(rWrt.bWrtWW8,
+            OSL_ENSURE(rWrt.bWrtWW8,
                 "You can't try and export these in WW8 format, a filter bug");
             /*
             #i3958# We only export an empty dummy picture frame here, this is
@@ -881,7 +866,7 @@ void SwWW8WrGrf::WriteGraphicNode(SvStream& rStrm, const GraphicDetails &rItem)
             }
             break;
         default:
-            ASSERT(!this,
+            OSL_ENSURE(!this,
            "Some inline export not implemented, remind cmc before we ship :-)");
             break;
     }
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index d17483cbfaa4..c4cfabf6fda8 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -271,20 +271,21 @@ void MSWordExportBase::ExportPoolItemsToCHP( sw::PoolItems &rItems, USHORT nScri
  *      - gebe die Attribute aus; ohne Parents!
  */
 
-void MSWordExportBase::OutputItemSet( const SfxItemSet& rSet, bool bPapFmt, bool bChpFmt, USHORT nScript )
+void MSWordExportBase::OutputItemSet( const SfxItemSet& rSet, bool bPapFmt, bool bChpFmt, USHORT nScript,
+                                      bool bExportParentItemSet )
 {
-    if ( rSet.Count() )
+    if( bExportParentItemSet || rSet.Count() )
     {
         const SfxPoolItem* pItem;
         pISet = &rSet;                  // fuer Doppel-Attribute
 
         // If frame dir is set, but not adjust, then force adjust as well
-        if ( bPapFmt && SFX_ITEM_SET == rSet.GetItemState( RES_FRAMEDIR, false ) )
+        if ( bPapFmt && SFX_ITEM_SET == rSet.GetItemState( RES_FRAMEDIR, bExportParentItemSet ) )
         {
             // No explicit adjust set ?
-            if ( SFX_ITEM_SET != rSet.GetItemState( RES_PARATR_ADJUST, false ) )
+            if ( SFX_ITEM_SET != rSet.GetItemState( RES_PARATR_ADJUST, bExportParentItemSet ) )
             {
-                if ( 0 != ( pItem = rSet.GetItem( RES_PARATR_ADJUST ) ) )
+                if ( 0 != ( pItem = rSet.GetItem( RES_PARATR_ADJUST, bExportParentItemSet ) ) )
                 {
                     // then set the adjust used by the parent format
                     AttrOutput().OutputItem( *pItem );
@@ -292,7 +293,7 @@ void MSWordExportBase::OutputItemSet( const SfxItemSet& rSet, bool bPapFmt, bool
             }
         }
 
-        if ( bPapFmt && SFX_ITEM_SET == rSet.GetItemState( RES_PARATR_NUMRULE, false, &pItem ) )
+        if ( bPapFmt && SFX_ITEM_SET == rSet.GetItemState( RES_PARATR_NUMRULE, bExportParentItemSet, &pItem ) )
         {
             AttrOutput().OutputItem( *pItem );
 
@@ -307,7 +308,7 @@ void MSWordExportBase::OutputItemSet( const SfxItemSet& rSet, bool bPapFmt, bool
         }
 
         sw::PoolItems aItems;
-        GetPoolItems( rSet, aItems );
+        GetPoolItems( rSet, aItems, bExportParentItemSet );
         if ( bChpFmt )
             ExportPoolItemsToCHP(aItems, nScript);
 
@@ -388,7 +389,7 @@ bool MSWordExportBase::SetAktPageDescFromNode(const SwNode &rNd)
 {
     bool bNewPageDesc = false;
     const SwPageDesc* pCurrent = SwPageDesc::GetPageDescOfNode(rNd);
-    ASSERT(pCurrent && pAktPageDesc, "Not possible surely");
+    OSL_ENSURE(pCurrent && pAktPageDesc, "Not possible surely");
     if (pAktPageDesc && pCurrent)
     {
         if (pCurrent != pAktPageDesc)
@@ -476,7 +477,7 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode
 
             if ( !bRemoveHardBreakInsideTable )
             {
-                ASSERT(pAktPageDesc, "should not be possible");
+                OSL_ENSURE(pAktPageDesc, "should not be possible");
                 /*
                  If because of this pagebreak the page desc following the page
                  break is the follow style of the current page desc then output a
@@ -532,7 +533,7 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode
 
     if ( bHackInBreak )
     {
-        ASSERT( pAktPageDesc, "should not be possible" );
+        OSL_ENSURE( pAktPageDesc, "should not be possible" );
         if ( pAktPageDesc )
             bNewPageDesc = SetAktPageDescFromNode( rNd );
     }
@@ -608,7 +609,7 @@ void WW8Export::PrepareNewPageDesc( const SfxItemSet*pSet,
     const SwSectionFmt* pFmt = GetSectionFormat( rNd );
     const ULONG nLnNm = GetSectionLineNo( pSet, rNd );
 
-    ASSERT( pNewPgDescFmt || pNewPgDesc, "Neither page desc format nor page desc provided." );
+    OSL_ENSURE( pNewPgDescFmt || pNewPgDesc, "Neither page desc format nor page desc provided." );
 
     if ( pNewPgDescFmt )
     {
@@ -687,12 +688,9 @@ void WW8AttributeOutput::OutlineNumbering( BYTE nLvl, const SwNumFmt &rNFmt, con
     else
     {
         m_rWW8Export.Out_SwNumLvl( nLvl );
-        // --> OD 2008-06-03 #i86652#
-//        if (rNFmt.GetAbsLSpace())
         if ( rNFmt.GetPositionAndSpaceMode() ==
                                    SvxNumberFormat::LABEL_WIDTH_AND_POSITION  &&
              rNFmt.GetAbsLSpace() )
-        // <--
         {
             SwNumFmt aNumFmt( rNFmt );
             const SvxLRSpaceItem& rLR =
@@ -766,12 +764,9 @@ void MSWordExportBase::OutputFormat( const SwFmt& rFmt, bool bPapFmt, bool bChpF
                 if ( bStyDef )
                     AttrOutput().OutlineNumbering( static_cast< BYTE >( nLvl ), rNFmt, rFmt );
 
-                // --> OD 2008-06-03 #i86652#
-//                if (rNFmt.GetAbsLSpace())
                 if ( rNFmt.GetPositionAndSpaceMode() ==
                                            SvxNumberFormat::LABEL_WIDTH_AND_POSITION  &&
                      rNFmt.GetAbsLSpace() )
-                // <--
                 {
                     SfxItemSet aSet( rFmt.GetAttrSet() );
                     SvxLRSpaceItem aLR(
@@ -783,7 +778,7 @@ void MSWordExportBase::OutputFormat( const SwFmt& rFmt, bool bPapFmt, bool bChpF
                     aSet.Put( aLR );
                     CorrectTabStopInSet( aSet, rNFmt.GetAbsLSpace() );
                     OutputItemSet( aSet, bPapFmt, bChpFmt,
-                        i18n::ScriptType::LATIN);
+                        i18n::ScriptType::LATIN, mbExportModeRTF);
                     bCallOutSet = false;
                 }
             }
@@ -801,7 +796,7 @@ void MSWordExportBase::OutputFormat( const SwFmt& rFmt, bool bPapFmt, bool bChpF
                         ItemGet<SvxLRSpaceItem>(aSet, RES_LR_SPACE));
                     aSet.Put( aLR );
                     OutputItemSet( aSet, bPapFmt, bChpFmt,
-                        com::sun::star::i18n::ScriptType::LATIN);
+                        com::sun::star::i18n::ScriptType::LATIN, mbExportModeRTF);
                     bCallOutSet = false;
                 }
                 // <--
@@ -814,7 +809,7 @@ void MSWordExportBase::OutputFormat( const SwFmt& rFmt, bool bPapFmt, bool bChpF
     case RES_FLYFRMFMT:
         if (bFlyFmt)
         {
-            ASSERT(mpParentFrame, "No parent frame, all broken");
+            OSL_ENSURE(mpParentFrame, "No parent frame, all broken");
 
             if (mpParentFrame)
             {
@@ -841,7 +836,7 @@ void MSWordExportBase::OutputFormat( const SwFmt& rFmt, bool bPapFmt, bool bChpF
                 bOutFlyFrmAttrs = true;
                 //script doesn't matter if not exporting chp
                 OutputItemSet(aSet, true, false,
-                    i18n::ScriptType::LATIN);
+                    i18n::ScriptType::LATIN, mbExportModeRTF);
                 bOutFlyFrmAttrs = false;
 
                 bCallOutSet = false;
@@ -849,13 +844,13 @@ void MSWordExportBase::OutputFormat( const SwFmt& rFmt, bool bPapFmt, bool bChpF
         }
         break;
     default:
-        ASSERT( !this, "Was wird hier ausgegeben ??? " );
+        OSL_ENSURE( !this, "Was wird hier ausgegeben ??? " );
         break;
     }
 
     if( bCallOutSet )
         OutputItemSet( rFmt.GetAttrSet(), bPapFmt, bChpFmt,
-            i18n::ScriptType::LATIN);
+            i18n::ScriptType::LATIN, mbExportModeRTF);
     pOutFmtNode = pOldMod;
 }
 
@@ -1038,7 +1033,7 @@ void WW8AttributeOutput::OutputFKP()
 
 void WW8AttributeOutput::ParagraphStyle( USHORT nStyle )
 {
-    ASSERT( !m_rWW8Export.pO->Count(), " pO ist am ZeilenEnde nicht leer" );
+    OSL_ENSURE( !m_rWW8Export.pO->Count(), " pO ist am ZeilenEnde nicht leer" );
 
     SVBT16 nSty;
     ShortToSVBT16( nStyle, nSty );
@@ -1059,7 +1054,7 @@ void WW8AttributeOutput::OutputWW8Attribute( BYTE nId, bool bVal )
 
 void WW8AttributeOutput::OutputWW8AttributeCTL( BYTE nId, bool bVal )
 {
-    ASSERT( nId <= 1, "out of range" );
+    OSL_ENSURE( nId <= 1, "out of range" );
     if ( !m_rWW8Export.bWrtWW8 || nId > 1 )
         return;
 
@@ -1299,7 +1294,7 @@ void WW8AttributeOutput::CharUnderline( const SvxUnderlineItem& rUnderline )
             b = 0;
             break;
         default:
-            ASSERT( rUnderline.GetLineStyle() == UNDERLINE_NONE, "Unhandled underline type" );
+            OSL_ENSURE( rUnderline.GetLineStyle() == UNDERLINE_NONE, "Unhandled underline type" );
             break;
     }
 
@@ -1780,7 +1775,7 @@ WW8_WrPlcFld* WW8Export::CurrentFieldPlc() const
             pFldP = pFldHFTxtBxs;
             break;
         default:
-            ASSERT( !this, "was ist das fuer ein SubDoc-Type?" );
+            OSL_ENSURE( !this, "was ist das fuer ein SubDoc-Type?" );
     }
     return pFldP;
 }
@@ -2088,8 +2083,6 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
             }
             break;
 
-//      case TOX_AUTHORITIES:   eCode = eTOA; sStr = ???; break;
-
         case TOX_ILLUSTRATIONS:
         case TOX_OBJECTS:
         case TOX_TABLES:
@@ -2114,8 +2107,6 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
             }
             break;
 
-//      case TOX_USER:
-//      case TOX_CONTENT:
         default:
             {
                 sStr = FieldString(eCode);
@@ -2138,39 +2129,8 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
 
                 if( nsSwTOXElement::TOX_OUTLINELEVEL & pTOX->GetCreateType() )
                 {
-                    // --> OD 2009-02-27 #i99641#
-                    // The following code does not determine the minimum outline
-                    // level for the TOC
-//                    // Search over all the outline styles used and figure out
-//                    // what is the minimum outline level we need to display
-//                    // (ignoring headline styles 1-9)
-//                    //BYTE nLvl = 0, nMinLvl = 0; //#outline level, removed by zhaojianwei
-//                    int nLvl = 0, nMinLvl = 0;      //<-end,add by zhaojianwei
-//                    const SwTxtFmtColls& rColls = *GetExport().pDoc->GetTxtFmtColls();
-//                    const SwTxtFmtColl* pColl;
-//                    for( n = rColls.Count(); n; )
-//                    {
-//                        pColl = rColls[ --n ];
-//                        //nLvl = pColl->GetOutlineLevel();    //#outline level,zhaojianwei
-//                        //USHORT nPoolId = pColl->GetPoolFmtId();
-//                        //if( MAXLEVEL > nLvl && nMinLvl < nLvl &&        //<-end, ->add by zhaojianwei
-//                        USHORT nPoolId = pColl->GetPoolFmtId();
-//                        if( pColl->IsAssignedToListLevelOfOutlineStyle() &&
-//                          nMinLvl < (nLvl = pColl->GetAssignedOutlineStyleLevel()) && //<-end,zhaojianwei
-//                            ( RES_POOLCOLL_HEADLINE1 > nPoolId ||
-//                              RES_POOLCOLL_HEADLINE9 < nPoolId ))
-//                        {
-//                            // If we are using the default heading styles then use nTOXLvl
-//                            if(!nMinLvl)
-//                                nLvl = nTOXLvl;
-//                            else
-//                                nLvl = nMinLvl < nTOXLvl ? nMinLvl : (BYTE)nTOXLvl;
-//                            nMinLvl = nLvl;
-//                        }
-//                    }
                     const int nMinLvl = nTOXLvl;
 
-//                    if( nLvl )
                     if ( nMinLvl > 0 )
                     {
                         int nTmpLvl = nMinLvl;
@@ -2182,34 +2142,6 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
                         sStr.AppendAscii(sEntryEnd);
 
                     }
-                    // <--
-
-                    // --> OD 2009-02-27 #i99641#
-                    // not needed to additional export paragraph style with
-                    // an outline level to the /t option
-//                    if( nMinLvl > 0 )
-//                    // <--
-//                    {
-//                        // collect this templates into the \t otion
-//                        const SwTxtFmtColls& rColls = *pDoc->GetTxtFmtColls();
-//                        const SwTxtFmtColl* pColl;
-//                        int nLvl = 0;
-//                        for( n = rColls.Count(); n;)
-//                        {
-//                            pColl = rColls[--n];
-//                            //nLvl =  pColl->GetOutlineLevel();         //#outline level, removed by zhaojianwei
-//                            //if (MAXLEVEL > nLvl && nMinLvl <= nLvl)
-//                            //{                                         //<-end, ->add by zhaojianwei
-//                            if( pColl->IsAssignedToListLevelOfOutlineStyle() &&
-//                                nMinLvl <= ( nLvl = pColl->GetAssignedOutlineStyleLevel()))
-//                            {                                           //<-end,zhaojianwei
-//                                if( sTOption.Len() )
-//                                    sTOption += ';';
-//                                (( sTOption += pColl->GetName() ) += ';' )
-//                                        += String::CreateFromInt32( nLvl + 1 );
-//                            }
-//                        }
-//                    }
 
                 }
 
@@ -2415,7 +2347,6 @@ bool MSWordExportBase::GetNumberFmt(const SwField& rFld, String& rStr)
     const SvNumberformat* pNumFmt = pNFmtr->GetEntry( nFmtIdx );
     if( pNumFmt )
     {
-        //USHORT nLng = rFld.GetLanguage();
         LocaleDataWrapper aLocDat( pNFmtr->GetServiceManager(),
             MsLangId::convertLanguageToLocale( LANGUAGE_ENGLISH_US ) );
 
@@ -2460,7 +2391,7 @@ void AttributeOutputBase::GetNumberPara( String& rStr, const SwField& rFld )
             rStr.APPEND_CONST_ASC("\\*roman ");
             break;
         default:
-            ASSERT(rFld.GetFormat() == SVX_NUM_ARABIC,
+            OSL_ENSURE(rFld.GetFormat() == SVX_NUM_ARABIC,
                 "Unknown numbering type exported as default\n");
         case SVX_NUM_ARABIC:
             rStr.APPEND_CONST_ASC("\\*Arabic ");
@@ -3138,7 +3069,7 @@ void WW8AttributeOutput::ParaVerticalAlign( const SvxParaVertAlignItem& rAlign )
             break;
         default:
             nVal = 4;
-            ASSERT( false, "Unknown vert alignment" );
+            OSL_ENSURE( false, "Unknown vert alignment" );
             break;
     }
     m_rWW8Export.InsUInt16( nVal );
@@ -3522,7 +3453,7 @@ void WW8AttributeOutput::FormatFrameSize( const SwFmtFrmSize& rSize )
 ULONG WW8Export::ReplaceCr( BYTE nChar )
 {
     // Bug #49917#
-    ASSERT( nChar, "gegen 0 ersetzt bringt WW97/95 zum Absturz" );
+    OSL_ENSURE( nChar, "gegen 0 ersetzt bringt WW97/95 zum Absturz" );
 
     bool bReplaced = false;
     SvStream& rStrm = Strm();
@@ -3590,13 +3521,6 @@ ULONG WW8Export::ReplaceCr( BYTE nChar )
         pChpPlc->AppendFkpEntry(rStrm.Tell());
         nRetPos = rStrm.Tell();
     }
-#ifndef DBG_UTIL
-    else
-    {
-        ASSERT( nRetPos || nPos == (ULONG)pFib->fcMin,
-                "WW8_ReplaceCr an falscher FilePos gerufen" );
-    }
-#endif
     return nRetPos;
 }
 
@@ -3643,9 +3567,6 @@ void AttributeOutputBase::FormatBreak( const SvxFmtBreakItem& rBreak )
     {
         switch ( rBreak.GetBreak() )
         {
-            // JP 21.06.99: column breaks never change to pagebreaks
-            // case SVX_BREAK_COLUMN_BEFORE:
-            // case SVX_BREAK_COLUMN_BOTH:
             case SVX_BREAK_NONE:
             case SVX_BREAK_PAGE_BEFORE:
             case SVX_BREAK_PAGE_BOTH:
@@ -3740,7 +3661,7 @@ void WW8AttributeOutput::FormatTextGrid( const SwTextGridItem& rGrid )
         switch ( rGrid.GetGridType() )
         {
             default:
-                ASSERT(false, "Unknown grid type");
+                OSL_ENSURE(false, "Unknown grid type");
             case GRID_NONE:
                 nGridType = 0;
                 break;
@@ -3903,7 +3824,7 @@ void WW8AttributeOutput::FormatULSpace( const SvxULSpaceItem& rUL )
     }
     else if ( m_rWW8Export.bOutPageDescs )            // Page-UL
     {
-        ASSERT( m_rWW8Export.GetCurItemSet(), "Impossible" );
+        OSL_ENSURE( m_rWW8Export.GetCurItemSet(), "Impossible" );
         if ( !m_rWW8Export.GetCurItemSet() )
             return;
 
@@ -4018,7 +3939,7 @@ void WW8AttributeOutput::FormatHorizOrientation( const SwFmtHoriOrient& rFlyHori
 {
     if ( !m_rWW8Export.mpParentFrame )
     {
-        ASSERT( m_rWW8Export.mpParentFrame, "HoriOrient without mpParentFrame !!" );
+        OSL_ENSURE( m_rWW8Export.mpParentFrame, "HoriOrient without mpParentFrame !!" );
         return;
     }
 
@@ -4057,7 +3978,7 @@ void WW8AttributeOutput::FormatHorizOrientation( const SwFmtHoriOrient& rFlyHori
 
 void WW8AttributeOutput::FormatAnchor( const SwFmtAnchor& rAnchor )
 {
-    ASSERT( m_rWW8Export.mpParentFrame, "Anchor without mpParentFrame !!" );
+    OSL_ENSURE( m_rWW8Export.mpParentFrame, "Anchor without mpParentFrame !!" );
 
     if ( m_rWW8Export.bOutFlyFrmAttrs )
     {
@@ -4223,7 +4144,7 @@ WW8_BRC WW8Export::TranslateBorderLine(const SvxBorderLine& rLine,
 void WW8Export::Out_BorderLine(WW8Bytes& rO, const SvxBorderLine* pLine,
     USHORT nDist, sal_uInt16 nSprmNo, bool bShadow)
 {
-    ASSERT( ( nSprmNo == 0 ) ||
+    OSL_ENSURE( ( nSprmNo == 0 ) ||
             ( nSprmNo >= 38 && nSprmNo <= 41 ) ||
             ( nSprmNo >= NS_sprm::LN_PBrcTop && nSprmNo <= NS_sprm::LN_PBrcRight ) ||
             ( nSprmNo >= NS_sprm::LN_SBrcTop && nSprmNo <= NS_sprm::LN_SBrcRight ),
@@ -4556,7 +4477,7 @@ void AttributeOutputBase::ParaLineSpacing( const SvxLineSpacingItem& rSpacing )
                                 getScriptType(pNd->GetTxt(), 0);
                         }
                     }
-                    ASSERT( pSet, "No attrset for lineheight :-(" );
+                    OSL_ENSURE( pSet, "No attrset for lineheight :-(" );
                     if ( pSet )
                     {
                         nSpace = nSpace + (short)( AttrSetToLineHeight( *GetExport().pDoc,
@@ -4578,7 +4499,9 @@ void AttributeOutputBase::ParaLineSpacing( const SvxLineSpacingItem& rSpacing )
         }
         break;
     }
-
+    // if nSpace is negative, it is a fixed size in 1/20 of a point
+    // if nSpace is positive and nMulti is 1, it is 1/240 of a single line height
+    // otherwise, I have no clue what the heck it is
     ParaLineSpacing_Impl( nSpace, nMulti );
 }
 
@@ -4697,7 +4620,7 @@ void WW8AttributeOutput::FormatFrameDirection( const SvxFrameDirectionItem& rDir
     {
         default:
             //Can't get an unknown type here
-            ASSERT(false, "Unknown frame direction");
+            OSL_ENSURE(false, "Unknown frame direction");
         case FRMDIR_HORI_LEFT_TOP:
             nTextFlow = 0;
             break;
@@ -4846,8 +4769,8 @@ void SwWW8WrTabu::PutAll(WW8Export& rWrt)
 {
     if (!nAdd && !nDel) //It its a no-op
         return;
-    ASSERT(nAdd <= 255, "more than 255 added tabstops ?");
-    ASSERT(nDel <= 255, "more than 244 removed tabstops ?");
+    OSL_ENSURE(nAdd <= 255, "more than 255 added tabstops ?");
+    OSL_ENSURE(nDel <= 255, "more than 244 removed tabstops ?");
     if (nAdd > 255)
         nAdd = 255;
     if (nDel > 255)
@@ -5270,7 +5193,7 @@ void AttributeOutputBase::OutputStyleItemSet( const SfxItemSet& rSet, BOOL bDeep
     const SfxPoolItem* pItem;
     if ( !bDeep || !pSet->GetParent() )
     {
-        ASSERT( rSet.Count(), "Wurde doch schon behandelt oder?" );
+        OSL_ENSURE( rSet.Count(), "Wurde doch schon behandelt oder?" );
         SfxItemIter aIter( *pSet );
         pItem = aIter.GetCurItem();
         do {
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index c877038385f9..3dc151feb782 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -230,7 +230,7 @@ bool WW8Glossary::Load( SwTextBlocks &rBlocks, bool bSaveRelFile )
                     *pD->GetNodes().GetEndOfContent().StartOfSectionNode(), 1);
                 if( !aIdx.GetNode().IsTxtNode() )
                 {
-                    ASSERT( !this, "wo ist der TextNode?" );
+                    OSL_ENSURE( !this, "wo ist der TextNode?" );
                     pD->GetNodes().GoNext( &aIdx );
                 }
                 SwPaM aPamo( aIdx );
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index df4b6dc23891..c8cc19f0bba1 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -179,7 +179,7 @@ bool SwWW8ImplReader::ReadGrafStart(void* pData, short nDataSiz,
 {
     if (SVBT16ToShort(pHd->cb) < sizeof(WW8_DPHEAD) + nDataSiz)
     {
-        ASSERT( !this, "+Grafik-Element: Size ?" );
+        OSL_ENSURE( !this, "+Grafik-Element: Size ?" );
         pStrm->SeekRel(SVBT16ToShort(pHd->cb) - sizeof(WW8_DPHEAD));
         return false;
     }
@@ -810,7 +810,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
     WW8PLCFspecial* pT = pPlcxMan ? pPlcxMan->GetTxbx() : 0;
     if( !pT )
     {
-        ASSERT( !this, "+Wo ist der Grafik-Text (1) ?" );
+        OSL_ENSURE( !this, "+Wo ist der Grafik-Text (1) ?" );
         return false;
     }
 
@@ -823,7 +823,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
     void* pT0;
     if( !pT->Get( rStartCp, pT0 ) )
     {
-        ASSERT( !this, "+Wo ist der Grafik-Text (2) ?" );
+        OSL_ENSURE( !this, "+Wo ist der Grafik-Text (2) ?" );
         return false;
     }
 
@@ -835,7 +835,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
             (*pT)++;
             if( !pT->Get( rStartCp, pT0 ) )
             {
-                ASSERT( !this, "+Wo ist der Grafik-Text (2-a) ?" );
+                OSL_ENSURE( !this, "+Wo ist der Grafik-Text (2-a) ?" );
                 return false;
             }
             bReusable = (0 != SVBT16ToShort( ((WW8_TXBXS*)pT0)->fReusable ));
@@ -844,7 +844,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
     (*pT)++;
     if( !pT->Get( rEndCp, pT0 ) )
     {
-        ASSERT( !this, "+Wo ist der Grafik-Text (3) ?" );
+        OSL_ENSURE( !this, "+Wo ist der Grafik-Text (3) ?" );
         return false;
     }
 
@@ -865,7 +865,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
             // den ersten Eintrag fuer diese TextBox-Story finden
             if( !pT->SeekPos( rStartCp ) )
             {
-                ASSERT( !this, "+Wo ist der Grafik-Text (4) ?" );
+                OSL_ENSURE( !this, "+Wo ist der Grafik-Text (4) ?" );
                 return false;
             }
             // ggfs. entsprechende Anzahl Eintraege weitergehen
@@ -874,7 +874,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
             if(    (!pT->Get( rStartCp, pT0 ))
                 || ( nMinStartCp > rStartCp  ) )
             {
-                ASSERT( !this, "+Wo ist der Grafik-Text (5) ?" );
+                OSL_ENSURE( !this, "+Wo ist der Grafik-Text (5) ?" );
                 return false;
             }
             if( rStartCp >= nMaxEndCp )
@@ -885,7 +885,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
                 if(    (!pT->Get( rEndCp, pT0 ))
                     || ( nMaxEndCp < rEndCp-1  ) )
                 {
-                    ASSERT( !this, "+Wo ist der Grafik-Text (6) ?" );
+                    OSL_ENSURE( !this, "+Wo ist der Grafik-Text (6) ?" );
                     return false;
                 }
                 rEndCp -= 1;
@@ -906,7 +906,7 @@ bool SwWW8ImplReader::GetRangeAsDrawingString(String& rString, long nStartCp, lo
     WW8_CP nOffset = pWwFib->GetBaseCp(eType);
 
     bool bOk = false;
-    ASSERT(nStartCp <= nEndCp, "+Wo ist der Grafik-Text (7) ?");
+    OSL_ENSURE(nStartCp <= nEndCp, "+Wo ist der Grafik-Text (7) ?");
     if (nStartCp == nEndCp)
         rString.Erase();      // leerer String: durchaus denkbar!
     else if (nStartCp < nEndCp)
@@ -914,7 +914,7 @@ bool SwWW8ImplReader::GetRangeAsDrawingString(String& rString, long nStartCp, lo
         // den Text einlesen: kann sich ueber mehrere Pieces erstrecken!!!
         USHORT nLen = pSBase->WW8ReadString(*pStrm, rString,
             nStartCp + nOffset, nEndCp - nStartCp, GetCurrentCharSet());
-        ASSERT(nLen, "+Wo ist der Grafik-Text (8) ?");
+        OSL_ENSURE(nLen, "+Wo ist der Grafik-Text (8) ?");
         if (nLen)
         {
             bOk = true;
@@ -1055,14 +1055,12 @@ SwFrmFmt* SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
                                 aSprmIter++;
                             }
 
-                            //if( bRead_Obj || bRead_PicLoc ) break;
                             if( !nLoop )
                             {
                                 pChp->GetPCDSprms(  aDesc );
                                 aSprmIter.SetSprms( aDesc.pMemPos,
                                     aDesc.nSprmsLen );
                             }
-                            //if( bRead_Obj || bRead_PicLoc ) break;
                         }
                         aSave.Restore(this);
                         bEmbeddObj=bOldEmbeddObj;
@@ -1318,7 +1316,7 @@ SdrObject *SwWW8ImplReader::ReadGroup( WW8_DPHEAD* pHd, const WW8_DO* pDo,
             // #116150#
             // first add and then set ItemSet
             SdrObjList *pSubGroup = pObj->GetSubList();
-            ASSERT(pSubGroup, "Why no sublist available?");
+            OSL_ENSURE(pSubGroup, "Why no sublist available?");
             if (pSubGroup)
                 pSubGroup->InsertObject(pObject, 0);
             pObject->SetMergedItemSetAndBroadcast(aSet);
@@ -1376,7 +1374,7 @@ SdrObject* SwWW8ImplReader::ReadGrafPrimitive( short& rLeft, const WW8_DO* pDo,
     }
     else
     {
-        ASSERT( !this, "+Grafik-Overlap" );
+        OSL_ENSURE( !this, "+Grafik-Overlap" );
     }
     rLeft = rLeft - SVBT16ToShort( aHd.cb );
     return pRet;
@@ -1389,13 +1387,13 @@ void SwWW8ImplReader::ReadGrafLayer1( WW8PLCFspecial* pPF, long nGrafAnchorCp )
     void* pF0;
     if( !pPF->Get( nStartFc, pF0 ) )
     {
-        ASSERT( !this, "+Wo ist die Grafik (2) ?" );
+        OSL_ENSURE( !this, "+Wo ist die Grafik (2) ?" );
         return;
     }
     WW8_FDOA* pF = (WW8_FDOA*)pF0;
     if( !SVBT32ToUInt32( pF->fc ) )
     {
-        ASSERT( !this, "+Wo ist die Grafik (3) ?" );
+        OSL_ENSURE( !this, "+Wo ist die Grafik (3) ?" );
         return;
     }
     WW8_DO aDo;
@@ -1499,7 +1497,7 @@ const WW8_BordersSO &WW8_BordersSO::Get0x01LineMatch(eBorderCode eCode)
 /*18*/  { DEF_LINE_WIDTH_5, 0, 0, DOTTED }
     };
     size_t nPos = static_cast<size_t>(eCode);
-    ASSERT(nPos < sizeof(aLineTabVer8), "Impossible");
+    OSL_ENSURE(nPos < sizeof(aLineTabVer8), "Impossible");
     if (nPos >= sizeof(aLineTabVer8))
         eCode = single0;
     return aLineTabVer8[eCode];
@@ -1656,7 +1654,7 @@ INT32 SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color& rLineColor,
         break;
     // erroneously not implemented line style is set
     default:
-        ASSERT(!this, "eLineStyle is not (yet) implemented!");
+        OSL_ENSURE(!this, "eLineStyle is not (yet) implemented!");
         break;
     }
 
@@ -1852,13 +1850,6 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj,
             SdrShadowXDistItem);
         const INT32 nShdDistY = WW8ITEMVALUE(rOldSet, SDRATTR_SHADOWYDIST,
             SdrShadowYDistItem);
-        //const USHORT nShdTrans= WW8ITEMVALUE(rOldSet,
-        //   SDRATTR_SHADOWTRANSPARENCE, SdrShadowTransparenceItem);
-
-        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        //
-        // SfxVoidItem( SDRATTR_SHADOW3D    )
-        // SfxVoidItem( SDRATTR_SHADOWPERSP )
 
         aShadow.SetColor( Color( aShdColor ) );
 
@@ -2034,16 +2025,6 @@ void SwWW8ImplReader::AdjustULWrapForWordMargins(
     //Remove top margin if aligned vertically inside margin
     if ((rRecord.nYAlign == 4) && (nYRelTo == 0))
         rUL.SetUpper((USHORT)0);
-
-    /*
-    // Something like this needs to be done once inside and outside are
-    // fixed
-    if (rRecord.nYAlign == 4)
-    {
-        if (rRecord.nYRelTo == 0)
-            rUL.SetUpper((USHORT)0);
-    }
-    */
 }
 
 void SwWW8ImplReader::MapWrapIntoFlyFmt(SvxMSDffImportRec* pRecord,
@@ -2269,7 +2250,7 @@ bool SwWW8ImplReader::MiserableRTLGraphicsHack(SwTwips &rLeft, SwTwips nWidth,
 RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
     WW8_FSPA *pFSPA, SfxItemSet &rFlySet, bool /*bOrgObjectWasReplace*/)
 {
-    ASSERT(pRecord || pFSPA, "give me something! to work with for anchoring");
+    OSL_ENSURE(pRecord || pFSPA, "give me something! to work with for anchoring");
     if (!pRecord && !pFSPA)
         return FLY_AT_PAGE;
 
@@ -2446,7 +2427,6 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
         if ( nInTable &&
              ( eHoriRel == text::RelOrientation::FRAME || eHoriRel == text::RelOrientation::CHAR ) &&
              pFSPA->nwr == 3 &&
-//             pRecord->nLayoutInTableCell == 0x80000000 )
              !IsObjectLayoutInTableCell( pRecord->nLayoutInTableCell ) )
         {
             eHoriRel = text::RelOrientation::PAGE_PRINT_AREA;
@@ -2515,7 +2495,7 @@ bool SwWW8ImplReader::IsObjectLayoutInTableCell( const UINT32 nLayoutInTableCell
             case 0x0000: // version 8 aka Microsoft Word 97
             {
                 bIsObjectLayoutInTableCell = false;
-                ASSERT( nLayoutInTableCell == 0xFFFFFFFF,
+                OSL_ENSURE( nLayoutInTableCell == 0xFFFFFFFF,
                         "no explicit object attribute layout in table cell excepted." );
             }
             break;
@@ -2543,7 +2523,7 @@ bool SwWW8ImplReader::IsObjectLayoutInTableCell( const UINT32 nLayoutInTableCell
             break;
             default:
             {
-                ASSERT( false,
+                OSL_ENSURE( false,
                         "unknown version." );
             }
         }
@@ -2567,7 +2547,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
     WW8PLCFspecial* pPF = pPlcxMan->GetFdoa();
     if( !pPF )
     {
-        ASSERT( !this, "Where is the grapic (1) ?" );
+        OSL_ENSURE( !this, "Where is the grapic (1) ?" );
         return 0;
     }
 
@@ -2588,7 +2568,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
     WW8_FC nStartFc;
     void* pF0;
     if( !pPF->Get( nStartFc, pF0 ) ){
-        ASSERT( !this, "+Wo ist die Grafik (2) ?" );
+        OSL_ENSURE( !this, "+Wo ist die Grafik (2) ?" );
         return 0;
     }
 
@@ -2603,7 +2583,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
 #endif // defined __WW8_NEEDS_COPY
     if( !pF->nSpId )
     {
-        ASSERT( !this, "+Wo ist die Grafik (3) ?" );
+        OSL_ENSURE( !this, "+Wo ist die Grafik (3) ?" );
         return 0;
     }
 
@@ -2629,7 +2609,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
 
     if (!bOk)
     {
-        ASSERT( !this, "Where is the Shape ?" );
+        OSL_ENSURE( !this, "Where is the Shape ?" );
         return 0;
     }
 
@@ -2651,13 +2631,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
 
     }
 
-    // OD 14.10.2003 - keep wrapping of objects in page header/footer.
-    /*
-    //#108778# when in a header or footer word appears to treat all elements
-    //are wrap through
-    if (bIsHeader || bIsFooter)
-        pF->nwr = 3;
-    */
+    //#108778# when in a header or footer word appears to treat all elements as wrap through
 
     // Umfluss-Modus ermitteln
     SfxItemSet aFlySet(rDoc.GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1);
@@ -2714,7 +2688,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
     // eingelesenes Objekt (kann eine ganze Gruppe sein) jetzt korrekt
     // positionieren usw.
 
-    ASSERT(!((aData.GetRecCount() != 1) && bReplaceable),
+    OSL_ENSURE(!((aData.GetRecCount() != 1) && bReplaceable),
         "Replaceable drawing with > 1 entries ?");
 
     if (aData.GetRecCount() != 1)
@@ -2735,17 +2709,10 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
             pRecord = 0;
     }
 
-    ASSERT(pRecord, "how did that happen?");
+    OSL_ENSURE(pRecord, "how did that happen?");
     if (!pRecord)
         return 0;
 
-    // --> OD 2008-04-10 #i84783#
-//    //cmc: We're in a table, and the element has the magic Word XP bit set
-//    //to enable layout inside a cell
-//    // --> OD 2005-08-10 #124714# - undo change made for issue #i33442#
-//    bool bLayoutInTableCell = ( nInTable &&
-//                                pRecord->nLayoutInTableCell & 0x00008000 );
-//    // <--
     const bool bLayoutInTableCell =
         nInTable && IsObjectLayoutInTableCell( pRecord->nLayoutInTableCell );
     // <--
@@ -2836,7 +2803,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
 
             pRetFrmFmt = rDoc.Insert(*pPaM, *pObject, &aFlySet, NULL);
 
-            ASSERT(pRetFrmFmt->GetAnchor().GetAnchorId() ==
+            OSL_ENSURE(pRetFrmFmt->GetAnchor().GetAnchorId() ==
                 eAnchor, "Not the anchor type requested!");
 
             /*
@@ -3029,7 +2996,7 @@ SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject,
             rFlySet.Put(SvxFrameDirectionItem(FRMDIR_VERT_TOP_RIGHT, RES_FRAMEDIR));
 
         pRetFrmFmt = rDoc.MakeFlySection(eAnchor, pPaM->GetPoint(), &rFlySet);
-        ASSERT(pRetFrmFmt->GetAnchor().GetAnchorId() == eAnchor,
+        OSL_ENSURE(pRetFrmFmt->GetAnchor().GetAnchorId() == eAnchor,
             "Not the anchor type requested!");
 
         // if everything is OK, find pointer on new object and correct
@@ -3235,7 +3202,7 @@ void SwWW8ImplReader::GrafikCtor()  // Fuer SVDraw und VCControls und Escher
         rDoc.GetOrCreateDrawModel();
         // <--
         pDrawModel  = rDoc.GetDrawModel();
-        ASSERT(pDrawModel, "Kann DrawModel nicht anlegen");
+        OSL_ENSURE(pDrawModel, "Kann DrawModel nicht anlegen");
         pDrawPg = pDrawModel->GetPage(0);
 
         pMSDffManager = new SwMSDffManager(*this);
@@ -3260,7 +3227,7 @@ void SwWW8ImplReader::GrafikDtor()
 
 void SwWW8FltAnchorStack::AddAnchor(const SwPosition& rPos, SwFrmFmt *pFmt)
 {
-    ASSERT(pFmt->GetAnchor().GetAnchorId() != FLY_AS_CHAR,
+    OSL_ENSURE(pFmt->GetAnchor().GetAnchorId() != FLY_AS_CHAR,
         "Don't use fltanchors with inline frames, slap!");
     NewAttr(rPos, SwFltAnchor(pFmt));
 }
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index 99418cc5d3f7..d4306c8acfef 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -68,7 +68,7 @@ wwZOrderer::wwZOrderer(const sw::util::SetLayer &rSetLayer, SdrPage* pDrawPg,
     mpShapeOrders(pShapeOrders)
 {
     mnNoInitialObjects = mpDrawPg->GetObjCount();
-    ASSERT(mpDrawPg,"Missing draw page impossible!");
+    OSL_ENSURE(mpDrawPg,"Missing draw page impossible!");
 }
 
 void wwZOrderer::InsideEscher(ULONG nSpId)
@@ -208,7 +208,7 @@ void wwZOrderer::InsertTextLayerObject(SdrObject* pObject)
             ++aIter;
         }
 
-        ASSERT(aEnd != maEscherLayer.end(), "Something very wrong here");
+        OSL_ENSURE(aEnd != maEscherLayer.end(), "Something very wrong here");
         if (aEnd != maEscherLayer.end())
         {
             aEnd->mnNoInlines++;
@@ -292,26 +292,6 @@ bool SwWW8ImplReader::ReadGrafFile(String& rFileName, Graphic*& rpGraphic,
 
     if (pWwFib->envr != 1) // !MAC als Creator
     {
-
-/* SJ: #i40742#, we will use the prefsize from the mtf directly.
-The scaling has been done in former days, because the wmf filter was sometimes not
-able to calculate the proper prefsize (especially if the wmf fileheader was missing)
-
-
-        aWMF.SetPrefMapMode( MapMode( MAP_100TH_MM ) );
-        // MetaFile auf neue Groesse skalieren und
-        // neue Groesse am MetaFile setzen
-        if (rPic.MFP.xExt && rPic.MFP.yExt)
-        {
-            Size aOldSiz(aWMF.GetPrefSize());
-            Size aNewSiz(rPic.MFP.xExt, rPic.MFP.yExt );
-            Fraction aFracX(aNewSiz.Width(), aOldSiz.Width());
-            Fraction aFracY(aNewSiz.Height(), aOldSiz.Height());
-
-            aWMF.Scale(aFracX, aFracY);
-            aWMF.SetPrefSize(aNewSiz);
-        }
-*/
         rpGraphic = new Graphic( aWMF );
         return true;
     }
@@ -377,7 +357,7 @@ void SwWW8ImplReader::ReplaceObj(const SdrObject &rReplaceObj,
     }
     else
     {
-        ASSERT( !this, "Impossible!");
+        OSL_ENSURE( !this, "Impossible!");
     }
 }
 
@@ -785,21 +765,6 @@ void WW8PicShadowToReal( WW8_PIC_SHADOW * pPicS, WW8_PIC * pPic )
 
 void WW8FSPAShadowToReal( WW8_FSPA_SHADOW * pFSPAS, WW8_FSPA * pFSPA )
 {
-    //long nSpId;       //Shape Identifier. Used in conjunction with the office art data (found via fcDggInfo in the FIB) to find the actual data for this shape.
-    //long nXaLeft; //left of rectangle enclosing shape relative to the origin of the shape
-    //long nYaTop;      //top of rectangle enclosing shape relative to the origin of the shape
-    //long nXaRight;    //right of rectangle enclosing shape relative to the origin of the shape
-    //long nYaBottom;//bottom of the rectangle enclosing shape relative to the origin of the shape
-    //USHORT bHdr:1;
-    //USHORT nbx:2;
-    //USHORT nby:2;
-    //USHORT nwr:4;
-    //USHORT nwrk:4;
-    //USHORT bRcaSimple:1;
-    //USHORT bAnchorLock:1;
-    //long nTxbx; //count of textboxes in shape (undo doc only)
-
-
     pFSPA->nSpId        = SVBT32ToUInt32( pFSPAS->nSpId );
     pFSPA->nXaLeft      = SVBT32ToUInt32( pFSPAS->nXaLeft );
     pFSPA->nYaTop       = SVBT32ToUInt32( pFSPAS->nYaTop );
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 2a1eff8103a7..e15954281202 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -293,7 +293,7 @@ SdrObject* SwMSDffManager::ImportOLE( long nOLEId,
     {
         SvStorageRef xSrc = xSrcStg->OpenSotStorage( sStorageName,
             STREAM_READWRITE| STREAM_SHARE_DENYALL );
-        ASSERT(rReader.pFormImpl, "No Form Implementation!");
+        OSL_ENSURE(rReader.pFormImpl, "No Form Implementation!");
         STAR_REFERENCE( drawing::XShape ) xShape;
         if ( (!(rReader.bIsHeader || rReader.bIsFooter)) &&
             rReader.pFormImpl->ReadOCXStream(xSrc,&xShape,true))
@@ -312,7 +312,7 @@ SdrObject* SwMSDffManager::ImportOLE( long nOLEId,
 
 void SwMSDffManager::DisableFallbackStream()
 {
-    ASSERT(!pFallbackStream || !pOldEscherBlipCache,
+    OSL_ENSURE(!pFallbackStream || !pOldEscherBlipCache,
         "if you're recursive, you're broken");
     pFallbackStream = pStData2;
     pOldEscherBlipCache = pEscherBlipCache;
@@ -449,7 +449,6 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
                     (pImpRec->eShapeType == mso_sptTextSimple) ||
                     (
                         (pImpRec->eShapeType == mso_sptRectangle)
-                        // && (eWrapMode == mso_wrapSquare)
                         && ShapeHasText(pImpRec->nShapeId, rObjData.rSpHd.GetRecBegFilePos() )
                     )
                 );
@@ -658,13 +657,6 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
                         eTVA = SDRTEXTVERTADJUST_BOTTOM;
                 }
                 break;
-/*
-                case mso_anchorTopBaseline:
-                case mso_anchorBottomBaseline:
-                case mso_anchorTopCenteredBaseline:
-                case mso_anchorBottomCenteredBaseline:
-                break;
-*/
                 default:
                     ;
             }
@@ -885,9 +877,9 @@ void SwWW8ImplReader::Read_Majority( USHORT, const BYTE* , short )
 void SwWW8FltControlStack::NewAttr(const SwPosition& rPos,
     const SfxPoolItem& rAttr)
 {
-    ASSERT(RES_TXTATR_FIELD != rAttr.Which(), "probably don't want to put"
+    OSL_ENSURE(RES_TXTATR_FIELD != rAttr.Which(), "probably don't want to put"
         "fields into the control stack");
-    ASSERT(RES_FLTR_REDLINE != rAttr.Which(), "probably don't want to put"
+    OSL_ENSURE(RES_FLTR_REDLINE != rAttr.Which(), "probably don't want to put"
         "redlines into the control stack");
     SwFltControlStack::NewAttr(rPos, rAttr);
 }
@@ -917,7 +909,7 @@ void SwWW8FltControlStack::SetAttr(const SwPosition& rPos, USHORT nAttrId,
 
 long GetListFirstLineIndent(const SwNumFmt &rFmt)
 {
-    ASSERT( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION,
+    OSL_ENSURE( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION,
             "<GetListFirstLineIndent> - misusage: position-and-space-mode does not equal LABEL_WIDTH_AND_POSITION" );
 
     SvxAdjust eAdj = rFmt.GetNumAdjust();
@@ -934,7 +926,7 @@ long GetListFirstLineIndent(const SwNumFmt &rFmt)
 long lcl_GetTrueMargin(const SvxLRSpaceItem &rLR, const SwNumFmt &rFmt,
     long &rFirstLinePos)
 {
-    ASSERT( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION,
+    OSL_ENSURE( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION,
             "<lcl_GetTrueMargin> - misusage: position-and-space-mode does not equal LABEL_WIDTH_AND_POSITION" );
 
     const long nBodyIndent = rLR.GetTxtLeft();
@@ -1063,7 +1055,7 @@ void SwWW8FltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
             }
             break;
         case RES_TXTATR_FIELD:
-            ASSERT(!this, "What is a field doing in the control stack,"
+            OSL_ENSURE(!this, "What is a field doing in the control stack,"
                 "probably should have been in the endstack");
             break;
         case RES_TXTATR_INETFMT:
@@ -1229,7 +1221,7 @@ void SwWW8FltRefStack::SetAttrInDoc(const SwPosition& rTmpPos,
             break;
         default:
         case RES_FLTR_BOOKMARK:
-            ASSERT(!this, "EndStck used with non field, not what we want");
+            OSL_ENSURE(!this, "EndStck used with non field, not what we want");
             SwFltEndStack::SetAttrInDoc(rTmpPos, pEntry);
             break;
     }
@@ -1511,7 +1503,6 @@ void SwWW8ImplReader::ImportDop()
 
     // #110055# disable form design mode to be able to use imported controls directly
     // #i31239# always disable form design mode, not only in protected docs
-//    if (pWDop->fProtEnabled)
     {
         using namespace com::sun::star;
 
@@ -1526,9 +1517,9 @@ void SwWW8ImplReader::ImportDop()
             sal_Bool bValue = false;
             if (xInfo.is())
             {
-                if (xInfo->hasPropertyByName(C2U("ApplyFormDesignMode")))
+                if (xInfo->hasPropertyByName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ApplyFormDesignMode"))))
                 {
-                    xDocProps->setPropertyValue(C2U("ApplyFormDesignMode"),
+                    xDocProps->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ApplyFormDesignMode")),
                                                 cppu::bool2any(bValue));
                 }
             }
@@ -1777,7 +1768,7 @@ void SwWW8ImplReader::Read_HdFtTextAsHackedFrame(long nStart, long nLen,
     SwFrmFmt &rHdFtFmt, sal_uInt16 nPageWidth)
 {
     const SwNodeIndex* pSttIdx = rHdFtFmt.GetCntnt().GetCntntIdx();
-    ASSERT(pSttIdx, "impossible");
+    OSL_ENSURE(pSttIdx, "impossible");
     if (!pSttIdx)
         return;
 
@@ -1794,7 +1785,7 @@ void SwWW8ImplReader::Read_HdFtTextAsHackedFrame(long nStart, long nLen,
     // --> OD 2005-02-28 #i43427# - send frame for header/footer into background.
     pFrame->SetFmtAttr( SvxOpaqueItem( RES_OPAQUE, false ) );
     SdrObject* pFrmObj = CreateContactObject( pFrame );
-    ASSERT( pFrmObj,
+    OSL_ENSURE( pFrmObj,
             "<SwWW8ImplReader::Read_HdFtTextAsHackedFrame(..)> - missing SdrObject instance" );
     if ( pFrmObj )
     {
@@ -1873,10 +1864,7 @@ void SwWW8ImplReader::Read_HdFt(bool bIsTitle, int nSect,
     }
     else
     {
-        // --> OD 2008-08-06 #150965#
-        // Always read title page header/footer data - it could be used by following sections
-//        nWhichItems =
-//            rSection.maSep.grpfIhdt & (WW8_HEADER_FIRST | WW8_FOOTER_FIRST),
+        // #150965# - Always read title page header/footer data - it could be used by following sections
         nWhichItems = ( WW8_HEADER_FIRST | WW8_FOOTER_FIRST );
         // <--
         pPD = rSection.mpTitlePage;
@@ -1971,7 +1959,7 @@ void wwSectionManager::SetHdFt(wwSection &rSection, int nSect,
     if (!rSection.maSep.grpfIhdt)
         return;
 
-    ASSERT(rSection.mpPage, "makes no sense to call with a main page");
+    OSL_ENSURE(rSection.mpPage, "makes no sense to call with a main page");
     if (rSection.mpPage)
     {
         mrReader.Read_HdFt(false, nSect, pPrevious ? pPrevious->mpPage : 0,
@@ -2131,7 +2119,7 @@ void SwWW8ImplReader::EndSpecial()
     if (maApos[0] == true)
         StopApo();
 
-    ASSERT(!nInTable, "unclosed table!");
+    OSL_ENSURE(!nInTable, "unclosed table!");
 }
 
 bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, WW8_CP nStartCp)
@@ -2142,7 +2130,7 @@ bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, WW8_CP nStartCp)
 
     rbReSync = false;
 
-    ASSERT(nInTable >= 0,"nInTable < 0!");
+    OSL_ENSURE(nInTable >= 0,"nInTable < 0!");
 
     // TabRowEnd
     bool bTableRowEnd = (pPlcxMan->HasParaSprm(bVer67 ? 25 : 0x2417) != 0 );
@@ -2467,7 +2455,7 @@ sal_Size Custom8BitToUnicode(rtl_TextToUnicodeConverter hConverter,
             pOut+nDestChars, nOutLen-nDestChars,
             nFlags, &nInfo, &nThisConverted);
 
-        ASSERT(nInfo == 0, "A character conversion failed!");
+        OSL_ENSURE(nInfo == 0, "A character conversion failed!");
 
         nConverted += nThisConverted;
 
@@ -2544,7 +2532,7 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, long nEnd, long nCpOfs)
         nLen = writer_cast<xub_StrLen>(nEnd - rPos);
     else
         nLen = STRING_MAXLEN-1;
-    ASSERT(nLen, "String is 0");
+    OSL_ENSURE(nLen, "String is 0");
     if (!nLen)
         return true;
 
@@ -2614,7 +2602,7 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, long nEnd, long nCpOfs)
                     aTest[0] = static_cast< sal_Char >((nUCode & 0xFF00) >> 8);
                     aTest[1] = static_cast< sal_Char >(nUCode & 0x00FF);
                     String aTemp(aTest, 2, eSrcCJKCharSet);
-                    ASSERT(aTemp.Len() == 1, "so much for that theory");
+                    OSL_ENSURE(aTemp.Len() == 1, "so much for that theory");
                     *pWork = aTemp.GetChar(0);
                 }
                 else
@@ -2876,7 +2864,7 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs)
                 if (!pResult)
                 {
                     cInsert = ' ';
-                    ASSERT(!bObj && !bEmbeddObj && !nObjLocFc,
+                    OSL_ENSURE(!bObj && !bEmbeddObj && !nObjLocFc,
                         "WW8: Please report this document, it may have a "
                         "missing graphic");
                 }
@@ -2996,20 +2984,20 @@ long SwWW8ImplReader::ReadTextAttr(WW8_CP& rTxtPos, bool& rbStartLine)
     long nSkipChars = 0;
     WW8PLCFManResult aRes;
 
-    ASSERT(pPaM->GetNode()->GetTxtNode(), "Missing txtnode");
+    OSL_ENSURE(pPaM->GetNode()->GetTxtNode(), "Missing txtnode");
     bool bStartAttr = pPlcxMan->Get(&aRes); // hole Attribut-Pos
     aRes.nAktCp = rTxtPos;              // Akt. Cp-Pos
 
     bool bNewSection = (aRes.nFlags & MAN_MASK_NEW_SEP) && !bIgnoreText;
     if ( bNewSection )  // neue Section
     {
-        ASSERT(pPaM->GetNode()->GetTxtNode(), "Missing txtnode");
+        OSL_ENSURE(pPaM->GetNode()->GetTxtNode(), "Missing txtnode");
         // PageDesc erzeugen und fuellen
         maSectionManager.CreateSep(rTxtPos, bPgSecBreak);
                                             // -> 0xc war ein Sectionbreak, aber
                                             // kein Pagebreak;
         bPgSecBreak = false;                // PageDesc erzeugen und fuellen
-        ASSERT(pPaM->GetNode()->GetTxtNode(), "Missing txtnode");
+        OSL_ENSURE(pPaM->GetNode()->GetTxtNode(), "Missing txtnode");
     }
 
     // neuer Absatz ueber Plcx.Fkp.papx
@@ -3186,7 +3174,7 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, ManTypes nType)
     while ( l<nStartCp+nTextLen )
     {
         ReadAttrs( nNext, l, bStartLine );// behandelt auch Section-Breaks
-        ASSERT(pPaM->GetNode()->GetTxtNode(), "Missing txtnode");
+        OSL_ENSURE(pPaM->GetNode()->GetTxtNode(), "Missing txtnode");
 
         if (mpPostProcessAttrsInfo != NULL)
             PostProcessAttrs();
@@ -3449,7 +3437,7 @@ void SwWW8ImplReader::DeleteStk(SwFltControlStack* pStck)
     }
     else
     {
-        ASSERT( !this, "WW-Stack bereits geloescht" );
+        OSL_ENSURE( !this, "WW-Stack bereits geloescht" );
     }
 }
 
@@ -3520,7 +3508,7 @@ void wwSectionManager::SetUseOn(wwSection &rSection)
     if (!bEven)
         eUse = (UseOnPage)(eUse | nsUseOnPage::PD_HEADERSHARE | nsUseOnPage::PD_FOOTERSHARE);
 
-    ASSERT(rSection.mpPage, "Makes no sense to call me with no pages to set");
+    OSL_ENSURE(rSection.mpPage, "Makes no sense to call me with no pages to set");
     if (rSection.mpPage)
         rSection.mpPage->WriteUseOn(eUse);
     if (rSection.mpTitlePage)
@@ -3545,7 +3533,7 @@ void GiveNodePageDesc(SwNodeIndex &rIdx, const SwFmtPageDesc &rPgDesc,
         SwTable& rTable =
             rIdx.GetNode().GetTableNode()->GetTable();
         SwFrmFmt* pApply = rTable.GetFrmFmt();
-        ASSERT(pApply, "impossible");
+        OSL_ENSURE(pApply, "impossible");
         if (pApply)
             pApply->SetFmtAttr(rPgDesc);
     }
@@ -3566,10 +3554,7 @@ SwFmtPageDesc wwSectionManager::SetSwFmtPageDesc(mySegIter &rIter,
     mySegIter &rStart, bool bIgnoreCols)
 {
     SwFmtPageDesc aEmpty;
-    // --> OD 2008-08-06 #150965#
-    // Always read title page header/footer data - it could be used by following sections
-//    if (rIter->HasTitlePage())
-    // <--
+    // #150965# - Always read title page header/footer data - it could be used by following sections
     {
         if (IsNewDoc() && rIter == rStart)
         {
@@ -3583,7 +3568,7 @@ SwFmtPageDesc wwSectionManager::SetSwFmtPageDesc(mySegIter &rIter,
                 , 0, false);
             rIter->mpTitlePage = &mrReader.rDoc._GetPageDesc(nPos);
         }
-        ASSERT(rIter->mpTitlePage, "no page!");
+        OSL_ENSURE(rIter->mpTitlePage, "no page!");
         if (!rIter->mpTitlePage)
             return aEmpty;
 
@@ -3603,7 +3588,7 @@ SwFmtPageDesc wwSectionManager::SetSwFmtPageDesc(mySegIter &rIter,
                 rIter->mpTitlePage, false);
         rIter->mpPage = &mrReader.rDoc._GetPageDesc(nPos);
     }
-    ASSERT(rIter->mpPage, "no page!");
+    OSL_ENSURE(rIter->mpPage, "no page!");
     if (!rIter->mpPage)
         return aEmpty;
 
@@ -3647,6 +3632,14 @@ void wwSectionManager::InsertSegments()
     mySegIter aStart = maSegments.begin();
     for (mySegIter aIter = aStart; aIter != aEnd; ++aIter)
     {
+        // If the section is of type "New column" (0x01), then simply insert a column break
+        if ( aIter->maSep.bkc == 1 )
+        {
+            SwPaM start( aIter->maStart );
+            mrReader.rDoc.InsertPoolItem( start, SvxFmtBreakItem(SVX_BREAK_COLUMN_BEFORE, RES_BREAK), 0);
+            continue;
+        }
+
         mySegIter aNext = aIter+1;
         mySegIter aPrev = (aIter == aStart) ? aIter : aIter-1;
 
@@ -3658,11 +3651,12 @@ void wwSectionManager::InsertSegments()
         bool bInsertSection = (aIter != aStart) ? (aIter->IsContinous() &&  bThisAndPreviousAreCompatible): false;
         bool bInsertPageDesc = !bInsertSection;
         bool bProtected = SectionIsProtected(*aIter); // do we really  need this ?? I guess I have a different logic in editshell which disales this...
-    if (bUseEnhFields && mrReader.pWDop->fProtEnabled && aIter->IsNotProtected()) {
-        // here we have the special case that the whole document is protected, with the execption of this section.
-        // I want to address this when I do the section rework, so for the moment we disable the overall protection then...
-        mrReader.rDoc.set(IDocumentSettingAccess::PROTECT_FORM, false );
-    }
+        if (bUseEnhFields && mrReader.pWDop->fProtEnabled && aIter->IsNotProtected())
+        {
+            // here we have the special case that the whole document is protected, with the execption of this section.
+            // I want to address this when I do the section rework, so for the moment we disable the overall protection then...
+            mrReader.rDoc.set(IDocumentSettingAccess::PROTECT_FORM, false );
+        }
 
 
         if (bInsertPageDesc)
@@ -3948,7 +3942,6 @@ void lcl_createTemplateToProjectEntry( const uno::Reference< container::XNameCon
             rtl::OUString templateNameWithExt = aObj.GetLastName();
             rtl::OUString templateName;
             sal_Int32 nIndex =  templateNameWithExt.lastIndexOf( '.' );
-            //xPrjNameCache->insertByName( templateNameWithExt, uno::makeAny( sVBAProjName ) );
             if ( nIndex != -1 )
             {
                 templateName = templateNameWithExt.copy( 0, nIndex );
@@ -4264,8 +4257,6 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
         SwEndNoteInfo aInfo;
         aInfo = rDoc.GetEndNoteInfo();  // parallel zu Ftn
 
-        // Ich kann nicht setzen, wann neu nummerieren...
-        //  aInfo.eNum = eNumA[pWDop->pDop->rncEdn];
         aInfo.aFmt.SetNumberingType( static_cast< sal_uInt16 >(eNumTA[pWDop->nfcEdnRef]) );
         if( pWDop->nEdn )
             aInfo.nFtnOffset = pWDop->nEdn - 1;
@@ -4519,7 +4510,7 @@ ULONG SwWW8ImplReader::SetSubStreams(SvStorageStreamRef &rTableStream,
         case 8:
             if(!pStg)
             {
-                ASSERT( pStg, "Version 8 muss immer einen Storage haben!" );
+                OSL_ENSURE( pStg, "Version 8 muss immer einen Storage haben!" );
                 nErrRet = ERR_SWG_READ_ERROR;
                 break;
             }
@@ -4544,7 +4535,7 @@ ULONG SwWW8ImplReader::SetSubStreams(SvStorageStreamRef &rTableStream,
             break;
         default:
             // Programm-Fehler!
-            ASSERT( !this, "Es wurde vergessen, nVersion zu kodieren!" );
+            OSL_ENSURE( !this, "Es wurde vergessen, nVersion zu kodieren!" );
             nErrRet = ERR_SWG_READ_ERROR;
             break;
     }
@@ -4836,7 +4827,6 @@ public:
     outlineeq(BYTE nNum) : mnNum(nNum) {}
     bool operator()(const SwTxtFmtColl *pTest) const
     {
-        //return pTest->GetOutlineLevel() == mnNum; //#outline level,zhaojianwei
         return pTest->IsAssignedToListLevelOfOutlineStyle() && pTest->GetAssignedOutlineStyleLevel() == mnNum;  //<-end,zhaojianwei
     }
 };
@@ -4852,7 +4842,6 @@ void SwWW8ImplReader::SetOutLineStyles()
     // <aOutlineRule>, because its used below to be compared this <&aOutlineRule>.
     // But at the end of the method <mpChosenOutlineNumRule> has to be set to
     // <rDoc.GetOutlineNumRule()>, because <aOutlineRule> will be destroyed.
-//    mpChosenOutlineNumRule = rDoc.GetOutlineNumRule();
     mpChosenOutlineNumRule = &aOutlineRule;
     // <--
 
@@ -4875,8 +4864,6 @@ void SwWW8ImplReader::SetOutLineStyles()
         for ( sw::ParaStyles::reverse_iterator aIter = aOutLined.rbegin(); aIter < aEnd; ++aIter)
         // <--
         {
-            //if ((*aIter)->GetOutlineLevel() < MAXLEVEL)   //#outline level,zhaojianwei,
-            //nFlagsStyleOutlLevel |= 1 << (*aIter)->GetOutlineLevel();
             if ((*aIter)->IsAssignedToListLevelOfOutlineStyle())
                 nFlagsStyleOutlLevel |= 1 << (*aIter)->GetAssignedOutlineStyleLevel();//<-end,zhaojianwei
             else
@@ -4934,7 +4921,7 @@ void SwWW8ImplReader::SetOutLineStyles()
         }
         // <--
 
-        ASSERT(mpChosenOutlineNumRule, "Impossible");
+        OSL_ENSURE(mpChosenOutlineNumRule, "Impossible");
         if (mpChosenOutlineNumRule)
             aOutlineRule = *mpChosenOutlineNumRule;
 
@@ -4946,8 +4933,6 @@ void SwWW8ImplReader::SetOutLineStyles()
             for ( sw::ParaStyles::reverse_iterator aIter = aOutLined.rbegin(); aIter < aEnd; ++aIter)
             // <--
             {
-                //if ((*aIter)->GetOutlineLevel() < MAXLEVEL)//#outline level,zhaojianwei
-                //    (*aIter)->SetOutlineLevel(NO_NUMBERING);
                 if((*aIter)->IsAssignedToListLevelOfOutlineStyle())
                     (*aIter)->DeleteAssignmentToListLevelOfOutlineStyle();  //<-end
 
@@ -4977,7 +4962,6 @@ void SwWW8ImplReader::SetOutLineStyles()
                 */
                 rSI.pFmt->SetFmtAttr(
                         SwNumRuleItem( rSI.pOutlineNumrule->GetName() ) );
-                //((SwTxtFmtColl*)rSI.pFmt)->SetOutlineLevel(NO_NUMBERING);
                 ((SwTxtFmtColl*)rSI.pFmt)->DeleteAssignmentToListLevelOfOutlineStyle();//#outline level,zhaojianwei
             }
             else
@@ -4999,7 +4983,6 @@ void SwWW8ImplReader::SetOutLineStyles()
                 myParaStyleIter aEnd = aOutLined.end();
                 while (aResult != aEnd  && aCmp(*aResult))
                 {
-                    //(*aResult)->SetOutlineLevel(NO_NUMBERING);//#outline level,zhaojianwei
                     (*aResult)->DeleteAssignmentToListLevelOfOutlineStyle();
                     ++aResult;
                 }
@@ -5019,8 +5002,6 @@ void SwWW8ImplReader::SetOutLineStyles()
                 BYTE nToLevel = rSI.nOutlineLevel;
                 const SwNumFmt& rRule=rSI.pOutlineNumrule->Get(nFromLevel);
                 aOutlineRule.Set(nToLevel, rRule);
-                // Set my outline level
-                //((SwTxtFmtColl*)rSI.pFmt)->SetOutlineLevel(nToLevel);//#outline level,zhaojianwei
                 ((SwTxtFmtColl*)rSI.pFmt)->AssignToListLevelOfOutlineStyle(nToLevel);   //<-end,zhaojianwei
                 // If there are more styles on this level ignore them
                 nFlagsStyleOutlLevel |= nAktFlags;
@@ -5141,7 +5122,7 @@ ULONG SwWW8ImplReader::LoadDoc( SwPaM& rPaM,WW8Glossary *pGloss)
             break;
         default:
             nErrRet = ERR_WW8_NO_WW8_FILE_ERR;
-            ASSERT( !this, "Es wurde vergessen, nVersion zu kodieren!" );
+            OSL_ENSURE( !this, "Es wurde vergessen, nVersion zu kodieren!" );
             break;
     }
 
@@ -5177,7 +5158,7 @@ ULONG WW8Reader::Read(SwDoc &rDoc, const String& rBaseURL, SwPaM &rPam, const St
             nVersion = 6;
         else
         {
-            ASSERT(!this, "WinWord 95 Reader-Read ohne Stream");
+            OSL_ENSURE(!this, "WinWord 95 Reader-Read ohne Stream");
             nRet = ERR_SWG_READ_ERROR;
         }
     }
@@ -5195,7 +5176,7 @@ ULONG WW8Reader::Read(SwDoc &rDoc, const String& rBaseURL, SwPaM &rPam, const St
         }
         else
         {
-            ASSERT(!this, "WinWord 95/97 Reader-Read ohne Storage");
+            OSL_ENSURE(!this, "WinWord 95/97 Reader-Read ohne Storage");
             nRet = ERR_SWG_READ_ERROR;
         }
     }
@@ -5213,7 +5194,14 @@ ULONG WW8Reader::Read(SwDoc &rDoc, const String& rBaseURL, SwPaM &rPam, const St
         }
         SwWW8ImplReader* pRdr = new SwWW8ImplReader(nVersion, pStg, pIn, rDoc,
             rBaseURL, bNew);
-        nRet = pRdr->LoadDoc( rPam );
+        try
+        {
+            nRet = pRdr->LoadDoc( rPam );
+        }
+        catch( const std::exception& )
+        {
+            nRet = ERR_WW8_NO_WW8_FILE_ERR;
+        }
         delete pRdr;
 
         if( refStrm.Is() )
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 9b4a908887d3..9d2f4aa2cb1d 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -132,11 +132,6 @@ struct WW8TabBandDesc
     sal_uInt32* pNewSHDs;
     WW8_BRC aDefBrcs[6];
 
-
-    // nur fuer WW6-7: diese Zelle hat WW-Flag bMerged (horizontal) gesetzt
-    //bool bWWMergedVer6[MAX_COL];
-
-
     bool bExist[MAX_COL];           // Existiert diese Zelle ?
     UINT8 nTransCell[MAX_COL + 2];  // UEbersetzung WW-Index -> SW-Index
 
@@ -282,8 +277,8 @@ void sw::util::RedlineStack::close( const SwPosition& rPos,
     {
         if( pTabDesc && pTabDesc->getOldRedlineStack() )
         {
-#ifdef DBG_UTIL
-            ASSERT( pTabDesc->getOldRedlineStack()->close(rPos, eType), "close without open!");
+#if OSL_DEBUG_LEVEL > 1
+            OSL_ENSURE( pTabDesc->getOldRedlineStack()->close(rPos, eType), "close without open!");
 #else
             pTabDesc->getOldRedlineStack()->close( rPos, eType );
 #endif
@@ -294,7 +289,7 @@ void sw::util::RedlineStack::close( const SwPosition& rPos,
 
 void wwSectionManager::SetCurrentSectionHasFootnote()
 {
-    ASSERT(!maSegments.empty(),
+    OSL_ENSURE(!maSegments.empty(),
         "should not be possible, must be at least one segment");
     if (!maSegments.empty())
         maSegments.back().mbHasFootnote = true;
@@ -302,7 +297,7 @@ void wwSectionManager::SetCurrentSectionHasFootnote()
 
 bool wwSectionManager::CurrentSectionIsVertical() const
 {
-    ASSERT(!maSegments.empty(),
+    OSL_ENSURE(!maSegments.empty(),
         "should not be possible, must be at least one segment");
     if (!maSegments.empty())
         return maSegments.back().IsVertical();
@@ -311,7 +306,7 @@ bool wwSectionManager::CurrentSectionIsVertical() const
 
 bool wwSectionManager::CurrentSectionIsProtected() const
 {
-    ASSERT(!maSegments.empty(),
+    OSL_ENSURE(!maSegments.empty(),
         "should not be possible, must be at least one segment");
     if (!maSegments.empty())
         return SectionIsProtected(maSegments.back());
@@ -358,7 +353,7 @@ sal_uInt16 SwWW8ImplReader::End_Ftn()
         return 0;
     }
 
-    ASSERT(!maFtnStack.empty(), "footnote end without start");
+    OSL_ENSURE(!maFtnStack.empty(), "footnote end without start");
     if (maFtnStack.empty())
         return 0;
 
@@ -383,7 +378,7 @@ sal_uInt16 SwWW8ImplReader::End_Ftn()
         SwFmtFtn aFtn(rDesc.meType == MAN_EDN);
         pFN = pTxt->InsertItem(aFtn, nPos, nPos);
     }
-    ASSERT(pFN, "Probleme beim Anlegen des Fussnoten-Textes");
+    OSL_ENSURE(pFN, "Probleme beim Anlegen des Fussnoten-Textes");
     if (pFN)
     {
 
@@ -393,7 +388,7 @@ sal_uInt16 SwWW8ImplReader::End_Ftn()
         WW8PLCFMan* pOldPlcxMan = pPlcxMan;
 
         const SwNodeIndex* pSttIdx = ((SwTxtFtn*)pFN)->GetStartNode();
-        ASSERT(pSttIdx, "Probleme beim Anlegen des Fussnoten-Textes");
+        OSL_ENSURE(pSttIdx, "Probleme beim Anlegen des Fussnoten-Textes");
 
         ((SwTxtFtn*)pFN)->SetSeqNo( rDoc.GetFtnIdxs().Count() );
 
@@ -405,7 +400,7 @@ sal_uInt16 SwWW8ImplReader::End_Ftn()
         bFtEdOk = true;
         bFtnEdn = bOld;
 
-        ASSERT(sChar.Len()==1 && ((rDesc.mbAutoNum == (sChar.GetChar(0) == 2))),
+        OSL_ENSURE(sChar.Len()==1 && ((rDesc.mbAutoNum == (sChar.GetChar(0) == 2))),
          "footnote autonumbering must be 0x02, and everthing else must not be");
 
         // If no automatic numbering use the following char from the main text
@@ -508,7 +503,7 @@ bool SwWW8ImplReader::SearchRowEnd(WW8PLCFx_Cp_FKP* pPap, WW8_CP &rStartCp,
                 }
                 else
                 {
-                    ASSERT(!nLevel || pLevel, "sublevel without level sprm");
+                    OSL_ENSURE(!nLevel || pLevel, "sublevel without level sprm");
                     return true;    // RowEnd found
                 }
             }
@@ -592,7 +587,7 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, bool bTableRowEnd,
             {
                 if (!pTableDesc)
                 {
-                    ASSERT(pTableDesc, "What!");
+                    OSL_ENSURE(pTableDesc, "What!");
                     bTestAllowed = false;
                 }
                 else
@@ -652,7 +647,6 @@ static void SetBaseAnlv(SwNumFmt &rNum, WW8_ANLV &rAV, BYTE nSwLevel )
     if ((SVBT8ToByte(rAV.aBits1 ) & 0x4) >> 2)
         rNum.SetIncludeUpperLevels(nSwLevel + 1);
     rNum.SetStart( SVBT16ToShort( rAV.iStartAt ) );
-//  rNum.eNumAdjust = eAdjA[rAV.jc];
     rNum.SetNumAdjust( eAdjA[SVBT8ToByte( rAV.aBits1 ) & 0x3] );
 
     rNum.SetCharTextDistance( SVBT16ToShort( rAV.dxaSpace ) );
@@ -716,8 +710,6 @@ void SwWW8ImplReader::SetAnlvStrings(SwNumFmt &rNum, WW8_ANLV &rAV,
     else
     {                                       // Nummerierung / Aufzaehlung
         bInsert = true;
-//      if( SVBT16ToShort( rAV.ftc ) == 1
-//          || SVBT16ToShort( rAV.ftc ) == 3 ){ // Symbol / WingDings
         if( bListSymbol )
         {
             FontFamily eFamily;
@@ -726,18 +718,14 @@ void SwWW8ImplReader::SetAnlvStrings(SwNumFmt &rNum, WW8_ANLV &rAV,
 
             if( GetFontParams( SVBT16ToShort( rAV.ftc ), eFamily, aName,
                                 ePitch, eCharSet ) ){
-//              USHORT nSiz = ( SVBT16ToShort( rAV.hps ) ) ?
-//                          SVBT16ToShort( rAV.hps ) : 24; // Groesse in 1/2 Pt
-//                      darf nach JP nicht gesetzt werden, da immer die Size
-//                      genommen wird, die am ZeilenAnfang benutzt wird
+
                 Font aFont;
                 aFont.SetName( aName );
                 aFont.SetFamily( eFamily );
-//              aFont.SetPitch( ePitch );       // darf nach JP nicht
+
                 aFont.SetCharSet( eCharSet );
                 rNum.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
-//              if( rAV.ico )       // geht in UI und SWG-Writer/Reader nicht
-//                  aFont.SetColor( Color( GetCol( rAV.ico ) ) );
+
                 rNum.SetBulletFont( &aFont );
 
                 // take only the very first character
@@ -800,7 +788,6 @@ SwNumRule* SwWW8ImplReader::GetStyRule()
     const String aName( rDoc.GetUniqueNumRuleName( &aBaseName, false) );
 
     // --> OD 2008-06-04 #i86652#
-//    USHORT nRul = rDoc.MakeNumRule( aName );
     USHORT nRul = rDoc.MakeNumRule( aName, 0, FALSE,
                                     SvxNumberFormat::LABEL_ALIGNMENT );
     // <--
@@ -833,7 +820,6 @@ void SwWW8ImplReader::Read_ANLevelNo( USHORT, const BYTE* pData, short nLen )
             {
                 nSwNumLevel = *pData - 1;
                 if (!bNoAttrImport)
-                    //((SwTxtFmtColl*)pAktColl)->SetOutlineLevel( nSwNumLevel );    //#outline level,zhaojianwei
                     ((SwTxtFmtColl*)pAktColl)->AssignToListLevelOfOutlineStyle( nSwNumLevel ); //<-end,zhaojianwei
                     // Bei WW-NoNumbering koennte auch NO_NUMBERING gesetzt
                     // werden. ( Bei normaler Nummerierung muss NO_NUM gesetzt
@@ -1026,7 +1012,6 @@ void SwWW8ImplReader::StartAnl(const BYTE* pSprm13)
         if (!pNumRule)
         {
             // --> OD 2008-06-04 #i86652#
-//            pNumRule = rDoc.GetNumRuleTbl()[rDoc.MakeNumRule(sNumRule)];
             pNumRule = rDoc.GetNumRuleTbl()[
                             rDoc.MakeNumRule( sNumRule, 0, FALSE,
                                               SvxNumberFormat::LABEL_ALIGNMENT ) ];
@@ -1490,8 +1475,8 @@ void WW8TabBandDesc::ProcessDirection(const BYTE* pParams)
     sal_uInt8 nEndCell = *pParams++;
     sal_uInt16 nCode = SVBT16ToShort(pParams);
 
-    ASSERT(nStartCell < nEndCell, "not as I thought");
-    ASSERT(nEndCell < MAX_COL + 1, "not as I thought");
+    OSL_ENSURE(nStartCell < nEndCell, "not as I thought");
+    OSL_ENSURE(nEndCell < MAX_COL + 1, "not as I thought");
     if (nStartCell > MAX_COL)
         return;
     if (nEndCell > MAX_COL + 1)
@@ -1504,19 +1489,19 @@ void WW8TabBandDesc::ProcessDirection(const BYTE* pParams)
 void WW8TabBandDesc::ProcessSpacing(const BYTE* pParams)
 {
     BYTE nLen = pParams ? *(pParams - 1) : 0;
-    ASSERT(nLen == 6, "Unexpected spacing len");
+    OSL_ENSURE(nLen == 6, "Unexpected spacing len");
     if (nLen != 6)
         return;
     mbHasSpacing=true;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     BYTE nWhichCell = *pParams;
-    ASSERT(nWhichCell == 0, "Expected cell to be 0!");
+    OSL_ENSURE(nWhichCell == 0, "Expected cell to be 0!");
 #endif
     ++pParams; //Skip which cell
     ++pParams; //unknown byte
 
     BYTE nSideBits = *pParams++;
-    ASSERT(nSideBits < 0x10, "Unexpected value for nSideBits");
+    OSL_ENSURE(nSideBits < 0x10, "Unexpected value for nSideBits");
     ++pParams; //unknown byte
     USHORT nValue =  SVBT16ToShort( pParams );
     for (int i = wwTOP; i <= wwRIGHT; i++)
@@ -1538,7 +1523,7 @@ void WW8TabBandDesc::ProcessSpacing(const BYTE* pParams)
             case 0:
                 break;
             default:
-                ASSERT(!this, "Impossible");
+                OSL_ENSURE(!this, "Impossible");
                 break;
         }
     }
@@ -1547,24 +1532,24 @@ void WW8TabBandDesc::ProcessSpacing(const BYTE* pParams)
 void WW8TabBandDesc::ProcessSpecificSpacing(const BYTE* pParams)
 {
     BYTE nLen = pParams ? *(pParams - 1) : 0;
-    ASSERT(nLen == 6, "Unexpected spacing len");
+    OSL_ENSURE(nLen == 6, "Unexpected spacing len");
     if (nLen != 6)
         return;
     BYTE nWhichCell = *pParams++;
-    ASSERT(nWhichCell < MAX_COL + 1, "Cell out of range in spacings");
+    OSL_ENSURE(nWhichCell < MAX_COL + 1, "Cell out of range in spacings");
     if (nWhichCell >= MAX_COL + 1)
         return;
 
     ++pParams; //unknown byte
     BYTE nSideBits = *pParams++;
-    ASSERT(nSideBits < 0x10, "Unexpected value for nSideBits");
+    OSL_ENSURE(nSideBits < 0x10, "Unexpected value for nSideBits");
     nOverrideSpacing[nWhichCell] |= nSideBits;
 
-    ASSERT(nOverrideSpacing[nWhichCell] < 0x10,
+    OSL_ENSURE(nOverrideSpacing[nWhichCell] < 0x10,
         "Unexpected value for nSideBits");
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     BYTE nUnknown2 = *pParams;
-    ASSERT(nUnknown2 == 0x3, "Unexpected value for spacing2");
+    OSL_ENSURE(nUnknown2 == 0x3, "Unexpected value for spacing2");
 #endif
     ++pParams;
     USHORT nValue =  SVBT16ToShort( pParams );
@@ -2330,7 +2315,7 @@ void WW8TabDesc::CalcDefaults()
             }
         }
 
-        ASSERT(i,"no columns in row ?");
+        OSL_ENSURE(i,"no columns in row ?");
 
         /*
         #96345#
@@ -2362,43 +2347,6 @@ void WW8TabDesc::CalcDefaults()
     disjoint upper and lowers to see what happens there.
     */
 
-    /* #i29550# FME 2004-06-02 Removed this code because of the implementation
-       of the collapsing table borders model. So this should not be necessary
-       anymore. */
-
-    /*    for (pR = pFirstBand; pR; pR = pR->pNextBand)
-    {
-        WW8TabBandDesc *pNext = pR->pNextBand;
-        if (!pNext)
-            break;
-
-        for (int k = 0; k < pR->nWwCols; ++k)
-        {
-            WW8_BRC &rAbove = pR->pTCs[k].rgbrc[WW8_BOT];
-            short nAboveThick = rAbove.IsEmpty(pIo->bVer67) ?
-                0 : rAbove.DetermineBorderProperties(pIo->bVer67);
-            short nUpperLeft = pR->nCenter[k];
-            short nUpperRight = pR->nCenter[k+1];
-
-            for (int l = 0; l < pNext->nWwCols; ++l)
-            {
-                short nLowerLeft = pNext->nCenter[l];
-                short nLowerRight = pNext->nCenter[l+1];
-
-                if ((nLowerLeft < nUpperLeft) || (nLowerRight > nUpperRight))
-                    continue;
-
-                WW8_BRC &rBelow = pNext->pTCs[l].rgbrc[WW8_TOP];
-                short nBelowThick = rBelow.IsEmpty(pIo->bVer67) ?
-                    0 : rBelow.DetermineBorderProperties(pIo->bVer67);
-                if (nAboveThick > nBelowThick)
-                    rBelow = rAbove;
-            }
-
-            rAbove = WW8_BRC();
-        }
-    } */
-
     if ((nMinLeft && !bIsBiDi && text::HoriOrientation::LEFT == eOri) ||
         (nMinLeft != -108 && bIsBiDi && text::HoriOrientation::RIGHT == eOri)) // Word sets the first nCenter value to -108 when no indent is used
         eOri = text::HoriOrientation::LEFT_AND_WIDTH; //  absolutely positioned
@@ -2408,7 +2356,7 @@ void WW8TabDesc::CalcDefaults()
         bOk = false;
     pActBand = pFirstBand;
     nAktBandRow = 0;
-    ASSERT( pActBand, "pActBand ist 0" );
+    OSL_ENSURE( pActBand, "pActBand ist 0" );
 }
 
 void WW8TabDesc::SetSizePosition(SwFrmFmt* pFrmFmt)
@@ -2416,7 +2364,7 @@ void WW8TabDesc::SetSizePosition(SwFrmFmt* pFrmFmt)
     SwFrmFmt* pApply = pFrmFmt;
     if (!pApply )
         pApply = pTable->GetFrmFmt();
-    ASSERT(pApply,"No frame");
+    OSL_ENSURE(pApply,"No frame");
     pApply->SetFmtAttr(aItemSet);
     if (pFrmFmt)
     {
@@ -2431,7 +2379,7 @@ void WW8TabDesc::SetSizePosition(SwFrmFmt* pFrmFmt)
 void wwSectionManager::PrependedInlineNode(const SwPosition &rPos,
     const SwNode &rNode)
 {
-    ASSERT(!maSegments.empty(),
+    OSL_ENSURE(!maSegments.empty(),
         "should not be possible, must be at least one segment");
     if ((!maSegments.empty()) && (maSegments.back().maStart == rPos.nNode))
         maSegments.back().maStart = SwNodeIndex(rNode);
@@ -2489,12 +2437,12 @@ void WW8TabDesc::CreateSwTable()
             SwInsertTableOptions( tabopts::HEADLINE_NO_BORDER, 0 ),
             *pTmpPos, nBands, nDefaultSwCols, eOri, 0, 0, FALSE, TRUE );
 
-    ASSERT(pTable && pTable->GetFrmFmt(), "insert table failed");
+    OSL_ENSURE(pTable && pTable->GetFrmFmt(), "insert table failed");
     if (!pTable || !pTable->GetFrmFmt())
         return;
 
     SwTableNode* pTableNode = pTable->GetTableNode();
-    ASSERT(pTableNode, "no table node!");
+    OSL_ENSURE(pTableNode, "no table node!");
     if (pTableNode)
     {
         pIo->maSectionManager.PrependedInlineNode(*pIo->pPaM->GetPoint(),
@@ -2599,7 +2547,7 @@ void WW8TabDesc::UseSwTable()
 
     pTblNd  = (SwTableNode*)(*pTabLines)[0]->GetTabBoxes()[0]->
         GetSttNd()->FindTableNode();
-    ASSERT( pTblNd, "wo ist mein TabellenNode" );
+    OSL_ENSURE( pTblNd, "wo ist mein TabellenNode" );
 
     // --> mloiseleur 2007-10-10 #i69519# Restrict rows to repeat to a decent value
     if ( nRowsToRepeat == static_cast<USHORT>(nRows) )
@@ -2639,7 +2587,7 @@ void WW8TabDesc::MergeCells()
                     //
                     // ggfs. eine neue Merge-Gruppe beginnen
                     //
-                    ASSERT(nRow < pTabLines->Count(),
+                    OSL_ENSURE(nRow < pTabLines->Count(),
                         "Too few lines, table ended early");
                     if (nRow >= pTabLines->Count())
                         return;
@@ -2649,7 +2597,7 @@ void WW8TabDesc::MergeCells()
                     USHORT nCol = pActBand->nTransCell[ i ];
                     if (!pActBand->bExist[i])    //#113434#
                         continue;
-                    ASSERT(nCol < pTabBoxes->Count(),
+                    OSL_ENSURE(nCol < pTabBoxes->Count(),
                         "Too few columns, table ended early");
                     if (nCol >= pTabBoxes->Count())
                         return;
@@ -2780,7 +2728,7 @@ void WW8TabDesc::ParkPaM()
 
 void WW8TabDesc::MoveOutsideTable()
 {
-    ASSERT(pTmpPos && pIo, "I've forgotten where the table is anchored");
+    OSL_ENSURE(pTmpPos && pIo, "I've forgotten where the table is anchored");
     if (pTmpPos && pIo)
         *pIo->pPaM->GetPoint() = *pTmpPos;
 }
@@ -2913,7 +2861,7 @@ bool WW8TabDesc::InFirstParaInCell() const
     //e.g. #i19718#
     if (!pTabBox || !pTabBox->GetSttNd())
     {
-        ASSERT(false, "Problem with table");
+        OSL_ENSURE(false, "Problem with table");
         return false;
     }
 
@@ -2928,7 +2876,7 @@ bool WW8TabDesc::InFirstParaInCell() const
 
 void WW8TabDesc::StartMiserableHackForUnsupportedDirection(short nWwCol)
 {
-    ASSERT(pActBand, "Impossible");
+    OSL_ENSURE(pActBand, "Impossible");
     if (pActBand && pActBand->maDirections[nWwCol] == 3)
     {
         pIo->pCtrlStck->NewAttr(*pIo->pPaM->GetPoint(),
@@ -2938,20 +2886,20 @@ void WW8TabDesc::StartMiserableHackForUnsupportedDirection(short nWwCol)
 
 void WW8TabDesc::EndMiserableHackForUnsupportedDirection(short nWwCol)
 {
-    ASSERT(pActBand, "Impossible");
+    OSL_ENSURE(pActBand, "Impossible");
     if (pActBand && pActBand->maDirections[nWwCol] == 3)
         pIo->pCtrlStck->SetAttr(*pIo->pPaM->GetPoint(), RES_CHRATR_ROTATE);
 }
 
 bool WW8TabDesc::SetPamInCell(short nWwCol, bool bPam)
 {
-    ASSERT( pActBand, "pActBand ist 0" );
+    OSL_ENSURE( pActBand, "pActBand ist 0" );
 
     USHORT nCol = pActBand->nTransCell[nWwCol];
 
     if ((USHORT)nAktRow >= pTabLines->Count())
     {
-        ASSERT(!this, "Actual row bigger than expected." );
+        OSL_ENSURE(!this, "Actual row bigger than expected." );
         if (bPam)
             MoveOutsideTable();
         return false;
@@ -2986,7 +2934,7 @@ bool WW8TabDesc::SetPamInCell(short nWwCol, bool bPam)
     pTabBox = (*pTabBoxes)[nCol];
     if( !pTabBox->GetSttNd() )
     {
-        ASSERT(pTabBox->GetSttNd(), "Probleme beim Aufbau der Tabelle");
+        OSL_ENSURE(pTabBox->GetSttNd(), "Probleme beim Aufbau der Tabelle");
         if (bPam)
             MoveOutsideTable();
         return false;
@@ -3153,7 +3101,7 @@ SvxFrameDirection MakeDirection(sal_uInt16 nCode, BOOL bIsBiDi)
     switch (nCode)
     {
         default:
-            ASSERT(eDir == 4, "unknown direction code, maybe its a bitfield");
+            OSL_ENSURE(eDir == 4, "unknown direction code, maybe its a bitfield");
         case 3:
             // --> FME/Alan Yaniger: 2006-09-15 #i38158# Consider RTL tables:
             eDir = bIsBiDi ? FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP;
@@ -3216,8 +3164,8 @@ void WW8TabDesc::AdjustNewBand()
         InsertCells( pActBand->nSwCols - nDefaultSwCols );
 
     SetPamInCell( 0, false);
-    ASSERT( pTabBoxes && pTabBoxes->Count() == (USHORT)pActBand->nSwCols,
-        "Falsche Spaltenzahl in Tabelle" )
+    OSL_ENSURE( pTabBoxes && pTabBoxes->Count() == (USHORT)pActBand->nSwCols,
+        "Falsche Spaltenzahl in Tabelle" );
 
     if( bClaimLineFmt )
     {
@@ -3350,7 +3298,7 @@ void WW8TabDesc::TableCellEnd()
         nAktCol = 0;
         nAktRow++;
         nAktBandRow++;
-        ASSERT( pActBand , "pActBand ist 0" );
+        OSL_ENSURE( pActBand , "pActBand ist 0" );
         if( pActBand )
         {
             if( nAktRow >= nRows )  // am Tabellenende gibt's nichts sinnvolles
@@ -3361,7 +3309,7 @@ void WW8TabDesc::TableCellEnd()
             {                       // neues Band noetig ?
                 pActBand = pActBand->pNextBand; //
                 nAktBandRow = 0;
-                ASSERT( pActBand, "pActBand ist 0" );
+                OSL_ENSURE( pActBand, "pActBand ist 0" );
                 AdjustNewBand();
             }
             else
@@ -3528,7 +3476,7 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp)
         int nNewInTable = nInTable + 1;
         if (InEqualApo(nNewInTable))
         {
-            ASSERT(pSFlyPara->pFlyFmt,
+            OSL_ENSURE(pSFlyPara->pFlyFmt,
                 "how could we be in a local apo and have no apo");
         }
 
@@ -3546,7 +3494,7 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp)
             aItemSet.Put( aAnchor );
             pTableDesc->pFlyFmt = rDoc.MakeFlySection( eAnchor,
                                                       pTableDesc->pParentPos, &aItemSet);
-            ASSERT( pTableDesc->pFlyFmt->GetAnchor().GetAnchorId() == eAnchor,
+            OSL_ENSURE( pTableDesc->pFlyFmt->GetAnchor().GetAnchorId() == eAnchor,
                    "Not the anchor type requested!" );
             // <--
             MoveInsideFly(pTableDesc->pFlyFmt);
@@ -3682,7 +3630,7 @@ void SwWW8ImplReader::StopTable()
 {
     maTracer.LeaveEnvironment(sw::log::eTable);
 
-    ASSERT(pTableDesc, "Panic, stop table with no table!");
+    OSL_ENSURE(pTableDesc, "Panic, stop table with no table!");
     if (!pTableDesc)
         return;
 
@@ -3920,32 +3868,17 @@ WW8RStyle::WW8RStyle(WW8Fib& _rFib, SwWW8ImplReader* pI)
 
 void WW8RStyle::Set1StyleDefaults()
 {
+    // see #i25247#, #i25561#, #i48064#, #i92341# for default font
     if (!bCJKFontChanged)   // Style no CJK Font? set the default
-        pIo->SetNewFontAttr(ftcStandardChpCJKStsh, true, RES_CHRATR_CJK_FONT);
-
-    // see i25247
-    const WW8_FFN* pF = pIo->pFonts->GetFont(3);
-    if (pF)
-    {
-        rtl_TextEncoding eEnc = WW8Fib::GetFIBCharset(pF->chs);
-        if ((ftcStandardChpCTLStsh == 0) && (eEnc == RTL_TEXTENCODING_MS_1255))
-            ftcStandardChpCTLStsh = 3;
-    }
-
-    if (ftcStandardChpCJKStsh == 0)
-        ftcStandardChpCJKStsh = 2;
+        pIo->SetNewFontAttr(ftcFE, true, RES_CHRATR_CJK_FONT);
 
     if (!bCTLFontChanged)   // Style no CTL Font? set the default
-        pIo->SetNewFontAttr(ftcStandardChpCTLStsh, true, RES_CHRATR_CTL_FONT);
+        pIo->SetNewFontAttr(ftcBi, true, RES_CHRATR_CTL_FONT);
 
     //#88976# western 2nd to make western charset conversion the default
     if (!bFontChanged)      // Style has no Font? set the default,
     {
-        pIo->SetNewFontAttr(ftcStandardChpStsh, true, RES_CHRATR_FONT);
-        /* removed by a patch from cmc for #i52786#
-        if (pIo->bVer67)
-            SetStyleCharSet(pIo->pCollA[pIo->nAktColl]);
-        */
+        pIo->SetNewFontAttr(ftcAsci, true, RES_CHRATR_FONT);
     }
 
     if( !pIo->bNoAttrImport )
@@ -4188,10 +4121,6 @@ void WW8RStyle::PostProcessStyles()
 
 void WW8RStyle::ScanStyles()        // untersucht Style-Abhaengigkeiten
 {                               // und ermittelt die Filepos fuer jeden Style
-    /*
-    WW8_FC nStyleStart = rFib.fcStshf;
-    pStStrm->Seek( nStyleStart );
-    */
     for (USHORT i = 0; i < cstd; ++i)
     {
         short nSkip;
@@ -4275,7 +4204,6 @@ std::vector<BYTE> ChpxToSprms(const Word2CHPX &rChpx)
         SVBT16 a;
         ShortToSVBT16(rChpx.hps, a);
         aRet.push_back(a[0]);
-//        aRet.push_back(a[1]);
     }
 
     if (rChpx.fsPos)
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index f1e920651afa..7cd832b30cfe 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -173,7 +173,7 @@ eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc* pF, String& rStr )
 
     if (aBookmarkName.Len()>0) {
         maFieldStack.back().SetBookmarkName(aBookmarkName);
-        maFieldStack.back().SetBookmarkType(::rtl::OUString::createFromAscii(ODF_FORMTEXT));
+        maFieldStack.back().SetBookmarkType(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMTEXT)));
         maFieldStack.back().getParameters()[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Description"))] = uno::makeAny(::rtl::OUString(aFormula.sToolTip));
         maFieldStack.back().getParameters()[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"))] = uno::makeAny(::rtl::OUString(aFormula.sTitle));
     }
@@ -223,13 +223,13 @@ eF_ResT SwWW8ImplReader::Read_F_FormCheckBox( WW8FieldDesc* pF, String& rStr )
         IDocumentMarkAccess* pMarksAccess = rDoc.getIDocumentMarkAccess( );
         IFieldmark* pFieldmark = dynamic_cast<IFieldmark*>( pMarksAccess->makeNoTextFieldBookmark(
                 *pPaM, aBookmarkName,
-                rtl::OUString::createFromAscii( ODF_FORMCHECKBOX ) ) );
-        ASSERT(pFieldmark!=NULL, "hmmm; why was the bookmark not created?");
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ODF_FORMCHECKBOX )) ) );
+        OSL_ENSURE(pFieldmark!=NULL, "hmmm; why was the bookmark not created?");
         if (pFieldmark!=NULL) {
             IFieldmark::parameter_map_t* const pParameters = pFieldmark->GetParameters();
             ICheckboxFieldmark* pCheckboxFm = dynamic_cast<ICheckboxFieldmark*>(pFieldmark);
-            (*pParameters)[::rtl::OUString::createFromAscii(ODF_FORMCHECKBOX_NAME)] = uno::makeAny(::rtl::OUString(aFormula.sTitle));
-            (*pParameters)[::rtl::OUString::createFromAscii(ODF_FORMCHECKBOX_HELPTEXT)] = uno::makeAny(::rtl::OUString(aFormula.sToolTip));
+            (*pParameters)[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMCHECKBOX_NAME))] = uno::makeAny(::rtl::OUString(aFormula.sTitle));
+            (*pParameters)[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMCHECKBOX_HELPTEXT))] = uno::makeAny(::rtl::OUString(aFormula.sToolTip));
             if(pCheckboxFm)
                 pCheckboxFm->SetChecked(aFormula.nChecked);
             // set field data here...
@@ -296,15 +296,15 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, String& rStr)
             IDocumentMarkAccess* pMarksAccess = rDoc.getIDocumentMarkAccess( );
             IFieldmark *pFieldmark = dynamic_cast<IFieldmark*>(
                     pMarksAccess->makeNoTextFieldBookmark( *pPaM, aBookmarkName,
-                           ::rtl::OUString::createFromAscii( ODF_FORMDROPDOWN ) ) );
-            ASSERT(pFieldmark!=NULL, "hmmm; why was the bookmark not created?");
+                           ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ODF_FORMDROPDOWN )) ) );
+            OSL_ENSURE(pFieldmark!=NULL, "hmmm; why was the bookmark not created?");
             if ( pFieldmark != NULL )
             {
                 uno::Sequence< ::rtl::OUString > vListEntries(aFormula.maListEntries.size());
                 ::std::copy(aFormula.maListEntries.begin(), aFormula.maListEntries.end(), ::comphelper::stl_begin(vListEntries));
-                (*pFieldmark->GetParameters())[::rtl::OUString::createFromAscii(ODF_FORMDROPDOWN_LISTENTRY)] = uno::makeAny(vListEntries);
+                (*pFieldmark->GetParameters())[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMDROPDOWN_LISTENTRY))] = uno::makeAny(vListEntries);
                 sal_Int32 nIndex = aFormula.fDropdownIndex  < aFormula.maListEntries.size() ? aFormula.fDropdownIndex : 0;
-                (*pFieldmark->GetParameters())[::rtl::OUString::createFromAscii(ODF_FORMDROPDOWN_RESULT)] = uno::makeAny(nIndex);
+                (*pFieldmark->GetParameters())[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMDROPDOWN_RESULT))] = uno::makeAny(nIndex);
                 // set field data here...
             }
         }
@@ -628,7 +628,7 @@ bool WW8ListManager::ReadLVL(SwNumFmt& rNumFmt, SfxItemSet*& rpItemSet,
                     }
                 }
             }
-            ASSERT(bDone, "tab setting in numbering is "
+            OSL_ENSURE(bDone, "tab setting in numbering is "
                 "of unexpected configuration");
         }
         if ( rNumFmt.GetPositionAndSpaceMode() ==
@@ -872,7 +872,7 @@ bool WW8ListManager::ReadLVL(SwNumFmt& rNumFmt, SfxItemSet*& rpItemSet,
             break;
          default:
             // undefied value
-            ASSERT( !this, "Value of aLVL.nAlign is not supported" );
+            OSL_ENSURE( !this, "Value of aLVL.nAlign is not supported" );
             // take default
             eAdj = SVX_ADJUST_LEFT;
             break;
@@ -1033,7 +1033,6 @@ void WW8ListManager::AdjustLVL( sal_uInt8 nLevel, SwNumRule& rNumRule,
         if( !pFmt )
         {
             // --> OD 2006-06-27 #b6440955#
-//            aFont = SwNumRule::GetDefBulletFont();
             aFont = numfunc::GetDefBulletFont();
             // <--
         }
@@ -1060,7 +1059,6 @@ SwNumRule* WW8ListManager::CreateNextRule(bool bSimple)
     String sPrefix(CREATE_CONST_ASC("WW8Num"));
     sPrefix += String::CreateFromInt32(nUniqueList++);
     // --> OD 2008-06-04 #i86652#
-//    sal_uInt16 nRul = rDoc.MakeNumRule(rDoc.GetUniqueNumRuleName(&sPrefix));
     sal_uInt16 nRul =
             rDoc.MakeNumRule( rDoc.GetUniqueNumRuleName(&sPrefix), 0, FALSE,
                               SvxNumberFormat::LABEL_ALIGNMENT );
@@ -1291,7 +1289,7 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
                 // 2.2.1 eine neue NumRule fuer diese Liste anlegen
                 //
                 SwNumRule* pParentNumRule = pLFOInfo->pNumRule;
-                ASSERT(pParentNumRule, "ww: Impossible lists, please report");
+                OSL_ENSURE(pParentNumRule, "ww: Impossible lists, please report");
                 if( !pParentNumRule )
                     break;
                 // Nauemsprefix aufbauen: fuer NumRule-Name (eventuell)
@@ -1518,7 +1516,6 @@ SwNumRule* WW8ListManager::GetNumRuleForActivation(sal_uInt16 nLFOPosition,
 
     // #i25545#
     // --> OD 2009-03-12 #i100132# - a number format does not have to exist on given list level
-//    SwNumFmt pFmt(*(pLFOInfo->pNumRule->GetNumFmt(nLevel)));
     SwNumFmt pFmt(pLFOInfo->pNumRule->Get(nLevel));
     // <--
     if (rReader.IsRightToLeft() && nLastLFOPosition != nLFOPosition) {
@@ -1569,7 +1566,7 @@ SwNumRule* WW8ListManager::GetNumRuleForActivation(sal_uInt16 nLFOPosition,
     if (pLFOInfo->bOverride && nLevel < pLFOInfo->nLfoLvl)
     {
         WW8LSTInfo* pParentListInfo = GetLSTByListId(pLFOInfo->nIdLst);
-        ASSERT(pParentListInfo, "ww: Impossible lists, please report");
+        OSL_ENSURE(pParentListInfo, "ww: Impossible lists, please report");
         if (pParentListInfo && pParentListInfo->pNumRule)
         {
             const WW8LFOLVL &rOverride = pLFOInfo->maOverrides[nLevel];
@@ -1633,7 +1630,7 @@ bool SwWW8ImplReader::SetTxtFmtCollAndListLevel(const SwPaM& rRg,
         bRes = rDoc.SetTxtFmtColl(rRg, (SwTxtFmtColl*)rStyleInfo.pFmt)
             ? true : false;
         SwTxtNode* pTxtNode = pPaM->GetNode()->GetTxtNode();
-        ASSERT( pTxtNode, "No Text-Node at PaM-Position" );
+        OSL_ENSURE( pTxtNode, "No Text-Node at PaM-Position" );
         // --> OD 2006-10-19 #134160# - make code robust
         if ( !pTxtNode )
         {
@@ -1666,8 +1663,6 @@ bool SwWW8ImplReader::SetTxtFmtCollAndListLevel(const SwPaM& rRg,
             // could contain more than one outline numbering rule and the one
             // of the text format isn't the one, which a chosen as the Writer
             // outline rule.
-//            pTxtNode->
-//                SetLevel(((SwTxtFmtColl*) rStyleInfo.pFmt)->GetOutlineLevel());
             pTxtNode->SetAttrListLevel( rStyleInfo.nOutlineLevel );
             // <--
         }
@@ -1720,7 +1715,7 @@ void SwWW8ImplReader::SetStylesList(sal_uInt16 nStyle, sal_uInt16 nActLFO,
     SwWW8StyInf &rStyleInf = pCollA[nStyle];
     if (rStyleInf.bValid)
     {
-        ASSERT(pAktColl, "Cannot be called outside of style import");
+        OSL_ENSURE(pAktColl, "Cannot be called outside of style import");
         // Phase 1: Nummerierungsattribute beim Einlesen einer StyleDef
         if( pAktColl )
         {
@@ -1803,7 +1798,7 @@ void SwWW8ImplReader::RegisterNumFmtOnTxtNode(sal_uInt16 nActLFO,
     {
         std::vector<sal_uInt8> aParaSprms;
         SwTxtNode* pTxtNd = pPaM->GetNode()->GetTxtNode();
-        ASSERT(pTxtNd, "Kein Text-Node an PaM-Position");
+        OSL_ENSURE(pTxtNd, "Kein Text-Node an PaM-Position");
 
         const SwNumRule* pRule = bSetAttr ?
             pLstManager->GetNumRuleForActivation( nActLFO, nActLevel,
@@ -1845,11 +1840,6 @@ void SwWW8ImplReader::RegisterNumFmtOnTxtNode(sal_uInt16 nActLFO,
                 }
             }
             // --> OD 2005-10-17 #126238#
-            // - re-introduce fix for issue #i49037#, which got lost by
-            // accident on a re-synchronisation on the master.
-//            if (pTxtNd->IsOutline() && pTxtNd->Len() == 0)
-//                pTxtNd->SetCounted(false);
-            // <--
 
             pTxtNd->SetAttrListLevel(nActLevel);
             // --> OD 2005-11-01 #126924#
@@ -1880,7 +1870,7 @@ void SwWW8ImplReader::RegisterNumFmtOnTxtNode(sal_uInt16 nActLFO,
                         RES_LR_SPACE);
                 const SvxLRSpaceItem *pItem = (const SvxLRSpaceItem*)(
                     GetFmtAttr(RES_LR_SPACE));
-                ASSERT(pItem, "impossible");
+                OSL_ENSURE(pItem, "impossible");
                 if (pItem)
                     aListIndent.Put(*pItem);
 
@@ -1907,7 +1897,7 @@ void SwWW8ImplReader::RegisterNumFmtOnTxtNode(sal_uInt16 nActLFO,
 
                 const SvxLRSpaceItem *pLR =
                     HasItem<SvxLRSpaceItem>(aListIndent, RES_LR_SPACE);
-                ASSERT(pLR, "Impossible");
+                OSL_ENSURE(pLR, "Impossible");
                 if (pLR)
                 {
                     pCtrlStck->NewAttr(*pPaM->GetPoint(), *pLR);
@@ -2014,10 +2004,6 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const sal_uInt8* pData,
             else if (SwTxtNode* pTxtNode = pPaM->GetNode()->GetTxtNode())
             {
                 // --> OD 2005-10-21 #i54393#
-                // - Reset hard set numbering rule at paragraph instead of
-                //   setting hard no numbering.
-//                pTxtNode->SwCntntNode::SetAttr
-//                    (*GetDfltAttr(RES_PARATR_NUMRULE));
                 pTxtNode->ResetAttr( RES_PARATR_NUMRULE );
                 // <--
                 pTxtNode->SetCountedInList(false);
@@ -2226,7 +2212,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich,
                 nChecked = false;
                 break;
             default:
-                ASSERT(!this, "unknown option, please report to cmc");
+                OSL_ENSURE(!this, "unknown option, please report to cmc");
                 break;
         }
     }
@@ -2287,7 +2273,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich,
                 bAllOk = false;
             *pDataStream >> nNoStrings;
         }
-        ASSERT(bAllOk,
+        OSL_ENSURE(bAllOk,
             "Unknown formfield dropdown list structure. Report to cmc");
         if (!bAllOk)    //Not as expected, don't risk it at all.
             nNoStrings = 0;
@@ -2338,7 +2324,7 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const String &rString,
     {
         bool bSet = true;
         const SfxPoolItem* pItem = GetFmtAttr( pMap->nWhichId );
-        ASSERT(pItem, "Impossible");
+        OSL_ENSURE(pItem, "Impossible");
         if (!pItem)
             continue;
 
@@ -2431,7 +2417,7 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const String &rString,
     }
     // now calculate the size of the control
     OutputDevice* pOut = Application::GetDefaultDevice();
-    ASSERT(pOut, "Impossible");
+    OSL_ENSURE(pOut, "Impossible");
     if (pOut)
     {
         pOut->Push( PUSH_FONT | PUSH_MAPMODE );
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index f9b8204d3b2d..50aa763267ba 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -75,7 +75,6 @@ struct OLE_MFP
 
 using namespace ::com::sun::star;
 
-// SV_IMPL_OP_PTRARR_SORT(WW8AuthorInfos, WW8AuthorInfo_Ptr)
 SV_IMPL_OP_PTRARR_SORT(WW8OleMaps, WW8OleMap_Ptr)
 
 static bool SwWw8ReadScaling(long& rX, long& rY, SvStorageRef& rSrc1)
@@ -99,7 +98,7 @@ static bool SwWw8ReadScaling(long& rX, long& rY, SvStorageRef& rSrc1)
     pS->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
     pS->Seek( STREAM_SEEK_TO_END );
 
-    ASSERT( pS->Tell() >=  76, "+OLE-PIC-Stream is shorter than 76 Byte" );
+    OSL_ENSURE( pS->Tell() >=  76, "+OLE-PIC-Stream is shorter than 76 Byte" );
 
     INT32 nOrgWidth,
           nOrgHeight,
@@ -124,7 +123,7 @@ static bool SwWw8ReadScaling(long& rX, long& rY, SvStorageRef& rSrc1)
     rY = nOrgHeight - nCropTop  - nCropBottom;
     if (10 > nScaleX || 65536 < nScaleX || 10 > nScaleY || 65536 < nScaleY)
     {
-        ASSERT( !pS, "+OLE-Scalinginformation in PIC-Stream wrong" );
+        OSL_ENSURE( !pS, "+OLE-Scalinginformation in PIC-Stream wrong" );
         return false;
     }
     else
@@ -155,23 +154,23 @@ static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp,
 
     if( pMfp->mm == 94 || pMfp->mm == 99 )
     {
-        ASSERT( !pSt, "+OLE: Falscher Metafile-Typ" );
+        OSL_ENSURE( !pSt, "+OLE: Falscher Metafile-Typ" );
         return false;
     }
     if( pMfp->mm != 8 )
     {
-        ASSERT( !pSt, "+OLE: Falscher Metafile-Typ ( nicht Anisotropic )" );
+        OSL_ENSURE( !pSt, "+OLE: Falscher Metafile-Typ ( nicht Anisotropic )" );
     }
     if( !pMfp->xExt || !pMfp->yExt )
     {
-        ASSERT( !pSt, "+OLE: Groesse von 0 ???" );
+        OSL_ENSURE( !pSt, "+OLE: Groesse von 0 ???" );
         return false;
     }
     bool bOk = ReadWindowMetafile( *pSt, rWMF, NULL ) ? true : false;   // WMF lesen
                     // *pSt >> aWMF  geht nicht ohne placable Header
     if (!bOk || pSt->GetError() || rWMF.GetActionCount() == 0)
     {
-        ASSERT( !pSt, "+OLE: Konnte Metafile nicht lesen" );
+        OSL_ENSURE( !pSt, "+OLE: Konnte Metafile nicht lesen" );
         return false;
     }
 
@@ -220,7 +219,7 @@ SwFlyFrmFmt* SwWW8ImplReader::InsertOle(SdrOle2Obj &rObject,
     const SfxItemSet &rFlySet, const SfxItemSet &rGrfSet)
 {
     SfxObjectShell *pPersist = rDoc.GetPersist();
-    ASSERT(pPersist, "No persist, cannot insert objects correctly");
+    OSL_ENSURE(pPersist, "No persist, cannot insert objects correctly");
     if (!pPersist)
         return 0;
 
@@ -253,7 +252,7 @@ SwFlyFrmFmt* SwWW8ImplReader::InsertOle(SdrOle2Obj &rObject,
     ::rtl::OUString sNewName;
     bool bSuccess = aOLEObj.TransferToDoc(sNewName);
 
-    ASSERT(bSuccess, "Insert OLE failed");
+    OSL_ENSURE(bSuccess, "Insert OLE failed");
     if (bSuccess)
     {
         const SfxItemSet *pFlySet = pMathFlySet ? pMathFlySet : &rFlySet;
@@ -357,7 +356,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
     const Graphic* pGrf, const SfxItemSet* pFlySet, const Rectangle& aVisArea )
 {
     SdrObject* pRet = 0;
-    ASSERT( pStg, "ohne storage geht hier fast gar nichts!" );
+    OSL_ENSURE( pStg, "ohne storage geht hier fast gar nichts!" );
 
     ::SetProgressState( nProgress, rDoc.GetDocShell() );     // Update
 
@@ -415,11 +414,11 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
     {
         //Can't put them in headers/footers :-(
         uno::Reference< drawing::XShape > xRef;
-        ASSERT(pFormImpl, "Impossible");
+        OSL_ENSURE(pFormImpl, "Impossible");
         if (pFormImpl && pFormImpl->ReadOCXStream(xSrc1, &xRef, false))
         {
             pRet = GetSdrObjectFromXShape(xRef);
-            ASSERT(pRet, "Impossible");
+            OSL_ENSURE(pRet, "Impossible");
             if (pRet)
                 pRet->SetLogicRect(aRect);
             return pRet;
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 9d90bb5eebfc..913a03952d71 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -153,13 +153,12 @@ _ReadFieldParams::_ReadFieldParams( const String& _rData )
 
     nFnd      = nNext;
     nSavPtr   = nNext;
-//  cLastChar = aData.GetChar( nSavPtr );
 }
 
 
 _ReadFieldParams::~_ReadFieldParams()
 {
-//  aData.SetChar( nSavPtr, cLastChar );
+
 }
 
 
@@ -322,7 +321,7 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*)
     WW8PLCFx_Book* pB = pPlcxMan->GetBook();
     if( !pB )
     {
-        ASSERT( pB, "WW8PLCFx_Book - Pointer nicht da" );
+        OSL_ENSURE( pB, "WW8PLCFx_Book - Pointer nicht da" );
         return 0;
     }
 
@@ -565,7 +564,7 @@ bool SwWW8ImplReader::ForceFieldLanguage(SwField &rFld, USHORT nLang)
 
     const SvxLanguageItem *pLang =
         (const SvxLanguageItem*)GetFmtAttr(RES_CHRATR_LANGUAGE);
-    ASSERT(pLang, "impossible");
+    OSL_ENSURE(pLang, "impossible");
     USHORT nDefault =  pLang ? pLang->GetValue() : LANGUAGE_ENGLISH_US;
 
     if (nLang != nDefault)
@@ -614,7 +613,7 @@ short SwWW8ImplReader::GetTimeDatePara(String& rStr, sal_uInt32& rFormat,
     }
     RES_CHRATR eLang = bRTL ? RES_CHRATR_CTL_LANGUAGE : RES_CHRATR_LANGUAGE;
     const SvxLanguageItem *pLang = (SvxLanguageItem*)GetFmtAttr( static_cast< USHORT >(eLang));
-    ASSERT(pLang, "impossible");
+    OSL_ENSURE(pLang, "impossible");
     rLang = pLang ? pLang->GetValue() : LANGUAGE_ENGLISH_US;
 
     SvNumberFormatter* pFormatter = rDoc.GetNumberFormatter();
@@ -654,7 +653,8 @@ short SwWW8ImplReader::GetTimeDatePara(String& rStr, sal_uInt32& rFormat,
     }
 
     ULONG nFmtIdx =
-        sw::ms::MSDateTimeFormatToSwFormat(sParams, pFormatter, rLang, bHijri);
+        sw::ms::MSDateTimeFormatToSwFormat(sParams, pFormatter, rLang, bHijri,
+                GetFib().lid);
     short nNumFmtType = NUMBERFORMAT_UNDEFINED;
     if (nFmtIdx)
         nNumFmtType = pFormatter->GetType(nFmtIdx);
@@ -669,10 +669,6 @@ short SwWW8ImplReader::GetTimeDatePara(String& rStr, sal_uInt32& rFormat,
 // Am Ende des Einlesens entsprechende Felder updaten ( z.Zt. die Referenzen )
 void SwWW8ImplReader::UpdateFields()
 {
-//  rDoc.GetSysFldType( RES_GETREFFLD )->UpdateFlds();  // Referenzen
-//  rDoc.UpdateFlds();                                  // SetExp-Fields
-//  rDoc.UpdateFlds();              // alles ???
-//  rDoc.UpdateExpFlds();                               // SetExp-Fields
     rDoc.SetUpdateExpFldStat(true);                 // JP: neu fuer alles wichtige
     rDoc.SetInitDBFields(true);             // Datenbank-Felder auch
 }
@@ -681,14 +677,14 @@ sal_uInt16 SwWW8ImplReader::End_Field()
 {
     sal_uInt16 nRet = 0;
     WW8PLCFx_FLD* pF = pPlcxMan->GetFld();
-    ASSERT(pF, "WW8PLCFx_FLD - Pointer nicht da");
+    OSL_ENSURE(pF, "WW8PLCFx_FLD - Pointer nicht da");
     if (!pF || !pF->EndPosIsFieldEnd())
         return nRet;
 
     const SvtFilterOptions* pOpt = SvtFilterOptions::Get();
     sal_Bool bUseEnhFields=(pOpt && pOpt->IsUseEnhancedFields());
 
-    ASSERT(!maFieldStack.empty(), "Empty field stack\n");
+    OSL_ENSURE(!maFieldStack.empty(), "Empty field stack\n");
     if (!maFieldStack.empty())
     {
         /*
@@ -705,8 +701,8 @@ sal_uInt16 SwWW8ImplReader::End_Field()
             SwPaM aFldPam( maFieldStack.back().GetPtNode(), maFieldStack.back().GetPtCntnt(), aEndPos.nNode, aEndPos.nContent.GetIndex());
             IDocumentMarkAccess* pMarksAccess = rDoc.getIDocumentMarkAccess( );
             IFieldmark *pFieldmark = dynamic_cast<IFieldmark*>( pMarksAccess->makeFieldBookmark(
-                        aFldPam, maFieldStack.back().GetBookmarkName(), ::rtl::OUString::createFromAscii(ODF_FORMTEXT ) ) );
-            ASSERT(pFieldmark!=NULL, "hmmm; why was the bookmark not created?");
+                        aFldPam, maFieldStack.back().GetBookmarkName(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMTEXT )) ) );
+            OSL_ENSURE(pFieldmark!=NULL, "hmmm; why was the bookmark not created?");
             if (pFieldmark!=NULL) {
                 const IFieldmark::parameter_map_t& pParametersToAdd = maFieldStack.back().getParameters();
                 pFieldmark->GetParameters()->insert(pParametersToAdd.begin(), pParametersToAdd.end());
@@ -723,7 +719,7 @@ sal_uInt16 SwWW8ImplReader::End_Field()
             SwPosition aEndPos = *pPaM->GetPoint();
             SwPaM aFldPam( maFieldStack.back().GetPtNode(), maFieldStack.back().GetPtCntnt(), aEndPos.nNode, aEndPos.nContent.GetIndex());
             SwFieldBookmark *pFieldmark=(SwFieldBookmark*)rDoc.makeFieldBookmark(aFldPam, maFieldStack.back().GetBookmarkName(), maFieldStack.back().GetBookmarkType());
-            ASSERT(pFieldmark!=NULL, "hmmm; why was the bookmark not created?");
+            OSL_ENSURE(pFieldmark!=NULL, "hmmm; why was the bookmark not created?");
             if (pFieldmark!=NULL) {
                 const IFieldmark::parameter_map_t& pParametersToAdd = maFieldStack.back().getParameters();
                 pFieldmark->GetParameters()->insert(pParameters.begin(), pParameters.end());
@@ -755,7 +751,7 @@ sal_uInt16 SwWW8ImplReader::End_Field()
                     IFieldmark* pFieldmark = pMarksAccess->makeFieldBookmark(
                                 aFldPam,
                                 maFieldStack.back().GetBookmarkName(),
-                                rtl::OUString::createFromAscii( ODF_UNHANDLED ) );
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ODF_UNHANDLED )) );
                     if ( pFieldmark )
                     {
                         const IFieldmark::parameter_map_t& pParametersToAdd = maFieldStack.back().getParameters();
@@ -763,11 +759,11 @@ sal_uInt16 SwWW8ImplReader::End_Field()
                         rtl::OUString sFieldId = rtl::OUString::valueOf( sal_Int32( maFieldStack.back().mnFieldId ) );
                         pFieldmark->GetParameters()->insert(
                                 std::pair< rtl::OUString, uno::Any > (
-                                    rtl::OUString::createFromAscii( ODF_ID_PARAM ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ODF_ID_PARAM )),
                                     uno::makeAny( sFieldId ) ) );
                         pFieldmark->GetParameters()->insert(
                                 std::pair< rtl::OUString, uno::Any > (
-                                    rtl::OUString::createFromAscii( ODF_CODE_PARAM ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ODF_CODE_PARAM )),
                                     uno::makeAny( aCode ) ) );
 
                         if ( maFieldStack.back().mnObjLocFc > 0 )
@@ -800,7 +796,7 @@ sal_uInt16 SwWW8ImplReader::End_Field()
                             // Store the OLE Id as a parameter
                             pFieldmark->GetParameters()->insert(
                                     std::pair< rtl::OUString, uno::Any >(
-                                        rtl::OUString::createFromAscii( ODF_OLE_PARAM ),
+                                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ODF_OLE_PARAM )),
                                         uno::makeAny( rtl::OUString( sOleId ) ) ) );
                         }
 
@@ -1007,11 +1003,11 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
         &SwWW8ImplReader::Read_F_Shape,             // 95
         0                                           // eMax - Dummy leer Methode
     };
-    ASSERT( ( sizeof( aWW8FieldTab ) / sizeof( *aWW8FieldTab ) == eMax+1 ),
+    OSL_ENSURE( ( sizeof( aWW8FieldTab ) / sizeof( *aWW8FieldTab ) == eMax+1 ),
             "FeldFunc-Tabelle stimmt nicht" );
 
     WW8PLCFx_FLD* pF = pPlcxMan->GetFld();
-    ASSERT(pF, "WW8PLCFx_FLD - Pointer nicht da");
+    OSL_ENSURE(pF, "WW8PLCFx_FLD - Pointer nicht da");
 
     if (!pF || !pF->StartPosIsFieldStart())
         return 0;
@@ -1031,7 +1027,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
     WW8FieldDesc aF;
     bool bOk = pF->GetPara(pRes->nCp2OrIdx, aF);
 
-    ASSERT(bOk, "WW8: Bad Field!\n");
+    OSL_ENSURE(bOk, "WW8: Bad Field!\n");
     if (aF.nId == 33) aF.bCodeNest=false; //#124716#: do not recurse into nested page fields
     bool bCodeNest = aF.bCodeNest;
     if ( aF.nId == 6 ) bCodeNest = false; // We can handle them and loose the inner data
@@ -1388,7 +1384,7 @@ the appropiate set/ask field.
 long SwWW8ImplReader::MapBookmarkVariables(const WW8FieldDesc* pF,
     String &rOrigName, const String &rData)
 {
-    ASSERT(pPlcxMan,"No pPlcxMan");
+    OSL_ENSURE(pPlcxMan,"No pPlcxMan");
     long nNo;
     /*
     If there was no bookmark associated with this set field, then we create a
@@ -1453,7 +1449,7 @@ SwFltStackEntry *SwWW8FltRefStack::RefToVar(const SwField* pFld,
 String SwWW8ImplReader::GetMappedBookmark(const String &rOrigName)
 {
     String sName(BookmarkToWriter(rOrigName));
-    ASSERT(pPlcxMan,"no pPlcxMan");
+    OSL_ENSURE(pPlcxMan,"no pPlcxMan");
     pPlcxMan->GetBook()->MapName(sName);
 
     //See if there has been a variable set with this name, if so get
@@ -1724,13 +1720,6 @@ eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc* pF, String& rStr )
 
         if( !bFldFound )
         {
-/*
-            SwUserFieldType aTmp( &rDoc, aDocProperty );
-            aTmp.SetContent(GetFieldResult( pF ));
-            SwUserField aUFld( (SwUserFieldType*)rDoc.InsertFldType( aTmp ));
-            aUFld.ChangeFormat( UF_STRING );
-            rDoc.Insert( *pPaM, SwFmtFld( aUFld ), 0);
-*/
             SwDocInfoField aFld( (SwDocInfoFieldType*)
                 rDoc.GetSysFldType( RES_DOCINFOFLD ), DI_CUSTOM|nReg, aDocProperty, GetFieldResult( pF ) );
             rDoc.InsertPoolItem(*pPaM, SwFmtFld(aFld), 0);
@@ -1919,7 +1908,7 @@ eF_ResT SwWW8ImplReader::Read_F_FileName(WW8FieldDesc*, String &rStr)
                 aReadParam.SkipToNextToken();
                 break;
             default:
-                ASSERT(!this, "unknown option in FileName field");
+                OSL_ENSURE(!this, "unknown option in FileName field");
                 break;
         }
     }
@@ -2255,7 +2244,7 @@ eF_ResT SwWW8ImplReader::Read_F_PgRef( WW8FieldDesc*, String& rStr )
     if (1) {
     ::rtl::OUString aBookmarkName=(RTL_CONSTASCII_USTRINGPARAM("_REF"));
     maFieldStack.back().SetBookmarkName(aBookmarkName);
-    maFieldStack.back().SetBookmarkType(::rtl::OUString::createFromAscii(ODF_PAGEREF));
+    maFieldStack.back().SetBookmarkType(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_PAGEREF)));
     maFieldStack.back().AddParam(rtl::OUString(), sName);
     return FLD_TEXT;
     }
@@ -2479,11 +2468,11 @@ eF_ResT SwWW8ImplReader::Read_F_IncludeText( WW8FieldDesc* /*pF*/, String& rStr
 
     SwSection *const pSection =
         rDoc.InsertSwSection(*pPaM, aSection, 0, 0, false);
-    ASSERT(pSection, "no section inserted");
+    OSL_ENSURE(pSection, "no section inserted");
     if (!pSection)
         return FLD_TEXT;
     const SwSectionNode* pSectionNode = pSection->GetFmt()->GetSectionNode();
-    ASSERT(pSectionNode, "no section node!");
+    OSL_ENSURE(pSectionNode, "no section node!");
     if (!pSectionNode)
         return FLD_TEXT;
 
@@ -2815,7 +2804,6 @@ bool SwWW8ImplReader::AddExtraOutlinesAsExtraStyles(SwTOXBase& rBase)
             sal_uInt16 nStyleLevel = rSI.nOutlineLevel;
             sal_uInt16 nMaxLevel = rBase.GetLevel();
             if (
-                 //nStyleLevel != pFmt->GetOutlineLevel() &&        //#outline level,zhaojianwei
                  nStyleLevel != (pFmt->GetAttrOutlineLevel()-1) &&  //<-end,zhaojianwei
                  nStyleLevel < nMaxLevel
                )
@@ -2966,8 +2954,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr )
     if (1) {
     ::rtl::OUString aBookmarkName=(RTL_CONSTASCII_USTRINGPARAM("_TOC"));
     maFieldStack.back().SetBookmarkName(aBookmarkName);
-    maFieldStack.back().SetBookmarkType(::rtl::OUString::createFromAscii(ODF_TOC));
-//     maFieldStack.back().AddParam(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Description")), aFormula.sToolTip);
+    maFieldStack.back().SetBookmarkType(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_TOC)));
     return FLD_TEXT;
     }
 #endif
@@ -3397,7 +3384,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr )
                     }
                     break;
                 default:
-                    ASSERT(!this, "Unhandled toc options!");
+                    OSL_ENSURE(!this, "Unhandled toc options!");
                     break;
             }
         }
@@ -3405,7 +3392,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr )
     case TOX_USER:
         break;
     default:
-        ASSERT(!this, "Unhandled toc options!");
+        OSL_ENSURE(!this, "Unhandled toc options!");
         break;
     } // ToxBase fertig
 
@@ -3453,7 +3440,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr )
     //for future page/section segment insertion
     SwPaM aRegion(*pPaM);
     aRegion.Move(fnMoveBackward);
-    ASSERT(rDoc.GetCurTOX(*aRegion.GetPoint()), "Misunderstood how toc works");
+    OSL_ENSURE(rDoc.GetCurTOX(*aRegion.GetPoint()), "Misunderstood how toc works");
     if (SwTOXBase* pBase2 = (SwTOXBase*)rDoc.GetCurTOX(*aRegion.GetPoint()))
     {
         if(nIndexCols>1)
@@ -3494,8 +3481,7 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* /*pF*/, String& rStr )
     if (1) {
     ::rtl::OUString aBookmarkName=(RTL_CONSTASCII_USTRINGPARAM("_HYPERLINK"));
     maFieldStack.back().SetBookmarkName(aBookmarkName);
-    maFieldStack.back().SetBookmarkType(::rtl::OUString::createFromAscii(ODF_HYPERLINK));
-//     maFieldStack.back().AddParam(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Description")), aFormula.sToolTip);
+    maFieldStack.back().SetBookmarkType(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_HYPERLINK)));
     return FLD_TEXT;
     }
 #endif
@@ -3544,7 +3530,7 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* /*pF*/, String& rStr )
                     break;
                 case 'h':
                 case 'm':
-                    ASSERT( !this, "Auswertung fehlt noch - Daten unbekannt" );
+                    OSL_ENSURE( !this, "Auswertung fehlt noch - Daten unbekannt" );
                 case 's':   //worthless fake anchor option
                     bOptions = true;
                     break;
@@ -3553,7 +3539,7 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* /*pF*/, String& rStr )
     }
 
     // das Resultat uebernehmen
-    ASSERT((sURL.Len() || sMark.Len()), "WW8: Empty URL")
+   OSL_ENSURE((sURL.Len() || sMark.Len()), "WW8: Empty URL");
 
     if( sMark.Len() )
         ( sURL += INET_MARK_TOKEN ) += sMark;
@@ -3614,7 +3600,7 @@ void lcl_ImportTox(SwDoc &rDoc, SwPaM &rPaM, const String &rStr, bool bIdx)
             break;
         }
 
-    ASSERT( rDoc.GetTOXTypeCount( eTox ), "Doc.GetTOXTypeCount() == 0  :-(" );
+    OSL_ENSURE( rDoc.GetTOXTypeCount( eTox ), "Doc.GetTOXTypeCount() == 0  :-(" );
 
     const SwTOXType* pT = rDoc.GetTOXType( eTox, 0 );
     SwTOXMark aM( pT );
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 794c3d145316..ecc1a3dc34e3 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -178,7 +178,7 @@ void wwSection::SetDirection()
     switch (maSep.wTextFlow)
     {
         default:
-            ASSERT(!this, "Unknown layout type");
+            OSL_ENSURE(!this, "Unknown layout type");
         case 0:
             meDir=FRMDIR_HORI_LEFT_TOP;
             break;
@@ -253,7 +253,7 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt &rFmt, const wwSection &rSection)
             eType = GRID_NONE;
             break;
         default:
-            ASSERT(!this, "Unknown grid type");
+            OSL_ENSURE(!this, "Unknown grid type");
         case 3:
             eType = GRID_LINES_CHARS;
             aGrid.SetSnapToChars(sal_True);
@@ -313,10 +313,6 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt &rFmt, const wwSection &rSection)
     aGrid.SetLines(writer_cast<sal_uInt16>(nTextareaHeight/nLinePitch));
     aGrid.SetBaseHeight(writer_cast<sal_uInt16>(nLinePitch));
 
-    // ruby height is not supported in ww8
-    //sal_Int32 nRubyHeight = nLinePitch - nCharWidth;
-    //if (nRubyHeight < 0)
-    //    nRubyHeight = 0;
     sal_Int32 nRubyHeight = 0;
     aGrid.SetRubyHeight(writer_cast<sal_uInt16>(nRubyHeight));
 
@@ -690,7 +686,7 @@ SwSectionFmt *wwSectionManager::InsertSection(
 
     rSection.mpSection =
         mrReader.rDoc.InsertSwSection( rMyPaM, aSection, 0, & aSet );
-    ASSERT(rSection.mpSection, "section not inserted!");
+    OSL_ENSURE(rSection.mpSection, "section not inserted!");
     if (!rSection.mpSection)
         return 0;
 
@@ -702,7 +698,7 @@ SwSectionFmt *wwSectionManager::InsertSection(
             break;
     }
 
-    ASSERT(pPage, "no page outside this section!");
+    OSL_ENSURE(pPage, "no page outside this section!");
 
     if (!pPage)
         pPage = &mrReader.rDoc._GetPageDesc(0);
@@ -711,7 +707,7 @@ SwSectionFmt *wwSectionManager::InsertSection(
         return 0;
 
     SwSectionFmt *pFmt = rSection.mpSection->GetFmt();
-    ASSERT(pFmt, "impossible");
+    OSL_ENSURE(pFmt, "impossible");
     if (!pFmt)
         return 0;
 
@@ -820,7 +816,7 @@ void wwSectionManager::CreateSep(const long nTxtPos, bool /*bMustHaveBreak*/)
         return;
 
     WW8PLCFx_SEPX* pSep = mrReader.pPlcxMan->GetSepPLCF();
-    ASSERT(pSep, "impossible!");
+    OSL_ENSURE(pSep, "impossible!");
     if (!pSep)
         return;
 
@@ -937,7 +933,7 @@ void wwSectionManager::CreateSep(const long nTxtPos, bool /*bMustHaveBreak*/)
                 //sprmSDxaColWidth
                 const BYTE* pSW = pSep->HasSprm( (eVer <= ww::eWW7 ? 136 : 0xF203), BYTE( i ) );
 
-                ASSERT( pSW, "+Sprm 136 (bzw. 0xF203) (ColWidth) fehlt" );
+                OSL_ENSURE( pSW, "+Sprm 136 (bzw. 0xF203) (ColWidth) fehlt" );
                 sal_uInt16 nWidth = pSW ? SVBT16ToShort(pSW + 1) : 1440;
 
                 aNewSection.maSep.rgdxaColumnWidthSpacing[++nIdx] = nWidth;
@@ -947,7 +943,7 @@ void wwSectionManager::CreateSep(const long nTxtPos, bool /*bMustHaveBreak*/)
                     //sprmSDxaColSpacing
                     const BYTE* pSD = pSep->HasSprm( (eVer <= ww::eWW7 ? 137 : 0xF204), BYTE( i ) );
 
-                    ASSERT( pSD, "+Sprm 137 (bzw. 0xF204) (Colspacing) fehlt" );
+                    OSL_ENSURE( pSD, "+Sprm 137 (bzw. 0xF204) (Colspacing) fehlt" );
                     if( pSD )
                     {
                         nWidth = SVBT16ToShort(pSD + 1);
@@ -1234,12 +1230,6 @@ static bool _SetWW8_BRC(bool bVer67, WW8_BRC& rVar, const BYTE* pS)
 BYTE lcl_ReadBorders(bool bVer67, WW8_BRC* brc, WW8PLCFx_Cp_FKP* pPap,
     const WW8RStyle* pSty, const WW8PLCFx_SEPX* pSep)
 {
-// Ausgegend von diesen defines:
-//      #define WW8_TOP 0
-//      #define WW8_LEFT 1
-//      #define WW8_BOT 2
-//      #define WW8_RIGHT 3
-//      #define WW8_BETW 4
 
 //returns a BYTE filled with a bit for each position that had a sprm
 //setting that border
@@ -1281,7 +1271,7 @@ BYTE lcl_ReadBorders(bool bVer67, WW8_BRC* brc, WW8PLCFx_Cp_FKP* pPap,
                 nBorder |= (_SetWW8_BRC( bVer67, brc[ i ], pSty->HasParaSprm( *pIds )))<<i;
         }
         else {
-            ASSERT( pSty || pPap, "WW8PLCFx_Cp_FKP and WW8RStyle "
+            OSL_ENSURE( pSty || pPap, "WW8PLCFx_Cp_FKP and WW8RStyle "
                                "and WW8PLCFx_SEPX is 0" );
         }
     }
@@ -1908,7 +1898,7 @@ bool WW8FlyPara::IsEmpty() const
      #107103# if wrong, so given that the empty is 2, if we are 0 then set
      empty to 0 to make 0 equiv to 2 for empty checking
     */
-    ASSERT(aEmpty.nSp37 == 2, "this is not what we expect for nSp37");
+    OSL_ENSURE(aEmpty.nSp37 == 2, "this is not what we expect for nSp37");
     if (this->nSp37 == 0)
         aEmpty.nSp37 = 0;
     if (aEmpty == *this)
@@ -2346,7 +2336,7 @@ void SwWW8ImplReader::MoveInsideFly(const SwFrmFmt *pFlyFmt)
 
     // Setze Pam in den FlyFrame
     const SwFmtCntnt& rCntnt = pFlyFmt->GetCntnt();
-    ASSERT( rCntnt.GetCntntIdx(), "Kein Inhalt vorbereitet." );
+    OSL_ENSURE( rCntnt.GetCntntIdx(), "Kein Inhalt vorbereitet." );
     pPaM->GetPoint()->nNode = rCntnt.GetCntntIdx()->GetIndex() + 1;
     pPaM->GetPoint()->nContent.Assign( pPaM->GetCntntNode(), 0 );
 
@@ -2421,7 +2411,7 @@ WW8FlyPara *SwWW8ImplReader::ConstructApo(const ApoTestResults &rApo,
     const WW8_TablePos *pTabPos)
 {
     WW8FlyPara *pRet = 0;
-    ASSERT(rApo.HasFrame() || pTabPos,
+    OSL_ENSURE(rApo.HasFrame() || pTabPos,
         "If no frame found, *MUST* be in a table");
 
     pRet = new WW8FlyPara(bVer67, rApo.mpStyleApo);
@@ -2499,7 +2489,7 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults &rApo,
 
         pSFlyPara->pFlyFmt = rDoc.MakeFlySection( pSFlyPara->eAnchor,
             pPaM->GetPoint(), &aFlySet );
-        ASSERT(pSFlyPara->pFlyFmt->GetAnchor().GetAnchorId() ==
+        OSL_ENSURE(pSFlyPara->pFlyFmt->GetAnchor().GetAnchorId() ==
             pSFlyPara->eAnchor, "Not the anchor type requested!");
 
         if (pSFlyPara->pFlyFmt)
@@ -2569,7 +2559,7 @@ bool SwWW8ImplReader::JoinNode(SwPaM &rPam, bool bStealAttr)
 
 void SwWW8ImplReader::StopApo()
 {
-    ASSERT(pWFlyPara, "no pWFlyPara to close");
+    OSL_ENSURE(pWFlyPara, "no pWFlyPara to close");
     if (!pWFlyPara)
         return;
     if (pWFlyPara->bGrafApo)
@@ -2583,8 +2573,8 @@ void SwWW8ImplReader::StopApo()
     {
         if (!pSFlyPara->pMainTextPos || !pWFlyPara)
         {
-            ASSERT( pSFlyPara->pMainTextPos, "StopApo: pMainTextPos ist 0" );
-            ASSERT( pWFlyPara, "StopApo: pWFlyPara ist 0" );
+            OSL_ENSURE( pSFlyPara->pMainTextPos, "StopApo: pMainTextPos ist 0" );
+            OSL_ENSURE( pWFlyPara, "StopApo: pWFlyPara ist 0" );
             return;
         }
 
@@ -2695,7 +2685,7 @@ bool SwWW8ImplReader::TestSameApo(const ApoTestResults &rApo,
 {
     if( !pWFlyPara )
     {
-        ASSERT( pWFlyPara, " Wo ist mein pWFlyPara ? " );
+        OSL_ENSURE( pWFlyPara, " Wo ist mein pWFlyPara ? " );
         return true;
     }
 
@@ -2726,7 +2716,7 @@ void SwWW8ImplReader::NewAttr( const SfxPoolItem& rAttr,
     {
         if (pAktColl)
         {
-            ASSERT(rAttr.Which() != RES_FLTR_REDLINE, "redline in style!");
+            OSL_ENSURE(rAttr.Which() != RES_FLTR_REDLINE, "redline in style!");
             pAktColl->SetFmtAttr(rAttr);
         }
         else if (pAktItemSet)
@@ -3034,7 +3024,7 @@ void SwWW8ImplReader::Read_BoldBiDiUsw(USHORT nId, const BYTE* pData,
     else
         nI = static_cast< BYTE >(nId - 0x085C);
 
-    ASSERT(nI <= 1, "not happening");
+    OSL_ENSURE(nI <= 1, "not happening");
     if (nI > 1)
         return;
 
@@ -3106,7 +3096,7 @@ void SwWW8ImplReader::SetToggleBiDiAttr(BYTE nAttrId, bool bOn)
             }
             break;
         default:
-            ASSERT(!this, "Unhandled unknown bidi toggle attribute");
+            OSL_ENSURE(!this, "Unhandled unknown bidi toggle attribute");
             break;
 
     }
@@ -3157,7 +3147,7 @@ void SwWW8ImplReader::SetToggleAttr(BYTE nAttrId, bool bOn)
                                                 : STRIKEOUT_NONE, RES_CHRATR_CROSSEDOUT ) );
             break;
         default:
-            ASSERT(!this, "Unhandled unknown toggle attribute");
+            OSL_ENSURE(!this, "Unhandled unknown toggle attribute");
             break;
     }
 }
@@ -3304,7 +3294,7 @@ void SwWW8ImplReader::Read_SubSuperProp( USHORT, const BYTE* pData, short nLen )
     INT32 nPos2 = nPos * ( 10 * 100 );      // HalfPoints in 100 * tw
     const SvxFontHeightItem* pF
         = (const SvxFontHeightItem*)GetFmtAttr(RES_CHRATR_FONTSIZE);
-    ASSERT(pF, "Expected to have the fontheight available here");
+    OSL_ENSURE(pF, "Expected to have the fontheight available here");
 
     // #i59022: Check ensure nHeight != 0. Div by zero otherwise.
     INT32 nHeight = 240;
@@ -3669,14 +3659,14 @@ bool SwWW8ImplReader::SetNewFontAttr(USHORT nFCode, bool bSetEnums,
 
 void SwWW8ImplReader::ResetCharSetVars()
 {
-    ASSERT(!maFontSrcCharSets.empty(),"no charset to remove");
+    OSL_ENSURE(!maFontSrcCharSets.empty(),"no charset to remove");
     if (!maFontSrcCharSets.empty())
         maFontSrcCharSets.pop();
 }
 
 void SwWW8ImplReader::ResetCJKCharSetVars()
 {
-    ASSERT(!maFontSrcCJKCharSets.empty(),"no charset to remove");
+    OSL_ENSURE(!maFontSrcCJKCharSets.empty(),"no charset to remove");
     if (!maFontSrcCJKCharSets.empty())
         maFontSrcCJKCharSets.pop();
 }
@@ -3690,18 +3680,18 @@ void SwWW8ImplReader::Read_FontCode( USHORT nId, const BYTE* pData, short nLen )
     {                       // (siehe sprmCSymbol) gesetzte Font !
         switch( nId )
         {
-    //      case 0x4a51:    //font to bias towards all else being equal ?
             case 113:
-            case 0x4a5E:
+            case 0x4A51:    //"Other" font, override with BiDi if it exists
+            case 0x4A5E:    //BiDi Font
                 nId = RES_CHRATR_CTL_FONT;
                 break;
             case 93:
             case 111:
-            case 0x4a4f:
+            case 0x4A4f:
                 nId = RES_CHRATR_FONT;
                 break;
             case 112:
-            case 0x4a50:
+            case 0x4A50:
                 nId = RES_CHRATR_CJK_FONT;
                 break;
             default:
@@ -3913,7 +3903,7 @@ void SwWW8ImplReader::Read_TxtBackColor(USHORT, const BYTE* pData, short nLen )
     }
     else
     {
-        ASSERT(nLen == 10, "Len of para back colour not 10!");
+        OSL_ENSURE(nLen == 10, "Len of para back colour not 10!");
         if (nLen != 10)
             return;
         Color aColour(ExtractColour(pData, bVer67));
@@ -4273,7 +4263,7 @@ void SwWW8ImplReader::Read_UL( USHORT nId, const BYTE* pData, short nLen )
 // im Style "Normal" eingefuegt, der
 // gar nicht da ist. Ueber das IniFlag WW8FL_NO_STY_DYA laesst sich dieses
 // Verhalten auch fuer andere WW-Versionen erzwingen
-//  ASSERT( !bStyNormal || bWWBugNormal, "+Dieses Doc deutet evtl. auf einen
+//  OSL_ENSURE( !bStyNormal || bWWBugNormal, "+Dieses Doc deutet evtl. auf einen
 // Fehler in der benutzten WW-Version hin. Wenn sich die Styles <Standard> bzw.
 // <Normal> zwischen WW und SW im Absatz- oder Zeilenabstand unterscheiden,
 // dann bitte dieses Doc SH zukommen lassen." );
@@ -4429,7 +4419,7 @@ void SwWW8ImplReader::Read_BoolItem( USHORT nId, const BYTE* pData, short nLen )
             nId = RES_PARATR_SCRIPTSPACE;
             break;
         default:
-            ASSERT( !this, "wrong Id" );
+            OSL_ENSURE( !this, "wrong Id" );
             return ;
     }
 
@@ -4575,14 +4565,14 @@ void SwWW8ImplReader::Read_TxtAnim(USHORT /*nId*/, const BYTE* pData, short nLen
 SwWW8Shade::SwWW8Shade(bool bVer67, const WW8_SHD& rSHD)
 {
     BYTE b = rSHD.GetFore();
-    ASSERT(b < 17, "ww8: colour out of range");
+    OSL_ENSURE(b < 17, "ww8: colour out of range");
     if (b >= 17)
         b = 0;
 
     ColorData nFore(SwWW8ImplReader::GetCol(b));
 
     b = rSHD.GetBack();
-    ASSERT(b < 17, "ww8: colour out of range");
+    OSL_ENSURE(b < 17, "ww8: colour out of range");
     if( b >=  17 )
         b = 0;
 
@@ -4749,7 +4739,7 @@ void SwWW8ImplReader::Read_ParaBackColor(USHORT, const BYTE* pData, short nLen)
     }
     else
     {
-        ASSERT(nLen == 10, "Len of para back colour not 10!");
+        OSL_ENSURE(nLen == 10, "Len of para back colour not 10!");
         if (nLen != 10)
             return;
         NewAttr(SvxBrushItem(Color(ExtractColour(pData, bVer67)), RES_BACKGROUND));
@@ -4758,13 +4748,14 @@ void SwWW8ImplReader::Read_ParaBackColor(USHORT, const BYTE* pData, short nLen)
 
 sal_uInt32 SwWW8ImplReader::ExtractColour(const BYTE* &rpData,
     bool
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         bVer67
 #endif
     )
 {
-    ASSERT(bVer67 == false, "Impossible");
-    //ASSERT(SVBT32ToUInt32(rpData) == 0xFF000000, "Unknown 1 not 0xff000000");
+#if OSL_DEBUG_LEVEL > 1
+    OSL_ENSURE(bVer67 == false, "Impossible");
+#endif
     sal_uInt32 nFore = wwUtility::BGRToRGB(SVBT32ToUInt32(rpData));
     rpData+=4;
     sal_uInt32 nBack = wwUtility::BGRToRGB(SVBT32ToUInt32(rpData));
@@ -4775,7 +4766,7 @@ sal_uInt32 SwWW8ImplReader::ExtractColour(const BYTE* &rpData,
     //background through, it merely acts like white
     if (nBack == 0xFF000000)
         nBack = COL_AUTO;
-    ASSERT(nBack == COL_AUTO || !(nBack & 0xFF000000),
+    OSL_ENSURE(nBack == COL_AUTO || !(nBack & 0xFF000000),
         "ww8: don't know what to do with such a transparent bg colour, report");
     SwWW8Shade aShade(nFore, nBack, nIndex);
     return aShade.aColor.GetColor();
@@ -4942,7 +4933,7 @@ void SwWW8ImplReader::Read_AlignFont( USHORT, const BYTE* pData, short nLen )
                 break;
             default:
                 nVal = SvxParaVertAlignItem::AUTOMATIC;
-                ASSERT(!this,"Unknown paragraph vertical align");
+                OSL_ENSURE(!this,"Unknown paragraph vertical align");
                 break;
         }
         NewAttr( SvxParaVertAlignItem( nVal, RES_PARATR_VERTALIGN ) );
@@ -5914,8 +5905,8 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
         {0x085B, 0},                                 //"sprmCFDiacColor"
         {0x085C, &SwWW8ImplReader::Read_BoldBiDiUsw},//"sprmCFBoldBi"
         {0x085D, &SwWW8ImplReader::Read_BoldBiDiUsw},//"sprmCFItalicBi"
-        {0x4A5E, &SwWW8ImplReader::Read_FontCode},
-        {0x485F, &SwWW8ImplReader::Read_Language},   // "sprmCLidBi"
+        {0x4A5E, &SwWW8ImplReader::Read_FontCode},   //"sprmCFtcBi"
+        {0x485F, &SwWW8ImplReader::Read_Language},   //"sprmCLidBi"
       //0x4A60, ? ? ?,                               //"sprmCIcoBi",
         {0x4A61, &SwWW8ImplReader::Read_FontSize},   //"sprmCHpsBi"
         {0xCA62, 0},                                 //"sprmCDispFldRMark"
@@ -6244,7 +6235,7 @@ short SwWW8ImplReader::ImportSprm(const BYTE* pPos,USHORT nId)
         nId = mpSprmParser->GetSprmId(pPos);
 
 #if OSL_DEBUG_LEVEL > 1
-    ASSERT( nId != 0xff, "Sprm FF !!!!" );
+    OSL_ENSURE( nId != 0xff, "Sprm FF !!!!" );
 #endif
 
     const SprmReadInfo& rSprm = GetSprmReadInfo(nId);
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 0219ae0f553c..44f8335208a8 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -40,7 +40,7 @@
 #ifdef DUMP
 
 #define ERR_SWG_READ_ERROR 1234
-#define ASSERT( a, b )
+#define OSL_ENSURE( a, b )
 
 #else                       // dump
 #include <swerror.h>        // ERR_WW6_...
@@ -57,7 +57,7 @@
 #include <stdio.h>
 
 #define ASSERT_RET_ON_FAIL( aCon, aError, aRet ) \
-    ASSERT(aCon, aError); \
+    OSL_ENSURE(aCon, aError); \
     if (!(aCon)) \
         return aRet;
 
@@ -784,7 +784,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
 
 wwSprmParser::wwSprmParser(ww::WordVersion eVersion) : meVersion(eVersion)
 {
-    ASSERT((meVersion >= ww::eWW2 && meVersion <= ww::eWW8),
+   OSL_ENSURE((meVersion >= ww::eWW2 && meVersion <= ww::eWW8),
         "Impossible value for version");
 
     mnDelta = (ww::IsSevenMinus(meVersion)) ? 0 : 1;
@@ -805,7 +805,7 @@ SprmInfo wwSprmParser::GetSprmInfo(sal_uInt16 nId) const
     const SprmInfo* pFound = mpKnownSprms->search(aSrch);
     if (pFound == 0)
     {
-        ASSERT(ww::IsEightPlus(meVersion),
+        OSL_ENSURE(ww::IsEightPlus(meVersion),
            "Unknown ww7- sprm, dangerous, report to development");
 
         aSrch.nId = 0;
@@ -897,11 +897,18 @@ void WW8SprmIter::SetSprms(const BYTE* pSprms_, long nLen_)
 
 const BYTE* WW8SprmIter::operator ++( int )
 {
-    if (nRemLen > 0)
+    if (nRemLen > 0 )
     {
-        pSprms += nAktSize;
-        nRemLen -= nAktSize;
-        UpdateMyMembers();
+        if( nRemLen >= nAktSize )
+        {
+            pSprms += nAktSize;
+            nRemLen -= nAktSize;
+            UpdateMyMembers();
+        }
+        else
+        {
+            throw( ::std::exception() );
+        }
     }
     return pSprms;
 }
@@ -1190,7 +1197,7 @@ WW8PLCFx& WW8PLCFx_PCD::operator ++( int )
     if (pPcdI)
         (*pPcdI)++;
     else {
-        ASSERT( !this, "pPcdI fehlt");
+        OSL_ENSURE( !this, "pPcdI fehlt");
     }
     return *this;
 }
@@ -1202,11 +1209,11 @@ WW8_FC WW8PLCFx_PCD::AktPieceStartCp2Fc( WW8_CP nCp )
 
     if ( !pPcdI->Get(nCpStart, nCpEnd, pData) )
     {
-        ASSERT( !this, "AktPieceStartCp2Fc() with false Cp found (1)" );
+        OSL_ENSURE( !this, "AktPieceStartCp2Fc() with false Cp found (1)" );
         return WW8_FC_MAX;
     }
 
-    ASSERT( nCp >= nCpStart && nCp < nCpEnd,
+    OSL_ENSURE( nCp >= nCpStart && nCp < nCpEnd,
         "AktPieceCp2Fc() with false Cp found (2)" );
 
     if( nCp < nCpStart )
@@ -1240,7 +1247,7 @@ WW8_CP WW8PLCFx_PCD::AktPieceStartFc2Cp( WW8_FC nStartPos )
     void* pData;
     if ( !pPcdI->Get( nCpStart, nCpEnd, pData ) )
     {
-        ASSERT( !this, "AktPieceStartFc2Cp() - Fehler" );
+        OSL_ENSURE( !this, "AktPieceStartFc2Cp() - Fehler" );
         return WW8_CP_MAX;
     }
     bool bIsUnicode = false;
@@ -1496,7 +1503,7 @@ WW8_CP WW8ScannerBase::WW8Fc2Cp( WW8_FC nFcPos ) const
             void* pData;
             if( !pPieceIter->Get( nCpStart, nCpEnd, pData ) )
             {   // ausserhalb PLCFfpcd ?
-                ASSERT( !this, "PLCFpcd-WW8Fc2Cp() ging schief" );
+                OSL_ENSURE( !this, "PLCFpcd-WW8Fc2Cp() ging schief" );
                 break;
             }
             INT32 nFcStart  = SVBT32ToUInt32( ((WW8_PCD*)pData)->fc );
@@ -1571,7 +1578,7 @@ WW8_FC WW8ScannerBase::WW8Cp2Fc(WW8_CP nCpPos, bool* pIsUnicode,
             if( pTestFlag )
                 *pTestFlag = false;
             else {
-                ASSERT( !this, "Falscher CP an WW8Cp2Fc() uebergeben" );
+                OSL_ENSURE( !this, "Falscher CP an WW8Cp2Fc() uebergeben" );
             }
             return WW8_FC_MAX;
         }
@@ -1582,7 +1589,7 @@ WW8_FC WW8ScannerBase::WW8Cp2Fc(WW8_CP nCpPos, bool* pIsUnicode,
             if( pTestFlag )
                 *pTestFlag = false;
             else {
-                ASSERT( !this, "PLCFfpcd-Get ging schief" );
+                OSL_ENSURE( !this, "PLCFfpcd-Get ging schief" );
             }
             return WW8_FC_MAX;
         }
@@ -1680,7 +1687,7 @@ WW8PLCFpcd* WW8ScannerBase::OpenPieceTable( SvStream* pStr, const WW8Fib* pWwF )
     }
     else
         *pStr >> nPLCFfLen;
-    ASSERT( 65536 > nPLCFfLen, "PLCFfpcd ueber 64 k" );
+    OSL_ENSURE( 65536 > nPLCFfLen, "PLCFfpcd ueber 64 k" );
     return new WW8PLCFpcd( pStr, pStr->Tell(), nPLCFfLen, 8 );
 }
 
@@ -1814,7 +1821,7 @@ WW8ScannerBase::WW8ScannerBase( SvStream* pSt, SvStream* pTblSt,
 
             break;
         default:
-            ASSERT( !this, "Es wurde vergessen, nVersion zu kodieren!" );
+            OSL_ENSURE( !this, "Es wurde vergessen, nVersion zu kodieren!" );
             break;
     }
 
@@ -2250,7 +2257,7 @@ bool WW8PLCFspecial::GetData(long nInIdx, WW8_CP& rPos, void*& rpValue) const
 WW8PLCF::WW8PLCF( SvStream* pSt, WW8_FC nFilePos, INT32 nPLCF, int nStruct,
     WW8_CP nStartPos ) : pPLCF_PosArray(0), nIdx(0), nStru(nStruct)
 {
-    ASSERT( nPLCF, "WW8PLCF: nPLCF ist Null!" );
+    OSL_ENSURE( nPLCF, "WW8PLCF: nPLCF ist Null!" );
 
     nIMax = ( nPLCF - 4 ) / ( 4 + nStruct );
 
@@ -2311,7 +2318,7 @@ void WW8PLCF::ReadPLCF( SvStream* pSt, WW8_FC nFilePos, INT32 nPLCF )
 
     pSt->Seek( nOldPos );
 
-    ASSERT( !failure, "Document has corrupt PLCF, ignoring it" );
+    OSL_ENSURE( !failure, "Document has corrupt PLCF, ignoring it" );
 
     if (failure)
         MakeFailedPLCF();
@@ -2328,7 +2335,7 @@ void WW8PLCF::MakeFailedPLCF()
 
 void WW8PLCF::GeneratePLCF( SvStream* pSt, INT32 nPN, INT32 ncpN )
 {
-    ASSERT( nIMax < ncpN, "Pcl.Fkp: Warum ist PLCF zu gross ?" );
+    OSL_ENSURE( nIMax < ncpN, "Pcl.Fkp: Warum ist PLCF zu gross ?" );
 
     bool failure = false;
     nIMax = ncpN;
@@ -2383,7 +2390,7 @@ void WW8PLCF::GeneratePLCF( SvStream* pSt, INT32 nPN, INT32 ncpN )
         }
     }
 
-    ASSERT( !failure, "Document has corrupt PLCF, ignoring it" );
+    OSL_ENSURE( !failure, "Document has corrupt PLCF, ignoring it" );
 
     if (failure)
         MakeFailedPLCF();
@@ -2658,7 +2665,7 @@ WW8PLCFx_Fc_FKP::WW8Fkp::WW8Fkp(ww::WordVersion eVersion, SvStream* pSt,
                     }
                     break;
                 default:
-                    ASSERT(false, "sweet god, what have you done!");
+                    OSL_ENSURE(false, "sweet god, what have you done!");
                     break;
             }
         }
@@ -2829,7 +2836,7 @@ bool WW8PLCFx_Fc_FKP::WW8Fkp::HasSprm(USHORT nId,
 //-----------------------------------------
 void WW8PLCFx::GetSprms( WW8PLCFxDesc* p )
 {
-    ASSERT( !this, "Falsches GetSprms gerufen" );
+    OSL_ENSURE( !this, "Falsches GetSprms gerufen" );
     p->nStartPos = p->nEndPos = WW8_CP_MAX;
     p->pMemPos = 0;
     p->nSprmsLen = 0;
@@ -2839,7 +2846,7 @@ void WW8PLCFx::GetSprms( WW8PLCFxDesc* p )
 
 long WW8PLCFx::GetNoSprms( WW8_CP& rStart, WW8_CP& rEnd, sal_Int32& rLen )
 {
-    ASSERT( !this, "Falsches GetNoSprms gerufen" );
+    OSL_ENSURE( !this, "Falsches GetNoSprms gerufen" );
     rStart = rEnd = WW8_CP_MAX;
     rLen = 0;
     return 0;
@@ -2900,7 +2907,7 @@ bool WW8PLCFx_Fc_FKP::NewFkp()
             break;
         default:
             // Programm-Fehler!
-            ASSERT( !this, "Es wurde vergessen, nVersion zu kodieren!" );
+            OSL_ENSURE( !this, "Es wurde vergessen, nVersion zu kodieren!" );
             return false;
     }
 
@@ -3252,6 +3259,8 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p)
         Otherwise our cool fastsave algorithm can be brought to bear on the
         problem.
         */
+        if( !pPieceIter )
+            return;
         ULONG nOldPos = pPieceIter->GetIdx();
         bool bOk = pPieceIter->SeekPos(nOrigCp);
         pPieceIter->SetIdx( nOldPos );
@@ -3353,7 +3362,7 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p)
                         {
                             if( !pPieceIter->Get( nCpStart, nCpEnd, pData ) )
                             {
-                                ASSERT( !this, "piece iter broken!" );
+                                OSL_ENSURE( !this, "piece iter broken!" );
                                 break;
                             }
                             bIsUnicode = false;
@@ -3854,7 +3863,7 @@ WW8PLCFx& WW8PLCFx_FLD::operator ++( int )
 
 bool WW8PLCFx_FLD::GetPara(long nIdx, WW8FieldDesc& rF)
 {
-    ASSERT( pPLCF, "Aufruf ohne Feld PLCFspecial" );
+    OSL_ENSURE( pPLCF, "Aufruf ohne Feld PLCFspecial" );
     if( !pPLCF )
         return false;
 
@@ -3951,7 +3960,7 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, UINT32 nStart, INT32 nLen,
         BYTE nBChar;
         if( nLen2 != nLen )
         {
-            ASSERT( nLen2 == nLen, "Fib length and read length are different" );
+            OSL_ENSURE( nLen2 == nLen, "Fib length and read length are different" );
             if (nLen > USHRT_MAX)
                 nLen = USHRT_MAX;
             else if (nLen < 2 )
@@ -4125,14 +4134,14 @@ long WW8PLCFx_Book::GetLen() const
 {
     if( nIsEnd )
     {
-        ASSERT( !this, "Falscher Aufruf (1) von PLCF_Book::GetLen()" );
+        OSL_ENSURE( !this, "Falscher Aufruf (1) von PLCF_Book::GetLen()" );
         return 0;
     }
     void * p;
     WW8_CP nStartPos;
     if( !pBook[0]->Get( nStartPos, p ) )
     {
-        ASSERT( !this, "Falscher Aufruf (2) von PLCF_Book::GetLen()" );
+        OSL_ENSURE( !this, "Falscher Aufruf (2) von PLCF_Book::GetLen()" );
         return 0;
     }
     USHORT nEndIdx = SVBT16ToShort( *((SVBT16*)p) );
@@ -4143,7 +4152,7 @@ long WW8PLCFx_Book::GetLen() const
 
 void WW8PLCFx_Book::SetStatus(USHORT nIndex, eBookStatus eStat )
 {
-    ASSERT(nIndex < nIMax, "set status of non existing bookmark!");
+    OSL_ENSURE(nIndex < nIMax, "set status of non existing bookmark!");
     pStatus[nIndex] = (eBookStatus)( pStatus[nIndex] | eStat );
 }
 
@@ -4187,7 +4196,7 @@ String WW8PLCFx_Book::GetBookmark(long nStart,long nEnd, USHORT &nIndex)
                 nEndIdx = SVBT16ToShort( *((SVBT16*)p) );
             else
             {
-                ASSERT( !this, "Bookmark-EndIdx nicht lesbar" );
+                OSL_ENSURE( !this, "Bookmark-EndIdx nicht lesbar" );
                 nEndIdx = i;
             }
 
@@ -4244,7 +4253,7 @@ bool WW8PLCFx_Book::MapName(String& rName)
             nEndIdx = SVBT16ToShort( *((SVBT16*)p) );
         else
         {
-            ASSERT( !this, "Bookmark-EndIdx nicht lesbar" );
+            OSL_ENSURE( !this, "Bookmark-EndIdx nicht lesbar" );
             nEndIdx = i;
         }
         nEndAkt = pBook[1]->GetPos( nEndIdx );
@@ -4321,7 +4330,7 @@ void WW8PLCFMan::AdjustEnds( WW8PLCFxDesc& rDesc )
 
 void WW8PLCFxDesc::ReduceByOffset()
 {
-    ASSERT((WW8_CP_MAX == nStartPos) || (nStartPos <= nEndPos),
+   OSL_ENSURE((WW8_CP_MAX == nStartPos) || (nStartPos <= nEndPos),
             "Attr-Anfang und -Ende ueber Kreuz" );
 
     if( nStartPos != WW8_CP_MAX )
@@ -4339,7 +4348,7 @@ void WW8PLCFxDesc::ReduceByOffset()
     }
     if( nEndPos != WW8_CP_MAX )
     {
-        ASSERT(nCpOfs <= nEndPos,
+        OSL_ENSURE(nCpOfs <= nEndPos,
             "oh oh, so much for the subdocument piece theory");
         nEndPos   -= nCpOfs;
     }
@@ -4360,7 +4369,7 @@ void WW8PLCFMan::GetNewNoSprms( WW8PLCFxDesc& rDesc )
     rDesc.nCp2OrIdx = rDesc.pPLCFx->GetNoSprms(rDesc.nStartPos, rDesc.nEndPos,
         rDesc.nSprmsLen);
 
-    ASSERT((WW8_CP_MAX == rDesc.nStartPos) || (rDesc.nStartPos <= rDesc.nEndPos),
+   OSL_ENSURE((WW8_CP_MAX == rDesc.nStartPos) || (rDesc.nStartPos <= rDesc.nEndPos),
             "Attr-Anfang und -Ende ueber Kreuz" );
 
     rDesc.ReduceByOffset();
@@ -4574,7 +4583,7 @@ WW8PLCFMan::~WW8PLCFMan()
 // 2. CP, wo ist naechste Attr.-Aenderung
 USHORT WW8PLCFMan::WhereIdx(bool* pbStart, long* pPos) const
 {
-    ASSERT(nPLCF,"What the hell");
+    OSL_ENSURE(nPLCF,"What the hell");
     long nNext = LONG_MAX;  // SuchReihenfolge:
     USHORT nNextIdx = nPLCF;// first ending found ( CHP, PAP, ( SEP ) ),
     bool bStart = true;     // dann Anfaenge finden ( ( SEP ), PAP, CHP )
@@ -4699,7 +4708,7 @@ void WW8PLCFMan::GetSprmEnd( short nIdx, WW8PLCFManResult* pRes ) const
         pRes->nSprmId = p->pIdStk->top();       // get end position
     else
     {
-        ASSERT( !this, "No Id on the Stack" );
+        OSL_ENSURE( !this, "No Id on the Stack" );
         pRes->nSprmId = 0;
     }
 }
@@ -4870,7 +4879,7 @@ void WW8PLCFMan::AdvSprm(short nIdx, bool bStart)
                 p->nSprmsLen = 0;
                 GetNewSprms( *p );
             }
-            ASSERT( p->nStartPos <= p->nEndPos, "Attribut ueber Kreuz" );
+            OSL_ENSURE( p->nStartPos <= p->nEndPos, "Attribut ueber Kreuz" );
         }
     }
 }
@@ -4961,7 +4970,7 @@ bool WW8PLCFMan::Get(WW8PLCFManResult* pRes) const
 
     if( nIdx >= nPLCF )
     {
-        ASSERT( !this, "Position not found" );
+        OSL_ENSURE( !this, "Position not found" );
         return true;
     }
 
@@ -4999,7 +5008,7 @@ USHORT WW8PLCFMan::GetColl() const
         return  pPap->pPLCFx->GetIstd();
     else
     {
-        ASSERT( !this, "GetColl ohne PLCF_Pap" );
+        OSL_ENSURE( !this, "GetColl ohne PLCF_Pap" );
         return 0;
     }
 }
@@ -5245,7 +5254,7 @@ WW8Fib::WW8Fib(SvStream& rSt, BYTE nWantedVersion, UINT32 nOffset)
                 nFibMin = 0;            // Programm-Fehler!
                 nFibMax = 0;
                 nFib    = 1;
-                ASSERT( !this, "Es wurde vergessen, nVersion zu kodieren!" );
+                OSL_ENSURE( !this, "Es wurde vergessen, nVersion zu kodieren!" );
                 break;
         }
         if ( (nFib < nFibMin) || (nFib > nFibMax) )
@@ -5613,11 +5622,6 @@ WW8Fib::WW8Fib(BYTE nVer)
         fExtChar = true;
         fWord97Saved = fWord2000Saved = true;
 
-        // diese Flags muessen nicht gesetzt werden; koennen aber.
-        //  wMagicCreated = wMagicRevised = 0x6a62;
-        //  wMagicCreatedPrivate = wMagicRevisedPrivate = 0xb3b2;
-        //
-
         wMagicCreated = 0x6143;
         wMagicRevised = 0x6C6F;
         wMagicCreatedPrivate = 0x6E61;
@@ -5984,7 +5988,7 @@ bool WW8Fib::Write(SvStream& rStrm)
 
 rtl_TextEncoding WW8Fib::GetFIBCharset(UINT16 chs)
 {
-    ASSERT(chs <= 0x100, "overflowed winword charset set");
+    OSL_ENSURE(chs <= 0x100, "overflowed winword charset set");
     rtl_TextEncoding eCharSet =
         (0x0100 == chs)
         ? RTL_TEXTENCODING_APPLE_ROMAN
@@ -5995,7 +5999,7 @@ rtl_TextEncoding WW8Fib::GetFIBCharset(UINT16 chs)
 WW8Style::WW8Style(SvStream& rStream, WW8Fib& rFibPara)
     : rFib(rFibPara), rSt(rStream), cstd(0), cbSTDBaseInFile(0),
     stiMaxWhenSaved(0), istdMaxFixedWhenSaved(0), nVerBuiltInNamesWhenSaved(0),
-    ftcStandardChpStsh(0), ftcStandardChpCJKStsh(0), ftcStandardChpCTLStsh(0)
+    ftcAsci(0), ftcFE(0), ftcOther(0), ftcBi(0)
 {
     nStyleStart = rFib.fcStshf;
     nStyleLen = rFib.lcbStshf;
@@ -6040,17 +6044,22 @@ WW8Style::WW8Style(SvStream& rStream, WW8Fib& rFibPara)
         rSt >> nVerBuiltInNamesWhenSaved;
 
         if( 14 > nRead ) break;
-        rSt >> ftcStandardChpStsh;
+        rSt >> ftcAsci;
 
         if( 16 > nRead ) break;
-        rSt >> ftcStandardChpCJKStsh;
+        rSt >> ftcFE;
 
         if ( 18 > nRead ) break;
-        rSt >> ftcStandardChpCTLStsh;
+        rSt >> ftcOther;
+
+        ftcBi = ftcOther;
+
+        if ( 20 > nRead ) break;
+        rSt >> ftcBi;
 
         // ggfs. den Rest ueberlesen
-        if( 18 < nRead )
-            rSt.SeekRel( nRead-18 );
+        if( 20 < nRead )
+            rSt.SeekRel( nRead-20 );
     }
     while( !this ); // Trick: obiger Block wird genau einmal durchlaufen
                     //   und kann vorzeitig per "break" verlassen werden.
@@ -6183,7 +6192,7 @@ WW8_STD* WW8Style::Read1Style( short& rSkip, String* pString, short* pcbStd )
                     }
                     break;
                 default:
-                    ASSERT(!this, "Es wurde vergessen, nVersion zu kodieren!");
+                    OSL_ENSURE(!this, "Es wurde vergessen, nVersion zu kodieren!");
                     break;
             }
         }
@@ -6264,7 +6273,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib )
     // always in ANSI, even if eStructCharSet == CHARSET_MAC !!
     if( rFib.lcbSttbfffn <= 2 )
     {
-        ASSERT( !this, "Fonttabelle kaputt! (rFib.lcbSttbfffn < 2)" );
+        OSL_ENSURE( !this, "Fonttabelle kaputt! (rFib.lcbSttbfffn < 2)" );
         pFontA = 0;
         nMax = 0;
         return;
@@ -6736,7 +6745,6 @@ WW8Dop::WW8Dop(SvStream& rSt, INT16 nFib, INT32 nPos, sal_uInt32 nSize) : bUseTh
                 a32Bit = Get_Long( pData );      // 512 0x200
 
                 // i#78591#
-                // fDontUseHTMLAutoSpacing = (a32Bit & 0x4) >> 2;
                 SetCompatabilityOptions2(a32Bit);
             }
             if (nRead >= 550)
@@ -7256,7 +7264,7 @@ USHORT WW8DopTypography::GetConvertedLang() const
             nLang = LANGUAGE_CHINESE_TRADITIONAL;
             break;
         default:
-            ASSERT(!this, "Unknown MS Asian Typography language, report");
+            OSL_ENSURE(!this, "Unknown MS Asian Typography language, report");
             nLang = LANGUAGE_CHINESE;
             break;
         case 0:
@@ -7313,7 +7321,7 @@ USHORT wwSprmParser::GetSprmTailLen(sal_uInt16 nId, const sal_uInt8* pSprm)
                     nL = static_cast< USHORT >(SVBT16ToShort( &pSprm[1 + mnDelta] ) + aSprm.nLen - 1);
                     break;
                 default:
-                    ASSERT(!this, "Unknown sprm varient");
+                    OSL_ENSURE(!this, "Unknown sprm varient");
                     break;
             }
             break;
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index db569127f84c..228d9a8d43fb 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -40,7 +40,7 @@
 #include <tools/datetime.hxx>
 #include <tools/stream.hxx>
 #include <tools/string.hxx>
-#include <errhdl.hxx>       // ASSERT()
+#include <errhdl.hxx>       // OSL_ENSURE()
 #include "hash_wrap.hxx"
 #include "sortedarray.hxx"
 
@@ -1464,11 +1464,13 @@ protected:
     UINT16  istdMaxFixedWhenSaved;     // How many fixed-index istds are there?
     UINT16  nVerBuiltInNamesWhenSaved; // Current version of built-in stylenames
     // ftc used by StandardChpStsh for this document
-    UINT16  ftcStandardChpStsh;
+    UINT16  ftcAsci;
     // CJK ftc used by StandardChpStsh for this document
-    UINT16  ftcStandardChpCJKStsh;
+    UINT16  ftcFE;
+    // CTL/Other ftc used by StandardChpStsh for this document
+    UINT16  ftcOther;
     // CTL ftc used by StandardChpStsh for this document
-    UINT16  ftcStandardChpCTLStsh;
+    UINT16  ftcBi;
 
     //No copying
     WW8Style(const WW8Style&);
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index d4cf89c76269..886056d7bc62 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -71,20 +71,20 @@ using ::com::sun::star::beans::XPropertySetInfo;
 SwDoc* lcl_GetDocViaTunnel( Reference<XTextCursor> & rCursor )
 {
     Reference<XUnoTunnel> xTunnel( rCursor, UNO_QUERY);
-    DBG_ASSERT( xTunnel.is(), "missing XUnoTunnel for Cursor" );
+    OSL_ENSURE( xTunnel.is(), "missing XUnoTunnel for Cursor" );
     OTextCursorHelper* pSwXCursor = reinterpret_cast< OTextCursorHelper * >(
             sal::static_int_cast< sal_IntPtr >(xTunnel->getSomething(OTextCursorHelper::getUnoTunnelId())) );
-    DBG_ASSERT( NULL != pSwXCursor, "OTextCursorHelper missing" );
+    OSL_ENSURE( NULL != pSwXCursor, "OTextCursorHelper missing" );
     return pSwXCursor->GetDoc();
 }
 
 SwDoc* lcl_GetDocViaTunnel( Reference<XTextRange> & rRange )
 {
     Reference<XUnoTunnel> xTunnel(rRange, UNO_QUERY);
-    DBG_ASSERT(xTunnel.is(), "Can't tunnel XTextRange");
+    OSL_ENSURE(xTunnel.is(), "Can't tunnel XTextRange");
     SwXTextRange *pRange = reinterpret_cast< SwXTextRange *>(
             sal::static_int_cast< sal_IntPtr >(xTunnel->getSomething(SwXTextRange::getUnoTunnelId())) );
-    DBG_ASSERT( NULL != pRange, "SwXTextRange missing" );
+    OSL_ENSURE( NULL != pRange, "SwXTextRange missing" );
     return pRange->GetDoc();
 }
 
@@ -157,11 +157,11 @@ void XTextRangeOrNodeIndexPosition::SetAsNodeIndex(
 
     // SwXTextRange -> PaM
     SwUnoInternalPaM aPaM(*pDoc);
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
     sal_Bool bSuccess =
 #endif
         ::sw::XTextRangeToSwPaM(aPaM, rRange);
-    DBG_ASSERT(bSuccess, "illegal range");
+    OSL_ENSURE(bSuccess, "illegal range");
 
     // PaM -> Index
     Set(aPaM.GetPoint()->nNode);
@@ -169,17 +169,17 @@ void XTextRangeOrNodeIndexPosition::SetAsNodeIndex(
 
 void XTextRangeOrNodeIndexPosition::CopyPositionInto(SwPosition& rPos)
 {
-    DBG_ASSERT(IsValid(), "Can't get Position");
+    OSL_ENSURE(IsValid(), "Can't get Position");
 
     // create PAM from start cursor (if no node index is present)
     if (NULL == pIndex)
     {
         SwUnoInternalPaM aUnoPaM(*GetDoc());
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
         sal_Bool bSuccess =
 #endif
             ::sw::XTextRangeToSwPaM(aUnoPaM, xRange);
-        DBG_ASSERT(bSuccess, "illegal range");
+        OSL_ENSURE(bSuccess, "illegal range");
 
         rPos = *aUnoPaM.GetPoint();
     }
@@ -193,7 +193,7 @@ void XTextRangeOrNodeIndexPosition::CopyPositionInto(SwPosition& rPos)
 
 SwDoc* XTextRangeOrNodeIndexPosition::GetDoc()
 {
-    DBG_ASSERT(IsValid(), "Can't get Doc");
+    OSL_ENSURE(IsValid(), "Can't get Doc");
 
     return (NULL != pIndex) ? pIndex->GetNodes().GetDoc() : lcl_GetDocViaTunnel(xRange);
 }
@@ -332,7 +332,7 @@ XMLRedlineImportHelper::~XMLRedlineImportHelper()
         // and delete the incomplete ones. Finally, delete it.
         if( IsReady(pInfo) )
         {
-            DBG_ERROR("forgotten RedlineInfo; now inserted");
+            OSL_ENSURE(false, "forgotten RedlineInfo; now inserted");
             InsertIntoDocument( pInfo );
         }
         else
@@ -341,7 +341,7 @@ XMLRedlineImportHelper::~XMLRedlineImportHelper()
             pInfo->bNeedsAdjustment = sal_False;
             if( IsReady(pInfo) )
             {
-                DBG_ERROR("RedlineInfo without adjustment; now inserted");
+                OSL_ENSURE(false, "RedlineInfo without adjustment; now inserted");
                 InsertIntoDocument( pInfo );
             }
             else
@@ -350,7 +350,7 @@ XMLRedlineImportHelper::~XMLRedlineImportHelper()
                 // (i.e. end without start, or start without
                 // end). This may well be a problem in the file,
                 // rather than the code.
-                DBG_ERROR("incomplete redline (maybe file was corrupt); "
+                OSL_ENSURE(false, "incomplete redline (maybe file was corrupt); "
                           "now deleted");
             }
         }
@@ -599,8 +599,8 @@ inline sal_Bool XMLRedlineImportHelper::IsReady(RedlineInfo* pRedline)
 
 void XMLRedlineImportHelper::InsertIntoDocument(RedlineInfo* pRedlineInfo)
 {
-    DBG_ASSERT(NULL != pRedlineInfo, "need redline info");
-    DBG_ASSERT(IsReady(pRedlineInfo), "redline info not complete yet!");
+    OSL_ENSURE(NULL != pRedlineInfo, "need redline info");
+    OSL_ENSURE(IsReady(pRedlineInfo), "redline info not complete yet!");
 
     // this method will modify the document directly -> lock SolarMutex
     SolarMutexGuard aGuard;
@@ -685,9 +685,9 @@ void XMLRedlineImportHelper::InsertIntoDocument(RedlineInfo* pRedlineInfo)
             if( nPoint < pRedlineInfo->pContentIndex->GetIndex() ||
                 nPoint > pRedlineInfo->pContentIndex->GetNode().EndOfSectionIndex() )
                 pRedline->SetContentIdx(pRedlineInfo->pContentIndex);
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
             else
-                ASSERT( false, "Recursive change tracking" );
+                OSL_ENSURE( false, "Recursive change tracking" );
 #endif
         }
 
diff --git a/sw/source/filter/xml/makefile.mk b/sw/source/filter/xml/makefile.mk
index c1191fe3faf1..10a653fc7ac0 100644
--- a/sw/source/filter/xml/makefile.mk
+++ b/sw/source/filter/xml/makefile.mk
@@ -43,51 +43,33 @@ CDEFS=$(CDEFS) -Dmydebug
 # --- Files --------------------------------------------------------
 
 SLOFILES =  \
-        $(SLO)$/swxml.obj \
-        $(SLO)$/xmlimp.obj \
-        $(SLO)$/wrtxml.obj \
-        $(SLO)$/xmlexp.obj \
-        $(SLO)$/xmltext.obj \
-        $(SLO)$/xmltexte.obj \
-        $(SLO)$/xmltexti.obj \
-        $(SLO)$/xmltbli.obj \
-        $(SLO)$/xmltble.obj \
-        $(SLO)$/xmlfmt.obj \
-        $(SLO)$/xmlfmte.obj \
-        $(SLO)$/xmlmeta.obj \
-        $(SLO)$/xmlscript.obj \
-        $(SLO)$/xmlitemm.obj \
-        $(SLO)$/xmlitemi.obj \
-        $(SLO)$/xmliteme.obj \
-        $(SLO)$/xmlithlp.obj \
-        $(SLO)$/xmlbrsh.obj \
-        $(SLO)$/xmlfonte.obj \
-        $(SLO)$/XMLRedlineImportHelper.obj \
-        $(SLO)$/xmlitem.obj	\
-        $(SLO)$/xmlitmpr.obj	\
+        $(EXCEPTIONSFILES) \
         $(SLO)$/xmlimpit.obj \
-        $(SLO)$/xmlexpit.obj
+        $(SLO)$/xmlitemm.obj \
+        $(SLO)$/xmlitmpr.obj
 
 EXCEPTIONSFILES= \
+        $(SLO)$/XMLRedlineImportHelper.obj \
         $(SLO)$/swxml.obj \
-        $(SLO)$/xmlimp.obj \
         $(SLO)$/wrtxml.obj \
+        $(SLO)$/xmlbrsh.obj \
         $(SLO)$/xmlexp.obj \
-        $(SLO)$/xmltext.obj \
-        $(SLO)$/xmltexti.obj \
-        $(SLO)$/xmltexte.obj \
-        $(SLO)$/xmltbli.obj \
-        $(SLO)$/xmltble.obj \
+        $(SLO)$/xmlexpit.obj \
         $(SLO)$/xmlfmt.obj \
         $(SLO)$/xmlfmte.obj \
-        $(SLO)$/xmlmeta.obj \
-        $(SLO)$/xmlscript.obj \
-        $(SLO)$/xmlitemi.obj \
+        $(SLO)$/xmlfonte.obj \
+        $(SLO)$/xmlimp.obj \
+        $(SLO)$/xmlitem.obj \
         $(SLO)$/xmliteme.obj \
+        $(SLO)$/xmlitemi.obj \
         $(SLO)$/xmlithlp.obj \
-        $(SLO)$/xmlbrsh.obj \
-        $(SLO)$/xmlfonte.obj \
-        $(SLO)$/XMLRedlineImportHelper.obj
+        $(SLO)$/xmlmeta.obj \
+        $(SLO)$/xmlscript.obj \
+        $(SLO)$/xmltble.obj \
+        $(SLO)$/xmltbli.obj \
+        $(SLO)$/xmltext.obj \
+        $(SLO)$/xmltexte.obj \
+        $(SLO)$/xmltexti.obj
 
 # --- Targets -------------------------------------------------------
 
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index e552d3a0bc21..a6481d9d23dd 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -255,7 +255,7 @@ sal_Int32 ReadThroughComponent(
         }
         else
         {
-            ASSERT( bMustBeSuccessfull, "Warnings are not supported" );
+            OSL_ENSURE( bMustBeSuccessfull, "Warnings are not supported" );
             return *new StringErrorInfo( ERR_FORMAT_ROWCOL, sErr,
                              ERRCODE_BUTTON_OK | ERRCODE_MSG_ERROR );
         }
@@ -445,10 +445,8 @@ void lcl_AdjustOutlineStylesForOOo( SwDoc& _rDoc )
     for ( USHORT n = 1; n < rColls.Count(); ++n )
     {
         SwTxtFmtColl* pColl = rColls[ n ];
-        //if ( pColl->GetOutlineLevel() != NO_NUMBERING )       //#outline level zhaojianwei
         if ( pColl->IsAssignedToListLevelOfOutlineStyle() )
         {
-        //  aOutlineLevelAssigned[ pColl->GetOutlineLevel() ] = true;
             aOutlineLevelAssigned[ pColl->GetAssignedOutlineStyleLevel() ] = true;//<-end,zhaojianwei
         }
 
@@ -471,14 +469,12 @@ void lcl_AdjustOutlineStylesForOOo( SwDoc& _rDoc )
         // --> OD 2007-01-11 #i73361#
         // Do not change assignment of already created default outline style
         // to a certain outline level.
-//        if ( aCreatedDefaultOutlineStyles[ i ] != 0 && !aOutlineLevelAssigned[ i ] )
         if ( !aOutlineLevelAssigned[ i ] &&
              aCreatedDefaultOutlineStyles[ i ] != 0 &&
              ! aCreatedDefaultOutlineStyles[ i ]->IsAssignedToListLevelOfOutlineStyle() )
         // <--
         {
             // apply outline level at created default outline style
-            //aCreatedDefaultOutlineStyles[ i ]->SetOutlineLevel( i );
             aCreatedDefaultOutlineStyles[ i ]->AssignToListLevelOfOutlineStyle(i);//#outline level added by zhaojianwei
 
             // apply outline numbering rule, if none is set.
@@ -541,7 +537,7 @@ ULONG XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, const S
     // Get service factory
     uno::Reference< lang::XMultiServiceFactory > xServiceFactory =
             comphelper::getProcessServiceFactory();
-    ASSERT( xServiceFactory.is(),
+    OSL_ENSURE( xServiceFactory.is(),
             "XMLReader::Read: got no service manager" );
     if( !xServiceFactory.is() )
         return ERR_SWG_READ_ERROR;
@@ -580,11 +576,11 @@ ULONG XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, const S
 
     // Get the docshell, the model, and finally the model's component
     SwDocShell *pDocSh = rDoc.GetDocShell();
-    ASSERT( pDocSh, "XMLReader::Read: got no doc shell" );
+    OSL_ENSURE( pDocSh, "XMLReader::Read: got no doc shell" );
     if( !pDocSh )
         return ERR_SWG_READ_ERROR;
     uno::Reference< lang::XComponent > xModelComp( pDocSh->GetModel(), UNO_QUERY );
-    ASSERT( xModelComp.is(),
+    OSL_ENSURE( xModelComp.is(),
             "XMLReader::Read: got no model" );
     if( !xModelComp.is() )
         return ERR_SWG_READ_ERROR;
@@ -1087,7 +1083,7 @@ USHORT XMLReader::GetSectionList( SfxMedium& rMedium,
 {
     uno::Reference< lang::XMultiServiceFactory > xServiceFactory =
             comphelper::getProcessServiceFactory();
-    ASSERT( xServiceFactory.is(),
+    OSL_ENSURE( xServiceFactory.is(),
             "XMLReader::Read: got no service manager" );
     uno::Reference < embed::XStorage > xStg2;
     if( xServiceFactory.is() && ( xStg2 = rMedium.GetStorage() ).is() )
@@ -1105,7 +1101,7 @@ USHORT XMLReader::GetSectionList( SfxMedium& rMedium,
             // get parser
             uno::Reference< XInterface > xXMLParser = xServiceFactory->createInstance(
                 OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) );
-            ASSERT( xXMLParser.is(),
+            OSL_ENSURE( xXMLParser.is(),
                 "XMLReader::Read: com.sun.star.xml.sax.Parser service missing" );
             if( xXMLParser.is() )
             {
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 5b91a2ef0966..d751eff31798 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -92,7 +92,7 @@ sal_uInt32 SwXMLWriter::_Write( SfxMedium* pTargetMedium )
     // Get service factory
     uno::Reference< lang::XMultiServiceFactory > xServiceFactory =
             comphelper::getProcessServiceFactory();
-    ASSERT( xServiceFactory.is(),
+    OSL_ENSURE( xServiceFactory.is(),
             "SwXMLWriter::Write: got no service manager" );
     if( !xServiceFactory.is() )
         return ERR_SWG_WRITE_ERROR;
@@ -105,7 +105,7 @@ sal_uInt32 SwXMLWriter::_Write( SfxMedium* pTargetMedium )
     uno::Reference< document::XEmbeddedObjectResolver > xObjectResolver;
     SvXMLEmbeddedObjectHelper *pObjectHelper = 0;
 
-    ASSERT( xStg.is(), "Where is my storage?" );
+    OSL_ENSURE( xStg.is(), "Where is my storage?" );
 pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
                                                  GRAPHICHELPER_MODE_WRITE,
                                                  sal_False );
@@ -204,35 +204,6 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
                 pStatusBarItem->GetValue() >>= xStatusIndicator;
         }
 
-//      try
-//      {
-//          uno::Reference<frame::XModel> xModel( pDoc->GetDocShell()->GetModel());
-//          if (xModel.is())
-//          {
-//              uno::Sequence< beans::PropertyValue > xMediaDescr
-//              uno::Reference<frame::XController> xController(
-//                  xModel->getCurrentController());
-//              if( xController.is())
-//              {
-//                  uno::Reference<frame::XFrame> xFrame( xController->getFrame());
-//                  if( xFrame.is())
-//                  {
-//                      uno::Reference<task::XStatusIndicatorFactory> xFactory(
-//                          xFrame, uno::UNO_QUERY );
-//                      if( xFactory.is())
-//                      {
-//                          xStatusIndicator =
-//                              xFactory->createStatusIndicator();
-//                      }
-//                  }
-//              }
-//          }
-//      }
-//      catch( const RuntimeException& )
-//      {
-//          xStatusIndicator = 0;
-//      }
-
         // set progress range and start status indicator
         sal_Int32 nProgressRange(1000000);
         if (xStatusIndicator.is())
@@ -343,7 +314,7 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
     //Get model
     uno::Reference< lang::XComponent > xModelComp(
         pDoc->GetDocShell()->GetModel(), UNO_QUERY );
-    ASSERT( xModelComp.is(), "XMLWriter::Write: got no model" );
+    OSL_ENSURE( xModelComp.is(), "XMLWriter::Write: got no model" );
     if( !xModelComp.is() )
         return ERR_SWG_WRITE_ERROR;
 
@@ -472,8 +443,6 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
     if( pDoc->GetRootFrm() && pDoc->GetDocStat().nPage > 1 &&
         !(bOrganizerMode || bBlock || bErr) )
     {
-//          DBG_ASSERT( !pDoc->GetDocStat().bModified,
-//                      "doc stat is modified!" );
         OUString sStreamName( RTL_CONSTASCII_USTRINGPARAM("layout-cache") );
         try
         {
@@ -642,9 +611,9 @@ sal_Bool SwXMLWriter::WriteThroughComponent(
     const Sequence<Any> & rArguments,
     const Sequence<PropertyValue> & rMediaDesc )
 {
-    ASSERT( xOutputStream.is(), "I really need an output stream!" );
-    ASSERT( xComponent.is(), "Need component!" );
-    ASSERT( NULL != pServiceName, "Need component name!" );
+    OSL_ENSURE( xOutputStream.is(), "I really need an output stream!" );
+    OSL_ENSURE( xComponent.is(), "Need component!" );
+    OSL_ENSURE( NULL != pServiceName, "Need component name!" );
 
     RTL_LOGFILE_CONTEXT_AUTHOR( aFilterLog, "sw", LOGFILE_AUTHOR,
                                 "SwXMLWriter::WriteThroughComponent" );
@@ -655,7 +624,7 @@ sal_Bool SwXMLWriter::WriteThroughComponent(
             String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(
                 "com.sun.star.xml.sax.Writer")) ),
         UNO_QUERY );
-    ASSERT( xSaxWriter.is(), "can't instantiate XML writer" );
+    OSL_ENSURE( xSaxWriter.is(), "can't instantiate XML writer" );
     if(!xSaxWriter.is())
         return sal_False;
 
@@ -675,7 +644,7 @@ sal_Bool SwXMLWriter::WriteThroughComponent(
     uno::Reference< document::XExporter > xExporter(
         rFactory->createInstanceWithArguments(
             OUString::createFromAscii(pServiceName), aArgs), UNO_QUERY);
-    ASSERT( xExporter.is(),
+    OSL_ENSURE( xExporter.is(),
             "can't instantiate export filter component" );
     if( !xExporter.is() )
         return sal_False;
diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx
index 807159040be4..5ff47b7cf8b6 100644
--- a/sw/source/filter/xml/xmlbrsh.cxx
+++ b/sw/source/filter/xml/xmlbrsh.cxx
@@ -228,7 +228,6 @@ void SwXMLBrushItemExport::exportXML( const SvxBrushItem& rItem )
         {
             GetExport().AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sValue );
             GetExport().AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
-    //      AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, ACP2WS(sXML_embed) );
             GetExport().AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
         }
 
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index e34873682072..d1a17c0014f5 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -195,7 +195,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
     Reference < XTextDocument > xTextDoc( GetModel(), UNO_QUERY );
     Reference < XText > xText = xTextDoc->getText();
     Reference<XUnoTunnel> xTextTunnel( xText, UNO_QUERY);
-    ASSERT( xTextTunnel.is(), "missing XUnoTunnel for Cursor" );
+    OSL_ENSURE( xTextTunnel.is(), "missing XUnoTunnel for Cursor" );
     if( !xTextTunnel.is() )
         return ERR_SWG_WRITE_ERROR;
 
@@ -221,7 +221,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
 
     SwXText *pText = reinterpret_cast< SwXText * >(
             sal::static_int_cast< sal_IntPtr >( xTextTunnel->getSomething( SwXText::getUnoTunnelId() )));
-    ASSERT( pText, "SwXText missing" );
+    OSL_ENSURE( pText, "SwXText missing" );
     if( !pText )
         return ERR_SWG_WRITE_ERROR;
 
@@ -252,7 +252,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
                 {
                     const SvXMLAttrContainerItem *pUnknown =
                                 PTR_CAST( SvXMLAttrContainerItem, pItem );
-                    ASSERT( pUnknown, "illegal attribute container item" );
+                    OSL_ENSURE( pUnknown, "illegal attribute container item" );
                     if( pUnknown && (pUnknown->GetAttrCount() > 0) )
                     {
                         sal_uInt16 nIdx = pUnknown->GetFirstNamespaceIndex();
@@ -321,7 +321,6 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
             nRef += pDoc->GetCharFmts()->Count() - 1;
             nRef += pDoc->GetFrmFmts()->Count() - 1;
             nRef += pDoc->GetTxtFmtColls()->Count() - 1;
-//          nRef += pDoc->GetPageDescCnt();
             nRef *= 2; // for the above styles, xmloff will increment by 2!
             // #i93174#: count all paragraphs for the progress bar
             nRef += aDocStat.nAllPara; // 1: only content, no autostyle
@@ -413,7 +412,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
     if( pEmbeddedResolver )
         SvXMLEmbeddedObjectHelper::Destroy( pEmbeddedResolver );
 
-    ASSERT( !pTableLines, "there are table columns infos left" );
+    OSL_ENSURE( !pTableLines, "there are table columns infos left" );
 
     return nRet;
 }
@@ -453,7 +452,7 @@ void SwXMLExport::GetViewSettings(Sequence<PropertyValue>& aProps)
 {
     Reference< XMultiServiceFactory > xServiceFactory =
             comphelper::getProcessServiceFactory();
-    ASSERT( xServiceFactory.is(),
+    OSL_ENSURE( xServiceFactory.is(),
             "XMLReader::Read: got no service manager" );
     if( !xServiceFactory.is() )
         return;
@@ -479,12 +478,12 @@ void SwXMLExport::GetViewSettings(Sequence<PropertyValue>& aProps)
         Reference < XTextDocument > xTextDoc( GetModel(), UNO_QUERY );
         xText = xTextDoc->getText();
         Reference<XUnoTunnel> xTextTunnel( xText, UNO_QUERY);
-        ASSERT( xTextTunnel.is(), "missing XUnoTunnel for Cursor" );
+        OSL_ENSURE( xTextTunnel.is(), "missing XUnoTunnel for Cursor" );
         if( xTextTunnel.is() )
         {
             pText = reinterpret_cast< SwXText * >(
                     sal::static_int_cast< sal_IntPtr >( xTextTunnel->getSomething( SwXText::getUnoTunnelId()) ));
-            ASSERT( pText, "SwXText missing" );
+            OSL_ENSURE( pText, "SwXText missing" );
         }
     }
 
@@ -499,7 +498,7 @@ void SwXMLExport::GetViewSettings(Sequence<PropertyValue>& aProps)
         pDoc->GetDocShell()->GetVisArea( ASPECT_CONTENT );
     sal_Bool bTwip = pDoc->GetDocShell()->GetMapUnit ( ) == MAP_TWIP;
 
-    ASSERT ( bTwip, "Map unit for visible area is not in TWIPS!" );
+   OSL_ENSURE( bTwip, "Map unit for visible area is not in TWIPS!" );
 
     pValue[nIndex].Name = OUString( RTL_CONSTASCII_USTRINGPARAM ( "ViewAreaTop") );
     pValue[nIndex++].Value <<= bTwip ? TWIP_TO_MM100 ( rRect.Top() ) : rRect.Top();
@@ -575,12 +574,12 @@ void SwXMLExport::SetBodyAttributes()
     // export use of soft page breaks
     {
         Reference<XUnoTunnel> xTextTunnel( xText, UNO_QUERY);
-        ASSERT( xTextTunnel.is(), "missing XUnoTunnel for Cursor" );
+        OSL_ENSURE( xTextTunnel.is(), "missing XUnoTunnel for Cursor" );
         if( xTextTunnel.is() )
         {
             SwXText *pText = reinterpret_cast< SwXText * >(
                     sal::static_int_cast< sal_IntPtr >( xTextTunnel->getSomething( SwXText::getUnoTunnelId() )));
-            ASSERT( pText, "SwXText missing" );
+            OSL_ENSURE( pText, "SwXText missing" );
             if( pText )
             {
                 SwDoc *pDoc = pText->GetDoc();
@@ -813,9 +812,6 @@ Reference< XInterface > SAL_CALL SwXMLExportStyles_createInstance(
     throw( Exception )
 {
     // #110680#
-    //return (cppu::OWeakObject*)new SwXMLExport(
-    //  EXPORT_STYLES | EXPORT_MASTERSTYLES | EXPORT_AUTOSTYLES |
-    //  EXPORT_FONTDECLS );
     return (cppu::OWeakObject*)new SwXMLExport( rSMgr,
         EXPORT_STYLES | EXPORT_MASTERSTYLES | EXPORT_AUTOSTYLES |
         EXPORT_FONTDECLS|EXPORT_OASIS );
@@ -840,9 +836,6 @@ Reference< XInterface > SAL_CALL SwXMLExportContent_createInstance(
     throw( Exception )
 {
     // #110680#
-    //return (cppu::OWeakObject*)new SwXMLExport(
-    //  EXPORT_AUTOSTYLES | EXPORT_CONTENT | EXPORT_SCRIPTS |
-    //  EXPORT_FONTDECLS );
     return (cppu::OWeakObject*)new SwXMLExport(
         rSMgr,
         EXPORT_AUTOSTYLES | EXPORT_CONTENT | EXPORT_SCRIPTS |
@@ -956,7 +949,7 @@ void SwXMLExport::ExportCurPaM( sal_Bool bExportWholePaM )
         aNextNumInfo.Set( *pNd );
         ExportListChange( aPrevNumInfo, aNextNumInfo );
 
-        ASSERT( !(pNd->IsGrfNode() || pNd->IsOLENode()),
+        OSL_ENSURE( !(pNd->IsGrfNode() || pNd->IsOLENode()),
                 "SwXMLExport::exportCurPaM: grf or OLE node unexpected" );
         if( pNd->IsTxtNode() )
         {
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 994800316d50..d0d085c776b5 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -416,7 +416,7 @@ void SwXMLTextStyleContext_Impl::Finish( sal_Bool bOverwrite )
     const SwDoc *pDoc = pStyle->GetDoc();
 
     SwTxtFmtColl *pColl = pDoc->FindTxtFmtCollByName( pStyle->GetStyleName() );
-    ASSERT( pColl, "Text collection not found" );
+    OSL_ENSURE( pColl, "Text collection not found" );
     if( !pColl || RES_CONDTXTFMTCOLL != pColl->Which() )
         return;
 
@@ -435,7 +435,7 @@ void SwXMLTextStyleContext_Impl::Finish( sal_Bool bOverwrite )
                                       sal_True);
         sName = aString;
         SwTxtFmtColl* pCondColl = pDoc->FindTxtFmtCollByName( sName );
-        ASSERT( pCondColl,
+        OSL_ENSURE( pCondColl,
             "SwXMLItemSetStyleContext_Impl::ConnectConditions: cond coll missing" );
         if( pCondColl )
         {
@@ -542,7 +542,7 @@ SvXMLImportContext *SwXMLItemSetStyleContext_Impl::CreateItemSetContext(
         sal_uInt16 nPrefix, const OUString& rLName,
         const uno::Reference< xml::sax::XAttributeList > & xAttrList )
 {
-    ASSERT( !pItemSet,
+    OSL_ENSURE( !pItemSet,
             "SwXMLItemSetStyleContext_Impl::CreateItemSetContext: item set exists" );
 
     SvXMLImportContext *pContext = 0;
@@ -565,7 +565,7 @@ SvXMLImportContext *SwXMLItemSetStyleContext_Impl::CreateItemSetContext(
         pItemSet = new SfxItemSet( rItemPool, aTableBoxSetRange );
         break;
     default:
-        ASSERT( !this,
+        OSL_ENSURE( !this,
         "SwXMLItemSetStyleContext_Impl::CreateItemSetContext: unknown family" );
         break;
     }
@@ -949,12 +949,6 @@ OUString SwXMLStylesContext_Impl::GetServiceName( sal_uInt16 nFamily ) const
 void SwXMLStylesContext_Impl::EndElement()
 {
     GetSwImport().InsertStyles( IsAutomaticStyle() );
-    // --> OD 2006-10-11 #i69629#
-    // assign paragraph styles to list levels of outline style after all styles
-    // are imported and finished.
-//    if( !bAutoStyles )
-//        GetImport().GetTextImport()->SetOutlineStyles( sal_True );
-    // <--
 }
 
 // ---------------------------------------------------------------------
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index 5128af6d3495..e815ca96e784 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -83,15 +83,15 @@ void SwXMLExport::ExportFmt( const SwFmt& rFmt, enum XMLTokenEnum eFamily )
     if( eFamily != XML_TOKEN_INVALID )
         AddAttribute( XML_NAMESPACE_STYLE, XML_FAMILY, eFamily );
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     // style:parent-style-name="..." (if its not the default only)
     const SwFmt* pParent = rFmt.DerivedFrom();
     // Parent-Namen nur uebernehmen, wenn kein Default
-    ASSERT( !pParent || pParent->IsDefault(), "unexpected parent" );
+    OSL_ENSURE( !pParent || pParent->IsDefault(), "unexpected parent" );
 
-    ASSERT( USHRT_MAX == rFmt.GetPoolFmtId(), "pool ids arent'supported" );
-    ASSERT( USHRT_MAX == rFmt.GetPoolHelpId(), "help ids arent'supported" );
-    ASSERT( USHRT_MAX == rFmt.GetPoolHelpId() ||
+    OSL_ENSURE( USHRT_MAX == rFmt.GetPoolFmtId(), "pool ids arent'supported" );
+    OSL_ENSURE( USHRT_MAX == rFmt.GetPoolHelpId(), "help ids arent'supported" );
+    OSL_ENSURE( USHRT_MAX == rFmt.GetPoolHelpId() ||
             UCHAR_MAX == rFmt.GetPoolHlpFileId(), "help file ids aren't supported" );
 #endif
 
diff --git a/sw/source/filter/xml/xmlfonte.cxx b/sw/source/filter/xml/xmlfonte.cxx
index ff9e8b2c6d1d..ea9ec6b3d404 100644
--- a/sw/source/filter/xml/xmlfonte.cxx
+++ b/sw/source/filter/xml/xmlfonte.cxx
@@ -60,13 +60,13 @@ SwXMLFontAutoStylePool_Impl::SwXMLFontAutoStylePool_Impl(
     Reference < XTextDocument > xTextDoc( _rExport.GetModel(), UNO_QUERY );
     Reference < XText > xText = xTextDoc->getText();
     Reference<XUnoTunnel> xTextTunnel( xText, UNO_QUERY);
-    ASSERT( xTextTunnel.is(), "missing XUnoTunnel for Cursor" );
+    OSL_ENSURE( xTextTunnel.is(), "missing XUnoTunnel for Cursor" );
     if( !xTextTunnel.is() )
         return;
 
     SwXText *pText = reinterpret_cast< SwXText *>(
             sal::static_int_cast< sal_IntPtr >( xTextTunnel->getSomething( SwXText::getUnoTunnelId() )));
-    ASSERT( pText, "SwXText missing" );
+    OSL_ENSURE( pText, "SwXText missing" );
     if( !pText )
         return;
 
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 7410b00b09cd..e1f3dbbea05b 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -240,10 +240,7 @@ SvXMLImportContext *SwXMLDocContext_Impl::CreateChildContext(
         pContext = GetSwImport().CreateStylesContext( rLocalName, xAttrList,
                                                       sal_True );
         break;
-//  case XML_TOK_DOC_USESTYLES:
-//      pContext = GetSwImport().CreateUseStylesContext( rLocalName,
-//                                                       xAttrList );
-//      break;
+
     case XML_TOK_DOC_MASTERSTYLES:
         pContext = GetSwImport().CreateMasterStylesContext( rLocalName,
                                                             xAttrList );
@@ -407,10 +404,7 @@ SvXMLImportContext *SwXMLImport::CreateContext(
     // --> OD 2006-10-11 #i69629#
     // own subclasses for <office:document> and <office:document-styles>
     if( XML_NAMESPACE_OFFICE==nPrefix &&
-//        ( IsXMLToken( rLocalName, XML_DOCUMENT ) ||
-//        ( IsXMLToken( rLocalName, XML_DOCUMENT_META ) ||
         ( IsXMLToken( rLocalName, XML_DOCUMENT_SETTINGS ) ||
-//          IsXMLToken( rLocalName, XML_DOCUMENT_STYLES ) ||
           IsXMLToken( rLocalName, XML_DOCUMENT_CONTENT ) ))
         pContext = new SwXMLDocContext_Impl( *this, nPrefix, rLocalName,
                                              xAttrList );
@@ -564,12 +558,12 @@ sal_Int64 SAL_CALL SwXMLImport::getSomething( const Sequence< sal_Int8 >& rId )
 OTextCursorHelper *lcl_xml_GetSwXTextCursor( const Reference < XTextCursor >& rTextCursor )
 {
     Reference<XUnoTunnel> xCrsrTunnel( rTextCursor, UNO_QUERY );
-    ASSERT( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
+    OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
     if( !xCrsrTunnel.is() )
         return 0;
     OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper *>(
             sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething(  OTextCursorHelper::getUnoTunnelId() )));
-    ASSERT( pTxtCrsr, "SwXTextCursor missing" );
+    OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
     return pTxtCrsr;
 }
 
@@ -694,12 +688,12 @@ void SwXMLImport::startDocument( void )
         if( IMPORT_ALL == getImportFlags() )
         {
             pTxtCrsr = lcl_xml_GetSwXTextCursor( xTextCursor );
-            ASSERT( pTxtCrsr, "SwXTextCursor missing" );
+            OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
             if( !pTxtCrsr )
                 return;
 
             pDoc = pTxtCrsr->GetDoc();
-            ASSERT( pDoc, "SwDoc missing" );
+            OSL_ENSURE( pDoc, "SwDoc missing" );
             if( !pDoc )
                 return;
 
@@ -727,12 +721,12 @@ void SwXMLImport::startDocument( void )
 
     if( !pTxtCrsr  )
         pTxtCrsr = lcl_xml_GetSwXTextCursor( xTextCursor );
-    ASSERT( pTxtCrsr, "SwXTextCursor missing" );
+    OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
     if( !pTxtCrsr )
         return;
 
     SwDoc *pDoc = pTxtCrsr->GetDoc();
-    ASSERT( pDoc, "SwDoc missing" );
+    OSL_ENSURE( pDoc, "SwDoc missing" );
     if( !pDoc )
         return;
 
@@ -815,10 +809,10 @@ void SwXMLImport::endDocument( void )
     {
         Reference<XUnoTunnel> xCrsrTunnel( GetTextImport()->GetCursor(),
                                               UNO_QUERY);
-        ASSERT( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
+        OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
         OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper *>(
                 sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
-        ASSERT( pTxtCrsr, "SwXTextCursor missing" );
+        OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
         SwPaM *pPaM = pTxtCrsr->GetPaM();
         if( IsInsertMode() && pSttNdIdx->GetIndex() )
         {
@@ -839,12 +833,12 @@ void SwXMLImport::endDocument( void )
                                             pTxtNode->GetTxt().Len() );
                 }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
                 // !!! This should be impossible !!!!
-                ASSERT( pSttNdIdx->GetIndex()+1 !=
+                OSL_ENSURE( pSttNdIdx->GetIndex()+1 !=
                                         pPaM->GetBound( sal_True ).nNode.GetIndex(),
                         "PaM.Bound1 point to new node " );
-                ASSERT( pSttNdIdx->GetIndex()+1 !=
+                OSL_ENSURE( pSttNdIdx->GetIndex()+1 !=
                                         pPaM->GetBound( sal_False ).nNode.GetIndex(),
                         "PaM.Bound2 points to new node" );
 
@@ -921,10 +915,6 @@ void SwXMLImport::endDocument( void )
                     if( pNextNd->CanJoinPrev(/* &pPos->nNode*/ ) &&
                          *pSttNdIdx != pPos->nNode )
                     {
-//                      SwTxtNode* pPrevNd = pPos->nNode.GetNode().GetTxtNode();
-//                      pPos->nContent.Assign( pPrevNd, 0 );
-//                      pPaM->SetMark(); pPaM->DeleteMark();
-//                      pPrevNd->JoinNext();
                         pNextNd->JoinPrev();
                     }
                 }
@@ -1087,13 +1077,13 @@ void SwXMLImport::SetViewSettings(const Sequence < PropertyValue > & aViewProps)
     Reference < XTextDocument > xTextDoc( GetModel(), UNO_QUERY );
     Reference < XText > xText = xTextDoc->getText();
     Reference<XUnoTunnel> xTextTunnel( xText, UNO_QUERY);
-    ASSERT( xTextTunnel.is(), "missing XUnoTunnel for Cursor" );
+    OSL_ENSURE( xTextTunnel.is(), "missing XUnoTunnel for Cursor" );
     if( !xTextTunnel.is() )
         return;
 
     SwXText *pText = reinterpret_cast< SwXText *>(
             sal::static_int_cast< sal_IntPtr >( xTextTunnel->getSomething( SwXText::getUnoTunnelId() )));
-    ASSERT( pText, "SwXText missing" );
+    OSL_ENSURE( pText, "SwXText missing" );
     if( !pText )
         return;
 
@@ -1147,8 +1137,6 @@ void SwXMLImport::SetViewSettings(const Sequence < PropertyValue > & aViewProps)
             bChangeShowRedline = sal_True;
         }
 // #105372#: Headers and footers are not displayed in BrowseView anymore
-//        else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "ShowHeaderWhileBrowsing" ) ) )
-//        else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "ShowFooterWhileBrowsing" ) ) )
         else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "InBrowseMode" ) ) )
         {
             bBrowseMode = *(sal_Bool *)(pValue->Value.getValue());
@@ -1457,12 +1445,12 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
     Reference < XTextDocument > xTextDoc( GetModel(), UNO_QUERY );
     Reference < XText > xText = xTextDoc->getText();
     Reference<XUnoTunnel> xTextTunnel( xText, UNO_QUERY);
-    ASSERT( xTextTunnel.is(), "missing XUnoTunnel for Cursor" );
+    OSL_ENSURE( xTextTunnel.is(), "missing XUnoTunnel for Cursor" );
     if( xTextTunnel.is() )
     {
         SwXText *pText = reinterpret_cast< SwXText *>(
                 sal::static_int_cast< sal_IntPtr >( xTextTunnel->getSomething( SwXText::getUnoTunnelId() )));
-        ASSERT( pText, "SwXText missing" );
+        OSL_ENSURE( pText, "SwXText missing" );
         if( pText )
         {
             SwDoc *pDoc = pText->GetDoc();
@@ -1580,7 +1568,6 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImport_createInstance(
     throw( uno::Exception )
 {
     // #110680#
-    // return (cppu::OWeakObject*)new SwXMLImport(IMPORT_ALL);
     return (cppu::OWeakObject*)new SwXMLImport( rSMgr, IMPORT_ALL );
 }
 
@@ -1603,9 +1590,6 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImportStyles_createInstance(
     throw( uno::Exception )
 {
     // #110680#
-    //return (cppu::OWeakObject*)new SwXMLImport(
-    //  IMPORT_STYLES | IMPORT_MASTERSTYLES | IMPORT_AUTOSTYLES |
-    //  IMPORT_FONTDECLS );
     return (cppu::OWeakObject*)new SwXMLImport(
         rSMgr,
         IMPORT_STYLES | IMPORT_MASTERSTYLES | IMPORT_AUTOSTYLES |
@@ -1631,9 +1615,6 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImportContent_createInstance(
     throw( uno::Exception )
 {
     // #110680#
-    //return (cppu::OWeakObject*)new SwXMLImport(
-    //  IMPORT_AUTOSTYLES | IMPORT_CONTENT | IMPORT_SCRIPTS |
-    //  IMPORT_FONTDECLS );
     return (cppu::OWeakObject*)new SwXMLImport(
         rSMgr,
         IMPORT_AUTOSTYLES | IMPORT_CONTENT | IMPORT_SCRIPTS |
@@ -1659,7 +1640,6 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImportMeta_createInstance(
     throw( uno::Exception )
 {
     // #110680#
-    // return (cppu::OWeakObject*)new SwXMLImport( IMPORT_META );
     return (cppu::OWeakObject*)new SwXMLImport( rSMgr, IMPORT_META );
 }
 
@@ -1682,7 +1662,6 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImportSettings_createInstance(
     throw( uno::Exception )
 {
     // #110680#
-    // return (cppu::OWeakObject*)new SwXMLImport( IMPORT_SETTINGS );
     return (cppu::OWeakObject*)new SwXMLImport( rSMgr, IMPORT_SETTINGS );
 }
 
@@ -1716,10 +1695,10 @@ SwDoc* SwImport::GetDocFromXMLImport( SvXMLImport& rImport )
     uno::Reference<lang::XUnoTunnel> xModelTunnel( rImport.GetModel(), uno::UNO_QUERY );
     SwXTextDocument *pTxtDoc = reinterpret_cast< SwXTextDocument *>(
             sal::static_int_cast< sal_IntPtr >(  xModelTunnel->getSomething(SwXTextDocument::getUnoTunnelId() )));
-    ASSERT( pTxtDoc, "Where is my model?" )
-    ASSERT( pTxtDoc->GetDocShell(), "Where is my shell?" )
+    OSL_ENSURE( pTxtDoc, "Where is my model?" );
+    OSL_ENSURE( pTxtDoc->GetDocShell(), "Where is my shell?" );
     SwDoc* pDoc = pTxtDoc->GetDocShell()->GetDoc();
-    ASSERT( pDoc, "Where is my document?" )
+    OSL_ENSURE( pDoc, "Where is my document?" );
     return pDoc;
 }
 
diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx
index f3eac88edfdf..904288221f15 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -124,9 +124,6 @@ void SvXMLImportItemMapper::importXML( SfxItemSet& rSet,
 
                     if( 0 == (pEntry->nMemberId&MID_SW_FLAG_SPECIAL_ITEM_IMPORT) )
                     {
-//                      bPut = pNewItem->importXML( rValue,
-//                                          pEntry->nMemberId & MID_SW_FLAG_MASK,
-//                                          rUnitConverter );
                         bPut = PutXMLValue( *pNewItem, rValue,
                                             static_cast<sal_uInt16>( pEntry->nMemberId & MID_SW_FLAG_MASK ),
                                             rUnitConverter );
diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx
index 62b5e3bff91e..fc1d425deca5 100644
--- a/sw/source/filter/xml/xmlmeta.cxx
+++ b/sw/source/filter/xml/xmlmeta.cxx
@@ -97,20 +97,6 @@ enum SvXMLTokenMapAttrs
     XML_TOK_META_STAT_END=XML_TOK_UNKNOWN
 };
 
-/*
-static __FAR_DATA SvXMLTokenMapEntry aMetaStatAttrTokenMap[] =
-{
-    { XML_NAMESPACE_META, XML_TABLE_COUNT,      XML_TOK_META_STAT_TABLE },
-    { XML_NAMESPACE_META, XML_IMAGE_COUNT,      XML_TOK_META_STAT_IMAGE },
-    { XML_NAMESPACE_META, XML_OBJECT_COUNT,     XML_TOK_META_STAT_OLE   },
-    { XML_NAMESPACE_META, XML_PARAGRAPH_COUNT,  XML_TOK_META_STAT_PARA  },
-    { XML_NAMESPACE_META, XML_PAGE_COUNT,       XML_TOK_META_STAT_PAGE  },
-    { XML_NAMESPACE_META, XML_WORD_COUNT,       XML_TOK_META_STAT_WORD  },
-    { XML_NAMESPACE_META, XML_CHARACTER_COUNT,  XML_TOK_META_STAT_CHAR  },
-    XML_TOKEN_MAP_END
-};
-*/
-
 struct statistic {
     SvXMLTokenMapAttrs token;
     const char* name;
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index fb166382080b..d1631af5bda4 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -137,7 +137,7 @@ SwXMLTableLines_Impl::SwXMLTableLines_Impl( const SwTableLines& rLines ) :
     pLines( &rLines ),
     nWidth( 0UL )
 {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
     sal_uInt16 nEndCPos = 0U;
 #endif
     sal_uInt16 nLines = rLines.Count();
@@ -164,34 +164,26 @@ SwXMLTableLines_Impl::SwXMLTableLines_Impl( const SwTableLines& rLines ) :
 
                 if( nBox==nBoxes-1U )
                 {
-                    ASSERT( nLine==0U && nWidth==0UL,
+                    OSL_ENSURE( nLine==0U && nWidth==0UL,
                             "parent width will be lost" );
                     nWidth = nCPos;
                 }
             }
             else
             {
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
                 sal_uInt16 nCheckPos =
                     nCPos + (sal_uInt16)SwWriteTable::GetBoxWidth( pBox );
                 if( !nEndCPos )
                 {
                     nEndCPos = nCheckPos;
                 }
-                else
-                {
-                    /*
-                    ASSERT( SwXMLTableColumn_impl(nCheckPos) ==
-                                        SwXMLTableColumn_Impl(nEndCPos),
-                    "rows have different total widths" );
-                    */
-                }
 #endif
                 nCPos = (sal_uInt16)nWidth;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
                 SwXMLTableColumn_Impl aCol( (sal_uInt16)nWidth );
-                ASSERT( aCols.Seek_Entry(&aCol), "couldn't find last column" );
-                ASSERT( SwXMLTableColumn_Impl(nCheckPos) ==
+                OSL_ENSURE( aCols.Seek_Entry(&aCol), "couldn't find last column" );
+                OSL_ENSURE( SwXMLTableColumn_Impl(nCheckPos) ==
                                             SwXMLTableColumn_Impl(nCPos),
                         "rows have different total widths" );
 #endif
@@ -694,11 +686,13 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines,
             // Und ihren Index
             sal_uInt16 nOldCol = nCol;
             SwXMLTableColumn_Impl aCol( nCPos );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
             sal_Bool bFound =
 #endif
                 pLines->GetColumns().Seek_Entry( &aCol, &nCol );
-            ASSERT( bFound, "couldn't find column" );
+#if OSL_DEBUG_LEVEL > 1
+            OSL_ENSURE( bFound, "couldn't find column" );
+#endif
 
             const SwStartNode *pBoxSttNd = pBox->GetSttNd();
             if( pBoxSttNd )
@@ -984,18 +978,20 @@ void SwXMLExport::ExportTableLine( const SwTableLine& rLine,
             const sal_uInt16 nOldCol = nCol;
             {
                 SwXMLTableColumn_Impl aCol( nCPos );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
                 const sal_Bool bFound =
 #endif
                     rLines.GetColumns().Seek_Entry( &aCol, &nCol );
-                ASSERT( bFound, "couldn't find column" );
+#if OSL_DEBUG_LEVEL > 1
+                OSL_ENSURE( bFound, "couldn't find column" );
+#endif
             }
 
             // --> OD 2009-03-19 #i95726#
             // Some fault tolerance, if table is somehow corrupted.
             if ( nCol < nOldCol )
             {
-                ASSERT( false, "table and/or table information seems to be corrupted." );
+                OSL_ENSURE( false, "table and/or table information seems to be corrupted." );
                 if ( nBox == nBoxes - 1 )
                 {
                     nCol = rLines.GetColumns().Count() - 1;
@@ -1028,7 +1024,7 @@ void SwXMLExport::ExportTableLines( const SwTableLines& rLines,
                                     SwXMLTableInfo_Impl& rTblInfo,
                                     USHORT nHeaderRows )
 {
-    ASSERT( pTableLines && pTableLines->Count(),
+    OSL_ENSURE( pTableLines && pTableLines->Count(),
             "SwXMLExport::ExportTableLines: table columns infos missing" );
     if( !pTableLines || 0 == pTableLines->Count() )
         return;
@@ -1043,9 +1039,9 @@ void SwXMLExport::ExportTableLines( const SwTableLines& rLines,
             break;
         }
     }
-    ASSERT( pLines,
+    OSL_ENSURE( pLines,
             "SwXMLExport::ExportTableLines: table columns info missing" );
-    ASSERT( 0==nInfoPos,
+    OSL_ENSURE( 0==nInfoPos,
             "SwXMLExport::ExportTableLines: table columns infos are unsorted" );
     if( !pLines )
         return;
@@ -1216,16 +1212,16 @@ void SwXMLTextParagraphExport::exportTable(
         {
             pXTable = reinterpret_cast< SwXTextTable * >(
                     sal::static_int_cast< sal_IntPtr >( xTableTunnel->getSomething( SwXTextTable::getUnoTunnelId() )));
-            ASSERT( pXTable, "SwXTextTable missing" );
+            OSL_ENSURE( pXTable, "SwXTextTable missing" );
         }
         if( pXTable )
         {
             SwFrmFmt *pFmt = pXTable->GetFrmFmt();
-            ASSERT( pFmt, "table format missing" );
+            OSL_ENSURE( pFmt, "table format missing" );
             const SwTable *pTbl = SwTable::FindTable( pFmt );
-            ASSERT( pTbl, "table missing" );
+            OSL_ENSURE( pTbl, "table missing" );
             const SwTableNode *pTblNd = pTbl->GetTableNode();
-            ASSERT( pTblNd, "table node missing" );
+            OSL_ENSURE( pTblNd, "table node missing" );
             if( bAutoStyles )
             {
                 SwNodeIndex aIdx( *pTblNd );
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index d98635056fe8..8ab886486e9a 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -336,7 +336,7 @@ SwXMLTableRow_Impl::SwXMLTableRow_Impl( const OUString& rStyleName,
 {
     if( pDfltCellStyleName  )
         aDfltCellStyleName = *pDfltCellStyleName;
-    ASSERT( nCells <= USHRT_MAX,
+    OSL_ENSURE( nCells <= USHRT_MAX,
             "SwXMLTableRow_Impl::SwXMLTableRow_Impl: too many cells" );
     if( nCells > USHRT_MAX )
         nCells = USHRT_MAX;
@@ -349,19 +349,17 @@ SwXMLTableRow_Impl::SwXMLTableRow_Impl( const OUString& rStyleName,
 
 inline SwXMLTableCell_Impl *SwXMLTableRow_Impl::GetCell( sal_uInt32 nCol ) const
 {
-    ASSERT( nCol < USHRT_MAX,
+    OSL_ENSURE( nCol < USHRT_MAX,
             "SwXMLTableRow_Impl::GetCell: column number is to big" );
-    // --> OD 2009-03-19 #i95726# - some fault tolerance
-//    return aCells[(sal_uInt16)nCol];
-    ASSERT( nCol < aCells.Count(),
+    // #i95726# - some fault tolerance
+    OSL_ENSURE( nCol < aCells.Count(),
             "SwXMLTableRow_Impl::GetCell: column number is out of bound" );
     return nCol < aCells.Count() ? aCells[(sal_uInt16)nCol] : 0;
-    // <--
 }
 
 void SwXMLTableRow_Impl::Expand( sal_uInt32 nCells, sal_Bool bOneCell )
 {
-    ASSERT( nCells <= USHRT_MAX,
+    OSL_ENSURE( nCells <= USHRT_MAX,
             "SwXMLTableRow_Impl::Expand: too many cells" );
     if( nCells > USHRT_MAX )
         nCells = USHRT_MAX;
@@ -375,7 +373,7 @@ void SwXMLTableRow_Impl::Expand( sal_uInt32 nCells, sal_Bool bOneCell )
         nColSpan--;
     }
 
-    ASSERT( nCells<=aCells.Count(),
+    OSL_ENSURE( nCells<=aCells.Count(),
             "SwXMLTableRow_Impl::Expand: wrong number of cells" );
 }
 
@@ -577,7 +575,7 @@ inline void SwXMLTableCellContext_Impl::_InsertContent()
 
 inline void SwXMLTableCellContext_Impl::InsertContent()
 {
-    ASSERT( !HasContent(), "content already there" );
+    OSL_ENSURE( !HasContent(), "content already there" );
     bHasTextContent = sal_True;
     _InsertContent();
 }
@@ -677,10 +675,10 @@ void SwXMLTableCellContext_Impl::EndElement()
 
                 // Until we have an API for copying we have to use the core.
                 Reference<XUnoTunnel> xSrcCrsrTunnel( xSrcTxtCursor, UNO_QUERY);
-                ASSERT( xSrcCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
+                OSL_ENSURE( xSrcCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
                 OTextCursorHelper *pSrcTxtCrsr = reinterpret_cast< OTextCursorHelper * >(
                         sal::static_int_cast< sal_IntPtr >( xSrcCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
-                ASSERT( pSrcTxtCrsr, "SwXTextCursor missing" );
+                OSL_ENSURE( pSrcTxtCrsr, "SwXTextCursor missing" );
                 SwDoc *pDoc = pSrcTxtCrsr->GetDoc();
                 const SwPaM *pSrcPaM = pSrcTxtCrsr->GetPaM();
 
@@ -690,11 +688,11 @@ void SwXMLTableCellContext_Impl::EndElement()
 
                     Reference<XUnoTunnel> xDstCrsrTunnel(
                         GetImport().GetTextImport()->GetCursor(), UNO_QUERY);
-                    ASSERT( xDstCrsrTunnel.is(),
+                    OSL_ENSURE( xDstCrsrTunnel.is(),
                             "missing XUnoTunnel for Cursor" );
                     OTextCursorHelper *pDstTxtCrsr = reinterpret_cast< OTextCursorHelper * >(
                             sal::static_int_cast< sal_IntPtr >( xDstCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )) );
-                    ASSERT( pDstTxtCrsr, "SwXTextCursor missing" );
+                    OSL_ENSURE( pDstTxtCrsr, "SwXTextCursor missing" );
                     SwPaM aSrcPaM( *pSrcPaM->GetPoint(),
                                    *pSrcPaM->GetMark() );
                     SwPosition aDstPos( *pDstTxtCrsr->GetPaM()->GetPoint() );
@@ -1155,11 +1153,6 @@ String lcl_GenerateFldTypeName(OUString sPrefix, SwTableNode* pTableNode)
     {
         sPrefixStr = String('_');
     }
-//  else if (sPrefixStr.Copy(0, 1).IsAlphaAscii())
-//  {
-//      sPrefixStr.Insert('_', 0);
-//  }
-    // else: name is OK.
 
     // increase count until we find a name that is not yet taken
     String sName;
@@ -1364,13 +1357,13 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
     const SwXTextTable *pXTable = 0;
     Reference<XMultiServiceFactory> xFactory( GetImport().GetModel(),
                                               UNO_QUERY );
-    ASSERT( xFactory.is(), "factory missing" );
+    OSL_ENSURE( xFactory.is(), "factory missing" );
     if( xFactory.is() )
     {
         OUString sService(
                 RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextTable" ) );
         Reference<XInterface> xIfc = xFactory->createInstance( sService );
-        ASSERT( xIfc.is(), "Couldn't create a table" );
+        OSL_ENSURE( xIfc.is(), "Couldn't create a table" );
 
         if( xIfc.is() )
             xTable = Reference< XTextTable > ( xIfc, UNO_QUERY );
@@ -1402,7 +1395,7 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
         {
             pXTable = reinterpret_cast< SwXTextTable * >(
                     sal::static_int_cast< sal_IntPtr >( xTableTunnel->getSomething( SwXTextTable::getUnoTunnelId() )));
-            ASSERT( pXTable, "SwXTextTable missing" );
+            OSL_ENSURE( pXTable, "SwXTextTable missing" );
         }
 
         Reference < XCellRange > xCellRange( xTable, UNO_QUERY );
@@ -1417,11 +1410,11 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
     if( pXTable )
     {
         SwFrmFmt *pTblFrmFmt = pXTable->GetFrmFmt();
-        ASSERT( pTblFrmFmt, "table format missing" );
+        OSL_ENSURE( pTblFrmFmt, "table format missing" );
         SwTable *pTbl = SwTable::FindTable( pTblFrmFmt );
-        ASSERT( pTbl, "table missing" );
+        OSL_ENSURE( pTbl, "table missing" );
         pTableNode = pTbl->GetTableNode();
-        ASSERT( pTableNode, "table node missing" );
+        OSL_ENSURE( pTableNode, "table node missing" );
 
         pTblFrmFmt->SetName( sTblName );
 
@@ -1531,7 +1524,7 @@ SvXMLImportContext *SwXMLTableContext::CreateChildContext( sal_uInt16 nPrefix,
 void SwXMLTableContext::InsertColumn( sal_Int32 nWidth2, sal_Bool bRelWidth2,
                                          const OUString *pDfltCellStyleName )
 {
-    ASSERT( nCurCol < USHRT_MAX,
+    OSL_ENSURE( nCurCol < USHRT_MAX,
             "SwXMLTableContext::InsertColumn: no space left" );
     if( nCurCol >= USHRT_MAX )
         return;
@@ -1594,17 +1587,17 @@ void SwXMLTableContext::InsertCell( const OUString& rStyleName,
                                     double fValue,
                                     sal_Bool bTextValue )
 {
-    ASSERT( nCurCol < GetColumnCount(),
+    OSL_ENSURE( nCurCol < GetColumnCount(),
             "SwXMLTableContext::InsertCell: row is full" );
-    ASSERT( nCurRow < USHRT_MAX,
+    OSL_ENSURE( nCurRow < USHRT_MAX,
             "SwXMLTableContext::InsertCell: table is full" );
     if( nCurCol >= USHRT_MAX || nCurRow > USHRT_MAX )
         return;
 
-    ASSERT( nRowSpan >=1UL, "SwXMLTableContext::InsertCell: row span is 0" );
+    OSL_ENSURE( nRowSpan >=1UL, "SwXMLTableContext::InsertCell: row span is 0" );
     if( 0UL == nRowSpan )
         nRowSpan = 1UL;
-    ASSERT( nColSpan >=1UL, "SwXMLTableContext::InsertCell: col span is 0" );
+    OSL_ENSURE( nColSpan >=1UL, "SwXMLTableContext::InsertCell: col span is 0" );
     if( 0UL == nColSpan )
         nColSpan = 1UL;
 
@@ -1703,7 +1696,7 @@ void SwXMLTableContext::InsertRow( const OUString& rStyleName,
                                    sal_Bool bInHead,
                                    const OUString & i_rXmlId )
 {
-    ASSERT( nCurRow < USHRT_MAX,
+    OSL_ENSURE( nCurRow < USHRT_MAX,
             "SwXMLTableContext::InsertRow: no space left" );
     if( nCurRow >= USHRT_MAX )
         return;
@@ -1825,7 +1818,7 @@ const SwStartNode *SwXMLTableContext::GetPrevStartNode( sal_uInt32 nRow,
         // <--
             pSttNd = pPrevCell->GetSubTable()->GetLastStartNode();
 
-        ASSERT( pSttNd != 0,
+        OSL_ENSURE( pSttNd != 0,
                 "table corrupt" );
     }
 
@@ -2259,7 +2252,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
         sal_Bool bSplitted = sal_False;
         while( !bSplitted )
         {
-            ASSERT( nCol < nRightCol, "Zu weit gelaufen" );
+            OSL_ENSURE( nCol < nRightCol, "Zu weit gelaufen" );
 
             // Kann hinter der aktuellen HTML-Tabellen-Spalte gesplittet
             // werden? Wenn ja, koennte der enstehende Bereich auch noch
@@ -2305,7 +2298,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
                 // --> OD 2009-03-19 #i95726# - some fault tolerance
                 if ( pCell == 0 )
                 {
-                    ASSERT( false, "table seems to be corrupt." );
+                    OSL_ENSURE( false, "table seems to be corrupt." );
                     break;
                 }
                 // <--
@@ -2315,22 +2308,22 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
                 bSplit = 1UL == pCell->GetColSpan();
             }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
             if( nCol == nRightCol-1UL )
             {
-                ASSERT( bSplit, "Split-Flag falsch" );
+                OSL_ENSURE( bSplit, "Split-Flag falsch" );
                 if ( bHasSubTables )
                 {
-                    ASSERT( !bHoriSplitMayContinue,
+                    OSL_ENSURE( !bHoriSplitMayContinue,
                             "HoriSplitMayContinue-Flag falsch" );
                     SwXMLTableCell_Impl *pTmpCell = GetCell( nTopRow, nStartCol );
-                    ASSERT( pTmpCell->GetRowSpan() != (nBottomRow-nTopRow) ||
+                    OSL_ENSURE( pTmpCell->GetRowSpan() != (nBottomRow-nTopRow) ||
                             !bHoriSplitPossible, "HoriSplitPossible-Flag falsch" );
                 }
             }
 #endif
 
-            ASSERT( !bHasSubTables || !bHoriSplitMayContinue || bHoriSplitPossible,
+            OSL_ENSURE( !bHasSubTables || !bHoriSplitMayContinue || bHoriSplitPossible,
                     "bHoriSplitMayContinue, aber nicht bHoriSplitPossible" );
 
             if( bSplit )
@@ -2389,9 +2382,9 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
                     // the split at the last split position we remembered.
                     if( bHoriSplitPossible || nSplitCol > nCol+1 )
                     {
-                        ASSERT( !bHoriSplitMayContinue,
+                        OSL_ENSURE( !bHoriSplitMayContinue,
                                 "bHoriSplitMayContinue==sal_True" );
-                        ASSERT( bHoriSplitPossible || nSplitCol == nRightCol,
+                        OSL_ENSURE( bHoriSplitPossible || nSplitCol == nRightCol,
                                 "bHoriSplitPossible-Flag sollte gesetzt sein" );
 
                         nSplitCol = nCol + 1UL;
@@ -2402,7 +2395,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
                     bSplitted = sal_True;
                 }
 
-                ASSERT( bHasSubTables || pBox, "Colspan trouble" )
+                OSL_ENSURE( bHasSubTables || pBox, "Colspan trouble" );
 
                 if( pBox )
                     rBoxes.C40_INSERT( SwTableBox, pBox, rBoxes.Count() );
@@ -2687,7 +2680,7 @@ void SwXMLTableContext::MakeTable()
     // #i97274# handle invalid tables
     if (!pRows || !pRows->Count() || !GetColumnCount())
     {
-        ASSERT(false, "invalid table: no cells; deleting...");
+        OSL_ENSURE(false, "invalid table: no cells; deleting...");
         pTableNode->GetDoc()->DeleteSection( pTableNode );
         pTableNode = 0;
         pBox1 = 0;
@@ -2881,10 +2874,10 @@ const SwStartNode *SwXMLTableContext::InsertTableSection(
     const SwStartNode *pStNd;
     Reference<XUnoTunnel> xCrsrTunnel( GetImport().GetTextImport()->GetCursor(),
                                        UNO_QUERY);
-    ASSERT( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
+    OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
     OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper * >(
             sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
-    ASSERT( pTxtCrsr, "SwXTextCursor missing" );
+    OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
 
     if( bFirstSection )
     {
@@ -2902,7 +2895,7 @@ const SwStartNode *SwXMLTableContext::InsertTableSection(
                                              : pTableNode->EndOfSectionNode();
         // --> OD 2007-07-02 #i78921# - make code robust
 #if OSL_DEBUG_LEVEL > 1
-        ASSERT( pDoc, "<SwXMLTableContext::InsertTableSection(..)> - no <pDoc> at <SwXTextCursor> instance - <SwXTextCurosr> doesn't seem to be registered at a <SwUnoCrsr> instance." );
+        OSL_ENSURE( pDoc, "<SwXMLTableContext::InsertTableSection(..)> - no <pDoc> at <SwXTextCursor> instance - <SwXTextCurosr> doesn't seem to be registered at a <SwUnoCrsr> instance." );
 #endif
         if ( !pDoc )
         {
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index d98bf9bba6fb..fbf4c3d95730 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -92,10 +92,10 @@ SwNoTxtNode *SwXMLTextParagraphExport::GetNoTxtNode(
     const Reference < XPropertySet >& rPropSet ) const
 {
     Reference<XUnoTunnel> xCrsrTunnel( rPropSet, UNO_QUERY );
-    ASSERT( xCrsrTunnel.is(), "missing XUnoTunnel for embedded" );
+    OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for embedded" );
     SwXFrame *pFrame = reinterpret_cast< SwXFrame * >(
                 sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( SwXFrame::getUnoTunnelId() )));
-    ASSERT( pFrame, "SwXFrame missing" );
+    OSL_ENSURE( pFrame, "SwXFrame missing" );
     SwFrmFmt *pFrmFmt = pFrame->GetFrmFmt();
     const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt();
     const SwNodeIndex *pNdIdx = rCntnt.GetCntntIdx();
@@ -118,7 +118,7 @@ void SwXMLTextParagraphExport::exportStyleContent(
         const SwDoc *pDoc = pStyle->GetDoc();
         const SwTxtFmtColl *pColl =
             pDoc->FindTxtFmtCollByName( pStyle->GetStyleName() );
-        ASSERT( pColl, "There is the text collection?" );
+        OSL_ENSURE( pColl, "There is the text collection?" );
         if( pColl && RES_CONDTXTFMTCOLL == pColl->Which() )
         {
             const SwFmtCollConditions& rConditions =
@@ -227,7 +227,7 @@ void SwXMLTextParagraphExport::setTextEmbeddedGraphicURL(
     SwGrfNode *pGrfNd = GetNoTxtNode( rPropSet )->GetGrfNode();
     if( !pGrfNd->IsGrfLink() )
     {
-        String aNewURL( RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.Package:") );
+        String aNewURL( RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.Package:") );
         aNewURL += String(rURL);
         pGrfNd->SetNewStreamName( aNewURL );
 
@@ -236,13 +236,6 @@ void SwXMLTextParagraphExport::setTextEmbeddedGraphicURL(
         pGrfNd->SwapOut();
     }
 }
-/*
-static void lcl_addParam ( SvXMLExport &rExport, const SvCommand &rCommand )
-{
-    rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, rCommand.GetCommand() );
-    rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, rCommand.GetArgument() );
-    SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True );
-}*/
 
 static void lcl_addURL ( SvXMLExport &rExport, const String &rURL,
                          sal_Bool bToRel = sal_True )
@@ -292,22 +285,18 @@ void lcl_addOutplaceProperties(
         if( aSize.Width() && aSize.Height() )
         {
             Any aAny;
-            //aAny <<= (sal_Int32)rVisArea.Left();
             aAny <<= 0L;
             *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_LEFT ), aAny );
             pStates++;
 
-            //aAny <<= (sal_Int32)rVisArea.Top();
             aAny <<= 0L;
             *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_TOP ), aAny );
             pStates++;
 
-            //aAny <<= (sal_Int32)rVisArea.GetWidth();
             aAny <<= (sal_Int32)aSize.Width();
             *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_WIDTH ), aAny );
             pStates++;
 
-            //aAny <<= (sal_Int32)rVisArea.GetHeight();
             aAny <<= (sal_Int32)aSize.Height();
             *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_HEIGHT ), aAny );
             pStates++;
@@ -659,7 +648,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
         }
         break;
     default:
-        ASSERT( !this, "unknown object type! Base class should have been called!" );
+        OSL_ENSURE( !this, "unknown object type! Base class should have been called!" );
     }
 
     {
@@ -671,7 +660,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
             if( (rXMLExport.getExportFlags() & EXPORT_EMBEDDED) != 0 )
             {
                 Reference < XEmbeddedObjectSupplier > xEOS( rPropSet, UNO_QUERY );
-                ASSERT( xEOS.is(), "no embedded object supplier for own object" );
+                OSL_ENSURE( xEOS.is(), "no embedded object supplier for own object" );
                 Reference < XComponent > xComp = xEOS->getEmbeddedObject();
                 rXMLExport.ExportEmbeddedOwnObject( xComp );
             }
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index b5da2e7781d4..8d3a0341100a 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -201,10 +201,10 @@ sal_Bool SwXMLTextImportHelper::IsInHeaderFooter() const
 {
     uno::Reference<XUnoTunnel> xCrsrTunnel(
             ((SwXMLTextImportHelper *)this)->GetCursor(), UNO_QUERY );
-    ASSERT( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
+    OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
     OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper * >(
                 sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
-    ASSERT( pTxtCrsr, "SwXTextCursor missing" );
+    OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
     SwDoc *pDoc = pTxtCrsr->GetDoc();
 
     return pDoc && pDoc->IsInHeaderFooter( pTxtCrsr->GetPaM()->GetPoint()->nNode );
@@ -219,7 +219,7 @@ SwOLENode *lcl_GetOLENode( const SwFrmFmt *pFrmFmt )
         const SwNodeIndex *pNdIdx = rCntnt.GetCntntIdx();
         pOLENd = pNdIdx->GetNodes()[pNdIdx->GetIndex() + 1]->GetOLENode();
     }
-    ASSERT( pOLENd, "Where is the OLE node" );
+    OSL_ENSURE( pOLENd, "Where is the OLE node" );
     return pOLENd;
 }
 
@@ -245,10 +245,10 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
         return xPropSet;
 
     uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY );
-    ASSERT( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
+    OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
     OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper * >(
                 sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
-    ASSERT( pTxtCrsr, "SwXTextCursor missing" );
+    OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
     SwDoc *pDoc = SwImport::GetDocFromXMLImport( rImport );
 
     SfxItemSet aItemSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN,
@@ -385,7 +385,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
         const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt();
         const SwNodeIndex *pNdIdx = rCntnt.GetCntntIdx();
         SwOLENode *pOLENode = pNdIdx->GetNodes()[pNdIdx->GetIndex() + 1]->GetOLENode();
-        ASSERT( pOLENode, "Where is the OLE node" );
+        OSL_ENSURE( pOLENode, "Where is the OLE node" );
 
         OUStringBuffer aBuffer( rTblName.getLength() );
         sal_Bool bQuoted = sal_False;
@@ -467,7 +467,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
             UniReference < SvXMLImportPropertyMapper > xImpPrMap =
                 pStyle->GetStyles()
                       ->GetImportPropertyMapper(pStyle->GetFamily());
-            ASSERT( xImpPrMap.is(), "Where is the import prop mapper?" );
+            OSL_ENSURE( xImpPrMap.is(), "Where is the import prop mapper?" );
             if( xImpPrMap.is() )
             {
                 UniReference<XMLPropertySetMapper> rPropMapper =
@@ -555,10 +555,10 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink(
     uno::Reference < XPropertySet > xPropSet;
 
     uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY );
-    ASSERT( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
+    OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
     OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper * >(
                 sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
-    ASSERT( pTxtCrsr, "SwXTextCursor missing" );
+    OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
     SwDoc *pDoc = SwImport::GetDocFromXMLImport( rImport );
 
     SfxItemSet aItemSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN,
@@ -643,10 +643,10 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertApplet(
 
     uno::Reference < XPropertySet > xPropSet;
     uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY );
-    ASSERT( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
+    OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
     OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper * >(
                 sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
-    ASSERT( pTxtCrsr, "SwXTextCursor missing" );
+    OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
     SwDoc *pDoc = pTxtCrsr->GetDoc();
 
     SfxItemSet aItemSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN,
@@ -688,10 +688,10 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin(
 {
     uno::Reference < XPropertySet > xPropSet;
     uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY );
-    ASSERT( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
+    OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
     OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper * >(
             sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
-    ASSERT( pTxtCrsr, "SwXTextCursor missing" );
+    OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
     SwDoc *pDoc = pTxtCrsr->GetDoc();
 
     SfxItemSet aItemSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN,
@@ -770,10 +770,10 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra
 
     uno::Reference < XPropertySet > xPropSet;
     uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY );
-    ASSERT( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
+    OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
     OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper * >(
                 sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
-    ASSERT( pTxtCrsr, "SwXTextCursor missing" );
+    OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
     SwDoc *pDoc = pTxtCrsr->GetDoc();
 
     SfxItemSet aItemSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN,
@@ -793,7 +793,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra
             UniReference < SvXMLImportPropertyMapper > xImpPrMap =
                 pStyle->GetStyles()
                       ->GetImportPropertyMapper(pStyle->GetFamily());
-            ASSERT( xImpPrMap.is(), "Where is the import prop mapper?" );
+            OSL_ENSURE( xImpPrMap.is(), "Where is the import prop mapper?" );
             if( xImpPrMap.is() )
             {
                 UniReference<XMLPropertySetMapper> rPropMapper =
@@ -920,10 +920,10 @@ void SwXMLTextImportHelper::endAppletOrPlugin(
     SolarMutexGuard aGuard;
 
     uno::Reference<XUnoTunnel> xCrsrTunnel( rPropSet, UNO_QUERY );
-    ASSERT( xCrsrTunnel.is(), "missing XUnoTunnel for embedded" );
+    OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for embedded" );
     SwXFrame *pFrame = reinterpret_cast< SwXFrame * >(
                 sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( SwXFrame::getUnoTunnelId() )));
-    ASSERT( pFrame, "SwXFrame missing" );
+    OSL_ENSURE( pFrame, "SwXFrame missing" );
     SwFrmFmt *pFrmFmt = pFrame->GetFrmFmt();
     const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt();
     const SwNodeIndex *pNdIdx = rCntnt.GetCntntIdx();
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 4831b71b82b2..d8546cafed4a 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -62,7 +62,7 @@ String STR_PAGE_COUNT_MACRO
     IdList = {                          \
         FN_FORMULA_CALC                 ;\
         FN_FORMULA_CANCEL               ;\
-         FN_FORMULA_APPLY               ;\
+        FN_FORMULA_APPLY                ;\
         };                              \
     IdCount = {                         \
         3;                              \
@@ -74,6 +74,7 @@ ImageList RID_DEFAULTIMAGELIST_SC
     MaskColor = IMAGE_MASK_COLOR ;
     IMAGELIST_AND_COUNT
 };
+
 ImageList RID_DEFAULTIMAGELIST_LC
 {
     Prefix = "lc";
@@ -81,19 +82,6 @@ ImageList RID_DEFAULTIMAGELIST_LC
     IMAGELIST_AND_COUNT
 };
 
-ImageList RID_DEFAULTIMAGELIST_SCH
-{
-    Prefix = "sch";
-    MaskColor = IMAGE_MASK_COLOR ;
-    IMAGELIST_AND_COUNT
-};
-ImageList RID_DEFAULTIMAGELIST_LCH
-{
-    Prefix = "lch";
-    MaskColor = IMAGE_MASK_COLOR ;
-    IMAGELIST_AND_COUNT
-};
-
 // Vorlagen
 #define STYLE_IMAGE_LISTEF \
     MaskColor = IMAGE_MASK_COLOR ; \
@@ -111,65 +99,65 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
         {
             Text [ en-US ] = "Paragraph Styles" ;
             StyleFamily = SFX_STYLE_FAMILY_PARA ;
-        FilterList [ en-US ] =
-        {
-         < "All Styles" ; SFXSTYLEBIT_ALL ; > ;
-            < "Applied Styles" ; SFXSTYLEBIT_USED ; > ;
-            < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ;
-            < "Automatic" ; SFXSTYLEBIT_AUTO ; > ;
-            < "Text Styles" ; SWSTYLEBIT_TEXT ; > ;
-            < "Chapter Styles" ; SWSTYLEBIT_CHAPTER ; > ;
-            < "List Styles" ; SWSTYLEBIT_LIST ; > ;
-            < "Index Styles" ; SWSTYLEBIT_IDX ; > ;
-            < "Special Styles" ; SWSTYLEBIT_EXTRA ; > ;
-            < "HTML Styles" ; SWSTYLEBIT_HTML ; > ;
-            < "Conditional Styles" ; SWSTYLEBIT_CONDCOLL ; > ;
+            FilterList [ en-US ] =
+            {
+                < "All Styles"          ; SFXSTYLEBIT_ALL       ; > ;
+                < "Applied Styles"      ; SFXSTYLEBIT_USED      ; > ;
+                < "Custom Styles"       ; SFXSTYLEBIT_USERDEF   ; > ;
+                < "Automatic"           ; SFXSTYLEBIT_AUTO      ; > ;
+                < "Text Styles"         ; SWSTYLEBIT_TEXT       ; > ;
+                < "Chapter Styles"      ; SWSTYLEBIT_CHAPTER    ; > ;
+                < "List Styles"         ; SWSTYLEBIT_LIST       ; > ;
+                < "Index Styles"        ; SWSTYLEBIT_IDX        ; > ;
+                < "Special Styles"      ; SWSTYLEBIT_EXTRA      ; > ;
+                < "HTML Styles"         ; SWSTYLEBIT_HTML       ; > ;
+                < "Conditional Styles"  ; SWSTYLEBIT_CONDCOLL   ; > ;
+            };
         };
-    };
         SfxStyleFamilyItem
         {
             Text [ en-US ] = "Character Styles" ;
             StyleFamily = SFX_STYLE_FAMILY_CHAR ;
             FilterList [ en-US ] =
             {
-                < "All" ; SFXSTYLEBIT_ALL ; > ;
-                < "Applied Styles" ; SFXSTYLEBIT_USED ; > ;
-                < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ;
+                < "All"             ; SFXSTYLEBIT_ALL       ; > ;
+                < "Applied Styles"  ; SFXSTYLEBIT_USED      ; > ;
+                < "Custom Styles"   ; SFXSTYLEBIT_USERDEF   ; > ;
             };
-    };
+        };
         SfxStyleFamilyItem
         {
             Text [ en-US ] = "Frame Styles" ;
             StyleFamily = SFX_STYLE_FAMILY_FRAME ;
             FilterList [ en-US ] =
             {
-                < "All" ; SFXSTYLEBIT_ALL ; > ;
-                < "Applied Styles" ; SFXSTYLEBIT_USED ; > ;
-                < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ;
+                < "All"             ; SFXSTYLEBIT_ALL       ; > ;
+                < "Applied Styles"  ; SFXSTYLEBIT_USED      ; > ;
+                < "Custom Styles"   ; SFXSTYLEBIT_USERDEF   ; > ;
             };
-    };
+        };
         SfxStyleFamilyItem
         {
             Text [ en-US ] = "Page Styles" ;
             StyleFamily = SFX_STYLE_FAMILY_PAGE ;
             FilterList [ en-US ] =
             {
-                < "All" ; SFXSTYLEBIT_ALL ; > ;
-                < "Applied Styles" ; SFXSTYLEBIT_USED ; > ;
-                < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ;
+                < "All"             ; SFXSTYLEBIT_ALL       ; > ;
+                < "Applied Styles"  ; SFXSTYLEBIT_USED      ; > ;
+                < "Custom Styles"   ; SFXSTYLEBIT_USERDEF   ; > ;
             };
-    };
+        };
         SfxStyleFamilyItem
         {
             StyleFamily = SFX_STYLE_FAMILY_PSEUDO ;
             FilterList [ en-US ] =
             {
-                < "All" ; SFXSTYLEBIT_ALL ; > ;
-                < "Applied Styles" ; SFXSTYLEBIT_USED ; > ;
-                < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ;
+                < "All"             ; SFXSTYLEBIT_ALL       ; > ;
+                < "Applied Styles"  ; SFXSTYLEBIT_USED      ; > ;
+                < "Custom Styles"   ; SFXSTYLEBIT_USERDEF   ; > ;
             };
             Text [ en-US ] = "List Styles" ;
-    };
+        };
     };
 
     ImageList 1 // == BMP_COLOR_NORMAL + 1
@@ -177,20 +165,15 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
         Prefix = "sf";
         STYLE_IMAGE_LISTEF
     };
-    ImageList 2 // == BMP_COLOR_HIGHCONTRAST + 1
-    {
-        Prefix = "sfh";
-        STYLE_IMAGE_LISTEF
-    };
 };
 
 
 
- // Default Bitmap fuer Toolbox
+// Default Bitmap fuer Toolbox
 BITMAP BMP_FEHLT { FILE = "x.bmp" ; };
- // Bitmap fuer die NumerierungsVorlagen im Organizer
+
+// Bitmap fuer die NumerierungsVorlagen im Organizer
 Bitmap BMP_STYLES_FAMILY_NUM { File = "styfamnu.bmp" ; };
-Bitmap BMP_STYLES_FAMILY_NUM_HC { File = "styfamnu_h.bmp" ; };
 
 String STR_ENV_TITLE
 {
@@ -223,18 +206,17 @@ String STR_CANTCREATE
 {
     Text [ en-US ] = "Can't create document.";
 };
+
 String STR_DLLNOTFOUND
 {
     Text [ en-US ] = "Filter not found." ;
 };
 
-
 String STR_UNBENANNT
 {
     Text [ en-US ] = "Untitled" ;
 };
 
-
 String STR_LOAD_GLOBAL_DOC
 {
     Text [ en-US ] = "Name and Path of Master Document" ;
@@ -251,6 +233,7 @@ InfoBox MSG_ERROR_SEND_MAIL
     DEFBUTTON = WB_DEF_OK ;
     Message [ en-US ] = "Error sending mail." ;
 };
+
 InfoBox MSG_ERROR_PASSWD
 {
     BUTTONS = WB_OK ;
@@ -395,16 +378,6 @@ Bitmap RID_GRAPHIC_ERRORBMP
     File = "grafikde.bmp" ;
 };
 
-Bitmap RID_GRAPHIC_REPLACEBMP_HC
-{
-    File = "grafikei_h.bmp" ;
-};
-
-Bitmap RID_GRAPHIC_ERRORBMP_HC
-{
-    File = "grafikde_h.bmp" ;
-};
-
 String STR_TABLE_DEFNAME
 {
     Text [ en-US ] = "Table" ;
@@ -424,14 +397,17 @@ String STR_FRAME_DEFNAME
 {
     Text [ en-US ] = "Frame" ;
 };
+
 String STR_REGION_DEFNAME
 {
     Text [ en-US ] = "Section" ;
 };
+
 String STR_NUMRULE_DEFNAME
 {
     Text [ en-US ] = "Numbering" ;
 };
+
 String STR_EMPTYPAGE
 {
     Text [ en-US ] = "blank page" ;
@@ -456,6 +432,7 @@ QueryBox MSG_SAVEAS_HTML_QUERY
     DEFBUTTON = WB_DEF_NO ;
     Message [ en-US ] = "The source code can only be displayed if the document is saved in HTML format.\nWould you like to save the document as HTML?";
 };
+
 String STR_ABSTRACT_TITLE
 {
     Text [ en-US ] = "Abstract: " ;
@@ -485,18 +462,22 @@ String STR_PAGEOFFSET
 {
     Text [ en-US ] = "Page number: " ;
 };
+
 String STR_PAGEBREAK
 {
     Text [ en-US ] = "Break before new page" ;
 };
+
 String STR_WESTERN_FONT
 {
     Text [ en-US ] = "Western text: ";
 };
+
 String STR_CJK_FONT
 {
     Text [ en-US ] = "Asian text: ";
 };
+
 String STR_REDLINE_UNKNOWN_AUTHOR
 {
     Text [ en-US ] = "Unknown Author";
@@ -508,6 +489,7 @@ WarningBox MSG_DISABLE_UNDO_QUESTION
     DEFBUTTON = WB_DEF_YES ;
     Message [ en-US ] = "This action deletes the list of actions that can be undone. Previous changes made to the document are still valid, but cannot be undone. Do you want to continue formatting?";
 };
+
 QueryBox MSG_PRINT_AS_MERGE
 {
     HelpId = HID_PRINT_AS_MERGE;
@@ -515,6 +497,7 @@ QueryBox MSG_PRINT_AS_MERGE
     DefButton = WB_DEF_YES ;
     Message [ en-US ] = "Your document contains address database fields. Do you want to print a form letter?";
 };
+
 ModalDialog DLG_MERGE_SOURCE_UNAVAILABLE
 {
     HelpId = HID_MERGE_SOURCE_UNAVAILABLE;
@@ -547,6 +530,7 @@ ModalDialog DLG_MERGE_SOURCE_UNAVAILABLE
         Size = MAP_APPFONT ( 50 , 14 ) ;
     };
 };
+
 WarningBox MSG_DATA_SOURCES_UNAVAILABLE
 {
     HelpId = HID_DATA_SOURCES_UNAVAILABLE;
@@ -558,14 +542,17 @@ String RID_MODULE_TOOLBOX
 {
     Text [ en-US ] = "Function Bar (viewing mode)" ;
 };
+
 String  STR_DONT_ASK_AGAIN
 {
     Text [ en-US ] = "~Do not show warning again" ;
 };
+
 String STR_OUTLINE_NUMBERING
 {
     Text [ en-US ] = "Outline Numbering";
 };
+
 ToolBox RID_MODULE_TOOLBOX
 {
     HelpID = HID_MODULE_TOOLBOX ;
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx
index 2a3299498c7a..69fab57fc4d6 100644
--- a/sw/source/ui/app/appopt.cxx
+++ b/sw/source/ui/app/appopt.cxx
@@ -165,17 +165,17 @@ SfxItemSet*  SwModule::CreateItemSet( USHORT nId )
 
         using namespace ::com::sun::star::i18n::ScriptType;
 
-        Any aLang = aLinguCfg.GetProperty(C2U("DefaultLocale"));
+        Any aLang = aLinguCfg.GetProperty(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultLocale")));
         aLang >>= aLocale;
         nLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aLocale), LATIN);
         pRet->Put(SvxLanguageItem(nLang, SID_ATTR_LANGUAGE));
 
-        aLang = aLinguCfg.GetProperty(C2U("DefaultLocale_CJK"));
+        aLang = aLinguCfg.GetProperty(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultLocale_CJK")));
         aLang >>= aLocale;
         nLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aLocale), ASIAN);
         pRet->Put(SvxLanguageItem(nLang, SID_ATTR_CHAR_CJK_LANGUAGE));
 
-        aLang = aLinguCfg.GetProperty(C2U("DefaultLocale_CTL"));
+        aLang = aLinguCfg.GetProperty(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultLocale_CTL")));
         aLang >>= aLocale;
         nLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aLocale), COMPLEX);
         pRet->Put(SvxLanguageItem(nLang, SID_ATTR_CHAR_CTL_LANGUAGE));
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index a7083b41cb14..2b93dde31b54 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -442,8 +442,8 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium )
                 GetModel(), uno::UNO_QUERY_THROW);
             uno::Reference<document::XDocumentProperties> xDocProps
                 = xDPS->getDocumentProperties();
-            xDocProps->setTemplateName(::rtl::OUString::createFromAscii(""));
-            xDocProps->setTemplateURL(::rtl::OUString::createFromAscii(""));
+            xDocProps->setTemplateName(::rtl::OUString());
+            xDocProps->setTemplateURL(::rtl::OUString());
             xDocProps->setTemplateDate(::util::DateTime());
         }
     }
@@ -984,12 +984,6 @@ sal_uInt16 SwDocShell::GetHiddenInformationState( sal_uInt16 nStates )
 }
 // <--
 
-
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void SwDocShell::GetState(SfxItemSet& rSet)
 {
     SfxWhichIter aIter(rSet);
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 4531e1bfc1d4..4929b8ea08b5 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -1458,32 +1458,18 @@ void lcl_processCompatibleSfxHint( const uno::Reference< document::XVbaEventsHel
 }
 #endif
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 long SwDocShell::DdeGetData( const String& rItem, const String& rMimeType,
                                 uno::Any & rValue )
 {
     return pDoc->GetData( rItem, rMimeType, rValue );
 }
 
-
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 long SwDocShell::DdeSetData( const String& rItem, const String& rMimeType,
                             const uno::Any & rValue )
 {
     return pDoc->SetData( rItem, rMimeType, rValue );
 }
 
-
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 ::sfx2::SvLinkSource* SwDocShell::DdeCreateLinkSource( const String& rItem )
 {
     return pDoc->CreateLinkSource( rItem );
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index 842e79829def..cfb9a34d70e0 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -87,11 +87,6 @@
 
 using namespace ::com::sun::star;
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void  SwDocShell::StateStyleSheet(SfxItemSet& rSet, SwWrtShell* pSh)
 {
     SfxWhichIter aIter(rSet);
@@ -1261,17 +1256,11 @@ void SwDocShell::FormatPage( const String& rPage, BOOL bColumn, SwWrtShell*
     Edit( rPage, aEmptyStr, SFX_STYLE_FAMILY_PAGE, 0, FALSE, bColumn, pActShell);
 }
 
-Bitmap SwDocShell::GetStyleFamilyBitmap( SfxStyleFamily eFamily, BmpColorMode eColorMode )
+Bitmap SwDocShell::GetStyleFamilyBitmap( SfxStyleFamily eFamily )
 {
     if( SFX_STYLE_FAMILY_PSEUDO == eFamily )
-    {
-        if ( eColorMode == BMP_COLOR_NORMAL )
-            return Bitmap( SW_RES( BMP_STYLES_FAMILY_NUM ));
-        else
-            return Bitmap( SW_RES( BMP_STYLES_FAMILY_NUM_HC ));
-    }
-
-    return SfxObjectShell::GetStyleFamilyBitmap( eFamily, eColorMode );
+        return Bitmap( SW_RES( BMP_STYLES_FAMILY_NUM ));
+    return SfxObjectShell::GetStyleFamilyBitmap( eFamily );
 }
 
 
diff --git a/sw/source/ui/app/makefile.mk b/sw/source/ui/app/makefile.mk
index 88f9ff9d6398..6048ad2ce8a0 100644
--- a/sw/source/ui/app/makefile.mk
+++ b/sw/source/ui/app/makefile.mk
@@ -50,6 +50,9 @@ SRC1FILES =\
 
 
 SLOFILES = \
+        $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES= \
         $(SLO)$/appenv.obj   \
         $(SLO)$/apphdl.obj   \
         $(SLO)$/applab.obj   \
@@ -61,19 +64,10 @@ SLOFILES = \
         $(SLO)$/docst.obj    \
         $(SLO)$/docstyle.obj \
         $(SLO)$/mainwn.obj   \
-        $(SLO)$/swmodule.obj \
+        $(SLO)$/swdll.obj    \
         $(SLO)$/swmodul1.obj \
-        $(SLO)$/swdll.obj	 \
-        $(SLO)$/swwait.obj
-
-EXCEPTIONSFILES= \
-        $(SLO)$/docsh.obj    \
-        $(SLO)$/docst.obj    \
-        $(SLO)$/docshini.obj \
         $(SLO)$/swmodule.obj \
-        $(SLO)$/swmodul1.obj \
-            $(SLO)$/apphdl.obj   \
-        $(SLO)$/docsh2.obj
+        $(SLO)$/swwait.obj
 
 LIB1TARGET= $(SLB)$/app.lib
 
diff --git a/sw/source/ui/cctrl/makefile.mk b/sw/source/ui/cctrl/makefile.mk
index 33ba83f34d7c..9a72754367f4 100644
--- a/sw/source/ui/cctrl/makefile.mk
+++ b/sw/source/ui/cctrl/makefile.mk
@@ -46,13 +46,13 @@ CXXFILES = \
         swlbox.cxx
 
 SLOFILES =  \
+        $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
         $(SLO)$/actctrl.obj \
         $(SLO)$/popbox.obj \
         $(SLO)$/swlbox.obj
 
-EXCEPTIONSFILES = \
-        $(SLO)$/popbox.obj
-
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/sw/source/ui/chrdlg/makefile.mk b/sw/source/ui/chrdlg/makefile.mk
index 42aad1aeddf1..8d8c3624b3f3 100644
--- a/sw/source/ui/chrdlg/makefile.mk
+++ b/sw/source/ui/chrdlg/makefile.mk
@@ -48,15 +48,18 @@ SRC1FILES =	\
         paradlg.src \
         numpara.src
 
-SLOFILES =	\
+EXCEPTIONSFILES = \
         $(SLO)$/break.obj \
+        $(SLO)$/ccoll.obj \
         $(SLO)$/chardlg.obj \
         $(SLO)$/drpcps.obj \
-        $(SLO)$/ccoll.obj \
-        $(SLO)$/swuiccoll.obj \
+        $(SLO)$/numpara.obj \
         $(SLO)$/pardlg.obj \
-        $(SLO)$/tblnumfm.obj \
-        $(SLO)$/numpara.obj
+        $(SLO)$/swuiccoll.obj \
+        $(SLO)$/tblnumfm.obj
+
+SLOFILES =	\
+        $(EXCEPTIONSFILES)
         
 LIB1TARGET = $(SLB)$/$(TARGET).lib
 
diff --git a/sw/source/ui/config/fontcfg.cxx b/sw/source/ui/config/fontcfg.cxx
index 6b42b0e8d110..136f5b2eee5c 100644
--- a/sw/source/ui/config/fontcfg.cxx
+++ b/sw/source/ui/config/fontcfg.cxx
@@ -264,10 +264,6 @@ String  SwStdFontConfig::GetDefaultFor(USHORT nFontType, LanguageType eLang)
         case FONT_INDEX_CTL   :
             nFontId = DEFAULTFONT_CTL_TEXT;
         break;
-//        case FONT_STANDARD:
-//        case FONT_LIST    :
-//        case FONT_CAPTION :
-//        case FONT_INDEX   :
         default:
             nFontId = DEFAULTFONT_LATIN_TEXT;
     }
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index 688a79e6aecc..25e55cea4460 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -268,7 +268,7 @@ SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage* pPare
 #ifdef MSC
 #pragma warning (default : 4355)
 #endif
-    m_aImageList( SW_RES( GetSettings().GetStyleSettings().GetHighContrastMode() ? ILIST_HC : ILIST) ),
+    m_aImageList( SW_RES(ILIST) ),
     m_sTask( SW_RES(        ST_TASK          )),
     m_sStatus( SW_RES(      ST_STATUS        )),
     m_sEstablish( SW_RES(   ST_ESTABLISH     )),
@@ -404,8 +404,7 @@ void SwTestAccountSettingsDialog::Test()
                     new SwConnectionContext(
                         m_pParent->m_aServerED.GetText(),
                         sal::static_int_cast< sal_Int16, sal_Int64 >(m_pParent->m_aPortNF.GetValue()),
-                        ::rtl::OUString::createFromAscii(
-                                m_pParent->m_aSecureCB.IsChecked() ? "Ssl" : "Insecure"));
+                        m_pParent->m_aSecureCB.IsChecked() ? OUString(RTL_CONSTASCII_USTRINGPARAM("Ssl")) : OUString(RTL_CONSTASCII_USTRINGPARAM("Insecure")));
             xMailService->connect(xConnectionContext, xAuthenticator);
             bIsLoggedIn = xMailService->isConnected();
             if( xInMailService.is() )
diff --git a/sw/source/ui/config/mailconfigpage.hrc b/sw/source/ui/config/mailconfigpage.hrc
index a7115878ccf5..7ff97978f968 100644
--- a/sw/source/ui/config/mailconfigpage.hrc
+++ b/sw/source/ui/config/mailconfigpage.hrc
@@ -61,7 +61,6 @@
 #define ST_FAILED                   44
 #define ST_ERROR_SERVER             46
 #define ILIST                       47
-#define ILIST_HC                    48
 
 #define CB_AUTHENTICATION           50
 #define RB_SEP_AUTHENTICATION       51
diff --git a/sw/source/ui/config/mailconfigpage.src b/sw/source/ui/config/mailconfigpage.src
index 1ad1378222c0..45401a0d4414 100644
--- a/sw/source/ui/config/mailconfigpage.src
+++ b/sw/source/ui/config/mailconfigpage.src
@@ -219,13 +219,6 @@ ModalDialog DLG_MM_TESTACCOUNTSETTINGS
         MaskColor = IMAGE_MASK_COLOR;
         IMGLIST_IDS;
     };
-
-    ImageList ILIST_HC
-    {
-        Prefix = "sch";
-        MaskColor = IMAGE_MASK_COLOR ;
-        IMGLIST_IDS;
-    };
     String ST_TASK
     {
         Text[ en-US ] = "Task";
diff --git a/sw/source/ui/config/makefile.mk b/sw/source/ui/config/makefile.mk
index 4b8ed01ca90e..d624e466c8bb 100644
--- a/sw/source/ui/config/makefile.mk
+++ b/sw/source/ui/config/makefile.mk
@@ -49,24 +49,24 @@ SRC1FILES =	\
         redlopt.src
 
 EXCEPTIONSFILES = \
-        $(SLO)$/mailconfigpage.obj \
-        $(SLO)$/optcomp.obj \
-        $(SLO)$/optload.obj
-
-SLOFILES =	\
-        $(EXCEPTIONSFILES) \
         $(SLO)$/barcfg.obj \
-        $(SLO)$/caption.obj \
         $(SLO)$/cfgitems.obj \
-        $(SLO)$/dbconfig.obj \
         $(SLO)$/fontcfg.obj \
+        $(SLO)$/mailconfigpage.obj \
         $(SLO)$/modcfg.obj \
+        $(SLO)$/optcomp.obj \
+        $(SLO)$/optload.obj \
         $(SLO)$/optpage.obj \
         $(SLO)$/prtopt.obj \
         $(SLO)$/uinums.obj \
         $(SLO)$/usrpref.obj \
         $(SLO)$/viewopt.obj
 
+SLOFILES =	\
+        $(EXCEPTIONSFILES) \
+        $(SLO)$/caption.obj \
+        $(SLO)$/dbconfig.obj
+
 LIB1TARGET= $(SLB)$/$(TARGET).lib
 
 LIB1OBJFILES = \
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 56cd16c526ce..5374a86e397b 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -313,8 +313,6 @@ SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent,
     SfxTabPage( pParent, SW_RES( TP_OPTPRINT_PAGE ), rCoreSet),
     aFL1          (this, SW_RES(FL_1)),
     aGrfCB           (this, SW_RES(CB_PGRF)),
-//  aTabCB           (this, SW_RES(CB_PTAB)),
-//  aDrawCB          (this, SW_RES(CB_PDRAW)),
     aCtrlFldCB       (this, SW_RES(CB_CTRLFLD)),
     aBackgroundCB    (this, SW_RES(CB_BACKGROUND)),
     aBlackFontCB     (this, SW_RES(CB_BLACK_FONT)),
@@ -324,7 +322,6 @@ SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent,
     aFL2          (this, SW_RES(FL_2)),
     aLeftPageCB      (this, SW_RES(CB_LEFTP)),
     aRightPageCB     (this, SW_RES(CB_RIGHTP)),
-//    aReverseCB       (this, SW_RES(CB_REVERSE)),
     aProspectCB      (this, SW_RES(CB_PROSPECT)),
     aProspectCB_RTL      (this, SW_RES(CB_PROSPECT_RTL)),
     aSeparatorRFL    (this, SW_RES(FL_SEP_PRT_RIGHT)),
@@ -335,7 +332,6 @@ SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent,
     aFL3          (this, SW_RES(FL_3)),
     aFL4          (this, SW_RES(FL_4)),
     aPrintEmptyPagesCB(this, SW_RES(CB_PRINTEMPTYPAGES)),
-//    aSingleJobsCB    (this, SW_RES(CB_SINGLEJOBS)),
     aPaperFromSetupCB(this, SW_RES(CB_PAPERFROMSETUP)),
     aFaxFT           (this, SW_RES(FT_FAX)),
     aFaxLB           (this, SW_RES(LB_FAX)),
@@ -349,14 +345,11 @@ SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent,
     aGrfCB.SetClickHdl( aLk );
     aRightPageCB.SetClickHdl( aLk );
     aLeftPageCB.SetClickHdl( aLk );
-//  aTabCB.SetClickHdl( aLk );
-//  aDrawCB.SetClickHdl( aLk );
     aCtrlFldCB.SetClickHdl( aLk );
     aBackgroundCB.SetClickHdl( aLk );
     aBlackFontCB.SetClickHdl( aLk );
     aPrintHiddenTextCB.SetClickHdl( aLk );
     aPrintTextPlaceholderCB.SetClickHdl( aLk );
-//  aReverseCB.SetClickHdl( aLk );
     aProspectCB.SetClickHdl( aLk );
     aProspectCB_RTL.SetClickHdl( aLk );
     aPaperFromSetupCB.SetClickHdl( aLk );
@@ -365,27 +358,20 @@ SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent,
     aEndRB.SetClickHdl( aLk );
     aOnlyRB.SetClickHdl( aLk );
     aNoRB.SetClickHdl( aLk );
-//  aSingleJobsCB.SetClickHdl( aLk );
     aFaxLB.SetSelectHdl( LINK( this, SwAddPrinterTabPage, SelectHdl ) );
 
     const SfxPoolItem* pItem;
     if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_HTML_MODE, FALSE, &pItem )
         && ((SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON)
     {
-//      aDrawCB      .Hide();
         aLeftPageCB  .Hide();
         aRightPageCB .Hide();
         aPrintHiddenTextCB.Hide();
         aPrintTextPlaceholderCB.Hide();
-//      aReverseCB.SetPosPixel(aLeftPageCB.GetPosPixel());
         aProspectCB.SetPosPixel(aLeftPageCB.GetPosPixel());
         Point aPt( aRightPageCB.GetPosPixel() );
         aPt.setX(aPt.getX() + 15); // indent
         aProspectCB_RTL.SetPosPixel(aPt);
-//      aBlackFontCB.SetPosPixel(aBackgroundCB.GetPosPixel());
-//        aPrintHiddenTextCB.SetPosPixel(aBlackFontCB.GetPosPixel());
-//      aBackgroundCB.SetPosPixel(aCtrlFldCB.GetPosPixel());
-//      aCtrlFldCB.SetPosPixel(aDrawCB.GetPosPixel());
 
         // hide aPrintEmptyPagesCB and move everything below up accordingly
         long nDeltaY = aPaperFromSetupCB.GetPosPixel().getY() - aPrintEmptyPagesCB.GetPosPixel().getY();
@@ -477,8 +463,6 @@ void    SwAddPrinterTabPage::Reset( const SfxItemSet&  )
                                     (const SfxPoolItem**)&pAddPrinterAttr ))
     {
         aGrfCB.Check(           pAddPrinterAttr->bPrintGraphic || pAddPrinterAttr->bPrintDraw );
-//      aTabCB.Check(           pAddPrinterAttr->bPrintTable);
-//        aDrawCB.Check(          pAddPrinterAttr->bPrintDraw);
         aCtrlFldCB.Check(       pAddPrinterAttr->bPrintControl);
         aBackgroundCB.Check(    pAddPrinterAttr->bPrintPageBackground);
         aBlackFontCB.Check(     pAddPrinterAttr->bPrintBlackFont);
@@ -486,12 +470,10 @@ void    SwAddPrinterTabPage::Reset( const SfxItemSet&  )
         aPrintTextPlaceholderCB.Check(pAddPrinterAttr->bPrintTextPlaceholder);
         aLeftPageCB.Check(      pAddPrinterAttr->bPrintLeftPages);
         aRightPageCB.Check(     pAddPrinterAttr->bPrintRightPages);
-//      aReverseCB.Check(       pAddPrinterAttr->bPrintReverse);
         aPaperFromSetupCB.Check(pAddPrinterAttr->bPaperFromSetup);
         aPrintEmptyPagesCB.Check(pAddPrinterAttr->bPrintEmptyPages);
         aProspectCB.Check(      pAddPrinterAttr->bPrintProspect);
         aProspectCB_RTL.Check(      pAddPrinterAttr->bPrintProspectRTL);
-//      aSingleJobsCB.Check(    pAddPrinterAttr->bPrintSingleJobs);
 
         aNoRB.Check (pAddPrinterAttr->nPrintPostIts== POSTITS_NONE ) ;
         aOnlyRB.Check (pAddPrinterAttr->nPrintPostIts== POSTITS_ONLY ) ;
@@ -548,7 +530,6 @@ IMPL_LINK_INLINE_END( SwAddPrinterTabPage, SelectHdl, ListBox *, EMPTYARG )
 
 void SwAddPrinterTabPage::PageCreated (SfxAllItemSet aSet)
 {
-    //SFX_ITEMSET_ARG (&aSet,pListItem,SfxStringListItem,SID_FAX_LIST,sal_False);
     SFX_ITEMSET_ARG (&aSet,pListItem,SfxBoolItem,SID_FAX_LIST,sal_False);
     SFX_ITEMSET_ARG (&aSet,pPreviewItem,SfxBoolItem,SID_PREVIEWFLAG_TYPE,sal_False);
     if (pPreviewItem)
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index 4986d1f1b745..2be8468df83d 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -29,20 +29,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-
-
-
 #include <hintids.hxx>
 #include <svl/urihelper.hxx>
 #include <unotools/pathoptions.hxx>
 #include <tools/stream.hxx>
-#ifndef _SFX_INIMGR_HXX
-#endif
 #include <sfx2/docfile.hxx>
 #include <svl/itemiter.hxx>
 #include <editeng/brshitem.hxx>
 
-
 #include <tools/resid.hxx>
 #include <fmtornt.hxx>
 #include <swtypes.hxx>      // Leerstring
diff --git a/sw/source/ui/dbui/createaddresslistdialog.src b/sw/source/ui/dbui/createaddresslistdialog.src
index b43a373cd047..c7bbe2f1b658 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.src
+++ b/sw/source/ui/dbui/createaddresslistdialog.src
@@ -29,9 +29,6 @@
 #include <dbui.hrc>
 #include <helpid.h>
 
-/*-- 13.04.2004 13:58:13---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 ModalDialog DLG_MM_CREATEADDRESSLIST
 {
     OutputSize = TRUE ;
@@ -164,9 +161,6 @@ ModalDialog DLG_MM_CREATEADDRESSLIST
     };
 };
 
-/*-- 13.04.2004 13:58:13---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 ModelessDialog DLG_MM_FIND_ENTRY
 {
     OutputSize = TRUE ;
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx
index a8c10a42e958..1989499cb7f7 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx
@@ -35,9 +35,7 @@
 #include <vcl/lstbox.hxx>
 
 struct SwCSVData;
-/*-- 08.04.2004 14:04:39---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 class SwCustomizeAddressListDialog : public SfxModalDialog
 {
     FixedText               m_aFieldsFT;
@@ -70,9 +68,7 @@ public:
 
     SwCSVData*    GetNewData();
 };
-/*-- 13.04.2004 13:30:21---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 class SwAddRenameEntryDialog : public SfxModalDialog
 {
     FixedText               m_aFieldNameFT;
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.src b/sw/source/ui/dbui/customizeaddresslistdialog.src
index 21e32ecb89c4..ae81c4a2eef6 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.src
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.src
@@ -29,9 +29,6 @@
 #include <dbui.hrc>
 #include <helpid.h>
 
-/*-- 13.04.2004 13:58:13---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 ModalDialog DLG_MM_CUSTOMIZE_ADDRESS_LIST
 {
     OutputSize = TRUE ;
@@ -108,9 +105,7 @@ ModalDialog DLG_MM_CUSTOMIZE_ADDRESS_LIST
         Size = MAP_APPFONT ( 50 , 14 ) ;
     };
 };
-/*-- 13.04.2004 13:58:13---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ModalDialog DLG_MM_ADD_RENAME_ENTRY
 {
     OutputSize = TRUE ;
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 1dad568b16b0..608a0555f745 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -455,7 +455,6 @@ SwInsertDBColAutoPilot::~SwInsertDBColAutoPilot()
     delete pTblSet;
     delete pRep;
 
-//  delete pConfig;
     delete pTAutoFmt;
 }
 
@@ -1181,12 +1180,14 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
                     }
                 }
                 catch(Exception&
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
                             aExcept
 #endif
                 )
                 {
+#if OSL_DEBUG_LEVEL > 1
                     OSL_ENSURE(false, ByteString(String(aExcept.Message), gsl_getSystemTextEncoding()).GetBuffer());
+#endif
                 }
             }
 
@@ -1401,14 +1402,12 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
                         // Cursor am Ende wieder auf Anfangsposition
                         // gesetzt werden kann.
 
-                        // rSh.SwCrsrShell::MovePara( fnParaCurr, fnParaStart );
                         rSh.SwCrsrShell::MovePara(
                             GetfnParaCurr(), GetfnParaStart() );
                         pMark = rSh.SetBookmark(
                             KeyCode(),
                             ::rtl::OUString(),
                             ::rtl::OUString(), IDocumentMarkAccess::UNO_BOOKMARK );
-                        // rSh.SwCrsrShell::MovePara( fnParaCurr, fnParaEnd );
                         rSh.SwCrsrShell::MovePara(
                             GetfnParaCurr(), GetfnParaEnd() );
                         bSetCrsr = FALSE;
@@ -1804,7 +1803,6 @@ void SwInsertDBColAutoPilot::Load()
                 pInsDBColumn->nUsrNumFmt = rNFmtr.GetEntryKey( pInsDBColumn->sUsrNumFmt,
                                                         pInsDBColumn->eUsrNumFmtLng );
 
-//              pInsDBColumn->nDBNumFmt
 
                 pNewData->aDBColumns.Insert(pInsDBColumn);
             }
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index eb9321926c25..19481fed576b 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -1157,9 +1157,8 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
                                     }
                                     else
                                     {
-                                        SwMailMessage* pMessage = 0;
-                                        uno::Reference< mail::XMailMessage > xMessage =
-                                                                pMessage = new SwMailMessage;
+                                        SwMailMessage* pMessage = new SwMailMessage;
+                                        uno::Reference< mail::XMailMessage > xMessage = pMessage;
                                         if(rMergeDescriptor.pMailMergeConfigItem->IsMailReplyTo())
                                             pMessage->setReplyToAddress(rMergeDescriptor.pMailMergeConfigItem->GetMailReplyTo());
                                         pMessage->addRecipient( sMailAddress );
@@ -1288,10 +1287,6 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
                     aOptions.realloc( nOpts + 1 );
                     aOptions[ nOpts ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wait"));
                     aOptions[ nOpts ].Value <<= sal_True ;
-//                    aPrintArgs.Put(SfxBoolItem(FN_QRY_MERGE, TRUE) );
-//                    // #i52629# aynchronous printing should only be done in silent mode - otherwise
-//                    // the printer dialog does not come up
-//                    aPrintArgs.Put( SfxBoolItem( SID_ASYNCHRON, rMergeDescriptor.bPrintAsync ));
                     // move print options
                     const beans::PropertyValue* pPrintOptions = rMergeDescriptor.aPrintOptions.getConstArray();
                     for( sal_Int32 nOption = 0; nOption < rMergeDescriptor.aPrintOptions.getLength(); ++nOption)
@@ -1308,14 +1303,7 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
                         }
                     }
 
-//                    const SwModuleOptions * pModOpt = SW_MOD()->GetModuleConfig();
-//                    if (pModOpt->IsSinglePrintJob())
-//                    {
-//                    }
-//                    else
-//                    {
                         pTargetView->ExecPrint( aOptions, IsMergeSilent(), rMergeDescriptor.bPrintAsync );
-//                    }
                 }
                 xTargetDocShell->DoClose();
             }
@@ -2750,7 +2738,6 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
         Window& rSourceWindow = rSourceView.GetViewFrame()->GetFrame().GetWindow();
         rTargetWindow.SetPosPixel(rSourceWindow.GetPosPixel());
 
-//        pTargetFrame->GetFrame().Appear();
         SwView* pTargetView = static_cast<SwView*>( pTargetFrame->GetViewShell() );
         rMMConfig.SetTargetView(pTargetView);
         //initiate SelectShell() to create sub shells
diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx
index 4cf314bf3111..74e92b096b90 100644
--- a/sw/source/ui/dbui/dbtree.cxx
+++ b/sw/source/ui/dbui/dbtree.cxx
@@ -195,7 +195,6 @@ SwDBTreeList::SwDBTreeList(Window *pParent, const ResId& rResId,
 
     SvTreeListBox   (pParent, rResId),
     aImageList      (SW_RES(ILIST_DB_DLG    )),
-    aImageListHC    (SW_RES(ILIST_DB_DLG_HC )),
     sDefDBName      (rDefDBName),
     bInitialized    (FALSE),
     bShowColumns    (bShowCol),
@@ -221,9 +220,7 @@ void SwDBTreeList::InitTreeList()
     // Font nicht setzen, damit der Font des Controls uebernommen wird!
     SetSpaceBetweenEntries(0);
     SetNodeBitmaps( aImageList.GetImage(IMG_COLLAPSE),
-                    aImageList.GetImage(IMG_EXPAND  ), BMP_COLOR_NORMAL );
-    SetNodeBitmaps( aImageListHC.GetImage(IMG_COLLAPSE),
-                    aImageListHC.GetImage(IMG_EXPAND  ), BMP_COLOR_HIGHCONTRAST );
+                    aImageList.GetImage(IMG_EXPAND  ) );
 
     SetDragDropMode(SV_DRAGDROP_APP_COPY);
 
@@ -234,30 +231,23 @@ void SwDBTreeList::InitTreeList()
     long nCount = aDBNames.getLength();
 
     Image aImg = aImageList.GetImage(IMG_DB);
-    Image aHCImg = aImageListHC.GetImage(IMG_DB);
     for(long i = 0; i < nCount; i++)
     {
         String sDBName(pDBNames[i]);
-        SvLBoxEntry* pEntry = InsertEntry(sDBName, aImg, aImg, NULL, TRUE);
-        SetExpandedEntryBmp(pEntry, aHCImg, BMP_COLOR_HIGHCONTRAST);
-        SetCollapsedEntryBmp(pEntry, aHCImg, BMP_COLOR_HIGHCONTRAST);
+        InsertEntry(sDBName, aImg, aImg, NULL, TRUE);
     }
     String sDBName(sDefDBName.GetToken(0, DB_DELIM));
     String sTableName(sDefDBName.GetToken(1, DB_DELIM));
     String sColumnName(sDefDBName.GetToken(2, DB_DELIM));
     Select(sDBName, sTableName, sColumnName);
 
-
     bInitialized = TRUE;
 }
 
 void    SwDBTreeList::AddDataSource(const String& rSource)
 {
     Image aImg = aImageList.GetImage(IMG_DB);
-    Image aHCImg = aImageListHC.GetImage(IMG_DB);
     SvLBoxEntry* pEntry = InsertEntry(rSource, aImg, aImg, NULL, TRUE);
-    SetExpandedEntryBmp(pEntry, aHCImg, BMP_COLOR_HIGHCONTRAST);
-    SetCollapsedEntryBmp(pEntry, aHCImg, BMP_COLOR_HIGHCONTRAST);
     SvTreeListBox::Select(pEntry);
 }
 
@@ -386,15 +376,12 @@ void  SwDBTreeList::RequestingChilds(SvLBoxEntry* pParent)
                         long nCount = aTblNames.getLength();
                         const ::rtl::OUString* pTblNames = aTblNames.getConstArray();
                         Image aImg = aImageList.GetImage(IMG_DBTABLE);
-                        Image aHCImg = aImageListHC.GetImage(IMG_DBTABLE);
                         for (long i = 0; i < nCount; i++)
                         {
                             sTableName = pTblNames[i];
                             SvLBoxEntry* pTableEntry = InsertEntry(sTableName, aImg, aImg, pParent, bShowColumns);
                             //to discriminate between queries and tables the user data of table entries is set
                             pTableEntry->SetUserData((void*)0);
-                            SetExpandedEntryBmp(pTableEntry, aHCImg, BMP_COLOR_HIGHCONTRAST);
-                            SetCollapsedEntryBmp(pTableEntry, aHCImg, BMP_COLOR_HIGHCONTRAST);
                         }
                     }
 
@@ -407,14 +394,11 @@ void  SwDBTreeList::RequestingChilds(SvLBoxEntry* pParent)
                         long nCount = aQueryNames.getLength();
                         const ::rtl::OUString* pQueryNames = aQueryNames.getConstArray();
                         Image aImg = aImageList.GetImage(IMG_DBQUERY);
-                        Image aHCImg = aImageListHC.GetImage(IMG_DBQUERY);
                         for (long i = 0; i < nCount; i++)
                         {
                             sQueryName = pQueryNames[i];
                             SvLBoxEntry* pQueryEntry = InsertEntry(sQueryName, aImg, aImg, pParent, bShowColumns);
                             pQueryEntry->SetUserData((void*)1);
-                            SetExpandedEntryBmp(pQueryEntry, aHCImg, BMP_COLOR_HIGHCONTRAST);
-                            SetCollapsedEntryBmp( pQueryEntry, aHCImg, BMP_COLOR_HIGHCONTRAST);
                         }
                     }
                 }
@@ -543,7 +527,7 @@ sal_Int8 SwDBTreeList::AcceptDrop( const AcceptDropEvent& /*rEvt*/ )
     return DND_ACTION_NONE;
 }
 
-void    SwDBTreeList::SetWrtShell(SwWrtShell& rSh)
+void SwDBTreeList::SetWrtShell(SwWrtShell& rSh)
 {
     pImpl->SetWrtShell(rSh);
     if (IsVisible() && !bInitialized)
diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx
index 35013652c83b..0b1a06511172 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.cxx
+++ b/sw/source/ui/dbui/mailmergechildwindow.cxx
@@ -92,8 +92,7 @@ SwMailMergeChildWin::SwMailMergeChildWin( SfxBindings* _pBindings,
     m_aBackTB(this, SW_RES( TB_BACK ))
 {
     m_aBackTB.SetSelectHdl(LINK(this, SwMailMergeChildWin, BackHdl));
-    sal_uInt16 nIResId =  GetSettings().GetStyleSettings().GetHighContrastMode() ?
-        ILIST_TBX_HC : ILIST_TBX;
+    sal_uInt16 nIResId = ILIST_TBX;
     ResId aResId( nIResId, *pSwResMgr );
     ImageList aIList(aResId);
     FreeResource();
@@ -325,7 +324,6 @@ SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConf
     m_bCancel(false),
     m_bDesctructionEnabled(false),
     m_aImageList( SW_RES( ILIST ) ),
-    m_aImageListHC( SW_RES( ILIST_HC ) ),
     m_pImpl(new SwSendMailDialog_Impl),
     m_pConfigItem(&rConfigItem),
     m_nSendCount(0),
@@ -562,9 +560,7 @@ void  SwSendMailDialog::IterateMails()
     {
         if(!SwMailMergeHelper::CheckMailAddress( pCurrentMailDescriptor->sEMail ))
         {
-            ImageList& rImgLst = GetSettings().GetStyleSettings().GetHighContrastMode() ?
-                                        m_aImageListHC : m_aImageList;
-            Image aInsertImg =   rImgLst.GetImage( FN_FORMULA_CANCEL );
+            Image aInsertImg = m_aImageList.GetImage( FN_FORMULA_CANCEL );
 
             String sMessage = m_sSendingTo;
             String sTmp(pCurrentMailDescriptor->sEMail);
@@ -578,8 +574,8 @@ void  SwSendMailDialog::IterateMails()
             pCurrentMailDescriptor = m_pImpl->GetNextDescriptor();
             continue;
         }
-        SwMailMessage* pMessage = 0;
-        uno::Reference< mail::XMailMessage > xMessage = pMessage = new SwMailMessage;
+        SwMailMessage* pMessage = new SwMailMessage;
+        uno::Reference< mail::XMailMessage > xMessage = pMessage;
         if(m_pConfigItem->IsMailReplyTo())
             pMessage->setReplyToAddress(m_pConfigItem->GetMailReplyTo());
         pMessage->addRecipient( pCurrentMailDescriptor->sEMail );
@@ -663,9 +659,7 @@ void SwSendMailDialog::DocumentSent( uno::Reference< mail::XMailMessage> xMessag
         Application::PostUserEvent( STATIC_LINK( this, SwSendMailDialog,
                                                     StopSendMails ), this );
     }
-    ImageList& rImgLst = GetSettings().GetStyleSettings().GetHighContrastMode() ?
-                                m_aImageListHC : m_aImageList;
-    Image aInsertImg =   rImgLst.GetImage( bResult ? FN_FORMULA_APPLY : FN_FORMULA_CANCEL );
+    Image aInsertImg = m_aImageList.GetImage( bResult ? FN_FORMULA_APPLY : FN_FORMULA_CANCEL );
 
     String sMessage = m_sSendingTo;
     String sTmp(xMessage->getRecipients()[0]);
diff --git a/sw/source/ui/dbui/mailmergechildwindow.hrc b/sw/source/ui/dbui/mailmergechildwindow.hrc
index 9b5931522975..deaebd021340 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.hrc
+++ b/sw/source/ui/dbui/mailmergechildwindow.hrc
@@ -27,7 +27,6 @@
 
 #define TB_BACK                     1
 #define ILIST_TBX                   90
-#define ILIST_TBX_HC                91
 
 #define FL_SEPARATOR                7
 
@@ -47,7 +46,6 @@
 #define ST_TASK                     73
 #define ST_STATUS                   74
 #define ILIST                       75
-#define ILIST_HC                    76
 #define ST_SEND                     77
 #define ST_SENDINGTO                78
 #define ST_COMPLETED                79
diff --git a/sw/source/ui/dbui/mailmergechildwindow.src b/sw/source/ui/dbui/mailmergechildwindow.src
index 3caf5b1a7607..b42043406947 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.src
+++ b/sw/source/ui/dbui/mailmergechildwindow.src
@@ -76,13 +76,6 @@ FloatingWindow DLG_MAILMERGECHILD\
         MaskColor = IMAGE_MASK_COLOR;
         IMGLIST1_IDS;
     };
-
-    ImageList ILIST_TBX_HC
-    {
-        Prefix = "sch";
-        MaskColor = IMAGE_MASK_COLOR ;
-        IMGLIST1_IDS;
-    };
 };
 
 //FloatingWindow DLG_MM_SENDMAILS
@@ -196,13 +189,6 @@ ModelessDialog /*ModalDialog*/ DLG_MM_SENDMAILS
         MaskColor = IMAGE_MASK_COLOR;
         IMGLIST2_IDS;
     };
-
-    ImageList ILIST_HC
-    {
-        Prefix = "sch";
-        MaskColor = IMAGE_MASK_COLOR ;
-        IMGLIST2_IDS;
-    };
     String ST_TASK
     {
         Text[ en-US ] = "Task";
diff --git a/sw/source/ui/dbui/mailmergehelper.cxx b/sw/source/ui/dbui/mailmergehelper.cxx
index 16332e3825f2..2357bb40317c 100644
--- a/sw/source/ui/dbui/mailmergehelper.cxx
+++ b/sw/source/ui/dbui/mailmergehelper.cxx
@@ -169,7 +169,7 @@ uno::Reference< mail::XSmtpService > ConnectToSmtpServer(
                     new SwConnectionContext(
                         rConfigItem.GetMailServer(),
                         rConfigItem.GetMailPort(),
-                        ::rtl::OUString::createFromAscii( rConfigItem.IsSecureConnection() ? "Ssl" : "Insecure"));
+                        rConfigItem.IsSecureConnection() ? OUString(RTL_CONSTASCII_USTRINGPARAM("Ssl")) : OUString(RTL_CONSTASCII_USTRINGPARAM("Insecure")) );
             xSmtpServer->connect(xConnectionContext, xAuthenticator);
             rxInMailService = uno::Reference< mail::XMailService >( xSmtpServer, uno::UNO_QUERY );
         }
@@ -662,13 +662,11 @@ SwConnectionListener::~SwConnectionListener()
 void SwConnectionListener::connected(const lang::EventObject& /*aEvent*/)
     throw (uno::RuntimeException)
 {
-    //OSL_ENSURE(false, "Connection opened");
 }
 
 void SwConnectionListener::disconnected(const lang::EventObject& /*aEvent*/)
     throw (uno::RuntimeException)
 {
-    //OSL_ENSURE(false, "Connection closed");
 }
 
 void SwConnectionListener::disposing(const lang::EventObject& /*aEvent*/)
diff --git a/sw/source/ui/dbui/makefile.mk b/sw/source/ui/dbui/makefile.mk
index c2477b02ca4a..f125f078510f 100644
--- a/sw/source/ui/dbui/makefile.mk
+++ b/sw/source/ui/dbui/makefile.mk
@@ -69,38 +69,24 @@ EXCEPTIONSFILES= \
         $(SLO)$/dbmgr.obj \
         $(SLO)$/dbtablepreviewdialog.obj \
         $(SLO)$/dbtree.obj \
+        $(SLO)$/dbui.obj \
         $(SLO)$/maildispatcher.obj \
         $(SLO)$/mailmergechildwindow.obj \
         $(SLO)$/mailmergehelper.obj \
-        $(SLO)$/mmaddressblockpage.obj \
-        $(SLO)$/mmconfigitem.obj \
-        $(SLO)$/mmlayoutpage.obj \
-        $(SLO)$/mmgreetingspage.obj \
-        $(SLO)$/mmoutputpage.obj
-
-SLOFILES =  \
-        $(SLO)$/addresslistdialog.obj \
-        $(SLO)$/createaddresslistdialog.obj \
-        $(SLO)$/customizeaddresslistdialog.obj \
-        $(SLO)$/dbinsdlg.obj \
-        $(SLO)$/dbmgr.obj \
-        $(SLO)$/dbtree.obj \
-        $(SLO)$/dbtablepreviewdialog.obj \
-        $(SLO)$/maildispatcher.obj \
-        $(SLO)$/mailmergehelper.obj \
         $(SLO)$/mailmergewizard.obj \
-        $(SLO)$/mailmergechildwindow.obj \
+        $(SLO)$/mmaddressblockpage.obj \
         $(SLO)$/mmconfigitem.obj \
         $(SLO)$/mmdocselectpage.obj \
+        $(SLO)$/mmgreetingspage.obj \
         $(SLO)$/mmlayoutpage.obj \
+        $(SLO)$/mmmergepage.obj \
         $(SLO)$/mmoutputpage.obj \
         $(SLO)$/mmoutputtypepage.obj \
-        $(SLO)$/mmaddressblockpage.obj \
-        $(SLO)$/mmgreetingspage.obj \
-        $(SLO)$/mmmergepage.obj \
         $(SLO)$/mmpreparemergepage.obj \
-        $(SLO)$/dbui.obj \
-        $(SLO)$/selectdbtabledialog.obj \
+        $(SLO)$/selectdbtabledialog.obj
+
+SLOFILES =  \
+        $(EXCEPTIONSFILES) \
         $(SLO)$/swdbtoolsclient.obj
 
         
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index d4c0a01edda0..062d8d1ede4c 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -322,8 +322,6 @@ IMPL_LINK(SwMailMergeAddressBlockPage, InsertDataHdl_Impl, ImageButton*, pButton
         }
     }
     m_aPrevSetIB.Enable(bEnable);
-    //m_aNextSetIB.Enable(bEnable);
-    //m_aDocumentIndexFI.Enable(bEnable);
     String sTemp(m_sDocument);
     sTemp.SearchAndReplaceAscii("%1", String::CreateFromInt32(nPos));
     m_aDocumentIndexFI.SetText(sTemp);
@@ -1322,7 +1320,6 @@ DDListBox::DDListBox(SwCustomizeAddressBlockDialog* pParent, const ResId rResId)
 {
     SetWindowBits( /*WB_HASBUTTONS|WB_HASBUTTONSATROOT|*/
                             WB_CLIPCHILDREN );
-//    SetSpaceBetweenEntries(3);
     SetSelectionMode( SINGLE_SELECTION );
     SetDragDropMode(   SV_DRAGDROP_CTRL_COPY );
     EnableAsyncDrag(TRUE);
@@ -1372,7 +1369,6 @@ AddressMultiLineEdit::AddressMultiLineEdit(SwCustomizeAddressBlockDialog* pParen
 {
     GetTextView()->SupportProtectAttribute(sal_True);
     StartListening(*GetTextEngine());
-    //DisableSelectionOnFocus();
     EnableFocusSelectionHide(FALSE);
 }
 
@@ -1503,7 +1499,6 @@ void AddressMultiLineEdit::RemoveCurrentEntry()
     ExtTextView* pTextView = GetTextView();
     const TextSelection& rSelection = pTextView->GetSelection();
     const TextCharAttrib* pBeginAttrib = pTextEngine->FindCharAttrib( rSelection.GetStart(), TEXTATTR_PROTECTED );
-//    const TextCharAttrib* pEndAttrib = pTextEngine->FindCharAttrib( rSelection.GetEnd(), TEXTATTR_PROTECTED );
     if(pBeginAttrib &&
             (pBeginAttrib->GetStart() <= rSelection.GetStart().GetIndex()
                             && pBeginAttrib->GetEnd() >= rSelection.GetEnd().GetIndex()))
@@ -1597,7 +1592,6 @@ sal_uInt16  AddressMultiLineEdit::IsCurrentItemMoveable()
     ExtTextView* pTextView = GetTextView();
     const TextSelection& rSelection = pTextView->GetSelection();
     const TextCharAttrib* pBeginAttrib = pTextEngine->FindCharAttrib( rSelection.GetStart(), TEXTATTR_PROTECTED );
-//    const TextCharAttrib* pEndAttrib = pTextEngine->FindCharAttrib( rSelection.GetEnd(), TEXTATTR_PROTECTED );
     if(pBeginAttrib &&
             (pBeginAttrib->GetStart() <= rSelection.GetStart().GetIndex()
                             && pBeginAttrib->GetEnd() >= rSelection.GetEnd().GetIndex()))
diff --git a/sw/source/ui/dbui/mmaddressblockpage.src b/sw/source/ui/dbui/mmaddressblockpage.src
index 238d1cfa1260..9db19f59bd6b 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.src
+++ b/sw/source/ui/dbui/mmaddressblockpage.src
@@ -187,9 +187,6 @@ TabPage DLG_MM_ADDRESSBLOCK_PAGE
     };
 };
 
-/*-- 13.04.2004 16:07:28---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 ModalDialog DLG_MM_SELECTADDRESSBLOCK
 {
     OutputSize = TRUE ;
@@ -287,10 +284,6 @@ ModalDialog DLG_MM_SELECTADDRESSBLOCK
     };
 };
 
-/*-- 13.04.2004 16:07:28---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
-
 #define WORKAROUND\
     Text [ en-US ] = "New Address Block";
 
@@ -512,9 +505,7 @@ ModalDialog DLG_MM_CUSTOMIZEADDRESSBLOCK
         };
     };
 };
-/*-- 13.04.2004 17:45:24---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ModalDialog DLG_MM_ASSIGNFIELDS
 {
     OutputSize = TRUE ;
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx
index 2f519ea069f7..2e106f91e0a4 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -132,7 +132,6 @@ IMPL_LINK(SwMailMergeDocSelectPage, FileSelectHdl, PushButton*, pButton)
     {
         m_aLoadTemplateRB.Check();
         SfxNewFileDialog* pNewFileDlg = new SfxNewFileDialog(this, 0);
-        //pNewFileDlg->SetTemplateFlags(nFlags);
         USHORT nRet = pNewFileDlg->Execute();
         if(RET_TEMPLATE_LOAD == nRet)
             bTemplate = false;
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index 2a44623325a3..e9ee86b0bb9c 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -482,7 +482,6 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
         rShell.MovePara(GetfnParaCurr(), GetfnParaStart());
     }
     bool bSplitNode = rShell.GetText().Len() > 0;
-//    rShell.SetTxtFmtColl( rShell.GetTxtCollFromPool( RES_POOLCOLL_GREETING ) );
     sal_Int32 nMoves = rConfigItem.GetGreetingMoves();
     if( !bExample && 0 != nMoves )
     {
@@ -710,8 +709,6 @@ IMPL_LINK(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl, void*, EMPTYARG)
     aZoom <<= (sal_Int16)DocumentZoomType::ENTIRE_PAGE;
     m_xViewProperties->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom);
 
-
-//    m_pExampleWrtShell->SetTxtFmtColl( rSh.GetTxtCollFromPool( RES_POOLCOLL_STANDARD ) );
     const SwFmtFrmSize& rPageSize = m_pExampleWrtShell->GetPageDesc(
                                      m_pExampleWrtShell->GetCurPageDesc()).GetMaster().GetFrmSize();
     m_aLeftMF.SetMax(rPageSize.GetWidth() - DEFAULT_LEFT_DISTANCE);
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index b3b65e6eb25c..cacbf0009184 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -518,7 +518,7 @@ IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton)
         aPos = m_aFromNF.GetPosPixel();     aPos.Y() = nNewRBXPos + nRB_FT_Offset; m_aFromNF.SetPosPixel(aPos);
         aPos = m_aToNF.GetPosPixel();       aPos.Y() = nNewRBXPos + nRB_FT_Offset; m_aToNF.SetPosPixel(aPos);
     }
-    else /*if(&m_aSendMailRB == pButton)*/
+    else
     {
         Control* aMailControls[] =
         {
@@ -785,7 +785,6 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton)
             SfxObjectShellRef xTempDocShell( new SwDocShell( SFX_CREATE_MODE_STANDARD ) );
             xTempDocShell->DoInitNew( 0 );
             SfxViewFrame* pTempFrame = SfxViewFrame::LoadHiddenDocument( *xTempDocShell, 0 );
-//            pTempFrame->GetFrame().Appear();
             SwView* pTempView = static_cast<SwView*>( pTempFrame->GetViewShell() );
             pTargetView->GetWrtShell().StartAction();
             SwgReaderOption aOpt;
@@ -805,8 +804,6 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton)
             String sCounter('_');
             sCounter += String::CreateFromInt32(nDoc);
             sOutPath.Insert(sCounter, sOutPath.Len() - sExtension.Len() - 1);
-            //SfxStringItem aName(SID_FILE_NAME, sOutPath);
-            //SfxStringItem aFilter(SID_FILTER_NAME, sFilter);
 
             while(true)
             {
@@ -885,7 +882,6 @@ IMPL_LINK(SwMailMergeOutputPage, PrinterChangeHdl_Impl, ListBox*, pBox)
         m_aPrinterSettingsPB.Disable();
     m_pWizard->GetConfigItem().SetSelectedPrinter( pBox->GetSelectEntry() );
 
-//    return m_pTempPrinter;
     return 0;
 }
 
@@ -930,7 +926,6 @@ IMPL_LINK(SwMailMergeOutputPage, PrintHdl_Impl, PushButton*, EMPTYARG)
     SfxObjectShell* pObjSh = pTargetView->GetViewFrame()->GetObjectShell();
     SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_MAIL_MERGE, SwDocShell::GetEventName(STR_SW_EVENT_MAIL_MERGE), pObjSh));
     rSh.GetNewDBMgr()->SetMergeType( DBMGR_MERGE_DOCUMENTS );
-    //SfxDispatcher *pDis = pTargetView->GetViewFrame()->GetDispatcher();
     SfxBoolItem aMergeSilent(SID_SILENT, sal_False);
     m_pWizard->enableButtons(WZB_CANCEL, sal_False);
 
@@ -1174,7 +1169,6 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
         SfxObjectShellRef xTempDocShell( new SwDocShell( SFX_CREATE_MODE_STANDARD ) );
         xTempDocShell->DoInitNew( 0 );
         SfxViewFrame* pTempFrame = SfxViewFrame::LoadHiddenDocument( *xTempDocShell, 0 );
-//        pTempFrame->GetFrame().Appear();
         SwView* pTempView = static_cast<SwView*>( pTempFrame->GetViewShell() );
         pTargetView->GetWrtShell().StartAction();
         SwgReaderOption aOpt;
@@ -1195,14 +1189,6 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
                     INetURLObject(), utl::TempFile::CreateTempName(0),
                     URIHelper::GetMaybeFileHdl()) );
 
-/*        if(bIsPDF)
-        {
-            SfxDispatcher* pSfxDispatcher = pTempView->GetViewFrame()->GetDispatcher();
-            pSfxDispatcher->Execute(
-                            SID_DIRECTEXPORTDOCASPDF,
-                                  SFX_CALLMODE_SYNCHRON, &aName, &aFilterName, 0L );
-        }
-        else*/
         {
             uno::Sequence< beans::PropertyValue > aFilterValues(MM_DOCTYPE_TEXT == nDocType ? 2 : 1);
             beans::PropertyValue* pFilterValues = aFilterValues.getArray();
@@ -1219,11 +1205,11 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
         }
         xTempDocShell->DoClose();
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
         sal_Int32 nTarget =
-#endif
                 rConfigItem.MoveResultSet(rInfo.nDBRow);
         OSL_ENSURE( nTarget == rInfo.nDBRow, "row of current document could not be selected");
+#endif
         OSL_ENSURE( sEMailColumn.Len(), "No email column selected");
         ::rtl::OUString sEMail = lcl_GetColumnValueOf(sEMailColumn, xColAccess);
         SwMailDescriptor aDesc;
diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx
index 6a7f9052d585..36c30428b024 100644
--- a/sw/source/ui/dbui/mmoutputpage.hxx
+++ b/sw/source/ui/dbui/mmoutputpage.hxx
@@ -196,7 +196,6 @@ class SW_DLLPUBLIC SwSendMailDialog : public ModelessDialog //SfxModalDialog
     bool                    m_bDesctructionEnabled;
 
     ImageList               m_aImageList;
-    ImageList               m_aImageListHC;
 
     SwSendMailDialog_Impl*  m_pImpl;
     SwMailMergeConfigItem*  m_pConfigItem;
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index 131884d562eb..39cd4e867e53 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -143,21 +143,15 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
                 if( bLF )
                 {
                     aOpt.SetParaFlags( LINEEND_CRLF );
-// have to check if of CharSet is type of ANSI
-//                  aOpt.SetCharSet( CHARSET_ANSI );
                 }
                 else
                 {
                     aOpt.SetParaFlags( LINEEND_CR );
-// have to check if CharSet is type of MAC
-//                  aOpt.SetCharSet( CHARSET_MAC );
                 }
             }
             else if( bLF )
             {
                 aOpt.SetParaFlags( LINEEND_LF );
-// have to check if of CharSet is type of ANSI
-//              aOpt.SetCharSet( CHARSET_ANSI );
             }
         }
 
diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx
index 1ed842560ca6..1db3df90d358 100644
--- a/sw/source/ui/dialog/macassgn.cxx
+++ b/sw/source/ui/dialog/macassgn.cxx
@@ -60,11 +60,8 @@
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::frame::XFrame;
 
-// SvStringsDtor* __EXPORT _GetRangeHdl( _SfxMacroTabPage*, const String& );
-
 SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType )
 {
-    // const SfxItemSet& rSet = rPg.GetItemSet();
     SfxEventNamesItem aItem(SID_EVENTCONFIG);
 
     BOOL bHtmlMode = FALSE;
@@ -74,13 +71,11 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType )
     switch( eType )
     {
     case MACASSGN_TEXTBAUST:            // Textbausteine
-        // rPg.SetGetRangeLink( &_GetRangeHdl );
         aItem.AddEvent( String( SW_RES(STR_EVENT_START_INS_GLOSSARY) ), String(),
                             SW_EVENT_START_INS_GLOSSARY );
         aItem.AddEvent( String( SW_RES(STR_EVENT_END_INS_GLOSSARY) ), String(),
                             SW_EVENT_END_INS_GLOSSARY);
         // damit der neue Handler aktiv wird!
-        // rPg.Reset( rSet );
         break;
     case MACASSGN_ALLFRM:
     case MACASSGN_GRAPHIC:          // Grafiken
diff --git a/sw/source/ui/dialog/makefile.mk b/sw/source/ui/dialog/makefile.mk
index 758ea00fcb10..033703f686d0 100644
--- a/sw/source/ui/dialog/makefile.mk
+++ b/sw/source/ui/dialog/makefile.mk
@@ -50,23 +50,23 @@ SRC1FILES =  \
         wordcountdialog.src
 
 EXCEPTIONSFILES = \
-        $(SLO)$/SwSpellDialogChildWindow.obj
-
-SLOFILES =  \
+        $(SLO)$/SwSpellDialogChildWindow.obj \
         $(SLO)$/abstract.obj \
         $(SLO)$/addrdlg.obj \
         $(SLO)$/ascfldlg.obj \
         $(SLO)$/docstdlg.obj \
         $(SLO)$/macassgn.obj \
-        $(SLO)$/SwSpellDialogChildWindow.obj \
-        $(SLO)$/regionsw.obj	\
-        $(SLO)$/uiregionsw.obj	\
-        $(SLO)$/swabstdlg.obj	\
-        $(SLO)$/swuiexp.obj		\
-        $(SLO)$/swwrtshitem.obj \
-        $(SLO)$/swdialmgr.obj  \
-        $(SLO)$/wordcountdialog.obj \
-        $(SLO)$/swdlgfact.obj
+        $(SLO)$/regionsw.obj \
+        $(SLO)$/swabstdlg.obj \
+        $(SLO)$/swdialmgr.obj \
+        $(SLO)$/swdlgfact.obj \
+        $(SLO)$/swuiexp.obj \
+        $(SLO)$/uiregionsw.obj \
+        $(SLO)$/wordcountdialog.obj
+
+SLOFILES =  \
+        $(EXCEPTIONSFILES) \
+        $(SLO)$/swwrtshitem.obj
 
 LIB1TARGET = $(SLB)$/$(TARGET).lib
 
diff --git a/sw/source/ui/dialog/regionsw.hrc b/sw/source/ui/dialog/regionsw.hrc
index 8f5dcadfbafd..b9d027fa6398 100644
--- a/sw/source/ui/dialog/regionsw.hrc
+++ b/sw/source/ui/dialog/regionsw.hrc
@@ -83,7 +83,6 @@
 #define FL_END                 52
 #define FL_FTN                 53
 #define IL_BITMAPS              54
-#define ILH_BITMAPS             55
 // #114856# edit in readonly sections
 #define FL_PROPERTIES           56
 #define CB_EDIT_IN_READONLY     57
diff --git a/sw/source/ui/dialog/regionsw.src b/sw/source/ui/dialog/regionsw.src
index f2af8dca3b0d..ea2c3bfcb18a 100644
--- a/sw/source/ui/dialog/regionsw.src
+++ b/sw/source/ui/dialog/regionsw.src
@@ -312,12 +312,6 @@ ModalDialog MD_EDIT_REGION
         MaskColor = IMAGE_MASK_COLOR ;
         DLG_IMAGE_IDLIST
     };
-    ImageList ILH_BITMAPS
-    {
-        Prefix = "reh";
-        MaskColor = IMAGE_MASK_COLOR ;
-        DLG_IMAGE_IDLIST
-    };
 };
 String STR_REG_DUPLICATE
 {
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index ad74b08ce44b..9f3cb5a8db18 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -583,13 +583,15 @@ long AbstractMailMergeWizard_Impl::GetResult()
     return pDlg->GetResult();
 }
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 IMPL_LINK( AbstractMailMergeWizard_Impl, EndDialogHdl, SwMailMergeWizard*, pDialog )
 #else
 IMPL_LINK( AbstractMailMergeWizard_Impl, EndDialogHdl, SwMailMergeWizard*, EMPTYARG )
 #endif
 {
+#if OSL_DEBUG_LEVEL > 1
     OSL_ENSURE( pDialog == pDlg, "wrong dialog passed to EndDialogHdl!" );
+#endif
 
     aEndDlgHdl.Call( this );
     aEndDlgHdl = Link();
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 0b820b3b1c1c..274f27b9f620 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -387,7 +387,6 @@ SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh )
     aHelp               ( this, SW_RES( PB_HELP ) ),
 
     aImageIL            (       SW_RES(IL_BITMAPS)),
-    aImageILH           (       SW_RES(ILH_BITMAPS)),
 
     rSh( rWrtSh ),
     pAktEntry( 0 ),
@@ -515,11 +514,8 @@ void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry
             {
                 SectRepr* pSectRepr = new SectRepr( n,
                                             *(pSect=pFmt->GetSection()) );
-                Image aImg = BuildBitmap( pSect->IsProtect(),pSect->IsHidden(), FALSE);
+                Image aImg = BuildBitmap( pSect->IsProtect(),pSect->IsHidden());
                 pEntry = aTree.InsertEntry(pSect->GetSectionName(), aImg, aImg);
-                Image aHCImg = BuildBitmap( pSect->IsProtect(),pSect->IsHidden(), TRUE);
-                aTree.SetExpandedEntryBmp(pEntry, aHCImg, BMP_COLOR_HIGHCONTRAST);
-                aTree.SetCollapsedEntryBmp(pEntry, aHCImg, BMP_COLOR_HIGHCONTRAST);
                 pEntry->SetUserData(pSectRepr);
                 RecurseList( pFmt, pEntry );
                 if (pEntry->HasChilds())
@@ -548,12 +544,9 @@ void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry
                     SectRepr* pSectRepr=new SectRepr(
                                     FindArrPos( pSect->GetFmt() ), *pSect );
                     Image aImage = BuildBitmap( pSect->IsProtect(),
-                                            pSect->IsHidden(), FALSE);
+                                            pSect->IsHidden());
                     pNEntry = aTree.InsertEntry(
                         pSect->GetSectionName(), aImage, aImage, pEntry);
-                    Image aHCImg = BuildBitmap( pSect->IsProtect(),pSect->IsHidden(), TRUE);
-                    aTree.SetExpandedEntryBmp(pEntry, aHCImg, BMP_COLOR_HIGHCONTRAST);
-                    aTree.SetCollapsedEntryBmp(pEntry, aHCImg, BMP_COLOR_HIGHCONTRAST);
                     pNEntry->SetUserData(pSectRepr);
                     RecurseList( aTmpArr[n]->GetFmt(), pNEntry );
                     if( pNEntry->HasChilds())
@@ -702,7 +695,6 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
             aConditionED.SetText(sCondition);
         else
         {
-//          aConditionED.SetText(aEmptyStr);
             aConditionFT.Enable(FALSE);
             aConditionED.Enable(FALSE);
         }
@@ -712,7 +704,6 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
         aFileNameED .Enable(FALSE);
         aSubRegionFT.Enable(FALSE);
         aSubRegionED.Enable(FALSE);
-//        aNameFT     .Enable(FALSE);
         aCurName    .Enable(FALSE);
         aOptionsPB  .Enable(FALSE);
         aDDECB              .Enable(FALSE);
@@ -733,7 +724,6 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
     }
     else if (pEntry )
     {
-//        aNameFT     .Enable(TRUE);
         aCurName    .Enable(TRUE);
         aOptionsPB  .Enable(TRUE);
         SectRepr* pRepr=(SectRepr*) pEntry->GetUserData();
@@ -807,7 +797,6 @@ IMPL_LINK( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox )
         aFileNameED  .Enable(FALSE);
         aSubRegionFT .Enable(FALSE);
         aSubRegionED .Enable(FALSE);
-//        aNameFT      .Enable(FALSE);
         aCurName     .Enable(FALSE);
         aDDECB              .Enable(FALSE);
         aDDECommandFT       .Enable(FALSE);
@@ -888,7 +877,6 @@ IMPL_LINK( SwEditRegionDlg, OkHdl, CheckBox *, EMPTYARG )
         if( USHRT_MAX != nNewPos )
             rSh.DelSectionFmt( nNewPos );
     }
-//    rSh.ChgSectionPasswd(aNewPasswd);
 
     aOrigArray.Remove( 0, aOrigArray.Count() );
 
@@ -918,12 +906,9 @@ IMPL_LINK( SwEditRegionDlg, ChangeProtectHdl, TriStateBox *, pBox )
         SectReprPtr pRepr = (SectReprPtr) pEntry->GetUserData();
         pRepr->GetSectionData().SetProtectFlag(bCheck);
         Image aImage = BuildBitmap( bCheck,
-                                    STATE_CHECK == aHideCB.GetState(), FALSE);
-        aTree.SetExpandedEntryBmp(pEntry, aImage, BMP_COLOR_NORMAL);
-        aTree.SetCollapsedEntryBmp(pEntry, aImage, BMP_COLOR_NORMAL);
-        Image aHCImg = BuildBitmap( bCheck, STATE_CHECK == aHideCB.GetState(), TRUE);
-        aTree.SetExpandedEntryBmp(pEntry, aHCImg, BMP_COLOR_HIGHCONTRAST);
-        aTree.SetCollapsedEntryBmp(pEntry, aHCImg, BMP_COLOR_HIGHCONTRAST);
+                                    STATE_CHECK == aHideCB.GetState());
+        aTree.SetExpandedEntryBmp(  pEntry, aImage );
+        aTree.SetCollapsedEntryBmp( pEntry, aImage );
         pEntry = aTree.NextSelected(pEntry);
     }
     aPasswdCB.Enable(bCheck);
@@ -945,14 +930,11 @@ IMPL_LINK( SwEditRegionDlg, ChangeHideHdl, TriStateBox *, pBox )
     {
         SectReprPtr pRepr = (SectReprPtr) pEntry->GetUserData();
         pRepr->GetSectionData().SetHidden(STATE_CHECK == pBox->GetState());
+
         Image aImage = BuildBitmap(STATE_CHECK == aProtectCB.GetState(),
-                                    STATE_CHECK == pBox->GetState(), FALSE);
-        aTree.SetExpandedEntryBmp(pEntry, aImage, BMP_COLOR_NORMAL);
-        aTree.SetCollapsedEntryBmp(pEntry, aImage, BMP_COLOR_NORMAL);
-        Image aHCImg = BuildBitmap( STATE_CHECK == aProtectCB.GetState(),
-                                    STATE_CHECK == pBox->GetState(), TRUE);
-        aTree.SetExpandedEntryBmp(pEntry, aHCImg, BMP_COLOR_HIGHCONTRAST);
-        aTree.SetCollapsedEntryBmp(pEntry, aHCImg, BMP_COLOR_HIGHCONTRAST);
+                                    STATE_CHECK == pBox->GetState());
+        aTree.SetExpandedEntryBmp(  pEntry, aImage );
+        aTree.SetCollapsedEntryBmp( pEntry, aImage );
 
         pEntry = aTree.NextSelected(pEntry);
     }
@@ -1494,9 +1476,9 @@ IMPL_LINK( SwEditRegionDlg, SubRegionEventHdl, VclWindowEvent *, pEvent )
     return 0;
 }
 
-Image SwEditRegionDlg::BuildBitmap(BOOL bProtect,BOOL bHidden, BOOL bHighContrast)
+Image SwEditRegionDlg::BuildBitmap(BOOL bProtect,BOOL bHidden)
 {
-    ImageList& rImgLst = bHighContrast ? aImageILH : aImageIL;
+    ImageList& rImgLst = aImageIL;
     return rImgLst.GetImage((!bHidden+(bProtect<<1)) + 1);
 }
 
@@ -1863,7 +1845,6 @@ IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, CheckBox *, pBox )
     aDDECB.Enable(bFile);
     if( bFile )
     {
-//      aFileNameED.SetText( aFileName );
         aFileNameED.GrabFocus();
         aProtectCB.Check( TRUE );
     }
@@ -1871,7 +1852,6 @@ IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, CheckBox *, pBox )
     {
         aDDECB.Check(FALSE);
         DDEHdl(&aDDECB);
-//      aFileNameED.SetText(aEmptyStr);
     }
     return 0;
 }
@@ -2095,7 +2075,6 @@ void SwSectionFtnEndTabPage::ResetState( BOOL bFtn,
     USHORT eState = rAttr.GetValue();
     switch( eState )
     {
-    // case FTNEND_ATPGORDOCEND:
     case FTNEND_ATTXTEND_OWNNUMANDFMT:
         pNtNumFmtCB->SetState( STATE_CHECK );
         // no break;
diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx
index 5f1e3795cdc6..6a851af172fe 100644
--- a/sw/source/ui/dochdl/gloshdl.cxx
+++ b/sw/source/ui/dochdl/gloshdl.cxx
@@ -158,12 +158,9 @@ void SwGlossaryHdl::SetCurGroup(const String &rGrp, BOOL bApi, BOOL bAlwaysCreat
                 sGroup.GetToken(0, GLOS_DELIM) == sCurBase)
                 bPathEqual = TRUE;
         }
-//      const String aMac_Tmp(pCurGrp->GetName());
+
         // Beim Pfadwechsel kann man sich auf den Namen nicht verlassen
-        if(!bAlwaysCreateNew &&
-                bPathEqual
-//      aMac_Tmp == sGroup
-        )
+        if(!bAlwaysCreateNew && bPathEqual)
             return;
     }
     aCurGrp = sGroup;
@@ -250,10 +247,6 @@ BOOL SwGlossaryHdl::CopyOrMove( const String& rSourceGroupName,  String& rSource
     SwTextBlocks* pDestGroup = rStatGlossaries.GetGroupDoc(rDestGroupName, FALSE);
     if(pDestGroup->IsReadOnly() || (bMove && pSourceGroup->IsReadOnly()) )
         return FALSE;
-    /*if(pDestGroup->IsOld()&& 0!= pDestGroup->ConvertToNew())
-        return FALSE;
-    if(bMove && pSourceGroup->IsOld() && 0 != pSourceGroup->ConvertToNew())
-        return FALSE;*/
 
     //Der Index muss hier ermittelt werden, weil rSourceShortName in CopyBlock evtl veraendert wird
     USHORT nDeleteIdx = pSourceGroup->GetIndex( rSourceShortName );
@@ -344,20 +337,6 @@ BOOL SwGlossaryHdl::HasShortName(const String& rShortName) const
 
 BOOL    SwGlossaryHdl::ConvertToNew(SwTextBlocks& /*rOld*/)
 {
-    /*if( rOld.IsOld() )
-    {
-        QueryBox aAsk( pWrtShell->GetView().GetWindow(), SW_RES( MSG_UPDATE_NEW_GLOS_FMT ) );
-        if( aAsk.Execute() == RET_YES )
-        {
-            if( rOld.ConvertToNew() )
-            {
-                InfoBox(pWrtShell->GetView().GetWindow(), SW_RES(MSG_ERR_INSERT_GLOS)).Execute();
-                return FALSE;
-            }
-        }
-        else
-            return FALSE;
-    }*/
     return TRUE;
 }
 
diff --git a/sw/source/ui/dochdl/makefile.mk b/sw/source/ui/dochdl/makefile.mk
index 48400052f5c5..5728eaa3c3c4 100644
--- a/sw/source/ui/dochdl/makefile.mk
+++ b/sw/source/ui/dochdl/makefile.mk
@@ -44,11 +44,11 @@ SRC1FILES =  \
         selglos.src
 
 SLOFILES =  \
-        $(SLO)$/gloshdl.obj \
-        $(SLO)$/selglos.obj \
-        $(SLO)$/swdtflvr.obj
+        $(EXCEPTIONSFILES)
 
 EXCEPTIONSFILES =  \
+        $(SLO)$/gloshdl.obj \
+        $(SLO)$/selglos.obj \
         $(SLO)$/swdtflvr.obj
 
 #        $(SLO)$/dataex.obj \
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index b69102196b18..cd9464b29e55 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -582,7 +582,6 @@ sal_Bool SwTransferable::GetData( const DATA_FLAVOR& rFlavor )
             break;
 
         case SOT_FORMATSTR_ID_EMBED_SOURCE:
-//      default:
             if( !aDocShellRef.Is() )
             {
                 SwDoc *const pDoc = lcl_GetDoc(*pClpDocFac);
@@ -1176,9 +1175,6 @@ int SwTransferable::PasteData( TransferableDataHelper& rData,
                 SwTransferable::SetSelInShell( rSh, TRUE, pPt );
                 break;
 
-            // case EXCHG_DEST_DOC_TEXTFRAME:
-            // case EXCHG_DEST_SWDOC_FREE_AREA:
-            // case EXCHG_DEST_DOC_URLFIELD:
             default:
                 SwTransferable::SetSelInShell( rSh, FALSE, pPt );
                 break;
@@ -1214,13 +1210,6 @@ int SwTransferable::PasteData( TransferableDataHelper& rData,
     }
 
     SwTransferable *pTrans=0, *pTunneledTrans=GetSwTransferable( rData );
-//    uno::Reference<XUnoTunnel> xTunnel( rData.GetTransferable(), UNO_QUERY );
-//    if ( xTunnel.is() )
-//    {
-//        sal_Int64 nHandle = xTunnel->getSomething( getUnoTunnelId() );
-//        if ( nHandle )
-//            pTunneledTrans = (SwTransferable*) (sal_IntPtr) nHandle;
-//    }
 
     if( pPt && ( bPasteSelection ? 0 != ( pTrans = pMod->pXSelection )
                                  : 0 != ( pTrans = pMod->pDragDrop) ))
@@ -1563,7 +1552,6 @@ USHORT SwTransferable::GetSotDestination( const SwWrtShell& rSh,
     case OBJCNT_GROUPOBJ:   nRet = EXCHG_DEST_DOC_GROUPOBJ;     break;
 
 // was mmchen wir bei Mehrfachselektion???
-//  case OBJCNT_DONTCARE:
     default:
         {
 /*
@@ -1633,7 +1621,6 @@ int SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
                 pStream = aMSE40ClpObj.IsValid( *xStrm );
                 pRead = ReadHTML;
                 pRead->SetReadUTF8( TRUE );
-                //pRead->SetBaseURL( aMSE40ClpObj.GetBaseURL() );
 
                 BOOL bNoComments =
                     ( nFmt == SOT_FORMATSTR_ID_HTML_NO_COMMENT );
@@ -1809,18 +1796,6 @@ int SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
             Graphic aGraphic;
             ULONG nGrFormat = 0;
 
-// (wg. Selection Manager bei Trustet Solaris)
-#ifndef SOLARIS
-/*
-            if( rData.GetGraphic( SOT_FORMATSTR_ID_SVXB, aGraphic ) )
-                nGrFormat = SOT_FORMATSTR_ID_SVXB;
-            else if( rData.GetGraphic( FORMAT_GDIMETAFILE, aGraphic ) )
-                nGrFormat = SOT_FORMAT_GDIMETAFILE;
-            else if( rData.GetGraphic( FORMAT_BITMAP, aGraphic ) )
-                nGrFormat = SOT_FORMAT_BITMAP;
-*/
-#endif
-
             // insert replacement image ( if there is one ) into the object helper
             if ( nGrFormat )
             {
@@ -2223,13 +2198,6 @@ int SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
     case SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR:
         if( 0 != ( nRet = rData.GetINetBookmark( nFmt, aBkmk ) ))
         {
-/*              if( SW_PASTESDR_SETATTR != nAction )
-            {
-                INetURLObject aURL( aBkmk.GetURL() );
-                bCheckForGrf = INET_PROT_FILE == aURL.GetProtocol();
-                nRet = 0 != bCheckForGrf;
-            }
-*/
             if( SW_PASTESDR_SETATTR == nAction )
                 nFmt = SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK;
             else
@@ -2471,15 +2439,7 @@ int SwTransferable::_PasteFileName( TransferableDataHelper& rData,
                 const SfxFilter* pFlt = SW_PASTESDR_SETATTR == nAction
                         ? 0 : SwIoSystem::GetFileFilter(
                         sFileURL, aEmptyStr );
-                if( pFlt && !rSh.GetView().GetDocShell()->ISA(SwWebDocShell)
-    /*
-    JP 02.07.98: warum nur fuer die Formate ??
-                    && ( pFlt->GetUserData() == FILTER_SW5 ||
-                    pFlt->GetUserData() == FILTER_SW4 ||
-                    pFlt->GetUserData() == FILTER_SW3 ||
-                    pFlt->GetUserData() == FILTER_SWG )
-    */
-                    )
+                if( pFlt && !rSh.GetView().GetDocShell()->ISA(SwWebDocShell) )
                 {
     // und dann per PostUser Event den Bereich-Einfuegen-Dialog hochreissen
                     SwSectionData * pSect = new SwSectionData(
@@ -3123,14 +3083,6 @@ void SwTransferable::DragFinished( sal_Int8 nAction )
         pWrtShell->HideCrsr();
     else
         pWrtShell->ShowCrsr();
-//!!    else if( DND_ACTION_NONE != nAction )
-//!!        pWrtShell->ShowCrsr();
-//!!    else
-//!!    {
-//!!        //Muss wohl sein weil gescrollt wurde und ?...?
-//!!        pWrtShell->StartAction();
-//!!        pWrtShell->EndAction();
-//!!    }
 
     ((SwViewOption *)pWrtShell->GetViewOptions())->SetIdle( bOldIdle );
 }
@@ -3180,10 +3132,6 @@ int SwTransferable::PrivatePaste( SwWrtShell& rShell )
 // a word in the buffer, word in this context means 'something with spaces at
 // beginning and end'. In this case we definitely want these spaces to be inserted
 // here.
-//      if( SCRIPTTYPE_LATIN != rShell.GetScriptType() )
-//          bSmart = FALSE;
-//      else
-//      {
             bInWrd = rShell.IsInWrd();
              bEndWrd = rShell.IsEndWrd();
             bSmart = bInWrd || bEndWrd;
@@ -3193,7 +3141,6 @@ int SwTransferable::PrivatePaste( SwWrtShell& rShell )
                 if( bSmart && !bSttWrd && (bInWrd || bEndWrd) )
                     rShell.SwEditShell::Insert(' ');
             }
-//      }
     }
 
     int nRet = rShell.Paste( pClpDocFac->GetDoc() );
@@ -3586,7 +3533,6 @@ SwTrnsfrDdeLink::SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh )
         {
             refObj->AddConnectAdvise( this );
             refObj->AddDataAdvise( this,
-//                          SotExchange::GetFormatMimeType( FORMAT_RTF ),
                             aEmptyStr,
                             ADVISEMODE_NODATA | ADVISEMODE_ONLYONCE );
             nOldTimeOut = refObj->GetUpdateTimeout();
@@ -3640,12 +3586,6 @@ BOOL SwTrnsfrDdeLink::WriteData( SvStream& rStrm )
     rStrm.Write( pMem, nLen );
     delete[] pMem;
 
-    //if( bDelBookmrk )
-    //{
-    //  // er wird das erstemal abgeholt, also ins Undo mitaufnehmen
-    //  // aber wie??
-    //}
-
     IDocumentMarkAccess* const pMarkAccess = pDocShell->GetDoc()->getIDocumentMarkAccess();
     IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->findMark(sName);
     if(ppMark != pMarkAccess->getMarksEnd()
diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx
index a9e3b86f25fb..613c8e8811b2 100644
--- a/sw/source/ui/docvw/PostItMgr.cxx
+++ b/sw/source/ui/docvw/PostItMgr.cxx
@@ -101,34 +101,10 @@
 
 using namespace sw::sidebarwindows;
 
-/*
-bool comp_author( const SwPostItItem* a, const SwPostItItem* b)
-{
-    return a->pFmtFld->GetFld()->GetPar1() < b->pFmtFld->GetFld()->GetPar1();
-}
-
-bool comp_date( const SwPostItItem* a, const SwPostItItem* b)
-{
-    return static_cast<SwPostItField*>(a->pFmtFld->GetFld())->GetDate()  < static_cast<SwPostItField*>(b->pFmtFld->GetFld())->GetDate();
-}
-*/
-
-//
 bool comp_pos(const SwSidebarItem* a, const SwSidebarItem* b)
 {
-    // --> OD 2010-01-19 #i88070#
     // sort by anchor position
-//// if position is on the same line, sort by x (Left) position, otherwise by y(Bottom) position
-//// if two notes are at the same position, sort by logical node position
-//    return (a->maLayoutInfo.mPosition.Bottom() == b->maLayoutInfo.mPosition.Bottom())
-//            ? ( ( (a->maLayoutInfo.mPosition.Left() == b->maLayoutInfo.mPosition.Left()) &&
-//                  (a->GetBroadCaster()->ISA(SwFmtFld) && b->GetBroadCaster()->ISA(SwFmtFld)) )
-//                ? *(static_cast<SwFmtFld*>(a->GetBroadCaster())->GetTxtFld()->GetStart()) <
-//                    *(static_cast<SwFmtFld*>(b->GetBroadCaster())->GetTxtFld()->GetStart())
-//                : a->maLayoutInfo.mPosition.Left() < b->maLayoutInfo.mPosition.Left() )
-//            : a->maLayoutInfo.mPosition.Bottom() < b->maLayoutInfo.mPosition.Bottom();
     return a->GetAnchorPosition() < b->GetAnchorPosition();
-    // <--
 }
 
 SwPostItMgr::SwPostItMgr(SwView* pView)
@@ -235,12 +211,7 @@ void SwPostItMgr::InsertItem(SfxBroadcaster* pItem, bool bCheckExistance, bool b
     mbLayout = bFocus;
     if (pItem->ISA(SwFmtFld))
         mvPostItFlds.push_back(new SwAnnotationItem(static_cast<SwFmtFld*>(pItem), true, bFocus) );
-    /*
-    else
-    if (pItem->ISA(SwRedline))
-        mvPostItFlds.push_back(new SwRedCommentItem( static_cast<SwRedline*>(pItem), true, bFocus)) ;
-    */
-    OSL_ENSURE(pItem->ISA(SwFmtFld) /*|| pItem->ISA(SwRedline)*/,"Mgr::InsertItem: seems like new stuff was added");
+    OSL_ENSURE(pItem->ISA(SwFmtFld),"Mgr::InsertItem: seems like new stuff was added");
     StartListening(*pItem);
 }
 
@@ -323,35 +294,6 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
             }
         }
     }
-    /*
-    else if ( rHint.IsA(TYPE(SwRedlineHint) ) )
-    {
-        const SwRedlineHint rRedlineHint = static_cast<const SwRedlineHint&>(rHint);
-           SwRedline* pRedline = const_cast<SwRedline*>(rRedlineHint.GetRedline());
-        switch ( rRedlineHint.Which() )
-        {
-            case SWREDLINE_INSERTED :
-            {
-                bool bEmpty = !HasNotes();
-                InsertItem( pRedline, true, false );
-                if (bEmpty && !mvPostItFlds.empty())
-                    PrepareView(true);
-                break;
-            }
-            case SWREDLINE_REMOVED:
-            {
-                RemoveItem(pRedline);
-                break;
-            }
-            case SWREDLINE_FOCUS:
-            {
-                                if (rRedlineHint.GetView()== mpView)
-                    Focus(rBC);
-                break;
-            }
-        }
-    }
-    */
     else if ( rHint.IsA(TYPE(SwFmtFldHint) ) )
     {
         const SwFmtFldHint& rFmtHint = static_cast<const SwFmtFldHint&>(rHint);
@@ -1113,7 +1055,6 @@ bool SwPostItMgr::LayoutByPage(std::list<SwSidebarWin*> &aVisiblePostItList,cons
                     //(*i) is the last visible item
                     SwSidebarWin_iterator aPrevPostIt = i;
                     --aPrevPostIt;
-                    //lTranslatePos = ( (*aPrevPostIt)->VirtualPos().Y() + (*aPrevPostIt)->VirtualSize().Height() + GetSpaceBetween() ) - (*i)->VirtualPos().Y();
                     lTranslatePos = ( (*aPrevPostIt)->VirtualPos().Y() + (*aPrevPostIt)->VirtualSize().Height() ) - (*i)->VirtualPos().Y();
                     if (lTranslatePos > 0)
                     {
@@ -1168,22 +1109,6 @@ bool SwPostItMgr::LayoutByPage(std::list<SwSidebarWin*> &aVisiblePostItList,cons
     return bScrollbars;
  }
 
-/*
-void SwPostItMgr::AddRedlineComments(bool bCheckExistance, bool bFocus)
-{
-    bool bEmpty = mvPostItFlds.empty();
-    const SwRedlineTbl& aTable = mpView->GetDocShell()->GetDoc()->GetRedlineTbl();
-    for( USHORT i = 0; i < aTable.Count(); ++i )
-    {
-        SwRedline* pRedline = const_cast<SwRedline*>((aTable)[i]);
-        if ( pRedline->GetComment() != String(rtl::OUString::createFromAscii("")) )
-            InsertItem(pRedline, bCheckExistance, bFocus);
-    }
-    if (bEmpty && !mvPostItFlds.empty())
-        PrepareView(true);
- }
- */
-
 void SwPostItMgr::AddPostIts(bool bCheckExistance, bool bFocus)
 {
     bool bEmpty = mvPostItFlds.empty();
@@ -1281,23 +1206,6 @@ void SwPostItMgr::Delete()
         mpWrtShell->DelRight();
     }
 
-/*
-    for(std::list<SwPostItItem*>::iterator i = mvPostItFlds.begin(); i!= mvPostItFlds.end() ; i++)
-    {
-        SwPostItItem* pItem = (*i);
-        // stop listening, we delete ourselves
-        EndListening( *(pItem->pFmtFld) );
-        // delete the actual SwPostItField
-        mpWrtShell->GotoField(*pItem->pFmtFld);
-        mpWrtShell->DelRight();
-        // delete visual representation
-        delete pItem->pPostIt;
-        // delete struct saving the pointers
-        delete pItem;
-    }
-    mvPostItFlds.clear();
-*/
-
     mpWrtShell->EndUndo( UNDO_DELETE );
     PrepareView();
     mpWrtShell->EndAllAction();
@@ -1347,14 +1255,6 @@ void SwPostItMgr::Sort(const short aType)
             case SORT_POS:
                 mvPostItFlds.sort(comp_pos);
                 break;
-            /*
-            case SORT_AUTHOR:
-                mvPostItFlds.sort(comp_author);
-                break;
-            case SORT_DATE:
-                mvPostItFlds.sort(comp_date);
-                break;
-            */
         }
     }
 }
@@ -1506,7 +1406,6 @@ void SwPostItMgr::PrepareView(bool bIgnoreCount)
     if (!HasNotes() || bIgnoreCount)
     {
         mpWrtShell->StartAllAction();
-        //mpEditWin->Invalidate(); // really not needed anymore??
         SwRootFrm* pLayout = mpWrtShell->GetLayout();
         if ( pLayout )
             SwPostItHelper::setSidebarChanged( pLayout,
@@ -1627,14 +1526,13 @@ void SwPostItMgr::CorrectPositions()
        return;
 
     // yeah, I know,    if this is a left page it could be wrong, but finding the page and the note is probably not even faster than just doing it
-    // --> OD 2010-06-03 #i111964# - check, if anchor overlay object exists.
+    // check, if anchor overlay object exists.
     const long aAnchorX = pFirstPostIt->Anchor()
                           ? mpEditWin->LogicToPixel( Point((long)(pFirstPostIt->Anchor()->GetSixthPosition().getX()),0)).X()
                           : 0;
     const long aAnchorY = pFirstPostIt->Anchor()
                           ? mpEditWin->LogicToPixel( Point(0,(long)(pFirstPostIt->Anchor()->GetSixthPosition().getY()))).Y() + 1
                           : 0;
-    // <--
     if (Point(aAnchorX,aAnchorY) != pFirstPostIt->GetPosPixel())
     {
         long aAnchorPosX = 0;
@@ -1643,9 +1541,8 @@ void SwPostItMgr::CorrectPositions()
         {
             for(SwSidebarItem_iterator i = mPages[n]->mList->begin(); i!= mPages[n]->mList->end(); i++)
             {
-                // --> OD 2010-06-03 #i111964# - check, if anchor overlay object exists.
+                // check, if anchor overlay object exists.
                 if ( (*i)->bShow && (*i)->pPostIt && (*i)->pPostIt->Anchor() )
-                // <--
                 {
                     aAnchorPosX = mPages[n]->eSidebarPosition == sw::sidebarwindows::SIDEBAR_LEFT
                         ? mpEditWin->LogicToPixel( Point((long)((*i)->pPostIt->Anchor()->GetSeventhPosition().getX()),0)).X()
@@ -1887,7 +1784,6 @@ sal_uInt16 SwPostItMgr::SearchReplace(const SwFmtFld &pFld, const ::com::sun::st
 
 void SwPostItMgr::AssureStdModeAtShell()
 {
-    //#i103373# #i103645#
         // deselect any drawing or frame and leave editing mode
           SdrView* pSdrView = mpWrtShell->GetDrawView();
         if ( pSdrView && pSdrView->IsTextEdit() )
diff --git a/sw/source/ui/docvw/SidebarTxtControl.cxx b/sw/source/ui/docvw/SidebarTxtControl.cxx
index fc5b0b66b6fb..6d1c21f3b708 100644
--- a/sw/source/ui/docvw/SidebarTxtControl.cxx
+++ b/sw/source/ui/docvw/SidebarTxtControl.cxx
@@ -364,7 +364,6 @@ void SidebarTxtControl::Command( const CommandEvent& rCEvt )
             //!! call different Execute function to get rid of the new thesaurus sub menu
             //!! pointer created in the call to Popup.
             //!! Otherwise we would have a memory leak (see also #i107205#)
-            //((PopupMenu*)pMgr->GetSVMenu())->Execute( this, aPos );
             pMgr->Execute( aPos, this );
             delete pMgr;
         }
diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx
index bc85ddb80e5c..323c1da6ccac 100644
--- a/sw/source/ui/docvw/SidebarWin.cxx
+++ b/sw/source/ui/docvw/SidebarWin.cxx
@@ -93,7 +93,7 @@ namespace sw { namespace sidebarwindows {
 #define POSTIT_SHADOW_BRIGHT    Color(180,180,180)
 #define POSTIT_SHADOW_DARK      Color(83,83,83)
 
-#define EMPTYSTRING             rtl::OUString::createFromAscii("")
+#define EMPTYSTRING             rtl::OUString()
 
 /************** SwSidebarWin************************************/
 SwSidebarWin::SwSidebarWin( SwEditWin& rEditWin,
@@ -400,7 +400,7 @@ void SwSidebarWin::CheckMetaText()
     else if (sMeta.Len() > 22)
     {
         sMeta.Erase(20);
-        sMeta = sMeta + rtl::OUString::createFromAscii("...");
+        sMeta = sMeta + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("..."));
     }
     if ( mpMetadataAuthor->GetText() != sMeta )
     {
@@ -426,7 +426,7 @@ void SwSidebarWin::CheckMetaText()
     }
     if (GetTime()!=0)
     {
-        sMeta = sMeta + rtl::OUString::createFromAscii(" ")  + rLocalData.getTime( GetTime(),false );
+        sMeta = sMeta + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "))  + rLocalData.getTime( GetTime(),false );
     }
     if ( mpMetadataDate->GetText() != sMeta )
     {
@@ -998,11 +998,7 @@ IMPL_LINK( SwSidebarWin, WindowEventListener, VclSimpleEvent*, pEvent )
             }
             else if ( pMouseEvt->IsLeaveWindow())
             {
-                if (IsPreview())
-                {
-                    //doLazyDelete();
-                }
-                else
+                if (!IsPreview())
                 {
                     mbMouseOver = false;
                     if ( !HasFocus() )
diff --git a/sw/source/ui/docvw/edtdd.cxx b/sw/source/ui/docvw/edtdd.cxx
index 688a4e3ae50c..3d9bdba2e38f 100644
--- a/sw/source/ui/docvw/edtdd.cxx
+++ b/sw/source/ui/docvw/edtdd.cxx
@@ -226,14 +226,13 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent& rEvt )
         if ( aRect.IsInside(aPos) )
         {
             rSh.StartAllAction();
-//!!            sal_Int8 nRet = DND_ACTION_NONE/*pOLV->ExecuteDrop( rEvt )*/;
             rSh.EndAllAction();
             return nRet;
         }
     }
 
 
-    // dvo 2002-05-27, #99027#: There's a special treatment for file lists with a single
+    //                          There's a special treatment for file lists with a single
     //                          element, that depends on the actual content of the
     //                          Transferable to be accessible. Since the transferable
     //                          may only be accessed after the drop has been accepted
@@ -247,7 +246,6 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent& rEvt )
                                 GetDataFlavorExVector(),
                                 m_nDropDestination,
                                 rEvt.mnAction,
-//!!                                rEvt.GetSourceOptions(),
                                 nUserOpt, m_nDropFormat, nEventAction, 0,
                                 &rEvt.maDropEvent.Transferable );
 
@@ -256,7 +254,6 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent& rEvt )
     nRet = rEvt.mnAction;
     if( !SwTransferable::PasteData( aData, rSh, m_nDropAction, m_nDropFormat,
                                 m_nDropDestination, FALSE, rEvt.mbDefault, &aDocPt, nRet))
-//!!    nRet = SFX_APP()->ExecuteDrop( rEvt );
         nRet = DND_ACTION_NONE;
     else if ( SW_MOD()->pDragDrop )
         //Bei internem D&D nicht mehr aufraeumen!
@@ -404,7 +401,6 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
                                 GetDataFlavorExVector(),
                                 m_nDropDestination,
                                 rEvt.mnAction,
-//!!                                rEvt.GetSourceOptions(),
                                 nUserOpt, m_nDropFormat, nEventAction );
 
     if( EXCHG_INOUT_ACTION_NONE != m_nDropAction )
@@ -433,7 +429,7 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
             }
             else if( rEvt.mbDefault )
             {
-                // JP 13.08.98: internes Drag&Drop: bei gleichem Doc ein Move
+                //              internes Drag&Drop: bei gleichem Doc ein Move
                 //              ansonten ein Copy - Task 54974
                 nEventAction = pSrcSh->GetDoc() == rSh.GetDoc()
                                     ? DND_ACTION_MOVE
@@ -495,7 +491,6 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
 
     CleanupDropUserMarker();
     rSh.UnSetVisCrsr();
-//!!    return SFX_APP()->AcceptDrop( rEvt );
     return DND_ACTION_NONE;
 }
 
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 8b71b713069e..dccc9707bce5 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -29,7 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-
 #include <tools/list.hxx>
 #include <swtypes.hxx>
 #include <hintids.hxx>
@@ -123,13 +122,12 @@
 #include <cmdid.h>
 #include <docvw.hrc>
 #include <uitool.hxx>
-// OD 18.09.2003 #i18732#
 #include <fmtfollowtextflow.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <charfmt.hxx>
 #include <numrule.hxx>
 #include <pagedesc.hxx>
-#include <svtools/ruler.hxx> // #i23726#
+#include <svtools/ruler.hxx>
 #include "formatclipboard.hxx"
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
@@ -140,12 +138,6 @@
 
 #include <PostItMgr.hxx>
 
-//JP 11.10.2001: enable test code for bug fix 91313
-//TODO: This one could most probably be removed
-#if defined(DBG_UTIL) && (OSL_DEBUG_LEVEL > 1)
-//#define TEST_FOR_BUG91313
-#endif
-
 using namespace sw::mark;
 using namespace ::com::sun::star;
 
@@ -181,7 +173,6 @@ Color   SwEditWin::aTextBackColor(COL_YELLOW);
 Color   SwEditWin::aTextColor(COL_RED);
 BOOL    SwEditWin::bTransparentBackColor = FALSE; // Hintergrund nicht transparent
 
-
 extern BOOL     bExecuteDrag;
 
 SfxShell* lcl_GetShellFromDispatcher( SwView& rView, TypeId nType );
@@ -193,17 +184,13 @@ class SwAnchorMarker
     SdrHdl* pHdl;
     Point aHdlPos;
     Point aLastPos;
-    // --> OD 2010-09-16 #i114522#
     bool bTopRightHandle;
-    // <--
 public:
     SwAnchorMarker( SdrHdl* pH )
         : pHdl( pH )
         , aHdlPos( pH->GetPos() )
         , aLastPos( pH->GetPos() )
-        // --> OD 2010-09-16 #i114522#
         , bTopRightHandle( pH->GetKind() == HDL_ANCHOR_TR )
-        // <--
     {}
     const Point& GetLastPos() const { return aLastPos; }
     void SetLastPos( const Point& rNew ) { aLastPos = rNew; }
@@ -213,14 +200,11 @@ public:
     void ChgHdl( SdrHdl* pNew )
     {
         pHdl = pNew;
-        // --> OD 2010-09-16 #i114522#
         if ( pHdl )
         {
             bTopRightHandle = (pHdl->GetKind() == HDL_ANCHOR_TR);
         }
-        // <--
     }
-    // --> OD 2010-09-16 #i114522#
     const Point GetPosForHitTest( const OutputDevice& rOut )
     {
         Point aHitTestPos( GetPos() );
@@ -237,7 +221,6 @@ public:
 
         return aHitTestPos;
     }
-    // <--
 };
 
 struct QuickHelpData
@@ -271,7 +254,6 @@ struct QuickHelpData
     void FillStrArr( SwWrtShell& rSh, const String& rWord );
 };
 
-
 /*--------------------------------------------------------------------
     Beschreibung:   Minimale Bewegung Zittern vermeiden
  --------------------------------------------------------------------*/
@@ -286,7 +268,7 @@ inline BOOL IsMinMove(const Point &rStartPos, const Point &rLPt)
 }
 
 /*--------------------------------------------------------------------
-    JP 30.07.98: fuer MouseButtonDown - feststellen, ob ein DrawObject
+                fuer MouseButtonDown - feststellen, ob ein DrawObject
                 und KEIN SwgFrame getroffen wurde! Shift/Ctrl sollen
                 nur bei DrawObjecte zum Selektieren fuehren, bei SwgFlys
                 ggfs zum ausloesen von Hyperlinks (DownLoad/NewWindow!)
@@ -312,7 +294,6 @@ inline BOOL IsDrawObjSelectable( const SwWrtShell& rSh, const Point& rPt )
     Beschreibung:   Pointer umschalten
  --------------------------------------------------------------------*/
 
-
 void SwEditWin::UpdatePointer(const Point &rLPt, USHORT nModifier )
 {
     SwWrtShell &rSh = rView.GetWrtShell();
@@ -326,7 +307,6 @@ void SwEditWin::UpdatePointer(const Point &rLPt, USHORT nModifier )
                 delete pUserMarker;
                 pUserMarker = 0L;
             }
-//          rSh.SwCrsrShell::UnSetVisCrsr( rLPt );
             eStyle = POINTER_NOTALLOWED;
         }
         else
@@ -397,9 +377,6 @@ void SwEditWin::UpdatePointer(const Point &rLPt, USHORT nModifier )
         return;
     }
 
-    // Removed ExecHyperlink option.
-    //BOOL bExecHyperlinks = rSh.GetViewOptions()->IsExecHyperlinks() ^
-    //                     (nModifier == KEY_MOD2 ? TRUE : FALSE);
     BOOL bExecHyperlinks = rView.GetDocShell()->IsReadOnly();
     if ( !bExecHyperlinks )
     {
@@ -568,7 +545,6 @@ void SwEditWin::UpdatePointer(const Point &rLPt, USHORT nModifier )
     Beschreibung: Timer fuer Selektion vergroessern
  --------------------------------------------------------------------*/
 
-
 IMPL_LINK( SwEditWin, TimerHandler, Timer *, EMPTYARG )
 {
     DBG_PROFSTART(edithdl);
@@ -604,14 +580,14 @@ IMPL_LINK( SwEditWin, TimerHandler, Timer *, EMPTYARG )
         else
             (rSh.*rSh.fnSetCrsr)( &aModPt, FALSE );
 
-        //fix(24138): Es kann sein, dass der "Sprung" ueber eine Tabelle so
+        // Es kann sein, dass der "Sprung" ueber eine Tabelle so
         //nicht geschafft wird. Deshalb wir hier eben per Up/Down ueber die
         //Tabelle gesprungen.
         const SwRect& rVisArea = rSh.VisArea();
         if( aOldVis == rVisArea && !rSh.IsStartOfDoc() && !rSh.IsEndOfDoc() )
         {
-            //JP 11.10.2001 Bug 72294 - take the center point of VisArea to
-            //              decide in which direction the user want.
+            // take the center point of VisArea to
+            // decide in which direction the user want.
             if( aModPt.Y() < ( rVisArea.Top() + rVisArea.Height() / 2 ) )
                 rSh.Up( TRUE, 1 );
             else
@@ -625,11 +601,6 @@ IMPL_LINK( SwEditWin, TimerHandler, Timer *, EMPTYARG )
     return 0;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void SwEditWin::JustifyAreaTimer()
 {
     const Rectangle &rVisArea = GetView().GetVisArea();
@@ -668,7 +639,6 @@ inline void SwEditWin::EnterArea()
  Beschreibung:  Modus fuer Rahmen einfuegen
 ------------------------------------------------------------------------*/
 
-
 void SwEditWin::InsFrm(USHORT nCols)
 {
     StdDrawMode( OBJ_NONE, FALSE );
@@ -676,15 +646,10 @@ void SwEditWin::InsFrm(USHORT nCols)
     nInsFrmColCount = nCols;
 }
 
-
-
 void SwEditWin::StdDrawMode( SdrObjKind eSdrObjectKind, BOOL bObjSelect )
 {
     SetSdrDrawMode( eSdrObjectKind );
 
-/*  if (GetDrawFuncPtr())
-        GetDrawFuncPtr()->Deactivate();*/
-
     if (bObjSelect)
         rView.SetDrawFuncPtr(new DrawSelection( &rView.GetWrtShell(), this, &rView ));
     else
@@ -695,13 +660,11 @@ void SwEditWin::StdDrawMode( SdrObjKind eSdrObjectKind, BOOL bObjSelect )
     if (bObjSelect)
         rView.GetDrawFuncPtr()->Activate( SID_OBJECT_SELECT );
     else
-        rView.GetDrawFuncPtr()->Activate( sal::static_int_cast< USHORT >(eSdrObjectKind) );     // don't know if this is useful at all; but it keeps functionality as it was...
+        rView.GetDrawFuncPtr()->Activate( sal::static_int_cast< USHORT >(eSdrObjectKind) );
     bInsFrm = FALSE;
     nInsFrmColCount = 1;
 }
 
-
-
 void SwEditWin::StopInsFrm()
 {
     if (rView.GetDrawFuncPtr())
@@ -717,7 +680,6 @@ void SwEditWin::StopInsFrm()
 /*--------------------------------------------------------------------
  --------------------------------------------------------------------*/
 
-
 BOOL SwEditWin::IsInputSequenceCheckingRequired( const String &rText, const SwPaM& rCrsr ) const
 {
     const SvtCTLOptions& rCTLOptions = SW_MOD()->GetCTLOptions();
@@ -744,12 +706,10 @@ BOOL SwEditWin::IsInputSequenceCheckingRequired( const String &rText, const SwPa
     return (0 <= nCTLScriptPos && nCTLScriptPos <= rText.Len());
 }
 
-
 /*--------------------------------------------------------------------
      Beschreibung:  Der Character Buffer wird in das Dokument eingefuegt
  --------------------------------------------------------------------*/
 
-
 void SwEditWin::FlushInBuffer()
 {
     if ( aInBuffer.Len() )
@@ -873,7 +833,6 @@ void SwEditWin::FlushInBuffer()
                 aReq.Done();
             }
         }
-        //#21019# apply CTL and CJK language to the text input
         sal_Bool bLang = true;
         if(eBufferLanguage != LANGUAGE_DONTKNOW)
         {
@@ -895,7 +854,7 @@ void SwEditWin::FlushInBuffer()
                     if ( eLang == eBufferLanguage )
                         // current language attribute equal to language reported from system
                         bLang = sal_False;
-                    else if ( !bInputLanguageSwitched && RES_CHRATR_LANGUAGE == nWhich /* && (eLang&LANGUAGE_MASK_PRIMARY) == LANGUAGE_ENGLISH */ )
+                    else if ( !bInputLanguageSwitched && RES_CHRATR_LANGUAGE == nWhich )
                     {
                         // special case: switching between two "LATIN" languages
                         // In case the current keyboard setting might be suitable for both languages we can't safely assume that the user
@@ -974,14 +933,11 @@ void SwEditWin::ChangeFly( BYTE nDir, BOOL bWeb )
     SwWrtShell &rSh = rView.GetWrtShell();
     SwRect aTmp = rSh.GetFlyRect();
     if( aTmp.HasArea() &&
-        // --> FME 2005-01-13 #i40348#
         // IsSelObjProtected() seems to be the correct condition, not
         // !HasReadonlySel(), otherwise frame is not moveable if content is
         // protected.
         !rSh.IsSelObjProtected( FLYPROTECT_POS|FLYPROTECT_SIZE ) )
-        // <--
     {
-        // OD 18.09.2003 #i18732# - add item <RES_FOLLOW_TEXT_FLOW>
         SfxItemSet aSet(rSh.GetAttrPool(),
                         RES_FRM_SIZE, RES_FRM_SIZE,
                         RES_VERT_ORIENT, RES_ANCHOR,
@@ -1009,13 +965,12 @@ void SwEditWin::ChangeFly( BYTE nDir, BOOL bWeb )
 
         SwRect aBoundRect;
         Point aRefPoint;
-        // OD 18.09.2003 #i18732# - adjustment for allowing vertical position
-        //      aligned to page for fly frame anchored to paragraph or to character.
+        // adjustment for allowing vertical position
+        // aligned to page for fly frame anchored to paragraph or to character.
         {
             SwFmtVertOrient aVert( (SwFmtVertOrient&)aSet.Get(RES_VERT_ORIENT) );
             const bool bFollowTextFlow =
                     static_cast<const SwFmtFollowTextFlow&>(aSet.Get(RES_FOLLOW_TEXT_FLOW)).GetValue();
-            // OD 12.11.2003 #i22341# - additional provide content position
             const SwPosition* pToCharCntntPos = ((SwFmtAnchor&)aSet.Get(RES_ANCHOR)).GetCntntAnchor();
             rSh.CalcBoundRect( aBoundRect, eAnchorId,
                                text::RelOrientation::FRAME, aVert.GetRelationOrient(),
@@ -1034,10 +989,10 @@ void SwEditWin::ChangeFly( BYTE nDir, BOOL bWeb )
             case MOVE_UP_BIG:
             case MOVE_UP_SMALL: aTmp.Top( aTmp.Top() - nUp ); break;
             case MOVE_RIGHT_SMALL: if( aTmp.Width() < aSnap.Width() + MINFLY ) break;
-                    nRight = aSnap.Width(); // kein break
+                    nRight = aSnap.Width(); // no break
             case MOVE_RIGHT_BIG: aTmp.Left( aTmp.Left() + nRight ); break;
             case MOVE_DOWN_SMALL: if( aTmp.Height() < aSnap.Height() + MINFLY ) break;
-                    nDown = aSnap.Height(); // kein break
+                    nDown = aSnap.Height(); // no break
             case MOVE_DOWN_BIG: aTmp.Top( aTmp.Top() + nDown ); break;
             default: OSL_ENSURE(true, "ChangeFly: Unknown direction." );
         }
@@ -1133,16 +1088,13 @@ void SwEditWin::ChangeFly( BYTE nDir, BOOL bWeb )
         rSh.EndAllAction();
     }
 }
-/* -----------------------------23.05.2002 11:35------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwEditWin::ChangeDrawing( BYTE nDir )
 {
-    // --> OD 2005-01-31 #i40845# - start undo action in order to get only one
+    // start undo action in order to get only one
     // undo action for this change.
     SwWrtShell &rSh = rView.GetWrtShell();
     rSh.StartUndo();
-    // <--
 
     long nX = 0;
     long nY = 0;
@@ -1206,7 +1158,6 @@ void SwEditWin::ChangeDrawing( BYTE nDir )
             // if the object's position is not protected
             if(0 == (nProtect&FLYPROTECT_POS))
             {
-                // --> FME 2005-04-26 #i47138#
                 // Check if object is anchored as character and move direction
                 BOOL bDummy;
                 const bool bVertAnchor = rSh.IsFrmVertical( TRUE, bDummy );
@@ -1215,7 +1166,6 @@ void SwEditWin::ChangeDrawing( BYTE nDir )
                     !bHoriMove || (rSh.GetAnchorId() != FLY_AS_CHAR);
                 if ( bMoveAllowed )
                 {
-                // <--
                     pSdrView->MoveAllMarked(Size(nX, nY));
                     rSh.SetModified();
                 }
@@ -1271,17 +1221,13 @@ void SwEditWin::ChangeDrawing( BYTE nDir )
         rSh.EndAllAction();
     }
 
-    // --> OD 2005-01-31 #i40845# - end undo action
     rSh.EndUndo();
-    // <--
 }
 
 /*--------------------------------------------------------------------
     Beschreibung:   KeyEvents
  --------------------------------------------------------------------*/
 
-
-
 void SwEditWin::KeyInput(const KeyEvent &rKEvt)
 {
     if( rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE &&
@@ -1345,7 +1291,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
     // look for vertical mappings
     if( !bIsDocReadOnly && !rSh.IsSelFrmMode() && !rSh.IsObjSelected() )
     {
-        //JP 21.2.2002: must changed from switch to if, because the Linux
+        // must changed from switch to if, because the Linux
         // compiler has problem with the code. Has to remove if the new general
         // handler exist.
         USHORT nKey = rKEvt.GetKeyCode().GetCode();
@@ -1466,9 +1412,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
     enum SW_KeyState { KS_Start,
                        KS_CheckKey, KS_InsChar, KS_InsTab,
                        KS_NoNum, KS_NumOff, KS_NumOrNoNum, KS_NumDown, KS_NumUp,
-                       // -> #i23725#
                        KS_NumIndentInc, KS_NumIndentDec,
-                       // <- #i23725#
 
                        KS_OutlineLvOff,
                        KS_NextCell, KS_PrevCell, KS_OutlineUp, KS_OutlineDown,
@@ -1506,20 +1450,16 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
                        KS_GotoPrevFieldMark,
                        KS_Ende };
 
-
-
     SW_KeyState eKeyState = bIsDocReadOnly ? KS_CheckDocReadOnlyKeys
                                            : KS_CheckKey,
                 eNextKeyState = KS_Ende;
     BYTE nDir = 0;
 
-    // -> #i23725#
     if (nKS_NUMDOWN_Count > 0)
         nKS_NUMDOWN_Count--;
 
     if (nKS_NUMINDENTINC_Count > 0)
         nKS_NUMINDENTINC_Count--;
-    // <- #i23725#
 
     while( KS_Ende != eKeyState )
     {
@@ -1532,8 +1472,8 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
 
 #if OSL_DEBUG_LEVEL > 1
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-            // JP 19.01.99: zum Umschalten des Cursor Verhaltens in ReadOnly
-            //              Bereichen
+            // zum Umschalten des Cursor Verhaltens in ReadOnly
+            //  Bereichen
             if( 0x7210 == rKeyCode.GetFullCode() )
                 rSh.SetReadOnlyAvailable( !rSh.IsReadOnlyAvailable() );
             else
@@ -1542,7 +1482,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
 
             if( !rKeyCode.IsMod2() && '=' == aCh &&
                 !rSh.IsTableMode() && rSh.GetTableFmt() &&
-                rSh.IsSttPara() /*&& rSh.IsEndPara()*/ &&
+                rSh.IsSttPara() &&
                 !rSh.HasReadonlySel() )
             {
                 // in der Tabelle am Anfang der Zelle ein '=' ->
@@ -1619,12 +1559,6 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
                     eFlyState = KS_Fly_Change;
                     nDir = MOVE_DOWN_SMALL;
                     goto KEYINPUT_CHECKTABLE;
-//              case KEY_UP | KEY_MOD2 | KEY_SHIFT:
-//                  eKeyState = KS_ColTopBig;
-//                  goto KEYINPUT_CHECKTABLE;
-//              case KEY_DOWN | KEY_MOD2 | KEY_SHIFT:
-//                  eKeyState = KS_ColTopSmall;
-//                  goto KEYINPUT_CHECKTABLE;
 
                 case KEY_UP | KEY_MOD2 | KEY_MOD1:
                     eKeyState = KS_CellBottomSmall;
@@ -1675,7 +1609,6 @@ KEYINPUT_CHECKTABLE:
                     nTblChgSize = pModOpt->GetTblVInsert();
                 }
                     goto KEYINPUT_CHECKTABLE_INSDEL;
-//                case KEY_RIGHT:
                 case KEY_RIGHT | KEY_MOD1:
                 {
                     eTblChgMode = nsTblChgWidthHeightType::WH_FLAG_INSDEL | nsTblChgWidthHeightType::WH_CELL_RIGHT;
@@ -1817,28 +1750,24 @@ KEYINPUT_CHECKTABLE_INSDEL:
                 case KEY_BACKSPACE | KEY_SHIFT:
                     if( !rSh.HasReadonlySel() )
                     {
-                        // #i23725#
                         BOOL bDone = FALSE;
-                        // --> OD 2006-01-31 - try to add comment for code snip:
+                        // try to add comment for code snip:
                         // Remove the paragraph indent, if the cursor is at the
                         // beginning of a paragraph, there is no selection
                         // and no numbering rule found at the current paragraph
-                        // --> OD 2006-01-31 #b6341339#, #i58776#
                         // Also try to remove indent, if current paragraph
                         // has numbering rule, but isn't counted and only
                         // key <backspace> is hit.
                         const bool bOnlyBackspaceKey(
                                     KEY_BACKSPACE == rKeyCode.GetFullCode() );
                         if ( rSh.IsSttPara() &&
-                             !rSh.HasSelection() && // i40834
+                             !rSh.HasSelection() &&
                              ( NULL == rSh.GetCurNumRule() ||
                                ( rSh.IsNoNum() && bOnlyBackspaceKey ) ) )
                         {
                             bDone = rSh.TryRemoveIndent();
                         }
-                        // <--
 
-                        // -> #i23725#
                         if (bDone)
                             eKeyState = KS_Ende;
                         else
@@ -1860,10 +1789,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                                     bDone = TRUE;
                                 }
                             }
-                            // <- #i23725#
-                            // --> OD 2006-01-31 #b6341339#, #i58776#
-                            // --> OD 2006-04-21 #i63540#
-                            // revise fix for issues b6341339 and i58776:
+
                             // If the cursor is in an empty paragraph, which has
                             // a numbering, but not the oultine numbering, and
                             // there is no selection, the numbering has to be
@@ -1905,7 +1831,6 @@ KEYINPUT_CHECKTABLE_INSDEL:
                             {
                                 eKeyState = KS_NumOrNoNum;
                             }
-                            // <--
                         }
                     }
                     break;
@@ -1932,11 +1857,8 @@ KEYINPUT_CHECKTABLE_INSDEL:
                     if( rSh.GetCurNumRule() && rSh.IsSttOfPara() &&
                         !rSh.HasReadonlySel() )
                     {
-                        // --> OD 2007-10-02 #b660435#
-//                        if (rSh.IsFirstOfNumRule()) // #i23725#
                         if ( rSh.IsFirstOfNumRule() &&
                              numfunc::ChangeIndentOnTabAtFirstPosOfFirstListItem() )
-                        // <--
                             eKeyState = KS_NumIndentInc;
                         else
                             eKeyState = KS_NumDown;
@@ -1963,10 +1885,9 @@ KEYINPUT_CHECKTABLE_INSDEL:
                         {
                             SwTxtFmtColl* pColl = rSh.GetCurTxtFmtColl();
                             if( pColl &&
-                                //0 <= pColl->GetOutlineLevel() && #i24560#
-                                //MAXLEVEL - 1 > pColl->GetOutlineLevel() )//#outline level,zhaojianwei
+
                                 pColl->IsAssignedToListLevelOfOutlineStyle()
-                                && MAXLEVEL-1 > pColl->GetAssignedOutlineStyleLevel() )//<-end,zhaojianwei
+                                && MAXLEVEL-1 > pColl->GetAssignedOutlineStyleLevel() )
                                 eKeyState = KS_OutlineDown;
                         }
                     }
@@ -1986,11 +1907,9 @@ KEYINPUT_CHECKTABLE_INSDEL:
                     else if( rSh.GetCurNumRule() && rSh.IsSttOfPara() &&
                          !rSh.HasReadonlySel() )
                     {
-                        // --> OD 2007-10-02 #b660435#
-//                        if (rSh.IsFirstOfNumRule()) // #i23725#
+
                         if ( rSh.IsFirstOfNumRule() &&
                              numfunc::ChangeIndentOnTabAtFirstPosOfFirstListItem() )
-                        // <--
                             eKeyState = KS_NumIndentDec;
                         else
                             eKeyState = KS_NumUp;
@@ -2016,8 +1935,6 @@ KEYINPUT_CHECKTABLE_INSDEL:
                         if( rSh.IsSttOfPara() && !rSh.HasReadonlySel() )
                         {
                             SwTxtFmtColl* pColl = rSh.GetCurTxtFmtColl();
-                            //if( pColl && 0 < pColl->GetOutlineLevel() &&  //#outline level,zhaojianwei
-                            //  MAXLEVEL - 1 >= pColl->GetOutlineLevel() )
                             if( pColl &&
                                 pColl->IsAssignedToListLevelOfOutlineStyle() &&
                                 0 < pColl->GetAssignedOutlineStyleLevel())
@@ -2035,7 +1952,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                     {
                         if( aTmpQHD.HasCntnt() && !rSh.HasSelection() )
                         {
-                            // zum naechsten Tip
+                            // to the next Tip
                             aTmpQHD.Inc( pACorr && pACorr->GetSwFlags().
                                                    bAutoCmpltEndless );
                             eKeyState = KS_NextPrevGlossary;
@@ -2058,7 +1975,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                         if( aTmpQHD.HasCntnt() && !rSh.HasSelection() &&
                             !rSh.HasReadonlySel() )
                         {
-                            // zum vorherigen Tip
+                            // to the previous Tip
                             aTmpQHD.Dec( pACorr && pACorr->GetSwFlags().
                                                         bAutoCmpltEndless );
                             eKeyState = KS_NextPrevGlossary;
@@ -2168,13 +2085,12 @@ KEYINPUT_CHECKTABLE_INSDEL:
                     bFlushBuffer = TRUE, bNormalChar = FALSE;
                 else
                 {
-// OS 22.09.95: Da der Sfx Acceleratoren nur aufruft, wenn sie beim letzten
-//              Statusupdate enabled wurden, muss copy ggf. von uns
-//              'gewaltsam' gerufen werden.
+                    // Da der Sfx Acceleratoren nur aufruft, wenn sie beim letzten
+                    // Statusupdate enabled wurden, muss copy ggf. von uns
+                    // 'gewaltsam' gerufen werden.
                     if( rKeyCode.GetFunction() == KEYFUNC_COPY )
                         GetView().GetViewFrame()->GetBindings().Execute(SID_COPY);
 
-
                     if( !bIsDocReadOnly && bNormalChar )
                     {
                         const int nSelectionType = rSh.GetSelectionType();
@@ -2241,15 +2157,15 @@ KEYINPUT_CHECKTABLE_INSDEL:
         }
         break;
         case KS_InsTab:
-            if( rView.ISA( SwWebView ))     //Kein Tabulator fuer Web!
+            if( rView.ISA( SwWebView ))     // no Tab for WebView
             {
-                // Bug 56196 - dann sollte der weiter gereicht werden.
+                // dann sollte der weiter gereicht werden.
                 Window::KeyInput( aKeyEvent );
                 eKeyState = KS_Ende;
                 break;
             }
             aCh = '\t';
-            // kein break!
+            // no break!
         case KS_InsChar:
             if (rSh.GetChar(FALSE)==CH_TXT_ATR_FORMELEMENT)
             {
@@ -2295,7 +2211,6 @@ KEYINPUT_CHECKTABLE_INSDEL:
                     aInBuffer.Expand( aInBuffer.Len() + 1, ' ' );
                 }
 
-
                 BOOL bIsAutoCorrectChar =  SvxAutoCorrect::IsAutoCorrectChar( aCh );
                 BOOL bRunNext = pACorr && pACorr->HasRunNext();
                 if( !aKeyEvent.GetRepeat() && pACorr && ( bIsAutoCorrectChar || bRunNext ) &&
@@ -2335,7 +2250,6 @@ KEYINPUT_CHECKTABLE_INSDEL:
             else
             {
                 InfoBox( this, SW_RES( MSG_READONLY_CONTENT )).Execute();
-    // ???          Window::KeyInput( aKeyEvent );
                 eKeyState = KS_Ende;
             }
         break;
@@ -2348,12 +2262,6 @@ KEYINPUT_CHECKTABLE_INSDEL:
                                         ChgToEnEmDash | SetINetAttr |
                                         Autocorrect ) &&
                 !rSh.HasReadonlySel() )
-        /*  {
-                pACorr->IsAutoCorrFlag( CptlSttSntnc | CptlSttWrd |
-                                        ChgFractionSymbol | ChgOrdinalNumber |
-                                        ChgToEnEmDash | SetINetAttr |
-                                        Autocorrect ) &&
-                !rSh.HasReadonlySel() ) */
             {
                 FlushInBuffer();
                 rSh.AutoCorrect( *pACorr, static_cast< sal_Unicode >('\0') );
@@ -2366,8 +2274,6 @@ KEYINPUT_CHECKTABLE_INSDEL:
         {
             USHORT nSlotId = 0;
             FlushInBuffer();
-//???           if( bFlushCharBuffer )
-//???               FlushInBuffer( &rSh );
             switch( eKeyState )
             {
             case KS_SpecialInsert:
@@ -2388,17 +2294,14 @@ KEYINPUT_CHECKTABLE_INSDEL:
 
             case KS_NumDown:
                 rSh.NumUpDown( TRUE );
-                nKS_NUMDOWN_Count = 2; // #i23725#
+                nKS_NUMDOWN_Count = 2;
                 break;
             case KS_NumUp:
                 rSh.NumUpDown( FALSE );
                 break;
 
-                // -> #i23726#
             case KS_NumIndentInc:
-                // --> OD 2008-06-16 #i90078#
                 rSh.ChangeIndentOfAllListLevels(360);
-                // <--
                 nKS_NUMINDENTINC_Count = 2;
                 break;
 
@@ -2417,11 +2320,8 @@ KEYINPUT_CHECKTABLE_INSDEL:
                 break;
 
             case KS_NumIndentDec:
-                // --> OD 2008-06-16 #i90078#
                 rSh.ChangeIndentOfAllListLevels(-360);
-                // <--
                 break;
-                // <- #i23726#
 
             case KS_OutlineDown:
                 rSh.OutlineUpDown( 1 );
@@ -2431,7 +2331,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                 break;
 
             case KS_NextCell:
-                //In Tabelle immer 'flushen'
+                // always 'flush' in tables
                 rSh.GoNextCell();
                 nSlotId = FN_GOTO_NEXT_CELL;
                 break;
@@ -2443,8 +2343,6 @@ KEYINPUT_CHECKTABLE_INSDEL:
                 rSh.SplitNode( TRUE );
                 break;
 
-//          case KS_NumOrNoNum:
-//              break;
             case KS_NextObject:
             case KS_PrevObject:
                 if(rSh.GotoObj( KS_NextObject == eKeyState, GOTOOBJ_GOTO_ANY))
@@ -2514,9 +2412,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
             case KS_ColRightBig:        rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_COL_RIGHT|nsTblChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTblHMove() );  break;
             case KS_ColLeftSmall:       rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_COL_LEFT, pModOpt->GetTblHMove() );   break;
             case KS_ColRightSmall:      rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_COL_RIGHT, pModOpt->GetTblHMove() );  break;
-//          case KS_ColTopBig:          rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_ROW_TOP|nsTblChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTblVMove() );    break;
             case KS_ColBottomBig:       rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_ROW_BOTTOM|nsTblChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTblVMove() ); break;
-//          case KS_ColTopSmall:        rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_ROW_TOP, pModOpt->GetTblVMove() );    break;
             case KS_ColBottomSmall:     rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_ROW_BOTTOM, pModOpt->GetTblVMove() ); break;
             case KS_CellLeftBig:        rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_CELL_LEFT|nsTblChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTblHMove() );  break;
             case KS_CellRightBig:       rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_CELL_RIGHT|nsTblChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTblHMove() ); break;
@@ -2582,7 +2478,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
     // falls die gepufferten Zeichen eingefuegt werden sollen
     if( bFlushBuffer && aInBuffer.Len() )
     {
-        //OS 16.02.96 11.04: bFlushCharBuffer wurde hier nicht zurueckgesetzt
+        // bFlushCharBuffer wurde hier nicht zurueckgesetzt
         // warum nicht?
         BOOL bSave = bFlushCharBuffer;
         FlushInBuffer();
@@ -2604,7 +2500,6 @@ KEYINPUT_CHECKTABLE_INSDEL:
      Beschreibung:  MouseEvents
  --------------------------------------------------------------------*/
 
-
 void SwEditWin::RstMBDownFlags()
 {
     //Nicht auf allen Systemen kommt vor dem modalen
@@ -2616,8 +2511,6 @@ void SwEditWin::RstMBDownFlags()
     ReleaseMouse();
 }
 
-
-
 void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
 {
     SwWrtShell &rSh = rView.GetWrtShell();
@@ -2628,7 +2521,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
     // opened by inplace client and we would deactivate the inplace client,
     // the contex menu is closed by VCL asynchronously which in the end
     // would work on deleted objects or the context menu has no parent anymore)
-    // See #126086# and #128122#
     SfxInPlaceClient* pIPClient = rSh.GetSfxViewShell()->GetIPClient();
     BOOL bIsOleActive = ( pIPClient && pIPClient->IsObjectInPlaceActive() );
 
@@ -2696,7 +2588,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
         }
     }
 
-
     bIsInMove = FALSE;
     aStartPos = rMEvt.GetPosPixel();
     aRszMvHdlPt.X() = 0, aRszMvHdlPt.Y() = 0;
@@ -2708,7 +2599,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
          0 != (nMouseTabCol = rSh.WhichMouseTabCol( aDocPos ) ) &&
          !rSh.IsObjSelectable( aDocPos ) )
     {
-        // --> FME 2004-07-30 #i32329# Enhanced table selection
         if ( SW_TABSEL_HORI <= nMouseTabCol && SW_TABCOLSEL_VERT >= nMouseTabCol )
         {
             rSh.EnterStdMode();
@@ -2724,7 +2614,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
             }
             return;
         }
-        // <--
 
         if ( !rSh.IsTableMode() )
         {
@@ -2753,7 +2642,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
             }
         }
     }
-    // #i23726#
     else if (bTmp &&
              rSh.IsNumLabel(aDocPos))
     {
@@ -2763,10 +2651,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
         SfxBindings& rBind = rView.GetViewFrame()->GetBindings();
         rBind.Update();
 
-        // --> OD 2005-02-21 #i42921#
         if ( RulerMarginDrag( rMEvt,
                         rSh.IsVerticalModeAtNdAndPos( *pNodeAtPos, aDocPos ) ) )
-        // <--
         {
             rView.SetNumRuleNodeFromDoc( NULL );
             rView.InvalidateRulerPos();
@@ -2775,11 +2661,10 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
         }
         else
         {
-            // --> FME 2005-11-03 #125036# Make sure the pointer is set to 0,
+            // Make sure the pointer is set to 0,
             // otherwise it may point to nowhere after deleting the corresponding
             // text node.
             rView.SetNumRuleNodeFromDoc( NULL );
-            // <--
             return;
         }
     }
@@ -2799,7 +2684,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
     {
         BOOL bOnlyText = FALSE;
         bMBPressed = bNoInterrupt = TRUE;
-        nKS_NUMDOWN_Count = 0; // #i23725#
+        nKS_NUMDOWN_Count = 0;
 
         CaptureMouse();
 
@@ -2877,11 +2762,9 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                 bExecHyperlinks = TRUE;
         }
 
-        // --> FME 2004-07-30 #i32329# Enhanced selection
         BYTE nNumberOfClicks = static_cast< BYTE >(rMEvt.GetClicks() % 4);
         if ( 0 == nNumberOfClicks && 0 < rMEvt.GetClicks() )
             nNumberOfClicks = 4;
-        // <--
 
         BOOL bExecDrawTextLink = FALSE;
 
@@ -2914,7 +2797,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                             !GetView().GetViewFrame()->GetDispatcher()->IsLocked() &&
                             !bExecDrawTextLink)
                         {
-                            // #107513#
                             // Test if there is a draw object at that position and if it should be selected.
                             sal_Bool bShould = rSh.ShouldObjectBeSelected(aDocPos);
 
@@ -3035,7 +2917,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                         if ( !bIsDocReadOnly && rSh.IsInsideSelectedObj(aDocPos) &&
                              0 == rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) )
 
-/* SJ: 01.03.2005: this is no good, on the one hand GetSelectionType is used as flag field (take a look into the GetSelectionType method)
+/* this is no good, on the one hand GetSelectionType is used as flag field (take a look into the GetSelectionType method)
    on the other hand the return value is used in a switch without proper masking (very nice), this must lead to trouble
 */
                         switch ( rSh.GetSelectionType() &~ ( nsSelectionType::SEL_FONTWORK | nsSelectionType::SEL_EXTRUDED_CUSTOMSHAPE ) )
@@ -3152,12 +3034,10 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                         if ( bMod )
                             rSh.EnterAddMode();
 
-                        // --> FME 2004-07-30 #i32329# Enhanced selection
                         if ( 3 == nNumberOfClicks )
                             rSh.SelSentence( &aDocPos );
                         else
                             rSh.SelPara( &aDocPos );
-                        // <--
 
                         if ( bMod )
                             rSh.LeaveAddMode();
@@ -3390,7 +3270,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                         bCallBase = FALSE;
                     }
 
-                    //#i42732# - notify the edit window that from now on we do not use the input language
+                    // notify the edit window that from now on we do not use the input language
                     if ( !(CRSR_POSOLD & nTmpSetCrsr) )
                         SetUseInputLanguage( sal_False );
 
@@ -3402,13 +3282,11 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                 if ( !bOverURLGrf && !bOnlyText )
                 {
                     const int nSelType = rSh.GetSelectionType();
-                    // --> OD 2009-12-30 #i89920#
                     // Check in general, if an object is selectable at given position.
                     // Thus, also text fly frames in background become selectable via Ctrl-Click.
                     if ( nSelType & nsSelectionType::SEL_OLE ||
                          nSelType & nsSelectionType::SEL_GRF ||
                          rSh.IsObjSelectable( aDocPos ) )
-                    // <--
                     {
                         MV_KONTEXT( &rSh );
                         if( !rSh.IsFrmSelected() )
@@ -3420,8 +3298,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
                 // nicht mehr hier zuruecksetzen, damit -- falls durch MouseMove
                 // bei gedrueckter Ctrl-Taste eine Mehrfachselektion erfolgen soll,
                 // im Drag nicht die vorherige Selektion aufgehoben wird.
-//              if(bModePushed)
-//                  rSh.PopMode(FALSE);
                 break;
             }
         }
@@ -3434,7 +3310,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
     Beschreibung:   MouseMove
  --------------------------------------------------------------------*/
 
-
 void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
 {
     MouseEvent rMEvt(_rMEvt);
@@ -3461,8 +3336,8 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
 
     SET_CURR_SHELL( &rSh );
 
-    //aPixPt == Point in Pixel, rel. zu ChildWin
-    //aDocPt == Point in Twips, Dokumentkoordinaten
+    //aPixPt == Point in Pixel, relative to ChildWin
+    //aDocPt == Point in Twips, document coordinates
     const Point aPixPt( rMEvt.GetPosPixel() );
     const Point aDocPt( PixelToLogic( aPixPt ) );
 
@@ -3519,7 +3394,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
         Point aDD( SwEditWin::nDDStartPosX, SwEditWin::nDDStartPosY );
         aDD = LogicToPixel( aDD );
         Rectangle aRect( aDD.X()-3, aDD.Y()-3, aDD.X()+3, aDD.Y()+3 );
-        if ( !aRect.IsInside( aPixPt ) )    // MA 23. May. 95: Tatterschutz.
+        if ( !aRect.IsInside( aPixPt ) )
             StopDDTimer( &rSh, aDocPt );
     }
 
@@ -3580,7 +3455,6 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
                     nPointer = POINTER_HSIZEBAR;
                     bChkTblSel = true;
                     break;
-                // --> FME 2004-07-30 #i20126# Enhanced table selection
                 case SW_TABSEL_HORI :
                     nPointer = POINTER_TAB_SELECT_SE;
                     break;
@@ -3599,31 +3473,26 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
                 case SW_TABCOLSEL_VERT :
                     nPointer = POINTER_TAB_SELECT_W;
                     break;
-                // <--
             }
 
             if ( USHRT_MAX != nPointer &&
-                // --> FME 2004-10-20 #i35543#
-                // Enhanced table selection is explicitely allowed in table mode
+                // i#35543 - Enhanced table selection is explicitely allowed in table mode
                 ( !bChkTblSel || !rSh.IsTableMode() ) )
-                // <--
             {
                 SetPointer( nPointer );
             }
 
             return;
         }
-        // #i23726#
         else if (rSh.IsNumLabel(aDocPt, RULER_MOUSE_MARGINWIDTH))
         {
-            // --> OD 2005-02-21 #i42921# - consider vertical mode
+            // i#42921 - consider vertical mode
             SwTxtNode* pNodeAtPos = rSh.GetNumRuleNodeAtPos( aDocPt );
             const USHORT nPointer =
                     rSh.IsVerticalModeAtNdAndPos( *pNodeAtPos, aDocPt )
                     ? POINTER_VSIZEBAR
                     : POINTER_HSIZEBAR;
             SetPointer( nPointer );
-            // <--
 
             return;
         }
@@ -3645,10 +3514,8 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
                 // So the pAnchorMarker has to find the right SdrHdl, if it's
                 // the old one, it will find it with position aOld, if this one
                 // is destroyed, it will find a new one at position GetHdlPos().
-                // --> OD 2010-09-16 #i114522#
-//                const Point aOld = pAnchorMarker->GetPos();
+
                 const Point aOld = pAnchorMarker->GetPosForHitTest( *(rSh.GetOut()) );
-                // <--
                 Point aNew = rSh.FindAnchorPos( aDocPt );
                 SdrHdl* pHdl;
                 if( (0!=( pHdl = pSdrView->PickHandle( aOld ) )||
@@ -3661,7 +3528,6 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
                     {
                         pAnchorMarker->SetPos( aNew );
                         pAnchorMarker->SetLastPos( aDocPt );
-                        //OLMpSdrView->RefreshAllIAOManagers();
                     }
                 }
                 else
@@ -3724,8 +3590,6 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
                             0 != ( pMacro = pFlyFmt->GetMacro().GetMacroTable().
                             Get( nEvent )) &&
 // oder nur z.B. alle 20 Twip bescheid sagen?
-//                          ( 20 > Abs( aRszMvHdlPt.X() - aDocPt.X() ) ||
-//                            20 > Abs( aRszMvHdlPt.Y() - aDocPt.Y() ) )
                             aRszMvHdlPt != aDocPt )
                         {
                             aRszMvHdlPt = aDocPt;
@@ -3811,9 +3675,6 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
                 }
                 else
                 {
-                    //JP 24.09.98: Fix fuer die Bugs 55592 / 55931
-                    //JP 23.04.99: Fix fuer den Bugs 65289
-                    //JP 06.07.99: Fix fuer den Bugs 67360
                     if( !rMEvt.IsSynthetic() &&
                             !(( MOUSE_LEFT + KEY_MOD1 ==
                             rMEvt.GetModifier() + rMEvt.GetButtons() ) &&
@@ -3835,7 +3696,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
                 UpdatePointer(aDocPt, 0); // evtl. muss hier ein Rahmen markiert werden
                                 break;
                         }
-            //#i6193#, change ui if mouse is over SwPostItField
+            // change ui if mouse is over SwPostItField
             // TODO: do the same thing for redlines SW_REDLINE
             SwRect aFldRect;
             SwContentAtPos aCntntAtPos( SwContentAtPos::SW_FIELD);
@@ -3947,7 +3808,6 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
     Beschreibung:   Button Up
  --------------------------------------------------------------------*/
 
-
 void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
 {
     BOOL bCallBase = TRUE;
@@ -3963,7 +3823,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
     SdrHdlKind eOldSdrMoveHdl = eSdrMoveHdl;
     eSdrMoveHdl = HDL_USER;     // fuer die MoveEvents - wieder zuruecksetzen
 
-    // sicherheitshalber zuruecksetzen Bug 27900
+    // sicherheitshalber zuruecksetzen
     rView.SetTabColFromDoc( FALSE );
     rView.SetNumRuleNodeFromDoc(NULL);
 
@@ -3983,10 +3843,9 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
     //MouseButtonUp nur bearbeiten, wenn auch das Down an dieses Fenster ging.
     if ( !bMBPressed )
     {
-// OS 25.02.97 Undo fuer die Giesskann ist bereits im CommandHdl
-//JP 29.09.95: so sollte es sein!!!     if(pApplyTempl->bUndo)
-//      if( pApplyTempl && MOUSE_RIGHT == rMEvt.GetModifier() + rMEvt.GetButtons() )
-//          rSh.Do( SwWrtShell::UNDO );
+// Undo fuer die Giesskann ist bereits im CommandHdl
+//so sollte es sein!!!
+
         return;
     }
 
@@ -4009,7 +3868,6 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
     if( pAnchorMarker )
     {
         Point aPnt( pAnchorMarker->GetLastPos() );
-        //OLMpSdrView->RefreshAllIAOManagers();
         DELETEZ( pAnchorMarker );
         if( aPnt.X() || aPnt.Y() )
             rSh.FindAnchorPos( aPnt, TRUE );
@@ -4177,7 +4035,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
 
             if( bHoldSelection )
             {
-                //JP 27.04.99: Bug 65389 - das EndDrag sollte auf jedenfall
+                // das EndDrag sollte auf jedenfall
                 //              gerufen werden.
                 bHoldSelection = FALSE;
                 (rSh.*rSh.fnEndDrag)( &aDocPt, FALSE );
@@ -4203,8 +4061,6 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
                     (rSh.*rSh.fnEndDrag)( &aDocPt, FALSE );
 
                     // Internetfield? --> Link-Callen (DocLaden!!)
-//JP 18.10.96: Bug 32437 -
-//                  if( !rSh.HasSelection() )
                     if( !bInSel )
                     {
                         USHORT nFilter = URLLOAD_NOFILTER;
@@ -4255,8 +4111,6 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
                                 if ( aCntntAtPos.aFnd.pFldmark != NULL)
                                 {
                                     IFieldmark *fieldBM = const_cast< IFieldmark* > ( aCntntAtPos.aFnd.pFldmark );
-                                    //SwDocShell* pDocSh = rView.GetDocShell();
-                                    //SwDoc *pDoc=pDocSh->GetDoc();
                                     if (fieldBM->GetFieldname( ).equalsAscii( ODF_FORMCHECKBOX ) )
                                     {
                                         ICheckboxFieldmark* pCheckboxFm = dynamic_cast<ICheckboxFieldmark*>(fieldBM);
@@ -4272,7 +4126,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
                                     }
                                 }
                             }
-                            else // if ( SwContentAtPos::SW_INETATTR == aCntntAtPos.eCntntAtPos )
+                            else
                             {
                                 if ( bExecHyperlinks )
                                     rSh.ClickToINetAttr( *(SwFmtINetFmt*)aCntntAtPos.aFnd.pAttr, nFilter );
@@ -4465,11 +4319,9 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
                 case SFX_STYLE_FAMILY_PSEUDO:
                     if( !rSh.HasReadonlySel() )
                     {
-                        // --> OD 2008-03-17 #refactorlists#
                         rSh.SetCurNumRule( *pApplyTempl->aColl.pNumRule,
                                            false,
                                            pApplyTempl->aColl.pNumRule->GetDefaultListId() );
-                        // <--
                         bCallBase = FALSE;
                         pApplyTempl->bUndo = TRUE;
                         if( pApplyTempl->aColl.pNumRule )
@@ -4508,12 +4360,10 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
         Window::MouseButtonUp(rMEvt);
 }
 
-
 /*--------------------------------------------------------------------
     Beschreibung:   Vorlage anwenden
  --------------------------------------------------------------------*/
 
-
 void SwEditWin::SetApplyTemplate(const SwApplyTemplate &rTempl)
 {
     static BOOL bIdle = FALSE;
@@ -4568,7 +4418,6 @@ void SwEditWin::SetApplyTemplate(const SwApplyTemplate &rTempl)
     Beschreibung:   ctor
  --------------------------------------------------------------------*/
 
-
 SwEditWin::SwEditWin(Window *pParent, SwView &rMyView):
     Window(pParent, WinBits(WB_CLIPCHILDREN | WB_DIALOGCONTROL)),
     DropTargetHelper( this ),
@@ -4594,8 +4443,8 @@ SwEditWin::SwEditWin(Window *pParent, SwView &rMyView):
 
     bLockInput(FALSE),
     bObjectSelect( FALSE ),
-    nKS_NUMDOWN_Count(0), // #i23725#
-    nKS_NUMINDENTINC_Count(0) // #i23725#
+    nKS_NUMDOWN_Count(0),
+    nKS_NUMINDENTINC_Count(0)
 {
     SetHelpId(HID_EDIT_WIN);
     EnableChildTransparentMode();
@@ -4603,7 +4452,7 @@ SwEditWin::SwEditWin(Window *pParent, SwView &rMyView):
 
     bLinkRemoved = bMBPressed = bInsDraw = bInsFrm =
     bIsInDrag = bOldIdle = bOldIdleSet = bChainMode = bWasShdwCrsr = FALSE;
-    //#i42732# initially use the input language
+    // initially use the input language
     bUseInputLanguage = sal_True;
 
     SetMapMode(MapMode(MAP_TWIP));
@@ -4623,7 +4472,7 @@ SwEditWin::SwEditWin(Window *pParent, SwView &rMyView):
     aTemplateTimer.SetTimeout(400);
     aTemplateTimer.SetTimeoutHdl(LINK(this, SwEditWin, TemplateTimerHdl));
 
-    //JP 16.12.98: temporaere Loesung!!! Sollte bei jeder Cursorbewegung
+    // temporaere Loesung!!! Sollte bei jeder Cursorbewegung
     //          den Font von der akt. einfuege Position setzen!
     if( !rMyView.GetDocShell()->IsReadOnly() )
     {
@@ -4633,8 +4482,6 @@ SwEditWin::SwEditWin(Window *pParent, SwView &rMyView):
     }
 }
 
-
-
 SwEditWin::~SwEditWin()
 {
     aKeyInputTimer.Stop();
@@ -4654,12 +4501,10 @@ SwEditWin::~SwEditWin()
     delete pAnchorMarker;
 }
 
-
 /******************************************************************************
  *  Beschreibung: DrawTextEditMode einschalten
  ******************************************************************************/
 
-
 void SwEditWin::EnterDrawTextMode( const Point& aDocPos )
 {
     if ( rView.EnterDrawTextMode(aDocPos) == TRUE )
@@ -4679,14 +4524,11 @@ void SwEditWin::EnterDrawTextMode( const Point& aDocPos )
  *  Beschreibung: DrawMode einschalten
  ******************************************************************************/
 
-
-
 BOOL SwEditWin::EnterDrawMode(const MouseEvent& rMEvt, const Point& aDocPos)
 {
     SwWrtShell &rSh = rView.GetWrtShell();
     SdrView *pSdrView = rSh.GetDrawView();
 
-//  if ( GetDrawFuncPtr() && (aActHitType == SDRHIT_NONE || rSh.IsDrawCreate()) )
     if ( rView.GetDrawFuncPtr() )
     {
         if (rSh.IsDrawCreate())
@@ -4720,23 +4562,11 @@ BOOL SwEditWin::EnterDrawMode(const MouseEvent& rMEvt, const Point& aDocPos)
     return FALSE;
 }
 
-/******************************************************************************
- *  Beschreibung:
- ******************************************************************************/
-
-
-
 BOOL SwEditWin::IsDrawSelMode()
 {
-//  return (IsFrmAction() == FALSE && GetSdrDrawMode() == OBJ_NONE);
     return IsObjectSelect();
 }
 
-/******************************************************************************
- *  Beschreibung:
- ******************************************************************************/
-
-
 void SwEditWin::GetFocus()
 {
     if ( rView.GetPostItMgr()->HasActiveSidebarWin() )
@@ -4751,12 +4581,6 @@ void SwEditWin::GetFocus()
     }
 }
 
-/******************************************************************************
- *  Beschreibung:
- ******************************************************************************/
-
-
-
 void SwEditWin::LoseFocus()
 {
     rView.GetWrtShell().InvalidateAccessibleFocus();
@@ -4766,12 +4590,6 @@ void SwEditWin::LoseFocus()
     rView.LostFocus();
 }
 
-/******************************************************************************
- *  Beschreibung:
- ******************************************************************************/
-
-
-
 void SwEditWin::Command( const CommandEvent& rCEvt )
 {
     SwWrtShell &rSh = rView.GetWrtShell();
@@ -4787,7 +4605,6 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
     // menu from an inplace client has been closed. Now we have the chance
     // to deactivate the inplace client without any problem regarding parent
     // windows and code on the stack.
-    // For more information, see #126086# and #128122#
     SfxInPlaceClient* pIPClient = rSh.GetSfxViewShell()->GetIPClient();
     BOOL bIsOleActive = ( pIPClient && pIPClient->IsObjectInPlaceActive() );
     if ( bIsOleActive && ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU ))
@@ -4887,7 +4704,6 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
                 if ( VOICECOMMANDTYPE_CONTROL == pCData->GetType() )
                     break;
 
-
                 USHORT nSlotId = 0;
                 SfxPoolItem *pItem = 0;
 
@@ -5006,7 +4822,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
 
                 if ( sRecord.Len() )
                 {
-                    // #102812# convert quotes in IME text
+                    // convert quotes in IME text
                     // works on the last input character, this is escpecially in Korean text often done
                     // quotes that are inside of the string are not replaced!
                     const sal_Unicode aCh = sRecord.GetChar(sRecord.Len() - 1);
@@ -5134,7 +4950,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
             GetView().GetViewFrame()->GetDispatcher()->Execute(SID_HANGUL_HANJA_CONVERSION);
         break;
         case COMMAND_INPUTLANGUAGECHANGE :
-            //#i42732# update state of fontname if input language changes
+            // i#42732 - update state of fontname if input language changes
             bInputLanguageSwitched = true;
             SetUseInputLanguage( sal_True );
         break;
@@ -5217,26 +5033,21 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
         Window::Command(rCEvt);
 }
 
-/* -----------------25.08.2003 10:12-----------------
-    #i18686#: select the object/cursor at the mouse
-    position of the context menu request
- --------------------------------------------------*/
+/*  i#18686 select the object/cursor at the mouse
+    position of the context menu request */
 BOOL SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
 {
     BOOL bRet = FALSE;
     const Point aDocPos( PixelToLogic( rMousePos ) );
-    // --> OD 2005-02-17 #i42258#
     const bool bIsInsideSelectedObj( rSh.IsInsideSelectedObj( aDocPos ) );
-    // <--
     //create a synthetic mouse event out of the coordinates
     MouseEvent aMEvt(rMousePos);
     SdrView *pSdrView = rSh.GetDrawView();
     if ( pSdrView )
     {
-        // --> OD 2005-02-17 #i42258# - no close of insert_draw and reset of
+        // no close of insert_draw and reset of
         // draw mode, if context menu position is inside a selected object.
         if ( !bIsInsideSelectedObj && rView.GetDrawFuncPtr() )
-        // <--
         {
 
             rView.GetDrawFuncPtr()->Deactivate();
@@ -5308,7 +5119,6 @@ BOOL SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
     if( !rSh.IsSelFrmMode() &&
         !GetView().GetViewFrame()->GetDispatcher()->IsLocked() )
     {
-        // #107513#
         // Test if there is a draw object at that position and if it should be selected.
         sal_Bool bShould = rSh.ShouldObjectBeSelected(aDocPos);
 
@@ -5458,8 +5268,6 @@ SfxShell* lcl_GetShellFromDispatcher( SwView& rView, TypeId nType )
     return pShell;
 }
 
-
-
 void SwEditWin::ClearTip()
 {
 }
@@ -5470,7 +5278,6 @@ IMPL_LINK( SwEditWin, KeyInputFlushHandler, Timer *, EMPTYARG )
     return 0;
 }
 
-
 IMPL_LINK( SwEditWin, KeyInputTimerHandler, Timer *, EMPTYARG )
 {
     bTblInsDelMode = FALSE;
@@ -5486,28 +5293,20 @@ void SwEditWin::_FinitStaticData()
 {
     delete pQuickHlpData;
 }
-/* -----------------23.01.2003 12:15-----------------
- * #i3370# remove quick help to prevent saving
- * of autocorrection suggestions
- * --------------------------------------------------*/
+/* i#3370 - remove quick help to prevent saving
+ * of autocorrection suggestions */
 void SwEditWin::StopQuickHelp()
 {
     if( HasFocus() && pQuickHlpData && pQuickHlpData->bClear  )
         pQuickHlpData->Stop( rView.GetWrtShell() );
 }
 
-/*-----------------23.02.97 18:39-------------------
-
---------------------------------------------------*/
-
-
 IMPL_LINK(SwEditWin, TemplateTimerHdl, Timer*, EMPTYARG)
 {
     SetApplyTemplate(SwApplyTemplate());
     return 0;
 }
 
-
 void SwEditWin::SetChainMode( BOOL bOn )
 {
     if ( !bChainMode )
@@ -5532,8 +5331,7 @@ void SwEditWin::SetChainMode( BOOL bOn )
 
 uno::Reference< ::com::sun::star::accessibility::XAccessible > SwEditWin::CreateAccessible()
 {
-    SolarMutexGuard aGuard;   // this should have
-                                                        // happend already!!!
+    SolarMutexGuard aGuard;   // this should have happend already!!!
     SwWrtShell *pSh = rView.GetWrtShellPtr();
     OSL_ENSURE( pSh, "no writer shell, no accessible object" );
     uno::Reference<
@@ -5551,7 +5349,6 @@ void QuickHelpData::Move( QuickHelpData& rCpy )
     // Pointer verschieben
     aArr.Insert( &rCpy.aArr );
     rCpy.aArr.Remove( (USHORT)0, rCpy.aArr.Count() );
-//  nTipId = rCpy.nTipId;
     bClear = rCpy.bClear;
     nLen = rCpy.nLen;
     nCurArrPos = rCpy.nCurArrPos;
@@ -5581,7 +5378,6 @@ void QuickHelpData::ClearCntnt()
     delete[] pAttrs, pAttrs = 0;
 }
 
-
 void QuickHelpData::Start( SwWrtShell& rSh, USHORT nWrdLen )
 {
     if( pCETID ) delete pCETID, pCETID = 0;
@@ -5629,8 +5425,6 @@ void QuickHelpData::Stop( SwWrtShell& rSh )
     ClearCntnt();
 }
 
-
-
 void QuickHelpData::FillStrArr( SwWrtShell& rSh, const String& rWord )
 {
     salhelper::SingletonRef<SwCalendarWrapper>* pCalendar = s_getCalendarWrapper();
@@ -5647,8 +5441,6 @@ void QuickHelpData::FillStrArr( SwWrtShell& rSh, const String& rWord )
                 if( rWord.Len() + 1 < sStr.Len() &&
 
 //!!! UNICODE: fehlendes interface
-//                  pIntl->CompareEqual( rWord, sStr.Copy( 0, rWord.Len() ),
-//                              INTN_COMPARE_IGNORECASE ) )
                     COMPARE_EQUAL == rWord.CompareIgnoreCaseToAscii(
                                         sStr, rWord.Len() ))
                 {
@@ -5670,9 +5462,9 @@ void QuickHelpData::FillStrArr( SwWrtShell& rSh, const String& rWord )
         while( nStt < nEnd )
         {
             const String& rS = rACLst[ nStt ];
-            //JP 16.06.99: Bug 66927 - only if the count of chars
-            //              from the suggest greater as the
-            //              actual word
+            // only if the count of chars
+            // from the suggest greater as the
+            // actual word
             if( rS.Len() > rWord.Len() )
             {
                 String* pNew = new String( rS );
@@ -5683,9 +5475,7 @@ void QuickHelpData::FillStrArr( SwWrtShell& rSh, const String& rWord )
         }
     }
 }
-/* -----------------06.11.2002 12:01-----------------
- *
- * --------------------------------------------------*/
+
 void SwEditWin::ShowAutoTextCorrectQuickHelp(
         const String& rWord, SvxAutoCorrCfg* pACfg, SvxAutoCorrect* pACorr,
         sal_Bool bFromIME )
@@ -5717,10 +5507,6 @@ void SwEditWin::ShowAutoTextCorrectQuickHelp(
         pQuickHlpData->Start( rSh, rWord.Len() );
 }
 
-/* -----------------29.03.2006 11:01-----------------
- *
- * --------------------------------------------------*/
-
 void SwEditWin::SetUseInputLanguage( sal_Bool bNew )
 {
     if ( bNew || bUseInputLanguage )
@@ -5732,9 +5518,6 @@ void SwEditWin::SetUseInputLanguage( sal_Bool bNew )
     bUseInputLanguage = bNew;
 }
 
-/*-- 13.11.2008 10:18:17---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 XubString SwEditWin::GetSurroundingText() const
 {
     String sReturn;
@@ -5760,9 +5543,7 @@ XubString SwEditWin::GetSurroundingText() const
 
     return sReturn;
 }
-/*-- 13.11.2008 10:18:17---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 Selection SwEditWin::GetSurroundingTextSelection() const
 {
     SwWrtShell& rSh = rView.GetWrtShell();
diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx
index a78fc7d113f4..11fa8eb8b2d9 100644
--- a/sw/source/ui/docvw/edtwin2.cxx
+++ b/sw/source/ui/docvw/edtwin2.cxx
@@ -192,7 +192,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                         sSuffix.EqualsAscii( pMarkToOLE ))
                     sTxt = sTxt.Copy( 0, nFound - 1);
                 }
-                // --> OD 2009-08-18 #i104300#
+                // #i104300#
                 // special handling if target is a cross-reference bookmark
                 {
                     String sTmpSearchStr = sTxt.Copy( 1, sTxt.Len() );
@@ -223,8 +223,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                         }
                     }
                 }
-                // <--
-                // --> OD 2007-07-26 #i80029#
+                // #i80029#
                 BOOL bExecHyperlinks = rView.GetDocShell()->IsReadOnly();
                 if ( !bExecHyperlinks )
                 {
@@ -237,7 +236,6 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                         sTxt.Insert( ViewShell::GetShellRes()->aHyperlinkClick, 0 );
                     }
                 }
-                // <--
                 break;
             }
             case SwContentAtPos::SW_SMARTTAG:
@@ -313,24 +311,6 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
 
                         case RES_POSTITFLD:
                             {
-                                /*
-                                SwPostItMgr* pMgr = rView.GetPostItMgr();
-                                if (pMgr->ShowNotes())
-                                {
-                                    SwFmtFld* pSwFmtFld = 0;
-                                    if (pMgr->ShowPreview(pFld,pSwFmtFld))
-                                    {
-                                        SwPostIt* pPostIt = new SwPostIt(static_cast<Window*>(this),0,pSwFmtFld,pMgr,PB_Preview);
-                                        pPostIt->InitControls();
-                                        pPostIt->SetReadonly(true);
-                                        pMgr->SetColors(pPostIt,static_cast<SwPostItField*>(pSwFmtFld->GetFld()));
-                                        pPostIt->SetVirtualPosSize(rEvt.GetMousePosPixel(),Size(180,70));
-                                        pPostIt->ShowNote();
-                                        SetPointerPosPixel(pPostIt->GetPosPixel() + Point(20,20));
-                                    }
-                                    return;
-                                }
-                                */
                                 break;
                             }
                         case RES_INPUTFLD:  // BubbleHelp, da der Hinweis ggf ziemlich lang sein kann
@@ -358,7 +338,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
 
                         case RES_GETREFFLD:
                         {
-                            // --> OD 2008-01-09 #i85090#
+                            // #i85090#
                             const SwGetRefField* pRefFld( dynamic_cast<const SwGetRefField*>(pFld) );
                             OSL_ENSURE( pRefFld,
                                     "<SwEditWin::RequestHelp(..)> - unexpected type of <pFld>" );
@@ -381,7 +361,6 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                                     sTxt = ((SwGetRefField*)pFld)->GetSetRefName();
                                 }
                             }
-                            // <--
                         }
                         break;
                         }
@@ -430,7 +409,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                 case SW_TABROW_VERT:
                     nTabRes = STR_TABLE_ROW_ADJUST;
                     break;
-                // --> FME 2004-07-30 #i32329# Enhanced table selection
+                // #i32329# Enhanced table selection
                 case SW_TABSEL_HORI:
                 case SW_TABSEL_HORI_RTL:
                 case SW_TABSEL_VERT:
@@ -445,7 +424,6 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
                 case SW_TABCOLSEL_VERT:
                     nTabRes = STR_TABLE_SELECT_COL;
                     break;
-                // <--
             }
             if(nTabRes)
             {
@@ -458,14 +436,6 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
         }
     }
 
-/*
-aktuelle Zeichenvorlage anzeigen?
-    if( bWeiter && rEvt.GetMode() & ( HELPMODE_QUICK | HELPMODE_BALLOON ))
-    {
-        SwCharFmt* pChrFmt = rSh.GetCurCharFmt();
-
-    }
-*/
     if( bWeiter && pSdrView && bQuickBalloon)
     {
         SdrViewEvent aVEvt;
@@ -571,16 +541,7 @@ void  SwEditWin::Paint(const Rectangle& rRect)
             bPaintShadowCrsr = TRUE;
         }
     }
-/*
-    //TODO/LATER: what's the replacement for this? Do we need it?
-    SwDocShell* pDocShell = GetView().GetDocShell();
-
-  SvInPlaceEnvironment *pIpEnv =  pDocShell ?
-                                  pDocShell->GetIPEnv() : 0;
-    if ( pIpEnv && pIpEnv->GetRectsChangedLockCount() )
-        //Wir stehen in Groessenverhandlungen (MM), Paint verzoegern
-        Invalidate( rRect );
-    else */
+
     if ( GetView().GetVisArea().GetWidth()  <= 0 ||
               GetView().GetVisArea().GetHeight() <= 0 )
         Invalidate( rRect );
diff --git a/sw/source/ui/docvw/edtwin3.cxx b/sw/source/ui/docvw/edtwin3.cxx
index 8af8e702aeb4..34d7e9a196cc 100644
--- a/sw/source/ui/docvw/edtwin3.cxx
+++ b/sw/source/ui/docvw/edtwin3.cxx
@@ -138,7 +138,7 @@ BOOL SwEditWin::RulerColumnDrag( const MouseEvent& rMEvt, BOOL bVerticalMode)
 }
 
 // #i23726#
-// --> OD 2005-02-18 #i42921# - add 3rd parameter <bVerticalMode> in order
+// #i42921# - add 3rd parameter <bVerticalMode> in order
 // to consider vertical layout
 BOOL SwEditWin::RulerMarginDrag( const MouseEvent& rMEvt,
                                  const bool bVerticalMode )
@@ -146,7 +146,6 @@ BOOL SwEditWin::RulerMarginDrag( const MouseEvent& rMEvt,
     SvxRuler& rRuler = bVerticalMode ?  rView.GetVLineal() : rView.GetHLineal();
     return !rRuler.StartDocDrag( rMEvt, RULER_TYPE_INDENT);
 }
-// <--
 
 LAYOUT_NS Dialog* GetSearchDialog()
 {
@@ -179,8 +178,8 @@ void SwEditWin::DataChanged( const DataChangedEvent& rDCEvt )
     Window::DataChanged( rDCEvt );
 
     SwWrtShell* pSh = GetView().GetWrtShellPtr();
-    //#99906#   DataChanged() is sometimes called prior to creating
-    //          the SwWrtShell
+    // DataChanged() is sometimes called prior to creating
+    // the SwWrtShell
     if(!pSh)
         return;
     BOOL bViewWasLocked = pSh->IsViewLocked(), bUnlockPaint = FALSE;
diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx
index b76994b6fb74..8568a204ab2c 100644
--- a/sw/source/ui/docvw/romenu.cxx
+++ b/sw/source/ui/docvw/romenu.cxx
@@ -428,7 +428,6 @@ String ExportGraphic( const Graphic &rGraphic, const String &rGrfName )
     FileDialogHelper aDlgHelper( TemplateDescription::FILESAVE_SIMPLE, 0 );
     Reference < XFilePicker > xFP = aDlgHelper.GetFilePicker();
 
-//    aExpDlg.SetHelpId(HID_FILEDLG_ROMENU);
     INetURLObject aPath;
     aPath.SetSmartURL( sGrfPath );
 
diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx
index 9b414a528464..e9bed7e6fb97 100644
--- a/sw/source/ui/docvw/srcedtw.cxx
+++ b/sw/source/ui/docvw/srcedtw.cxx
@@ -66,16 +66,8 @@ struct SwTextPortion
 
 SV_DECL_VARARR(SwTextPortions, SwTextPortion,16,16)
 
-/* -----------------15.01.97 12.07-------------------
-
---------------------------------------------------*/
-
 SV_IMPL_VARARR(SwTextPortions, SwTextPortion)
 
-/*-----------------15.01.97 12.08-------------------
-
---------------------------------------------------*/
-
 static void lcl_Highlight(const String& rSource, SwTextPortions& aPortionList)
 {
     const sal_Unicode cOpenBracket = '<';
@@ -219,11 +211,6 @@ static void lcl_Highlight(const String& rSource, SwTextPortions& aPortionList)
     }
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 SwSrcEditWindow::SwSrcEditWindow( Window* pParent, SwSrcView* pParentView ) :
     Window( pParent, WB_BORDER|WB_CLIPCHILDREN ),
 
@@ -246,9 +233,7 @@ SwSrcEditWindow::SwSrcEditWindow( Window* pParent, SwSrcView* pParentView ) :
     CreateTextEngine();
     pSourceViewConfig->AddListener(this);
 }
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
+
  SwSrcEditWindow::~SwSrcEditWindow()
 {
     pSourceViewConfig->RemoveListener(this);
@@ -268,10 +253,6 @@ SwSrcEditWindow::SwSrcEditWindow( Window* pParent, SwSrcView* pParentView ) :
     delete pOutWin;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 void SwSrcEditWindow::DataChanged( const DataChangedEvent& rDCEvt )
 {
     Window::DataChanged( rDCEvt );
@@ -341,10 +322,6 @@ void  SwSrcEditWindow::Resize()
 
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 void TextViewOutWin::DataChanged( const DataChangedEvent& rDCEvt )
 {
     Window::DataChanged( rDCEvt );
@@ -371,11 +348,6 @@ void  TextViewOutWin::MouseMove( const MouseEvent &rEvt )
         pTextView->MouseMove( rEvt );
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void  TextViewOutWin::MouseButtonUp( const MouseEvent &rEvt )
 {
     if ( pTextView )
@@ -388,11 +360,6 @@ void  TextViewOutWin::MouseButtonUp( const MouseEvent &rEvt )
     }
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void  TextViewOutWin::MouseButtonDown( const MouseEvent &rEvt )
 {
     GrabFocus();
@@ -400,11 +367,6 @@ void  TextViewOutWin::MouseButtonDown( const MouseEvent &rEvt )
         pTextView->MouseButtonDown( rEvt );
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void  TextViewOutWin::Command( const CommandEvent& rCEvt )
 {
     switch(rCEvt.GetCommand())
@@ -433,12 +395,6 @@ void  TextViewOutWin::Command( const CommandEvent& rCEvt )
     }
 }
 
-
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void  TextViewOutWin::KeyInput( const KeyEvent& rKEvt )
 {
     BOOL bDone = FALSE;
@@ -477,21 +433,11 @@ void  TextViewOutWin::KeyInput( const KeyEvent& rKEvt )
     }
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void  TextViewOutWin::Paint( const Rectangle& rRect )
 {
     pTextView->Paint( rRect );
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void SwSrcEditWindow::CreateTextEngine()
 {
     const Color &rCol = GetSettings().GetStyleSettings().GetWindowColor();
@@ -502,12 +448,12 @@ void SwSrcEditWindow::CreateTextEngine()
 
     //Scrollbars anlegen
     pHScrollbar = new ScrollBar(this, WB_3DLOOK |WB_HSCROLL|WB_DRAG);
-        pHScrollbar->EnableRTL( false ); // #107300# --- RTL --- no mirroring for scrollbars
+        pHScrollbar->EnableRTL( false ); // --- RTL --- no mirroring for scrollbars
     pHScrollbar->SetScrollHdl(LINK(this, SwSrcEditWindow, ScrollHdl));
     pHScrollbar->Show();
 
     pVScrollbar = new ScrollBar(this, WB_3DLOOK |WB_VSCROLL|WB_DRAG);
-        pVScrollbar->EnableRTL( false ); // #107300# --- RTL --- no mirroring for scrollbars
+        pVScrollbar->EnableRTL( false ); // --- RTL --- no mirroring for scrollbars
     pVScrollbar->SetScrollHdl(LINK(this, SwSrcEditWindow, ScrollHdl));
     pHScrollbar->EnableDrag();
     pVScrollbar->Show();
@@ -541,18 +487,8 @@ void SwSrcEditWindow::CreateTextEngine()
 
     SfxBindings& rBind = GetSrcView()->GetViewFrame()->GetBindings();
     rBind.Invalidate( SID_TABLE_CELL );
-//  rBind.Invalidate( SID_ATTR_CHAR_FONTHEIGHT );
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void SwSrcEditWindow::SetScrollBarRanges()
 {
     // Extra-Methode, nicht InitScrollBars, da auch fuer TextEngine-Events.
@@ -561,11 +497,6 @@ void SwSrcEditWindow::SetScrollBarRanges()
     pVScrollbar->SetRange( Range(0, pTextEngine->GetTextHeight()-1) );
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 void SwSrcEditWindow::InitScrollBars()
 {
     SetScrollBarRanges();
@@ -582,11 +513,6 @@ void SwSrcEditWindow::InitScrollBars()
 
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 IMPL_LINK(SwSrcEditWindow, ScrollHdl, ScrollBar*, pScroll)
 {
     if(pScroll == pVScrollbar)
@@ -607,15 +533,10 @@ IMPL_LINK(SwSrcEditWindow, ScrollHdl, ScrollBar*, pScroll)
     return 0;
 }
 
-/*-----------------15.01.97 09.22-------------------
-
---------------------------------------------------*/
-
 IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Timer *, pTimer )
 {
     Time aSyntaxCheckStart;
     OSL_ENSURE( pTextView, "Noch keine View, aber Syntax-Highlight ?!" );
-    // pTextEngine->SetUpdateMode( FALSE );
 
     bHighlighting = TRUE;
     USHORT nLine;
@@ -662,16 +583,6 @@ IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Timer *, pTimer )
             break;
         }
     }
-    // os: #43050# hier wird ein TextView-Problem umpopelt:
-    // waehrend des Highlightings funktionierte das Scrolling nicht
-    /* MT: Shouldn't be a oproblem any more, using IdeFormatter in Insert/RemoveAttrib now.
-
-        TextView* pTmp = pTextEngine->GetActiveView();
-        pTextEngine->SetActiveView(0);
-        // pTextEngine->SetUpdateMode( TRUE );
-        pTextEngine->SetActiveView(pTmp);
-        pTextView->ShowCursor(FALSE, FALSE);
-    */
 
     if(aSyntaxLineTable.Count() && !pTimer->IsActive())
         pTimer->Start();
@@ -685,9 +596,6 @@ IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Timer *, pTimer )
 
     return 0;
 }
-/*-----------------15.01.97 10.01-------------------
-
---------------------------------------------------*/
 
 void SwSrcEditWindow::DoSyntaxHighlight( USHORT nPara )
 {
@@ -700,14 +608,11 @@ void SwSrcEditWindow::DoSyntaxHighlight( USHORT nPara )
         String aSource( pTextEngine->GetText( nPara ) );
         pTextEngine->SetUpdateMode( FALSE );
         ImpDoHighlight( aSource, nPara );
-        // os: #43050# hier wird ein TextView-Problem umpopelt:
-        // waehrend des Highlightings funktionierte das Scrolling nicht
         TextView* pTmp = pTextEngine->GetActiveView();
         pTmp->SetAutoScroll(FALSE);
         pTextEngine->SetActiveView(0);
         pTextEngine->SetUpdateMode( TRUE );
         pTextEngine->SetActiveView(pTmp);
-        // Bug 72887 show the cursor
         pTmp->SetAutoScroll(TRUE);
         pTmp->ShowCursor( FALSE/*pTmp->IsAutoScroll()*/ );
 
@@ -716,10 +621,6 @@ void SwSrcEditWindow::DoSyntaxHighlight( USHORT nPara )
     }
 }
 
-/*-----------------15.01.97 09.49-------------------
-
---------------------------------------------------*/
-
 void SwSrcEditWindow::DoDelayedSyntaxHighlight( USHORT nPara )
 {
     if ( !bHighlighting && bDoSyntaxHighlight )
@@ -729,10 +630,6 @@ void SwSrcEditWindow::DoDelayedSyntaxHighlight( USHORT nPara )
     }
 }
 
-/*-----------------15.01.97 11.32-------------------
-
---------------------------------------------------*/
-
 void SwSrcEditWindow::ImpDoHighlight( const String& rSource, USHORT nLineOff )
 {
     SwTextPortions aPortionList;
@@ -763,13 +660,13 @@ void SwSrcEditWindow::ImpDoHighlight( const String& rSource, USHORT nLineOff )
         // optimiert das die TextEngine.
         USHORT nLastEnd = 0;
 
-#ifdef DBG_UTIL
-        USHORT nLine = aPortionList[0].nLine;
-#endif
         for ( USHORT i = 0; i < nCount; i++ )
         {
             SwTextPortion& r = aPortionList[i];
+#if OSL_DEBUG_LEVEL > 1
+            USHORT nLine = aPortionList[0].nLine;
             OSL_ENSURE( r.nLine == nLine, "doch mehrere Zeilen ?" );
+#endif
             if ( r.nStart > r.nEnd )    // Nur bis Bug von MD behoeben
                 continue;
 
@@ -801,10 +698,6 @@ void SwSrcEditWindow::ImpDoHighlight( const String& rSource, USHORT nLineOff )
     }
 }
 
-/*-----------------30.06.97 09:12-------------------
-
---------------------------------------------------*/
-
 void SwSrcEditWindow::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 {
     if ( rHint.ISA( TextHint ) )
@@ -836,10 +729,6 @@ void SwSrcEditWindow::ConfigurationChanged( utl::ConfigurationBroadcaster* pBrdC
         SetFont();
 }
 
-/*-----------------30.06.97 13:22-------------------
-
---------------------------------------------------*/
-
 void    SwSrcEditWindow::Invalidate(USHORT )
 {
     pOutWin->Invalidate();
@@ -876,15 +765,6 @@ void SwSrcEditWindow::GetFocus()
     pOutWin->GrabFocus();
 }
 
-/*void SwSrcEditWindow::LoseFocus()
-{
-    Window::LoseFocus();
-//  pOutWin->LoseFocus();
-//  rView.LostFocus();
-} */
-/* -----------------------------29.08.2002 13:21------------------------------
-
- ---------------------------------------------------------------------------*/
 BOOL  lcl_GetLanguagesForEncoding(rtl_TextEncoding eEnc, LanguageType aLanguages[])
 {
     switch(eEnc)
@@ -1041,8 +921,6 @@ BOOL  lcl_GetLanguagesForEncoding(rtl_TextEncoding eEnc, LanguageType aLanguages
         case RTL_TEXTENCODING_TIS_620          :
             aLanguages[0] = LANGUAGE_THAI;
         break;
-//        case RTL_TEXTENCODING_SYMBOL      :
-//        case RTL_TEXTENCODING_DONTKNOW:        :
         default: aLanguages[0] = Application::GetSettings().GetUILanguage();
     }
     return aLanguages[0] != LANGUAGE_SYSTEM;
@@ -1081,9 +959,7 @@ void SwSrcEditWindow::SetFont()
     GetTextEngine()->SetFont( aFont );
     pOutWin->SetFont(aFont);
 }
-/* -----------------------------29.08.2002 13:47------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwSrcEditWindow::SetTextEncoding(rtl_TextEncoding eEncoding)
 {
     eSourceEncoding = eEncoding;
diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index 68d72c129afc..de01f9bfb57b 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -91,26 +91,25 @@ SwEnvPrtPage::~SwEnvPrtPage()
 
 IMPL_LINK( SwEnvPrtPage, ClickHdl, Button *, EMPTYARG )
 {
-    sal_Bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
     if (aBottomButton.IsChecked())
     {
         // Envelope from botton
-        aAlignBox.SetItemImage(ITM_HOR_LEFT, Bitmap(SW_RES(bHC ? BMP_HOR_LEFT_LOWER_H : BMP_HOR_LEFT_LOWER)));
-        aAlignBox.SetItemImage(ITM_HOR_CNTR, Bitmap(SW_RES(bHC ? BMP_HOR_CNTR_LOWER_H : BMP_HOR_CNTR_LOWER)));
-        aAlignBox.SetItemImage(ITM_HOR_RGHT, Bitmap(SW_RES(bHC ? BMP_HOR_RGHT_LOWER_H : BMP_HOR_RGHT_LOWER)));
-        aAlignBox.SetItemImage(ITM_VER_LEFT, Bitmap(SW_RES(bHC ? BMP_VER_LEFT_LOWER_H : BMP_VER_LEFT_LOWER)));
-        aAlignBox.SetItemImage(ITM_VER_CNTR, Bitmap(SW_RES(bHC ? BMP_VER_CNTR_LOWER_H : BMP_VER_CNTR_LOWER)));
-        aAlignBox.SetItemImage(ITM_VER_RGHT, Bitmap(SW_RES(bHC ? BMP_VER_RGHT_LOWER_H : BMP_VER_RGHT_LOWER)));
+        aAlignBox.SetItemImage(ITM_HOR_LEFT, Bitmap(SW_RES(BMP_HOR_LEFT_LOWER)));
+        aAlignBox.SetItemImage(ITM_HOR_CNTR, Bitmap(SW_RES(BMP_HOR_CNTR_LOWER)));
+        aAlignBox.SetItemImage(ITM_HOR_RGHT, Bitmap(SW_RES(BMP_HOR_RGHT_LOWER)));
+        aAlignBox.SetItemImage(ITM_VER_LEFT, Bitmap(SW_RES(BMP_VER_LEFT_LOWER)));
+        aAlignBox.SetItemImage(ITM_VER_CNTR, Bitmap(SW_RES(BMP_VER_CNTR_LOWER)));
+        aAlignBox.SetItemImage(ITM_VER_RGHT, Bitmap(SW_RES(BMP_VER_RGHT_LOWER)));
     }
     else
     {
         // Envelope from top
-        aAlignBox.SetItemImage(ITM_HOR_LEFT, Bitmap(SW_RES(bHC ? BMP_HOR_LEFT_UPPER_H : BMP_HOR_LEFT_UPPER)));
-        aAlignBox.SetItemImage(ITM_HOR_CNTR, Bitmap(SW_RES(bHC ? BMP_HOR_CNTR_UPPER_H : BMP_HOR_CNTR_UPPER)));
-        aAlignBox.SetItemImage(ITM_HOR_RGHT, Bitmap(SW_RES(bHC ? BMP_HOR_RGHT_UPPER_H : BMP_HOR_RGHT_UPPER)));
-        aAlignBox.SetItemImage(ITM_VER_LEFT, Bitmap(SW_RES(bHC ? BMP_VER_LEFT_UPPER_H : BMP_VER_LEFT_UPPER)));
-        aAlignBox.SetItemImage(ITM_VER_CNTR, Bitmap(SW_RES(bHC ? BMP_VER_CNTR_UPPER_H : BMP_VER_CNTR_UPPER)));
-        aAlignBox.SetItemImage(ITM_VER_RGHT, Bitmap(SW_RES(bHC ? BMP_VER_RGHT_UPPER_H : BMP_VER_RGHT_UPPER)));
+        aAlignBox.SetItemImage(ITM_HOR_LEFT, Bitmap(SW_RES(BMP_HOR_LEFT_UPPER)));
+        aAlignBox.SetItemImage(ITM_HOR_CNTR, Bitmap(SW_RES(BMP_HOR_CNTR_UPPER)));
+        aAlignBox.SetItemImage(ITM_HOR_RGHT, Bitmap(SW_RES(BMP_HOR_RGHT_UPPER)));
+        aAlignBox.SetItemImage(ITM_VER_LEFT, Bitmap(SW_RES(BMP_VER_LEFT_UPPER)));
+        aAlignBox.SetItemImage(ITM_VER_CNTR, Bitmap(SW_RES(BMP_VER_CNTR_UPPER)));
+        aAlignBox.SetItemImage(ITM_VER_RGHT, Bitmap(SW_RES(BMP_VER_RGHT_UPPER)));
     }
     return 0;
 }
diff --git a/sw/source/ui/envelp/envprt.hrc b/sw/source/ui/envelp/envprt.hrc
index 64d90dfdf93f..a3953ec1b1af 100644
--- a/sw/source/ui/envelp/envprt.hrc
+++ b/sw/source/ui/envelp/envprt.hrc
@@ -67,26 +67,11 @@
 #define ITM_VER_CNTR        (RC_ENVPRT_BEGIN + 16)
 #define ITM_VER_RGHT        (RC_ENVPRT_BEGIN + 17)
 
-#define BMP_HOR_LEFT_LOWER_H  (RC_ENVPRT_HC_BEGIN   )
-#define BMP_HOR_LEFT_UPPER_H  (RC_ENVPRT_HC_BEGIN + 1)
-#define BMP_HOR_CNTR_LOWER_H  (RC_ENVPRT_HC_BEGIN + 2)
-#define BMP_HOR_CNTR_UPPER_H  (RC_ENVPRT_HC_BEGIN + 3)
-#define BMP_HOR_RGHT_LOWER_H  (RC_ENVPRT_HC_BEGIN + 4)
-#define BMP_HOR_RGHT_UPPER_H  (RC_ENVPRT_HC_BEGIN + 5)
-
-#define BMP_VER_LEFT_LOWER_H  (RC_ENVPRT_HC_BEGIN + 6)
-#define BMP_VER_LEFT_UPPER_H  (RC_ENVPRT_HC_BEGIN + 7)
-#define BMP_VER_CNTR_LOWER_H  (RC_ENVPRT_HC_BEGIN + 8)
-#define BMP_VER_CNTR_UPPER_H  (RC_ENVPRT_HC_BEGIN + 9)
-#define BMP_VER_RGHT_LOWER_H  (RC_ENVPRT_HC_BEGIN + 10)
-#define BMP_VER_RGHT_UPPER_H  (RC_ENVPRT_HC_BEGIN + 11)
-
-
 // Ueberlaufpruefung ********************************************************
 
-#define ENVPRT_ACT_END  BMP_VER_RGHT_UPPER_H
+#define ENVPRT_ACT_END  ITM_VER_RGHT
 
-#if ENVPRT_ACT_END > RC_ENVPRT_HC_END
+#if ENVPRT_ACT_END > ITM_VER_RGHT
 #error Resource-Ueberlauf in #file, #line
 #endif
 
diff --git a/sw/source/ui/envelp/envprt.src b/sw/source/ui/envelp/envprt.src
index f409614f7965..7c971a7a5de7 100644
--- a/sw/source/ui/envelp/envprt.src
+++ b/sw/source/ui/envelp/envprt.src
@@ -211,81 +211,3 @@ Bitmap BMP_VER_RGHT_UPPER
 {
     File = "envvr_u.bmp" ;
 };
-// HighContrast Bitmaps
-Bitmap BMP_HOR_LEFT_LOWER_H
-{
-    File = "envhl_l_h.bmp" ;
-};
-Bitmap BMP_HOR_LEFT_UPPER_H
-{
-    File = "envhl_u_h.bmp" ;
-};
-Bitmap BMP_HOR_CNTR_LOWER_H
-{
-    File = "envhc_l_h.bmp" ;
-};
-Bitmap BMP_HOR_CNTR_UPPER_H
-{
-    File = "envhc_u_h.bmp" ;
-};
-Bitmap BMP_HOR_RGHT_LOWER_H
-{
-    File = "envhr_l_h.bmp" ;
-};
-Bitmap BMP_HOR_RGHT_UPPER_H
-{
-    File = "envhr_u_h.bmp" ;
-};
-Bitmap BMP_VER_LEFT_LOWER_H
-{
-    File = "envvl_l_h.bmp" ;
-};
-Bitmap BMP_VER_LEFT_UPPER_H
-{
-    File = "envvl_u_h.bmp" ;
-};
-Bitmap BMP_VER_CNTR_LOWER_H
-{
-    File = "envvc_l_h.bmp" ;
-};
-Bitmap BMP_VER_CNTR_UPPER_H
-{
-    File = "envvc_u_h.bmp" ;
-};
-Bitmap BMP_VER_RGHT_LOWER_H
-{
-    File = "envvr_l_h.bmp" ;
-};
-Bitmap BMP_VER_RGHT_UPPER_H
-{
-    File = "envvr_u_h.bmp" ;
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index 5d24909b5376..b0628ae7e61e 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -138,9 +138,7 @@ public:
 
     SwLabDlg* GetParent() {return (SwLabDlg*) SfxTabPage::GetParent()->GetParent();}
 };
-/* -----------------------------23.01.01 10:26--------------------------------
 
- ---------------------------------------------------------------------------*/
 class SwSaveLabelDlg : public ModalDialog
 {
     FixedLine       aOptionsFL;
diff --git a/sw/source/ui/envelp/makefile.mk b/sw/source/ui/envelp/makefile.mk
index 3010601b0ac2..cb38ffd84714 100644
--- a/sw/source/ui/envelp/makefile.mk
+++ b/sw/source/ui/envelp/makefile.mk
@@ -50,23 +50,22 @@ SRC1FILES =\
         mailmrge.src
 
 SLOFILES =  \
-        $(SLO)$/envfmt.obj  \
-        $(SLO)$/envimg.obj  \
+        $(EXCEPTIONSFILES) \
+        $(SLO)$/labimg.obj
+
+EXCEPTIONSFILES= \
+        $(SLO)$/envfmt.obj \
+        $(SLO)$/envimg.obj \
         $(SLO)$/envlop1.obj \
-        $(SLO)$/envprt.obj  \
-        $(SLO)$/labelcfg.obj  \
-        $(SLO)$/label1.obj  \
+        $(SLO)$/envprt.obj \
+        $(SLO)$/label1.obj \
+        $(SLO)$/labelcfg.obj \
         $(SLO)$/labelexp.obj \
-        $(SLO)$/labfmt.obj  \
-        $(SLO)$/labprt.obj  \
-        $(SLO)$/labimg.obj  \
+        $(SLO)$/labfmt.obj \
+        $(SLO)$/labprt.obj \
         $(SLO)$/mailmrge.obj \
         $(SLO)$/syncbtn.obj
 
-EXCEPTIONSFILES= \
-        $(SLO)$/labelexp.obj      \
-        $(SLO)$/mailmrge.obj
-
 LIB1TARGET = $(SLB)$/$(TARGET).lib
 
 LIB1OBJFILES =	\
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index c5d7c150d9ee..fd248b19cbc5 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -97,9 +97,6 @@ public:
     inline SwNewDBMgr* GetNewDBMgr() const { return pNewDBMgr; }
 };
 
-/* -----------------08.07.99 13:48-------------------
-
- --------------------------------------------------*/
 class SwOneExampleFrame;
 class SwVisitingCardPage : public SfxTabPage
 {
@@ -148,9 +145,7 @@ public:
     virtual sal_Bool FillItemSet(SfxItemSet& rSet);
     virtual void Reset(const SfxItemSet& rSet);
 };
-/* -----------------29.09.99 08:51-------------------
 
- --------------------------------------------------*/
 class SwPrivateDataPage : public SfxTabPage
 {
     FixedLine       aDataFL;
@@ -200,9 +195,7 @@ public:
     virtual sal_Bool FillItemSet(SfxItemSet& rSet);
     virtual void Reset(const SfxItemSet& rSet);
 };
-/* -----------------29.09.99 08:51-------------------
 
- --------------------------------------------------*/
 class SwBusinessDataPage : public SfxTabPage
 {
     FixedLine       aDataFL;
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index 1ad46a156ce8..4275bb362abe 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -85,10 +85,7 @@ SwChangeDBDlg::SwChangeDBDlg(SwView& rVw) :
     aOKBT       (this, SW_RES(BT_OK         )),
     aCancelBT   (this, SW_RES(BT_CANCEL     )),
     aHelpBT     (this, SW_RES(BT_HELP       )),
-//  aChangeBT   (this, SW_RES(BT_CHANGEDB    )),
     aImageList      (SW_RES(ILIST_DB_DLG    )),
-    aImageListHC    (SW_RES(ILIST_DB_DLG_HC )),
-
     pSh(rVw.GetWrtShellPtr()),
     pMgr( new SwFldMgr() )
 {
@@ -104,11 +101,7 @@ SwChangeDBDlg::SwChangeDBDlg(SwView& rVw) :
     aUsedDBTLB.SetSelectionMode(MULTIPLE_SELECTION);
     aUsedDBTLB.SetWindowBits(WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL);
     aUsedDBTLB.SetSpaceBetweenEntries(0);
-
-    aUsedDBTLB.SetNodeBitmaps( aImageList.GetImage(IMG_COLLAPSE),
-                    aImageList.GetImage(IMG_EXPAND  ), BMP_COLOR_NORMAL );
-    aUsedDBTLB.SetNodeBitmaps( aImageListHC.GetImage(IMG_COLLAPSE),
-                    aImageListHC.GetImage(IMG_EXPAND  ), BMP_COLOR_HIGHCONTRAST );
+    aUsedDBTLB.SetNodeBitmaps( aImageList.GetImage(IMG_COLLAPSE), aImageList.GetImage(IMG_EXPAND));
 
     Link aLink = LINK(this, SwChangeDBDlg, TreeSelectHdl);
 
@@ -187,11 +180,7 @@ SvLBoxEntry* SwChangeDBDlg::Insert(const String& rDBName)
     Image aTableImg = aImageList.GetImage(IMG_DBTABLE);
     Image aDBImg = aImageList.GetImage(IMG_DB);
     Image aQueryImg = aImageList.GetImage(IMG_DBQUERY);
-    Image aHCTableImg = aImageListHC.GetImage(IMG_DBTABLE);
-    Image aHCDBImg = aImageListHC.GetImage(IMG_DB);
-    Image aHCQueryImg = aImageListHC.GetImage(IMG_DBQUERY);
     Image& rToInsert = nCommandType ? aQueryImg : aTableImg;
-    Image& rHCToInsert = nCommandType ? aHCQueryImg : aHCTableImg;
     while ((pParent = aUsedDBTLB.GetEntry(nParent++)) != NULL)
     {
         if (sDBName == aUsedDBTLB.GetEntryText(pParent))
@@ -202,19 +191,13 @@ SvLBoxEntry* SwChangeDBDlg::Insert(const String& rDBName)
                     return pChild;
             }
             SvLBoxEntry* pRet = aUsedDBTLB.InsertEntry(sTableName, rToInsert, rToInsert, pParent);
-            aUsedDBTLB.SetExpandedEntryBmp(pRet, rHCToInsert, BMP_COLOR_HIGHCONTRAST);
-            aUsedDBTLB.SetCollapsedEntryBmp(pRet, rHCToInsert, BMP_COLOR_HIGHCONTRAST);
             pRet->SetUserData((void*)nCommandType);
             return pRet;
         }
     }
     pParent = aUsedDBTLB.InsertEntry(sDBName, aDBImg, aDBImg);
-    aUsedDBTLB.SetExpandedEntryBmp(pParent, aHCDBImg, BMP_COLOR_HIGHCONTRAST);
-    aUsedDBTLB.SetCollapsedEntryBmp(pParent, aHCDBImg, BMP_COLOR_HIGHCONTRAST);
 
     SvLBoxEntry* pRet = aUsedDBTLB.InsertEntry(sTableName, rToInsert, rToInsert, pParent);
-    aUsedDBTLB.SetExpandedEntryBmp(pRet, rHCToInsert, BMP_COLOR_HIGHCONTRAST);
-    aUsedDBTLB.SetCollapsedEntryBmp(pRet, rHCToInsert, BMP_COLOR_HIGHCONTRAST);
     pRet->SetUserData((void*)nCommandType);
     return pRet;
 }
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index 59cb0b741487..d473d6bf828f 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -39,10 +39,6 @@
 
 #include "fldpage.hxx"
 
-/*--------------------------------------------------------------------
-   Beschreibung:
- --------------------------------------------------------------------*/
-
 class SwFldDBPage : public SwFldPage
 {
     FixedText           aTypeFT;
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 95acf983bc5d..7efe4d911726 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -153,11 +153,7 @@ void __EXPORT SwFldDokInfPage::Reset(const SfxItemSet& )
                 {
                     uno::Reference< beans::XPropertySetInfo > xSetInfo = xCustomPropertySet->getPropertySetInfo();
                     const uno::Sequence< beans::Property > rProperties = xSetInfo->getProperties();
-//                    uno::Sequence< ::rtl::OUString > aPropertyNames(rProperties.getLength());
-//                    for (sal_Int32 i = 0; i < rProperties.getLength(); ++i) {
-//                        aPropertyNames[i] = rProperties[i].Name;
-//                    }
-                    //if ( !IsFldEdit() )
+
                     if( rProperties.getLength() )
                     {
                         pInfo = aTypeTLB.InsertEntry( String(SW_RES( STR_CUSTOM )) );
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index 0b24c5327642..400e3d43c45d 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -192,14 +192,6 @@ SfxTabPage* SwFldEditDlg::CreatePage(USHORT nGroup)
                 uno::Reference< beans::XPropertySet > xUDProps(
                     xDocProps->getUserDefinedProperties(),
                     uno::UNO_QUERY_THROW);
-//                uno::Reference< beans::XPropertySetInfo > xSetInfo
-//                    = xUDProps->getPropertySetInfo();
-//                const uno::Sequence< beans::Property > props
-//                    = xSetInfo->getProperties();
-//                uno::Sequence< ::rtl::OUString > names(props.getLength());
-//                for (sal_Int32 i = 0; i < props.getLength(); ++i) {
-//                    names[i] = props[i].Name;
-//                }
                 pSet->Put( SfxUnoAnyItem( SID_DOCINFO, uno::makeAny(xUDProps) ) );
                 pTabPage = SwFldDokInfPage::Create(this, *pSet);
                 nHelpId = HID_EDIT_FLD_DOKINF;
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 21751cdabc90..c690acdd136a 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -98,7 +98,6 @@ SwFldFuncPage::SwFldFuncPage(Window* pParent, const SfxItemSet& rCoreSet ) :
     aCond1ED.ShowBrackets(FALSE);
     aCond2ED.ShowBrackets(FALSE);
 
-//  SwWrtShell* pSh = (SwWrtShell*)ViewShell::GetCurrShell();
 }
 
 SwFldFuncPage::~SwFldFuncPage()
@@ -351,7 +350,6 @@ IMPL_LINK( SwFldFuncPage, TypeHdl, ListBox *, EMPTYARG )
             case TYP_INPUTFLD:
                 aValueFT.SetText(SW_RESSTR(STR_PROMPT));
                 bValue = TRUE;
-                // bShowSelection = TRUE;
                 break;
 
             case TYP_COMBINED_CHARS:
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index eafe7365da9e..ab021b3892b7 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -38,9 +38,6 @@
 #include "condedit.hxx"
 #include "fldpage.hxx"
 #include <actctrl.hxx>
-/*--------------------------------------------------------------------
-   Beschreibung:
- --------------------------------------------------------------------*/
 
 class SwFldFuncPage : public SwFldPage
 {
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index a04d14433773..916339a62fc0 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -197,7 +197,7 @@ struct SwFldPack
  --------------------------------------------------------------------*/
 static const SwFldPack __FAR_DATA aSwFlds[] =
 {
-    // Dokument
+    // Document
     { TYP_EXTUSERFLD,       FLD_EU_BEGIN,       FLD_EU_END,     0,                  0 },
     { TYP_AUTHORFLD,        0,                  0,              FMT_AUTHOR_BEGIN,   FMT_AUTHOR_END },
     { TYP_DATEFLD,          FLD_DATE_BEGIN,     FLD_DATE_END,   0,                  0 },
@@ -211,7 +211,7 @@ static const SwFldPack __FAR_DATA aSwFlds[] =
     { TYP_CHAPTERFLD,       0,                  0,              FMT_CHAPTER_BEGIN,  FMT_CHAPTER_END },
     { TYP_TEMPLNAMEFLD,     0,                  0,              FMT_FF_BEGIN,       FMT_FF_END },
 
-    // Funktion
+    // Functions
     { TYP_CONDTXTFLD,       0,                  0,              0,                  0 },
     { TYP_DROPDOWN,         0,                  0,              0,                  0 },
     { TYP_INPUTFLD,         FLD_INPUT_BEGIN,    FLD_INPUT_END,  0,                  0 },
@@ -221,21 +221,21 @@ static const SwFldPack __FAR_DATA aSwFlds[] =
     { TYP_HIDDENTXTFLD,     0,                  0,              0,                  0 },
     { TYP_HIDDENPARAFLD,    0,                  0,              0,                  0 },
 
-    // Referenzen
+    // Cross-References
     { TYP_SETREFFLD,        0,                  0,              0,                  0 },
     { TYP_GETREFFLD,        0,                  0,              FMT_REF_BEGIN,      FMT_REF_END },
 
-    // Ablage
+    // DocInformation
     { TYP_DOCINFOFLD,       0,                  0,              FMT_REG_BEGIN,      FMT_REG_END },
 
-    // Datenbank
+    // Database
     { TYP_DBFLD,            0,                  0,              FMT_DBFLD_BEGIN,    FMT_DBFLD_END },
     { TYP_DBNEXTSETFLD,     0,                  0,              0,                  0 },
     { TYP_DBNUMSETFLD,      0,                  0,              0,                  0 },
     { TYP_DBSETNUMBERFLD,   0,                  0,              FMT_NUM_BEGIN,      FMT_NUM_END-2 },
     { TYP_DBNAMEFLD,        0,                  0,              0,                  0 },
 
-    // Variablen
+    // Variables
     { TYP_SETFLD,           0,                  0,              FMT_SETVAR_BEGIN,   FMT_SETVAR_END },
 
     { TYP_GETFLD,           0,                  0,              FMT_GETVAR_BEGIN,   FMT_GETVAR_END },
@@ -393,21 +393,21 @@ const SwFldGroupRgn& SwFldMgr::GetGroupRange(BOOL bHtmlMode, USHORT nGrpId) cons
 {
 static SwFldGroupRgn __READONLY_DATA aRanges[] =
 {
-    { /* Dokument   */  GRP_DOC_BEGIN,  GRP_DOC_END },
-    { /* Funktionen */  GRP_FKT_BEGIN,  GRP_FKT_END },
-    { /* Referenzen */  GRP_REF_BEGIN,  GRP_REF_END },
-    { /* Ablage     */  GRP_REG_BEGIN,  GRP_REG_END },
-    { /* DB         */  GRP_DB_BEGIN,   GRP_DB_END },
+    { /* Document   */  GRP_DOC_BEGIN,  GRP_DOC_END },
+    { /* Functions  */  GRP_FKT_BEGIN,  GRP_FKT_END },
+    { /* Cross-Refs */  GRP_REF_BEGIN,  GRP_REF_END },
+    { /* DocInfos   */  GRP_REG_BEGIN,  GRP_REG_END },
+    { /* Database   */  GRP_DB_BEGIN,   GRP_DB_END  },
     { /* User       */  GRP_VAR_BEGIN,  GRP_VAR_END }
 };
 static SwFldGroupRgn __READONLY_DATA aWebRanges[] =
 {
-    { /* Dokument   */  GRP_WEB_DOC_BEGIN,  GRP_WEB_DOC_END },
-    { /* Funktionen */  GRP_WEB_FKT_BEGIN,  GRP_WEB_FKT_END },
-    { /* Referenzen */  GRP_WEB_REF_BEGIN,  GRP_WEB_REF_END },
-    { /* Ablage     */  GRP_WEB_REG_BEGIN,  GRP_WEB_REG_END },
-    { /* DB         */  GRP_WEB_DB_BEGIN,   GRP_WEB_DB_END },
-    { /* User       */  GRP_WEB_VAR_BEGIN,  GRP_WEB_VAR_END }
+    { /* Document    */  GRP_WEB_DOC_BEGIN,  GRP_WEB_DOC_END },
+    { /* Functions   */  GRP_WEB_FKT_BEGIN,  GRP_WEB_FKT_END },
+    { /* Cross-Refs  */  GRP_WEB_REF_BEGIN,  GRP_WEB_REF_END },
+    { /* DocInfos    */  GRP_WEB_REG_BEGIN,  GRP_WEB_REG_END },
+    { /* Database    */  GRP_WEB_DB_BEGIN,   GRP_WEB_DB_END  },
+    { /* User        */  GRP_WEB_VAR_BEGIN,  GRP_WEB_VAR_END }
 };
 
     if (bHtmlMode)
@@ -1336,11 +1336,6 @@ BOOL SwFldMgr::InsertFld(  const SwInsertFld_Data& rData )
                 pCurShell->EndAllAction();
                 return TRUE;
 
-/*              // In der Tabelle Tabellenformeln einfuegen
-                SwTblFieldType* pTyp = (SwTblFieldType*)pCurShell->GetFldType(
-                                                        0, RES_TABLEFLD);
-                pFld = new SwTblField(pTyp, rData.sPar2, nsSwGetSetExpType::GSE_EXPR, nFormatId);
-                bTbl = TRUE;*/
             }
             else
             {
diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index a64b1fcebfcf..24007bd0a0af 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -71,7 +71,7 @@ SwFldPage::SwFldPage( Window *pParent, const ResId &rId,
     m_bRefresh          (FALSE),
     m_bFirstHTMLInit    (TRUE)
 {
-//  FreeResource();
+
 }
 
 SwFldPage::~SwFldPage()
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 3fc46e8b41cc..9b1d6ae0d34c 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -70,11 +70,6 @@ USHORT  nFldDlgFmtSel       = 0;
 #define USER_DATA_VERSION_1 "1"
 #define USER_DATA_VERSION USER_DATA_VERSION_1
 
-
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 SwFldRefPage::SwFldRefPage(Window* pParent, const SfxItemSet& rCoreSet ) :
     SwFldPage( pParent, SW_RES( TP_FLD_REF ), rCoreSet ),
 
@@ -123,10 +118,6 @@ SwFldRefPage::SwFldRefPage(Window* pParent, const SfxItemSet& rCoreSet ) :
     // <--
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 SwFldRefPage::~SwFldRefPage()
 {
 }
@@ -179,10 +170,6 @@ sal_uInt16 SwFldRefPage::GetSavedSelectedPos() const
 
 // <--
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 void SwFldRefPage::Reset(const SfxItemSet& )
 {
     if (!IsFldEdit())
@@ -300,10 +287,6 @@ void SwFldRefPage::Reset(const SfxItemSet& )
     }
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG )
 {
     // Alte ListBoxPos sichern
@@ -325,8 +308,6 @@ IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG )
                 case REF_BOOKMARK:
                 {
                     // --> OD 2007-11-14 #i83479#
-//                    sName = sBookmarkTxt;
-//                    nFlag = REFFLDFLAG_BOOKMARK;
                     SwGetRefField* pRefFld = dynamic_cast<SwGetRefField*>(GetCurField());
                     if ( pRefFld &&
                          pRefFld->IsRefToHeadingCrossRefBookmark() )
@@ -445,10 +426,6 @@ IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG )
     return 0;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 IMPL_LINK( SwFldRefPage, SubTypeHdl, ListBox *, EMPTYARG )
 {
     USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel());
@@ -719,10 +696,6 @@ void SwFldRefPage::UpdateSubType()
     // <--
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 USHORT SwFldRefPage::FillFormatLB(USHORT nTypeId)
 {
     String sOldSel;
@@ -755,9 +728,7 @@ USHORT SwFldRefPage::FillFormatLB(USHORT nTypeId)
 
         default:
             // --> OD 2007-11-16 #i83479#
-//            nSize = GetFldMgr().GetFormatCount( (REFFLDFLAG & nTypeId)
-//                                                    ? (USHORT)TYP_GETREFFLD : nTypeId,
-//                                                FALSE, IsFldDlgHtmlMode() );
+
             if ( REFFLDFLAG & nTypeId )
             {
                 nSize = FMT_REF_ONLYSEQNO - FMT_REF_BEGIN + 1;
@@ -836,10 +807,6 @@ IMPL_LINK( SwFldRefPage, ModifyHdl, Edit *, EMPTYARG )
     return 0;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 BOOL SwFldRefPage::FillItemSet(SfxItemSet& )
 {
     BOOL bModified = FALSE;
@@ -861,7 +828,6 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& )
     switch(nTypeId)
     {
         case TYP_GETREFFLD:
-            // aName = aSelectionLB.GetSelectEntry();
             nSubType = REF_SETREFATTR;
             break;
 
@@ -1028,28 +994,17 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& )
     return FALSE;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 SfxTabPage* SwFldRefPage::Create(   Window* pParent,
                         const SfxItemSet& rAttrSet )
 {
     return ( new SwFldRefPage( pParent, rAttrSet ) );
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 USHORT SwFldRefPage::GetGroup()
 {
     return GRP_REF;
 }
 
-/* -----------------12.01.99 10:09-------------------
- *
- * --------------------------------------------------*/
 void    SwFldRefPage::FillUserData()
 {
     String sData( String::CreateFromAscii(
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index abe971fab699..d5b8aba751f5 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -280,7 +280,6 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
                         }
                         else
                             aValueED.SetText(pType->GetContent());
-//                          aValueED.SetText(pType->GetContent(aNumFormatLB.GetFormat()));
                     }
                 }
                 else
@@ -469,7 +468,6 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
 
         case TYP_SEQFLD:
             {
-                // aNumRB.Check(TRUE);
                 bName = bValue = bSeparator = bChapterLevel = TRUE;
 
                 SwFieldType* pFldTyp;
@@ -1215,7 +1213,6 @@ BOOL SwFldVarPage::FillItemSet(SfxItemSet& )
         }
         case TYP_SEQFLD:
         {
-            // nSubType = nsSwGetSetExpType::GSE_SEQ;   // nsSwGetSetExpType::GSE_SEQ wird im Fldmgr fest gesetzt, kann also entfallen
             nSubType = aChapterLevelLB.GetSelectEntryPos();
             if (nSubType == 0)
                 nSubType = 0x7f;
@@ -1224,7 +1221,6 @@ BOOL SwFldVarPage::FillItemSet(SfxItemSet& )
                 nSubType--;
                 String sSeparator(aSeparatorED.GetText().GetChar(0));
                 cSeparator = sSeparator.Len() ? sSeparator.GetChar(0) : ' ';
-                //nSubType |= (USHORT)(((BYTE)) << 8);
             }
             break;
         }
@@ -1274,14 +1270,12 @@ SelectionListBox::SelectionListBox( SwFldVarPage* pDialog, const ResId& rResId )
 long SelectionListBox::PreNotify( NotifyEvent& rNEvt )
 {
     long nHandled = ListBox::PreNotify( rNEvt );
-    //BOOL bAddSel = FALSE;
     if ( rNEvt.GetType() == EVENT_KEYUP )
     {
         const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
         const KeyCode aKeyCode = pKEvt->GetKeyCode();
         const USHORT nModifier = aKeyCode.GetModifier();
         if( aKeyCode.GetCode() == KEY_SPACE && !nModifier)
-//          bAddSel = TRUE;
             bCallAddSelection = TRUE;
     }
     if ( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN )
@@ -1289,13 +1283,9 @@ long SelectionListBox::PreNotify( NotifyEvent& rNEvt )
         const MouseEvent* pMEvt = rNEvt.GetMouseEvent();
 
         if (pMEvt && (pMEvt->IsMod1() || pMEvt->IsMod2()))  // Alt oder Ctrl
-            //bAddSel = TRUE;
             bCallAddSelection = TRUE;
     }
 
-//  if (bAddSel)
-//      pDlg->AddSelection(this);
-
     return nHandled;
 }
 
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index ca7422ecac44..f822dc3d9883 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -132,7 +132,7 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS,
     // JP 31.3.00: Inputfields in readonly regions must be allowed to
     //              input any content. - 74639
     BOOL bEnable = !rSh.IsCrsrReadonly();
-                    /*!rSh.IsReadOnlyAvailable() || !rSh.HasReadonlySel()*/;
+
     aOKBT.Enable( bEnable );
     aEditED.SetReadOnly( !bEnable );
 
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index f9fa94907cd3..6953dd257192 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -121,12 +121,6 @@ SwJavaEditDialog::SwJavaEditDialog(Window* pParent, SwWrtShell* pWrtSh) :
     RadioButtonHdl(NULL);
 }
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
-
-
 SwJavaEditDialog::~SwJavaEditDialog()
 {
     delete pMgr;
@@ -134,12 +128,6 @@ SwJavaEditDialog::~SwJavaEditDialog()
     Application::SetDefDialogParent( pOldDefDlgParent );
 }
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
-
-
 IMPL_LINK_INLINE_START( SwJavaEditDialog, PrevHdl, Button *, EMPTYARG )
 {
     SetFld();
@@ -152,12 +140,6 @@ IMPL_LINK_INLINE_START( SwJavaEditDialog, PrevHdl, Button *, EMPTYARG )
 }
 IMPL_LINK_INLINE_END( SwJavaEditDialog, PrevHdl, Button *, EMPTYARG )
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
-
-
 IMPL_LINK_INLINE_START( SwJavaEditDialog, NextHdl, Button *, EMPTYARG )
 {
     SetFld();
@@ -170,12 +152,6 @@ IMPL_LINK_INLINE_START( SwJavaEditDialog, NextHdl, Button *, EMPTYARG )
 }
 IMPL_LINK_INLINE_END( SwJavaEditDialog, NextHdl, Button *, EMPTYARG )
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
-
-
 IMPL_LINK( SwJavaEditDialog, OKHdl, Button *, EMPTYARG )
 {
     SetFld();
@@ -183,22 +159,10 @@ IMPL_LINK( SwJavaEditDialog, OKHdl, Button *, EMPTYARG )
     return 0;
 }
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
-
-
 void SwJavaEditDialog::Apply()
 {
 }
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
-
-
 void SwJavaEditDialog::CheckTravel()
 {
     BOOL bTravel = FALSE;
@@ -255,12 +219,6 @@ void SwJavaEditDialog::CheckTravel()
     }
 }
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
-
-
 void SwJavaEditDialog::SetFld()
 {
     if( !aOKBtn.IsEnabled() )
@@ -295,10 +253,6 @@ BOOL SwJavaEditDialog::IsUpdate()
     return pFld && ( bIsUrl != pFld->GetFormat() || pFld->GetPar2() != aType || pFld->GetPar1() != aText );
 }
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
 IMPL_LINK( SwJavaEditDialog, RadioButtonHdl, RadioButton *, EMPTYARG )
 {
     BOOL bEnable = aUrlRB.IsChecked();
@@ -319,10 +273,6 @@ IMPL_LINK( SwJavaEditDialog, RadioButtonHdl, RadioButton *, EMPTYARG )
     return 0;
 }
 
-/***************************************************************************
-    Beschreibung:
-***************************************************************************/
-
 IMPL_LINK( SwJavaEditDialog, InsertFileHdl, PushButton *, pBtn )
 {
     if ( !pFileDlg )
diff --git a/sw/source/ui/fldui/makefile.mk b/sw/source/ui/fldui/makefile.mk
index ee9dbff9cf7e..212c3da6bacf 100644
--- a/sw/source/ui/fldui/makefile.mk
+++ b/sw/source/ui/fldui/makefile.mk
@@ -54,8 +54,12 @@ SRC1FILES =  \
         inpdlg.src
 
 SLOFILES =  \
-            $(SLO)$/changedb.obj \
+        $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES =  \
         $(SLO)$/DropDownFieldDialog.obj \
+        $(SLO)$/FldRefTreeListBox.obj \
+        $(SLO)$/changedb.obj \
         $(SLO)$/flddb.obj \
         $(SLO)$/flddinf.obj \
         $(SLO)$/flddok.obj \
@@ -66,17 +70,9 @@ SLOFILES =  \
         $(SLO)$/fldref.obj \
         $(SLO)$/fldtdlg.obj \
         $(SLO)$/fldvar.obj \
-        $(SLO)$/javaedit.obj \
-        $(SLO)$/inpdlg.obj \
         $(SLO)$/fldwrap.obj \
-                $(SLO)$/xfldui.obj \
-                $(SLO)$/FldRefTreeListBox.obj
-
-
-EXCEPTIONSFILES =  \
-        $(SLO)$/fldtdlg.obj \
-        $(SLO)$/fldedt.obj \
-        $(SLO)$/flddinf.obj \
+        $(SLO)$/inpdlg.obj \
+        $(SLO)$/javaedit.obj \
         $(SLO)$/xfldui.obj
 
 LIB1TARGET = $(SLB)$/$(TARGET).lib
diff --git a/sw/source/ui/fmtui/makefile.mk b/sw/source/ui/fmtui/makefile.mk
index 37ad48df008e..9474cfa135b3 100644
--- a/sw/source/ui/fmtui/makefile.mk
+++ b/sw/source/ui/fmtui/makefile.mk
@@ -43,6 +43,9 @@ SRC1FILES =  \
         tmpdlg.src
 
 SLOFILES =  \
+        $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
         $(SLO)$/tmpdlg.obj
 
 # --- Tagets -------------------------------------------------------
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 7d787d5d8700..6e22e8f8e00a 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -251,15 +251,6 @@ SwTemplateDlg::SwTemplateDlg(Window*            pParent,
 
             AddTabPage( TP_MACRO_ASSIGN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_MACROASSIGN), 0);
 
-            // Auskommentiert wegen Bug #45776 (per default keine Breite&Groesse in Rahmenvorlagen)
-/*          SwFmtFrmSize aSize( (const SwFmtFrmSize&)rBase.
-                                            GetItemSet().Get(RES_FRM_SIZE));
-            if( !aSize.GetWidth() )
-            {
-                aSize.SetWidth( DFLT_WIDTH );
-                aSize.SetHeight( DFLT_HEIGHT );
-                rBase.GetItemSet().Put( aSize );
-            }*/
         break;
         }
         // Seitenvorlagen
@@ -317,14 +308,6 @@ SwTemplateDlg::SwTemplateDlg(Window*            pParent,
             AddTabPage( RID_SVXPAGE_NUM_OPTIONS );
             AddTabPage( RID_SVXPAGE_NUM_POSITION );
 
-
-/*          const SfxPoolItem* pItem;
-            if(SFX_ITEM_SET == rBase.GetItemSet().GetItemState(
-                FN_PARAM_ACT_NUMBER, FALSE, &pItem ))
-            {
-//              pActNum = (ActNumberFormat*)((const SwPtrItem*)pItem)->GetValue();
-            }
-*/
         }
         break;
 
@@ -334,18 +317,10 @@ SwTemplateDlg::SwTemplateDlg(Window*            pParent,
     }
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 SwTemplateDlg::~SwTemplateDlg()
 {
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 short SwTemplateDlg::Ok()
 {
     short nRet = SfxTabDialog::Ok();
@@ -372,10 +347,6 @@ short SwTemplateDlg::Ok()
     return nRet;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 const SfxItemSet* SwTemplateDlg::GetRefreshedSet()
 {
     SfxItemSet* pInSet = GetInputSetImpl();
@@ -384,10 +355,6 @@ const SfxItemSet* SwTemplateDlg::GetRefreshedSet()
     return pInSet;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
 {
     //Namen der Vorlagen und Metric setzen
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 47c4e6a177bb..587d5895f9c5 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -1054,8 +1054,6 @@ IMPL_LINK( SwColumnPage, Timeout, Timer *, EMPTYARG )
             ++nChanged;
         else if(pModifiedField == &aEd3)
             nChanged += 2;
-        /*else if(pModifiedField == &aEd4)
-            nChanged += 3;*/
 
         long nNewWidth = (USHORT)
             pModifiedField->DenormalizePercent(pModifiedField->GetValue(FUNIT_TWIP));
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 8bcc2912717b..c9f5fcb9677f 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -419,7 +419,6 @@ void SwCaptionDialog::DrawSample()
             case SVX_NUM_CHARS_LOWER_LETTER_N:  aStr += 'a'; break;
             case SVX_NUM_ROMAN_UPPER:           aStr += 'I'; break;
             case SVX_NUM_ROMAN_LOWER:           aStr += 'i'; break;
-            //case ARABIC:
             default:                    aStr += '1'; break;
             }
             //#i61007# order of captions
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 6cc805ecae33..5980e054bbd5 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -71,7 +71,6 @@
 #include <colmgr.hxx>
 #include <grfatr.hxx>
 #include <uiitems.hxx>
-// OD 19.09.2003 #i18732#
 #include <fmtfollowtextflow.hxx>
 
 #include <frmui.hrc>
@@ -114,7 +113,6 @@ struct StringIdPair_Impl
 #define MAX_PERCENT_WIDTH   254L
 #define MAX_PERCENT_HEIGHT  254L
 
-// OD 19.09.2003 #i18732# - change order of alignments
 #define LB_FRAME                0x00000001L // Textbereich des Absatzes
 #define LB_PRTAREA              0x00000002L // Textbereich des Absatzes + Einzuege
 #define LB_VERT_FRAME           0x00000004L // Vertikaler Textbereich des Absatzes
@@ -136,11 +134,9 @@ struct StringIdPair_Impl
 #define LB_REL_CHAR             0x00020000L // Zeichenausrichtung Zeichen
 #define LB_REL_ROW              0x00040000L // Zeichenausrichtung Zeile
 
-// OD 10.11.2003 #i22305#
 #define LB_FLY_VERT_FRAME       0x00100000L // vertical entire frame
 #define LB_FLY_VERT_PRTAREA     0x00200000L // vertical frame text area
 
-// OD 11.11.2003 #i22341#
 #define LB_VERT_LINE            0x00400000L // vertical text line
 
 static RelationMap __FAR_DATA aRelationMap[] =
@@ -163,11 +159,9 @@ static RelationMap __FAR_DATA aRelationMap[] =
     {SwFPos::REL_BORDER,        SwFPos::REL_BORDER,             LB_VERT_FRAME,          text::RelOrientation::FRAME},
     {SwFPos::REL_PRTAREA,       SwFPos::REL_PRTAREA,            LB_VERT_PRTAREA,        text::RelOrientation::PRINT_AREA},
 
-    // OD 10.11.2003 #i22305#
     {SwFPos::FLY_REL_PG_FRAME,      SwFPos::FLY_REL_PG_FRAME,   LB_FLY_VERT_FRAME,      text::RelOrientation::FRAME},
     {SwFPos::FLY_REL_PG_PRTAREA,    SwFPos::FLY_REL_PG_PRTAREA,     LB_FLY_VERT_PRTAREA,    text::RelOrientation::PRINT_AREA},
 
-    // OD 11.11.2003 #i22341#
     {SwFPos::REL_LINE,  SwFPos::REL_LINE,   LB_VERT_LINE,   text::RelOrientation::TEXT_LINE}
 };
 
@@ -232,8 +226,7 @@ static FrmMap __FAR_DATA aHFlyHtmlMap[] =
     {SwFPos::FROMLEFT,      SwFPos::MIR_FROMLEFT,   text::HoriOrientation::NONE,      LB_FLY_REL_PG_FRAME}
 };
 
-// OD 19.09.2003 #i18732# - own vertical alignment map for to frame anchored objects
-// OD 10.11.2003 #i22305#
+// own vertical alignment map for to frame anchored objects
 #define VERT_FRAME_REL   (LB_FLY_VERT_FRAME|LB_FLY_VERT_PRTAREA)
 
 static FrmMap __FAR_DATA aVFrameMap[] =
@@ -246,7 +239,6 @@ static FrmMap __FAR_DATA aVFrameMap[] =
 
 static FrmMap __FAR_DATA aVFlyHtmlMap[] =
 {
-    // OD 10.11.2003 #i22305#
     {SwFPos::TOP,           SwFPos::TOP,            text::VertOrientation::TOP,       LB_FLY_VERT_FRAME},
     {SwFPos::FROMTOP,       SwFPos::FROMTOP,        text::VertOrientation::NONE,      LB_FLY_VERT_FRAME}
 };
@@ -280,7 +272,7 @@ static FrmMap __FAR_DATA aHParaHtmlAbsMap[] =
     {SwFPos::RIGHT,         SwFPos::MIR_RIGHT,      text::HoriOrientation::RIGHT,     HTML_HORI_PARA_REL}
 };
 
-// OD 19.09.2003 #i18732# - allow vertical alignment at page areas
+// allow vertical alignment at page areas
 #define VERT_PARA_REL   (LB_VERT_FRAME|LB_VERT_PRTAREA| \
                          LB_REL_PG_FRAME|LB_REL_PG_PRTAREA)
 
@@ -327,14 +319,12 @@ static FrmMap __FAR_DATA aHCharHtmlAbsMap[] =
     {SwFPos::FROMLEFT,      SwFPos::MIR_FROMLEFT,   text::HoriOrientation::NONE,      LB_REL_PG_FRAME}
 };
 
-// OD 19.09.2003 #i18732# - allow vertical alignment at page areas
-// OD 12.11.2003 #i22341# - handle <LB_REL_CHAR> on its own
+// allow vertical alignment at page areas
 #define VERT_CHAR_REL   (LB_VERT_FRAME|LB_VERT_PRTAREA| \
                          LB_REL_PG_FRAME|LB_REL_PG_PRTAREA)
 
 static FrmMap __FAR_DATA aVCharMap[] =
 {
-    // OD 11.11.2003 #i22341#
     // introduce mappings for new vertical alignment at top of line <LB_VERT_LINE>
     // and correct mapping for vertical alignment at character for position <FROM_BOTTOM>
     // Note: Because of these adjustments the map becomes ambigous in its values
@@ -435,7 +425,6 @@ size_t lcl_GetFrmMapCount( const FrmMap* pMap)
             return sizeof(aHParaMap) / aSizeOf;
         if ( pMap == aHFrameMap )
             return sizeof(aHFrameMap) / aSizeOf;
-        // OD 19.09.2003 #i18732# - own vertical alignment map for to frame anchored objects
         if ( pMap == aVFrameMap )
             return sizeof(aVFrameMap) / aSizeOf;
         if ( pMap == aHCharMap )
@@ -544,7 +533,7 @@ SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL(SvxSwFramePosString
     return eStringId;
 }
 
-// OD 12.11.2003 #i22341# - helper method in order to determine all possible
+// helper method in order to determine all possible
 // listbox relations in a relation map for a given relation
 ULONG lcl_GetLBRelationsForRelations( const USHORT _nRel )
 {
@@ -562,7 +551,7 @@ ULONG lcl_GetLBRelationsForRelations( const USHORT _nRel )
     return nLBRelations;
 }
 
-// OD 14.11.2003 #i22341# - helper method on order to determine all possible
+// helper method on order to determine all possible
 // listbox relations in a relation map for a given string ID
 ULONG lcl_GetLBRelationsForStrID( const FrmMap* _pMap,
                                   const SvxSwFramePosString::StringId _eStrId,
@@ -633,7 +622,6 @@ SwFrmPage::SwFrmPage ( Window *pParent, const SfxItemSet &rSet ) :
     aAtVertPosED    (this, SW_RES(ED_AT_VERT_POS)),
     aVertRelationFT (this, SW_RES(FT_VERT_RELATION)),
     aVertRelationLB (this, SW_RES(LB_VERT_RELATION)),
-    // OD 19.09.2003 #i18732# - new checkbox
     aFollowTextFlowCB(this, SW_RES(CB_FOLLOWTEXTFLOW)),
     aPositionFL     (this, SW_RES(FL_POSITION)),
 
@@ -654,7 +642,6 @@ SwFrmPage::SwFrmPage ( Window *pParent, const SfxItemSet &rSet ) :
     nUpperBorder(0),
     nLowerBorder(0),
     fWidthHeightRatio(1.0),
-    // OD 12.11.2003 #i22341#
     mpToCharCntntPos( NULL ),
 
     nOldH(text::HoriOrientation::CENTER),
@@ -672,7 +659,6 @@ SwFrmPage::SwFrmPage ( Window *pParent, const SfxItemSet &rSet ) :
     aHeightED.   SetLoseFocusHdl( aLk );
     aAtHorzPosED.SetLoseFocusHdl( aLk );
     aAtVertPosED.SetLoseFocusHdl( aLk );
-    // OD 25.09.2003 #i18732# - click handler for new checkbox
     aFollowTextFlowCB.SetClickHdl( aLk );
 
     aLk = LINK(this, SwFrmPage, ModifyHdl);
@@ -728,7 +714,7 @@ namespace
 
 void SwFrmPage::EnableGraficMode( void )
 {
-    // #i39692# mustn't be called more than once
+    // i#39692 - mustn't be called more than once
     if(!aRealSizeBT.IsVisible())
     {
         long nOffset1 = aRelWidthCB.GetPosPixel().Y() - aAutoWidthCB.GetPosPixel().Y();
@@ -766,7 +752,6 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
     SetMetric( aAtHorzPosED, aMetric );
     SetMetric( aAtVertPosED, aMetric );
 
-
     const SwFmtAnchor& rAnchor = (const SwFmtAnchor&)rSet.Get(RES_ANCHOR);
 
     if (bFormat)
@@ -808,8 +793,6 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
             aRealSizeBT.SetClickHdl(LINK(this, SwFrmPage, RealSizeHdl));
             EnableGraficMode();
         }
-//      else
-//          aTypeFL.SetSizePixel(Size(aTypeFL.GetSizePixel().Width(), aSizeFL.GetSizePixel().Height()));
 
         if ( nDlgType == DLG_FRM_GRF )
             aFixedRatioCB.Check( FALSE );
@@ -823,11 +806,10 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
     }
     else
     {
-//      aTypeFL.SetSizePixel(Size(aTypeFL.GetSizePixel().Width(), aSizeFL.GetSizePixel().Height()));
         aGrfSize = ((const SwFmtFrmSize&)rSet.Get(RES_FRM_SIZE)).GetSize();
     }
 
-    //Prozenteingabe ermoeglichen.
+    // entering procent value made possible
     aWidthED. SetBaseValue( aWidthED.Normalize(aGrfSize.Width()), FUNIT_TWIP );
     aHeightED.SetBaseValue( aHeightED.Normalize(aGrfSize.Height()), FUNIT_TWIP );
     //the available space is not yet known so the RefValue has to be calculated from size and relative size values
@@ -860,11 +842,11 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
         default:; //prevent warning
     }
 
-    // OD 12.11.2003 #i22341# - determine content position of character
+    // i#22341 - determine content position of character
     // Note: content position can be NULL
     mpToCharCntntPos = rAnchor.GetCntntAnchor();
 
-    // OD 19.09.2003 #i18732# - init checkbox value
+    // i#18732 - init checkbox value
     {
         const bool bFollowTextFlow =
             static_cast<const SwFmtFollowTextFlow&>(rSet.Get(RES_FOLLOW_TEXT_FLOW)).GetValue();
@@ -893,16 +875,16 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
         aMirrorPagesCB.Show(FALSE);
         if(nDlgType == DLG_FRM_STD)
             aFixedRatioCB.Enable(FALSE);
-        // OD 19.09.2003 #i18732# - hide checkbox in HTML mode
+        // i#18732 hide checkbox in HTML mode
         aFollowTextFlowCB.Show(FALSE);
     }
     else
     {
-        // OD 06.11.2003 #i18732# correct enable/disable of check box 'Mirror on..'
+        // enable/disable of check box 'Mirror on..'
         aMirrorPagesCB.Enable(!aAnchorAsCharRB.IsChecked());
 
-        // OD 06.11.2003 #i18732# - enable/disable check box 'Follow text flow'.
-        // OD 10.11.2003 #i22305# - enable check box 'Follow text
+        // enable/disable check box 'Follow text flow'.
+        // enable check box 'Follow text
         // flow' also for anchor type to-frame.
         aFollowTextFlowCB.Enable( aAnchorAtParaRB.IsChecked() ||
                                   aAnchorAtCharRB.IsChecked() ||
@@ -912,7 +894,6 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
     Init( rSet, TRUE );
     aAtVertPosED.SaveValue();
     aAtHorzPosED.SaveValue();
-    // OD 19.09.2003 #i18732#
     aFollowTextFlowCB.SaveValue();
 
     bNoModifyHdl = FALSE;
@@ -1048,12 +1029,6 @@ BOOL SwFrmPage::FillItemSet(SfxItemSet &rSet)
     const SwFmtFrmSize& rOldSize = (const SwFmtFrmSize& )rOldSet.Get(RES_FRM_SIZE);
     SwFmtFrmSize aSz( rOldSize );
 
-/*  // Folgende Zeilen nur zum debuggen:
-    BOOL bModified = aWidthED.IsValueModified();
-    USHORT nOldWidth = rOldSize.GetWidth ();
-    USHORT nWidth = aWidthED .GetValue();
-    USHORT nMinWidth = aWidthED .GetMin();*/
-
     BOOL bValueModified = (aWidthED.IsValueModified() || aHeightED.IsValueModified());
     BOOL bCheckChanged = (aRelWidthCB.GetSavedValue() != aRelWidthCB.IsChecked()
                         || aRelHeightCB.GetSavedValue() != aRelHeightCB.IsChecked());
@@ -1114,11 +1089,10 @@ BOOL SwFrmPage::FillItemSet(SfxItemSet &rSet)
                     (aSz.GetHeight() > 0 || aSz.GetHeightPercent() > 0)))
     {
         if (aSz.GetHeightSizeType() == ATT_VAR_SIZE)    // VAR_SIZE gibts nicht bei Rahmen
-            aSz.SetHeightSizeType(ATT_MIN_SIZE);        // Bug #45776 (Vorlagen ohne Breite/Hoehe)
+            aSz.SetHeightSizeType(ATT_MIN_SIZE);
 
         bRet |= 0 != rSet.Put( aSz );
     }
-    // OD 19.09.2003 #i18732#
     if(aFollowTextFlowCB.IsChecked() != aFollowTextFlowCB.GetSavedValue())
     {
         bRet |= 0 != rSet.Put(SwFmtFollowTextFlow(aFollowTextFlowCB.IsChecked()));
@@ -1165,7 +1139,7 @@ void SwFrmPage::InitPos(RndStdIds eId,
     }
     else if ( eId == FLY_AT_FLY )
     {
-        // OD 19.09.2003 #i18732# - own vertical alignment map for to frame
+        // own vertical alignment map for to frame
         // anchored objects.
         pVMap = bHtmlMode ? aVFlyHtmlMap : aVFrameMap;
         pHMap = bHtmlMode ? aHFlyHtmlMap : aHFrameMap;
@@ -1212,7 +1186,6 @@ void SwFrmPage::InitPos(RndStdIds eId,
         nH    = nOldH;
         nHRel = nOldHRel;
     }
-    // OD 12.11.2003 #i22341# - pass <nHRel> as 3rd parameter to method <FillPosLB>
     USHORT nMapPos = FillPosLB(pHMap, nH, nHRel, aHorizontalDLB);
     FillRelLB(pHMap, nMapPos, nH, nHRel, aHoriRelationLB, aHoriRelationFT);
 
@@ -1222,11 +1195,9 @@ void SwFrmPage::InitPos(RndStdIds eId,
         nV    = nOldV;
         nVRel = nOldVRel;
     }
-    // OD 12.11.2003 #i22341# - pass <nVRel> as 3rd parameter to method <FillPosLB>
     nMapPos = FillPosLB(pVMap, nV, nVRel, aVerticalDLB);
     FillRelLB(pVMap, nMapPos, nV, nVRel, aVertRelationLB, aVertRelationFT);
 
-    // Edits init
     bEnable = nH == text::HoriOrientation::NONE && eId != FLY_AS_CHAR;
     if (!bEnable)
     {
@@ -1276,7 +1247,7 @@ USHORT SwFrmPage::FillPosLB(const FrmMap* _pMap,
 
     _rLB.Clear();
 
-    // OD 12.11.2003 #i22341# - determine all possible listbox relations for
+    // i#22341 determine all possible listbox relations for
     // given relation for map <aVCharMap>
     const ULONG nLBRelations = (_pMap != aVCharMap)
                                ? 0L
@@ -1286,8 +1257,7 @@ USHORT SwFrmPage::FillPosLB(const FrmMap* _pMap,
     size_t nCount = ::lcl_GetFrmMapCount(_pMap);
     for (size_t i = 0; _pMap && i < nCount; ++i)
     {
-//      #61359# Warum nicht von links/von innen bzw. von oben?
-//      if (!bFormat || (pMap[i].eStrId != SwFPos::FROMLEFT && pMap[i].eStrId != SwFPos::FROMTOP))
+//      Warum nicht von links/von innen bzw. von oben?
         {
             SvxSwFramePosString::StringId eStrId = aMirrorPagesCB.IsChecked() ? _pMap[i].eMirrorStrId : _pMap[i].eStrId;
             eStrId = lcl_ChangeResIdToVerticalOrRTL(eStrId, bIsVerticalFrame, bIsInRightToLeft);
@@ -1297,7 +1267,7 @@ USHORT SwFrmPage::FillPosLB(const FrmMap* _pMap,
                 // bei zeichengebundenen Rahmen keine doppelten Eintraege einfuegen
                 _rLB.InsertEntry(sEntry);
             }
-            // OD 12.11.2003 #i22341# - add condition to handle map <aVCharMap>
+            // i#22341 - add condition to handle map <aVCharMap>
             // that is ambigous in the alignment.
             if ( _pMap[i].nAlign == _nAlign &&
                  ( !(_pMap == aVCharMap) || _pMap[i].nLBRelations & nLBRelations ) )
@@ -1386,7 +1356,7 @@ ULONG SwFrmPage::FillRelLB( const FrmMap* _pMap,
         {
             USHORT nRelCount = sizeof(aRelationMap) / sizeof(RelationMap);
 
-            // OD 14.11.2003 #i22341# - special handling for map <aVCharMap>,
+            // special handling for map <aVCharMap>,
             // because its ambigous in its <eStrId>/<eMirrorStrId>.
             if ( _pMap == aVCharMap )
             {
@@ -1489,7 +1459,7 @@ short SwFrmPage::GetAlignment(FrmMap *pMap, USHORT nMapPos,
 {
     short nAlign = 0;
 
-    // OD 14.11.2003 #i22341# - special handling also for map <aVCharMap>,
+    // i#22341 special handling also for map <aVCharMap>,
     // because it contains ambigous items for alignment
     if ( pMap == aVAsCharHtmlMap || pMap == aVAsCharMap ||
          pMap == aVCharMap )
@@ -1666,7 +1636,6 @@ IMPL_LINK( SwFrmPage, RangeModifyHdl, Edit *, EMPTYARG )
     aVal.bAutoHeight = aAutoHeightCB.IsChecked();
     aVal.bAutoWidth = aAutoWidthCB.IsChecked();
     aVal.bMirror = aMirrorPagesCB.IsChecked();
-    // OD 18.09.2003 #i18732#
     aVal.bFollowTextFlow = aFollowTextFlowCB.IsChecked();
 
     if ( pHMap )
@@ -1783,9 +1752,9 @@ IMPL_LINK( SwFrmPage, AnchorTypeHdl, RadioButton *, EMPTYARG )
 {
     aMirrorPagesCB.Enable(!aAnchorAsCharRB.IsChecked());
 
-    // OD 06.11.2003 #i18732# - enable check box 'Follow text flow' for anchor
+    // i#18732 - enable check box 'Follow text flow' for anchor
     // type to-paragraph' and to-character
-    // OD 10.11.2003 #i22305# - enable check box 'Follow text
+    // i#22305 - enable check box 'Follow text
     // flow' also for anchor type to-frame.
     aFollowTextFlowCB.Enable( aAnchorAtParaRB.IsChecked() ||
                               aAnchorAtCharRB.IsChecked() ||
@@ -2233,12 +2202,6 @@ void SwFrmPage::SetFormatUsed(BOOL bFmt)
         aAnchorAtFrameRB.Hide();
         aTypeFL.Hide();
         aTypeSepFL.Hide();
-
-//        Point aSizePos = aSizeFL.GetPosPixel();
-//        Size aSizeSize = aSizeFL.GetSizePixel();
-//        aSizeSize.Width() = aTypeFL.GetPosPixel().X() +
-//                    aTypeFL.GetSizePixel().Width() - aSizePos.X();
-//        aSizeFL.SetSizePixel(aSizeSize);
     }
 }
 
@@ -2250,7 +2213,7 @@ SwGrfExtPage::SwGrfExtPage(Window *pParent, const SfxItemSet &rSet) :
     aAllPagesRB     (this, SW_RES( RB_MIRROR_ALL_PAGES )),
     aLeftPagesRB    (this, SW_RES( RB_MIRROR_LEFT_PAGES )),
     aRightPagesRB   (this, SW_RES( RB_MIRROR_RIGHT_PAGES )),
-    aBmpWin         (this, WN_BMP, Graphic(), BitmapEx(SW_RES(BMP_EXAMPLE)), BitmapEx(SW_RES(BMP_EXAMPLE_HC)) ),
+    aBmpWin         (this, WN_BMP, Graphic(), BitmapEx(SW_RES(BMP_EXAMPLE))),
     aConnectFL      (this, SW_RES( FL_CONNECT )),
     aConnectFT      (this, SW_RES( FT_CONNECT )),
     aConnectED      (this, SW_RES( ED_CONNECT )),
@@ -2492,11 +2455,10 @@ IMPL_LINK( SwGrfExtPage, MirrorHdl, CheckBox *, EMPTYARG )
     Beschreibung: BeispielWindow
  --------------------------------------------------------------------*/
 BmpWindow::BmpWindow( Window* pPar, USHORT nId,
-                        const Graphic& rGraphic, const BitmapEx& rBmp, const BitmapEx& rBmpHC ) :
+                        const Graphic& rGraphic, const BitmapEx& rBmp ) :
     Window(pPar, SW_RES(nId)),
     aGraphic(rGraphic),
     aBmp(rBmp),
-    aBmpHC(rBmpHC),
     bHorz(FALSE),
     bVert(FALSE),
     bGraphic(FALSE),
@@ -2543,8 +2505,7 @@ void BmpWindow::Paint( const Rectangle& )
         aGraphic.Draw( this, aPntPos, aPntSz );
     else
     {
-        bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
-        DrawBitmapEx( aPntPos, aPntSz, bHC ? aBmpHC : aBmp );
+        DrawBitmapEx( aPntPos, aPntSz, aBmp );
     }
 }
 
@@ -2889,7 +2850,6 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet )
             aThisPageFrames.erase(aThisPageFrames.begin(), aThisPageFrames.end());
             aRemainFrames.erase(aRemainFrames.begin(), aRemainFrames.end());
 
-
             pWrtSh->GetConnectableFrmFmts(*pFmt, sPrevChain, TRUE,
                             aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames );
             lcl_InsertVectors(aNextLB, aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames);
@@ -2915,7 +2875,7 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet )
     const SwFmtEditInReadonly& rEdit = (const SwFmtEditInReadonly& )rSet.Get(RES_EDIT_IN_READONLY);
     aEditInReadonlyCB.Check(rEdit.GetValue());          aEditInReadonlyCB.SaveValue();
 
-    // drucken
+    // print
     const SvxPrintItem& rPrt = (const SvxPrintItem&)rSet.Get(RES_PRINT);
     aPrintFrameCB.Check(rPrt.GetValue());               aPrintFrameCB.SaveValue();
 
diff --git a/sw/source/ui/frmdlg/frmpage.hrc b/sw/source/ui/frmdlg/frmpage.hrc
index 044d2fdd4e05..ed58d821f032 100644
--- a/sw/source/ui/frmdlg/frmpage.hrc
+++ b/sw/source/ui/frmdlg/frmpage.hrc
@@ -105,7 +105,6 @@
 #define ED_URL                  59
 
 #define BMP_EXAMPLE             62
-#define BMP_EXAMPLE_HC          63
 #define RB_MIRROR_ALL_PAGES     64
 #define RB_MIRROR_LEFT_PAGES    65
 #define RB_MIRROR_RIGHT_PAGES   66
diff --git a/sw/source/ui/frmdlg/frmpage.src b/sw/source/ui/frmdlg/frmpage.src
index 20a2d1702a46..0004d47c6473 100644
--- a/sw/source/ui/frmdlg/frmpage.src
+++ b/sw/source/ui/frmdlg/frmpage.src
@@ -522,10 +522,6 @@ TabPage TP_GRF_EXT
     {
         File = "dog.bmp" ;
     };
-    Bitmap BMP_EXAMPLE_HC
-    {
-        File = "dog_h.bmp" ;
-    };
     FixedLine FL_CONNECT
     {
         Pos = MAP_APPFONT ( 6 , 87 ) ;
diff --git a/sw/source/ui/frmdlg/makefile.mk b/sw/source/ui/frmdlg/makefile.mk
index a7addb0b9493..3caff5544e61 100644
--- a/sw/source/ui/frmdlg/makefile.mk
+++ b/sw/source/ui/frmdlg/makefile.mk
@@ -48,9 +48,12 @@ SRC1FILES =  \
         wrap.src
 
 SLOFILES =  \
-        $(SLO)$/colmgr.obj \
-        $(SLO)$/column.obj \
+        $(EXCEPTIONSFILES) \
+        $(SLO)$/colmgr.obj
+
+EXCEPTIONSFILES =  \
         $(SLO)$/colex.obj \
+        $(SLO)$/column.obj \
         $(SLO)$/cption.obj \
         $(SLO)$/frmdlg.obj \
         $(SLO)$/frmmgr.obj \
@@ -59,10 +62,6 @@ SLOFILES =  \
         $(SLO)$/uiborder.obj \
         $(SLO)$/wrap.obj
 
-EXCEPTIONSFILES =  \
-        $(SLO)$/frmpage.obj \
-        $(SLO)$/cption.obj 
-
 LIB1TARGET = $(SLB)$/$(TARGET).lib
 
 LIB1OBJFILES =	\
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 29cd08234e18..60cdc1a43ed3 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -42,7 +42,7 @@
 #include <editeng/opaqitem.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/lrspitem.hxx>
-// OD 18.09.2003 #i18732#
+// #i18732#
 #include <fmtfollowtextflow.hxx>
 #include <svx/swframevalidation.hxx>
 
@@ -116,7 +116,6 @@ SwWrapTabPage::SwWrapTabPage(Window *pParent, const SfxItemSet &rSet) :
     aWrapOutsideCB      (this, SW_RES(CB_ONLYOUTSIDE)),
 
     aWrapIL             (SW_RES(IL_WRAP)),
-    aWrapILH            (SW_RES(ILH_WRAP)),
 
     nAnchorId(FLY_AT_PARA),
     nHtmlMode(0),
@@ -447,7 +446,7 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet)
         aVal.bAutoHeight = rFrmSize.GetHeightSizeType() == ATT_MIN_SIZE;
         aVal.bAutoWidth = rFrmSize.GetWidthSizeType() == ATT_MIN_SIZE;
         aVal.bMirror = rHori.IsPosToggle();
-        // OD 18.09.2003 #i18732#
+        // #i18732#
         aVal.bFollowTextFlow =
             static_cast<const SwFmtFollowTextFlow&>(rSet.Get(RES_FOLLOW_TEXT_FLOW)).GetValue();
 
@@ -647,10 +646,15 @@ IMPL_LINK( SwWrapTabPage, RangeModifyHdl, MetricField *, pEdit )
         else if (pEdit == &aBottomMarginED)
             pOpposite = &aTopMarginED;
 
-        sal_Int64 nOpposite = pOpposite->GetValue();
+        OSL_ASSERT(pOpposite);
 
-        if (nValue + nOpposite > Max(pEdit->GetMax(), pOpposite->GetMax()))
-            pOpposite->SetValue(pOpposite->GetMax() - nValue);
+        if (pOpposite)
+        {
+            sal_Int64 nOpposite = pOpposite->GetValue();
+
+            if (nValue + nOpposite > Max(pEdit->GetMax(), pOpposite->GetMax()))
+                pOpposite->SetValue(pOpposite->GetMax() - nValue);
+        }
     }
 
     return 0;
@@ -703,26 +707,25 @@ void SwWrapTabPage::DataChanged( const DataChangedEvent& rDCEvt )
 
 void SwWrapTabPage::ApplyImageList()
 {
-    ImageList& rImgLst = GetSettings().GetStyleSettings().GetHighContrastMode() ?
-        aWrapILH : aWrapIL;
+    ImageList& rImgLst = aWrapIL;
 
     aWrapThroughRB.SetModeRadioImage(rImgLst.GetImage(IMG_THROUGH));
     BOOL bWrapOutline =  !aWrapOutlineCB.IsChecked();
     if(bWrapOutline)
     {
-        aNoWrapRB.SetModeRadioImage(rImgLst.GetImage(IMG_NONE));
-        aWrapLeftRB.SetModeRadioImage(rImgLst.GetImage(IMG_LEFT));
-        aWrapRightRB.SetModeRadioImage(rImgLst.GetImage(IMG_RIGHT));
-        aWrapParallelRB.SetModeRadioImage(rImgLst.GetImage(IMG_PARALLEL));
-        aIdealWrapRB.SetModeRadioImage(rImgLst.GetImage(IMG_IDEAL));
+        aNoWrapRB.SetModeRadioImage(       rImgLst.GetImage( IMG_NONE     ));
+        aWrapLeftRB.SetModeRadioImage(     rImgLst.GetImage( IMG_LEFT     ));
+        aWrapRightRB.SetModeRadioImage(    rImgLst.GetImage( IMG_RIGHT    ));
+        aWrapParallelRB.SetModeRadioImage( rImgLst.GetImage( IMG_PARALLEL ));
+        aIdealWrapRB.SetModeRadioImage(    rImgLst.GetImage( IMG_IDEAL    ));
     }
     else
     {
-        aNoWrapRB.SetModeRadioImage(rImgLst.GetImage( IMG_KON_NONE ));
-        aWrapLeftRB.SetModeRadioImage(rImgLst.GetImage( IMG_KON_LEFT ));
-        aWrapRightRB.SetModeRadioImage(rImgLst.GetImage( IMG_KON_RIGHT ));
-        aWrapParallelRB.SetModeRadioImage(rImgLst.GetImage(IMG_KON_PARALLEL ));
-        aIdealWrapRB.SetModeRadioImage(rImgLst.GetImage( IMG_KON_IDEAL ));
+        aNoWrapRB.SetModeRadioImage(       rImgLst.GetImage( IMG_KON_NONE     ));
+        aWrapLeftRB.SetModeRadioImage(     rImgLst.GetImage( IMG_KON_LEFT     ));
+        aWrapRightRB.SetModeRadioImage(    rImgLst.GetImage( IMG_KON_RIGHT    ));
+        aWrapParallelRB.SetModeRadioImage( rImgLst.GetImage( IMG_KON_PARALLEL ));
+        aIdealWrapRB.SetModeRadioImage(    rImgLst.GetImage( IMG_KON_IDEAL    ));
     }
 }
 
diff --git a/sw/source/ui/frmdlg/wrap.hrc b/sw/source/ui/frmdlg/wrap.hrc
index be19dbe702c2..5874b161e012 100644
--- a/sw/source/ui/frmdlg/wrap.hrc
+++ b/sw/source/ui/frmdlg/wrap.hrc
@@ -24,13 +24,13 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#define RB_NO_WRAP          2
-#define RB_WRAP_LEFT        3
-#define RB_WRAP_RIGHT       4
-#define RB_WRAP_PARALLEL    5
-#define RB_WRAP_THROUGH     6
-#define RB_WRAP_IDEAL       7
-#define CB_ANCHOR_ONLY      8
+#define RB_NO_WRAP           2
+#define RB_WRAP_LEFT         3
+#define RB_WRAP_RIGHT        4
+#define RB_WRAP_PARALLEL     5
+#define RB_WRAP_THROUGH      6
+#define RB_WRAP_IDEAL        7
+#define CB_ANCHOR_ONLY       8
 #define FT_LEFT_MARGIN      13
 #define ED_LEFT_MARGIN      14
 #define FT_RIGHT_MARGIN     15
@@ -39,28 +39,25 @@
 #define ED_TOP_MARGIN       18
 #define ED_BOTTOM_MARGIN    19
 #define FT_BOTTOM_MARGIN    20
-#define FL_MARGIN                       21
+#define FL_MARGIN           21
 #define CB_TRANSPARENT      22
 #define CB_OUTLINE          23
-#define FL_OPTION                       24
+#define FL_OPTION           24
 #define CB_ONLYOUTSIDE      25
-#define FL_OPTION_SEP                       26
-#define C_WRAP_FL                      31
+#define FL_OPTION_SEP       26
+#define C_WRAP_FL           31
 
 #define IL_WRAP             32
-#define ILH_WRAP            33
 // nur fuer die ImageList
-#define IMG_BEGIN       1
-#define IMG_NONE        (IMG_BEGIN)
-#define IMG_LEFT        (IMG_BEGIN + 1)
-#define IMG_RIGHT               (IMG_BEGIN + 2)
-#define IMG_PARALLEL            (IMG_BEGIN + 3)
-#define IMG_THROUGH             (IMG_BEGIN + 4)
-#define IMG_IDEAL       (IMG_BEGIN + 5)
-#define IMG_KON_NONE        (IMG_BEGIN + 6)
-#define IMG_KON_LEFT            (IMG_BEGIN + 7)
-#define IMG_KON_RIGHT           (IMG_BEGIN + 8)
-#define IMG_KON_PARALLEL        (IMG_BEGIN + 9)
-#define IMG_KON_IDEAL           (IMG_BEGIN + 10)
-
-
+#define IMG_BEGIN           1
+#define IMG_NONE            (IMG_BEGIN)
+#define IMG_LEFT            (IMG_BEGIN +  1)
+#define IMG_RIGHT           (IMG_BEGIN +  2)
+#define IMG_PARALLEL        (IMG_BEGIN +  3)
+#define IMG_THROUGH         (IMG_BEGIN +  4)
+#define IMG_IDEAL           (IMG_BEGIN +  5)
+#define IMG_KON_NONE        (IMG_BEGIN +  6)
+#define IMG_KON_LEFT        (IMG_BEGIN +  7)
+#define IMG_KON_RIGHT       (IMG_BEGIN +  8)
+#define IMG_KON_PARALLEL    (IMG_BEGIN +  9)
+#define IMG_KON_IDEAL       (IMG_BEGIN + 10)
diff --git a/sw/source/ui/frmdlg/wrap.src b/sw/source/ui/frmdlg/wrap.src
index bd779308178d..e512e63eec5d 100644
--- a/sw/source/ui/frmdlg/wrap.src
+++ b/sw/source/ui/frmdlg/wrap.src
@@ -246,12 +246,4 @@ TabPage TP_FRM_WRAP
         MaskColor = IMAGE_MASK_COLOR ;
         WRAP_IDLIST
     };
-    ImageList ILH_WRAP
-    {
-        Prefix = "wrh";
-        MaskColor = IMAGE_MASK_COLOR ;
-        WRAP_IDLIST
-    };
-
 };
-
diff --git a/sw/source/ui/globdoc/makefile.mk b/sw/source/ui/globdoc/makefile.mk
index d75eb7af8807..f3563b819d35 100644
--- a/sw/source/ui/globdoc/makefile.mk
+++ b/sw/source/ui/globdoc/makefile.mk
@@ -43,6 +43,9 @@ SRC1FILES =  \
         globdoc.src
 
 SLOFILES =  \
+        $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
         $(SLO)$/globdoc.obj
 
 # --- Tagets -------------------------------------------------------
diff --git a/sw/source/ui/inc/SwXFilterOptions.hxx b/sw/source/ui/inc/SwXFilterOptions.hxx
index 85752c0bc9ca..e5d6030be989 100644
--- a/sw/source/ui/inc/SwXFilterOptions.hxx
+++ b/sw/source/ui/inc/SwXFilterOptions.hxx
@@ -39,10 +39,6 @@ namespace com { namespace sun { namespace star { namespace io {
     class XInputStream;
 } } } }
 
-
-/* -----------------------------2002/06/21 12:07------------------------------
-
- ---------------------------------------------------------------------------*/
 class SwXFilterOptions : public ::cppu::WeakImplHelper5<
                             ::com::sun::star::beans::XPropertyAccess,
                             ::com::sun::star::ui::dialogs::XExecutableDialog,
diff --git a/sw/source/ui/inc/abstract.hxx b/sw/source/ui/inc/abstract.hxx
index adc56934d32e..29a60dff072d 100644
--- a/sw/source/ui/inc/abstract.hxx
+++ b/sw/source/ui/inc/abstract.hxx
@@ -36,10 +36,6 @@
 
 #include <vcl/button.hxx>
 
-
-/*-----------------22.02.97 15.06-------------------
-
---------------------------------------------------*/
 class SwInsertAbstractDlg  : public SfxModalDialog
 {
     FixedLine       aFL;
diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc
index edf7014a4e4f..5697f76c30ed 100644
--- a/sw/source/ui/inc/app.hrc
+++ b/sw/source/ui/inc/app.hrc
@@ -31,137 +31,92 @@
 #include "rcid.hrc"
 
 // Default Bitmap fuer ToolBox
-#define BMP_FEHLT                   (RC_APP_BEGIN + 1)
+#define BMP_FEHLT                       (RC_APP_BEGIN + 1)
 
 // Document-Icon
-#define RC_DOC_ICON                 (RC_APP_BEGIN + 2)
+#define RC_DOC_ICON                     (RC_APP_BEGIN + 2)
 
 //Soll das Clipboard fuer andere Applikationen...
-#define MSG_CLPBRD_CLEAR            (RC_APP_BEGIN + 3)
+#define MSG_CLPBRD_CLEAR                (RC_APP_BEGIN + 3)
 
-#define STR_CANTCREATE              (RC_APP_BEGIN + 4)
-#define STR_CANTOPEN                (RC_APP_BEGIN + 5)
+#define STR_CANTCREATE                  (RC_APP_BEGIN + 4)
+#define STR_CANTOPEN                    (RC_APP_BEGIN + 5)
 
 // Messages
-#define MSG_ERROR_SEND_MAIL         ( RC_APP_BEGIN + 6)
-#define MSG_SAVE_HTML_QUERY         ( RC_APP_BEGIN + 7)
+#define MSG_ERROR_SEND_MAIL             ( RC_APP_BEGIN + 6)
+#define MSG_SAVE_HTML_QUERY             ( RC_APP_BEGIN + 7)
 
 //Fuer das Interface, weil der RID_APP_BEGIN jetzt Desktop ist.
-#define RID_SW_NAME                 ( RC_APP_BEGIN + 8)
-#define MSG_SAVEAS_HTML_QUERY       ( RC_APP_BEGIN + 9)
+#define RID_SW_NAME                     ( RC_APP_BEGIN + 8)
+#define MSG_SAVEAS_HTML_QUERY           ( RC_APP_BEGIN + 9)
 
 
-#define STR_UNBENANNT               (RC_APP_BEGIN + 13)
-#define STR_VERSION                 (RC_APP_BEGIN + 14)
-#define STR_PRINT_MERGE_MACRO       (RC_APP_BEGIN + 15)
-#define STR_PAGE_COUNT_MACRO        (RC_APP_BEGIN + 16)
+#define STR_UNBENANNT                   (RC_APP_BEGIN + 13)
+#define STR_VERSION                     (RC_APP_BEGIN + 14)
+#define STR_PRINT_MERGE_MACRO           (RC_APP_BEGIN + 15)
+#define STR_PAGE_COUNT_MACRO            (RC_APP_BEGIN + 16)
 
 // Bitmap fuer die NumerierungsVorlagen im Organizer
-#define BMP_STYLES_FAMILY_NUM       (RC_APP_BEGIN + 17)
-#define BMP_STYLES_FAMILY_NUM_HC    (RC_APP_BEGIN + 18)
+#define BMP_STYLES_FAMILY_NUM           (RC_APP_BEGIN + 17)
 
 // Strings fuer Bereiche in der Konfiguration
-#define STR_GRP_FILE                (RC_APP_BEGIN + 56)
-#define STR_GRP_EDIT                (RC_APP_BEGIN + 57)
-#define STR_GRP_TRAVELLING          (RC_APP_BEGIN + 58)
-#define STR_GRP_VIEW                (RC_APP_BEGIN + 59)
-#define STR_GRP_INSERT              (RC_APP_BEGIN + 60)
-#define STR_GRP_FORMAT              (RC_APP_BEGIN + 61)
-#define STR_GRP_STYLE               (RC_APP_BEGIN + 62)
-#define STR_GRP_TEXT                (RC_APP_BEGIN + 63)
-#define STR_GRP_FRAME               (RC_APP_BEGIN + 64)
-#define STR_GRP_GRAPHIC             (RC_APP_BEGIN + 65)
-#define STR_GRP_TABLE               (RC_APP_BEGIN + 66)
-#define STR_GRP_TOOLS               (RC_APP_BEGIN + 67)
-#define STR_GRP_NUMBERING           (RC_APP_BEGIN + 68)
-#define STR_GRP_WINDOW              (RC_APP_BEGIN + 69)
-#define STR_GRP_MISC                (RC_APP_BEGIN + 70)
-#define STR_GRP_MACRO               (RC_APP_BEGIN + 71)
-#define RES_EXT_HELP_STRING         (RC_APP_BEGIN + 72)
-#define RES_STD_HELP_STRING         (RC_APP_BEGIN + 73)
-#define STR_PAGEOFFSET              (RC_APP_BEGIN + 74)
-#define STR_PAGEBREAK               (RC_APP_BEGIN + 75)
-#define STR_REDLINE_UNKNOWN_AUTHOR  (RC_APP_BEGIN + 76)
-#define STR_WESTERN_FONT            (RC_APP_BEGIN + 77)
-#define STR_CJK_FONT                (RC_APP_BEGIN + 78)
-//#define MSG_INS_MERGE_FIELDS        (RC_APP_BEGIN + 79)
-#define MSG_PRINT_AS_MERGE          (RC_APP_BEGIN + 80)
-#define MSG_DATA_SOURCES_UNAVAILABLE (RC_APP_BEGIN + 82)
-#define DLG_MERGE_SOURCE_UNAVAILABLE (RC_APP_BEGIN + 83)
-#define ST_MERGE_SOURCE_UNAVAILABLE 1
-#define PB_MERGE_OK                 2
-#define PB_MERGE_CANCEL             3
-#define IMG_MERGE                   4
-#define SID_TOGGLETOOLBOX           (RC_APP_BEGIN + 89)
-
-#define STR_ENV_TITLE               (RC_APP_BEGIN + 91)
-#define STR_LAB_TITLE               (RC_APP_BEGIN + 92)
-
-#define STR_HUMAN_SWDOC_NAME        (RC_APP_BEGIN + 93)
-
-#define RID_SW_ERRHDL               (RC_APP_BEGIN + 95)
-
-#define STR_FDLG_TEMPLATE_BUTTON    (RC_APP_BEGIN + 1)
-#define STR_FDLG_TEMPLATE_NAME      (RC_APP_BEGIN + 2)
+#define STR_GRP_FILE                    (RC_APP_BEGIN + 56)
+#define STR_GRP_EDIT                    (RC_APP_BEGIN + 57)
+#define STR_GRP_TRAVELLING              (RC_APP_BEGIN + 58)
+#define STR_GRP_VIEW                    (RC_APP_BEGIN + 59)
+#define STR_GRP_INSERT                  (RC_APP_BEGIN + 60)
+#define STR_GRP_FORMAT                  (RC_APP_BEGIN + 61)
+#define STR_GRP_STYLE                   (RC_APP_BEGIN + 62)
+#define STR_GRP_TEXT                    (RC_APP_BEGIN + 63)
+#define STR_GRP_FRAME                   (RC_APP_BEGIN + 64)
+#define STR_GRP_GRAPHIC                 (RC_APP_BEGIN + 65)
+#define STR_GRP_TABLE                   (RC_APP_BEGIN + 66)
+#define STR_GRP_TOOLS                   (RC_APP_BEGIN + 67)
+#define STR_GRP_NUMBERING               (RC_APP_BEGIN + 68)
+#define STR_GRP_WINDOW                  (RC_APP_BEGIN + 69)
+#define STR_GRP_MISC                    (RC_APP_BEGIN + 70)
+#define STR_GRP_MACRO                   (RC_APP_BEGIN + 71)
+#define RES_EXT_HELP_STRING             (RC_APP_BEGIN + 72)
+#define RES_STD_HELP_STRING             (RC_APP_BEGIN + 73)
+#define STR_PAGEOFFSET                  (RC_APP_BEGIN + 74)
+#define STR_PAGEBREAK                   (RC_APP_BEGIN + 75)
+#define STR_REDLINE_UNKNOWN_AUTHOR      (RC_APP_BEGIN + 76)
+#define STR_WESTERN_FONT                (RC_APP_BEGIN + 77)
+#define STR_CJK_FONT                    (RC_APP_BEGIN + 78)
+#define MSG_PRINT_AS_MERGE              (RC_APP_BEGIN + 80)
+#define MSG_DATA_SOURCES_UNAVAILABLE    (RC_APP_BEGIN + 82)
+#define DLG_MERGE_SOURCE_UNAVAILABLE    (RC_APP_BEGIN + 83)
+
+#define ST_MERGE_SOURCE_UNAVAILABLE     1
+#define PB_MERGE_OK                     2
+#define PB_MERGE_CANCEL                 3
+#define IMG_MERGE                       4
+
+#define SID_TOGGLETOOLBOX               (RC_APP_BEGIN + 89)
+
+#define STR_ENV_TITLE                   (RC_APP_BEGIN + 91)
+#define STR_LAB_TITLE                   (RC_APP_BEGIN + 92)
+
+#define STR_HUMAN_SWDOC_NAME            (RC_APP_BEGIN + 93)
+
+#define RID_SW_ERRHDL                   (RC_APP_BEGIN + 95)
+
+#define STR_FDLG_TEMPLATE_BUTTON        (RC_APP_BEGIN + 1)
+#define STR_FDLG_TEMPLATE_NAME          (RC_APP_BEGIN + 2)
 
 
 // Ids fuer die einzelnen PopUpMenues
-//#define MN_WIZARD                 (RC_APP_BEGIN + 9)
-//#define MN_INDEX                  (RC_APP_BEGIN + 10)
-//#define MN_FILE                   (RC_APP_BEGIN + 11)
-//#define MN_EDIT                   (RC_APP_BEGIN + 12)
-//#define MN_VIEW                   (RC_APP_BEGIN + 13)
-//#define MN_INS                        (RC_APP_BEGIN + 14)
-//#define MN_TEXT                   (RC_APP_BEGIN + 15)
-//#define MN_FORMAT                 (RC_APP_BEGIN + 16)
-#define MN_FORMAT_STYLE           (RC_APP_BEGIN + 17)
-#define MN_FORMAT_ALGN                (RC_APP_BEGIN + 18)
-#define MN_FORMAT_LINESPACE       (RC_APP_BEGIN + 19)
-//#define MN_EXTRA                  (RC_APP_BEGIN + 20)
-//#define MN_WIN                        (RC_APP_BEGIN + 21)
-//#define MN_HELP                   (RC_APP_BEGIN + 22)
-#define MN_FORMAT_FRM_HORZ            (RC_APP_BEGIN + 23)
-//#define MN_FORMAT_FRM_VERT            (RC_APP_BEGIN + 24)
-//#define MN_PICKLIST               (RC_APP_BEGIN + 25)
-//#define MN_WINLIST                    (RC_APP_BEGIN + 26)
-//#define MN_MACRO                  (RC_APP_BEGIN + 27)
-//#define MN_FORMAT_HIERARCHY       (RC_APP_BEGIN + 28)
-#define MN_CELL                   (RC_APP_BEGIN + 29)
-//#define MN_HELP_TIP               (RC_APP_BEGIN + 30)
-//#define MN_HELP_SEARCH                (RC_APP_BEGIN + 31)
-//#define MN_HELP_ACTIVE                (RC_APP_BEGIN + 32)
-//#define MN_HELP_INDEX             (RC_APP_BEGIN + 33)
-//#define MN_OBJECT                 (RC_APP_BEGIN + 34)
-//#define MN_DATABASE                   (RC_APP_BEGIN + 35)
-//#define MN_DIRSUBMENU               (RC_APP_BEGIN + 36)
-//#define MN_MAIL                       (RC_APP_BEGIN + 37)
-#define MN_WRAP                       (RC_APP_BEGIN + 38)
-#define MN_SUB_TBLROW               (RC_APP_BEGIN + 39)
-#define MN_SUB_TBLCOL               (RC_APP_BEGIN + 40)
-//#define MN_SUB_AUTOFORMAT           (RC_APP_BEGIN + 41)
-//#define MN_SUB_TOOLBAR              (RC_APP_BEGIN + 42)
-//#define MN_SUB_FIELD                (RC_APP_BEGIN + 43)
-//#define MN_SUB_GRAPHIC              (RC_APP_BEGIN + 44)
-//#define MN_SUB_TEMPLATES            (RC_APP_BEGIN + 45)
-#define MN_SUB_ARRANGE              (RC_APP_BEGIN + 46)
-
-//#define MN_SUB_UPDATE               (RC_APP_BEGIN + 48)
-//#define MN_SUB_MIRROR             (RC_APP_BEGIN + 49)
-#define MN_SUB_ALIGN                (RC_APP_BEGIN + 50)
-//#define MN_SUB_OPTIONS              (RC_APP_BEGIN + 51)
-//#define MN_SUB_SENDTO             (RC_APP_BEGIN + 52)
-//#define MN_SUB_REVISE             (RC_APP_BEGIN + 53)
-//#define MN_TEMPLATES              (RC_APP_BEGIN + 54)
-//#define MN_FILE_PORT                  (RC_APP_BEGIN + 55)
-//#define MN_EDIT_PORT                  (RC_APP_BEGIN + 56)
-//#define MN_VIEW_PORT                  (RC_APP_BEGIN + 57)
-//#define MN_INS_PORT                   (RC_APP_BEGIN + 58)
-//#define MN_FORMAT_PORT                (RC_APP_BEGIN + 59)
-//#define MN_EXTRA_PORT             (RC_APP_BEGIN + 60)
-//#define MN_WIN_PORT               (RC_APP_BEGIN + 61)
-//#define MN_HELP_PORT              (RC_APP_BEGIN + 62)
-//#define MN_SUB_TRANSLITERATE        (RC_APP_BEGIN + 63)
-//#define MN_SUB_MACRO                (RC_APP_BEGIN + 64)
+#define MN_FORMAT_STYLE                 (RC_APP_BEGIN + 17)
+#define MN_FORMAT_ALGN                  (RC_APP_BEGIN + 18)
+#define MN_FORMAT_LINESPACE             (RC_APP_BEGIN + 19)
+#define MN_FORMAT_FRM_HORZ              (RC_APP_BEGIN + 23)
+#define MN_CELL                         (RC_APP_BEGIN + 29)
+#define MN_WRAP                         (RC_APP_BEGIN + 38)
+#define MN_SUB_TBLROW                   (RC_APP_BEGIN + 39)
+#define MN_SUB_TBLCOL                   (RC_APP_BEGIN + 40)
+#define MN_SUB_ARRANGE                  (RC_APP_BEGIN + 46)
+
+#define MN_SUB_ALIGN                    (RC_APP_BEGIN + 50)
 
 #define STR_WRITER_DOCUMENT_FULLTYPE    (RC_APP_BEGIN + 100)
 #define STR_ABSTRACT_TITLE              (RC_APP_BEGIN + 102)
@@ -170,8 +125,8 @@
 #define STR_OUTLINE_NUMBERING           (RC_APP_BEGIN + 104)
 // <--
 //#outline level,zhaojianwei
-#define STR_FDLG_OUTLINE_LEVEL      (RC_APP_BEGIN + 105)
-#define STR_FDLG_STYLE              (RC_APP_BEGIN + 106)
+#define STR_FDLG_OUTLINE_LEVEL          (RC_APP_BEGIN + 105)
+#define STR_FDLG_STYLE                  (RC_APP_BEGIN + 106)
 //<-end,zhaojianwei
 
 #define APP_ACT_END                     STR_FDLG_STYLE
diff --git a/sw/source/ui/inc/bmpwin.hxx b/sw/source/ui/inc/bmpwin.hxx
index ebc22332885e..c602b9e9df1a 100644
--- a/sw/source/ui/inc/bmpwin.hxx
+++ b/sw/source/ui/inc/bmpwin.hxx
@@ -41,7 +41,6 @@ class BmpWindow : public Window
 private:
     Graphic     aGraphic;
     BitmapEx    aBmp;
-    BitmapEx    aBmpHC;
 
     BOOL        bHorz : 1;
     BOOL        bVert : 1;
@@ -52,7 +51,7 @@ private:
 
 public:
     BmpWindow(Window* pPar, USHORT nId,
-                const Graphic& rGraphic, const BitmapEx& rBmp, const BitmapEx& rBmpHC);
+                const Graphic& rGraphic, const BitmapEx& rBmp);
     BmpWindow(Window* pParent, const ResId rResId) :
         Window(pParent, rResId),
         bHorz(FALSE), bVert(FALSE),bGraphic(FALSE), bLeftAlign(TRUE) {}
diff --git a/sw/source/ui/inc/bookmark.hxx b/sw/source/ui/inc/bookmark.hxx
index 54492b201196..d6201069f8d6 100644
--- a/sw/source/ui/inc/bookmark.hxx
+++ b/sw/source/ui/inc/bookmark.hxx
@@ -38,10 +38,6 @@
 class SwWrtShell;
 class SfxRequest;
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 class BookmarkCombo : public SwComboBox
 {
     USHORT          GetFirstSelEntryPos() const;
@@ -58,10 +54,6 @@ public:
     static const String aForbiddenChars;
 };
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 class SwInsertBookmarkDlg: public SvxStandardDialog
 {
     BookmarkCombo   aBookmarkBox;
diff --git a/sw/source/ui/inc/changedb.hxx b/sw/source/ui/inc/changedb.hxx
index de5c57dd9671..47dc19daf945 100644
--- a/sw/source/ui/inc/changedb.hxx
+++ b/sw/source/ui/inc/changedb.hxx
@@ -60,10 +60,8 @@ class SwChangeDBDlg: public SvxStandardDialog
     OKButton        aOKBT;
     CancelButton    aCancelBT;
     HelpButton      aHelpBT;
-//  PushButton      aChangeBT;
 
     ImageList       aImageList;
-    ImageList       aImageListHC;
 
     SwWrtShell      *pSh;
     SwFldMgr        *pMgr;
diff --git a/sw/source/ui/inc/dbtree.hxx b/sw/source/ui/inc/dbtree.hxx
index c3f53c513842..ec0bb0d970b5 100644
--- a/sw/source/ui/inc/dbtree.hxx
+++ b/sw/source/ui/inc/dbtree.hxx
@@ -44,7 +44,6 @@ class SwWrtShell;
 class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox
 {
     ImageList       aImageList;
-    ImageList       aImageListHC;
     Image           aDBBMP;
     Image           aTableBMP;
     Image           aQueryBMP;
diff --git a/sw/source/ui/inc/insrule.hxx b/sw/source/ui/inc/insrule.hxx
index e6d02f2ac22d..e3a8473934a0 100644
--- a/sw/source/ui/inc/insrule.hxx
+++ b/sw/source/ui/inc/insrule.hxx
@@ -31,9 +31,7 @@
 
 class SwRulerValueSet;
 class ValueSet;
-/*-----------------14.02.97 12.30-------------------
 
---------------------------------------------------*/
 class SwInsertGrfRulerDlg  : public SfxModalDialog
 {
     FixedLine       aSelectionFL;
diff --git a/sw/source/ui/inc/misc.hrc b/sw/source/ui/inc/misc.hrc
index f7c7cfcde9a0..39f33d39d677 100644
--- a/sw/source/ui/inc/misc.hrc
+++ b/sw/source/ui/inc/misc.hrc
@@ -96,6 +96,7 @@
 #define MN_REDLINE_POPUP            (RC_MISC_BEGIN + 61)
 #define STR_REMOVE_WARNING          (RC_MISC_BEGIN + 62)
 #define STRRES_NUMTYPES             (RC_MISC_BEGIN + 63)
+#define STR_MY_AUTOTEXT             (RC_MISC_BEGIN + 64)
 
 #define MISC_ACT_END                STRRES_NUMTYPES
 
diff --git a/sw/source/ui/inc/navipi.hxx b/sw/source/ui/inc/navipi.hxx
index 21a3ecd4dcf4..91e16972596b 100644
--- a/sw/source/ui/inc/navipi.hxx
+++ b/sw/source/ui/inc/navipi.hxx
@@ -70,7 +70,6 @@ class SwNavigationPI : public Window,
     SwNavHelpToolBox    aContentToolBox;
     SwHelpToolBox       aGlobalToolBox;
     ImageList           aContentImageList;
-    ImageList           aContentImageListH;
     SwContentTree       aContentTree;
     SwGlobalTree        aGlobalTree;
     ListBox             aDocListBox;
diff --git a/sw/source/ui/inc/num.hxx b/sw/source/ui/inc/num.hxx
index 332ca4f81d50..6f66050ddfb8 100644
--- a/sw/source/ui/inc/num.hxx
+++ b/sw/source/ui/inc/num.hxx
@@ -45,30 +45,18 @@ class SwWrtShell;
 class SvxBrushItem;
 class SwOutlineTabDialog;
 
-
-/*-----------------13.02.97 14.02-------------------
-
---------------------------------------------------*/
-
 struct SwBmpItemInfo
 {
     SvxBrushItem*   pBrushItem;
     USHORT          nItemId;
 };
 
-
-/*-----------------07.02.97 15.37-------------------
-
---------------------------------------------------*/
 #define NUM_PAGETYPE_BULLET         0
 #define NUM_PAGETYPE_SINGLENUM      1
 #define NUM_PAGETYPE_NUM            2
 #define NUM_PAGETYPE_BMP            3
 #define PAGETYPE_USER_START         10
 
-/*-----------------03.12.97 10:18-------------------
-
---------------------------------------------------*/
 class SwNumPositionTabPage : public SfxTabPage
 {
     FixedLine       aPositionFL;
diff --git a/sw/source/ui/inc/numprevw.hxx b/sw/source/ui/inc/numprevw.hxx
index 1d0002f0d56e..939cdd0e0585 100644
--- a/sw/source/ui/inc/numprevw.hxx
+++ b/sw/source/ui/inc/numprevw.hxx
@@ -33,9 +33,6 @@
 #include <vcl/window.hxx>
 
 class SwNumRule;
-/*-----------------02.12.97 10:31-------------------
-
---------------------------------------------------*/
 
 class NumberingPreview : public Window
 {
diff --git a/sw/source/ui/inc/redlndlg.hxx b/sw/source/ui/inc/redlndlg.hxx
index 685d03c824c6..8f2686b93cb1 100644
--- a/sw/source/ui/inc/redlndlg.hxx
+++ b/sw/source/ui/inc/redlndlg.hxx
@@ -144,10 +144,6 @@ public:
     virtual void    Resize();
 };
 
-/*------------------------------------------------------------------------
-    Beschreibung:
-------------------------------------------------------------------------*/
-
 class SwModelessRedlineAcceptDlg : public SfxModelessDialog
 {
     SwRedlineAcceptDlg*     pImplDlg;
@@ -164,11 +160,6 @@ public:
     void            Initialize (SfxChildWinInfo* pInfo);
 };
 
-
-/*------------------------------------------------------------------------
-    Beschreibung:
-------------------------------------------------------------------------*/
-
 class SwRedlineAcceptChild : public SwChildWinWrapper
 {
 public:
diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx
index 0019b4b1b291..ea6573a60f4f 100644
--- a/sw/source/ui/inc/regionsw.hxx
+++ b/sw/source/ui/inc/regionsw.hxx
@@ -106,7 +106,6 @@ class SwEditRegionDlg : public SfxModalDialog
     PushButton      aDismiss;
     HelpButton      aHelp;
     ImageList       aImageIL;
-    ImageList       aImageILH;
 
     SwWrtShell&             rSh;
     SectReprArr             aSectReprArr;
@@ -119,7 +118,7 @@ class SwEditRegionDlg : public SfxModalDialog
     BOOL            bWeb            :1;
 
 
-    Image  BuildBitmap(BOOL bProtect,BOOL bHidden,BOOL bHighContrast);
+    Image  BuildBitmap(BOOL bProtect,BOOL bHidden);
 
     void    RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry);
     USHORT  FindArrPos(const SwSectionFmt* pFmt);
diff --git a/sw/source/ui/inc/syncbtn.hxx b/sw/source/ui/inc/syncbtn.hxx
index 348b60cafaef..7c05e0776b96 100644
--- a/sw/source/ui/inc/syncbtn.hxx
+++ b/sw/source/ui/inc/syncbtn.hxx
@@ -34,10 +34,6 @@
 
 #include <vcl/button.hxx>
 
-/*------------------------------------------------------------------------
-    Beschreibung:
-------------------------------------------------------------------------*/
-
 class SwSyncBtnDlg : public SfxFloatingWindow
 {
     PushButton              aSyncBtn;
@@ -50,10 +46,6 @@ public:
 };
 #endif
 
-/*------------------------------------------------------------------------
-    Beschreibung:
-------------------------------------------------------------------------*/
-
 class SwSyncChildWin : public SfxChildWindow
 {
 public:
diff --git a/sw/source/ui/inc/utlui.hrc b/sw/source/ui/inc/utlui.hrc
index aa7dab24054a..41655ce860c0 100644
--- a/sw/source/ui/inc/utlui.hrc
+++ b/sw/source/ui/inc/utlui.hrc
@@ -154,15 +154,7 @@
 #define DLG_GLOSSARY_DECIDE_DLG     (RC_UTLUI_BEGIN + 3)
 
 #define IMG_NAVI_ENTRYBMP           (RC_UTLUI_BEGIN + 4)
-#define IMG_NAVI_ENTRYBMPH          (RC_UTLUI_BEGIN + 5)
 #define ILIST_DB_DLG                (RC_UTLUI_BEGIN + 6)
-#define ILIST_DB_DLG_HC             (RC_UTLUI_BEGIN + 7)
-
-#define IMG_ONE_LEFT_HC             (RC_UTLUI_BEGIN + 8)
-#define IMG_ONE_RIGHT_HC            (RC_UTLUI_BEGIN + 9)
-#define IMG_ALL_LEFT_HC             (RC_UTLUI_BEGIN + 10)
-#define IMG_ALL_RIGHT_HC            (RC_UTLUI_BEGIN + 11)
-
 
 #define IMG_VIEWLAYOUT_AUTOMATIC                 (RC_UTLUI_BEGIN +  12)
 #define IMG_VIEWLAYOUT_AUTOMATIC_ACTIVE          (RC_UTLUI_BEGIN +  13)
@@ -170,12 +162,6 @@
 #define IMG_VIEWLAYOUT_BOOKMODE_ACTIVE           (RC_UTLUI_BEGIN +  15)
 #define IMG_VIEWLAYOUT_SINGLECOLUMN              (RC_UTLUI_BEGIN +  16)
 #define IMG_VIEWLAYOUT_SINGLECOLUMN_ACTIVE       (RC_UTLUI_BEGIN +  17)
-#define IMG_VIEWLAYOUT_AUTOMATIC_HC              (RC_UTLUI_BEGIN +  18)
-#define IMG_VIEWLAYOUT_AUTOMATIC_ACTIVE_HC       (RC_UTLUI_BEGIN +  19)
-#define IMG_VIEWLAYOUT_BOOKMODE_HC               (RC_UTLUI_BEGIN +  20)
-#define IMG_VIEWLAYOUT_BOOKMODE_ACTIVE_HC        (RC_UTLUI_BEGIN +  21)
-#define IMG_VIEWLAYOUT_SINGLECOLUMN_HC           (RC_UTLUI_BEGIN +  22)
-#define IMG_VIEWLAYOUT_SINGLECOLUMN_ACTIVE_HC    (RC_UTLUI_BEGIN +  23)
 
 
 //local ids of the Database ImageLists
diff --git a/sw/source/ui/inc/workctrl.hxx b/sw/source/ui/inc/workctrl.hxx
index 364d0d3ab418..cfc02d6fec68 100644
--- a/sw/source/ui/inc/workctrl.hxx
+++ b/sw/source/ui/inc/workctrl.hxx
@@ -136,7 +136,6 @@ class SwScrollNaviPopup : public SfxPopupWindow
     FixedLine       aSeparator;
     FixedInfo       aInfoField;
     ImageList       aIList;
-    ImageList       aIListH;
 
     String          sQuickHelp[2 * NID_COUNT];
 
@@ -169,7 +168,6 @@ class SwNaviImageButton : public ImageButton
 {
         SwScrollNaviPopup*  pPopup;
         Image               aImage;
-        Image               aImageH;
         String              sQuickText;
         SfxPopupWindow*     pPopupWindow;
         SfxPopupWindow*     pFloatingWindow;
@@ -201,9 +199,7 @@ class SwHlpImageButton : public ImageButton
     virtual void    RequestHelp( const HelpEvent& rHEvt );
 
 };
-/* -----------------26.11.2002 09:25-----------------
- *
- * --------------------------------------------------*/
+
 class SwPreviewZoomControl : public SfxToolBoxControl
 {
 public:
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 7444f76e1285..c3caafaf8d88 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -191,8 +191,6 @@ class SwEntryBrowseBox : public SwEntryBrowseBox_Base
 
 protected:
     virtual sal_Bool                SeekRow( long nRow );
-//  virtual void                PaintField( OutputDevice& rDev, const awt::Rectangle& rRect,
-//                                          sal_uInt16 nColumnId ) const;
     virtual void                    PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId) const;
     virtual void                    InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol);
     virtual ::svt::CellController*  GetController(long nRow, sal_uInt16 nCol);
@@ -586,13 +584,11 @@ IMPL_LINK( SwMultiTOXTabDialog, ShowPreviewHdl, CheckBox *, pBox )
 sal_Bool SwMultiTOXTabDialog::IsNoNum(SwWrtShell& rSh, const String& rName)
 {
     SwTxtFmtColl* pColl = rSh.GetParaStyle(rName);
-    //if(pColl && pColl->GetOutlineLevel() == NO_NUMBERING)     //#outline level,zhaojianwei
     if(pColl && ! pColl->IsAssignedToListLevelOfOutlineStyle()) //<-end,zhaojianwei
         return sal_True;
 
     sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName(rName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL);
     if(nId != USHRT_MAX &&
-        //rSh.GetTxtCollFromPool(nId)->GetOutlineLevel() == NO_NUMBERING)       //#outline level,zhaojianwei
         ! rSh.GetTxtCollFromPool(nId)->IsAssignedToListLevelOfOutlineStyle())   //<-end,zhaojianwei
         return sal_True;
 
@@ -736,9 +732,6 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(Window* pParent,
 {
     FreeResource();
 
-    aLeftPB.SetModeImage( Image( SW_RES( IMG_ALL_LEFT_HC ) ), BMP_COLOR_HIGHCONTRAST );
-    aRightPB.SetModeImage( Image( SW_RES( IMG_ALL_RIGHT_HC ) ), BMP_COLOR_HIGHCONTRAST );
-
     aOk.SetClickHdl(LINK(this, SwAddStylesDlg_Impl, OkHdl));
     aLeftPB.SetClickHdl(LINK(this, SwAddStylesDlg_Impl, LeftRightHdl));
     aRightPB.SetClickHdl(LINK(this, SwAddStylesDlg_Impl, LeftRightHdl));
@@ -758,7 +751,6 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(Window* pParent,
 
     SwIndexTreeLB& rTLB = aHeaderTree.GetTreeListBox();
     rTLB.SetWindowBits(WB_CLIPCHILDREN|WB_SORT);
-    //aStylesTLB.SetSelectHdl(LINK(this, SwAddStylesDlg_Impl, SelectHdl));
     rTLB.GetModel()->SetSortMode(SortAscending);
     for(i = 0; i < MAXLEVEL; ++i)
     {
@@ -882,7 +874,6 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrS
 
     aCreateFromFL(      this, SW_RES(FL_CREATEFROM       )),
     aFromHeadingsCB(    this, SW_RES(CB_FROMHEADINGS     )),
-//   aChapterDlgPB(      this, SW_RES(PB_CHAPTERDLG      )),//#outline level,removed by zhaojianwei
     aAddStylesCB(       this, SW_RES(CB_ADDSTYLES       )),
     aAddStylesPB(       this, SW_RES(PB_ADDSTYLES       )),
 
@@ -959,7 +950,6 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrS
     aTypeLB.SetSelectHdl(LINK(this, SwTOXSelectTabPage, TOXTypeHdl));
 
     aAddStylesPB.SetClickHdl(LINK(this, SwTOXSelectTabPage, AddStylesHdl));
-    //aChapterDlgPB.SetClickHdl(LINK(this, SwTOXSelectTabPage, ChapterHdl));//#outline level,removed by zhaojianwei
 
     PopupMenu*  pMenu = aAutoMarkPB.GetPopupMenu();
     pMenu->SetActivateHdl(LINK(this, SwTOXSelectTabPage, MenuEnableHdl));
@@ -1123,7 +1113,6 @@ void    SwTOXSelectTabPage::ApplyTOXDescription()
     if(TOX_CONTENT == aCurType.eType)
     {
         aFromHeadingsCB.Check( 0 != (nCreateType & nsSwTOXElement::TOX_OUTLINELEVEL) );
-        //aChapterDlgPB.Enable(aFromHeadingsCB.IsChecked());//#outline level,removed by zhaojianwei
         aAddStylesCB.SetText(sAddStyleContent);
         aAddStylesPB.Enable(aAddStylesCB.IsChecked());
     }
@@ -1375,7 +1364,6 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl,   ListBox*, pBox)
     aAreaFL.Show( 0 != (nType & (TO_CONTENT|TO_ILLUSTRATION|TO_USER|TO_INDEX|TO_TABLE|TO_OBJECT)) );
 
     aFromHeadingsCB.Show( 0 != (nType & (TO_CONTENT)) );
-   // aChapterDlgPB.Show( 0 != (nType & (TO_CONTENT)) );//#outline level,removed by zhaojianwei
     aAddStylesCB.Show( 0 != (nType & (TO_CONTENT|TO_USER)) );
     aAddStylesPB.Show( 0 != (nType & (TO_CONTENT|TO_USER)) );
 
@@ -1407,13 +1395,6 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl,   ListBox*, pBox)
     aSortAlgorithmFT.Show(bEnableSortLanguage);
     aSortAlgorithmLB.Show(bEnableSortLanguage);
 
-    //if(nType & TO_CONTENT)            //#outline level,removed by zhaojianwei
-    //{
-         //Point aPos(aAddStylesPB.GetPosPixel());
-        //aPos.X() = aChapterDlgPB.GetPosPixel().X();
-        //aAddStylesPB.SetPosPixel(aPos);
-    //}
-    //else if( nType & TO_ILLUSTRATION )//<-removed end.
     if( nType & TO_ILLUSTRATION )       //add by zhaojianwei
         aCaptionSequenceLB.SelectEntry( SwStyleNameMapper::GetUIName(
                                     RES_POOLCOLL_LABEL_ABB, aEmptyStr ));
@@ -1425,7 +1406,6 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl,   ListBox*, pBox)
         aAddStylesCB.SetText(sAddStyleUser);
         // move left!
          Point aPos(aAddStylesPB.GetPosPixel());
-    //  aPos.X() = aChapterDlgPB.GetPosPixel().X();
         aPos.X() -= 2 * aAddStylesPB.GetSizePixel().Width();
         aAddStylesPB.SetPosPixel(aPos);
     }
@@ -1438,8 +1418,6 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl,   ListBox*, pBox)
     aKeyAsEntryCB.Show( 0 != (nType & TO_INDEX) );
     aFromFileCB.Show( 0 != (nType & TO_INDEX) );
     aAutoMarkPB.Show( 0 != (nType & TO_INDEX) );
-//  aCreateAutoMarkPB.Show(nType &TO_INDEX);
-//  aEditAutoMarkPB.Show(nType & TO_INDEX);
 
     aIdxOptionsFL.Show( 0 != (nType & TO_INDEX) );
 
@@ -1485,7 +1463,6 @@ IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl,  CheckBox*, pBox )
             pBox->Check(sal_True);
         }
         aAddStylesPB.Enable(aAddStylesCB.IsChecked());
-        //aChapterDlgPB.Enable(aFromHeadingsCB.IsChecked());//#outline level,removed by zhaojianwei
     }
     if(TOX_USER == aCurType.eType)
     {
@@ -1563,45 +1540,6 @@ IMPL_LINK(SwTOXSelectTabPage, TOXAreaHdl,   ListBox*, pBox)
     return 0;
 }
 
-//#outline level, removed by zhaojianwei
-//It is no longer used!
-///* -----------------14.06.99 13:10-------------------
-//
-// --------------------------------------------------*/
-//IMPL_LINK(SwTOXSelectTabPage, ChapterHdl,     PushButton*, pButton)
-//{
-//  SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
-//  SwWrtShell& rSh = pTOXDlg->GetWrtShell();
-//
-//  SfxItemSet aTmp(rSh.GetView().GetPool(), FN_PARAM_1, FN_PARAM_1);
-//  SwOutlineTabDialog* pDlg = new SwOutlineTabDialog(pButton, &aTmp, rSh);
-//
-//  if(RET_OK == pDlg->Execute())
-//  {
-//      CurTOXType aCurType = pTOXDlg->GetCurrentTOXType();
-//      SwForm* pForm = ((SwMultiTOXTabDialog*)GetTabDialog())->GetForm(aCurType);
-//      // jetzt muss ueberprueft werden, ob dem sdbcx::Index Ueberschriftenvorlagen
-//      // zugewiesen wurden
-//      String sStr;
-//      for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
-//      {
-//          sal_Bool bNum = !SwMultiTOXTabDialog::IsNoNum(rSh, pForm->GetTemplate( i + 1 ));
-//          if(bNum)
-//          {
-//              //es gibt getrennte Resourcebereiche fuer die Inhaltsverzeichnisse
-//              if(i < 5)
-//                    SwStyleNameMapper::FillUIName( static_cast< sal_uInt16 >(RES_POOLCOLL_TOX_CNTNT1 + i), sStr );
-//              else
-//                    SwStyleNameMapper::FillUIName( static_cast< sal_uInt16 >(RES_POOLCOLL_TOX_CNTNT6 + i - 5), sStr );
-//              pForm->SetTemplate( i + 1, sStr );
-//          }
-//      }
-//
-//  }
-//  delete pDlg;
-//  return 0;
-//}
-
 IMPL_LINK(SwTOXSelectTabPage, AddStylesHdl, PushButton*, pButton)
 {
     SwAddStylesDlg_Impl* pDlg = new SwAddStylesDlg_Impl(pButton,
@@ -1975,15 +1913,6 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet
     m_pCurrentForm(0),
     bInLevelHdl(sal_False)
 {
-    Image aSortUpHC(SW_RES(IMG_SORTUP_HC ));
-    aFirstSortUpRB.SetModeRadioImage(aSortUpHC,BMP_COLOR_HIGHCONTRAST);
-    aSecondSortUpRB.SetModeRadioImage(aSortUpHC,BMP_COLOR_HIGHCONTRAST);
-    aThirdSortUpRB.SetModeRadioImage(aSortUpHC,BMP_COLOR_HIGHCONTRAST);
-
-    Image aSortDownHC(SW_RES(IMG_SORTDOWN_HC ));
-    aFirstSortDownRB.SetModeRadioImage(aSortDownHC,BMP_COLOR_HIGHCONTRAST);
-    aSecondSortDownRB.SetModeRadioImage(aSortDownHC,BMP_COLOR_HIGHCONTRAST);
-    aThirdSortDownRB.SetModeRadioImage(aSortDownHC,BMP_COLOR_HIGHCONTRAST);
     FreeResource();
 
     sLevelStr = aLevelFT.GetText();
@@ -1996,7 +1925,6 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet
 
     aLastTOXType.eType = (TOXTypes)USHRT_MAX;
     aLastTOXType.nIndex = 0;
-    //aLevelGBSize = aLevelGB.GetSizePixel();
     aLevelFLSize = aLevelFT.GetSizePixel();
 
     SetExchangeSupport();
@@ -2052,7 +1980,7 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet
         (aRelToStyleIdxPos.Y() - aAlphaDelimCB.GetPosPixel().Y());
     aEditStylePB.Enable(sal_False);
 
-//get position for Numbering and other stuff
+    //get position for Numbering and other stuff
     aChapterEntryFTPosition = aChapterEntryFT.GetPosPixel();
     aEntryOutlineLevelFTPosition = aEntryOutlineLevelFT.GetPosPixel();
     nBiasToEntryPoint = aEntryOutlineLevelNF.GetPosPixel().X() -
@@ -2241,13 +2169,11 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/)
 
         if(nDiff)
         {
-//          lcl_ChgWidth(aLevelFL, nDiff);
             lcl_ChgWidth(aLevelFT, nDiff);
             lcl_ChgWidth(aLevelLB, nDiff);
             lcl_ChgXPos(aCharStyleFT, nDiff);
             lcl_ChgXPos(aCharStyleLB, nDiff);
             lcl_ChgWidth(aCharStyleLB, -nDiff);
-    //          lcl_ChgXPos(aEditStylePB, -nDiff);
             lcl_ChgXPos(aFillCharFT,  nDiff);
             lcl_ChgXPos(aFillCharCB,  nDiff);
             lcl_ChgXPos(aTabPosFT,   nDiff);
@@ -2330,8 +2256,6 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/)
         aRelToStyleCB.SetPosPixel( bToxIsIndex ? aRelToStyleIdxPos
                                                : aRelToStylePos );
 
-//      aRecalcTabCB.Show(  aCurType.eType == TOX_CONTENT);
-
         aMainEntryStyleFT.Show( bToxIsIndex );
         aMainEntryStyleLB.Show( bToxIsIndex );
         aAlphaDelimCB.Show(     bToxIsIndex );
@@ -2607,7 +2531,6 @@ IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken*, pToken)
         aCharStyleLB.SelectEntry(pToken->sCharStyleName);
     else
         aCharStyleLB.SelectEntry(sNoCharStyle);
-    //StyleSelectHdl(&aCharStyleLB);
 
     String sEntry = aCharStyleLB.GetSelectEntry();
     aEditStylePB.Enable(sEntry != sNoCharStyle);
@@ -2632,13 +2555,6 @@ IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken*, pToken)
         }
 //<---
 //i53420
-//move into position the fixed text
-//         aEntryOutlineLevelFT.SetPosPixel( aEntryOutlineLevelFTPosition );
-// // then the entry
-//         Point aPoint;
-//         aPoint.Y() = aEntryOutlineLevelFTPosition.Y();
-//         aPoint.X() = aEntryOutlineLevelFTPosition.X() + nBiasToEntryPoint;
-//         aEntryOutlineLevelNF.SetPosPixel( aPoint );
 
         aEntryOutlineLevelNF.SetValue(pToken->nOutlineLevel);
     }
@@ -2646,14 +2562,6 @@ IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken*, pToken)
 //i53420
     if(pToken->eTokenType == TOKEN_ENTRY_NO)
     {
-//move into position the fixed text
-//        aEntryOutlineLevelFT.SetPosPixel( aChapterEntryFTPosition );
-// // then the entry
-//         Point aPoint;
-//         aPoint.Y() = aChapterEntryFTPosition.Y();
-//         aPoint.X() = aChapterEntryFTPosition.X() + nBiasToEntryPoint;
-//         aEntryOutlineLevelNF.SetPosPixel( aPoint );
-
         aEntryOutlineLevelNF.SetValue(pToken->nOutlineLevel);
         sal_uInt16 nFormat = 0;
         if( pToken->nChapterFormat == CF_NUM_NOPREPST_TITLE )
@@ -2925,8 +2833,6 @@ SwTokenWindow::SwTokenWindow(SwTOXEntryTabPage* pParent, const ResId& rResId) :
 
 SwTokenWindow::~SwTokenWindow()
 {
-//  for(sal_uInt16 i = GetItemCount(); i ; i--)
-//      RemoveItem(i - 1);
 
     for( sal_uInt32 n = 0; n < aControlList.Count(); ++n )
     {
@@ -3080,8 +2986,6 @@ Control*    SwTokenWindow::InsertItem(const String& rText, const SwFormToken& rT
         aControlList.Insert(pButton, aControlList.Count());
          Size aEditSize(aControlSize);
         aEditSize.Width() = pButton->GetTextWidth(rText) + 5;
-//        pButton->SetControlBackground(aCtrlColor);
-//        pButton->SetControlForeground(aTextColor);
         pButton->SetSizePixel(aEditSize);
         pButton->SetPrevNextLink(LINK(this, SwTokenWindow, NextItemBtnHdl));
         pButton->SetGetFocusHdl(LINK(this, SwTokenWindow, TbxFocusBtnHdl));
@@ -3525,8 +3429,6 @@ BOOL SwTokenWindow::CreateQuickHelp(Control* pCtrl,
      Rectangle aItemRect( aPos, pCtrl->GetSizePixel() );
         if(rToken.eTokenType == TOKEN_TAB_STOP )
         {
-//          sEntry += '\n';
-//          sEntry += rToken.nTabStopPosition;
         }
         else
         {
@@ -3679,8 +3581,6 @@ SwTOXStylesTabPage::SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrS
     FreeResource();
     SetExchangeSupport( sal_True );
 
-    aAssignBT.SetModeImage( Image( SW_RES( IMG_ONE_LEFT_HC ) ), BMP_COLOR_HIGHCONTRAST );
-
     aEditStyleBT.SetClickHdl   (LINK(   this, SwTOXStylesTabPage, EditStyleHdl));
     aAssignBT.SetClickHdl      (LINK(   this, SwTOXStylesTabPage, AssignHdl));
     aStdBT.SetClickHdl         (LINK(   this, SwTOXStylesTabPage, StdHdl));
@@ -3789,13 +3689,12 @@ IMPL_LINK( SwTOXStylesTabPage, EditStyleHdl, Button *, pBtn )
     {
         SfxStringItem aStyle(SID_STYLE_EDIT, aParaLayLB.GetSelectEntry());
         SfxUInt16Item aFamily(SID_STYLE_FAMILY, SFX_STYLE_FAMILY_PARA);
-//      SwPtrItem aShell(FN_PARAM_WRTSHELL, pWrtShell);
         Window* pDefDlgParent = Application::GetDefDialogParent();
         Application::SetDefDialogParent( pBtn );
         SwWrtShell& rSh = ((SwMultiTOXTabDialog*)GetTabDialog())->GetWrtShell();
         rSh.GetView().GetViewFrame()->GetDispatcher()->Execute(
         SID_STYLE_EDIT, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_MODAL,
-            &aStyle, &aFamily/*, &aShell*/, 0L);
+            &aStyle, &aFamily, 0L);
         Application::SetDefDialogParent( pDefDlgParent );
     }
     return 0;
@@ -3864,7 +3763,6 @@ IMPL_LINK_INLINE_END( SwTOXStylesTabPage, DoubleClickHdl, Button *, EMPTYARG )
  --------------------------------------------------------------------*/
 IMPL_LINK( SwTOXStylesTabPage, EnableSelectHdl, ListBox *, EMPTYARG )
 {
-    //UpdatePattern();
     aStdBT.Enable(aLevelLB.GetSelectEntryPos()  != LISTBOX_ENTRY_NOTFOUND);
 
     SwWrtShell& rSh = ((SwMultiTOXTabDialog*)GetTabDialog())->GetWrtShell();
diff --git a/sw/source/ui/index/cnttab.hrc b/sw/source/ui/index/cnttab.hrc
index c544be2c7a2e..d1eed8cefad1 100644
--- a/sw/source/ui/index/cnttab.hrc
+++ b/sw/source/ui/index/cnttab.hrc
@@ -222,8 +222,6 @@
 #define LB_LANGUAGE             146
 #define FT_SORTALG              147
 #define LB_SORTALG              148
-#define IMG_SORTUP_HC           149
-#define IMG_SORTDOWN_HC         150
 #define ST_NO_BRACKET           151
 
 #define FT_LEVEL_OL             152
diff --git a/sw/source/ui/index/cnttab.src b/sw/source/ui/index/cnttab.src
index 68f008b8d5ff..377c07020268 100644
--- a/sw/source/ui/index/cnttab.src
+++ b/sw/source/ui/index/cnttab.src
@@ -907,16 +907,6 @@ TabPage TP_TOX_ENTRY
         Border = TRUE;
         DropDown = TRUE;
     };
-    Image IMG_SORTUP_HC
-    {
-        ImageBitmap = Bitmap{File = "sch10712.bmp"; };
-        MaskColor = IMAGE_MASK_COLOR ;
-    };
-    Image IMG_SORTDOWN_HC
-    {
-        ImageBitmap = Bitmap{File = "sch10713.bmp"; };
-        MaskColor = IMAGE_MASK_COLOR ;
-    };
     ImageRadioButton RB_SORTUP1
     {
         Pos = MAP_APPFONT ( 222 , 138 ) ;
diff --git a/sw/source/ui/index/makefile.mk b/sw/source/ui/index/makefile.mk
index 647b579e531b..a42f98122b55 100644
--- a/sw/source/ui/index/makefile.mk
+++ b/sw/source/ui/index/makefile.mk
@@ -46,16 +46,15 @@ SRC1FILES =  \
 
 EXCEPTIONSFILES =  \
         $(SLO)$/cnttab.obj \
-        $(SLO)$/cntex.obj
-
-SLOFILES =  \
-        $(SLO)$/cnttab.obj \
         $(SLO)$/cntex.obj \
         $(SLO)$/idxmrk.obj \
-        $(SLO)$/swuiidxmrk.obj \
         $(SLO)$/multmrk.obj \
+        $(SLO)$/swuiidxmrk.obj \
         $(SLO)$/toxmgr.obj
 
+SLOFILES =  \
+        $(EXCEPTIONSFILES)
+
 LIB1TARGET= $(SLB)$/$(TARGET).lib
 
 LIB1OBJFILES = \
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index a49272f481bf..4564384a3f0a 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -198,7 +198,6 @@ SwIndexMarkDlg::SwIndexMarkDlg(Window *pParent,
     aPrevSameBT.SetClickHdl(LINK(this,SwIndexMarkDlg,   PrevSameHdl));
     aNextBT.SetClickHdl(LINK(this,SwIndexMarkDlg,       NextHdl));
     aNextSameBT.SetClickHdl(LINK(this,SwIndexMarkDlg,   NextSameHdl));
-    //aTypeDCB.SetModifyHdl(LINK(this,SwIndexMarkDlg,   ModifyHdl));
     aTypeDCB.SetSelectHdl(LINK(this,SwIndexMarkDlg,     ModifyHdl));
     aKeyDCB.SetModifyHdl(LINK(this,SwIndexMarkDlg,      KeyDCBModifyHdl));
     aKey2DCB.SetModifyHdl(LINK(this,SwIndexMarkDlg,     KeyDCBModifyHdl));
@@ -214,16 +213,8 @@ SwIndexMarkDlg::SwIndexMarkDlg(Window *pParent,
     if(bNewMark)
     {
         aDelBT.Hide();
-
-        {
-            ImageList aTempList( SW_RES( IMG_NAVI_ENTRYBMPH ) );
-            aNewBT.SetModeImage( aTempList.GetImage( SID_SW_START + CONTENT_TYPE_INDEX ), BMP_COLOR_HIGHCONTRAST );
-        }
-
-        {
-            ImageList aTempList( SW_RES( IMG_NAVI_ENTRYBMP ) );
-            aNewBT.SetModeImage( aTempList.GetImage( SID_SW_START + CONTENT_TYPE_INDEX ), BMP_COLOR_NORMAL );
-        }
+        ImageList aTempList( SW_RES( IMG_NAVI_ENTRYBMP ) );
+        aNewBT.SetModeImage( aTempList.GetImage( SID_SW_START + CONTENT_TYPE_INDEX ) );
     }
     else
     {
@@ -394,7 +385,6 @@ void    SwIndexMarkDlg::UpdateLanguageDependenciesForPhoneticReading()
         {
             case SCRIPTTYPE_ASIAN: nWhich = RES_CHRATR_CJK_LANGUAGE; break;
             case SCRIPTTYPE_COMPLEX:nWhich = RES_CHRATR_CTL_LANGUAGE; break;
-            //case SCRIPTTYPE_LATIN:
             default:nWhich = RES_CHRATR_LANGUAGE; break;
         }
         SfxItemSet aLangSet(pSh->GetAttrPool(), nWhich, nWhich);
@@ -402,13 +392,6 @@ void    SwIndexMarkDlg::UpdateLanguageDependenciesForPhoneticReading()
         nLangForPhoneticReading = ((const SvxLanguageItem&)aLangSet.Get(nWhich)).GetLanguage();
     }
 
-    /*
-    //enable phonetic reading dependent on the current language
-    {
-        lang::Locale aLocale( SvxCreateLocale( LanguageType( nLangForPhoneticReading ) ) );
-        bIsPhoneticReadingEnabled = xExtendedIndexEntrySupplier->usePhoneticEntry( aLocale );
-    }
-    */
 }
 
 String  SwIndexMarkDlg::GetDefaultPhoneticReading( const String& rText )
@@ -1726,7 +1709,6 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent,
     long nHeightDiff = - aFLSz.Height();
     aFLSz.Height() = aTL1.Y();
     nHeightDiff += aFLSz.Height();
-//    aEntriesFL.SetSizePixel(aFLSz);
     Size aDlgSize(GetSizePixel());
     aDlgSize.Height() += nHeightDiff;
     SetSizePixel(aDlgSize);
diff --git a/sw/source/ui/index/toxmgr.cxx b/sw/source/ui/index/toxmgr.cxx
index 642bdad7e5a2..ad6f70beca5c 100644
--- a/sw/source/ui/index/toxmgr.cxx
+++ b/sw/source/ui/index/toxmgr.cxx
@@ -400,7 +400,6 @@ BOOL SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc,
                     pSh->DelRight();
                 pNewTOX = (SwTOXBase*)pCurTOX;
             }
-//          pTOX->SetOptions(rDesc.GetIndexOptions());
             pNewTOX->SetFromObjectNames(rDesc.IsCreateFromObjectNames());
             pNewTOX->SetOLEOptions(rDesc.GetOLEOptions());
         }
diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx
index 887405d2c5fb..3b843bc5191c 100644
--- a/sw/source/ui/lingu/hhcwrp.cxx
+++ b/sw/source/ui/lingu/hhcwrp.cxx
@@ -189,11 +189,6 @@ SwHHCWrapper::~SwHHCWrapper()
         }
 
     }
-
-/*
-    if( bInfoBox )
-        InfoBox(&pView->GetEditWin(), String(SW_RES(STR_SPELL_OK)) ).Execute();
-*/
 }
 
 
@@ -502,9 +497,7 @@ void SwHHCWrapper::ReplaceUnit(
 
         pRuby->SetPosition( bRubyBelow );
         pRuby->SetAdjustment( RubyAdjust_CENTER );
-        //!! the following seem not to be needed
-        //pRuby->SetCharFmtName( const String& rNm );
-        //pRuby->SetCharFmtId( USHORT nNew );
+
 #ifdef DEBUG
         SwPaM *pPaM = rWrtShell.GetCrsr();
         (void)pPaM;
@@ -543,8 +536,6 @@ void SwHHCWrapper::ReplaceUnit(
             SfxItemSet aSet( rWrtShell.GetAttrPool(), aRanges );
             if (pNewUnitLanguage)
             {
-                //OSL_ENSURE(!IsSimilarChinese( *pNewUnitLanguage, nOldLang ),
-                //      "similar language should not be changed!");
                 aSet.Put( SvxLanguageItem( *pNewUnitLanguage, RES_CHRATR_CJK_LANGUAGE ) );
             }
 
@@ -695,7 +686,6 @@ sal_Bool SwHHCWrapper::ConvNext_impl( )
         return sal_False;
     }
 
-    //ResMgr* pMgr = DIALOG_MGR();
     sal_Bool bGoOn = sal_False;
 
     if ( bIsOtherCntnt )
@@ -717,29 +707,9 @@ sal_Bool SwHHCWrapper::ConvNext_impl( )
     }
     else
     {
-        // Ein BODY_Bereich erledigt, Frage nach dem anderen BODY_Bereich
-/*
-        //pWin->LeaveWait();
-
-        sal_uInt16 nResId = RID_SVXQB_CONTINUE;
-        QueryBox aBox( pWin, ResId( nResId, pMgr ) );
-        if ( aBox.Execute() != RET_YES )
-        {
-            // Verzicht auf den anderen Bereich, ggf. Frage nach Sonderbereich
-            //pWin->EnterWait();
-            bStartDone = bEndDone = sal_True;
-            return SpellNext();
-        }
-        else
-        {
-*/
             bStartChk = !bStartDone;
             ConvStart_impl( pConvArgs, bStartChk ? SVX_SPELL_BODY_START : SVX_SPELL_BODY_END );
             bGoOn = sal_True;
-/*
-        }
-        pWin->EnterWait();
-*/
     }
     return bGoOn;
 }
@@ -749,8 +719,6 @@ sal_Bool SwHHCWrapper::FindConvText_impl()
 {
     //! modified version of SvxSpellWrapper::FindSpellError
 
-    //ShowLanguageErrors();
-
     sal_Bool bFound = sal_False;
 
     pWin->EnterWait();
@@ -790,20 +758,17 @@ void SwHHCWrapper::ConvStart_impl( SwConversionArgs /* [out] */ *pConversionArgs
 void SwHHCWrapper::ConvEnd_impl( SwConversionArgs *pConversionArgs )
 {
     pView->SpellEnd( pConversionArgs );
-    //ShowLanguageErrors();
 }
 
 
 sal_Bool SwHHCWrapper::ConvContinue_impl( SwConversionArgs *pConversionArgs )
 {
     sal_Bool bProgress = !bIsDrawObj && !bIsSelection;
-//    bLastRet = aConvText.getLength() == 0;
     pConversionArgs->aConvText = OUString();
     pConversionArgs->nConvTextLang = LANGUAGE_NONE;
     uno::Any  aRet = bProgress ?
         pView->GetWrtShell().SpellContinue( &nPageCount, &nPageStart, pConversionArgs ) :
         pView->GetWrtShell().SpellContinue( &nPageCount, NULL, pConversionArgs );
-    //aRet >>= aConvText;
     return pConversionArgs->aConvText.getLength() != 0;
 }
 
diff --git a/sw/source/ui/lingu/makefile.mk b/sw/source/ui/lingu/makefile.mk
index 617910a61060..0abd0c319ab1 100644
--- a/sw/source/ui/lingu/makefile.mk
+++ b/sw/source/ui/lingu/makefile.mk
@@ -38,13 +38,13 @@ TARGET=lingu
 # --- Files --------------------------------------------------------
 
 EXCEPTIONSFILES= \
+        $(SLO)$/hhcwrp.obj \
+        $(SLO)$/hyp.obj \
         $(SLO)$/olmenu.obj \
+        $(SLO)$/sdrhhcwrap.obj
 
 SLOFILES =  \
-        $(SLO)$/hyp.obj \
-        $(SLO)$/olmenu.obj \
-        $(SLO)$/sdrhhcwrap.obj \
-        $(SLO)$/hhcwrp.obj 
+        $(EXCEPTIONSFILES)
 
 SRS1NAME=$(TARGET)
 SRC1FILES =  \
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index 65f7abf985fe..29b39f3e1aa1 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -334,9 +334,8 @@ static Image lcl_GetImageFromPngUrl( const OUString &rFileUrl )
     Image aRes;
     OUString aTmp;
     osl::FileBase::getSystemPathFromFileURL( rFileUrl, aTmp );
-//    ::rtl::OString aPath = OString( aTmp.getStr(), aTmp.getLength(), osl_getThreadTextEncoding() );
 #if defined(WNT)
-//    aTmp = lcl_Win_GetShortPathName( aTmp );
+
 #endif
     Graphic aGraphic;
     const String aFilterName( RTL_CONSTASCII_USTRINGPARAM( IMP_PNG ) );
@@ -392,15 +391,14 @@ OUString RetrieveLabelFromCommand( const OUString& aCmdURL )
 SwSpellPopup::SwSpellPopup(
         SwWrtShell* pWrtSh,
         const uno::Reference< linguistic2::XSpellAlternatives >  &xAlt,
-        const String &rParaText ) :
-PopupMenu( SW_RES(MN_SPELL_POPUP) ),
-pSh( pWrtSh ),
-xSpellAlt(xAlt),
-bGrammarResults(false)
+        const String &rParaText
+)   : PopupMenu( SW_RES(MN_SPELL_POPUP) )
+    , pSh( pWrtSh )
+    , xSpellAlt(xAlt)
+    , bGrammarResults(false)
 {
     OSL_ENSURE(xSpellAlt.is(), "no spelling alternatives available");
 
-//    CreateAutoMnemonics();
     SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS);
 
     nCheckedLanguage = LANGUAGE_NONE;
@@ -412,7 +410,6 @@ bGrammarResults(false)
     sal_Int16 nStringCount = static_cast< sal_Int16 >( aSuggestions.getLength() );
 
     SvtLinguConfig aCfg;
-    const bool bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
 
     PopupMenu *pMenu = GetPopupMenu(MN_AUTOCORR);
     pMenu->SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS);
@@ -424,7 +421,7 @@ bGrammarResults(false)
         uno::Reference< container::XNamed > xNamed( xSpellAlt, uno::UNO_QUERY );
         if (xNamed.is())
         {
-            aSuggestionImageUrl = aCfg.GetSpellAndGrammarContextSuggestionImage( xNamed->getName(), bHC );
+            aSuggestionImageUrl = aCfg.GetSpellAndGrammarContextSuggestionImage( xNamed->getName() );
             aImage = Image( lcl_GetImageFromPngUrl( aSuggestionImageUrl ) );
         }
 
@@ -475,7 +472,6 @@ bGrammarResults(false)
     }
 
     pMenu = GetPopupMenu(MN_ADD_TO_DIC);
-//    pMenu->CreateAutoMnemonics();
     pMenu->SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS);     //! necessary to retrieve the correct dictionary name in 'Execute' below
     bEnable = FALSE;    // enable MN_ADD_TO_DIC?
     uno::Reference< linguistic2::XDictionaryList >    xDicList( SvxGetDictionaryList() );
@@ -515,7 +511,7 @@ bGrammarResults(false)
                 if (xSvcInfo.is())
                 {
                     OUString aDictionaryImageUrl( aCfg.GetSpellAndGrammarContextDictionaryImage(
-                            xSvcInfo->getImplementationName(), bHC) );
+                            xSvcInfo->getImplementationName() ) );
                     if (aDictionaryImageUrl.getLength() > 0)
                     {
                         Image aImage( lcl_GetImageFromPngUrl( aDictionaryImageUrl ) );
@@ -563,15 +559,10 @@ bGrammarResults(false)
     pMenu = GetPopupMenu(MN_SET_LANGUAGE_PARAGRAPH);
     fillLangPopupMenu( pMenu, MN_SET_LANGUAGE_PARAGRAPH_START, aSeq, pWrtSh, aLangTable_Paragraph );
     EnableItem( MN_SET_LANGUAGE_PARAGRAPH, true );
-/*
-    pMenu = GetPopupMenu(MN_SET_LANGUAGE_ALL_TEXT);
-    fillLangPopupMenu( pMenu, MN_SET_LANGUAGE_ALL_TEXT_START, aSeq, pWrtSh, aLangTable_Document );
-    EnableItem( MN_SET_LANGUAGE_ALL_TEXT, true );
-*/
+
     uno::Reference< frame::XFrame > xFrame = pWrtSh->GetView().GetViewFrame()->GetFrame().GetFrameInterface();
     Image rImg = ::GetImage( xFrame,
-            OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SpellingAndGrammarDialog")), sal_False,
-            Application::GetSettings().GetStyleSettings().GetHighContrastMode() );
+            OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SpellingAndGrammarDialog")), sal_False );
     SetItemImage( MN_SPELLING_DLG, rImg );
 
     //////////////////////////////////////////////////////////////////////////////////
@@ -603,7 +594,6 @@ aInfo16( SW_RES(IMG_INFO_16) )
     InsertItem( MN_SHORT_COMMENT, aMessageText, MIB_NOSELECT, nPos++ );
     SetItemImage( MN_SHORT_COMMENT, aInfo16 );
 
-//    CreateAutoMnemonics();
     SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS);
 
     InsertSeparator( nPos++ );
@@ -647,7 +637,6 @@ aInfo16( SW_RES(IMG_INFO_16) )
     nGuessLangPara = LANGUAGE_NONE;
     if (xLG.is())
     {
-//        nGuessLangWord = lcl_CheckLanguage( xSpellAlt->getWord(), ::GetSpellChecker(), xLG, sal_False );
         nGuessLangPara = lcl_CheckLanguage( rParaText, ::GetSpellChecker(), xLG, sal_True );
     }
     if (nGuessLangWord != LANGUAGE_NONE || nGuessLangPara != LANGUAGE_NONE)
@@ -696,15 +685,10 @@ aInfo16( SW_RES(IMG_INFO_16) )
     pMenu = GetPopupMenu(MN_SET_LANGUAGE_PARAGRAPH);
     fillLangPopupMenu( pMenu, MN_SET_LANGUAGE_PARAGRAPH_START, aSeq, pWrtSh, aLangTable_Paragraph );
     EnableItem( MN_SET_LANGUAGE_PARAGRAPH, true );
-/*
-    pMenu = GetPopupMenu(MN_SET_LANGUAGE_ALL_TEXT);
-    fillLangPopupMenu( pMenu, MN_SET_LANGUAGE_ALL_TEXT_START, aSeq, pWrtSh, aLangTable_Document );
-    EnableItem( MN_SET_LANGUAGE_ALL_TEXT, true );
-*/
+
     uno::Reference< frame::XFrame > xFrame = pWrtSh->GetView().GetViewFrame()->GetFrame().GetFrameInterface();
     Image rImg = ::GetImage( xFrame,
-            OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SpellingAndGrammarDialog")), sal_False,
-            Application::GetSettings().GetStyleSettings().GetHighContrastMode() );
+            OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SpellingAndGrammarDialog")), sal_False );
     SetItemImage( MN_SPELLING_DLG, rImg );
 
     //////////////////////////////////////////////////////////////////////////////////
@@ -717,14 +701,11 @@ aInfo16( SW_RES(IMG_INFO_16) )
 ---------------------------------------------------------------------------*/
 sal_uInt16  SwSpellPopup::Execute( const Rectangle& rWordPos, Window* pWin )
 {
-//    SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS);
     sal_uInt16 nRet = PopupMenu::Execute(pWin, pWin->LogicToPixel(rWordPos));
     Execute( nRet );
     return nRet;
 }
-/*-- 19.01.2006 08:15:48---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SwSpellPopup::Execute( USHORT nId )
 {
     if (nId == USHRT_MAX)
@@ -825,7 +806,6 @@ void SwSpellPopup::Execute( USHORT nId )
     else if (MN_DICTIONARIES_START <= nId && nId <= MN_DICTIONARIES_END)
     {
             OUString aWord( xSpellAlt->getWord() );
-//            OSL_ENSURE( nDicIdx < aDics.getLength(), "dictionary index out of range" );
 
             PopupMenu *pMenu = GetPopupMenu(MN_ADD_TO_DIC);
             String aDicName ( pMenu->GetItemText(nId) );
diff --git a/sw/source/ui/lingu/sdrhhcwrap.cxx b/sw/source/ui/lingu/sdrhhcwrap.cxx
index a724f4d5cff4..2e910d09e329 100644
--- a/sw/source/ui/lingu/sdrhhcwrap.cxx
+++ b/sw/source/ui/lingu/sdrhhcwrap.cxx
@@ -110,9 +110,6 @@ SdrHHCWrapper::~SdrHHCWrapper()
         pSdrView->SdrEndTextEdit( sal_True );
         SetUpdateMode(sal_False);
         pOutlView->SetOutputArea( Rectangle( Point(), Size(1, 1) ) );
-//      SetPaperSize( Size(1, 1) );
-//      SetText(NULL);
-//      pTextObj = NULL;
     }
     RemoveView( pOutlView );
     delete pOutlView;
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index d70f0a99d308..9cbdd38f7d3a 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -96,7 +96,6 @@ IMPL_LINK( SwInsertBookmarkDlg, DeleteHdl, Button *, EMPTYARG )
 
     aBookmarkBox.SetText(aEmptyStr);
     aDeleteBtn.Enable(FALSE);   // keine weiteren Eintraege vorhanden
-    // aBookmarkBox.SetText(aEmptyStr);
 
     aOkBtn.Enable();            // Im OK Handler wird geloescht
     return 0;
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 796c9cafdec5..8f06c31e709a 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -189,7 +189,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet& )
             aPageTemplLbl.Enable(FALSE);
             aPageTemplBox.Enable(FALSE);
         }
-        else // if ( rInf.ePos == FTNPOS_CHAPTER )
+        else
         {
             aPosChapterBox.Check();
             aNumCountBox.RemoveEntry(aNumPage);
@@ -315,9 +315,6 @@ int SwEndNoteOptionPage::GetNumbering() const
     return (int) bPosDoc? nPos + 1: nPos;
 }
 
-/*-----------------09.02.98 11:17-------------------
-
---------------------------------------------------*/
 void SwEndNoteOptionPage::SetShell( SwWrtShell &rShell )
 {
     pSh = &rShell;
@@ -355,11 +352,6 @@ IMPL_LINK( SwEndNoteOptionPage, PosPageHdl, Button *, EMPTYARG )
     return 0;
 }
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
-
 IMPL_LINK( SwEndNoteOptionPage, NumCountHdl, ListBox*, EMPTYARG )
 {
     BOOL bEnable = TRUE;
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index dfbb2b383a90..54cbd6a80ebf 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -134,7 +134,6 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent,
         pData->sGroupName = sGroup;
         pData->sGroupTitle = sTitle;
         String sTemp(sTitle);
-        //sGroup.GetToken(0, GLOS_DELIM)
         sTemp += '\t';
         pData->sPath = aPathLB.GetEntry((USHORT)sGroup.GetToken(1, GLOS_DELIM).ToInt32());
         sTemp += pData->sPath;
@@ -265,7 +264,6 @@ IMPL_LINK( SwGlossaryGroupDlg, SelectHdl, SvTabListBox*, EMPTYARG  )
 IMPL_LINK( SwGlossaryGroupDlg, NewHdl, Button*, EMPTYARG )
 {
     String sGroup(aNameED.GetText());
-//  sGroup.ToLower();
     sGroup += GLOS_DELIM;
     sGroup += String::CreateFromInt32(aPathLB.GetSelectEntryPos());
     OSL_ENSURE(!pGlosHdl->FindGroupName(sGroup), "group already available!");
@@ -273,7 +271,6 @@ IMPL_LINK( SwGlossaryGroupDlg, NewHdl, Button*, EMPTYARG )
         pInsertedArr = new SvStrings;
     pInsertedArr->Insert(new String(sGroup), pInsertedArr->Count());
     String sTemp(aNameED.GetText());
-//  sTemp.ToLower();
     sTemp += '\t';
     sTemp += aPathLB.GetSelectEntry();
     SvLBoxEntry* pEntry = aGroupTLB.InsertEntry(sTemp);
@@ -399,7 +396,6 @@ IMPL_LINK( SwGlossaryGroupDlg, RenameHdl, Button *, EMPTYARG )
     delete (GlosBibUserData*)pEntry->GetUserData();
     aGroupTLB.GetModel()->Remove(pEntry);
     String sTemp(aNameED.GetText());
-//  sTemp.ToLower();
     sTemp += '\t';
     sTemp += aPathLB.GetSelectEntry();
     pEntry = aGroupTLB.InsertEntry(sTemp);
@@ -417,7 +413,6 @@ IMPL_LINK( SwGlossaryGroupDlg, RenameHdl, Button *, EMPTYARG )
 IMPL_LINK( SwGlossaryGroupDlg, ModifyHdl, Edit*, EMPTYARG )
 {
     String sEntry(aNameED.GetText());
-//  sEntry.ToLower();
     BOOL bEnableNew = TRUE;
     BOOL bEnableDel = FALSE;
     ULONG nCaseReadonly =
@@ -462,11 +457,6 @@ IMPL_LINK( SwGlossaryGroupDlg, ModifyHdl, Edit*, EMPTYARG )
     {
         GlosBibUserData* pUserData = (GlosBibUserData*)pEntry->GetUserData();
         bEnableDel = IsDeleteAllowed(pUserData->sGroupName);
-
-//      String sGroup = aGroupTLB.GetEntryText(pEntry, 0);
-//      sGroup += GLOS_DELIM;
-//      sGroup += String::CreateFromInt32(aPathLB.GetEntryPos(aGroupTLB.GetEntryText(pEntry, 1)));
-//      bEnableDel = IsDeleteAllowed(sGroup);
     }
 
     aDelPB.Enable(bEnableDel);
diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx
index b669440a1ba4..07771e379665 100644
--- a/sw/source/ui/misc/glosdoc.cxx
+++ b/sw/source/ui/misc/glosdoc.cxx
@@ -262,7 +262,6 @@ sal_Bool    SwGlossaries::RenameGroupDoc(
                 String sNewFilePath(*(*m_pPathArr)[nNewPath]);
                 String sNewFileName = lcl_CheckFileName(
                                     sNewFilePath, rNewGroup.GetToken(0, GLOS_DELIM));
-                //String aTmp( rNewGroup.GetToken(0, GLOS_DELIM));
                 const sal_uInt16 nFileNameLen = sNewFileName.Len();
                 sNewFileName += SwGlossaries::GetExtension();
                 String sTempNewFilePath(sNewFilePath);
@@ -498,7 +497,7 @@ void SwGlossaries::UpdateGlosPath(sal_Bool bFull)
         aDirArr.DeleteAndDestroy(0, aDirArr.Count());
 
         if(!nTokenCount ||
-            m_sErrPath.Len() && (bPathChanged || m_sOldErrPath != m_sErrPath) )
+            (m_sErrPath.Len() && (bPathChanged || m_sOldErrPath != m_sErrPath)) )
         {
             m_sOldErrPath = m_sErrPath;
             // Falscher Pfad, d.h. AutoText-Verzeichnis existiert nicht
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index a85c2921c81b..2439da3752c5 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -742,6 +742,9 @@ void SwGlossaryDlg::Init()
     SvLBoxEntry* pSelEntry = 0;
     const String sSelStr(::GetCurrGlosGroup()->GetToken(0, GLOS_DELIM));
     const sal_uInt16 nSelPath = static_cast< sal_uInt16 >(::GetCurrGlosGroup()->GetToken(1, GLOS_DELIM).ToInt32());
+    // #i66304# - "My AutoText" comes from mytexts.bau, but should be translated
+    const String sMyAutoTextEnglish(RTL_CONSTASCII_USTRINGPARAM("My AutoText"));
+    const String sMyAutoTextTranslated(SW_RESSTR(STR_MY_AUTOTEXT));
     for(sal_uInt16 nId = 0; nId < nCnt; ++nId )
     {
         String sTitle;
@@ -750,6 +753,8 @@ void SwGlossaryDlg::Init()
             continue;
         if(!sTitle.Len())
             sTitle = sGroupName.GetToken( 0, GLOS_DELIM );
+        if(sTitle == sMyAutoTextEnglish)
+            sTitle = sMyAutoTextTranslated;
         SvLBoxEntry* pEntry = aCategoryBox.InsertEntry( sTitle );
         sal_uInt16 nPath = static_cast< sal_uInt16 >(sGroupName.GetToken( 1, GLOS_DELIM ).ToInt32());
 
diff --git a/sw/source/ui/misc/glossary.src b/sw/source/ui/misc/glossary.src
index 3ed5c4939791..a09b17ad4282 100644
--- a/sw/source/ui/misc/glossary.src
+++ b/sw/source/ui/misc/glossary.src
@@ -372,92 +372,7 @@ InfoBox MSG_NO_GLOSSARIES
     Message [ en-US ] = "There is no AutoText in this file.";
 };
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+String STR_MY_AUTOTEXT
+{
+    Text[ en-US ] = "My AutoText";
+};
diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx
index 5ca777508715..b536b4f3d651 100644
--- a/sw/source/ui/misc/insfnote.cxx
+++ b/sw/source/ui/misc/insfnote.cxx
@@ -93,37 +93,12 @@ void __EXPORT SwInsFootNoteDlg::Apply()
     }
     else
     {
-/*
-        rSh.StartUndo( UNDO_UI_INSERT_FOOTNOTE );
-        rSh.InsertFootnote( aStr, aEndNoteBtn.IsChecked(), !bExtCharAvailable );
 
-        if ( bExtCharAvailable )
-        {
-            rSh.Left( CRSR_SKIP_CHARS, TRUE, 1, FALSE );
-            SfxItemSet aSet( rSh.GetAttrPool(), RES_CHRATR_FONT, RES_CHRATR_FONT );
-            rSh.GetAttr( aSet );
-            SvxFontItem &rFont = (SvxFontItem &) aSet.Get( RES_CHRATR_FONT );
-            SvxFontItem aFont( rFont.GetFamily(), aFontName,
-                               rFont.GetStyleName(), rFont.GetPitch(),
-                               eCharSet );
-            aSet.Put( aFont );
-            rSh.SetAttr( aSet, SETATTR_DONTEXPAND );
-            // zur Bearbeitung des Fussnotentextes
-            rSh.ResetSelect(0, FALSE);
-            rSh.GotoFtnTxt();
-        }
-        rSh.EndUndo( UNDO_UI_INSERT_FOOTNOTE );
-*/
     }
 
     bFootnote = aFtnBtn.IsChecked();
 }
 
-
-/*------------------------------------------------------------------------
-    Beschreibung:
-------------------------------------------------------------------------*/
-
 IMPL_LINK_INLINE_START( SwInsFootNoteDlg, NumberCharHdl, Button *, EMPTYARG )
 {
     aNumberCharEdit.GrabFocus();
@@ -132,10 +107,6 @@ IMPL_LINK_INLINE_START( SwInsFootNoteDlg, NumberCharHdl, Button *, EMPTYARG )
 }
 IMPL_LINK_INLINE_END( SwInsFootNoteDlg, NumberCharHdl, Button *, EMPTYARG )
 
-/*------------------------------------------------------------------------
-    Beschreibung:
-------------------------------------------------------------------------*/
-
 IMPL_LINK_INLINE_START( SwInsFootNoteDlg, NumberEditHdl, void *, EMPTYARG )
 {
     aNumberCharBtn.Check( TRUE );
@@ -145,10 +116,6 @@ IMPL_LINK_INLINE_START( SwInsFootNoteDlg, NumberEditHdl, void *, EMPTYARG )
 }
 IMPL_LINK_INLINE_END( SwInsFootNoteDlg, NumberEditHdl, void *, EMPTYARG )
 
-/*------------------------------------------------------------------------
-    Beschreibung:
-------------------------------------------------------------------------*/
-
 IMPL_LINK_INLINE_START( SwInsFootNoteDlg, NumberAutoBtnHdl, Button *, EMPTYARG )
 {
     aOkBtn.Enable( TRUE );
@@ -156,10 +123,6 @@ IMPL_LINK_INLINE_START( SwInsFootNoteDlg, NumberAutoBtnHdl, Button *, EMPTYARG )
 }
 IMPL_LINK_INLINE_END( SwInsFootNoteDlg, NumberAutoBtnHdl, Button *, EMPTYARG )
 
-/*------------------------------------------------------------------------
-    Beschreibung:
-------------------------------------------------------------------------*/
-
 IMPL_LINK( SwInsFootNoteDlg, NumberExtCharHdl, Button *, EMPTYARG )
 {
     aNumberCharBtn.Check( TRUE );
@@ -203,10 +166,6 @@ IMPL_LINK( SwInsFootNoteDlg, NumberExtCharHdl, Button *, EMPTYARG )
     return 0;
 }
 
-/*------------------------------------------------------------------------
-    Beschreibung:
-------------------------------------------------------------------------*/
-
 IMPL_LINK( SwInsFootNoteDlg, NextPrevHdl, Button *, pBtn )
 {
     Apply();
@@ -223,10 +182,6 @@ IMPL_LINK( SwInsFootNoteDlg, NextPrevHdl, Button *, pBtn )
     return 0;
 }
 
-/*------------------------------------------------------------------------
-    Beschreibung:
-------------------------------------------------------------------------*/
-
 SwInsFootNoteDlg::SwInsFootNoteDlg(Window *pParent, SwWrtShell &rShell, BOOL bEd) :
 
     SvxStandardDialog(pParent,SW_RES(DLG_INS_FOOTNOTE)),
@@ -272,11 +227,6 @@ SwInsFootNoteDlg::SwInsFootNoteDlg(Window *pParent, SwWrtShell &rShell, BOOL bEd
     }
 }
 
-
-/*------------------------------------------------------------------------
-    Beschreibung:
-------------------------------------------------------------------------*/
-
 SwInsFootNoteDlg::~SwInsFootNoteDlg()
 {
     rSh.SetCareWin(0);
@@ -285,10 +235,6 @@ SwInsFootNoteDlg::~SwInsFootNoteDlg()
         rSh.ResetSelect(0, FALSE);
 }
 
-/*------------------------------------------------------------------------
-    Beschreibung:
-------------------------------------------------------------------------*/
-
 void SwInsFootNoteDlg::Init()
 {
     SwFmtFtn aFtnNote;
diff --git a/sw/source/ui/misc/insrule.cxx b/sw/source/ui/misc/insrule.cxx
index 644604c2a72b..d1cf53c4c55f 100644
--- a/sw/source/ui/misc/insrule.cxx
+++ b/sw/source/ui/misc/insrule.cxx
@@ -50,11 +50,6 @@
 #include "misc.hrc"
 #include "helpid.h"
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
-
 SwInsertGrfRulerDlg::SwInsertGrfRulerDlg( Window* pParent ) :
     SfxModalDialog(pParent, SW_RES(DLG_INSERT_RULER)),
     aSelectionFL(this, SW_RES(FL_SEL     )),
@@ -89,9 +84,6 @@ SwInsertGrfRulerDlg::SwInsertGrfRulerDlg( Window* pParent ) :
     pExampleVS->Show();
 
 }
-/*-----------------14.02.97 13.18-------------------
-
---------------------------------------------------*/
 
 SwInsertGrfRulerDlg::~SwInsertGrfRulerDlg()
 {
@@ -99,10 +91,6 @@ SwInsertGrfRulerDlg::~SwInsertGrfRulerDlg()
     delete pExampleVS;
 }
 
-/*-----------------14.02.97 13.17-------------------
-
---------------------------------------------------*/
-
 String SwInsertGrfRulerDlg::GetGraphicName()
 {
     String sRet;
@@ -114,10 +102,6 @@ String SwInsertGrfRulerDlg::GetGraphicName()
     return sRet;
 }
 
-/*-----------------14.02.97 13.20-------------------
-
---------------------------------------------------*/
-
 IMPL_LINK(SwInsertGrfRulerDlg, SelectHdl, ValueSet*, pVS)
 {
     nSelPos = pVS->GetSelectItemId();
@@ -125,23 +109,16 @@ IMPL_LINK(SwInsertGrfRulerDlg, SelectHdl, ValueSet*, pVS)
     return 0;
 }
 
-/*-----------------14.02.97 14.17-------------------
-
---------------------------------------------------*/
 SwRulerValueSet::SwRulerValueSet(   Window* pParent, const ResId& rResId ) :
     SvxBmpNumValueSet(pParent, rResId)
 {
     SetStyle(  GetStyle() & ~WB_ITEMBORDER     );
 }
-/*-----------------14.02.97 14.17-------------------
 
---------------------------------------------------*/
 SwRulerValueSet::~SwRulerValueSet()
 {
 }
-/*-----------------14.02.97 13.42-------------------
 
---------------------------------------------------*/
 void __EXPORT SwRulerValueSet::UserDraw( const UserDrawEvent& rUDEvt )
 {
     Rectangle aRect = rUDEvt.GetRect();
@@ -213,10 +190,6 @@ void __EXPORT SwRulerValueSet::UserDraw( const UserDrawEvent& rUDEvt )
     }
 }
 
-/*-----------------15.02.97 10.03-------------------
-
---------------------------------------------------*/
-
 IMPL_LINK(SwInsertGrfRulerDlg, DoubleClickHdl, ValueSet*, EMPTYARG)
 {
     EndDialog(RET_OK);
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index f6c141290185..3919ea85f317 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -145,22 +145,9 @@ void __EXPORT SwLineNumberingPage::Reset( const SfxItemSet&  )
     }
 
     // Format
-//  SwFldMgr aMgr( pSh );
     USHORT nSelFmt = rInf.GetNumType().GetNumberingType();
-//  USHORT nCnt = aMgr.GetFormatCount( TYP_SEQFLD, FALSE );
-
-//  for( USHORT i = 0; i < nCnt; i++)
-//  {
-//      aFormatLB.InsertEntry(aMgr.GetFormatStr( TYP_SEQFLD, i));
-//      USHORT nFmtId = aMgr.GetFormatId( TYP_SEQFLD, i );
-//      aFormatLB.SetEntryData( i, (void*)nFmtId );
-//      if( nFmtId == nSelFmt )
-//          aFormatLB.SelectEntryPos( i );
-//  }
-    aFormatLB.SelectNumberingType(nSelFmt);
 
-//  if ( !aFormatLB.GetSelectEntryCount() )
-//      aFormatLB.SelectEntryPos(aFormatLB.GetEntryCount() - 1);
+    aFormatLB.SelectNumberingType(nSelFmt);
 
     // Position
     aPosLB.SelectEntryPos((USHORT)rInf.GetPos());
diff --git a/sw/source/ui/misc/makefile.mk b/sw/source/ui/misc/makefile.mk
index d2ed28a0c7f2..4448c9acfa9f 100644
--- a/sw/source/ui/misc/makefile.mk
+++ b/sw/source/ui/misc/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -56,15 +56,6 @@ SRC1FILES=\
     titlepage.src
 
 EXCEPTIONSFILES = \
-        $(SLO)$/glossary.obj \
-        $(SLO)$/glosdoc.obj \
-        $(SLO)$/glshell.obj \
-        $(SLO)$/numberingtypelistbox.obj \
-        $(SLO)$/outline.obj \
-        $(SLO)$/redlndlg.obj
-        
-
-SLOFILES =	\
         $(SLO)$/bookmark.obj \
         $(SLO)$/docfnote.obj \
         $(SLO)$/glosbib.obj \
@@ -74,15 +65,19 @@ SLOFILES =	\
         $(SLO)$/insfnote.obj \
         $(SLO)$/insrule.obj \
         $(SLO)$/linenum.obj \
-        $(SLO)$/titlepage.obj \
         $(SLO)$/num.obj \
         $(SLO)$/numberingtypelistbox.obj \
         $(SLO)$/outline.obj \
         $(SLO)$/pgfnote.obj \
         $(SLO)$/pggrid.obj \
         $(SLO)$/redlndlg.obj \
-        $(SLO)$/swmodalredlineacceptdlg.obj	\
-        $(SLO)$/srtdlg.obj
+        $(SLO)$/srtdlg.obj \
+        $(SLO)$/swmodalredlineacceptdlg.obj \
+        $(SLO)$/titlepage.obj
+
+
+SLOFILES =	\
+        $(EXCEPTIONSFILES)
 
 LIB1TARGET = $(SLB)$/$(TARGET).lib
 
@@ -91,7 +86,7 @@ LIB1OBJFILES =	\
         $(SLO)$/glshell.obj \
         $(SLO)$/numberingtypelistbox.obj \
         $(SLO)$/redlndlg.obj
-       
+
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :	target.mk
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 8d3543964fa3..2ec2a5be9885 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -1079,7 +1079,6 @@ void SwSvxNumBulletTabDialog::PageCreated(USHORT nPageId, SfxTabPage& rPage)
             SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
             aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM, static_cast< USHORT >(eMetric)) );
             rPage.PageCreated(aSet);
-//          ((SvxNumPositionTabPage&)rPage).SetWrtShell(&rWrtSh);
         }
         break;
     }
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 0a21d2ae19b3..4ea34f82b5a5 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -222,8 +222,6 @@ SwOutlineTabDialog::SwOutlineTabDialog(Window* pParent,
         SwTxtFmtColl &rTxtColl = rWrtSh.GetTxtFmtColl(i);
         if(!rTxtColl.IsDefault())
         {
-            //BYTE nOutLevel = rTxtColl.GetOutlineLevel();  //<-#outline level, removed out by zhaojianwei
-            //if(nOutLevel != NO_NUMBERING)
             //->added by zhaojianwei
             if(rTxtColl.IsAssignedToListLevelOfOutlineStyle())
             {
@@ -369,28 +367,10 @@ short SwOutlineTabDialog::Ok()
         SwTxtFmtColl &rTxtColl = rWrtSh.GetTxtFmtColl(i);
         if( !rTxtColl.IsDefault() )
         {
-            //rTxtColl.SetOutlineLevel( (BYTE)GetLevel(rTxtColl.GetName()));//#outline level,removed by zhaojianwei
 
             const SfxPoolItem & rItem =
                 rTxtColl.GetFmtAttr(RES_PARATR_NUMRULE, FALSE);
 
-            //if ((BYTE)GetLevel(rTxtColl.GetName()) == NO_NUMBERING)   //#outline level,removed by zhaojianwei
-            //{
-            //  if (static_cast<const SwNumRuleItem &>(rItem).GetValue() ==
-            //      pOutlineRule->GetName())
-            //  {
-            //      rTxtColl.ResetFmtAttr(RES_PARATR_NUMRULE);
-            //  }
-            //}
-            //else
-            //{
-            //  if (static_cast<const SwNumRuleItem &>(rItem).GetValue() !=
-            //      pOutlineRule->GetName())
-            //  {
-            //      SwNumRuleItem aItem(pOutlineRule->GetName());
-            //      rTxtColl.SetFmtAttr(aItem);
-            //  }
-            //}
            if ((BYTE)GetLevel(rTxtColl.GetName()) == MAXLEVEL) //add by zhaojianwei
             {
                 if(rTxtColl.IsAssignedToListLevelOfOutlineStyle())
@@ -425,25 +405,6 @@ short SwOutlineTabDialog::Ok()
         SwTxtFmtColl* pColl = rWrtSh.FindTxtFmtCollByName( sHeadline );
         if( !pColl )
         {
-            //if( !aCollNames[i].Len() )            //#outline level,removed by zhaojianwei
-            //{
-            //  SwTxtFmtColl* pTxtColl = rWrtSh.GetTxtCollFromPool(
-            //      static_cast< USHORT >(RES_POOLCOLL_HEADLINE1 + i) );
-            //  pTxtColl->SetOutlineLevel( NO_NUMBERING );
-            //  pTxtColl->ResetFmtAttr(RES_PARATR_NUMRULE);
-            //}
-            //else if(aCollNames[i] != sHeadline)
-            //{
-            //  SwTxtFmtColl* pTxtColl = rWrtSh.GetParaStyle(
-            //      aCollNames[i], SwWrtShell::GETSTYLE_CREATESOME);
-            //  if(pTxtColl)
-            //  {
-            //      pTxtColl->SetOutlineLevel( static_cast< BYTE >(i) );
-
-            //      SwNumRuleItem aItem(pOutlineRule->GetName());
-            //      pTxtColl->SetFmtAttr(aItem);
-            //  }
-            //}
             if(aCollNames[i] != sHeadline)//->added by zhaojianwei
             {
                 SwTxtFmtColl* pTxtColl = rWrtSh.GetTxtCollFromPool(
@@ -549,8 +510,8 @@ void    SwOutlineSettingsTabPage::Update()
                 bSameSuffix &= aNumFmtArr[i]->GetSuffix() == aNumFmtArr[0]->GetSuffix();
                 bSameComplete &= aNumFmtArr[i]->GetIncludeUpperLevels() == aNumFmtArr[0]->GetIncludeUpperLevels();
                 const SwCharFmt* pFmt = aNumFmtArr[i]->GetCharFmt();
-                bSameCharFmt &=     !pFirstFmt && !pFmt
-                                    || pFirstFmt && pFmt && pFmt->GetName() == pFirstFmt->GetName();
+                bSameCharFmt &=     (!pFirstFmt && !pFmt)
+                                    || (pFirstFmt && pFmt && pFmt->GetName() == pFirstFmt->GetName());
             }
         }
         CheckForStartValue_Impl(aNumFmtArr[0]->GetNumberingType());
@@ -723,7 +684,7 @@ IMPL_LINK( SwOutlineSettingsTabPage, CollSelectGetFocus, ListBox *, EMPTYARG )
 IMPL_LINK( SwOutlineSettingsTabPage, NumberSelect, SwNumberingTypeListBox *, pBox )
 {
     USHORT nMask = 1;
-    sal_Int16 nNumberType = pBox->GetSelectedNumberingType();//(sal_Int16)(ULONG)pBox->GetEntryData(pBox->GetSelectEntryPos());
+    sal_Int16 nNumberType = pBox->GetSelectedNumberingType();
     for(USHORT i = 0; i < MAXLEVEL; i++)
     {
         if(nActLevel & nMask)
@@ -776,7 +737,6 @@ IMPL_LINK( SwOutlineSettingsTabPage, StartModified, NumericField *, pFld )
 
 IMPL_LINK( SwOutlineSettingsTabPage, CharFmtHdl, ListBox *, EMPTYARG )
 {
-//  bAutomaticCharStyles = FALSE;
     String sEntry = aCharFmtLB.GetSelectEntry();
     USHORT nMask = 1;
     BOOL bFormatNone = sEntry == ViewShell::GetShellRes()->aStrNone;
@@ -832,8 +792,6 @@ void SwOutlineSettingsTabPage::SetWrtShell(SwWrtShell* pShell)
     pNumRule = ((SwOutlineTabDialog*)GetTabDialog())->GetNumRule();
     pCollNames = ((SwOutlineTabDialog*)GetTabDialog())->GetCollNames();
 
-    //pNumRule = new SwNumRule( *rSh.GetOutlineNumRule() );
-
     aPreviewWIN.SetNumRule(pNumRule);
     aPreviewWIN.SetOutlineNames(pCollNames);
     // Startwert setzen - nActLevel muss hier 1 sein
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index b936ebb5b265..6e69cd11099d 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -455,7 +455,6 @@ IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, SpinField*, pField)
     {
         if (&aTextSizeMF == pField)
         {
-            sal_Int32 nTextSize = static_cast< sal_Int32 >(aTextSizeMF.Denormalize(aTextSizeMF.GetValue(FUNIT_TWIP)));
             m_bRubyUserValue = sal_False;
         }
         //set maximum line per page
diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx
index 58f7bbc9bf7a..9f3d4fcba97a 100644
--- a/sw/source/ui/misc/redlndlg.cxx
+++ b/sw/source/ui/misc/redlndlg.cxx
@@ -322,10 +322,6 @@ void SwRedlineAcceptDlg::InitAuthors()
         if( bOnlyFormatedRedlines && nsRedlineType_t::REDLINE_FORMAT != rRedln.GetType() )
             bOnlyFormatedRedlines = FALSE;
 
-//JP 27.9.2001: make no sense if we handle readonly sections
-//      if( !bHasReadonlySel && rRedln.HasReadonlySel() )
-//          bHasReadonlySel = TRUE;
-
         String *pAuthor = new String(rRedln.GetAuthorString());
         if (!aStrings.Insert(pAuthor))
             delete pAuthor;
@@ -427,12 +423,6 @@ void SwRedlineAcceptDlg::Activate()
     if (!pView) // Kann passieren, wenn man auf eine andere App umschaltet, wenn
         return; // vorher eine Listbox im Dialog den Focus hatte (eigentlich THs Bug)
 
-/*  if (HasRedlineAutoFmt())
-    {
-        Init();
-        return;
-    }*/
-
     // Hat sich was geaendert?
     SwWrtShell* pSh = pView->GetWrtShellPtr();
     USHORT nCount = pSh->GetRedlineCount();
@@ -984,7 +974,6 @@ IMPL_LINK( SwRedlineAcceptDlg, GotoHdl, void*, EMPTYARG )
 
     BOOL bIsNotFormated = FALSE;
     BOOL bSel = FALSE;
-//  BOOL bReadonlySel = FALSE;
 
     //#98883# don't select redlines while the dialog is not focussed
     //#107938# But not only ask pTable if it has the focus. To move
@@ -1025,10 +1014,6 @@ IMPL_LINK( SwRedlineAcceptDlg, GotoHdl, void*, EMPTYARG )
                 const SwRedline& rRedln = pSh->GetRedline( nPos );
                 bIsNotFormated |= nsRedlineType_t::REDLINE_FORMAT != rRedln.GetType();
 
-//JP 27.9.2001: make no sense if we handle readonly sections
-//          if( !bReadonlySel && rRedln.HasReadonlySel() )
-//              bReadonlySel = TRUE;
-
                 if (pSh->GotoRedline(nPos, TRUE))
                 {
                     pSh->SetInSelect();
diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx
index 8c39bbb8b5d6..e593bc733a41 100644
--- a/sw/source/ui/misc/titlepage.cxx
+++ b/sw/source/ui/misc/titlepage.cxx
@@ -162,7 +162,9 @@ USHORT SwTitlePageDlg::GetInsertPosition() const
 
 SwTitlePageDlg::SwTitlePageDlg( Window *pParent ) :
     SfxModalDialog( pParent, SW_RES(DLG_TITLEPAGE) ),
+#ifdef MSC
 #pragma warning (disable : 4355)
+#endif
     aMakeInsertFL       ( this, SW_RES( FL_MAKEINSERT )),
     aUseExistingPagesRB ( this, SW_RES( RB_USE_EXISTING_PAGES )),
     aInsertNewPagesRB   ( this, SW_RES( RB_INSERT_NEW_PAGES )),
@@ -188,7 +190,9 @@ SwTitlePageDlg::SwTitlePageDlg( Window *pParent ) :
     aCancelPB           ( this, SW_RES( PB_CANCEL )),
     aHelpPB             ( this, SW_RES( PB_HELP )),
     mpPageFmtDesc       (0)
+#ifdef MSC
 #pragma warning (default : 4355)
+#endif
 {
     FreeResource();
 
diff --git a/sw/source/ui/ribbar/conarc.cxx b/sw/source/ui/ribbar/conarc.cxx
index d56ab137e452..cbf8fc28fc8d 100644
--- a/sw/source/ui/ribbar/conarc.cxx
+++ b/sw/source/ui/ribbar/conarc.cxx
@@ -107,11 +107,6 @@ BOOL ConstArc::MouseButtonUp( const MouseEvent& rMEvt )
                 m_pSh->EndCreate(SDRCREATE_NEXTPOINT);
         }
     }
-/*  else if ( pView->IsCreateObj() && rMEvt.IsRight() )
-    {
-        pView->EndCreateObj( SDRCREATE_FORCEEND );
-        bReturn = TRUE;
-    }*/
 
     return (bReturn);
 }
diff --git a/sw/source/ui/ribbar/conform.cxx b/sw/source/ui/ribbar/conform.cxx
index 7bd3373780ae..71659ba78fdf 100644
--- a/sw/source/ui/ribbar/conform.cxx
+++ b/sw/source/ui/ribbar/conform.cxx
@@ -121,9 +121,7 @@ void ConstFormControl::Activate(const USHORT nSlotId)
 
     m_pWin->SetPointer(Pointer(POINTER_DRAW_RECT));
 }
-/* -----------------------------19.04.2002 12:42------------------------------
 
- ---------------------------------------------------------------------------*/
 void ConstFormControl::CreateDefaultObject()
 {
     Point aStartPos(GetDefaultCenterPos());
diff --git a/sw/source/ui/ribbar/drawbase.cxx b/sw/source/ui/ribbar/drawbase.cxx
index f9f27d6435c8..e93c6f8258a8 100644
--- a/sw/source/ui/ribbar/drawbase.cxx
+++ b/sw/source/ui/ribbar/drawbase.cxx
@@ -101,7 +101,6 @@ BOOL SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
     SdrView *pSdrView = m_pSh->GetDrawView();
 
     // #i33136#
-    // pSdrView->SetOrtho(rMEvt.IsShift());
     pSdrView->SetOrtho(doConstructOrthogonal() ? !rMEvt.IsShift() : rMEvt.IsShift());
     pSdrView->SetAngleSnapEnabled(rMEvt.IsShift());
 
@@ -212,8 +211,6 @@ BOOL SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
                     {
                         bNoInterrupt = TRUE;
                         pSdrView->MarkPoint(*pHdl);
-//                      bReturn = pSdrView->BegDragObj(m_aStartPos, (OutputDevice*) NULL, pHdl);
-//                      m_pWin->SetDrawAction(TRUE);
                     }
                 }
             }
@@ -240,11 +237,9 @@ BOOL SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
                     {
                         if (!pSdrView->HasMarkablePoints())
                         {
-                            //JP 10.10.2001: Bug 89619 - don't scroll the
-                            //              cursor into the visible area
                             BOOL bUnlockView = !m_pSh->IsViewLocked();
                             m_pSh->LockView( TRUE ); //lock visible section
-                            m_pSh->SelectObj(Point(LONG_MAX, LONG_MAX)); // Alles deselektieren
+                            m_pSh->SelectObj(Point(LONG_MAX, LONG_MAX)); // deselect all
                             if( bUnlockView )
                                 m_pSh->LockView( FALSE );
                         }
@@ -281,7 +276,6 @@ BOOL SwDrawBase::MouseMove(const MouseEvent& rMEvt)
     if (IsCreateObj() && !m_pWin->IsDrawSelMode() && pSdrView->IsCreateObj())
     {
         // #i33136#
-        // pSdrView->SetOrtho(rMEvt.IsShift());
         pSdrView->SetOrtho(doConstructOrthogonal() ? !rMEvt.IsShift() : rMEvt.IsShift());
         pSdrView->SetAngleSnapEnabled(rMEvt.IsShift());
 
@@ -531,9 +525,6 @@ void __EXPORT SwDrawBase::Deactivate()
     m_pWin->ReleaseMouse();
     bNoInterrupt = FALSE;
 
-//  if(!m_pSh->IsObjSelected())
-//      m_pSh->Edit();
-
     if(m_pWin->GetApplyTemplate())
         m_pWin->SetApplyTemplate(SwApplyTemplate());
     m_pSh->GetView().GetViewFrame()->GetBindings().Invalidate(SID_INSERT_DRAW);
@@ -647,7 +638,6 @@ void SwDrawBase::BreakCreate()
     m_pWin->ReleaseMouse();
 
     Deactivate();
-//  m_pView->LeaveDrawCreate();
 }
 
 /*************************************************************************
@@ -700,9 +690,7 @@ void SwDrawBase::EnterSelectMode(const MouseEvent& rMEvt)
         m_pView->NoRotate();
     }
 }
-/* -----------------------------03.04.2002 10:52------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwDrawBase::CreateDefaultObject()
 {
     Point aStartPos = GetDefaultCenterPos();
@@ -714,9 +702,7 @@ void SwDrawBase::CreateDefaultObject()
     Rectangle aRect(aStartPos, aEndPos);
     m_pSh->CreateDefaultShape( static_cast< UINT16 >(m_pWin->GetSdrDrawMode()), aRect, m_nSlotId);
 }
-/* -----------------25.10.2002 14:14-----------------
- *
- * --------------------------------------------------*/
+
 Point  SwDrawBase::GetDefaultCenterPos()
 {
     Size aDocSz(m_pSh->GetDocSize());
diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx
index fd3cec7e1114..fd8c88f25dfe 100644
--- a/sw/source/ui/ribbar/inputwin.cxx
+++ b/sw/source/ui/ribbar/inputwin.cxx
@@ -93,10 +93,9 @@ SwInputWindow::SwInputWindow( Window* pParent, SfxBindings* pBind )
     InsertWindow( ED_FORMULA, &aEdit);
     SetHelpId(ED_FORMULA, HID_EDIT_FORMULA);
 
-    BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
-    SetItemImage( FN_FORMULA_CALC, pManager->GetImage(FN_FORMULA_CALC, bHC ));
-    SetItemImage( FN_FORMULA_CANCEL, pManager->GetImage(FN_FORMULA_CANCEL, bHC  ));
-    SetItemImage( FN_FORMULA_APPLY, pManager->GetImage(FN_FORMULA_APPLY, bHC  ));
+    SetItemImage( FN_FORMULA_CALC,   pManager->GetImage(FN_FORMULA_CALC   ));
+    SetItemImage( FN_FORMULA_CANCEL, pManager->GetImage(FN_FORMULA_CANCEL ));
+    SetItemImage( FN_FORMULA_APPLY,  pManager->GetImage(FN_FORMULA_APPLY  ));
 
     SetItemBits( FN_FORMULA_CALC, GetItemBits( FN_FORMULA_CALC ) | TIB_DROPDOWNONLY );
     SetDropdownClickHdl( LINK( this, SwInputWindow, DropdownClickHdl ));
@@ -154,11 +153,9 @@ void SwInputWindow::DataChanged( const DataChangedEvent& rDCEvt )
         //      update item images
         SwModule *pMod  = SW_MOD();
         SfxImageManager *pImgMgr = SfxImageManager::GetImageManager( pMod );
-        BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
-        //
-        SetItemImage( FN_FORMULA_CALC,   pImgMgr->GetImage(FN_FORMULA_CALC,   bHC ));
-        SetItemImage( FN_FORMULA_CANCEL, pImgMgr->GetImage(FN_FORMULA_CANCEL, bHC ));
-        SetItemImage( FN_FORMULA_APPLY,  pImgMgr->GetImage(FN_FORMULA_APPLY,  bHC ));
+        SetItemImage( FN_FORMULA_CALC,   pImgMgr->GetImage(FN_FORMULA_CALC   ));
+        SetItemImage( FN_FORMULA_CANCEL, pImgMgr->GetImage(FN_FORMULA_CANCEL ));
+        SetItemImage( FN_FORMULA_APPLY,  pImgMgr->GetImage(FN_FORMULA_APPLY  ));
     }
 
     ToolBox::DataChanged( rDCEvt );
@@ -214,8 +211,8 @@ void SwInputWindow::ShowWin()
         OSL_ENSURE(pMgr == 0, "FieldManager not deleted");
         pMgr = new SwFldMgr;
 
-        // JP 13.01.97: Formel soll immer mit einem "=" beginnen, hier
-        //              also setzen
+        // Formel soll immer mit einem "=" beginnen, hier
+        // also setzen
         String sEdit( '=' );
         if( pMgr->GetCurFld() && TYP_FORMELFLD == pMgr->GetCurTypeId() )
         {
@@ -379,8 +376,8 @@ void  SwInputWindow::ApplyFormula()
     }
     pWrtShell->Pop( FALSE );
 
-    // JP 13.01.97: Formel soll immer mit einem "=" beginnen, hier
-    //              also wieder entfernen
+    // Formel soll immer mit einem "=" beginnen, hier
+    // also wieder entfernen
     String sEdit( aEdit.GetText() );
     sEdit.EraseLeadingChars().EraseTrailingChars();
     if( sEdit.Len() && '=' == sEdit.GetChar( 0 ) )
@@ -594,8 +591,7 @@ void __EXPORT InputEdit::UpdateRange(const String& rBoxes,
             nEndPos = nStartPos;
             while( nEndPos < nLen )
             {
-                if( cClose == (cCh = aActText.GetChar( nEndPos )) /*||
-                    cCh == cCloseBracket*/ )
+                if( cClose == (cCh = aActText.GetChar( nEndPos )))
                 {
                     bFound = TRUE;
                     break;
@@ -627,7 +623,6 @@ void __EXPORT InputEdit::UpdateRange(const String& rBoxes,
         {
             SetText( aActText );
             SetSelection( Selection( nPos, nPos ) );
-//          GetModifyHdl().Call( this );
         }
     }
     GrabFocus();
@@ -635,7 +630,6 @@ void __EXPORT InputEdit::UpdateRange(const String& rBoxes,
 }
 //==================================================================
 
-
 SwInputChild::SwInputChild(Window* _pParent,
                                 USHORT nId,
                                 SfxBindings* pBindings,
@@ -662,26 +656,4 @@ SfxChildWinInfo __EXPORT SwInputChild::GetInfo() const
     return aInfo;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/ribbar/makefile.mk b/sw/source/ui/ribbar/makefile.mk
index 2405d4b16d9f..13e3600aa892 100644
--- a/sw/source/ui/ribbar/makefile.mk
+++ b/sw/source/ui/ribbar/makefile.mk
@@ -46,23 +46,21 @@ SRC1FILES =  \
         workctrl.src
 
 EXCEPTIONSFILES = \
-        $(SLO)$/tblctrl.obj \
-        $(SLO)$/tbxanchr.obj \
-        $(SLO)$/workctrl.obj
-
-SLOFILES =  \
-        $(SLO)$/inputwin.obj \
-        $(SLO)$/tbxanchr.obj \
-        $(SLO)$/conrect.obj \
-        $(SLO)$/conform.obj \
-        $(SLO)$/conpoly.obj \
         $(SLO)$/conarc.obj \
         $(SLO)$/concustomshape.obj \
-        $(SLO)$/dselect.obj \
+        $(SLO)$/conform.obj \
+        $(SLO)$/conpoly.obj \
+        $(SLO)$/conrect.obj \
         $(SLO)$/drawbase.obj \
+        $(SLO)$/dselect.obj \
+        $(SLO)$/inputwin.obj \
         $(SLO)$/tblctrl.obj \
+        $(SLO)$/tbxanchr.obj \
         $(SLO)$/workctrl.obj
 
+SLOFILES =  \
+        $(EXCEPTIONSFILES)
+
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/sw/source/ui/ribbar/tbxanchr.cxx b/sw/source/ui/ribbar/tbxanchr.cxx
index 0144c5f2c158..d13783488e4a 100644
--- a/sw/source/ui/ribbar/tbxanchr.cxx
+++ b/sw/source/ui/ribbar/tbxanchr.cxx
@@ -56,10 +56,6 @@
 
 SFX_IMPL_TOOLBOX_CONTROL(SwTbxAnchor, SfxUInt16Item);
 
-/******************************************************************************
- *  Beschreibung:
- ******************************************************************************/
-
 SwTbxAnchor::SwTbxAnchor( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
     SfxToolBoxControl( nSlotId, nId, rTbx ),
     nActAnchorId(0)
@@ -67,18 +63,10 @@ SwTbxAnchor::SwTbxAnchor( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
     rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
 }
 
-/******************************************************************************
- *  Beschreibung:
- ******************************************************************************/
-
  SwTbxAnchor::~SwTbxAnchor()
 {
 }
 
-/******************************************************************************
- *  Beschreibung:
- ******************************************************************************/
-
 void  SwTbxAnchor::StateChanged( USHORT /*nSID*/, SfxItemState eState, const SfxPoolItem* pState )
 {
     GetToolBox().EnableItem( GetId(), (GetItemState(pState) != SFX_ITEM_DISABLED) );
@@ -92,20 +80,12 @@ void  SwTbxAnchor::StateChanged( USHORT /*nSID*/, SfxItemState eState, const Sfx
 
 }
 
-/******************************************************************************
- *  Beschreibung:
- ******************************************************************************/
-
 SfxPopupWindow* SwTbxAnchor::CreatePopupWindow()
 {
     SwTbxAnchor::Click();
     return 0;
 }
 
-/******************************************************************************
- *  Beschreibung:
- ******************************************************************************/
-
 void  SwTbxAnchor::Click()
 {
     PopupMenu aPopMenu(SW_RES(MN_ANCHOR_POPUP));
@@ -121,8 +101,6 @@ void  SwTbxAnchor::Click()
             pDispatch = pViewFrame->GetDispatcher();
     }
 
-//    SfxDispatcher* pDispatch = GetBindings().GetDispatcher();
-//    SfxViewFrame* pViewFrame = pDispatch ? pDispatch->GetFrame() : 0;
     SwView* pActiveView = 0;
     if(pViewFrame)
     {
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index 23e389683b48..8b9e2c9e41f0 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -30,7 +30,6 @@
 #include "precompiled_sw.hxx"
 
 
-
 #include <string> // HACK: prevent conflict between STLPORT and Workshop headers
 #include <svl/eitem.hxx>
 #include <svx/htmlmode.hxx>
@@ -58,7 +57,7 @@
 
 #include <vcl/svapp.hxx>
 
-//JP 14.01.99: Size Abpruefung
+// Size Abpruefung
 #define NAVI_ENTRIES 20
 #if NAVI_ENTRIES != NID_COUNT
 #error SwScrollNaviPopup-CTOR static Array falsche Size. Wurden neue IDs zugefuegt ??
@@ -73,9 +72,6 @@ using namespace ::com::sun::star::frame;
 SFX_IMPL_TOOLBOX_CONTROL( SwTbxInsertCtrl, SfxImageItem);
 SFX_IMPL_TOOLBOX_CONTROL( SwTbxAutoTextCtrl, SfxBoolItem );
 
-/**********************************************************************
-
-**********************************************************************/
 SwTbxInsertCtrl::SwTbxInsertCtrl(
     USHORT nSlotId,
     USHORT nId,
@@ -85,9 +81,7 @@ SwTbxInsertCtrl::SwTbxInsertCtrl(
 {
     rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
 }
-/**********************************************************************
 
-**********************************************************************/
 SwTbxInsertCtrl::~SwTbxInsertCtrl()
 {
 }
@@ -97,10 +91,7 @@ void SAL_CALL SwTbxInsertCtrl::update() throw (uno::RuntimeException)
     ToolBox& rTbx = GetToolBox();
     rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
     aSlotURL += rtl::OUString::valueOf( sal_Int32( nLastSlotId ));
-    Image aImage = GetImage( m_xFrame,
-                             aSlotURL,
-                             hasBigImages(),
-                             rTbx.GetSettings().GetStyleSettings().GetHighContrastMode() );
+    Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() );
 
     rTbx.SetItemImage(GetId(), aImage);
     rTbx.Invalidate();
@@ -108,11 +99,6 @@ void SAL_CALL SwTbxInsertCtrl::update() throw (uno::RuntimeException)
     SfxToolBoxControl::update();
 }
 
-/**********************************************************************
-
-**********************************************************************/
-
-
 void SwTbxInsertCtrl::StateChanged( USHORT /*nSID*/,
                                       SfxItemState eState,
                                       const SfxPoolItem* pState )
@@ -132,10 +118,7 @@ void SwTbxInsertCtrl::StateChanged( USHORT /*nSID*/,
             rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
             aSlotURL += rtl::OUString::valueOf( sal_Int32( nId ));
             ToolBox& rBox = GetToolBox();
-            Image aImage = GetImage( m_xFrame,
-                                     aSlotURL,
-                                     hasBigImages(),
-                                     rBox.GetSettings().GetStyleSettings().GetHighContrastMode() );
+            Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() );
             rBox.SetItemImage(GetId(), aImage);
             rBox.SetItemImageMirrorMode( GetId(), FALSE );
             rBox.SetItemImageAngle( GetId(), pItem->GetRotation() );
@@ -144,10 +127,6 @@ void SwTbxInsertCtrl::StateChanged( USHORT /*nSID*/,
     }
 
 }
-/**********************************************************************
-
-**********************************************************************/
-
 
 SfxPopupWindow* SwTbxInsertCtrl::CreatePopupWindow()
 {
@@ -164,22 +143,12 @@ SfxPopupWindow* SwTbxInsertCtrl::CreatePopupWindow()
     return NULL;
 }
 
-/**********************************************************************
-
-**********************************************************************/
-
-
 SfxPopupWindowType  SwTbxInsertCtrl::GetPopupWindowType() const
 {
     return nLastSlotId ? SFX_POPUPWINDOW_ONTIMEOUT : SFX_POPUPWINDOW_ONCLICK;
 }
 
 
-/**********************************************************************
-
-**********************************************************************/
-
-
 void SwTbxInsertCtrl::Select( BOOL /*bMod1*/ )
 {
     if( nLastSlotId )
@@ -199,11 +168,6 @@ void SwTbxInsertCtrl::Select( BOOL /*bMod1*/ )
     }
 }
 
-/**********************************************************************
-
-**********************************************************************/
-
-
 SwTbxAutoTextCtrl::SwTbxAutoTextCtrl(
     USHORT nSlotId,
     USHORT nId,
@@ -214,21 +178,12 @@ SwTbxAutoTextCtrl::SwTbxAutoTextCtrl(
 {
     rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
 }
-/**********************************************************************
-
-**********************************************************************/
-
 
 SwTbxAutoTextCtrl::~SwTbxAutoTextCtrl()
 {
     DelPopup();
 }
 
-/**********************************************************************
-
-**********************************************************************/
-
-
 SfxPopupWindow* SwTbxAutoTextCtrl::CreatePopupWindow()
 {
     pView = ::GetActiveView();
@@ -304,21 +259,11 @@ SfxPopupWindow* SwTbxAutoTextCtrl::CreatePopupWindow()
 }
 
 
-/**********************************************************************
-
-**********************************************************************/
-
-
 SfxPopupWindowType SwTbxAutoTextCtrl::GetPopupWindowType() const
 {
     return SFX_POPUPWINDOW_ONTIMEOUT;
 }
 
-/**********************************************************************
-
-**********************************************************************/
-
-
 void SwTbxAutoTextCtrl::StateChanged( USHORT nSID,
                                               SfxItemState eState,
                                               const SfxPoolItem* pState )
@@ -330,11 +275,6 @@ void SwTbxAutoTextCtrl::StateChanged( USHORT nSID,
     }
 }
 
-/**********************************************************************
-
-**********************************************************************/
-
-
 IMPL_LINK(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*, pMenu)
 {
     USHORT nId = pMenu->GetCurItemId();
@@ -392,11 +332,6 @@ IMPL_LINK(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*, pMenu)
     return 0;
 }
 
-/**********************************************************************
-
-**********************************************************************/
-
-
 void SwTbxAutoTextCtrl::DelPopup()
 {
     if(pPopup)
@@ -414,9 +349,7 @@ void SwTbxAutoTextCtrl::DelPopup()
     }
 }
 
-/*-----------------19.02.97 10.52-------------------
-    Navigations-Popup
---------------------------------------------------*/
+/* Navigations-Popup */
 // determine the order of the toolbox items
 static USHORT __READONLY_DATA aNavigationInsertIds[ NAVI_ENTRIES ] =
 {
@@ -475,7 +408,6 @@ SwScrollNaviPopup::SwScrollNaviPopup( USHORT nId, const Reference< XFrame >& rFr
     aSeparator(this, SW_RES(FL_SEP)),
     aInfoField(this, SW_RES(FI_INFO)),
     aIList(SW_RES(IL_VALUES)),
-    aIListH(SW_RES(ILH_VALUES)),
     nFwdId(FN_START_OF_NEXT_PAGE),
     nBackId(FN_START_OF_PREV_PAGE)
 {
@@ -534,16 +466,11 @@ SwScrollNaviPopup::SwScrollNaviPopup( USHORT nId, const Reference< XFrame >& rFr
     aToolBox.StartSelection();
     aToolBox.Show();
 }
-/*-----------------19.02.97 12.45-------------------
-
---------------------------------------------------*/
 
 SwScrollNaviPopup::~SwScrollNaviPopup()
 {
 }
-/* -----------------------------08.05.2002 14:00------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwScrollNaviPopup::DataChanged( const DataChangedEvent& rDCEvt )
 {
     if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
@@ -552,32 +479,22 @@ void SwScrollNaviPopup::DataChanged( const DataChangedEvent& rDCEvt )
 
     Window::DataChanged( rDCEvt );
 }
-/* -----------------------------08.05.2002 14:02------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwScrollNaviPopup::ApplyImageList()
 {
-    ImageList& rImgLst = aToolBox.GetSettings().GetStyleSettings().GetHighContrastMode() ?
-        aIListH : aIList;
+    ImageList& rImgLst = aIList;
     for(USHORT i = 0; i < NID_COUNT; i++)
     {
         USHORT nNaviId = aNavigationInsertIds[i];
         aToolBox.SetItemImage(nNaviId, rImgLst.GetImage(nNaviId));
     }
 }
-/*-----------------19.02.97 13.58-------------------
-
---------------------------------------------------*/
 
 SfxPopupWindow* SwScrollNaviPopup::Clone() const
 {
     return new SwScrollNaviPopup( GetId(), GetFrame() );
 }
 
-/*-----------------19.02.97 14.10-------------------
-
---------------------------------------------------*/
-
 IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet)
 {
     USHORT nSet = pSet->GetCurItemId();
@@ -608,9 +525,6 @@ IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet)
     }
     return 0;
 }
-/*-----------------23.02.97 18.21-------------------
-
---------------------------------------------------*/
 
 void SwScrollNaviToolBox::MouseButtonUp( const MouseEvent& rMEvt )
 {
@@ -619,9 +533,6 @@ void SwScrollNaviToolBox::MouseButtonUp( const MouseEvent& rMEvt )
         ((SwScrollNaviPopup*)GetParent())->EndPopupMode( FLOATWIN_POPUPMODEEND_CLOSEALL );
 }
 
-/*-----------------20.06.97 13:28-------------------
-
---------------------------------------------------*/
 void  SwScrollNaviToolBox::RequestHelp( const HelpEvent& rHEvt )
 {
     SetItemText(NID_NEXT, SwScrollNaviPopup::GetQuickHelpText(TRUE));
@@ -630,9 +541,6 @@ void  SwScrollNaviToolBox::RequestHelp( const HelpEvent& rHEvt )
 
 }
 
-/*-----------------20.06.97 13:41-------------------
-
---------------------------------------------------*/
 String  SwScrollNaviPopup::GetQuickHelpText(BOOL bNext)
 {
     USHORT nResId = STR_IMGBTN_START;
@@ -641,17 +549,12 @@ String  SwScrollNaviPopup::GetQuickHelpText(BOOL bNext)
         nResId += NID_COUNT;
     return String(SW_RES(nResId));
 }
-/* -----------------------------05.09.2002 13:53------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwNaviImageButton::Click()
 {
-//    SfxBindings& rBind = SfxViewFrame::Current()->GetBindings();
-//    rBind.ENTERREGISTRATIONS();
     pPopup = new
         SwScrollNaviPopup( FN_SCROLL_NAVIGATION,
                            m_xFrame );
-//    rBind.LEAVEREGISTRATIONS();
     Point aPos = OutputToScreenPixel(Point(0,0));
     Rectangle aRect(aPos, GetSizePixel());
     SetPopupWindow( pPopup );
@@ -700,10 +603,6 @@ IMPL_LINK( SwNaviImageButton, ClosePopupWindow, SfxPopupWindow *, pWindow )
     return 1;
 }
 
-/*-----------------21.02.97 09:41-------------------
-
---------------------------------------------------*/
-
 void SwHlpImageButton::RequestHelp( const HelpEvent& rHEvt )
 {
 
@@ -712,17 +611,12 @@ void SwHlpImageButton::RequestHelp( const HelpEvent& rHEvt )
     ImageButton::RequestHelp(rHEvt);
 }
 
-/*-----------------25.02.97 12:38-------------------
-
---------------------------------------------------*/
-
 SwNaviImageButton::SwNaviImageButton(
     Window* pParent,
     const Reference< XFrame >& rFrame ) :
     ImageButton(pParent, SW_RES(BTN_NAVI)),
         pPopup(0),
         aImage(SW_RES(IMG_BTN)),
-        aImageH(SW_RES(IMG_BTN_H)),
         sQuickText(SW_RES(ST_QUICK)),
         pPopupWindow(0),
         pFloatingWindow(0),
@@ -731,22 +625,18 @@ SwNaviImageButton::SwNaviImageButton(
     FreeResource();
     SetStyle(GetStyle()|WB_NOPOINTERFOCUS);
     SetQuickHelpText(sQuickText);
-    SetModeImage( GetSettings().GetStyleSettings().GetHighContrastMode() ? aImageH : aImage);
+    SetModeImage( aImage );
 }
-/* -----------------------------2002/07/05 9:41-------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwNaviImageButton::DataChanged( const DataChangedEvent& rDCEvt )
 {
     if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
          (rDCEvt.GetFlags() & SETTINGS_STYLE) )
-            SetModeImage( GetSettings().GetStyleSettings().GetHighContrastMode() ? aImageH : aImage);
+            SetModeImage( aImage );
 
     Window::DataChanged( rDCEvt );
 }
-/* -----------------26.11.2002 09:28-----------------
- *
- * --------------------------------------------------*/
+
 class SwZoomBox_Impl : public ComboBox
 {
     USHORT          nSlotId;
@@ -767,9 +657,7 @@ protected:
     void ReleaseFocus();
 
 };
-/* -----------------26.11.2002 09:29-----------------
- *
- * --------------------------------------------------*/
+
 SwZoomBox_Impl::SwZoomBox_Impl(
     Window* pParent,
     USHORT nSlot,
@@ -789,14 +677,10 @@ SwZoomBox_Impl::SwZoomBox_Impl(
         InsertEntry(sEntry);
     }
 }
-/* -----------------26.11.2002 09:29-----------------
- *
- * --------------------------------------------------*/
+
 SwZoomBox_Impl::~SwZoomBox_Impl()
 {}
-/* -----------------26.11.2002 09:34-----------------
- *
- * --------------------------------------------------*/
+
 void    SwZoomBox_Impl::Select()
 {
     if ( !IsTravelSelect() )
@@ -826,9 +710,7 @@ void    SwZoomBox_Impl::Select()
         ReleaseFocus();
     }
 }
-/* -----------------02.12.2002 07:49-----------------
- *
- * --------------------------------------------------*/
+
 long SwZoomBox_Impl::Notify( NotifyEvent& rNEvt )
 {
     long nHandled = 0;
@@ -865,9 +747,7 @@ long SwZoomBox_Impl::Notify( NotifyEvent& rNEvt )
 
     return nHandled ? nHandled : ComboBox::Notify( rNEvt );
 }
-/* -----------------02.12.2002 07:51-----------------
- *
- * --------------------------------------------------*/
+
 void SwZoomBox_Impl::ReleaseFocus()
 {
     if ( !bRelease )
@@ -886,9 +766,6 @@ void SwZoomBox_Impl::ReleaseFocus()
     }
 }
 
-/* -----------------26.11.2002 09:29-----------------
- *
- * --------------------------------------------------*/
 SFX_IMPL_TOOLBOX_CONTROL( SwPreviewZoomControl, SfxUInt16Item);
 
 SwPreviewZoomControl::SwPreviewZoomControl(
@@ -898,15 +775,11 @@ SwPreviewZoomControl::SwPreviewZoomControl(
     SfxToolBoxControl( nSlotId, nId, rTbx )
 {
 }
-/* -----------------26.11.2002 09:29-----------------
- *
- * --------------------------------------------------*/
+
 SwPreviewZoomControl::~SwPreviewZoomControl()
 {
 }
-/* -----------------26.11.2002 09:29-----------------
- *
- * --------------------------------------------------*/
+
 void SwPreviewZoomControl::StateChanged( USHORT /*nSID*/,
                                          SfxItemState eState,
                                          const SfxPoolItem* pState )
@@ -922,9 +795,7 @@ void SwPreviewZoomControl::StateChanged( USHORT /*nSID*/,
         pBox->SaveValue();
     }
 }
-/* -----------------26.11.2002 09:29-----------------
- *
- * --------------------------------------------------*/
+
 Window* SwPreviewZoomControl::CreateItemWindow( Window *pParent )
 {
     SwZoomBox_Impl* pRet = new SwZoomBox_Impl( pParent, GetSlotId(), Reference< XDispatchProvider >( m_xFrame->getController(), UNO_QUERY ));
diff --git a/sw/source/ui/ribbar/workctrl.hrc b/sw/source/ui/ribbar/workctrl.hrc
index 5e5180f363aa..51ac45b2ae87 100644
--- a/sw/source/ui/ribbar/workctrl.hrc
+++ b/sw/source/ui/ribbar/workctrl.hrc
@@ -37,9 +37,6 @@
 #define ST_QUICK            7
 #define FI_INFO             8
 #define FL_SEP              9
-#define ILH_VALUES         10
-#define IMG_BTN_H            11
-
 
 #define ST_TBL          12
 #define ST_FRM          13
diff --git a/sw/source/ui/ribbar/workctrl.src b/sw/source/ui/ribbar/workctrl.src
index 2f3e156edf16..74b0fa42cb58 100644
--- a/sw/source/ui/ribbar/workctrl.src
+++ b/sw/source/ui/ribbar/workctrl.src
@@ -261,12 +261,6 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN
         MaskColor = IMAGE_MASK_COLOR ;
         SCROLL_IMAGE_IDLIST
     };
-    ImageList ILH_VALUES
-    {
-        Prefix = "srh";
-        MaskColor = IMAGE_MASK_COLOR ;
-        SCROLL_IMAGE_IDLIST
-    };
     FixedLine FL_SEP
     {
         //no position, no text
@@ -546,11 +540,6 @@ ImageButton BTN_NAVI
         ImageBitmap = Bitmap { File = "punkt.bmp" ; };
         MaskColor = IMAGE_MASK_COLOR ;
     };
-    Image IMG_BTN_H
-    {
-        ImageBitmap = Bitmap { File = "punkt_h.bmp" ; };
-        MaskColor = IMAGE_MASK_COLOR ;
-    };
     String ST_QUICK
     {
         Text [ en-US ] = "Navigation" ;
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index 475d1fecddd1..ed1db36e8824 100644
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -902,7 +902,6 @@ void SwAnnotationShell::StateClpbrd(SfxItemSet &rSet)
                         SvxClipboardFmtItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
                         if ( aDataHelper.HasFormat( SOT_FORMAT_RTF ) )
                             aFormats.AddClipbrdFormat( SOT_FORMAT_RTF );
-                        //if ( aDataHelper.HasFormat( SOT_FORMAT_STRING ) )
                             aFormats.AddClipbrdFormat( SOT_FORMAT_STRING );
                         rSet.Put( aFormats );
                     }
@@ -1024,15 +1023,6 @@ void SwAnnotationShell::NoteExec(SfxRequest &rReq)
             break;
         }
         case FN_HIDE_NOTE:
-            /*
-            if ( Mgr()->GetActiveSidebarWin() == this )
-            {
-                Mgr()->SetActivePostIt(0);
-                // put the cursor back into the document
-                SwitchToFieldPos();
-            }
-            Mgr()->Hide(mpFld);
-            */
             break;
         case FN_HIDE_ALL_NOTES:
             pPostItMgr->Hide();
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index b23744a8bcd9..0f47161dd3ad 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -229,10 +229,6 @@ void SwBaseShell::ExecDelete(SfxRequest &rReq)
                 BOOL bLeft = rSh.Left( CRSR_SKIP_CHARS, TRUE, 1, FALSE  );
                 if( bLeft )
                 {
-                    // JP 28.03.96: ein Backspace im Absatz ohne Nummer wird zum Delete
-                    //rSh.SwapPam();
-                    //rSh.DelRight( FALSE );
-
                     rSh.DelLeft();
                 }
                 else
@@ -749,22 +745,6 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                 {
                     const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, pGal->GetURL().GetMainURL( INetURLObject::NO_DECODE ) );
                        GetView().GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_AVMEDIA, SFX_CALLMODE_SYNCHRON, &aMediaURLItem, 0L );
-/*
-                    String sURL( pGal->GetURL().GetMainURL( INetURLObject::NO_DECODE ) );
-                    String sLabel( pGal->GetURL().getBase() );
-                    String sTarget; // empty string!
-
-                    bool bIsHTMLMode =
-                        0 == ( HTMLMODE_ON &
-                               ::GetHtmlMode( GetView().GetDocShell() ) );
-
-                    // in Writer, we insert a button which plays the
-                    // sound. In Writer/Web, we just insert a (text) link.
-                    if( bIsHTMLMode )
-                        InsertURLButton( sURL, sTarget, sLabel );
-                    else
-                        rSh.InsertURL( SwFmtINetFmt( sURL, sTarget ), sLabel );
-*/
                 }
             }
         }
@@ -2192,7 +2172,6 @@ void SwBaseShell::GetBckColState(SfxItemSet &rSet)
     USHORT nWhich = aIter.FirstWhich();
     int nSelType = rSh.GetSelectionType();
 
-//  if ( nSelType & nsSelectionType::SEL_GRF ||
     if( nSelType & nsSelectionType::SEL_OLE )
     {
         rSet.DisableItem( SID_BACKGROUND_COLOR );
@@ -2272,8 +2251,6 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq)
         aBrushItem = (const SvxBrushItem&)aCoreSet.Get(RES_BACKGROUND);
     }
 
-//  BOOL bMsgOk = FALSE;
-
     switch (nSlot)
     {
         // RES_BACKGROUND (=SID_ATTR_BRUSH) muss ueber zwei IDs
@@ -2282,7 +2259,6 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq)
             {
                 aBrushItem.SetGraphicPos(GPOS_NONE);
 
-                //Brush &rBrush = aBrushItem.GetBrush();
                 if(pArgs)
                 {
                     const SvxColorItem& rNewColorItem = (const SvxColorItem&)
@@ -2308,7 +2284,6 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq)
         }
         break;
         default:
-//          bMsgOk = FALSE;
             rReq.Ignore();
             OSL_ENSURE(false, "unknown message in ExecuteAttr!" );
             return;
@@ -2509,7 +2484,6 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
                 aSet.Put( aBrush );
                 if ( pDlg->Execute() == RET_OK )
                 {
-                    //aBrush = (SvxBrushItem) pDlg->GetOutputItemSet()->Get( RES_BACKGROUND );
 
                     rSh.SetBoxBackground( (SvxBrushItem&)
                         pDlg->GetOutputItemSet()->Get( RES_BACKGROUND ));
diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx
index 5945e8d327d4..4003bfec08c3 100644
--- a/sw/source/ui/shells/drwbassh.cxx
+++ b/sw/source/ui/shells/drwbassh.cxx
@@ -407,7 +407,6 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
                 {
                     pSh->LeaveSelFrmMode();
                     // #105852# FME
-//                   pSh->NoEdit();
                 }
                 bNotify = TRUE;
             }
@@ -638,19 +637,6 @@ IMPL_LINK( SwDrawBaseShell, CheckGroupShapeNameHdl, AbstractSvxNameDialog*, pNam
     {
         nRet = 1;
         SdrModel* pModel = rSh.getIDocumentDrawModelAccess()->GetDrawModel();
-        // --> OD 2006-03-09 #i51726# - all drawing objects can be named now.
-        // consider also drawing objects inside group objects
-//        SdrPage* pPage = pModel->GetPage(0);
-//        sal_uInt32 nCount = pPage->GetObjCount();
-//        for( sal_uInt32 i=0; i< nCount; i++ )
-//        {
-//            SdrObject* pTemp = pPage->GetObj(i);
-//            if(pObj != pTemp && pTemp->ISA(SdrObjGroup) && pTemp->GetName() == sNewName)
-//            {
-//                nRet = 0;
-//                break;
-//            }
-//        }
         SdrObjListIter aIter( *(pModel->GetPage(0)), IM_DEEPWITHGROUPS );
         while( aIter.IsMore() )
         {
diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index 6b831509558b..6796f6539524 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -411,10 +411,6 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
 
                 aDlgAttr.Put(aEditAttr);
 
-                // Die Werte sind erst einmal uebernommen worden, um den Dialog anzuzeigen.
-                // Muss natuerlich noch geaendert werden
-                // aDlgAttr.Put( SvxParaDlgLimitsItem( 567 * 50, 5670) );
-
                 aDlgAttr.Put( SvxHyphenZoneItem( sal_False, RES_PARATR_HYPHENZONE) );
                 aDlgAttr.Put( SvxFmtBreakItem( SVX_BREAK_NONE, RES_BREAK ) );
                 aDlgAttr.Put( SvxFmtSplitItem( sal_True, RES_PARATR_SPLIT ) );
diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx
index 55d270675ac0..c9e1f93fceb2 100644
--- a/sw/source/ui/shells/drwtxtsh.cxx
+++ b/sw/source/ui/shells/drwtxtsh.cxx
@@ -151,18 +151,6 @@ __EXPORT SwDrawTextShell::~SwDrawTextShell()
 {
     if ( GetView().GetCurShell() == this )
         rView.ResetSubShell();
-
-    //MA 13. Nov. 96: Das kommt durchaus vor #33141#:
-    //(doppel-)Klick von einem Texteditmode in ein anderes Objekt, zwischendurch
-    //wird eine andere (Draw-)Shell gepusht, die alte aber noch nicht deletet.
-    //Dann wird vor dem Flush wieder ein DrawTextShell gepusht und der Mode ist
-    //eingeschaltet. In diesem Moment wird der Dispatcher geflusht und die alte
-    //DrawTextShell zerstoert.
-//  ASSERT( !pSdrView->IsTextEdit(), "TextEdit in DTor DrwTxtSh?" );
-//    if (pSdrView->IsTextEdit())
-//      GetShell().EndTextEdit();   // Danebengeklickt, Ende mit Edit
-
-//    GetShell().Edit();
 }
 
 SwWrtShell& SwDrawTextShell::GetShell()
diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx
index 4362e8eedd0d..27843a00bf20 100644
--- a/sw/source/ui/shells/frmsh.cxx
+++ b/sw/source/ui/shells/frmsh.cxx
@@ -418,10 +418,8 @@ void SwFrameShell::Execute(SfxRequest &rReq)
                 aSet.Put(SfxStringItem(FN_SET_FRM_NAME, rSh.GetFlyName()));
                 if( nSel & nsSelectionType::SEL_OLE )
                 {
-                    // --> OD 2009-07-13 #i73249#
-//                    aSet.Put(SfxStringItem(FN_SET_FRM_ALT_NAME, rSh.GetAlternateText()));
+                    // #i73249#
                     aSet.Put( SfxStringItem( FN_SET_FRM_ALT_NAME, rSh.GetObjTitle() ) );
-                    // <--
                 }
 
                 const SwRect &rPg = rSh.GetAnyCurRect(RECT_PAGE);
@@ -479,10 +477,8 @@ void SwFrameShell::Execute(SfxRequest &rReq)
                         }
                         if (SFX_ITEM_SET == pOutSet->GetItemState(FN_SET_FRM_ALT_NAME, TRUE, &pItem))
                         {
-                            // --> OD 2009-07-13 #i73249#
-//                            rSh.SetAlternateText(((const SfxStringItem*)pItem)->GetValue());
+                            // #i73249#
                             rSh.SetObjTitle(((const SfxStringItem*)pItem)->GetValue());
-                            // <--
                         }
                         // Vorlagen-AutoUpdate
                         SwFrmFmt* pFmt = rSh.GetCurFrmFmt();
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx
index 0fe336f2f006..90ab01c5e2c9 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -152,10 +152,8 @@ void SwGrfShell::Execute(SfxRequest &rReq)
             aSet.Put(SfxStringItem(FN_SET_FRM_NAME, rSh.GetFlyName()));
             if ( nSlot == FN_FORMAT_GRAFIC_DLG )
             {
-                // --> OD 2009-07-13 #i73249#
-//                aSet.Put(SfxStringItem(FN_SET_FRM_ALT_NAME, rSh.GetAlternateText()));
+                // #i73249#
                 aSet.Put( SfxStringItem( FN_SET_FRM_ALT_NAME, rSh.GetObjTitle() ) );
-                // <--
             }
 
             pRect = &rSh.GetAnyCurRect(RECT_PAGE_PRT);
@@ -328,11 +326,8 @@ void SwGrfShell::Execute(SfxRequest &rReq)
                 if ( SFX_ITEM_SET == pSet->GetItemState(
                                         FN_SET_FRM_ALT_NAME, TRUE, &pItem ))
                 {
-                    // --> OD 2009-07-13 #i73249#
-//                    rSh.SetAlternateText(
-//                                ((const SfxStringItem*)pItem)->GetValue() );
+                    // #i73249#
                     rSh.SetObjTitle( ((const SfxStringItem*)pItem)->GetValue() );
-                    // <--
                 }
 
                 SfxItemSet aGrfSet( rSh.GetAttrPool(), RES_GRFATR_BEGIN,
@@ -518,10 +513,6 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet)
     rSh.GetCurAttr( aCoreSet );
     BOOL bParentCntProt = 0 != rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT );
     BOOL bIsGrfCntnt = CNT_GRF == GetShell().GetCntType();
-    // --> OD 2006-11-03 #i59688#
-//    BOOL bSwappedOut = rSh.IsGrfSwapOut( TRUE );
-//    BOOL bBitmapType = !bSwappedOut && GRAPHIC_BITMAP == rSh.GetGraphicType();
-    // <--
 
     SetGetStateSet( &rSet );
 
@@ -651,16 +642,7 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet)
             {
                 if( bParentCntProt || !bIsGrfCntnt )
                     bDisable = TRUE;
-                // --> OD 2006-11-03 #i59688#
-                // load graphic only if type is unknown
-//                else if( bSwappedOut )
-//                {
-//                    rSet.DisableItem( nWhich );
-//                    if( AddGrfUpdateSlot( nWhich ))
-//                        rSh.GetGraphic(FALSE);  // start the loading
-//                }
-//                else
-//                    bDisable = !bBitmapType;
+                // #i59688# load graphic only if type is unknown
                 else
                 {
                     const USHORT eGraphicType( rSh.GetGraphicType() );
diff --git a/sw/source/ui/shells/makefile.mk b/sw/source/ui/shells/makefile.mk
index dce62a2c9336..36eb9b64b10a 100644
--- a/sw/source/ui/shells/makefile.mk
+++ b/sw/source/ui/shells/makefile.mk
@@ -43,7 +43,9 @@ SRC1FILES =  \
         shells.src
 
 SLOFILES =  \
-        $(SLO)$/langhelper.obj \
+        $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES =  \
         $(SLO)$/annotsh.obj \
         $(SLO)$/basesh.obj \
         $(SLO)$/beziersh.obj \
@@ -56,8 +58,9 @@ SLOFILES =  \
         $(SLO)$/frmsh.obj \
         $(SLO)$/grfsh.obj \
         $(SLO)$/grfshex.obj \
-        $(SLO)$/mediash.obj \
+        $(SLO)$/langhelper.obj \
         $(SLO)$/listsh.obj \
+        $(SLO)$/mediash.obj \
         $(SLO)$/olesh.obj \
         $(SLO)$/slotadd.obj \
         $(SLO)$/tabsh.obj \
@@ -72,20 +75,6 @@ SLOFILES =  \
         $(SLO)$/txtcrsr.obj \
         $(SLO)$/txtnum.obj
 
-EXCEPTIONSFILES =  \
-        $(SLO)$/basesh.obj \
-        $(SLO)$/annotsh.obj \
-        $(SLO)$/drwtxtsh.obj \
-        $(SLO)$/textsh.obj \
-        $(SLO)$/textsh2.obj \
-        $(SLO)$/grfshex.obj \
-        $(SLO)$/drawsh.obj \
-        $(SLO)$/drwtxtsh.obj \
-        $(SLO)$/frmsh.obj \
-        $(SLO)$/drwtxtex.obj \
-        $(SLO)$/slotadd.obj \
-        $(SLO)$/textsh1.obj
-
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 77e973900566..35dd6981b7b9 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -178,8 +178,6 @@ static SwTableRep*  lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh )
     USHORT  nBackgroundDestination = rSh.GetViewOptions()->GetTblDest();
     rSet.Put(SwBackgroundDestinationItem(SID_BACKGRND_DESTINATION, nBackgroundDestination ));
     SvxBrushItem aBrush( RES_BACKGROUND );
-//      rSh.GetBoxBackground(aBrush);
-//  rSet.Put( aBrush );
     if(rSh.GetRowBackground(aBrush))
         rSet.Put( aBrush, SID_ATTR_BRUSH_ROW );
     else
@@ -494,23 +492,6 @@ void SwTableShell::Execute(SfxRequest &rReq)
     {
         case SID_ATTR_BORDER:
         {
-/*          BOOL bPopCrsr = FALSE;
-            if ( !rReq.IsAPI() )
-            {
-                //Keine Tabellenselektion -> Aenderung wird auf die gesamte
-                //Tabelle.
-                if ( !rSh.IsTableMode() )
-                {
-                    rSh.StartAction();
-                    bPopCrsr = TRUE;
-                    rSh.Push();
-                    rSh.EnterStdMode();
-                    rSh.MoveTable( fnTableCurr, fnTableStart );
-                    rSh.SttSelect();
-                    rSh.MoveTable( fnTableCurr, fnTableEnd );
-                    rSh.EndSelect();
-                }
-            }*/
             if(!pArgs)
                 break;
             //Items erzeugen, weil wir sowieso nacharbeiten muessen
@@ -586,9 +567,6 @@ void SwTableShell::Execute(SfxRequest &rReq)
             if ((pBorderLine = aInfo.GetVert()) != NULL)
                 aInfo.SetLine(&aBorderLine, BOXINFO_LINE_VERT), bLine |= TRUE;
 
-//          if ( bPopCrsr && !bLine )
-//              aBox.SetDistance( 0 );
-
             aCoreSet.Put( aBox  );
             aCoreSet.Put( aInfo );
             rSh.SetTabBorders( aCoreSet );
@@ -600,12 +578,6 @@ void SwTableShell::Execute(SfxRequest &rReq)
             rReq.AppendItem( aInfo );
             bCallDone = TRUE;
 
-/*          if ( bPopCrsr )
-            {
-                rSh.KillPams();
-                rSh.Pop(FALSE);
-                rSh.EndAction();
-            }*/
         }
         break;
         case FN_INSERT_TABLE:
@@ -1268,7 +1240,6 @@ void SwTableShell::GetState(SfxItemSet &rSet)
             case FN_INSERT_TABLE:
                 // Irgendeinen Wert "putten", damit Controller enabled bleibt.
                 // Statt "Insert:Table" erscheint dann "Format:Table".
-//              rSet.Put(SfxUInt16Item(nSlot, 1));
                 break;
 
             case FN_TABLE_OPTIMAL_HEIGHT:
@@ -1428,24 +1399,6 @@ void SwTableShell::ExecTableStyle(SfxRequest& rReq)
             case SID_FRAME_LINESTYLE:
             case SID_FRAME_LINECOLOR:
             {
-/*  Tabellenselektion ist abgeschafft
-                BOOL bPopCrsr = FALSE;
-                if ( !rReq.IsAPI() )
-                {
-                    //Keine Tabellenselektion -> Aenderung wird auf die gesamte
-                    //Tabelle.
-                    if ( !rSh.IsTableMode() )
-                    {
-                        bPopCrsr = TRUE;
-                        rSh.Push();
-                        rSh.StartAction();
-                        rSh.EnterStdMode();
-                        rSh.MoveTable( fnTableCurr, fnTableStart );
-                        rSh.SttSelect();
-                        rSh.MoveTable( fnTableCurr, fnTableEnd );
-                        rSh.EndSelect();
-                    }
-                }*/
                 if ( rReq.GetSlot() == SID_FRAME_LINESTYLE )
                 {
                     const SvxLineItem &rLineItem = (const SvxLineItem&)pArgs->
@@ -1461,12 +1414,7 @@ void SwTableShell::ExecTableStyle(SfxRequest& rReq)
                 }
 
                 rReq.Done();
-/*              if ( bPopCrsr )
-                {
-                    rSh.KillPams();
-                    rSh.Pop(FALSE);
-                    rSh.EndAction();
-                }*/
+
                 break;
             }
         }
diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx
index 7750582e0d05..624006baba9e 100644
--- a/sw/source/ui/shells/textfld.cxx
+++ b/sw/source/ui/shells/textfld.cxx
@@ -640,12 +640,6 @@ void SwTextShell::StateField( SfxItemSet &rSet )
             break;
             case FN_EDIT_FIELD:
             {
-                /* #108536# Fields can be selected, too now. Removed
-
-                if( rSh.HasSelection() )
-                     rSet.DisableItem(nWhich);
-                else ...
-                */
 
                 if( !bGetField )
                 {
diff --git a/sw/source/ui/shells/textidx.cxx b/sw/source/ui/shells/textidx.cxx
index cb47f09827c0..7b9b31cb6f74 100644
--- a/sw/source/ui/shells/textidx.cxx
+++ b/sw/source/ui/shells/textidx.cxx
@@ -213,7 +213,7 @@ void SwTextShell::GetIdxState(SfxItemSet &rSet)
             rSet.Put(SfxBoolItem(FN_INSERT_AUTH_ENTRY_DLG, TRUE));
 
     }
-    else //if( SFX_ITEM_UNKNOWN != rSet.GetItemState( FN_EDIT_IDX_ENTRY_DLG ))
+    else
     {
 
         BOOL bEnableEdit = TRUE;
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index f385b53e8b14..d18a5e04b411 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -411,13 +411,9 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
                         xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsScrollingMode")),
                             uno::makeAny( (sal_Bool) ( eScroll == ScrollingYes) ) );
 
-                    //if ( aFrmDescr.IsFrameBorderSet() )
                     if ( pBorderItem )
                         xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsBorder")),
                             uno::makeAny( (sal_Bool) pBorderItem->GetValue() ) );
-                    /*else
-                        xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoBorder")),
-                            makeAny( sal_True ) );*/
 
                     if ( pMarginItem )
                     {
@@ -461,9 +457,6 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
                 {
                     SwFrmFmt* pTblFmt = GetShell().GetTableFmt();
                     String aCurrentTblName = pTblFmt->GetName();
-        //             String aText( String::CreateFromAscii("<.>") );   // was used for UI
-        //             aText.Insert( rWrtShell.GetBoxNms(), 2);
-        //             aText.Insert( aCurrentTblName, 1 );
                     aRangeString = aCurrentTblName;
                     aRangeString += OUString::valueOf( sal_Unicode('.') );
                     aRangeString += GetShell().GetBoxNms();
@@ -923,7 +916,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
                 }
             break;
             case FN_INSERT_HRULER :
-                if(rSh.IsReadOnlyAvailable() && rSh.HasReadonlySel() || bCrsrInHidden )
+                if ( (rSh.IsReadOnlyAvailable() && rSh.HasReadonlySel()) || bCrsrInHidden )
                     rSet.DisableItem(nWhich);
             break;
             case FN_FORMAT_COLUMN :
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 53076e7aed5f..fe1c11facd02 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -425,7 +425,6 @@ void SwTextShell::Execute(SfxRequest &rReq)
         {
             String aStr;
             SFX_REQUEST_ARG( rReq, pFont, SfxStringItem, FN_PARAM_1 , sal_False );
-//            SFX_REQUEST_ARG( rReq, pCharset, SfxInt16Item, FN_PARAM_2 , sal_False );
             SFX_REQUEST_ARG( rReq, pNameItem, SfxStringItem, nSlot , sal_False );
             if ( pNameItem )
                 aStr = pNameItem->GetValue();
@@ -440,7 +439,6 @@ void SwTextShell::Execute(SfxRequest &rReq)
                 SvxFontItem &rFont = (SvxFontItem &) aSet.Get( RES_CHRATR_FONT );
                 SvxFontItem aFont( rFont.GetFamily(), pFont->GetValue(),
                                     rFont.GetStyleName(), rFont.GetPitch(), RTL_TEXTENCODING_DONTKNOW, RES_CHRATR_FONT );
-                                    //pCharset ? (CharSet) pCharset->GetValue() : RTL_TEXTENCODING_DONTKNOW );
                 rWrtSh.SetAttr( aSet, nsSetAttrMode::SETATTR_DONTEXPAND );
                 rWrtSh.ResetSelect(0, FALSE);
                 rWrtSh.EndSelect();
@@ -466,7 +464,6 @@ void SwTextShell::Execute(SfxRequest &rReq)
                     aReq.AppendItem( SfxStringItem( nId, pDlg->GetStr() ) );
                 if ( pDlg->GetFontName().Len() )
                     aReq.AppendItem( SfxStringItem( FN_PARAM_1, pDlg->GetFontName() ) );
-                //aReq.AppendItem( SfxStringItem( FN_PARAM_2, pDlg->GetCharSet() ) );
                 ExecuteSlot( aReq );
             }
 
@@ -933,12 +930,8 @@ void SwTextShell::Execute(SfxRequest &rReq)
             {
                 SfxBoolItem aStart( FN_NUMBER_NEWSTART, rWrtSh.IsNumRuleStart() );
                 aCoreSet.Put(aStart);
-                // --> OD 2008-02-29 #refactorlists#
-//                SfxUInt16Item aStartAt(FN_NUMBER_NEWSTART_AT,
-//                                                rWrtSh.IsNodeNumStart());
                 SfxUInt16Item aStartAt( FN_NUMBER_NEWSTART_AT,
                                         rWrtSh.GetNodeNumStart() );
-                // <--
                 aCoreSet.Put(aStartAt);
             }
             SfxAbstractTabDialog* pDlg = NULL;
@@ -1004,14 +997,12 @@ void SwTextShell::Execute(SfxRequest &rReq)
                 if( pSet->Count() )
                 {
                     rWrtSh.StartAction();
-//                    rWrtSh.StartUndo( UNDO_START );
                     if ( SFX_ITEM_SET == pSet->GetItemState(FN_DROP_TEXT, FALSE, &pItem) )
                     {
                         if ( ((SfxStringItem*)pItem)->GetValue().Len() )
                             rWrtSh.ReplaceDropTxt(((SfxStringItem*)pItem)->GetValue());
                     }
                     rWrtSh.SetAttr( *pSet );
-//                    rWrtSh.EndUndo( UNDO_END );
                     rWrtSh.EndAction();
                     SwTxtFmtColl* pColl = rWrtSh.GetCurTxtFmtColl();
                     if(pColl && pColl->IsAutoUpdateFmt())
@@ -1109,30 +1100,15 @@ void SwTextShell::Execute(SfxRequest &rReq)
                 SwEditWin& rEditWin = GetView().GetEditWin();
                 rEditWin.SetTextColor(aSet);
                 SwApplyTemplate* pApply = rEditWin.GetApplyTemplate();
-                SvxColorItem aItem(aSet, RES_CHRATR_COLOR);
 
-                // besteht eine Selektion, wird sie gleich gefaerbt
-                if(!pApply && rWrtSh.HasSelection())
+                // If there is a selection, then set the color on it
+                // otherwise, it'll be the color for the next text to be typed
+                if(!pApply || pApply->nColor != SID_ATTR_CHAR_COLOR_EXT)
                 {
                     rWrtSh.SetAttr(SvxColorItem (aSet, RES_CHRATR_COLOR));
                 }
-                else if(!pApply || pApply->nColor != SID_ATTR_CHAR_COLOR_EXT)
-                {
-                    GetView().GetViewFrame()->GetDispatcher()->Execute(SID_ATTR_CHAR_COLOR_EXT);
-                }
 
                 rReq.Done();
-/*              OS 22.02.97 18:40 Das alte Verhalten ist unerwuenscht
-                SwEditWin& rEdtWin = GetView().GetEditWin();
-
-                SwApplyTemplate* pApply = rEdtWin.GetApplyTemplate();
-                SvxColorItem aItem(aSet, RES_CHRATR_COLOR);
-
-                if(!pApply || pApply->nColor != SID_ATTR_CHAR_COLOR_EXT)
-                {
-                    GetShell().SetAttr(aItem);
-                }
-*/
             }
         }
         break;
@@ -1163,15 +1139,6 @@ void SwTextShell::Execute(SfxRequest &rReq)
 
             rReq.Done();
 
-/*          OS 22.02.97 18:40 Das alte Verhalten ist unerwuenscht
-            if(!pApply || pApply->nColor != SID_ATTR_CHAR_COLOR_BACKGROUND_EXT)
-            {
-                Brush aBrush(pItem ? BRUSH_SOLID : BRUSH_NULL);
-                if(pItem)
-                    aBrush.SetColor( aSet );
-                GetShell().SetAttr( SvxBrushItem(aBrush, RES_CHRATR_BACKGROUND) );
-            }
-*/
         }
         break;
         case SID_ATTR_CHAR_COLOR_BACKGROUND_EXT:
@@ -1688,13 +1655,6 @@ void SwTextShell::GetState( SfxItemSet &rSet )
             break;
             case FN_NUM_CONTINUE:
             {
-                // --> OD 2009-08-26 #i86492#
-                // Allow continuation of previous list, even if at current cursor
-                // a list is active.
-//                if ( rSh.GetCurNumRule() )
-//                    rSet.DisableItem(nWhich);
-//                else
-                // <--
                 {
                     // --> OD 2009-08-26 #i86492#
                     // Search also for bullet list
@@ -1748,8 +1708,8 @@ void SwTextShell::ChangeHeaderOrFooter(
         String sTmp(aDesc.GetName());
         if( !rStyleName.Len() || rStyleName == sTmp )
         {
-            if( bShowWarning && !bOn && GetActiveView() && GetActiveView() == &GetView() &&
-                (bHeader && aDesc.GetMaster().GetHeader().IsActive()) ||
+            if( (bShowWarning && !bOn && GetActiveView() && GetActiveView() == &GetView() &&
+                (bHeader && aDesc.GetMaster().GetHeader().IsActive())) ||
                 (!bHeader && aDesc.GetMaster().GetFooter().IsActive()))
             {
                 bShowWarning = FALSE;
diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx
index 43ee2df4305f..6548259a2b44 100644
--- a/sw/source/ui/shells/txtattr.cxx
+++ b/sw/source/ui/shells/txtattr.cxx
@@ -108,8 +108,8 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq)
                 eEscape = nWhich == FN_SET_SUPER_SCRIPT ?
                                 SVX_ESCAPEMENT_SUPERSCRIPT:
                                 SVX_ESCAPEMENT_SUBSCRIPT;
-                if( nWhich == FN_SET_SUB_SCRIPT && nTmpEsc < 0 ||
-                            nWhich == FN_SET_SUPER_SCRIPT && nTmpEsc > 0 )
+                if( (nWhich == FN_SET_SUB_SCRIPT && nTmpEsc < 0) ||
+                            (nWhich == FN_SET_SUPER_SCRIPT && nTmpEsc > 0) )
                     eEscape = SVX_ESCAPEMENT_OFF;
 
                 SfxBindings& rBind = GetView().GetViewFrame()->GetBindings();
@@ -420,14 +420,7 @@ SET_LINESPACE:
             int eState = pArgs ? pArgs->GetItemState(nSlot) : SFX_ITEM_DISABLED;
             if (pArgs && SFX_ITEM_SET == eState)
                 bSet = ((const SfxBoolItem&)pArgs->Get(nSlot)).GetValue();
-/*
-// toggling of the slots not used anymore
-
-           if(!bSet)
-                nSlot = SID_ATTR_PARA_LEFT_TO_RIGHT == nSlot ?
-                    SID_ATTR_PARA_RIGHT_TO_LEFT :
-                    SID_ATTR_PARA_LEFT_TO_RIGHT;
-*/
+
             SfxItemSet aAdjustSet( GetPool(),
                     RES_PARATR_ADJUST, RES_PARATR_ADJUST );
             GetShell().GetCurAttr(aAdjustSet);
@@ -437,7 +430,6 @@ SET_LINESPACE:
             {
                 int eAdjust = (int)(( const SvxAdjustItem& )
                         aAdjustSet.Get(RES_PARATR_ADJUST)).GetAdjust();
-//                bChgAdjust = SVX_ADJUST_CENTER  != eAdjust  &&  SVX_ADJUST_BLOCK != eAdjust;
                 bChgAdjust = (SVX_ADJUST_LEFT  == eAdjust  &&  SID_ATTR_PARA_RIGHT_TO_LEFT == nSlot) ||
                              (SVX_ADJUST_RIGHT == eAdjust  &&  SID_ATTR_PARA_LEFT_TO_RIGHT == nSlot);
             }
diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx
index e08b4bdc0140..0720c71ef05e 100644
--- a/sw/source/ui/shells/txtnum.cxx
+++ b/sw/source/ui/shells/txtnum.cxx
@@ -95,10 +95,6 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
     break;
     case FN_NUMBER_BULLETS:
     {
-        // --> OD 2008-02-29 #refactorlists#
-//        // per default TRUE, damit die Schleife im Dialog richtig arbeitet!
-//        BOOL bHasChild = TRUE;
-        // <--
         SfxItemSet aSet(GetPool(),
                 SID_HTML_MODE, SID_HTML_MODE,
                 SID_ATTR_NUMBERING_RULE, SID_PARAM_CUR_NUM_LEVEL,
diff --git a/sw/source/ui/smartmenu/stmenu.cxx b/sw/source/ui/smartmenu/stmenu.cxx
index 13f3cc462391..42eed42c1413 100644
--- a/sw/source/ui/smartmenu/stmenu.cxx
+++ b/sw/source/ui/smartmenu/stmenu.cxx
@@ -54,8 +54,6 @@ SwSmartTagPopup::SwSmartTagPopup( SwView* pSwView,
     mpSwView ( pSwView ),
     mxTextRange( xTextRange )
 {
-    //CreateAutoMnemonics();
-
     Reference <frame::XController> xController = mpSwView->GetController();
     const lang::Locale aLocale( SW_BREAKITER()->GetLocale( (LanguageType)GetAppLanguage() ) );
 
diff --git a/sw/source/ui/table/chartins.cxx b/sw/source/ui/table/chartins.cxx
index 6cdca739c17a..928635f89c45 100644
--- a/sw/source/ui/table/chartins.cxx
+++ b/sw/source/ui/table/chartins.cxx
@@ -149,11 +149,6 @@ Point SwGetChartDialogPos( const Window *pParentWin, const Size& rDialogSize, co
     return aRet;
 }
 
-/*------------------------------------------------------------------------
-    Beschreibung:
-------------------------------------------------------------------------*/
-
-
 void SwInsertChart(Window* pParent, SfxBindings* pBindings )
 {
     (void) pParent;
@@ -178,9 +173,6 @@ void SwInsertChart(Window* pParent, SfxBindings* pBindings )
         {
             SwFrmFmt* pTblFmt = rWrtShell.GetTableFmt();
             String aCurrentTblName = pTblFmt->GetName();
-//             String aText( String::CreateFromAscii("<.>") );   // was used for UI
-//             aText.Insert( rWrtShell.GetBoxNms(), 2);
-//             aText.Insert( aCurrentTblName, 1 );
             aRangeString = aCurrentTblName;
             aRangeString += OUString::valueOf( sal_Unicode('.') );
             aRangeString += rWrtShell.GetBoxNms();
@@ -204,7 +196,7 @@ void SwInsertChart(Window* pParent, SfxBindings* pBindings )
         {
             uno::Reference< ui::dialogs::XExecutableDialog > xDialog(
                 xMCF->createInstanceWithContext(
-                    C2U("com.sun.star.comp.chart2.WizardDialog")
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.chart2.WizardDialog"))
                     , xContext), uno::UNO_QUERY);
             uno::Reference< lang::XInitialization > xInit( xDialog, uno::UNO_QUERY );
             if( xInit.is() )
@@ -214,10 +206,10 @@ void SwInsertChart(Window* pParent, SfxBindings* pBindings )
                 uno::Sequence<uno::Any> aSeq(2);
                 uno::Any* pArray = aSeq.getArray();
                 beans::PropertyValue aParam1;
-                aParam1.Name = C2U("ParentWindow");
+                aParam1.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow"));
                 aParam1.Value <<= uno::makeAny(xDialogParentWindow);
                 beans::PropertyValue aParam2;
-                aParam2.Name = C2U("ChartModel");
+                aParam2.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ChartModel"));
                 aParam2.Value <<= uno::makeAny(xChartModel);
                 pArray[0] <<= uno::makeAny(aParam1);
                 pArray[1] <<= uno::makeAny(aParam2);
diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index 809beeae5adb..fabe7d289130 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -185,9 +185,6 @@ IMPL_LINK_INLINE_START( SwInsTableDlg, ModifyName, Edit *, pEdit )
 }
 IMPL_LINK_INLINE_END( SwInsTableDlg, ModifyName, Edit *, EMPTYARG )
 
-/*-----------------15.04.98 11:36-------------------
-
---------------------------------------------------*/
 IMPL_LINK( SwInsTableDlg, ModifyRowCol, NumericField *, pField )
 {
     if(pField == &aColEdit)
diff --git a/sw/source/ui/table/makefile.mk b/sw/source/ui/table/makefile.mk
index 8b2ba850d174..7897bf9ad998 100644
--- a/sw/source/ui/table/makefile.mk
+++ b/sw/source/ui/table/makefile.mk
@@ -38,9 +38,6 @@ LIBTARGET=no
 
 # --- Files --------------------------------------------------------
 
-EXCEPTIONSFILES=   \
-        $(SLO)$/chartins.obj\
-
 SRS1NAME=$(TARGET)
 SRC1FILES =  \
         colwd.src \
@@ -54,19 +51,22 @@ SRC1FILES =  \
         tabledlg.src \
         tautofmt.src
 
-SLOFILES =  \
+EXCEPTIONSFILES=   \
+        $(SLO)$/chartins.obj \
         $(SLO)$/colwd.obj \
         $(SLO)$/convert.obj \
-        $(SLO)$/chartins.obj \
         $(SLO)$/instable.obj \
         $(SLO)$/mergetbl.obj \
         $(SLO)$/rowht.obj \
         $(SLO)$/splittbl.obj \
+        $(SLO)$/swtablerep.obj \
         $(SLO)$/tabledlg.obj \
         $(SLO)$/tablemgr.obj \
-        $(SLO)$/swtablerep.obj \
         $(SLO)$/tautofmt.obj
 
+SLOFILES =  \
+        $(EXCEPTIONSFILES)
+
 LIB1TARGET = $(SLB)$/$(TARGET).lib
 
 LIB1OBJFILES =	\
diff --git a/sw/source/ui/table/splittbl.cxx b/sw/source/ui/table/splittbl.cxx
index db1d1a1e80bc..35315ca22ef2 100644
--- a/sw/source/ui/table/splittbl.cxx
+++ b/sw/source/ui/table/splittbl.cxx
@@ -39,9 +39,7 @@
 #include <splittbl.hrc>
 #include <table.hrc>
 #include <tblenum.hxx>
-/*-----------------17.03.98 10:56-------------------
 
---------------------------------------------------*/
 SwSplitTblDlg::SwSplitTblDlg( Window *pParent, SwWrtShell &rSh ) :
     SvxStandardDialog(pParent, SW_RES(DLG_SPLIT_TABLE)),
     aOKPB(                  this, SW_RES(PB_OK      )),
@@ -59,9 +57,6 @@ SwSplitTblDlg::SwSplitTblDlg( Window *pParent, SwWrtShell &rSh ) :
     aCntntCopyRB.Check();
 }
 
-/*-----------------17.03.98 10:56-------------------
-
---------------------------------------------------*/
 void SwSplitTblDlg::Apply()
 {
     m_nSplit = HEADLINE_CNTNTCOPY;
diff --git a/sw/source/ui/table/swtablerep.cxx b/sw/source/ui/table/swtablerep.cxx
index 4a008bd43ef3..b3085bba254e 100644
--- a/sw/source/ui/table/swtablerep.cxx
+++ b/sw/source/ui/table/swtablerep.cxx
@@ -77,14 +77,11 @@ void DbgTColumn(TColumn* pTColumn, USHORT nCount)
         String sMsg(i);
         sMsg += pTColumn[i].bVisible ? " v " : " h ";
         sMsg += pTColumn[i].nWidth;
-        OSL_ENSURE(false, sMsg)
+        OSL_ENSURE(false, sMsg);
     }
 }
 #endif
 
-
-/*-----------------20.08.96 09.43-------------------
---------------------------------------------------*/
 SwTableRep::SwTableRep( const SwTabCols& rTabCol, BOOL bCplx )
     :
     nTblWidth(0),
@@ -117,15 +114,11 @@ SwTableRep::SwTableRep( const SwTabCols& rTabCol, BOOL bCplx )
     nAllCols++;
 }
 
-/*-----------------20.08.96 09.43-------------------
---------------------------------------------------*/
 SwTableRep::~SwTableRep()
 {
     delete[] pTColumns;
 }
 
-/*-----------------20.08.96 13.33-------------------
---------------------------------------------------*/
 BOOL SwTableRep::FillTabCols( SwTabCols& rTabCols ) const
 {
     long nOldLeft = rTabCols.GetLeft(),
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 3aba3fa7e872..f6dc85da4d47 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -81,8 +81,8 @@ using namespace ::com::sun::star;
 #ifdef DEBUG_TBLDLG
 void DbgTblRep(SwTableRep* pRep)
 {
-    OSL_ENSURE(false, String(pRep->GetColCount()))
-    OSL_ENSURE(false, String(pRep->GetAllColCount()))
+    OSL_ENSURE(false, String(pRep->GetColCount()));
+    OSL_ENSURE(false, String(pRep->GetAllColCount()));
     SwTwips nSum = 0;
     for(USHORT i = 0; i < pRep->GetAllColCount(); i++)
     {
@@ -90,23 +90,23 @@ void DbgTblRep(SwTableRep* pRep)
         sMsg += pRep->GetColumns()[i].bVisible ? " v " : " h ";
         sMsg += pRep->GetColumns()[i].nWidth;
         nSum +=pRep->GetColumns()[i].nWidth;
-        OSL_ENSURE(false, sMsg)
+        OSL_ENSURE(false, sMsg);
     }
     String sMsg("Column sum: ");
     sMsg += nSum;
     sMsg += " table width: ";
     sMsg += pRep->GetWidth();
-    OSL_ENSURE(false, sMsg)
+    OSL_ENSURE(false, sMsg);
     sMsg = "Gesamt/Links/Rechts: ";
     sMsg += pRep->GetSpace();
     sMsg += '/';
     sMsg += pRep->GetLeftSpace();
     sMsg += '/';
     sMsg += pRep->GetRightSpace();
-    OSL_ENSURE(false, sMsg)
+    OSL_ENSURE(false, sMsg);
     sMsg = "Align: ";
     sMsg += pRep->GetAlign();
-    OSL_ENSURE(false, sMsg)
+    OSL_ENSURE(false, sMsg);
 
 };
 
@@ -318,9 +318,7 @@ IMPL_LINK( SwFormatTablePage, RightModifyHdl, MetricField *, EMPTYARG )
     if(aFreeBtn.IsChecked())
     {
         BOOL bEnable = aRightMF.GetValue() == 0;
-//      aWidthMF.Enable(bEnable);
         aRelWidthCB.Enable(bEnable);
-//      aWidthFT.Enable(bEnable);
         if ( !bEnable )
         {
             aRelWidthCB.Check(FALSE);
@@ -785,8 +783,6 @@ int  SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet )
                 pTblData->SetAlign(nAlign);
             }
 
-
-    //      if(  text::HoriOrientation::CENTER && lWidth != (SwTwips)aWidthMF.GetSavedValue())
             if(pTblData->GetWidth() != lWidth )
             {
                 pTblData->SetWidthChanged();
@@ -1165,29 +1161,6 @@ void   SwTableColumnPage::UpdateCols( USHORT nAktPos )
 
             }
         nTableWidth += nAdd;
-
-    }
-    else
-    {
-//      Die Differenz wird gleichmaessig auf alle anderen Spalten aufgeteilt
-//      die Tabellenbreite bleibt konstant
-/*
-        SwTwips nDiffn = nDiff/(nNoOfVisibleCols - 1);
-        if(nDiff < 0 && (nNoOfVisibleCols - 1) * nDiffn != nDiff)
-            nDiffn-- ;
-        USHORT nStart = nAktPos++;
-        if(nAktPos == nNoOfVisibleCols)
-            nStart = 0;
-        for(USHORT i = 0; i < nNoOfVisibleCols; i++ )
-        {
-            if((nVisWidth = GetVisibleWidth(i)) + nDiff < MINLAY)
-            {
-                nAdd += nVisWidth - MINLAY;
-                SetVisibleWidth(i, MINLAY);
-            }
-        }
-*/
-
     }
 
 #ifdef DEBUG_TBLDLG
@@ -1246,10 +1219,6 @@ void    SwTableColumnPage::ActivatePage( const SfxItemSet& )
     aModifyTableCB.Enable( !bPercentMode && bModifyTbl );
     aProportionalCB.Enable(!bPercentMode && bModifyTbl );
 
-/*  if(pTblData->IsLineSelected() && pTblData->IsComplex())
-    {
-
-    }*/
     aSpaceED.SetValue(aSpaceED.Normalize(
                 pTblData->GetSpace() - nTableWidth) , FUNIT_TWIP);
 
@@ -1339,7 +1308,6 @@ SwTwips  SwTableColumnPage::GetVisibleWidth(USHORT nPos)
     while(!pTblData->GetColumns()[i].bVisible && (i + 1) < nNoOfCols)
         nReturn += pTblData->GetColumns()[++i].nWidth;
 
-//  return (*ppTableColumns)[i].nWidth;
     return nReturn;
 }
 
@@ -1408,8 +1376,6 @@ void  SwTableTabDlg::PageCreated(USHORT nId, SfxTabPage& rPage)
     }
 }
 
-/*-----------------12.12.96 12.22-------------------
---------------------------------------------------*/
 SwTextFlowPage::SwTextFlowPage( Window* pParent,
                                 const SfxItemSet& rSet ) :
     SfxTabPage(pParent, SW_RES( TP_TABLE_TEXTFLOW ), rSet ),
@@ -1479,22 +1445,16 @@ SwTextFlowPage::SwTextFlowPage( Window* pParent,
     HeadLineCBClickHdl();
 }
 
-/*-----------------12.12.96 12.22-------------------
---------------------------------------------------*/
  SwTextFlowPage::~SwTextFlowPage()
 {
 }
 
-/*-----------------12.12.96 12.22-------------------
---------------------------------------------------*/
 SfxTabPage*   SwTextFlowPage::Create( Window* pParent,
                                 const SfxItemSet& rAttrSet)
 {
     return new SwTextFlowPage(pParent, rAttrSet);
 }
 
-/*-----------------12.12.96 12.22-------------------
---------------------------------------------------*/
 BOOL  SwTextFlowPage::FillItemSet( SfxItemSet& rSet )
 {
     BOOL bModified = FALSE;
@@ -1611,8 +1571,6 @@ BOOL  SwTextFlowPage::FillItemSet( SfxItemSet& rSet )
 
 }
 
-/*-----------------12.12.96 12.22-------------------
---------------------------------------------------*/
 void   SwTextFlowPage::Reset( const SfxItemSet& rSet )
 {
     const SfxPoolItem* pItem;
@@ -1797,9 +1755,6 @@ void   SwTextFlowPage::Reset( const SfxItemSet& rSet )
 
     HeadLineCBClickHdl();
 }
-/*-----------------16.04.98 14:48-------------------
-
---------------------------------------------------*/
 
 void SwTextFlowPage::SetShell(SwWrtShell* pSh)
 {
@@ -1812,8 +1767,6 @@ void SwTextFlowPage::SetShell(SwWrtShell* pSh)
     }
 }
 
-/*-----------------12.12.96 16.18-------------------
---------------------------------------------------*/
 IMPL_LINK( SwTextFlowPage, PageBreakHdl_Impl, CheckBox*, EMPTYARG )
 {
     if( aPgBrkCB.IsChecked() )
@@ -1852,8 +1805,6 @@ IMPL_LINK( SwTextFlowPage, PageBreakHdl_Impl, CheckBox*, EMPTYARG )
     return 0;
 }
 
-/*-----------------12.12.96 16.18-------------------
---------------------------------------------------*/
 IMPL_LINK( SwTextFlowPage, ApplyCollClickHdl_Impl, CheckBox*, EMPTYARG )
 {
     BOOL bEnable = FALSE;
@@ -1876,8 +1827,6 @@ IMPL_LINK( SwTextFlowPage, ApplyCollClickHdl_Impl, CheckBox*, EMPTYARG )
     return 0;
 }
 
-/*-----------------12.12.96 16.18-------------------
---------------------------------------------------*/
 IMPL_LINK( SwTextFlowPage, PageBreakPosHdl_Impl, RadioButton*, pBtn )
 {
     if ( aPgBrkCB.IsChecked() )
@@ -1908,8 +1857,6 @@ IMPL_LINK( SwTextFlowPage, PageBreakPosHdl_Impl, RadioButton*, pBtn )
     return 0;
 }
 
-/*-----------------12.12.96 16.18-------------------
---------------------------------------------------*/
 IMPL_LINK( SwTextFlowPage, PageBreakTypeHdl_Impl, RadioButton*, pBtn )
 {
     if ( pBtn == &aColBrkRB || aPgBrkAfterRB.IsChecked() )
@@ -1924,17 +1871,13 @@ IMPL_LINK( SwTextFlowPage, PageBreakTypeHdl_Impl, RadioButton*, pBtn )
         PageBreakPosHdl_Impl( &aPgBrkBeforeRB );
     return 0;
 }
-/*-----------------17.11.2003 11:30-----------------
- *
- * --------------------------------------------------*/
+
 IMPL_LINK( SwTextFlowPage, SplitHdl_Impl, CheckBox*, pBox )
 {
     aSplitRowCB.Enable(pBox->IsChecked());
     return 0;
 }
-/*-----------------17.11.2003 11:30-----------------
- *
- * --------------------------------------------------*/
+
 IMPL_LINK( SwTextFlowPage, SplitRowHdl_Impl, TriStateBox*, pBox )
 {
     pBox->EnableTriState(FALSE);
@@ -1948,9 +1891,6 @@ IMPL_LINK( SwTextFlowPage, HeadLineCBClickHdl, void*, EMPTYARG )
     return 0;
 }
 
-/*-----------------30.05.97 07:37-------------------
-
---------------------------------------------------*/
 void SwTextFlowPage::DisablePageBreak()
 {
     bPageBreak = FALSE;
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 9116b00608bd..46eaddef7809 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -328,8 +328,6 @@ IMPL_LINK( SwAutoFormatDlg, CheckHdl, Button *, pBtn )
         pData->SetBackground( bCheck );
     else if ( pBtn == &aBtnAlignment )
         pData->SetJustify( bCheck );
-//    else if ( pBtn == &aBtnAdjust )
-//        pData->SetIncludeWidthHeight( bCheck );
     else
         bDataChgd = FALSE;
 
@@ -755,9 +753,6 @@ MAKENUMSTR:
         Rectangle           cellRect        = maArray.GetCellRect( nCol, nRow );
         Point               aPos            = cellRect.TopLeft();
         USHORT              nRightX         = 0;
-//            BOOL                bJustify        = aCurData.IsJustify();
-//            ScHorJustifyAttr    aHorJustifyItem;
-//          CellHorJustify    eJustification;
 
         Size theMaxStrSize( cellRect.GetWidth() - FRAME_OFFSET,
                             cellRect.GetHeight() - FRAME_OFFSET );
@@ -786,9 +781,6 @@ MAKENUMSTR:
         while( theMaxStrSize.Width() <= aStrSize.Width() &&
                 cellString.Len() > 1 )
         {
-//                  if( eJustification == SVX_HOR_JUSTIFY_RIGHT )
-//                          cellString.Erase( 0, 1 );
-//                  else
             cellString.Erase( cellString.Len() - 1 );
             aScriptedText.SetText( cellString, m_xBreak );
             aStrSize = aScriptedText.GetTextSize();
@@ -797,18 +789,6 @@ MAKENUMSTR:
         nRightX  = (USHORT)(  cellRect.GetWidth()
                                 - aStrSize.Width()
                                 - FRAME_OFFSET );
-        //-------------
-        // Ausrichtung:
-        //-------------
-        /*   if ( bJustify )
-        {
-            aCurData.GetHorJustify( nFmtIndex, aHorJustifyItem );
-            eJustification = (CellHorJustify)aHorJustifyItem.GetValue();
-        }
-        else
-        {
-            eJustification = SC_HOR_JUSTIFY_STANDARD;
-        }*/
 
         //-----------------------------
         // vertikal (immer zentrieren):
@@ -818,7 +798,6 @@ MAKENUMSTR:
         //-----------
         // horizontal
         //-----------
-/*        if ( eJustification != SC_HOR_JUSTIFY_STANDARD )*/
         if( mbRTL )
             aPos.X() += nRightX;
         else if (aCurData.IsJustify())
diff --git a/sw/source/ui/uiview/makefile.mk b/sw/source/ui/uiview/makefile.mk
index 337ee85da580..70a4efa525e9 100644
--- a/sw/source/ui/uiview/makefile.mk
+++ b/sw/source/ui/uiview/makefile.mk
@@ -45,6 +45,8 @@ SRC1FILES =  \
 
 EXCEPTIONSFILES= \
         $(SLO)$/formatclipboard.obj \
+        $(SLO)$/pview.obj \
+        $(SLO)$/scroll.obj \
         $(SLO)$/srcview.obj \
         $(SLO)$/swcli.obj  \
         $(SLO)$/uivwimp.obj \
@@ -52,37 +54,22 @@ EXCEPTIONSFILES= \
         $(SLO)$/view0.obj \
         $(SLO)$/view1.obj \
         $(SLO)$/view2.obj \
-        $(SLO)$/viewdraw.obj \
-        $(SLO)$/viewport.obj \
-        $(SLO)$/viewprt.obj \
-        $(SLO)$/viewsrch.obj \
-        $(SLO)$/viewling.obj \
-        $(SLO)$/viewmdi.obj \
-
-SLOFILES =  \
-        $(SLO)$/view0.obj \
-        $(SLO)$/view.obj \
-        $(SLO)$/view1.obj \
-        $(SLO)$/view2.obj \
         $(SLO)$/viewcoll.obj \
-        $(SLO)$/viewdlg2.obj \
         $(SLO)$/viewdlg.obj \
+        $(SLO)$/viewdlg2.obj \
         $(SLO)$/viewdraw.obj \
         $(SLO)$/viewling.obj \
         $(SLO)$/viewmdi.obj \
-        $(SLO)$/pview.obj \
         $(SLO)$/viewport.obj \
-        $(SLO)$/viewstat.obj \
-        $(SLO)$/viewtab.obj \
         $(SLO)$/viewprt.obj \
         $(SLO)$/viewsrch.obj \
-        $(SLO)$/scroll.obj \
-        $(SLO)$/swcli.obj  \
-        $(SLO)$/srcview.obj \
-        $(SLO)$/uivwimp.obj \
-        $(SLO)$/formatclipboard.obj
+        $(SLO)$/viewstat.obj \
+        $(SLO)$/viewtab.obj
+
+SLOFILES =  \
+        $(EXCEPTIONSFILES)
 
-# --- Tagets -------------------------------------------------------
+# --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
 
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index 7e54dd7ce12d..8f18436538f9 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -1311,17 +1311,7 @@ SwPagePreView::~SwPagePreView()
     delete pPageUpBtn;
     delete pPageDownBtn;
 
-/*    SfxObjectShell* pDocSh = GetDocShell();
-    for( SfxViewFrame *pFrame = SfxViewFrame::GetFirst( pDocSh );
-        pFrame; pFrame = SfxViewFrame::GetNext( *pFrame, pDocSh ) )
-        if( pFrame != GetViewFrame() )
-        {
-            // es gibt noch eine weitere Sicht auf unser Dokument, also
-            // aktiviere dieses
-            pFrame->GetFrame().Appear();
-            break;
-        }
-*/}
+}
 
 SwDocShell* SwPagePreView::GetDocShell()
 {
@@ -1811,30 +1801,6 @@ Size  SwPagePreView::GetOptimalSizePixel() const
 {
     OSL_ENSURE( false, "overloaded virtual method <SwPagePreView::GetOptimalSizePixel()> needed ??" );
     return Size( -1, -1 );
-/*
-    //JP 09.06.99: was wird hier errechnet ?????
-// ALT:
-//   SfxApplicationWindow* pWin = SFX_APPWINDOW ;
-//   Rectangle aRect = pWin->GetClientAreaPixel();
-
-    Window& rWin = GetViewFrame()->GetWindow();
-    Rectangle aRect( Point(0, 0), rWin.GetOutputSizePixel() );
-    Size aMaxSize( aRect.GetWidth(), aRect.GetHeight() );
-    Size aInSize = rWin.GetOutputSizePixel();
-    Size aOutSize = rWin.GetSizePixel();
-    USHORT nXBorder = USHORT(aOutSize.Width() - aInSize.Width());
-    USHORT nYBorder = USHORT(aOutSize.Height() - aInSize.Height());
-    aMaxSize.Width() -= nXBorder;
-    //'auf Verdacht' etwas vom Border abziehen (Menue)
-    nYBorder -= (nYBorder - nXBorder) / 2;
-    aMaxSize.Height() -= nYBorder;
-    //mit der max. moeglichen Outputsize guenstigstes Verhaeltnis ausrechnen
-    aViewWin.GetOptimalSize(aMaxSize);
-    // Border wieder dazuzaehlen
-    aMaxSize.Height() += nYBorder;
-    aMaxSize.Width() += nXBorder;
-    return aMaxSize;
-*/
 }
 
 // OD 12.12.2002 #103492#
diff --git a/sw/source/ui/uiview/scroll.cxx b/sw/source/ui/uiview/scroll.cxx
index 15d596f5633b..b58bd19ff24a 100644
--- a/sw/source/ui/uiview/scroll.cxx
+++ b/sw/source/ui/uiview/scroll.cxx
@@ -66,7 +66,6 @@ void SwScrollbar::DocSzChgd( const Size &rSize )
     SetRange( Range( 0, bHori ? rSize.Width() : rSize.Height()) );
     const ULONG nVisSize = GetVisibleSize();
     SetLineSize( SCROLL_LINE_SIZE );
-//    SetLineSize( nVisSize * 10 / 100 );
     SetPageSize( nVisSize * 77 / 100 );
 }
 
@@ -98,9 +97,6 @@ void SwScrollbar::ViewPortChgd( const Rectangle &rRect )
         AutoShow();
 }
 
-/*-----------------10/21/97 02:48pm-----------------
-
---------------------------------------------------*/
 void SwScrollbar::ExtendedShow( BOOL bSet )
 {
     bVisible = bSet;
@@ -108,9 +104,6 @@ void SwScrollbar::ExtendedShow( BOOL bSet )
         ScrollBar::Show(bSet);
 }
 
-/*-----------------10/21/97 03:23pm-----------------
-
---------------------------------------------------*/
 void SwScrollbar::SetPosSizePixel( const Point& rNewPos, const Size& rNewSize )
 {
     ScrollBar::SetPosSizePixel(rNewPos, rNewSize);
@@ -120,10 +113,6 @@ void SwScrollbar::SetPosSizePixel( const Point& rNewPos, const Size& rNewSize )
 
 }
 
-
-/*-----------------14.04.98 11:38-------------------
-
---------------------------------------------------*/
 void SwScrollbar::SetAuto(BOOL bSet)
 {
     if(bAuto != bSet)
@@ -137,9 +126,7 @@ void SwScrollbar::SetAuto(BOOL bSet)
             AutoShow(); // oder automatisch verstecken
     }
 }
-/*-----------------14.04.98 11:43-------------------
 
---------------------------------------------------*/
 void SwScrollbar::AutoShow()
 {
     long nVis = GetVisibleSize();
diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index 8d5dc09d6377..4a67bedd5137 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -254,7 +254,6 @@ SwSrcView::~SwSrcView()
     sal_Int32 delay = xDocProps->getAutoloadSecs();
     pDocShell->SetAutoLoad(INetURLObject(url), delay,
                             (delay != 0) || !url.equalsAscii(""));
-//  EndListening(*GetViewFrame());
     EndListening(*pDocShell);
     delete pSearchItem;
 }
@@ -281,7 +280,6 @@ void SwSrcView::Init()
         aEditWin.SetReadonly(TRUE);
     }
 
-//  StartListening(*GetViewFrame());
     StartListening(*pDocShell,TRUE);
 }
 
@@ -314,7 +312,6 @@ void SwSrcView::Execute(SfxRequest& rReq)
                 TemplateDescription::FILESAVE_AUTOEXTENSION,
                 TemplateDescription::FILESAVE_SIMPLE );
             uno::Reference < XFilePicker > xFP = aDlgHelper.GetFilePicker();
-//          pFileDlg->SetHelpId(HID_FILEDLG_SRCVIEW);
             uno::Reference<XFilterManager> xFltMgr(xFP, UNO_QUERY);
 
             // search for an html filter for export
diff --git a/sw/source/ui/uiview/uivwimp.cxx b/sw/source/ui/uiview/uivwimp.cxx
index 51ff90209e9e..6dabd5d8a5e5 100644
--- a/sw/source/ui/uiview/uivwimp.cxx
+++ b/sw/source/ui/uiview/uivwimp.cxx
@@ -158,8 +158,6 @@ void SwView_Impl::ExecuteScan( SfxRequest& rReq )
             else
             {
                 rReq.Ignore();
-// KA 04.07.2002
-//              InfoBox( 0, SW_RES(MSG_SCAN_NOSOURCE) ).Execute();
             }
         }
         break;
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index 77b6c83b681a..2157f74d9b42 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -29,7 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-
 #include <string> // HACK: prevent conflict between STLPORT and Workshop headers
 #include <stdlib.h>
 #include <hintids.hxx>
@@ -118,7 +117,6 @@
 
 #include <svl/cjkoptions.hxx>
 
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -126,7 +124,6 @@ using namespace ::com::sun::star::scanner;
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
 
-
 extern sal_Bool bNoInterrupt;       // in mainwn.cxx
 
 #define SWVIEWFLAGS ( SFX_VIEW_CAN_PRINT|               \
@@ -148,7 +145,6 @@ sal_Bool            SwView::bExtra      = sal_False;
 sal_Bool            SwView::bFound      = sal_False;
 sal_Bool            SwView::bJustOpened = sal_False;
 
-
 SvxSearchDialog*    SwView::pSrchDlg    = 0;
 SearchAttrItemList* SwView::pSrchList   = 0;
 SearchAttrItemList* SwView::pReplList   = 0;
@@ -256,7 +252,7 @@ void SwView::SelectShell()
     }
     pLastTableFormat = pCurTableFmt;
 
-    //SEL_TBL und SEL_TBL_CELLS koennen verodert sein!
+    //SEL_TBL and SEL_TBL_CELLS can be changed!
     int nNewSelectionType = (pWrtShell->GetSelectionType()
                                 & ~nsSelectionType::SEL_TBL_CELLS);
 
@@ -277,7 +273,6 @@ void SwView::SelectShell()
         SfxDispatcher &rDispatcher = GetDispatcher();
         SwToolbarConfigItem *pBarCfg = SW_MOD()->GetToolbarConfig();
 
-    //  DELETEZ(pxSelectionObj); //Selektionsobjekt loeschen
         if ( pShell )
         {
             rDispatcher.Flush();        // alle gecachten Shells wirklich loeschen
@@ -464,7 +459,7 @@ void SwView::SelectShell()
     if ( GetDocShell()->GetDoc()->IsOLEPrtNotifyPending() )
         GetDocShell()->GetDoc()->PrtOLENotify( sal_False );
 
-    //jetzt das Tabellen-Update
+    // now the table-update
     if(bUpdateTable)
         pWrtShell->UpdateTable();
 
@@ -496,7 +491,6 @@ IMPL_LINK( SwView, AttrChangedNotify, SwWrtShell *, EMPTYARG )
         GetDocShell()->IsReadOnly() )
         _CheckReadonlyState();
 
-    // JP 19.01.99: Cursor in Readonly Bereichen
     if( !pWrtShell->IsPaintLocked() && !bNoInterrupt )
         _CheckReadonlySelection();
 
@@ -524,26 +518,11 @@ IMPL_LINK( SwView, AttrChangedNotify, SwWrtShell *, EMPTYARG )
 
     }
 
-    //#i6193#, change ui if cursor is at a SwPostItField
+    // change ui if cursor is at a SwPostItField
     if (mpPostItMgr)
     {
-        // --> OD 2008-06-19 #i90516#
         // only perform the code that is needed to determine, if at the
         // actual cursor position is a post-it field
-//        SwRect aFldRect;
-//        SwContentAtPos aCntntAtPos( SwContentAtPos::SW_FIELD);
-//        if( pWrtShell->GetContentAtPos( pWrtShell->GetCrsrDocPos(), aCntntAtPos, FALSE, &aFldRect ) )
-//        {
-//            const SwField* pFld = aCntntAtPos.aFnd.pFld;
-//            if (pFld->Which()== RES_POSTITFLD)
-//            {
-//                mpPostItMgr->SetShadowState(reinterpret_cast<const SwPostItField*>(pFld));
-//            }
-//            else
-//                mpPostItMgr->SetShadowState(0);
-//        }
-//        else
-//            mpPostItMgr->SetShadowState(0);
         mpPostItMgr->SetShadowState( pWrtShell->GetPostItFieldAtCursor() );
     }
 
@@ -587,8 +566,8 @@ void SwView::_CheckReadonlyState()
     //Um erkennen zu koennen ob bereits disabled ist!
     SfxItemState eStateRO, eStateProtAll;
     const SfxPoolItem *pItem;
-    // JP 29.04.97: von einem nur uns bekannten Slot den Status abfragen.
-    //              Ansonsten kennen andere den Slot; wie z.B. die BasidIde
+    // von einem nur uns bekannten Slot den Status abfragen.
+    // Ansonsten kennen andere den Slot; wie z.B. die BasidIde
     eStateRO = rDis.QueryState( FN_INSERT_BOOKMARK, pItem );
     eStateProtAll = rDis.QueryState( FN_EDIT_REGION, pItem );
     sal_Bool bChgd = sal_False;
@@ -693,7 +672,7 @@ void SwView::_CheckReadonlySelection()
         case SHELL_MODE_TABLE_TEXT:
         case SHELL_MODE_TABLE_LIST_TEXT:
             {
-//JP 22.01.99: temporaere Loesung!!! Sollte bei jeder Cursorbewegung
+// temporaere Loesung!!! Sollte bei jeder Cursorbewegung
 //          den Font von der akt. Einfuegeposition setzen, also ausserhalb
 //          dieses if's. Aber TH wertet den Font zur Zeit nicht aus und
 //          das besorgen erscheint mir hier zu teuer zu sein.
@@ -729,7 +708,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
 
     aPageStr( SW_RES( STR_PAGE )),
     nNewPage(USHRT_MAX),
-    pNumRuleNodeFromDoc(0), // #i23726#
+    pNumRuleNodeFromDoc(0),
     pEditWin( new SwEditWin( &_pFrame->GetWindow(), *this ) ),
     pWrtShell(0),
     pShell(0),
@@ -770,7 +749,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
     bInDtor(FALSE),
     bOldShellWasPagePreView(FALSE)
 {
-    // OD 18.12.2002 #103492# - According to discussion with MBA and further
+    // According to discussion with MBA and further
     // investigations, no old SfxViewShell will be set as parameter <pOldSh>,
     // if function "New Window" is performed to open an additional view beside
     // an already existing one.
@@ -814,7 +793,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
 
     sal_Bool bOldShellWasSrcView = FALSE;
 
-    // OD 18.12.2002 #103492# - determine, if there is an existing view for
+    // determine if there is an existing view for
     // document
     SfxViewShell* pExistingSh = 0;
     if ( pOldSh )
@@ -869,20 +848,20 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
             aUsrPref.SetViewLayoutColumns( 1 );
         }
         pWrtShell = new SwWrtShell( rDoc, pEditWin, *this, &aUsrPref );
-        //#97610# creating an SwView from a SwPagePreView needs to
+        // creating an SwView from a SwPagePreView needs to
         // add the ViewShell to the ring of the other ViewShell(s)
         if(bOldShellWasPagePreView)
         {
             ViewShell& rPreviewViewShell = *((SwPagePreView*)pExistingSh)->GetViewShell();
             pWrtShell->MoveTo(&rPreviewViewShell);
-            //#95521# to update the field command et.al. if necessary
+            // to update the field command et.al. if necessary
             const SwViewOption* pPreViewOpt = rPreviewViewShell.GetViewOptions();
             if( pPreViewOpt->IsFldName() != aUsrPref.IsFldName() ||
                     pPreViewOpt->IsShowHiddenField() != aUsrPref.IsShowHiddenField() ||
                     pPreViewOpt->IsShowHiddenPara() != aUsrPref.IsShowHiddenPara() ||
                     pPreViewOpt->IsShowHiddenChar() != aUsrPref.IsShowHiddenChar() )
                 rPreviewViewShell.ApplyViewOptions(aUsrPref);
-            // OD 09.01.2003 #106334# - reset design mode at draw view for form
+            // reset design mode at draw view for form
             // shell, if needed.
             if ( ((SwPagePreView*)pExistingSh)->ResetFormDesignMode() &&
                  pWrtShell->HasDrawView() )
@@ -894,16 +873,15 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
     }
     RTL_LOGFILE_CONTEXT_TRACE( aLog, "after create WrtShell" );
 
-    // --> OD 2005-02-11 #i38810# - assure that modified state of document
+    // assure that modified state of document
     // isn't reset, if document is already modified.
     const bool bIsDocModified = pWrtShell->GetDoc()->IsModified();
-    // <--
 
-    // JP 05.02.99: Bug 61495 - damit unter anderem das HLineal im
+    // damit unter anderem das HLineal im
     //              ReadonlyFall nicht angezeigt wird
     aUsrPref.SetReadonly( pWrtShell->GetViewOptions()->IsReadonly() );
 
-    //Kein Margin fuer OLE!
+    // no margin for OLE!
     Size aBrwsBorder;
     if( SFX_CREATE_MODE_EMBEDDED != pDocSh->GetCreateMode() )
         aBrwsBorder = GetMargin();
@@ -929,7 +907,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
     StartListening( *pViewFrame, TRUE );
     StartListening( *pDocSh, TRUE );
 
-    // Vom HLineal den ZOOM-Faktor einstellen
+    // Set Zoom-factor from HLineal
     Fraction aZoomFract( aUsrPref.GetZoom(), 100 );
     pHRuler->SetZoom( aZoomFract );
     pVRuler->SetZoom( aZoomFract );
@@ -1040,14 +1018,13 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
     SfxViewFrame* pFirst = SfxViewFrame::GetFirst(pDocSh);
     // zur Zeit(360) wird die View erst nach dem Ctor eingetragen
     // der folgende Ausdruck funktioniert auch, wenn sich das aendert
-    //JP 27.07.98: wenn per Undo nicht mehr die Modifizierung aufhebar ist,
+    // wenn per Undo nicht mehr die Modifizierung aufhebar ist,
     //              so setze das Modified NICHT zurueck.
-    // --> OD 2005-02-11 #i38810# - no reset of modified state, if document
+    // no reset of modified state, if document
     // was already modified.
     if ( !pWrtShell->GetDoc()->IsUndoNoResetModified() &&
          ( !pFirst || pFirst == pVFrame ) &&
          !bIsDocModified )
-    // <--
     {
         pWrtShell->ResetModified();
     }
@@ -1062,12 +1039,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
         GetDispatcher().Execute(SID_NAVIGATOR, SFX_CALLMODE_ASYNCHRON, &aNavi, 0L);
     }
 
-
-    /*uno::Reference< awt::XWindow >  aTmpRef;
-    _pFrame->GetFrame().GetFrameInterface()->setComponent( aTmpRef,
-                                            pViewImpl->GetUNOObject_Impl());*/
-
-   uno::Reference< frame::XFrame >  xFrame = pVFrame->GetFrame().GetFrameInterface();
+    uno::Reference< frame::XFrame >  xFrame = pVFrame->GetFrame().GetFrameInterface();
 
     uno::Reference< frame::XFrame >  xBeamerFrame = xFrame->findFrame(
             OUString(RTL_CONSTASCII_USTRINGPARAM("_beamer")), frame::FrameSearchFlag::CHILDREN);
@@ -1103,9 +1075,7 @@ SwView::~SwView()
 {
     GetViewFrame()->GetWindow().RemoveChildEventListener( LINK( this, SwView, WindowChildEventListener ) );
     delete mpPostItMgr;
-    // --> OD 2009-03-10 #i100035#
     mpPostItMgr = 0;
-    // <--
 
     bInDtor = TRUE;
     pEditWin->Hide(); // damit kein Paint Aerger machen kann!
@@ -1119,7 +1089,7 @@ SwView::~SwView()
     if( aTimer.IsActive() && bAttrChgNotifiedWithRegistrations )
         GetViewFrame()->GetBindings().LEAVEREGISTRATIONS();
 
-    //JP 27.11.00: Bug 80631 - the last view must end the text edit
+    // the last view must end the text edit
     SdrView *pSdrView = pWrtShell ? pWrtShell->GetDrawView() : 0;
     if( pSdrView && pSdrView->IsTextEdit() )
         pSdrView->SdrEndTextEdit( sal_True );
@@ -1191,7 +1161,6 @@ void SwView::WriteUserData( String &rUserData, sal_Bool bBrowse )
 /*--------------------------------------------------------------------
     Beschreibung: CursorPos setzen
  --------------------------------------------------------------------*/
-//#i43146# go to the last editing position when opening own files
 bool lcl_IsOwnDocument( SwView& rView )
 {
     uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
@@ -1213,7 +1182,6 @@ void SwView::ReadUserData( const String &rUserData, sal_Bool bBrowse )
         //Forward/Backward
          (!pWrtShell->IsNewLayout() || pWrtShell->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) || bBrowse) )
     {
-        //#i43146# go to the last editing position when opening own files
         bool bIsOwnDocument = lcl_IsOwnDocument( *this );
 
         SET_CURR_SHELL(pWrtShell);
@@ -1254,14 +1222,13 @@ void SwView::ReadUserData( const String &rUserData, sal_Bool bBrowse )
             sal_Bool bSelectObj = (0 != rUserData.GetToken( nOff, ';', nPos ).ToInt32())
                                 && pWrtShell->IsObjSelectable( aCrsrPos );
 
-            //#i33307# restore editing position
+            // restore editing position
             pViewImpl->SetRestorePosition(aCrsrPos, bSelectObj);
-            // OD 11.02.2003 #100556# - set flag value to avoid macro execution.
+            // set flag value to avoid macro execution.
             bool bSavedFlagValue = pWrtShell->IsMacroExecAllowed();
             pWrtShell->SetMacroExecAllowed( false );
-//!!! pb (11.08.2004): #i32536#
 // os: changed: The user data has to be read if the view is switched back from page preview
-//#i43146# go to the last editing position when opening own files
+// go to the last editing position when opening own files
             if(bOldShellWasPagePreView || bIsOwnDocument)
             {
                 pWrtShell->SwCrsrShell::SetCrsr( aCrsrPos, !bSelectObj );
@@ -1272,15 +1239,14 @@ void SwView::ReadUserData( const String &rUserData, sal_Bool bBrowse )
                 }
             }
 
-            // OD 11.02.2003 #100556# - reset flag value
+            // reset flag value
             pWrtShell->SetMacroExecAllowed( bSavedFlagValue );
 
-            // OD 08.04.2003 #108693# - set visible area before applying
+            // set visible area before applying
             // information from print preview. Otherwise, the applied information
             // is lost.
-//!!! pb (11.08.2004): #i32536#
 // os: changed: The user data has to be read if the view is switched back from page preview
-//#i43146# go to the last editing position when opening own files
+// go to the last editing position when opening own files
             if(bOldShellWasPagePreView || bIsOwnDocument )
             {
                 if ( bBrowse )
@@ -1331,7 +1297,6 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
 {
     if(GetDocShell()->IsPreview())
         return;
-    //#i43146# go to the last editing position when opening own files
     bool bIsOwnDocument = lcl_IsOwnDocument( *this );
     sal_Int32 nLength = rSequence.getLength();
     if (nLength && (!pWrtShell->IsNewLayout() || pWrtShell->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) || bBrowse) )
@@ -1444,13 +1409,11 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
                     sal_Bool bSelectObj = (sal_False != bSelectedFrame )
                                         && pWrtShell->IsObjSelectable( aCrsrPos );
 
-                    // OD 11.02.2003 #100556# - set flag value to avoid macro execution.
+                    // set flag value to avoid macro execution.
                     bool bSavedFlagValue = pWrtShell->IsMacroExecAllowed();
                     pWrtShell->SetMacroExecAllowed( false );
-//!!! pb (11.08.2004): #i32536#
 // os: changed: The user data has to be read if the view is switched back from page preview
-//#i43146# go to the last editing position when opening own files
-                    //#i33307# restore editing position
+// go to the last editing position when opening own files
                     pViewImpl->SetRestorePosition(aCrsrPos, bSelectObj);
                     if(bOldShellWasPagePreView|| bIsOwnDocument)
                     {
@@ -1462,7 +1425,7 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
                         }
                     }
 
-                    // OD 11.02.2003 #100556# - reset flag value
+                    // reset flag value
                     pWrtShell->SetMacroExecAllowed( bSavedFlagValue );
                 }
                 SelectShell();
@@ -1483,7 +1446,6 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
                                                   bSetViewSettings &&
                                                   eZoom != SVX_ZOOM_PERCENT;
 
-
                 if ( !bZoomNeedsViewLayout )
                     pWrtShell->StartAction();
 
@@ -1496,15 +1458,14 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
                 if ( bSetViewSettings )
                     SetZoom( eZoom, nZoomFactor, sal_True );
 
-//!!! pb (11.08.2004): #i32536#
 // os: changed: The user data has to be read if the view is switched back from page preview
-//#i43146# go to the last editing position when opening own files
+// go to the last editing position when opening own files
                 if(bOldShellWasPagePreView||bIsOwnDocument)
                 {
                     if ( bBrowse && bGotVisibleLeft && bGotVisibleTop )
                     {
                         Point aTopLeft(aVis.TopLeft());
-                        //#i76699# make sure the document is still centered
+                        // make sure the document is still centered
                         const SwTwips lBorder = IsDocumentBorder() ? DOCUMENTBORDER : 2 * DOCUMENTBORDER;
                         SwTwips nEditWidth = GetEditWin().GetOutputSize().Width();
                         if(nEditWidth > (aDocSz.Width() + lBorder ))
@@ -1604,7 +1565,7 @@ void SwView::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue >& rSe
 
 void SwView::ShowCursor( bool bOn )
 {
-    //JP 10.10.2001: Bug 90461 - don't scroll the cursor into the visible area
+    //don't scroll the cursor into the visible area
     BOOL bUnlockView = !pWrtShell->IsViewLocked();
     pWrtShell->LockView( TRUE );    //lock visible section
 
@@ -1629,9 +1590,8 @@ ErrCode SwView::DoVerb( long nVerb )
     return ERRCODE_NONE;
 }
 
-/*-----------------17.02.98 13:33-------------------
-    nur sal_True fuer eine Textselektion zurueck geben
---------------------------------------------------*/
+/*   only return sal_True for a text selection
+*/
 sal_Bool SwView::HasSelection( sal_Bool  bText ) const
 {
     return bText ? GetWrtShell().SwCrsrShell::HasSelection()
@@ -1671,7 +1631,7 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
         sal_uInt32 nId = ((SfxSimpleHint&)rHint).GetId();
         switch ( nId )
         {
-            // --> OD 2005-03-03 #i43775# - sub shells will be destroyed by the
+            // sub shells will be destroyed by the
             // dispatcher, if the view frame is dying. Thus, reset member <pShell>.
             case SFX_HINT_DYING:
                 {
@@ -1681,7 +1641,6 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
                     }
                 }
                 break;
-            // <--
             case SFX_HINT_MODECHANGED:
                 {
                     // Modalmodus-Umschaltung?
@@ -1690,7 +1649,7 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
                     pVRuler->SetActive( !bModal );
                 }
 
-                /* kein break hier */
+                /* no break here */
 
             case SFX_HINT_TITLECHANGED:
                 if ( GetDocShell()->IsReadOnly() != GetWrtShell().GetViewOptions()->IsReadonly() )
@@ -1707,7 +1666,7 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
                     else
                         KillTab();
                     bool bReadonly = GetDocShell()->IsReadOnly();
-                    //#i76332# if document is to be opened in alive-mode then this has to be regarded while switching from readonly-mode to edit-mode
+                    // if document is to be opened in alive-mode then this has to be regarded while switching from readonly-mode to edit-mode
                     if( !bReadonly )
                     {
                         SwDrawDocument * pDrawDoc = 0;
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index cc87cb45f745..73ef3be1c086 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -127,7 +127,6 @@ SFX_IMPL_INTERFACE( SwView, SfxViewShell, SW_RES(RID_TOOLS_TOOLBOX) )
     SFX_CHILDWINDOW_REGISTRATION(FN_INSERT_FIELD_DATA_ONLY);
         SFX_FEATURED_CHILDWINDOW_REGISTRATION(FN_SYNC_LABELS,           CHILDWIN_LABEL    );
         SFX_FEATURED_CHILDWINDOW_REGISTRATION(FN_MAILMERGE_CHILDWINDOW, CHILDWIN_MAILMERGE);
-//    SFX_CHILDWINDOW_REGISTRATION(FN_MAILMERGE_SENDMAIL_CHILDWINDOW);
     SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS|
                                 SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
                                 SW_RES(RID_TOOLS_TOOLBOX) );
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 489e81e84860..6dc7b6bc9876 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -973,10 +973,10 @@ void __EXPORT SwView::Execute(SfxRequest &rReq)
                 JumpToSwMark( (( const SfxStringItem*)pItem)->GetValue() );
             break;
         case SID_GALLERY :
-            GetViewFrame()->ChildWindowExecute(rReq);//ToggleChildWindow(SID_GALLERY);
+            GetViewFrame()->ChildWindowExecute(rReq);
         break;
         case SID_AVMEDIA_PLAYER :
-            GetViewFrame()->ChildWindowExecute(rReq);//ToggleChildWindow(SID_AVMEDIA_PLAYER);
+            GetViewFrame()->ChildWindowExecute(rReq);
         break;
         case SID_VIEW_DATA_SOURCE_BROWSER:
         {
@@ -995,7 +995,6 @@ void __EXPORT SwView::Execute(SfxRequest &rReq)
             if( pArgs &&
                 SFX_ITEM_SET == pArgs->GetItemState(nSlot, FALSE, &pItem ))
                 bShow = ((const SfxBoolItem*)pItem)->GetValue();
-            //GetViewFrame()->ShowChildWindow(nSlot, bShow && bInMailMerge);
             if((bShow && bInMailMerge) != GetViewFrame()->HasChildWindow(nSlot))
                 GetViewFrame()->ToggleChildWindow(nSlot);
             //if fields have been succesfully inserted call the "real"
@@ -1189,19 +1188,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
     {
         switch( nWhich )
         {
-            case FN_STAT_PAGE:
-/*
-//JP 07.01.00: is a nice feature - show the selektion of DrawObjects
-            if( rShell.IsObjSelected()
-//???               || rShell.IsFrmSelected()
-                )
-            {
-                String sDisplay( rShell.GetDrawView()->GetMarkedObjectList().
-                                    GetDescriptionOfMarkedObjects() );
-                rSet.Put( SfxStringItem( FN_STAT_PAGE, sDisplay ));
-            }
-            else
-*/          {
+            case FN_STAT_PAGE: {
                 // Anzahl der Seiten, log. SeitenNr. SeitenNr ermitteln
                 USHORT nPage, nLogPage;
                 String sDisplay;
@@ -1384,45 +1371,6 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
                         }
                     }
                 }
-
-                //#outline level, removed by zhaojianwei
-                //const SwNumRule* pNumRule = rShell.GetCurNumRule();
-                //if (pNumRule) // Cursor in Numerierung
-                //{
-                //  BYTE nNumLevel = rShell.GetNumLevel();
-                //  if( IsShowNum(nNumLevel) && MAXLEVEL >
-                //      ( nNumLevel = GetRealLevel( nNumLevel )) )
-                //  {
-                //      if( sStr.Len() )
-                //          sStr.AppendAscii(sStatusDelim);
-                //      sStr += SW_RESSTR(STR_NUM_LEVEL);
-                //      sStr += String::CreateFromInt32( nNumLevel + 1 );
-                //      if(!pNumRule->IsAutoRule())
-                //      {
-                //          SfxItemSet aSet(GetPool(),
-                //              RES_PARATR_NUMRULE, RES_PARATR_NUMRULE);
-                //          rShell.GetCurAttr(aSet);
-                //          /* const SfxPoolItem* pItem; */
-                //          if(SFX_ITEM_AVAILABLE <=
-                //              aSet.GetItemState(RES_PARATR_NUMRULE, TRUE
-                //              /*, &pItem */ ))
-                //          {
-                //              const String& rNumStyle =
-                //                  ((const SfxStringItem &)
-                //                  aSet.Get(RES_PARATR_NUMRULE)).GetValue();
-                //              /* #i5116# GetItemState does not necessarily
-                //              change pItem */
-                //              // ((const SfxStringItem*)pItem)->GetValue();
-                //              if(rNumStyle.Len())
-                //              {
-                //                  sStr.AppendAscii(sStatusDelim);
-                //                  sStr += rNumStyle;
-                //              }
-                //          }
-                //      }
-                //  }
-                //}//<-removed end ,zhaojianwei
-
                 //-->#outline level,added by zhaojianwei
                 const SwNumRule* pNumRule = rShell.GetCurNumRule();
                 const bool bOutlineNum = pNumRule ? pNumRule->IsOutlineRule() : 0;
@@ -1431,18 +1379,13 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
                 if (pNumRule && !bOutlineNum )  // Cursor in Numerierung
                 {
                     BYTE nNumLevel = rShell.GetNumLevel();
-                    // --> OD 2008-04-02 #refactorlists#
-//                    if( IsShowNum(nNumLevel) && MAXLEVEL >
-//                        ( nNumLevel = GetRealLevel( nNumLevel )) )
                     if ( nNumLevel < MAXLEVEL )
-                    // <--
                     {
                         if(!pNumRule->IsAutoRule())
                         {
                             SfxItemSet aSet(GetPool(),
                                     RES_PARATR_NUMRULE, RES_PARATR_NUMRULE);
                             rShell.GetCurAttr(aSet);
-                            /* const SfxPoolItem* pItem; */
                             if(SFX_ITEM_AVAILABLE <=
                                aSet.GetItemState(RES_PARATR_NUMRULE, TRUE
                                                  /*, &pItem */ ))
@@ -1450,9 +1393,6 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
                                 const String& rNumStyle =
                                     ((const SfxStringItem &)
                                      aSet.Get(RES_PARATR_NUMRULE)).GetValue();
-                                /* #i5116# GetItemState does not necessarily
-                                   change pItem */
-                                // ((const SfxStringItem*)pItem)->GetValue();
                                 if(rNumStyle.Len())
                                 {
                                     if( sStr.Len() )
@@ -1818,13 +1758,6 @@ void SwView::EditLinkDlg()
         pDlg->Execute();
         delete pDlg;
     }
-/*
-    SwLinkDlg* pDlg = new SwLinkDlg(GetFrameWindow());
-    pDlg->SetShell(&GetWrtShell());
-    pDlg->Execute();
-
-    DELETEZ(pDlg);
-*/
 }
 
 BOOL SwView::JumpToSwMark( const String& rMark )
diff --git a/sw/source/ui/uiview/viewdlg2.cxx b/sw/source/ui/uiview/viewdlg2.cxx
index 9a6bd8a0c77d..50db327adbf5 100644
--- a/sw/source/ui/uiview/viewdlg2.cxx
+++ b/sw/source/ui/uiview/viewdlg2.cxx
@@ -61,10 +61,6 @@ extern String* pOldTabCat;
 extern String* pOldFrmCat;
 extern String* pOldDrwCat;
 
-/* -----------------06.11.98 13:45-------------------
- *
- * --------------------------------------------------*/
-
 void SwView::ExecDlgExt(SfxRequest &rReq)
 {
     Window *pMDI = &GetViewFrame()->GetWindow();
@@ -102,10 +98,6 @@ void SwView::ExecDlgExt(SfxRequest &rReq)
     }
 }
 
-/* -----------------06.11.98 14:53-------------------
- *
- * --------------------------------------------------*/
-
 void SwView::AutoCaption(const USHORT nType, const SvGlobalName *pOleId)
 {
     SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig();
@@ -119,10 +111,6 @@ void SwView::AutoCaption(const USHORT nType, const SvGlobalName *pOleId)
     }
 }
 
-/* -----------------06.11.98 12:58-------------------
- *
- * --------------------------------------------------*/
-
 void SwView::InsertCaption(const InsCaptionOpt *pOpt)
 {
     if (!pOpt)
diff --git a/sw/source/ui/uiview/viewdraw.cxx b/sw/source/ui/uiview/viewdraw.cxx
index 07c8f7864434..465c69cd16cc 100644
--- a/sw/source/ui/uiview/viewdraw.cxx
+++ b/sw/source/ui/uiview/viewdraw.cxx
@@ -496,7 +496,6 @@ sal_Bool SwView::EnterDrawTextMode(const Point& aDocPos)
 
         // #108784#
         // To allow SwDrawVirtObj text objects to be activated, allow their type, too.
-        //pObj->ISA( SdrTextObj ) &&
         ( pObj->ISA( SdrTextObj ) ||
           ( pObj->ISA(SwDrawVirtObj) &&
             ((SwDrawVirtObj*)pObj)->GetReferencedObj().ISA(SdrTextObj) ) ) &&
@@ -552,10 +551,6 @@ sal_Bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin,
         if( bIsNewObj )
             pOutliner->SetVertical( SID_DRAW_TEXT_VERTICAL == nDrawSfxId ||
                                     SID_DRAW_CAPTION_VERTICAL == nDrawSfxId );
-        // #i7672#
-        // No longer necessary, see text below
-        // Color aBackground(pSh->GetShapeBackgrd());
-        // pOutliner->SetBackgroundColor(aBackground);
 
         // OD 09.12.2002 #103045# - set default horizontal text direction at outliner
         EEHorizontalTextDirection aDefHoriTextDir =
diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx
index 163e55ca8f62..29bb65822a39 100644
--- a/sw/source/ui/uiview/viewling.cxx
+++ b/sw/source/ui/uiview/viewling.cxx
@@ -737,8 +737,8 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt)
                 aEvent.ExecutePosition.Y = aPixPos.Y();
                 Menu* pMenu = 0;
 
-                ::rtl::OUString sMenuName = ::rtl::OUString::createFromAscii(
-                    bUseGrammarContext ? "private:resource/GrammarContextMenu" : "private:resource/SpellContextMenu");
+                ::rtl::OUString sMenuName  = bUseGrammarContext ?
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/GrammarContextMenu")) : OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/SpellContextMenu"));
                 if(TryContextMenuInterception( *pPopup, sMenuName, pMenu, aEvent ))
                 {
 
@@ -865,12 +865,10 @@ public:
 
 protected:
     virtual void LoseFocus() {
-//  printf("ListBox: lose focus!!\n");
     ListBox::LoseFocus();
     }
 
     virtual void Select() {
-//  printf("SELECT!!! IsTravelSelect=%i\n", IsTravelSelect());
     ListBox::Select();
     }
 };
@@ -890,7 +888,7 @@ public:
     assert(fieldBM!=NULL);
     if (fieldBM!=NULL) {
         const IFieldmark::parameter_map_t* const pParameters = fieldBM->GetParameters();
-        IFieldmark::parameter_map_t::const_iterator pListEntries = pParameters->find(::rtl::OUString::createFromAscii(ODF_FORMDROPDOWN_LISTENTRY));
+        IFieldmark::parameter_map_t::const_iterator pListEntries = pParameters->find(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMDROPDOWN_LISTENTRY)));
         if(pListEntries != pParameters->end())
         {
             Sequence< ::rtl::OUString> vListEntries;
@@ -915,21 +913,12 @@ public:
     aText.SetPosPixel(Point(0, lbSize.Height()));
     aText.Show();
     SetSizePixel(Size(lbSize.Width(), lbSize.Height()+tSize.Height()));
-//  SetSizePixel(Size(200, 200));
     }
 
     int getSelection() {
     return selection;
     }
 protected:
-    /*
-    virtual void LoseFocus() {
-    printf("lose focus!!\n");
-    Dialog::LoseFocus();
-    printf("close:\n");
-    EndDialog(8);
-    }
-    */
 
     virtual long PreNotify( NotifyEvent& rNEvt ) {
     if (rNEvt.GetType() == EVENT_LOSEFOCUS && aListBox.GetImplWin()==rNEvt.GetWindow()) {
@@ -937,7 +926,6 @@ protected:
         return 1;
     }
     if (rNEvt.GetType() == EVENT_KEYINPUT) {
-//      printf("PreNotify::KEYINPUT\n");
     }
     return Dialog::PreNotify(rNEvt);
     }
@@ -971,7 +959,7 @@ BOOL SwView::ExecFieldPopup( const Point& rPt, IFieldmark *fieldBM )
     /*short ret=*/aFldDlg.Execute();
     sal_Int32 selection=aFldDlg.getSelection();
     if (selection>=0) {
-        (*fieldBM->GetParameters())[::rtl::OUString::createFromAscii(ODF_FORMDROPDOWN_RESULT)] = makeAny(selection);
+        (*fieldBM->GetParameters())[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMDROPDOWN_RESULT))] = makeAny(selection);
     }
 
     pWrtShell->Pop( sal_False );
diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx
index 04309b9821a1..caa56daf02d6 100644
--- a/sw/source/ui/uiview/viewmdi.cxx
+++ b/sw/source/ui/uiview/viewmdi.cxx
@@ -150,7 +150,7 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType,
                 nFac = Min( nFac, nVisPercent );
             }
         }
-        else /*if( SVX_ZOOM_PAGEWIDTH_NOBORDER == eZoomType )*/
+        else
         {
             const long nTmpWidth = bAutomaticViewLayout ? aPageSize.Width() : aRootSize.Width();
             nFac = aWindowSize.Width() * 100 / nTmpWidth;
@@ -222,15 +222,6 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType,
     pWrtShell->UnlockPaint();
     if( bUnLockView )
         pWrtShell->LockView( FALSE );
-
-//    if ( mpPostItMgr )
-//    {
-//        mpPostItMgr->Rescale();
-//        mpPostItMgr->CalcRects();
-//        mpPostItMgr->LayoutPostIts();
-//    }
-
-//  eZoom = eZoomType;
 }
 
 void SwView::SetViewLayout( USHORT nColumns, bool bBookMode, BOOL bViewOnly )
diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx
index 2e92bc864234..1d8ea819ae56 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/ui/uiview/viewport.cxx
@@ -701,10 +701,6 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar )
         String sDisplay;
         if(pWrtShell->GetPageNumber( aPos.Y(), FALSE, nPhNum, nVirtNum, sDisplay ))
         {
-            // JP 21.07.00: the end scrollhandler invalidate the FN_STAT_PAGE,
-            //              so we dont must do it agin.
-//          if(!GetViewFrame()->GetFrame().IsInPlace())
-//              S F X_BINDINGS().Update(FN_STAT_PAGE);
 
             //QuickHelp:
             if( pWrtShell->GetPageCnt() > 1 && Help::IsQuickHelpEnabled() )
diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx
index 3366fa80db6f..d0e25c2071c4 100644
--- a/sw/source/ui/uiview/viewprt.cxx
+++ b/sw/source/ui/uiview/viewprt.cxx
@@ -182,12 +182,9 @@ SfxTabPage* __EXPORT SwView::CreatePrintOptionsPage(Window* pParent,
 PrintDialog* CreatePrintDialog( Window* pParent, USHORT nPg, SwWrtShell* pSh )
 {
     PrintDialog *pDlg = new PrintDialog( pParent, false );
-//  pDlg->ChangeFirstPage( 1 );
 
     if ( !nPg )
         nPg = 1;
-//  pDlg->ChangeLastPage( nPg );
-//  pDlg->ChangeMaxPage( 9999 );
     pDlg->EnableRange( PRINTDIALOG_FROMTO );
 
     if (pSh && (pSh->IsSelection() || pSh->IsFrmSelected() || pSh->IsObjSelected()))
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index 2342a75c8aa7..fa483123f074 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -99,12 +99,6 @@ inline Window* GetParentWindow( SvxSearchDialog* pSrchDlg )
     return pWin;
 }
 
-
-/*-----------------12.04.97 13:04-------------------
-
---------------------------------------------------*/
-
-
 void SwView::ExecSearch(SfxRequest& rReq, BOOL bNoMessage)
 {
     const SfxItemSet* pArgs = rReq.GetArgs();
@@ -770,38 +764,6 @@ void SwView::StateSearch(SfxItemSet &rSet)
                 rSet.Put( *pSrchItem );
             }
             break;
-
-/*          case SID_SEARCH_REPLACESET:
-            case SID_SEARCH_SEARCHSET:
-            {
-                static USHORT __READONLY_DATA aSearchAttrRange[] =
-                {
-                        RES_CHRATR_CASEMAP,     RES_CHRATR_POSTURE,
-                        RES_CHRATR_SHADOWED,    RES_CHRATR_WORDLINEMODE,
-                        RES_PARATR_LINESPACING, RES_PARATR_HYPHENZONE,
-                        RES_LR_SPACE,           RES_UL_SPACE,
-                        SID_ATTR_PARA_MODEL,    SID_ATTR_PARA_KEEP,
-                        0
-                };
-
-                SfxItemSet aSet(pWrtShell->GetAttrPool(), aSearchAttrRange );
-                if( SID_SEARCH_REPLACESET==nWhich )
-                {
-                    if( pReplList )
-                    {
-                        pReplList->Get( aSet );
-                        DELETEZ( pReplList );
-                    }
-                }
-                else if( pSrchList )
-                {
-                    pSrchList->Get( aSet );
-                    DELETEZ( pSrchList );
-                }
-                rSet.Put( SvxSetItem( nWhich, aSet ));
-            }
-            break;
-*/
         }
         nWhich = aIter.NextWhich();
     }
diff --git a/sw/source/ui/uiview/viewstat.cxx b/sw/source/ui/uiview/viewstat.cxx
index fdaf59ec4742..ba9ca2dfe65f 100644
--- a/sw/source/ui/uiview/viewstat.cxx
+++ b/sw/source/ui/uiview/viewstat.cxx
@@ -331,7 +331,6 @@ void SwView::GetState(SfxItemSet &rSet)
             case SID_DOCUMENT_COMPARE:
             case SID_DOCUMENT_MERGE:
                 if( GetDocShell()->IsA( SwGlobalDocShell::StaticType() ) ||
-//                  pWrtShell->IsAnySectionInDoc( sal_True, sal_True, sal_True )||
                     (SID_DOCUMENT_MERGE == nWhich && pWrtShell->getIDocumentRedlineAccess()->GetRedlinePassword().getLength()))
                     rSet.DisableItem(nWhich);
             break;
@@ -459,7 +458,6 @@ void SwView::GetDrawState(SfxItemSet &rSet)
         case SID_SHOW_HIDDEN:
         case SID_SHOW_FORMS:
             rSet.DisableItem( nWhich );
-            // rSet.Put( SfxBoolItem(nWhich,sal_True ));
             break;
 
         case SID_DRAW_TEXT_MARQUEE:
diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx
index 4bb32d3667a9..3c0ea75be104 100644
--- a/sw/source/ui/uiview/viewtab.cxx
+++ b/sw/source/ui/uiview/viewtab.cxx
@@ -946,8 +946,6 @@ void SwView::StateTabWin(SfxItemSet& rSet)
     {
         switch ( nWhich )
         {
-//        case RES_LR_SPACE:
-//        case SID_ATTR_LRSPACE:
         case SID_ATTR_LONG_LRSPACE:
         {
             SvxLongLRSpaceItem aLongLR( (long)aPageLRSpace.GetLeft(),
@@ -1010,8 +1008,6 @@ void SwView::StateTabWin(SfxItemSet& rSet)
             break;
         }
         case SID_ATTR_LONG_ULSPACE:
-//        case SID_ATTR_ULSPACE:
-//        case RES_UL_SPACE:
         {
             // Rand Seite Oben Unten
             SvxULSpaceItem aUL( rDesc.GetMaster().GetULSpace() );
diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx
index b0b59aa3c044..72047f05ad82 100644
--- a/sw/source/ui/uno/SwXDocumentSettings.cxx
+++ b/sw/source/ui/uno/SwXDocumentSettings.cxx
@@ -821,7 +821,6 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf
         break;
         case HANDLE_IS_KERN_ASIAN_PUNCTUATION:
         {
-            //sal_Bool bParaSpace = mpDoc->IsKernAsianPunctuation();
             sal_Bool bParaSpace = mpDoc->get(IDocumentSettingAccess::KERN_ASIAN_PUNCTUATION);
             rValue.setValue(&bParaSpace, ::getBooleanCppuType());
         }
diff --git a/sw/source/ui/uno/dlelstnr.cxx b/sw/source/ui/uno/dlelstnr.cxx
index 53359a88176b..d81f27bcf934 100644
--- a/sw/source/ui/uno/dlelstnr.cxx
+++ b/sw/source/ui/uno/dlelstnr.cxx
@@ -56,8 +56,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::linguistic2;
 using namespace ::com::sun::star::linguistic2::LinguServiceEventFlags;
 
-#define A2OU(x) OUString::createFromAscii(x)
-
 SwLinguServiceEventListener::SwLinguServiceEventListener()
 {
     Reference< XMultiServiceFactory > xMgr( comphelper::getProcessServiceFactory() );
@@ -65,20 +63,20 @@ SwLinguServiceEventListener::SwLinguServiceEventListener()
     {
         try
         {
-            OUString aSvcName( A2OU( "com.sun.star.frame.Desktop" ) );
+            OUString aSvcName( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" )) );
             xDesktop = Reference< frame::XDesktop >(
                     xMgr->createInstance( aSvcName ), UNO_QUERY );
             if (xDesktop.is())
                 xDesktop->addTerminateListener( this );
 
-            aSvcName = A2OU( "com.sun.star.linguistic2.LinguServiceManager" );
+            aSvcName = OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.linguistic2.LinguServiceManager" ));
             xLngSvcMgr = Reference< XLinguServiceManager >( xMgr->createInstance( aSvcName ), UNO_QUERY );
             if (xLngSvcMgr.is())
                 xLngSvcMgr->addLinguServiceManagerListener( (XLinguServiceEventListener *) this );
 
             if (SvtLinguConfig().HasGrammarChecker())
             {
-                aSvcName = A2OU( "com.sun.star.linguistic2.ProofreadingIterator" );
+                aSvcName = OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.linguistic2.ProofreadingIterator" ));
                 xGCIterator = Reference< XProofreadingIterator >( xMgr->createInstance( aSvcName ), UNO_QUERY );
                 Reference< XLinguServiceEventBroadcaster > xBC( xGCIterator, UNO_QUERY );
                 if (xBC.is())
@@ -167,7 +165,6 @@ void SAL_CALL SwLinguServiceEventListener::queryTermination(
             const EventObject& /*rEventObj*/ )
         throw(TerminationVetoException, RuntimeException)
 {
-    //SolarMutexGuard aGuard;
 }
 
 void SAL_CALL SwLinguServiceEventListener::notifyTermination(
diff --git a/sw/source/ui/uno/swdet2.cxx b/sw/source/ui/uno/swdet2.cxx
index 5df50b64a30d..6f325faab3df 100644
--- a/sw/source/ui/uno/swdet2.cxx
+++ b/sw/source/ui/uno/swdet2.cxx
@@ -76,36 +76,7 @@ ULONG SwFilterDetect::DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilt
     const SfxFilter* pTmp = SwIoSystem::GetFileFilter( rMedium.GetPhysicalName(), aPrefFlt, &rMedium );
     if( !pTmp )
         return ERRCODE_ABORT;
-    /*
-    else if( *ppFilter && (*ppFilter)->GetUserData().EqualsAscii( "W4W", 0, 3 )
-                && pTmp->GetUserData().EqualsAscii( FILTER_TEXT, 0, 4 ) )
-    {
-        // Bug 95262 - if the user (or short  detect) select a
-        //              Word 4 Word filter, but the autodect of mastersoft
-        //              can't detect it, we normally return the ascii filter
-        //              But the user may have a change to use the W4W filter,
-        //              so the SFX must show now a dialog with the 2 filters
-        nRet = ERRCODE_SFX_CONSULTUSER;
-        *ppFilter = pTmp;
-    } */
 
-    // sollte der voreingestellte Filter ASCII sein und wir haben
-    // ASCII erkannt, dann ist das ein gultiger Filter, ansonsten ist das
-    // ein Fehler und wir wollen die Filterbox sehen
-    /*
-    else if( pTmp->GetUserData().EqualsAscii( FILTER_TEXT ) )
-    {
-        // Bug 28974: "Text" erkannt, aber "Text Dos" "Text ..." eingestellt
-        //  -> keine FilterBox, sondern den eingestellten Filter benutzen
-        if( *ppFilter && (*ppFilter)->GetUserData().EqualsAscii( FILTER_TEXT, 0, 4 ) )
-            ;
-        else
-//          if( !*ppFilter || COMPARE_EQUAL != pTmp->GetUserData().Compare((*ppFilter)->GetUserData(), 4 ))
-        {
-//              nRet = ERRCODE_ABORT;
-            *ppFilter = pTmp;
-        }
-    } */
     else
     {
         //Bug 41417: JP 09.07.97: HTML documents should be loaded by WebWriter
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index c7b155c5a019..e13e62216e3c 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -170,9 +170,7 @@ SwFilterDetect::~SwFilterDetect()
             nIndexOfDocumentTitle = nProperty;
     }
 
-    // can't check the type for external filters, so set the "dont" flag accordingly
     SolarMutexGuard aGuard;
-    //SfxFilterFlags nMust = SFX_FILTER_IMPORT, nDont = SFX_FILTER_NOTINSTALLED;
 
     SfxApplication* pApp = SFX_APP();
     SfxAllItemSet *pSet = new SfxAllItemSet( pApp->GetPool() );
@@ -190,7 +188,6 @@ SwFilterDetect::~SwFilterDetect()
             String aPattern( aPrefix );
             aPattern += String::CreateFromAscii("swriter");
             if ( aURL.Match( aPattern ) >= aPattern.Len() )
-                //pFilter = SfxFilter::GetDefaultFilterFromFactory( aURL );
                 return aTypeName;
         }
     }
diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx
index 8885ca9d82ea..4d68828abfd0 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/ui/uno/unoatxt.cxx
@@ -395,10 +395,6 @@ uno::Reference< text::XAutoTextEntry >  SwXAutoTextGroup::insertNewByName(const
     String sLongName(aTitle);
     if(pGlosGroup && !pGlosGroup->GetError())
     {
-        /*if( pGlosGroup->IsOld() && pGlosGroup->ConvertToNew())
-        {
-            throw uno::RuntimeException();
-        } */
         uno::Reference<lang::XUnoTunnel> xRangeTunnel( xTextRange, uno::UNO_QUERY);
         SwXTextRange* pxRange = 0;
         OTextCursorHelper* pxCursor = 0;
diff --git a/sw/source/ui/uno/unodispatch.cxx b/sw/source/ui/uno/unodispatch.cxx
index 9bee47d7481c..e3337edd17b4 100644
--- a/sw/source/ui/uno/unodispatch.cxx
+++ b/sw/source/ui/uno/unodispatch.cxx
@@ -234,7 +234,6 @@ void SwXDispatch::dispatch(
             FN_MAILMERGE_WIZARD,
             SFX_CALLMODE_ASYNCHRON,
             &aDBProperties, 0L);
-//      pNewDBMgr->ExecuteFormLetter(rSh, aArgs);
     }
     else if(!aURL.Complete.compareToAscii(cURLDocumentDataSource))
     {
@@ -393,7 +392,6 @@ const sal_Char* SwXDispatch::GetDBChangeURL()
 
 SwXDispatchProviderInterceptor::DispatchMutexLock_Impl::DispatchMutexLock_Impl(
                                                  SwXDispatchProviderInterceptor& ) :
-//    aGuard(rInterceptor.m_aMutex) #102295# solar mutex has to be used currently
     aGuard(Application::GetSolarMutex())
 {
 }
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx
index 44597ea0cab9..ed85d476fbe0 100644
--- a/sw/source/ui/uno/unomailmerge.cxx
+++ b/sw/source/ui/uno/unomailmerge.cxx
@@ -735,7 +735,6 @@ uno::Any SAL_CALL SwXMailMerge::execute(
                 aCurFileNamePrefix = aURLObj.GetBase(); // filename without extension
             if (!aCurOutputURL.getLength())
             {
-                //aCurOutputURL = aURLObj.GetURLPath();
                 aURLObj.removeSegment();
                 aCurOutputURL = aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI );
             }
@@ -768,7 +767,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
             aMergeDesc.aSaveToFilterData = aSaveFilterData;
             aMergeDesc.bCreateSingleFile = bSaveAsSingleFile;
         }
-        else /*if(MailMergeType::MAIL == nCurOutputType)*/
+        else
         {
             pMgr->SetEMailColumn( sAddressFromColumn );
             if(!sAddressFromColumn.getLength())
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index 1609e78f2cdd..345f3d915150 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -1370,11 +1370,6 @@ Reference< drawing::XDrawPage >  SwXTextDocument::getDrawPage(void) throw( Runti
         // for the case that it did something by purpose
         ((SwXTextDocument*)this)->pDrawPage = new SwXDrawPage(pDocShell->GetDoc());
         ((SwXTextDocument*)this)->pxXDrawPage = new Reference< drawing::XDrawPage >(pDrawPage);
-
-        //((SwXTextDocument*)this)->pxXDrawPage = new Reference< drawing::XDrawPage > ;
-        //((SwXTextDocument*)this)->pDrawPage = new SwXDrawPage(pDocShell->GetDoc());
-        //Reference< drawing::XShapes >  xTmp = pDrawPage;
-        //*pxXDrawPage = Reference< drawing::XDrawPage>(xTmp, UNO_QUERY);
     }
     return *pxXDrawPage;
 }
@@ -2507,7 +2502,6 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
     if (!m_pPrintUIOptions)
         m_pPrintUIOptions = lcl_GetPrintUIOptions( pDocShell, pView );
     bool bFormat = m_pPrintUIOptions->processPropertiesAndCheckFormat( rxOptions );
-    // const bool bIsSkipEmptyPages    = !m_pPrintUIOptions->IsPrintEmptyPages( bIsPDFExport );
 
     SwDoc *pDoc = GetRenderDoc( pView, rSelection, bIsPDFExport );
     OSL_ENSURE( pDoc && pView, "doc or view shell missing!" );
@@ -2819,9 +2813,6 @@ SfxViewShell * SwXTextDocument::GuessViewShell(
     if (pView)
         rbIsSwSrcView = pSwSrcView != 0;
     return pView;
-//    return pSwView ? dynamic_cast< SfxViewShell * >(pSwView) :
-//            (pSwSrcView ? dynamic_cast< SfxViewShell * >(pSwSrcView) :
-//                          dynamic_cast< SfxViewShell * >(pSwPagePreView) );
 }
 
 void SAL_CALL SwXTextDocument::render(
@@ -3266,14 +3257,6 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName)
         Reference< XPropertySet >  xRet(xTbls, UNO_QUERY);
         aRet.setValue(&xRet, ::getCppuType((Reference< XPropertySet>*)0));
     }
-/*  else if(sToCompare == )
-    {
-        sSuffix += UniString::CreateFromAscii(pMarkToText);
-        Reference< XNameAccess >  xTbls = new SwXLinkNameAccessWrapper(
-                                        pxDoc->, sSuffix );
-        Reference< XPropertySet >  xRet(xTbls, UNO_QUERY);
-        aRet.setValue(&xRet, ::getCppuType((const XPropertySet*)0));
-    }*/
     else if(sToCompare == sGraphics)
     {
         sSuffix += UniString::CreateFromAscii(pMarkToGraphic);
@@ -3579,8 +3562,6 @@ Any lcl_GetDisplayBitmap(String sLinkSuffix)
         nImgId = CONTENT_TYPE_FRAME;
     else if(COMPARE_EQUAL  == sLinkSuffix.CompareToAscii(pMarkToGraphic))
         nImgId = CONTENT_TYPE_GRAPHIC;
-//  else if(== sLinkSuffix)
-//      nImgId = CONTENT_TYPE_BOOKMARK;
     else if(COMPARE_EQUAL  == sLinkSuffix.CompareToAscii(pMarkToRegion))
         nImgId = CONTENT_TYPE_REGION;
     else if(COMPARE_EQUAL == sLinkSuffix.CompareToAscii(pMarkToOLE))
@@ -3590,8 +3571,7 @@ Any lcl_GetDisplayBitmap(String sLinkSuffix)
     if(USHRT_MAX != nImgId)
     {
         nImgId += 20000;
-        BOOL bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
-        ImageList aEntryImages( SW_RES(bHighContrast ? IMG_NAVI_ENTRYBMPH : IMG_NAVI_ENTRYBMP) );
+        ImageList aEntryImages( SW_RES(IMG_NAVI_ENTRYBMP) );
         const Image& rImage = aEntryImages.GetImage( nImgId );
         Bitmap aBitmap( rImage.GetBitmapEx().GetBitmap() );
         Reference<awt::XBitmap> xBmp = VCLUnoHelper::CreateBitmap( aBitmap );
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index d4765157b456..3f110e5d6556 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -167,7 +167,6 @@ void SwXTextView::Invalidate()
 
 Sequence< uno::Type > SAL_CALL SwXTextView::getTypes(  ) throw(uno::RuntimeException)
 {
-//  uno::Sequence< uno::Type > aViewTypes = SwXTextViewBaseClass::getTypes();
     uno::Sequence< uno::Type > aBaseTypes = SfxBaseController::getTypes();
 
     long nIndex = aBaseTypes.getLength();
@@ -454,7 +453,6 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) throw( lang::IllegalArg
                     SdrObject *pObj = pSvxShape->GetSdrObject();
                     if (pObj)
                     {
-//                      lcl_ShowObject( *m_pViewSh, *pDrawView, pObj );
                         SdrPageView* pPV = pDrawView->GetSdrPageView();
                         if ( pPV && pObj->GetPage() == pPV->GetPage() )
                         {
@@ -487,7 +485,6 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) throw( lang::IllegalArg
                                 {
                                     if (!pPV)               // erstes Objekt
                                     {
-//                                      lcl_ShowObject( *m_pViewSh, *pDrawView, pObj );
                                         pPV = pDrawView->GetSdrPageView();
                                     }
                                     if ( pPV && pObj->GetPage() == pPV->GetPage() )
diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx
index 2de34301fe59..cadfb353e70f 100644
--- a/sw/source/ui/utlui/attrdesc.cxx
+++ b/sw/source/ui/utlui/attrdesc.cxx
@@ -71,7 +71,7 @@ using namespace com::sun::star;
 
 TYPEINIT2(SwFmtCharFmt,SfxPoolItem,SwClient);
 
-// erfrage die Attribut-Beschreibung
+// query the attribute descriptions
 void SwAttrSet::GetPresentation(
         SfxItemPresentation ePres,
         SfxMapUnit eCoreMetric,
@@ -911,20 +911,12 @@ SfxItemPresentation SwFmtFtnEndAtTxtEnd::GetPresentation
                 switch( GetValue() )
                 {
                 case FTNEND_ATPGORDOCEND:
-//                  rText = SW_RESSTR( STR_LAYOUT_FTN );
                     break;
 
                 case FTNEND_ATTXTEND:
                     break;
 
                 case FTNEND_ATTXTEND_OWNNUMSEQ:
-                    {
-//  String      sPrefix;
-//  String      sSuffix;
-//  SvxNumberType   aFmt;
-//  USHORT      nOffset;
-//                      rText +=
-                    }
                     break;
                 }
             }
@@ -1062,20 +1054,6 @@ SfxItemPresentation SwHeaderAndFooterEatSpacingItem::GetPresentation
     const IntlWrapper*        /*pIntl*/
 )   const
 {
-//    rText.Erase();
-//    switch ( ePres )
-//    {
-//        case SFX_ITEM_PRESENTATION_NONE:
-//            rText.Erase();
-//            break;
-//        case SFX_ITEM_PRESENTATION_NAMELESS:
-//        case SFX_ITEM_PRESENTATION_COMPLETE:
-//        {
-//            if ( GetValue() )
-//                rText = SW_RESSTR(STR_EDIT_IN_READONLY);
-//            return ePres;
-//        }
-//    }
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index 1beea561d3fd..c7ad691c5415 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -97,7 +97,6 @@
 #include "globals.hrc"
 #include <unomid.h>
 
-
 #define CTYPE_CNT   0
 #define CTYPE_CTT   1
 
@@ -107,7 +106,6 @@ using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;
 
-
 #define NAVI_BOOKMARK_DELIM     (sal_Unicode)1
 
 typedef SwContent* SwContentPtr;
@@ -116,7 +114,6 @@ SV_IMPL_OP_PTRARR_SORT(SwContentArr, SwContentPtr)
 
 sal_Bool SwContentTree::bIsInDrag = sal_False;
 
-
 namespace
 {
     static sal_Bool lcl_IsContent(SvLBoxEntry* pEntry)
@@ -124,13 +121,11 @@ namespace
         return ((SwTypeNumber*)pEntry->GetUserData())->GetTypeId() == CTYPE_CNT;
     }
 
-
     static sal_Bool lcl_IsContentType(SvLBoxEntry* pEntry)
     {
         return ((SwTypeNumber*)pEntry->GetUserData())->GetTypeId() == CTYPE_CTT;
     }
 
-
     static sal_Bool lcl_FindShell(SwWrtShell* pShell)
     {
         sal_Bool bFound = sal_False;
@@ -328,7 +323,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow)
                     if( !pFmt->GetInfo( aAskItem ) &&
                         !aAskItem.pObject )     // not visible
                         pCnt->SetInvisible();
-                    pMember->Insert(pCnt);//, pMember->Count());
+                    pMember->Insert(pCnt);
 
                     sal_uInt16 nPos = pMember->Count() - 1;
                     if(nOldRegionCount > nPos &&
@@ -386,7 +381,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow)
                                         RTL_TEXTENCODING_UTF8 ),
                                     &p->rINetAttr,
                                     n );
-                pMember->Insert( pCnt );//, n );
+                pMember->Insert( pCnt );
             }
             bEdit = sal_True;
             nOldMemberCount = nMemberCount;
@@ -423,28 +418,8 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow)
                             nMemberCount++;
                         }
                     }
-                    /*
-                    //  this code can be used once we want redline comments in the margin
-                    else    // redcomment
-                    {
-                        SwRedline* pRedline = static_cast<SwRedline*>((*i)->GetBroadCaster());
-                        if ( pRedline->GetComment().Len() )
-                        {
-                            String sEntry = pRedline->GetComment();
-                            RemoveNewline(sEntry);
-                            SwPostItContent* pCnt = new SwPostItContent(
-                                                this,
-                                                sEntry, // hier steht der Text
-                                                pRedline,
-                                                nMemberCount);
-                            pMember->Insert(pCnt);
-                            nMemberCount++;
-                        }
-                    }
-                    */
                 }
             }
-            //
             sTypeToken = aEmptyStr;
             bEdit = sal_True;
             nOldMemberCount = nMemberCount;
@@ -462,10 +437,8 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow)
                 for( sal_uInt32 i=0; i< nCount; i++ )
                 {
                     SdrObject* pTemp = pPage->GetObj(i);
-                    // --> OD 2006-03-09 #i51726# - all drawing objects can be named now
-//                    if(pTemp->ISA(SdrObjGroup) && pTemp->GetName().Len())
+                    // #i51726# - all drawing objects can be named now
                     if ( pTemp->GetName().Len() )
-                    // <--
                         nMemberCount++;
                 }
             }
@@ -578,7 +551,7 @@ void    SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
                     !aAskItem.pObject )     // not visible
                     pCnt->SetInvisible();
 
-                pMember->Insert(pCnt);//, i);
+                pMember->Insert(pCnt);
 
                 if(nOldMemberCount > (int)i &&
                     (pOldMember->GetObject(i))->IsInvisible() != pCnt->IsInvisible())
@@ -623,7 +596,7 @@ void    SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
                 if( !pFrmFmt->GetInfo( aAskItem ) &&
                     !aAskItem.pObject )     // not visible
                     pCnt->SetInvisible();
-                pMember->Insert(pCnt);//, i);
+                pMember->Insert(pCnt);
                 if(nOldMemberCount > (int)i &&
                     (pOldMember->GetObject(i))->IsInvisible() != pCnt->IsInvisible())
                         *pbLevelOrVisibiblityChanged = sal_True;
@@ -642,7 +615,7 @@ void    SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
                     const String& rBkmName = ppBookmark->get()->GetName();
                     //nYPos von 0 -> text::Bookmarks werden nach Alphabet sortiert
                     SwContent* pCnt = new SwContent(this, rBkmName, 0);
-                    pMember->Insert(pCnt);//, pMember->Count());
+                    pMember->Insert(pCnt);
                 }
             }
         }
@@ -675,7 +648,7 @@ void    SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
                     if( !pFmt->GetInfo( aAskItem ) &&
                         !aAskItem.pObject )     // not visible
                         pCnt->SetInvisible();
-                    pMember->Insert(pCnt);//, pMember->Count());
+                    pMember->Insert(pCnt);
 
                     sal_uInt16 nPos = pMember->Count() - 1;
                     if(nOldMemberCount > nPos &&
@@ -697,7 +670,7 @@ void    SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
                 //Referenzen nach Alphabet sortiert
                 SwContent* pCnt = new SwContent(
                             this, *aRefMarks.GetObject(i), 0);
-                pMember->Insert(pCnt);//, i);
+                pMember->Insert(pCnt);
             }
         }
         break;
@@ -718,7 +691,7 @@ void    SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
                                         RTL_TEXTENCODING_UTF8 ),
                                     &p->rINetAttr,
                                     n );
-                pMember->Insert( pCnt );//, n );
+                pMember->Insert( pCnt );
             }
         }
         break;
@@ -738,7 +711,7 @@ void    SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
                     !aAskItem.pObject )     // not visible
                     pCnt->SetInvisible();
 
-                pMember->Insert( pCnt );//, nTox );
+                pMember->Insert( pCnt );
                 sal_uInt16 nPos = pMember->Count() - 1;
                 if(nOldMemberCount > nPos &&
                     (pOldMember->GetObject(nPos))->IsInvisible()
@@ -796,7 +769,6 @@ void    SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
                     */
                 }
             }
-            //
         }
         break;
         case CONTENT_TYPE_DRAWOBJECT:
@@ -816,10 +788,8 @@ void    SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
                 for( sal_uInt32 i=0; i< nCount; i++ )
                 {
                     SdrObject* pTemp = pPage->GetObj(i);
-                    // --> OD 2006-03-09 #i51726# - all drawing objects can be named now
-//                    if(pTemp->ISA(SdrObjGroup) && pTemp->GetName().Len())
+                    // #i51726# - all drawing objects can be named now
                     if ( pTemp->GetName().Len() )
-                    // <--
                     {
                         SwContact* pContact = (SwContact*)pTemp->GetUserCall();
                         long nYPos = 0;
@@ -1017,7 +987,6 @@ sal_Int8 SwContentTree::ExecuteDrop( const ExecuteDropEvent& rEvt )
     return bIsInDrag ? DND_ACTION_NONE : GetParentWindow()->ExecuteDrop(rEvt);
 }
 
-
 /***************************************************************************
     Beschreibung:   Handler fuer Dragging und ContextMenu
 ***************************************************************************/
@@ -1172,14 +1141,6 @@ PopupMenu* SwContentTree::CreateContextMenu( void )
                 pSubPop4->InsertItem(600, sPostItShow );
                 pSubPop4->InsertItem(601, sPostItHide );
                 pSubPop4->InsertItem(602, sPostItDelete );
-                /*
-                pSubPop4->InsertItem(603,rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Sort")));
-                PopupMenu* pMenuSort = new PopupMenu;
-                pMenuSort->InsertItem(604,rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("By Position")));
-                pMenuSort->InsertItem(605,rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("By Author")));
-                pMenuSort->InsertItem(606,rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("By Date")));
-                pSubPop4->SetPopupMenu(603, pMenuSort);
-                */
                 pPop->InsertItem(4, pType->GetSingleName());
                 pPop->SetPopupMenu(4, pSubPop4);
         }
@@ -1383,7 +1344,6 @@ sal_Bool  SwContentTree::Collapse( SvLBoxEntry* pParent )
             bRet = SvTreeListBox::Collapse(pParent);
     }
     else
-//      bRet = sal_False;
         bRet = SvTreeListBox::Collapse(pParent);
     return bRet;
 }
@@ -1424,8 +1384,7 @@ void SwContentTree::Display( sal_Bool bActive )
 {
     if(!bIsImageListInitialized)
     {
-        USHORT nResId = GetSettings().GetStyleSettings().GetHighContrastMode() ? IMG_NAVI_ENTRYBMPH : IMG_NAVI_ENTRYBMP;
-        aEntryImages = ImageList(SW_RES(nResId));
+        aEntryImages = ImageList(SW_RES(IMG_NAVI_ENTRYBMP));
         bIsImageListInitialized = sal_True;
     }
     // erst den selektierten Eintrag auslesen, um ihn spaeter evtl. wieder
@@ -1484,7 +1443,6 @@ void SwContentTree::Display( sal_Bool bActive )
                 if(!*ppContentT)
                     (*ppContentT) = new SwContentType(pShell, nCntType, nOutlineLevel );
 
-
                 String sEntry = (*ppContentT)->GetName();
                 SvLBoxEntry* pEntry;
                 const Image& rImage = aEntryImages.GetImage(SID_SW_START + nCntType);
@@ -1545,7 +1503,6 @@ void SwContentTree::Display( sal_Bool bActive )
 
             if(nRootType != CONTENT_TYPE_OUTLINE)
             {
-                SvLBoxEntry* pEntry;
                 for(sal_uInt16 i = 0; i < (*ppRootContentT)->GetMemberCount(); i++ )
                 {
                     const SwContent* pCnt = (*ppRootContentT)->GetMember(i);
@@ -1651,7 +1608,7 @@ sal_Bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer,
             OSL_ENSURE(nPos < pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineNodesCount(),
                        "outlinecnt changed");
 
-            // #100738# make sure outline may actually be copied
+            // make sure outline may actually be copied
             if( pWrtShell->IsOutlineCopyable( nPos ) )
             {
                 const SwNumRule* pOutlRule = pWrtShell->GetOutlineNumRule();
@@ -1686,7 +1643,7 @@ sal_Bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer,
         break;
         case CONTENT_TYPE_URLFIELD:
             sUrl = ((SwURLFieldContent*)pCnt)->GetURL();
-        // kein break;
+        // no break;
         case CONTENT_TYPE_OLE:
         case CONTENT_TYPE_GRAPHIC:
             if(GetParentWindow()->GetRegionDropMode() != REGION_MODE_NONE)
@@ -2035,8 +1992,6 @@ void SwContentTree::FindActiveTypeAndRemoveUserData()
         if(pEntry->GetUserData() && lcl_IsContentType(pEntry))
             nLastSelType = ((SwContentType*)pEntry->GetUserData())->GetType();
     }
-//  else
-//      nLastSelType = USHRT_MAX;
     pEntry = First();
     while(pEntry)
     {
@@ -2138,7 +2093,7 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier)
             SvLBoxEntry* pFirstEntry = FirstSelected();
             if (pFirstEntry && lcl_IsContent(pFirstEntry))
             {
-                if(bIsRoot && nRootType == CONTENT_TYPE_OUTLINE ||
+                if ( (bIsRoot && nRootType == CONTENT_TYPE_OUTLINE) ||
                     ((SwContent*)pFirstEntry->GetUserData())->GetParent()->GetType()
                                                 ==  CONTENT_TYPE_OUTLINE)
                 {
@@ -2156,8 +2111,8 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier)
                 if( nMove )
                 {
                     short nDir = nCmd == FN_ITEM_UP ? -1 : 1;
-                    if( !bModifier && (nDir == -1 && nActPos > 0 ||
-                        nDir == 1 && nActPos < GetEntryCount() - 2 ) )
+                    if( !bModifier && ( (nDir == -1 && nActPos > 0) ||
+                        (nDir == 1 && nActPos < GetEntryCount() - 2) ) )
                     {
                         pShell->MoveOutlinePara( nDir );
                         //Cursor wieder an die aktuelle Position setzen
@@ -2385,7 +2340,7 @@ sal_Bool  SwContentTree::NotifyMoving( SvLBoxEntry*  pTarget,
         aActiveContentArr[CONTENT_TYPE_OUTLINE]->Invalidate();
         Display(sal_True);
     }
-    //TreeListBox wird aus dem Dokument neu geladen
+    //TreeListBox will be reloaded from the document
     return sal_False;
 }
 
@@ -2416,7 +2371,6 @@ sal_Bool  SwContentTree::NotifyCopying( SvLBoxEntry*  pTarget,
 
         }
 
-
         OSL_ENSURE( pEntry &&
             lcl_IsContent(pEntry),"Source == 0 or Source has no Content" );
         GetParentWindow()->MoveOutline( nSourcePos, nTargetPos, sal_False);
@@ -2707,7 +2661,7 @@ void    SwContentTree::ExcecuteContextMenuAction( USHORT nSelectedPopupEntry )
                 break;
             }
         //Anzeige
-        default: // nSelectedPopupEntry > 300
+        default:
         if(nSelectedPopupEntry > 300 && nSelectedPopupEntry < 400)
         {
             nSelectedPopupEntry -= 300;
@@ -2787,8 +2741,8 @@ sal_Bool  SwContentTree::Select( SvLBoxEntry* pEntry, sal_Bool bSelect )
         pParentEntry = GetParent(pParentEntry);
     }
     if(!bIsLastReadOnly && (!IsVisible() ||
-        (bIsRoot && nRootType == CONTENT_TYPE_OUTLINE && pParentEntry ||
-            lcl_IsContent(pEntry) && ((SwContentType*)pParentEntry->GetUserData())->GetType() == CONTENT_TYPE_OUTLINE)))
+        ( (bIsRoot && nRootType == CONTENT_TYPE_OUTLINE && pParentEntry) ||
+            (lcl_IsContent(pEntry) && ((SwContentType*)pParentEntry->GetUserData())->GetType() == CONTENT_TYPE_OUTLINE)) ))
         bEnable = sal_True;
     SwNavigationPI* pNavi = GetParentWindow();
     pNavi->aContentToolBox.EnableItem(FN_ITEM_UP ,  bEnable);
@@ -2949,15 +2903,6 @@ void SwContentTree::EditEntry(SvLBoxEntry* pEntry, sal_uInt8 nMode)
                     pActiveShell->GetView().GetPostItMgr()->SetActiveSidebarWin(0);
                     pActiveShell->DelRight();
                 }
-                /*
-                //  this code can be used once we want redline comments in the margin
-                else
-                {
-                    SwMarginWin* pComment = pActiveShell->GetView().GetPostItMgr()->GetPostIt(((SwPostItContent*)pCnt)->GetRedline());
-                    if (pComment)
-                        pComment->Delete();
-                }
-                */
             }
             else
             {
@@ -3127,10 +3072,8 @@ void SwContentTree::GotoContent(SwContent* pCnt)
                 for( sal_uInt32 i=0; i< nCount; i++ )
                 {
                     SdrObject* pTemp = pPage->GetObj(i);
-                    // --> OD 2006-03-09 #i51726# - all drawing objects can be named now
-//                    if(pTemp->ISA(SdrObjGroup) && pTemp->GetName() == pCnt->GetName())
+                    // #i51726# - all drawing objects can be named now
                     if ( pTemp->GetName() == pCnt->GetName() )
-                    // <--
                     {
                         SdrPageView* pPV = pDrawView->GetSdrPageView();
                         if( pPV )
@@ -3154,9 +3097,7 @@ void SwContentTree::GotoContent(SwContent* pCnt)
     rView.GetEditWin().GrabFocus();
 }
 
-/*-----------------06.02.97 19.14-------------------
-    Jetzt nochtdie passende text::Bookmark
---------------------------------------------------*/
+/* Jetzt nochtdie passende text::Bookmark */
 NaviContentBookmark::NaviContentBookmark()
     :
     nDocSh(0),
@@ -3231,7 +3172,6 @@ void SwContentLBoxString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFl
     if(lcl_IsContent(pEntry) &&
             ((SwContent *)pEntry->GetUserData())->IsInvisible())
     {
-        //* pCont = (SwContent*)pEntry->GetUserData();
         Font aOldFont( rDev.GetFont());
         Font aFont(aOldFont);
         Color aCol( COL_LIGHTGRAY );
@@ -3249,13 +3189,11 @@ void    SwContentTree::DataChanged( const DataChangedEvent& rDCEvt )
   if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
          (rDCEvt.GetFlags() & SETTINGS_STYLE) )
     {
-        USHORT nResId = GetSettings().GetStyleSettings().GetHighContrastMode() ? IMG_NAVI_ENTRYBMPH : IMG_NAVI_ENTRYBMP;
-        aEntryImages = ImageList(SW_RES(nResId));
+        aEntryImages = ImageList(SW_RES(IMG_NAVI_ENTRYBMP));
         FindActiveTypeAndRemoveUserData();
         Display(sal_True);
     }
     SvTreeListBox::DataChanged( rDCEvt );
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx
index cf6e2b542b25..47fc8848461e 100644
--- a/sw/source/ui/utlui/glbltree.cxx
+++ b/sw/source/ui/utlui/glbltree.cxx
@@ -78,8 +78,6 @@ using ::rtl::OUString;
 
 // Kontextmenue fuer GlobalTree
 #define CTX_INSERT_ANY_INDEX 10
-//#define CTX_INSERT_CNTIDX   11
-//#define CTX_INSERT_USRIDX   12
 #define CTX_INSERT_FILE     11
 #define CTX_INSERT_NEW_FILE 12
 #define CTX_INSERT_TEXT     13
@@ -413,8 +411,6 @@ void SwGlobalTree::TbxMenuHdl(USHORT nTbxId, ToolBox* pBox)
             pMenu->SetHelpId(i, aHelpForMenu[i] );
         }
         pMenu->EnableItem(CTX_INSERT_ANY_INDEX, 0 != (nEnableFlags & ENABLE_INSERT_IDX ));
-//      pMenu->EnableItem(CTX_INSERT_CNTIDX,    0 != (nEnableFlags & ENABLE_INSERT_IDX ));
-//      pMenu->EnableItem(CTX_INSERT_USRIDX,    0 != (nEnableFlags & ENABLE_INSERT_IDX ));
         pMenu->EnableItem(CTX_INSERT_TEXT,      0 != (nEnableFlags & ENABLE_INSERT_TEXT));
         pMenu->EnableItem(CTX_INSERT_FILE,      0 != (nEnableFlags & ENABLE_INSERT_FILE));
         pMenu->EnableItem(CTX_INSERT_NEW_FILE,  0 != (nEnableFlags & ENABLE_INSERT_FILE));
@@ -647,8 +643,7 @@ void    SwGlobalTree::Display(BOOL bOnlyUpdateUserData)
 {
     if(!bIsImageListInitialized)
     {
-        USHORT nResId = GetSettings().GetStyleSettings().GetHighContrastMode() ? IMG_NAVI_ENTRYBMPH : IMG_NAVI_ENTRYBMP;
-        aEntryImages = ImageList(SW_RES(nResId));
+        aEntryImages = ImageList(SW_RES(IMG_NAVI_ENTRYBMP));
         bIsImageListInitialized = TRUE;
     }
     USHORT nCount = pSwGlblDocContents->Count();
@@ -792,9 +787,7 @@ IMPL_LINK( SwGlobalTree, PopupHdl, Menu* , pMenu)
 }
 
 void    SwGlobalTree::ExcecuteContextMenuAction( USHORT nSelectedPopupEntry )
-//IMPL_LINK( SwGlobalTree, PopupHdl, Menu* , pMenu)
 {
-//  USHORT nId = pMenu->GetCurItemId();
     SvLBoxEntry* pEntry = FirstSelected();
     SwGlblDocContent* pCont = pEntry ? (SwGlblDocContent*)pEntry->GetUserData() : 0;
     // wird waehrend des Dialogs ein RequestHelp gerufen,
@@ -889,8 +882,6 @@ void    SwGlobalTree::ExcecuteContextMenuAction( USHORT nSelectedPopupEntry )
         }
         break;
         case CTX_INSERT_ANY_INDEX:
-//      case CTX_INSERT_CNTIDX:
-//      case CTX_INSERT_USRIDX:
         {
             if(pContCopy)
             {
@@ -1024,7 +1015,6 @@ void    SwGlobalTree::ExcecuteContextMenuAction( USHORT nSelectedPopupEntry )
         delete pContCopy;
     else
         bDeleteContentCopy = true;
-//  return TRUE;
 }
 
 IMPL_LINK( SwGlobalTree, Timeout, Timer*, EMPTYARG )
@@ -1283,8 +1273,7 @@ void    SwGlobalTree::DataChanged( const DataChangedEvent& rDCEvt )
     if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
          (rDCEvt.GetFlags() & SETTINGS_STYLE) )
     {
-        USHORT nResId = GetSettings().GetStyleSettings().GetHighContrastMode() ? IMG_NAVI_ENTRYBMPH : IMG_NAVI_ENTRYBMP;
-        aEntryImages = ImageList(SW_RES(nResId));
+        aEntryImages = ImageList(SW_RES(IMG_NAVI_ENTRYBMP));
         Update(sal_True);
     }
     SvTreeListBox::DataChanged( rDCEvt );
diff --git a/sw/source/ui/utlui/gloslst.cxx b/sw/source/ui/utlui/gloslst.cxx
index c401cd2e05c2..030747525cfb 100644
--- a/sw/source/ui/utlui/gloslst.cxx
+++ b/sw/source/ui/utlui/gloslst.cxx
@@ -88,10 +88,6 @@ class SwGlossDecideDlg : public ModalDialog
     ListBox&    GetListBox() {return aListLB;}
 };
 
-/*-----------------21.01.97 13.25-------------------
-
---------------------------------------------------*/
-
 SwGlossDecideDlg::SwGlossDecideDlg(Window* pParent) :
     ModalDialog(pParent, SW_RES(DLG_GLOSSARY_DECIDE_DLG)),
     aOk(this,       SW_RES(PB_OK)),
@@ -105,18 +101,11 @@ SwGlossDecideDlg::SwGlossDecideDlg(Window* pParent) :
     aListLB.SetSelectHdl(LINK(this, SwGlossDecideDlg, SelectHdl));
 }
 
-/*-----------------21.01.97 13.25-------------------
-
---------------------------------------------------*/
-
 IMPL_LINK(SwGlossDecideDlg, DoubleClickHdl, ListBox*, EMPTYARG)
 {
     EndDialog(RET_OK);
     return 0;
 }
-/*-----------------21.01.97 13.29-------------------
-
---------------------------------------------------*/
 
 IMPL_LINK(SwGlossDecideDlg, SelectHdl, ListBox*, EMPTYARG)
 {
diff --git a/sw/source/ui/utlui/makefile.mk b/sw/source/ui/utlui/makefile.mk
index cded61eee357..75d83767029a 100644
--- a/sw/source/ui/utlui/makefile.mk
+++ b/sw/source/ui/utlui/makefile.mk
@@ -50,28 +50,28 @@ SRC1FILES =  \
                 utlui.src
 
 EXCEPTIONSFILES= \
+        $(SLO)$/attrdesc.obj \
         $(SLO)$/bookctrl.obj \
-        $(SLO)$/glbltree.obj \
-        $(SLO)$/navipi.obj \
-        $(SLO)$/unotools.obj    \
-        $(SLO)$/content.obj \
-        $(SLO)$/swrenamexnameddlg.obj
-
-SLOFILES =  $(EXCEPTIONSFILES) \
         $(SLO)$/condedit.obj \
+        $(SLO)$/content.obj \
+        $(SLO)$/glbltree.obj \
         $(SLO)$/gloslst.obj \
         $(SLO)$/initui.obj \
-        $(SLO)$/navicfg.obj \
+        $(SLO)$/navipi.obj \
         $(SLO)$/numfmtlb.obj \
         $(SLO)$/prcntfld.obj \
+        $(SLO)$/shdwcrsr.obj \
+        $(SLO)$/swrenamexnameddlg.obj \
         $(SLO)$/textcontrolcombo.obj \
         $(SLO)$/tmplctrl.obj \
         $(SLO)$/uitool.obj \
-        $(SLO)$/uiitems.obj \
-        $(SLO)$/attrdesc.obj \
-        $(SLO)$/shdwcrsr.obj \
-                $(SLO)$/zoomctrl.obj \
-                $(SLO)$/viewlayoutctrl.obj
+        $(SLO)$/unotools.obj \
+        $(SLO)$/viewlayoutctrl.obj \
+        $(SLO)$/zoomctrl.obj
+
+SLOFILES =  $(EXCEPTIONSFILES) \
+        $(SLO)$/navicfg.obj \
+        $(SLO)$/uiitems.obj
 
 # --- Tagets -------------------------------------------------------
 
diff --git a/sw/source/ui/utlui/navicfg.cxx b/sw/source/ui/utlui/navicfg.cxx
index cbc89fb4bbf3..3dc9320cb1a4 100644
--- a/sw/source/ui/utlui/navicfg.cxx
+++ b/sw/source/ui/utlui/navicfg.cxx
@@ -77,7 +77,6 @@ SwNavigationConfig::SwNavigationConfig() :
 {
     Sequence<OUString> aNames = GetPropertyNames();
     Sequence<Any> aValues = GetProperties(aNames);
-//  EnableNotification(aNames);
     const Any* pValues = aValues.getConstArray();
     OSL_ENSURE(aValues.getLength() == aNames.getLength(), "GetProperties failed");
     if(aValues.getLength() == aNames.getLength())
diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx
index 629f1d7807d5..3bf6dbf8cda5 100644
--- a/sw/source/ui/utlui/navipi.cxx
+++ b/sw/source/ui/utlui/navipi.cxx
@@ -284,7 +284,6 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
             }
         }
         return TRUE;
-        //break;
         // Funktionen, die eine direkte Aktion ausloesen
 
         case FN_SELECT_FOOTER:
@@ -400,9 +399,6 @@ IMPL_LINK( SwNavigationPI, ToolBoxClickHdl, ToolBox *, pBox )
     return TRUE;
 }
 
-/*-----------------13.07.04 -------------------
- ----------------------------------------------*/
-
 IMPL_LINK( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox )
 {
     const USHORT nCurrItemId = pBox->GetCurItemId();
@@ -421,9 +417,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox )
             {
                 pMenu->InsertItem( i + 1, aContextArr[i] );
                 pMenu->SetHelpId(i + 1, HID_NAVI_DRAG_HYP + i);
-                    /*HID_NAVI_DRAG_HYP
-                    HID_NAVI_DRAG_LINK
-                    HID_NAVI_DRAG_COPY  */
+
             }
             pMenu->CheckItem( nRegionMode + 1 );
             pMenu->SetSelectHdl(LINK(this, SwNavigationPI, MenuSelectHdl));
@@ -461,15 +455,11 @@ IMPL_LINK( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox )
     return TRUE;
 }
 
-/*-----------------13.07.04 -------------------
---------------------------------------------------*/
 
 SwNavHelpToolBox::SwNavHelpToolBox(SwNavigationPI* pParent, const ResId &rResId) :
             SwHelpToolBox(pParent, rResId)
 {}
-/*-----------------19.06.97 09:09-------------------
 
---------------------------------------------------*/
 void SwNavHelpToolBox::MouseButtonDown(const MouseEvent &rEvt)
 {
     if(rEvt.GetButtons() == MOUSE_LEFT &&
@@ -480,18 +470,13 @@ void SwNavHelpToolBox::MouseButtonDown(const MouseEvent &rEvt)
     else
         SwHelpToolBox::MouseButtonDown(rEvt);
 }
-/* -----------------------------12.03.2002 16:55------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwNavigationPI::CreateNavigationTool(const Rectangle& rRect, BOOL bSetFocus)
 {
-//    SfxBindings& rBind = GetCreateView()->GetViewFrame()->GetBindings();
-//    rBind.ENTERREGISTRATIONS();
     Reference< XFrame > xFrame = GetCreateView()->GetViewFrame()->GetFrame().GetFrameInterface();
     SwScrollNaviPopup* pPopup = new
         SwScrollNaviPopup(FN_SCROLL_NAVIGATION,
                           xFrame );
-//    rBind.LEAVEREGISTRATIONS();
 
     Rectangle aRect(rRect);
     Point aT1 = aRect.TopLeft();
@@ -506,9 +491,6 @@ void SwNavigationPI::CreateNavigationTool(const Rectangle& rRect, BOOL bSetFocus
     }
 }
 
-/*-----------------19.06.97 10:12-------------------
-
---------------------------------------------------*/
 void  SwNavHelpToolBox::RequestHelp( const HelpEvent& rHEvt )
 {
     USHORT nItemId = GetItemId(ScreenToOutputPixel(rHEvt.GetMousePosPixel()));
@@ -558,10 +540,6 @@ IMPL_LINK( SwNavigationPI, EditGetFocus, NumEditAction *, pEdit )
     return 0;
 }
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
 BOOL SwNavigationPI::Close()
 {
     SfxViewFrame* pVFrame = pCreateView->GetViewFrame();
@@ -604,10 +582,6 @@ void SwNavigationPI::MakeMark()
         nAutoMarkIdx = 0;
 }
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
 void SwNavigationPI::GotoPage()
 {
     if ( pContextWin->GetFloatingWindow() && pContextWin->GetFloatingWindow()->IsRollUp())
@@ -618,10 +592,6 @@ void SwNavigationPI::GotoPage()
     GetPageEdit().GrabFocus();
 }
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
 void SwNavigationPI::_ZoomOut()
 {
     if (_IsZoomedIn())
@@ -652,10 +622,6 @@ void SwNavigationPI::_ZoomOut()
     }
 }
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
 void SwNavigationPI::_ZoomIn()
 {
     FloatingWindow* pFloat = pContextWin->GetFloatingWindow();
@@ -682,9 +648,6 @@ void SwNavigationPI::_ZoomIn()
         aContentToolBox.CheckItem(FN_SHOW_CONTENT_BOX, FALSE);
     }
 }
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
 
 void SwNavigationPI::Resize()
 {
@@ -734,11 +697,6 @@ void SwNavigationPI::Resize()
     }
 }
 
-
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
 SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
                                 SfxChildWindowContext* pCw,
                                 Window* pParent) :
@@ -749,7 +707,6 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
     aContentToolBox(this, SW_RES(TB_CONTENT)),
     aGlobalToolBox(this, SW_RES(TB_GLOBAL)),
     aContentImageList(SW_RES(IL_CONTENT)),
-    aContentImageListH(SW_RES(ILH_CONTENT)),
     aContentTree(this, SW_RES(TL_CONTENT)),
     aGlobalTree(this, SW_RES(TL_GLOBAL)),
     aDocListBox(this, SW_RES(LB_DOCS)),
@@ -795,8 +752,6 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
 
     bPageCtrlsVisible = TRUE;
 
-//  Rectangle aFirstRect = aContentToolBox.GetItemRect(FN_SHOW_ROOT);
-//  USHORT nWidth = 2 * (USHORT)aFirstRect.Left();
     //doppelte Separatoren sind nicht erlaubt, also muss
     //die passende Groesse anders ermittelt werden
     Rectangle aFirstRect = aContentToolBox.GetItemRect(FN_SELECT_FOOTNOTE);
@@ -919,10 +874,6 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
     aPageChgTimer.SetTimeout(PAGE_CHANGE_TIMEOUT);
 }
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
 SwNavigationPI::~SwNavigationPI()
 {
     if(IsGlobalDoc() && !IsGlobalMode())
@@ -953,10 +904,6 @@ SwNavigationPI::~SwNavigationPI()
         rBindings.Release(*this);
 }
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
 void SwNavigationPI::SetPopupWindow( SfxPopupWindow* pWindow )
 {
     pPopupWindow = pWindow;
@@ -964,10 +911,6 @@ void SwNavigationPI::SetPopupWindow( SfxPopupWindow* pWindow )
     pPopupWindow->SetDeleteLink_Impl( LINK( this, SwNavigationPI, ClosePopupWindow ));
 }
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
 IMPL_LINK( SwNavigationPI, PopupModeEndHdl, void *, EMPTYARG )
 {
     if ( pPopupWindow->IsVisible() )
@@ -988,10 +931,6 @@ IMPL_LINK( SwNavigationPI, PopupModeEndHdl, void *, EMPTYARG )
     return 1;
 }
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
 IMPL_LINK( SwNavigationPI, ClosePopupWindow, SfxPopupWindow *, pWindow )
 {
     if ( pWindow == pFloatingWindow )
@@ -1002,10 +941,6 @@ IMPL_LINK( SwNavigationPI, ClosePopupWindow, SfxPopupWindow *, pWindow )
     return 1;
 }
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
 void SwNavigationPI::StateChanged( USHORT nSID, SfxItemState /*eState*/,
                                             const SfxPoolItem* /*pState*/ )
 {
@@ -1045,10 +980,6 @@ NumEditAction& SwNavigationPI::GetPageEdit()
     return *(NumEditAction*)aContentToolBox.GetItemWindow(FN_PAGENUMBER);
 }
 
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
 SfxChildAlignment SwNavigationPI::CheckAlignment
     (
         SfxChildAlignment eActAlign,
@@ -1133,10 +1064,6 @@ void SwNavigationPI::Notify( SfxBroadcaster& rBrdc, const SfxHint& rHint )
     }
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 IMPL_LINK( SwNavigationPI, MenuSelectHdl, Menu *, pMenu )
 {
     USHORT nMenuId = pMenu->GetCurItemId();
@@ -1150,11 +1077,6 @@ IMPL_LINK( SwNavigationPI, MenuSelectHdl, Menu *, pMenu )
     return 0;
 }
 
-
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 void SwNavigationPI::UpdateListBox()
 {
     aDocListBox.SetUpdateMode(FALSE);
@@ -1172,7 +1094,7 @@ void SwNavigationPI::UpdateListBox()
     while (pView)
     {
         SfxObjectShell* pDoc = pView->GetDocShell();
-        // pb: #i53333# don't show help pages here
+        // #i53333# don't show help pages here
         if ( !pDoc->IsHelpDocument() )
         {
             String sEntry = pDoc->GetTitle();
@@ -1225,14 +1147,6 @@ void SwNavigationPI::UpdateListBox()
     aDocListBox.SetUpdateMode(TRUE);
 }
 
-/*-----------------16.06.97 15:05-------------------
-
---------------------------------------------------*/
-
-/*------------------------------------------------------------------------
-    Beschreibung:
-------------------------------------------------------------------------*/
-
 IMPL_LINK(SwNavigationPI, DoneLink, SfxPoolItem *, pItem)
 {
     const SfxViewFrameItem* pFrameItem = PTR_CAST(SfxViewFrameItem, pItem );
@@ -1287,10 +1201,6 @@ String SwNavigationPI::CreateDropFileName( TransferableDataHelper& rData )
     return sFileName;
 }
 
-/*------------------------------------------------------------------------
-    Beschreibung:
-------------------------------------------------------------------------*/
-
 sal_Int8 SwNavigationPI::AcceptDrop( const AcceptDropEvent& /*rEvt*/ )
 {
     return ( !aContentTree.IsInDrag() &&
@@ -1344,10 +1254,6 @@ sal_Int8 SwNavigationPI::ExecuteDrop( const ExecuteDropEvent& rEvt )
     return nRet;
 }
 
-/*-----------------27.11.96 13.00-------------------
-
---------------------------------------------------*/
-
 void SwNavigationPI::SetRegionDropMode(USHORT nNewMode)
 {
     nRegionMode = nNewMode;
@@ -1359,18 +1265,12 @@ void SwNavigationPI::SetRegionDropMode(USHORT nNewMode)
     else if(nRegionMode == REGION_MODE_EMBEDDED)
         nDropId = FN_DROP_REGION_COPY;
 
-    ImageList& rImgLst = aContentToolBox.GetSettings().GetStyleSettings().GetHighContrastMode()
-                ? aContentImageListH : aContentImageList;
+    ImageList& rImgLst = aContentImageList;
 
-    aContentToolBox.SetItemImage( FN_DROP_REGION,
-                                    rImgLst.GetImage(nDropId));
+    aContentToolBox.SetItemImage( FN_DROP_REGION, rImgLst.GetImage(nDropId));
 }
 
 
-/*-----------------12.06.97 09:47-------------------
-
---------------------------------------------------*/
-
 BOOL    SwNavigationPI::ToggleTree()
 {
     BOOL bRet = TRUE;
@@ -1404,9 +1304,6 @@ BOOL    SwNavigationPI::ToggleTree()
     return bRet;
 }
 
-/*-----------------13.06.97 09:42-------------------
-
---------------------------------------------------*/
 BOOL    SwNavigationPI::IsGlobalDoc() const
 {
     BOOL bRet = FALSE;
@@ -1418,18 +1315,14 @@ BOOL    SwNavigationPI::IsGlobalDoc() const
     }
     return bRet;
 }
-/* -----------------26.10.98 08:10-------------------
- *
- * --------------------------------------------------*/
+
 IMPL_LINK( SwNavigationPI, ChangePageHdl, Timer*, EMPTYARG )
 {
     EditAction(&GetPageEdit());
     GetPageEdit().GrabFocus();
     return 0;
 }
-/* -----------------26.10.98 08:14-------------------
- *
- * --------------------------------------------------*/
+
 IMPL_LINK( SwNavigationPI, PageEditModifyHdl, Edit*, EMPTYARG )
 {
     if(aPageChgTimer.IsActive())
@@ -1438,9 +1331,6 @@ IMPL_LINK( SwNavigationPI, PageEditModifyHdl, Edit*, EMPTYARG )
     return 0;
 }
 
-/* -----------------------------23.04.01 07:34--------------------------------
-
- ---------------------------------------------------------------------------*/
 SwView*  SwNavigationPI::GetCreateView() const
 {
     if(!pCreateView)
@@ -1460,11 +1350,6 @@ SwView*  SwNavigationPI::GetCreateView() const
     return pCreateView;
 }
 
-
-/*------------------------------------------------------------------------
- Beschreibung:
-------------------------------------------------------------------------*/
-
 SwNavigationChild::SwNavigationChild( Window* pParent,
                         USHORT nId,
                         SfxBindings* _pBindings,
@@ -1492,9 +1377,7 @@ SwNavigationChild::SwNavigationChild( Window* pParent,
         pNavi->_ZoomIn();
     }
 }
-/* -----------------------------06.05.2002 10:06------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwNavigationPI::DataChanged( const DataChangedEvent& rDCEvt )
 {
     Window::DataChanged( rDCEvt );
@@ -1508,15 +1391,12 @@ void SwNavigationPI::DataChanged( const DataChangedEvent& rDCEvt )
         SetBackground( aBack );
     }
 }
-/* -----------------------------06.05.2002 10:07------------------------------
 
- ---------------------------------------------------------------------------*/
 void SwNavigationPI::InitImageList()
 {
     USHORT k;
 
-    ImageList& rImgLst = aContentToolBox.GetSettings().GetStyleSettings().GetHighContrastMode() ?
-                aContentImageListH : aContentImageList;
+    ImageList& rImgLst = aContentImageList;
     for( k = 0; k < aContentToolBox.GetItemCount(); k++)
             aContentToolBox.SetItemImage(aContentToolBox.GetItemId(k),
                     rImgLst.GetImage(aContentToolBox.GetItemId(k)));
diff --git a/sw/source/ui/utlui/navipi.hrc b/sw/source/ui/utlui/navipi.hrc
index 8254e2dc92a9..f669387d8161 100644
--- a/sw/source/ui/utlui/navipi.hrc
+++ b/sw/source/ui/utlui/navipi.hrc
@@ -31,7 +31,6 @@
 #define BT_UP               5
 #define BT_DOWN             6
 #define IL_CONTENT          7
-#define ILH_CONTENT         8
 #define FT_PAGE             10
 #define ED_PAGE             11
 #define LB_SELECT           22
diff --git a/sw/source/ui/utlui/navipi.src b/sw/source/ui/utlui/navipi.src
index 0c45e3203df0..1a22d5bd9342 100644
--- a/sw/source/ui/utlui/navipi.src
+++ b/sw/source/ui/utlui/navipi.src
@@ -91,12 +91,6 @@ Window DLG_NAVIGATION_PI
         MaskColor = IMAGE_MASK_COLOR ;
         NAVI_IDLIST
     };
-    ImageList ILH_CONTENT
-    {
-        Prefix = "sch";
-        MaskColor = IMAGE_MASK_COLOR ;
-        NAVI_IDLIST
-    };
     Toolbox TB_CONTENT
     {
         Pos = MAP_PIXEL ( 5 , 5 ) ;
@@ -519,18 +513,9 @@ Window DLG_NAVIGATION_PI
     };                 \
     IdCount = { 12 ; };
 
-
-
 ImageList IMG_NAVI_ENTRYBMP
 {
     Prefix = "nc";
     MaskColor = IMAGE_MASK_COLOR ;
     NAVI_ENTRY_IDS
 };
-
-ImageList IMG_NAVI_ENTRYBMPH
-{
-    Prefix = "nch";
-    MaskColor = IMAGE_MASK_COLOR ;
-    NAVI_ENTRY_IDS
-};
diff --git a/sw/source/ui/utlui/numfmtlb.cxx b/sw/source/ui/utlui/numfmtlb.cxx
index 13aecfd2bbc4..caa7f7466892 100644
--- a/sw/source/ui/utlui/numfmtlb.cxx
+++ b/sw/source/ui/utlui/numfmtlb.cxx
@@ -335,7 +335,6 @@ void NumFormatListBox::SetDefFormat(const ULONG nDefFmt)
     while ((ULONG)GetEntryData(nPos) == ULONG_MAX)
         nPos++;
 
-//
     ULONG nSysNumFmt = pFormatter->GetFormatIndex( NF_NUMBER_SYSTEM, eCurLanguage);
     ULONG nSysShortDateFmt = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_SHORT, eCurLanguage);
     ULONG nSysLongDateFmt = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_LONG, eCurLanguage);
@@ -471,12 +470,6 @@ double NumFormatListBox::GetDefValue(const short nFormatType) const
         case NUMBERFORMAT_TIME:
             fDefValue = SVX_NUMVAL_TIME;
             break;
-/*      {
-            String sValue("31.8.1997 16:57:34");
-            ULONG nFormat = pFormatter->GetStandardFormat(nFormatType, LANGUAGE_GERMAN);
-            pFormatter->IsNumberFormat( sValue, nFormat, fDefValue );
-        }
-        break;*/
 
         case NUMBERFORMAT_TEXT:
         case NUMBERFORMAT_UNDEFINED:
diff --git a/sw/source/ui/utlui/prcntfld.cxx b/sw/source/ui/utlui/prcntfld.cxx
index 406827818ad5..0c1ad64e4488 100644
--- a/sw/source/ui/utlui/prcntfld.cxx
+++ b/sw/source/ui/utlui/prcntfld.cxx
@@ -31,8 +31,6 @@
 
 #include "prcntfld.hxx"
 
-// STATIC DATA -----------------------------------------------------------
-
 PercentField::PercentField( Window* pWin, const ResId& rResId ) :
         MetricField ( pWin, rResId ),
 
@@ -84,7 +82,7 @@ void PercentField::ShowPercent(BOOL bPercent)
         SetDecimalDigits( 0 );
 
         nAktWidth = ConvertValue(nOldMin, 0, nOldDigits, eOldUnit, FUNIT_TWIP);
-        // Um 0.5 Prozent aufrunden
+        // round to 0.5 percent
         nPercent = ((nAktWidth * 10) / nRefValue + 5) / 10;
 
         MetricField::SetMin(Max(static_cast< sal_Int64 >(1), nPercent));
@@ -101,7 +99,6 @@ void PercentField::ShowPercent(BOOL bPercent)
         }
         else
             MetricFormatter::SetValue(nLastPercent);
-//      SetValue(100, FUNIT_CUSTOM);
     }
     else
     {
@@ -215,7 +212,6 @@ void PercentField::SetMax(sal_Int64 nNewMax, FieldUnit eInUnit)
     {
         if (eInUnit == FUNIT_NONE)
             eInUnit = eOldUnit;
-//      SetRefValue(Convert(nNewMax, eInUnit, FUNIT_TWIP));
     }
 }
 
@@ -297,7 +293,7 @@ sal_Int64 PercentField::Convert(sal_Int64 nValue, FieldUnit eInUnit, FieldUnit e
             nAktWidth = nValue;
         else
             nAktWidth = ConvertValue(nValue, 0, nOldDigits, eInUnit, FUNIT_TWIP);
-        // Um 0.5 Prozent runden
+        // Round to 0.5 percent
         return ((nAktWidth * 1000) / nRefValue + 5) / 10;
     }
 
diff --git a/sw/source/ui/utlui/textcontrolcombo.cxx b/sw/source/ui/utlui/textcontrolcombo.cxx
index db113e1697a7..6a35f13b9325 100644
--- a/sw/source/ui/utlui/textcontrolcombo.cxx
+++ b/sw/source/ui/utlui/textcontrolcombo.cxx
@@ -63,7 +63,7 @@ void TextControlCombo::Arrange( FixedText& _rFTcomplete, BOOL /*bShow*/ )
         nYCtrl += aMetricVals.Height();
 
     // separate text parts
-    const String    aReplStr( RTL_CONSTASCII_STRINGPARAM( "%POSITION_OF_CONTROL" ) );
+    const String    aReplStr( RTL_CONSTASCII_USTRINGPARAM( "%POSITION_OF_CONTROL" ) );
     String          aTxtBefore( _rFTcomplete.GetText() );
     String          aTxtAfter;
     xub_StrLen      nReplPos = aTxtBefore.Search( aReplStr );
diff --git a/sw/source/ui/utlui/unotools.cxx b/sw/source/ui/utlui/unotools.cxx
index e0d9a5ee7a10..0bf8d24358b3 100644
--- a/sw/source/ui/utlui/unotools.cxx
+++ b/sw/source/ui/utlui/unotools.cxx
@@ -97,7 +97,6 @@ SwOneExampleFrame::SwOneExampleFrame( Window& rWin,
 
     // the controller is asynchronously set
     aLoadedTimer.SetTimeoutHdl(LINK(this, SwOneExampleFrame, TimeoutHdl));
-//      aLoadedTimer.SetTimeout(500);
     aLoadedTimer.SetTimeout(200);
 
     rWin.Enable(sal_False);
@@ -146,7 +145,6 @@ void    SwOneExampleFrame::CreateControl()
 
             uno::Reference< beans::XPropertySet >  xPrSet(xInst, uno::UNO_QUERY);
             uno::Any aURL;
-            //
             // create new doc
             String sTempURL = C2S(cFactory);
             if(sArgumentURL.Len())
@@ -310,7 +308,6 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer )
         if( aInitializedLink.IsSet() )
         {
             rWindow.Enable(sal_False, sal_True);
-            //rWindow.Enable(sal_True, sal_False);
                aInitializedLink.Call(this);
         }
 
diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src
index dfa3e07f9053..db93aceacc04 100644
--- a/sw/source/ui/utlui/utlui.src
+++ b/sw/source/ui/utlui/utlui.src
@@ -319,51 +319,6 @@ ImageList ILIST_DB_DLG
     MaskColor = IMAGE_MASK_COLOR;
     IMGLIST_IDS;
 };
-
-ImageList ILIST_DB_DLG_HC
-{
-    Prefix = "sxh";
-    MaskColor = IMAGE_MASK_COLOR ;
-    IMGLIST_IDS;
-};
-
-Image IMG_ONE_LEFT_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "one_left_h.bmp" ;
-    };
-    MaskColor = IMAGE_MASK_COLOR ;
-};
-
-Image IMG_ONE_RIGHT_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "one_right_h.bmp" ;
-    };
-    MaskColor = IMAGE_MASK_COLOR ;
-};
-
-Image IMG_ALL_LEFT_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "all_left_h.bmp" ;
-    };
-    MaskColor = IMAGE_MASK_COLOR ;
-};
-
-Image IMG_ALL_RIGHT_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "all_right_h.bmp" ;
-    };
-    MaskColor = IMAGE_MASK_COLOR ;
-};
-
-
 Image IMG_VIEWLAYOUT_AUTOMATIC
 {
     ImageBitmap = Bitmap
@@ -414,59 +369,6 @@ Image IMG_VIEWLAYOUT_SINGLECOLUMN_ACTIVE
     };
     MaskColor = IMAGE_MASK_COLOR;
 };
-
-Image IMG_VIEWLAYOUT_AUTOMATIC_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "twopages_11x25_h.png" ;
-    };
-    MaskColor = IMAGE_MASK_COLOR;
-};
-Image IMG_VIEWLAYOUT_AUTOMATIC_ACTIVE_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "twopages_a_11x25_h.png" ;
-    };
-    MaskColor = IMAGE_MASK_COLOR;
-};
-
-Image IMG_VIEWLAYOUT_BOOKMODE_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "doublepage_11x23_h.png" ;
-    };
-    MaskColor = IMAGE_MASK_COLOR;
-};
-Image IMG_VIEWLAYOUT_BOOKMODE_ACTIVE_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "doublepage_a_11x23_h.png" ;
-    };
-    MaskColor = IMAGE_MASK_COLOR;
-};
-Image IMG_VIEWLAYOUT_SINGLECOLUMN_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "emptypage_11x15_h.png" ;
-    };
-    MaskColor = IMAGE_MASK_COLOR;
-};
-Image IMG_VIEWLAYOUT_SINGLECOLUMN_ACTIVE_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "emptypage_a_11x15_h.png" ;
-    };
-    MaskColor = IMAGE_MASK_COLOR;
-};
-
-
-
 String STR_HYPERCTRL_SEL
 {
     Text [ en-US ] = "SEL";
@@ -475,4 +377,3 @@ String STR_HYPERCTRL_HYP
 {
     Text [ en-US ] = "HYP";
 };
-
diff --git a/sw/source/ui/utlui/viewlayoutctrl.cxx b/sw/source/ui/utlui/viewlayoutctrl.cxx
index 1b9700a5fe2d..18b7ac1446ac 100644
--- a/sw/source/ui/utlui/viewlayoutctrl.cxx
+++ b/sw/source/ui/utlui/viewlayoutctrl.cxx
@@ -68,13 +68,12 @@ SwViewLayoutControl::SwViewLayoutControl( USHORT _nSlotId, USHORT _nId, StatusBa
 {
     mpImpl->mnState = 0;
 
-    const sal_Bool bHC = GetStatusBar().GetSettings().GetStyleSettings().GetHighContrastMode();
-    mpImpl->maImageSingleColumn         = Image( bHC ? SW_RES(IMG_VIEWLAYOUT_SINGLECOLUMN_HC)          : SW_RES(IMG_VIEWLAYOUT_SINGLECOLUMN) );
-    mpImpl->maImageSingleColumn_Active  = Image( bHC ? SW_RES(IMG_VIEWLAYOUT_SINGLECOLUMN_ACTIVE_HC) : SW_RES(IMG_VIEWLAYOUT_SINGLECOLUMN_ACTIVE) );
-    mpImpl->maImageAutomatic            = Image( bHC ? SW_RES(IMG_VIEWLAYOUT_AUTOMATIC_HC)             : SW_RES(IMG_VIEWLAYOUT_AUTOMATIC) );
-    mpImpl->maImageAutomatic_Active     = Image( bHC ? SW_RES(IMG_VIEWLAYOUT_AUTOMATIC_ACTIVE_HC)    : SW_RES(IMG_VIEWLAYOUT_AUTOMATIC_ACTIVE) );
-    mpImpl->maImageBookMode             = Image( bHC ? SW_RES(IMG_VIEWLAYOUT_BOOKMODE_HC)              : SW_RES(IMG_VIEWLAYOUT_BOOKMODE) );
-    mpImpl->maImageBookMode_Active      = Image( bHC ? SW_RES(IMG_VIEWLAYOUT_BOOKMODE_ACTIVE_HC)     : SW_RES(IMG_VIEWLAYOUT_BOOKMODE_ACTIVE) );
+    mpImpl->maImageSingleColumn         = Image( SW_RES(IMG_VIEWLAYOUT_SINGLECOLUMN) );
+    mpImpl->maImageSingleColumn_Active  = Image( SW_RES(IMG_VIEWLAYOUT_SINGLECOLUMN_ACTIVE) );
+    mpImpl->maImageAutomatic            = Image( SW_RES(IMG_VIEWLAYOUT_AUTOMATIC) );
+    mpImpl->maImageAutomatic_Active     = Image( SW_RES(IMG_VIEWLAYOUT_AUTOMATIC_ACTIVE) );
+    mpImpl->maImageBookMode             = Image( SW_RES(IMG_VIEWLAYOUT_BOOKMODE) );
+    mpImpl->maImageBookMode_Active      = Image( SW_RES(IMG_VIEWLAYOUT_BOOKMODE_ACTIVE) );
 }
 
 SwViewLayoutControl::~SwViewLayoutControl()
@@ -116,9 +115,6 @@ void SwViewLayoutControl::Paint( const UserDrawEvent& rUsrEvt )
     Color               aOldLineColor = pDev->GetLineColor();
     Color               aOldFillColor = pDev->GetFillColor();
 
-    //pDev->SetLineColor();
-    //pDev->SetFillColor( pDev->GetBackground().GetColor() );
-
     const bool bSingleColumn    = 0 == mpImpl->mnState;
     const bool bAutomatic       = 1 == mpImpl->mnState;
     const bool bBookMode        = 2 == mpImpl->mnState;
@@ -139,17 +135,6 @@ void SwViewLayoutControl::Paint( const UserDrawEvent& rUsrEvt )
     // draw bookmode image:
     aRect.Left() += nImageWidthAuto;
     pDev->DrawImage( aRect.TopLeft(), bBookMode ? mpImpl->maImageBookMode_Active         : mpImpl->maImageBookMode );
-
-    // draw separators
-    //aRect = rUsrEvt.GetRect();
-    //aRect.Left() += nImageWidth;
-    //aRect.setWidth( 1 );
-    //pDev->DrawRect( aRect );
-    //aRect.Left() += nImageWidth;
-    //pDev->DrawRect( aRect );
-
-    //pDev->SetLineColor( aOldLineColor );
-    //pDev->SetFillColor( aOldFillColor );
 }
 
 BOOL SwViewLayoutControl::MouseButtonDown( const MouseEvent & rEvt )
diff --git a/sw/source/ui/vba/makefile.mk b/sw/source/ui/vba/makefile.mk
index 2cd777b28234..26975035f1c1 100644
--- a/sw/source/ui/vba/makefile.mk
+++ b/sw/source/ui/vba/makefile.mk
@@ -117,6 +117,14 @@ SLOFILES= \
                 $(SLO)$/vbaframes.obj \
                 $(SLO)$/vbaeventshelper.obj \
 
+# These files to be enabled when field related patches
+# are folded into libreoffice
+.IF "$(ENABLE_FIELDBITS)"=="YES"
+SLOFILES+=$(SLO)$/vbaformfield.obj \
+          $(SLO)$/vbaformfields.obj \
+          $(SLO)$/vbacheckbox.obj
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
diff --git a/sw/source/ui/vba/vbaautotextentry.cxx b/sw/source/ui/vba/vbaautotextentry.cxx
index bece42209ba8..8ad0f0f45673 100644
--- a/sw/source/ui/vba/vbaautotextentry.cxx
+++ b/sw/source/ui/vba/vbaautotextentry.cxx
@@ -78,7 +78,6 @@ uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::R
             }
         }
         xEndMarker->setString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("") ) ); // remove marker
-        //xTC->gotoRange( xEndMarker, sal_True );
         xTC = xText->createTextCursorByRange( xEndMarker->getEnd() );
         pWhere->setXTextCursor( xTC );
     }
@@ -118,8 +117,6 @@ SwVbaAutoTextEntries::getElementType() throw (uno::RuntimeException)
 uno::Reference< container::XEnumeration >
 SwVbaAutoTextEntries::createEnumeration() throw (uno::RuntimeException)
 {
-    //uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
-    //return xEnumerationAccess->createEnumeration();
     throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
 }
 
diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx
index d199728b0209..2990feaf9487 100644
--- a/sw/source/ui/vba/vbabookmarks.cxx
+++ b/sw/source/ui/vba/vbabookmarks.cxx
@@ -118,8 +118,6 @@ SwVbaBookmarks::SwVbaBookmarks( const uno::Reference< XHelperInterface >& xParen
 {
     mxBookmarksSupplier.set( mxModel, uno::UNO_QUERY_THROW );
     uno::Reference< text::XTextDocument > xDocument( mxModel, uno::UNO_QUERY_THROW );
-    // use view cursor to insert bookmark, or it will fail if insert bookmark in table
-    //mxText = word::getXTextViewCursor( mxModel )->getText();
 }
 // XEnumerationAccess
 uno::Type
@@ -175,7 +173,6 @@ SwVbaBookmarks::Add( const rtl::OUString& rName, const uno::Any& rRange ) throw
     }
 
     // remove the exist bookmark
-    // rtl::OUString aName = rName.toAsciiLowerCase();
     rtl::OUString aName = rName;
     if( m_xNameAccess->hasByName( aName ) )
         removeBookmarkByName( aName );
diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx
index 0170eb88c20e..26d5a6bf18be 100644
--- a/sw/source/ui/vba/vbaborders.cxx
+++ b/sw/source/ui/vba/vbaborders.cxx
@@ -350,11 +350,6 @@ SwVbaBorders::getItemByIntIndex( const sal_Int32 nIndex )  throw (uno::RuntimeEx
 
 sal_Bool SAL_CALL SwVbaBorders::getShadow() throw (uno::RuntimeException)
 {
-    /*
-    table::ShadowFormat aShadowFormat;
-    m_xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ShadowFormat") ) ) >>= aShadowFormat;
-    return ( aShadowFormat.Location != table::ShadowLocation_NONE );
-    */
     // always return False for table border in MS Word
     return sal_False;
 }
diff --git a/sw/source/ui/vba/vbacheckbox.cxx b/sw/source/ui/vba/vbacheckbox.cxx
index e4e0bc030e63..a20d93786a99 100644
--- a/sw/source/ui/vba/vbacheckbox.cxx
+++ b/sw/source/ui/vba/vbacheckbox.cxx
@@ -74,8 +74,8 @@ sal_Bool SAL_CALL SwVbaCheckBox::getValue() throw ( uno::RuntimeException )
 
 void SAL_CALL SwVbaCheckBox::setValue( sal_Bool value ) throw ( uno::RuntimeException )
 {
-    rtl::OUString sValue = rtl::OUString::createFromAscii( value ? "on" : "off" );
-    mxFormField->addParam( rtl::OUString::createFromAscii( ECMA_FORMCHECKBOX_CHECKED ), sValue, sal_True );
+    rtl::OUString sValue = value ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("on")) : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("off"));
+    mxFormField->addParam( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ECMA_FORMCHECKBOX_CHECKED )), sValue, sal_True );
 }
 
 rtl::OUString&
diff --git a/sw/source/ui/vba/vbacolumn.cxx b/sw/source/ui/vba/vbacolumn.cxx
index f3cc4238aa5c..9a945f33a191 100644
--- a/sw/source/ui/vba/vbacolumn.cxx
+++ b/sw/source/ui/vba/vbacolumn.cxx
@@ -111,15 +111,6 @@ void SwVbaColumn::calculateRelativeColumnWidth( const double* pAbsWidth, double*
 sal_Int32 SAL_CALL
 SwVbaColumn::getWidth( ) throw ( css::uno::RuntimeException )
 {
-   /* uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW );
-    uno::Sequence< text::TableColumnSeparator > aSeparators;
-    xTableProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TableColumnSeparators") ) ) >>= aSeparators;
-    sal_Int32 nTableWidth = SwVbaTable::getTableWidth( xTableProps );
-    sal_Int32 nColCont = aSeparators.getLength() + 1;
-    double dAbsColWidth[ nColCont ];
-    calculateAbsoluteColumnWidth( nTableWidth, aSeparators, dAbsColWidth );
-    return Millimeter::getInPoints( (sal_Int32)( dAbsColWidth[ mnIndex ] ) );
-   */
     SwVbaTableHelper aTableHelper( mxTextTable );
     return aTableHelper.GetColWidth( mnIndex );
 }
@@ -127,32 +118,6 @@ SwVbaColumn::getWidth( ) throw ( css::uno::RuntimeException )
 void SAL_CALL
 SwVbaColumn::setWidth( sal_Int32 _width ) throw ( css::uno::RuntimeException )
 {
-/*    uno::Reference< beans::XPropertySet > xTableProps( mxTextTable, uno::UNO_QUERY_THROW );
-    uno::Sequence< text::TableColumnSeparator > aSeparators;
-    xTableProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TableColumnSeparators") ) ) >>= aSeparators;
-    sal_Int32 nTableWidth = SwVbaTable::getTableWidth( xTableProps );
-    sal_Int32 nColCont = aSeparators.getLength() + 1;
-    double dAbsColWidth[ nColCont ];
-    calculateAbsoluteColumnWidth( nTableWidth, aSeparators, dAbsColWidth );
-    dAbsColWidth[ mnIndex ] = Millimeter::getInHundredthsOfOneMillimeter( _width );
-    double tableWidth = 0.0;
-    for( sal_Int32 i = 0; i < nColCont; i++ )
-    {
-        tableWidth += dAbsColWidth[i];
-    }
-
-    double dRelColWidth[ nColCont ];
-    calculateRelativeColumnWidth( dAbsColWidth, dRelColWidth, nColCont);
-
-    text::TableColumnSeparator* pArray = aSeparators.getArray();
-    for( sal_Int32 i = 0; i < nColCont - 1; i++ )
-    {
-        pArray[i].Position = (sal_Int16)(dRelColWidth[i]);
-    }
-
-    xTableProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TableColumnSeparators") ), uno::makeAny( aSeparators ) );
-    SwVbaTable::setTableWidth( xTableProps, (sal_Int32)( tableWidth ) );
-    */
 
     SwVbaTableHelper aTableHelper( mxTextTable );
     aTableHelper.SetColWidth( _width, mnIndex );
diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx
index 30d41900019b..8b8eb4440a72 100644
--- a/sw/source/ui/vba/vbadocument.cxx
+++ b/sw/source/ui/vba/vbadocument.cxx
@@ -210,7 +210,6 @@ uno::Any SAL_CALL
 SwVbaDocument::Shapes( const uno::Any& index ) throw (uno::RuntimeException)
 {
     uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( getModel(), uno::UNO_QUERY_THROW );
-    //uno::Reference< drawing::XShapes > xShapes( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
     uno::Reference< container::XIndexAccess > xIndexAccess( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
     uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW );
     uno::Reference< XCollection > xCol( new ScVbaShapes( this, mxContext, xIndexAccess, xModel ) );
diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx
index 428d5f3ca98c..1b97e6cf383e 100644
--- a/sw/source/ui/vba/vbadocumentproperties.cxx
+++ b/sw/source/ui/vba/vbadocumentproperties.cxx
@@ -136,7 +136,6 @@ public:
         {
             // Characters, ParagraphCount & WordCount are available from
             // the model ( and addtionally these also update the statics object )
-            //return mxProps->getPropertyValue( rPropName );
             return mxModelProps->getPropertyValue( rPropName );
         }
         catch( uno::Exception& )
diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx
index ebd01c6f046c..9f7f3da8f9bb 100644
--- a/sw/source/ui/vba/vbafield.cxx
+++ b/sw/source/ui/vba/vbafield.cxx
@@ -126,13 +126,11 @@ _ReadFieldParams::_ReadFieldParams( const String& _rData )
     nFnd      = nNext;
     nSavPtr   = nNext;
     aFieldName = aData.Copy( 0, nFnd );
-//  cLastChar = aData.GetChar( nSavPtr );
 }
 
 
 _ReadFieldParams::~_ReadFieldParams()
 {
-//  aData.SetChar( nSavPtr, cLastChar );
 }
 
 
@@ -508,7 +506,7 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const
         if( aDocProperty.EqualsIgnoreCaseAscii( pTable->sDocPropertyName ) )
         {
             if( pTable->sFieldService != NULL )
-                sFieldService = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( pTable->sFieldService ) );
+                sFieldService = rtl::OUString::createFromAscii(pTable->sFieldService);
             bCustom = sal_False;
             break;
         }
diff --git a/sw/source/ui/vba/vbalisthelper.cxx b/sw/source/ui/vba/vbalisthelper.cxx
index ef35be98833c..75e4266a9bc7 100644
--- a/sw/source/ui/vba/vbalisthelper.cxx
+++ b/sw/source/ui/vba/vbalisthelper.cxx
@@ -119,7 +119,6 @@ void SwVbaListHelper::Init() throw( css::uno::RuntimeException )
         // insert this style into style family, or the property NumberingRules doesn't exist.
         mxStyleFamily->insertByName( msStyleName, uno::makeAny( mxStyleProps ) );
         mxStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NumberingRules") ) ) >>= mxNumberingRules;
-        //mxNumberingRules.set( xDocMSF->createInstance(  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.NumberingRules") ) ), uno::UNO_QUERY_THROW );
 
         CreateListTemplate();
 
diff --git a/sw/source/ui/vba/vbalisthelper.hxx b/sw/source/ui/vba/vbalisthelper.hxx
index 6d60420ac6b5..1fd590db907d 100644
--- a/sw/source/ui/vba/vbalisthelper.hxx
+++ b/sw/source/ui/vba/vbalisthelper.hxx
@@ -65,7 +65,7 @@ private:
 public:
     SwVbaListHelper( const css::uno::Reference< css::text::XTextDocument >& xTextDoc, sal_Int32 nGalleryType, sal_Int32 nTemplateType ) throw( css::uno::RuntimeException );
 
-    sal_Int32 getGalleryType() { return mnGalleryType; }
+    sal_Int32 getGalleryType() const { return mnGalleryType; }
     css::uno::Reference< css::container::XIndexReplace > getNumberingRules() { return mxNumberingRules; }
     css::uno::Any getPropertyValueWithNameAndLevel( sal_Int32 nLevel, const rtl::OUString& sName ) throw( css::uno::RuntimeException );
     void setPropertyValueWithNameAndLevel( sal_Int32 nLevel, const rtl::OUString& sName, const css::uno::Any& aValue ) throw( css::uno::RuntimeException );
diff --git a/sw/source/ui/vba/vbapagesetup.cxx b/sw/source/ui/vba/vbapagesetup.cxx
index 7a1519bb2578..5af4ec6799ae 100644
--- a/sw/source/ui/vba/vbapagesetup.cxx
+++ b/sw/source/ui/vba/vbapagesetup.cxx
@@ -237,7 +237,6 @@ rtl::OUString SwVbaPageSetup::getStyleOfFirstPage() throw (uno::RuntimeException
     sal_Int32 wdSectionStart = word::WdSectionStart::wdSectionNewPage;
     uno::Reference< container::XNamed > xNamed( mxPageProps, uno::UNO_QUERY_THROW );
     rtl::OUString sStyleName = xNamed->getName();
-    //mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Name") ) ) >>= sStyleName;
     if( sStyleName.equalsAscii("Left Page") )
         wdSectionStart = word::WdSectionStart::wdSectionEvenPage;
     else if( sStyleName.equalsAscii("Right Page") )
diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx
index df6fec751ab9..1861f316cf87 100644
--- a/sw/source/ui/vba/vbaparagraph.cxx
+++ b/sw/source/ui/vba/vbaparagraph.cxx
@@ -82,8 +82,6 @@ SwVbaParagraph::getServiceNames()
     return aServiceNames;
 }
 
-
-//typedef ::cppu::WeakImplHelper1< container::XEnumeration > ParagraphEnumeration_BASE;
 typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > ParagraphCollectionHelper_BASE;
 
 class ParagraphCollectionHelper : public ParagraphCollectionHelper_BASE
diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx
index 04f7e3fdaf44..1507d3fc0e56 100644
--- a/sw/source/ui/vba/vbaselection.cxx
+++ b/sw/source/ui/vba/vbaselection.cxx
@@ -576,7 +576,6 @@ uno::Reference< word::XRange > SAL_CALL SwVbaSelection::GoTo( const uno::Any& _w
             uno::Reference< word::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
             uno::Reference< word::XBookmark > xBookmark( xApplication->getActiveDocument()->Bookmarks(_name), uno::UNO_QUERY_THROW );
             xBookmark->Select();
-            //return uno::Reference< word::XRange >( xBookmark->Range(), uno::UNO_QUERY_THROW );
             break;
         }
         case word::WdGoToItem::wdGoToPage:
@@ -683,8 +682,6 @@ void SAL_CALL SwVbaSelection::setLanguageID( ::sal_Int32 _languageid ) throw (un
 uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type ) throw (uno::RuntimeException)
 {
     uno::Any result;
-    //uno::Reference< view::XSelectionSupplier > xSel( mxModel->getCurrentController(), uno::UNO_QUERY_THROW );
-    //uno::Any aSelectedObject = xSel->getSelection();
     switch( _type )
     {
         case word::WdInformation::wdActiveEndPageNumber:
@@ -781,8 +778,6 @@ uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type ) throw (uno::Run
         default:
             throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() );
     }
-    // This method fails to restore the previouse selection
-    //xSel->select( aSelectedObject );
     return result;
 }
 
diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx
index 7d17e98e2ffa..06d9d52c8d5b 100644
--- a/sw/source/ui/vba/vbastyles.cxx
+++ b/sw/source/ui/vba/vbastyles.cxx
@@ -326,7 +326,6 @@ SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 ) throw (uno::
                 rtl::OUString aStyleName = rtl::OUString::createFromAscii( pTable->pOOoStyleName );
                 if( aStyleName.getLength() > 0 )
                 {
-                    //rtl::OUString aStyleType = SwVbaStyle::getOOoStyleTypeFromMSWord( pTable->wdStyleType );
                     rtl::OUString aStyleType;
                     switch( pTable->wdStyleType )
                     {
diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx
index 2fa13bc98673..452ba5024daf 100644
--- a/sw/source/ui/vba/vbatablehelper.cxx
+++ b/sw/source/ui/vba/vbatablehelper.cxx
@@ -190,11 +190,6 @@ void SwVbaTableHelper::InitTabCols( SwTabCols& rCols, const SwTableBox *pStart,
     rCols.SetLeft    ( 0 );
     rCols.SetRight   ( UNO_TABLE_COLUMN_SUM );
     rCols.SetRightMax( UNO_TABLE_COLUMN_SUM );
-
-    //if( !pDoc )
-   // {
-     //   pDoc = word::getDocShell( getCurrentDocument() )->GetDoc();
-   // }
     pTable->GetTabCols( rCols, pStart, sal_False, sal_False );
 }
 
@@ -272,14 +267,11 @@ void SwVbaTableHelper::SetColWidth( sal_Int32 _width, sal_Int32 nCol, sal_Int32
     SwTabCols aOldCols;
     InitTabCols( aOldCols, pStart, bCurRowOnly );
 
-    //BOOL bCurRowOnly = FALSE;
     SwTwips nWidth = 0;
 
     SwTabCols aCols( aOldCols );
     if ( aCols.Count() > 0 )
     {
-    //  if(aCols.Count() != GetColCount( aCols ))
-    //      bCurRowOnly = TRUE;
         nWidth = GetColWidth( aCols, nCol);
 
         int nDiff = (int)(nNewWidth - nWidth);
@@ -302,7 +294,6 @@ void SwVbaTableHelper::SetColWidth( sal_Int32 _width, sal_Int32 nCol, sal_Int32
     else
         aCols.SetRight( Min( (long)nNewWidth, aCols.GetRightMax()) );
 
-    //pDoc->SetTabCols(*pTable, aCols, aOldCols, pStartBox, bCurRowOnly );
     pTable->SetTabCols(aCols, aOldCols, pStart, bCurRowOnly );
 }
 
diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx
index ab7ab7c67766..77e3a464f665 100644
--- a/sw/source/ui/vba/vbatables.cxx
+++ b/sw/source/ui/vba/vbatables.cxx
@@ -161,11 +161,7 @@ SwVbaTables::Add( const uno::Reference< word::XRange >& Range, const uno::Any& N
 
     uno::Reference< text::XTextTable > xTable;
     xTable.set( xMsf->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextTable")) ), uno::UNO_QUERY_THROW );
-/*
-    comphelper::ComponentContext aCtx( xMsf );
-    if ( !aCtx.createComponent( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextTable") ), xTable ) );
-        throw uno::RuntimeException(); // #FIXME better exception??
-*/
+
     xTable->initialize( nRows, nCols );
     uno::Reference< text::XText > xText = xTextRange->getText();
     uno::Reference< text::XTextContent > xContext( xTable, uno::UNO_QUERY_THROW );
diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx
index 93f665939a55..00123c9459dd 100644
--- a/sw/source/ui/vba/vbatablesofcontents.cxx
+++ b/sw/source/ui/vba/vbatablesofcontents.cxx
@@ -143,8 +143,6 @@ SwVbaTablesOfContents::Add( const uno::Reference< word::XRange >& Range, const u
     xToc->setUseFields( bUseFields );
 
     sal_Bool bUseOutlineLevels = sal_True;
-    //if( UseOutlineLevels.hasValue() )
-    //    UseOutlineLevels >>= bUseOutlineLevels;
     xToc->setUseOutlineLevels( bUseOutlineLevels );
 
     SwVbaRange* pVbaRange = dynamic_cast<SwVbaRange*>( Range.get() );
diff --git a/sw/source/ui/vba/vbatemplate.cxx b/sw/source/ui/vba/vbatemplate.cxx
index 6ac677ed5146..6216b853ee3e 100644
--- a/sw/source/ui/vba/vbatemplate.cxx
+++ b/sw/source/ui/vba/vbatemplate.cxx
@@ -118,7 +118,6 @@ SwVbaTemplate::AutoTextEntries( const uno::Any& index ) throw (uno::RuntimeExcep
     else
     {
         throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Auto Text Entry doesn't exist") ), uno::Reference< uno::XInterface >() );
-        //xGroup.set( xAutoTextContainer->insertNewByName( sGroup ), uno::UNO_QUERY_THROW );
     }
 
     uno::Reference< XCollection > xCol( new SwVbaAutoTextEntries( this, mxContext, xGroup ) );
diff --git a/sw/source/ui/vba/vbaview.cxx b/sw/source/ui/vba/vbaview.cxx
index 044884af3e71..169695f81e94 100644
--- a/sw/source/ui/vba/vbaview.cxx
+++ b/sw/source/ui/vba/vbaview.cxx
@@ -130,9 +130,6 @@ SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeExceptio
     // document, so we can jump back to this position, if the macro sets
     // the ViewMode back to wdSeekMainDocument
 
-    // if( _seekview == getSeekView() )
-    //    return;
-
     word::gotoSelectedObjectAnchor( mxModel );
     switch( _seekview )
     {
diff --git a/sw/source/ui/web/makefile.mk b/sw/source/ui/web/makefile.mk
index 2b1eb7590b9a..3dca3955de89 100644
--- a/sw/source/ui/web/makefile.mk
+++ b/sw/source/ui/web/makefile.mk
@@ -42,17 +42,20 @@ SRS1NAME=$(TARGET)
 SRC1FILES =  \
         web.src 
 
-SLOFILES =  \
-        $(SLO)$/wformsh.obj	\
-        $(SLO)$/wgrfsh.obj	\
-        $(SLO)$/wlistsh.obj	\
-        $(SLO)$/wolesh.obj	\
-        $(SLO)$/wtabsh.obj	\
+EXCEPTIONSFILES = \
+        $(SLO)$/wdocsh.obj \
+        $(SLO)$/wformsh.obj \
         $(SLO)$/wfrmsh.obj \
+        $(SLO)$/wgrfsh.obj \
+        $(SLO)$/wlistsh.obj \
+        $(SLO)$/wolesh.obj \
+        $(SLO)$/wtabsh.obj \
         $(SLO)$/wtextsh.obj \
-        $(SLO)$/wdocsh.obj \
         $(SLO)$/wview.obj
 
+SLOFILES =  \
+        $(EXCEPTIONSFILES)
+
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/sw/source/ui/web/wdocsh.cxx b/sw/source/ui/web/wdocsh.cxx
index 00b761accd1c..82344aeafb3c 100644
--- a/sw/source/ui/web/wdocsh.cxx
+++ b/sw/source/ui/web/wdocsh.cxx
@@ -63,20 +63,12 @@ TYPEINIT1(SwWebDocShell, SwDocShell);
 
 SFX_IMPL_OBJECTFACTORY(SwWebDocShell, SvGlobalName(SO3_SWWEB_CLASSID), SFXOBJECTSHELL_STD_NORMAL|SFXOBJECTSHELL_HASMENU, "swriter/web" )
 
-/*-----------------22.01.97 09.29-------------------
-
---------------------------------------------------*/
-
 SwWebDocShell::SwWebDocShell(SfxObjectCreateMode eMode ) :
         SwDocShell(eMode),
         nSourcePara(0)
 {
 }
 
-/*-----------------22.01.97 09.29-------------------
-
---------------------------------------------------*/
-
 SwWebDocShell::~SwWebDocShell()
 {
 }
diff --git a/sw/source/ui/web/wfrmsh.cxx b/sw/source/ui/web/wfrmsh.cxx
index dc9b6e04c490..900dd380d9c5 100644
--- a/sw/source/ui/web/wfrmsh.cxx
+++ b/sw/source/ui/web/wfrmsh.cxx
@@ -51,11 +51,6 @@
 #include <sfx2/msg.hxx>
 #include "swslots.hxx"
 
-
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 SFX_IMPL_INTERFACE(SwWebFrameShell, SwFrameShell, SW_RES(STR_SHELLNAME_WEBFRAME))
 {
     SFX_POPUPMENU_REGISTRATION(SW_RES(MN_FRM_POPUPMENU));
@@ -66,24 +61,12 @@ SFX_IMPL_INTERFACE(SwWebFrameShell, SwFrameShell, SW_RES(STR_SHELLNAME_WEBFRAME)
 
 TYPEINIT1(SwWebFrameShell, SwFrameShell)
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
 SwWebFrameShell::SwWebFrameShell(SwView &_rView) :
     SwFrameShell(_rView)
 {
     SetHelpId(SW_WEBFRAMESHELL);
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
-
 SwWebFrameShell::~SwWebFrameShell()
 {
 }
diff --git a/sw/source/ui/web/wtextsh.cxx b/sw/source/ui/web/wtextsh.cxx
index ad9dd701e575..adde4bef5128 100644
--- a/sw/source/ui/web/wtextsh.cxx
+++ b/sw/source/ui/web/wtextsh.cxx
@@ -60,11 +60,6 @@
 #include <sfx2/msg.hxx>
 #include "swslots.hxx"
 
-
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 SFX_IMPL_INTERFACE(SwWebTextShell, SwBaseShell, SW_RES(STR_SHELLNAME_WEBTEXT))
 {
     SFX_POPUPMENU_REGISTRATION(SW_RES(MN_WEB_TEXT_POPUPMENU));
@@ -75,21 +70,12 @@ SFX_IMPL_INTERFACE(SwWebTextShell, SwBaseShell, SW_RES(STR_SHELLNAME_WEBTEXT))
 
 TYPEINIT1(SwWebTextShell, SwTextShell)
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
 SwWebTextShell::SwWebTextShell(SwView &_rView) :
     SwTextShell(_rView)
 {
     SetHelpId(SW_WEBTEXTSHELL);
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
-
-
 SwWebTextShell::~SwWebTextShell()
 {
 }
diff --git a/sw/source/ui/web/wview.cxx b/sw/source/ui/web/wview.cxx
index e5a0b4e972d5..20ce3b3d8b15 100644
--- a/sw/source/ui/web/wview.cxx
+++ b/sw/source/ui/web/wview.cxx
@@ -111,30 +111,15 @@ SFX_IMPL_INTERFACE( SwWebView, SwView, SW_RES(RID_WEBTOOLS_TOOLBOX) )
 
 TYPEINIT1(SwWebView,SwView)
 
-/*-----------------22.01.97 14.27-------------------
-
---------------------------------------------------*/
-
-
 SwWebView::SwWebView(SfxViewFrame* _pFrame, SfxViewShell* _pShell) :
     SwView(_pFrame, _pShell)
 {
 }
 
-/*-----------------22.01.97 14.27-------------------
-
---------------------------------------------------*/
-
-
 SwWebView::~SwWebView()
 {
 }
 
-/*-----------------23.01.97 09.01-------------------
-
---------------------------------------------------*/
-
-
 void SwWebView::SelectShell()
 {
     // Entscheidung, ob UpdateTable gerufen werden muss
@@ -160,8 +145,6 @@ void SwWebView::SelectShell()
     }
     else
     {
-
-    //  DELETEZ(pxSelectionObj); //Selektionsobjekt loeschen
         SfxDispatcher &rDispatcher = *GetViewFrame()->GetDispatcher();
         SwToolbarConfigItem *pBarCfg = SW_MOD()->GetWebToolbarConfig();
 
diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx
index 6b1957169e35..6eaa3e9e1658 100644
--- a/sw/source/ui/wrtsh/delete.cxx
+++ b/sw/source/ui/wrtsh/delete.cxx
@@ -112,9 +112,7 @@ long SwWrtShell::DelLine()
     SwCrsrShell::LeftMargin();
     SetMark();
     SwCrsrShell::RightMargin();
-//Warum soll hier noch ein Zeichen in der naechsten Zeile geloescht werden?
-//  if(!IsEndOfPara())
-//      SwCrsrShell::Right();
+
     long nRet = Delete();
     Pop(FALSE);
     if( nRet )
diff --git a/sw/source/ui/wrtsh/makefile.mk b/sw/source/ui/wrtsh/makefile.mk
index baeb3acd25e5..d650e7ba3051 100644
--- a/sw/source/ui/wrtsh/makefile.mk
+++ b/sw/source/ui/wrtsh/makefile.mk
@@ -43,19 +43,18 @@ SRC1FILES =  \
         wrtsh.src
 
 SLOFILES =  \
+        $(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES = \
+        $(SLO)$/delete.obj \
         $(SLO)$/move.obj \
         $(SLO)$/select.obj \
         $(SLO)$/wrtsh1.obj \
         $(SLO)$/wrtsh2.obj \
         $(SLO)$/wrtsh3.obj \
         $(SLO)$/wrtsh4.obj \
-        $(SLO)$/delete.obj \
         $(SLO)$/wrtundo.obj
 
-EXCEPTIONSFILES = \
-        $(SLO)$/wrtsh1.obj \
-        $(SLO)$/wrtsh2.obj
-
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/sw/source/ui/wrtsh/move.cxx b/sw/source/ui/wrtsh/move.cxx
index 3507850ab20e..02d02693604d 100644
--- a/sw/source/ui/wrtsh/move.cxx
+++ b/sw/source/ui/wrtsh/move.cxx
@@ -522,7 +522,6 @@ BOOL SwWrtShell::PushCrsr(SwTwips lOffset, BOOL bSelect)
 
         if( bIsFrmSel )
         {
-//          CallChgLnk();
             // bei Frames immer nur die obere Ecke nehmen, damit dieser
             // wieder selektiert werden kann
             aOldRect.SSize( 5, 5 );
diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx
index 8730900e6bfa..b45b5ed585c7 100644
--- a/sw/source/ui/wrtsh/select.cxx
+++ b/sw/source/ui/wrtsh/select.cxx
@@ -620,7 +620,6 @@ long SwWrtShell::SttLeaveSelect(const Point *, BOOL )
     if(SwCrsrShell::HasSelection() && !IsSelTblCells() && bClearMark) {
         return 0;
     }
-//  if( IsSelTblCells() ) aSelTblLink.Call(this);
     ClearMark();
     return 1;
 }
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index 0268a838fed3..7e74d6eff6ba 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -256,18 +256,6 @@ void SwWrtShell::Insert( const String &rStr )
         bDeleted = DelRight() != 0;
     }
 
-    /*
-JP 21.01.98: Ueberschreiben ueberschreibt nur die Selektion, nicht das
-            naechste Zeichen.
-    if( bHasSel && !bIns && 1 < rStr.Len() )
-    {
-        // falls mehrere Zeichen anstehen, nur das erste einfuegen,
-        // der Rest muss dann aber Ueberschrieben werden.
-        SwEditShell::Insert( rStr.GetChar( 0 ) );
-        SwEditShell::Overwrite( rStr.Copy( 1 ) );
-    }
-    else
-*/
     bCallIns ?
         SwEditShell::Insert2( rStr, bDeleted ) : SwEditShell::Overwrite( rStr );
 
@@ -277,7 +265,6 @@ JP 21.01.98: Ueberschreiben ueberschreibt nur die Selektion, nicht das
         EndAllAction();
         EndUndo(UNDO_REPLACE);
     }
-//    delete pChgFlg;
 }
 
 /* Begrenzung auf maximale Hoehe geht nicht, da die maximale Hoehe
@@ -1052,7 +1039,6 @@ void SwWrtShell::SplitNode( BOOL bAutoFmt, BOOL bCheckTableStart )
 // extern void SetNumChrFmt( SwWrtShell*, SwNumRules& );
 
 // -> #i40041#
-// --> OD 2005-10-25 #b6340308#
 // Preconditions (as far as OD has figured out):
 // - <SwEditShell::HasNumber()> is FALSE, if <bNum> is TRUE
 // - <SwEditShell::HasBullet()> is FALSE, if <bNum> is FALSE
@@ -1067,7 +1053,6 @@ void SwWrtShell::NumOrBulletOn(BOOL bNum)
 
     const SwNumRule * pNumRule = pCurRule;
 
-    // --> OD 2005-10-25 #b6340308#
     // - activate outline rule respectively turning on outline rule for
     //   current text node. But, only for turning on a numbering (<bNum> == TRUE).
     // - overwrite found numbering rule at current cursor position, if
@@ -1078,7 +1063,7 @@ void SwWrtShell::NumOrBulletOn(BOOL bNum)
     SwTxtFmtColl * pColl = GetCurTxtFmtColl();
     if ( pColl )
     {
-        // --> OD 2005-10-25 #b6340308# - retrieve numbering rule at paragraph
+        // retrieve numbering rule at paragraph
         // style, which is found at current cursor position in the document.
         SwNumRule* pCollRule = pDoc->FindNumRulePtr(pColl->GetNumRule().GetValue());
         // --> OD 2005-10-25 #125993# - The outline numbering rule isn't allowed
@@ -1094,29 +1079,15 @@ void SwWrtShell::NumOrBulletOn(BOOL bNum)
                 pCollRule = 0;
             }
         }
-        // --> OD 2006-11-20 #i71764#
-        // Document setting OUTLINE_LEVEL_YIELDS_OUTLINE_RULE has no influence
-        // any more.
-//        if ( pCollRule == NULL &&
-//             NO_NUMBERING != pColl->GetOutlineLevel() &&
-//             GetDoc()->get(IDocumentSettingAccess::OUTLINE_LEVEL_YIELDS_OUTLINE_RULE) )
-//        {
-//            pCollRule = GetDoc()->GetOutlineNumRule();
-//        }
-        // <--
 
-        // <--
-        // --> OD 2005-10-25 #b6340308#
         if ( !pCollRule )
         {
             pNumRule = pCollRule;
         }
-        // --> OD 2006-06-12 #b6435904#
         // no activation or continuation of outline numbering in Writer/Web document
         else if ( bNum &&
                   !dynamic_cast<SwWebDocShell*>(GetDoc()->GetDocShell()) &&
                   pCollRule == GetDoc()->GetOutlineNumRule() )
-        // <--
         {
             if ( pNumRule == pCollRule )
             {
@@ -1198,7 +1169,6 @@ void SwWrtShell::NumOrBulletOn(BOOL bNum)
         }
     }
 
-    // --> OD 2005-10-25 #b6340308#
     // Only automatic numbering/bullet rules should be changed.
     // Note: The outline numbering rule is also an automatic one. It's only
     //       changed, if it has to be activated.
@@ -1214,11 +1184,8 @@ void SwWrtShell::NumOrBulletOn(BOOL bNum)
             pNumRule = 0;
         }
     }
-    // <--
 
-    // --> OD 2005-10-25 #b6340308#
     // Search for a previous numbering/bullet rule to continue it.
-    // --> OD 2008-03-18 #refactorlists#
     String sContinuedListId;
     if ( !pNumRule )
     {
@@ -1227,13 +1194,11 @@ void SwWrtShell::NumOrBulletOn(BOOL bNum)
                                             sContinuedListId );
         bContinueFoundNumRule = pNumRule != 0;
     }
-    // <--
 
     if (pNumRule)
     {
         SwNumRule aNumRule(*pNumRule);
 
-        // --> OD 2005-10-25 #b6340308#
         // do not change found numbering/bullet rule, if it should only be continued.
         if ( !bContinueFoundNumRule )
         {
@@ -1241,12 +1206,10 @@ void SwWrtShell::NumOrBulletOn(BOOL bNum)
 
             if (pTxtNode)
             {
-                // --> OD 2005-10-26 #b6340308# - use above retrieve outline
-                // level, if outline numbering has to be activated.
-                int nLevel = bActivateOutlineRule  ////#outline level,zhaojianwei,need more consideration
+                // use above retrieve outline level, if outline numbering has to be activated.
+                int nLevel = bActivateOutlineRule
                               ? nActivateOutlineLvl
                               : pTxtNode->GetActualListLevel();
-                // <--
 
                 if (nLevel < 0)
                     nLevel = 0;
@@ -1260,37 +1223,29 @@ void SwWrtShell::NumOrBulletOn(BOOL bNum)
                     aFmt.SetNumberingType(SVX_NUM_ARABIC);
                 else
                 {
-                    // --> OD 2008-06-03 #i63395#
-                    // Only apply user defined default bullet font
+                    // #i63395# Only apply user defined default bullet font
                     if ( numfunc::IsDefBulletFontUserDefined() )
                     {
                         const Font* pFnt = &numfunc::GetDefBulletFont();
                         aFmt.SetBulletFont( pFnt );
                     }
-                    // <--
                     aFmt.SetBulletChar( numfunc::GetBulletChar(static_cast<BYTE>(nLevel)));
                     aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
                 }
                 aNumRule.Set(static_cast<USHORT>(nLevel), aFmt);
             }
         }
-        // <--
 
-        // --> OD 2008-02-08 #newlistlevelattrs#
         // reset indent attribute on applying list style
-        // --> OD 2008-03-27 #refactorlists#
         SetCurNumRule( aNumRule, false, sContinuedListId, true );
-        // <--
     }
     else
     {
         // --> OD 2009-08-27 #i95907#
         const SvxNumberFormat::SvxNumPositionAndSpaceMode ePosAndSpaceMode(
                                     numfunc::GetDefaultPositionAndSpaceMode() );
-        // --> OD 2008-02-11 #newlistlevelattrs#
         SwNumRule aNumRule( GetUniqueNumRuleName(), ePosAndSpaceMode );
         // <--
-        // <--
         // Zeichenvorlage an die Numerierung haengen
         SwCharFmt* pChrFmt;
         SwDocShell* pDocSh = GetView().GetDocShell();
@@ -1366,11 +1321,7 @@ void SwWrtShell::NumOrBulletOn(BOOL bNum)
         if ( pTxtNode &&
              ePosAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
         {
-            // --> OD 2010-01-05 #b6884103#
-//            short nTxtNodeFirstLineOffset( 0 );
-//            pTxtNode->GetFirstLineOfsWithNum( nTxtNodeFirstLineOffset );
-//            const SwTwips nTxtNodeIndent = pTxtNode->GetLeftMarginForTabCalculation() +
-//                                           nTxtNodeFirstLineOffset;
+
             const SwTwips nTxtNodeIndent = pTxtNode->GetAdditionalIndentForStartingNewList();
             // <--
             if ( ( nTxtNodeIndent + nWidthOfTabs ) != 0 )
@@ -1473,9 +1424,6 @@ SelectionType SwWrtShell::GetSelectionType() const
     if ( BasicActionPend() )
         return IsSelFrmMode() ? nsSelectionType::SEL_FRM : nsSelectionType::SEL_TXT;
 
-//  if ( IsTableMode() )
-//      return nsSelectionType::SEL_TBL | nsSelectionType::SEL_TBL_CELLS;
-
     SwView &_rView = ((SwView&)GetView());
     if (_rView.GetPostItMgr() && _rView.GetPostItMgr()->HasActiveSidebarWin() )
         return nsSelectionType::SEL_POSTIT;
@@ -1703,10 +1651,6 @@ void SwWrtShell::AutoUpdatePara(SwTxtFmtColl* pColl, const SfxItemSet& rStyleSet
     EndAction();
 }
 
-/*-----------------12.03.97 12.24-------------------
-
---------------------------------------------------*/
-
 void SwWrtShell::AutoUpdateFrame( SwFrmFmt* pFmt, const SfxItemSet& rStyleSet )
 {
     StartAction();
@@ -1775,6 +1719,12 @@ SwWrtShell::SwWrtShell( SwDoc& rDoc, Window *_pWin, SwView &rShell,
     SET_CURR_SHELL( this );
     SetSfxViewShell( (SfxViewShell *)&rShell );
     SetFlyMacroLnk( LINK(this, SwWrtShell, ExecFlyMac) );
+
+    // place the cursor on the first field...
+    IFieldmark *pBM = NULL;
+    if ( IsFormProtected() && ( pBM = GetFieldmarkAfter( ) ) !=NULL ) {
+        GotoFieldmark(pBM);
+    }
 }
 
 /*
@@ -1804,9 +1754,6 @@ BOOL SwWrtShell::Pop( BOOL bOldCrsr )
     return bRet;
 }
 
-/*--------------------------------------------------------------------
-    Beschreibung:
- --------------------------------------------------------------------*/
 BOOL SwWrtShell::CanInsert()
 {
     return (!(IsSelFrmMode() | IsObjSelected() | (GetView().GetDrawFuncPtr() != NULL) | (GetView().GetPostItMgr()->GetActiveSidebarWin()!= NULL)));
diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx
index eca6344941e3..2d793f3410e5 100644
--- a/sw/source/ui/wrtsh/wrtsh2.cxx
+++ b/sw/source/ui/wrtsh/wrtsh2.cxx
@@ -74,11 +74,6 @@
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 
-
-/*------------------------------------------------------------------------
-        Beschreibung:
-------------------------------------------------------------------------*/
-
 void SwWrtShell::Insert(SwField &rFld)
 {
     ResetCursorStack();
@@ -154,9 +149,6 @@ void SwWrtShell::UpdateInputFlds( SwInputFieldList* pLst, BOOL bOnlyInSel )
 BOOL SwWrtShell::StartInputFldDlg( SwField* pFld, BOOL bNextButton,
                                     Window* pParentWin, ByteString* pWindowState )
 {
-//JP 14.08.96: Bug 30332 - nach Umbau der modularietaet im SFX, muss jetzt
-//              das TopWindow der Application benutzt werden.
-//  SwFldInputDlg* pDlg = new SwFldInputDlg( GetWin(), *this, pFld );
 
     SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
     OSL_ENSURE(pFact, "Dialogdiet fail!");
@@ -173,9 +165,7 @@ BOOL SwWrtShell::StartInputFldDlg( SwField* pFld, BOOL bNextButton,
     GetWin()->Update();
     return bRet;
 }
-/* -----------------17.06.2003 10:18-----------------
 
- --------------------------------------------------*/
 BOOL SwWrtShell::StartDropDownFldDlg(SwField* pFld, BOOL bNextButton, ByteString* pWindowState)
 {
     SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
@@ -265,7 +255,6 @@ void SwWrtShell::ClickToField( const SwField& rFld )
             case JE_FMT_GRAPHIC:    nSlotId = SID_INSERT_GRAPHIC;       break;
             case JE_FMT_OLE:        nSlotId = SID_INSERT_OBJECT;        break;
 
-//          case JE_FMT_TEXT:
             }
 
             Right( CRSR_SKIP_CHARS, TRUE, 1, FALSE );       // Feld selektieren
@@ -422,7 +411,6 @@ void LoadURL( const String& rURL, ViewShell* pVSh, USHORT nFilter,
 
     SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, FALSE );
     //#39076# Silent kann lt. SFX entfernt werden.
-//  SfxBoolItem aSilent( SID_SILENT, TRUE );
     SfxBoolItem aBrowse( SID_BROWSE, TRUE );
 
     if( nFilter & URLLOAD_NEWVIEW )
diff --git a/sw/source/ui/wrtsh/wrtsh3.cxx b/sw/source/ui/wrtsh/wrtsh3.cxx
index 148add9bf0de..4b7b0378062e 100644
--- a/sw/source/ui/wrtsh/wrtsh3.cxx
+++ b/sw/source/ui/wrtsh/wrtsh3.cxx
@@ -58,8 +58,6 @@ extern sal_Bool bNoInterrupt;       // in mainwn.cxx
 
 BOOL SwWrtShell::MoveBookMark( BookMarkMove eFuncId, const ::sw::mark::IMark* const pMark)
 {
-//JP 08.03.96: die Wizards brauchen die Selektion !!
-//  EndSelect();
     (this->*fnKillSel)( 0, sal_False );
 
     BOOL bRet = sal_True;
diff --git a/sw/source/ui/wrtsh/wrtsh4.cxx b/sw/source/ui/wrtsh/wrtsh4.cxx
index 2bf6f80c8122..bd1705929ee7 100644
--- a/sw/source/ui/wrtsh/wrtsh4.cxx
+++ b/sw/source/ui/wrtsh/wrtsh4.cxx
@@ -248,16 +248,6 @@ BOOL SwWrtShell::_FwdPara()
 {
     Push();
     ClearMark();
-    // --> OD 2009-01-06 #i81824#
-    // going right and back again left not needed and causes too much
-    // accessibility events due to the cursor movements.
-//    if(!SwCrsrShell::Right(1,CRSR_SKIP_CHARS))
-//    {
-//        Pop(FALSE);
-//        return 0;
-//    }
-//    SwCrsrShell::Left(1,CRSR_SKIP_CHARS);
-    // <--
     BOOL bRet = SwCrsrShell::MovePara(fnParaNext, fnParaStart);
 
     ClearMark();
@@ -270,22 +260,7 @@ BOOL SwWrtShell::_BwdPara()
 {
     Push();
     ClearMark();
-    // --> OD 2009-01-06 #i81824#
-    // going left and back again right not needed and causes too much
-    // accessibility events due to the cursor movements.
-//    if(!SwCrsrShell::Left(1,CRSR_SKIP_CHARS))
-//    {
-//        Pop(FALSE);
-//        return 0;
-//    }
-//    SwCrsrShell::Right(1,CRSR_SKIP_CHARS);
-    // <--
-    // --> OD 2009-01-06 #i81824#
-    // going to start of paragraph only needed, if move to previous paragraph
-    // does not happen. Otherwise, useless accessibility events are triggered
-    // due to cursor movements.
-//    if(!IsSttOfPara())
-//        SttPara();
+
     BOOL bRet = SwCrsrShell::MovePara(fnParaPrev, fnParaStart);
     if ( !bRet && !IsSttOfPara() )
     {
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index 2f6534c69197..8cd46b6e674f 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -454,6 +454,7 @@
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ShowLicense"/>
       <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ShowCredits"/>
       <menu:menuitem menu:id=".uno:About"/>
     </menu:menupopup>
   </menu:menu>
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index ffae48e1f7be..fa417a66b392 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -383,6 +383,7 @@
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ShowLicense"/>
       <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ShowCredits"/>
       <menu:menuitem menu:id=".uno:About"/>
     </menu:menupopup>
   </menu:menu>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index 729cf028d5d2..4e90101c0625 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -450,6 +450,7 @@
       <menu:menuitem menu:id=".uno:ShowLicense"/>
       <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
       <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ShowCredits"/>
       <menu:menuitem menu:id=".uno:About"/>
     </menu:menupopup>
   </menu:menu>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index 729cf028d5d2..4e90101c0625 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -450,6 +450,7 @@
       <menu:menuitem menu:id=".uno:ShowLicense"/>
       <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
       <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ShowCredits"/>
       <menu:menuitem menu:id=".uno:About"/>
     </menu:menupopup>
   </menu:menu>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index 82993b0cc7bb..58422d94c226 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -458,6 +458,7 @@
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ShowLicense"/>
       <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ShowCredits"/>
       <menu:menuitem menu:id=".uno:About"/>
     </menu:menupopup>
   </menu:menu>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index df5fe3f02e9e..14e758ef99e0 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -451,6 +451,7 @@
       <menu:menuitem menu:id=".uno:ShowLicense"/>
       <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
       <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:ShowCredits"/>
       <menu:menuitem menu:id=".uno:About"/>
     </menu:menupopup>
   </menu:menu>
diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk
index 3ad3fc0ab9e4..4088abeae70a 100644
--- a/sw/util/makefile.mk
+++ b/sw/util/makefile.mk
@@ -157,7 +157,7 @@ SHL2OBJS=   $(SLO)$/swdetect.obj \
         $(SLO)$/detreg.obj \
         $(SLO)$/iodetect.obj
 
-.IF "$(dbgutil)"!=""
+.IF "$(DBG_LEVEL)">="2"
 SHL2OBJS+=  \
         $(SLO)$/errhdl.obj
 .ENDIF
diff --git a/sw/xml/writer.xml b/sw/xml/writer.xml
index c06350f66b10..0fe096e2970c 100644
--- a/sw/xml/writer.xml
+++ b/sw/xml/writer.xml
@@ -748,7 +748,7 @@
         <language>c++</language>
         <status value="final"/>
         <supported-service>com::sun::star::util::SearchDescriptor</supported-service>
-        <supported-service>com::sun::star::util::ReplaceDescriptor/supported-service>
+        <supported-service>com::sun::star::util::ReplaceDescriptor</supported-service>
     </component-description>
     <component-description>
         <author>automatically generated by objects2xml</author>
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index 60aff1738d5d..460a27c5fd9b 100644
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -94,11 +94,14 @@ mkdir -p ${DESTDIR}/usr/bin
 
 office_root=/opt/${PREFIX}
 
-cp openoffice.sh ${DESTDIR}/usr/bin/${PREFIX}
+#this symlink is needed to have the API boostrap functions running right
+ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/libreoffice
+
 cp printeradmin.sh ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
 chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
 
 if test "${PREFIX}" != libreoffice ; then
+    cp openoffice.sh ${DESTDIR}/usr/bin/${PREFIX}
     ln -sf /usr/bin/${PREFIX} ${DESTDIR}/usr/bin/libreoffice
     ln -sf /usr/bin/${PREFIX}-printeradmin ${DESTDIR}/usr/bin/libreoffice-printeradmin
 fi
diff --git a/sysui/source/win32/misc/WinImplHelper.cxx b/sysui/source/win32/misc/WinImplHelper.cxx
index dc5089dacbbb..845a324400e3 100644
--- a/sysui/source/win32/misc/WinImplHelper.cxx
+++ b/sysui/source/win32/misc/WinImplHelper.cxx
@@ -133,7 +133,7 @@ void SAL_CALL ListboxAddItem( HWND hwnd, const Any& aItem, const Reference< XInt
     if ( !aItem.hasValue( ) ||
          aItem.getValueType( ) != getCppuType((OUString*)0) )
          throw IllegalArgumentException(
-            OUString::createFromAscii( "invalid value type or any has no value" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )),
             rXInterface,
             aArgPos );
 
@@ -155,7 +155,7 @@ void SAL_CALL ListboxAddItems( HWND hwnd, const Any& aItemList, const Reference<
     if ( !aItemList.hasValue( ) ||
          aItemList.getValueType( ) != getCppuType((Sequence<OUString>*)0) )
          throw IllegalArgumentException(
-            OUString::createFromAscii( "invalid value type or any has no value" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )),
             rXInterface,
             aArgPos );
 
@@ -183,7 +183,7 @@ void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Referenc
            (aPosition.getValueType( ) != getCppuType((sal_Int16*)0)) &&
            (aPosition.getValueType( ) != getCppuType((sal_Int8*)0)) ) )
          throw IllegalArgumentException(
-            OUString::createFromAscii( "invalid value type or any has no value" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )),
             rXInterface,
             aArgPos );
 
@@ -196,7 +196,7 @@ void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Referenc
     // index was not correct
     if ( CB_ERR == lRet )
         throw IllegalArgumentException(
-            OUString::createFromAscii( "inavlid item position" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM( "inavlid item position" )),
             rXInterface,
             aArgPos );
 }
@@ -235,7 +235,7 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref
            (aPosition.getValueType( ) != getCppuType((sal_Int16*)0)) &&
            (aPosition.getValueType( ) != getCppuType((sal_Int8*)0)) ) )
          throw IllegalArgumentException(
-            OUString::createFromAscii( "invalid value type or any has no value" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )),
             rXInterface,
             aArgPos );
 
@@ -244,7 +244,7 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref
 
     if ( nPos < -1 )
         throw IllegalArgumentException(
-            OUString::createFromAscii("invalid index"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("invalid index")),
             rXInterface,
             aArgPos );
 
@@ -252,7 +252,7 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref
 
     if ( (CB_ERR == lRet) && (-1 != nPos) )
         throw IllegalArgumentException(
-            OUString::createFromAscii("invalid index"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("invalid index")),
             rXInterface,
             aArgPos );
 }
@@ -329,7 +329,7 @@ void SAL_CALL CheckboxSetState(
     if ( !aState.hasValue( ) ||
          aState.getValueType( ) != getCppuType((sal_Bool*)0) )
          throw IllegalArgumentException(
-            OUString::createFromAscii( "invalid value type or any has no value" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM( "invalid value type or any has no value" )),
             rXInterface,
             aArgPos );
 
diff --git a/sysui/source/win32/misc/resourceprovider.cxx b/sysui/source/win32/misc/resourceprovider.cxx
index 18a54d636814..dc95c6d08fb2 100644
--- a/sysui/source/win32/misc/resourceprovider.cxx
+++ b/sysui/source/win32/misc/resourceprovider.cxx
@@ -60,7 +60,7 @@ using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;
 // id + 100
 #define LB_LABEL_OFFSET 100
 
-const rtl::OUString TILDE = OUString::createFromAscii( "~" );
+const rtl::OUString TILDE = OUString(RTL_CONSTASCII_USTRINGPARAM( "~" ));
 const sal_Unicode TILDE_SIGN = L'~';
 
 #define FOLDERPICKER_TITLE            500
diff --git a/testautomation/global/input/xml_filter/word.xml b/testautomation/global/input/xml_filter/word.xml
index 795cc23f8298..b74b79760028 100755
--- a/testautomation/global/input/xml_filter/word.xml
+++ b/testautomation/global/input/xml_filter/word.xml
@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <?mso-application progid="Word.Document"?>
-<w:wordDocument xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" w:macrosPresent="no" w:embeddedObjPresent="no" w:ocxPresent="no" xml:space="preserve"><o:DocumentProperties><o:Title>Just a testfile with Word 2003</o:Title><o:Author>Joerg Sievers</o:Author><o:LastAuthor>Joerg Sievers</o:LastAuthor><o:Revision>1</o:Revision><o:TotalTime>0</o:TotalTime><o:Created>2004-03-29T11:50:00Z</o:Created><o:LastSaved>2004-03-29T11:52:00Z</o:LastSaved><o:Pages>1</o:Pages><o:Words>6</o:Words><o:Characters>39</o:Characters><o:Company>Sun Microsystems GmbH</o:Company><o:Lines>1</o:Lines><o:Paragraphs>1</o:Paragraphs><o:CharactersWithSpaces>44</o:CharactersWithSpaces><o:Version>11.5604</o:Version></o:DocumentProperties><w:fonts><w:defaultFonts w:ascii="Times New Roman" w:fareast="Times New Roman" w:h-ansi="Times New Roman" w:cs="Times New Roman"/></w:fonts><w:styles><w:versionOfBuiltInStylenames w:val="4"/><w:latentStyles w:defLockedState="off" w:latentStyleCount="156"/><w:style w:type="paragraph" w:default="on" w:styleId="Normal"><w:name w:val="Normal"/><w:rPr><wx:font wx:val="Times New Roman"/><w:sz w:val="24"/><w:sz-cs w:val="24"/><w:lang w:val="DE" w:fareast="DE" w:bidi="AR-SA"/></w:rPr></w:style><w:style w:type="character" w:default="on" w:styleId="DefaultParagraphFont"><w:name w:val="Default Paragraph Font"/><w:semiHidden/></w:style><w:style w:type="table" w:default="on" w:styleId="TableNormal"><w:name w:val="Normal Table"/><wx:uiName wx:val="Table Normal"/><w:semiHidden/><w:rPr><wx:font wx:val="Times New Roman"/></w:rPr><w:tblPr><w:tblInd w:w="0" w:type="dxa"/><w:tblCellMar><w:top w:w="0" w:type="dxa"/><w:left w:w="108" w:type="dxa"/><w:bo
-tom w:w="0" w:type="dxa"/><w:right w:w="108" w:type="dxa"/></w:tblCellMar></w:tblPr></w:style><w:style w:type="list" w:default="on" w:styleId="NoList"><w:name w:val="No List"/><w:semiHidden/></w:style></w:styles><w:docPr><w:view w:val="print"/><w:zoom w:percent="100"/><w:doNotEmbedSystemFonts/><w:proofState w:spelling="clean" w:grammar="clean"/><w:attachedTemplate w:val=""/><w:defaultTabStop w:val="708"/><w:hyphenationZone w:val="425"/><w:punctuationKerning/><w:characterSpacingControl w:val="DontCompress"/><w:optimizeForBrowser/><w:validateAgainstSchema/><w:saveInvalidXML w:val="off"/><w:ignoreMixedContent w:val="off"/><w:alwaysShowPlaceholderText w:val="off"/><w:compat><w:breakWrappedTables/><w:snapToGridInCell/><w:wrapTextWithPunct/><w:useAsianBreakRules/><w:dontGrowAutofit/></w:compat></w:docPr><w:body><wx:sect><w:proofErr w:type="gramStart"/><w:p><w:pPr><w:rPr><w:lang w:val="EN-GB"/></w:rPr></w:pPr><w:r><w:rPr><w:lang w:val="EN-GB"/></w:rPr><w:t>Just a </w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:lang w:val="EN-GB"/></w:rPr><w:t>testfile</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:rPr><w:lang w:val="EN-GB"/></w:rPr><w:t> with Word 2003.</w:t></w:r><w:proofErr w:type="gramEnd"/></w:p><w:p><w:pPr><w:rPr><w:lang w:val="EN-GB"/></w:rPr></w:pPr><w:r><w:rPr><w:lang w:val="EN-GB"/></w:rPr><w:t>11.5604.5606</w:t></w:r></w:p><w:sectPr><w:pgSz w:w="11906" w:h="16838"/><w:pgMar w:top="1417" w:right="1417" w:bottom="1134" w:left="1417" w:header="708" w:footer="708" w:gutter="0"/><w:cols w:space="708"/><w:docGrid w:line-pitch="360"/></w:sectPr></wx:sect></w:body></w:wordDocument>
+<w:wordDocument xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" w:macrosPresent="no" w:embeddedObjPresent="no" w:ocxPresent="no" xml:space="preserve"><o:DocumentProperties><o:Title>Just a testfile with Word 2003</o:Title><o:Author>Joerg Sievers</o:Author><o:LastAuthor>Joerg Sievers</o:LastAuthor><o:Revision>1</o:Revision><o:TotalTime>0</o:TotalTime><o:Created>2004-03-29T11:50:00Z</o:Created><o:LastSaved>2004-03-29T11:52:00Z</o:LastSaved><o:Pages>1</o:Pages><o:Words>6</o:Words><o:Characters>39</o:Characters><o:Company>Sun Microsystems GmbH</o:Company><o:Lines>1</o:Lines><o:Paragraphs>1</o:Paragraphs><o:CharactersWithSpaces>44</o:CharactersWithSpaces><o:Version>11.5604</o:Version></o:DocumentProperties><w:fonts><w:defaultFonts w:ascii="Times New Roman" w:fareast="Times New Roman" w:h-ansi="Times New Roman" w:cs="Times New Roman"/></w:fonts><w:styles><w:versionOfBuiltInStylenames w:val="4"/><w:latentStyles w:defLockedState="off" w:latentStyleCount="156"/><w:style w:type="paragraph" w:default="on" w:styleId="Normal"><w:name w:val="Normal"/><w:rPr><wx:font wx:val="Times New Roman"/><w:sz w:val="24"/><w:sz-cs w:val="24"/><w:lang w:val="DE" w:fareast="DE" w:bidi="AR-SA"/></w:rPr></w:style><w:style w:type="character" w:default="on" w:styleId="DefaultParagraphFont"><w:name w:val="Default Paragraph Font"/><w:semiHidden/></w:style><w:style w:type="table" w:default="on" w:styleId="TableNormal"><w:name w:val="Normal Table"/><wx:uiName wx:val="Table Normal"/><w:semiHidden/><w:rPr><wx:font wx:val="Times New Roman"/></w:rPr><w:tblPr><w:tblInd w:w="0" w:type="dxa"/><w:tblCellMar><w:top w:w="0" w:type="dxa"/><w:left w:w="108" w:type="dxa"/><w:bottom w:w="0" w:type="dxa"/><w:right w:w="108" w:type="dxa"/></w:tblCellMar></w:tblPr></w:style><w:style w:type="list" w:default="on" w:styleId="NoList"><w:name w:val="No List"/><w:semiHidden/></w:style></w:styles><w:docPr><w:view w:val="print"/><w:zoom w:percent="100"/><w:doNotEmbedSystemFonts/><w:proofState w:spelling="clean" w:grammar="clean"/><w:attachedTemplate w:val=""/><w:defaultTabStop w:val="708"/><w:hyphenationZone w:val="425"/><w:punctuationKerning/><w:characterSpacingControl w:val="DontCompress"/><w:optimizeForBrowser/><w:validateAgainstSchema/><w:saveInvalidXML w:val="off"/><w:ignoreMixedContent w:val="off"/><w:alwaysShowPlaceholderText w:val="off"/><w:compat><w:breakWrappedTables/><w:snapToGridInCell/><w:wrapTextWithPunct/><w:useAsianBreakRules/><w:dontGrowAutofit/></w:compat></w:docPr><w:body><wx:sect><w:proofErr w:type="gramStart"/><w:p><w:pPr><w:rPr><w:lang w:val="EN-GB"/></w:rPr></w:pPr><w:r><w:rPr><w:lang w:val="EN-GB"/></w:rPr><w:t>Just a </w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:lang w:val="EN-GB"/></w:rPr><w:t>testfile</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:rPr><w:lang w:val="EN-GB"/></w:rPr><w:t> with Word 2003.</w:t></w:r><w:proofErr w:type="gramEnd"/></w:p><w:p><w:pPr><w:rPr><w:lang w:val="EN-GB"/></w:rPr></w:pPr><w:r><w:rPr><w:lang w:val="EN-GB"/></w:rPr><w:t>11.5604.5606</w:t></w:r></w:p><w:sectPr><w:pgSz w:w="11906" w:h="16838"/><w:pgMar w:top="1417" w:right="1417" w:bottom="1134" w:left="1417" w:header="708" w:footer="708" w:gutter="0"/><w:cols w:space="708"/><w:docGrid w:line-pitch="360"/></w:sectPr></wx:sect></w:body></w:wordDocument>
diff --git a/testautomation/global/system/includes/iniinfo.inc b/testautomation/global/system/includes/iniinfo.inc
index 0b83af421eeb..a716a5d98506 100755
--- a/testautomation/global/system/includes/iniinfo.inc
+++ b/testautomation/global/system/includes/iniinfo.inc
@@ -772,8 +772,8 @@ function getSofficeNative() as string
     if ("unx" = gPlatGroup) then
         '/// on Linux/Unix systems we need to check/resolv 2 possible links which point to the directory with the 'soffice' executable ///'
         try
-            '/// created by an installation from the root user: //usr//bin//soffice ///'
-            sCandidates(1) = getLinkDestination("/usr/bin/soffice") ' command fails, if link doesn't exist
+            '/// created by an installation from the root user: //usr//bin//libreoffice ///'
+            sCandidates(1) = getLinkDestination("/usr/bin/libreoffice") ' command fails, if link doesn't exist
             if (left(sCandidates(1),2)="..") then
                 ' If the link is relative, make it absolute
                 sCandidates(1) = "/usr/bin/" + sCandidates(1)
@@ -782,28 +782,28 @@ function getSofficeNative() as string
             end if
             ' DEBUG: If you need more detailed information about the installation environment
             '        enable the next line.
-            ' printlog "getSofficeNative() - : /usr/bin/soffice: '" + sCandidates(1) + "' destination exists?: " +fileExists(sCandidates(1))
+            ' printlog "getSofficeNative() - : /usr/bin/libreoffice: '" + sCandidates(1) + "' destination exists?: " +fileExists(sCandidates(1))
         catch
             ' DEBUG: If you need more detailed information about the installation environment
             '        enable the next line.
-            ' printlog "getSofficeNative() - : /usr/bin/soffice: NOT AVAILABLE"
+            ' printlog "getSofficeNative() - : /usr/bin/libreoffice: NOT AVAILABLE"
             sCandidates(1) = ""
         endcatch
         try
-            '/// HAS TO GET created by installation from NON root user: $HOME/soffice ///'
+            '/// HAS TO GET created by installation from NON root user: $HOME/libreoffice ///'
             sTemp = Environ("HOME")
-            sCandidates(2) = getLinkDestination(sTemp+"/soffice")
+            sCandidates(2) = getLinkDestination(sTemp+"/libreoffice")
             if (left(sCandidates(2),1) <> "/") then
                 ' relative path in $HOME directory!
                 sCandidates(2) = sTemp + "/" + sCandidates(2)
             end if
             ' DEBUG: If you need more detailed information about the installation environment
             '        enable the next line.
-            ' printlog "getSofficeNative() - : $HOME/soffice   : '" + sCandidates(2) + "' destination exists?: " +fileExists(sCandidates(2))
+            ' printlog "getSofficeNative() - : $HOME/libreoffice   : '" + sCandidates(2) + "' destination exists?: " +fileExists(sCandidates(2))
         catch
             ' DEBUG: If you need more detailed information about the installation environment
             '        enable the next line.
-            ' printlog "getSofficeNative() - : $HOME/soffice   : NOT AVAILABLE"
+            ' printlog "getSofficeNative() - : $HOME/libreoffice   : NOT AVAILABLE"
             sCandidates(2) = ""
         endcatch
         for i = 1 to 2
diff --git a/testtools/source/bridgetest/multi.cxx b/testtools/source/bridgetest/multi.cxx
index dd8558a29867..3437cd24b290 100644
--- a/testtools/source/bridgetest/multi.cxx
+++ b/testtools/source/bridgetest/multi.cxx
@@ -132,32 +132,32 @@ rtl::OUString testMulti(
             css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >(
                 multi, css::uno::UNO_QUERY_THROW)->fn11(5));
         checkEqual(
-            rtl::OUString::createFromAscii("12" "abc"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12" "abc")),
             css::uno::Reference< test::testtools::bridgetest::XMultiBase1 >(
                 multi, css::uno::UNO_QUERY_THROW)->fn12(
-                    rtl::OUString::createFromAscii("abc")));
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc"))));
         checkEqual(
-            rtl::OUString::createFromAscii("12" "abc-2"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12" "abc-2")),
             static_cast< test::testtools::bridgetest::XMultiBase2 * >(
-                multi.get())->fn12(rtl::OUString::createFromAscii("abc-2")));
+                multi.get())->fn12(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc-2"))));
         checkEqual(
-            rtl::OUString::createFromAscii("12" "abc-2"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12" "abc-2")),
             css::uno::Reference< test::testtools::bridgetest::XMultiBase2 >(
                 multi, css::uno::UNO_QUERY_THROW)->fn12(
-                    rtl::OUString::createFromAscii("abc-2")));
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc-2"))));
         checkEqual(
-            rtl::OUString::createFromAscii("12" "abc-5"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12" "abc-5")),
             static_cast< test::testtools::bridgetest::XMultiBase5 * >(
-                multi.get())->fn12(rtl::OUString::createFromAscii("abc-5")));
+                multi.get())->fn12(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc-5"))));
         checkEqual(
-            rtl::OUString::createFromAscii("12" "abc-5"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12" "abc-5")),
             css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >(
                 multi, css::uno::UNO_QUERY_THROW)->fn12(
-                    rtl::OUString::createFromAscii("abc-5")));
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc-5"))));
         checkEqual< sal_Int32 >(21 * 2, multi->fn21(2));
         checkEqual(
-            rtl::OUString::createFromAscii("22" "de"),
-            multi->fn22(rtl::OUString::createFromAscii("de")));
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("22" "de")),
+            multi->fn22(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de"))));
         checkEqual< sal_Int32 >(
             31 * 3,
             css::uno::Reference< test::testtools::bridgetest::XMultiBase3 >(
@@ -197,19 +197,19 @@ rtl::OUString testMulti(
             css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >(
                 multi, css::uno::UNO_QUERY_THROW)->getatt3());
         checkEqual(
-            rtl::OUString::createFromAscii("32" "f"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("32" "f")),
             css::uno::Reference< test::testtools::bridgetest::XMultiBase3 >(
                 multi, css::uno::UNO_QUERY_THROW)->fn32(
-                    rtl::OUString::createFromAscii("f")));
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("f"))));
         checkEqual(
-            rtl::OUString::createFromAscii("32" "f-5"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("32" "f-5")),
             static_cast< test::testtools::bridgetest::XMultiBase5 * >(
-                multi.get())->fn32(rtl::OUString::createFromAscii("f-5")));
+                multi.get())->fn32(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("f-5"))));
         checkEqual(
-            rtl::OUString::createFromAscii("32" "f-5"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("32" "f-5")),
             css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >(
                 multi, css::uno::UNO_QUERY_THROW)->fn32(
-                    rtl::OUString::createFromAscii("f-5")));
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("f-5"))));
         checkEqual< sal_Int32 >(
             33,
             css::uno::Reference< test::testtools::bridgetest::XMultiBase3 >(
@@ -225,12 +225,12 @@ rtl::OUString testMulti(
         checkEqual< sal_Int32 >(41 * 4, multi->fn41(4));
         checkEqual< sal_Int32 >(61 * 6, multi->fn61(6));
         checkEqual(
-            rtl::OUString::createFromAscii("62" ""),
-            multi->fn62(rtl::OUString::createFromAscii("")));
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("62" "")),
+            multi->fn62(rtl::OUString()));
         checkEqual< sal_Int32 >(71 * 7, multi->fn71(7));
         checkEqual(
-            rtl::OUString::createFromAscii("72" "g"),
-            multi->fn72(rtl::OUString::createFromAscii("g")));
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("72" "g")),
+            multi->fn72(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("g"))));
         checkEqual< sal_Int32 >(73, multi->fn73());
     } catch (CheckFailed const & f) {
         return f.message;
diff --git a/toolkit/inc/layout/layout.hxx b/toolkit/inc/layout/layout.hxx
index ec63578b0408..9322cdc2924d 100644
--- a/toolkit/inc/layout/layout.hxx
+++ b/toolkit/inc/layout/layout.hxx
@@ -61,8 +61,6 @@ class PushButton;
 class RadioButton;
 class ResId;
 struct SfxChildWinInfo;
-//class SvxFontListBox;
-//class SvxLanguageBox;
 class TabControl;
 class TabPage;
 class VCLXRadioButton;
@@ -170,8 +168,6 @@ public:
     void EnterWait ();
     void LeaveWait ();
     bool IsWait () const;
-    //void Enable (bool enable=true, bool child=true);
-    //void Disable (bool child=true);
     bool IsEnabled () const;
     void EnableInput (bool enable=true, bool child=true);
     bool IsInputEnabled () const;
@@ -268,7 +264,7 @@ public:
     static String GetStandardText (sal_uInt16 button_type);
     void SetText( rtl::OUString const& rStr );
     bool SetModeImage (Image const& image);
-    bool SetModeImage (::Image const& image, BmpColorMode mode=BMP_COLOR_NORMAL);
+    bool SetModeImage (::Image const& image);
     void SetImageAlign( ImageAlign eAlign );
 
     void SetClickHdl( Link const& rLink );
@@ -776,7 +772,6 @@ class PluginImpl;
 class TOOLKIT_DLLPUBLIC Plugin : public Control
 {
     DECL_GET_IMPL( Plugin );
-    //DECL_CONSTRUCTORS( Plugin, Control, 0 );
 public:
     ::Control *mpPlugin;
     Plugin( Context *context, char const* id, ::Control *plugin );
diff --git a/toolkit/inc/toolkit/awt/vclxdevice.hxx b/toolkit/inc/toolkit/awt/vclxdevice.hxx
index 5cee7501ac34..d7d144edff98 100644
--- a/toolkit/inc/toolkit/awt/vclxdevice.hxx
+++ b/toolkit/inc/toolkit/awt/vclxdevice.hxx
@@ -58,7 +58,6 @@ class TOOLKIT_DLLPUBLIC VCLXDevice :    public ::com::sun::star::awt::XDevice,
     friend class VCLXGraphics;
 
 private:
-    ::osl::SolarMutex&      mrMutex;  // Reference to SolarMutex
     OutputDevice*           mpOutputDevice;
 
 public:
@@ -66,7 +65,6 @@ public:
     sal_uInt32              nFlags;
 
 protected:
-    ::osl::SolarMutex&       GetMutex() { return mrMutex; }
     void                    DestroyOutputDevice();
 
 public:
diff --git a/toolkit/inc/toolkit/awt/vclxgraphics.hxx b/toolkit/inc/toolkit/awt/vclxgraphics.hxx
index 22266f3aa7fc..1feea0be2e0b 100644
--- a/toolkit/inc/toolkit/awt/vclxgraphics.hxx
+++ b/toolkit/inc/toolkit/awt/vclxgraphics.hxx
@@ -61,7 +61,6 @@ class VCLXGraphics :    public ::com::sun::star::awt::XGraphics,
                         public ::cppu::OWeakObject
 {
 private:
-    osl::SolarMutex&    mrMutex;    // Reference to SolarMutex
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice> mxDevice; // nur um bei getDevice() immer das gleiche zurueckzugeben
 
     OutputDevice*   mpOutputDevice;
@@ -73,9 +72,6 @@ private:
     RasterOp        meRasterOp;
     Region*         mpClipRegion;
 
-protected:
-    osl::SolarMutex&    GetMutex() { return mrMutex; }
-
 public:
                     VCLXGraphics();
                     ~VCLXGraphics();
diff --git a/toolkit/inc/toolkit/awt/vclxtopwindow.hxx b/toolkit/inc/toolkit/awt/vclxtopwindow.hxx
index 5c49313c1aed..76bdf0b8dceb 100644
--- a/toolkit/inc/toolkit/awt/vclxtopwindow.hxx
+++ b/toolkit/inc/toolkit/awt/vclxtopwindow.hxx
@@ -55,7 +55,6 @@ protected:
 
     bool isSystemDependentWindowPeer() const { return m_bWHWND; }
 
-    virtual ::osl::SolarMutex& GetMutexImpl() = 0;
     virtual Window* GetWindowImpl() = 0;
     virtual ::cppu::OInterfaceContainerHelper& GetTopWindowListenersImpl() = 0;
 
@@ -96,7 +95,6 @@ class VCLXTopWindow: public VCLXTopWindow_Base,
                      public VCLXContainer
 {
 protected:
-    virtual osl::SolarMutex& GetMutexImpl();
     virtual Window* GetWindowImpl();
     virtual ::cppu::OInterfaceContainerHelper& GetTopWindowListenersImpl();
 
diff --git a/toolkit/inc/toolkit/awt/vclxwindows.hxx b/toolkit/inc/toolkit/awt/vclxwindows.hxx
index 66950befa6e2..a487c9080ec0 100644
--- a/toolkit/inc/toolkit/awt/vclxwindows.hxx
+++ b/toolkit/inc/toolkit/awt/vclxwindows.hxx
@@ -82,6 +82,8 @@
 #include <com/sun/star/awt/XComboBox.hpp>
 #include <com/sun/star/awt/XCheckBox.hpp>
 #include <com/sun/star/awt/XItemListListener.hpp>
+#include <com/sun/star/awt/XImageConsumer.hpp>
+#include <com/sun/star/awt/XSimpleTabController.hpp>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/implbase2.hxx>
@@ -92,6 +94,7 @@
 
 #include <vcl/pointr.hxx>
 #include <vcl/image.hxx>
+#include <vcl/tabctrl.hxx>
 
 #include <com/sun/star/document/XVbaMethodParameter.hpp>  //liuchen 2009-6-22, add the support of input/output parameters to VBA Dialog_QueryClose event
 class Button;
@@ -372,6 +375,40 @@ public:
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
 };
 
+//  ----------------------------------------------------
+//  class VCLXFrame
+//  ----------------------------------------------------
+class VCLXFrame :   public VCLXContainer
+{
+protected:
+    void                        ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+
+public:
+    VCLXFrame();
+    ~VCLXFrame();
+
+    // ::com::sun::star::uno::XInterface
+    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void                                        SAL_CALL acquire() throw()  { OWeakObject::acquire(); }
+    void                                        SAL_CALL release() throw()  { OWeakObject::release(); }
+
+    // ::com::sun::star::lang::XTypeProvider
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+
+    // ::com::sun::star::awt::XView
+    void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException);
+
+    // ::com::sun::star::awt::XDevice,
+    ::com::sun::star::awt::DeviceInfo SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException);
+
+    // ::com::sun::star::awt::XVclWindowPeer
+    void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException);
+
+    static void     ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
+    virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
+};
+
 
 
 //  ----------------------------------------------------
@@ -449,6 +486,59 @@ public:
     // ::com::sun::star::awt::XVclWindowPeer
     void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException);
 
+    TabPage*  getTabPage() const throw ( ::com::sun::star::uno::RuntimeException);
+    static void     ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
+    virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
+};
+
+class VCLXMultiPage : public ::com::sun::star::awt::XSimpleTabController, public VCLXContainer
+{
+    TabListenerMultiplexer maTabListeners;
+    sal_Int32 mTabId;
+protected:
+    void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+public:
+    VCLXMultiPage();
+    ~VCLXMultiPage();
+
+    // ::com::sun::star::uno::XInterface
+    ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void SAL_CALL acquire() throw() { OWeakObject::acquire(); }
+    void SAL_CALL release() throw() { OWeakObject::release(); }
+
+    // ::com::sun::star::lang::XTypeProvider
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+
+    // ::com::sun::star::lang::XComponent
+    void SAL_CALL dispose(  ) throw(::com::sun::star::uno::RuntimeException);
+
+    // ::com::sun::star::awt::XView
+    void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException);
+
+    // ::com::sun::star::awt::XDevice,
+    ::com::sun::star::awt::DeviceInfo SAL_CALL getInfo() throw(::com::sun::star::uno::RuntimeException);
+
+    // ::com::sun::star::awt::XVclWindowPeer
+    void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException);
+    // XSimpleTabController
+    virtual ::sal_Int32 SAL_CALL insertTab() throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeTab( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL setTabProps( ::sal_Int32 ID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Properties ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > SAL_CALL getTabProps( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL activateTab( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL getActiveTabID() throw (::com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL addTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& Listener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& Listener ) throw (::com::sun::star::uno::RuntimeException);
+    // C++
+    TabControl*  getTabControl() const throw ( ::com::sun::star::uno::RuntimeException);
+    USHORT insertTab( TabPage*, rtl::OUString& sTitle );
+    static void     ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
+    virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); }
 };
 
 //  ----------------------------------------------------
diff --git a/toolkit/inc/toolkit/controls/dialogcontrol.hxx b/toolkit/inc/toolkit/controls/dialogcontrol.hxx
index 04b8c9b9f9c6..6adec8eeae4f 100644
--- a/toolkit/inc/toolkit/controls/dialogcontrol.hxx
+++ b/toolkit/inc/toolkit/controls/dialogcontrol.hxx
@@ -35,12 +35,16 @@
 #include <com/sun/star/awt/XTopWindow.hpp>
 #include <com/sun/star/util/XChangesNotifier.hpp>
 #include <com/sun/star/util/XChangesListener.hpp>
+#include <com/sun/star/awt/XTabListener.hpp>
+#include <com/sun/star/awt/XSimpleTabController.hpp>
 #include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/awt/XDialog2.hpp>
 #include <com/sun/star/resource/XStringResourceResolver.hpp>
+#include <com/sun/star/graphic/XGraphicObject.hpp>
 #include <cppuhelper/implbase6.hxx>
 #include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase2.hxx>
 #include <toolkit/helper/listenermultiplexer.hxx>
 #include <toolkit/controls/unocontrolmodel.hxx>
 #include "toolkit/helper/servicenames.hxx"
@@ -68,11 +72,13 @@ class UnoControlDialogModel :   public UnoControlDialogModel_IBase
                             ,   public UnoControlDialogModel_Base
 {
 public:
+    enum ChildOperation { Insert = 0, Remove };
     // would like to make this typedef private, too, but the Forte 7 compiler does have
     // problems with this .....
     typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >, ::rtl::OUString >
                                                         UnoControlModelHolder;
-private:
+protected:
+    void updateUserFormChildren(  const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xAllChildren, const rtl::OUString& aName, ChildOperation Operation,  const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xTarget ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
     typedef ::std::list< UnoControlModelHolder >        UnoControlModelHolderList;
 
     // for grouping control models (XTabControllerModel::getGroupXXX)
@@ -84,7 +90,6 @@ private:
     friend struct FindControlModel;
     friend struct CompareControlModel;
 
-private:
     ContainerListenerMultiplexer        maContainerListeners;
     ::cppu::OInterfaceContainerHelper   maChangeListeners;
     UnoControlModelHolderList           maModels;
@@ -94,14 +99,15 @@ private:
 
     ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > mxGrfObj;
     bool mbAdjustingGraphic;
-protected:
+
     ::com::sun::star::uno::Any          ImplGetDefaultValue( sal_uInt16 nPropId ) const;
     ::cppu::IPropertyArrayHelper&       SAL_CALL getInfoHelper();
 
     UnoControlModelHolderList::iterator         ImplFindElement( const ::rtl::OUString& rName );
 
 public:
-                        UnoControlDialogModel();
+                        // bRegProps = false => subclass will register its own props
+                        UnoControlDialogModel(  bool bRegProps = true );
                         UnoControlDialogModel( const UnoControlDialogModel& rModel );
                         ~UnoControlDialogModel();
 
@@ -324,6 +330,197 @@ protected:
 };
 
 
+typedef ::cppu::ImplHelper2< ::com::sun::star::container::XContainerListener,
+                             ::com::sun::star::util::XChangesListener >
+                             UnoParentControl_IBase;
+
+class UnoParentControl : public UnoControlContainer, public UnoParentControl_IBase
+{
+protected:
+    bool                                                                        mbSizeModified;
+    bool                                                                        mbPosModified;
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController >   mxTabController;
+    void        ImplInsertControl( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxModel, const ::rtl::OUString& rName );
+    void        ImplRemoveControl( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& rxModel );
+    virtual void        ImplSetPosSize( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& rxCtrl );
+
+public:
+    UnoParentControl();
+    ~UnoParentControl();
+
+    DECLIMPL_SERVICEINFO_DERIVED( UnoParentControl, UnoControlBase, "com.sun.star.awt.UnoParentControl" )
+    ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlContainer::queryInterface(rType); }
+    ::com::sun::star::uno::Any  SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void SAL_CALL acquire() throw() { OWeakAggObject::acquire(); }
+    void SAL_CALL release() throw() { OWeakAggObject::release(); }
+
+    void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException);
+    void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException);
+
+    void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
+
+    // ::com::sun::star::container::XContainerListener
+    void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException);
+    void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException);
+    void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException);
+
+    // ::com::sun::star::lang::XTypeProvider
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+
+    // XChangesListener
+    virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+
+    // ::com::sun::star::awt::XControl
+    sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model ) throw(::com::sun::star::uno::RuntimeException);
+    void SAL_CALL setDesignMode( sal_Bool bOn ) throw(::com::sun::star::uno::RuntimeException);
+protected:
+    virtual void ImplModelPropertiesChanged( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& rEvents ) throw(::com::sun::star::uno::RuntimeException);
+    virtual void removingControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl );
+    virtual void addingControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl );
+};
+
+class UnoMultiPageModel : public UnoControlDialogModel
+{
+public:
+    UnoMultiPageModel();
+    ~UnoMultiPageModel();
+    UnoMultiPageModel( const UnoMultiPageModel& rModel );
+
+    UnoControlModel*    Clone() const;
+
+    DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageModel, UnoControlDialogModel, szServiceName_UnoMultiPageModel )
+
+    virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw( ::com::sun::star::uno::RuntimeException);
+    // XNamedContainer
+    void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+
+    // Override the method of parent Class
+    virtual sal_Bool SAL_CALL getGroupControl(  ) throw (::com::sun::star::uno::RuntimeException);
+protected:
+    virtual ::com::sun::star::uno::Any          ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+    ::cppu::IPropertyArrayHelper&       SAL_CALL getInfoHelper();
+
+};
+
+class UnoMultiPageControl :  public UnoParentControl
+                            ,public ::com::sun::star::awt::XSimpleTabController
+                            ,public ::com::sun::star::awt::XTabListener
+{
+    TabListenerMultiplexer maTabListeners;
+    void bindPage( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl );
+public:
+    UnoMultiPageControl();
+    ~UnoMultiPageControl();
+    ::rtl::OUString     GetComponentServiceName();
+
+    // ::com::sun::star::lang::XServiceInfo
+    DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageControl, UnoParentControl, szServiceName_UnoMultiPageControl )
+    ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoParentControl::queryInterface(rType); }
+    ::com::sun::star::uno::Any  SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void                        SAL_CALL acquire() throw()  { OWeakAggObject::acquire(); }
+    void                        SAL_CALL release() throw()  { OWeakAggObject::release(); }
+    // ::com::sun::star::lang::XTypeProvider
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+    void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
+    // com::sun::star::awt::XSimpleTabController
+    virtual ::sal_Int32 SAL_CALL insertTab() throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeTab( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL setTabProps( ::sal_Int32 ID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Properties ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > SAL_CALL getTabProps( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL activateTab( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL getActiveTabID() throw (::com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL addTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& Listener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& Listener ) throw (::com::sun::star::uno::RuntimeException);
+    // XTabListener
+    virtual void SAL_CALL inserted( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removed( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL changed( ::sal_Int32 ID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Properties ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL activated( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL deactivated( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& evt ) throw (::com::sun::star::uno::RuntimeException);
+    // XComponent
+    void SAL_CALL dispose(  ) throw(::com::sun::star::uno::RuntimeException);
+
+protected:
+    virtual void    impl_createControlPeerIfNecessary(
+        const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl
+    );
+
+};
+
+
+class UnoPageModel : public UnoControlDialogModel
+{
+public:
+    UnoPageModel();
+    ~UnoPageModel();
+    UnoPageModel( const UnoPageModel& rModel );
+
+    UnoControlModel*    Clone() const;
+
+    DECLIMPL_SERVICEINFO_DERIVED( UnoPageModel, UnoControlDialogModel, szServiceName_UnoPageModel )
+
+    virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw( ::com::sun::star::uno::RuntimeException);
+
+    // Override the method of parent Class
+    virtual sal_Bool SAL_CALL getGroupControl(  ) throw (::com::sun::star::uno::RuntimeException);
+protected:
+    virtual ::com::sun::star::uno::Any          ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+    ::cppu::IPropertyArrayHelper&       SAL_CALL getInfoHelper();
+
+};
+
+class UnoPageControl :  public UnoParentControl
+{
+public:
+    UnoPageControl();
+    ~UnoPageControl();
+    ::rtl::OUString     GetComponentServiceName();
+
+
+    // ::com::sun::star::lang::XServiceInfo
+    DECLIMPL_SERVICEINFO_DERIVED( UnoPageControl, UnoParentControl, szServiceName_UnoPageControl )
+};
+
+class UnoFrameModel : public UnoControlDialogModel
+{
+public:
+    UnoFrameModel();
+    ~UnoFrameModel();
+    UnoFrameModel( const UnoFrameModel& rModel );
+
+    UnoControlModel*    Clone() const;
+
+    DECLIMPL_SERVICEINFO_DERIVED( UnoFrameModel, UnoControlDialogModel, szServiceName_UnoFrameModel )
+
+    virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw( ::com::sun::star::uno::RuntimeException);
+
+protected:
+    virtual ::com::sun::star::uno::Any          ImplGetDefaultValue( sal_uInt16 nPropId ) const;
+    ::cppu::IPropertyArrayHelper&       SAL_CALL getInfoHelper();
+};
+
+class UnoFrameControl :  public UnoParentControl
+{
+protected:
+    virtual void        ImplSetPosSize( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& rxCtrl );
+public:
+    UnoFrameControl();
+    ~UnoFrameControl();
+    ::rtl::OUString     GetComponentServiceName();
+
+// ::com::sun::star::lang::XServiceInfo
+DECLIMPL_SERVICEINFO_DERIVED( UnoFrameControl, UnoParentControl, szServiceName_UnoPageControl )
+};
+
 #endif // TOOLKIT_DIALOG_CONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx b/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx
index a566fef2716e..d2b225d23411 100644
--- a/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx
@@ -120,6 +120,15 @@ protected:
     virtual void removingControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl );
     virtual void addingControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl );
 
+    /** ensures that the given control has a peer, if necessary and possible
+        @param _rxControl
+            an ->XControl which has just been inserted into the container. Must not be <NULL/>.
+        @precond
+            our mutex is locked
+    */
+    virtual void    impl_createControlPeerIfNecessary(
+        const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl
+    );
 private:
     /** adds the control to the container, does necessary notifications, and the like
         @param _rxControl
@@ -150,15 +159,6 @@ private:
         const ::rtl::OUString* _pNameAccessor
     );
 
-    /** ensures that the given control has a peer, if necessary and possible
-        @param _rxControl
-            an ->XControl which has just been inserted into the container. Must not be <NULL/>.
-        @precond
-            our mutex is locked
-    */
-    void    impl_createControlPeerIfNecessary(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl
-    );
 };
 
 
diff --git a/toolkit/inc/toolkit/controls/unocontrols.hxx b/toolkit/inc/toolkit/controls/unocontrols.hxx
index 21b634155585..531467f359be 100644
--- a/toolkit/inc/toolkit/controls/unocontrols.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrols.hxx
@@ -72,6 +72,16 @@
 #define UNO_NAME_GRAPHOBJ_URLPREFIX                             "vnd.sun.star.GraphicObject:"
 #define UNO_NAME_GRAPHOBJ_URLPKGPREFIX                  "vnd.sun.star.Package:"
 
+class ImageHelper
+{
+public:
+    // The routine will always attempt to return a valid XGraphic for the passed _rURL
+    // additionallly xOutGraphicObject will container the associated XGraphicObject ( if url
+    // is valid for that )
+    // and is set appropriately ( e.g. NULL if non GraphicObject scheme ) or valid object
+    // if the rURL points to a valid object
+    static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > getGraphicAndGraphicObjectFromURL_nothrow( ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject >& xOutGraphicObject, const ::rtl::OUString& _rURL );
+};
 
 //  ----------------------------------------------------
 //  class UnoControlEditModel
@@ -637,44 +647,6 @@ public:
 
 };
 
-class UnoMultiPageModel : public UnoControlModel
-{
-protected:
-    ::com::sun::star::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const;
-    ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper();
-
-public:
-                        UnoMultiPageModel();
-                        UnoMultiPageModel( const UnoMultiPageModel& rModel ) : UnoControlModel( rModel ) {;}
-
-    UnoControlModel*    Clone() const { return new UnoMultiPageModel( *this ); }
-
-    // ::com::sun::star::io::XPersistObject
-    ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
-
-    // ::com::sun::star::beans::XMultiPropertySet
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
-
-    // ::com::sun::star::lang::XServiceInfo
-    DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageModel, UnoControlModel, szServiceName_UnoMultiPageModel )
-
-};
-//  ----------------------------------------------------
-//  class UnoGroupBoxControl
-//  ----------------------------------------------------
-class UnoMultiPageControl : public UnoControlBase
-{
-public:
-                        UnoMultiPageControl();
-    ::rtl::OUString     GetComponentServiceName();
-
-    sal_Bool SAL_CALL isTransparent(  ) throw(::com::sun::star::uno::RuntimeException);
-
-    // ::com::sun::star::lang::XServiceInfo
-    DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageControl, UnoControlBase, szServiceName_UnoMultiPageControl )
-
-};
-
 //  ----------------------------------------------------
 //  class UnoFixedTextControl
 //  ----------------------------------------------------
diff --git a/toolkit/inc/toolkit/helper/listenermultiplexer.hxx b/toolkit/inc/toolkit/helper/listenermultiplexer.hxx
index 38d7300382cd..ac38197bc5f1 100644
--- a/toolkit/inc/toolkit/helper/listenermultiplexer.hxx
+++ b/toolkit/inc/toolkit/helper/listenermultiplexer.hxx
@@ -42,6 +42,7 @@
 #include <com/sun/star/awt/XTextListener.hpp>
 #include <com/sun/star/awt/XActionListener.hpp>
 #include <com/sun/star/awt/XItemListener.hpp>
+#include <com/sun/star/awt/XTabListener.hpp>
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/awt/XSpinListener.hpp>
 #include <com/sun/star/awt/XAdjustmentListener.hpp>
@@ -184,6 +185,17 @@ DECL_LISTENERMULTIPLEXER_START_DLLPUB( ItemListenerMultiplexer, ::com::sun::star
 DECL_LISTENERMULTIPLEXER_END
 
 //  ----------------------------------------------------
+//  class TabListenerMultiplexer
+//  ----------------------------------------------------
+DECL_LISTENERMULTIPLEXER_START_DLLPUB( TabListenerMultiplexer, ::com::sun::star::awt::XTabListener )
+    void SAL_CALL inserted( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException);
+    void SAL_CALL removed( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException);
+    void SAL_CALL changed( ::sal_Int32 ID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Properties ) throw (::com::sun::star::uno::RuntimeException);
+    void SAL_CALL activated( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException);
+    void SAL_CALL deactivated( ::sal_Int32 ID ) throw (::com::sun::star::uno::RuntimeException);
+DECL_LISTENERMULTIPLEXER_END
+
+//  ----------------------------------------------------
 //  class ContainerListenerMultiplexer
 //  ----------------------------------------------------
 DECL_LISTENERMULTIPLEXER_START( ContainerListenerMultiplexer, ::com::sun::star::container::XContainerListener )
diff --git a/toolkit/inc/toolkit/helper/macros.hxx b/toolkit/inc/toolkit/helper/macros.hxx
index 9fac9cb14582..243ab8e4563d 100644
--- a/toolkit/inc/toolkit/helper/macros.hxx
+++ b/toolkit/inc/toolkit/helper/macros.hxx
@@ -190,6 +190,57 @@ void ClassName::disposing( const ::com::sun::star::lang::EventObject& ) throw(::
     #define DISPLAY_EXCEPTION( ClassName, MethodName, e )
 #endif
 
+#define IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_2PARAM( ClassName, InterfaceName, MethodName, ParamType1, ParamType2 ) \
+{ \
+    ParamType1 aMulti( evt ); \
+    ParamType2 aMulti2( evt2 ); \
+    ::cppu::OInterfaceIteratorHelper aIt( *this ); \
+    while( aIt.hasMoreElements() ) \
+    { \
+        ::com::sun::star::uno::Reference< InterfaceName > xListener( \
+            static_cast< InterfaceName* >( aIt.next() ) ); \
+        try \
+        { \
+            xListener->MethodName( aMulti, aMulti2 ); \
+        } \
+        catch( ::com::sun::star::lang::DisposedException e ) \
+        { \
+            OSL_ENSURE( e.Context.is(), "caught DisposedException with empty Context field" ); \
+            if ( e.Context == xListener || !e.Context.is() ) \
+                aIt.remove(); \
+        } \
+        catch( ::com::sun::star::uno::RuntimeException e ) \
+        { \
+            DISPLAY_EXCEPTION( ClassName, MethodName, e ) \
+        } \
+    } \
+}
+
+#define IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_1PARAM( ClassName, InterfaceName, MethodName, ParamType1 ) \
+{ \
+    ParamType1 aMulti( evt ); \
+    ::cppu::OInterfaceIteratorHelper aIt( *this ); \
+    while( aIt.hasMoreElements() ) \
+    { \
+        ::com::sun::star::uno::Reference< InterfaceName > xListener( \
+            static_cast< InterfaceName* >( aIt.next() ) ); \
+        try \
+        { \
+            xListener->MethodName( aMulti ); \
+        } \
+        catch( ::com::sun::star::lang::DisposedException e ) \
+        { \
+            OSL_ENSURE( e.Context.is(), "caught DisposedException with empty Context field" ); \
+            if ( e.Context == xListener || !e.Context.is() ) \
+                aIt.remove(); \
+        } \
+        catch( ::com::sun::star::uno::RuntimeException e ) \
+        { \
+            DISPLAY_EXCEPTION( ClassName, MethodName, e ) \
+        } \
+    } \
+}
+
 #define IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodName, EventType ) \
 { \
     EventType aMulti( evt ); \
diff --git a/toolkit/inc/toolkit/helper/property.hxx b/toolkit/inc/toolkit/helper/property.hxx
index 611384b89d22..9b077cab2709 100644
--- a/toolkit/inc/toolkit/helper/property.hxx
+++ b/toolkit/inc/toolkit/helper/property.hxx
@@ -205,6 +205,8 @@ namespace rtl {
 #define BASEPROPERTY_MULTISELECTION_SIMPLEMODE      152
 #define BASEPROPERTY_ITEM_SEPARATOR_POS             153
 #define BASEPROPERTY_GROUPNAME                      154  // ::rtl::OUString
+#define BASEPROPERTY_MULTIPAGEVALUE                 155  // sal_Int32
+#define BASEPROPERTY_USERFORMCONTAINEES             156  // css::container::XNameContainer
 
 
 // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
diff --git a/toolkit/inc/toolkit/helper/servicenames.hxx b/toolkit/inc/toolkit/helper/servicenames.hxx
index 9b13eb07c21d..1ec5298cf303 100644
--- a/toolkit/inc/toolkit/helper/servicenames.hxx
+++ b/toolkit/inc/toolkit/helper/servicenames.hxx
@@ -38,9 +38,13 @@ extern const sal_Char __FAR_DATA szServiceName_PopupMenu[], szServiceName2_Popup
 extern const sal_Char __FAR_DATA szServiceName_MenuBar[], szServiceName2_MenuBar[];
 extern const sal_Char __FAR_DATA szServiceName_Pointer[], szServiceName2_Pointer[];
 extern const sal_Char __FAR_DATA szServiceName_UnoControlContainer[], szServiceName2_UnoControlContainer[];
+extern const sal_Char __FAR_DATA szServiceName_UnoControlContainerModel[], szServiceName2_UnoControlContainerModel[];
 extern const sal_Char __FAR_DATA szServiceName_UnoMultiPageControl[], szServiceName2_UnoMultiPageControl[];
 extern const sal_Char __FAR_DATA szServiceName_UnoMultiPageModel[], szServiceName2_UnoMultiPageModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlContainerModel[], szServiceName2_UnoControlContainerModel[];
+extern const sal_Char __FAR_DATA szServiceName_UnoPageControl[], szServiceName2_UnoPageControl[];
+extern const sal_Char __FAR_DATA szServiceName_UnoPageModel[], szServiceName2_UnoPageModel[];
+extern const sal_Char __FAR_DATA szServiceName_UnoFrameControl[], szServiceName2_UnoFrameControl[];
+extern const sal_Char __FAR_DATA szServiceName_UnoFrameModel[], szServiceName2_UnoFrameModel[];
 extern const sal_Char __FAR_DATA szServiceName_TabController[], szServiceName2_TabController[];
 extern const sal_Char __FAR_DATA szServiceName_TabControllerModel[], szServiceName2_TabControllerModel[];
 extern const sal_Char __FAR_DATA szServiceName_UnoControlDialog[], szServiceName2_UnoControlDialog[];
diff --git a/toolkit/inc/toolkit/helper/throbberimpl.hxx b/toolkit/inc/toolkit/helper/throbberimpl.hxx
index eab9eb76aa53..b2c7a5771f78 100644
--- a/toolkit/inc/toolkit/helper/throbberimpl.hxx
+++ b/toolkit/inc/toolkit/helper/throbberimpl.hxx
@@ -40,13 +40,14 @@
 namespace toolkit
 //........................................................................
 {
+#define CSS_UNO     ::com::sun::star::uno
+#define CSS_GRAPHIC ::com::sun::star::graphic
 
     class Throbber_Impl
     {
     private:
-        osl::SolarMutex&    mrMutex;    // Reference to SolarMutex
-        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > maImageList;
-        ::com::sun::star::uno::Reference< VCLXWindow > mxParent;
+        CSS_UNO::Sequence< CSS_UNO::Reference< CSS_GRAPHIC::XGraphic > > maImageList;
+        CSS_UNO::Reference< VCLXWindow > mxParent;
 
         sal_Bool    mbRepeat;
         sal_Int32   mnStepTime;
@@ -56,10 +57,8 @@ namespace toolkit
 
         DECL_LINK( TimeOutHdl, Throbber_Impl* );
 
-        osl::SolarMutex&    GetMutex() { return mrMutex; }
-
     public:
-             Throbber_Impl( ::com::sun::star::uno::Reference< VCLXWindow > xParent,
+             Throbber_Impl( CSS_UNO::Reference< VCLXWindow > xParent,
                             sal_Int32 nStepTime,
                             sal_Bool bRepeat );
             ~Throbber_Impl();
@@ -69,15 +68,17 @@ namespace toolkit
         void setRepeat( sal_Bool bRepeat ) { mbRepeat = bRepeat; }
 
         // XSimpleAnimation
-        void start() throw ( ::com::sun::star::uno::RuntimeException );
-        void stop() throw ( ::com::sun::star::uno::RuntimeException );
-        void setImageList( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& ImageList )
-                    throw ( ::com::sun::star::uno::RuntimeException );
+        void start() throw ( CSS_UNO::RuntimeException );
+        void stop()  throw ( CSS_UNO::RuntimeException );
+        void setImageList( const CSS_UNO::Sequence< CSS_UNO::Reference< CSS_GRAPHIC::XGraphic > >& ImageList )
+                     throw ( CSS_UNO::RuntimeException );
         // Helpers
-        void initImage() throw ( ::com::sun::star::uno::RuntimeException );
-        sal_Bool isHCMode() throw ( ::com::sun::star::uno::RuntimeException );
+        void initImage() throw ( CSS_UNO::RuntimeException );
     };
 //........................................................................
+#undef CSS_UNO
+#undef CSS_GRAPHIC
+
 } // namespacetoolkit
 //........................................................................
 
diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx
index 077ddbca83e0..9e7494779fc7 100644
--- a/toolkit/source/awt/stylesettings.cxx
+++ b/toolkit/source/awt/stylesettings.cxx
@@ -39,6 +39,7 @@
 #include <osl/mutex.hxx>
 #include <vcl/window.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
 
 //......................................................................................................................
 namespace toolkit
@@ -69,13 +70,11 @@ namespace toolkit
     //==================================================================================================================
     struct WindowStyleSettings_Data
     {
-        ::osl::SolarMutex&                      rMutex;
         VCLXWindow*                         pOwningWindow;
         ::cppu::OInterfaceContainerHelper   aStyleChangeListeners;
 
-        WindowStyleSettings_Data( ::osl::SolarMutex& i_rWindowMutex, ::osl::Mutex& i_rListenerMutex, VCLXWindow& i_rOwningWindow )
-            :rMutex( i_rWindowMutex )
-            ,pOwningWindow( &i_rOwningWindow )
+        WindowStyleSettings_Data( ::osl::Mutex& i_rListenerMutex, VCLXWindow& i_rOwningWindow )
+            : pOwningWindow( &i_rOwningWindow )
             ,aStyleChangeListeners( i_rListenerMutex )
         {
         }
@@ -106,7 +105,6 @@ namespace toolkit
     {
     public:
         StyleMethodGuard( WindowStyleSettings_Data& i_rData )
-            :m_aGuard( i_rData.rMutex )
         {
             if ( i_rData.pOwningWindow == NULL )
                 throw DisposedException();
@@ -117,15 +115,15 @@ namespace toolkit
         }
 
     private:
-        ::osl::SolarGuard   m_aGuard;
+        SolarMutexGuard  m_aGuard;
     };
 
     //==================================================================================================================
     //= WindowStyleSettings
     //==================================================================================================================
     //------------------------------------------------------------------------------------------------------------------
-    WindowStyleSettings::WindowStyleSettings( ::osl::SolarMutex& i_rWindowMutex, ::osl::Mutex& i_rListenerMutex, VCLXWindow& i_rOwningWindow )
-        :m_pData( new WindowStyleSettings_Data( i_rWindowMutex, i_rListenerMutex, i_rOwningWindow ) )
+    WindowStyleSettings::WindowStyleSettings(::osl::Mutex& i_rListenerMutex, VCLXWindow& i_rOwningWindow )
+        :m_pData( new WindowStyleSettings_Data(i_rListenerMutex, i_rOwningWindow ) )
     {
         Window* pWindow = i_rOwningWindow.GetWindow();
         if ( !pWindow )
diff --git a/toolkit/source/awt/stylesettings.hxx b/toolkit/source/awt/stylesettings.hxx
index f9a1dff98ff0..b79969f455f2 100644
--- a/toolkit/source/awt/stylesettings.hxx
+++ b/toolkit/source/awt/stylesettings.hxx
@@ -57,7 +57,7 @@ namespace toolkit
     class WindowStyleSettings : public WindowStyleSettings_Base
     {
     public:
-        WindowStyleSettings( ::osl::SolarMutex& i_rWindowMutex, ::osl::Mutex& i_rListenerMutex, VCLXWindow& i_rOwningWindow );
+        WindowStyleSettings( ::osl::Mutex& i_rListenerMutex, VCLXWindow& i_rOwningWindow );
         ~WindowStyleSettings();
 
         void dispose();
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index fd77de8ba8c9..e8626333aad5 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -110,7 +110,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER3( VCLXAccessibleComponent, AccessibleExtendedCom
 
 ::rtl::OUString VCLXAccessibleComponent::getImplementationName() throw (uno::RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleWindow" );
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.toolkit.AccessibleWindow"));
 }
 
 sal_Bool VCLXAccessibleComponent::supportsService( const ::rtl::OUString& rServiceName ) throw (uno::RuntimeException)
@@ -127,7 +127,7 @@ sal_Bool VCLXAccessibleComponent::supportsService( const ::rtl::OUString& rServi
 uno::Sequence< ::rtl::OUString > VCLXAccessibleComponent::getSupportedServiceNames() throw (uno::RuntimeException)
 {
     uno::Sequence< ::rtl::OUString > aNames(1);
-    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleWindow" );
+    aNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleWindow"));
     return aNames;
 }
 
diff --git a/toolkit/source/awt/vclxbutton.cxx b/toolkit/source/awt/vclxbutton.cxx
index d201a2344fa3..6ab3221c5df0 100644
--- a/toolkit/source/awt/vclxbutton.cxx
+++ b/toolkit/source/awt/vclxbutton.cxx
@@ -45,11 +45,11 @@ VCLXIconButton::VCLXIconButton( Window *p, rtl::OUString aDefaultLabel, char con
     p->SetComponentInterface( this );
 
     setLabel( aDefaultLabel );
-    setProperty( rtl::OUString::createFromAscii( "Graphic" ),
+    setProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Graphic")),
                  css::uno::Any( layoutimpl::loadGraphic( pGraphName ) ) );
-    setProperty( rtl::OUString::createFromAscii( "ImagePosition" ),
+    setProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImagePosition")),
                  css::uno::Any( css::awt::ImagePosition::LeftCenter ) );
-    setProperty( rtl::OUString::createFromAscii( "Align" ),
+    setProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Align")),
                  css::uno::Any( (sal_Int16) 1 /* magic - center */ ) );
 }
 
@@ -63,7 +63,7 @@ VCLXOKButton::VCLXOKButton( Window *p )
 
 VCLXCancelButton::VCLXCancelButton( Window *p )
     : VCLXIconButton( p, Button::GetStandardText( BUTTON_CANCEL ),
-//    : VCLXIconButton( xButton, rtl::OUString::createFromAscii( "~Cancel " ),
+//    : VCLXIconButton( xButton, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Cancel ")),
                          "res/commandimagelist/sc_cancel.png" )
 {
 }
@@ -93,13 +93,13 @@ VCLXIgnoreButton::VCLXIgnoreButton( Window *p )
 }
 
 VCLXResetButton::VCLXResetButton( Window *p )
-    : VCLXIconButton( p, rtl::OUString::createFromAscii( "~Reset " ),
+    : VCLXIconButton( p, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Reset ")),
                   "res/commandimagelist/sc_reset.png" )
 {
 }
 
 VCLXApplyButton::VCLXApplyButton( Window *p )
-    : VCLXIconButton( p, rtl::OUString::createFromAscii( "Apply" ),
+    : VCLXIconButton( p, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Apply")),
                   "res/commandimagelist/sc_apply.png" )
 {
 }
@@ -112,14 +112,14 @@ VCLXHelpButton::VCLXHelpButton( Window *p )
 
 VCLXMoreButton::VCLXMoreButton( Window *p )
     : VCLXIconButton( p, Button::GetStandardText( BUTTON_MORE ),
-//    : VCLXIconButton( p, rtl::OUString::createFromAscii( "More " ),
+//    : VCLXIconButton( p, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("More ")),
                   "res/commandimagelist/sc_more.png" )
 {
 }
 
 VCLXAdvancedButton::VCLXAdvancedButton( Window *p )
 //    : VCLXIconButton( p, Button::GetStandardText( BUTTON_ADVANCED ),
-    : VCLXIconButton( p, rtl::OUString::createFromAscii( "Advanced " ),
+    : VCLXIconButton( p, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Advanced ")),
                   "res/commandimagelist/sc_advanced.png" )
 {
 }
diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx
index f0988c6d1eac..a8cc0415e322 100644
--- a/toolkit/source/awt/vclxcontainer.cxx
+++ b/toolkit/source/awt/vclxcontainer.cxx
@@ -37,6 +37,7 @@
 #include <rtl/memory.h>
 #include <rtl/uuid.h>
 
+#include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <tools/debug.hxx>
 
@@ -77,21 +78,21 @@ IMPL_XTYPEPROVIDER_END
 // ::com::sun::star::awt::XVclContainer
 void VCLXContainer::addVclContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclContainerListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     GetContainerListeners().addInterface( rxListener );
 }
 
 void VCLXContainer::removeVclContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclContainerListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     GetContainerListeners().removeInterface( rxListener );
 }
 
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > > VCLXContainer::getWindows(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     // Bei allen Childs das Container-Interface abfragen...
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > > aSeq;
@@ -119,7 +120,7 @@ void VCLXContainer::removeVclContainerListener( const ::com::sun::star::uno::Ref
 // ::com::sun::star::awt::XVclContainerPeer
 void VCLXContainer::enableDialogControl( sal_Bool bEnable ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindow();
     if ( pWindow )
@@ -135,7 +136,7 @@ void VCLXContainer::enableDialogControl( sal_Bool bEnable ) throw(::com::sun::st
 
 void VCLXContainer::setTabOrder( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& Components, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Tabs, sal_Bool bGroupControl ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     sal_uInt32 nCount = Components.getLength();
     DBG_ASSERT( nCount == (sal_uInt32)Tabs.getLength(), "setTabOrder: TabCount != ComponentCount" );
@@ -180,7 +181,7 @@ void VCLXContainer::setTabOrder( const ::com::sun::star::uno::Sequence< ::com::s
 
 void VCLXContainer::setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& Components ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     sal_uInt32 nCount = Components.getLength();
     const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > * pComps = Components.getConstArray();
@@ -234,4 +235,4 @@ void VCLXContainer::setGroup( const ::com::sun::star::uno::Sequence< ::com::sun:
     }
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx
index c7d3910b4262..80cdc766e990 100644
--- a/toolkit/source/awt/vclxdevice.cxx
+++ b/toolkit/source/awt/vclxdevice.cxx
@@ -53,7 +53,7 @@
 //  ----------------------------------------------------
 //  class VCLXDevice
 //  ----------------------------------------------------
-VCLXDevice::VCLXDevice() : mrMutex( Application::GetSolarMutex() )
+VCLXDevice::VCLXDevice()
 {
     mpOutputDevice = NULL;
     nFlags = 0;
@@ -112,7 +112,7 @@ IMPL_XTYPEPROVIDER_END
 // ::com::sun::star::awt::XDevice,
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > VCLXDevice::createGraphics(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > xRef;
 
@@ -124,7 +124,7 @@ IMPL_XTYPEPROVIDER_END
 
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > VCLXDevice::createDevice( sal_Int32 nWidth, sal_Int32 nHeight ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >  xRef;
     if ( GetOutputDevice() )
@@ -140,7 +140,7 @@ IMPL_XTYPEPROVIDER_END
 
 ::com::sun::star::awt::DeviceInfo VCLXDevice::getInfo() throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::awt::DeviceInfo aInfo;
 
@@ -191,7 +191,7 @@ IMPL_XTYPEPROVIDER_END
 
 ::com::sun::star::uno::Sequence< ::com::sun::star::awt::FontDescriptor > VCLXDevice::getFontDescriptors(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Sequence< ::com::sun::star::awt::FontDescriptor> aFonts;
     if( mpOutputDevice )
@@ -210,7 +210,7 @@ IMPL_XTYPEPROVIDER_END
 
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > VCLXDevice::getFont( const ::com::sun::star::awt::FontDescriptor& rDescriptor ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >  xRef;
     if( mpOutputDevice )
@@ -224,7 +224,7 @@ IMPL_XTYPEPROVIDER_END
 
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > VCLXDevice::createBitmap( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >  xBmp;
     if( mpOutputDevice )
@@ -240,7 +240,7 @@ IMPL_XTYPEPROVIDER_END
 
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayBitmap > VCLXDevice::createDisplayBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >& rxBitmap ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     BitmapEx aBmp = VCLUnoHelper::GetBitmap( rxBitmap );
     VCLXBitmap* pBmp = new VCLXBitmap;
@@ -252,7 +252,7 @@ IMPL_XTYPEPROVIDER_END
 
 VCLXVirtualDevice::~VCLXVirtualDevice()
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     DestroyOutputDevice();
 }
@@ -265,7 +265,7 @@ VCLXVirtualDevice::~VCLXVirtualDevice()
 ::com::sun::star::awt::Point SAL_CALL VCLXDevice::convertPointToLogic( const ::com::sun::star::awt::Point& aPoint, ::sal_Int16 TargetUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
     (void)aPoint;
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     if (TargetUnit == com::sun::star::util::MeasureUnit::PERCENT )
     {
         // percentage not allowed here
@@ -290,7 +290,7 @@ VCLXVirtualDevice::~VCLXVirtualDevice()
 ::com::sun::star::awt::Point SAL_CALL VCLXDevice::convertPointToPixel( const ::com::sun::star::awt::Point& aPoint, ::sal_Int16 SourceUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
     (void)aPoint;
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     if (SourceUnit == com::sun::star::util::MeasureUnit::PERCENT ||
         SourceUnit == com::sun::star::util::MeasureUnit::PIXEL )
     {
@@ -314,7 +314,7 @@ VCLXVirtualDevice::~VCLXVirtualDevice()
 ::com::sun::star::awt::Size SAL_CALL VCLXDevice::convertSizeToLogic( const ::com::sun::star::awt::Size& aSize, ::sal_Int16 TargetUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
     (void)aSize;
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     if (TargetUnit == com::sun::star::util::MeasureUnit::PERCENT)
     {
         // percentage not allowed here
@@ -339,7 +339,7 @@ VCLXVirtualDevice::~VCLXVirtualDevice()
 ::com::sun::star::awt::Size SAL_CALL VCLXDevice::convertSizeToPixel( const ::com::sun::star::awt::Size& aSize, ::sal_Int16 SourceUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
     (void)aSize;
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     if (SourceUnit == com::sun::star::util::MeasureUnit::PERCENT ||
         SourceUnit == com::sun::star::util::MeasureUnit::PIXEL)
     {
diff --git a/toolkit/source/awt/vclxdialog.cxx b/toolkit/source/awt/vclxdialog.cxx
index 19e08029213a..7d90dc7f6cba 100644
--- a/toolkit/source/awt/vclxdialog.cxx
+++ b/toolkit/source/awt/vclxdialog.cxx
@@ -80,11 +80,6 @@ VCLXDialog::~VCLXDialog()
     DBG_DTOR( VCLXDialog, NULL );
 }
 
-osl::SolarMutex& VCLXDialog::GetMutexImpl()
-{
-    return VCLXWindow::GetMutex();
-}
-
 Window* VCLXDialog::GetWindowImpl()
 {
     return VCLXWindow::GetWindow();
@@ -102,7 +97,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXDialog, VCLXWindow, VCLXDialog_Base );
 void SAL_CALL VCLXDialog::dispose() throw(::com::sun::star::uno::RuntimeException)
 {
     {
-        ::osl::SolarGuard aGuard( GetMutex() );
+        SolarMutexGuard aGuard;
 
         ::com::sun::star::lang::EventObject aDisposeEvent;
         aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
@@ -147,7 +142,7 @@ void SAL_CALL VCLXDialog::allocateArea( const css::awt::Rectangle &rArea )
 
 void VCLXDialog::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
 {
-    ::osl::ClearableSolarGuard aGuard( GetMutex() );
+    SolarMutexClearableGuard aGuard;
 
     switch ( _rVclWindowEvent.GetId() )
     {
@@ -162,7 +157,7 @@ void VCLXDialog::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
 
 void SAL_CALL VCLXDialog::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any &Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( GetWindow() )
     {
@@ -179,7 +174,7 @@ void SAL_CALL VCLXDialog::setProperty( const ::rtl::OUString& PropertyName, cons
 
 ::com::sun::star::uno::Any SAL_CALL VCLXDialog::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Any aReturn;
     if ( GetWindow() )
@@ -200,7 +195,7 @@ void SAL_CALL VCLXDialog::setProperty( const ::rtl::OUString& PropertyName, cons
 
 void VCLXDialog::setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindow();
     if ( pWindow )
@@ -209,7 +204,7 @@ void VCLXDialog::setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star
 
 void VCLXDialog::setHelpId( sal_Int32 id ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindow();
     if ( pWindow )
@@ -218,7 +213,7 @@ void VCLXDialog::setHelpId( sal_Int32 id ) throw(::com::sun::star::uno::RuntimeE
 
 ::rtl::OUString VCLXDialog::getTitle() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::rtl::OUString aTitle;
     Window* pWindow = GetWindow();
@@ -229,7 +224,7 @@ void VCLXDialog::setHelpId( sal_Int32 id ) throw(::com::sun::star::uno::RuntimeE
 
 sal_Int16 VCLXDialog::execute() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     sal_Int16 nRet = 0;
     if ( GetWindow() )
@@ -253,7 +248,7 @@ sal_Int16 VCLXDialog::execute() throw(::com::sun::star::uno::RuntimeException)
 
 void VCLXDialog::endDialog( sal_Int32 nResult ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( nResult == BUTTONID_HELP )
     {
diff --git a/toolkit/source/awt/vclxdialog.hxx b/toolkit/source/awt/vclxdialog.hxx
index 978519319d3a..e7d92aad59c7 100644
--- a/toolkit/source/awt/vclxdialog.hxx
+++ b/toolkit/source/awt/vclxdialog.hxx
@@ -54,7 +54,6 @@ private:
     VCLXDialog& operator=( const VCLXDialog& ); // never implemented
 
 protected:
-    osl::SolarMutex& GetMutexImpl();
     Window* GetWindowImpl();
     ::cppu::OInterfaceContainerHelper& GetTopWindowListenersImpl();
 
diff --git a/toolkit/source/awt/vclxfixedline.cxx b/toolkit/source/awt/vclxfixedline.cxx
index cecef12fa992..1d51defe2d7d 100644
--- a/toolkit/source/awt/vclxfixedline.cxx
+++ b/toolkit/source/awt/vclxfixedline.cxx
@@ -33,6 +33,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/debug.hxx>
 #include <vcl/fixed.hxx>
+#include <vcl/svapp.hxx>
 
 #include "forward.hxx"
 
@@ -63,7 +64,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER1( VCLXFixedLine, VCLXWindow );
 void SAL_CALL VCLXFixedLine::dispose() throw(RuntimeException)
 {
     {
-        ::osl::SolarGuard aGuard( GetMutex() );
+        SolarMutexGuard aGuard;
 
         EventObject aDisposeEvent;
         aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
@@ -80,23 +81,14 @@ void SAL_CALL VCLXFixedLine::dispose() throw(RuntimeException)
 
 void VCLXFixedLine::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
 {
-    ::osl::ClearableSolarGuard aGuard( GetMutex() );
-/*
-    switch ( _rVclWindowEvent.GetId() )
-    {
-        default:
-            aGuard.clear();
-*/
-            VCLXWindow::ProcessWindowEvent( _rVclWindowEvent );
-/*
-            break;
-    }
-*/
+    SolarMutexGuard aGuard;
+
+    VCLXWindow::ProcessWindowEvent( _rVclWindowEvent );
 }
 
 void SAL_CALL VCLXFixedLine::setProperty( const ::rtl::OUString& PropertyName, const Any &Value ) throw(RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( GetWindow() )
     {
@@ -113,7 +105,7 @@ void SAL_CALL VCLXFixedLine::setProperty( const ::rtl::OUString& PropertyName, c
 
 Any SAL_CALL VCLXFixedLine::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Any aReturn;
     if ( GetWindow() )
diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx
index ac3add9d5ddc..dc2c84702664 100644
--- a/toolkit/source/awt/vclxgraphics.cxx
+++ b/toolkit/source/awt/vclxgraphics.cxx
@@ -65,7 +65,7 @@ IMPL_XTYPEPROVIDER_START( VCLXGraphics )
     getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics>* ) NULL )
 IMPL_XTYPEPROVIDER_END
 
-VCLXGraphics::VCLXGraphics() : mrMutex( Application::GetSolarMutex() )
+VCLXGraphics::VCLXGraphics()
 {
     mpOutputDevice = NULL;
     mpClipRegion = NULL;
@@ -142,7 +142,7 @@ void VCLXGraphics::InitOutputDevice( sal_uInt16 nFlags )
 
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > VCLXGraphics::getDevice() throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if( !mxDevice.is() && mpOutputDevice )
     {
@@ -155,7 +155,7 @@ void VCLXGraphics::InitOutputDevice( sal_uInt16 nFlags )
 
 ::com::sun::star::awt::SimpleFontMetric VCLXGraphics::getFontMetric() throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::awt::SimpleFontMetric aM;
     if( mpOutputDevice )
@@ -168,56 +168,56 @@ void VCLXGraphics::InitOutputDevice( sal_uInt16 nFlags )
 
 void VCLXGraphics::setFont( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& rxFont ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     maFont = VCLUnoHelper::CreateFont( rxFont );
 }
 
 void VCLXGraphics::selectFont( const ::com::sun::star::awt::FontDescriptor& rDescription ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     maFont = VCLUnoHelper::CreateFont( rDescription, Font() );
 }
 
 void VCLXGraphics::setTextColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     maTextColor = Color( (sal_uInt32)nColor );
 }
 
 void VCLXGraphics::setTextFillColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     maTextFillColor = Color( (sal_uInt32)nColor );
 }
 
 void VCLXGraphics::setLineColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     maLineColor = Color( (sal_uInt32)nColor );
 }
 
 void VCLXGraphics::setFillColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     maFillColor = Color( (sal_uInt32)nColor );
 }
 
 void VCLXGraphics::setRasterOp( ::com::sun::star::awt::RasterOperation eROP ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     meRasterOp = (RasterOp)eROP;
 }
 
 void VCLXGraphics::setClipRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     delete mpClipRegion;
     if ( rxRegion.is() )
@@ -228,7 +228,7 @@ void VCLXGraphics::setClipRegion( const ::com::sun::star::uno::Reference< ::com:
 
 void VCLXGraphics::intersectClipRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( rxRegion.is() )
     {
@@ -242,7 +242,7 @@ void VCLXGraphics::intersectClipRegion( const ::com::sun::star::uno::Reference<
 
 void VCLXGraphics::push(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
 
     if( mpOutputDevice )
@@ -251,7 +251,7 @@ void VCLXGraphics::push(  ) throw(::com::sun::star::uno::RuntimeException)
 
 void VCLXGraphics::pop(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
 
     if( mpOutputDevice )
@@ -260,7 +260,7 @@ void VCLXGraphics::pop(  ) throw(::com::sun::star::uno::RuntimeException)
 
 void VCLXGraphics::copy( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >& rxSource, sal_Int32 nSourceX, sal_Int32 nSourceY, sal_Int32 nSourceWidth, sal_Int32 nSourceHeight, sal_Int32 nDestX, sal_Int32 nDestY, sal_Int32 nDestWidth, sal_Int32 nDestHeight ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( mpOutputDevice )
     {
@@ -277,7 +277,7 @@ void VCLXGraphics::copy( const ::com::sun::star::uno::Reference< ::com::sun::sta
 
 void VCLXGraphics::draw( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayBitmap >& rxBitmapHandle, sal_Int32 nSourceX, sal_Int32 nSourceY, sal_Int32 nSourceWidth, sal_Int32 nSourceHeight, sal_Int32 nDestX, sal_Int32 nDestY, sal_Int32 nDestWidth, sal_Int32 nDestHeight ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if( mpOutputDevice )
     {
@@ -309,7 +309,7 @@ void VCLXGraphics::draw( const ::com::sun::star::uno::Reference< ::com::sun::sta
 
 void VCLXGraphics::drawPixel( sal_Int32 x, sal_Int32 y ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if( mpOutputDevice )
     {
@@ -320,7 +320,7 @@ void VCLXGraphics::drawPixel( sal_Int32 x, sal_Int32 y ) throw(::com::sun::star:
 
 void VCLXGraphics::drawLine( sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32 y2 ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if( mpOutputDevice )
     {
@@ -331,7 +331,7 @@ void VCLXGraphics::drawLine( sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32
 
 void VCLXGraphics::drawRect( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if( mpOutputDevice )
     {
@@ -342,7 +342,7 @@ void VCLXGraphics::drawRect( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int3
 
 void VCLXGraphics::drawRoundedRect( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height, sal_Int32 nHorzRound, sal_Int32 nVertRound ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if( mpOutputDevice )
     {
@@ -353,7 +353,7 @@ void VCLXGraphics::drawRoundedRect( sal_Int32 x, sal_Int32 y, sal_Int32 width, s
 
 void VCLXGraphics::drawPolyLine( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if( mpOutputDevice )
     {
@@ -364,7 +364,7 @@ void VCLXGraphics::drawPolyLine( const ::com::sun::star::uno::Sequence< sal_Int3
 
 void VCLXGraphics::drawPolygon( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if( mpOutputDevice )
     {
@@ -375,7 +375,7 @@ void VCLXGraphics::drawPolygon( const ::com::sun::star::uno::Sequence< sal_Int32
 
 void VCLXGraphics::drawPolyPolygon( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > >& DataX, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > >& DataY ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if( mpOutputDevice )
     {
@@ -391,7 +391,7 @@ void VCLXGraphics::drawPolyPolygon( const ::com::sun::star::uno::Sequence< ::com
 
 void VCLXGraphics::drawEllipse( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if( mpOutputDevice )
     {
@@ -402,7 +402,7 @@ void VCLXGraphics::drawEllipse( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_I
 
 void VCLXGraphics::drawArc( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height, sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32 y2 ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if( mpOutputDevice )
     {
@@ -413,7 +413,7 @@ void VCLXGraphics::drawArc( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32
 
 void VCLXGraphics::drawPie( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height, sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32 y2 ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if( mpOutputDevice )
     {
@@ -424,7 +424,7 @@ void VCLXGraphics::drawPie( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32
 
 void VCLXGraphics::drawChord( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height, sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32 y2 ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if( mpOutputDevice )
     {
@@ -435,7 +435,7 @@ void VCLXGraphics::drawChord( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int
 
 void VCLXGraphics::drawGradient( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height, const ::com::sun::star::awt::Gradient& rGradient ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if( mpOutputDevice )
     {
@@ -454,7 +454,7 @@ void VCLXGraphics::drawGradient( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_
 
 void VCLXGraphics::drawText( sal_Int32 x, sal_Int32 y, const ::rtl::OUString& rText ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if( mpOutputDevice )
     {
@@ -465,7 +465,7 @@ void VCLXGraphics::drawText( sal_Int32 x, sal_Int32 y, const ::rtl::OUString& rT
 
 void VCLXGraphics::drawTextArray( sal_Int32 x, sal_Int32 y, const ::rtl::OUString& rText, const ::com::sun::star::uno::Sequence< sal_Int32 >& rLongs ) throw(::com::sun::star::uno::RuntimeException)
 {
-    osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if( mpOutputDevice )
     {
diff --git a/toolkit/source/awt/vclxplugin.cxx b/toolkit/source/awt/vclxplugin.cxx
index 2e8e4c12cbcf..93b1a9db6830 100644
--- a/toolkit/source/awt/vclxplugin.cxx
+++ b/toolkit/source/awt/vclxplugin.cxx
@@ -32,6 +32,7 @@
 #include <toolkit/helper/convert.hxx>
 #include <toolkit/helper/property.hxx>
 #include <vcl/ctrl.hxx>
+#include <vcl/svapp.hxx>
 
 #include "forward.hxx"
 
@@ -55,7 +56,7 @@ VCLXPlugin::~VCLXPlugin()
 void SAL_CALL VCLXPlugin::dispose() throw(uno::RuntimeException)
 {
     {
-        ::osl::SolarGuard aGuard( GetMutex() );
+        SolarMutexGuard aGuard;
 
         lang::EventObject aDisposeEvent;
         aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
@@ -72,7 +73,7 @@ void VCLXPlugin::SetPlugin( ::Control *p )
 awt::Size SAL_CALL VCLXPlugin::getMinimumSize()
     throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::ClearableSolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     if ( mpPlugin )
         return AWTSize( mpPlugin->GetSizePixel() );
     return awt::Size();
diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx
index 093e02fc0efd..ed4d65453340 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@@ -63,8 +63,8 @@
         {
             static ::com::sun::star::beans::Property __FAR_DATA aPropTable[] =
             {
-                ::com::sun::star::beans::Property( ::rtl::OUString::createFromAscii( "Orientation" ), PROPERTY_Orientation, ::getCppuType((const sal_Int16*)0), 0 ),
-                ::com::sun::star::beans::Property( ::rtl::OUString::createFromAscii( "Horizontal" ), PROPERTY_Horizontal, ::getBooleanCppuType(), 0 )
+                ::com::sun::star::beans::Property( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Orientation")), PROPERTY_Orientation, ::getCppuType((const sal_Int16*)0), 0 ),
+                ::com::sun::star::beans::Property( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Horizontal")), PROPERTY_Horizontal, ::getBooleanCppuType(), 0 )
             };
             pProperties = aPropTable;
             nElements = sizeof( aPropTable ) / sizeof( ::com::sun::star::beans::Property );
diff --git a/toolkit/source/awt/vclxscroller.cxx b/toolkit/source/awt/vclxscroller.cxx
index 27424ef83d03..407b7552eeec 100644
--- a/toolkit/source/awt/vclxscroller.cxx
+++ b/toolkit/source/awt/vclxscroller.cxx
@@ -35,6 +35,7 @@
 #include <toolkit/helper/property.hxx>
 #include <tools/debug.hxx>
 #include <vcl/scrbar.hxx>
+#include <vcl/svapp.hxx>
 
 #include "forward.hxx"
 
@@ -69,7 +70,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER1( VCLXScroller, VCLXWindow );
 void SAL_CALL VCLXScroller::dispose() throw(RuntimeException)
 {
     {
-        ::osl::SolarGuard aGuard( GetMutex() );
+        SolarMutexGuard aGuard;
 
         EventObject aDisposeEvent;
         aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
@@ -154,7 +155,7 @@ void VCLXScroller::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
 
 void SAL_CALL VCLXScroller::setProperty( const ::rtl::OUString& PropertyName, const Any &Value ) throw(RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( GetWindow() )
     {
@@ -173,7 +174,7 @@ void SAL_CALL VCLXScroller::setProperty( const ::rtl::OUString& PropertyName, co
 
 Any SAL_CALL VCLXScroller::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Any aReturn;
     if ( GetWindow() )
diff --git a/toolkit/source/awt/vclxspinbutton.cxx b/toolkit/source/awt/vclxspinbutton.cxx
index 1ee7d455d809..2197321b41fb 100644
--- a/toolkit/source/awt/vclxspinbutton.cxx
+++ b/toolkit/source/awt/vclxspinbutton.cxx
@@ -35,6 +35,7 @@
 
 #include <tools/debug.hxx>
 #include <vcl/spin.hxx>
+#include <vcl/svapp.hxx>
 
 namespace toolkit
 {
@@ -93,7 +94,7 @@ namespace toolkit
     void SAL_CALL VCLXSpinButton::dispose( ) throw(RuntimeException)
     {
         {
-            ::osl::SolarGuard aGuard( GetMutex() );
+            SolarMutexGuard aGuard;
 
             EventObject aDisposeEvent;
             aDisposeEvent.Source = *this;
@@ -123,19 +124,18 @@ namespace toolkit
         typedef long (SpinButton::*GetSpinButtonValue) (void) const;
 
         //................................................................
-        void lcl_setSpinButtonValue( ::osl::SolarMutex& _rMutex, Window* _pWindow, SetSpinButtonValue _pSetter, sal_Int32 _nValue )
+        void lcl_setSpinButtonValue(Window* _pWindow, SetSpinButtonValue _pSetter, sal_Int32 _nValue )
         {
-            ::osl::SolarGuard aGuard( _rMutex );
-
+            SolarMutexGuard aGuard;
             SpinButton* pSpinButton = static_cast< SpinButton* >( _pWindow );
             if ( pSpinButton )
                 (pSpinButton->*_pSetter)( _nValue );
         }
 
         //................................................................
-        sal_Int32 lcl_getSpinButtonValue( ::osl::SolarMutex& _rMutex, const Window* _pWindow, GetSpinButtonValue _pGetter )
+        sal_Int32 lcl_getSpinButtonValue(const Window* _pWindow, GetSpinButtonValue _pGetter )
         {
-            ::osl::SolarGuard aGuard( _rMutex );
+            SolarMutexGuard aGuard;
 
             sal_Int32 nValue = 0;
 
@@ -149,13 +149,13 @@ namespace toolkit
     //--------------------------------------------------------------------
     void SAL_CALL VCLXSpinButton::setValue( sal_Int32 n ) throw (RuntimeException)
     {
-        lcl_setSpinButtonValue( GetMutex(), GetWindow(), &SpinButton::SetValue, n );
+        lcl_setSpinButtonValue( GetWindow(), &SpinButton::SetValue, n );
     }
 
     //--------------------------------------------------------------------
     void SAL_CALL VCLXSpinButton::setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) throw (RuntimeException)
     {
-        ::osl::SolarGuard aGuard( GetMutex() );
+        SolarMutexGuard aGuard;
 
         setMinimum( minValue );
         setMaximum( maxValue );
@@ -165,49 +165,49 @@ namespace toolkit
     //--------------------------------------------------------------------
     sal_Int32 SAL_CALL VCLXSpinButton::getValue(  ) throw (RuntimeException)
     {
-        return lcl_getSpinButtonValue( GetMutex(), GetWindow(), &SpinButton::GetValue );
+        return lcl_getSpinButtonValue( GetWindow(), &SpinButton::GetValue );
     }
 
     //--------------------------------------------------------------------
     void SAL_CALL VCLXSpinButton::setMinimum( sal_Int32 minValue ) throw (RuntimeException)
     {
-        lcl_setSpinButtonValue( GetMutex(), GetWindow(), &SpinButton::SetRangeMin, minValue );
+        lcl_setSpinButtonValue( GetWindow(), &SpinButton::SetRangeMin, minValue );
     }
 
     //--------------------------------------------------------------------
     void SAL_CALL VCLXSpinButton::setMaximum( sal_Int32 maxValue ) throw (RuntimeException)
     {
-        lcl_setSpinButtonValue( GetMutex(), GetWindow(), &SpinButton::SetRangeMax, maxValue );
+        lcl_setSpinButtonValue( GetWindow(), &SpinButton::SetRangeMax, maxValue );
     }
 
     //--------------------------------------------------------------------
     sal_Int32 SAL_CALL VCLXSpinButton::getMinimum(  ) throw (RuntimeException)
     {
-        return lcl_getSpinButtonValue( GetMutex(), GetWindow(), &SpinButton::GetRangeMin );
+        return lcl_getSpinButtonValue( GetWindow(), &SpinButton::GetRangeMin );
     }
 
     //--------------------------------------------------------------------
     sal_Int32 SAL_CALL VCLXSpinButton::getMaximum(  ) throw (RuntimeException)
     {
-        return lcl_getSpinButtonValue( GetMutex(), GetWindow(), &SpinButton::GetRangeMax );
+        return lcl_getSpinButtonValue( GetWindow(), &SpinButton::GetRangeMax );
     }
 
     //--------------------------------------------------------------------
     void SAL_CALL VCLXSpinButton::setSpinIncrement( sal_Int32 spinIncrement ) throw (RuntimeException)
     {
-        lcl_setSpinButtonValue( GetMutex(), GetWindow(), &SpinButton::SetValueStep, spinIncrement );
+        lcl_setSpinButtonValue( GetWindow(), &SpinButton::SetValueStep, spinIncrement );
     }
 
     //--------------------------------------------------------------------
     sal_Int32 SAL_CALL VCLXSpinButton::getSpinIncrement(  ) throw (RuntimeException)
     {
-        return lcl_getSpinButtonValue( GetMutex(), GetWindow(), &SpinButton::GetValueStep );
+        return lcl_getSpinButtonValue( GetWindow(), &SpinButton::GetValueStep );
     }
 
     //--------------------------------------------------------------------
     void SAL_CALL VCLXSpinButton::setOrientation( sal_Int32 orientation ) throw (NoSupportException, RuntimeException)
     {
-        ::osl::SolarGuard aGuard( GetMutex() );
+        SolarMutexGuard aGuard;
 
         lcl_modifyStyle( GetWindow(), WB_HSCROLL, orientation == ScrollBarOrientation::HORIZONTAL );
     }
@@ -223,7 +223,7 @@ namespace toolkit
     //--------------------------------------------------------------------
     void VCLXSpinButton::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
     {
-        ::osl::ClearableSolarGuard aGuard( GetMutex() );
+        SolarMutexClearableGuard aGuard;
         Reference< XSpinValue > xKeepAlive( this );
         SpinButton* pSpinButton = static_cast< SpinButton* >( GetWindow() );
         if ( !pSpinButton )
@@ -255,7 +255,7 @@ namespace toolkit
     //--------------------------------------------------------------------
     void SAL_CALL VCLXSpinButton::setProperty( const ::rtl::OUString& PropertyName, const Any& Value ) throw(RuntimeException)
     {
-        ::osl::SolarGuard aGuard( GetMutex() );
+        SolarMutexGuard aGuard;
 
         sal_Int32 nValue = 0;
         sal_Bool  bIsLongValue = ( Value >>= nValue );
@@ -305,7 +305,7 @@ namespace toolkit
     //--------------------------------------------------------------------
     Any SAL_CALL VCLXSpinButton::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException)
     {
-        ::osl::SolarGuard aGuard( GetMutex() );
+        SolarMutexGuard aGuard;
 
         Any aReturn;
 
diff --git a/toolkit/source/awt/vclxsplitter.cxx b/toolkit/source/awt/vclxsplitter.cxx
index 1ffbb9373647..a0b67e2ca823 100644
--- a/toolkit/source/awt/vclxsplitter.cxx
+++ b/toolkit/source/awt/vclxsplitter.cxx
@@ -34,6 +34,7 @@
 #include <toolkit/helper/property.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/split.hxx>
+#include <vcl/svapp.hxx>
 
 #include "forward.hxx"
 
@@ -107,7 +108,7 @@ VCLXSplitter::getChild( int i )
 void SAL_CALL VCLXSplitter::dispose() throw(RuntimeException)
 {
     {
-        ::osl::SolarGuard aGuard( GetMutex() );
+        SolarMutexGuard aGuard;
 
         EventObject aDisposeEvent;
         aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx
index fb28d89b9cbc..522ab0b1145c 100644
--- a/toolkit/source/awt/vclxsystemdependentwindow.cxx
+++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx
@@ -50,6 +50,7 @@
 #include "postmac.h"
 #endif
 
+#include <vcl/svapp.hxx>
 #include <vcl/syschild.hxx>
 #include <vcl/sysdata.hxx>
 
@@ -80,7 +81,7 @@ IMPL_XTYPEPROVIDER_END
 
 ::com::sun::star::uno::Any VCLXSystemDependentWindow::getWindowHandle( const ::com::sun::star::uno::Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     // TODO, check the process id
     ::com::sun::star::uno::Any aRet;
diff --git a/toolkit/source/awt/vclxtabcontrol.cxx b/toolkit/source/awt/vclxtabcontrol.cxx
index fb2e361c337c..1874e654cbcd 100644
--- a/toolkit/source/awt/vclxtabcontrol.cxx
+++ b/toolkit/source/awt/vclxtabcontrol.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include "vclxtabcontrol.hxx"
+#include <vclxtabcontrol.hxx>
 
 #include <com/sun/star/awt/PosSize.hpp>
 #include <sal/macros.h>
@@ -34,6 +34,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/tabpage.hxx>
+#include <vcl/svapp.hxx>
 
 #include "forward.hxx"
 
@@ -100,7 +101,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXTabControl, VCLXWindow, VCLXTabControl_Bas
 void SAL_CALL VCLXTabControl::dispose( ) throw(uno::RuntimeException)
 {
     {
-        ::osl::SolarGuard aGuard( GetMutex() );
+        SolarMutexGuard aGuard;
 
         EventObject aDisposeEvent;
         aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
@@ -220,7 +221,7 @@ uno::Sequence< NamedValue > SAL_CALL VCLXTabControl::getTabProps( sal_Int32 ID )
 // TODO: draw tab border here
 void SAL_CALL VCLXTabControl::draw( sal_Int32 nX, sal_Int32 nY ) throw(uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     TabControl *pTabControl = getTabControl();
     TabPage *pTabPage = pTabControl->GetTabPage( sal::static_int_cast< USHORT >(  getActiveTabID() ) );
@@ -447,7 +448,7 @@ awt::Size SAL_CALL VCLXTabControl::getMinimumSize()
 
 void VCLXTabControl::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
 {
-    ::osl::ClearableSolarGuard aGuard( GetMutex() );
+    SolarMutexClearableGuard aGuard;
     TabControl* pTabControl = static_cast< TabControl* >( GetWindow() );
     if ( !pTabControl )
         return;
diff --git a/toolkit/source/awt/vclxtabcontrol.hxx b/toolkit/source/awt/vclxtabcontrol.hxx
index dfe1b0975346..e5d391b0c783 100644
--- a/toolkit/source/awt/vclxtabcontrol.hxx
+++ b/toolkit/source/awt/vclxtabcontrol.hxx
@@ -123,6 +123,8 @@ public:
         ChildProps( VCLXTabControl::ChildData *pData );
     };
 
+    inline TabControl *getTabControl() const throw (::com::sun::star::uno::RuntimeException);
+
 protected:
     ChildData *createChild( css::uno::Reference< css::awt::XLayoutConstrains > const& xChild );
     ChildProps *createChildProps( Box_Base::ChildData* pData );
@@ -133,7 +135,6 @@ protected:
     std::list< ::com::sun::star::uno::Reference
                < ::com::sun::star::awt::XTabListener > > mxTabListeners;
 
-    inline TabControl *getTabControl() const throw (::com::sun::star::uno::RuntimeException);
 
 private:
     VCLXTabControl( const VCLXTabControl& );            // never implemented
diff --git a/toolkit/source/awt/vclxtabpage.cxx b/toolkit/source/awt/vclxtabpage.cxx
index 7286b7d1bd04..c50e40ec331e 100644
--- a/toolkit/source/awt/vclxtabpage.cxx
+++ b/toolkit/source/awt/vclxtabpage.cxx
@@ -26,13 +26,15 @@
  *
  ************************************************************************/
 
-#include "vclxtabpage.hxx"
+#include <vclxtabpage.hxx>
+
 #include "forward.hxx"
 
 #include <com/sun/star/awt/PosSize.hpp>
 #include <toolkit/helper/convert.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/tabctrl.hxx>
+#include <vcl/svapp.hxx>
 
 #if !defined (__GNUC__)
 #define __PRETTY_FUNCTION__ __FUNCTION__
@@ -66,7 +68,7 @@ VCLXTabPage::~VCLXTabPage()
 void SAL_CALL VCLXTabPage::dispose() throw(uno::RuntimeException)
 {
     {
-        ::osl::SolarGuard aGuard( GetMutex() );
+        SolarMutexGuard aGuard;
 
         lang::EventObject aDisposeEvent;
         aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
@@ -135,7 +137,7 @@ void SAL_CALL VCLXTabPage::allocateArea( awt::Rectangle const& area )
 awt::Size SAL_CALL VCLXTabPage::getMinimumSize()
     throw(uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     return Bin::getMinimumSize();
 }
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 3a80494bb979..62e1714d3f72 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -116,6 +116,7 @@
 
 #include <tools/debug.hxx>
 #include <comphelper/processfactory.hxx>
+#include "awt/vclxtabcontrol.hxx"
 
 namespace css = ::com::sun::star;
 
@@ -283,6 +284,7 @@ static ComponentInfo __FAR_DATA aComponentInfos [] =
     { "floatingwindow",     WINDOW_FLOATINGWINDOW },
     { "framewindow",        VCLWINDOW_FRAMEWINDOW },
     { "groupbox",           WINDOW_GROUPBOX },
+    { "frame",          WINDOW_GROUPBOX },
     { "helpbutton",         WINDOW_HELPBUTTON },
     { "imagebutton",        WINDOW_IMAGEBUTTON },
     { "imageradiobutton",   WINDOW_IMAGERADIOBUTTON },
@@ -623,7 +625,14 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
 
     Window* pNewWindow = NULL;
     sal_uInt16 nType = ImplGetComponentType( aServiceName );
-
+    bool bFrameControl = false;
+    if ( aServiceName == String( RTL_CONSTASCII_USTRINGPARAM("frame") ) )
+        bFrameControl = true;
+    if ( aServiceName == String( RTL_CONSTASCII_USTRINGPARAM("tabcontrolnotabs") ) )
+    {
+        nWinBits |= WB_NOBORDER;
+        nType = ImplGetComponentType( String( RTL_CONSTASCII_USTRINGPARAM("tabcontrol") ) );
+    }
     if ( !pParent )
     {
         // Wenn die Component einen Parent braucht, dann NULL zurueckgeben,
@@ -720,7 +729,17 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
                 pNewWindow = new FloatingWindow( pParent, nWinBits );
             break;
             case WINDOW_GROUPBOX:
+                        {
                 pNewWindow = new GroupBox( pParent, nWinBits );
+                                if ( bFrameControl )
+                                {
+                                    GroupBox* pGroupBox =  static_cast< GroupBox* >( pNewWindow );
+                                    *ppNewComp = new VCLXFrame;
+                                    // Frame control needs to recieve
+                                    // Mouse events
+                                    pGroupBox->SetMouseTransparent( FALSE );
+                                }
+                        }
             break;
             case WINDOW_HELPBUTTON:
                 pNewWindow = new HelpButton( pParent, nWinBits );
@@ -860,6 +879,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
             break;
             case WINDOW_TABCONTROL:
                 pNewWindow = new TabControl( pParent, nWinBits );
+                *ppNewComp = new VCLXMultiPage;
             break;
             case WINDOW_TABDIALOG:
                 pNewWindow = new TabDialog( pParent, nWinBits );
@@ -982,14 +1002,14 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
             break;
             case WINDOW_CONTROL:
                 if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCase(
-                        ::rtl::OUString::createFromAscii("simpleanimation") ) )
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("simpleanimation")) ) )
                 {
                     nWinBits |= WB_SCALE;
                     pNewWindow = new FixedImage( pParent, nWinBits );
                     *ppNewComp = new ::toolkit::XSimpleAnimation;
                 }
                 else if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCase(
-                        ::rtl::OUString::createFromAscii("throbber") ) )
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("throbber")) ) )
                 {
                     nWinBits |= WB_SCALE;
                     pNewWindow = new FixedImage( pParent, nWinBits );
@@ -1308,14 +1328,14 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
             {
                 // remember clipboard here
                 mxClipboard = ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > (
-                    xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.SystemClipboard" ) ), ::com::sun::star::uno::UNO_QUERY );
+                    xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.SystemClipboard")) ), ::com::sun::star::uno::UNO_QUERY );
             }
         }
 
         return mxClipboard;
     }
 
-    else if( clipboardName.equals( ::rtl::OUString::createFromAscii("Selection") ) )
+    else if( clipboardName.equals( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Selection")) ) )
     {
         return mxSelection;
     }
@@ -1326,7 +1346,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
 // XServiceInfo
 ::rtl::OUString VCLXToolkit::getImplementationName() throw(::com::sun::star::uno::RuntimeException)
 {
-    return rtl::OUString::createFromAscii( "stardiv.Toolkit.VCLXToolkit" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv.Toolkit.VCLXToolkit"));
 }
 
 sal_Bool VCLXToolkit::supportsService( const ::rtl::OUString& rServiceName ) throw(::com::sun::star::uno::RuntimeException)
diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx
index 61e89fae8165..79171ef81442 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -93,7 +93,7 @@ Sequence< Type > VCLXTopWindow_Base::getTypes() throw(RuntimeException)
 
 ::com::sun::star::uno::Any VCLXTopWindow_Base::getWindowHandle( const ::com::sun::star::uno::Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutexImpl() );
+    SolarMutexGuard aGuard;
 
     // TODO, check the process id
     ::com::sun::star::uno::Any aRet;
@@ -134,21 +134,21 @@ Sequence< Type > VCLXTopWindow_Base::getTypes() throw(RuntimeException)
 
 void VCLXTopWindow_Base::addTopWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindowListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutexImpl() );
+    SolarMutexGuard aGuard;
 
     GetTopWindowListenersImpl().addInterface( rxListener );
 }
 
 void VCLXTopWindow_Base::removeTopWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindowListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutexImpl() );
+    SolarMutexGuard aGuard;
 
     GetTopWindowListenersImpl().removeInterface( rxListener );
 }
 
 void VCLXTopWindow_Base::toFront(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutexImpl() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindowImpl();
     if ( pWindow )
@@ -161,7 +161,7 @@ void VCLXTopWindow_Base::toBack(  ) throw(::com::sun::star::uno::RuntimeExceptio
 
 void VCLXTopWindow_Base::setMenuBar( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar >& rxMenu ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutexImpl() );
+    SolarMutexGuard aGuard;
 
     SystemWindow* pWindow = (SystemWindow*) GetWindowImpl();
     if ( pWindow )
@@ -180,7 +180,7 @@ void VCLXTopWindow_Base::setMenuBar( const ::com::sun::star::uno::Reference< ::c
 //--------------------------------------------------------------------
 ::sal_Bool SAL_CALL VCLXTopWindow_Base::getIsMaximized() throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutexImpl() );
+    SolarMutexGuard aGuard;
 
     const WorkWindow* pWindow = dynamic_cast< const WorkWindow* >( GetWindowImpl() );
     if ( !pWindow )
@@ -192,7 +192,7 @@ void VCLXTopWindow_Base::setMenuBar( const ::com::sun::star::uno::Reference< ::c
 //--------------------------------------------------------------------
 void SAL_CALL VCLXTopWindow_Base::setIsMaximized( ::sal_Bool _ismaximized ) throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutexImpl() );
+    SolarMutexGuard aGuard;
 
     WorkWindow* pWindow = dynamic_cast< WorkWindow* >( GetWindowImpl() );
     if ( !pWindow )
@@ -204,7 +204,7 @@ void SAL_CALL VCLXTopWindow_Base::setIsMaximized( ::sal_Bool _ismaximized ) thro
 //--------------------------------------------------------------------
 ::sal_Bool SAL_CALL VCLXTopWindow_Base::getIsMinimized() throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutexImpl() );
+    SolarMutexGuard aGuard;
 
     const WorkWindow* pWindow = dynamic_cast< const WorkWindow* >( GetWindowImpl() );
     if ( !pWindow )
@@ -216,7 +216,7 @@ void SAL_CALL VCLXTopWindow_Base::setIsMaximized( ::sal_Bool _ismaximized ) thro
 //--------------------------------------------------------------------
 void SAL_CALL VCLXTopWindow_Base::setIsMinimized( ::sal_Bool _isMinimized ) throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutexImpl() );
+    SolarMutexGuard aGuard;
 
     WorkWindow* pWindow = dynamic_cast< WorkWindow* >( GetWindowImpl() );
     if ( !pWindow )
@@ -228,7 +228,7 @@ void SAL_CALL VCLXTopWindow_Base::setIsMinimized( ::sal_Bool _isMinimized ) thro
 //--------------------------------------------------------------------
 ::sal_Int32 SAL_CALL VCLXTopWindow_Base::getDisplay() throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutexImpl() );
+    SolarMutexGuard aGuard;
 
     const SystemWindow* pWindow = dynamic_cast< const SystemWindow* >( GetWindowImpl() );
     if ( !pWindow )
@@ -240,7 +240,7 @@ void SAL_CALL VCLXTopWindow_Base::setIsMinimized( ::sal_Bool _isMinimized ) thro
 //--------------------------------------------------------------------
 void SAL_CALL VCLXTopWindow_Base::setDisplay( ::sal_Int32 _display ) throw (RuntimeException, IndexOutOfBoundsException)
 {
-    ::osl::SolarGuard aGuard( GetMutexImpl() );
+    SolarMutexGuard aGuard;
 
     if ( ( _display < 0 ) || ( _display >= (sal_Int32)Application::GetScreenCount() ) )
         throw IndexOutOfBoundsException();
@@ -270,11 +270,6 @@ VCLXTopWindow::~VCLXTopWindow()
 {
 }
 
-osl::SolarMutex& VCLXTopWindow::GetMutexImpl()
-{
-    return VCLXContainer::GetMutex();
-}
-
 Window* VCLXTopWindow::GetWindowImpl()
 {
     return VCLXContainer::GetWindow();
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 8b6587627a67..9de591da7a3e 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -128,7 +128,6 @@ private:
 
 private:
     VCLXWindow&                         mrAntiImpl;
-    ::osl::SolarMutex&                  mrMutex;
     ::toolkit::AccessibilityClient      maAccFactory;
     bool                                mbDisposed;
     bool                                mbDrawingOntoParent;    // no bit mask, is passed around  by reference
@@ -181,7 +180,7 @@ public:
         the <type>VCLXWindow</type> instance which the object belongs to. Must
         live longer then the object just being constructed.
     */
-    VCLXWindowImpl( VCLXWindow& _rAntiImpl, ::osl::SolarMutex& _rMutex, bool _bWithDefaultProps );
+    VCLXWindowImpl( VCLXWindow& _rAntiImpl, bool _bWithDefaultProps );
 
     /** synchronously mbEnableVisible
     */
@@ -237,9 +236,8 @@ private:
 };
 
 //--------------------------------------------------------------------
-VCLXWindowImpl::VCLXWindowImpl( VCLXWindow& _rAntiImpl, ::osl::SolarMutex& _rMutex, bool _bWithDefaultProps )
+VCLXWindowImpl::VCLXWindowImpl( VCLXWindow& _rAntiImpl, bool _bWithDefaultProps )
     :mrAntiImpl( _rAntiImpl )
-    ,mrMutex( _rMutex )
     ,mbDisposed( false )
     ,mbDrawingOntoParent( false )
     ,mbEnableVisible(sal_True)
@@ -276,7 +274,7 @@ VCLXWindowImpl::~VCLXWindowImpl()
 //--------------------------------------------------------------------
 void VCLXWindowImpl::disposing()
 {
-    ::osl::SolarGuard aGuard( mrMutex );
+    SolarMutexGuard aGuard;
     if ( mnCallbackEventId )
         Application::RemoveUserEvent( mnCallbackEventId );
     mnCallbackEventId = 0;
@@ -323,7 +321,7 @@ IMPL_LINK( VCLXWindowImpl, OnProcessCallbacks, void*, EMPTYARG )
     // work on a copy of the callback array
     CallbackArray aCallbacksCopy;
     {
-        ::osl::SolarGuard aGuard( mrMutex );
+        SolarMutexGuard aGuard;
         aCallbacksCopy = maCallbackEvents;
         maCallbackEvents.clear();
 
@@ -366,11 +364,11 @@ void SAL_CALL VCLXWindowImpl::release()
 //--------------------------------------------------------------------
 Reference< XStyleSettings > VCLXWindowImpl::getStyleSettings()
 {
-    ::osl::SolarGuard  aGuard( mrMutex );
+    SolarMutexGuard aGuard;
     if ( mbDisposed )
         throw DisposedException( ::rtl::OUString(), mrAntiImpl );
     if ( !mxWindowStyleSettings.is() )
-        mxWindowStyleSettings = new ::toolkit::WindowStyleSettings( mrMutex, maListenerContainerMutex, mrAntiImpl );
+        mxWindowStyleSettings = new ::toolkit::WindowStyleSettings( maListenerContainerMutex, mrAntiImpl );
     return mxWindowStyleSettings;
 }
 
@@ -404,7 +402,7 @@ VCLXWindow::VCLXWindow( bool _bWithDefaultProps )
 {
     DBG_CTOR( VCLXWindow, 0 );
 
-    mpImpl = new VCLXWindowImpl( *this, GetMutex(), _bWithDefaultProps );
+    mpImpl = new VCLXWindowImpl( *this, _bWithDefaultProps );
 }
 
 VCLXWindow::~VCLXWindow()
@@ -449,7 +447,6 @@ void VCLXWindow::SetWindow( Window* pWindow )
         sal_Bool bDirectVisible = pWindow ? pWindow->IsVisible() : false;
         mpImpl->setDirectVisible( bDirectVisible );
     }
-
 }
 
 void VCLXWindow::suspendVclEventListening( )
@@ -943,7 +940,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 
 uno::Reference< accessibility::XAccessibleContext > VCLXWindow::CreateAccessibleContext()
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     return getAccessibleFactory().createAccessibleContext( this );
 }
 
@@ -979,7 +976,7 @@ IMPL_XUNOTUNNEL2( VCLXWindow, VCLXDevice )
 // ::com::sun::star::lang::Component
 void VCLXWindow::dispose(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     mpImpl->mxViewGraphics = NULL;
 
@@ -1018,14 +1015,14 @@ void VCLXWindow::dispose(  ) throw(::com::sun::star::uno::RuntimeException)
 
 void VCLXWindow::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     mpImpl->getEventListeners().addInterface( rxListener );
 }
 
 void VCLXWindow::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     mpImpl->getEventListeners().removeInterface( rxListener );
 }
@@ -1034,7 +1031,7 @@ void VCLXWindow::removeEventListener( const ::com::sun::star::uno::Reference< ::
 // ::com::sun::star::awt::XWindow
 void VCLXWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( GetWindow() )
     {
@@ -1047,7 +1044,7 @@ void VCLXWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int3
 
 ::com::sun::star::awt::Rectangle VCLXWindow::getPosSize(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::awt::Rectangle aBounds;
     if ( GetWindow() )
@@ -1063,7 +1060,7 @@ void VCLXWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int3
 
 void VCLXWindow::setVisible( sal_Bool bVisible ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindow();
     if ( pWindow )
@@ -1088,7 +1085,7 @@ void VCLXWindow::setVisible( sal_Bool bVisible ) throw(::com::sun::star::uno::Ru
 
 void VCLXWindow::setEnable( sal_Bool bEnable ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindow();
     if ( pWindow )
@@ -1100,7 +1097,7 @@ void VCLXWindow::setEnable( sal_Bool bEnable ) throw(::com::sun::star::uno::Runt
 
 void VCLXWindow::setFocus(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( GetWindow() )
         GetWindow()->GrabFocus();
@@ -1108,7 +1105,7 @@ void VCLXWindow::setFocus(  ) throw(::com::sun::star::uno::RuntimeException)
 
 void VCLXWindow::addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     mpImpl->getWindowListeners().addInterface( rxListener );
 
@@ -1123,7 +1120,7 @@ void VCLXWindow::addWindowListener( const ::com::sun::star::uno::Reference< ::co
 
 void VCLXWindow::removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Reference< XWindowListener2 > xListener2( rxListener, UNO_QUERY );
     if ( xListener2.is() )
@@ -1134,61 +1131,61 @@ void VCLXWindow::removeWindowListener( const ::com::sun::star::uno::Reference< :
 
 void VCLXWindow::addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     mpImpl->getFocusListeners().addInterface( rxListener );
 }
 
 void VCLXWindow::removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     mpImpl->getFocusListeners().removeInterface( rxListener );
 }
 
 void VCLXWindow::addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     mpImpl->getKeyListeners().addInterface( rxListener );
 }
 
 void VCLXWindow::removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     mpImpl->getKeyListeners().removeInterface( rxListener );
 }
 
 void VCLXWindow::addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     mpImpl->getMouseListeners().addInterface( rxListener );
 }
 
 void VCLXWindow::removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     mpImpl->getMouseListeners().removeInterface( rxListener );
 }
 
 void VCLXWindow::addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     mpImpl->getMouseMotionListeners().addInterface( rxListener );
 }
 
 void VCLXWindow::removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     mpImpl->getMouseMotionListeners().removeInterface( rxListener );
 }
 
 void VCLXWindow::addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     mpImpl->getPaintListeners().addInterface( rxListener );
 }
 
 void VCLXWindow::removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     mpImpl->getPaintListeners().removeInterface( rxListener );
 }
 
@@ -1202,7 +1199,7 @@ void VCLXWindow::removePaintListener( const ::com::sun::star::uno::Reference< ::
 
 void VCLXWindow::setPointer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPointer >& rxPointer ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     VCLXPointer* pPointer = VCLXPointer::GetImplementation( rxPointer );
     if ( pPointer )
@@ -1215,7 +1212,7 @@ void VCLXWindow::setPointer( const ::com::sun::star::uno::Reference< ::com::sun:
 
 void VCLXWindow::setBackground( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( GetWindow() )
     {
@@ -1235,7 +1232,7 @@ void VCLXWindow::setBackground( sal_Int32 nColor ) throw(::com::sun::star::uno::
 
 void VCLXWindow::invalidate( sal_Int16 nInvalidateFlags ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( GetWindow() )
         GetWindow()->Invalidate( (sal_uInt16) nInvalidateFlags );
@@ -1243,7 +1240,7 @@ void VCLXWindow::invalidate( sal_Int16 nInvalidateFlags ) throw(::com::sun::star
 
 void VCLXWindow::invalidateRect( const ::com::sun::star::awt::Rectangle& rRect, sal_Int16 nInvalidateFlags ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( GetWindow() )
         GetWindow()->Invalidate( VCLRectangle(rRect), (sal_uInt16) nInvalidateFlags );
@@ -1253,7 +1250,7 @@ void VCLXWindow::invalidateRect( const ::com::sun::star::awt::Rectangle& rRect,
 // ::com::sun::star::awt::XVclWindowPeer
 sal_Bool VCLXWindow::isChild( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& rxPeer ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     sal_Bool bIsChild = sal_False;
     Window* pWindow = GetWindow();
@@ -1268,20 +1265,20 @@ sal_Bool VCLXWindow::isChild( const ::com::sun::star::uno::Reference< ::com::sun
 
 void VCLXWindow::setDesignMode( sal_Bool bOn ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     mpImpl->mbDesignMode = bOn;
 }
 
 sal_Bool VCLXWindow::isDesignMode(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     return mpImpl->mbDesignMode;
 }
 
 void VCLXWindow::enableClipSiblings( sal_Bool bClip ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( GetWindow() )
         GetWindow()->EnableClipSiblings( bClip );
@@ -1289,7 +1286,7 @@ void VCLXWindow::enableClipSiblings( sal_Bool bClip ) throw(::com::sun::star::un
 
 void VCLXWindow::setForeground( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( GetWindow() )
     {
@@ -1300,7 +1297,7 @@ void VCLXWindow::setForeground( sal_Int32 nColor ) throw(::com::sun::star::uno::
 
 void VCLXWindow::setControlFont( const ::com::sun::star::awt::FontDescriptor& rFont ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( GetWindow() )
         GetWindow()->SetControlFont( VCLUnoHelper::CreateFont( rFont, GetWindow()->GetControlFont() ) );
@@ -1308,7 +1305,7 @@ void VCLXWindow::setControlFont( const ::com::sun::star::awt::FontDescriptor& rF
 
 void VCLXWindow::getStyles( sal_Int16 nType, ::com::sun::star::awt::FontDescriptor& Font, sal_Int32& ForegroundColor, sal_Int32& BackgroundColor ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( GetWindow() )
     {
@@ -1462,7 +1459,7 @@ namespace
 
 void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindow();
     if ( !pWindow )
@@ -1995,7 +1992,7 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com::
 
 ::com::sun::star::uno::Any VCLXWindow::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Any aProp;
     if ( GetWindow() )
@@ -2235,7 +2232,7 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com::
 // ::com::sun::star::awt::XLayoutConstrains
 ::com::sun::star::awt::Size VCLXWindow::getMinimumSize(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     // Diese Methode sollte nur fuer Componenten gerufen werden, die zwar
     // ueber das ::com::sun::star::awt::Toolkit erzeugt werden koennen, aber fuer die es
@@ -2279,7 +2276,7 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com::
 
 ::com::sun::star::awt::Size VCLXWindow::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::awt::Size aNewSize( rNewSize );
     ::com::sun::star::awt::Size aMinSize = getMinimumSize();
@@ -2296,7 +2293,7 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com::
 // ::com::sun::star::awt::XView
 sal_Bool VCLXWindow::setGraphics( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& rxDevice ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( VCLUnoHelper::GetOutputDevice( rxDevice ) )
         mpImpl->mxViewGraphics = rxDevice;
@@ -2308,14 +2305,14 @@ sal_Bool VCLXWindow::setGraphics( const ::com::sun::star::uno::Reference< ::com:
 
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > VCLXWindow::getGraphics(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     return mpImpl->mxViewGraphics;
 }
 
 ::com::sun::star::awt::Size VCLXWindow::getSize(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Size aSz;
     if ( GetWindow() )
@@ -2325,7 +2322,7 @@ sal_Bool VCLXWindow::setGraphics( const ::com::sun::star::uno::Reference< ::com:
 
 void VCLXWindow::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindow();
     if ( !pWindow )
@@ -2421,7 +2418,7 @@ void VCLXWindow::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno:
 
 void VCLXWindow::setZoom( float fZoomX, float /*fZoomY*/ ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( GetWindow() )
     {
@@ -2437,7 +2434,7 @@ void VCLXWindow::setZoom( float fZoomX, float /*fZoomY*/ ) throw(::com::sun::sta
 // ::com::sun::star::lang::XEventListener
 void SAL_CALL VCLXWindow::disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     // check if it comes from our AccessibleContext
     uno::Reference< uno::XInterface > aAC( mpImpl->mxAccessibleContext, uno::UNO_QUERY );
@@ -2454,7 +2451,7 @@ void SAL_CALL VCLXWindow::disposing( const ::com::sun::star::lang::EventObject&
 {
     using namespace ::com::sun::star;
 
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     // already disposed
     if( ! mpImpl )
@@ -2478,7 +2475,7 @@ void SAL_CALL VCLXWindow::disposing( const ::com::sun::star::lang::EventObject&
 // ::com::sun::star::awt::XDockable
 void SAL_CALL VCLXWindow::addDockableWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDockableWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( xListener.is() )
         mpImpl->getDockableWindowListeners().addInterface( xListener );
@@ -2487,14 +2484,14 @@ void SAL_CALL VCLXWindow::addDockableWindowListener( const ::com::sun::star::uno
 
 void SAL_CALL VCLXWindow::removeDockableWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDockableWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     mpImpl->getDockableWindowListeners().removeInterface( xListener );
 }
 
 void SAL_CALL VCLXWindow::enableDocking( sal_Bool bEnable ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindow();
     if ( pWindow )
@@ -2503,7 +2500,7 @@ void SAL_CALL VCLXWindow::enableDocking( sal_Bool bEnable ) throw (::com::sun::s
 
 sal_Bool SAL_CALL VCLXWindow::isFloating(  ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindow();
     if( pWindow )
@@ -2514,7 +2511,7 @@ sal_Bool SAL_CALL VCLXWindow::isFloating(  ) throw (::com::sun::star::uno::Runti
 
 void SAL_CALL VCLXWindow::setFloatingMode( sal_Bool bFloating ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindow();
     if( pWindow )
@@ -2523,7 +2520,7 @@ void SAL_CALL VCLXWindow::setFloatingMode( sal_Bool bFloating ) throw (::com::su
 
 sal_Bool SAL_CALL VCLXWindow::isLocked(  ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindow();
     if( pWindow )
@@ -2534,7 +2531,7 @@ sal_Bool SAL_CALL VCLXWindow::isLocked(  ) throw (::com::sun::star::uno::Runtime
 
 void SAL_CALL VCLXWindow::lock(  ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindow();
     if( pWindow && !Window::GetDockingManager()->IsFloating( pWindow ) )
@@ -2543,7 +2540,7 @@ void SAL_CALL VCLXWindow::lock(  ) throw (::com::sun::star::uno::RuntimeExceptio
 
 void SAL_CALL VCLXWindow::unlock(  ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindow();
     if( pWindow && !Window::GetDockingManager()->IsFloating( pWindow ) )
@@ -2552,14 +2549,14 @@ void SAL_CALL VCLXWindow::unlock(  ) throw (::com::sun::star::uno::RuntimeExcept
 void SAL_CALL VCLXWindow::startPopupMode( const ::com::sun::star::awt::Rectangle& ) throw (::com::sun::star::uno::RuntimeException)
 {
     // TODO: remove interface in the next incompatible build
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
 }
 
 sal_Bool SAL_CALL VCLXWindow::isInPopupMode(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     // TODO: remove interface in the next incompatible build
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     return FALSE;
 }
 
@@ -2568,7 +2565,7 @@ sal_Bool SAL_CALL VCLXWindow::isInPopupMode(  ) throw (::com::sun::star::uno::Ru
 
 void SAL_CALL VCLXWindow::setOutputSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     Window *pWindow;
     if( (pWindow = GetWindow()) != NULL )
     {
@@ -2582,7 +2579,7 @@ void SAL_CALL VCLXWindow::setOutputSize( const ::com::sun::star::awt::Size& aSiz
 
 ::com::sun::star::awt::Size SAL_CALL VCLXWindow::getOutputSize(  ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     Window *pWindow;
     if( (pWindow = GetWindow()) != NULL )
     {
@@ -2598,7 +2595,7 @@ void SAL_CALL VCLXWindow::setOutputSize( const ::com::sun::star::awt::Size& aSiz
 
 sal_Bool SAL_CALL VCLXWindow::isVisible(  ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     if( GetWindow() )
         return GetWindow()->IsVisible();
     else
@@ -2607,7 +2604,7 @@ sal_Bool SAL_CALL VCLXWindow::isVisible(  ) throw (::com::sun::star::uno::Runtim
 
 sal_Bool SAL_CALL VCLXWindow::isActive(  ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     if( GetWindow() )
         return GetWindow()->IsActive();
     else
@@ -2617,7 +2614,7 @@ sal_Bool SAL_CALL VCLXWindow::isActive(  ) throw (::com::sun::star::uno::Runtime
 
 sal_Bool SAL_CALL VCLXWindow::isEnabled(  ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     if( GetWindow() )
         return GetWindow()->IsEnabled();
     else
@@ -2626,7 +2623,7 @@ sal_Bool SAL_CALL VCLXWindow::isEnabled(  ) throw (::com::sun::star::uno::Runtim
 
 sal_Bool SAL_CALL VCLXWindow::hasFocus(  ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     if( GetWindow() )
         return GetWindow()->HasFocus();
     else
@@ -2638,7 +2635,7 @@ sal_Bool SAL_CALL VCLXWindow::hasFocus(  ) throw (::com::sun::star::uno::Runtime
 UnoPropertyArrayHelper *
 VCLXWindow::GetPropHelper()
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     if ( mpImpl->mpPropHelper == NULL )
     {
         std::list< sal_uInt16 > aIDs;
diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx
index f97f11f9320d..259b86368cc7 100644
--- a/toolkit/source/awt/vclxwindow1.cxx
+++ b/toolkit/source/awt/vclxwindow1.cxx
@@ -57,7 +57,7 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle )
     {
         ::com::sun::star::uno::Exception *pException =
             new ::com::sun::star::uno::RuntimeException;
-        pException->Message = ::rtl::OUString::createFromAscii( "not a work window" );
+        pException->Message = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not a work window"));
         throw pException;
     }
 
@@ -88,7 +88,7 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle )
     {
         ::com::sun::star::uno::Exception *pException =
             new ::com::sun::star::uno::RuntimeException;
-        pException->Message = ::rtl::OUString::createFromAscii( "incorrect window handle type" );
+        pException->Message = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("incorrect window handle type"));
         throw pException;
     }
     // create system parent data
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index d3fd77d602b5..620ee6bab0ee 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -223,7 +223,7 @@ void VCLXGraphicControl::ImplSetNewImage()
 
 void VCLXGraphicControl::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, short Flags ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( GetWindow() )
     {
@@ -236,7 +236,7 @@ void VCLXGraphicControl::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width,
 
 void VCLXGraphicControl::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Button* pButton = static_cast< Button* >( GetWindow() );
     if ( !pButton )
@@ -289,7 +289,7 @@ void VCLXGraphicControl::setProperty( const ::rtl::OUString& PropertyName, const
 
 ::com::sun::star::uno::Any VCLXGraphicControl::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Any aProp;
     if ( !GetWindow() )
@@ -389,7 +389,7 @@ VCLXButton::~VCLXButton()
 
 void VCLXButton::dispose() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::lang::EventObject aObj;
     aObj.Source = (::cppu::OWeakObject*)this;
@@ -400,31 +400,31 @@ void VCLXButton::dispose() throw(::com::sun::star::uno::RuntimeException)
 
 void VCLXButton::addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l  )throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maActionListeners.addInterface( l );
 }
 
 void VCLXButton::removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maActionListeners.removeInterface( l );
 }
 
 void VCLXButton::addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l  )throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maItemListeners.addInterface( l );
 }
 
 void VCLXButton::removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maItemListeners.removeInterface( l );
 }
 
 void VCLXButton::setLabel( const ::rtl::OUString& rLabel ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindow();
     if ( pWindow )
@@ -433,14 +433,14 @@ void VCLXButton::setLabel( const ::rtl::OUString& rLabel ) throw(::com::sun::sta
 
 void VCLXButton::setActionCommand( const ::rtl::OUString& rCommand ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     maActionCommand = rCommand;
 }
 
 ::com::sun::star::awt::Size VCLXButton::getMinimumSize(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Size aSz;
     PushButton* pButton = (PushButton*) GetWindow();
@@ -459,7 +459,7 @@ void VCLXButton::setActionCommand( const ::rtl::OUString& rCommand ) throw(::com
 
 ::com::sun::star::awt::Size VCLXButton::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Size aSz = VCLSize(rNewSize);
     PushButton* pButton = (PushButton*) GetWindow();
@@ -487,7 +487,7 @@ void VCLXButton::setActionCommand( const ::rtl::OUString& rCommand ) throw(::com
 
 void VCLXButton::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Button* pButton = (Button*)GetWindow();
     if ( pButton )
@@ -532,7 +532,7 @@ void VCLXButton::setProperty( const ::rtl::OUString& PropertyName, const ::com::
 
 ::com::sun::star::uno::Any VCLXButton::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Any aProp;
     Button* pButton = (Button*)GetWindow();
@@ -664,7 +664,7 @@ void VCLXImageControl::ImplSetNewImage()
 
 ::com::sun::star::awt::Size VCLXImageControl::getMinimumSize(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Size aSz = GetBitmap().GetSizePixel();
     aSz = ImplCalcWindowSize( aSz );
@@ -679,7 +679,7 @@ void VCLXImageControl::ImplSetNewImage()
 
 ::com::sun::star::awt::Size VCLXImageControl::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::awt::Size aSz = rNewSize;
     ::com::sun::star::awt::Size aMinSz = getMinimumSize();
@@ -692,7 +692,7 @@ void VCLXImageControl::ImplSetNewImage()
 
 void VCLXImageControl::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ImageControl* pImageControl = (ImageControl*)GetWindow();
 
@@ -728,7 +728,7 @@ void VCLXImageControl::setProperty( const ::rtl::OUString& PropertyName, const :
 
 ::com::sun::star::uno::Any VCLXImageControl::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Any aProp;
     ImageControl* pImageControl = (ImageControl*)GetWindow();
@@ -812,7 +812,7 @@ IMPL_XTYPEPROVIDER_END
 
 void VCLXCheckBox::dispose() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::lang::EventObject aObj;
     aObj.Source = (::cppu::OWeakObject*)this;
@@ -822,37 +822,37 @@ void VCLXCheckBox::dispose() throw(::com::sun::star::uno::RuntimeException)
 
 void VCLXCheckBox::addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maItemListeners.addInterface( l );
 }
 
 void VCLXCheckBox::removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maItemListeners.removeInterface( l );
 }
 
 void VCLXCheckBox::addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l  )throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maActionListeners.addInterface( l );
 }
 
 void VCLXCheckBox::removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maActionListeners.removeInterface( l );
 }
 
 void VCLXCheckBox::setActionCommand( const ::rtl::OUString& rCommand ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maActionCommand = rCommand;
 }
 
 void VCLXCheckBox::setLabel( const ::rtl::OUString& rLabel ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindow();
     if ( pWindow )
@@ -861,7 +861,7 @@ void VCLXCheckBox::setLabel( const ::rtl::OUString& rLabel ) throw(::com::sun::s
 
 void VCLXCheckBox::setState( short n ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     CheckBox* pCheckBox = (CheckBox*)GetWindow();
     if ( pCheckBox)
@@ -889,7 +889,7 @@ void VCLXCheckBox::setState( short n ) throw(::com::sun::star::uno::RuntimeExcep
 
 short VCLXCheckBox::getState() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     short nState = -1;
     CheckBox* pCheckBox = (CheckBox*)GetWindow();
@@ -909,7 +909,7 @@ short VCLXCheckBox::getState() throw(::com::sun::star::uno::RuntimeException)
 
 void VCLXCheckBox::enableTriState( sal_Bool b ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     CheckBox* pCheckBox = (CheckBox*)GetWindow();
     if ( pCheckBox)
@@ -918,7 +918,7 @@ void VCLXCheckBox::enableTriState( sal_Bool b ) throw(::com::sun::star::uno::Run
 
 ::com::sun::star::awt::Size VCLXCheckBox::getMinimumSize(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Size aSz;
     CheckBox* pCheckBox = (CheckBox*) GetWindow();
@@ -934,7 +934,7 @@ void VCLXCheckBox::enableTriState( sal_Bool b ) throw(::com::sun::star::uno::Run
 
 ::com::sun::star::awt::Size VCLXCheckBox::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Size aSz = VCLSize(rNewSize);
     CheckBox* pCheckBox = (CheckBox*) GetWindow();
@@ -951,7 +951,7 @@ void VCLXCheckBox::enableTriState( sal_Bool b ) throw(::com::sun::star::uno::Run
 
 void VCLXCheckBox::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     CheckBox* pCheckBox = (CheckBox*)GetWindow();
     if ( pCheckBox )
@@ -987,7 +987,7 @@ void VCLXCheckBox::setProperty( const ::rtl::OUString& PropertyName, const ::com
 
 ::com::sun::star::uno::Any VCLXCheckBox::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Any aProp;
     CheckBox* pCheckBox = (CheckBox*)GetWindow();
@@ -1114,7 +1114,7 @@ IMPL_XTYPEPROVIDER_END
 
 void VCLXRadioButton::dispose() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::lang::EventObject aObj;
     aObj.Source = (::cppu::OWeakObject*)this;
@@ -1124,7 +1124,7 @@ void VCLXRadioButton::dispose() throw(::com::sun::star::uno::RuntimeException)
 
 void VCLXRadioButton::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     RadioButton* pButton = (RadioButton*)GetWindow();
     if ( pButton )
@@ -1166,7 +1166,7 @@ void VCLXRadioButton::setProperty( const ::rtl::OUString& PropertyName, const ::
 
 ::com::sun::star::uno::Any VCLXRadioButton::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Any aProp;
     RadioButton* pButton = (RadioButton*)GetWindow();
@@ -1195,31 +1195,31 @@ void VCLXRadioButton::setProperty( const ::rtl::OUString& PropertyName, const ::
 
 void VCLXRadioButton::addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maItemListeners.addInterface( l );
 }
 
 void VCLXRadioButton::removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maItemListeners.removeInterface( l );
 }
 
 void VCLXRadioButton::addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l  )throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maActionListeners.addInterface( l );
 }
 
 void VCLXRadioButton::removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maActionListeners.removeInterface( l );
 }
 
 void VCLXRadioButton::setLabel( const ::rtl::OUString& rLabel ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindow();
     if ( pWindow )
@@ -1228,13 +1228,13 @@ void VCLXRadioButton::setLabel( const ::rtl::OUString& rLabel ) throw(::com::sun
 
 void VCLXRadioButton::setActionCommand( const ::rtl::OUString& rCommand ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maActionCommand = rCommand;
 }
 
 void VCLXRadioButton::setState( sal_Bool b ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     RadioButton* pRadioButton = (RadioButton*)GetWindow();
     if ( pRadioButton)
@@ -1253,7 +1253,7 @@ void VCLXRadioButton::setState( sal_Bool b ) throw(::com::sun::star::uno::Runtim
 
 sal_Bool VCLXRadioButton::getState() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     RadioButton* pRadioButton = (RadioButton*)GetWindow();
     return pRadioButton ? pRadioButton->IsChecked() : sal_False;
@@ -1261,7 +1261,7 @@ sal_Bool VCLXRadioButton::getState() throw(::com::sun::star::uno::RuntimeExcepti
 
 ::com::sun::star::awt::Size VCLXRadioButton::getMinimumSize(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Size aSz;
     RadioButton* pRadioButton = (RadioButton*) GetWindow();
@@ -1277,7 +1277,7 @@ sal_Bool VCLXRadioButton::getState() throw(::com::sun::star::uno::RuntimeExcepti
 
 ::com::sun::star::awt::Size VCLXRadioButton::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Size aSz = VCLSize(rNewSize);
     RadioButton* pRadioButton = (RadioButton*) GetWindow();
@@ -1376,19 +1376,19 @@ IMPL_XTYPEPROVIDER_END
 
 void VCLXSpinField::addSpinListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSpinListener > & l ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maSpinListeners.addInterface( l );
 }
 
 void VCLXSpinField::removeSpinListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSpinListener > & l ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maSpinListeners.removeInterface( l );
 }
 
 void VCLXSpinField::up() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     SpinField* pSpinField = (SpinField*) GetWindow();
     if ( pSpinField )
@@ -1397,7 +1397,7 @@ void VCLXSpinField::up() throw(::com::sun::star::uno::RuntimeException)
 
 void VCLXSpinField::down() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     SpinField* pSpinField = (SpinField*) GetWindow();
     if ( pSpinField )
@@ -1406,7 +1406,7 @@ void VCLXSpinField::down() throw(::com::sun::star::uno::RuntimeException)
 
 void VCLXSpinField::first() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     SpinField* pSpinField = (SpinField*) GetWindow();
     if ( pSpinField )
@@ -1415,7 +1415,7 @@ void VCLXSpinField::first() throw(::com::sun::star::uno::RuntimeException)
 
 void VCLXSpinField::last() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     SpinField* pSpinField = (SpinField*) GetWindow();
     if ( pSpinField )
@@ -1424,7 +1424,7 @@ void VCLXSpinField::last() throw(::com::sun::star::uno::RuntimeException)
 
 void VCLXSpinField::enableRepeat( sal_Bool bRepeat ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindow();
     if ( pWindow )
@@ -1523,7 +1523,7 @@ VCLXListBox::VCLXListBox()
 
 void VCLXListBox::dispose() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::lang::EventObject aObj;
     aObj.Source = (::cppu::OWeakObject*)this;
@@ -1534,31 +1534,31 @@ void VCLXListBox::dispose() throw(::com::sun::star::uno::RuntimeException)
 
 void VCLXListBox::addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maItemListeners.addInterface( l );
 }
 
 void VCLXListBox::removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maItemListeners.removeInterface( l );
 }
 
 void VCLXListBox::addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maActionListeners.addInterface( l );
 }
 
 void VCLXListBox::removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maActionListeners.removeInterface( l );
 }
 
 void VCLXListBox::addItem( const ::rtl::OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ListBox* pBox = (ListBox*) GetWindow();
     if ( pBox )
@@ -1567,7 +1567,7 @@ void VCLXListBox::addItem( const ::rtl::OUString& aItem, sal_Int16 nPos ) throw(
 
 void VCLXListBox::addItems( const ::com::sun::star::uno::Sequence< ::rtl::OUString>& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ListBox* pBox = (ListBox*) GetWindow();
     if ( pBox )
@@ -1591,7 +1591,7 @@ void VCLXListBox::addItems( const ::com::sun::star::uno::Sequence< ::rtl::OUStri
 
 void VCLXListBox::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ListBox* pBox = (ListBox*) GetWindow();
     if ( pBox )
@@ -1603,7 +1603,7 @@ void VCLXListBox::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::s
 
 sal_Int16 VCLXListBox::getItemCount() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ListBox* pBox = (ListBox*) GetWindow();
     return pBox ? pBox->GetEntryCount() : 0;
@@ -1611,7 +1611,7 @@ sal_Int16 VCLXListBox::getItemCount() throw(::com::sun::star::uno::RuntimeExcept
 
 ::rtl::OUString VCLXListBox::getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     String aItem;
     ListBox* pBox = (ListBox*) GetWindow();
@@ -1622,7 +1622,7 @@ sal_Int16 VCLXListBox::getItemCount() throw(::com::sun::star::uno::RuntimeExcept
 
 ::com::sun::star::uno::Sequence< ::rtl::OUString> VCLXListBox::getItems() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Sequence< ::rtl::OUString> aSeq;
     ListBox* pBox = (ListBox*) GetWindow();
@@ -1641,7 +1641,7 @@ sal_Int16 VCLXListBox::getItemCount() throw(::com::sun::star::uno::RuntimeExcept
 
 sal_Int16 VCLXListBox::getSelectedItemPos() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ListBox* pBox = (ListBox*) GetWindow();
     return pBox ? pBox->GetSelectEntryPos() : 0;
@@ -1649,7 +1649,7 @@ sal_Int16 VCLXListBox::getSelectedItemPos() throw(::com::sun::star::uno::Runtime
 
 ::com::sun::star::uno::Sequence<sal_Int16> VCLXListBox::getSelectedItemsPos() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Sequence<sal_Int16> aSeq;
     ListBox* pBox = (ListBox*) GetWindow();
@@ -1665,7 +1665,7 @@ sal_Int16 VCLXListBox::getSelectedItemPos() throw(::com::sun::star::uno::Runtime
 
 ::rtl::OUString VCLXListBox::getSelectedItem() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     String aItem;
     ListBox* pBox = (ListBox*) GetWindow();
@@ -1676,7 +1676,7 @@ sal_Int16 VCLXListBox::getSelectedItemPos() throw(::com::sun::star::uno::Runtime
 
 ::com::sun::star::uno::Sequence< ::rtl::OUString> VCLXListBox::getSelectedItems() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Sequence< ::rtl::OUString> aSeq;
     ListBox* pBox = (ListBox*) GetWindow();
@@ -1692,7 +1692,7 @@ sal_Int16 VCLXListBox::getSelectedItemPos() throw(::com::sun::star::uno::Runtime
 
 void VCLXListBox::selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ListBox* pBox = (ListBox*) GetWindow();
     if ( pBox && ( pBox->IsEntryPosSelected( nPos ) != bSelect ) )
@@ -1711,7 +1711,7 @@ void VCLXListBox::selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(::com:
 
 void VCLXListBox::selectItemsPos( const ::com::sun::star::uno::Sequence<sal_Int16>& aPositions, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ListBox* pBox = (ListBox*) GetWindow();
     if ( pBox )
@@ -1742,7 +1742,7 @@ void VCLXListBox::selectItemsPos( const ::com::sun::star::uno::Sequence<sal_Int1
 
 void VCLXListBox::selectItem( const ::rtl::OUString& rItemText, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ListBox* pBox = (ListBox*) GetWindow();
     if ( pBox )
@@ -1755,7 +1755,7 @@ void VCLXListBox::selectItem( const ::rtl::OUString& rItemText, sal_Bool bSelect
 
 void VCLXListBox::setDropDownLineCount( sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ListBox* pBox = (ListBox*) GetWindow();
     if ( pBox )
@@ -1764,7 +1764,7 @@ void VCLXListBox::setDropDownLineCount( sal_Int16 nLines ) throw(::com::sun::sta
 
 sal_Int16 VCLXListBox::getDropDownLineCount() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     sal_Int16 nLines = 0;
     ListBox* pBox = (ListBox*) GetWindow();
@@ -1775,7 +1775,7 @@ sal_Int16 VCLXListBox::getDropDownLineCount() throw(::com::sun::star::uno::Runti
 
 sal_Bool VCLXListBox::isMutipleMode() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     sal_Bool bMulti = sal_False;
     ListBox* pBox = (ListBox*) GetWindow();
@@ -1786,7 +1786,7 @@ sal_Bool VCLXListBox::isMutipleMode() throw(::com::sun::star::uno::RuntimeExcept
 
 void VCLXListBox::setMultipleMode( sal_Bool bMulti ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ListBox* pBox = (ListBox*) GetWindow();
     if ( pBox )
@@ -1795,7 +1795,7 @@ void VCLXListBox::setMultipleMode( sal_Bool bMulti ) throw(::com::sun::star::uno
 
 void VCLXListBox::makeVisible( sal_Int16 nEntry ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ListBox* pBox = (ListBox*) GetWindow();
     if ( pBox )
@@ -1854,14 +1854,14 @@ void VCLXListBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 
 ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXListBox::CreateAccessibleContext()
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     return getAccessibleFactory().createAccessibleContext( this );
 }
 
 void VCLXListBox::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ListBox* pListBox = (ListBox*)GetWindow();
     if ( pListBox )
@@ -1938,7 +1938,7 @@ void VCLXListBox::setProperty( const ::rtl::OUString& PropertyName, const ::com:
 
 ::com::sun::star::uno::Any VCLXListBox::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Any aProp;
     ListBox* pListBox = (ListBox*)GetWindow();
@@ -1992,7 +1992,7 @@ void VCLXListBox::setProperty( const ::rtl::OUString& PropertyName, const ::com:
 
 ::com::sun::star::awt::Size VCLXListBox::getMinimumSize(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Size aSz;
     ListBox* pListBox = (ListBox*) GetWindow();
@@ -2003,7 +2003,7 @@ void VCLXListBox::setProperty( const ::rtl::OUString& PropertyName, const ::com:
 
 ::com::sun::star::awt::Size VCLXListBox::getPreferredSize(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Size aSz;
     ListBox* pListBox = (ListBox*) GetWindow();
@@ -2018,7 +2018,7 @@ void VCLXListBox::setProperty( const ::rtl::OUString& PropertyName, const ::com:
 
 ::com::sun::star::awt::Size VCLXListBox::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Size aSz = VCLSize(rNewSize);
     ListBox* pListBox = (ListBox*) GetWindow();
@@ -2029,7 +2029,7 @@ void VCLXListBox::setProperty( const ::rtl::OUString& PropertyName, const ::com:
 
 ::com::sun::star::awt::Size VCLXListBox::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Size aSz;
     ListBox* pListBox = (ListBox*) GetWindow();
@@ -2040,7 +2040,7 @@ void VCLXListBox::setProperty( const ::rtl::OUString& PropertyName, const ::com:
 
 void VCLXListBox::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     nCols = nLines = 0;
     ListBox* pListBox = (ListBox*) GetWindow();
@@ -2098,7 +2098,7 @@ namespace
 
 void SAL_CALL VCLXListBox::listItemInserted( const ItemListEvent& i_rEvent ) throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ListBox* pListBox = dynamic_cast< ListBox* >( GetWindow() );
 
@@ -2113,7 +2113,7 @@ void SAL_CALL VCLXListBox::listItemInserted( const ItemListEvent& i_rEvent ) thr
 
 void SAL_CALL VCLXListBox::listItemRemoved( const ItemListEvent& i_rEvent ) throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ListBox* pListBox = dynamic_cast< ListBox* >( GetWindow() );
 
@@ -2126,7 +2126,7 @@ void SAL_CALL VCLXListBox::listItemRemoved( const ItemListEvent& i_rEvent ) thro
 
 void SAL_CALL VCLXListBox::listItemModified( const ItemListEvent& i_rEvent ) throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ListBox* pListBox = dynamic_cast< ListBox* >( GetWindow() );
 
@@ -2145,7 +2145,7 @@ void SAL_CALL VCLXListBox::listItemModified( const ItemListEvent& i_rEvent ) thr
 
 void SAL_CALL VCLXListBox::allItemsRemoved( const EventObject& i_rEvent ) throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ListBox* pListBox = dynamic_cast< ListBox* >( GetWindow() );
     ENSURE_OR_RETURN_VOID( pListBox, "VCLXListBox::listItemModified: no ListBox?!" );
@@ -2157,7 +2157,7 @@ void SAL_CALL VCLXListBox::allItemsRemoved( const EventObject& i_rEvent ) throw
 
 void SAL_CALL VCLXListBox::itemListChanged( const EventObject& i_rEvent ) throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ListBox* pListBox = dynamic_cast< ListBox* >( GetWindow() );
     ENSURE_OR_RETURN_VOID( pListBox, "VCLXListBox::listItemModified: no ListBox?!" );
@@ -2228,7 +2228,7 @@ IMPL_XTYPEPROVIDER_END
 
 void VCLXMessageBox::setCaptionText( const ::rtl::OUString& rText ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindow();
     if ( pWindow )
@@ -2237,7 +2237,7 @@ void VCLXMessageBox::setCaptionText( const ::rtl::OUString& rText ) throw(::com:
 
 ::rtl::OUString VCLXMessageBox::getCaptionText() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     String aText;
     Window* pWindow = GetWindow();
@@ -2248,7 +2248,7 @@ void VCLXMessageBox::setCaptionText( const ::rtl::OUString& rText ) throw(::com:
 
 void VCLXMessageBox::setMessageText( const ::rtl::OUString& rText ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     MessBox* pBox = (MessBox*)GetWindow();
     if ( pBox )
@@ -2257,7 +2257,7 @@ void VCLXMessageBox::setMessageText( const ::rtl::OUString& rText ) throw(::com:
 
 ::rtl::OUString VCLXMessageBox::getMessageText() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::rtl::OUString aText;
     MessBox* pBox = (MessBox*)GetWindow();
@@ -2268,7 +2268,7 @@ void VCLXMessageBox::setMessageText( const ::rtl::OUString& rText ) throw(::com:
 
 sal_Int16 VCLXMessageBox::execute() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     MessBox* pBox = (MessBox*)GetWindow();
     return pBox ? pBox->Execute() : 0;
@@ -2276,7 +2276,7 @@ sal_Int16 VCLXMessageBox::execute() throw(::com::sun::star::uno::RuntimeExceptio
 
 ::com::sun::star::awt::Size SAL_CALL VCLXMessageBox::getMinimumSize() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     return ::com::sun::star::awt::Size( 250, 100 );
 }
 
@@ -2290,6 +2290,7 @@ void VCLXDialog::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 
 VCLXDialog::VCLXDialog()
 {
+    OSL_TRACE("XDialog created");
 }
 
 VCLXDialog::~VCLXDialog()
@@ -2319,7 +2320,7 @@ IMPL_XTYPEPROVIDER_END
 
 void SAL_CALL VCLXDialog::endDialog( ::sal_Int32 i_result ) throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Dialog* pDialog = dynamic_cast< Dialog* >( GetWindow() );
     if ( pDialog )
@@ -2328,7 +2329,7 @@ void SAL_CALL VCLXDialog::endDialog( ::sal_Int32 i_result ) throw (RuntimeExcept
 
 void SAL_CALL VCLXDialog::setHelpId( ::sal_Int32 i_id ) throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindow();
     if ( pWindow )
@@ -2337,7 +2338,7 @@ void SAL_CALL VCLXDialog::setHelpId( ::sal_Int32 i_id ) throw (RuntimeException)
 
 void VCLXDialog::setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindow();
     if ( pWindow )
@@ -2346,7 +2347,7 @@ void VCLXDialog::setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star
 
 ::rtl::OUString VCLXDialog::getTitle() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::rtl::OUString aTitle;
     Window* pWindow = GetWindow();
@@ -2357,7 +2358,7 @@ void VCLXDialog::setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star
 
 sal_Int16 VCLXDialog::execute() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     sal_Int16 nRet = 0;
     if ( GetWindow() )
@@ -2394,7 +2395,7 @@ void VCLXDialog::endExecute() throw(::com::sun::star::uno::RuntimeException)
 
 void SAL_CALL VCLXDialog::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     Window* pWindow = GetWindow();
 
     if ( pWindow )
@@ -2414,7 +2415,7 @@ void SAL_CALL VCLXDialog::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::s
 {
     ::com::sun::star::awt::DeviceInfo aInfo = VCLXDevice::getInfo();
 
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     Dialog* pDlg = (Dialog*) GetWindow();
     if ( pDlg )
         pDlg->GetDrawWindowBorder( aInfo.LeftInset, aInfo.TopInset, aInfo.RightInset, aInfo.BottomInset );
@@ -2428,9 +2429,9 @@ void SAL_CALL VCLXDialog::setVbaMethodParameter(
     const ::com::sun::star::uno::Any& Value )
 throw(::com::sun::star::uno::RuntimeException)
 {
-    if (rtl::OUString::createFromAscii( "Cancel" ) == PropertyName)
+    if (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cancel")) == PropertyName)
     {
-        ::osl::SolarGuard aGuard( GetMutex() );
+        SolarMutexGuard aGuard;
         if ( GetWindow() )
         {
             sal_Int8 nCancel = 0;
@@ -2446,7 +2447,7 @@ throw(::com::sun::star::uno::RuntimeException)
     const ::rtl::OUString& /*PropertyName*/ )
 throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Any aRet;
     return aRet;
@@ -2457,7 +2458,7 @@ void SAL_CALL VCLXDialog::setProperty(
     const ::com::sun::star::uno::Any& Value )
 throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Dialog* pDialog = (Dialog*)GetWindow();
     if ( pDialog )
@@ -2498,6 +2499,292 @@ throw(::com::sun::star::uno::RuntimeException)
     }
 }
 
+
+//  ----------------------------------------------------
+//  class VCLXTabPage
+//  ----------------------------------------------------
+VCLXMultiPage::VCLXMultiPage() : maTabListeners( *this ), mTabId( 1 )
+{
+    OSL_TRACE("VCLXMultiPage::VCLXMultiPage()" );
+}
+
+void VCLXMultiPage::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
+{
+    PushPropertyIds( rIds,
+                     BASEPROPERTY_BACKGROUNDCOLOR,
+                     BASEPROPERTY_DEFAULTCONTROL,
+                     BASEPROPERTY_ENABLED,
+                     BASEPROPERTY_MULTIPAGEVALUE,
+                     BASEPROPERTY_ENABLEVISIBLE,
+                     BASEPROPERTY_FONTDESCRIPTOR,
+                     BASEPROPERTY_GRAPHIC,
+                     BASEPROPERTY_HELPTEXT,
+                     BASEPROPERTY_HELPURL,
+                     BASEPROPERTY_IMAGEALIGN,
+                     BASEPROPERTY_IMAGEPOSITION,
+                     BASEPROPERTY_IMAGEURL,
+                     BASEPROPERTY_PRINTABLE,
+                     BASEPROPERTY_TABSTOP,
+                     BASEPROPERTY_FOCUSONCLICK,
+                     0);
+    VCLXContainer::ImplGetPropertyIds( rIds );
+}
+
+VCLXMultiPage::~VCLXMultiPage()
+{
+}
+void SAL_CALL VCLXMultiPage::dispose() throw(::com::sun::star::uno::RuntimeException)
+{
+    SolarMutexGuard aGuard;
+
+    ::com::sun::star::lang::EventObject aObj;
+    aObj.Source = (::cppu::OWeakObject*)this;
+    maTabListeners.disposeAndClear( aObj );
+    VCLXContainer::dispose();
+}
+::com::sun::star::uno::Any SAL_CALL VCLXMultiPage::queryInterface(const ::com::sun::star::uno::Type & rType )
+throw(::com::sun::star::uno::RuntimeException)
+{
+    uno::Any aRet = ::cppu::queryInterface( rType, static_cast< awt::XSimpleTabController*>( this ) );
+
+    return ( aRet.hasValue() ? aRet : VCLXContainer::queryInterface( rType ) );
+}
+
+// ::com::sun::star::lang::XTypeProvider
+IMPL_XTYPEPROVIDER_START( VCLXMultiPage )
+    VCLXContainer::getTypes()
+IMPL_XTYPEPROVIDER_END
+
+// ::com::sun::star::awt::XView
+void SAL_CALL VCLXMultiPage::draw( sal_Int32 nX, sal_Int32 nY )
+throw(::com::sun::star::uno::RuntimeException)
+{
+    SolarMutexGuard aGuard;
+    Window* pWindow = GetWindow();
+
+    if ( pWindow )
+    {
+        OutputDevice* pDev = VCLUnoHelper::GetOutputDevice( getGraphics() );
+        if ( !pDev )
+            pDev = pWindow->GetParent();
+
+        Size aSize = pDev->PixelToLogic( pWindow->GetSizePixel() );
+        Point aPos = pDev->PixelToLogic( Point( nX, nY ) );
+
+        pWindow->Draw( pDev, aPos, aSize, WINDOW_DRAW_NOCONTROLS );
+    }
+}
+
+// ::com::sun::star::awt::XDevice,
+::com::sun::star::awt::DeviceInfo SAL_CALL VCLXMultiPage::getInfo()
+throw(::com::sun::star::uno::RuntimeException)
+{
+    ::com::sun::star::awt::DeviceInfo aInfo = VCLXDevice::getInfo();
+    return aInfo;
+}
+
+uno::Any SAL_CALL VCLXMultiPage::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
+{
+    SolarMutexGuard aGuard;
+    OSL_TRACE(" **** VCLXMultiPage::getProperty( %s )",
+        rtl::OUStringToOString( PropertyName,
+        RTL_TEXTENCODING_UTF8 ).getStr() );
+    ::com::sun::star::uno::Any aProp;
+    sal_uInt16 nPropType = GetPropertyId( PropertyName );
+    switch ( nPropType )
+    {
+
+        case BASEPROPERTY_MULTIPAGEVALUE:
+        {
+            aProp <<= getActiveTabID();
+        }
+        break;
+        default:
+            aProp <<= VCLXContainer::getProperty( PropertyName );
+    }
+    return aProp;
+}
+
+void SAL_CALL VCLXMultiPage::setProperty(
+    const ::rtl::OUString& PropertyName,
+    const ::com::sun::star::uno::Any& Value )
+throw(::com::sun::star::uno::RuntimeException)
+{
+    SolarMutexGuard aGuard;
+    OSL_TRACE(" **** VCLXMultiPage::setProperty( %s )", rtl::OUStringToOString( PropertyName, RTL_TEXTENCODING_UTF8 ).getStr() );
+
+    TabControl* pTabControl = (TabControl*)GetWindow();
+    if ( pTabControl )
+    {
+        sal_Bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
+
+        sal_uInt16 nPropType = GetPropertyId( PropertyName );
+        switch ( nPropType )
+        {
+            case BASEPROPERTY_MULTIPAGEVALUE:
+            {
+                OSL_TRACE("***MULTIPAGE VALUE");
+                sal_Int32 nId(0);
+                Value >>= nId;
+                // when the multipage is created we attempt to set the activepage
+                // but no pages created
+                if ( nId && nId <= getWindows().getLength() )
+                    activateTab( nId );
+            }
+            case BASEPROPERTY_GRAPHIC:
+            {
+                Reference< XGraphic > xGraphic;
+                if (( Value >>= xGraphic ) && xGraphic.is() )
+                {
+                    Image aImage( xGraphic );
+
+                    Wallpaper aWallpaper( aImage.GetBitmapEx());
+                    aWallpaper.SetStyle( WALLPAPER_SCALE );
+                    pTabControl->SetBackground( aWallpaper );
+                }
+                else if ( bVoid || !xGraphic.is() )
+                {
+                    Color aColor = pTabControl->GetControlBackground().GetColor();
+                    if ( aColor == COL_AUTO )
+                        aColor = pTabControl->GetSettings().GetStyleSettings().GetDialogColor();
+
+                    Wallpaper aWallpaper( aColor );
+                    pTabControl->SetBackground( aWallpaper );
+                }
+            }
+            break;
+
+            default:
+            {
+                VCLXContainer::setProperty( PropertyName, Value );
+            }
+        }
+    }
+}
+
+TabControl *VCLXMultiPage::getTabControl() const throw (uno::RuntimeException)
+{
+    TabControl *pTabControl = dynamic_cast< TabControl* >( GetWindow() );
+    if ( pTabControl )
+        return pTabControl;
+    throw uno::RuntimeException();
+}
+sal_Int32 SAL_CALL VCLXMultiPage::insertTab() throw (uno::RuntimeException)
+{
+    TabControl *pTabControl = getTabControl();
+    TabPage* pTab = new TabPage( pTabControl );
+    rtl::OUString title (RTL_CONSTASCII_USTRINGPARAM( "" ) );
+    return static_cast< sal_Int32 >( insertTab( pTab, title ) );
+}
+
+USHORT VCLXMultiPage::insertTab( TabPage* pPage, rtl::OUString& sTitle )
+{
+    TabControl *pTabControl = getTabControl();
+    USHORT id = sal::static_int_cast< USHORT >( mTabId++ );
+    pTabControl->InsertPage( id, sTitle.getStr(), TAB_APPEND );
+    pTabControl->SetTabPage( id, pPage );
+    return id;
+}
+
+void SAL_CALL VCLXMultiPage::removeTab( sal_Int32 ID ) throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
+{
+    TabControl *pTabControl = getTabControl();
+    if ( pTabControl->GetTabPage( sal::static_int_cast< USHORT >( ID ) ) == NULL )
+        throw lang::IndexOutOfBoundsException();
+    pTabControl->RemovePage( sal::static_int_cast< USHORT >( ID ) );
+}
+
+void SAL_CALL VCLXMultiPage::activateTab( sal_Int32 ID ) throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
+{
+    TabControl *pTabControl = getTabControl();
+    OSL_TRACE("Attempting to activate tab %d, active tab is %d, numtabs is %d", ID, getActiveTabID(), getWindows().getLength() );
+    if ( pTabControl->GetTabPage( sal::static_int_cast< USHORT >( ID ) ) == NULL )
+        throw lang::IndexOutOfBoundsException();
+    pTabControl->SelectTabPage( sal::static_int_cast< USHORT >( ID ) );
+}
+
+sal_Int32 SAL_CALL VCLXMultiPage::getActiveTabID() throw (uno::RuntimeException)
+{
+    return getTabControl()->GetCurPageId( );
+}
+
+void SAL_CALL VCLXMultiPage::addTabListener( const uno::Reference< awt::XTabListener >& xListener ) throw (uno::RuntimeException)
+{
+    SolarMutexGuard aGuard;
+    maTabListeners.addInterface( xListener );
+}
+
+void SAL_CALL VCLXMultiPage::removeTabListener( const uno::Reference< awt::XTabListener >& xListener ) throw (uno::RuntimeException)
+{
+    SolarMutexGuard aGuard;
+    maTabListeners.addInterface( xListener );
+}
+
+void SAL_CALL VCLXMultiPage::setTabProps( sal_Int32 ID, const uno::Sequence< beans::NamedValue >& Properties ) throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
+{
+    SolarMutexGuard aGuard;
+    TabControl *pTabControl = getTabControl();
+    if ( pTabControl->GetTabPage( sal::static_int_cast< USHORT >( ID ) ) == NULL )
+        throw lang::IndexOutOfBoundsException();
+
+    for ( int i = 0; i < Properties.getLength(); i++ )
+    {
+        const rtl::OUString &name = Properties[i].Name;
+        const uno::Any &value = Properties[i].Value;
+
+        if ( name  == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ) )
+        {
+            rtl::OUString title = value.get<rtl::OUString>();
+            pTabControl->SetPageText( sal::static_int_cast< USHORT >( ID ), title.getStr() );
+        }
+    }
+}
+
+uno::Sequence< beans::NamedValue > SAL_CALL VCLXMultiPage::getTabProps( sal_Int32 ID )
+    throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+{
+    SolarMutexGuard aGuard;
+    TabControl *pTabControl = getTabControl();
+    if ( pTabControl->GetTabPage( sal::static_int_cast< USHORT >( ID ) ) == NULL )
+        throw lang::IndexOutOfBoundsException();
+
+#define ADD_PROP( seq, i, name, val ) {                                \
+        beans::NamedValue value;                                                  \
+        value.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( name ) ); \
+        value.Value = uno::makeAny( val );                                      \
+        seq[i] = value;                                                    \
+    }
+
+    uno::Sequence< beans::NamedValue > props( 2 );
+    ADD_PROP( props, 0, "Title", rtl::OUString( pTabControl->GetPageText( sal::static_int_cast< USHORT >( ID ) ) ) );
+    ADD_PROP( props, 1, "Position", pTabControl->GetPagePos( sal::static_int_cast< USHORT >( ID ) ) );
+#undef ADD_PROP
+    return props;
+}
+void VCLXMultiPage::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
+{
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xKeepAlive( this );
+    switch ( rVclWindowEvent.GetId() )
+    {
+        case VCLEVENT_TABPAGE_DEACTIVATE:
+        {
+            ULONG nPageID = (ULONG)( rVclWindowEvent.GetData() );
+            maTabListeners.deactivated( nPageID );
+            break;
+
+        }
+        case VCLEVENT_TABPAGE_ACTIVATE:
+        {
+            ULONG nPageID = (ULONG)( rVclWindowEvent.GetData() );
+            maTabListeners.activated( nPageID );
+            break;
+        }
+        default:
+            VCLXContainer::ProcessWindowEvent( rVclWindowEvent );
+            break;
+    };
+}
+
 //  ----------------------------------------------------
 //  class VCLXTabPage
 //  ----------------------------------------------------
@@ -2505,6 +2792,27 @@ VCLXTabPage::VCLXTabPage()
 {
 }
 
+void VCLXTabPage::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
+{
+    PushPropertyIds( rIds,
+                     BASEPROPERTY_BACKGROUNDCOLOR,
+                     BASEPROPERTY_DEFAULTCONTROL,
+                     BASEPROPERTY_ENABLED,
+                     BASEPROPERTY_ENABLEVISIBLE,
+                     BASEPROPERTY_FONTDESCRIPTOR,
+                     BASEPROPERTY_GRAPHIC,
+                     BASEPROPERTY_HELPTEXT,
+                     BASEPROPERTY_HELPURL,
+                     BASEPROPERTY_IMAGEALIGN,
+                     BASEPROPERTY_IMAGEPOSITION,
+                     BASEPROPERTY_IMAGEURL,
+                     BASEPROPERTY_PRINTABLE,
+                     BASEPROPERTY_TABSTOP,
+                     BASEPROPERTY_FOCUSONCLICK,
+                     0);
+    VCLXContainer::ImplGetPropertyIds( rIds );
+}
+
 VCLXTabPage::~VCLXTabPage()
 {
 }
@@ -2524,7 +2832,7 @@ IMPL_XTYPEPROVIDER_END
 void SAL_CALL VCLXTabPage::draw( sal_Int32 nX, sal_Int32 nY )
 throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     Window* pWindow = GetWindow();
 
     if ( pWindow )
@@ -2553,7 +2861,7 @@ void SAL_CALL VCLXTabPage::setProperty(
     const ::com::sun::star::uno::Any& Value )
 throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     TabPage* pTabPage = (TabPage*)GetWindow();
     if ( pTabPage )
@@ -2594,9 +2902,18 @@ throw(::com::sun::star::uno::RuntimeException)
     }
 }
 
+TabPage *VCLXTabPage::getTabPage() const throw (uno::RuntimeException)
+{
+    TabPage *pTabPage = dynamic_cast< TabPage* >( GetWindow() );
+    if ( pTabPage )
+        return pTabPage;
+    throw uno::RuntimeException();
+}
+
 //  ----------------------------------------------------
 //  class VCLXFixedHyperlink
 //  ----------------------------------------------------
+
 VCLXFixedHyperlink::VCLXFixedHyperlink() :
 
     maActionListeners( *this )
@@ -2618,7 +2935,7 @@ VCLXFixedHyperlink::~VCLXFixedHyperlink()
 
 void VCLXFixedHyperlink::dispose() throw(::com::sun::star::uno::RuntimeException)
 {
-        ::osl::SolarGuard aGuard( GetMutex() );
+        SolarMutexGuard aGuard;
 
         ::com::sun::star::lang::EventObject aObj;
         aObj.Source = (::cppu::OWeakObject*)this;
@@ -2653,7 +2970,7 @@ void VCLXFixedHyperlink::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve
                     sURL = pBase->GetURL();
                 Reference< ::com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
                     ::comphelper::getProcessServiceFactory()->createInstance(
-                        ::rtl::OUString::createFromAscii( "com.sun.star.system.SystemShellExecute" )), uno::UNO_QUERY );
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SystemShellExecute"))), uno::UNO_QUERY );
                 if ( sURL.getLength() > 0 && xSystemShellExecute.is() )
                 {
                     try
@@ -2682,7 +2999,7 @@ void VCLXFixedHyperlink::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve
 
 void VCLXFixedHyperlink::setText( const ::rtl::OUString& Text ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::toolkit::FixedHyperlinkBase* pBase = (::toolkit::FixedHyperlinkBase*)GetWindow();
     if ( pBase )
@@ -2691,7 +3008,7 @@ void VCLXFixedHyperlink::setText( const ::rtl::OUString& Text ) throw(::com::sun
 
 ::rtl::OUString VCLXFixedHyperlink::getText() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::rtl::OUString aText;
     Window* pWindow = GetWindow();
@@ -2702,7 +3019,7 @@ void VCLXFixedHyperlink::setText( const ::rtl::OUString& Text ) throw(::com::sun
 
 void VCLXFixedHyperlink::setURL( const ::rtl::OUString& URL ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::toolkit::FixedHyperlinkBase* pBase = (::toolkit::FixedHyperlinkBase*)GetWindow();
     if ( pBase )
@@ -2711,7 +3028,7 @@ void VCLXFixedHyperlink::setURL( const ::rtl::OUString& URL ) throw(::com::sun::
 
 ::rtl::OUString VCLXFixedHyperlink::getURL(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::rtl::OUString aText;
     ::toolkit::FixedHyperlinkBase* pBase = (::toolkit::FixedHyperlinkBase*)GetWindow();
@@ -2722,7 +3039,7 @@ void VCLXFixedHyperlink::setURL( const ::rtl::OUString& URL ) throw(::com::sun::
 
 void VCLXFixedHyperlink::setAlignment( short nAlign ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindow();
     if ( pWindow )
@@ -2743,7 +3060,7 @@ void VCLXFixedHyperlink::setAlignment( short nAlign ) throw(::com::sun::star::un
 
 short VCLXFixedHyperlink::getAlignment() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     short nAlign = 0;
     Window* pWindow = GetWindow();
@@ -2762,19 +3079,19 @@ short VCLXFixedHyperlink::getAlignment() throw(::com::sun::star::uno::RuntimeExc
 
 void VCLXFixedHyperlink::addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l  )throw(::com::sun::star::uno::RuntimeException)
 {
-        ::osl::SolarGuard aGuard( GetMutex() );
+        SolarMutexGuard aGuard;
         maActionListeners.addInterface( l );
 }
 
 void VCLXFixedHyperlink::removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l ) throw(::com::sun::star::uno::RuntimeException)
 {
-        ::osl::SolarGuard aGuard( GetMutex() );
+        SolarMutexGuard aGuard;
         maActionListeners.removeInterface( l );
 }
 
 ::com::sun::star::awt::Size VCLXFixedHyperlink::getMinimumSize(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Size aSz;
     FixedText* pFixedText = (FixedText*)GetWindow();
@@ -2790,7 +3107,7 @@ void VCLXFixedHyperlink::removeActionListener( const ::com::sun::star::uno::Refe
 
 ::com::sun::star::awt::Size VCLXFixedHyperlink::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::awt::Size aSz = rNewSize;
     ::com::sun::star::awt::Size aMinSz = getMinimumSize();
@@ -2802,7 +3119,7 @@ void VCLXFixedHyperlink::removeActionListener( const ::com::sun::star::uno::Refe
 
 void VCLXFixedHyperlink::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::toolkit::FixedHyperlinkBase* pBase = (::toolkit::FixedHyperlinkBase*)GetWindow();
     if ( pBase )
@@ -2836,7 +3153,7 @@ void VCLXFixedHyperlink::setProperty( const ::rtl::OUString& PropertyName, const
 
 ::com::sun::star::uno::Any VCLXFixedHyperlink::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Any aProp;
     ::toolkit::FixedHyperlinkBase* pBase = (::toolkit::FixedHyperlinkBase*)GetWindow();
@@ -2944,7 +3261,7 @@ IMPL_XTYPEPROVIDER_END
 
 void VCLXFixedText::setText( const ::rtl::OUString& Text ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindow();
     if ( pWindow )
@@ -2953,7 +3270,7 @@ void VCLXFixedText::setText( const ::rtl::OUString& Text ) throw(::com::sun::sta
 
 ::rtl::OUString VCLXFixedText::getText() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::rtl::OUString aText;
     Window* pWindow = GetWindow();
@@ -2964,7 +3281,7 @@ void VCLXFixedText::setText( const ::rtl::OUString& Text ) throw(::com::sun::sta
 
 void VCLXFixedText::setAlignment( short nAlign ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindow();
     if ( pWindow )
@@ -2985,7 +3302,7 @@ void VCLXFixedText::setAlignment( short nAlign ) throw(::com::sun::star::uno::Ru
 
 short VCLXFixedText::getAlignment() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     short nAlign = 0;
     Window* pWindow = GetWindow();
@@ -3004,7 +3321,7 @@ short VCLXFixedText::getAlignment() throw(::com::sun::star::uno::RuntimeExceptio
 
 ::com::sun::star::awt::Size VCLXFixedText::getMinimumSize(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Size aSz;
     FixedText* pFixedText = (FixedText*)GetWindow();
@@ -3020,7 +3337,7 @@ short VCLXFixedText::getAlignment() throw(::com::sun::star::uno::RuntimeExceptio
 
 ::com::sun::star::awt::Size VCLXFixedText::calcAdjustedSize( const ::com::sun::star::awt::Size& rMaxSize ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Size aAdjustedSize( VCLUnoHelper::ConvertToVCLSize( rMaxSize ) );
     FixedText* pFixedText = (FixedText*)GetWindow();
@@ -3087,7 +3404,7 @@ IMPL_XTYPEPROVIDER_END
 // ::com::sun::star::lang::XComponent
 void VCLXScrollBar::dispose() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::lang::EventObject aObj;
     aObj.Source = (::cppu::OWeakObject*)this;
@@ -3098,19 +3415,19 @@ void VCLXScrollBar::dispose() throw(::com::sun::star::uno::RuntimeException)
 // ::com::sun::star::awt::XScrollbar
 void VCLXScrollBar::addAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener > & l ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maAdjustmentListeners.addInterface( l );
 }
 
 void VCLXScrollBar::removeAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener > & l ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maAdjustmentListeners.removeInterface( l );
 }
 
 void VCLXScrollBar::setValue( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ScrollBar* pScrollBar = (ScrollBar*) GetWindow();
     if ( pScrollBar )
@@ -3119,7 +3436,7 @@ void VCLXScrollBar::setValue( sal_Int32 n ) throw(::com::sun::star::uno::Runtime
 
 void VCLXScrollBar::setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ScrollBar* pScrollBar = (ScrollBar*) GetWindow();
     if ( pScrollBar )
@@ -3132,7 +3449,7 @@ void VCLXScrollBar::setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 n
 
 sal_Int32 VCLXScrollBar::getValue() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ScrollBar* pScrollBar = (ScrollBar*) GetWindow();
     return pScrollBar ? pScrollBar->GetThumbPos() : 0;
@@ -3140,7 +3457,7 @@ sal_Int32 VCLXScrollBar::getValue() throw(::com::sun::star::uno::RuntimeExceptio
 
 void VCLXScrollBar::setMaximum( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ScrollBar* pScrollBar = (ScrollBar*) GetWindow();
     if ( pScrollBar )
@@ -3149,7 +3466,7 @@ void VCLXScrollBar::setMaximum( sal_Int32 n ) throw(::com::sun::star::uno::Runti
 
 sal_Int32 VCLXScrollBar::getMaximum() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ScrollBar* pScrollBar = (ScrollBar*) GetWindow();
     return pScrollBar ? pScrollBar->GetRangeMax() : 0;
@@ -3157,7 +3474,7 @@ sal_Int32 VCLXScrollBar::getMaximum() throw(::com::sun::star::uno::RuntimeExcept
 
 void VCLXScrollBar::setMinimum( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ScrollBar* pScrollBar = static_cast< ScrollBar* >( GetWindow() );
     if ( pScrollBar )
@@ -3166,7 +3483,7 @@ void VCLXScrollBar::setMinimum( sal_Int32 n ) throw(::com::sun::star::uno::Runti
 
 sal_Int32 VCLXScrollBar::getMinimum() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ScrollBar* pScrollBar = static_cast< ScrollBar* >( GetWindow() );
     return pScrollBar ? pScrollBar->GetRangeMin() : 0;
@@ -3174,7 +3491,7 @@ sal_Int32 VCLXScrollBar::getMinimum() throw(::com::sun::star::uno::RuntimeExcept
 
 void VCLXScrollBar::setLineIncrement( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ScrollBar* pScrollBar = (ScrollBar*) GetWindow();
     if ( pScrollBar )
@@ -3183,7 +3500,7 @@ void VCLXScrollBar::setLineIncrement( sal_Int32 n ) throw(::com::sun::star::uno:
 
 sal_Int32 VCLXScrollBar::getLineIncrement() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ScrollBar* pScrollBar = (ScrollBar*) GetWindow();
     return pScrollBar ? pScrollBar->GetLineSize() : 0;
@@ -3191,7 +3508,7 @@ sal_Int32 VCLXScrollBar::getLineIncrement() throw(::com::sun::star::uno::Runtime
 
 void VCLXScrollBar::setBlockIncrement( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ScrollBar* pScrollBar = (ScrollBar*) GetWindow();
     if ( pScrollBar )
@@ -3200,7 +3517,7 @@ void VCLXScrollBar::setBlockIncrement( sal_Int32 n ) throw(::com::sun::star::uno
 
 sal_Int32 VCLXScrollBar::getBlockIncrement() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ScrollBar* pScrollBar = (ScrollBar*) GetWindow();
     return pScrollBar ? pScrollBar->GetPageSize() : 0;
@@ -3208,7 +3525,7 @@ sal_Int32 VCLXScrollBar::getBlockIncrement() throw(::com::sun::star::uno::Runtim
 
 void VCLXScrollBar::setVisibleSize( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ScrollBar* pScrollBar = (ScrollBar*) GetWindow();
     if ( pScrollBar )
@@ -3217,7 +3534,7 @@ void VCLXScrollBar::setVisibleSize( sal_Int32 n ) throw(::com::sun::star::uno::R
 
 sal_Int32 VCLXScrollBar::getVisibleSize() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ScrollBar* pScrollBar = (ScrollBar*) GetWindow();
     return pScrollBar ? pScrollBar->GetVisibleSize() : 0;
@@ -3225,7 +3542,7 @@ sal_Int32 VCLXScrollBar::getVisibleSize() throw(::com::sun::star::uno::RuntimeEx
 
 void VCLXScrollBar::setOrientation( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pWindow = GetWindow();
     if ( pWindow )
@@ -3244,7 +3561,7 @@ void VCLXScrollBar::setOrientation( sal_Int32 n ) throw(::com::sun::star::uno::R
 
 sal_Int32 VCLXScrollBar::getOrientation() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     sal_Int32 n = 0;
     Window* pWindow = GetWindow();
@@ -3263,7 +3580,7 @@ sal_Int32 VCLXScrollBar::getOrientation() throw(::com::sun::star::uno::RuntimeEx
 // ::com::sun::star::awt::VclWindowPeer
 void VCLXScrollBar::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ScrollBar* pScrollBar = (ScrollBar*)GetWindow();
     if ( pScrollBar )
@@ -3378,7 +3695,7 @@ void VCLXScrollBar::setProperty( const ::rtl::OUString& PropertyName, const ::co
 
 ::com::sun::star::uno::Any VCLXScrollBar::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Any aProp;
     ScrollBar* pScrollBar = (ScrollBar*)GetWindow();
@@ -3502,7 +3819,7 @@ void VCLXScrollBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 
 ::com::sun::star::awt::Size SAL_CALL VCLXScrollBar::getMinimumSize() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     return implGetMinimumSize( GetWindow() );
 }
 
@@ -3575,7 +3892,7 @@ IMPL_XTYPEPROVIDER_END
 
 void VCLXEdit::dispose() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::lang::EventObject aObj;
     aObj.Source = (::cppu::OWeakObject*)this;
@@ -3585,19 +3902,19 @@ void VCLXEdit::dispose() throw(::com::sun::star::uno::RuntimeException)
 
 void VCLXEdit::addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     GetTextListeners().addInterface( l );
 }
 
 void VCLXEdit::removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     GetTextListeners().removeInterface( l );
 }
 
 void VCLXEdit::setText( const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Edit* pEdit = (Edit*)GetWindow();
     if ( pEdit )
@@ -3614,7 +3931,7 @@ void VCLXEdit::setText( const ::rtl::OUString& aText ) throw(::com::sun::star::u
 
 void VCLXEdit::insertText( const ::com::sun::star::awt::Selection& rSel, const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Edit* pEdit = (Edit*)GetWindow();
     if ( pEdit )
@@ -3632,7 +3949,7 @@ void VCLXEdit::insertText( const ::com::sun::star::awt::Selection& rSel, const :
 
 ::rtl::OUString VCLXEdit::getText() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::rtl::OUString aText;
     Window* pWindow = GetWindow();
@@ -3643,7 +3960,7 @@ void VCLXEdit::insertText( const ::com::sun::star::awt::Selection& rSel, const :
 
 ::rtl::OUString VCLXEdit::getSelectedText() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::rtl::OUString aText;
     Edit* pEdit = (Edit*) GetWindow();
@@ -3655,7 +3972,7 @@ void VCLXEdit::insertText( const ::com::sun::star::awt::Selection& rSel, const :
 
 void VCLXEdit::setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Edit* pEdit = (Edit*) GetWindow();
     if ( pEdit )
@@ -3664,7 +3981,7 @@ void VCLXEdit::setSelection( const ::com::sun::star::awt::Selection& aSelection
 
 ::com::sun::star::awt::Selection VCLXEdit::getSelection() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Selection aSel;
     Edit* pEdit = (Edit*) GetWindow();
@@ -3675,7 +3992,7 @@ void VCLXEdit::setSelection( const ::com::sun::star::awt::Selection& aSelection
 
 sal_Bool VCLXEdit::isEditable() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Edit* pEdit = (Edit*) GetWindow();
     return ( pEdit && !pEdit->IsReadOnly() && pEdit->IsEnabled() ) ? sal_True : sal_False;
@@ -3683,7 +4000,7 @@ sal_Bool VCLXEdit::isEditable() throw(::com::sun::star::uno::RuntimeException)
 
 void VCLXEdit::setEditable( sal_Bool bEditable ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Edit* pEdit = (Edit*) GetWindow();
     if ( pEdit )
@@ -3693,7 +4010,7 @@ void VCLXEdit::setEditable( sal_Bool bEditable ) throw(::com::sun::star::uno::Ru
 
 void VCLXEdit::setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Edit* pEdit = (Edit*) GetWindow();
     if ( pEdit )
@@ -3702,7 +4019,7 @@ void VCLXEdit::setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::uno::Runt
 
 sal_Int16 VCLXEdit::getMaxTextLen() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Edit* pEdit = (Edit*) GetWindow();
     return pEdit ? pEdit->GetMaxTextLen() : 0;
@@ -3710,7 +4027,7 @@ sal_Int16 VCLXEdit::getMaxTextLen() throw(::com::sun::star::uno::RuntimeExceptio
 
 void VCLXEdit::setEchoChar( sal_Unicode cEcho ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Edit* pEdit = (Edit*) GetWindow();
     if ( pEdit )
@@ -3719,7 +4036,7 @@ void VCLXEdit::setEchoChar( sal_Unicode cEcho ) throw(::com::sun::star::uno::Run
 
 void VCLXEdit::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Edit* pEdit = (Edit*)GetWindow();
     if ( pEdit )
@@ -3764,7 +4081,7 @@ void VCLXEdit::setProperty( const ::rtl::OUString& PropertyName, const ::com::su
 
 ::com::sun::star::uno::Any VCLXEdit::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Any aProp;
     Edit* pEdit = (Edit*)GetWindow();
@@ -3796,7 +4113,7 @@ void VCLXEdit::setProperty( const ::rtl::OUString& PropertyName, const ::com::su
 
 ::com::sun::star::awt::Size VCLXEdit::getMinimumSize(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Size aSz;
     Edit* pEdit = (Edit*) GetWindow();
@@ -3807,7 +4124,7 @@ void VCLXEdit::setProperty( const ::rtl::OUString& PropertyName, const ::com::su
 
 ::com::sun::star::awt::Size VCLXEdit::getPreferredSize(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Size aSz;
     Edit* pEdit = (Edit*) GetWindow();
@@ -3821,7 +4138,7 @@ void VCLXEdit::setProperty( const ::rtl::OUString& PropertyName, const ::com::su
 
 ::com::sun::star::awt::Size VCLXEdit::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::awt::Size aSz = rNewSize;
     ::com::sun::star::awt::Size aMinSz = getMinimumSize();
@@ -3833,7 +4150,7 @@ void VCLXEdit::setProperty( const ::rtl::OUString& PropertyName, const ::com::su
 
 ::com::sun::star::awt::Size VCLXEdit::getMinimumSize( sal_Int16 nCols, sal_Int16 ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Size aSz;
     Edit* pEdit = (Edit*) GetWindow();
@@ -3849,7 +4166,7 @@ void VCLXEdit::setProperty( const ::rtl::OUString& PropertyName, const ::com::su
 
 void VCLXEdit::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     nLines = 1;
     nCols = 0;
@@ -3937,14 +4254,14 @@ VCLXComboBox::~VCLXComboBox()
 
 ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXComboBox::CreateAccessibleContext()
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     return getAccessibleFactory().createAccessibleContext( this );
 }
 
 void VCLXComboBox::dispose() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::lang::EventObject aObj;
     aObj.Source = (::cppu::OWeakObject*)this;
@@ -3956,31 +4273,31 @@ void VCLXComboBox::dispose() throw(::com::sun::star::uno::RuntimeException)
 
 void VCLXComboBox::addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maItemListeners.addInterface( l );
 }
 
 void VCLXComboBox::removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maItemListeners.removeInterface( l );
 }
 
 void VCLXComboBox::addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maActionListeners.addInterface( l );
 }
 
 void VCLXComboBox::removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     maActionListeners.removeInterface( l );
 }
 
 void VCLXComboBox::addItem( const ::rtl::OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ComboBox* pBox = (ComboBox*) GetWindow();
     if ( pBox )
@@ -3989,7 +4306,7 @@ void VCLXComboBox::addItem( const ::rtl::OUString& aItem, sal_Int16 nPos ) throw
 
 void VCLXComboBox::addItems( const ::com::sun::star::uno::Sequence< ::rtl::OUString>& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ComboBox* pBox = (ComboBox*) GetWindow();
     if ( pBox )
@@ -4010,7 +4327,7 @@ void VCLXComboBox::addItems( const ::com::sun::star::uno::Sequence< ::rtl::OUStr
 
 void VCLXComboBox::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ComboBox* pBox = (ComboBox*) GetWindow();
     if ( pBox )
@@ -4022,7 +4339,7 @@ void VCLXComboBox::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::
 
 sal_Int16 VCLXComboBox::getItemCount() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ComboBox* pBox = (ComboBox*) GetWindow();
     return pBox ? pBox->GetEntryCount() : 0;
@@ -4030,7 +4347,7 @@ sal_Int16 VCLXComboBox::getItemCount() throw(::com::sun::star::uno::RuntimeExcep
 
 ::rtl::OUString VCLXComboBox::getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::rtl::OUString aItem;
     ComboBox* pBox = (ComboBox*) GetWindow();
@@ -4041,7 +4358,7 @@ sal_Int16 VCLXComboBox::getItemCount() throw(::com::sun::star::uno::RuntimeExcep
 
 ::com::sun::star::uno::Sequence< ::rtl::OUString> VCLXComboBox::getItems() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Sequence< ::rtl::OUString> aSeq;
     ComboBox* pBox = (ComboBox*) GetWindow();
@@ -4060,7 +4377,7 @@ sal_Int16 VCLXComboBox::getItemCount() throw(::com::sun::star::uno::RuntimeExcep
 
 void VCLXComboBox::setDropDownLineCount( sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ComboBox* pBox = (ComboBox*) GetWindow();
     if ( pBox )
@@ -4069,7 +4386,7 @@ void VCLXComboBox::setDropDownLineCount( sal_Int16 nLines ) throw(::com::sun::st
 
 sal_Int16 VCLXComboBox::getDropDownLineCount() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     sal_Int16 nLines = 0;
     ComboBox* pBox = (ComboBox*) GetWindow();
@@ -4080,7 +4397,7 @@ sal_Int16 VCLXComboBox::getDropDownLineCount() throw(::com::sun::star::uno::Runt
 
 void VCLXComboBox::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ComboBox* pComboBox = (ComboBox*)GetWindow();
     if ( pComboBox )
@@ -4130,7 +4447,7 @@ void VCLXComboBox::setProperty( const ::rtl::OUString& PropertyName, const ::com
 
 ::com::sun::star::uno::Any VCLXComboBox::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Any aProp;
     ComboBox* pComboBox = (ComboBox*)GetWindow();
@@ -4218,7 +4535,7 @@ void VCLXComboBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 
 ::com::sun::star::awt::Size VCLXComboBox::getMinimumSize(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Size aSz;
     ComboBox* pComboBox = (ComboBox*) GetWindow();
@@ -4229,7 +4546,7 @@ void VCLXComboBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 
 ::com::sun::star::awt::Size VCLXComboBox::getPreferredSize(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Size aSz;
     ComboBox* pComboBox = (ComboBox*) GetWindow();
@@ -4244,7 +4561,7 @@ void VCLXComboBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 
 ::com::sun::star::awt::Size VCLXComboBox::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Size aSz = VCLSize(rNewSize);
     ComboBox* pComboBox = (ComboBox*) GetWindow();
@@ -4255,7 +4572,7 @@ void VCLXComboBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 
 ::com::sun::star::awt::Size VCLXComboBox::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     Size aSz;
     ComboBox* pComboBox = (ComboBox*) GetWindow();
@@ -4266,7 +4583,7 @@ void VCLXComboBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 
 void VCLXComboBox::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     nCols = nLines = 0;
     ComboBox* pComboBox = (ComboBox*) GetWindow();
@@ -4280,7 +4597,7 @@ void VCLXComboBox::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) thr
 }
 void SAL_CALL VCLXComboBox::listItemInserted( const ItemListEvent& i_rEvent ) throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ComboBox* pComboBox = dynamic_cast< ComboBox* >( GetWindow() );
 
@@ -4295,7 +4612,7 @@ void SAL_CALL VCLXComboBox::listItemInserted( const ItemListEvent& i_rEvent ) th
 
 void SAL_CALL VCLXComboBox::listItemRemoved( const ItemListEvent& i_rEvent ) throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ComboBox* pComboBox = dynamic_cast< ComboBox* >( GetWindow() );
 
@@ -4308,7 +4625,7 @@ void SAL_CALL VCLXComboBox::listItemRemoved( const ItemListEvent& i_rEvent ) thr
 
 void SAL_CALL VCLXComboBox::listItemModified( const ItemListEvent& i_rEvent ) throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ComboBox* pComboBox = dynamic_cast< ComboBox* >( GetWindow() );
 
@@ -4327,7 +4644,7 @@ void SAL_CALL VCLXComboBox::listItemModified( const ItemListEvent& i_rEvent ) th
 
 void SAL_CALL VCLXComboBox::allItemsRemoved( const EventObject& i_rEvent ) throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ComboBox* pComboBox = dynamic_cast< ComboBox* >( GetWindow() );
     ENSURE_OR_RETURN_VOID( pComboBox, "VCLXComboBox::listItemModified: no ComboBox?!" );
@@ -4339,7 +4656,7 @@ void SAL_CALL VCLXComboBox::allItemsRemoved( const EventObject& i_rEvent ) throw
 
 void SAL_CALL VCLXComboBox::itemListChanged( const EventObject& i_rEvent ) throw (RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ComboBox* pComboBox = dynamic_cast< ComboBox* >( GetWindow() );
     ENSURE_OR_RETURN_VOID( pComboBox, "VCLXComboBox::listItemModified: no ComboBox?!" );
@@ -4398,7 +4715,7 @@ VCLXFormattedSpinField::~VCLXFormattedSpinField()
 
 void VCLXFormattedSpinField::setStrictFormat( sal_Bool bStrict )
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormatterBase* pFormatter = GetFormatter();
     if ( pFormatter )
@@ -4414,7 +4731,7 @@ sal_Bool VCLXFormattedSpinField::isStrictFormat()
 
 void VCLXFormattedSpinField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     FormatterBase* pFormatter = GetFormatter();
     if ( pFormatter )
@@ -4453,7 +4770,7 @@ void VCLXFormattedSpinField::setProperty( const ::rtl::OUString& PropertyName, c
 
 ::com::sun::star::uno::Any VCLXFormattedSpinField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Any aProp;
     FormatterBase* pFormatter = GetFormatter();
@@ -4547,7 +4864,7 @@ IMPL_XTYPEPROVIDER_END
 
 void VCLXDateField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( GetWindow() )
     {
@@ -4616,7 +4933,7 @@ void VCLXDateField::setProperty( const ::rtl::OUString& PropertyName, const ::co
 
 ::com::sun::star::uno::Any VCLXDateField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Any aProp;
     FormatterBase* pFormatter = GetFormatter();
@@ -4662,7 +4979,7 @@ void VCLXDateField::setProperty( const ::rtl::OUString& PropertyName, const ::co
 
 void VCLXDateField::setDate( sal_Int32 nDate ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     DateField* pDateField = (DateField*) GetWindow();
     if ( pDateField )
@@ -4679,7 +4996,7 @@ void VCLXDateField::setDate( sal_Int32 nDate ) throw(::com::sun::star::uno::Runt
 
 sal_Int32 VCLXDateField::getDate() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     sal_Int32 nDate = 0;
     DateField* pDateField = (DateField*) GetWindow();
@@ -4691,7 +5008,7 @@ sal_Int32 VCLXDateField::getDate() throw(::com::sun::star::uno::RuntimeException
 
 void VCLXDateField::setMin( sal_Int32 nDate ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     DateField* pDateField = (DateField*) GetWindow();
     if ( pDateField )
@@ -4700,7 +5017,7 @@ void VCLXDateField::setMin( sal_Int32 nDate ) throw(::com::sun::star::uno::Runti
 
 sal_Int32 VCLXDateField::getMin() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     sal_Int32 nDate = 0;
     DateField* pDateField = (DateField*) GetWindow();
@@ -4712,7 +5029,7 @@ sal_Int32 VCLXDateField::getMin() throw(::com::sun::star::uno::RuntimeException)
 
 void VCLXDateField::setMax( sal_Int32 nDate ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     DateField* pDateField = (DateField*) GetWindow();
     if ( pDateField )
@@ -4721,7 +5038,7 @@ void VCLXDateField::setMax( sal_Int32 nDate ) throw(::com::sun::star::uno::Runti
 
 sal_Int32 VCLXDateField::getMax() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     sal_Int32 nDate = 0;
     DateField* pDateField = (DateField*) GetWindow();
@@ -4733,7 +5050,7 @@ sal_Int32 VCLXDateField::getMax() throw(::com::sun::star::uno::RuntimeException)
 
 void VCLXDateField::setFirst( sal_Int32 nDate ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     DateField* pDateField = (DateField*) GetWindow();
     if ( pDateField )
@@ -4742,7 +5059,7 @@ void VCLXDateField::setFirst( sal_Int32 nDate ) throw(::com::sun::star::uno::Run
 
 sal_Int32 VCLXDateField::getFirst() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     sal_Int32 nDate = 0;
     DateField* pDateField = (DateField*) GetWindow();
@@ -4754,7 +5071,7 @@ sal_Int32 VCLXDateField::getFirst() throw(::com::sun::star::uno::RuntimeExceptio
 
 void VCLXDateField::setLast( sal_Int32 nDate ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     DateField* pDateField = (DateField*) GetWindow();
     if ( pDateField )
@@ -4763,7 +5080,7 @@ void VCLXDateField::setLast( sal_Int32 nDate ) throw(::com::sun::star::uno::Runt
 
 sal_Int32 VCLXDateField::getLast() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     sal_Int32 nDate = 0;
     DateField* pDateField = (DateField*) GetWindow();
@@ -4775,7 +5092,7 @@ sal_Int32 VCLXDateField::getLast() throw(::com::sun::star::uno::RuntimeException
 
 void VCLXDateField::setLongFormat( sal_Bool bLong ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     DateField* pDateField = (DateField*) GetWindow();
     if ( pDateField )
@@ -4784,7 +5101,7 @@ void VCLXDateField::setLongFormat( sal_Bool bLong ) throw(::com::sun::star::uno:
 
 sal_Bool VCLXDateField::isLongFormat() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     DateField* pDateField = (DateField*) GetWindow();
     return pDateField ? pDateField->IsLongFormat() : sal_False;
@@ -4792,7 +5109,7 @@ sal_Bool VCLXDateField::isLongFormat() throw(::com::sun::star::uno::RuntimeExcep
 
 void VCLXDateField::setEmpty() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     DateField* pDateField = (DateField*) GetWindow();
     if ( pDateField )
@@ -4809,7 +5126,7 @@ void VCLXDateField::setEmpty() throw(::com::sun::star::uno::RuntimeException)
 
 sal_Bool VCLXDateField::isEmpty() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     DateField* pDateField = (DateField*) GetWindow();
     return pDateField ? pDateField->IsEmptyDate() : sal_False;
@@ -4889,7 +5206,7 @@ IMPL_XTYPEPROVIDER_END
 
 void VCLXTimeField::setTime( sal_Int32 nTime ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     TimeField* pTimeField = (TimeField*) GetWindow();
     if ( pTimeField )
@@ -4906,7 +5223,7 @@ void VCLXTimeField::setTime( sal_Int32 nTime ) throw(::com::sun::star::uno::Runt
 
 sal_Int32 VCLXTimeField::getTime() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     sal_Int32 nTime = 0;
     TimeField* pTimeField = (TimeField*) GetWindow();
@@ -4918,7 +5235,7 @@ sal_Int32 VCLXTimeField::getTime() throw(::com::sun::star::uno::RuntimeException
 
 void VCLXTimeField::setMin( sal_Int32 nTime ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     TimeField* pTimeField = (TimeField*) GetWindow();
     if ( pTimeField )
@@ -4927,7 +5244,7 @@ void VCLXTimeField::setMin( sal_Int32 nTime ) throw(::com::sun::star::uno::Runti
 
 sal_Int32 VCLXTimeField::getMin() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     sal_Int32 nTime = 0;
     TimeField* pTimeField = (TimeField*) GetWindow();
@@ -4939,7 +5256,7 @@ sal_Int32 VCLXTimeField::getMin() throw(::com::sun::star::uno::RuntimeException)
 
 void VCLXTimeField::setMax( sal_Int32 nTime ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     TimeField* pTimeField = (TimeField*) GetWindow();
     if ( pTimeField )
@@ -4948,7 +5265,7 @@ void VCLXTimeField::setMax( sal_Int32 nTime ) throw(::com::sun::star::uno::Runti
 
 sal_Int32 VCLXTimeField::getMax() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     sal_Int32 nTime = 0;
     TimeField* pTimeField = (TimeField*) GetWindow();
@@ -4960,7 +5277,7 @@ sal_Int32 VCLXTimeField::getMax() throw(::com::sun::star::uno::RuntimeException)
 
 void VCLXTimeField::setFirst( sal_Int32 nTime ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     TimeField* pTimeField = (TimeField*) GetWindow();
     if ( pTimeField )
@@ -4969,7 +5286,7 @@ void VCLXTimeField::setFirst( sal_Int32 nTime ) throw(::com::sun::star::uno::Run
 
 sal_Int32 VCLXTimeField::getFirst() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     sal_Int32 nTime = 0;
     TimeField* pTimeField = (TimeField*) GetWindow();
@@ -4981,7 +5298,7 @@ sal_Int32 VCLXTimeField::getFirst() throw(::com::sun::star::uno::RuntimeExceptio
 
 void VCLXTimeField::setLast( sal_Int32 nTime ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     TimeField* pTimeField = (TimeField*) GetWindow();
     if ( pTimeField )
@@ -4990,7 +5307,7 @@ void VCLXTimeField::setLast( sal_Int32 nTime ) throw(::com::sun::star::uno::Runt
 
 sal_Int32 VCLXTimeField::getLast() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     sal_Int32 nTime = 0;
     TimeField* pTimeField = (TimeField*) GetWindow();
@@ -5002,7 +5319,7 @@ sal_Int32 VCLXTimeField::getLast() throw(::com::sun::star::uno::RuntimeException
 
 void VCLXTimeField::setEmpty() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     TimeField* pTimeField = (TimeField*) GetWindow();
     if ( pTimeField )
@@ -5011,7 +5328,7 @@ void VCLXTimeField::setEmpty() throw(::com::sun::star::uno::RuntimeException)
 
 sal_Bool VCLXTimeField::isEmpty() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     TimeField* pTimeField = (TimeField*) GetWindow();
     return pTimeField ? pTimeField->IsEmptyTime() : sal_False;
@@ -5030,7 +5347,7 @@ sal_Bool VCLXTimeField::isStrictFormat() throw(::com::sun::star::uno::RuntimeExc
 
 void VCLXTimeField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( GetWindow() )
     {
@@ -5092,7 +5409,7 @@ void VCLXTimeField::setProperty( const ::rtl::OUString& PropertyName, const ::co
 
 ::com::sun::star::uno::Any VCLXTimeField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Any aProp;
     if ( GetWindow() )
@@ -5193,7 +5510,7 @@ IMPL_XTYPEPROVIDER_END
 
 void VCLXNumericField::setValue( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     NumericFormatter* pNumericFormatter = (NumericFormatter*) GetFormatter();
     if ( pNumericFormatter )
@@ -5217,7 +5534,7 @@ void VCLXNumericField::setValue( double Value ) throw(::com::sun::star::uno::Run
 
 double VCLXNumericField::getValue() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     NumericFormatter* pNumericFormatter = (NumericFormatter*) GetFormatter();
     return pNumericFormatter
@@ -5227,7 +5544,7 @@ double VCLXNumericField::getValue() throw(::com::sun::star::uno::RuntimeExceptio
 
 void VCLXNumericField::setMin( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     NumericFormatter* pNumericFormatter = (NumericFormatter*) GetFormatter();
     if ( pNumericFormatter )
@@ -5237,7 +5554,7 @@ void VCLXNumericField::setMin( double Value ) throw(::com::sun::star::uno::Runti
 
 double VCLXNumericField::getMin() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     NumericFormatter* pNumericFormatter = (NumericFormatter*) GetFormatter();
     return pNumericFormatter
@@ -5247,7 +5564,7 @@ double VCLXNumericField::getMin() throw(::com::sun::star::uno::RuntimeException)
 
 void VCLXNumericField::setMax( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     NumericFormatter* pNumericFormatter = (NumericFormatter*) GetFormatter();
     if ( pNumericFormatter )
@@ -5257,7 +5574,7 @@ void VCLXNumericField::setMax( double Value ) throw(::com::sun::star::uno::Runti
 
 double VCLXNumericField::getMax() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     NumericFormatter* pNumericFormatter = (NumericFormatter*) GetFormatter();
     return pNumericFormatter
@@ -5267,7 +5584,7 @@ double VCLXNumericField::getMax() throw(::com::sun::star::uno::RuntimeException)
 
 void VCLXNumericField::setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     NumericField* pNumericField = (NumericField*) GetWindow();
     if ( pNumericField )
@@ -5277,7 +5594,7 @@ void VCLXNumericField::setFirst( double Value ) throw(::com::sun::star::uno::Run
 
 double VCLXNumericField::getFirst() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     NumericField* pNumericField = (NumericField*) GetWindow();
     return pNumericField
@@ -5287,7 +5604,7 @@ double VCLXNumericField::getFirst() throw(::com::sun::star::uno::RuntimeExceptio
 
 void VCLXNumericField::setLast( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     NumericField* pNumericField = (NumericField*) GetWindow();
     if ( pNumericField )
@@ -5297,7 +5614,7 @@ void VCLXNumericField::setLast( double Value ) throw(::com::sun::star::uno::Runt
 
 double VCLXNumericField::getLast() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     NumericField* pNumericField = (NumericField*) GetWindow();
     return pNumericField
@@ -5318,7 +5635,7 @@ sal_Bool VCLXNumericField::isStrictFormat() throw(::com::sun::star::uno::Runtime
 
 void VCLXNumericField::setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     NumericField* pNumericField = (NumericField*) GetWindow();
     if ( pNumericField )
@@ -5328,7 +5645,7 @@ void VCLXNumericField::setSpinSize( double Value ) throw(::com::sun::star::uno::
 
 double VCLXNumericField::getSpinSize() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     NumericField* pNumericField = (NumericField*) GetWindow();
     return pNumericField
@@ -5338,7 +5655,7 @@ double VCLXNumericField::getSpinSize() throw(::com::sun::star::uno::RuntimeExcep
 
 void VCLXNumericField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     NumericFormatter* pNumericFormatter = (NumericFormatter*) GetFormatter();
     if ( pNumericFormatter )
@@ -5351,7 +5668,7 @@ void VCLXNumericField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::sta
 
 sal_Int16 VCLXNumericField::getDecimalDigits() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     NumericFormatter* pNumericFormatter = (NumericFormatter*) GetFormatter();
     return pNumericFormatter ? pNumericFormatter->GetDecimalDigits() : 0;
@@ -5359,7 +5676,7 @@ sal_Int16 VCLXNumericField::getDecimalDigits() throw(::com::sun::star::uno::Runt
 
 void VCLXNumericField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( GetWindow() )
     {
@@ -5428,7 +5745,7 @@ void VCLXNumericField::setProperty( const ::rtl::OUString& PropertyName, const :
 
 ::com::sun::star::uno::Any VCLXNumericField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Any aProp;
     FormatterBase* pFormatter = GetFormatter();
@@ -5553,12 +5870,12 @@ IMPL_XTYPEPROVIDER_END
 #define METRIC_MAP_PAIR(method,parent) \
     sal_Int64 VCLXMetricField::get##method( sal_Int16 nUnit ) throw (::com::sun::star::uno::RuntimeException) \
     { \
-        ::osl::SolarGuard aGuard( GetMutex() ); \
+        SolarMutexGuard aGuard; \
         return GetMetric##parent()->Get##method( MetricUnitUnoToVcl( nUnit ) ); \
     } \
     void VCLXMetricField::set##method( sal_Int64 nValue, sal_Int16 nUnit ) throw (::com::sun::star::uno::RuntimeException) \
     { \
-        ::osl::SolarGuard aGuard( GetMutex() ); \
+        SolarMutexGuard aGuard; \
         GetMetric##parent()->Set##method( nValue, MetricUnitUnoToVcl( nUnit ) ); \
     }
 
@@ -5571,13 +5888,13 @@ METRIC_MAP_PAIR(Last,  Field)
 
 ::sal_Int64 VCLXMetricField::getValue( ::sal_Int16 nUnit ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     return GetMetricFormatter()->GetValue( MetricUnitUnoToVcl( nUnit ) );
 }
 
 ::sal_Int64 VCLXMetricField::getCorrectedValue( ::sal_Int16 nUnit ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     return GetMetricFormatter()->GetCorrectedValue( MetricUnitUnoToVcl( nUnit ) );
 }
 
@@ -5597,14 +5914,14 @@ void VCLXMetricField::CallListeners()
 
 void VCLXMetricField::setValue( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     GetMetricFormatter()->SetValue( Value, MetricUnitUnoToVcl( Unit ) );
     CallListeners();
 }
 
 void VCLXMetricField::setUserValue( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     GetMetricFormatter()->SetUserValue( Value, MetricUnitUnoToVcl( Unit ) );
     CallListeners();
 }
@@ -5621,25 +5938,25 @@ sal_Bool VCLXMetricField::isStrictFormat() throw(::com::sun::star::uno::RuntimeE
 
 void VCLXMetricField::setSpinSize( sal_Int64 Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     GetMetricField()->SetSpinSize( Value );
 }
 
 sal_Int64 VCLXMetricField::getSpinSize() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     return GetMetricField()->GetSpinSize();
 }
 
 void VCLXMetricField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
     GetMetricFormatter()->SetDecimalDigits( Value );
 }
 
 sal_Int16 VCLXMetricField::getDecimalDigits() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     NumericFormatter* pNumericFormatter = (NumericFormatter*) GetFormatter();
     return pNumericFormatter ? pNumericFormatter->GetDecimalDigits() : 0;
@@ -5647,7 +5964,7 @@ sal_Int16 VCLXMetricField::getDecimalDigits() throw(::com::sun::star::uno::Runti
 
 void VCLXMetricField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( GetWindow() )
     {
@@ -5693,7 +6010,7 @@ void VCLXMetricField::setProperty( const ::rtl::OUString& PropertyName, const ::
 
 ::com::sun::star::uno::Any VCLXMetricField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Any aProp;
     FormatterBase* pFormatter = GetFormatter();
@@ -5788,7 +6105,7 @@ IMPL_XTYPEPROVIDER_END
 
 void VCLXCurrencyField::setValue( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     LongCurrencyFormatter* pCurrencyFormatter = (LongCurrencyFormatter*) GetFormatter();
     if ( pCurrencyFormatter )
@@ -5812,7 +6129,7 @@ void VCLXCurrencyField::setValue( double Value ) throw(::com::sun::star::uno::Ru
 
 double VCLXCurrencyField::getValue() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     LongCurrencyFormatter* pCurrencyFormatter = (LongCurrencyFormatter*) GetFormatter();
     return pCurrencyFormatter
@@ -5822,7 +6139,7 @@ double VCLXCurrencyField::getValue() throw(::com::sun::star::uno::RuntimeExcepti
 
 void VCLXCurrencyField::setMin( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     LongCurrencyFormatter* pCurrencyFormatter = (LongCurrencyFormatter*) GetFormatter();
     if ( pCurrencyFormatter )
@@ -5832,7 +6149,7 @@ void VCLXCurrencyField::setMin( double Value ) throw(::com::sun::star::uno::Runt
 
 double VCLXCurrencyField::getMin() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     LongCurrencyFormatter* pCurrencyFormatter = (LongCurrencyFormatter*) GetFormatter();
     return pCurrencyFormatter
@@ -5842,7 +6159,7 @@ double VCLXCurrencyField::getMin() throw(::com::sun::star::uno::RuntimeException
 
 void VCLXCurrencyField::setMax( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     LongCurrencyFormatter* pCurrencyFormatter = (LongCurrencyFormatter*) GetFormatter();
     if ( pCurrencyFormatter )
@@ -5852,7 +6169,7 @@ void VCLXCurrencyField::setMax( double Value ) throw(::com::sun::star::uno::Runt
 
 double VCLXCurrencyField::getMax() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     LongCurrencyFormatter* pCurrencyFormatter = (LongCurrencyFormatter*) GetFormatter();
     return pCurrencyFormatter
@@ -5862,7 +6179,7 @@ double VCLXCurrencyField::getMax() throw(::com::sun::star::uno::RuntimeException
 
 void VCLXCurrencyField::setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     LongCurrencyField* pCurrencyField = (LongCurrencyField*) GetWindow();
     if ( pCurrencyField )
@@ -5872,7 +6189,7 @@ void VCLXCurrencyField::setFirst( double Value ) throw(::com::sun::star::uno::Ru
 
 double VCLXCurrencyField::getFirst() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     LongCurrencyField* pCurrencyField = (LongCurrencyField*) GetWindow();
     return pCurrencyField
@@ -5882,7 +6199,7 @@ double VCLXCurrencyField::getFirst() throw(::com::sun::star::uno::RuntimeExcepti
 
 void VCLXCurrencyField::setLast( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     LongCurrencyField* pCurrencyField = (LongCurrencyField*) GetWindow();
     if ( pCurrencyField )
@@ -5892,7 +6209,7 @@ void VCLXCurrencyField::setLast( double Value ) throw(::com::sun::star::uno::Run
 
 double VCLXCurrencyField::getLast() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     LongCurrencyField* pCurrencyField = (LongCurrencyField*) GetWindow();
     return pCurrencyField
@@ -5902,7 +6219,7 @@ double VCLXCurrencyField::getLast() throw(::com::sun::star::uno::RuntimeExceptio
 
 void VCLXCurrencyField::setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     LongCurrencyField* pCurrencyField = (LongCurrencyField*) GetWindow();
     if ( pCurrencyField )
@@ -5912,7 +6229,7 @@ void VCLXCurrencyField::setSpinSize( double Value ) throw(::com::sun::star::uno:
 
 double VCLXCurrencyField::getSpinSize() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     LongCurrencyField* pCurrencyField = (LongCurrencyField*) GetWindow();
     return pCurrencyField
@@ -5933,7 +6250,7 @@ sal_Bool VCLXCurrencyField::isStrictFormat() throw(::com::sun::star::uno::Runtim
 
 void VCLXCurrencyField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     LongCurrencyFormatter* pCurrencyFormatter = (LongCurrencyFormatter*) GetFormatter();
     if ( pCurrencyFormatter )
@@ -5946,7 +6263,7 @@ void VCLXCurrencyField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::st
 
 sal_Int16 VCLXCurrencyField::getDecimalDigits() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     LongCurrencyFormatter* pCurrencyFormatter = (LongCurrencyFormatter*) GetFormatter();
     return pCurrencyFormatter ? pCurrencyFormatter->GetDecimalDigits() : 0;
@@ -5954,7 +6271,7 @@ sal_Int16 VCLXCurrencyField::getDecimalDigits() throw(::com::sun::star::uno::Run
 
 void VCLXCurrencyField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( GetWindow() )
     {
@@ -6030,7 +6347,7 @@ void VCLXCurrencyField::setProperty( const ::rtl::OUString& PropertyName, const
 
 ::com::sun::star::uno::Any VCLXCurrencyField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Any aProp;
     FormatterBase* pFormatter = GetFormatter();
@@ -6136,7 +6453,7 @@ IMPL_XTYPEPROVIDER_END
 
 void VCLXPatternField::setMasks( const ::rtl::OUString& EditMask, const ::rtl::OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     PatternField* pPatternField = (PatternField*) GetWindow();
     if ( pPatternField )
@@ -6147,7 +6464,7 @@ void VCLXPatternField::setMasks( const ::rtl::OUString& EditMask, const ::rtl::O
 
 void VCLXPatternField::getMasks( ::rtl::OUString& EditMask, ::rtl::OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     PatternField* pPatternField = (PatternField*) GetWindow();
     if ( pPatternField )
@@ -6159,7 +6476,7 @@ void VCLXPatternField::getMasks( ::rtl::OUString& EditMask, ::rtl::OUString& Lit
 
 void VCLXPatternField::setString( const ::rtl::OUString& Str ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     PatternField* pPatternField = (PatternField*) GetWindow();
     if ( pPatternField )
@@ -6170,7 +6487,7 @@ void VCLXPatternField::setString( const ::rtl::OUString& Str ) throw(::com::sun:
 
 ::rtl::OUString VCLXPatternField::getString() throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::rtl::OUString aString;
     PatternField* pPatternField = (PatternField*) GetWindow();
@@ -6191,7 +6508,7 @@ sal_Bool VCLXPatternField::isStrictFormat() throw(::com::sun::star::uno::Runtime
 
 void VCLXPatternField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( GetWindow() )
     {
@@ -6224,7 +6541,7 @@ void VCLXPatternField::setProperty( const ::rtl::OUString& PropertyName, const :
 
 ::com::sun::star::uno::Any VCLXPatternField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Any aProp;
     if ( GetWindow() )
@@ -6268,4 +6585,99 @@ VCLXToolBox::~VCLXToolBox()
     return getAccessibleFactory().createAccessibleContext( this );
 }
 
+//  ----------------------------------------------------
+//  class VCLXFrame
+//  ----------------------------------------------------
+VCLXFrame::VCLXFrame()
+{
+}
+
+void VCLXFrame::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
+{
+    PushPropertyIds( rIds,
+                     BASEPROPERTY_BACKGROUNDCOLOR,
+                     BASEPROPERTY_DEFAULTCONTROL,
+                     BASEPROPERTY_ENABLED,
+                     BASEPROPERTY_ENABLEVISIBLE,
+                     BASEPROPERTY_FONTDESCRIPTOR,
+                     BASEPROPERTY_GRAPHIC,
+                     BASEPROPERTY_HELPTEXT,
+                     BASEPROPERTY_HELPURL,
+                     BASEPROPERTY_PRINTABLE,
+                     BASEPROPERTY_LABEL,
+                     0);
+    VCLXContainer::ImplGetPropertyIds( rIds );
+}
+
+VCLXFrame::~VCLXFrame()
+{
+}
+
+::com::sun::star::uno::Any SAL_CALL VCLXFrame::queryInterface(const ::com::sun::star::uno::Type & rType )
+throw(::com::sun::star::uno::RuntimeException)
+{
+    return VCLXContainer::queryInterface( rType );
+}
+
+// ::com::sun::star::lang::XTypeProvider
+IMPL_XTYPEPROVIDER_START( VCLXFrame )
+    VCLXContainer::getTypes()
+IMPL_XTYPEPROVIDER_END
+
+// ::com::sun::star::awt::XView
+void SAL_CALL VCLXFrame::draw( sal_Int32 nX, sal_Int32 nY )
+throw(::com::sun::star::uno::RuntimeException)
+{
+    SolarMutexGuard aGuard;
+    Window* pWindow = GetWindow();
+
+    if ( pWindow )
+    {
+        OutputDevice* pDev = VCLUnoHelper::GetOutputDevice( getGraphics() );
+        if ( !pDev )
+            pDev = pWindow->GetParent();
+
+        Size aSize = pDev->PixelToLogic( pWindow->GetSizePixel() );
+        Point aPos = pDev->PixelToLogic( Point( nX, nY ) );
+
+        pWindow->Draw( pDev, aPos, aSize, WINDOW_DRAW_NOCONTROLS );
+    }
+}
+
+// ::com::sun::star::awt::XDevice,
+::com::sun::star::awt::DeviceInfo SAL_CALL VCLXFrame::getInfo()
+throw(::com::sun::star::uno::RuntimeException)
+{
+    ::com::sun::star::awt::DeviceInfo aInfo = VCLXDevice::getInfo();
+    return aInfo;
+}
+
+void SAL_CALL VCLXFrame::setProperty(
+    const ::rtl::OUString& PropertyName,
+    const ::com::sun::star::uno::Any& Value )
+throw(::com::sun::star::uno::RuntimeException)
+{
+    SolarMutexGuard aGuard;
+
+#if OSL_DEBUG_LEVEL > 0
+    sal_Bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID;
+    (void)bVoid;
+#endif
+
+    sal_uInt16 nPropType = GetPropertyId( PropertyName );
+    switch ( nPropType )
+    {
+        default:
+        {
+            VCLXContainer::setProperty( PropertyName, Value );
+        }
+    }
+}
+
+void VCLXFrame::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
+{
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xKeepAlive( this );
+    VCLXContainer::ProcessWindowEvent( rVclWindowEvent );
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/awt/xsimpleanimation.cxx b/toolkit/source/awt/xsimpleanimation.cxx
index 925fe57b3436..f11dd3f547a5 100644
--- a/toolkit/source/awt/xsimpleanimation.cxx
+++ b/toolkit/source/awt/xsimpleanimation.cxx
@@ -33,6 +33,8 @@
 #include "toolkit/helper/throbberimpl.hxx"
 #include <tools/debug.hxx>
 
+#include <vcl/svapp.hxx>
+
 //........................................................................
 namespace toolkit
 {
@@ -102,7 +104,7 @@ namespace toolkit
     void SAL_CALL XSimpleAnimation::setProperty( const ::rtl::OUString& PropertyName, const uno::Any& Value )
         throw( uno::RuntimeException )
     {
-        ::osl::SolarGuard aGuard( GetMutex() );
+        SolarMutexGuard aGuard;
 
         if ( GetWindow() )
         {
@@ -138,7 +140,7 @@ namespace toolkit
     uno::Any SAL_CALL XSimpleAnimation::getProperty( const ::rtl::OUString& PropertyName )
         throw( uno::RuntimeException )
     {
-        ::osl::SolarGuard aGuard( GetMutex() );
+        SolarMutexGuard aGuard;
 
         uno::Any aReturn;
 
diff --git a/toolkit/source/awt/xthrobber.cxx b/toolkit/source/awt/xthrobber.cxx
index 01527839d75f..5f015953132c 100644
--- a/toolkit/source/awt/xthrobber.cxx
+++ b/toolkit/source/awt/xthrobber.cxx
@@ -37,6 +37,7 @@
 #include <tools/debug.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/timer.hxx>
+#include <vcl/svapp.hxx>
 
 //........................................................................
 namespace toolkit
@@ -108,7 +109,7 @@ namespace toolkit
     void SAL_CALL XThrobber::setProperty( const ::rtl::OUString& PropertyName, const uno::Any& Value )
         throw( uno::RuntimeException )
     {
-        ::osl::SolarGuard aGuard( GetMutex() );
+        SolarMutexGuard aGuard;
 
         if ( GetWindow() )
         {
@@ -120,7 +121,7 @@ namespace toolkit
     uno::Any SAL_CALL XThrobber::getProperty( const ::rtl::OUString& PropertyName )
         throw( uno::RuntimeException )
     {
-        ::osl::SolarGuard aGuard( GetMutex() );
+        SolarMutexGuard aGuard;
 
         uno::Any aReturn;
 
@@ -135,13 +136,10 @@ namespace toolkit
     void SAL_CALL XThrobber::InitImageList()
         throw( uno::RuntimeException )
     {
-        ::osl::SolarGuard aGuard( GetMutex() );
+        SolarMutexGuard aGuard;
         uno::Sequence< uno::Reference< graphic::XGraphic > > aImageList(12);
         sal_uInt16 nIconIdStart = RID_TK_ICON_THROBBER_START;
 
-        if ( mpThrobber->isHCMode() )
-            nIconIdStart = RID_TK_HC_ICON_THROBBER_START;
-
         for ( sal_uInt16 i=0; i<12; i++ )
         {
             Image aImage = TK_RES_IMAGE( nIconIdStart + i );
diff --git a/toolkit/source/awt/xthrobber.hrc b/toolkit/source/awt/xthrobber.hrc
index 32c068ff8a85..8fd8e741fa40 100644
--- a/toolkit/source/awt/xthrobber.hrc
+++ b/toolkit/source/awt/xthrobber.hrc
@@ -28,12 +28,6 @@
 #ifndef _TOOLKIT_AWT_XTHROBBER_HRC_
 #define _TOOLKIT_AWT_XTHROBBER_HRC_
 
-
-//------------------------------------------------------------------------------
-
 #define RID_TK_ICON_THROBBER_START       1000
-#define RID_TK_HC_ICON_THROBBER_START    1020
-
-// -----------------------------------------------------------------------------
 
 #endif          // _TOOLKIT_AWT_XTHROBBER_HRC_
diff --git a/toolkit/source/awt/xthrobber.src b/toolkit/source/awt/xthrobber.src
index 199b25015056..90b8fdf1201c 100644
--- a/toolkit/source/awt/xthrobber.src
+++ b/toolkit/source/awt/xthrobber.src
@@ -102,76 +102,3 @@ Image RID_TK_ICON_THROBBER_START + 11
     ImageBitmap = Bitmap{ file = "spinner03-grey_12.png"; };
     STD_MASK_COLOR
 };
-
-Image RID_TK_HC_ICON_THROBBER_START
-{
-    ImageBitmap = Bitmap{ file = "spinner03-32-hc_01.png"; };
-    STD_MASK_COLOR
-};
-
-Image RID_TK_HC_ICON_THROBBER_START + 1
-{
-    ImageBitmap = Bitmap{ file = "spinner03-32-hc_02.png"; };
-    STD_MASK_COLOR
-};
-
-Image RID_TK_HC_ICON_THROBBER_START + 2
-{
-    ImageBitmap = Bitmap{ file = "spinner03-32-hc_03.png"; };
-    STD_MASK_COLOR
-};
-
-Image RID_TK_HC_ICON_THROBBER_START + 3
-{
-    ImageBitmap = Bitmap{ file = "spinner03-32-hc_04.png"; };
-    STD_MASK_COLOR
-};
-
-Image RID_TK_HC_ICON_THROBBER_START + 4
-{
-    ImageBitmap = Bitmap{ file = "spinner03-32-hc_05.png"; };
-    STD_MASK_COLOR
-};
-
-Image RID_TK_HC_ICON_THROBBER_START + 5
-{
-    ImageBitmap = Bitmap{ file = "spinner03-32-hc_06.png"; };
-    STD_MASK_COLOR
-};
-
-Image RID_TK_HC_ICON_THROBBER_START + 6
-{
-    ImageBitmap = Bitmap{ file = "spinner03-32-hc_07.png"; };
-    STD_MASK_COLOR
-};
-
-Image RID_TK_HC_ICON_THROBBER_START + 7
-{
-    ImageBitmap = Bitmap{ file = "spinner03-32-hc_08.png"; };
-    STD_MASK_COLOR
-};
-
-Image RID_TK_HC_ICON_THROBBER_START + 8
-{
-    ImageBitmap = Bitmap{ file = "spinner03-32-hc_09.png"; };
-    STD_MASK_COLOR
-};
-
-Image RID_TK_HC_ICON_THROBBER_START + 9
-{
-    ImageBitmap = Bitmap{ file = "spinner03-32-hc_10.png"; };
-    STD_MASK_COLOR
-};
-
-Image RID_TK_HC_ICON_THROBBER_START + 10
-{
-    ImageBitmap = Bitmap{ file = "spinner03-32-hc_11.png"; };
-    STD_MASK_COLOR
-};
-
-Image RID_TK_HC_ICON_THROBBER_START + 11
-{
-    ImageBitmap = Bitmap{ file = "spinner03-32-hc_12.png"; };
-    STD_MASK_COLOR
-};
-
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index b80222108594..167a88d3790b 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -68,10 +68,16 @@
 #include "grid/gridcontrol.hxx"
 
 #include <map>
+#include <hash_map>
 #include <algorithm>
 #include <functional>
 #include "tools/urlobj.hxx"
 #include "osl/file.hxx"
+#include <com/sun/star/awt/XSimpleTabController.hpp>
+#include <vcl/tabctrl.hxx>
+#include <vcl/tabpage.hxx>
+#include <vcl/button.hxx>
+#include <toolkit/awt/vclxwindows.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -236,14 +242,93 @@ static const ::rtl::OUString& getStepPropertyName( )
     return s_sStepProperty;
 }
 
+// we probably will need both a hash of control models and hash of controls
+// => use some template magic
+
+typedef ::cppu::WeakImplHelper1< container::XNameContainer > SimpleNameContainer_BASE;
+
+template< typename T >
+class SimpleNamedThingContainer : public SimpleNameContainer_BASE
+{
+    typedef std::hash_map< rtl::OUString, Reference< T >, ::rtl::OUStringHash,
+       ::std::equal_to< ::rtl::OUString > > NamedThingsHash;
+    NamedThingsHash things;
+    ::osl::Mutex m_aMutex;
+public:
+    // ::com::sun::star::container::XNameContainer, XNameReplace, XNameAccess
+    virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        if ( !hasByName( aName ) )
+            throw NoSuchElementException();
+        Reference< T > xElement;
+        if ( ! ( aElement >>= xElement ) )
+            throw IllegalArgumentException();
+        things[ aName ] = xElement;
+    }
+    virtual Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        if ( !hasByName( aName ) )
+            throw NoSuchElementException();
+        return uno::makeAny( things[ aName ] );
+    }
+    virtual Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw(RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        Sequence< ::rtl::OUString > aResult( things.size() );
+        typename NamedThingsHash::iterator it = things.begin();
+        typename NamedThingsHash::iterator it_end = things.end();
+        rtl::OUString* pName = aResult.getArray();
+        for (; it != it_end; ++it, ++pName )
+            *pName = it->first;
+        return aResult;
+    }
+    virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        return ( things.find( aName ) != things.end() );
+    }
+    virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        if ( hasByName( aName ) )
+            throw ElementExistException();
+        Reference< T > xElement;
+        if ( ! ( aElement >>= xElement ) )
+            throw IllegalArgumentException();
+        things[ aName ] = xElement;
+    }
+    virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        if ( !hasByName( aName ) )
+            throw NoSuchElementException();
+        things.erase( things.find( aName ) );
+    }
+    virtual Type SAL_CALL getElementType(  ) throw (RuntimeException)
+    {
+        return T::static_type( NULL );
+    }
+    virtual ::sal_Bool SAL_CALL hasElements(  ) throw (RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        return ( things.size() > 0 );
+    }
+};
+
+
 //  ----------------------------------------------------
 //  class UnoControlDialogModel
 //  ----------------------------------------------------
-UnoControlDialogModel::UnoControlDialogModel()
+UnoControlDialogModel::UnoControlDialogModel( bool regProps )
     :maContainerListeners( *this )
     ,maChangeListeners ( GetMutex() )
     ,mbGroupsUpToDate( sal_False ), mbAdjustingGraphic( false )
 {
+    if ( !regProps ) // Register properties elsewhere ( probably in class derived from this )
+        return;
+
     ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
 //  ImplRegisterProperty( BASEPROPERTY_BORDER );
     ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
@@ -264,6 +349,9 @@ UnoControlDialogModel::UnoControlDialogModel()
     aBool <<= (sal_Bool) sal_True;
     ImplRegisterProperty( BASEPROPERTY_MOVEABLE, aBool );
     ImplRegisterProperty( BASEPROPERTY_CLOSEABLE, aBool );
+    // #TODO separate class for 'UserForm' ( instead of re-using Dialog ? )
+    uno::Reference< XNameContainer > xNameCont = new SimpleNamedThingContainer< XControlModel >();
+    ImplRegisterProperty( BASEPROPERTY_USERFORMCONTAINEES, uno::makeAny( xNameCont ) );
 }
 
 UnoControlDialogModel::UnoControlDialogModel( const UnoControlDialogModel& rModel )
@@ -315,7 +403,7 @@ void SAL_CALL UnoControlDialogModel::setFastPropertyValue_NoBroadcast( sal_Int32
                 mbAdjustingGraphic = true;
                 ::rtl::OUString sImageURL;
                 OSL_VERIFY( rValue >>= sImageURL );
-                setPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHIC ), uno::makeAny( getGraphicFromURL_nothrow( mxGrfObj, sImageURL ) ) );
+                setPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHIC ), uno::makeAny( ImageHelper::getGraphicAndGraphicObjectFromURL_nothrow( mxGrfObj, sImageURL ) ) );
                 mbAdjustingGraphic = false;
             }
             break;
@@ -478,6 +566,10 @@ Reference< XInterface > UnoControlDialogModel::createInstance( const ::rtl::OUSt
         pNewModel = new OGeometryControlModel< UnoTreeModel >;
     else if ( aServiceSpecifier.compareToAscii( szServiceName_GridControlModel ) == 0 )
         pNewModel = new OGeometryControlModel< UnoGridModel >;
+    else if ( aServiceSpecifier.compareToAscii( szServiceName_UnoMultiPageModel ) == 0 )
+        pNewModel = new OGeometryControlModel< UnoMultiPageModel >;
+    else if ( aServiceSpecifier.compareToAscii( szServiceName_UnoFrameModel ) == 0 )
+        pNewModel = new OGeometryControlModel< UnoFrameModel >;
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoSimpleAnimationControlModel ) == 0 )
         pNewModel = new OGeometryControlModel< UnoSimpleAnimationControlModel >;
     else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoThrobberControlModel ) == 0 )
@@ -494,7 +586,7 @@ Reference< XInterface > UnoControlDialogModel::createInstance( const ::rtl::OUSt
             Reference< XAggregation > xAgg( xCloneAccess, UNO_QUERY );
             if ( xAgg.is() )
             {
-                if ( xSI->supportsService( ::rtl::OUString::createFromAscii( "com.sun.star.awt.UnoControlModel" ) ) )
+                if ( xSI->supportsService( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlModel")) ) )
                 {
                     // release 3 of the 4 references we have to the object
                     xAgg.clear();
@@ -521,7 +613,7 @@ Sequence< ::rtl::OUString > UnoControlDialogModel::getAvailableServiceNames() th
     static Sequence< ::rtl::OUString >* pNamesSeq = NULL;
     if ( !pNamesSeq )
     {
-        pNamesSeq = new Sequence< ::rtl::OUString >( 24 );
+        pNamesSeq = new Sequence< ::rtl::OUString >( 26 );
         ::rtl::OUString* pNames = pNamesSeq->getArray();
         pNames[0] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlEditModel );
         pNames[1] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlFormattedFieldModel );
@@ -547,6 +639,8 @@ Sequence< ::rtl::OUString > UnoControlDialogModel::getAvailableServiceNames() th
         pNames[21] = ::rtl::OUString::createFromAscii( szServiceName_GridControlModel );
         pNames[22] = ::rtl::OUString::createFromAscii( szServiceName2_UnoSimpleAnimationControlModel );
         pNames[23] = ::rtl::OUString::createFromAscii( szServiceName2_UnoThrobberControlModel );
+        pNames[24] = ::rtl::OUString::createFromAscii( szServiceName_UnoMultiPageModel );
+        pNames[25] = ::rtl::OUString::createFromAscii( szServiceName_UnoFrameModel );
     }
     return *pNamesSeq;
 }
@@ -569,6 +663,55 @@ Type UnoControlDialogModel::getElementType() throw(RuntimeException)
     return aType;
 }
 
+void UnoControlDialogModel::updateUserFormChildren( const Reference< XNameContainer >& xAllChildren, const rtl::OUString& aName, ChildOperation Operation, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xTarget ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException)
+{
+    if ( Operation < Insert || Operation > Remove )
+        throw IllegalArgumentException();
+
+    if ( xAllChildren.is() )
+    {
+        if ( Operation == Remove )
+        {
+            Reference< XControlModel > xOldModel( xAllChildren->getByName( aName ), UNO_QUERY );
+            xAllChildren->removeByName( aName );
+
+            Reference< XNameContainer > xChildContainer( xOldModel, UNO_QUERY );
+            if ( xChildContainer.is() )
+            {
+                Reference< XPropertySet > xProps( xChildContainer, UNO_QUERY );
+                // container control is being removed from this container, reset the
+                // global list of containees
+                if ( xProps.is() )
+                    xProps->setPropertyValue(  GetPropertyName( BASEPROPERTY_USERFORMCONTAINEES ), uno::makeAny( uno::Reference< XNameContainer >() ) );
+                Sequence< rtl::OUString > aChildNames = xChildContainer->getElementNames();
+                for ( sal_Int32 index=0; index< aChildNames.getLength(); ++index )
+                    updateUserFormChildren( xAllChildren, aChildNames[ index ], Operation,  Reference< XControlModel > () );
+            }
+        }
+        else if ( Operation == Insert )
+        {
+            xAllChildren->insertByName( aName, uno::makeAny( xTarget ) );
+            Reference< XNameContainer > xChildContainer( xTarget, UNO_QUERY );
+            if ( xChildContainer.is() )
+            {
+                // container control is being added from this container, reset the
+                // global list of containees to point to the correct global list
+                Reference< XPropertySet > xProps( xChildContainer, UNO_QUERY );
+                if ( xProps.is() )
+                    xProps->setPropertyValue(  GetPropertyName( BASEPROPERTY_USERFORMCONTAINEES ), uno::makeAny( xAllChildren ) );
+                Sequence< rtl::OUString > aChildNames = xChildContainer->getElementNames();
+                for ( sal_Int32 index=0; index< aChildNames.getLength(); ++index )
+                {
+                    Reference< XControlModel > xChildTarget( xChildContainer->getByName( aChildNames[ index ] ), UNO_QUERY );
+                    updateUserFormChildren( xAllChildren, aChildNames[ index ], Operation, xChildTarget );
+                }
+            }
+        }
+    }
+    else
+        throw IllegalArgumentException();
+}
+
 sal_Bool UnoControlDialogModel::hasElements() throw(RuntimeException)
 {
     return !maModels.empty();
@@ -587,7 +730,20 @@ void UnoControlDialogModel::replaceByName( const ::rtl::OUString& aName, const A
     UnoControlModelHolderList::iterator aElementPos = ImplFindElement( aName );
     if ( maModels.end() == aElementPos )
         lcl_throwNoSuchElementException();
-
+    // Dialog behaviour is to have all containee names unique ( MSO Userform is the same )
+    // With container controls you could have constructed an existing hierachy and are now
+    // add this to an existing container, in this case a name nested in the containment
+    // hierachy of the added control could contain a name clash, if we have access to the
+    // list of global names then recursively check for previously existing names ( we need
+    // to do this obviously before the 'this' objects container is updated
+    Reference< XNameContainer > xAllChildren( getPropertyValue( GetPropertyName( BASEPROPERTY_USERFORMCONTAINEES ) ), UNO_QUERY );
+    if ( xAllChildren.is() )
+    {
+        // remove old control ( and children ) from global list of containees
+        updateUserFormChildren( xAllChildren, aName, Remove, uno::Reference< XControlModel >() );
+        // Add new control ( and containees if they exist )
+        updateUserFormChildren( xAllChildren, aName, Insert, xNewModel );
+    }
     // stop listening at the old model
     stopControlListening( aElementPos->first );
     Reference< XControlModel > xReplaced( aElementPos->first );
@@ -655,7 +811,13 @@ void UnoControlDialogModel::insertByName( const ::rtl::OUString& aName, const An
                 {
                     Any aUrl = xProps.get()->getPropertyValue(  sImageSourceProperty );
 
-                    ::rtl::OUString absoluteUrl =
+                    ::rtl::OUString absoluteUrl;
+                    aUrl >>= absoluteUrl;
+                    if ( absoluteUrl.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) == 0 )
+                        xProps.get()->setPropertyValue(  sImageSourceProperty , aUrl );
+                    // Now we inherit from this class, no all containers have
+                    // DialogSourceURL
+                    else if ( getPropertySetInfo()->hasPropertyByName( GetPropertyName( BASEPROPERTY_DIALOGSOURCEURL ) ) )
                         getPhysicalLocation( getPropertyValue( GetPropertyName( BASEPROPERTY_DIALOGSOURCEURL ) ), aUrl );
 
                     aUrl <<= absoluteUrl;
@@ -674,7 +836,19 @@ void UnoControlDialogModel::insertByName( const ::rtl::OUString& aName, const An
     if ( maModels.end() != aElementPos )
         lcl_throwElementExistException();
 
+    // Dialog behaviour is to have all containee names unique ( MSO Userform is the same )
+    // With container controls you could have constructed an existing hierachy and are now
+    // add this to an existing container, in this case a name nested in the containment
+    // hierachy of the added control could contain a name clash, if we have access to the
+    // list of global names then we need to recursively check for previously existing
+    // names ( we need to do this obviously before the 'this' objects container is updated
+    // remove old control ( and children ) from global list of containees
+    Reference< XNameContainer > xAllChildren( getPropertyValue( GetPropertyName( BASEPROPERTY_USERFORMCONTAINEES ) ), UNO_QUERY );
+
+    if ( xAllChildren.is() )
+        updateUserFormChildren( xAllChildren, aName, Insert, xM );
     maModels.push_back( UnoControlModelHolder( xM, aName ) );
+
     mbGroupsUpToDate = sal_False;
     startControlListening( xM );
 
@@ -696,6 +870,15 @@ void UnoControlDialogModel::removeByName( const ::rtl::OUString& aName ) throw(N
     if ( maModels.end() == aElementPos )
         lcl_throwNoSuchElementException();
 
+    // Dialog behaviour is to have all containee names unique ( MSO Userform is the same )
+    // With container controls you could have constructed an existing hierachy and are now
+    // removing this control from an existing container, in this case all nested names in
+    // the containment hierachy of the control to be removed need to be removed from the global
+    // names cache ( we need to do this obviously before the 'this' objects container is updated )
+    Reference< XNameContainer > xAllChildren( getPropertyValue( GetPropertyName( BASEPROPERTY_USERFORMCONTAINEES ) ), UNO_QUERY );
+    if ( xAllChildren.is() )
+        updateUserFormChildren( xAllChildren, aName, Remove, uno::Reference< XControlModel >() );
+
     ContainerEvent aEvent;
     aEvent.Source = *this;
     aEvent.Element <<= aElementPos->first;
@@ -1044,8 +1227,8 @@ void UnoControlDialogModel::implUpdateGroupStructure()
 #if OSL_DEBUG_LEVEL > 1
                 Reference< XPropertySet > xModelProps( *pControlModels, UNO_QUERY );
                 ::rtl::OUString sLabel;
-                if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( ::rtl::OUString::createFromAscii( "Label" ) ) )
-                    xModelProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Label" ) ) >>= sLabel;
+                if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")) ) )
+                    xModelProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")) ) >>= sLabel;
                 aCurrentGroupLabels.push_back( sLabel );
 #endif
             }
@@ -1068,8 +1251,8 @@ void UnoControlDialogModel::implUpdateGroupStructure()
 #if OSL_DEBUG_LEVEL > 1
                 Reference< XPropertySet > xModelProps( *pControlModels, UNO_QUERY );
                 ::rtl::OUString sLabel;
-                if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( ::rtl::OUString::createFromAscii( "Label" ) ) )
-                    xModelProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Label" ) ) >>= sLabel;
+                if ( xModelProps.is() && xModelProps->getPropertySetInfo().is() && xModelProps->getPropertySetInfo()->hasPropertyByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")) ) )
+                    xModelProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")) ) >>= sLabel;
                 aCurrentGroupLabels.push_back( sLabel );
 #endif
             }
@@ -1385,9 +1568,9 @@ UnoDialogControl::UnoDialogControl() :
     sal_Bool bDecoration( sal_True );
     ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_DECORATION )) >>= bDecoration;
     if ( bDecoration )
-        return ::rtl::OUString::createFromAscii( "Dialog" );
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Dialog"));
     else
-        return ::rtl::OUString::createFromAscii( "TabPage" );
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TabPage"));
 }
 
 // XInterface
@@ -1690,13 +1873,13 @@ void UnoDialogControl::PrepareWindowDescriptor( ::com::sun::star::awt::WindowDes
     if (( ImplGetPropertyValue( PROPERTY_IMAGEURL ) >>= aImageURL ) &&
         ( aImageURL.getLength() > 0 ))
     {
-        aImageURL =
-            getPhysicalLocation( ImplGetPropertyValue( PROPERTY_DIALOGSOURCEURL ),
+        rtl::OUString absoluteUrl( aImageURL );
+        if ( aImageURL.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) != 0 )
+            absoluteUrl =
+                getPhysicalLocation( ImplGetPropertyValue( PROPERTY_DIALOGSOURCEURL ),
                                  ImplGetPropertyValue( PROPERTY_IMAGEURL ));
-
+        ImplSetPropertyValue( PROPERTY_IMAGEURL, uno::makeAny( absoluteUrl ), sal_True );
     }
-    if ( aImageURL.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) != 0 )
-        ImplSetPropertyValue( PROPERTY_IMAGEURL, uno::makeAny( aImageURL ), sal_True );
 }
 
 void UnoDialogControl::elementInserted( const ContainerEvent& Event ) throw(RuntimeException)
@@ -1928,16 +2111,19 @@ void UnoDialogControl::ImplModelPropertiesChanged( const Sequence< PropertyChang
         if ( bOwnModel && rEvt.PropertyName.equalsAsciiL( "ImageURL", 8 ))
         {
             ::rtl::OUString aImageURL;
+            ::rtl::OUString absoluteUrl( aImageURL );
+            // Ignore GraphicObject urls
             if (( ImplGetPropertyValue( PROPERTY_IMAGEURL ) >>= aImageURL ) &&
                 ( aImageURL.getLength() > 0 ))
             {
-                aImageURL =
-                    getPhysicalLocation( ImplGetPropertyValue( PROPERTY_DIALOGSOURCEURL ),
+                absoluteUrl = aImageURL;
+                if ( aImageURL.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) != 0 )
+                    absoluteUrl =
+                        getPhysicalLocation( ImplGetPropertyValue( PROPERTY_DIALOGSOURCEURL ),
                                          ImplGetPropertyValue( PROPERTY_IMAGEURL ));
 
+                ImplSetPropertyValue( PROPERTY_IMAGEURL, uno::makeAny( absoluteUrl ), sal_True );
             }
-
-            ImplSetPropertyValue( PROPERTY_IMAGEURL, uno::makeAny( aImageURL ), sal_True );
             break;
         }
     }
@@ -2089,10 +2275,10 @@ void UnoDialogControl::addingControl( const Reference< XControl >& _rxControl )
         {
             Sequence< ::rtl::OUString > aNames( 4 );
             ::rtl::OUString* pNames = aNames.getArray();
-            *pNames++ = ::rtl::OUString::createFromAscii( "PositionX" );
-            *pNames++ = ::rtl::OUString::createFromAscii( "PositionY" );
-            *pNames++ = ::rtl::OUString::createFromAscii( "Width" );
-            *pNames++ = ::rtl::OUString::createFromAscii( "Height" );
+            *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionX"));
+            *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionY"));
+            *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Width"));
+            *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Height"));
 
             xProps->addPropertiesChangeListener( aNames, this );
         }
@@ -2174,4 +2360,925 @@ throw (RuntimeException)
     return absoluteURL;
 }
 
+UnoParentControl::UnoParentControl() :
+    mbSizeModified(false),
+    mbPosModified(false)
+{
+    maComponentInfos.nWidth = 280;
+    maComponentInfos.nHeight = 400;
+    // #TODO Do we need the ResourceListener foo ?
+}
+
+UnoParentControl::~UnoParentControl()
+{
+}
+
+// XInterface
+Any UnoParentControl::queryAggregation( const Type & rType ) throw(RuntimeException)
+{
+    Any aRet( UnoParentControl_IBase::queryInterface( rType ) );
+    return (aRet.hasValue() ? aRet : UnoControlContainer::queryAggregation( rType ));
+}
+
+// XTypeProvider
+IMPL_IMPLEMENTATION_ID( UnoParentControl )
+Sequence< Type >
+UnoParentControl::getTypes() throw(RuntimeException)
+{
+    return ::comphelper::concatSequences(
+        UnoParentControl_IBase::getTypes(),
+        UnoControlContainer::getTypes()
+    );
+}
+
+void UnoParentControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer ) throw(RuntimeException)
+{
+    SolarMutexGuard aSolarGuard;
+    UnoControlContainer::createPeer( rxToolkit, rParentPeer );
+}
+
+void UnoParentControl::ImplInsertControl( Reference< XControlModel >& rxModel, const ::rtl::OUString& rName )
+{
+    Reference< XPropertySet > xP( rxModel, UNO_QUERY );
+
+    ::rtl::OUString aDefCtrl;
+    xP->getPropertyValue( GetPropertyName( BASEPROPERTY_DEFAULTCONTROL ) ) >>= aDefCtrl;
+    Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
+    Reference < XControl > xCtrl( xMSF->createInstance( aDefCtrl ), UNO_QUERY );
+
+    DBG_ASSERT( xCtrl.is(), "UnoDialogControl::ImplInsertControl: could not create the control!" );
+    if ( xCtrl.is() )
+    {
+        xCtrl->setModel( rxModel );
+        addControl( rName, xCtrl );
+            // will implicitly call addingControl, where we can add the PropertiesChangeListener to the model
+            // (which we formerly did herein)
+            // 08.01.2001 - 96008 - fs@openoffice.org
+
+        ImplSetPosSize( xCtrl );
+    }
+}
+
+void UnoParentControl::ImplRemoveControl( Reference< XControlModel >& rxModel )
+{
+    Sequence< Reference< XControl > > aControls = getControls();
+    Reference< XControl > xCtrl = StdTabController::FindControl( aControls, rxModel );
+    if ( xCtrl.is() )
+        removeControl( xCtrl );
+}
+
+void UnoParentControl::ImplSetPosSize( Reference< XControl >& rxCtrl )
+{
+    Reference< XPropertySet > xP( rxCtrl->getModel(), UNO_QUERY );
+
+    sal_Int32 nX = 0, nY = 0, nWidth = 0, nHeight = 0;
+    xP->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PositionX" ) ) ) >>= nX;
+    xP->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PositionY" ) ) ) >>= nY;
+    xP->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Width" ) ) ) >>= nWidth;
+    xP->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Height" ) ) ) >>= nHeight;
+    MapMode aMode( MAP_APPFONT );
+    OutputDevice*pOutDev = Application::GetDefaultDevice();
+    if ( pOutDev )
+    {
+        ::Size aTmp( nX, nY );
+        aTmp = pOutDev->LogicToPixel( aTmp, aMode );
+        nX = aTmp.Width();
+        nY = aTmp.Height();
+        aTmp = ::Size( nWidth, nHeight );
+        aTmp = pOutDev->LogicToPixel( aTmp, aMode );
+        nWidth = aTmp.Width();
+        nHeight = aTmp.Height();
+    }
+    else
+    {
+        Reference< XWindowPeer > xPeer = ImplGetCompatiblePeer( sal_True );
+        Reference< XDevice > xD( xPeer, UNO_QUERY );
+
+        SimpleFontMetric aFM;
+        FontDescriptor aFD;
+        Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_FONTDESCRIPTOR ) );
+        aVal >>= aFD;
+        if ( aFD.StyleName.getLength() )
+        {
+            Reference< XFont > xFont = xD->getFont( aFD );
+            aFM = xFont->getFontMetric();
+        }
+        else
+        {
+            Reference< XGraphics > xG = xD->createGraphics();
+            aFM = xG->getFontMetric();
+        }
+
+        sal_Int16 nH = aFM.Ascent + aFM.Descent;
+        sal_Int16 nW = nH/2;    // calculate avarage width?!
+
+        nX *= nW;
+        nX /= 4;
+        nWidth *= nW;
+        nWidth /= 4;
+        nY *= nH;
+        nY /= 8;
+        nHeight *= nH;
+        nHeight /= 8;
+    }
+    Reference < XWindow > xW( rxCtrl, UNO_QUERY );
+    xW->setPosSize( nX, nY, nWidth, nHeight, PosSize::POSSIZE );
+}
+
+void UnoParentControl::dispose() throw(RuntimeException)
+{
+    UnoControlContainer::dispose();
+}
+
+void SAL_CALL UnoParentControl::disposing(
+    const EventObject& Source )
+throw(RuntimeException)
+{
+    UnoControlContainer::disposing( Source );
+}
+
+sal_Bool UnoParentControl::setModel( const Reference< XControlModel >& rxModel ) throw(RuntimeException)
+{
+    SolarMutexGuard aSolarGuard;
+
+    // destroy the old tab controller, if existent
+    if ( mxTabController.is() )
+    {
+        mxTabController->setModel( NULL );                  // just to be sure, should not be necessary
+        removeTabController( mxTabController );
+        ::comphelper::disposeComponent( mxTabController );  // just to be sure, should not be necessary
+        mxTabController.clear();
+    }
+
+    if ( getModel().is() )
+    {
+        Sequence< Reference< XControl > > aControls = getControls();
+        const Reference< XControl >* pCtrls = aControls.getConstArray();
+        const Reference< XControl >* pCtrlsEnd = pCtrls + aControls.getLength();
+
+        for ( ; pCtrls < pCtrlsEnd; ++pCtrls )
+            removeControl( *pCtrls );
+                // will implicitly call removingControl, which will remove the PropertyChangeListener
+                // (which we formerly did herein)
+                // 08.01.2001 - 96008 - fs@openoffice.org
+
+        Reference< XContainer > xC( getModel(), UNO_QUERY );
+        if ( xC.is() )
+            xC->removeContainerListener( this );
+
+        Reference< XChangesNotifier > xChangeNotifier( getModel(), UNO_QUERY );
+        if ( xChangeNotifier.is() )
+            xChangeNotifier->removeChangesListener( this );
+    }
+
+    sal_Bool bRet = UnoControl::setModel( rxModel );
+
+    if ( getModel().is() )
+    {
+        Reference< XNameAccess > xNA( getModel(), UNO_QUERY );
+        if ( xNA.is() )
+        {
+            Sequence< ::rtl::OUString > aNames = xNA->getElementNames();
+            const ::rtl::OUString* pNames = aNames.getConstArray();
+            sal_uInt32 nCtrls = aNames.getLength();
+
+            Reference< XControlModel > xCtrlModel;
+            for( sal_uInt32 n = 0; n < nCtrls; ++n, ++pNames )
+            {
+                xNA->getByName( *pNames ) >>= xCtrlModel;
+                ImplInsertControl( xCtrlModel, *pNames );
+            }
+        }
+
+        Reference< XContainer > xC( getModel(), UNO_QUERY );
+        if ( xC.is() )
+            xC->addContainerListener( this );
+
+        Reference< XChangesNotifier > xChangeNotifier( getModel(), UNO_QUERY );
+        if ( xChangeNotifier.is() )
+            xChangeNotifier->addChangesListener( this );
+    }
+
+    Reference< XTabControllerModel > xTabbing( getModel(), UNO_QUERY );
+    if ( xTabbing.is() )
+    {
+        mxTabController = new StdTabController;
+        mxTabController->setModel( xTabbing );
+        addTabController( mxTabController );
+    }
+//    ImplStartListingForResourceEvents();
+
+    return bRet;
+}
+void UnoParentControl::setDesignMode( sal_Bool bOn ) throw(RuntimeException)
+{
+    SolarMutexGuard aSolarGuard;
+
+    UnoControl::setDesignMode( bOn );
+
+    Sequence< Reference< XControl > > xCtrls = getControls();
+    sal_Int32 nControls = xCtrls.getLength();
+    Reference< XControl >* pControls = xCtrls.getArray();
+    for ( sal_Int32 n = 0; n < nControls; n++ )
+        pControls[n]->setDesignMode( bOn );
+
+    // #109067# in design mode the tab controller is not notified about
+    // tab index changes, therefore the tab order must be activated
+    // when switching from design mode to live mode
+    if ( mxTabController.is() && !bOn )
+        mxTabController->activateTabOrder();
+}
+
+void UnoParentControl::elementInserted( const ContainerEvent& Event ) throw(RuntimeException)
+{
+    SolarMutexGuard aSolarGuard;
+    Reference< XControlModel > xModel;
+    ::rtl::OUString aName;
+
+    Event.Accessor >>= aName;
+    Event.Element >>= xModel;
+    ImplInsertControl( xModel, aName );
+}
+
+void UnoParentControl::elementRemoved( const ContainerEvent& Event ) throw(RuntimeException)
+{
+    SolarMutexGuard aSolarGuard;
+
+    Reference< XControlModel > xModel;
+    Event.Element >>= xModel;
+    if ( xModel.is() )
+        ImplRemoveControl( xModel );
+}
+
+void UnoParentControl::elementReplaced( const ContainerEvent& Event ) throw(RuntimeException)
+{
+    SolarMutexGuard aSolarGuard;
+
+    Reference< XControlModel > xModel;
+    Event.ReplacedElement >>= xModel;
+    if ( xModel.is() )
+        ImplRemoveControl( xModel );
+
+    ::rtl::OUString aName;
+    Event.Accessor >>= aName;
+    Event.Element >>= xModel;
+    ImplInsertControl( xModel, aName );
+}
+
+// XPropertiesChangeListener
+void UnoParentControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent >& rEvents ) throw(RuntimeException)
+{
+    if( !isDesignMode() && !mbCreatingCompatiblePeer )
+    {
+        ::rtl::OUString s1( RTL_CONSTASCII_USTRINGPARAM( "PositionX" ) );
+        ::rtl::OUString s2( RTL_CONSTASCII_USTRINGPARAM( "PositionY" ) );
+        ::rtl::OUString s3( RTL_CONSTASCII_USTRINGPARAM( "Width" ) );
+        ::rtl::OUString s4( RTL_CONSTASCII_USTRINGPARAM( "Height" ) );
+
+        sal_Int32 nLen = rEvents.getLength();
+        for( sal_Int32 i = 0; i < nLen; i++ )
+        {
+            const PropertyChangeEvent& rEvt = rEvents.getConstArray()[i];
+            Reference< XControlModel > xModel( rEvt.Source, UNO_QUERY );
+            sal_Bool bOwnModel = (XControlModel*)xModel.get() == (XControlModel*)getModel().get();
+            if ( ( rEvt.PropertyName == s1 ) ||
+                 ( rEvt.PropertyName == s2 ) ||
+                 ( rEvt.PropertyName == s3 ) ||
+                 ( rEvt.PropertyName == s4 ) )
+            {
+                if ( bOwnModel )
+                {
+                    if ( !mbPosModified && !mbSizeModified )
+                    {
+                        // Don't set new pos/size if we get new values from window listener
+                        Reference< XControl > xThis( (XAggregation*)(::cppu::OWeakAggObject*)this, UNO_QUERY );
+                        ImplSetPosSize( xThis );
+                    }
+                }
+                else
+                {
+                    Sequence<Reference<XControl> > aControlSequence(getControls());
+                    Reference<XControl> aControlRef( StdTabController::FindControl( aControlSequence, xModel ) );
+                    ImplSetPosSize( aControlRef );
+                }
+                break;
+            }
+        }
+    }
+    UnoControlContainer::ImplModelPropertiesChanged( rEvents );
+}
+
+void UnoParentControl::addingControl( const Reference< XControl >& _rxControl )
+{
+    SolarMutexGuard aSolarGuard;
+    UnoControlContainer::addingControl( _rxControl );
+
+    if ( _rxControl.is() )
+    {
+        Reference< XMultiPropertySet > xProps( _rxControl->getModel(), UNO_QUERY );
+        if ( xProps.is() )
+        {
+            Sequence< ::rtl::OUString > aNames( 4 );
+            ::rtl::OUString* pNames = aNames.getArray();
+            *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionX"));
+            *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PositionY"));
+            *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Width"));
+            *pNames++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Height"));
+
+            xProps->addPropertiesChangeListener( aNames, this );
+        }
+    }
+}
+
+void UnoParentControl::removingControl( const Reference< XControl >& _rxControl )
+{
+    SolarMutexGuard aSolarGuard;
+    UnoControlContainer::removingControl( _rxControl );
+
+    if ( _rxControl.is() )
+    {
+        Reference< XMultiPropertySet > xProps( _rxControl->getModel(), UNO_QUERY );
+        if ( xProps.is() )
+            xProps->removePropertiesChangeListener( this );
+    }
+
+}
+
+void SAL_CALL UnoParentControl::changesOccurred( const ChangesEvent& ) throw (RuntimeException)
+{
+    SolarMutexGuard aSolarGuard;
+    // a tab controller model may have changed
+
+    // #109067# in design mode don't notify the tab controller
+    // about tab index changes
+    if ( mxTabController.is() && !mbDesignMode )
+        mxTabController->activateTabOrder();
+}
+
+//  ----------------------------------------------------
+//  class MultiPageControl
+//  ----------------------------------------------------
+UnoMultiPageControl::UnoMultiPageControl() : maTabListeners( *this )
+{
+    maComponentInfos.nWidth = 280;
+    maComponentInfos.nHeight = 400;
+}
+
+UnoMultiPageControl::~UnoMultiPageControl()
+{
+}
+// XTabListener
+
+void SAL_CALL UnoMultiPageControl::inserted( ::sal_Int32 /*ID*/ ) throw (RuntimeException)
+{
+}
+void SAL_CALL UnoMultiPageControl::removed( ::sal_Int32 /*ID*/ ) throw (RuntimeException)
+{
+}
+void SAL_CALL UnoMultiPageControl::changed( ::sal_Int32 /*ID*/, const Sequence< NamedValue >& /*Properties*/ ) throw (RuntimeException)
+{
+}
+void SAL_CALL UnoMultiPageControl::activated( ::sal_Int32 ID ) throw (RuntimeException)
+{
+    ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_MULTIPAGEVALUE ), uno::makeAny( ID ), sal_False );
+
+}
+void SAL_CALL UnoMultiPageControl::deactivated( ::sal_Int32 /*ID*/ ) throw (RuntimeException)
+{
+}
+void SAL_CALL UnoMultiPageControl::disposing(const EventObject&) throw (RuntimeException)
+{
+}
+
+void SAL_CALL UnoMultiPageControl::dispose() throw (RuntimeException)
+{
+    lang::EventObject aEvt;
+    aEvt.Source = (::cppu::OWeakObject*)this;
+    maTabListeners.disposeAndClear( aEvt );
+    UnoParentControl::dispose();
+}
+
+// com::sun::star::awt::XSimpleTabController
+::sal_Int32 SAL_CALL UnoMultiPageControl::insertTab() throw (RuntimeException)
+{
+    Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY );
+    if ( !xMultiPage.is() )
+        throw RuntimeException();
+    return xMultiPage->insertTab();
+}
+
+void SAL_CALL UnoMultiPageControl::removeTab( ::sal_Int32 ID ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY );
+    if ( !xMultiPage.is() )
+        throw RuntimeException();
+    xMultiPage->removeTab( ID );
+}
+
+void SAL_CALL UnoMultiPageControl::setTabProps( ::sal_Int32 ID, const Sequence< NamedValue >& Properties ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY );
+    if ( !xMultiPage.is() )
+        throw RuntimeException();
+    xMultiPage->setTabProps( ID, Properties );
+}
+
+Sequence< NamedValue > SAL_CALL UnoMultiPageControl::getTabProps( ::sal_Int32 ID ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY );
+    if ( !xMultiPage.is() )
+        throw RuntimeException();
+    return xMultiPage->getTabProps( ID );
+}
+
+void SAL_CALL UnoMultiPageControl::activateTab( ::sal_Int32 ID ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY );
+    if ( !xMultiPage.is() )
+        throw RuntimeException();
+    xMultiPage->activateTab( ID );
+    ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_MULTIPAGEVALUE ), uno::makeAny( ID ), sal_True );
+
+}
+
+::sal_Int32 SAL_CALL UnoMultiPageControl::getActiveTabID() throw (RuntimeException)
+{
+    Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY );
+    if ( !xMultiPage.is() )
+        throw RuntimeException();
+    return xMultiPage->getActiveTabID();
+}
+
+void SAL_CALL UnoMultiPageControl::addTabListener( const Reference< XTabListener >& Listener ) throw (RuntimeException)
+{
+    maTabListeners.addInterface( Listener );
+    Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY );
+    if ( xMultiPage.is()  && maTabListeners.getLength() == 1 )
+        xMultiPage->addTabListener( &maTabListeners );
+}
+
+void SAL_CALL UnoMultiPageControl::removeTabListener( const Reference< XTabListener >& Listener ) throw (RuntimeException)
+{
+    Reference< XSimpleTabController > xMultiPage( getPeer(), UNO_QUERY );
+    if ( xMultiPage.is()  && maTabListeners.getLength() == 1 )
+        xMultiPage->removeTabListener( &maTabListeners );
+    maTabListeners.removeInterface( Listener );
+}
+
+
+// lang::XTypeProvider
+IMPL_XTYPEPROVIDER_START( UnoMultiPageControl )
+    getCppuType( ( uno::Reference< awt::XSimpleTabController>* ) NULL ),
+    getCppuType( ( uno::Reference< awt::XTabListener>* ) NULL ),
+    UnoParentControl::getTypes()
+IMPL_XTYPEPROVIDER_END
+
+// uno::XInterface
+uno::Any UnoMultiPageControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException)
+{
+    uno::Any aRet = ::cppu::queryInterface( rType,
+                                        SAL_STATIC_CAST( awt::XTabListener*, this ), SAL_STATIC_CAST( awt::XSimpleTabController*, this ) );
+    return (aRet.hasValue() ? aRet : UnoParentControl::queryAggregation( rType ));
+}
+
+::rtl::OUString UnoMultiPageControl::GetComponentServiceName()
+{
+    sal_Bool bDecoration( sal_True );
+    ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_DECORATION )) >>= bDecoration;
+    if ( bDecoration )
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tabcontrol"));
+    // Hopefully we can tweak the tabcontrol to display without tabs
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tabcontrolnotabs"));
+}
+
+void UnoMultiPageControl::bindPage( const uno::Reference< awt::XControl >& _rxControl )
+{
+    uno::Reference< awt::XWindowPeer > xPage( _rxControl->getPeer() );
+    uno::Reference< awt::XSimpleTabController > xTabCntrl( getPeer(), uno::UNO_QUERY );
+    uno::Reference< beans::XPropertySet > xProps( _rxControl->getModel(), uno::UNO_QUERY );
+
+   VCLXTabPage* pXPage = dynamic_cast< VCLXTabPage* >( xPage.get() );
+   TabPage* pPage = pXPage ? pXPage->getTabPage() : NULL;
+    if ( xTabCntrl.is() && pPage )
+    {
+        VCLXMultiPage* pXTab = dynamic_cast< VCLXMultiPage* >( xTabCntrl.get() );
+        if ( pXTab )
+        {
+            rtl::OUString sTitle;
+            xProps->getPropertyValue( GetPropertyName( BASEPROPERTY_TITLE ) ) >>= sTitle;
+            pXTab->insertTab( pPage, sTitle);
+        }
+    }
+
+}
+
+void UnoMultiPageControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer ) throw(RuntimeException)
+{
+    SolarMutexGuard aSolarGuard;
+
+    UnoControlContainer::createPeer( rxToolkit, rParentPeer );
+
+    uno::Sequence< uno::Reference< awt::XControl > > aCtrls = getControls();
+    sal_uInt32 nCtrls = aCtrls.getLength();
+    for( sal_uInt32 n = 0; n < nCtrls; n++ )
+       bindPage( aCtrls[ n ] );
+    sal_Int32 nActiveTab(0);
+    Reference< XPropertySet > xMultiProps( getModel(), UNO_QUERY );
+    xMultiProps->getPropertyValue( GetPropertyName( BASEPROPERTY_MULTIPAGEVALUE ) ) >>= nActiveTab;
+
+    uno::Reference< awt::XSimpleTabController > xTabCntrl( getPeer(), uno::UNO_QUERY );
+    if ( xTabCntrl.is() )
+    {
+        xTabCntrl->addTabListener( this );
+        if ( nActiveTab && nCtrls ) // Ensure peer is initialise with correct activated tab
+        {
+            xTabCntrl->activateTab( nActiveTab );
+            ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_MULTIPAGEVALUE ), uno::makeAny( nActiveTab ), sal_True );
+        }
+    }
+}
+
+void    UnoMultiPageControl::impl_createControlPeerIfNecessary( const uno::Reference< awt::XControl >& _rxControl)
+{
+    OSL_PRECOND( _rxControl.is(), "UnoMultiPageControl::impl_createControlPeerIfNecessary: invalid control, this will crash!" );
+
+    // if the container already has a peer, then also create a peer for the control
+    uno::Reference< awt::XWindowPeer > xMyPeer( getPeer() );
+
+    if( xMyPeer.is() )
+    {
+        _rxControl->createPeer( NULL, xMyPeer );
+        bindPage( _rxControl );
+        ImplActivateTabControllers();
+    }
+
+}
+
+// ------------- UnoMultiPageModel -----------------
+
+UnoMultiPageModel::UnoMultiPageModel() : UnoControlDialogModel( false )
+{
+    ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
+    ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
+    ImplRegisterProperty( BASEPROPERTY_ENABLEVISIBLE );
+    ImplRegisterProperty( BASEPROPERTY_ENABLED );
+
+    ImplRegisterProperty( BASEPROPERTY_FONTDESCRIPTOR );
+    ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
+    ImplRegisterProperty( BASEPROPERTY_HELPURL );
+    ImplRegisterProperty( BASEPROPERTY_SIZEABLE );
+    //ImplRegisterProperty( BASEPROPERTY_DIALOGSOURCEURL );
+    ImplRegisterProperty( BASEPROPERTY_MULTIPAGEVALUE );
+    ImplRegisterProperty( BASEPROPERTY_PRINTABLE );
+    ImplRegisterProperty( BASEPROPERTY_USERFORMCONTAINEES );
+
+    Any aBool;
+    aBool <<= (sal_Bool) sal_True;
+    ImplRegisterProperty( BASEPROPERTY_MOVEABLE, aBool );
+    ImplRegisterProperty( BASEPROPERTY_CLOSEABLE, aBool );
+    ImplRegisterProperty( BASEPROPERTY_DECORATION, aBool );
+    // MultiPage Control has the tab stop property. And the default value is True.
+    ImplRegisterProperty( BASEPROPERTY_TABSTOP, aBool );
+}
+
+UnoMultiPageModel::UnoMultiPageModel( const UnoMultiPageModel& rModel )
+    : UnoControlDialogModel( rModel )
+{
+}
+
+UnoMultiPageModel::~UnoMultiPageModel()
+{
+}
+
+UnoControlModel*
+UnoMultiPageModel::Clone() const
+{
+    // clone the container itself
+    UnoMultiPageModel* pClone = new UnoMultiPageModel( *this );
+
+    // clone all children
+    ::std::for_each(
+        maModels.begin(), maModels.end(),
+        CloneControlModel( pClone->maModels )
+    );
+
+    return pClone;
+}
+
+::rtl::OUString UnoMultiPageModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
+{
+    return ::rtl::OUString::createFromAscii( szServiceName_UnoMultiPageModel );
+}
+
+uno::Any UnoMultiPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
+{
+    if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
+    {
+        uno::Any aAny;
+        aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoMultiPageControl );
+        return aAny;
+    }
+    return UnoControlDialogModel::ImplGetDefaultValue( nPropId );
+}
+
+::cppu::IPropertyArrayHelper& UnoMultiPageModel::getInfoHelper()
+{
+    static UnoPropertyArrayHelper* pHelper = NULL;
+    if ( !pHelper )
+    {
+        uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
+        pHelper = new UnoPropertyArrayHelper( aIDs );
+    }
+    return *pHelper;
+}
+
+// beans::XMultiPropertySet
+uno::Reference< beans::XPropertySetInfo > UnoMultiPageModel::getPropertySetInfo(  ) throw(uno::RuntimeException)
+{
+    static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
+    return xInfo;
+}
+
+void UnoMultiPageModel::insertByName( const ::rtl::OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException)
+{
+    Reference< XServiceInfo > xInfo;
+    aElement >>= xInfo;
+
+    if ( !xInfo.is() )
+        throw IllegalArgumentException();
+
+    // Only a Page model can be inserted into the multipage
+    if ( !xInfo->supportsService( rtl::OUString::createFromAscii( szServiceName_UnoPageModel ) ) )
+        throw IllegalArgumentException();
+
+    return UnoControlDialogModel::insertByName( aName, aElement );
+}
+
+// ----------------------------------------------------------------------------
+sal_Bool SAL_CALL UnoMultiPageModel::getGroupControl(  ) throw (RuntimeException)
+{
+    return sal_True;
+}
+
+//  ----------------------------------------------------
+//  class UnoPageControl
+//  ----------------------------------------------------
+UnoPageControl::UnoPageControl()
+{
+    maComponentInfos.nWidth = 280;
+    maComponentInfos.nHeight = 400;
+}
+
+UnoPageControl::~UnoPageControl()
+{
+}
+
+::rtl::OUString UnoPageControl::GetComponentServiceName()
+{
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tabpage"));
+}
+
+
+// ------------- UnoPageModel -----------------
+
+UnoPageModel::UnoPageModel() : UnoControlDialogModel( false )
+{
+    ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
+    ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
+    ImplRegisterProperty( BASEPROPERTY_ENABLED );
+    ImplRegisterProperty( BASEPROPERTY_ENABLEVISIBLE );
+
+    ImplRegisterProperty( BASEPROPERTY_FONTDESCRIPTOR );
+    ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
+    ImplRegisterProperty( BASEPROPERTY_HELPURL );
+    ImplRegisterProperty( BASEPROPERTY_TITLE );
+    ImplRegisterProperty( BASEPROPERTY_SIZEABLE );
+    ImplRegisterProperty( BASEPROPERTY_PRINTABLE );
+    ImplRegisterProperty( BASEPROPERTY_USERFORMCONTAINEES );
+//    ImplRegisterProperty( BASEPROPERTY_DIALOGSOURCEURL );
+
+    Any aBool;
+    aBool <<= (sal_Bool) sal_True;
+    ImplRegisterProperty( BASEPROPERTY_MOVEABLE, aBool );
+    ImplRegisterProperty( BASEPROPERTY_CLOSEABLE, aBool );
+    //ImplRegisterProperty( BASEPROPERTY_TABSTOP, aBool );
+}
+
+UnoPageModel::UnoPageModel( const UnoPageModel& rModel )
+    : UnoControlDialogModel( rModel )
+{
+}
+
+UnoPageModel::~UnoPageModel()
+{
+}
+
+UnoControlModel*
+UnoPageModel::Clone() const
+{
+    // clone the container itself
+    UnoPageModel* pClone = new UnoPageModel( *this );
+
+    // clone all children
+    ::std::for_each(
+        maModels.begin(), maModels.end(),
+        CloneControlModel( pClone->maModels )
+    );
+
+    return pClone;
+}
+
+::rtl::OUString UnoPageModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
+{
+    return ::rtl::OUString::createFromAscii( szServiceName_UnoPageModel );
+}
+
+uno::Any UnoPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
+{
+    if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
+    {
+        uno::Any aAny;
+        aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoPageControl );
+        return aAny;
+    }
+    return UnoControlDialogModel::ImplGetDefaultValue( nPropId );
+}
+
+::cppu::IPropertyArrayHelper& UnoPageModel::getInfoHelper()
+{
+    static UnoPropertyArrayHelper* pHelper = NULL;
+    if ( !pHelper )
+    {
+        uno::Sequence<sal_Int32>  aIDs = ImplGetPropertyIds();
+        pHelper = new UnoPropertyArrayHelper( aIDs );
+    }
+    return *pHelper;
+}
+
+// beans::XMultiPropertySet
+uno::Reference< beans::XPropertySetInfo > UnoPageModel::getPropertySetInfo(  ) throw(uno::RuntimeException)
+{
+    static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
+    return xInfo;
+}
+
+// ----------------------------------------------------------------------------
+sal_Bool SAL_CALL UnoPageModel::getGroupControl(  ) throw (RuntimeException)
+{
+    return sal_False;
+}
+
+// Frame control
+
+//  ----------------------------------------------------
+//  class UnoFrameControl
+//  ----------------------------------------------------
+UnoFrameControl::UnoFrameControl()
+{
+    maComponentInfos.nWidth = 280;
+    maComponentInfos.nHeight = 400;
+}
+
+UnoFrameControl::~UnoFrameControl()
+{
+}
+
+::rtl::OUString UnoFrameControl::GetComponentServiceName()
+{
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("frame"));
+}
+
+void UnoFrameControl::ImplSetPosSize( Reference< XControl >& rxCtrl )
+{
+    bool bOwnCtrl = false;
+    rtl::OUString sTitle;
+    if ( rxCtrl.get() == Reference<XControl>( this ).get() )
+        bOwnCtrl = true;
+    Reference< XPropertySet > xProps( getModel(), UNO_QUERY );
+    //xProps->getPropertyValue( GetPropertyName( BASEPROPERTY_TITLE ) ) >>= sTitle;
+    xProps->getPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ) ) >>= sTitle;
+
+    UnoParentControl::ImplSetPosSize( rxCtrl );
+    Reference < XWindow > xW( rxCtrl, UNO_QUERY );
+    if ( !bOwnCtrl && xW.is() && sTitle.getLength() )
+    {
+        awt::Rectangle aSizePos = xW->getPosSize();
+
+        sal_Int32 nX = aSizePos.X, nY = aSizePos.Y, nWidth = aSizePos.Width, nHeight = aSizePos.Height;
+        // Retrieve the values set by the base class
+        OutputDevice*pOutDev = Application::GetDefaultDevice();
+        if ( pOutDev )
+        {
+            if ( !bOwnCtrl && sTitle.getLength() )
+            {
+                // Adjust Y based on height of Title
+                ::Rectangle aRect = pOutDev->GetTextRect( aRect, sTitle );
+                nY = nY + ( aRect.GetHeight() / 2 );
+            }
+        }
+        else
+        {
+            Reference< XWindowPeer > xPeer = ImplGetCompatiblePeer( sal_True );
+            Reference< XDevice > xD( xPeer, UNO_QUERY );
+
+            SimpleFontMetric aFM;
+            FontDescriptor aFD;
+            Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_FONTDESCRIPTOR ) );
+            aVal >>= aFD;
+            if ( aFD.StyleName.getLength() )
+            {
+                Reference< XFont > xFont = xD->getFont( aFD );
+                aFM = xFont->getFontMetric();
+            }
+            else
+            {
+                Reference< XGraphics > xG = xD->createGraphics();
+                aFM = xG->getFontMetric();
+            }
+
+            sal_Int16 nH = aFM.Ascent + aFM.Descent;
+            if ( !bOwnCtrl && sTitle.getLength() )
+                // offset y based on height of font ( not sure if my guess at the correct calculation is correct here )
+                nY = nY + ( nH / 8); // how do I test this
+        }
+        xW->setPosSize( nX, nY, nWidth, nHeight, PosSize::POSSIZE );
+    }
+}
+
+// ------------- UnoFrameModel -----------------
+
+UnoFrameModel::UnoFrameModel() : UnoControlDialogModel( false )
+{
+    ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
+    ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
+    ImplRegisterProperty( BASEPROPERTY_ENABLED );
+    ImplRegisterProperty( BASEPROPERTY_ENABLEVISIBLE );
+    ImplRegisterProperty( BASEPROPERTY_FONTDESCRIPTOR );
+    ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
+    ImplRegisterProperty( BASEPROPERTY_HELPURL );
+    ImplRegisterProperty( BASEPROPERTY_PRINTABLE );
+    ImplRegisterProperty( BASEPROPERTY_LABEL );
+    ImplRegisterProperty( BASEPROPERTY_WRITING_MODE );
+    ImplRegisterProperty( BASEPROPERTY_CONTEXT_WRITING_MODE );
+    ImplRegisterProperty( BASEPROPERTY_USERFORMCONTAINEES );
+}
+
+UnoFrameModel::UnoFrameModel( const UnoFrameModel& rModel )
+    : UnoControlDialogModel( rModel )
+{
+}
+
+UnoFrameModel::~UnoFrameModel()
+{
+}
+
+UnoControlModel*
+UnoFrameModel::Clone() const
+{
+    // clone the container itself
+    UnoFrameModel* pClone = new UnoFrameModel( *this );
+
+    // clone all children
+    ::std::for_each(
+        maModels.begin(), maModels.end(),
+        CloneControlModel( pClone->maModels )
+    );
+
+    return pClone;
+}
+
+::rtl::OUString UnoFrameModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
+{
+    return ::rtl::OUString::createFromAscii( szServiceName_UnoFrameModel );
+}
+
+uno::Any UnoFrameModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
+{
+    if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
+    {
+        uno::Any aAny;
+        aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoFrameControl );
+        return aAny;
+    }
+    return UnoControlDialogModel::ImplGetDefaultValue( nPropId );
+}
+
+::cppu::IPropertyArrayHelper& UnoFrameModel::getInfoHelper()
+{
+    static UnoPropertyArrayHelper* pHelper = NULL;
+    if ( !pHelper )
+    {
+        uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
+        pHelper = new UnoPropertyArrayHelper( aIDs );
+    }
+    return *pHelper;
+}
+
+// beans::XMultiPropertySet
+uno::Reference< beans::XPropertySetInfo > UnoFrameModel::getPropertySetInfo(  ) throw(uno::RuntimeException)
+{
+    static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
+    return xInfo;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx
index b82b8b4be2c0..e83749d3a6da 100644
--- a/toolkit/source/controls/formattedcontrol.cxx
+++ b/toolkit/source/controls/formattedcontrol.cxx
@@ -375,9 +375,9 @@ namespace toolkit
             }
 
             throw IllegalArgumentException(
-                        ( ::rtl::OUString::createFromAscii("Unable to convert the given value for the property ")
+                        ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unable to convert the given value for the property "))
                     +=  GetPropertyName((sal_uInt16)nPropId) )
-                    +=  ::rtl::OUString::createFromAscii(" (double, integer, or string expected)."),
+                    +=  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" (double, integer, or string expected).")),
                 static_cast< XPropertySet* >(this),
                 1);
         }
@@ -441,7 +441,7 @@ namespace toolkit
     // -------------------------------------------------------------------
     ::rtl::OUString UnoFormattedFieldControl::GetComponentServiceName()
     {
-        return ::rtl::OUString::createFromAscii( "FormattedField" );
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormattedField"));
     }
 
     // -------------------------------------------------------------------
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
index 1716d843a117..4a644484b599 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
@@ -117,14 +117,14 @@ void SAL_CALL DefaultGridColumnModel::setDefaultColumns(sal_Int32 rowElements) t
 
     for(sal_Int32 i=0;i<rowElements;i++)
     {
-        Reference<XGridColumn> xColumn( m_xFactory->createInstance ( OUString::createFromAscii( "com.sun.star.awt.grid.GridColumn"  ) ), UNO_QUERY );
+        Reference<XGridColumn> xColumn( m_xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.grid.GridColumn")) ), UNO_QUERY );
         columns.push_back(xColumn);
         xColumn->setIndex(i);
     }
 }
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > SAL_CALL DefaultGridColumnModel::copyColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > & column)  throw (::com::sun::star::uno::RuntimeException)
 {
-    Reference<XGridColumn> xColumn( m_xFactory->createInstance ( OUString::createFromAscii( "com.sun.star.awt.grid.GridColumn"  ) ), UNO_QUERY );
+    Reference<XGridColumn> xColumn( m_xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.grid.GridColumn")) ), UNO_QUERY );
     xColumn->setColumnWidth(column->getColumnWidth());
     xColumn->setPreferredWidth(column->getPreferredWidth());
     xColumn->setMaxWidth(column->getMaxWidth());
diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx
index 158876245be6..9289352720bc 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.cxx
@@ -162,7 +162,7 @@ UnoGridControl::UnoGridControl()
 
 OUString UnoGridControl::GetComponentServiceName()
 {
-    return OUString::createFromAscii( "Grid" );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("Grid"));
 }
 
 void SAL_CALL UnoGridControl::dispose(  ) throw(RuntimeException)
@@ -184,10 +184,10 @@ void UnoGridControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolk
     Reference<XGridColumnListener> xColListener ( getPeer(), UNO_QUERY_THROW );
     Reference<XPropertySet> xPropSet ( getModel(), UNO_QUERY_THROW );
 
-    Reference<XGridDataModel> xGridDataModel ( xPropSet->getPropertyValue(OUString::createFromAscii( "GridDataModel" )), UNO_QUERY_THROW );
+    Reference<XGridDataModel> xGridDataModel ( xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("GridDataModel"))), UNO_QUERY_THROW );
     if(xGridDataModel != NULL)
         xGridDataModel->addDataListener(xListener);
-    Reference<XGridColumnModel> xGridColumnModel ( xPropSet->getPropertyValue(OUString::createFromAscii( "ColumnModel" )), UNO_QUERY_THROW );
+    Reference<XGridColumnModel> xGridColumnModel ( xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("ColumnModel"))), UNO_QUERY_THROW );
     if(xGridColumnModel != NULL)
     {
         for(int i = 0;i<xGridColumnModel->getColumnCount();i++)
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index bf9639901f11..957b55e3afde 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -196,7 +196,7 @@ static void lcl_throwIndexOutOfBoundsException( )
         if ( !xRoadmapItem.is() )
             lcl_throwIllegalArgumentException();
         Reference< XServiceInfo > xServiceInfo( xRoadmapItem, UNO_QUERY );
-        sal_Bool bIsRoadmapItem = xServiceInfo->supportsService( ::rtl::OUString::createFromAscii( "com.sun.star.awt.RoadmapItem" ) );
+        sal_Bool bIsRoadmapItem = xServiceInfo->supportsService( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.RoadmapItem")) );
         if ( !bIsRoadmapItem )
             lcl_throwIllegalArgumentException();
     }
@@ -210,12 +210,12 @@ static void lcl_throwIndexOutOfBoundsException( )
         if ( xProps.is() )
         {
             sal_Int32 LocID = 0;
-            Any aValue = xPropertySet->getPropertyValue( ::rtl::OUString::createFromAscii( "ID" ) );
+            Any aValue = xPropertySet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ID")) );
             aValue >>= LocID;
             if (LocID < 0)              // index may not be smaller than zero
             {
                 aAny <<= GetUniqueID();
-                xPropertySet->setPropertyValue( ::rtl::OUString::createFromAscii( "ID" ), aAny );
+                xPropertySet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ID")), aAny );
             }
         }
     }
@@ -238,7 +238,7 @@ static void lcl_throwIndexOutOfBoundsException( )
               {
                 CurRoadmapItem = *i;
                 Reference< XPropertySet > xPropertySet( CurRoadmapItem, UNO_QUERY );
-                aAny = xPropertySet->getPropertyValue( ::rtl::OUString::createFromAscii( "ID" ) );
+                aAny = xPropertySet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ID")) );
                 aAny >>= n_CurItemID;
                 if (n_CurItemID == CurID)
                 {
@@ -396,7 +396,7 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >&
     // -------------------------------------------------------------------
     ::rtl::OUString UnoRoadmapControl::GetComponentServiceName()
     {
-        return ::rtl::OUString::createFromAscii( "Roadmap" );
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Roadmap"));
     }
 
 
diff --git a/toolkit/source/controls/roadmapentry.cxx b/toolkit/source/controls/roadmapentry.cxx
index e12fbfae7565..55a3e8b1b3f9 100644
--- a/toolkit/source/controls/roadmapentry.cxx
+++ b/toolkit/source/controls/roadmapentry.cxx
@@ -40,22 +40,22 @@ ORoadmapEntry::ORoadmapEntry() : ORoadmapEntry_Base( )
 {
     // registerProperty or registerMayBeVoidProperty or registerPropertyNoMember
 
-    registerProperty( ::rtl::OUString::createFromAscii( "Label" ), RM_PROPERTY_ID_LABEL,
+    registerProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")), RM_PROPERTY_ID_LABEL,
                       ::com::sun::star::beans::PropertyAttribute::BOUND |
                       ::com::sun::star::beans::PropertyAttribute::CONSTRAINED,
                       & m_sLabel, ::getCppuType( &m_sLabel ) );
     m_nID = -1;
-    registerProperty( ::rtl::OUString::createFromAscii( "ID" ), RM_PROPERTY_ID_ID,
+    registerProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ID")), RM_PROPERTY_ID_ID,
                       ::com::sun::star::beans::PropertyAttribute::BOUND |
                       ::com::sun::star::beans::PropertyAttribute::CONSTRAINED,
                       & m_nID, ::getCppuType( &m_nID ) );
     m_bEnabled = sal_True;
-    registerProperty( ::rtl::OUString::createFromAscii( "Enabled" ), RM_PROPERTY_ID_ENABLED,
+    registerProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Enabled")), RM_PROPERTY_ID_ENABLED,
                     ::com::sun::star::beans::PropertyAttribute::BOUND |
                     ::com::sun::star::beans::PropertyAttribute::MAYBEDEFAULT,
                     & m_bEnabled, ::getCppuType( &m_bEnabled ) );
 
-    registerProperty( ::rtl::OUString::createFromAscii( "Interactive" ), RM_PROPERTY_ID_INTERACTIVE,
+    registerProperty( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Interactive")), RM_PROPERTY_ID_INTERACTIVE,
                     ::com::sun::star::beans::PropertyAttribute::BOUND |
                     ::com::sun::star::beans::PropertyAttribute::MAYBEDEFAULT,
                     & m_bInteractive, ::getCppuType( &m_bInteractive ) );
@@ -91,20 +91,20 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( ORoadmapEntry, ORoadmapEntry_Base, ::comphelpe
 
 ::rtl::OUString SAL_CALL ORoadmapEntry::getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::rtl::OUString aStr = ::rtl::OUString::createFromAscii("com.sun.star.comp.toolkit.RoadmapItem");
+    ::rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.toolkit.RoadmapItem"));
     return aStr;
 }
 
 sal_Bool SAL_CALL ORoadmapEntry::supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException)
 {
-    return ServiceName.equals( ::rtl::OUString::createFromAscii( "com.sun.star.awt.RoadmapItem" ) );
+    return ServiceName.equals( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.RoadmapItem")) );
 }
 
 ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ORoadmapEntry::getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Sequence< ::rtl::OUString > aRet(1);
     ::rtl::OUString* pArray = aRet.getArray();
-    pArray[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.RoadmapItem" );
+    pArray[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.RoadmapItem"));
     return aRet;
 }
 //--------------------------------------------------------------------------
diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx
index bb4f35644e3a..47cb26e89453 100644
--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.cxx
@@ -121,7 +121,7 @@ sal_Bool StdTabController::ImplCreateComponentSequence(
             if ( pTabs )
             {
                 // opt: String fuer TabStop als Konstante
-                static const ::rtl::OUString aTabStopName( ::rtl::OUString::createFromAscii( "Tabstop" ) );
+                static const ::rtl::OUString aTabStopName( RTL_CONSTASCII_USTRINGPARAM("Tabstop") );
 
                 Reference< XPropertySet >  xPSet( xCtrl->getModel(), UNO_QUERY );
                 Reference< XPropertySetInfo >  xInfo = xPSet->getPropertySetInfo();
diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx
index e2acf791a886..b5b9723d39bb 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.cxx
@@ -104,7 +104,7 @@ namespace toolkit
 
     ::rtl::OUString UnoScrollBarControl::GetComponentServiceName()
     {
-        return ::rtl::OUString::createFromAscii( "ScrollBar" );
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScrollBar"));
     }
 
     // ::com::sun::star::uno::XInterface
diff --git a/toolkit/source/controls/tksimpleanimation.cxx b/toolkit/source/controls/tksimpleanimation.cxx
index f60abcaf3823..2ac9d1f1d478 100644
--- a/toolkit/source/controls/tksimpleanimation.cxx
+++ b/toolkit/source/controls/tksimpleanimation.cxx
@@ -127,7 +127,7 @@ namespace toolkit
     //--------------------------------------------------------------------
     ::rtl::OUString UnoSimpleAnimationControl::GetComponentServiceName()
     {
-        return ::rtl::OUString::createFromAscii( "SimpleAnimation" );
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SimpleAnimation"));
     }
 
     //--------------------------------------------------------------------
diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx
index c22cbf1fae10..178108621f7f 100644
--- a/toolkit/source/controls/tkspinbutton.cxx
+++ b/toolkit/source/controls/tkspinbutton.cxx
@@ -146,7 +146,7 @@ namespace toolkit
     //--------------------------------------------------------------------
     ::rtl::OUString UnoSpinButtonControl::GetComponentServiceName()
     {
-        return ::rtl::OUString::createFromAscii( "SpinButton" );
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SpinButton"));
     }
 
     //--------------------------------------------------------------------
diff --git a/toolkit/source/controls/tkthrobber.cxx b/toolkit/source/controls/tkthrobber.cxx
index 0f3d2a58654e..b93ccda7c5ba 100644
--- a/toolkit/source/controls/tkthrobber.cxx
+++ b/toolkit/source/controls/tkthrobber.cxx
@@ -125,7 +125,7 @@ namespace toolkit
     //--------------------------------------------------------------------
     ::rtl::OUString UnoThrobberControl::GetComponentServiceName()
     {
-        return ::rtl::OUString::createFromAscii( "Throbber" );
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Throbber"));
     }
 
     //--------------------------------------------------------------------
diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx
index 2b3a6d61d9ea..4e5fa657c33e 100644
--- a/toolkit/source/controls/tree/treecontrol.cxx
+++ b/toolkit/source/controls/tree/treecontrol.cxx
@@ -148,7 +148,7 @@ UnoTreeControl::UnoTreeControl()
 
 OUString UnoTreeControl::GetComponentServiceName()
 {
-    return OUString::createFromAscii( "Tree" );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("Tree"));
 }
 
 // -------------------------------------------------------------------
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index d078aa358e60..40a8dd456516 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -1119,7 +1119,7 @@ void UnoControl::createPeer( const Reference< XToolkit >& rxToolkit, const Refer
     if ( !mxModel.is() )
     {
         RuntimeException aException;
-        aException.Message = ::rtl::OUString::createFromAscii( "createPeer: no model!" );
+        aException.Message = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("createPeer: no model!"));
         aException.Context = (XAggregation*)(::cppu::OWeakAggObject*)this;
         throw( aException );
     }
@@ -1428,7 +1428,7 @@ void UnoControl::setDesignMode( sal_Bool bOn ) throw(RuntimeException)
         disposeAccessibleContext();
 
         aModeChangeEvent.Source = *this;
-        aModeChangeEvent.NewMode = ::rtl::OUString::createFromAscii( mbDesignMode ? "design" : "alive" );
+        aModeChangeEvent.NewMode = mbDesignMode ? ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("design")) : ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("alive" ));
     }
 
     // ajust the visibility of our window
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index 7aa2e63fd9cc..d4755d37df50 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -809,8 +809,8 @@ void UnoControlContainer::createPeer( const uno::Reference< awt::XToolkit >& rxT
                 aCtrls.getArray()[n]->createPeer( rxToolkit, getPeer() );
 
             uno::Reference< awt::XVclContainerPeer >  xC( getPeer(), uno::UNO_QUERY );
-
-            xC->enableDialogControl( sal_True );
+            if ( xC.is() )
+                xC->enableDialogControl( sal_True );
             ImplActivateTabControllers();
         }
 
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index 4ad984647eb4..2f46f97827a2 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -477,7 +477,8 @@ void UnoControlModel::ImplRegisterProperty( sal_uInt16 nPropId )
 void UnoControlModel::ImplRegisterProperties( const std::list< sal_uInt16 > &rIds )
 {
     std::list< sal_uInt16 >::const_iterator iter;
-    for( iter = rIds.begin(); iter != rIds.end(); iter++) {
+    for( iter = rIds.begin(); iter != rIds.end(); ++iter)
+    {
         if( !ImplHasProperty( *iter ) )
             ImplRegisterProperty( *iter, ImplGetDefaultValue( *iter ) );
     }
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index b72ae69e44c6..cde41f613683 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -186,13 +186,13 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoEditControl, UnoControlBase, UnoEditControl
 ::rtl::OUString UnoEditControl::GetComponentServiceName()
 {
     // by default, we want a simple edit field
-    ::rtl::OUString sName( ::rtl::OUString::createFromAscii( "Edit" ) );
+    ::rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM("Edit") );
 
     // but maybe we are to display multi-line text?
     uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_MULTILINE ) );
     sal_Bool b = sal_Bool();
     if ( ( aVal >>= b ) && b )
-        sName= ::rtl::OUString::createFromAscii( "MultiLineEdit" );
+        sName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MultiLineEdit"));
 
     return sName;
 }
@@ -524,7 +524,7 @@ UnoFileControl::UnoFileControl()
 
 ::rtl::OUString UnoFileControl::GetComponentServiceName()
 {
-    return ::rtl::OUString::createFromAscii( "filecontrol" );
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("filecontrol"));
 }
 
 //  ----------------------------------------------------
@@ -537,7 +537,7 @@ uno::Any GraphicControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 
     return UnoControlModel::ImplGetDefaultValue( nPropId );
 }
-    uno::Reference< graphic::XGraphic > getGraphicFromURL_nothrow( uno::Reference< graphic::XGraphicObject >& rxGrfObj, const ::rtl::OUString& _rURL )
+    uno::Reference< graphic::XGraphic > ImageHelper::getGraphicAndGraphicObjectFromURL_nothrow( uno::Reference< graphic::XGraphicObject >& xOutGraphicObj, const ::rtl::OUString& _rURL )
     {
         uno::Reference< graphic::XGraphic > xGraphic;
 
@@ -547,10 +547,10 @@ uno::Any GraphicControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
             rtl::OUString sID = _rURL.copy( sizeof( UNO_NAME_GRAPHOBJ_URLPREFIX ) - 1 );
             // get the DefaultContext
             ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
-            rxGrfObj = graphic::GraphicObject::createWithId( aContext.getUNOContext(), sID );
+            xOutGraphicObj = graphic::GraphicObject::createWithId( aContext.getUNOContext(), sID );
         }
         else // linked
-            rxGrfObj = NULL; // release the GraphicObject
+            xOutGraphicObj = NULL; // release the GraphicObject
 
         if ( !_rURL.getLength() )
             return xGraphic;
@@ -575,6 +575,7 @@ uno::Any GraphicControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
         return xGraphic;
     }
 
+
 void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception)
 {
     UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue );
@@ -591,7 +592,7 @@ void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 n
                 mbAdjustingGraphic = true;
                 ::rtl::OUString sImageURL;
                 OSL_VERIFY( rValue >>= sImageURL );
-                setPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHIC ), uno::makeAny( getGraphicFromURL_nothrow( mxGrfObj, sImageURL ) ) );
+                setPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHIC ), uno::makeAny( ImageHelper::getGraphicAndGraphicObjectFromURL_nothrow( mxGrfObj, sImageURL ) ) );
                 mbAdjustingGraphic = false;
             }
             break;
@@ -703,7 +704,7 @@ UnoButtonControl::UnoButtonControl()
 
 ::rtl::OUString UnoButtonControl::GetComponentServiceName()
 {
-    ::rtl::OUString aName( ::rtl::OUString::createFromAscii( "pushbutton" ) );
+    ::rtl::OUString aName( RTL_CONSTASCII_USTRINGPARAM("pushbutton") );
     uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_PUSHBUTTONTYPE ) );
     sal_Int16 n = sal_Int16();
     if ( ( aVal >>= n ) && n )
@@ -711,11 +712,11 @@ UnoButtonControl::UnoButtonControl()
         // Use PushButtonType later when available...
         switch ( n )
         {
-            case 1 /*PushButtonType::OK*/:      aName= ::rtl::OUString::createFromAscii( "okbutton" );
+            case 1 /*PushButtonType::OK*/:      aName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("okbutton"));
                                                 break;
-            case 2 /*PushButtonType::CANCEL*/:  aName= ::rtl::OUString::createFromAscii( "cancelbutton" );
+            case 2 /*PushButtonType::CANCEL*/:  aName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cancelbutton"));
                                                 break;
-            case 3 /*PushButtonType::HELP*/:    aName= ::rtl::OUString::createFromAscii( "helpbutton" );
+            case 3 /*PushButtonType::HELP*/:    aName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("helpbutton"));
                                                 break;
             default:
             {
@@ -923,7 +924,7 @@ UnoImageControlControl::UnoImageControlControl()
 
 ::rtl::OUString UnoImageControlControl::GetComponentServiceName()
 {
-    return ::rtl::OUString::createFromAscii( "fixedimage" );
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fixedimage"));
 }
 
 void UnoImageControlControl::dispose() throw(uno::RuntimeException)
@@ -1013,7 +1014,7 @@ UnoRadioButtonControl::UnoRadioButtonControl()
 
 ::rtl::OUString UnoRadioButtonControl::GetComponentServiceName()
 {
-    return ::rtl::OUString::createFromAscii( "radiobutton" );
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("radiobutton"));
 }
 
 void UnoRadioButtonControl::dispose() throw(uno::RuntimeException)
@@ -1220,7 +1221,7 @@ UnoCheckBoxControl::UnoCheckBoxControl()
 
 ::rtl::OUString UnoCheckBoxControl::GetComponentServiceName()
 {
-    return ::rtl::OUString::createFromAscii( "checkbox" );
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("checkbox"));
 }
 
 void UnoCheckBoxControl::dispose() throw(uno::RuntimeException)
@@ -1411,7 +1412,7 @@ UnoFixedHyperlinkControl::UnoFixedHyperlinkControl()
 
 ::rtl::OUString UnoFixedHyperlinkControl::GetComponentServiceName()
 {
-    return ::rtl::OUString::createFromAscii( "fixedhyperlink" );
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fixedhyperlink"));
 }
 
 // uno::XInterface
@@ -1590,7 +1591,7 @@ UnoFixedTextControl::UnoFixedTextControl()
 
 ::rtl::OUString UnoFixedTextControl::GetComponentServiceName()
 {
-    return ::rtl::OUString::createFromAscii( "fixedtext" );
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fixedtext"));
 }
 
 // uno::XInterface
@@ -1721,7 +1722,7 @@ UnoGroupBoxControl::UnoGroupBoxControl()
 
 ::rtl::OUString UnoGroupBoxControl::GetComponentServiceName()
 {
-    return ::rtl::OUString::createFromAscii( "groupbox" );
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("groupbox"));
 }
 
 sal_Bool UnoGroupBoxControl::isTransparent() throw(uno::RuntimeException)
@@ -1729,75 +1730,6 @@ sal_Bool UnoGroupBoxControl::isTransparent() throw(uno::RuntimeException)
     return sal_True;
 }
 
-// MultiPage
-
-UnoMultiPageModel::UnoMultiPageModel()
-{
-    ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
-    ImplRegisterProperty( BASEPROPERTY_ENABLED );
-    ImplRegisterProperty( BASEPROPERTY_FONTDESCRIPTOR );
-    ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
-    ImplRegisterProperty( BASEPROPERTY_HELPURL );
-    ImplRegisterProperty( BASEPROPERTY_LABEL );
-    ImplRegisterProperty( BASEPROPERTY_PRINTABLE );
-    ImplRegisterProperty( BASEPROPERTY_PROGRESSVALUE );
-    ImplRegisterProperty( BASEPROPERTY_PROGRESSVALUE_MAX );
-}
-
-::rtl::OUString UnoMultiPageModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
-{
-    return ::rtl::OUString::createFromAscii( szServiceName_UnoMultiPageModel );
-}
-
-uno::Any UnoMultiPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
-{
-    if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
-    {
-        uno::Any aAny;
-        aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoControlGroupBox );
-        //aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoMultiPageControl );
-        return aAny;
-    }
-    return UnoControlModel::ImplGetDefaultValue( nPropId );
-}
-
-::cppu::IPropertyArrayHelper& UnoMultiPageModel::getInfoHelper()
-{
-    static UnoPropertyArrayHelper* pHelper = NULL;
-    if ( !pHelper )
-    {
-        uno::Sequence<sal_Int32>    aIDs = ImplGetPropertyIds();
-        pHelper = new UnoPropertyArrayHelper( aIDs );
-    }
-    return *pHelper;
-}
-
-// beans::XMultiPropertySet
-uno::Reference< beans::XPropertySetInfo > UnoMultiPageModel::getPropertySetInfo(  ) throw(uno::RuntimeException)
-{
-    static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
-    return xInfo;
-}
-
-//  ----------------------------------------------------
-//  class MultiPageControl
-//  ----------------------------------------------------
-UnoMultiPageControl::UnoMultiPageControl()
-{
-    maComponentInfos.nWidth = 100;
-    maComponentInfos.nHeight = 100;
-}
-
-::rtl::OUString UnoMultiPageControl::GetComponentServiceName()
-{
-    return ::rtl::OUString::createFromAscii( "multipage" );
-}
-
-sal_Bool UnoMultiPageControl::isTransparent() throw(uno::RuntimeException)
-{
-    return sal_True;
-}
-
 // =====================================================================================================================
 // = UnoControlListBoxModel_Data
 // =====================================================================================================================
@@ -2355,7 +2287,7 @@ UnoListBoxControl::UnoListBoxControl()
 
 ::rtl::OUString UnoListBoxControl::GetComponentServiceName()
 {
-    return ::rtl::OUString::createFromAscii( "listbox" );
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("listbox"));
 }
 IMPL_SERVICEINFO_DERIVED( UnoListBoxControl, UnoControlBase, szServiceName2_UnoControlListBox )
 
@@ -2861,7 +2793,7 @@ IMPL_SERVICEINFO_DERIVED( UnoComboBoxControl, UnoEditControl, szServiceName2_Uno
 
 ::rtl::OUString UnoComboBoxControl::GetComponentServiceName()
 {
-    return ::rtl::OUString::createFromAscii( "combobox" );
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("combobox"));
 }
 
 void UnoComboBoxControl::dispose() throw(uno::RuntimeException)
@@ -3314,7 +3246,7 @@ UnoDateFieldControl::UnoDateFieldControl()
 
 ::rtl::OUString UnoDateFieldControl::GetComponentServiceName()
 {
-    return ::rtl::OUString::createFromAscii( "datefield" );
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("datefield"));
 }
 
 // uno::XInterface
@@ -3553,7 +3485,7 @@ UnoTimeFieldControl::UnoTimeFieldControl()
 
 ::rtl::OUString UnoTimeFieldControl::GetComponentServiceName()
 {
-    return ::rtl::OUString::createFromAscii( "timefield" );
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("timefield"));
 }
 
 // uno::XInterface
@@ -3752,7 +3684,7 @@ UnoNumericFieldControl::UnoNumericFieldControl()
 
 ::rtl::OUString UnoNumericFieldControl::GetComponentServiceName()
 {
-    return ::rtl::OUString::createFromAscii( "numericfield" );
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("numericfield"));
 }
 
 // uno::XInterface
@@ -3952,7 +3884,7 @@ UnoCurrencyFieldControl::UnoCurrencyFieldControl()
 
 ::rtl::OUString UnoCurrencyFieldControl::GetComponentServiceName()
 {
-    return ::rtl::OUString::createFromAscii( "longcurrencyfield" );
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("longcurrencyfield"));
 }
 
 // uno::XInterface
@@ -4143,7 +4075,7 @@ UnoPatternFieldControl::UnoPatternFieldControl()
 
 ::rtl::OUString UnoPatternFieldControl::GetComponentServiceName()
 {
-    return ::rtl::OUString::createFromAscii( "patternfield" );
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("patternfield"));
 }
 
 void UnoPatternFieldControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, const uno::Any& rVal )
@@ -4288,7 +4220,7 @@ UnoProgressBarControl::UnoProgressBarControl()
 
 ::rtl::OUString UnoProgressBarControl::GetComponentServiceName()
 {
-    return ::rtl::OUString::createFromAscii( "ProgressBar" );
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ProgressBar"));
 }
 
 // uno::XInterface
@@ -4417,7 +4349,7 @@ UnoFixedLineControl::UnoFixedLineControl()
 
 ::rtl::OUString UnoFixedLineControl::GetComponentServiceName()
 {
-    return ::rtl::OUString::createFromAscii( "FixedLine" );
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FixedLine"));
 }
 
 sal_Bool UnoFixedLineControl::isTransparent() throw(uno::RuntimeException)
diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx
index f172e4791c51..0848e5a2df08 100644
--- a/toolkit/source/helper/accessibilityclient.cxx
+++ b/toolkit/source/helper/accessibilityclient.cxx
@@ -205,14 +205,14 @@ namespace toolkit
             // load the library implementing the factory
             if ( !s_pFactory.get() )
             {
-                const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii(
-                    SVLIBRARY( "acc" )
+                const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(
+                    SVLIBRARY( "acc" ))
                 );
                 s_hAccessibleImplementationModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, 0 );
                 if ( s_hAccessibleImplementationModule != NULL )
                 {
                     const ::rtl::OUString sFactoryCreationFunc =
-                        ::rtl::OUString::createFromAscii( "getStandardAccessibleFactory" );
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getStandardAccessibleFactory"));
                     s_pAccessibleFactoryFunc = (GetStandardAccComponentFactory)
                         osl_getFunctionSymbol( s_hAccessibleImplementationModule, sFactoryCreationFunc.pData );
 
diff --git a/toolkit/source/helper/listenermultiplexer.cxx b/toolkit/source/helper/listenermultiplexer.cxx
index 1e75709f188f..f8011846aa3c 100644
--- a/toolkit/source/helper/listenermultiplexer.cxx
+++ b/toolkit/source/helper/listenermultiplexer.cxx
@@ -154,6 +154,21 @@ IMPL_LISTENERMULTIPLEXER_BASEMETHODS( ItemListenerMultiplexer, ::com::sun::star:
 IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ItemListenerMultiplexer, ::com::sun::star::awt::XItemListener, itemStateChanged, ::com::sun::star::awt::ItemEvent )
 
 //  ----------------------------------------------------
+//  class TabListenerMultiplexer
+//  ----------------------------------------------------
+IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TabListenerMultiplexer, ::com::sun::star::awt::XTabListener )
+void TabListenerMultiplexer::inserted( sal_Int32 evt ) throw(::com::sun::star::uno::RuntimeException)
+IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_1PARAM( TabListenerMultiplexer, ::com::sun::star::awt::XTabListener, inserted, ::sal_Int32 )
+void TabListenerMultiplexer::removed( sal_Int32 evt ) throw(::com::sun::star::uno::RuntimeException)
+IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_1PARAM( TabListenerMultiplexer, ::com::sun::star::awt::XTabListener, removed, ::sal_Int32 )
+void TabListenerMultiplexer::changed( sal_Int32 evt, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& evt2 ) throw(::com::sun::star::uno::RuntimeException)
+IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_2PARAM( TabListenerMultiplexer, ::com::sun::star::awt::XTabListener, changed, ::sal_Int32, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > )
+void TabListenerMultiplexer::activated( sal_Int32 evt ) throw(::com::sun::star::uno::RuntimeException)
+IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_1PARAM( TabListenerMultiplexer, ::com::sun::star::awt::XTabListener, activated, ::sal_Int32 )
+void TabListenerMultiplexer::deactivated( sal_Int32 evt ) throw(::com::sun::star::uno::RuntimeException)
+IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_1PARAM( TabListenerMultiplexer, ::com::sun::star::awt::XTabListener, deactivated, ::sal_Int32 )
+
+//  ----------------------------------------------------
 //  class ContainerListenerMultiplexer
 //  ----------------------------------------------------
 IMPL_LISTENERMULTIPLEXER_BASEMETHODS( ContainerListenerMultiplexer, ::com::sun::star::container::XContainerListener )
diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx
index 9e49ed6bd316..f3479bfde424 100644
--- a/toolkit/source/helper/property.cxx
+++ b/toolkit/source/helper/property.cxx
@@ -56,6 +56,7 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/resource/XStringResourceResolver.hpp>
+#include <com/sun/star/container/XNameContainer.hpp>
 #include <comphelper/types.hxx>
 #include <functional>
 #include <algorithm>
@@ -289,7 +290,9 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount )
             DECL_PROP_3     ( "EvenRowBackgroundColor", GRID_EVEN_ROW_BACKGROUND, sal_Int32,      BOUND, MAYBEDEFAULT, MAYBEVOID ),
             DECL_PROP_3     ( "HeaderBackgroundColor",  GRID_HEADER_BACKGROUND,  sal_Int32,      BOUND, MAYBEDEFAULT, MAYBEVOID ),
             DECL_PROP_3     ( "GridLineColor",          GRID_LINE_COLOR,         sal_Int32,      BOUND, MAYBEDEFAULT, MAYBEVOID ),
-            DECL_PROP_3     ( "RowBackgroundColor",     GRID_ROW_BACKGROUND,     sal_Int32,      BOUND, MAYBEDEFAULT, MAYBEVOID )
+            DECL_PROP_3     ( "RowBackgroundColor",     GRID_ROW_BACKGROUND,     sal_Int32,      BOUND, MAYBEDEFAULT, MAYBEVOID ),
+            DECL_DEP_PROP_3 ( "MultiPageValue",          MULTIPAGEVALUE,      sal_Int32,          BOUND, MAYBEDEFAULT, MAYBEVOID ),
+            DECL_PROP_3     ( "AllDialogChildren",                USERFORMCONTAINEES,                Reference< ::com::sun::star::container::XNameContainer >,           BOUND, MAYBEDEFAULT, MAYBEVOID ),
     };
             pPropertyInfos = aImplPropertyInfos;
             nElements = sizeof( aImplPropertyInfos ) / sizeof( ImplPropertyInfo );
diff --git a/toolkit/source/helper/registerservices.cxx b/toolkit/source/helper/registerservices.cxx
index 95d91c2d96ab..7fbe410df046 100644
--- a/toolkit/source/helper/registerservices.cxx
+++ b/toolkit/source/helper/registerservices.cxx
@@ -167,6 +167,8 @@ IMPL_CREATEINSTANCE( UnoControlProgressBarModel )
 IMPL_CREATEINSTANCE( UnoControlScrollBarModel )
 IMPL_CREATEINSTANCE( UnoSpinButtonModel )
 IMPL_CREATEINSTANCE( UnoMultiPageModel )
+IMPL_CREATEINSTANCE( UnoPageModel )
+IMPL_CREATEINSTANCE( UnoFrameModel )
 IMPL_CREATEINSTANCE( UnoControlFixedLineModel )
 IMPL_CREATEINSTANCE( UnoCurrencyFieldControl )
 IMPL_CREATEINSTANCE( UnoDateFieldControl )
@@ -187,6 +189,8 @@ IMPL_CREATEINSTANCE( UnoProgressBarControl )
 IMPL_CREATEINSTANCE( UnoScrollBarControl )
 IMPL_CREATEINSTANCE( UnoSpinButtonControl )
 IMPL_CREATEINSTANCE( UnoMultiPageControl )
+IMPL_CREATEINSTANCE( UnoPageControl )
+IMPL_CREATEINSTANCE( UnoFrameControl )
 IMPL_CREATEINSTANCE( UnoFixedLineControl )
 IMPL_CREATEINSTANCE( VCLXMenuBar )
 IMPL_CREATEINSTANCE( VCLXPointer )
@@ -281,6 +285,10 @@ TOOLKIT_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo( void* _pServiceManager,
         registerServices( xRegistryKey, "UnoSpinButtonControl", szServiceName_UnoSpinButtonControl );
         registerServices( xRegistryKey, "UnoMultiPageModel", szServiceName_UnoMultiPageModel );
         registerServices( xRegistryKey, "UnoMultiPageControl", szServiceName_UnoMultiPageControl );
+        registerServices( xRegistryKey, "UnoPageModel", szServiceName_UnoPageModel );
+        registerServices( xRegistryKey, "UnoPageControl", szServiceName_UnoPageControl );
+        registerServices( xRegistryKey, "UnoFrameModel", szServiceName_UnoFrameModel );
+        registerServices( xRegistryKey, "UnoFrameControl", szServiceName_UnoFrameControl );
         registerServices( xRegistryKey, "UnoFixedLineControl", szServiceName_UnoControlFixedLine, szServiceName2_UnoControlFixedLine );
         registerServices( xRegistryKey, "UnoControlFixedLineModel", szServiceName_UnoControlFixedLineModel, szServiceName2_UnoControlFixedLineModel );
         registerServices( xRegistryKey, "VCLXPrinterServer", szServiceName_PrinterServer, szServiceName2_PrinterServer );
@@ -317,7 +325,6 @@ TOOLKIT_DLLPUBLIC void* SAL_CALL component_getFactory( const sal_Char* sImplemen
     {
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory =
             static_cast< ::com::sun::star::lang::XMultiServiceFactory* >( _pServiceManager );
-
         CHECKANDCREATEFACTORY( VCLXToolkit, szServiceName_Toolkit, szServiceName2_Toolkit )
         CHECKANDCREATEFACTORY( VCLXPopupMenu, szServiceName_PopupMenu, szServiceName2_PopupMenu )
         CHECKANDCREATEFACTORY( VCLXMenuBar, szServiceName_MenuBar, szServiceName2_MenuBar )
@@ -373,6 +380,10 @@ TOOLKIT_DLLPUBLIC void* SAL_CALL component_getFactory( const sal_Char* sImplemen
         CHECKANDCREATEFACTORY( UnoControlRoadmapModel, szServiceName_UnoControlRoadmapModel, szServiceName2_UnoControlRoadmapModel )
         CHECKANDCREATEFACTORY( UnoMultiPageModel, szServiceName_UnoMultiPageModel, NULL )
         CHECKANDCREATEFACTORY( UnoMultiPageControl, szServiceName_UnoMultiPageControl, NULL )
+        CHECKANDCREATEFACTORY( UnoPageModel, szServiceName_UnoPageModel, NULL )
+        CHECKANDCREATEFACTORY( UnoPageControl, szServiceName_UnoPageControl, NULL )
+        CHECKANDCREATEFACTORY( UnoFrameModel, szServiceName_UnoFrameModel, NULL )
+        CHECKANDCREATEFACTORY( UnoFrameControl, szServiceName_UnoFrameControl, NULL )
         CHECKANDCREATEFACTORY( UnoSpinButtonModel, szServiceName_UnoSpinButtonModel, NULL )
         CHECKANDCREATEFACTORY( UnoSpinButtonControl, szServiceName_UnoSpinButtonControl, NULL )
         CHECKANDCREATEFACTORY( TreeControl, szServiceName_TreeControl, NULL )
diff --git a/toolkit/source/helper/servicenames.cxx b/toolkit/source/helper/servicenames.cxx
index 1a310d1d12df..19083a3ce4c1 100644
--- a/toolkit/source/helper/servicenames.cxx
+++ b/toolkit/source/helper/servicenames.cxx
@@ -93,6 +93,10 @@ const sal_Char __FAR_DATA szServiceName_UnoSpinButtonControl[] = "com.sun.star.a
 const sal_Char __FAR_DATA szServiceName_UnoSpinButtonModel[] = "com.sun.star.awt.UnoControlSpinButtonModel";
 const sal_Char __FAR_DATA szServiceName_UnoMultiPageControl[] = "com.sun.star.awt.UnoControlMultiPage";
 const sal_Char __FAR_DATA szServiceName_UnoMultiPageModel[] = "com.sun.star.awt.UnoMultiPageModel";
+const sal_Char __FAR_DATA szServiceName_UnoPageControl[] = "com.sun.star.awt.UnoControlPage";
+const sal_Char __FAR_DATA szServiceName_UnoPageModel[] = "com.sun.star.awt.UnoPageModel";
+const sal_Char __FAR_DATA szServiceName_UnoFrameControl[] = "com.sun.star.awt.UnoControlFrame";
+const sal_Char __FAR_DATA szServiceName_UnoFrameModel[] = "com.sun.star.awt.UnoFrameModel";
 const sal_Char __FAR_DATA szServiceName_TreeControl[] = "com.sun.star.awt.tree.TreeControl";
 const sal_Char __FAR_DATA szServiceName_TreeControlModel[] = "com.sun.star.awt.tree.TreeControlModel";
 const sal_Char __FAR_DATA szServiceName_MutableTreeDataModel[] = "com.sun.star.awt.tree.MutableTreeDataModel";
diff --git a/toolkit/source/helper/throbberimpl.cxx b/toolkit/source/helper/throbberimpl.cxx
index 509407d3ff66..d11a13661148 100644
--- a/toolkit/source/helper/throbberimpl.cxx
+++ b/toolkit/source/helper/throbberimpl.cxx
@@ -41,7 +41,6 @@ namespace toolkit
     Throbber_Impl::Throbber_Impl( uno::Reference< VCLXWindow > xParent,
                                   sal_Int32 nStepTime,
                                   sal_Bool bRepeat )
-        :mrMutex( Application::GetSolarMutex() )
     {
         mxParent = xParent;
         mbRepeat = bRepeat;
@@ -60,7 +59,7 @@ namespace toolkit
     //--------------------------------------------------------------------
     void Throbber_Impl::start() throw ( uno::RuntimeException )
     {
-        ::osl::SolarGuard aGuard( GetMutex() );
+        SolarMutexGuard aGuard;
 
         mnCurStep = 0;
         maWaitTimer.Start();
@@ -69,7 +68,7 @@ namespace toolkit
     //--------------------------------------------------------------------
     void Throbber_Impl::stop() throw ( uno::RuntimeException )
     {
-        ::osl::SolarGuard aGuard( GetMutex() );
+        SolarMutexGuard aGuard;
 
         maWaitTimer.Stop();
     }
@@ -78,7 +77,7 @@ namespace toolkit
     void Throbber_Impl::setImageList( const uno::Sequence< uno::Reference< graphic::XGraphic > >& rImageList )
         throw ( uno::RuntimeException )
     {
-        ::osl::SolarGuard aGuard( GetMutex() );
+        SolarMutexGuard aGuard;
 
         maImageList = rImageList;
 
@@ -102,21 +101,10 @@ namespace toolkit
             pImage->SetImage( maImageList[ 0 ] );
     }
 
-    //--------------------------------------------------------------------
-    sal_Bool Throbber_Impl::isHCMode()
-        throw ( uno::RuntimeException )
-    {
-        FixedImage* pImage = static_cast< FixedImage* >( mxParent->GetWindow() );
-        if ( pImage )
-            return pImage->GetSettings().GetStyleSettings().GetHighContrastMode();
-        else
-            return Application::GetSettings().GetStyleSettings().GetHighContrastMode();
-    }
-
     // -----------------------------------------------------------------------
     IMPL_LINK( Throbber_Impl, TimeOutHdl, Throbber_Impl*, EMPTYARG )
     {
-        ::osl::SolarGuard aGuard( GetMutex() );
+        SolarMutexGuard aGuard;
 
         FixedImage* pImage = static_cast< FixedImage* >( mxParent->GetWindow() );
 
diff --git a/toolkit/source/helper/unopropertyarrayhelper.cxx b/toolkit/source/helper/unopropertyarrayhelper.cxx
index f17fab4e9e58..c21cf581464d 100644
--- a/toolkit/source/helper/unopropertyarrayhelper.cxx
+++ b/toolkit/source/helper/unopropertyarrayhelper.cxx
@@ -47,7 +47,7 @@ UnoPropertyArrayHelper::UnoPropertyArrayHelper( const ::com::sun::star::uno::Seq
 UnoPropertyArrayHelper::UnoPropertyArrayHelper( const std::list< sal_uInt16 > &rIDs )
 {
     std::list< sal_uInt16 >::const_iterator iter;
-    for( iter = rIDs.begin(); iter != rIDs.end(); iter++)
+    for( iter = rIDs.begin(); iter != rIDs.end(); ++iter)
       maIDs.Insert( *iter, (void*)1L);
 }
 
diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index cee3427f3866..8e37dc74e889 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -39,6 +39,7 @@
 #include <toolkit/awt/vclxcontainer.hxx>
 #include <toolkit/awt/vclxtopwindow.hxx>
 #include <toolkit/awt/vclxgraphics.hxx>
+#include <awt/vclxtabcontrol.hxx>
 
 #include "toolkit/dllapi.h"
 #include <vcl/svapp.hxx>
@@ -108,6 +109,7 @@ using namespace ::com::sun::star;
         case WINDOW_TABPAGE:        return new VCLXContainer;
 
         case WINDOW_TOOLBOX:        return new VCLXToolBox;
+        case WINDOW_TABCONTROL:     return new VCLXMultiPage;
 
         // case WINDOW_FIXEDLINE:
         // case WINDOW_FIXEDBITMAP:
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index 5bdd975803f1..3f9d142dd6b6 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -639,7 +639,7 @@ MapUnit /* MapModeUnit */ VCLUnoHelper::ConvertToMapModeUnit(sal_Int16 /* com.su
 */
 
     default:
-        throw ::com::sun::star::lang::IllegalArgumentException(::rtl::OUString::createFromAscii("Unsupported measure unit."), NULL, 1 );
+        throw ::com::sun::star::lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unsupported measure unit.")), NULL, 1 );
     }
     return eMode;
 }
@@ -709,7 +709,7 @@ sal_Int16 /* com.sun.star.util.MeasureUnit.* */ VCLUnoHelper::ConvertToMeasureme
         break;
 */
     default:
-        throw ::com::sun::star::lang::IllegalArgumentException(::rtl::OUString::createFromAscii("Unsupported MapMode unit."), NULL, 1 );
+        throw ::com::sun::star::lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unsupported MapMode unit.")), NULL, 1 );
     }
     return nMeasureUnit;
 }
diff --git a/toolkit/source/layout/core/factory.cxx b/toolkit/source/layout/core/factory.cxx
index 2e1c7012b8e0..ff52c3d14446 100644
--- a/toolkit/source/layout/core/factory.cxx
+++ b/toolkit/source/layout/core/factory.cxx
@@ -88,14 +88,14 @@ sal_Bool SAL_CALL comp_Layout_component_writeInfo( void * /*serviceManager*/, vo
 // Component registration
 ::rtl::OUString SAL_CALL LayoutFactory::impl_staticGetImplementationName()
 {
-    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.awt.Layout" );
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.awt.Layout"));
 }
 
 uno::Sequence< ::rtl::OUString > SAL_CALL LayoutFactory::impl_staticGetSupportedServiceNames()
 {
     uno::Sequence< ::rtl::OUString > aRet(2);
-    aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.awt.Layout");
-    aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.comp.awt.Layout");
+    aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Layout"));
+    aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.awt.Layout"));
     return aRet;
 }
 
diff --git a/toolkit/source/layout/core/flow.cxx b/toolkit/source/layout/core/flow.cxx
index 8b57ca04f33c..ee3ffe15f6d1 100644
--- a/toolkit/source/layout/core/flow.cxx
+++ b/toolkit/source/layout/core/flow.cxx
@@ -79,7 +79,7 @@ Flow::removeChild( const css::uno::Reference< css::awt::XLayoutConstrains >& xCh
     throw (css::uno::RuntimeException)
 {
     for ( std::list< ChildData * >::iterator it = maChildren.begin();
-          it != maChildren.end(); it++ )
+          it != maChildren.end(); ++it )
     {
         if ( (*it)->xChild == xChild )
         {
@@ -100,7 +100,7 @@ Flow::getChildren()
     uno::Sequence< uno::Reference< awt::XLayoutConstrains > > children( maChildren.size() );
     unsigned int i = 0;
     for ( std::list< ChildData * >::iterator it = maChildren.begin();
-          it != maChildren.end(); it++, i++ )
+          it != maChildren.end(); ++it, ++i )
         children[i] = (*it)->xChild;
 
     return children;
@@ -121,7 +121,7 @@ Flow::calculateSize( long nMaxWidth )
     std::list<ChildData *>::const_iterator it;
     mnEachWidth = 0;
     // first pass, for homogeneous property
-    for (it = maChildren.begin(); it != maChildren.end(); it++)
+    for (it = maChildren.begin(); it != maChildren.end(); ++it)
     {
         if ( !(*it)->isVisible() )
             continue;
@@ -131,7 +131,7 @@ Flow::calculateSize( long nMaxWidth )
     }
 
     long nRowWidth = 0, nRowHeight = 0;
-    for (it = maChildren.begin(); it != maChildren.end(); it++)
+    for (it = maChildren.begin(); it != maChildren.end(); ++it)
     {
         if ( !(*it)->isVisible() )
             continue;
@@ -182,7 +182,7 @@ Flow::allocateArea( const css::awt::Rectangle &rArea )
 
     std::list<ChildData *>::const_iterator it;
     long nX = 0, nY = 0, nRowHeight = 0;
-    for (it = maChildren.begin(); it != maChildren.end(); it++)
+    for (it = maChildren.begin(); it != maChildren.end(); ++it)
     {
         ChildData *child = *it;
         if ( !child->isVisible() )
diff --git a/toolkit/source/layout/core/helper.cxx b/toolkit/source/layout/core/helper.cxx
index 1434054d8cf9..99957e955459 100644
--- a/toolkit/source/layout/core/helper.cxx
+++ b/toolkit/source/layout/core/helper.cxx
@@ -139,7 +139,7 @@ uno::Reference <awt::XLayoutConstrains> WidgetFactory::toolkitCreateWidget (uno:
         VCLXWindow* parentComponent = VCLXWindow::GetImplementation( xWinParent );
         if ( !parentComponent )
             throw uno::RuntimeException(
-                OUString::createFromAscii( "parent has no implementation" ),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("parent has no implementation")),
                 uno::Reference< uno::XInterface >() );
         desc.Parent = xWinParent;
     }
@@ -192,7 +192,7 @@ WidgetFactory::createWidget (uno::Reference< awt::XToolkit > xToolkit, uno::Refe
     OUString tName = name;
     // FIXME
     if ( name.equalsAscii( "fixedinfo" ) )
-        tName = OUString::createFromAscii( "fixedtext" );
+        tName = OUString(RTL_CONSTASCII_USTRINGPARAM("fixedtext"));
     xPeer = toolkitCreateWidget (xToolkit, xParent, tName, properties);
 #else
     xPeer = toolkitCreateWidget (xToolkit, xParent, name, properties);
diff --git a/toolkit/source/layout/core/import.cxx b/toolkit/source/layout/core/import.cxx
index b4fbacc02243..94291b54a18f 100644
--- a/toolkit/source/layout/core/import.cxx
+++ b/toolkit/source/layout/core/import.cxx
@@ -129,7 +129,7 @@ SAL_THROW (())
     if ( xRadio.is() )
     {
         if (!bSetRadioGroup)
-            aRadioGroup = OUString::createFromAscii ("default");
+            aRadioGroup = OUString(RTL_CONSTASCII_USTRINGPARAM ("default"));
         pImport->mxRadioGroups.addItem( aRadioGroup, xRadio );
     }
 }
@@ -174,9 +174,9 @@ WidgetElement::characters( OUString const& rChars )
         if ( xDialog.is() )
             xDialog->setTitle( rChars );
         else if ( xButton.is() )
-            mpWidget->setProperty( OUString::createFromAscii( "label" ), rChars );
+            mpWidget->setProperty( OUString(RTL_CONSTASCII_USTRINGPARAM("label")), rChars );
         else
-            mpWidget->setProperty( OUString::createFromAscii( "text" ), rChars );
+            mpWidget->setProperty( OUString(RTL_CONSTASCII_USTRINGPARAM("text")), rChars );
     }
 }
 // ---- ElementBase ----
diff --git a/toolkit/source/layout/core/localized-string.cxx b/toolkit/source/layout/core/localized-string.cxx
index 35384f641101..e555817cef54 100644
--- a/toolkit/source/layout/core/localized-string.cxx
+++ b/toolkit/source/layout/core/localized-string.cxx
@@ -30,6 +30,7 @@
 
 #include <toolkit/helper/property.hxx>
 #include <vcl/window.hxx>
+#include <vcl/svapp.hxx>
 
 namespace layoutimpl
 {
@@ -61,7 +62,7 @@ uno::Any LocalizedString::queryInterface( uno::Type const& rType )
 void LocalizedString::setText( OUString const& s )
     throw(uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( Window *w = GetWindow() )
         return w->SetText( s );
@@ -70,7 +71,7 @@ void LocalizedString::setText( OUString const& s )
 OUString LocalizedString::getText()
     throw(uno::RuntimeException)
 {
-    ::osl::SolarGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     if ( Window *w = GetWindow() )
         return w->GetText();
diff --git a/toolkit/source/layout/core/proplist.cxx b/toolkit/source/layout/core/proplist.cxx
index 24c9bc471833..f04350d01362 100644
--- a/toolkit/source/layout/core/proplist.cxx
+++ b/toolkit/source/layout/core/proplist.cxx
@@ -376,7 +376,7 @@ findAndRemove( const char *pAttr, PropList &rProps, OUString &rValue )
     for ( it = rProps.begin(); it != rProps.end(); it++ )
     {
         if ( it->first.equalsIgnoreAsciiCase( aName )
-             || it->first.equalsIgnoreAsciiCase( OUString::createFromAscii ("_") + aName ) )
+             || it->first.equalsIgnoreAsciiCase( OUString(RTL_CONSTASCII_USTRINGPARAM ("_")) + aName ) )
         {
             rValue = it->second;
             rProps.erase( it );
diff --git a/toolkit/source/layout/core/root.cxx b/toolkit/source/layout/core/root.cxx
index f5b96d94d5ae..f5d52b7918e5 100644
--- a/toolkit/source/layout/core/root.cxx
+++ b/toolkit/source/layout/core/root.cxx
@@ -80,7 +80,7 @@ LayoutRoot::~LayoutRoot()
 void ShowMessageBox( uno::Reference< lang::XMultiServiceFactory > const& xFactory, uno::Reference< awt::XToolkit > xToolkit, OUString const& aTitle, OUString const& aMessage )
 {
     uno::Reference< uno::XInterface > iDesktop = xFactory->createInstance
-        ( OUString::createFromAscii( "com.sun.star.frame.Desktop" ) );
+        ( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) );
     uno::Reference< frame::XDesktop > xDesktop ( iDesktop, uno::UNO_QUERY );
     uno::Reference< frame::XFrame > xFrame ( xDesktop->getCurrentFrame() );
     uno::Reference< awt::XWindow > xContainerWindow( xFrame->getContainerWindow() );
@@ -90,7 +90,7 @@ void ShowMessageBox( uno::Reference< lang::XMultiServiceFactory > const& xFactor
     awt::Rectangle aRectangle;
     uno::Reference< awt::XMessageBox > xMessageBox
         = xMessageBoxFactory->createMessageBox
-        ( xWindowPeer, aRectangle, OUString::createFromAscii( "errorbox" ),
+        ( xWindowPeer, aRectangle, OUString(RTL_CONSTASCII_USTRINGPARAM("errorbox")),
           awt::MessageBoxButtons::BUTTONS_OK, aTitle, aMessage );
 
     if ( xMessageBox.is() )
@@ -104,7 +104,7 @@ void LayoutRoot::error( OUString const& message )
 {
     OSL_TRACE( "%s\n", OUSTRING_CSTR( message ) );
     ShowMessageBox( mxFactory, mxToolkit,
-                    OUString::createFromAscii( "Fatal error" ),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("Fatal error")),
                     message );
     throw uno::RuntimeException( message, uno::Reference< uno::XInterface >() );
 }
@@ -133,13 +133,13 @@ void SAL_CALL LayoutRoot::initialize( const uno::Sequence< uno::Any >& aArgument
 
     uno::Reference< xml::sax::XParser > xParser
         ( mxFactory->createInstance(
-            OUString::createFromAscii( "com.sun.star.xml.sax.Parser" ) ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) ),
           uno::UNO_QUERY );
     OSL_ASSERT( xParser.is() );
     if (! xParser.is())
     {
         throw uno::RuntimeException(
-            OUString::createFromAscii( "cannot create sax-parser component" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("cannot create sax-parser component")),
             uno::Reference< uno::XInterface >() );
     }
 
@@ -148,18 +148,18 @@ void SAL_CALL LayoutRoot::initialize( const uno::Sequence< uno::Any >& aArgument
 
     mxToolkit = uno::Reference< awt::XToolkit >(
         mxFactory->createInstance(
-            OUString::createFromAscii( "com.sun.star.awt.Toolkit" ) ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Toolkit")) ),
         uno::UNO_QUERY );
 
     if ( !mxToolkit.is() )
         throw uno::RuntimeException(
-            OUString::createFromAscii( "failed to create toolkit!" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("failed to create toolkit!")),
             uno::Reference< uno::XInterface >() );
 
     OUString aXMLFile = readRightTranslation( aXMLName );
     uno::Reference< io::XInputStream > xStream = getFileAsStream( aXMLFile );
     if (! xStream.is() )
-        error( OUString::createFromAscii( "Installation problem: cannot find XML file:" ) + aXMLName );
+        error( OUString(RTL_CONSTASCII_USTRINGPARAM("Installation problem: cannot find XML file:")) + aXMLName );
 
     // error handler, entity resolver omitted
 
@@ -170,17 +170,17 @@ void SAL_CALL LayoutRoot::initialize( const uno::Sequence< uno::Any >& aArgument
     aArgs[0] <<= xRoot;
     uno::Reference< xml::sax::XDocumentHandler > xDocHandler
         (mxFactory->createInstanceWithArguments
-         ( OUString::createFromAscii( "com.sun.star.xml.input.SaxDocumentHandler" ),
+         ( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.input.SaxDocumentHandler")),
           aArgs ), uno::UNO_QUERY );
 
     if (! xDocHandler.is() )
-        error( OUString::createFromAscii( "cannot find SAx handler for document type of:") + aXMLName );
+        error( OUString(RTL_CONSTASCII_USTRINGPARAM("cannot find SAx handler for document type of:")) + aXMLName );
 
     xParser->setDocumentHandler( xDocHandler );
 
     xml::sax::InputSource source;
     source.aInputStream = xStream;
-    source.sSystemId = OUString::createFromAscii( "virtual file" );
+    source.sSystemId = OUString(RTL_CONSTASCII_USTRINGPARAM("virtual file"));
 
     try
     {
@@ -188,11 +188,11 @@ void SAL_CALL LayoutRoot::initialize( const uno::Sequence< uno::Any >& aArgument
     }
     catch ( xml::sax::SAXParseException& e )
     {
-        OUString c = OUString::createFromAscii( ":" );
+        OUString c(RTL_CONSTASCII_USTRINGPARAM(":"));
         error( aXMLName
                + c + OUString::valueOf( e.LineNumber )
                + c + OUString::valueOf( e.ColumnNumber )
-               + c + OUString::createFromAscii( "Sax parse error" ) );
+               + c + OUString(RTL_CONSTASCII_USTRINGPARAM("Sax parse error")) );
     }
 }
 
diff --git a/toolkit/source/layout/core/table.cxx b/toolkit/source/layout/core/table.cxx
index b990a88f38f0..53faefff1271 100644
--- a/toolkit/source/layout/core/table.cxx
+++ b/toolkit/source/layout/core/table.cxx
@@ -125,7 +125,7 @@ Table::getMinimumSize() throw( uno::RuntimeException )
         int col = 0;
         int row = 0;
         for ( std::list<Box_Base::ChildData *>::iterator it
-                  = maChildren.begin(); it != maChildren.end(); it++ )
+                  = maChildren.begin(); it != maChildren.end(); ++it )
         {
             ChildData *child = static_cast<Table::ChildData*> ( *it );
             if ( !child->isVisible() )
@@ -172,7 +172,7 @@ Table::getMinimumSize() throw( uno::RuntimeException )
 
         // 2.1 base sizes on one-column/row children
         for ( std::list<Box_Base::ChildData *>::iterator it
-                  = maChildren.begin(); it != maChildren.end(); it++ )
+                  = maChildren.begin(); it != maChildren.end(); ++it )
         {
             ChildData *child = static_cast<Table::ChildData*> ( *it );
             if ( !child->isVisible() )
@@ -195,7 +195,7 @@ Table::getMinimumSize() throw( uno::RuntimeException )
 
         // 2.2 make sure multiple-columns/rows children fit
         for ( std::list<Box_Base::ChildData *>::iterator it
-                  = maChildren.begin(); it != maChildren.end(); it++ )
+                  = maChildren.begin(); it != maChildren.end(); ++it )
         {
             ChildData *child = static_cast<Table::ChildData*> ( *it );
             if ( !child->isVisible() )
@@ -237,14 +237,14 @@ Table::getMinimumSize() throw( uno::RuntimeException )
     mnColExpandables =( mnRowExpandables = 0 );
     maRequisition.Width =( maRequisition.Height = 0 );
     for ( std::vector<GroupData>::iterator it = maCols.begin();
-          it != maCols.end(); it++ )
+          it != maCols.end(); ++it )
     {
         maRequisition.Width += it->mnSize;
         if ( it->mbExpand )
             mnColExpandables++;
     }
     for ( std::vector<GroupData>::iterator it = maRows.begin();
-          it != maRows.end(); it++ )
+          it != maRows.end(); ++it )
     {
         maRequisition.Height += it->mnSize;
         if ( it->mbExpand )
@@ -269,7 +269,7 @@ Table::allocateArea( const awt::Rectangle &rArea )
     nExtraSize[ 1 ] /= mnRowExpandables ? mnRowExpandables : maRows.size();
 
     for ( std::list<Box_Base::ChildData *>::const_iterator it
-              = maChildren.begin(); it != maChildren.end(); it++ )
+              = maChildren.begin(); it != maChildren.end(); ++it )
     {
         ChildData *child = static_cast<Table::ChildData*> ( *it );
         if ( !child->isVisible() )
diff --git a/toolkit/source/layout/core/timer.cxx b/toolkit/source/layout/core/timer.cxx
index 18be0e19a122..279c0ea7f172 100644
--- a/toolkit/source/layout/core/timer.cxx
+++ b/toolkit/source/layout/core/timer.cxx
@@ -70,7 +70,7 @@ public:
             if ( it != jt && isParentOf( *it, *jt ) )
                 jt = list.erase( jt );
             else
-                jt++;
+                ++jt;
         }
     }
 
@@ -98,12 +98,12 @@ public:
 
         // 1. remove duplications and children
         for ( ContainerList::iterator it = mxContainers.begin();
-             it != mxContainers.end(); it++ )
+             it != mxContainers.end(); ++it )
             eraseChildren( it, mxContainers );
 
         // 2. check damage extent
         for ( ContainerList::iterator it = mxContainers.begin();
-             it != mxContainers.end(); it++ )
+             it != mxContainers.end(); ++it )
         {
             uno::Reference< awt::XLayoutContainer > xContainer = *it;
             while ( xContainer->getParent().is() && isContainerDamaged( xContainer ) )
@@ -124,7 +124,7 @@ public:
 
         // 3. force re-calculations
         for ( ContainerList::iterator it = mxContainers.begin();
-             it != mxContainers.end(); it++ )
+             it != mxContainers.end(); ++it )
             (*it)->allocateArea( (*it)->getAllocatedArea() );
     }
 };
diff --git a/toolkit/source/layout/core/translate.cxx b/toolkit/source/layout/core/translate.cxx
index 4d35f101ae21..009c64acbb74 100644
--- a/toolkit/source/layout/core/translate.cxx
+++ b/toolkit/source/layout/core/translate.cxx
@@ -54,19 +54,19 @@ static std::list<OUString>
 getLocaleSubdirList( lang::Locale const& rLocale )
 {
     std::list<OUString> aSubdirs;
-    aSubdirs.push_front( OUString::createFromAscii( "." ) );
-    aSubdirs.push_front( OUString::createFromAscii( "en-US" ) );
+    aSubdirs.push_front( OUString(RTL_CONSTASCII_USTRINGPARAM(".")) );
+    aSubdirs.push_front( OUString(RTL_CONSTASCII_USTRINGPARAM("en-US")) );
     if ( rLocale.Language.getLength() )
         aSubdirs.push_front( rLocale.Language );
     if ( rLocale.Country.getLength() )
     {
         OUString aLocaleCountry = rLocale.Language
-            + OUString::createFromAscii( "-" )
+            + OUString(RTL_CONSTASCII_USTRINGPARAM("-"))
             + rLocale.Country;
         aSubdirs.push_front( aLocaleCountry );
         if ( rLocale.Variant.getLength() )
             aSubdirs.push_front( aLocaleCountry
-                                 + OUString::createFromAscii( "." )
+                                 + OUString(RTL_CONSTASCII_USTRINGPARAM("."))
                                  + rLocale.Variant );
     }
     return aSubdirs;
@@ -84,7 +84,7 @@ static OUString
 getFirstExisting( OUString const& aDir, std::list<OUString> const& aSubDirs,
                   OUString const& aXMLName )
 {
-    static OUString const aSlash = OUString::createFromAscii( "/" );
+    static OUString const aSlash(RTL_CONSTASCII_USTRINGPARAM("/"));
     String aResult;
     for ( std::list<OUString>::const_iterator i = aSubDirs.begin();
           i != aSubDirs.end(); i++ )
@@ -118,7 +118,7 @@ readRightTranslation( OUString const& aXMLName )
     {
         OUString aShareUrl;
         Bootstrap::locateSharedData( aShareUrl );
-        OUString aXMLUrl = aShareUrl + OUString::createFromAscii( "/layout" );
+        OUString aXMLUrl = aShareUrl + OUString(RTL_CONSTASCII_USTRINGPARAM("/layout"));
         String aXMLDir;
         LocalFileHelper::ConvertURLToPhysicalName( aXMLUrl, aXMLDir );
         aXMLFile = getFirstExisting( aXMLDir, aSubdirs, aXMLName );
diff --git a/toolkit/source/layout/vcl/wbutton.cxx b/toolkit/source/layout/vcl/wbutton.cxx
index 79d8f31bc9fa..67573eefb950 100644
--- a/toolkit/source/layout/vcl/wbutton.cxx
+++ b/toolkit/source/layout/vcl/wbutton.cxx
@@ -166,9 +166,9 @@ bool Button::SetModeImage (Image const& image)
     return getImpl().SetModeImage (image.getImpl().mxGraphic);
 }
 
-bool Button::SetModeImage (::Image const& image, BmpColorMode mode)
+bool Button::SetModeImage (::Image const& image)
 {
-    return GetButton ()->SetModeImage (image, mode);
+    return GetButton ()->SetModeImage (image);
 }
 
 void Button::SetImageAlign( ImageAlign eAlign )
@@ -507,8 +507,8 @@ public:
           // TODO: i18n
           // Button::GetStandardText( BUTTON_ADVANCED );
           // Button::GetStandardText( BUTTON_SIMPLE );
-        , mAdvancedLabel( rtl::OUString::createFromAscii( "Advanced..." ) )
-        , mSimpleLabel( rtl::OUString::createFromAscii( "Simple..." ) )
+        , mAdvancedLabel( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Advanced...")) )
+        , mSimpleLabel( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Simple...")) )
     {
     }
     void Click()
diff --git a/toolkit/source/layout/vcl/wrapper.cxx b/toolkit/source/layout/vcl/wrapper.cxx
index 3acb946f7545..f06af5f3addc 100644
--- a/toolkit/source/layout/vcl/wrapper.cxx
+++ b/toolkit/source/layout/vcl/wrapper.cxx
@@ -81,7 +81,7 @@ public:
 
         uno::Reference< lang::XSingleServiceFactory > xFactory(
             comphelper::createProcessComponent(
-                OUString::createFromAscii( "com.sun.star.awt.Layout" ) ),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Layout")) ),
             uno::UNO_QUERY );
         if ( !xFactory.is() )
         {
diff --git a/toolkit/src2xml/src.lst b/toolkit/src2xml/src.lst
index 4a5876b84a08..58316eb2b4c3 100644
--- a/toolkit/src2xml/src.lst
+++ b/toolkit/src2xml/src.lst
@@ -554,7 +554,6 @@
 ../../chart2/source/controller/dialogs/dlg_RotateDiagram.src
 ../../chart2/source/controller/dialogs/tp_PointGeometry.src
 ../../chart2/source/controller/dialogs/dlg_ObjectProperties.src
-../../chart2/source/controller/dialogs/Bitmaps_HC.src
 ../../chart2/source/controller/dialogs/tp_TitleRotation.src
 ../../chart2/source/controller/dialogs/dlg_ChartType.src
 ../../chart2/source/controller/dialogs/Bitmaps.src
diff --git a/toolkit/workben/layout/editor.cxx b/toolkit/workben/layout/editor.cxx
index f93731ab9c0a..a1f8ffde1d82 100644
--- a/toolkit/workben/layout/editor.cxx
+++ b/toolkit/workben/layout/editor.cxx
@@ -1707,7 +1707,7 @@ void EditorImpl::loadFile( const rtl::OUString &aTestFile )
 
 /*
   mxMSF->createInstance
-  ( ::rtl::OUString::createFromAscii( "com.sun.star.awt.Layout" ) ),
+  ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Layout")) ),
   uno::UNO_QUERY );
 */
     if ( !xRoot.is() )
diff --git a/toolkit/workben/layout/interactable-containers.xml b/toolkit/workben/layout/interactable-containers.xml
index fa1bbfc5ed15..afb663951d6c 100644
--- a/toolkit/workben/layout/interactable-containers.xml
+++ b/toolkit/workben/layout/interactable-containers.xml
@@ -44,6 +44,6 @@
                 <pushbutton label="Content 4" cnt:title="Page 4" />
                 <pushbutton label="Content 5" cnt:title="Page 5" />
             </tabcontrol>
-        </vscroll>
+        </vsplitter>
     </hsplitter>
 </dialog>
diff --git a/toolkit/workben/layout/number-format.xml b/toolkit/workben/layout/number-format.xml
index 6f4c61d01b3e..77460ea79ceb 100644
--- a/toolkit/workben/layout/number-format.xml
+++ b/toolkit/workben/layout/number-format.xml
@@ -10,11 +10,6 @@
             <idlist none="IID_INFO"/>
             <idcount none="3"/>
     </imagelist>
-    <imagelist prefix="nuh" id="IL_ICON_HC">
-            <maskcolor blue="0xFFFF" green="0x0000" red="0xFFFF" type="Color"/>
-            <idlist none="IID_INFO"/>
-            <idcount none="3"/>
-    </imagelist>
     !-->
     <vbox spacing="5" border="5">
     <string id="STR_EUROPE" _text="Europe"/>
diff --git a/toolkit/workben/layout/sortdlg.cxx b/toolkit/workben/layout/sortdlg.cxx
index 84b42f5a2656..51fadaa7959f 100644
--- a/toolkit/workben/layout/sortdlg.cxx
+++ b/toolkit/workben/layout/sortdlg.cxx
@@ -57,9 +57,9 @@ ScSortDlg::ScSortDlg( Window*           pParent,
     AddTabPage( TP_FIELDS,  ScTabPageSortFields::Create,  0 );
     AddTabPage( TP_OPTIONS, ScTabPageSortOptions::Create, 0 );
 #else /* !LAYOUT_SFX_TABDIALOG_BROKEN */
-    String fields = rtl::OUString::createFromAscii ("fields");
+    String fields(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("fields")));
     AddTabPage( TP_FIELDS, fields, ScTabPageSortFields::Create, 0, FALSE, TAB_APPEND);
-    String options = rtl::OUString::createFromAscii ("options");
+    String options(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("options")));
     AddTabPage( TP_OPTIONS, options, ScTabPageSortOptions::Create, 0, FALSE, TAB_APPEND);
 #endif /* !LAYOUT_SFX_TABDIALOG_BROKEN */
     FreeResource();
diff --git a/toolkit/workben/layout/sortdlg.hrc b/toolkit/workben/layout/sortdlg.hrc
index 0cecd39e8541..1b62f3f8cbac 100644
--- a/toolkit/workben/layout/sortdlg.hrc
+++ b/toolkit/workben/layout/sortdlg.hrc
@@ -33,12 +33,6 @@
                     // -> SCSTR_UNDEFINED
                     // -> SCSTR_FIELD
 
-/*
-#define RID_SCDLG_SORT          256
-#define RID_SCPAGE_SORT_FIELDS  257
-#define RID_SCPAGE_SORT_OPTIONS 258
-*/
-
 #define TP_FIELDS           1
 #define TP_OPTIONS          2
 
@@ -61,8 +55,6 @@
 #define LB_SORT_USER        2
 #define LB_OUTAREA          3
 #define ED_OUTAREA          4
-//#define FT_AREA_LABEL       5
-//#define FT_AREA             6
 #define BTN_SORT_USER       7
 #define BTN_CASESENSITIVE   8
 #define BTN_LABEL           9
@@ -77,7 +69,3 @@
 #define FT_ALGORITHM        18
 #define LB_ALGORITHM        19
 #define BTN_NATURALSORT     20
-
-
-
-
diff --git a/toolkit/workben/layout/sortdlg.src b/toolkit/workben/layout/sortdlg.src
index 5e855962af96..f9980f36002c 100644
--- a/toolkit/workben/layout/sortdlg.src
+++ b/toolkit/workben/layout/sortdlg.src
@@ -116,6 +116,7 @@ TabPage RID_SCPAGE_SORT_FIELDS
         Text [ en-US ] = "T~hen by" ;
     };
 };
+
 TabPage RID_SCPAGE_SORT_OPTIONS
 {
     Hide = TRUE ;
@@ -158,7 +159,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS
         Text [ de ] = "Enable ~natural sort" ;
         Text [ en-US ] = "Enable ~natural sort" ;
         Text [ cs ] = "Aktivovat přirozené třídění" ;
-       Text [ sk ] = "Aktivovať prirodzené triedenie" ;
+        Text [ sk ] = "Aktivovať prirodzené triedenie" ;
         TabStop = TRUE ;
         Text [ x-comment ] = " " ;
     };
@@ -250,15 +251,8 @@ TabPage RID_SCPAGE_SORT_OPTIONS
         Text [ en-US ] = "L~eft to right (sort columns)" ;
         TabStop = TRUE ;
     };
-/*
-    FixedText FT_AREA_LABEL
-    {
-        Pos = MAP_APPFONT ( 6 , 171 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Data area:" ;
-    };
-*/
 };
+
 TabDialog RID_SCDLG_SORT
 {
     OutputSize = TRUE ;
@@ -313,5 +307,3 @@ TabDialog RID_SCDLG_SORT
         TabStop = TRUE ;
     };
 };
-
-
diff --git a/toolkit/workben/layout/test.cxx b/toolkit/workben/layout/test.cxx
index 2a6be01f4557..ba782a4eca18 100644
--- a/toolkit/workben/layout/test.cxx
+++ b/toolkit/workben/layout/test.cxx
@@ -147,12 +147,12 @@ void LayoutTest::InitUCB()
     OUString aEmpty;
     Sequence< Any > aArgs( 6 );
     aArgs[0]
-        <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );
+        <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL ));
     aArgs[1]
-        <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );
-    aArgs[2] <<= OUString::createFromAscii( "PIPE" );
+        <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE ));
+    aArgs[2] <<= OUString(RTL_CONSTASCII_USTRINGPARAM("PIPE"));
     aArgs[3] <<= aEmpty;
-    aArgs[4] <<= OUString::createFromAscii( "PORTAL" );
+    aArgs[4] <<= OUString(RTL_CONSTASCII_USTRINGPARAM("PORTAL"));
     aArgs[5] <<= aEmpty;
 
     if ( !::ucbhelper::ContentBroker::initialize( mxMSF, aArgs ) )
@@ -209,7 +209,7 @@ void LayoutTest::ParseCommandLine()
         }
         else if ( aParam.equalsAscii( "--test" ) )
         {
-            mTestDialog = OUString::createFromAscii( "zoom" );
+            mTestDialog = OUString(RTL_CONSTASCII_USTRINGPARAM("zoom"));
             if (i + 1 < GetCommandLineParamCount())
                 mTestDialog = GetCommandLineParam( ++i );
         }
@@ -220,7 +220,7 @@ void LayoutTest::ParseCommandLine()
     }
 
     if ( mFiles.size() <= 0 )
-        mFiles.push_back( OUString::createFromAscii( "layout.xml" ) );
+        mFiles.push_back( OUString(RTL_CONSTASCII_USTRINGPARAM("layout.xml")) );
 }
 
 void LayoutTest::RunEditor()
@@ -279,7 +279,7 @@ void TestDialog( OUString const& name )
         QueryBox query ( 0,
                          WinBits( WB_YES_NO | WB_DEF_YES ),
 //                         WinBits( WB_ABORT_RETRY_IGNORE ),
-                         OUString::createFromAscii ("Do you want to do?"));
+                         OUString(RTL_CONSTASCII_USTRINGPARAM ("Do you want to do?")));
         RunDialog( query );
     }
     else if ( name.equalsAscii( "recover" ) )
diff --git a/toolkit/workben/layout/wordcount-tight.xml b/toolkit/workben/layout/wordcount-tight.xml
index b9af6f7e7ef2..bcf6a6d86fca 100644
--- a/toolkit/workben/layout/wordcount-tight.xml
+++ b/toolkit/workben/layout/wordcount-tight.xml
@@ -29,6 +29,7 @@
         <fixedtext id="FT_DOCCHARACTER" label="Characters:" cnt:padding="13"/>
         <fixedinfo id="FI_DOCCHARACTER" right="true" label="00000" cnt:padding="13"/>
         </hbox>
+        <hbox>
         <fixedtext id="FT_DOCCHARACTEREXCLUDINGSPACES" label="Characters excluding spaces:" cnt:padding="13"/>
         <fixedinfo id="FI_DOCCHARACTEREXCLUDINGSPACES" right="true" label="000000" cnt:padding="13"/>
         </hbox>
diff --git a/tools/inc/bootstrp/listmacr.hxx b/tools/inc/bootstrp/listmacr.hxx
index 512a60c6d1a9..6cee0b5ad3ed 100644
--- a/tools/inc/bootstrp/listmacr.hxx
+++ b/tools/inc/bootstrp/listmacr.hxx
@@ -50,13 +50,4 @@ public:                                                         \
 
 #endif
 
-
-
-
-
-
-
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/inc/tools/diagnose_ex.h b/tools/inc/tools/diagnose_ex.h
index 4b7ce44df320..326f59ad8ed4 100644
--- a/tools/inc/tools/diagnose_ex.h
+++ b/tools/inc/tools/diagnose_ex.h
@@ -91,32 +91,35 @@
                                      OSL_ENSURE(c, m); \
                                      throw ::com::sun::star::lang::IllegalArgumentException( \
                                      ::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \
-                                     ::rtl::OUString::createFromAscii(",\n"m), \
+                                     ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ",\n"m )), \
                                      ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(), \
                                      0 ); }
 #define ENSURE_ARG_OR_THROW2(c, m, ifc, arg) if( !(c) ) { \
                                                OSL_ENSURE(c, m); \
                                                throw ::com::sun::star::lang::IllegalArgumentException( \
                                                ::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \
-                                               ::rtl::OUString::createFromAscii(",\n"m), \
+                                               ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ",\n"m )), \
                                                ifc, \
                                                arg ); }
 
 /** This macro asserts the given condition (in debug mode), and throws
     an RuntimeException afterwards.
  */
-#define ENSURE_OR_THROW(c, m) if( !(c) ) { \
-                                     OSL_ENSURE(c, m); \
-                                     throw ::com::sun::star::uno::RuntimeException( \
-                                     ::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \
-                                     ::rtl::OUString::createFromAscii(",\n"m), \
-                                     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); }
-#define ENSURE_OR_THROW2(c, m, ifc) if( !(c) ) { \
-                                          OSL_ENSURE(c, m); \
-                                          throw ::com::sun::star::uno::RuntimeException( \
-                                          ::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \
-                                          ::rtl::OUString::createFromAscii(",\n"m), \
-                                          ifc ); }
+#define ENSURE_OR_THROW(c, m) \
+    if( !(c) ){ \
+        OSL_ENSURE(c, m); \
+        throw ::com::sun::star::uno::RuntimeException( \
+        ::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \
+        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ",\n"m )), \
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); }
+
+#define ENSURE_OR_THROW2(c, m, ifc) \
+    if( !(c) ) { \
+        OSL_ENSURE(c, m); \
+        throw ::com::sun::star::uno::RuntimeException( \
+        ::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \
+        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ",\n"m )), \
+        ifc ); }
 
 /** This macro asserts the given condition (in debug mode), and
     returns the given value afterwards.
diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h
index cde9e178812b..e54e92df862a 100644
--- a/tools/inc/tools/solar.h
+++ b/tools/inc/tools/solar.h
@@ -59,7 +59,6 @@ typedef sal_Bool        BOOL;   /* typedef unsigned char   BOOL; */
 typedef sal_uInt8       BYTE;   /* typedef unsigned char   BYTE; */
 typedef sal_uInt16      USHORT; /* typedef unsigned short  USHORT; */
 typedef sal_uIntPtr     ULONG;  /* typedef unsigned long   ULONG; */
-typedef int             FASTBOOL;
 
 #if !defined(VCL_NEED_BASETSD) || defined(__MINGW32__)
 #ifndef _SOLAR_NOUINT
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index 08092bf1e42c..1706ee8ea714 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -842,9 +842,7 @@ public:
 class TOOLS_DLLPUBLIC SvDataCopyStream
 {
 public:
-    /*-----------------MM 30.04.96 11:01-----------------
-     mehrfaches Aufrufen von Load und Assign erlaubt
-    --------------------------------------------------*/
+    // mehrfaches Aufrufen von Load und Assign erlaubt
                     TYPEINFO();
     virtual         ~SvDataCopyStream(){}
     virtual void    Load( SvStream & ) = 0;
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index 5b8c2b5573b1..ad2afc842b6b 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -474,6 +474,8 @@ private:
     void                operator +=(int); // not implemented; to detect misuses
                                           // of operator +=(sal_Unicode)
 
+    //detect and reject use of RTL_CONSTASCII_STRINGPARAM instead of RTL_CONSTASCII_USTRINGPARAM
+    TOOLS_DLLPRIVATE UniString( const sal_Char*, sal_Int32 );
 public:
                         UniString();
                         UniString( const ResId& rResId );
diff --git a/tools/inc/tools/urlobj.hxx b/tools/inc/tools/urlobj.hxx
index 4783dfbefccc..558777bc966d 100644
--- a/tools/inc/tools/urlobj.hxx
+++ b/tools/inc/tools/urlobj.hxx
@@ -1533,6 +1533,9 @@ private:
 
     TOOLS_DLLPRIVATE static bool scanIPv6reference(
         sal_Unicode const *& rBegin, sal_Unicode const * pEnd);
+
+private:
+    void changeScheme(INetProtocol eTargetScheme);
 };
 
 // static
diff --git a/tools/qa/urlobj/export.map b/tools/qa/urlobj/export.map
new file mode 100644
index 000000000000..8c1ebd8cfe1f
--- /dev/null
+++ b/tools/qa/urlobj/export.map
@@ -0,0 +1,7 @@
+ UDK_3.0 {
+     global:
+         registerAllTestFunction;
+
+     local:
+         *;
+ };
diff --git a/tools/qa/urlobj/makefile.mk b/tools/qa/urlobj/makefile.mk
new file mode 100644
index 000000000000..09745b1103d6
--- /dev/null
+++ b/tools/qa/urlobj/makefile.mk
@@ -0,0 +1,66 @@
+ #*************************************************************************
+ #
+ # Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ #
+ # The contents of this file are subject to the Mozilla Public License Version
+ # 1.1 (the "License"); you may not use this file except in compliance with
+ # the License. You may obtain a copy of the License at
+ # http://www.mozilla.org/MPL/
+ #
+ # Software distributed under the License is distributed on an "AS IS" basis,
+ # WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ # for the specific language governing rights and limitations under the
+ # License.
+ #
+ # The Initial Developer of the Original Code is
+ #       [ insert your name / company etc. here eg. Jim Bob <jim@bob.org> ]
+ # Portions created by the Initial Developer are Copyright (C) 2010 the
+ # Initial Developer. All Rights Reserved.
+ #
+ # Contributor(s): Florian Reuter <freuter@novell.com>
+ #
+ # Alternatively, the contents of this file may be used under the terms of
+ # either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ # the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ # instead of those above.
+ #*************************************************************************
+
+ PRJ=..$/..
+
+ PRJNAME=tools
+ TARGET=qa_tools_urlobj_test
+ # this is removed at the moment because we need some enhancements
+ # TESTDIR=TRUE
+
+ ENABLE_EXCEPTIONS=TRUE
+
+ # --- Settings -----------------------------------------------------
+
+ .INCLUDE :  settings.mk
+
+ # BEGIN ----------------------------------------------------------------
+ # auto generated Target:job by codegen.pl
+ SHL1OBJS=  \
+    $(SLO)$/tools_urlobj_test.obj
+
+ SHL1TARGET= tools_urlobj
+ SHL1STDLIBS=\
+    $(SALLIB) \
+    $(CPPUNITLIB) \
+    $(TOOLSLIB)
+
+ SHL1IMPLIB= i$(SHL1TARGET)
+ DEF1NAME    =$(SHL1TARGET)
+ SHL1VERSIONMAP= export.map
+ # auto generated Target:job
+ # END ------------------------------------------------------------------
+
+ #------------------------------- All object files -------------------------------
+ # do this here, so we get right dependencies
+ # SLOFILES=$(SHL1OBJS)
+
+ # --- Targets ------------------------------------------------------
+
+ .INCLUDE :  target.mk
+ .INCLUDE : _cppunit.mk
diff --git a/tools/qa/urlobj/tools_urlobj_test.cxx b/tools/qa/urlobj/tools_urlobj_test.cxx
new file mode 100644
index 000000000000..1f096ff5a5c1
--- /dev/null
+++ b/tools/qa/urlobj/tools_urlobj_test.cxx
@@ -0,0 +1,183 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       [ insert your name / company etc. here eg. Jim Bob <jim@bob.org> ]
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Florian Reuter <freuter@novell.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+ #include <cppunit/simpleheader.hxx>
+
+ #include <urlobj.hxx>
+
+ namespace tools_urlobj
+ {
+
+ class urlobjTest : public CppUnit::TestFixture
+ {
+
+ public:
+     // initialise your test code values here.
+     void setUp()
+     {
+     }
+
+     void tearDown()
+     {
+     }
+
+     // insert your test code here.
+     // this is only demonstration code
+     void urlobjTest_001()
+     {
+        INetURLObject aUrl(rtl::OUString::createFromAscii("file://10.10.1.1/sampledir/sample.file"));
+ #ifdef LINUX
+        CPPUNIT_ASSERT(aUrl.GetMainURL(INetURLObject::NO_DECODE).compareToAscii("smb://10.10.1.1/sampledir/sample.file")==0);
+        CPPUNIT_ASSERT(aUrl.GetProtocol()==INET_PROT_SMB);
+ #endif
+ #ifdef WIN
+        CPPUNIT_ASSERT(aUrl.GetMainURL(INetURLObject::NO_DECODE).compareToAscii("file://10.10.1.1/sampledir/sample.file")==0);
+        CPPUNIT_ASSERT(aUrl.GetProtocol()==INET_PROT_FILE);
+ #endif
+        CPPUNIT_ASSERT(aUrl.GetHost(INetURLObject::NO_DECODE).compareToAscii("10.10.1.1")==0);
+        CPPUNIT_ASSERT(aUrl.GetURLPath(INetURLObject::NO_DECODE).compareToAscii("/sampledir/sample.file")==0);
+        CPPUNIT_ASSERT(aUrl.getName().compareToAscii("sample.file")==0);
+        CPPUNIT_ASSERT(aUrl.getBase().compareToAscii("sample")==0);
+        CPPUNIT_ASSERT(aUrl.getExtension().compareToAscii("file")==0);
+     }
+
+     void urlobjTest_002()
+     {
+        INetURLObject aUrl;
+        aUrl.setFSysPath(rtl::OUString::createFromAscii("\\\\137.65.170.24\\c$\\Img0001.jpg"), INetURLObject::FSYS_DETECT);
+ #ifdef LINUX
+        CPPUNIT_ASSERT(aUrl.GetMainURL(INetURLObject::NO_DECODE).compareToAscii("smb://137.65.170.24/c$/Img0001.jpg")==0);
+        CPPUNIT_ASSERT(aUrl.GetProtocol()==INET_PROT_SMB);
+ #endif
+ #ifdef WIN
+        CPPUNIT_ASSERT(aUrl.GetMainURL(INetURLObject::NO_DECODE).compareToAscii("file://137.65.170.24/c$/Img0001.jpg")==0);
+        CPPUNIT_ASSERT(aUrl.GetProtocol()==INET_PROT_FILE);
+ #endif
+        CPPUNIT_ASSERT(aUrl.GetHost(INetURLObject::NO_DECODE).compareToAscii("137.65.170.24")==0);
+        CPPUNIT_ASSERT(aUrl.GetURLPath(INetURLObject::NO_DECODE).compareToAscii("/c$/Img0001.jpg")==0);
+        CPPUNIT_ASSERT(aUrl.getName().compareToAscii("Img0001.jpg")==0);
+        CPPUNIT_ASSERT(aUrl.getBase().compareToAscii("Img0001")==0);
+        CPPUNIT_ASSERT(aUrl.getExtension().compareToAscii("jpg")==0);
+     }
+
+
+     void urlobjTest_003()
+     {
+        INetURLObject aUrl;
+        aUrl.setFSysPath(rtl::OUString::createFromAscii("\\\\hive-winxp-x86\\pmladek\\test2.odt"), INetURLObject::FSYS_DETECT);
+ #ifdef LINUX
+        CPPUNIT_ASSERT(aUrl.GetMainURL(INetURLObject::NO_DECODE).compareToAscii("smb://hive-winxp-x86/pmladek/test2.odt")==0);
+        CPPUNIT_ASSERT(aUrl.GetProtocol()==INET_PROT_SMB);
+ #endif
+ #ifdef WIN
+        CPPUNIT_ASSERT(aUrl.GetMainURL(INetURLObject::NO_DECODE).compareToAscii("file://hive-winxp-x86/pmladek/test2.odt")==0);
+        CPPUNIT_ASSERT(aUrl.GetProtocol()==INET_PROT_FILE);
+ #endif
+        CPPUNIT_ASSERT(aUrl.GetHost(INetURLObject::NO_DECODE).compareToAscii("hive-winxp-x86")==0);
+        CPPUNIT_ASSERT(aUrl.GetURLPath(INetURLObject::NO_DECODE).compareToAscii("/pmladek/test2.odt")==0);
+     }
+
+     void urlobjTest_004()
+     {
+        INetURLObject aUrl(rtl::OUString::createFromAscii("smb://10.10.1.1/sampledir/sample.file"));
+ #ifdef LINUX
+        CPPUNIT_ASSERT(aUrl.GetMainURL(INetURLObject::NO_DECODE).compareToAscii("smb://10.10.1.1/sampledir/sample.file")==0);
+        CPPUNIT_ASSERT(aUrl.GetProtocol()==INET_PROT_SMB);
+ #endif
+ #ifdef WIN
+        CPPUNIT_ASSERT(aUrl.GetMainURL(INetURLObject::NO_DECODE).compareToAscii("file://10.10.1.1/sampledir/sample.file")==0);
+        CPPUNIT_ASSERT(aUrl.GetProtocol()==INET_PROT_FILE);
+ #endif
+        CPPUNIT_ASSERT(aUrl.GetHost(INetURLObject::NO_DECODE).compareToAscii("10.10.1.1")==0);
+        CPPUNIT_ASSERT(aUrl.GetURLPath(INetURLObject::NO_DECODE).compareToAscii("/sampledir/sample.file")==0);
+        CPPUNIT_ASSERT(aUrl.getName().compareToAscii("sample.file")==0);
+        CPPUNIT_ASSERT(aUrl.getBase().compareToAscii("sample")==0);
+        CPPUNIT_ASSERT(aUrl.getExtension().compareToAscii("file")==0);
+     }
+
+     void urlobjTest_005()
+     {
+        INetURLObject aUrl;
+        aUrl.setFSysPath(rtl::OUString::createFromAscii("//137.65.170.24/c$/Img0001.jpg"), INetURLObject::FSYS_DETECT);
+ #ifdef LINUX
+        CPPUNIT_ASSERT(aUrl.GetMainURL(INetURLObject::NO_DECODE).compareToAscii("smb://137.65.170.24/c$/Img0001.jpg")==0);
+        CPPUNIT_ASSERT(aUrl.GetProtocol()==INET_PROT_SMB);
+ #endif
+ #ifdef WIN
+        CPPUNIT_ASSERT(aUrl.GetMainURL(INetURLObject::NO_DECODE).compareToAscii("file://137.65.170.24/c$/Img0001.jpg")==0);
+        CPPUNIT_ASSERT(aUrl.GetProtocol()==INET_PROT_FILE);
+ #endif
+        CPPUNIT_ASSERT(aUrl.GetHost(INetURLObject::NO_DECODE).compareToAscii("137.65.170.24")==0);
+        CPPUNIT_ASSERT(aUrl.GetURLPath(INetURLObject::NO_DECODE).compareToAscii("/c$/Img0001.jpg")==0);
+        CPPUNIT_ASSERT(aUrl.getName().compareToAscii("Img0001.jpg")==0);
+        CPPUNIT_ASSERT(aUrl.getBase().compareToAscii("Img0001")==0);
+        CPPUNIT_ASSERT(aUrl.getExtension().compareToAscii("jpg")==0);
+     }
+
+
+     void urlobjTest_006()
+     {
+        INetURLObject aUrl;
+        aUrl.setFSysPath(rtl::OUString::createFromAscii("//hive-winxp-x86/pmladek/test2.odt"), INetURLObject::FSYS_DETECT);
+ #ifdef LINUX
+        CPPUNIT_ASSERT(aUrl.GetMainURL(INetURLObject::NO_DECODE).compareToAscii("smb://hive-winxp-x86/pmladek/test2.odt")==0);
+        CPPUNIT_ASSERT(aUrl.GetProtocol()==INET_PROT_SMB);
+ #endif
+ #ifdef WIN
+        CPPUNIT_ASSERT(aUrl.GetMainURL(INetURLObject::NO_DECODE).compareToAscii("file://hive-winxp-x86/pmladek/test2.odt")==0);
+        CPPUNIT_ASSERT(aUrl.GetProtocol()==INET_PROT_FILE);
+ #endif
+        CPPUNIT_ASSERT(aUrl.GetHost(INetURLObject::NO_DECODE).compareToAscii("hive-winxp-x86")==0);
+        CPPUNIT_ASSERT(aUrl.GetURLPath(INetURLObject::NO_DECODE).compareToAscii("/pmladek/test2.odt")==0);
+     }
+
+
+
+     // Change the following lines only, if you add, remove or rename
+     // member functions of the current class,
+     // because these macros are need by auto register mechanism.
+
+     CPPUNIT_TEST_SUITE(urlobjTest);
+     CPPUNIT_TEST(urlobjTest_001);
+     CPPUNIT_TEST(urlobjTest_002);
+     CPPUNIT_TEST(urlobjTest_003);
+     CPPUNIT_TEST(urlobjTest_004);
+     CPPUNIT_TEST(urlobjTest_005);
+     CPPUNIT_TEST(urlobjTest_006);
+     CPPUNIT_TEST_SUITE_END();
+ }; // class createPool
+
+
+ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(tools_urlobj::urlobjTest, "tools_urlobj");
+ } // namespace rtl_random
+
+
+ // -----------------------------------------------------------------------------
+
+ // this macro creates an empty function, which will called by the RegisterAllFunctions()
+ // to let the user the possibility to also register some functions by hand.
+ NOADDITIONAL;
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 68997ac1b778..50e945cb8db7 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -1444,10 +1444,48 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
 
     m_aAbsURIRef = aSynAbsURIRef;
 
+    // At this point references of type "\\server\paths" have
+    // been converted to file:://server/path".
+#ifdef LINUX
+    if (m_eScheme==INET_PROT_FILE && !m_aHost.isEmpty()) {
+        // Change "file:://server/path" URIs to "smb:://server/path" on
+        // Linux
+        // Leave "file::path" URIs unchanged.
+        changeScheme(INET_PROT_SMB);
+    }
+#endif
+
+#ifdef WIN
+    if (m_eScheme==INET_PROT_SMB) {
+        // Change "smb://server/path" URIs to "file://server/path"
+        // URIs on Windows, since Windows doesn't understand the
+        // SMB scheme.
+        changeScheme(INET_PROT_FILE);
+    }
+#endif
+
     return true;
 }
 
 //============================================================================
+void INetURLObject::changeScheme(INetProtocol eTargetScheme) {
+    ::rtl::OUString aTmpStr=m_aAbsURIRef.makeStringAndClear();
+    int oldSchemeLen=strlen(getSchemeInfo().m_pScheme);
+    m_eScheme=eTargetScheme;
+    int newSchemeLen=strlen(getSchemeInfo().m_pScheme);
+    m_aAbsURIRef.appendAscii(getSchemeInfo().m_pScheme);
+    m_aAbsURIRef.append(aTmpStr.getStr()+oldSchemeLen);
+    int delta=newSchemeLen-oldSchemeLen;
+    m_aUser+=delta;
+    m_aAuth+=delta;
+    m_aHost+=delta;
+    m_aPort+=delta;
+    m_aPath+=delta;
+    m_aQuery+=delta;
+    m_aFragment+=delta;
+}
+
+//============================================================================
 bool INetURLObject::convertRelToAbs(rtl::OUString const & rTheRelURIRef,
                                     bool bOctets,
                                     INetURLObject & rTheAbsURIRef,
@@ -2336,7 +2374,7 @@ bool INetURLObject::setPassword(rtl::OUString const & rThePassword,
     else if (m_aHost.isPresent())
     {
         m_aAbsURIRef.insert(m_aHost.getBegin(),
-            rtl::OUString::createFromAscii(":@"));
+            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ":@" )));
         m_aUser.set(m_aAbsURIRef, rtl::OUString(), m_aHost.getBegin());
         nDelta
             = m_aAuth.set(m_aAbsURIRef, aNewAuth, m_aHost.getBegin() + 1) + 2;
diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx
index d4a92de5d589..e8d9129c2fb2 100644
--- a/tools/source/generic/config.cxx
+++ b/tools/source/generic/config.cxx
@@ -217,20 +217,20 @@ static String ImplMakeConfigName( const XubString* pFileName,
     if ( pFileName )
     {
 #ifdef UNX
-        aFileName = ::rtl::OUString::createFromAscii( "." );
+        aFileName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "." ));
         aFileName += *pFileName;
-        aFileName += ::rtl::OUString::createFromAscii( "rc" );
+        aFileName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "rc" ));
 #else
         aFileName = *pFileName;
-        aFileName += ::rtl::OUString::createFromAscii( ".ini" );
+        aFileName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".ini" ));
 #endif
     }
     else
     {
 #ifdef UNX
-        aFileName = ::rtl::OUString::createFromAscii( ".sversionrc" );
+        aFileName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".sversionrc" ));
 #else
-        aFileName = ::rtl::OUString::createFromAscii( "sversion.ini" );
+        aFileName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sversion.ini" ));
 #endif
     }
 
@@ -249,7 +249,7 @@ static String ImplMakeConfigName( const XubString* pFileName,
     }
 
     ::rtl::OUString aName( aPathName );
-    aName += ::rtl::OUString::createFromAscii( "/" );
+    aName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ));
     aName += aFileName;
 
     return aName;
diff --git a/tools/source/generic/svlibrary.cxx b/tools/source/generic/svlibrary.cxx
index be6772ffbcfa..5864bdf2c8a8 100644
--- a/tools/source/generic/svlibrary.cxx
+++ b/tools/source/generic/svlibrary.cxx
@@ -62,7 +62,7 @@ static uno::Sequence< rtl::OUString > GetMultiPaths_Impl()
             aUser     .AppendAscii( "_user" );
 
             uno::Reference< beans::XPropertySet > xPathSettings( xMgr->createInstance(
-                rtl::OUString::createFromAscii( "com.sun.star.util.PathSettings" ) ), uno::UNO_QUERY_THROW );
+                rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.PathSettings" )) ), uno::UNO_QUERY_THROW );
             xPathSettings->getPropertyValue( aInternal )  >>= aInternalPaths;
             xPathSettings->getPropertyValue( aUser )      >>= aUserPaths;
         }
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index ee1c513adba6..49c753b66ce7 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -1109,6 +1109,10 @@ sal_Bool SvStream::ReadCsvLine( String& rStr, sal_Bool bEmbeddedLineBreak,
     if (bEmbeddedLineBreak)
     {
         const sal_Unicode* pSeps = rFieldSeparators.GetBuffer();
+
+        // See if the separator(s) include tab.
+        bool bTabSep = lcl_UnicodeStrChr(pSeps, '\t') != NULL;
+
         xub_StrLen nLastOffset = 0;
         xub_StrLen nQuotes = 0;
         while (!IsEof() && rStr.Len() < STRING_MAXLEN)
@@ -1121,6 +1125,16 @@ sal_Bool SvStream::ReadCsvLine( String& rStr, sal_Bool bEmbeddedLineBreak,
             {
                 if (nQuotes)
                 {
+                    if (bTabSep && *p == '\t')
+                    {
+                        // When tab-delimited, tab char ends quoted sequence
+                        // even if we haven't reached the end quote.  Doing
+                        // this helps keep mal-formed rows from damaging
+                        // other, well-formed rows.
+                        nQuotes = 0;
+                        break;
+                    }
+
                     if (*p == cFieldQuote && !bBackslashEscaped)
                         ++nQuotes;
                     else if (bAllowBackslashEscape)
diff --git a/tools/workben/urltest.cxx b/tools/workben/urltest.cxx
index 0b0239a96f5a..2d3bd9b445f8 100644
--- a/tools/workben/urltest.cxx
+++ b/tools/workben/urltest.cxx
@@ -611,7 +611,7 @@ main()
     if (true)
     {
         rtl::OUString
-            aParameters(rtl::OUString::createFromAscii("; CharSet=UTF-8  ; Blubber=Blob"));
+            aParameters(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "; CharSet=UTF-8  ; Blubber=Blob" )));
         sal_Unicode const * pBegin = aParameters.getStr();
         sal_Unicode const * pEnd = pBegin + aParameters.getLength();
         INetContentTypeParameterList aList;
@@ -1451,7 +1451,7 @@ main()
     }
 
     if (true) { // #112130#
-        INetURLObject url1(rtl::OUString::createFromAscii(".uno:abc%3Fdef"));
+        INetURLObject url1(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:abc%3Fdef" )));
         if (url1.GetProtocol() != INET_PROT_UNO) {
             printf("BAD .uno:abc%%3Fdef\n");
             bSuccess = false;
@@ -1469,7 +1469,7 @@ main()
             printf("BAD HasParam(.uno:abc%%3Fdef)\n");
             bSuccess = false;
         }
-        INetURLObject url2(rtl::OUString::createFromAscii(".uno:abc?def?ghi"));
+        INetURLObject url2(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:abc?def?ghi" )));
         if (url2.GetProtocol() != INET_PROT_UNO) {
             printf("BAD .uno:abc?def?ghi\n");
             bSuccess = false;
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index 4d43cace003b..f91819b0a636 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -444,10 +444,10 @@ public:
         throw( RuntimeException );
 };
 
-OUString    CCRS_PropertySetInfo::m_aPropertyNameForCount( OUString::createFromAscii( "RowCount" ) );
-OUString    CCRS_PropertySetInfo::m_aPropertyNameForFinalCount( OUString::createFromAscii( "IsRowCountFinal" ) );
-OUString    CCRS_PropertySetInfo::m_aPropertyNameForFetchSize( OUString::createFromAscii( "FetchSize" ) );
-OUString    CCRS_PropertySetInfo::m_aPropertyNameForFetchDirection( OUString::createFromAscii( "FetchDirection" ) );
+OUString    CCRS_PropertySetInfo::m_aPropertyNameForCount( RTL_CONSTASCII_USTRINGPARAM("RowCount") );
+OUString    CCRS_PropertySetInfo::m_aPropertyNameForFinalCount( RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal") );
+OUString    CCRS_PropertySetInfo::m_aPropertyNameForFetchSize( RTL_CONSTASCII_USTRINGPARAM("FetchSize") );
+OUString    CCRS_PropertySetInfo::m_aPropertyNameForFetchDirection( RTL_CONSTASCII_USTRINGPARAM("FetchDirection") );
 
 CCRS_PropertySetInfo::CCRS_PropertySetInfo(
         Reference< XPropertySetInfo > xInfo )
@@ -972,10 +972,10 @@ XTYPEPROVIDER_IMPL_11( CachedContentResultSet
 //--------------------------------------------------------------------------
 
 XSERVICEINFO_NOFACTORY_IMPL_1( CachedContentResultSet,
-                               OUString::createFromAscii(
-                            "com.sun.star.comp.ucb.CachedContentResultSet" ),
-                            OUString::createFromAscii(
-                            CACHED_CONTENT_RESULTSET_SERVICE_NAME ) );
+                               OUString(RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.comp.ucb.CachedContentResultSet" )),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM(
+                            CACHED_CONTENT_RESULTSET_SERVICE_NAME )) );
 
 //--------------------------------------------------------------------------
 // XPropertySet methods. ( inherited )
@@ -2151,8 +2151,8 @@ const Reference< XTypeConverter >& CachedContentResultSet::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(),
@@ -2201,10 +2201,10 @@ XTYPEPROVIDER_IMPL_3( CachedContentResultSetFactory,
 //--------------------------------------------------------------------------
 
 XSERVICEINFO_IMPL_1( CachedContentResultSetFactory,
-                     OUString::createFromAscii(
-                           "com.sun.star.comp.ucb.CachedContentResultSetFactory" ),
-                         OUString::createFromAscii(
-                         CACHED_CONTENT_RESULTSET_FACTORY_NAME ) );
+                     OUString(RTL_CONSTASCII_USTRINGPARAM(
+                           "com.sun.star.comp.ucb.CachedContentResultSetFactory" )),
+                         OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         CACHED_CONTENT_RESULTSET_FACTORY_NAME )) );
 
 //--------------------------------------------------------------------------
 // Service factory implementation.
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index b4edc92072aa..0ccca6340cf1 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -51,8 +51,8 @@ CachedContentResultSetStub::CachedContentResultSetStub( Reference< XResultSet >
                 , m_bFirstFetchSizePropagationDone( sal_False )
                 , m_nLastFetchSize( 1 )//this value is not important at all
                 , m_bLastFetchDirection( sal_True )//this value is not important at all
-                , m_aPropertyNameForFetchSize( OUString::createFromAscii( "FetchSize" ) )
-                , m_aPropertyNameForFetchDirection( OUString::createFromAscii( "FetchDirection" ) )
+                , m_aPropertyNameForFetchSize( OUString(RTL_CONSTASCII_USTRINGPARAM("FetchSize")) )
+                , m_aPropertyNameForFetchDirection( OUString(RTL_CONSTASCII_USTRINGPARAM("FetchDirection")) )
 {
     impl_init();
 }
@@ -240,10 +240,10 @@ Sequence< Type > SAL_CALL CachedContentResultSetStub
 //--------------------------------------------------------------------------
 
 XSERVICEINFO_NOFACTORY_IMPL_1( CachedContentResultSetStub,
-                        OUString::createFromAscii(
-                        "com.sun.star.comp.ucb.CachedContentResultSetStub" ),
-                        OUString::createFromAscii(
-                        CACHED_CRS_STUB_SERVICE_NAME ) );
+                        OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.comp.ucb.CachedContentResultSetStub" )),
+                        OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        CACHED_CRS_STUB_SERVICE_NAME )) );
 
 //-----------------------------------------------------------------
 // XFetchProvider methods.
@@ -599,10 +599,10 @@ XTYPEPROVIDER_IMPL_3( CachedContentResultSetStubFactory,
 //--------------------------------------------------------------------------
 
 XSERVICEINFO_IMPL_1( CachedContentResultSetStubFactory,
-                     OUString::createFromAscii(
-                     "com.sun.star.comp.ucb.CachedContentResultSetStubFactory" ),
-                     OUString::createFromAscii(
-                     CACHED_CRS_STUB_FACTORY_NAME ) );
+                     OUString(RTL_CONSTASCII_USTRINGPARAM(
+                     "com.sun.star.comp.ucb.CachedContentResultSetStubFactory" )),
+                     OUString(RTL_CONSTASCII_USTRINGPARAM(
+                     CACHED_CRS_STUB_FACTORY_NAME )) );
 
 //--------------------------------------------------------------------------
 // Service factory implementation.
diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx
index 762e6613d3d9..68a7bfa90665 100644
--- a/ucb/source/cacher/cacheddynamicresultset.cxx
+++ b/ucb/source/cacher/cacheddynamicresultset.cxx
@@ -121,10 +121,10 @@ XTYPEPROVIDER_IMPL_4( CachedDynamicResultSet
 //--------------------------------------------------------------------------
 
 XSERVICEINFO_NOFACTORY_IMPL_1( CachedDynamicResultSet,
-                            OUString::createFromAscii(
-                            "com.sun.star.comp.ucb.CachedDynamicResultSet" ),
-                            OUString::createFromAscii(
-                            CACHED_DRS_SERVICE_NAME ) );
+                            OUString(RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.comp.ucb.CachedDynamicResultSet" )),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM(
+                            CACHED_DRS_SERVICE_NAME )) );
 
 //--------------------------------------------------------------------------
 // own methds. ( inherited )
@@ -177,10 +177,10 @@ XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetFactory,
 //--------------------------------------------------------------------------
 
 XSERVICEINFO_IMPL_1( CachedDynamicResultSetFactory,
-                         OUString::createFromAscii(
-                         "com.sun.star.comp.ucb.CachedDynamicResultSetFactory" ),
-                         OUString::createFromAscii(
-                         CACHED_DRS_FACTORY_NAME ) );
+                         OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         "com.sun.star.comp.ucb.CachedDynamicResultSetFactory" )),
+                         OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         CACHED_DRS_FACTORY_NAME )) );
 
 //--------------------------------------------------------------------------
 // Service factory implementation.
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
index db46662e9bb0..60fe063d31e2 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
@@ -123,10 +123,10 @@ XTYPEPROVIDER_IMPL_5( CachedDynamicResultSetStub
 //--------------------------------------------------------------------------
 
 XSERVICEINFO_NOFACTORY_IMPL_1( CachedDynamicResultSetStub,
-                        OUString::createFromAscii(
-                        "com.sun.star.comp.ucb.CachedDynamicResultSetStub" ),
-                        OUString::createFromAscii(
-                        CACHED_DRS_STUB_SERVICE_NAME ) );
+                        OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.comp.ucb.CachedDynamicResultSetStub" )),
+                        OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        CACHED_DRS_STUB_SERVICE_NAME )) );
 
 //--------------------------------------------------------------------------
 //--------------------------------------------------------------------------
@@ -167,10 +167,10 @@ XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetStubFactory,
 //--------------------------------------------------------------------------
 
 XSERVICEINFO_IMPL_1( CachedDynamicResultSetStubFactory,
-                     OUString::createFromAscii(
-                     "com.sun.star.comp.ucb.CachedDynamicResultSetStubFactory" ),
-                     OUString::createFromAscii(
-                     CACHED_DRS_STUB_FACTORY_NAME ) );
+                     OUString(RTL_CONSTASCII_USTRINGPARAM(
+                     "com.sun.star.comp.ucb.CachedDynamicResultSetStubFactory" )),
+                     OUString(RTL_CONSTASCII_USTRINGPARAM(
+                     CACHED_DRS_STUB_FACTORY_NAME )) );
 
 //--------------------------------------------------------------------------
 // Service factory implementation.
@@ -217,8 +217,8 @@ void SAL_CALL CachedDynamicResultSetStubFactory
         try
         {
             xSortFactory = Reference< XSortedDynamicResultSetFactory >(
-                m_xSMgr->createInstance( OUString::createFromAscii(
-                    "com.sun.star.ucb.SortedDynamicResultSetFactory" ) ),
+                m_xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.ucb.SortedDynamicResultSetFactory" )) ),
                 UNO_QUERY );
         }
         catch ( Exception const & )
diff --git a/ucb/source/cacher/cacheserv.cxx b/ucb/source/cacher/cacheserv.cxx
index 32b41b2c2f60..8ff18650d925 100644
--- a/ucb/source/cacher/cacheserv.cxx
+++ b/ucb/source/cacher/cacheserv.cxx
@@ -46,9 +46,9 @@ static sal_Bool writeInfo( void * pRegistryKey,
                            const OUString & rImplementationName,
                               Sequence< OUString > const & rServiceNames )
 {
-    OUString aKeyName( OUString::createFromAscii( "/" ) );
+    OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" ) );
     aKeyName += rImplementationName;
-    aKeyName += OUString::createFromAscii( "/UNO/SERVICES" );
+    aKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
 
     Reference< XRegistryKey > xKey;
     try
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index e49e40ef07e8..6b7d714b6936 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -320,7 +320,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
         }
         aGuard.reacquire();
 
-        rtl::OUString aName = OUString::createFromAscii( "ResultSetType" );
+        rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM("ResultSetType"));
         //find out, if we are ForwardOnly and cache the value:
 
         impl_init_xPropertySetOrigin();
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx
index 25bb6ec5dae3..97232c89c56a 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.cxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx
@@ -428,8 +428,8 @@ void SAL_CALL DynamicResultSetWrapper
         {
             xStubFactory = Reference< XCachedDynamicResultSetStubFactory >(
                 m_xSMgr->createInstance(
-                    OUString::createFromAscii(
-                        "com.sun.star.ucb.CachedDynamicResultSetStubFactory" ) ),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.ucb.CachedDynamicResultSetStubFactory" )) ),
                 UNO_QUERY );
         }
         catch ( Exception const & )
diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index 776040110ecd..664d85372baa 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -86,10 +86,10 @@ XTYPEPROVIDER_IMPL_3( UcbContentProviderProxyFactory,
 //=========================================================================
 
 XSERVICEINFO_IMPL_1( UcbContentProviderProxyFactory,
-                     OUString::createFromAscii(
-                         "com.sun.star.comp.ucb.UcbContentProviderProxyFactory" ),
-                     OUString::createFromAscii(
-                         PROVIDER_FACTORY_SERVICE_NAME ) );
+                     OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         "com.sun.star.comp.ucb.UcbContentProviderProxyFactory" )),
+                     OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         PROVIDER_FACTORY_SERVICE_NAME )) );
 
 //=========================================================================
 //
@@ -214,10 +214,10 @@ Sequence< Type > SAL_CALL UcbContentProviderProxy::getTypes()
 //=========================================================================
 
 XSERVICEINFO_NOFACTORY_IMPL_1( UcbContentProviderProxy,
-                            OUString::createFromAscii(
-                                "com.sun.star.comp.ucb.UcbContentProviderProxy" ),
-                            OUString::createFromAscii(
-                             PROVIDER_PROXY_SERVICE_NAME ) );
+                            OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                "com.sun.star.comp.ucb.UcbContentProviderProxy" )),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM(
+                             PROVIDER_PROXY_SERVICE_NAME )) );
 
 //=========================================================================
 //
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 0542a431d61e..f944980f8971 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -351,10 +351,10 @@ void SAL_CALL UniversalContentBroker::removeEventListener(
 //=========================================================================
 
 XSERVICEINFO_IMPL_1( UniversalContentBroker,
-                     OUString::createFromAscii(
-                         "com.sun.star.comp.ucb.UniversalContentBroker" ),
-                     OUString::createFromAscii(
-                         UCB_SERVICE_NAME ) );
+                     OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         "com.sun.star.comp.ucb.UniversalContentBroker" )),
+                     OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         UCB_SERVICE_NAME )) );
 
 //=========================================================================
 //
@@ -659,8 +659,8 @@ Any SAL_CALL UniversalContentBroker::execute(
         {
             ucbhelper::cancelCommandExecution(
                 makeAny( IllegalArgumentException(
-                                rtl::OUString::createFromAscii(
-                                        "Wrong argument type!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "Wrong argument type!" )),
                                 static_cast< cppu::OWeakObject * >( this ),
                                 -1 ) ),
                 Environment );
@@ -844,8 +844,8 @@ bool UniversalContentBroker::getContentProviderData(
     {
         uno::Reference< lang::XMultiServiceFactory > xConfigProv(
                 m_xSMgr->createInstance(
-                    rtl::OUString::createFromAscii(
-                        "com.sun.star.configuration.ConfigurationProvider" ) ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.configuration.ConfigurationProvider" )) ),
                 uno::UNO_QUERY_THROW );
 
         rtl::OUStringBuffer aFullPath;
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index dbbc39e9bf15..0447fac228db 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -249,12 +249,12 @@ CommandProcessorInfo::CommandProcessorInfo()
 
     (*m_pInfo)[ 0 ]
         = ucb::CommandInfo(
-            rtl::OUString::createFromAscii( GETCOMMANDINFO_NAME ), // Name
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( GETCOMMANDINFO_NAME )), // Name
             GETCOMMANDINFO_HANDLE, // Handle
             getCppuVoidType() ); // ArgType
     (*m_pInfo)[ 1 ]
         = ucb::CommandInfo(
-            rtl::OUString::createFromAscii( GLOBALTRANSFER_NAME ), // Name
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( GLOBALTRANSFER_NAME )), // Name
             GLOBALTRANSFER_HANDLE, // Handle
             getCppuType(
                 static_cast<
@@ -559,19 +559,19 @@ uno::Reference< ucb::XContent > createNew(
             ucb::IOErrorCode_CANT_CREATE,
             uno::Sequence< uno::Any >(&aProps, 1),
             rContext.xOrigEnv,
-            rtl::OUString::createFromAscii( "Target is no XCommandProcessor!" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Target is no XCommandProcessor!")),
             rContext.xProcessor );
         // Unreachable
     }
 
     uno::Sequence< beans::Property > aPropsToObtain( 1 );
     aPropsToObtain[ 0 ].Name
-        = rtl::OUString::createFromAscii( "CreatableContentsInfo" );
+        = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreatableContentsInfo"));
     aPropsToObtain[ 0 ].Handle
         = -1;
 
     ucb::Command aGetPropsCommand(
-            rtl::OUString::createFromAscii( "getPropertyValues" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertyValues")),
             -1,
             uno::makeAny( aPropsToObtain ) );
 
@@ -613,7 +613,7 @@ uno::Reference< ucb::XContent > createNew(
                 ucb::IOErrorCode_CANT_CREATE,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 rContext.xOrigEnv,
-                rtl::OUString::createFromAscii( "Target is no XContentCreator!" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Target is no XContentCreator!")),
                 rContext.xProcessor );
             // Unreachable
         }
@@ -634,7 +634,7 @@ uno::Reference< ucb::XContent > createNew(
             ucb::IOErrorCode_CANT_CREATE,
             uno::Sequence< uno::Any >(&aProps, 1),
             rContext.xOrigEnv,
-            rtl::OUString::createFromAscii( "No types creatable!" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No types creatable!")),
             rContext.xProcessor );
         // Unreachable
     }
@@ -700,8 +700,8 @@ uno::Reference< ucb::XContent > createNew(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                        rtl::OUString::createFromAscii(
-                                            "Unknown transfer operation!" ),
+                                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                            "Unknown transfer operation!" )),
                                         rContext.xProcessor,
                                         -1 ) ),
                               rContext.xOrigEnv );
@@ -721,7 +721,7 @@ uno::Reference< ucb::XContent > createNew(
                 // First, try it using "CreatabeleContentsInfo" property and
                 // "createNewContent" command -> the "new" way.
                 ucb::Command aCreateNewCommand(
-                   rtl::OUString::createFromAscii( "createNewContent" ),
+                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("createNewContent")),
                    -1,
                    uno::makeAny( aTypesInfo[ n ] ) );
 
@@ -750,8 +750,8 @@ uno::Reference< ucb::XContent > createNew(
                     ucb::IOErrorCode_CANT_CREATE,
                     uno::Sequence< uno::Any >(&aProps, 1),
                     rContext.xOrigEnv,
-                    rtl::OUString::createFromAscii(
-                        "createNewContent failed!" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "createNewContent failed!" )),
                     rContext.xProcessor );
                 // Unreachable
             }
@@ -770,7 +770,7 @@ void transferProperties(
         throw( uno::Exception )
 {
     ucb::Command aGetPropertySetInfoCommand(
-                rtl::OUString::createFromAscii( "getPropertySetInfo" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertySetInfo")),
                 -1,
                 uno::Any() );
 
@@ -791,8 +791,8 @@ void transferProperties(
             ucb::IOErrorCode_CANT_READ,
             uno::Sequence< uno::Any >(&aProps, 1),
             rContext.xOrigEnv,
-            rtl::OUString::createFromAscii(
-                "Unable to get propertyset info from source object!" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "Unable to get propertyset info from source object!" )),
             rContext.xProcessor );
         // Unreachable
     }
@@ -800,7 +800,7 @@ void transferProperties(
     uno::Sequence< beans::Property > aAllProps = xInfo->getProperties();
 
     ucb::Command aGetPropsCommand1(
-                rtl::OUString::createFromAscii( "getPropertyValues" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertyValues")),
                 -1,
                 uno::makeAny( aAllProps ) );
 
@@ -821,8 +821,8 @@ void transferProperties(
             ucb::IOErrorCode_CANT_READ,
             uno::Sequence< uno::Any >(&aProps, 1),
             rContext.xOrigEnv,
-            rtl::OUString::createFromAscii(
-                "Unable to get properties from source object!" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "Unable to get properties from source object!" )),
             rContext.xProcessor );
         // Unreachable
     }
@@ -893,7 +893,7 @@ void transferProperties(
     if ( !bHasTitle && ( rContext.aArg.NewTitle.getLength() > 0 ) )
     {
         aPropValues[ nWritePos ].Name
-            = rtl::OUString::createFromAscii( "Title" );
+            = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
         aPropValues[ nWritePos ].Handle = -1;
         aPropValues[ nWritePos ].Value <<= rContext.aArg.NewTitle;
 
@@ -905,7 +905,7 @@ void transferProperties(
                                 == ucb::TransferCommandOperation_LINK ) )
     {
         aPropValues[ nWritePos ].Name
-            = rtl::OUString::createFromAscii( "TargetURL" );
+            = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL"));
         aPropValues[ nWritePos ].Handle = -1;
         aPropValues[ nWritePos ].Value <<= rContext.aArg.SourceURL;
 
@@ -917,7 +917,7 @@ void transferProperties(
     // Set properties at new object.
 
     ucb::Command aSetPropsCommand(
-                rtl::OUString::createFromAscii( "setPropertyValues" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setPropertyValues")),
                 -1,
                 uno::makeAny( aPropValues ) );
 
@@ -952,7 +952,7 @@ uno::Reference< io::XInputStream > getInputStream(
         aArg.Properties = uno::Sequence< beans::Property >( 0 ); // unused
 
         ucb::Command aOpenCommand(
-                                rtl::OUString::createFromAscii( "open" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open")),
                                 -1,
                                 uno::makeAny( aArg ) );
 
@@ -980,7 +980,7 @@ uno::Reference< io::XInputStream > getInputStream(
         {
             uno::Reference< io::XOutputStream > xOutputStream(
                 rContext.xSMgr->createInstance(
-                    rtl::OUString::createFromAscii( "com.sun.star.io.Pipe" ) ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe")) ),
                 uno::UNO_QUERY );
 
             if ( xOutputStream.is() )
@@ -992,7 +992,7 @@ uno::Reference< io::XInputStream > getInputStream(
                 aArg.Properties = uno::Sequence< beans::Property >( 0 );
 
                 ucb::Command aOpenCommand(
-                                    rtl::OUString::createFromAscii( "open" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open")),
                                     -1,
                                     uno::makeAny( aArg ) );
 
@@ -1025,11 +1025,11 @@ uno::Reference< sdbc::XResultSet > getResultSet(
 
     uno::Sequence< beans::Property > aProps( 3 );
 
-    aProps[ 0 ].Name   = rtl::OUString::createFromAscii( "IsFolder" );
+    aProps[ 0 ].Name   = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder"));
     aProps[ 0 ].Handle = -1; /* unknown */
-    aProps[ 1 ].Name   = rtl::OUString::createFromAscii( "IsDocument" );
+    aProps[ 1 ].Name   = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument"));
     aProps[ 1 ].Handle = -1; /* unknown */
-    aProps[ 2 ].Name   = rtl::OUString::createFromAscii( "TargetURL" );
+    aProps[ 2 ].Name   = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL"));
     aProps[ 2 ].Handle = -1; /* unknown */
 
     ucb::OpenCommandArgument2 aArg;
@@ -1038,7 +1038,7 @@ uno::Reference< sdbc::XResultSet > getResultSet(
     aArg.Sink       = 0;
     aArg.Properties = aProps;
 
-    ucb::Command aOpenCommand( rtl::OUString::createFromAscii( "open" ),
+    ucb::Command aOpenCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open")),
                                      -1,
                                      uno::makeAny( aArg ) );
     try
@@ -1076,11 +1076,11 @@ void handleNameClashRename(
 
     // Obtain old title.
     uno::Sequence< beans::Property > aProps( 1 );
-    aProps[ 0 ].Name   = rtl::OUString::createFromAscii( "Title" );
+    aProps[ 0 ].Name   = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
     aProps[ 0 ].Handle = -1;
 
     ucb::Command aGetPropsCommand(
-            rtl::OUString::createFromAscii( "getPropertyValues" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertyValues")),
             -1,
             uno::makeAny( aProps ) );
 
@@ -1101,8 +1101,8 @@ void handleNameClashRename(
             ucb::IOErrorCode_CANT_READ,
             uno::Sequence< uno::Any >( &aProps2, 1 ),
             rContext.xOrigEnv,
-            rtl::OUString::createFromAscii(
-                "Unable to get properties from new object!" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "Unable to get properties from new object!" )),
             rContext.xProcessor );
         // Unreachable
     }
@@ -1112,9 +1112,9 @@ void handleNameClashRename(
     {
         ucbhelper::cancelCommandExecution(
             uno::makeAny( beans::UnknownPropertyException(
-                            rtl::OUString::createFromAscii(
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                 "Unable to get property 'Title' "
-                                "from new object!" ),
+                                "from new object!" )),
                             rContext.xProcessor ) ),
             rContext.xOrigEnv );
         // Unreachable
@@ -1133,7 +1133,7 @@ void handleNameClashRename(
         aOldTitlePre = aOldTitle;
 
     if ( nPos > 0 )
-        aOldTitlePre += rtl::OUString::createFromAscii( "_" );
+        aOldTitlePre += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_"));
 
     sal_Bool bContinue = sal_True;
     do
@@ -1194,8 +1194,8 @@ void handleNameClashRename(
                             ucb::IOErrorCode_CANT_READ,
                             uno::Sequence< uno::Any >( &aProps2, 1 ),
                             rContext.xOrigEnv,
-                            rtl::OUString::createFromAscii(
-                                "Got no data stream from source!" ),
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                "Got no data stream from source!" )),
                             rContext.xProcessor );
                         // Unreachable
                     }
@@ -1207,7 +1207,7 @@ void handleNameClashRename(
             aArg.ReplaceExisting = sal_False;
 
             ucb::Command aInsertCommand(
-                        rtl::OUString::createFromAscii( "insert" ),
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert")),
                         -1,
                         uno::makeAny( aArg ) );
 
@@ -1231,8 +1231,8 @@ void handleNameClashRename(
         ucbhelper::cancelCommandExecution(
             uno::makeAny(
                 ucb::UnsupportedNameClashException(
-                    rtl::OUString::createFromAscii(
-                        "Unable to resolve name clash!" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "Unable to resolve name clash!" )),
                     rContext.xProcessor,
                     ucb::NameClash::RENAME ) ),
             rContext.xOrigEnv );
@@ -1254,9 +1254,9 @@ void globalTransfer_(
     {
         ucbhelper::cancelCommandExecution(
             uno::makeAny( beans::UnknownPropertyException(
-                            rtl::OUString::createFromAscii(
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                 "Unable to get property 'IsFolder' "
-                                "from source object!" ),
+                                "from source object!" )),
                             rContext.xProcessor ) ),
             rContext.xOrigEnv );
         // Unreachable
@@ -1268,9 +1268,9 @@ void globalTransfer_(
     {
         ucbhelper::cancelCommandExecution(
             uno::makeAny( beans::UnknownPropertyException(
-                            rtl::OUString::createFromAscii(
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                 "Unable to get property 'IsDocument' "
-                                "from source object!" ),
+                                "from source object!" )),
                             rContext.xProcessor ) ),
             rContext.xOrigEnv );
         // Unreachable
@@ -1304,8 +1304,8 @@ void globalTransfer_(
             ucb::IOErrorCode_CANT_CREATE,
             uno::Sequence< uno::Any >(&aProps, 1),
             rContext.xOrigEnv,
-            rtl::OUString::createFromAscii(
-                "No matching content type at target!" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "No matching content type at target!" )),
             rContext.xProcessor );
         // Unreachable
     }
@@ -1333,8 +1333,8 @@ void globalTransfer_(
             ucb::IOErrorCode_CANT_WRITE,
             uno::Sequence< uno::Any >(&aProps, 1),
             rContext.xOrigEnv,
-            rtl::OUString::createFromAscii(
-                "New content is not a XCommandProcessor!" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "New content is not a XCommandProcessor!" )),
             rContext.xProcessor );
         // Unreachable
     }
@@ -1356,8 +1356,8 @@ void globalTransfer_(
             ucb::IOErrorCode_CANT_READ,
             uno::Sequence< uno::Any >(&aProps, 1),
             rContext.xOrigEnv,
-            rtl::OUString::createFromAscii(
-                "Source content is not a XCommandProcessor!" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "Source content is not a XCommandProcessor!" )),
             rContext.xProcessor );
         // Unreachable
     }
@@ -1426,7 +1426,7 @@ void globalTransfer_(
         try
         {
             ucb::Command aInsertCommand(
-                                    rtl::OUString::createFromAscii( "insert" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert")),
                                     -1,
                                     uno::makeAny( aArg ) );
 
@@ -1444,9 +1444,9 @@ void globalTransfer_(
             // No chance to solve name clashes, because I'm not able to detect
             // whether there is one.
             throw ucb::UnsupportedNameClashException(
-                    rtl::OUString::createFromAscii(
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                         "Unable to resolve name clashes, no chance to detect "
-                        "that there is one!" ),
+                        "that there is one!" )),
                     rContext.xProcessor,
                     rContext.aArg.NameClash );
         }
@@ -1472,9 +1472,9 @@ void globalTransfer_(
                     ucbhelper::cancelCommandExecution(
                         uno::makeAny(
                             ucb::UnsupportedNameClashException(
-                                rtl::OUString::createFromAscii(
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                     "BUG: insert + replace == true MUST NOT "
-                                    "throw NameClashException." ),
+                                    "throw NameClashException." )),
                                 rContext.xProcessor,
                                 rContext.aArg.NameClash ) ),
                         rContext.xOrigEnv );
@@ -1617,8 +1617,8 @@ void globalTransfer_(
                     ucb::IOErrorCode_CANT_READ,
                     uno::Sequence< uno::Any >(&aProps, 1),
                     rContext.xOrigEnv,
-                    rtl::OUString::createFromAscii(
-                        "Unable to get properties from children of source!" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "Unable to get properties from children of source!" )),
                     rContext.xProcessor );
                 // Unreachable
             }
@@ -1640,8 +1640,8 @@ void globalTransfer_(
                     ucb::IOErrorCode_CANT_READ,
                     uno::Sequence< uno::Any >(&aProps, 1),
                     rContext.xOrigEnv,
-                    rtl::OUString::createFromAscii(
-                        "Unable to get children of source!" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "Unable to get children of source!" )),
                     rContext.xProcessor );
                 // Unreachable
             }
@@ -1697,14 +1697,13 @@ void globalTransfer_(
             aAny =
                 xcp->execute(
                     ucb::Command(
-                        rtl::OUString::createFromAscii("getCommandInfo"),
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getCommandInfo")),
                         -1,
                         uno::Any()),
                     0,
                     rContext.xEnv );
 
-        const rtl::OUString cmdName =
-            rtl::OUString::createFromAscii("flush");
+        const rtl::OUString cmdName(RTL_CONSTASCII_USTRINGPARAM("flush"));
         if((aAny >>= xci) && xci->hasCommandByName(cmdName))
             xcp->execute(
                 ucb::Command(
@@ -1792,8 +1791,8 @@ void UniversalContentBroker::globalTransfer(
             ucb::IOErrorCode_CANT_READ,
             uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
-            rtl::OUString::createFromAscii(
-                "Can't instanciate target object!" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "Can't instanciate target object!" )),
             this );
         // Unreachable
     }
@@ -1817,8 +1816,8 @@ void UniversalContentBroker::globalTransfer(
                 ucb::IOErrorCode_CANT_READ,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 xEnv,
-                rtl::OUString::createFromAscii(
-                    "Target content is not a XCommandProcessor!" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "Target content is not a XCommandProcessor!" )),
                 this );
             // Unreachable
         }
@@ -1838,7 +1837,7 @@ void UniversalContentBroker::globalTransfer(
             try
             {
                 ucb::Command aCommand(
-                    rtl::OUString::createFromAscii( "transfer" ), // Name
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("transfer")), // Name
                     -1,                                           // Handle
                     uno::makeAny( aTransferArg ) );               // Argument
 
@@ -1874,7 +1873,7 @@ void UniversalContentBroker::globalTransfer(
                             ucb::NameClash::ERROR );
 
                         ucb::Command aCommand1(
-                            rtl::OUString::createFromAscii( "transfer" ),
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("transfer")),
                             -1,
                             uno::makeAny( aTransferArg1 ) );
 
@@ -1981,8 +1980,8 @@ void UniversalContentBroker::globalTransfer(
             ucb::IOErrorCode_CANT_READ,
             uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
-            rtl::OUString::createFromAscii(
-                "Can't instanciate source object!" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "Can't instanciate source object!" )),
             this );
         // Unreachable
     }
@@ -2002,8 +2001,8 @@ void UniversalContentBroker::globalTransfer(
             ucb::IOErrorCode_CANT_READ,
             uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
-            rtl::OUString::createFromAscii(
-                "Source content is not a XCommandProcessor!" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "Source content is not a XCommandProcessor!" )),
             this );
         // Unreachable
     }
@@ -2012,17 +2011,17 @@ void UniversalContentBroker::globalTransfer(
 
     uno::Sequence< beans::Property > aProps( 4 );
 
-    aProps[ 0 ].Name   = rtl::OUString::createFromAscii( "IsFolder" );
+    aProps[ 0 ].Name   = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder"));
     aProps[ 0 ].Handle = -1; /* unknown */
-    aProps[ 1 ].Name   = rtl::OUString::createFromAscii( "IsDocument" );
+    aProps[ 1 ].Name   = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument"));
     aProps[ 1 ].Handle = -1; /* unknown */
-    aProps[ 2 ].Name   = rtl::OUString::createFromAscii( "TargetURL" );
+    aProps[ 2 ].Name   = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL"));
     aProps[ 2 ].Handle = -1; /* unknown */
-    aProps[ 3 ].Name   = rtl::OUString::createFromAscii( "BaseURI" );
+    aProps[ 3 ].Name   = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseURI"));
     aProps[ 3 ].Handle = -1; /* unknown */
 
     ucb::Command aGetPropsCommand(
-                rtl::OUString::createFromAscii( "getPropertyValues" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertyValues")),
                 -1,
                 uno::makeAny( aProps ) );
 
@@ -2042,8 +2041,8 @@ void UniversalContentBroker::globalTransfer(
             ucb::IOErrorCode_CANT_READ,
             uno::Sequence< uno::Any >(&aProps2, 1),
             xEnv,
-            rtl::OUString::createFromAscii(
-                "Unable to get properties from source object!" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "Unable to get properties from source object!" )),
             this );
         // Unreachable
     }
@@ -2076,7 +2075,7 @@ void UniversalContentBroker::globalTransfer(
         try
         {
             ucb::Command aCommand(
-                rtl::OUString::createFromAscii( "delete" ), // Name
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), // Name
                 -1,                                         // Handle
                 uno::makeAny( sal_Bool( sal_True ) ) );     // Argument
 
diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx
index 008d974d349f..2adba422c649 100644
--- a/ucb/source/core/ucbprops.cxx
+++ b/ucb/source/core/ucbprops.cxx
@@ -358,10 +358,10 @@ XTYPEPROVIDER_IMPL_3( UcbPropertiesManager,
 //=========================================================================
 
 XSERVICEINFO_IMPL_1( UcbPropertiesManager,
-                     OUString::createFromAscii(
-                         "com.sun.star.comp.ucb.UcbPropertiesManager" ),
-                     OUString::createFromAscii(
-                         PROPERTIES_MANAGER_SERVICE_NAME ) );
+                     OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         "com.sun.star.comp.ucb.UcbPropertiesManager" )),
+                     OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         PROPERTIES_MANAGER_SERVICE_NAME )) );
 
 //=========================================================================
 //
diff --git a/ucb/source/core/ucbserv.cxx b/ucb/source/core/ucbserv.cxx
index b54cc98436ab..73b1523ad1b9 100644
--- a/ucb/source/core/ucbserv.cxx
+++ b/ucb/source/core/ucbserv.cxx
@@ -47,9 +47,9 @@ static sal_Bool writeInfo( void * pRegistryKey,
                            const OUString & rImplementationName,
                                Sequence< OUString > const & rServiceNames )
 {
-    OUString aKeyName( OUString::createFromAscii( "/" ) );
+    OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM("/") );
     aKeyName += rImplementationName;
-    aKeyName += OUString::createFromAscii( "/UNO/SERVICES" );
+    aKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
 
     Reference< XRegistryKey > xKey;
     try
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 8ca46ae8d510..912e2c94b395 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -244,10 +244,10 @@ XTYPEPROVIDER_IMPL_4( UcbStore,
 //=========================================================================
 
 XSERVICEINFO_IMPL_1( UcbStore,
-                     OUString::createFromAscii(
-                         "com.sun.star.comp.ucb.UcbStore" ),
-                     OUString::createFromAscii(
-                         STORE_SERVICE_NAME ) );
+                     OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         "com.sun.star.comp.ucb.UcbStore" )),
+                     OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         STORE_SERVICE_NAME )) );
 
 //=========================================================================
 //
@@ -383,10 +383,10 @@ XTYPEPROVIDER_IMPL_4( PropertySetRegistry,
 //=========================================================================
 
 XSERVICEINFO_NOFACTORY_IMPL_1( PropertySetRegistry,
-                                OUString::createFromAscii(
-                                   "com.sun.star.comp.ucb.PropertySetRegistry" ),
-                                OUString::createFromAscii(
-                                   PROPSET_REG_SERVICE_NAME ) );
+                                OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                   "com.sun.star.comp.ucb.PropertySetRegistry" )),
+                                OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                   PROPSET_REG_SERVICE_NAME )) );
 
 //=========================================================================
 //
@@ -461,7 +461,7 @@ PropertySetRegistry::openPropertySet( const OUString& key, sal_Bool create )
 
 //                              // Set Values
 //                              xNameReplace->replaceByName(
-//                                      OUString::createFromAscii( "Values" ),
+//                                      OUString(RTL_CONSTASCII_USTRINGPARAM("Values")),
 //                                      makeAny( ... ) );
 
                                 // Insert new item.
@@ -845,7 +845,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
                 {
                     rtl::OUString aOldValuesKey
                         = makeHierarchalNameSegment( rOldKey );
-                    aOldValuesKey += OUString::createFromAscii( "/Values" );
+                    aOldValuesKey += OUString(RTL_CONSTASCII_USTRINGPARAM("/Values"));
 
                     Reference< XNameAccess > xOldNameAccess;
                     xRootHierNameAccess->getByHierarchicalName(
@@ -867,7 +867,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
                     {
                         rtl::OUString aNewValuesKey
                             = makeHierarchalNameSegment( rNewKey );
-                        aNewValuesKey += OUString::createFromAscii( "/Values" );
+                        aNewValuesKey += OUString(RTL_CONSTASCII_USTRINGPARAM("/Values"));
 
                         Reference< XSingleServiceFactory > xNewFac;
                         xRootHierNameAccess->getByHierarchicalName(
@@ -891,16 +891,12 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
                             return;
                         }
 
-                        aOldValuesKey += OUString::createFromAscii( "/" );
+                        aOldValuesKey += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
-                        OUString aHandleKey
-                            = OUString::createFromAscii( "/Handle" );
-                        OUString aValueKey
-                            = OUString::createFromAscii( "/Value" );
-                        OUString aStateKey
-                            = OUString::createFromAscii( "/State" );
-                        OUString aAttrKey
-                            = OUString::createFromAscii( "/Attributes" );
+                        OUString aHandleKey(RTL_CONSTASCII_USTRINGPARAM("/Handle"));
+                        OUString aValueKey(RTL_CONSTASCII_USTRINGPARAM("/Value"));
+                        OUString aStateKey(RTL_CONSTASCII_USTRINGPARAM("/State"));
+                        OUString aAttrKey(RTL_CONSTASCII_USTRINGPARAM("/Attributes"));
 
                         for ( sal_Int32 n = 0; n < nCount; ++n )
                         {
@@ -931,7 +927,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
                                 xRootHierNameAccess->getByHierarchicalName(
                                     aNewKey1 );
                             xNewPropNameReplace->replaceByName(
-                                OUString::createFromAscii( "Handle" ),
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("Handle")),
                                 aAny );
 
                             // ... value
@@ -941,7 +937,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
                                 xRootHierNameAccess->getByHierarchicalName(
                                     aNewKey1 );
                             xNewPropNameReplace->replaceByName(
-                                OUString::createFromAscii( "Value" ),
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("Value")),
                                 aAny );
 
                             // ... state
@@ -951,7 +947,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
                                 xRootHierNameAccess->getByHierarchicalName(
                                     aNewKey1 );
                             xNewPropNameReplace->replaceByName(
-                                OUString::createFromAscii( "State" ),
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("State")),
                                 aAny );
 
                             // ... attributes
@@ -961,7 +957,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
                                 xRootHierNameAccess->getByHierarchicalName(
                                     aNewKey1 );
                             xNewPropNameReplace->replaceByName(
-                                OUString::createFromAscii( "Attributes" ),
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("Attributes")),
                                 aAny );
 
                             // Insert new item.
@@ -1091,9 +1087,9 @@ Reference< XMultiServiceFactory > PropertySetRegistry::getConfigProvider()
                     m_pImpl->m_xConfigProvider
                         = Reference< XMultiServiceFactory >(
                             m_xSMgr->createInstance(
-                                OUString::createFromAscii(
+                                OUString(RTL_CONSTASCII_USTRINGPARAM(
                                     "com.sun.star.configuration."
-                                    "ConfigurationProvider" ) ),
+                                    "ConfigurationProvider" )) ),
                             UNO_QUERY );
 
                     OSL_ENSURE( m_pImpl->m_xConfigProvider.is(),
@@ -1149,8 +1145,8 @@ Reference< XInterface > PropertySetRegistry::getRootConfigReadAccess()
 
                 m_pImpl->m_xRootReadAccess =
                     m_pImpl->m_xConfigProvider->createInstanceWithArguments(
-                        OUString::createFromAscii(
-                            "com.sun.star.configuration.ConfigurationAccess" ),
+                        OUString(RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.configuration.ConfigurationAccess" )),
                         aArguments );
 
                 if ( m_pImpl->m_xRootReadAccess.is() )
@@ -1221,8 +1217,8 @@ Reference< XInterface > PropertySetRegistry::getConfigWriteAccess(
 
                 m_pImpl->m_xRootWriteAccess =
                     m_pImpl->m_xConfigProvider->createInstanceWithArguments(
-                        OUString::createFromAscii(
-                            "com.sun.star.configuration.ConfigurationUpdateAccess" ),
+                        OUString(RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.configuration.ConfigurationUpdateAccess" )),
                         aArguments );
 
                 OSL_ENSURE( m_pImpl->m_xRootWriteAccess.is(),
@@ -1401,10 +1397,10 @@ XTYPEPROVIDER_IMPL_8( PersistentPropertySet,
 //=========================================================================
 
 XSERVICEINFO_NOFACTORY_IMPL_1( PersistentPropertySet,
-                                OUString::createFromAscii(
-                                   "com.sun.star.comp.ucb.PersistentPropertySet" ),
-                                OUString::createFromAscii(
-                                   PERS_PROPSET_SERVICE_NAME ) );
+                                OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                   "com.sun.star.comp.ucb.PersistentPropertySet" )),
+                                OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                   PERS_PROPSET_SERVICE_NAME )) );
 
 //=========================================================================
 //
@@ -1507,7 +1503,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValue(
     if ( xRootHierNameAccess.is() )
     {
         OUString aFullPropName( getFullKey() );
-        aFullPropName += OUString::createFromAscii( "/" );
+        aFullPropName += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
         aFullPropName += makeHierarchalNameSegment( aPropertyName );
 
         // Does property exist?
@@ -1526,7 +1522,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValue(
                 {
                     // Obtain old value
                     OUString aValueName = aFullPropName;
-                    aValueName += OUString::createFromAscii( "/Value" );
+                    aValueName += OUString(RTL_CONSTASCII_USTRINGPARAM("/Value"));
                     Any aOldValue
                         = xRootHierNameAccess->getByHierarchicalName(
                                                                 aValueName );
@@ -1539,12 +1535,12 @@ void SAL_CALL PersistentPropertySet::setPropertyValue(
 
                     // Write value
                     xNameReplace->replaceByName(
-                                    OUString::createFromAscii( "Value" ),
+                                    OUString(RTL_CONSTASCII_USTRINGPARAM("Value")),
                                     aValue );
 
                     // Write state ( Now it is a directly set value )
                     xNameReplace->replaceByName(
-                                    OUString::createFromAscii( "State" ),
+                                    OUString(RTL_CONSTASCII_USTRINGPARAM("State")),
                                     makeAny(
                                         sal_Int32(
                                             PropertyState_DIRECT_VALUE ) ) );
@@ -1557,7 +1553,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValue(
                     {
                         // Obtain handle
                         aValueName = aFullPropName;
-                        aValueName += OUString::createFromAscii( "/Handle" );
+                        aValueName += OUString(RTL_CONSTASCII_USTRINGPARAM("/Handle"));
                         sal_Int32 nHandle = -1;
                         xRootHierNameAccess->getByHierarchicalName( aValueName )
                             >>= nHandle;
@@ -1613,9 +1609,9 @@ Any SAL_CALL PersistentPropertySet::getPropertyValue(
     if ( xNameAccess.is() )
     {
         OUString aFullPropName( getFullKey() );
-        aFullPropName += OUString::createFromAscii( "/" );
+        aFullPropName += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
         aFullPropName += makeHierarchalNameSegment( PropertyName );
-        aFullPropName += OUString::createFromAscii( "/Value" );
+        aFullPropName += OUString(RTL_CONSTASCII_USTRINGPARAM("/Value"));
         try
         {
             return xNameAccess->getByHierarchicalName( aFullPropName );
@@ -1774,7 +1770,7 @@ void SAL_CALL PersistentPropertySet::addProperty(
     {
         aFullValuesName = getFullKey();
         OUString aFullPropName = aFullValuesName;
-        aFullPropName += OUString::createFromAscii( "/" );
+        aFullPropName += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
         aFullPropName += makeHierarchalNameSegment( Name );
 
         if ( xRootHierNameAccess->hasByHierarchicalName( aFullPropName ) )
@@ -1820,24 +1816,24 @@ void SAL_CALL PersistentPropertySet::addProperty(
 
                 // Set handle
                 xNameReplace->replaceByName(
-                                    OUString::createFromAscii( "Handle" ),
+                                    OUString(RTL_CONSTASCII_USTRINGPARAM("Handle")),
                                     makeAny( sal_Int32( -1 ) ) );
 
                 // Set default value
                 xNameReplace->replaceByName(
-                                    OUString::createFromAscii( "Value" ),
+                                    OUString(RTL_CONSTASCII_USTRINGPARAM("Value")),
                                     DefaultValue );
 
                 // Set state ( always "default" )
                 xNameReplace->replaceByName(
-                                    OUString::createFromAscii( "State" ),
+                                    OUString(RTL_CONSTASCII_USTRINGPARAM("State")),
                                     makeAny(
                                         sal_Int32(
                                             PropertyState_DEFAULT_VALUE ) ) );
 
                 // Set attributes
                 xNameReplace->replaceByName(
-                                    OUString::createFromAscii( "Attributes" ),
+                                    OUString(RTL_CONSTASCII_USTRINGPARAM("Attributes")),
                                     makeAny( sal_Int32( Attributes ) ) );
 
                 // Insert new item.
@@ -1930,7 +1926,7 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name )
     {
         aFullValuesName = getFullKey();
         aFullPropName   = aFullValuesName;
-        aFullPropName   += OUString::createFromAscii( "/" );
+        aFullPropName   += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
         aFullPropName   += makeHierarchalNameSegment( Name );
 
         // Property in set?
@@ -1941,7 +1937,7 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name )
         try
         {
             OUString aFullAttrName = aFullPropName;
-            aFullAttrName += OUString::createFromAscii( "/Attributes" );
+            aFullAttrName += OUString(RTL_CONSTASCII_USTRINGPARAM("/Attributes"));
 
             sal_Int32 nAttribs = 0;
             if ( xRootHierNameAccess->getByHierarchicalName( aFullAttrName )
@@ -2001,7 +1997,7 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name )
                     {
                         OUString aFullHandleName = aFullPropName;
                         aFullHandleName
-                                += OUString::createFromAscii( "/Handle" );
+                                += OUString(RTL_CONSTASCII_USTRINGPARAM("/Handle"));
 
                         if ( ! ( xRootHierNameAccess->getByHierarchicalName(
                                         aFullHandleName ) >>= nHandle ) )
@@ -2135,12 +2131,9 @@ Sequence< PropertyValue > SAL_CALL PersistentPropertySet::getPropertyValues()
                     {
                         Sequence< PropertyValue > aValues( nCount );
 
-                        const OUString aHandleName
-                                    = OUString::createFromAscii( "/Handle" );
-                        const OUString aValueName
-                                    = OUString::createFromAscii( "/Value" );
-                        const OUString aStateName
-                                    = OUString::createFromAscii( "/State" );
+                        const OUString aHandleName(RTL_CONSTASCII_USTRINGPARAM("/Handle"));
+                        const OUString aValueName(RTL_CONSTASCII_USTRINGPARAM("/Value"));
+                        const OUString aStateName(RTL_CONSTASCII_USTRINGPARAM("/State"));
 
                         for ( sal_Int32 n = 0; n < nCount; ++n )
                         {
@@ -2265,7 +2258,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValues(
         Events aEvents;
 
         OUString aFullPropNamePrefix( getFullKey() );
-        aFullPropNamePrefix += OUString::createFromAscii( "/" );
+        aFullPropNamePrefix += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
         // Iterate over given property value sequence.
         for ( sal_Int32 n = 0; n < nCount; ++n )
@@ -2292,23 +2285,23 @@ void SAL_CALL PersistentPropertySet::setPropertyValues(
                     {
                         // Write handle
                         xNameReplace->replaceByName(
-                                    OUString::createFromAscii( "Handle" ),
+                                    OUString(RTL_CONSTASCII_USTRINGPARAM("Handle")),
                                     makeAny( rNewValue.Handle ) );
 
                         // Save old value
                         OUString aValueName = aFullPropName;
-                        aValueName += OUString::createFromAscii( "/Value" );
+                        aValueName += OUString(RTL_CONSTASCII_USTRINGPARAM("/Value"));
                         Any aOldValue
                             = xRootHierNameAccess->getByHierarchicalName(
                                                                 aValueName );
                         // Write value
                         xNameReplace->replaceByName(
-                                    OUString::createFromAscii( "Value" ),
+                                    OUString(RTL_CONSTASCII_USTRINGPARAM("Value")),
                                     rNewValue.Value );
 
                         // Write state ( Now it is a directly set value )
                         xNameReplace->replaceByName(
-                                    OUString::createFromAscii( "State" ),
+                                    OUString(RTL_CONSTASCII_USTRINGPARAM("State")),
                                     makeAny(
                                         sal_Int32(
                                             PropertyState_DIRECT_VALUE ) ) );
@@ -2545,12 +2538,9 @@ Sequence< Property > SAL_CALL PropertySetInfo_Impl::getProperties()
 
                         if ( xHierNameAccess.is() )
                         {
-                            const OUString aHandleName
-                                = OUString::createFromAscii( "/Handle" );
-                            const OUString aValueName
-                                = OUString::createFromAscii( "/Value" );
-                            const OUString aAttrName
-                                = OUString::createFromAscii( "/Attributes" );
+                            const OUString aHandleName(RTL_CONSTASCII_USTRINGPARAM("/Handle"));
+                            const OUString aValueName(RTL_CONSTASCII_USTRINGPARAM("/Value"));
+                            const OUString aAttrName(RTL_CONSTASCII_USTRINGPARAM("/Attributes"));
 
                             Property* pProps = pPropSeq->getArray();
 
@@ -2672,7 +2662,7 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName(
     if ( xRootHierNameAccess.is() )
     {
         OUString aFullPropName( m_pOwner->getFullKey() );
-        aFullPropName += OUString::createFromAscii( "/" );
+        aFullPropName += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
         aFullPropName += makeHierarchalNameSegment( aName );
 
         // Does property exist?
@@ -2685,7 +2675,7 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName(
 
             // Obtain handle.
             OUString aKey = aFullPropName;
-            aKey += OUString::createFromAscii( "/Handle" );
+            aKey += OUString(RTL_CONSTASCII_USTRINGPARAM("/Handle"));
 
             if ( !( xRootHierNameAccess->getByHierarchicalName( aKey )
                     >>= aProp.Handle ) )
@@ -2698,7 +2688,7 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName(
 
             // Obtain Value and extract type.
             aKey = aFullPropName;
-            aKey += OUString::createFromAscii( "/Value" );
+            aKey += OUString(RTL_CONSTASCII_USTRINGPARAM("/Value"));
 
             Any aValue = xRootHierNameAccess->getByHierarchicalName( aKey );
             if ( !aValue.hasValue() )
@@ -2713,7 +2703,7 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName(
 
             // Obtain Attributes.
             aKey = aFullPropName;
-            aKey += OUString::createFromAscii( "/Attributes" );
+            aKey += OUString(RTL_CONSTASCII_USTRINGPARAM("/Attributes"));
 
             sal_Int32 nAttribs = 0;
             if ( xRootHierNameAccess->getByHierarchicalName( aKey )
@@ -2760,7 +2750,7 @@ sal_Bool SAL_CALL PropertySetInfo_Impl::hasPropertyByName(
     if ( xRootHierNameAccess.is() )
     {
         OUString aFullPropName( m_pOwner->getFullKey() );
-        aFullPropName += OUString::createFromAscii( "/" );
+        aFullPropName += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
         aFullPropName += makeHierarchalNameSegment( Name );
 
         return xRootHierNameAccess->hasByHierarchicalName( aFullPropName );
diff --git a/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx
index 364fb53fa609..18136bc16b5d 100644
--- a/ucb/source/regexp/regexp.cxx
+++ b/ucb/source/regexp/regexp.cxx
@@ -61,7 +61,7 @@ inline Regexp::Regexp(Kind eTheKind, rtl::OUString const & rThePrefix,
     m_bTranslation(bTheTranslation)
 {
     OSL_ASSERT(m_eKind == KIND_DOMAIN
-               || !m_bEmptyDomain && m_aInfix.getLength() == 0);
+               || (!m_bEmptyDomain && m_aInfix.getLength() == 0));
     OSL_ASSERT(m_bTranslation || m_aReversePrefix.getLength() == 0);
 }
 
diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index 2cb85cb97446..551445df5e9d 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -136,10 +136,10 @@ XTYPEPROVIDER_IMPL_3( SortedDynamicResultSet,
 //--------------------------------------------------------------------------
 
 XSERVICEINFO_NOFACTORY_IMPL_1( SortedDynamicResultSet,
-                                   OUString::createFromAscii(
-                                   "com.sun.star.comp.ucb.SortedDynamicResultSet" ),
-                                   OUString::createFromAscii(
-                                   DYNAMIC_RESULTSET_SERVICE_NAME ) );
+                                   OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                   "com.sun.star.comp.ucb.SortedDynamicResultSet" )),
+                                   OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                   DYNAMIC_RESULTSET_SERVICE_NAME )) );
 
 //--------------------------------------------------------------------------
 // XComponent methods.
@@ -255,8 +255,8 @@ SortedDynamicResultSet::connectToCache(
         {
             xStubFactory = Reference< XCachedDynamicResultSetStubFactory >(
                 mxSMgr->createInstance(
-                    OUString::createFromAscii(
-                        "com.sun.star.ucb.CachedDynamicResultSetStubFactory" ) ),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.ucb.CachedDynamicResultSetStubFactory" )) ),
                 UNO_QUERY );
         }
         catch ( Exception const & )
@@ -341,7 +341,7 @@ SortedDynamicResultSet::impl_notify( const ListEvent& Changes )
     Any  aRet;
 
     try {
-        aRet = pCurSet->getPropertyValue( OUString::createFromAscii( "IsRowCountFinal" ) );
+        aRet = pCurSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) );
     }
     catch ( UnknownPropertyException ) {}
     catch ( WrappedTargetException ) {}
@@ -512,10 +512,10 @@ XTYPEPROVIDER_IMPL_3( SortedDynamicResultSetFactory,
 //--------------------------------------------------------------------------
 
 XSERVICEINFO_IMPL_1( SortedDynamicResultSetFactory,
-                         OUString::createFromAscii(
-                        "com.sun.star.comp.ucb.SortedDynamicResultSetFactory" ),
-                         OUString::createFromAscii(
-                         DYNAMIC_RESULTSET_FACTORY_NAME ) );
+                         OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.comp.ucb.SortedDynamicResultSetFactory" )),
+                         OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         DYNAMIC_RESULTSET_FACTORY_NAME )) );
 
 //--------------------------------------------------------------------------
 // Service factory implementation.
diff --git a/ucb/source/sorter/sortmain.cxx b/ucb/source/sorter/sortmain.cxx
index e23b2e384761..fef1f52a9a3e 100644
--- a/ucb/source/sorter/sortmain.cxx
+++ b/ucb/source/sorter/sortmain.cxx
@@ -43,9 +43,9 @@ static sal_Bool writeInfo( void * pRegistryKey,
                            const OUString & rImplementationName,
                               Sequence< OUString > const & rServiceNames )
 {
-    OUString aKeyName( OUString::createFromAscii( "/" ) );
+    OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM("/") );
     aKeyName += rImplementationName;
-    aKeyName += OUString::createFromAscii( "/UNO/SERVICES" );
+    aKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
 
     Reference< XRegistryKey > xKey;
     try
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 90a1d6601271..3d62a442a89a 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -248,10 +248,10 @@ XTYPEPROVIDER_IMPL_9( SortedResultSet,
 //--------------------------------------------------------------------------
 
 XSERVICEINFO_NOFACTORY_IMPL_1( SortedResultSet,
-                               OUString::createFromAscii(
-                                "com.sun.star.comp.ucb.SortedResultSet" ),
-                               OUString::createFromAscii(
-                                RESULTSET_SERVICE_NAME ) );
+                               OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                "com.sun.star.comp.ucb.SortedResultSet" )),
+                               OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                RESULTSET_SERVICE_NAME )) );
 
 //--------------------------------------------------------------------------
 // XComponent methods.
@@ -951,7 +951,7 @@ Any SAL_CALL SortedResultSet::getPropertyValue( const OUString& PropertyName )
         if ( bOrgFinal )
         {
             aOrgRet = Reference< XPropertySet >::query(mxOriginal)->
-                getPropertyValue( OUString::createFromAscii( "RowCount" ) );
+                getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) );
             aOrgRet >>= nOrgCount;
             if ( nOrgCount == maS2O.Count() )
                 aRet <<= (sal_Bool) sal_True;
@@ -1494,7 +1494,7 @@ void SortedResultSet::CheckProperties( long nOldCount, sal_Bool bWasFinal )
             sal_Bool bIsFinal = sal_False;
             PropertyChangeEvent aEvt;
 
-            aEvt.PropertyName = OUString::createFromAscii( "RowCount" );
+            aEvt.PropertyName = OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount"));
             aEvt.Further = sal_False;
             aEvt.PropertyHandle = -1;
             aEvt.OldValue <<= nOldCount;
@@ -1502,7 +1502,7 @@ void SortedResultSet::CheckProperties( long nOldCount, sal_Bool bWasFinal )
 
             PropertyChanged( aEvt );
 
-            OUString aName = OUString::createFromAscii( "IsRowCountFinal" );
+            OUString aName = OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal"));
             Any aRet = getPropertyValue( aName );
             if ( (aRet >>= bIsFinal) && bIsFinal != bWasFinal )
             {
@@ -2003,12 +2003,12 @@ void SimpleList::Replace( void* pData, sal_uInt32 nPos )
 
 SRSPropertySetInfo::SRSPropertySetInfo()
 {
-    maProps[0].Name = OUString::createFromAscii( "RowCount" );
+    maProps[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount"));
     maProps[0].Handle = -1;
     maProps[0].Type = ::getCppuType( (const OUString*) NULL );
     maProps[0].Attributes = -1;
 
-    maProps[1].Name = OUString::createFromAscii( "IsRowCountFinal" );
+    maProps[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal"));
     maProps[1].Handle = -1;
     maProps[1].Type = ::getBooleanCppuType();
     maProps[1].Attributes = -1;
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
index fba64800ca51..b83aa4f7b455 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -435,22 +435,22 @@ namespace ucb { namespace ucp { namespace ext
         else
         {
             // Append all Core Properties.
-            xRow->appendString ( Property( ::rtl::OUString::createFromAscii( "ContentType" ),
+            xRow->appendString ( Property( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType")),
                           -1,
                           getCppuType( static_cast< const ::rtl::OUString * >( 0 ) ),
                           PropertyAttribute::BOUND | PropertyAttribute::READONLY ),
                 ContentProvider::getArtificialNodeContentType() );
-            xRow->appendString ( Property( ::rtl::OUString::createFromAscii( "Title" ),
+            xRow->appendString ( Property( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
                           -1,
                           getCppuType( static_cast< const ::rtl::OUString * >( 0 ) ),
                           PropertyAttribute::BOUND | PropertyAttribute::READONLY ),
                 i_rTitle );
-            xRow->appendBoolean( Property( ::rtl::OUString::createFromAscii( "IsDocument" ),
+            xRow->appendBoolean( Property( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")),
                           -1,
                           getCppuBooleanType(),
                           PropertyAttribute::BOUND | PropertyAttribute::READONLY ),
                 sal_False );
-            xRow->appendBoolean( Property( ::rtl::OUString::createFromAscii( "IsFolder" ),
+            xRow->appendBoolean( Property( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")),
                           -1,
                           getCppuBooleanType(),
                           PropertyAttribute::BOUND | PropertyAttribute::READONLY ),
@@ -541,7 +541,7 @@ namespace ucb { namespace ucp { namespace ext
         for ( sal_Int32 n = 0; n < nCount; ++n, ++pValues )
         {
             // all our properties are read-only ...
-            aRet[ n ] <<= IllegalAccessException( ::rtl::OUString::createFromAscii( "property is read-only." ), *this );
+            aRet[ n ] <<= IllegalAccessException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("property is read-only.")), *this );
         }
 
         return aRet;
diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx
index 4892a5fbb8b6..79927f9b427b 100644
--- a/ucb/source/ucp/ext/ucpext_provider.cxx
+++ b/ucb/source/ucp/ext/ucpext_provider.cxx
@@ -140,7 +140,7 @@ namespace ucb { namespace ucp { namespace ext
         throw( IllegalIdentifierException, RuntimeException )
     {
         // Check URL scheme...
-        const ::rtl::OUString sScheme( rtl::OUString::createFromAscii( "vnd.sun.star.extension" ) );
+        const ::rtl::OUString sScheme( RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.extension") );
         if ( !i_rIdentifier->getContentProviderScheme().equalsIgnoreAsciiCase( sScheme ) )
             throw IllegalIdentifierException();
 
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index f4ddfd769f4a..ae661d18dcf4 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -267,7 +267,7 @@ rtl::OUString SAL_CALL
 BaseContent::getImplementationName()
     throw( RuntimeException)
 {
-    return rtl::OUString::createFromAscii( "com.sun.star.comp.ucb.FileContent" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ucb.FileContent"));
 }
 
 
@@ -289,7 +289,7 @@ BaseContent::getSupportedServiceNames()
     throw( RuntimeException )
 {
     Sequence< rtl::OUString > ret( 1 );
-    ret[0] = rtl::OUString::createFromAscii( "com.sun.star.ucb.FileContent" );
+    ret[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.FileContent"));
     return ret;
 }
 
@@ -421,7 +421,7 @@ BaseContent::execute( const Command& aCommand,
     {
         Sequence< beans::Property > seq(1);
         seq[0] = beans::Property(
-            rtl::OUString::createFromAscii("CasePreservingURL"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CasePreservingURL")),
             -1,
             getCppuType( static_cast< sal_Bool* >(0) ),
             0 );
@@ -530,7 +530,7 @@ BaseContent::getContentType()
             {
                 // Who am I ?
                 Sequence< beans::Property > seq(1);
-                seq[0] = beans::Property( rtl::OUString::createFromAscii("IsDocument"),
+                seq[0] = beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")),
                                           -1,
                                           getCppuType( static_cast< sal_Bool* >(0) ),
                                           0 );
@@ -669,7 +669,7 @@ BaseContent::createNewContent(
     try
     {
         Sequence< beans::Property > seq(1);
-        seq[0] = beans::Property( rtl::OUString::createFromAscii("IsDocument"),
+        seq[0] = beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")),
                                   -1,
                                   getCppuType( static_cast< sal_Bool* >(0) ),
                                   0 );
@@ -872,7 +872,7 @@ BaseContent::setPropertyValues(
         return Sequence< Any >( Values.getLength() );
     }
 
-    const rtl::OUString Title = rtl::OUString::createFromAscii( "Title" );
+    const rtl::OUString Title(RTL_CONSTASCII_USTRINGPARAM("Title"));
 
     // Special handling for files which have to be inserted
     if( m_nState & JustInserted )
@@ -926,7 +926,7 @@ BaseContent::setPropertyValues(
                             // m_aUncPath contains parent's URI.
 
                             if( m_aUncPath.lastIndexOf( sal_Unicode('/') ) != m_aUncPath.getLength() - 1 )
-                                m_aUncPath += rtl::OUString::createFromAscii("/");
+                                m_aUncPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
                             m_aUncPath += rtl::Uri::encode( NewTitle,
                                                             rtl_UriCharClassPchar,
@@ -967,7 +967,7 @@ BaseContent::setPropertyValues(
 
             rtl::OUString aDstName = getParentName( m_aUncPath );
             if( aDstName.lastIndexOf( sal_Unicode('/') ) != aDstName.getLength() - 1 )
-                aDstName += rtl::OUString::createFromAscii("/");
+                aDstName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
             aDstName += rtl::Uri::encode( NewTitle,
                                           rtl_UriCharClassPchar,
@@ -1129,7 +1129,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier,
 
     // Is destination a document or a folder ?
     Sequence< beans::Property > seq(1);
-    seq[0] = beans::Property( rtl::OUString::createFromAscii("IsDocument"),
+    seq[0] = beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")),
                               -1,
                               getCppuType( static_cast< sal_Bool* >(0) ),
                               0 );
@@ -1152,7 +1152,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier,
         // as child
         dstUncPath = m_aUncPath;
 
-    dstUncPath += ( rtl::OUString::createFromAscii( "/" ) + NewTitle );
+    dstUncPath += ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + NewTitle );
 
     sal_Int32 NameClash = aTransferInfo.NameClash;
 
@@ -1198,7 +1198,7 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier,
     sal_Bool bDocument = false;
 
     Sequence< beans::Property > seq(1);
-    seq[0] = beans::Property( rtl::OUString::createFromAscii("IsDocument"),
+    seq[0] = beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")),
                               -1,
                               getCppuType( static_cast< sal_Bool* >(0) ),
                               0 );
@@ -1264,7 +1264,7 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier,
             m_pMyShell->clearError( nMyCommandIdentifier );
             m_aUncPath = getParentName( m_aUncPath );
             if( m_aUncPath.lastIndexOf( sal_Unicode('/') ) != m_aUncPath.getLength() - 1 )
-                m_aUncPath += rtl::OUString::createFromAscii("/");
+                m_aUncPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
             m_aUncPath += rtl::Uri::encode( aRequestImpl->newName(),
                                             rtl_UriCharClassPchar,
diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx
index d17fcc646497..1c8e7eb63bfb 100644
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
@@ -222,10 +222,10 @@ namespace fileaccess {
         rtl::OUString aParent = aFileName.copy( 0,lastIndex );
 
         if( aParent[ aParent.getLength()-1] == sal_Unicode(':') && aParent.getLength() == 6 )
-            aParent += rtl::OUString::createFromAscii( "/" );
+            aParent += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
         if( 0 == aParent.compareToAscii( "file://" ) )
-            aParent = rtl::OUString::createFromAscii( "file:///" );
+            aParent = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///"));
 
         return aParent;
     }
@@ -536,8 +536,8 @@ namespace fileaccess {
             Sequence< ::rtl::OUString > aSeq( 1 );
             aSeq[0] =
                 ( errorCode == TASKHANDLING_NONAMESET_INSERT_COMMAND )  ?
-                rtl::OUString::createFromAscii( "Title" )               :
-                rtl::OUString::createFromAscii( "ContentType" );
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"))               :
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType"));
 
             aAny <<= MissingPropertiesException(
                 rtl::OUString(
@@ -603,7 +603,7 @@ namespace fileaccess {
             InteractiveAugmentedIOException excep;
             excep.Code = IOErrorCode_INVALID_CHARACTER;
             PropertyValue prop;
-            prop.Name = rtl::OUString::createFromAscii("ResourceName");
+            prop.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ResourceName"));
             prop.Handle = -1;
             rtl::OUString m_aClashingName(
                 rtl::Uri::decode(
diff --git a/ucb/source/ucp/file/filinsreq.cxx b/ucb/source/ucp/file/filinsreq.cxx
index 2738151fbf8a..66ac700013e6 100644
--- a/ucb/source/ucp/file/filinsreq.cxx
+++ b/ucb/source/ucp/file/filinsreq.cxx
@@ -207,7 +207,7 @@ XInteractionRequestImpl::getRequest()
         InteractiveAugmentedIOException excep;
         excep.Code = IOErrorCode_INVALID_CHARACTER;
         PropertyValue prop;
-        prop.Name = rtl::OUString::createFromAscii("ResourceName");
+        prop.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ResourceName"));
         prop.Handle = -1;
         prop.Value <<= m_aClashingName;
         Sequence<Any> seq(1);
diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx
index 31246a8f9771..4bd7954917ef 100644
--- a/ucb/source/ucp/file/filrow.cxx
+++ b/ucb/source/ucp/file/filrow.cxx
@@ -56,7 +56,7 @@ sal_Bool convert( shell* pShell,
         {
             xConverter = uno::Reference< script::XTypeConverter >(
                 pShell->m_xMultiServiceFactory->createInstance(
-                    rtl::OUString::createFromAscii( "com.sun.star.script.Converter" ) ),uno::UNO_QUERY );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter")) ), uno::UNO_QUERY );
 
 /*          DBG_ASSERT( m_xTypeConverter.is(),
                         "PropertyValueSet::getTypeConverter() - "
diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx
index f2c3ec8e77ba..88b78ff61a1d 100644
--- a/ucb/source/ucp/file/filrset.cxx
+++ b/ucb/source/ucp/file/filrset.cxx
@@ -237,7 +237,7 @@ void XResultSet_impl::rowCountChanged()
         aOldValue = aNewValue-1;
     }
     beans::PropertyChangeEvent aEv;
-    aEv.PropertyName = rtl::OUString::createFromAscii( "RowCount" );
+    aEv.PropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount"));
     aEv.Further = false;
     aEv.PropertyHandle = -1;
     aEv.OldValue <<= aOldValue;
@@ -262,7 +262,7 @@ void XResultSet_impl::isFinalChanged()
         m_bRowCountFinal = true;
     }
     beans::PropertyChangeEvent aEv;
-    aEv.PropertyName = rtl::OUString::createFromAscii( "IsRowCountFinal" );
+    aEv.PropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal"));
     aEv.Further = false;
     aEv.PropertyHandle = -1;
     sal_Bool fval = false;
@@ -734,8 +734,8 @@ XResultSet_impl::connectToCache(
             xStubFactory
                 = uno::Reference< ucb::XCachedDynamicResultSetStubFactory >(
                     mxSMgr->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 & )
@@ -806,12 +806,12 @@ XResultSet_impl::getPropertySetInfo()
 {
 
     uno::Sequence< beans::Property > seq(2);
-    seq[0].Name = rtl::OUString::createFromAscii( "RowCount" );
+    seq[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount"));
     seq[0].Handle = -1;
     seq[0].Type = getCppuType( static_cast< sal_Int32* >(0) );
     seq[0].Attributes = beans::PropertyAttribute::READONLY;
 
-    seq[0].Name = rtl::OUString::createFromAscii( "IsRowCountFinal" );
+    seq[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal"));
     seq[0].Handle = -1;
     seq[0].Type = getCppuType( static_cast< sal_Bool* >(0) );
     seq[0].Attributes = beans::PropertyAttribute::READONLY;
@@ -831,8 +831,8 @@ void SAL_CALL XResultSet_impl::setPropertyValue(
            lang::WrappedTargetException,
            uno::RuntimeException)
 {
-    if( aPropertyName == rtl::OUString::createFromAscii( "IsRowCountFinal" ) ||
-        aPropertyName == rtl::OUString::createFromAscii( "RowCount" ) )
+    if( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) ||
+        aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) )
         return;
     throw beans::UnknownPropertyException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 }
@@ -844,13 +844,13 @@ uno::Any SAL_CALL XResultSet_impl::getPropertyValue(
            lang::WrappedTargetException,
            uno::RuntimeException)
 {
-    if( PropertyName == rtl::OUString::createFromAscii( "IsRowCountFinal" ) )
+    if( PropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) )
     {
         uno::Any aAny;
         aAny <<= m_bRowCountFinal;
         return aAny;
     }
-    else if ( PropertyName == rtl::OUString::createFromAscii( "RowCount" ) )
+    else if ( PropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) )
     {
         uno::Any aAny;
         sal_Int32 count = sal::static_int_cast<sal_Int32>(m_aItems.size());
@@ -869,7 +869,7 @@ void SAL_CALL XResultSet_impl::addPropertyChangeListener(
            lang::WrappedTargetException,
            uno::RuntimeException)
 {
-    if( aPropertyName == rtl::OUString::createFromAscii( "IsRowCountFinal" ) )
+    if( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) )
     {
         osl::MutexGuard aGuard( m_aMutex );
         if ( ! m_pIsFinalListeners )
@@ -878,7 +878,7 @@ void SAL_CALL XResultSet_impl::addPropertyChangeListener(
 
         m_pIsFinalListeners->addInterface( xListener );
     }
-    else if ( aPropertyName == rtl::OUString::createFromAscii( "RowCount" ) )
+    else if ( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) )
     {
         osl::MutexGuard aGuard( m_aMutex );
         if ( ! m_pRowCountListeners )
@@ -898,13 +898,13 @@ void SAL_CALL XResultSet_impl::removePropertyChangeListener(
            lang::WrappedTargetException,
            uno::RuntimeException)
 {
-    if( aPropertyName == rtl::OUString::createFromAscii( "IsRowCountFinal" ) &&
+    if( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) &&
         m_pIsFinalListeners )
     {
         osl::MutexGuard aGuard( m_aMutex );
         m_pIsFinalListeners->removeInterface( aListener );
     }
-    else if ( aPropertyName == rtl::OUString::createFromAscii( "RowCount" ) &&
+    else if ( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) &&
               m_pRowCountListeners )
     {
         osl::MutexGuard aGuard( m_aMutex );
diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx
index 71f0174edbfd..401bd8aae97b 100644
--- a/ucb/source/ucp/file/filrset.hxx
+++ b/ucb/source/ucp/file/filrset.hxx
@@ -28,9 +28,7 @@
 #ifndef _FILRSET_HXX_
 #define _FILRSET_HXX_
 
-#ifndef __SGI_STL_VECTOR
 #include <vector>
-#endif
 #include <ucbhelper/macros.hxx>
 #include <osl/file.hxx>
 
diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx
index d034538e47ff..6860acfeac41 100644
--- a/ucb/source/ucp/file/filstr.cxx
+++ b/ucb/source/ucp/file/filstr.cxx
@@ -303,8 +303,8 @@ XStream_impl::closeStream(
 
         if( err != osl::FileBase::E_None ) {
             io::IOException ex;
-            ex.Message = rtl::OUString::createFromAscii(
-                "could not close file");
+            ex.Message = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "could not close file"));
             throw ex;
         }
 
diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx
index ff56db01b8a3..38aba3bb4537 100644
--- a/ucb/source/ucp/file/filtask.hxx
+++ b/ucb/source/ucp/file/filtask.hxx
@@ -93,7 +93,7 @@ namespace fileaccess
                 m_bHandled = true;
             }
 
-            bool isHandled()
+            bool isHandled() const
             {
                 return true;
             }
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index b167757eeac1..4292c5fefe87 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -56,9 +56,9 @@ static sal_Bool writeInfo( void * pRegistryKey,
                            const rtl::OUString & rImplementationName,
                               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"));
 
     Reference< registry::XRegistryKey > xKey;
     try
@@ -263,7 +263,7 @@ FileProvider::supportsService(
                   const rtl::OUString& ServiceName )
   throw( RuntimeException )
 {
-  return ServiceName == rtl::OUString::createFromAscii( "com.sun.star.ucb.FileContentProvider" );
+  return ServiceName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.FileContentProvider"));
 }
 
 
@@ -468,17 +468,17 @@ private:
 XPropertySetInfoImpl2::XPropertySetInfoImpl2()
     : m_seq( 3 )
 {
-    m_seq[0] = Property( rtl::OUString::createFromAscii( "HostName" ),
+    m_seq[0] = Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HostName")),
                          -1,
                          getCppuType( static_cast< rtl::OUString* >( 0 ) ),
                          PropertyAttribute::READONLY );
 
-    m_seq[1] = Property( rtl::OUString::createFromAscii( "HomeDirectory" ),
+    m_seq[1] = Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HomeDirectory")),
                          -1,
                          getCppuType( static_cast< rtl::OUString* >( 0 ) ),
                          PropertyAttribute::READONLY );
 
-    m_seq[2] = Property( rtl::OUString::createFromAscii( "FileSystemNotation" ),
+    m_seq[2] = Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FileSystemNotation")),
                          -1,
                          getCppuType( static_cast< sal_Int32* >( 0 ) ),
                          PropertyAttribute::READONLY );
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 6b5ad1357c11..250d58db9b7f 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -167,24 +167,24 @@ shell::shell( const uno::Reference< lang::XMultiServiceFactory >& xMultiServiceF
       m_bWithConfig( bWithConfig ),
       m_pProvider( pProvider ),
       m_xMultiServiceFactory( xMultiServiceFactory ),
-      Title( rtl::OUString::createFromAscii( "Title" ) ),
+      Title( RTL_CONSTASCII_USTRINGPARAM("Title") ),
       CasePreservingURL(
-          rtl::OUString::createFromAscii( "CasePreservingURL" ) ),
-      IsDocument( rtl::OUString::createFromAscii( "IsDocument" ) ),
-      IsFolder( rtl::OUString::createFromAscii( "IsFolder" ) ),
-      DateModified( rtl::OUString::createFromAscii( "DateModified" ) ),
-      Size( rtl::OUString::createFromAscii( "Size" ) ),
-      IsVolume( rtl::OUString::createFromAscii( "IsVolume" ) ),
-      IsRemoveable( rtl::OUString::createFromAscii( "IsRemoveable" ) ),
-      IsRemote( rtl::OUString::createFromAscii( "IsRemote" ) ),
-      IsCompactDisc( rtl::OUString::createFromAscii( "IsCompactDisc" ) ),
-      IsFloppy( rtl::OUString::createFromAscii( "IsFloppy" ) ),
-      IsHidden( rtl::OUString::createFromAscii( "IsHidden" ) ),
-      ContentType( rtl::OUString::createFromAscii( "ContentType" ) ),
-      IsReadOnly( rtl::OUString::createFromAscii( "IsReadOnly" ) ),
-      CreatableContentsInfo( rtl::OUString::createFromAscii( "CreatableContentsInfo" ) ),
-      FolderContentType( rtl::OUString::createFromAscii( "application/vnd.sun.staroffice.fsys-folder" ) ),
-      FileContentType( rtl::OUString::createFromAscii( "application/vnd.sun.staroffice.fsys-file" ) ),
+          RTL_CONSTASCII_USTRINGPARAM("CasePreservingURL") ),
+      IsDocument( RTL_CONSTASCII_USTRINGPARAM("IsDocument") ),
+      IsFolder( RTL_CONSTASCII_USTRINGPARAM("IsFolder") ),
+      DateModified( RTL_CONSTASCII_USTRINGPARAM("DateModified") ),
+      Size( RTL_CONSTASCII_USTRINGPARAM("Size") ),
+      IsVolume( RTL_CONSTASCII_USTRINGPARAM("IsVolume") ),
+      IsRemoveable( RTL_CONSTASCII_USTRINGPARAM("IsRemoveable") ),
+      IsRemote( RTL_CONSTASCII_USTRINGPARAM("IsRemote") ),
+      IsCompactDisc( RTL_CONSTASCII_USTRINGPARAM("IsCompactDisc") ),
+      IsFloppy( RTL_CONSTASCII_USTRINGPARAM("IsFloppy") ),
+      IsHidden( RTL_CONSTASCII_USTRINGPARAM("IsHidden") ),
+      ContentType( RTL_CONSTASCII_USTRINGPARAM("ContentType") ),
+      IsReadOnly( RTL_CONSTASCII_USTRINGPARAM("IsReadOnly") ),
+      CreatableContentsInfo( RTL_CONSTASCII_USTRINGPARAM("CreatableContentsInfo") ),
+      FolderContentType( RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.staroffice.fsys-folder") ),
+      FileContentType( RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.staroffice.fsys-file") ),
       m_sCommandInfo( 9 )
 {
     // Title
@@ -364,45 +364,45 @@ shell::shell( const uno::Reference< lang::XMultiServiceFactory >& xMultiServiceF
                                              | beans::PropertyAttribute::READONLY ) );
 
     // Commands
-    m_sCommandInfo[0].Name = rtl::OUString::createFromAscii( "getCommandInfo" );
+    m_sCommandInfo[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getCommandInfo"));
     m_sCommandInfo[0].Handle = -1;
     m_sCommandInfo[0].ArgType = getCppuVoidType();
 
-    m_sCommandInfo[1].Name = rtl::OUString::createFromAscii( "getPropertySetInfo" );
+    m_sCommandInfo[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertySetInfo"));
     m_sCommandInfo[1].Handle = -1;
     m_sCommandInfo[1].ArgType = getCppuVoidType();
 
-    m_sCommandInfo[2].Name = rtl::OUString::createFromAscii( "getPropertyValues" );
+    m_sCommandInfo[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertyValues"));
     m_sCommandInfo[2].Handle = -1;
     m_sCommandInfo[2].ArgType = getCppuType( static_cast< uno::Sequence< beans::Property >* >( 0 ) );
 
-    m_sCommandInfo[3].Name = rtl::OUString::createFromAscii( "setPropertyValues" );
+    m_sCommandInfo[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setPropertyValues"));
     m_sCommandInfo[3].Handle = -1;
     m_sCommandInfo[3].ArgType = getCppuType( static_cast< uno::Sequence< beans::PropertyValue >* >( 0 ) );
 
-    m_sCommandInfo[4].Name = rtl::OUString::createFromAscii( "open" );
+    m_sCommandInfo[4].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open"));
     m_sCommandInfo[4].Handle = -1;
     m_sCommandInfo[4].ArgType = getCppuType( static_cast< OpenCommandArgument* >( 0 ) );
 
-    m_sCommandInfo[5].Name = rtl::OUString::createFromAscii( "transfer" );
+    m_sCommandInfo[5].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("transfer"));
     m_sCommandInfo[5].Handle = -1;
     m_sCommandInfo[5].ArgType = getCppuType( static_cast< TransferInfo* >( 0 ) );
 
-    m_sCommandInfo[6].Name = rtl::OUString::createFromAscii( "delete" );
+    m_sCommandInfo[6].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete"));
     m_sCommandInfo[6].Handle = -1;
     m_sCommandInfo[6].ArgType = getCppuType( static_cast< sal_Bool* >( 0 ) );
 
-    m_sCommandInfo[7].Name = rtl::OUString::createFromAscii( "insert" );
+    m_sCommandInfo[7].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert"));
     m_sCommandInfo[7].Handle = -1;
     m_sCommandInfo[7].ArgType = getCppuType( static_cast< InsertCommandArgument* > ( 0 ) );
 
-    m_sCommandInfo[7].Name = rtl::OUString::createFromAscii( "createNewContent" );
+    m_sCommandInfo[7].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("createNewContent"));
     m_sCommandInfo[7].Handle = -1;
     m_sCommandInfo[7].ArgType = getCppuType( static_cast< ucb::ContentInfo * > ( 0 ) );
 
     if(m_bWithConfig)
     {
-        rtl::OUString Store = rtl::OUString::createFromAscii( "com.sun.star.ucb.Store" );
+        rtl::OUString Store(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.Store"));
         uno::Reference< XPropertySetRegistryFactory > xRegFac(
             m_xMultiServiceFactory->createInstance( Store ),
             uno::UNO_QUERY );
@@ -914,7 +914,7 @@ shell::setv( const rtl::OUString& aUnqPath,
                         --propChanged; // unsuccessful setting
                         uno::Sequence< uno::Any > names( 1 );
                         ret[0] <<= beans::PropertyValue(
-                            rtl::OUString::createFromAscii("Uri"), -1,
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Uri")), -1,
                             uno::makeAny(aUnqPath),
                             beans::PropertyState_DIRECT_VALUE);
                         IOErrorCode ioError(IOErrorCode_GENERAL);
@@ -978,7 +978,7 @@ shell::setv( const rtl::OUString& aUnqPath,
                         --propChanged; // unsuccessful setting
                         uno::Sequence< uno::Any > names( 1 );
                         names[0] <<= beans::PropertyValue(
-                            rtl::OUString::createFromAscii("Uri"), -1,
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Uri")), -1,
                             uno::makeAny(aUnqPath),
                             beans::PropertyState_DIRECT_VALUE);
                         IOErrorCode ioError;
@@ -1208,7 +1208,7 @@ shell::move( sal_Int32 CommandId,
                 {
                     newDstUnqPath = dstUnqPath;
 
-                    rtl::OUString aPostFix( rtl::OUString::createFromAscii( "_" ) );
+                    rtl::OUString aPostFix( RTL_CONSTASCII_USTRINGPARAM("_") );
                     aPostFix += rtl::OUString::valueOf( ++nTry );
 
                     newDstUnqPath = newDstUnqPath.replaceAt( nPos, 0, aPostFix );
@@ -1438,7 +1438,7 @@ shell::copy(
                 {
                     newDstUnqPath = dstUnqPath;
 
-                    rtl::OUString aPostFix( rtl::OUString::createFromAscii( "_" ) );
+                    rtl::OUString aPostFix( RTL_CONSTASCII_USTRINGPARAM("_") );
                     aPostFix += rtl::OUString::valueOf( ++nTry );
 
                     newDstUnqPath = newDstUnqPath.replaceAt( nPos, 0, aPostFix );
@@ -1981,7 +1981,7 @@ sal_Bool SAL_CALL shell::getUnqFromUrl( const rtl::OUString& Url,rtl::OUString&
         0 == Url.compareToAscii( "file://localhost/" ) ||
         0 == Url.compareToAscii( "file://127.0.0.1/" ) )
     {
-        Unq = rtl::OUString::createFromAscii( "file:///" );
+        Unq = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///"));
         return false;
     }
 
@@ -2062,7 +2062,7 @@ shell::copy_recursive( const rtl::OUString& srcUnqPath,
                                           RTL_TEXTENCODING_UTF8 );
 
                 if( newDstUnqPath.lastIndexOf( sal_Unicode('/') ) != newDstUnqPath.getLength()-1 )
-                    newDstUnqPath += rtl::OUString::createFromAscii( "/" );
+                    newDstUnqPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
                 newDstUnqPath += tit;
 
@@ -3033,7 +3033,7 @@ uno::Sequence< ucb::ContentInfo > shell::queryCreatableContentsInfo()
 
     uno::Sequence< beans::Property > props( 1 );
     props[0] = beans::Property(
-        rtl::OUString::createFromAscii( "Title" ),
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
         -1,
         getCppuType( static_cast< rtl::OUString* >( 0 ) ),
         beans::PropertyAttribute::MAYBEVOID
@@ -3056,20 +3056,20 @@ uno::Sequence< ucb::ContentInfo > shell::queryCreatableContentsInfo()
 void SAL_CALL
 shell::getScheme( rtl::OUString& Scheme )
 {
-  Scheme = rtl::OUString::createFromAscii( "file" );
+  Scheme = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file"));
 }
 
 rtl::OUString SAL_CALL
 shell::getImplementationName_static( void )
 {
-  return rtl::OUString::createFromAscii( "com.sun.star.comp.ucb.FileProvider" );
+  return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ucb.FileProvider"));
 }
 
 
 uno::Sequence< rtl::OUString > SAL_CALL
 shell::getSupportedServiceNames_static( void )
 {
-  rtl::OUString Supported = rtl::OUString::createFromAscii( "com.sun.star.ucb.FileContentProvider" ) ;
+  rtl::OUString Supported(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.FileContentProvider"));
   com::sun::star::uno::Sequence< rtl::OUString > Seq( &Supported,1 );
   return Seq;
 }
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index 7b8ee427d001..0cd65184721d 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -177,10 +177,10 @@ XTYPEPROVIDER_IMPL_6( FTPContent,
 #define XSERVICEINFO_CREATE_INSTANCE_IMPL( Class )
 
 XSERVICEINFO_IMPL_1( FTPContent,
-                     rtl::OUString::createFromAscii(
-                         "com.sun.star.comp.FTPContent"),
-                     rtl::OUString::createFromAscii(
-                         "com.sun.star.ucb.FTPContent"));
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         "com.sun.star.comp.FTPContent")),
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         "com.sun.star.ucb.FTPContent")));
 
 
 
@@ -194,7 +194,7 @@ XSERVICEINFO_IMPL_1( FTPContent,
 rtl::OUString SAL_CALL FTPContent::getContentType()
     throw( RuntimeException )
 {
-    return rtl::OUString::createFromAscii(FTP_CONTENT_TYPE);
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(FTP_CONTENT_TYPE));
 }
 
 
@@ -375,7 +375,7 @@ Any SAL_CALL FTPContent::execute(
                 {
                     Sequence<Any> seq(1);
                     PropertyValue value;
-                    value.Name = rtl::OUString::createFromAscii("Uri");
+                    value.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Uri"));
                     value.Handle = -1;
                     value.Value <<= m_aFTPURL.ident(false,false);
                     value.State = PropertyState_DIRECT_VALUE;
@@ -410,7 +410,7 @@ Any SAL_CALL FTPContent::execute(
                 {
                     Sequence<Any> seq(1);
                     PropertyValue value;
-                    value.Name = rtl::OUString::createFromAscii("Uri");
+                    value.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Uri"));
                     value.Handle = -1;
                     value.Value <<= m_aFTPURL.ident(false,false);
                     value.State = PropertyState_DIRECT_VALUE;
@@ -435,8 +435,8 @@ Any SAL_CALL FTPContent::execute(
                 if(!(aCommand.Argument >>= Properties))
                 {
                     aRet <<= IllegalArgumentException(
-                                rtl::OUString::createFromAscii(
-                                    "Wrong argument type!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "Wrong argument type!" )),
                                 static_cast< cppu::OWeakObject * >(this),
                                 -1);
                     ucbhelper::cancelCommandExecution(aRet,Environment);
@@ -450,8 +450,8 @@ Any SAL_CALL FTPContent::execute(
 
                 if( ! ( aCommand.Argument >>= propertyValues ) ) {
                     aRet <<= IllegalArgumentException(
-                                rtl::OUString::createFromAscii(
-                                    "Wrong argument type!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "Wrong argument type!" )),
                                 static_cast< cppu::OWeakObject * >(this),
                                 -1);
                     ucbhelper::cancelCommandExecution(aRet,Environment);
@@ -472,8 +472,8 @@ Any SAL_CALL FTPContent::execute(
                 InsertCommandArgument aInsertArgument;
                 if ( ! ( aCommand.Argument >>= aInsertArgument ) ) {
                     aRet <<= IllegalArgumentException(
-                                rtl::OUString::createFromAscii(
-                                    "Wrong argument type!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "Wrong argument type!" )),
                                 static_cast< cppu::OWeakObject * >(this),
                                 -1);
                     ucbhelper::cancelCommandExecution(aRet,Environment);
@@ -488,8 +488,8 @@ Any SAL_CALL FTPContent::execute(
                 OpenCommandArgument2 aOpenCommand;
                 if ( !( aCommand.Argument >>= aOpenCommand ) ) {
                     aRet <<= IllegalArgumentException(
-                                rtl::OUString::createFromAscii(
-                                    "Wrong argument type!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "Wrong argument type!" )),
                                 static_cast< cppu::OWeakObject * >(this),
                                 -1);
 
@@ -533,7 +533,7 @@ Any SAL_CALL FTPContent::execute(
                             Sequence<Any> seq(1);
                             PropertyValue value;
                             value.Name =
-                                rtl::OUString::createFromAscii("Uri");
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Uri"));
                             value.Handle = -1;
                             value.Value <<= m_aFTPURL.ident(false,false);
                             value.State = PropertyState_DIRECT_VALUE;
@@ -584,8 +584,8 @@ Any SAL_CALL FTPContent::execute(
                 }
                 else {
                     aRet <<= IllegalArgumentException(
-                                rtl::OUString::createFromAscii(
-                                    "Unexpected OpenMode!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "Unexpected OpenMode!" )),
                                 static_cast< cppu::OWeakObject * >(this),
                                 -1);
 
@@ -597,8 +597,8 @@ Any SAL_CALL FTPContent::execute(
                     ucbhelper::cancelCommandExecution(
                         makeAny(
                             IllegalArgumentException(
-                                rtl::OUString::createFromAscii(
-                                    "Wrong argument type!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "Wrong argument type!" )),
                                 static_cast< cppu::OWeakObject * >(this),
                                 -1)),
                         Environment);
@@ -635,13 +635,13 @@ Any SAL_CALL FTPContent::execute(
         }
 }
 
-#define FTP_FILE rtl::OUString::createFromAscii(     \
+#define FTP_FILE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(     \
                                    "application/"    \
-                                   "vnd.sun.staroffice.ftp-file")
+                                   "vnd.sun.staroffice.ftp-file"))
 
-#define FTP_FOLDER rtl::OUString::createFromAscii(     \
+#define FTP_FOLDER rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(     \
                                    "application/"    \
-                                   "vnd.sun.staroffice.ftp-folder")
+                                   "vnd.sun.staroffice.ftp-folder"))
 
 Sequence<ContentInfo > SAL_CALL
 FTPContent::queryCreatableContentsInfo(  )
@@ -662,7 +662,7 @@ FTPContent::queryCreatableContentsInfo_Static(  )
         | ContentInfoAttribute::KIND_DOCUMENT;
     Sequence< Property > props( 1 );
     props[0] = Property(
-        rtl::OUString::createFromAscii( "Title" ),
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
         -1,
         getCppuType( static_cast< rtl::OUString* >( 0 ) ),
         PropertyAttribute::MAYBEVOID
@@ -762,7 +762,7 @@ void FTPContent::insert(const InsertCommandArgument& aInsertCommand,
     if(m_bInserted && !m_bTitleSet) {
         MissingPropertiesException excep;
         excep.Properties.realloc(1);
-        excep.Properties[0] = rtl::OUString::createFromAscii("Title");
+        excep.Properties[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
         Any aAny; aAny <<= excep;
         ucbhelper::cancelCommandExecution(aAny,Env);
     }
@@ -915,7 +915,7 @@ Sequence<Any> FTPContent::setPropertyValues(
                     rtl::OUString OldTitle = m_aFTPURL.ren(Title);
                     evt.realloc(1);
                     evt[0].PropertyName =
-                        rtl::OUString::createFromAscii("Title");
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
                     evt[0].Further = false;
                     evt[0].PropertyHandle = -1;
                     evt[0].OldValue <<= OldTitle;
@@ -936,8 +936,8 @@ Sequence<Any> FTPContent::setPropertyValues(
             for(sal_Int32 j = 0; j < props.getLength(); ++j)
                 if(props[j].Name == seqPropVal[i].Name) {
                     ret[i] <<= IllegalAccessException(
-                        rtl::OUString::createFromAscii(
-                            "Property is read-only!"),
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                            "Property is read-only!")),
                             //props[j].Attributes & PropertyAttribute::READONLY
                             //    ? "Property is read-only!"
                             //    : "Access denied!"),
diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
index c9110a44c5f9..0a2ac9b306f0 100644
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
@@ -141,7 +141,7 @@ FTPContentIdentifier::getContentProviderScheme(
         com::sun::star::uno::RuntimeException
     )
 {
-    return rtl::OUString::createFromAscii("ftp");
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ftp"));
 }
 
 
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
index 77b3655b9de5..9665d6fc1ce1 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
@@ -105,8 +105,8 @@ XTYPEPROVIDER_IMPL_3(FTPContentProvider,
 
 XSERVICEINFO_IMPL_1(
     FTPContentProvider,
-    rtl::OUString::createFromAscii("com.sun.star.comp.FTPContentProvider"),
-    rtl::OUString::createFromAscii(FTP_CONTENT_PROVIDER_SERVICE_NAME));
+    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.FTPContentProvider")),
+    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(FTP_CONTENT_PROVIDER_SERVICE_NAME)));
 
 //=========================================================================
 //
@@ -160,7 +160,7 @@ FTPContentProvider::queryContent(
                     this);
 
         if(!m_pProxyDecider->shouldUseProxy(
-            rtl::OUString::createFromAscii("ftp"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ftp")),
             aURL.host(),
             aURL.port().toInt32()))
         {
diff --git a/ucb/source/ucp/ftp/ftpresultsetI.cxx b/ucb/source/ucp/ftp/ftpresultsetI.cxx
index 54fb64bf489c..c861ebb8481e 100644
--- a/ucb/source/ucp/ftp/ftpresultsetI.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetI.cxx
@@ -72,8 +72,8 @@ ResultSetI::ResultSetI(const Reference<XMultiServiceFactory>&  xMSF,
             const rtl::OUString& Name = seqProp[i].Name;
             if(Name.compareToAscii("ContentType") == 0 )
                 xRow->appendString(seqProp[i],
-                                   rtl::OUString::createFromAscii(
-                                       "application/ftp" ));
+                                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                       "application/ftp" )));
             else if(Name.compareToAscii("Title") == 0)
                 xRow->appendString(seqProp[i],dirvec[n].m_aName);
             else if(Name.compareToAscii("IsReadOnly") == 0)
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
index 7d7173277af3..93db7e67091b 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
@@ -512,12 +512,12 @@ ResultSetBase::getPropertySetInfo()
     throw( uno::RuntimeException)
 {
     uno::Sequence< beans::Property > seq(2);
-    seq[0].Name = rtl::OUString::createFromAscii( "RowCount" );
+    seq[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount"));
     seq[0].Handle = -1;
     seq[0].Type = getCppuType( static_cast< sal_Int32* >(0) );
     seq[0].Attributes = beans::PropertyAttribute::READONLY;
 
-    seq[1].Name = rtl::OUString::createFromAscii( "IsRowCountFinal" );
+    seq[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal"));
     seq[1].Handle = -1;
     seq[1].Type = getCppuType( static_cast< sal_Bool* >(0) );
     seq[1].Attributes = beans::PropertyAttribute::READONLY;
@@ -537,8 +537,8 @@ void SAL_CALL ResultSetBase::setPropertyValue(
            lang::WrappedTargetException,
            uno::RuntimeException)
 {
-    if( aPropertyName == rtl::OUString::createFromAscii( "IsRowCountFinal" ) ||
-        aPropertyName == rtl::OUString::createFromAscii( "RowCount" ) )
+    if( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) ||
+        aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) )
         return;
 
     throw beans::UnknownPropertyException();
@@ -551,13 +551,13 @@ uno::Any SAL_CALL ResultSetBase::getPropertyValue(
            lang::WrappedTargetException,
            uno::RuntimeException)
 {
-    if( PropertyName == rtl::OUString::createFromAscii( "IsRowCountFinal" ) )
+    if( PropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) )
     {
         uno::Any aAny;
         aAny <<= m_bRowCountFinal;
         return aAny;
     }
-    else if ( PropertyName == rtl::OUString::createFromAscii( "RowCount" ) )
+    else if ( PropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) )
     {
         uno::Any aAny;
         sal_Int32 count = m_aItems.size();
@@ -576,7 +576,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener(
            lang::WrappedTargetException,
            uno::RuntimeException)
 {
-    if( aPropertyName == rtl::OUString::createFromAscii( "IsRowCountFinal" ) )
+    if( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) )
     {
         osl::MutexGuard aGuard( m_aMutex );
         if ( ! m_pIsFinalListeners )
@@ -585,7 +585,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener(
 
         m_pIsFinalListeners->addInterface( xListener );
     }
-    else if ( aPropertyName == rtl::OUString::createFromAscii( "RowCount" ) )
+    else if ( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) )
     {
         osl::MutexGuard aGuard( m_aMutex );
         if ( ! m_pRowCountListeners )
@@ -605,13 +605,13 @@ void SAL_CALL ResultSetBase::removePropertyChangeListener(
            lang::WrappedTargetException,
            uno::RuntimeException)
 {
-    if( aPropertyName == rtl::OUString::createFromAscii( "IsRowCountFinal" ) &&
+    if( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) &&
         m_pIsFinalListeners )
     {
         osl::MutexGuard aGuard( m_aMutex );
         m_pIsFinalListeners->removeInterface( aListener );
     }
-    else if ( aPropertyName == rtl::OUString::createFromAscii( "RowCount" ) &&
+    else if ( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) &&
               m_pRowCountListeners )
     {
         osl::MutexGuard aGuard( m_aMutex );
diff --git a/ucb/source/ucp/ftp/ftpservices.cxx b/ucb/source/ucp/ftp/ftpservices.cxx
index 360de25278a7..1bb8ec694a7e 100644
--- a/ucb/source/ucp/ftp/ftpservices.cxx
+++ b/ucb/source/ucp/ftp/ftpservices.cxx
@@ -41,9 +41,9 @@ static 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
diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index 5dda1fb5c5f1..b26e380aa037 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -139,9 +139,9 @@ FTPURL::FTPURL(const rtl::OUString& url,
         malformed_exception
     )
     : m_pFCP(pFCP),
-      m_aUsername(rtl::OUString::createFromAscii("anonymous")),
+      m_aUsername(RTL_CONSTASCII_USTRINGPARAM("anonymous")),
       m_bShowPassword(false),
-      m_aPort(rtl::OUString::createFromAscii("21"))
+      m_aPort(RTL_CONSTASCII_USTRINGPARAM("21"))
 {
     parse(url);  // can reset m_bShowPassword
 }
@@ -406,7 +406,7 @@ namespace ftp {
         // Setting username:password
 #define SET_USER_PASSWORD(username,password)                      \
    rtl::OUString combi(username  +                                \
-                       rtl::OUString::createFromAscii(":") +      \
+                       rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":")) +      \
                        password);                                 \
    rtl::OString aUserPsswd(combi.getStr(),                        \
                            combi.getLength(),                     \
@@ -556,7 +556,7 @@ rtl::OUString FTPURL::net_title() const
 
         if(try_more &&
            1+url.lastIndexOf(sal_Unicode('/')) != url.getLength())
-            url += rtl::OUString::createFromAscii("/");  // add end-slash
+            url += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));  // add end-slash
         else if(!try_more &&
                 1+url.lastIndexOf(sal_Unicode('/')) == url.getLength())
             url = url.copy(0,url.getLength()-1);         // remove end-slash
@@ -574,7 +574,7 @@ rtl::OUString FTPURL::net_title() const
             // Format of current working directory:
             // 257 "/bla/bla" is current directory
             sal_Int32 index1 = aNetTitle.lastIndexOf(
-                rtl::OUString::createFromAscii("257"));
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("257")));
             index1 = 1+aNetTitle.indexOf(sal_Unicode('"'),index1);
             sal_Int32 index2 = aNetTitle.indexOf(sal_Unicode('"'),index1);
             aNetTitle = aNetTitle.copy(index1,index2-index1);
@@ -602,7 +602,7 @@ rtl::OUString FTPURL::net_title() const
                 aNetTitle = decodePathSegment(m_aPathSegmentVec.back());
             else
                 // must be root
-                aNetTitle = rtl::OUString::createFromAscii("/");
+                aNetTitle = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
             try_more = false;
         }
 
@@ -737,7 +737,7 @@ void FTPURL::mkdir(bool ReplaceExisting) const
 
     rtl::OUString url(parent(true));
     if(1+url.lastIndexOf(sal_Unicode('/')) != url.getLength())
-        url += rtl::OUString::createFromAscii("/");
+        url += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     SET_URL(url);
 
     CURLcode err = curl_easy_perform(curl);
@@ -777,7 +777,7 @@ rtl::OUString FTPURL::ren(const rtl::OUString& NewTitle)
 
     rtl::OUString url(parent(true));
     if(1+url.lastIndexOf(sal_Unicode('/')) != url.getLength())
-        url += rtl::OUString::createFromAscii("/");
+        url += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     SET_URL(url);
 
     CURLcode err = curl_easy_perform(curl);
@@ -828,7 +828,7 @@ void FTPURL::del() const
 
     rtl::OUString url(parent(true));
     if(1+url.lastIndexOf(sal_Unicode('/')) != url.getLength())
-        url += rtl::OUString::createFromAscii("/");
+        url += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     SET_URL(url);
 
     CURLcode err = curl_easy_perform(curl);
diff --git a/ucb/source/ucp/ftp/test.cxx b/ucb/source/ucp/ftp/test.cxx
index 49e2416bd6e9..6c88911cc341 100644
--- a/ucb/source/ucp/ftp/test.cxx
+++ b/ucb/source/ucp/ftp/test.cxx
@@ -113,7 +113,7 @@
 
 //      Reference<XContentIdentifier> xIdent(
 //          new ftp::FTPContentIdentifier(
-//              rtl::OUString::createFromAscii("ftp://abi:psswd@abi-1/file"),
+//              rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ftp://abi:psswd@abi-1/file")),
 //              pProvider));
 
 //      Reference<XContent> xContent = xProvider->queryContent(xIdent);
@@ -132,7 +132,7 @@
 //                                        Sequence<NumberedSortingInfo>(0));
 //      Any aAny; aAny <<= aOpenCommand;
 
-//      Command aCommand(OUString::createFromAscii("open"),
+//      Command aCommand(OUString(RTL_CONSTASCII_USTRINGPARAM("open")),
 //                       -1,
 //                       aAny);
 
@@ -232,9 +232,9 @@ int main(int argc,char* argv[])
 
 //      rtl::OUString lib,tmp,testlib;
 //      std::vector<rtl::OUString> tests;
-//      sal_Int32 TEST = sce.indexOf(rtl::OUString::createFromAscii("TEST"));
-//      sal_Int32 WITH = sce.indexOf(rtl::OUString::createFromAscii("WITH"));
-//      sal_Int32 FROM = sce.indexOf(rtl::OUString::createFromAscii("FROM"));
+//      sal_Int32 TEST = sce.indexOf(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TEST")));
+//      sal_Int32 WITH = sce.indexOf(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WITH")));
+//      sal_Int32 FROM = sce.indexOf(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FROM")));
 //      lib = sce.copy(TEST+4,WITH-TEST-4).trim();
 
 //      tmp = sce.copy(WITH+4,FROM-WITH-4).trim();
@@ -263,9 +263,9 @@ int main(int argc,char* argv[])
 //      }
 
 //      osl::Module mathLib;
-//      mathLib.load(rtl::OUString::createFromAscii("libm.so"));
+//      mathLib.load(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("libm.so")));
 //      typedef double (*DF)(double);
-//      DF func = (DF)mathLib.getSymbol(rtl::OUString::createFromAscii("cos"));
+//      DF func = (DF)mathLib.getSymbol(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cos")));
 //      fprintf(stderr,"-------double %f ----------\n",(*func)(2.0));
 
 //      fprintf(stderr,"-------testing %s ----------\n",scefile);
diff --git a/ucb/source/ucp/ftp/test_ftpurl.cxx b/ucb/source/ucp/ftp/test_ftpurl.cxx
index 6e8da47fa0da..851f5c3baf4b 100644
--- a/ucb/source/ucp/ftp/test_ftpurl.cxx
+++ b/ucb/source/ucp/ftp/test_ftpurl.cxx
@@ -164,8 +164,8 @@ int test_ftplist(void) {
     FTPHandleProviderI provider;
 
     ftp::FTPURL url(
-        rtl::OUString::createFromAscii(
-            "ftp://abi:psswd@abi-1/dir"),
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "ftp://abi:psswd@abi-1/dir")),
         &provider);
 
     std::vector<ftp::FTPDirentry> vec =
@@ -230,8 +230,8 @@ int test_ftpproperties(void) {
     FTPHandleProviderI provider;
 
     ftp::FTPURL url(
-        rtl::OUString::createFromAscii(
-            "ftp://abi:psswd@abi-1/file"),
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "ftp://abi:psswd@abi-1/file")),
         &provider);
 
     ftp::FTPDirentry ade(url.direntry());
@@ -251,8 +251,8 @@ int test_ftpopen(void)
 
     FTPHandleProviderI provider;
     ftp::FTPURL url(
-        rtl::OUString::createFromAscii(
-            "ftp://abi:psswd@abi-1/file"),
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "ftp://abi:psswd@abi-1/file")),
         &provider);
 
     FILE* file = url.open();
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index 6eb02232a59c..c8c397853fb5 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -150,8 +150,8 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
 rtl::OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException )
 {
     return isFolder(uno::Reference< ucb::XCommandEnvironment >())
-        ? rtl::OUString::createFromAscii( GIO_FOLDER_TYPE )
-        : rtl::OUString::createFromAscii( GIO_FILE_TYPE );
+        ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( GIO_FOLDER_TYPE ))
+        : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( GIO_FILE_TYPE ));
 }
 
 #define EXCEPT(aExcept) \
@@ -305,7 +305,7 @@ uno::Any Content::mapGIOError( GError *pError )
 uno::Any Content::getBadArgExcept()
 {
     return uno::makeAny( lang::IllegalArgumentException(
-        rtl::OUString::createFromAscii( "Wrong argument type!" ),
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wrong argument type!")),
         static_cast< cppu::OWeakObject * >( this ), -1) );
 }
 
@@ -529,7 +529,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
 static lang::IllegalAccessException
 getReadOnlyException( const uno::Reference< uno::XInterface >& rContext )
 {
-    return lang::IllegalAccessException ( rtl::OUString::createFromAscii( "Property is read-only!" ), rContext );
+    return lang::IllegalAccessException ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Property is read-only!")), rContext );
 }
 
 void Content::queryChildren( ContentRefList& rChildren )
@@ -545,7 +545,7 @@ void Content::queryChildren( ContentRefList& rChildren )
     sal_Int32 nURLPos = aURL.lastIndexOf( '/' );
 
     if ( nURLPos != ( aURL.getLength() - 1 ) )
-        aURL += rtl::OUString::createFromAscii( "/" );
+        aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
     sal_Int32 nLen = aURL.getLength();
 
@@ -677,7 +677,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
             if (!( rValue.Value >>= aNewTitle ))
             {
                 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 ) );
                 continue;
             }
@@ -685,7 +685,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
             if ( aNewTitle.getLength() <= 0 )
             {
                 aRet[ n ] <<= lang::IllegalArgumentException
-                    ( rtl::OUString::createFromAscii( "Empty title not allowed!" ),
+                    ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty title not allowed!")),
                       static_cast< cppu::OWeakObject * >( this ), -1 );
                 continue;
 
@@ -701,7 +701,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                 g_warning ("Set new name to '%s'", newName);
 #endif
 
-                aEvent.PropertyName = rtl::OUString::createFromAscii( "Title" );
+                aEvent.PropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
                 if (oldName)
                     aEvent.OldValue = uno::makeAny(rtl::OUString(oldName, strlen(oldName), RTL_TEXTENCODING_UTF8));
                 aEvent.NewValue = uno::makeAny(aNewTitle);
@@ -745,7 +745,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                 if (!exchangeIdentity( xNewId ) )
                 {
                     aRet[ nTitlePos ] <<= uno::Exception
-                        ( rtl::OUString::createFromAscii( "Exchange failed!" ),
+                        ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Exchange failed!")),
                           static_cast< cppu::OWeakObject * >( this ) );
                 }
             }
@@ -1102,19 +1102,19 @@ uno::Sequence< ucb::ContentInfo > Content::queryCreatableContentsInfo(
         // Minimum set of props we really need
         uno::Sequence< beans::Property > props( 1 );
         props[0] = beans::Property(
-            rtl::OUString::createFromAscii( "Title" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
             -1,
             getCppuType( static_cast< rtl::OUString* >( 0 ) ),
             beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::BOUND );
 
         // file
-        seq[0].Type       = rtl::OUString::createFromAscii( GIO_FILE_TYPE );
+        seq[0].Type       = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( GIO_FILE_TYPE ));
         seq[0].Attributes = ( ucb::ContentInfoAttribute::INSERT_WITH_INPUTSTREAM |
                               ucb::ContentInfoAttribute::KIND_DOCUMENT );
         seq[0].Properties = props;
 
         // folder
-        seq[1].Type       = rtl::OUString::createFromAscii( GIO_FOLDER_TYPE );
+        seq[1].Type       = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( GIO_FOLDER_TYPE ));
         seq[1].Attributes = ucb::ContentInfoAttribute::KIND_FOLDER;
         seq[1].Properties = props;
 
@@ -1159,7 +1159,7 @@ uno::Reference< ucb::XContent >
     rtl::OUString aURL = m_xIdentifier->getContentIdentifier();
 
     if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() )
-            aURL += rtl::OUString::createFromAscii( "/" );
+            aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
     name = create_document ? "[New_Content]" : "[New_Collection]";
     aURL += rtl::OUString::createFromAscii( name );
@@ -1321,14 +1321,14 @@ uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) throw ( uno
 
 rtl::OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException )
 {
-       return rtl::OUString::createFromAscii("com.sun.star.comp.GIOContent" );
+       return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.GIOContent"));
 }
 
 uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames()
        throw( uno::RuntimeException )
 {
        uno::Sequence< rtl::OUString > aSNS( 1 );
-       aSNS.getArray()[ 0 ] = rtl::OUString::createFromAscii("com.sun.star.ucb.GIOContent" );
+       aSNS.getArray()[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.GIOContent"));
        return aSNS;
 }
 
diff --git a/ucb/source/ucp/gio/gio_datasupplier.cxx b/ucb/source/ucp/gio/gio_datasupplier.cxx
index ded89864cb34..a45892633dfc 100644
--- a/ucb/source/ucp/gio/gio_datasupplier.cxx
+++ b/ucb/source/ucp/gio/gio_datasupplier.cxx
@@ -130,7 +130,7 @@ DataSupplier::~DataSupplier()
             g_uri_escape_string( g_file_info_get_name(maResults[ nIndex ]->pInfo) , NULL, false);
 
         if ( ( aId.lastIndexOf( '/' ) + 1 ) != aId.getLength() )
-                aId += rtl::OUString::createFromAscii( "/" );
+                aId += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
         aId += rtl::OUString::createFromAscii( escaped_name );
 
@@ -246,7 +246,7 @@ uno::Reference< sdbc::XRow > DataSupplier::queryPropertyValues( sal_uInt32 nInde
                     xContent, uno::UNO_QUERY_THROW );
                 sal_Int32 nCmdId( xCmdProc->createCommandIdentifier() );
                 ucb::Command aCmd;
-                aCmd.Name = rtl::OUString::createFromAscii( "getPropertyValues" );
+                aCmd.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertyValues"));
                 aCmd.Handle = -1;
                 aCmd.Argument <<= getResultSet()->getProperties();
                 uno::Any aResult( xCmdProc->execute(
diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx
index ce1a7f3fe9fe..130b08e72670 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -94,10 +94,10 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
                       com::sun::star::ucb::XContentProvider );
 
 XSERVICEINFO_IMPL_1( ContentProvider,
-                     rtl::OUString::createFromAscii(
-                       "com.sun.star.comp.GIOContentProvider" ),
-                     rtl::OUString::createFromAscii(
-                       "com.sun.star.ucb.GIOContentProvider" ) );
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                       "com.sun.star.comp.GIOContentProvider" )),
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                       "com.sun.star.ucb.GIOContentProvider" )) );
 
 ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
 
@@ -106,9 +106,9 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
 static 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
diff --git a/ucb/source/ucp/gio/ucpgio.xml b/ucb/source/ucp/gio/ucpgio.xml
index 20bfe43e5a6f..ac53fd217e14 100644
--- a/ucb/source/ucp/gio/ucpgio.xml
+++ b/ucb/source/ucp/gio/ucpgio.xml
@@ -8,7 +8,7 @@
 
     <component-description>
         <author>
-            Caolán McNamara &;amp; Jan Navrati
+            Caolán McNamara &amp; Jan Navrátil
         </author>
         <name>
             com.sun.star.comp.ucb.GIOContentProvider
diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx
index 1cfbf45be180..e4b3624ac377 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.cxx
@@ -249,15 +249,15 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
 rtl::OUString SAL_CALL Content::getImplementationName()
     throw( uno::RuntimeException )
 {
-    return rtl::OUString::createFromAscii("com.sun.star.comp.GnomeVFSContent" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.GnomeVFSContent"));
 }
 
 uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames()
     throw( uno::RuntimeException )
 {
     uno::Sequence< rtl::OUString > aSNS( 1 );
-    aSNS.getArray()[ 0 ] = rtl::OUString::createFromAscii(
-        "com.sun.star.ucb.GnomeVFSContent" );
+    aSNS.getArray()[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+        "com.sun.star.ucb.GnomeVFSContent" ));
     return aSNS;
 }
 
@@ -269,9 +269,9 @@ rtl::OUString SAL_CALL Content::getContentType()
     throw( uno::RuntimeException )
 {
     if ( isFolder( uno::Reference< ucb::XCommandEnvironment >() ) )
-        return rtl::OUString::createFromAscii( GVFS_FOLDER_TYPE );
+        return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( GVFS_FOLDER_TYPE ));
     else
-        return rtl::OUString::createFromAscii( GVFS_FILE_TYPE );
+        return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( GVFS_FILE_TYPE ));
 }
 
 //
@@ -281,7 +281,7 @@ rtl::OUString SAL_CALL Content::getContentType()
 uno::Any Content::getBadArgExcept()
 {
     return uno::makeAny( lang::IllegalArgumentException
-                 ( rtl::OUString::createFromAscii( "Wrong argument type!" ),
+                 ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wrong argument type!")),
                    static_cast< cppu::OWeakObject * >( this ),
                    -1 ) );
 }
@@ -461,19 +461,19 @@ uno::Sequence< ucb::ContentInfo > Content::queryCreatableContentsInfo(
         // Minimum set of props we really need
         uno::Sequence< beans::Property > props( 1 );
         props[0] = beans::Property(
-            rtl::OUString::createFromAscii( "Title" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
             -1,
             getCppuType( static_cast< rtl::OUString* >( 0 ) ),
             beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::BOUND );
 
         // file
-        seq[0].Type       = rtl::OUString::createFromAscii( GVFS_FILE_TYPE );
+        seq[0].Type       = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( GVFS_FILE_TYPE ));
         seq[0].Attributes = ( ucb::ContentInfoAttribute::INSERT_WITH_INPUTSTREAM |
                               ucb::ContentInfoAttribute::KIND_DOCUMENT );
         seq[0].Properties = props;
 
         // folder
-        seq[1].Type       = rtl::OUString::createFromAscii( GVFS_FOLDER_TYPE );
+        seq[1].Type       = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( GVFS_FOLDER_TYPE ));
         seq[1].Attributes = ucb::ContentInfoAttribute::KIND_FOLDER;
         seq[1].Properties = props;
 
@@ -517,7 +517,7 @@ Content::createNewContent( const ucb::ContentInfo& Info )
         rtl::OUString aURL = getOUURI();
 
     if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() )
-        aURL += rtl::OUString::createFromAscii( "/" );
+        aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
     name = create_document ? "[New_Content]" : "[New_Collection]";
     // This looks problematic to me cf. webdav
@@ -706,7 +706,7 @@ static lang::IllegalAccessException
 getReadOnlyException( Content *ctnt )
 {
     return lang::IllegalAccessException
-        ( rtl::OUString::createFromAscii( "Property is read-only!" ),
+        ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Property is read-only!")),
           static_cast< cppu::OWeakObject * >( ctnt ) );
 }
 
@@ -715,7 +715,7 @@ Content::makeNewURL( const char */*newName*/ )
 {
     rtl::OUString aNewURL = getParentURL();
     if ( aNewURL.lastIndexOf( '/' ) != ( aNewURL.getLength() - 1 ) )
-        aNewURL += rtl::OUString::createFromAscii( "/" );
+        aNewURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
     char *name = gnome_vfs_escape_string( m_info.name );
     aNewURL += GnomeToOUString( name );
@@ -810,7 +810,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
             if ( rValue.Value >>= aNewTitle ) {
                 if ( aNewTitle.getLength() <= 0 )
                     aRet[ n ] <<= lang::IllegalArgumentException
-                        ( rtl::OUString::createFromAscii( "Empty title not allowed!" ),
+                        ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty title not allowed!")),
                           static_cast< cppu::OWeakObject * >( this ), -1 );
                 else {
                     char *newName = OUStringToGnome( aNewTitle );
@@ -820,7 +820,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                         g_warning ("Set new name to '%s'", newName);
 #endif
 
-                        aEvent.PropertyName = rtl::OUString::createFromAscii( "Title" );
+                        aEvent.PropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
                         aEvent.OldValue     = uno::makeAny( GnomeToOUString( newInfo.name ) );
                         aEvent.NewValue     = uno::makeAny( aNewTitle );
                         aChanges.getArray()[ nChanged ] = aEvent;
@@ -833,7 +833,7 @@ 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 ) );
 
         } else if ( rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DateCreated" ) ) ||
@@ -870,7 +870,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
             aGuard.clear();
             if (!exchangeIdentity( xNewId ) )
                 aRet[ nTitlePos ] <<= uno::Exception
-                    ( rtl::OUString::createFromAscii( "Exchange failed!" ),
+                    ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Exchange failed!")),
                       static_cast< cppu::OWeakObject * >( this ) );
         }
     }
@@ -899,7 +899,7 @@ void Content::queryChildren( ContentRefList& rChildren )
     sal_Int32 nURLPos = aURL.lastIndexOf( '/' );
 
     if ( nURLPos != ( aURL.getLength() - 1 ) )
-        aURL += rtl::OUString::createFromAscii( "/" );
+        aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
     sal_Int32 nLen = aURL.getLength();
 
@@ -1034,7 +1034,7 @@ void Content::transfer(const ucb::TransferInfo & /*rArgs*/,
     ucbhelper::cancelCommandExecution
         ( uno::makeAny
             ( ucb::InteractiveBadTransferURLException
-                ( rtl::OUString::createFromAscii( "Unsupported URL scheme!" ),
+                ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unsupported URL scheme!")),
                   static_cast< cppu::OWeakObject * >( this ) ) ),
           xEnv );
 }
@@ -1188,7 +1188,7 @@ uno::Any Content::mapVFSException( const GnomeVFSResult result, sal_Bool bWrite
         aArgs[ 0 ] <<= m_xIdentifier->getContentIdentifier();
         aException <<=
             ucb::InteractiveAugmentedIOException
-            ( rtl::OUString::createFromAscii( "Not found!" ),
+            ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Not found!")),
               static_cast< cppu::OWeakObject * >( this ),
               task::InteractionClassification_ERROR,
               ucb::IOErrorCode_NOT_EXISTING,
diff --git a/ucb/source/ucp/gvfs/gvfs_directory.cxx b/ucb/source/ucp/gvfs/gvfs_directory.cxx
index c6e08f65f1ac..d1d8d6663ae1 100644
--- a/ucb/source/ucp/gvfs/gvfs_directory.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_directory.cxx
@@ -175,7 +175,7 @@ rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex )
         escaped_name = gnome_vfs_escape_string( m_pImpl->m_aResults[ nIndex ]->aInfo.name );
 
         if ( ( aId.lastIndexOf( '/' ) + 1 ) != aId.getLength() )
-            aId += rtl::OUString::createFromAscii( "/" );
+            aId += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
         aId += rtl::OUString::createFromAscii( escaped_name );
 
diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx b/ucb/source/ucp/gvfs/gvfs_provider.cxx
index f192b9528d2b..203235b591fc 100644
--- a/ucb/source/ucp/gvfs/gvfs_provider.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx
@@ -86,10 +86,10 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
 //=========================================================================
 
 XSERVICEINFO_IMPL_1( ContentProvider,
-                     rtl::OUString::createFromAscii(
-            "com.sun.star.comp.GnomeVFSContentProvider" ),
-                     rtl::OUString::createFromAscii(
-            "com.sun.star.ucb.GnomeVFSContentProvider" ) );
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.comp.GnomeVFSContentProvider" )),
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.ucb.GnomeVFSContentProvider" )) );
 //=========================================================================
 //
 // Service factory implementation.
@@ -151,9 +151,9 @@ 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 {
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index e9c5546dc496..583c558a007e 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -304,8 +304,8 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyContent::getTypes()
 rtl::OUString SAL_CALL HierarchyContent::getImplementationName()
     throw( uno::RuntimeException )
 {
-    return rtl::OUString::createFromAscii(
-                            "com.sun.star.comp.ucb.HierarchyContent" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.comp.ucb.HierarchyContent" ));
 }
 
 //=========================================================================
@@ -317,14 +317,14 @@ HierarchyContent::getSupportedServiceNames()
     uno::Sequence< rtl::OUString > aSNS( 1 );
 
     if ( m_eKind == LINK )
-        aSNS.getArray()[ 0 ] = rtl::OUString::createFromAscii(
-                                HIERARCHY_LINK_CONTENT_SERVICE_NAME );
+        aSNS.getArray()[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                HIERARCHY_LINK_CONTENT_SERVICE_NAME ));
     else if ( m_eKind == FOLDER )
-        aSNS.getArray()[ 0 ] = rtl::OUString::createFromAscii(
-                                HIERARCHY_FOLDER_CONTENT_SERVICE_NAME );
+        aSNS.getArray()[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                HIERARCHY_FOLDER_CONTENT_SERVICE_NAME ));
     else
-        aSNS.getArray()[ 0 ] = rtl::OUString::createFromAscii(
-                                HIERARCHY_ROOT_FOLDER_CONTENT_SERVICE_NAME );
+        aSNS.getArray()[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                HIERARCHY_ROOT_FOLDER_CONTENT_SERVICE_NAME ));
 
     return aSNS;
 }
@@ -387,8 +387,8 @@ uno::Any SAL_CALL HierarchyContent::execute(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "Wrong argument type!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "Wrong argument type!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -409,8 +409,8 @@ uno::Any SAL_CALL HierarchyContent::execute(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "Wrong argument type!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "Wrong argument type!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -421,8 +421,8 @@ uno::Any SAL_CALL HierarchyContent::execute(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "No properties!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "No properties!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -461,8 +461,8 @@ uno::Any SAL_CALL HierarchyContent::execute(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "Wrong argument type!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "Wrong argument type!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -487,8 +487,8 @@ uno::Any SAL_CALL HierarchyContent::execute(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "Wrong argument type!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "Wrong argument type!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -529,8 +529,8 @@ uno::Any SAL_CALL HierarchyContent::execute(
                 ucb::IOErrorCode_CANT_WRITE,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 Environment,
-                rtl::OUString::createFromAscii(
-                    "Cannot remove persistent data!" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "Cannot remove persistent data!" )),
                 this );
             // Unreachable
         }
@@ -553,8 +553,8 @@ uno::Any SAL_CALL HierarchyContent::execute(
             OSL_ENSURE( sal_False, "Wrong argument type!" );
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "Wrong argument type!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "Wrong argument type!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -578,8 +578,8 @@ uno::Any SAL_CALL HierarchyContent::execute(
             OSL_ENSURE( sal_False, "Wrong argument type!" );
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "Wrong argument type!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "Wrong argument type!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -655,12 +655,12 @@ HierarchyContent::createNewContent( const ucb::ContentInfo& Info )
                     "HierarchyContent::createNewContent - empty identifier!" );
 
         if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() )
-            aURL += rtl::OUString::createFromAscii( "/" );
+            aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
         if ( bCreateFolder )
-            aURL += rtl::OUString::createFromAscii( "New_Folder" );
+            aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("New_Folder"));
         else
-            aURL += rtl::OUString::createFromAscii( "New_Link" );
+            aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("New_Link"));
 
         uno::Reference< ucb::XContentIdentifier > xId
             = new ::ucbhelper::ContentIdentifier( m_xSMgr, aURL );
@@ -822,7 +822,7 @@ HierarchyContent::makeNewIdentifier( const rtl::OUString& rTitle )
     // Assemble new content identifier...
     HierarchyUri aUri( m_xIdentifier->getContentIdentifier() );
     rtl::OUString aNewURL = aUri.getParentUri();
-    aNewURL += rtl::OUString::createFromAscii( "/" );
+    aNewURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     aNewURL += ::ucb_impl::urihelper::encodeSegment( rTitle );
 
     return uno::Reference< ucb::XContentIdentifier >(
@@ -848,7 +848,7 @@ void HierarchyContent::queryChildren( HierarchyContentRefList& rChildren )
     if ( nURLPos != ( aURL.getLength() - 1 ) )
     {
         // No trailing slash found. Append.
-        aURL += rtl::OUString::createFromAscii( "/" );
+        aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     }
 
     sal_Int32 nLen = aURL.getLength();
@@ -1062,28 +1062,28 @@ uno::Reference< sdbc::XRow > HierarchyContent::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.getContentType() );
         xRow->appendString (
-            beans::Property( rtl::OUString::createFromAscii( "Title" ),
+            beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
                       -1,
                       getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
                           // @@@ Might actually be read-only!
                       beans::PropertyAttribute::BOUND ),
             rData.getTitle() );
         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.getIsDocument() );
         xRow->appendBoolean(
-            beans::Property( rtl::OUString::createFromAscii( "IsFolder" ),
+            beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")),
                       -1,
                       getCppuBooleanType(),
                       beans::PropertyAttribute::BOUND
@@ -1092,7 +1092,7 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues(
 
         if ( rData.getIsDocument() )
             xRow->appendString(
-                beans::Property( rtl::OUString::createFromAscii( "TargetURL" ),
+                beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL")),
                           -1,
                           getCppuType(
                             static_cast< const rtl::OUString * >( 0 ) ),
@@ -1101,7 +1101,7 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues(
                 rData.getTargetURL() );
         xRow->appendObject(
             beans::Property(
-                rtl::OUString::createFromAscii( "CreatableContentsInfo" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreatableContentsInfo")),
                 -1,
                 getCppuType( static_cast<
                         const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
@@ -1172,8 +1172,8 @@ uno::Sequence< uno::Any > HierarchyContent::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(
@@ -1181,8 +1181,8 @@ uno::Sequence< uno::Any > HierarchyContent::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(
@@ -1190,8 +1190,8 @@ uno::Sequence< uno::Any > HierarchyContent::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(
@@ -1199,8 +1199,8 @@ uno::Sequence< uno::Any > HierarchyContent::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(
@@ -1209,8 +1209,8 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues(
             if ( isReadOnly() )
             {
                 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
@@ -1245,8 +1245,8 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues(
                     else
                     {
                         aRet[ n ] <<= lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                            "Empty title not allowed!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                            "Empty title not allowed!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 );
                     }
@@ -1254,8 +1254,8 @@ uno::Sequence< uno::Any > HierarchyContent::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 ) );
                 }
             }
@@ -1266,8 +1266,8 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues(
             if ( isReadOnly() )
             {
                 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
@@ -1299,8 +1299,8 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues(
                         else
                         {
                             aRet[ n ] <<= lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                            "Empty target URL not allowed!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                            "Empty target URL not allowed!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 );
                         }
@@ -1308,16 +1308,16 @@ uno::Sequence< uno::Any > HierarchyContent::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 ) );
                     }
                 }
                 else
                 {
                     aRet[ n ] <<= beans::UnknownPropertyException(
-                                rtl::OUString::createFromAscii(
-                                    "TargetURL only supported by links!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "TargetURL only supported by links!" )),
                                 static_cast< cppu::OWeakObject * >( this ) );
                 }
             }
@@ -1371,8 +1371,8 @@ uno::Sequence< uno::Any > HierarchyContent::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 ) );
             }
         }
@@ -1406,14 +1406,14 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues(
 
             // Set error .
             aRet[ nTitlePos ] <<= uno::Exception(
-                    rtl::OUString::createFromAscii( "Exchange failed!" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Exchange failed!")),
                     static_cast< cppu::OWeakObject * >( this ) );
         }
     }
 
     if ( aOldTitle.getLength() )
     {
-        aEvent.PropertyName = rtl::OUString::createFromAscii( "Title" );
+        aEvent.PropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
         aEvent.OldValue     = uno::makeAny( aOldTitle );
         aEvent.NewValue     = uno::makeAny( m_aProps.getTitle() );
 
@@ -1441,8 +1441,8 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues(
                     ucb::IOErrorCode_CANT_WRITE,
                     uno::Sequence< uno::Any >(&aProps, 1),
                     xEnv,
-                    rtl::OUString::createFromAscii(
-                        "Cannot store persistent data!" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "Cannot store persistent data!" )),
                     this );
                 // Unreachable
             }
@@ -1470,8 +1470,8 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve,
     {
         ucbhelper::cancelCommandExecution(
             uno::makeAny( ucb::UnsupportedCommandException(
-                                rtl::OUString::createFromAscii(
-                                    "Not supported by root folder!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "Not supported by root folder!" )),
                                 static_cast< cppu::OWeakObject * >( this ) ) ),
             xEnv );
         // Unreachable
@@ -1481,7 +1481,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve,
     if ( m_aProps.getTitle().getLength() == 0 )
     {
         uno::Sequence< rtl::OUString > aProps( 1 );
-        aProps[ 0 ] = rtl::OUString::createFromAscii( "Title" );
+        aProps[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
         ucbhelper::cancelCommandExecution(
             uno::makeAny( ucb::MissingPropertiesException(
                                 rtl::OUString(),
@@ -1529,7 +1529,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve,
                 do
                 {
                     rtl::OUString aNewId = xId->getContentIdentifier();
-                    aNewId += rtl::OUString::createFromAscii( "_" );
+                    aNewId += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_"));
                     aNewId += rtl::OUString::valueOf( ++nTry );
                     xId = new ::ucbhelper::ContentIdentifier( m_xSMgr, aNewId );
                 }
@@ -1540,8 +1540,8 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve,
                     ucbhelper::cancelCommandExecution(
                         uno::makeAny(
                             ucb::UnsupportedNameClashException(
-                                rtl::OUString::createFromAscii(
-                                    "Unable to resolve name clash!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "Unable to resolve name clash!" )),
                                 static_cast< cppu::OWeakObject * >( this ),
                                 nNameClashResolve ) ),
                     xEnv );
@@ -1550,7 +1550,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve,
                 else
                 {
                     rtl::OUString aNewTitle( m_aProps.getTitle() );
-                    aNewTitle += rtl::OUString::createFromAscii( "_" );
+                    aNewTitle += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_"));
                     aNewTitle += rtl::OUString::valueOf( nTry );
                     m_aProps.setTitle( aNewTitle );
                 }
@@ -1593,7 +1593,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve,
             ucb::IOErrorCode_CANT_WRITE,
             uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
-            rtl::OUString::createFromAscii( "Cannot store persistent data!" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cannot store persistent data!")),
             this );
         // Unreachable
     }
@@ -1624,8 +1624,8 @@ void HierarchyContent::destroy( sal_Bool bDeletePhysical,
     {
         ucbhelper::cancelCommandExecution(
             uno::makeAny( ucb::UnsupportedCommandException(
-                                rtl::OUString::createFromAscii(
-                                    "Not persistent!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "Not persistent!" )),
                                 static_cast< cppu::OWeakObject * >( this ) ) ),
             xEnv );
         // Unreachable
@@ -1636,8 +1636,8 @@ void HierarchyContent::destroy( sal_Bool bDeletePhysical,
     {
         ucbhelper::cancelCommandExecution(
             uno::makeAny( ucb::UnsupportedCommandException(
-                                rtl::OUString::createFromAscii(
-                                    "Not supported by root folder!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "Not supported by root folder!" )),
                                 static_cast< cppu::OWeakObject * >( this ) ) ),
             xEnv );
         // Unreachable
@@ -1679,8 +1679,8 @@ void HierarchyContent::transfer(
     {
         ucbhelper::cancelCommandExecution(
             uno::makeAny( ucb::UnsupportedCommandException(
-                                rtl::OUString::createFromAscii(
-                                    "Not persistent!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "Not persistent!" )),
                                 static_cast< cppu::OWeakObject * >( this ) ) ),
             xEnv );
         // Unreachable
@@ -1706,7 +1706,7 @@ void HierarchyContent::transfer(
     if ( nPos != ( aId.getLength() - 1 ) )
     {
         // No trailing slash found. Append.
-        aId += rtl::OUString::createFromAscii( "/" );
+        aId += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     }
 
     if ( rInfo.SourceURL.getLength() <= aId.getLength() )
@@ -1725,8 +1725,8 @@ void HierarchyContent::transfer(
                 ucb::IOErrorCode_RECURSIVE,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 xEnv,
-                rtl::OUString::createFromAscii(
-                    "Target is equal to or is a child of source!" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "Target is equal to or is a child of source!" )),
                 this );
             // Unreachable
         }
@@ -1766,8 +1766,8 @@ void HierarchyContent::transfer(
             ucb::IOErrorCode_CANT_READ,
             uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
-            rtl::OUString::createFromAscii(
-                "Cannot instanciate source object!" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "Cannot instanciate source object!" )),
             this );
         // Unreachable
     }
@@ -1777,8 +1777,8 @@ void HierarchyContent::transfer(
     //////////////////////////////////////////////////////////////////////
 
     rtl::OUString aType = xSource->isFolder()
-        ? rtl::OUString::createFromAscii( HIERARCHY_FOLDER_CONTENT_TYPE )
-        : rtl::OUString::createFromAscii( HIERARCHY_LINK_CONTENT_TYPE );
+        ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( HIERARCHY_FOLDER_CONTENT_TYPE ))
+        : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( HIERARCHY_LINK_CONTENT_TYPE ));
     ucb::ContentInfo aContentInfo;
     aContentInfo.Type = aType;
     aContentInfo.Attributes = 0;
@@ -1801,8 +1801,8 @@ void HierarchyContent::transfer(
             ucb::IOErrorCode_CANT_CREATE,
             uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
-            rtl::OUString::createFromAscii(
-                "XContentCreator::createNewContent failed!" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "XContentCreator::createNewContent failed!" )),
             this );
         // Unreachable
     }
@@ -1896,7 +1896,7 @@ void HierarchyContent::transfer(
 
             rtl::OUString aChildId = xId->getContentIdentifier();
             if ( ( aChildId.lastIndexOf( '/' ) + 1 ) != aChildId.getLength() )
-                aChildId += rtl::OUString::createFromAscii( "/" );
+                aChildId += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
             aChildId += rResult.getName();
 
@@ -1936,8 +1936,8 @@ void HierarchyContent::transfer(
                 ucb::IOErrorCode_CANT_WRITE,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 xEnv,
-                rtl::OUString::createFromAscii(
-                    "Cannot remove persistent data of source object!" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "Cannot remove persistent data of source object!" )),
                 this );
             // Unreachable
         }
@@ -1964,13 +1964,13 @@ HierarchyContentProperties::getCreatableContentsInfo() const
 
         // Folder.
         aSeq.getArray()[ 0 ].Type
-            = rtl::OUString::createFromAscii( HIERARCHY_FOLDER_CONTENT_TYPE );
+            = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( HIERARCHY_FOLDER_CONTENT_TYPE ));
         aSeq.getArray()[ 0 ].Attributes
             = ucb::ContentInfoAttribute::KIND_FOLDER;
 
         uno::Sequence< beans::Property > aFolderProps( 1 );
         aFolderProps.getArray()[ 0 ] = beans::Property(
-                    rtl::OUString::createFromAscii( "Title" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
                     -1,
                     getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
                     beans::PropertyAttribute::BOUND );
@@ -1978,18 +1978,18 @@ HierarchyContentProperties::getCreatableContentsInfo() const
 
         // Link.
         aSeq.getArray()[ 1 ].Type
-            = rtl::OUString::createFromAscii( HIERARCHY_LINK_CONTENT_TYPE );
+            = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( HIERARCHY_LINK_CONTENT_TYPE ));
         aSeq.getArray()[ 1 ].Attributes
             = ucb::ContentInfoAttribute::KIND_LINK;
 
         uno::Sequence< beans::Property > aLinkProps( 2 );
         aLinkProps.getArray()[ 0 ] = beans::Property(
-                    rtl::OUString::createFromAscii( "Title" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
                     -1,
                     getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
                     beans::PropertyAttribute::BOUND );
         aLinkProps.getArray()[ 1 ] = beans::Property(
-                    rtl::OUString::createFromAscii( "TargetURL" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL")),
                     -1,
                     getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
                     beans::PropertyAttribute::BOUND );
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
index d082ee858533..9a1f49b9573d 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
@@ -71,14 +71,14 @@ public:
     HierarchyContentProperties( const HierarchyEntryData::Type & rType )
     : m_aData( rType ),
       m_aContentType( rType == HierarchyEntryData::FOLDER
-        ? rtl::OUString::createFromAscii( HIERARCHY_FOLDER_CONTENT_TYPE )
-        : rtl::OUString::createFromAscii( HIERARCHY_LINK_CONTENT_TYPE ) ) {}
+        ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( HIERARCHY_FOLDER_CONTENT_TYPE ))
+        : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( HIERARCHY_LINK_CONTENT_TYPE )) ) {}
 
     HierarchyContentProperties( const HierarchyEntryData & rData )
     : m_aData( rData ),
       m_aContentType( rData.getType() == HierarchyEntryData::FOLDER
-        ? rtl::OUString::createFromAscii( HIERARCHY_FOLDER_CONTENT_TYPE )
-        : rtl::OUString::createFromAscii( HIERARCHY_LINK_CONTENT_TYPE ) ) {}
+        ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( HIERARCHY_FOLDER_CONTENT_TYPE ))
+        : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( HIERARCHY_LINK_CONTENT_TYPE )) ) {}
 
     const rtl::OUString & getName() const { return m_aData.getName(); }
     void setName( const rtl::OUString & rName ) { m_aData.setName( rName ); };
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx
index 4957d94b29a5..4b8983e9e918 100644
--- a/ucb/source/ucp/hierarchy/hierarchydata.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx
@@ -181,7 +181,7 @@ sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData )
         if ( xRootReadAccess.is() )
         {
             rtl::OUString aTitlePath = m_aPath;
-            aTitlePath += rtl::OUString::createFromAscii( "/Title" );
+            aTitlePath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/Title"));
 
             // Note: Avoid NoSuchElementExceptions, because exceptions are
             //       relatively 'expensive'. Checking for availability of
@@ -206,7 +206,7 @@ sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData )
 
             // Get TargetURL value.
             rtl::OUString aTargetURLPath = m_aPath;
-            aTargetURLPath += rtl::OUString::createFromAscii( "/TargetURL" );
+            aTargetURLPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/TargetURL"));
             if ( !( xRootReadAccess->getByHierarchicalName( aTargetURLPath )
                     >>= aValue ) )
             {
@@ -226,7 +226,7 @@ sal_Bool HierarchyEntry::getData( HierarchyEntryData& rData )
             rData.setTargetURL( aValue );
 
             rtl::OUString aTypePath = m_aPath;
-            aTypePath += rtl::OUString::createFromAscii( "/Type" );
+            aTypePath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/Type"));
             if ( xRootReadAccess->hasByHierarchicalName( aTypePath ) )
             {
                 // Might not be present since it was introduced long after
@@ -349,7 +349,7 @@ sal_Bool HierarchyEntry::setData(
                     else
                     {
                         xParentNameAccess->getByName(
-                            rtl::OUString::createFromAscii( "Children" ) )
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Children")) )
                                 >>= xNameAccess;
                     }
 
@@ -397,8 +397,8 @@ sal_Bool HierarchyEntry::setData(
                         // Append new entry to parents child list,
                         // which is a set of entries.
                         xParentNameAccess->getByName(
-                                        rtl::OUString::createFromAscii(
-                                            "Children" ) ) >>= xFac;
+                                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                            "Children" )) ) >>= xFac;
                     }
 
                     OSL_ENSURE( xFac.is(),
@@ -429,7 +429,7 @@ sal_Bool HierarchyEntry::setData(
                 {
                     // Set Title value.
                     xNameReplace->replaceByName(
-                        rtl::OUString::createFromAscii( "Title" ),
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
                         uno::makeAny( rData.getTitle() ) );
 
                     // Set TargetURL value.
@@ -445,14 +445,14 @@ sal_Bool HierarchyEntry::setData(
                             = m_xOfficeInstDirs->makeRelocatableURL( aValue );
 
                     xNameReplace->replaceByName(
-                        rtl::OUString::createFromAscii( "TargetURL" ),
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL")),
                         uno::makeAny( aValue ) );
 
                     // Set Type value.
                     sal_Int32 nType
                         = rData.getType() == HierarchyEntryData::LINK ? 0 : 1;
                     xNameReplace->replaceByName(
-                        rtl::OUString::createFromAscii( "Type" ),
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Type")),
                         uno::makeAny( nType ) );
 
                     if ( xContainer.is() )
@@ -667,7 +667,7 @@ sal_Bool HierarchyEntry::move(
         else
         {
             xOldParentNameAccess->getByName(
-                 rtl::OUString::createFromAscii( "Children" ) )
+                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Children")) )
                     >>= xOldNameContainer;
         }
 
@@ -749,7 +749,7 @@ sal_Bool HierarchyEntry::move(
             else
             {
                 xNewParentNameAccess->getByName(
-                     rtl::OUString::createFromAscii( "Children" ) )
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Children")) )
                         >>= xNewNameContainer;
             }
         }
@@ -760,7 +760,7 @@ sal_Bool HierarchyEntry::move(
             return sal_False;
 
         xNewNameReplace->replaceByName(
-            rtl::OUString::createFromAscii( "Title" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
             uno::makeAny( rData.getTitle() ) );
 
         // TargetURL property may contain a reference to the Office
@@ -772,11 +772,11 @@ sal_Bool HierarchyEntry::move(
         if ( m_xOfficeInstDirs.is() && ( aValue.getLength() > 0 ) )
             aValue = m_xOfficeInstDirs->makeRelocatableURL( aValue );
         xNewNameReplace->replaceByName(
-            rtl::OUString::createFromAscii( "TargetURL" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL")),
             uno::makeAny( aValue ) );
         sal_Int32 nType = rData.getType() == HierarchyEntryData::LINK ? 0 : 1;
         xNewNameReplace->replaceByName(
-            rtl::OUString::createFromAscii( "Type" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Type")),
             uno::makeAny( nType ) );
 
         xNewNameContainer->insertByName( aNewKey, aEntry );
@@ -892,7 +892,7 @@ sal_Bool HierarchyEntry::remove()
                     // Append new entry to parents child list,
                     // which is a set of entries.
                      xParentNameAccess->getByName(
-                        rtl::OUString::createFromAscii( "Children" ) )
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Children")) )
                             >>= xContainer;
                 }
 
@@ -960,7 +960,7 @@ sal_Bool HierarchyEntry::first( iterator& it )
                 if ( m_aPath.getLength() > 0 )
                 {
                     rtl::OUString aPath = m_aPath;
-                    aPath += rtl::OUString::createFromAscii( "/Children" );
+                    aPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/Children"));
 
                     xRootHierNameAccess->getByHierarchicalName( aPath )
                         >>= xNameAccess;
@@ -1172,9 +1172,9 @@ const HierarchyEntryData& HierarchyEntry::iterator::operator*() const
             rtl::OUString aTargetURL = aTitle;
             rtl::OUString aType      = aTitle;
 
-            aTitle     += rtl::OUString::createFromAscii( "/Title" );
-            aTargetURL += rtl::OUString::createFromAscii( "/TargetURL" );
-            aType      += rtl::OUString::createFromAscii( "/Type" );
+            aTitle     += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/Title"));
+            aTargetURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/TargetURL"));
+            aType      += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/Type"));
 
             rtl::OUString aValue;
             m_pImpl->dir->getByHierarchicalName( aTitle ) >>= aValue;
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index 9cb3f236d955..318b884b7cf1 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -268,14 +268,14 @@ XTYPEPROVIDER_IMPL_4( HierarchyDataSource,
 //=========================================================================
 
 XSERVICEINFO_IMPL_0( HierarchyDataSource,
-                     rtl::OUString::createFromAscii(
-                        "com.sun.star.comp.ucb.HierarchyDataSource" ) )
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.comp.ucb.HierarchyDataSource" )) )
 {
     uno::Sequence< rtl::OUString > aSNS( 2 );
-    aSNS[ 0 ] = rtl::OUString::createFromAscii(
-                    "com.sun.star.ucb.DefaultHierarchyDataSource" );
-    aSNS[ 1 ] = rtl::OUString::createFromAscii(
-                    "com.sun.star.ucb.HierarchyDataSource" );
+    aSNS[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.ucb.DefaultHierarchyDataSource" ));
+    aSNS[ 1 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.ucb.HierarchyDataSource" ));
     return aSNS;
 }
 
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
index 32c19589d5d8..25bd6ef03e6e 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
@@ -163,7 +163,7 @@ rtl::OUString HierarchyResultSetDataSupplier::queryContentIdentifierString(
             = m_pImpl->m_xContent->getIdentifier()->getContentIdentifier();
 
         if ( ( aId.lastIndexOf( '/' ) + 1 ) != aId.getLength() )
-            aId += rtl::OUString::createFromAscii( "/" );
+            aId += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
         aId += m_pImpl->m_aResults[ nIndex ]->aData.getName();
 
@@ -370,9 +370,9 @@ HierarchyResultSetDataSupplier::queryPropertyValues( sal_uInt32 nIndex  )
     if ( getResult( nIndex ) )
     {
         static rtl::OUString aFolderType(
-            rtl::OUString::createFromAscii( HIERARCHY_FOLDER_CONTENT_TYPE ) );
+            RTL_CONSTASCII_USTRINGPARAM( HIERARCHY_FOLDER_CONTENT_TYPE ) );
         static rtl::OUString aLinkType(
-            rtl::OUString::createFromAscii( HIERARCHY_LINK_CONTENT_TYPE ) );
+            RTL_CONSTASCII_USTRINGPARAM( HIERARCHY_LINK_CONTENT_TYPE ) );
 
         HierarchyContentProperties aData(
             m_pImpl->m_aResults[ nIndex ]->aData );
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
index 1e5fdbfc3e79..2a594a0de784 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
@@ -102,10 +102,10 @@ XTYPEPROVIDER_IMPL_4( HierarchyContentProvider,
 //=========================================================================
 
 XSERVICEINFO_IMPL_1( HierarchyContentProvider,
-                     rtl::OUString::createFromAscii(
-                         "com.sun.star.comp.ucb.HierarchyContentProvider" ),
-                     rtl::OUString::createFromAscii(
-                         HIERARCHY_CONTENT_PROVIDER_SERVICE_NAME ) );
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         "com.sun.star.comp.ucb.HierarchyContentProvider" )),
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         HIERARCHY_CONTENT_PROVIDER_SERVICE_NAME )) );
 
 //=========================================================================
 //
diff --git a/ucb/source/ucp/hierarchy/hierarchyservices.cxx b/ucb/source/ucp/hierarchy/hierarchyservices.cxx
index 21f594dcd6b8..f9cb6387c3f6 100644
--- a/ucb/source/ucp/hierarchy/hierarchyservices.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyservices.cxx
@@ -42,9 +42,9 @@ static 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
diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.cxx b/ucb/source/ucp/hierarchy/hierarchyuri.cxx
index 71fcb4660503..45d2bac0e9ac 100644
--- a/ucb/source/ucp/hierarchy/hierarchyuri.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyuri.cxx
@@ -67,7 +67,7 @@ void HierarchyUri::init() const
         if ( ( m_aUri.getLength() < HIERARCHY_URL_SCHEME_LENGTH + 1 ) )
         {
             // error, but remember that we did a init().
-            m_aPath = rtl::OUString::createFromAscii( "/" );
+            m_aPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
             return;
         }
 
@@ -139,17 +139,17 @@ void HierarchyUri::init() const
                 if ( nStart == m_aUri.getLength() )
                 {
                     // error, but remember that we did a init().
-                    m_aPath = rtl::OUString::createFromAscii( "/" );
+                    m_aPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
                     return;
                 }
 
                 // Empty path segments?
                 if ( m_aUri.indexOf(
-                        rtl::OUString::createFromAscii( "//" ),
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("//")),
                         nStart ) != -1 )
                 {
                     // error, but remember that we did a init().
-                    m_aPath = rtl::OUString::createFromAscii( "/" );
+                    m_aPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
                     return;
                 }
 
@@ -159,7 +159,7 @@ void HierarchyUri::init() const
                 if ( nEnd == nStart )
                 {
                     // error, but remember that we did a init().
-                    m_aPath = rtl::OUString::createFromAscii( "/" );
+                    m_aPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
                     return;
                 }
 
@@ -167,7 +167,7 @@ void HierarchyUri::init() const
                 {
                     // Trailing slash missing.
                     nEnd = m_aUri.getLength();
-                    m_aUri += rtl::OUString::createFromAscii( "/" );
+                    m_aUri += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
                 }
 
                 m_aService = m_aUri.copy( nStart, nEnd - nStart );
@@ -203,7 +203,7 @@ void HierarchyUri::init() const
         else
         {
             // error, but remember that we did a init().
-            m_aPath = rtl::OUString::createFromAscii( "/" );
+            m_aPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
         }
     }
 }
diff --git a/ucb/source/ucp/odma/odma_content.cxx b/ucb/source/ucp/odma/odma_content.cxx
index f1cd571dd10f..4ac96ab5b4b3 100644
--- a/ucb/source/ucp/odma/odma_content.cxx
+++ b/ucb/source/ucp/odma/odma_content.cxx
@@ -179,7 +179,7 @@ rtl::OUString SAL_CALL Content::getImplementationName()
     throw( uno::RuntimeException )
 {
     // @@@ Adjust implementation name. Keep the prefix "com.sun.star.comp."!
-    return rtl::OUString::createFromAscii( "com.sun.star.comp.odma.Content" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.odma.Content"));
 }
 
 //=========================================================================
@@ -190,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( ODMA_CONTENT_SERVICE_NAME );
+            = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ODMA_CONTENT_SERVICE_NAME ));
     return aSNS;
 }
 
@@ -205,7 +205,7 @@ rtl::OUString SAL_CALL Content::getContentType()
     throw( uno::RuntimeException )
 {
     // @@@ Adjust macro name ( def in odma_provider.hxx ).
-    return rtl::OUString::createFromAscii( ODMA_CONTENT_TYPE );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ODMA_CONTENT_TYPE ));
 }
 
 //=========================================================================
@@ -702,27 +702,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->m_sContentType );
         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->m_sTitle );
         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->m_bIsDocument );
         xRow->appendBoolean(
-            beans::Property( rtl::OUString::createFromAscii( "IsFolder" ),
+            beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")),
                       -1,
                       getCppuBooleanType(),
                       beans::PropertyAttribute::BOUND
@@ -731,40 +731,40 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
 
         // @@@ Append other properties supported directly.
         xRow->appendTimestamp(
-            beans::Property( rtl::OUString::createFromAscii( "DateCreated" ),
+            beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateCreated")),
                       -1,
                       getCppuType(static_cast< const util::DateTime * >( 0 ) ),
                       beans::PropertyAttribute::BOUND
                         | beans::PropertyAttribute::READONLY ),
             rData->m_aDateCreated );
         xRow->appendTimestamp(
-            beans::Property( rtl::OUString::createFromAscii( "DateModified" ),
+            beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateModified")),
                       -1,
                       getCppuType(static_cast< const util::DateTime * >( 0 ) ),
                       beans::PropertyAttribute::BOUND
                         | beans::PropertyAttribute::READONLY ),
             rData->m_aDateModified );
         xRow->appendBoolean(
-            beans::Property( rtl::OUString::createFromAscii( "IsReadOnly" ),
+            beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsReadOnly")),
                       -1,
                       getCppuBooleanType(),
                       beans::PropertyAttribute::BOUND
                         | beans::PropertyAttribute::READONLY ),
             rData->m_bIsReadOnly );
         xRow->appendString (
-            beans::Property( rtl::OUString::createFromAscii( "Author" ),
+            beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Author")),
                       -1,
                       getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
                       beans::PropertyAttribute::BOUND ),
             rData->m_sAuthor );
         xRow->appendString (
-            beans::Property( rtl::OUString::createFromAscii( "Subject" ),
+            beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Subject")),
                       -1,
                       getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
                       beans::PropertyAttribute::BOUND ),
             rData->m_sSubject );
         xRow->appendString (
-            beans::Property( rtl::OUString::createFromAscii( "Keywords" ),
+            beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Keywords")),
                       -1,
                       getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
                       beans::PropertyAttribute::BOUND ),
@@ -921,8 +921,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 ) );
             }
         }
@@ -955,7 +955,7 @@ void Content::insert(
         OSL_ENSURE( sal_False, "Content::insert - property value missing!" );
 
         uno::Sequence< rtl::OUString > aProps( 1 );
-        aProps[ 0 ] = rtl::OUString::createFromAscii( "zzzz" );
+        aProps[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("zzzz"));
         ucbhelper::cancelCommandExecution(
             uno::makeAny( ucb::MissingPropertiesException(
                                 rtl::OUString(),
@@ -1076,8 +1076,8 @@ void Content::changePropertyValue(const beans::PropertyValue& _rValue,
     if(bError)
     {
         _rRet[ _rnCurrentPos ] <<= 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 ) );
     }
 }
diff --git a/ucb/source/ucp/odma/odma_provider.cxx b/ucb/source/ucp/odma/odma_provider.cxx
index 84c7038108b0..a5fb562a796e 100644
--- a/ucb/source/ucp/odma/odma_provider.cxx
+++ b/ucb/source/ucp/odma/odma_provider.cxx
@@ -151,8 +151,8 @@ 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.odma.ContentProvider" ),
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.comp.odma.ContentProvider" )),
                      rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODMA_CONTENT_PROVIDER_SERVICE_NAME) ) );
 
 //=========================================================================
diff --git a/ucb/source/ucp/odma/odma_services.cxx b/ucb/source/ucp/odma/odma_services.cxx
index e6c56c759609..7720623fd961 100644
--- a/ucb/source/ucp/odma/odma_services.cxx
+++ b/ucb/source/ucp/odma/odma_services.cxx
@@ -43,9 +43,9 @@ static sal_Bool writeInfo( void * pRegistryKey,
                            const rtl::OUString & rImplementationName,
                                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"));
 
     Reference< XRegistryKey > xKey;
     try
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index 349d613a470b..e501dd09fde1 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -124,7 +124,7 @@ ContentProperties::getCreatableContentsInfo( PackageUri const & rUri ) const
     {
         uno::Sequence< beans::Property > aProps( 1 );
         aProps.getArray()[ 0 ] = beans::Property(
-                    rtl::OUString::createFromAscii( "Title" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
                     -1,
                     getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
                     beans::PropertyAttribute::BOUND );
@@ -246,11 +246,11 @@ Content* Content::create(
 ::rtl::OUString Content::getContentType(
     const ::rtl::OUString& aScheme, sal_Bool bFolder )
 {
-    return ( rtl::OUString::createFromAscii( "application/" )
+    return ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("application/"))
              + aScheme
              + ( bFolder
-                 ? rtl::OUString::createFromAscii( "-folder" )
-                 : rtl::OUString::createFromAscii( "-stream" ) ) );
+                 ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-folder"))
+                 : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-stream")) ) );
 }
 
 //=========================================================================
@@ -424,8 +424,8 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
 rtl::OUString SAL_CALL Content::getImplementationName()
     throw( uno::RuntimeException )
 {
-    return rtl::OUString::createFromAscii(
-                            "com.sun.star.comp.ucb.PackageContent" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.comp.ucb.PackageContent" ));
 }
 
 //=========================================================================
@@ -436,12 +436,12 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames()
     uno::Sequence< rtl::OUString > aSNS( 1 );
     if ( isFolder() )
         aSNS.getArray()[ 0 ]
-            = rtl::OUString::createFromAscii(
-                PACKAGE_FOLDER_CONTENT_SERVICE_NAME );
+            = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                PACKAGE_FOLDER_CONTENT_SERVICE_NAME ));
     else
         aSNS.getArray()[ 0 ]
-            = rtl::OUString::createFromAscii(
-                PACKAGE_STREAM_CONTENT_SERVICE_NAME );
+            = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                PACKAGE_STREAM_CONTENT_SERVICE_NAME ));
 
     return aSNS;
 }
@@ -488,8 +488,8 @@ uno::Any SAL_CALL Content::execute(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "Wrong argument type!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "Wrong argument type!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -510,8 +510,8 @@ uno::Any SAL_CALL Content::execute(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "Wrong argument type!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "Wrong argument type!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -522,8 +522,8 @@ uno::Any SAL_CALL Content::execute(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "No properties!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "No properties!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -564,8 +564,8 @@ uno::Any SAL_CALL Content::execute(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "Wrong argument type!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "Wrong argument type!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -587,8 +587,8 @@ uno::Any SAL_CALL Content::execute(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "Wrong argument type!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "Wrong argument type!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -628,8 +628,8 @@ uno::Any SAL_CALL Content::execute(
                 ucb::IOErrorCode_CANT_WRITE,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 Environment,
-                rtl::OUString::createFromAscii(
-                    "Cannot remove persistent data!" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "Cannot remove persistent data!" )),
                 this );
             // Unreachable
         }
@@ -650,8 +650,8 @@ uno::Any SAL_CALL Content::execute(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "Wrong argument type!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "Wrong argument type!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -675,8 +675,8 @@ uno::Any SAL_CALL Content::execute(
             OSL_ENSURE( sal_False, "Wrong argument type!" );
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "Wrong argument type!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "Wrong argument type!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -708,8 +708,8 @@ uno::Any SAL_CALL Content::execute(
                 ucb::IOErrorCode_CANT_WRITE,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 Environment,
-                rtl::OUString::createFromAscii(
-                    "Cannot write file to disk!" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "Cannot write file to disk!" )),
                 this );
             // Unreachable
         }
@@ -774,13 +774,13 @@ Content::createNewContent( const ucb::ContentInfo& Info )
             return uno::Reference< ucb::XContent >();
 
         rtl::OUString aURL = m_aUri.getUri();
-        aURL += rtl::OUString::createFromAscii( "/" );
+        aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
         if ( Info.Type.equalsIgnoreAsciiCase(
                 getContentType( m_aUri.getScheme(), sal_True ) ) )
-            aURL += rtl::OUString::createFromAscii( "New_Folder" );
+            aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("New_Folder"));
         else
-            aURL += rtl::OUString::createFromAscii( "New_Stream" );
+            aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("New_Stream"));
 
         uno::Reference< ucb::XContentIdentifier > xId(
             new ::ucbhelper::ContentIdentifier( m_xSMgr, aURL ) );
@@ -979,7 +979,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
         // Append all Core Properties.
         xRow->appendString (
             beans::Property(
-                rtl::OUString::createFromAscii( "ContentType" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType")),
                 -1,
                 getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
                 beans::PropertyAttribute::BOUND
@@ -987,14 +987,14 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
             rData.aContentType );
         xRow->appendString(
             beans::Property(
-                rtl::OUString::createFromAscii( "Title" ),
+                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" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")),
                 -1,
                 getCppuBooleanType(),
                 beans::PropertyAttribute::BOUND
@@ -1002,7 +1002,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
             rData.bIsDocument );
         xRow->appendBoolean(
             beans::Property(
-                rtl::OUString::createFromAscii( "IsFolder" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")),
                 -1,
                 getCppuBooleanType(),
                 beans::PropertyAttribute::BOUND
@@ -1010,7 +1010,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
             rData.bIsFolder );
         xRow->appendObject(
             beans::Property(
-                rtl::OUString::createFromAscii( "CreatableContentsInfo" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreatableContentsInfo")),
                 -1,
                 getCppuType( static_cast<
                         const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
@@ -1020,7 +1020,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
                 rData.getCreatableContentsInfo( PackageUri( rContentId ) ) ) );
         xRow->appendString(
             beans::Property(
-                rtl::OUString::createFromAscii( "MediaType" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")),
                 -1,
                 getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
                 beans::PropertyAttribute::BOUND ),
@@ -1031,7 +1031,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
         {
             xRow->appendLong(
                 beans::Property(
-                    rtl::OUString::createFromAscii( "Size" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size")),
                     -1,
                     getCppuType( static_cast< const sal_Int64 * >( 0 ) ),
                     beans::PropertyAttribute::BOUND
@@ -1040,7 +1040,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
 
             xRow->appendBoolean(
                 beans::Property(
-                    rtl::OUString::createFromAscii( "Compressed" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Compressed")),
                     -1,
                     getCppuBooleanType(),
                     beans::PropertyAttribute::BOUND ),
@@ -1048,7 +1048,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
 
             xRow->appendBoolean(
                 beans::Property(
-                    rtl::OUString::createFromAscii( "Encrypted" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Encrypted")),
                     -1,
                     getCppuBooleanType(),
                     beans::PropertyAttribute::BOUND ),
@@ -1061,7 +1061,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
         {
             xRow->appendBoolean(
                 beans::Property(
-                    rtl::OUString::createFromAscii( "HasEncryptedEntries" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasEncryptedEntries")),
                     -1,
                     getCppuBooleanType(),
                     beans::PropertyAttribute::BOUND
@@ -1133,8 +1133,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(
@@ -1142,8 +1142,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(
@@ -1151,8 +1151,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(
@@ -1160,8 +1160,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(
@@ -1171,8 +1171,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
@@ -1201,8 +1201,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                     {
                         aRet[ n ] <<=
                             lang::IllegalArgumentException(
-                                rtl::OUString::createFromAscii(
-                                    "Empty title not allowed!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "Empty title not allowed!" )),
                                 static_cast< cppu::OWeakObject * >( this ),
                                 -1 );
                     }
@@ -1211,8 +1211,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                 {
                     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 ) );
                 }
             }
@@ -1238,8 +1238,8 @@ 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 ) );
             }
         }
@@ -1248,8 +1248,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(
@@ -1276,16 +1276,16 @@ 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 ) );
                 }
             }
             else
             {
                 aRet[ n ] <<= beans::UnknownPropertyException(
-                                rtl::OUString::createFromAscii(
-                                    "Compressed only supported by streams!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "Compressed only supported by streams!" )),
                                 static_cast< cppu::OWeakObject * >( this ) );
             }
         }
@@ -1313,16 +1313,16 @@ 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 ) );
                 }
             }
             else
             {
                 aRet[ n ] <<= beans::UnknownPropertyException(
-                                rtl::OUString::createFromAscii(
-                                    "Encrypted only supported by streams!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "Encrypted only supported by streams!" )),
                                 static_cast< cppu::OWeakObject * >( this ) );
             }
         }
@@ -1331,8 +1331,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(
@@ -1364,16 +1364,16 @@ 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 ) );
                 }
             }
             else
             {
                 aRet[ n ] <<= beans::UnknownPropertyException(
-                        rtl::OUString::createFromAscii(
-                            "EncryptionKey not supported by non-root folder!" ),
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                            "EncryptionKey not supported by non-root folder!" )),
                         static_cast< cppu::OWeakObject * >( this ) );
             }
         }
@@ -1426,8 +1426,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 ) );
             }
         }
@@ -1439,7 +1439,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 
         // Assemble new content identifier...
         rtl::OUString aNewURL = m_aUri.getParentUri();
-        aNewURL += rtl::OUString::createFromAscii( "/" );
+        aNewURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
         aNewURL += ::ucb_impl::urihelper::encodeSegment( aNewTitle );
         uno::Reference< ucb::XContentIdentifier > xNewId
             = new ::ucbhelper::ContentIdentifier( m_xSMgr, aNewURL );
@@ -1462,14 +1462,14 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 
             // Set error .
             aRet[ nTitlePos ] <<= uno::Exception(
-                    rtl::OUString::createFromAscii( "Exchange failed!" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Exchange failed!")),
                     static_cast< cppu::OWeakObject * >( this ) );
         }
     }
 
     if ( aNewTitle.getLength() )
     {
-        aEvent.PropertyName = rtl::OUString::createFromAscii( "Title" );
+        aEvent.PropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
         aEvent.OldValue     = uno::makeAny( m_aProps.aTitle );
         aEvent.NewValue     = uno::makeAny( aNewTitle );
 
@@ -1500,8 +1500,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                     ucb::IOErrorCode_CANT_WRITE,
                     uno::Sequence< uno::Any >(&aProps, 1),
                     xEnv,
-                    rtl::OUString::createFromAscii(
-                        "Cannot store persistent data!" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "Cannot store persistent data!" )),
                     this );
                 // Unreachable
             }
@@ -1577,7 +1577,7 @@ uno::Any Content::open(
                     m_eState == PERSISTENT
                         ? xEnv
                         : uno::Reference< ucb::XCommandEnvironment >(),
-                    rtl::OUString::createFromAscii( "Got no data stream!" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Got no data stream!")),
                     this );
                 // Unreachable
             }
@@ -1638,8 +1638,8 @@ uno::Any Content::open(
                             ? xEnv
                             : uno::Reference<
                                   ucb::XCommandEnvironment >(),
-                        rtl::OUString::createFromAscii(
-                            "Got no data stream!" ),
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                            "Got no data stream!" )),
                         this );
                     // Unreachable
                 }
@@ -1706,7 +1706,7 @@ void Content::insert(
 
     rtl::OUString aNewURL = m_aUri.getParentUri();
     if (1 + aNewURL.lastIndexOf('/') != aNewURL.getLength())
-        aNewURL += rtl::OUString::createFromAscii( "/" );
+        aNewURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     aNewURL += ::ucb_impl::urihelper::encodeSegment( m_aProps.aTitle );
     PackageUri aNewUri( aNewURL );
 
@@ -1741,7 +1741,7 @@ void Content::insert(
                 do
                 {
                     rtl::OUString aNew = aNewUri.getUri();
-                    aNew += rtl::OUString::createFromAscii( "_" );
+                    aNew += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_"));
                     aNew += rtl::OUString::valueOf( ++nTry );
                     aNewUri.setUri( aNew );
                 }
@@ -1752,8 +1752,8 @@ void Content::insert(
                     ucbhelper::cancelCommandExecution(
                         uno::makeAny(
                             ucb::UnsupportedNameClashException(
-                                rtl::OUString::createFromAscii(
-                                    "Unable to resolve name clash!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "Unable to resolve name clash!" )),
                                 static_cast< cppu::OWeakObject * >( this ),
                                 nNameClashResolve ) ),
                     xEnv );
@@ -1761,7 +1761,7 @@ void Content::insert(
                 }
                 else
                 {
-                    m_aProps.aTitle += rtl::OUString::createFromAscii( "_" );
+                    m_aProps.aTitle += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_"));
                     m_aProps.aTitle += rtl::OUString::valueOf( nTry );
                 }
             }
@@ -1807,7 +1807,7 @@ void Content::insert(
             ucb::IOErrorCode_CANT_WRITE,
             uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
-            rtl::OUString::createFromAscii( "Cannot store persistent data!" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cannot store persistent data!")),
             this );
         // Unreachable
     }
@@ -1845,8 +1845,8 @@ void Content::destroy(
     {
         ucbhelper::cancelCommandExecution(
             uno::makeAny( ucb::UnsupportedCommandException(
-                                rtl::OUString::createFromAscii(
-                                    "Not persistent!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "Not persistent!" )),
                                 static_cast< cppu::OWeakObject * >( this ) ) ),
             xEnv );
         // Unreachable
@@ -1888,8 +1888,8 @@ void Content::transfer(
     {
         ucbhelper::cancelCommandExecution(
             uno::makeAny( ucb::UnsupportedCommandException(
-                                rtl::OUString::createFromAscii(
-                                    "Not persistent!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "Not persistent!" )),
                                 static_cast< cppu::OWeakObject * >( this ) ) ),
             xEnv );
         // Unreachable
@@ -1910,7 +1910,7 @@ void Content::transfer(
 
     // Is source not a parent of me / not me?
     rtl::OUString aId = m_aUri.getParentUri();
-    aId += rtl::OUString::createFromAscii( "/" );
+    aId += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
     if ( rInfo.SourceURL.getLength() <= aId.getLength() )
     {
@@ -1928,8 +1928,8 @@ void Content::transfer(
                 ucb::IOErrorCode_RECURSIVE,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 xEnv,
-                rtl::OUString::createFromAscii(
-                    "Target is equal to or is a child of source!" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "Target is equal to or is a child of source!" )),
                 this );
             // Unreachable
         }
@@ -1969,8 +1969,8 @@ void Content::transfer(
             ucb::IOErrorCode_CANT_READ,
             uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
-            rtl::OUString::createFromAscii(
-                "Cannot instanciate source object!" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "Cannot instanciate source object!" )),
             this );
         // Unreachable
     }
@@ -2003,8 +2003,8 @@ void Content::transfer(
             ucb::IOErrorCode_CANT_CREATE,
             uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
-            rtl::OUString::createFromAscii(
-                "XContentCreator::createNewContent failed!" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "XContentCreator::createNewContent failed!" )),
             this );
         // Unreachable
     }
@@ -2119,7 +2119,7 @@ void Content::transfer(
                     rtl::OUString aChildId = xId->getContentIdentifier();
                     if ( ( aChildId.lastIndexOf( '/' ) + 1 )
                                                 != aChildId.getLength() )
-                        aChildId += rtl::OUString::createFromAscii( "/" );
+                        aChildId += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
                     aChildId += ::ucb_impl::urihelper::encodeSegment( aName );
 
@@ -2167,8 +2167,8 @@ void Content::transfer(
                 ucb::IOErrorCode_CANT_WRITE,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 xEnv,
-                rtl::OUString::createFromAscii(
-                    "Cannot remove persistent data of source object!" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "Cannot remove persistent data of source object!" )),
                 this );
             // Unreachable
         }
@@ -2267,7 +2267,7 @@ void Content::queryChildren( ContentRefList& rChildren )
     OSL_ENSURE( aURL.lastIndexOf( '/' ) != ( aURL.getLength() - 1 ),
                 "Content::queryChildren - Invalid URL!" );
 
-    aURL += rtl::OUString::createFromAscii( "/" );
+    aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
     sal_Int32 nLen = aURL.getLength();
 
@@ -2381,8 +2381,8 @@ sal_Bool Content::loadData(
             {
                 uno::Any aHasEncryptedEntries
                     = xPackagePropSet->getPropertyValue(
-                        rtl::OUString::createFromAscii(
-                            "HasEncryptedEntries" ) );
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                            "HasEncryptedEntries" )) );
                 if ( !( aHasEncryptedEntries >>= rProps.bHasEncryptedEntries ) )
                 {
                     OSL_ENSURE( sal_False,
@@ -2434,7 +2434,7 @@ sal_Bool Content::loadData(
             {
                 uno::Any aMediaType
                     = xPropSet->getPropertyValue(
-                        rtl::OUString::createFromAscii( "MediaType" ) );
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) );
                 if ( !( aMediaType >>= rProps.aMediaType ) )
                 {
                     OSL_ENSURE( sal_False,
@@ -2481,7 +2481,7 @@ sal_Bool Content::loadData(
                 {
                     uno::Any aSize
                         = xPropSet->getPropertyValue(
-                            rtl::OUString::createFromAscii( "Size" ) );
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size")) );
                     if ( !( aSize >>= rProps.nSize ) )
                     {
                         OSL_ENSURE( sal_False,
@@ -2507,7 +2507,7 @@ sal_Bool Content::loadData(
                 {
                     uno::Any aCompressed
                         = xPropSet->getPropertyValue(
-                            rtl::OUString::createFromAscii( "Compressed" ) );
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Compressed")) );
                     if ( !( aCompressed >>= rProps.bCompressed ) )
                     {
                         OSL_ENSURE( sal_False,
@@ -2533,7 +2533,7 @@ sal_Bool Content::loadData(
                 {
                     uno::Any aEncrypted
                         = xPropSet->getPropertyValue(
-                            rtl::OUString::createFromAscii( "Encrypted" ) );
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Encrypted")) );
                     if ( !( aEncrypted >>= rProps.bEncrypted ) )
                     {
                         OSL_ENSURE( sal_False,
@@ -2635,7 +2635,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
             try
             {
                 xPackagePropSet->setPropertyValue(
-                        rtl::OUString::createFromAscii( "EncryptionKey" ),
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EncryptionKey")),
                         uno::makeAny( m_aProps.aEncryptionKey ) );
                 m_nModifiedProps &= ~ENCRYPTIONKEY_MODIFIED;
             }
@@ -2768,7 +2768,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
         if ( m_nModifiedProps & MEDIATYPE_MODIFIED )
         {
             xPropSet->setPropertyValue(
-                                rtl::OUString::createFromAscii( "MediaType" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")),
                                 uno::makeAny( m_aProps.aMediaType ) );
             m_nModifiedProps &= ~MEDIATYPE_MODIFIED;
         }
@@ -2777,7 +2777,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
         {
             if ( !isFolder() )
                 xPropSet->setPropertyValue(
-                                rtl::OUString::createFromAscii( "Compressed" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Compressed")),
                                 uno::makeAny( m_aProps.bCompressed ) );
 
             m_nModifiedProps &= ~COMPRESSED_MODIFIED;
@@ -2787,7 +2787,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
         {
             if ( !isFolder() )
                 xPropSet->setPropertyValue(
-                                rtl::OUString::createFromAscii( "Encrypted" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Encrypted")),
                                 uno::makeAny( m_aProps.bEncrypted ) );
 
             m_nModifiedProps &= ~ENCRYPTED_MODIFIED;
@@ -2797,7 +2797,7 @@ sal_Bool Content::storeData( const uno::Reference< io::XInputStream >& xStream )
         {
             if ( !isFolder() )
                 xPropSet->setPropertyValue(
-                            rtl::OUString::createFromAscii( "EncryptionKey" ),
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EncryptionKey")),
                             uno::makeAny( m_aProps.aEncryptionKey ) );
 
             m_nModifiedProps &= ~ENCRYPTIONKEY_MODIFIED;
diff --git a/ucb/source/ucp/package/pkgdatasupplier.cxx b/ucb/source/ucp/package/pkgdatasupplier.cxx
index 1d84f871b695..d403626ba061 100644
--- a/ucb/source/ucp/package/pkgdatasupplier.cxx
+++ b/ucb/source/ucp/package/pkgdatasupplier.cxx
@@ -114,7 +114,7 @@ DataSupplier_Impl::~DataSupplier_Impl()
     while ( it != end )
     {
         delete (*it);
-        it++;
+        ++it;
     }
 }
 
@@ -478,7 +478,7 @@ void DataSupplier::validate()
 
         sal_Int32 nPackageUrlEnd = aURL.lastIndexOf( '/' );
         if ( nPackageUrlEnd != aURL.getLength() - 1 )
-            aURL += rtl::OUString::createFromAscii( "/" );
+            aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
         aURL += ::ucb_impl::urihelper::encodeSegment( aName );
         aURL += aContURL.copy( nParam );
@@ -489,7 +489,7 @@ void DataSupplier::validate()
 
         sal_Int32 nPackageUrlEnd = aURL.lastIndexOf( '/' );
         if ( nPackageUrlEnd != aURL.getLength() - 1 )
-            aURL += rtl::OUString::createFromAscii( "/" );
+            aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
         aURL += ::ucb_impl::urihelper::encodeSegment( aName );
     }
diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx
index 4392861fe0a0..906da6c080e0 100644
--- a/ucb/source/ucp/package/pkgprovider.cxx
+++ b/ucb/source/ucp/package/pkgprovider.cxx
@@ -183,10 +183,10 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
 //=========================================================================
 
 XSERVICEINFO_IMPL_1( ContentProvider,
-                     rtl::OUString::createFromAscii(
-                        "com.sun.star.comp.ucb.PackageContentProvider" ),
-                     rtl::OUString::createFromAscii(
-                        PACKAGE_CONTENT_PROVIDER_SERVICE_NAME ) );
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.comp.ucb.PackageContentProvider" )),
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        PACKAGE_CONTENT_PROVIDER_SERVICE_NAME )) );
 
 //=========================================================================
 //
@@ -278,8 +278,8 @@ ContentProvider::createPackage( const rtl::OUString & rName, const rtl::OUString
 
         uno::Reference< uno::XInterface > xIfc
             = m_xSMgr->createInstanceWithArguments(
-                rtl::OUString::createFromAscii(
-                                "com.sun.star.packages.comp.ZipPackage" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                "com.sun.star.packages.comp.ZipPackage" )),
                 aArguments );
 
         if ( xIfc.is() )
diff --git a/ucb/source/ucp/package/pkgservices.cxx b/ucb/source/ucp/package/pkgservices.cxx
index 9809eda95b3c..737dc78c7091 100644
--- a/ucb/source/ucp/package/pkgservices.cxx
+++ b/ucb/source/ucp/package/pkgservices.cxx
@@ -43,9 +43,9 @@ sal_Bool writeInfo(
     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
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index 2a50f8d051b3..1c0634b79acf 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -319,8 +319,8 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
 rtl::OUString SAL_CALL Content::getImplementationName()
     throw( uno::RuntimeException )
 {
-    return rtl::OUString::createFromAscii(
-                "com.sun.star.comp.ucb.TransientDocumentsContent" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.comp.ucb.TransientDocumentsContent" ));
 }
 
 //=========================================================================
@@ -333,17 +333,17 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames()
     uno::Sequence< rtl::OUString > aSNS( 1 );
 
     if ( m_aProps.getType() == STREAM )
-        aSNS.getArray()[ 0 ] = rtl::OUString::createFromAscii(
-                                TDOC_STREAM_CONTENT_SERVICE_NAME );
+        aSNS.getArray()[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                TDOC_STREAM_CONTENT_SERVICE_NAME ));
     else if ( m_aProps.getType() == FOLDER )
-        aSNS.getArray()[ 0 ] = rtl::OUString::createFromAscii(
-                                TDOC_FOLDER_CONTENT_SERVICE_NAME );
+        aSNS.getArray()[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                TDOC_FOLDER_CONTENT_SERVICE_NAME ));
     else if ( m_aProps.getType() == DOCUMENT )
-        aSNS.getArray()[ 0 ] = rtl::OUString::createFromAscii(
-                                TDOC_DOCUMENT_CONTENT_SERVICE_NAME );
+        aSNS.getArray()[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                TDOC_DOCUMENT_CONTENT_SERVICE_NAME ));
     else
-        aSNS.getArray()[ 0 ] = rtl::OUString::createFromAscii(
-                                TDOC_ROOT_CONTENT_SERVICE_NAME );
+        aSNS.getArray()[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                TDOC_ROOT_CONTENT_SERVICE_NAME ));
 
     return aSNS;
 }
@@ -410,8 +410,8 @@ uno::Any SAL_CALL Content::execute(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "Wrong argument type!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "Wrong argument type!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -432,8 +432,8 @@ uno::Any SAL_CALL Content::execute(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "Wrong argument type!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "Wrong argument type!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -444,8 +444,8 @@ uno::Any SAL_CALL Content::execute(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "No properties!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "No properties!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -484,8 +484,8 @@ uno::Any SAL_CALL Content::execute(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "Wrong argument type!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "Wrong argument type!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -541,8 +541,8 @@ uno::Any SAL_CALL Content::execute(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "Wrong argument type!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "Wrong argument type!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -600,8 +600,8 @@ uno::Any SAL_CALL Content::execute(
                 ucb::IOErrorCode_CANT_WRITE,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 Environment,
-                rtl::OUString::createFromAscii(
-                    "Cannot remove persistent data!" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "Cannot remove persistent data!" )),
                 this );
             // Unreachable
         }
@@ -641,8 +641,8 @@ uno::Any SAL_CALL Content::execute(
             OSL_ENSURE( sal_False, "Wrong argument type!" );
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "Wrong argument type!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "Wrong argument type!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -684,8 +684,8 @@ uno::Any SAL_CALL Content::execute(
             OSL_ENSURE( sal_False, "Wrong argument type!" );
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "Wrong argument type!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "Wrong argument type!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -774,12 +774,12 @@ Content::createNewContent( const ucb::ContentInfo& Info )
                     "Content::createNewContent - empty identifier!" );
 
         if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() )
-            aURL += rtl::OUString::createFromAscii( "/" );
+            aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
         if ( bCreateFolder )
-            aURL += rtl::OUString::createFromAscii( "New_Folder" );
+            aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("New_Folder"));
         else
-            aURL += rtl::OUString::createFromAscii( "New_Stream" );
+            aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("New_Stream"));
 
         uno::Reference< ucb::XContentIdentifier > xId
             = new ::ucbhelper::ContentIdentifier( m_xSMgr, aURL );
@@ -842,7 +842,7 @@ void Content::queryChildren( ContentRefList& rChildren )
     if ( nURLPos != ( aURL.getLength() - 1 ) )
     {
         // No trailing slash found. Append.
-        aURL += rtl::OUString::createFromAscii( "/" );
+        aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     }
 
     sal_Int32 nLen = aURL.getLength();
@@ -1104,7 +1104,7 @@ 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
@@ -1114,7 +1114,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
         ContentType eType = rData.getType();
 
         xRow->appendString (
-            beans::Property( rtl::OUString::createFromAscii( "Title" ),
+            beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
                       -1,
                       getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
                       // Title is read-only for root and documents.
@@ -1124,14 +1124,14 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
                         : 0 ),
             rData.getTitle() );
         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.getIsDocument() );
         xRow->appendBoolean(
-            beans::Property( rtl::OUString::createFromAscii( "IsFolder" ),
+            beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")),
                       -1,
                       getCppuBooleanType(),
                       beans::PropertyAttribute::BOUND
@@ -1139,7 +1139,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
             rData.getIsFolder() );
         xRow->appendObject(
             beans::Property(
-                rtl::OUString::createFromAscii( "CreatableContentsInfo" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreatableContentsInfo")),
                 -1,
                 getCppuType( static_cast<
                         const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
@@ -1150,7 +1150,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
         // Storage is only supported by folders.
         if ( eType == FOLDER )
             xRow->appendObject(
-                beans::Property( rtl::OUString::createFromAscii( "Storage" ),
+                beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Storage")),
                           -1,
                           getCppuType(
                             static_cast<
@@ -1162,7 +1162,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
         // DocumentModel is only supported by documents.
         if ( eType == DOCUMENT )
             xRow->appendObject(
-                beans::Property( rtl::OUString::createFromAscii( "DocumentModel" ),
+                beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentModel")),
                           -1,
                           getCppuType(
                             static_cast<
@@ -1234,8 +1234,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(
@@ -1243,8 +1243,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(
@@ -1252,8 +1252,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(
@@ -1261,8 +1261,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(
@@ -1273,8 +1273,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
             if ( ( eType == ROOT ) || ( eType == DOCUMENT ) )
             {
                 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
@@ -1304,8 +1304,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                     else
                     {
                         aRet[ n ] <<= lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "Empty Title not allowed!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "Empty Title not allowed!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 );
                     }
@@ -1313,8 +1313,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                 else
                 {
                     aRet[ n ] <<= beans::IllegalTypeException(
-                                rtl::OUString::createFromAscii(
-                                    "Title Property value has wrong type!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "Title Property value has wrong type!" )),
                                 static_cast< cppu::OWeakObject * >( this ) );
                 }
             }
@@ -1326,16 +1326,16 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
             if ( eType == FOLDER )
             {
                 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
             {
                 // Storage is only supported by folders.
                 aRet[ n ] <<= beans::UnknownPropertyException(
-                            rtl::OUString::createFromAscii(
-                                "Storage property only supported by folders" ),
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                "Storage property only supported by folders" )),
                             static_cast< cppu::OWeakObject * >( this ) );
             }
         }
@@ -1346,17 +1346,17 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
             if ( eType == DOCUMENT )
             {
                 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
             {
                 // Storage is only supported by folders.
                 aRet[ n ] <<= beans::UnknownPropertyException(
-                            rtl::OUString::createFromAscii(
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                 "DocumentModel property only supported by "
-                                "documents" ),
+                                "documents" )),
                             static_cast< cppu::OWeakObject * >( this ) );
             }
         }
@@ -1409,8 +1409,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 ) );
             }
         }
@@ -1442,14 +1442,14 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 
             // Set error .
             aRet[ nTitlePos ] <<= uno::Exception(
-                    rtl::OUString::createFromAscii( "Exchange failed!" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Exchange failed!")),
                     static_cast< cppu::OWeakObject * >( this ) );
         }
     }
 
     if ( aOldTitle.getLength() )
     {
-        aEvent.PropertyName = rtl::OUString::createFromAscii( "Title" );
+        aEvent.PropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
         aEvent.OldValue     = uno::makeAny( aOldTitle );
         aEvent.NewValue     = uno::makeAny( m_aProps.getTitle() );
 
@@ -1477,8 +1477,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                     ucb::IOErrorCode_CANT_WRITE,
                     uno::Sequence< uno::Any >(&aProps, 1),
                     xEnv,
-                    rtl::OUString::createFromAscii(
-                        "Cannot store persistent data!" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "Cannot store persistent data!" )),
                     this );
                 // Unreachable
             }
@@ -1558,8 +1558,8 @@ uno::Any Content::open(
                     m_eState == PERSISTENT
                         ? xEnv
                         : uno::Reference< ucb::XCommandEnvironment >(),
-                    rtl::OUString::createFromAscii(
-                        "Got no data stream!" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "Got no data stream!" )),
                     this );
                 // Unreachable
             }
@@ -1594,7 +1594,7 @@ uno::Any Content::open(
                         m_eState == PERSISTENT
                             ? xEnv
                             : uno::Reference< ucb::XCommandEnvironment >(),
-                        rtl::OUString::createFromAscii( "Got no data stream!" ),
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Got no data stream!")),
                         this );
                     // Unreachable
                 }
@@ -1656,8 +1656,8 @@ uno::Any Content::open(
                                 ? xEnv
                                 : uno::Reference<
                                       ucb::XCommandEnvironment >(),
-                            rtl::OUString::createFromAscii(
-                                "Got no data stream!" ),
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                "Got no data stream!" )),
                             this );
                         // Unreachable
                     }
@@ -1785,8 +1785,8 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData,
                     ucbhelper::cancelCommandExecution(
                         uno::makeAny(
                             ucb::UnsupportedNameClashException(
-                                rtl::OUString::createFromAscii(
-                                    "Unable to resolve name clash!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "Unable to resolve name clash!" )),
                                 static_cast< cppu::OWeakObject * >( this ),
                                 nNameClashResolve ) ),
                         xEnv );
@@ -1842,7 +1842,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData,
             ucb::IOErrorCode_CANT_WRITE,
             uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
-            rtl::OUString::createFromAscii( "Cannot store persistent data!" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cannot store persistent data!")),
             this );
         // Unreachable
     }
@@ -1880,8 +1880,8 @@ void Content::destroy( sal_Bool bDeletePhysical,
     {
         ucbhelper::cancelCommandExecution(
             uno::makeAny( ucb::UnsupportedCommandException(
-                                rtl::OUString::createFromAscii(
-                                    "Not persistent!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "Not persistent!" )),
                                 static_cast< cppu::OWeakObject * >( this ) ) ),
             xEnv );
         // Unreachable
@@ -2022,8 +2022,8 @@ void Content::transfer(
     {
         ucbhelper::cancelCommandExecution(
             uno::makeAny( ucb::UnsupportedCommandException(
-                                rtl::OUString::createFromAscii(
-                                    "Not persistent!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "Not persistent!" )),
                                 static_cast< cppu::OWeakObject * >( this ) ) ),
             xEnv );
         // Unreachable
@@ -2063,8 +2063,8 @@ void Content::transfer(
     {
         ucbhelper::cancelCommandExecution(
             uno::makeAny( lang::IllegalArgumentException(
-                                rtl::OUString::createFromAscii(
-                                    "Invalid source URI! Syntax!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "Invalid source URI! Syntax!" )),
                                 static_cast< cppu::OWeakObject * >( this ),
                                 -1 ) ),
             xEnv );
@@ -2075,9 +2075,9 @@ void Content::transfer(
     {
         ucbhelper::cancelCommandExecution(
             uno::makeAny( lang::IllegalArgumentException(
-                                rtl::OUString::createFromAscii(
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                     "Invalid source URI! "
-                                    "Must describe a folder or stream!" ),
+                                    "Must describe a folder or stream!" )),
                                 static_cast< cppu::OWeakObject * >( this ),
                                 -1 ) ),
             xEnv );
@@ -2090,7 +2090,7 @@ void Content::transfer(
     if ( nPos != ( aId.getLength() - 1 ) )
     {
         // No trailing slash found. Append.
-        aId += rtl::OUString::createFromAscii( "/" );
+        aId += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     }
 
     if ( rInfo.SourceURL.getLength() <= aId.getLength() )
@@ -2109,8 +2109,8 @@ void Content::transfer(
                 ucb::IOErrorCode_RECURSIVE,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 xEnv,
-                rtl::OUString::createFromAscii(
-                    "Target is equal to or is a child of source!" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "Target is equal to or is a child of source!" )),
                 this );
             // Unreachable
         }
@@ -2132,10 +2132,10 @@ void Content::transfer(
                 {
                     ucbhelper::cancelCommandExecution(
                         uno::makeAny( lang::IllegalArgumentException(
-                                        rtl::OUString::createFromAscii(
+                                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                             "Invalid source URI! "
                                             "Streams cannot be created as "
-                                            "children of document root!" ),
+                                            "children of document root!" )),
                                         static_cast< cppu::OWeakObject * >(
                                             this ),
                                         -1 ) ),
@@ -2162,9 +2162,9 @@ void Content::transfer(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                         "Invalid source URI! "
-                                        "Unabale to determine source type!" ),
+                                        "Unabale to determine source type!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 xEnv );
@@ -2207,7 +2207,7 @@ void Content::transfer(
 
     rtl::OUString aTargetUri = m_xIdentifier->getContentIdentifier();
     if ( ( aTargetUri.lastIndexOf( '/' ) + 1 ) != aTargetUri.getLength() )
-        aTargetUri += rtl::OUString::createFromAscii( "/" );
+        aTargetUri += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
     if ( rInfo.NewTitle.getLength() > 0 )
         aTargetUri += ::ucb_impl::urihelper::encodeSegment( rInfo.NewTitle );
@@ -2270,8 +2270,8 @@ void Content::transfer(
             ucb::IOErrorCode_CANT_READ,
             uno::Sequence< uno::Any >(&aProps, 1),
             xEnv,
-            rtl::OUString::createFromAscii(
-                "Cannot instanciate target object!" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "Cannot instanciate target object!" )),
             this );
         // Unreachable
     }
@@ -2315,8 +2315,8 @@ void Content::transfer(
                 ucb::IOErrorCode_CANT_READ,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 xEnv,
-                rtl::OUString::createFromAscii(
-                    "Cannot instanciate target object!" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "Cannot instanciate target object!" )),
                 this );
             // Unreachable
         }
@@ -2339,8 +2339,8 @@ void Content::transfer(
                 ucb::IOErrorCode_CANT_WRITE,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 xEnv,
-                rtl::OUString::createFromAscii(
-                    "Cannot remove persistent data of source object!" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "Cannot remove persistent data of source object!" )),
                 this );
             // Unreachable
         }
@@ -2360,8 +2360,8 @@ void Content::transfer(
                 ucb::IOErrorCode_CANT_WRITE,
                 uno::Sequence< uno::Any >(&aProps, 1),
                 xEnv,
-                rtl::OUString::createFromAscii(
-                    "Cannot remove additional properties of source object!" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "Cannot remove additional properties of source object!" )),
                 this );
             // Unreachable
         }
@@ -3067,7 +3067,7 @@ ContentProperties::getCreatableContentsInfo() const
     {
         uno::Sequence< beans::Property > aProps( 1 );
         aProps.getArray()[ 0 ] = beans::Property(
-                    rtl::OUString::createFromAscii( "Title" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
                     -1,
                     getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
                     beans::PropertyAttribute::BOUND );
@@ -3080,7 +3080,7 @@ ContentProperties::getCreatableContentsInfo() const
 
             // Folder.
             aSeq.getArray()[ 0 ].Type
-                = rtl::OUString::createFromAscii( TDOC_FOLDER_CONTENT_TYPE );
+                = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( TDOC_FOLDER_CONTENT_TYPE ));
             aSeq.getArray()[ 0 ].Attributes
                 = ucb::ContentInfoAttribute::KIND_FOLDER;
             aSeq.getArray()[ 0 ].Properties = aProps;
@@ -3094,14 +3094,14 @@ ContentProperties::getCreatableContentsInfo() const
 
             // Folder.
             aSeq.getArray()[ 0 ].Type
-                = rtl::OUString::createFromAscii( TDOC_FOLDER_CONTENT_TYPE );
+                = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( TDOC_FOLDER_CONTENT_TYPE ));
             aSeq.getArray()[ 0 ].Attributes
                 = ucb::ContentInfoAttribute::KIND_FOLDER;
             aSeq.getArray()[ 0 ].Properties = aProps;
 
             // Stream.
             aSeq.getArray()[ 1 ].Type
-                = rtl::OUString::createFromAscii( TDOC_STREAM_CONTENT_TYPE );
+                = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( TDOC_STREAM_CONTENT_TYPE ));
             aSeq.getArray()[ 1 ].Attributes
                 = ucb::ContentInfoAttribute::INSERT_WITH_INPUTSTREAM
                   | ucb::ContentInfoAttribute::KIND_DOCUMENT;
diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx
index 17bcd643fadc..39792a372789 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.hxx
@@ -72,12 +72,12 @@ public:
     ContentProperties( const ContentType & rType, const rtl::OUString & rTitle )
     : m_eType( rType ),
       m_aContentType( rType == STREAM
-        ? rtl::OUString::createFromAscii( TDOC_STREAM_CONTENT_TYPE )
+        ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( TDOC_STREAM_CONTENT_TYPE ))
         : rType == FOLDER
-            ? rtl::OUString::createFromAscii( TDOC_FOLDER_CONTENT_TYPE )
+            ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( TDOC_FOLDER_CONTENT_TYPE ))
             : rType == DOCUMENT
-                ? rtl::OUString::createFromAscii( TDOC_DOCUMENT_CONTENT_TYPE )
-                : rtl::OUString::createFromAscii( TDOC_ROOT_CONTENT_TYPE ) ),
+                ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( TDOC_DOCUMENT_CONTENT_TYPE ))
+                : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( TDOC_ROOT_CONTENT_TYPE )) ),
       m_aTitle( rTitle )
     {}
 
diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
index 2d5236b77017..319e2c8ad101 100644
--- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
@@ -110,7 +110,7 @@ DataSupplier_Impl::~DataSupplier_Impl()
     while ( it != end )
     {
         delete (*it);
-        it++;
+        ++it;
     }
 
     delete m_pNamesOfChildren;
@@ -462,7 +462,7 @@ ResultSetDataSupplier::assembleChildURL( const ::rtl::OUString& aName )
 
     sal_Int32 nUrlEnd = aURL.lastIndexOf( '/' );
     if ( nUrlEnd != aURL.getLength() - 1 )
-        aURL += rtl::OUString::createFromAscii( "/" );
+        aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
     aURL += aName;
     return aURL;
diff --git a/ucb/source/ucp/tdoc/tdoc_services.cxx b/ucb/source/ucp/tdoc/tdoc_services.cxx
index 12d7c210f154..230b0f74792f 100644
--- a/ucb/source/ucp/tdoc/tdoc_services.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_services.cxx
@@ -44,9 +44,9 @@ static 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
diff --git a/ucb/source/ucp/tdoc/tdoc_uri.cxx b/ucb/source/ucp/tdoc/tdoc_uri.cxx
index 32524a1813ec..3205a3a590f4 100644
--- a/ucb/source/ucp/tdoc/tdoc_uri.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_uri.cxx
@@ -128,7 +128,7 @@ void Uri::init() const
             if ( nSlash != - 1 )
                 m_aInternalPath = m_aPath.copy( nSlash );
             else
-                m_aInternalPath = rtl::OUString::createFromAscii( "/" );
+                m_aInternalPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
         }
 
         m_eState = VALID;
diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav/ContentProperties.cxx
index 4db694f433f4..c026a2150774 100644
--- a/ucb/source/ucp/webdav/ContentProperties.cxx
+++ b/ucb/source/ucp/webdav/ContentProperties.cxx
@@ -105,13 +105,13 @@ ContentProperties::ContentProperties( const DAVResource& rResource )
         NeonUri aURI( rResource.uri );
         m_aEscapedTitle = aURI.GetPathBaseName();
 
-        (*m_xProps)[ rtl::OUString::createFromAscii( "Title" ) ]
+        (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) ]
             = PropertyValue(
                 uno::makeAny( aURI.GetPathBaseNameUnescaped() ), true );
     }
     catch ( DAVException const & )
     {
-        (*m_xProps)[ rtl::OUString::createFromAscii( "Title" ) ]
+        (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) ]
             = PropertyValue(
                 uno::makeAny(
                     rtl::OUString(
@@ -141,11 +141,11 @@ ContentProperties::ContentProperties(
 : m_xProps( new PropertyValueMap ),
   m_bTrailingSlash( sal_False )
 {
-    (*m_xProps)[ rtl::OUString::createFromAscii( "Title" ) ]
+    (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) ]
         = PropertyValue( uno::makeAny( rTitle ), true );
-    (*m_xProps)[ rtl::OUString::createFromAscii( "IsFolder" ) ]
+    (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")) ]
         = PropertyValue( uno::makeAny( bFolder ), true );
-    (*m_xProps)[ rtl::OUString::createFromAscii( "IsDocument" ) ]
+    (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")) ]
         = PropertyValue( uno::makeAny( sal_Bool( !bFolder ) ), true );
 }
 
@@ -154,7 +154,7 @@ ContentProperties::ContentProperties( const rtl::OUString & rTitle )
 : m_xProps( new PropertyValueMap ),
   m_bTrailingSlash( sal_False )
 {
-    (*m_xProps)[ rtl::OUString::createFromAscii( "Title" ) ]
+    (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) ]
         = PropertyValue( uno::makeAny( rTitle ), true );
 }
 
@@ -346,19 +346,19 @@ void ContentProperties::UCBNamesToHTTPNames(
                     RTL_CONSTASCII_STRINGPARAM( "DateModified" ) ) )
         {
             propertyNames.push_back(
-                rtl::OUString::createFromAscii( "Last-Modified" ) );
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Last-Modified")) );
         }
         else if ( rProp.Name.equalsAsciiL(
                     RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) )
         {
             propertyNames.push_back(
-                rtl::OUString::createFromAscii( "Content-Type" ) );
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Content-Type")) );
         }
         else if ( rProp.Name.equalsAsciiL(
                     RTL_CONSTASCII_STRINGPARAM( "Size" ) ) )
         {
             propertyNames.push_back(
-                rtl::OUString::createFromAscii( "Content-Length" ) );
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Content-Length")) );
         }
         else
         {
@@ -465,7 +465,7 @@ void ContentProperties::addProperty( const rtl::OUString & rName,
         util::DateTime aDate;
         DateTimeHelper::convert( aValue, aDate );
 
-        (*m_xProps)[ rtl::OUString::createFromAscii( "DateCreated" ) ]
+        (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateCreated")) ]
             = PropertyValue( uno::makeAny( aDate ), true );
     }
     //  else if ( rName.equals( DAVProperties::DISPLAYNAME ) )
@@ -480,7 +480,7 @@ void ContentProperties::addProperty( const rtl::OUString & rName,
         rtl::OUString aValue;
         rValue >>= aValue;
 
-        (*m_xProps)[ rtl::OUString::createFromAscii( "Size" ) ]
+        (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size")) ]
             = PropertyValue( uno::makeAny( aValue.toInt64() ), true );
     }
     else if ( rName.equalsAsciiL(
@@ -493,13 +493,13 @@ void ContentProperties::addProperty( const rtl::OUString & rName,
         rtl::OUString aValue;
         rValue >>= aValue;
 
-        (*m_xProps)[ rtl::OUString::createFromAscii( "Size" ) ]
+        (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size")) ]
             = PropertyValue( uno::makeAny( aValue.toInt64() ), true );
     }
     else if ( rName.equals( DAVProperties::GETCONTENTTYPE ) )
     {
         // Map DAV:getcontenttype to UCP:MediaType (1:1)
-        (*m_xProps)[ rtl::OUString::createFromAscii( "MediaType" ) ]
+        (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) ]
             = PropertyValue( rValue, true );
     }
     else if ( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Content-Type" ) ) )
@@ -508,7 +508,7 @@ void ContentProperties::addProperty( const rtl::OUString & rName,
         // Only DAV resources have this property.
 
         // Map DAV:getcontenttype to UCP:MediaType (1:1)
-        (*m_xProps)[ rtl::OUString::createFromAscii( "MediaType" ) ]
+        (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) ]
             = PropertyValue( rValue, true );
     }
     //  else if ( rName.equals( DAVProperties::GETETAG ) )
@@ -522,7 +522,7 @@ void ContentProperties::addProperty( const rtl::OUString & rName,
         util::DateTime aDate;
         DateTimeHelper::convert( aValue, aDate );
 
-        (*m_xProps)[ rtl::OUString::createFromAscii( "DateModified" ) ]
+        (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateModified")) ]
             = PropertyValue( uno::makeAny( aDate ), true );
     }
     else if ( rName.equalsAsciiL(
@@ -537,7 +537,7 @@ void ContentProperties::addProperty( const rtl::OUString & rName,
         util::DateTime aDate;
         DateTimeHelper::convert( aValue, aDate );
 
-        (*m_xProps)[ rtl::OUString::createFromAscii( "DateModified" ) ]
+        (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateModified")) ]
             = PropertyValue( uno::makeAny( aDate ), true );
     }
     //  else if ( rName.equals( DAVProperties::LOCKDISCOVERY ) )
@@ -553,14 +553,14 @@ void ContentProperties::addProperty( const rtl::OUString & rName,
             aValue.equalsIgnoreAsciiCaseAsciiL(
                 RTL_CONSTASCII_STRINGPARAM( "collection" ) );
 
-        (*m_xProps)[ rtl::OUString::createFromAscii( "IsFolder" ) ]
+        (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")) ]
             = PropertyValue( uno::makeAny( bFolder ), true );
-        (*m_xProps)[ rtl::OUString::createFromAscii( "IsDocument" ) ]
+        (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")) ]
             = PropertyValue( uno::makeAny( sal_Bool( !bFolder ) ), true );
-        (*m_xProps)[ rtl::OUString::createFromAscii( "ContentType" ) ]
+        (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType")) ]
             = PropertyValue( uno::makeAny( bFolder
-                ? rtl::OUString::createFromAscii( WEBDAV_COLLECTION_TYPE )
-                : rtl::OUString::createFromAscii( WEBDAV_CONTENT_TYPE ) ), true );
+                ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( WEBDAV_COLLECTION_TYPE ))
+                : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( WEBDAV_CONTENT_TYPE )) ), true );
     }
     //  else if ( rName.equals( DAVProperties::SOURCE ) )
     //  {
diff --git a/ucb/source/ucp/webdav/DAVProperties.cxx b/ucb/source/ucp/webdav/DAVProperties.cxx
index 2ee9983b7380..0562ef0b91e1 100644
--- a/ucb/source/ucp/webdav/DAVProperties.cxx
+++ b/ucb/source/ucp/webdav/DAVProperties.cxx
@@ -34,32 +34,19 @@
 
 using namespace webdav_ucp;
 
-const ::rtl::OUString DAVProperties::CREATIONDATE =
-                ::rtl::OUString::createFromAscii( "DAV:creationdate" );
-const ::rtl::OUString DAVProperties::DISPLAYNAME =
-                ::rtl::OUString::createFromAscii( "DAV:displayname" );
-const ::rtl::OUString DAVProperties::GETCONTENTLANGUAGE =
-                ::rtl::OUString::createFromAscii( "DAV:getcontentlanguage" );
-const ::rtl::OUString DAVProperties::GETCONTENTLENGTH =
-                ::rtl::OUString::createFromAscii( "DAV:getcontentlength" );
-const ::rtl::OUString DAVProperties::GETCONTENTTYPE =
-                ::rtl::OUString::createFromAscii( "DAV:getcontenttype" );
-const ::rtl::OUString DAVProperties::GETETAG =
-                ::rtl::OUString::createFromAscii( "DAV:getetag" );
-const ::rtl::OUString DAVProperties::GETLASTMODIFIED =
-                ::rtl::OUString::createFromAscii( "DAV:getlastmodified" );
-const ::rtl::OUString DAVProperties::LOCKDISCOVERY =
-                ::rtl::OUString::createFromAscii( "DAV:lockdiscovery" );
-const ::rtl::OUString DAVProperties::RESOURCETYPE =
-                ::rtl::OUString::createFromAscii( "DAV:resourcetype" );
-const ::rtl::OUString DAVProperties::SOURCE =
-                ::rtl::OUString::createFromAscii( "DAV:source" );
-const ::rtl::OUString DAVProperties::SUPPORTEDLOCK =
-                ::rtl::OUString::createFromAscii( "DAV:supportedlock" );
-
-const ::rtl::OUString DAVProperties::EXECUTABLE =
-                ::rtl::OUString::createFromAscii(
-                                "http://apache.org/dav/props/executable" );
+const ::rtl::OUString DAVProperties::CREATIONDATE(RTL_CONSTASCII_USTRINGPARAM("DAV:creationdate"));
+const ::rtl::OUString DAVProperties::DISPLAYNAME(RTL_CONSTASCII_USTRINGPARAM("DAV:displayname"));
+const ::rtl::OUString DAVProperties::GETCONTENTLANGUAGE(RTL_CONSTASCII_USTRINGPARAM("DAV:getcontentlanguage"));
+const ::rtl::OUString DAVProperties::GETCONTENTLENGTH(RTL_CONSTASCII_USTRINGPARAM("DAV:getcontentlength"));
+const ::rtl::OUString DAVProperties::GETCONTENTTYPE(RTL_CONSTASCII_USTRINGPARAM("DAV:getcontenttype"));
+const ::rtl::OUString DAVProperties::GETETAG(RTL_CONSTASCII_USTRINGPARAM("DAV:getetag"));
+const ::rtl::OUString DAVProperties::GETLASTMODIFIED(RTL_CONSTASCII_USTRINGPARAM("DAV:getlastmodified"));
+const ::rtl::OUString DAVProperties::LOCKDISCOVERY(RTL_CONSTASCII_USTRINGPARAM("DAV:lockdiscovery"));
+const ::rtl::OUString DAVProperties::RESOURCETYPE(RTL_CONSTASCII_USTRINGPARAM("DAV:resourcetype"));
+const ::rtl::OUString DAVProperties::SOURCE(RTL_CONSTASCII_USTRINGPARAM("DAV:source"));
+const ::rtl::OUString DAVProperties::SUPPORTEDLOCK(RTL_CONSTASCII_USTRINGPARAM("DAV:supportedlock"));
+
+const ::rtl::OUString DAVProperties::EXECUTABLE(RTL_CONSTASCII_USTRINGPARAM("http://apache.org/dav/props/executable"));
 
 // -------------------------------------------------------------------
 // static
@@ -181,11 +168,11 @@ void DAVProperties::createUCBPropName( const char * nspace,
     else
     {
         // Create property name that encodes, namespace and name ( XML ).
-        rFullName  = rtl::OUString::createFromAscii( "<prop:" );
+        rFullName  = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<prop:"));
         rFullName += aName;
-        rFullName += rtl::OUString::createFromAscii( " xmlns:prop=\"" );
+        rFullName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " xmlns:prop=\"" ));
         rFullName += aNameSpace;
-        rFullName += rtl::OUString::createFromAscii( "\">" );
+        rFullName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "\">" ));
     }
 }
 
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
index 3267485af6f8..0024eb734033 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
@@ -193,8 +193,8 @@ void DAVResourceAccess::OPTIONS(
             DAVRequestHeaders aHeaders;
             getUserRequestHeaders( xEnv,
                                    getRequestURI(),
-                                   rtl::OUString::createFromAscii(
-                                       "OPTIONS" ),
+                                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                       "OPTIONS" )),
                                    aHeaders );
 
             m_xSession->OPTIONS( getRequestURI(),
@@ -237,8 +237,8 @@ void DAVResourceAccess::PROPFIND(
 
             getUserRequestHeaders( xEnv,
                                    getRequestURI(),
-                                   rtl::OUString::createFromAscii(
-                                       "PROPFIND" ),
+                                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                       "PROPFIND" )),
                                    aHeaders );
 
             m_xSession->PROPFIND( getRequestURI(),
@@ -280,8 +280,8 @@ void DAVResourceAccess::PROPFIND(
             DAVRequestHeaders aHeaders;
             getUserRequestHeaders( xEnv,
                                    getRequestURI(),
-                                   rtl::OUString::createFromAscii(
-                                       "PROPFIND" ),
+                                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                       "PROPFIND" )),
                                    aHeaders );
 
             m_xSession->PROPFIND( getRequestURI(),
@@ -321,8 +321,8 @@ void DAVResourceAccess::PROPPATCH(
             DAVRequestHeaders aHeaders;
             getUserRequestHeaders( xEnv,
                                    getRequestURI(),
-                                   rtl::OUString::createFromAscii(
-                                       "PROPPATCH" ),
+                                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                       "PROPPATCH" )),
                                    aHeaders );
 
             m_xSession->PROPPATCH( getRequestURI(),
@@ -362,7 +362,7 @@ void DAVResourceAccess::HEAD(
             DAVRequestHeaders aHeaders;
             getUserRequestHeaders( xEnv,
                                    getRequestURI(),
-                                   rtl::OUString::createFromAscii( "HEAD" ),
+                                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HEAD")),
                                    aHeaders );
 
             m_xSession->HEAD( getRequestURI(),
@@ -402,7 +402,7 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET(
             DAVRequestHeaders aHeaders;
             getUserRequestHeaders( xEnv,
                                    getRequestURI(),
-                                   rtl::OUString::createFromAscii( "GET" ),
+                                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GET")),
                                    aHeaders );
 
             xStream = m_xSession->GET( getRequestURI(),
@@ -443,7 +443,7 @@ void DAVResourceAccess::GET(
             DAVRequestHeaders aHeaders;
             getUserRequestHeaders( xEnv,
                                    getRequestURI(),
-                                   rtl::OUString::createFromAscii( "GET" ),
+                                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GET")),
                                    aHeaders );
 
             m_xSession->GET( getRequestURI(),
@@ -484,7 +484,7 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET(
             DAVRequestHeaders aHeaders;
             getUserRequestHeaders( xEnv,
                                    getRequestURI(),
-                                   rtl::OUString::createFromAscii( "GET" ),
+                                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GET")),
                                    aHeaders );
 
             xStream = m_xSession->GET( getRequestURI(),
@@ -529,7 +529,7 @@ void DAVResourceAccess::GET(
             DAVRequestHeaders aHeaders;
             getUserRequestHeaders( xEnv,
                                    getRequestURI(),
-                                   rtl::OUString::createFromAscii( "GET" ),
+                                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GET")),
                                    aHeaders );
 
             m_xSession->GET( getRequestURI(),
@@ -616,7 +616,7 @@ void DAVResourceAccess::PUT(
             DAVRequestHeaders aHeaders;
             getUserRequestHeaders( xEnv,
                                    getRequestURI(),
-                                   rtl::OUString::createFromAscii( "PUT" ),
+                                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PUT")),
                                    aHeaders );
 
             m_xSession->PUT( getRequestURI(),
@@ -668,7 +668,7 @@ uno::Reference< io::XInputStream > DAVResourceAccess::POST(
             DAVRequestHeaders aHeaders;
             getUserRequestHeaders( xEnv,
                                    getRequestURI(),
-                                   rtl::OUString::createFromAscii( "POST" ),
+                                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("POST")),
                                    aHeaders );
 
             xStream = m_xSession->POST( getRequestURI(),
@@ -731,7 +731,7 @@ void DAVResourceAccess::POST(
             DAVRequestHeaders aHeaders;
             getUserRequestHeaders( xEnv,
                                    getRequestURI(),
-                                   rtl::OUString::createFromAscii( "POST" ),
+                                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("POST")),
                                    aHeaders );
 
             m_xSession->POST( getRequestURI(),
@@ -779,7 +779,7 @@ void DAVResourceAccess::MKCOL(
             DAVRequestHeaders aHeaders;
             getUserRequestHeaders( xEnv,
                                    getRequestURI(),
-                                   rtl::OUString::createFromAscii( "MKCOL" ),
+                                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MKCOL")),
                                    aHeaders );
 
             m_xSession->MKCOL( getRequestURI(),
@@ -819,7 +819,7 @@ void DAVResourceAccess::COPY(
             DAVRequestHeaders aHeaders;
             getUserRequestHeaders( xEnv,
                                    getRequestURI(),
-                                   rtl::OUString::createFromAscii( "COPY" ),
+                                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("COPY")),
                                    aHeaders );
 
             m_xSession->COPY( rSourcePath,
@@ -861,7 +861,7 @@ void DAVResourceAccess::MOVE(
             DAVRequestHeaders aHeaders;
             getUserRequestHeaders( xEnv,
                                    getRequestURI(),
-                                   rtl::OUString::createFromAscii( "MOVE" ),
+                                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MOVE")),
                                    aHeaders );
 
             m_xSession->MOVE( rSourcePath,
@@ -900,8 +900,8 @@ void DAVResourceAccess::DESTROY(
             DAVRequestHeaders aHeaders;
             getUserRequestHeaders( xEnv,
                                    getRequestURI(),
-                                   rtl::OUString::createFromAscii(
-                                       "DESTROY" ),
+                                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                       "DESTROY" )),
                                    aHeaders );
 
             m_xSession->DESTROY( getRequestURI(),
@@ -940,7 +940,7 @@ void DAVResourceAccess::LOCK(
             DAVRequestHeaders aHeaders;
             getUserRequestHeaders( xEnv,
                                    getRequestURI(),
-                                   rtl::OUString::createFromAscii( "LOCK" ),
+                                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LOCK")),
                                    aHeaders );
 
             m_xSession->LOCK( getRequestURI(),
@@ -982,7 +982,7 @@ sal_Int64 DAVResourceAccess::LOCK(
             DAVRequestHeaders aHeaders;
             getUserRequestHeaders( xEnv,
                                    getRequestURI(),
-                                   rtl::OUString::createFromAscii( "LOCK" ),
+                                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LOCK")),
                                    aHeaders );
 
             nNewTimeout = m_xSession->LOCK( getRequestURI(),
@@ -1024,7 +1024,7 @@ void DAVResourceAccess::UNLOCK(
             DAVRequestHeaders aHeaders;
             getUserRequestHeaders( xEnv,
                                    getRequestURI(),
-                                   rtl::OUString::createFromAscii( "UNLOCK" ),
+                                   rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNLOCK")),
                                    aHeaders );
 
             m_xSession->UNLOCK( getRequestURI(),
@@ -1162,7 +1162,7 @@ sal_Bool DAVResourceAccess::detectRedirectCycle(
         if ( aUri == (*it) )
             return sal_True;
 
-        it++;
+        ++it;
     }
 
     return sal_False;
diff --git a/ucb/source/ucp/webdav/LinkSequence.cxx b/ucb/source/ucp/webdav/LinkSequence.cxx
index 52dcda066a54..c638b3824a0e 100644
--- a/ucb/source/ucp/webdav/LinkSequence.cxx
+++ b/ucb/source/ucp/webdav/LinkSequence.cxx
@@ -204,9 +204,9 @@ bool LinkSequence::toXML( const uno::Sequence< ucb::Link > & rInData,
     sal_Int32 nCount = rInData.getLength();
     if ( nCount )
     {
-        rtl::OUString aPre( rtl::OUString::createFromAscii( "<link><src>" ) );
-        rtl::OUString aMid( rtl::OUString::createFromAscii( "</src><dst>" ) );
-        rtl::OUString aEnd( rtl::OUString::createFromAscii( "</dst></link>" ) );
+        rtl::OUString aPre( RTL_CONSTASCII_USTRINGPARAM("<link><src>") );
+        rtl::OUString aMid( RTL_CONSTASCII_USTRINGPARAM("</src><dst>") );
+        rtl::OUString aEnd( RTL_CONSTASCII_USTRINGPARAM("</dst></link>") );
 
         for ( sal_Int32 n = 0; n < nCount; ++n )
         {
diff --git a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
index 5af0f432469b..807a255efcc3 100644
--- a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
+++ b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
@@ -143,7 +143,7 @@ extern "C" int NPFR_propfind_iter( void* userdata,
                          RTL_CONSTASCII_STRINGPARAM( "<collection" ) ) == 0 )
                 {
                     thePropertyValue.Value
-                        <<= OUString::createFromAscii( "collection" );
+                        <<= OUString(RTL_CONSTASCII_USTRINGPARAM("collection"));
                 }
             }
 
diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx
index 958b26dca153..eb87fc9c41ac 100644
--- a/ucb/source/ucp/webdav/NeonSession.cxx
+++ b/ucb/source/ucp/webdav/NeonSession.cxx
@@ -363,7 +363,7 @@ namespace {
     ::rtl::OUString GetHostnamePart( const ::rtl::OUString& _rRawString )
     {
         ::rtl::OUString sPart;
-        ::rtl::OUString sPartId = ::rtl::OUString::createFromAscii( "CN=" );
+        ::rtl::OUString sPartId(RTL_CONSTASCII_USTRINGPARAM("CN="));
         sal_Int32 nContStart = _rRawString.indexOf( sPartId );
         if ( nContStart != -1 )
         {
@@ -390,8 +390,8 @@ extern "C" int NeonSession_CertificationNotify( void *userdata,
         xCertificateContainer
             = uno::Reference< security::XCertificateContainer >(
                 pSession->getMSF()->createInstance(
-                    rtl::OUString::createFromAscii(
-                        "com.sun.star.security.CertificateContainer" ) ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.security.CertificateContainer" )) ),
                 uno::UNO_QUERY );
     }
     catch ( uno::Exception const & )
@@ -423,7 +423,7 @@ extern "C" int NeonSession_CertificationNotify( void *userdata,
     {
         xSEInitializer = uno::Reference< xml::crypto::XSEInitializer >(
             pSession->getMSF()->createInstance(
-                rtl::OUString::createFromAscii( SEINITIALIZER_COMPONENT ) ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SEINITIALIZER_COMPONENT )) ),
             uno::UNO_QUERY );
     }
     catch ( uno::Exception const & )
@@ -2147,7 +2147,7 @@ NeonSession::isDomainMatch( rtl::OUString certHostName )
     if (hostName.equalsIgnoreAsciiCase( certHostName ) )
         return sal_True;
 
-    if ( 0 == certHostName.indexOf( rtl::OUString::createFromAscii( "*" ) ) &&
+    if ( 0 == certHostName.indexOf( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")) ) &&
          hostName.getLength() >= certHostName.getLength()  )
     {
         rtl::OUString cmpStr = certHostName.copy( 1 );
diff --git a/ucb/source/ucp/webdav/NeonUri.cxx b/ucb/source/ucp/webdav/NeonUri.cxx
index dd391c6c296e..a1ebbb0f94d4 100644
--- a/ucb/source/ucp/webdav/NeonUri.cxx
+++ b/ucb/source/ucp/webdav/NeonUri.cxx
@@ -192,14 +192,14 @@ void NeonUri::init( const rtl::OString & rUri, const ne_uri * pUri )
 #if NEON_VERSION >= 0x0260
     if ( pUri->query )
     {
-        mPath += rtl::OUString::createFromAscii( "?" );
+        mPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("?"));
         mPath += rtl::OStringToOUString(
             pUri->query,  RTL_TEXTENCODING_UTF8 );
     }
 
     if ( pUri->fragment )
     {
-        mPath += rtl::OUString::createFromAscii( "#" );
+        mPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#"));
         mPath += rtl::OStringToOUString(
             pUri->fragment,  RTL_TEXTENCODING_UTF8 );
     }
@@ -291,7 +291,7 @@ void NeonUri::calculateURI ()
         return aTemp;
     }
     else
-        return rtl::OUString::createFromAscii ("/");
+        return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("/"));
 }
 
 bool NeonUri::operator== ( const NeonUri & rOther ) const
@@ -307,7 +307,7 @@ bool NeonUri::operator== ( const NeonUri & rOther ) const
 void NeonUri::AppendPath (const rtl::OUString& rPath)
 {
     if (mPath.lastIndexOf ('/') != mPath.getLength () - 1)
-        mPath += rtl::OUString::createFromAscii ("/");
+        mPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("/"));
 
     mPath += rPath;
     calculateURI ();
diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
index 590b78706276..e7b5411487c5 100644
--- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
+++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
@@ -50,32 +50,20 @@ struct UCBDeadPropertyValueParseContext
 };
 
 // static
-const rtl::OUString UCBDeadPropertyValue::aTypeString
-    = rtl::OUString::createFromAscii( "string" );
-const rtl::OUString UCBDeadPropertyValue::aTypeLong
-    = rtl::OUString::createFromAscii( "long" );
-const rtl::OUString UCBDeadPropertyValue::aTypeShort
-    = rtl::OUString::createFromAscii( "short" );
-const rtl::OUString UCBDeadPropertyValue::aTypeBoolean
-    = rtl::OUString::createFromAscii( "boolean" );
-const rtl::OUString UCBDeadPropertyValue::aTypeChar
-    = rtl::OUString::createFromAscii( "char" );
-const rtl::OUString UCBDeadPropertyValue::aTypeByte
-    = rtl::OUString::createFromAscii( "byte" );
-const rtl::OUString UCBDeadPropertyValue::aTypeHyper
-    = rtl::OUString::createFromAscii( "hyper" );
-const rtl::OUString UCBDeadPropertyValue::aTypeFloat
-    = rtl::OUString::createFromAscii( "float" );
-const rtl::OUString UCBDeadPropertyValue::aTypeDouble
-    = rtl::OUString::createFromAscii( "double" );
+const rtl::OUString UCBDeadPropertyValue::aTypeString(RTL_CONSTASCII_USTRINGPARAM("string"));
+const rtl::OUString UCBDeadPropertyValue::aTypeLong(RTL_CONSTASCII_USTRINGPARAM("long"));
+const rtl::OUString UCBDeadPropertyValue::aTypeShort(RTL_CONSTASCII_USTRINGPARAM("short"));
+const rtl::OUString UCBDeadPropertyValue::aTypeBoolean(RTL_CONSTASCII_USTRINGPARAM("boolean"));
+const rtl::OUString UCBDeadPropertyValue::aTypeChar(RTL_CONSTASCII_USTRINGPARAM("char"));
+const rtl::OUString UCBDeadPropertyValue::aTypeByte(RTL_CONSTASCII_USTRINGPARAM("byte"));
+const rtl::OUString UCBDeadPropertyValue::aTypeHyper(RTL_CONSTASCII_USTRINGPARAM("hyper"));
+const rtl::OUString UCBDeadPropertyValue::aTypeFloat(RTL_CONSTASCII_USTRINGPARAM("float"));
+const rtl::OUString UCBDeadPropertyValue::aTypeDouble(RTL_CONSTASCII_USTRINGPARAM("double"));
 
 // static
-const rtl::OUString UCBDeadPropertyValue::aXMLPre
-    = rtl::OUString::createFromAscii( "<ucbprop><type>" );
-const rtl::OUString UCBDeadPropertyValue::aXMLMid
-    = rtl::OUString::createFromAscii( "</type><value>" );
-const rtl::OUString UCBDeadPropertyValue::aXMLEnd
-    = rtl::OUString::createFromAscii( "</value></ucbprop>" );
+const rtl::OUString UCBDeadPropertyValue::aXMLPre(RTL_CONSTASCII_USTRINGPARAM("<ucbprop><type>"));
+const rtl::OUString UCBDeadPropertyValue::aXMLMid(RTL_CONSTASCII_USTRINGPARAM("</type><value>"));
+const rtl::OUString UCBDeadPropertyValue::aXMLEnd(RTL_CONSTASCII_USTRINGPARAM("</value></ucbprop>"));
 
 #define STATE_TOP (1)
 
@@ -403,7 +391,7 @@ bool UCBDeadPropertyValue::createFromXML( const rtl::OString & rInData,
                 else if ( aCtx.pType->equalsIgnoreAsciiCase( aTypeBoolean ) )
                 {
                     if ( aStringValue.equalsIgnoreAsciiCase(
-                            rtl::OUString::createFromAscii( "true" ) ) )
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")) ) )
                         rOutData <<= sal_Bool( sal_True );
                     else
                         rOutData <<= sal_Bool( sal_False );
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index e7f36d16a619..81e96793e6e9 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -344,8 +344,8 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
 rtl::OUString SAL_CALL Content::getImplementationName()
     throw( uno::RuntimeException )
 {
-    return rtl::OUString::createFromAscii(
-                            "com.sun.star.comp.ucb.WebDAVContent" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.comp.ucb.WebDAVContent" ));
 }
 
 //=========================================================================
@@ -355,7 +355,7 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames()
 {
     uno::Sequence< rtl::OUString > aSNS( 1 );
     aSNS.getArray()[ 0 ]
-        = rtl::OUString::createFromAscii( WEBDAV_CONTENT_SERVICE_NAME );
+        = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( WEBDAV_CONTENT_SERVICE_NAME ));
     return aSNS;
 }
 
@@ -384,9 +384,9 @@ rtl::OUString SAL_CALL Content::getContentType()
     }
 
     if ( bFolder )
-        return rtl::OUString::createFromAscii( WEBDAV_COLLECTION_TYPE );
+        return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( WEBDAV_COLLECTION_TYPE ));
 
-    return rtl::OUString::createFromAscii( WEBDAV_CONTENT_TYPE );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( WEBDAV_CONTENT_TYPE ));
 }
 
 //=========================================================================
@@ -423,8 +423,8 @@ uno::Any SAL_CALL Content::execute(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "Wrong argument type!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "Wrong argument type!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -445,8 +445,8 @@ uno::Any SAL_CALL Content::execute(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "Wrong argument type!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "Wrong argument type!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -457,8 +457,8 @@ uno::Any SAL_CALL Content::execute(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "No properties!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "No properties!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -500,8 +500,8 @@ uno::Any SAL_CALL Content::execute(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "Wrong argument type!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "Wrong argument type!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -522,8 +522,8 @@ uno::Any SAL_CALL Content::execute(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "Wrong argument type!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "Wrong argument type!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -587,8 +587,8 @@ uno::Any SAL_CALL Content::execute(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                  rtl::OUString::createFromAscii(
-                                      "Wrong argument type!" ),
+                                  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                      "Wrong argument type!" )),
                                   static_cast< cppu::OWeakObject * >( this ),
                                   -1 ) ),
                 Environment );
@@ -609,8 +609,8 @@ uno::Any SAL_CALL Content::execute(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "Wrong argument type!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "Wrong argument type!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -652,8 +652,8 @@ uno::Any SAL_CALL Content::execute(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( lang::IllegalArgumentException(
-                                    rtl::OUString::createFromAscii(
-                                        "Wrong argument type!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "Wrong argument type!" )),
                                     static_cast< cppu::OWeakObject * >( this ),
                                     -1 ) ),
                 Environment );
@@ -952,7 +952,7 @@ Content::queryCreatableContentsInfo()
 
     // document.
     aSeq.getArray()[ 0 ].Type
-        = rtl::OUString::createFromAscii( WEBDAV_CONTENT_TYPE );
+        = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( WEBDAV_CONTENT_TYPE ));
     aSeq.getArray()[ 0 ].Attributes
         = ucb::ContentInfoAttribute::INSERT_WITH_INPUTSTREAM
           | ucb::ContentInfoAttribute::KIND_DOCUMENT;
@@ -967,7 +967,7 @@ Content::queryCreatableContentsInfo()
 
     // folder.
     aSeq.getArray()[ 1 ].Type
-        = rtl::OUString::createFromAscii( WEBDAV_COLLECTION_TYPE );
+        = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( WEBDAV_COLLECTION_TYPE ));
     aSeq.getArray()[ 1 ].Attributes
         = ucb::ContentInfoAttribute::KIND_FOLDER;
 
@@ -1001,18 +1001,18 @@ Content::createNewContent( const ucb::ContentInfo& Info )
                 "WebdavContent::createNewContent - empty identifier!" );
 
     if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() )
-        aURL += rtl::OUString::createFromAscii( "/" );
+        aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
     sal_Bool isCollection;
     if ( Info.Type.equalsAsciiL(
              RTL_CONSTASCII_STRINGPARAM( WEBDAV_COLLECTION_TYPE ) ) )
     {
-        aURL += rtl::OUString::createFromAscii( "New_Collection" );
+        aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("New_Collection"));
         isCollection = sal_True;
     }
     else
     {
-        aURL += rtl::OUString::createFromAscii( "New_Content" );
+        aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("New_Content"));
         isCollection = sal_False;
     }
 
@@ -1527,8 +1527,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 ) );
             continue;
         }
@@ -1541,8 +1541,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 ( rName.equalsAsciiL(
@@ -1550,8 +1550,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 ( rName.equalsAsciiL(
@@ -1559,8 +1559,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 ( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Title" ) ) )
@@ -1593,8 +1593,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                     catch ( DAVException const & )
                     {
                         aRet[ n ] <<= lang::IllegalArgumentException(
-                            rtl::OUString::createFromAscii(
-                                "Invalid content identifier!" ),
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                "Invalid content identifier!" )),
                             static_cast< cppu::OWeakObject * >( this ),
                             -1 );
                     }
@@ -1602,8 +1602,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                 else
                 {
                     aRet[ n ] <<= lang::IllegalArgumentException(
-                        rtl::OUString::createFromAscii(
-                            "Empty title not allowed!" ),
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                            "Empty title not allowed!" )),
                         static_cast< cppu::OWeakObject * >( this ),
                         -1 );
                 }
@@ -1611,8 +1611,8 @@ 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 ) );
             }
         }
@@ -1632,8 +1632,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                 // PROPPATCH::set would add the property automatically, which
                 // is not allowed for "setPropertyValues" command!
                 aRet[ n ] <<= beans::UnknownPropertyException(
-                                rtl::OUString::createFromAscii(
-                                    "Property is unknown!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "Property is unknown!" )),
                                 static_cast< cppu::OWeakObject * >( this ) );
                 continue;
             }
@@ -1642,8 +1642,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 ( rName.equalsAsciiL(
@@ -1651,8 +1651,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 ( rName.equalsAsciiL(
@@ -1660,8 +1660,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 ( rName.equalsAsciiL(
@@ -1670,8 +1670,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                 // Read-only property!
                 // (but could be writable, if 'getcontenttype' would be)
                 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 ) );
             }
             if ( rName.equalsAsciiL(
@@ -1679,8 +1679,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
@@ -1745,8 +1745,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 ) );
                     }
                 }
@@ -1810,7 +1810,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 
         rtl::OUString aNewURL = getParentURL();
         if ( aNewURL.lastIndexOf( '/' ) != ( aNewURL.getLength() - 1 ) )
-            aNewURL += rtl::OUString::createFromAscii( "/" );
+            aNewURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
         aNewURL += NeonUri::escapeSegment( aNewTitle );
 
@@ -1853,7 +1853,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 
                 // Set error .
                 aRet[ nTitlePos ] <<= uno::Exception(
-                    rtl::OUString::createFromAscii( "Exchange failed!" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Exchange failed!")),
                     static_cast< cppu::OWeakObject * >( this ) );
             }
         }
@@ -1871,7 +1871,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
     {
         osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
-        aEvent.PropertyName = rtl::OUString::createFromAscii( "Title" );
+        aEvent.PropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
         aEvent.OldValue     = uno::makeAny( aOldTitle );
         aEvent.NewValue     = uno::makeAny( aNewTitle );
 
@@ -2174,7 +2174,7 @@ void Content::queryChildren( ContentRefList& rChildren )
     if ( nURLPos != ( aURL.getLength() - 1 ) )
     {
         // No trailing slash found. Append.
-        aURL += rtl::OUString::createFromAscii( "/" );
+        aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     }
 
     sal_Int32 nLen = aURL.getLength();
@@ -2236,7 +2236,7 @@ void Content::insert(
         OSL_ENSURE( sal_False, "Content::insert - Title missing!" );
 
         uno::Sequence< rtl::OUString > aProps( 1 );
-        aProps[ 0 ] = rtl::OUString::createFromAscii( "Title" );
+        aProps[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
         ucbhelper::cancelCommandExecution(
             uno::makeAny( ucb::MissingPropertiesException(
                                 rtl::OUString(),
@@ -2267,8 +2267,8 @@ void Content::insert(
         if ( !bTransient || ( bTransient && !bCollection  ) )
         {
             ucb::UnsupportedNameClashException aEx(
-                rtl::OUString::createFromAscii(
-                    "Unable to write without overwrite!" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "Unable to write without overwrite!" )),
                 static_cast< cppu::OWeakObject * >( this ),
                 ucb::NameClash::ERROR );
 
@@ -2315,8 +2315,8 @@ void Content::insert(
                                     "Content::insert - "
                                     "Unknown interaction selection!" );
                         throw ucb::CommandFailedException(
-                                    rtl::OUString::createFromAscii(
-                                        "Unknown interaction selection!" ),
+                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                        "Unknown interaction selection!" )),
                                     uno::Reference< uno::XInterface >(),
                                     aExAsAny );
 //                            break;
@@ -2335,7 +2335,7 @@ void Content::insert(
         // Assemble new content identifier...
         rtl::OUString aURL = getParentURL();
         if ( aURL.lastIndexOf( '/' ) != ( aURL.getLength() - 1 ) )
-            aURL += rtl::OUString::createFromAscii( "/" );
+            aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
         aURL += aEscapedTitle;
 
@@ -2489,19 +2489,19 @@ void Content::transfer(
                 RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) )
         {
             sourceURI.SetScheme(
-                rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( HTTP_URL_SCHEME )) );
         }
         else if ( aScheme.equalsAsciiL(
                 RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) )
         {
             sourceURI.SetScheme(
-                rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( HTTP_URL_SCHEME )) );
         }
         else if ( aScheme.equalsAsciiL(
                 RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) )
         {
             sourceURI.SetScheme(
-                rtl::OUString::createFromAscii( HTTPS_URL_SCHEME ) );
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( HTTPS_URL_SCHEME )) );
         }
         else
         {
@@ -2513,8 +2513,8 @@ void Content::transfer(
                 ucbhelper::cancelCommandExecution(
                     uno::makeAny(
                         ucb::InteractiveBadTransferURLException(
-                            rtl::OUString::createFromAscii(
-                                "Unsupported URL scheme!" ),
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                "Unsupported URL scheme!" )),
                             static_cast< cppu::OWeakObject * >( this ) ) ),
                     Environment );
                 // Unreachable
@@ -2524,11 +2524,11 @@ void Content::transfer(
         if ( targetURI.GetScheme().toAsciiLowerCase().equalsAsciiL(
                  RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) )
             targetURI.SetScheme(
-                rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( HTTP_URL_SCHEME )) );
         else if ( targetURI.GetScheme().toAsciiLowerCase().equalsAsciiL(
                  RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) )
             targetURI.SetScheme(
-                rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( HTTP_URL_SCHEME )) );
 
         // @@@ This implementation of 'transfer' only works
         //     if the source and target are located at same host.
@@ -2541,8 +2541,8 @@ void Content::transfer(
         {
             ucbhelper::cancelCommandExecution(
                 uno::makeAny( ucb::InteractiveBadTransferURLException(
-                                rtl::OUString::createFromAscii(
-                                    "Different hosts!" ),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "Different hosts!" )),
                                 static_cast< cppu::OWeakObject * >( this ) ) ),
                 Environment );
             // Unreachable
@@ -2564,7 +2564,7 @@ void Content::transfer(
         rtl::OUString aTargetURL = xIdentifier->getContentIdentifier();
         if ( ( aTargetURL.lastIndexOf( '/' ) + 1 )
                 != aTargetURL.getLength() )
-            aTargetURL += rtl::OUString::createFromAscii( "/" );
+            aTargetURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
         aTargetURL += aTitle;
 
@@ -2770,7 +2770,7 @@ void Content::lock(
 
         uno::Any aOwnerAny;
         aOwnerAny
-            <<= rtl::OUString::createFromAscii( "http://ucb.openoffice.org" );
+            <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("http://ucb.openoffice.org"));
 
         ucb::Lock aLock(
             ucb::LockScope_EXCLUSIVE,
@@ -2904,7 +2904,7 @@ sal_Bool Content::isFolder(
     }
 
     uno::Sequence< beans::Property > aProperties( 1 );
-    aProperties[ 0 ].Name   = rtl::OUString::createFromAscii( "IsFolder" );
+    aProperties[ 0 ].Name   = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder"));
     aProperties[ 0 ].Handle = -1;
     uno::Reference< sdbc::XRow > xRow( getPropertyValues( aProperties, xEnv ) );
     if ( xRow.is() )
@@ -2933,13 +2933,13 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite )
         {
             uno::Sequence< uno::Any > aArgs( 1 );
             aArgs[ 0 ] <<= beans::PropertyValue(
-                rtl::OUString::createFromAscii("Uri"), -1,
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Uri")), -1,
                 uno::makeAny(m_xIdentifier->getContentIdentifier()),
                 beans::PropertyState_DIRECT_VALUE);
 
             aException <<=
                 ucb::InteractiveAugmentedIOException(
-                    rtl::OUString::createFromAscii( "Not found!" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Not found!")),
                     static_cast< cppu::OWeakObject * >( this ),
                     task::InteractionClassification_ERROR,
                     ucb::IOErrorCode_NOT_EXISTING,
@@ -3021,7 +3021,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite )
 #if 1
         aException <<=
             ucb::InteractiveLockingLockedException(
-                rtl::OUString::createFromAscii( "Locked!" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Locked!")),
                 static_cast< cppu::OWeakObject * >( this ),
                 task::InteractionClassification_ERROR,
                 m_xIdentifier->getContentIdentifier(),
@@ -3030,13 +3030,13 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite )
         {
             uno::Sequence< uno::Any > aArgs( 1 );
             aArgs[ 0 ] <<= beans::PropertyValue(
-                rtl::OUString::createFromAscii("Uri"), -1,
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Uri")), -1,
                 uno::makeAny(m_xIdentifier->getContentIdentifier()),
                 beans::PropertyState_DIRECT_VALUE);
 
             aException <<=
                 ucb::InteractiveAugmentedIOException(
-                    rtl::OUString::createFromAscii( "Locked!" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Locked!")),
                     static_cast< cppu::OWeakObject * >( this ),
                     task::InteractionClassification_ERROR,
                     ucb::IOErrorCode_LOCKING_VIOLATION,
@@ -3048,7 +3048,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite )
     case DAVException::DAV_LOCKED_SELF:
         aException <<=
             ucb::InteractiveLockingLockedException(
-                rtl::OUString::createFromAscii( "Locked (self)!" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Locked (self)!")),
                 static_cast< cppu::OWeakObject * >( this ),
                 task::InteractionClassification_ERROR,
                 m_xIdentifier->getContentIdentifier(),
@@ -3058,7 +3058,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite )
     case DAVException::DAV_NOT_LOCKED:
         aException <<=
             ucb::InteractiveLockingNotLockedException(
-                rtl::OUString::createFromAscii( "Not locked!" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Not locked!")),
                 static_cast< cppu::OWeakObject * >( this ),
                 task::InteractionClassification_ERROR,
                 m_xIdentifier->getContentIdentifier() );
@@ -3067,7 +3067,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite )
     case DAVException::DAV_LOCK_EXPIRED:
         aException <<=
             ucb::InteractiveLockingLockExpiredException(
-                rtl::OUString::createFromAscii( "Lock expired!" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Lock expired!")),
                 static_cast< cppu::OWeakObject * >( this ),
                 task::InteractionClassification_ERROR,
                 m_xIdentifier->getContentIdentifier() );
@@ -3175,13 +3175,13 @@ const Content::ResourceType & Content::getResourceType(
                 std::vector< rtl::OUString > aPropNames;
                 uno::Sequence< beans::Property > aProperties( 5 );
                 aProperties[ 0 ].Name
-                    = rtl::OUString::createFromAscii( "IsFolder" );
+                    = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder"));
                 aProperties[ 1 ].Name
-                    = rtl::OUString::createFromAscii( "IsDocument" );
+                    = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument"));
                 aProperties[ 2 ].Name
-                    = rtl::OUString::createFromAscii( "IsReadOnly" );
+                    = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsReadOnly"));
                 aProperties[ 3 ].Name
-                    = rtl::OUString::createFromAscii( "MediaType" );
+                    = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType"));
                 aProperties[ 4 ].Name
                     = DAVProperties::SUPPORTEDLOCK;
 
diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.cxx b/ucb/source/ucp/webdav/webdavdatasupplier.cxx
index 63162e31644c..7f5a0b007d17 100644
--- a/ucb/source/ucp/webdav/webdavdatasupplier.cxx
+++ b/ucb/source/ucp/webdav/webdavdatasupplier.cxx
@@ -163,12 +163,12 @@ rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex )
                             = *( m_pImpl->m_aResults[ nIndex ]->pData );
 
         if ( ( aId.lastIndexOf( '/' ) + 1 ) != aId.getLength() )
-            aId += rtl::OUString::createFromAscii( "/" );
+            aId += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
         aId += props.getEscapedTitle();
 
         if ( props.isTrailingSlash() )
-            aId += rtl::OUString::createFromAscii( "/" );
+            aId += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
         m_pImpl->m_aResults[ nIndex ]->aId = aId;
         return aId;
diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx
index 536a0a0c2eba..13a5b6145612 100644
--- a/ucb/source/ucp/webdav/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav/webdavprovider.cxx
@@ -95,10 +95,10 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
 //=========================================================================
 
 XSERVICEINFO_IMPL_1( ContentProvider,
-                     rtl::OUString::createFromAscii(
-                         "com.sun.star.comp.WebDAVContentProvider" ),
-                     rtl::OUString::createFromAscii(
-                         WEBDAV_CONTENT_PROVIDER_SERVICE_NAME ) );
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         "com.sun.star.comp.WebDAVContentProvider" )),
+                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                         WEBDAV_CONTENT_PROVIDER_SERVICE_NAME )) );
 
 //=========================================================================
 //
@@ -160,8 +160,8 @@ ContentProvider::queryContent(
     {
         aURL = aURL.replaceAt( 0,
                                WEBDAV_URL_SCHEME_LENGTH,
-                               rtl::OUString::createFromAscii(
-                                                    HTTP_URL_SCHEME ) );
+                               rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                                    HTTP_URL_SCHEME )) );
         bNewId = true;
     }
     else if ( aScheme.equalsAsciiL(
@@ -169,8 +169,8 @@ ContentProvider::queryContent(
     {
         aURL = aURL.replaceAt( 0,
                                DAV_URL_SCHEME_LENGTH,
-                               rtl::OUString::createFromAscii(
-                                                    HTTP_URL_SCHEME ) );
+                               rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                                    HTTP_URL_SCHEME )) );
         bNewId = true;
     }
     else if ( aScheme.equalsAsciiL(
@@ -178,8 +178,8 @@ ContentProvider::queryContent(
     {
         aURL = aURL.replaceAt( 0,
                                DAVS_URL_SCHEME_LENGTH,
-                               rtl::OUString::createFromAscii(
-                                                    HTTPS_URL_SCHEME ) );
+                               rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                                    HTTPS_URL_SCHEME )) );
         bNewId = true;
     }
 
@@ -194,7 +194,7 @@ ContentProvider::queryContent(
         nPos = aURL.indexOf( '/', nPos + 1 );
         if ( nPos == -1 )
         {
-            aURL += rtl::OUString::createFromAscii( "/" );
+            aURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
             bNewId = true;
         }
     }
diff --git a/ucb/source/ucp/webdav/webdavservices.cxx b/ucb/source/ucp/webdav/webdavservices.cxx
index 1678d2c6fbe2..22b129d2e766 100644
--- a/ucb/source/ucp/webdav/webdavservices.cxx
+++ b/ucb/source/ucp/webdav/webdavservices.cxx
@@ -40,9 +40,9 @@ static 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
diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx
index 7e64bacf23e4..f57c3c7521db 100644
--- a/ucb/workben/ucb/ucbdemo.cxx
+++ b/ucb/workben/ucb/ucbdemo.cxx
@@ -236,7 +236,7 @@ rtl::OUString TestOutputStream::getStart() const
 {
     rtl::OUString sResult = m_sStart;
     if (m_bMore)
-        sResult += rtl::OUString::createFromAscii("...");
+        sResult += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("..."));
     return sResult;
 }
 
@@ -285,13 +285,13 @@ rtl::OUString ProgressHandler::toString(const uno::Any & rStatus)
         if (aStart.Text.getLength() > 0)
         {
             sResult = aStart.Text;
-            sResult += rtl::OUString::createFromAscii(" ");
+            sResult += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
         }
-        sResult += rtl::OUString::createFromAscii("[");
+        sResult += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("["));
         sResult += rtl::OUString::valueOf(aStart.Minimum);
-        sResult += rtl::OUString::createFromAscii("..");
+        sResult += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".."));
         sResult += rtl::OUString::valueOf(aStart.Maximum);
-        sResult += rtl::OUString::createFromAscii("]");
+        sResult += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("]"));
         return sResult;
     }
 
@@ -302,13 +302,13 @@ rtl::OUString ProgressHandler::toString(const uno::Any & rStatus)
     sal_Int32 nValue;
     if (rStatus >>= nValue)
     {
-        rtl::OUString sResult = rtl::OUString::createFromAscii("..");
+        rtl::OUString sResult(RTL_CONSTASCII_USTRINGPARAM(".."));
         sResult += rtl::OUString::valueOf(nValue);
-        sResult += rtl::OUString::createFromAscii("..");
+        sResult += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".."));
         return rtl::OUString(sResult);
     }
 
-    return rtl::OUString::createFromAscii("(Unknown object)");
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("(Unknown object)"));
 }
 
 //============================================================================
@@ -328,7 +328,7 @@ ProgressHandler::queryInterface( const uno::Type & rType )
 void SAL_CALL ProgressHandler::push(const uno::Any & rStatus)
     throw (uno::RuntimeException)
 {
-    rtl::OUString sMessage = rtl::OUString::createFromAscii("Status push: ");
+    rtl::OUString sMessage(RTL_CONSTASCII_USTRINGPARAM("Status push: "));
     sMessage += toString(rStatus);
     m_rPrinter.print(sMessage);
 }
@@ -338,7 +338,7 @@ void SAL_CALL ProgressHandler::push(const uno::Any & rStatus)
 void SAL_CALL ProgressHandler::update(const uno::Any & rStatus)
     throw (uno::RuntimeException)
 {
-    rtl::OUString sMessage = rtl::OUString::createFromAscii("Status update: ");
+    rtl::OUString sMessage(RTL_CONSTASCII_USTRINGPARAM("Status update: "));
     sMessage += toString(rStatus);
     m_rPrinter.print(sMessage);
 }
@@ -396,13 +396,13 @@ rtl::OUString Ucb::m_aProtocol;
 // static
 rtl::OUString Ucb::getUnoURL()
 {
-    rtl::OUString aUnoURL(rtl::OUString::createFromAscii(
+    rtl::OUString aUnoURL(RTL_CONSTASCII_USTRINGPARAM(
                          "uno:socket,host=localhost,port=8121;"));
     if (m_aProtocol.getLength() == 0)
-        aUnoURL += rtl::OUString::createFromAscii("urp");
+        aUnoURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("urp"));
     else
         aUnoURL += m_aProtocol;
-    aUnoURL += rtl::OUString::createFromAscii(";UCB.Factory");
+    aUnoURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";UCB.Factory"));
     return aUnoURL;
 }
 
@@ -437,7 +437,7 @@ sal_Bool Ucb::init()
             uno::Sequence< uno::Any > aArgs(4);
             aArgs[0] <<= m_aConfigurationKey1;
             aArgs[1] <<= m_aConfigurationKey2;
-            aArgs[2] <<= rtl::OUString::createFromAscii("PIPE");
+            aArgs[2] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PIPE"));
             aArgs[3] <<= aPipe;
 
             ::ucbhelper::ContentBroker::initialize( m_xFac, aArgs );
@@ -659,8 +659,8 @@ uno::Any UcbCommandProcessor::executeCommand( const rtl::OUString& rName,
                 = uno::Reference< task::XInteractionHandler >(
                       m_rUCB.getServiceFactory()->
                           createInstance(
-                              rtl::OUString::createFromAscii(
-                                  "com.sun.star.task.InteractionHandler")),
+                              rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                  "com.sun.star.task.InteractionHandler"))),
                       uno::UNO_QUERY);
         uno::Reference< ucb::XProgressHandler >
             xProgressHandler(new ProgressHandler(m_rUCB));
@@ -934,18 +934,18 @@ void UcbContent::open( const rtl::OUString & rName, const UniString& rInput,
             return;
         }
         aArgument.Properties.realloc(5);
-        aArgument.Properties[0].Name = rtl::OUString::createFromAscii("Title");
+        aArgument.Properties[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
         aArgument.Properties[0].Handle = -1;
         aArgument.Properties[1].Name
-            = rtl::OUString::createFromAscii("DateCreated");
+            = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateCreated"));
         aArgument.Properties[1].Handle = -1;
-        aArgument.Properties[2].Name = rtl::OUString::createFromAscii("Size");
+        aArgument.Properties[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size"));
         aArgument.Properties[2].Handle = -1;
         aArgument.Properties[3].Name
-            = rtl::OUString::createFromAscii("IsFolder");
+            = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder"));
         aArgument.Properties[3].Handle = -1;
         aArgument.Properties[4].Name
-            = rtl::OUString::createFromAscii("IsDocument");
+            = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument"));
         aArgument.Properties[4].Handle = -1;
         aArg <<= aArgument;
     }
@@ -958,19 +958,19 @@ void UcbContent::open( const rtl::OUString & rName, const UniString& rInput,
             // Property values which shall be in the result set...
             uno::Sequence< beans::Property > aProps( 5 );
             beans::Property* pProps = aProps.getArray();
-            pProps[ 0 ].Name   = rtl::OUString::createFromAscii( "Title" );
+            pProps[ 0 ].Name   = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
             pProps[ 0 ].Handle = -1; // Important!
 /**/        pProps[ 0 ].Type = getCppuType(static_cast< rtl::OUString * >(0));
                 // HACK for sorting...
-            pProps[ 1 ].Name   = rtl::OUString::createFromAscii( "DateCreated" );
+            pProps[ 1 ].Name   = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateCreated"));
             pProps[ 1 ].Handle = -1; // Important!
-            pProps[ 2 ].Name   = rtl::OUString::createFromAscii( "Size" );
+            pProps[ 2 ].Name   = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size"));
             pProps[ 2 ].Handle = -1; // Important!
-            pProps[ 3 ].Name   = rtl::OUString::createFromAscii( "IsFolder" );
+            pProps[ 3 ].Name   = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder"));
             pProps[ 3 ].Handle = -1; // Important!
 /**/        pProps[ 3 ].Type = getCppuType(static_cast< sal_Bool * >(0));
                 // HACK for sorting...
-            pProps[ 4 ].Name   = rtl::OUString::createFromAscii( "IsDocument" );
+            pProps[ 4 ].Name   = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument"));
             pProps[ 4 ].Handle = -1; // Important!
             aOpenArg.Properties = aProps;
 
@@ -1022,9 +1022,9 @@ void UcbContent::open( const rtl::OUString & rName, const UniString& rInput,
                               m_rUCB.
                                   getServiceFactory()->
                                       createInstance(
-                                          rtl::OUString::createFromAscii(
+                                          rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                                               "com.sun.star.ucb.SortedDynamic"
-                                                  "ResultSetFactory")),
+                                                  "ResultSetFactory"))),
                               uno::UNO_QUERY);
                 uno::Reference< ucb::XDynamicResultSet > xSorted;
                 if (xSortedFactory.is())
@@ -1062,8 +1062,8 @@ void UcbContent::open( const rtl::OUString & rName, const UniString& rInput,
                     try
                     {
                         xProperties->
-                            setPropertyValue(rtl::OUString::createFromAscii(
-                                                 "FetchSize"),
+                            setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                                 "FetchSize")),
                                              uno::makeAny(nFetchSize));
                         bSet = true;
                     }
@@ -1307,11 +1307,11 @@ void UcbContent::transfer( const rtl::OUString& rSourceURL, sal_Bool bMove  )
                             rSourceURL,
                             getURL(),
                             rtl::OUString(),
-                            //rtl::OUString::createFromAscii( "NewTitle" ),
+                            //rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NewTitle")),
                             ucb::NameClash::ERROR );
 
-        ucb::Command aTransferCommand( rtl::OUString::createFromAscii(
-                                                "globalTransfer" ),
+        ucb::Command aTransferCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                                "globalTransfer" )),
                                              -1,
                                              uno::makeAny( aArg ) );
 
@@ -1321,8 +1321,8 @@ void UcbContent::transfer( const rtl::OUString& rSourceURL, sal_Bool bMove  )
                 = uno::Reference< task::XInteractionHandler >(
                           m_rUCB.getServiceFactory()->
                               createInstance(
-                                rtl::OUString::createFromAscii(
-                                      "com.sun.star.task.InteractionHandler")),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                      "com.sun.star.task.InteractionHandler"))),
                         uno::UNO_QUERY);
         uno::Reference< ucb::XProgressHandler > xProgressHandler(
             new ProgressHandler(m_rUCB));
@@ -1347,9 +1347,9 @@ void UcbContent::transfer( const rtl::OUString& rSourceURL, sal_Bool bMove  )
     uno::Any aArg;
     aArg <<= ucb::TransferInfo(
             bMove, rSourceURL, rtl::OUString(), ucb::NameClash::ERROR );
-    executeCommand( rtl::OUString::createFromAscii( "transfer" ), aArg );
+    executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("transfer")), aArg );
 
-//  executeCommand( rtl::OUString::createFromAscii( "flush" ), Any() );
+//  executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("flush")), Any() );
 
 #endif
 }
@@ -1361,16 +1361,16 @@ void UcbContent::destroy()
 
     uno::Any aArg;
     aArg <<= sal_Bool( sal_True ); // delete physically, not only to trash.
-    executeCommand( rtl::OUString::createFromAscii( "delete" ), aArg );
+    executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), aArg );
 
-//  executeCommand( rtl::OUString::createFromAscii( "flush" ), Any() );
+//  executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("flush")), Any() );
 }
 
 //-------------------------------------------------------------------------
 uno::Sequence< ucb::CommandInfo > UcbContent::getCommands()
 {
     uno::Any aResult = executeCommand(
-            rtl::OUString::createFromAscii( "getCommandInfo" ), uno::Any() );
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getCommandInfo")), uno::Any() );
 
     uno::Reference< ucb::XCommandInfo > xInfo;
     if ( aResult >>= xInfo )
@@ -1401,7 +1401,7 @@ uno::Sequence< ucb::CommandInfo > UcbContent::getCommands()
 uno::Sequence< beans::Property > UcbContent::getProperties()
 {
     uno::Any aResult = executeCommand(
-        rtl::OUString::createFromAscii( "getPropertySetInfo" ), uno::Any() );
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertySetInfo")), uno::Any() );
 
     uno::Reference< beans::XPropertySetInfo > xInfo;
     if ( aResult >>= xInfo )
@@ -1442,7 +1442,7 @@ uno::Any UcbContent::getPropertyValue( const rtl::OUString& rName )
     aArg <<= aProps;
 
     uno::Any aResult = executeCommand(
-        rtl::OUString::createFromAscii( "getPropertyValues" ), aArg );
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertyValues")), aArg );
 
     uno::Reference< sdbc::XRow > xValues;
     if ( aResult >>= xValues )
@@ -1490,10 +1490,10 @@ void UcbContent::setPropertyValue( const rtl::OUString& rName,
     uno::Any aArg;
     aArg <<= aProps;
 
-    executeCommand( rtl::OUString::createFromAscii( "setPropertyValues" ),
+    executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setPropertyValues")),
                     aArg );
 
-//  executeCommand( rtl::OUString::createFromAscii( "flush" ), Any() );
+//  executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("flush")), Any() );
 }
 
 //----------------------------------------------------------------------------
@@ -2203,7 +2203,7 @@ IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox )
             if ( m_pContent )
                 m_pContent->addStringProperty(
                         aCmdLine,
-                        rtl::OUString::createFromAscii( "DefaultValue" ) );
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultValue")) );
             else
                 print( "No content!" );
 
@@ -2229,7 +2229,7 @@ IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox )
             if ( m_pContent )
                 m_pContent->setStringPropertyValue(
                                 aCmdLine,
-                                rtl::OUString::createFromAscii( "NewValue" ) );
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NewValue")) );
             else
                 print( "No content!" );
 
@@ -2237,7 +2237,7 @@ IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox )
 
         case MYWIN_ITEMID_OPEN:
             if ( m_pContent )
-                m_pContent->open(rtl::OUString::createFromAscii("open"),
+                m_pContent->open(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open")),
                                  aCmdLine, !m_bTiming, m_bTiming, m_bSort, 0,
                                  0, m_nFetchSize);
             else
@@ -2256,7 +2256,7 @@ IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox )
 
         case MYWIN_ITEMID_UPDATE:
             if ( m_pContent )
-                m_pContent->open(rtl::OUString::createFromAscii("update"),
+                m_pContent->open(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("update")),
                                  aCmdLine, !m_bTiming, m_bTiming, m_bSort, 0,
                                  0, m_nFetchSize);
             else
@@ -2266,7 +2266,7 @@ IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox )
 
         case MYWIN_ITEMID_SYNCHRONIZE:
             if ( m_pContent )
-                m_pContent->open(rtl::OUString::createFromAscii("synchronize"),
+                m_pContent->open(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("synchronize")),
                                  aCmdLine, !m_bTiming, m_bTiming, m_bSort, 0,
                                  0, m_nFetchSize);
             else
@@ -2276,7 +2276,7 @@ IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox )
 
         case MYWIN_ITEMID_SEARCH:
             if ( m_pContent )
-                m_pContent->open(rtl::OUString::createFromAscii("search"),
+                m_pContent->open(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("search")),
                                  aCmdLine, !m_bTiming, m_bTiming, m_bSort, 0,
                                  0, m_nFetchSize);
             else
@@ -2287,7 +2287,7 @@ IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox )
         case MYWIN_ITEMID_REORGANIZE:
             if ( m_pContent )
                 m_pContent->executeCommand (
-                    rtl::OUString::createFromAscii ("reorganizeData"),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("reorganizeData")),
                     uno::Any());
             else
                 print( "No content!" );
@@ -2402,7 +2402,7 @@ IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox )
             uno::Any aArgument;
             if (nItemId == MYWIN_ITEMID_OFFLINE)
             {
-                aName = rtl::OUString::createFromAscii("goOffline");
+                aName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("goOffline"));
 
                 uno::Sequence<
                     uno::Reference< ucb::XContentIdentifier > >
@@ -2413,7 +2413,7 @@ IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox )
                 aArgument <<= aIdentifiers;
             }
             else
-                aName = rtl::OUString::createFromAscii("goOnline");
+                aName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("goOnline"));
 
             UcbCommandProcessor(m_aUCB, xProcessor, m_pOutEdit).
                 executeCommand(aName, aArgument);
@@ -2449,9 +2449,9 @@ void MyApp::Main()
     // Read command line params.
     //////////////////////////////////////////////////////////////////////
 
-    rtl::OUString aConfigurationKey1(rtl::OUString::createFromAscii(
+    rtl::OUString aConfigurationKey1(RTL_CONSTASCII_USTRINGPARAM(
                                          UCB_CONFIGURATION_KEY1_LOCAL));
-    rtl::OUString aConfigurationKey2(rtl::OUString::createFromAscii(
+    rtl::OUString aConfigurationKey2(RTL_CONSTASCII_USTRINGPARAM(
                                          UCB_CONFIGURATION_KEY2_OFFICE));
 
     USHORT nParams = Application::GetCommandLineParamCount();
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index 1da9dc9b8a2b..3592049c95f4 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -227,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
@@ -239,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 );
         }
@@ -257,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
@@ -269,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
@@ -307,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 );
         }
@@ -317,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 >() );
     }
 
@@ -357,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 );
         }
@@ -367,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 >() );
     }
 
@@ -535,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();
 
@@ -551,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();
 
@@ -678,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;
 
@@ -711,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;
 
@@ -732,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() );
@@ -759,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;
 
@@ -780,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() );
@@ -807,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;
 
@@ -876,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;
 
@@ -909,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;
 
@@ -1022,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,
@@ -1057,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,
@@ -1097,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,
@@ -1151,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,
@@ -1198,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;
 
@@ -1223,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;
 
@@ -1248,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;
 
@@ -1273,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;
 
@@ -1296,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;
 
@@ -1319,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;
 
@@ -1338,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;
 
@@ -1354,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;
 
@@ -1415,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;
 
@@ -1449,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,
@@ -1478,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;
 
@@ -1512,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,
@@ -1567,8 +1567,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() );
@@ -1582,7 +1582,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;
 
@@ -1595,14 +1595,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() );
 
@@ -1616,14 +1616,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() );
 
diff --git a/ucbhelper/source/client/contentbroker.cxx b/ucbhelper/source/client/contentbroker.cxx
index cc5f6f8280e0..4eef68226b06 100644
--- a/ucbhelper/source/client/contentbroker.cxx
+++ b/ucbhelper/source/client/contentbroker.cxx
@@ -285,8 +285,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 & )
                 {
@@ -319,8 +319,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 & )
diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx
index 8c26104a07b6..b336e74afd94 100644
--- a/ucbhelper/source/client/proxydecider.cxx
+++ b/ucbhelper/source/client/proxydecider.cxx
@@ -267,17 +267,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(),
@@ -295,8 +295,8 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl(
                 try
                 {
                     if ( !( xNameAccess->getByName(
-                                rtl::OUString::createFromAscii(
-                                    PROXY_TYPE_KEY ) ) >>= m_nProxyType ) )
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    PROXY_TYPE_KEY )) ) >>= m_nProxyType ) )
                     {
                         OSL_ENSURE( sal_False,
                                     "InternetProxyDecider - "
@@ -314,8 +314,8 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl(
                 try
                 {
                     if ( !( xNameAccess->getByName(
-                                rtl::OUString::createFromAscii(
-                                    NO_PROXY_LIST_KEY ) ) >>= aNoProxyList ) )
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    NO_PROXY_LIST_KEY )) ) >>= aNoProxyList ) )
                     {
                         OSL_ENSURE( sal_False,
                                     "InternetProxyDecider - "
@@ -334,8 +334,8 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl(
                 try
                 {
                     if ( !( xNameAccess->getByName(
-                                rtl::OUString::createFromAscii(
-                                    HTTP_PROXY_NAME_KEY ) )
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    HTTP_PROXY_NAME_KEY )) )
                             >>= m_aHttpProxy.aName ) )
                     {
                         OSL_ENSURE( sal_False,
@@ -354,8 +354,8 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl(
                 try
                 {
                     uno::Any aValue = xNameAccess->getByName(
-                            rtl::OUString::createFromAscii(
-                                HTTP_PROXY_PORT_KEY ) );
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                HTTP_PROXY_PORT_KEY )) );
                     if ( aValue.hasValue() &&
                          !( aValue >>= m_aHttpProxy.nPort ) )
                     {
@@ -377,8 +377,8 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl(
                 try
                 {
                     if ( !( xNameAccess->getByName(
-                                rtl::OUString::createFromAscii(
-                                    FTP_PROXY_NAME_KEY ) )
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    FTP_PROXY_NAME_KEY )) )
                             >>= m_aFtpProxy.aName ) )
                     {
                         OSL_ENSURE( sal_False,
@@ -397,8 +397,8 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl(
                 try
                 {
                     uno::Any aValue = xNameAccess->getByName(
-                            rtl::OUString::createFromAscii(
-                                FTP_PROXY_PORT_KEY ) );
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                FTP_PROXY_PORT_KEY )) );
                     if ( aValue.hasValue() &&
                          !( aValue >>= m_aFtpProxy.nPort ) )
                     {
@@ -742,14 +742,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
                 {
diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx
index ab479372dc9f..c0d5f5ce1cb3 100644
--- a/ucbhelper/source/provider/propertyvalueset.cxx
+++ b/ucbhelper/source/provider/propertyvalueset.cxx
@@ -666,8 +666,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(),
diff --git a/ucbhelper/source/provider/provconf.cxx b/ucbhelper/source/provider/provconf.cxx
index 9e58ba5006e1..542ddf9351ae 100644
--- a/ucbhelper/source/provider/provconf.cxx
+++ b/ucbhelper/source/provider/provconf.cxx
@@ -108,8 +108,8 @@ bool getContentProviderData(
     {
         uno::Reference< lang::XMultiServiceFactory > xConfigProv(
                 rServiceMgr->createInstance(
-                    rtl::OUString::createFromAscii(
-                        "com.sun.star.configuration.ConfigurationProvider" ) ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.configuration.ConfigurationProvider" )) ),
                 uno::UNO_QUERY );
 
         if ( !xConfigProv.is() )
diff --git a/ucbhelper/source/provider/providerhelper.cxx b/ucbhelper/source/provider/providerhelper.cxx
index 359e5c952463..9a70249c33da 100644
--- a/ucbhelper/source/provider/providerhelper.cxx
+++ b/ucbhelper/source/provider/providerhelper.cxx
@@ -326,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(),
diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx
index 9f2f97d558fd..b39d6aa886a6 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -309,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 )) );
 
 //=========================================================================
 //
@@ -1358,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();
@@ -1389,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();
     }
@@ -1421,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 )
@@ -1447,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 )
@@ -1536,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
@@ -1552,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
diff --git a/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx
index a508b47818c9..ac6798e7450e 100644
--- a/ucbhelper/source/provider/resultsethelper.cxx
+++ b/ucbhelper/source/provider/resultsethelper.cxx
@@ -117,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 )) );
 
 //=========================================================================
 //
@@ -273,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 & )
diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx
index d7697fb92533..ceb73a994412 100644
--- a/ucbhelper/source/provider/resultsetmetadata.cxx
+++ b/ucbhelper/source/provider/resultsetmetadata.cxx
@@ -412,8 +412,8 @@ 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() )
                 {
diff --git a/ucbhelper/workben/myucp/myucp_content.cxx b/ucbhelper/workben/myucp/myucp_content.cxx
index a787ed64467f..35219355d071 100644
--- a/ucbhelper/workben/myucp/myucp_content.cxx
+++ b/ucbhelper/workben/myucp/myucp_content.cxx
@@ -179,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"));
 }
 
 //=========================================================================
@@ -190,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;
 }
 
@@ -205,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 ));
 }
 
 //=========================================================================
@@ -571,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
@@ -667,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(
@@ -676,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(
@@ -685,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(
@@ -714,8 +714,8 @@ 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 ) );
             }
         }
@@ -780,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 ) );
             }
         }
@@ -820,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();
@@ -895,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
     }
diff --git a/ucbhelper/workben/myucp/myucp_provider.cxx b/ucbhelper/workben/myucp/myucp_provider.cxx
index f51ec34e261c..7a82de0152f9 100644
--- a/ucbhelper/workben/myucp/myucp_provider.cxx
+++ b/ucbhelper/workben/myucp/myucp_provider.cxx
@@ -101,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 )) );
 
 //=========================================================================
 //
@@ -127,7 +127,7 @@ 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();
 
diff --git a/ucbhelper/workben/myucp/myucp_services.cxx b/ucbhelper/workben/myucp/myucp_services.cxx
index 7ab10a200535..56be6f1a4243 100644
--- a/ucbhelper/workben/myucp/myucp_services.cxx
+++ b/ucbhelper/workben/myucp/myucp_services.cxx
@@ -44,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
diff --git a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx b/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx
index cd8b03453c44..f1db1f4deca3 100644
--- a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx
+++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx
@@ -445,8 +445,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 )
@@ -470,8 +470,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
@@ -587,7 +587,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(
@@ -689,7 +689,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 & )
@@ -719,8 +719,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 & )
             {
@@ -750,7 +750,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
                     try
                     {
                         pEntry->m_aContent.getPropertyValue(
-                                    OUString::createFromAscii( "Title" ) )
+                                    OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) )
                                     >>= aNewTitle;
                     }
                     catch ( CommandAbortedException const & )
@@ -769,7 +769,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();
@@ -794,7 +794,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
                     try
                     {
                         pEntry->m_aContent.setPropertyValue(
-                                    OUString::createFromAscii( "Title" ),
+                                    OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
                                     aValue );
                         bOK = sal_True;
                     }
@@ -818,7 +818,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
                         try
                         {
                             pEntry->m_aContent.getPropertyValue(
-                                OUString::createFromAscii( "TargetURL" ) )
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL")) )
                                     >>= aTargetURL;
                         }
                         catch ( CommandAbortedException const & )
@@ -836,7 +836,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
                         if ( aTargetURL.getLength() > 0 )
                         {
                             // Insert link.
-                            aText += OUString::createFromAscii( " --> " );
+                            aText += OUString(RTL_CONSTASCII_USTRINGPARAM(" --> "));
                             aText += aTargetURL;
                         }
 
@@ -853,7 +853,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 & )
@@ -917,9 +917,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;
 
@@ -940,7 +940,7 @@ UcbExplorerListBoxEntry* UcbExplorerTreeListBox::InsertEntry(
             try
             {
                 rContent.getPropertyValue(
-                    OUString::createFromAscii( "TargetURL" ) ) >>= aTargetURL;
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL")) ) >>= aTargetURL;
             }
             catch ( CommandAbortedException const & )
             {
@@ -957,7 +957,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,
@@ -1007,8 +1007,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
@@ -1114,16 +1114,16 @@ 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
diff --git a/ucbhelper/workben/ucbexplorer/ucbexplorer.src b/ucbhelper/workben/ucbexplorer/ucbexplorer.src
index 4bee5900eaaf..ea9aa993cba2 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
 {
     Border = TRUE ;
@@ -146,4 +127,3 @@ String TEXT_TITLEBAR
 {
     Text [ en-US ] = "UCB Explorer" ;
 };
-
diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
index d76af17fba09..b8af603c0212 100644
--- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
@@ -536,13 +536,13 @@ void generateAddinConstructorAndHelper(std::ostream& o,
             "            RTL_CONSTASCII_USTRINGPARAM(\n"
             "                \"com.sun.star.configuration.ConfigurationAccess\"));\n\n";
 
-        o << "        ::rtl::OUStringBuffer sPath(::rtl::OUString::createFromAscii(\n"
-            "             \"/org.openoffice.Office.CalcAddIns/AddInInfo/\"));\n"
+        o << "        ::rtl::OUStringBuffer sPath(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\n"
+            "             \"/org.openoffice.Office.CalcAddIns/AddInInfo/\")));\n"
             "        sPath.appendAscii(sADDIN_SERVICENAME);\n"
             "        sPath.appendAscii(\"/AddInFunctions\");\n\n"
             "        // create arguments: nodepath\n"
             "        css::beans::PropertyValue aArgument;\n"
-            "        aArgument.Name = ::rtl::OUString::createFromAscii(\"nodepath\");\n"
+            "        aArgument.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\"nodepath\"));\n"
             "        aArgument.Value <<= sPath.makeStringAndClear();\n\n"
             "        css::uno::Sequence< css::uno::Any > aArguments(1);\n"
             "        aArguments[0] <<= aArgument;\n\n";
@@ -557,8 +557,8 @@ void generateAddinConstructorAndHelper(std::ostream& o,
 
         o << "        // extend arguments to create a view for all locales to get "
             "simple\n        // access to the compatibilityname property\n"
-            "        aArgument.Name = ::rtl::OUString::createFromAscii(\"locale\");\n"
-            "        aArgument.Value <<= ::rtl::OUString::createFromAscii(\"*\");\n"
+            "        aArgument.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\"locale\"));\n"
+            "        aArgument.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\"*\"));\n"
             "        aArguments.realloc(2);\n"
             "        aArguments[1] <<= aArgument;\n\n"
             "        // create view for all locales\n"
@@ -582,7 +582,7 @@ void generateAddinConstructorAndHelper(std::ostream& o,
             "            m_xHAccess->getByHierarchicalName(\n"
             "                buf.makeStringAndClear()), css::uno::UNO_QUERY);\n"
             "        xPropSet->getPropertyValue(\n            "
-            "::rtl::OUString::createFromAscii(propName)) >>= ret;\n    }\n"
+            "::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(propName))) >>= ret;\n    }\n"
             "     catch ( css::uno::RuntimeException & e ) {\n        throw e;\n    }\n"
             "     catch ( css::uno::Exception & ) {\n    }\n    return ret;\n";
     }
diff --git a/unodevtools/source/skeletonmaker/cpptypemaker.cxx b/unodevtools/source/skeletonmaker/cpptypemaker.cxx
index 15ae7ae95988..ce9f4b8d95a6 100644
--- a/unodevtools/source/skeletonmaker/cpptypemaker.cxx
+++ b/unodevtools/source/skeletonmaker/cpptypemaker.cxx
@@ -420,8 +420,8 @@ void printMethods(std::ostream & o,
             o << "// ::com::sun::star::lang::XServiceName:\n"
                 "::rtl::OUString SAL_CALL " << classname << "getServiceName() "
                 "throw (css::uno::RuntimeException)\n{\n    "
-                "return ::rtl::OUString::createFromAscii("
-                "sADDIN_SERVICENAME);\n}\n";
+                "return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("
+                "sADDIN_SERVICENAME));\n}\n";
             generated.add(type);
             return;
         } else if (type.equals("com/sun/star/sheet/XAddIn")) {
diff --git a/unodevtools/source/skeletonmaker/skeletoncommon.cxx b/unodevtools/source/skeletonmaker/skeletoncommon.cxx
index 188e0fa05101..6452bace295c 100644
--- a/unodevtools/source/skeletonmaker/skeletoncommon.cxx
+++ b/unodevtools/source/skeletonmaker/skeletoncommon.cxx
@@ -669,9 +669,9 @@ void generateFunctionParamterMap(std::ostream& o,
         for ( sal_uInt16 p = 0; p < reader.getMethodParameterCount(m); ++p ) {
             if ( options.language == 2 ) {
                 o << "        fpm[" << p
-                  << "] = ::rtl::OUString::createFromAscii(\""
+                  << "] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\""
                   << codemaker::convertString(reader.getMethodParameterName(m, p))
-                  << "\");\n";
+                  << "\"));\n";
             }
             else {
                 if ( options.java5 )
@@ -688,8 +688,8 @@ void generateFunctionParamterMap(std::ostream& o,
         }
 
         if ( options.language == 2 ) {
-            o << "        m_functionMap[::rtl::OUString::createFromAscii(\""
-              << sMethod << "\")] = fpm;\n\n";
+            o << "        m_functionMap[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\""
+              << sMethod << "\"))] = fpm;\n\n";
         }
         else {
             o << "        m_functionMap.put(\"" << sMethod << "\", fpm);\n\n";
diff --git a/unotools/inc/unotools/atom.hxx b/unotools/inc/unotools/atom.hxx
index ed32efb79626..a371c5fa9bb7 100644
--- a/unotools/inc/unotools/atom.hxx
+++ b/unotools/inc/unotools/atom.hxx
@@ -34,9 +34,7 @@
 #include <cppuhelper/implbase1.hxx>
 
 #include <hash_map>
-#ifndef __SGI_STL_LIST
 #include <list>
-#endif
 #include <com/sun/star/util/XAtomServer.hpp>
 
 #define INVALID_ATOM 0
diff --git a/unotools/inc/unotools/lingucfg.hxx b/unotools/inc/unotools/lingucfg.hxx
index 415d825fb248..cecc0147b9d7 100644
--- a/unotools/inc/unotools/lingucfg.hxx
+++ b/unotools/inc/unotools/lingucfg.hxx
@@ -228,11 +228,11 @@ public:
     std::vector< SvtLinguConfigDictionaryEntry > GetActiveDictionariesByFormat( const rtl::OUString &rFormatName );
 
     // functions returning file URLs to the respective images (if found) and empty string otherwise
-    ::rtl::OUString     GetSpellAndGrammarDialogImage( const ::rtl::OUString &rServiceImplName, bool bHighContrast = false ) const;
-    ::rtl::OUString     GetSpellAndGrammarContextSuggestionImage( const ::rtl::OUString &rServiceImplName, bool bHighContrast = false ) const;
-    ::rtl::OUString     GetSpellAndGrammarContextDictionaryImage( const ::rtl::OUString &rServiceImplName, bool bHighContrast = false ) const;
-    ::rtl::OUString     GetThesaurusDialogImage( const ::rtl::OUString &rServiceImplName, bool bHighContrast = false ) const;
-    ::rtl::OUString     GetSynonymsContextImage( const ::rtl::OUString &rServiceImplName, bool bHighContrast = false ) const;
+    ::rtl::OUString     GetSpellAndGrammarDialogImage( const ::rtl::OUString &rServiceImplName ) const;
+    ::rtl::OUString     GetSpellAndGrammarContextSuggestionImage( const ::rtl::OUString &rServiceImplName ) const;
+    ::rtl::OUString     GetSpellAndGrammarContextDictionaryImage( const ::rtl::OUString &rServiceImplName ) const;
+    ::rtl::OUString     GetThesaurusDialogImage( const ::rtl::OUString &rServiceImplName ) const;
+    ::rtl::OUString     GetSynonymsContextImage( const ::rtl::OUString &rServiceImplName ) const;
 
     bool                HasVendorImages( const char *pImageName ) const;
     bool                HasGrammarChecker() const;
diff --git a/unotools/inc/unotools/misccfg.hxx b/unotools/inc/unotools/misccfg.hxx
index 87b8173da42e..030a433bc6e3 100644
--- a/unotools/inc/unotools/misccfg.hxx
+++ b/unotools/inc/unotools/misccfg.hxx
@@ -32,9 +32,6 @@
 #include "tools/solar.h"
 #include "unotools/options.hxx"
 
-/*--------------------------------------------------------------------
-     Beschreibung:
- --------------------------------------------------------------------*/
 namespace utl
 {
     class SfxMiscCfg;
diff --git a/unotools/inc/unotools/sourceviewconfig.hxx b/unotools/inc/unotools/sourceviewconfig.hxx
index 2450ee27092b..02b2ab0ab79b 100644
--- a/unotools/inc/unotools/sourceviewconfig.hxx
+++ b/unotools/inc/unotools/sourceviewconfig.hxx
@@ -35,9 +35,6 @@
 #include <rtl/ustring.hxx>
 #include <unotools/options.hxx>
 
-/* -----------------------------12.10.00 11:40--------------------------------
-
- ---------------------------------------------------------------------------*/
 namespace utl
 {
     class SourceViewConfig_Impl;
diff --git a/unotools/source/accessibility/accessiblestatesethelper.cxx b/unotools/source/accessibility/accessiblestatesethelper.cxx
index d2f1e50960f6..f4705c5e25bc 100644
--- a/unotools/source/accessibility/accessiblestatesethelper.cxx
+++ b/unotools/source/accessibility/accessiblestatesethelper.cxx
@@ -50,11 +50,11 @@ public:
     AccessibleStateSetHelperImpl(const AccessibleStateSetHelperImpl& rImpl);
     ~AccessibleStateSetHelperImpl();
 
-    sal_Bool IsEmpty ()
+    sal_Bool IsEmpty () const
         throw (uno::RuntimeException);
-    sal_Bool Contains (sal_Int16 aState)
+    sal_Bool Contains (sal_Int16 aState) const
         throw (uno::RuntimeException);
-    uno::Sequence<sal_Int16> GetStates()
+    uno::Sequence<sal_Int16> GetStates() const
         throw (uno::RuntimeException);
     void AddState(sal_Int16 aState)
         throw (uno::RuntimeException);
@@ -62,7 +62,7 @@ public:
         throw (uno::RuntimeException);
     sal_Bool Compare(const AccessibleStateSetHelperImpl* pComparativeValue,
                         AccessibleStateSetHelperImpl* pOldStates,
-                        AccessibleStateSetHelperImpl* pNewStates)
+                        AccessibleStateSetHelperImpl* pNewStates) const
         throw (uno::RuntimeException);
 
     inline void AddStates( const sal_Int64 _nStates ) SAL_THROW( ( ) );
@@ -85,13 +85,13 @@ AccessibleStateSetHelperImpl::~AccessibleStateSetHelperImpl()
 {
 }
 
-inline sal_Bool AccessibleStateSetHelperImpl::IsEmpty ()
+inline sal_Bool AccessibleStateSetHelperImpl::IsEmpty () const
     throw (uno::RuntimeException)
 {
     return maStates == 0;
 }
 
-inline sal_Bool AccessibleStateSetHelperImpl::Contains (sal_Int16 aState)
+inline sal_Bool AccessibleStateSetHelperImpl::Contains (sal_Int16 aState) const
     throw (uno::RuntimeException)
 {
     DBG_ASSERT(aState < BITFIELDSIZE, "the statesset is too small");
@@ -100,7 +100,7 @@ inline sal_Bool AccessibleStateSetHelperImpl::Contains (sal_Int16 aState)
     return ((aTempBitSet & maStates) != 0);
 }
 
-inline uno::Sequence<sal_Int16> AccessibleStateSetHelperImpl::GetStates()
+inline uno::Sequence<sal_Int16> AccessibleStateSetHelperImpl::GetStates() const
     throw (uno::RuntimeException)
 {
     uno::Sequence<sal_Int16> aRet(BITFIELDSIZE);
@@ -144,7 +144,7 @@ inline void AccessibleStateSetHelperImpl::RemoveState(sal_Int16 aState)
 inline sal_Bool AccessibleStateSetHelperImpl::Compare(
     const AccessibleStateSetHelperImpl* pComparativeValue,
         AccessibleStateSetHelperImpl* pOldStates,
-        AccessibleStateSetHelperImpl* pNewStates)
+        AccessibleStateSetHelperImpl* pNewStates) const
     throw (uno::RuntimeException)
 {
     sal_Bool bResult(sal_False);
diff --git a/unotools/source/config/accelcfg.cxx b/unotools/source/config/accelcfg.cxx
index a44e9639dcbf..5c96ab7d049f 100644
--- a/unotools/source/config/accelcfg.cxx
+++ b/unotools/source/config/accelcfg.cxx
@@ -84,7 +84,7 @@ SvtAcceleratorConfig_Impl::SvtAcceleratorConfig_Impl( Reference< XInputStream >&
         : bModified( false )
 {
     Reference< XParser > xParser( ::comphelper::getProcessServiceFactory()->createInstance(
-                                    ::rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Parser" )),
+                                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser"))),
                                   UNO_QUERY);
 
     // connect stream to input stream to the parser
@@ -104,7 +104,7 @@ bool SvtAcceleratorConfig_Impl::Commit( Reference< XOutputStream >& rOutputStrea
     Reference< XDocumentHandler > xWriter;
 
     xWriter = Reference< XDocumentHandler >( ::comphelper::getProcessServiceFactory()->createInstance(
-            ::rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Writer" )), UNO_QUERY) ;
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer"))), UNO_QUERY) ;
 
     Reference< ::com::sun::star::io::XActiveDataSource> xDataSource( xWriter , UNO_QUERY );
     xDataSource->setOutputStream( rOutputStream );
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx
index a9248a03804f..b620f40e1034 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -401,7 +401,7 @@ PathStatus getDerivedPath(
 
         OSL_ENSURE(sDerivedURL == _rURL,"Could not set derived URL via Bootstrap default parameter");
         OSL_POSTCOND(RTL_BOOTSTRAP_DEFAULTS_BROKEN ||
-                    _rData.getFrom(_sBootstrapParameter,sDerivedURL) && sDerivedURL==_rURL,"Use of default did not affect bootstrap value");
+                    (_rData.getFrom(_sBootstrapParameter,sDerivedURL) && sDerivedURL==_rURL),"Use of default did not affect bootstrap value");
     }
     else
     {
diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx
index c65c83245e70..6d426095eed2 100644
--- a/unotools/source/config/compatibility.cxx
+++ b/unotools/source/config/compatibility.cxx
@@ -41,9 +41,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
-#ifndef __SGI_STL_VECTOR
 #include <vector>
-#endif
 
 #include <itemholder1.hxx>
 
@@ -225,7 +223,7 @@ class SvtCompatibility
             return lEntries.size();
         }
 
-        const SvtCompatibilityEntry& operator[]( int i )
+        const SvtCompatibilityEntry& operator[]( int i ) const
         {
             return lEntries[i];
         }
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index 4a330bcf18cc..e836c3b80a86 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -106,9 +106,7 @@ namespace utl{
         //XEventListener
         virtual void SAL_CALL disposing( const EventObject& Source ) throw(RuntimeException);
     };
-/* -----------------------------12.02.01 11:38--------------------------------
 
- ---------------------------------------------------------------------------*/
 struct ConfigItem_Impl
 {
     utl::ConfigManager*         pManager;
@@ -126,9 +124,7 @@ struct ConfigItem_Impl
     {}
 };
 }
-/* -----------------------------04.12.00 10:25--------------------------------
 
- ---------------------------------------------------------------------------*/
 class ValueCounter_Impl
 {
     sal_Int16& rCnt;
@@ -142,9 +138,7 @@ public:
                 rCnt--;
             }
 };
-/* -----------------------------03.12.02 -------------------------------------
 
- ---------------------------------------------------------------------------*/
 namespace
 {
     // helper to achieve exception - safe handling of an Item under construction
@@ -166,24 +160,18 @@ namespace
         void keep() { m_pItem = 0; }
     };
 }
-/* -----------------------------29.08.00 16:34--------------------------------
 
- ---------------------------------------------------------------------------*/
 ConfigChangeListener_Impl::ConfigChangeListener_Impl(
              ConfigItem& rItem, const Sequence< OUString >& rNames) :
     pParent(&rItem),
     aPropertyNames(rNames)
 {
 }
-/* -----------------------------29.08.00 16:34--------------------------------
 
- ---------------------------------------------------------------------------*/
 ConfigChangeListener_Impl::~ConfigChangeListener_Impl()
 {
 }
-/* -----------------------------29.08.00 16:34--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool lcl_Find(
         const rtl::OUString& rTemp,
         const OUString* pCheckPropertyNames,
@@ -225,16 +213,12 @@ void ConfigChangeListener_Impl::changesOccurred( const ChangesEvent& rEvent ) th
     }
 }
 
-/* -----------------------------29.08.00 16:34--------------------------------
 
- ---------------------------------------------------------------------------*/
 void ConfigChangeListener_Impl::disposing( const EventObject& /*rSource*/ ) throw(RuntimeException)
 {
     pParent->RemoveChangesListener();
 }
-/* -----------------------------29.08.00 12:50--------------------------------
 
- ---------------------------------------------------------------------------*/
 ConfigItem::ConfigItem(const OUString rSubTree, sal_Int16 nSetMode ) :
     sSubTree(rSubTree),
     pImpl(new ConfigItem_Impl)
@@ -252,9 +236,7 @@ ConfigItem::ConfigItem(const OUString rSubTree, sal_Int16 nSetMode ) :
     aNewImpl.keep();
     pImpl->nMode &= ~CONFIG_MODE_PROPAGATE_ERRORS;
 }
-/* -----------------------------17.11.00 13:53--------------------------------
 
- ---------------------------------------------------------------------------*/
 ConfigItem::ConfigItem(utl::ConfigManager&  rManager, const rtl::OUString rSubTree) :
     sSubTree(rSubTree),
     pImpl(new ConfigItem_Impl)
@@ -263,16 +245,12 @@ ConfigItem::ConfigItem(utl::ConfigManager&  rManager, const rtl::OUString rSubTr
     pImpl->nMode = CONFIG_MODE_IMMEDIATE_UPDATE; // does not allow exceptions
     m_xHierarchyAccess = pImpl->pManager->AddConfigItem(*this);
 }
-//---------------------------------------------------------------------
-//--- 02.08.2002 16:33:23 -----------------------------------------------
+
 sal_Bool ConfigItem::IsValidConfigMgr() const
 {
     return ( pImpl->pManager && pImpl->pManager->GetConfigurationProvider().is() );
 }
 
-/* -----------------------------29.08.00 12:52--------------------------------
-
- ---------------------------------------------------------------------------*/
 ConfigItem::~ConfigItem()
 {
     if(pImpl->pManager)
@@ -282,9 +260,7 @@ ConfigItem::~ConfigItem()
     }
     delete pImpl;
 }
-/* -----------------------------29.08.00 12:52--------------------------------
 
- ---------------------------------------------------------------------------*/
 void    ConfigItem::ReleaseConfigMgr()
 {
     Reference<XHierarchicalNameAccess> xHierarchyAccess = GetTree();
@@ -301,9 +277,7 @@ void    ConfigItem::ReleaseConfigMgr()
     OSL_ENSURE(pImpl->pManager, "ConfigManager already released");
     pImpl->pManager = 0;
 }
-/* -----------------------------29.08.00 12:52--------------------------------
 
- ---------------------------------------------------------------------------*/
 void ConfigItem::CallNotify( const com::sun::star::uno::Sequence<OUString>& rPropertyNames )
 {
     // the call is forwarded to the virtual Notify() method
@@ -313,9 +287,6 @@ void ConfigItem::CallNotify( const com::sun::star::uno::Sequence<OUString>& rPro
         Notify(rPropertyNames);
 }
 
-/* -----------------------------12.12.00 17:09--------------------------------
-
- ---------------------------------------------------------------------------*/
 sal_Bool lcl_IsLocalProperty(const OUString& rSubTree, const OUString& rProperty)
 {
     static const sal_Char* aLocalProperties[] =
@@ -338,9 +309,7 @@ sal_Bool lcl_IsLocalProperty(const OUString& rSubTree, const OUString& rProperty
 
     return sal_False;
 }
-/* -----------------------------10.04.01 15:00--------------------------------
 
- ---------------------------------------------------------------------------*/
 void ConfigItem::impl_packLocalizedProperties(  const   Sequence< OUString >&   lInNames    ,
                                                 const   Sequence< Any >&        lInValues   ,
                                                         Sequence< Any >&        lOutValues  )
@@ -412,9 +381,7 @@ void ConfigItem::impl_packLocalizedProperties(  const   Sequence< OUString >&
         ++nDestinationCounter;
     }
 }
-/* -----------------------------10.04.01 15:00--------------------------------
 
- ---------------------------------------------------------------------------*/
 void ConfigItem::impl_unpackLocalizedProperties(    const   Sequence< OUString >&   lInNames    ,
                                                     const   Sequence< Any >&        lInValues   ,
                                                             Sequence< OUString >&   lOutNames   ,
@@ -489,9 +456,7 @@ void ConfigItem::impl_unpackLocalizedProperties(    const   Sequence< OUString >
         }
     }
 }
-/* -----------------------------03.02.2003 14:44------------------------------
 
- ---------------------------------------------------------------------------*/
 Sequence< sal_Bool > ConfigItem::GetReadOnlyStates(const com::sun::star::uno::Sequence< rtl::OUString >& rNames)
 {
     sal_Int32 i;
@@ -576,9 +541,6 @@ Sequence< sal_Bool > ConfigItem::GetReadOnlyStates(const com::sun::star::uno::Se
     return lStates;
 }
 
-/* -----------------------------29.08.00 15:10--------------------------------
-
- ---------------------------------------------------------------------------*/
 Sequence< Any > ConfigItem::GetProperties(const Sequence< OUString >& rNames)
 {
     Sequence< Any > aRet(rNames.getLength());
@@ -636,9 +598,7 @@ Sequence< Any > ConfigItem::GetProperties(const Sequence< OUString >& rNames)
     }
     return aRet;
 }
-/* -----------------------------29.08.00 17:28--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool ConfigItem::PutProperties( const Sequence< OUString >& rNames,
                                                 const Sequence< Any>& rValues)
 {
@@ -722,17 +682,13 @@ sal_Bool ConfigItem::PutProperties( const Sequence< OUString >& rNames,
 
     return bRet;
 }
-/* -----------------------------08.12.05 15:27--------------------------------
 
- ---------------------------------------------------------------------------*/
 void ConfigItem::DisableNotification()
 {
     OSL_ENSURE( xChangeLstnr.is(), "ConfigItem::DisableNotification: notifications not enabled currently!" );
     RemoveChangesListener();
 }
-/* -----------------------------29.08.00 16:19--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool    ConfigItem::EnableNotification(const Sequence< OUString >& rNames,
                 sal_Bool bEnableInternalNotification )
 
@@ -760,9 +716,7 @@ sal_Bool    ConfigItem::EnableNotification(const Sequence< OUString >& rNames,
     }
     return bRet;
 }
-/* -----------------------------29.08.00 16:47--------------------------------
 
- ---------------------------------------------------------------------------*/
 void ConfigItem::RemoveChangesListener()
 {
     Reference<XChangesNotifier> xChgNot(m_xHierarchyAccess, UNO_QUERY);
@@ -778,9 +732,7 @@ void ConfigItem::RemoveChangesListener()
         }
     }
 }
-/* -----------------------------10.07.00      --------------------------------
 
- ---------------------------------------------------------------------------*/
 void lcl_normalizeLocalNames(Sequence< OUString >& _rNames, ConfigNameFormat _eFormat, Reference<XInterface> const& _xParentNode)
 {
     switch (_eFormat)
@@ -855,18 +807,14 @@ void lcl_normalizeLocalNames(Sequence< OUString >& _rNames, ConfigNameFormat _eF
 
     }
 }
-/* -----------------------------10.07.00      --------------------------------
 
- ---------------------------------------------------------------------------*/
 Sequence< OUString > ConfigItem::GetNodeNames(const OUString& rNode)
 {
     ConfigNameFormat const eDefaultFormat = CONFIG_NAME_LOCAL_NAME; // CONFIG_NAME_DEFAULT;
 
     return GetNodeNames(rNode, eDefaultFormat);
 }
-/* -----------------------------15.09.00 12:06--------------------------------
 
- ---------------------------------------------------------------------------*/
 Sequence< OUString > ConfigItem::GetNodeNames(const OUString& rNode, ConfigNameFormat eFormat)
 {
     Sequence< OUString > aRet;
@@ -894,9 +842,7 @@ Sequence< OUString > ConfigItem::GetNodeNames(const OUString& rNode, ConfigNameF
     }
     return aRet;
 }
-/* -----------------------------15.09.00 15:52--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool ConfigItem::ClearNodeSet(const OUString& rNode)
 {
     ValueCounter_Impl aCounter(pImpl->nInValueChange);
@@ -934,9 +880,7 @@ sal_Bool ConfigItem::ClearNodeSet(const OUString& rNode)
     }
     return bRet;
 }
-/* -----------------------------24.11.00 10:58--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool ConfigItem::ClearNodeElements(const OUString& rNode, Sequence< OUString >& rElements)
 {
     ValueCounter_Impl aCounter(pImpl->nInValueChange);
@@ -1008,9 +952,8 @@ Sequence< OUString > lcl_extractSetPropertyNames( const Sequence< PropertyValue
 
     return aSubNodeNames;
 }
-/* -----------------------------15.09.00 15:52--------------------------------
-    add or change properties
- ---------------------------------------------------------------------------*/
+
+// Add or change properties
 sal_Bool ConfigItem::SetSetProperties(
     const OUString& rNode, Sequence< PropertyValue > rValues)
 {
@@ -1109,9 +1052,7 @@ sal_Bool ConfigItem::SetSetProperties(
     }
     return bRet;
 }
-/* -----------------------------15.09.00 15:52--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool ConfigItem::ReplaceSetProperties(
     const OUString& rNode, Sequence< PropertyValue > rValues)
 {
@@ -1248,9 +1189,7 @@ sal_Bool ConfigItem::ReplaceSetProperties(
     }
     return bRet;
 }
-/* -----------------------------07.05.01 12:15--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool ConfigItem::getUniqueSetElementName( const ::rtl::OUString& _rSetNode, ::rtl::OUString& _rName)
 {
     ::rtl::OUString sNewElementName;
@@ -1289,9 +1228,7 @@ sal_Bool ConfigItem::getUniqueSetElementName( const ::rtl::OUString& _rSetNode,
     }
     return bRet;
 }
-/* -----------------------------23.01.01 12:49--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool ConfigItem::AddNode(const rtl::OUString& rNode, const rtl::OUString& rNewNode)
 {
     ValueCounter_Impl aCounter(pImpl->nInValueChange);
@@ -1354,44 +1291,32 @@ sal_Bool ConfigItem::AddNode(const rtl::OUString& rNode, const rtl::OUString& rN
     }
     return bRet;
 }
-/* -----------------------------12.02.01 11:38--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Int16   ConfigItem::GetMode() const
 {
     return pImpl->nMode;
 }
-/* -----------------------------12.02.01 13:31--------------------------------
 
- ---------------------------------------------------------------------------*/
 void    ConfigItem::SetModified()
 {
     pImpl->bIsModified = sal_True;
 }
-/* -----------------------------05.05.01 14:07--------------------------------
 
- ---------------------------------------------------------------------------*/
 void    ConfigItem::ClearModified()
 {
     pImpl->bIsModified = sal_False;
 }
-/* -----------------------------12.02.01 13:31--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool ConfigItem::IsModified() const
 {
     return pImpl->bIsModified;
 }
-/* -----------------------------12.02.01 13:33--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool ConfigItem::IsInValueChange() const
 {
     return pImpl->nInValueChange > 0;
 }
-/* -----------------------------21.06.01 12:26--------------------------------
 
- ---------------------------------------------------------------------------*/
 Reference< XHierarchicalNameAccess> ConfigItem::GetTree()
 {
     Reference< XHierarchicalNameAccess> xRet;
@@ -1402,17 +1327,13 @@ Reference< XHierarchicalNameAccess> ConfigItem::GetTree()
     OSL_ENSURE(xRet.is(), "AcquireTree failed");
     return xRet;
 }
-/* -----------------------------22.06.01 08:42--------------------------------
 
- ---------------------------------------------------------------------------*/
 void ConfigItem::LockTree()
 {
     OSL_ENSURE(0 != (pImpl->nMode&CONFIG_MODE_RELEASE_TREE), "call LockTree in CONFIG_MODE_RELEASE_TREE mode, only");
     m_xHierarchyAccess = GetTree();
 }
-/* -----------------------------22.06.01 08:42--------------------------------
 
- ---------------------------------------------------------------------------*/
 void ConfigItem::UnlockTree()
 {
     OSL_ENSURE(0 != (pImpl->nMode&CONFIG_MODE_RELEASE_TREE), "call UnlockTree in CONFIG_MODE_RELEASE_TREE mode, only");
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx
index 9bb77a99427b..a9584217a590 100644
--- a/unotools/source/config/configmgr.cxx
+++ b/unotools/source/config/configmgr.cxx
@@ -100,25 +100,18 @@ struct utl::ConfigMgr_Impl
     ConfigItemList                          aItemList;
 };
 
-/* -----------------------------28.08.00 15:35--------------------------------
-
- ---------------------------------------------------------------------------*/
 ConfigManager::ConfigManager() :
     pMgrImpl(new utl::ConfigMgr_Impl)
 {
     GetConfigurationProvider(); // attempt to create the provider early
 }
-/* -----------------------------17.11.00 13:51--------------------------------
 
- ---------------------------------------------------------------------------*/
 ConfigManager::ConfigManager(Reference< XMultiServiceFactory > xConfigProv) :
     xConfigurationProvider(xConfigProv),
     pMgrImpl(new utl::ConfigMgr_Impl)
 {
 }
-/* -----------------------------28.08.00 15:35--------------------------------
 
- ---------------------------------------------------------------------------*/
 ConfigManager::~ConfigManager()
 {
     //check list content -> should be empty!
@@ -136,9 +129,7 @@ ConfigManager::~ConfigManager()
     delete pMgrImpl;
 
 }
-/* -----------------------------28.08.00 16:17--------------------------------
 
- ---------------------------------------------------------------------------*/
 Reference< XMultiServiceFactory > ConfigManager::GetConfigurationProvider()
 {
     if(!xConfigurationProvider.is())
@@ -174,9 +165,7 @@ Reference< XMultiServiceFactory > ConfigManager::GetConfigurationProvider()
     }
     return xConfigurationProvider;
 }
-/* -----------------------------03.12.02 -------------------------------------
 
- ---------------------------------------------------------------------------*/
 namespace
 {
     // helper to achieve exception - safe registration of a ConfigItem under construction
@@ -200,16 +189,12 @@ namespace
         void keep() { pCfgItem = 0; }
     };
 }
-/* -----------------------------12.12.00 17:19--------------------------------
 
- ---------------------------------------------------------------------------*/
 Reference< XMultiServiceFactory > ConfigManager::GetLocalConfigurationProvider()
 {
     return GetConfigurationProvider();
 }
-/* -----------------------------29.08.00 12:35--------------------------------
 
- ---------------------------------------------------------------------------*/
 Reference< XHierarchicalNameAccess > ConfigManager::AddConfigItem(utl::ConfigItem& rCfgItem)
 {
     RegisterConfigItemHelper registeredItem(*this,rCfgItem);
@@ -217,9 +202,7 @@ Reference< XHierarchicalNameAccess > ConfigManager::AddConfigItem(utl::ConfigIte
     registeredItem.keep();
     return xTree;
 }
-/* -----------------------------21.06.01 12:20--------------------------------
 
- ---------------------------------------------------------------------------*/
 void    ConfigManager::RegisterConfigItem(utl::ConfigItem& rCfgItem)
 {
     ConfigItemList::iterator aListIter = pMgrImpl->aItemList.begin();
@@ -233,9 +216,7 @@ void    ConfigManager::RegisterConfigItem(utl::ConfigItem& rCfgItem)
 #endif
     pMgrImpl->aItemList.insert(aListIter, ConfigItemListEntry_Impl(&rCfgItem));
 }
-/* -----------------------------21.06.01 12:20--------------------------------
 
- ---------------------------------------------------------------------------*/
 Reference< XHierarchicalNameAccess> ConfigManager::AcquireTree(utl::ConfigItem& rCfgItem)
 {
     ConfigItemList::iterator aListIter = pMgrImpl->aItemList.begin();
@@ -313,9 +294,7 @@ Reference< XHierarchicalNameAccess> ConfigManager::AcquireTree(utl::ConfigItem&
     }
     return Reference<XHierarchicalNameAccess>(xIFace, UNO_QUERY);
 }
-/* -----------------------------29.08.00 12:35--------------------------------
 
- ---------------------------------------------------------------------------*/
 void ConfigManager::RemoveConfigItem(utl::ConfigItem& rCfgItem)
 {
     if( !pMgrImpl->aItemList.empty() )
@@ -332,9 +311,7 @@ void ConfigManager::RemoveConfigItem(utl::ConfigItem& rCfgItem)
         }
     }
 }
-/* -----------------------------30.08.00 15:04--------------------------------
 
- ---------------------------------------------------------------------------*/
 void ConfigManager::StoreConfigItems()
 {
     if(!pMgrImpl->aItemList.empty())
@@ -351,25 +328,19 @@ void ConfigManager::StoreConfigItems()
         }
     }
 }
-/* -----------------------------07.09.00 11:06--------------------------------
 
- ---------------------------------------------------------------------------*/
 struct theConfigManager : public rtl::Static<ConfigManager, theConfigManager> {};
 
 ConfigManager& ConfigManager::GetConfigManager()
 {
     return theConfigManager::get();
 }
-/* -----------------------------08.09.00 13:22--------------------------------
 
- ---------------------------------------------------------------------------*/
 rtl::OUString ConfigManager::GetConfigBaseURL()
 {
     return OUString::createFromAscii(pConfigBaseURL);
 }
-/* -----------------------------25.09.00 16:34--------------------------------
 
- ---------------------------------------------------------------------------*/
 Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp)
 {
     switch(eProp)
@@ -626,9 +597,6 @@ void ConfigManager::getBasisAboutBoxProductVersion( OUString& rVersion )
     }
 }
 
-/* -----------------------------12.12.00 17:22--------------------------------
-
- ---------------------------------------------------------------------------*/
 Reference< XHierarchicalNameAccess> ConfigManager::GetHierarchyAccess(const OUString& rFullPath)
 {
     Sequence< Any > aArgs(1);
@@ -658,9 +626,7 @@ Reference< XHierarchicalNameAccess> ConfigManager::GetHierarchyAccess(const OUSt
     }
     return Reference<XHierarchicalNameAccess>(xIFace, UNO_QUERY);
 }
-/* -----------------------------12.12.00 17:17--------------------------------
 
- ---------------------------------------------------------------------------*/
 Any ConfigManager::GetLocalProperty(const OUString& rProperty)
 {
     OUString sPath(OUString::createFromAscii(pConfigBaseURL));
@@ -690,9 +656,7 @@ Any ConfigManager::GetLocalProperty(const OUString& rProperty)
 #endif
     return aRet;
 }
-/* -----------------------------12.12.00 17:17--------------------------------
 
- ---------------------------------------------------------------------------*/
 void ConfigManager::PutLocalProperty(const OUString& rProperty, const Any& rValue)
 {
     OUString sPath(OUString::createFromAscii(pConfigBaseURL));
@@ -722,9 +686,7 @@ void ConfigManager::PutLocalProperty(const OUString& rProperty, const Any& rValu
 #endif
     }
 }
-/* -----------------------------13.12.00 08:47--------------------------------
 
- ---------------------------------------------------------------------------*/
 sal_Bool    ConfigManager::IsLocalConfigProvider()
 {
     return false;
diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx
index 5fba8c9bbc51..65f7b2b631c9 100644
--- a/unotools/source/config/confignode.cxx
+++ b/unotools/source/config/confignode.cxx
@@ -363,9 +363,6 @@ namespace utl
         return bIsSet;
     }
 
-    //---------------------------------------------------------------------
-    //--- 20.08.01 19:03:20 -----------------------------------------------
-
     sal_Bool OConfigurationNode::hasByHierarchicalName( const ::rtl::OUString& _rName ) const throw()
     {
         OSL_ENSURE( m_xHierarchyAccess.is(), "OConfigurationNode::hasByHierarchicalName: no hierarchy access!" );
@@ -533,10 +530,9 @@ namespace utl
                 aArgs.put( "lazywrite", i_bLazyWrite );
                 aArgs.put( "depth", i_nDepth );
 
-                ::rtl::OUString sAccessService = ::rtl::OUString::createFromAscii(
-                        i_bUpdatable
-                    ? "com.sun.star.configuration.ConfigurationUpdateAccess"
-                    : "com.sun.star.configuration.ConfigurationAccess" );
+                ::rtl::OUString sAccessService( i_bUpdatable ?
+                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationUpdateAccess" )) :
+                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" )));
 
                 Reference< XInterface > xRoot(
                     i_rxConfigProvider->createInstanceWithArguments( sAccessService, aArgs.getWrappedPropertyValues() ),
diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx
index 46f22b9c7a0a..a7fc30699218 100644
--- a/unotools/source/config/configvaluecontainer.cxx
+++ b/unotools/source/config/configvaluecontainer.cxx
@@ -82,9 +82,6 @@ namespace utl
         bool operator != ( const NodeValueAccessor& rhs ) const { return !operator == ( rhs ); }
     };
 
-    //---------------------------------------------------------------------
-    //--- 20.08.01 17:21:13 -----------------------------------------------
-
     NodeValueAccessor::NodeValueAccessor( const ::rtl::OUString& _rNodePath )
         :sRelativePath( _rNodePath )
         ,eLocationType( ltUnbound )
@@ -92,9 +89,6 @@ namespace utl
     {
     }
 
-    //---------------------------------------------------------------------
-    //--- 20.08.01 17:06:36 -----------------------------------------------
-
     bool NodeValueAccessor::operator == ( const NodeValueAccessor& rhs ) const
     {
         return  (   sRelativePath   ==  rhs.sRelativePath   )
@@ -102,9 +96,6 @@ namespace utl
             &&  (   pLocation       ==  rhs.pLocation       );
     }
 
-    //---------------------------------------------------------------------
-    //--- 20.08.01 17:47:43 -----------------------------------------------
-
     void NodeValueAccessor::bind( void* _pLocation, const Type& _rType )
     {
         DBG_ASSERT( !isBound(), "NodeValueAccessor::bind: already bound!" );
@@ -114,9 +105,6 @@ namespace utl
         aDataType = _rType;
     }
 
-    //---------------------------------------------------------------------
-    //--- 20.08.01 17:48:47 -----------------------------------------------
-
     void NodeValueAccessor::bind( Any* _pLocation )
     {
         DBG_ASSERT( !isBound(), "NodeValueAccessor::bind: already bound!" );
@@ -126,9 +114,6 @@ namespace utl
         aDataType = ::getCppuType( _pLocation );
     }
 
-    //---------------------------------------------------------------------
-    //--- 20.08.01 17:42:17 -----------------------------------------------
-
     #ifndef UNX
     static
     #endif
@@ -174,9 +159,6 @@ namespace utl
         }
     }
 
-    //---------------------------------------------------------------------
-    //--- 21.08.01 12:06:43 -----------------------------------------------
-
     #ifndef UNX
     static
     #endif
@@ -205,9 +187,6 @@ namespace utl
     //= functors on NodeValueAccessor instances
     //=====================================================================
 
-    //---------------------------------------------------------------------
-    //--- 21.08.01 12:01:16 -----------------------------------------------
-
     /// base class for functors syncronizing between exchange locations and config sub nodes
     struct SubNodeAccess : public ::std::unary_function< NodeValueAccessor, void >
     {
@@ -223,9 +202,6 @@ namespace utl
         }
     };
 
-    //---------------------------------------------------------------------
-    //--- 21.08.01 11:25:56 -----------------------------------------------
-
     struct UpdateFromConfig : public SubNodeAccess
     {
     public:
@@ -237,9 +213,6 @@ namespace utl
         }
     };
 
-    //---------------------------------------------------------------------
-    //--- 21.08.01 11:25:56 -----------------------------------------------
-
     struct UpdateToConfig : public SubNodeAccess
     {
     public:
@@ -253,9 +226,6 @@ namespace utl
         }
     };
 
-    //---------------------------------------------------------------------
-    //--- 20.08.01 16:58:24 -----------------------------------------------
-
     DECLARE_STL_VECTOR( NodeValueAccessor, NodeValueAccessors );
 
     //=====================================================================
@@ -280,9 +250,6 @@ namespace utl
     //= OConfigurationValueContainer
     //=====================================================================
 
-    //---------------------------------------------------------------------
-    //--- 20.08.01 15:53:35 -----------------------------------------------
-
     OConfigurationValueContainer::OConfigurationValueContainer(
             const Reference< XMultiServiceFactory >& _rxORB, ::osl::Mutex& _rAccessSafety,
             const sal_Char* _pConfigLocation, const sal_uInt16 _nAccessFlags, const sal_Int32 _nLevels )
@@ -291,9 +258,6 @@ namespace utl
         implConstruct( ::rtl::OUString::createFromAscii( _pConfigLocation ), _nAccessFlags, _nLevels );
     }
 
-    //---------------------------------------------------------------------
-    //--- 20.08.01 15:55:20 -----------------------------------------------
-
     OConfigurationValueContainer::OConfigurationValueContainer(
             const Reference< XMultiServiceFactory >& _rxORB, ::osl::Mutex& _rAccessSafety,
             const ::rtl::OUString& _rConfigLocation, const sal_uInt16 _nAccessFlags, const sal_Int32 _nLevels )
@@ -302,25 +266,16 @@ namespace utl
         implConstruct( _rConfigLocation, _nAccessFlags, _nLevels );
     }
 
-    //---------------------------------------------------------------------
-    //--- 20.08.01 16:01:29 -----------------------------------------------
-
     OConfigurationValueContainer::~OConfigurationValueContainer()
     {
         delete m_pImpl;
     }
 
-    //---------------------------------------------------------------------
-    //--- 20.08.01 15:59:13 -----------------------------------------------
-
     const Reference< XMultiServiceFactory >& OConfigurationValueContainer::getServiceFactory( ) const
     {
         return m_pImpl->xORB;
     }
 
-    //---------------------------------------------------------------------
-    //--- 20.08.01 16:02:07 -----------------------------------------------
-
     void OConfigurationValueContainer::implConstruct( const ::rtl::OUString& _rConfigLocation,
         const sal_uInt16 _nAccessFlags, const sal_Int32 _nLevels )
     {
@@ -344,9 +299,6 @@ namespace utl
         #endif
     }
 
-    //---------------------------------------------------------------------
-    //--- 20.08.01 16:39:05 -----------------------------------------------
-
     void OConfigurationValueContainer::registerExchangeLocation( const sal_Char* _pRelativePath,
         void* _pContainer, const Type& _rValueType )
     {
@@ -370,9 +322,6 @@ namespace utl
         implRegisterExchangeLocation( aNewAccessor );
     }
 
-    //---------------------------------------------------------------------
-    //--- 21.08.01 14:44:45 -----------------------------------------------
-
     void OConfigurationValueContainer::registerNullValueExchangeLocation( const sal_Char* _pRelativePath, Any* _pContainer )
     {
         // build an accessor for this container
@@ -383,9 +332,6 @@ namespace utl
         implRegisterExchangeLocation( aNewAccessor );
     }
 
-    //---------------------------------------------------------------------
-    //--- 21.08.01 10:23:34 -----------------------------------------------
-
     void OConfigurationValueContainer::read( )
     {
         std::for_each(
@@ -395,9 +341,6 @@ namespace utl
         );
     }
 
-    //---------------------------------------------------------------------
-    //--- 21.08.01 12:04:48 -----------------------------------------------
-
     void OConfigurationValueContainer::write( sal_Bool _bCommit )
     {
         // collect the current values in the exchange locations
@@ -412,9 +355,6 @@ namespace utl
             commit( sal_False );
     }
 
-    //---------------------------------------------------------------------
-    //--- 21.08.01 12:09:45 -----------------------------------------------
-
     void OConfigurationValueContainer::commit( sal_Bool _bWrite )
     {
         // write the current values in the exchange locations (if requested)
@@ -425,9 +365,6 @@ namespace utl
         m_pImpl->aConfigRoot.commit( );
     }
 
-    //---------------------------------------------------------------------
-    //--- 20.08.01 17:29:27 -----------------------------------------------
-
     void OConfigurationValueContainer::implRegisterExchangeLocation( const NodeValueAccessor& _rAccessor )
     {
         // some checks
diff --git a/unotools/source/config/docinfohelper.cxx b/unotools/source/config/docinfohelper.cxx
index e37da4e54634..beb381c51d37 100644
--- a/unotools/source/config/docinfohelper.cxx
+++ b/unotools/source/config/docinfohelper.cxx
@@ -72,17 +72,17 @@ namespace utl
         }
 
         aResult.append( (sal_Unicode)'$' );
-        aResult.append( ::rtl::OUString::createFromAscii(
-                                TOOLS_INETDEF_OS ).replace( ' ', '_' ) );
+        aResult.append( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                TOOLS_INETDEF_OS )).replace( ' ', '_' ) );
 
         aResult.append( (sal_Unicode)' ' );
     }
 
-    // second product: OpenOffice.org_project/<build_information>
+    // second product: LibreOffice_project/<build_information>
     // build_information has '(' and '[' encoded as '$', ')' and ']' ignored
     // and ':' replaced by '-'
     {
-        aResult.appendAscii( "OpenOffice.org_project/" );
+        aResult.appendAscii( "LibreOffice_project/" );
         ::rtl::OUString aDefault;
         ::rtl::OUString aBuildId( Bootstrap::getBuildIdData( aDefault ) );
         for( sal_Int32 i=0; i < aBuildId.getLength(); i++ )
diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx
index 3dc775c6bdca..87f535f72399 100644
--- a/unotools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.cxx
@@ -37,9 +37,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
-#ifndef __SGI_STL_VECTOR
 #include <vector>
-#endif
 
 #include <itemholder1.hxx>
 
diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx
index d393ccad30bc..74ddfe622c0b 100644
--- a/unotools/source/config/extendedsecurityoptions.cxx
+++ b/unotools/source/config/extendedsecurityoptions.cxx
@@ -357,9 +357,7 @@ SvtExtendedSecurityOptions::OpenHyperlinkMode SvtExtendedSecurityOptions_Impl::G
 {
     return m_eOpenHyperlinkMode;
 }
-/* -----------------09.07.2003 11:26-----------------
 
- --------------------------------------------------*/
 sal_Bool SvtExtendedSecurityOptions_Impl::IsOpenHyperlinkModeReadOnly() const
 {
     return m_bROOpenHyperlinkMode;
@@ -496,9 +494,7 @@ SvtExtendedSecurityOptions::OpenHyperlinkMode SvtExtendedSecurityOptions::GetOpe
     MutexGuard aGuard( GetInitMutex() );
     return m_pDataContainer->GetOpenHyperlinkMode();
 }
-/* -----------------09.07.2003 11:26-----------------
 
- --------------------------------------------------*/
 sal_Bool SvtExtendedSecurityOptions::IsOpenHyperlinkModeReadOnly() const
 {
     return m_pDataContainer->IsOpenHyperlinkModeReadOnly();
diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx
index 592ed8373475..8e2f5ea2900f 100644
--- a/unotools/source/config/fltrcfg.cxx
+++ b/unotools/source/config/fltrcfg.cxx
@@ -66,9 +66,6 @@ using namespace com::sun::star::uno;
 
 static SvtFilterOptions* pOptions=0;
 
-/* -----------------------------22.01.01 10:23--------------------------------
-
- ---------------------------------------------------------------------------*/
 class SvtAppFilterOptions_Impl : public utl::ConfigItem
 {
     sal_Bool                bLoadVBA;
@@ -99,17 +96,12 @@ public:
                             }
 };
 
-/* -----------------------------22.01.01 11:08--------------------------------
-
- ---------------------------------------------------------------------------*/
 SvtAppFilterOptions_Impl::~SvtAppFilterOptions_Impl()
 {
     if(IsModified())
         Commit();
 }
-/* -----------------------------22.01.01 10:38--------------------------------
 
- ---------------------------------------------------------------------------*/
 void    SvtAppFilterOptions_Impl::Commit()
 {
     Sequence<OUString> aNames(2);
@@ -131,10 +123,6 @@ void SvtAppFilterOptions_Impl::Notify( const Sequence< rtl::OUString >&  )
     // no listeners supported yet
 }
 
-
-/* -----------------------------22.01.01 10:38--------------------------------
-
- ---------------------------------------------------------------------------*/
 void    SvtAppFilterOptions_Impl::Load()
 {
     Sequence<OUString> aNames(2);
@@ -243,9 +231,6 @@ void SvtCalcFilterOptions_Impl::Load()
         bLoadExecutable = *(sal_Bool*)pValues[0].getValue();
 }
 
-/* -----------------------------22.01.01 10:32--------------------------------
-
- ---------------------------------------------------------------------------*/
 struct SvtFilterOptions_Impl
 {
     ULONG nFlags;
@@ -285,9 +270,7 @@ struct SvtFilterOptions_Impl
         aImpressCfg.Load();
     }
 };
-/* -----------------------------22.01.01 10:34--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SvtFilterOptions_Impl::SetFlag( ULONG nFlag, BOOL bSet )
 {
     switch(nFlag)
@@ -307,9 +290,7 @@ void SvtFilterOptions_Impl::SetFlag( ULONG nFlag, BOOL bSet )
                 nFlags &= ~nFlag;
     }
 }
-/* -----------------------------22.01.01 10:35--------------------------------
 
- ---------------------------------------------------------------------------*/
 BOOL SvtFilterOptions_Impl::IsFlag( ULONG nFlag ) const
 {
     BOOL bRet;
@@ -344,9 +325,7 @@ SvtFilterOptions::~SvtFilterOptions()
 {
     delete pImp;
 }
-/* -----------------------------22.01.01 08:45--------------------------------
 
- ---------------------------------------------------------------------------*/
 const Sequence<OUString>& SvtFilterOptions::GetPropertyNames()
 {
     static Sequence<OUString> aNames;
@@ -398,16 +377,12 @@ static ULONG lcl_GetFlag(sal_Int32 nProp)
     }
     return nFlag;
 }
-/*-- 22.01.01 08:53:03---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvtFilterOptions::Notify( const Sequence<OUString>& )
 {
     Load();
 }
-/*-- 22.01.01 08:53:04---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvtFilterOptions::Commit()
 {
     const Sequence<OUString>& aNames = GetPropertyNames();
@@ -424,9 +399,7 @@ void SvtFilterOptions::Commit()
     }
     PutProperties(aNames, aValues);
 }
-/*-- 22.01.01 08:53:04---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvtFilterOptions::Load()
 {
     pImp->Load();
diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx
index dd18d399bc10..7cc8d4eedefd 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -37,13 +37,8 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
-#ifndef __SGI_STL_DEQUE
 #include <deque>
-#endif
-
-#ifndef __SGI_STL_ALGORITHM
 #include <algorithm>
-#endif
 
 #include <rtl/logfile.hxx>
 #include "itemholder1.hxx"
@@ -107,7 +102,7 @@ struct IMPL_THistoryItem
         sPassword = sNewPassword ;
     }
 
-    sal_Bool operator==( const OUString& sSearchedURL )
+    sal_Bool operator==( const OUString& sSearchedURL ) const
     {
         return( sURL == sSearchedURL );
     }
diff --git a/unotools/source/config/inetoptions.cxx b/unotools/source/config/inetoptions.cxx
index 387bbe384edc..bc6f3c493aff 100644
--- a/unotools/source/config/inetoptions.cxx
+++ b/unotools/source/config/inetoptions.cxx
@@ -247,7 +247,7 @@ SvtInetOptions::Impl::notifyListeners(
             {
                 aEvents.realloc(nCount);
                 aNotifications.
-                    push_back(std::make_pair< List::value_type::first_type,
+                    push_back(std::pair< List::value_type::first_type,
                                               List::value_type::second_type >(
                                   aIt->first, aEvents));
             }
diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx
index e906fc5da5b5..283c9a2b5bed 100644
--- a/unotools/source/config/itemholder1.cxx
+++ b/unotools/source/config/itemholder1.cxx
@@ -87,7 +87,7 @@ ItemHolder1::ItemHolder1()
     {
         css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
         css::uno::Reference< css::lang::XComponent > xCfg(
-            xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")),
+            xSMGR->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))),
             css::uno::UNO_QUERY);
         if (xCfg.is())
             xCfg->addEventListener(static_cast< css::lang::XEventListener* >(this));
diff --git a/unotools/source/config/javaoptions.cxx b/unotools/source/config/javaoptions.cxx
index 0fa713c8d7b4..ef9d5f10de41 100644
--- a/unotools/source/config/javaoptions.cxx
+++ b/unotools/source/config/javaoptions.cxx
@@ -40,9 +40,7 @@ using namespace ::rtl;
 
 #define C2U(cChar) OUString::createFromAscii(cChar)
 #define CFG_READONLY_DEFAULT    sal_False
-/* -----------------------------10.04.01 12:39--------------------------------
 
- ---------------------------------------------------------------------------*/
 class SvtExecAppletsItem_Impl : public utl::ConfigItem
 {
     sal_Bool  bExecute;
@@ -57,9 +55,7 @@ public:
     void     SetExecuteApplets(sal_Bool bSet);
     sal_Bool IsReadOnly() const {return bRO;}
 };
-/* -----------------------------10.02.2003 07:46------------------------------
 
- ---------------------------------------------------------------------------*/
 void SvtExecAppletsItem_Impl::SetExecuteApplets(sal_Bool bSet)
 {
     OSL_ENSURE(!bRO, "SvtExecAppletsItem_Impl::SetExecuteApplets()\nYou tried to write on a readonly value!\n");
@@ -69,9 +65,7 @@ void SvtExecAppletsItem_Impl::SetExecuteApplets(sal_Bool bSet)
         SetModified();
     }
 }
-/* -----------------------------18.05.01 14:44--------------------------------
 
- ---------------------------------------------------------------------------*/
 SvtExecAppletsItem_Impl::SvtExecAppletsItem_Impl() :
         utl::ConfigItem(C2U("Office.Common/Java/Applet")),
         bExecute       (sal_False                       ),
@@ -139,9 +133,7 @@ struct SvtJavaOptions_Impl
             pNames[3] = C2U("UserClassPath");
         }
 };
-/* -----------------------------18.05.01 13:28--------------------------------
 
- ---------------------------------------------------------------------------*/
 SvtJavaOptions::SvtJavaOptions() :
     utl::ConfigItem(C2U("Office.Java/VirtualMachine")),
     pImpl(new SvtJavaOptions_Impl)
@@ -173,16 +165,12 @@ SvtJavaOptions::SvtJavaOptions() :
         pImpl->bROUserClassPath = pROStates[3];
     }
 }
-/* -----------------------------18.05.01 13:28--------------------------------
 
- ---------------------------------------------------------------------------*/
 SvtJavaOptions::~SvtJavaOptions()
 {
     delete pImpl;
 }
-/*-- 18.05.01 13:28:35---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void    SvtJavaOptions::Commit()
 {
     pImpl->aExecItem.Commit();
@@ -243,37 +231,27 @@ void    SvtJavaOptions::Commit()
     aNames.realloc(nRealCount);
     PutProperties(aNames,aValues);
 }
-/*-- 18.05.01 13:28:35---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool        SvtJavaOptions::IsEnabled() const
 {
     return pImpl->bEnabled;
 }
-/*-- 18.05.01 13:28:35---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool        SvtJavaOptions::IsSecurity()const
 {
     return pImpl->bSecurity;
 }
-/*-- 18.05.01 13:28:35---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Int32       SvtJavaOptions::GetNetAccess() const
 {
     return pImpl->nNetAccess;
 }
-/*-- 18.05.01 13:28:36---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 rtl::OUString&  SvtJavaOptions::GetUserClassPath()const
 {
     return pImpl->sUserClassPath;
 }
-/*-- 18.05.01 13:28:37---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvtJavaOptions::SetEnabled(sal_Bool bSet)
 {
     OSL_ENSURE(!pImpl->bROEnabled, "SvtJavaOptions::SetEnabled()\nYou tried to write on a readonly value!\n");
@@ -283,9 +261,7 @@ void SvtJavaOptions::SetEnabled(sal_Bool bSet)
         SetModified();
     }
 }
-/*-- 18.05.01 13:28:38---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvtJavaOptions::SetSecurity(sal_Bool bSet)
 {
     OSL_ENSURE(!pImpl->bROSecurity, "SvtJavaOptions::SetSecurity()\nYou tried to write on a readonly value!\n");
@@ -295,9 +271,7 @@ void SvtJavaOptions::SetSecurity(sal_Bool bSet)
         SetModified();
     }
 }
-/*-- 18.05.01 13:28:38---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvtJavaOptions::SetNetAccess(sal_Int32 nSet)
 {
     OSL_ENSURE(!pImpl->bRONetAccess, "SvtJavaOptions::SetNetAccess()\nYou tried to write on a readonly value!\n");
@@ -307,9 +281,7 @@ void SvtJavaOptions::SetNetAccess(sal_Int32 nSet)
         SetModified();
     }
 }
-/*-- 18.05.01 13:28:38---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvtJavaOptions::SetUserClassPath(const rtl::OUString& rSet)
 {
     OSL_ENSURE(!pImpl->bROUserClassPath, "SvtJavaOptions::SetUserClassPath()\nYou tried to write on a readonly value!\n");
@@ -320,16 +292,12 @@ void SvtJavaOptions::SetUserClassPath(const rtl::OUString& rSet)
     }
 }
 
-/*-- 18.05.01 14:34:32---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool        SvtJavaOptions::IsExecuteApplets() const
 {
     return pImpl->aExecItem.IsExecuteApplets();
 }
-/*-- 18.05.01 14:34:32---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvtJavaOptions::SetExecuteApplets(sal_Bool bSet)
 {
     if(!pImpl->aExecItem.IsReadOnly() && pImpl->aExecItem.IsExecuteApplets() != bSet)
@@ -338,9 +306,7 @@ void SvtJavaOptions::SetExecuteApplets(sal_Bool bSet)
         SetModified();
     }
 }
-/*--10.02.2003 08:40---------------------------------------------------
 
------------------------------------------------------------------------*/
 sal_Bool SvtJavaOptions::IsReadOnly( EOption eOption ) const
 {
     sal_Bool bRO = sal_True;
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index c11403f47a26..cab39e74f212 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -1364,13 +1364,13 @@ rtl::OUString SvtLinguConfig::GetVendorImageUrl_Impl(
 
 
 rtl::OUString SvtLinguConfig::GetSpellAndGrammarDialogImage(
-    const rtl::OUString &rServiceImplName,
-    bool bHighContrast ) const
+    const rtl::OUString &rServiceImplName
+) const
 {
     rtl::OUString   aRes;
     if (rServiceImplName.getLength() > 0)
     {
-        rtl::OUString aImageName( A2OU( bHighContrast ? "SpellAndGrammarDialogImage_HC" : "SpellAndGrammarDialogImage" ));
+        rtl::OUString aImageName( A2OU( "SpellAndGrammarDialogImage" ));
         rtl::OUString aPath( GetVendorImageUrl_Impl( rServiceImplName, aImageName ) );
         aRes = aPath;
     }
@@ -1379,13 +1379,13 @@ rtl::OUString SvtLinguConfig::GetSpellAndGrammarDialogImage(
 
 
 rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextSuggestionImage(
-    const rtl::OUString &rServiceImplName,
-    bool bHighContrast ) const
+    const rtl::OUString &rServiceImplName
+) const
 {
     rtl::OUString   aRes;
     if (rServiceImplName.getLength() > 0)
     {
-        rtl::OUString aImageName( A2OU( bHighContrast ? "SpellAndGrammarContextMenuSuggestionImage_HC" : "SpellAndGrammarContextMenuSuggestionImage" ));
+        rtl::OUString aImageName( A2OU( "SpellAndGrammarContextMenuSuggestionImage" ));
         rtl::OUString aPath( GetVendorImageUrl_Impl( rServiceImplName, aImageName ) );
         aRes = aPath;
     }
@@ -1394,13 +1394,13 @@ rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextSuggestionImage(
 
 
 rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextDictionaryImage(
-    const rtl::OUString &rServiceImplName,
-    bool bHighContrast ) const
+    const rtl::OUString &rServiceImplName
+) const
 {
     rtl::OUString   aRes;
     if (rServiceImplName.getLength() > 0)
     {
-        rtl::OUString aImageName( A2OU( bHighContrast ? "SpellAndGrammarContextMenuDictionaryImage_HC" : "SpellAndGrammarContextMenuDictionaryImage" ));
+        rtl::OUString aImageName( A2OU( "SpellAndGrammarContextMenuDictionaryImage" ));
         rtl::OUString aPath( GetVendorImageUrl_Impl( rServiceImplName, aImageName ) );
         aRes = aPath;
     }
@@ -1409,13 +1409,13 @@ rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextDictionaryImage(
 
 
 ::rtl::OUString SvtLinguConfig::GetThesaurusDialogImage(
-    const ::rtl::OUString &rServiceImplName,
-    bool bHighContrast ) const
+    const ::rtl::OUString &rServiceImplName
+) const
 {
     rtl::OUString   aRes;
     if (rServiceImplName.getLength() > 0)
     {
-        rtl::OUString aImageName( A2OU( bHighContrast ? "ThesaurusDialogImage_HC" : "ThesaurusDialogImage" ));
+        rtl::OUString aImageName( A2OU( "ThesaurusDialogImage" ));
         rtl::OUString aPath( GetVendorImageUrl_Impl( rServiceImplName, aImageName ) );
         aRes = aPath;
     }
@@ -1424,13 +1424,13 @@ rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextDictionaryImage(
 
 
 ::rtl::OUString SvtLinguConfig::GetSynonymsContextImage(
-    const ::rtl::OUString &rServiceImplName,
-    bool bHighContrast ) const
+    const ::rtl::OUString &rServiceImplName
+) const
 {
     rtl::OUString   aRes;
     if (rServiceImplName.getLength() > 0)
     {
-        rtl::OUString aImageName( A2OU( bHighContrast ? "SynonymsContextMenuImage_HC" : "SynonymsContextMenuImage" ));
+        rtl::OUString aImageName( A2OU( "SynonymsContextMenuImage" ));
         rtl::OUString aPath( GetVendorImageUrl_Impl( rServiceImplName, aImageName ) );
         aRes = aPath;
     }
diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx
index bb09c47fe887..2e05d2a77837 100644
--- a/unotools/source/config/misccfg.cxx
+++ b/unotools/source/config/misccfg.cxx
@@ -89,9 +89,6 @@ public:
 
 };
 
-/*--------------------------------------------------------------------
-     Beschreibung:
- --------------------------------------------------------------------*/
 SfxMiscCfg::SfxMiscCfg() :
     ConfigItem(C2U("Office.Common") ),
     bPaperSize(FALSE),
@@ -103,15 +100,10 @@ SfxMiscCfg::SfxMiscCfg() :
 
     Load();
 }
-/* -----------------------------02.03.01 15:31--------------------------------
 
- ---------------------------------------------------------------------------*/
 SfxMiscCfg::~SfxMiscCfg()
 {
 }
-/*--------------------------------------------------------------------
-     Beschreibung:
- --------------------------------------------------------------------*/
 
 void SfxMiscCfg::SetNotFoundWarning( BOOL bSet)
 {
@@ -120,10 +112,6 @@ void SfxMiscCfg::SetNotFoundWarning( BOOL bSet)
     bNotFound = bSet;
 }
 
-/*--------------------------------------------------------------------
-     Beschreibung:
- --------------------------------------------------------------------*/
-
 void SfxMiscCfg::SetPaperSizeWarning( BOOL bSet)
 {
     if(bPaperSize != bSet)
@@ -131,18 +119,12 @@ void SfxMiscCfg::SetPaperSizeWarning( BOOL bSet)
     bPaperSize = bSet;
 }
 
-/*--------------------------------------------------------------------
-     Beschreibung:
- --------------------------------------------------------------------*/
 void SfxMiscCfg::SetPaperOrientationWarning( BOOL bSet)
 {
     if(bPaperOrientation != bSet)
         SetModified();
     bPaperOrientation = bSet;
 }
-/*--------------------------------------------------------------------
-     Beschreibung:
- --------------------------------------------------------------------*/
 
 void SfxMiscCfg::SetYear2000( sal_Int32 nSet )
 {
@@ -150,9 +132,7 @@ void SfxMiscCfg::SetYear2000( sal_Int32 nSet )
         SetModified();
     nYear2000 = nSet;
 }
-/* -----------------------------02.03.01 15:31--------------------------------
 
- ---------------------------------------------------------------------------*/
 const Sequence<OUString>& SfxMiscCfg::GetPropertyNames()
 {
     static Sequence<OUString> aNames;
@@ -173,9 +153,7 @@ const Sequence<OUString>& SfxMiscCfg::GetPropertyNames()
     }
     return aNames;
 }
-/* -----------------------------02.03.01 15:31--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SfxMiscCfg::Load()
 {
     const Sequence<OUString>& aNames = GetPropertyNames();
@@ -200,16 +178,12 @@ void SfxMiscCfg::Load()
         }
     }
 }
-/* -----------------------------02.03.01 15:31--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SfxMiscCfg::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& )
 {
     Load();
 }
-/* -----------------------------02.03.01 15:31--------------------------------
 
- ---------------------------------------------------------------------------*/
 void SfxMiscCfg::Commit()
 {
     const Sequence<OUString>& aNames = GetPropertyNames();
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index 32b1a2d84a90..396f5cedf2b8 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -1357,16 +1357,16 @@ sal_uInt32 SvtModuleOptions::GetFeatures() const
 {
     switch( eModule )
     {
-        case SvtModuleOptions::E_SWRITER    :   { return ::rtl::OUString::createFromAscii("Writer"); }
-        case SvtModuleOptions::E_SWEB       :   { return ::rtl::OUString::createFromAscii("Web"); }
-        case SvtModuleOptions::E_SGLOBAL    :   { return ::rtl::OUString::createFromAscii("Global"); }
-        case SvtModuleOptions::E_SCALC      :   { return ::rtl::OUString::createFromAscii("Calc"); }
-        case SvtModuleOptions::E_SDRAW      :   { return ::rtl::OUString::createFromAscii("Draw"); }
-        case SvtModuleOptions::E_SIMPRESS   :   { return ::rtl::OUString::createFromAscii("Impress"); }
-        case SvtModuleOptions::E_SMATH      :   { return ::rtl::OUString::createFromAscii("Math"); }
-        case SvtModuleOptions::E_SCHART     :   { return ::rtl::OUString::createFromAscii("Chart"); }
-        case SvtModuleOptions::E_SBASIC     :   { return ::rtl::OUString::createFromAscii("Basic"); }
-        case SvtModuleOptions::E_SDATABASE  :   { return ::rtl::OUString::createFromAscii("Database"); }
+        case SvtModuleOptions::E_SWRITER    :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Writer")); }
+        case SvtModuleOptions::E_SWEB       :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Web")); }
+        case SvtModuleOptions::E_SGLOBAL    :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Global")); }
+        case SvtModuleOptions::E_SCALC      :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Calc")); }
+        case SvtModuleOptions::E_SDRAW      :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Draw")); }
+        case SvtModuleOptions::E_SIMPRESS   :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Impress")); }
+        case SvtModuleOptions::E_SMATH      :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Math")); }
+        case SvtModuleOptions::E_SCHART     :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Chart")); }
+        case SvtModuleOptions::E_SBASIC     :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Basic")); }
+        case SvtModuleOptions::E_SDATABASE  :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Database")); }
         default:
             OSL_ASSERT( "unknown module" );
             break;
@@ -1379,16 +1379,16 @@ sal_uInt32 SvtModuleOptions::GetFeatures() const
 {
     switch( eFactory )
     {
-        case SvtModuleOptions::E_WRITER         :   { return ::rtl::OUString::createFromAscii("Writer"); }
-        case SvtModuleOptions::E_WRITERWEB      :   { return ::rtl::OUString::createFromAscii("Writer"); }
-        case SvtModuleOptions::E_WRITERGLOBAL   :   { return ::rtl::OUString::createFromAscii("Writer"); }
-        case SvtModuleOptions::E_CALC           :   { return ::rtl::OUString::createFromAscii("Calc"); }
-        case SvtModuleOptions::E_DRAW           :   { return ::rtl::OUString::createFromAscii("Draw"); }
-        case SvtModuleOptions::E_IMPRESS        :   { return ::rtl::OUString::createFromAscii("Impress"); }
-        case SvtModuleOptions::E_MATH           :   { return ::rtl::OUString::createFromAscii("Math"); }
-        case SvtModuleOptions::E_CHART          :   { return ::rtl::OUString::createFromAscii("Chart"); }
-        case SvtModuleOptions::E_BASIC          :   { return ::rtl::OUString::createFromAscii("Basic"); }
-        case SvtModuleOptions::E_DATABASE       :   { return ::rtl::OUString::createFromAscii("Database"); }
+        case SvtModuleOptions::E_WRITER         :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Writer")); }
+        case SvtModuleOptions::E_WRITERWEB      :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Writer")); }
+        case SvtModuleOptions::E_WRITERGLOBAL   :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Writer")); }
+        case SvtModuleOptions::E_CALC           :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Calc")); }
+        case SvtModuleOptions::E_DRAW           :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Draw")); }
+        case SvtModuleOptions::E_IMPRESS        :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Impress")); }
+        case SvtModuleOptions::E_MATH           :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Math")); }
+        case SvtModuleOptions::E_CHART          :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Chart")); }
+        case SvtModuleOptions::E_BASIC          :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Basic")); }
+        case SvtModuleOptions::E_DATABASE       :   { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Database")); }
         default:
             OSL_ASSERT( "unknown factory" );
             break;
@@ -1468,9 +1468,9 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const ::rtl::O
     try
     {
         xFilterCfg = css::uno::Reference< css::container::XNameAccess >(
-            xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.document.FilterFactory")), css::uno::UNO_QUERY);
+            xSMGR->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.FilterFactory"))), css::uno::UNO_QUERY);
         xTypeCfg = css::uno::Reference< css::container::XNameAccess >(
-            xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.document.TypeDetection")), css::uno::UNO_QUERY);
+            xSMGR->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection"))), css::uno::UNO_QUERY);
     }
     catch(const css::uno::RuntimeException&)
         { throw; }
@@ -1480,13 +1480,13 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const ::rtl::O
     ::comphelper::SequenceAsHashMap stlDesc(lMediaDescriptor);
 
     // is there already a filter inside the descriptor?
-    ::rtl::OUString sFilterName = stlDesc.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("FilterName"), ::rtl::OUString());
+    ::rtl::OUString sFilterName = stlDesc.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName")), ::rtl::OUString());
     if (sFilterName.getLength())
     {
         try
         {
             ::comphelper::SequenceAsHashMap stlFilterProps   (xFilterCfg->getByName(sFilterName));
-            ::rtl::OUString                 sDocumentService = stlFilterProps.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("DocumentService"), ::rtl::OUString());
+            ::rtl::OUString                 sDocumentService = stlFilterProps.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentService")), ::rtl::OUString());
             SvtModuleOptions::EFactory      eApp             = SvtModuleOptions::ClassifyFactoryByServiceName(sDocumentService);
 
             if (eApp != E_UNKNOWN_FACTORY)
@@ -1499,7 +1499,7 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const ::rtl::O
     }
 
     // is there already a type inside the descriptor?
-    ::rtl::OUString sTypeName = stlDesc.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("TypeName"), ::rtl::OUString());
+    ::rtl::OUString sTypeName = stlDesc.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeName")), ::rtl::OUString());
     if (!sTypeName.getLength())
     {
         // no :-(
@@ -1516,9 +1516,9 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const ::rtl::O
     try
     {
         ::comphelper::SequenceAsHashMap stlTypeProps     (xTypeCfg->getByName(sTypeName));
-        ::rtl::OUString                 sPreferredFilter = stlTypeProps.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("PreferredFilter"), ::rtl::OUString());
+        ::rtl::OUString                 sPreferredFilter = stlTypeProps.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PreferredFilter")), ::rtl::OUString());
         ::comphelper::SequenceAsHashMap stlFilterProps   (xFilterCfg->getByName(sPreferredFilter));
-        ::rtl::OUString                 sDocumentService = stlFilterProps.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("DocumentService"), ::rtl::OUString());
+        ::rtl::OUString                 sDocumentService = stlFilterProps.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentService")), ::rtl::OUString());
         SvtModuleOptions::EFactory      eApp             = SvtModuleOptions::ClassifyFactoryByServiceName(sDocumentService);
 
         if (eApp != E_UNKNOWN_FACTORY)
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index 8c850a805372..cb1e790bb82b 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -1062,7 +1062,7 @@ void SAL_CALL PathService::flush(  ) throw(::com::sun::star::uno::RuntimeExcepti
 
 ::rtl::OUString SAL_CALL PathService::getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    return OUString::createFromAscii("com.sun.star.comp.unotools.PathService");
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.unotools.PathService"));
 }
 
 sal_Bool SAL_CALL PathService::supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException)
@@ -1076,7 +1076,7 @@ sal_Bool SAL_CALL PathService::supportsService( const ::rtl::OUString& ServiceNa
 ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL PathService::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     Sequence< OUString > aRet(1);
-    *aRet.getArray() = OUString::createFromAscii("com.sun.star.config.SpecialConfigManager");
+    *aRet.getArray() = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.config.SpecialConfigManager"));
     return aRet;
 }
 
diff --git a/unotools/source/config/regoptions.cxx b/unotools/source/config/regoptions.cxx
index f102285ccf16..aad9dc205c3a 100644
--- a/unotools/source/config/regoptions.cxx
+++ b/unotools/source/config/regoptions.cxx
@@ -259,13 +259,13 @@ namespace utl
         // create the config node for all our registration information
         m_aRegistrationNode = OConfigurationTreeRoot::createWithServiceFactory(
             ::comphelper::getProcessServiceFactory(),
-            ::rtl::OUString::createFromAscii( "/org.openoffice.Office.Common/Help/Registration" )
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Common/Help/Registration"))
         );
 
         // cache some data
         //the URL to use for online registration
         ::rtl::OUString sStringValue;
-        m_aRegistrationNode.getNodeValue( ::rtl::OUString::createFromAscii( "URL" ) ) >>= sStringValue;
+        m_aRegistrationNode.getNodeValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) ) >>= sStringValue;
         m_sRegistrationURL = sStringValue;
 
         // the state of the dialog
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index 5a812fece4f0..8f1ee3d4bd16 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -382,7 +382,7 @@ Sequence< OUString > GetPropertyNames()
 // -----------------------------------------------------------------------
 
 SvtSaveOptions_Impl::SvtSaveOptions_Impl()
-    : ConfigItem( OUString::createFromAscii("Office.Common/Save") )
+    : ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Save")) )
     , nAutoSaveTime( 0 )
     , bUseUserData( sal_False )
     , bBackup( sal_False )
@@ -543,18 +543,18 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl()
     {
     css::uno::Reference< css::uno::XInterface > xCFG = ::comphelper::ConfigurationHelper::openConfig(
         ::utl::getProcessServiceFactory(),
-        ::rtl::OUString::createFromAscii("org.openoffice.Office.Recovery"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Recovery")),
         ::comphelper::ConfigurationHelper::E_READONLY);
 
     ::comphelper::ConfigurationHelper::readRelativeKey(
         xCFG,
-        ::rtl::OUString::createFromAscii("AutoSave"),
-        ::rtl::OUString::createFromAscii("Enabled")) >>= bAutoSave;
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoSave")),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Enabled"))) >>= bAutoSave;
 
     ::comphelper::ConfigurationHelper::readRelativeKey(
         xCFG,
-        ::rtl::OUString::createFromAscii("AutoSave"),
-        ::rtl::OUString::createFromAscii("TimeIntervall")) >>= nAutoSaveTime;
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoSave")),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeIntervall"))) >>= nAutoSaveTime;
     }
     catch(const css::uno::Exception&)
         { DBG_ERROR("Could not find needed informations for AutoSave feature."); }
@@ -713,19 +713,19 @@ void SvtSaveOptions_Impl::Commit()
 
     css::uno::Reference< css::uno::XInterface > xCFG = ::comphelper::ConfigurationHelper::openConfig(
         ::utl::getProcessServiceFactory(),
-        ::rtl::OUString::createFromAscii("org.openoffice.Office.Recovery"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Recovery")),
         ::comphelper::ConfigurationHelper::E_STANDARD);
 
     ::comphelper::ConfigurationHelper::writeRelativeKey(
         xCFG,
-        ::rtl::OUString::createFromAscii("AutoSave"),
-        ::rtl::OUString::createFromAscii("TimeIntervall"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoSave")),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeIntervall")),
         css::uno::makeAny(nAutoSaveTime));
 
     ::comphelper::ConfigurationHelper::writeRelativeKey(
         xCFG,
-        ::rtl::OUString::createFromAscii("AutoSave"),
-        ::rtl::OUString::createFromAscii("Enabled"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoSave")),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Enabled")),
         css::uno::makeAny(bAutoSave));
 
     ::comphelper::ConfigurationHelper::flush(xCFG);
@@ -757,7 +757,7 @@ public:
 const sal_Char cUserDefinedSettings[] = "UserDefinedSettings";
 
 SvtLoadOptions_Impl::SvtLoadOptions_Impl()
-    : ConfigItem( OUString::createFromAscii("Office.Common/Load") )
+    : ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Load")) )
     , bLoadUserDefinedSettings( sal_False )
 {
     Sequence< OUString > aNames(1);
diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx
index c4cae792c953..f7d6333afac0 100644
--- a/unotools/source/config/searchopt.cxx
+++ b/unotools/source/config/searchopt.cxx
@@ -83,7 +83,7 @@ public:
 
 
 SvtSearchOptions_Impl::SvtSearchOptions_Impl() :
-    ConfigItem( OUString::createFromAscii( "Office.Common/SearchOptions" ) )
+    ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/SearchOptions")) )
 {
     RTL_LOGFILE_CONTEXT(aLog, "unotools SvtSearchOptions_Impl::SvtSearchOptions_Impl()");
     nFlags = 0x0003FFFF;    // set all options values to 'true'
diff --git a/unotools/source/config/sourceviewconfig.cxx b/unotools/source/config/sourceviewconfig.cxx
index 270a04702fef..13978c99b53d 100644
--- a/unotools/source/config/sourceviewconfig.cxx
+++ b/unotools/source/config/sourceviewconfig.cxx
@@ -97,25 +97,19 @@ public:
 SourceViewConfig_Impl* SourceViewConfig::m_pImplConfig = 0;
 sal_Int32              SourceViewConfig::m_nRefCount = 0;
 namespace { struct lclMutex : public rtl::Static< ::osl::Mutex, lclMutex > {}; }
-/* -----------------------------28.08.2002 16:45------------------------------
 
- ---------------------------------------------------------------------------*/
 SourceViewConfig_Impl::SourceViewConfig_Impl() :
-    ConfigItem(OUString::createFromAscii("Office.Common/Font/SourceViewFont")),
+    ConfigItem(OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Font/SourceViewFont"))),
     m_nFontHeight(12),
     m_bProportionalFontOnly(sal_False)
 {
     Load();
 }
-/* -----------------------------28.08.2002 16:45------------------------------
 
- ---------------------------------------------------------------------------*/
 SourceViewConfig_Impl::~SourceViewConfig_Impl()
 {
 }
-/* -----------------------------28.08.2002 16:25------------------------------
 
- ---------------------------------------------------------------------------*/
 Sequence< OUString > SourceViewConfig_Impl::GetPropertyNames()
 {
     //this list needs exactly to mach the enum PropertyNameIndex
@@ -134,9 +128,6 @@ Sequence< OUString > SourceViewConfig_Impl::GetPropertyNames()
     return aNames;
 }
 
-/*-- 28.08.2002 16:37:59---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 void SourceViewConfig_Impl::Load()
 {
     Sequence< OUString > aNames = GetPropertyNames();
@@ -160,16 +151,12 @@ void SourceViewConfig_Impl::Load()
         }
     }
 }
-/*-- 28.08.2002 16:38:00---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SourceViewConfig_Impl::Notify( const Sequence< OUString >& )
 {
     Load();
 }
-/*-- 28.08.2002 16:38:00---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SourceViewConfig_Impl::Commit()
 {
     ClearModified();
@@ -191,9 +178,7 @@ void SourceViewConfig_Impl::Commit()
 
     NotifyListeners(0);
 }
-/*-- 28.08.2002 16:32:19---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SourceViewConfig::SourceViewConfig()
 {
     {
@@ -209,9 +194,7 @@ SourceViewConfig::SourceViewConfig()
 
     m_pImplConfig->AddListener( this );
 }
-/*-- 28.08.2002 16:32:19---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SourceViewConfig::~SourceViewConfig()
 {
     m_pImplConfig->RemoveListener( this );
@@ -223,44 +206,32 @@ SourceViewConfig::~SourceViewConfig()
         DELETEZ( m_pImplConfig );
     }
 }
-/*-- 28.08.2002 16:32:19---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 const OUString&  SourceViewConfig::GetFontName() const
 {
     return m_pImplConfig->GetFontName();
 }
-/*-- 28.08.2002 16:32:20---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SourceViewConfig::SetFontName(const OUString& rName)
 {
     m_pImplConfig->SetFontName(rName);
 }
-/*-- 28.08.2002 16:32:20---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Int16 SourceViewConfig::GetFontHeight() const
 {
     return m_pImplConfig->GetFontHeight();
 }
-/*-- 28.08.2002 16:32:20---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SourceViewConfig::SetFontHeight(sal_Int16 nHeight)
 {
     m_pImplConfig->SetFontHeight(nHeight);
 }
-/*-- 28.08.2002 16:32:20---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 sal_Bool SourceViewConfig::IsShowProportionalFontsOnly() const
 {
     return m_pImplConfig->IsShowProportionalFontsOnly();
 }
-/*-- 28.08.2002 16:32:20---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SourceViewConfig::SetShowProportionalFontsOnly(sal_Bool bSet)
 {
     m_pImplConfig->SetShowProportionalFontsOnly(bSet);
diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx
index d16576be8fee..fdafb7228833 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -578,19 +578,12 @@ void SvtSysLocaleOptions::SetCurrencyConfigString( const OUString& rStr )
     pOptions->SetCurrencyString( rStr );
 }
 
-
-
-/*-- 11.02.2004 13:31:41---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 sal_Bool SvtSysLocaleOptions::IsDecimalSeparatorAsLocale() const
 {
     MutexGuard aGuard( GetMutex() );
     return pOptions->IsDecimalSeparatorAsLocale();
 }
-/*-- 11.02.2004 13:31:41---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvtSysLocaleOptions::SetDecimalSeparatorAsLocale( sal_Bool bSet)
 {
     MutexGuard aGuard( GetMutex() );
diff --git a/unotools/source/config/undoopt.cxx b/unotools/source/config/undoopt.cxx
index f7e985c71318..1e55eea775fe 100644
--- a/unotools/source/config/undoopt.cxx
+++ b/unotools/source/config/undoopt.cxx
@@ -69,7 +69,7 @@ public:
 // -----------------------------------------------------------------------
 
 SvtUndoOptions_Impl::SvtUndoOptions_Impl()
-    : ConfigItem( OUString::createFromAscii("Office.Common/Undo") )
+    : ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Undo")) )
     , nUndoCount( 20 )
 {
     Load();
diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx
index 57f23586e6e7..7019d5648921 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -146,30 +146,21 @@ static sal_Int32            nRefCount = 0;
 
 #define READONLY_DEFAULT    sal_False
 
-/*-- 16.06.2009 14:22:56---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 SvtUserConfigChangeListener_Impl::SvtUserConfigChangeListener_Impl(SvtUserOptions_Impl& rParent) :
     m_rParent( rParent )
 {
 }
-/*-- 16.06.2009 14:22:56---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 SvtUserConfigChangeListener_Impl::~SvtUserConfigChangeListener_Impl()
 {
 }
-/*-- 16.06.2009 14:22:56---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvtUserConfigChangeListener_Impl::changesOccurred( const util::ChangesEvent& rEvent ) throw(RuntimeException)
 {
     if(rEvent.Changes.getLength())
         m_rParent.Notify();
 }
-/*-- 16.06.2009 14:22:56---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void SvtUserConfigChangeListener_Impl::disposing( const lang::EventObject& rSource ) throw(RuntimeException)
 {
     try
@@ -759,7 +750,7 @@ void SvtUserOptions_Impl::SetApartment( const ::rtl::OUString& sApartment )
     sFullName = GetFirstName();
     sFullName.trim();
     if ( sFullName.getLength() )
-        sFullName += ::rtl::OUString::createFromAscii(" ");
+        sFullName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
     sFullName += GetLastName();
     sFullName.trim();
 
diff --git a/unotools/source/ucbhelper/localfilehelper.cxx b/unotools/source/ucbhelper/localfilehelper.cxx
index 75b3dc650602..d421ad3dd5f8 100644
--- a/unotools/source/ucbhelper/localfilehelper.cxx
+++ b/unotools/source/ucbhelper/localfilehelper.cxx
@@ -183,7 +183,7 @@ DECLARE_LIST( StringList_Impl, ::rtl::OUString* )
         Reference< ::com::sun::star::sdbc::XResultSet > xResultSet;
         ::com::sun::star::uno::Sequence< ::rtl::OUString > aProps(1);
         ::rtl::OUString* pProps = aProps.getArray();
-        pProps[0] = ::rtl::OUString::createFromAscii( "Url" );
+        pProps[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Url"));
 
         try
         {
diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx
index 5a99c522035f..160a4572553e 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -75,10 +75,10 @@ rtl::OUString getParentName( const rtl::OUString& aFileName )
     rtl::OUString aParent = aFileName.copy( 0,lastIndex );
 
     if( aParent[ aParent.getLength()-1] == sal_Unicode(':') && aParent.getLength() == 6 )
-        aParent += rtl::OUString::createFromAscii( "/" );
+        aParent += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
     if( 0 == aParent.compareToAscii( "file://" ) )
-        aParent = rtl::OUString::createFromAscii( "file:///" );
+        aParent = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///"));
 
     return aParent;
 }
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx
index 01b99f85e8ec..c289730bfbc0 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.cxx
@@ -109,7 +109,7 @@ sal_Bool UCBContentHelper::Transfer_Impl( const String& rSource, const String& r
     {
         Content aDestPath( aDestObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > () );
         uno::Reference< ::com::sun::star::ucb::XCommandInfo > xInfo = aDestPath.getCommands();
-        OUString aTransferName = OUString::createFromAscii( "transfer" );
+        OUString aTransferName(RTL_CONSTASCII_USTRINGPARAM("transfer"));
         if ( xInfo->hasCommandByName( aTransferName ) )
         {
             aDestPath.executeCommand( aTransferName, makeAny(
@@ -240,7 +240,7 @@ sal_Bool UCBContentHelper::GetTitle( const String& rContent, String& rTitle )
     {
         Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > () );
         OUString aTemp;
-        if ( aCnt.getPropertyValue( OUString::createFromAscii( "Title" ) ) >>= aTemp )
+        if ( aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) ) >>= aTemp )
         {
             rTitle = String( aTemp );
             bRet = sal_True;
@@ -266,7 +266,7 @@ sal_Bool UCBContentHelper::Kill( const String& rContent )
     try
     {
         Content aCnt( aDeleteObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > () );
-        aCnt.executeCommand( OUString::createFromAscii( "delete" ), makeAny( sal_Bool( sal_True ) ) );
+        aCnt.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), makeAny( sal_Bool( sal_True ) ) );
     }
     catch( ::com::sun::star::ucb::CommandAbortedException& )
     {
@@ -295,9 +295,9 @@ Sequence < OUString > UCBContentHelper::GetFolderContents( const String& rFolder
         uno::Reference< XResultSet > xResultSet;
         Sequence< OUString > aProps( bSorted ? 2 : 1 );
         OUString* pProps = aProps.getArray();
-        pProps[0] = OUString::createFromAscii( "Title" );
+        pProps[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
         if ( bSorted )
-            pProps[1] = OUString::createFromAscii( "IsFolder" );
+            pProps[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder"));
 
         try
         {
@@ -314,7 +314,7 @@ Sequence < OUString > UCBContentHelper::GetFolderContents( const String& rFolder
                 uno::Reference < com::sun::star::ucb::XAnyCompareFactory > xFactory;
                 uno::Reference < XMultiServiceFactory > xMgr = getProcessServiceFactory();
                 uno::Reference < com::sun::star::ucb::XSortedDynamicResultSetFactory > xSRSFac(
-                    xMgr->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.ucb.SortedDynamicResultSetFactory") ), UNO_QUERY );
+                    xMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory")) ), UNO_QUERY );
 
                 Sequence< com::sun::star::ucb::NumberedSortingInfo > aSortInfo( 2 );
                 com::sun::star::ucb::NumberedSortingInfo* pInfo = aSortInfo.getArray();
@@ -395,10 +395,10 @@ Sequence < OUString > UCBContentHelper::GetResultSet( const String& rURL )
         uno::Reference< com::sun::star::ucb::XDynamicResultSet > xDynResultSet;
         Sequence< OUString > aProps(3);
         OUString* pProps = aProps.getArray();
-        pProps[0] = OUString::createFromAscii( "Title" );
-        pProps[1] = OUString::createFromAscii( "ContentType" );
+        pProps[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
+        pProps[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType"));
         // TODO: can be optimized, property never used:
-        pProps[2] = OUString::createFromAscii( "IsFolder" );
+        pProps[2] = OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder"));
 
         try
         {
@@ -636,7 +636,7 @@ ULONG UCBContentHelper::GetSize( const String& rContent )
     try
     {
         Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > () );
-        aCnt.getPropertyValue( OUString::createFromAscii( "Size" ) ) >>= nTemp;
+        aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Size")) ) >>= nTemp;
     }
     catch( ::com::sun::star::ucb::CommandAbortedException& )
     {
@@ -662,11 +662,11 @@ sal_Bool UCBContentHelper::IsYounger( const String& rIsYoung, const String& rIsO
         uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > aCmdEnv;
         Content aYoung( aYoungObj.GetMainURL( INetURLObject::NO_DECODE ), aCmdEnv );
         ::com::sun::star::util::DateTime aTempYoungDate;
-        aYoung.getPropertyValue( OUString::createFromAscii( "DateModified" ) ) >>= aTempYoungDate;
+        aYoung.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DateModified")) ) >>= aTempYoungDate;
         CONVERT_DATETIME( aTempYoungDate, aYoungDate );
         Content aOlder( aOlderObj.GetMainURL( INetURLObject::NO_DECODE ), aCmdEnv );
         ::com::sun::star::util::DateTime aTempOlderDate;
-        aOlder.getPropertyValue( OUString::createFromAscii( "DateModified" ) ) >>= aTempOlderDate;
+        aOlder.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DateModified")) ) >>= aTempOlderDate;
         CONVERT_DATETIME( aTempOlderDate, aOlderDate );
     }
     catch( ::com::sun::star::ucb::CommandAbortedException& )
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index 272412d39fe2..d41f7ee269fc 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -201,7 +201,7 @@ void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequenc
     for (i = 0; i < n; i++)
     {
         PropertyChangeEvent evt (rEvent[i]);
-        if (evt.PropertyName == ::rtl::OUString::createFromAscii ("DocumentHeader"))
+        if (evt.PropertyName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("DocumentHeader")))
         {
             Sequence<DocumentHeaderField> aHead;
             if (evt.NewValue >>= aHead)
@@ -226,12 +226,12 @@ void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequenc
 
             m_xLockBytes->SetStreamValid_Impl();
         }
-        else if (evt.PropertyName == rtl::OUString::createFromAscii ("PresentationURL"))
+        else if (evt.PropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("PresentationURL")))
         {
             ::rtl::OUString aUrl;
             if (evt.NewValue >>= aUrl)
             {
-                ::rtl::OUString aBad (::rtl::OUString::createFromAscii ("private:"));
+                ::rtl::OUString aBad (RTL_CONSTASCII_USTRINGPARAM ("private:"));
                 if (!(aUrl.compareTo (aBad, aBad.getLength()) == 0))
                 {
                     // URL changed (Redirection).
@@ -239,7 +239,7 @@ void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequenc
                 }
             }
         }
-        else if (evt.PropertyName == ::rtl::OUString::createFromAscii ("MediaType"))
+        else if (evt.PropertyName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("MediaType")))
         {
             ::rtl::OUString aContentType;
             if (evt.NewValue >>= aContentType)
@@ -1372,7 +1372,7 @@ sal_Bool UcbLockBytes::setInputStream_Impl( const Reference<XInputStream> &rxInp
             {
                 Reference < XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
                 Reference< XOutputStream > rxTempOut = Reference < XOutputStream > (
-                                    xFactory->createInstance ( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ),
+                                    xFactory->createInstance ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")) ),
                                     UNO_QUERY );
 
                 if( rxTempOut.is() )
@@ -1667,7 +1667,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xCo
     aArgument.Referer = rReferer;
 
     Command aCommand;
-    aCommand.Name = ::rtl::OUString::createFromAscii ("post");
+    aCommand.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("post"));
     aCommand.Argument <<= aArgument;
 
     Reference< XProgressHandler > xProgressHdl = new ProgressHandler_Impl( LINK( &xLockBytes, UcbLockBytes, DataAvailHdl ) );
@@ -1707,7 +1707,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xCo
     {
         Reference < XCommandProcessor > xProcessor( xContent, UNO_QUERY );
         Command aCommand;
-        aCommand.Name     = ::rtl::OUString::createFromAscii("setPropertyValues");
+        aCommand.Name     = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setPropertyValues"));
         aCommand.Handle   = -1; /* unknown */
         aCommand.Argument <<= rProps;
         xProcessor->execute( aCommand, 0, Reference < XCommandEnvironment >() );
diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx
index dc99c388594c..b6692e260940 100644
--- a/unotools/source/ucbhelper/ucbstreamhelper.cxx
+++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx
@@ -72,7 +72,7 @@ static SvStream* lcl_CreateStream( const String& rFileName, StreamMode eOpenMode
                 {
                     // truncate is implemented with deleting the original file
                     ::ucbhelper::Content aCnt( rFileName, Reference < XCommandEnvironment >() );
-                    aCnt.executeCommand( ::rtl::OUString::createFromAscii( "delete" ), makeAny( sal_Bool( sal_True ) ) );
+                    aCnt.executeCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), makeAny( sal_Bool( sal_True ) ) );
                 }
 
                 catch ( CommandAbortedException& )
@@ -103,7 +103,7 @@ static SvStream* lcl_CreateStream( const String& rFileName, StreamMode eOpenMode
                     aInsertArg.ReplaceExisting = sal_False;
                     Any aCmdArg;
                     aCmdArg <<= aInsertArg;
-                    aContent.executeCommand( ::rtl::OUString::createFromAscii( "insert" ), aCmdArg );
+                    aContent.executeCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert")), aCmdArg );
                 }
 
                 // it is NOT an error when the stream already exists and no truncation was desired
diff --git a/unoxml/source/dom/cdatasection.cxx b/unoxml/source/dom/cdatasection.cxx
index 2f432138c0e0..1bb7d6d72f19 100644
--- a/unoxml/source/dom/cdatasection.cxx
+++ b/unoxml/source/dom/cdatasection.cxx
@@ -51,7 +51,7 @@ namespace DOM
 
     OUString SAL_CALL CCDATASection::getNodeName()throw (RuntimeException)
     {
-        return OUString::createFromAscii("#cdata-section");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("#cdata-section"));
     }
 
     OUString SAL_CALL CCDATASection::getNodeValue() throw (RuntimeException)
diff --git a/unoxml/source/dom/characterdata.cxx b/unoxml/source/dom/characterdata.cxx
index c5e09540b79c..060d33d3f546 100644
--- a/unoxml/source/dom/characterdata.cxx
+++ b/unoxml/source/dom/characterdata.cxx
@@ -41,9 +41,9 @@ namespace DOM
     {
         Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY);
         Reference< XMutationEvent > event(docevent->createEvent(
-            OUString::createFromAscii("DOMCharacterDataModified")), UNO_QUERY);
+            OUString(RTL_CONSTASCII_USTRINGPARAM("DOMCharacterDataModified"))), UNO_QUERY);
         event->initMutationEvent(
-                OUString::createFromAscii("DOMCharacterDataModified"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("DOMCharacterDataModified")),
                 sal_True, sal_False, Reference< XNode >(),
                 prevValue, newValue, OUString(), (AttrChangeType)0 );
         dispatchEvent(Reference< XEvent >(event, UNO_QUERY));
diff --git a/unoxml/source/dom/comment.cxx b/unoxml/source/dom/comment.cxx
index 4b7dd5a72154..d7a8ff605f43 100644
--- a/unoxml/source/dom/comment.cxx
+++ b/unoxml/source/dom/comment.cxx
@@ -49,7 +49,7 @@ namespace DOM
 
     OUString SAL_CALL CComment::getNodeName()throw (RuntimeException)
     {
-        return OUString::createFromAscii("#comment");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("#comment"));
     }
 
     OUString SAL_CALL CComment::getNodeValue() throw (RuntimeException)
diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx
index d405a79a808f..60b044c7f43e 100644
--- a/unoxml/source/dom/document.cxx
+++ b/unoxml/source/dom/document.cxx
@@ -142,7 +142,7 @@ namespace DOM
         while (iter1 != m_streamListeners.end()) {
             Reference< XStreamListener > aListener = *iter1;
             aListener->started();
-            iter1++;
+            ++iter1;
         }
 
         // setup libxml IO and write data to output stream
@@ -156,7 +156,7 @@ namespace DOM
         while (iter2 != m_streamListeners.end()) {
             Reference< XStreamListener > aListener = *iter2;
             aListener->closed();
-            iter2++;
+            ++iter2;
         }
 
     }
@@ -504,7 +504,7 @@ namespace DOM
             {
 
                 if (aNsPrefix.getLength() > 0)
-                    aQName = aNsPrefix + OUString::createFromAscii(":") + aQName;
+                    aQName = aNsPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM(":")) + aQName;
                 newElement = createElementNS(aNsUri, aQName);
             }
             else
@@ -524,7 +524,7 @@ namespace DOM
                     if (aAttrUri.getLength() > 0)
                     {
                         if (aAttrPrefix.getLength() > 0)
-                            aAttrName = aAttrPrefix + OUString::createFromAscii(":") + aAttrName;
+                            aAttrName = aAttrPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM(":")) + aAttrName;
                         newElement->setAttributeNS(aAttrUri, aAttrName, curAttr->getValue());
                     }
                     else
@@ -590,8 +590,8 @@ namespace DOM
         {
             Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY);
             Reference< XMutationEvent > event(docevent->createEvent(
-                OUString::createFromAscii("DOMNodeInsertedIntoDocument")), UNO_QUERY);
-            event->initMutationEvent(OUString::createFromAscii("DOMNodeInsertedIntoDocument")
+                OUString(RTL_CONSTASCII_USTRINGPARAM("DOMNodeInsertedIntoDocument"))), UNO_QUERY);
+            event->initMutationEvent(OUString(RTL_CONSTASCII_USTRINGPARAM("DOMNodeInsertedIntoDocument"))
                 , sal_True, sal_False, Reference< XNode >(),
                 OUString(), OUString(), OUString(), (AttrChangeType)0 );
             dispatchEvent(Reference< XEvent >(event, UNO_QUERY));
@@ -601,7 +601,7 @@ namespace DOM
     }
     OUString SAL_CALL CDocument::getNodeName()throw (RuntimeException)
     {
-        return OUString::createFromAscii("#document");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("#document"));
     }
     OUString SAL_CALL CDocument::getNodeValue() throw (RuntimeException)
     {
diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx
index 3f6d67d53811..1c7f3140a33e 100644
--- a/unoxml/source/dom/documentbuilder.cxx
+++ b/unoxml/source/dom/documentbuilder.cxx
@@ -297,7 +297,7 @@ namespace DOM
     // default warning handler triggers assertion
     static void warning_func(void * ctx, const char * /*msg*/, ...)
     {
-        OUStringBuffer buf(OUString::createFromAscii("libxml2 warning\n"));
+        OUStringBuffer buf(OUString(RTL_CONSTASCII_USTRINGPARAM("libxml2 warning\n")));
         buf.append(make_error_message(static_cast< xmlParserCtxtPtr >(ctx)));
         OString msg = OUStringToOString(buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US);
         OSL_ENSURE(sal_False, msg.getStr());
@@ -306,7 +306,7 @@ namespace DOM
     // default error handler triggers assertion
     static void error_func(void * ctx, const char * /*msg*/, ...)
     {
-        OUStringBuffer buf(OUString::createFromAscii("libxml2 error\n"));
+        OUStringBuffer buf(OUString(RTL_CONSTASCII_USTRINGPARAM("libxml2 error\n")));
         buf.append(make_error_message(static_cast< xmlParserCtxtPtr >(ctx)));
         OString msg = OUStringToOString(buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US);
         OSL_ENSURE(sal_False, msg.getStr());
diff --git a/unoxml/source/dom/documentfragment.cxx b/unoxml/source/dom/documentfragment.cxx
index 9e93449b001c..00c344f77bad 100644
--- a/unoxml/source/dom/documentfragment.cxx
+++ b/unoxml/source/dom/documentfragment.cxx
@@ -37,7 +37,7 @@ namespace DOM
     }
     OUString SAL_CALL CDocumentFragment::getNodeName()throw (RuntimeException)
     {
-        return OUString::createFromAscii("#document-fragment");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("#document-fragment"));
     }
     OUString SAL_CALL CDocumentFragment::getNodeValue() throw (RuntimeException)
     {
diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx
index 2c4264f07cf3..1f86e33c9185 100644
--- a/unoxml/source/dom/element.cxx
+++ b/unoxml/source/dom/element.cxx
@@ -53,7 +53,7 @@ namespace DOM
         if (!i_xHandler.is()) throw RuntimeException();
         comphelper::AttributeList *pAttrs =
             new comphelper::AttributeList();
-        OUString type = OUString::createFromAscii("");
+        OUString type = OUString();
         // add namespace definitions to attributes
         for (xmlNsPtr pNs = m_aNodePtr->nsDef; pNs != 0; pNs = pNs->next) {
             const xmlChar *pPrefix = pNs->prefix;
@@ -61,8 +61,8 @@ namespace DOM
                 strlen(reinterpret_cast<const char*>(pPrefix)),
                 RTL_TEXTENCODING_UTF8);
             OUString name = (prefix.equalsAscii(""))
-                ? OUString::createFromAscii("xmlns")
-                : OUString::createFromAscii("xmlns:") + prefix;
+                ? OUString(RTL_CONSTASCII_USTRINGPARAM("xmlns"))
+                : OUString(RTL_CONSTASCII_USTRINGPARAM("xmlns:")) + prefix;
             const xmlChar *pHref = pNs->href;
             OUString val(reinterpret_cast<const sal_Char*>(pHref),
                 strlen(reinterpret_cast<const char*>(pHref)),
@@ -463,8 +463,8 @@ namespace DOM
             // dispatch DOMAttrModified event
             Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY);
             Reference< XMutationEvent > event(docevent->createEvent(
-                OUString::createFromAscii("DOMAttrModified")), UNO_QUERY);
-            event->initMutationEvent(OUString::createFromAscii("DOMAttrModified"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("DOMAttrModified"))), UNO_QUERY);
+            event->initMutationEvent(OUString(RTL_CONSTASCII_USTRINGPARAM("DOMAttrModified")),
                 sal_True, sal_False, Reference< XNode >(aAttr, UNO_QUERY),
                 OUString(), aAttr->getValue(), aAttr->getName(), AttrChangeType_ADDITION);
             dispatchEvent(Reference< XEvent >(event, UNO_QUERY));
@@ -518,8 +518,8 @@ namespace DOM
 
             Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY);
             Reference< XMutationEvent > event(docevent->createEvent(
-                OUString::createFromAscii("DOMAttrModified")), UNO_QUERY);
-            event->initMutationEvent(OUString::createFromAscii("DOMAttrModified"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("DOMAttrModified"))), UNO_QUERY);
+            event->initMutationEvent(OUString(RTL_CONSTASCII_USTRINGPARAM("DOMAttrModified")),
                 sal_True, sal_False, Reference< XNode >(getAttributeNode(name), UNO_QUERY),
                 oldValue, value, name, aChangeType);
             dispatchEvent(Reference< XEvent >(event, UNO_QUERY));
@@ -588,8 +588,8 @@ namespace DOM
                 // dispatch DOMAttrModified event
                 Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY);
                 Reference< XMutationEvent > event(docevent->createEvent(
-                    OUString::createFromAscii("DOMAttrModified")), UNO_QUERY);
-                event->initMutationEvent(OUString::createFromAscii("DOMAttrModified"), sal_True, sal_False,
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("DOMAttrModified"))), UNO_QUERY);
+                event->initMutationEvent(OUString(RTL_CONSTASCII_USTRINGPARAM("DOMAttrModified")), sal_True, sal_False,
                     Reference< XNode >(getAttributeNodeNS(namespaceURI, OUString((char*)xLName, strlen((char*)xLName), RTL_TEXTENCODING_UTF8)), UNO_QUERY),
                     oldValue, value, qualifiedName, aChangeType);
                 dispatchEvent(Reference< XEvent >(event, UNO_QUERY));
@@ -632,7 +632,7 @@ namespace DOM
 
     void SAL_CALL CElement::setElementName(const OUString& aName) throw (RuntimeException, DOMException)
     {
-        if (aName.getLength() > 0 && aName.indexOf(OUString::createFromAscii(":")) < 0)
+        if (aName.getLength() > 0 && aName.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM(":"))) < 0)
         {
             OString oName = OUStringToOString(aName, RTL_TEXTENCODING_UTF8);
             xmlChar *xName = (xmlChar*)oName.getStr();
diff --git a/unoxml/source/dom/elementlist.cxx b/unoxml/source/dom/elementlist.cxx
index 15a870aed933..5b0d96758459 100644
--- a/unoxml/source/dom/elementlist.cxx
+++ b/unoxml/source/dom/elementlist.cxx
@@ -66,7 +66,7 @@ namespace DOM
             // get the XNode
             Reference< XNode > xNode(CNode::get(static_cast<const CNode*>(pElement)->m_aNodePtr));
             Reference< XEventTarget > xTarget(xNode, UNO_QUERY_THROW);
-            OUString aType = OUString::createFromAscii("DOMSubtreeModified");
+            OUString aType(RTL_CONSTASCII_USTRINGPARAM("DOMSubtreeModified"));
             sal_Bool capture = sal_False;
             xTarget->addEventListener(aType, Reference< XEventListener >(this), capture);
         } catch (Exception &e){
diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx
index 1c8cf054a27b..79f42b6fd1f9 100644
--- a/unoxml/source/dom/node.cxx
+++ b/unoxml/source/dom/node.cxx
@@ -466,8 +466,8 @@ namespace DOM
         {
             Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY);
             Reference< XMutationEvent > event(docevent->createEvent(
-                OUString::createFromAscii("DOMNodeInserted")), UNO_QUERY);
-            event->initMutationEvent(OUString::createFromAscii("DOMNodeInserted")
+                OUString(RTL_CONSTASCII_USTRINGPARAM("DOMNodeInserted"))), UNO_QUERY);
+            event->initMutationEvent(OUString(RTL_CONSTASCII_USTRINGPARAM("DOMNodeInserted"))
                 , sal_True, sal_False, Reference< XNode >(CNode::get(m_aNodePtr)),
                 OUString(), OUString(), OUString(), (AttrChangeType)0 );
             dispatchEvent(Reference< XEvent >(event, UNO_QUERY));
@@ -861,8 +861,8 @@ namespace DOM
         {
             Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY);
             Reference< XMutationEvent > event(docevent->createEvent(
-                OUString::createFromAscii("DOMNodeRemoved")), UNO_QUERY);
-            event->initMutationEvent(OUString::createFromAscii("DOMNodeRemoved"), sal_True,
+                OUString(RTL_CONSTASCII_USTRINGPARAM("DOMNodeRemoved"))), UNO_QUERY);
+            event->initMutationEvent(OUString(RTL_CONSTASCII_USTRINGPARAM("DOMNodeRemoved")), sal_True,
                 sal_False, Reference< XNode >(CNode::get(m_aNodePtr)),
                 OUString(), OUString(), OUString(), (AttrChangeType)0 );
             dispatchEvent(Reference< XEvent >(event, UNO_QUERY));
@@ -950,8 +950,8 @@ namespace DOM
         // target is _this_ node
         Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY);
         Reference< XMutationEvent > event(docevent->createEvent(
-            OUString::createFromAscii("DOMSubtreeModified")), UNO_QUERY);
-        event->initMutationEvent(OUString::createFromAscii("DOMSubtreeModified"), sal_True,
+            OUString(RTL_CONSTASCII_USTRINGPARAM("DOMSubtreeModified"))), UNO_QUERY);
+        event->initMutationEvent(OUString(RTL_CONSTASCII_USTRINGPARAM("DOMSubtreeModified")), sal_True,
             sal_False, Reference< XNode >(),
             OUString(), OUString(), OUString(), (AttrChangeType)0 );
         dispatchEvent(Reference< XEvent >(event, UNO_QUERY));
diff --git a/unoxml/source/dom/saxbuilder.cxx b/unoxml/source/dom/saxbuilder.cxx
index 7f64f8924334..d6d87754eb6a 100644
--- a/unoxml/source/dom/saxbuilder.cxx
+++ b/unoxml/source/dom/saxbuilder.cxx
@@ -164,7 +164,7 @@ namespace DOM
             throw SAXException();
 
         Reference< XDocumentBuilder > aBuilder(m_aServiceManager->createInstance(
-                OUString::createFromAscii("com.sun.star.xml.dom.DocumentBuilder")), UNO_QUERY_THROW);
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.dom.DocumentBuilder"))), UNO_QUERY_THROW);
         Reference< XDocument > aDocument = aBuilder->newDocument();
         m_aNodeStack.push(Reference< XNode >(aDocument, UNO_QUERY));
         m_aDocument = aDocument;
@@ -210,12 +210,12 @@ namespace DOM
             attr_qname = attribs->getNameByIndex(i);
             attr_value = attribs->getValueByIndex(i);
             // new prefix mapping
-            if (attr_qname.indexOf(OUString::createFromAscii("xmlns:")) == 0)
+            if (attr_qname.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM("xmlns:"))) == 0)
             {
                 newprefix = attr_qname.copy(attr_qname.indexOf(':')+1);
                 aNSMap.insert(NSMap::value_type(newprefix, attr_value));
             }
-            else if (attr_qname == OUString::createFromAscii("xmlns"))
+            else if (attr_qname == OUString(RTL_CONSTASCII_USTRINGPARAM("xmlns")))
             {
                 // new default prefix
                 aNSMap.insert(NSMap::value_type(OUString(), attr_value));
@@ -263,10 +263,8 @@ namespace DOM
             attr_qname = a->first;
             attr_value = a->second;
             idx = attr_qname.indexOf(':');
-            if(idx != -1)
-            {
+            if (idx != -1)
                 aPrefix = attr_qname.copy(0, idx);
-            }
             else
                 aPrefix = OUString();
 
@@ -275,11 +273,13 @@ namespace DOM
             {
                 // set attribute with namespace
                 aElement->setAttributeNS(result->second, attr_qname, attr_value);
-            } else {
+            }
+            else
+            {
                 // set attribute without namespace
                 aElement->setAttribute(attr_qname, attr_value);
-           }
-            a++;
+            }
+            ++a;
         }
         m_aNSStack.push(aNSMap);
     }
@@ -300,7 +300,7 @@ namespace DOM
         OUString aRefName;
         OUString aPrefix = aElement->getPrefix();
         if (aPrefix.getLength() > 0)
-            aRefName = aPrefix + OUString::createFromAscii(":") + aElement->getTagName();
+            aRefName = aPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM(":")) + aElement->getTagName();
         else
             aRefName = aElement->getTagName();
         if (aRefName != aName) // consistency check
diff --git a/unoxml/source/dom/text.cxx b/unoxml/source/dom/text.cxx
index a10ba9944702..520adf3b77e3 100644
--- a/unoxml/source/dom/text.cxx
+++ b/unoxml/source/dom/text.cxx
@@ -54,7 +54,7 @@ namespace DOM
 
     OUString SAL_CALL CText::getNodeName()throw (RuntimeException)
     {
-        return OUString::createFromAscii("#text");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("#text"));
     }
 
     void SAL_CALL CText::fastSaxify( Context& io_rContext )
diff --git a/unoxml/source/events/testlistener.cxx b/unoxml/source/events/testlistener.cxx
index 7c65d4ca606d..ee307fa27220 100644
--- a/unoxml/source/events/testlistener.cxx
+++ b/unoxml/source/events/testlistener.cxx
@@ -92,21 +92,21 @@ namespace DOM { namespace events
     void SAL_CALL CTestListener::initialize(const Sequence< Any >& args) throw(RuntimeException)
     {
         if (args.getLength() < 3) throw IllegalArgumentException(
-            OUString::createFromAscii("Wrong number of arguments"), Reference< XInterface >(), 0);
+            OUString(RTL_CONSTASCII_USTRINGPARAM("Wrong number of arguments")), Reference< XInterface >(), 0);
 
         Reference <XEventTarget> aTarget;
         if(! (args[0] >>= aTarget)) throw IllegalArgumentException(
-                OUString::createFromAscii("Illegal argument 1"), Reference< XInterface >(), 1);
+                OUString(RTL_CONSTASCII_USTRINGPARAM("Illegal argument 1")), Reference< XInterface >(), 1);
 
         OUString aType;
         if (! (args[1] >>= aType))
-            throw IllegalArgumentException(OUString::createFromAscii("Illegal argument 2"), Reference< XInterface >(), 2);
+            throw IllegalArgumentException(OUString(RTL_CONSTASCII_USTRINGPARAM("Illegal argument 2")), Reference< XInterface >(), 2);
 
         sal_Bool bCapture = sal_False;
         if(! (args[2]  >>=  bCapture)) throw IllegalArgumentException(
-            OUString::createFromAscii("Illegal argument 3"), Reference< XInterface >(), 3);
+            OUString(RTL_CONSTASCII_USTRINGPARAM("Illegal argument 3")), Reference< XInterface >(), 3);
 
-        if(! (args[3] >>= m_name)) m_name = OUString::createFromAscii("<unnamed listener>");
+        if(! (args[3] >>= m_name)) m_name = OUString(RTL_CONSTASCII_USTRINGPARAM("<unnamed listener>"));
 
         m_target = aTarget;
         m_type = aType;
diff --git a/unoxml/source/rdf/CBlankNode.cxx b/unoxml/source/rdf/CBlankNode.cxx
index 19f114ea7c07..62d5978b3846 100644
--- a/unoxml/source/rdf/CBlankNode.cxx
+++ b/unoxml/source/rdf/CBlankNode.cxx
@@ -101,15 +101,15 @@ void SAL_CALL CBlankNode::initialize(const css::uno::Sequence< ::com::sun::star:
 {
     if (aArguments.getLength() != 1) {
         throw css::lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii("CBlankNode::initialize: "
-                "must give exactly 1 argument"), *this, 1);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CBlankNode::initialize: "
+                "must give exactly 1 argument")), *this, 1);
     }
 
     ::rtl::OUString arg;
     if (!(aArguments[0] >>= arg)) {
         throw css::lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii("CBlankNode::initialize: "
-                "argument must be string"), *this, 0);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CBlankNode::initialize: "
+                "argument must be string")), *this, 0);
     }
 
     //FIXME: what is legal?
@@ -117,8 +117,8 @@ void SAL_CALL CBlankNode::initialize(const css::uno::Sequence< ::com::sun::star:
         m_NodeID = arg;
     } else {
         throw css::lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii("CBlankNode::initialize: "
-                "argument is not valid blank node ID"), *this, 0);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CBlankNode::initialize: "
+                "argument is not valid blank node ID")), *this, 0);
     }
 }
 
diff --git a/unoxml/source/rdf/CLiteral.cxx b/unoxml/source/rdf/CLiteral.cxx
index 08ebb0a4775c..6867d71ed1c8 100644
--- a/unoxml/source/rdf/CLiteral.cxx
+++ b/unoxml/source/rdf/CLiteral.cxx
@@ -111,23 +111,23 @@ void SAL_CALL CLiteral::initialize(const css::uno::Sequence< ::com::sun::star::u
     const sal_Int32 len( aArguments.getLength() );
     if (len < 1 || len > 2) {
             throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii("CLiteral::initialize: "
-                    "must give 1 or 2 argument(s)"), *this, 2);
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CLiteral::initialize: "
+                    "must give 1 or 2 argument(s)")), *this, 2);
     }
 
     ::rtl::OUString arg0;
     if (!(aArguments[0] >>= arg0)) {
         throw css::lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii("CLiteral::initialize: "
-                "argument must be string"), *this, 0);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CLiteral::initialize: "
+                "argument must be string")), *this, 0);
     }
     //FIXME: what is legal?
     if (true) {
         m_Value = arg0;
     } else {
         throw css::lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii("CLiteral::initialize: "
-                "argument is not valid literal value"), *this, 0);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CLiteral::initialize: "
+                "argument is not valid literal value")), *this, 0);
     }
 
     if (len > 1) {
@@ -138,21 +138,21 @@ void SAL_CALL CLiteral::initialize(const css::uno::Sequence< ::com::sun::star::u
                 m_Language = arg1;
             } else {
                 throw css::lang::IllegalArgumentException(
-                    ::rtl::OUString::createFromAscii("CLiteral::initialize: "
-                        "argument is not valid language"), *this, 1);
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CLiteral::initialize: "
+                        "argument is not valid language")), *this, 1);
             }
         } else if ((aArguments[1] >>= xURI)) {
             if (xURI.is()) {
                 m_xDatatype = xURI;
             } else {
                 throw css::lang::IllegalArgumentException(
-                    ::rtl::OUString::createFromAscii("CLiteral::initialize: "
-                        "argument is null"), *this, 1);
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CLiteral::initialize: "
+                        "argument is null")), *this, 1);
             }
         } else {
             throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii("CLiteral::initialize: "
-                    "argument must be string or URI"), *this, 1);
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CLiteral::initialize: "
+                    "argument must be string or URI")), *this, 1);
         }
     }
 }
diff --git a/unoxml/source/rdf/CURI.cxx b/unoxml/source/rdf/CURI.cxx
index 7d154876aa3a..414267ffe795 100644
--- a/unoxml/source/rdf/CURI.cxx
+++ b/unoxml/source/rdf/CURI.cxx
@@ -738,8 +738,8 @@ void SAL_CALL CURI::initFromConstant(const sal_Int16 i_Constant)
 
         default:
             throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii("CURI::initialize: "
-                    "invalid URIs constant argument"), *this, 0);
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CURI::initialize: "
+                    "invalid URIs constant argument")), *this, 0);
     }
     m_Namespace = ::rtl::OUString::createFromAscii(ns).intern();
     m_LocalName = ::rtl::OUString::createFromAscii(ln).intern();
@@ -752,8 +752,8 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence< ::com::sun::star::uno::
     sal_Int32 len = aArguments.getLength();
     if ((len < 1) || (len > 2)) {
         throw css::lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii("CURI::initialize: "
-                "must give 1 or 2 argument(s)"), *this, 2);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CURI::initialize: "
+                "must give 1 or 2 argument(s)")), *this, 2);
     }
 
     sal_Int16 arg(0);
@@ -763,22 +763,22 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence< ::com::sun::star::uno::
         // integer argument: constant from rdf::URIs
         if (len != 1) {
             throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii("CURI::initialize: "
-                    "must give 1 int argument"), *this, 1);
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CURI::initialize: "
+                    "must give 1 int argument")), *this, 1);
         }
         initFromConstant(arg);
         return;
     }
     if (!(aArguments[0] >>= arg0)) {
         throw css::lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii("CURI::initialize: "
-                "argument must be string or short"), *this, 0);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CURI::initialize: "
+                "argument must be string or short")), *this, 0);
     }
     if (len > 1) {
         if (!(aArguments[1] >>= arg1)) {
             throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii("CURI::initialize: "
-                    "argument must be string"), *this, 1);
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CURI::initialize: "
+                    "argument must be string")), *this, 1);
         }
         // just append the parameters and then split them again; seems simplest
         arg0 = arg0 + arg1;
@@ -798,8 +798,8 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence< ::com::sun::star::uno::
         }
     } else {
         throw css::lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii("CURI::initialize: "
-                "argument not splittable: no separator [#/:]"), *this, 0);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CURI::initialize: "
+                "argument not splittable: no separator [#/:]")), *this, 0);
     }
 
     //FIXME: what is legal?
@@ -807,16 +807,16 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence< ::com::sun::star::uno::
         m_Namespace = arg0;
     } else {
         throw css::lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii("CURI::initialize: "
-                "argument is not valid namespace"), *this, 0);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CURI::initialize: "
+                "argument is not valid namespace")), *this, 0);
     }
     //FIXME: what is legal?
     if (true) {
         m_LocalName = arg1;
     } else {
         throw css::lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii("CURI::initialize: "
-                "argument is not valid local name"), *this, 1);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CURI::initialize: "
+                "argument is not valid local name")), *this, 1);
     }
 }
 
diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx
index 0a3f875e1897..caf6c19dfd32 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -479,12 +479,12 @@ throw (uno::RuntimeException, container::NoSuchElementException,
 
         librdf_statement *pStmt( librdf_stream_get_object(m_pStream.get()) );
         if (!pStmt) {
-            rdf::QueryException e(::rtl::OUString::createFromAscii(
+            rdf::QueryException e(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "librdf_GraphResult::nextElement: "
-                "librdf_stream_get_object failed"), *this);
-            throw lang::WrappedTargetException(::rtl::OUString::createFromAscii(
+                "librdf_stream_get_object failed")), *this);
+            throw lang::WrappedTargetException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "librdf_GraphResult::nextElement: "
-                "librdf_stream_get_object failed"), *this,
+                "librdf_stream_get_object failed")), *this,
                     uno::makeAny(e));
         }
         // NB: pCtxt may be null here if this is result of a graph query
@@ -593,12 +593,12 @@ throw (uno::RuntimeException, container::NoSuchElementException,
         if (librdf_query_results_get_bindings(m_pQueryResult.get(), NULL,
                     pNodes.get()))
         {
-            rdf::QueryException e(::rtl::OUString::createFromAscii(
+            rdf::QueryException e(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "librdf_QuerySelectResult::nextElement: "
-                "librdf_query_results_get_bindings failed"), *this);
-            throw lang::WrappedTargetException(::rtl::OUString::createFromAscii(
+                "librdf_query_results_get_bindings failed")), *this);
+            throw lang::WrappedTargetException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "librdf_QuerySelectResult::nextElement: "
-                "librdf_query_results_get_bindings failed"), *this,
+                "librdf_query_results_get_bindings failed")), *this,
                 uno::makeAny(e));
         }
         uno::Sequence< uno::Reference< rdf::XNode > > ret(count);
@@ -717,8 +717,8 @@ throw (uno::RuntimeException,
 {
     uno::Reference< rdf::XRepository > xRep( m_wRep );
     if (!xRep.is()) {
-        throw rdf::RepositoryException(::rtl::OUString::createFromAscii(
-            "librdf_NamedGraph::clear: repository is gone"), *this);
+        throw rdf::RepositoryException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "librdf_NamedGraph::clear: repository is gone")), *this);
     }
     try {
         m_pRep->clearGraph(m_xName);
@@ -736,8 +736,8 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
 {
     uno::Reference< rdf::XRepository > xRep( m_wRep );
     if (!xRep.is()) {
-        throw rdf::RepositoryException(::rtl::OUString::createFromAscii(
-            "librdf_NamedGraph::addStatement: repository is gone"), *this);
+        throw rdf::RepositoryException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "librdf_NamedGraph::addStatement: repository is gone")), *this);
     }
     m_pRep->addStatementGraph(i_xSubject, i_xPredicate, i_xObject, m_xName);
 }
@@ -751,8 +751,8 @@ throw (uno::RuntimeException,
 {
     uno::Reference< rdf::XRepository > xRep( m_wRep );
     if (!xRep.is()) {
-        throw rdf::RepositoryException(::rtl::OUString::createFromAscii(
-            "librdf_NamedGraph::removeStatements: repository is gone"), *this);
+        throw rdf::RepositoryException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "librdf_NamedGraph::removeStatements: repository is gone")), *this);
     }
     m_pRep->removeStatementsGraph(i_xSubject, i_xPredicate, i_xObject, m_xName);
 }
@@ -767,8 +767,8 @@ throw (uno::RuntimeException,
 {
     uno::Reference< rdf::XRepository > xRep( m_wRep );
     if (!xRep.is()) {
-        throw rdf::RepositoryException(::rtl::OUString::createFromAscii(
-            "librdf_NamedGraph::getStatements: repository is gone"), *this);
+        throw rdf::RepositoryException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "librdf_NamedGraph::getStatements: repository is gone")), *this);
     }
     return m_pRep->getStatementsGraph(
             i_xSubject, i_xPredicate, i_xObject, m_xName);
@@ -849,15 +849,15 @@ throw (uno::RuntimeException)
         librdf_new_node_from_blank_identifier(m_pWorld.get(), NULL),
         safe_librdf_free_node);
     if (!pNode) {
-        throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+        throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::createBlankNode: "
-            "librdf_new_node_from_blank_identifier failed"), *this);
+            "librdf_new_node_from_blank_identifier failed")), *this);
     }
     const unsigned char * id (librdf_node_get_blank_identifier(pNode.get()));
     if (!id) {
-        throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+        throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::createBlankNode: "
-            "librdf_node_get_blank_identifier failed"), *this);
+            "librdf_node_get_blank_identifier failed")), *this);
     }
     const ::rtl::OUString nodeID(::rtl::OUString::createFromAscii(
         reinterpret_cast<const char *>(id)));
@@ -865,9 +865,9 @@ throw (uno::RuntimeException)
         return rdf::BlankNode::create(m_xContext, nodeID);
     } catch (lang::IllegalArgumentException & iae) {
         throw lang::WrappedTargetRuntimeException(
-            ::rtl::OUString::createFromAscii(
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "librdf_Repository::createBlankNode: "
-                "illegal blank node label"), *this, uno::makeAny(iae));
+                "illegal blank node label")), *this, uno::makeAny(iae));
     }
 }
 
@@ -891,44 +891,44 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
     ::osl::MutexGuard g(m_aMutex);
     if (!i_xInStream.is()) {
         throw lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii("librdf_Repository::importGraph: "
-                "stream is null"), *this, 1);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("librdf_Repository::importGraph: "
+                "stream is null")), *this, 1);
     }
     //FIXME: other formats
     if (i_Format != rdf::FileFormat::RDF_XML) {
         throw datatransfer::UnsupportedFlavorException(
-            ::rtl::OUString::createFromAscii("librdf_Repository::importGraph: "
-                "file format not supported"), *this);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("librdf_Repository::importGraph: "
+                "file format not supported")), *this);
     }
     if (!i_xGraphName.is()) {
         throw lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii("librdf_Repository::importGraph: "
-                "graph name is null"), *this, 2);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("librdf_Repository::importGraph: "
+                "graph name is null")), *this, 2);
     }
     if (i_xGraphName->getStringValue().matchAsciiL(s_nsOOo, sizeof(s_nsOOo)-1))
     {
         throw lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii("librdf_Repository::importGraph: "
-                "URI is reserved"), *this, 0);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("librdf_Repository::importGraph: "
+                "URI is reserved")), *this, 0);
     }
     if (formatNeedsBaseURI(i_Format) && !i_xBaseURI.is()) {
         throw lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii("librdf_Repository::importGraph: "
-                "base URI is null"), *this, 3);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("librdf_Repository::importGraph: "
+                "base URI is null")), *this, 3);
     }
     OSL_ENSURE(i_xBaseURI.is(), "no base uri");
     const ::rtl::OUString baseURIU( i_xBaseURI->getStringValue() );
     if (baseURIU.indexOf('#') >= 0) {
         throw lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii("librdf_Repository::importGraph: "
-                "base URI is not absolute"), *this, 3);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("librdf_Repository::importGraph: "
+                "base URI is not absolute")), *this, 3);
     }
 
     const ::rtl::OUString contextU( i_xGraphName->getStringValue() );
     if (m_NamedGraphs.find(contextU) != m_NamedGraphs.end()) {
         throw container::ElementExistException(
-            ::rtl::OUString::createFromAscii("librdf_Repository::importGraph: "
-                "graph with given URI exists"), *this);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("librdf_Repository::importGraph: "
+                "graph with given URI exists")), *this);
     }
     const ::rtl::OString context(
         ::rtl::OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) );
@@ -938,9 +938,9 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
             reinterpret_cast<const unsigned char*> (context.getStr())),
         safe_librdf_free_node);
     if (!pContext) {
-        throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+        throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::importGraph: "
-            "librdf_new_node_from_uri_string failed"), *this);
+            "librdf_new_node_from_uri_string failed")), *this);
     }
 
     const ::rtl::OString baseURI(
@@ -950,18 +950,18 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
             reinterpret_cast<const unsigned char*> (baseURI.getStr())),
         safe_librdf_free_uri);
     if (!pBaseURI) {
-        throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+        throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::importGraph: "
-            "librdf_new_uri failed"), *this);
+            "librdf_new_uri failed")), *this);
     }
 
     const boost::shared_ptr<librdf_parser> pParser(
         librdf_new_parser(m_pWorld.get(), "rdfxml", NULL, NULL),
         safe_librdf_free_parser);
     if (!pParser) {
-        throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+        throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::importGraph: "
-            "librdf_new_parser failed"), *this);
+            "librdf_new_parser failed")), *this);
     }
 
     uno::Sequence<sal_Int8> buf;
@@ -976,17 +976,17 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
             buf.getLength(), pBaseURI.get()),
         safe_librdf_free_stream);
     if (!pStream) {
-        throw rdf::ParseException(::rtl::OUString::createFromAscii(
+        throw rdf::ParseException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::importGraph: "
-            "librdf_parser_parse_counted_string_as_stream failed"), *this);
+            "librdf_parser_parse_counted_string_as_stream failed")), *this);
     }
     m_NamedGraphs.insert(std::make_pair(contextU,
         new librdf_NamedGraph(this, i_xGraphName)));
     if (librdf_model_context_add_statements(m_pModel.get(),
             pContext.get(), pStream.get())) {
-        throw rdf::RepositoryException(::rtl::OUString::createFromAscii(
+        throw rdf::RepositoryException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::importGraph: "
-            "librdf_model_context_add_statements failed"), *this);
+            "librdf_model_context_add_statements failed")), *this);
     }
     return getGraph(i_xGraphName);
 }
@@ -1004,38 +1004,38 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
     ::osl::MutexGuard g(m_aMutex);
     if (!i_xOutStream.is()) {
         throw lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii("librdf_Repository::exportGraph: "
-                "stream is null"), *this, 1);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("librdf_Repository::exportGraph: "
+                "stream is null")), *this, 1);
     }
     // FIXME: other formats
     if (i_Format != rdf::FileFormat::RDF_XML) {
         throw datatransfer::UnsupportedFlavorException(
-            ::rtl::OUString::createFromAscii("librdf_Repository::exportGraph: "
-                "file format not supported"), *this);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("librdf_Repository::exportGraph: "
+                "file format not supported")), *this);
     }
     if (!i_xGraphName.is()) {
         throw lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii("librdf_Repository::exportGraph: "
-                "graph name is null"), *this, 2);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("librdf_Repository::exportGraph: "
+                "graph name is null")), *this, 2);
     }
     if (formatNeedsBaseURI(i_Format) && !i_xBaseURI.is()) {
         throw lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii("librdf_Repository::exportGraph: "
-                "base URI is null"), *this, 3);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("librdf_Repository::exportGraph: "
+                "base URI is null")), *this, 3);
     }
     OSL_ENSURE(i_xBaseURI.is(), "no base uri");
     const ::rtl::OUString baseURIU( i_xBaseURI->getStringValue() );
     if (baseURIU.indexOf('#') >= 0) {
         throw lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii("librdf_Repository::exportGraph: "
-                "base URI is not absolute"), *this, 3);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("librdf_Repository::exportGraph: "
+                "base URI is not absolute")), *this, 3);
     }
 
     const ::rtl::OUString contextU( i_xGraphName->getStringValue() );
     if (m_NamedGraphs.find(contextU) == m_NamedGraphs.end()) {
         throw container::NoSuchElementException(
-            ::rtl::OUString::createFromAscii("librdf_Repository::exportGraph: "
-                "no graph with given URI exists"), *this);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("librdf_Repository::exportGraph: "
+                "no graph with given URI exists")), *this);
     }
     const ::rtl::OString context(
         ::rtl::OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) );
@@ -1045,9 +1045,9 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
             reinterpret_cast<const unsigned char*> (context.getStr())),
         safe_librdf_free_node);
     if (!pContext) {
-        throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+        throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::exportGraph: "
-            "librdf_new_node_from_uri_string failed"), *this);
+            "librdf_new_node_from_uri_string failed")), *this);
     }
     const ::rtl::OString baseURI(
         ::rtl::OUStringToOString(baseURIU, RTL_TEXTENCODING_UTF8) );
@@ -1056,18 +1056,18 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
             reinterpret_cast<const unsigned char*> (baseURI.getStr())),
         safe_librdf_free_uri);
     if (!pBaseURI) {
-        throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+        throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::exportGraph: "
-            "librdf_new_uri failed"), *this);
+            "librdf_new_uri failed")), *this);
     }
 
     const boost::shared_ptr<librdf_stream> pStream(
         librdf_model_context_as_stream(m_pModel.get(), pContext.get()),
         safe_librdf_free_stream);
     if (!pStream) {
-        throw rdf::RepositoryException(::rtl::OUString::createFromAscii(
+        throw rdf::RepositoryException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::exportGraph: "
-            "librdf_model_context_as_stream failed"), *this);
+            "librdf_model_context_as_stream failed")), *this);
     }
 //    const char *format("rdfxml");
     const char *format("rdfxml-abbrev");
@@ -1075,9 +1075,9 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
         librdf_new_serializer(m_pWorld.get(), format, NULL, NULL),
         safe_librdf_free_serializer);
     if (!pSerializer) {
-        throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+        throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::exportGraph: "
-            "librdf_new_serializer failed"), *this);
+            "librdf_new_serializer failed")), *this);
     }
 
     const boost::shared_ptr<librdf_uri> pRelativeURI(
@@ -1097,26 +1097,26 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
             reinterpret_cast<const unsigned char*> ("1"), NULL, 0),
         safe_librdf_free_node);
     if (!pWriteBaseURI || !pRelativeURI || !p0 || !p1) {
-        throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+        throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::exportGraph: "
-            "librdf_new_uri or librdf_new_node_from_literal failed"), *this);
+            "librdf_new_uri or librdf_new_node_from_literal failed")), *this);
     }
 
     // make URIs relative to base URI
     if (librdf_serializer_set_feature(pSerializer.get(),
         pRelativeURI.get(), p1.get()))
     {
-        throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+        throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::exportGraph: "
-            "librdf_serializer_set_feature relativeURIs failed"), *this);
+            "librdf_serializer_set_feature relativeURIs failed")), *this);
     }
     // but do not write the base URI to the file!
     if (librdf_serializer_set_feature(pSerializer.get(),
         pWriteBaseURI.get(), p0.get()))
     {
-        throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+        throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::exportGraph: "
-            "librdf_serializer_set_feature writeBaseURI failed"), *this);
+            "librdf_serializer_set_feature writeBaseURI failed")), *this);
     }
 
     size_t length;
@@ -1124,9 +1124,9 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
         librdf_serializer_serialize_stream_to_counted_string(
             pSerializer.get(), pBaseURI.get(), pStream.get(), &length), free);
     if (!pBuf) {
-        throw rdf::RepositoryException(::rtl::OUString::createFromAscii(
+        throw rdf::RepositoryException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::exportGraph: "
-            "librdf_serializer_serialize_stream_to_counted_string failed"),
+            "librdf_serializer_serialize_stream_to_counted_string failed")),
             *this);
     }
     const uno::Sequence<sal_Int8> buf(
@@ -1156,8 +1156,8 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
     ::osl::MutexGuard g(m_aMutex);
     if (!i_xGraphName.is()) {
         throw lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii("librdf_Repository::getGraph: "
-                "URI is null"), *this, 0);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("librdf_Repository::getGraph: "
+                "URI is null")), *this, 0);
     }
     const NamedGraphMap_t::iterator iter(
         m_NamedGraphs.find(i_xGraphName->getStringValue()) );
@@ -1176,14 +1176,14 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
     ::osl::MutexGuard g(m_aMutex);
     if (!i_xGraphName.is()) {
         throw lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii("librdf_Repository::createGraph: "
-                "URI is null"), *this, 0);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("librdf_Repository::createGraph: "
+                "URI is null")), *this, 0);
     }
     if (i_xGraphName->getStringValue().matchAsciiL(s_nsOOo, sizeof(s_nsOOo)-1))
     {
         throw lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii("librdf_Repository::createGraph: "
-                "URI is reserved"), *this, 0);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("librdf_Repository::createGraph: "
+                "URI is reserved")), *this, 0);
     }
 
     // NB: librdf does not have a concept of graphs as such;
@@ -1192,8 +1192,8 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
     const ::rtl::OUString contextU( i_xGraphName->getStringValue() );
     if (m_NamedGraphs.find(contextU) != m_NamedGraphs.end()) {
         throw container::ElementExistException(
-            ::rtl::OUString::createFromAscii("librdf_Repository::createGraph: "
-            "graph with given URI exists"), *this);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("librdf_Repository::createGraph: "
+            "graph with given URI exists")), *this);
     }
     m_NamedGraphs.insert(std::make_pair(contextU,
         new librdf_NamedGraph(this, i_xGraphName)));
@@ -1246,9 +1246,9 @@ throw (uno::RuntimeException, rdf::RepositoryException)
         librdf_model_find_statements(m_pModel.get(), pStatement.get()),
         safe_librdf_free_stream);
     if (!pStream) {
-        throw rdf::RepositoryException(::rtl::OUString::createFromAscii(
+        throw rdf::RepositoryException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::getStatements: "
-            "librdf_model_find_statements failed"), *this);
+            "librdf_model_find_statements failed")), *this);
     }
 
     return new librdf_GraphResult(this, m_aMutex, pStream,
@@ -1268,17 +1268,17 @@ throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException)
             reinterpret_cast<const unsigned char*> (query.getStr()), NULL),
         safe_librdf_free_query);
     if (!pQuery) {
-        throw rdf::QueryException(::rtl::OUString::createFromAscii(
+        throw rdf::QueryException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::querySelect: "
-            "librdf_new_query failed"), *this);
+            "librdf_new_query failed")), *this);
     }
     const boost::shared_ptr<librdf_query_results> pResults(
         librdf_model_query_execute(m_pModel.get(), pQuery.get()),
         safe_librdf_free_query_results);
     if (!pResults || !librdf_query_results_is_bindings(pResults.get())) {
-        throw rdf::QueryException(::rtl::OUString::createFromAscii(
+        throw rdf::QueryException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::querySelect: "
-            "query result is null or not bindings"), *this);
+            "query result is null or not bindings")), *this);
     }
 
     const int count( librdf_query_results_get_bindings_count(pResults.get()) );
@@ -1288,9 +1288,9 @@ throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException)
             const char* name( librdf_query_results_get_binding_name(
                 pResults.get(), i) );
             if (!name) {
-                throw rdf::QueryException(::rtl::OUString::createFromAscii(
+                throw rdf::QueryException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                     "librdf_Repository::querySelect: "
-                    "binding is null"), *this);
+                    "binding is null")), *this);
             }
 
             names[i] = ::rtl::OUString::createFromAscii(name);
@@ -1300,9 +1300,9 @@ throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException)
             pQuery, pResults, names);
 
     } else {
-        throw rdf::QueryException(::rtl::OUString::createFromAscii(
+        throw rdf::QueryException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::querySelect: "
-            "librdf_query_results_get_bindings_count failed"), *this);
+            "librdf_query_results_get_bindings_count failed")), *this);
     }
 }
 
@@ -1318,25 +1318,25 @@ throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException)
             reinterpret_cast<const unsigned char*> (query.getStr()), NULL),
         safe_librdf_free_query);
     if (!pQuery) {
-        throw rdf::QueryException(::rtl::OUString::createFromAscii(
+        throw rdf::QueryException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::queryConstruct: "
-            "librdf_new_query failed"), *this);
+            "librdf_new_query failed")), *this);
     }
     const boost::shared_ptr<librdf_query_results> pResults(
         librdf_model_query_execute(m_pModel.get(), pQuery.get()),
         safe_librdf_free_query_results);
     if (!pResults || !librdf_query_results_is_graph(pResults.get())) {
-        throw rdf::QueryException(::rtl::OUString::createFromAscii(
+        throw rdf::QueryException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::queryConstruct: "
-            "query result is null or not graph"), *this);
+            "query result is null or not graph")), *this);
     }
     const boost::shared_ptr<librdf_stream> pStream(
         librdf_query_results_as_stream(pResults.get()),
         safe_librdf_free_stream);
     if (!pStream) {
-        throw rdf::QueryException(::rtl::OUString::createFromAscii(
+        throw rdf::QueryException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::queryConstruct: "
-            "librdf_query_results_as_stream failed"), *this);
+            "librdf_query_results_as_stream failed")), *this);
     }
 
     return new librdf_GraphResult(this, m_aMutex, pStream,
@@ -1356,17 +1356,17 @@ throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException)
             reinterpret_cast<const unsigned char*> (query.getStr()), NULL),
         safe_librdf_free_query);
     if (!pQuery) {
-        throw rdf::QueryException(::rtl::OUString::createFromAscii(
+        throw rdf::QueryException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::queryAsk: "
-            "librdf_new_query failed"), *this);
+            "librdf_new_query failed")), *this);
     }
     const boost::shared_ptr<librdf_query_results> pResults(
         librdf_model_query_execute(m_pModel.get(), pQuery.get()),
         safe_librdf_free_query_results);
     if (!pResults || !librdf_query_results_is_boolean(pResults.get())) {
-        throw rdf::QueryException(::rtl::OUString::createFromAscii(
+        throw rdf::QueryException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::queryAsk: "
-            "query result is null or not boolean"), *this);
+            "query result is null or not boolean")), *this);
     }
     return librdf_query_results_get_boolean(pResults.get())
         ? sal_True : sal_False;
@@ -1382,37 +1382,33 @@ void SAL_CALL librdf_Repository::setStatementRDFa(
 throw (uno::RuntimeException, lang::IllegalArgumentException,
     rdf::RepositoryException)
 {
-    static const ::rtl::OUString s_cell(
-        ::rtl::OUString::createFromAscii("com.sun.star.table.Cell"));
-    static const ::rtl::OUString s_cellprops( // for writer
-        ::rtl::OUString::createFromAscii("com.sun.star.text.CellProperties"));
-    static const ::rtl::OUString s_paragraph(
-        ::rtl::OUString::createFromAscii("com.sun.star.text.Paragraph"));
-    static const ::rtl::OUString s_bookmark(
-        ::rtl::OUString::createFromAscii("com.sun.star.text.Bookmark"));
-    static const ::rtl::OUString s_meta( ::rtl::OUString::createFromAscii(
+    static const ::rtl::OUString s_cell(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.table.Cell"));
+    static const ::rtl::OUString s_cellprops(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.CellProperties")); // for writer
+    static const ::rtl::OUString s_paragraph(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Paragraph"));
+    static const ::rtl::OUString s_bookmark(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Bookmark"));
+    static const ::rtl::OUString s_meta( RTL_CONSTASCII_USTRINGPARAM(
         "com.sun.star.text.InContentMetadata"));
 
     if (!i_xSubject.is()) {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
-            "librdf_Repository::setStatementRDFa: Subject is null"), *this, 0);
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "librdf_Repository::setStatementRDFa: Subject is null")), *this, 0);
     }
     if (!i_rPredicates.getLength()) {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
-            "librdf_Repository::setStatementRDFa: no Predicates"),
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "librdf_Repository::setStatementRDFa: no Predicates")),
             *this, 1);
     }
     for (sal_Int32 i = 0; i < i_rPredicates.getLength(); ++i) {
         if (!i_rPredicates[i].is()) {
             throw lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii(
-                    "librdf_Repository::setStatementRDFa: Predicate is null"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "librdf_Repository::setStatementRDFa: Predicate is null")),
                 *this, 1);
         }
     }
     if (!i_xObject.is()) {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
-            "librdf_Repository::setStatementRDFa: Object is null"), *this, 2);
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "librdf_Repository::setStatementRDFa: Object is null")), *this, 2);
     }
     const uno::Reference<lang::XServiceInfo> xService(i_xObject,
         uno::UNO_QUERY_THROW);
@@ -1431,20 +1427,20 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
         xTextRange = xTextContent->getAnchor();
     }
     if (!xTextRange.is()) {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::setStatementRDFa: "
-            "Object does not support RDFa"), *this, 2);
+            "Object does not support RDFa")), *this, 2);
     }
     // ensure that the metadatable has an XML ID
     i_xObject->ensureMetadataReference();
     const beans::StringPair mdref( i_xObject->getMetadataReference() );
     if (mdref.First.equalsAscii("") || mdref.Second.equalsAscii("")) {
-        throw uno::RuntimeException( ::rtl::OUString::createFromAscii(
+        throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "librdf_Repository::setStatementRDFa: "
-                "ensureMetadataReference did not"), *this);
+                "ensureMetadataReference did not")), *this);
     }
     ::rtl::OUString const sXmlId(mdref.First +
-            ::rtl::OUString::createFromAscii("#") + mdref.Second);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#")) + mdref.Second);
     uno::Reference<rdf::XURI> xXmlId;
     try {
         xXmlId.set( rdf::URI::create(m_xContext,
@@ -1452,9 +1448,9 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
             uno::UNO_QUERY_THROW);
     } catch (lang::IllegalArgumentException & iae) {
         throw lang::WrappedTargetRuntimeException(
-            ::rtl::OUString::createFromAscii(
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "librdf_Repository::setStatementRDFa: "
-                "cannot create URI for XML ID"), *this, uno::makeAny(iae));
+                "cannot create URI for XML ID")), *this, uno::makeAny(iae));
     }
 
     ::osl::MutexGuard g(m_aMutex);
@@ -1473,9 +1469,9 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
         }
     } catch (lang::IllegalArgumentException & iae) {
         throw lang::WrappedTargetRuntimeException(
-            ::rtl::OUString::createFromAscii(
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "librdf_Repository::setStatementRDFa: "
-                "cannot create literal"), *this, uno::makeAny(iae));
+                "cannot create literal")), *this, uno::makeAny(iae));
     }
     removeStatementRDFa(i_xObject);
     if (i_rRDFaContent.getLength() == 0) {
@@ -1495,8 +1491,8 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
     rdf::RepositoryException)
 {
     if (!i_xElement.is()) {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
-            "librdf_Repository::removeStatementRDFa: Element is null"),
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "librdf_Repository::removeStatementRDFa: Element is null")),
             *this, 0);
     }
 
@@ -1508,14 +1504,14 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
     try {
         xXmlId.set( rdf::URI::create(m_xContext,
                 ::rtl::OUString::createFromAscii(s_nsOOo)
-                + mdref.First + ::rtl::OUString::createFromAscii("#")
+                + mdref.First + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#"))
                 + mdref.Second),
             uno::UNO_QUERY_THROW);
     } catch (lang::IllegalArgumentException & iae) {
         throw lang::WrappedTargetRuntimeException(
-            ::rtl::OUString::createFromAscii(
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "librdf_Repository::removeStatementRDFa: "
-                "cannot create URI for XML ID"), *this, uno::makeAny(iae));
+                "cannot create URI for XML ID")), *this, uno::makeAny(iae));
     }
     // clearGraph does locking, not needed here
     clearGraph(xXmlId, true);
@@ -1528,15 +1524,15 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
     rdf::RepositoryException)
 {
     if (!i_xElement.is()) {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
-            "librdf_Repository::getStatementRDFa: Element is null"), *this, 0);
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "librdf_Repository::getStatementRDFa: Element is null")), *this, 0);
     }
     const beans::StringPair mdref( i_xElement->getMetadataReference() );
     if (mdref.First.equalsAscii("") || mdref.Second.equalsAscii("")) {
         return beans::Pair< uno::Sequence<rdf::Statement>, sal_Bool >();
     }
     ::rtl::OUString const sXmlId(mdref.First +
-            ::rtl::OUString::createFromAscii("#") + mdref.Second);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#")) + mdref.Second);
     uno::Reference<rdf::XURI> xXmlId;
     try {
         xXmlId.set( rdf::URI::create(m_xContext,
@@ -1544,9 +1540,9 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
             uno::UNO_QUERY_THROW);
     } catch (lang::IllegalArgumentException & iae) {
         throw lang::WrappedTargetRuntimeException(
-            ::rtl::OUString::createFromAscii(
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "librdf_Repository::getStatementRDFa: "
-                "cannot create URI for XML ID"), *this, uno::makeAny(iae));
+                "cannot create URI for XML ID")), *this, uno::makeAny(iae));
     }
 
     ::osl::MutexGuard g(m_aMutex);
@@ -1610,16 +1606,16 @@ throw (uno::RuntimeException, rdf::RepositoryException)
         librdf_model_find_statements(m_pModel.get(), pStatement.get()),
         safe_librdf_free_stream);
     if (!pStream) {
-        throw rdf::RepositoryException(::rtl::OUString::createFromAscii(
+        throw rdf::RepositoryException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::getStatementsRDFa: "
-            "librdf_model_find_statements failed"), *this);
+            "librdf_model_find_statements failed")), *this);
     }
 
     if (librdf_stream_add_map(pStream.get(), rdfa_context_stream_map_handler,
                 0, 0)) {
-        throw rdf::RepositoryException(::rtl::OUString::createFromAscii(
+        throw rdf::RepositoryException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::getStatementsRDFa: "
-            "librdf_stream_add_map failed"), *this);
+            "librdf_stream_add_map failed")), *this);
     }
 
     return new librdf_GraphResult(this, m_aMutex, pStream,
@@ -1649,16 +1645,16 @@ const NamedGraphMap_t::iterator SAL_CALL librdf_Repository::clearGraph(
 {
     if (!i_xGraphName.is()) {
         throw lang::IllegalArgumentException(
-            ::rtl::OUString::createFromAscii("librdf_Repository::clearGraph: "
-                "URI is null"), *this, 0);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("librdf_Repository::clearGraph: "
+                "URI is null")), *this, 0);
     }
     ::osl::MutexGuard g(m_aMutex);
     const ::rtl::OUString contextU( i_xGraphName->getStringValue() );
     const NamedGraphMap_t::iterator iter( m_NamedGraphs.find(contextU) );
     if (!i_Internal && iter == m_NamedGraphs.end()) {
         throw container::NoSuchElementException(
-            ::rtl::OUString::createFromAscii("librdf_Repository::clearGraph: "
-            "no graph with given URI exists"), *this);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("librdf_Repository::clearGraph: "
+            "no graph with given URI exists")), *this);
     }
     const ::rtl::OString context(
         ::rtl::OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) );
@@ -1668,15 +1664,15 @@ const NamedGraphMap_t::iterator SAL_CALL librdf_Repository::clearGraph(
             reinterpret_cast<const unsigned char*> (context.getStr())),
         safe_librdf_free_node);
     if (!pContext) {
-        throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+        throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::clearGraph: "
-            "librdf_new_node_from_uri_string failed"), *this);
+            "librdf_new_node_from_uri_string failed")), *this);
     }
     if (librdf_model_context_remove_statements(m_pModel.get(), pContext.get()))
     {
-        throw rdf::RepositoryException(::rtl::OUString::createFromAscii(
+        throw rdf::RepositoryException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::clearGraph: "
-            "librdf_model_context_remove_statements failed"), *this);
+            "librdf_model_context_remove_statements failed")), *this);
     }
     return iter;
 }
@@ -1691,25 +1687,25 @@ void SAL_CALL librdf_Repository::addStatementGraph(
 //    container::NoSuchElementException, rdf::RepositoryException)
 {
     if (!i_xSubject.is()) {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
-            "librdf_Repository::addStatement: Subject is null"), *this, 0);
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "librdf_Repository::addStatement: Subject is null")), *this, 0);
     }
     if (!i_xPredicate.is()) {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
-            "librdf_Repository::addStatement: Predicate is null"),
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "librdf_Repository::addStatement: Predicate is null")),
             *this, 1);
     }
     if (!i_xObject.is()) {
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
-            "librdf_Repository::addStatement: Object is null"), *this, 2);
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "librdf_Repository::addStatement: Object is null")), *this, 2);
     }
 
     ::osl::MutexGuard g(m_aMutex);
     const ::rtl::OUString contextU( i_xGraphName->getStringValue() );
     if (!i_Internal && (m_NamedGraphs.find(contextU) == m_NamedGraphs.end())) {
         throw container::NoSuchElementException(
-            ::rtl::OUString::createFromAscii("librdf_Repository::addStatement: "
-            "no graph with given URI exists"), *this);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("librdf_Repository::addStatement: "
+            "no graph with given URI exists")), *this);
     }
     const ::rtl::OString context(
         ::rtl::OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) );
@@ -1719,9 +1715,9 @@ void SAL_CALL librdf_Repository::addStatementGraph(
             reinterpret_cast<const unsigned char*> (context.getStr())),
         safe_librdf_free_node);
     if (!pContext) {
-        throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+        throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::addStatement: "
-            "librdf_new_node_from_uri_string failed"), *this);
+            "librdf_new_node_from_uri_string failed")), *this);
     }
     const boost::shared_ptr<librdf_statement> pStatement(
         m_TypeConverter.mkStatement(m_pWorld.get(),
@@ -1743,9 +1739,9 @@ void SAL_CALL librdf_Repository::addStatementGraph(
 
     if (librdf_model_context_add_statement(m_pModel.get(),
             pContext.get(), pStatement.get())) {
-        throw rdf::RepositoryException(::rtl::OUString::createFromAscii(
+        throw rdf::RepositoryException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::addStatement: "
-            "librdf_model_context_add_statement failed"), *this);
+            "librdf_model_context_add_statement failed")), *this);
     }
 }
 
@@ -1768,9 +1764,9 @@ void SAL_CALL librdf_Repository::removeStatementsGraph(
     const ::rtl::OUString contextU( i_xGraphName->getStringValue() );
     if (m_NamedGraphs.find(contextU) == m_NamedGraphs.end()) {
         throw container::NoSuchElementException(
-            ::rtl::OUString::createFromAscii(
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "librdf_Repository::removeStatements: "
-                "no graph with given URI exists"), *this);
+                "no graph with given URI exists")), *this);
     }
     const ::rtl::OString context(
         ::rtl::OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) );
@@ -1780,9 +1776,9 @@ void SAL_CALL librdf_Repository::removeStatementsGraph(
             reinterpret_cast<const unsigned char*> (context.getStr())),
         safe_librdf_free_node);
     if (!pContext) {
-        throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+        throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::removeStatements: "
-            "librdf_new_node_from_uri_string failed"), *this);
+            "librdf_new_node_from_uri_string failed")), *this);
     }
     const boost::shared_ptr<librdf_statement> pStatement(
         m_TypeConverter.mkStatement(m_pWorld.get(),
@@ -1795,24 +1791,24 @@ void SAL_CALL librdf_Repository::removeStatementsGraph(
             pStatement.get(), pContext.get()),
         safe_librdf_free_stream);
     if (!pStream) {
-        throw rdf::RepositoryException(::rtl::OUString::createFromAscii(
+        throw rdf::RepositoryException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::removeStatements: "
-            "librdf_model_find_statements_in_context failed"), *this);
+            "librdf_model_find_statements_in_context failed")), *this);
     }
 
     if (!librdf_stream_end(pStream.get())) {
         do {
             librdf_statement *pStmt( librdf_stream_get_object(pStream.get()) );
             if (!pStmt) {
-                throw rdf::RepositoryException(::rtl::OUString::createFromAscii(
+                throw rdf::RepositoryException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                     "librdf_Repository::removeStatements: "
-                    "librdf_stream_get_object failed"), *this);
+                    "librdf_stream_get_object failed")), *this);
             }
             if (librdf_model_context_remove_statement(m_pModel.get(),
                     pContext.get(), pStmt)) {
-                throw rdf::RepositoryException(::rtl::OUString::createFromAscii(
+                throw rdf::RepositoryException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                     "librdf_Repository::removeStatements: "
-                    "librdf_model_context_remove_statement failed"), *this);
+                    "librdf_model_context_remove_statement failed")), *this);
             }
         } while (!librdf_stream_next(pStream.get()));
     }
@@ -1845,9 +1841,9 @@ librdf_Repository::getStatementsGraph(
     const ::rtl::OUString contextU( i_xGraphName->getStringValue() );
     if (!i_Internal && (m_NamedGraphs.find(contextU) == m_NamedGraphs.end())) {
         throw container::NoSuchElementException(
-            ::rtl::OUString::createFromAscii(
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "librdf_Repository::getStatements: "
-                "no graph with given URI exists"), *this);
+                "no graph with given URI exists")), *this);
     }
     const ::rtl::OString context(
         ::rtl::OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) );
@@ -1857,9 +1853,9 @@ librdf_Repository::getStatementsGraph(
             reinterpret_cast<const unsigned char*> (context.getStr())),
         safe_librdf_free_node);
     if (!pContext) {
-        throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+        throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::getStatements: "
-            "librdf_new_node_from_uri_string failed"), *this);
+            "librdf_new_node_from_uri_string failed")), *this);
     }
     const boost::shared_ptr<librdf_statement> pStatement(
         m_TypeConverter.mkStatement(m_pWorld.get(),
@@ -1872,9 +1868,9 @@ librdf_Repository::getStatementsGraph(
             pStatement.get(), pContext.get()),
         safe_librdf_free_stream);
     if (!pStream) {
-        throw rdf::RepositoryException(::rtl::OUString::createFromAscii(
+        throw rdf::RepositoryException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_Repository::getStatements: "
-            "librdf_model_find_statements_in_context failed"), *this);
+            "librdf_model_find_statements_in_context failed")), *this);
     }
 
     // librdf_model_find_statements_in_context is buggy and does not put
@@ -1887,8 +1883,8 @@ librdf_world *librdf_TypeConverter::createWorld() const
     // create and initialize world
     librdf_world *pWorld( librdf_new_world() );
     if (!pWorld) {
-        throw uno::RuntimeException(::rtl::OUString::createFromAscii(
-            "librdf_TypeConverter::createWorld: librdf_new_world failed"),
+        throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "librdf_TypeConverter::createWorld: librdf_new_world failed")),
             m_rRep);
     }
     //FIXME logger, digest, features?
@@ -1912,8 +1908,8 @@ librdf_TypeConverter::createStorage(librdf_world *i_pWorld) const
         librdf_new_storage(i_pWorld, "hashes", NULL,
             "contexts='yes',hash-type='memory'") );
     if (!pStorage) {
-        throw uno::RuntimeException(::rtl::OUString::createFromAscii(
-            "librdf_TypeConverter::createStorage: librdf_new_storage failed"),
+        throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "librdf_TypeConverter::createStorage: librdf_new_storage failed")),
             m_rRep);
     }
     return pStorage;
@@ -1924,8 +1920,8 @@ librdf_model *librdf_TypeConverter::createModel(
 {
     librdf_model *pRepository( librdf_new_model(i_pWorld, i_pStorage, NULL) );
     if (!pRepository) {
-        throw uno::RuntimeException(::rtl::OUString::createFromAscii(
-            "librdf_TypeConverter::createModel: librdf_new_model failed"),
+        throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "librdf_TypeConverter::createModel: librdf_new_model failed")),
             m_rRep);
     }
     //FIXME
@@ -1956,8 +1952,8 @@ librdf_uri* librdf_TypeConverter::mkURI( librdf_world* i_pWorld,
     librdf_uri *pURI( librdf_new_uri(i_pWorld,
         reinterpret_cast<const unsigned char *>(uri.getStr())));
     if (!pURI) {
-        throw uno::RuntimeException(::rtl::OUString::createFromAscii(
-            "librdf_TypeConverter::mkURI: librdf_new_uri failed"), 0);
+        throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "librdf_TypeConverter::mkURI: librdf_new_uri failed")), 0);
     }
     return pURI;
 }
@@ -1976,9 +1972,9 @@ librdf_node* librdf_TypeConverter::mkResource( librdf_world* i_pWorld,
             librdf_new_node_from_blank_identifier(i_pWorld,
                 reinterpret_cast<const unsigned char*> (label.getStr())));
         if (!pNode) {
-            throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+            throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "librdf_TypeConverter::mkResource: "
-                "librdf_new_node_from_blank_identifier failed"), 0);
+                "librdf_new_node_from_blank_identifier failed")), 0);
         }
         return pNode;
     } else { // assumption: everything else is URI
@@ -1989,9 +1985,9 @@ librdf_node* librdf_TypeConverter::mkResource( librdf_world* i_pWorld,
             librdf_new_node_from_uri_string(i_pWorld,
                 reinterpret_cast<const unsigned char*> (uri.getStr())));
         if (!pNode) {
-            throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+            throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "librdf_TypeConverter::mkResource: "
-                "librdf_new_node_from_uri_string failed"), 0);
+                "librdf_new_node_from_uri_string failed")), 0);
         }
         return pNode;
     }
@@ -2042,9 +2038,9 @@ librdf_node* librdf_TypeConverter::mkNode( librdf_world* i_pWorld,
         }
     }
     if (!ret) {
-        throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+        throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_TypeConverter::mkNode: "
-            "librdf_new_node_from_literal failed"), 0);
+            "librdf_new_node_from_literal failed")), 0);
     }
     return ret;
 }
@@ -2075,9 +2071,9 @@ librdf_statement* librdf_TypeConverter::mkStatement( librdf_world* i_pWorld,
     librdf_statement* pStatement( librdf_new_statement_from_nodes(i_pWorld,
         pSubject, pPredicate, pObject) );
     if (!pStatement) {
-        throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+        throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_TypeConverter::mkStatement: "
-            "librdf_new_statement_from_nodes failed"), 0);
+            "librdf_new_statement_from_nodes failed")), 0);
     }
     return pStatement;
 }
@@ -2088,9 +2084,9 @@ librdf_TypeConverter::convertToXURI(librdf_uri* i_pURI) const
     if (!i_pURI) return 0;
     const unsigned char* uri( librdf_uri_as_string(i_pURI) );
     if (!uri) {
-        throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+        throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_TypeConverter::convertToXURI: "
-            "librdf_uri_as_string failed"), m_rRep);
+            "librdf_uri_as_string failed")), m_rRep);
     }
     ::rtl::OUString uriU( ::rtl::OStringToOUString(
         ::rtl::OString(reinterpret_cast<const sal_Char*>(uri)),
@@ -2099,9 +2095,9 @@ librdf_TypeConverter::convertToXURI(librdf_uri* i_pURI) const
         return rdf::URI::create(m_xContext, uriU);
     } catch (lang::IllegalArgumentException & iae) {
         throw lang::WrappedTargetRuntimeException(
-            ::rtl::OUString::createFromAscii(
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "librdf_TypeConverter::convertToXURI: "
-                "illegal uri"), m_rRep, uno::makeAny(iae));
+                "illegal uri")), m_rRep, uno::makeAny(iae));
     }
 }
 
@@ -2112,9 +2108,9 @@ librdf_TypeConverter::convertToXURI(librdf_node* i_pNode) const
     if (librdf_node_is_resource(i_pNode)) {
         librdf_uri* pURI( librdf_node_get_uri(i_pNode) );
         if (!pURI) {
-            throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+            throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "librdf_TypeConverter::convertToXURI: "
-                "resource has no uri"), m_rRep);
+                "resource has no uri")), m_rRep);
         }
         return convertToXURI(pURI);
     } else {
@@ -2130,9 +2126,9 @@ librdf_TypeConverter::convertToXResource(librdf_node* i_pNode) const
     if (librdf_node_is_blank(i_pNode)) {
         const unsigned char* label( librdf_node_get_blank_identifier(i_pNode) );
         if (!label) {
-            throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+            throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "librdf_TypeConverter::convertToXResource: "
-                "blank node has no label"), m_rRep);
+                "blank node has no label")), m_rRep);
         }
         ::rtl::OUString labelU( ::rtl::OStringToOUString(
             ::rtl::OString(reinterpret_cast<const sal_Char*>(label)),
@@ -2142,9 +2138,9 @@ librdf_TypeConverter::convertToXResource(librdf_node* i_pNode) const
                 rdf::BlankNode::create(m_xContext, labelU), uno::UNO_QUERY);
         } catch (lang::IllegalArgumentException & iae) {
             throw lang::WrappedTargetRuntimeException(
-                ::rtl::OUString::createFromAscii(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                     "librdf_TypeConverter::convertToXResource: "
-                    "illegal blank node label"), m_rRep, uno::makeAny(iae));
+                    "illegal blank node label")), m_rRep, uno::makeAny(iae));
         }
     } else {
         return uno::Reference<rdf::XResource>(convertToXURI(i_pNode),
@@ -2162,9 +2158,9 @@ librdf_TypeConverter::convertToXNode(librdf_node* i_pNode) const
     }
     const unsigned char* value( librdf_node_get_literal_value(i_pNode) );
     if (!value) {
-        throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+        throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "librdf_TypeConverter::convertToXNode: "
-            "literal has no value"), m_rRep);
+            "literal has no value")), m_rRep);
     }
     const char * lang( librdf_node_get_literal_value_language(i_pNode) );
     librdf_uri* pType(
diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx
index 22307f4e52ae..a800cefc5f52 100644
--- a/unoxml/source/xpath/xpathapi.cxx
+++ b/unoxml/source/xpath/xpathapi.cxx
@@ -134,7 +134,7 @@ namespace XPath
             p = (xmlChar*)oprefix.getStr();
             u = (xmlChar*)ouri.getStr();
             xmlXPathRegisterNs(ctx, p, u);
-            i++;
+            ++i;
         }
     }
 
@@ -185,7 +185,7 @@ namespace XPath
                     reinterpret_cast<void*>(
                         sal::static_int_cast<sal_IntPtr>(aHandle.variableData)));
             }
-            i++;
+            ++i;
         }
     }
 
@@ -279,7 +279,7 @@ namespace XPath
             va_end(args);
 
             ::rtl::OUStringBuffer buf(
-                OUString::createFromAscii("libxml2 error:\n"));
+                OUString(RTL_CONSTASCII_USTRINGPARAM("libxml2 error:\n")));
             buf.appendAscii(str);
             OString msg = OUStringToOString(buf.makeStringAndClear(),
                 RTL_TEXTENCODING_ASCII_US);
@@ -290,11 +290,11 @@ namespace XPath
         {
             (void) userData;
             ::rtl::OUStringBuffer buf(
-                OUString::createFromAscii("libxml2 error:\n"));
+                OUString(RTL_CONSTASCII_USTRINGPARAM("libxml2 error:\n")));
             if (error) {
                 buf.append(make_error_message(error));
             } else {
-                buf.append(OUString::createFromAscii("no error argument!"));
+                buf.append(OUString(RTL_CONSTASCII_USTRINGPARAM("no error argument!")));
             }
             OString msg = OUStringToOString(buf.makeStringAndClear(),
                 RTL_TEXTENCODING_ASCII_US);
diff --git a/unoxml/test/domtest.cxx b/unoxml/test/domtest.cxx
index 9871846eaea5..ff44e2b9dc3e 100644
--- a/unoxml/test/domtest.cxx
+++ b/unoxml/test/domtest.cxx
@@ -311,7 +311,7 @@ struct SerializerTest : public CppUnit::TestFixture
                 CPPUNIT_ASSERT_MESSAGE(
                     "Converting ini file to URL",
                     osl_getFileURLFromSystemPath(
-                        (sBaseDir+rtl::OUString::createFromAscii("unoxml_unittest_test.ini")).pData,
+                        (sBaseDir+rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unoxml_unittest_test.ini"))).pData,
                         &aIniUrl.pData ) == osl_File_E_None );
 
                 mxCtx = ::cppu::defaultBootstrap_InitialComponentContext(aIniUrl);
diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx
index 2c043443bed6..1f8e5bd15ccf 100644
--- a/uui/source/iahndl-filter.cxx
+++ b/uui/source/iahndl-filter.cxx
@@ -116,8 +116,8 @@ handleNoSuchFilterRequest_(
     try
     {
         xFilterContainer.set( xServiceFactory->createInstance(
-                                  ::rtl::OUString::createFromAscii(
-                                      "com.sun.star.document.FilterFactory") ),
+                                  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                      "com.sun.star.document.FilterFactory")) ),
                               uno::UNO_QUERY );
     }
     catch ( uno::Exception const & )
@@ -147,8 +147,8 @@ handleNoSuchFilterRequest_(
     //            out by using DocumentService property later!
     uno::Reference< container::XEnumeration > xFilters
         = xFilterContainer->createSubSetEnumerationByQuery(
-            ::rtl::OUString::createFromAscii(
-                "_query_all:sort_prop=uiname:iflags=1:eflags=143360"));
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "_query_all:sort_prop=uiname:iflags=1:eflags=143360")));
     while (xFilters->hasMoreElements())
     {
         try
@@ -157,9 +157,9 @@ handleNoSuchFilterRequest_(
             uui::FilterNamePair             aPair;
 
             aPair.sInternal = lProps.getUnpackedValueOrDefault(
-                rtl::OUString::createFromAscii("Name"), ::rtl::OUString());
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), ::rtl::OUString());
             aPair.sUI       = lProps.getUnpackedValueOrDefault(
-                 rtl::OUString::createFromAscii("UIName"), ::rtl::OUString());
+                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIName")), ::rtl::OUString());
             if ( (!aPair.sInternal.Len()) || (!aPair.sUI.Len() ) )
             {
                continue;
@@ -224,8 +224,8 @@ handleAmbigousFilterRequest_(
     try
     {
         xFilterContainer.set( xServiceFactory->createInstance(
-            ::rtl::OUString::createFromAscii(
-                "com.sun.star.document.FilterFactory") ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.document.FilterFactory")) ),
             uno::UNO_QUERY );
     }
     catch ( uno::Exception & )
@@ -325,8 +325,8 @@ handleFilterOptionsRequest_(
     try
     {
         xFilterCFG.set( xServiceFactory->createInstance(
-                            ::rtl::OUString::createFromAscii(
-                                "com.sun.star.document.FilterFactory" ) ),
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                "com.sun.star.document.FilterFactory" )) ),
                         uno::UNO_QUERY );
     }
     catch ( uno::Exception const & )
@@ -343,7 +343,7 @@ handleFilterOptionsRequest_(
             {
                 rtl::OUString tmp = rRequest.rProperties[ind].Name;
                 if( rRequest.rProperties[ind].Name.equals(
-                        ::rtl::OUString::createFromAscii("FilterName")) )
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName"))) )
                 {
                     rRequest.rProperties[ind].Value >>= aFilterName;
                     break;
@@ -358,7 +358,7 @@ handleFilterOptionsRequest_(
                      nProperty < nPropertyCount;
                      ++nProperty )
                     if( aProps[nProperty].Name.equals(
-                            ::rtl::OUString::createFromAscii("UIComponent")) )
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIComponent"))) )
                     {
                         ::rtl::OUString aServiceName;
                         aProps[nProperty].Value >>= aServiceName;
diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index d22a2da6b7e2..9271219b6b74 100644
--- a/uui/source/iahndl-ssl.cxx
+++ b/uui/source/iahndl-ssl.cxx
@@ -83,7 +83,7 @@ isDomainMatch(
     if (hostName.equalsIgnoreAsciiCase( certHostName ))
         return true;
 
-    if ( 0 == certHostName.indexOf( rtl::OUString::createFromAscii( "*" ) ) &&
+    if ( 0 == certHostName.indexOf( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "*" )) ) &&
               hostName.getLength() >= certHostName.getLength()  )
     {
         rtl::OUString cmpStr = certHostName.copy( 1 );
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index c0a80ea4148c..5822704b4b0e 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -959,8 +959,8 @@ UUIInteractionHelper::getInteractionHandlerList(
     {
         uno::Reference< lang::XMultiServiceFactory > xConfigProv(
             m_xServiceFactory->createInstance(
-                rtl::OUString::createFromAscii(
-                    "com.sun.star.configuration.ConfigurationProvider" ) ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.configuration.ConfigurationProvider" )) ),
             uno::UNO_QUERY );
 
         if ( !xConfigProv.is() )
diff --git a/uui/source/services.cxx b/uui/source/services.cxx
index 821fdef34c02..e2c5fae546f6 100644
--- a/uui/source/services.cxx
+++ b/uui/source/services.cxx
@@ -48,9 +48,9 @@ sal_Bool writeInfo( void * pRegistryKey,
                     const OUString & rImplementationName,
                     Sequence< OUString > const & rServiceNames )
 {
-    OUString aKeyName( OUString::createFromAscii( "/" ) );
+    OUString aKeyName( OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )) );
     aKeyName += rImplementationName;
-    aKeyName += OUString::createFromAscii( "/UNO/SERVICES" );
+    aKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
 
     Reference< XRegistryKey > xKey;
     try
diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx
index ad18a51751de..3ef1b4283e19 100644
--- a/uui/source/sslwarndlg.cxx
+++ b/uui/source/sslwarndlg.cxx
@@ -49,7 +49,7 @@ IMPL_LINK( SSLWarnDialog, ViewCertHdl_Impl, PushButton *, EMPTYARG )
     uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures;
 
     xDocumentDigitalSignatures = uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >(
-                    getServiceFactory().get()->createInstance( rtl::OUString::createFromAscii( "com.sun.star.security.DocumentDigitalSignatures" )), uno::UNO_QUERY );
+                    getServiceFactory().get()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.security.DocumentDigitalSignatures" ))), uno::UNO_QUERY );
 
     xDocumentDigitalSignatures.get()->showCertificate(getCert());
 
diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx
index 3776ab413404..e540b1d7613e 100644
--- a/uui/source/unknownauthdlg.cxx
+++ b/uui/source/unknownauthdlg.cxx
@@ -56,7 +56,7 @@ IMPL_LINK( UnknownAuthDialog, ViewCertHdl_Impl, PushButton *, EMPTYARG )
     uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures;
 
     xDocumentDigitalSignatures = uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >(
-                    getServiceFactory().get()->createInstance( rtl::OUString::createFromAscii( "com.sun.star.security.DocumentDigitalSignatures" )), uno::UNO_QUERY );
+                    getServiceFactory().get()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.security.DocumentDigitalSignatures" ))), uno::UNO_QUERY );
 
     xDocumentDigitalSignatures.get()->showCertificate(getCert());
 
diff --git a/vbahelper/inc/vbahelper/vbacollectionimpl.hxx b/vbahelper/inc/vbahelper/vbacollectionimpl.hxx
index 0674ed1a7984..69020d373e3f 100644
--- a/vbahelper/inc/vbahelper/vbacollectionimpl.hxx
+++ b/vbahelper/inc/vbahelper/vbacollectionimpl.hxx
@@ -305,8 +305,8 @@ public:
             if ( ( Index1 >>= nIndex ) != sal_True )
             {
                 rtl::OUString message;
-                message = rtl::OUString::createFromAscii(
-                    "Couldn't convert index to Int32");
+                message = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "Couldn't convert index to Int32"));
                 throw  css::lang::IndexOutOfBoundsException( message,
                     css::uno::Reference< css::uno::XInterface >() );
             }
diff --git a/vbahelper/inc/vbahelper/vbapropvalue.hxx b/vbahelper/inc/vbahelper/vbapropvalue.hxx
index f48e034b0eec..70e4c3aff2a9 100644
--- a/vbahelper/inc/vbahelper/vbapropvalue.hxx
+++ b/vbahelper/inc/vbahelper/vbapropvalue.hxx
@@ -52,7 +52,7 @@ public:
     virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
     virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
 
-    rtl::OUString SAL_CALL getDefaultPropertyName() throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
+    rtl::OUString SAL_CALL getDefaultPropertyName() throw (css::uno::RuntimeException) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); }
 
 };
 #endif //SC_VBA_PROPVALULE_HXX
diff --git a/vbahelper/prj/build.lst b/vbahelper/prj/build.lst
index 20001db859c8..ded9ee23b3fc 100644
--- a/vbahelper/prj/build.lst
+++ b/vbahelper/prj/build.lst
@@ -1,4 +1,4 @@
-vba     vbahelper       :       oovbaapi basic sfx2 svx filter cppuhelper vcl comphelper svtools tools sal NULL
+vba     vbahelper       :       oovbaapi oox basic sfx2 svx filter cppuhelper vcl comphelper svtools tools sal NULL
 vba	vbahelper									usr1	-	all	  vba_mkout NULL
 #vba	vbahelper\inc								nmake	-	all	vba_inc NULL
 vba	vbahelper\source\vbahelper                        nmake	-	all	vba_vbahelper NULL
diff --git a/vbahelper/source/msforms/vbacheckbox.hxx b/vbahelper/source/msforms/vbacheckbox.hxx
index 64563cc81410..10af39e64ea3 100644
--- a/vbahelper/source/msforms/vbacheckbox.hxx
+++ b/vbahelper/source/msforms/vbacheckbox.hxx
@@ -45,7 +45,7 @@ public:
     virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
     virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
     // XDefaultProperty
-    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
+    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); }
     //XHelperInterface
     virtual rtl::OUString& getServiceImplName();
     virtual css::uno::Sequence<rtl::OUString> getServiceNames();
diff --git a/vbahelper/source/msforms/vbacombobox.hxx b/vbahelper/source/msforms/vbacombobox.hxx
index a48e56ba02b2..fa4ee10d89d4 100644
--- a/vbahelper/source/msforms/vbacombobox.hxx
+++ b/vbahelper/source/msforms/vbacombobox.hxx
@@ -69,7 +69,7 @@ public:
     virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
 
     // XDefaultProperty
-        ::rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
+        ::rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); }
     //XHelperInterface
     virtual rtl::OUString& getServiceImplName();
     virtual css::uno::Sequence<rtl::OUString> getServiceNames();
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx
index 599ef3336dcc..6b14bed48e87 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -95,7 +95,7 @@ ScVbaControl::getWindowPeer() throw (uno::RuntimeException)
     }
     catch( uno::Exception )
     {
-        throw uno::RuntimeException( rtl::OUString::createFromAscii( "The Control does not exsit" ),
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The Control does not exsit")),
                 uno::Reference< uno::XInterface >() );
     }
     return xWinPeer;
@@ -448,7 +448,7 @@ void ScVbaControl::fireEvent( script::ScriptEvent& evt )
             aEvt.Source = m_xEmptyFormControl;
             // Set up proper scriptcode
             uno::Reference< lang::XMultiServiceFactory > xDocFac(  m_xModel, uno::UNO_QUERY_THROW );
-            uno::Reference< document::XCodeNameQuery > xNameQuery(  xDocFac->createInstance( rtl::OUString::createFromAscii( "ooo.vba.VBACodeNameProvider" ) ), uno::UNO_QUERY_THROW );
+            uno::Reference< document::XCodeNameQuery > xNameQuery(  xDocFac->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo.vba.VBACodeNameProvider")) ), uno::UNO_QUERY_THROW );
             uno::Reference< uno::XInterface > xIf( xControlShape->getControl(), uno::UNO_QUERY_THROW );
             evt.ScriptCode = xNameQuery->getCodeNameForObject( xIf );
             evt.Arguments[ 0 ] = uno::makeAny( aEvt );
@@ -544,8 +544,8 @@ ScVbaControl* ScVbaControlFactory::createControl(const uno::Reference< drawing::
         case form::FormComponentType::IMAGECONTROL:
             return new ScVbaImage( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
         default:
-            throw uno::RuntimeException( rtl::OUString::createFromAscii(
-                    "Donot support this Control Type." ), uno::Reference< uno::XInterface >() );
+            throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "Donot support this Control Type." )), uno::Reference< uno::XInterface >() );
     }
 }
 
@@ -573,25 +573,30 @@ ScVbaControl* ScVbaControlFactory::createControl( const uno::Reference< awt::XCo
     else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlComboBoxModel") ) ) )
         pControl = new ScVbaComboBox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ), true );
     else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlListBoxModel") ) ) )
-    pControl = new ScVbaListBox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
+        pControl = new ScVbaListBox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
     else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedTextModel") ) ) )
-    pControl = new ScVbaLabel( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
+        pControl = new ScVbaLabel( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
     else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlImageControlModel") ) ) )
-    pControl = new ScVbaImage( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
+        pControl = new ScVbaImage( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
     else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlProgressBarModel") ) ) )
-    pControl = new ScVbaProgressBar( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
+        pControl = new ScVbaProgressBar( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
     else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlGroupBoxModel") ) ) )
-    pControl = new ScVbaFrame( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
+        pControl = new ScVbaFrame( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
     else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlScrollBarModel") ) ) )
-    pControl = new ScVbaScrollBar( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
+        pControl = new ScVbaScrollBar( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
     else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoMultiPageModel") ) ) )
-    pControl = new ScVbaMultiPage( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ), xParent );
+        pControl = new ScVbaMultiPage( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ), xParent );
+    // #FIXME implement a page control
+    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoPageModel") ) ) )
+        pControl = new ScVbaControl( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
+    else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoFrameModel") ) ) )
+        pControl = new ScVbaFrame( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
     else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlSpinButtonModel") ) ) )
-    pControl = new ScVbaSpinButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
+        pControl = new ScVbaSpinButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
     else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.custom.awt.UnoControlSystemAXContainerModel") ) ) )
-    pControl = new VbaSystemAXControl( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
+        pControl = new VbaSystemAXControl( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
     else
-        throw uno::RuntimeException( rtl::OUString::createFromAscii("Unsupported control " ), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unsupported control ")), uno::Reference< uno::XInterface >() );
     return pControl;
 }
 
diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx
index b4c2f6a6f497..75688413a57a 100644
--- a/vbahelper/source/msforms/vbacontrols.cxx
+++ b/vbahelper/source/msforms/vbacontrols.cxx
@@ -71,7 +71,19 @@ private:
             mIndices[ msNames[ nIndex ] ] = nIndex;
         }
     }
-
+    void getNestedControls( ControlVec& vControls, uno::Reference< awt::XControlContainer >& xContainer )
+    {
+        uno::Sequence< uno::Reference< awt::XControl > > aControls = xContainer->getControls();
+        const uno::Reference< awt::XControl >* pCtrl = aControls.getConstArray();
+        const uno::Reference< awt::XControl >* pCtrlsEnd = pCtrl + aControls.getLength();
+        for ( ; pCtrl < pCtrlsEnd; ++pCtrl )
+        {
+            uno::Reference< awt::XControlContainer > xC( *pCtrl, uno::UNO_QUERY );
+            vControls.push_back( *pCtrl );
+            if ( xC.is() )
+                getNestedControls( vControls, xC );
+        }
+    }
 public:
     ControlArrayWrapper( const uno::Reference< awt::XControl >& xDialog )
     {
diff --git a/vbahelper/source/msforms/vbalabel.hxx b/vbahelper/source/msforms/vbalabel.hxx
index 6adbc6e70f7b..6ee3998b52b0 100644
--- a/vbahelper/source/msforms/vbalabel.hxx
+++ b/vbahelper/source/msforms/vbalabel.hxx
@@ -51,7 +51,7 @@ public:
     virtual rtl::OUString& getServiceImplName();
     virtual css::uno::Sequence<rtl::OUString> getServiceNames();
     // XDefaultProperty
-    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
+    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); }
 };
 #endif //SC_VBA_LABEL_HXX
 
diff --git a/vbahelper/source/msforms/vbalistbox.cxx b/vbahelper/source/msforms/vbalistbox.cxx
index d830e109db52..a29c1312eecc 100644
--- a/vbahelper/source/msforms/vbalistbox.cxx
+++ b/vbahelper/source/msforms/vbalistbox.cxx
@@ -73,8 +73,8 @@ ScVbaListBox::getValue() throw (uno::RuntimeException)
     m_xProps->getPropertyValue( SELECTEDITEMS ) >>= sSelection;
     m_xProps->getPropertyValue( ITEMS ) >>= sItems;
     if( getMultiSelect() )
-        throw uno::RuntimeException( rtl::OUString::createFromAscii(
-                    "Attribute use invalid." ), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "Attribute use invalid." )), uno::Reference< uno::XInterface >() );
     uno::Any aRet;
     if ( sSelection.getLength() )
         aRet = uno::makeAny( sItems[ sSelection[ 0 ] ] );
@@ -86,8 +86,8 @@ ScVbaListBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
 {
     if( getMultiSelect() )
     {
-        throw uno::RuntimeException( rtl::OUString::createFromAscii(
-                    "Attribute use invalid." ), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "Attribute use invalid." )), uno::Reference< uno::XInterface >() );
     }
     rtl::OUString sValue = getAnyAsString( _value );
     uno::Sequence< rtl::OUString > sList;
@@ -105,8 +105,8 @@ ScVbaListBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
         }
     }
     if( nValue == -1 )
-        throw uno::RuntimeException( rtl::OUString::createFromAscii(
-                    "Attribute use invalid." ), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "Attribute use invalid." )), uno::Reference< uno::XInterface >() );
 
     uno::Sequence< sal_Int16 > nSelectedIndices(1);
     uno::Sequence< sal_Int16 > nOldSelectedIndices;
@@ -158,8 +158,8 @@ ScVbaListBox::Selected( sal_Int32 index ) throw (css::uno::RuntimeException)
     // the indices are but sal_Int16
     sal_Int16 nIndex = static_cast< sal_Int16 >( index );
     if( nIndex < 0 || nIndex >= nLength )
-        throw uno::RuntimeException( rtl::OUString::createFromAscii(
-                    "Error Number." ), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "Error Number." )), uno::Reference< uno::XInterface >() );
     m_nIndex = nIndex;
     return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( this ) ) );
 }
@@ -192,8 +192,8 @@ ScVbaListBox::setValueEvent( const uno::Any& value )
 {
     sal_Bool bValue = sal_False;
     if( !(value >>= bValue) )
-        throw uno::RuntimeException( rtl::OUString::createFromAscii(
-                    "Invalid type\n. need boolean." ), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "Invalid type\n. need boolean." )), uno::Reference< uno::XInterface >() );
     uno::Sequence< sal_Int16 > nList;
     m_xProps->getPropertyValue( SELECTEDITEMS ) >>= nList;
     sal_Int16 nLength = static_cast<sal_Int16>( nList.getLength() );
diff --git a/vbahelper/source/msforms/vbalistbox.hxx b/vbahelper/source/msforms/vbalistbox.hxx
index 72e61ec20116..972e5808a62d 100644
--- a/vbahelper/source/msforms/vbalistbox.hxx
+++ b/vbahelper/source/msforms/vbalistbox.hxx
@@ -72,7 +72,7 @@ public:
     virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
 
     // XDefaultProperty
-    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
+    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); }
 
     //XHelperInterface
     virtual rtl::OUString& getServiceImplName();
diff --git a/vbahelper/source/msforms/vbalistcontrolhelper.cxx b/vbahelper/source/msforms/vbalistcontrolhelper.cxx
index a41dfe30ce4a..696b52bfb42d 100644
--- a/vbahelper/source/msforms/vbalistcontrolhelper.cxx
+++ b/vbahelper/source/msforms/vbalistcontrolhelper.cxx
@@ -28,8 +28,8 @@ ListPropListener::ListPropListener( const uno::Reference< beans::XPropertySet >&
 void ListPropListener::setValueEvent( const uno::Any& value )
 {
     if( m_pvargIndex.hasValue() || m_pvarColumn.hasValue() )
-        throw uno::RuntimeException( rtl::OUString::createFromAscii(
-                "Bad argument" ), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "Bad argument" )), uno::Reference< uno::XInterface >() );
 
     m_xProps->setPropertyValue( ITEMS, value );
 }
@@ -45,13 +45,13 @@ uno::Any ListPropListener::getValueEvent()
         sal_Int16 nIndex = -1;
         m_pvargIndex >>= nIndex;
         if( nIndex < 0 || nIndex >= nLength )
-            throw uno::RuntimeException( rtl::OUString::createFromAscii(
-                    "Bad row Index" ), uno::Reference< uno::XInterface >() );
+            throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "Bad row Index" )), uno::Reference< uno::XInterface >() );
         aRet <<= sList[ nIndex ];
     }
     else if ( m_pvarColumn.hasValue() ) // pvarColumn on its own would be bad
-            throw uno::RuntimeException( rtl::OUString::createFromAscii(
-                    "Bad column Index" ), uno::Reference< uno::XInterface >() );
+            throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "Bad column Index" )), uno::Reference< uno::XInterface >() );
     else // List() ( e.g. no args )
     {
         uno::Sequence< uno::Sequence< rtl::OUString > > sReturnArray( nLength );
@@ -130,7 +130,7 @@ ListControlHelper::removeItem( const uno::Any& index ) throw (uno::RuntimeExcept
         uno::Sequence< rtl::OUString > sList;
         m_xProps->getPropertyValue( ITEMS ) >>= sList;
         if( nIndex < 0 || nIndex > ( sList.getLength() - 1 ) )
-            throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid index" ), uno::Reference< uno::XInterface > () );
+            throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid index")), uno::Reference< uno::XInterface > () );
         if( sList.hasElements() )
         {
             if( sList.getLength() == 1 )
diff --git a/vbahelper/source/msforms/vbamultipage.cxx b/vbahelper/source/msforms/vbamultipage.cxx
index 2d657440a7c3..ac613ccdfaca 100644
--- a/vbahelper/source/msforms/vbamultipage.cxx
+++ b/vbahelper/source/msforms/vbamultipage.cxx
@@ -29,14 +29,12 @@
 #include <ooo/vba/XCollection.hpp>
 #include "vbapages.hxx"
 #include <vector>
+#include <com/sun/star/container/XNameContainer.hpp>
 
 using namespace com::sun::star;
 using namespace ooo::vba;
 
-// uno servicename com.sun.star.awt.UnoControlProgressBarMode
-const rtl::OUString SVALUE( RTL_CONSTASCII_USTRINGPARAM("ProgressValue") );
-const rtl::OUString SVALUEMAX( RTL_CONSTASCII_USTRINGPARAM("ProgressValueMax") );
-const rtl::OUString SSTEP( RTL_CONSTASCII_USTRINGPARAM("Step") );
+const rtl::OUString SVALUE( RTL_CONSTASCII_USTRINGPARAM("MultiPageValue") );
 
 typedef cppu::WeakImplHelper1< container::XIndexAccess > PagesImpl_Base;
 class PagesImpl : public PagesImpl_Base
@@ -72,8 +70,6 @@ ScVbaMultiPage::getPages( sal_Int32 nPages )
 ScVbaMultiPage::ScVbaMultiPage( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper, const uno::Reference< uno::XInterface >& xDialog ) : MultiPageImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
 {
     mxDialogProps.set( xDialog, uno::UNO_QUERY_THROW );
-    // set dialog step to value of multipage pseudo model
-    setValue(getValue());
 }
 
 // Attributes
@@ -82,17 +78,17 @@ ScVbaMultiPage::getValue() throw (css::uno::RuntimeException)
 {
     sal_Int32 nValue = 0;
     m_xProps->getPropertyValue( SVALUE ) >>= nValue;
-    return nValue;
+    // VBA 0 based tab index
+    return nValue - 1;
 }
 
 void SAL_CALL
 ScVbaMultiPage::setValue( const sal_Int32 _value ) throw (::com::sun::star::uno::RuntimeException)
 {
-    // track change in dialog ( dialog value is 1 based, 0 is a special value )
-    sal_Int32 nVal = _value; // will be _value + 1 when cws container_controls is integrated
+    // Openoffice 1 based tab index
+    sal_Int32 nVal = _value + 1;
     sal_Int32 nOldVal = getValue();
-    m_xProps->setPropertyValue( SVALUE, uno::makeAny( _value ) );
-    mxDialogProps->setPropertyValue( SSTEP, uno::makeAny( _value + 1) );
+    m_xProps->setPropertyValue( SVALUE, uno::makeAny( nVal ) );
     if ( nVal != nOldVal )
         fireChangeEvent();
 }
@@ -108,9 +104,9 @@ ScVbaMultiPage::getServiceImplName()
 uno::Any SAL_CALL
 ScVbaMultiPage::Pages( const uno::Any& index ) throw (uno::RuntimeException)
 {
-    sal_Int32 nValue = 0;
-    m_xProps->getPropertyValue( SVALUEMAX ) >>= nValue;
-    uno::Reference< XCollection > xColl( new ScVbaPages( this, mxContext, getPages( nValue ) ) );
+    // get the container model
+    uno::Reference< container::XNameContainer > xContainer( m_xProps, uno::UNO_QUERY_THROW );
+    uno::Reference< XCollection > xColl( new ScVbaPages( this, mxContext, getPages( xContainer->getElementNames().getLength() ) ) );
     if ( !index.hasValue() )
         return uno::makeAny( xColl );
     return xColl->Item( uno::makeAny( index ), uno::Any() );
diff --git a/vbahelper/source/msforms/vbamultipage.hxx b/vbahelper/source/msforms/vbamultipage.hxx
index 756ae03b27a9..b3a16294d8f4 100644
--- a/vbahelper/source/msforms/vbamultipage.hxx
+++ b/vbahelper/source/msforms/vbamultipage.hxx
@@ -52,7 +52,7 @@ public:
     virtual rtl::OUString& getServiceImplName();
     virtual css::uno::Sequence<rtl::OUString> getServiceNames();
     // XDefaultProperty
-    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
+    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); }
 };
 #endif //SC_VBA_LABEL_HXX
 
diff --git a/vbahelper/source/msforms/vbaprogressbar.hxx b/vbahelper/source/msforms/vbaprogressbar.hxx
index 39686e6cb3d4..73c1ba776382 100644
--- a/vbahelper/source/msforms/vbaprogressbar.hxx
+++ b/vbahelper/source/msforms/vbaprogressbar.hxx
@@ -47,7 +47,7 @@ public:
     virtual rtl::OUString& getServiceImplName();
     virtual css::uno::Sequence<rtl::OUString> getServiceNames();
     // XDefaultProperty
-    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
+    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); }
 };
 #endif //SC_VBA_LABEL_HXX
 
diff --git a/vbahelper/source/msforms/vbaradiobutton.hxx b/vbahelper/source/msforms/vbaradiobutton.hxx
index 0e67b6ec0e6f..6bb0981553f4 100644
--- a/vbahelper/source/msforms/vbaradiobutton.hxx
+++ b/vbahelper/source/msforms/vbaradiobutton.hxx
@@ -47,7 +47,7 @@ public:
     virtual rtl::OUString& getServiceImplName();
     virtual css::uno::Sequence<rtl::OUString> getServiceNames();
     // XDefaultProperty
-    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
+    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); }
 
 };
 #endif //SC_VBA_RADIOBUTTON_HXX
diff --git a/vbahelper/source/msforms/vbatextbox.hxx b/vbahelper/source/msforms/vbatextbox.hxx
index 8b9788dd05cb..161926c98c92 100644
--- a/vbahelper/source/msforms/vbatextbox.hxx
+++ b/vbahelper/source/msforms/vbatextbox.hxx
@@ -49,7 +49,7 @@ public:
     virtual sal_Bool SAL_CALL getMultiline() throw (css::uno::RuntimeException);
     virtual void SAL_CALL setMultiline( sal_Bool _multiline ) throw (css::uno::RuntimeException);
     // XDefaultProperty
-    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
+    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); }
     //XHelperInterface
     virtual rtl::OUString& getServiceImplName();
     virtual css::uno::Sequence<rtl::OUString> getServiceNames();
diff --git a/vbahelper/source/msforms/vbatogglebutton.hxx b/vbahelper/source/msforms/vbatogglebutton.hxx
index a68ad464e726..7ae6daab84d7 100644
--- a/vbahelper/source/msforms/vbatogglebutton.hxx
+++ b/vbahelper/source/msforms/vbatogglebutton.hxx
@@ -51,7 +51,7 @@ public:
     virtual rtl::OUString& getServiceImplName();
     virtual css::uno::Sequence<rtl::OUString> getServiceNames();
     // XDefaultProperty
-    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
+    rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (css::uno::RuntimeException) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); }
 };
 #endif //SC_VBA_TOGGLEBUTTON_HXX
 
diff --git a/vbahelper/source/msforms/vbauserform.cxx b/vbahelper/source/msforms/vbauserform.cxx
index dadb8656e6e4..afbe84830dcc 100644
--- a/vbahelper/source/msforms/vbauserform.cxx
+++ b/vbahelper/source/msforms/vbauserform.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/awt/XControlContainer.hpp>
 #include <com/sun/star/awt/XWindow2.hpp>
 #include <com/sun/star/beans/PropertyConcept.hpp>
+#include <com/sun/star/container/XNameContainer.hpp>
 #include <basic/sbx.hxx>
 #include <basic/sbstar.hxx>
 #include <basic/sbmeth.hxx>
@@ -191,6 +192,30 @@ ScVbaUserForm::setValue( const ::rtl::OUString& aPropertyName, const uno::Any& a
     }
 }
 
+uno::Reference< awt::XControl >
+ScVbaUserForm::nestedSearch( const rtl::OUString& aPropertyName, uno::Reference< awt::XControlContainer >& xContainer )
+{
+    uno::Reference< awt::XControl > xControl = xContainer->getControl( aPropertyName );
+    if ( !xControl.is() )
+    {
+        uno::Sequence< uno::Reference< awt::XControl > > aControls = xContainer->getControls();
+        const uno::Reference< awt::XControl >* pCtrl = aControls.getConstArray();
+        const uno::Reference< awt::XControl >* pCtrlsEnd = pCtrl + aControls.getLength();
+
+        for ( ; pCtrl < pCtrlsEnd; ++pCtrl )
+        {
+            uno::Reference< awt::XControlContainer > xC( *pCtrl, uno::UNO_QUERY );
+            if ( xC.is() )
+            {
+                xControl.set( nestedSearch( aPropertyName, xC ) );
+                if ( xControl.is() )
+                    break;
+            }
+        }
+    }
+    return xControl;
+}
+
 uno::Any SAL_CALL
 ScVbaUserForm::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
@@ -201,7 +226,8 @@ ScVbaUserForm::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::Un
     {
         uno::Reference< awt::XControl > xDialogControl( m_xDialog, uno::UNO_QUERY_THROW );
         uno::Reference< awt::XControlContainer > xContainer( m_xDialog, uno::UNO_QUERY_THROW );
-        uno::Reference< awt::XControl > xControl = xContainer->getControl( aPropertyName );
+        uno::Reference< awt::XControl > xControl = nestedSearch( aPropertyName, xContainer );
+        xContainer->getControl( aPropertyName );
         ScVbaControlFactory aFac( mxContext, xControl, m_xModel );
             uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( xDialogControl->getModel() ) );
             ScVbaControl* pControl  = dynamic_cast< ScVbaControl* >( xVBAControl.get() );
@@ -235,13 +261,18 @@ ScVbaUserForm::Controls( const uno::Any& index ) throw (uno::RuntimeException)
 ScVbaUserForm::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
 {
     uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY );
+
     OSL_TRACE("ScVbaUserForm::hasProperty(%s) %d", rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), xControl.is() );
     if ( xControl.is() )
     {
-        uno::Reference< container::XNameAccess > xNameAccess( xControl->getModel(), uno::UNO_QUERY_THROW );
-        sal_Bool bRes =  xNameAccess->hasByName( aName );
-    OSL_TRACE("ScVbaUserForm::hasProperty(%s) %d ---> %d", rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), xControl.is(), bRes );
-        return bRes;
+        uno::Reference< beans::XPropertySet > xDlgProps( xControl->getModel(), uno::UNO_QUERY );
+        if ( xDlgProps.is() )
+        {
+            uno::Reference< container::XNameContainer > xAllChildren( xDlgProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AllDialogChildren")) ), uno::UNO_QUERY_THROW );
+            sal_Bool bRes =  xAllChildren->hasByName( aName );
+            OSL_TRACE("ScVbaUserForm::hasProperty(%s) %d ---> %d", rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), xAllChildren.is(), bRes );
+            return bRes;
+        }
     }
     return sal_False;
 }
diff --git a/vbahelper/source/msforms/vbauserform.hxx b/vbahelper/source/msforms/vbauserform.hxx
index 6389557b1afa..700f1017bffd 100644
--- a/vbahelper/source/msforms/vbauserform.hxx
+++ b/vbahelper/source/msforms/vbauserform.hxx
@@ -31,6 +31,7 @@
 #include <cppuhelper/implbase1.hxx>
 #include <ooo/vba/msforms/XUserForm.hpp>
 #include <com/sun/star/awt/XDialog.hpp>
+#include <com/sun/star/awt/XControlContainer.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 
 #include <vbahelper/vbahelperinterface.hxx>
@@ -49,6 +50,7 @@ protected:
 public:
     ScVbaUserForm( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ) throw ( css::lang::IllegalArgumentException );
     virtual ~ScVbaUserForm();
+    static css::uno::Reference< css::awt::XControl > nestedSearch( const rtl::OUString& aPropertyName, css::uno::Reference< css::awt::XControlContainer >& xContainer );
     virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
     virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException);
     // XUserForm
diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
index 13049c1d49be..f9907cf4b255 100644
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@@ -299,8 +299,8 @@ VbaApplicationBase::getVersion() throw (uno::RuntimeException)
 
 uno::Any SAL_CALL VbaApplicationBase::Run( const ::rtl::OUString& MacroName, const uno::Any& varg1, const uno::Any& varg2, const uno::Any& varg3, const uno::Any& varg4, const uno::Any& varg5, const uno::Any& varg6, const uno::Any& varg7, const uno::Any& varg8, const uno::Any& varg9, const uno::Any& varg10, const uno::Any& varg11, const uno::Any& varg12, const uno::Any& varg13, const uno::Any& varg14, const uno::Any& varg15, const uno::Any& varg16, const uno::Any& varg17, const uno::Any& varg18, const uno::Any& varg19, const uno::Any& varg20, const uno::Any& varg21, const uno::Any& varg22, const uno::Any& varg23, const uno::Any& varg24, const uno::Any& varg25, const uno::Any& varg26, const uno::Any& varg27, const uno::Any& varg28, const uno::Any& varg29, const uno::Any& varg30 ) throw (uno::RuntimeException)
 {
-    ::rtl::OUString sSeparator = ::rtl::OUString::createFromAscii("/");
-    ::rtl::OUString sMacroSeparator = ::rtl::OUString::createFromAscii("!");
+    ::rtl::OUString sSeparator(RTL_CONSTASCII_USTRINGPARAM("/"));
+    ::rtl::OUString sMacroSeparator(RTL_CONSTASCII_USTRINGPARAM("!"));
     ::rtl::OUString sMacro_only_Name;
     sal_Int32 Position_MacroSeparator = MacroName.indexOf(sMacroSeparator);
 
diff --git a/vbahelper/source/vbahelper/vbacolorformat.cxx b/vbahelper/source/vbahelper/vbacolorformat.cxx
index d87e1db7df1b..f50c93acbfa7 100644
--- a/vbahelper/source/vbahelper/vbacolorformat.cxx
+++ b/vbahelper/source/vbahelper/vbacolorformat.cxx
@@ -77,20 +77,20 @@ ScVbaColorFormat::getRGB() throw (uno::RuntimeException)
     switch( m_nColorFormatType )
     {
     case ColorFormatType::LINEFORMAT_FORECOLOR:
-        m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("LineColor") ) >>= nRGB;
+        m_xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineColor")) ) >>= nRGB;
         break;
     case ColorFormatType::LINEFORMAT_BACKCOLOR:
         //TODO BackColor not supported
-        // m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("Color"), uno::makeAny( nRGB ) );
+        // m_xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Color")), uno::makeAny( nRGB ) );
         break;
     case ColorFormatType::FILLFORMAT_FORECOLOR:
-        m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("FillColor") ) >>= nRGB;
+        m_xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FillColor")) ) >>= nRGB;
         break;
     case ColorFormatType::FILLFORMAT_BACKCOLOR:
         nRGB = m_nFillFormatBackColor;
         break;
     default:
-        throw uno::RuntimeException( rtl::OUString::createFromAscii("Second parameter of ColorFormat is wrong."), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second parameter of ColorFormat is wrong.")), uno::Reference< uno::XInterface >() );
     }
     nRGB = OORGBToXLRGB( nRGB );
     return nRGB;
@@ -103,13 +103,13 @@ ScVbaColorFormat::setRGB( sal_Int32 _rgb ) throw (uno::RuntimeException)
     switch( m_nColorFormatType )
     {
     case ColorFormatType::LINEFORMAT_FORECOLOR:
-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineColor" ), uno::makeAny( nRGB ) );
+        m_xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineColor")), uno::makeAny( nRGB ) );
         break;
     case ColorFormatType::LINEFORMAT_BACKCOLOR:
         // TODO BackColor not supported
         break;
     case ColorFormatType::FILLFORMAT_FORECOLOR:
-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "FillColor" ), uno::makeAny( nRGB ) );
+        m_xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FillColor")), uno::makeAny( nRGB ) );
         if( m_pFillFormat )
         {
             m_pFillFormat->setForeColorAndInternalStyle(nRGB);
@@ -123,7 +123,7 @@ ScVbaColorFormat::setRGB( sal_Int32 _rgb ) throw (uno::RuntimeException)
         }
         break;
     default:
-        throw uno::RuntimeException( rtl::OUString::createFromAscii("Second parameter of ColorFormat is wrong."), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Second parameter of ColorFormat is wrong.")), uno::Reference< uno::XInterface >() );
     }
 }
 
diff --git a/vbahelper/source/vbahelper/vbacommandbar.cxx b/vbahelper/source/vbahelper/vbacommandbar.cxx
index 94c71919a8cf..bf813ca3cb36 100644
--- a/vbahelper/source/vbahelper/vbacommandbar.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbar.cxx
@@ -47,7 +47,7 @@ ScVbaCommandBar::getName() throw ( uno::RuntimeException )
 {
     // This will get a "NULL length string" when Name is not set.
     uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
-    uno::Any aName = xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("UIName") );
+    uno::Any aName = xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIName")) );
     rtl::OUString sName;
     aName >>= sName;
     if( sName.getLength() < 1 )
@@ -78,7 +78,7 @@ void SAL_CALL
 ScVbaCommandBar::setName( const ::rtl::OUString& _name ) throw (uno::RuntimeException)
 {
     uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
-    xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("UIName"), uno::makeAny( _name ) );
+    xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIName")), uno::makeAny( _name ) );
 
     pCBarHelper->ApplyChange( m_sResourceUrl, m_xBarSettings );
 }
@@ -160,7 +160,7 @@ ScVbaCommandBar::Controls( const uno::Any& aIndex ) throw (script::BasicErrorExc
     {
         uno::Reference< frame::XLayoutManager > xLayoutManager = pCBarHelper->getLayoutManager();
         uno::Reference< beans::XPropertySet > xPropertySet( xLayoutManager->getElement( m_sResourceUrl ), uno::UNO_QUERY_THROW );
-        xMenu.set( xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("XMenuBar") ), uno::UNO_QUERY );
+        xMenu.set( xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("XMenuBar")) ), uno::UNO_QUERY );
     }
     uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, m_xBarSettings, pCBarHelper, m_xBarSettings, m_sResourceUrl, xMenu ) );
     if( aIndex.hasValue() )
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
index ebf2f33c3044..a18f81ff2e3a 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
@@ -54,7 +54,7 @@ ScVbaCommandBarControl::getCaption() throw ( uno::RuntimeException )
 {
     // "Label" always empty
     rtl::OUString sCaption;
-    getPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("Label") ) >>= sCaption;
+    getPropertyValue( m_aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")) ) >>= sCaption;
     return sCaption;
 }
 
@@ -62,7 +62,7 @@ void SAL_CALL
 ScVbaCommandBarControl::setCaption( const ::rtl::OUString& _caption ) throw (uno::RuntimeException)
 {
     rtl::OUString sCaption = _caption.replace('&','~');
-    setPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("Label"), uno::makeAny( sCaption ) );
+    setPropertyValue( m_aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")), uno::makeAny( sCaption ) );
     ApplyChange();
 }
 
@@ -70,7 +70,7 @@ ScVbaCommandBarControl::setCaption( const ::rtl::OUString& _caption ) throw (uno
 ScVbaCommandBarControl::getOnAction() throw (uno::RuntimeException)
 {
     rtl::OUString sCommandURL;
-    getPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("CommandURL") ) >>= sCommandURL;
+    getPropertyValue( m_aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CommandURL")) ) >>= sCommandURL;
     return sCommandURL;
 }
 
@@ -84,7 +84,7 @@ ScVbaCommandBarControl::setOnAction( const ::rtl::OUString& _onaction ) throw (u
     {
         rtl::OUString aCommandURL = ooo::vba::makeMacroURL( aResolvedMacro.ResolvedMacro() );
         OSL_TRACE(" ScVbaCommandBarControl::setOnAction: %s", rtl::OUStringToOString( aCommandURL, RTL_TEXTENCODING_UTF8 ).getStr() );
-        setPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("CommandURL"), uno::makeAny( aCommandURL ) );
+        setPropertyValue( m_aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CommandURL")), uno::makeAny( aCommandURL ) );
         ApplyChange();
     }
 }
@@ -93,7 +93,7 @@ ScVbaCommandBarControl::setOnAction( const ::rtl::OUString& _onaction ) throw (u
 ScVbaCommandBarControl::getVisible() throw (uno::RuntimeException)
 {
     sal_Bool bVisible = sal_True;
-    uno::Any aValue = getPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("IsVisible") );
+    uno::Any aValue = getPropertyValue( m_aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsVisible")) );
     if( aValue.hasValue() )
         aValue >>= bVisible;
     return bVisible;
@@ -101,10 +101,10 @@ ScVbaCommandBarControl::getVisible() throw (uno::RuntimeException)
 void SAL_CALL
 ScVbaCommandBarControl::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException)
 {
-    uno::Any aValue = getPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("IsVisible") );
+    uno::Any aValue = getPropertyValue( m_aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsVisible")) );
     if( aValue.hasValue() )
     {
-        setPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("IsVisible"), uno::makeAny( _visible ) );
+        setPropertyValue( m_aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsVisible")), uno::makeAny( _visible ) );
         ApplyChange();
     }
 }
@@ -175,7 +175,7 @@ ScVbaCommandBarControl::Controls( const uno::Any& aIndex ) throw (script::BasicE
 {
     // only Popup Menu has controls
     uno::Reference< container::XIndexAccess > xSubMenu;
-    getPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_CONTAINER ) ) >>= xSubMenu;
+    getPropertyValue( m_aPropertyValues, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_CONTAINER )) ) >>= xSubMenu;
     if( !xSubMenu.is() )
         throw uno::RuntimeException();
 
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
index d488ffb8992a..cfeb31007067 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
@@ -65,15 +65,15 @@ uno::Sequence< beans::PropertyValue > ScVbaCommandBarControls::CreateMenuItemDat
 {
     uno::Sequence< beans::PropertyValue > aProps(5);
 
-    aProps[0].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_COMMANDURL );
+    aProps[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_COMMANDURL ));
     aProps[0].Value <<= sCommandURL;
-    aProps[1].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_HELPURL );
+    aProps[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL ));
     aProps[1].Value <<= sHelpURL;
-    aProps[2].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_LABEL );
+    aProps[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL ));
     aProps[2].Value <<= sLabel;
-    aProps[3].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_TYPE );
+    aProps[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TYPE ));
     aProps[3].Value <<= nType;
-    aProps[4].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_CONTAINER );
+    aProps[4].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_CONTAINER ));
     aProps[4].Value = aSubMenu;
 
     return aProps;
@@ -83,19 +83,19 @@ uno::Sequence< beans::PropertyValue > ScVbaCommandBarControls::CreateToolbarItem
 {
     uno::Sequence< beans::PropertyValue > aProps(7);
 
-    aProps[0].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_COMMANDURL );
+    aProps[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_COMMANDURL ));
     aProps[0].Value <<= sCommandURL;
-    aProps[1].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_HELPURL );
+    aProps[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL ));
     aProps[1].Value <<= sHelpURL;
-    aProps[2].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_LABEL );
+    aProps[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL ));
     aProps[2].Value <<= sLabel;
-    aProps[3].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_TYPE );
+    aProps[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TYPE ));
     aProps[3].Value <<= nType;
-    aProps[4].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_CONTAINER );
+    aProps[4].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_CONTAINER ));
     aProps[4].Value = aSubMenu;
-    aProps[5].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_ISVISIBLE );
+    aProps[5].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_ISVISIBLE ));
     aProps[5].Value <<= isVisible;
-    aProps[6].Name = rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_STYLE );
+    aProps[6].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_STYLE ));
     aProps[6].Value <<= nStyle;
 
     return aProps;
@@ -122,7 +122,7 @@ ScVbaCommandBarControls::createCollectionObject( const uno::Any& aSource )
     uno::Sequence< beans::PropertyValue > aProps;
     m_xIndexAccess->getByIndex( nPosition ) >>= aProps;
     uno::Reference< container::XIndexAccess > xSubMenu;
-    getPropertyValue( aProps, rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_CONTAINER ) ) >>= xSubMenu;
+    getPropertyValue( aProps, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_CONTAINER )) ) >>= xSubMenu;
     ScVbaCommandBarControl* pNewCommandBarControl = NULL;
     if( xSubMenu.is() )
         pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition, sal_True, m_xMenu );
@@ -161,8 +161,8 @@ ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const un
 {
     // Parameter is not supported
     // the following name needs to be individually created;
-    rtl::OUString sLabel( rtl::OUString::createFromAscii("Custom") );
-    rtl::OUString sCommandUrl = rtl::OUString::createFromAscii( CUSTOM_MENU_STR ) + sLabel;
+    rtl::OUString sLabel(RTL_CONSTASCII_USTRINGPARAM("Custom"));
+    rtl::OUString sCommandUrl(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CUSTOM_MENU_STR)) + sLabel);
     sal_Int32 nType = office::MsoControlType::msoControlButton;
     sal_Int32 nPosition = 0;
     sal_Bool bTemporary = sal_True;
diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
index c8fd28fa6ba5..c6e5831b9577 100644
--- a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
@@ -41,7 +41,7 @@
 using namespace com::sun::star;
 using namespace ooo::vba;
 
-#define CREATEOUSTRING(asciistr) rtl::OUString::createFromAscii(asciistr)
+#define CREATEOUSTRING(asciistr) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(asciistr))
 
 typedef std::map< rtl::OUString, rtl::OUString > MSO2OOCommandbarMap;
 
@@ -185,7 +185,7 @@ uno::Reference< frame::XLayoutManager > VbaCommandBarHelper::getLayoutManager()
 {
     uno::Reference< frame::XFrame > xFrame( getModel()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
     uno::Reference< beans::XPropertySet > xPropertySet( xFrame, uno::UNO_QUERY_THROW );
-    uno::Reference< frame::XLayoutManager > xLayoutManager( xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("LayoutManager") ), uno::UNO_QUERY_THROW );
+    uno::Reference< frame::XLayoutManager > xLayoutManager( xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) ), uno::UNO_QUERY_THROW );
     return xLayoutManager;
 }
 
@@ -195,7 +195,7 @@ sal_Bool VbaCommandBarHelper::hasToolbar( const rtl::OUString& sResourceUrl, con
     {
         rtl::OUString sUIName;
         uno::Reference< beans::XPropertySet > xPropertySet( m_xDocCfgMgr->getSettings( sResourceUrl, sal_False ), uno::UNO_QUERY_THROW );
-        xPropertySet->getPropertyValue( rtl::OUString::createFromAscii(ITEM_DESCRIPTOR_UINAME) ) >>= sUIName;
+        xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ITEM_DESCRIPTOR_UINAME)) ) >>= sUIName;
         if( sName.equalsIgnoreAsciiCase( sUIName ) )
             return sal_True;
     }
@@ -216,7 +216,7 @@ rtl::OUString VbaCommandBarHelper::findToolbarByName( const css::uno::Reference<
     for( sal_Int32 i = 0; i < allNames.getLength(); i++ )
     {
         sResourceUrl = allNames[i];
-        if(sResourceUrl.indexOf( rtl::OUString::createFromAscii( ITEM_TOOLBAR_URL ) ) == 0 )
+        if(sResourceUrl.indexOf( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_TOOLBAR_URL )) ) == 0 )
         {
             if( hasToolbar( sResourceUrl, sName ) )
                 return sResourceUrl;
@@ -241,7 +241,7 @@ sal_Int32 VbaCommandBarHelper::findControlByName( const css::uno::Reference< css
     {
         rtl::OUString sLabel;
         xIndexAccess->getByIndex( i ) >>= aProps;
-        getPropertyValue( aProps, rtl::OUString::createFromAscii(ITEM_DESCRIPTOR_LABEL) ) >>= sLabel;
+        getPropertyValue( aProps, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ITEM_DESCRIPTOR_LABEL)) ) >>= sLabel;
         // handle the hotkey marker '~' (remove in toolbars (?), replace by '&' in menus)
         ::rtl::OUStringBuffer aBuffer;
         sal_Int32 index = sLabel.indexOf( sal_Unicode('~') );
@@ -268,8 +268,8 @@ sal_Int32 VbaCommandBarHelper::findControlByName( const css::uno::Reference< css
 
 rtl::OUString VbaCommandBarHelper::generateCustomURL()
 {
-    rtl::OUString url = rtl::OUString::createFromAscii( ITEM_TOOLBAR_URL );
-    url += rtl::OUString::createFromAscii( CUSTOM_TOOLBAR_STR );
+    rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM( ITEM_TOOLBAR_URL ));
+    url += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CUSTOM_TOOLBAR_STR ));
 
     // use a random number to minimize possible clash with existing custom toolbars
     srand( unsigned( time( NULL ) ));
diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx b/vbahelper/source/vbahelper/vbacommandbars.cxx
index b76e23002c45..6e9dbbf93435 100644
--- a/vbahelper/source/vbahelper/vbacommandbars.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbars.cxx
@@ -68,7 +68,7 @@ public:
         if( hasMoreElements() )
         {
             rtl::OUString sResourceUrl( m_sNames[ m_nCurrentPosition++ ] );
-            if( sResourceUrl.indexOf( rtl::OUString::createFromAscii("private:resource/toolbar/") ) != -1 )
+            if( sResourceUrl.indexOf( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/")) ) != -1 )
             {
                 uno::Reference< container::XIndexAccess > xCBarSetting = m_pCBarHelper->getSettings( sResourceUrl );
                 uno::Reference< XCommandBar > xCommandBar( new ScVbaCommandBar( m_xParent, m_xContext, m_pCBarHelper, xCBarSetting, sResourceUrl, sal_False, sal_False ) );
@@ -123,7 +123,7 @@ ScVbaCommandBars::createCollectionObject( const uno::Any& aSource )
             if( sBarName.equalsIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM("Worksheet Menu Bar") ) )
             {
                 // spreadsheet menu bar
-                sResourceUrl = rtl::OUString::createFromAscii( ITEM_MENUBAR_URL );
+                sResourceUrl = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_MENUBAR_URL ));
                 bMenu = sal_True;
             }
             else if( sBarName.equalsIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM("Cell") ) )
@@ -137,7 +137,7 @@ ScVbaCommandBars::createCollectionObject( const uno::Any& aSource )
             if( sBarName.equalsIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM("Menu Bar") ) )
             {
                 // text processor menu bar
-                sResourceUrl = rtl::OUString::createFromAscii( ITEM_MENUBAR_URL );
+                sResourceUrl = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_MENUBAR_URL ));
                 bMenu = sal_True;
             }
         }
@@ -203,7 +203,7 @@ ScVbaCommandBars::getCount() throw(css::uno::RuntimeException)
     uno::Sequence< ::rtl::OUString > allNames = m_xNameAccess->getElementNames();
     for( sal_Int32 i = 0; i < allNames.getLength(); i++ )
     {
-        if(allNames[i].indexOf( rtl::OUString::createFromAscii("private:resource/toolbar/") ) != -1 )
+        if(allNames[i].indexOf( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/")) ) != -1 )
         {
             nCount++;
         }
@@ -227,9 +227,9 @@ ScVbaCommandBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) th
     {
         uno::Any aSource;
         if( m_pCBarHelper->getModuleId().equalsAscii( "com.sun.star.sheet.SpreadsheetDocument" ) )
-            aSource <<= rtl::OUString::createFromAscii( "Worksheet Menu Bar" );
+            aSource <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Worksheet Menu Bar"));
         else if( m_pCBarHelper->getModuleId().equalsAscii("com.sun.star.text.TextDocument") )
-            aSource <<= rtl::OUString::createFromAscii( "Menu Bar" );
+            aSource <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Menu Bar"));
         if( aSource.hasValue() )
             return createCollectionObject( aSource );
     }
diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
index 2eb98845e90d..5353a310c2f7 100644
--- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
@@ -58,8 +58,8 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-static const rtl::OUString sSpreadsheetDocument( rtl::OUString::createFromAscii( "com.sun.star.sheet.SpreadsheetDocument" ) );
-static const rtl::OUString sTextDocument( rtl::OUString::createFromAscii( "com.sun.star.text.TextDocument" ) );
+static const rtl::OUString sSpreadsheetDocument( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument") );
+static const rtl::OUString sTextDocument( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument") );
 
 typedef  std::hash_map< rtl::OUString,
 sal_Int32, ::rtl::OUStringHash,
@@ -89,7 +89,7 @@ public:
             m_xContext->getServiceManager(), uno::UNO_QUERY_THROW );
 
         uno::Reference< frame::XDesktop > xDesktop
-            (xSMgr->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"), m_xContext), uno::UNO_QUERY_THROW );
+            (xSMgr->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")), m_xContext), uno::UNO_QUERY_THROW );
         uno::Reference< container::XEnumeration > mxComponents = xDesktop->getComponents()->createEnumeration();
         while( mxComponents->hasMoreElements() )
         {
@@ -228,7 +228,7 @@ VbaDocumentsBase::Add() throw (uno::RuntimeException)
 
      uno::Reference< frame::XComponentLoader > xLoader(
         xSMgr->createInstanceWithContext(
-            ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")),
                 mxContext), uno::UNO_QUERY_THROW );
     rtl::OUString sURL;
     if( meDocType == WORD_DOCUMENT )
@@ -274,11 +274,11 @@ VbaDocumentsBase::Open( const rtl::OUString& rFileName, const uno::Any& ReadOnly
     uno::Reference< lang::XMultiComponentFactory > xSMgr(
         mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
     uno::Reference< frame::XDesktop > xDesktop
-        (xSMgr->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")                    , mxContext),
+        (xSMgr->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"))                    , mxContext),
         uno::UNO_QUERY_THROW );
     uno::Reference< frame::XComponentLoader > xLoader(
         xSMgr->createInstanceWithContext(
-        ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")),
         mxContext),
         uno::UNO_QUERY_THROW );
 
diff --git a/vbahelper/source/vbahelper/vbafillformat.cxx b/vbahelper/source/vbahelper/vbafillformat.cxx
index 151c90911055..463860c07aa3 100644
--- a/vbahelper/source/vbahelper/vbafillformat.cxx
+++ b/vbahelper/source/vbahelper/vbafillformat.cxx
@@ -50,7 +50,7 @@ ScVbaFillFormat::setFillStyle( drawing::FillStyle nFillStyle ) throw (uno::Runti
     m_nFillStyle = nFillStyle;
     if( m_nFillStyle == drawing::FillStyle_GRADIENT )
     {
-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("FillStyle"), uno::makeAny( drawing::FillStyle_GRADIENT ) );
+        m_xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FillStyle")), uno::makeAny( drawing::FillStyle_GRADIENT ) );
         awt::Gradient aGradient;
         // AXIAL
         // RADIAL
@@ -67,11 +67,11 @@ ScVbaFillFormat::setFillStyle( drawing::FillStyle nFillStyle ) throw (uno::Runti
         aGradient.StartIntensity = 100;
         aGradient.EndIntensity = 100;
         aGradient.StepCount = 1;
-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("FillGradient"), uno::makeAny( aGradient ) );
+        m_xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FillGradient")), uno::makeAny( aGradient ) );
     }
     else if( m_nFillStyle == drawing::FillStyle_SOLID )
     {
-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("FillStyle"), uno::makeAny(drawing::FillStyle_SOLID) );
+        m_xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FillStyle")), uno::makeAny(drawing::FillStyle_SOLID) );
     }
 }
 
@@ -87,7 +87,7 @@ sal_Bool SAL_CALL
 ScVbaFillFormat::getVisible() throw (uno::RuntimeException)
 {
     drawing::FillStyle nFillStyle;
-    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("FillStyle") ) >>= nFillStyle;
+    m_xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FillStyle")) ) >>= nFillStyle;
     if( nFillStyle == drawing::FillStyle_NONE )
         return sal_False;
     return sal_True;
@@ -97,10 +97,10 @@ void SAL_CALL
 ScVbaFillFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException)
 {
     drawing::FillStyle aFillStyle;
-    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("FillStyle") ) >>= aFillStyle;
+    m_xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FillStyle")) ) >>= aFillStyle;
     if( !_visible )
     {
-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("FillStyle"), uno::makeAny( drawing::FillStyle_NONE ) );
+        m_xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FillStyle")), uno::makeAny( drawing::FillStyle_NONE ) );
     }
     else
     {
@@ -116,7 +116,7 @@ ScVbaFillFormat::getTransparency() throw (uno::RuntimeException)
 {
     sal_Int16 nTransparence = 0;
     double dTransparence = 0;
-    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "FillTransparence" ) ) >>= nTransparence;
+    m_xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FillTransparence")) ) >>= nTransparence;
     dTransparence = static_cast<double>( nTransparence );
     dTransparence /= 100;
     return dTransparence;
@@ -126,7 +126,7 @@ void SAL_CALL
 ScVbaFillFormat::setTransparency( double _transparency ) throw (uno::RuntimeException)
 {
     sal_Int16 nTransparence = static_cast< sal_Int16 >( _transparency * 100 );
-    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "FillTransparence" ), uno::makeAny( nTransparence ) );
+    m_xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FillTransparence")), uno::makeAny( nTransparence ) );
 }
 
 
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index a601d24eee02..fc3e9dc3b176 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -127,7 +127,7 @@ getIntrospectionAccess( const uno::Any& aObject ) throw (uno::RuntimeException)
     if( !xIntrospection.is() )
     {
         uno::Reference< lang::XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
-        xIntrospection.set( xFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.beans.Introspection") ), uno::UNO_QUERY_THROW );
+        xIntrospection.set( xFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.Introspection")) ), uno::UNO_QUERY_THROW );
     }
     return xIntrospection->inspect( aObject );
 }
@@ -558,7 +558,7 @@ rtl::OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeEx
                 break;
             }
         default:
-                   throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid type, can't convert" ), uno::Reference< uno::XInterface >() );
+                   throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid type, can't convert")), uno::Reference< uno::XInterface >() );
     }
     return sString;
 }
@@ -1191,7 +1191,7 @@ void UserFormGeometryHelper::setHeight( double nHeight )
     ShapeHelper::ShapeHelper( const css::uno::Reference< css::drawing::XShape >& _xShape) throw (css::script::BasicErrorException ) : xShape( _xShape )
     {
         if( !xShape.is() )
-            throw css::uno::RuntimeException( rtl::OUString::createFromAscii("No valid shape for helper"), css::uno::Reference< css::uno::XInterface >() );
+            throw css::uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No valid shape for helper")), css::uno::Reference< css::uno::XInterface >() );
     }
 
     double ShapeHelper::getHeight()
@@ -1265,7 +1265,7 @@ void UserFormGeometryHelper::setHeight( double nHeight )
     void DebugHelper::exception( const rtl::OUString&  DetailedMessage, const css::uno::Exception& ex,  int err, const rtl::OUString& /*additionalArgument*/ ) throw( css::script::BasicErrorException )
     {
         // #TODO #FIXME ( do we want to support additionalArg here )
-        throw css::script::BasicErrorException( DetailedMessage.concat( rtl::OUString::createFromAscii(" ") ).concat( ex.Message ), css::uno::Reference< css::uno::XInterface >(), err, rtl::OUString() );
+        throw css::script::BasicErrorException( DetailedMessage.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")) ).concat( ex.Message ), css::uno::Reference< css::uno::XInterface >(), err, rtl::OUString() );
     }
 
     void DebugHelper::exception( int err,  const rtl::OUString& additionalArgument ) throw( css::script::BasicErrorException )
diff --git a/vbahelper/source/vbahelper/vbalineformat.cxx b/vbahelper/source/vbahelper/vbalineformat.cxx
index 7a265170009b..d7b44c32a146 100644
--- a/vbahelper/source/vbahelper/vbalineformat.cxx
+++ b/vbahelper/source/vbahelper/vbalineformat.cxx
@@ -54,39 +54,39 @@ sal_Int32
 ScVbaLineFormat::convertLineStartEndNameToArrowheadStyle( rtl::OUString sLineName )
 {
     sal_Int32 nLineType = office::MsoArrowheadStyle::msoArrowheadNone;
-    if (sLineName.equals(rtl::OUString::createFromAscii("Small Arrow")) ||
-        sLineName.equals(rtl::OUString::createFromAscii("Arrow")) ||
-        sLineName.equals(rtl::OUString::createFromAscii("msArrowEnd")) ||
-        sLineName.equals(rtl::OUString::createFromAscii("Double Arrow")))
+    if (sLineName.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Small Arrow"))) ||
+        sLineName.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Arrow"))) ||
+        sLineName.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("msArrowEnd"))) ||
+        sLineName.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Double Arrow"))))
     {
         // msoArrowheadTriangle
         nLineType = office::MsoArrowheadStyle::msoArrowheadTriangle;
     }
-    else if (sLineName.equals(rtl::OUString::createFromAscii("Square 45")) ||
-             sLineName.equals(rtl::OUString::createFromAscii("Square")) ||
-             sLineName.equals(rtl::OUString::createFromAscii("msArrowDiamondEnd")))
+    else if (sLineName.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Square 45"))) ||
+             sLineName.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Square"))) ||
+             sLineName.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("msArrowDiamondEnd"))))
     {
         // msoArrowheadDiamond
         nLineType = office::MsoArrowheadStyle::msoArrowheadDiamond;
     }
-    else if (sLineName.equals(rtl::OUString::createFromAscii("Circle")) ||
-             sLineName.equals(rtl::OUString::createFromAscii("msArrowOvalEnd")) ||
-             sLineName.equals(rtl::OUString::createFromAscii("Dimension Lines")) )
+    else if (sLineName.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Circle"))) ||
+             sLineName.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("msArrowOvalEnd"))) ||
+             sLineName.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Dimension Lines"))) )
     {
         // msoArrowheadOval
         nLineType = office::MsoArrowheadStyle::msoArrowheadOval;
     }
-    else if (sLineName.equals(rtl::OUString::createFromAscii("Arrow concave")) ||
-             sLineName.equals(rtl::OUString::createFromAscii("msArrowStealthEnd")))
+    else if (sLineName.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Arrow concave"))) ||
+             sLineName.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("msArrowStealthEnd"))))
     {
         // msoArrowheadStealth
         nLineType = office::MsoArrowheadStyle::msoArrowheadStealth;
     }
-    else if (sLineName.equals(rtl::OUString::createFromAscii("Rounded short Arrow")) ||
-             sLineName.equals(rtl::OUString::createFromAscii("Rounded large Arrow")) ||
-             sLineName.equals(rtl::OUString::createFromAscii("Symmetric Arrow")) ||
-             sLineName.equals(rtl::OUString::createFromAscii("msArrowOpenEnd")) ||
-             sLineName.equals(rtl::OUString::createFromAscii("Line Arrow")))
+    else if (sLineName.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Rounded short Arrow"))) ||
+             sLineName.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Rounded large Arrow"))) ||
+             sLineName.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Symmetric Arrow"))) ||
+             sLineName.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("msArrowOpenEnd"))) ||
+             sLineName.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Line Arrow"))))
     {
         // msoArrowheadOpen
         nLineType = office::MsoArrowheadStyle::msoArrowheadOpen;
@@ -105,19 +105,19 @@ ScVbaLineFormat::convertArrowheadStyleToLineStartEndName( sal_Int32 nArrowheadSt
     switch( nArrowheadStyle )
     {
         case office::MsoArrowheadStyle::msoArrowheadNone:
-            return rtl::OUString(rtl::OUString::createFromAscii( "" ) );
+            return rtl::OUString();
         case office::MsoArrowheadStyle::msoArrowheadStealth:
-            return rtl::OUString::createFromAscii( "Arrow concave" );
+            return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Arrow concave"));
         case office::MsoArrowheadStyle::msoArrowheadOpen:
-            return rtl::OUString::createFromAscii("Line Arrow" );
+            return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Line Arrow"));
         case office::MsoArrowheadStyle::msoArrowheadOval:
-            return  rtl::OUString::createFromAscii("Circle" );
+            return  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Circle"));
         case office::MsoArrowheadStyle::msoArrowheadDiamond:
-            return rtl::OUString::createFromAscii( "Square 45" );
+            return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Square 45"));
         case office::MsoArrowheadStyle::msoArrowheadTriangle:
-            return rtl::OUString::createFromAscii( "Arrow" );
+            return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Arrow"));
         default:
-            throw uno::RuntimeException( rtl::OUString::createFromAscii("Invalid Arrow Style!"), uno::Reference< uno::XInterface >() );
+            throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid Arrow Style!")), uno::Reference< uno::XInterface >() );
     }
 }
 
@@ -127,10 +127,10 @@ ScVbaLineFormat::getBeginArrowheadStyle() throw (uno::RuntimeException)
 {
     sal_Int32 nLineType = office::MsoArrowheadStyle::msoArrowheadNone;
     rtl::OUString sLineName;
-    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineStartName" ) ) >>= sLineName;
-    if( ( sLineName.getLength() > 7 ) && ( sLineName.indexOf( rtl::OUString::createFromAscii( "msArray" ) ) ) != -1 )
+    m_xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineStartName")) ) >>= sLineName;
+    if( ( sLineName.getLength() > 7 ) && ( sLineName.indexOf( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("msArray")) ) ) != -1 )
     {
-        sal_Int32 nIndex = sLineName.indexOf( rtl::OUString::createFromAscii(" ") );
+        sal_Int32 nIndex = sLineName.indexOf( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")) );
         rtl::OUString sName = sLineName.copy( 0, nIndex );
         //sal_Int32 nSize = sLineName.copy( nIndex + 1 ).toInt32();
         nLineType = convertLineStartEndNameToArrowheadStyle( sName );
@@ -146,31 +146,31 @@ void SAL_CALL
 ScVbaLineFormat::setBeginArrowheadStyle( sal_Int32 _beginarrowheadstyle ) throw (uno::RuntimeException)
 {
     rtl::OUString sArrayName = convertArrowheadStyleToLineStartEndName( _beginarrowheadstyle );
-    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineStartName" ), uno::makeAny( sArrayName ) );
+    m_xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineStartName")), uno::makeAny( sArrayName ) );
 }
 
 sal_Int32 SAL_CALL
 ScVbaLineFormat::getBeginArrowheadLength() throw (uno::RuntimeException)
 {
-    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
+    throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Property 'EndArrowheadWidth' is not supported.")), uno::Reference< uno::XInterface >() );
 }
 
 void SAL_CALL
 ScVbaLineFormat::setBeginArrowheadLength( sal_Int32 /*_beginarrowheadlength*/ ) throw (uno::RuntimeException)
 {
-    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
+    throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Property 'EndArrowheadWidth' is not supported.")), uno::Reference< uno::XInterface >() );
 }
 
 sal_Int32 SAL_CALL
 ScVbaLineFormat::getBeginArrowheadWidth() throw (uno::RuntimeException)
 {
-    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
+    throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Property 'EndArrowheadWidth' is not supported.")), uno::Reference< uno::XInterface >() );
 }
 
 void SAL_CALL
 ScVbaLineFormat::setBeginArrowheadWidth( sal_Int32 /*_beginarrowheadwidth*/ ) throw (uno::RuntimeException)
 {
-    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
+    throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Property 'EndArrowheadWidth' is not supported.")), uno::Reference< uno::XInterface >() );
 }
 
 sal_Int32 SAL_CALL
@@ -187,32 +187,32 @@ ScVbaLineFormat::setEndArrowheadStylel( sal_Int32 /*_endarrowheadstylel*/ ) thro
 sal_Int32 SAL_CALL
 ScVbaLineFormat::getEndArrowheadLength() throw (uno::RuntimeException)
 {
-    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
+    throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Property 'EndArrowheadWidth' is not supported.")), uno::Reference< uno::XInterface >() );
 }
 
 void SAL_CALL
 ScVbaLineFormat::setEndArrowheadLength( sal_Int32 /*_endarrowheadlength*/ ) throw (uno::RuntimeException)
 {
-    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
+    throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Property 'EndArrowheadWidth' is not supported.")), uno::Reference< uno::XInterface >() );
 }
 
 sal_Int32 SAL_CALL
 ScVbaLineFormat::getEndArrowheadWidth() throw (uno::RuntimeException)
 {
-    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
+    throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Property 'EndArrowheadWidth' is not supported.")), uno::Reference< uno::XInterface >() );
 }
 
 void SAL_CALL
 ScVbaLineFormat::setEndArrowheadWidth( sal_Int32 /*_endarrowheadwidth*/ ) throw (uno::RuntimeException)
 {
-    throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() );
+    throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Property 'EndArrowheadWidth' is not supported.")), uno::Reference< uno::XInterface >() );
 }
 
 double SAL_CALL
 ScVbaLineFormat::getWeight() throw (uno::RuntimeException)
 {
     sal_Int32 nLineWidth=0;
-    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineWidth") ) >>= nLineWidth;
+    m_xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineWidth")) ) >>= nLineWidth;
     double dLineWidth = Millimeter::getInPoints( nLineWidth );
     return dLineWidth;
 }
@@ -221,7 +221,7 @@ void SAL_CALL
 ScVbaLineFormat::setWeight( double _weight ) throw (uno::RuntimeException)
 {
     if( _weight < 0 )
-        throw uno::RuntimeException( rtl::OUString::createFromAscii("Parameter: Must be positv."), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Parameter: Must be positive.")), uno::Reference< uno::XInterface >() );
     if( _weight == 0 )
         _weight = 0.5;
     m_nLineWeight = _weight;
@@ -229,7 +229,7 @@ ScVbaLineFormat::setWeight( double _weight ) throw (uno::RuntimeException)
     aMillimeter.setInPoints( _weight );
 
     sal_Int32 nLineWidth = static_cast<sal_Int32>( aMillimeter.getInHundredthsOfOneMillimeter() );
-    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineWidth" ), uno::makeAny( nLineWidth ) );
+    m_xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineWidth")), uno::makeAny( nLineWidth ) );
     setDashStyle( m_nLineDashStyle );
 }
 
@@ -237,7 +237,7 @@ sal_Bool SAL_CALL
 ScVbaLineFormat::getVisible() throw (uno::RuntimeException)
 {
     drawing::LineStyle aLineStyle;
-    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ) ) >>= aLineStyle;
+    m_xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineStyle")) ) >>= aLineStyle;
     if( aLineStyle == drawing::LineStyle_NONE )
     {
         return sal_False;
@@ -249,11 +249,11 @@ void SAL_CALL
 ScVbaLineFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException)
 {
     drawing::LineStyle aLineStyle;
-    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ) ) >>= aLineStyle;
+    m_xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineStyle")) ) >>= aLineStyle;
     if( !_visible )
     {
         aLineStyle = drawing::LineStyle_NONE;
-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ), uno::makeAny( aLineStyle ) );
+        m_xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineStyle")), uno::makeAny( aLineStyle ) );
     }
     else
     {
@@ -268,7 +268,7 @@ double SAL_CALL
 ScVbaLineFormat::getTransparency() throw (uno::RuntimeException)
 {
     sal_Int16 nTransparency = 0;
-    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineTransparence" ) ) >>= nTransparency;
+    m_xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineTransparence")) ) >>= nTransparency;
     double fTransparency = static_cast<double>( nTransparency );
     return fTransparency / 100;
 }
@@ -277,7 +277,7 @@ void SAL_CALL
 ScVbaLineFormat::setTransparency( double _transparency ) throw (uno::RuntimeException)
 {
     sal_Int16 nTransparency = static_cast<sal_Int16>( _transparency * 100 );
-    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineTransparence" ), uno::makeAny( nTransparency ) );
+    m_xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineTransparence")), uno::makeAny( nTransparency ) );
 }
 
 sal_Int16 SAL_CALL
@@ -302,13 +302,13 @@ ScVbaLineFormat::getDashStyle() throw (uno::RuntimeException)
 {
     drawing::LineStyle eLineStyle;
     //LineStyle integer in Xray
-    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ) ) >>= eLineStyle;
+    m_xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineStyle")) ) >>= eLineStyle;
     if( eLineStyle == drawing::LineStyle_SOLID )
         m_nLineDashStyle = office::MsoLineDashStyle::msoLineSolid;
     else
     {
         drawing::LineDash aLineDash;
-        m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "LineDash" ) ) >>= aLineDash;
+        m_xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineDash")) ) >>= aLineDash;
         if( aLineDash.Dots == 0 )
         {
             //LineDash
@@ -354,11 +354,11 @@ ScVbaLineFormat::setDashStyle( sal_Int32 _dashstyle ) throw (uno::RuntimeExcepti
     m_nLineDashStyle = _dashstyle;
     if( _dashstyle == office::MsoLineDashStyle::msoLineSolid )
     {
-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ), uno::makeAny( drawing::LineStyle_SOLID  ));
+        m_xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineStyle")), uno::makeAny( drawing::LineStyle_SOLID  ));
     }
     else
     {
-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ), uno::makeAny( drawing::LineStyle_DASH ) );
+        m_xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineStyle")), uno::makeAny( drawing::LineStyle_DASH ) );
         drawing::LineDash  pLineDash;
         Millimeter aMillimeter( m_nLineWeight );
         sal_Int32 nPixel = static_cast< sal_Int32 >( aMillimeter.getInHundredthsOfOneMillimeter() );
@@ -414,9 +414,9 @@ ScVbaLineFormat::setDashStyle( sal_Int32 _dashstyle ) throw (uno::RuntimeExcepti
             pLineDash.Distance = nPixel;
             break;
         default:
-            throw uno::RuntimeException( rtl::OUString::createFromAscii("this MsoLineDashStyle is not supported."), uno::Reference< uno::XInterface >() );
+            throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("this MsoLineDashStyle is not supported.")), uno::Reference< uno::XInterface >() );
         }
-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineDash" ), uno::makeAny( pLineDash ) );
+        m_xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineDash")), uno::makeAny( pLineDash ) );
     }
 }
 
diff --git a/vbahelper/source/vbahelper/vbapictureformat.cxx b/vbahelper/source/vbahelper/vbapictureformat.cxx
index 0574a6cf3180..26d4424e427b 100644
--- a/vbahelper/source/vbahelper/vbapictureformat.cxx
+++ b/vbahelper/source/vbahelper/vbapictureformat.cxx
@@ -43,11 +43,11 @@ ScVbaPictureFormat::checkParameterRangeInDouble( double nRange, double nMin, dou
 {
     if( nRange < nMin )
     {
-        throw uno::RuntimeException( rtl::OUString::createFromAscii("Parameter out of range, value is too small.") , uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Parameter out of range, value is too small.")) , uno::Reference< uno::XInterface >() );
     }
     if( nRange > nMax )
     {
-        throw uno::RuntimeException( rtl::OUString::createFromAscii("Parameter out of range, value is too high.") , uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Parameter out of range, value is too high.")) , uno::Reference< uno::XInterface >() );
     }
 }
 
@@ -56,7 +56,7 @@ double SAL_CALL
 ScVbaPictureFormat::getBrightness() throw (uno::RuntimeException)
 {
     sal_Int16 nLuminance = 0;
-    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("AdjustLuminance") ) >>= nLuminance;
+    m_xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AdjustLuminance")) ) >>= nLuminance;
     double fBrightness = static_cast< double >( nLuminance );
     fBrightness = ( fBrightness +100 ) / 200;
     return fBrightness;
@@ -68,14 +68,14 @@ ScVbaPictureFormat::setBrightness( double _brightness ) throw (uno::RuntimeExcep
     checkParameterRangeInDouble( _brightness, 0.0, 1.0 );
     double fLuminance = _brightness * 200 - 100;
     sal_Int16 nLuminance = static_cast< sal_Int16 >( fLuminance );
-    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("AdjustLuminance"), uno::makeAny( nLuminance ) );
+    m_xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AdjustLuminance")), uno::makeAny( nLuminance ) );
 }
 
 double SAL_CALL
 ScVbaPictureFormat::getContrast() throw (uno::RuntimeException)
 {
     sal_Int16 nContrast = 0;
-    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("AdjustContrast") ) >>= nContrast;
+    m_xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AdjustContrast")) ) >>= nContrast;
     double fContrast = static_cast< double >( nContrast );
     fContrast = ( fContrast + 100 ) / 200;
     return fContrast;
@@ -87,7 +87,7 @@ ScVbaPictureFormat::setContrast( double _contrast ) throw (uno::RuntimeException
     checkParameterRangeInDouble( _contrast, 0.0, 1.0 );
     double fContrast = _contrast * 200 - 100;
     sal_Int16 nContrast = static_cast< sal_Int16 >( fContrast );
-    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("AdjustContrast"), uno::makeAny( nContrast ) );
+    m_xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AdjustContrast")), uno::makeAny( nContrast ) );
 }
 
 
diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx
index 7eafdfde1b39..ca368e447118 100644
--- a/vbahelper/source/vbahelper/vbashape.cxx
+++ b/vbahelper/source/vbahelper/vbashape.cxx
@@ -142,22 +142,22 @@ ScVbaShape::getType( const css::uno::Reference< drawing::XShape > xShape ) throw
     sShapeType = xShapeDescriptor->getShapeType();
     OSL_TRACE("ScVbaShape::getType: %s", rtl::OUStringToOString( sShapeType, RTL_TEXTENCODING_UTF8 ).getStr() );
     // office::MsoShapeType::msoDiagram to "com.sun.star.drawing.GroupShape"
-    if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.GroupShape" ) ) )
+    if( sShapeType.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GroupShape")) ) )
         return office::MsoShapeType::msoGroup;
-    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.GraphicObjectShape" ) ) )
+    else if( sShapeType.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GraphicObjectShape")) ) )
         return office::MsoShapeType::msoPicture;
-    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.ControlShape" ) ) ||
-            sShapeType.equals( rtl::OUString::createFromAscii( "FrameShape" ) ) )
+    else if( sShapeType.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape")) ) ||
+            sShapeType.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameShape")) ) )
         return office::MsoShapeType::msoOLEControlObject;
     // OOo don't support office::MsoShapeType::msoComment as a Shape.
-    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.OLE2Shape" ) ) )
+    else if( sShapeType.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OLE2Shape")) ) )
         return office::MsoShapeType::msoChart;
     // Art characters office::MsoShapeType::msoTextEffect, in OOo corresponding to "com.sun.star.drawing.CustomShape"
-    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.ConnectorShape" ) ) )
+    else if( sShapeType.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ConnectorShape")) ) )
     {
         enum drawing::ConnectorType connectorType;
         uno::Reference< beans::XPropertySet > xPropertySet( xShape, uno::UNO_QUERY_THROW );
-        xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("EdgeKind")) >>= connectorType;
+        xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EdgeKind"))) >>= connectorType;
         if( connectorType == drawing::ConnectorType_CURVE )
             return office::MsoShapeType::msoFreeform;
         else if( connectorType == drawing::ConnectorType_LINE )
@@ -165,15 +165,15 @@ ScVbaShape::getType( const css::uno::Reference< drawing::XShape > xShape ) throw
         else
             return office::MsoShapeType::msoAutoShape;
     }
-    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.LineShape" ) ) )
+    else if( sShapeType.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.LineShape")) ) )
         return office::MsoShapeType::msoLine;
-    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.CustomShape" ) ) ||
-            sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.RectangleShape") ) )
+    else if( sShapeType.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CustomShape")) ) ||
+            sShapeType.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.RectangleShape")) ) )
         return office::MsoShapeType::msoAutoShape;
-    else if( sShapeType.equals( rtl::OUString::createFromAscii( "com.sun.star.drawing.TextShape" ) ) )
+    else if( sShapeType.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.TextShape")) ) )
         return office::MsoShapeType::msoTextBox;
     else
-        throw uno::RuntimeException( rtl::OUString::createFromAscii( "the shape type do not be supported: " ) + sShapeType, uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("the shape type do not be supported: ")) + sShapeType, uno::Reference< uno::XInterface >() );
 }
 
 // Attributes
@@ -246,7 +246,7 @@ ScVbaShape::setLeft( double _left ) throw (uno::RuntimeException)
     {
         sal_Int32 nLeft = 0;
         nLeft = Millimeter::getInHundredthsOfOneMillimeter( _left );
-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "HoriOrientPosition" ), uno::makeAny( nLeft ) );
+        m_xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HoriOrientPosition")), uno::makeAny( nLeft ) );
     }
 }
 
@@ -278,7 +278,7 @@ ScVbaShape::setTop( double _top ) throw (uno::RuntimeException)
     {
         sal_Int32 nTop = 0;
         nTop = Millimeter::getInHundredthsOfOneMillimeter( _top );
-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "VertOrientPosition" ), uno::makeAny( nTop ) );
+        m_xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VertOrientPosition")), uno::makeAny( nTop ) );
     }
 }
 
@@ -299,7 +299,7 @@ sal_Int32 SAL_CALL
 ScVbaShape::getZOrderPosition() throw (uno::RuntimeException)
 {
     sal_Int32 nZOrderPosition = 0;
-    uno::Any aZOrderPosition =  m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ) );
+    uno::Any aZOrderPosition =  m_xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZOrder")) );
     aZOrderPosition >>= nZOrderPosition;
     return nZOrderPosition + 1;
 }
@@ -315,7 +315,7 @@ ScVbaShape::getRotation() throw (uno::RuntimeException)
 {
     double dRotation = 0;
     sal_Int32 nRotation = 0;
-    m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "RotateAngle" ) ) >>= nRotation;
+    m_xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RotateAngle")) ) >>= nRotation;
     dRotation = static_cast< double >( nRotation /100 );
     return dRotation;
 }
@@ -324,7 +324,7 @@ void SAL_CALL
 ScVbaShape::setRotation( double _rotation ) throw (uno::RuntimeException)
 {
     sal_Int32 nRotation = static_cast < sal_Int32 > ( _rotation * 100 );
-    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "RotateAngle" ), uno::makeAny( nRotation ) );
+    m_xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RotateAngle")), uno::makeAny( nRotation ) );
 }
 
 uno::Reference< msforms::XLineFormat > SAL_CALL
@@ -375,33 +375,33 @@ void SAL_CALL
 ScVbaShape::ZOrder( sal_Int32 ZOrderCmd ) throw (uno::RuntimeException)
 {
     sal_Int32 nOrderPositon;
-    uno::Any aOrderPostion = m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ) );
+    uno::Any aOrderPostion = m_xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZOrder")) );
     aOrderPostion >>= nOrderPositon;
     switch( ZOrderCmd )
     {
     case office::MsoZOrderCmd::msoBringToFront:
-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ), uno::makeAny( SAL_MAX_INT32 ) );
+        m_xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZOrder")), uno::makeAny( SAL_MAX_INT32 ) );
         break;
     case office::MsoZOrderCmd::msoSendToBack:
-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ), uno::makeAny( (sal_Int32)0 ) );
+        m_xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZOrder")), uno::makeAny( (sal_Int32)0 ) );
         break;
     case office::MsoZOrderCmd::msoBringForward:
         nOrderPositon += 1;
-        m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ), uno::makeAny( nOrderPositon ) );
+        m_xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZOrder")), uno::makeAny( nOrderPositon ) );
         break;
     case office::MsoZOrderCmd::msoSendBackward:
         if( nOrderPositon > 0 )
         {
             nOrderPositon -= 1;
-            m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "ZOrder" ), uno::makeAny( nOrderPositon ) );
+            m_xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZOrder")), uno::makeAny( nOrderPositon ) );
         }
         break;
     // below two commands use with Writer for text and image object.
     case office::MsoZOrderCmd::msoBringInFrontOfText:
     case office::MsoZOrderCmd::msoSendBehindText:
-        throw uno::RuntimeException( rtl::OUString::createFromAscii( "This ZOrderCmd is not implemented, it is use with writer." ), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("This ZOrderCmd is not implemented, it is use with writer.")), uno::Reference< uno::XInterface >() );
     default:
-        throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid Parameter." ), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid Parameter.")), uno::Reference< uno::XInterface >() );
     }
 }
 
@@ -454,7 +454,7 @@ ScVbaShape::ScaleHeight( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal
     }
     else
     {
-        throw uno::RuntimeException( rtl::OUString::createFromAscii( "ScaleHeight.Scale wrong value is given." ) , uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScaleHeight.Scale wrong value is given.")) , uno::Reference< uno::XInterface >() );
     }
 }
 
@@ -483,7 +483,7 @@ ScVbaShape::ScaleWidth( double Factor, sal_Bool /*RelativeToOriginalSize*/, sal_
     }
     else
     {
-        throw uno::RuntimeException( rtl::OUString::createFromAscii( "ScaleHeight.Scale wrong value is given." ) , uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScaleHeight.Scale wrong value is given.")) , uno::Reference< uno::XInterface >() );
     }
 }
 
diff --git a/vbahelper/source/vbahelper/vbashaperange.cxx b/vbahelper/source/vbahelper/vbashaperange.cxx
index e58b8c87a0a3..44f2845d36d4 100644
--- a/vbahelper/source/vbahelper/vbashaperange.cxx
+++ b/vbahelper/source/vbahelper/vbashaperange.cxx
@@ -83,7 +83,7 @@ ScVbaShapeRange::getShapes() throw (uno::RuntimeException)
     if ( !m_xShapes.is() )
     {
         uno::Reference< lang::XMultiServiceFactory > xMSF( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
-        m_xShapes.set( xMSF->createInstance( rtl::OUString::createFromAscii( "com.sun.star.drawing.ShapeCollection" ) ), uno::UNO_QUERY_THROW );
+        m_xShapes.set( xMSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ShapeCollection")) ), uno::UNO_QUERY_THROW );
         sal_Int32 nLen = m_xIndexAccess->getCount();
         for ( sal_Int32 index = 0; index < nLen; ++index )
             m_xShapes->add( uno::Reference< drawing::XShape >( m_xIndexAccess->getByIndex( index ), uno::UNO_QUERY_THROW ) );
diff --git a/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx
index a748906d4b78..761d8de625f3 100644
--- a/vbahelper/source/vbahelper/vbashapes.cxx
+++ b/vbahelper/source/vbahelper/vbashapes.cxx
@@ -236,7 +236,7 @@ ScVbaShapes::createShape( rtl::OUString service ) throw (css::uno::RuntimeExcept
 uno::Any
 ScVbaShapes::AddRectangle( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, uno::Any aRange ) throw (css::uno::RuntimeException)
 {
-    rtl::OUString sCreateShapeName( rtl::OUString::createFromAscii( "com.sun.star.drawing.RectangleShape" ) );
+    rtl::OUString sCreateShapeName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.RectangleShape")) );
     sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( startX );
     sal_Int32 nYPos = Millimeter::getInHundredthsOfOneMillimeter( startY );
     sal_Int32 nWidth = Millimeter::getInHundredthsOfOneMillimeter( nLineWidth );
@@ -245,7 +245,7 @@ ScVbaShapes::AddRectangle( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWi
     uno::Reference< drawing::XShape > xShape( createShape( sCreateShapeName ), uno::UNO_QUERY_THROW );
     m_xShapes->add( xShape );
 
-    rtl::OUString sName = createName( rtl::OUString::createFromAscii( "Rectangle" ) );
+    rtl::OUString sName(createName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Rectangle")) ));
     setDefaultShapeProperties( xShape );
     setShape_NameProperty( xShape, sName );
 
@@ -268,7 +268,7 @@ ScVbaShapes::AddRectangle( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWi
 uno::Any
 ScVbaShapes::AddEllipse( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, uno::Any aRange ) throw (css::uno::RuntimeException)
 {
-    rtl::OUString sCreateShapeName( rtl::OUString::createFromAscii( "com.sun.star.drawing.EllipseShape" ) );
+    rtl::OUString sCreateShapeName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.EllipseShape") );
     sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( startX );
     sal_Int32 nYPos = Millimeter::getInHundredthsOfOneMillimeter( startY );
     sal_Int32 nWidth = Millimeter::getInHundredthsOfOneMillimeter( nLineWidth );
@@ -290,7 +290,7 @@ ScVbaShapes::AddEllipse( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidt
 
     setShape_AnchorTypeAndRangeProperty(xShape, _aRange);
     */
-    rtl::OUString name = createName( rtl::OUString::createFromAscii( "Oval" ));
+    rtl::OUString name(createName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Oval"))));
     setDefaultShapeProperties(xShape);
     setShape_NameProperty(xShape, name);
 
@@ -321,12 +321,12 @@ ScVbaShapes::AddLine( sal_Int32 StartX, sal_Int32 StartY, sal_Int32 endX, sal_In
     sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( StartX );
     sal_Int32 nYPos = Millimeter::getInHundredthsOfOneMillimeter( StartY );
 
-    uno::Reference< drawing::XShape > xShape( createShape( rtl::OUString::createFromAscii("com.sun.star.drawing.LineShape") ), uno::UNO_QUERY_THROW );
+    uno::Reference< drawing::XShape > xShape( createShape( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.LineShape")) ), uno::UNO_QUERY_THROW );
     m_xShapes->add( xShape );
 
     awt::Point aMovePositionIfRange( 0, 0 );
 
-    rtl::OUString name = createName( rtl::OUString::createFromAscii( "Line" ) );
+    rtl::OUString name(createName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Line")) ));
     setDefaultShapeProperties(xShape);
     setShape_NameProperty(xShape, name);
 
@@ -373,7 +373,7 @@ ScVbaShapes::AddTextbox( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_Int32 _n
 uno::Any
 ScVbaShapes::AddTextboxInWriter( sal_Int32 /*_nOrientation*/, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (uno::RuntimeException)
 {
-    rtl::OUString sCreateShapeName( rtl::OUString::createFromAscii( "com.sun.star.drawing.TextShape" ) );
+    rtl::OUString sCreateShapeName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.TextShape") );
     sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( _nLeft );
     sal_Int32 nYPos = Millimeter::getInHundredthsOfOneMillimeter( _nTop );
     sal_Int32 nWidth = Millimeter::getInHundredthsOfOneMillimeter( _nWidth );
@@ -384,7 +384,7 @@ ScVbaShapes::AddTextboxInWriter( sal_Int32 /*_nOrientation*/, sal_Int32 _nLeft,
 
     setDefaultShapeProperties(xShape);
 
-    rtl::OUString sName =  createName( rtl::OUString::createFromAscii( "Text Box") );
+    rtl::OUString sName(createName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Text Box")) ));
     setShape_NameProperty( xShape, sName );
 
     awt::Size size;
@@ -393,23 +393,23 @@ ScVbaShapes::AddTextboxInWriter( sal_Int32 /*_nOrientation*/, sal_Int32 _nLeft,
     xShape->setSize(size);
 
     uno::Reference< beans::XPropertySet > xShapeProps( xShape, uno::UNO_QUERY_THROW );
-    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "AnchorType" ), uno::makeAny( text::TextContentAnchorType_AT_PAGE ) );
-    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "HoriOrientRelation" ), uno::makeAny( text::RelOrientation::PAGE_LEFT ) );
-    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "HoriOrient" ), uno::makeAny( text::HoriOrientation::NONE ) );
-    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "HoriOrientPosition" ), uno::makeAny( nXPos ) );
+    xShapeProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AnchorType")), uno::makeAny( text::TextContentAnchorType_AT_PAGE ) );
+    xShapeProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HoriOrientRelation")), uno::makeAny( text::RelOrientation::PAGE_LEFT ) );
+    xShapeProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HoriOrient")), uno::makeAny( text::HoriOrientation::NONE ) );
+    xShapeProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HoriOrientPosition")), uno::makeAny( nXPos ) );
 
-    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "VertOrientRelation" ), uno::makeAny( text::RelOrientation::PAGE_FRAME ) );
-    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "VertOrient" ), uno::makeAny( text::VertOrientation::NONE ) );
-    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "VertOrientPosition" ), uno::makeAny( nYPos ) );
+    xShapeProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VertOrientRelation")), uno::makeAny( text::RelOrientation::PAGE_FRAME ) );
+    xShapeProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VertOrient")), uno::makeAny( text::VertOrientation::NONE ) );
+    xShapeProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VertOrientPosition")), uno::makeAny( nYPos ) );
 
     // set to visible
     drawing::LineStyle aLineStyle = drawing::LineStyle_SOLID;
-    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "LineStyle" ), uno::makeAny( aLineStyle ) );
+    xShapeProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineStyle")), uno::makeAny( aLineStyle ) );
     // set to font
     sal_Int16 nLayerId = 1;
-    rtl::OUString sLayerName = rtl::OUString::createFromAscii("Heaven");
-    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "LayerID" ), uno::makeAny( nLayerId ) );
-    xShapeProps->setPropertyValue( rtl::OUString::createFromAscii( "LayerName" ), uno::makeAny( sLayerName ) );
+    rtl::OUString sLayerName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Heaven"));
+    xShapeProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayerID")), uno::makeAny( nLayerId ) );
+    xShapeProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayerName")), uno::makeAny( sLayerName ) );
 
 
     ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, m_xModel, ScVbaShape::getType( xShape ) );
@@ -448,11 +448,11 @@ void
 ScVbaShapes::setDefaultShapeProperties( uno::Reference< drawing::XShape > xShape ) throw (uno::RuntimeException)
 {
     uno::Reference< beans::XPropertySet > xPropertySet( xShape, uno::UNO_QUERY_THROW );
-    xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "FillStyle" ), uno::makeAny( rtl::OUString::createFromAscii( "SOLID" ) ) );
-    xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "FillColor"), uno::makeAny( sal_Int32(0xFFFFFF) )  );
-    xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "TextWordWrap"), uno::makeAny( text::WrapTextMode_THROUGHT )  );
+    xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FillStyle")), uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SOLID")) ) );
+    xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FillColor")), uno::makeAny( sal_Int32(0xFFFFFF) )  );
+    xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextWordWrap")), uno::makeAny( text::WrapTextMode_THROUGHT )  );
     //not find in OOo2.3
-    //xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "Opaque"), uno::makeAny( sal_True )  );
+    //xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Opaque")), uno::makeAny( sal_True )  );
 }
 
 void
@@ -461,7 +461,7 @@ ScVbaShapes::setShape_NameProperty( uno::Reference< css::drawing::XShape > xShap
     uno::Reference< beans::XPropertySet > xPropertySet( xShape, uno::UNO_QUERY_THROW );
     try
     {
-        xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "Name" ), uno::makeAny( sName ) );
+        xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), uno::makeAny( sName ) );
     }
     catch( script::BasicErrorException e )
     {
diff --git a/vbahelper/source/vbahelper/vbatextframe.cxx b/vbahelper/source/vbahelper/vbatextframe.cxx
index b490f9b427a0..1a98998c8dca 100644
--- a/vbahelper/source/vbahelper/vbatextframe.cxx
+++ b/vbahelper/source/vbahelper/vbatextframe.cxx
@@ -44,8 +44,8 @@ VbaTextFrame::setAsMSObehavior()
     //set property TextWordWrap default as False.
     // TextFitToSize control the text content. it seems we should set the default as False.
     // com.sun.star.drawing.TextFitToSizeType.NONE
-    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "TextWordWrap" ), uno::makeAny( sal_False ) );
-    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "TextFitToSize" ), uno::makeAny( drawing::TextFitToSizeType_NONE ) );
+    m_xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextWordWrap")), uno::makeAny( sal_False ) );
+    m_xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextFitToSize")), uno::makeAny( drawing::TextFitToSizeType_NONE ) );
 }
 
 sal_Int32 VbaTextFrame::getMargin( rtl::OUString sMarginType )
@@ -70,7 +70,7 @@ VbaTextFrame::getAutoSize() throw (uno::RuntimeException)
     // TextFitToSize control the text content.
     // and in mso, there isnot option TextWordWrap which means auto wrap. the default is False.
     sal_Bool bAutosize = sal_False;
-    uno::Any aTextAutoGrowHeight = m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "TextAutoGrowHeight" ) );
+    uno::Any aTextAutoGrowHeight = m_xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextAutoGrowHeight")) );
     aTextAutoGrowHeight >>= bAutosize;
     return bAutosize;
 }
@@ -79,13 +79,13 @@ void SAL_CALL
 VbaTextFrame::setAutoSize( sal_Bool _autosize ) throw (uno::RuntimeException)
 {
     setAsMSObehavior();
-    m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "TextAutoGrowHeight" ), uno::makeAny( _autosize ) );
+    m_xPropertySet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextAutoGrowHeight")), uno::makeAny( _autosize ) );
 }
 
 float SAL_CALL
 VbaTextFrame::getMarginBottom() throw (uno::RuntimeException)
 {
-    sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextLowerDistance" ) );
+    sal_Int32 nMargin = getMargin( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextLowerDistance")) );
     float fMargin = (float)Millimeter::getInPoints( nMargin );
     return fMargin;
 }
@@ -93,13 +93,13 @@ VbaTextFrame::getMarginBottom() throw (uno::RuntimeException)
 void SAL_CALL
 VbaTextFrame::setMarginBottom( float _marginbottom ) throw (uno::RuntimeException)
 {
-    setMargin( rtl::OUString::createFromAscii( "TextLowerDistance" ), _marginbottom );
+    setMargin( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextLowerDistance")), _marginbottom );
 }
 
 float SAL_CALL
 VbaTextFrame::getMarginTop() throw (uno::RuntimeException)
 {
-    sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextUpperDistance" ) );
+    sal_Int32 nMargin = getMargin( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextUpperDistance")) );
     float fMargin = (float)Millimeter::getInPoints( nMargin );
     return fMargin;
 }
@@ -107,13 +107,13 @@ VbaTextFrame::getMarginTop() throw (uno::RuntimeException)
 void SAL_CALL
 VbaTextFrame::setMarginTop( float _margintop ) throw (uno::RuntimeException)
 {
-    setMargin( rtl::OUString::createFromAscii( "TextUpperDistance" ), _margintop );
+    setMargin( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextUpperDistance")), _margintop );
 }
 
 float SAL_CALL
 VbaTextFrame::getMarginLeft() throw (uno::RuntimeException)
 {
-    sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextLeftDistance" ) );
+    sal_Int32 nMargin = getMargin( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextLeftDistance")) );
     float fMargin = (float)Millimeter::getInPoints( nMargin );
     return fMargin;
 }
@@ -121,13 +121,13 @@ VbaTextFrame::getMarginLeft() throw (uno::RuntimeException)
 void SAL_CALL
 VbaTextFrame::setMarginLeft( float _marginleft ) throw (uno::RuntimeException)
 {
-    setMargin( rtl::OUString::createFromAscii( "TextLeftDistance" ), _marginleft );
+    setMargin( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextLeftDistance")), _marginleft );
 }
 
 float SAL_CALL
 VbaTextFrame::getMarginRight() throw (uno::RuntimeException)
 {
-    sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextRightDistance" ) );
+    sal_Int32 nMargin = getMargin( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextRightDistance")) );
     float fMargin = (float)Millimeter::getInPoints( nMargin );
     return fMargin;
 }
@@ -135,7 +135,7 @@ VbaTextFrame::getMarginRight() throw (uno::RuntimeException)
 void SAL_CALL
 VbaTextFrame::setMarginRight( float _marginright ) throw (uno::RuntimeException)
 {
-    setMargin( rtl::OUString::createFromAscii( "TextRightDistance" ), _marginright );
+    setMargin( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextRightDistance")), _marginright );
 }
 
 
diff --git a/vcl/aqua/source/app/vclnsapp.mm b/vcl/aqua/source/app/vclnsapp.mm
index f33599fa086e..4264f8802126 100755
--- a/vcl/aqua/source/app/vclnsapp.mm
+++ b/vcl/aqua/source/app/vclnsapp.mm
@@ -39,6 +39,8 @@
 #include "vcl/cmdevt.hxx"
 #include "rtl/ustrbuf.hxx"
 
+#include "vcl/impimagetree.hxx"
+
 #include "premac.h"
 #import "Carbon/Carbon.h"
 #import "apple_remote/RemoteControl.h"
@@ -416,6 +418,7 @@
     #else // the clean version follows
     return pSalData->maFrames.front()->CallCallback( SALEVENT_SHUTDOWN, NULL ) ? NSTerminateCancel : NSTerminateNow;
     #endif
+    ImplImageTreeSingletonRef()->shutDown();
     return NSTerminateNow;
 }
 
diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.cxx b/vcl/aqua/source/dtrans/aqua_clipboard.cxx
index 493ad850abe8..21b8bc5c96d9 100644
--- a/vcl/aqua/source/dtrans/aqua_clipboard.cxx
+++ b/vcl/aqua/source/dtrans/aqua_clipboard.cxx
@@ -323,14 +323,17 @@ void AquaClipboard::fireLostClipboardOwnershipEvent(Reference<XClipboardOwner> o
 
 void AquaClipboard::provideDataForType(NSPasteboard* sender, NSString* type)
 {
-  DataProviderPtr_t dp = mpDataFlavorMapper->getDataProvider(type, mXClipboardContent);
-  NSData* pBoardData = NULL;
-
-  if (dp.get() != NULL)
-  {
-      pBoardData = (NSData*)dp->getSystemData();
-      [sender setData: pBoardData forType: type];
-  }
+    if( mXClipboardContent.is() )
+    {
+        DataProviderPtr_t dp = mpDataFlavorMapper->getDataProvider(type, mXClipboardContent);
+        NSData* pBoardData = NULL;
+
+        if (dp.get() != NULL)
+        {
+            pBoardData = (NSData*)dp->getSystemData();
+            [sender setData: pBoardData forType: type];
+        }
+    }
 }
 
 
@@ -341,20 +344,21 @@ void AquaClipboard::provideDataForType(NSPasteboard* sender, NSString* type)
 void SAL_CALL AquaClipboard::flushClipboard()
   throw(RuntimeException)
 {
-  if (mXClipboardContent.is())
+    if (mXClipboardContent.is())
     {
           Sequence<DataFlavor> flavorList = mXClipboardContent->getTransferDataFlavors();
         sal_uInt32 nFlavors = flavorList.getLength();
 
         for (sal_uInt32 i = 0; i < nFlavors; i++)
-          {
+        {
             NSString* sysType = mpDataFlavorMapper->openOfficeToSystemFlavor(flavorList[i]);
 
             if (sysType != NULL)
-              {
+            {
                 provideDataForType(mPasteboard, sysType);
-              }
-          }
+            }
+        }
+        mXClipboardContent.clear();
     }
 }
 
diff --git a/vcl/aqua/source/dtrans/test_aquacb.cxx b/vcl/aqua/source/dtrans/test_aquacb.cxx
index 6a223a9bcec1..dbcd0c94c784 100644
--- a/vcl/aqua/source/dtrans/test_aquacb.cxx
+++ b/vcl/aqua/source/dtrans/test_aquacb.cxx
@@ -75,7 +75,7 @@ TestTransferable::TestTransferable() :
 {
     DataFlavor df;
 
-    df.MimeType = OUString::createFromAscii( "text/html" );
+    df.MimeType = OUString(RTL_CONSTASCII_USTRINGPARAM("text/html"));
     df.DataType = getCppuType( ( Sequence< sal_Int8 >* )0 );
 
     m_seqDFlv[0] = df;
diff --git a/vcl/aqua/source/gdi/salatslayout.cxx b/vcl/aqua/source/gdi/salatslayout.cxx
index 6f21be3f5c49..f79da3559b35 100644
--- a/vcl/aqua/source/gdi/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/salatslayout.cxx
@@ -751,9 +751,10 @@ int ATSLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) cons
     // initial measurement of text break position
     UniCharArrayOffset nBreakPos = mnMinCharPos;
     const ATSUTextMeasurement nATSUMaxWidth = Vcl2Fixed( nPixelWidth );
+    if( nATSUMaxWidth <= 0xFFFF ) // #i108584# avoid ATSU rejecting the parameter
+        return mnMinCharPos;      //           or do ATSUMaxWidth=0x10000;
     OSStatus eStatus = ATSUBreakLine( maATSULayout, mnMinCharPos,
         nATSUMaxWidth, false, &nBreakPos );
-
     if( (eStatus != noErr) && (eStatus != kATSULineBreakInWord) )
         return STRING_LEN;
 
@@ -778,7 +779,7 @@ int ATSLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) cons
     if( eStatus != noErr )
         return nBreakPos;
     const ATSUTextMeasurement nATSURemWidth = nATSUMaxWidth - (nRight - nLeft);
-    if( nATSURemWidth <= 0 )
+    if( nATSURemWidth <= 0xFFFF ) // #i108584# avoid ATSU rejecting the parameter
         return nBreakPos;
     UniCharArrayOffset nBreakPosInWord = nBreakPos;
     eStatus = ATSUBreakLine( maATSULayout, nBreakPos, nATSURemWidth, false, &nBreakPosInWord );
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index 27573318228c..e280a583b3d5 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -1170,6 +1170,8 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings )
     getResolution( nDPIX, nDPIY );
     aAppFont = getFont( [NSFont systemFontOfSize: 0], nDPIY, aAppFont );
 
+    aStyleSettings.SetToolbarIconSize( nDPIY > 160 ? STYLE_TOOLBAR_ICONSIZE_LARGE : STYLE_TOOLBAR_ICONSIZE_SMALL );
+
     // TODO: better mapping of aqua<->ooo font settings
     aStyleSettings.SetAppFont( aAppFont );
     aStyleSettings.SetHelpFont( aAppFont );
diff --git a/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx
index 706e831869a1..41d3899366bf 100644
--- a/vcl/inc/vcl/button.hxx
+++ b/vcl/inc/vcl/button.hxx
@@ -87,14 +87,14 @@ public:
     static XubString    GetStandardText( StandardButtonType eButton );
     static XubString    GetStandardHelpText( StandardButtonType eButton );
 
-    BOOL                SetModeImage( const Image& rImage, BmpColorMode eMode = BMP_COLOR_NORMAL );
-    const Image         GetModeImage( BmpColorMode eMode = BMP_COLOR_NORMAL ) const;
+    BOOL                SetModeImage( const Image& rImage );
+    const Image         GetModeImage( ) const;
     BOOL                HasImage() const;
     void                SetImageAlign( ImageAlign eAlign );
     ImageAlign          GetImageAlign() const;
 
-    BOOL                SetModeBitmap( const BitmapEx& rBitmap, BmpColorMode eMode = BMP_COLOR_NORMAL );
-    BitmapEx            GetModeBitmap( BmpColorMode eMode = BMP_COLOR_NORMAL ) const;
+    BOOL                SetModeBitmap( const BitmapEx& rBitmap );
+    BitmapEx            GetModeBitmap( ) const;
 
     void                EnableImageDisplay( BOOL bEnable );
     BOOL                IsImageDisplayEnabled();
@@ -298,7 +298,6 @@ private:
     Rectangle       maStateRect;
     Rectangle       maMouseRect;
     Image           maImage;
-    Image           maImageHC;
     BOOL            mbChecked;
     BOOL            mbSaveValue;
     BOOL            mbRadioCheck;
@@ -374,8 +373,8 @@ public:
     void            EnableRadioCheck( BOOL bRadioCheck = TRUE ) { mbRadioCheck = bRadioCheck; }
     BOOL            IsRadioCheckEnabled() const { return mbRadioCheck; }
 
-    BOOL            SetModeRadioImage( const Image& rImage, BmpColorMode eMode = BMP_COLOR_NORMAL );
-    const Image&    GetModeRadioImage( BmpColorMode eMode = BMP_COLOR_NORMAL ) const;
+    BOOL            SetModeRadioImage( const Image& rImage );
+    const Image&    GetModeRadioImage( ) const;
 
     void            SetState( BOOL bCheck );
     void            Check( BOOL bCheck = TRUE );
diff --git a/vcl/inc/vcl/fixed.hxx b/vcl/inc/vcl/fixed.hxx
index d14cc750d6ea..42061cfa09ea 100644
--- a/vcl/inc/vcl/fixed.hxx
+++ b/vcl/inc/vcl/fixed.hxx
@@ -118,7 +118,6 @@ class VCL_DLLPUBLIC FixedBitmap : public Control
 {
 private:
     Bitmap          maBitmap;
-    Bitmap          maBitmapHC;
 
     using Control::ImplInitSettings;
     using Window::ImplInit;
@@ -145,8 +144,8 @@ public:
     void            SetBitmap( const Bitmap& rBitmap );
     using OutputDevice::GetBitmap;
     const Bitmap&   GetBitmap() const { return maBitmap; }
-    BOOL            SetModeBitmap( const Bitmap& rBitmap, BmpColorMode eMode = BMP_COLOR_NORMAL );
-    const Bitmap&   GetModeBitmap( BmpColorMode eMode = BMP_COLOR_NORMAL ) const;
+    BOOL            SetModeBitmap( const Bitmap& rBitmap );
+    const Bitmap&   GetModeBitmap( ) const;
 };
 
 // --------------
@@ -157,7 +156,6 @@ class VCL_DLLPUBLIC FixedImage : public Control
 {
 private:
     Image           maImage;
-    Image           maImageHC;
     BOOL            mbInUserDraw;
 
 private:
@@ -188,8 +186,8 @@ public:
     void            SetImage( const Image& rImage );
     const Image&    GetImage() const { return maImage; }
 
-    BOOL            SetModeImage( const Image& rImage, BmpColorMode eMode = BMP_COLOR_NORMAL );
-    const Image&    GetModeImage( BmpColorMode eMode = BMP_COLOR_NORMAL ) const;
+    BOOL            SetModeImage( const Image& rImage );
+    const Image&    GetModeImage( ) const;
 
     Point           CalcImagePos( const Point& rPos,
                                   const Size& rObjSize, const Size& rWinSize );
diff --git a/vcl/inc/vcl/ilstbox.hxx b/vcl/inc/vcl/ilstbox.hxx
index 110e57233550..b468978f247e 100644
--- a/vcl/inc/vcl/ilstbox.hxx
+++ b/vcl/inc/vcl/ilstbox.hxx
@@ -60,7 +60,7 @@ enum LB_EVENT_TYPE
 // -----------------
 // - ImplEntryType -
 // -----------------
-
+
 struct ImplEntryType
 {
     XubString   maStr;
@@ -102,7 +102,7 @@ struct ImplEntryType
 // -----------------
 // - ImplEntryList -
 // -----------------
-
+
 class ImplEntryList : private List
 {
 private:
@@ -385,7 +385,7 @@ public:
 // ---------------
 // - ImplListBox -
 // ---------------
-
+
 class ImplListBox : public Control
 {
 private:
@@ -508,7 +508,7 @@ public:
 // -----------------------------
 // - ImplListBoxFloatingWindow -
 // -----------------------------
-
+
 class ImplListBoxFloatingWindow : public FloatingWindow
 {
 private:
@@ -551,7 +551,7 @@ public:
 // -----------
 // - ImplWin -
 // -----------
-
+
 class ImplWin : public Control
 {
 private:
@@ -559,7 +559,6 @@ private:
     USHORT          mnItemPos;  // wegen UserDraw muss ich wissen, welches Item ich darstelle.
     XubString       maString;
     Image           maImage;
-    Image           maImageHC;
 
     Rectangle       maFocusRect;
     Size            maUserItemSize;
@@ -595,8 +594,8 @@ public:
     const Image&    GetImage() const { return maImage; }
     void            SetImage( const Image& rImg ) { maImage = rImg; }
 
-    BOOL            SetModeImage( const Image& rImage, BmpColorMode eMode = BMP_COLOR_NORMAL );
-    const Image&    GetModeImage( BmpColorMode eMode = BMP_COLOR_NORMAL ) const;
+    BOOL            SetModeImage( const Image& rImage );
+    const Image&    GetModeImage( ) const;
 
 
     virtual void    MBDown();
diff --git a/vcl/inc/vcl/imgctrl.hxx b/vcl/inc/vcl/imgctrl.hxx
index 4b68d89130b4..5867a6ff16d0 100644
--- a/vcl/inc/vcl/imgctrl.hxx
+++ b/vcl/inc/vcl/imgctrl.hxx
@@ -42,7 +42,6 @@ class VCL_DLLPUBLIC ImageControl : public FixedImage
 {
 private:
     BitmapEx        maBmp;
-    BitmapEx        maBmpHC;
     ::sal_Int16     mnScaleMode;
 
 public:
@@ -61,8 +60,8 @@ public:
     void            SetBitmap( const BitmapEx& rBmp );
     using OutputDevice::GetBitmap;
     const BitmapEx& GetBitmap() const { return maBmp; }
-    BOOL            SetModeBitmap( const BitmapEx& rBitmap, BmpColorMode eMode = BMP_COLOR_NORMAL );
-    const BitmapEx& GetModeBitmap( BmpColorMode eMode = BMP_COLOR_NORMAL ) const;
+    BOOL            SetModeBitmap( const BitmapEx& rBitmap );
+    const BitmapEx& GetModeBitmap( ) const;
 };
 
 #endif  // _SV_IMGCTRL_HXX
diff --git a/vcl/inc/vcl/impimagetree.hxx b/vcl/inc/vcl/impimagetree.hxx
index 849e98bb234c..4afa807cf28a 100644
--- a/vcl/inc/vcl/impimagetree.hxx
+++ b/vcl/inc/vcl/impimagetree.hxx
@@ -58,7 +58,7 @@ public:
 
     bool loadImage(
         rtl::OUString const & name, rtl::OUString const & style,
-        BitmapEx & bitmap, bool localized = false );
+        BitmapEx & bitmap, bool localized = false, bool loadMissing = false );
 
     void shutDown();
         // a crude form of life cycle control (called from DeInitVCL; otherwise,
@@ -66,6 +66,10 @@ public:
         // be too late for the destructors of the bitmaps in m_iconCache)
 
 private:
+    bool doLoadImage(
+        rtl::OUString const & name, rtl::OUString const & style,
+        BitmapEx & bitmap, bool localized);
+
     typedef std::list<
         std::pair<
             rtl::OUString,
diff --git a/vcl/inc/vcl/msgbox.hxx b/vcl/inc/vcl/msgbox.hxx
index 7b02444ed4d7..42eaeef2a7e4 100644
--- a/vcl/inc/vcl/msgbox.hxx
+++ b/vcl/inc/vcl/msgbox.hxx
@@ -71,7 +71,6 @@ protected:
     FixedImage*         mpFixedImage;
     XubString           maMessText;
     Image               maImage;
-    Image               maImageHC;
     USHORT              mnSoundType;
     BOOL                mbHelpBtn;
     BOOL                mbSound;
@@ -101,8 +100,8 @@ public:
     void                SetImage( const Image& rImage ) { maImage = rImage; }
     const Image&        GetImage() const { return maImage; }
 
-    BOOL                SetModeImage( const Image& rImage, BmpColorMode eMode = BMP_COLOR_NORMAL );
-    const Image&        GetModeImage( BmpColorMode eMode = BMP_COLOR_NORMAL ) const;
+    BOOL                SetModeImage( const Image& rImage );
+    const Image&        GetModeImage( ) const;
 
     void                SetDefaultCheckBoxText();
     void                SetCheckBoxText( const XubString& rText ) { maCheckBoxText = rText;}
@@ -127,7 +126,6 @@ public:
                         InfoBox( Window* pParent, const ResId & rResId );
 
     static Image        GetStandardImage();
-    static Image        GetStandardImageHC();
 };
 
 // --------------
@@ -147,7 +145,6 @@ public:
     void                SetDefaultCheckBoxText();
 
     static Image        GetStandardImage();
-    static Image        GetStandardImageHC();
 };
 
 // ------------
@@ -165,7 +162,6 @@ public:
                         ErrorBox( Window* pParent, const ResId& rResId );
 
     static Image        GetStandardImage();
-    static Image        GetStandardImageHC();
 };
 
 // ------------
@@ -185,7 +181,6 @@ public:
     void                SetDefaultCheckBoxText();
 
     static Image        GetStandardImage();
-    static Image        GetStandardImageHC();
 };
 
 #endif  // _SV_MSGBOX_HXX
diff --git a/vcl/inc/vcl/prndlg.hxx b/vcl/inc/vcl/prndlg.hxx
index f741cb6cd0d3..7549d1e5ea5e 100644
--- a/vcl/inc/vcl/prndlg.hxx
+++ b/vcl/inc/vcl/prndlg.hxx
@@ -61,7 +61,6 @@ namespace vcl
             rtl::OUString       maReplacementString;
             rtl::OUString       maToolTipString;
 
-            bool useHCColorReplacement() const;
         public:
             PrintPreviewWindow( Window* pParent, const ResId& );
             virtual ~PrintPreviewWindow();
@@ -169,9 +168,7 @@ namespace vcl
             FixedImage                              maCollateImage;
 
             Image                                   maCollateImg;
-            Image                                   maCollateHCImg;
             Image                                   maNoCollateImg;
-            Image                                   maNoCollateHCImg;
 
             long                                    mnCollateUIMode;
 
diff --git a/vcl/inc/vcl/svdata.hxx b/vcl/inc/vcl/svdata.hxx
index 3229b6f1654d..69ac3f540b65 100644
--- a/vcl/inc/vcl/svdata.hxx
+++ b/vcl/inc/vcl/svdata.hxx
@@ -231,7 +231,6 @@ struct ImplSVWinData
     Window*                 mpTrackWin;         // window, that is in tracking mode
     AutoTimer*              mpTrackTimer;       // tracking timer
     ImageList*              mpMsgBoxImgList;    // ImageList for MessageBox
-    ImageList*              mpMsgBoxHCImgList;  // ImageList for MessageBox (high contrast mode)
     Window*                 mpAutoScrollWin;    // window, that is in AutoScrollMode mode
     USHORT                  mnTrackFlags;       // tracking flags
     USHORT                  mnAutoScrollFlags;  // auto scroll flags
@@ -255,9 +254,7 @@ struct ImplSVCtrlData
     ImageList*              mpSplitHArwImgList; // ImageList for Horizontale SplitWindows (Arrows)
     ImageList*              mpSplitVArwImgList; // ImageList for Vertikale SplitWindows (Arrows)
     Image*                  mpDisclosurePlus;
-    Image*                  mpDisclosurePlusHC;
     Image*                  mpDisclosureMinus;
-    Image*                  mpDisclosureMinusHC;
     ImplTBDragMgr*          mpTBDragMgr;        // DragMgr for ToolBox
     USHORT                  mnCheckStyle;       // CheckBox-Style for ImageList-Update
     USHORT                  mnRadioStyle;       // Radio-Style for ImageList-Update
diff --git a/vcl/inc/vcl/svids.hrc b/vcl/inc/vcl/svids.hrc
index 059ed1524b7c..50e334deaa3b 100644
--- a/vcl/inc/vcl/svids.hrc
+++ b/vcl/inc/vcl/svids.hrc
@@ -43,7 +43,6 @@
 #define SV_RESID_BITMAP_RADIO               1010
 
 #define SV_RESID_BITMAP_MSGBOX              1020
-#define SV_RESID_BITMAP_MSGBOX_HC           1021
 
 #define SV_RESID_BITMAP_PIN                 1030
 
@@ -55,12 +54,9 @@
 #define SV_RESID_BITMAP_SCROLLMSK           1050
 #define SV_RESID_BITMAP_SCROLLBMP           1051
 #define SV_RESID_BITMAP_CLOSEDOC            1052
-#define SV_RESID_BITMAP_CLOSEDOCHC          1053
 
 #define SV_DISCLOSURE_PLUS                  1060
 #define SV_DISCLOSURE_MINUS                 1061
-#define SV_DISCLOSURE_PLUS_HC               1062
-#define SV_DISCLOSURE_MINUS_HC              1063
 
 #define SV_RESID_MENU_EDIT                  2000
 #define SV_MENU_EDIT_UNDO                   1
@@ -142,8 +138,6 @@
 #define SV_PRINT_BUTTONLINE                 14
 #define SV_PRINT_COLLATE_IMG                15
 #define SV_PRINT_NOCOLLATE_IMG              16
-#define SV_PRINT_COLLATE_HC_IMG             17
-#define SV_PRINT_NOCOLLATE_HC_IMG           18
 #define SV_PRINT_NOPAGES                    19
 #define SV_PRINT_STATUS_TXT                 20
 #define SV_PRINT_LOCATION_TXT               21
@@ -234,8 +228,6 @@
 
 #define SV_ICON_LARGE_START                 24000
 #define SV_ICON_SMALL_START                 25000
-#define SV_ICON_LARGE_HC_START              26000
-#define SV_ICON_SMALL_HC_START              27000
 
 #define SV_ICON_ID_OFFICE                       1
 #define SV_ICON_ID_TEXT                         2
diff --git a/vcl/inc/vcl/tabctrl.hxx b/vcl/inc/vcl/tabctrl.hxx
index 25925a89b1d7..5463246ec8a0 100644
--- a/vcl/inc/vcl/tabctrl.hxx
+++ b/vcl/inc/vcl/tabctrl.hxx
@@ -103,6 +103,7 @@ private:
 protected:
     using Window::ImplInit;
     SAL_DLLPRIVATE void         ImplInit( Window* pParent, WinBits nStyle );
+    SAL_DLLPRIVATE WinBits      ImplInitStyle( WinBits nStyle );
     SAL_DLLPRIVATE void         ImplLoadRes( const ResId& rResId );
 
     virtual void                FillLayoutData() const;
diff --git a/vcl/prj/build.lst b/vcl/prj/build.lst
index e6f636522acb..f64757f2c9e1 100644
--- a/vcl/prj/build.lst
+++ b/vcl/prj/build.lst
@@ -1,4 +1,4 @@
-vc	vcl	:	l10n apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools l10ntools icc SO:print_header cpputools shell svl NULL
+vc	vcl	:	l10n apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools l10ntools icc cpputools shell svl NULL
 vc	vcl										usr1	-	all	vc_mkout NULL
 vc	vcl\inc									nmake	-	all	vc_inc NULL
 vc	vcl\source\glyphs						nmake	-	all	vc_glyphs vc_inc NULL
diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx
index 0a6e9241e3a2..1657be61c4ff 100644
--- a/vcl/source/app/brand.cxx
+++ b/vcl/source/app/brand.cxx
@@ -58,7 +58,7 @@ bool Application::LoadBrandBitmap (const char* pName, BitmapEx &rBitmap)
 {
     // TODO - if we want more flexibility we could add a branding path
     // in an rc file perhaps fallback to "about.bmp"
-    rtl::OUString aBaseName = ( rtl::OUString::createFromAscii( "/" ) +
+    rtl::OUString aBaseName = ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) +
                                 rtl::OUString::createFromAscii( pName ) );
     rtl::OUString aPng( RTL_CONSTASCII_USTRINGPARAM(".png") );
 
@@ -67,9 +67,9 @@ bool Application::LoadBrandBitmap (const char* pName, BitmapEx &rBitmap)
     rtl::OLocale aLoc( pLoc );
 
     rtl::OUString aName = aBaseName + aPng;
-    rtl::OUString aLocaleName = ( aBaseName + rtl::OUString::createFromAscii ("-") +
+    rtl::OUString aLocaleName = ( aBaseName + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("-")) +
                                   aLoc.getLanguage() +
-                                  rtl::OUString::createFromAscii ("_") +
+                                  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("_")) +
                                   aLoc.getCountry() + aPng );
 
     return ( loadPng ("$BRAND_BASE_DIR/program/edition", aLocaleName, rBitmap) ||
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 1530a0649689..d8146275e4b4 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -1310,7 +1310,7 @@ void MiscSettings::SetDisablePrinting( BOOL bEnable )
         vcl::SettingsConfigItem::get()->
             setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DesktopManagement" ) ),
                       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DisablePrinting" ) ),
-                      rtl::OUString::createFromAscii( bEnable ? "true" : "false" ) );
+                      bEnable ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")) : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("false" )) );
         mpData->mnDisablePrinting = bEnable ? 1 : 0;
     }
 }
@@ -1366,7 +1366,7 @@ void MiscSettings::SetEnableATToolSupport( BOOL bEnable )
         vcl::SettingsConfigItem::get()->
             setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Accessibility" ) ),
                       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableATToolSupport" ) ),
-                      rtl::OUString::createFromAscii( bEnable ? "true" : "false" ) );
+                      bEnable ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")) : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("false" )) );
         mpData->mnEnableATT = bEnable ? 1 : 0;
     }
 }
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index db166af1b295..f29c7c87ac96 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -324,14 +324,14 @@ bool ImplInitAccessBridge(BOOL bAllowCancel, BOOL &rCancelled)
                         new AccessBridgeCurrentContext( com::sun::star::uno::getCurrentContext() ) );
 
                     pSVData->mxAccessBridge = xFactory->createInstanceWithArguments(
-                            OUString::createFromAscii( "com.sun.star.accessibility.AccessBridge" ),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessBridge")),
                             arguments
                         );
                 }
                 else
                 {
                     pSVData->mxAccessBridge = xFactory->createInstanceWithArguments(
-                            OUString::createFromAscii( "com.sun.star.accessibility.AccessBridge" ),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessBridge")),
                             arguments
                         );
                 }
@@ -453,11 +453,11 @@ bool ImplInitAccessBridge(BOOL bAllowCancel, BOOL &rCancelled)
             String aTitle;
             String aMessage(ResId(SV_ACCESSERROR_BRIDGE_MSG, *pResMgr));
 
-            if( 0 == e.Message.compareTo(::rtl::OUString::createFromAscii("ClassNotFound"), 13) )
+            if( 0 == e.Message.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ClassNotFound")), 13) )
             {
                 aTitle = String(ResId(SV_ACCESSERROR_MISSING_BRIDGE, *pResMgr));
             }
-            else if( 0 == e.Message.compareTo(::rtl::OUString::createFromAscii("NoSuchMethod"), 12) )
+            else if( 0 == e.Message.compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NoSuchMethod")), 12) )
             {
                 aTitle = String(ResId(SV_ACCESSERROR_WRONG_VERSION, *pResMgr));
             }
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 4f76193d4b90..d08994c9d6de 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -392,11 +392,6 @@ void DeInitVCL()
         delete pSVData->maWinData.mpMsgBoxImgList;
         pSVData->maWinData.mpMsgBoxImgList = NULL;
     }
-    if ( pSVData->maWinData.mpMsgBoxHCImgList )
-    {
-        delete pSVData->maWinData.mpMsgBoxHCImgList;
-        pSVData->maWinData.mpMsgBoxHCImgList = NULL;
-    }
     if ( pSVData->maCtrlData.mpCheckImgList )
     {
         delete pSVData->maCtrlData.mpCheckImgList;
@@ -437,21 +432,11 @@ void DeInitVCL()
         delete pSVData->maCtrlData.mpDisclosurePlus;
         pSVData->maCtrlData.mpDisclosurePlus = NULL;
     }
-    if ( pSVData->maCtrlData.mpDisclosurePlusHC )
-    {
-        delete pSVData->maCtrlData.mpDisclosurePlusHC;
-        pSVData->maCtrlData.mpDisclosurePlusHC = NULL;
-    }
     if ( pSVData->maCtrlData.mpDisclosureMinus )
     {
         delete pSVData->maCtrlData.mpDisclosureMinus;
         pSVData->maCtrlData.mpDisclosureMinus = NULL;
     }
-    if ( pSVData->maCtrlData.mpDisclosureMinusHC )
-    {
-        delete pSVData->maCtrlData.mpDisclosureMinusHC;
-        pSVData->maCtrlData.mpDisclosureMinusHC = NULL;
-    }
     if ( pSVData->mpDefaultWin )
     {
         delete pSVData->mpDefaultWin;
diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx
index 4cd397151081..b33d252f6bb1 100644
--- a/vcl/source/app/unohelp.cxx
+++ b/vcl/source/app/unohelp.cxx
@@ -106,7 +106,7 @@ uno::Reference< lang::XMultiServiceFactory > vcl::unohelper::GetMultiServiceFact
         {
             pSVData->maAppData.mxMSF = ::cppu::createRegistryServiceFactory( aTempFileName, rtl::OUString(), sal_False );
             uno::Reference < registry::XImplementationRegistration > xReg(
-                pSVData->maAppData.mxMSF->createInstance( OUString::createFromAscii( "com.sun.star.registry.ImplementationRegistration" )), uno::UNO_QUERY );
+                pSVData->maAppData.mxMSF->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration"))), uno::UNO_QUERY );
 
             if( xReg.is() )
             {
@@ -119,7 +119,7 @@ uno::Reference< lang::XMultiServiceFactory > vcl::unohelper::GetMultiServiceFact
                         try
                         {
                             xReg->registerImplementation(
-                                OUString::createFromAscii( "com.sun.star.loader.SharedLibrary" ),aComponentPathString, NULL );
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")),aComponentPathString, NULL );
                         }
                         catch( ::com::sun::star::uno::Exception & )
                         {
@@ -145,7 +145,7 @@ uno::Reference < i18n::XBreakIterator > vcl::unohelper::CreateBreakIterator()
     uno::Reference< lang::XMultiServiceFactory > xMSF = GetMultiServiceFactory();
     if ( xMSF.is() )
     {
-        uno::Reference < uno::XInterface > xI = xMSF->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.i18n.BreakIterator" ) );
+        uno::Reference < uno::XInterface > xI = xMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")) );
         if ( xI.is() )
         {
             uno::Any x = xI->queryInterface( ::getCppuType((const uno::Reference< i18n::XBreakIterator >*)0) );
@@ -161,7 +161,7 @@ uno::Reference < i18n::XCharacterClassification > vcl::unohelper::CreateCharacte
     uno::Reference< lang::XMultiServiceFactory > xMSF = GetMultiServiceFactory();
     if ( xMSF.is() )
     {
-        uno::Reference < uno::XInterface > xI = xMSF->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.i18n.CharacterClassification" ) );
+        uno::Reference < uno::XInterface > xI = xMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.CharacterClassification")) );
         if ( xI.is() )
         {
             uno::Any x = xI->queryInterface( ::getCppuType((const uno::Reference< i18n::XCharacterClassification >*)0) );
@@ -177,7 +177,7 @@ uno::Reference < i18n::XCollator > vcl::unohelper::CreateCollator()
     uno::Reference< lang::XMultiServiceFactory > xMSF = GetMultiServiceFactory();
     if ( xMSF.is() )
     {
-        uno::Reference < uno::XInterface > xI = xMSF->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.i18n.Collator" ) );
+        uno::Reference < uno::XInterface > xI = xMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.Collator")) );
         if ( xI.is() )
         {
             uno::Any x = xI->queryInterface( ::getCppuType((const uno::Reference< i18n::XCollator >*)0) );
diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx
index b46e33686b9b..cd1fbec0502b 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -145,7 +145,7 @@ rtl::OUString GenericClipboard::getImplementationName_static()
 Sequence< rtl::OUString > GenericClipboard::getSupportedServiceNames_static()
 {
     Sequence< OUString > aRet(1);
-    aRet[0] = OUString::createFromAscii("com.sun.star.datatransfer.clipboard.SystemClipboard");
+    aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.SystemClipboard"));
     return aRet;
 }
 
@@ -282,7 +282,7 @@ Reference< XInterface > ClipboardFactory::createInstanceWithArguments( const Seq
 Sequence< OUString > SAL_CALL Clipboard_getSupportedServiceNames()
 {
     Sequence< OUString > aRet(1);
-    aRet[0] = OUString::createFromAscii("com.sun.star.datatransfer.clipboard.SystemClipboard");
+    aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.SystemClipboard"));
     return aRet;
 }
 
@@ -335,13 +335,13 @@ public:
     static Sequence< OUString > getSupportedServiceNames_static()
     {
         Sequence< OUString > aRet( 1 );
-        aRet[0] = OUString::createFromAscii( "com.sun.star.datatransfer.dnd.GenericDragSource" );
+        aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.GenericDragSource"));
         return aRet;
     }
 
     static OUString getImplementationName_static()
     {
-        return OUString::createFromAscii( "com.sun.star.datatransfer.dnd.VclGenericDragSource" );
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.VclGenericDragSource"));
     }
 };
 
@@ -447,13 +447,13 @@ public:
     static Sequence< OUString > getSupportedServiceNames_static()
     {
         Sequence< OUString > aRet( 1 );
-        aRet[0] = OUString::createFromAscii( "com.sun.star.datatransfer.dnd.GenericDropTarget" );
+        aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.GenericDropTarget"));
         return aRet;
     }
 
     static OUString getImplementationName_static()
     {
-        return OUString::createFromAscii( "com.sun.star.datatransfer.dnd.VclGenericDropTarget" );
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.VclGenericDropTarget"));
     }
 };
 
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index a2bbfb67baf4..51f602542ae1 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -81,9 +81,7 @@ public:
     BOOL            mbSmallSymbol;
 
     Image           maImage;
-    Image           maImageHC;
     BitmapEx*       mpBitmapEx;
-    BitmapEx*       mpBitmapExHC;
     ImageAlign      meImageAlign;
     SymbolAlign     meSymbolAlign;
 
@@ -99,7 +97,6 @@ ImplCommonButtonData::ImplCommonButtonData()
     mbSmallSymbol = FALSE;
 
     mpBitmapEx = NULL;
-    mpBitmapExHC = NULL;
     meImageAlign = IMAGEALIGN_TOP;
     meSymbolAlign = SYMBOLALIGN_LEFT;
 }
@@ -108,7 +105,6 @@ ImplCommonButtonData::ImplCommonButtonData()
 ImplCommonButtonData::~ImplCommonButtonData()
 {
     delete mpBitmapEx;
-    delete mpBitmapExHC;
 }
 
 // =======================================================================
@@ -203,51 +199,24 @@ XubString Button::GetStandardHelpText( StandardButtonType /* eButton */ )
     return aHelpText;
 }
 // -----------------------------------------------------------------------
-BOOL Button::SetModeImage( const Image& rImage, BmpColorMode eMode )
+BOOL Button::SetModeImage( const Image& rImage )
 {
-    if( eMode == BMP_COLOR_NORMAL )
+    if ( rImage != mpButtonData->maImage )
     {
-        if ( rImage != mpButtonData->maImage )
-        {
-            delete mpButtonData->mpBitmapEx;
-
-            mpButtonData->mpBitmapEx = NULL;
-            mpButtonData->maImage = rImage;
-
-            StateChanged( STATE_CHANGE_DATA );
-        }
-    }
-    else if( eMode == BMP_COLOR_HIGHCONTRAST )
-    {
-        if( rImage != mpButtonData->maImageHC )
-        {
-            delete mpButtonData->mpBitmapExHC;
+        delete mpButtonData->mpBitmapEx;
 
-            mpButtonData->mpBitmapExHC = NULL;
-            mpButtonData->maImageHC = rImage;
+        mpButtonData->mpBitmapEx = NULL;
+        mpButtonData->maImage = rImage;
 
-            StateChanged( STATE_CHANGE_DATA );
-        }
+        StateChanged( STATE_CHANGE_DATA );
     }
-    else
-        return FALSE;
-
     return TRUE;
 }
 
 // -----------------------------------------------------------------------
-const Image Button::GetModeImage( BmpColorMode eMode ) const
+const Image Button::GetModeImage( ) const
 {
-    if( eMode == BMP_COLOR_NORMAL )
-    {
-        return mpButtonData->maImage;
-    }
-    else if( eMode == BMP_COLOR_HIGHCONTRAST )
-    {
-        return mpButtonData->maImageHC;
-    }
-    else
-        return Image();
+    return mpButtonData->maImage;
 }
 
 // -----------------------------------------------------------------------
@@ -273,43 +242,24 @@ ImageAlign Button::GetImageAlign() const
 }
 
 // -----------------------------------------------------------------------
-BOOL Button::SetModeBitmap( const BitmapEx& rBitmap, BmpColorMode eMode )
+BOOL Button::SetModeBitmap( const BitmapEx& rBitmap )
 {
-    if ( SetModeImage( rBitmap, eMode ) )
+    if ( SetModeImage( rBitmap ) )
     {
-        if( eMode == BMP_COLOR_NORMAL )
-        {
-            if ( !mpButtonData->mpBitmapEx )
-                mpButtonData->mpBitmapEx = new BitmapEx( rBitmap );
-        }
-        else if ( eMode == BMP_COLOR_HIGHCONTRAST )
-        {
-            if ( !mpButtonData->mpBitmapExHC )
-                mpButtonData->mpBitmapExHC = new BitmapEx( rBitmap );
-        }
-        else
-            return FALSE;
-
+        if ( !mpButtonData->mpBitmapEx )
+            mpButtonData->mpBitmapEx = new BitmapEx( rBitmap );
         return TRUE;
     }
     return FALSE;
 }
 
 // -----------------------------------------------------------------------
-BitmapEx Button::GetModeBitmap( BmpColorMode eMode ) const
+BitmapEx Button::GetModeBitmap( ) const
 {
     BitmapEx aBmp;
 
-    if ( eMode == BMP_COLOR_NORMAL )
-    {
-        if ( mpButtonData->mpBitmapEx )
-            aBmp = *( mpButtonData->mpBitmapEx );
-    }
-    else if ( eMode == BMP_COLOR_HIGHCONTRAST )
-    {
-        if ( mpButtonData->mpBitmapExHC )
-            aBmp = *( mpButtonData->mpBitmapExHC );
-    }
+    if ( mpButtonData->mpBitmapEx )
+        aBmp = *( mpButtonData->mpBitmapEx );
 
     return aBmp;
 }
@@ -423,15 +373,6 @@ void Button::ImplDrawAlignedImage( OutputDevice* pDev, Point& rPos,
     Image    *pImage    = &(mpButtonData->maImage);
     BitmapEx *pBitmapEx = mpButtonData->mpBitmapEx;
 
-    if( !!(mpButtonData->maImageHC) )
-    {
-        if( GetSettings().GetStyleSettings().GetHighContrastMode() )
-        {
-            pImage = &(mpButtonData->maImageHC);
-            pBitmapEx = mpButtonData->mpBitmapExHC;
-        }
-    }
-
     if ( pBitmapEx && ( pDev->GetOutDevType() == OUTDEV_PRINTER ) )
     {
         // Die Groesse richtet sich nach dem Bildschirm, soll auf
@@ -483,21 +424,21 @@ void Button::ImplDrawAlignedImage( OutputDevice* pDev, Point& rPos,
 
         if ( bDrawText )
         {
-            if ( ( eImageAlign == IMAGEALIGN_LEFT_TOP ) ||
-                ( eImageAlign == IMAGEALIGN_LEFT ) ||
-                ( eImageAlign == IMAGEALIGN_LEFT_BOTTOM ) ||
-                ( eImageAlign == IMAGEALIGN_RIGHT_TOP ) ||
-                ( eImageAlign == IMAGEALIGN_RIGHT ) ||
-                ( eImageAlign == IMAGEALIGN_RIGHT_BOTTOM ) )
+            if ( ( eImageAlign == IMAGEALIGN_LEFT_TOP     ) ||
+                 ( eImageAlign == IMAGEALIGN_LEFT         ) ||
+                 ( eImageAlign == IMAGEALIGN_LEFT_BOTTOM  ) ||
+                 ( eImageAlign == IMAGEALIGN_RIGHT_TOP    ) ||
+                 ( eImageAlign == IMAGEALIGN_RIGHT        ) ||
+                 ( eImageAlign == IMAGEALIGN_RIGHT_BOTTOM ) )
             {
                 aRect.Right() -= ( aImageSize.Width() + nImageSep );
             }
-            else if ( ( eImageAlign == IMAGEALIGN_TOP_LEFT ) ||
-                ( eImageAlign == IMAGEALIGN_TOP ) ||
-                ( eImageAlign == IMAGEALIGN_TOP_RIGHT ) ||
-                ( eImageAlign == IMAGEALIGN_BOTTOM_LEFT ) ||
-                ( eImageAlign == IMAGEALIGN_BOTTOM ) ||
-                ( eImageAlign == IMAGEALIGN_BOTTOM_RIGHT ) )
+            else if ( ( eImageAlign == IMAGEALIGN_TOP_LEFT     ) ||
+                      ( eImageAlign == IMAGEALIGN_TOP          ) ||
+                      ( eImageAlign == IMAGEALIGN_TOP_RIGHT    ) ||
+                      ( eImageAlign == IMAGEALIGN_BOTTOM_LEFT  ) ||
+                      ( eImageAlign == IMAGEALIGN_BOTTOM       ) ||
+                      ( eImageAlign == IMAGEALIGN_BOTTOM_RIGHT ) )
             {
                 aRect.Bottom() -= ( aImageSize.Height() + nImageSep );
             }
@@ -518,7 +459,7 @@ void Button::ImplDrawAlignedImage( OutputDevice* pDev, Point& rPos,
             }
         }
 
-        aMax.Width() = aTSSize.Width() > aImageSize.Width() ? aTSSize.Width() : aImageSize.Width();
+        aMax.Width()  = aTSSize.Width()  > aImageSize.Width()  ? aTSSize.Width()  : aImageSize.Width();
         aMax.Height() = aTSSize.Height() > aImageSize.Height() ? aTSSize.Height() : aImageSize.Height();
 
         // Now calculate the output area for the image and the text acording to the image align flags
@@ -684,9 +625,9 @@ void Button::ImplSetFocusRect( const Rectangle &rFocusRect )
         aFocusRect.Bottom()++;
     }
 
-    if ( aFocusRect.Left() < aOutputRect.Left() )   aFocusRect.Left() = aOutputRect.Left();
-    if ( aFocusRect.Top() < aOutputRect.Top() )     aFocusRect.Top() = aOutputRect.Top();
-    if ( aFocusRect.Right() > aOutputRect.Right() ) aFocusRect.Right() = aOutputRect.Right();
+    if ( aFocusRect.Left()   < aOutputRect.Left()   ) aFocusRect.Left()   = aOutputRect.Left();
+    if ( aFocusRect.Top()    < aOutputRect.Top()    ) aFocusRect.Top()    = aOutputRect.Top();
+    if ( aFocusRect.Right()  > aOutputRect.Right()  ) aFocusRect.Right()  = aOutputRect.Right();
     if ( aFocusRect.Bottom() > aOutputRect.Bottom() ) aFocusRect.Bottom() = aOutputRect.Bottom();
 
     mpButtonData->maFocusRect = aFocusRect;
@@ -725,6 +666,7 @@ SymbolAlign Button::ImplGetSymbolAlign() const
 {
     return mpButtonData->meSymbolAlign;
 }
+
 // -----------------------------------------------------------------------
 void Button::ImplSetSmallSymbol( BOOL bSmall )
 {
@@ -855,10 +797,10 @@ WinBits PushButton::ImplInitStyle( const Window* pPrevWindow, WinBits nStyle )
 
     if ( !(nStyle & WB_NOGROUP) &&
          (!pPrevWindow ||
-          ((pPrevWindow->GetType() != WINDOW_PUSHBUTTON) &&
-           (pPrevWindow->GetType() != WINDOW_OKBUTTON) &&
+          ((pPrevWindow->GetType() != WINDOW_PUSHBUTTON  ) &&
+           (pPrevWindow->GetType() != WINDOW_OKBUTTON    ) &&
            (pPrevWindow->GetType() != WINDOW_CANCELBUTTON) &&
-           (pPrevWindow->GetType() != WINDOW_HELPBUTTON)) ) )
+           (pPrevWindow->GetType() != WINDOW_HELPBUTTON  )) ) )
         nStyle |= WB_GROUP;
     return nStyle;
 }
@@ -2312,9 +2254,6 @@ void RadioButton::ImplInitSettings( BOOL bFont,
     }
 }
 
-//---------------------------------------------------------------------
-//--- 12.03.2003 18:46:14 ---------------------------------------------
-
 void RadioButton::DrawRadioButtonState( )
 {
     ImplDrawRadioButtonState( );
@@ -2405,13 +2344,7 @@ if ( bNativeOK == FALSE )
         if ( !bEnabled )
             nButtonStyle |= IMAGE_DRAW_DISABLE;
 
-        // check for HC mode
         Image *pImage = &maImage;
-        if( !!maImageHC )
-        {
-            if( rStyleSettings.GetHighContrastMode() )
-                pImage = &maImageHC;
-        }
 
         Point aImagePos( aImageRect.TopLeft() );
         aImagePos.X() += (aImageRect.GetWidth()-aImageSize.Width())/2;
@@ -3107,38 +3040,21 @@ void RadioButton::Toggle()
 
 // -----------------------------------------------------------------------
 
-BOOL RadioButton::SetModeRadioImage( const Image& rImage, BmpColorMode eMode )
-{
-    if( eMode == BMP_COLOR_NORMAL )
+BOOL RadioButton::SetModeRadioImage( const Image& rImage )
 {
     if ( rImage != maImage )
     {
         maImage = rImage;
         StateChanged( STATE_CHANGE_DATA );
     }
-}
-    else if( eMode == BMP_COLOR_HIGHCONTRAST )
-    {
-        if( maImageHC != rImage )
-        {
-            maImageHC = rImage;
-            StateChanged( STATE_CHANGE_DATA );
-        }
-    }
-    else
-        return FALSE;
-
     return TRUE;
 }
 
 // -----------------------------------------------------------------------
 
-const Image& RadioButton::GetModeRadioImage( BmpColorMode eMode ) const
+const Image& RadioButton::GetModeRadioImage( ) const
 {
-    if( eMode == BMP_COLOR_HIGHCONTRAST )
-        return maImageHC;
-    else
-        return maImage;
+    return maImage;
 }
 
 // -----------------------------------------------------------------------
@@ -3291,10 +3207,11 @@ Image RadioButton::GetRadioImage( const AllSettings& rSettings, USHORT nFlags )
         ResMgr* pResMgr = ImplGetResMgr();
         pSVData->maCtrlData.mpRadioImgList = new ImageList();
         if( pResMgr )
-        LoadThemedImageList( rStyleSettings,
+            LoadThemedImageList( rStyleSettings,
                  pSVData->maCtrlData.mpRadioImgList,
-                 ResId( SV_RESID_BITMAP_RADIO+nStyle, *pResMgr ), 6 );
-    pSVData->maCtrlData.mnRadioStyle = nStyle;
+                 ResId( SV_RESID_BITMAP_RADIO+nStyle, *pResMgr ), 6
+            );
+        pSVData->maCtrlData.mnRadioStyle = nStyle;
     }
 
     USHORT nId;
@@ -3378,13 +3295,13 @@ Size RadioButton::CalcMinimumSize( long nMaxWidth ) const
         if ( aSize.Height() < aTextSize.Height() )
             aSize.Height() = aTextSize.Height();
     }
-    else if ( !maImage )
-    {
+//  else if ( !maImage )
+//  {
 /* da ansonsten im Writer die Control zu weit oben haengen
         aSize.Width() += 2;
         aSize.Height() += 2;
 */
-    }
+//  }
 
     return CalcWindowSize( aSize );
 }
@@ -4465,18 +4382,11 @@ void DisclosureButton::ImplDrawCheckBoxState()
         ImplSVCtrlData& rCtrlData( ImplGetSVData()->maCtrlData );
         if( ! rCtrlData.mpDisclosurePlus )
             rCtrlData.mpDisclosurePlus = new Image( BitmapEx( VclResId( SV_DISCLOSURE_PLUS ) ) );
-        if( ! rCtrlData.mpDisclosurePlusHC )
-            rCtrlData.mpDisclosurePlusHC = new Image( BitmapEx( VclResId( SV_DISCLOSURE_PLUS_HC ) ) );
         if( ! rCtrlData.mpDisclosureMinus )
             rCtrlData.mpDisclosureMinus = new Image( BitmapEx( VclResId( SV_DISCLOSURE_MINUS ) ) );
-        if( ! rCtrlData.mpDisclosureMinusHC )
-            rCtrlData.mpDisclosureMinusHC = new Image( BitmapEx( VclResId( SV_DISCLOSURE_MINUS_HC ) ) );
 
         Image* pImg = NULL;
-        if( GetSettings().GetStyleSettings().GetHighContrastMode() )
-            pImg = IsChecked() ? rCtrlData.mpDisclosureMinusHC : rCtrlData.mpDisclosurePlusHC;
-        else
-            pImg = IsChecked() ? rCtrlData.mpDisclosureMinus : rCtrlData.mpDisclosurePlus;
+        pImg = IsChecked() ? rCtrlData.mpDisclosureMinus : rCtrlData.mpDisclosurePlus;
 
         DBG_ASSERT( pImg, "no disclosure image" );
         if( ! pImg )
@@ -4512,5 +4422,4 @@ void DisclosureButton::KeyInput( const KeyEvent& rKEvt )
         Button::KeyInput( rKEvt );
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index b4a6c26c4c1b..e65925db282c 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -213,7 +213,7 @@ void ComboBox::ImplInit( Window* pParent, WinBits nStyle )
     Window* pLBParent = this;
     if ( mpFloatWin )
         pLBParent = mpFloatWin;
-    mpImplLB = new ImplListBox( pLBParent, nListStyle|WB_SIMPLEMODE );
+    mpImplLB = new ImplListBox( pLBParent, nListStyle|WB_SIMPLEMODE|WB_AUTOHSCROLL );
     mpImplLB->SetPosPixel( Point() );
     mpImplLB->SetSelectHdl( LINK( this, ComboBox, ImplSelectHdl ) );
     mpImplLB->SetCancelHdl( LINK( this, ComboBox, ImplCancelHdl ) );
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 0ef45ccabd94..15ce9476cdd1 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -796,7 +796,7 @@ Reference < i18n::XBreakIterator > Edit::ImplGetBreakIterator() const
 //    if ( !xBI.is() )
     {
         Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
-        Reference < XInterface > xI = xMSF->createInstance( OUString::createFromAscii( "com.sun.star.i18n.BreakIterator" ) );
+        Reference < XInterface > xI = xMSF->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")) );
         if ( xI.is() )
         {
             Any x = xI->queryInterface( ::getCppuType((const Reference< i18n::XBreakIterator >*)0) );
@@ -816,7 +816,7 @@ Reference < i18n::XExtendedInputSequenceChecker > Edit::ImplGetInputSequenceChec
 //    if ( !xISC.is() )
     {
         Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
-        Reference < XInterface > xI = xMSF->createInstance( OUString::createFromAscii( "com.sun.star.i18n.InputSequenceChecker" ) );
+        Reference < XInterface > xI = xMSF->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.InputSequenceChecker")) );
         if ( xI.is() )
         {
             Any x = xI->queryInterface( ::getCppuType((const Reference< i18n::XExtendedInputSequenceChecker >*)0) );
@@ -878,12 +878,12 @@ void Edit::ImplInsertText( const XubString& rStr, const Selection* pNewSel, sal_
 
         // determine if input-sequence-checking should be applied or not
         //
-        static OUString sModule( OUString::createFromAscii( "/org.openoffice.Office.Common/I18N" ) );
-        static OUString sRelNode( OUString::createFromAscii( "CTL" ) );
-        static OUString sCTLSequenceChecking( OUString::createFromAscii( "CTLSequenceChecking" ) );
-        static OUString sCTLSequenceCheckingRestricted( OUString::createFromAscii( "CTLSequenceCheckingRestricted" ) );
-        static OUString sCTLSequenceCheckingTypeAndReplace( OUString::createFromAscii( "CTLSequenceCheckingTypeAndReplace" ) );
-        static OUString sCTLFont( OUString::createFromAscii( "CTLFont" ) );
+        static OUString sModule( RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Common/I18N") );
+        static OUString sRelNode( RTL_CONSTASCII_USTRINGPARAM("CTL") );
+        static OUString sCTLSequenceChecking( RTL_CONSTASCII_USTRINGPARAM("CTLSequenceChecking") );
+        static OUString sCTLSequenceCheckingRestricted( RTL_CONSTASCII_USTRINGPARAM("CTLSequenceCheckingRestricted") );
+        static OUString sCTLSequenceCheckingTypeAndReplace( RTL_CONSTASCII_USTRINGPARAM("CTLSequenceCheckingTypeAndReplace") );
+        static OUString sCTLFont( RTL_CONSTASCII_USTRINGPARAM("CTLFont") );
         //
         sal_Bool bCTLSequenceChecking               = sal_False;
         sal_Bool bCTLSequenceCheckingRestricted     = sal_False;
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index fafe06e47c89..e0455630e496 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -758,11 +758,6 @@ void FixedBitmap::ImplDraw( OutputDevice* pDev, ULONG /* nDrawFlags */,
     USHORT nStyle = 0;
     Bitmap* pBitmap = &maBitmap;
     Color aCol;
-    if( !!maBitmapHC )
-    {
-        if( GetSettings().GetStyleSettings().GetHighContrastMode() )
-            pBitmap = &maBitmapHC;
-    }
 
     if( nStyle & IMAGE_DRAW_COLORTRANSFORM )
     {
@@ -884,28 +879,17 @@ void FixedBitmap::SetBitmap( const Bitmap& rBitmap )
 
 // -----------------------------------------------------------------------
 
-BOOL FixedBitmap::SetModeBitmap( const Bitmap& rBitmap, BmpColorMode eMode )
+BOOL FixedBitmap::SetModeBitmap( const Bitmap& rBitmap )
 {
-    if( eMode == BMP_COLOR_NORMAL )
-        SetBitmap( rBitmap );
-    else if( eMode == BMP_COLOR_HIGHCONTRAST )
-    {
-        maBitmapHC = rBitmap;
-        StateChanged( STATE_CHANGE_DATA );
-    }
-    else
-        return FALSE;
+    SetBitmap( rBitmap );
     return TRUE;
 }
 
 // -----------------------------------------------------------------------
 
-const Bitmap& FixedBitmap::GetModeBitmap( BmpColorMode eMode) const
+const Bitmap& FixedBitmap::GetModeBitmap( ) const
 {
-    if( eMode == BMP_COLOR_HIGHCONTRAST )
-        return maBitmapHC;
-    else
-        return maBitmap;
+    return maBitmap;
 }
 
 // =======================================================================
@@ -1009,11 +993,6 @@ void FixedImage::ImplDraw( OutputDevice* pDev, ULONG nDrawFlags,
 
     Image *pImage = &maImage;
     Color aCol;
-    if( !!maImageHC )
-    {
-        if( GetSettings().GetStyleSettings().GetHighContrastMode() )
-            pImage = &maImageHC;
-    }
 
     // Haben wir ueberhaupt ein Image
     if ( !(!(*pImage)) )
@@ -1044,7 +1023,7 @@ void FixedImage::Paint( const Rectangle& )
 
 Size FixedImage::GetOptimalSize( WindowSizeType ) const
 {
-    const Image* pImage = GetSettings().GetStyleSettings().GetHighContrastMode() ? &maImageHC : &maImage;
+    const Image* pImage = &maImage;
     return pImage->GetSizePixel();
 }
 
@@ -1139,31 +1118,17 @@ void FixedImage::SetImage( const Image& rImage )
 
 // -----------------------------------------------------------------------
 
-BOOL FixedImage::SetModeImage( const Image& rImage, BmpColorMode eMode )
+BOOL FixedImage::SetModeImage( const Image& rImage )
 {
-    if( eMode == BMP_COLOR_NORMAL )
-        SetImage( rImage );
-    else if( eMode == BMP_COLOR_HIGHCONTRAST )
-    {
-        if( maImageHC != rImage )
-        {
-            maImageHC = rImage;
-            StateChanged( STATE_CHANGE_DATA );
-        }
-    }
-    else
-        return FALSE;
+    SetImage( rImage );
     return TRUE;
 }
 
 // -----------------------------------------------------------------------
 
-const Image& FixedImage::GetModeImage( BmpColorMode eMode ) const
+const Image& FixedImage::GetModeImage( ) const
 {
-    if( eMode == BMP_COLOR_HIGHCONTRAST )
-        return maImageHC;
-    else
-        return maImage;
+    return maImage;
 }
 
 // -----------------------------------------------------------------------
diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx
index 73d303b871ea..5b062d6ea8ef 100644
--- a/vcl/source/control/group.cxx
+++ b/vcl/source/control/group.cxx
@@ -135,6 +135,7 @@ GroupBox::GroupBox( Window* pParent, const ResId& rResId ) :
 void GroupBox::ImplDraw( OutputDevice* pDev, ULONG nDrawFlags,
                          const Point& rPos, const Size& rSize, bool bLayout )
 {
+        OSL_TRACE("GroupBox::ImplDraw Y %d, X %d", rPos.Y(), rPos.X() );
     long                    nTop;
     long                    nTextOff;
     const StyleSettings&    rStyleSettings = GetSettings().GetStyleSettings();
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index b89bd2bde25a..9d4958abfd88 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -2711,25 +2711,17 @@ ImplWin::ImplWin( Window* pParent, WinBits nWinStyle ) :
 
 // -----------------------------------------------------------------------
 
-BOOL ImplWin::SetModeImage( const Image& rImage, BmpColorMode eMode )
+BOOL ImplWin::SetModeImage( const Image& rImage )
 {
-    if( eMode == BMP_COLOR_NORMAL )
-        SetImage( rImage );
-    else if( eMode == BMP_COLOR_HIGHCONTRAST )
-        maImageHC = rImage;
-    else
-        return FALSE;
+    SetImage( rImage );
     return TRUE;
 }
 
 // -----------------------------------------------------------------------
 
-const Image& ImplWin::GetModeImage( BmpColorMode eMode ) const
+const Image& ImplWin::GetModeImage( ) const
 {
-    if( eMode == BMP_COLOR_HIGHCONTRAST )
-        return maImageHC;
-    else
-        return maImage;
+    return maImage;
 }
 
 // -----------------------------------------------------------------------
@@ -2746,7 +2738,6 @@ void ImplWin::MouseButtonDown( const MouseEvent& )
 {
     if( IsEnabled() )
     {
-//      Control::MouseButtonDown( rMEvt );
         MBDown();
     }
 }
@@ -2908,12 +2899,6 @@ void ImplWin::DrawEntry( BOOL bDrawImage, BOOL bDrawText, BOOL bDrawTextAtImageP
         // check for HC mode
         Image *pImage = &maImage;
 
-        if( !!maImageHC )
-        {
-            if( GetSettings().GetStyleSettings().GetHighContrastMode() )
-                pImage = &maImageHC;
-        }
-
         if ( !IsZoom() )
         {
             DrawImage( aPtImg, *pImage, nStyle );
@@ -3147,6 +3132,11 @@ Size ImplListBoxFloatingWindow::CalcFloatSize()
             long nSBWidth = GetSettings().GetStyleSettings().GetScrollBarSize();
             aFloatSz.Width() += nSBWidth;
         }
+
+        long nDesktopWidth = GetDesktopRectPixel().getWidth();
+        if (aFloatSz.Width() > nDesktopWidth)
+            // Don't exceed the desktop width.
+            aFloatSz.Width() = nDesktopWidth;
     }
 
     if ( aFloatSz.Height() > nMaxHeight )
@@ -3173,6 +3163,13 @@ Size ImplListBoxFloatingWindow::CalcFloatSize()
         aFloatSz.Height() = nInnerHeight + nTop + nBottom;
     }
 
+    if (aFloatSz.Width() < aSz.Width())
+    {
+        // The max width of list box entries exceeds the window width.
+        // Account for the scroll bar height.
+        long nSBWidth = GetSettings().GetStyleSettings().GetScrollBarSize();
+        aFloatSz.Height() += nSBWidth;
+    }
     return aFloatSz;
 }
 
diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx
index dfb74ecc4880..c5ae529f9b26 100644
--- a/vcl/source/control/imgctrl.cxx
+++ b/vcl/source/control/imgctrl.cxx
@@ -91,12 +91,6 @@ void ImageControl::UserDraw( const UserDrawEvent& rUDEvt )
 {
     USHORT nStyle = 0;
     BitmapEx* pBitmap = &maBmp;
-    if( !!maBmpHC )
-    {
-        if( GetSettings().GetStyleSettings().GetHighContrastMode() )
-            pBitmap = &maBmpHC;
-    }
-
     if ( !*pBitmap )
     {
         String  sText( GetText() );
@@ -201,28 +195,17 @@ void ImageControl::SetBitmap( const BitmapEx& rBmp )
 
 // -----------------------------------------------------------------------
 
-BOOL ImageControl::SetModeBitmap( const BitmapEx& rBitmap, BmpColorMode eMode )
+BOOL ImageControl::SetModeBitmap( const BitmapEx& rBitmap )
 {
-    if( eMode == BMP_COLOR_NORMAL )
-        SetBitmap( rBitmap );
-    else if( eMode == BMP_COLOR_HIGHCONTRAST )
-    {
-        maBmpHC = rBitmap;
-        StateChanged( STATE_CHANGE_DATA );
-    }
-    else
-        return FALSE;
+    SetBitmap( rBitmap );
     return TRUE;
 }
 
 // -----------------------------------------------------------------------
 
-const BitmapEx& ImageControl::GetModeBitmap( BmpColorMode eMode ) const
+const BitmapEx& ImageControl::GetModeBitmap( ) const
 {
-    if( eMode == BMP_COLOR_HIGHCONTRAST )
-        return maBmpHC;
-    else
-        return maBmp;
+    return maBmp;
 }
 
 // -----------------------------------------------------------------------
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 8cc7bb221a09..4d9b215ceb21 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -174,6 +174,18 @@ const Color& TabControl::GetCanonicalTextColor( const StyleSettings& _rStyle ) c
 
 // -----------------------------------------------------------------------
 
+WinBits TabControl::ImplInitStyle( WinBits nStyle )
+{
+    if ( !(nStyle & WB_NOTABSTOP) )
+        nStyle |= WB_TABSTOP;
+    if ( !(nStyle & WB_NOGROUP) )
+        nStyle |= WB_GROUP;
+
+    return nStyle;
+}
+
+// -----------------------------------------------------------------------
+
 void TabControl::ImplInitSettings( BOOL bFont,
                                    BOOL bForeground, BOOL bBackground )
 {
@@ -230,6 +242,7 @@ TabControl::TabControl( Window* pParent, WinBits nStyle ) :
     Control( WINDOW_TABCONTROL )
 {
     ImplInit( pParent, nStyle );
+    OSL_TRACE("*** TABCONTROL no notabs? %s", ( GetStyle() & WB_NOBORDER ) ? "true" : "false" );
 }
 
 // -----------------------------------------------------------------------
@@ -695,7 +708,13 @@ void TabControl::ImplChangeTabPage( USHORT nId, USHORT nOldId )
 
     if ( pPage )
     {
-        pPage->SetPosSizePixel( aRect.TopLeft(), aRect.GetSize() );
+        if (  ( GetStyle() & WB_NOBORDER ) )
+        {
+            Rectangle aRectNoTab( (const Point&)Point( 0, 0 ), GetSizePixel() );
+            pPage->SetPosSizePixel( aRectNoTab.TopLeft(), aRectNoTab.GetSize() );
+        }
+        else
+            pPage->SetPosSizePixel( aRect.TopLeft(), aRect.GetSize() );
 
         // activate page here so the conbtrols can be switched
         // also set the help id of the parent window to that of the tab page
@@ -755,6 +774,12 @@ BOOL TabControl::ImplPosCurTabPage()
     ImplTabItem* pItem = ImplGetItem( GetCurPageId() );
     if ( pItem && pItem->mpTabPage )
     {
+        if (  ( GetStyle() & WB_NOBORDER ) )
+        {
+            Rectangle aRectNoTab( (const Point&)Point( 0, 0 ), GetSizePixel() );
+            pItem->mpTabPage->SetPosSizePixel( aRectNoTab.TopLeft(), aRectNoTab.GetSize() );
+            return TRUE;
+        }
         Rectangle aRect = ImplGetTabRect( TAB_PAGERECT );
         pItem->mpTabPage->SetPosSizePixel( aRect.TopLeft(), aRect.GetSize() );
         return TRUE;
@@ -1163,7 +1188,8 @@ void TabControl::KeyInput( const KeyEvent& rKEvt )
 
 void TabControl::Paint( const Rectangle& rRect )
 {
-    ImplPaint( rRect, false );
+    if (  !( GetStyle() & WB_NOBORDER ) )
+        ImplPaint( rRect, false );
 }
 
 // -----------------------------------------------------------------------
@@ -1191,7 +1217,6 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout )
     // Draw the TabPage border
     const StyleSettings&    rStyleSettings  = GetSettings().GetStyleSettings();
     Rectangle               aCurRect;
-    long                    nTopOff = 1;
     aRect.Left()   -= TAB_OFFSET;
     aRect.Top()    -= TAB_OFFSET;
     aRect.Right()  += TAB_OFFSET;
@@ -1233,6 +1258,7 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout )
     }
     else
     {
+        long nTopOff = 1;
         if ( !(rStyleSettings.GetOptions() & STYLE_OPTION_MONO) )
             SetLineColor( rStyleSettings.GetLightColor() );
         else
@@ -1600,6 +1626,10 @@ void TabControl::StateChanged( StateChangedType nType )
         ImplInitSettings( FALSE, FALSE, TRUE );
         Invalidate();
     }
+    else if ( nType == STATE_CHANGE_STYLE )
+    {
+        SetStyle( ImplInitStyle( GetStyle() ) );
+    }
 }
 
 // -----------------------------------------------------------------------
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index a94e46659a41..26a0100c3db8 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -2048,7 +2048,7 @@ void Type1Emitter::emitValVector( const char* pLineHead, const char* pLineTail,
         return;
 
     // emit the line head
-    mpPtr += sprintf( mpPtr, pLineHead);
+    mpPtr += sprintf( mpPtr, "%s", pLineHead);
     // emit the vector values
     ValVector::value_type aVal = 0;
     for( ValVector::const_iterator it = rVector.begin();;) {
@@ -2061,7 +2061,7 @@ void Type1Emitter::emitValVector( const char* pLineHead, const char* pLineTail,
     // emit the last value
     mpPtr += dbl2str( mpPtr, aVal);
     // emit the line tail
-    mpPtr += sprintf( mpPtr, pLineTail);
+    mpPtr += sprintf( mpPtr, "%s", pLineTail);
 }
 
 // --------------------------------------------------------------------
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 3555b701ef8a..001d7790cb20 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1842,7 +1842,7 @@ static int doOpenTTFont( sal_uInt32 facenum, TrueTypeFont* t )
         {
 #if OSL_DEBUG_LEVEL > 1
             if( t->tables[i] )
-                fprintf( stderr, "font file %s has bad table offset %d (tagnum=%d)\n", t->fname, (sal_uInt8*)t->tables[i]-t->ptr, i );
+                fprintf( stderr, "font file %s has bad table offset %" SAL_PRI_PTRDIFFT "d (tagnum=%d)\n", t->fname, (sal_uInt8*)t->tables[i]-t->ptr, i );
 #endif
             t->tlens[i] = 0;
             t->tables[i] = NULL;
@@ -2058,7 +2058,7 @@ int  CreateT3FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *fname, /*FO
     fprintf(outf, h02, modname, modver, modextra);
     fprintf(outf, h09, ttf->psname);
 
-    fprintf(outf, h10);
+    fprintf(outf, "%s", h10);
     fprintf(outf, h11, fname);
 /*    fprintf(outf, h12, 4000000); */
 
@@ -2073,17 +2073,17 @@ int  CreateT3FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *fname, /*FO
      */
 
     fprintf(outf, h17, rtl_crc32(0, ttf->ptr, ttf->fsize), nGlyphs, rtl_crc32(0, glyphArray, nGlyphs * 2), rtl_crc32(0, encoding, nGlyphs));
-    fprintf(outf, h13);
+    fprintf(outf, "%s", h13);
     fprintf(outf, h14, XUnits(UPEm, GetInt16(table, 36, 1)), XUnits(UPEm, GetInt16(table, 38, 1)), XUnits(UPEm, GetInt16(table, 40, 1)), XUnits(UPEm, GetInt16(table, 42, 1)));
-    fprintf(outf, h15);
+    fprintf(outf, "%s", h15);
 
     for (i = 0; i < nGlyphs; i++) {
         fprintf(outf, h16, encoding[i], i);
     }
 
     fprintf(outf, h30, nGlyphs+1);
-    fprintf(outf, h31);
-    fprintf(outf, h32);
+    fprintf(outf, "%s", h31);
+    fprintf(outf, "%s", h32);
 
     for (i = 0; i < nGlyphs; i++) {
         fprintf(outf, h33, i);
@@ -2131,14 +2131,14 @@ int  CreateT3FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *fname, /*FO
         }
         if (n > 0) fprintf(outf, "\tfill\n");     /* if glyph is not a whitespace character */
 
-        fprintf(outf, h34);
+        fprintf(outf, "%s", h34);
 
         free(pa);
         free(path);
     }
-    fprintf(outf, h35);
+    fprintf(outf, "%s", h35);
 
-    fprintf(outf, h40);
+    fprintf(outf, "%s", h40);
     fprintf(outf, h41, fname);
 
     return SF_OK;
diff --git a/vcl/source/gdi/bitmap2.cxx b/vcl/source/gdi/bitmap2.cxx
index e11671e0f2c6..6add986538f5 100644
--- a/vcl/source/gdi/bitmap2.cxx
+++ b/vcl/source/gdi/bitmap2.cxx
@@ -216,7 +216,8 @@ BOOL Bitmap::ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, ULONG nOffset, BOOL bIs
 
                 // set decoded bytes to memory stream,
                 // from which we will read the bitmap data
-                pIStm = pMemStm = new SvMemoryStream;
+                pMemStm = new SvMemoryStream;
+                pIStm = pMemStm;
                 pMemStm->SetBuffer( (char*) pData, nUncodedSize, FALSE, nUncodedSize );
                 nOffset = 0;
             }
diff --git a/vcl/source/gdi/bmpconv.cxx b/vcl/source/gdi/bmpconv.cxx
index c47b3ca4908d..2660f4e4cfcc 100644
--- a/vcl/source/gdi/bmpconv.cxx
+++ b/vcl/source/gdi/bmpconv.cxx
@@ -119,7 +119,7 @@ Any SAL_CALL BmpConverter::getValue( const OUString& ) throw( UnknownPropertyExc
 
 sal_Bool SAL_CALL BmpConverter::hasMethod( const OUString& rName ) throw()
 {
-    return rName.equalsIgnoreAsciiCase( OUString::createFromAscii( "convert-bitmap-depth" ) );
+    return rName.equalsIgnoreAsciiCase( OUString(RTL_CONSTASCII_USTRINGPARAM("convert-bitmap-depth")) );
 }
 
 sal_Bool SAL_CALL BmpConverter::hasProperty( const OUString& ) throw()
@@ -136,7 +136,7 @@ Any SAL_CALL BmpConverter::invoke(
 {
     Any aRet;
 
-    if( rFunction.equalsIgnoreAsciiCase( OUString::createFromAscii( "convert-bitmap-depth" ) ) )
+    if( rFunction.equalsIgnoreAsciiCase( OUString(RTL_CONSTASCII_USTRINGPARAM("convert-bitmap-depth")) ) )
     {
         Reference< XBitmap > xBM;
         sal_uInt16 nTargetDepth = 0;
diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx
index c8be4e9145d3..fa866ba8130a 100644
--- a/vcl/source/gdi/configsettings.cxx
+++ b/vcl/source/gdi/configsettings.cxx
@@ -139,7 +139,7 @@ void SettingsConfigItem::getValues()
     for( int j = 0; j < aNames.getLength(); j++ )
     {
 #if OSL_DEBUG_LEVEL > 2
-        fprintf( stderr, "found settings data for \"%s\"\n",
+        OSL_TRACE( "found settings data for \"%s\"\n",
                  OUStringToOString( aNames.getConstArray()[j], RTL_TEXTENCODING_ASCII_US ).getStr()
                  );
 #endif
@@ -165,7 +165,7 @@ void SettingsConfigItem::getValues()
                 if( pLine->getLength() )
                     m_aSettings[ aKeyName ][ pFrom[i] ] = *pLine;
 #if OSL_DEBUG_LEVEL > 2
-                fprintf( stderr, "   \"%s\"=\"%.30s\"\n",
+                OSL_TRACE( "   \"%s\"=\"%.30s\"\n",
                          OUStringToOString( aKeys.getConstArray()[i], RTL_TEXTENCODING_ASCII_US ).getStr(),
                          OUStringToOString( *pLine, RTL_TEXTENCODING_ASCII_US ).getStr()
                          );
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index fdb6ab0e6b4a..7c10fb46c647 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -523,7 +523,7 @@ bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, S
             uno::Reference< rendering::XBitmapCanvas > xBitmapCanvas( xBitmap, uno::UNO_QUERY );
             if( xBitmapCanvas.is() ) {
                 args[0] = uno::Any( xBitmapCanvas );
-                xMtfRenderer.set( xFactory->createInstanceWithArguments( ::rtl::OUString::createFromAscii( "com.sun.star.rendering.MtfRenderer" ),
+                xMtfRenderer.set( xFactory->createInstanceWithArguments( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.rendering.MtfRenderer")),
                                                                          args ), uno::UNO_QUERY );
 
                 if( xMtfRenderer.is() ) {
diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx
index e74d41967a7d..5341433d0bdd 100644
--- a/vcl/source/gdi/image.cxx
+++ b/vcl/source/gdi/image.cxx
@@ -797,7 +797,7 @@ Image ImageList::GetImage( USHORT nId ) const
     {
         std::vector<ImageAryData *>::iterator aIter;
         for( aIter = mpImplData->maImages.begin();
-             aIter != mpImplData->maImages.end(); aIter++)
+             aIter != mpImplData->maImages.end(); ++aIter)
         {
             if ((*aIter)->mnId == nId)
             {
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 63b30b483fcb..cbd53dc1b201 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -388,7 +388,7 @@ void ImpGraphic::ImplClear()
                 ::ucbhelper::Content aCnt( mpSwapFile->aSwapURL.GetMainURL( INetURLObject::NO_DECODE ),
                                      ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() );
 
-                aCnt.executeCommand( ::rtl::OUString::createFromAscii( "delete" ),
+                aCnt.executeCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),
                                      ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) );
             }
             catch( const ::com::sun::star::ucb::ContentCreationException& )
@@ -1069,7 +1069,7 @@ BOOL ImpGraphic::ImplReadEmbedded( SvStream& rIStm, BOOL bSwap )
                                     ::ucbhelper::Content aCnt( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ),
                                                          ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() );
 
-                                    aCnt.executeCommand( ::rtl::OUString::createFromAscii( "delete" ),
+                                    aCnt.executeCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),
                                                          ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) );
                                 }
                                 catch( const ::com::sun::star::ucb::ContentCreationException& )
@@ -1253,7 +1253,7 @@ BOOL ImpGraphic::ImplSwapOut()
                             ::ucbhelper::Content aCnt( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ),
                                                  ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() );
 
-                            aCnt.executeCommand( ::rtl::OUString::createFromAscii( "delete" ),
+                            aCnt.executeCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),
                                                  ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) );
                         }
                         catch( const ::com::sun::star::ucb::ContentCreationException& )
@@ -1355,7 +1355,7 @@ BOOL ImpGraphic::ImplSwapIn()
                             ::ucbhelper::Content aCnt( aSwapURL,
                                                  ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() );
 
-                            aCnt.executeCommand( ::rtl::OUString::createFromAscii( "delete" ),
+                            aCnt.executeCommand( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),
                                                  ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) );
                         }
                         catch( const ::com::sun::star::ucb::ContentCreationException& )
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 54fa97e5f46f..403eb638b63c 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -151,6 +151,32 @@ bool ImplImageTree::checkStyle(rtl::OUString const & style)
 
 bool ImplImageTree::loadImage(
     rtl::OUString const & name, rtl::OUString const & style, BitmapEx & bitmap,
+    bool localized, bool loadMissing )
+{
+    bool found = false;
+    try {
+        found = doLoadImage(name, style, bitmap, localized);
+    } catch (css::uno::RuntimeException &) {
+        if (!loadMissing)
+            throw;
+    }
+    if (found || !loadMissing)
+        return found;
+
+    try {
+        OSL_TRACE(
+            "ImplImageTree::loadImage exception couldn't load \"%s\", fetching missing_icon.png",
+            rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8).getStr());
+        found = doLoadImage( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("res/missing_icon.png")),
+            style, bitmap, false);
+    } catch (css::uno::RuntimeException &) {
+        throw;
+    }
+    return found;
+}
+
+bool ImplImageTree::doLoadImage(
+    rtl::OUString const & name, rtl::OUString const & style, BitmapEx & bitmap,
     bool localized)
 {
     setStyle(style);
@@ -273,7 +299,7 @@ void ImplImageTree::resetZips() {
                 u.GetMainURL(INetURLObject::NO_DECODE),
                 css::uno::Reference< css::container::XNameAccess >()));
     }
-    if ( m_style.equals(::rtl::OUString::createFromAscii("default")) )
+    if ( m_style.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("default"))) )
     {
         rtl::OUString url(
             RTL_CONSTASCII_USTRINGPARAM(
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 25afe9946ccb..3c999ef9762a 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -1442,19 +1442,35 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
     rIStm   >> mnLen;
     rIStm   >> nAryLen;
 
+    if ( mnIndex > mnLen )
+    {
+        mnIndex = 0;
+        mpDXAry = 0;
+        return;
+    }
+
     if( nAryLen )
     {
         // #i9762#, #106172# Ensure that DX array is at least mnLen entries long
-        const ULONG nIntAryLen( Max(nAryLen, static_cast<sal_uInt32>(mnLen)) );
-        mpDXAry = new sal_Int32[ nIntAryLen ];
-
-        ULONG i;
-        for( i = 0UL; i < nAryLen; i++ )
-            rIStm >> mpDXAry[ i ];
+        if ( mnLen >= nAryLen )
+        {
+            mpDXAry = new (std::nothrow)sal_Int32[ mnLen ];
+            if ( mpDXAry )
+            {
+                   ULONG i;
+                for( i = 0UL; i < nAryLen; i++ )
+                    rIStm >> mpDXAry[ i ];
 
-        // #106172# setup remainder
-        for( ; i < nIntAryLen; i++ )
-            mpDXAry[ i ] = 0;
+                // #106172# setup remainder
+                for( ; i < mnLen; i++ )
+                    mpDXAry[ i ] = 0;
+            }
+        }
+        else
+        {
+            mpDXAry = NULL;
+            return;
+        }
     }
     else
         mpDXAry = NULL;
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index 0389d8364b2c..08c27603e193 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -2488,6 +2488,9 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt,
     const bool bDashUsed(LINE_DASH == aInfo.GetStyle());
     const bool bLineWidthUsed(aInfo.GetWidth() > 1);
 
+    if ( mbInitLineColor )
+        ImplInitLineColor();
+
     if(bDashUsed || bLineWidthUsed)
     {
         basegfx::B2DPolygon aLinePolygon;
@@ -2498,9 +2501,6 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt,
     }
     else
     {
-        if ( mbInitLineColor )
-            ImplInitLineColor();
-
         mpGraphics->DrawLine( aStartPt.X(), aStartPt.Y(), aEndPt.X(), aEndPt.Y(), this );
     }
 
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index b3e5362be198..10f4e693d48b 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -7366,7 +7366,14 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const String& rText, bool bT
                 // try to handle ligatures and such
                 if( i < nGlyphs-1 )
                 {
-                    pUnicodesPerGlyph[i] = nChars = pCharPosAry[i+1] - pCharPosAry[i];
+                    nChars = pCharPosAry[i+1] - pCharPosAry[i];
+                    // #i115618# fix for simple RTL+CTL cases
+                    // TODO: sanitize for RTL ligatures, more complex CTL, etc.
+                    if( nChars < 0 )
+                        nChars = -nChars;
+            else if( nChars == 0 )
+                        nChars = 1;
+                    pUnicodesPerGlyph[i] = nChars;
                     for( int n = 1; n < nChars; n++ )
                         aUnicodes.push_back( rText.GetChar( sal::static_int_cast<xub_StrLen>(pCharPosAry[i]+n) ) );
                 }
@@ -11802,7 +11809,7 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa
             rNewWidget.m_nTextStyle =
                 TEXT_DRAW_VCENTER | TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK;
 
-        rNewWidget.m_aValue = OUString::createFromAscii( rBox.Checked ? "Yes" : "Off" );
+        rNewWidget.m_aValue = rBox.Checked ? OUString(RTL_CONSTASCII_USTRINGPARAM("Yes")) : OUString(RTL_CONSTASCII_USTRINGPARAM("Off" ));
         // create default appearance before m_aRect gets transformed
         createDefaultCheckBoxAppearance( rNewWidget, rBox );
     }
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 95b8419a8131..1c755fe0e7c4 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -201,7 +201,7 @@ public:
             return *this;
         }
 
-        bool operator==( const BitmapID& rComp )
+        bool operator==( const BitmapID& rComp ) const
         {
             return (m_aPixelSize == rComp.m_aPixelSize &&
                     m_nSize == rComp.m_nSize &&
@@ -228,7 +228,7 @@ public:
         sal_Int32           m_nObject;
         bool                m_bTrueColor;
 
-        JPGEmit() : m_pStream( NULL ) {}
+        JPGEmit() : m_pStream( NULL ), m_bTrueColor( false ) {}
         ~JPGEmit() { delete m_pStream; }
     };
 
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index a2094c97a77c..94605be2686d 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -158,7 +158,6 @@ private:
 
     bool                ReadNextChunk();
     void                ReadRemainingChunks();
-    void                SkipRemainingChunks();
 
     void                ImplSetPixel( sal_uInt32 y, sal_uInt32 x, const BitmapColor & );
     void                ImplSetPixel( sal_uInt32 y, sal_uInt32 x, BYTE nPalIndex );
@@ -201,7 +200,9 @@ PNGReaderImpl::PNGReaderImpl( SvStream& rPNGStream )
     mpInflateInBuf  ( NULL ),
     mpScanPrior     ( NULL ),
     mpTransTab      ( NULL ),
+    mpScanCurrent   ( NULL ),
     mpColorTable    ( (sal_uInt8*) mpDefaultColorTable ),
+    mnPass ( 0 ),
     mbzCodecInUse   ( sal_False ),
     mbStatus( TRUE),
     mbIDAT( FALSE ),
@@ -334,30 +335,6 @@ void PNGReaderImpl::ReadRemainingChunks()
 
 // ------------------------------------------------------------------------
 
-// move position of mrPNGStream to the end of the file
-void PNGReaderImpl::SkipRemainingChunks()
-{
-    // nothing to skip if the last chunk was read
-    if( !maChunkSeq.empty() && (maChunkSeq.back().nType == PNGCHUNK_IEND) )
-        return;
-
-    // read from the stream until the IEND chunk is found
-    const sal_Size nStreamPos = mrPNGStream.Tell();
-    while( !mrPNGStream.IsEof() && (mrPNGStream.GetError() == ERRCODE_NONE) )
-    {
-        mrPNGStream >> mnChunkLen >> mnChunkType;
-        if( mnChunkLen < 0 )
-            break;
-        if( nStreamPos + mnChunkLen >= mnStreamSize )
-            break;
-        mrPNGStream.SeekRel( mnChunkLen + 4 );  // skip data + CRC
-        if( mnChunkType == PNGCHUNK_IEND )
-            break;
-    }
-}
-
-// ------------------------------------------------------------------------
-
 const std::vector< vcl::PNGReader::ChunkData >& PNGReaderImpl::GetAllChunks()
 {
     ReadRemainingChunks();
@@ -412,7 +389,9 @@ BitmapEx PNGReaderImpl::GetBitmapEx( const Size& rPreviewSizeHint )
 
             case PNGCHUNK_IDAT :
             {
-                if ( !mbIDAT )      // the gfx is finished, but there may be left a zlibCRC of about 4Bytes
+                if ( !mpInflateInBuf )  // taking care that the header has properly been read
+                    mbStatus = FALSE;
+                else if ( !mbIDAT )     // the gfx is finished, but there may be left a zlibCRC of about 4Bytes
                     ImplReadIDAT();
             }
             break;
@@ -523,7 +502,7 @@ BOOL PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint )
     mbIDAT = mbAlphaChannel = mbTransparent = FALSE;
     mbGrayScale = mbRGBTriple = FALSE;
     mnTargetDepth = mnPngDepth;
-    mnScansize = ( ( maOrigSize.Width() * mnPngDepth ) + 7 ) >> 3;
+    sal_uInt64 nScansize64 = ( ( static_cast< sal_uInt64 >( maOrigSize.Width() ) * mnPngDepth ) + 7 ) >> 3;
 
     // valid color types are 0,2,3,4 & 6
     switch ( mnColorType )
@@ -553,7 +532,7 @@ BOOL PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint )
         case 2 :    // each pixel is an RGB triple
         {
             mbRGBTriple = TRUE;
-            mnScansize *= 3;
+            nScansize64 *= 3;
             switch ( mnPngDepth )
             {
                 case 16 :           // we have to reduce the bitmap
@@ -586,7 +565,7 @@ BOOL PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint )
 
         case 4 :    // each pixel is a grayscale sample followed by an alpha sample
         {
-            mnScansize *= 2;
+            nScansize64 *= 2;
             mbAlphaChannel = TRUE;
             switch ( mnPngDepth )
             {
@@ -604,7 +583,7 @@ BOOL PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint )
         case 6 :    // each pixel is an RGB triple followed by an alpha sample
         {
             mbRGBTriple = TRUE;
-            mnScansize *= 4;
+            nScansize64 *= 4;
             mbAlphaChannel = TRUE;
             switch (mnPngDepth )
             {
@@ -622,16 +601,24 @@ BOOL PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint )
             return FALSE;
     }
 
-    mnBPP = mnScansize / maOrigSize.Width();
+    mnBPP = static_cast< sal_uInt32 >( nScansize64 / maOrigSize.Width() );
     if ( !mnBPP )
         mnBPP = 1;
 
-    mnScansize++;       // each scanline includes one filterbyte
+    nScansize64++;       // each scanline includes one filterbyte
+
+    if ( nScansize64 > SAL_MAX_UINT32 )
+        return FALSE;
+
+    mnScansize = static_cast< sal_uInt32 >( nScansize64 );
 
     // TODO: switch between both scanlines instead of copying
-    mpInflateInBuf = new BYTE[ mnScansize ];
+    mpInflateInBuf = new (std::nothrow) BYTE[ mnScansize ];
     mpScanCurrent = mpInflateInBuf;
-    mpScanPrior = new BYTE[ mnScansize ];
+    mpScanPrior = new (std::nothrow) BYTE[ mnScansize ];
+
+    if ( !mpInflateInBuf || !mpScanPrior )
+        return FALSE;
 
     // calculate target size from original size and the preview hint
     if( rPreviewSizeHint.Width() || rPreviewSizeHint.Height() )
diff --git a/vcl/source/glyphs/gcach_ftyp.cxx b/vcl/source/glyphs/gcach_ftyp.cxx
index 972540f6c7b7..2860eea20d96 100644
--- a/vcl/source/glyphs/gcach_ftyp.cxx
+++ b/vcl/source/glyphs/gcach_ftyp.cxx
@@ -2090,6 +2090,7 @@ PolyArgs::PolyArgs( PolyPolygon& rPolyPoly, USHORT nMaxPoints )
     mnMaxPoints(nMaxPoints),
     mnPoints(0),
     mnPoly(0),
+    mnHeight(0),
     bHasOffline(false)
 {
     mpPointAry  = new Point[ mnMaxPoints ];
diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx
index 32f5ea768066..3e2d839093bc 100644
--- a/vcl/source/helper/canvasbitmap.cxx
+++ b/vcl/source/helper/canvasbitmap.cxx
@@ -687,7 +687,7 @@ sal_Bool SAL_CALL VclCanvasBitmap::getIndex( uno::Sequence< double >& o_entry, s
                          (m_pBmpAcc->HasPalette() ? m_pBmpAcc->GetPaletteEntryCount() : 0 ) : 0 );
     OSL_ENSURE(nIndex >= 0 && nIndex < nCount,"Palette index out of range");
     if( nIndex < 0 || nIndex >= nCount )
-        throw lang::IndexOutOfBoundsException(::rtl::OUString::createFromAscii("Palette index out of range"),
+        throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Palette index out of range")),
                                               static_cast<rendering::XBitmapPalette*>(this));
 
     const BitmapColor aCol = m_pBmpAcc->GetPaletteColor(sal::static_int_cast<USHORT>(nIndex));
@@ -709,7 +709,7 @@ sal_Bool SAL_CALL VclCanvasBitmap::setIndex( const uno::Sequence< double >&, sal
 
     OSL_ENSURE(nIndex >= 0 && nIndex < nCount,"Palette index out of range");
     if( nIndex < 0 || nIndex >= nCount )
-        throw lang::IndexOutOfBoundsException(::rtl::OUString::createFromAscii("Palette index out of range"),
+        throw lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Palette index out of range")),
                                               static_cast<rendering::XBitmapPalette*>(this));
 
     return sal_False; // read-only implementation
diff --git a/vcl/source/src/btntext.src b/vcl/source/src/btntext.src
index 6d2360dae6cb..a6792b202b3d 100644
--- a/vcl/source/src/btntext.src
+++ b/vcl/source/src/btntext.src
@@ -80,68 +80,3 @@ String SV_BUTTONTEXT_ABORT
 {
     Text [ en-US ] = "~Abort";
 };
-
-/* HelpTexte, die wir derzeit nicht mehr verwenden:
-SV_BUTTONHELPTEXT_OK
-{
-    Text = "Schließt dieses Dialogfeld und speichert alle vorgenommenen Änderungen." ;
-};
-
-SV_BUTTONHELPTEXT_CANCEL
-{
-    Text = "Schließt dieses Dialogfeld, ohne Ihre Änderungen zu speichern." ;
-};
-
-SV_BUTTONHELPTEXT_HELP
-{
-    Text = "Zeigt Hilfe zu diesem Fenster an." ;
-};
-
-SV_BUTTONHELPTEXT_MORE
-{
-    Text = "Zeigt weitere EinstellmÖglichkeiten an oder versteckt diese wieder." ;
-};
-
-Finnische-Texte:
-OK          OK
-CANCEL      Peruuta
-HELP        ~Ohje
-MORE        ~Enemmän
-YES         ~Kyllä
-NO          ~Ei
-RETRY       ~Yritäuudelleen
-*/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/vcl/source/src/helptext.src b/vcl/source/src/helptext.src
index a42a9531d9ee..59d7ea3d443e 100644
--- a/vcl/source/src/helptext.src
+++ b/vcl/source/src/helptext.src
@@ -138,26 +138,3 @@ String SV_SHORTCUT_SPLITTER
 {
     Text [ en-US ] = "Split window separator" ;
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src
index fdb1e755c86a..871cd6af2b29 100644
--- a/vcl/source/src/images.src
+++ b/vcl/source/src/images.src
@@ -35,27 +35,27 @@
 
 Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_STDOFFSET)
 {
-    File = "check.bmp";
+    File = "check.png";
 };
 
 Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_WINOFFSET)
 {
-    File = "checkwin.bmp";
+    File = "checkwin.png";
 };
 
 Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_OS2OFFSET)
 {
-    File = "checkos2.bmp";
+    File = "checkos2.png";
 };
 
 Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_MACOFFSET)
 {
-    File = "checkmac.bmp";
+    File = "checkmac.png";
 };
 
 Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_UNIXOFFSET)
 {
-    File = "checkunx.bmp";
+    File = "checkunx.png";
 };
 
 Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_MONOOFFSET)
@@ -65,39 +65,39 @@ Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_MONOOFFSET)
 
 Bitmap (SV_RESID_BITMAP_SCROLLBMP)
 {
-    File = "scrbmp.bmp";
+    File = "scrbmp.png";
 };
 
 Bitmap (SV_RESID_BITMAP_SCROLLMSK)
 {
-    File = "scrmsk.bmp";
+    File = "scrmsk.png";
 };
 
 // -----------------------------------------------------------------------
 
 Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_STDOFFSET)
 {
-    File = "radio.bmp";
+    File = "radio.png";
 };
 
 Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_WINOFFSET)
 {
-    File = "radiowin.bmp";
+    File = "radiowin.png";
 };
 
 Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_OS2OFFSET)
 {
-    File = "radioos2.bmp";
+    File = "radioos2.png";
 };
 
 Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_MACOFFSET)
 {
-    File = "radiomac.bmp";
+    File = "radiomac.png";
 };
 
 Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_UNIXOFFSET)
 {
-    File = "radiounx.bmp";
+    File = "radiounx.png";
 };
 
 Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_MONOOFFSET)
@@ -105,63 +105,41 @@ Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_MONOOFFSET)
     File = "radiomono.bmp";
 };
 
-// -----------------------------------------------------------------------
-
 Bitmap SV_RESID_BITMAP_MSGBOX
 {
     File = "msgbox.png";
 };
 
-// -----------------------------------------------------------------------
-
-Bitmap SV_RESID_BITMAP_MSGBOX_HC
-{
-    File = "msgbox_hc.png";
-};
-
-// -----------------------------------------------------------------------
-
 Bitmap SV_RESID_BITMAP_PIN
 {
-    File = "pin.bmp";
+    File = "pin.png";
 };
 
-// -----------------------------------------------------------------------
-
 Bitmap SV_RESID_BITMAP_CLOSEDOC
 {
-    File = "closedoc.bmp";
-};
-
-Bitmap SV_RESID_BITMAP_CLOSEDOCHC
-{
-    File = "closedochc.bmp";
+    File = "closedoc.png";
 };
 
-// -----------------------------------------------------------------------
-
 Bitmap SV_RESID_BITMAP_SPLITHPIN
 {
-    File = "splhpin.bmp";
+    File = "splhpin.png";
 };
 
 Bitmap SV_RESID_BITMAP_SPLITVPIN
 {
-    File = "splvpin.bmp";
+    File = "splvpin.png";
 };
 
 Bitmap SV_RESID_BITMAP_SPLITHARW
 {
-    File = "splharw.bmp";
+    File = "splharw.png";
 };
 
 Bitmap SV_RESID_BITMAP_SPLITVARW
 {
-    File = "splvarw.bmp";
+    File = "splvarw.png";
 };
 
-// -----------------------------------------------------------------------
-
 Bitmap (SV_ICON_SIZE48_START)
 {
     File = "mainapp_48_8.png" ;
@@ -460,16 +438,6 @@ Bitmap (SV_ICON_SMALL_START)
     File = "mainapp_16.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START)
-{
-    File = "mainapp_32_h.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START)
-{
-    File = "mainapp_16_h.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_OFFICE)
 {
     File = "mainapp_32.png" ;
@@ -480,16 +448,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_OFFICE)
     File = "mainapp_16.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_OFFICE)
-{
-    File = "mainapp_32_h.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_OFFICE)
-{
-    File = "mainapp_16_h" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_TEXT)
 {
     File = "lx03251.png" ;
@@ -500,16 +458,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_TEXT)
     File = "sx03251.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_TEXT)
-{
-    File = "lxh03251.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_TEXT)
-{
-    File = "sxh03251.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_TEXT_TEMPLATE)
 {
     File = "lx03255.png" ;
@@ -520,16 +468,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_TEXT_TEMPLATE)
     File = "sx03255.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_TEXT_TEMPLATE)
-{
-    File = "lxh03255.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_TEXT_TEMPLATE)
-{
-    File = "sxh03255.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_SPREADSHEET)
 {
     File = "lx03250.png" ;
@@ -540,16 +478,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_SPREADSHEET)
     File = "sx03250.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_SPREADSHEET)
-{
-    File = "lxh03250.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_SPREADSHEET)
-{
-    File = "sxh03250.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_SPREADSHEET_TEMPLATE)
 {
     File = "lx03254.png" ;
@@ -560,16 +488,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_SPREADSHEET_TEMPLATE)
     File = "sx03254.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_SPREADSHEET_TEMPLATE)
-{
-    File = "lxh03254.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_SPREADSHEET_TEMPLATE)
-{
-    File = "sxh03254.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_DRAWING)
 {
     File = "lx03246.png" ;
@@ -580,16 +498,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_DRAWING)
     File = "sx03246.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_DRAWING)
-{
-    File = "lxh03246.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_DRAWING)
-{
-    File = "sxh03246.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_DRAWING_TEMPLATE)
 {
     File = "lx03252.png" ;
@@ -600,16 +508,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_DRAWING_TEMPLATE)
     File = "sx03252.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_DRAWING_TEMPLATE)
-{
-    File = "lxh03252.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_DRAWING_TEMPLATE)
-{
-    File = "sxh03252.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_PRESENTATION)
 {
     File = "lx03249.png" ;
@@ -620,16 +518,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_PRESENTATION)
     File = "sx03249.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_PRESENTATION)
-{
-    File = "lxh03249.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_PRESENTATION)
-{
-    File = "sxh03249.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_PRESENTATION_TEMPLATE)
 {
     File = "lx03253.png" ;
@@ -640,16 +528,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_PRESENTATION_TEMPLATE)
     File = "sx03253.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_PRESENTATION_TEMPLATE)
-{
-    File = "lxh03253.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_PRESENTATION_TEMPLATE)
-{
-    File = "sxh03253.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_PRESENTATION_COMPRESSED)
 {
     File = "lx03241.png" ;
@@ -660,16 +538,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_PRESENTATION_COMPRESSED)
     File = "sx03241.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_PRESENTATION_COMPRESSED)
-{
-    File = "lxh03241.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_PRESENTATION_COMPRESSED)
-{
-    File = "sxh03241.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_MASTER_DOCUMENT)
 {
     File = "lx03248.png" ;
@@ -680,16 +548,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_MASTER_DOCUMENT)
     File = "sx03248.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_MASTER_DOCUMENT)
-{
-    File = "lxh03248.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_MASTER_DOCUMENT)
-{
-    File = "sxh03248.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_HTML_DOCUMENT)
 {
     File = "lx03139.png" ;
@@ -700,16 +558,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_HTML_DOCUMENT)
     File = "sx03139.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_HTML_DOCUMENT)
-{
-    File = "lxh03139.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_HTML_DOCUMENT)
-{
-    File = "sxh03139.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_CHART)
 {
     File = "lx03128.png" ;
@@ -720,16 +568,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_CHART)
     File = "sx03128.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_CHART)
-{
-    File = "lxh03128.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_CHART)
-{
-    File = "sxh03128.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_DATABASE)
 {
     File = "lx03245.png" ;
@@ -740,16 +578,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_DATABASE)
     File = "sx03245.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_DATABASE)
-{
-    File = "lxh03245.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_DATABASE)
-{
-    File = "sxh03245.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_FORMULA)
 {
     File = "lx03247.png" ;
@@ -760,16 +588,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_FORMULA)
     File = "sx03247.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_FORMULA)
-{
-    File = "lxh03247.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_FORMULA)
-{
-    File = "sxh03247.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_TEMPLATE)
 {
     File = "lx03242.png" ;
@@ -780,16 +598,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_TEMPLATE)
     File = "sx03242.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_TEMPLATE)
-{
-    File = "lxh03242.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_TEMPLATE)
-{
-    File = "sxh03242.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_MACRO)
 {
     File = "lx03216.png" ;
@@ -800,16 +608,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_MACRO)
     File = "sx03216.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_MACRO)
-{
-    File = "lxh03216.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_MACRO)
-{
-    File = "sxh03216.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_PRINTERADMIN)
 {
     File = "printeradmin_32.png" ;
@@ -820,33 +618,13 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_PRINTERADMIN)
     File = "printeradmin_16.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_PRINTERADMIN)
-{
-    File = "printeradmin_32_h.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_PRINTERADMIN)
-{
-    File = "printeradmin_16_h.png" ;
-};
-
 Bitmap SV_DISCLOSURE_PLUS
 {
     File = "plus.png";
 };
 
-Bitmap SV_DISCLOSURE_PLUS_HC
-{
-    File = "plus_sch.png";
-};
-
 Bitmap SV_DISCLOSURE_MINUS
 {
     File = "minus.png";
 };
 
-Bitmap SV_DISCLOSURE_MINUS_HC
-{
-    File = "minus_sch.png";
-};
-
diff --git a/vcl/source/src/print.src b/vcl/source/src/print.src
index 58f0a477c848..01d3c64f7fdb 100644
--- a/vcl/source/src/print.src
+++ b/vcl/source/src/print.src
@@ -397,16 +397,6 @@ ModalDialog SV_DLG_PRINT
         {
             ImageBitmap = Bitmap { File = "ncollate.png" ; };
         };
-
-        Image SV_PRINT_COLLATE_HC_IMG
-        {
-            ImageBitmap = Bitmap { File = "collate_h.png" ; };
-        };
-
-        Image SV_PRINT_NOCOLLATE_HC_IMG
-        {
-            ImageBitmap = Bitmap { File = "ncollate_h.png" ; };
-        };
     };
 
     TabPage SV_PRINT_TAB_OPT
diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx
index 641686756b74..d60dbb83b6c5 100644
--- a/vcl/source/window/abstdlg.cxx
+++ b/vcl/source/window/abstdlg.cxx
@@ -45,7 +45,7 @@ VclAbstractDialogFactory* VclAbstractDialogFactory::Create()
     static ::osl::Module aDialogLibrary;
     if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( RTL_CONSTASCII_USTRINGPARAM( DLL_NAME ) ) ) )
         fp = ( VclAbstractDialogFactory* (__LOADONCALLAPI*)() )
-            aDialogLibrary.getFunctionSymbol( ::rtl::OUString::createFromAscii("CreateDialogFactory") );
+            aDialogLibrary.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialogFactory")) );
     if ( fp )
         return fp();
     return 0;
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index e6722c3d90d3..2a7e9b07d1f2 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -562,7 +562,6 @@ public:
     Size    getMinSize();
 
     Image   maImage;
-    Image   maImageHC;
 };
 
 DecoToolBox::DecoToolBox( Window* pParent, WinBits nStyle ) :
@@ -640,8 +639,7 @@ void DecoToolBox::SetImages( long nMaxHeight, bool bForce )
 
         Color       aEraseColor( 255, 255, 255, 255 );
         BitmapEx    aBmpExDst( maImage.GetBitmapEx() );
-        BitmapEx    aBmpExSrc( GetSettings().GetStyleSettings().GetHighContrastMode() ?
-                              maImageHC.GetBitmapEx() : aBmpExDst );
+        BitmapEx    aBmpExSrc( aBmpExDst );
 
         aEraseColor.SetTransparency( 255 );
         aBmpExDst.Erase( aEraseColor );
@@ -5165,18 +5163,14 @@ MenuBarWindow::MenuBarWindow( Window* pParent ) :
     if( pResMgr )
     {
         BitmapEx aBitmap( ResId( SV_RESID_BITMAP_CLOSEDOC, *pResMgr ) );
-        BitmapEx aBitmapHC( ResId( SV_RESID_BITMAP_CLOSEDOCHC, *pResMgr ) );
-
         aCloser.maImage = Image( aBitmap );
-        aCloser.maImageHC = Image( aBitmapHC );
 
         aCloser.SetOutStyle( TOOLBOX_STYLE_FLAT );
         aCloser.SetBackground();
         aCloser.SetPaintTransparent( TRUE );
         aCloser.SetParentClipMode( PARENTCLIPMODE_NOCLIP );
 
-        aCloser.InsertItem( IID_DOCUMENTCLOSE,
-        GetSettings().GetStyleSettings().GetHighContrastMode() ? aCloser.maImageHC : aCloser.maImage, 0 );
+        aCloser.InsertItem( IID_DOCUMENTCLOSE, aCloser.maImage, 0 );
         aCloser.SetSelectHdl( LINK( this, MenuBarWindow, CloserHdl ) );
         aCloser.AddEventListener( LINK( this, MenuBarWindow, ToolboxEventHdl ) );
         aCloser.SetQuickHelpText( IID_DOCUMENTCLOSE, XubString( ResId( SV_HELPTEXT_CLOSEDOCUMENT, *pResMgr ) ) );
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 7a21ab627381..07eafcac357a 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -54,14 +54,11 @@ static void ImplInitMsgBoxImageList()
     {
         ResMgr* pResMgr = ImplGetResMgr();
         pSVData->maWinData.mpMsgBoxImgList = new ImageList(4);
-        pSVData->maWinData.mpMsgBoxHCImgList = new ImageList(4);
         if( pResMgr )
         {
             Color aNonAlphaMask( 0xC0, 0xC0, 0xC0 );
             pSVData->maWinData.mpMsgBoxImgList->InsertFromHorizontalBitmap
                 ( ResId( SV_RESID_BITMAP_MSGBOX, *pResMgr ), 4, &aNonAlphaMask );
-            pSVData->maWinData.mpMsgBoxHCImgList->InsertFromHorizontalBitmap
-                ( ResId( SV_RESID_BITMAP_MSGBOX_HC, *pResMgr ), 4, &aNonAlphaMask );
         }
     }
 }
@@ -209,7 +206,7 @@ MessBox::MessBox( Window* pParent, const ResId& rResId ) :
 
 void MessBox::ImplLoadRes( const ResId& )
 {
-    SetText( ReadStringRes() );
+    SetText(     ReadStringRes() );
     SetMessText( ReadStringRes() );
     SetHelpText( ReadStringRes() );
 }
@@ -312,9 +309,6 @@ void MessBox::ImplPosControls()
                                               IMPL_DIALOG_OFFSET-2+IMPL_MSGBOX_OFFSET_EXTRA_Y ),
                                        aImageSize );
         mpFixedImage->SetImage( maImage );
-        // forward the HC image
-        if( !!maImageHC )
-            mpFixedImage->SetModeImage( maImageHC, BMP_COLOR_HIGHCONTRAST );
         mpFixedImage->Show();
         nMaxWidth -= aImageSize.Width()+IMPL_SEP_MSGBOX_IMAGE;
     }
@@ -465,37 +459,41 @@ void MessBox::SetDefaultCheckBoxText()
 
 // -----------------------------------------------------------------------
 
-BOOL MessBox::SetModeImage( const Image& rImage, BmpColorMode eMode )
+BOOL MessBox::SetModeImage( const Image& rImage )
 {
-    if( eMode == BMP_COLOR_NORMAL )
-        SetImage( rImage );
-    else if( eMode == BMP_COLOR_HIGHCONTRAST )
-        maImageHC = rImage;
-    else
-        return FALSE;
+    SetImage( rImage );
     return TRUE;
 }
 
 // -----------------------------------------------------------------------
 
-const Image& MessBox::GetModeImage( BmpColorMode eMode ) const
+const Image& MessBox::GetModeImage( ) const
 {
-    if( eMode == BMP_COLOR_HIGHCONTRAST )
-        return maImageHC;
-    else
-        return maImage;
+    return maImage;
 }
 
 // -----------------------------------------------------------------------
 
+Size MessBox::GetOptimalSize(WindowSizeType eType) const
+{
+    switch( eType ) {
+    case WINDOWSIZE_MINIMUM:
+        // FIXME: base me on the font size ?
+        return Size( 250, 100 );
+    default:
+        return Window::GetOptimalSize( eType );
+    }
+}
+
+// ============================================================================
+
 void InfoBox::ImplInitInfoBoxData()
 {
     // Default Text is the display title from the application
     if ( !GetText().Len() )
         SetText( Application::GetDisplayName() );
 
-    SetImage( GetSettings().GetStyleSettings().GetHighContrastMode() ?
-                InfoBox::GetStandardImageHC() : InfoBox::GetStandardImage() );
+    SetImage( InfoBox::GetStandardImage() );
     mnSoundType = ((USHORT)SOUND_INFO)+1;
 }
 
@@ -523,15 +521,7 @@ Image InfoBox::GetStandardImage()
     return ImplGetSVData()->maWinData.mpMsgBoxImgList->GetImage( 4 );
 }
 
-// -----------------------------------------------------------------------
-
-Image InfoBox::GetStandardImageHC()
-{
-    ImplInitMsgBoxImageList();
-    return ImplGetSVData()->maWinData.mpMsgBoxHCImgList->GetImage( 4 );
-}
-
-// -----------------------------------------------------------------------
+// ============================================================================
 
 void WarningBox::ImplInitWarningBoxData()
 {
@@ -577,7 +567,7 @@ Image WarningBox::GetStandardImage()
     return ImplGetSVData()->maWinData.mpMsgBoxImgList->GetImage( 3 );
 }
 
-// -----------------------------------------------------------------------
+// ============================================================================
 
 void ErrorBox::ImplInitErrorBoxData()
 {
@@ -585,8 +575,7 @@ void ErrorBox::ImplInitErrorBoxData()
     if ( !GetText().Len() )
         SetText( Application::GetDisplayName() );
 
-    SetImage( GetSettings().GetStyleSettings().GetHighContrastMode() ?
-        ErrorBox::GetStandardImageHC() : ErrorBox::GetStandardImage() );
+    SetImage( ErrorBox::GetStandardImage() );
     mnSoundType = ((USHORT)SOUND_ERROR)+1;
 }
 
@@ -615,15 +604,7 @@ Image ErrorBox::GetStandardImage()
     return ImplGetSVData()->maWinData.mpMsgBoxImgList->GetImage( 1 );
 }
 
-// -----------------------------------------------------------------------
-
-Image ErrorBox::GetStandardImageHC()
-{
-    ImplInitMsgBoxImageList();
-    return ImplGetSVData()->maWinData.mpMsgBoxHCImgList->GetImage( 1 );
-}
-
-// -----------------------------------------------------------------------
+// ============================================================================
 
 void QueryBox::ImplInitQueryBoxData()
 {
@@ -631,8 +612,7 @@ void QueryBox::ImplInitQueryBoxData()
     if ( !GetText().Len() )
         SetText( Application::GetDisplayName() );
 
-    SetImage( GetSettings().GetStyleSettings().GetHighContrastMode() ?
-        QueryBox::GetStandardImageHC() : QueryBox::GetStandardImage() );
+    SetImage( QueryBox::GetStandardImage() );
     mnSoundType = ((USHORT)SOUND_QUERY)+1;
 }
 
@@ -669,25 +649,4 @@ Image QueryBox::GetStandardImage()
     return ImplGetSVData()->maWinData.mpMsgBoxImgList->GetImage( 2 );
 }
 
-// -----------------------------------------------------------------------
-
-Image QueryBox::GetStandardImageHC()
-{
-    ImplInitMsgBoxImageList();
-    return ImplGetSVData()->maWinData.mpMsgBoxHCImgList->GetImage( 2 );
-}
-
-// -----------------------------------------------------------------------
-
-Size MessBox::GetOptimalSize(WindowSizeType eType) const
-{
-    switch( eType ) {
-    case WINDOWSIZE_MINIMUM:
-        // FIXME: base me on the font size ?
-        return Size( 250, 100 );
-    default:
-        return Window::GetOptimalSize( eType );
-    }
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 98e7c279559a..887ca0ea8600 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -73,89 +73,19 @@ PrintDialog::PrintPreviewWindow::PrintPreviewWindow( Window* i_pParent, const Re
 {
     SetPaintTransparent( TRUE );
     SetBackground();
-    if( useHCColorReplacement() )
-        maPageVDev.SetBackground( GetSettings().GetStyleSettings().GetWindowColor() );
-    else
-        maPageVDev.SetBackground( Color( COL_WHITE ) );
+    maPageVDev.SetBackground( Color( COL_WHITE ) );
 }
 
 PrintDialog::PrintPreviewWindow::~PrintPreviewWindow()
 {
 }
 
-bool PrintDialog::PrintPreviewWindow::useHCColorReplacement() const
-{
-    bool bRet = false;
-    if( GetSettings().GetStyleSettings().GetHighContrastMode() )
-    {
-        try
-        {
-            // get service provider
-            Reference< XMultiServiceFactory > xSMgr( unohelper::GetMultiServiceFactory() );
-            // create configuration hierachical access name
-            if( xSMgr.is() )
-            {
-                try
-                {
-                    Reference< XMultiServiceFactory > xConfigProvider(
-                        Reference< XMultiServiceFactory >(
-                            xSMgr->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                            "com.sun.star.configuration.ConfigurationProvider" ))),
-                            UNO_QUERY )
-                        );
-                    if( xConfigProvider.is() )
-                    {
-                        Sequence< Any > aArgs(1);
-                        PropertyValue aVal;
-                        aVal.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) );
-                        aVal.Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Common/Accessibility" ) );
-                        aArgs.getArray()[0] <<= aVal;
-                        Reference< XNameAccess > xConfigAccess(
-                            Reference< XNameAccess >(
-                                xConfigProvider->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                                    "com.sun.star.configuration.ConfigurationAccess" )),
-                                                                                aArgs ),
-                                UNO_QUERY )
-                            );
-                        if( xConfigAccess.is() )
-                        {
-                            try
-                            {
-                                sal_Bool bValue = sal_False;
-                                Any aAny = xConfigAccess->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsForPagePreviews" ) ) );
-                                if( aAny >>= bValue )
-                                    bRet = bool(bValue);
-                            }
-                            catch( NoSuchElementException& )
-                            {
-                            }
-                            catch( WrappedTargetException& )
-                            {
-                            }
-                        }
-                    }
-                }
-                catch( Exception& )
-                {
-                }
-            }
-        }
-        catch( WrappedTargetException& )
-        {
-        }
-    }
-    return bRet;
-}
-
 void PrintDialog::PrintPreviewWindow::DataChanged( const DataChangedEvent& i_rDCEvt )
 {
     // react on settings changed
     if( i_rDCEvt.GetType() == DATACHANGED_SETTINGS )
     {
-        if( useHCColorReplacement() )
-            maPageVDev.SetBackground( GetSettings().GetStyleSettings().GetWindowColor() );
-        else
-            maPageVDev.SetBackground( Color( COL_WHITE ) );
+        maPageVDev.SetBackground( Color( COL_WHITE ) );
     }
     Window::DataChanged( i_rDCEvt );
 }
@@ -304,10 +234,6 @@ void PrintDialog::PrintPreviewWindow::setPreview( const GDIMetaFile& i_rNewPrevi
     #endif
     SetQuickHelpText( aBuf.makeStringAndClear() );
     maMtf = i_rNewPreview;
-    if( useHCColorReplacement() )
-    {
-        maMtf.ReplaceColors( Color( COL_BLACK ), Color( COL_WHITE ), 30 );
-    }
 
     maOrigSize = i_rOrigSize;
     maReplacementString = i_rReplacement;
@@ -598,9 +524,7 @@ PrintDialog::JobTabPage::JobTabPage( Window* i_pParent, const ResId& rResId )
     , maCollateBox( this, VclResId( SV_PRINT_COLLATE ) )
     , maCollateImage( this, VclResId( SV_PRINT_COLLATE_IMAGE ) )
     , maCollateImg( VclResId( SV_PRINT_COLLATE_IMG ) )
-    , maCollateHCImg( VclResId( SV_PRINT_COLLATE_HC_IMG ) )
     , maNoCollateImg( VclResId( SV_PRINT_NOCOLLATE_IMG ) )
-    , maNoCollateHCImg( VclResId( SV_PRINT_NOCOLLATE_HC_IMG ) )
     , mnCollateUIMode( 0 )
     , maLayout( NULL, true )
 {
@@ -729,7 +653,8 @@ void PrintDialog::JobTabPage::storeToSettings()
                      maCopyCountField.GetText() );
     pItem->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
                      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Collate" ) ),
-                     rtl::OUString::createFromAscii( maCollateBox.IsChecked() ? "true" : "false" ) );
+                     maCollateBox.IsChecked() ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")) :
+                                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("false")) );
 }
 
 void PrintDialog::JobTabPage::Resize()
@@ -785,7 +710,8 @@ void PrintDialog::OutputOptPage::storeToSettings()
     SettingsConfigItem* pItem = SettingsConfigItem::get();
     pItem->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
                      rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ToFile" ) ),
-                     rtl::OUString::createFromAscii( maToFileBox.IsChecked() ? "true" : "false" ) );
+                     maToFileBox.IsChecked() ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true"))
+                                             : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("false")) );
 }
 
 void PrintDialog::OutputOptPage::Resize()
@@ -1730,21 +1656,12 @@ void PrintDialog::checkControlDependencies()
         maJobPage.maCollateBox.Enable( FALSE );
 
     Image aImg( maJobPage.maCollateBox.IsChecked() ? maJobPage.maCollateImg : maJobPage.maNoCollateImg );
-    Image aHCImg( maJobPage.maCollateBox.IsChecked() ? maJobPage.maCollateHCImg : maJobPage.maNoCollateHCImg );
-    bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
 
     Size aImgSize( aImg.GetSizePixel() );
-    Size aHCImgSize( aHCImg.GetSizePixel() );
-
-    if( aHCImgSize.Width() > aImgSize.Width() )
-        aImgSize.Width() = aHCImgSize.Width();
-    if( aHCImgSize.Height() > aImgSize.Height() )
-        aImgSize.Height() = aHCImgSize.Height();
 
     // adjust size of image
     maJobPage.maCollateImage.SetSizePixel( aImgSize );
-    maJobPage.maCollateImage.SetImage( bHC ? aHCImg : aImg );
-    maJobPage.maCollateImage.SetModeImage( aHCImg, BMP_COLOR_HIGHCONTRAST );
+    maJobPage.maCollateImage.SetImage( aImg );
     maJobPage.maLayout.resize();
 
     // enable setup button only for printers that can be setup
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 0fafed0dd061..08b86cb81113 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -2371,12 +2371,12 @@ BOOL ToolBox::AlwaysLocked()
 
         utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithServiceFactory(
             vcl::unohelper::GetMultiServiceFactory(),
-            OUString::createFromAscii( "/org.openoffice.Office.UI.GlobalSettings/Toolbars" ) );    // note: case sensisitive !
+            OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.UI.GlobalSettings/Toolbars")) );    // note: case sensisitive !
         if ( aNode.isValid() )
         {
             // feature enabled ?
             BOOL bStatesEnabled = BOOL();
-            ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString::createFromAscii( "StatesEnabled" ) );
+            ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString(RTL_CONSTASCII_USTRINGPARAM("StatesEnabled")) );
             if( aValue >>= bStatesEnabled )
             {
                 if( bStatesEnabled == TRUE )
@@ -2384,10 +2384,10 @@ BOOL ToolBox::AlwaysLocked()
                     // now read the locking state
                     utl::OConfigurationNode aNode2 = utl::OConfigurationTreeRoot::tryCreateWithServiceFactory(
                         vcl::unohelper::GetMultiServiceFactory(),
-                        OUString::createFromAscii( "/org.openoffice.Office.UI.GlobalSettings/Toolbars/States" ) );    // note: case sensisitive !
+                        OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.UI.GlobalSettings/Toolbars/States")) );    // note: case sensisitive !
 
                     BOOL bLocked = BOOL();
-                    ::com::sun::star::uno::Any aValue2 = aNode2.getNodeValue( OUString::createFromAscii( "Locked" ) );
+                    ::com::sun::star::uno::Any aValue2 = aNode2.getNodeValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Locked")) );
                     if( aValue2 >>= bLocked )
                         nAlwaysLocked = (bLocked == TRUE) ? 1 : 0;
                 }
@@ -2412,11 +2412,9 @@ void ToolBox::ImplUpdateImageList()
 {
     if (mpData->mpImageListProvider != NULL)
     {
-        BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
         try
         {
-            ImageListType eType = bHC ? vcl::HIGHCONTRAST_YES : vcl::HIGHCONTRAST_NO;
-
+            ImageListType eType = vcl::HIGHCONTRAST_NO;
             if (eType != mpData->meImageListType)
             {
                 vcl::IImageListProvider* pImageListProvider = mpData->mpImageListProvider;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index ffc447b09172..1ecd97d40756 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -286,8 +286,6 @@ bool Window::ImplCheckUIFont( const Font& rFont )
 
 void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, BOOL bCallHdl )
 {
-    // reset high contrast to false, so the system can either update it
-    // or AutoDetectSystemHC can kick in (see below)
     StyleSettings aTmpSt( rSettings.GetStyleSettings() );
     aTmpSt.SetHighContrastMode( FALSE );
     rSettings.SetStyleSettings( aTmpSt );
@@ -471,7 +469,6 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, BOOL bCallHdl )
 
     rSettings.SetStyleSettings( aStyleSettings );
 
-
     // auto detect HC mode; if the system already set it to "yes"
     // (see above) then accept that
     if( !rSettings.GetStyleSettings().GetHighContrastMode() )
@@ -479,10 +476,10 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, BOOL bCallHdl )
         sal_Bool bTmp = sal_False, bAutoHCMode = sal_True;
         utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithServiceFactory(
             vcl::unohelper::GetMultiServiceFactory(),
-            OUString::createFromAscii( "org.openoffice.Office.Common/Accessibility" ) );    // note: case sensisitive !
+            OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/Accessibility")) );    // note: case sensisitive !
         if ( aNode.isValid() )
         {
-            ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString::createFromAscii( "AutoDetectSystemHC" ) );
+            ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString(RTL_CONSTASCII_USTRINGPARAM("AutoDetectSystemHC")) );
             if( aValue >>= bTmp )
                 bAutoHCMode = bTmp;
         }
@@ -493,6 +490,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, BOOL bCallHdl )
             {
                 aStyleSettings = rSettings.GetStyleSettings();
                 aStyleSettings.SetHighContrastMode( TRUE );
+                aStyleSettings.SetSymbolsStyle( STYLE_SYMBOLS_HICONTRAST );
                 rSettings.SetStyleSettings( aStyleSettings );
             }
         }
@@ -502,6 +500,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, BOOL bCallHdl )
     if( pEnvHC && *pEnvHC )
     {
         aStyleSettings.SetHighContrastMode( TRUE );
+        aStyleSettings.SetSymbolsStyle( STYLE_SYMBOLS_HICONTRAST );
         rSettings.SetStyleSettings( aStyleSettings );
     }
 
@@ -8576,22 +8575,22 @@ Reference< XDragSource > Window::GetDragSource()
                         Sequence< Any > aDragSourceAL( 2 ), aDropTargetAL( 2 );
                         OUString aDragSourceSN, aDropTargetSN;
 #if defined WNT
-                        aDragSourceSN = OUString::createFromAscii( "com.sun.star.datatransfer.dnd.OleDragSource" );
-                        aDropTargetSN = OUString::createFromAscii( "com.sun.star.datatransfer.dnd.OleDropTarget" );
+                        aDragSourceSN = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.OleDragSource"));
+                        aDropTargetSN = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.OleDropTarget"));
                         aDragSourceAL[ 1 ] = makeAny( (sal_uInt32) pEnvData->hWnd );
                         aDropTargetAL[ 0 ] = makeAny( (sal_uInt32) pEnvData->hWnd );
 #elif defined QUARTZ
             /* FIXME: Mac OS X specific dnd interface does not exist! *
              * Using Windows based dnd as a temporary solution        */
-                        aDragSourceSN = OUString::createFromAscii( "com.sun.star.datatransfer.dnd.OleDragSource" );
-                        aDropTargetSN = OUString::createFromAscii( "com.sun.star.datatransfer.dnd.OleDropTarget" );
+                        aDragSourceSN = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.OleDragSource"));
+                        aDropTargetSN = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.OleDropTarget"));
                         aDragSourceAL[ 1 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->pView) ) );
                         aDropTargetAL[ 0 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->pView) ) );
 #elif defined UNX
                         aDropTargetAL.realloc( 3 );
                         aDragSourceAL.realloc( 3 );
-                        aDragSourceSN = OUString::createFromAscii( "com.sun.star.datatransfer.dnd.X11DragSource" );
-                        aDropTargetSN = OUString::createFromAscii( "com.sun.star.datatransfer.dnd.X11DropTarget" );
+                        aDragSourceSN = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.X11DragSource"));
+                        aDropTargetSN = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.X11DropTarget"));
 
                         aDragSourceAL[ 0 ] = makeAny( Application::GetDisplayConnection() );
                         aDragSourceAL[ 2 ] = makeAny( vcl::createBmpConverter() );
@@ -8664,10 +8663,10 @@ Reference< XClipboard > Window::GetClipboard()
 
                 if( xFactory.is() )
                 {
-                    mpWindowImpl->mpFrameData->mxClipboard = Reference< XClipboard >( xFactory->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.SystemClipboardExt" ) ), UNO_QUERY );
+                    mpWindowImpl->mpFrameData->mxClipboard = Reference< XClipboard >( xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.SystemClipboardExt")) ), UNO_QUERY );
 
                     if( !mpWindowImpl->mpFrameData->mxClipboard.is() )
-                        mpWindowImpl->mpFrameData->mxClipboard = Reference< XClipboard >( xFactory->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.SystemClipboard" ) ), UNO_QUERY );
+                        mpWindowImpl->mpFrameData->mxClipboard = Reference< XClipboard >( xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.SystemClipboard")) ), UNO_QUERY );
 
 #if defined(UNX) && !defined(QUARTZ)          // unix clipboard needs to be initialized
                     if( mpWindowImpl->mpFrameData->mxClipboard.is() )
@@ -8678,7 +8677,7 @@ Reference< XClipboard > Window::GetClipboard()
                         {
                             Sequence< Any > aArgumentList( 3 );
                             aArgumentList[ 0 ] = makeAny( Application::GetDisplayConnection() );
-                            aArgumentList[ 1 ] = makeAny( OUString::createFromAscii( "CLIPBOARD" ) );
+                            aArgumentList[ 1 ] = makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("CLIPBOARD")) );
                             aArgumentList[ 2 ] = makeAny( vcl::createBmpConverter() );
 
                             xInit->initialize( aArgumentList );
@@ -8721,19 +8720,19 @@ Reference< XClipboard > Window::GetPrimarySelection()
 #if defined(UNX) && !defined(QUARTZ)
                     Sequence< Any > aArgumentList( 3 );
                       aArgumentList[ 0 ] = makeAny( Application::GetDisplayConnection() );
-                    aArgumentList[ 1 ] = makeAny( OUString::createFromAscii( "PRIMARY" ) );
+                    aArgumentList[ 1 ] = makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("PRIMARY")) );
                     aArgumentList[ 2 ] = makeAny( vcl::createBmpConverter() );
 
                     mpWindowImpl->mpFrameData->mxSelection = Reference< XClipboard >( xFactory->createInstanceWithArguments(
-                    OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.SystemClipboard" ), aArgumentList ), UNO_QUERY );
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.SystemClipboard")), aArgumentList ), UNO_QUERY );
 #       else
                     static Reference< XClipboard >      s_xSelection;
 
                     if ( !s_xSelection.is() )
-                         s_xSelection = Reference< XClipboard >( xFactory->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.GenericClipboardExt" ) ), UNO_QUERY );
+                         s_xSelection = Reference< XClipboard >( xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.GenericClipboardExt")) ), UNO_QUERY );
 
                     if ( !s_xSelection.is() )
-                         s_xSelection = Reference< XClipboard >( xFactory->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.clipboard.GenericClipboard" ) ), UNO_QUERY );
+                         s_xSelection = Reference< XClipboard >( xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.GenericClipboard")) ), UNO_QUERY );
 
                     mpWindowImpl->mpFrameData->mxSelection = s_xSelection;
 #       endif
diff --git a/vcl/test/canvasbitmaptest.cxx b/vcl/test/canvasbitmaptest.cxx
index 51ec6685f0ca..94807c051e59 100644
--- a/vcl/test/canvasbitmaptest.cxx
+++ b/vcl/test/canvasbitmaptest.cxx
@@ -123,7 +123,7 @@ class TestWindow : public Dialog
     public:
         TestWindow() : Dialog( (Window *) NULL )
         {
-            SetText( rtl::OUString::createFromAscii( "CanvasBitmap test harness" ) );
+            SetText( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CanvasBitmap test harness")) );
             SetSizePixel( Size( 1024, 1024 ) );
             EnablePaint( true );
             Show();
diff --git a/vcl/test/dndtest.cxx b/vcl/test/dndtest.cxx
index 31bc02ffd8ef..31d7f01b3aa8 100644
--- a/vcl/test/dndtest.cxx
+++ b/vcl/test/dndtest.cxx
@@ -139,7 +139,7 @@ public:
     {
         DataFlavor df;
 
-        df.MimeType = OUString::createFromAscii( "text/plain;charset=utf-16" );
+        df.MimeType = OUString(RTL_CONSTASCII_USTRINGPARAM("text/plain;charset=utf-16"));
         df.DataType = getCppuType( static_cast < OUString * > ( 0 ) );
 
          m_aFlavorList[0] = df;
@@ -163,7 +163,7 @@ void MyApp::Main()
 
         osl_getCommandArg( n, &aArg.pData );
 
-        if( aArg.compareTo( OUString::createFromAscii( "-r" ), 2 ) == 0 )
+        if( aArg.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("-r")), 2 ) == 0 )
         {
             if ( n + 1 < nmax )
                 osl_getCommandArg( ++n, &aRegistry.pData );
@@ -210,7 +210,7 @@ void MyApp::Main()
 
     MyListBox aListBox( &aMainWin );
     aListBox.SetPosSizePixel( 10, 10, 100, 100 );
-    aListBox.InsertEntry( OUString::createFromAscii( "TestItem" ));
+    aListBox.InsertEntry( OUString(RTL_CONSTASCII_USTRINGPARAM("TestItem")));
     aListBox.Show();
 
     Execute();
@@ -296,7 +296,7 @@ void SAL_CALL MyDragAndDropListener::dragGestureRecognized( const DragGestureEve
     printf( "XDragGestureListener::dragGestureRecognized called ( Window: %p, %"SAL_PRIdINT32", %"SAL_PRIdINT32" ).\n", m_pWindow, dge.DragOriginX, dge.DragOriginY );
 
     Reference< XDragSource > xDragSource( dge.DragSource, UNO_QUERY );
-    xDragSource->startDrag( dge, -1, 0, 0, new StringTransferable( OUString::createFromAscii( "TestString" ) ), this );
+    xDragSource->startDrag( dge, -1, 0, 0, new StringTransferable( OUString(RTL_CONSTASCII_USTRINGPARAM("TestString")) ), this );
     printf( "XDragSource::startDrag returned.\n" );
 }
 
@@ -385,7 +385,7 @@ void SAL_CALL MyDragAndDropListener::disposing( const EventObject& ) throw(Runti
 // -----------------------------------------------------------------------
 
 MyInfoBox::MyInfoBox( Window* pParent ) : InfoBox( pParent,
-    OUString::createFromAscii( "dragging over this box should result in another window id in the drag log." ) )
+    OUString(RTL_CONSTASCII_USTRINGPARAM("dragging over this box should result in another window id in the drag log.")) )
 {
     Reference< XDropTargetListener > xListener = new MyDragAndDropListener( this );
 
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index 9896456f91ec..43bca43ac626 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -787,13 +787,13 @@ ooo_atk_util_get_type (void)
 
         static const GTypeInfo typeInfo =
         {
-            type_query.class_size,
+            static_cast<guint16>(type_query.class_size),
             (GBaseInitFunc) NULL,
             (GBaseFinalizeFunc) NULL,
             (GClassInitFunc) ooo_atk_util_class_init,
             (GClassFinalizeFunc) NULL,
             NULL,
-            type_query.instance_size,
+            static_cast<guint16>(type_query.instance_size),
             0,
             (GInstanceInitFunc) NULL,
             NULL
diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx
index be6d646fdc29..c265f79585e8 100644
--- a/vcl/unx/gtk/a11y/atkwindow.cxx
+++ b/vcl/unx/gtk/a11y/atkwindow.cxx
@@ -296,13 +296,13 @@ ooo_window_wrapper_get_type (void)
 
         static const GTypeInfo typeInfo =
         {
-            type_query.class_size,
+            static_cast<guint16>(type_query.class_size),
             (GBaseInitFunc) NULL,
             (GBaseFinalizeFunc) NULL,
             (GClassInitFunc) ooo_window_wrapper_class_init,
             (GClassFinalizeFunc) NULL,
             NULL,
-            type_query.instance_size,
+            static_cast<guint16>(type_query.instance_size),
             0,
             (GInstanceInitFunc) NULL,
             NULL
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 950dbcbea0b6..95cc936df35f 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -316,17 +316,17 @@ long GtkSalDisplay::Dispatch( XEvent* pEvent )
     return GDK_FILTER_CONTINUE;
 }
 
-GdkCursor* GtkSalDisplay::getFromXPM( const char *pBitmap,
-                                      const char *pMask,
+GdkCursor* GtkSalDisplay::getFromXPM( const unsigned char *pBitmap,
+                                      const unsigned char *pMask,
                                       int nWidth, int nHeight,
                                       int nXHot, int nYHot )
 {
     GdkScreen *pScreen = gdk_display_get_default_screen( m_pGdkDisplay );
     GdkDrawable *pDrawable = GDK_DRAWABLE( gdk_screen_get_root_window (pScreen) );
     GdkBitmap *pBitmapPix = gdk_bitmap_create_from_data
-            ( pDrawable, pBitmap, nWidth, nHeight );
+            ( pDrawable, reinterpret_cast<const char*>(pBitmap), nWidth, nHeight );
     GdkBitmap *pMaskPix = gdk_bitmap_create_from_data
-            ( pDrawable, pMask, nWidth, nHeight );
+            ( pDrawable, reinterpret_cast<const char*>(pMask), nWidth, nHeight );
     GdkColormap *pColormap = gdk_drawable_get_colormap( pDrawable );
 
     GdkColor aWhite = { 0, 0xffff, 0xffff, 0xffff };
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index b307f955cc2a..985fb155bf94 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -268,7 +268,7 @@ public:
 
     void SetSize( int n)
         { delete [] pData; m_idx = 0; m_size = n; pData = new NWPixmapCacheData[m_size]; }
-    int GetSize() { return m_size; }
+    int GetSize() const { return m_size; }
 
     BOOL Find( ControlType aType, ControlState aState, const Rectangle& r_pixmapRect, GdkPixmap** pPixmap );
     void Fill( ControlType aType, ControlState aState, const Rectangle& r_pixmapRect, GdkPixmap* pPixmap );
@@ -918,7 +918,13 @@ BOOL GtkSalGraphics::drawNativeMixedStateCheck( ControlType nType,
     // draw upper half in off state
     const_cast<ImplControlValue&>(aValue).setTristateVal( BUTTONVALUE_OFF );
     XLIB_Region aRegion = XCreateRegion();
-    XRectangle aXRect = { aCtrlRect.Left(), aCtrlRect.Top(), aCtrlRect.GetWidth(), aCtrlRect.GetHeight() };
+    XRectangle aXRect =
+    {
+        static_cast<short>(aCtrlRect.Left()),
+        static_cast<short>(aCtrlRect.Top()),
+        static_cast<unsigned short>(aCtrlRect.GetWidth()),
+        static_cast<unsigned short>(aCtrlRect.GetHeight())
+    };
     const unsigned short nH = aXRect.height/2;
     aXRect.height -= nH;
     XUnionRectWithRegion( &aXRect, aRegion, aRegion );
@@ -3581,8 +3587,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     aStyleSet.SetPreferredSymbolsStyleName( OUString::createFromAscii( pIconThemeName ) );
     g_free( pIconThemeName );
 
-    //  FIXME: need some way of fetching toolbar icon size.
-//  aStyleSet.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_SMALL );
+    aStyleSet.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_LARGE );
 
     const cairo_font_options_t* pNewOptions = NULL;
     if( GdkScreen* pScreen = gdk_display_get_screen( gdk_display_get_default(), m_nScreen ) )
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 860bf980df19..e062dfe89f72 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -1114,13 +1114,6 @@ void GtkSalFrame::SetIcon( USHORT nIcon )
     USHORT nOffsets[2] = { SV_ICON_SMALL_START, SV_ICON_LARGE_START };
     USHORT nIndex;
 
-    // Use high contrast icons where appropriate
-    if( Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
-    {
-        nOffsets[0] = SV_ICON_LARGE_HC_START;
-        nOffsets[1] = SV_ICON_SMALL_HC_START;
-    }
-
     for( nIndex = 0; nIndex < sizeof(nOffsets)/ sizeof(USHORT); nIndex++ )
     {
         // #i44723# workaround gcc temporary problem
@@ -2145,6 +2138,8 @@ void GtkSalFrame::SetPointer( PointerStyle ePointerStyle )
 
 void GtkSalFrame::grabPointer( BOOL bGrab, BOOL bOwnerEvents )
 {
+    static const char* pEnv = getenv( "SAL_NO_MOUSEGRABS" );
+
     if( m_pWindow )
     {
         if( bGrab )
@@ -2167,9 +2162,10 @@ void GtkSalFrame::grabPointer( BOOL bGrab, BOOL bOwnerEvents )
             {
                 const int nMask = ( GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK );
 
-                gdk_pointer_grab( m_pWindow->window, bOwnerEvents,
-                                  (GdkEventMask) nMask, NULL, m_pCurrentCursor,
-                                  GDK_CURRENT_TIME );
+                if( !pEnv || !*pEnv )
+                    gdk_pointer_grab( m_pWindow->window, bOwnerEvents,
+                                      (GdkEventMask) nMask, NULL, m_pCurrentCursor,
+                                      GDK_CURRENT_TIME );
             }
             else
             {
@@ -2179,23 +2175,25 @@ void GtkSalFrame::grabPointer( BOOL bGrab, BOOL bOwnerEvents )
                 //
                 // this is of course a bad hack, especially as we cannot
                 // set the right cursor this way
-                XGrabPointer( getDisplay()->GetDisplay(),
-                              GDK_WINDOW_XWINDOW( m_pWindow->window),
-                              bOwnerEvents,
-                              PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
-                              GrabModeAsync,
-                              GrabModeAsync,
-                              None,
-                              None,
-                              CurrentTime
-                              );
+                if( !pEnv || !*pEnv )
+                    XGrabPointer( getDisplay()->GetDisplay(),
+                                  GDK_WINDOW_XWINDOW( m_pWindow->window),
+                                  bOwnerEvents,
+                                  PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
+                                  GrabModeAsync,
+                                  GrabModeAsync,
+                                  None,
+                                  None,
+                                  CurrentTime
+                        );
 
             }
         }
         else
         {
             // Two GdkDisplays may be open
-            gdk_display_pointer_ungrab( getGdkDisplay(), GDK_CURRENT_TIME);
+            if( !pEnv || !*pEnv )
+                gdk_display_pointer_ungrab( getGdkDisplay(), GDK_CURRENT_TIME);
         }
     }
 }
@@ -3788,11 +3786,18 @@ uno::Reference<accessibility::XAccessibleEditableText> lcl_GetxText()
     uno::Reference<accessibility::XAccessibleEditableText> xText;
     Window* pFocusWin = ImplGetSVData()->maWinData.mpFocusWin;
     if (!pFocusWin)
-    return xText;
+        return xText;
 
-    uno::Reference< accessibility::XAccessible > xAccessible( pFocusWin->GetAccessible( true ) );
-    if (xAccessible.is())
-        xText = FindFocus(xAccessible->getAccessibleContext());
+    try
+    {
+        uno::Reference< accessibility::XAccessible > xAccessible( pFocusWin->GetAccessible( true ) );
+        if (xAccessible.is())
+            xText = FindFocus(xAccessible->getAccessibleContext());
+    }
+    catch(const uno::Exception& e)
+    {
+        g_warning( "Exception in getting input method surrounding text" );
+    }
     return xText;
 }
 
diff --git a/vcl/unx/headless/svpgdi.cxx b/vcl/unx/headless/svpgdi.cxx
index 2a717352d84c..7e3f0b7880dc 100644
--- a/vcl/unx/headless/svpgdi.cxx
+++ b/vcl/unx/headless/svpgdi.cxx
@@ -63,7 +63,7 @@ rDevice
     aBuf.append( "debug" );
     mkdir( aBuf.getStr(), 0777 );
     aBuf.append( "/" );
-    aBuf.append( sal_Int64(reinterpret_cast<sal_uInt32>(rDevice.get())), 16 );
+    aBuf.append( sal_Int64(reinterpret_cast<sal_IntPtr>(rDevice.get())), 16 );
     mkdir( aBuf.getStr(), 0777 );
     aBuf.append( "/bmp" );
     aBuf.append( sal_Int32(dbgStreamNum++) );
diff --git a/vcl/unx/headless/svpprn.cxx b/vcl/unx/headless/svpprn.cxx
index 87a64286c908..9038e3cd42fb 100644
--- a/vcl/unx/headless/svpprn.cxx
+++ b/vcl/unx/headless/svpprn.cxx
@@ -883,7 +883,7 @@ BOOL PspSalPrinter::StartJob(
             nMode = S_IRUSR | S_IWUSR;
 
             ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it;
-            it = pJobSetup->maValueMap.find( ::rtl::OUString::createFromAscii( "FAX#" ) );
+            it = pJobSetup->maValueMap.find( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FAX#")) );
             if( it != pJobSetup->maValueMap.end() )
                 m_aFaxNr = it->second;
 
diff --git a/vcl/unx/inc/plugins/gtk/gtkdata.hxx b/vcl/unx/inc/plugins/gtk/gtkdata.hxx
index 5ea635703189..4f02ea7c5ecf 100644
--- a/vcl/unx/inc/plugins/gtk/gtkdata.hxx
+++ b/vcl/unx/inc/plugins/gtk/gtkdata.hxx
@@ -60,7 +60,7 @@ class GtkSalDisplay : public SalDisplay
     GdkDisplay*                     m_pGdkDisplay;
     GdkCursor                      *m_aCursors[ POINTER_COUNT ];
     bool                            m_bStartupCompleted;
-    GdkCursor* getFromXPM( const char *pBitmap, const char *pMask,
+    GdkCursor* getFromXPM( const unsigned char *pBitmap, const unsigned char *pMask,
                            int nWidth, int nHeight, int nXHot, int nYHot );
 public:
              GtkSalDisplay( GdkDisplay* pDisplay );
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 9293b801d95b..099833a18976 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -1831,6 +1831,8 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
     StyleSettings aStyleSettings( rSettings.GetStyleSettings() );
     bool bSetTitleFont = false;
 
+    aStyleSettings.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_LARGE );
+
     // WM settings
     KConfig *pConfig = KGlobal::config();
     if ( pConfig )
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index 7cdbb0e824a2..107a2a2757b8 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -185,6 +185,8 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
     // General settings
     QPalette pal = kapp->palette();
 
+    style.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_LARGE );
+
     style.SetActiveColor(toColor(pal.color(QPalette::Active, QPalette::Window)));
     style.SetDeactiveColor(toColor(pal.color(QPalette::Inactive, QPalette::Window)));
 
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index e130afbecd15..936167f8c879 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -441,6 +441,7 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
             //setup parameters from the OO values
             option.minimum = sbVal->mnMin;
             option.maximum = sbVal->mnMax - sbVal->mnVisibleSize;
+            option.maximum = qMax( option.maximum, option.minimum ); // bnc#619772
             option.sliderValue = sbVal->mnCur;
             option.sliderPosition = sbVal->mnCur;
             option.pageStep = sbVal->mnVisibleSize;
diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx
index f2eecf0d9cbd..cf38f4bb5c1a 100644
--- a/vcl/unx/source/app/saldisp.cxx
+++ b/vcl/unx/source/app/saldisp.cxx
@@ -803,7 +803,7 @@ void SalDisplay::initScreen( int nScreen ) const
         }
         rSD.m_hInvert50 = XCreateBitmapFromData( pDisp_,
                                                  rSD.m_aRefWindow,
-                                                 invert50_bits,
+                                                 reinterpret_cast<const char*>(invert50_bits),
                                                  invert50_width,
                                                  invert50_height );
     }
@@ -1856,7 +1856,7 @@ KeySym SalDisplay::GetKeySym( XKeyEvent        *pEvent,
 #define MAKE_BITMAP( name ) \
     XCreateBitmapFromData( pDisp_, \
                            DefaultRootWindow( pDisp_ ), \
-                           name##_bits, \
+                           reinterpret_cast<const char*>(name##_bits), \
                            name##_width, \
                            name##_height )
 
@@ -2218,10 +2218,13 @@ XLIB_Cursor SalDisplay::GetPointer( int ePointerStyle )
 
 int SalDisplay::CaptureMouse( SalFrame *pCapture )
 {
+    static const char* pEnv = getenv( "SAL_NO_MOUSEGRABS" );
+
     if( !pCapture )
     {
         m_pCapture = NULL;
-        XUngrabPointer( GetDisplay(), CurrentTime );
+        if( !pEnv || !*pEnv )
+            XUngrabPointer( GetDisplay(), CurrentTime );
         XFlush( GetDisplay() );
         return 0;
     }
@@ -2230,20 +2233,23 @@ int SalDisplay::CaptureMouse( SalFrame *pCapture )
 
     // FIXME: get rid of X11SalFrame
     const SystemEnvData* pEnvData = pCapture->GetSystemData();
-    int ret = XGrabPointer( GetDisplay(),
-                            (XLIB_Window)pEnvData->aWindow,
-                            False,
-                            PointerMotionMask| ButtonPressMask|ButtonReleaseMask,
-                            GrabModeAsync,
-                            GrabModeAsync,
-                            None,
-                            static_cast<X11SalFrame*>(pCapture)->GetCursor(),
-                            CurrentTime );
-
-    if( ret != GrabSuccess )
-    {
-        DBG_ASSERT( 1, "SalDisplay::CaptureMouse could not grab pointer\n");
-        return -1;
+    if( !pEnv || !*pEnv )
+    {
+        int ret = XGrabPointer( GetDisplay(),
+                                (XLIB_Window)pEnvData->aWindow,
+                                False,
+                                PointerMotionMask| ButtonPressMask|ButtonReleaseMask,
+                                GrabModeAsync,
+                                GrabModeAsync,
+                                None,
+                                static_cast<X11SalFrame*>(pCapture)->GetCursor(),
+                                CurrentTime );
+
+        if( ret != GrabSuccess )
+        {
+            DBG_ASSERT( 1, "SalDisplay::CaptureMouse could not grab pointer\n");
+            return -1;
+        }
     }
 
     m_pCapture = pCapture;
diff --git a/vcl/unx/source/app/wmadaptor.cxx b/vcl/unx/source/app/wmadaptor.cxx
index 955d7098192f..d0680b599615 100644
--- a/vcl/unx/source/app/wmadaptor.cxx
+++ b/vcl/unx/source/app/wmadaptor.cxx
@@ -1060,7 +1060,7 @@ void WMAdaptor::setWMName( X11SalFrame* pFrame, const String& rWMName ) const
 
         if( aCountry.getLength() )
         {
-            aLocaleString += ::rtl::OUString::createFromAscii( "_" );
+            aLocaleString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_"));
             aLocaleString += aCountry;
         }
         if( aVariant.getLength() )
diff --git a/vcl/unx/source/dtrans/X11_clipboard.cxx b/vcl/unx/source/dtrans/X11_clipboard.cxx
index f4922f57cf72..afe7c17595e8 100644
--- a/vcl/unx/source/dtrans/X11_clipboard.cxx
+++ b/vcl/unx/source/dtrans/X11_clipboard.cxx
@@ -79,7 +79,7 @@ X11Clipboard::X11Clipboard( SelectionManager& rManager, Atom aSelection ) :
     else
     {
         m_rSelectionManager.registerHandler( XA_PRIMARY, *this );
-        m_rSelectionManager.registerHandler( m_rSelectionManager.getAtom( OUString::createFromAscii( "CLIPBOARD" ) ), *this );
+        m_rSelectionManager.registerHandler( m_rSelectionManager.getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("CLIPBOARD")) ), *this );
     }
 }
 
@@ -97,7 +97,7 @@ X11Clipboard::~X11Clipboard()
     else
     {
         m_rSelectionManager.deregisterHandler( XA_PRIMARY );
-        m_rSelectionManager.deregisterHandler( m_rSelectionManager.getAtom( OUString::createFromAscii( "CLIPBOARD" ) ) );
+        m_rSelectionManager.deregisterHandler( m_rSelectionManager.getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("CLIPBOARD")) ) );
     }
 }
 
@@ -108,7 +108,7 @@ void X11Clipboard::fireChangedContentsEvent()
 {
     ClearableMutexGuard aGuard( m_rSelectionManager.getMutex() );
 #if OSL_DEBUG_LEVEL > 1
-    fprintf( stderr, "X11Clipboard::fireChangedContentsEvent for %s (%d listeners)\n",
+    fprintf( stderr, "X11Clipboard::fireChangedContentsEvent for %s (%" SAL_PRI_SIZET "u listeners)\n",
              OUStringToOString( m_rSelectionManager.getString( m_aSelection ), RTL_TEXTENCODING_ISO_8859_1 ).getStr(), m_aListeners.size() );
 #endif
     ::std::list< Reference< XClipboardListener > > listeners( m_aListeners );
@@ -182,7 +182,7 @@ void SAL_CALL X11Clipboard::setContents(
     else
     {
         m_rSelectionManager.requestOwnership( XA_PRIMARY );
-        m_rSelectionManager.requestOwnership( m_rSelectionManager.getAtom( OUString::createFromAscii( "CLIPBOARD" ) ) );
+        m_rSelectionManager.requestOwnership( m_rSelectionManager.getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("CLIPBOARD")) ) );
     }
 
     // notify old owner on loss of ownership
@@ -261,7 +261,7 @@ Reference< XInterface > X11Clipboard::getReference() throw()
 OUString SAL_CALL X11Clipboard::getImplementationName(  )
     throw(RuntimeException)
 {
-    return OUString::createFromAscii(X11_CLIPBOARD_IMPLEMENTATION_NAME);
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(X11_CLIPBOARD_IMPLEMENTATION_NAME));
 }
 
 // ------------------------------------------------------------------------
diff --git a/vcl/unx/source/dtrans/X11_droptarget.cxx b/vcl/unx/source/dtrans/X11_droptarget.cxx
index ab12c917297a..ce4851ace375 100644
--- a/vcl/unx/source/dtrans/X11_droptarget.cxx
+++ b/vcl/unx/source/dtrans/X11_droptarget.cxx
@@ -203,7 +203,7 @@ void DropTarget::dragOver( const DropTargetDragEvent& dtde ) throw()
 
 OUString DropTarget::getImplementationName() throw()
 {
-    return OUString::createFromAscii(XDND_DROPTARGET_IMPLEMENTATION_NAME);
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(XDND_DROPTARGET_IMPLEMENTATION_NAME));
 }
 
 // ------------------------------------------------------------------------
diff --git a/vcl/unx/source/dtrans/X11_selection.cxx b/vcl/unx/source/dtrans/X11_selection.cxx
index 18d120d4961b..118162c06422 100644
--- a/vcl/unx/source/dtrans/X11_selection.cxx
+++ b/vcl/unx/source/dtrans/X11_selection.cxx
@@ -286,7 +286,7 @@ SelectionManager::SelectionManager() :
     m_aDragRunning.reset();
 }
 
-XLIB_Cursor SelectionManager::createCursor( const char* pPointerData, const char* pMaskData, int width, int height, int hotX, int hotY )
+XLIB_Cursor SelectionManager::createCursor( const unsigned char* pPointerData, const unsigned char* pMaskData, int width, int height, int hotX, int hotY )
 {
     Pixmap aPointer;
     Pixmap aMask;
@@ -303,13 +303,13 @@ XLIB_Cursor SelectionManager::createCursor( const char* pPointerData, const char
     aPointer =
         XCreateBitmapFromData( m_pDisplay,
                                m_aWindow,
-                               pPointerData,
+                               reinterpret_cast<const char*>(pPointerData),
                                width,
                                height );
     aMask
         = XCreateBitmapFromData( m_pDisplay,
                                  m_aWindow,
-                                 pMaskData,
+                                 reinterpret_cast<const char*>(pMaskData),
                                  width,
                                  height );
     XLIB_Cursor aCursor =
@@ -1237,7 +1237,7 @@ bool SelectionManager::getPasteData( Atom selection, const ::rtl::OUString& rTyp
             bSuccess = getPasteData( selection, nSelectedType, rData );
     }
 #if OSL_DEBUG_LEVEL > 1
-    fprintf( stderr, "getPasteData for selection %s and data type %s returns %s, returned sequence has length %ld\n",
+    fprintf( stderr, "getPasteData for selection %s and data type %s returns %s, returned sequence has length %" SAL_PRIdINT32 "\n",
              OUStringToOString( getString( selection ), RTL_TEXTENCODING_ISO_8859_1 ).getStr(),
              OUStringToOString( rType, RTL_TEXTENCODING_ISO_8859_1 ).getStr(),
              bSuccess ? "true" : "false",
@@ -4164,7 +4164,7 @@ void SelectionManagerHolder::startDrag(
 
 OUString SelectionManagerHolder::getImplementationName() throw()
 {
-    return OUString::createFromAscii(XDND_IMPLEMENTATION_NAME);
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(XDND_IMPLEMENTATION_NAME));
 }
 
 // ------------------------------------------------------------------------
diff --git a/vcl/unx/source/dtrans/X11_selection.hxx b/vcl/unx/source/dtrans/X11_selection.hxx
index f5534dab81f5..fb01b95a4335 100644
--- a/vcl/unx/source/dtrans/X11_selection.hxx
+++ b/vcl/unx/source/dtrans/X11_selection.hxx
@@ -402,7 +402,7 @@ namespace x11 {
         void sendDropPosition( bool bForce, XLIB_Time eventXLIB_Time );
         bool updateDragAction( int modifierState );
         int getXdndVersion( XLIB_Window aXLIB_Window, XLIB_Window& rProxy );
-        XLIB_Cursor createCursor( const char* pPointerData, const char* pMaskData, int width, int height, int hotX, int hotY );
+        XLIB_Cursor createCursor( const unsigned char* pPointerData, const unsigned char* pMaskData, int width, int height, int hotX, int hotY );
         // coordinates on root XLIB_Window
         void updateDragWindow( int nX, int nY, XLIB_Window aRoot );
 
diff --git a/vcl/unx/source/dtrans/X11_service.cxx b/vcl/unx/source/dtrans/X11_service.cxx
index cfb1fc623c44..3eab180f8fec 100644
--- a/vcl/unx/source/dtrans/X11_service.cxx
+++ b/vcl/unx/source/dtrans/X11_service.cxx
@@ -50,21 +50,21 @@ using namespace x11;
 Sequence< OUString > SAL_CALL x11::X11Clipboard_getSupportedServiceNames()
 {
     Sequence< OUString > aRet(1);
-    aRet[0] = OUString::createFromAscii("com.sun.star.datatransfer.clipboard.SystemClipboard");
+    aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.SystemClipboard"));
     return aRet;
 }
 
 Sequence< OUString > SAL_CALL x11::Xdnd_getSupportedServiceNames()
 {
     Sequence< OUString > aRet(1);
-    aRet[0] = OUString::createFromAscii("com.sun.star.datatransfer.dnd.X11DragSource");
+    aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.X11DragSource"));
     return aRet;
 }
 
 Sequence< OUString > SAL_CALL x11::Xdnd_dropTarget_getSupportedServiceNames()
 {
     Sequence< OUString > aRet(1);
-    aRet[0] = OUString::createFromAscii("com.sun.star.datatransfer.dnd.X11DropTarget");
+    aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.dnd.X11DropTarget"));
     return aRet;
 }
 
@@ -105,7 +105,7 @@ Reference< XInterface > X11SalInstance::CreateClipboard( const Sequence< Any >&
     else
     {
         // default atom is clipboard selection
-        nSelection = rManager.getAtom( OUString::createFromAscii( "CLIPBOARD" ) );
+        nSelection = rManager.getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("CLIPBOARD")) );
     }
 
     ::std::hash_map< Atom, Reference< XClipboard > >& rMap( m_aInstances[ aDisplayName ] );
diff --git a/vcl/unx/source/dtrans/X11_transferable.cxx b/vcl/unx/source/dtrans/X11_transferable.cxx
index aaf90e4d8ec6..cb5511f6bf3d 100644
--- a/vcl/unx/source/dtrans/X11_transferable.cxx
+++ b/vcl/unx/source/dtrans/X11_transferable.cxx
@@ -75,13 +75,13 @@ Any SAL_CALL X11Transferable::getTransferData( const DataFlavor& rFlavor )
     Sequence< sal_Int8 > aData;
     bool bSuccess = m_rManager.getPasteData( m_aSelection ? m_aSelection : XA_PRIMARY, rFlavor.MimeType, aData );
     if( ! bSuccess && m_aSelection == 0 )
-        bSuccess = m_rManager.getPasteData( m_rManager.getAtom( OUString::createFromAscii( "CLIPBOARD" ) ), rFlavor.MimeType, aData );
+        bSuccess = m_rManager.getPasteData( m_rManager.getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("CLIPBOARD")) ), rFlavor.MimeType, aData );
 
     if( ! bSuccess )
     {
         throw UnsupportedFlavorException( rFlavor.MimeType, static_cast < XTransferable * > ( this ) );
     }
-    if( rFlavor.MimeType.equalsIgnoreAsciiCase( OUString::createFromAscii( "text/plain;charset=utf-16" ) ) )
+    if( rFlavor.MimeType.equalsIgnoreAsciiCase( OUString(RTL_CONSTASCII_USTRINGPARAM("text/plain;charset=utf-16")) ) )
     {
         int nLen = aData.getLength()/2;
         if( ((sal_Unicode*)aData.getConstArray())[nLen-1] == 0 )
@@ -107,7 +107,7 @@ Sequence< DataFlavor > SAL_CALL X11Transferable::getTransferDataFlavors()
     Sequence< DataFlavor > aFlavorList;
     bool bSuccess = m_rManager.getPasteDataTypes( m_aSelection ? m_aSelection : XA_PRIMARY, aFlavorList );
     if( ! bSuccess && m_aSelection == 0 )
-        bSuccess = m_rManager.getPasteDataTypes( m_rManager.getAtom( OUString::createFromAscii( "CLIPBOARD" ) ), aFlavorList );
+        bSuccess = m_rManager.getPasteDataTypes( m_rManager.getAtom( OUString(RTL_CONSTASCII_USTRINGPARAM("CLIPBOARD")) ), aFlavorList );
 
     return aFlavorList;
 }
@@ -119,7 +119,7 @@ sal_Bool SAL_CALL X11Transferable::isDataFlavorSupported( const DataFlavor& aFla
 {
     if( aFlavor.DataType != getCppuType( (Sequence< sal_Int8 >*)0 ) )
     {
-        if( ! aFlavor.MimeType.equalsIgnoreAsciiCase( OUString::createFromAscii( "text/plain;charset=utf-16" ) ) &&
+        if( ! aFlavor.MimeType.equalsIgnoreAsciiCase( OUString(RTL_CONSTASCII_USTRINGPARAM("text/plain;charset=utf-16")) ) &&
             aFlavor.DataType == getCppuType( (OUString*)0 ) )
             return false;
     }
diff --git a/vcl/unx/source/dtrans/config.cxx b/vcl/unx/source/dtrans/config.cxx
index 5add04288aa9..74b8ca8eba05 100644
--- a/vcl/unx/source/dtrans/config.cxx
+++ b/vcl/unx/source/dtrans/config.cxx
@@ -67,7 +67,7 @@ sal_Int32 SelectionManager::getSelectionTimeout()
         DtransX11ConfigItem aCfg;
         m_nSelectionTimeout = aCfg.getSelectionTimeout();
 #if OSL_DEBUG_LEVEL > 1
-        fprintf( stderr, "initialized selection timeout to %ld seconds\n", m_nSelectionTimeout );
+        fprintf( stderr, "initialized selection timeout to %" SAL_PRIdINT32 " seconds\n", m_nSelectionTimeout );
 #endif
     }
     return m_nSelectionTimeout;
@@ -88,7 +88,7 @@ DtransX11ConfigItem::DtransX11ConfigItem() :
         aKeys.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SELECTION_PROPERTY ) );
         Sequence< Any > aValues = GetProperties( aKeys );
 #if OSL_DEBUG_LEVEL > 1
-        fprintf( stderr, "found %ld properties for %s\n", aValues.getLength(), SELECTION_PROPERTY );
+        fprintf( stderr, "found %" SAL_PRIdINT32 " properties for %s\n", aValues.getLength(), SELECTION_PROPERTY );
 #endif
         Any* pValue = aValues.getArray();
         for( int i = 0; i < aValues.getLength(); i++, pValue++ )
diff --git a/vcl/unx/source/dtrans/copydata_curs.h b/vcl/unx/source/dtrans/copydata_curs.h
index b7cb1557c7a3..a882a541a6d7 100644
--- a/vcl/unx/source/dtrans/copydata_curs.h
+++ b/vcl/unx/source/dtrans/copydata_curs.h
@@ -29,7 +29,7 @@
 #define copydata_curs_height 32
 #define copydata_curs_x_hot 1
 #define copydata_curs_y_hot 1
-static char copydata_curs_bits[] = {
+static unsigned char copydata_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
    0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00,
    0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00,
diff --git a/vcl/unx/source/dtrans/copydata_mask.h b/vcl/unx/source/dtrans/copydata_mask.h
index d0cd40bc78fd..9cd73b08d106 100644
--- a/vcl/unx/source/dtrans/copydata_mask.h
+++ b/vcl/unx/source/dtrans/copydata_mask.h
@@ -29,7 +29,7 @@
 #define copydata_mask_height 32
 #define copydata_mask_x_hot 1
 #define copydata_mask_y_hot 1
-static char copydata_mask_bits[] = {
+static unsigned char copydata_mask_bits[] = {
    0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
    0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
    0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
diff --git a/vcl/unx/source/dtrans/linkdata_curs.h b/vcl/unx/source/dtrans/linkdata_curs.h
index 02d5709600a8..054ef55ef2bb 100644
--- a/vcl/unx/source/dtrans/linkdata_curs.h
+++ b/vcl/unx/source/dtrans/linkdata_curs.h
@@ -29,7 +29,7 @@
 #define linkdata_curs_height 32
 #define linkdata_curs_x_hot 1
 #define linkdata_curs_y_hot 1
-static char linkdata_curs_bits[] = {
+static unsigned char linkdata_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
    0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00,
    0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00,
diff --git a/vcl/unx/source/dtrans/linkdata_mask.h b/vcl/unx/source/dtrans/linkdata_mask.h
index 5bf28eac1bd5..429c603066dc 100644
--- a/vcl/unx/source/dtrans/linkdata_mask.h
+++ b/vcl/unx/source/dtrans/linkdata_mask.h
@@ -29,7 +29,7 @@
 #define linkdata_mask_height 32
 #define linkdata_mask_x_hot 1
 #define linkdata_mask_y_hot 1
-static char linkdata_mask_bits[] = {
+static unsigned char linkdata_mask_bits[] = {
    0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
    0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
    0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
diff --git a/vcl/unx/source/dtrans/movedata_curs.h b/vcl/unx/source/dtrans/movedata_curs.h
index cbc3b6b73c1e..642bbd176e4b 100644
--- a/vcl/unx/source/dtrans/movedata_curs.h
+++ b/vcl/unx/source/dtrans/movedata_curs.h
@@ -29,7 +29,7 @@
 #define movedata_curs_height 32
 #define movedata_curs_x_hot 1
 #define movedata_curs_y_hot 1
-static char movedata_curs_bits[] = {
+static unsigned char movedata_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
    0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00,
    0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00,
diff --git a/vcl/unx/source/dtrans/movedata_mask.h b/vcl/unx/source/dtrans/movedata_mask.h
index 716e626f778b..f06c80f1728c 100644
--- a/vcl/unx/source/dtrans/movedata_mask.h
+++ b/vcl/unx/source/dtrans/movedata_mask.h
@@ -29,7 +29,7 @@
 #define movedata_mask_height 32
 #define movedata_mask_x_hot 1
 #define movedata_mask_y_hot 1
-static char movedata_mask_bits[] = {
+static unsigned char movedata_mask_bits[] = {
    0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
    0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
    0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
diff --git a/vcl/unx/source/dtrans/nodrop_curs.h b/vcl/unx/source/dtrans/nodrop_curs.h
index 96b0c51178e6..5c501d3876c4 100644
--- a/vcl/unx/source/dtrans/nodrop_curs.h
+++ b/vcl/unx/source/dtrans/nodrop_curs.h
@@ -29,7 +29,7 @@
 #define nodrop_curs_height 32
 #define nodrop_curs_x_hot 9
 #define nodrop_curs_y_hot 9
-static char nodrop_curs_bits[] = {
+static unsigned char nodrop_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0xc0, 0x0f, 0x00, 0x00, 0xf0, 0x3f, 0x00, 0x00,
    0xf8, 0x7f, 0x00, 0x00, 0x7c, 0xf8, 0x00, 0x00, 0x1c, 0xfc, 0x00, 0x00,
    0x1e, 0xfe, 0x01, 0x00, 0x0e, 0xdf, 0x01, 0x00, 0x8e, 0xcf, 0x01, 0x00,
diff --git a/vcl/unx/source/dtrans/nodrop_mask.h b/vcl/unx/source/dtrans/nodrop_mask.h
index b5bd992c7a4c..bd315dc28df1 100644
--- a/vcl/unx/source/dtrans/nodrop_mask.h
+++ b/vcl/unx/source/dtrans/nodrop_mask.h
@@ -29,7 +29,7 @@
 #define nodrop_mask_height 32
 #define nodrop_mask_x_hot 9
 #define nodrop_mask_y_hot 9
-static char nodrop_mask_bits[] = {
+static unsigned char nodrop_mask_bits[] = {
    0xc0, 0x0f, 0x00, 0x00, 0xf0, 0x3f, 0x00, 0x00, 0xf8, 0x7f, 0x00, 0x00,
    0xfc, 0xff, 0x00, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x7e, 0xfe, 0x01, 0x00,
    0x3f, 0xff, 0x03, 0x00, 0x9f, 0xff, 0x03, 0x00, 0xdf, 0xff, 0x03, 0x00,
diff --git a/vcl/unx/source/fontmanager/fontmanager.cxx b/vcl/unx/source/fontmanager/fontmanager.cxx
index cb43af0351c6..623ac6d0db30 100644
--- a/vcl/unx/source/fontmanager/fontmanager.cxx
+++ b/vcl/unx/source/fontmanager/fontmanager.cxx
@@ -705,7 +705,7 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomPr
             }
 
 #if OSL_DEBUG_LEVEL > 1
-            fprintf( stderr, "found %d/%d kern pairs for %s\n",
+            fprintf( stderr, "found %" SAL_PRI_SIZET "u/%" SAL_PRI_SIZET "u kern pairs for %s\n",
                      m_pMetrics->m_aXKernPairs.size(),
                      m_pMetrics->m_aYKernPairs.size(),
                      OUStringToOString( pProvider->getString( ATOM_FAMILYNAME, m_nFamilyName ), RTL_TEXTENCODING_MS_1252 ).getStr() );
@@ -2405,7 +2405,7 @@ void PrintFontManager::initialize()
 
 #if OSL_DEBUG_LEVEL > 1
     aStep3 = times( &tms );
-    fprintf( stderr, "PrintFontManager::initialize: collected %d fonts (%d builtin, %d cached)\n", m_aFonts.size(), nBuiltinFonts, nCached );
+    fprintf( stderr, "PrintFontManager::initialize: collected %" SAL_PRI_SIZET "u fonts (%d builtin, %d cached)\n", m_aFonts.size(), nBuiltinFonts, nCached );
     double fTick = (double)sysconf( _SC_CLK_TCK );
     fprintf( stderr, "Step 1 took %lf seconds\n", (double)(aStep1 - aStart)/fTick );
     fprintf( stderr, "Step 2 took %lf seconds\n", (double)(aStep2 - aStep1)/fTick );
diff --git a/vcl/unx/source/gdi/salprnpsp.cxx b/vcl/unx/source/gdi/salprnpsp.cxx
index 136bb753d219..596c9d04a1c4 100644
--- a/vcl/unx/source/gdi/salprnpsp.cxx
+++ b/vcl/unx/source/gdi/salprnpsp.cxx
@@ -976,7 +976,7 @@ BOOL PspSalPrinter::StartJob(
             nMode = S_IRUSR | S_IWUSR;
 
             ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it;
-            it = pJobSetup->maValueMap.find( ::rtl::OUString::createFromAscii( "FAX#" ) );
+            it = pJobSetup->maValueMap.find( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FAX#")) );
             if( it != pJobSetup->maValueMap.end() )
                 m_aFaxNr = it->second;
 
diff --git a/vcl/unx/source/inc/airbrush_curs.h b/vcl/unx/source/inc/airbrush_curs.h
index 3a5555f34384..a78666bb243d 100644
--- a/vcl/unx/source/inc/airbrush_curs.h
+++ b/vcl/unx/source/inc/airbrush_curs.h
@@ -29,7 +29,7 @@
 #define airbrush_curs_height 32
 #define airbrush_curs_x_hot 5
 #define airbrush_curs_y_hot 22
-static char airbrush_curs_bits[] = {
+static unsigned char airbrush_curs_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x78,0x00,0x00,0x00,
  0x7c,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x1f,0x00,0x00,0x98,0x0f,0x00,0x00,
diff --git a/vcl/unx/source/inc/airbrush_mask.h b/vcl/unx/source/inc/airbrush_mask.h
index 35e55b834f77..82d70f05bbb7 100644
--- a/vcl/unx/source/inc/airbrush_mask.h
+++ b/vcl/unx/source/inc/airbrush_mask.h
@@ -29,7 +29,7 @@
 #define airbrush_mask_height 32
 #define airbrush_mask_x_hot 5
 #define airbrush_mask_y_hot 22
-static char airbrush_mask_bits[] = {
+static unsigned char airbrush_mask_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x78,0x00,0x00,0x00,
  0x7c,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x1f,0x00,0x00,0x98,0x0f,0x00,0x00,
diff --git a/vcl/unx/source/inc/ase_curs.h b/vcl/unx/source/inc/ase_curs.h
index bd968c4e6f17..0a7c9bfd29c2 100644
--- a/vcl/unx/source/inc/ase_curs.h
+++ b/vcl/unx/source/inc/ase_curs.h
@@ -29,7 +29,7 @@
 #define ase_curs_height 32
 #define ase_curs_x_hot 19
 #define ase_curs_y_hot 16
-static char ase_curs_bits[] = {
+static unsigned char ase_curs_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
diff --git a/vcl/unx/source/inc/ase_mask.h b/vcl/unx/source/inc/ase_mask.h
index 6f765158c400..4ded0773a72a 100644
--- a/vcl/unx/source/inc/ase_mask.h
+++ b/vcl/unx/source/inc/ase_mask.h
@@ -29,7 +29,7 @@
 #define ase_mask_height 32
 #define ase_mask_x_hot 19
 #define ase_mask_y_hot 16
-static char ase_mask_bits[] = {
+static unsigned char ase_mask_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
diff --git a/vcl/unx/source/inc/asn_curs.h b/vcl/unx/source/inc/asn_curs.h
index 81f5b0bfee63..68ab521de1a5 100644
--- a/vcl/unx/source/inc/asn_curs.h
+++ b/vcl/unx/source/inc/asn_curs.h
@@ -29,7 +29,7 @@
 #define asn_curs_height 32
 #define asn_curs_x_hot 16
 #define asn_curs_y_hot 12
-static char asn_curs_bits[] = {
+static unsigned char asn_curs_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x80,0x03,
  0x00,0x00,0xc0,0x07,0x00,0x00,0xc0,0x07,0x00,0x00,0xe0,0x0f,0x00,0x00,0x20,
  0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x03,0x00,0x00,
diff --git a/vcl/unx/source/inc/asn_mask.h b/vcl/unx/source/inc/asn_mask.h
index 10f6fb7ff0c9..0e7a30e5a190 100644
--- a/vcl/unx/source/inc/asn_mask.h
+++ b/vcl/unx/source/inc/asn_mask.h
@@ -29,7 +29,7 @@
 #define asn_mask_height 32
 #define asn_mask_x_hot 16
 #define asn_mask_y_hot 12
-static char asn_mask_bits[] = {
+static unsigned char asn_mask_bits[] = {
  0x00,0x00,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x80,0x03,0x00,0x00,0xc0,0x07,
  0x00,0x00,0xe0,0x0f,0x00,0x00,0xe0,0x0f,0x00,0x00,0xf0,0x1f,0x00,0x00,0xf0,
  0x1f,0x00,0x00,0x20,0x08,0x00,0x00,0x80,0x03,0x00,0x00,0xc0,0x07,0x00,0x00,
diff --git a/vcl/unx/source/inc/asne_curs.h b/vcl/unx/source/inc/asne_curs.h
index f01ca8814b76..8ba58f9639e2 100644
--- a/vcl/unx/source/inc/asne_curs.h
+++ b/vcl/unx/source/inc/asne_curs.h
@@ -29,7 +29,7 @@
 #define asne_curs_height 32
 #define asne_curs_x_hot 21
 #define asne_curs_y_hot 10
-static char asne_curs_bits[] = {
+static unsigned char asne_curs_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0x00,0x00,0x80,
  0x3f,0x00,0x00,0xc0,0x3f,0x00,0x00,0x00,0x3f,0x00,0x00,0x00,0x1c,0x00,0x00,
  0x00,0x1c,0x00,0x00,0x70,0x18,0x00,0x00,0xf8,0x08,0x00,0x00,0xf8,0x00,0x00,
diff --git a/vcl/unx/source/inc/asne_mask.h b/vcl/unx/source/inc/asne_mask.h
index 62fc2d1c94e6..6408f127b1f4 100644
--- a/vcl/unx/source/inc/asne_mask.h
+++ b/vcl/unx/source/inc/asne_mask.h
@@ -29,7 +29,7 @@
 #define asne_mask_height 32
 #define asne_mask_x_hot 21
 #define asne_mask_y_hot 10
-static char asne_mask_bits[] = {
+static unsigned char asne_mask_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7c,0x00,0x00,0x80,0x7f,0x00,0x00,0xc0,
  0x7f,0x00,0x00,0xe0,0x7f,0x00,0x00,0xc0,0x7f,0x00,0x00,0x00,0x3f,0x00,0x00,
  0x70,0x3e,0x00,0x00,0xf8,0x3c,0x00,0x00,0xfc,0x1d,0x00,0x00,0xfc,0x09,0x00,
diff --git a/vcl/unx/source/inc/asns_curs.h b/vcl/unx/source/inc/asns_curs.h
index db0ff615e309..3e039241ba61 100644
--- a/vcl/unx/source/inc/asns_curs.h
+++ b/vcl/unx/source/inc/asns_curs.h
@@ -29,7 +29,7 @@
 #define asns_curs_height 32
 #define asns_curs_x_hot 15
 #define asns_curs_y_hot 15
-static char asns_curs_bits[] = {
+static unsigned char asns_curs_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x80,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0xc0,0x01,0x00,0x00,0xe0,
  0x03,0x00,0x00,0xe0,0x03,0x00,0x00,0xf0,0x07,0x00,0x00,0x10,0x04,0x00,0x00,
diff --git a/vcl/unx/source/inc/asns_mask.h b/vcl/unx/source/inc/asns_mask.h
index 2d8c689c64a8..2a753501bc9d 100644
--- a/vcl/unx/source/inc/asns_mask.h
+++ b/vcl/unx/source/inc/asns_mask.h
@@ -29,7 +29,7 @@
 #define asns_mask_height 32
 #define asns_mask_x_hot 15
 #define asns_mask_y_hot 15
-static char asns_mask_bits[] = {
+static unsigned char asns_mask_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,
  0x00,0x00,0xc0,0x01,0x00,0x00,0xc0,0x01,0x00,0x00,0xe0,0x03,0x00,0x00,0xf0,
  0x07,0x00,0x00,0xf0,0x07,0x00,0x00,0xf8,0x0f,0x00,0x00,0xf8,0x0f,0x00,0x00,
diff --git a/vcl/unx/source/inc/asnswe_curs.h b/vcl/unx/source/inc/asnswe_curs.h
index 276d1dbce8ce..599511e1d433 100644
--- a/vcl/unx/source/inc/asnswe_curs.h
+++ b/vcl/unx/source/inc/asnswe_curs.h
@@ -29,7 +29,7 @@
 #define asnswe_curs_height 32
 #define asnswe_curs_x_hot 15
 #define asnswe_curs_y_hot 15
-static char asnswe_curs_bits[] = {
+static unsigned char asnswe_curs_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x80,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0xc0,0x01,0x00,0x00,0xe0,
  0x03,0x00,0x00,0xe0,0x03,0x00,0x00,0xf0,0x07,0x00,0x00,0x10,0x04,0x00,0x00,
diff --git a/vcl/unx/source/inc/asnswe_mask.h b/vcl/unx/source/inc/asnswe_mask.h
index 6e1f22650b1e..a0bcb3c5310e 100644
--- a/vcl/unx/source/inc/asnswe_mask.h
+++ b/vcl/unx/source/inc/asnswe_mask.h
@@ -29,7 +29,7 @@
 #define asnswe_mask_height 32
 #define asnswe_mask_x_hot 15
 #define asnswe_mask_y_hot 15
-static char asnswe_mask_bits[] = {
+static unsigned char asnswe_mask_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,
  0x00,0x00,0xc0,0x01,0x00,0x00,0xc0,0x01,0x00,0x00,0xe0,0x03,0x00,0x00,0xf0,
  0x07,0x00,0x00,0xf0,0x07,0x00,0x00,0xf8,0x0f,0x00,0x00,0xf8,0x0f,0x00,0x00,
diff --git a/vcl/unx/source/inc/asnw_curs.h b/vcl/unx/source/inc/asnw_curs.h
index 706e021463c9..139cd4e2ea5e 100644
--- a/vcl/unx/source/inc/asnw_curs.h
+++ b/vcl/unx/source/inc/asnw_curs.h
@@ -29,7 +29,7 @@
 #define asnw_curs_height 32
 #define asnw_curs_x_hot 10
 #define asnw_curs_y_hot 10
-static char asnw_curs_bits[] = {
+static unsigned char asnw_curs_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0xfc,0x01,0x00,
  0x00,0xfc,0x03,0x00,0x00,0xfc,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x38,0x00,
  0x00,0x00,0x18,0x0e,0x00,0x00,0x10,0x1f,0x00,0x00,0x00,0x1f,0x00,0x00,0x00,
diff --git a/vcl/unx/source/inc/asnw_mask.h b/vcl/unx/source/inc/asnw_mask.h
index 189dab48fc82..6f7da9a88661 100644
--- a/vcl/unx/source/inc/asnw_mask.h
+++ b/vcl/unx/source/inc/asnw_mask.h
@@ -29,7 +29,7 @@
 #define asnw_mask_height 32
 #define asnw_mask_x_hot 10
 #define asnw_mask_y_hot 10
-static char asnw_mask_bits[] = {
+static unsigned char asnw_mask_bits[] = {
  0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0xfe,0x01,0x00,0x00,0xfe,0x03,0x00,
  0x00,0xfe,0x07,0x00,0x00,0xfe,0x03,0x00,0x00,0xfc,0x00,0x00,0x00,0x7c,0x0e,
  0x00,0x00,0x3c,0x1f,0x00,0x00,0xb8,0x3f,0x00,0x00,0x90,0x3f,0x00,0x00,0x80,
diff --git a/vcl/unx/source/inc/ass_curs.h b/vcl/unx/source/inc/ass_curs.h
index f7cd7e7d5110..ea98bf5b0404 100644
--- a/vcl/unx/source/inc/ass_curs.h
+++ b/vcl/unx/source/inc/ass_curs.h
@@ -29,7 +29,7 @@
 #define ass_curs_height 32
 #define ass_curs_x_hot 15
 #define ass_curs_y_hot 19
-static char ass_curs_bits[] = {
+static unsigned char ass_curs_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
diff --git a/vcl/unx/source/inc/ass_mask.h b/vcl/unx/source/inc/ass_mask.h
index 6ac71c7b32a5..ccb91615d34a 100644
--- a/vcl/unx/source/inc/ass_mask.h
+++ b/vcl/unx/source/inc/ass_mask.h
@@ -29,7 +29,7 @@
 #define ass_mask_height 32
 #define ass_mask_x_hot 15
 #define ass_mask_y_hot 19
-static char ass_mask_bits[] = {
+static unsigned char ass_mask_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
diff --git a/vcl/unx/source/inc/asse_curs.h b/vcl/unx/source/inc/asse_curs.h
index 1dd325ac0606..0df55658c10a 100644
--- a/vcl/unx/source/inc/asse_curs.h
+++ b/vcl/unx/source/inc/asse_curs.h
@@ -29,7 +29,7 @@
 #define asse_curs_height 32
 #define asse_curs_x_hot 21
 #define asse_curs_y_hot 21
-static char asse_curs_bits[] = {
+static unsigned char asse_curs_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
diff --git a/vcl/unx/source/inc/asse_mask.h b/vcl/unx/source/inc/asse_mask.h
index 7685aaa21c17..1835e939f275 100644
--- a/vcl/unx/source/inc/asse_mask.h
+++ b/vcl/unx/source/inc/asse_mask.h
@@ -29,7 +29,7 @@
 #define asse_mask_height 32
 #define asse_mask_x_hot 21
 #define asse_mask_y_hot 21
-static char asse_mask_bits[] = {
+static unsigned char asse_mask_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
diff --git a/vcl/unx/source/inc/assw_curs.h b/vcl/unx/source/inc/assw_curs.h
index 1f8d53ff9b72..5956aa5bf40b 100644
--- a/vcl/unx/source/inc/assw_curs.h
+++ b/vcl/unx/source/inc/assw_curs.h
@@ -29,7 +29,7 @@
 #define assw_curs_height 32
 #define assw_curs_x_hot 21
 #define assw_curs_y_hot 21
-static char assw_curs_bits[] = {
+static unsigned char assw_curs_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
diff --git a/vcl/unx/source/inc/assw_mask.h b/vcl/unx/source/inc/assw_mask.h
index 243c62c25e10..3023b2a6061f 100644
--- a/vcl/unx/source/inc/assw_mask.h
+++ b/vcl/unx/source/inc/assw_mask.h
@@ -29,7 +29,7 @@
 #define assw_mask_height 32
 #define assw_mask_x_hot 21
 #define assw_mask_y_hot 21
-static char assw_mask_bits[] = {
+static unsigned char assw_mask_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
diff --git a/vcl/unx/source/inc/asw_curs.h b/vcl/unx/source/inc/asw_curs.h
index 80f741496bae..8064570cb8fe 100644
--- a/vcl/unx/source/inc/asw_curs.h
+++ b/vcl/unx/source/inc/asw_curs.h
@@ -29,7 +29,7 @@
 #define asw_curs_height 32
 #define asw_curs_x_hot 12
 #define asw_curs_y_hot 15
-static char asw_curs_bits[] = {
+static unsigned char asw_curs_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
diff --git a/vcl/unx/source/inc/asw_mask.h b/vcl/unx/source/inc/asw_mask.h
index 18765d5fc452..245c42e7d790 100644
--- a/vcl/unx/source/inc/asw_mask.h
+++ b/vcl/unx/source/inc/asw_mask.h
@@ -29,7 +29,7 @@
 #define asw_mask_height 32
 #define asw_mask_x_hot 12
 #define asw_mask_y_hot 15
-static char asw_mask_bits[] = {
+static unsigned char asw_mask_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,
diff --git a/vcl/unx/source/inc/aswe_curs.h b/vcl/unx/source/inc/aswe_curs.h
index b2965e42f4a2..ed83d450c269 100644
--- a/vcl/unx/source/inc/aswe_curs.h
+++ b/vcl/unx/source/inc/aswe_curs.h
@@ -29,7 +29,7 @@
 #define aswe_curs_height 32
 #define aswe_curs_x_hot 15
 #define aswe_curs_y_hot 15
-static char aswe_curs_bits[] = {
+static unsigned char aswe_curs_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
diff --git a/vcl/unx/source/inc/aswe_mask.h b/vcl/unx/source/inc/aswe_mask.h
index 76c73193d35f..d2a97d7fa4c8 100644
--- a/vcl/unx/source/inc/aswe_mask.h
+++ b/vcl/unx/source/inc/aswe_mask.h
@@ -29,7 +29,7 @@
 #define aswe_mask_height 32
 #define aswe_mask_x_hot 15
 #define aswe_mask_y_hot 15
-static char aswe_mask_bits[] = {
+static unsigned char aswe_mask_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
diff --git a/vcl/unx/source/inc/chain_curs.h b/vcl/unx/source/inc/chain_curs.h
index 77a1dd23d664..ea319fb6b128 100644
--- a/vcl/unx/source/inc/chain_curs.h
+++ b/vcl/unx/source/inc/chain_curs.h
@@ -29,7 +29,7 @@
 #define chain_curs_height 32
 #define chain_curs_x_hot 0
 #define chain_curs_y_hot 2
-static char chain_curs_bits[] = {
+static unsigned char chain_curs_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x03,0x00,0x00,
  0x00,0x05,0x00,0x00,0x00,0x09,0x00,0x00,0x00,0x11,0x00,0x00,0x00,0x21,0x00,
  0x00,0x00,0x41,0x00,0x00,0x00,0x81,0x00,0x00,0x00,0x01,0x01,0x00,0x00,0x01,
diff --git a/vcl/unx/source/inc/chain_mask.h b/vcl/unx/source/inc/chain_mask.h
index e06b038d19be..688835ecbd3e 100644
--- a/vcl/unx/source/inc/chain_mask.h
+++ b/vcl/unx/source/inc/chain_mask.h
@@ -27,7 +27,7 @@
  ************************************************************************/
 #define chain_mask_width 32
 #define chain_mask_height 32
-static char chain_mask_bits[] = {
+static unsigned char chain_mask_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x03,0x00,0x00,
  0x00,0x07,0x00,0x00,0x00,0x0f,0x00,0x00,0x00,0x1f,0x00,0x00,0x00,0x3f,0x00,
  0x00,0x00,0x7f,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x01,0x00,0x00,0xff,
diff --git a/vcl/unx/source/inc/chainnot_curs.h b/vcl/unx/source/inc/chainnot_curs.h
index ae695e69fd85..e327586e3110 100644
--- a/vcl/unx/source/inc/chainnot_curs.h
+++ b/vcl/unx/source/inc/chainnot_curs.h
@@ -29,7 +29,7 @@
 #define chainnot_curs_height 32
 #define chainnot_curs_x_hot 2
 #define chainnot_curs_y_hot 2
-static char chainnot_curs_bits[] = {
+static unsigned char chainnot_curs_bits[] = {
  0x00,0x00,0x00,0x00,0x80,0x1f,0x00,0x00,0xe0,0x7f,0x00,0x00,0xf0,0xf0,0x00,
  0x00,0x38,0xc0,0x01,0x00,0x7c,0x80,0x03,0x00,0xec,0x00,0x03,0x00,0xce,0x01,
  0x07,0x00,0x86,0x03,0x06,0x00,0x06,0x07,0x06,0x00,0x06,0x0e,0x06,0x00,0x06,
diff --git a/vcl/unx/source/inc/chainnot_mask.h b/vcl/unx/source/inc/chainnot_mask.h
index b5311f762fec..6666599ad64c 100644
--- a/vcl/unx/source/inc/chainnot_mask.h
+++ b/vcl/unx/source/inc/chainnot_mask.h
@@ -27,7 +27,7 @@
  ************************************************************************/
 #define chainnot_mask_width 32
 #define chainnot_mask_height 32
-static char chainnot_mask_bits[] = {
+static unsigned char chainnot_mask_bits[] = {
  0x80,0x1f,0x00,0x00,0xe0,0x7f,0x00,0x00,0xf0,0xff,0x00,0x00,0xf8,0xff,0x01,
  0x00,0xfc,0xf0,0x03,0x00,0xfe,0xc0,0x07,0x00,0xfe,0x81,0x07,0x00,0xff,0x83,
  0x0f,0x00,0xcf,0x07,0x0f,0x00,0x8f,0x0f,0x0f,0x00,0x0f,0x1f,0x0f,0x00,0x0f,
diff --git a/vcl/unx/source/inc/chart_curs.h b/vcl/unx/source/inc/chart_curs.h
index 9210452713cf..f1fbd5557ad4 100644
--- a/vcl/unx/source/inc/chart_curs.h
+++ b/vcl/unx/source/inc/chart_curs.h
@@ -29,7 +29,7 @@
 #define chart_curs_height 32
 #define chart_curs_x_hot 15
 #define chart_curs_y_hot 16
-static char chart_curs_bits[] = {
+static unsigned char chart_curs_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x80,0x00,0x00,0x00,
diff --git a/vcl/unx/source/inc/chart_mask.h b/vcl/unx/source/inc/chart_mask.h
index b8cf5a69f889..53f4ae125bda 100644
--- a/vcl/unx/source/inc/chart_mask.h
+++ b/vcl/unx/source/inc/chart_mask.h
@@ -29,7 +29,7 @@
 #define chart_mask_height 32
 #define chart_mask_x_hot 15
 #define chart_mask_y_hot 16
-static char chart_mask_bits[] = {
+static unsigned char chart_mask_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0xc0,0x01,0x00,0x00,0xc0,0x01,0x00,0x00,0xc0,0x01,0x00,0x00,
diff --git a/vcl/unx/source/inc/copydata_curs.h b/vcl/unx/source/inc/copydata_curs.h
index b7cb1557c7a3..a882a541a6d7 100644
--- a/vcl/unx/source/inc/copydata_curs.h
+++ b/vcl/unx/source/inc/copydata_curs.h
@@ -29,7 +29,7 @@
 #define copydata_curs_height 32
 #define copydata_curs_x_hot 1
 #define copydata_curs_y_hot 1
-static char copydata_curs_bits[] = {
+static unsigned char copydata_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
    0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00,
    0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/copydata_mask.h b/vcl/unx/source/inc/copydata_mask.h
index d0cd40bc78fd..9cd73b08d106 100644
--- a/vcl/unx/source/inc/copydata_mask.h
+++ b/vcl/unx/source/inc/copydata_mask.h
@@ -29,7 +29,7 @@
 #define copydata_mask_height 32
 #define copydata_mask_x_hot 1
 #define copydata_mask_y_hot 1
-static char copydata_mask_bits[] = {
+static unsigned char copydata_mask_bits[] = {
    0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
    0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
    0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/copydlnk_curs.h b/vcl/unx/source/inc/copydlnk_curs.h
index 8b3418ce7336..353297212083 100644
--- a/vcl/unx/source/inc/copydlnk_curs.h
+++ b/vcl/unx/source/inc/copydlnk_curs.h
@@ -29,7 +29,7 @@
 #define copydlnk_curs_height 32
 #define copydlnk_curs_x_hot 1
 #define copydlnk_curs_y_hot 1
-static char copydlnk_curs_bits[] = {
+static unsigned char copydlnk_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
    0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00,
    0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/copydlnk_mask.h b/vcl/unx/source/inc/copydlnk_mask.h
index 3ad9e0a1b1e7..b6ac40003814 100644
--- a/vcl/unx/source/inc/copydlnk_mask.h
+++ b/vcl/unx/source/inc/copydlnk_mask.h
@@ -29,7 +29,7 @@
 #define copydlnk_mask_height 32
 #define copydlnk_mask_x_hot 1
 #define copydlnk_mask_y_hot 1
-static char copydlnk_mask_bits[] = {
+static unsigned char copydlnk_mask_bits[] = {
    0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
    0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
    0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/copyfile_curs.h b/vcl/unx/source/inc/copyfile_curs.h
index 7ea2cb393944..da1366c71c6c 100644
--- a/vcl/unx/source/inc/copyfile_curs.h
+++ b/vcl/unx/source/inc/copyfile_curs.h
@@ -29,7 +29,7 @@
 #define copyfile_curs_height 32
 #define copyfile_curs_x_hot 9
 #define copyfile_curs_y_hot 9
-static char copyfile_curs_bits[] = {
+static unsigned char copyfile_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x00,
    0xfe, 0x00, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00,
    0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x04, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/copyfile_mask.h b/vcl/unx/source/inc/copyfile_mask.h
index 200d280c8cd8..5679ee8c2da8 100644
--- a/vcl/unx/source/inc/copyfile_mask.h
+++ b/vcl/unx/source/inc/copyfile_mask.h
@@ -29,7 +29,7 @@
 #define copyfile_mask_height 32
 #define copyfile_mask_x_hot 9
 #define copyfile_mask_y_hot 9
-static char copyfile_mask_bits[] = {
+static unsigned char copyfile_mask_bits[] = {
    0xff, 0x01, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
    0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
    0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/copyfiles_curs.h b/vcl/unx/source/inc/copyfiles_curs.h
index 4842d5fe72ad..c761f67ae370 100644
--- a/vcl/unx/source/inc/copyfiles_curs.h
+++ b/vcl/unx/source/inc/copyfiles_curs.h
@@ -29,7 +29,7 @@
 #define copyfiles_curs_height 32
 #define copyfiles_curs_x_hot 8
 #define copyfiles_curs_y_hot 9
-static char copyfiles_curs_bits[] = {
+static unsigned char copyfiles_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0xe0, 0x0f, 0x00, 0x00, 0xe0, 0x2f, 0x00, 0x00,
    0xe8, 0x0f, 0x00, 0x00, 0xe8, 0x7f, 0x00, 0x00, 0xea, 0x7f, 0x00, 0x00,
    0xea, 0x7f, 0x00, 0x00, 0xea, 0x7f, 0x00, 0x00, 0x6a, 0x7e, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/copyfiles_mask.h b/vcl/unx/source/inc/copyfiles_mask.h
index b1cbb4a10032..e6be0c5f105d 100644
--- a/vcl/unx/source/inc/copyfiles_mask.h
+++ b/vcl/unx/source/inc/copyfiles_mask.h
@@ -29,7 +29,7 @@
 #define copyfiles_mask_height 32
 #define copyfiles_mask_x_hot 8
 #define copyfiles_mask_y_hot 9
-static char copyfiles_mask_bits[] = {
+static unsigned char copyfiles_mask_bits[] = {
    0xf0, 0x1f, 0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00, 0xfc, 0x7f, 0x00, 0x00,
    0xfc, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
    0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/copyflnk_curs.h b/vcl/unx/source/inc/copyflnk_curs.h
index def45ab47a8b..9fdf78685365 100644
--- a/vcl/unx/source/inc/copyflnk_curs.h
+++ b/vcl/unx/source/inc/copyflnk_curs.h
@@ -29,7 +29,7 @@
 #define copyflnk_curs_height 32
 #define copyflnk_curs_x_hot 9
 #define copyflnk_curs_y_hot 9
-static char copyflnk_curs_bits[] = {
+static unsigned char copyflnk_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x00,
    0xfe, 0x00, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00,
    0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/copyflnk_mask.h b/vcl/unx/source/inc/copyflnk_mask.h
index ac05eaa13a64..3b678164e0c6 100644
--- a/vcl/unx/source/inc/copyflnk_mask.h
+++ b/vcl/unx/source/inc/copyflnk_mask.h
@@ -29,7 +29,7 @@
 #define copyflnk_mask_height 32
 #define copyflnk_mask_x_hot 9
 #define copyflnk_mask_y_hot 9
-static char copyflnk_mask_bits[] = {
+static unsigned char copyflnk_mask_bits[] = {
    0xff, 0x01, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
    0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
    0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/crook_curs.h b/vcl/unx/source/inc/crook_curs.h
index 5cb4874c219f..97db1feaa394 100644
--- a/vcl/unx/source/inc/crook_curs.h
+++ b/vcl/unx/source/inc/crook_curs.h
@@ -29,7 +29,7 @@
 #define crook_curs_height 32
 #define crook_curs_x_hot 15
 #define crook_curs_y_hot 14
-static char crook_curs_bits[] = {
+static unsigned char crook_curs_bits[] = {
    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
    0xff, 0xff, 0xff, 0xff, 0xff, 0x7c, 0x3e, 0xff, 0x7f, 0xbb, 0xdd, 0xfe,
diff --git a/vcl/unx/source/inc/crook_mask.h b/vcl/unx/source/inc/crook_mask.h
index 97b47601ebe5..534ad6da53fd 100644
--- a/vcl/unx/source/inc/crook_mask.h
+++ b/vcl/unx/source/inc/crook_mask.h
@@ -27,7 +27,7 @@
  ************************************************************************/
 #define crook_mask_width 32
 #define crook_mask_height 32
-static char crook_mask_bits[] = {
+static unsigned char crook_mask_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x83, 0xc1, 0x00, 0x80, 0xc7, 0xe3, 0x01, 0xc0, 0xef, 0xf7, 0x03,
diff --git a/vcl/unx/source/inc/crop_curs.h b/vcl/unx/source/inc/crop_curs.h
index 3e8424657453..5647de80b196 100644
--- a/vcl/unx/source/inc/crop_curs.h
+++ b/vcl/unx/source/inc/crop_curs.h
@@ -29,7 +29,7 @@
 #define crop_curs_height 32
 #define crop_curs_x_hot 9
 #define crop_curs_y_hot 9
-static char crop_curs_bits[] = {
+static unsigned char crop_curs_bits[] = {
    0xff, 0x0f, 0xff, 0xff, 0xff, 0x6f, 0xff, 0xff, 0xff, 0x6f, 0xff, 0xff,
    0x07, 0x60, 0xf8, 0xff, 0xf7, 0x6f, 0xfb, 0xff, 0xf7, 0x6f, 0xfb, 0xff,
    0x37, 0x60, 0xf8, 0xff, 0xb7, 0x6f, 0xff, 0xff, 0xb7, 0x6f, 0xff, 0xff,
diff --git a/vcl/unx/source/inc/crop_mask.h b/vcl/unx/source/inc/crop_mask.h
index 84c37341918c..f7d3c87201c3 100644
--- a/vcl/unx/source/inc/crop_mask.h
+++ b/vcl/unx/source/inc/crop_mask.h
@@ -27,7 +27,7 @@
  ************************************************************************/
 #define crop_mask_width 32
 #define crop_mask_height 32
-static char crop_mask_bits[] = {
+static unsigned char crop_mask_bits[] = {
    0x00, 0xf8, 0x01, 0x00, 0x00, 0xf8, 0x01, 0x00, 0xfc, 0xff, 0x0f, 0x00,
    0xfc, 0xff, 0x0f, 0x00, 0xfc, 0xff, 0x0f, 0x00, 0xfc, 0xff, 0x0f, 0x00,
    0xfc, 0xff, 0x0f, 0x00, 0xfc, 0xff, 0x0f, 0x00, 0xfc, 0xf8, 0x01, 0x00,
diff --git a/vcl/unx/source/inc/detective_curs.h b/vcl/unx/source/inc/detective_curs.h
index 181b6e0d3e28..b2e3e2a375b9 100644
--- a/vcl/unx/source/inc/detective_curs.h
+++ b/vcl/unx/source/inc/detective_curs.h
@@ -29,7 +29,7 @@
 #define detective_curs_height 32
 #define detective_curs_x_hot 12
 #define detective_curs_y_hot 13
-static char detective_curs_bits[] = {
+static unsigned char detective_curs_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x38,0x00,
  0x00,0x00,0x10,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7c,
  0x00,0x00,0x00,0x83,0x01,0x00,0x80,0x00,0x02,0x00,0x80,0x10,0x02,0x00,0x40,
diff --git a/vcl/unx/source/inc/detective_mask.h b/vcl/unx/source/inc/detective_mask.h
index db93906579a4..e731aff3c989 100644
--- a/vcl/unx/source/inc/detective_mask.h
+++ b/vcl/unx/source/inc/detective_mask.h
@@ -29,7 +29,7 @@
 #define detective_mask_height 32
 #define detective_mask_x_hot 12
 #define detective_mask_y_hot 13
-static char detective_mask_bits[] = {
+static unsigned char detective_mask_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x38,0x00,
  0x00,0x00,0x10,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7c,
  0x00,0x00,0x00,0xff,0x01,0x00,0x80,0xff,0x03,0x00,0x80,0xff,0x03,0x00,0xc0,
diff --git a/vcl/unx/source/inc/drawarc_curs.h b/vcl/unx/source/inc/drawarc_curs.h
index 1db1b3a61840..08a3e324dae6 100644
--- a/vcl/unx/source/inc/drawarc_curs.h
+++ b/vcl/unx/source/inc/drawarc_curs.h
@@ -29,7 +29,7 @@
 #define drawarc_curs_height 32
 #define drawarc_curs_x_hot 7
 #define drawarc_curs_y_hot 7
-static char drawarc_curs_bits[] = {
+static unsigned char drawarc_curs_bits[] = {
    0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
    0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/drawarc_mask.h b/vcl/unx/source/inc/drawarc_mask.h
index 9c5ddd61b471..b4e42dc824c6 100644
--- a/vcl/unx/source/inc/drawarc_mask.h
+++ b/vcl/unx/source/inc/drawarc_mask.h
@@ -27,7 +27,7 @@
  ************************************************************************/
 #define drawarc_mask_width 32
 #define drawarc_mask_height 32
-static char drawarc_mask_bits[] = {
+static unsigned char drawarc_mask_bits[] = {
    0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00,
    0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00,
    0x3f, 0x7e, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/drawbezier_curs.h b/vcl/unx/source/inc/drawbezier_curs.h
index ad96981c9bb3..a84a2da70333 100644
--- a/vcl/unx/source/inc/drawbezier_curs.h
+++ b/vcl/unx/source/inc/drawbezier_curs.h
@@ -29,7 +29,7 @@
 #define drawbezier_curs_height 32
 #define drawbezier_curs_x_hot 7
 #define drawbezier_curs_y_hot 7
-static char drawbezier_curs_bits[] = {
+static unsigned char drawbezier_curs_bits[] = {
    0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
    0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/drawbezier_mask.h b/vcl/unx/source/inc/drawbezier_mask.h
index 791d170d4045..13bac21a4594 100644
--- a/vcl/unx/source/inc/drawbezier_mask.h
+++ b/vcl/unx/source/inc/drawbezier_mask.h
@@ -27,7 +27,7 @@
  ************************************************************************/
 #define drawbezier_mask_width 32
 #define drawbezier_mask_height 32
-static char drawbezier_mask_bits[] = {
+static unsigned char drawbezier_mask_bits[] = {
    0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00,
    0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00,
    0x3f, 0x7e, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/drawcaption_curs.h b/vcl/unx/source/inc/drawcaption_curs.h
index 45d14a75d18a..9905c240002d 100644
--- a/vcl/unx/source/inc/drawcaption_curs.h
+++ b/vcl/unx/source/inc/drawcaption_curs.h
@@ -29,7 +29,7 @@
 #define drawcaption_curs_height 32
 #define drawcaption_curs_x_hot 8
 #define drawcaption_curs_y_hot 8
-static char drawcaption_curs_bits[] = {
+static unsigned char drawcaption_curs_bits[] = {
    0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff,
    0xff, 0xfe, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff,
    0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x81, 0x02, 0xff, 0xff,
diff --git a/vcl/unx/source/inc/drawcaption_mask.h b/vcl/unx/source/inc/drawcaption_mask.h
index 87c6ff83916c..98c0bc5aaf38 100644
--- a/vcl/unx/source/inc/drawcaption_mask.h
+++ b/vcl/unx/source/inc/drawcaption_mask.h
@@ -27,7 +27,7 @@
  ************************************************************************/
 #define drawcaption_mask_width 32
 #define drawcaption_mask_height 32
-static char drawcaption_mask_bits[] = {
+static unsigned char drawcaption_mask_bits[] = {
    0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00,
    0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00,
    0x80, 0x03, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0xff, 0xff, 0x01, 0x00,
diff --git a/vcl/unx/source/inc/drawcirclecut_curs.h b/vcl/unx/source/inc/drawcirclecut_curs.h
index 1554aeb08090..c36720ad659e 100644
--- a/vcl/unx/source/inc/drawcirclecut_curs.h
+++ b/vcl/unx/source/inc/drawcirclecut_curs.h
@@ -29,7 +29,7 @@
 #define drawcirclecut_curs_height 32
 #define drawcirclecut_curs_x_hot 7
 #define drawcirclecut_curs_y_hot 7
-static char drawcirclecut_curs_bits[] = {
+static unsigned char drawcirclecut_curs_bits[] = {
    0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
    0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/drawcirclecut_mask.h b/vcl/unx/source/inc/drawcirclecut_mask.h
index 3e5ebe03e164..885c210bda34 100644
--- a/vcl/unx/source/inc/drawcirclecut_mask.h
+++ b/vcl/unx/source/inc/drawcirclecut_mask.h
@@ -27,7 +27,7 @@
  ************************************************************************/
 #define drawcirclecut_mask_width 32
 #define drawcirclecut_mask_height 32
-static char drawcirclecut_mask_bits[] = {
+static unsigned char drawcirclecut_mask_bits[] = {
    0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00,
    0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00,
    0x3f, 0x7e, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/drawconnect_curs.h b/vcl/unx/source/inc/drawconnect_curs.h
index 2f657f1ba426..40f4e6dc3905 100644
--- a/vcl/unx/source/inc/drawconnect_curs.h
+++ b/vcl/unx/source/inc/drawconnect_curs.h
@@ -29,7 +29,7 @@
 #define drawconnect_curs_height 32
 #define drawconnect_curs_x_hot 7
 #define drawconnect_curs_y_hot 7
-static char drawconnect_curs_bits[] = {
+static unsigned char drawconnect_curs_bits[] = {
    0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
    0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/drawconnect_mask.h b/vcl/unx/source/inc/drawconnect_mask.h
index 6b48aa5c8945..270cdbac3fe6 100644
--- a/vcl/unx/source/inc/drawconnect_mask.h
+++ b/vcl/unx/source/inc/drawconnect_mask.h
@@ -27,7 +27,7 @@
  ************************************************************************/
 #define drawconnect_mask_width 32
 #define drawconnect_mask_height 32
-static char drawconnect_mask_bits[] = {
+static unsigned char drawconnect_mask_bits[] = {
    0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00,
    0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00,
    0x3f, 0x7e, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/drawcrook_curs.h b/vcl/unx/source/inc/drawcrook_curs.h
index 8af64195ed51..e89e91322432 100644
--- a/vcl/unx/source/inc/drawcrook_curs.h
+++ b/vcl/unx/source/inc/drawcrook_curs.h
@@ -29,7 +29,7 @@
 #define drawcrook_curs_height 32
 #define drawcrook_curs_x_hot 15
 #define drawcrook_curs_y_hot 14
-static char drawcrook_curs_bits[] = {
+static unsigned char drawcrook_curs_bits[] = {
    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
    0xff, 0xff, 0xff, 0xff, 0xff, 0x7c, 0x3e, 0xff, 0x7f, 0xbb, 0xdd, 0xfe,
diff --git a/vcl/unx/source/inc/drawcrook_mask.h b/vcl/unx/source/inc/drawcrook_mask.h
index 037889ade041..b42d2591d123 100644
--- a/vcl/unx/source/inc/drawcrook_mask.h
+++ b/vcl/unx/source/inc/drawcrook_mask.h
@@ -27,7 +27,7 @@
  ************************************************************************/
 #define drawcrook_mask_width 32
 #define drawcrook_mask_height 32
-static char drawcrook_mask_bits[] = {
+static unsigned char drawcrook_mask_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x83, 0xc1, 0x00, 0x80, 0xc7, 0xe3, 0x01, 0xc0, 0xef, 0xf7, 0x03,
diff --git a/vcl/unx/source/inc/drawcrop_curs.h b/vcl/unx/source/inc/drawcrop_curs.h
index e356a91102d5..903c5b314418 100644
--- a/vcl/unx/source/inc/drawcrop_curs.h
+++ b/vcl/unx/source/inc/drawcrop_curs.h
@@ -29,7 +29,7 @@
 #define drawcrop_curs_height 32
 #define drawcrop_curs_x_hot 9
 #define drawcrop_curs_y_hot 9
-static char drawcrop_curs_bits[] = {
+static unsigned char drawcrop_curs_bits[] = {
    0xff, 0x0f, 0xff, 0xff, 0xff, 0x6f, 0xff, 0xff, 0xff, 0x6f, 0xff, 0xff,
    0x07, 0x60, 0xf8, 0xff, 0xf7, 0x6f, 0xfb, 0xff, 0xf7, 0x6f, 0xfb, 0xff,
    0x37, 0x60, 0xf8, 0xff, 0xb7, 0x6f, 0xff, 0xff, 0xb7, 0x6f, 0xff, 0xff,
diff --git a/vcl/unx/source/inc/drawcrop_mask.h b/vcl/unx/source/inc/drawcrop_mask.h
index 7bfb31382793..eea6b4448146 100644
--- a/vcl/unx/source/inc/drawcrop_mask.h
+++ b/vcl/unx/source/inc/drawcrop_mask.h
@@ -27,7 +27,7 @@
  ************************************************************************/
 #define drawcrop_mask_width 32
 #define drawcrop_mask_height 32
-static char drawcrop_mask_bits[] = {
+static unsigned char drawcrop_mask_bits[] = {
    0x00, 0xf8, 0x01, 0x00, 0x00, 0xf8, 0x01, 0x00, 0xfc, 0xff, 0x0f, 0x00,
    0xfc, 0xff, 0x0f, 0x00, 0xfc, 0xff, 0x0f, 0x00, 0xfc, 0xff, 0x0f, 0x00,
    0xfc, 0xff, 0x0f, 0x00, 0xfc, 0xff, 0x0f, 0x00, 0xfc, 0xf8, 0x01, 0x00,
diff --git a/vcl/unx/source/inc/drawellipse_curs.h b/vcl/unx/source/inc/drawellipse_curs.h
index 32d2259dc7d7..5928139b81f3 100644
--- a/vcl/unx/source/inc/drawellipse_curs.h
+++ b/vcl/unx/source/inc/drawellipse_curs.h
@@ -29,7 +29,7 @@
 #define drawellipse_curs_height 32
 #define drawellipse_curs_x_hot 7
 #define drawellipse_curs_y_hot 7
-static char drawellipse_curs_bits[] = {
+static unsigned char drawellipse_curs_bits[] = {
    0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
    0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/drawellipse_mask.h b/vcl/unx/source/inc/drawellipse_mask.h
index 5218ac419c97..72ceedfb57ee 100644
--- a/vcl/unx/source/inc/drawellipse_mask.h
+++ b/vcl/unx/source/inc/drawellipse_mask.h
@@ -27,7 +27,7 @@
  ************************************************************************/
 #define drawellipse_mask_width 32
 #define drawellipse_mask_height 32
-static char drawellipse_mask_bits[] = {
+static unsigned char drawellipse_mask_bits[] = {
    0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00,
    0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00,
    0x3f, 0x7e, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/drawfreehand_curs.h b/vcl/unx/source/inc/drawfreehand_curs.h
index 7e577fe08940..644d5bbb639d 100644
--- a/vcl/unx/source/inc/drawfreehand_curs.h
+++ b/vcl/unx/source/inc/drawfreehand_curs.h
@@ -29,7 +29,7 @@
 #define drawfreehand_curs_height 32
 #define drawfreehand_curs_x_hot 8
 #define drawfreehand_curs_y_hot 8
-static char drawfreehand_curs_bits[] = {
+static unsigned char drawfreehand_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
    0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
    0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xfd, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/drawfreehand_mask.h b/vcl/unx/source/inc/drawfreehand_mask.h
index ed06a873d0e2..959a54e827fe 100644
--- a/vcl/unx/source/inc/drawfreehand_mask.h
+++ b/vcl/unx/source/inc/drawfreehand_mask.h
@@ -27,7 +27,7 @@
  ************************************************************************/
 #define drawfreehand_mask_width 32
 #define drawfreehand_mask_height 32
-static char drawfreehand_mask_bits[] = {
+static unsigned char drawfreehand_mask_bits[] = {
    0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00,
    0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00,
    0x80, 0x03, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0xff, 0xff, 0x01, 0x00,
diff --git a/vcl/unx/source/inc/drawline_curs.h b/vcl/unx/source/inc/drawline_curs.h
index 1d9e3f642704..84f78ccec876 100644
--- a/vcl/unx/source/inc/drawline_curs.h
+++ b/vcl/unx/source/inc/drawline_curs.h
@@ -29,7 +29,7 @@
 #define drawline_curs_height 32
 #define drawline_curs_x_hot 7
 #define drawline_curs_y_hot 7
-static char drawline_curs_bits[] = {
+static unsigned char drawline_curs_bits[] = {
    0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
    0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/drawline_mask.h b/vcl/unx/source/inc/drawline_mask.h
index b9e66306d964..80784ca860b6 100644
--- a/vcl/unx/source/inc/drawline_mask.h
+++ b/vcl/unx/source/inc/drawline_mask.h
@@ -27,7 +27,7 @@
  ************************************************************************/
 #define drawline_mask_width 32
 #define drawline_mask_height 32
-static char drawline_mask_bits[] = {
+static unsigned char drawline_mask_bits[] = {
    0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00,
    0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00,
    0x3f, 0xfe, 0x00, 0x00, 0xbf, 0xfe, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/drawmirror_curs.h b/vcl/unx/source/inc/drawmirror_curs.h
index 4c93e574e2f6..b68907138e42 100644
--- a/vcl/unx/source/inc/drawmirror_curs.h
+++ b/vcl/unx/source/inc/drawmirror_curs.h
@@ -29,7 +29,7 @@
 #define drawmirror_curs_height 32
 #define drawmirror_curs_x_hot 14
 #define drawmirror_curs_y_hot 12
-static char drawmirror_curs_bits[] = {
+static unsigned char drawmirror_curs_bits[] = {
    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0x03, 0xf8, 0xf5, 0xff,
    0xfb, 0xfb, 0xee, 0xff, 0x0b, 0xfa, 0xf5, 0xff, 0xeb, 0xfa, 0xfa, 0xff,
    0xeb, 0xfa, 0xfa, 0xff, 0xeb, 0x7a, 0xfd, 0xff, 0xeb, 0x7a, 0xfd, 0xff,
diff --git a/vcl/unx/source/inc/drawmirror_mask.h b/vcl/unx/source/inc/drawmirror_mask.h
index cfcd0f7abf3b..231f109a24ae 100644
--- a/vcl/unx/source/inc/drawmirror_mask.h
+++ b/vcl/unx/source/inc/drawmirror_mask.h
@@ -27,7 +27,7 @@
  ************************************************************************/
 #define drawmirror_mask_width 32
 #define drawmirror_mask_height 32
-static char drawmirror_mask_bits[] = {
+static unsigned char drawmirror_mask_bits[] = {
    0x00, 0x00, 0x04, 0x00, 0xfe, 0x0f, 0x0e, 0x00, 0xfe, 0x0f, 0x1f, 0x00,
    0xfe, 0x8f, 0x3f, 0x00, 0xfe, 0x0f, 0x1f, 0x00, 0xfe, 0x8f, 0x0f, 0x00,
    0xbe, 0x8f, 0x0f, 0x00, 0xbe, 0xcf, 0x07, 0x00, 0xbe, 0xcf, 0x87, 0x00,
diff --git a/vcl/unx/source/inc/drawpie_curs.h b/vcl/unx/source/inc/drawpie_curs.h
index 26dae0f57de8..1cc5933c88b3 100644
--- a/vcl/unx/source/inc/drawpie_curs.h
+++ b/vcl/unx/source/inc/drawpie_curs.h
@@ -29,7 +29,7 @@
 #define drawpie_curs_height 32
 #define drawpie_curs_x_hot 7
 #define drawpie_curs_y_hot 7
-static char drawpie_curs_bits[] = {
+static unsigned char drawpie_curs_bits[] = {
    0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
    0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/drawpie_mask.h b/vcl/unx/source/inc/drawpie_mask.h
index 403321f7648d..880be6043497 100644
--- a/vcl/unx/source/inc/drawpie_mask.h
+++ b/vcl/unx/source/inc/drawpie_mask.h
@@ -27,7 +27,7 @@
  ************************************************************************/
 #define drawpie_mask_width 32
 #define drawpie_mask_height 32
-static char drawpie_mask_bits[] = {
+static unsigned char drawpie_mask_bits[] = {
    0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00,
    0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00,
    0x3f, 0x7e, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/drawpolygon_curs.h b/vcl/unx/source/inc/drawpolygon_curs.h
index 40805ec5b857..a101b1bff576 100644
--- a/vcl/unx/source/inc/drawpolygon_curs.h
+++ b/vcl/unx/source/inc/drawpolygon_curs.h
@@ -29,7 +29,7 @@
 #define drawpolygon_curs_height 32
 #define drawpolygon_curs_x_hot 7
 #define drawpolygon_curs_y_hot 7
-static char drawpolygon_curs_bits[] = {
+static unsigned char drawpolygon_curs_bits[] = {
    0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
    0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/drawpolygon_mask.h b/vcl/unx/source/inc/drawpolygon_mask.h
index 6f8eed316e70..660bee287c09 100644
--- a/vcl/unx/source/inc/drawpolygon_mask.h
+++ b/vcl/unx/source/inc/drawpolygon_mask.h
@@ -27,7 +27,7 @@
  ************************************************************************/
 #define drawpolygon_mask_width 32
 #define drawpolygon_mask_height 32
-static char drawpolygon_mask_bits[] = {
+static unsigned char drawpolygon_mask_bits[] = {
    0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00,
    0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00,
    0x3f, 0x7e, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/drawrect_curs.h b/vcl/unx/source/inc/drawrect_curs.h
index ac5d544122fd..553df540aa29 100644
--- a/vcl/unx/source/inc/drawrect_curs.h
+++ b/vcl/unx/source/inc/drawrect_curs.h
@@ -29,7 +29,7 @@
 #define drawrect_curs_height 32
 #define drawrect_curs_x_hot 7
 #define drawrect_curs_y_hot 7
-static char drawrect_curs_bits[] = {
+static unsigned char drawrect_curs_bits[] = {
    0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
    0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/drawrect_mask.h b/vcl/unx/source/inc/drawrect_mask.h
index 03e765e0547a..3bb39e1d98a8 100644
--- a/vcl/unx/source/inc/drawrect_mask.h
+++ b/vcl/unx/source/inc/drawrect_mask.h
@@ -27,7 +27,7 @@
  ************************************************************************/
 #define drawrect_mask_width 32
 #define drawrect_mask_height 32
-static char drawrect_mask_bits[] = {
+static unsigned char drawrect_mask_bits[] = {
    0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00,
    0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00,
    0x3f, 0x7e, 0x00, 0x00, 0xbf, 0x7e, 0x00, 0x00, 0x3f, 0x7e, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/drawtext_curs.h b/vcl/unx/source/inc/drawtext_curs.h
index d33eb6860219..67726d6e5a2d 100644
--- a/vcl/unx/source/inc/drawtext_curs.h
+++ b/vcl/unx/source/inc/drawtext_curs.h
@@ -29,7 +29,7 @@
 #define drawtext_curs_height 32
 #define drawtext_curs_x_hot 8
 #define drawtext_curs_y_hot 8
-static char drawtext_curs_bits[] = {
+static unsigned char drawtext_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
    0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
    0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xfd, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/drawtext_mask.h b/vcl/unx/source/inc/drawtext_mask.h
index 5f6d4bcfa453..ce1fc2c41053 100644
--- a/vcl/unx/source/inc/drawtext_mask.h
+++ b/vcl/unx/source/inc/drawtext_mask.h
@@ -27,7 +27,7 @@
  ************************************************************************/
 #define drawtext_mask_width 32
 #define drawtext_mask_height 32
-static char drawtext_mask_bits[] = {
+static unsigned char drawtext_mask_bits[] = {
    0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00,
    0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00,
    0x80, 0x03, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0xff, 0xff, 0x01, 0x00,
diff --git a/vcl/unx/source/inc/fill_curs.h b/vcl/unx/source/inc/fill_curs.h
index c08ae8a70f00..c8dfbb274f13 100644
--- a/vcl/unx/source/inc/fill_curs.h
+++ b/vcl/unx/source/inc/fill_curs.h
@@ -29,7 +29,7 @@
 #define fill_curs_height 32
 #define fill_curs_x_hot 10
 #define fill_curs_y_hot 22
-static char fill_curs_bits[] = {
+static unsigned char fill_curs_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x80,0x02,0x00,0x00,0x5c,0x0c,0x00,0x00,
diff --git a/vcl/unx/source/inc/fill_mask.h b/vcl/unx/source/inc/fill_mask.h
index 5a1432dccdd1..32b25ae67660 100644
--- a/vcl/unx/source/inc/fill_mask.h
+++ b/vcl/unx/source/inc/fill_mask.h
@@ -29,7 +29,7 @@
 #define fill_mask_height 32
 #define fill_mask_x_hot 10
 #define fill_mask_y_hot 22
-static char fill_mask_bits[] = {
+static unsigned char fill_mask_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x80,0x03,0x00,0x00,0xdc,0x0f,0x00,0x00,
diff --git a/vcl/unx/source/inc/hshear_curs.h b/vcl/unx/source/inc/hshear_curs.h
index 91a89ab99a04..edaa9fe7958b 100644
--- a/vcl/unx/source/inc/hshear_curs.h
+++ b/vcl/unx/source/inc/hshear_curs.h
@@ -29,7 +29,7 @@
 #define hshear_curs_height 32
 #define hshear_curs_x_hot 15
 #define hshear_curs_y_hot 15
-static char hshear_curs_bits[] = {
+static unsigned char hshear_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/hshear_mask.h b/vcl/unx/source/inc/hshear_mask.h
index 15a6e92b412c..5c6f9a017e5a 100644
--- a/vcl/unx/source/inc/hshear_mask.h
+++ b/vcl/unx/source/inc/hshear_mask.h
@@ -27,7 +27,7 @@
  ************************************************************************/
 #define hshear_mask_width 32
 #define hshear_mask_height 32
-static char hshear_mask_bits[] = {
+static unsigned char hshear_mask_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/invert50.h b/vcl/unx/source/inc/invert50.h
index 12f64dff5ce7..b1f4c1e86d18 100644
--- a/vcl/unx/source/inc/invert50.h
+++ b/vcl/unx/source/inc/invert50.h
@@ -27,7 +27,7 @@
  ************************************************************************/
 #define invert50_width 32
 #define invert50_height 32
-static char invert50_bits[] = {
+static unsigned char invert50_bits[] = {
 #if 1
    0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0x55, 0x55, 0x55,
    0xAA, 0xAA, 0xAA, 0xAA, 0x55, 0x55, 0x55, 0x55,
diff --git a/vcl/unx/source/inc/linkdata_curs.h b/vcl/unx/source/inc/linkdata_curs.h
index 02d5709600a8..054ef55ef2bb 100644
--- a/vcl/unx/source/inc/linkdata_curs.h
+++ b/vcl/unx/source/inc/linkdata_curs.h
@@ -29,7 +29,7 @@
 #define linkdata_curs_height 32
 #define linkdata_curs_x_hot 1
 #define linkdata_curs_y_hot 1
-static char linkdata_curs_bits[] = {
+static unsigned char linkdata_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
    0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00,
    0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/linkdata_mask.h b/vcl/unx/source/inc/linkdata_mask.h
index 5bf28eac1bd5..429c603066dc 100644
--- a/vcl/unx/source/inc/linkdata_mask.h
+++ b/vcl/unx/source/inc/linkdata_mask.h
@@ -29,7 +29,7 @@
 #define linkdata_mask_height 32
 #define linkdata_mask_x_hot 1
 #define linkdata_mask_y_hot 1
-static char linkdata_mask_bits[] = {
+static unsigned char linkdata_mask_bits[] = {
    0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
    0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
    0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/linkfile_curs.h b/vcl/unx/source/inc/linkfile_curs.h
index 38731cdde471..5f68af135810 100644
--- a/vcl/unx/source/inc/linkfile_curs.h
+++ b/vcl/unx/source/inc/linkfile_curs.h
@@ -29,7 +29,7 @@
 #define linkfile_curs_height 32
 #define linkfile_curs_x_hot 9
 #define linkfile_curs_y_hot 9
-static char linkfile_curs_bits[] = {
+static unsigned char linkfile_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x00,
    0xfe, 0x00, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00,
    0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x04, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/linkfile_mask.h b/vcl/unx/source/inc/linkfile_mask.h
index 0b36e8a28c41..fad8d6ad7624 100644
--- a/vcl/unx/source/inc/linkfile_mask.h
+++ b/vcl/unx/source/inc/linkfile_mask.h
@@ -29,7 +29,7 @@
 #define linkfile_mask_height 32
 #define linkfile_mask_x_hot 9
 #define linkfile_mask_y_hot 9
-static char linkfile_mask_bits[] = {
+static unsigned char linkfile_mask_bits[] = {
    0xff, 0x01, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
    0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
    0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/magnify_curs.h b/vcl/unx/source/inc/magnify_curs.h
index d25680bca7ec..4db8bb382b15 100644
--- a/vcl/unx/source/inc/magnify_curs.h
+++ b/vcl/unx/source/inc/magnify_curs.h
@@ -29,7 +29,7 @@
 #define magnify_curs_height 32
 #define magnify_curs_x_hot 12
 #define magnify_curs_y_hot 13
-static char magnify_curs_bits[] = {
+static unsigned char magnify_curs_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,0x83,
  0x01,0x00,0x80,0x00,0x02,0x00,0x40,0x00,0x04,0x00,0x40,0x00,0x04,0x00,0x20,
diff --git a/vcl/unx/source/inc/magnify_mask.h b/vcl/unx/source/inc/magnify_mask.h
index 723a913eeb20..a7b5b027362d 100644
--- a/vcl/unx/source/inc/magnify_mask.h
+++ b/vcl/unx/source/inc/magnify_mask.h
@@ -27,7 +27,7 @@
  ************************************************************************/
 #define magnify_mask_width 32
 #define magnify_mask_height 32
-static char magnify_mask_bits[] = {
+static unsigned char magnify_mask_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00,
    0x00, 0xff, 0x01, 0x00, 0x80, 0xff, 0x03, 0x00, 0xc0, 0x83, 0x07, 0x00,
diff --git a/vcl/unx/source/inc/mirror_curs.h b/vcl/unx/source/inc/mirror_curs.h
index 6f7ea2de78f5..c2488a6fd725 100644
--- a/vcl/unx/source/inc/mirror_curs.h
+++ b/vcl/unx/source/inc/mirror_curs.h
@@ -29,7 +29,7 @@
 #define mirror_curs_height 32
 #define mirror_curs_x_hot 14
 #define mirror_curs_y_hot 12
-static char mirror_curs_bits[] = {
+static unsigned char mirror_curs_bits[] = {
    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0x03, 0xf8, 0xf5, 0xff,
    0xfb, 0xfb, 0xee, 0xff, 0x0b, 0xfa, 0xf5, 0xff, 0xeb, 0xfa, 0xfa, 0xff,
    0xeb, 0xfa, 0xfa, 0xff, 0xeb, 0x7a, 0xfd, 0xff, 0xeb, 0x7a, 0xfd, 0xff,
diff --git a/vcl/unx/source/inc/mirror_mask.h b/vcl/unx/source/inc/mirror_mask.h
index d39742976c93..60e8f1593b2b 100644
--- a/vcl/unx/source/inc/mirror_mask.h
+++ b/vcl/unx/source/inc/mirror_mask.h
@@ -27,7 +27,7 @@
  ************************************************************************/
 #define mirror_mask_width 32
 #define mirror_mask_height 32
-static char mirror_mask_bits[] = {
+static unsigned char mirror_mask_bits[] = {
    0x00, 0x00, 0x04, 0x00, 0xfe, 0x0f, 0x0e, 0x00, 0xfe, 0x0f, 0x1f, 0x00,
    0xfe, 0x8f, 0x3f, 0x00, 0xfe, 0x0f, 0x1f, 0x00, 0xfe, 0x8f, 0x0f, 0x00,
    0xbe, 0x8f, 0x0f, 0x00, 0xbe, 0xcf, 0x07, 0x00, 0xbe, 0xcf, 0x87, 0x00,
diff --git a/vcl/unx/source/inc/movebezierweight_curs.h b/vcl/unx/source/inc/movebezierweight_curs.h
index 1c83a1f72ca0..df99aab7ea0f 100644
--- a/vcl/unx/source/inc/movebezierweight_curs.h
+++ b/vcl/unx/source/inc/movebezierweight_curs.h
@@ -29,7 +29,7 @@
 #define movebezierweight_curs_height 32
 #define movebezierweight_curs_x_hot 0
 #define movebezierweight_curs_y_hot 0
-static char movebezierweight_curs_bits[] = {
+static unsigned char movebezierweight_curs_bits[] = {
    0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xf9, 0xff, 0xff, 0xff,
    0xf1, 0xff, 0xff, 0xff, 0xe1, 0xff, 0xff, 0xff, 0xc1, 0xff, 0xff, 0xff,
    0x81, 0xff, 0xff, 0xff, 0x01, 0xff, 0xff, 0xff, 0x01, 0xfe, 0xff, 0xff,
diff --git a/vcl/unx/source/inc/movebezierweight_mask.h b/vcl/unx/source/inc/movebezierweight_mask.h
index 392657c42f19..831f427a9086 100644
--- a/vcl/unx/source/inc/movebezierweight_mask.h
+++ b/vcl/unx/source/inc/movebezierweight_mask.h
@@ -27,7 +27,7 @@
  ************************************************************************/
 #define movebezierweight_mask_width 32
 #define movebezierweight_mask_height 32
-static char movebezierweight_mask_bits[] = {
+static unsigned char movebezierweight_mask_bits[] = {
    0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00,
    0x1f, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00,
    0xff, 0x00, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/movedata_curs.h b/vcl/unx/source/inc/movedata_curs.h
index cbc3b6b73c1e..642bbd176e4b 100644
--- a/vcl/unx/source/inc/movedata_curs.h
+++ b/vcl/unx/source/inc/movedata_curs.h
@@ -29,7 +29,7 @@
 #define movedata_curs_height 32
 #define movedata_curs_x_hot 1
 #define movedata_curs_y_hot 1
-static char movedata_curs_bits[] = {
+static unsigned char movedata_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
    0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00,
    0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/movedata_mask.h b/vcl/unx/source/inc/movedata_mask.h
index 716e626f778b..f06c80f1728c 100644
--- a/vcl/unx/source/inc/movedata_mask.h
+++ b/vcl/unx/source/inc/movedata_mask.h
@@ -29,7 +29,7 @@
 #define movedata_mask_height 32
 #define movedata_mask_x_hot 1
 #define movedata_mask_y_hot 1
-static char movedata_mask_bits[] = {
+static unsigned char movedata_mask_bits[] = {
    0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
    0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
    0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/movedlnk_curs.h b/vcl/unx/source/inc/movedlnk_curs.h
index 62ff813f9366..c163488d8d26 100644
--- a/vcl/unx/source/inc/movedlnk_curs.h
+++ b/vcl/unx/source/inc/movedlnk_curs.h
@@ -29,7 +29,7 @@
 #define movedlnk_curs_height 32
 #define movedlnk_curs_x_hot 1
 #define movedlnk_curs_y_hot 1
-static char movedlnk_curs_bits[] = {
+static unsigned char movedlnk_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
    0x0e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00,
    0x7e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/movedlnk_mask.h b/vcl/unx/source/inc/movedlnk_mask.h
index 4852cbbbc4a5..8f3fa3cb92f6 100644
--- a/vcl/unx/source/inc/movedlnk_mask.h
+++ b/vcl/unx/source/inc/movedlnk_mask.h
@@ -29,7 +29,7 @@
 #define movedlnk_mask_height 32
 #define movedlnk_mask_x_hot 1
 #define movedlnk_mask_y_hot 1
-static char movedlnk_mask_bits[] = {
+static unsigned char movedlnk_mask_bits[] = {
    0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
    0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
    0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/movefile_curs.h b/vcl/unx/source/inc/movefile_curs.h
index 7ec7075a4733..54c3ce91df96 100644
--- a/vcl/unx/source/inc/movefile_curs.h
+++ b/vcl/unx/source/inc/movefile_curs.h
@@ -29,7 +29,7 @@
 #define movefile_curs_height 32
 #define movefile_curs_x_hot 9
 #define movefile_curs_y_hot 9
-static char movefile_curs_bits[] = {
+static unsigned char movefile_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x00,
    0xfe, 0x00, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00,
    0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x04, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/movefile_mask.h b/vcl/unx/source/inc/movefile_mask.h
index 355b571420ea..566b3fdeb8de 100644
--- a/vcl/unx/source/inc/movefile_mask.h
+++ b/vcl/unx/source/inc/movefile_mask.h
@@ -29,7 +29,7 @@
 #define movefile_mask_height 32
 #define movefile_mask_x_hot 9
 #define movefile_mask_y_hot 9
-static char movefile_mask_bits[] = {
+static unsigned char movefile_mask_bits[] = {
    0xff, 0x01, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
    0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
    0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/movefiles_curs.h b/vcl/unx/source/inc/movefiles_curs.h
index a469b10dbb4f..95ec95bd8302 100644
--- a/vcl/unx/source/inc/movefiles_curs.h
+++ b/vcl/unx/source/inc/movefiles_curs.h
@@ -29,7 +29,7 @@
 #define movefiles_curs_height 32
 #define movefiles_curs_x_hot 8
 #define movefiles_curs_y_hot 9
-static char movefiles_curs_bits[] = {
+static unsigned char movefiles_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0xe0, 0x0f, 0x00, 0x00, 0xe0, 0x2f, 0x00, 0x00,
    0xe8, 0x0f, 0x00, 0x00, 0xe8, 0x7f, 0x00, 0x00, 0xea, 0x7f, 0x00, 0x00,
    0xea, 0x7f, 0x00, 0x00, 0xea, 0x7f, 0x00, 0x00, 0x6a, 0x7e, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/movefiles_mask.h b/vcl/unx/source/inc/movefiles_mask.h
index 09553289eff0..03a56a169218 100644
--- a/vcl/unx/source/inc/movefiles_mask.h
+++ b/vcl/unx/source/inc/movefiles_mask.h
@@ -29,7 +29,7 @@
 #define movefiles_mask_height 32
 #define movefiles_mask_x_hot 8
 #define movefiles_mask_y_hot 9
-static char movefiles_mask_bits[] = {
+static unsigned char movefiles_mask_bits[] = {
    0xf0, 0x1f, 0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00, 0xfc, 0x7f, 0x00, 0x00,
    0xfc, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
    0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/moveflnk_curs.h b/vcl/unx/source/inc/moveflnk_curs.h
index 0986e445d95f..1f1fea56dead 100644
--- a/vcl/unx/source/inc/moveflnk_curs.h
+++ b/vcl/unx/source/inc/moveflnk_curs.h
@@ -29,7 +29,7 @@
 #define moveflnk_curs_height 32
 #define moveflnk_curs_x_hot 9
 #define moveflnk_curs_y_hot 9
-static char moveflnk_curs_bits[] = {
+static unsigned char moveflnk_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x00,
    0xfe, 0x00, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00,
    0xfe, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/moveflnk_mask.h b/vcl/unx/source/inc/moveflnk_mask.h
index c73e4b16fc34..f8312aba525e 100644
--- a/vcl/unx/source/inc/moveflnk_mask.h
+++ b/vcl/unx/source/inc/moveflnk_mask.h
@@ -29,7 +29,7 @@
 #define moveflnk_mask_height 32
 #define moveflnk_mask_x_hot 9
 #define moveflnk_mask_y_hot 9
-static char moveflnk_mask_bits[] = {
+static unsigned char moveflnk_mask_bits[] = {
    0xff, 0x01, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
    0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
    0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/movepoint_curs.h b/vcl/unx/source/inc/movepoint_curs.h
index 1331b81e68aa..8ccf2d581455 100644
--- a/vcl/unx/source/inc/movepoint_curs.h
+++ b/vcl/unx/source/inc/movepoint_curs.h
@@ -29,7 +29,7 @@
 #define movepoint_curs_height 32
 #define movepoint_curs_x_hot 0
 #define movepoint_curs_y_hot 0
-static char movepoint_curs_bits[] = {
+static unsigned char movepoint_curs_bits[] = {
    0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xf9, 0xff, 0xff, 0xff,
    0xf1, 0xff, 0xff, 0xff, 0xe1, 0xff, 0xff, 0xff, 0xc1, 0xff, 0xff, 0xff,
    0x81, 0xff, 0xff, 0xff, 0x01, 0xff, 0xff, 0xff, 0x01, 0xfe, 0xff, 0xff,
diff --git a/vcl/unx/source/inc/movepoint_mask.h b/vcl/unx/source/inc/movepoint_mask.h
index e7355183ec2c..547dfb03a87e 100644
--- a/vcl/unx/source/inc/movepoint_mask.h
+++ b/vcl/unx/source/inc/movepoint_mask.h
@@ -27,7 +27,7 @@
  ************************************************************************/
 #define movepoint_mask_width 32
 #define movepoint_mask_height 32
-static char movepoint_mask_bits[] = {
+static unsigned char movepoint_mask_bits[] = {
    0x03, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00,
    0x1f, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00,
    0xff, 0x00, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/nodrop_curs.h b/vcl/unx/source/inc/nodrop_curs.h
index 96b0c51178e6..5c501d3876c4 100644
--- a/vcl/unx/source/inc/nodrop_curs.h
+++ b/vcl/unx/source/inc/nodrop_curs.h
@@ -29,7 +29,7 @@
 #define nodrop_curs_height 32
 #define nodrop_curs_x_hot 9
 #define nodrop_curs_y_hot 9
-static char nodrop_curs_bits[] = {
+static unsigned char nodrop_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0xc0, 0x0f, 0x00, 0x00, 0xf0, 0x3f, 0x00, 0x00,
    0xf8, 0x7f, 0x00, 0x00, 0x7c, 0xf8, 0x00, 0x00, 0x1c, 0xfc, 0x00, 0x00,
    0x1e, 0xfe, 0x01, 0x00, 0x0e, 0xdf, 0x01, 0x00, 0x8e, 0xcf, 0x01, 0x00,
diff --git a/vcl/unx/source/inc/nodrop_mask.h b/vcl/unx/source/inc/nodrop_mask.h
index b5bd992c7a4c..bd315dc28df1 100644
--- a/vcl/unx/source/inc/nodrop_mask.h
+++ b/vcl/unx/source/inc/nodrop_mask.h
@@ -29,7 +29,7 @@
 #define nodrop_mask_height 32
 #define nodrop_mask_x_hot 9
 #define nodrop_mask_y_hot 9
-static char nodrop_mask_bits[] = {
+static unsigned char nodrop_mask_bits[] = {
    0xc0, 0x0f, 0x00, 0x00, 0xf0, 0x3f, 0x00, 0x00, 0xf8, 0x7f, 0x00, 0x00,
    0xfc, 0xff, 0x00, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x7e, 0xfe, 0x01, 0x00,
    0x3f, 0xff, 0x03, 0x00, 0x9f, 0xff, 0x03, 0x00, 0xdf, 0xff, 0x03, 0x00,
diff --git a/vcl/unx/source/inc/null_curs.h b/vcl/unx/source/inc/null_curs.h
index 7b771173ee44..1f5687cbcf61 100644
--- a/vcl/unx/source/inc/null_curs.h
+++ b/vcl/unx/source/inc/null_curs.h
@@ -29,6 +29,6 @@
 #define nullcurs_height 4
 #define nullcurs_x_hot 2
 #define nullcurs_y_hot 2
-static char nullcurs_bits[] = { 0x00, 0x00 };
+static unsigned char nullcurs_bits[] = { 0x00, 0x00 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/source/inc/null_mask.h b/vcl/unx/source/inc/null_mask.h
index 5ac9e4df4840..e7ff46805d41 100644
--- a/vcl/unx/source/inc/null_mask.h
+++ b/vcl/unx/source/inc/null_mask.h
@@ -27,6 +27,6 @@
  ************************************************************************/
 #define nullmask_width 4
 #define nullmask_height 4
-static char nullmask_bits[] = { 0x00, 0x00 };
+static unsigned char nullmask_bits[] = { 0x00, 0x00 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/source/inc/paintbrush_curs.h b/vcl/unx/source/inc/paintbrush_curs.h
index ccdbd42e3cb1..1e3cef066ddc 100644
--- a/vcl/unx/source/inc/paintbrush_curs.h
+++ b/vcl/unx/source/inc/paintbrush_curs.h
@@ -3,7 +3,7 @@
 #define paintbrush_curs_height 16
 #define paintbrush_curs_x_hot 0
 #define paintbrush_curs_y_hot 10
-static char paintbrush_curs_bits[] = {
+static unsigned char paintbrush_curs_bits[] = {
    0x00, 0x80, 0x00, 0x40, 0x00, 0x20, 0x00, 0x90, 0x80, 0xcb, 0x60, 0x64,
    0x90, 0x34, 0x08, 0x19, 0x06, 0x22, 0x11, 0x24, 0x09, 0x18, 0x46, 0x14,
    0x24, 0x0a, 0x18, 0x05, 0x90, 0x02, 0xe0, 0x01 };
diff --git a/vcl/unx/source/inc/paintbrush_mask.h b/vcl/unx/source/inc/paintbrush_mask.h
index 2b644a19aa09..4e3000d3b981 100644
--- a/vcl/unx/source/inc/paintbrush_mask.h
+++ b/vcl/unx/source/inc/paintbrush_mask.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #define paintbrush_mask_width 16
 #define paintbrush_mask_height 16
-static char paintbrush_mask_bits[] = {
+static unsigned char paintbrush_mask_bits[] = {
    0x00, 0x80, 0x00, 0xc0, 0x00, 0xe0, 0x00, 0xf0, 0x80, 0xfb, 0xe0, 0x7f,
    0xf0, 0x3f, 0xf8, 0x1f, 0xfe, 0x3f, 0xff, 0x3f, 0xff, 0x1f, 0xfe, 0x1f,
    0xfc, 0x0f, 0xf8, 0x07, 0xf0, 0x03, 0xe0, 0x01 };
diff --git a/vcl/unx/source/inc/pivotcol_curs.h b/vcl/unx/source/inc/pivotcol_curs.h
index 751df69b53b9..dcd7e321fd2e 100644
--- a/vcl/unx/source/inc/pivotcol_curs.h
+++ b/vcl/unx/source/inc/pivotcol_curs.h
@@ -29,7 +29,7 @@
 #define pivotcol_curs_height 32
 #define pivotcol_curs_x_hot 7
 #define pivotcol_curs_y_hot 5
-static char pivotcol_curs_bits[] = {
+static unsigned char pivotcol_curs_bits[] = {
    0xff, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x55, 0x01, 0x00, 0x00,
    0x29, 0x01, 0x00, 0x00, 0x15, 0x01, 0x00, 0x00, 0xa9, 0x00, 0x00, 0x00,
    0x95, 0x01, 0x00, 0x00, 0xa9, 0x02, 0x00, 0x00, 0x95, 0x04, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/pivotcol_mask.h b/vcl/unx/source/inc/pivotcol_mask.h
index 1792ef6962db..b5537c03ec9f 100644
--- a/vcl/unx/source/inc/pivotcol_mask.h
+++ b/vcl/unx/source/inc/pivotcol_mask.h
@@ -29,7 +29,7 @@
 #define pivotcol_mask_height 32
 #define pivotcol_mask_x_hot 7
 #define pivotcol_mask_y_hot 5
-static char pivotcol_mask_bits[] = {
+static unsigned char pivotcol_mask_bits[] = {
    0xff, 0x01, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00,
    0xff, 0x01, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00,
    0xff, 0x01, 0x00, 0x00, 0xff, 0x03, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/pivotdel_curs.h b/vcl/unx/source/inc/pivotdel_curs.h
index c1b8a8537ff9..18348b9e21df 100644
--- a/vcl/unx/source/inc/pivotdel_curs.h
+++ b/vcl/unx/source/inc/pivotdel_curs.h
@@ -29,7 +29,7 @@
 #define pivotdel_curs_height 32
 #define pivotdel_curs_x_hot 9
 #define pivotdel_curs_y_hot 8
-static char pivotdel_curs_bits[] = {
+static unsigned char pivotdel_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x80, 0x01, 0x00,
    0x3c, 0xc0, 0x00, 0x00, 0x73, 0x6f, 0x07, 0x00, 0xe1, 0x30, 0x04, 0x00,
    0xc1, 0x1d, 0x04, 0x00, 0x81, 0x0f, 0x04, 0x00, 0x01, 0x07, 0x04, 0x00,
diff --git a/vcl/unx/source/inc/pivotdel_mask.h b/vcl/unx/source/inc/pivotdel_mask.h
index aece5f1bfd60..bf2e2379f194 100644
--- a/vcl/unx/source/inc/pivotdel_mask.h
+++ b/vcl/unx/source/inc/pivotdel_mask.h
@@ -29,7 +29,7 @@
 #define pivotdel_mask_height 32
 #define pivotdel_mask_x_hot 9
 #define pivotdel_mask_y_hot 8
-static char pivotdel_mask_bits[] = {
+static unsigned char pivotdel_mask_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x80, 0x01, 0x00,
    0x3c, 0xc0, 0x00, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00,
    0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00,
diff --git a/vcl/unx/source/inc/pivotfld_curs.h b/vcl/unx/source/inc/pivotfld_curs.h
index ed999caa6dcc..424179cbfe16 100644
--- a/vcl/unx/source/inc/pivotfld_curs.h
+++ b/vcl/unx/source/inc/pivotfld_curs.h
@@ -29,7 +29,7 @@
 #define pivotfld_curs_height 32
 #define pivotfld_curs_x_hot 8
 #define pivotfld_curs_y_hot 7
-static char pivotfld_curs_bits[] = {
+static unsigned char pivotfld_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x07, 0x00,
    0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x04, 0x00,
    0x01, 0x00, 0x04, 0x00, 0x01, 0x01, 0x04, 0x00, 0x01, 0x03, 0x04, 0x00,
diff --git a/vcl/unx/source/inc/pivotfld_mask.h b/vcl/unx/source/inc/pivotfld_mask.h
index 99f884db83d2..e768b4b26889 100644
--- a/vcl/unx/source/inc/pivotfld_mask.h
+++ b/vcl/unx/source/inc/pivotfld_mask.h
@@ -29,7 +29,7 @@
 #define pivotfld_mask_height 32
 #define pivotfld_mask_x_hot 8
 #define pivotfld_mask_y_hot 7
-static char pivotfld_mask_bits[] = {
+static unsigned char pivotfld_mask_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x07, 0x00,
    0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00,
    0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00,
diff --git a/vcl/unx/source/inc/pivotrow_curs.h b/vcl/unx/source/inc/pivotrow_curs.h
index d504655bd530..1b6060ea5b8b 100644
--- a/vcl/unx/source/inc/pivotrow_curs.h
+++ b/vcl/unx/source/inc/pivotrow_curs.h
@@ -29,7 +29,7 @@
 #define pivotrow_curs_height 32
 #define pivotrow_curs_x_hot 8
 #define pivotrow_curs_y_hot 7
-static char pivotrow_curs_bits[] = {
+static unsigned char pivotrow_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x07, 0x00,
    0x01, 0x00, 0x04, 0x00, 0x55, 0x55, 0x07, 0x00, 0xa9, 0xaa, 0x06, 0x00,
    0x55, 0x54, 0x07, 0x00, 0x29, 0xa9, 0x06, 0x00, 0x55, 0x53, 0x07, 0x00,
diff --git a/vcl/unx/source/inc/pivotrow_mask.h b/vcl/unx/source/inc/pivotrow_mask.h
index 8599bc546d3f..f6ea09498aa0 100644
--- a/vcl/unx/source/inc/pivotrow_mask.h
+++ b/vcl/unx/source/inc/pivotrow_mask.h
@@ -29,7 +29,7 @@
 #define pivotrow_mask_height 32
 #define pivotrow_curs_x_hot 8
 #define pivotrow_curs_y_hot 7
-static char pivotrow_mask_bits[] = {
+static unsigned char pivotrow_mask_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x07, 0x00,
    0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00,
    0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0x07, 0x00,
diff --git a/vcl/unx/source/inc/rotate_curs.h b/vcl/unx/source/inc/rotate_curs.h
index bfaf4ab65726..c6550475c989 100644
--- a/vcl/unx/source/inc/rotate_curs.h
+++ b/vcl/unx/source/inc/rotate_curs.h
@@ -29,7 +29,7 @@
 #define rotate_curs_height 32
 #define rotate_curs_x_hot 15
 #define rotate_curs_y_hot 15
-static char rotate_curs_bits[] = {
+static unsigned char rotate_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00,
    0x00, 0xc0, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00, 0xd8, 0x00, 0x00,
diff --git a/vcl/unx/source/inc/rotate_mask.h b/vcl/unx/source/inc/rotate_mask.h
index dafb049c8b89..12790cca4beb 100644
--- a/vcl/unx/source/inc/rotate_mask.h
+++ b/vcl/unx/source/inc/rotate_mask.h
@@ -27,7 +27,7 @@
  ************************************************************************/
 #define rotate_mask_width 32
 #define rotate_mask_height 32
-static char rotate_mask_bits[] = {
+static unsigned char rotate_mask_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00,
    0x00, 0xe0, 0x01, 0x00, 0x00, 0xf8, 0x03, 0x00, 0x00, 0xfc, 0x01, 0x00,
diff --git a/vcl/unx/source/inc/tblsele_curs.h b/vcl/unx/source/inc/tblsele_curs.h
index 40b14520f7d6..21bcfd1fdd9f 100644
--- a/vcl/unx/source/inc/tblsele_curs.h
+++ b/vcl/unx/source/inc/tblsele_curs.h
@@ -3,7 +3,7 @@
 #define tblsele_curs_height 16
 #define tblsele_curs_x_hot 14
 #define tblsele_curs_y_hot 8
-static char tblsele_curs_bits[] = {
+static unsigned char tblsele_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x0c,
    0x00, 0x1c, 0xfc, 0x3f, 0xfc, 0x7f, 0xfc, 0x3f, 0x00, 0x1c, 0x00, 0x0c,
    0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/vcl/unx/source/inc/tblsele_mask.h b/vcl/unx/source/inc/tblsele_mask.h
index 28d5e8b6e003..2a555e83d884 100644
--- a/vcl/unx/source/inc/tblsele_mask.h
+++ b/vcl/unx/source/inc/tblsele_mask.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #define tblsele_mask_width 16
 #define tblsele_mask_height 16
-static char tblsele_mask_bits[] = {
+static unsigned char tblsele_mask_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x0e, 0x00, 0x1e,
    0xfe, 0x3f, 0xfe, 0x7f, 0xfe, 0xff, 0xfe, 0x7f, 0xfe, 0x3f, 0x00, 0x1e,
    0x00, 0x0e, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00 };
diff --git a/vcl/unx/source/inc/tblsels_curs.h b/vcl/unx/source/inc/tblsels_curs.h
index 2e4be684d8db..fb739951e9f4 100644
--- a/vcl/unx/source/inc/tblsels_curs.h
+++ b/vcl/unx/source/inc/tblsels_curs.h
@@ -3,7 +3,7 @@
 #define tblsels_curs_height 16
 #define tblsels_curs_x_hot 7
 #define tblsels_curs_y_hot 14
-static char tblsels_curs_bits[] = {
+static unsigned char tblsels_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01,
    0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xf8, 0x0f, 0xf0, 0x07,
    0xe0, 0x03, 0xc0, 0x01, 0x80, 0x00, 0x00, 0x00 };
diff --git a/vcl/unx/source/inc/tblsels_mask.h b/vcl/unx/source/inc/tblsels_mask.h
index ad41a0b4377c..5a75aabe4c51 100644
--- a/vcl/unx/source/inc/tblsels_mask.h
+++ b/vcl/unx/source/inc/tblsels_mask.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #define tblsels_mask_width 16
 #define tblsels_mask_height 16
-static char tblsels_mask_bits[] = {
+static unsigned char tblsels_mask_bits[] = {
    0x00, 0x00, 0xe0, 0x03, 0xe0, 0x03, 0xe0, 0x03, 0xe0, 0x03, 0xe0, 0x03,
    0xe0, 0x03, 0xe0, 0x03, 0xe0, 0x03, 0xfc, 0x1f, 0xfc, 0x1f, 0xf8, 0x0f,
    0xf0, 0x07, 0xe0, 0x03, 0xc0, 0x01, 0x80, 0x00 };
diff --git a/vcl/unx/source/inc/tblselse_curs.h b/vcl/unx/source/inc/tblselse_curs.h
index 9a8d3b9d423d..fb34ff02b574 100644
--- a/vcl/unx/source/inc/tblselse_curs.h
+++ b/vcl/unx/source/inc/tblselse_curs.h
@@ -3,7 +3,7 @@
 #define tblselse_curs_height 16
 #define tblselse_curs_x_hot 14
 #define tblselse_curs_y_hot 14
-static char tblselse_curs_bits[] = {
+static unsigned char tblselse_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0xf0, 0x00,
    0xf0, 0x01, 0xe0, 0x03, 0xc0, 0x47, 0x80, 0x6f, 0x00, 0x7f, 0x00, 0x7e,
    0x00, 0x7c, 0x00, 0x7e, 0x00, 0x7f, 0x00, 0x00 };
diff --git a/vcl/unx/source/inc/tblselse_mask.h b/vcl/unx/source/inc/tblselse_mask.h
index 32087f1cc30b..fc289854e3ea 100644
--- a/vcl/unx/source/inc/tblselse_mask.h
+++ b/vcl/unx/source/inc/tblselse_mask.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #define tblselse_mask_width 16
 #define tblselse_mask_height 16
-static char tblselse_mask_bits[] = {
+static unsigned char tblselse_mask_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0xf0, 0x00, 0xf8, 0x01,
    0xf8, 0x03, 0xf0, 0xc7, 0xe0, 0xef, 0xc0, 0xff, 0x80, 0xff, 0x00, 0xff,
    0x00, 0xfe, 0x00, 0xff, 0x80, 0xff, 0x80, 0xff };
diff --git a/vcl/unx/source/inc/tblselsw_curs.h b/vcl/unx/source/inc/tblselsw_curs.h
index 1bade5674398..a421a18b815d 100644
--- a/vcl/unx/source/inc/tblselsw_curs.h
+++ b/vcl/unx/source/inc/tblselsw_curs.h
@@ -3,7 +3,7 @@
 #define tblselsw_curs_height 16
 #define tblselsw_curs_x_hot 1
 #define tblselsw_curs_y_hot 14
-static char tblselsw_curs_bits[] = {
+static unsigned char tblselsw_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x0f,
    0x80, 0x0f, 0xc0, 0x07, 0xe2, 0x03, 0xf6, 0x01, 0xfe, 0x00, 0x7e, 0x00,
    0x3e, 0x00, 0x7e, 0x00, 0xfe, 0x00, 0x00, 0x00 };
diff --git a/vcl/unx/source/inc/tblselsw_mask.h b/vcl/unx/source/inc/tblselsw_mask.h
index 49fb462c878e..14b49a9863fb 100644
--- a/vcl/unx/source/inc/tblselsw_mask.h
+++ b/vcl/unx/source/inc/tblselsw_mask.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #define tblselsw_mask_width 16
 #define tblselsw_mask_height 16
-static char tblselsw_mask_bits[] = {
+static unsigned char tblselsw_mask_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x0f, 0x80, 0x1f,
    0xc0, 0x1f, 0xe3, 0x0f, 0xf7, 0x07, 0xff, 0x03, 0xff, 0x01, 0xff, 0x00,
    0x7f, 0x00, 0xff, 0x00, 0xff, 0x01, 0xff, 0x01 };
diff --git a/vcl/unx/source/inc/tblselw_curs.h b/vcl/unx/source/inc/tblselw_curs.h
index 2a7e325a2098..2ee9a0d4af20 100644
--- a/vcl/unx/source/inc/tblselw_curs.h
+++ b/vcl/unx/source/inc/tblselw_curs.h
@@ -3,7 +3,7 @@
 #define tblselw_curs_height 16
 #define tblselw_curs_x_hot 1
 #define tblselw_curs_y_hot 8
-static char tblselw_curs_bits[] = {
+static unsigned char tblselw_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x30, 0x00,
    0x38, 0x00, 0xfc, 0x3f, 0xfe, 0x3f, 0xfc, 0x3f, 0x38, 0x00, 0x30, 0x00,
    0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/vcl/unx/source/inc/tblselw_mask.h b/vcl/unx/source/inc/tblselw_mask.h
index 8f600a85a752..8fa5be7c724a 100644
--- a/vcl/unx/source/inc/tblselw_mask.h
+++ b/vcl/unx/source/inc/tblselw_mask.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 #define tblselw_mask_width 16
 #define tblselw_mask_height 16
-static char tblselw_mask_bits[] = {
+static unsigned char tblselw_mask_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x70, 0x00, 0x78, 0x00,
    0xfc, 0x7f, 0xfe, 0x7f, 0xff, 0x7f, 0xfe, 0x7f, 0xfc, 0x7f, 0x78, 0x00,
    0x70, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/vcl/unx/source/inc/timemove_curs.h b/vcl/unx/source/inc/timemove_curs.h
index c9f9c771ada3..ce5e2b6914b5 100644
--- a/vcl/unx/source/inc/timemove_curs.h
+++ b/vcl/unx/source/inc/timemove_curs.h
@@ -29,7 +29,7 @@
 #define timemove_curs_height 32
 #define timemove_curs_x_hot 16
 #define timemove_curs_y_hot 16
-static char timemove_curs_bits[] = {
+static unsigned char timemove_curs_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0xc0,0x07,0x00,0x00,
diff --git a/vcl/unx/source/inc/timemove_mask.h b/vcl/unx/source/inc/timemove_mask.h
index 3176258df95d..42664e6998fb 100644
--- a/vcl/unx/source/inc/timemove_mask.h
+++ b/vcl/unx/source/inc/timemove_mask.h
@@ -29,7 +29,7 @@
 #define timemove_mask_height 32
 #define timemove_mask_x_hot 16
 #define timemove_mask_y_hot 16
-static char timemove_mask_bits[] = {
+static unsigned char timemove_mask_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x01,0x00,0x00,0x80,0x03,0x00,0x00,0xc0,0x07,0x00,0x00,0xe0,0x0f,0x00,0x00,
diff --git a/vcl/unx/source/inc/timesize_curs.h b/vcl/unx/source/inc/timesize_curs.h
index 7e75b3e4c95b..99c75d4affb1 100644
--- a/vcl/unx/source/inc/timesize_curs.h
+++ b/vcl/unx/source/inc/timesize_curs.h
@@ -29,7 +29,7 @@
 #define timesize_curs_height 32
 #define timesize_curs_x_hot 16
 #define timesize_curs_y_hot 16
-static char timesize_curs_bits[] = {
+static unsigned char timesize_curs_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0xff,0xff,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
diff --git a/vcl/unx/source/inc/timesize_mask.h b/vcl/unx/source/inc/timesize_mask.h
index 2f2de862a678..68d03c95057f 100644
--- a/vcl/unx/source/inc/timesize_mask.h
+++ b/vcl/unx/source/inc/timesize_mask.h
@@ -29,7 +29,7 @@
 #define timesize_mask_height 32
 #define timesize_mask_x_hot 16
 #define timesize_mask_y_hot 16
-static char timesize_mask_bits[] = {
+static unsigned char timesize_mask_bits[] = {
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,
  0xff,0x03,0x80,0xff,0xff,0x03,0x80,0xff,0xff,0x03,0x80,0xff,0xff,0x03,0x80,
diff --git a/vcl/unx/source/inc/vertcurs_curs.h b/vcl/unx/source/inc/vertcurs_curs.h
index 93767087a405..5f8cfde93a8d 100644
--- a/vcl/unx/source/inc/vertcurs_curs.h
+++ b/vcl/unx/source/inc/vertcurs_curs.h
@@ -3,7 +3,7 @@
 #define vertcurs_curs_height 16
 #define vertcurs_curs_x_hot 8
 #define vertcurs_curs_y_hot 8
-static char vertcurs_curs_bits[] = {
+static unsigned char vertcurs_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x40, 0x02, 0x40,
    0x06, 0x60, 0xfc, 0x3f, 0x06, 0x60, 0x02, 0x40, 0x02, 0x40, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/vcl/unx/source/inc/vertcurs_mask.h b/vcl/unx/source/inc/vertcurs_mask.h
index a652d58b8ef3..05ac8246e52e 100644
--- a/vcl/unx/source/inc/vertcurs_mask.h
+++ b/vcl/unx/source/inc/vertcurs_mask.h
@@ -3,7 +3,7 @@
 #define vertcurs_mask_height 16
 #define vertcurs_mask_x_hot 8
 #define vertcurs_mask_y_hot 8
-static char vertcurs_mask_bits[] = {
+static unsigned char vertcurs_mask_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xe0, 0x07, 0xe0, 0x0f, 0xf0,
    0xff, 0xff, 0xfe, 0x7f, 0xff, 0xff, 0x0f, 0xf0, 0x07, 0xe0, 0x07, 0xe0,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/vcl/unx/source/inc/vshear_curs.h b/vcl/unx/source/inc/vshear_curs.h
index ba073ca64211..c8f0f7dd4b8b 100644
--- a/vcl/unx/source/inc/vshear_curs.h
+++ b/vcl/unx/source/inc/vshear_curs.h
@@ -29,7 +29,7 @@
 #define vshear_curs_height 32
 #define vshear_curs_x_hot 15
 #define vshear_curs_y_hot 15
-static char vshear_curs_bits[] = {
+static unsigned char vshear_curs_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x04, 0x00,
diff --git a/vcl/unx/source/inc/vshear_mask.h b/vcl/unx/source/inc/vshear_mask.h
index 7a614df0b9fa..70b777a18d2f 100644
--- a/vcl/unx/source/inc/vshear_mask.h
+++ b/vcl/unx/source/inc/vshear_mask.h
@@ -27,7 +27,7 @@
  ************************************************************************/
 #define vshear_mask_width 32
 #define vshear_mask_height 32
-static char vshear_mask_bits[] = {
+static unsigned char vshear_mask_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x0e, 0x00, 0x00, 0x70, 0x0e, 0x00,
diff --git a/vcl/unx/source/plugadapt/salplug.cxx b/vcl/unx/source/plugadapt/salplug.cxx
index 0accb8def42f..7398cc8410a6 100644
--- a/vcl/unx/source/plugadapt/salplug.cxx
+++ b/vcl/unx/source/plugadapt/salplug.cxx
@@ -284,7 +284,7 @@ void SalAbort( const XubString& rErrorText )
         std::fprintf( stderr, "Application Error" );
     else
         std::fprintf( stderr, "%s", ByteString( rErrorText, gsl_getSystemTextEncoding() ).GetBuffer() );
-    abort();
+    exit(-1);
 }
 
 const OUString& SalGetDesktopEnvironment()
diff --git a/vcl/unx/source/printer/cupsmgr.cxx b/vcl/unx/source/printer/cupsmgr.cxx
index fdab933a494c..cb4a2de7ed73 100644
--- a/vcl/unx/source/printer/cupsmgr.cxx
+++ b/vcl/unx/source/printer/cupsmgr.cxx
@@ -1109,7 +1109,7 @@ const char* CUPSManager::authenticateUser( const char* /*pIn*/ )
     const char* pRet = NULL;
 
 #ifdef ENABLE_CUPS
-    OUString aLib = OUString::createFromAscii( _XSALSET_LIBNAME );
+    OUString aLib(RTL_CONSTASCII_USTRINGPARAM( _XSALSET_LIBNAME ));
     oslModule pLib = osl_loadModule( aLib.pData, SAL_LOADMODULE_LAZY );
     if( pLib )
     {
diff --git a/vcl/unx/source/printer/ppdparser.cxx b/vcl/unx/source/printer/ppdparser.cxx
index c10f8aca8664..b8466ec55877 100644
--- a/vcl/unx/source/printer/ppdparser.cxx
+++ b/vcl/unx/source/printer/ppdparser.cxx
@@ -750,9 +750,8 @@ PPDParser::PPDParser( const String& rFile ) :
             case PPDKey::AnySetup:          pSetupType = "AnySetup";break;
             default: break;
         };
-        fprintf( stderr, "\t\"%s\" (\"%s\") (%d values) OrderDependency: %d %s\n",
+        fprintf( stderr, "\t\"%s\" (%d values) OrderDependency: %d %s\n",
                  BSTRING( pKey->getKey() ).GetBuffer(),
-                 BSTRING( pKey->m_aUITranslation ).GetBuffer(),
                  pKey->countValues(),
                  pKey->m_nOrderDependency,
                  pSetupType );
@@ -772,12 +771,10 @@ PPDParser::PPDParser( const String& rFile ) :
                 case eNo:               pVType = "no";break;
                 default: break;
             };
-            fprintf( stderr, "option: \"%s\" (\"%s\"), value: type %s \"%s\" (\"%s\")\n",
+            fprintf( stderr, "option: \"%s\", value: type %s \"%s\"\n",
                      BSTRING( pValue->m_aOption ).GetBuffer(),
-                     BSTRING( pValue->m_aOptionTranslation ).GetBuffer(),
                      pVType,
-                     BSTRING( pValue->m_aValue ).GetBuffer(),
-                     BSTRING( pValue->m_aValueTranslation ).GetBuffer() );
+                     BSTRING( pValue->m_aValue ).GetBuffer() );
         }
     }
     fprintf( stderr, "constraints: (%d found)\n", m_aConstraints.size() );
diff --git a/vcl/unx/source/printer/printerinfomanager.cxx b/vcl/unx/source/printer/printerinfomanager.cxx
index 0fff5b590b98..b907fa9af4a7 100644
--- a/vcl/unx/source/printer/printerinfomanager.cxx
+++ b/vcl/unx/source/printer/printerinfomanager.cxx
@@ -326,7 +326,7 @@ void PrinterInfoManager::initialize()
                 }
             }
             #if OSL_DEBUG_LEVEL > 1
-            fprintf( stderr, "global settings: fontsubst = %s, %d substitutes\n", m_aGlobalDefaults.m_bPerformFontSubstitution ? "true" : "false", m_aGlobalDefaults.m_aFontSubstitutes.size() );
+            fprintf( stderr, "global settings: fontsubst = %s, %" SAL_PRI_SIZET "u substitutes\n", m_aGlobalDefaults.m_bPerformFontSubstitution ? "true" : "false", m_aGlobalDefaults.m_aFontSubstitutes.size() );
             #endif
         }
     }
diff --git a/vcl/unx/source/printergfx/printerjob.cxx b/vcl/unx/source/printergfx/printerjob.cxx
index e565a0e2355f..1d8924913703 100644
--- a/vcl/unx/source/printergfx/printerjob.cxx
+++ b/vcl/unx/source/printergfx/printerjob.cxx
@@ -110,7 +110,7 @@ PrinterJob::CreateSpoolFile (const rtl::OUString& rName, const rtl::OUString& rE
     nError = osl::File::getFileURLFromSystemPath( aFile, aFileURL );
     if (nError != osl::File::E_None)
         return NULL;
-    aFileURL = maSpoolDirName + rtl::OUString::createFromAscii ("/") + aFileURL;
+    aFileURL = maSpoolDirName + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("/")) + aFileURL;
 
     pFile = new osl::File (aFileURL);
     nError = pFile->open (OpenFlag_Read | OpenFlag_Write | OpenFlag_Create);
@@ -397,9 +397,9 @@ PrinterJob::StartJob (
     maSpoolDirName = createSpoolDir ();
     maJobTitle = rJobName;
 
-    rtl::OUString aExt = rtl::OUString::createFromAscii (".ps");
-    mpJobHeader  = CreateSpoolFile (rtl::OUString::createFromAscii("psp_head"), aExt);
-    mpJobTrailer = CreateSpoolFile (rtl::OUString::createFromAscii("psp_tail"), aExt);
+    rtl::OUString aExt(RTL_CONSTASCII_USTRINGPARAM (".ps"));
+    mpJobHeader  = CreateSpoolFile (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("psp_head")), aExt);
+    mpJobTrailer = CreateSpoolFile (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("psp_tail")), aExt);
     if( ! (mpJobHeader && mpJobTrailer) ) // existing files are removed in destructor
         return sal_False;
 
@@ -668,12 +668,12 @@ PrinterJob::StartPage (const JobData& rJobSetup)
     InitPaperSize (rJobSetup);
 
     rtl::OUString aPageNo = rtl::OUString::valueOf ((sal_Int32)maPageList.size()+1); // sequential page number must start with 1
-    rtl::OUString aExt    = aPageNo + rtl::OUString::createFromAscii (".ps");
+    rtl::OUString aExt    = aPageNo + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM (".ps"));
 
     osl::File* pPageHeader = CreateSpoolFile (
-                                              rtl::OUString::createFromAscii("psp_pghead"), aExt);
+                                              rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("psp_pghead")), aExt);
     osl::File* pPageBody   = CreateSpoolFile (
-                                              rtl::OUString::createFromAscii("psp_pgbody"), aExt);
+                                              rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("psp_pgbody")), aExt);
 
     maHeaderList.push_back (pPageHeader);
     maPageList.push_back (pPageBody);
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 6c002b673165..7e378cf7e58a 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -3009,11 +3009,14 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
     // High contrast
     HIGHCONTRAST hc;
     hc.cbSize = sizeof( HIGHCONTRAST );
-    if( SystemParametersInfo( SPI_GETHIGHCONTRAST, hc.cbSize, &hc, 0) && (hc.dwFlags & HCF_HIGHCONTRASTON) )
+    if(    SystemParametersInfo( SPI_GETHIGHCONTRAST, hc.cbSize, &hc, 0)
+        && (hc.dwFlags & HCF_HIGHCONTRASTON)
+    ) {
         aStyleSettings.SetHighContrastMode( 1 );
-    else
+        aStyleSettings.SetSymbolsStyle( STYLE_SYMBOLS_HICONTRAST );
+    } else {
         aStyleSettings.SetHighContrastMode( 0 );
-
+    }
 
     // Query Fonts
     Font    aMenuFont = aStyleSettings.GetMenuFont();
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index 18b5a19aa646..1951684b2747 100644
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx
@@ -83,7 +83,7 @@ class TestWindow : public Dialog
     public:
         TestWindow() : Dialog( (Window *) NULL )
         {
-            SetText( rtl::OUString::createFromAscii( "OutDev grinding" ) );
+            SetText( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OutDev grinding")) );
             SetSizePixel( Size( 1024, 1024 ) );
             EnablePaint( true );
             Show();
@@ -959,8 +959,8 @@ void GrindApp::Main()
 
     // Create UCB.
     uno::Sequence< uno::Any > aArgs( 2 );
-    aArgs[ 0 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );
-    aArgs[ 1 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );
+    aArgs[ 0 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL ));
+    aArgs[ 1 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE ));
     ::ucbhelper::ContentBroker::initialize( xFactory, aArgs );
 
     TestWindow pWindow;
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index 2f5fa442127a..94971f292dc3 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -100,8 +100,8 @@ SAL_IMPLEMENT_MAIN()
      *  Create UCB.
      */
     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 ));
 #if OSL_DEBUG_LEVEL > 1
     sal_Bool bSuccess =
 #endif
diff --git a/wizards/source/formwizard/Language.xba b/wizards/source/formwizard/Language.xba
index 5a2dcb1c67fe..2f2b7e3ec11f 100644
--- a/wizards/source/formwizard/Language.xba
+++ b/wizards/source/formwizard/Language.xba
@@ -112,8 +112,8 @@ Dim slblFields as String
 		.optAlign2.Label = GetResText(RID_FORM + 34)
 		.optAlign0.State = 1
 		
+                //FIXME: Remove this unused FNameAddOn through the file
 		FNameAddOn = &quot;&quot;
-		If isHighContrast(DlgFormDB.getPeer) Then FNameAddOn = &quot;_hc&quot;
 
 		IDArray = Array(36, 37, 40, 38, 39)
 		For i = 1 To 5
diff --git a/wizards/source/imagelists/imagelists.src b/wizards/source/imagelists/imagelists.src
index 830c365ca4e4..aaab54be232c 100644
--- a/wizards/source/imagelists/imagelists.src
+++ b/wizards/source/imagelists/imagelists.src
@@ -34,182 +34,86 @@ Image IMG_REPORT_ORIENTATION_PORTRAIT
     ImageBitmap = Bitmap { File = "portrait_32.png"; };
 };
 
-#define IMG_REPORT_ORIENTATION_PORTRAIT_HC      REPORTWIZARD_BASE + 1
-Image IMG_REPORT_ORIENTATION_PORTRAIT_HC
-{
-    ImageBitmap = Bitmap { File = "portrait_32_h.png"; };
-};
-
 #define IMG_REPORT_ORIENTATION_LANDSCAPE        REPORTWIZARD_BASE + 2
 Image IMG_REPORT_ORIENTATION_LANDSCAPE
 {
     ImageBitmap = Bitmap { File = "landscape_32.png"; };
 };
 
-#define IMG_REPORT_ORIENTATION_LANDSCAPE_HC     REPORTWIZARD_BASE + 3
-Image IMG_REPORT_ORIENTATION_LANDSCAPE_HC
-{
-    ImageBitmap = Bitmap { File = "landscape_32_h.png"; };
-};
-
 #define IMG_FORM_ARRANGELISTSIDE                FORMWIZARD_BASE + 0
 Image IMG_FORM_ARRANGELISTSIDE
 {
     ImageBitmap = Bitmap { File = "formarrangelistside_42.png"; };
 };
 
-#define IMG_FORM_ARRANGELISTSIDE_HC             FORMWIZARD_BASE + 1
-Image IMG_FORM_ARRANGELISTSIDE_HC
-{
-    ImageBitmap = Bitmap { File = "formarrangelistside_42_h.png"; };
-};
-
 #define IMG_FORM_ARRANGELISTTOP                 FORMWIZARD_BASE + 2
 Image IMG_FORM_ARRANGELISTTOP
 {
     ImageBitmap = Bitmap { File = "formarrangelisttop_42.png"; };
 };
 
-#define IMG_FORM_ARRANGELISTTOP_HC              FORMWIZARD_BASE + 3
-Image IMG_FORM_ARRANGELISTTOP_HC
-{
-    ImageBitmap = Bitmap { File = "formarrangelisttop_42_h.png"; };
-};
-
 #define IMG_FORM_ARRANGETABLE                   FORMWIZARD_BASE + 4
 Image IMG_FORM_ARRANGETABLE
 {
     ImageBitmap = Bitmap { File = "formarrangetable_42.png"; };
 };
 
-#define IMG_FORM_ARRANGETABLE_HC                    FORMWIZARD_BASE + 5
-Image IMG_FORM_ARRANGETABLE_HC
-{
-    ImageBitmap = Bitmap { File = "formarrangetable_42_h.png"; };
-};
-
-
 #define IMG_FORM_ARRANGEFREE                    FORMWIZARD_BASE + 6
 Image IMG_FORM_ARRANGEFREE
 {
     ImageBitmap = Bitmap { File = "formarrangefree_42.png"; };
 };
 
-#define IMG_FORM_ARRANGEFREE_HC                 FORMWIZARD_BASE + 7
-Image IMG_FORM_ARRANGEFREE_HC
-{
-    ImageBitmap = Bitmap { File = "formarrangefree_42_h.png"; };
-};
-
-
 #define IMG_WEB_LAYOUT_TABLE3                       WEBWIZARD_BASE + 0
 Image IMG_WEB_LAYOUT_TABLE3
 {
     ImageBitmap = Bitmap { File = "table_3.png"; };
 };
 
-#define IMG_WEB_LAYOUT_TABLE3_HC                        WEBWIZARD_BASE + 1
-Image IMG_WEB_LAYOUT_TABLE3_HC
-{
-    ImageBitmap = Bitmap { File = "table_3_h.png"; };
-};
-
-
 #define IMG_WEB_LAYOUT_TABLE2                       WEBWIZARD_BASE + 2
 Image IMG_WEB_LAYOUT_TABLE2
 {
     ImageBitmap = Bitmap { File = "table_2.png"; };
 };
 
-
-#define IMG_WEB_LAYOUT_TABLE2_HC                    WEBWIZARD_BASE + 3
-Image IMG_WEB_LAYOUT_TABLE2_HC
-{
-    ImageBitmap = Bitmap { File = "table_2_h.png"; };
-};
-
-
 #define IMG_WEB_LAYOUT_SIMPLE                       WEBWIZARD_BASE + 4
 Image IMG_WEB_LAYOUT_SIMPLE
 {
     ImageBitmap = Bitmap { File = "simple.png"; };
 };
 
-#define IMG_WEB_LAYOUT_SIMPLE_HC                    WEBWIZARD_BASE + 5
-Image IMG_WEB_LAYOUT_SIMPLE_HC
-{
-    ImageBitmap = Bitmap { File = "simple_h.png"; };
-};
-
 #define IMG_WEB_LAYOUT_DIAGONAL                     WEBWIZARD_BASE + 6
 Image IMG_WEB_LAYOUT_DIAGONAL
 {
     ImageBitmap = Bitmap { File = "diagonal.png"; };
 };
 
-#define IMG_WEB_LAYOUT_DIAGONAL_HC                  WEBWIZARD_BASE + 7
-Image IMG_WEB_LAYOUT_DIAGONAL_HC
-{
-    ImageBitmap = Bitmap { File = "diagonal_h.png"; };
-};
-
 #define IMG_WEB_LAYOUT_ZIGZAG                       WEBWIZARD_BASE + 8
 Image IMG_WEB_LAYOUT_ZIGZAG
 {
     ImageBitmap = Bitmap { File = "zigzag.png"; };
 };
 
-#define IMG_WEB_LAYOUT_ZIGZAG_HC                        WEBWIZARD_BASE + 9
-Image IMG_WEB_LAYOUT_ZIGZAG_HC
-{
-    ImageBitmap = Bitmap { File = "zigzag_h.png"; };
-};
-
 #define IMG_WEB_LAYOUT_FRAMELEFT                        WEBWIZARD_BASE + 10
 Image IMG_WEB_LAYOUT_FRAMELEFT
 {
     ImageBitmap = Bitmap { File = "frame_left.png"; };
 };
 
-#define IMG_WEB_LAYOUT_FRAMELEFT_HC                     WEBWIZARD_BASE + 11
-Image IMG_WEB_LAYOUT_FRAMELEFT_HC
-{
-    ImageBitmap = Bitmap { File = "frame_left_h.png"; };
-};
-
 #define IMG_WEB_LAYOUT_FRAMERIGHT                       WEBWIZARD_BASE + 12
 Image IMG_WEB_LAYOUT_FRAMERIGHT
 {
     ImageBitmap = Bitmap { File = "frame_right.png"; };
 };
 
-#define IMG_WEB_LAYOUT_FRAMERIGHT_HC                        WEBWIZARD_BASE + 13
-Image IMG_WEB_LAYOUT_FRAMERIGHT_HC
-{
-    ImageBitmap = Bitmap { File = "frame_right_h.png"; };
-};
-
 #define IMG_WEB_LAYOUT_FRAMETOP                         WEBWIZARD_BASE + 14
 Image IMG_WEB_LAYOUT_FRAMETOP
 {
     ImageBitmap = Bitmap { File = "frame_top.png"; };
 };
 
-#define IMG_WEB_LAYOUT_FRAMETOP_HC                      WEBWIZARD_BASE + 15
-Image IMG_WEB_LAYOUT_FRAMETOP_HC
-{
-    ImageBitmap = Bitmap { File = "frame_top_h.png"; };
-};
-
 #define IMG_WEB_LAYOUT_FRAMEBOTTOM                          WEBWIZARD_BASE + 16
 Image IMG_WEB_LAYOUT_FRAMEBOTTOM
 {
     ImageBitmap = Bitmap { File = "frame_bottom.png"; };
 };
-
-#define IMG_WEB_LAYOUT_FRAMEBOTTOM_HC                           WEBWIZARD_BASE + 17
-Image IMG_WEB_LAYOUT_FRAMEBOTTOM_HC
-{
-    ImageBitmap = Bitmap { File = "frame_bottom_h.png"; };
-};
-
diff --git a/writerfilter/inc/resourcemodel/Protocol.hxx b/writerfilter/inc/resourcemodel/Protocol.hxx
index 8405892fd2a4..df2c98592cf3 100644
--- a/writerfilter/inc/resourcemodel/Protocol.hxx
+++ b/writerfilter/inc/resourcemodel/Protocol.hxx
@@ -31,7 +31,7 @@
 #ifndef INCLUDE_WRITERFILTER_PROTOCOL_HXX
 #define INCLUDE_WRITERFILTER_PROTOCOL_HXX
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
 
 #include <boost/shared_ptr.hpp>
 #include "WW8ResourceModel.hxx"
diff --git a/writerfilter/inc/resourcemodel/TagLogger.hxx b/writerfilter/inc/resourcemodel/TagLogger.hxx
index 5735269bee25..4101503b02e7 100644
--- a/writerfilter/inc/resourcemodel/TagLogger.hxx
+++ b/writerfilter/inc/resourcemodel/TagLogger.hxx
@@ -29,7 +29,7 @@
 #ifndef INCLUDED_TAG_LOGGER_HXX
 #define INCLUDED_TAG_LOGGER_HXX
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
 
 #include <rtl/ustring.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/writerfilter/inc/resourcemodel/util.hxx b/writerfilter/inc/resourcemodel/util.hxx
index 5a0ce69790c6..be7dae0150a7 100644
--- a/writerfilter/inc/resourcemodel/util.hxx
+++ b/writerfilter/inc/resourcemodel/util.hxx
@@ -40,7 +40,7 @@ namespace writerfilter
 
     string WRITERFILTER_DLLPUBLIC xmlify(const string & str);
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
     string WRITERFILTER_DLLPUBLIC propertysetToString
     (uno::Reference<beans::XPropertySet> const & rProps);
 
diff --git a/writerfilter/inc/writerfilter.mk b/writerfilter/inc/writerfilter.mk
index f8ea735a4ec5..116add50488f 100644
--- a/writerfilter/inc/writerfilter.mk
+++ b/writerfilter/inc/writerfilter.mk
@@ -26,4 +26,7 @@
 #*************************************************************************
 
 CDEFS+=-DWRITERFILTER_DLLIMPLEMENTATION
- 
+.IF "$(DBG_LEVEL)">="2"
+CDEFS+=-DDEBUG_DOMAINMAPPER -DDEBUG_ELEMENT -DDEBUG_RESOLVE \
+       -DDEBUG_CONTEXT_STACK -DDEBUG_ATTRIBUTES -DDEBUG_PROPERTIES
+.ENDIF
diff --git a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
index 0ae9f3d24004..095eff019c03 100644
--- a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
+++ b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
@@ -80,8 +80,8 @@ namespace testdoctok
                 {
                     uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess >
                         xNameContainer(xFactory->createInstanceWithContext
-                                       (::rtl::OUString::createFromAscii
-                                        ("com.sun.star.ucb.SimpleFileAccess" ),
+                                       (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
+                                        ("com.sun.star.ucb.SimpleFileAccess" )),
                                         xComponentContext), uno::UNO_QUERY );
 
                     if (xNameContainer.is())
diff --git a/writerfilter/qa/cppunittests/odiapi/testProperty.cxx b/writerfilter/qa/cppunittests/odiapi/testProperty.cxx
index a24ed6ba8afd..3bff8817e845 100644
--- a/writerfilter/qa/cppunittests/odiapi/testProperty.cxx
+++ b/writerfilter/qa/cppunittests/odiapi/testProperty.cxx
@@ -49,7 +49,7 @@ OString getTempFileName(const OUString& fileName)
   OUString ousTmpUrl;
   FileBase::getTempDirURL(ousTmpUrl);
   if (!ousTmpUrl.endsWithIgnoreAsciiCaseAsciiL("/", 1))
-    ousTmpUrl += OUString::createFromAscii("/");
+    ousTmpUrl += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
   ousTmpUrl += fileName;
 
   OUString sysTmpPath;
@@ -273,12 +273,12 @@ public:
 
         pool->insert(ps4);
 
-        OString tmpFileName = getTempFileName(OUString::createFromAscii("testPropertyPool_int.dot"));
+        OString tmpFileName = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testPropertyPool_int.dot")));
         printf("Pool dump: %s\n", tmpFileName.getStr());
         FileLoggerImpl fl(tmpFileName.getStr());
         pool->dump(&fl);
 
-        OString tmpFileName2 = getTempFileName(OUString::createFromAscii("testPropertyPool_ext.dot"));
+        OString tmpFileName2 = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testPropertyPool_ext.dot")));
         printf("Pool dump: %s\n", tmpFileName2.getStr());
         ExternalViewLoggerImpl evl(tmpFileName2.getStr());
         pool->dump(&evl);
@@ -373,12 +373,12 @@ public:
 
         CPPUNIT_ASSERT_MESSAGE("paraProps == failed failed", paraProps == paragraphProps);
 
-        OString tmpFileName = getTempFileName(OUString::createFromAscii("testComplexParaProps_int.dot"));
+        OString tmpFileName = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testComplexParaProps_int.dot")));
         printf("Pool dump: %s\n", tmpFileName.getStr());
         FileLoggerImpl fl(tmpFileName.getStr());
         pool->dump(&fl);
 
-        OString tmpFileName2 = getTempFileName(OUString::createFromAscii("testComplexParaProps_ext.dot"));
+        OString tmpFileName2 = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testComplexParaProps_ext.dot")));
         printf("Pool dump: %s\n", tmpFileName2.getStr());
         ExternalViewLoggerImpl evl(tmpFileName2.getStr());
         pool->dump(&evl);
@@ -505,21 +505,21 @@ public:
             pb2->insert(createStringProperty(NS_style::LN_font_face, "Roman"));
             PropertyPoolHandle_Pointer_t ph2 = pool->insert(pb2);
 
-            OString tmpFileName = getTempFileName(OUString::createFromAscii("testPropPoolGarbageColl_1.dot"));
+            OString tmpFileName = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testPropPoolGarbageColl_1.dot")));
             printf("Pool dump: %s\n", tmpFileName.getStr());
             FileLoggerImpl fl(tmpFileName.getStr());
             pool->dump(&fl);
 
         }
 
-        OString tmpFileName = getTempFileName(OUString::createFromAscii("testPropPoolGarbageColl_2.dot"));
+        OString tmpFileName = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testPropPoolGarbageColl_2.dot")));
         printf("Pool dump: %s\n", tmpFileName.getStr());
         FileLoggerImpl fl(tmpFileName.getStr());
         pool->dump(&fl);
 
         pool->garbageCollection();
 
-        OString tmpFileName2 = getTempFileName(OUString::createFromAscii("testPropPoolGarbageColl_after.dot"));
+        OString tmpFileName2 = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testPropPoolGarbageColl_after.dot")));
         printf("Pool dump: %s\n", tmpFileName2.getStr());
         FileLoggerImpl fl2(tmpFileName2.getStr());
         pool->dump(&fl2);
diff --git a/writerfilter/qa/cppunittests/sl/helloworld.odt.flat.xml b/writerfilter/qa/cppunittests/sl/helloworld.odt.flat.xml
index 85ad3557c396..c577b41ed69e 100644
--- a/writerfilter/qa/cppunittests/sl/helloworld.odt.flat.xml
+++ b/writerfilter/qa/cppunittests/sl/helloworld.odt.flat.xml
@@ -1,12 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" office:version="1.0" office:mimetype="application/x-vnd.oasis.openoffice.text"><office:meta><meta:generator>StarOffice/8$Win32 OpenOffice.org_project/680m145$Build-8989</meta:generator><meta:creation-date>2006-02-10T18:59:19</meta:creation-date><dc:date>2006-02-10T19:02:26</dc:date><dc:language>de-DE</dc:language><meta:editing-cycles>2</meta:editing-cycles><meta:editing-duration>PT3M12S</meta:editing-duration><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/><meta:document-statistic meta:table-count="0" meta:image-count="0" meta:
-bject-count="0" meta:page-count="1" meta:paragraph-count="1" meta:word-count="2" meta:character-count="11"/></office:meta><office:settings><config:config-item-set config:name="ooo:view-settings"><config:config-item config:name="ViewAreaTop" config:type="int">0</config:config-item><config:config-item config:name="ViewAreaLeft" config:type="int">0</config:config-item><config:config-item config:name="ViewAreaWidth" config:type="int">15965</config:config-item><config:config-item config:name="ViewAreaHeight" config:type="int">8363</config:config-item><config:config-item config:name="ShowRedlineChanges" config:type="boolean">true</config:config-item><config:config-item config:name="InBrowseMode" config:type="boolean">false</config:config-item><config:config-item-map-indexed config:name="Views"><config:config-item-map-entry><config:config-item config:name="ViewId" config:type="string">view2</config:config-item><config:config-item config:name="ViewLeft" config:type="int">6137</config:config-item><config:config-item config:name="ViewTop" config:type="int">3002</config:config-item><config:config-item config:name="VisibleLeft" config:type="int">0</config:config-item><config:config-item config:name="VisibleTop" config:type="int">0</config:config-item><config:config-item config:name="VisibleRight" config:type="int">15963</config:config-item><config:config-item config:name="VisibleBottom" config:type="int">8361</config:config-item><config:config-item config:name="ZoomType" config:type="short">0</config:config-item><config:config-item config:name="ZoomFactor" config:type="short">150</config:config-item><config:config-item config:name="IsSelectedFrame" config:type="boolean">false</config:config-item></config:config-item-map-entry></config:config-item-map-indexed></config:config-item-set><config:config-item-set config:name="ooo:configuration-settings"><config:config-item config:name="AddParaTableSpacing" config:type="boolean">true</config:config-item><config:config-item config:name="PrintReversed" config:type="boolean">false</co
-fig:config-item><config:config-item config:name="OutlineLevelYieldsNumbering" config:type="boolean">false</config:config-item><config:config-item config:name="LinkUpdateMode" config:type="short">1</config:config-item><config:config-item config:name="IgnoreFirstLineIndentInNumbering" config:type="boolean">false</config:config-item><config:config-item config:name="CharacterCompressionType" config:type="short">0</config:config-item><config:config-item config:name="PrintSingleJobs" config:type="boolean">false</config:config-item><config:config-item config:name="UpdateFromTemplate" config:type="boolean">false</config:config-item><config:config-item config:name="PrintPaperFromSetup" config:type="boolean">false</config:config-item><config:config-item config:name="AddFrameOffsets" config:type="boolean">false</config:config-item><config:config-item config:name="PrintLeftPages" config:type="boolean">true</config:config-item><config:config-item config:name="RedlineProtectionKey" config:type="base64Binary"/><config:config-item config:name="PrintTables" config:type="boolean">true</config:config-item><config:config-item config:name="ChartAutoUpdate" config:type="boolean">true</config:config-item><config:config-item config:name="PrintControls" config:type="boolean">true</config:config-item><config:config-item config:name="PrinterSetup" config:type="base64Binary"/><config:config-item config:name="PrintAnnotationMode" config:type="short">0</config:config-item><config:config-item config:name="LoadReadonly" config:type="boolean">false</config:config-item><config:config-item config:name="AddParaSpacingToTableCells" config:type="boolean">true</config:config-item><config:config-item config:name="AddExternalLeading" config:type="boolean">true</config:config-item><config:config-item config:name="ApplyUserData" config:type="boolean">true</config:config-item><config:config-item config:name="FieldAutoUpdate" config:type="boolean">true</config:config-item><config:config-item config:name="SaveVersionOnClose" config:type="boolean">false</con
-ig:config-item><config:config-item config:name="SaveGlobalDocumentLinks" config:type="boolean">false</config:config-item><config:config-item config:name="IsKernAsianPunctuation" config:type="boolean">false</config:config-item><config:config-item config:name="AlignTatopPosition" config:type="boolean">true</config:config-item><config:config-item config:name="CurrentDatabaseDataSource" config:type="string"/><config:config-item config:name="PrinterName" config:type="string"/><config:config-item config:name="PrintFaxName" config:type="string"/><config:config-item config:name="ConsiderTextWrapOnObjPos" config:type="boolean">false</config:config-item><config:config-item config:name="PrintRightPages" config:type="boolean">true</config:config-item><config:config-item config:name="IsLabelDocument" config:type="boolean">false</config:config-item><config:config-item config:name="UseFormerLineSpacing" config:type="boolean">false</config:config-item><config:config-item config:name="AddParaTableSpacingAtStart" config:type="boolean">true</config:config-item><config:config-item config:name="UseFormerTextWrapping" config:type="boolean">false</config:config-item><config:config-item config:name="DoNotResetParaAttrsForNumFont" config:type="boolean">false</config:config-item><config:config-item config:name="PrintProspect" config:type="boolean">false</config:config-item><config:config-item config:name="PrintGraphics" config:type="boolean">true</config:config-item><config:config-item config:name="AllowPrintJobCancel" config:type="boolean">true</config:config-item><config:config-item config:name="CurrentDatabaseCommandType" config:type="int">0</config:config-item><config:config-item config:name="DoNotJustifyLinesWithManualBreak" config:type="boolean">false</config:config-item><config:config-item config:name="UseFormerObjectPositioning" config:type="boolean">false</config:config-item><config:config-item config:name="PrinterIndependentLayout" config:type="string">high-resolution</config:config-item><config:config-item config:name="UseOldN
-mbering" config:type="boolean">false</config:config-item><config:config-item config:name="PrintPageBackground" config:type="boolean">true</config:config-item><config:config-item config:name="CurrentDatabaseCommand" config:type="string"/><config:config-item config:name="PrintDrawings" config:type="boolean">true</config:config-item><config:config-item config:name="PrintBlackFonts" config:type="boolean">false</config:config-item></config:config-item-set></office:settings><office:scripts><office:script script:language="ooo:Basic">
-   <ooo:libraries>
-    <ooo:library-embedded ooo:name="Standard"/>
-   </ooo:libraries></office:script></office:scripts><office:font-face-decls><style:font-face style:name="Tahoma1" svg:font-family="Tahoma"/><style:font-face style:name="Andale Sans UI" svg:font-family="'Andale Sans UI'" style:font-pitch="variable"/><style:font-face style:name="MS Mincho" svg:font-family="'MS Mincho'" style:font-pitch="variable"/><style:font-face style:name="Tahoma" svg:font-family="Tahoma" style:font-pitch="variable"/><style:font-face style:name="Thorndale" svg:font-family="Thorndale" style:font-family-generic="roman" style:font-pitch="variable"/><style:font-face style:name="Albany" svg:font-family="Albany" style:font-family-generic="swiss" style:font-pitch="variable"/></office:font-face-decls><office:styles><style:default-style style:family="graphic"><style:graphic-properties draw:shadow-offset-x="0.3cm" draw:shadow-offset-y="0.3cm" draw:start-line-spacing-horizontal="0.283cm" draw:start-line-spacing-vertical="0.283cm" draw:end-line-spacing-horizontal="0.283cm" draw:end-line-spacing-vertical="0.283cm" style:flow-with-text="false"/><style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" style:writing-mode="lr-tb" style:font-independent-line-spacing="false"><!--<style:tab-stops/>--></style:paragraph-properties><style:text-properties style:use-window-font-color="true" fo:font-size="12pt" fo:language="de" fo:country="DE" style:font-size-asian="12pt" style:language-asian="none" style:country-asian="none" style:font-size-complex="12pt" style:language-complex="none" style:country-complex="none"/></style:default-style><style:default-style style:family="paragraph"><style:paragraph-properties fo:hyphenation-ladder-count="no-limit" style:text-autospace="ideograph-alpha" style:punctuation-wrap="hanging" style:line-break="strict" style:tab-stop-distance="1.251cm" style:writing-mode="page"/><style:text-properties style:use-window-font-color="true" style:font-name="Thorndale" fo:font-size="12pt" fo:language="de" fo:country="DE" style:font-name-asian="Andale Sans UI" style:
-ont-size-asian="12pt" style:language-asian="none" style:country-asian="none" style:font-name-complex="Tahoma" style:font-size-complex="12pt" style:language-complex="none" style:country-complex="none" fo:hyphenate="false" fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2"/></style:default-style><style:default-style style:family="table"><style:table-properties table:border-model="collapsing"/></style:default-style><style:default-style style:family="table-row"><style:table-row-properties fo:keep-together="auto"/></style:default-style><style:style style:name="Standard" style:family="paragraph" style:class="text"/><style:style style:name="Text_20_body" style:display-name="Text body" style:family="paragraph" style:parent-style-name="Standard" style:class="text"><style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.212cm"/></style:style><style:style style:name="Heading" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_20_body" style:class="text"><style:paragraph-properties fo:margin-top="0.423cm" fo:margin-bottom="0.212cm" fo:keep-with-next="always"/><style:text-properties style:font-name="Albany" fo:font-size="14pt" style:font-name-asian="MS Mincho" style:font-size-asian="14pt" style:font-name-complex="Tahoma" style:font-size-complex="14pt"/></style:style><style:style style:name="List" style:family="paragraph" style:parent-style-name="Text_20_body" style:class="list"><style:text-properties style:font-name-complex="Tahoma1"/></style:style><style:style style:name="Caption" style:family="paragraph" style:parent-style-name="Standard" style:class="extra"><style:paragraph-properties fo:margin-top="0.212cm" fo:margin-bottom="0.212cm" text:number-lines="false" text:line-number="0"/><style:text-properties fo:font-size="12pt" fo:font-style="italic" style:font-size-asian="12pt" style:font-style-asian="italic" style:font-name-complex="Tahoma1" style:font-size-complex="12pt" style:font-style-complex="italic"/></style:style><style:style style:name="Index" sty
-e:family="paragraph" style:parent-style-name="Standard" style:class="index"><style:paragraph-properties text:number-lines="false" text:line-number="0"/><style:text-properties style:font-name-complex="Tahoma1"/></style:style><text:outline-style><text:outline-level-style text:level="1" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style><text:outline-level-style text:level="2" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style><text:outline-level-style text:level="3" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style><text:outline-level-style text:level="4" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style><text:outline-level-style text:level="5" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style><text:outline-level-style text:level="6" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style><text:outline-level-style text:level="7" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style><text:outline-level-style text:level="8" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style><text:outline-level-style text:level="9" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style><text:outline-level-style text:level="10" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style></text:outline-style><text:notes-configuration text:note-class="footnote" style:num-format="1" text:start-value="0" text:footnotes-position="page" text:start-numbering-at="document"/><text:notes-configuration text:note-class="endnote" style:num-format="i" text:start-value="0"/><tex
-:linenumbering-configuration text:number-lines="false" text:offset="0.499cm" style:num-format="1" text:number-position="left" text:increment="5"/></office:styles><office:automatic-styles><style:style style:name="P1" style:family="paragraph" style:parent-style-name="Standard"><style:paragraph-properties><!--<style:tab-stops><style:tab-stop style:position="1.446cm"/><style:tab-stop style:position="3.704cm" style:type="center"/><style:tab-stop style:position="6.473cm" style:type="right"/></style:tab-stops>--></style:paragraph-properties></style:style><style:style style:name="T1" style:family="text"><style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/></style:style><style:style style:name="T2" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic"/></style:style><style:page-layout style:name="pm1"><style:page-layout-properties fo:page-width="20.999cm" fo:page-height="29.699cm" style:num-format="1" style:print-orientation="portrait" fo:margin-top="2cm" fo:margin-bottom="2cm" fo:margin-left="2cm" fo:margin-right="2cm" style:writing-mode="lr-tb" style:footnote-max-height="0cm"><style:footnote-sep style:width="0.018cm" style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm" style:adjustment="left" style:rel-width="25%" style:color="#000000"/></style:page-layout-properties><style:header-style/><style:footer-style/></style:page-layout></office:automatic-styles><office:master-styles><style:master-page style:name="Standard" style:page-layout-name="pm1"/></office:master-styles><office:body><office:text><office:forms form:automatic-focus="false" form:apply-design-mode="false"/><text:sequence-decls><text:sequence-decl text:display-outline-level="0" text:name="Illustration"/><text:sequence-decl text:display-outline-level="0" text:name="Table"/><text:sequence-decl text:display-outline-level="0" text:name="Text"/><text:sequence-decl text:display-outline-level="0" text:name="Drawing"/
-</text:sequence-decls><text:p text:style-name="P1"><text:span text:style-name="T1">HALLO</text:span> <text:span text:style-name="T2">WOLRD</text:span></text:p></office:text></office:body></office:document>
+<?xml version="1.0" encoding="UTF-8"?><office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" office:version="1.0" office:mimetype="application/x-vnd.oasis.openoffice.text"><office:meta><meta:generator>StarOffice/8$Win32 OpenOffice.org_project/680m145$Build-8989</meta:generator><meta:creation-date>2006-02-10T18:59:19</meta:creation-date><dc:date>2006-02-10T19:02:26</dc:date><dc:language>de-DE</dc:language><meta:editing-cycles>2</meta:editing-cycles><meta:editing-duration>PT3M12S</meta:editing-duration><meta:user-defined meta:name="Info 1"/><meta:user-defined meta:name="Info 2"/><meta:user-defined meta:name="Info 3"/><meta:user-defined meta:name="Info 4"/><meta:document-statistic meta:table-count="0" meta:image-count="0" meta:object-count="0" meta:page-count="1" meta:paragraph-count="1" meta:word-count="2" meta:character-count="11"/></office:meta><office:settings><config:config-item-set config:name="ooo:view-settings"><config:config-item config:name="ViewAreaTop" config:type="int">0</config:config-item><config:config-item config:name="ViewAreaLeft" config:type="int">0</config:config-item><config:config-item config:name="ViewAreaWidth" config:type="int">15965</config:config-item><config:config-item config:name="ViewAreaHeight" config:type="int">8363</config:config-item><config:config-item config:name="ShowRedlineChanges" config:type="boolean">true</config:config-item><config:config-item config:name="InBrowseMode" config:type="boolean">false</config:config-item><config:config-item-map-indexed config:name="Views"><config:config-item-map-entry><config:config-item config:name="ViewId" config:type="string">view2</config:config-item><config:config-item config:name="ViewLeft" config:type="int">6137</config:config-item><config:config-item config:name="ViewTop" config:type="int">3002</config:config-item><config:config-item config:name="VisibleLeft" config:type="int">0</config:config-item><config:config-item config:name="VisibleTop" config:type="int">0</config:config-item><config:config-item config:name="VisibleRight" config:type="int">15963</config:config-item><config:config-item config:name="VisibleBottom" config:type="int">8361</config:config-item><config:config-item config:name="ZoomType" config:type="short">0</config:config-item><config:config-item config:name="ZoomFactor" config:type="short">150</config:config-item><config:config-item config:name="IsSelectedFrame" config:type="boolean">false</config:config-item></config:config-item-map-entry></config:config-item-map-indexed></config:config-item-set><config:config-item-set config:name="ooo:configuration-settings"><config:config-item config:name="AddParaTableSpacing" config:type="boolean">true</config:config-item><config:config-item config:name="PrintReversed" config:type="boolean">false</config:config-item><config:config-item config:name="OutlineLevelYieldsNumbering" config:type="boolean">false</config:config-item><config:config-item config:name="LinkUpdateMode" config:type="short">1</config:config-item><config:config-item config:name="IgnoreFirstLineIndentInNumbering" config:type="boolean">false</config:config-item><config:config-item config:name="CharacterCompressionType" config:type="short">0</config:config-item><config:config-item config:name="PrintSingleJobs" config:type="boolean">false</config:config-item><config:config-item config:name="UpdateFromTemplate" config:type="boolean">false</config:config-item><config:config-item config:name="PrintPaperFromSetup" config:type="boolean">false</config:config-item><config:config-item config:name="AddFrameOffsets" config:type="boolean">false</config:config-item><config:config-item config:name="PrintLeftPages" config:type="boolean">true</config:config-item><config:config-item config:name="RedlineProtectionKey" config:type="base64Binary"/><config:config-item config:name="PrintTables" config:type="boolean">true</config:config-item><config:config-item config:name="ChartAutoUpdate" config:type="boolean">true</config:config-item><config:config-item config:name="PrintControls" config:type="boolean">true</config:config-item><config:config-item config:name="PrinterSetup" config:type="base64Binary"/><config:config-item config:name="PrintAnnotationMode" config:type="short">0</config:config-item><config:config-item config:name="LoadReadonly" config:type="boolean">false</config:config-item><config:config-item config:name="AddParaSpacingToTableCells" config:type="boolean">true</config:config-item><config:config-item config:name="AddExternalLeading" config:type="boolean">true</config:config-item><config:config-item config:name="ApplyUserData" config:type="boolean">true</config:config-item><config:config-item config:name="FieldAutoUpdate" config:type="boolean">true</config:config-item><config:config-item config:name="SaveVersionOnClose" config:type="boolean">false</config:config-item><config:config-item config:name="SaveGlobalDocumentLinks" config:type="boolean">false</config:config-item><config:config-item config:name="IsKernAsianPunctuation" config:type="boolean">false</config:config-item><config:config-item config:name="AlignTatopPosition" config:type="boolean">true</config:config-item><config:config-item config:name="CurrentDatabaseDataSource" config:type="string"/><config:config-item config:name="PrinterName" config:type="string"/><config:config-item config:name="PrintFaxName" config:type="string"/><config:config-item config:name="ConsiderTextWrapOnObjPos" config:type="boolean">false</config:config-item><config:config-item config:name="PrintRightPages" config:type="boolean">true</config:config-item><config:config-item config:name="IsLabelDocument" config:type="boolean">false</config:config-item><config:config-item config:name="UseFormerLineSpacing" config:type="boolean">false</config:config-item><config:config-item config:name="AddParaTableSpacingAtStart" config:type="boolean">true</config:config-item><config:config-item config:name="UseFormerTextWrapping" config:type="boolean">false</config:config-item><config:config-item config:name="DoNotResetParaAttrsForNumFont" config:type="boolean">false</config:config-item><config:config-item config:name="PrintProspect" config:type="boolean">false</config:config-item><config:config-item config:name="PrintGraphics" config:type="boolean">true</config:config-item><config:config-item config:name="AllowPrintJobCancel" config:type="boolean">true</config:config-item><config:config-item config:name="CurrentDatabaseCommandType" config:type="int">0</config:config-item><config:config-item config:name="DoNotJustifyLinesWithManualBreak" config:type="boolean">false</config:config-item><config:config-item config:name="UseFormerObjectPositioning" config:type="boolean">false</config:config-item><config:config-item config:name="PrinterIndependentLayout" config:type="string">high-resolution</config:config-item><config:config-item config:name="UseOldNumbering" config:type="boolean">false</config:config-item><config:config-item config:name="PrintPageBackground" config:type="boolean">true</config:config-item><config:config-item config:name="CurrentDatabaseCommand" config:type="string"/><config:config-item config:name="PrintDrawings" config:type="boolean">true</config:config-item><config:config-item config:name="PrintBlackFonts" config:type="boolean">false</config:config-item></config:config-item-set></office:settings><office:scripts><office:script script:language="ooo:Basic"> <ooo:libraries> <ooo:library-embedded ooo:name="Standard"/> </ooo:libraries></office:script></office:scripts><office:font-face-decls><style:font-face style:name="Tahoma1" svg:font-family="Tahoma"/><style:font-face style:name="Andale Sans UI" svg:font-family="'Andale Sans UI'" style:font-pitch="variable"/><style:font-face style:name="MS Mincho" svg:font-family="'MS Mincho'" style:font-pitch="variable"/><style:font-face style:name="Tahoma" svg:font-family="Tahoma" style:font-pitch="variable"/><style:font-face style:name="Thorndale" svg:font-family="Thorndale" style:font-family-generic="roman" style:font-pitch="variable"/><style:font-face style:name="Albany" svg:font-family="Albany" style:font-family-generic="swiss" style:font-pitch="variable"/></office:font-face-decls><office:styles><style:default-style style:family="graphic"><style:graphic-properties draw:shadow-offset-x="0.3cm" draw:shadow-offset-y="0.3cm" draw:start-line-spacing-horizontal="0.283cm" draw:start-line-spacing-vertical="0.283cm" draw:end-line-spacing-horizontal="0.283cm" draw:end-line-spacing-vertical="0.283cm" style:flow-with-text="false"/><style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" style:writing-mode="lr-tb" style:font-independent-line-spacing="false"><!--<style:tab-stops/>--></style:paragraph-properties><style:text-properties style:use-window-font-color="true" fo:font-size="12pt" fo:language="de" fo:country="DE" style:font-size-asian="12pt" style:language-asian="none" style:country-asian="none" style:font-size-complex="12pt" style:language-complex="none" style:country-complex="none"/></style:default-style><style:default-style style:family="paragraph"><style:paragraph-properties fo:hyphenation-ladder-count="no-limit" style:text-autospace="ideograph-alpha" style:punctuation-wrap="hanging" style:line-break="strict" style:tab-stop-distance="1.251cm" style:writing-mode="page"/><style:text-properties style:use-window-font-color="true" style:font-name="Thorndale" fo:font-size="12pt" fo:language="de" fo:country="DE" style:font-name-asian="Andale Sans UI" style:font-size-asian="12pt" style:language-asian="none" style:country-asian="none" style:font-name-complex="Tahoma" style:font-size-complex="12pt" style:language-complex="none" style:country-complex="none" fo:hyphenate="false" fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2"/></style:default-style><style:default-style style:family="table"><style:table-properties table:border-model="collapsing"/></style:default-style><style:default-style style:family="table-row"><style:table-row-properties fo:keep-together="auto"/></style:default-style><style:style style:name="Standard" style:family="paragraph" style:class="text"/><style:style style:name="Text_20_body" style:display-name="Text body" style:family="paragraph" style:parent-style-name="Standard" style:class="text"><style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.212cm"/></style:style><style:style style:name="Heading" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_20_body" style:class="text"><style:paragraph-properties fo:margin-top="0.423cm" fo:margin-bottom="0.212cm" fo:keep-with-next="always"/><style:text-properties style:font-name="Albany" fo:font-size="14pt" style:font-name-asian="MS Mincho" style:font-size-asian="14pt" style:font-name-complex="Tahoma" style:font-size-complex="14pt"/></style:style><style:style style:name="List" style:family="paragraph" style:parent-style-name="Text_20_body" style:class="list"><style:text-properties style:font-name-complex="Tahoma1"/></style:style><style:style style:name="Caption" style:family="paragraph" style:parent-style-name="Standard" style:class="extra"><style:paragraph-properties fo:margin-top="0.212cm" fo:margin-bottom="0.212cm" text:number-lines="false" text:line-number="0"/><style:text-properties fo:font-size="12pt" fo:font-style="italic" style:font-size-asian="12pt" style:font-style-asian="italic" style:font-name-complex="Tahoma1" style:font-size-complex="12pt" style:font-style-complex="italic"/></style:style><style:style style:name="Index" style:family="paragraph" style:parent-style-name="Standard" style:class="index"><style:paragraph-properties text:number-lines="false" text:line-number="0"/><style:text-properties style:font-name-complex="Tahoma1"/></style:style><text:outline-style><text:outline-level-style text:level="1" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style><text:outline-level-style text:level="2" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style><text:outline-level-style text:level="3" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style><text:outline-level-style text:level="4" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style><text:outline-level-style text:level="5" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style><text:outline-level-style text:level="6" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style><text:outline-level-style text:level="7" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style><text:outline-level-style text:level="8" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style><text:outline-level-style text:level="9" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style><text:outline-level-style text:level="10" style:num-format=""><style:list-level-properties text:min-label-distance="0.381cm"/></text:outline-level-style></text:outline-style><text:notes-configuration text:note-class="footnote" style:num-format="1" text:start-value="0" text:footnotes-position="page" text:start-numbering-at="document"/><text:notes-configuration text:note-class="endnote" style:num-format="i" text:start-value="0"/><text:linenumbering-configuration text:number-lines="false" text:offset="0.499cm" style:num-format="1" text:number-position="left" text:increment="5"/></office:styles><office:automatic-styles><style:style style:name="P1" style:family="paragraph" style:parent-style-name="Standard"><style:paragraph-properties><!--<style:tab-stops><style:tab-stop style:position="1.446cm"/><style:tab-stop style:position="3.704cm" style:type="center"/><style:tab-stop style:position="6.473cm" style:type="right"/></style:tab-stops>--></style:paragraph-properties></style:style><style:style style:name="T1" style:family="text"><style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/></style:style><style:style style:name="T2" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic"/></style:style><style:page-layout style:name="pm1"><style:page-layout-properties fo:page-width="20.999cm" fo:page-height="29.699cm" style:num-format="1" style:print-orientation="portrait" fo:margin-top="2cm" fo:margin-bottom="2cm" fo:margin-left="2cm" fo:margin-right="2cm" style:writing-mode="lr-tb" style:footnote-max-height="0cm"><style:footnote-sep style:width="0.018cm" style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm" style:adjustment="left" style:rel-width="25%" style:color="#000000"/></style:page-layout-properties><style:header-style/><style:footer-style/></style:page-layout></office:automatic-styles><office:master-styles><style:master-page style:name="Standard" style:page-layout-name="pm1"/></office:master-styles><office:body><office:text><office:forms form:automatic-focus="false" form:apply-design-mode="false"/><text:sequence-decls><text:sequence-decl text:display-outline-level="0" text:name="Illustration"/><text:sequence-decl text:display-outline-level="0" text:name="Table"/><text:sequence-decl text:display-outline-level="0" text:name="Text"/><text:sequence-decl text:display-outline-level="0" text:name="Drawing"/></text:sequence-decls><text:p text:style-name="P1"><text:span text:style-name="T1">HALLO</text:span> <text:span text:style-name="T2">WOLRD</text:span></text:p></office:text></office:body></office:document>
diff --git a/writerfilter/qa/cppunittests/sl/testOD_SL.cxx b/writerfilter/qa/cppunittests/sl/testOD_SL.cxx
index ac9db8378dfb..5a8a0a00a7c7 100644
--- a/writerfilter/qa/cppunittests/sl/testOD_SL.cxx
+++ b/writerfilter/qa/cppunittests/sl/testOD_SL.cxx
@@ -75,7 +75,7 @@ OString getTempFileName(const OUString& fileName)
   OUString ousTmpUrl;
   FileBase::getTempDirURL(ousTmpUrl);
   if (!ousTmpUrl.endsWithIgnoreAsciiCaseAsciiL("/", 1))
-    ousTmpUrl += OUString::createFromAscii("/");
+    ousTmpUrl += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
   ousTmpUrl += fileName;
 
   OUString sysTmpPath;
@@ -94,12 +94,12 @@ public:
         std::auto_ptr<xxml::XXmlReader> reader=xxml::XXmlReader::createXXmlReader(*handler);
         reader->read("helloworld.odt.flat.xml");
 
-        OString tmpFileName = getTempFileName(OUString::createFromAscii("dumpSlPool_int.dot"));
+        OString tmpFileName = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("dumpSlPool_int.dot")));
         printf("Pool dump: %s\n", tmpFileName.getStr());
         FileLoggerImpl fl(tmpFileName.getStr());
         propertyPool->dump(&fl);
 
-        OString tmpFileName2 = getTempFileName(OUString::createFromAscii("dumpSlPool_ext.dot"));
+        OString tmpFileName2 = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("dumpSlPool_ext.dot")));
         printf("Pool dump: %s\n", tmpFileName2.getStr());
         ExternalViewLoggerImpl evl(tmpFileName2.getStr());
         propertyPool->dump(&evl);
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx
index 3d7c35052db2..1b98712beebd 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -418,7 +418,7 @@ bool lcl_IsNotAM(::rtl::OUString& rFmt, sal_Int32 nPos)
                     //todo: this cannot be the right way to replace a part of the string!
                     aNewFormat.setCharAt( nI, 'Y' );
                     aNewFormat.setCharAt( nI + 1, 'Y' );
-                    aNewFormat.insert(nI + 2, ::rtl::OUString::createFromAscii("YY"));
+                    aNewFormat.insert(nI + 2, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YY")));
                     nLen+=2;
                     nI+=3;
                 }
@@ -431,7 +431,7 @@ bool lcl_IsNotAM(::rtl::OUString& rFmt, sal_Int32 nPos)
                     //todo: this cannot be the right way to replace a part of the string!
                     aNewFormat.setCharAt( nI, 'y' );
                     aNewFormat.setCharAt( nI + 1, 'y' );
-                    aNewFormat.insert(nI + 2, ::rtl::OUString::createFromAscii("yy"));
+                    aNewFormat.insert(nI + 2, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("yy")));
                     nLen+=2;
                     nI+=3;
                 }
@@ -442,7 +442,7 @@ bool lcl_IsNotAM(::rtl::OUString& rFmt, sal_Int32 nPos)
                 // MM We have to escape '/' in case it's used as a char
                 //todo: this cannot be the right way to replace a part of the string!
                 aNewFormat.setCharAt( nI, '\\' );
-                aNewFormat.insert(nI + 1, ::rtl::OUString::createFromAscii("/"));
+                aNewFormat.insert(nI + 1, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")));
                 nI++;
                 nLen++;
             }
@@ -455,18 +455,18 @@ bool lcl_IsNotAM(::rtl::OUString& rFmt, sal_Int32 nPos)
 
     if (bForceJapanese)
     {
-        rLocale.Language =  ::rtl::OUString::createFromAscii("ja");
-        rLocale.Country = ::rtl::OUString::createFromAscii("JP");
+        rLocale.Language =  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ja"));
+        rLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JP"));
     }
 
     if (bForceNatNum)
     {
-        aNewFormat.insert( 0, ::rtl::OUString::createFromAscii("[NatNum1][$-411]"));
+        aNewFormat.insert( 0, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[NatNum1][$-411]")));
     }
 
     if (bHijri)
     {
-        aNewFormat.insert( 0, ::rtl::OUString::createFromAscii("[~hijri]"));
+        aNewFormat.insert( 0, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[~hijri]")));
     }
     return aNewFormat.makeStringAndClear();
 
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 80ee55ee2f55..978c1f53f27b 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -4243,6 +4243,7 @@ void DomainMapper::sprm( Sprm& rSprm, PropertyMapPtr rContext, SprmType eSprmTyp
 #ifdef DEBUG_DOMAINMAPPER
             dmapper_logger->startElement("unhandled");
             dmapper_logger->attribute("id", nSprmId);
+            dmapper_logger->attribute("name", rSprm.getName());
             dmapper_logger->endElement("unhandled");
 #endif
         }
@@ -4313,7 +4314,7 @@ void DomainMapper::startParagraphGroup()
 
     m_pImpl->getTableManager().startParagraphGroup();
     m_pImpl->PushProperties(CONTEXT_PARAGRAPH);
-    static ::rtl::OUString sDefault( ::rtl::OUString::createFromAscii("Standard") );
+    static ::rtl::OUString sDefault(RTL_CONSTASCII_USTRINGPARAM("Standard") );
     if (m_pImpl->GetTopContext())
     {
         m_pImpl->GetTopContext()->Insert( PROP_PARA_STYLE_NAME, true, uno::makeAny( sDefault ) );
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index a063e7a3c73a..ca703211e466 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -269,6 +269,44 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
             case NS_ooxml::LN_CT_TblPrBase_tblLook:
                 /* WRITERFILTERSTATUS: done: 0, planned: 2, spent: 0 */
                 break; //todo: table look specifier
+            case NS_ooxml::LN_CT_TcPrBase_textDirection:
+            {
+                TablePropertyMapPtr pPropMap( new TablePropertyMap );
+                const sal_Int16 HORI_LEFT_TOP = 0;
+                /*const sal_Int16 HORI_RIGHT_TOP = 1;*/ // currently not used below
+                const sal_Int16 VERT_TOP_RIGHT = 2;
+                bool bInsertCellProps = true;
+                switch ( nIntValue )
+                {
+                    case 1:  // tbRl
+                    // Binary filter takes BiDirection into account ( but I have no idea about that here )
+                    // or even what it is. But... here's where to handle it if it becomes an issue
+                        pPropMap->Insert( PROP_FRM_DIRECTION, false, uno::makeAny( VERT_TOP_RIGHT ));
+                        OSL_TRACE("Have inserted textDirection %d", nIntValue );
+                        break;
+                    case 3:  // btLr
+                        // We have to fake this text direction
+                         pPropMap->Insert( PROP_FRM_DIRECTION, false, uno::makeAny( HORI_LEFT_TOP ));
+                         pPropMap->Insert( PROP_CHAR_ROTATION, false, uno::makeAny( sal_Int16( 900 ) ));
+                        OSL_TRACE("Have inserted textDirection %d", nIntValue );
+                        break;
+                    case 4: // lrTbV
+                        pPropMap->Insert( PROP_FRM_DIRECTION, false, uno::makeAny( HORI_LEFT_TOP ));
+                        break;
+                    case 5: // tbRlV
+                        pPropMap->Insert( PROP_FRM_DIRECTION, false, uno::makeAny( VERT_TOP_RIGHT ));
+                        break;
+                    case 0: // lrTb
+                    case NS_ooxml::LN_Value_ST_TextDirection_tbLrV:
+                    default:
+                       // Ignore - we can't handle these
+                       bInsertCellProps = false;
+                       break;
+                }
+                if ( bInsertCellProps )
+                    cellProps( pPropMap );
+                break;
+            }
             case NS_ooxml::LN_CT_TcPrBase_tcW:
                 /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
                 break; //fixed column width is not supported
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index ad00a5881fae..71c621a8717e 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -184,7 +184,7 @@ uno::Reference< container::XNameContainer >    DomainMapper_Impl::GetPageStyles(
     if(!m_xPageStyles.is())
     {
         uno::Reference< style::XStyleFamiliesSupplier > xSupplier( m_xTextDocument, uno::UNO_QUERY );
-        xSupplier->getStyleFamilies()->getByName(::rtl::OUString::createFromAscii("PageStyles")) >>= m_xPageStyles;
+        xSupplier->getStyleFamilies()->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageStyles"))) >>= m_xPageStyles;
     }
     return m_xPageStyles;
 }
@@ -1469,7 +1469,7 @@ extract a parameter (with or without quotes) between the command and the followi
     }
     else
     {
-        nEndIndex = rCommand.indexOf( ::rtl::OUString::createFromAscii(" \\"), nStartIndex);
+        nEndIndex = rCommand.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" \\")), nStartIndex);
     }
     ::rtl::OUString sRet;
     if( nEndIndex > nStartIndex + 1 )
@@ -2640,7 +2640,7 @@ void DomainMapper_Impl::handleAuthor
         {
             //create a custom property field
             sServiceName +=
-                ::rtl::OUString::createFromAscii("DocInfo.Custom");
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocInfo.Custom"));
             bIsCustomField = true;
         }
         else
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 89935eafcffa..3b6cc69ad8df 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1055,10 +1055,10 @@ void GraphicImport::attribute(Id nName, Value & val)
                             ( xShape, uno::UNO_QUERY_THROW );
 
                         rtl::OUString sUrl;
-                        xShapeProps->getPropertyValue( rtl::OUString::createFromAscii( "GraphicURL" ) ) >>= sUrl;
+                        xShapeProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicURL")) ) >>= sUrl;
 
                         ::com::sun::star::beans::PropertyValues aMediaProperties( 1 );
-                        aMediaProperties[0].Name = rtl::OUString::createFromAscii( "URL" );
+                        aMediaProperties[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"));
                         aMediaProperties[0].Value <<= sUrl;
 
                         m_xGraphicObject = createGraphicObject( aMediaProperties );
@@ -1071,9 +1071,9 @@ void GraphicImport::attribute(Id nName, Value & val)
                             uno::Reference< beans::XPropertySet > xGraphProps( m_xGraphicObject,
                                     uno::UNO_QUERY );
                             awt::Size aSize = xShape->getSize( );
-                            xGraphProps->setPropertyValue( rtl::OUString::createFromAscii( "Height" ),
+                            xGraphProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Height")),
                                    uno::makeAny( aSize.Height ) );
-                            xGraphProps->setPropertyValue( rtl::OUString::createFromAscii( "Width" ),
+                            xGraphProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Width")),
                                    uno::makeAny( aSize.Width ) );
                         }
                     }
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 4b6fdb069086..a6d47a320bf7 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -439,7 +439,7 @@ ListDef::~ListDef( )
 
 OUString ListDef::GetStyleName( sal_Int32 nId )
 {
-    OUString sStyleName( OUString::createFromAscii( "WWNum" ) );
+    OUString sStyleName( RTL_CONSTASCII_USTRINGPARAM("WWNum") );
     sStyleName += OUString::valueOf( nId );
 
     return sStyleName;
@@ -476,7 +476,7 @@ uno::Reference< container::XNameContainer > lcl_getUnoNumberingStyles(
     try
     {
         uno::Reference< style::XStyleFamiliesSupplier > xFamilies( xFactory, uno::UNO_QUERY_THROW );
-        uno::Any oFamily = xFamilies->getStyleFamilies( )->getByName( OUString::createFromAscii( "NumberingStyles" ) );
+        uno::Any oFamily = xFamilies->getStyleFamilies( )->getByName( OUString(RTL_CONSTASCII_USTRINGPARAM("NumberingStyles")) );
 
         oFamily >>= xStyles;
     }
@@ -501,7 +501,7 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper,
             // Create the numbering style
             uno::Reference< beans::XPropertySet > xStyle (
                 xFactory->createInstance(
-                    OUString::createFromAscii("com.sun.star.style.NumberingStyle")),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.NumberingStyle"))),
                 uno::UNO_QUERY_THROW );
 
             rtl::OUString sStyleName = GetStyleName( GetId( ) );
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx
index a4950cbc0f17..baca2ece3556 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -324,6 +324,7 @@ const rtl::OUString& PropertyNameSupplier::GetName( PropertyIds eId ) const
             case PROP_PARA_SPLIT:    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaSplit")); break;
             case PROP_HELP:    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Help")); break;
             case PROP_HEADING_STYLE_NAME:    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeadingStyleName")); break;
+            case PROP_FRM_DIRECTION:        sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FRMDirection")); break;
 //            case       :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break;
 //            case       :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break;
 //            case       :    sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); break;
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx b/writerfilter/source/dmapper/PropertyIds.hxx
index a50500573ea0..eea6d3c1ea22 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -287,6 +287,7 @@ enum PropertyIds
 /*250*/ ,PROP_HEADING_STYLE_NAME
 /*251*/ ,PROP_PARA_SPLIT
 /*252*/ ,PROP_HELP
+/*253*/ ,PROP_FRM_DIRECTION
 };
 struct PropertyNameSupplier_Impl;
 class PropertyNameSupplier
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.cxx b/writerfilter/source/dmapper/PropertyMapHelper.cxx
index 9aab90f6f197..1392b299d2b6 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.cxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.cxx
@@ -33,7 +33,7 @@
 #include <resourcemodel/TagLogger.hxx>
 #include "PropertyMapHelper.hxx"
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
 namespace writerfilter
 {
 namespace dmapper
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.hxx b/writerfilter/source/dmapper/PropertyMapHelper.hxx
index 039a8da5df57..ba568caaf97d 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.hxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.hxx
@@ -29,7 +29,7 @@
  *
  ************************************************************************/
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
 #include "PropertyMap.hxx"
 #include <com/sun/star/beans/PropertyValues.hpp>
 
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx
index 78a5973db3ef..065a3db8fc49 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -267,7 +267,7 @@ void SettingsTable::ApplyProperties( uno::Reference< text::XTextDocument > xDoc
     uno::Reference< beans::XPropertySet> xDocProps( xDoc, uno::UNO_QUERY );
 
     // Record changes value
-    xDocProps->setPropertyValue( ::rtl::OUString::createFromAscii( "RecordChanges" ), uno::makeAny( m_pImpl->m_bRecordChanges ) );
+    xDocProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RecordChanges")), uno::makeAny( m_pImpl->m_bRecordChanges ) );
 }
 
 
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 00a59155b44b..8f7984c979bb 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -926,7 +926,7 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
                             {
                                 aPropValues.realloc( aPropValues.getLength( ) + 1 );
                                 beans::PropertyValue aStyleVal( rPropNameSupplier.GetName( PROP_NUMBERING_STYLE_NAME ), 0,
-                                        uno::makeAny( rtl::OUString::createFromAscii( "" ) ),
+                                        uno::makeAny( rtl::OUString() ),
                                         beans::PropertyState_DIRECT_VALUE );
                                 aPropValues[ aPropValues.getLength( ) - 1 ] = aStyleVal;
                             }
diff --git a/writerfilter/source/dmapper/dmapperLoggers.hxx b/writerfilter/source/dmapper/dmapperLoggers.hxx
index a053c413fae5..e9d4cf958a9f 100644
--- a/writerfilter/source/dmapper/dmapperLoggers.hxx
+++ b/writerfilter/source/dmapper/dmapperLoggers.hxx
@@ -32,7 +32,7 @@
 #ifndef INCLUDED_DMAPPER_LOGGERS_HXX
 #define INCLUDED_DMAPPER_LOGGERS_HXX
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
 #include <resourcemodel/TagLogger.hxx>
 
 namespace writerfilter {
diff --git a/writerfilter/source/doctok/WW8DocumentImpl.cxx b/writerfilter/source/doctok/WW8DocumentImpl.cxx
index 92b20f688920..c5f1b1090465 100644
--- a/writerfilter/source/doctok/WW8DocumentImpl.cxx
+++ b/writerfilter/source/doctok/WW8DocumentImpl.cxx
@@ -158,7 +158,7 @@ WW8Document::~WW8Document()
 {
 }
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
 class WW8IdToString : public IdToString
 {
 public:
@@ -185,16 +185,16 @@ WW8DocumentImpl::WW8DocumentImpl(WW8Stream::Pointer_t rpStream)
 : bSubDocument(false), mfcPicLoc(0), mbPicIsData(false), mpStream(rpStream),
 mbInSection(false), mbInParagraphGroup(false), mbInCharacterGroup(false)
 {
-    mpDocStream = getSubStream(::rtl::OUString::createFromAscii
-                               ("WordDocument"));
+    mpDocStream = getSubStream(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
+                               ("WordDocument")));
 
-    mpSummaryInformationStream = getSubStream(::rtl::OUString::createFromAscii
-                                              ("\5SummaryInformation"));
+    mpSummaryInformationStream = getSubStream(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
+                                              ("\5SummaryInformation")));
 
     try
     {
-        mpDataStream = getSubStream(::rtl::OUString::createFromAscii
-                                    ("Data"));
+        mpDataStream = getSubStream(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
+                                    ("Data")));
     }
     catch (ExceptionNotFound e)
     {
@@ -202,8 +202,8 @@ mbInSection(false), mbInParagraphGroup(false), mbInCharacterGroup(false)
 
     try
     {
-        mpCompObjStream = getSubStream(::rtl::OUString::createFromAscii
-                                       ("\1CompObj"));
+        mpCompObjStream = getSubStream(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
+                                       ("\1CompObj")));
     }
     catch (ExceptionNotFound e)
     {
@@ -219,14 +219,14 @@ mbInSection(false), mbInParagraphGroup(false), mbInCharacterGroup(false)
     switch (mpFib->get_fWhichTblStm())
     {
     case 0:
-        mpTableStream = getSubStream(::rtl::OUString::createFromAscii
-                                     ("0Table"));
+        mpTableStream = getSubStream(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
+                                     ("0Table")));
 
         break;
 
     case 1:
-        mpTableStream = getSubStream(::rtl::OUString::createFromAscii
-                                     ("1Table"));
+        mpTableStream = getSubStream(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
+                                     ("1Table")));
 
         break;
 
diff --git a/writerfilter/source/doctok/WW8StreamImpl.cxx b/writerfilter/source/doctok/WW8StreamImpl.cxx
index e60426f522c3..23cecbbe6118 100644
--- a/writerfilter/source/doctok/WW8StreamImpl.cxx
+++ b/writerfilter/source/doctok/WW8StreamImpl.cxx
@@ -40,7 +40,7 @@ namespace doctok
 {
 using namespace ::com::sun::star;
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
 TagLogger::Pointer_t debug_logger(TagLogger::getInstance("DEBUG"));
 #endif
 
@@ -60,8 +60,8 @@ WW8StreamImpl::WW8StreamImpl(uno::Reference<uno::XComponentContext> rContext,
 
     xOLESimpleStorage = uno::Reference<container::XNameContainer>
         (xFactory->createInstanceWithArgumentsAndContext
-         (::rtl::OUString::createFromAscii
-          ("com.sun.star.embed.OLESimpleStorage"),
+         (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
+          ("com.sun.star.embed.OLESimpleStorage")),
           aArgs, mrComponentContext ),
          uno::UNO_QUERY );
 
diff --git a/writerfilter/source/doctok/doctokLoggers.hxx b/writerfilter/source/doctok/doctokLoggers.hxx
index bc39e077a5fd..aa3823dea67f 100644
--- a/writerfilter/source/doctok/doctokLoggers.hxx
+++ b/writerfilter/source/doctok/doctokLoggers.hxx
@@ -29,7 +29,7 @@
 #ifndef INCLUDED_DOCTOK_LOGGERS_HXX
 #define INCLUDED_DOCTOK_LOGGERS_HXX
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
 
 #include <resourcemodel/TagLogger.hxx>
 
diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx b/writerfilter/source/filter/WriterFilterDetection.cxx
index 8e1f813c37ab..1bcb5f2cee7e 100644
--- a/writerfilter/source/filter/WriterFilterDetection.cxx
+++ b/writerfilter/source/filter/WriterFilterDetection.cxx
@@ -97,10 +97,10 @@ OUString WriterFilterDetection::detect( uno::Sequence< beans::PropertyValue >& r
             {
                 SotStorageRef xStg = new SotStorage( pStream, FALSE );
 
-                bool bTable2 = xStg->IsContained( rtl::OUString::createFromAscii("1Table" ));
+                bool bTable2 = xStg->IsContained( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1Table")));
                 SotStorageStreamRef xRef =
 
-                    xStg->OpenSotStream(rtl::OUString::createFromAscii("WordDocument"),
+                    xStg->OpenSotStream(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WordDocument")),
 
                             STREAM_STD_READ | STREAM_NOCREATE );
 
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 5de0f0e34421..d07410793348 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -44,7 +44,7 @@ namespace writerfilter {
 namespace ooxml
 {
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
 TagLogger::Pointer_t debug_logger(TagLogger::getInstance("DEBUG"));
 #endif
 
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 491c98224f73..063154b2d3cd 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -101,7 +101,7 @@ static string resourceToString
 
 set<OOXMLFastContextHandler *> aSetContexts;
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
 class OOXMLIdToString : public IdToString
 {
 public:
@@ -435,7 +435,7 @@ void OOXMLFastContextHandler::lcl_endAction(Token_t Element)
     OOXMLFactory::getInstance()->endAction(this, Element);
 }
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
 XMLTag::Pointer_t OOXMLFastContextHandler::toPropertiesTag
     (OOXMLPropertySet::Pointer_t pProps)
 {
@@ -1360,7 +1360,7 @@ OOXMLValue::Pointer_t OOXMLFastContextHandlerProperties::getValue() const
     return OOXMLValue::Pointer_t(new OOXMLPropertySetValue(mpPropertySet));
 }
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
 XMLTag::Pointer_t OOXMLFastContextHandlerProperties::toTag() const
 {
     XMLTag::Pointer_t pTag(OOXMLFastContextHandler::toTag());
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index a92b0e80bb43..e6a1d0abae93 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -225,7 +225,7 @@ public:
 
     void sendPropertyToParent();
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
     static XMLTag::Pointer_t toPropertiesTag(OOXMLPropertySet::Pointer_t);
     virtual XMLTag::Pointer_t toTag() const;
     virtual string toString() const;
@@ -344,7 +344,7 @@ public:
     virtual void setPropertySet(OOXMLPropertySet::Pointer_t pPropertySet);
     virtual OOXMLPropertySet::Pointer_t getPropertySet() const;
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
     virtual XMLTag::Pointer_t toTag() const;
 #endif
 
diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx b/writerfilter/source/ooxml/OOXMLParserState.cxx
index f2d8a004dd92..fd2bb82fcabf 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.cxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.cxx
@@ -275,7 +275,7 @@ void OOXMLParserState::incContextCount()
     mnContexts++;
 }
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
 unsigned int OOXMLParserState::getContextCount() const
 {
     return mnContexts;
diff --git a/writerfilter/source/ooxml/OOXMLParserState.hxx b/writerfilter/source/ooxml/OOXMLParserState.hxx
index 3245ac0f2eda..c265902701fe 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.hxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.hxx
@@ -32,7 +32,7 @@
 #include <ooxml/OOXMLDocument.hxx>
 #include "OOXMLPropertySetImpl.hxx"
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
 #include <resourcemodel/TagLogger.hxx>
 #endif
 
@@ -105,7 +105,7 @@ public:
 
     void incContextCount();
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
 public:
     unsigned int getContextCount() const;
     string toString() const;
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
index b59f42892c24..62c746828619 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
@@ -262,7 +262,7 @@ uno::Reference<xml::sax::XParser> OOXMLStreamImpl::getParser()
 
     uno::Reference<xml::sax::XParser> xParser
         (xFactory->createInstanceWithContext
-        ( rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Parser" ),
+        ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")),
           mxContext ),
         uno::UNO_QUERY );
 
diff --git a/writerfilter/source/ooxml/ooxmlLoggers.hxx b/writerfilter/source/ooxml/ooxmlLoggers.hxx
index 67c8d606a5da..1b5d2ef2deca 100644
--- a/writerfilter/source/ooxml/ooxmlLoggers.hxx
+++ b/writerfilter/source/ooxml/ooxmlLoggers.hxx
@@ -29,7 +29,7 @@
 #ifndef INCLUDED_OOXML_LOGGERS_HXX
 #define INCLUDED_OOXML_LOGGERS_HXX
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
 
 #include <resourcemodel/TagLogger.hxx>
 
diff --git a/writerfilter/source/resourcemodel/Protocol.cxx b/writerfilter/source/resourcemodel/Protocol.cxx
index 8bbe9f83c785..5b0fe65e877f 100644
--- a/writerfilter/source/resourcemodel/Protocol.cxx
+++ b/writerfilter/source/resourcemodel/Protocol.cxx
@@ -29,7 +29,7 @@
  *
  ************************************************************************/
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
 #include <stdio.h>
 #include <rtl/ustrbuf.hxx>
 #include <resourcemodel/Protocol.hxx>
diff --git a/writerfilter/source/resourcemodel/TagLogger.cxx b/writerfilter/source/resourcemodel/TagLogger.cxx
index 7c6d081a4dda..594e0ae579f9 100644
--- a/writerfilter/source/resourcemodel/TagLogger.cxx
+++ b/writerfilter/source/resourcemodel/TagLogger.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
 #include <fstream>
 #include <string.h>
 #include <resourcemodel/TagLogger.hxx>
diff --git a/writerfilter/source/resourcemodel/WW8Analyzer.cxx b/writerfilter/source/resourcemodel/WW8Analyzer.cxx
index 5de563e69846..126d46a96d4b 100644
--- a/writerfilter/source/resourcemodel/WW8Analyzer.cxx
+++ b/writerfilter/source/resourcemodel/WW8Analyzer.cxx
@@ -178,7 +178,7 @@ void WW8Analyzer::dumpStats(ostream & o) const
 {
     {
         for (IdSet::const_iterator aIt = mSprmIdSet.begin();
-             aIt != mSprmIdSet.end(); aIt++)
+             aIt != mSprmIdSet.end(); ++aIt)
         {
             sal_uInt32 aId = *aIt;
 
@@ -194,7 +194,7 @@ void WW8Analyzer::dumpStats(ostream & o) const
 
     {
         for (IdSet::const_iterator aIt = mAttributeIdSet.begin();
-             aIt != mAttributeIdSet.end(); aIt++)
+             aIt != mAttributeIdSet.end(); ++aIt)
         {
             sal_uInt32 aId = *aIt;
 
diff --git a/writerfilter/source/resourcemodel/util.cxx b/writerfilter/source/resourcemodel/util.cxx
index e69bb27e3d4d..f36a5797920c 100644
--- a/writerfilter/source/resourcemodel/util.cxx
+++ b/writerfilter/source/resourcemodel/util.cxx
@@ -95,7 +95,7 @@ void logger(string prefix, string message)
         return result;
     }
 
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
 string propertysetToString(uno::Reference<beans::XPropertySet> const & xPropSet)
 {
     string sResult;
diff --git a/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx b/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx
index 892f87e35511..43f4790f6646 100644
--- a/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx
+++ b/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx
@@ -100,8 +100,8 @@ public:
               xContext), uno::UNO_QUERY_THROW);
         xInputStream = xFileAccess->openFileRead(absFileUrl) ;
 
-        mLF = rtl::OUString::createFromAscii("\n");
-        mCRLF = rtl::OUString::createFromAscii("\r\n");
+        mLF = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n"));
+        mCRLF = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\r\n"));
     }
 
     rtl::OUString getURL()
diff --git a/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx b/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx
index 59038f2118ca..cb48b78bf7fb 100644
--- a/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx
+++ b/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx
@@ -101,8 +101,8 @@ public:
               xContext), uno::UNO_QUERY_THROW);
         xInputStream = xFileAccess->openFileRead(absFileUrl) ;
 
-        mLF = rtl::OUString::createFromAscii("\n");
-        mCRLF = rtl::OUString::createFromAscii("\r\n");
+        mLF = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n"));
+        mCRLF = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\r\n"));
     }
 
     rtl::OUString getURL()
diff --git a/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx b/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
index e845423ca70a..7fb41e6715c7 100644
--- a/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
+++ b/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
@@ -154,7 +154,7 @@ class MyRtfScannerHandler : public writerfilter::rtftok::RTFScannerHandler
             aArgs0[0] <<= myStream;
             uno::Reference< container::XNameContainer > xNameContainer(
             xServiceFactory->createInstanceWithArguments(
-                    ::rtl::OUString::createFromAscii("com.sun.star.embed.OLESimpleStorage" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.OLESimpleStorage")),
                     aArgs0 ),
             uno::UNO_QUERY_THROW );
             try {
@@ -171,7 +171,7 @@ class MyRtfScannerHandler : public writerfilter::rtftok::RTFScannerHandler
                 uno::Reference< io::XStream > xContentStream = xStorage->openStreamElement(
                     rtl::OUString::createFromAscii(buf), embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE );
                 uno::Reference<beans::XPropertySet> xContentStreamPropSet(xContentStream, uno::UNO_QUERY_THROW);
-                xContentStreamPropSet->setPropertyValue(rtl::OUString::createFromAscii("MediaType"), uno::makeAny(rtl::OUString::createFromAscii("application/vnd.sun.star.oleobject")));
+                xContentStreamPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), uno::makeAny(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.star.oleobject"))));
                 uno::Reference<io::XOutputStream> myOutStream=xContentStream->getOutputStream();
                 uno::Sequence< ::sal_Int8 > seq1(binLen);
                 unsigned char *data1=binBufferStr;
@@ -197,21 +197,21 @@ class MyRtfScannerHandler : public writerfilter::rtftok::RTFScannerHandler
                 uno::Reference< io::XStream > xContentStream = xStorage->openStreamElement(
                     rtl::OUString::createFromAscii(buf), embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE );
                 uno::Reference<beans::XPropertySet> xContentStreamPropSet(xContentStream, uno::UNO_QUERY_THROW);
-                xContentStreamPropSet->setPropertyValue(rtl::OUString::createFromAscii("MediaType"), uno::makeAny(rtl::OUString::createFromAscii("application/vnd.sun.star.oleobject")));
+                xContentStreamPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), uno::makeAny(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.star.oleobject"))));
                 printf("CONTENT STREAM OK\n");
 
                 uno::Sequence< uno::Any > aArgs1( 1 );
                 aArgs1[0] <<= xContentStream;
                 uno::Reference< container::XNameContainer > xNameContainer2(
                     xServiceFactory->createInstanceWithArguments(
-                    ::rtl::OUString::createFromAscii("com.sun.star.embed.OLESimpleStorage" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.OLESimpleStorage")),
                     aArgs1 ),
                     uno::UNO_QUERY_THROW );
                 printf("OLE STORAGE OK\n");
 
                 uno::Any anyStream;
                 anyStream <<= myInStream;
-                xNameContainer2->insertByName(rtl::OUString::createFromAscii("\1Ole10Native"), anyStream);
+                xNameContainer2->insertByName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\1Ole10Native")), anyStream);
                 printf("INSERT OK\n");
 
                 uno::Reference<embed::XTransactedObject> xTransact(xNameContainer2, uno::UNO_QUERY);
@@ -311,7 +311,7 @@ public:
             bytesTotal=xSeekable->getLength();
         if (xStatusIndicator.is() && xSeekable.is())
         {
-            xStatusIndicator->start(::rtl::OUString::createFromAscii("Converting"), 100);
+            xStatusIndicator->start(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Converting")), 100);
         }
     }
 
@@ -386,7 +386,7 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >
             rtl_uString_release(dir);
 
             uno::Reference <lang::XSingleServiceFactory> xStorageFactory(
-                xServiceFactory->createInstance (rtl::OUString::createFromAscii("com.sun.star.embed.StorageFactory")), uno::UNO_QUERY_THROW);
+                xServiceFactory->createInstance (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.StorageFactory"))), uno::UNO_QUERY_THROW);
 
             rtl::OUString outFileUrl;
             {
@@ -401,7 +401,7 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >
             aArgs2[1] <<= embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE;
             uno::Reference<embed::XStorage> xStorage(xStorageFactory->createInstanceWithArguments(aArgs2), uno::UNO_QUERY_THROW);
             uno::Reference<beans::XPropertySet> xPropSet(xStorage, uno::UNO_QUERY_THROW);
-            xPropSet->setPropertyValue(rtl::OUString::createFromAscii("MediaType"), uno::makeAny(rtl::OUString::createFromAscii("application/vnd.oasis.opendocument.text")));
+            xPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), uno::makeAny(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("application/vnd.oasis.opendocument.text"))));
             uno::Reference<io::XInputStream> xInputStream = xFileAccess->openFileRead(absFileUrl);
             uno::Reference< task::XStatusIndicator > xStatusIndicator;
 
diff --git a/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx b/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
index 868878bd7410..05141a26f110 100644
--- a/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
+++ b/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
@@ -201,7 +201,7 @@ public:
             bytesTotal=xSeekable->getLength();
         if (xStatusIndicator.is() && xSeekable.is())
         {
-            xStatusIndicator->start(::rtl::OUString::createFromAscii("Converting"), 100);
+            xStatusIndicator->start(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Converting")), 100);
         }
     }
 
@@ -270,7 +270,7 @@ sal_Int32 SAL_CALL XMLScanner::run( const uno::Sequence< rtl::OUString >& aArgum
             rtl_uString_release(dir);
 
             uno::Reference <lang::XSingleServiceFactory> xStorageFactory(
-                xServiceFactory->createInstance (rtl::OUString::createFromAscii("com.sun.star.embed.StorageFactory")), uno::UNO_QUERY_THROW);
+                xServiceFactory->createInstance (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.StorageFactory"))), uno::UNO_QUERY_THROW);
 
 #if 0
             rtl::OUString outFileUrl;
@@ -286,7 +286,7 @@ sal_Int32 SAL_CALL XMLScanner::run( const uno::Sequence< rtl::OUString >& aArgum
             aArgs[1] <<= embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE;
             uno::Reference<embed::XStorage> xStorage(xStorageFactory->createInstanceWithArguments(aArgs), uno::UNO_QUERY_THROW);
             uno::Reference<beans::XPropertySet> xPropSet(xStorage, uno::UNO_QUERY_THROW);
-            xPropSet->setPropertyValue(rtl::OUString::createFromAscii("MediaType"), uno::makeAny(rtl::OUString::createFromAscii("application/vnd.oasis.opendocument.text")));
+            xPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), uno::makeAny(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("application/vnd.oasis.opendocument.text"))));
 #endif
             uno::Reference<io::XInputStream> xInputStream = xFileAccess->openFileRead(absFileUrl);
             uno::Reference< task::XStatusIndicator > xStatusIndicator;
diff --git a/writerperfect/prj/build.lst b/writerperfect/prj/build.lst
index bf7a656a1f2f..87b258ac3016 100644
--- a/writerperfect/prj/build.lst
+++ b/writerperfect/prj/build.lst
@@ -1,4 +1,4 @@
-wp      writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd sot comphelper xmloff svtools NULL
+wp      writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd sot comphelper xmloff svtools sfx2 NULL
 wp	writerperfect			usr1	-	all	wp_mkout NULL
 wp	writerperfect\source\stream	nmake	-	all	wp_stream NULL
 wp	writerperfect\source\filter	nmake	-	all	wp_filter NULL
diff --git a/writerperfect/source/filter/DocumentCollector.cxx b/writerperfect/source/filter/DocumentCollector.cxx
index c410e6095584..22605664cc65 100644
--- a/writerperfect/source/filter/DocumentCollector.cxx
+++ b/writerperfect/source/filter/DocumentCollector.cxx
@@ -40,6 +40,8 @@
 
 #include "DocumentCollector.hxx"
 #include "DocumentElement.hxx"
+#include "DocumentHandler.hxx"
+#include "InternalHandler.hxx"
 #include "TextRunStyle.hxx"
 #include "FontStyle.hxx"
 #include "ListStyle.hxx"
@@ -48,34 +50,49 @@
 #include "TableStyle.hxx"
 #include "FilterInternal.hxx"
 #include "WriterProperties.hxx"
+#include "OdgExporter.hxx"
 
 _WriterDocumentState::_WriterDocumentState() :
     mbFirstElement(true),
+    mbFirstParagraphInPageSpan(true),
     mbInFakeSection(false),
     mbListElementOpenedAtCurrentLevel(false),
     mbTableCellOpened(false),
     mbHeaderRow(false),
-    mbInNote(false)
+    mbInNote(false),
+    mbInTextBox(false),
+    mbInFrame(false)
 {
 }
 
-DocumentCollector::DocumentCollector(WPSInputStream *pInput, DocumentHandler *pHandler) :
+_WriterListState::_WriterListState() :
+    mpCurrentListStyle(NULL),
+    miCurrentListLevel(0),
+    miLastListLevel(0),
+    miLastListNumber(0),
+    mbListContinueNumbering(false),
+    mbListElementParagraphOpened(false),
+    mbListElementOpened()
+{
+}
+
+DocumentCollector::DocumentCollector(WPXInputStream *pInput, DocumentHandlerInterface *pHandler) :
         mpInput(pInput),
         mpHandler(pHandler),
     mbUsed(false),
+    mWriterDocumentStates(),
+    mWriterListStates(),
     mfSectionSpaceAfter(0.0f),
     miNumListStyles(0),
     mpCurrentContentElements(&mBodyElements),
     mpCurrentPageSpan(NULL),
     miNumPageStyles(0),
-    mpCurrentListStyle(NULL),
-    miCurrentListLevel(0),
-    miLastListLevel(0),
-    miLastListNumber(0),
-    mbListContinueNumbering(false),
-    mbListElementOpened(false),
-    mbListElementParagraphOpened(false)
+    miObjectNumber(0),
+    mbIsFlatXML(true),
+    mpPassword(NULL)
 {
+    mWriterDocumentStates.push(WriterDocumentState());
+    mWriterListStates.push(WriterListState());
 }
 
 DocumentCollector::~DocumentCollector()
@@ -102,111 +119,132 @@ bool DocumentCollector::filter()
      WRITER_DEBUG_MSG(("WriterWordPerfect: Cleaning up our mess..\n"));
 
     WRITER_DEBUG_MSG(("Destroying the body elements\n"));
-    for (std::vector<DocumentElement *>::iterator iterBody = mBodyElements.begin(); iterBody != mBodyElements.end(); iterBody++) {
-        delete((*iterBody));
+    for (std::vector<DocumentElement *>::iterator iterBody = mBodyElements.begin(); iterBody != mBodyElements.end(); ++iterBody) {
+        delete (*iterBody);
         (*iterBody) = NULL;
     }
 
     WRITER_DEBUG_MSG(("Destroying the styles elements\n"));
-    for (std::vector<DocumentElement *>::iterator iterStyles = mStylesElements.begin(); iterStyles != mStylesElements.end(); iterStyles++) {
+    for (std::vector<DocumentElement *>::iterator iterStyles = mStylesElements.begin(); iterStyles != mStylesElements.end(); ++iterStyles) {
          delete (*iterStyles);
         (*iterStyles) = NULL; // we may pass over the same element again (in the case of headers/footers spanning multiple pages)
                       // so make sure we don't do a double del
     }
 
     WRITER_DEBUG_MSG(("Destroying the rest of the styles elements\n"));
-    for (std::map<WPXString, ParagraphStyle *, ltstr>::iterator iterTextStyle = mTextStyleHash.begin(); iterTextStyle != mTextStyleHash.end(); iterTextStyle++) {
-        delete iterTextStyle->second;
+    for (std::map<WPXString, ParagraphStyle *, ltstr>::iterator iterTextStyle = mTextStyleHash.begin(); iterTextStyle != mTextStyleHash.end(); ++iterTextStyle) {
+        delete (iterTextStyle->second);
     }
-    for (std::map<WPXString, SpanStyle *, ltstr>::iterator iterSpanStyle = mSpanStyleHash.begin(); iterSpanStyle != mSpanStyleHash.end(); iterSpanStyle++) {
-        delete iterSpanStyle->second;
+    for (std::map<WPXString, SpanStyle *, ltstr>::iterator iterSpanStyle = mSpanStyleHash.begin(); iterSpanStyle != mSpanStyleHash.end(); ++iterSpanStyle) {
+        delete(iterSpanStyle->second);
     }
 
-    for (std::map<WPXString, FontStyle *, ltstr>::iterator iterFont = mFontHash.begin(); iterFont != mFontHash.end(); iterFont++) {
-        delete iterFont->second;
+    for (std::map<WPXString, FontStyle *, ltstr>::iterator iterFont = mFontHash.begin(); iterFont != mFontHash.end(); ++iterFont) {
+        delete(iterFont->second);
     }
 
-    for (std::vector<ListStyle *>::iterator iterListStyles = mListStyles.begin(); iterListStyles != mListStyles.end(); iterListStyles++) {
+    for (std::vector<ListStyle *>::iterator iterListStyles = mListStyles.begin(); iterListStyles != mListStyles.end(); ++iterListStyles) {
         delete (*iterListStyles);
     }
-    for (std::vector<SectionStyle *>::iterator iterSectionStyles = mSectionStyles.begin(); iterSectionStyles != mSectionStyles.end(); iterSectionStyles++) {
+    for (std::vector<SectionStyle *>::iterator iterSectionStyles = mSectionStyles.begin(); iterSectionStyles != mSectionStyles.end(); ++iterSectionStyles) {
         delete (*iterSectionStyles);
     }
-    for (std::vector<TableStyle *>::iterator iterTableStyles = mTableStyles.begin(); iterTableStyles != mTableStyles.end(); iterTableStyles++) {
-        delete (*iterTableStyles);
+    for (std::vector<TableStyle *>::iterator iterTableStyles = mTableStyles.begin(); iterTableStyles != mTableStyles.end(); ++iterTableStyles) {
+        delete((*iterTableStyles));
     }
 
-    for (std::vector<PageSpan *>::iterator iterPageSpans = mPageSpans.begin(); iterPageSpans != mPageSpans.end(); iterPageSpans++) {
+    for (std::vector<PageSpan *>::iterator iterPageSpans = mPageSpans.begin(); iterPageSpans != mPageSpans.end(); ++iterPageSpans) {
         delete (*iterPageSpans);
     }
+    for (std::vector<DocumentElement *>::iterator iterFrameStyles = mFrameStyles.begin(); iterFrameStyles != mFrameStyles.end(); ++iterFrameStyles) {
+        delete(*iterFrameStyles);
+    }
+    for (std::vector<DocumentElement *>::iterator iterFrameAutomaticStyles = mFrameAutomaticStyles.begin();
+        iterFrameAutomaticStyles != mFrameAutomaticStyles.end(); ++iterFrameAutomaticStyles) {
+        delete(*iterFrameAutomaticStyles);
+    }
+    for (std::vector<DocumentElement *>::iterator iterMetaData = mMetaData.begin(); iterMetaData != mMetaData.end(); ++iterMetaData) {
+        delete(*iterMetaData);
+    }
 
      return true;
 }
 
-void DocumentCollector::_writeDefaultStyles(DocumentHandler *pHandler)
+void DocumentCollector::_writeDefaultStyles(DocumentHandlerInterface *pHandler)
 {
-    TagOpenElement stylesOpenElement("office:styles");
-    stylesOpenElement.write(pHandler);
+    TagOpenElement("office:styles").write(pHandler);
 
     TagOpenElement defaultParagraphStyleOpenElement("style:default-style");
     defaultParagraphStyleOpenElement.addAttribute("style:family", "paragraph");
     defaultParagraphStyleOpenElement.write(pHandler);
 
-    TagOpenElement defaultParagraphStylePropertiesOpenElement("style:properties");
-    defaultParagraphStylePropertiesOpenElement.addAttribute("style:family", "paragraph");
-    defaultParagraphStylePropertiesOpenElement.addAttribute("style:tab-stop-distance", "0.5inch");
+    TagOpenElement defaultParagraphStylePropertiesOpenElement("style:paragraph-properties");
+    defaultParagraphStylePropertiesOpenElement.addAttribute("style:tab-stop-distance", "0.5in");
     defaultParagraphStylePropertiesOpenElement.write(pHandler);
-    TagCloseElement defaultParagraphStylePropertiesCloseElement("style:properties");
+    TagCloseElement defaultParagraphStylePropertiesCloseElement("style:paragraph-properties");
     defaultParagraphStylePropertiesCloseElement.write(pHandler);
 
-    TagCloseElement defaultParagraphStyleCloseElement("style:default-style");
-    defaultParagraphStyleCloseElement.write(pHandler);
+    pHandler->endElement("style:default-style");
+
+    TagOpenElement defaultTableRowStyleOpenElement("style:default-style");
+    defaultTableRowStyleOpenElement.addAttribute("style:family", "table-row");
+    defaultTableRowStyleOpenElement.write(pHandler);
+
+    TagOpenElement defaultTableRowPropertiesOpenElement("style:table-row-properties");
+    defaultTableRowPropertiesOpenElement.addAttribute("fo:keep-together", "auto");
+    defaultTableRowPropertiesOpenElement.write(pHandler);
+
+    pHandler->endElement("style:table-row-properties");
+    pHandler->endElement("style:default-style");
 
     TagOpenElement standardStyleOpenElement("style:style");
         standardStyleOpenElement.addAttribute("style:name", "Standard");
         standardStyleOpenElement.addAttribute("style:family", "paragraph");
         standardStyleOpenElement.addAttribute("style:class", "text");
         standardStyleOpenElement.write(pHandler);
-        TagCloseElement standardStyleCloseElement("style:style");
-        standardStyleCloseElement.write(pHandler);
+
+    pHandler->endElement("style:style");
 
         TagOpenElement textBodyStyleOpenElement("style:style");
-        textBodyStyleOpenElement.addAttribute("style:name", "Text Body");
+    textBodyStyleOpenElement.addAttribute("style:name", "Text_Body");
+    textBodyStyleOpenElement.addAttribute("style:display-name", "Text Body");
         textBodyStyleOpenElement.addAttribute("style:family", "paragraph");
         textBodyStyleOpenElement.addAttribute("style:parent-style-name", "Standard");
         textBodyStyleOpenElement.addAttribute("style:class", "text");
         textBodyStyleOpenElement.write(pHandler);
-        TagCloseElement textBodyStyleCloseElement("style:style");
-        textBodyStyleCloseElement.write(pHandler);
+
+    pHandler->endElement("style:style");
 
         TagOpenElement tableContentsStyleOpenElement("style:style");
-        tableContentsStyleOpenElement.addAttribute("style:name", "Table Contents");
+    tableContentsStyleOpenElement.addAttribute("style:name", "Table_Contents");
+    tableContentsStyleOpenElement.addAttribute("style:display-name", "Table Contents");
         tableContentsStyleOpenElement.addAttribute("style:family", "paragraph");
-        tableContentsStyleOpenElement.addAttribute("style:parent-style-name", "Text Body");
+    tableContentsStyleOpenElement.addAttribute("style:parent-style-name", "Text_Body");
         tableContentsStyleOpenElement.addAttribute("style:class", "extra");
         tableContentsStyleOpenElement.write(pHandler);
-        TagCloseElement tableContentsStyleCloseElement("style:style");
-        tableContentsStyleCloseElement.write(pHandler);
+
+    pHandler->endElement("style:style");
 
         TagOpenElement tableHeadingStyleOpenElement("style:style");
-        tableHeadingStyleOpenElement.addAttribute("style:name", "Table Heading");
+    tableHeadingStyleOpenElement.addAttribute("style:name", "Table_Heading");
+    tableHeadingStyleOpenElement.addAttribute("style:display-name", "Table Heading");
         tableHeadingStyleOpenElement.addAttribute("style:family", "paragraph");
-        tableHeadingStyleOpenElement.addAttribute("style:parent-style-name", "Table Contents");
+    tableHeadingStyleOpenElement.addAttribute("style:parent-style-name", "Table_Contents");
         tableHeadingStyleOpenElement.addAttribute("style:class", "extra");
         tableHeadingStyleOpenElement.write(pHandler);
-        TagCloseElement tableHeadingStyleCloseElement("style:style");
-        tableHeadingStyleCloseElement.write(pHandler);
 
-    TagCloseElement stylesCloseElement("office:styles");
-    stylesCloseElement.write(pHandler);
+    pHandler->endElement("style:style");
 
+    for (std::vector<DocumentElement *>::const_iterator iter = mFrameStyles.begin();
+        iter != mFrameStyles.end(); ++iter)
+        (*iter)->write(pHandler);
+
+    pHandler->endElement("office:styles");
 }
 
-void DocumentCollector::_writeMasterPages(DocumentHandler *pHandler)
+void DocumentCollector::_writeMasterPages(DocumentHandlerInterface *pHandler)
 {
-        WPXPropertyList xBlankAttrList;
-
-    pHandler->startElement("office:master-styles", xBlankAttrList);
+    TagOpenElement("office:master-styles").write(mpHandler);
     int pageNumber = 1;
     for (unsigned int i=0; i<mPageSpans.size(); i++)
     {
@@ -218,66 +256,80 @@ void DocumentCollector::_writeMasterPages(DocumentHandler *pHandler)
     pHandler->endElement("office:master-styles");
 }
 
-void DocumentCollector::_writePageMasters(DocumentHandler *pHandler)
+void DocumentCollector::_writePageLayouts(DocumentHandlerInterface *pHandler)
 {
     for (unsigned int i=0; i<mPageSpans.size(); i++)
     {
-        mPageSpans[i]->writePageMaster(i, pHandler);
+        mPageSpans[i]->writePageLayout(i, pHandler);
     }
 }
 
-bool DocumentCollector::_writeTargetDocument(DocumentHandler *pHandler)
+bool DocumentCollector::_writeTargetDocument(DocumentHandlerInterface *pHandler)
 {
     WRITER_DEBUG_MSG(("WriterWordPerfect: Document Body: Printing out the header stuff..\n"));
-    WPXPropertyList xBlankAttrList;
 
     WRITER_DEBUG_MSG(("WriterWordPerfect: Document Body: Start Document\n"));
     mpHandler->startDocument();
 
     WRITER_DEBUG_MSG(("WriterWordPerfect: Document Body: preamble\n"));
         WPXPropertyList docContentPropList;
-    docContentPropList.insert("xmlns:office", "http://openoffice.org/2000/office");
-    docContentPropList.insert("xmlns:style", "http://openoffice.org/2000/style");
-    docContentPropList.insert("xmlns:text", "http://openoffice.org/2000/text");
-    docContentPropList.insert("xmlns:table", "http://openoffice.org/2000/table");
-    docContentPropList.insert("xmlns:draw", "http://openoffice.org/2000/draw");
-    docContentPropList.insert("xmlns:fo", "http://www.w3.org/1999/XSL/Format");
+    docContentPropList.insert("xmlns:office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0");
+    docContentPropList.insert("xmlns:meta", "urn:oasis:names:tc:opendocument:xmlns:meta:1.0");
+    docContentPropList.insert("xmlns:dc", "http://purl.org/dc/elements/1.1/");
+    docContentPropList.insert("xmlns:config", "urn:oasis:names:tc:opendocument:xmlns:config:1.0");
+    docContentPropList.insert("xmlns:text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0");
+    docContentPropList.insert("xmlns:table", "urn:oasis:names:tc:opendocument:xmlns:table:1.0");
+    docContentPropList.insert("xmlns:draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0");
+    docContentPropList.insert("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0");
     docContentPropList.insert("xmlns:xlink", "http://www.w3.org/1999/xlink");
     docContentPropList.insert("xmlns:number", "http://openoffice.org/2000/datastyle");
-    docContentPropList.insert("xmlns:svg", "http://www.w3.org/2000/svg");
-    docContentPropList.insert("xmlns:chart", "http://openoffice.org/2000/chart");
-    docContentPropList.insert("xmlns:dr3d", "http://openoffice.org/2000/dr3d");
+    docContentPropList.insert("xmlns:svg", "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0");
+    docContentPropList.insert("xmlns:chart", "urn:oasis:names:tc:opendocument:xmlns:chart:1.0");
+    docContentPropList.insert("xmlns:dr3d", "urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0");
     docContentPropList.insert("xmlns:math", "http://www.w3.org/1998/Math/MathML");
-    docContentPropList.insert("xmlns:form", "http://openoffice.org/2000/form");
-    docContentPropList.insert("xmlns:script", "http://openoffice.org/2000/script");
-    docContentPropList.insert("office:class", "text");
+    docContentPropList.insert("xmlns:form", "urn:oasis:names:tc:opendocument:xmlns:form:1.0");
+    docContentPropList.insert("xmlns:script", "urn:oasis:names:tc:opendocument:xmlns:script:1.0");
+    docContentPropList.insert("xmlns:style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0");
     docContentPropList.insert("office:version", "1.0");
-        mpHandler->startElement("office:document-content", docContentPropList);
+    docContentPropList.insert("office:mimetype", "application/vnd.oasis.opendocument.text");
+    mpHandler->startElement("office:document", docContentPropList);
+
+    // write out the metadata
+    TagOpenElement("office:meta").write(mpHandler);
+    for (std::vector<DocumentElement *>::const_iterator iterMetaData = mMetaData.begin(); iterMetaData != mMetaData.end(); ++iterMetaData) {
+        (*iterMetaData)->write(mpHandler);
+    }
+    mpHandler->endElement("office:meta");
 
     // write out the font styles
-    mpHandler->startElement("office:font-decls", xBlankAttrList);
-    for (std::map<WPXString, FontStyle *, ltstr>::iterator iterFont = mFontHash.begin(); iterFont != mFontHash.end(); iterFont++) {
+    TagOpenElement("office:font-face-decls").write(mpHandler);
+    for (std::map<WPXString, FontStyle *, ltstr>::iterator iterFont = mFontHash.begin(); iterFont != mFontHash.end(); ++iterFont) {
         iterFont->second->write(mpHandler);
     }
-    TagOpenElement symbolFontOpen("style:font-decl");
+    TagOpenElement symbolFontOpen("style:font-face");
     symbolFontOpen.addAttribute("style:name", "StarSymbol");
-    symbolFontOpen.addAttribute("fo:font-family", "StarSymbol");
+    symbolFontOpen.addAttribute("svg:font-family", "StarSymbol");
     symbolFontOpen.addAttribute("style:font-charset", "x-symbol");
     symbolFontOpen.write(mpHandler);
-        mpHandler->endElement("style:font-decl");
-
-    mpHandler->endElement("office:font-decls");
+    mpHandler->endElement("style:font-face");
 
+    mpHandler->endElement("office:font-face-decls");
 
      WRITER_DEBUG_MSG(("WriterWordPerfect: Document Body: Writing out the styles..\n"));
 
     // write default styles
     _writeDefaultStyles(mpHandler);
 
-    mpHandler->startElement("office:automatic-styles", xBlankAttrList);
+    TagOpenElement("office:automatic-styles").write(mpHandler);
 
-    for (std::map<WPXString, ParagraphStyle *, ltstr>::iterator iterTextStyle = mTextStyleHash.begin();
-             iterTextStyle != mTextStyleHash.end(); iterTextStyle++)
+    for (std::vector<DocumentElement *>::const_iterator iterFrameAutomaticStyles = mFrameAutomaticStyles.begin();
+        iterFrameAutomaticStyles != mFrameAutomaticStyles.end(); ++iterFrameAutomaticStyles)
+    {
+        (*iterFrameAutomaticStyles)->write(pHandler);
+    }
+
+    for (std::map<WPXString, ParagraphStyle *, ltstr>::const_iterator iterTextStyle = mTextStyleHash.begin();
+             iterTextStyle != mTextStyleHash.end(); ++iterTextStyle)
         {
         // writing out the paragraph styles
         if (strcmp((iterTextStyle->second)->getName().cstr(), "Standard"))
@@ -288,29 +340,29 @@ bool DocumentCollector::_writeTargetDocument(DocumentHandler *pHandler)
     }
 
         // span styles..
-    for (std::map<WPXString, SpanStyle *, ltstr>::iterator iterSpanStyle = mSpanStyleHash.begin();
-             iterSpanStyle != mSpanStyleHash.end(); iterSpanStyle++)
+    for (std::map<WPXString, SpanStyle *, ltstr>::const_iterator iterSpanStyle = mSpanStyleHash.begin();
+             iterSpanStyle != mSpanStyleHash.end(); ++iterSpanStyle)
         {
                 (iterSpanStyle->second)->write(pHandler);
     }
 
      // writing out the sections styles
-    for (std::vector<SectionStyle *>::iterator iterSectionStyles = mSectionStyles.begin(); iterSectionStyles != mSectionStyles.end(); iterSectionStyles++) {
+    for (std::vector<SectionStyle *>::const_iterator iterSectionStyles = mSectionStyles.begin(); iterSectionStyles != mSectionStyles.end(); ++iterSectionStyles) {
         (*iterSectionStyles)->write(pHandler);
     }
 
     // writing out the lists styles
-    for (std::vector<ListStyle *>::iterator iterListStyles = mListStyles.begin(); iterListStyles != mListStyles.end(); iterListStyles++) {
+    for (std::vector<ListStyle *>::const_iterator iterListStyles = mListStyles.begin(); iterListStyles != mListStyles.end(); ++iterListStyles) {
         (*iterListStyles)->write(pHandler);
     }
 
      // writing out the table styles
-    for (std::vector<TableStyle *>::iterator iterTableStyles = mTableStyles.begin(); iterTableStyles != mTableStyles.end(); iterTableStyles++) {
+    for (std::vector<TableStyle *>::const_iterator iterTableStyles = mTableStyles.begin(); iterTableStyles != mTableStyles.end(); ++iterTableStyles) {
         (*iterTableStyles)->write(pHandler);
     }
 
     // writing out the page masters
-    _writePageMasters(pHandler);
+    _writePageLayouts(pHandler);
 
 
     pHandler->endElement("office:automatic-styles");
@@ -319,15 +371,17 @@ bool DocumentCollector::_writeTargetDocument(DocumentHandler *pHandler)
 
      WRITER_DEBUG_MSG(("WriterWordPerfect: Document Body: Writing out the document..\n"));
      // writing out the document
-    pHandler->startElement("office:body", xBlankAttrList);
+    TagOpenElement("office:body").write(mpHandler);
+    TagOpenElement("office:text").write(mpHandler);
 
-    for (std::vector<DocumentElement *>::iterator iterBodyElements = mBodyElements.begin(); iterBodyElements != mBodyElements.end(); iterBodyElements++) {
+    for (std::vector<DocumentElement *>::const_iterator iterBodyElements = mBodyElements.begin(); iterBodyElements != mBodyElements.end(); ++iterBodyElements) {
         (*iterBodyElements)->write(pHandler);
     }
      WRITER_DEBUG_MSG(("WriterWordPerfect: Document Body: Finished writing all doc els..\n"));
 
+    pHandler->endElement("office:text");
     pHandler->endElement("office:body");
-    pHandler->endElement("office:document-content");
+    pHandler->endElement("office:document");
 
     pHandler->endDocument();
 
@@ -375,11 +429,31 @@ void DocumentCollector::_allocateFontName(const WPXString & sFontName)
     }
 }
 
+void DocumentCollector::setDocumentMetaData(const WPXPropertyList &propList)
+{
+        WPXPropertyList::Iter i(propList);
+        for (i.rewind(); i.next(); )
+        {
+                // filter out libwpd elements
+                if (strncmp(i.key(), "libwpd", 6) != 0 && strncmp(i.key(), "dcterms", 7) != 0)
+        {
+            mMetaData.push_back(new TagOpenElement(i.key()));
+            WPXString sStringValue(i()->getStr(), true);
+            mMetaData.push_back(new CharDataElement(sStringValue.cstr()));
+            mMetaData.push_back(new TagCloseElement(i.key()));
+        }
+        }
+
+}
+
 void DocumentCollector::openPageSpan(const WPXPropertyList &propList)
 {
     PageSpan *pPageSpan = new PageSpan(propList);
     mPageSpans.push_back(pPageSpan);
     mpCurrentPageSpan = pPageSpan;
+    miNumPageStyles++;
+
+    mWriterDocumentStates.top().mbFirstParagraphInPageSpan = true;
 }
 
 void DocumentCollector::openHeader(const WPXPropertyList &propList)
@@ -419,16 +493,20 @@ void DocumentCollector::closeFooter()
 void DocumentCollector::openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns)
 {
         int iNumColumns = columns.count();
-    float fSectionMarginLeft = 0.0f;
-    float fSectionMarginRight = 0.0f;
+    double fSectionMarginLeft = 0.0;
+    double fSectionMarginRight = 0.0;
     if (propList["fo:margin-left"])
-        fSectionMarginLeft = propList["fo:margin-left"]->getFloat();
+        fSectionMarginLeft = propList["fo:margin-left"]->getDouble();
     if (propList["fo:margin-right"])
-        fSectionMarginRight = propList["fo:margin-right"]->getFloat();
+        fSectionMarginRight = propList["fo:margin-right"]->getDouble();
 
     if (iNumColumns > 1 || fSectionMarginLeft != 0 || fSectionMarginRight != 0)
     {
-        mfSectionSpaceAfter = propList["fo:margin-bottom"]->getFloat();
+        if (propList["fo:margin-bottom"])
+            mfSectionSpaceAfter = propList["fo:margin-bottom"]->getDouble();
+        else if (propList["libwpd:margin-bottom"])
+            mfSectionSpaceAfter =  propList["libwpd:margin-bottom"]->getDouble();
+
         WPXString sSectionName;
         sSectionName.sprintf("Section%i", mSectionStyles.size());
 
@@ -438,29 +516,20 @@ void DocumentCollector::openSection(const WPXPropertyList &propList, const WPXPr
         TagOpenElement *pSectionOpenElement = new TagOpenElement("text:section");
         pSectionOpenElement->addAttribute("text:style-name", pSectionStyle->getName());
         pSectionOpenElement->addAttribute("text:name", pSectionStyle->getName());
-        mpCurrentContentElements->push_back(static_cast<DocumentElement *>(pSectionOpenElement));
+        mpCurrentContentElements->push_back(pSectionOpenElement);
     }
     else
-        mWriterDocumentState.mbInFakeSection = true;
+        mWriterDocumentStates.top().mbInFakeSection = true;
 }
 
 void DocumentCollector::closeSection()
 {
-    if (!mWriterDocumentState.mbInFakeSection)
-        mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:section")));
+    if (!mWriterDocumentStates.top().mbInFakeSection)
+        mpCurrentContentElements->push_back(new TagCloseElement("text:section"));
     else
-        mWriterDocumentState.mbInFakeSection = false;
+        mWriterDocumentStates.top().mbInFakeSection = false;
 
-    // open as many paragraphs as needed to simulate section space after
-    // WLACH_REFACTORING: disable this for now..
-    #if 0
-    for (float f=0.0f; f<mfSectionSpaceAfter; f+=1.0f) {
-        vector<WPXTabStop> dummyTabStops;
-        openParagraph(WPX_PARAGRAPH_JUSTIFICATION_LEFT, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, dummyTabStops, false, false);
-        closeParagraph();
-    }
-    #endif
-    mfSectionSpaceAfter = 0.0f;
+    mfSectionSpaceAfter = 0.0;
 }
 
 void DocumentCollector::openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops)
@@ -471,7 +540,7 @@ void DocumentCollector::openParagraph(const WPXPropertyList &propList, const WPX
     WPXPropertyList *pPersistPropList = new WPXPropertyList(propList);
     ParagraphStyle *pStyle = NULL;
 
-    if (mWriterDocumentState.mbFirstElement && mpCurrentContentElements == &mBodyElements)
+    if (mWriterDocumentStates.top().mbFirstElement && mpCurrentContentElements == &mBodyElements)
     {
         // we don't have to go through the fuss of determining if the paragraph style is
         // unique in this case, because if we are the first document element, then we
@@ -483,26 +552,36 @@ void DocumentCollector::openParagraph(const WPXPropertyList &propList, const WPX
         sName.sprintf("FS");
 
         WPXString sParagraphHashKey("P|FS");
-        pPersistPropList->insert("style:master-page-name", "Page Style 1");
+        pPersistPropList->insert("style:master-page-name", "Page_Style_1");
                 pStyle = new ParagraphStyle(pPersistPropList, tabStops, sName);
         mTextStyleHash[sParagraphHashKey] = pStyle;
-        mWriterDocumentState.mbFirstElement = false;
+        mWriterDocumentStates.top().mbFirstElement = false;
+        mWriterDocumentStates.top().mbFirstParagraphInPageSpan = false;
      }
     else
     {
-        if (mWriterDocumentState.mbTableCellOpened)
+        if (mWriterDocumentStates.top().mbFirstParagraphInPageSpan && mpCurrentContentElements == &mBodyElements)
+        {
+            WPXString sPageStyleName;
+            sPageStyleName.sprintf("Page_Style_%i", miNumPageStyles);
+            pPersistPropList->insert("style:master-page-name", sPageStyleName);
+            mWriterDocumentStates.top().mbFirstParagraphInPageSpan = false;
+        }
+
+        if (mWriterDocumentStates.top().mbTableCellOpened)
         {
-            if (mWriterDocumentState.mbHeaderRow)
-                pPersistPropList->insert("style:parent-style-name", "Table Heading");
+            if (mWriterDocumentStates.top().mbHeaderRow)
+                pPersistPropList->insert("style:parent-style-name", "Table_Heading");
             else
-                pPersistPropList->insert("style:parent-style-name", "Table Contents");
+                pPersistPropList->insert("style:parent-style-name", "Table_Contents");
         }
         else
             pPersistPropList->insert("style:parent-style-name", "Standard");
 
                 WPXString sKey = getParagraphStyleKey(*pPersistPropList, tabStops);
 
-        if (mTextStyleHash.find(sKey) == mTextStyleHash.end()) {
+        if (mTextStyleHash.find(sKey) == mTextStyleHash.end())
+        {
             WPXString sName;
             sName.sprintf("S%i", mTextStyleHash.size());
 
@@ -519,12 +598,12 @@ void DocumentCollector::openParagraph(const WPXPropertyList &propList, const WPX
     // create a document element corresponding to the paragraph, and append it to our list of document elements
     TagOpenElement *pParagraphOpenElement = new TagOpenElement("text:p");
     pParagraphOpenElement->addAttribute("text:style-name", pStyle->getName());
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(pParagraphOpenElement));
+    mpCurrentContentElements->push_back(pParagraphOpenElement);
 }
 
 void DocumentCollector::closeParagraph()
 {
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:p")));
+    mpCurrentContentElements->push_back(new TagCloseElement("text:p"));
 }
 
 void DocumentCollector::openSpan(const WPXPropertyList &propList)
@@ -552,12 +631,12 @@ void DocumentCollector::openSpan(const WPXPropertyList &propList)
     // create a document element corresponding to the paragraph, and append it to our list of document elements
     TagOpenElement *pSpanOpenElement = new TagOpenElement("text:span");
     pSpanOpenElement->addAttribute("text:style-name", sName.cstr());
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(pSpanOpenElement));
+    mpCurrentContentElements->push_back(pSpanOpenElement);
 }
 
 void DocumentCollector::closeSpan()
 {
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:span")));
+    mpCurrentContentElements->push_back(new TagCloseElement("text:span"));
 }
 
 void DocumentCollector::defineOrderedListLevel(const WPXPropertyList &propList)
@@ -567,8 +646,8 @@ void DocumentCollector::defineOrderedListLevel(const WPXPropertyList &propList)
                 id = propList["libwpd:id"]->getInt();
 
      OrderedListStyle *pOrderedListStyle = NULL;
-    if (mpCurrentListStyle && mpCurrentListStyle->getListID() == id)
-        pOrderedListStyle = static_cast<OrderedListStyle *>(mpCurrentListStyle); // FIXME: using a dynamic cast here causes oo to crash?!
+    if (mWriterListStates.top().mpCurrentListStyle && mWriterListStates.top().mpCurrentListStyle->getListID() == id)
+        pOrderedListStyle = static_cast<OrderedListStyle *>(mWriterListStates.top().mpCurrentListStyle); // FIXME: using a dynamic cast here causes oo to crash?!
 
     // this rather appalling conditional makes sure we only start a new list (rather than continue an old
     // one) if: (1) we have no prior list OR (2) the prior list is actually definitively different
@@ -576,27 +655,27 @@ void DocumentCollector::defineOrderedListLevel(const WPXPropertyList &propList)
     // is starting a new list at level 1 (and only level 1)
     if (pOrderedListStyle == NULL || pOrderedListStyle->getListID() != id  ||
         (propList["libwpd:level"] && propList["libwpd:level"]->getInt()==1 &&
-             (propList["text:start-value"] && (unsigned int)(propList["text:start-value"]->getInt()) != (miLastListNumber+1))))
+         (propList["text:start-value"] && propList["text:start-value"]->getInt() != (mWriterListStates.top().miLastListNumber+1))))
     {
         WRITER_DEBUG_MSG(("Attempting to create a new ordered list style (listid: %i)\n", id));
         WPXString sName;
         sName.sprintf("OL%i", miNumListStyles);
         miNumListStyles++;
-        pOrderedListStyle = new OrderedListStyle(sName.cstr(), propList["libwpd:id"]->getInt());
-        mListStyles.push_back(static_cast<ListStyle *>(pOrderedListStyle));
-        mpCurrentListStyle = static_cast<ListStyle *>(pOrderedListStyle);
-        mbListContinueNumbering = false;
-        miLastListNumber = 0;
+        pOrderedListStyle = new OrderedListStyle(sName.cstr(), id);
+        mListStyles.push_back(pOrderedListStyle);
+        mWriterListStates.top().mpCurrentListStyle = pOrderedListStyle;
+        mWriterListStates.top().mbListContinueNumbering = false;
+        mWriterListStates.top().miLastListNumber = 0;
     }
     else
-        mbListContinueNumbering = true;
+        mWriterListStates.top().mbListContinueNumbering = true;
 
     // Iterate through ALL list styles with the same WordPerfect list id and define a level if it is not already defined
     // This solves certain problems with lists that start and finish without reaching certain levels and then begin again
     // and reach those levels. See gradguide0405_PC.wpd in the regression suite
-    for (std::vector<ListStyle *>::iterator iterOrderedListStyles = mListStyles.begin(); iterOrderedListStyles != mListStyles.end(); iterOrderedListStyles++)
+    for (std::vector<ListStyle *>::iterator iterOrderedListStyles = mListStyles.begin(); iterOrderedListStyles != mListStyles.end(); ++iterOrderedListStyles)
     {
-        if ((* iterOrderedListStyles)->getListID() == propList["libwpd:id"]->getInt())
+        if ((* iterOrderedListStyles)->getListID() == id)
             (* iterOrderedListStyles)->updateListLevel((propList["libwpd:level"]->getInt() - 1), propList);
     }
 }
@@ -608,106 +687,114 @@ void DocumentCollector::defineUnorderedListLevel(const WPXPropertyList &propList
                 id = propList["libwpd:id"]->getInt();
 
      UnorderedListStyle *pUnorderedListStyle = NULL;
-    if (mpCurrentListStyle && mpCurrentListStyle->getListID() == id)
-        pUnorderedListStyle = static_cast<UnorderedListStyle *>(mpCurrentListStyle); // FIXME: using a dynamic cast here causes oo to crash?!
+    if (mWriterListStates.top().mpCurrentListStyle && mWriterListStates.top().mpCurrentListStyle->getListID() == id)
+        pUnorderedListStyle = static_cast<UnorderedListStyle *>(mWriterListStates.top().mpCurrentListStyle); // FIXME: using a dynamic cast here causes oo to crash?!
 
     if (pUnorderedListStyle == NULL) {
         WRITER_DEBUG_MSG(("Attempting to create a new unordered list style (listid: %i)\n", id));
         WPXString sName;
         sName.sprintf("UL%i", miNumListStyles);
+        miNumListStyles++;
         pUnorderedListStyle = new UnorderedListStyle(sName.cstr(), id);
-        mListStyles.push_back(static_cast<ListStyle *>(pUnorderedListStyle));
-        mpCurrentListStyle = static_cast<ListStyle *>(pUnorderedListStyle);
+        mListStyles.push_back(pUnorderedListStyle);
+        mWriterListStates.top().mpCurrentListStyle = pUnorderedListStyle;
     }
 
     // See comment in DocumentCollector::defineOrderedListLevel
-    for (std::vector<ListStyle *>::iterator iterUnorderedListStyles = mListStyles.begin(); iterUnorderedListStyles != mListStyles.end(); iterUnorderedListStyles++)
+    for (std::vector<ListStyle *>::iterator iterUnorderedListStyles = mListStyles.begin(); iterUnorderedListStyles != mListStyles.end(); ++iterUnorderedListStyles)
     {
-        if ((* iterUnorderedListStyles)->getListID() == propList["libwpd:id"]->getInt())
+        if ((* iterUnorderedListStyles)->getListID() == id)
             (* iterUnorderedListStyles)->updateListLevel((propList["libwpd:level"]->getInt() - 1), propList);
     }
 }
 
 void DocumentCollector::openOrderedListLevel(const WPXPropertyList & /* propList */)
 {
-    miCurrentListLevel++;
-    TagOpenElement *pListLevelOpenElement = new TagOpenElement("text:ordered-list");
+    if (mWriterListStates.top().mbListElementParagraphOpened)
+    {
+        mpCurrentContentElements->push_back(new TagCloseElement("text:p"));
+        mWriterListStates.top().mbListElementParagraphOpened = false;
+    }
+    TagOpenElement *pListLevelOpenElement = new TagOpenElement("text:list");
     _openListLevel(pListLevelOpenElement);
 
-    if (mbListContinueNumbering) {
+    if (mWriterListStates.top().mbListContinueNumbering) {
         pListLevelOpenElement->addAttribute("text:continue-numbering", "true");
     }
 
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(pListLevelOpenElement));
+    mpCurrentContentElements->push_back(pListLevelOpenElement);
 }
 
 void DocumentCollector::openUnorderedListLevel(const WPXPropertyList & /* propList */)
 {
-    miCurrentListLevel++;
-    TagOpenElement *pListLevelOpenElement = new TagOpenElement("text:unordered-list");
+    if (mWriterListStates.top().mbListElementParagraphOpened)
+    {
+        mpCurrentContentElements->push_back(new TagCloseElement("text:p"));
+        mWriterListStates.top().mbListElementParagraphOpened = false;
+    }
+    TagOpenElement *pListLevelOpenElement = new TagOpenElement("text:list");
     _openListLevel(pListLevelOpenElement);
 
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(pListLevelOpenElement));
+    mpCurrentContentElements->push_back(pListLevelOpenElement);
 }
 
 void DocumentCollector::_openListLevel(TagOpenElement *pListLevelOpenElement)
 {
-      if (!mbListElementOpened && miCurrentListLevel > 1)
-      {
-          mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagOpenElement("text:list-item")));
-      }
-    else if (mbListElementParagraphOpened)
+    if (!mWriterListStates.top().mbListElementOpened.empty() &&
+        !mWriterListStates.top().mbListElementOpened.top())
     {
-        mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:p")));
-        mbListElementParagraphOpened = false;
+        mpCurrentContentElements->push_back(new TagOpenElement("text:list-item"));
+        mWriterListStates.top().mbListElementOpened.top() = true;
     }
 
-    if (miCurrentListLevel==1) {
-        pListLevelOpenElement->addAttribute("text:style-name", mpCurrentListStyle->getName());
+    mWriterListStates.top().mbListElementOpened.push(false);
+    if (mWriterListStates.top().mbListElementOpened.size() == 1) {
+        pListLevelOpenElement->addAttribute("text:style-name", mWriterListStates.top().mpCurrentListStyle->getName());
     }
-
-    mbListElementOpened = false;
 }
 
 void DocumentCollector::closeOrderedListLevel()
 {
-    _closeListLevel("ordered-list");
+    _closeListLevel();
 }
 
 void DocumentCollector::closeUnorderedListLevel()
 {
-    _closeListLevel("unordered-list");
+    _closeListLevel();
 }
 
-void DocumentCollector::_closeListLevel(const char *szListType)
+void DocumentCollector::_closeListLevel()
 {
-    if (mbListElementOpened)
-        mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:list-item")));
-
-    miCurrentListLevel--;
+    if (mWriterListStates.top().mbListElementOpened.top())
+    {
+        mpCurrentContentElements->push_back(new TagCloseElement("text:list-item"));
+        mWriterListStates.top().mbListElementOpened.top() = false;
+    }
 
-    WPXString sCloseElement;
-    sCloseElement.sprintf("text:%s", szListType);
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement(sCloseElement.cstr())));
+    mpCurrentContentElements->push_back(new TagCloseElement("text:list"));
 
-    if (miCurrentListLevel > 0)
-        mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:list-item")));
-    mbListElementOpened = false;
+    if (!mWriterListStates.top().mbListElementOpened.empty())
+    {
+        mWriterListStates.top().mbListElementOpened.pop();
+    }
 }
 
 void DocumentCollector::openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops)
 {
-    miLastListLevel = miCurrentListLevel;
-    if (miCurrentListLevel == 1)
-        miLastListNumber++;
+    mWriterListStates.top().miLastListLevel = mWriterListStates.top().miCurrentListLevel;
+    if (mWriterListStates.top().miCurrentListLevel == 1)
+        mWriterListStates.top().miLastListNumber++;
 
-    if (mbListElementOpened)
-        mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:list-item")));
+    if (mWriterListStates.top().mbListElementOpened.top())
+    {
+        mpCurrentContentElements->push_back(new TagCloseElement("text:list-item"));
+        mWriterListStates.top().mbListElementOpened.top() = false;
+    }
 
     ParagraphStyle *pStyle = NULL;
 
     WPXPropertyList *pPersistPropList = new WPXPropertyList(propList);
-    pPersistPropList->insert("style:list-style-name", mpCurrentListStyle->getName());
+    pPersistPropList->insert("style:list-style-name", mWriterListStates.top().mpCurrentListStyle->getName());
     pPersistPropList->insert("style:parent-style-name", "Standard");
 
         WPXString sKey = getParagraphStyleKey(*pPersistPropList, tabStops);
@@ -727,17 +814,18 @@ void DocumentCollector::openListElement(const WPXPropertyList &propList, const W
                 delete pPersistPropList;
         }
 
-    TagOpenElement *pOpenListElement = new TagOpenElement("text:list-item");
-    TagOpenElement *pOpenListElementParagraph = new TagOpenElement("text:p");
+    mpCurrentContentElements->push_back(new TagOpenElement("text:list-item"));
 
+    TagOpenElement *pOpenListElementParagraph = new TagOpenElement("text:p");
     pOpenListElementParagraph->addAttribute("text:style-name", pStyle->getName());
+    mpCurrentContentElements->push_back(pOpenListElementParagraph);
 
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(pOpenListElement));
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(pOpenListElementParagraph));
+    if (mpCurrentContentElements == &mBodyElements)
+        mWriterDocumentStates.top().mbFirstParagraphInPageSpan = false;
 
-    mbListElementOpened = true;
-    mbListElementParagraphOpened = true;
-    mbListContinueNumbering = false;
+    mWriterListStates.top().mbListElementOpened.top() = true;
+    mWriterListStates.top().mbListElementParagraphOpened = true;
+    mWriterListStates.top().mbListContinueNumbering = false;
 }
 
 void DocumentCollector::closeListElement()
@@ -746,69 +834,100 @@ void DocumentCollector::closeListElement()
     // could contain another list level in OOo's implementation of lists). that is done in the closeListLevel
     // code (or when we open another list element)
 
-    if (mbListElementParagraphOpened)
+    if (mWriterListStates.top().mbListElementParagraphOpened)
     {
-        mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:p")));
-        mbListElementParagraphOpened = false;
+        mpCurrentContentElements->push_back(new TagCloseElement("text:p"));
+        mWriterListStates.top().mbListElementParagraphOpened = false;
     }
 }
 
 void DocumentCollector::openFootnote(const WPXPropertyList &propList)
 {
-    TagOpenElement *pOpenFootNote = new TagOpenElement("text:footnote");
+    mWriterListStates.push(WriterListState());
+    TagOpenElement *pOpenFootNote = new TagOpenElement("text:note");
+    pOpenFootNote->addAttribute("text:note-class", "footnote");
     if (propList["libwpd:number"])
     {
         WPXString tmpString("ftn");
         tmpString.append(propList["libwpd:number"]->getStr());
         pOpenFootNote->addAttribute("text:id", tmpString);
     }
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(pOpenFootNote));
+    mpCurrentContentElements->push_back(pOpenFootNote);
 
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagOpenElement("text:footnote-citation")));
+    mpCurrentContentElements->push_back(new TagOpenElement("text:note-citation"));
         if (propList["libwpd:number"])
-                mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new CharDataElement(propList["libwpd:number"]->getStr().cstr())));
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:footnote-citation")));
+    mpCurrentContentElements->push_back(new CharDataElement(propList["libwpd:number"]->getStr().cstr()));
+    mpCurrentContentElements->push_back(new TagCloseElement("text:note-citation"));
 
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagOpenElement("text:footnote-body")));
+    mpCurrentContentElements->push_back(new TagOpenElement("text:note-body"));
 
-    mWriterDocumentState.mbInNote = true;
+    mWriterDocumentStates.top().mbInNote = true;
 }
 
 void DocumentCollector::closeFootnote()
 {
-    mWriterDocumentState.mbInNote = false;
+    mWriterDocumentStates.top().mbInNote = false;
+    if (mWriterListStates.size() > 1)
+        mWriterListStates.pop();
 
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:footnote-body")));
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:footnote")));
+    mpCurrentContentElements->push_back(new TagCloseElement("text:note-body"));
+    mpCurrentContentElements->push_back(new TagCloseElement("text:note"));
 }
 
 void DocumentCollector::openEndnote(const WPXPropertyList &propList)
 {
-    TagOpenElement *pOpenEndNote = new TagOpenElement("text:endnote");
+    mWriterListStates.push(WriterListState());
+    TagOpenElement *pOpenEndNote = new TagOpenElement("text:note");
+    pOpenEndNote->addAttribute("text:note-class", "endnote");
     if (propList["libwpd:number"])
     {
         WPXString tmpString("edn");
         tmpString.append(propList["libwpd:number"]->getStr());
         pOpenEndNote->addAttribute("text:id", tmpString);
     }
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(pOpenEndNote));
+    mpCurrentContentElements->push_back(pOpenEndNote);
 
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagOpenElement("text:endnote-citation")));
+    mpCurrentContentElements->push_back(new TagOpenElement("text:note-citation"));
         if (propList["libwpd:number"])
-                mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new CharDataElement(propList["libwpd:number"]->getStr().cstr())));
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:endnote-citation")));
+    mpCurrentContentElements->push_back(new CharDataElement(propList["libwpd:number"]->getStr().cstr()));
+    mpCurrentContentElements->push_back(new TagCloseElement("text:note-citation"));
 
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagOpenElement("text:endnote-body")));
+    mpCurrentContentElements->push_back(new TagOpenElement("text:note-body"));
 
+    mWriterDocumentStates.top().mbInNote = true;
 }
+
 void DocumentCollector::closeEndnote()
 {
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:endnote-body")));
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:endnote")));
+    mWriterDocumentStates.top().mbInNote = false;
+    if (mWriterListStates.size() > 1)
+        mWriterListStates.pop();
+
+    mpCurrentContentElements->push_back(new TagCloseElement("text:note-body"));
+    mpCurrentContentElements->push_back(new TagCloseElement("text:note"));
+}
+
+void DocumentCollector::openComment(const WPXPropertyList & /*propList*/)
+{
+    mWriterListStates.push(WriterListState());
+    mpCurrentContentElements->push_back(new TagOpenElement("office:annotation"));
+
+    mWriterDocumentStates.top().mbInNote = true;
+}
+
+void DocumentCollector::closeComment()
+{
+    mWriterDocumentStates.top().mbInNote = false;
+    if (mWriterListStates.size() > 1)
+        mWriterListStates.pop();
+
+    mpCurrentContentElements->push_back(new TagCloseElement("office:annotation"));
 }
 
 void DocumentCollector::openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns)
 {
+    if (!mWriterDocumentStates.top().mbInNote)
+    {
     WPXString sTableName;
     sTableName.sprintf("Table%i", mTableStyles.size());
 
@@ -817,11 +936,11 @@ void DocumentCollector::openTable(const WPXPropertyList &propList, const WPXProp
         // WLACH_REFACTORING: characterize this behaviour, probably should nip it at the bud within libwpd
     TableStyle *pTableStyle = new TableStyle(propList, columns, sTableName.cstr());
 
-    if (mWriterDocumentState.mbFirstElement && mpCurrentContentElements == &mBodyElements)
+    if (mWriterDocumentStates.top().mbFirstElement && mpCurrentContentElements == &mBodyElements)
     {
-        WPXString sMasterPageName("Page Style 1");
+        WPXString sMasterPageName("Page_Style_1");
         pTableStyle->setMasterPageName(sMasterPageName);
-        mWriterDocumentState.mbFirstElement = false;
+        mWriterDocumentStates.top().mbFirstElement = false;
     }
 
     mTableStyles.push_back(pTableStyle);
@@ -832,7 +951,7 @@ void DocumentCollector::openTable(const WPXPropertyList &propList, const WPXProp
 
     pTableOpenElement->addAttribute("table:name", sTableName.cstr());
     pTableOpenElement->addAttribute("table:style-name", sTableName.cstr());
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(pTableOpenElement));
+    mpCurrentContentElements->push_back(pTableOpenElement);
 
     for (int i=0; i<pTableStyle->getNumColumns(); i++)
         {
@@ -846,13 +965,16 @@ void DocumentCollector::openTable(const WPXPropertyList &propList, const WPXProp
         mpCurrentContentElements->push_back(pTableColumnCloseElement);
     }
 }
+}
 
 void DocumentCollector::openTableRow(const WPXPropertyList &propList)
 {
+    if (!mWriterDocumentStates.top().mbInNote)
+    {
     if (propList["libwpd:is-header-row"] && (propList["libwpd:is-header-row"]->getInt()))
     {
-        mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagOpenElement("table:table-header-rows")));
-        mWriterDocumentState.mbHeaderRow = true;
+        mpCurrentContentElements->push_back(new TagOpenElement("table:table-header-rows"));
+        mWriterDocumentStates.top().mbHeaderRow = true;
     }
 
     WPXString sTableRowStyleName;
@@ -862,21 +984,27 @@ void DocumentCollector::openTableRow(const WPXPropertyList &propList)
 
     TagOpenElement *pTableRowOpenElement = new TagOpenElement("table:table-row");
     pTableRowOpenElement->addAttribute("table:style-name", sTableRowStyleName);
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(pTableRowOpenElement));
+    mpCurrentContentElements->push_back(pTableRowOpenElement);
+    }
 }
 
 void DocumentCollector::closeTableRow()
 {
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("table:table-row")));
-    if (mWriterDocumentState.mbHeaderRow)
+    if (!mWriterDocumentStates.top().mbInNote)
     {
-        mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("table:table-header-rows")));
-        mWriterDocumentState.mbHeaderRow = false;
+        mpCurrentContentElements->push_back(new TagCloseElement("table:table-row"));
+        if (mWriterDocumentStates.top().mbHeaderRow)
+        {
+            mpCurrentContentElements->push_back(new TagCloseElement("table:table-header-rows"));
+            mWriterDocumentStates.top().mbHeaderRow = false;
+        }
     }
 }
 
 void DocumentCollector::openTableCell(const WPXPropertyList &propList)
 {
+    if (!mWriterDocumentStates.top().mbInNote)
+    {
     WPXString sTableCellStyleName;
     sTableCellStyleName.sprintf( "%s.Cell%i", mpCurrentTableStyle->getName().cstr(), mpCurrentTableStyle->getNumTableCellStyles());
     TableCellStyle *pTableCellStyle = new TableCellStyle(propList, sTableCellStyleName.cstr());
@@ -890,39 +1018,72 @@ void DocumentCollector::openTableCell(const WPXPropertyList &propList)
         if (propList["table:number-rows-spanned"])
                 pTableCellOpenElement->addAttribute("table:number-rows-spanned",
                                                     propList["table:number-rows-spanned"]->getStr().cstr());
-    pTableCellOpenElement->addAttribute("table:value-type", "string");
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(pTableCellOpenElement));
+        // pTableCellOpenElement->addAttribute("table:value-type", "string");
+        mpCurrentContentElements->push_back(pTableCellOpenElement);
 
-    mWriterDocumentState.mbTableCellOpened = true;
+        mWriterDocumentStates.top().mbTableCellOpened = true;
+    }
 }
 
 void DocumentCollector::closeTableCell()
 {
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("table:table-cell")));
-    mWriterDocumentState.mbTableCellOpened = false;
+    if (!mWriterDocumentStates.top().mbInNote)
+    {
+        mpCurrentContentElements->push_back(new TagCloseElement("table:table-cell"));
+        mWriterDocumentStates.top().mbTableCellOpened = false;
+    }
 }
 
 void DocumentCollector::insertCoveredTableCell(const WPXPropertyList & /* propList */)
 {
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagOpenElement("table:covered-table-cell")));
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("table:covered-table-cell")));
+    if (!mWriterDocumentStates.top().mbInNote)
+    {
+        mpCurrentContentElements->push_back(new TagOpenElement("table:covered-table-cell"));
+        mpCurrentContentElements->push_back(new TagCloseElement("table:covered-table-cell"));
+    }
 }
 
 void DocumentCollector::closeTable()
 {
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("table:table")));
+    if (!mWriterDocumentStates.top().mbInNote)
+    {
+        mpCurrentContentElements->push_back(new TagCloseElement("table:table"));
+    }
 }
 
+
 void DocumentCollector::insertTab()
 {
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagOpenElement("text:tab-stop")));
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:tab-stop")));
+    mpCurrentContentElements->push_back(new TagOpenElement("text:tab"));
+    mpCurrentContentElements->push_back(new TagCloseElement("text:tab"));
+}
+
+void DocumentCollector::insertSpace()
+{
+    mpCurrentContentElements->push_back(new TagOpenElement("text:s"));
+    mpCurrentContentElements->push_back(new TagCloseElement("text:s"));
 }
 
 void DocumentCollector::insertLineBreak()
 {
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagOpenElement("text:line-break")));
-    mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:line-break")));
+    mpCurrentContentElements->push_back(new TagOpenElement("text:line-break"));
+    mpCurrentContentElements->push_back(new TagCloseElement("text:line-break"));
+}
+
+void DocumentCollector::insertField(const WPXString &type, const WPXPropertyList &propList)
+{
+    if (!type.len())
+        return;
+
+    TagOpenElement *openElement = new TagOpenElement(type.cstr());
+    if (type == "text:page-number")
+        openElement->addAttribute("text:select-page", "current");
+
+    if (propList["style:num-format"])
+        openElement->addAttribute("style:num-format", propList["style:num-format"]->getStr());
+
+    mpCurrentContentElements->push_back(openElement);
+    mpCurrentContentElements->push_back(new TagCloseElement(type.cstr()));
 }
 
 void DocumentCollector::insertText(const WPXString &text)
@@ -931,4 +1092,221 @@ void DocumentCollector::insertText(const WPXString &text)
     mpCurrentContentElements->push_back(pText);
 }
 
+void DocumentCollector::openFrame(const WPXPropertyList &propList)
+{
+    mWriterListStates.push(WriterListState());
+
+    // First, let's create a Frame Style for this box
+    TagOpenElement *frameStyleOpenElement = new TagOpenElement("style:style");
+    WPXString frameStyleName;
+    frameStyleName.sprintf("GraphicFrame_%i", miObjectNumber);
+    frameStyleOpenElement->addAttribute("style:name", frameStyleName);
+    frameStyleOpenElement->addAttribute("style:family", "graphic");
+
+    mFrameStyles.push_back(frameStyleOpenElement);
+
+    TagOpenElement *frameStylePropertiesOpenElement = new TagOpenElement("style:graphic-properties");
+
+    if (propList["text:anchor-type"])
+        frameStylePropertiesOpenElement->addAttribute("text:anchor-type", propList["text:anchor-type"]->getStr());
+    else
+        frameStylePropertiesOpenElement->addAttribute("text:anchor-type","paragraph");
+
+    if (propList["text:anchor-page-number"])
+        frameStylePropertiesOpenElement->addAttribute("text:anchor-page-number", propList["text:anchor-page-number"]->getStr());
+
+    if (propList["svg:x"])
+        frameStylePropertiesOpenElement->addAttribute("svg:x", propList["svg:x"]->getStr());
+
+    if (propList["svg:y"])
+        frameStylePropertiesOpenElement->addAttribute("svg:y", propList["svg:y"]->getStr());
+
+    if (propList["svg:width"])
+        frameStylePropertiesOpenElement->addAttribute("svg:width", propList["svg:width"]->getStr());
+
+    if (propList["svg:height"])
+        frameStylePropertiesOpenElement->addAttribute("svg:height", propList["svg:height"]->getStr());
+
+    if (propList["style:rel-width"])
+        frameStylePropertiesOpenElement->addAttribute("style:rel-width", propList["style:rel-width"]->getStr());
+
+    if (propList["style:rel-height"])
+        frameStylePropertiesOpenElement->addAttribute("style:rel-height", propList["style:rel-height"]->getStr());
+
+    if (propList["fo:max-width"])
+        frameStylePropertiesOpenElement->addAttribute("fo:max-width", propList["fo:max-width"]->getStr());
+
+    if (propList["fo:max-height"])
+        frameStylePropertiesOpenElement->addAttribute("fo:max-height", propList["fo:max-height"]->getStr());
+
+    if (propList["style:wrap"])
+        frameStylePropertiesOpenElement->addAttribute("style:wrap", propList["style:wrap"]->getStr());
+
+    mFrameStyles.push_back(frameStylePropertiesOpenElement);
+
+    mFrameStyles.push_back(new TagCloseElement("style:graphic-properties"));
+
+    mFrameStyles.push_back(new TagCloseElement("style:style"));
+
+    // Now, let's create an automatic style for this frame
+    TagOpenElement *frameAutomaticStyleElement = new TagOpenElement("style:style");
+    WPXString frameAutomaticStyleName;
+    frameAutomaticStyleName.sprintf("fr%i", miObjectNumber);
+    frameAutomaticStyleElement->addAttribute("style:name", frameAutomaticStyleName);
+    frameAutomaticStyleElement->addAttribute("style:family", "graphic");
+    frameAutomaticStyleElement->addAttribute("style:parent-style-name", frameStyleName);
+
+    mFrameAutomaticStyles.push_back(frameAutomaticStyleElement);
+
+    TagOpenElement *frameAutomaticStylePropertiesElement = new TagOpenElement("style:graphic-properties");
+    if (propList["style:horizontal-pos"])
+        frameAutomaticStylePropertiesElement->addAttribute("style:horizontal-pos", propList["style:horizontal-pos"]->getStr());
+    else
+        frameAutomaticStylePropertiesElement->addAttribute("style:horizontal-pos", "left");
+
+    if (propList["style:horizontal-rel"])
+        frameAutomaticStylePropertiesElement->addAttribute("style:horizontal-rel", propList["style:horizontal-rel"]->getStr());
+    else
+        frameAutomaticStylePropertiesElement->addAttribute("style:horizontal-rel", "paragraph");
+
+    if (propList["style:vertical-pos"])
+        frameAutomaticStylePropertiesElement->addAttribute("style:vertical-pos", propList["style:vertical-pos"]->getStr());
+    else
+        frameAutomaticStylePropertiesElement->addAttribute("style:vertical-pos", "top");
+
+    if (propList["style:vertical-rel"])
+        frameAutomaticStylePropertiesElement->addAttribute("style:vertical-rel", propList["style:vertical-rel"]->getStr());
+    else
+        frameAutomaticStylePropertiesElement->addAttribute("style:vertical-rel", "page-content");
+
+    if (propList["fo:max-width"])
+        frameAutomaticStylePropertiesElement->addAttribute("fo:max-width", propList["fo:max-width"]->getStr());
+
+    if (propList["fo:max-height"])
+        frameAutomaticStylePropertiesElement->addAttribute("fo:max-height", propList["fo:max-height"]->getStr());
+
+    frameAutomaticStylePropertiesElement->addAttribute("draw:ole-draw-aspect", "1");
+
+    mFrameAutomaticStyles.push_back(frameAutomaticStylePropertiesElement);
+
+    mFrameAutomaticStyles.push_back(new TagCloseElement("style:graphic-properties"));
+
+    mFrameAutomaticStyles.push_back(new TagCloseElement("style:style"));
+
+    // And write the frame itself
+    TagOpenElement *drawFrameOpenElement = new TagOpenElement("draw:frame");
+
+    drawFrameOpenElement->addAttribute("draw:style-name", frameAutomaticStyleName);
+    WPXString objectName;
+    objectName.sprintf("Object%i", miObjectNumber++);
+    drawFrameOpenElement->addAttribute("draw:name", objectName);
+    if (propList["text:anchor-type"])
+        drawFrameOpenElement->addAttribute("text:anchor-type", propList["text:anchor-type"]->getStr());
+    else
+        drawFrameOpenElement->addAttribute("text:anchor-type","paragraph");
+
+    if (propList["text:anchor-page-number"])
+        drawFrameOpenElement->addAttribute("text:anchor-page-number", propList["text:anchor-page-number"]->getStr());
+
+    if (propList["svg:x"])
+        drawFrameOpenElement->addAttribute("svg:x", propList["svg:x"]->getStr());
+
+    if (propList["svg:y"])
+        drawFrameOpenElement->addAttribute("svg:y", propList["svg:y"]->getStr());
+
+    if (propList["svg:width"])
+        drawFrameOpenElement->addAttribute("svg:width", propList["svg:width"]->getStr());
+
+    if (propList["svg:height"])
+        drawFrameOpenElement->addAttribute("svg:height", propList["svg:height"]->getStr());
+
+    if (propList["style:rel-width"])
+        drawFrameOpenElement->addAttribute("style:rel-width", propList["style:rel-width"]->getStr());
+
+    if (propList["style:rel-height"])
+        drawFrameOpenElement->addAttribute("style:rel-height", propList["style:rel-height"]->getStr());
+
+    mpCurrentContentElements->push_back(drawFrameOpenElement);
+
+    mWriterDocumentStates.top().mbInFrame = true;
+}
+
+void DocumentCollector::closeFrame()
+{
+    if (mWriterListStates.size() > 1)
+        mWriterListStates.pop();
+
+    mpCurrentContentElements->push_back(new TagCloseElement("draw:frame"));
+
+    mWriterDocumentStates.top().mbInFrame = false;
+}
+
+void DocumentCollector::insertBinaryObject(const WPXPropertyList &propList, const WPXBinaryData &data)
+{
+    if (!data.size())
+        return;
+    if (!mWriterDocumentStates.top().mbInFrame) // Embedded objects without a frame simply don't make sense for us
+        return;
+    if (!propList["libwpd:mimetype"])
+        return;
+
+    if (propList["libwpd:mimetype"]->getStr() == "image/x-wpg")
+    {
+        std::vector<DocumentElement *> tmpContentElements;
+        InternalHandler tmpHandler(&tmpContentElements);
+        OdgExporter exporter(&tmpHandler);
+
+        libwpg::WPGFileFormat fileFormat = libwpg::WPG_AUTODETECT;
+
+        if (!libwpg::WPGraphics::isSupported(const_cast<WPXInputStream *>(data.getDataStream())))
+            fileFormat = libwpg::WPG_WPG1;
+
+        if (libwpg::WPGraphics::parse(const_cast<WPXInputStream *>(data.getDataStream()), &exporter, fileFormat) && !tmpContentElements.empty())
+        {
+            mpCurrentContentElements->push_back(new TagOpenElement("draw:object"));
+            for (std::vector<DocumentElement *>::const_iterator iter = tmpContentElements.begin(); iter != tmpContentElements.end(); ++iter)
+                mpCurrentContentElements->push_back(*iter);
+            mpCurrentContentElements->push_back(new TagCloseElement("draw:object"));
+        }
+    }
+    else
+    {
+        mpCurrentContentElements->push_back(new TagOpenElement("draw:image"));
+
+        mpCurrentContentElements->push_back(new TagOpenElement("office:binary-data"));
+
+        WPXString binaryBase64Data = data.getBase64Data();
+
+        mpCurrentContentElements->push_back(new CharDataElement(binaryBase64Data.cstr()));
+
+        mpCurrentContentElements->push_back(new TagCloseElement("office:binary-data"));
+
+        mpCurrentContentElements->push_back(new TagCloseElement("draw:image"));
+    }
+}
+
+void DocumentCollector::openTextBox(const WPXPropertyList & /*propList*/)
+{
+    if (!mWriterDocumentStates.top().mbInFrame) // Text box without a frame simply doesn't make sense for us
+        return;
+    mWriterListStates.push(WriterListState());
+    mWriterDocumentStates.push(WriterDocumentState());
+    mpCurrentContentElements->push_back(new TagOpenElement("draw:text-box"));
+    mWriterDocumentStates.top().mbInTextBox = true;
+    mWriterDocumentStates.top().mbFirstElement = false;
+}
+
+void DocumentCollector::closeTextBox()
+{
+    if (!mWriterDocumentStates.top().mbInTextBox)
+        return;
+    if (mWriterListStates.size() > 1)
+        mWriterListStates.pop();
+    if (mWriterDocumentStates.size() > 1)
+        mWriterDocumentStates.pop();
+
+    mpCurrentContentElements->push_back(new TagCloseElement("draw:text-box"));
+}
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/filter/DocumentCollector.hxx b/writerperfect/source/filter/DocumentCollector.hxx
index 218cc686a3bf..619bc1de603d 100644
--- a/writerperfect/source/filter/DocumentCollector.hxx
+++ b/writerperfect/source/filter/DocumentCollector.hxx
@@ -46,8 +46,9 @@
 #include <stack>
 #include <string.h>
 
+#include "DocumentHandlerInterface.hxx"
+
 class DocumentElement;
-class DocumentHandler;
 class TagOpenElement;
 class FontStyle;
 class ListStyle;
@@ -64,11 +65,29 @@ struct _WriterDocumentState
     _WriterDocumentState();
 
     bool mbFirstElement;
+    bool mbFirstParagraphInPageSpan;
     bool mbInFakeSection;
     bool mbListElementOpenedAtCurrentLevel;
     bool mbTableCellOpened;
     bool mbHeaderRow;
     bool mbInNote;
+    bool mbInTextBox;
+    bool mbInFrame;
+};
+
+// list state
+typedef struct _WriterListState WriterListState;
+struct _WriterListState
+{
+    _WriterListState();
+
+    ListStyle *mpCurrentListStyle;
+    unsigned int miCurrentListLevel;
+    unsigned int miLastListLevel;
+    unsigned int miLastListNumber;
+    bool mbListContinueNumbering;
+    bool mbListElementParagraphOpened;
+    std::stack<bool> mbListElementOpened;
 };
 
 enum WriterListType { unordered, ordered };
@@ -81,20 +100,23 @@ struct ltstr
   }
 };
 
-class DocumentCollector : public WPXHLListenerImpl
+class DocumentCollector : public WPXDocumentInterface
 {
 public:
-    DocumentCollector(WPSInputStream *pInput, DocumentHandler *pHandler);
+    DocumentCollector(WPXInputStream *pInput, DocumentHandlerInterface *pHandler);
     virtual ~DocumentCollector();
     bool filter();
 
-     virtual void setDocumentMetaData(const WPXPropertyList & /* propList */) {}
+    // WPXDocumentInterface's callbacks
+    virtual void setDocumentMetaData(const WPXPropertyList &propList);
     virtual void startDocument() {}
     virtual void endDocument() {}
 
+    virtual void definePageStyle(const WPXPropertyList&) {}
     virtual void openPageSpan(const WPXPropertyList &propList);
     virtual void closePageSpan() {}
 
+    virtual void defineSectionStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
     virtual void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns);
     virtual void closeSection();
 
@@ -103,16 +125,19 @@ public:
     virtual void openFooter(const WPXPropertyList &propList);
     virtual void closeFooter();
 
+    virtual void defineParagraphStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
     virtual void openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops);
     virtual void closeParagraph();
 
+    virtual void defineCharacterStyle(const WPXPropertyList&) {}
     virtual void openSpan(const WPXPropertyList &propList);
     virtual void closeSpan();
 
-
     virtual void insertTab();
+    virtual void insertSpace();
     virtual void insertText(const WPXString &text);
      virtual void insertLineBreak();
+    virtual void insertField(const WPXString &type, const WPXPropertyList &propList);
 
     virtual void defineOrderedListLevel(const WPXPropertyList &propList);
     virtual void defineUnorderedListLevel(const WPXPropertyList &propList);
@@ -127,6 +152,10 @@ public:
     virtual void closeFootnote();
     virtual void openEndnote(const WPXPropertyList &propList);
     virtual void closeEndnote();
+    virtual void openComment(const WPXPropertyList &propList);
+    virtual void closeComment();
+    virtual void openTextBox(const WPXPropertyList &propList);
+    virtual void closeTextBox();
 
      virtual void openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns);
      virtual void openTableRow(const WPXPropertyList &propList);
@@ -135,25 +164,34 @@ public:
     virtual void closeTableCell();
     virtual void insertCoveredTableCell(const WPXPropertyList &propList);
      virtual void closeTable();
-    virtual bool parseSourceDocument(WPSInputStream &input) = 0;
+
+    virtual void openFrame(const WPXPropertyList & propList);
+    virtual void closeFrame();
+
+    virtual void insertBinaryObject(const WPXPropertyList &propList, const WPXBinaryData &data);
+    virtual void insertEquation(const WPXPropertyList & /* propList */, const WPXString & /* data */) {}
+
+    virtual bool parseSourceDocument(WPXInputStream &input) = 0;
 
 protected:
     void _resetDocumentState();
-    bool _writeTargetDocument(DocumentHandler *pHandler);
-    void _writeDefaultStyles(DocumentHandler *pHandler);
-    void _writeMasterPages(DocumentHandler *pHandler);
-    void _writePageMasters(DocumentHandler *pHandler);
+    bool _writeTargetDocument(DocumentHandlerInterface *pHandler);
+    void _writeDefaultStyles(DocumentHandlerInterface *pHandler);
+    void _writeMasterPages(DocumentHandlerInterface *pHandler);
+    void _writePageLayouts(DocumentHandlerInterface *pHandler);
     void _allocateFontName(const WPXString &);
 
 private:
     void _openListLevel(TagOpenElement *pListLevelOpenElement);
-    void _closeListLevel(const char *szListType);
+    void _closeListLevel();
 
-        WPSInputStream *mpInput;
-        DocumentHandler *mpHandler;
+    WPXInputStream *mpInput;
+    DocumentHandlerInterface *mpHandler;
     bool mbUsed; // whether or not it has been before (you can only use me once!)
 
-    WriterDocumentState mWriterDocumentState;
+    std::stack<WriterDocumentState> mWriterDocumentStates;
+
+    std::stack<WriterListState> mWriterListStates;
 
     // paragraph styles
     std::map<WPXString, ParagraphStyle *, ltstr> mTextStyleHash;
@@ -171,6 +209,14 @@ private:
     // table styles
     std::vector<TableStyle *> mTableStyles;
 
+    // frame styles
+    std::vector<DocumentElement *> mFrameStyles;
+
+    std::vector<DocumentElement *> mFrameAutomaticStyles;
+
+    // metadata
+    std::vector<DocumentElement *> mMetaData;
+
     // list styles
     unsigned int miNumListStyles;
 
@@ -186,18 +232,18 @@ private:
     PageSpan *mpCurrentPageSpan;
     int miNumPageStyles;
 
-    // list styles / state
-    ListStyle *mpCurrentListStyle;
-    unsigned int miCurrentListLevel;
-    unsigned int miLastListLevel;
-    unsigned int miLastListNumber;
+    // list styles
     std::vector<ListStyle *> mListStyles;
-    bool mbListContinueNumbering;
-    bool mbListElementOpened;
-    bool mbListElementParagraphOpened;
+
+    // object state
+    unsigned miObjectNumber;
 
     // table state
     TableStyle *mpCurrentTableStyle;
+
+    const bool mbIsFlatXML;
+
+    const char * mpPassword;
 };
 
 #endif
diff --git a/writerperfect/source/filter/DocumentElement.cxx b/writerperfect/source/filter/DocumentElement.cxx
index 2a92d488ec43..f330ab0ace47 100644
--- a/writerperfect/source/filter/DocumentElement.cxx
+++ b/writerperfect/source/filter/DocumentElement.cxx
@@ -27,6 +27,7 @@
  */
 
 #include "DocumentElement.hxx"
+#include "DocumentHandler.hxx"
 #include "FilterInternal.hxx"
 #include <string.h>
 
@@ -37,7 +38,7 @@ void TagElement::print() const
     WRITER_DEBUG_MSG(("%s\n", msTagName.cstr()));
 }
 
-void TagOpenElement::write(DocumentHandler *pHandler) const
+void TagOpenElement::write(DocumentHandlerInterface *pHandler) const
 {
     pHandler->startElement(getTagName().cstr(), maAttrList);
 }
@@ -52,14 +53,14 @@ void TagOpenElement::addAttribute(const char *szAttributeName, const WPXString &
         maAttrList.insert(szAttributeName, sAttributeValue);
 }
 
-void TagCloseElement::write(DocumentHandler *pHandler) const
+void TagCloseElement::write(DocumentHandlerInterface *pHandler) const
 {
     WRITER_DEBUG_MSG(("TagCloseElement: write (%s)\n", getTagName().cstr()));
 
     pHandler->endElement(getTagName().cstr());
 }
 
-void CharDataElement::write(DocumentHandler *pHandler) const
+void CharDataElement::write(DocumentHandlerInterface *pHandler) const
 {
     WRITER_DEBUG_MSG(("TextElement: write\n"));
     pHandler->characters(msData);
@@ -72,8 +73,10 @@ TextElement::TextElement(const WPXString & sTextBuf) :
 
 // write: writes a text run, appropriately converting spaces to <text:s>
 // elements
-void TextElement::write(DocumentHandler *pHandler) const
+void TextElement::write(DocumentHandlerInterface *pHandler) const
 {
+    if (msTextBuf.len() <= 0)
+        return;
     WPXPropertyList xBlankAttrList;
 
     WPXString sTemp;
diff --git a/writerperfect/source/filter/DocumentElement.hxx b/writerperfect/source/filter/DocumentElement.hxx
index 3481359278c2..cb84777a278a 100644
--- a/writerperfect/source/filter/DocumentElement.hxx
+++ b/writerperfect/source/filter/DocumentElement.hxx
@@ -28,30 +28,25 @@
 
 #ifndef _DOCUMENTELEMENT_H
 #define _DOCUMENTELEMENT_H
-#if defined _MSC_VER
-#pragma warning( push, 1 )
-#endif
 #include <libwpd/libwpd.h>
 #include <libwpd/WPXProperty.h>
 #include <libwpd/WPXString.h>
-#if defined _MSC_VER
-#pragma warning( pop )
-#endif
 #include <vector>
 
-#include "DocumentHandler.hxx"
+#include "DocumentHandlerInterface.hxx"
 
 class DocumentElement
 {
 public:
     virtual ~DocumentElement() {}
-    virtual void write(DocumentHandler *pHandler) const = 0;
+    virtual void write(DocumentHandlerInterface *pHandler) const = 0;
     virtual void print() const {}
 };
 
 class TagElement : public DocumentElement
 {
 public:
+    virtual ~TagElement() {}
     TagElement(const char *szTagName) : msTagName(szTagName) {}
     const WPXString & getTagName() const { return msTagName; }
     virtual void print() const;
@@ -63,9 +58,9 @@ class TagOpenElement : public TagElement
 {
 public:
     TagOpenElement(const char *szTagName) : TagElement(szTagName) {}
-    ~TagOpenElement() {}
+    virtual ~TagOpenElement() {}
     void addAttribute(const char *szAttributeName, const WPXString &sAttributeValue);
-    virtual void write(DocumentHandler *pHandler) const;
+    virtual void write(DocumentHandlerInterface *pHandler) const;
     virtual void print () const;
 private:
     WPXPropertyList maAttrList;
@@ -75,14 +70,16 @@ class TagCloseElement : public TagElement
 {
 public:
     TagCloseElement(const char *szTagName) : TagElement(szTagName) {}
-    virtual void write(DocumentHandler *pHandler) const;
+    virtual ~TagCloseElement() {}
+    virtual void write(DocumentHandlerInterface *pHandler) const;
 };
 
 class CharDataElement : public DocumentElement
 {
 public:
     CharDataElement(const char *sData) : DocumentElement(), msData(sData) {}
-    virtual void write(DocumentHandler *pHandler) const;
+    virtual ~CharDataElement() {}
+    virtual void write(DocumentHandlerInterface *pHandler) const;
 private:
     WPXString msData;
 };
@@ -91,7 +88,8 @@ class TextElement : public DocumentElement
 {
 public:
     TextElement(const WPXString & sTextBuf);
-    virtual void write(DocumentHandler *pHandler) const;
+    virtual ~TextElement() {}
+    virtual void write(DocumentHandlerInterface *pHandler) const;
 
 private:
     WPXString msTextBuf;
diff --git a/writerperfect/source/filter/DocumentHandler.cxx b/writerperfect/source/filter/DocumentHandler.cxx
index 8d4cc9b820a7..c61ffc0c19c5 100644
--- a/writerperfect/source/filter/DocumentHandler.cxx
+++ b/writerperfect/source/filter/DocumentHandler.cxx
@@ -29,6 +29,8 @@
 
 #include <xmloff/attrlist.hxx>
 
+// #define DEBUG_XML 1
+
 using namespace ::rtl;
 using rtl::OUString;
 
@@ -41,19 +43,19 @@ DocumentHandler::DocumentHandler(Reference < XDocumentHandler > &xHandler) :
 
 void DocumentHandler::startDocument()
 {
-    WRITER_DEBUG_MSG(("DocumentHandler::startDocument\n"));
     mxHandler->startDocument();
 }
 
 void DocumentHandler::endDocument()
 {
-    WRITER_DEBUG_MSG(("DocumentHandler::endDocument\n"));
     mxHandler->endDocument();
 }
 
 void DocumentHandler::startElement(const char *psName, const WPXPropertyList &xPropList)
 {
-    WRITER_DEBUG_MSG(("DocumentHandler::startElement\n"));
+#ifdef DEBUG_XML
+    printf("<%s", psName);
+#endif
         SvXMLAttributeList *pAttrList = new SvXMLAttributeList();
     Reference < XAttributeList > xAttrList(pAttrList);
     WPXPropertyList::Iter i(xPropList);
@@ -61,23 +63,36 @@ void DocumentHandler::startElement(const char *psName, const WPXPropertyList &xP
     {
                 // filter out libwpd elements
                 if (strncmp(i.key(), "libwpd", 6) != 0)
+        {
                         pAttrList->AddAttribute(OUString::createFromAscii(i.key()),
                                                 OUString::createFromAscii(i()->getStr().cstr()));
+#ifdef DEBUG_XML
+            printf(" %s=\"%s\"", i.key(), i()->getStr().cstr());
+#endif
+        }
         }
+#ifdef DEBUG_XML
+    printf(">");
+#endif
 
         mxHandler->startElement(OUString::createFromAscii(psName), xAttrList);
 }
 
 void DocumentHandler::endElement(const char *psName)
 {
-    WRITER_DEBUG_MSG(("DocumentHandler::endElement\n"));
+#ifdef DEBUG_XML
+    printf("</%s>", psName);
+#endif
         mxHandler->endElement(OUString::createFromAscii(psName));
 }
 
 void DocumentHandler::characters(const WPXString &sCharacters)
 {
-    WRITER_DEBUG_MSG(("DocumentHandler::characters\n"));
         OUString sCharU16(sCharacters.cstr(), strlen(sCharacters.cstr()), RTL_TEXTENCODING_UTF8);
+#ifdef DEBUG_XML
+    WPXString sEscapedCharacters(sCharacters, true);
+    printf("%s", sEscapedCharacters.cstr());
+#endif
         mxHandler->characters(sCharU16);
 }
 
diff --git a/writerperfect/source/filter/DocumentHandler.hxx b/writerperfect/source/filter/DocumentHandler.hxx
index 82a82132fec8..249f64ff4e7b 100644
--- a/writerperfect/source/filter/DocumentHandler.hxx
+++ b/writerperfect/source/filter/DocumentHandler.hxx
@@ -12,10 +12,12 @@
 #pragma warning( pop )
 #endif
 
+#include "DocumentHandlerInterface.hxx"
+
 using com::sun::star::uno::Reference;
 using com::sun::star::xml::sax::XDocumentHandler;
 
-class DocumentHandler
+class DocumentHandler: public DocumentHandlerInterface
 {
 public:
         DocumentHandler(Reference < XDocumentHandler > &xHandler);
diff --git a/writerperfect/source/filter/DocumentHandlerInterface.hxx b/writerperfect/source/filter/DocumentHandlerInterface.hxx
new file mode 100644
index 000000000000..73ced7d39650
--- /dev/null
+++ b/writerperfect/source/filter/DocumentHandlerInterface.hxx
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2004 William Lachance (wlach@interlog.com)
+ * Copyright (C) 2004 Net Integration Technologies (http://www.net-itech.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ *  Contributor(s): Martin Gallwey (gallwey@sun.com)
+ *
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+#ifndef _DOCUMENTHANDLERINTERFACE_H
+#define _DOCUMENTHANDLERINTERFACE_H
+#include <libwpd/libwpd.h>
+#include <libwpd/WPXProperty.h>
+#include <libwpd/WPXString.h>
+
+class DocumentHandlerInterface
+{
+public:
+    DocumentHandlerInterface() {};
+    virtual ~DocumentHandlerInterface() {};
+
+        virtual void startDocument() = 0;
+        virtual void endDocument() = 0;
+        virtual void startElement(const char *psName, const WPXPropertyList &xPropList) = 0;
+        virtual void endElement(const char *psName) = 0;
+        virtual void characters(const WPXString &sCharacters) = 0;
+};
+#endif
diff --git a/writerperfect/source/filter/FilterInternal.hxx b/writerperfect/source/filter/FilterInternal.hxx
index 1275f7d13091..c53e83ec5d35 100644
--- a/writerperfect/source/filter/FilterInternal.hxx
+++ b/writerperfect/source/filter/FilterInternal.hxx
@@ -20,6 +20,10 @@
  * For further information visit http://libwpd.sourceforge.net
  *
  */
+
+#ifndef _FILTERINTERNAL_HXX
+#define _FILTERINTERNAL_HXX
+
 #include <stdio.h>
 #ifdef DEBUG
 #define WRITER_DEBUG_MSG(M) printf M
@@ -31,4 +35,6 @@ const float fDefaultSideMargin = 1.0f; // inches
 const float fDefaultPageWidth = 8.5f; // inches (OOo required default: we will handle this later)
 const float fDefaultPageHeight = 11.0f; // inches
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/filter/FontStyle.cxx b/writerperfect/source/filter/FontStyle.cxx
index 69195f0f41c0..e15c6651edd9 100644
--- a/writerperfect/source/filter/FontStyle.cxx
+++ b/writerperfect/source/filter/FontStyle.cxx
@@ -30,7 +30,7 @@
 #include "DocumentElement.hxx"
 
 FontStyle::FontStyle(const char *psName, const char *psFontFamily) : Style(psName),
-    msFontFamily(psFontFamily),
+    msFontFamily(psFontFamily, true),
     msFontPitch(IMP_DEFAULT_FONT_PITCH)
 {
 }
@@ -39,14 +39,14 @@ FontStyle::~FontStyle()
 {
 }
 
-void FontStyle::write(DocumentHandler *pHandler) const
+void FontStyle::write(DocumentHandlerInterface *pHandler) const
 {
-    TagOpenElement styleOpen("style:font-decl");
+    TagOpenElement styleOpen("style:font-face");
     styleOpen.addAttribute("style:name", getName());
-    styleOpen.addAttribute("fo:font-family", msFontFamily);
-    styleOpen.addAttribute("style:font-pitch", msFontPitch);
+    styleOpen.addAttribute("svg:font-family", msFontFamily);
+//    styleOpen.addAttribute("style:font-pitch", msFontPitch);
     styleOpen.write(pHandler);
-    TagCloseElement styleClose("style:font-decl");
+    TagCloseElement styleClose("style:font-face");
     styleClose.write(pHandler);
 }
 
diff --git a/writerperfect/source/filter/FontStyle.hxx b/writerperfect/source/filter/FontStyle.hxx
index 8d16b13c41ba..aec430dbd43e 100644
--- a/writerperfect/source/filter/FontStyle.hxx
+++ b/writerperfect/source/filter/FontStyle.hxx
@@ -27,23 +27,18 @@
  */
 #ifndef _FONTSTYLE_H
 #define _FONTSTYLE_H
-#if defined _MSC_VER
-#pragma warning( push, 1 )
-#endif
 #include <libwpd/libwpd.h>
-#if defined _MSC_VER
-#pragma warning( pop )
-#endif
 
 #include "Style.hxx"
 #include "WriterProperties.hxx"
+#include "DocumentHandlerInterface.hxx"
 
 class FontStyle : public Style
 {
 public:
     FontStyle(const char *psName, const char *psFontFamily);
     ~FontStyle();
-    virtual void write(DocumentHandler *pHandler) const;
+    virtual void write(DocumentHandlerInterface *pHandler) const;
     const WPXString &getFontFamily() const { return msFontFamily; }
 
 private:
diff --git a/writerperfect/source/filter/GraphicsStyle.cxx b/writerperfect/source/filter/GraphicsStyle.cxx
new file mode 100644
index 000000000000..4067f55baf46
--- /dev/null
+++ b/writerperfect/source/filter/GraphicsStyle.cxx
@@ -0,0 +1,40 @@
+/* GraphicsStyle:
+ *
+ * Copyright (C) 2007 Fridrich Strba .strba@bluewin.ch)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ * For further information visit http://libwpd.sourceforge.net
+ *
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+#include "GraphicsStyle.hxx"
+#include "WriterProperties.hxx"
+#include "DocumentElement.hxx"
+
+GraphicsStyle::GraphicsStyle(const char *psName) : Style(psName)
+{
+}
+
+GraphicsStyle::~GraphicsStyle()
+{
+}
+
+void GraphicsStyle::write(DocumentHandlerInterface * /* pHandler */) const
+{
+}
diff --git a/writerperfect/source/filter/GraphicsStyle.hxx b/writerperfect/source/filter/GraphicsStyle.hxx
new file mode 100644
index 000000000000..b6ee0c66da88
--- /dev/null
+++ b/writerperfect/source/filter/GraphicsStyle.hxx
@@ -0,0 +1,40 @@
+/* GraphicsStyle:
+ *
+ * Copyright (C) 2007 Fridrich Strba .strba@bluewin.ch)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ * For further information visit http://libwpd.sourceforge.net
+ *
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+#ifndef _GRAPHICSSTYLE_H
+#define _GRAPHICSSTYLE_H
+
+#include "Style.hxx"
+#include "WriterProperties.hxx"
+#include "DocumentHandlerInterface.hxx"
+
+class GraphicsStyle : public Style
+{
+public:
+    GraphicsStyle(const char *psName);
+    ~GraphicsStyle();
+    virtual void write(DocumentHandlerInterface *pHandler) const;
+};
+#endif
diff --git a/writerperfect/source/filter/InternalHandler.cxx b/writerperfect/source/filter/InternalHandler.cxx
new file mode 100644
index 000000000000..82479bd2221a
--- /dev/null
+++ b/writerperfect/source/filter/InternalHandler.cxx
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2007 Fridrich Strba .strba@bluewin.ch)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
+#include "InternalHandler.hxx"
+
+#include <string.h>
+
+InternalHandler::InternalHandler(std::vector<DocumentElement *> *elements):
+    mpElements(elements)
+{
+}
+
+void InternalHandler::startElement(const char *psName, const WPXPropertyList &xPropList)
+{
+    TagOpenElement    *element = new TagOpenElement(psName);
+    WPXPropertyList::Iter i(xPropList);
+    for (i.rewind(); i.next(); )
+    {
+        // filter out libwpd elements
+        if (strncmp(i.key(), "libwpd", 6) != 0)
+            element->addAttribute(i.key(), i()->getStr());
+    }
+    mpElements->push_back(element);
+}
+
+void InternalHandler::endElement(const char *psName)
+{
+    mpElements->push_back(new TagCloseElement(psName));
+}
+
+void InternalHandler::characters(const WPXString &sCharacters)
+{
+    mpElements->push_back(new CharDataElement(sCharacters.cstr()));
+}
diff --git a/writerperfect/source/filter/InternalHandler.hxx b/writerperfect/source/filter/InternalHandler.hxx
new file mode 100644
index 000000000000..9913ac803652
--- /dev/null
+++ b/writerperfect/source/filter/InternalHandler.hxx
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2007 Fridrich Strba .strba@bluewin.ch)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
+#ifndef _INTERNALHANDLER_H
+#define _INTERNALHANDLER_H
+#include <libwpd/libwpd.h>
+#include <libwpd/WPXProperty.h>
+#include <libwpd/WPXString.h>
+#include "DocumentElement.hxx"
+#include "DocumentHandlerInterface.hxx"
+
+class InternalHandler : public DocumentHandlerInterface
+{
+public:
+    InternalHandler(std::vector<DocumentElement *> *elements);
+    ~InternalHandler() {};
+
+    void startDocument() {};
+    void endDocument() {};
+    void startElement(const char *psName, const WPXPropertyList &xPropList);
+    void endElement(const char *psName);
+    void characters(const WPXString &sCharacters);
+private:
+    std::vector<DocumentElement *> *mpElements;
+};
+#endif
diff --git a/writerperfect/source/filter/ListStyle.cxx b/writerperfect/source/filter/ListStyle.cxx
index 3373d316dea1..c7fdc0d0a835 100644
--- a/writerperfect/source/filter/ListStyle.cxx
+++ b/writerperfect/source/filter/ListStyle.cxx
@@ -42,34 +42,46 @@ void OrderedListStyle::updateListLevel(const int iLevel, const WPXPropertyList &
         setListLevel(iLevel, new OrderedListLevelStyle(xPropList));
 }
 
-void OrderedListLevelStyle::write(DocumentHandler *pHandler, int iLevel) const
+void OrderedListLevelStyle::write(DocumentHandlerInterface *pHandler, int iLevel) const
 {
     WPXString sLevel;
     sLevel.sprintf("%i", (iLevel+1));
 
     TagOpenElement listLevelStyleOpen("text:list-level-style-number");
     listLevelStyleOpen.addAttribute("text:level", sLevel);
-    listLevelStyleOpen.addAttribute("text:style-name", "Numbering Symbols");
+    listLevelStyleOpen.addAttribute("text:style-name", "Numbering_Symbols");
         if (mPropList["style:num-prefix"])
-                listLevelStyleOpen.addAttribute("style:num-prefix", mPropList["style:num-prefix"]->getStr());
+    {
+        WPXString sEscapedString(mPropList["style:num-prefix"]->getStr(), true);
+        listLevelStyleOpen.addAttribute("style:num-prefix", sEscapedString);
+    }
         if (mPropList["style:num-suffix"])
-                listLevelStyleOpen.addAttribute("style:num-suffix", mPropList["style:num-suffix"]->getStr());
+    {
+        WPXString sEscapedString(mPropList["style:num-suffix"]->getStr(), true);
+        listLevelStyleOpen.addAttribute("style:num-suffix", sEscapedString);
+    }
         if (mPropList["style:num-format"])
                 listLevelStyleOpen.addAttribute("style:num-format", mPropList["style:num-format"]->getStr());
         if (mPropList["text:start-value"])
+    {
+        // odf as to the version 1.1 does require the text:start-value to be a positive integer, means > 0
+        if (mPropList["text:start-value"]->getInt() > 0)
                 listLevelStyleOpen.addAttribute("text:start-value", mPropList["text:start-value"]->getStr());
+        else
+            listLevelStyleOpen.addAttribute("text:start-value", "1");
+    }
     listLevelStyleOpen.write(pHandler);
 
-    TagOpenElement stylePropertiesOpen("style:properties");
-        if (mPropList["text:space-before"])
+    TagOpenElement stylePropertiesOpen("style:list-level-properties");
+    if (mPropList["text:space-before"] && mPropList["text:space-before"]->getDouble() > 0.0f)
                 stylePropertiesOpen.addAttribute("text:space-before", mPropList["text:space-before"]->getStr());
-    if (mPropList["text:min-label-width"])
+    if (mPropList["text:min-label-width"] && mPropList["text:min-label-width"]->getDouble() > 0.0f)
         stylePropertiesOpen.addAttribute("text:min-label-width", mPropList["text:min-label-width"]->getStr());
-    if (mPropList["text:min-label-distance"])
+    if (mPropList["text:min-label-distance"] && mPropList["text:min-label-distance"]->getDouble() > 0.0f)
         stylePropertiesOpen.addAttribute("text:min-label-distance", mPropList["text:min-label-distance"]->getStr());
     stylePropertiesOpen.write(pHandler);
 
-    pHandler->endElement("style:properties");
+    pHandler->endElement("style:list-level-properties");
     pHandler->endElement("text:list-level-style-number");
 }
 
@@ -86,29 +98,38 @@ void UnorderedListStyle::updateListLevel(const int iLevel, const WPXPropertyList
         setListLevel(iLevel, new UnorderedListLevelStyle(xPropList));
 }
 
-void UnorderedListLevelStyle::write(DocumentHandler *pHandler, int iLevel) const
+void UnorderedListLevelStyle::write(DocumentHandlerInterface *pHandler, int iLevel) const
 {
     WPXString sLevel;
     sLevel.sprintf("%i", (iLevel+1));
     TagOpenElement listLevelStyleOpen("text:list-level-style-bullet");
     listLevelStyleOpen.addAttribute("text:level", sLevel);
-    listLevelStyleOpen.addAttribute("text:style-name", "Bullet Symbols");
-    listLevelStyleOpen.addAttribute("style:num-suffice", ".");
-        if (mPropList["text:bullet-char"])
-                listLevelStyleOpen.addAttribute("text:bullet-char", mPropList["text:bullet-char"]->getStr());
+    listLevelStyleOpen.addAttribute("text:style-name", "Bullet_Symbols");
+    if (mPropList["text:bullet-char"] && (mPropList["text:bullet-char"]->getStr().len()))
+    {
+        // The following is needed because the odf format does not accept bullet chars longer than one character
+        WPXString::Iter i(mPropList["text:bullet-char"]->getStr()); i.rewind();
+        WPXString sEscapedString(".");
+        if (i.next())
+            sEscapedString = WPXString(i(), true);
+        listLevelStyleOpen.addAttribute("text:bullet-char", sEscapedString);
+
+    }
+    else
+        listLevelStyleOpen.addAttribute("text:bullet-char", ".");
     listLevelStyleOpen.write(pHandler);
 
-    TagOpenElement stylePropertiesOpen("style:properties");
-        if (mPropList["text:space-before"])
+    TagOpenElement stylePropertiesOpen("style:list-level-properties");
+    if (mPropList["text:space-before"] && mPropList["text:space-before"]->getDouble() > 0.0f)
                 stylePropertiesOpen.addAttribute("text:space-before", mPropList["text:space-before"]->getStr());
-    if (mPropList["text:min-label-width"])
+    if (mPropList["text:min-label-width"] && mPropList["text:min-label-width"]->getDouble() > 0.0f)
         stylePropertiesOpen.addAttribute("text:min-label-width", mPropList["text:min-label-width"]->getStr());
-    if (mPropList["text:min-label-distance"])
+    if (mPropList["text:min-label-distance"] && mPropList["text:min-label-distance"]->getDouble() > 0.0f)
         stylePropertiesOpen.addAttribute("text:min-label-distance", mPropList["text:min-label-distance"]->getStr());
     stylePropertiesOpen.addAttribute("style:font-name", "OpenSymbol");
     stylePropertiesOpen.write(pHandler);
 
-    pHandler->endElement("style:properties");
+    pHandler->endElement("style:list-level-properties");
     pHandler->endElement("text:list-level-style-bullet");
 }
 
@@ -147,7 +168,7 @@ void ListStyle::setListLevel(int iLevel, ListLevelStyle *iListLevelStyle)
         mppListLevels[iLevel] = iListLevelStyle;
 }
 
-void ListStyle::write(DocumentHandler *pHandler) const
+void ListStyle::write(DocumentHandlerInterface *pHandler) const
 {
     TagOpenElement listStyleOpenElement("text:list-style");
     listStyleOpenElement.addAttribute("style:name", getName());
diff --git a/writerperfect/source/filter/ListStyle.hxx b/writerperfect/source/filter/ListStyle.hxx
index c3549344a682..cbba20a8352e 100644
--- a/writerperfect/source/filter/ListStyle.hxx
+++ b/writerperfect/source/filter/ListStyle.hxx
@@ -27,18 +27,13 @@
  */
 #ifndef _LISTSTYLE_H
 #define _LISTSTYLE_H
-#if defined _MSC_VER
-#pragma warning( push, 1 )
-#endif
 #include <libwpd/libwpd.h>
-#if defined _MSC_VER
-#pragma warning( pop )
-#endif
 
 #define WP6_NUM_LIST_LEVELS 8 // see WP6FileStructure.h (we shouldn't need to reference this)
 
 #include "Style.hxx"
 #include "WriterProperties.hxx"
+#include "DocumentHandlerInterface.hxx"
 
 class DocumentElement;
 
@@ -46,14 +41,14 @@ class ListLevelStyle
 {
 public:
     virtual ~ListLevelStyle() {};
-    virtual void write(DocumentHandler *pHandler, int iLevel) const = 0;
+    virtual void write(DocumentHandlerInterface *pHandler, int iLevel) const = 0;
 };
 
 class OrderedListLevelStyle : public ListLevelStyle
 {
 public:
     OrderedListLevelStyle(const WPXPropertyList &xPropList);
-    void write(DocumentHandler *pHandler, int iLevel) const;
+    void write(DocumentHandlerInterface *pHandler, int iLevel) const;
 private:
         WPXPropertyList mPropList;
 };
@@ -62,7 +57,7 @@ class UnorderedListLevelStyle : public ListLevelStyle
 {
 public:
     UnorderedListLevelStyle(const WPXPropertyList &xPropList);
-    void write(DocumentHandler *pHandler, int iLevel) const;
+    void write(DocumentHandlerInterface *pHandler, int iLevel) const;
 private:
         WPXPropertyList mPropList;
 };
@@ -73,7 +68,7 @@ public:
     ListStyle(const char *psName, const int iListID);
     virtual ~ListStyle();
     virtual void updateListLevel(const int iLevel, const WPXPropertyList &xPropList) = 0;
-    virtual void write(DocumentHandler *pHandler) const;
+    virtual void write(DocumentHandlerInterface *pHandler) const;
     int getListID() const { return miListID; }
     bool isListLevelDefined(int iLevel) const;
 
diff --git a/writerperfect/source/filter/OdgExporter.cxx b/writerperfect/source/filter/OdgExporter.cxx
new file mode 100644
index 000000000000..429fc8d10dd1
--- /dev/null
+++ b/writerperfect/source/filter/OdgExporter.cxx
@@ -0,0 +1,648 @@
+/* libwpg
+ * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+ * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02111-1301 USA
+ *
+ * For further information visit http://libwpg.sourceforge.net
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
+#include "OdgExporter.hxx"
+#include "DocumentElement.hxx"
+#include "DocumentHandler.hxx"
+#include <locale.h>
+#include <math.h>
+#include <string>
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+OdgExporter::OdgExporter(DocumentHandlerInterface *pHandler):
+    mpHandler(pHandler),
+    miGradientIndex(1),
+    miDashIndex(1),
+    miGraphicsStyleIndex(1),
+    mfWidth(0.0),
+    mfHeight(0.0)
+{
+}
+
+OdgExporter::~OdgExporter()
+{
+
+    for (std::vector<DocumentElement *>::iterator iterBody = mBodyElements.begin(); iterBody != mBodyElements.end(); iterBody++)
+    {
+        delete (*iterBody);
+        (*iterBody) = NULL;
+    }
+
+    for (std::vector<DocumentElement *>::iterator iterGraphicsAutomaticStyles = mGraphicsAutomaticStyles.begin();
+        iterGraphicsAutomaticStyles != mGraphicsAutomaticStyles.end(); iterGraphicsAutomaticStyles++)
+    {
+        delete((*iterGraphicsAutomaticStyles));
+    }
+
+    for (std::vector<DocumentElement *>::iterator iterGraphicsStrokeDashStyles = mGraphicsStrokeDashStyles.begin();
+        iterGraphicsStrokeDashStyles != mGraphicsStrokeDashStyles.end(); iterGraphicsStrokeDashStyles++)
+    {
+        delete((*iterGraphicsStrokeDashStyles));
+    }
+
+    for (std::vector<DocumentElement *>::iterator iterGraphicsGradientStyles = mGraphicsGradientStyles.begin();
+        iterGraphicsGradientStyles != mGraphicsGradientStyles.end(); iterGraphicsGradientStyles++)
+    {
+        delete((*iterGraphicsGradientStyles));
+    }
+}
+
+void OdgExporter::startGraphics(const ::WPXPropertyList &propList)
+{
+    miGradientIndex = 1;
+    miDashIndex = 1;
+    miGraphicsStyleIndex = 1;
+    mfWidth = 0.0;
+    mfHeight = 0.0;
+
+    if (propList["svg:width"])
+        mfWidth = propList["svg:width"]->getDouble();
+
+    if (propList["svg:height"])
+        mfHeight = propList["svg:height"]->getDouble();
+
+    mpHandler->startDocument();
+    TagOpenElement tmpOfficeDocumentContent("office:document");
+    tmpOfficeDocumentContent.addAttribute("xmlns:office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0");
+    tmpOfficeDocumentContent.addAttribute("xmlns:style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0");
+    tmpOfficeDocumentContent.addAttribute("xmlns:text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0");
+    tmpOfficeDocumentContent.addAttribute("xmlns:draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0");
+    tmpOfficeDocumentContent.addAttribute("xmlns:dc", "http://purl.org/dc/elements/1.1/");
+    tmpOfficeDocumentContent.addAttribute("xmlns:svg", "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0");
+    tmpOfficeDocumentContent.addAttribute("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0");
+    tmpOfficeDocumentContent.addAttribute("xmlns:config", "urn:oasis:names:tc:opendocument:xmlns:config:1.0");
+    tmpOfficeDocumentContent.addAttribute("xmlns:ooo", "http://openoffice.org/2004/office");
+    tmpOfficeDocumentContent.addAttribute("office:version", "1.0");
+    tmpOfficeDocumentContent.addAttribute("office:mimetype", "application/vnd.oasis.opendocument.graphics");
+    tmpOfficeDocumentContent.write(mpHandler);
+
+    TagOpenElement("office:settings").write(mpHandler);
+
+    TagOpenElement configItemSetOpenElement("config:config-item-set");
+    configItemSetOpenElement.addAttribute("config:name", "ooo:view-settings");
+    configItemSetOpenElement.write(mpHandler);
+
+    TagOpenElement configItemOpenElement("config:config-item");
+
+    configItemOpenElement.addAttribute("config:name", "VisibleAreaTop");
+    configItemOpenElement.addAttribute("config:type", "int");
+    configItemOpenElement.write(mpHandler);
+    mpHandler->characters("0");
+    mpHandler->endElement("config:config-item");
+
+    configItemOpenElement.addAttribute("config:name", "VisibleAreaLeft");
+    configItemOpenElement.addAttribute("config:type", "int");
+    configItemOpenElement.write(mpHandler);
+    mpHandler->characters("0");
+    mpHandler->endElement("config:config-item");
+
+    configItemOpenElement.addAttribute("config:name", "VisibleAreaWidth");
+    configItemOpenElement.addAttribute("config:type", "int");
+    configItemOpenElement.write(mpHandler);
+    WPXString sWidth; sWidth.sprintf("%li", (unsigned long)(2540 * mfWidth));
+    mpHandler->characters(sWidth);
+    mpHandler->endElement("config:config-item");
+
+    configItemOpenElement.addAttribute("config:name", "VisibleAreaHeight");
+    configItemOpenElement.addAttribute("config:type", "int");
+    configItemOpenElement.write(mpHandler);
+    WPXString sHeight; sHeight.sprintf("%li", (unsigned long)(2540 * mfHeight));
+    mpHandler->characters(sHeight);
+    mpHandler->endElement("config:config-item");
+
+    mpHandler->endElement("config:config-item-set");
+
+    mpHandler->endElement("office:settings");
+}
+
+void OdgExporter::endGraphics()
+{
+    TagOpenElement("office:styles").write(mpHandler);
+
+    for (std::vector<DocumentElement *>::const_iterator iterGraphicsStrokeDashStyles = mGraphicsStrokeDashStyles.begin();
+        iterGraphicsStrokeDashStyles != mGraphicsStrokeDashStyles.end(); iterGraphicsStrokeDashStyles++)
+    {
+        (*iterGraphicsStrokeDashStyles)->write(mpHandler);
+    }
+
+    for (std::vector<DocumentElement *>::const_iterator iterGraphicsGradientStyles = mGraphicsGradientStyles.begin();
+        iterGraphicsGradientStyles != mGraphicsGradientStyles.end(); iterGraphicsGradientStyles++)
+    {
+        (*iterGraphicsGradientStyles)->write(mpHandler);
+    }
+
+    mpHandler->endElement("office:styles");
+
+    TagOpenElement("office:automatic-styles").write(mpHandler);
+
+    // writing out the graphics automatic styles
+    for (std::vector<DocumentElement *>::iterator iterGraphicsAutomaticStyles = mGraphicsAutomaticStyles.begin();
+        iterGraphicsAutomaticStyles != mGraphicsAutomaticStyles.end(); iterGraphicsAutomaticStyles++)
+    {
+        (*iterGraphicsAutomaticStyles)->write(mpHandler);
+    }
+
+    TagOpenElement tmpStylePageLayoutOpenElement("style:page-layout");
+    tmpStylePageLayoutOpenElement.addAttribute("style:name", "PM0");
+    tmpStylePageLayoutOpenElement.write(mpHandler);
+
+    TagOpenElement tmpStylePageLayoutPropertiesOpenElement("style:page-layout-properties");
+    tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-top", "0in");
+    tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-bottom", "0in");
+    tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-left", "0in");
+    tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-right", "0in");
+    WPXString sValue;
+    sValue = doubleToString(mfWidth); sValue.append("in");
+    tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-width", sValue);
+    sValue = doubleToString(mfHeight); sValue.append("in");
+    tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-height", sValue);
+    tmpStylePageLayoutPropertiesOpenElement.addAttribute("style:print-orientation", "portrait");
+    tmpStylePageLayoutPropertiesOpenElement.write(mpHandler);
+
+    mpHandler->endElement("style:page-layout-properties");
+
+    mpHandler->endElement("style:page-layout");
+
+    TagOpenElement tmpStyleStyleOpenElement("style:style");
+    tmpStyleStyleOpenElement.addAttribute("style:name", "dp1");
+    tmpStyleStyleOpenElement.addAttribute("style:family", "drawing-page");
+    tmpStyleStyleOpenElement.write(mpHandler);
+
+    TagOpenElement tmpStyleDrawingPagePropertiesOpenElement("style:drawing-page-properties");
+    // tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:background-size", "border");
+    tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:fill", "none");
+    tmpStyleDrawingPagePropertiesOpenElement.write(mpHandler);
+
+    mpHandler->endElement("style:drawing-page-properties");
+
+    mpHandler->endElement("style:style");
+
+    mpHandler->endElement("office:automatic-styles");
+
+    TagOpenElement("office:master-styles").write(mpHandler);
+
+    TagOpenElement tmpStyleMasterPageOpenElement("style:master-page");
+    tmpStyleMasterPageOpenElement.addAttribute("style:name", "Default");
+    tmpStyleMasterPageOpenElement.addAttribute("style:page-layout-name", "PM0");
+    tmpStyleMasterPageOpenElement.addAttribute("draw:style-name", "dp1");
+    tmpStyleMasterPageOpenElement.write(mpHandler);
+
+    mpHandler->endElement("style:master-page");
+
+    mpHandler->endElement("office:master-styles");
+
+    TagOpenElement("office:body").write(mpHandler);
+
+    TagOpenElement("office:drawing").write(mpHandler);
+
+    TagOpenElement tmpDrawPageOpenElement("draw:page");
+    tmpDrawPageOpenElement.addAttribute("draw:name", "page1");
+    tmpDrawPageOpenElement.addAttribute("draw:style-name", "dp1");
+    tmpDrawPageOpenElement.addAttribute("draw:master-page-name", "Default");
+    tmpDrawPageOpenElement.write(mpHandler);
+
+    for (std::vector<DocumentElement *>::const_iterator bodyIter = mBodyElements.begin();
+        bodyIter != mBodyElements.end(); bodyIter++)
+    {
+        (*bodyIter)->write(mpHandler);
+    }
+
+    mpHandler->endElement("draw:page");
+    mpHandler->endElement("office:drawing");
+    mpHandler->endElement("office:body");
+
+    mpHandler->endElement("office:document");
+
+    mpHandler->endDocument();
+}
+
+void OdgExporter::setStyle(const ::WPXPropertyList & propList, const ::WPXPropertyListVector& gradient)
+{
+    mxStyle = propList;
+    mxGradient = gradient;
+}
+
+void OdgExporter::startLayer(const ::WPXPropertyList & /* propList */)
+{
+}
+
+void OdgExporter::endLayer()
+{
+}
+
+void OdgExporter::drawRectangle(const ::WPXPropertyList &propList)
+{
+    writeGraphicsStyle();
+    TagOpenElement *pDrawRectElement = new TagOpenElement("draw:rect");
+    WPXString sValue;
+    sValue.sprintf("gr%i", miGraphicsStyleIndex-1);
+    pDrawRectElement->addAttribute("draw:style-name", sValue);
+    pDrawRectElement->addAttribute("svg:x", propList["svg:x"]->getStr());
+    pDrawRectElement->addAttribute("svg:y", propList["svg:y"]->getStr());
+    pDrawRectElement->addAttribute("svg:width", propList["svg:width"]->getStr());
+    pDrawRectElement->addAttribute("svg:height", propList["svg:height"]->getStr());
+    // FIXME: what to do when rx != ry ?
+    if (propList["svg:rx"])
+        pDrawRectElement->addAttribute("draw:corner-radius", propList["svg:rx"]->getStr());
+    else
+        pDrawRectElement->addAttribute("draw:corner-radius", "0.0000in");
+    mBodyElements.push_back(pDrawRectElement);
+    mBodyElements.push_back(new TagCloseElement("draw:rect"));
+}
+
+void OdgExporter::drawEllipse(const ::WPXPropertyList &propList)
+{
+    writeGraphicsStyle();
+    TagOpenElement *pDrawEllipseElement = new TagOpenElement("draw:ellipse");
+    WPXString sValue;
+    sValue.sprintf("gr%i", miGraphicsStyleIndex-1);
+    pDrawEllipseElement->addAttribute("draw:style-name", sValue);
+    sValue = doubleToString(2 * propList["svg:rx"]->getDouble()); sValue.append("in");
+    pDrawEllipseElement->addAttribute("svg:width", sValue);
+    sValue = doubleToString(2 * propList["svg:ry"]->getDouble()); sValue.append("in");
+    pDrawEllipseElement->addAttribute("svg:height", sValue);
+    if (propList["libwpg:rotate"] && propList["libwpg:rotate"]->getDouble() != 0.0)
+    {
+        double rotation = propList["libwpg:rotate"]->getDouble();
+        while(rotation < -180)
+            rotation += 360;
+        while(rotation > 180)
+            rotation -= 360;
+        double radrotation = rotation*M_PI/180.0;
+        double deltax = sqrt(pow(propList["svg:rx"]->getDouble(), 2.0)
+            + pow(propList["svg:ry"]->getDouble(), 2.0))*cos(atan(propList["svg:ry"]->getDouble()/propList["svg:rx"]->getDouble())
+            - radrotation ) - propList["svg:rx"]->getDouble();
+        double deltay = sqrt(pow(propList["svg:rx"]->getDouble(), 2.0)
+            + pow(propList["svg:ry"]->getDouble(), 2.0))*sin(atan(propList["svg:ry"]->getDouble()/propList["svg:rx"]->getDouble())
+            - radrotation ) - propList["svg:ry"]->getDouble();
+        sValue = "rotate("; sValue.append(doubleToString(radrotation)); sValue.append(") ");
+        sValue.append("translate("); sValue.append(doubleToString(propList["svg:cx"]->getDouble() - propList["svg:rx"]->getDouble() - deltax));
+        sValue.append("in, ");
+        sValue.append(doubleToString(propList["svg:cy"]->getDouble() - propList["svg:ry"]->getDouble() - deltay)); sValue.append("in)");
+        pDrawEllipseElement->addAttribute("draw:transform", sValue);
+    }
+    else
+    {
+        sValue = doubleToString(propList["svg:cx"]->getDouble()-propList["svg:rx"]->getDouble()); sValue.append("in");
+        pDrawEllipseElement->addAttribute("svg:x", sValue);
+        sValue = doubleToString(propList["svg:cy"]->getDouble()-propList["svg:ry"]->getDouble()); sValue.append("in");
+        pDrawEllipseElement->addAttribute("svg:y", sValue);
+    }
+    mBodyElements.push_back(pDrawEllipseElement);
+    mBodyElements.push_back(new TagCloseElement("draw:ellipse"));
+}
+
+void OdgExporter::drawPolyline(const ::WPXPropertyListVector& vertices)
+{
+    drawPolySomething(vertices, false);
+}
+
+void OdgExporter::drawPolygon(const ::WPXPropertyListVector& vertices)
+{
+    drawPolySomething(vertices, true);
+}
+
+void OdgExporter::drawPolySomething(const ::WPXPropertyListVector& vertices, bool isClosed)
+{
+    if(vertices.count() < 2)
+        return;
+
+    if(vertices.count() == 2)
+    {
+        writeGraphicsStyle();
+        TagOpenElement *pDrawLineElement = new TagOpenElement("draw:line");
+        WPXString sValue;
+        sValue.sprintf("gr%i", miGraphicsStyleIndex-1);
+        pDrawLineElement->addAttribute("draw:style-name", sValue);
+        pDrawLineElement->addAttribute("draw:text-style-name", "P1");
+        pDrawLineElement->addAttribute("draw:layer", "layout");
+        pDrawLineElement->addAttribute("svg:x1", vertices[0]["svg:x"]->getStr());
+        pDrawLineElement->addAttribute("svg:y1", vertices[0]["svg:y"]->getStr());
+        pDrawLineElement->addAttribute("svg:x2", vertices[1]["svg:x"]->getStr());
+        pDrawLineElement->addAttribute("svg:y2", vertices[1]["svg:y"]->getStr());
+        mBodyElements.push_back(pDrawLineElement);
+        mBodyElements.push_back(new TagCloseElement("draw:line"));
+    }
+    else
+    {
+        ::WPXPropertyListVector path;
+        ::WPXPropertyList element;
+
+        for (unsigned long ii = 0; ii < vertices.count(); ii++)
+        {
+            element = vertices[ii];
+            if (ii == 0)
+                element.insert("libwpg:path-action", "M");
+            else
+                element.insert("libwpg:path-action", "L");
+            path.append(element);
+            element.clear();
+        }
+        if (isClosed)
+        {
+            element.insert("libwpg:path-action", "Z");
+            path.append(element);
+        }
+        drawPath(path);
+    }
+}
+
+void OdgExporter::drawPath(const WPXPropertyListVector& path)
+{
+    if(path.count() == 0)
+        return;
+
+    // try to find the bounding box
+    // this is simple convex hull technique, the bounding box might not be
+    // accurate but that should be enough for this purpose
+    double px = path[0]["svg:x"]->getDouble();
+    double py = path[0]["svg:y"]->getDouble();
+    double qx = path[0]["svg:x"]->getDouble();
+    double qy = path[0]["svg:y"]->getDouble();
+    for(unsigned k = 0; k < path.count(); k++)
+    {
+        if (!path[k]["svg:x"] || !path[k]["svg:y"])
+            continue;
+        px = (px > path[k]["svg:x"]->getDouble()) ? path[k]["svg:x"]->getDouble() : px;
+        py = (py > path[k]["svg:y"]->getDouble()) ? path[k]["svg:y"]->getDouble() : py;
+        qx = (qx < path[k]["svg:x"]->getDouble()) ? path[k]["svg:x"]->getDouble() : qx;
+        qy = (qy < path[k]["svg:y"]->getDouble()) ? path[k]["svg:y"]->getDouble() : qy;
+        if(path[k]["libwpg:path-action"]->getStr() == "C")
+        {
+            px = (px > path[k]["svg:x1"]->getDouble()) ? path[k]["svg:x1"]->getDouble() : px;
+            py = (py > path[k]["svg:y1"]->getDouble()) ? path[k]["svg:y1"]->getDouble() : py;
+            qx = (qx < path[k]["svg:x1"]->getDouble()) ? path[k]["svg:x1"]->getDouble() : qx;
+            qy = (qy < path[k]["svg:y1"]->getDouble()) ? path[k]["svg:y1"]->getDouble() : qy;
+            px = (px > path[k]["svg:x2"]->getDouble()) ? path[k]["svg:x2"]->getDouble() : px;
+            py = (py > path[k]["svg:y2"]->getDouble()) ? path[k]["svg:y2"]->getDouble() : py;
+            qx = (qx < path[k]["svg:x2"]->getDouble()) ? path[k]["svg:x2"]->getDouble() : qx;
+            qy = (qy < path[k]["svg:y2"]->getDouble()) ? path[k]["svg:y2"]->getDouble() : qy;
+        }
+        if(path[k]["libwpg:path-action"]->getStr() == "A")
+        {
+            px = (px > path[k]["svg:x"]->getDouble()-2*path[k]["svg:rx"]->getDouble()) ? path[k]["svg:x"]->getDouble()-2*path[k]["svg:rx"]->getDouble() : px;
+            py = (py > path[k]["svg:y"]->getDouble()-2*path[k]["svg:ry"]->getDouble()) ? path[k]["svg:y"]->getDouble()-2*path[k]["svg:ry"]->getDouble() : py;
+            qx = (qx < path[k]["svg:x"]->getDouble()+2*path[k]["svg:rx"]->getDouble()) ? path[k]["svg:x"]->getDouble()+2*path[k]["svg:rx"]->getDouble() : qx;
+            qy = (qy < path[k]["svg:y"]->getDouble()+2*path[k]["svg:ry"]->getDouble()) ? path[k]["svg:y"]->getDouble()+2*path[k]["svg:ry"]->getDouble() : qy;
+        }
+    }
+    double vw = qx - px;
+    double vh = qy - py;
+
+    writeGraphicsStyle();
+
+    TagOpenElement *pDrawPathElement = new TagOpenElement("draw:path");
+    WPXString sValue;
+    sValue.sprintf("gr%i", miGraphicsStyleIndex-1);
+    pDrawPathElement->addAttribute("draw:style-name", sValue);
+    pDrawPathElement->addAttribute("draw:text-style-name", "P1");
+    pDrawPathElement->addAttribute("draw:layer", "layout");
+    sValue = doubleToString(px); sValue.append("in");
+    pDrawPathElement->addAttribute("svg:x", sValue);
+    sValue = doubleToString(py); sValue.append("in");
+    pDrawPathElement->addAttribute("svg:y", sValue);
+    sValue = doubleToString(vw); sValue.append("in");
+    pDrawPathElement->addAttribute("svg:width", sValue);
+    sValue = doubleToString(vh); sValue.append("in");
+    pDrawPathElement->addAttribute("svg:height", sValue);
+    sValue.sprintf("%i %i %i %i", 0, 0, (unsigned)(vw*2540), (unsigned)(vh*2540));
+    pDrawPathElement->addAttribute("svg:viewBox", sValue);
+
+    sValue.clear();
+    for(unsigned i = 0; i < path.count(); i++)
+    {
+        WPXString sElement;
+        if (path[i]["libwpg:path-action"]->getStr() == "M")
+        {
+            // 2540 is 2.54*1000, 2.54 in = 1 inch
+            sElement.sprintf("M%i %i", (unsigned)((path[i]["svg:x"]->getDouble()-px)*2540),
+                (unsigned)((path[i]["svg:y"]->getDouble()-py)*2540));
+            sValue.append(sElement);
+        }
+        else if (path[i]["libwpg:path-action"]->getStr() == "L")
+        {
+            sElement.sprintf("L%i %i", (unsigned)((path[i]["svg:x"]->getDouble()-px)*2540),
+                (unsigned)((path[i]["svg:y"]->getDouble()-py)*2540));
+            sValue.append(sElement);
+        }
+        else if (path[i]["libwpg:path-action"]->getStr() == "C")
+        {
+            sElement.sprintf("C%i %i %i %i %i %i", (unsigned)((path[i]["svg:x1"]->getDouble()-px)*2540),
+                (int)((path[i]["svg:y1"]->getDouble()-py)*2540), (unsigned)((path[i]["svg:x2"]->getDouble()-px)*2540),
+                (int)((path[i]["svg:y2"]->getDouble()-py)*2540), (unsigned)((path[i]["svg:x"]->getDouble()-px)*2540),
+                (unsigned)((path[i]["svg:y"]->getDouble()-py)*2540));
+            sValue.append(sElement);
+        }
+        else if (path[i]["libwpg:path-action"]->getStr() == "A")
+        {
+            sElement.sprintf("A%i %i %i %i %i %i %i", (unsigned)((path[i]["svg:rx"]->getDouble())*2540),
+                (int)((path[i]["svg:ry"]->getDouble())*2540), (path[i]["libwpg:rotate"] ? path[i]["libwpg:rotate"]->getInt() : 0),
+                0, 0, (unsigned)((path[i]["svg:x"]->getDouble()-px)*2540), (unsigned)((path[i]["svg:y"]->getDouble()-py)*2540));
+            sValue.append(sElement);
+        }
+        else if (path[i]["libwpg:path-action"]->getStr() == "Z" && i >= (path.count() - 1))
+            sValue.append(" Z");
+    }
+    pDrawPathElement->addAttribute("svg:d", sValue);
+    mBodyElements.push_back(pDrawPathElement);
+    mBodyElements.push_back(new TagCloseElement("draw:path"));
+}
+
+void OdgExporter::drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData& binaryData)
+{
+    if (!propList["libwpg:mime-type"] && propList["libwpg:mime-type"]->getStr().len() <= 0)
+        return;
+    TagOpenElement *pDrawFrameElement = new TagOpenElement("draw:frame");
+
+
+    WPXString sValue;
+    if (propList["svg:x"])
+        pDrawFrameElement->addAttribute("svg:x", propList["svg:x"]->getStr());
+    if (propList["svg:y"])
+        pDrawFrameElement->addAttribute("svg:y", propList["svg:y"]->getStr());
+    if (propList["svg:height"])
+        pDrawFrameElement->addAttribute("svg:height", propList["svg:height"]->getStr());
+    if (propList["svg:width"])
+        pDrawFrameElement->addAttribute("svg:width", propList["svg:width"]->getStr());
+    mBodyElements.push_back(pDrawFrameElement);
+
+    mBodyElements.push_back(new TagOpenElement("draw:image"));
+
+    mBodyElements.push_back(new TagOpenElement("office:binary-data"));
+
+    ::WPXString base64Binary = binaryData.getBase64Data();
+    mBodyElements.push_back(new CharDataElement(base64Binary.cstr()));
+
+    mBodyElements.push_back(new TagCloseElement("office:binary-data"));
+
+    mBodyElements.push_back(new TagCloseElement("draw:image"));
+
+    mBodyElements.push_back(new TagCloseElement("draw:frame"));
+}
+
+void OdgExporter::writeGraphicsStyle()
+{
+#if 0
+    if(mxStyle["libwpg:stroke-solid"] && !mxStyle["libwpg:stroke-solid"]->getInt() && (mxDashArray.count() >=2 ) )
+    {
+        // ODG only supports dashes with the same length of spaces inbetween
+        // here we take the first space and assume everything else the same
+        // note that dash length is written in percentage ?????????????????
+        double distance = mxDashArray.at(1);
+        TagOpenElement *pDrawStrokeDashElement = new TagOpenElement("draw:stroke-dash");
+        pDrawStrokeDashElement->addAttribute("draw:style", "rect");
+        WPXString sValue;
+        sValue.sprintf("Dash_%i", miDashIndex++);
+        pDrawStrokeDashElement->addAttribute("draw:name", sValue);
+        sValue = doubleToString(distance); sValue.append("in");
+        pDrawStrokeDashElement->addAttribute("draw:distance", sValue);
+        WPXString sName;
+        // We have to find out how to do this intelligently, since the ODF is allowing only
+        // two pairs draw:dots1 draw:dots1-length and draw:dots2 draw:dots2-length
+        for(unsigned i = 0; i < mxDashArray.count()/2 && i < 2; i++)
+        {
+            sName.sprintf("draw:dots%i", i+1);
+            pDrawStrokeDashElement->addAttribute(sName.cstr(), "1");
+            sName.sprintf("draw:dots%i-length", i+1);
+            sValue = doubleToString(mxDashArray.at(i*2)); sValue.append("in");
+            pDrawStrokeDashElement->addAttribute(sName.cstr(), sValue);
+        }
+        mGraphicsStrokeDashStyles.push_back(pDrawStrokeDashElement);
+        mGraphicsStrokeDashStyles.push_back(new TagCloseElement("draw:stroke-dash"));
+    }
+#endif
+    if(mxStyle["draw:fill"] && mxStyle["draw:fill"]->getStr() == "gradient" && mxGradient.count() >= 2)
+    {
+        TagOpenElement *pDrawGradientElement = new TagOpenElement("draw:gradient");
+        pDrawGradientElement->addAttribute("draw:style", "linear");
+        WPXString sValue;
+        sValue.sprintf("Gradient_%i", miGradientIndex++);
+        pDrawGradientElement->addAttribute("draw:name", sValue);
+
+        // ODG angle unit is 0.1 degree
+        double angle = mxStyle["draw:angle"] ? -mxStyle["draw:angle"]->getDouble() : 0.0;
+        while(angle < 0)
+            angle += 360;
+        while(angle > 360)
+            angle -= 360;
+
+        sValue.sprintf("%i", (unsigned)(angle*10));
+        pDrawGradientElement->addAttribute("draw:angle", sValue);
+
+        pDrawGradientElement->addAttribute("draw:start-color", mxGradient[0]["svg:stop-color"]->getStr().cstr());
+        pDrawGradientElement->addAttribute("draw:end-color", mxGradient[1]["svg:stop-color"]->getStr().cstr());
+        pDrawGradientElement->addAttribute("draw:start-intensity", "100%");
+        pDrawGradientElement->addAttribute("draw:end-intensity", "100%");
+        pDrawGradientElement->addAttribute("draw:border", "0%");
+        mGraphicsGradientStyles.push_back(pDrawGradientElement);
+        mGraphicsGradientStyles.push_back(new TagCloseElement("draw:gradient"));
+    }
+
+    TagOpenElement *pStyleStyleElement = new TagOpenElement("style:style");
+    WPXString sValue;
+    sValue.sprintf("gr%i",  miGraphicsStyleIndex);
+    pStyleStyleElement->addAttribute("style:name", sValue);
+    pStyleStyleElement->addAttribute("style:family", "graphic");
+    pStyleStyleElement->addAttribute("style:parent-style-name", "standard");
+    mGraphicsAutomaticStyles.push_back(pStyleStyleElement);
+
+    TagOpenElement *pStyleGraphicsPropertiesElement = new TagOpenElement("style:graphic-properties");
+
+    if(!(mxStyle["draw:stroke"] && mxStyle["draw:stroke"]->getStr() == "none") && mxStyle["svg:stroke-width"] && mxStyle["svg:stroke-width"]->getDouble() > 0.0)
+    {
+        if (mxStyle["svg:stroke-width"])
+            pStyleGraphicsPropertiesElement->addAttribute("svg:stroke-width", mxStyle["svg:stroke-width"]->getStr());
+
+        if (mxStyle["svg:stroke-color"])
+            pStyleGraphicsPropertiesElement->addAttribute("svg:stroke-color", mxStyle["svg:stroke-color"]->getStr());
+        if (mxStyle["svg:stroke-opacity"] && mxStyle["svg:stroke-opacity"]->getDouble() != 1.0)
+            pStyleGraphicsPropertiesElement->addAttribute("svg:stroke-opacity", mxStyle["svg:stroke-opacity"]->getStr());
+
+
+        if(mxStyle["libwpg:stroke-solid"] && mxStyle["libwpg:stroke-solid"]->getInt())
+            pStyleGraphicsPropertiesElement->addAttribute("draw:stroke", "solid");
+#if 0
+        else
+        {
+            pStyleGraphicsPropertiesElement->addAttribute("draw:stroke", "dash");
+            sValue.sprintf("Dash_%i", miDashIndex-1);
+            pStyleGraphicsPropertiesElement->addAttribute("draw:stroke-dash", sValue);
+        }
+#endif
+    }
+    else
+        pStyleGraphicsPropertiesElement->addAttribute("draw:stroke", "none");
+
+    if(mxStyle["draw:fill"] && mxStyle["draw:fill"]->getStr() == "none")
+        pStyleGraphicsPropertiesElement->addAttribute("draw:fill", "none");
+
+    if(mxStyle["draw:fill"] && mxStyle["draw:fill"]->getStr() == "solid")
+    {
+        pStyleGraphicsPropertiesElement->addAttribute("draw:fill", "solid");
+        if (mxStyle["draw:fill-color"])
+            pStyleGraphicsPropertiesElement->addAttribute("draw:fill-color", mxStyle["draw:fill-color"]->getStr());
+        if (mxStyle["draw:opacity"] && mxStyle["draw:opacity"]->getDouble() != 1.0)
+            pStyleGraphicsPropertiesElement->addAttribute("draw:opacity", mxStyle["draw:opacity"]->getStr());
+    }
+
+    if(mxStyle["draw:fill"] && mxStyle["draw:fill"]->getStr() == "gradient")
+    {
+        if (mxGradient.count() >= 2)
+        {
+            pStyleGraphicsPropertiesElement->addAttribute("draw:fill", "gradient");
+            sValue.sprintf("Gradient_%i", miGradientIndex-1);
+            pStyleGraphicsPropertiesElement->addAttribute("draw:fill-gradient-name", sValue);
+        }
+        else
+            pStyleGraphicsPropertiesElement->addAttribute("draw:fill", "none");
+    }
+
+    mGraphicsAutomaticStyles.push_back(pStyleGraphicsPropertiesElement);
+    mGraphicsAutomaticStyles.push_back(new TagCloseElement("style:graphic-properties"));
+
+    mGraphicsAutomaticStyles.push_back(new TagCloseElement("style:style"));
+    miGraphicsStyleIndex++;
+}
+
+WPXString OdgExporter::doubleToString(const double value)
+{
+    WPXString tempString;
+    tempString.sprintf("%.4f", value);
+    std::string decimalPoint(localeconv()->decimal_point);
+    if ((decimalPoint.size() == 0) || (decimalPoint == "."))
+        return tempString;
+    std::string stringValue(tempString.cstr());
+    if (!stringValue.empty())
+    {
+        std::string::size_type pos;
+        while ((pos = stringValue.find(decimalPoint)) != std::string::npos)
+            stringValue.replace(pos,decimalPoint.size(),".");
+    }
+    return WPXString(stringValue.c_str());
+}
diff --git a/writerperfect/source/filter/OdgExporter.hxx b/writerperfect/source/filter/OdgExporter.hxx
new file mode 100644
index 000000000000..948d3b87374c
--- /dev/null
+++ b/writerperfect/source/filter/OdgExporter.hxx
@@ -0,0 +1,90 @@
+/* libwpg
+ * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02111-1301 USA
+ *
+ * For further information visit http://libwpg.sourceforge.net
+ */
+
+/* "This product is not manufactured, approved, or supported by
+ * Corel Corporation or Corel Corporation Limited."
+ */
+#ifndef __ODGEXPORTER_HXX__
+#define __ODGEXPORTER_HXX__
+
+#include <iostream>
+#include <sstream>
+#include <string>
+
+#include <libwpd/libwpd.h>
+#include <libwpg/libwpg.h>
+#include "DocumentElement.hxx"
+#include "DocumentHandler.hxx"
+#include "FilterInternal.hxx"
+
+class OdgExporter : public libwpg::WPGPaintInterface {
+public:
+    OdgExporter(DocumentHandlerInterface *pHandler);
+    ~OdgExporter();
+
+    void startGraphics(const ::WPXPropertyList &propList);
+    void endGraphics();
+    void startLayer(const ::WPXPropertyList &propList);
+    void endLayer();
+    void startEmbeddedGraphics(const ::WPXPropertyList& /*propList*/) {}
+    void endEmbeddedGraphics() {}
+
+    void setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector& gradient);
+
+    void drawRectangle(const ::WPXPropertyList &propList);
+    void drawEllipse(const ::WPXPropertyList &propList);
+    void drawPolyline(const ::WPXPropertyListVector& vertices);
+    void drawPolygon(const ::WPXPropertyListVector& vertices);
+    void drawPath(const ::WPXPropertyListVector& path);
+    void drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData& binaryData);
+    void startTextObject(const ::WPXPropertyList & /*propList*/, const ::WPXPropertyListVector &/*path*/) {}
+    void endTextObject() {}
+    void startTextLine(const ::WPXPropertyList & /*propList*/) {}
+    void endTextLine() {}
+    void startTextSpan(const ::WPXPropertyList & /*propList*/) {}
+    void endTextSpan() {}
+    void insertText(const ::WPXString & /*str*/) {}
+
+private:
+    void writeGraphicsStyle();
+    WPXString doubleToString(const double value);
+    void drawPolySomething(const ::WPXPropertyListVector& vertices, bool isClosed);
+
+    // body elements
+    std::vector <DocumentElement *> mBodyElements;
+
+    // graphics styles
+    std::vector<DocumentElement *> mGraphicsStrokeDashStyles;
+    std::vector<DocumentElement *> mGraphicsGradientStyles;
+    std::vector<DocumentElement *> mGraphicsAutomaticStyles;
+
+    DocumentHandlerInterface *mpHandler;
+
+    ::WPXPropertyList mxStyle;
+    ::WPXPropertyListVector mxGradient;
+    int miGradientIndex;
+    int miDashIndex;
+    int miGraphicsStyleIndex;
+    double mfWidth;
+    double mfHeight;
+};
+
+#endif // __ODGEXPORTER_HXX__
diff --git a/writerperfect/source/filter/PageSpan.cxx b/writerperfect/source/filter/PageSpan.cxx
index e3fab42eed7e..7ff4d1ce6977 100644
--- a/writerperfect/source/filter/PageSpan.cxx
+++ b/writerperfect/source/filter/PageSpan.cxx
@@ -29,6 +29,7 @@
 #include "FilterInternal.hxx"
 #include "PageSpan.hxx"
 #include "DocumentElement.hxx"
+#include "DocumentHandler.hxx"
 
 PageSpan::PageSpan(const WPXPropertyList &xPropList) :
         mxPropList(xPropList),
@@ -39,10 +40,12 @@ PageSpan::PageSpan(const WPXPropertyList &xPropList) :
 {
 }
 
-PageSpan::~PageSpan()
-{
+namespace {
     typedef std::vector<DocumentElement *>::iterator DEVIter;
+}
 
+PageSpan::~PageSpan()
+{
     if (mpHeaderContent)
     {
         for (DEVIter iterHeaderContent = mpHeaderContent->begin();
@@ -88,39 +91,110 @@ int PageSpan::getSpan() const
         return 0; // should never happen
 }
 
-void PageSpan::writePageMaster(const int iNum, DocumentHandler *pHandler) const
+double PageSpan::getMarginLeft() const
 {
-        WPXPropertyList propList;
+        if (mxPropList["fo:margin-left"])
+                return mxPropList["fo:margin-left"]->getDouble();
 
-    WPXString sPageMasterName;
-        sPageMasterName.sprintf("PM%i", iNum /* +2 */);
-        propList.insert("style:name", sPageMasterName);
+         return 0.0;
+}
 
-    pHandler->startElement("style:page-master", propList);
+double PageSpan::getMarginRight() const
+{
+        if (mxPropList["fo:margin-right"])
+                return mxPropList["fo:margin-right"]->getDouble();
+
+         return 0.0;
+}
+
+void PageSpan::setHeaderContent(std::vector<DocumentElement *> * pHeaderContent)
+{
+    if (mpHeaderContent)
+    {
+        for (DEVIter iterHeaderContent = mpHeaderContent->begin();
+            iterHeaderContent != mpHeaderContent->end();
+            iterHeaderContent++)
+                delete(*iterHeaderContent);
+        delete mpHeaderContent;
+    }
+
+    mpHeaderContent = pHeaderContent;
+}
+
+void PageSpan::setFooterContent(std::vector<DocumentElement *> * pFooterContent)
+{
+    if (mpFooterContent)
+    {
+        for (DEVIter iterFooterContent = mpFooterContent->begin();
+            iterFooterContent != mpFooterContent->end();
+            iterFooterContent++)
+                delete(*iterFooterContent);
+        delete mpFooterContent;
+    }
+
+    mpFooterContent = pFooterContent;
+}
+
+void PageSpan::setHeaderLeftContent(std::vector<DocumentElement *> * pHeaderContent)
+{
+    if (mpHeaderLeftContent)
+    {
+        for (DEVIter iterHeaderLeftContent = mpHeaderLeftContent->begin();
+            iterHeaderLeftContent != mpHeaderLeftContent->end();
+            iterHeaderLeftContent++)
+                delete(*iterHeaderLeftContent);
+        delete mpHeaderLeftContent;
+    }
+
+    mpHeaderLeftContent = pHeaderContent;
+}
+
+void PageSpan::setFooterLeftContent(std::vector<DocumentElement *> * pFooterContent)
+{
+    if (mpFooterLeftContent)
+    {
+        for (DEVIter iterFooterLeftContent = mpFooterLeftContent->begin();
+            iterFooterLeftContent != mpFooterLeftContent->end();
+            iterFooterLeftContent++)
+                delete(*iterFooterLeftContent);
+        delete mpFooterLeftContent;
+    }
+
+    mpFooterLeftContent = pFooterContent;
+}
+
+void PageSpan::writePageLayout(const int iNum, DocumentHandlerInterface *pHandler) const
+{
+        WPXPropertyList propList;
+
+    WPXString sPageLayoutName;
+        sPageLayoutName.sprintf("PM%i", iNum+2);
+        propList.insert("style:name", sPageLayoutName);
+    pHandler->startElement("style:page-layout", propList);
 
     WPXPropertyList tempPropList = mxPropList;
     if (!tempPropList["style:writing-mode"])
         tempPropList.insert("style:writing-mode", WPXString("lr-tb"));
     if (!tempPropList["style:footnote-max-height"])
-        tempPropList.insert("style:footnote-max-height", WPXString("0inch"));
-        pHandler->startElement("style:properties", tempPropList);
+        tempPropList.insert("style:footnote-max-height", WPXString("0in"));
+        pHandler->startElement("style:page-layout-properties", tempPropList);
 
     WPXPropertyList footnoteSepPropList;
-    footnoteSepPropList.insert("style:width", WPXString("0.0071inch"));
-    footnoteSepPropList.insert("style:distance-before-sep", WPXString("0.0398inch"));
-    footnoteSepPropList.insert("style:distance-after-sep", WPXString("0.0398inch"));
+    footnoteSepPropList.insert("style:width", WPXString("0.0071in"));
+    footnoteSepPropList.insert("style:distance-before-sep", WPXString("0.0398in"));
+    footnoteSepPropList.insert("style:distance-after-sep", WPXString("0.0398in"));
     footnoteSepPropList.insert("style:adjustment", WPXString("left"));
     footnoteSepPropList.insert("style:rel-width", WPXString("25%"));
     footnoteSepPropList.insert("style:color", WPXString("#000000"));
     pHandler->startElement("style:footnote-sep", footnoteSepPropList);
 
     pHandler->endElement("style:footnote-sep");
-        pHandler->endElement("style:properties");
-        pHandler->endElement("style:page-master");
+        pHandler->endElement("style:page-layout-properties");
+        pHandler->endElement("style:page-layout");
 }
 
-void PageSpan::writeMasterPages(const int iStartingNum, const int iPageMasterNum, const bool bLastPageSpan,
-                                DocumentHandler *pHandler) const
+void PageSpan::writeMasterPages(const int iStartingNum, const int iPageLayoutNum, const bool bLastPageSpan,
+                                DocumentHandlerInterface *pHandler) const
 {
     int iSpan = 0;
     (bLastPageSpan) ? iSpan = 1 : iSpan = getSpan();
@@ -128,29 +202,58 @@ void PageSpan::writeMasterPages(const int iStartingNum, const int iPageMasterNum
     for (int i=iStartingNum; i<(iStartingNum+iSpan); i++)
     {
         TagOpenElement masterPageOpen("style:master-page");
-        WPXString sMasterPageName;
-        sMasterPageName.sprintf("Page Style %i", i);
-        WPXString sPageMasterName;
-        sPageMasterName.sprintf("PM%i", iPageMasterNum /* +2 */);
+        WPXString sMasterPageName, sMasterPageDisplayName;
+        sMasterPageName.sprintf("Page_Style_%i", i);
+        sMasterPageDisplayName.sprintf("Page Style %i", i);
+        WPXString sPageLayoutName;
         WPXPropertyList propList;
+        sPageLayoutName.sprintf("PM%i", iPageLayoutNum+2);
                 propList.insert("style:name", sMasterPageName);
-        propList.insert("style:page-master-name", sPageMasterName);
+        propList.insert("style:display-name", sMasterPageDisplayName);
+        propList.insert("style:page-layout-name", sPageLayoutName);
         if (!bLastPageSpan)
         {
             WPXString sNextMasterPageName;
-            sNextMasterPageName.sprintf("Page Style %i", (i+1));
+            sNextMasterPageName.sprintf("Page_Style_%i", (i+1));
                         propList.insert("style:next-style-name", sNextMasterPageName);
         }
                 pHandler->startElement("style:master-page", propList);
 
         if (mpHeaderContent)
+        {
             _writeHeaderFooter("style:header", *mpHeaderContent, pHandler);
+            pHandler->endElement("style:header");
         if (mpHeaderLeftContent)
+            {
+            _writeHeaderFooter("style:header-left", *mpHeaderLeftContent, pHandler);
+                pHandler->endElement("style:header-left");
+            }
+        }
+        else if (mpHeaderLeftContent)
+        {
+            TagOpenElement("style:header").write(pHandler);
+            pHandler->endElement("style:header");
             _writeHeaderFooter("style:header-left", *mpHeaderLeftContent, pHandler);
+            pHandler->endElement("style:header-left");
+        }
+
         if (mpFooterContent)
+        {
             _writeHeaderFooter("style:footer", *mpFooterContent, pHandler);
+            pHandler->endElement("style:footer");
         if (mpFooterLeftContent)
+            {
             _writeHeaderFooter("style:footer-left", *mpFooterLeftContent, pHandler);
+                pHandler->endElement("style:footer-left");
+            }
+        }
+        else if (mpFooterLeftContent)
+        {
+            TagOpenElement("style:footer").write(pHandler);
+            pHandler->endElement("style:footer");
+            _writeHeaderFooter("style:footer-left", *mpFooterLeftContent, pHandler);
+            pHandler->endElement("style:footer-left");
+        }
 
                 pHandler->endElement("style:master-page");
     }
@@ -159,17 +262,15 @@ void PageSpan::writeMasterPages(const int iStartingNum, const int iPageMasterNum
 
 void PageSpan::_writeHeaderFooter(const char *headerFooterTagName,
                   const std::vector<DocumentElement *> & headerFooterContent,
-                  DocumentHandler *pHandler) const
+                  DocumentHandlerInterface *pHandler) const
 {
     TagOpenElement headerFooterOpen(headerFooterTagName);
     headerFooterOpen.write(pHandler);
     for (std::vector<DocumentElement *>::const_iterator iter = headerFooterContent.begin();
          iter != headerFooterContent.end();
-         iter++) {
+         ++iter) {
         (*iter)->write(pHandler);
     }
-    TagCloseElement headerFooterClose(headerFooterTagName);
-    headerFooterClose.write(pHandler);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/filter/PageSpan.hxx b/writerperfect/source/filter/PageSpan.hxx
index f2165d4062f4..92eba26fe4a4 100644
--- a/writerperfect/source/filter/PageSpan.hxx
+++ b/writerperfect/source/filter/PageSpan.hxx
@@ -27,35 +27,30 @@
  */
 #ifndef _PAGESPAN_H
 #define _PAGESPAN_H
-#if defined _MSC_VER
-#pragma warning( push, 1 )
-#endif
 #include <libwpd/libwpd.h>
-#if defined _MSC_VER
-#pragma warning( pop )
-#endif
 #include <vector>
 
 class DocumentElement;
-class DocumentHandler;
+class DocumentHandlerInterface;
 
 class PageSpan
 {
 public:
     PageSpan(const WPXPropertyList &xPropList);
     virtual ~PageSpan();
-    void writePageMaster(const int iNum, DocumentHandler *pHandler) const;
-    void writeMasterPages(const int iStartingNum, const int iPageMasterNum, const bool bLastPageSpan, DocumentHandler *pHandler) const;
+    void writePageLayout(const int iNum, DocumentHandlerInterface *pHandler) const;
+    void writeMasterPages(const int iStartingNum, const int iPageLayoutNum, const bool bLastPageSpan, DocumentHandlerInterface *pHandler) const;
     int getSpan() const;
+    double getMarginLeft() const;
+    double getMarginRight() const;
 
-    const std::vector<DocumentElement *> * getHeaderContent() const { return mpHeaderContent; }
-    void setHeaderContent(std::vector<DocumentElement *> * pHeaderContent) { mpHeaderContent = pHeaderContent; }
-    void setFooterContent(std::vector<DocumentElement *> * pFooterContent) { mpFooterContent = pFooterContent; }
-    void setHeaderLeftContent(std::vector<DocumentElement *> * pHeaderContent) { mpHeaderLeftContent = pHeaderContent; }
-    void setFooterLeftContent(std::vector<DocumentElement *> * pFooterContent) { mpFooterLeftContent = pFooterContent; }
+    void setHeaderContent(std::vector<DocumentElement *> * pHeaderContent);
+    void setFooterContent(std::vector<DocumentElement *> * pFooterContent);
+    void setHeaderLeftContent(std::vector<DocumentElement *> * pHeaderContent);
+    void setFooterLeftContent(std::vector<DocumentElement *> * pFooterContent);
 protected:
     void _writeHeaderFooter(const char *headerFooterTagName, const std::vector<DocumentElement *> & headerFooterContent,
-                DocumentHandler *pHandler) const;
+                DocumentHandlerInterface *pHandler) const;
 private:
         WPXPropertyList mxPropList;
     std::vector<DocumentElement *> * mpHeaderContent;
diff --git a/writerperfect/source/filter/SectionStyle.cxx b/writerperfect/source/filter/SectionStyle.cxx
index 73c5984fd53e..1b65fc7eae38 100644
--- a/writerperfect/source/filter/SectionStyle.cxx
+++ b/writerperfect/source/filter/SectionStyle.cxx
@@ -34,7 +34,7 @@
 
 #ifdef _MSC_VER
 double rint(double x);
-#endif /* _MSC_VER */
+#endif /* _WIN32 */
 
 SectionStyle::SectionStyle(const WPXPropertyList &xPropList,
                            const WPXPropertyListVector &xColumns,
@@ -45,7 +45,7 @@ SectionStyle::SectionStyle(const WPXPropertyList &xPropList,
 {
 }
 
-void SectionStyle::write(DocumentHandler *pHandler) const
+void SectionStyle::write(DocumentHandlerInterface *pHandler) const
 {
     TagOpenElement styleOpen("style:style");
     styleOpen.addAttribute("style:name", getName());
@@ -54,7 +54,7 @@ void SectionStyle::write(DocumentHandler *pHandler) const
 
     // if the number of columns is <= 1, we will never come here. This is only an additional check
     // style properties
-    pHandler->startElement("style:properties", mPropList);
+    pHandler->startElement("style:section-properties", mPropList);
 
     // column properties
     WPXPropertyList columnProps;
@@ -81,7 +81,7 @@ void SectionStyle::write(DocumentHandler *pHandler) const
     pHandler->endElement("style:columns");
 
 
-    pHandler->endElement("style:properties");
+    pHandler->endElement("style:section-properties");
 
     pHandler->endElement("style:style");
 }
diff --git a/writerperfect/source/filter/SectionStyle.hxx b/writerperfect/source/filter/SectionStyle.hxx
index eaf4410a497e..ee7a003fffae 100644
--- a/writerperfect/source/filter/SectionStyle.hxx
+++ b/writerperfect/source/filter/SectionStyle.hxx
@@ -27,14 +27,8 @@
  */
 #ifndef _SECTIONSTYLE_H
 #define _SECTIONSTYLE_H
-#if defined _MSC_VER
-#pragma warning( push, 1 )
-#endif
 #include <libwpd/libwpd.h>
 #include <libwpd/WPXPropertyListVector.h>
-#if defined _MSC_VER
-#pragma warning( pop )
-#endif
 
 #include "Style.hxx"
 #include "WriterProperties.hxx"
@@ -44,7 +38,7 @@ class SectionStyle : public Style
 {
 public:
     SectionStyle(const WPXPropertyList &xPropList, const WPXPropertyListVector &xColumns, const char *psName);
-    virtual void write(DocumentHandler *pHandler) const;
+    virtual void write(DocumentHandlerInterface *pHandler) const;
 
 private:
         WPXPropertyList mPropList;
diff --git a/writerperfect/source/filter/Style.hxx b/writerperfect/source/filter/Style.hxx
index 7232a028a69b..282041542017 100644
--- a/writerperfect/source/filter/Style.hxx
+++ b/writerperfect/source/filter/Style.hxx
@@ -28,13 +28,7 @@
 
 #ifndef _STYLE_H
 #define _STYLE_H
-#if defined _MSC_VER
-#pragma warning( push, 1 )
-#endif
 #include <libwpd/libwpd.h>
-#if defined _MSC_VER
-#pragma warning( pop )
-#endif
 #include "DocumentElement.hxx"
 
 class TopLevelElementStyle
@@ -55,7 +49,7 @@ class Style
     Style(const WPXString &psName) : msName(psName) {}
     virtual ~Style() {}
 
-    virtual void write(DocumentHandler * /* pHandler */) const {};
+    virtual void write(DocumentHandlerInterface * /* pHandler */) const {};
     const WPXString &getName() const { return msName; }
 
  private:
diff --git a/writerperfect/source/filter/TableStyle.cxx b/writerperfect/source/filter/TableStyle.cxx
index 1b00c35e3de4..2fc66ed04841 100644
--- a/writerperfect/source/filter/TableStyle.cxx
+++ b/writerperfect/source/filter/TableStyle.cxx
@@ -28,7 +28,6 @@
  * Corel Corporation or Corel Corporation Limited."
  */
 #include <math.h>
-#include <string.h>
 #include "FilterInternal.hxx"
 #include "TableStyle.hxx"
 #include "DocumentElement.hxx"
@@ -37,13 +36,15 @@
 #include <minmax.h>
 #endif
 
+#include <string.h>
+
 TableCellStyle::TableCellStyle(const WPXPropertyList &xPropList, const char *psName) :
     Style(psName),
         mPropList(xPropList)
 {
 }
 
-void TableCellStyle::write(DocumentHandler *pHandler) const
+void TableCellStyle::write(DocumentHandlerInterface *pHandler) const
 {
     TagOpenElement styleOpen("style:style");
     styleOpen.addAttribute("style:name", getName());
@@ -59,9 +60,9 @@ void TableCellStyle::write(DocumentHandler *pHandler) const
                 if (strlen(i.key()) > 2 && strncmp(i.key(), "fo", 2) == 0)
                         stylePropList.insert(i.key(), i()->clone());
         }
-        stylePropList.insert("fo:padding", "0.0382inch");
-        pHandler->startElement("style:properties", stylePropList);
-    pHandler->endElement("style:properties");
+        stylePropList.insert("fo:padding", "0.0382in");
+        pHandler->startElement("style:table-cell-properties", stylePropList);
+    pHandler->endElement("style:table-cell-properties");
 
     pHandler->endElement("style:style");
 }
@@ -72,20 +73,21 @@ TableRowStyle::TableRowStyle(const WPXPropertyList &propList, const char *psName
 {
 }
 
-void TableRowStyle::write(DocumentHandler *pHandler) const
+void TableRowStyle::write(DocumentHandlerInterface *pHandler) const
 {
     TagOpenElement styleOpen("style:style");
     styleOpen.addAttribute("style:name", getName());
     styleOpen.addAttribute("style:family", "table-row");
     styleOpen.write(pHandler);
 
-        TagOpenElement stylePropertiesOpen("style:properties");
+        TagOpenElement stylePropertiesOpen("style:table-row-properties");
         if (mPropList["style:min-row-height"])
                 stylePropertiesOpen.addAttribute("style:min-row-height", mPropList["style:min-row-height"]->getStr());
         else if (mPropList["style:row-height"])
                 stylePropertiesOpen.addAttribute("style:row-height", mPropList["style:row-height"]->getStr());
+    stylePropertiesOpen.addAttribute("fo:keep-together", "auto");
         stylePropertiesOpen.write(pHandler);
-        pHandler->endElement("style:properties");
+        pHandler->endElement("style:table-row-properties");
 
     pHandler->endElement("style:style");
 }
@@ -106,10 +108,9 @@ TableStyle::~TableStyle()
         delete(*iterTableCellStyles);
     for (TRSVIter iterTableRowStyles = mTableRowStyles.begin() ; iterTableRowStyles != mTableRowStyles.end(); iterTableRowStyles++)
         delete(*iterTableRowStyles);
-
 }
 
-void TableStyle::write(DocumentHandler *pHandler) const
+void TableStyle::write(DocumentHandlerInterface *pHandler) const
 {
     TagOpenElement styleOpen("style:style");
     styleOpen.addAttribute("style:name", getName());
@@ -118,7 +119,7 @@ void TableStyle::write(DocumentHandler *pHandler) const
         styleOpen.addAttribute("style:master-page-name", getMasterPageName()->cstr());
     styleOpen.write(pHandler);
 
-    TagOpenElement stylePropertiesOpen("style:properties");
+    TagOpenElement stylePropertiesOpen("style:table-properties");
         if (mPropList["table:align"])
                 stylePropertiesOpen.addAttribute("table:align", mPropList["table:align"]->getStr());
     if (mPropList["fo:margin-left"])
@@ -131,7 +132,7 @@ void TableStyle::write(DocumentHandler *pHandler) const
         stylePropertiesOpen.addAttribute("fo:break-before", mPropList["fo:break-before"]->getStr());
     stylePropertiesOpen.write(pHandler);
 
-    pHandler->endElement("style:properties");
+    pHandler->endElement("style:table-properties");
 
     pHandler->endElement("style:style");
 
@@ -139,15 +140,15 @@ void TableStyle::write(DocumentHandler *pHandler) const
         WPXPropertyListVector::Iter j(mColumns);
     for (j.rewind(); j.next();)
     {
-        TagOpenElement styleNestedOpen("style:style");
+        TagOpenElement styleOpen2("style:style");
         WPXString sColumnName;
         sColumnName.sprintf("%s.Column%i", getName().cstr(), i);
-        styleNestedOpen.addAttribute("style:name", sColumnName);
-        styleNestedOpen.addAttribute("style:family", "table-column");
-        styleNestedOpen.write(pHandler);
+        styleOpen2.addAttribute("style:name", sColumnName);
+        styleOpen2.addAttribute("style:family", "table-column");
+        styleOpen2.write(pHandler);
 
-                pHandler->startElement("style:properties", j());
-        pHandler->endElement("style:properties");
+        pHandler->startElement("style:table-column-properties", j());
+        pHandler->endElement("style:table-column-properties");
 
         pHandler->endElement("style:style");
 
diff --git a/writerperfect/source/filter/TableStyle.hxx b/writerperfect/source/filter/TableStyle.hxx
index eee08706c22d..95c30892faf5 100644
--- a/writerperfect/source/filter/TableStyle.hxx
+++ b/writerperfect/source/filter/TableStyle.hxx
@@ -39,15 +39,16 @@
 
 #include "Style.hxx"
 #include "WriterProperties.hxx"
+#include "DocumentHandlerInterface.hxx"
 
 class DocumentElement;
-class DocumentHandler;
 
 class TableCellStyle : public Style
 {
 public:
+    virtual ~TableCellStyle() {};
     TableCellStyle(const WPXPropertyList &xPropList, const char *psName);
-    virtual void write(DocumentHandler *pHandler) const;
+    virtual void write(DocumentHandlerInterface *pHandler) const;
 private:
         WPXPropertyList mPropList;
 };
@@ -55,8 +56,9 @@ private:
 class TableRowStyle : public Style
 {
 public:
+    virtual ~TableRowStyle() {};
     TableRowStyle(const WPXPropertyList &propList, const char *psName);
-    virtual void write(DocumentHandler *pHandler) const;
+    virtual void write(DocumentHandlerInterface *pHandler) const;
 private:
         WPXPropertyList mPropList;
 };
@@ -65,8 +67,8 @@ class TableStyle : public Style, public TopLevelElementStyle
 {
 public:
     TableStyle(const WPXPropertyList &xPropList, const WPXPropertyListVector &columns, const char *psName);
-    ~TableStyle();
-    virtual void write(DocumentHandler *pHandler) const;
+    virtual ~TableStyle();
+    virtual void write(DocumentHandlerInterface *pHandler) const;
     int getNumColumns() const { return mColumns.count(); }
     void addTableCellStyle(TableCellStyle *pTableCellStyle) { mTableCellStyles.push_back(pTableCellStyle); }
     int getNumTableCellStyles() { return mTableCellStyles.size(); }
diff --git a/writerperfect/source/filter/TextRunStyle.cxx b/writerperfect/source/filter/TextRunStyle.cxx
index 7e37d6def3b8..9b3bc9825fd9 100644
--- a/writerperfect/source/filter/TextRunStyle.cxx
+++ b/writerperfect/source/filter/TextRunStyle.cxx
@@ -51,7 +51,7 @@ ParagraphStyle::~ParagraphStyle()
     delete mpPropList;
 }
 
-void ParagraphStyle::write(DocumentHandler *pHandler) const
+void ParagraphStyle::write(DocumentHandlerInterface *pHandler) const
 {
     WRITER_DEBUG_MSG(("Writing a paragraph style..\n"));
 
@@ -64,49 +64,53 @@ void ParagraphStyle::write(DocumentHandler *pHandler) const
         pHandler->startElement("style:style", propList);
 
         propList.clear();
-    WPXPropertyList::Iter k((*mpPropList));
-    for (k.rewind(); k.next(); )
+    WPXPropertyList::Iter i((*mpPropList));
+    for (i.rewind(); i.next(); )
     {
-                if (strcmp(k.key(), "style:list-style-name") == 0)
-                        propList.insert("style:list-style-name", k()->getStr());
-        if (strcmp(k.key(), "fo:margin-left") == 0)
-            propList.insert("fo:margin-left", k()->getStr());
-        if (strcmp(k.key(), "fo:margin-right") == 0)
-            propList.insert("fo:margin-right", k()->getStr());
-        if (strcmp(k.key(), "fo:text-indent") == 0)
-            propList.insert("fo:text-indent", k()->getStr());
-        if (strcmp(k.key(), "fo:margin-top") == 0)
-            propList.insert("fo:margin-top", k()->getStr());
-        if (strcmp(k.key(), "fo:margin-bottom") == 0)
+#if 0
+        if (strcmp(i.key(), "style:list-style-name") == 0)
+            propList.insert("style:list-style-name", i()->getStr());
+#endif
+        if (strcmp(i.key(), "fo:margin-left") == 0)
+            propList.insert("fo:margin-left", i()->getStr());
+        if (strcmp(i.key(), "fo:margin-right") == 0)
+            propList.insert("fo:margin-right", i()->getStr());
+        if (strcmp(i.key(), "fo:text-indent") == 0)
+            propList.insert("fo:text-indent", i()->getStr());
+        if (strcmp(i.key(), "fo:margin-top") == 0)
+            propList.insert("fo:margin-top", i()->getStr());
+        if (strcmp(i.key(), "fo:margin-bottom") == 0)
         {
-            if (k()->getFloat() > 0.0f)
-                propList.insert("fo:margin-bottom", k()->getStr());
+            if (i()->getDouble() > 0.0f)
+                propList.insert("fo:margin-bottom", i()->getStr());
             else
                 propList.insert("fo:margin-bottom", 0.0f);
         }
-        if (strcmp(k.key(), "fo:line-height") == 0)
-            propList.insert("fo:line-height", k()->getStr());
-        if (strcmp(k.key(), "fo:break-before") == 0)
-            propList.insert("fo:break-before", k()->getStr());
-        if (strcmp(k.key(), "fo:text-align") == 0)
-            propList.insert("fo:text-align", k()->getStr());
-                if (strcmp(k.key(), "fo:text-align-last") == 0)
-                        propList.insert("fo:text-align-last", k()->getStr());
+        if (strcmp(i.key(), "fo:line-height") == 0)
+            propList.insert("fo:line-height", i()->getStr());
+        if (strcmp(i.key(), "fo:break-before") == 0)
+            propList.insert("fo:break-before", i()->getStr());
+        if (strcmp(i.key(), "fo:text-align") == 0)
+            propList.insert("fo:text-align", i()->getStr());
+        if (strcmp(i.key(), "fo:text-align-last") == 0)
+            propList.insert("fo:text-align-last", i()->getStr());
     }
 
     propList.insert("style:justify-single-word", "false");
-    pHandler->startElement("style:properties", propList);
+    pHandler->startElement("style:paragraph-properties", propList);
 
         if (mxTabStops.count() > 0)
         {
                 TagOpenElement tabListOpen("style:tab-stops");
                 tabListOpen.write(pHandler);
-                WPXPropertyListVector::Iter i(mxTabStops);
-                for (i.rewind(); i.next();)
+        WPXPropertyListVector::Iter i2(mxTabStops);
+        for (i2.rewind(); i2.next();)
                 {
+            if (i2()["style:position"] && i2()["style:position"]->getDouble() < 0)
+                continue;
                         TagOpenElement tabStopOpen("style:tab-stop");
 
-                        WPXPropertyList::Iter j(i());
+            WPXPropertyList::Iter j(i2());
                         for (j.rewind(); j.next(); )
                         {
                                 tabStopOpen.addAttribute(j.key(), j()->getStr().cstr());
@@ -117,7 +121,7 @@ void ParagraphStyle::write(DocumentHandler *pHandler) const
                 pHandler->endElement("style:tab-stops");
         }
 
-    pHandler->endElement("style:properties");
+    pHandler->endElement("style:paragraph-properties");
     pHandler->endElement("style:style");
 }
 
@@ -127,7 +131,7 @@ SpanStyle::SpanStyle(const char *psName, const WPXPropertyList &xPropList) :
 {
 }
 
-void SpanStyle::write(DocumentHandler *pHandler) const
+void SpanStyle::write(DocumentHandlerInterface *pHandler) const
 {
     WRITER_DEBUG_MSG(("Writing a span style..\n"));
         WPXPropertyList styleOpenList;
@@ -145,9 +149,14 @@ void SpanStyle::write(DocumentHandler *pHandler) const
 
     if (mPropList["fo:font-size"])
     {
+        if (mPropList["fo:font-size"]->getDouble() > 0.0f)
+        {
         propList.insert("style:font-size-asian", mPropList["fo:font-size"]->getStr());
         propList.insert("style:font-size-complex", mPropList["fo:font-size"]->getStr());
     }
+        else
+            propList.remove("fo:font-size");
+    }
 
     if (mPropList["fo:font-weight"])
     {
@@ -161,9 +170,9 @@ void SpanStyle::write(DocumentHandler *pHandler) const
         propList.insert("style:font-style-complex", mPropList["fo:font-style"]->getStr());
     }
 
-        pHandler->startElement("style:properties", propList);
+    pHandler->startElement("style:text-properties", propList);
 
-    pHandler->endElement("style:properties");
+    pHandler->endElement("style:text-properties");
     pHandler->endElement("style:style");
 }
 
diff --git a/writerperfect/source/filter/TextRunStyle.hxx b/writerperfect/source/filter/TextRunStyle.hxx
index 2bc29ed84be4..492132cfc54d 100644
--- a/writerperfect/source/filter/TextRunStyle.hxx
+++ b/writerperfect/source/filter/TextRunStyle.hxx
@@ -30,26 +30,19 @@
 
 #ifndef _TEXTRUNSTYLE_H
 #define _TEXTRUNSTYLE_H
-#if defined _MSC_VER
-#pragma warning( push, 1 )
-#endif
 #include <libwpd/libwpd.h>
-#if defined _MSC_VER
-#pragma warning( pop )
-#endif
 
 #include "Style.hxx"
 
 class TagOpenElement;
 class DocumentElement;
-class DocumentHandler;
 
 class ParagraphStyle
 {
 public:
     ParagraphStyle(WPXPropertyList *propList, const WPXPropertyListVector &tabStops, const WPXString &sName);
     virtual ~ParagraphStyle();
-    virtual void write(DocumentHandler *pHandler) const;
+    virtual void write(DocumentHandlerInterface *pHandler) const;
     WPXString getName() const { return msName; }
 private:
     WPXPropertyList *mpPropList;
@@ -62,7 +55,7 @@ class SpanStyle : public Style
 {
 public:
     SpanStyle(const char *psName, const WPXPropertyList &xPropList);
-    virtual void write(DocumentHandler *pHandler) const;
+    virtual void write(DocumentHandlerInterface *pHandler) const;
 
 private:
         WPXPropertyList mPropList;
diff --git a/writerperfect/source/filter/WriterProperties.hxx b/writerperfect/source/filter/WriterProperties.hxx
index ea539125fe57..757807ef3977 100644
--- a/writerperfect/source/filter/WriterProperties.hxx
+++ b/writerperfect/source/filter/WriterProperties.hxx
@@ -33,7 +33,6 @@
 #define IMP_DEFAULT_FONT_NAME "Times New Roman"
 #define IMP_DEFAULT_FONT_SIZE 12.0f
 #define IMP_DEFAULT_FONT_PITCH "variable"
-#define IMP_DEFAULT_FONT_COLOR (new RGBSColor(0x00,0x00,0x00,0x64))
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/filter/makefile.mk b/writerperfect/source/filter/makefile.mk
index a092ce27db2e..f211101f706e 100644
--- a/writerperfect/source/filter/makefile.mk
+++ b/writerperfect/source/filter/makefile.mk
@@ -10,6 +10,10 @@ ENABLE_EXCEPTIONS=true
 INCPRE+=$(LIBWPD_CFLAGS)
 .ENDIF
 
+.IF "$(SYSTEM_LIBWPG)" == "YES"
+INCPRE+=$(LIBWPG_CFLAGS)
+.ENDIF
+
 .IF "$(SYSTEM_LIBWPS)" == "YES"
 INCPRE+=$(LIBWPS_CFLAGS)
 .ENDIF
@@ -18,14 +22,17 @@ INCPRE+=$(LIBWPS_CFLAGS)
 INCPRE+= -I..
 
 SLOFILES= \
+    $(SLO)$/DocumentCollector.obj \
     $(SLO)$/DocumentElement.obj		\
+    $(SLO)$/DocumentHandler.obj \
     $(SLO)$/FontStyle.obj			\
+    $(SLO)$/GraphicsStyle.obj \
+    $(SLO)$/InternalHandler.obj \
     $(SLO)$/ListStyle.obj			\
-    $(SLO)$/DocumentHandler.obj		\
+    $(SLO)$/OdgExporter.obj \
     $(SLO)$/PageSpan.obj			\
     $(SLO)$/SectionStyle.obj		\
     $(SLO)$/TableStyle.obj			\
-    $(SLO)$/TextRunStyle.obj 		\
-    $(SLO)$/DocumentCollector.obj
+    $(SLO)$/TextRunStyle.obj
 
 .INCLUDE :  target.mk
diff --git a/writerperfect/source/stream/WPXSvStream.cxx b/writerperfect/source/stream/WPXSvStream.cxx
index 4485eb8f726c..fd7d98604a07 100644
--- a/writerperfect/source/stream/WPXSvStream.cxx
+++ b/writerperfect/source/stream/WPXSvStream.cxx
@@ -10,7 +10,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::io;
 
 WPXSvInputStream::WPXSvInputStream( Reference< XInputStream > xStream ) :
-        WPSInputStream(),
+        WPXInputStream(),
         mxChildStorage(),
         mxChildStream(),
         mxStream(xStream),
@@ -42,7 +42,7 @@ WPXSvInputStream::~WPXSvInputStream()
 {
 }
 
-const uint8_t * WPXSvInputStream::read(size_t numBytes, size_t &numBytesRead)
+const unsigned char * WPXSvInputStream::read(unsigned long numBytes, unsigned long &numBytesRead)
 {
     numBytesRead = 0;
 
@@ -53,7 +53,7 @@ const uint8_t * WPXSvInputStream::read(size_t numBytes, size_t &numBytesRead)
     if (numBytesRead == 0)
         return 0;
 
-    return (const uint8_t *)maData.getConstArray();
+    return (const unsigned char *)maData.getConstArray();
 }
 
 long WPXSvInputStream::tell()
@@ -169,9 +169,4 @@ WPXInputStream * WPXSvInputStream::getDocumentOLEStream(const char * name)
         return 0;
 }
 
-WPXInputStream * WPXSvInputStream::getDocumentOLEStream()
-{
-    return getDocumentOLEStream( "PerfectOffice_MAIN" );
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/stream/WPXSvStream.h b/writerperfect/source/stream/WPXSvStream.h
index edc010df3010..37d905adcc41 100644
--- a/writerperfect/source/stream/WPXSvStream.h
+++ b/writerperfect/source/stream/WPXSvStream.h
@@ -13,13 +13,12 @@
 #if defined _MSC_VER
 #pragma warning( push, 1 )
 #endif
-#include <libwps/WPSStream.h>
-#include <libwpd/WPXStream.h>
+#include <libwpd-stream/WPXStream.h>
 #if defined _MSC_VER
 #pragma warning( pop )
 #endif
 
-class WPXSvInputStream : public WPSInputStream
+class WPXSvInputStream : public WPXInputStream
 {
 public:
     WPXSvInputStream( ::com::sun::star::uno::Reference<
@@ -27,10 +26,9 @@ public:
     virtual ~WPXSvInputStream();
 
     virtual bool isOLEStream();
-    virtual WPXInputStream * getDocumentOLEStream();
     virtual WPXInputStream * getDocumentOLEStream(const char *name);
 
-    virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead);
+    virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
     virtual int seek(long offset, WPX_SEEK_TYPE seekType);
     virtual long tell();
     virtual bool atEOS();
diff --git a/writerperfect/source/wpdimp/WordPerfectCollector.cxx b/writerperfect/source/wpdimp/WordPerfectCollector.cxx
index a5b57181af78..83fdec5ff9cd 100644
--- a/writerperfect/source/wpdimp/WordPerfectCollector.cxx
+++ b/writerperfect/source/wpdimp/WordPerfectCollector.cxx
@@ -36,8 +36,9 @@
 #pragma warning( pop )
 #endif
 
-WordPerfectCollector::WordPerfectCollector(WPSInputStream *pInput, DocumentHandler *pHandler) :
-    DocumentCollector(pInput, pHandler)
+WordPerfectCollector::WordPerfectCollector(WPXInputStream *pInput, DocumentHandlerInterface *pHandler, const rtl::OString& password) :
+    DocumentCollector(pInput, pHandler),
+    maUtf8Password(password)
 {
 }
 
@@ -45,9 +46,13 @@ WordPerfectCollector::~WordPerfectCollector()
 {
 }
 
-bool WordPerfectCollector::parseSourceDocument(WPSInputStream &input)
+bool WordPerfectCollector::parseSourceDocument(WPXInputStream &input)
 {
-        WPDResult result = WPDocument::parse(&input, static_cast<WPXHLListenerImpl *>(this));
+        WPDResult result;
+        if (maUtf8Password.getLength())
+            result = WPDocument::parse(&input, static_cast<WPXDocumentInterface *>(this), maUtf8Password.getStr());
+        else
+            result = WPDocument::parse(&input, static_cast<WPXDocumentInterface *>(this), NULL);
         if (result != WPD_OK)
                 return false;
 
diff --git a/writerperfect/source/wpdimp/WordPerfectCollector.hxx b/writerperfect/source/wpdimp/WordPerfectCollector.hxx
index b38cba0646b3..fce25691e951 100644
--- a/writerperfect/source/wpdimp/WordPerfectCollector.hxx
+++ b/writerperfect/source/wpdimp/WordPerfectCollector.hxx
@@ -31,13 +31,17 @@
 #define _WORDPERFECTCOLLECTOR_HXX
 
 #include "filter/DocumentCollector.hxx"
+#include "filter/DocumentHandlerInterface.hxx"
+#include <rtl/ustring.hxx>
 
 class WordPerfectCollector : public DocumentCollector
 {
 public:
-    WordPerfectCollector(WPSInputStream *pInput, DocumentHandler *pHandler);
+    WordPerfectCollector(WPXInputStream *pInput, DocumentHandlerInterface *pHandler, const rtl::OString& password);
     virtual ~WordPerfectCollector();
-    bool parseSourceDocument(WPSInputStream &pInput);
+    bool parseSourceDocument(WPXInputStream &pInput);
+private:
+    rtl::OString maUtf8Password;
 };
 #endif
 
diff --git a/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx b/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx
index 560940814838..1bd7e16cd6fa 100644
--- a/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx
+++ b/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx
@@ -1,7 +1,5 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* WordPerfectImportFilter: Sets up the filter, and calls DocumentCollector
- * to do the actual filtering
- *
+/*
  * Copyright (C) 2000 by Sun Microsystems, Inc.
  * Copyright (C) 2002-2004 William Lachance (wlach@interlog.com)
  * Copyright (C) 2004 Net Integration Technologies (http://www.net-itech.com)
@@ -32,16 +30,16 @@
 #include <osl/diagnose.h>
 #include <rtl/tencinfo.h>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <com/sun/star/xml/sax/InputSource.hpp>
 #include <com/sun/star/xml/sax/XParser.hpp>
-
+#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 
 #include <xmloff/attrlist.hxx>
 #include <ucbhelper/content.hxx>
+#include <sfx2/passwd.hxx>
 
 #include "filter/FilterInternal.hxx"
 #include "filter/DocumentHandler.hxx"
@@ -107,11 +105,38 @@ sal_Bool SAL_CALL WordPerfectImportFilter::importImpl( const Sequence< ::com::su
         OSL_ASSERT( 0 );
         return sal_False;
     }
-    OString sFileName;
-    sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII);
+
+    WPXSvInputStream input( xInputStream );
+
+    OString aUtf8Passwd;
+
+#if 1
+    WPDConfidence confidence = WPDocument::isFileFormatSupported(&input);
+
+    if (WPD_CONFIDENCE_SUPPORTED_ENCRYPTION == confidence)
+    {
+        int unsuccessfulAttempts = 0;
+        while (true )
+        {
+            SfxPasswordDialog aPasswdDlg( 0 );
+            aPasswdDlg.SetMinLen(0);
+            if(!aPasswdDlg.Execute())
+                return sal_False;
+            String aPasswd = aPasswdDlg.GetPassword();
+            OUString aUniPasswd(aPasswd.GetBuffer() /*, aPasswd.Len(), RTL_TEXTENCODING_UCS2 */);
+            aUtf8Passwd = OUStringToOString(aUniPasswd, RTL_TEXTENCODING_UTF8);
+            if (WPD_PASSWORD_MATCH_OK == WPDocument::verifyPassword(&input, aUtf8Passwd.getStr()))
+                break;
+            else
+                unsuccessfulAttempts++;
+            if (unsuccessfulAttempts == 3) // timeout after 3 password atempts
+                return sal_False;
+        }
+    }
+#endif
 
     // An XML import service: what we push sax messages to..
-    OUString sXMLImportService ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.XMLImporter" ) );
+    OUString sXMLImportService ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.XMLOasisImporter" ) );
     uno::Reference < XDocumentHandler > xInternalHandler( mxMSF->createInstance( sXMLImportService ), UNO_QUERY );
 
     // The XImporter sets up an empty target document for XDocumentHandler to write to..
@@ -122,9 +147,7 @@ sal_Bool SAL_CALL WordPerfectImportFilter::importImpl( const Sequence< ::com::su
         // writes to in-memory target doc
         DocumentHandler xHandler(xInternalHandler);
 
-    WPXSvInputStream input( xInputStream );
-
-    WordPerfectCollector collector(&input, &xHandler);
+    WordPerfectCollector collector(&input, &xHandler, aUtf8Passwd);
     collector.filter();
 
     return true;
@@ -196,9 +219,9 @@ OUString SAL_CALL WordPerfectImportFilter::detect( com::sun::star::uno::Sequence
     if (input.atEOS())
         return ::rtl::OUString();
 
-    confidence = WPDocument::isFileFormatSupported(&input, false);
+    confidence = WPDocument::isFileFormatSupported(&input);
 
-    if (confidence == WPD_CONFIDENCE_EXCELLENT)
+    if (confidence == WPD_CONFIDENCE_EXCELLENT || confidence == WPD_CONFIDENCE_SUPPORTED_ENCRYPTION)
         sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "writer_WordPerfect_Document" ) );
 
     if (sTypeName.getLength())
@@ -206,7 +229,7 @@ OUString SAL_CALL WordPerfectImportFilter::detect( com::sun::star::uno::Sequence
         if ( location == Descriptor.getLength() )
         {
             Descriptor.realloc(nLength+1);
-            Descriptor[location].Name = ::rtl::OUString::createFromAscii( "TypeName" );
+            Descriptor[location].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeName"));
         }
 
            Descriptor[location].Value <<=sTypeName;
@@ -255,7 +278,6 @@ Sequence< OUString > SAL_CALL WordPerfectImportFilter_getSupportedServiceNames(
     throw (RuntimeException)
 {
     Sequence < OUString > aRet(2);
-//  Sequence < OUString > aRet(1);
         OUString* pArray = aRet.getArray();
         pArray[0] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME1 ) );
     pArray[1] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME2 ) );
@@ -287,4 +309,126 @@ Sequence< OUString > SAL_CALL WordPerfectImportFilter::getSupportedServiceNames(
     return WordPerfectImportFilter_getSupportedServiceNames();
 }
 
+
+WordPerfectImportFilterDialog::WordPerfectImportFilterDialog(const ::com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory > &r ) :
+    mxMSF( r ) {}
+
+WordPerfectImportFilterDialog::~WordPerfectImportFilterDialog()
+{
+}
+
+void SAL_CALL WordPerfectImportFilterDialog::setTitle( const ::rtl::OUString& )
+            throw (::com::sun::star::uno::RuntimeException)
+{
+}
+
+sal_Int16 SAL_CALL WordPerfectImportFilterDialog::execute()
+            throw (::com::sun::star::uno::RuntimeException)
+{
+    WPXSvInputStream input( mxInputStream );
+
+    OString aUtf8Passwd;
+
+    WPDConfidence confidence = WPDocument::isFileFormatSupported(&input);
+
+    if (WPD_CONFIDENCE_SUPPORTED_ENCRYPTION == confidence)
+    {
+        int unsuccessfulAttempts = 0;
+        while (true )
+        {
+            SfxPasswordDialog aPasswdDlg(0);
+            aPasswdDlg.SetMinLen(0);
+            if(!aPasswdDlg.Execute())
+                return com::sun::star::ui::dialogs::ExecutableDialogResults::CANCEL;
+            msPassword = ::rtl::OUString(aPasswdDlg.GetPassword().GetBuffer());
+            aUtf8Passwd = OUStringToOString(msPassword, RTL_TEXTENCODING_UTF8);
+            if (WPD_PASSWORD_MATCH_OK == WPDocument::verifyPassword(&input, aUtf8Passwd.getStr()))
+                break;
+            else
+                unsuccessfulAttempts++;
+            if (unsuccessfulAttempts == 3) // timeout after 3 password atempts
+                return com::sun::star::ui::dialogs::ExecutableDialogResults::CANCEL;
+        }
+    }
+    return com::sun::star::ui::dialogs::ExecutableDialogResults::OK;
+}
+
+uno::Sequence<beans::PropertyValue> SAL_CALL WordPerfectImportFilterDialog::getPropertyValues() throw(uno::RuntimeException)
+{
+    uno::Sequence<beans::PropertyValue> aRet(1);
+    beans::PropertyValue* pArray = aRet.getArray();
+
+    pArray[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Password") );
+    pArray[0].Value <<= msPassword;
+
+    return aRet;
+}
+
+void SAL_CALL WordPerfectImportFilterDialog::setPropertyValues( const uno::Sequence<beans::PropertyValue>& aProps)
+                    throw(beans::UnknownPropertyException, beans::PropertyVetoException,
+                            lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
+{
+    const beans::PropertyValue* pPropArray = aProps.getConstArray();
+    long nPropCount = aProps.getLength();
+    for (long i = 0; i < nPropCount; i++)
+    {
+        const beans::PropertyValue& rProp = pPropArray[i];
+        ::rtl::OUString aPropName = rProp.Name;
+
+        if ( aPropName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Password")) )
+            rProp.Value >>= msPassword;
+        else if ( aPropName.equalsAscii( "InputStream" ) )
+            rProp.Value >>= mxInputStream;
+    }
+}
+
+
+// XServiceInfo
+OUString SAL_CALL WordPerfectImportFilterDialog::getImplementationName(  )
+    throw (RuntimeException)
+{
+    return WordPerfectImportFilterDialog_getImplementationName();
+}
+
+sal_Bool SAL_CALL WordPerfectImportFilterDialog::supportsService( const OUString& rServiceName )
+    throw (RuntimeException)
+{
+    return WordPerfectImportFilterDialog_supportsService( rServiceName );
+}
+
+Sequence< OUString > SAL_CALL WordPerfectImportFilterDialog::getSupportedServiceNames(  )
+    throw (RuntimeException)
+{
+    return WordPerfectImportFilterDialog_getSupportedServiceNames();
+}
+
+OUString WordPerfectImportFilterDialog_getImplementationName ()
+    throw (RuntimeException)
+{
+    return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.WordPerfectImportFilterDialog" ) );
+}
+
+#define SERVICE_NAME "com.sun.star.ui.dialogs.FilterOptionsDialog"
+sal_Bool SAL_CALL WordPerfectImportFilterDialog_supportsService( const OUString& ServiceName )
+    throw (RuntimeException)
+{
+    return ( ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME ) ) );
+}
+
+Sequence< OUString > SAL_CALL WordPerfectImportFilterDialog_getSupportedServiceNames(  )
+    throw (RuntimeException)
+{
+    Sequence < OUString > aRet(1);
+    OUString* pArray = aRet.getArray();
+    pArray[0] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
+    return aRet;
+}
+#undef SERVICE_NAME
+
+uno::Reference< XInterface > SAL_CALL WordPerfectImportFilterDialog_createInstance( const uno::Reference< XMultiServiceFactory > & rSMgr)
+    throw( Exception )
+{
+    return (cppu::OWeakObject*) new WordPerfectImportFilterDialog( rSMgr );
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/wpdimp/WordPerfectImportFilter.hxx b/writerperfect/source/wpdimp/WordPerfectImportFilter.hxx
index 2a4cc666cdca..50b995ff70bf 100644
--- a/writerperfect/source/wpdimp/WordPerfectImportFilter.hxx
+++ b/writerperfect/source/wpdimp/WordPerfectImportFilter.hxx
@@ -33,9 +33,13 @@
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/document/XImporter.hpp>
 #include <com/sun/star/document/XExtendedFilterDetection.hpp>
+#include <com/sun/star/beans/XPropertyAccess.hpp>
+#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/implbase5.hxx>
 
 enum FilterType
@@ -113,6 +117,62 @@ sal_Bool SAL_CALL WordPerfectImportFilter_supportsService( const ::rtl::OUString
 SAL_CALL WordPerfectImportFilter_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr)
     throw ( ::com::sun::star::uno::Exception );
 
+
+class WordPerfectImportFilterDialog : public cppu::WeakImplHelper3 <
+        com::sun::star::ui::dialogs::XExecutableDialog,
+        com::sun::star::lang::XServiceInfo,
+        com::sun::star::beans::XPropertyAccess
+>
+{
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF;
+    ::rtl::OUString msPassword;
+    ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > mxInputStream;
+
+    ~WordPerfectImportFilterDialog();
+
+    // XExecutableDialog
+       virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle )
+            throw (::com::sun::star::uno::RuntimeException);
+       virtual sal_Int16 SAL_CALL execute()
+            throw (::com::sun::star::uno::RuntimeException);
+
+    // XServiceInfo
+        virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+            throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+            throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+            throw (::com::sun::star::uno::RuntimeException);
+
+    // XPropertyAccess
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
+                            SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL    setPropertyValues( const ::com::sun::star::uno::Sequence<
+                                    ::com::sun::star::beans::PropertyValue >& aProps )
+                                throw (::com::sun::star::beans::UnknownPropertyException,
+                                        ::com::sun::star::beans::PropertyVetoException,
+                                        ::com::sun::star::lang::IllegalArgumentException,
+                                        ::com::sun::star::lang::WrappedTargetException,
+                                        ::com::sun::star::uno::RuntimeException);
+
+public:
+    WordPerfectImportFilterDialog(const ::com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory > &r );
+
+};
+
+::rtl::OUString WordPerfectImportFilterDialog_getImplementationName()
+    throw ( ::com::sun::star::uno::RuntimeException );
+
+sal_Bool SAL_CALL WordPerfectImportFilterDialog_supportsService( const ::rtl::OUString& ServiceName )
+    throw ( ::com::sun::star::uno::RuntimeException );
+
+::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL WordPerfectImportFilterDialog_getSupportedServiceNames(  )
+    throw ( ::com::sun::star::uno::RuntimeException );
+
+::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
+SAL_CALL WordPerfectImportFilterDialog_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr)
+    throw ( ::com::sun::star::uno::Exception );
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/wpdimp/makefile.mk b/writerperfect/source/wpdimp/makefile.mk
index 745887eb8588..e2dd8d746546 100644
--- a/writerperfect/source/wpdimp/makefile.mk
+++ b/writerperfect/source/wpdimp/makefile.mk
@@ -10,6 +10,10 @@ ENABLE_EXCEPTIONS=true
 INCPRE+=$(LIBWPD_CFLAGS)
 .ENDIF
 
+.IF "$(SYSTEM_LIBWPG)" == "YES"
+INCPRE+=$(LIBWPG_CFLAGS)
+.ENDIF
+
 .IF "$(SYSTEM_LIBWPS)" == "YES"
 INCPRE+=$(LIBWPS_CFLAGS)
 .ENDIF
diff --git a/writerperfect/source/wpdimp/wpft_genericfilter.cxx b/writerperfect/source/wpdimp/wpft_genericfilter.cxx
index 36378097ed35..eb3cb035a001 100644
--- a/writerperfect/source/wpdimp/wpft_genericfilter.cxx
+++ b/writerperfect/source/wpdimp/wpft_genericfilter.cxx
@@ -57,13 +57,21 @@ sal_Bool SAL_CALL component_writeInfo(
             sal_Int32 nPos = 0;
             Reference< XRegistryKey > xNewKey(
                 reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( WordPerfectImportFilter_getImplementationName() ) );
-            xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+            xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
 
             const Sequence< OUString > & rSNL = WordPerfectImportFilter_getSupportedServiceNames();
             const OUString * pArray = rSNL.getConstArray();
             for ( nPos = rSNL.getLength(); nPos--; )
                 xNewKey->createKey( pArray[nPos] );
+#if 0
+            xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( WordPerfectImportFilterDialog_getImplementationName() );
+            xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
 
+            const Sequence< OUString > & rSNL2 = WordPerfectImportFilterDialog_getSupportedServiceNames();
+            pArray = rSNL2.getConstArray();
+            for ( nPos = rSNL2.getLength(); nPos--; )
+                xNewKey->createKey( pArray[nPos] );
+#endif
             return sal_True;
         }
         catch (InvalidRegistryException &)
@@ -93,6 +101,21 @@ void * SAL_CALL component_getFactory(
             pRet = xFactory.get();
         }
     }
+#if 0
+    else if ( pServiceManager && implName.equals(WordPerfectImportFilterDialog_getImplementationName()) )
+    {
+        Reference< XSingleServiceFactory > xFactory( createSingleFactory(
+            reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
+            OUString::createFromAscii( pImplName ),
+            WordPerfectImportFilterDialog_createInstance, WordPerfectImportFilterDialog_getSupportedServiceNames() ) );
+
+        if (xFactory.is())
+        {
+            xFactory->acquire();
+            pRet = xFactory.get();
+        }
+    }
+#endif
 
     return pRet;
 }
diff --git a/writerperfect/source/wpgimp/OdgExporter.cxx b/writerperfect/source/wpgimp/OdgExporter.cxx
deleted file mode 100644
index 36d13948ae8f..000000000000
--- a/writerperfect/source/wpgimp/OdgExporter.cxx
+++ /dev/null
@@ -1,513 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* libwpg
- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
- * Copyright (C) 2006-2007 Fridrich Strba (fridrich.strba@bluewin.ch)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02111-1301 USA
- *
- * For further information visit http://libwpg.sourceforge.net
- */
-
-/* "This product is not manufactured, approved, or supported by
- * Corel Corporation or Corel Corporation Limited."
- */
-
-#include "OdgExporter.hxx"
-#include "filter/DocumentElement.hxx"
-#include "filter/DocumentHandler.hxx"
-#include <rtl/math.hxx>
-
-
-OdgExporter::OdgExporter(DocumentHandler *pHandler):
-    mpHandler(pHandler),
-    m_fillRule(AlternatingFill),
-    m_gradientIndex(1),
-    m_dashIndex(1),
-    m_styleIndex(1)
-{
-}
-
-OdgExporter::~OdgExporter()
-{
-}
-
-void OdgExporter::startDocument(double width, double height)
-{
-    m_gradientIndex = 1;
-    m_dashIndex = 1;
-    m_styleIndex = 1;
-
-    mpHandler->startDocument();
-    TagOpenElement tmpOfficeDocumentContent("office:document");
-    tmpOfficeDocumentContent.addAttribute("xmlns:office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0");
-    tmpOfficeDocumentContent.addAttribute("xmlns:style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0");
-    tmpOfficeDocumentContent.addAttribute("xmlns:text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0");
-    tmpOfficeDocumentContent.addAttribute("xmlns:draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0");
-    tmpOfficeDocumentContent.addAttribute("xmlns:dc", "http://purl.org/dc/elements/1.1/");
-    tmpOfficeDocumentContent.addAttribute("xmlns:svg", "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0");
-    tmpOfficeDocumentContent.addAttribute("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0");
-    tmpOfficeDocumentContent.addAttribute("office:version", "1.0");
-    tmpOfficeDocumentContent.write(mpHandler);
-
-    TagOpenElement("office:styles").write(mpHandler);
-    TagCloseElement("office:styles").write(mpHandler);
-
-    TagOpenElement("office:automatic-styles").write(mpHandler);
-
-    TagOpenElement tmpStylePageLayoutOpenElement("style:page-layout");
-    tmpStylePageLayoutOpenElement.addAttribute("style:name", "PM0");
-    tmpStylePageLayoutOpenElement.write(mpHandler);
-
-    TagOpenElement tmpStylePageLayoutPropertiesOpenElement("style:page-layout-properties");
-    tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-top", "0cm");
-    tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-bottom", "0cm");
-    tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-left", "0cm");
-    tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-right", "0cm");
-    WPXString sValue;
-    sValue = doubleToString(2.54 * width); sValue.append("cm");
-    tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-width", sValue);
-    sValue = doubleToString(2.54 * height); sValue.append("cm");
-    tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-height", sValue);
-    tmpStylePageLayoutPropertiesOpenElement.addAttribute("style:print-orientation", "portrait");
-    tmpStylePageLayoutPropertiesOpenElement.write(mpHandler);
-
-    TagCloseElement("style:page-layout-properties").write(mpHandler);
-
-    TagCloseElement("style:page-layout").write(mpHandler);
-
-    TagOpenElement tmpStyleStyleOpenElement("style:style");
-    tmpStyleStyleOpenElement.addAttribute("style:name", "dp1");
-    tmpStyleStyleOpenElement.addAttribute("style:family", "drawing-page");
-    tmpStyleStyleOpenElement.write(mpHandler);
-
-    TagOpenElement tmpStyleDrawingPagePropertiesOpenElement("style:drawing-page-properties");
-    tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:background-size", "border");
-    tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:fill", "none");
-    tmpStyleDrawingPagePropertiesOpenElement.write(mpHandler);
-
-    TagCloseElement("style:drawing-page-properties").write(mpHandler);
-
-    TagCloseElement("style:style").write(mpHandler);
-}
-
-void OdgExporter::endDocument()
-{
-    TagCloseElement("office:automatic-styles").write(mpHandler);
-
-    TagOpenElement("office:master-styles").write(mpHandler);
-
-    TagOpenElement tmpStyleMasterPageOpenElement("style:master-page");
-    tmpStyleMasterPageOpenElement.addAttribute("style:name", "Default");
-    tmpStyleMasterPageOpenElement.addAttribute("style:page-layout-name", "PM0");
-    tmpStyleMasterPageOpenElement.addAttribute("draw:style-name", "dp1");
-    tmpStyleMasterPageOpenElement.write(mpHandler);
-
-    TagCloseElement("style:master-page").write(mpHandler);
-
-    TagCloseElement("office:master-styles").write(mpHandler);
-
-    TagOpenElement("office:body").write(mpHandler);
-
-    TagOpenElement("office:drawing").write(mpHandler);
-
-    TagOpenElement tmpDrawPageOpenElement("draw:page");
-    tmpDrawPageOpenElement.addAttribute("draw:name", "page1");
-    tmpDrawPageOpenElement.addAttribute("draw:style-name", "dp1");
-    tmpDrawPageOpenElement.addAttribute("draw:master-page-name", "Default");
-    tmpDrawPageOpenElement.write(mpHandler);
-
-    for (std::vector<DocumentElement *>::const_iterator bodyIter = mpBodyElements.begin();
-        bodyIter != mpBodyElements.end(); bodyIter++)
-    {
-        (*bodyIter)->write(mpHandler);
-    }
-
-    TagCloseElement("draw:page").write(mpHandler);
-    TagCloseElement("office:drawing").write(mpHandler);
-    TagCloseElement("office:body").write(mpHandler);
-    TagCloseElement("office:document").write(mpHandler);
-
-    mpHandler->endDocument();
-}
-
-void OdgExporter::setPen(const libwpg::WPGPen& pen)
-{
-    m_pen = pen;
-}
-
-void OdgExporter::setBrush(const libwpg::WPGBrush& brush)
-{
-    m_brush = brush;
-}
-
-void OdgExporter::setFillRule(FillRule rule)
-{
-    m_fillRule = rule;
-}
-
-void OdgExporter::startLayer(unsigned int /* id */)
-{
-}
-
-void OdgExporter::endLayer(unsigned int)
-{
-}
-
-void OdgExporter::drawRectangle(const libwpg::WPGRect& rect, double rx, double /* ry */)
-{
-    writeStyle();
-    TagOpenElement *pDrawRectElement = new TagOpenElement("draw:rect");
-    WPXString sValue;
-    sValue.sprintf("gr%i", m_styleIndex-1);
-    pDrawRectElement->addAttribute("draw:style-name", sValue);
-    sValue = doubleToString(2.54 * rect.x1); sValue.append("cm");
-    pDrawRectElement->addAttribute("svg:x", sValue);
-    sValue = doubleToString(2.54 * rect.y1); sValue.append("cm");
-    pDrawRectElement->addAttribute("svg:y", sValue);
-    sValue = doubleToString(2.54 * (rect.x2-rect.x1)); sValue.append("cm");
-    pDrawRectElement->addAttribute("svg:width", sValue);
-    sValue = doubleToString(2.54 * (rect.y2-rect.y1)); sValue.append("cm");
-    pDrawRectElement->addAttribute("svg:height", sValue);
-    sValue = doubleToString(2.54 * rx); sValue.append("cm");
-    // FIXME: what to do when rx != ry ?
-    pDrawRectElement->addAttribute("draw:corner-radius", sValue);
-    mpBodyElements.push_back(static_cast<DocumentElement *>(pDrawRectElement));
-    mpBodyElements.push_back(static_cast<DocumentElement *>(new TagCloseElement("draw:rect")));
-}
-
-void OdgExporter::drawEllipse(const libwpg::WPGPoint& center, double rx, double ry)
-{
-    writeStyle();
-    TagOpenElement *pDrawEllipseElement = new TagOpenElement("draw:ellipse");
-    WPXString sValue;
-    sValue.sprintf("gr%i", m_styleIndex-1);
-    pDrawEllipseElement->addAttribute("draw:style-name", sValue);
-    sValue = doubleToString(2.54 * (center.x-rx)); sValue.append("cm");
-    pDrawEllipseElement->addAttribute("svg:x", sValue);
-    sValue = doubleToString(2.54 * (center.y-ry)); sValue.append("cm");
-    pDrawEllipseElement->addAttribute("svg:y", sValue);
-    sValue = doubleToString(2 * 2.54 * rx); sValue.append("cm");
-    pDrawEllipseElement->addAttribute("svg:width", sValue);
-    sValue = doubleToString(2 * 2.54 * ry); sValue.append("cm");
-    pDrawEllipseElement->addAttribute("svg:height", sValue);
-    mpBodyElements.push_back(static_cast<DocumentElement *>(pDrawEllipseElement));
-    mpBodyElements.push_back(static_cast<DocumentElement *>(new TagCloseElement("draw:ellipse")));
-}
-
-void OdgExporter::drawPolygon(const libwpg::WPGPointArray& vertices)
-{
-    if(vertices.count() < 2)
-        return;
-
-    if(vertices.count() == 2)
-    {
-        const libwpg::WPGPoint& p1 = vertices[0];
-        const libwpg::WPGPoint& p2 = vertices[1];
-
-        writeStyle();
-        TagOpenElement *pDrawLineElement = new TagOpenElement("draw:line");
-        WPXString sValue;
-        sValue.sprintf("gr%i", m_styleIndex-1);
-        pDrawLineElement->addAttribute("draw:style-name", sValue);
-        pDrawLineElement->addAttribute("draw:text-style-name", "P1");
-        pDrawLineElement->addAttribute("draw:layer", "layout");
-        sValue = doubleToString(2.54 * p1.x); sValue.append("cm");
-        pDrawLineElement->addAttribute("svg:x1", sValue);
-        sValue = doubleToString(2.54 * p1.y); sValue.append("cm");
-        pDrawLineElement->addAttribute("svg:y1", sValue);
-        sValue = doubleToString(2.54 * p2.x); sValue.append("cm");
-        pDrawLineElement->addAttribute("svg:x2", sValue);
-        sValue = doubleToString(2.54 * p2.y); sValue.append("cm");
-        pDrawLineElement->addAttribute("svg:y2", sValue);
-        mpBodyElements.push_back(static_cast<DocumentElement *>(pDrawLineElement));
-        mpBodyElements.push_back(static_cast<DocumentElement *>(new TagCloseElement("draw:line")));
-    }
-    else
-    {
-        // draw as path
-        libwpg::WPGPath path;
-        path.moveTo(vertices[0]);
-        for(unsigned long ii = 1; ii < vertices.count(); ii++)
-            path.lineTo(vertices[ii]);
-        path.closed = true;
-        drawPath(path);
-    }
-}
-
-void OdgExporter::drawPath(const libwpg::WPGPath& path)
-{
-    if(path.count() == 0)
-        return;
-
-    // try to find the bounding box
-    // this is simple convex hull technique, the bounding box might not be
-    // accurate but that should be enough for this purpose
-    libwpg::WPGPoint p = path.element(0).point;
-    libwpg::WPGPoint q = path.element(0).point;
-    for(unsigned k = 0; k < path.count(); k++)
-    {
-        libwpg::WPGPathElement element = path.element(k);
-        p.x = (p.x > element.point.x) ? element.point.x : p.x;
-        p.y = (p.y > element.point.y) ? element.point.y : p.y;
-        q.x = (q.x < element.point.x) ? element.point.x : q.x;
-        q.y = (q.y < element.point.y) ? element.point.y : q.y;
-        if(element.type == libwpg::WPGPathElement::CurveToElement)
-        {
-            p.x = (p.x > element.extra1.x) ? element.extra1.x : p.x;
-            p.y = (p.y > element.extra1.y) ? element.extra1.y : p.y;
-            q.x = (q.x < element.extra1.x) ? element.extra1.x : q.x;
-            q.y = (q.y < element.extra1.y) ? element.extra1.y : q.y;
-            p.x = (p.x > element.extra2.x) ? element.extra2.x : p.x;
-            p.y = (p.y > element.extra2.y) ? element.extra2.y : p.y;
-            q.x = (q.x < element.extra2.x) ? element.extra2.x : q.x;
-            q.y = (q.y < element.extra2.y) ? element.extra2.y : q.y;
-        }
-    }
-    double vw = q.x - p.x;
-    double vh = q.y - p.y;
-
-    writeStyle();
-
-    TagOpenElement *pDrawPathElement = new TagOpenElement("draw:path");
-    WPXString sValue;
-    sValue.sprintf("gr%i", m_styleIndex-1);
-    pDrawPathElement->addAttribute("draw:style-name", sValue);
-    pDrawPathElement->addAttribute("draw:text-style-name", "P1");
-    pDrawPathElement->addAttribute("draw:layer", "layout");
-    sValue = doubleToString(2.54 * p.x); sValue.append("cm");
-    pDrawPathElement->addAttribute("svg:x", sValue);
-    sValue = doubleToString(2.54 * p.y); sValue.append("cm");
-    pDrawPathElement->addAttribute("svg:y", sValue);
-    sValue = doubleToString(2.54 * vw); sValue.append("cm");
-    pDrawPathElement->addAttribute("svg:width", sValue);
-    sValue = doubleToString(2.54 * vh); sValue.append("cm");
-    pDrawPathElement->addAttribute("svg:height", sValue);
-    sValue.sprintf("%i %i %i %i", 0, 0, (int)(vw*2540), (int)(vh*2540));
-    pDrawPathElement->addAttribute("svg:viewBox", sValue);
-
-    sValue.clear();
-    for(unsigned i = 0; i < path.count(); i++)
-    {
-        libwpg::WPGPathElement element = path.element(i);
-        libwpg::WPGPoint point = element.point;
-        WPXString sElement;
-        switch(element.type)
-        {
-            // 2540 is 2.54*1000, 2.54 cm = 1 inch
-            case libwpg::WPGPathElement::MoveToElement:
-                sElement.sprintf("M%i %i", (int)((point.x-p.x)*2540), (int)((point.y-p.y)*2540));
-                break;
-
-            case libwpg::WPGPathElement::LineToElement:
-                sElement.sprintf("L%i %i", (int)((point.x-p.x)*2540), (int)((point.y-p.y)*2540));
-                break;
-
-            case libwpg::WPGPathElement::CurveToElement:
-                sElement.sprintf("C%i %i %i %i %i %i", (int)((element.extra1.x-p.x)*2540),
-                (int)((element.extra1.y-p.y)*2540), (int)((element.extra2.x-p.x)*2540),
-                (int)((element.extra2.y-p.y)*2540), (int)((point.x-p.x)*2540), (int)((point.y-p.y)*2540));
-                break;
-
-            default:
-                break;
-        }
-        sValue.append(sElement);
-    }
-    if(path.closed)
-        sValue.append(" Z");
-    pDrawPathElement->addAttribute("svg:d", sValue);
-    mpBodyElements.push_back(static_cast<DocumentElement *>(pDrawPathElement));
-    mpBodyElements.push_back(static_cast<DocumentElement *>(new TagCloseElement("draw:path")));
-}
-
-void OdgExporter::drawBitmap(const libwpg::WPGBitmap& bitmap)
-{
-    TagOpenElement *pDrawFrameElement = new TagOpenElement("draw:frame");
-    WPXString sValue;
-    sValue = doubleToString(2.54 * bitmap.rect.x1); sValue.append("cm");
-    pDrawFrameElement->addAttribute("svg:x", sValue);
-    sValue = doubleToString(2.54 * bitmap.rect.y1); sValue.append("cm");
-    pDrawFrameElement->addAttribute("svg:y", sValue);
-    sValue = doubleToString(2.54 * bitmap.rect.height()); sValue.append("cm");
-    pDrawFrameElement->addAttribute("svg:height", sValue);
-    sValue = doubleToString(2.54 * bitmap.rect.width()); sValue.append("cm");
-    pDrawFrameElement->addAttribute("svg:width", sValue);
-    mpBodyElements.push_back(static_cast<DocumentElement *>(pDrawFrameElement));
-
-    mpBodyElements.push_back(static_cast<DocumentElement *>(new TagOpenElement("draw:image")));
-
-    mpBodyElements.push_back(static_cast<DocumentElement *>(new TagOpenElement("office:binary-data")));
-
-    libwpg::WPGString base64Binary;
-    bitmap.generateBase64DIB(base64Binary);
-    mpBodyElements.push_back(static_cast<DocumentElement *>(new CharDataElement(base64Binary.cstr())));
-
-    mpBodyElements.push_back(static_cast<DocumentElement *>(new TagCloseElement("office:binary-data")));
-
-    mpBodyElements.push_back(static_cast<DocumentElement *>(new TagCloseElement("draw:image")));
-
-    mpBodyElements.push_back(static_cast<DocumentElement *>(new TagCloseElement("draw:frame")));
-}
-
-void OdgExporter::drawImageObject(const libwpg::WPGBinaryData& binaryData)
-{
-    if (binaryData.mimeType.length() <= 0)
-        return;
-
-    TagOpenElement *pDrawFrameElement = new TagOpenElement("draw:frame");
-    WPXString sValue;
-    sValue = doubleToString(2.54 * binaryData.rect.x1); sValue.append("cm");
-    pDrawFrameElement->addAttribute("svg:x", sValue);
-    sValue = doubleToString(2.54 * binaryData.rect.y1); sValue.append("cm");
-    pDrawFrameElement->addAttribute("svg:y", sValue);
-    sValue = doubleToString(2.54 * binaryData.rect.height()); sValue.append("cm");
-    pDrawFrameElement->addAttribute("svg:height", sValue);
-    sValue = doubleToString(2.54 * binaryData.rect.width()); sValue.append("cm");
-    pDrawFrameElement->addAttribute("svg:width", sValue);
-    mpBodyElements.push_back(static_cast<DocumentElement *>(pDrawFrameElement));
-
-    mpBodyElements.push_back(static_cast<DocumentElement *>(new TagOpenElement("draw:image")));
-
-    mpBodyElements.push_back(static_cast<DocumentElement *>(new TagOpenElement("office:binary-data")));
-
-    libwpg::WPGString base64Binary = binaryData.getBase64Data();;
-    mpBodyElements.push_back(static_cast<DocumentElement *>(new CharDataElement(base64Binary.cstr())));
-
-    mpBodyElements.push_back(static_cast<DocumentElement *>(new TagCloseElement("office:binary-data")));
-
-    mpBodyElements.push_back(static_cast<DocumentElement *>(new TagCloseElement("draw:image")));
-
-    mpBodyElements.push_back(static_cast<DocumentElement *>(new TagCloseElement("draw:frame")));
-}
-
-void OdgExporter::writeStyle()
-{
-    if(!m_pen.solid && (m_pen.dashArray.count() >=2 ) )
-    {
-        // ODG only supports dashes with the same length of spaces inbetween
-        // here we take the first space and assume everything else the same
-        // note that dash length is written in percentage
-        double distance = m_pen.dashArray.at(1);
-        TagOpenElement tmpDrawStrokeDashElement("draw:stroke-dash");
-        tmpDrawStrokeDashElement.addAttribute("draw:style", "rect");
-        WPXString sValue;
-        sValue.sprintf("Dash_%i", m_dashIndex++);
-        tmpDrawStrokeDashElement.addAttribute("draw:name", sValue);
-        sValue.sprintf("%i \%", distance*100);
-        tmpDrawStrokeDashElement.addAttribute("draw:distance", sValue);
-        WPXString sName;
-        for(unsigned i = 0; i < m_pen.dashArray.count()/2; i++)
-        {
-            sName.sprintf("draw:dots%i", i+1);
-            tmpDrawStrokeDashElement.addAttribute(sName.cstr(), "1");
-            sName.sprintf("draw:dots%i-length", i+1);
-            sValue.sprintf("%i\%", 100*m_pen.dashArray.at(i*2));
-            tmpDrawStrokeDashElement.addAttribute(sName.cstr(), sValue);
-        }
-        tmpDrawStrokeDashElement.write(mpHandler);
-        TagCloseElement("draw:stroke-dash").write(mpHandler);
-    }
-
-    if(m_brush.style == libwpg::WPGBrush::Gradient)
-    {
-        TagOpenElement tmpDrawGradientElement("draw:gradient");
-        tmpDrawGradientElement.addAttribute("draw:style", "linear");
-        WPXString sValue;
-        sValue.sprintf("Gradient_%i", m_gradientIndex++);
-        tmpDrawGradientElement.addAttribute("draw:name", sValue);
-
-        // ODG angle unit is 0.1 degree
-        double angle = -m_brush.gradient.angle();
-        while(angle < 0)
-            angle += 360;
-        while(angle > 360)
-            angle -= 360;
-
-        sValue.sprintf("%i", angle*10);
-        tmpDrawGradientElement.addAttribute("draw:angle", sValue);
-
-        libwpg::WPGColor startColor = m_brush.gradient.stopColor(0);
-        libwpg::WPGColor stopColor = m_brush.gradient.stopColor(1);
-        sValue.sprintf("#%.2x%.2x%.2x", (startColor.red & 0xff), (startColor.green & 0xff), (startColor.blue & 0xff));
-        tmpDrawGradientElement.addAttribute("draw:start-color", sValue);
-        sValue.sprintf("#%.2x%.2x%.2x", (stopColor.red & 0xff), (stopColor.green & 0xff), (stopColor.blue & 0xff));
-        tmpDrawGradientElement.addAttribute("draw:end-color", sValue);
-        tmpDrawGradientElement.addAttribute("draw:start-intensity", "100%");
-        tmpDrawGradientElement.addAttribute("draw:end-intensity", "100%");
-        tmpDrawGradientElement.addAttribute("draw:border", "0%");
-        tmpDrawGradientElement.write(mpHandler);
-        TagCloseElement("draw:gradient").write(mpHandler);
-    }
-
-    TagOpenElement tmpStyleStyleElement("style:style");
-    WPXString sValue;
-    sValue.sprintf("gr%i",  m_styleIndex);
-    tmpStyleStyleElement.addAttribute("style:name", sValue);
-    tmpStyleStyleElement.addAttribute("style:family", "graphic");
-    tmpStyleStyleElement.addAttribute("style:parent-style-name", "standard");
-    tmpStyleStyleElement.write(mpHandler);
-
-    TagOpenElement tmpStyleGraphicPropertiesElement("style:graphic-properties");
-
-    if(m_pen.width > 0.0)
-    {
-        sValue = doubleToString(2.54 * m_pen.width); sValue.append("cm");
-        tmpStyleGraphicPropertiesElement.addAttribute("svg:stroke-width", sValue);
-        sValue.sprintf("#%.2x%.2x%.2x", (m_pen.foreColor.red & 0xff),
-                      (m_pen.foreColor.green & 0xff), (m_pen.foreColor.blue & 0xff));
-        tmpStyleGraphicPropertiesElement.addAttribute("svg:stroke-color", sValue);
-
-        if(!m_pen.solid)
-        {
-            tmpStyleGraphicPropertiesElement.addAttribute("draw:stroke", "dash");
-            sValue.sprintf("Dash_%i", m_dashIndex-1);
-            tmpStyleGraphicPropertiesElement.addAttribute("draw:stroke-dash", sValue);
-            }
-    }
-    else
-        tmpStyleGraphicPropertiesElement.addAttribute("draw:stroke", "none");
-
-    if(m_brush.style == libwpg::WPGBrush::NoBrush)
-        tmpStyleGraphicPropertiesElement.addAttribute("draw:fill", "none");
-
-    if(m_brush.style == libwpg::WPGBrush::Solid)
-    {
-        tmpStyleGraphicPropertiesElement.addAttribute("draw:fill", "solid");
-        sValue.sprintf("#%.2x%.2x%.2x", (m_brush.foreColor.red & 0xff),
-                      (m_brush.foreColor.green & 0xff), (m_brush.foreColor.blue & 0xff));
-        tmpStyleGraphicPropertiesElement.addAttribute("draw:fill-color", sValue);
-    }
-
-    if(m_brush.style == libwpg::WPGBrush::Gradient)
-    {
-        tmpStyleGraphicPropertiesElement.addAttribute("draw:fill", "gradient");
-        sValue.sprintf("Gradient_%i", m_gradientIndex-1);
-        tmpStyleGraphicPropertiesElement.addAttribute("draw:fill-gradient-name", sValue);
-    }
-
-    tmpStyleGraphicPropertiesElement.write(mpHandler);
-    TagCloseElement("style:graphic-properties").write(mpHandler);
-
-    TagCloseElement("style:style").write(mpHandler);
-    m_styleIndex++;
-}
-
-WPXString OdgExporter::doubleToString(const double value)
-{
-    return WPXString((char *)::rtl::math::doubleToString(value, rtl_math_StringFormat_F, 4, '.').getStr());
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/wpgimp/OdgExporter.hxx b/writerperfect/source/wpgimp/OdgExporter.hxx
deleted file mode 100644
index 2bfa6b88a144..000000000000
--- a/writerperfect/source/wpgimp/OdgExporter.hxx
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* libwpg
- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
- * Copyright (C) 2007 Fridrich Strba (fridrich_strba@bluewin.ch)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02111-1301 USA
- *
- * For further information visit http://libwpg.sourceforge.net
- */
-
-/* "This product is not manufactured, approved, or supported by
- * Corel Corporation or Corel Corporation Limited."
- */
-
-#ifndef __ODGEXPORTER_HXX__
-#define __ODGEXPORTER_HXX__
-
-#include <iostream>
-#include <sstream>
-#include <string>
-
-#include <libwpd/WPXString.h>
-#include <libwpg/libwpg.h>
-#include <libwpg/WPGBinaryData.h>
-#include "filter/DocumentElement.hxx"
-#include "filter/DocumentHandler.hxx"
-
-class OdgExporter : public libwpg::WPGPaintInterface {
-public:
-    OdgExporter(DocumentHandler *pHandler);
-    ~OdgExporter();
-
-    void startDocument(double width, double height);
-    void startGraphics(double width, double height) { startDocument(width, height); }
-    void endDocument();
-    void endGraphics() { endDocument(); };
-    void startLayer(unsigned int id);
-    void endLayer(unsigned int id);
-
-    void setPen(const libwpg::WPGPen& pen);
-    void setBrush(const libwpg::WPGBrush& brush);
-    void setFillRule(FillRule rule);
-
-    void drawRectangle(const libwpg::WPGRect& rect, double rx, double ry);
-    void drawEllipse(const libwpg::WPGPoint& center, double rx, double ry);
-    void drawPolygon(const libwpg::WPGPointArray& vertices);
-    void drawPath(const libwpg::WPGPath& path);
-    void drawBitmap(const libwpg::WPGBitmap& bitmap);
-    void drawImageObject(const libwpg::WPGBinaryData& binaryData);
-
-private:
-    std::vector <DocumentElement *> mpBodyElements;
-    std::vector <DocumentElement *> mpStylesElements;
-    DocumentHandler *mpHandler;
-
-    libwpg::WPGPen m_pen;
-    libwpg::WPGBrush m_brush;
-    FillRule m_fillRule;
-    int m_gradientIndex;
-    int m_dashIndex;
-    int m_styleIndex;
-    void writeStyle();
-    WPXString doubleToString(const double value);
-};
-
-#endif // __ODGEXPORTER_HXX__
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/wpgimp/WPGImportFilter.cxx b/writerperfect/source/wpgimp/WPGImportFilter.cxx
index 75283cf4fb73..8a1f92d97041 100644
--- a/writerperfect/source/wpgimp/WPGImportFilter.cxx
+++ b/writerperfect/source/wpgimp/WPGImportFilter.cxx
@@ -47,7 +47,7 @@
 #include <xmloff/attrlist.hxx>
 
 #include "filter/DocumentHandler.hxx"
-#include "OdgExporter.hxx"
+#include "filter/OdgExporter.hxx"
 #include "WPGImportFilter.hxx"
 #include "stream/WPXSvStream.h"
 
@@ -120,16 +120,6 @@ sal_Bool SAL_CALL WPGImportFilter::filter( const Sequence< ::com::sun::star::bea
 
     WPXInputStream* input = new WPXSvInputStream( xInputStream );
 
-    if (input->isOLEStream())
-    {
-        WPXInputStream* olestream = input->getDocumentOLEStream();
-        if (olestream)
-        {
-            delete input;
-            input = olestream;
-        }
-    }
-
     OdgExporter exporter(&xHandler);
     bool tmpParseResult = libwpg::WPGraphics::parse(input, &exporter);
     if (input)
@@ -179,16 +169,6 @@ OUString SAL_CALL WPGImportFilter::detect( com::sun::star::uno::Sequence< Proper
 
     WPXInputStream* input = new WPXSvInputStream( xInputStream );
 
-    if (input->isOLEStream())
-    {
-        WPXInputStream* olestream = input->getDocumentOLEStream();
-        if (olestream)
-        {
-            delete input;
-            input = olestream;
-        }
-    }
-
     if (libwpg::WPGraphics::isSupported(input))
         sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "draw_WordPerfect_Graphics" ) );
 
@@ -200,7 +180,7 @@ OUString SAL_CALL WPGImportFilter::detect( com::sun::star::uno::Sequence< Proper
         if ( location == Descriptor.getLength() )
         {
             Descriptor.realloc(nLength+1);
-            Descriptor[location].Name = ::rtl::OUString::createFromAscii( "TypeName" );
+            Descriptor[location].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeName"));
         }
 
         Descriptor[location].Value <<=sTypeName;
diff --git a/writerperfect/source/wpgimp/makefile.mk b/writerperfect/source/wpgimp/makefile.mk
index 3bb58c112af4..ccf1d7df9e34 100644
--- a/writerperfect/source/wpgimp/makefile.mk
+++ b/writerperfect/source/wpgimp/makefile.mk
@@ -8,27 +8,16 @@ ENABLE_EXCEPTIONS=true
 
 .IF "$(SYSTEM_LIBWPD)" == "YES"
 INCPRE+=$(LIBWPD_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
-.ENDIF
-
-.IF "$(SYSTEM_LIBWPS)" == "YES"
-INCPRE+=$(LIBWPS_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwps
 .ENDIF
 
 .IF "$(SYSTEM_LIBWPG)" == "YES"
 INCPRE+=$(LIBWPG_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg
 .ENDIF
 
 # broken but ... necessary, internal include shafted ...
 INCPRE+= -I..
 
 SLOFILES= \
-    $(SLO)$/OdgExporter.obj  \
     $(SLO)$/WPGImportFilter.obj \
     $(SLO)$/wpgimport_genericfilter.obj
 
diff --git a/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx b/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx
index 16fd6e8719bd..d1686773ffe9 100644
--- a/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx
+++ b/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx
@@ -58,7 +58,7 @@ sal_Bool SAL_CALL component_writeInfo(
             sal_Int32 nPos = 0;
             Reference< XRegistryKey > xNewKey(
                 reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( WPGImportFilter_getImplementationName() ) );
-            xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+            xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
 
             const Sequence< OUString > & rSNL = WPGImportFilter_getSupportedServiceNames();
             const OUString * pArray = rSNL.getConstArray();
diff --git a/writerperfect/source/wpsimp/MSWorksCollector.cxx b/writerperfect/source/wpsimp/MSWorksCollector.cxx
index 20934c2ba69e..bed21d8bed73 100644
--- a/writerperfect/source/wpsimp/MSWorksCollector.cxx
+++ b/writerperfect/source/wpsimp/MSWorksCollector.cxx
@@ -30,7 +30,7 @@
 #include "MSWorksCollector.hxx"
 #include <libwps/WPSDocument.h>
 
-MSWorksCollector::MSWorksCollector(WPSInputStream *pInput, DocumentHandler *pHandler) :
+MSWorksCollector::MSWorksCollector(WPXInputStream *pInput, DocumentHandlerInterface *pHandler) :
     DocumentCollector(pInput, pHandler)
 {
 }
@@ -39,9 +39,9 @@ MSWorksCollector::~MSWorksCollector()
 {
 }
 
-bool MSWorksCollector::parseSourceDocument(WPSInputStream &input)
+bool MSWorksCollector::parseSourceDocument(WPXInputStream &input)
 {
-        WPSResult result = WPSDocument::parse(&input, static_cast<WPXHLListenerImpl *>(this));
+        WPSResult result = WPSDocument::parse(&input, static_cast<WPXDocumentInterface *>(this));
         if (result != WPS_OK)
                 return false;
 
diff --git a/writerperfect/source/wpsimp/MSWorksCollector.hxx b/writerperfect/source/wpsimp/MSWorksCollector.hxx
index b2a767b37525..9db02532a5f1 100644
--- a/writerperfect/source/wpsimp/MSWorksCollector.hxx
+++ b/writerperfect/source/wpsimp/MSWorksCollector.hxx
@@ -31,13 +31,14 @@
 #define _MSWORKSCOLLECTOR_HXX
 
 #include "filter/DocumentCollector.hxx"
+#include "filter/DocumentHandlerInterface.hxx"
 
 class MSWorksCollector : public DocumentCollector
 {
 public:
-    MSWorksCollector(WPSInputStream *pInput, DocumentHandler *pHandler);
+    MSWorksCollector(WPXInputStream *pInput, DocumentHandlerInterface *pHandler);
     virtual ~MSWorksCollector();
-    bool parseSourceDocument(WPSInputStream &input);
+    bool parseSourceDocument(WPXInputStream &input);
 };
 #endif
 
diff --git a/writerperfect/source/wpsimp/MSWorksImportFilter.cxx b/writerperfect/source/wpsimp/MSWorksImportFilter.cxx
index b8818dc548d2..211d3ae33fd3 100644
--- a/writerperfect/source/wpsimp/MSWorksImportFilter.cxx
+++ b/writerperfect/source/wpsimp/MSWorksImportFilter.cxx
@@ -102,7 +102,7 @@ sal_Bool SAL_CALL MSWorksImportFilter::importImpl( const Sequence< ::com::sun::s
     sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII);
 
     // An XML import service: what we push sax messages to..
-    OUString sXMLImportService ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.XMLImporter" ) );
+    OUString sXMLImportService ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.XMLOasisImporter" ) );
     Reference < XDocumentHandler > xInternalHandler( mxMSF->createInstance( sXMLImportService ), UNO_QUERY );
 
     // The XImporter sets up an empty target document for XDocumentHandler to write to..
@@ -187,7 +187,7 @@ OUString SAL_CALL MSWorksImportFilter::detect( com::sun::star::uno::Sequence< Pr
     if (input.atEOS())
         return ::rtl::OUString();
 
-    confidence = WPSDocument::isFileFormatSupported(&input, false);
+    confidence = WPSDocument::isFileFormatSupported(&input);
 
     if ((confidence == WPS_CONFIDENCE_EXCELLENT) || (confidence == WPS_CONFIDENCE_GOOD))
         sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "writer_MS_Works_Document" ) );
@@ -197,7 +197,7 @@ OUString SAL_CALL MSWorksImportFilter::detect( com::sun::star::uno::Sequence< Pr
         if ( location == Descriptor.getLength() )
         {
             Descriptor.realloc(nLength+1);
-            Descriptor[location].Name = ::rtl::OUString::createFromAscii( "TypeName" );
+            Descriptor[location].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeName"));
         }
 
         Descriptor[location].Value <<=sTypeName;
diff --git a/writerperfect/source/wpsimp/MSWorksImportFilter.hxx b/writerperfect/source/wpsimp/MSWorksImportFilter.hxx
index bb876d85af8f..71e621298f35 100644
--- a/writerperfect/source/wpsimp/MSWorksImportFilter.hxx
+++ b/writerperfect/source/wpsimp/MSWorksImportFilter.hxx
@@ -69,7 +69,9 @@ protected:
 
 public:
     MSWorksImportFilter( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > &rxMSF)
-        : mxMSF( rxMSF ) {}
+        : mxMSF( rxMSF )
+        , meType( FILTER_IMPORT )
+         {}
     virtual ~MSWorksImportFilter() {}
 
     // XFilter
diff --git a/writerperfect/source/wpsimp/msworks_genericfilter.cxx b/writerperfect/source/wpsimp/msworks_genericfilter.cxx
index 8d6e7c6fdf62..695791431103 100644
--- a/writerperfect/source/wpsimp/msworks_genericfilter.cxx
+++ b/writerperfect/source/wpsimp/msworks_genericfilter.cxx
@@ -58,7 +58,7 @@ sal_Bool SAL_CALL component_writeInfo(
             sal_Int32 nPos = 0;
             Reference< XRegistryKey > xNewKey(
                 reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( MSWorksImportFilter_getImplementationName() ) );
-            xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+            xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
 
             const Sequence< OUString > & rSNL = MSWorksImportFilter_getSupportedServiceNames();
             const OUString * pArray = rSNL.getConstArray();
diff --git a/writerperfect/util/makefile.mk b/writerperfect/util/makefile.mk
index 35daf5e9b3bf..9ac9e4c35cda 100644
--- a/writerperfect/util/makefile.mk
+++ b/writerperfect/util/makefile.mk
@@ -42,6 +42,8 @@ SHL1LIBS=$(LIB1TARGET)
 SHL1STDLIBS+= \
     $(SOTLIB) \
     $(SO2LIB) \
+    $(SFXLIB) \
+    $(VCLLIB) \
     $(UNOTOOLSLIB) \
     $(TOOLSLIB) \
     $(UCBHELPERLIB) \
@@ -49,6 +51,7 @@ SHL1STDLIBS+= \
     $(CPPULIB) \
     $(SALLIB) \
     $(XMLOFFLIB) \
+    $(LIBWPG) \
     $(LIBWPD)
 
 SHL1TARGET = wpft$(DLLPOSTFIX)
@@ -78,6 +81,7 @@ SHL2STDLIBS+= \
     $(SALLIB) \
     $(XMLOFFLIB) \
     $(LIBWPS) \
+    $(LIBWPG) \
     $(LIBWPD)
 
 SHL2TARGET = msworks$(DLLPOSTFIX)
@@ -105,8 +109,8 @@ SHL3STDLIBS+= \
     $(CPPULIB) \
     $(SALLIB) \
     $(XMLOFFLIB) \
-    $(LIBWPD) \
-    $(LIBWPG)
+    $(LIBWPG) \
+    $(LIBWPD)
 
 SHL3TARGET = wpgimport$(DLLPOSTFIX)
 SHL3IMPLIB = i$(SHL3TARGET)
diff --git a/xmerge/source/activesync/XMergeSync.cpp b/xmerge/source/activesync/XMergeSync.cpp
index 13c5cdf57f88..3edc4c94a0e7 100644
--- a/xmerge/source/activesync/XMergeSync.cpp
+++ b/xmerge/source/activesync/XMergeSync.cpp
@@ -831,7 +831,7 @@ long CXMergeSyncModule::LockServer(BOOL fLock)
         return ::InterlockedDecrement(&m_lLocks);
 }
 
-long CXMergeSyncModule::GetLockCount()
+long CXMergeSyncModule::GetLockCount() const
 {
     return m_lLocks + m_lObjs;
 }
diff --git a/xmerge/source/activesync/XMergeSync.h b/xmerge/source/activesync/XMergeSync.h
index 1afab6629f1d..f50167e1f833 100644
--- a/xmerge/source/activesync/XMergeSync.h
+++ b/xmerge/source/activesync/XMergeSync.h
@@ -20,7 +20,7 @@ protected:
     long  m_lObjs;
 
 public:
-    long GetLockCount();
+    long GetLockCount() const;
     long LockServer(BOOL fLock);
     HINSTANCE m_hInst;
     CXMergeSyncModule();
diff --git a/xmerge/source/bridge/java/XMergeBridge.java b/xmerge/source/bridge/java/XMergeBridge.java
index 38503d3b49ff..6fc6db43ac70 100644
--- a/xmerge/source/bridge/java/XMergeBridge.java
+++ b/xmerge/source/bridge/java/XMergeBridge.java
@@ -97,7 +97,6 @@ public class XMergeBridge {
 
     /** This inner class provides the component as a concrete implementation
      * of the service description. It implements the needed interfaces.
-     * @implements XTypeProvider
      */
     static public class _XMergeBridge implements
                                                XImportFilter,
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java
index df45b708d89c..fe61eb3c5ee8 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java
@@ -49,8 +49,7 @@ public class BeginningOfFile implements BIFFRecord {
    /**
     *  Constructor that initializes the member values.
     *
-    *  @param  ver  Version Number
-    *               Substream type (workbook = 0x05, worksheet = 0x10)
+    *  @param  global   True for a workbook, false for a worksheet
     */
     public BeginningOfFile(boolean global) {
         setVersion((short) 271);
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java
index da826a8d9058..3ce6b6535e9a 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java
@@ -52,10 +52,9 @@ public class BlankCell extends CellValue {
     /**
       * Constructs a <code>BlankCell</code> using specified attributes
      *
-     * @param row row number
-     * @param col column number
-     * @param cellContents contents of the cell
-     * @param ixfe font index
+     * @param row     row number
+     * @param column  column number
+     * @param ixfe    font index
       */
     public BlankCell(int row, int column, int ixfe) throws IOException {
 
@@ -87,7 +86,7 @@ public class BlankCell extends CellValue {
     /**
      * Reads a BlankCell <code>InputStream</code>
      *
-     * @param   is InputStream containing a BlankCell.
+     * @param   input InputStream containing a BlankCell.
      */
     public int read(InputStream input) throws IOException {
 
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java
index 9a370ccd8a59..d617837a5724 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java
@@ -31,7 +31,6 @@ import java.io.OutputStream;
 import java.io.InputStream;
 import java.io.IOException;
 
-
 import org.openoffice.xmerge.util.Debug;
 import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants;
 
@@ -46,11 +45,11 @@ public class BoolErrCell extends CellValue {
      /**
      * Constructs a BoolErrCell from arguments
       *
-     * @param row row number
-     * @param col column number
-     * @param ixfe font index
+     * @param row      row number
+     * @param column   column number
+     * @param ixfe     font index
      * @param bBoolErr Boolean value or error value
-     * @param fError Boolean error flag
+     * @param fError   Boolean error flag
       */
     public BoolErrCell(int row, int column, int ixfe, int bBoolErr, int fError) throws IOException {
 
@@ -82,7 +81,7 @@ public class BoolErrCell extends CellValue {
     /**
      * Writes a <code>BoolErrCell</code> to the specified <code>Outputstream</code>
      *
-     * @param os the <code>OutputStream</code> to write to
+     * @param output the <code>OutputStream</code> to write to
      */
     public void write(OutputStream output) throws IOException {
 
@@ -99,7 +98,7 @@ public class BoolErrCell extends CellValue {
     /**
      * Reads a BoolErrCell from the <code>InputStream</code>
       *
-      * @param  is InputStream containing a BoolErrCell
+      * @param  input InputStream containing a BoolErrCell
       */
     public int read(InputStream input) throws IOException {
 
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java
index 679224634bfa..0d2cc0669c6c 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java
@@ -99,7 +99,7 @@ public class BoundSheet implements BIFFRecord {
      /**
      * Write this particular <code>BIFFRecord</code> to the <code>OutputStream</code>
      *
-     * @param ouput the <code>OutputStream</code>
+     * @param output the <code>OutputStream</code>
      */
     public void write(OutputStream output) throws IOException {
 
@@ -115,7 +115,7 @@ public class BoundSheet implements BIFFRecord {
       * Reads a BoundSheet from the <code>InputStream</code> The byte array
      * must be twice the size of the String as it uses unicode.
       *
-      * @param  is InputStream containing the record data
+      * @param  input InputStream containing the record data
       */
     public int read(InputStream input) throws IOException {
 
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java
index c09cde5a32c1..1aa6da472ccb 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java
@@ -40,7 +40,7 @@ public abstract class CellValue implements BIFFRecord {
     protected byte   col;
     protected byte[] ixfe = new byte[2];
 
-       /**
+     /**
      * Get the row number of this cell
      *
      * @return the row number of this cell
@@ -85,9 +85,9 @@ public abstract class CellValue implements BIFFRecord {
     }
 
     /**
-     * Set the row number of this cell
+     * Set the column number of this cell
      *
-     * @param col sets the row number for this cell
+     * @param col sets the column number for this cell
      */
     public void setCol(int col) {
         this.col = (byte) (col - 1);        // The cols start at 1
@@ -96,7 +96,7 @@ public abstract class CellValue implements BIFFRecord {
     /**
      * Writes basic cell value attributes to the specified <code>Outputstream</code>
      *
-     * @param os the <code>OutputStream</code> to write to
+     * @param output the <code>OutputStream</code> to write to
      */
     public void write(OutputStream output) throws IOException {
 
@@ -106,9 +106,9 @@ public abstract class CellValue implements BIFFRecord {
     }
 
     /**
-     * Writes a<code>LabelCell</code> to the specified <code>Outputstream</code>
+     * Reads a <code>LabelCell</code> from the specified <code>Inputstream</code>
      *
-     * @param os the <code>OutputStream</code> to write to
+     * @param input the <code>InputStream</code> to read from
      */
     public int read(InputStream input) throws IOException {
 
@@ -124,7 +124,6 @@ public abstract class CellValue implements BIFFRecord {
         return numOfBytesRead;
     }
 
-
     /**
      * Returns the contents of the cell as a String
      *
@@ -133,4 +132,3 @@ public abstract class CellValue implements BIFFRecord {
     abstract public String getString() throws IOException;
 
 }
-
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java
index 6ce59c7ca72c..14426241419c 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java
@@ -54,8 +54,8 @@ public class ColInfo implements BIFFRecord {
       *
       * @param  colFirst    the first column this formatting applies to
       * @param  colLast     last column this formatting applies to
-      * @param  coldx       column width
-      * @param  grbit       options flags
+      * @param  colDX       column width
+      * @param  ixfe        index for formatting
       */
     public ColInfo(int colFirst, int colLast, int colDX, int ixfe) {
         this.colFirst   = EndianConverter.writeShort((short)colFirst);
@@ -119,18 +119,18 @@ public class ColInfo implements BIFFRecord {
     }
 
     /**
-     * Get the hex code for this particular <code>BIFFRecord</code>
+     * Get the first column that this formatting applies to.
      *
-     * @return the hex code for <code>ColInfo</code>
+     * @return The first column.
      */
     public short getFirst() {
         return EndianConverter.readShort(colFirst);
     }
 
     /**
-     * Get the hex code for this particular <code>BIFFRecord</code>
+     * Get the last column that this formatting applies to.
      *
-     * @return the hex code for <code>ColInfo</code>
+     * @return The last column.
      */
     public short getLast() {
         return EndianConverter.readShort(colLast);
@@ -139,7 +139,7 @@ public class ColInfo implements BIFFRecord {
     /**
      * Writes a ColInfo to the specified <code>Outputstream</code>
      *
-     * @param os the <code>OutputStream</code> to write to
+     * @param output the <code>OutputStream</code> to write to
      */
     public void write(OutputStream output) throws IOException {
 
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java
index b3e3a8e6b0e3..b6b3baace2de 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java
@@ -44,18 +44,21 @@ public class DefColWidth implements BIFFRecord {
     private byte[] coldx = new byte[2];
     private byte[] ixfe  = new byte[2];
 
-/**
- * Constructs a pocket Excel Document from the
- * <code>InputStream</code> and assigns it the document name passed in
- *
- * @param   is InputStream containing a Pocket Excel Data file.
- */
+    /**
+     * Default constructor. Sets width to 9.
+     */
     public DefColWidth() {
         grbit   = new byte[] {0x00, 0x00};
         coldx   = new byte[] {0x00, 0x09};
         ixfe    = new byte[] {0x00, 0x00};
     }
 
+    /**
+     * Constructs a pocket Excel Document from the
+     * <code>InputStream</code> and assigns it the document name passed in
+     *
+     * @param   is InputStream containing a Pocket Excel Data file.
+     */
     public DefColWidth(InputStream is) throws IOException {
         read(is);
     }
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java
index 454a5ed87520..f2c5e83bc0e6 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java
@@ -44,10 +44,7 @@ public class DefRowHeight implements BIFFRecord {
     private byte[] unknown2 = new byte[2];
 
     /**
-      * Constructs a pocket Excel Document from the
-      * <code>InputStream</code> and assigns it the document name passed in
-      *
-      * @param  is InputStream containing a Pocket Excel Data file.
+      * Default constructor. Sets something unknown to 255.
       */
     public DefRowHeight() {
         unknown1 = new byte[] {(byte)0x00, (byte)0x00};
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java
index 0f8c535a9b92..af97015db745 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java
@@ -55,9 +55,10 @@ public class DefinedName implements BIFFRecord {
     private Workbook wb;
 
     /**
-      * Constructs a Defined Name from the <code>InputStream</code>
+      * Constructs a Defined Name from an existing <code>NameDefinition</code>
       *
-      * @param  is InputStream containing the record data
+      * @param  nd The name definition.
+      * @param  wb The workbook we are defined in.
       */
     public DefinedName(NameDefinition nd, Workbook wb) throws IOException {
 
@@ -74,10 +75,12 @@ public class DefinedName implements BIFFRecord {
         grbit = EndianConverter.writeShort((short)0);
         ixals[0] = (byte)0xFF;ixals[1] = (byte)0xFF;
     }
+
     /**
       * Constructs a Defined Name from the <code>InputStream</code>
       *
       * @param  is InputStream containing the record data
+      * @param  wb The workbook we are defined in.
       */
     public DefinedName(InputStream is, Workbook wb) throws IOException {
 
@@ -99,7 +102,7 @@ public class DefinedName implements BIFFRecord {
       * Reads a Defined Name from the <code>InputStream</code> The byte array
      * must be twice the size of the String as it uses unicode.
       *
-      * @param  is InputStream containing the record data
+      * @param  input InputStream containing the record data
       */
     public int read(InputStream input) throws IOException {
 
@@ -115,8 +118,6 @@ public class DefinedName implements BIFFRecord {
         rgce = new byte[EndianConverter.readShort(cce)];
         input.read(rgce, 0, EndianConverter.readShort(cce));
 
-
-
         Debug.log(Debug.TRACE, "\tgrbit : "+ EndianConverter.readShort(grbit) +
                             " cch : " + cch +
                             " cce : " + EndianConverter.readShort(cce) +
@@ -130,7 +131,7 @@ public class DefinedName implements BIFFRecord {
      /**
      * Write this particular <code>BIFFRecord</code> to the <code>OutputStream</code>
      *
-     * @param ouput the <code>OutputStream</code>
+     * @param output the <code>OutputStream</code>
      */
     public void write(OutputStream output) throws IOException {
 
@@ -143,7 +144,6 @@ public class DefinedName implements BIFFRecord {
             cce = EndianConverter.writeShort((short) 0);
         }
 
-
         output.write(getBiffType());
         output.write(grbit);
         output.write(cch);
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java
index 5165efd84460..2ae615dc93ce 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java
@@ -280,8 +280,8 @@ org.openoffice.xmerge.converter.xml.OfficeConstants {
     /**
      * Compare two ExtendedFormat to see if the font index is the same
      *
-     * @param the ExtendedFormat to be used in the comaprison
-     * @return boolean if the two are the same otherwise false
+     * @param  rhs The ExtendedFormat to be used in the comaprison
+     * @return True if the two are the same otherwise false
      */
     public boolean compareTo(ExtendedFormat rhs) {
 
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java
index 8d702640a500..1359134400ed 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java
@@ -43,8 +43,7 @@ public class FloatNumber extends CellValue {
     protected byte[] num  = new byte[8];
 
     /**
-      * Constructs a pocket Excel Document from the
-      * <code>InputStream</code> and assigns it the document name passed in
+      * Constructs a FloatNumber by reading from an InputStream.
      *
       * @param  is InputStream containing a Pocket Excel Data file.
       */
@@ -55,10 +54,10 @@ public class FloatNumber extends CellValue {
     /**
       * Constructs a <code>FloatNumber</code> using specified attributes
      *
-     * @param row row number
-     * @param col column number
+     * @param row          row number
+     * @param column       column number
      * @param cellContents contents of the cell
-     * @param ixfe font index
+     * @param ixfe         font index
       */
     public FloatNumber(int row, int column, String cellContents, int ixfe) throws IOException {
 
@@ -104,7 +103,6 @@ public class FloatNumber extends CellValue {
         Debug.log(Debug.TRACE,"Writing FloatNumber record");
     }
 
-
     /**
      * Gets the numerical value the cell represents
      *
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java
index 61d9746c80d3..1462e965ddd0 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java
@@ -39,7 +39,6 @@ import org.openoffice.xmerge.util.EndianConverter;
 import org.openoffice.xmerge.util.ColourConverter;
 import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants;
 
-
 /**
  * Represents a BIFF Record descibing a font used
  */
@@ -61,11 +60,9 @@ public class FontDescription implements BIFFRecord {
     public static final int ITALIC      = 0x02;
 
     /**
-      * Constructs a FontDescription from the bold italic and undelrine attributes
+      * Constructs a FontDescription from a Format.
       *
-      * @param  italic      Italic attribute
-      * @param  bold        Bold attribute
-      * @param  underline   Underline attribute
+      * @param  fmt The <code>Format</code> to use as source.
       */
     public FontDescription(Format fmt) throws IOException {
 
@@ -86,7 +83,6 @@ public class FontDescription implements BIFFRecord {
         if (fmt.getAttribute(Format.UNDERLINE))
             uls |= UNDERLINE;
 
-
         bFamily     = 0;
         bCharSet    = 0;
 
@@ -188,7 +184,6 @@ public class FontDescription implements BIFFRecord {
         return true;
     }
 
-
     /**
       * Constructs a Font Description from the <code>InputStream</code>
       *
@@ -234,7 +229,7 @@ public class FontDescription implements BIFFRecord {
     /**
       * Constructs a Font Description from the <code>InputStream</code>
       *
-      * @param  is InputStream containing a <code>FontDescription</code>
+      * @param  input InputStream containing a <code>FontDescription</code>
       */
     public int read(InputStream input) throws IOException {
 
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java
index a073883b2e8e..90c28a1f7dd3 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java
@@ -39,7 +39,6 @@ import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula.FormulaHel
 import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Workbook;
 import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants;
 
-
 /**
  * Represents a BIFF Record describing a formula
  */
@@ -52,14 +51,15 @@ public class Formula extends CellValue implements OfficeConstants {
     private FormulaHelper fh = new FormulaHelper();
 
     /**
-      * Constructs a <code>Formula</code> using specified attributes
+     * Constructs a <code>Formula</code> using specified attributes
      *
-     * @param row row number
-     * @param col column number
+     * @param row          row number
+     * @param column       column number
      * @param cellContents contents of the cell
-     * @param ixfe font index
-     * @param value the value of the cell
-      */
+     * @param ixfe         font index
+     * @param fmt          cell format description.
+     * @param wb           the workbook we are defined in.
+     */
     public Formula(int row, int column, String cellContents, int ixfe, Format fmt, Workbook wb)
     throws Exception {
 
@@ -116,7 +116,7 @@ public class Formula extends CellValue implements OfficeConstants {
       * Translates a <code>String</code> written in infix which represents a
      * formula into a byte[] what can be written to pocket excel file.
       *
-      * @param  formula string
+      * @param  inFormula formula string
       */
     public void setFormula(String inFormula) throws Exception {
 
@@ -129,6 +129,7 @@ public class Formula extends CellValue implements OfficeConstants {
       * <code>InputStream</code>
       *
       * @param  is InputStream containing a Pocket Excel Data file.
+      * @param  wb The workbook we are defined in.
       */
     public Formula(InputStream is, Workbook wb) throws IOException {
         read(is);
@@ -148,6 +149,7 @@ public class Formula extends CellValue implements OfficeConstants {
      * Reads the formula data members from the stream. Byte arrays for Strings
      * are doubled as they are stored as  unicode
      *
+     * @param input  the input stream to read from.
      * @return total number of bytes read
      */
     public int read(InputStream input) throws IOException {
@@ -175,7 +177,7 @@ public class Formula extends CellValue implements OfficeConstants {
      /**
      * Writes the Formula record to the <code>OutputStream</code>
      *
-     * @param the <code>OutputStream</code> being written to
+     * @param output The <code>OutputStream</code> being written to
      */
     public void write(OutputStream output) throws IOException {
 
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
index d4ad28cc7e2b..4d4ef3029823 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
@@ -35,7 +35,6 @@ import org.openoffice.xmerge.util.Debug;
 import org.openoffice.xmerge.util.EndianConverter;
 import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants;
 
-
 /**
  * Reperesent a BIFF Record descibing a cell containing a string
  */
@@ -47,10 +46,10 @@ public class LabelCell extends CellValue {
     /**
       * Constructs a <code>LabelCell</code> using specified attributes
      *
-     * @param row row number
-     * @param col column number
+     * @param row          row number
+     * @param column       column number
      * @param cellContents contents of the cell
-     * @param ixfe font index
+     * @param ixfe         font index
       */
     public LabelCell(int row, int column, String cellContents, int ixfe)
     throws IOException {
@@ -73,7 +72,7 @@ public class LabelCell extends CellValue {
     /**
      * Writes a <code>LabelCell</code> to the specified <code>Outputstream</code>
      *
-     * @param os the <code>OutputStream</code> to write to
+     * @param output The <code>OutputStream</code> to write to
      */
     public void write(OutputStream output) throws IOException {
 
@@ -117,7 +116,6 @@ public class LabelCell extends CellValue {
         return numOfBytesRead;
     }
 
-
     /**
      * Gets the <code>String</code> representing the cells contents
      *
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java
index b65d1027f969..8c1547e3f2a1 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java
@@ -124,9 +124,11 @@ public class Pane implements BIFFRecord {
     }
 
     /**
-     * Get the hex code for this particular <code>BIFFRecord</code>
+     * Set the pane number
+     * 0 - bottom right, 1 - top right
+     * 2 - bottom left, 3 - top left
      *
-     * @return the hex code for <code>Pane</code>
+     * @param paneNumber the pane number
      */
     public void setPaneNumber(int paneNumber) {
         pnnAcct = (byte) paneNumber;
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java
index 8e3067d26c6b..5e36575d4296 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java
@@ -35,7 +35,6 @@ import org.openoffice.xmerge.util.Debug;
 import org.openoffice.xmerge.util.EndianConverter;
 import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants;
 
-
 /**
  * Represents s BIFF Record that describes the format of a column
  */
@@ -94,7 +93,7 @@ public class Row implements BIFFRecord {
     }
 
     /**
-     * Get the rown number for this style
+     * Get the row number
      *
      * @return the row this style applies to
      */
@@ -105,7 +104,7 @@ public class Row implements BIFFRecord {
     /**
      * Reads a Row from an <code>InputStream</code>
      *
-     * @param   is InputStream containing a Pane Record
+     * @param   input InputStream containing a Row Record
      */
     public int read(InputStream input) throws IOException {
 
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java
index 308eae29227e..72dc960880b5 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java
@@ -36,7 +36,6 @@ import org.openoffice.xmerge.util.Debug;
 import org.openoffice.xmerge.util.EndianConverter;
 import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants;
 
-
 /**
  * Represents a BIFF Record that describes the selected area of a worksheet
  */
@@ -81,9 +80,9 @@ public class Selection implements BIFFRecord {
     }
 
     /**
-     * Get the hex code for this particular <code>BIFFRecord</code>
+     * Get the active cell for this particular <code>BIFFRecord</code>
      *
-     * @return the hex code for <code>Selection</code>
+     * @return the cell position
      */
     public Point getActiveCell() {
         Point p = new Point(colActive, EndianConverter.readShort(rwActive));
@@ -91,9 +90,9 @@ public class Selection implements BIFFRecord {
     }
 
     /**
-     * Get the hex code for this particular <code>BIFFRecord</code>
+     * Set the active cell position for this particular <code>BIFFRecord</code>
      *
-     * @return the hex code for <code>Selection</code>
+     * @param p The active cell position
      */
     public void setActiveCell(Point p) {
 
@@ -104,7 +103,7 @@ public class Selection implements BIFFRecord {
     /**
      * Reads a Selection Record from the <code>InputStream</code>
      *
-     * @param   is InputStream containing a Pocket Excel Data file.
+     * @param   input InputStream containing a Pocket Excel Data file.
      */
     public int read(InputStream input) throws IOException {
 
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java
index c516eca69b1b..af33a2a6b8d0 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java
@@ -36,7 +36,6 @@ import org.openoffice.xmerge.util.Debug;
 import org.openoffice.xmerge.util.EndianConverter;
 import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants;
 
-
 /**
  * Represents a BIFF Record that describes the value of a formula that
  * evaluates to a string
@@ -47,9 +46,9 @@ public class StringValue implements BIFFRecord {
     private byte[]  rgch;
 
     /**
-      * Constructs a StringValue Record from an <code>InputStream</code>
+      * Constructs a StringValue Record from a string
       *
-      * @param  is InputStream containing a StringValue Record
+      * @param  str String containing value
       */
     public StringValue(String str) throws IOException {
         cch = EndianConverter.writeShort((short) str.length());
@@ -78,7 +77,7 @@ public class StringValue implements BIFFRecord {
        /**
       * Reads a StringVlaue Record from an <code>InputStream</code>
       *
-      * @param  is InputStream containing a StringValue Record
+      * @param  input InputStream containing a StringValue Record
       */
     public int read(InputStream input) throws IOException {
 
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java
index c060db90d60d..d2c256e41e1e 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java
@@ -35,7 +35,6 @@ import org.openoffice.xmerge.util.Debug;
 import org.openoffice.xmerge.util.EndianConverter;
 import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants;
 
-
 /**
  * Represents a BIFF REcord that describes workbook window attributes
  */
@@ -91,7 +90,7 @@ public class Window1 implements BIFFRecord {
        /**
       * Reads a Window1 Record from an <code>InputStream</code>
       *
-      * @param  is InputStream containing a Window1 Record
+      * @param  input InputStream containing a Window1 Record
       */
     public int read(InputStream input) throws IOException {
 
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java
index 4c49a941219c..12bc74641092 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java
@@ -37,7 +37,6 @@ import org.openoffice.xmerge.util.EndianConverter;
 import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants;
 import org.openoffice.xmerge.converter.xml.sxc.SheetSettings;
 
-
 /**
  * Represents a BIFF Record that describes worksheet window attributes
  */
@@ -127,7 +126,7 @@ public class Window2 implements BIFFRecord {
        /**
       * Reads a Window2 Record from an <code>InputStream</code>
       *
-      * @param  is InputStream containing a Window2 Record
+      * @param  input InputStream containing a Window2 Record
       */
     public int read(InputStream input) throws IOException {
 
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java
index 5a9f329e4667..2fb8f416c037 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java
@@ -69,7 +69,6 @@ OfficeConstants {
         eof             = new Eof();
     }
 
-
     /**
      * Constructs a pocket Excel Workbook with the name of the file passed in
      * as an argument. Also fills out a basic header block containing the
@@ -91,7 +90,9 @@ OfficeConstants {
      * Constructs a pocket Excel Workbook from the
      * <code>InputStream</code> and assigns it the document name passed in
      *
-     * @param   is InputStream containing a Pocket Excel Data file.
+     * @param   name Name of the Pocket Excel Data file. (including the file
+     *               extension)
+     * @param   is   InputStream containing a Pocket Excel Data file.
      */
     public Workbook(String name, InputStream is) throws IOException {
         read(is);
@@ -240,7 +241,7 @@ OfficeConstants {
     /**
       * Adds a ExtendedFormat record to the workbook
      *
-      * @param  f the font recrod to add
+      * @param  fmt the font record to add
       */
     public int addExtendedFormat(Format fmt) throws IOException {
 
@@ -362,7 +363,7 @@ OfficeConstants {
     /**
      * Adds a <code>Worksheet</code> to the workbook.
      *
-     * @return name the name of the <code>Worksheet</code> to be added
+     * @param name the name of the <code>Worksheet</code> to be added
      */
     public void addWorksheet(String name) throws IOException {
 
@@ -376,7 +377,10 @@ OfficeConstants {
     /**
      * Adds a cell to the current worksheet.
      *
-     * @return the name of the <code>Worksheet</code> to be added
+     * @param row          Row index for the new cell.
+     * @param col          Column index for the new cell.
+     * @param fmt          Format description for the new cell.
+     * @param cellContents Contents for the new cell.
      */
     public void addCell(int row,int col, Format fmt, String cellContents)
     throws IOException {
@@ -429,7 +433,7 @@ OfficeConstants {
 
     /**
       * Will create a number of ColInfo records based on the column widths
-     * based in.
+     * passed in.
      *
       * @param  columnRows <code>Vector</code> of <code>ColumnRowInfo</code>
       */
@@ -470,12 +474,11 @@ OfficeConstants {
         }
     }
 
-    /**
-      * Will create a number of ColInfo recrods based on the column widths
-     * based in.
-     *
-      * @param  an integer list representing the column widths
-      */
+   /**
+    * Add a name definition to the workbook.
+    *
+    * @param nameDefinition The name definition to add.
+    */
     public void addNameDefinition(NameDefinition nameDefinition) throws IOException {
 
         DefinedName dn = new DefinedName(nameDefinition, this);
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java
index 6ab57189f39f..7c43122cef76 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java
@@ -38,7 +38,6 @@ import org.openoffice.xmerge.util.Debug;
 import org.openoffice.xmerge.converter.xml.sxc.SheetSettings;
 import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants;
 
-
 /**
  *  This class is used by <code>PxlDocument</code> to maintain pexcel
  *  worksheets.
@@ -61,18 +60,16 @@ public class Worksheet {
     private Eof eof;
 
     /**
-      * Writes the current workbook to the <code>Outputstream</code>
+      * Creates a worksheet in a given workbook.
       *
-      * @param  os The destination outputstream
+      * @param  wb The destination workbook.
       */
     public Worksheet(Workbook wb) {
         this.wb = wb;
     }
 
     /**
-      * Default Contructor
-      *
-      * @param  os The destination outputstream
+      * Default Contructor. Creates a worksheet not attached to any workbook.
       */
     public Worksheet() {
     }
@@ -108,11 +105,12 @@ public class Worksheet {
     }
 
     /**
-      * Reads a worksheet from the <code>InputStream</code> and contructs a
+     *  Reads a worksheet from the <code>InputStream</code> and contructs a
      *  workbook object from it
      *
-      * @param  is InputStream containing a Pocket Excel Data file.
-      */
+     * @param   is InputStream containing a Pocket Excel Data file.
+     * @return True if we read anything. False if not.
+     */
     public boolean read(InputStream is) throws IOException {
 
         int b = is.read();
@@ -230,38 +228,38 @@ public class Worksheet {
     }
 
     /**
-      * Adds a cell to this worksheet. Current valdid celltypes are
-     * <code>FloatNumber</code>, <code>LabelCell</code> or <code>Formula</code>
+     * Adds a cell to this worksheet based on a <code>BIFFRecord</code>.
+     * Current valdid celltypes are <code>FloatNumber</code>,
+     * <code>LabelCell</code> or <code>Formula</code>
      *
-      * @param  f the font recrod to add
-      */
+     * @param br The <code>BIFFRecord</code> to read from.
+     */
     public void addCell(BIFFRecord br) {
         cells.add(br);
     }
 
     /**
-      * Adds a number of ColInfo Records to the worksheet base on a list of
-     * clumnwidths passed in
+     * Adds a row to the worksheet.
      *
-      * @param  list of column widths
-      */
+     * @param r The row to add.
+     */
     public void addRow(Row r) {
         rows.add(r);
     }
 
     /**
-      * Adds a number of ColInfo Records to the worksheet base on a list of
-     * clumnwidths passed in
+     * Adds a ColInfo record to the worksheet. This may effec more than one column.
      *
-      * @param  list of column widths
-      */
+     * @param c ColInfo structure defining widths, format etc.
+     */
     public void addCol(ColInfo c) {
         colInfo.add(c);
     }
+
     /**
-     * Returns an <code>Enumeration</code> to the ColInfo's for this worksheet
+     * Add various settings to this worksheet.
      *
-     * @return an <code>Enumeration</code> to the ColInfo's
+     * @param s SheetSettings object defining pane number, splits etc.
      */
     public void addSettings(SheetSettings s) {
 
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
index 208feb030f36..1ae9388d013d 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
@@ -37,7 +37,7 @@ import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Workbook;
 /**
  * This Helper class provides a simplified interface to conversion between PocketXL formula representation
  * and Calc formula representation.<p>
- * The class is used by {@link org.openoffice.xmerge.converter.xml.sxc.pexcel.Records.Formula}
+ * The class is used by {@link org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Formula}
  */
 public class FormulaHelper {
 
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
index 551b77cf6e7f..1f2bef7b1d92 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
@@ -31,7 +31,7 @@ import java.util.HashMap;
 
 /**
  * This class defines the precedence applied to each operator when performing a conversion
- * {@link org.openoffice.xmerge.converter.xml.sxc.pexcel.Records.formula.FormulaCompiler.infix2 from infix to RPN.}.
+ * {@link org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula.FormulaCompiler.infix2RPN  from infix to RPN}.
  */
 public class PrecedenceTable {
     public static final int DEFAULT_PRECEDENCE  = 0;
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/SymbolLookup.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/SymbolLookup.java
index bf7722b973e4..521799d518f1 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/SymbolLookup.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/SymbolLookup.java
@@ -48,7 +48,7 @@ public abstract class SymbolLookup {
     /**
      * Associate a symbol with a  numeric value in the lookup table
      * @param symbol    The symbol that will act as the key in the lookup table
-     * @param value     The value to be associated with a given symbol
+     * @param id        The ID number to be associated with a given symbol
      */
     public void addEntry(String symbol, int id) {
         Integer iObj = new Integer(id);
diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java
index 08424a073803..db53410633ff 100644
--- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java
+++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java
@@ -45,7 +45,6 @@ import org.openoffice.xmerge.converter.xml.StyleCatalog;
 
 import java.io.IOException;
 
-
 /**
  * <p>Pocket Word implementation of <code>DocumentDeserializer</code>
  * for use by {@link
@@ -67,7 +66,6 @@ public final class DocumentSerializerImpl
 
     private boolean inList = false;
 
-
     /**
      *  <p>Initialises a new <code>DocumentSerializerImpl</code> using the.<br>
      *     supplied <code>Document</code></p>
@@ -76,14 +74,13 @@ public final class DocumentSerializerImpl
      *    org.openoffice.xmerge.converter.xml.sxw.SxwDocument SxwDocument}
      *    object.</p>
      *
-     *  @param  document  The <code>Document</code> to convert.
+     *  @param  doc  The <code>Document</code> to convert.
      */
     public DocumentSerializerImpl(Document doc) {
         sxwDoc = (SxwDocument)doc;
         pswDoc = new PocketWordDocument(sxwDoc.getName());
     }
 
-
     /**
      *  <p>Convert the data passed into the <code>DocumentSerializerImpl</code>
      *  constructor into Pocket Word format.</p>
@@ -119,7 +116,6 @@ public final class DocumentSerializerImpl
         return cd;
     }
 
-
     /*
      * Handles the loading of defined styles from the style.xml file as well
      * as automatic styles from the content.xml file.
@@ -175,7 +171,6 @@ public final class DocumentSerializerImpl
         }
     }
 
-
     /*
      * Process the office:body tag.
      */
@@ -205,7 +200,6 @@ public final class DocumentSerializerImpl
         }
     }
 
-
     /*
      * Process a text:p tag
      */
@@ -238,7 +232,6 @@ public final class DocumentSerializerImpl
         traverseParagraphContents(node, tstyle);
     }
 
-
     /*
      * Process the contents of a paragraph.  This method handles situations
      * where the paragraph contains multiple children, each representing a
@@ -356,7 +349,6 @@ public final class DocumentSerializerImpl
         }
     }
 
-
     /*
      * Process a text:ordered-list or text:unordered-list tag.  Pocket Word has
      * no concept of a list so there is no need to differentiate between the
@@ -387,7 +379,6 @@ public final class DocumentSerializerImpl
         inList = false;
     }
 
-
     /*
      * Process a text:list-item node.  They usually contain have a single
      * text:p child but can also have sections or other lists.
@@ -414,7 +405,6 @@ public final class DocumentSerializerImpl
 
     }
 
-
     /*
      * Utility method to retrieve a Node attribute.
      */
diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java
index bc77e0fa6988..29e04e841203 100644
--- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java
+++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java
@@ -105,7 +105,7 @@ public class PocketWordDocument implements Document, PocketWordConstants {
      * <p>This method reads <code>byte</code> data from the InputStream and
      *    extracts font and paragraph data from the file.</p>
      *
-     * @param   is      InputStream containing a Pocket Word data file.
+     * @param   docData         InputStream containing a Pocket Word data file.
      *
      * @throws  IOException     In case of any I/O errors.
      */
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
index f7df881b1061..e14ce25999db 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
@@ -157,7 +157,7 @@ public class DOMDocument
      *  Sets the Content of the <code>Document</code> to the contents of the
      *  supplied <code>Node</code> list.
      *
-     *  @return  DOM <code>Document</code> object.
+     *  @param newDom DOM <code>Document</code> object.
      */
     public void setContentDOM( Node newDom) {
     contentDoc=(Document)newDom;
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java
index 668bfdb7f155..99038df73cc6 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java
@@ -120,7 +120,7 @@ public class PalmDocument
     /**
      *  Writes the <code>PalmDocument</code> to an <code>OutputStream</code>.
      *
-     *  @param  is  The <code>OutputStream</code> to write the content.
+     *  @param  os  The <code>OutputStream</code> to write the content.
      *
      *  @throws  IOException  If any I/O error occurs.
      */
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java
index 23690792bdbf..f2b1d557006e 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java
@@ -138,7 +138,7 @@ public final class Record {
      *  <code>Record</code> length followed by the data in this
      *  <code>Record</code> object.
      *
-     *  @param  out  The <code>OutputStream</code> to write the object.
+     *  @param  outs  The <code>OutputStream</code> to write the object.
      *
      *  @throws  IOException  If any I/O error occurs.
      */
@@ -155,7 +155,7 @@ public final class Record {
      *  Read the necessary data to create a PDB from
      *  the <code>InputStream</code>.
      *
-     *  @param  in  The <code>InputStream</code> to read data from
+     *  @param  ins  The <code>InputStream</code> to read data from
      *              in order to restore the <code>object</code>.
      *
      *  @throws  IOException  If any I/O error occurs.
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java
index 6e5f123ded53..dcf82bd2ace6 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java
@@ -138,7 +138,7 @@ public class EmbeddedXMLObject extends EmbeddedObject {
     /**
      * Sets the settings data for the embedded object.
      *
-     * @param   styles     DOM representation of the object's styles.
+     * @param   settings     DOM representation of the object's styles.
      */
     public void setSettingsDOM(Document settings) {
         settingsDOM = settings;
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
index 662a542d0e7b..e68327792374 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
@@ -269,15 +269,15 @@ public class ParaStyle extends Style implements Cloneable {
     /**
      *  Constructor for use when going from client device format to DOM.
      *
-     *  @param  name     Name of the <code>Style</code>.  Can be null.
-     *  @param  family   Family of the <code>Style</code> - usually
-     *                   <i>paragraph</i>, <i>text</i>, etc.  Can be null.
-     *  @param  parent   Name of the parent <code>Style</code>, or null
-     *                   if none.
-     *  @param  attribs  Array of attributes to set.
-     *  @param  values   Array of values to set.
-     *  @param  sc       The <code>StyleCatalog</code>, which is used for
-     *                   looking up ancestor <code>Style</code> objects.
+     *  @param  name       Name of the <code>Style</code>.  Can be null.
+     *  @param  familyName Family of the <code>Style</code> - usually
+     *                     <i>paragraph</i>, <i>text</i>, etc.  Can be null.
+     *  @param  parentName Name of the parent <code>Style</code>, or null
+     *                     if none.
+     *  @param  attribs    Array of attributes to set.
+     *  @param  values     Array of values to set.
+     *  @param  sc         The <code>StyleCatalog</code>, which is used for
+     *                     looking up ancestor <code>Style</code> objects.
      */
     public ParaStyle(String name, String familyName, String parentName,
     String attribs[], String values[], StyleCatalog sc) {
@@ -292,15 +292,15 @@ public class ParaStyle extends Style implements Cloneable {
      *  Alternate constructor for use when going from client device
      *  format to DOM.
      *
-     *  @param  name     Name of the <code>Style</code>.  Can be null.
-     *  @param  family   Family of the <code>Style</code> - usually
-     *                   <i>paragraph</i>, <i>text</i>, etc.  Can be null.
-     *  @param  parent   Name of the parent <code>Style</code>, or
-     *                   null if none.
-     *  @param  attribs  Array of attributes indices to set.
-     *  @param  values   Array of values to set.
-     *  @param  sc       The <code>StyleCatalog</code>, which is used for
-     *                   looking up ancestor <code>Style</code> objects.
+     *  @param  name       Name of the <code>Style</code>.  Can be null.
+     *  @param  familyName Family of the <code>Style</code> - usually
+     *                     <i>paragraph</i>, <i>text</i>, etc.  Can be null.
+     *  @param  parentName Name of the parent <code>Style</code>, or
+     *                     null if none.
+     *  @param  attribs    Array of attributes indices to set.
+     *  @param  values     Array of values to set.
+     *  @param  lookup     The <code>StyleCatalog</code>, which is used for
+     *                     looking up ancestor <code>Style</code> objects.
      */
     public ParaStyle(String name, String familyName, String parentName,
     int attribs[], String values[], StyleCatalog lookup) {
@@ -377,7 +377,7 @@ public class ParaStyle extends Style implements Cloneable {
      *  Set an attribute for this paragraph <code>Style</code>.
      *
      *  @param  attr   The attribute index to set.
-     *  @apram  value  The attribute value to set.
+     *  @param  value  The attribute value to set.
      */
     public void setAttribute(int attr, String value) {
         isSet[attr] = true;
@@ -500,9 +500,9 @@ public class ParaStyle extends Style implements Cloneable {
     /**
      *  Create the <code>Node</code> with the specified elements.
      *
-     *  @parentDoc  Parent  <code>Document</code> of the
-     *                      <code>Node</code> to create.
-     *  @param      name    Name of the <code>Node</code>.
+     *  @param parentDoc  Parent <code>Document</code> of the
+     *                    <code>Node</code> to create.
+     *  @param name       Name of the <code>Node</code>.
      *
      *  @return  The created <code>Node</code>.
      */
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
index 91926310776c..c1a4430b32f1 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
@@ -78,7 +78,7 @@ public class TextStyle extends Style implements Cloneable {
     /**
      *  Constructor for use when going from DOM to client device format.
      *
-     *  @param  Node  The <i>style:style</i> <code>Node</code> containing
+     *  @param  node  The <i>style:style</i> <code>Node</code> containing
      *                the <code>Style</code>.  (This <code>Node</code> is
      *                assumed have a <i>family</i> attribute of <i>text</i>).
      *  @param  sc    The <code>StyleCatalog</code>, which is used for
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
index b1d4d5b510fd..afd90733eb68 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
@@ -44,15 +44,12 @@ public interface MergeAlgorithm {
      *  This method is to merge the difference to an <code>Iterator</code>.
      *  The original <code>Iterator</code> will be modified after the call.
      *
-     *  @param  objSeq       The original sequence which the difference
+     *  @param  orgSeq       The original sequence which the difference
      *                       will be applied.  It will be modified.
      *  @param  modSeq       The modified sequence where the difference
      *                       content will be extracted.
      *  @param  differences  The <code>Difference</code> array.
      *
-     *  @return  An <code>Iterator</code> which is the modified original
-     *           <code>Iterator</code> Sequence.  Same as the first parameter.
-     *
      *  @throws  MergeException  If an error occurs during the merge.
      */
     public void applyDifference(Iterator orgSeq, Iterator modSeq,
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
index 9337816c64ab..525cbd74d481 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
@@ -47,6 +47,6 @@ public interface NodeMergeAlgorithm {
      *  @param  modifyNode    The <code>Node</code> to be merged.  It may
      *                        be modified.
      */
-    public void merge(Node orginialNode, Node modifyNode);
+    public void merge(Node orginalNode, Node modifyNode);
 }
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java
index b1da7bcdcdaf..2c5359010276 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java
@@ -52,7 +52,7 @@ public final class TextNodeIterator extends NodeIterator {
     /**
      *  Standard constructor.
      *
-     *  @param  initial  The initial root <code>Node</code>.
+     *  @param  node  The initial root <code>Node</code>.
      */
     public TextNodeIterator(Node node) {
         super(null, node);
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java
index f9742c48a743..731fafa8acff 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java
@@ -38,7 +38,7 @@ import java.util.Enumeration;
  *  Loads a properties file so that registry knows which plug-ins
  *  it needs to load.
  *
- *  @author: Martin Maher
+ *  @author Martin Maher
  */
 public class ConverterInfoList {
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java
index 33ef294d4ae8..bfaffdffbe42 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java
@@ -112,7 +112,7 @@ public class ColourConverter {
      * cases where the 16 colour values are something other than there default
      * values (e.g. in the case of pocket Excel)
      *
-     * @param short[] a 16 bit array mapping the 16 colours to there values
+     * @param lookup[] a 16 bit array mapping the 16 colours to their values
      */
     public ColourConverter(short lookup[]) {
 
@@ -155,7 +155,7 @@ public class ColourConverter {
      * This method maps a Pocket Word colour index value to an RGB value as
      * used by OpenOffice.
      *
-     * @param   index   The index into Pocket Word's colour table.
+     * @param   colour   The index into Pocket Word's colour table.
      *
      * @return  A Color object representing the RGB value of the Pocket Word
      *          colour.
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
index 8b9f06eb4e86..7edef508507a 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
@@ -269,7 +269,7 @@ public final class Debug {
      *  <p>This logs the message during runtime if debug.info or debug.trace
      *  in the properties file is set to true.</p>
      *
-     *  @param   int   Log type, one of the Debug constants
+     *  @param   flag  Log type, one of the Debug constants
      *                 {@link #INFO}, {@link #TRACE}, {@link #ERROR}
      *                 or a combination of which or'ed together.
      *  @param   msg   The message.
@@ -291,7 +291,7 @@ public final class Debug {
      *  of the exception passed in.  Refer to the other log method
      *  for description.
      *
-     *  @param   int   Log type, one of the Debug constants
+     *  @param   flag  Log type, one of the Debug constants
      *                 {@link #INFO}, {@link #TRACE}, {@link #ERROR}
      *                 or a combination of which or'ed together.
      *  @param   msg   The message.
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
index 0993924c129f..b94a7085724c 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
@@ -37,7 +37,7 @@ import java.io.*;
  *  manager can exist at a time.  It is final, so it may not be
  *  subclassed.
  *
- *  @author: Brian Cameron
+ *  @author Brian Cameron
  */
 public final class ConverterInfoMgr {
 
@@ -50,15 +50,13 @@ public final class ConverterInfoMgr {
        converterInfoList = new Vector();
     }
 
-
    /**
     *  Adds a converter plug-in to the registry.  The
     *  <code>ConverterInfo</code> must have a unique DisplayName
     *  and must have non-null values for DisplayName, ClassImpl,
     *  OfficeMime, and DeviceMime.
     *
-    *  @param  ConverterInfo  A <code>ConverterInfo</code> object
-    *                         describing a plug-in.
+    *  @param  ci  A <code>ConverterInfo</code> object describing a plug-in.
     *
     *  @throws  RegistryException  If the <code>ConverterInfo</code>
     *                              is not valid.
@@ -111,14 +109,13 @@ public final class ConverterInfoMgr {
         }
     }
 
-
    /**
-    *  Adds a <code>Vector</code> of converter plug-ins to the registry.
-    *  Each <code>ConverterInfo</code> in the <code>Vector</code> must have
+    *  Adds a list of converter plug-ins to the registry.
+    *  Each <code>ConverterInfo</code> in the list must have
     *  a unique DisplayName and must have non-null values for DisplayName,
     *  ClassImpl, OfficeMime, and DeviceMime.
     *
-    *  @param  ciVectory  A <code>Vector</code> of <code>ConverterInfo</code>
+    *  @param  jarEnum  An <code>Enumeration</code> of <code>ConverterInfo</code>
     *                     objects describing one or more plug-in(s).
     *
     *  @throws  RegistryException  If a <code>ConverterInfo</code> in the
@@ -132,7 +129,6 @@ public final class ConverterInfoMgr {
         }
     }
 
-
    /**
     *  Returns an <code>Enumeration</code> of registered
     *  <code>ConverterInfo</code> objects.
@@ -145,7 +141,6 @@ public final class ConverterInfoMgr {
       return (converterInfoList.elements());
    }
 
-
    /**
     *  Removes any <code>ConverterInfo</code> object from the registry
     *  that have the specified jar name value.
@@ -183,7 +178,6 @@ public final class ConverterInfoMgr {
         return rc;
     }
 
-
    /**
     *  Removes any <code>ConverterInfo</code> object from the registry
     *  that have the specified display name value.
@@ -210,7 +204,6 @@ public final class ConverterInfoMgr {
         return rc;
     }
 
-
    /**
     *  Returns the <code>ConverterInfo</code> object that supports
     *  the specified device/office mime type conversion.  If there
@@ -254,15 +247,14 @@ public final class ConverterInfoMgr {
         return null;
     }
 
-
    /**
     *  Returns an array of two <code>ConverterInfo</code> objects that
     *  can be chained to perform the specified mime type conversion.
     *  If there are multiple <code>ConverterInfo</code> objects that
     *  support this conversion, only the first is returned.
     *
-    *  @param  deviceMimeFrom  The device from mime.
-    *  @param  deviceMimeTo    The device to mime.
+    *  @param  deviceFromMime  The device from mime.
+    *  @param  deviceToMime    The device to mime.
     *
     *  @return  An array of two <code>ConverterInfo</code> objects
     *           that can be chained to perform the specified
@@ -323,7 +315,6 @@ public final class ConverterInfoMgr {
         return null;
     }
 
-
     /**
      *  main to let the user specify what plug-ins to register from
      *  jarfiles and to display the currently registered plug-ins.
@@ -533,4 +524,3 @@ public final class ConverterInfoMgr {
         }
     }
 }
-
diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx
index 52f66c39ea23..895a02e1a882 100644
--- a/xmlhelp/source/cxxhelp/provider/content.cxx
+++ b/xmlhelp/source/cxxhelp/provider/content.cxx
@@ -165,7 +165,7 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
 rtl::OUString SAL_CALL Content::getImplementationName()
     throw( uno::RuntimeException )
 {
-    return rtl::OUString::createFromAscii( "CHelpContent" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CHelpContent" ));
 }
 
 //=========================================================================
@@ -175,7 +175,7 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames()
 {
     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;
 }
 
@@ -189,7 +189,7 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames()
 rtl::OUString SAL_CALL Content::getContentType()
     throw( uno::RuntimeException )
 {
-    return rtl::OUString::createFromAscii( MYUCP_CONTENT_TYPE );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( MYUCP_CONTENT_TYPE ));
 }
 
 //=========================================================================
@@ -462,8 +462,8 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
         if ( rProp.Name.compareToAscii( "ContentType" ) == 0 )
             xRow->appendString(
                 rProp,
-                rtl::OUString::createFromAscii(
-                    "application/vnd.sun.star.help" ) );
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "application/vnd.sun.star.help" )) );
         else if( rProp.Name.compareToAscii( "Title" ) == 0 )
             xRow->appendString ( rProp,m_aURLParameter.get_title() );
         else if( rProp.Name.compareToAscii( "IsReadOnly" ) == 0 )
@@ -482,18 +482,18 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
             if( m_aURLParameter.isPicture() )
                 xRow->appendString(
                     rProp,
-                    rtl::OUString::createFromAscii( "image/gif" ) );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "image/gif" )) );
             else if( m_aURLParameter.isActive() )
                 xRow->appendString(
                     rProp,
-                    rtl::OUString::createFromAscii( "text/plain" ) );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "text/plain" )) );
             else if( m_aURLParameter.isFile() )
                 xRow->appendString(
-                    rProp,rtl::OUString::createFromAscii( "text/html" ) );
+                    rProp,rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "text/html" )) );
             else if( m_aURLParameter.isRoot() )
                 xRow->appendString(
                     rProp,
-                    rtl::OUString::createFromAscii( "text/css" ) );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "text/css" )) );
             else
                 xRow->appendVoid( rProp );
         else if( m_aURLParameter.isModule() )
@@ -544,8 +544,8 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
             else if( rProp.Name.compareToAscii( "SearchScopes" ) == 0 )
             {
                 uno::Sequence< rtl::OUString > seq( 2 );
-                seq[0] = rtl::OUString::createFromAscii( "Heading" );
-                seq[1] = rtl::OUString::createFromAscii( "FullText" );
+                seq[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Heading" ));
+                seq[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FullText" ));
                 uno::Any aAny;
                 aAny <<= seq;
                 xRow->appendObject( rProp,aAny );
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 4f55d7571910..711021d17627 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -31,6 +31,7 @@
 #include "db.hxx"
 #include <osl/diagnose.h>
 #include <osl/thread.h>
+#include <osl/process.h>
 #include <rtl/uri.hxx>
 #include <osl/file.hxx>
 #include <rtl/memory.h>
@@ -80,8 +81,8 @@ using namespace com::sun::star::deployment;
 using namespace com::sun::star::beans;
 
 
-static rtl::OUString aSlash( rtl::OUString::createFromAscii( "/" ) );
-static rtl::OUString aHelpFilesBaseName( rtl::OUString::createFromAscii( "help" ) );
+static rtl::OUString aSlash(RTL_CONSTASCII_USTRINGPARAM("/"));
+static rtl::OUString aHelpFilesBaseName(RTL_CONSTASCII_USTRINGPARAM("help"));
 
 rtl::OUString Databases::expandURL( const rtl::OUString& aURL )
 {
@@ -103,18 +104,18 @@ rtl::OUString Databases::expandURL( const rtl::OUString& aURL, Reference< uno::X
         Reference< XMultiComponentFactory > xSMgr( xContext->getServiceManager(), UNO_QUERY );
 
         xFac = Reference< uri::XUriReferenceFactory >(
-            xSMgr->createInstanceWithContext( rtl::OUString::createFromAscii(
-            "com.sun.star.uri.UriReferenceFactory"), xContext ) , UNO_QUERY );
+            xSMgr->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.uri.UriReferenceFactory")), xContext ) , UNO_QUERY );
         if( !xFac.is() )
         {
             throw RuntimeException(
-                ::rtl::OUString::createFromAscii( "Databases::expand(), could not instatiate UriReferenceFactory." ),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Databases::expand(), could not instatiate UriReferenceFactory." )),
                 Reference< XInterface >() );
         }
 
         xMacroExpander = Reference< util::XMacroExpander >(
             xContext->getValueByName(
-            ::rtl::OUString::createFromAscii( "/singletons/com.sun.star.util.theMacroExpander" ) ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theMacroExpander" )) ),
             UNO_QUERY_THROW );
      }
 
@@ -152,13 +153,13 @@ Databases::Databases( sal_Bool showBasic,
       m_nCustomCSSDocLength( 0 ),
       m_pCustomCSSDoc( 0 ),
       m_aCSS(styleSheet.toAsciiLowerCase()),
-      newProdName(rtl::OUString::createFromAscii( "$[officename]" ) ),
-      newProdVersion(rtl::OUString::createFromAscii( "$[officeversion]" ) ),
-      prodName( rtl::OUString::createFromAscii( "%PRODUCTNAME" ) ),
-      prodVersion( rtl::OUString::createFromAscii( "%PRODUCTVERSION" ) ),
-      vendName( rtl::OUString::createFromAscii( "%VENDORNAME" ) ),
-      vendVersion( rtl::OUString::createFromAscii( "%VENDORVERSION" ) ),
-      vendShort( rtl::OUString::createFromAscii( "%VENDORSHORT" ) ),
+      newProdName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "$[officename]" )) ),
+      newProdVersion(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "$[officeversion]" )) ),
+      prodName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "%PRODUCTNAME" )) ),
+      prodVersion( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "%PRODUCTVERSION" )) ),
+      vendName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "%VENDORNAME" )) ),
+      vendVersion( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "%VENDORVERSION" )) ),
+      vendShort( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "%VENDORSHORT" )) ),
       m_aImagesZipPaths( imagesZipPaths ),
       m_nSymbolsStyle( 0 )
 {
@@ -181,7 +182,7 @@ Databases::Databases( sal_Bool showBasic,
     setInstallPath( instPath );
 
     m_xSFA = Reference< ucb::XSimpleFileAccess >(
-        m_xSMgr->createInstanceWithContext( rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ),
+        m_xSMgr->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" )),
         m_xContext ), UNO_QUERY_THROW );
 }
 
@@ -237,17 +238,21 @@ static bool impl_getZipFile(
         const rtl::OUString & rZipName,
         rtl::OUString & rFileName )
 {
+    rtl::OUString aWorkingDir;
+    osl_getProcessWorkingDir( &aWorkingDir.pData );
     const rtl::OUString *pPathArray = rImagesZipPaths.getArray();
     for ( int i = 0; i < rImagesZipPaths.getLength(); ++i )
     {
-        rFileName = pPathArray[ i ];
-        if ( rFileName.getLength() )
+        rtl::OUString aFileName = pPathArray[ i ];
+        if ( aFileName.getLength() )
         {
-            if ( 1 + rFileName.lastIndexOf( '/' ) != rFileName.getLength() )
+            if ( 1 + aFileName.lastIndexOf( '/' ) != aFileName.getLength() )
             {
-                rFileName += rtl::OUString::createFromAscii( "/" );
+                aFileName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" ));
             }
-            rFileName += rZipName;
+            aFileName += rZipName;
+            // the icons are not read when the URL is a symlink
+            osl::File::getAbsoluteFileURL( aWorkingDir, aFileName, rFileName );
 
             // test existence
             osl::DirectoryItem aDirItem;
@@ -265,23 +270,23 @@ rtl::OString Databases::getImagesZipFileURL()
     try
     {
         uno::Reference< lang::XMultiServiceFactory > xConfigProvider(
-            m_xSMgr ->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider"), m_xContext), uno::UNO_QUERY_THROW);
+            m_xSMgr ->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider")), m_xContext), uno::UNO_QUERY_THROW);
 
         // set root path
         uno::Sequence < uno::Any > lParams(1);
         beans::PropertyValue                       aParam ;
-        aParam.Name    = ::rtl::OUString::createFromAscii("nodepath");
-        aParam.Value <<= ::rtl::OUString::createFromAscii("org.openoffice.Office.Common");
+        aParam.Name    = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath"));
+        aParam.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common"));
         lParams[0] = uno::makeAny(aParam);
 
         // open it
         uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments(
-                    ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")),
                     lParams) );
 
         bool bChanged = false;
         uno::Reference< container::XHierarchicalNameAccess > xAccess(xCFG, uno::UNO_QUERY_THROW);
-        uno::Any aResult = xAccess->getByHierarchicalName(::rtl::OUString::createFromAscii("Misc/SymbolSet"));
+        uno::Any aResult = xAccess->getByHierarchicalName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Misc/SymbolSet")));
         if ( (aResult >>= nSymbolsStyle) && m_nSymbolsStyle != nSymbolsStyle )
         {
             m_nSymbolsStyle = nSymbolsStyle;
@@ -291,21 +296,21 @@ rtl::OString Databases::getImagesZipFileURL()
         if ( !m_aImagesZipFileURL.getLength() || bChanged )
         {
             rtl::OUString aImageZip, aSymbolsStyleName;
-            aResult = xAccess->getByHierarchicalName(::rtl::OUString::createFromAscii("Misc/SymbolStyle"));
+            aResult = xAccess->getByHierarchicalName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Misc/SymbolStyle")));
             aResult >>= aSymbolsStyleName;
 
             bool bFound = false;
             if ( aSymbolsStyleName.getLength() != 0 )
             {
-                rtl::OUString aZipName = rtl::OUString::createFromAscii( "images_" );
+                rtl::OUString aZipName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images_" ));
                 aZipName += aSymbolsStyleName;
-                aZipName += rtl::OUString::createFromAscii( ".zip" );
+                aZipName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".zip" ));
 
                 bFound = impl_getZipFile( m_aImagesZipPaths, aZipName, aImageZip );
             }
 
             if ( ! bFound )
-                bFound = impl_getZipFile( m_aImagesZipPaths, rtl::OUString::createFromAscii( "images.zip" ), aImageZip );
+                bFound = impl_getZipFile( m_aImagesZipPaths, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "images.zip" )), aImageZip );
 
             if ( ! bFound )
                 aImageZip = rtl::OUString();
@@ -476,7 +481,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OU
 {
     osl::MutexGuard aGuard( m_aMutex );
 
-    rtl::OUString key = processLang(Language) + rtl::OUString::createFromAscii( "/" ) + Module;
+    rtl::OUString key = processLang(Language) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )) + Module;
 
     std::pair< ModInfoTable::iterator,bool > aPair =
         m_aModInfo.insert( ModInfoTable::value_type( key,0 ) );
@@ -487,7 +492,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OU
     {
         osl::File cfgFile( getInstallPathAsURL() +
                            key +
-                           rtl::OUString::createFromAscii( ".cfg" ) );
+                           rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".cfg" )) );
 
         if( osl::FileBase::E_None != cfgFile.open( OpenFlag_Read ) )
             it->second = 0;
@@ -506,7 +511,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OU
 
             const sal_Unicode* str = fileContent.getStr();
             rtl::OUString current,lang_,program,startid,title,heading,fulltext;
-            rtl::OUString order = rtl::OUString::createFromAscii( "1" );
+            rtl::OUString order(RTL_CONSTASCII_USTRINGPARAM( "1" ));
 
             for( sal_Int32 i = 0;i < fileContent.getLength();i++ )
             {
@@ -622,7 +627,7 @@ Db* Databases::getBerkeley( const rtl::OUString& Database,
     osl::MutexGuard aGuard( m_aMutex );
 
 
-    rtl::OUString aFileExt( rtl::OUString::createFromAscii( helpText ? ".ht" : ".db" ) );
+    rtl::OUString aFileExt( helpText ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".ht")) : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".db" )) );
     rtl::OUString dbFileName = aSlash + Database + aFileExt;
     rtl::OUString key;
     if( pExtensionPath == NULL )
@@ -654,7 +659,7 @@ Db* Databases::getBerkeley( const rtl::OUString& Database,
 
         rtl::OUString fileNameDBHelp( fileNameOU );
         if( pExtensionPath != NULL )
-            fileNameDBHelp += rtl::OUString::createFromAscii( "_" );
+            fileNameDBHelp += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_" ));
         if( m_xSFA->exists( fileNameDBHelp ) )
         {
             DBHelp* pDBHelp = new DBHelp( fileNameDBHelp, m_xSFA );
@@ -699,28 +704,28 @@ Databases::getCollator( const rtl::OUString& Language,
     {
         it->second =
             Reference< XCollator > (
-                m_xSMgr->createInstanceWithContext( rtl::OUString::createFromAscii( "com.sun.star.i18n.Collator" ),
+                m_xSMgr->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.Collator" )),
                 m_xContext ), UNO_QUERY );
         rtl::OUString langStr = processLang(Language);
         rtl::OUString countryStr = country(Language);
         if( !countryStr.getLength() )
         {
             if( langStr.compareToAscii("de") == 0 )
-                countryStr = rtl::OUString::createFromAscii("DE");
+                countryStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE"));
             else if( langStr.compareToAscii("en") == 0 )
-                countryStr = rtl::OUString::createFromAscii("US");
+                countryStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"));
             else if( langStr.compareToAscii("es") == 0 )
-                countryStr = rtl::OUString::createFromAscii("ES");
+                countryStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ES"));
             else if( langStr.compareToAscii("it") == 0 )
-                countryStr = rtl::OUString::createFromAscii("IT");
+                countryStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IT"));
             else if( langStr.compareToAscii("fr") == 0 )
-                countryStr = rtl::OUString::createFromAscii("FR");
+                countryStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FR"));
             else if( langStr.compareToAscii("sv") == 0 )
-                countryStr = rtl::OUString::createFromAscii("SE");
+                countryStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SE"));
             else if( langStr.compareToAscii("ja") == 0 )
-                countryStr = rtl::OUString::createFromAscii("JP");
+                countryStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JP"));
             else if( langStr.compareToAscii("ko") == 0 )
-                countryStr = rtl::OUString::createFromAscii("KR");
+                countryStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KR"));
         }
         it->second->loadDefaultCollator(  Locale( langStr,
                                                   countryStr,
@@ -935,7 +940,7 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database,
 {
     osl::MutexGuard aGuard( m_aMutex );
 
-    rtl::OUString key = processLang(Language) + rtl::OUString::createFromAscii( "/" ) + Database;
+    rtl::OUString key = processLang(Language) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )) + Database;
 
     std::pair< KeywordInfoTable::iterator,bool > aPair =
         m_aKeywordInfo.insert( KeywordInfoTable::value_type( key,0 ) );
@@ -959,7 +964,7 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database,
 
             rtl::OUString fileNameDBHelp( fileNameOU );
             if( bExtension )
-                fileNameDBHelp += rtl::OUString::createFromAscii( "_" );
+                fileNameDBHelp += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_" ));
             if( m_xSFA->exists( fileNameDBHelp ) )
             {
                 DBHelp aDBHelp( fileNameDBHelp, m_xSFA );
@@ -1133,8 +1138,8 @@ Reference< XHierarchicalNameAccess > Databases::jarFile( const rtl::OUString& ja
 
             Reference< XInterface > xIfc
                 = m_xSMgr->createInstanceWithArgumentsAndContext(
-                    rtl::OUString::createFromAscii(
-                        "com.sun.star.packages.comp.ZipPackage" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.packages.comp.ZipPackage" )),
                     aArguments, m_xContext );
 
             if ( xIfc.is() )
@@ -1294,9 +1299,9 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language,
                         uno::Reference< awt::XVclWindowPeer > xVclWindowPeer( xTopWindow, uno::UNO_QUERY );
                         if ( xVclWindowPeer.is() )
                         {
-                            uno::Any aHCMode = xVclWindowPeer->getProperty( rtl::OUString::createFromAscii( "HighContrastMode" ) );
+                            uno::Any aHCMode = xVclWindowPeer->getProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HighContrastMode" )) );
                             if ( ( aHCMode >>= bHighContrastMode ) && bHighContrastMode )
-                                aCSS = rtl::OUString::createFromAscii( "highcontrastblack" );
+                                aCSS = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "highcontrastblack" ));
                         }
                     }
                 }
@@ -1310,14 +1315,14 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language,
                 fileURL =
                     getInstallPathAsURL()  +
                     processLang( Language )       +
-                    rtl::OUString::createFromAscii( "/" ) +
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )) +
                     aCSS +
-                    rtl::OUString::createFromAscii( ".css" );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".css" ));
             else if( retry == 1 )
                 fileURL =
                     getInstallPathAsURL()  +
                     aCSS +
-                    rtl::OUString::createFromAscii( ".css" );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".css" ));
 
             osl::DirectoryItem aDirItem;
             osl::File aFile( fileURL );
@@ -1327,7 +1332,9 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language,
                 osl::FileBase::E_None == aFile.open( OpenFlag_Read )                 &&
                 osl::FileBase::E_None == aDirItem.getFileStatus( aStatus ) )
             {
-                m_nCustomCSSDocLength = int( aStatus.getFileSize() );
+                sal_uInt64 nSize;
+                aFile.getSize( nSize );
+                m_nCustomCSSDocLength = (int)nSize;
                 m_pCustomCSSDoc = new char[ 1 + m_nCustomCSSDocLength ];
                 m_pCustomCSSDoc[ m_nCustomCSSDocLength ] = 0;
                 sal_uInt64 a = m_nCustomCSSDocLength,b = m_nCustomCSSDocLength;
@@ -1340,7 +1347,7 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language,
             if ( !retry && error && bHighContrastMode )
             {
                 // fall back to default css
-                aCSS = rtl::OUString::createFromAscii( "default" );
+                aCSS = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "default" ));
                 retry = 2;
                 bHighContrastMode = sal_False;
             }
@@ -1447,7 +1454,7 @@ void Databases::setInstallPath( const rtl::OUString& aInstDir )
         //TODO: check returned error code
 
     if( m_aInstallDirectory.lastIndexOf( sal_Unicode( '/' ) ) != m_aInstallDirectory.getLength() - 1 )
-        m_aInstallDirectory += rtl::OUString::createFromAscii( "/" );
+        m_aInstallDirectory += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" ));
 
     m_aInstallDirectoryWithoutEncoding = rtl::Uri::decode( m_aInstallDirectory,
                                                            rtl_UriDecodeWithCharset,
@@ -1498,13 +1505,13 @@ void ExtensionIteratorBase::init()
     if( !m_xContext.is() )
     {
         throw RuntimeException(
-            ::rtl::OUString::createFromAscii( "ExtensionIteratorBase::init(), no XComponentContext" ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ExtensionIteratorBase::init(), no XComponentContext" )),
             Reference< XInterface >() );
     }
 
     Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager(), UNO_QUERY );
     m_xSFA = Reference< ucb::XSimpleFileAccess >(
-        xSMgr->createInstanceWithContext( rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ),
+        xSMgr->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" )),
         m_xContext ), UNO_QUERY_THROW );
 
     m_bUserPackagesLoaded = false;
@@ -1587,7 +1594,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextUserHelpPack
     if( !m_bUserPackagesLoaded )
     {
         Reference< XPackageManager > xUserManager =
-            thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString::createFromAscii("user") );
+            thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")) );
         m_aUserPackagesSeq = xUserManager->getDeployedPackages
             ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
         m_bUserPackagesLoaded = true;
@@ -1616,7 +1623,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextSharedHelpPa
     if( !m_bSharedPackagesLoaded )
     {
         Reference< XPackageManager > xSharedManager =
-            thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString::createFromAscii("shared") );
+            thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("shared")) );
         m_aSharedPackagesSeq = xSharedManager->getDeployedPackages
             ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
         m_bSharedPackagesLoaded = true;
@@ -1645,7 +1652,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextBundledHelpP
     if( !m_bBundledPackagesLoaded )
     {
         Reference< XPackageManager > xBundledManager =
-            thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString::createFromAscii("bundled") );
+            thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bundled")) );
         m_aBundledPackagesSeq = xBundledManager->getDeployedPackages
             ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
         m_bBundledPackagesLoaded = true;
@@ -1880,7 +1887,7 @@ rtl::OUString KeyDataBaseFileIterator::nextDbFile( bool& o_rbExtension )
                 aRetFile =
                     m_rDatabases.getInstallPathAsSystemPath() +
                     m_rDatabases.processLang( m_aLanguage ) + aSlash + m_aInitialModule +
-                    rtl::OUString::createFromAscii( ".key" );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".key" ));
 
                 o_rbExtension = false;
 
@@ -1940,7 +1947,7 @@ rtl::OUString KeyDataBaseFileIterator::implGetDbFileFromPackage
     ( Reference< deployment::XPackage > xPackage )
 {
     rtl::OUString aExpandedURL =
-        implGetFileFromPackage( rtl::OUString::createFromAscii( ".key" ), xPackage );
+        implGetFileFromPackage( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".key" )), xPackage );
 
     rtl::OUString aRetFile;
     osl::FileBase::getSystemPathFromFileURL( aExpandedURL, aRetFile );
@@ -2016,7 +2023,7 @@ Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage
     Reference< XHierarchicalNameAccess > xNA;
 
     rtl::OUString zipFile =
-        implGetFileFromPackage( rtl::OUString::createFromAscii( ".jar" ), xPackage );
+        implGetFileFromPackage( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".jar" )), xPackage );
 
     try
     {
@@ -2032,8 +2039,8 @@ Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage
         Reference< XMultiComponentFactory >xSMgr( m_xContext->getServiceManager(), UNO_QUERY );
         Reference< XInterface > xIfc
             = xSMgr->createInstanceWithArgumentsAndContext(
-                rtl::OUString::createFromAscii(
-                    "com.sun.star.packages.comp.ZipPackage" ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.packages.comp.ZipPackage" )),
                 aArguments, m_xContext );
 
         if ( xIfc.is() )
@@ -2086,7 +2093,7 @@ rtl::OUString IndexFolderIterator::nextIndexFolder( bool& o_rbExtension, bool& o
                 aIndexFolder =
                     m_rDatabases.getInstallPathAsURL() +
                     m_rDatabases.processLang( m_aLanguage ) + aSlash + m_aInitialModule +
-                    rtl::OUString::createFromAscii( ".idxl" );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".idxl" ));
 
                 o_rbTemporary = false;
                 o_rbExtension = false;
@@ -2146,7 +2153,7 @@ rtl::OUString IndexFolderIterator::nextIndexFolder( bool& o_rbExtension, bool& o
 rtl::OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemporary, Reference< deployment::XPackage > xPackage )
 {
     rtl::OUString aIndexFolder =
-        implGetFileFromPackage( rtl::OUString::createFromAscii( ".idxl" ), xPackage );
+        implGetFileFromPackage( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".idxl" )), xPackage );
 
     o_rbTemporary = false;
     if( !m_xSFA->isFolder( aIndexFolder ) )
@@ -2159,7 +2166,7 @@ rtl::OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemp
             bool bIsWriteAccess = false;
             try
             {
-                rtl::OUString aCreateTestFolder = aLangURL + rtl::OUString::createFromAscii( "CreateTestFolder" );
+                rtl::OUString aCreateTestFolder = aLangURL + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CreateTestFolder" ));
                 m_xSFA->createFolder( aCreateTestFolder );
                 if( m_xSFA->isFolder( aCreateTestFolder  ) )
                     bIsWriteAccess = true;
@@ -2177,25 +2184,25 @@ rtl::OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemp
             try
             {
                 xInvocation = Reference< script::XInvocation >(
-                    m_xContext->getServiceManager()->createInstanceWithContext( rtl::OUString::createFromAscii(
-                    "com.sun.star.help.HelpIndexer" ), m_xContext ) , UNO_QUERY );
+                    m_xContext->getServiceManager()->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.help.HelpIndexer" )), m_xContext ) , UNO_QUERY );
 
                 if( xInvocation.is() )
                 {
                     Sequence<uno::Any> aParamsSeq( bIsWriteAccess ? 6 : 8 );
 
-                    aParamsSeq[0] = uno::makeAny( rtl::OUString::createFromAscii( "-lang" ) );
+                    aParamsSeq[0] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-lang" )) );
 
                     rtl::OUString aLang;
                     sal_Int32 nLastSlash = aLangURL.lastIndexOf( '/' );
                     if( nLastSlash != -1 )
                         aLang = aLangURL.copy( nLastSlash + 1 );
                     else
-                        aLang = rtl::OUString::createFromAscii( "en" );
+                        aLang = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "en" ));
                     aParamsSeq[1] = uno::makeAny( aLang );
 
-                    aParamsSeq[2] = uno::makeAny( rtl::OUString::createFromAscii( "-mod" ) );
-                    aParamsSeq[3] = uno::makeAny( rtl::OUString::createFromAscii( "help" ) );
+                    aParamsSeq[2] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-mod" )) );
+                    aParamsSeq[3] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "help" )) );
 
                     rtl::OUString aZipDir = aLangURL;
                     if( !bIsWriteAccess )
@@ -2218,14 +2225,14 @@ rtl::OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemp
                         }
                     }
 
-                    aParamsSeq[4] = uno::makeAny( rtl::OUString::createFromAscii( "-zipdir" ) );
+                    aParamsSeq[4] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-zipdir" )) );
                     rtl::OUString aSystemPath;
                     osl::FileBase::getSystemPathFromFileURL( aZipDir, aSystemPath );
                     aParamsSeq[5] = uno::makeAny( aSystemPath );
 
                     if( !bIsWriteAccess )
                     {
-                        aParamsSeq[6] = uno::makeAny( rtl::OUString::createFromAscii( "-srcdir" ) );
+                        aParamsSeq[6] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-srcdir" )) );
                         rtl::OUString aSrcDirVal;
                         osl::FileBase::getSystemPathFromFileURL( aLangURL, aSrcDirVal );
                         aParamsSeq[7] = uno::makeAny( aSrcDirVal );
@@ -2233,13 +2240,13 @@ rtl::OUString IndexFolderIterator::implGetIndexFolderFromPackage( bool& o_rbTemp
 
                     Sequence< sal_Int16 > aOutParamIndex;
                     Sequence< uno::Any > aOutParam;
-                    uno::Any aRet = xInvocation->invoke( rtl::OUString::createFromAscii( "createIndex" ),
+                    uno::Any aRet = xInvocation->invoke( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "createIndex" )),
                         aParamsSeq, aOutParamIndex, aOutParam );
 
                     if( bIsWriteAccess )
-                        aIndexFolder = implGetFileFromPackage( rtl::OUString::createFromAscii( ".idxl" ), xPackage );
+                        aIndexFolder = implGetFileFromPackage( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ".idxl" )), xPackage );
                     else
-                        aIndexFolder = aZipDir + rtl::OUString::createFromAscii( "/help.idxl" );
+                        aIndexFolder = aZipDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/help.idxl" ));
                 }
             }
             catch (Exception &)
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx
index 1c487b9eb517..98c3c387ad6d 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -99,12 +99,12 @@ namespace chelp {
 
         ~StaticModuleInformation() { }
 
-        rtl::OUString get_title()     { return m_aTitle; }
-        rtl::OUString get_id()        { return m_aStartId; }
-        rtl::OUString get_program()   { return m_aProgramSwitch; }
-        rtl::OUString get_heading()   { return m_aHeading; }
-        rtl::OUString get_fulltext()  { return m_aFulltext; }
-        int get_order() { return m_nOrder; }
+        rtl::OUString get_title() const { return m_aTitle; }
+        rtl::OUString get_id() const { return m_aStartId; }
+        rtl::OUString get_program() const { return m_aProgramSwitch; }
+        rtl::OUString get_heading() const { return m_aHeading; }
+        rtl::OUString get_fulltext() const { return m_aFulltext; }
+        int get_order() const { return m_nOrder; }
     };  // end class StaticModuleInformation
 
 
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index 0aa3d26005b7..713e2596ac58 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -69,7 +69,7 @@ ContentProvider::ContentProvider(
     const uno::Reference< lang::XMultiServiceFactory >& rSMgr )
     : ::ucbhelper::ContentProviderImplHelper( rSMgr ),
         isInitialized( false ),
-        m_aScheme( rtl::OUString::createFromAscii( MYUCP_URL_SCHEME ) ),
+        m_aScheme(RTL_CONSTASCII_USTRINGPARAM(MYUCP_URL_SCHEME)),
         m_pDatabases( 0 )
 {
 }
@@ -122,7 +122,7 @@ rtl::OUString SAL_CALL ContentProvider::getImplementationName()
 
 rtl::OUString ContentProvider::getImplementationName_Static()
 {
-    return rtl::OUString::createFromAscii("CHelpContentProvider" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CHelpContentProvider" ));
 }
 
 sal_Bool SAL_CALL
@@ -162,11 +162,11 @@ ContentProvider::getSupportedServiceNames_Static()
 {
     uno::Sequence< rtl::OUString > aSNS( 2 );
     aSNS.getArray()[ 0 ] =
-        rtl::OUString::createFromAscii(
-            MYUCP_CONTENT_PROVIDER_SERVICE_NAME1 );
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            MYUCP_CONTENT_PROVIDER_SERVICE_NAME1 ));
     aSNS.getArray()[ 1 ] =
-        rtl::OUString::createFromAscii(
-            MYUCP_CONTENT_PROVIDER_SERVICE_NAME2 );
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            MYUCP_CONTENT_PROVIDER_SERVICE_NAME2 ));
 
     return aSNS;
 }
@@ -277,7 +277,7 @@ void ContentProvider::init()
     rtl::OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) );
     if( ! instPath.getLength() )
         // try to determine path from default
-        instPath = rtl::OUString::createFromAscii( "$(instpath)/help" );
+        instPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "$(instpath)/help" ));
     // replace anything like $(instpath);
     subst( instPath );
 
@@ -290,7 +290,7 @@ void ContentProvider::init()
         if( xAccess.is() )
         {
             uno::Any aAny =
-                xAccess->getByName( rtl::OUString::createFromAscii( "Help" ) );
+                xAccess->getByName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Help" )) );
             aAny >>= m_xContainer;
             if( m_xContainer.is() )
                 m_xContainer->addContainerListener( this );
@@ -317,21 +317,21 @@ void ContentProvider::init()
     try
     {
         uno::Reference< lang::XMultiServiceFactory > xConfigProvider(
-              m_xSMgr ->createInstance(::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")), uno::UNO_QUERY_THROW);
+              m_xSMgr ->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))), uno::UNO_QUERY_THROW);
 
         uno::Sequence < uno::Any > lParams(1);
         beans::PropertyValue                       aParam ;
-        aParam.Name    = ::rtl::OUString::createFromAscii("nodepath");
-        aParam.Value <<= ::rtl::OUString::createFromAscii("/org.openoffice.Setup/Product");
+        aParam.Name    = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath"));
+        aParam.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Product"));
         lParams[0] = uno::makeAny(aParam);
 
         // open it
         uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments(
-                    ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")),
                     lParams) );
 
         uno::Reference< container::XNameAccess > xDirectAccess(xCFG, uno::UNO_QUERY);
-        uno::Any aRet = xDirectAccess->getByName(::rtl::OUString::createFromAscii("ooSetupExtension"));
+        uno::Any aRet = xDirectAccess->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupExtension")));
 
         aRet >>= setupextension;
     }
@@ -341,7 +341,7 @@ void ContentProvider::init()
 
     rtl::OUString productversion(
         setupversion +
-        rtl::OUString::createFromAscii( " " ) +
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " " )) +
         setupextension );
 
     uno::Sequence< rtl::OUString > aImagesZipPaths( 2 );
@@ -384,8 +384,8 @@ ContentProvider::getConfiguration() const
         try
         {
             rtl::OUString sProviderService =
-                rtl::OUString::createFromAscii(
-                    "com.sun.star.configuration.ConfigurationProvider" );
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.configuration.ConfigurationProvider" ));
             sProvider =
                 uno::Reference< lang::XMultiServiceFactory >(
                     m_xSMgr->createInstance( sProviderService ),
@@ -411,8 +411,8 @@ ContentProvider::getHierAccess(
     {
         uno::Sequence< uno::Any > seq( 1 );
         rtl::OUString sReaderService(
-            rtl::OUString::createFromAscii(
-                "com.sun.star.configuration.ConfigurationAccess" ) );
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.configuration.ConfigurationAccess" )) );
 
         seq[ 0 ] <<= rtl::OUString::createFromAscii( file );
 
@@ -489,8 +489,8 @@ void ContentProvider::subst( rtl::OUString& instpath ) const
             xCfgMgr =
                 uno::Reference< frame::XConfigManager >(
                     m_xSMgr->createInstance(
-                        rtl::OUString::createFromAscii(
-                            "com.sun.star.config.SpecialConfigManager" ) ),
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.config.SpecialConfigManager" )) ),
                     uno::UNO_QUERY );
         }
         catch( const uno::Exception&)
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
index 451811a59ff4..04e2f7576230 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
@@ -505,12 +505,12 @@ ResultSetBase::getPropertySetInfo()
     throw( uno::RuntimeException)
 {
     uno::Sequence< beans::Property > seq(2);
-    seq[0].Name = rtl::OUString::createFromAscii( "RowCount" );
+    seq[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowCount" ));
     seq[0].Handle = -1;
     seq[0].Type = getCppuType( static_cast< sal_Int32* >(0) );
     seq[0].Attributes = beans::PropertyAttribute::READONLY;
 
-    seq[1].Name = rtl::OUString::createFromAscii( "IsRowCountFinal" );
+    seq[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IsRowCountFinal" ));
     seq[1].Handle = -1;
     seq[1].Type = getCppuType( static_cast< sal_Bool* >(0) );
     seq[1].Attributes = beans::PropertyAttribute::READONLY;
@@ -531,8 +531,8 @@ void SAL_CALL ResultSetBase::setPropertyValue(
 {
     (void)aValue;
 
-    if( aPropertyName == rtl::OUString::createFromAscii( "IsRowCountFinal" ) ||
-        aPropertyName == rtl::OUString::createFromAscii( "RowCount" ) )
+    if( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IsRowCountFinal" )) ||
+        aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowCount" )) )
         return;
 
     throw beans::UnknownPropertyException();
@@ -545,13 +545,13 @@ uno::Any SAL_CALL ResultSetBase::getPropertyValue(
            lang::WrappedTargetException,
            uno::RuntimeException)
 {
-    if( PropertyName == rtl::OUString::createFromAscii( "IsRowCountFinal" ) )
+    if( PropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IsRowCountFinal" )) )
     {
         uno::Any aAny;
         aAny <<= m_bRowCountFinal;
         return aAny;
     }
-    else if ( PropertyName == rtl::OUString::createFromAscii( "RowCount" ) )
+    else if ( PropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowCount" )) )
     {
         uno::Any aAny;
         sal_Int32 count = m_aItems.size();
@@ -570,7 +570,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener(
            lang::WrappedTargetException,
            uno::RuntimeException)
 {
-    if( aPropertyName == rtl::OUString::createFromAscii( "IsRowCountFinal" ) )
+    if( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IsRowCountFinal" )) )
     {
         osl::MutexGuard aGuard( m_aMutex );
         if ( ! m_pIsFinalListeners )
@@ -579,7 +579,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener(
 
         m_pIsFinalListeners->addInterface( xListener );
     }
-    else if ( aPropertyName == rtl::OUString::createFromAscii( "RowCount" ) )
+    else if ( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowCount" )) )
     {
         osl::MutexGuard aGuard( m_aMutex );
         if ( ! m_pRowCountListeners )
@@ -599,13 +599,13 @@ void SAL_CALL ResultSetBase::removePropertyChangeListener(
            lang::WrappedTargetException,
            uno::RuntimeException)
 {
-    if( aPropertyName == rtl::OUString::createFromAscii( "IsRowCountFinal" ) &&
+    if( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IsRowCountFinal" )) &&
         m_pIsFinalListeners )
     {
         osl::MutexGuard aGuard( m_aMutex );
         m_pIsFinalListeners->removeInterface( aListener );
     }
-    else if ( aPropertyName == rtl::OUString::createFromAscii( "RowCount" ) &&
+    else if ( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowCount" )) &&
               m_pRowCountListeners )
     {
         osl::MutexGuard aGuard( m_aMutex );
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index 1df8105ec198..0da606e5ce06 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -90,7 +90,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
       m_aURLParameter( aURLParameter )
 {
     Reference< XTransliteration > xTrans(
-        xMSF->createInstance( rtl::OUString::createFromAscii( "com.sun.star.i18n.Transliteration" ) ),
+        xMSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.Transliteration" )) ),
         UNO_QUERY );
     Locale aLocale( aURLParameter.get_language(),
                     rtl::OUString(),
@@ -101,7 +101,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
 
     // Access Lucene via XInvocation
     Reference< script::XInvocation > xInvocation(
-        xMSF->createInstance( rtl::OUString::createFromAscii( "com.sun.star.help.HelpSearch" ) ),
+        xMSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.help.HelpSearch" )) ),
         UNO_QUERY );
 
     vector< vector< rtl::OUString > > queryList;
@@ -182,27 +182,27 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
                     int nParamCount = bCaptionsOnly ? 7 : 6;
                     Sequence<uno::Any> aParamsSeq( nParamCount );
 
-                    aParamsSeq[0] = uno::makeAny( rtl::OUString::createFromAscii( "-lang" ) );
+                    aParamsSeq[0] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-lang" )) );
                     aParamsSeq[1] = uno::makeAny( m_aURLParameter.get_language() );
 
-                    aParamsSeq[2] = uno::makeAny( rtl::OUString::createFromAscii( "-index" ) );
+                    aParamsSeq[2] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-index" )) );
                     rtl::OUString aSystemPath;
                     osl::FileBase::getSystemPathFromFileURL( idxDir, aSystemPath );
                     aParamsSeq[3] = uno::makeAny( aSystemPath );
 
-                    aParamsSeq[4] = uno::makeAny( rtl::OUString::createFromAscii( "-query" ) );
+                    aParamsSeq[4] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-query" )) );
 
                     const std::vector< rtl::OUString >& aListItem = queryList[i];
                     ::rtl::OUString aNewQueryStr = aListItem[0];
                     aParamsSeq[5] = uno::makeAny( aNewQueryStr );
 
                     if( bCaptionsOnly )
-                        aParamsSeq[6] = uno::makeAny( rtl::OUString::createFromAscii( "-caption" ) );
+                        aParamsSeq[6] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-caption" )) );
 
                     Sequence< sal_Int16 > aOutParamIndex;
                     Sequence< uno::Any > aOutParam;
 
-                    uno::Any aRet = xInvocation->invoke( rtl::OUString::createFromAscii( "search" ),
+                    uno::Any aRet = xInvocation->invoke( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "search" )),
                         aParamsSeq, aOutParamIndex, aOutParam );
 
                     Sequence< float > aScoreSeq;
@@ -412,8 +412,8 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
 #endif
     }
 
-    sal_Int32 replIdx = rtl::OUString::createFromAscii( "#HLP#" ).getLength();
-    rtl::OUString replWith = rtl::OUString::createFromAscii( "vnd.sun.star.help://" );
+    sal_Int32 replIdx = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "#HLP#" )).getLength();
+    rtl::OUString replWith = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" ));
 
     int nResultCount = aCompleteResultVector.size();
     for( int r = 0 ; r < nResultCount ; ++r )
@@ -427,16 +427,16 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
     m_aIdents.resize( m_aPath.size() );
 
     Command aCommand;
-    aCommand.Name = rtl::OUString::createFromAscii( "getPropertyValues" );
+    aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ));
     aCommand.Argument <<= m_sProperty;
 
     for( m_nRow = 0; sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aPath.size(); ++m_nRow )
     {
         m_aPath[m_nRow] =
             m_aPath[m_nRow]                                          +
-            rtl::OUString::createFromAscii( "?Language=" )           +
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "?Language=" ))           +
             m_aURLParameter.get_language()                           +
-            rtl::OUString::createFromAscii( "&System=" )             +
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "&System=" ))             +
             m_aURLParameter.get_system();
 
         uno::Reference< XContent > content = queryContent();
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
index 0a827cf8284b..3f899b0b62db 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
@@ -57,17 +57,17 @@ ResultSetForRoot::ResultSetForRoot( const uno::Reference< lang::XMultiServiceFac
     m_aIdents.resize( m_aPath.size() );
 
     Command aCommand;
-    aCommand.Name = rtl::OUString::createFromAscii( "getPropertyValues" );
+    aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ));
     aCommand.Argument <<= m_sProperty;
 
     for( sal_uInt32 i = 0; i < m_aPath.size(); ++i )
     {
         m_aPath[i] =
-            rtl::OUString::createFromAscii( "vnd.sun.star.help://" ) +
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" )) +
             m_aPath[i]                                               +
-            rtl::OUString::createFromAscii( "?Language=" )           +
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "?Language=" ))           +
             m_aURLParameter.get_language()                           +
-            rtl::OUString::createFromAscii( "&System=" )             +
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "&System=" ))             +
             m_aURLParameter.get_system();
 
         m_nRow = sal_Int32( i );
diff --git a/xmlhelp/source/cxxhelp/provider/services.cxx b/xmlhelp/source/cxxhelp/provider/services.cxx
index dbc6d24589c7..782eb343a523 100644
--- a/xmlhelp/source/cxxhelp/provider/services.cxx
+++ b/xmlhelp/source/cxxhelp/provider/services.cxx
@@ -42,9 +42,9 @@ static sal_Bool writeInfo(
     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
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 0208f4353e93..1c56d5fcb9ba 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -185,7 +185,7 @@ rtl::OUString URLParameter::get_title()
             m_aTitle = inf->get_title();
     }
     else   // This must be the root
-        m_aTitle = rtl::OUString::createFromAscii("root");
+        m_aTitle = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("root"));
 
     return m_aTitle;
 }
@@ -280,7 +280,7 @@ rtl::OUString URLParameter::get_the_jar()
         return m_aJar;
     }
     else
-        return get_module() + rtl::OUString::createFromAscii(".jar");
+        return get_module() + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".jar"));
 }
 
 
@@ -288,7 +288,7 @@ rtl::OUString URLParameter::get_the_jar()
 
 void URLParameter::readBerkeley()
 {
-    static rtl::OUString aQuestionMark( rtl::OUString::createFromAscii( "?" ) );
+    static rtl::OUString aQuestionMark(RTL_CONSTASCII_USTRINGPARAM("?"));
 
     if( get_id().compareToAscii("") == 0 )
         return;
@@ -450,7 +450,7 @@ void URLParameter::open( const Reference< XMultiServiceFactory >& rxSMgr,
     {
         Reference< XInputStream > xStream;
         Reference< XHierarchicalNameAccess > xNA =
-            m_pDatabases->jarFile( rtl::OUString::createFromAscii( "picture.jar" ),
+            m_pDatabases->jarFile( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "picture.jar" )),
                                    get_language() );
 
         rtl::OUString path = get_path();
@@ -520,7 +520,7 @@ void URLParameter::open( const Reference< XMultiServiceFactory >& rxSMgr,
     {
         Reference< XInputStream > xStream;
         Reference< XHierarchicalNameAccess > xNA =
-            m_pDatabases->jarFile( rtl::OUString::createFromAscii( "picture.jar" ),
+            m_pDatabases->jarFile( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "picture.jar" )),
                                    get_language() );
 
         rtl::OUString path = get_path();
@@ -578,7 +578,7 @@ bool URLParameter::scheme()
         if( aLastStr.compareToAscii( "DbPAR=" ) == 0 )
         {
             rtl::OUString aNewExpr = m_aExpr.copy( 0, 20 );
-            rtl::OUString aSharedStr = rtl::OUString::createFromAscii( "shared" );
+            rtl::OUString aSharedStr(RTL_CONSTASCII_USTRINGPARAM("shared"));
             aNewExpr += aSharedStr;
             aNewExpr += m_aExpr.copy( 20 );
             aNewExpr += aSharedStr;
@@ -695,7 +695,7 @@ bool URLParameter::query()
             if( ! m_aQuery.getLength() )
                 m_aQuery = value;
             else
-                m_aQuery += ( rtl::OUString::createFromAscii( " " ) + value );
+                m_aQuery += ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " " )) + value );
         }
         else if( parameter.compareToAscii( "Scope" ) == 0 )
             m_aScope = value;
@@ -1035,7 +1035,7 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
             if( !xContext.is() )
             {
                 throw RuntimeException(
-                    ::rtl::OUString::createFromAscii( "InputStreamTransformer::InputStreamTransformer(), no XComponentContext" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "InputStreamTransformer::InputStreamTransformer(), no XComponentContext" )),
                     Reference< XInterface >() );
             }
 
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
index 656abacb232d..eea149af5e77 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
@@ -126,16 +126,16 @@ namespace chelp {
                       Databases* pDatabases )
             throw( com::sun::star::ucb::IllegalIdentifierException );
 
-        bool isPicture()        { return m_aModule.compareToAscii("picture") == 0; }
-        bool isActive()         { return m_aActive.getLength() > 0 && m_aActive.compareToAscii( "true" ) == 0; }
-        bool isQuery()          { return m_aId.compareToAscii("") == 0 && m_aQuery.compareToAscii("") != 0; }
-        bool isEntryForModule() { return m_aId.compareToAscii("start") == 0 || m_bStart; }
-        bool isFile()           { return m_aId.compareToAscii( "" ) != 0; }
-        bool isModule()         { return m_aId.compareToAscii("") == 0 && m_aModule.compareToAscii("") != 0; }
-        bool isRoot()           { return m_aModule.compareToAscii("") == 0; }
+        bool isPicture() const { return m_aModule.compareToAscii("picture") == 0; }
+        bool isActive() const { return m_aActive.getLength() > 0 && m_aActive.compareToAscii( "true" ) == 0; }
+        bool isQuery() const { return m_aId.compareToAscii("") == 0 && m_aQuery.compareToAscii("") != 0; }
+        bool isEntryForModule() const { return m_aId.compareToAscii("start") == 0 || m_bStart; }
+        bool isFile() const { return m_aId.compareToAscii( "" ) != 0; }
+        bool isModule() const { return m_aId.compareToAscii("") == 0 && m_aModule.compareToAscii("") != 0; }
+        bool isRoot() const { return m_aModule.compareToAscii("") == 0; }
         bool isErrorDocument();
 
-        rtl::OUString get_url() { return m_aURL; }
+        rtl::OUString get_url() const { return m_aURL; }
 
         rtl::OUString get_id();
 
@@ -145,36 +145,39 @@ namespace chelp {
 
         rtl::OUString get_path()   { return get_the_path(); }
 
-        rtl::OUString get_eid()    { return m_aEid; }
+        rtl::OUString get_eid() const   { return m_aEid; }
 
         rtl::OUString get_title();
 
         rtl::OUString get_jar()      { return get_the_jar(); }      // BerkeleyDb
 
-        rtl::OUString get_ExtensionRegistryPath()    { return m_aExtensionRegistryPath; }
+        rtl::OUString get_ExtensionRegistryPath() const { return m_aExtensionRegistryPath; }
 
-        rtl::OUString get_module()   { return m_aModule; }
+        rtl::OUString get_module() const { return m_aModule; }
 
-        rtl::OUString get_dbpar()    {
-            if( m_aDbPar.getLength() ) return m_aDbPar;
-            else return m_aModule;
+        rtl::OUString get_dbpar() const
+        {
+            if( m_aDbPar.getLength() )
+                return m_aDbPar;
+            else
+                return m_aModule;
         }
 
-        rtl::OUString get_prefix()   { return m_aPrefix; }
+        rtl::OUString get_prefix() const { return m_aPrefix; }
 
         rtl::OUString get_language();
 
-        rtl::OUString get_device()   { return m_aDevice; }
+        rtl::OUString get_device() const { return m_aDevice; }
 
         rtl::OUString get_program();
 
-        rtl::OUString get_query()    { return m_aQuery; }
+        rtl::OUString get_query() const { return m_aQuery; }
 
-        rtl::OUString get_scope()    { return m_aScope; }
+        rtl::OUString get_scope() const { return m_aScope; }
 
-        rtl::OUString get_system()   { return m_aSystem; }
+        rtl::OUString get_system() const { return m_aSystem; }
 
-        sal_Int32     get_hitCount() { return m_nHitCount; }
+        sal_Int32     get_hitCount() const { return m_nHitCount; }
 
         rtl::OString getByName( const char* par );
 
diff --git a/xmlhelp/source/cxxhelp/test/searchdemo.cxx b/xmlhelp/source/cxxhelp/test/searchdemo.cxx
index 6bf827e849a2..201567356213 100644
--- a/xmlhelp/source/cxxhelp/test/searchdemo.cxx
+++ b/xmlhelp/source/cxxhelp/test/searchdemo.cxx
@@ -78,21 +78,21 @@ int main( int argc,char* argv[] )
 
     try
     {
-        rtl::OUString installDir = rtl::OUString::createFromAscii( "//./e|/index/" );
+        rtl::OUString installDir(RTL_CONSTASCII_USTRINGPARAM("//./e|/index/"));
         QueryProcessor queryProcessor( installDir );
 
         std::vector<rtl::OUString> Query(2);
-        Query[0] = rtl::OUString::createFromAscii( "text*" );
-        Query[1] = rtl::OUString::createFromAscii( "abbildung" );
-        rtl::OUString Scope = rtl::OUString::createFromAscii( "headingheading" );
+        Query[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "text*" ));
+        Query[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "abbildung" ));
+        rtl::OUString Scope = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "headingheading" ));
         int HitCount = 40;
 
          QueryStatement queryStatement( HitCount,Query,Scope );
         queryResults = queryProcessor.processQuery( queryStatement );
 
         rtl::OUString translations[2];
-        translations[0] = rtl::OUString::createFromAscii( "#HLP#" );
-        translations[1] = rtl::OUString::createFromAscii( "vnd.sun.star.help://" );
+        translations[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "#HLP#" ));
+        translations[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" ));
 
         PrefixTranslator* translator =  PrefixTranslator::makePrefixTranslator( translations,2 );
 
diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx
index 21214059a8be..b4361e50d8ef 100644
--- a/xmlhelp/source/treeview/tvfactory.cxx
+++ b/xmlhelp/source/treeview/tvfactory.cxx
@@ -147,7 +147,7 @@ TVFactory::createInstance(
     aAny <<= rtl::OUString();
     Sequence< Any > seq( 1 );
     seq[0] <<= PropertyValue(
-        rtl::OUString::createFromAscii( "nodepath" ),
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "nodepath" )),
         -1,
         aAny,
         PropertyState_DIRECT_VALUE );
@@ -208,7 +208,7 @@ TVFactory::getAvailableServiceNames( )
     throw( RuntimeException )
 {
     Sequence< rtl::OUString > seq( 1 );
-    seq[0] = rtl::OUString::createFromAscii( "com.sun.star.ucb.HierarchyDataReadAccess" );
+    seq[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.HierarchyDataReadAccess" ));
     return seq;
 }
 
@@ -220,7 +220,7 @@ TVFactory::getAvailableServiceNames( )
 rtl::OUString SAL_CALL
 TVFactory::getImplementationName_static()
 {
-    return rtl::OUString::createFromAscii( "com.sun.star.help.TreeViewImpl" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.help.TreeViewImpl" ));
 }
 
 
@@ -228,8 +228,8 @@ Sequence< rtl::OUString > SAL_CALL
 TVFactory::getSupportedServiceNames_static()
 {
     Sequence< rtl::OUString > seq( 2 );
-    seq[0] = rtl::OUString::createFromAscii( "com.sun.star.help.TreeView" );
-    seq[1] = rtl::OUString::createFromAscii( "com.sun.star.ucb.HiearchyDataSource" );
+    seq[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.help.TreeView" ));
+    seq[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.HiearchyDataSource" ));
     return seq;
 }
 
@@ -263,9 +263,9 @@ static sal_Bool writeInfo( void * pRegistryKey,
                            const rtl::OUString & rImplementationName,
                               Sequence< rtl::OUString > const & rServiceNames )
 {
-    rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) );
+    rtl::OUString aKeyName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )) );
     aKeyName += rImplementationName;
-    aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" );
+    aKeyName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
 
     Reference< registry::XRegistryKey > xKey;
     try
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index 06c3609aa8fb..8c9851fb33bd 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -185,11 +185,11 @@ using namespace com::sun::star::deployment;
 
 
 ConfigData::ConfigData()
-    : prodName( rtl::OUString::createFromAscii( "%PRODUCTNAME" ) ),
-      prodVersion( rtl::OUString::createFromAscii( "%PRODUCTVERSION" ) ),
-      vendName( rtl::OUString::createFromAscii( "%VENDORNAME" ) ),
-      vendVersion( rtl::OUString::createFromAscii( "%VENDORVERSION" ) ),
-      vendShort( rtl::OUString::createFromAscii( "%VENDORSHORT" ) )
+    : prodName(RTL_CONSTASCII_USTRINGPARAM("%PRODUCTNAME")),
+      prodVersion(RTL_CONSTASCII_USTRINGPARAM("%PRODUCTVERSION")),
+      vendName(RTL_CONSTASCII_USTRINGPARAM("%VENDORNAME")),
+      vendVersion(RTL_CONSTASCII_USTRINGPARAM("%VENDORVERSION")),
+      vendShort(RTL_CONSTASCII_USTRINGPARAM("%VENDORSHORT"))
 {
 }
 
@@ -308,7 +308,7 @@ TVRead::TVRead( const ConfigData& configData,TVDom* tvDom )
     {
         TargetURL = ( tvDom->getTargetURL() + configData.appendix );
         if( tvDom->anchor.getLength() )
-            TargetURL += ( rtl::OUString::createFromAscii( "#" ) +
+            TargetURL += ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "#" )) +
                            tvDom->anchor );
     }
     else
@@ -363,9 +363,9 @@ TVRead::getElementNames( )
 {
     Sequence< rtl::OUString > seq( 3 );
 
-    seq[0] = rtl::OUString::createFromAscii( "Title" );
-    seq[1] = rtl::OUString::createFromAscii( "TargetURL" );
-    seq[2] = rtl::OUString::createFromAscii( "Children" );
+    seq[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Title" ));
+    seq[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "TargetURL" ));
+    seq[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Children" ));
 
     return seq;
 }
@@ -667,7 +667,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
     rtl::OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) );
     if( ! instPath.getLength() )
       // try to determine path from default
-      instPath = rtl::OUString::createFromAscii( "$(instpath)/help" );
+      instPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "$(instpath)/help" ));
 
     // replace anything like $(instpath);
     subst( xSMgr,instPath );
@@ -686,21 +686,21 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
     try
     {
         uno::Reference< lang::XMultiServiceFactory > xConfigProvider(
-              xSMgr ->createInstance(::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")), uno::UNO_QUERY_THROW);
+              xSMgr ->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))), uno::UNO_QUERY_THROW);
 
         uno::Sequence < uno::Any > lParams(1);
         beans::PropertyValue                       aParam ;
-        aParam.Name    = ::rtl::OUString::createFromAscii("nodepath");
-        aParam.Value <<= ::rtl::OUString::createFromAscii("/org.openoffice.Setup/Product");
+        aParam.Name    = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath"));
+        aParam.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Product"));
         lParams[0] = uno::makeAny(aParam);
 
         // open it
         uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments(
-                    ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")),
                     lParams) );
 
         uno::Reference< container::XNameAccess > xDirectAccess(xCFG, uno::UNO_QUERY);
-        uno::Any aRet = xDirectAccess->getByName(::rtl::OUString::createFromAscii("ooSetupExtension"));
+        uno::Any aRet = xDirectAccess->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupExtension")));
 
         aRet >>= setupextension;
     }
@@ -709,7 +709,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
     }
 
     rtl::OUString productVersion( setupversion +
-                                  rtl::OUString::createFromAscii( " " ) +
+                                  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " " )) +
                                   setupextension );
     rtl::OUString locale( getKey( xHierAccess,"L10N/ooLocale" ) );
 
@@ -719,7 +719,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
     osl::FileBase::RC errFile = osl::FileBase::getFileURLFromSystemPath( instPath,url );
     if( errFile != osl::FileBase::E_None ) return configData;
     if( url.lastIndexOf( sal_Unicode( '/' ) ) != url.getLength() - 1 )
-        url += rtl::OUString::createFromAscii( "/" );
+        url += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" ));
     rtl::OUString ret;
     sal_Int32 idx;
     osl::DirectoryItem aDirItem;
@@ -732,8 +732,8 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
         ret = locale.copy( 0,idx );
     else
         {
-        locale = rtl::OUString::createFromAscii( "en-US" );
-        ret = rtl::OUString::createFromAscii("en");
+        locale = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "en-US" ));
+        ret = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
         }
     url = url + ret;
 
@@ -780,9 +780,15 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
                 rtl::OUString baseName = aFileName.copy(0,idx_).toAsciiLowerCase();
                 if(! showBasic && baseName.compareToAscii("sbasic") == 0 )
                   continue;
-
-                configData.vFileLen.push_back( aFileStatus.getFileSize() );
-                configData.vFileURL.push_back( aFileUrl );
+                osl::File aFile( aFileUrl );
+                if( osl::FileBase::E_None == aFile.open( OpenFlag_Read ) )
+                {
+                    sal_uInt64 nSize;
+                    aFile.getSize( nSize );
+                    configData.vFileLen.push_back( aFileStatus.getFileSize() );
+                    configData.vFileURL.push_back( aFileUrl );
+                    aFile.close();
+                }
               }
           }
         aDirectory.close();
@@ -800,11 +806,11 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
        configData.system = system;
     configData.locale = locale;
     configData.appendix =
-        rtl::OUString::createFromAscii( "?Language=" ) +
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "?Language=" )) +
         configData.locale +
-        rtl::OUString::createFromAscii( "&System=" ) +
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "&System=" )) +
         configData.system +
-        rtl::OUString::createFromAscii( "&UseDB=no" ) ;
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "&UseDB=no" )) ;
 
     return configData;
 }
@@ -826,7 +832,7 @@ TVChildTarget::getConfiguration(const Reference< XMultiServiceFactory >& m_xSMgr
         try
         {
             rtl::OUString sProviderService =
-                rtl::OUString::createFromAscii( "com.sun.star.configuration.ConfigurationProvider" );
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ));
             sProvider =
                 Reference< XMultiServiceFactory >(
                     m_xSMgr->createInstance( sProviderService ),
@@ -853,7 +859,7 @@ TVChildTarget::getHierAccess( const Reference< XMultiServiceFactory >& sProvider
     {
         Sequence< Any > seq(1);
         rtl::OUString sReaderService =
-            rtl::OUString::createFromAscii( "com.sun.star.configuration.ConfigurationAccess" );
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" ));
 
         seq[0] <<= rtl::OUString::createFromAscii( file );
 
@@ -930,7 +936,7 @@ void TVChildTarget::subst( const Reference< XMultiServiceFactory >& m_xSMgr,
         {
             xCfgMgr =
                 Reference< XConfigManager >(
-                    m_xSMgr->createInstance( rtl::OUString::createFromAscii( "com.sun.star.config.SpecialConfigManager" ) ),
+                    m_xSMgr->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.config.SpecialConfigManager" )) ),
                     UNO_QUERY );
         }
         catch( const com::sun::star::uno::Exception& )
@@ -949,9 +955,9 @@ void TVChildTarget::subst( const Reference< XMultiServiceFactory >& m_xSMgr,
 //===================================================================
 // class ExtensionIteratorBase
 
-static rtl::OUString aSlash( rtl::OUString::createFromAscii( "/" ) );
-static rtl::OUString aHelpFilesBaseName( rtl::OUString::createFromAscii( "help" ) );
-static rtl::OUString aHelpMediaType( rtl::OUString::createFromAscii( "application/vnd.sun.star.help" ) );
+static rtl::OUString aSlash(RTL_CONSTASCII_USTRINGPARAM("/"));
+static rtl::OUString aHelpFilesBaseName(RTL_CONSTASCII_USTRINGPARAM("help"));
+static rtl::OUString aHelpMediaType(RTL_CONSTASCII_USTRINGPARAM( "application/vnd.sun.star.help"));
 
 ExtensionIteratorBase::ExtensionIteratorBase( const rtl::OUString& aLanguage )
         : m_eState( USER_EXTENSIONS )
@@ -974,13 +980,13 @@ void ExtensionIteratorBase::init()
     if( !m_xContext.is() )
     {
         throw RuntimeException(
-            ::rtl::OUString::createFromAscii( "ExtensionIteratorBase::init(), no XComponentContext" ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ExtensionIteratorBase::init(), no XComponentContext" )),
             Reference< XInterface >() );
     }
 
     Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager(), UNO_QUERY );
     m_xSFA = Reference< ucb::XSimpleFileAccess >(
-        xSMgr->createInstanceWithContext( rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ),
+        xSMgr->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" )),
         m_xContext ), UNO_QUERY_THROW );
 
     m_bUserPackagesLoaded = false;
@@ -1051,7 +1057,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextUserHelpPack
     if( !m_bUserPackagesLoaded )
     {
         Reference< XPackageManager > xUserManager =
-            thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString::createFromAscii("user") );
+            thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")) );
         m_aUserPackagesSeq = xUserManager->getDeployedPackages
             ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
 
@@ -1081,7 +1087,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextSharedHelpPa
     if( !m_bSharedPackagesLoaded )
     {
         Reference< XPackageManager > xSharedManager =
-            thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString::createFromAscii("shared") );
+            thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("shared")) );
         m_aSharedPackagesSeq = xSharedManager->getDeployedPackages
             ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
 
@@ -1111,7 +1117,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextBundledHelpP
     if( !m_bBundledPackagesLoaded )
     {
         Reference< XPackageManager > xBundledManager =
-            thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString::createFromAscii("bundled") );
+            thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bundled")) );
         m_aBundledPackagesSeq = xBundledManager->getDeployedPackages
             ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
 
@@ -1236,18 +1242,18 @@ rtl::OUString TreeFileIterator::expandURL( const rtl::OUString& aURL )
         Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager(), UNO_QUERY );
 
         xFac = Reference< uri::XUriReferenceFactory >(
-            xSMgr->createInstanceWithContext( rtl::OUString::createFromAscii(
-            "com.sun.star.uri.UriReferenceFactory"), m_xContext ) , UNO_QUERY );
+            xSMgr->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.uri.UriReferenceFactory")), m_xContext ) , UNO_QUERY );
         if( !xFac.is() )
         {
             throw RuntimeException(
-                ::rtl::OUString::createFromAscii( "Databases::expand(), could not instatiate UriReferenceFactory." ),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Databases::expand(), could not instatiate UriReferenceFactory." )),
                 Reference< XInterface >() );
         }
 
         xMacroExpander = Reference< util::XMacroExpander >(
             m_xContext->getValueByName(
-            ::rtl::OUString::createFromAscii( "/singletons/com.sun.star.util.theMacroExpander" ) ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theMacroExpander" )) ),
             UNO_QUERY_THROW );
      }
 
diff --git a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
index b368aa77264d..66c512bd4251 100644
--- a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
+++ b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
@@ -102,10 +102,10 @@ public:
     const SvXMLTokenMap& GetFtnConfigAttrTokenMap();
 
     /// set configuration at document; calls ProcessSettings
-    // --> OD 2005-01-31 #i40579# - move code from <CreateAndInsertLate(..)>
-    // to <Finish(..)>, because at this time all styles it references have been set.
+    /* Move code from <CreateAndInsertLate(..)> to <Finish(..)>, because
+       at this time all styles it references have been set. (#i40579#)
+    */
     virtual void Finish( sal_Bool bOverwrite);
-    // <--
 
     /// set configuration at document
     void ProcessSettings(
diff --git a/xmloff/inc/numehelp.hxx b/xmloff/inc/numehelp.hxx
index 09faa5a01b07..f6eeeed55877 100644
--- a/xmloff/inc/numehelp.hxx
+++ b/xmloff/inc/numehelp.hxx
@@ -35,9 +35,7 @@
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 
-#ifndef __SGI_STL_SET
 #include <set>
-#endif
 
 class SvXMLExport;
 namespace rtl
diff --git a/xmloff/inc/txtlists.hxx b/xmloff/inc/txtlists.hxx
index 67305ad76272..b8735e8b7856 100644
--- a/xmloff/inc/txtlists.hxx
+++ b/xmloff/inc/txtlists.hxx
@@ -66,13 +66,11 @@ class XMLTextListsHelper : private boost::noncopyable
 
 
         // keeping track of processed lists for import and export
-        // --> OD 2008-08-15 #i92811#
-        // - add optional parameter <sListStyleDefaultListId>
+        // Add optional parameter <sListStyleDefaultListId> (#i92811#)
         void KeepListAsProcessed( ::rtl::OUString sListId,
                                   ::rtl::OUString sListStyleName,
                                   ::rtl::OUString sContinueListId,
                                   ::rtl::OUString sListStyleDefaultListId = ::rtl::OUString() );
-        // <--
 
         sal_Bool IsListProcessed( const ::rtl::OUString sListId ) const;
         ::rtl::OUString GetListStyleOfProcessedList(
@@ -84,11 +82,8 @@ class XMLTextListsHelper : private boost::noncopyable
 
         ::rtl::OUString GenerateNewListId() const;
 
-        // --> OD 2008-08-15 #i92811#
-        // provide list id for a certain list block for import
+        // Provide list id for a certain list block for import (#i92811#)
         ::rtl::OUString GetListIdForListBlock( XMLTextListBlockContext& rListBlock );
-        // <--
-
 
         // keep track of continue list chain for export
         void StoreLastContinuingList( ::rtl::OUString sListId,
@@ -158,12 +153,11 @@ class XMLTextListsHelper : private boost::noncopyable
         ::rtl::OUString msLastProcessedListId;
         ::rtl::OUString msListStyleOfLastProcessedList;
 
-        // --> OD 2008-08-15 #i92811#
-        // additional container for processed lists.
-        // map with <ListStyleName> as key and pair( <ListId, ListStyleDefaultListId> )
-        // as value.
+        /* additional container for processed lists.
+           map with <ListStyleName> as key and pair( <ListId, ListStyleDefaultListId> )
+           as value. (#i92811#)
+        */
         tMapForLists* mpMapListIdToListStyleDefaultListId;
-        // <--
 
         // container type to build up continue list chain:
         // map with <ListId> of master list as key and <ListId> of last list
diff --git a/xmloff/inc/xmloff/XMLFontStylesContext.hxx b/xmloff/inc/xmloff/XMLFontStylesContext.hxx
index fe89cbed2321..9813ab708302 100644
--- a/xmloff/inc/xmloff/XMLFontStylesContext.hxx
+++ b/xmloff/inc/xmloff/XMLFontStylesContext.hxx
@@ -31,9 +31,7 @@
 #include "sal/config.h"
 #include "xmloff/dllapi.h"
 
-#ifndef __SGI_STL_VECTOR
 #include <vector>
-#endif
 
 #include <xmloff/xmlstyle.hxx>
 
diff --git a/xmloff/inc/xmloff/XMLPageExport.hxx b/xmloff/inc/xmloff/XMLPageExport.hxx
index b6773575dc9d..9b9bd2781e75 100644
--- a/xmloff/inc/xmloff/XMLPageExport.hxx
+++ b/xmloff/inc/xmloff/XMLPageExport.hxx
@@ -33,9 +33,7 @@
 #include "xmloff/dllapi.h"
 #include "sal/types.h"
 #include <rtl/ustring.hxx>
-#ifndef __SGI_STL_VECTOR
 #include <vector>
-#endif
 #include <xmloff/attrlist.hxx>
 #include <xmloff/uniref.hxx>
 #include <com/sun/star/container/XIndexAccess.hpp>
diff --git a/xmloff/inc/xmloff/nmspmap.hxx b/xmloff/inc/xmloff/nmspmap.hxx
index 80230d3064a6..27967549b40e 100644
--- a/xmloff/inc/xmloff/nmspmap.hxx
+++ b/xmloff/inc/xmloff/nmspmap.hxx
@@ -34,9 +34,7 @@
 #include "sal/types.h"
 #include <rtl/ustring.hxx>
 #include <hash_map>
-#ifndef __SGI_STL_MAP
 #include <map>
-#endif
 #include <rtl/ref.hxx>
 #include <cppuhelper/weak.hxx>
 
diff --git a/xmloff/inc/xmloff/prhdlfac.hxx b/xmloff/inc/xmloff/prhdlfac.hxx
index ef235a0ab7e5..c13d43654dea 100644
--- a/xmloff/inc/xmloff/prhdlfac.hxx
+++ b/xmloff/inc/xmloff/prhdlfac.hxx
@@ -33,9 +33,7 @@
 #include "xmloff/dllapi.h"
 #include "sal/types.h"
 
-#ifndef __SGI_STL_MAP
 #include <map>
-#endif
 #include <xmloff/uniref.hxx>
 #include <xmloff/xmlprhdl.hxx>
 
diff --git a/xmloff/inc/xmloff/prstylei.hxx b/xmloff/inc/xmloff/prstylei.hxx
index 81ff772e1b7a..d777206da2a2 100644
--- a/xmloff/inc/xmloff/prstylei.hxx
+++ b/xmloff/inc/xmloff/prstylei.hxx
@@ -32,9 +32,7 @@
 #include "xmloff/dllapi.h"
 #include "sal/types.h"
 #include <com/sun/star/style/XStyle.hpp>
-#ifndef __SGI_STL_VECTOR
 #include <vector>
-#endif
 #include <xmloff/xmlstyle.hxx>
 
 struct XMLPropertyState;
diff --git a/xmloff/inc/xmloff/styleexp.hxx b/xmloff/inc/xmloff/styleexp.hxx
index efbebdeedb6e..3931c76146ef 100644
--- a/xmloff/inc/xmloff/styleexp.hxx
+++ b/xmloff/inc/xmloff/styleexp.hxx
@@ -45,10 +45,10 @@ namespace com { namespace sun { namespace star
     {
         class XPropertySet;
     }
-    namespace container     //#outline level,add by zhaojianwei
+    namespace container
     {
         class XNameAccess;
-    }                       //<-end,zhaojianwei
+    }
 
 } } }
 
@@ -65,7 +65,7 @@ protected:
     const ::rtl::OUString sIsAutoUpdate;
     const ::rtl::OUString sFollowStyle;
     const ::rtl::OUString sNumberingStyleName;
-    const ::rtl::OUString sOutlineLevel;    //#outline level,add by zhaojianwei
+    const ::rtl::OUString sOutlineLevel;
 
     SvXMLExport& GetExport() { return rExport; }
     const SvXMLExport& GetExport() const  { return rExport; }
@@ -78,19 +78,13 @@ private:
 
 protected:
 
-    //virtual sal_Bool exportStyle(             //#outline level,zhaojianwei
-    //  const ::com::sun::star::uno::Reference<
-    //          ::com::sun::star::style::XStyle > & rStyle,
-    //  const ::rtl::OUString& rXMLFamily,
-    //  const UniReference < SvXMLExportPropertyMapper >& rPropMapper,
-    //  const ::rtl::OUString* pPrefix = 0L );
-    virtual sal_Bool exportStyle(               //add by zhaojianwei
+    virtual sal_Bool exportStyle(
         const ::com::sun::star::uno::Reference<
         ::com::sun::star::style::XStyle > & rStyle,
         const ::rtl::OUString& rXMLFamily,
         const UniReference < SvXMLExportPropertyMapper >& rPropMapper,
         const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xStyles,
-        const ::rtl::OUString* pPrefix = 0L );  //<-end,zhaojianwei
+        const ::rtl::OUString* pPrefix = 0L );
 
     virtual void exportStyleAttributes(
         const ::com::sun::star::uno::Reference<
diff --git a/xmloff/inc/xmloff/txtimp.hxx b/xmloff/inc/xmloff/txtimp.hxx
index 39ec9dacc7d2..4f1332da1e50 100644
--- a/xmloff/inc/xmloff/txtimp.hxx
+++ b/xmloff/inc/xmloff/txtimp.hxx
@@ -46,11 +46,7 @@
 #include <comphelper/stl_types.hxx>
 #include <xmloff/uniref.hxx>
 
-
-// --> OD 2008-04-25 #refactorlists#
 class XMLTextListsHelper;
-// <--
-
 class SvXMLImportContext;
 class SvXMLTokenMap;
 class SvXMLImportPropertyMapper;
@@ -290,10 +286,8 @@ enum XMLTextListBlockAttrTokens
     XML_TOK_TEXT_LIST_BLOCK_XMLID,
     XML_TOK_TEXT_LIST_BLOCK_STYLE_NAME,
     XML_TOK_TEXT_LIST_BLOCK_CONTINUE_NUMBERING,
-    // --> OD 2008-04-22 #refactorlists#
     XML_TOK_TEXT_LIST_BLOCK_ID,
     XML_TOK_TEXT_LIST_BLOCK_CONTINUE_LIST,
-    // <--
     XML_TOK_TEXT_LIST_BLOCK_END=XML_TOK_UNKNOWN
 };
 
@@ -482,9 +476,8 @@ public:
     void InsertTextContent( ::com::sun::star::uno::Reference <
                             ::com::sun::star::text::XTextContent > & xContent);
 
-    // --> OD 2007-07-25 #i73509# - add parameter <bOutlineLevelAttrFound>
-    // --> OD 2007-08-17 #i80724#
-    // add parameter <bSetListAttrs> in order to suppress the handling of the list attributes
+    // Add parameter <bOutlineLevelAttrFound> (#i73509#)
+    // Add parameter <bSetListAttrs> in order to suppress the handling of the list attributes (#i80724#)
     ::rtl::OUString SetStyleAndAttrs(
             SvXMLImport& rImport,
             const ::com::sun::star::uno::Reference <
@@ -494,22 +487,19 @@ public:
             sal_Bool bOutlineLevelAttrFound = sal_False,
             sal_Int8 nOutlineLevel = -1,
             sal_Bool bSetListAttrs = sal_True );
-    // <--
 
     /** Find a suitable name for the given outline level.
      *  If rStyleName is empty, change it to a previously used or default style
      *  name for that level. Otherwise, leave rStyleName unmodified.
      */
-    // --> OD 2006-10-12 #i69629# - adjust 2nd parameter
+    // Adjust 2nd parameter (#i69629#)
     void FindOutlineStyleName( ::rtl::OUString& rStyleName,
                                sal_Int8 nOutlineLevel );
-    // <--
 
-    // --> OD 2006-10-12 #i69629#
-    // change method name to reflect change of data structure
+    // Change method name to reflect change of data structure (#i69629#)
     void AddOutlineStyleCandidate( const sal_Int8 nOutlineLevel,
                                    const ::rtl::OUString& rStyleName );
-    // <--
+
     void SetOutlineStyles( sal_Bool bSetEmpty );
 
     void SetHyperlink(
@@ -742,9 +732,7 @@ public:
 
     SvXMLImport & GetXMLImport();
 
-    // --> OD 2008-04-25 #refactorlists#
     XMLTextListsHelper & GetTextListHelper();
-    // <--
 
     // forwards to TextListHelper; these are used in many places
     /// push a list context on the list context stack
diff --git a/xmloff/inc/xmloff/txtparae.hxx b/xmloff/inc/xmloff/txtparae.hxx
index b5faab453578..5f8cdaee0e7e 100644
--- a/xmloff/inc/xmloff/txtparae.hxx
+++ b/xmloff/inc/xmloff/txtparae.hxx
@@ -40,12 +40,9 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/SinglePropertySetInfoCache.hxx>
 #include <xmloff/XMLStringVector.hxx>
-
-// --> OD 2008-04-25 #refactorlists#
-class XMLTextListsHelper;
 #include <vector>
-// <--
 
+class XMLTextListsHelper;
 class SvXMLExport;
 class SvXMLAutoStylePoolP;
 class XMLTextFieldExport;
@@ -92,9 +89,6 @@ class XMLOFF_DLLPUBLIC XMLTextParagraphExport : public XMLStyleExport
     const ::std::auto_ptr< ::xmloff::BoundFrameSets > pBoundFrameSets;
     XMLTextFieldExport          *pFieldExport;
     OUStrings_Impl              *pListElements;
-    // --> OD 2008-05-07 #refactorlists# - no longer needed
-//    OUStringsSort_Impl          *pExportedLists;
-    // <--
     XMLTextListAutoStylePool    *pListAutoPool;
     XMLSectionExport            *pSectionExport;
     XMLIndexMarkExport          *pIndexMarkExport;
@@ -112,21 +106,17 @@ class XMLOFF_DLLPUBLIC XMLTextParagraphExport : public XMLStyleExport
     ::rtl::OUString             sOpenRubyCharStyle;
     sal_Bool                    bOpenRuby;
 
-    // --> OD 2008-05-07 #refactorlists#
     XMLTextListsHelper* mpTextListsHelper;
     ::std::vector< XMLTextListsHelper* > maTextListsHelperStack;
-    // <--
 
     enum FrameType { FT_TEXT, FT_GRAPHIC, FT_EMBEDDED, FT_SHAPE };
 
 protected:
 
     const ::rtl::OUString sActualSize;
-    // --> OD 2009-07-22 #i73249#
-//    const ::rtl::OUString sAlternativeText;
+    // Implement Title/Description Elements UI (#i73249#)
     const ::rtl::OUString sTitle;
     const ::rtl::OUString sDescription;
-    // <--
     const ::rtl::OUString sAnchorCharStyleName;
     const ::rtl::OUString sAnchorPageNo;
     const ::rtl::OUString sAnchorType;
@@ -614,12 +604,10 @@ public:
     virtual void exportTextAutoStyles();
 
     void exportEvents( const ::com::sun::star::uno::Reference < com::sun::star::beans::XPropertySet > & rPropSet );
-    // --> OD 2009-07-22 #i73249#
-//    void exportAlternativeText( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & rPropSet,
-//                                const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo );
+
+    // Implement Title/Description Elements UI (#i73249#)
     void exportTitleAndDescription( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & rPropSet,
                                     const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo );
-    // <--
 
     // This method exports the given XText
     void exportText(
@@ -685,11 +673,11 @@ public:
 
     sal_Int32 GetHeadingLevel( const ::rtl::OUString& rStyleName );
 
-    // --> OD 2008-05-08 #refactorlists#
     void PushNewTextListsHelper();
+
     void PopTextListsHelper();
-    // <--
-    private:
+
+private:
         XMLTextParagraphExport(XMLTextParagraphExport &); // private copy-ctor because of explicit copy-ctor of auto_ptr
 };
 
diff --git a/xmloff/inc/xmloff/txtprmap.hxx b/xmloff/inc/xmloff/txtprmap.hxx
index f969c18a5334..88c7d0aa63df 100644
--- a/xmloff/inc/xmloff/txtprmap.hxx
+++ b/xmloff/inc/xmloff/txtprmap.hxx
@@ -158,9 +158,10 @@
 #define CTF_FRAMEWIDTH_REL                  (XML_TEXT_CTF_START + 126)
 #define CTF_FRAMEWIDTH_TYPE                 (XML_TEXT_CTF_START + 127)
 #define CTF_BORDER_MODEL                    (XML_TEXT_CTF_START + 128)
-// --> OD 2004-08-09 #i28749# - define CTF ids for positioning properties of
-// shapes, because on export to OpenOffice.org file format these have to
-// be handled special, if shape isn't anchored as-character.
+/* Define CTF ids for positioning properties of
+   shapes, because on export to OpenOffice.org file format these have to
+   be handled special, if shape isn't anchored as-character. (#i28749#)
+*/
 #define CTF_SHAPE_HORIZONTALPOS             (XML_TEXT_CTF_START + 129)
 #define CTF_SHAPE_HORIZONTALPOS_MIRRORED    (XML_TEXT_CTF_START + 130)
 #define CTF_SHAPE_HORIZONTALREL             (XML_TEXT_CTF_START + 131)
diff --git a/xmloff/inc/xmloff/txtstyli.hxx b/xmloff/inc/xmloff/txtstyli.hxx
index 6cc8debf28e4..79eb6cfb3cd5 100644
--- a/xmloff/inc/xmloff/txtstyli.hxx
+++ b/xmloff/inc/xmloff/txtstyli.hxx
@@ -45,7 +45,7 @@ class XMLOFF_DLLPUBLIC XMLTextStyleContext : public XMLPropStyleContext
     const ::rtl::OUString       sIsAutoUpdate;
     const ::rtl::OUString       sCategory;
     const ::rtl::OUString       sNumberingStyleName;
-    const ::rtl::OUString       sOutlineLevel; //#outline level,add by zhaojianwei
+    const ::rtl::OUString       sOutlineLevel;
 
 public:
     const ::rtl::OUString       sDropCapCharStyleName;
@@ -59,10 +59,8 @@ private:
 
     sal_Bool bHasCombinedCharactersLetter : 1;
 
-    // --> OD 2006-09-21 #i69523#
-    // introduce import of empty list style
+    // Introduce import of empty list style (#i69523#)
     sal_Bool mbListStyleSet : 1;
-    // <--
 
     XMLEventsImportContext* pEventContext;
 
@@ -92,12 +90,12 @@ public:
     sal_Bool IsAutoUpdate() const { return bAutoUpdate; }
 
     const ::rtl::OUString& GetListStyle() const { return sListStyleName; }
-    // --> OD 2006-10-13 #i69629#
+    // XML import: reconstrution of assignment of paragraph style to outline levels (#i69629#)
     sal_Bool IsListStyleSet() const
     {
         return mbListStyleSet;
     }
-    // <--
+
     const ::rtl::OUString& GetMasterPageName() const { return sMasterPageName; }
     sal_Bool HasMasterPageName() const { return bHasMasterPageName; }
     const ::rtl::OUString& GetDropCapStyleName() const { return sDropCapTextStyleName; }
diff --git a/xmloff/inc/xmloff/xmlexp.hxx b/xmloff/inc/xmloff/xmlexp.hxx
index 130fe3078df4..b91a1fbefa0d 100644
--- a/xmloff/inc/xmloff/xmlexp.hxx
+++ b/xmloff/inc/xmloff/xmlexp.hxx
@@ -80,9 +80,8 @@ class XMLSettingsExportHelper;
 class XMLImageMapExport;
 class XMLErrors;
 
-// --> OD 2006-03-14 #i51726#
+// Shapes in Writer cannot be named via context menu (#i51726#)
 #include <unotools/moduleoptions.hxx>
-// <--
 
 namespace rtl { class OUString; }
 namespace com { namespace sun { namespace star {
@@ -170,10 +169,9 @@ public:
 
 private:
 
-    // --> OD 2006-03-10 #i51726#
+    // Shapes in Writer cannot be named via context menu (#i51726#)
     SvtModuleOptions::EFactory meModelType;
     SAL_DLLPRIVATE void _DetermineModelType();
-    // <--
 
     SAL_DLLPRIVATE void ImplExportMeta(); // <office:meta>
     SAL_DLLPRIVATE void ImplExportSettings(); // <office:settings>
@@ -567,16 +565,14 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
     GetComponentContext() const;
 
-    // --> OD 2006-03-10 #i51726#
+    // Shapes in Writer cannot be named via context menu (#i51726#)
     SvtModuleOptions::EFactory GetModelType() const
     {
         return meModelType;
     }
-    // <--
 
-    // --> OD 2006-09-27 #i69627#
+    // Written OpenDocument file format doesn't fit to the created text document (#i69627#)
     sal_Bool writeOutlineStyleAsNormalListStyle() const;
-    // <--
        bool isExperimentalOdfExportEnabled() const { return mbEnableExperimentalOdfExport; }
 
     ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetTargetStorage();
@@ -601,9 +597,7 @@ public:
     void AddAttributesRDFa( ::com::sun::star::uno::Reference<
         ::com::sun::star::text::XTextContent> const & i_xTextContent);
 
-    // --> OD 2008-11-26 #158694#
     sal_Bool exportTextNumberElement() const;
-    // <--
 
     /// set null date from model to unit converter, if not already done
     sal_Bool SetNullDateOnUnitConverter();
diff --git a/xmloff/inc/xmloff/xmlimp.hxx b/xmloff/inc/xmloff/xmlimp.hxx
index 1b59e7b161ba..7a83f09c744e 100644
--- a/xmloff/inc/xmloff/xmlimp.hxx
+++ b/xmloff/inc/xmloff/xmlimp.hxx
@@ -409,13 +409,10 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
     GetComponentContext() const;
 
-    // --> OD 2004-08-10 #i28749#
+    // Convert drawing object positions from OOo file format to OASIS file format and vice versa (#i28749#)
     sal_Bool IsShapePositionInHoriL2R() const;
-    // <--
 
-    // --> OD 2007-12-19 #152540#
     sal_Bool IsTextDocInOOoFileFormat() const;
-    // <--
 
     String GetBaseURL() const;
     String GetDocumentBase() const;
diff --git a/xmloff/inc/xmloff/xmlimppr.hxx b/xmloff/inc/xmloff/xmlimppr.hxx
index 83ad425d0f03..eb1e245a044a 100644
--- a/xmloff/inc/xmloff/xmlimppr.hxx
+++ b/xmloff/inc/xmloff/xmlimppr.hxx
@@ -38,9 +38,7 @@
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XTolerantMultiPropertySet.hpp>
 
-#ifndef __SGI_STL_VECTOR
 #include <vector>
-#endif
 #include <xmloff/uniref.hxx>
 
 struct XMLPropertyState;
diff --git a/xmloff/inc/xmloff/xmlnume.hxx b/xmloff/inc/xmloff/xmlnume.hxx
index ae540bf5ebdb..473bec6d5dec 100644
--- a/xmloff/inc/xmloff/xmlnume.hxx
+++ b/xmloff/inc/xmloff/xmlnume.hxx
@@ -55,13 +55,11 @@ class SvxXMLNumRuleExport
     const ::rtl::OUString sNumberingRules;
     const ::rtl::OUString sIsPhysical;
     const ::rtl::OUString sIsContinuousNumbering;
-    // --> OD 2008-06-06 #i89178#
     // Boolean indicating, if properties for position-and-space-mode LABEL_ALIGNEMNT
-    // are exported or not.
+    // are exported or not. (#i89178#)
     // These properties have been introduced in ODF 1.2. Thus, its export have
     // to be suppressed on writing ODF 1.0 respectively ODF 1.1
     bool mbExportPositionAndSpaceModeLabelAlignment;
-    // <--
 
     void exportLevelStyles(
             const ::com::sun::star::uno::Reference<
@@ -101,12 +99,6 @@ public:
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::container::XIndexReplace > & xNumRule );
 
-    // --> OD 2008-06-17 #i90780#
-    // refactoring: removing unused methods
-//    void Export( const ::rtl::OUString& rOutline, sal_Bool bContNumbering );
-//    void ExportOutline();
-    // <--
-
     static sal_Bool GetOutlineStyles( XMLStringVector& rStyleNames,
                const ::com::sun::star::uno::Reference<
                             ::com::sun::star::frame::XModel > & rModel );
diff --git a/xmloff/inc/xmloff/xmlnumfi.hxx b/xmloff/inc/xmloff/xmlnumfi.hxx
index aba24ceffd22..a43aeec94b60 100644
--- a/xmloff/inc/xmloff/xmlnumfi.hxx
+++ b/xmloff/inc/xmloff/xmlnumfi.hxx
@@ -37,9 +37,7 @@
 #include <xmloff/xmlstyle.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <i18npool/lang.h>
-#ifndef __SGI_STL_VECTOR
 #include <vector>
-#endif
 #include <unotools/localedatawrapper.hxx>
 
 #define XML_NUMBERSTYLES "NumberStyles"
@@ -117,13 +115,6 @@ public:
 class SvXMLNumFmtDefaults
 {
 public:
-    static sal_Bool IsSystemLongDay( const SvtSysLocale& rSysLoc, BOOL bLong );
-    static sal_Bool IsSystemLongMonth( const SvtSysLocale& rSysLoc, BOOL bLong );
-    static sal_Bool IsSystemTextualMonth( const SvtSysLocale& rSysLoc, BOOL bLong );
-    static sal_Bool IsSystemLongYear( const SvtSysLocale& rSysLoc, BOOL bLong );
-    static sal_Bool IsSystemLongEra( const SvtSysLocale& rSysLoc, BOOL bLong );
-    static sal_Bool IsSystemLongDayOfWeek( const SvtSysLocale& rSysLoc, BOOL bLong );
-
     // return value is NfIndexTableOffset
     static sal_uInt16 GetDefaultDateFormat( SvXMLDateElementAttributes eDOW,
                 SvXMLDateElementAttributes eDay, SvXMLDateElementAttributes eMonth,
diff --git a/xmloff/inc/xmloff/xmlprmap.hxx b/xmloff/inc/xmloff/xmlprmap.hxx
index f62575510510..41b997af86c0 100644
--- a/xmloff/inc/xmloff/xmlprmap.hxx
+++ b/xmloff/inc/xmloff/xmlprmap.hxx
@@ -35,9 +35,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
-#ifndef __SGI_STL_VECTOR
 #include <vector>
-#endif
 #include <xmloff/uniref.hxx>
 #include <xmloff/maptype.hxx>
 #include <xmloff/xmltypes.hxx>
diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx
index 8427f2319851..4f84f6e54703 100644
--- a/xmloff/inc/xmloff/xmltoken.hxx
+++ b/xmloff/inc/xmloff/xmltoken.hxx
@@ -929,14 +929,12 @@ namespace xmloff { namespace token {
         XML_HINT,
         XML_HORIZONTAL,
         XML_HORIZONTAL_LINES,
-        // --> OD 2005-05-12 #i49139#
         // XML_HORIZONTAL_ON_LEFT_PAGES and XML_HORIZONTAL_ON_RIGHT_PAGES
         // are replaced by XML_HORIZONTAL_ON_EVEN and XML_HORIZONTAL_ON_ODD.
         // Usage is deprecated, but the old token are needed for the
-        // OpenOffice.org file format import/export filter for the renaming
+        // OpenOffice.org file format import/export filter for the renaming (#i49139#)
         XML_HORIZONTAL_ON_LEFT_PAGES,
         XML_HORIZONTAL_ON_RIGHT_PAGES,
-        // <--
         XML_HORIZONTAL_POS,
         XML_HORIZONTAL_REL,
         XML_HORIZONTAL_SCROLLBAR_WIDTH,
@@ -2372,13 +2370,13 @@ namespace xmloff { namespace token {
         XML_REPEAT_CONTENT,
         XML_SHRINK_TO_FIT,
 
-        // OD 2004-05-05 #i28701#
+        /* Core impl. of the positioning of floating screen objects without
+           considering its wrapping style (#i28701#)
+         */
         XML_WRAP_INFLUENCE_ON_POSITION,
-        // --> OD 2004-10-18 #i35017# - tokens have been renamed and
-        // <XML_ITERATIVE> has been added
+        // Tokens have been renamed and <XML_ITERATIVE> has been added (#i35017#)
         XML_ONCE_SUCCESSIVE,
         XML_ONCE_CONCURRENT,
-        // <--
 
         // Names for OOo format only
         XML_N_OFFICE_OOO,
@@ -2895,11 +2893,9 @@ namespace xmloff { namespace token {
         XML_URI_W3_PREFIX,
         XML_URI_XFORMS_SUFFIX,
 
-        // --> OD 2005-05-12 #i49139#
         // XML_HORIZONTAL_ON_LEFT_PAGES and XML_HORIZONTAL_ON_RIGHT_PAGES
-        // are replaced by XML_HORIZONTAL_ON_EVEN and XML_HORIZONTAL_ON_ODD.
+        // are replaced by XML_HORIZONTAL_ON_EVEN and XML_HORIZONTAL_ON_ODD. (#i49139#)
         XML_HORIZONTAL_ON_EVEN,
-        // --> OJ 2005-09-01
         XML_N_RPT_OASIS,
         XML_N_RPT,
         XML_GROUP,
@@ -2975,15 +2971,11 @@ namespace xmloff { namespace token {
         XML_ODD_ROWS,
         XML_EVEN_COLUMNS,
         XML_ODD_COLUMNS,
-        // <--
         XML_HORIZONTAL_ON_ODD,
-        // <--
-        // --> OD 2005-10-10 #i45874#
+        // Password error from 1.4 to 2.0 Beta (#i45874#)
         XML_RESTART_NUMBERING,
-        // <--
-        // --> FLR #i52127#
+        // OpenDocument <text:numbered-paragraph> element not supported on OpenDocument import (#i52127#)
         XML_NUMBERED_PARAGRAPH,
-        // <--
         XML_MASTER_DETAIL_FIELDS,
         XML_MASTER_DETAIL_FIELD,
         XML_SUB_DOCUMENT,
@@ -3041,11 +3033,9 @@ namespace xmloff { namespace token {
         XML_TABLE_INCLUDE_FILTER,
         XML_DEFAULT_ROW_STYLE_NAME,
         XML_ANGLE_OFFSET,
-        // --> OD 2007-09-14 #i81002#
+        // Core implementation for direct cross-references (#i81002#)
         XML_NUMBER_NO_SUPERIOR,
         XML_NUMBER_ALL_SUPERIOR,
-        // <--
-        // --> OD 2008-01-15 #newlistlevelattrs#
         XML_LIST_LEVEL_POSITION_AND_SPACE_MODE,
         XML_LABEL_WIDTH_AND_POSITION,
         XML_LABEL_ALIGNMENT,
@@ -3055,16 +3045,13 @@ namespace xmloff { namespace token {
         XML_SPACE,
         XML_NOTHING,
         XML_LIST_TAB_STOP_POSITION,
-        // <--
         XML_STANDARD_ERROR,
         XML_CELL_RANGE,
         XML_ERROR_LOWER_RANGE,
         XML_ERROR_UPPER_RANGE,
 
-        // --> OD 2008-04-22 #refactorlists#
         XML_CONTINUE_LIST,
         XML_STYLE_OVERRIDE,
-        // <--
 
         // fs: #i90243#
         XML_XFORM_MODEL_SETTINGS,
diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx
index d9aaec4eb306..a9488fcdc2aa 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -226,24 +226,24 @@ void XMLChartExportPropertyMapper::ContextFilter(
             // if Auto... is set the corresponding properties mustn't be exported
             case XML_SCH_CONTEXT_MIN:
                 bCheckAuto = sal_True;
-                aAutoPropName = ::rtl::OUString::createFromAscii( "AutoMin" );
+                aAutoPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoMin" ));
                 break;
             case XML_SCH_CONTEXT_MAX:
                 bCheckAuto = sal_True;
-                aAutoPropName = ::rtl::OUString::createFromAscii( "AutoMax" );
+                aAutoPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoMax" ));
                 break;
             case XML_SCH_CONTEXT_STEP_MAIN:
                 bCheckAuto = sal_True;
-                aAutoPropName = ::rtl::OUString::createFromAscii( "AutoStepMain" );
+                aAutoPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoStepMain" ));
                 break;
             case XML_SCH_CONTEXT_STEP_HELP_COUNT:
                 bCheckAuto = sal_True;
-                aAutoPropName = ::rtl::OUString::createFromAscii( "AutoStepHelp" );
+                aAutoPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoStepHelp" ));
                 break;
 
             case XML_SCH_CONTEXT_ORIGIN:
                 bCheckAuto = sal_True;
-                aAutoPropName = ::rtl::OUString::createFromAscii( "AutoOrigin" );
+                aAutoPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoOrigin" ));
                 break;
 
             // the following property is deprecated
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index b2c53075b9b9..d71d71ee6df3 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -132,7 +132,7 @@ void lcl_setRoleAtLabeledSequence(
     {
         uno::Reference< beans::XPropertySet > xProp( xValues, uno::UNO_QUERY );
         if( xProp.is())
-            xProp->setPropertyValue(OUString::createFromAscii("Role"), uno::makeAny( rRole ));
+            xProp->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "Role" )), uno::makeAny( rRole ));
     }
 }
 
@@ -423,9 +423,9 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut
         {
             try
             {
-                xDocProp->getPropertyValue( ::rtl::OUString::createFromAscii("BaseDiagram")) >>= aOldChartTypeName;
+                xDocProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "BaseDiagram" ))) >>= aOldChartTypeName;
                 maChartTypeServiceName =  SchXMLTools::GetNewChartTypeName( aOldChartTypeName );
-                xDocProp->setPropertyValue( rtl::OUString::createFromAscii( "RefreshAddInAllowed" ) , uno::makeAny( sal_False) );
+                xDocProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RefreshAddInAllowed" )) , uno::makeAny( sal_False) );
             }
             catch( uno::Exception & )
             {
@@ -703,15 +703,15 @@ void lcl_ApplyDataFromRectangularRangeToDiagram(
 
     uno::Sequence< beans::PropertyValue > aArgs( 3 );
     aArgs[0] = beans::PropertyValue(
-        ::rtl::OUString::createFromAscii("CellRangeRepresentation"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CellRangeRepresentation" )),
         -1, uno::makeAny( rRectangularRange ),
         beans::PropertyState_DIRECT_VALUE );
     aArgs[1] = beans::PropertyValue(
-        ::rtl::OUString::createFromAscii("DataRowSource"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataRowSource" )),
         -1, uno::makeAny( eDataRowSource ),
         beans::PropertyState_DIRECT_VALUE );
     aArgs[2] = beans::PropertyValue(
-        ::rtl::OUString::createFromAscii("FirstCellAsLabel"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FirstCellAsLabel" )),
         -1, uno::makeAny( bFirstCellAsLabel ),
         beans::PropertyState_DIRECT_VALUE );
 
@@ -719,7 +719,7 @@ void lcl_ApplyDataFromRectangularRangeToDiagram(
     {
         aArgs.realloc( aArgs.getLength() + 1 );
         aArgs[ aArgs.getLength() - 1 ] = beans::PropertyValue(
-            ::rtl::OUString::createFromAscii("SequenceMapping"),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SequenceMapping" )),
             -1, uno::makeAny( sColTrans.getLength()
                 ? lcl_getNumberSequenceFromString( sColTrans, bHasCateories && !xNewDoc->hasInternalDataProvider() )
                 : lcl_getNumberSequenceFromString( sRowTrans, bHasCateories && !xNewDoc->hasInternalDataProvider() ) ),
@@ -745,7 +745,7 @@ void lcl_ApplyDataFromRectangularRangeToDiagram(
         {
             aArgs.realloc( aArgs.getLength() + 1 );
             aArgs[ aArgs.getLength() - 1 ] = beans::PropertyValue(
-                ::rtl::OUString::createFromAscii("ChartOleObjectName"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ChartOleObjectName" )),
                 -1, uno::makeAny( aChartOleObjectName ),
                 beans::PropertyState_DIRECT_VALUE );
         }
@@ -757,7 +757,7 @@ void lcl_ApplyDataFromRectangularRangeToDiagram(
 
     aArgs.realloc( aArgs.getLength() + 1 );
     aArgs[ aArgs.getLength() - 1 ] = beans::PropertyValue(
-        ::rtl::OUString::createFromAscii("HasCategories"),
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasCategories" )),
         -1, uno::makeAny( bHasCateories ),
         beans::PropertyState_DIRECT_VALUE );
 
@@ -861,7 +861,7 @@ void SchXMLChartContext::EndElement()
         xNewDoc->createInternalDataProvider( sal_False /* bCloneExistingData */ );
     }
     if( bHasOwnData )
-        msChartAddress = ::rtl::OUString::createFromAscii("all");
+        msChartAddress = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "all" ));
 
     bool bSwitchRangesFromOuterToInternalIfNecessary = false;
     if( !bHasOwnData && mbAllRangeAddressesAvailable )
@@ -909,7 +909,7 @@ void SchXMLChartContext::EndElement()
                 if(!bHasOwnData)
                 {
                     bHasOwnData = true;
-                    msChartAddress = ::rtl::OUString::createFromAscii("all");
+                    msChartAddress = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "all" ));
                     if( !xNewDoc->hasInternalDataProvider() )
                     {
                         xNewDoc->createInternalDataProvider( sal_False /* bCloneExistingData */ );
@@ -994,7 +994,7 @@ void SchXMLChartContext::EndElement()
     }
 
     if( xProp.is())
-        xProp->setPropertyValue( rtl::OUString::createFromAscii( "RefreshAddInAllowed" ) , uno::makeAny( sal_True) );
+        xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RefreshAddInAllowed" )) , uno::makeAny( sal_True) );
 }
 
 void SchXMLChartContext::MergeSeriesForStockChart()
@@ -1023,7 +1023,7 @@ void SchXMLChartContext::MergeSeriesForStockChart()
                 {
                     xDSContainer.set( aChartTypes[nCTIdx], uno::UNO_QUERY_THROW );
                     uno::Reference< beans::XPropertySet > xCTProp( aChartTypes[nCTIdx], uno::UNO_QUERY_THROW );
-                    xCTProp->getPropertyValue( ::rtl::OUString::createFromAscii("Japanese")) >>= bHasJapaneseCandlestick;
+                    xCTProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Japanese" ))) >>= bHasJapaneseCandlestick;
                     break;
                 }
             }
@@ -1045,27 +1045,27 @@ void SchXMLChartContext::MergeSeriesForStockChart()
                 if( bHasJapaneseCandlestick )
                 {
                     // open values
-                    lcl_setRoleAtFirstSequence( aSeriesSeq[ nSeriesIndex ], OUString::createFromAscii("values-first"));
+                    lcl_setRoleAtFirstSequence( aSeriesSeq[ nSeriesIndex ], OUString(RTL_CONSTASCII_USTRINGPARAM( "values-first" )));
                     aNewSeries[i] = aSeriesSeq[ nSeriesIndex ];
                     // low values
                     lcl_MoveDataToCandleStickSeries(
                         uno::Reference< chart2::data::XDataSource >( aSeriesSeq[ ++nSeriesIndex ], uno::UNO_QUERY_THROW ),
-                        aNewSeries[i], OUString::createFromAscii("values-min"));
+                        aNewSeries[i], OUString(RTL_CONSTASCII_USTRINGPARAM( "values-min" )));
                 }
                 else
                 {
                     // low values
-                    lcl_setRoleAtFirstSequence( aSeriesSeq[ nSeriesIndex ], OUString::createFromAscii("values-min"));
+                    lcl_setRoleAtFirstSequence( aSeriesSeq[ nSeriesIndex ], OUString(RTL_CONSTASCII_USTRINGPARAM( "values-min" )));
                     aNewSeries[i] = aSeriesSeq[ nSeriesIndex ];
                 }
                 // high values
                 lcl_MoveDataToCandleStickSeries(
                     uno::Reference< chart2::data::XDataSource >( aSeriesSeq[ ++nSeriesIndex ], uno::UNO_QUERY_THROW ),
-                    aNewSeries[i], OUString::createFromAscii("values-max"));
+                    aNewSeries[i], OUString(RTL_CONSTASCII_USTRINGPARAM( "values-max" )));
                 // close values
                 lcl_MoveDataToCandleStickSeries(
                     uno::Reference< chart2::data::XDataSource >( aSeriesSeq[ ++nSeriesIndex ], uno::UNO_QUERY_THROW ),
-                    aNewSeries[i], OUString::createFromAscii("values-last"));
+                    aNewSeries[i], OUString(RTL_CONSTASCII_USTRINGPARAM( "values-last" )));
             }
             xDSContainer->setDataSeries( aNewSeries );
         }
@@ -1108,7 +1108,7 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext(
             {
                 if( xProp.is())
                 {
-                    xProp->setPropertyValue( rtl::OUString::createFromAscii( "HasMainTitle" ), aTrueBool );
+                    xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasMainTitle" )), aTrueBool );
                 }
                 uno::Reference< drawing::XShape > xTitleShape( xDoc->getTitle(), uno::UNO_QUERY );
                 pContext = new SchXMLTitleContext( mrImportHelper, GetImport(),
@@ -1121,7 +1121,7 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext(
             {
                 if( xProp.is())
                 {
-                    xProp->setPropertyValue( rtl::OUString::createFromAscii( "HasSubTitle" ), aTrueBool );
+                    xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSubTitle" )), aTrueBool );
                 }
                 uno::Reference< drawing::XShape > xTitleShape( xDoc->getSubTitle(), uno::UNO_QUERY );
                 pContext = new SchXMLTitleContext( mrImportHelper, GetImport(),
@@ -1341,7 +1341,7 @@ void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttribu
         aTrueBool <<= (sal_Bool)(sal_True);
         try
         {
-            xDocProp->setPropertyValue( rtl::OUString::createFromAscii( "HasLegend" ), aTrueBool );
+            xDocProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasLegend" )), aTrueBool );
         }
         catch( beans::UnknownPropertyException )
         {
@@ -1381,7 +1381,7 @@ void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttribu
                             {
                                 uno::Any aAny;
                                 aAny <<= (chart::ChartLegendPosition)(nEnumVal);
-                                xProp->setPropertyValue( rtl::OUString::createFromAscii( "Alignment" ), aAny );
+                                xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Alignment" )), aAny );
                             }
                         }
                         catch( beans::UnknownPropertyException )
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index c9338885f982..2f660ffb05f7 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -282,7 +282,7 @@ Reference< uno::XComponentContext > lcl_getComponentContext()
     {
         Reference< beans::XPropertySet > xFactProp( comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
         if( xFactProp.is())
-            xFactProp->getPropertyValue(OUString::createFromAscii("DefaultContext")) >>= xContext;
+            xFactProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext;
     }
     catch( uno::Exception& )
     {}
@@ -383,7 +383,7 @@ Reference< chart2::data::XDataSource > lcl_createDataSource(
     if( xContext.is() )
         xSink.set(
             xContext->getServiceManager()->createInstanceWithContext(
-                OUString::createFromAscii("com.sun.star.chart2.data.DataSource"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.data.DataSource" )),
                 xContext ), uno::UNO_QUERY_THROW );
     if( xSink.is())
         xSink->setData( aData );
@@ -449,12 +449,12 @@ Reference< chart2::data::XDataSource > lcl_pressUsedDataIntoRectangularFormat( c
 
     //the first x-values is always the next sequence //todo ... other x-values get lost for old format
     Reference< chart2::data::XLabeledDataSequence > xXValues(
-        lcl_getDataSequenceByRole( aSeriesSeqVector, OUString::createFromAscii("values-x" ) ) );
+        lcl_getDataSequenceByRole( aSeriesSeqVector, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-x" )) ) );
     if( xXValues.is() )
         aLabeledSeqVector.push_back( xXValues );
 
     //add all other sequences now without x-values
-    lcl_MatchesRole aHasXValues( OUString::createFromAscii("values-x" ) );
+    lcl_MatchesRole aHasXValues( OUString(RTL_CONSTASCII_USTRINGPARAM( "values-x" )) );
     for( sal_Int32 nN=0; nN<aSeriesSeqVector.getLength(); nN++ )
     {
         if( !aHasXValues( aSeriesSeqVector[nN] ) )
@@ -1064,7 +1064,7 @@ SchXMLExportHelper_Impl::SchXMLExportHelper_Impl(
         msCLSID = OUString( SvGlobalName( SO3_SCH_CLASSID ).GetHexName());
     }
 
-    msTableName = OUString::createFromAscii( "local-table" );
+    msTableName = OUString(RTL_CONSTASCII_USTRINGPARAM( "local-table" ));
 
     // create factory
     mxPropertyHandlerFactory = new XMLChartPropHdlFactory;
@@ -1080,16 +1080,16 @@ SchXMLExportHelper_Impl::SchXMLExportHelper_Impl(
     // register chart auto-style family
     mrAutoStylePool.AddFamily(
         XML_STYLE_FAMILY_SCH_CHART_ID,
-        OUString::createFromAscii( XML_STYLE_FAMILY_SCH_CHART_NAME ),
+        OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_SCH_CHART_NAME )),
         mxExpPropMapper.get(),
-        OUString::createFromAscii( XML_STYLE_FAMILY_SCH_CHART_PREFIX ));
+        OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_SCH_CHART_PREFIX )));
 
     // register shape family
     mrAutoStylePool.AddFamily(
         XML_STYLE_FAMILY_SD_GRAPHICS_ID,
-        OUString::createFromAscii( XML_STYLE_FAMILY_SD_GRAPHICS_NAME ),
+        OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_SD_GRAPHICS_NAME )),
         mxExpPropMapper.get(),
-        OUString::createFromAscii( XML_STYLE_FAMILY_SD_GRAPHICS_PREFIX ));
+        OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_SD_GRAPHICS_PREFIX )));
     // register paragraph family also for shapes
     mrAutoStylePool.AddFamily(
         XML_STYLE_FAMILY_TEXT_PARAGRAPH,
@@ -1515,7 +1515,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >&
             // get a sequence of non-chart shapes (inserted via clipboard)
             try
             {
-                Any aShapesAny = xDocPropSet->getPropertyValue( OUString::createFromAscii( "AdditionalShapes" ));
+                Any aShapesAny = xDocPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "AdditionalShapes" )));
                 aShapesAny >>= mxAdditionalShapes;
             }
             catch( uno::Exception & rEx )
@@ -2117,7 +2117,7 @@ void SchXMLExportHelper_Impl::exportAxes(
         return;
 
     // variables for autostyles
-    const OUString sNumFormat( OUString::createFromAscii( "NumberFormat" ));
+    const OUString sNumFormat( OUString(RTL_CONSTASCII_USTRINGPARAM( "NumberFormat" )));
     Reference< beans::XPropertySet > xPropSet;
     std::vector< XMLPropertyState > aPropertyStates;
 
@@ -2150,31 +2150,31 @@ void SchXMLExportHelper_Impl::exportAxes(
     if (xServiceInfo.is())
     {
         if (xServiceInfo->supportsService(
-            OUString::createFromAscii ("com.sun.star.chart.ChartAxisXSupplier")))
+            OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartAxisXSupplier"))))
         {
             aDiagramProperties.Add (
                 OUString(RTL_CONSTASCII_USTRINGPARAM("HasXAxis")), bHasXAxis);
         }
         if (xServiceInfo->supportsService(
-            OUString::createFromAscii ("com.sun.star.chart.ChartAxisYSupplier")))
+            OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartAxisYSupplier"))))
         {
             aDiagramProperties.Add (
                 OUString(RTL_CONSTASCII_USTRINGPARAM("HasYAxis")), bHasYAxis);
         }
         if (xServiceInfo->supportsService(
-            OUString::createFromAscii ("com.sun.star.chart.ChartAxisZSupplier")))
+            OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartAxisZSupplier"))))
         {
             aDiagramProperties.Add (
                 OUString(RTL_CONSTASCII_USTRINGPARAM("HasZAxis")), bHasZAxis);
         }
         if (xServiceInfo->supportsService(
-            OUString::createFromAscii ("com.sun.star.chart.ChartTwoAxisXSupplier")))
+            OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartTwoAxisXSupplier"))))
         {
             aDiagramProperties.Add (
                 OUString(RTL_CONSTASCII_USTRINGPARAM("HasSecondaryXAxis")), bHasSecondaryXAxis);
         }
         if (xServiceInfo->supportsService(
-            OUString::createFromAscii ("com.sun.star.chart.ChartTwoAxisYSupplier")))
+            OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartTwoAxisYSupplier"))))
         {
             aDiagramProperties.Add (
                 OUString(RTL_CONSTASCII_USTRINGPARAM("HasSecondaryYAxis")), bHasSecondaryYAxis);
@@ -2725,8 +2725,8 @@ void SchXMLExportHelper_Impl::exportSeries(
 
     std::vector< XMLPropertyState > aPropertyStates;
 
-    const OUString sNumFormat( OUString::createFromAscii( "NumberFormat" ));
-    const OUString sPercentageNumFormat( OUString::createFromAscii( "PercentageNumberFormat" ));
+    const OUString sNumFormat(RTL_CONSTASCII_USTRINGPARAM("NumberFormat"));
+    const OUString sPercentageNumFormat(RTL_CONSTASCII_USTRINGPARAM( "PercentageNumberFormat"));
 
     Sequence< Reference< chart2::XCoordinateSystem > >
         aCooSysSeq( xBCooSysCnt->getCoordinateSystems());
@@ -2751,7 +2751,7 @@ void SchXMLExportHelper_Impl::exportSeries(
                 sal_Bool bJapaneseCandleSticks = sal_False;
                 Reference< beans::XPropertySet > xCTProp( aCTSeq[nCTIdx], uno::UNO_QUERY );
                 if( xCTProp.is())
-                    xCTProp->getPropertyValue( OUString::createFromAscii("Japanese")) >>= bJapaneseCandleSticks;
+                    xCTProp->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "Japanese" ))) >>= bJapaneseCandleSticks;
                 exportCandleStickSeries(
                     xDSCnt->getDataSeries(), xNewDiagram, bJapaneseCandleSticks, bExportContent );
                 continue;
@@ -2791,7 +2791,7 @@ void SchXMLExportHelper_Impl::exportSeries(
                             {
                                 Reference< beans::XPropertySet > xSeqProp( xTempValueSeq, uno::UNO_QUERY );
                                 if( xSeqProp.is())
-                                    xSeqProp->getPropertyValue(OUString::createFromAscii("Role")) >>= aRole;
+                                    xSeqProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "Role" ))) >>= aRole;
                                 // "main" sequence
                                 if( aRole.equals( aLabelRole ))
                                 {
@@ -2933,7 +2933,7 @@ void SchXMLExportHelper_Impl::exportSeries(
                             Reference< chart2::data::XDataSequence > xYValuesForBubbleChart;
                             if( bIsBubbleChart )
                             {
-                                Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, OUString::createFromAscii("values-y" ) ) );
+                                Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-y" )) ) );
                                 if( xSequence.is() )
                                 {
                                     xYValuesForBubbleChart = xSequence->getValues();
@@ -2943,7 +2943,7 @@ void SchXMLExportHelper_Impl::exportSeries(
                             }
                             if( bIsScatterChart || bIsBubbleChart )
                             {
-                                Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, OUString::createFromAscii("values-x" ) ) );
+                                Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-x" )) ) );
                                 if( xSequence.is() )
                                 {
                                     Reference< chart2::data::XDataSequence > xValues( xSequence->getValues() );
@@ -3214,7 +3214,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
                 xSource->getDataSequences());
 
             sal_Int32 nSeriesLength =
-                lcl_getSequenceLengthByRole( aSeqCnt, OUString::createFromAscii("values-last"));
+                lcl_getSequenceLengthByRole( aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-last" )));
 
             if( bExportContent )
             {
@@ -3225,7 +3225,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
                 if( bJapaneseCandleSticks )
                 {
                     tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole(
-                        aSeqCnt, OUString::createFromAscii("values-first"),  xNewDoc, m_aDataSequencesToExport ));
+                        aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-first" )),  xNewDoc, m_aDataSequencesToExport ));
                     if( aRanges.second.getLength())
                         mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second );
                     if( aRanges.first.getLength())
@@ -3242,7 +3242,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
                 // low
                 {
                     tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole(
-                        aSeqCnt, OUString::createFromAscii("values-min"),  xNewDoc, m_aDataSequencesToExport ));
+                        aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-min" )),  xNewDoc, m_aDataSequencesToExport ));
                     if( aRanges.second.getLength())
                         mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second );
                     if( aRanges.first.getLength())
@@ -3259,7 +3259,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
                 // high
                 {
                     tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole(
-                        aSeqCnt, OUString::createFromAscii("values-max"),  xNewDoc, m_aDataSequencesToExport ));
+                        aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-max" )),  xNewDoc, m_aDataSequencesToExport ));
                     if( aRanges.second.getLength())
                         mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second );
                     if( aRanges.first.getLength())
@@ -3276,7 +3276,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
                 // close
                 {
                     tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole(
-                        aSeqCnt, OUString::createFromAscii("values-last"),  xNewDoc, m_aDataSequencesToExport ));
+                        aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-last" )),  xNewDoc, m_aDataSequencesToExport ));
                     if( aRanges.second.getLength())
                         mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second );
                     if( aRanges.first.getLength())
@@ -3332,8 +3332,8 @@ void SchXMLExportHelper_Impl::exportDataPoints(
 
         std::vector< XMLPropertyState > aPropertyStates;
 
-        const OUString sNumFormat( OUString::createFromAscii( "NumberFormat" ));
-        const OUString sPercentageNumFormat( OUString::createFromAscii( "PercentageNumberFormat" ));
+        const OUString sNumFormat(RTL_CONSTASCII_USTRINGPARAM("NumberFormat"));
+        const OUString sPercentageNumFormat(RTL_CONSTASCII_USTRINGPARAM( "PercentageNumberFormat"));
 
         bool bVaryColorsByPoint = false;
         Sequence< sal_Int32 > aDataPointSeq;
@@ -3733,7 +3733,7 @@ void SchXMLExport::_ExportContent()
             if( xServ.is())
             {
                 if( xServ->supportsService(
-                        OUString::createFromAscii( "com.sun.star.chart.ChartTableAddressSupplier" )))
+                        OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartTableAddressSupplier" ))))
                 {
                     Reference< beans::XPropertySet > xProp( xServ, uno::UNO_QUERY );
                     if( xProp.is())
@@ -3743,13 +3743,13 @@ void SchXMLExport::_ExportContent()
                         {
                             OUString sChartAddress;
                             aAny = xProp->getPropertyValue(
-                                OUString::createFromAscii( "ChartRangeAddress" ));
+                                OUString(RTL_CONSTASCII_USTRINGPARAM( "ChartRangeAddress" )));
                             aAny >>= sChartAddress;
                             maExportHelper.m_pImpl->SetChartRangeAddress( sChartAddress );
 
                             OUString sTableNumberList;
                             aAny = xProp->getPropertyValue(
-                                OUString::createFromAscii( "TableNumberList" ));
+                                OUString(RTL_CONSTASCII_USTRINGPARAM( "TableNumberList" )));
                             aAny >>= sTableNumberList;
                             maExportHelper.m_pImpl->SetTableNumberList( sTableNumberList );
 
@@ -4033,7 +4033,7 @@ OUString SAL_CALL SchXMLExport::getImplementationName() throw( uno::RuntimeExcep
         case EXPORT_SETTINGS:
         // there is no settings component in chart
         default:
-            return OUString::createFromAscii( "SchXMLExport" );
+            return OUString(RTL_CONSTASCII_USTRINGPARAM( "SchXMLExport" ));
     }
 }
 
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 7255e29c39b6..7fe48082cf8a 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -81,7 +81,7 @@ Reference< uno::XComponentContext > lcl_getComponentContext()
     {
         Reference< beans::XPropertySet > xFactProp( comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
         if( xFactProp.is())
-            xFactProp->getPropertyValue(OUString::createFromAscii("DefaultContext")) >>= xContext;
+            xFactProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext;
     }
     catch( uno::Exception& )
     {}
@@ -621,7 +621,7 @@ Reference< chart2::XDataSeries > SchXMLImportHelper::GetNewDataSeries(
                 {
                     xResult.set(
                         xContext->getServiceManager()->createInstanceWithContext(
-                            OUString::createFromAscii("com.sun.star.chart2.DataSeries"),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.DataSeries" )),
                             xContext ), uno::UNO_QUERY_THROW );
                 }
                 if( xResult.is() )
@@ -740,8 +740,8 @@ SvXMLImportContext *SchXMLImport::CreateContext( USHORT nPrefix, const OUString&
         if (xDPS.is()) {
             uno::Reference<xml::sax::XDocumentHandler> xDocBuilder(
                 mxServiceFactory->createInstance(
-                    ::rtl::OUString::createFromAscii(
-                        "com.sun.star.xml.dom.SAXDocumentBuilder")),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.xml.dom.SAXDocumentBuilder"))),
                     uno::UNO_QUERY_THROW);
             pContext = (IsXMLToken(rLocalName, XML_DOCUMENT_META))
                 ? new SvXMLMetaDocumentContext(*this,
@@ -956,7 +956,7 @@ OUString SAL_CALL SchXMLImport::getImplementationName() throw( uno::RuntimeExcep
         case IMPORT_SETTINGS:
         // there is no settings component in chart
         default:
-            return OUString::createFromAscii( "SchXMLImport" );
+            return OUString(RTL_CONSTASCII_USTRINGPARAM( "SchXMLImport" ));
     }
 }
 
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 21af9e1ff2df..f3001a65762a 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -147,7 +147,7 @@ void SchXML3DSceneAttributesHelper::getCameraDefaultFromDiagram( const uno::Refe
         if( xProp.is() )
         {
             drawing::CameraGeometry aCamGeo;
-            xProp->getPropertyValue( ::rtl::OUString::createFromAscii("D3DCameraGeometry")) >>= aCamGeo;
+            xProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "D3DCameraGeometry" ))) >>= aCamGeo;
             maVRP.setX( aCamGeo.vrp.PositionX );
             maVRP.setY( aCamGeo.vrp.PositionY );
             maVRP.setZ( aCamGeo.vrp.PositionZ );
@@ -240,51 +240,51 @@ SchXMLPlotAreaContext::SchXMLPlotAreaContext(
     {
         try
         {
-            if( xInfo->supportsService( rtl::OUString::createFromAscii( "com.sun.star.chart.ChartAxisXSupplier" )))
+            if( xInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartAxisXSupplier" ))))
             {
                 xProp->setPropertyValue(
-                    rtl::OUString::createFromAscii( "HasXAxis" ), aFalseBool );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxis" )), aFalseBool );
                 xProp->setPropertyValue(
-                    rtl::OUString::createFromAscii( "HasXAxisGrid" ), aFalseBool );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxisGrid" )), aFalseBool );
                 xProp->setPropertyValue(
-                    rtl::OUString::createFromAscii( "HasXAxisDescription" ), aFalseBool );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxisDescription" )), aFalseBool );
             }
-            if( xInfo->supportsService( rtl::OUString::createFromAscii( "com.sun.star.chart.ChartTwoAxisXSupplier" )))
+            if( xInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartTwoAxisXSupplier" ))))
             {
                 xProp->setPropertyValue(
-                    rtl::OUString::createFromAscii( "HasSecondaryXAxis" ), aFalseBool );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryXAxis" )), aFalseBool );
                 xProp->setPropertyValue(
-                    rtl::OUString::createFromAscii( "HasSecondaryXAxisDescription" ), aFalseBool );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryXAxisDescription" )), aFalseBool );
             }
 
-            if( xInfo->supportsService( rtl::OUString::createFromAscii( "com.sun.star.chart.ChartAxisYSupplier" )))
+            if( xInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartAxisYSupplier" ))))
             {
                 xProp->setPropertyValue(
-                    rtl::OUString::createFromAscii( "HasYAxis" ), aFalseBool );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxis" )), aFalseBool );
                 xProp->setPropertyValue(
-                    rtl::OUString::createFromAscii( "HasYAxisGrid" ), aFalseBool );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxisGrid" )), aFalseBool );
                 xProp->setPropertyValue(
-                    rtl::OUString::createFromAscii( "HasYAxisDescription" ), aFalseBool );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxisDescription" )), aFalseBool );
             }
-            if( xInfo->supportsService( rtl::OUString::createFromAscii( "com.sun.star.chart.ChartTwoAxisYSupplier" )))
+            if( xInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartTwoAxisYSupplier" ))))
             {
                 xProp->setPropertyValue(
-                    rtl::OUString::createFromAscii( "HasSecondaryYAxis" ), aFalseBool );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryYAxis" )), aFalseBool );
                 xProp->setPropertyValue(
-                    rtl::OUString::createFromAscii( "HasSecondaryYAxisDescription" ), aFalseBool );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryYAxisDescription" )), aFalseBool );
             }
 
-            if( xInfo->supportsService( rtl::OUString::createFromAscii( "com.sun.star.chart.ChartAxisZSupplier" )))
+            if( xInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartAxisZSupplier" ))))
             {
                 xProp->setPropertyValue(
-                    rtl::OUString::createFromAscii( "HasZAxis" ), aFalseBool );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasZAxis" )), aFalseBool );
                 xProp->setPropertyValue(
-                    rtl::OUString::createFromAscii( "HasZAxisDescription" ), aFalseBool );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasZAxisDescription" )), aFalseBool );
             }
             uno::Any aAny;
             chart::ChartDataRowSource eSource = chart::ChartDataRowSource_COLUMNS;
             aAny <<= eSource;
-            xProp->setPropertyValue( rtl::OUString::createFromAscii( "DataRowSource" ), aAny );
+            xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataRowSource" )), aAny );
         }
         catch( beans::UnknownPropertyException & )
         {
@@ -362,12 +362,12 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
                 uno::Any aAny;
                 aAny <<= (sal_Bool)(mrColHasLabels);
                 xDocProp->setPropertyValue(
-                    ::rtl::OUString::createFromAscii( "DataSourceLabelsInFirstColumn" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataSourceLabelsInFirstColumn" )),
                     aAny );
 
                 aAny <<= (sal_Bool)(mrRowHasLabels);
                 xDocProp->setPropertyValue(
-                    ::rtl::OUString::createFromAscii( "DataSourceLabelsInFirstRow" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataSourceLabelsInFirstRow" )),
                     aAny );
             }
             catch( beans::UnknownPropertyException & )
@@ -397,7 +397,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
                     pPropStyleContext->FillPropertySet( xProp );
 
                     // get the data row source that was set without having data
-                    xProp->getPropertyValue( ::rtl::OUString::createFromAscii("DataRowSource"))
+                    xProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataRowSource" )))
                         >>= mrDataRowSource;
 
                     //lines on/off
@@ -507,7 +507,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
         // data yet.
         mxNewDoc->createInternalDataProvider( false /* bCloneExistingData */ );
         if( xProp.is() && mrDataRowSource!=chart::ChartDataRowSource_COLUMNS )
-            xProp->setPropertyValue( rtl::OUString::createFromAscii( "DataRowSource" ), uno::makeAny(mrDataRowSource) );
+            xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataRowSource" )), uno::makeAny(mrDataRowSource) );
     }
 }
 
@@ -635,7 +635,7 @@ void SchXMLPlotAreaContext::EndElement()
     if( xDiaProp.is())
     {
         sal_Bool bIsThreeDim = sal_False;
-        uno::Any aAny = xDiaProp->getPropertyValue( ::rtl::OUString::createFromAscii( "Dim3D" ));
+        uno::Any aAny = xDiaProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Dim3D" )));
         aAny >>= bIsThreeDim;
 
         // set 3d scene attributes
@@ -747,31 +747,31 @@ void SchXMLPlotAreaContext::CorrectAxisPositions()
                         chart2::ScaleData aMainXScale = xMainXAxis->getScaleData();
                         if( 0 == maChartTypeServiceName.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.ScatterChartType" ) ) )
                         {
-                            xMainYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+                            xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
                                     , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE) );
                             double fCrossoverValue = 0.0;
                             aMainXScale.Origin >>= fCrossoverValue;
-                            xMainYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverValue")
+                            xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverValue" ))
                                     , uno::makeAny( fCrossoverValue ) );
 
                             if( aMainXScale.Orientation == chart2::AxisOrientation_REVERSE )
                             {
-                                xMainYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("LabelPosition")
+                                xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LabelPosition" ))
                                     , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END) );
-                                xMainYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("MarkPosition")
+                                xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MarkPosition" ))
                                     , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) );
                                 if( xSecondaryYAxisProp.is() )
-                                    xSecondaryYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+                                    xSecondaryYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
                                     , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) );
                             }
                             else
                             {
-                                xMainYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("LabelPosition")
+                                xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LabelPosition" ))
                                     , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START) );
-                                xMainYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("MarkPosition")
+                                xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MarkPosition" ))
                                     , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) );
                                 if( xSecondaryYAxisProp.is() )
-                                    xSecondaryYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+                                    xSecondaryYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
                                     , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) );
                             }
                         }
@@ -779,48 +779,48 @@ void SchXMLPlotAreaContext::CorrectAxisPositions()
                         {
                             if( aMainXScale.Orientation == chart2::AxisOrientation_REVERSE )
                             {
-                                xMainYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+                                xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
                                     , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) );
                                 if( xSecondaryYAxisProp.is() )
-                                    xSecondaryYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+                                    xSecondaryYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
                                         , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) );
                             }
                             else
                             {
-                                xMainYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+                                xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
                                     , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) );
                                 if( xSecondaryYAxisProp.is() )
-                                    xSecondaryYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+                                    xSecondaryYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
                                         , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) );
                             }
                         }
 
                         chart2::ScaleData aMainYScale = xMainYAxis->getScaleData();
-                        xMainXAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+                        xMainXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
                                 , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE) );
                         double fCrossoverValue = 0.0;
                         aMainYScale.Origin >>= fCrossoverValue;
-                        xMainXAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverValue")
+                        xMainXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverValue" ))
                                 , uno::makeAny( fCrossoverValue ) );
 
                         if( aMainYScale.Orientation == chart2::AxisOrientation_REVERSE )
                         {
-                            xMainXAxisProp->setPropertyValue( rtl::OUString::createFromAscii("LabelPosition")
+                            xMainXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LabelPosition" ))
                                 , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END) );
-                            xMainXAxisProp->setPropertyValue( rtl::OUString::createFromAscii("MarkPosition")
+                            xMainXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MarkPosition" ))
                                 , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) );
                             if( xSecondaryXAxisProp.is() )
-                                xSecondaryXAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+                                xSecondaryXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
                                 , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) );
                         }
                         else
                         {
-                            xMainXAxisProp->setPropertyValue( rtl::OUString::createFromAscii("LabelPosition")
+                            xMainXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LabelPosition" ))
                                 , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START) );
-                            xMainXAxisProp->setPropertyValue( rtl::OUString::createFromAscii("MarkPosition")
+                            xMainXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MarkPosition" ))
                                 , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) );
                             if( xSecondaryXAxisProp.is() )
-                                xSecondaryXAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+                                xSecondaryXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
                                 , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) );
                         }
                     }
@@ -878,7 +878,7 @@ uno::Reference< drawing::XShape > SchXMLAxisContext::getTitleShape()
                 if( xSuppl.is())
                 {
                     if( xDiaProp.is())
-                        xDiaProp->setPropertyValue( rtl::OUString::createFromAscii( "HasXAxisTitle" ), aTrueBool );
+                        xDiaProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxisTitle" )), aTrueBool );
                     xResult = uno::Reference< drawing::XShape >( xSuppl->getXAxisTitle(), uno::UNO_QUERY );
                 }
             }
@@ -888,7 +888,7 @@ uno::Reference< drawing::XShape > SchXMLAxisContext::getTitleShape()
                 if( xSuppl.is() )
                 {
                     if( xDiaProp.is() )
-                        xDiaProp->setPropertyValue( rtl::OUString::createFromAscii( "HasSecondaryXAxisTitle" ), aTrueBool );
+                        xDiaProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryXAxisTitle" )), aTrueBool );
                     xResult = uno::Reference< drawing::XShape >( xSuppl->getSecondXAxisTitle(), uno::UNO_QUERY );
                 }
             }
@@ -900,7 +900,7 @@ uno::Reference< drawing::XShape > SchXMLAxisContext::getTitleShape()
                 if( xSuppl.is())
                 {
                     if( xDiaProp.is())
-                        xDiaProp->setPropertyValue( rtl::OUString::createFromAscii( "HasYAxisTitle" ), aTrueBool );
+                        xDiaProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxisTitle" )), aTrueBool );
                     xResult = uno::Reference< drawing::XShape >( xSuppl->getYAxisTitle(), uno::UNO_QUERY );
                 }
             }
@@ -910,7 +910,7 @@ uno::Reference< drawing::XShape > SchXMLAxisContext::getTitleShape()
                 if( xSuppl.is() )
                 {
                     if( xDiaProp.is() )
-                        xDiaProp->setPropertyValue( rtl::OUString::createFromAscii( "HasSecondaryYAxisTitle" ), aTrueBool );
+                        xDiaProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryYAxisTitle" )), aTrueBool );
                     xResult = uno::Reference< drawing::XShape >( xSuppl->getSecondYAxisTitle(), uno::UNO_QUERY );
                 }
             }
@@ -921,7 +921,7 @@ uno::Reference< drawing::XShape > SchXMLAxisContext::getTitleShape()
             if( xSuppl.is())
             {
                 if( xDiaProp.is())
-                    xDiaProp->setPropertyValue( rtl::OUString::createFromAscii( "HasZAxisTitle" ), aTrueBool );
+                    xDiaProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasZAxisTitle" )), aTrueBool );
                 xResult = uno::Reference< drawing::XShape >( xSuppl->getZAxisTitle(), uno::UNO_QUERY );
             }
             break;
@@ -955,13 +955,13 @@ void SchXMLAxisContext::CreateGrid( ::rtl::OUString sAutoStyleName,
                     if( bIsMajor )
                     {
                         if( xDiaProp.is())
-                            xDiaProp->setPropertyValue( ::rtl::OUString::createFromAscii("HasXAxisGrid"), aTrueBool );
+                            xDiaProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxisGrid" )), aTrueBool );
                         xGridProp = xSuppl->getXMainGrid();
                     }
                     else
                     {
                         if( xDiaProp.is())
-                            xDiaProp->setPropertyValue( ::rtl::OUString::createFromAscii("HasXAxisHelpGrid"), aTrueBool );
+                            xDiaProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxisHelpGrid" )), aTrueBool );
                         xGridProp = xSuppl->getXHelpGrid();
                     }
                 }
@@ -975,13 +975,13 @@ void SchXMLAxisContext::CreateGrid( ::rtl::OUString sAutoStyleName,
                     if( bIsMajor )
                     {
                         if( xDiaProp.is())
-                            xDiaProp->setPropertyValue( ::rtl::OUString::createFromAscii("HasYAxisGrid"), aTrueBool );
+                            xDiaProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxisGrid" )), aTrueBool );
                         xGridProp = xSuppl->getYMainGrid();
                     }
                     else
                     {
                         if( xDiaProp.is())
-                            xDiaProp->setPropertyValue( ::rtl::OUString::createFromAscii("HasYAxisHelpGrid"), aTrueBool );
+                            xDiaProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxisHelpGrid" )), aTrueBool );
                         xGridProp = xSuppl->getYHelpGrid();
                     }
                 }
@@ -995,13 +995,13 @@ void SchXMLAxisContext::CreateGrid( ::rtl::OUString sAutoStyleName,
                     if( bIsMajor )
                     {
                         if( xDiaProp.is())
-                            xDiaProp->setPropertyValue( ::rtl::OUString::createFromAscii("HasZAxisGrid"), aTrueBool );
+                            xDiaProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasZAxisGrid" )), aTrueBool );
                         xGridProp = xSuppl->getZMainGrid();
                     }
                     else
                     {
                         if( xDiaProp.is())
-                            xDiaProp->setPropertyValue( ::rtl::OUString::createFromAscii("HasZAxisHelpGrid"), aTrueBool );
+                            xDiaProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasZAxisHelpGrid" )), aTrueBool );
                         xGridProp = xSuppl->getZHelpGrid();
                     }
                 }
@@ -1159,7 +1159,7 @@ void SchXMLAxisContext::CreateAxis()
                 try
                 {
                     xDiaProp->setPropertyValue(
-                        rtl::OUString::createFromAscii( "HasXAxis" ), aTrueBool );
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxis" )), aTrueBool );
                 }
                 catch( beans::UnknownPropertyException & )
                 {
@@ -1174,7 +1174,7 @@ void SchXMLAxisContext::CreateAxis()
                 try
                 {
                     xDiaProp->setPropertyValue(
-                        rtl::OUString::createFromAscii( "HasSecondaryXAxis" ), aTrueBool );
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryXAxis" )), aTrueBool );
                 }
                 catch( beans::UnknownPropertyException & )
                 {
@@ -1192,7 +1192,7 @@ void SchXMLAxisContext::CreateAxis()
                 try
                 {
                     xDiaProp->setPropertyValue(
-                        rtl::OUString::createFromAscii( "HasYAxis" ), aTrueBool );
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxis" )), aTrueBool );
                 }
                 catch( beans::UnknownPropertyException & )
                 {
@@ -1210,7 +1210,7 @@ void SchXMLAxisContext::CreateAxis()
                         try
                         {
                             xDiaProp->setPropertyValue(
-                                rtl::OUString::createFromAscii( "HasXAxis" ), uno::makeAny(sal_True) );
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxis" )), uno::makeAny(sal_True) );
                         }
                         catch( beans::UnknownPropertyException & )
                         {
@@ -1224,7 +1224,7 @@ void SchXMLAxisContext::CreateAxis()
                 try
                 {
                     xDiaProp->setPropertyValue(
-                        rtl::OUString::createFromAscii( "HasSecondaryYAxis" ), aTrueBool );
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryYAxis" )), aTrueBool );
                 }
                 catch( beans::UnknownPropertyException & )
                 {
@@ -1241,7 +1241,7 @@ void SchXMLAxisContext::CreateAxis()
                 bool bSettingZAxisSuccedded = false;
                 try
                 {
-                    rtl::OUString sHasZAxis( rtl::OUString::createFromAscii( "HasZAxis" ) );
+                    rtl::OUString sHasZAxis( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasZAxis" )) );
                     xDiaProp->setPropertyValue( sHasZAxis, aTrueBool );
                     xDiaProp->getPropertyValue( sHasZAxis ) >>= bSettingZAxisSuccedded;
                 }
@@ -1269,10 +1269,10 @@ void SchXMLAxisContext::CreateAxis()
         xProp->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineColor" )),
                                      uno::makeAny( COL_BLACK ));
 
-        xProp->setPropertyValue( rtl::OUString::createFromAscii( "DisplayLabels" ), aFalseBool );
+        xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DisplayLabels" )), aFalseBool );
 
         // #88077# AutoOrigin 'on' is default
-        xProp->setPropertyValue( rtl::OUString::createFromAscii( "AutoOrigin" ), aTrueBool );
+        xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoOrigin" )), aTrueBool );
 
         if( msAutoStyleName.getLength())
         {
@@ -1328,7 +1328,7 @@ void SchXMLAxisContext::CreateAxis()
                         uno::Reference< beans::XPropertySet > xNewAxisProp( xAxis, uno::UNO_QUERY );
                         if( xNewAxisProp.is() )
                         {
-                            xNewAxisProp->setPropertyValue( rtl::OUString::createFromAscii("LineStyle")
+                            xNewAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LineStyle" ))
                                 , uno::makeAny(drawing::LineStyle_NONE));
                         }
                     }
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 52bd068da102..3dcfa34a019e 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -239,7 +239,7 @@ Reference< chart2::data::XLabeledDataSequence > lcl_createAndAddSequenceToSeries
     Reference< chart2::data::XDataSequence > xSeq = SchXMLTools::CreateDataSequence( rRange, xChartDoc );
     Reference< beans::XPropertySet > xSeqProp( xSeq, uno::UNO_QUERY );
     if( xSeqProp.is())
-        xSeqProp->setPropertyValue(OUString::createFromAscii("Role"), uno::makeAny( rRole));
+        xSeqProp->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "Role" )), uno::makeAny( rRole));
     xLabeledSeq->setValues( xSeq );
 
     // add new sequence to data series / push to front to have the correct sequence order if charttype is changed afterwards
@@ -387,7 +387,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib
                 && m_bStockHasVolume
                 && mnSeriesIndex == 0 )
             {
-                maSeriesChartTypeName = OUString::createFromAscii( "com.sun.star.chart2.ColumnChartType" );
+                maSeriesChartTypeName = OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ColumnChartType" ));
                 bIsCandleStick = false;
             }
             else
@@ -428,10 +428,10 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib
         Reference< beans::XPropertySet > xSeqProp( xSeq, uno::UNO_QUERY );
         if( xSeqProp.is())
         {
-            OUString aMainRole( OUString::createFromAscii("values-y") );
+            OUString aMainRole(RTL_CONSTASCII_USTRINGPARAM("values-y"));
             if( maSeriesChartTypeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.chart2.BubbleChartType") ) )
-                aMainRole = OUString::createFromAscii("values-size");
-            xSeqProp->setPropertyValue(OUString::createFromAscii("Role"), uno::makeAny( aMainRole ));
+                aMainRole = OUString(RTL_CONSTASCII_USTRINGPARAM( "values-size" ));
+            xSeqProp->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "Role" )), uno::makeAny( aMainRole ));
         }
         xLabeledSeq->setValues( xSeq );
 
@@ -520,7 +520,7 @@ void SchXMLSeries2Context::EndElement()
     //different handling for different chart types necessary
     if( bIsScatterChart || ( nDomainCount==1 && !bIsBubbleChart ) )
     {
-        DomainInfo aDomainInfo( OUString::createFromAscii("values-x"), m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress, m_rGlobalSeriesImportInfo.nFirstFirstDomainIndex ) ;
+        DomainInfo aDomainInfo( OUString(RTL_CONSTASCII_USTRINGPARAM( "values-x" )), m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress, m_rGlobalSeriesImportInfo.nFirstFirstDomainIndex ) ;
         bool bCreateXValues = true;
         if( !maDomainAddresses.empty() )
         {
@@ -553,7 +553,7 @@ void SchXMLSeries2Context::EndElement()
     {
         if( nDomainCount>1 )
         {
-            DomainInfo aDomainInfo( OUString::createFromAscii("values-x"), maDomainAddresses[1], m_rGlobalSeriesImportInfo.nCurrentDataIndex ) ;
+            DomainInfo aDomainInfo( OUString(RTL_CONSTASCII_USTRINGPARAM( "values-x" )), maDomainAddresses[1], m_rGlobalSeriesImportInfo.nCurrentDataIndex ) ;
             if( !m_rGlobalSeriesImportInfo.aFirstSecondDomainAddress.getLength() )
             {
                 //for bubble chart the second domain contains the x values which should become an index smaller than y values for own data table
@@ -566,12 +566,12 @@ void SchXMLSeries2Context::EndElement()
         }
         else if( m_rGlobalSeriesImportInfo.aFirstSecondDomainAddress.getLength() )
         {
-            DomainInfo aDomainInfo( OUString::createFromAscii("values-x"), m_rGlobalSeriesImportInfo.aFirstSecondDomainAddress, m_rGlobalSeriesImportInfo.nFirstSecondDomainIndex ) ;
+            DomainInfo aDomainInfo( OUString(RTL_CONSTASCII_USTRINGPARAM( "values-x" )), m_rGlobalSeriesImportInfo.aFirstSecondDomainAddress, m_rGlobalSeriesImportInfo.nFirstSecondDomainIndex ) ;
             aDomainInfos.push_back( aDomainInfo );
         }
         if( nDomainCount>0)
         {
-            DomainInfo aDomainInfo( OUString::createFromAscii("values-y"), maDomainAddresses.front(), m_rGlobalSeriesImportInfo.nCurrentDataIndex ) ;
+            DomainInfo aDomainInfo( OUString(RTL_CONSTASCII_USTRINGPARAM( "values-y" )), maDomainAddresses.front(), m_rGlobalSeriesImportInfo.nCurrentDataIndex ) ;
             if( !m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress.getLength() )
             {
                 m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress = maDomainAddresses.front();
diff --git a/xmloff/source/chart/SchXMLSeriesHelper.cxx b/xmloff/source/chart/SchXMLSeriesHelper.cxx
index 2b84f38b1030..0b0c3325abdc 100644
--- a/xmloff/source/chart/SchXMLSeriesHelper.cxx
+++ b/xmloff/source/chart/SchXMLSeriesHelper.cxx
@@ -207,7 +207,7 @@ Reference< chart2::XDataSeries > SchXMLSeriesHelper::getFirstCandleStickSeries(
             for( sal_Int32 nCTIdx=0; !xResult.is() && nCTIdx<aCTSeq.getLength(); ++nCTIdx )
             {
                 if( aCTSeq[nCTIdx]->getChartType().equals(
-                        ::rtl::OUString::createFromAscii("com.sun.star.chart2.CandleStickChartType")))
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CandleStickChartType" ))))
                 {
                     Reference< chart2::XDataSeriesContainer > xSeriesCnt( aCTSeq[nCTIdx], uno::UNO_QUERY_THROW );
                     Sequence< Reference< chart2::XDataSeries > > aSeriesSeq( xSeriesCnt->getDataSeries() );
@@ -240,7 +240,7 @@ uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPISeriesProp
             if( xFactory.is() )
             {
                 xRet = uno::Reference< beans::XPropertySet >( xFactory->createInstance(
-                    OUString::createFromAscii( "com.sun.star.comp.chart2.DataSeriesWrapper" ) ), uno::UNO_QUERY );
+                    OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.DataSeriesWrapper" )) ), uno::UNO_QUERY );
                 Reference< lang::XInitialization > xInit( xRet, uno::UNO_QUERY );
                 if(xInit.is())
                 {
@@ -277,7 +277,7 @@ uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPIDataPointP
             if( xFactory.is() )
             {
                 xRet = uno::Reference< beans::XPropertySet >( xFactory->createInstance(
-                    OUString::createFromAscii( "com.sun.star.comp.chart2.DataSeriesWrapper" ) ), uno::UNO_QUERY );
+                    OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.DataSeriesWrapper" )) ), uno::UNO_QUERY );
                 Reference< lang::XInitialization > xInit( xRet, uno::UNO_QUERY );
                 if(xInit.is())
                 {
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index f95eae93e865..73f0871a09f7 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -85,7 +85,7 @@ Reference< uno::XComponentContext > lcl_getComponentContext()
     {
         Reference< beans::XPropertySet > xFactProp( comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
         if( xFactProp.is())
-            xFactProp->getPropertyValue(OUString::createFromAscii("DefaultContext")) >>= xContext;
+            xFactProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext;
     }
     catch( uno::Exception& )
     {}
@@ -197,35 +197,35 @@ const tMakeStringStringMap& lcl_getChartTypeNameMap()
     //shape property -- chart model object property
     static tMakeStringStringMap g_aChartTypeNameMap =
         tMakeStringStringMap
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.LineDiagram" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.LineChartType" ) )
+        ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.LineDiagram" ))
+        , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.LineChartType" )) )
 
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.AreaDiagram" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.AreaChartType" ) )
+        ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.AreaDiagram" ))
+        , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.AreaChartType" )) )
 
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.BarDiagram" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.ColumnChartType" ) )
+        ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.BarDiagram" ))
+        , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ColumnChartType" )) )
 
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.PieDiagram" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.PieChartType" ) )
+        ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.PieDiagram" ))
+        , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.PieChartType" )) )
 
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.DonutDiagram" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.DonutChartType" ) )
+        ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.DonutDiagram" ))
+        , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.DonutChartType" )) )
 
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.XYDiagram" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.ScatterChartType" ) )
+        ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.XYDiagram" ))
+        , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ScatterChartType" )) )
 
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.NetDiagram" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.NetChartType" ) )
+        ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.NetDiagram" ))
+        , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.NetChartType" )) )
 
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.FilledNetDiagram" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.FilledNetChartType" ) )
+        ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.FilledNetDiagram" ))
+        , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.FilledNetChartType" )) )
 
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.StockDiagram" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.CandleStickChartType" ) )
+        ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.StockDiagram" ))
+        , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CandleStickChartType" )) )
 
-        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.BubbleDiagram" )
-        , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.BubbleChartType" ) )
+        ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.BubbleDiagram" ))
+        , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.BubbleChartType" )) )
 
         ;
     return g_aChartTypeNameMap;
@@ -386,7 +386,7 @@ Reference< chart2::data::XLabeledDataSequence > GetNewLabeledDataSequence()
     if( xContext.is() )
         xResult.set(
             xContext->getServiceManager()->createInstanceWithContext(
-                OUString::createFromAscii("com.sun.star.chart2.data.LabeledDataSequence"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.data.LabeledDataSequence" )),
                 xContext ), uno::UNO_QUERY_THROW );
     return xResult;
 }
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index bdd8196e1d77..4fd06b7f914f 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -39,9 +39,7 @@
 #include <xmloff/xmluconv.hxx>
 #include <tools/debug.hxx>
 
-#ifndef __SGI_STL_LIST
 #include <list>
-#endif
 #include <com/sun/star/i18n/XForbiddenCharacters.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/xmloff/source/core/RDFaExportHelper.cxx b/xmloff/source/core/RDFaExportHelper.cxx
index 226e438ebe38..fd931e39fc88 100644
--- a/xmloff/source/core/RDFaExportHelper.cxx
+++ b/xmloff/source/core/RDFaExportHelper.cxx
@@ -104,8 +104,8 @@ getRelativeReference(SvXMLExport const& rExport, ::rtl::OUString const& rURI)
         xContext->getServiceManager(), uno::UNO_SET_THROW);
     uno::Reference<uri::XUriReferenceFactory> const xUriFactory(
         xServiceFactory->createInstanceWithContext(
-            ::rtl::OUString::createFromAscii(
-                "com.sun.star.uri.UriReferenceFactory"), xContext),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.uri.UriReferenceFactory")), xContext),
         uno::UNO_QUERY_THROW);
 
     uno::Reference< uri::XUriReference > const xBaseURI(
@@ -215,7 +215,7 @@ RDFaExportHelper::AddRDFa(
                 ::boost::bind(&makeCURIE, &m_rExport,
                     ::boost::bind(&rdf::Statement::Predicate, _1))),
             ::comphelper::OUStringBufferAppender(property),
-            ::rtl::OUString::createFromAscii(" "));
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")));
 
         m_rExport.AddAttribute(XML_NAMESPACE_XHTML, token::XML_PROPERTY,
             property.makeStringAndClear());
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index 752244b6661d..03f7ad036894 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -81,7 +81,7 @@ SvXMLNamespaceMap::~SvXMLNamespaceMap()
     while ( aIter != aEnd )
     {
         const OUString *pString = (*aIter).first.second;
-        aIter++;
+        ++aIter;
         delete pString;
     }
 }
@@ -171,7 +171,7 @@ sal_uInt16 SvXMLNamespaceMap::GetKeyByName( const OUString& rName ) const
             nKey = (*aIter).second->nKey;
             break;
         }
-        aIter++;
+        ++aIter;
     }
     return nKey;
 }
diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx
index 7055cb9c3e95..3acf32709c21 100644
--- a/xmloff/source/core/unoatrcn.cxx
+++ b/xmloff/source/core/unoatrcn.cxx
@@ -160,7 +160,7 @@ uno::Any SAL_CALL SvUnoAttributeContainer::getByName(const OUString& aName)
 
     xml::AttributeData aData;
     aData.Namespace = mpContainer->GetAttrNamespace(nAttr);
-    aData.Type = OUString::createFromAscii("CDATA");
+    aData.Type = OUString(RTL_CONSTASCII_USTRINGPARAM("CDATA"));
     aData.Value = mpContainer->GetAttrValue(nAttr);
 
     uno::Any aAny;
@@ -287,13 +287,13 @@ void SAL_CALL SvUnoAttributeContainer::removeByName(const OUString& Name)
 //XServiceInfo
 OUString SAL_CALL SvUnoAttributeContainer::getImplementationName(void) throw( uno::RuntimeException )
 {
-    return OUString::createFromAscii( "SvUnoAttributeContainer" );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( "SvUnoAttributeContainer" ));
 }
 
 uno::Sequence< OUString > SvUnoAttributeContainer::getSupportedServiceNames(void)
     throw( uno::RuntimeException )
 {
-    OUString aSN( OUString::createFromAscii( "com.sun.star.xml.AttributeContainer" ) );
+    OUString aSN( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.AttributeContainer" )) );
     uno::Sequence< OUString > aNS( &aSN, 1L );
     return aNS;
 }
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 2deb1c7a7f9d..cd1e83cafdd6 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -116,8 +116,6 @@ using namespace ::xmloff::token;
 sal_Char __READONLY_DATA sXML_1_1[] = "1.1";
 sal_Char __READONLY_DATA sXML_1_2[] = "1.2";
 
-const sal_Char *sOpenOfficeOrgProject ="OpenOffice.org_project";
-
 const sal_Char s_grddl_xsl[] =
     "http://docs.oasis-open.org/office/1.2/xslt/odf2rdf.xsl";
 
@@ -270,12 +268,9 @@ public:
     uno::Reference< uri::XUriReferenceFactory >         mxUriReferenceFactory;
     rtl::OUString                                       msPackageURI;
     rtl::OUString                                       msPackageURIScheme;
-    // --> OD 2006-09-27 #i69627#
+    // Written OpenDocument file format doesn't fit to the created text document (#i69627#)
     sal_Bool                                            mbOutlineStyleAsNormalListStyle;
-    // <--
-    // --> PB 2007-07-06 #i146851#
     sal_Bool                                            mbSaveBackwardCompatibleODF;
-    // <--
 
     uno::Reference< embed::XStorage >                   mxTargetStorage;
 
@@ -297,9 +292,7 @@ public:
 
     ::std::auto_ptr< ::xmloff::RDFaExportHelper> mpRDFaHelper;
 
-    // --> OD 2008-11-26 #158694#
     sal_Bool                                            mbExportTextNumberElement;
-    // <--
     sal_Bool                                            mbNullDateInitialized;
 
     void SetSchemeOf( const ::rtl::OUString& rOrigFileName )
@@ -311,20 +304,15 @@ public:
 };
 
 SvXMLExport_Impl::SvXMLExport_Impl()
-    // --> OD 2006-09-27 #i69627#
+    // Written OpenDocument file format doesn't fit to the created text document (#i69627#)
     : mbOutlineStyleAsNormalListStyle( false )
-    // <--
-    // --> PB 2007-07-06 #i146851#
         ,mbSaveBackwardCompatibleODF( sal_True )
-    // <--
         ,mxComponentContext( ::comphelper::getProcessComponentContext() )
         ,mStreamName()
         ,mNamespaceMaps()
         ,mDepth(0)
         ,mpRDFaHelper() // lazy
-    // --> OD 2008-11-26 #158694#
         ,mbExportTextNumberElement( sal_False )
-    // <--
         ,mbNullDateInitialized( sal_False )
 {
     OSL_ENSURE(mxComponentContext.is(), "SvXMLExport: no ComponentContext");
@@ -444,14 +432,11 @@ void SvXMLExport::_InitCtor()
         mxModel->addEventListener(mxEventListener);
     }
 
-    // --> OD 2006-03-10 #i51726# - determine model type
+    // Determine model type (#i51726#)
     _DetermineModelType();
-    // <--
 
     mbEnableExperimentalOdfExport = getenv("ENABLE_EXPERIMENTAL_ODF_EXPORT") != NULL;
 
-    // --> PB 2007-07-06 #146851# - load mbSaveBackwardCompatibleODF from configuration
-
     // cl: but only if we do export to current oasis format, old openoffice format *must* always be compatible
     if( (getExportFlags() & EXPORT_OASIS) != 0 )
     {
@@ -467,7 +452,7 @@ void SvXMLExport::_InitCtor()
     // <--
 }
 
-// --> OD 2006-03-14 #i51726#
+// Shapes in Writer cannot be named via context menu (#i51726#)
 void SvXMLExport::_DetermineModelType()
 {
     meModelType = SvtModuleOptions::E_UNKNOWN_FACTORY;
@@ -477,18 +462,14 @@ void SvXMLExport::_DetermineModelType()
         meModelType = SvtModuleOptions::ClassifyFactoryByModel( mxModel );
     }
 }
-// <--
 
-// #110680#
 SvXMLExport::SvXMLExport(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
     MapUnit eDfltUnit, const enum XMLTokenEnum eClass, sal_uInt16 nExportFlags )
 :   mpImpl( new SvXMLExport_Impl ),
-    // #110680#
     mxServiceFactory(xServiceFactory),
     mpAttrList( new SvXMLAttributeList ),
     mpNamespaceMap( new SvXMLNamespaceMap ),
-    // #110680#
     mpUnitConv( new SvXMLUnitConverter( MAP_100TH_MM, eDfltUnit, getServiceFactory() ) ),
     mpNumExport(0L),
     mpProgressBarHelper( NULL ),
@@ -506,21 +487,18 @@ SvXMLExport::SvXMLExport(
     _InitCtor();
 }
 
-// #110680#
 SvXMLExport::SvXMLExport(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
     const OUString &rFileName,
     const uno::Reference< xml::sax::XDocumentHandler > & rHandler,
     MapUnit eDfltUnit   )
 :   mpImpl( new SvXMLExport_Impl ),
-    // #110680#
     mxServiceFactory(xServiceFactory),
     mxHandler( rHandler ),
     mxExtHandler( rHandler, uno::UNO_QUERY ),
     mpAttrList( new SvXMLAttributeList ),
     msOrigFileName( rFileName ),
     mpNamespaceMap( new SvXMLNamespaceMap ),
-    // #110680#
     mpUnitConv( new SvXMLUnitConverter( MAP_100TH_MM, eDfltUnit, getServiceFactory() ) ),
     mpNumExport(0L),
     mpProgressBarHelper( NULL ),
@@ -542,7 +520,6 @@ SvXMLExport::SvXMLExport(
         mpNumExport = new SvXMLNumFmtExport(*this, mxNumberFormatsSupplier);
 }
 
-// #110680#
 SvXMLExport::SvXMLExport(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
     const OUString &rFileName,
@@ -550,7 +527,6 @@ SvXMLExport::SvXMLExport(
     const Reference< XModel >& rModel,
     sal_Int16 eDfltUnit )
 :   mpImpl( new SvXMLExport_Impl ),
-    // #110680#
     mxServiceFactory(xServiceFactory),
     mxModel( rModel ),
     mxHandler( rHandler ),
@@ -559,8 +535,6 @@ SvXMLExport::SvXMLExport(
     mpAttrList( new SvXMLAttributeList ),
     msOrigFileName( rFileName ),
     mpNamespaceMap( new SvXMLNamespaceMap ),
-    // #110680#
-    // pUnitConv( new SvXMLUnitConverter( MAP_100TH_MM, SvXMLUnitConverter::GetMapUnit(eDfltUnit) ) ),
     mpUnitConv( new SvXMLUnitConverter( MAP_100TH_MM, SvXMLUnitConverter::GetMapUnit(eDfltUnit), getServiceFactory() ) ),
     mpNumExport(0L),
     mpProgressBarHelper( NULL ),
@@ -582,7 +556,6 @@ SvXMLExport::SvXMLExport(
         mpNumExport = new SvXMLNumFmtExport(*this, mxNumberFormatsSupplier);
 }
 
-// #110680#
 SvXMLExport::SvXMLExport(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
     const OUString &rFileName,
@@ -591,7 +564,6 @@ SvXMLExport::SvXMLExport(
     const Reference< document::XGraphicObjectResolver >& rEmbeddedGraphicObjects,
     sal_Int16 eDfltUnit )
 :   mpImpl( new SvXMLExport_Impl ),
-    // #110680#
     mxServiceFactory(xServiceFactory),
     mxModel( rModel ),
     mxHandler( rHandler ),
@@ -601,7 +573,6 @@ SvXMLExport::SvXMLExport(
     mpAttrList( new SvXMLAttributeList ),
     msOrigFileName( rFileName ),
     mpNamespaceMap( new SvXMLNamespaceMap ),
-    // #110680#
     mpUnitConv( new SvXMLUnitConverter( MAP_100TH_MM, SvXMLUnitConverter::GetMapUnit(eDfltUnit), getServiceFactory() ) ),
     mpNumExport(0L),
     mpProgressBarHelper( NULL ),
@@ -732,12 +703,10 @@ void SAL_CALL SvXMLExport::setSourceDocument( const uno::Reference< lang::XCompo
         }
     }
 
-    // --> PB 2007-07-06 #i146851#
     if ( mpImpl->mbSaveBackwardCompatibleODF )
         mnExportFlags |= EXPORT_SAVEBACKWARDCOMPATIBLE;
     else
         mnExportFlags &= ~EXPORT_SAVEBACKWARDCOMPATIBLE;
-    // <--
 
     // namespaces for user defined attributes
     Reference< XMultiServiceFactory > xFactory( mxModel,    UNO_QUERY );
@@ -773,9 +742,8 @@ void SAL_CALL SvXMLExport::setSourceDocument( const uno::Reference< lang::XCompo
         }
     }
 
-    // --> OD 2006-03-10 #i51726# - determine model type
+    // Determine model type (#i51726#)
     _DetermineModelType();
-    // <--
 }
 
 // XInitialize
@@ -865,7 +833,7 @@ void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArgumen
         }
         mpImpl->mStreamName = sName; // Note: may be empty (XSLT)
 
-        // --> OD 2006-09-26 #i69627#
+        // Written OpenDocument file format doesn't fit to the created text document (#i69627#)
         const ::rtl::OUString sOutlineStyleAsNormalListStyle(
                 RTL_CONSTASCII_USTRINGPARAM("OutlineStyleAsNormalListStyle") );
         if( xPropertySetInfo->hasPropertyByName( sOutlineStyleAsNormalListStyle ) )
@@ -873,13 +841,11 @@ void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArgumen
             uno::Any aAny = mxExportInfo->getPropertyValue( sOutlineStyleAsNormalListStyle );
             aAny >>= (mpImpl->mbOutlineStyleAsNormalListStyle);
         }
-        // <--
 
         OUString sTargetStorage( RTL_CONSTASCII_USTRINGPARAM("TargetStorage") );
         if( xPropertySetInfo->hasPropertyByName( sTargetStorage ) )
             mxExportInfo->getPropertyValue( sTargetStorage ) >>= mpImpl->mxTargetStorage;
 
-        // --> OD 2008-11-26 #158694#
         const ::rtl::OUString sExportTextNumberElement(
                 RTL_CONSTASCII_USTRINGPARAM("ExportTextNumberElement") );
         if( xPropertySetInfo->hasPropertyByName( sExportTextNumberElement ) )
@@ -887,7 +853,6 @@ void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArgumen
             uno::Any aAny = mxExportInfo->getPropertyValue( sExportTextNumberElement );
             aAny >>= (mpImpl->mbExportTextNumberElement);
         }
-        // <--
     }
 
 }
@@ -1309,7 +1274,7 @@ lcl_AddGrddl(SvXMLExport & rExport, const sal_Int32 nExportMode)
     if (EXPORT_SETTINGS != nExportMode) // meta, content, styles
     {
         rExport.AddAttribute( XML_NAMESPACE_GRDDL, XML_TRANSFORMATION,
-            OUString::createFromAscii(s_grddl_xsl) );
+            OUString(RTL_CONSTASCII_USTRINGPARAM(s_grddl_xsl)) );
     }
 }
 
@@ -1385,7 +1350,7 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass )
                 // get filter component
                 Reference< xml::sax::XDocumentHandler > xTmpDocHandler(
                     xFactory->createInstanceWithArguments(
-                    OUString::createFromAscii("com.sun.star.comp.Oasis2OOoTransformer"),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Oasis2OOoTransformer")),
                                 aArgs), UNO_QUERY);
                 OSL_ENSURE( xTmpDocHandler.is(),
                     "can't instantiate OASIS transformer component" );
@@ -2465,16 +2430,13 @@ XMLErrors* SvXMLExport::GetErrors()
 void SvXMLExport::DisposingModel()
 {
     mxModel.clear();
-    // --> OD 2006-03-13 #i51726#
+    // Shapes in Writer cannot be named via context menu (#i51726#)
     meModelType = SvtModuleOptions::E_UNKNOWN_FACTORY;;
-    // <--
     mxEventListener.clear();
 }
 
-// #110680#
 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > SvXMLExport::getServiceFactory()
 {
-    // #110680#
     return mxServiceFactory;
 }
 
@@ -2489,12 +2451,11 @@ SvXMLExport::GetComponentContext() const
     return mpImpl->maInterfaceToIdentifierMapper;
 }
 
-// --> OD 2006-09-27 #i69627#
+// Written OpenDocument file format doesn't fit to the created text document (#i69627#)
 sal_Bool SvXMLExport::writeOutlineStyleAsNormalListStyle() const
 {
     return mpImpl->mbOutlineStyleAsNormalListStyle;
 }
-// <--
 
 uno::Reference< embed::XStorage > SvXMLExport::GetTargetStorage()
 {
@@ -2610,12 +2571,10 @@ SvXMLExport::AddAttributesRDFa(
     mpImpl->mpRDFaHelper->AddRDFa(xMeta);
 }
 
-// --> OD 2008-11-26 #158694#
 sal_Bool SvXMLExport::exportTextNumberElement() const
 {
     return mpImpl->mbExportTextNumberElement;
 }
-// <--
 
 sal_Bool SvXMLExport::SetNullDateOnUnitConverter()
 {
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 646242ea10be..e0b2ac0c09f4 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -185,14 +185,11 @@ public:
 
     ::rtl::OUString aODFVersion;
 
-    // --> OD 2004-08-10 #i28749# - boolean, indicating that position attributes
+    // Boolean, indicating that position attributes
     // of shapes are given in horizontal left-to-right layout. This is the case
-    // for the OpenOffice.org file format.
+    // for the OpenOffice.org file format. (#i28749#)
     sal_Bool mbShapePositionInHoriL2R;
-    // <--
-    // --> OD 2007-12-19 #152540#
     sal_Bool mbTextDocInOOoFileFormat;
-    // <--
 
     const uno::Reference< uno::XComponentContext > mxComponentContext;
 
@@ -203,12 +200,9 @@ public:
         mbOwnGraphicResolver( false ),
         mbOwnEmbeddedResolver( false ),
         mStreamName(),
-        // --> OD 2004-08-11 #i28749#
+        // Convert drawing object positions from OOo file format to OASIS (#i28749#)
         mbShapePositionInHoriL2R( sal_False ),
-        // <--
-        // --> OD 2007-12-19 #152540#
         mbTextDocInOOoFileFormat( sal_False ),
-        // <--
         mxComponentContext( ::comphelper::getProcessComponentContext() ),
         mpRDFaHelper() // lazy
     {
@@ -999,22 +993,19 @@ void SAL_CALL SvXMLImport::initialize( const uno::Sequence< uno::Any >& aArgumen
                     mpImpl->aBaseURL.insertName( sName );
                 }
                 mpImpl->mStreamName = sName; // Note: may be empty (XSLT)
-                // --> OD 2004-08-10 #i28749# - retrieve property <ShapePositionInHoriL2R>
+                // Retrieve property <ShapePositionInHoriL2R> (#i28749#)
                 sPropName = OUString( RTL_CONSTASCII_USTRINGPARAM("ShapePositionInHoriL2R" ) );
                 if( xPropertySetInfo->hasPropertyByName(sPropName) )
                 {
                     uno::Any aAny = mxImportInfo->getPropertyValue(sPropName);
                     aAny >>= (mpImpl->mbShapePositionInHoriL2R);
                 }
-                // <--
-                // --> OD 2007-12-19 #152540#
                 sPropName = OUString( RTL_CONSTASCII_USTRINGPARAM("TextDocInOOoFileFormat" ) );
                 if( xPropertySetInfo->hasPropertyByName(sPropName) )
                 {
                     uno::Any aAny = mxImportInfo->getPropertyValue(sPropName);
                     aAny >>= (mpImpl->mbTextDocInOOoFileFormat);
                 }
-                // <--
             }
         }
     }
@@ -1898,21 +1889,17 @@ String SvXMLImport::GetDocumentBase() const
     return mpImpl->mStreamName;
 }
 
-// --> OD 2004-08-10 #i28749#
+// Convert drawing object positions from OOo file format to OASIS (#i28749#)
 sal_Bool SvXMLImport::IsShapePositionInHoriL2R() const
 {
     return mpImpl->mbShapePositionInHoriL2R;
 }
-// <--
 
-// --> OD 2007-12-19 #152540#
 sal_Bool SvXMLImport::IsTextDocInOOoFileFormat() const
 {
     return mpImpl->mbTextDocInOOoFileFormat;
 }
 
-// <--
-
 void SvXMLImport::initXForms()
 {
     // dummy method; to be implemented by derived classes supporting XForms
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index ac12778c5979..d4ae2252a9c7 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -936,14 +936,13 @@ namespace xmloff { namespace token {
         TOKEN( "hint",                            XML_HINT),
         TOKEN( "horizontal",                      XML_HORIZONTAL ),
         TOKEN( "horizontal-lines",                XML_HORIZONTAL_LINES ),
-        // --> OD 2005-05-12 #i49139#
-        // XML_HORIZONTAL_ON_LEFT_PAGES and XML_HORIZONTAL_ON_RIGHT_PAGES
-        // are replaced by XML_HORIZONTAL_ON_EVEN and XML_HORIZONTAL_ON_ODD.
-        // Usage is deprecated, but the old token are needed for the
-        // OpenOffice.org file format import/export filter for the renaming
+        /* XML_HORIZONTAL_ON_LEFT_PAGES and XML_HORIZONTAL_ON_RIGHT_PAGES
+           are replaced by XML_HORIZONTAL_ON_EVEN and XML_HORIZONTAL_ON_ODD.
+           Usage is deprecated, but the old token are needed for the
+           OpenOffice.org file format import/export filter for the renaming (#i49139#)
+        */
         TOKEN( "horizontal-on-left-pages",        XML_HORIZONTAL_ON_LEFT_PAGES ),
         TOKEN( "horizontal-on-right-pages",       XML_HORIZONTAL_ON_RIGHT_PAGES ),
-        // <--
         TOKEN( "horizontal-pos",                  XML_HORIZONTAL_POS ),
         TOKEN( "horizontal-rel",                  XML_HORIZONTAL_REL ),
         TOKEN( "horizontal-scrollbar-width",      XML_HORIZONTAL_SCROLLBAR_WIDTH ),
@@ -2379,8 +2378,7 @@ namespace xmloff { namespace token {
 
         // OD 2004-05-05 #i28701#
         TOKEN( "wrap-influence-on-position",           XML_WRAP_INFLUENCE_ON_POSITION ),
-        // --> OD 2004-10-18 #i35017# - tokens have been renamed and
-        // <XML_ITERATIVE> has been added
+        // Tokens have been renamed and <XML_ITERATIVE> has been added (#i35017#)
         TOKEN( "once-successive",                       XML_ONCE_SUCCESSIVE ),
         TOKEN( "once-concurrent",                       XML_ONCE_CONCURRENT ),
 
@@ -2893,12 +2891,10 @@ namespace xmloff { namespace token {
 
         TOKEN( "http://www.w3.org/",    XML_URI_W3_PREFIX ),
         TOKEN( "/xforms",               XML_URI_XFORMS_SUFFIX ),
-        // --> OD 2005-05-12 #i49139#
-        // XML_HORIZONTAL_ON_LEFT_PAGES and XML_HORIZONTAL_ON_RIGHT_PAGES
-        // are replaced by XML_HORIZONTAL_ON_EVEN and XML_HORIZONTAL_ON_ODD.
+        /* XML_HORIZONTAL_ON_LEFT_PAGES and XML_HORIZONTAL_ON_RIGHT_PAGES
+           are replaced by XML_HORIZONTAL_ON_EVEN and XML_HORIZONTAL_ON_ODD. (#i49139#)
+        */
         TOKEN( "horizontal-on-even",        XML_HORIZONTAL_ON_EVEN ),
-        // <--
-        // --> OJ 2005-09-01
         TOKEN( "urn:oasis:names:tc:opendocument:xmlns:report:1.0",        XML_N_RPT_OASIS ),
         TOKEN( "http://openoffice.org/2005/report",       XML_N_RPT ),
         TOKEN( "group",       XML_GROUP ),
@@ -2974,15 +2970,11 @@ namespace xmloff { namespace token {
         TOKEN( "odd-rows",              XML_ODD_ROWS        ),
         TOKEN( "even-columns",          XML_EVEN_COLUMNS    ),
         TOKEN( "odd-columns",           XML_ODD_COLUMNS     ),
-
-        // <--
         TOKEN( "horizontal-on-odd",         XML_HORIZONTAL_ON_ODD ),
-        // --> OD 2005-10-10 #i45874#
+        // Password error from 1.4 to 2.0 Beta (#i45874#)
         TOKEN( "restart-numbering",               XML_RESTART_NUMBERING),
-        // <--
-        // -> FLR #i52127#
+        // OpenDocument <text:numbered-paragraph> element not supported on OpenDocument import (#i52127#)
         TOKEN( "numbered-paragraph", XML_NUMBERED_PARAGRAPH),
-        // <--
         TOKEN( "master-detail-fields",  XML_MASTER_DETAIL_FIELDS),
         TOKEN( "master-detail-field",   XML_MASTER_DETAIL_FIELD),
         TOKEN( "sub-document",          XML_SUB_DOCUMENT),
@@ -3040,11 +3032,9 @@ namespace xmloff { namespace token {
         TOKEN( "table-include-filter",         XML_TABLE_INCLUDE_FILTER ),
         TOKEN( "default-row-style-name", XML_DEFAULT_ROW_STYLE_NAME),
         TOKEN( "angle-offset",          XML_ANGLE_OFFSET ),
-        // --> OD 2007-09-14 #i81002#
+        // Core implementation for direct cross-references (#i81002#)
         TOKEN( "number-no-superior", XML_NUMBER_NO_SUPERIOR ),
         TOKEN( "number-all-superior", XML_NUMBER_ALL_SUPERIOR ),
-        // <--
-        // --> OD 2008-01-15 #newlistlevelattrs#
         TOKEN( "list-level-position-and-space-mode", XML_LIST_LEVEL_POSITION_AND_SPACE_MODE ),
         TOKEN( "label-width-and-position",           XML_LABEL_WIDTH_AND_POSITION ),
         TOKEN( "label-alignment",                    XML_LABEL_ALIGNMENT ),
@@ -3054,7 +3044,6 @@ namespace xmloff { namespace token {
         TOKEN( "space",                              XML_SPACE ),
         TOKEN( "nothing",                            XML_NOTHING ),
         TOKEN( "list-tab-stop-position",             XML_LIST_TAB_STOP_POSITION ),
-        // <--
 
         // bm: chart error bar extensions (ODF 1.2)
         TOKEN( "standard-error",        XML_STANDARD_ERROR ),
@@ -3062,12 +3051,10 @@ namespace xmloff { namespace token {
         TOKEN( "error-lower-range",     XML_ERROR_LOWER_RANGE ),
         TOKEN( "error-upper-range",     XML_ERROR_UPPER_RANGE ),
 
-        // --> OD 2008-04-22 #refactorlists#
         TOKEN( "continue-list",         XML_CONTINUE_LIST ),
         TOKEN( "style-override",        XML_STYLE_OVERRIDE ),
-        // <--
-        //
-        // fs: #i90243#
+
+        // XForms: Changes to model should optionally set document's modified state. (#i90243#)
         TOKEN( "xforms-settings",       XML_XFORM_MODEL_SETTINGS ),
 
         // ODF 1.2 metadata
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index c115ff9e3d66..4e930fe81f96 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -1907,8 +1907,8 @@ OUString SvXMLUnitConverter::encodeStyleName(
                                 ->xCharClass =
                                     Reference < XCharacterClassification >(
                                 mxServiceFactory->createInstance(
-                                    OUString::createFromAscii(
-                        "com.sun.star.i18n.CharacterClassification_Unicode") ),
+                                    OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.i18n.CharacterClassification_Unicode")) ),
                                 UNO_QUERY );
 
                             OSL_ENSURE( xCharClass.is(),
diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index 91121fdc7db0..09f34ae27ca3 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -526,11 +526,11 @@ public:
 
     Reference< XInterface > getParagraphTarget( const ParagraphTarget* pTarget ) const;
 
-    void convertPath( OUStringBuffer& sTmp, const Any& rPath );
-    void convertValue( XMLTokenEnum eAttributeName, OUStringBuffer& sTmp, const Any& rValue );
-    void convertTiming( OUStringBuffer& sTmp, const Any& rTiming );
-    void convertSource( OUStringBuffer& sTmp, const Any& rSource );
-    void convertTarget( OUStringBuffer& sTmp, const Any& rTarget );
+    void convertPath( OUStringBuffer& sTmp, const Any& rPath ) const;
+    void convertValue( XMLTokenEnum eAttributeName, OUStringBuffer& sTmp, const Any& rValue ) const;
+    void convertTiming( OUStringBuffer& sTmp, const Any& rTiming ) const;
+    void convertSource( OUStringBuffer& sTmp, const Any& rSource ) const;
+    void convertTarget( OUStringBuffer& sTmp, const Any& rTarget ) const;
 
     void prepareValue( const Any& rValue );
 
@@ -1437,7 +1437,7 @@ Reference< XInterface > AnimationsExporterImpl::getParagraphTarget( const Paragr
     return xRef;
 }
 
-void AnimationsExporterImpl::convertPath( OUStringBuffer& sTmp, const Any& rPath )
+void AnimationsExporterImpl::convertPath( OUStringBuffer& sTmp, const Any& rPath ) const
 {
     OUString aStr;
     rPath >>= aStr;
@@ -1445,7 +1445,7 @@ void AnimationsExporterImpl::convertPath( OUStringBuffer& sTmp, const Any& rPath
     sTmp = aStr;
 }
 
-void AnimationsExporterImpl::convertValue( XMLTokenEnum eAttributeName, OUStringBuffer& sTmp, const Any& rValue )
+void AnimationsExporterImpl::convertValue( XMLTokenEnum eAttributeName, OUStringBuffer& sTmp, const Any& rValue ) const
 {
     if( !rValue.hasValue() )
         return;
@@ -1581,7 +1581,7 @@ void AnimationsExporterImpl::convertValue( XMLTokenEnum eAttributeName, OUString
 */
 }
 
-void AnimationsExporterImpl::convertTiming( OUStringBuffer& sTmp, const Any& rValue )
+void AnimationsExporterImpl::convertTiming( OUStringBuffer& sTmp, const Any& rValue ) const
 {
     if( !rValue.hasValue() )
         return;
@@ -1648,12 +1648,12 @@ void AnimationsExporterImpl::convertTiming( OUStringBuffer& sTmp, const Any& rVa
     }
 }
 
-void AnimationsExporterImpl::convertSource( OUStringBuffer& sTmp, const Any& rSource )
+void AnimationsExporterImpl::convertSource( OUStringBuffer& sTmp, const Any& rSource ) const
 {
     convertTarget( sTmp, rSource );
 }
 
-void AnimationsExporterImpl::convertTarget( OUStringBuffer& sTmp, const Any& rTarget )
+void AnimationsExporterImpl::convertTarget( OUStringBuffer& sTmp, const Any& rTarget ) const
 {
     if( !rTarget.hasValue() )
         return;
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 32ca03b3c653..939c843e9a0e 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -1881,7 +1881,7 @@ void SdXMLExport::SetProgress(sal_Int32 nProg)
 void SdXMLExport::_ExportMeta()
 {
     uno::Sequence<beans::NamedValue> stats(1);
-    stats[0] = beans::NamedValue(::rtl::OUString::createFromAscii("ObjectCount"),
+    stats[0] = beans::NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ObjectCount" )),
                 uno::makeAny(mnObjectCount));
 
     // update document statistics at the model
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index c5958391200f..335a5aa3947d 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -740,8 +740,8 @@ SvXMLImportContext *SdXMLImport::CreateContext(USHORT nPrefix,
     } else if ( (XML_NAMESPACE_OFFICE == nPrefix) &&
                 ( IsXMLToken(rLocalName, XML_DOCUMENT)) ) {
         uno::Reference<xml::sax::XDocumentHandler> xDocBuilder(
-            mxServiceFactory->createInstance(::rtl::OUString::createFromAscii(
-                "com.sun.star.xml.dom.SAXDocumentBuilder")),
+            mxServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.xml.dom.SAXDocumentBuilder"))),
                 uno::UNO_QUERY_THROW);
         uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
             GetModel(), uno::UNO_QUERY_THROW);
@@ -765,8 +765,8 @@ SvXMLImportContext *SdXMLImport::CreateMetaContext(const OUString& rLocalName,
     if (!IsStylesOnlyMode() && (getImportFlags() & IMPORT_META))
     {
         uno::Reference<xml::sax::XDocumentHandler> xDocBuilder(
-            mxServiceFactory->createInstance(::rtl::OUString::createFromAscii(
-                "com.sun.star.xml.dom.SAXDocumentBuilder")),
+            mxServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.xml.dom.SAXDocumentBuilder"))),
                 uno::UNO_QUERY_THROW);
         uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
             GetModel(), uno::UNO_QUERY_THROW);
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx
index c2a6a2797ba2..17cabd288616 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
@@ -35,9 +35,7 @@
 #include <xmloff/xmltkmap.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
 
-#ifndef __SGI_STL_VECTOR
 #include <vector>
-#endif
 #include <xmloff/xmlimp.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 831bc8912e60..b918d3f0a383 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -173,10 +173,10 @@ uno::Reference< drawing::XShape > XMLShapeExport::checkForCustomShapeReplacement
                 {
                     uno::Sequence< uno::Any > aArgument( 1 );
                     uno::Sequence< beans::PropertyValue > aPropValues( 2 );
-                    aPropValues[ 0 ].Name = rtl::OUString::createFromAscii( "CustomShape" );
+                    aPropValues[ 0 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CustomShape" ));
                     aPropValues[ 0 ].Value <<= xShape;
                     sal_Bool bForceGroupWithText = sal_True;
-                    aPropValues[ 1 ].Name = rtl::OUString::createFromAscii( "ForceGroupWithText" );
+                    aPropValues[ 1 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ForceGroupWithText" ));
                     aPropValues[ 1 ].Value <<= bForceGroupWithText;
                     aArgument[ 0 ] <<= aPropValues;
                     uno::Reference< uno::XInterface > xInterface( xFactory->createInstanceWithArguments( aEngine, aArgument ) );
@@ -507,7 +507,6 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap
 
 ///////////////////////////////////////////////////////////////////////
 
-// --> OD 2008-05-08 #refactorlists#
 namespace
 {
     class NewTextListsHelper
@@ -584,9 +583,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
         return;
     }
 
-    // --> OD 2008-05-08 #refactorlists#
     NewTextListsHelper aNewTextListsHelper( mrExport );
-    // <--
 
     const ImplXMLShapeExportInfo& aShapeInfo = aShapeInfoVector[nZIndex];
 
@@ -619,16 +616,13 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
     if( mxAnimationsExporter.is() )
         mxAnimationsExporter->collect( xShape, mrExport );
 
-    // -------------------------------
-    // export shapes name if he has one
-    // --> OD 2006-03-13 #i51726#
-    // Export of the shape name for text documents only if the OpenDocument
-    // file format is written - exceptions are group shapes.
-    // Note: Writer documents in OpenOffice.org file format doesn't contain
-    //       any names for shapes, except for group shapes.
-    // -------------------------------
+    /* Export shapes name if he has one (#i51726#)
+       Export of the shape name for text documents only if the OpenDocument
+       file format is written - exceptions are group shapes.
+       Note: Writer documents in OpenOffice.org file format doesn't contain
+             any names for shapes, except for group shapes.
+    */
     {
-        // --> OD 2006-03-10 #i51726#
         if ( ( GetExport().GetModelType() != SvtModuleOptions::E_WRITER &&
                GetExport().GetModelType() != SvtModuleOptions::E_WRITERWEB &&
                GetExport().GetModelType() != SvtModuleOptions::E_WRITERGLOBAL ) ||
@@ -645,7 +639,6 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
                     mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_NAME, aName );
             }
         }
-        // <--
     }
 
     // ------------------
@@ -692,7 +685,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
             {
                 uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY );
                 OUString aLayerName;
-                xProps->getPropertyValue( OUString::createFromAscii( "LayerName" ) ) >>= aLayerName;
+                xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "LayerName" )) ) >>= aLayerName;
                 mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_LAYER, aLayerName );
 
             }
diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx
index 0c53f5178bfc..5035e069ffbd 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -88,16 +88,17 @@ void XMLShapeExport::ImpExportNewTrans(const uno::Reference< beans::XPropertySet
 void XMLShapeExport::ImpExportNewTrans_GetB2DHomMatrix(::basegfx::B2DHomMatrix& rMatrix,
     const uno::Reference< beans::XPropertySet >& xPropSet)
 {
-    // --> OD 2004-08-09 #i28749# - Get <TransformationInHoriL2R>, if it exist
-    // and if the document is exported into the OpenOffice.org file format.
-    // This property only exists at service com::sun::star::text::Shape - the
-    // Writer UNO service for shapes.
-    // This code is needed, because the positioning attributes in the
-    // OpenOffice.org file format are given in horizontal left-to-right layout
-    // regardless the layout direction the shape is in. In the OASIS Open Office
-    // file format the positioning attributes are correctly given in the layout
-    // direction the shape is in. Thus, this code provides the conversion from
-    // the OASIS Open Office file format to the OpenOffice.org file format.
+    /* Get <TransformationInHoriL2R>, if it exist
+       and if the document is exported into the OpenOffice.org file format.
+       This property only exists at service com::sun::star::text::Shape - the
+       Writer UNO service for shapes.
+       This code is needed, because the positioning attributes in the
+       OpenOffice.org file format are given in horizontal left-to-right layout
+       regardless the layout direction the shape is in. In the OASIS Open Office
+       file format the positioning attributes are correctly given in the layout
+       direction the shape is in. Thus, this code provides the conversion from
+       the OASIS Open Office file format to the OpenOffice.org file format. (#i28749#)
+    */
     uno::Any aAny;
     if ( ( GetExport().getExportFlags() & EXPORT_OASIS ) == 0 &&
          xPropSet->getPropertySetInfo()->hasPropertyByName(
@@ -109,7 +110,6 @@ void XMLShapeExport::ImpExportNewTrans_GetB2DHomMatrix(::basegfx::B2DHomMatrix&
     {
         aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Transformation")));
     }
-    // <--
     drawing::HomogenMatrix3 aMatrix;
     aAny >>= aMatrix;
 
@@ -564,8 +564,8 @@ void XMLShapeExport::ImpExportDescription( const uno::Reference< drawing::XShape
         OUString aDescription;
 
         uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY_THROW );
-        xProps->getPropertyValue( OUString::createFromAscii( "Title" ) ) >>= aTitle;
-        xProps->getPropertyValue( OUString::createFromAscii( "Description" ) ) >>= aDescription;
+        xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "Title" )) ) >>= aTitle;
+        xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "Description" )) ) >>= aDescription;
 
         if(aTitle.getLength())
         {
@@ -1144,7 +1144,7 @@ void XMLShapeExport::ImpExportGraphicObjectShape(
                 {
                     if( aStr[ 0 ] == '#' )
                     {
-                        aStreamURL = OUString::createFromAscii( "vnd.sun.star.Package:" );
+                        aStreamURL = OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" ));
                         aStreamURL = aStreamURL.concat( aStr.copy( 1, aStr.getLength() - 1 ) );
                     }
 
@@ -1286,17 +1286,18 @@ void XMLShapeExport::ImpExportConnectorShape(
     awt::Point aStart(0,0);
     awt::Point aEnd(1,1);
 
-    // --> OD 2004-08-09 #i36248# - Get <StartPositionInHoriL2R> and
-    // <EndPositionInHoriL2R>, if they exist and if the document is exported
-    // into the OpenOffice.org file format.
-    // These properties only exist at service com::sun::star::text::Shape - the
-    // Writer UNO service for shapes.
-    // This code is needed, because the positioning attributes in the
-    // OpenOffice.org file format are given in horizontal left-to-right layout
-    // regardless the layout direction the shape is in. In the OASIS Open Office
-    // file format the positioning attributes are correctly given in the layout
-    // direction the shape is in. Thus, this code provides the conversion from
-    // the OASIS Open Office file format to the OpenOffice.org file format.
+    /* Get <StartPositionInHoriL2R> and
+       <EndPositionInHoriL2R>, if they exist and if the document is exported
+       into the OpenOffice.org file format.
+       These properties only exist at service com::sun::star::text::Shape - the
+       Writer UNO service for shapes.
+       This code is needed, because the positioning attributes in the
+       OpenOffice.org file format are given in horizontal left-to-right layout
+       regardless the layout direction the shape is in. In the OASIS Open Office
+       file format the positioning attributes are correctly given in the layout
+       direction the shape is in. Thus, this code provides the conversion from
+       the OASIS Open Office file format to the OpenOffice.org file format. (#i36248#)
+    */
     if ( ( GetExport().getExportFlags() & EXPORT_OASIS ) == 0 &&
          xProps->getPropertySetInfo()->hasPropertyByName(
             OUString(RTL_CONSTASCII_USTRINGPARAM("StartPositionInHoriL2R"))) &&
@@ -1311,7 +1312,6 @@ void XMLShapeExport::ImpExportConnectorShape(
         xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("StartPosition"))) >>= aStart;
         xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("EndPosition"))) >>= aEnd;
     }
-    // <--
 
     if( pRefPoint )
     {
@@ -1458,17 +1458,18 @@ void XMLShapeExport::ImpExportMeasureShape(
     awt::Point aStart(0,0);
     awt::Point aEnd(1,1);
 
-    // --> OD 2004-08-09 #i36248# - Get <StartPositionInHoriL2R> and
-    // <EndPositionInHoriL2R>, if they exist and if the document is exported
-    // into the OpenOffice.org file format.
-    // These properties only exist at service com::sun::star::text::Shape - the
-    // Writer UNO service for shapes.
-    // This code is needed, because the positioning attributes in the
-    // OpenOffice.org file format are given in horizontal left-to-right layout
-    // regardless the layout direction the shape is in. In the OASIS Open Office
-    // file format the positioning attributes are correctly given in the layout
-    // direction the shape is in. Thus, this code provides the conversion from
-    // the OASIS Open Office file format to the OpenOffice.org file format.
+    /* Get <StartPositionInHoriL2R> and
+       <EndPositionInHoriL2R>, if they exist and if the document is exported
+       into the OpenOffice.org file format.
+       These properties only exist at service com::sun::star::text::Shape - the
+       Writer UNO service for shapes.
+       This code is needed, because the positioning attributes in the
+       OpenOffice.org file format are given in horizontal left-to-right layout
+       regardless the layout direction the shape is in. In the OASIS Open Office
+       file format the positioning attributes are correctly given in the layout
+       direction the shape is in. Thus, this code provides the conversion from
+       the OASIS Open Office file format to the OpenOffice.org file format. (#i36248#)
+    */
     if ( ( GetExport().getExportFlags() & EXPORT_OASIS ) == 0 &&
          xProps->getPropertySetInfo()->hasPropertyByName(
             OUString(RTL_CONSTASCII_USTRINGPARAM("StartPositionInHoriL2R"))) &&
@@ -1483,7 +1484,6 @@ void XMLShapeExport::ImpExportMeasureShape(
         xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("StartPosition"))) >>= aStart;
         xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("EndPosition"))) >>= aEnd;
     }
-    // <--
 
     if( pRefPoint )
     {
@@ -1593,7 +1593,7 @@ void XMLShapeExport::ImpExportOLE2Shape(
                 {
                     // OOo internal links have no storage persistance, URL is stored in the XML file
                     // the result LinkURL is empty in case the object is not a link
-                    xPropSet->getPropertyValue( OUString::createFromAscii( "LinkURL" ) ) >>= sURL;
+                    xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "LinkURL" )) ) >>= sURL;
                 }
 
                 xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "PersistName" ) ) ) >>= sPersistName;
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index 42151808a346..0caa6d361ffe 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -1052,18 +1052,19 @@ void XMLShapeImportHelper::finishShape(
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >&,
         com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >&)
 {
-    // --> OD 2004-08-10 #i28749#, #i36248# - set property <PositionLayoutDir>
-    // to <PositionInHoriL2R>, if it exists and the import states that
-    // the shape positioning attributes are in horizontal left-to-right
-    // layout. This is the case for the OpenOffice.org file format.
-    // This setting is done for Writer documents, because the property
-    // only exists at service com::sun::star::text::Shape - the Writer
-    // UNO service for shapes.
-    // The value indicates that the positioning attributes are given
-    // in horizontal left-to-right layout. The property is evaluated
-    // during the first positioning of the shape in order to convert
-    // the shape position given in the OpenOffice.org file format to
-    // the one for the OASIS Open Office file format.
+    /* Set property <PositionLayoutDir>
+       to <PositionInHoriL2R>, if it exists and the import states that
+       the shape positioning attributes are in horizontal left-to-right
+       layout. This is the case for the OpenOffice.org file format.
+       This setting is done for Writer documents, because the property
+       only exists at service com::sun::star::text::Shape - the Writer
+       UNO service for shapes.
+       The value indicates that the positioning attributes are given
+       in horizontal left-to-right layout. The property is evaluated
+       during the first positioning of the shape in order to convert
+       the shape position given in the OpenOffice.org file format to
+       the one for the OASIS Open Office file format. (#i28749#, #i36248#)
+    */
     uno::Reference< beans::XPropertySet > xPropSet(rShape, uno::UNO_QUERY);
     if ( xPropSet.is() )
     {
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index 74e9c3b4aa4c..87830d8b1e6c 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -425,14 +425,14 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter&
         {
             case IMP_SDXMLEXP_TRANSOBJ2D_ROTATE :
             {
-                aNewString += OUString::createFromAscii("rotate (");
+                aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "rotate (" ));
                 Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DRotate*)pObj)->mfRotate);
                 aNewString += aClosingBrace;
                 break;
             }
             case IMP_SDXMLEXP_TRANSOBJ2D_SCALE      :
             {
-                aNewString += OUString::createFromAscii("scale (");
+                aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "scale (" ));
                 Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DScale*)pObj)->maScale.getX());
                 aNewString += aEmptySpace;
                 Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DScale*)pObj)->maScale.getY());
@@ -441,7 +441,7 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter&
             }
             case IMP_SDXMLEXP_TRANSOBJ2D_TRANSLATE  :
             {
-                aNewString += OUString::createFromAscii("translate (");
+                aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "translate (" ));
                 Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DTranslate*)pObj)->maTranslate.getX(), true);
                 aNewString += aEmptySpace;
                 Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DTranslate*)pObj)->maTranslate.getY(), true);
@@ -450,21 +450,21 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter&
             }
             case IMP_SDXMLEXP_TRANSOBJ2D_SKEWX      :
             {
-                aNewString += OUString::createFromAscii("skewX (");
+                aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "skewX (" ));
                 Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DSkewX*)pObj)->mfSkewX);
                 aNewString += aClosingBrace;
                 break;
             }
             case IMP_SDXMLEXP_TRANSOBJ2D_SKEWY      :
             {
-                aNewString += OUString::createFromAscii("skewY (");
+                aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "skewY (" ));
                 Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DSkewY*)pObj)->mfSkewY);
                 aNewString += aClosingBrace;
                 break;
             }
             case IMP_SDXMLEXP_TRANSOBJ2D_MATRIX :
             {
-                aNewString += OUString::createFromAscii("matrix (");
+                aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "matrix (" ));
 
                 // a
                 Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DMatrix*)pObj)->maMatrix.get(0, 0));
@@ -531,12 +531,12 @@ void SdXMLImExTransform2D::SetString(const OUString& rNew, const SvXMLUnitConver
         const OUString aStr(msString.getStr(), (sal_uInt16)msString.getLength());
         const sal_Int32 nLen(aStr.getLength());
 
-        const OUString aString_rotate(OUString::createFromAscii("rotate"));
-        const OUString aString_scale(OUString::createFromAscii("scale"));
-        const OUString aString_translate(OUString::createFromAscii("translate"));
-        const OUString aString_skewX(OUString::createFromAscii("skewX"));
-        const OUString aString_skewY(OUString::createFromAscii("skewY"));
-        const OUString aString_matrix(OUString::createFromAscii("matrix"));
+        const OUString aString_rotate(RTL_CONSTASCII_USTRINGPARAM( "rotate" ));
+        const OUString aString_scale(RTL_CONSTASCII_USTRINGPARAM( "scale" ));
+        const OUString aString_translate(RTL_CONSTASCII_USTRINGPARAM( "translate" ));
+        const OUString aString_skewX(RTL_CONSTASCII_USTRINGPARAM( "skewX" ));
+        const OUString aString_skewY(RTL_CONSTASCII_USTRINGPARAM( "skewY" ));
+        const OUString aString_matrix(RTL_CONSTASCII_USTRINGPARAM( "matrix" ));
 
         sal_Int32 nPos(0);
 
@@ -901,28 +901,28 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter&
         {
             case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_X   :
             {
-                aNewString += OUString::createFromAscii("rotatex (");
+                aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "rotatex (" ));
                 Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DRotateX*)pObj)->mfRotateX);
                 aNewString += aClosingBrace;
                 break;
             }
             case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Y   :
             {
-                aNewString += OUString::createFromAscii("rotatey (");
+                aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "rotatey (" ));
                 Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DRotateY*)pObj)->mfRotateY);
                 aNewString += aClosingBrace;
                 break;
             }
             case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Z   :
             {
-                aNewString += OUString::createFromAscii("rotatez (");
+                aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "rotatez (" ));
                 Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DRotateZ*)pObj)->mfRotateZ);
                 aNewString += aClosingBrace;
                 break;
             }
             case IMP_SDXMLEXP_TRANSOBJ3D_SCALE      :
             {
-                aNewString += OUString::createFromAscii("scale (");
+                aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "scale (" ));
                 Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DScale*)pObj)->maScale.getX());
                 aNewString += aEmptySpace;
                 Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DScale*)pObj)->maScale.getY());
@@ -933,7 +933,7 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter&
             }
             case IMP_SDXMLEXP_TRANSOBJ3D_TRANSLATE  :
             {
-                aNewString += OUString::createFromAscii("translate (");
+                aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "translate (" ));
                 Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DTranslate*)pObj)->maTranslate.getX(), true);
                 aNewString += aEmptySpace;
                 Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DTranslate*)pObj)->maTranslate.getY(), true);
@@ -944,7 +944,7 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter&
             }
             case IMP_SDXMLEXP_TRANSOBJ3D_MATRIX :
             {
-                aNewString += OUString::createFromAscii("matrix (");
+                aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "matrix (" ));
 
                 // a
                 Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix.get(0, 0));
@@ -1035,12 +1035,12 @@ void SdXMLImExTransform3D::SetString(const OUString& rNew, const SvXMLUnitConver
         const OUString aStr(msString.getStr(), (sal_uInt16)msString.getLength());
         const sal_Int32 nLen(aStr.getLength());
 
-        const OUString aString_rotatex(OUString::createFromAscii("rotatex"));
-        const OUString aString_rotatey(OUString::createFromAscii("rotatey"));
-        const OUString aString_rotatez(OUString::createFromAscii("rotatez"));
-        const OUString aString_scale(OUString::createFromAscii("scale"));
-        const OUString aString_translate(OUString::createFromAscii("translate"));
-        const OUString aString_matrix(OUString::createFromAscii("matrix"));
+        const OUString aString_rotatex(RTL_CONSTASCII_USTRINGPARAM( "rotatex" ));
+        const OUString aString_rotatey(RTL_CONSTASCII_USTRINGPARAM( "rotatey" ));
+        const OUString aString_rotatez(RTL_CONSTASCII_USTRINGPARAM( "rotatez" ));
+        const OUString aString_scale(RTL_CONSTASCII_USTRINGPARAM( "scale" ));
+        const OUString aString_translate(RTL_CONSTASCII_USTRINGPARAM( "translate" ));
+        const OUString aString_matrix(RTL_CONSTASCII_USTRINGPARAM( "matrix" ));
 
         sal_Int32 nPos(0);
 
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index ff3cd686c064..bfe07cfb4c89 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -87,10 +87,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <tools/string.hxx>
 #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
-
-// --> OD 2006-02-22 #b6382898#
 #include <com/sun/star/text/XTextDocument.hpp>
-// <--
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
@@ -503,23 +500,22 @@ void SdXMLShapeContext::AddShape(const char* pServiceName )
     {
         try
         {
-            // --> OD 2006-02-22 #b6382898#
-            // Since fix for issue i33294 the Writer model doesn't support
-            // com.sun.star.drawing.OLE2Shape anymore.
-            // To handle Draw OLE objects it's decided to import these
-            // objects as com.sun.star.drawing.OLE2Shape and convert these
-            // objects after the import into com.sun.star.drawing.GraphicObjectShape.
+            /* Since fix for issue i33294 the Writer model doesn't support
+               com.sun.star.drawing.OLE2Shape anymore.
+               To handle Draw OLE objects it's decided to import these
+               objects as com.sun.star.drawing.OLE2Shape and convert these
+               objects after the import into com.sun.star.drawing.GraphicObjectShape.
+            */
             uno::Reference< drawing::XShape > xShape;
             if ( OUString::createFromAscii(pServiceName).compareToAscii( "com.sun.star.drawing.OLE2Shape" ) == 0 &&
                  uno::Reference< text::XTextDocument >(GetImport().GetModel(), uno::UNO_QUERY).is() )
             {
-                xShape = uno::Reference< drawing::XShape >(xServiceFact->createInstance(OUString::createFromAscii("com.sun.star.drawing.temporaryForXMLImportOLE2Shape")), uno::UNO_QUERY);
+                xShape = uno::Reference< drawing::XShape >(xServiceFact->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.temporaryForXMLImportOLE2Shape"))), uno::UNO_QUERY);
             }
             else
             {
                 xShape = uno::Reference< drawing::XShape >(xServiceFact->createInstance(OUString::createFromAscii(pServiceName)), uno::UNO_QUERY);
             }
-            // <--
             if( xShape.is() )
                 AddShape( xShape );
         }
@@ -1932,7 +1928,35 @@ void SdXMLConnectorShapeContext::StartElement(const uno::Reference< xml::sax::XA
             SetLayer();
 
             if ( maPath.hasValue() )
-                xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("PolyPolygonBezier") ), maPath );
+            {
+                // --> OD #i115492#
+                // Ignore svg:d attribute for text documents created by OpenOffice.org
+                // versions before OOo 3.3, because these OOo versions are storing
+                // svg:d values not using the correct unit.
+                bool bApplySVGD( true );
+                if ( uno::Reference< text::XTextDocument >(GetImport().GetModel(), uno::UNO_QUERY).is() )
+                {
+                    sal_Int32 nUPD( 0 );
+                    sal_Int32 nBuild( 0 );
+                    const bool bBuildIdFound = GetImport().getBuildIds( nUPD, nBuild );
+                    if ( GetImport().IsTextDocInOOoFileFormat() ||
+                         ( bBuildIdFound &&
+                           ( ( nUPD == 641 ) || ( nUPD == 645 ) ||  // prior OOo 2.0
+                             ( nUPD == 680 ) ||                     // OOo 2.x
+                             ( nUPD == 300 ) ||                     // OOo 3.0 - OOo 3.0.1
+                             ( nUPD == 310 ) ||                     // OOo 3.1 - OOo 3.1.1
+                             ( nUPD == 320 ) ) ) )                  // OOo 3.2 - OOo 3.2.1
+                    {
+                        bApplySVGD = false;
+                    }
+                }
+
+                if ( bApplySVGD )
+                {
+                    xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("PolyPolygonBezier") ), maPath );
+                }
+                // <--
+            }
 
             SdXMLShapeContext::StartElement(xAttrList);
         }
diff --git a/xmloff/source/forms/controlpropertymap.cxx b/xmloff/source/forms/controlpropertymap.cxx
index bf3855f466c3..0c6c871bd50c 100644
--- a/xmloff/source/forms/controlpropertymap.cxx
+++ b/xmloff/source/forms/controlpropertymap.cxx
@@ -32,9 +32,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/maptype.hxx>
 #include <xmloff/xmltypes.hxx>
-#ifndef __SGI_STL_ALGORITHM
 #include <algorithm>
-#endif
 #include "strings.hxx"
 #include <xmloff/contextid.hxx>
 #include "controlpropertymap.hxx"
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index bb852ccbbc32..4e035df500ce 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -457,7 +457,7 @@ namespace xmloff
         // no optimization here. If this method gets called, the XML stream did not contain a name for the
         // element, which is a heavy error. So in this case we don't care for performance
         Sequence< ::rtl::OUString > aNames = m_xParentContainer->getElementNames();
-        static const ::rtl::OUString sUnnamedName = ::rtl::OUString::createFromAscii("unnamed");
+        static const ::rtl::OUString sUnnamedName(RTL_CONSTASCII_USTRINGPARAM("unnamed"));
 
         ::rtl::OUString sReturn;
         const ::rtl::OUString* pNames = NULL;
@@ -1443,12 +1443,12 @@ namespace xmloff
             const Reference< sax::XAttributeList >& _rxAttrList)
     {
         // is it the "option" sub tag of a listbox ?
-        static const ::rtl::OUString s_sOptionElementName = ::rtl::OUString::createFromAscii("option");
+        static const ::rtl::OUString s_sOptionElementName(RTL_CONSTASCII_USTRINGPARAM("option"));
         if (s_sOptionElementName == _rLocalName)
             return new OListOptionImport(GetImport(), _nPrefix, _rLocalName, this);
 
         // is it the "item" sub tag of a combobox ?
-        static const ::rtl::OUString s_sItemElementName = ::rtl::OUString::createFromAscii("item");
+        static const ::rtl::OUString s_sItemElementName(RTL_CONSTASCII_USTRINGPARAM("item"));
         if (s_sItemElementName == _rLocalName)
             return new OComboItemImport(GetImport(), _nPrefix, _rLocalName, this);
 
@@ -1655,9 +1655,9 @@ namespace xmloff
         // the label and the value
         const SvXMLNamespaceMap& rMap = GetImport().GetNamespaceMap();
         const ::rtl::OUString sLabelAttribute = rMap.GetQNameByKey(
-            GetPrefix(), ::rtl::OUString::createFromAscii("label"));
+            GetPrefix(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("label")));
         const ::rtl::OUString sValueAttribute = rMap.GetQNameByKey(
-            GetPrefix(), ::rtl::OUString::createFromAscii("value"));
+            GetPrefix(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value")));
 
         // -------------------
         // the label attribute
diff --git a/xmloff/source/forms/eventexport.cxx b/xmloff/source/forms/eventexport.cxx
index 08e475f6bc60..5a6d84f16fea 100644
--- a/xmloff/source/forms/eventexport.cxx
+++ b/xmloff/source/forms/eventexport.cxx
@@ -107,7 +107,7 @@ namespace xmloff
     void SAL_CALL OEventDescriptorMapper::replaceByName( const ::rtl::OUString&, const Any& ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException)
     {
         throw IllegalArgumentException(
-            ::rtl::OUString::createFromAscii("replacing is not implemented for this wrapper class."), static_cast< ::cppu::OWeakObject* >(this), 1);
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("replacing is not implemented for this wrapper class.")), static_cast< ::cppu::OWeakObject* >(this), 1);
     }
 
     //---------------------------------------------------------------------
@@ -116,7 +116,7 @@ namespace xmloff
         ConstMapString2PropertyValueSequenceIterator aPos = m_aMappedEvents.find(_rName);
         if (m_aMappedEvents.end() == aPos)
             throw NoSuchElementException(
-                ::rtl::OUString::createFromAscii("There is no element named ") += _rName,
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("There is no element named ")) += _rName,
                 static_cast< ::cppu::OWeakObject* >(this));
 
         return makeAny(aPos->second);
diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx
index f6e50513aa95..d7bc42e756fd 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -87,7 +87,7 @@ namespace xmloff
     //---------------------------------------------------------------------
     const ::rtl::OUString& OFormLayerXMLExport_Impl::getControlNumberStyleNamePrefix()
     {
-        static const ::rtl::OUString s_sControlNumberStyleNamePrefix = ::rtl::OUString::createFromAscii("C");
+        static const ::rtl::OUString s_sControlNumberStyleNamePrefix(RTL_CONSTASCII_USTRINGPARAM("C"));
         return s_sControlNumberStyleNamePrefix;
     }
 
@@ -776,8 +776,8 @@ namespace xmloff
                 // create it for en-US (does not really matter, as we will specify a locale for every
                 // concrete language to use)
                 Sequence< Any > aSupplierArgs(1);
-                aSupplierArgs[0] <<= Locale (   ::rtl::OUString::createFromAscii("en"),
-                                                ::rtl::OUString::createFromAscii("US"),
+                aSupplierArgs[0] <<= Locale (   ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")),
+                                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")),
                                                 ::rtl::OUString()
                                             );
                 // #110680#
diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx
index 1c78dc98fbe4..288857a7977c 100644
--- a/xmloff/source/meta/MetaExportComponent.cxx
+++ b/xmloff/source/meta/MetaExportComponent.cxx
@@ -125,7 +125,7 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum )
                 // get filter component
                 xDocHandler = uno::Reference< xml::sax::XDocumentHandler >(
                     xFactory->createInstanceWithArguments(
-                        ::rtl::OUString::createFromAscii("com.sun.star.comp.Oasis2OOoTransformer"),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Oasis2OOoTransformer")),
                         aArgs),
                     uno::UNO_QUERY_THROW );
 
diff --git a/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx
index 60c73e560247..08e00b5bf028 100644
--- a/xmloff/source/meta/MetaImportComponent.cxx
+++ b/xmloff/source/meta/MetaImportComponent.cxx
@@ -65,13 +65,13 @@ SvXMLImportContext* XMLMetaImportComponent::CreateContext(
          IsXMLToken(rLocalName, XML_DOCUMENT_META) )
     {
         if (!mxDocProps.is()) {
-            throw uno::RuntimeException(::rtl::OUString::createFromAscii(
+            throw uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "XMLMetaImportComponent::CreateContext: setTargetDocument "
-                "has not been called"), *this);
+                "has not been called")), *this);
         }
         uno::Reference<xml::sax::XDocumentHandler> xDocBuilder(
-            mxServiceFactory->createInstance(::rtl::OUString::createFromAscii(
-                    "com.sun.star.xml.dom.SAXDocumentBuilder")),
+            mxServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.xml.dom.SAXDocumentBuilder"))),
                  uno::UNO_QUERY_THROW);
         return new SvXMLMetaDocumentContext(
                         *this, nPrefix, rLocalName, mxDocProps, xDocBuilder);
@@ -88,9 +88,9 @@ void SAL_CALL XMLMetaImportComponent::setTargetDocument(
 {
     mxDocProps = uno::Reference< document::XDocumentProperties >::query( xDoc );
     if( !mxDocProps.is() )
-        throw lang::IllegalArgumentException(::rtl::OUString::createFromAscii(
+        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "XMLMetaImportComponent::setTargetDocument: argument is no "
-            "XDocumentProperties"), uno::Reference<uno::XInterface>(*this), 0);
+            "XDocumentProperties")), uno::Reference<uno::XInterface>(*this), 0);
 }
 
 uno::Sequence< rtl::OUString > SAL_CALL
diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx
index 97b857320b3a..1776d708a908 100644
--- a/xmloff/source/meta/xmlmetai.cxx
+++ b/xmloff/source/meta/xmlmetai.cxx
@@ -200,9 +200,9 @@ void SvXMLMetaDocumentContext::initDocumentProperties()
         throw;
     } catch (uno::Exception & e) {
         throw lang::WrappedTargetRuntimeException(
-            ::rtl::OUString::createFromAscii(
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "SvXMLMetaDocumentContext::initDocumentProperties: "
-                "properties init exception"),
+                "properties init exception")),
             GetImport(), makeAny(e));
     }
 }
@@ -252,11 +252,11 @@ void SvXMLMetaDocumentContext::setBuildId(::rtl::OUString const& i_rBuildId, con
             (i_rBuildId.compareToAscii(
                 RTL_CONSTASCII_STRINGPARAM("OpenOffice.org 1") ) == 0))
         {
-            sBuildId = OUString::createFromAscii( "645$8687" );
+            sBuildId = OUString(RTL_CONSTASCII_USTRINGPARAM("645$8687"));
         }
         if ((i_rBuildId.compareToAscii( RTL_CONSTASCII_STRINGPARAM("NeoOffice/2") ) == 0) )
         {
-            sBuildId = OUString::createFromAscii( "680$9134" ); // fake NeoOffice as OpenOffice.org 2.2 release
+            sBuildId = OUString(RTL_CONSTASCII_USTRINGPARAM("680$9134")); // fake NeoOffice as OpenOffice.org 2.2 release
         }
     }
 
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index bbb655b75700..351a3ad8130d 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -445,7 +445,7 @@ uno::Sequence< util::RevisionTag > SAL_CALL XMLVersionListPersistence::load( con
             if ( xProps.is() )
             {
                 try {
-                    xProps->getPropertyValue( ::rtl::OUString::createFromAscii( "URL" ) ) >>= aParserInput.sSystemId;
+                    xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) ) >>= aParserInput.sSystemId;
                 }
                 catch( uno::Exception& )
                 {}
@@ -468,7 +468,7 @@ uno::Sequence< util::RevisionTag > SAL_CALL XMLVersionListPersistence::load( con
 
             // get parser
             Reference< XInterface > xXMLParser = xServiceFactory->createInstance(
-                OUString::createFromAscii("com.sun.star.xml.sax.Parser") );
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) );
             DBG_ASSERT( xXMLParser.is(),
                     "XMLReader::Read: com.sun.star.xml.sax.Parser service missing" );
 
diff --git a/xmloff/source/style/prhdlfac.cxx b/xmloff/source/style/prhdlfac.cxx
index fe5e9298b7f3..d82bf6a655e1 100644
--- a/xmloff/source/style/prhdlfac.cxx
+++ b/xmloff/source/style/prhdlfac.cxx
@@ -113,7 +113,7 @@ SvXMLEnumMapEntry __READONLY_DATA aXML_WritingDirection_Enum[] =
 //
 XMLPropertyHandlerFactory::~XMLPropertyHandlerFactory()
 {
-    for( CacheMap::iterator pPos = maHandlerCache.begin(); pPos != maHandlerCache.end(); pPos++ )
+    for( CacheMap::iterator pPos = maHandlerCache.begin(); pPos != maHandlerCache.end(); ++pPos )
         delete pPos->second;
 }
 
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index 0f96e9cd8b2f..b96dc754a5fe 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -31,9 +31,7 @@
 
 
 #include <tools/debug.hxx>
-#ifndef __SGI_STL_SET
 #include <set>
-#endif
 #include "xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlprcon.hxx>
@@ -211,15 +209,15 @@ void XMLPropStyleContext::CreateAndInsert( sal_Bool bOverwrite )
                 {
                     aValues.realloc( nLen + 2 );
                     PropertyValue *pProps = aValues.getArray() + nLen;
-                    pProps->Name = rtl::OUString::createFromAscii("ParaStyleName");
+                    pProps->Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaStyleName"));
                     OUString sParent( GetParentName() );
                     if( sParent.getLength() )
                         sParent = GetImport().GetStyleDisplayName( GetFamily(), sParent );
                     else
-                        sParent =  rtl::OUString::createFromAscii("Standard");
+                        sParent =  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Standard"));
                     pProps->Value <<= sParent;
                     ++pProps;
-                    pProps->Name = rtl::OUString::createFromAscii("ParaConditionalStyleName");
+                    pProps->Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaConditionalStyleName"));
                     pProps->Value <<= sParent;
                 }
 
@@ -228,8 +226,8 @@ void XMLPropStyleContext::CreateAndInsert( sal_Bool bOverwrite )
                 {
                     Sequence< OUString > aPropNames(1);
                     aPropNames[0] = GetFamily() == XML_STYLE_FAMILY_TEXT_PARAGRAPH ?
-                        rtl::OUString::createFromAscii("ParaAutoStyleName") :
-                        rtl::OUString::createFromAscii("CharAutoStyleName");
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParaAutoStyleName")) :
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharAutoStyleName"));
                     Sequence< Any > aAny = xAutoStyle->getPropertyValues( aPropNames );
                     if( aAny.hasElements() )
                     {
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index 29e126fe7310..01ee3a49b008 100644
--- a/xmloff/source/style/styleexp.cxx
+++ b/xmloff/source/style/styleexp.cxx
@@ -76,7 +76,7 @@ XMLStyleExport::XMLStyleExport(
     sIsAutoUpdate( RTL_CONSTASCII_USTRINGPARAM( "IsAutoUpdate" ) ),
     sFollowStyle( RTL_CONSTASCII_USTRINGPARAM( "FollowStyle" ) ),
     sNumberingStyleName( RTL_CONSTASCII_USTRINGPARAM( "NumberingStyleName" ) ),
-    sOutlineLevel( RTL_CONSTASCII_USTRINGPARAM( "OutlineLevel" ) ),//#outline level,add by zhaojianwei
+    sOutlineLevel( RTL_CONSTASCII_USTRINGPARAM( "OutlineLevel" ) ),
     sPoolStyleName( rPoolStyleName ),
     pAutoStylePool( pAutoStyleP  )
 {
@@ -98,7 +98,7 @@ sal_Bool XMLStyleExport::exportStyle(
         const Reference< XStyle >& rStyle,
           const OUString& rXMLFamily,
         const UniReference < SvXMLExportPropertyMapper >& rPropMapper,
-        const Reference< XNameAccess >& xStyles,        //#outline level,add by zhaojianwei
+        const Reference< XNameAccess >& xStyles,
         const OUString* pPrefix )
 {
     Reference< XPropertySet > xPropSet( rStyle, UNO_QUERY );
@@ -176,7 +176,7 @@ sal_Bool XMLStyleExport::exportStyle(
                                       XML_TRUE );
     }
 
-    // style:default-outline-level"..." //#outline level, add by zhaojianwei.0802
+    // style:default-outline-level"..."
     sal_Int32 nOutlineLevel = 0;
     if( xPropSetInfo->hasPropertyByName( sOutlineLevel ) )
     {
@@ -195,12 +195,11 @@ sal_Bool XMLStyleExport::exportStyle(
             }
             else
             {
-                // --> OD 2009-12-29 #i104889#
-                // empty value for style:default-outline-level does exist
-                // since ODF 1.2. Thus, suppress its export for former versions.
+                /* Empty value for style:default-outline-level does exist
+                   since ODF 1.2. Thus, suppress its export for former versions. (#i104889#)
+                */
                 if ( ( GetExport().getExportFlags() & EXPORT_OASIS ) != 0 &&
                      GetExport().getDefaultVersion() >= SvtSaveOptions::ODFVER_012 )
-                // <--
                 {
                     GetExport().AddAttribute( XML_NAMESPACE_STYLE,
                                               XML_DEFAULT_OUTLINE_LEVEL,
@@ -208,7 +207,7 @@ sal_Bool XMLStyleExport::exportStyle(
                 }
             }
         }
-    }//<-end,zhaojianwei
+    }
 
     // style:list-style-name="..." (SW paragarph styles only)
     if( xPropSetInfo->hasPropertyByName( sNumberingStyleName ) )
@@ -223,10 +222,10 @@ sal_Bool XMLStyleExport::exportStyle(
                 OUString sListName;
                 aAny >>= sListName;
 
-                // --> OD 2006-09-21 #i69523#
-                // An direct set empty list style has to be written. Otherwise,
-                // this information is lost and causes an error, if the parent
-                // style has a list style set.
+                /* An direct set empty list style has to be written. Otherwise,
+                   this information is lost and causes an error, if the parent
+                   style has a list style set. (#i69523#)
+                */
                 if ( !sListName.getLength() )
                 {
                     GetExport().AddAttribute( XML_NAMESPACE_STYLE,
@@ -235,7 +234,7 @@ sal_Bool XMLStyleExport::exportStyle(
                 }
                 else
                 {
-                    // --> OD 2006-09-27 #i69627#
+                    // Written OpenDocument file format doesn't fit to the created text document (#i69627#)
                     bool bSuppressListStyle( false );
                     {
                         if ( !GetExport().writeOutlineStyleAsNormalListStyle() )
@@ -264,17 +263,14 @@ sal_Bool XMLStyleExport::exportStyle(
                     }
 
                     if ( sListName.getLength() && !bSuppressListStyle )
-                    // <--
                     {
                         GetExport().AddAttribute( XML_NAMESPACE_STYLE,
                                                   XML_LIST_STYLE_NAME,
                                   GetExport().EncodeStyleName( sListName ) );
                     }
                 }
-                // <--
             }
         }
-        //#outline level, add by zhaojianwei.0802
         else if( nOutlineLevel > 0 )
         {
 
@@ -314,10 +310,8 @@ sal_Bool XMLStyleExport::exportStyle(
                                           XML_LIST_STYLE_NAME,
                                           OUString( RTL_CONSTASCII_USTRINGPARAM( "" )));
         }
-        //<-end,zhaojianwei
     }
 
-
     // style:pool-id="..." is not required any longer since we use
     // english style names only
     exportStyleAttributes( rStyle );
diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx
index 42b04d32a2b8..af4fcaba8f3c 100644
--- a/xmloff/source/style/xmlbahdl.cxx
+++ b/xmloff/source/style/xmlbahdl.cxx
@@ -539,13 +539,13 @@ sal_Bool XMLColorPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue,
         Sequence< double > aHSL;
         if( (rValue >>= aHSL) && (aHSL.getLength() == 3) )
         {
-            aOut.append( OUString::createFromAscii("hsl(") );
+            aOut.append( OUString(RTL_CONSTASCII_USTRINGPARAM("hsl(")) );
             aOut.append( aHSL[0] );
-            aOut.append( OUString::createFromAscii(",") );
+            aOut.append( OUString(RTL_CONSTASCII_USTRINGPARAM(",")) );
             aOut.append( aHSL[1] * 100.0 );
-            aOut.append( OUString::createFromAscii("%,") );
+            aOut.append( OUString(RTL_CONSTASCII_USTRINGPARAM("%,")) );
             aOut.append( aHSL[2] * 100.0 );
-            aOut.append( OUString::createFromAscii("%)") );
+            aOut.append( OUString(RTL_CONSTASCII_USTRINGPARAM("%)")) );
             rStrExpValue = aOut.makeStringAndClear();
 
             bRet = sal_True;
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx
index 480b89e8d126..e3d33647e9b6 100644
--- a/xmloff/source/style/xmlnume.cxx
+++ b/xmloff/source/style/xmlnume.cxx
@@ -39,10 +39,8 @@
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <com/sun/star/text/XChapterNumberingSupplier.hpp>
-// --> OD 2008-01-16 #newlistlevelattrs#
 #include <com/sun/star/text/PositionAndSpaceMode.hpp>
 #include <com/sun/star/text/LabelFollow.hpp>
-// <--
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
@@ -91,13 +89,11 @@ static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_FIRST_LINE_OFFSET[] = "FirstL
 static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_BULLET_FONT[] = "BulletFont";
 static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_GRAPHICURL[] = "GraphicURL";
 static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_START_WITH[] = "StartWith";
-// --> OD 2008-01-15 #newlistlevelattrs#
 static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_POSITION_AND_SPACE_MODE[] = "PositionAndSpaceMode";
 static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_LABEL_FOLLOWED_BY[] = "LabelFollowedBy";
 static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_LISTTAB_STOP_POSITION[] = "ListtabStopPosition";
 static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_FIRST_LINE_INDENT[] = "FirstLineIndent";
 static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_INDENT_AT[] = "IndentAt";
-// <--
 
 void SvxXMLNumRuleExport::exportLevelStyles( const uno::Reference< ::com::sun::star::container::XIndexReplace > & xNumRule,
                                              sal_Bool bOutline )
@@ -140,13 +136,11 @@ void SvxXMLNumRuleExport::exportLevelStyle( INT32 nLevel,
     sal_Int32 nImageWidth = 0, nImageHeight = 0;
     sal_Int16 eImageVertOrient = VertOrientation::LINE_CENTER;
 
-    // --> OD 2008-01-15 #newlistlevelattrs#
     sal_Int16 ePosAndSpaceMode = PositionAndSpaceMode::LABEL_WIDTH_AND_POSITION;
     sal_Int16 eLabelFollowedBy = LabelFollow::LISTTAB;
     sal_Int32 nListtabStopPosition( 0 );
     sal_Int32 nFirstLineIndent( 0 );
     sal_Int32 nIndentAt( 0 );
-    // <--
 
     const sal_Int32 nCount = rProps.getLength();
     const beans::PropertyValue* pPropArray = rProps.getConstArray();
@@ -251,7 +245,6 @@ void SvxXMLNumRuleExport::exportLevelStyle( INT32 nLevel,
             rProp.Value >>= nValue;
             eImageVertOrient = nValue;
         }
-        // --> OD 2008-01-16 #newlistlevelattrs#
         else if( rProp.Name.equalsAsciiL( XML_UNO_NAME_NRULE_POSITION_AND_SPACE_MODE,
                                           sizeof(XML_UNO_NAME_NRULE_POSITION_AND_SPACE_MODE)-1 ) )
         {
@@ -281,7 +274,6 @@ void SvxXMLNumRuleExport::exportLevelStyle( INT32 nLevel,
         {
             rProp.Value >>= nIndentAt;
         }
-        // <--
     }
 
     if( bOutline && (NumberingType::CHAR_SPECIAL == eType ||
@@ -388,19 +380,9 @@ void SvxXMLNumRuleExport::exportLevelStyle( INT32 nLevel,
         SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, eElem,
                                   sal_True, sal_True );
 
-        // --> OD 2008-01-16 #newlistlevelattrs#
         OUStringBuffer sBuffer;
         if ( ePosAndSpaceMode == PositionAndSpaceMode::LABEL_WIDTH_AND_POSITION )
         {
-            // --> OD 2008-06-05 #i89178#
-            // optimization of XML stream size:
-            // suppress export of property list-level-position-and-space-mode,
-            // if its value is "label-width-and-position" - its the default value
-//            GetExport().AddAttribute( XML_NAMESPACE_TEXT,
-//                                      XML_LIST_LEVEL_POSITION_AND_SPACE_MODE,
-//                                      XML_LABEL_WIDTH_AND_POSITION );
-            // <--
-
             nSpaceBefore += nMinLabelWidth;
             nMinLabelWidth = -nMinLabelWidth;
             if( nSpaceBefore != 0 )
@@ -422,18 +404,16 @@ void SvxXMLNumRuleExport::exportLevelStyle( INT32 nLevel,
                               sBuffer.makeStringAndClear() );
             }
         }
-        // --> OD 2008-06-06 #i89178#
-        // check, if properties for position-and-space-mode LABEL_ALIGNMENT
-        // are allowed to be exported.
+        /* Check, if properties for position-and-space-mode LABEL_ALIGNMENT
+           are allowed to be exported. (#i89178#)
+        */
         else if ( ePosAndSpaceMode == PositionAndSpaceMode::LABEL_ALIGNMENT &&
                   mbExportPositionAndSpaceModeLabelAlignment )
-        // <--
         {
             GetExport().AddAttribute( XML_NAMESPACE_TEXT,
                                       XML_LIST_LEVEL_POSITION_AND_SPACE_MODE,
                                       XML_LABEL_ALIGNMENT );
         }
-        // <--
         if( HoriOrientation::LEFT != eAdjust )
         {
             enum XMLTokenEnum eValue = XML_TOKEN_INVALID;
@@ -509,18 +489,15 @@ void SvxXMLNumRuleExport::exportLevelStyle( INT32 nLevel,
             }
         }
 
-        // --> OD 2008-01-16 #newlistlevelattrs#
-//        if( GetExport().GetAttrList().getLength() > 0 )
         {
             SvXMLElementExport aElement( GetExport(), XML_NAMESPACE_STYLE,
                                       XML_LIST_LEVEL_PROPERTIES, sal_True, sal_True );
 
-            // --> OD 2008-06-06 #i89178#
-            // check, if properties for position-and-space-mode LABEL_ALIGNMENT
-            // are allowed to be exported.
+            /* Check, if properties for position-and-space-mode LABEL_ALIGNMENT
+               are allowed to be exported. (#i89178#)
+            */
             if ( ePosAndSpaceMode == PositionAndSpaceMode::LABEL_ALIGNMENT &&
                  mbExportPositionAndSpaceModeLabelAlignment )
-            // <--
             {
                 enum XMLTokenEnum eValue = XML_LISTTAB;
                 if ( eLabelFollowedBy == LabelFollow::SPACE )
@@ -564,7 +541,6 @@ void SvxXMLNumRuleExport::exportLevelStyle( INT32 nLevel,
                                              sal_True, sal_True );
             }
         }
-        // <--
 
         if( NumberingType::CHAR_SPECIAL == eType )
         {
@@ -675,9 +651,8 @@ SvxXMLNumRuleExport::SvxXMLNumRuleExport( SvXMLExport& rExp ) :
     sNumberingRules( RTL_CONSTASCII_USTRINGPARAM( "NumberingRules" ) ),
     sIsPhysical( RTL_CONSTASCII_USTRINGPARAM( "IsPhysical" ) ),
     sIsContinuousNumbering( RTL_CONSTASCII_USTRINGPARAM( "IsContinuousNumbering" ) ),
-    // --> OD 2008-06-06 #i89178#
+    // Let list style creation depend on Load/Save option "ODF format version" (#i89178#)
     mbExportPositionAndSpaceModeLabelAlignment( true )
-    // <--
 {
     switch ( GetExport().getDefaultVersion() )
     {
@@ -698,57 +673,6 @@ SvxXMLNumRuleExport::~SvxXMLNumRuleExport()
 {
 }
 
-// --> OD 2008-06-17 #i90780#
-// refactoring: removing unused methods
-//void SvxXMLNumRuleExport::Export( const OUString& rName,
-//                                sal_Bool bContNumbering )
-//{
-//  GetExport().CheckAttrList();
-
-//  // style:name="..."
-//  if( rName.getLength() )
-//  {
-//      sal_Bool bEncoded = sal_False;
-//      GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_NAME,
-//                        GetExport().EncodeStyleName( rName, &bEncoded ) );
-//      if( bEncoded )
-//          GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_DISPLAY_NAME,
-//                                   rName);
-//  }
-
-//  // text:consecutive-numbering="..."
-//  if( bContNumbering )
-//      GetExport().AddAttribute( XML_NAMESPACE_TEXT, XML_CONSECUTIVE_NUMBERING,
-//                         XML_TRUE );
-
-//  // other application specific attributes
-//  AddListStyleAttributes();
-
-//  OUString sElem = GetExport().GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_TEXT,
-//                                 GetXMLToken(XML_LIST_STYLE) );
-//  GetExport().IgnorableWhitespace();
-//  GetExport().StartElement( XML_NAMESPACE_TEXT, XML_LIST_STYLE, sal_False );
-
-//  uno::Reference< ::com::sun::star::container::XIndexReplace >  xNumRule = GetUNONumRule();
-//  if( xNumRule.is() )
-//      exportLevelStyles( xNumRule );
-
-//  GetExport().EndElement( XML_NAMESPACE_TEXT, XML_LIST_STYLE, sal_True );
-//}
-
-//void SvxXMLNumRuleExport::ExportOutline()
-//{
-//  GetExport().IgnorableWhitespace( );
-//  GetExport().StartElement( XML_NAMESPACE_TEXT, XML_OUTLINE_STYLE, sal_False );
-
-//  uno::Reference< ::com::sun::star::container::XIndexReplace >  xNumRule = GetUNONumRule();
-//  if( xNumRule.is() )
-//      exportLevelStyles( xNumRule, sal_True );
-
-//  GetExport().EndElement( XML_NAMESPACE_TEXT, XML_OUTLINE_STYLE, sal_True );
-//}
-// <--
-
 void SvxXMLNumRuleExport::exportNumberingRule(
         const OUString& rName,
         const Reference< XIndexReplace >& rNumRule )
@@ -833,9 +757,9 @@ void SvxXMLNumRuleExport::exportOutline()
 
         if( xNumRule.is() )
         {
-            // --> OD 2008-06-17 #i90780#
-            // Outline style has property style:name since ODF 1.2
-            // Thus, export this property and adjust fix for issue #i69627#
+            /* Outline style has property style:name since ODF 1.2
+               Thus, export this property and adjust fix for issue #i69627# (#i90780#)
+            */
             OUString sOutlineStyleName;
             {
                 Reference<XPropertySet> xNumRulePropSet(
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 28c5acad2f18..7acf0d4eccab 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -248,7 +248,7 @@ SvXMLNumFmtExport::SvXMLNumFmtExport(
             SvXMLExport& rExp,
             const uno::Reference< util::XNumberFormatsSupplier >& rSupp ) :
     rExport( rExp ),
-    sPrefix( OUString::createFromAscii( "N" ) ),
+    sPrefix( OUString(RTL_CONSTASCII_USTRINGPARAM("N")) ),
     pFormatter( NULL ),
     pCharClass( NULL ),
     pLocaleData( NULL )
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 32610072b572..29af3031488c 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -893,7 +893,7 @@ void lcl_EnquoteIfNecessary( rtl::OUStringBuffer& rContent, const SvXMLNumFormat
         {
             // A quote is turned into "\"" - a quote to end quoted text, an escaped quote,
             // and a quote to resume quoting.
-            rtl::OUString aInsert( rtl::OUString::createFromAscii( "\"\\\"" ) );
+            rtl::OUString aInsert( RTL_CONSTASCII_USTRINGPARAM( "\"\\\"" ) );
 
             sal_Int32 nPos = 0;
             while ( nPos < rContent.getLength() )
@@ -1233,7 +1233,7 @@ void SvXMLNumFmtElementContext::EndElement()
             {
                 rParent.AddNumber( aNumInfo );      // simple number
 
-                rParent.AddToCode( OUString::createFromAscii( "E+" ) );
+                rParent.AddToCode( OUString(RTL_CONSTASCII_USTRINGPARAM("E+")) );
                 for (sal_Int32 i=0; i<aNumInfo.nExpDigits; i++)
                     rParent.AddToCode( OUString::valueOf((sal_Unicode)'0') );
             }
@@ -1246,74 +1246,6 @@ void SvXMLNumFmtElementContext::EndElement()
 
 //-------------------------------------------------------------------------
 
-sal_Bool SvXMLNumFmtDefaults::IsSystemLongDay( const SvtSysLocale&, BOOL bLong )
-{
-    // TODO: merge system information and defaults into i18n locale data
-#if 0
-    return bLong ? rIntn.IsLongDateDayLeadingZero() : rIntn.IsDateDayLeadingZero();
-#else
-    return !bLong;
-#endif
-}
-
-sal_Bool SvXMLNumFmtDefaults::IsSystemLongMonth( const SvtSysLocale&, BOOL bLong )
-{
-    // TODO: merge system information and defaults into i18n locale data
-#if 0
-    if (bLong)
-    {
-        MonthFormat eMonth = rIntn.GetLongDateMonthFormat();
-        return ( eMonth == MONTH_ZERO || eMonth == MONTH_LONG );
-    }
-    else
-        return rIntn.IsDateMonthLeadingZero();
-#else
-    return !bLong;
-#endif
-}
-
-sal_Bool SvXMLNumFmtDefaults::IsSystemTextualMonth( const SvtSysLocale&, BOOL bLong )
-{
-    // TODO: merge system information and defaults into i18n locale data
-#if 0
-    if (bLong)
-    {
-        MonthFormat eMonth = rIntn.GetLongDateMonthFormat();
-        return ( eMonth == MONTH_SHORT || eMonth == MONTH_LONG );
-    }
-    else
-        return sal_False;
-#else
-    return bLong;
-#endif
-}
-
-sal_Bool SvXMLNumFmtDefaults::IsSystemLongYear( const SvtSysLocale&, BOOL bLong )
-{
-    // TODO: merge system information and defaults into i18n locale data
-#if 0
-    return bLong ? rIntn.IsLongDateCentury() : rIntn.IsDateCentury();
-#else
-    return bLong;
-#endif
-}
-
-sal_Bool SvXMLNumFmtDefaults::IsSystemLongEra( const SvtSysLocale& rSysLoc, BOOL bLong )
-{
-    // TODO: merge system information and defaults into i18n locale data
-    return IsSystemLongYear( rSysLoc, bLong );      // no separate setting
-}
-
-sal_Bool SvXMLNumFmtDefaults::IsSystemLongDayOfWeek( const SvtSysLocale&, BOOL bLong )
-{
-    // TODO: merge system information and defaults into i18n locale data
-#if 0
-    return ( bLong && rIntn.GetLongDateDayOfWeekFormat() == DAYOFWEEK_LONG );
-#else
-    return bLong && true;
-#endif
-}
-
 sal_uInt16 SvXMLNumFmtDefaults::GetDefaultDateFormat( SvXMLDateElementAttributes eDOW,
                 SvXMLDateElementAttributes eDay, SvXMLDateElementAttributes eMonth,
                 SvXMLDateElementAttributes eYear, SvXMLDateElementAttributes eHours,
@@ -2104,7 +2036,7 @@ void SvXMLNumFormatContext::AddCondition( const sal_Int32 nIndex )
     rtl::OUString rCondition = aMyConditions[nIndex].sCondition;
     SvNumberFormatter* pFormatter = pData->GetNumberFormatter();
     sal_uInt32 l_nKey = pData->GetKeyForName( rApplyName );
-    OUString sValue = OUString::createFromAscii( "value()" );       //! define constant
+    OUString sValue(RTL_CONSTASCII_USTRINGPARAM("value()"));        //! define constant
     sal_Int32 nValLen = sValue.getLength();
 
     if ( pFormatter && l_nKey != NUMBERFORMAT_ENTRY_NOT_FOUND &&
@@ -2154,7 +2086,7 @@ void SvXMLNumFormatContext::AddCondition( const sal_Int32 nIndex )
 void SvXMLNumFormatContext::AddCondition( const sal_Int32 nIndex, const rtl::OUString& rFormat, const LocaleDataWrapper& rData )
 {
     rtl::OUString rCondition = aMyConditions[nIndex].sCondition;
-    OUString sValue = OUString::createFromAscii( "value()" );       //! define constant
+    OUString sValue(RTL_CONSTASCII_USTRINGPARAM("value()"));        //! define constant
     sal_Int32 nValLen = sValue.getLength();
 
     if ( rCondition.copy( 0, nValLen ) == sValue )
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index 854604060ed1..9fbd84ea7cd9 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -35,10 +35,8 @@
 #include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
-// --> OD 2008-01-16 #newlistlevelattrs#
 #include <com/sun/star/text/PositionAndSpaceMode.hpp>
 #include <com/sun/star/text/LabelFollow.hpp>
-// <--
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/style/XStyle.hpp>
@@ -110,13 +108,11 @@ static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_BULLET_FONT[] = "BulletFont";
 static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_GRAPHICURL[] = "GraphicURL";
 static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_START_WITH[] = "StartWith";
 static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_BULLET_COLOR[] = "BulletColor";
-// --> OD 2008-01-15 #newlistlevelattrs#
 static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_POSITION_AND_SPACE_MODE[] = "PositionAndSpaceMode";
 static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_LABEL_FOLLOWED_BY[] = "LabelFollowedBy";
 static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_LISTTAB_STOP_POSITION[] = "ListtabStopPosition";
 static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_FIRST_LINE_INDENT[] = "FirstLineIndent";
 static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_INDENT_AT[] = "IndentAt";
-// <--
 
 // ---------------------------------------------------------------------
 
@@ -135,16 +131,13 @@ public:
             SvxXMLListLevelStyleContext_Impl& rLLevel   );
     virtual ~SvxXMLListLevelStyleAttrContext_Impl();
 
-    // --> OD 2008-01-16 #newlistlevelattrs#
     virtual SvXMLImportContext *CreateChildContext(
             sal_uInt16 nPrefix, const OUString& rLocalName,
             const Reference< xml::sax::XAttributeList > & xAttrList );
-    // <--
 };
 
 // ---------------------------------------------------------------------
 
-// --> OD 2008-01-16 #newlistlevelattrs#
 class SvxXMLListLevelStyleLabelAlignmentAttrContext_Impl : public SvXMLImportContext
 {
     SvxXMLListLevelStyleContext_Impl&   rListLevel;
@@ -158,7 +151,6 @@ public:
             SvxXMLListLevelStyleContext_Impl& rLLevel   );
     virtual ~SvxXMLListLevelStyleLabelAlignmentAttrContext_Impl();
 };
-// <--
 
 // ---------------------------------------------------------------------
 
@@ -242,13 +234,11 @@ class SvxXMLListLevelStyleContext_Impl : public SvXMLImportContext
     sal_Int16           nRelSize;
     Color               aColor;
 
-    // --> OD 2008-01-16 #newlistlevelattrs#
     sal_Int16           ePosAndSpaceMode;
     sal_Int16           eLabelFollowedBy;
     sal_Int32           nListtabStopPosition;
     sal_Int32           nFirstLineIndent;
     sal_Int32           nIndentAt;
-    // <--
 
     sal_Bool            bBullet : 1;
     sal_Bool            bImage : 1;
@@ -291,7 +281,6 @@ public:
     Sequence<beans::PropertyValue> GetProperties(
             const SvI18NMap *pI18NMap=0 );
 
-    // --> OD 2008-01-16 #newlistlevelattrs#
     inline void SetPosAndSpaceMode( sal_Int16 eValue )
     {
         ePosAndSpaceMode = eValue;
@@ -312,7 +301,6 @@ public:
     {
         nIndentAt = nValue;
     }
-    // <--
 };
 
 SvxXMLListLevelStyleContext_Impl::SvxXMLListLevelStyleContext_Impl(
@@ -323,7 +311,7 @@ SvxXMLListLevelStyleContext_Impl::SvxXMLListLevelStyleContext_Impl(
 :   SvXMLImportContext( rImport, nPrfx, rLName )
 ,   sStarBats( RTL_CONSTASCII_USTRINGPARAM( "StarBats" ) )
 ,   sStarMath( RTL_CONSTASCII_USTRINGPARAM( "StarMath" ) )
-,   sNumFormat( OUString::createFromAscii( "1" ) )
+,   sNumFormat( OUString(RTL_CONSTASCII_USTRINGPARAM("1")) )
 ,   nLevel( -1L )
 ,   nSpaceBefore( 0L )
 ,   nMinLabelWidth( 0L )
@@ -340,13 +328,11 @@ SvxXMLListLevelStyleContext_Impl::SvxXMLListLevelStyleContext_Impl(
 ,   cBullet( 0 )
 ,   nRelSize(0)
 ,   aColor( 0 )
-// --> OD 2008-01-16 #newlistelevelattrs#
 ,   ePosAndSpaceMode( PositionAndSpaceMode::LABEL_WIDTH_AND_POSITION )
 ,   eLabelFollowedBy( LabelFollow::LISTTAB )
 ,   nListtabStopPosition( 0 )
 ,   nFirstLineIndent( 0 )
 ,   nIndentAt( 0 )
-// <--
 ,   bBullet( sal_False )
 ,   bImage( sal_False )
 ,   bNum( sal_False )
@@ -511,50 +497,48 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
         beans::PropertyValue *pProps = aPropSeq.getArray();
         sal_Int32 nPos = 0L;
         pProps[nPos].Name =
-                OUString::createFromAscii( XML_UNO_NAME_NRULE_NUMBERINGTYPE );
+                OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_NUMBERINGTYPE ));
         pProps[nPos++].Value <<= (sal_Int16)eType ;
 
-        pProps[nPos].Name = OUString::createFromAscii( XML_UNO_NAME_NRULE_PREFIX );
+        pProps[nPos].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_PREFIX ));
         pProps[nPos++].Value <<= sPrefix;
 
-        pProps[nPos].Name = OUString::createFromAscii( XML_UNO_NAME_NRULE_SUFFIX );
+        pProps[nPos].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_SUFFIX ));
         pProps[nPos++].Value <<= sSuffix;
 
-        pProps[nPos].Name = OUString::createFromAscii( XML_UNO_NAME_NRULE_ADJUST );
+        pProps[nPos].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_ADJUST ));
         pProps[nPos++].Value <<= eAdjust;
 
         sal_Int32 nLeftMargin = nSpaceBefore + nMinLabelWidth;
         pProps[nPos].Name =
-            OUString::createFromAscii( XML_UNO_NAME_NRULE_LEFT_MARGIN );
+            OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_LEFT_MARGIN ));
         pProps[nPos++].Value <<= (sal_Int32)nLeftMargin;
 
         sal_Int32 nFirstLineOffset = -nMinLabelWidth;
 
         pProps[nPos].Name =
-                OUString::createFromAscii( XML_UNO_NAME_NRULE_FIRST_LINE_OFFSET );
+                OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_FIRST_LINE_OFFSET ));
         pProps[nPos++].Value <<= (sal_Int32)nFirstLineOffset;
 
         pProps[nPos].Name =
-            OUString::createFromAscii(XML_UNO_NAME_NRULE_SYMBOL_TEXT_DISTANCE);
+            OUString(RTL_CONSTASCII_USTRINGPARAM(XML_UNO_NAME_NRULE_SYMBOL_TEXT_DISTANCE));
         pProps[nPos++].Value <<= (sal_Int16)nMinLabelDist;
 
-        // --> OD 2008-01-16 #newlistlevelattrs#
         pProps[nPos].Name =
-            OUString::createFromAscii(XML_UNO_NAME_NRULE_POSITION_AND_SPACE_MODE);
+            OUString(RTL_CONSTASCII_USTRINGPARAM(XML_UNO_NAME_NRULE_POSITION_AND_SPACE_MODE));
         pProps[nPos++].Value <<= (sal_Int16)ePosAndSpaceMode;
         pProps[nPos].Name =
-            OUString::createFromAscii(XML_UNO_NAME_NRULE_LABEL_FOLLOWED_BY);
+            OUString(RTL_CONSTASCII_USTRINGPARAM(XML_UNO_NAME_NRULE_LABEL_FOLLOWED_BY));
         pProps[nPos++].Value <<= (sal_Int16)eLabelFollowedBy;
         pProps[nPos].Name =
-            OUString::createFromAscii(XML_UNO_NAME_NRULE_LISTTAB_STOP_POSITION);
+            OUString(RTL_CONSTASCII_USTRINGPARAM(XML_UNO_NAME_NRULE_LISTTAB_STOP_POSITION));
         pProps[nPos++].Value <<= (sal_Int32)nListtabStopPosition;
         pProps[nPos].Name =
-            OUString::createFromAscii(XML_UNO_NAME_NRULE_FIRST_LINE_INDENT);
+            OUString(RTL_CONSTASCII_USTRINGPARAM(XML_UNO_NAME_NRULE_FIRST_LINE_INDENT));
         pProps[nPos++].Value <<= (sal_Int32)nFirstLineIndent;
         pProps[nPos].Name =
-            OUString::createFromAscii(XML_UNO_NAME_NRULE_INDENT_AT);
+            OUString(RTL_CONSTASCII_USTRINGPARAM(XML_UNO_NAME_NRULE_INDENT_AT));
         pProps[nPos++].Value <<= (sal_Int32)nIndentAt;
-        // <--
 
         OUString sDisplayTextStyleName = GetImport().GetStyleDisplayName(
                                 XML_STYLE_FAMILY_TEXT_TEXT, sTextStyleName  );
@@ -562,7 +546,7 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
         if( sStyleName.getLength() && pI18NMap )
             sStyleName = pI18NMap->Get( SFX_STYLE_FAMILY_CHAR, sStyleName );
         pProps[nPos].Name =
-                OUString::createFromAscii( XML_UNO_NAME_NRULE_CHAR_STYLE_NAME );
+                OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_CHAR_STYLE_NAME ));
         pProps[nPos++].Value <<= sDisplayTextStyleName;
 
         if( bBullet )
@@ -598,12 +582,12 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
                 OUStringBuffer sTmp(1);
                 sTmp.append( cBullet );
                 pProps[nPos].Name =
-                        OUString::createFromAscii( XML_UNO_NAME_NRULE_BULLET_CHAR );
+                        OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_BULLET_CHAR ));
                 pProps[nPos++].Value <<= sTmp.makeStringAndClear();
             }
 
             pProps[nPos].Name =
-                    OUString::createFromAscii( XML_UNO_NAME_NRULE_BULLET_FONT );
+                    OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_BULLET_FONT ));
             pProps[nPos++].Value <<= aFDesc;
 
         }
@@ -625,41 +609,41 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
             if( sStr.getLength() )
             {
                 pProps[nPos].Name =
-                        OUString::createFromAscii( XML_UNO_NAME_NRULE_GRAPHICURL );
+                        OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_GRAPHICURL ));
                 pProps[nPos++].Value <<= sStr;
             }
 
             awt::Size aSize( nImageWidth, nImageHeight );
             pProps[nPos].Name =
-                OUString::createFromAscii( XML_UNO_NAME_NRULE_GRAPHIC_SIZE );
+                OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_GRAPHIC_SIZE ));
             pProps[nPos++].Value <<= aSize;
 
             pProps[nPos].Name =
-                OUString::createFromAscii( XML_UNO_NAME_NRULE_VERT_ORIENT );
+                OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_VERT_ORIENT ));
             pProps[nPos++].Value <<= (sal_Int16)eImageVertOrient;
         }
 
         if( bNum )
         {
             pProps[nPos].Name =
-                    OUString::createFromAscii( XML_UNO_NAME_NRULE_START_WITH );
+                    OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_START_WITH ));
             pProps[nPos++].Value <<= (sal_Int16)nNumStartValue;
 
             pProps[nPos].Name =
-                OUString::createFromAscii(XML_UNO_NAME_NRULE_PARENT_NUMBERING);
+                OUString(RTL_CONSTASCII_USTRINGPARAM(XML_UNO_NAME_NRULE_PARENT_NUMBERING));
             pProps[nPos++].Value <<= (sal_Int16)nNumDisplayLevels;
         }
 
         if( ( bNum || bBullet ) && nRelSize )
         {
             pProps[nPos].Name =
-                OUString::createFromAscii( XML_UNO_NAME_NRULE_BULLET_RELSIZE );
+                OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_BULLET_RELSIZE ));
             pProps[nPos++].Value <<= nRelSize;
         }
 
         if( !bImage && bHasColor )
         {
-            pProps[nPos].Name = OUString::createFromAscii( XML_UNO_NAME_NRULE_BULLET_COLOR );
+            pProps[nPos].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_BULLET_COLOR ));
             pProps[nPos++].Value <<= (sal_Int32)aColor.GetColor();
         }
 
@@ -690,10 +674,7 @@ enum SvxXMLStyleAttributesAttrTokens
     XML_TOK_STYLE_ATTRIBUTES_ATTR_COLOR,
     XML_TOK_STYLE_ATTRIBUTES_ATTR_WINDOW_FONT_COLOR,
     XML_TOK_STYLE_ATTRIBUTES_ATTR_FONT_SIZE,
-    // --> OD 2008-01-16 #newlistlevelattrs#
     XML_TOK_STYLE_ATTRIBUTES_ATTR_POSITION_AND_SPACE_MODE,
-    // <--
-
     XML_TOK_STYLE_ATTRIBUTES_ATTR_END=XML_TOK_UNKNOWN
 };
 const SvXMLTokenMapEntry* lcl_getStyleAttributesAttrTokenMap()
@@ -734,11 +715,8 @@ const SvXMLTokenMapEntry* lcl_getStyleAttributesAttrTokenMap()
                 XML_TOK_STYLE_ATTRIBUTES_ATTR_WINDOW_FONT_COLOR },
         { XML_NAMESPACE_FO, XML_FONT_SIZE,
                 XML_TOK_STYLE_ATTRIBUTES_ATTR_FONT_SIZE },
-        // --> OD 2008-01-16 #newlistlevelattrs#
         { XML_NAMESPACE_TEXT, XML_LIST_LEVEL_POSITION_AND_SPACE_MODE,
                 XML_TOK_STYLE_ATTRIBUTES_ATTR_POSITION_AND_SPACE_MODE },
-        // <--
-
         XML_TOKEN_MAP_END
     };
     return aStyleAttributesAttrTokenMap;
@@ -843,7 +821,6 @@ SvxXMLListLevelStyleAttrContext_Impl::SvxXMLListLevelStyleAttrContext_Impl(
             if(SvXMLUnitConverter::convertPercent( nVal, rValue ) )
                 rListLevel.SetRelSize( (sal_Int16)nVal );
             break;
-        // --> OD 2008-01-16 #newlistlevelattrs#
         case XML_TOK_STYLE_ATTRIBUTES_ATTR_POSITION_AND_SPACE_MODE:
             {
                 sal_Int16 ePosAndSpaceMode = PositionAndSpaceMode::LABEL_WIDTH_AND_POSITION;
@@ -852,7 +829,6 @@ SvxXMLListLevelStyleAttrContext_Impl::SvxXMLListLevelStyleAttrContext_Impl(
                 rListLevel.SetPosAndSpaceMode( ePosAndSpaceMode );
             }
             break;
-        // <--
         }
     }
 
@@ -990,7 +966,6 @@ SvxXMLListLevelStyleAttrContext_Impl::~SvxXMLListLevelStyleAttrContext_Impl()
 {
 }
 
-// --> OD 2008-01-16 #newlistlevelattrs#
 SvXMLImportContext* SvxXMLListLevelStyleAttrContext_Impl::CreateChildContext(
         sal_uInt16 nPrefix, const OUString& rLocalName,
         const Reference< xml::sax::XAttributeList > & xAttrList )
@@ -1012,11 +987,9 @@ SvXMLImportContext* SvxXMLListLevelStyleAttrContext_Impl::CreateChildContext(
 
     return pContext;
 }
-// <--
 
 // ---------------------------------------------------------------------
 
-// --> OD 2008-01-16 #newlistlevelattrs#
 enum SvxXMLStyleAttributesLabelAlignmentAttrTokens
 {
     XML_TOK_STYLE_ATTRIBUTES_ATTR_LABEL_FOLLOWED_BY,
@@ -1096,7 +1069,6 @@ SvxXMLListLevelStyleLabelAlignmentAttrContext_Impl::SvxXMLListLevelStyleLabelAli
 SvxXMLListLevelStyleLabelAlignmentAttrContext_Impl::~SvxXMLListLevelStyleLabelAlignmentAttrContext_Impl()
 {
 }
-// <--
 
 // ---------------------------------------------------------------------
 
@@ -1370,7 +1342,7 @@ void SvxXMLListStyleContext::SetDefaultStyle(
     beans::PropertyValue *pProps = aPropSeq.getArray();
 
     pProps->Name =
-                OUString::createFromAscii( XML_UNO_NAME_NRULE_NUMBERINGTYPE );
+                OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_NUMBERINGTYPE ));
     (pProps++)->Value <<= (sal_Int16)(bOrdered ? NumberingType::ARABIC
                                                  : NumberingType::CHAR_SPECIAL );
     if( !bOrdered )
@@ -1391,16 +1363,16 @@ void SvxXMLListStyleContext::SetDefaultStyle(
         aFDesc.Weight = WEIGHT_DONTKNOW;
         //aFDesc.Transparant = sal_True;
         pProps->Name =
-                    OUString::createFromAscii( XML_UNO_NAME_NRULE_BULLET_FONT );
+                    OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_BULLET_FONT ));
         (pProps++)->Value <<= aFDesc;
 
         OUStringBuffer sTmp(1);
         sTmp.append( (sal_Unicode)(0xF000 + 149) );
         pProps->Name =
-                    OUString::createFromAscii( XML_UNO_NAME_NRULE_BULLET_CHAR );
+                    OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_BULLET_CHAR ));
         (pProps++)->Value <<= sTmp.makeStringAndClear();
         pProps->Name =
-                OUString::createFromAscii( XML_UNO_NAME_NRULE_CHAR_STYLE_NAME );
+                OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_CHAR_STYLE_NAME ));
         (pProps++)->Value <<=
             OUString( RTL_CONSTASCII_USTRINGPARAM( "Numbering Symbols" ) );
     }
diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx
index 6ea5e4e66528..ddbe3853beba 100644
--- a/xmloff/source/text/XMLAutoTextEventExport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.cxx
@@ -158,7 +158,7 @@ sal_uInt32 XMLAutoTextEventExport::exportDoc( enum XMLTokenEnum )
                 // get filter component
                 Reference< xml::sax::XDocumentHandler > xTmpDocHandler(
                     xFactory->createInstanceWithArguments(
-                    OUString::createFromAscii("com.sun.star.comp.Oasis2OOoTransformer"),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Oasis2OOoTransformer")),
                                 aArgs), UNO_QUERY);
                 OSL_ENSURE( xTmpDocHandler.is(),
                     "can't instantiate OASIS transformer component" );
diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
index 72f8a9492c9b..c98f6e1fe25a 100644
--- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
@@ -343,11 +343,8 @@ SvXMLImportContext *XMLFootnoteConfigurationImportContext::CreateChildContext(
     return pContext;
 }
 
-
-// --> OD 2005-01-31 #i40597# - rename method <CreateAndInsertLate(..)> to
-// <Finish(..)>
+// Rename method <CreateAndInsertLate(..)> to <Finish(..)> (#i40597#)
 void XMLFootnoteConfigurationImportContext::Finish( sal_Bool bOverwrite )
-// <--
 {
 
     if (bOverwrite)
diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
index 3575b60cc6df..4db52729120d 100644
--- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx
@@ -145,7 +145,9 @@ void XMLIndexChapterInfoEntryContext::StartElement(
     if (bChapterInfoOK)
     {
         nValues++;
-        // --> OD 2008-06-26 #i89791#
+        /* Some of the index chapter information attributes written to ODF 1.1
+           and 1.2 don't reflect the displaying (#i89791#)
+        */
         if ( !bTOC )
         {
             bool bConvert( false );
diff --git a/xmloff/source/text/XMLIndexTOCStylesContext.hxx b/xmloff/source/text/XMLIndexTOCStylesContext.hxx
index 26f89681e413..d027b30ec5aa 100644
--- a/xmloff/source/text/XMLIndexTOCStylesContext.hxx
+++ b/xmloff/source/text/XMLIndexTOCStylesContext.hxx
@@ -32,10 +32,7 @@
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/uno/Reference.h>
 
-#ifndef __SGI_STL_VECTOR
 #include <vector>
-#endif
-
 
 namespace com { namespace sun { namespace star {
     namespace xml { namespace sax { class XAttributeList; } }
diff --git a/xmloff/source/text/XMLPropertyBackpatcher.hxx b/xmloff/source/text/XMLPropertyBackpatcher.hxx
index 55e6577c6dda..42f2009f25e0 100644
--- a/xmloff/source/text/XMLPropertyBackpatcher.hxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.hxx
@@ -30,13 +30,8 @@
 #ifndef _XMLOFF_XMLPROPERTYBACKPATCHER_HXX
 #define _XMLOFF_XMLPROPERTYBACKPATCHER_HXX
 
-#ifndef __SGI_STL_MAP
 #include <map>
-#endif
-
-#ifndef __SGI_STL_VECTOR
 #include <vector>
-#endif
 #include <comphelper/stl_types.hxx>
 
 namespace rtl { class OUString; }
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index c9a14591be8f..f86d2b791d00 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -121,7 +121,7 @@ inline XMLTextFrameContextHyperlink_Impl::XMLTextFrameContextHyperlink_Impl(
 {
 }
 
-// --> OD 2009-07-22 #i73249#
+// Implement Title/Description Elements UI (#i73249#)
 class XMLTextFrameTitleOrDescContext_Impl : public SvXMLImportContext
 {
     OUString&   mrTitleOrDesc;
@@ -159,7 +159,6 @@ void XMLTextFrameTitleOrDescContext_Impl::Characters( const OUString& rText )
 {
     mrTitleOrDesc += rText;
 }
-// <--
 
 // ------------------------------------------------------------------------
 
@@ -383,11 +382,8 @@ class XMLTextFrameContext_Impl : public SvXMLImportContext
     const ::rtl::OUString sAnchorPageNo;
     const ::rtl::OUString sGraphicURL;
     const ::rtl::OUString sGraphicFilter;
-    // --> OD 2009-07-22 #i73249#
-//    const ::rtl::OUString sAlternativeText;
     const ::rtl::OUString sTitle;
     const ::rtl::OUString sDescription;
-    // <--
     const ::rtl::OUString sFrameStyleName;
     const ::rtl::OUString sGraphicRotation;
     const ::rtl::OUString sTextBoxServiceName;
@@ -463,9 +459,10 @@ public:
                        const ::rtl::OUString& rName,
                        const ::rtl::OUString& rTargetFrameName,
                        sal_Bool bMap );
-    // --> OD 2009-07-22 #i73249#
+
+    // Implement Title/Description Elements UI (#i73249#)
     void SetTitle( const ::rtl::OUString& rTitle );
-    // <--
+
     void SetDesc( const ::rtl::OUString& rDesc );
 
     ::com::sun::star::text::TextContentAnchorType GetAnchorType() const { return eAnchorType; }
@@ -834,11 +831,8 @@ XMLTextFrameContext_Impl::XMLTextFrameContext_Impl(
 ,   sAnchorPageNo(RTL_CONSTASCII_USTRINGPARAM("AnchorPageNo"))
 ,   sGraphicURL(RTL_CONSTASCII_USTRINGPARAM("GraphicURL"))
 ,   sGraphicFilter(RTL_CONSTASCII_USTRINGPARAM("GraphicFilter"))
-// --> OD 2009-07-22 #i73249#
-//,   sAlternativeText(RTL_CONSTASCII_USTRINGPARAM("AlternativeText"))
 ,   sTitle(RTL_CONSTASCII_USTRINGPARAM("Title"))
 ,   sDescription(RTL_CONSTASCII_USTRINGPARAM("Description"))
-// <--
 ,   sFrameStyleName(RTL_CONSTASCII_USTRINGPARAM("FrameStyleName"))
 ,   sGraphicRotation(RTL_CONSTASCII_USTRINGPARAM("GraphicRotation"))
 ,   sTextBoxServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFrame"))
@@ -1145,15 +1139,13 @@ SvXMLImportContext *XMLTextFrameContext_Impl::CreateChildContext(
             }
         }
     }
-    // --> OD 2009-08-17 #i100480#
-    // correction of condition which also avoids warnings.
+    // Correction of condition which also avoids warnings. (#i100480#)
     if( !pContext &&
         ( XML_TEXT_FRAME_OBJECT == nType &&
           ( ( XML_NAMESPACE_OFFICE == nPrefix &&
               IsXMLToken( rLocalName, XML_DOCUMENT ) ) ||
             ( XML_NAMESPACE_MATH == nPrefix &&
               IsXMLToken( rLocalName, XML_MATH ) ) ) ) )
-    // <--
     {
         if( !xPropSet.is() && !bCreateFailed )
         {
@@ -1283,7 +1275,7 @@ void XMLTextFrameContext_Impl::SetHyperlink( const OUString& rHRef,
     }
 }
 
-// --> OD 2009-07-22 #i73249#
+// Implement Title/Description Elements UI (#i73249#)
 void XMLTextFrameContext_Impl::SetTitle( const OUString& rTitle )
 {
     if ( xPropSet.is() )
@@ -1307,7 +1299,6 @@ void XMLTextFrameContext_Impl::SetDesc( const OUString& rDesc )
         }
     }
 }
-// <--
 
 //-----------------------------------------------------------------------------------------------------
 
@@ -1346,14 +1337,12 @@ XMLTextFrameContext::XMLTextFrameContext(
 :   SvXMLImportContext( rImport, nPrfx, rLName )
 ,   m_xAttrList( new SvXMLAttributeList( xAttrList ) )
 ,   m_pHyperlink( 0 )
-// --> OD 2009-07-22 #i73249#
+    // Implement Title/Description Elements UI (#i73249#)
 ,   m_sTitle()
 ,   m_sDesc()
-// <--
 ,   m_eDefaultAnchorType( eATyp )
-    // --> OD 2006-03-10 #i51726#
+    // Shapes in Writer cannot be named via context menu (#i51726#)
 ,   m_HasAutomaticStyleWithoutParentStyle( sal_False )
-    // <--
 ,   m_bSupportsReplacement( sal_False )
 {
     sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -1364,9 +1353,8 @@ XMLTextFrameContext::XMLTextFrameContext(
         OUString aLocalName;
         sal_uInt16 nPrefix =
             GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName );
-        // --> OD 2006-03-10 #i51726#
         // New distinguish attribute between Writer objects and Draw objects is:
-        // Draw objects have an automatic style without a parent style
+        // Draw objects have an automatic style without a parent style (#i51726#)
         if ( XML_NAMESPACE_DRAW == nPrefix &&
              IsXMLToken( aLocalName, XML_STYLE_NAME ) )
         {
@@ -1383,7 +1371,6 @@ XMLTextFrameContext::XMLTextFrameContext(
                 }
             }
         }
-        // <--
         else if ( XML_NAMESPACE_TEXT == nPrefix &&
                   IsXMLToken( aLocalName, XML_ANCHOR_TYPE ) )
         {
@@ -1412,11 +1399,6 @@ void XMLTextFrameContext::EndElement()
     {
         pImpl->CreateIfNotThere();
 
-        // --> OD 2009-07-22 #i73249#
-//        // alternative text
-//        if( m_sDesc.getLength() )
-//            pImpl->SetDesc( m_sDesc );
-        // svg:title
         if( m_sTitle.getLength() )
         {
             pImpl->SetTitle( m_sTitle );
@@ -1425,7 +1407,6 @@ void XMLTextFrameContext::EndElement()
         {
             pImpl->SetDesc( m_sDesc );
         }
-        // <--
 
         if( m_pHyperlink )
         {
@@ -1468,11 +1449,10 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext(
 
             if( USHRT_MAX != nFrameType )
             {
-                // --> OD 2006-03-10 #i51726#
+                // Shapes in Writer cannot be named via context menu (#i51726#)
                 if ( ( XML_TEXT_FRAME_TEXTBOX == nFrameType ||
                        XML_TEXT_FRAME_GRAPHIC == nFrameType ) &&
                      m_HasAutomaticStyleWithoutParentStyle )
-                // <--
                 {
                     Reference < XShapes > xShapes;
                     pContext = GetImport().GetShapeImport()->CreateFrameChildContext(
@@ -1543,11 +1523,7 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext(
         // the child is a writer frame
         if( XML_NAMESPACE_SVG == p_nPrefix )
         {
-            // --> OD 2009-07-22 #i73249#
-//            bool bOld = SvXMLImport::OOo_2x >= GetImport().getGeneratorVersion();
-//            if( IsXMLToken( rLocalName, bOld ? XML_DESC : XML_TITLE ) )
-//                pContext = new XMLTextFrameDescContext_Impl( GetImport(), p_nPrefix, rLocalName,
-//                                                         xAttrList, m_sDesc );
+            // Implement Title/Description Elements UI (#i73249#)
             const bool bOld = SvXMLImport::OOo_2x >= GetImport().getGeneratorVersion();
             if ( bOld )
             {
@@ -1576,7 +1552,6 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext(
                                                                         m_sDesc );
                 }
             }
-            // <--
         }
         else if( XML_NAMESPACE_DRAW == p_nPrefix )
         {
@@ -1666,7 +1641,6 @@ Reference < XTextContent > XMLTextFrameContext::GetTextContent() const
     return xTxtCntnt;
 }
 
-// --> OD 2004-08-24 #33242#
 Reference < XShape > XMLTextFrameContext::GetShape() const
 {
     Reference < XShape > xShape;
@@ -1679,6 +1653,5 @@ Reference < XShape > XMLTextFrameContext::GetShape() const
 
     return xShape;
 }
-// <--
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLTextFrameContext.hxx b/xmloff/source/text/XMLTextFrameContext.hxx
index 4cbe9c6dcc1d..1168bf3ffc1d 100644
--- a/xmloff/source/text/XMLTextFrameContext.hxx
+++ b/xmloff/source/text/XMLTextFrameContext.hxx
@@ -49,20 +49,19 @@ class XMLTextFrameContext : public SvXMLImportContext
     SvXMLAttributeList *m_pAttrList;
 
     XMLTextFrameContextHyperlink_Impl   *m_pHyperlink;
-    // --> OD 2009-07-22 #i73249#
+    // Implement Title/Description Elements UI (#i73249#)
     ::rtl::OUString m_sTitle;
-    // <--
     ::rtl::OUString m_sDesc;
 
     ::com::sun::star::text::TextContentAnchorType   m_eDefaultAnchorType;
 
-    // --> OD 2006-03-10 #i51726#
-    // The <draw:name> can longer be used to distinguish Writer graphic/text box
-    // objects and Draw graphic/text box objects.
-    // The new distinguish attribute is the parent style of the automatic style
-    // of the object. All Draw objects have an automatic style without a parent style.
+    /* The <draw:name> can longer be used to distinguish Writer graphic/text box
+       objects and Draw graphic/text box objects.
+       The new distinguish attribute is the parent style of the automatic style
+       of the object. All Draw objects have an automatic style without a parent style.
+       (#i51726#)
+    */
     sal_Bool m_HasAutomaticStyleWithoutParentStyle;
-    // <--
     sal_Bool m_bSupportsReplacement;
 
     sal_Bool CreateIfNotThere();
@@ -97,10 +96,10 @@ public:
 
     ::com::sun::star::uno::Reference <
         ::com::sun::star::text::XTextContent > GetTextContent() const;
-    // --> OD 2004-08-24 #i33242#
+
+    // Frame "to character": anchor moves from first to last char after saving (#i33242#)
     ::com::sun::star::uno::Reference <
         ::com::sun::star::drawing::XShape > GetShape() const;
-    // <--
 };
 
 
diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
index 879ac97dee5c..63acce770c49 100644
--- a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
+++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
@@ -172,7 +172,7 @@ Reference < XTextContent > XMLTextFrameHyperlinkContext::GetTextContent() const
     return xTxt;
 }
 
-// --> OD 2004-08-24 #33242#
+// Frame "to character": anchor moves from first to last char after saving (#i33242#)
 Reference < drawing::XShape > XMLTextFrameHyperlinkContext::GetShape() const
 {
     Reference < drawing::XShape > xShape;
@@ -184,7 +184,5 @@ Reference < drawing::XShape > XMLTextFrameHyperlinkContext::GetShape() const
 
     return xShape;
 }
-// <--
-
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
index b60c6b70bfdc..0ba1ca1c9523 100644
--- a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
+++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
@@ -70,12 +70,13 @@ public:
                     ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
 
     ::com::sun::star::text::TextContentAnchorType GetAnchorType() const;
+
     ::com::sun::star::uno::Reference <
         ::com::sun::star::text::XTextContent > GetTextContent() const;
-    // --> OD 2004-08-24 #i33242#
+
+    // Frame "to character": anchor moves from first to last char after saving (#i33242#)
     ::com::sun::star::uno::Reference <
         ::com::sun::star::drawing::XShape > GetShape() const;
-    // <--
 };
 
 
diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
index 4470094bae70..3de0e70bfc52 100644
--- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx
+++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
@@ -61,12 +61,12 @@ XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( SvXMLImport& rImport, sa
                        sal_Bool bFooter, sal_Bool bLft ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
     xPropSet( rPageStylePropSet ),
-    sOn( OUString::createFromAscii( bFooter ? "FooterIsOn" : "HeaderIsOn" ) ),
-    sShareContent( OUString::createFromAscii( bFooter ? "FooterIsShared"
-                                                      : "HeaderIsShared" ) ),
-    sText( OUString::createFromAscii( bFooter ? "FooterText" : "HeaderText" ) ),
-    sTextLeft( OUString::createFromAscii( bFooter ? "FooterTextLeft"
-                                                     : "HeaderTextLeft" ) ),
+    sOn( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM( "FooterIsOn" )) : OUString(RTL_CONSTASCII_USTRINGPARAM( "HeaderIsOn" )) ),
+    sShareContent( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM( "FooterIsShared" ))
+                                                      : OUString(RTL_CONSTASCII_USTRINGPARAM( "HeaderIsShared" )) ),
+    sText( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM( "FooterText" )) : OUString(RTL_CONSTASCII_USTRINGPARAM( "HeaderText" )) ),
+    sTextLeft( bFooter ?  OUString(RTL_CONSTASCII_USTRINGPARAM( "FooterTextLeft" ))
+                                                     : OUString(RTL_CONSTASCII_USTRINGPARAM( "HeaderTextLeft" )) ),
     bInsertContent( sal_True ),
     bLeft( bLft )
 {
diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx b/xmloff/source/text/XMLTextListBlockContext.cxx
index 490bd153e312..2e6c2eca70c2 100644
--- a/xmloff/source/text/XMLTextListBlockContext.cxx
+++ b/xmloff/source/text/XMLTextListBlockContext.cxx
@@ -65,20 +65,13 @@ XMLTextListBlockContext::XMLTextListBlockContext(
         const sal_Bool bRestartNumberingAtSubList )
 :   SvXMLImportContext( rImport, nPrfx, rLName )
 ,   mrTxtImport( rTxtImp )
-// --> OD 2008-04-22 #refactorlists#
 ,   msListStyleName()
-// <--
 ,   mxParentListBlock( )
 ,   mnLevel( 0 )
-// --> OD 2008-05-07 #refactorlists#
-//,   mbRestartNumbering( sal_True )
 ,   mbRestartNumbering( sal_False )
-// <--
 ,   mbSetDefaults( sal_False )
-// --> OD 2008-04-22 #refactorlists#
 ,   msListId()
 ,   msContinueListId()
-// <--
 {
     static ::rtl::OUString s_PropNameDefaultListId(
         RTL_CONSTASCII_USTRINGPARAM("DefaultListId"));
@@ -93,9 +86,7 @@ XMLTextListBlockContext::XMLTextListBlockContext(
     // Inherit style name from parent list, as well as the flags whether
     // numbering must be restarted and formats have to be created.
     OUString sParentListStyleName;
-    // --> OD 2008-11-27 #158694#
     sal_Bool bParentRestartNumbering( sal_False );
-    // <--
     if( mxParentListBlock.Is() )
     {
         XMLTextListBlockContext *pParent =
@@ -104,26 +95,17 @@ XMLTextListBlockContext::XMLTextListBlockContext(
         sParentListStyleName = msListStyleName;
         mxNumRules = pParent->GetNumRules();
         mnLevel = pParent->GetLevel() + 1;
-        // --> OD 2008-05-07 #refactorlists#
-//        mbRestartNumbering = pParent->IsRestartNumbering();
         mbRestartNumbering = pParent->IsRestartNumbering() ||
                              bRestartNumberingAtSubList;
-        // <--
-        // --> OD 2008-11-27 #158694#
         bParentRestartNumbering = pParent->IsRestartNumbering();
-        // <--
         mbSetDefaults = pParent->mbSetDefaults;
-        // --> OD 2008-04-22 #refactorlists#
         msListId = pParent->GetListId();
         msContinueListId = pParent->GetContinueListId();
-        // <--
     }
 
     const SvXMLTokenMap& rTokenMap = mrTxtImport.GetTextListBlockAttrTokenMap();
 
-    // --> OD 2008-05-07 #refactorlists#
     bool bIsContinueNumberingAttributePresent( false );
-    // <--
     sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
     for( sal_Int16 i=0; i < nAttrCount; i++ )
     {
@@ -139,23 +121,19 @@ XMLTextListBlockContext::XMLTextListBlockContext(
         case XML_TOK_TEXT_LIST_BLOCK_XMLID:
             sXmlId = rValue;
 //FIXME: there is no UNO API for lists
-            // --> OD 2008-07-31 #i92221# - xml:id is also the list ID
+            // xml:id is also the list ID (#i92221#)
             if ( mnLevel == 0 ) // root <list> element
             {
                 msListId = rValue;
             }
-            // <--
             break;
         case XML_TOK_TEXT_LIST_BLOCK_CONTINUE_NUMBERING:
             mbRestartNumbering = !IsXMLToken(rValue, XML_TRUE);
-            // --> OD 2008-05-07 #refactorlists#
             bIsContinueNumberingAttributePresent = true;
-            // <--
             break;
         case XML_TOK_TEXT_LIST_BLOCK_STYLE_NAME:
             msListStyleName = rValue;
             break;
-        // --> OD 2008-04-22 #refactorlists#
         case XML_TOK_TEXT_LIST_BLOCK_CONTINUE_LIST:
             if ( mnLevel == 0 ) // root <list> element
             {
@@ -171,11 +149,10 @@ XMLTextListBlockContext::XMLTextListBlockContext(
     if( !mxNumRules.is() )
         return;
 
-    // --> OD 2008-04-23 #refactorlists#
     if ( mnLevel == 0 ) // root <list> element
     {
         XMLTextListsHelper& rTextListsHelper( mrTxtImport.GetTextListHelper() );
-        // --> OD 2008-08-15 #i92811#
+        // Inconsistent behavior regarding lists (#i92811#)
         ::rtl::OUString sListStyleDefaultListId;
         {
             uno::Reference< beans::XPropertySet > xNumRuleProps( mxNumRules, UNO_QUERY );
@@ -194,7 +171,6 @@ XMLTextListBlockContext::XMLTextListBlockContext(
                 }
             }
         }
-        // <--
         if ( msListId.getLength() == 0 )  // no text:id property found
         {
             sal_Int32 nUPD( 0 );
@@ -203,9 +179,10 @@ XMLTextListBlockContext::XMLTextListBlockContext(
             if ( rImport.IsTextDocInOOoFileFormat() ||
                  ( bBuildIdFound && nUPD == 680 ) )
             {
-                // handling former documents written by OpenOffice.org:
-                // use default list id of numbering rules instance, if existing
-                // --> OD 2008-08-15 #i92811#
+                /* handling former documents written by OpenOffice.org:
+                   use default list id of numbering rules instance, if existing
+                   (#i92811#)
+                */
                 if ( sListStyleDefaultListId.getLength() != 0 )
                 {
                     msListId = sListStyleDefaultListId;
@@ -216,7 +193,6 @@ XMLTextListBlockContext::XMLTextListBlockContext(
                         mbRestartNumbering = sal_True;
                     }
                 }
-                // <--
             }
             if ( msListId.getLength() == 0 )
             {
@@ -260,14 +236,12 @@ XMLTextListBlockContext::XMLTextListBlockContext(
 
         if ( !rTextListsHelper.IsListProcessed( msListId ) )
         {
-            // --> OD 2008-08-15 #i92811#
+            // Inconsistent behavior regarding lists (#i92811#)
             rTextListsHelper.KeepListAsProcessed(
                 msListId, msListStyleName, msContinueListId,
                 sListStyleDefaultListId );
-            // <--
         }
     }
-    // <--
 
     // Remember this list block.
     mrTxtImport.GetTextListHelper().PushListContext( this );
@@ -323,7 +297,6 @@ SvXMLImportContext *XMLTextListBlockContext::CreateChildContext(
     return pContext;
 }
 
-// --> OD 2008-04-22 #refactorlists#
 const ::rtl::OUString& XMLTextListBlockContext::GetListId() const
 {
     return msListId;
@@ -333,6 +306,5 @@ const ::rtl::OUString& XMLTextListBlockContext::GetContinueListId() const
 {
     return msContinueListId;
 }
-// <--
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLTextListBlockContext.hxx b/xmloff/source/text/XMLTextListBlockContext.hxx
index 301aa2d8d1ab..ba47769abc94 100644
--- a/xmloff/source/text/XMLTextListBlockContext.hxx
+++ b/xmloff/source/text/XMLTextListBlockContext.hxx
@@ -51,18 +51,15 @@ class XMLTextListBlockContext : public SvXMLImportContext
     sal_Bool                mbRestartNumbering;
     sal_Bool                mbSetDefaults;
 
-    // --> OD 2008-04-22 #refactorlists#
     // text:id property of <list> element, only valid for root <list> element
     ::rtl::OUString msListId;
     // text:continue-list property of <list> element, only valid for root <list> element
     ::rtl::OUString msContinueListId;
-    // <--
 
 public:
 
     TYPEINFO();
 
-    // --> OD 2008-05-07 #refactorlists#
     // add optional parameter <bRestartNumberingAtSubList>
     XMLTextListBlockContext(
                 SvXMLImport& rImport,
@@ -72,7 +69,6 @@ public:
                 const ::com::sun::star::uno::Reference<
                     ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
                 const sal_Bool bRestartNumberingAtSubList = sal_False );
-    // <--
     virtual ~XMLTextListBlockContext();
 
     virtual void EndElement();
@@ -91,11 +87,8 @@ public:
         ::com::sun::star::container::XIndexReplace >& GetNumRules() const
         { return mxNumRules; }
 
-    // --> OD 2008-04-22 #refactorlists#
     const ::rtl::OUString& GetListId() const;
     const ::rtl::OUString& GetContinueListId() const;
-    // <--
-
 };
 
 
diff --git a/xmloff/source/text/XMLTextListItemContext.cxx b/xmloff/source/text/XMLTextListItemContext.cxx
index 3b3c815a2a1b..cd01b9ce70e9 100644
--- a/xmloff/source/text/XMLTextListItemContext.cxx
+++ b/xmloff/source/text/XMLTextListItemContext.cxx
@@ -37,15 +37,11 @@
 #include "txtlists.hxx"
 #include "XMLTextListBlockContext.hxx"
 #include <xmloff/txtimp.hxx>
-// --> OD 2008-05-08 #refactorlists#
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/style/XStyle.hpp>
 #include <xmloff/xmlnumi.hxx>
-// <--
-
 #include "XMLTextListItemContext.hxx"
 
-
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
 
@@ -65,10 +61,8 @@ XMLTextListItemContext::XMLTextListItemContext(
     : SvXMLImportContext( rImport, nPrfx, rLName ),
       rTxtImport( rTxtImp ),
       nStartValue( -1 ),
-      // --> OD 2008-05-07 #refactorlists#
       mnSubListCount( 0 ),
       mxNumRulesOverride()
-      // <--
 {
     static ::rtl::OUString s_NumberingRules(
         RTL_CONSTASCII_USTRINGPARAM("NumberingRules"));
@@ -89,7 +83,6 @@ XMLTextListItemContext::XMLTextListItemContext(
             if( nTmp >= 0 && nTmp <= SHRT_MAX )
                 nStartValue = (sal_Int16)nTmp;
         }
-        // --> OD 2008-05-08 #refactorlists#
         else if ( nPrefix == XML_NAMESPACE_TEXT &&
                   IsXMLToken( aLocalName, XML_STYLE_OVERRIDE ) )
         {
@@ -127,7 +120,6 @@ XMLTextListItemContext::XMLTextListItemContext(
                 }
             }
         }
-        // <--
         else if ( (XML_NAMESPACE_XML == nPrefix) &&
              IsXMLToken(aLocalName, XML_ID)   )
         {
@@ -176,16 +168,11 @@ SvXMLImportContext *XMLTextListItemContext::CreateChildContext(
 
         break;
     case XML_TOK_TEXT_LIST:
-        // --> OD 2008-05-07 #refactorlists#
-//        pContext = new XMLTextListBlockContext( GetImport(), rTxtImport,
-//                                            nPrefix, rLocalName,
-//                                            xAttrList );
         ++mnSubListCount;
         pContext = new XMLTextListBlockContext( GetImport(), rTxtImport,
                                                 nPrefix, rLocalName,
                                                 xAttrList,
                                                 (mnSubListCount > 1) );
-        // <--
         break;
     }
 
@@ -195,5 +182,4 @@ SvXMLImportContext *XMLTextListItemContext::CreateChildContext(
     return pContext;
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLTextListItemContext.hxx b/xmloff/source/text/XMLTextListItemContext.hxx
index 95f8ee644e4f..2644a38513a9 100644
--- a/xmloff/source/text/XMLTextListItemContext.hxx
+++ b/xmloff/source/text/XMLTextListItemContext.hxx
@@ -39,13 +39,11 @@ class XMLTextListItemContext : public SvXMLImportContext
 
     sal_Int16                   nStartValue;
 
-    // --> OD 2008-05-07 #refactorlists#
     // quantity of <text:list> child elements
     sal_Int16 mnSubListCount;
     // list style instance for text::style-override property
     ::com::sun::star::uno::Reference<
                 ::com::sun::star::container::XIndexReplace > mxNumRulesOverride;
-    // <--
 
 public:
 
@@ -71,7 +69,6 @@ public:
     sal_Bool HasStartValue() const { return -1 != nStartValue; }
     sal_Int16 GetStartValue() const { return nStartValue; }
 
-    // --> OD 2008-05-08 #refactorlists#
     inline sal_Bool HasNumRulesOverride() const
     {
         return mxNumRulesOverride.is();
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 3ac7b6f48b0b..a44cededd0ae 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -186,7 +186,7 @@ void XMLTextMarkImportContext::StartElement(
     {
         if (m_sBookmarkName.getLength() == 0)
         {
-            m_sBookmarkName = ::rtl::OUString::createFromAscii("Unknown");
+            m_sBookmarkName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown"));
         }
         m_rHelper.pushFieldCtx( m_sBookmarkName, m_sFieldName );
     }
diff --git a/xmloff/source/text/XMLTextNumRuleInfo.cxx b/xmloff/source/text/XMLTextNumRuleInfo.cxx
index 465d53bdab2a..a17da2ea4b72 100644
--- a/xmloff/source/text/XMLTextNumRuleInfo.cxx
+++ b/xmloff/source/text/XMLTextNumRuleInfo.cxx
@@ -36,9 +36,7 @@
 #include <com/sun/star/style/NumberingType.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include "XMLTextNumRuleInfo.hxx"
-// --> OD 2008-04-25 #refactorlists#
 #include "XMLTextListAutoStylePool.hxx"
-// <--
 
 using ::rtl::OUString;
 
@@ -47,7 +45,6 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::style;
 
-// --> OD 2008-05-08 #refactorlists#
 // Complete refactoring of the class and enhancement of the class for lists.
 XMLTextNumRuleInfo::XMLTextNumRuleInfo()
     : msNumberingRules(RTL_CONSTASCII_USTRINGPARAM("NumberingRules"))
@@ -58,10 +55,8 @@ XMLTextNumRuleInfo::XMLTextNumRuleInfo()
     , msNumberingIsOutline(RTL_CONSTASCII_USTRINGPARAM("NumberingIsOutline"))
     , msPropNameListId(RTL_CONSTASCII_USTRINGPARAM("ListId"))
     , msPropNameStartWith(RTL_CONSTASCII_USTRINGPARAM("StartWith"))
-    // --> OD 2008-11-26 #158694#
     , msContinueingPreviousSubTree(RTL_CONSTASCII_USTRINGPARAM("ContinueingPreviousSubTree"))
     , msListLabelStringProp(RTL_CONSTASCII_USTRINGPARAM("ListLabelString"))
-    // <--
     , mxNumRules()
     , msNumRulesName()
     , msListId()
@@ -75,20 +70,17 @@ XMLTextNumRuleInfo::XMLTextNumRuleInfo()
     Reset();
 }
 
-// --> OD 2006-09-27 #i69627#
+// Written OpenDocument file format doesn't fit to the created text document (#i69627#)
 void XMLTextNumRuleInfo::Set(
         const ::com::sun::star::uno::Reference <
                         ::com::sun::star::text::XTextContent > & xTextContent,
         const sal_Bool bOutlineStyleAsNormalListStyle,
         const XMLTextListAutoStylePool& rListAutoPool,
-        // --> OD 2008-11-26 #158694#
         const sal_Bool bExportTextNumberElement )
-        // <--
 {
     Reset();
-    // --> OD 2006-09-27 #i69627#
+    // Written OpenDocument file format doesn't fit to the created text document (#i69627#)
     mbOutlineStyleAsNormalListStyle = bOutlineStyleAsNormalListStyle;
-    // <--
 
     Reference< XPropertySet > xPropSet( xTextContent, UNO_QUERY );
     Reference< XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo();
@@ -111,7 +103,7 @@ void XMLTextNumRuleInfo::Set(
         mnListLevel = 0;
     }
 
-    // --> OD 2008-12-17 #i97312#
+    // Assertion saving writer document (#i97312#)
     if ( mxNumRules.is() && mxNumRules->getCount() < 1 )
     {
         DBG_ASSERT( false,
@@ -119,9 +111,7 @@ void XMLTextNumRuleInfo::Set(
         Reset();
         return;
     }
-    // <--
 
-    // --> OD 2010-01-13 #b6912256#
     if ( mnListLevel < 0 )
     {
         DBG_ASSERT( false,
@@ -130,7 +120,7 @@ void XMLTextNumRuleInfo::Set(
         return;
     }
 
-    // --> OD 2006-09-27 #i69627#
+    // Written OpenDocument file format doesn't fit to the created text document (#i69627#)
     bool bSuppressListStyle( false );
     if ( mxNumRules.is() )
     {
@@ -149,7 +139,6 @@ void XMLTextNumRuleInfo::Set(
     }
 
     if( mxNumRules.is() && !bSuppressListStyle )
-    // <--
     {
         // First try to find the numbering rules in the list auto style pool.
         // If not found, the numbering rules instance has to be named.
@@ -172,13 +161,11 @@ void XMLTextNumRuleInfo::Set(
             xPropSet->getPropertyValue( msPropNameListId ) >>= msListId;
         }
 
-        // --> OD 2008-11-26 #158694#
         mbContinueingPreviousSubTree = sal_False;
         if( xPropSetInfo->hasPropertyByName( msContinueingPreviousSubTree ) )
         {
             xPropSet->getPropertyValue( msContinueingPreviousSubTree ) >>= mbContinueingPreviousSubTree;
         }
-        // <--
 
         mbIsNumbered = sal_True;
         if( xPropSetInfo->hasPropertyByName( msNumberingIsNumber ) )
@@ -225,14 +212,12 @@ void XMLTextNumRuleInfo::Set(
             }
         }
 
-        // --> OD 2008-11-26 #158694#
         msListLabelString = ::rtl::OUString();
         if ( bExportTextNumberElement &&
              xPropSetInfo->hasPropertyByName( msListLabelStringProp ) )
         {
             xPropSet->getPropertyValue( msListLabelStringProp ) >>= msListLabelString;
         }
-        // <--
 
         // paragraph's list level range is [0..9] representing list levels [1..10]
         ++mnListLevel;
@@ -259,6 +244,5 @@ sal_Bool XMLTextNumRuleInfo::BelongsToSameList( const XMLTextNumRuleInfo& rCmp )
 
     return bRet;
 }
-// <--
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLTextNumRuleInfo.hxx b/xmloff/source/text/XMLTextNumRuleInfo.hxx
index 54b9542ae7d0..d03370eb6feb 100644
--- a/xmloff/source/text/XMLTextNumRuleInfo.hxx
+++ b/xmloff/source/text/XMLTextNumRuleInfo.hxx
@@ -55,10 +55,8 @@ class XMLTextNumRuleInfo
     const ::rtl::OUString msNumberingIsOutline;
     const ::rtl::OUString msPropNameListId;
     const ::rtl::OUString msPropNameStartWith;
-    // --> OD 2008-11-26 #158694#
     const ::rtl::OUString msContinueingPreviousSubTree;
     const ::rtl::OUString msListLabelStringProp;
-    // <--
 
     // numbering rules instance and its name
     ::com::sun::star::uno::Reference <
@@ -73,31 +71,25 @@ class XMLTextNumRuleInfo
     sal_Bool            mbIsRestart;
 
     // numbering rules' attributes
-    // --> OD 2008-05-07 #refactorlists#
     sal_Int16           mnListLevelStartValue;
-    // <--
 
-    // --> OD 2006-09-27 #i69627#
+    // Written OpenDocument file format doesn't fit to the created text document (#i69627#)
     sal_Bool mbOutlineStyleAsNormalListStyle;
-    // <--
 
-    // --> OD 2008-11-26 #158694#
     sal_Bool mbContinueingPreviousSubTree;
     ::rtl::OUString msListLabelString;
-    // <--
+
 public:
 
     XMLTextNumRuleInfo();
 
     inline XMLTextNumRuleInfo& operator=( const XMLTextNumRuleInfo& rInfo );
 
-    // --> OD 2008-11-26 #158694#
     void Set( const ::com::sun::star::uno::Reference <
                         ::com::sun::star::text::XTextContent > & rTextContnt,
               const sal_Bool bOutlineStyleAsNormalListStyle,
               const XMLTextListAutoStylePool& rListAutoPool,
               const sal_Bool bExportTextNumberElement );
-    // <--
     inline void Reset();
 
     inline const ::rtl::OUString& GetNumRulesName() const
@@ -149,7 +141,6 @@ public:
         return rCmp.msNumRulesName == msNumRulesName;
     }
 
-    // --> OD 2008-11-26 #158694#
     inline sal_Bool IsContinueingPreviousSubTree() const
     {
         return mbContinueingPreviousSubTree;
@@ -158,7 +149,6 @@ public:
     {
         return msListLabelString;
     }
-    // <--
 };
 
 inline XMLTextNumRuleInfo& XMLTextNumRuleInfo::operator=(
@@ -171,13 +161,10 @@ inline XMLTextNumRuleInfo& XMLTextNumRuleInfo::operator=(
     mnListLevel = rInfo.mnListLevel;
     mbIsNumbered = rInfo.mbIsNumbered;
     mbIsRestart = rInfo.mbIsRestart;
-    // --> OD 2006-09-27 #i69627#
+    // Written OpenDocument file format doesn't fit to the created text document (#i69627#)
     mbOutlineStyleAsNormalListStyle = rInfo.mbOutlineStyleAsNormalListStyle;
-    // <--
-    // --> OD 2008-11-26 #158694#
     mbContinueingPreviousSubTree = rInfo.mbContinueingPreviousSubTree;
     msListLabelString = rInfo.msListLabelString;
-    // <--
 
     return *this;
 }
@@ -189,14 +176,11 @@ inline void XMLTextNumRuleInfo::Reset()
     msListId = ::rtl::OUString();
     mnListStartValue = -1;
     mnListLevel = 0;
-    // --> OD 2006-09-27 #i69627#
+    // Written OpenDocument file format doesn't fit to the created text document (#i69627#)
     mbIsNumbered = mbIsRestart =
     mbOutlineStyleAsNormalListStyle = sal_False;
-    // <--
-    // --> OD 2008-11-26 #158694#
     mbContinueingPreviousSubTree = sal_False;
     msListLabelString = ::rtl::OUString();
-    // <--
 }
 #endif  //  _XMLOFF_XMLTEXTNUMRULEINFO_HXX
 
diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index 127c4e5a7de0..d0c78829bf92 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -409,13 +409,12 @@ void XMLTextExportPropertySetMapper::ContextFilter(
     XMLPropertyState* pHoriOrientRelState = NULL;
     XMLPropertyState* pHoriOrientRelFrameState = NULL;
     XMLPropertyState* pHoriOrientMirrorState = NULL;
-    // --> OD 2004-08-09 #i28749# - horizontal position and relation for shapes
+    // Horizontal position and relation for shapes (#i28749#)
     XMLPropertyState* pShapeHoriOrientState = NULL;
     XMLPropertyState* pShapeHoriOrientMirroredState = NULL;
     XMLPropertyState* pShapeHoriOrientRelState = NULL;
     XMLPropertyState* pShapeHoriOrientRelFrameState = NULL;
     XMLPropertyState* pShapeHoriOrientMirrorState = NULL;
-    // <--
 
     // vertical position and relation
     XMLPropertyState* pVertOrientState = NULL;
@@ -425,13 +424,12 @@ void XMLTextExportPropertySetMapper::ContextFilter(
     XMLPropertyState* pVertOrientRelFrameState = NULL;
     XMLPropertyState* pVertOrientRelAsCharState = NULL;
 
-    // --> OD 2004-08-09 #i28749# - vertical position and relation for shapes
+    // Vertical position and relation for shapes (#i28749#)
     XMLPropertyState* pShapeVertOrientState = NULL;
     XMLPropertyState* pShapeVertOrientAtCharState = NULL;
     XMLPropertyState* pShapeVertOrientRelState = NULL;
     XMLPropertyState* pShapeVertOrientRelPageState = NULL;
     XMLPropertyState* pShapeVertOrientRelFrameState = NULL;
-    // <--
 
     // filter underline color
     XMLPropertyState* pUnderlineState = NULL;
@@ -522,7 +520,7 @@ void XMLTextExportPropertySetMapper::ContextFilter(
         case CTF_VERTICALREL_FRAME:     pVertOrientRelFrameState = propertie; bNeedsAnchor = sal_True; break;
         case CTF_VERTICALREL_ASCHAR:    pVertOrientRelAsCharState = propertie; bNeedsAnchor = sal_True; break;
 
-        // --> OD 2004-08-09 #i28749# - handle new CTFs for shape positioning properties
+        // Handle new CTFs for shape positioning properties (#i28749#)
         case CTF_SHAPE_HORIZONTALPOS:             pShapeHoriOrientState = propertie; bNeedsAnchor = sal_True; break;
         case CTF_SHAPE_HORIZONTALPOS_MIRRORED:    pShapeHoriOrientMirroredState = propertie; bNeedsAnchor = sal_True; break;
         case CTF_SHAPE_HORIZONTALREL:             pShapeHoriOrientRelState = propertie; bNeedsAnchor = sal_True; break;
@@ -533,8 +531,6 @@ void XMLTextExportPropertySetMapper::ContextFilter(
         case CTF_SHAPE_VERTICALREL:           pShapeVertOrientRelState = propertie; bNeedsAnchor = sal_True; break;
         case CTF_SHAPE_VERTICALREL_PAGE:      pShapeVertOrientRelPageState = propertie; bNeedsAnchor = sal_True; break;
         case CTF_SHAPE_VERTICALREL_FRAME:     pShapeVertOrientRelFrameState = propertie; bNeedsAnchor = sal_True; break;
-        // <--
-
         case CTF_FONTNAME:              pFontNameState = propertie; break;
         case CTF_FONTFAMILYNAME:        pFontFamilyNameState = propertie; break;
         case CTF_FONTSTYLENAME:         pFontStyleNameState = propertie; break;
@@ -933,7 +929,7 @@ void XMLTextExportPropertySetMapper::ContextFilter(
             pVertOrientRelAsCharState->mnIndex = -1;
     }
 
-    // --> OD 2004-08-09 #i28749# - states for shape positioning properties
+    // States for shape positioning properties (#i28749#)
     if ( eAnchor != TextContentAnchorType_AS_CHARACTER &&
          ( GetExport().getExportFlags() & EXPORT_OASIS ) == 0 )
     {
@@ -992,7 +988,6 @@ void XMLTextExportPropertySetMapper::ContextFilter(
         if( pShapeVertOrientRelFrameState && TextContentAnchorType_AT_FRAME != eAnchor )
             pShapeVertOrientRelFrameState->mnIndex = -1;
     }
-    // <--
 
     // list style name: remove list style if it is the default outline style
     if( pListStyleName != NULL )
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index d58798e87f27..9dd0a9fc2f51 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -3167,7 +3167,7 @@ enum XMLTokenEnum XMLTextFieldExport::MapReferenceType(sal_Int16 nType)
             // XML_TEMPLATE is default
             eElement = XML_TEMPLATE;
             break;
-        // --> OD 2007-09-14 #i81002#
+        // Core implementation for direct cross-references (#i81002#)
         case ReferenceFieldPart::NUMBER:
             eElement = XML_NUMBER;
             break;
@@ -3177,7 +3177,6 @@ enum XMLTokenEnum XMLTextFieldExport::MapReferenceType(sal_Int16 nType)
         case ReferenceFieldPart::NUMBER_FULL_CONTEXT:
             eElement = XML_NUMBER_ALL_SUPERIOR;
             break;
-        // <--
         default:
             DBG_ERROR("unknown reference type");
             eElement = XML_TEMPLATE;
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 4611ec6ce144..e09eb09f3930 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -1995,7 +1995,7 @@ void XMLUserDocInfoImportContext::ProcessAttribute(
         {
             if (!bValid)
             {
-                SetServiceName(OUString::createFromAscii( sAPI_docinfo_custom ) );
+                SetServiceName(OUString(RTL_CONSTASCII_USTRINGPARAM( sAPI_docinfo_custom )) );
                 aName = sAttrValue;
                 bValid = sal_True;
             }
@@ -2887,11 +2887,10 @@ static SvXMLEnumMapEntry __READONLY_DATA lcl_aReferenceTypeTokenMap[] =
     { XML_CATEGORY_AND_VALUE, ReferenceFieldPart::CATEGORY_AND_NUMBER },
     { XML_CAPTION,      ReferenceFieldPart::ONLY_CAPTION },
     { XML_VALUE,        ReferenceFieldPart::ONLY_SEQUENCE_NUMBER },
-    // --> OD 2007-09-14 #i81002#
+    // Core implementation for direct cross-references (#i81002#)
     { XML_NUMBER,               ReferenceFieldPart::NUMBER },
     { XML_NUMBER_NO_SUPERIOR,   ReferenceFieldPart::NUMBER_NO_CONTEXT },
     { XML_NUMBER_ALL_SUPERIOR,  ReferenceFieldPart::NUMBER_FULL_CONTEXT },
-    // <--
     { XML_TOKEN_INVALID, 0 }
 };
 
@@ -3903,7 +3902,7 @@ void XMLMeasureFieldImportContext::PrepareField(
 {
     Any aAny;
     aAny <<= mnKind;
-    xPropertySet->setPropertyValue(OUString::createFromAscii("Kind"), aAny);
+    xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Kind")), aAny);
 }
 
 
@@ -4063,7 +4062,7 @@ XMLHeaderFieldImportContext::XMLHeaderFieldImportContext(
         const ::rtl::OUString& sLocalName)      /// element name w/o prefix
 : XMLTextFieldImportContext(rImport, rHlp, sAPI_header, nPrfx, sLocalName )
 {
-    sServicePrefix = OUString::createFromAscii( sAPI_presentation_prefix );
+    sServicePrefix = OUString(RTL_CONSTASCII_USTRINGPARAM( sAPI_presentation_prefix ));
     bValid = sal_True;
 }
 
@@ -4087,7 +4086,7 @@ XMLFooterFieldImportContext::XMLFooterFieldImportContext(
         const ::rtl::OUString& sLocalName)      /// element name w/o prefix
 : XMLTextFieldImportContext(rImport, rHlp, sAPI_footer, nPrfx, sLocalName )
 {
-    sServicePrefix = OUString::createFromAscii( sAPI_presentation_prefix );
+    sServicePrefix = OUString(RTL_CONSTASCII_USTRINGPARAM( sAPI_presentation_prefix ));
     bValid = sal_True;
 }
 
@@ -4112,7 +4111,7 @@ XMLDateTimeFieldImportContext::XMLDateTimeFieldImportContext(
         const ::rtl::OUString& sLocalName)      /// element name w/o prefix
 : XMLTextFieldImportContext(rImport, rHlp, sAPI_datetime, nPrfx, sLocalName )
 {
-    sServicePrefix = OUString::createFromAscii( sAPI_presentation_prefix );
+    sServicePrefix = OUString(RTL_CONSTASCII_USTRINGPARAM( sAPI_presentation_prefix ));
     bValid = sal_True;
 }
 
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 3266bdc8191d..ada788291401 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -92,13 +92,9 @@
 #include "XMLCalculationSettingsContext.hxx"
 #include <xmloff/formsimp.hxx>
 #include "XMLNumberStylesImport.hxx"
-// --> OD 2006-10-12 #i69629#
+// XML import: reconstrution of assignment of paragraph style to outline levels (#i69629#)
 #include <com/sun/star/beans/XPropertyState.hpp>
-// <--
-
-// --> OD 2008-04-25 #refactorlists#
 #include <txtlists.hxx>
-// <--
 #include <xmloff/odffields.hxx>
 #include <comphelper/stlunosequence.hxx>
 
@@ -377,7 +373,6 @@ static __FAR_DATA SvXMLTokenMapEntry aTextListBlockAttrTokenMap[] =
             XML_TOK_TEXT_LIST_BLOCK_STYLE_NAME },
     { XML_NAMESPACE_TEXT, XML_CONTINUE_NUMBERING,
             XML_TOK_TEXT_LIST_BLOCK_CONTINUE_NUMBERING },
-    // --> OD 2008-04-22 #refactorlists#
     { XML_NAMESPACE_TEXT, XML_CONTINUE_LIST,
             XML_TOK_TEXT_LIST_BLOCK_CONTINUE_LIST },
     XML_TOKEN_MAP_END
@@ -545,10 +540,7 @@ struct SAL_DLLPRIVATE XMLTextImportHelper::Impl
     ::std::auto_ptr<SvXMLTokenMap> m_pTextMasterPageElemTokenMap;
     ::std::auto_ptr<SvStringsDtor> m_pPrevFrmNames;
     ::std::auto_ptr<SvStringsDtor> m_pNextFrmNames;
-
-    // --> OD 2008-04-25 #refactorlists#
     ::std::auto_ptr<XMLTextListsHelper> m_pTextListsHelper;
-    // <--
 
     SvXMLImportContextRef m_xAutoStyles;
     SvXMLImportContextRef m_xFontDecls;
@@ -562,14 +554,14 @@ struct SAL_DLLPRIVATE XMLTextImportHelper::Impl
     UniReference< SvXMLImportPropertyMapper > m_xRubyImpPrMap;
 
     ::std::auto_ptr<SvI18NMap> m_pRenameMap;
-    // --> OD 2006-10-12 #i69629# - change and extend data structure:
-    // - data structure contains candidates of paragraph styles, which
-    //   will be assigned to the outline style
-    // - data structure contains more than one candidate for each list level
-    //   of the outline style
+    /* Change and extend data structure:
+       - data structure contains candidates of paragraph styles, which
+         will be assigned to the outline style
+       - data structure contains more than one candidate for each list level
+         of the outline style (#i69629#)
+    */
     ::boost::scoped_array< ::std::vector< ::rtl::OUString > >
         m_pOutlineStylesCandidates;
-    // <--
 
     // start range, xml:id, RDFa stuff
     typedef ::boost::tuple<
@@ -641,13 +633,10 @@ struct SAL_DLLPRIVATE XMLTextImportHelper::Impl
         ,   m_pTextMasterPageElemTokenMap( 0 )
         ,   m_pPrevFrmNames( 0 )
         ,   m_pNextFrmNames( 0 )
-        // --> OD 2008-04-25 #refactorlists#
         ,   m_pTextListsHelper( new XMLTextListsHelper() )
-        // <--
         ,   m_pRenameMap( 0 )
-        // --> OD 2006-10-12 #i69629#
+        // XML import: reconstrution of assignment of paragraph style to outline levels (#i69629#)
         ,   m_pOutlineStylesCandidates( 0 )
-        // <--
         ,   m_xServiceFactory( rModel, UNO_QUERY )
         ,   m_rSvXMLImport( rImport )
         ,   m_bInsertMode( bInsertMode )
@@ -934,7 +923,7 @@ namespace
         {
             Sequence<OUString> vListEntriesSeq(vListEntries.size());
             copy(vListEntries.begin(), vListEntries.end(), ::comphelper::stl_begin(vListEntriesSeq));
-            vOutParams[OUString::createFromAscii(ODF_FORMDROPDOWN_LISTENTRY)] = makeAny(vListEntriesSeq);
+            vOutParams[OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMDROPDOWN_LISTENTRY))] = makeAny(vListEntriesSeq);
         }
         for(::std::map<OUString, Any>::const_iterator pCurrent = vOutParams.begin();
             pCurrent != vOutParams.end();
@@ -968,7 +957,6 @@ XMLTextImportHelper::XMLTextImportHelper(
     if( xCNSupplier.is() )
     {
         m_pImpl->m_xChapterNumbering = xCNSupplier->getChapterNumberingRules();
-        // --> OD 2008-05-15 #refactorlists#
         if (m_pImpl->m_xChapterNumbering.is())
         {
             Reference< XPropertySet > const xNumRuleProps(
@@ -1001,7 +989,6 @@ XMLTextImportHelper::XMLTextImportHelper(
                 }
             }
         }
-        // <--
     }
 
     Reference< XStyleFamiliesSupplier > xFamiliesSupp( rModel, UNO_QUERY );
@@ -1362,12 +1349,12 @@ OUString XMLTextImportHelper::ConvertStarFonts( const OUString& rChars,
     return bConverted ? sChars.makeStringAndClear() : rChars;
 }
 
-// --> OD 2006-10-12 #i69629#
-// helper method to determine, if a paragraph style has a list style (inclusive
-// an empty one) inherits a list style (inclusive an empty one) from one of its parents
-// --> OD 2007-01-29 #i73973#
-// apply special case, that found list style equals the chapter numbering, also
-// to the found list styles of the parent styles.
+/* Helper method to determine, if a paragraph style has a list style (inclusive
+   an empty one) inherits a list style (inclusive an empty one) from one of its parents (#i69629#)
+*/
+/* Apply special case, that found list style equals the chapter numbering, also
+   to the found list styles of the parent styles. (#i73973#)
+*/
 sal_Bool lcl_HasListStyle( OUString sStyleName,
                            const Reference < XNameContainer >& xParaStyles,
                            SvXMLImport& rImport,
@@ -1409,14 +1396,11 @@ sal_Bool lcl_HasListStyle( OUString sStyleName,
     }
     else
     {
-        // --> OD 2007-12-07 #i77708#
+        // Tools.Outline settings lost on Save (#i77708#)
         sal_Int32 nUPD( 0 );
         sal_Int32 nBuild( 0 );
-        // --> OD 2008-03-19 #i86058#
-//        rImport.getBuildIds( nUPD, nBuild );
+        // Don't use UPD for versioning: xmloff/source/text/txtstyli.cxx and txtimp.cxx (#i86058#)
         const bool bBuildIdFound = rImport.getBuildIds( nUPD, nBuild );
-        // <--
-        // <--
         // search list style at parent
         Reference<XStyle> xStyle( xPropState, UNO_QUERY );
         while ( xStyle.is() )
@@ -1448,8 +1432,7 @@ sal_Bool lcl_HasListStyle( OUString sStyleName,
                 {
                     // list style found
                     bRet = sal_True;
-                    // --> OD 2007-01-29 #i73973#
-                    // special case: the found list style equals the chapter numbering
+                    // Special case: the found list style equals the chapter numbering (#i73973#)
                     Reference< XPropertySet > xPropSet( xPropState, UNO_QUERY );
                     if ( xPropSet.is() )
                     {
@@ -1460,11 +1443,10 @@ sal_Bool lcl_HasListStyle( OUString sStyleName,
                         {
                             bRet = sal_False;
                         }
-                        // --> OD 2007-12-07 #i77708#
-                        // special handling for text documents from OOo version prior OOo 2.4
-                        // --> OD 2008-03-19 #i86058#
-                        // check explicitly on certain versions and on import of
-                        // text documents in OpenOffice.org file format
+                        // Special handling for text documents from OOo version prior OOo 2.4 (#i77708#)
+                        /* Check explicitly on certain versions and on import of
+                           text documents in OpenOffice.org file format (#i86058#)
+                        */
                         else if ( sListStyle.getLength() == 0 &&
                                   ( rImport.IsTextDocInOOoFileFormat() ||
                                     ( bBuildIdFound &&
@@ -1497,9 +1479,8 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
         sal_Bool bPara,
         sal_Bool bOutlineLevelAttrFound,
         sal_Int8 nOutlineLevel,
-        // --> OD 2007-08-17 #i80724#
+        // Numberings/Bullets in table not visible aftzer save/reload (#i80724#)
         sal_Bool bSetListAttrs )
-        // <--
 {
     static ::rtl::OUString s_ParaStyleName(
         RTL_CONSTASCII_USTRINGPARAM("ParaStyleName"));
@@ -1564,14 +1545,13 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
             sStyleName = OUString();
     }
 
-    // --> OD 2008-09-10 #i70748#
-    // The outline level needs to be only applied as list level, if the heading
-    // is not inside a list and if it by default applies the outline style.
+    /* The outline level needs to be only applied as list level, if the heading
+       is not inside a list and if it by default applies the outline style. (#i70748#)
+    */
     bool bApplyOutlineLevelAsListLevel( false );
-    // --> OD 2007-08-17 #i80724#
+    // Numberings/Bullets in table not visible aftzer save/reload (#i80724#)
     if (bSetListAttrs && bPara
         && xPropSetInfo->hasPropertyByName( s_NumberingRules))
-    // <--
     {
         // Set numbering rules
         Reference< XIndexReplace > const xNumRules(
@@ -1597,23 +1577,20 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
             if (!pListItem) {
                 bNumberingIsNumber = false; // list-header
             }
-            // --> OD 2008-05-08 #refactorlists#
             // consider text:style-override property of <text:list-item>
             xNewNumRules.set(
                 (pListItem != 0 && pListItem->HasNumRulesOverride())
                     ? pListItem->GetNumRulesOverride()
                     : pListBlock->GetNumRules() );
-            // <--
             nLevel = static_cast<sal_Int8>(pListBlock->GetLevel());
 
             if ( pListItem && pListItem->HasStartValue() ) {
                nStartValue = pListItem->GetStartValue();
             }
 
-            // --> OD 2008-08-15 #i92811#
+            // Inconsistent behavior regarding lists (#i92811#)
             sListId = m_pImpl->m_pTextListsHelper->GetListIdForListBlock(
                             *pListBlock);
-            // <--
         }
         else if (pNumberedParagraph)
         {
@@ -1626,8 +1603,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
 
         if (pListBlock || pNumberedParagraph)
         {
-            // --> OD 2009-08-24 #i101349#
-            // Assure that list style of automatic paragraph style is applied at paragraph.
+            // Assure that list style of automatic paragraph style is applied at paragraph. (#i101349#)
             sal_Bool bApplyNumRules = pStyle && pStyle->IsListStyleSet();
             if ( !bApplyNumRules )
             {
@@ -1657,7 +1633,6 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
             }
 
             if ( bApplyNumRules )
-            // <--
             {
                 // #102607# This may except when xNewNumRules contains
                 // a Writer-NumRule-Implementation bug gets applied to
@@ -1704,7 +1679,6 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
                                            makeAny(nStartValue));
             }
 
-            // --> OD 2008-04-23 #refactorlists#
             if (xPropSetInfo->hasPropertyByName(s_PropNameListId))
             {
                 if (sListId.getLength()) {
@@ -1712,20 +1686,19 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
                         makeAny(sListId) );
                 }
             }
-            // <--
 
             GetTextListHelper().SetListItem( (XMLTextListItemContext *)0 );
         }
         else
         {
-            // If the paragraph is not in a list but its style, remove it from
-            // the list.
-            // --> OD 2005-10-25 #126347# - do not remove it, if the list
-            // of the style is the chapter numbering rule.
+            /* If the paragraph is not in a list but its style, remove it from
+               the list. Do not remove it, if the list of the style is
+               the chapter numbering rule.
+            */
             if( xNumRules.is() )
             {
                 bool bRemove( true );
-                // --> OD 2008-12-17 #i70748# - special handling for document from OOo 2.x
+                // Special handling for document from OOo 2.x (#i70748#)
                 sal_Int32 nUPD( 0 );
                 sal_Int32 nBuild( 0 );
                 const bool bBuildIdFound = rImport.getBuildIds( nUPD, nBuild );
@@ -1746,19 +1719,16 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
                              xNumNamed->getName() == xChapterNumNamed->getName() )
                         {
                             bRemove = false;
-                            // --> OD 2008-09-10 #i70748#
+                            // RFE: inserting headings into text documents (#i70748#)
                             bApplyOutlineLevelAsListLevel = true;
-                            // <--
                         }
                     }
                 }
-                // <--
                 if ( bRemove )
                 {
                     xPropSet->setPropertyValue( s_NumberingRules, Any() );
                 }
             }
-            // <--
         }
     }
 
@@ -1853,8 +1823,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
     }
 
     // outline level; set after list style has been set
-    // --> OD 2005-08-25 #i53198#
-    // Complete re-worked and corrected:
+    // Complete re-worked and corrected: (#i53198#)
     // - set outline level at paragraph
     // - set numbering level at paragraph, if none is already set
     // - assure that style is marked as an outline style for the corresponding
@@ -1862,11 +1831,10 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
     // - DO NOT set type of numbering rule to outline.
     // - DO NOT set numbering rule directly at the paragraph.
 
-    // --> OD 2008-12-09 #i70748#
-    // Some minor rework and adjust access to paragraph styles
+    // Some minor rework and adjust access to paragraph styles (#i70748#)
     if ( bPara )
     {
-        // --> OD 2009-08-18 #i103817#
+        // Headings not numbered anymore in 3.1 (#i103817#)
         sal_Int16 nCurrentOutlineLevelInheritedFromParagraphStyle = 0;
         const bool bHasOutlineLevelProp(
             xPropSetInfo->hasPropertyByName(s_OutlineLevel));
@@ -1875,11 +1843,8 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
             xPropSet->getPropertyValue(s_OutlineLevel)
                 >>= nCurrentOutlineLevelInheritedFromParagraphStyle;
         }
-        // <--
-        //if ( bPara && nOutlineLevel != -1 )   //#outline level,removed by zhaojianwei
-        if ( nOutlineLevel > 0 )       //add by zhaojianwei
+        if ( nOutlineLevel > 0 )
         {
-            //#outline level,removed by zhaojianwei
             if ( bHasOutlineLevelProp )
             {
                 // In case that the value equals the value of its paragraph style
@@ -1889,9 +1854,9 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
                     xPropSet->setPropertyValue( s_OutlineLevel,
                         makeAny( static_cast<sal_Int16>(nOutlineLevel) ) );
                 }
-            }//<-end,zhaojianwei
+            }
 
-            // --> OD 2008-09-10 #i70748#
+            // RFE: inserting headings into text documents (#i70748#)
             if ( bApplyOutlineLevelAsListLevel )
             {
                 sal_Int16 nNumLevel = -1;
@@ -1903,25 +1868,24 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
                             makeAny( static_cast<sal_Int8>(nOutlineLevel - 1) ) );
                 }
             }
-            // <--
-            // --> OD 2006-10-13 #i69629# - correction:
-            // - for text document from version OOo 2.0.4/SO 8 PU4 and earlier
-            //   the paragraph style of a heading should be assigned to the
-            //   corresponding list level of the outline style.
-            // - for other text documents the paragraph style of a heading is only
-            //   a candidate for an assignment to the list level of the outline
-            //   style, if it has no direct list style property and (if exists) the
-            //   automatic paragraph style has also no direct list style set.
+            /* Correction: (#i69629#)
+               - for text document from version OOo 2.0.4/SO 8 PU4 and earlier
+                 the paragraph style of a heading should be assigned to the
+                 corresponding list level of the outline style.
+               - for other text documents the paragraph style of a heading is only
+                 a candidate for an assignment to the list level of the outline
+                 style, if it has no direct list style property and (if exists) the
+                 automatic paragraph style has also no direct list style set.
+            */
             if (m_pImpl->m_xParaStyles->hasByName(sStyleName))
             {
                 bool bOutlineStyleCandidate( false );
 
                 sal_Int32 nUPD( 0 );
                 sal_Int32 nBuild( 0 );
-                // --> OD 2007-12-19 #152540#
                 const bool bBuildIdFound = rImport.getBuildIds( nUPD, nBuild );
-                // --> OD 2007-07-25 #i73509#
-                // --> OD 2008-03-19 #i86058# - check explicitly on certain versions
+                // Lost outline numbering in master document (#i73509#)
+                // Check explicitly on certain versions (#i86058#)
                 if ( rImport.IsTextDocInOOoFileFormat() ||
                      ( bBuildIdFound &&
                        ( nUPD == 645 || nUPD == 641 ) ) )
@@ -1932,36 +1896,11 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
                 {
                     bOutlineStyleCandidate = bOutlineLevelAttrFound;
                 }
-                // <--
-//                else
-//                {
-//                    Reference< XPropertyState > xStylePropState(
-//                                    xParaStyles->getByName( sStyleName ), UNO_QUERY );
-//                    if ( xStylePropState.is() &&
-//                         xStylePropState->getPropertyState( sNumberingStyleName ) == PropertyState_DIRECT_VALUE )
-//                    {
-//                        bOutlineStyleCandidate = false;
-//                    }
-//                    // --> OD 2007-01-11 #i73361#
-//                    // The automatic paragraph style doesn't have to be considered.
-//    //                else if ( pStyle && /* automatic paragraph style */
-//    //                          pStyle->IsListStyleSet() )
-//    //                {
-//    //                    bOutlineStyleCandidate = false;
-//    //                }
-//                    // <--
-//                    else
-//                    {
-//                        bOutlineStyleCandidate = true;
-//                    }
-//                  }
-
                 if ( bOutlineStyleCandidate )
                 {
                     AddOutlineStyleCandidate( nOutlineLevel, sStyleName );
                 }
-                // --> OD 2009-08-18 #i103817#
-                // Assure that heading applies the outline style
+                // Assure that heading applies the outline style (#i103817#)
                 if ( ( !pStyle || !pStyle->IsListStyleSet() ) &&
                      !bOutlineStyleCandidate &&
                      m_pImpl->m_xChapterNumbering.is())
@@ -1979,11 +1918,8 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
                             makeAny(static_cast<sal_Int8>(nOutlineLevel - 1)));
                     }
                 }
-                // <--
             }
-            // <--
         }
-        //-> #outlinelevel added by zhaojianwei
         //handle for text:p,if the paragraphstyle outlinelevel is set to[1~10]
         else if( bHasOutlineLevelProp )
         {
@@ -1993,9 +1929,8 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
                 xPropSet->setPropertyValue(s_OutlineLevel,
                     makeAny( static_cast<sal_Int16>(nZero) ));
             }
-        }//<-end,zhaojianwei
+        }
     }
-    // <--
 
     return sStyleName;
 }
@@ -2043,10 +1978,9 @@ void XMLTextImportHelper::FindOutlineStyleName( ::rtl::OUString& rStyleName,
 
             // finally, we'll use the previously used style name for this
             // format (or the default we've just put into that style)
-            // --> OD 2006-11-06 #i71249# - take last added one
+            // take last added one (#i71249#)
             rStyleName =
                 m_pImpl->m_pOutlineStylesCandidates[nOutlineLevel].back();
-            // <--
         }
         // else: nothing we can do, so we'll leave it empty
     }
@@ -2106,14 +2040,13 @@ void XMLTextImportHelper::SetOutlineStyles( sal_Bool bSetEmptyLevels )
         }
 
         const sal_Int32 nCount = m_pImpl->m_xChapterNumbering->getCount();
-        // --> OD 2009-11-13 #i106218#
-        // First collect all paragraph styles choosen for assignment to each
-        // list level of the outline style, then perform the intrinsic assignment.
-        // Reason: The assignment of a certain paragraph style to a list level
-        //         of the outline style causes side effects on the children
-        //         paragraph styles in Writer.
+        /* First collect all paragraph styles choosen for assignment to each
+           list level of the outline style, then perform the intrinsic assignment.
+           Reason: The assignment of a certain paragraph style to a list level
+                   of the outline style causes side effects on the children
+                   paragraph styles in Writer. (#i106218#)
+        */
         ::std::vector<OUString> sChosenStyles(nCount);
-        // <--
         for( sal_Int32 i=0; i < nCount; ++i )
         {
             if ( bSetEmptyLevels ||
@@ -2151,23 +2084,21 @@ void XMLTextImportHelper::SetOutlineStyles( sal_Bool bSetEmptyLevels )
                 }
             }
         }
-        // --> OD 2009-11-13 #i106218#
+        // Trashed outline numbering in ODF 1.1 text document created by OOo 3.x (#i106218#)
         Sequence < PropertyValue > aProps( 1 );
         PropertyValue *pProps = aProps.getArray();
         pProps->Name = s_HeadingStyleName;
         for ( sal_Int32 i = 0; i < nCount; ++i )
         {
-            // --> OD 2009-12-11 #i107610#
+            // Paragraph style assignments in Outline of template lost from second level on (#i107610#)
             if ( bSetEmptyLevels ||
                  sChosenStyles[i].getLength() > 0 )
-            // <--
             {
                 pProps->Value <<= sChosenStyles[i];
                 m_pImpl->m_xChapterNumbering->replaceByIndex(i,
                         makeAny( aProps ));
             }
         }
-        // <--
     }
 }
 
diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx
index 399da525eade..2444c1de79f9 100644
--- a/xmloff/source/text/txtlists.cxx
+++ b/xmloff/source/text/txtlists.cxx
@@ -52,9 +52,8 @@ XMLTextListsHelper::XMLTextListsHelper()
    :  mpProcessedLists( 0 ),
       msLastProcessedListId(),
       msListStyleOfLastProcessedList(),
-      // --> OD 2008-08-15 #i92811#
+      // Inconsistent behavior regarding lists (#i92811#)
       mpMapListIdToListStyleDefaultListId( 0 ),
-      // <--
       mpContinuingLists( 0 ),
       mpListStack( 0 )
 {
@@ -67,13 +66,12 @@ XMLTextListsHelper::~XMLTextListsHelper()
         mpProcessedLists->clear();
         delete mpProcessedLists;
     }
-    // --> OD 2008-08-15 #i92811#
+    // Inconsistent behavior regarding lists (#i92811#)#
     if ( mpMapListIdToListStyleDefaultListId )
     {
         mpMapListIdToListStyleDefaultListId->clear();
         delete mpMapListIdToListStyleDefaultListId;
     }
-    // <--
     if ( mpContinuingLists )
     {
         mpContinuingLists->clear();
@@ -144,7 +142,7 @@ void XMLTextListsHelper::SetListItem( XMLTextListItemContext *i_pListItem )
     }
 }
 
-// --> OD 2008-08-15 #i92811# - handling for parameter <sListStyleDefaultListId>
+// Handling for parameter <sListStyleDefaultListId> (#i92811#)
 void XMLTextListsHelper::KeepListAsProcessed( ::rtl::OUString sListId,
                                               ::rtl::OUString sListStyleName,
                                               ::rtl::OUString sContinueListId,
@@ -169,7 +167,7 @@ void XMLTextListsHelper::KeepListAsProcessed( ::rtl::OUString sListId,
     msLastProcessedListId = sListId;
     msListStyleOfLastProcessedList = sListStyleName;
 
-    // --> OD 2008-08-15 #i92811#
+    // Inconsistent behavior regarding lists (#i92811#)
     if ( sListStyleDefaultListId.getLength() != 0 )
     {
         if ( mpMapListIdToListStyleDefaultListId == 0 )
@@ -186,7 +184,6 @@ void XMLTextListsHelper::KeepListAsProcessed( ::rtl::OUString sListId,
                                                                 aListIdMapData;
         }
     }
-    // <--
 }
 
 sal_Bool XMLTextListsHelper::IsListProcessed( const ::rtl::OUString sListId ) const
@@ -241,15 +238,13 @@ const ::rtl::OUString& XMLTextListsHelper::GetListStyleOfLastProcessedList() con
 
 ::rtl::OUString XMLTextListsHelper::GenerateNewListId() const
 {
-    // --> OD 2008-08-06 #i92478#
-    ::rtl::OUString sTmpStr( ::rtl::OUString::createFromAscii( "list" ) );
-    // <--
+    // Value of xml:id in element <text:list> has to be a valid ID type (#i92478#)
+    ::rtl::OUString sTmpStr( RTL_CONSTASCII_USTRINGPARAM( "list" ) );
     sal_Int64 n = Time().GetTime();
     n += Date().GetDate();
     n += rand();
-    // --> OD 2008-08-06 #i92478#
+    // Value of xml:id in element <text:list> has to be a valid ID type (#i92478#)
     sTmpStr += ::rtl::OUString::valueOf( n );
-    // <--
 
     long nHitCount = 0;
     ::rtl::OUString sNewListId( sTmpStr );
@@ -266,8 +261,7 @@ const ::rtl::OUString& XMLTextListsHelper::GetListStyleOfLastProcessedList() con
     return sNewListId;
 }
 
-// --> OD 2008-08-15 #i92811#
-// provide list id for a certain list block for import
+// Provide list id for a certain list block for import (#i92811#)
 ::rtl::OUString XMLTextListsHelper::GetListIdForListBlock( XMLTextListBlockContext& rListBlock )
 {
     ::rtl::OUString sListBlockListId( rListBlock.GetContinueListId() );
@@ -297,7 +291,6 @@ const ::rtl::OUString& XMLTextListsHelper::GetListStyleOfLastProcessedList() con
 
     return sListBlockListId;
 }
-// <--
 
 void XMLTextListsHelper::StoreLastContinuingList( ::rtl::OUString sListId,
                                                   ::rtl::OUString sContinuingListId )
@@ -471,15 +464,6 @@ XMLTextListsHelper::MakeNumRule(
             uno::Any any = rNumStyles->getByName( sDisplayStyleName );
             any >>= xStyle;
 
-            // --> OD 2008-05-07 #refactorlists# - no longer needed
-//            // If the style has not been used, the restart numbering has
-//            // to be set never.
-//            if ( mbRestartNumbering && !xStyle->isInUse() )
-//            {
-//                mbRestartNumbering = sal_False;
-//            }
-            // <--
-
             uno::Reference< beans::XPropertySet > xPropSet( xStyle,
                 uno::UNO_QUERY );
             any = xPropSet->getPropertyValue(s_NumberingRules);
@@ -492,18 +476,11 @@ XMLTextListsHelper::MakeNumRule(
             if( pListStyle )
             {
                 xNumRules = pListStyle->GetNumRules();
-                // --> OD 2008-05-07 #refactorlists# - no longer needed
-//                sal_Bool bUsed = mxNumRules.is();
-                // <--
                 if( !xNumRules.is() )
                 {
                     pListStyle->CreateAndInsertAuto();
                     xNumRules = pListStyle->GetNumRules();
                 }
-                // --> OD 2008-05-07 #refactorlists# - no longer needed
-//                if( mbRestartNumbering && !bUsed )
-//                    mbRestartNumbering = sal_False;
-                // <--
             }
         }
     }
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 4fca359e5033..4e2da753a3f6 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -53,7 +53,7 @@
 #include <com/sun/star/text/XTextSectionsSupplier.hpp>
 #include <com/sun/star/text/XTextTablesSupplier.hpp>
 #include <com/sun/star/text/XNumberingRulesSupplier.hpp>
-#include <com/sun/star/text/XChapterNumberingSupplier.hpp>//#outline level,add by zhaojianwei
+#include <com/sun/star/text/XChapterNumberingSupplier.hpp>
 #include <com/sun/star/text/XTextTable.hpp>
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/XTextContent.hpp>
@@ -122,10 +122,7 @@
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
 #include <com/sun/star/document/XStorageBasedDocument.hpp>
-
-// --> OD 2008-04-25 #refactorlists#
 #include <txtlists.hxx>
-// <--
 #include <com/sun/star/rdf/XMetadatable.hpp>
 
 using ::rtl::OUString;
@@ -179,9 +176,9 @@ namespace
 
     static bool lcl_ShapeFilter(const Reference<XTextContent>& xTxtContent)
     {
-        static const OUString sTextFrameService = OUString::createFromAscii("com.sun.star.text.TextFrame");
-        static const OUString sTextGraphicService = OUString::createFromAscii("com.sun.star.text.TextGraphicObject");
-        static const OUString sTextEmbeddedService = OUString::createFromAscii("com.sun.star.text.TextEmbeddedObject");
+        static const OUString sTextFrameService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFrame"));
+        static const OUString sTextGraphicService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextGraphicObject"));
+        static const OUString sTextEmbeddedService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextEmbeddedObject"));
         Reference<XShape> xShape(xTxtContent, UNO_QUERY);
         if(!xShape.is())
             return false;
@@ -234,8 +231,8 @@ namespace
             static const OUString our_sAnchorType;
             static const OUString our_sAnchorFrame;
     };
-    const OUString BoundFrames::our_sAnchorType = OUString::createFromAscii("AnchorType");
-    const OUString BoundFrames::our_sAnchorFrame = OUString::createFromAscii("AnchorFrame");
+    const OUString BoundFrames::our_sAnchorType(RTL_CONSTASCII_USTRINGPARAM("AnchorType"));
+    const OUString BoundFrames::our_sAnchorFrame(RTL_CONSTASCII_USTRINGPARAM("AnchorFrame"));
 
     class FieldParamExporter
     {
@@ -326,10 +323,8 @@ enum eParagraphPropertyNamesEnumAuto
 static const sal_Char* aParagraphPropertyNames[] =
 {
     "NumberingIsNumber",
-    "NumberingStyleName",           //#outline level,add by zhaojianwei
-
-    //"ParaChapterNumberingLevel",  //#outline level,remove by zhaojianwei
-    "OutlineLevel",                 //<-end,add by zhaojianwei
+    "NumberingStyleName",
+    "OutlineLevel",
     "ParaConditionalStyleName",
     "ParaStyleName",
     "TextSection",
@@ -339,9 +334,8 @@ static const sal_Char* aParagraphPropertyNames[] =
 enum eParagraphPropertyNamesEnum
 {
     NUMBERING_IS_NUMBER = 0,
-    PARA_NUMBERING_STYLENAME = 1,       //#outline level,add by zhaojianwei
-    //PARA_CHAPTER_NUMERBING_LEVEL = 1, //#outline level,remove by zhaojianwei
-    PARA_OUTLINE_LEVEL=2,               //<-end.add by zhaojianwei
+    PARA_NUMBERING_STYLENAME = 1,
+    PARA_OUTLINE_LEVEL=2,
     PARA_CONDITIONAL_STYLE_NAME = 3,
     PARA_STYLE_NAME = 4,
     TEXT_SECTION = 5
@@ -429,14 +423,14 @@ void FieldParamExporter::Export()
                 // Save the OLE object
                 Reference< embed::XStorage > xTargetStg = m_pExport->GetTargetStorage();
                 Reference< embed::XStorage > xDstStg = xTargetStg->openStorageElement(
-                        rtl::OUString::createFromAscii( "OLELinks" ), embed::ElementModes::WRITE );
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OLELinks")), embed::ElementModes::WRITE );
 
                 if ( !xDstStg->hasByName( sValue ) ) {
                     Reference< XStorageBasedDocument > xStgDoc (
                             m_pExport->GetModel( ), UNO_QUERY );
                     Reference< embed::XStorage > xDocStg = xStgDoc->getDocumentStorage();
                     Reference< embed::XStorage > xOleStg = xDocStg->openStorageElement(
-                            rtl::OUString::createFromAscii( "OLELinks" ), embed::ElementModes::READ );
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OLELinks")), embed::ElementModes::READ );
 
                     xOleStg->copyElementTo( sValue, xDstStg, sValue );
                     Reference< embed::XTransactedObject > xTransact( xDstStg, UNO_QUERY );
@@ -450,6 +444,7 @@ void FieldParamExporter::Export()
             sal_Bool bValue = false;
             aValue >>= bValue;
             ExportParameter(*pCurrent,OUString::createFromAscii(bValue ? "true" : "false"));
+            ExportParameter(*pCurrent, (bValue ? OUString(RTL_CONSTASCII_USTRINGPARAM( "true" )) : OUString(RTL_CONSTASCII_USTRINGPARAM("false"))) );
         }
         else if(aValueType == aSeqType)
         {
@@ -550,7 +545,7 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily,
                                        ->hasPropertyByName( sIsAutomatic ) )
                         {
                             bAdd = *(sal_Bool *)xNumPropSet->getPropertyValue( sIsAutomatic ).getValue();
-                            // --> OD 2007-01-12 #i73361# - check on outline style
+                            // Check on outline style (#i73361#)
                             const OUString sNumberingIsOutline( RTL_CONSTASCII_USTRINGPARAM( "NumberingIsOutline" ) );
                             if ( bAdd &&
                                  xNumPropSet->getPropertySetInfo()
@@ -558,7 +553,6 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily,
                             {
                                 bAdd = !(*(sal_Bool *)xNumPropSet->getPropertyValue( sNumberingIsOutline ).getValue());
                             }
-                            // <--
                         }
                         else
                         {
@@ -668,7 +662,7 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily,
                                ->hasPropertyByName( sIsAutomatic ) )
                 {
                     bAdd = *(sal_Bool *)xNumPropSet->getPropertyValue( sIsAutomatic ).getValue();
-                    // --> OD 2007-01-12 #i73361# - check on outline style
+                    // Check on outline style (#i73361#)
                     const OUString sNumberingIsOutline( RTL_CONSTASCII_USTRINGPARAM( "NumberingIsOutline" ) );
                     if ( bAdd &&
                          xNumPropSet->getPropertySetInfo()
@@ -676,7 +670,6 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily,
                     {
                         bAdd = !(*(sal_Bool *)xNumPropSet->getPropertyValue( sNumberingIsOutline ).getValue());
                     }
-                    // <--
                 }
                 else
                 {
@@ -846,7 +839,6 @@ OUString XMLTextParagraphExport::FindTextStyle(
 }
 
 
-// --> OD 2008-04-25 #refactorlists#
 // adjustments to support lists independent from list style
 void XMLTextParagraphExport::exportListChange(
         const XMLTextNumRuleInfo& rPrevInfo,
@@ -855,13 +847,11 @@ void XMLTextParagraphExport::exportListChange(
     // end a list
     if ( rPrevInfo.GetLevel() > 0 )
     {
-        bool bRootListToBeClosed = false;
         sal_Int16 nListLevelsToBeClosed = 0;
         if ( !rNextInfo.BelongsToSameList( rPrevInfo ) ||
              rNextInfo.GetLevel() <= 0 )
         {
             // close complete previous list
-            bRootListToBeClosed = true;
             nListLevelsToBeClosed = rPrevInfo.GetLevel();
         }
         else if ( rPrevInfo.GetLevel() > rNextInfo.GetLevel() )
@@ -929,10 +919,8 @@ void XMLTextParagraphExport::exportListChange(
             bool bExportListStyle( true );
             bool bRestartNumberingAtContinuedRootList( false );
             sal_Int16 nRestartValueForContinuedRootList( -1 );
-            // --> OD 2008-11-26 #158694#
             bool bContinueingPreviousSubList = !bRootListToBeStarted &&
                                                rNextInfo.IsContinueingPreviousSubTree();
-            // <--
             do {
                 GetExport().CheckAttrList();
 
@@ -944,11 +932,12 @@ void XMLTextParagraphExport::exportListChange(
                              eODFDefaultVersion >= SvtSaveOptions::ODFVER_012 &&
                              sListId.getLength() > 0 )
                         {
-                            // --> OD 2008-07-31 #i92221#
+                            /* Property text:id at element <text:list> has to be
+                               replaced by property xml:id (#i92221#)
+                            */
                             GetExport().AddAttribute( XML_NAMESPACE_XML,
                                                       XML_ID,
                                                       sListId );
-                            // <--
                         }
                         mpTextListsHelper->KeepListAsProcessed( sListId,
                                                                 sListStyleName,
@@ -962,11 +951,12 @@ void XMLTextParagraphExport::exportListChange(
                              eODFDefaultVersion >= SvtSaveOptions::ODFVER_012 &&
                              sListId.getLength() > 0 )
                         {
-                            // --> OD 2008-07-31 #i92221#
+                            /* Property text:id at element <text:list> has to be
+                               replaced by property xml:id (#i92221#)
+                            */
                             GetExport().AddAttribute( XML_NAMESPACE_XML,
                                                       XML_ID,
                                                       sNewListId );
-                            // <--
                         }
 
                         const ::rtl::OUString sContinueListId =
@@ -977,10 +967,9 @@ void XMLTextParagraphExport::exportListChange(
                                                                     sNewListId );
                         if ( sListStyleName ==
                                 mpTextListsHelper->GetListStyleOfLastProcessedList() &&
-                             // --> OD 2008-08-15 #i92811#
+                             // Inconsistent behavior regarding lists (#i92811#)
                              sContinueListId ==
                                 mpTextListsHelper->GetLastProcessedListId() &&
-                             // <--
                              !rNextInfo.IsRestart() )
                         {
                             GetExport().AddAttribute( XML_NAMESPACE_TEXT,
@@ -1027,14 +1016,12 @@ void XMLTextParagraphExport::exportListChange(
                     bExportListStyle = false;
                 }
 
-                // --> OD 2008-11-26 #158694#
                 if ( bContinueingPreviousSubList )
                 {
                     GetExport().AddAttribute( XML_NAMESPACE_TEXT,
                                               XML_CONTINUE_NUMBERING, XML_TRUE );
                     bContinueingPreviousSubList = false;
                 }
-                // <--
 
                 enum XMLTokenEnum eLName = XML_LIST;
 
@@ -1055,9 +1042,9 @@ void XMLTextParagraphExport::exportListChange(
                 // <text:list-header> or <text:list-item>
                 GetExport().CheckAttrList();
 
-                // --> OD 2009-06-24 #i97309#
-                // export start value in case of <bRestartNumberingAtContinuedRootList>
-                // at correct list item
+                /* Export start value in case of <bRestartNumberingAtContinuedRootList>
+                   at correct list item (#i97309#)
+                */
                 if ( nListLevelsToBeOpened == 1 )
                 {
                     if ( rNextInfo.HasStartValue() )
@@ -1077,7 +1064,6 @@ void XMLTextParagraphExport::exportListChange(
                         bRestartNumberingAtContinuedRootList = false;
                     }
                 }
-                // <--
 
                 eLName = ( rNextInfo.IsNumbered() || nListLevelsToBeOpened > 1 )
                          ? XML_LIST_ITEM
@@ -1090,7 +1076,6 @@ void XMLTextParagraphExport::exportListChange(
 
                 pListElements->Insert( pElem, pListElements->Count() );
 
-                // --> OD 2008-11-26 #158694#
                 // export of <text:number> element for last opened <text:list-item>, if requested
                 if ( GetExport().exportTextNumberElement() &&
                      eLName == XML_LIST_ITEM && nListLevelsToBeOpened == 1 && // last iteration --> last opened <text:list-item>
@@ -1105,8 +1090,6 @@ void XMLTextParagraphExport::exportListChange(
                     GetExport().Characters( rNextInfo.ListLabelString() );
                     GetExport().EndElement( aTextNumberElem, sal_True );
                 }
-                // <--
-
                 --nListLevelsToBeOpened;
             } while ( nListLevelsToBeOpened > 0 );
         }
@@ -1127,10 +1110,9 @@ void XMLTextParagraphExport::exportListChange(
         pListElements->Remove( pListElements->Count()-1 );
         delete pElem;
 
-        // --> OD 2009-11-12 #i103745# - only for sub lists
+        // Only for sub lists (#i103745#)
         if ( rNextInfo.IsRestart() && !rNextInfo.HasStartValue() &&
              rNextInfo.GetLevel() != 1 )
-        // <--
         {
             // start new sub list respectively list on same list level
             pElem = (*pListElements)[pListElements->Count()-1];
@@ -1148,7 +1130,7 @@ void XMLTextParagraphExport::exportListChange(
             GetExport().AddAttribute( XML_NAMESPACE_TEXT, XML_START_VALUE,
                                       aBuffer.makeStringAndClear() );
         }
-        // --> OD 2009-11-12 #i103745# - handle restart without start value on list level 1
+        // Handle restart without start value on list level 1 (#i103745#)
         else if ( rNextInfo.IsRestart() && /*!rNextInfo.HasStartValue() &&*/
                   rNextInfo.GetLevel() == 1 )
         {
@@ -1157,7 +1139,6 @@ void XMLTextParagraphExport::exportListChange(
             GetExport().AddAttribute( XML_NAMESPACE_TEXT, XML_START_VALUE,
                                       aBuffer.makeStringAndClear() );
         }
-        // <--
         if ( ( GetExport().getExportFlags() & EXPORT_OASIS ) != 0 &&
              GetExport().getDefaultVersion() >= SvtSaveOptions::ODFVER_012 )
         {
@@ -1177,7 +1158,6 @@ void XMLTextParagraphExport::exportListChange(
 
         pListElements->Insert( pElem, pListElements->Count() );
 
-        // --> OD 2008-11-26 #158694#
         // export of <text:number> element for <text:list-item>, if requested
         if ( GetExport().exportTextNumberElement() &&
              rNextInfo.ListLabelString().getLength() > 0 )
@@ -1191,10 +1171,8 @@ void XMLTextParagraphExport::exportListChange(
             GetExport().Characters( rNextInfo.ListLabelString() );
             GetExport().EndElement( aTextNumberElem, sal_True );
         }
-        // <--
     }
 }
-// <--
 
 XMLTextParagraphExport::XMLTextParagraphExport(
         SvXMLExport& rExp,
@@ -1205,31 +1183,20 @@ XMLTextParagraphExport::XMLTextParagraphExport(
     pBoundFrameSets(new BoundFrameSets(GetExport().GetModel())),
     pFieldExport( 0 ),
     pListElements( 0 ),
-    // --> OD 2008-05-07 #refactorlists# - no longer needed
-//    pExportedLists( 0 ),
-    // <--
     pListAutoPool( new XMLTextListAutoStylePool( this->GetExport() ) ),
     pSectionExport( NULL ),
     pIndexMarkExport( NULL ),
-
     pRedlineExport( NULL ),
     pHeadingStyles( NULL ),
-
     bProgress( sal_False ),
     bBlock( sal_False ),
-
     bOpenRuby( sal_False ),
-    // --> OD 2008-04-25 #refactorlists#
     mpTextListsHelper( 0 ),
     maTextListsHelperStack(),
-    // <--
-
     sActualSize(RTL_CONSTASCII_USTRINGPARAM("ActualSize")),
-    // --> OD 2009-07-22 #i73249#
-//    sAlternativeText(RTL_CONSTASCII_USTRINGPARAM("AlternativeText")),
+    // Implement Title/Description Elements UI (#i73249#)
     sTitle(RTL_CONSTASCII_USTRINGPARAM("Title")),
     sDescription(RTL_CONSTASCII_USTRINGPARAM("Description")),
-    // <--
     sAnchorCharStyleName(RTL_CONSTASCII_USTRINGPARAM("AnchorCharStyleName")),
     sAnchorPageNo(RTL_CONSTASCII_USTRINGPARAM("AnchorPageNo")),
     sAnchorType(RTL_CONSTASCII_USTRINGPARAM("AnchorType")),
@@ -1373,10 +1340,7 @@ XMLTextParagraphExport::XMLTextParagraphExport(
                                 "", XML_NAMESPACE_STYLE,
                                 GetXMLToken(XML_TEXT_COMBINE));
     pFieldExport = new XMLTextFieldExport( rExp, new XMLPropertyState( nIndex, uno::makeAny(sal_True) ) );
-
-    // --> OD 2008-05-08 #refactorlists#
     PushNewTextListsHelper();
-    // <--
 }
 
 XMLTextParagraphExport::~XMLTextParagraphExport()
@@ -1387,19 +1351,13 @@ XMLTextParagraphExport::~XMLTextParagraphExport()
     delete pSectionExport;
     delete pFieldExport;
     delete pListElements;
-    // --> OD 2008-05-07 #refactorlists# - no longer needed
-//    delete pExportedLists;
-    // <--
     delete pListAutoPool;
 #ifdef DBG_UTIL
     txtparae_bContainsIllegalCharacters = sal_False;
 #endif
-    // --> OD 2008-04-25 #refactorlists#
-    // also deletes <mpTextListsHelper>
     PopTextListsHelper();
     DBG_ASSERT( maTextListsHelperStack.size() == 0,
                 "misusage of text lists helper stack - it is not empty. Serious defect - please inform OD" );
-    // <--
 }
 
 SvXMLExportPropertyMapper *XMLTextParagraphExport::CreateShapeExtPropMapper(
@@ -1564,7 +1522,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( sal_Bool bIsProgres
             {
                 Reference < XPropertySet > xSet( xTextField, UNO_QUERY );
                 Reference < XText > xText;
-                Any a = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("TextRange") );
+                Any a = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextRange")) );
                 a >>= xText;
                 if ( xText.is() )
                 {
@@ -1665,9 +1623,8 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( sal_Bool bIsProgres
     {
         Reference< XIndexAccess > xNumberingRules = xNumberingRulesSupp->getNumberingRules();
         nCount = xNumberingRules->getCount();
-        // --> OD 2007-01-12 #i73361#
+        // Custom outline assignment lost after re-importing sxw (#i73361#)
         const OUString sNumberingIsOutline( RTL_CONSTASCII_USTRINGPARAM( "NumberingIsOutline" ) );
-        // <--
         for( sal_Int32 i = 0; i < nCount; ++i )
         {
             Reference< XIndexReplace > xNumRule( xNumberingRules->getByIndex( i ), UNO_QUERY );
@@ -1688,14 +1645,13 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( sal_Bool bIsProgres
                                    ->hasPropertyByName( sIsAutomatic ) )
                     {
                         bAdd = *(sal_Bool *)xNumPropSet->getPropertyValue( sIsAutomatic ).getValue();
-                        // --> OD 2007-01-12 #i73361# - check on outline style
+                        // Check on outline style (#i73361#)
                         if ( bAdd &&
                              xNumPropSet->getPropertySetInfo()
                                        ->hasPropertyByName( sNumberingIsOutline ) )
                         {
                             bAdd = !(*(sal_Bool *)xNumPropSet->getPropertyValue( sNumberingIsOutline ).getValue());
                         }
-                        // <--
                     }
                     else
                     {
@@ -1855,17 +1811,14 @@ sal_Bool XMLTextParagraphExport::exportTextContentEnumeration(
                 }
                 else
                 {
-                    // --> OD 2006-09-27 #i69627#
-                    // --> OD 2008-04-24 #refactorlists#
-                    // pass list auto style pool to <XMLTextNumRuleInfo> instance
-                    // --> OD 2008-11-26 #158694#
-                    // pass info about request to export <text:number> element
-                    // to <XMLTextNumRuleInfo> instance
+                    /* Pass list auto style pool to <XMLTextNumRuleInfo> instance
+                       Pass info about request to export <text:number> element
+                       to <XMLTextNumRuleInfo> instance (#i69627#)
+                    */
                     aNextNumInfo.Set( xTxtCntnt,
                                       GetExport().writeOutlineStyleAsNormalListStyle(),
                                       GetListAutoStylePool(),
                                       GetExport().exportTextNumberElement() );
-                    // <--
 
                     exportListAndSectionChange( xCurrentTextSection, aPropSetHelper,
                                                 TEXT_SECTION, xTxtCntnt,
@@ -2065,24 +2018,19 @@ void XMLTextParagraphExport::exportParagraph(
                 }
             }
 
-            //if( rPropSetHelper.hasProperty( PARA_CHAPTER_NUMERBING_LEVEL ) )  //#outline level,zhaojianwei
-            if( rPropSetHelper.hasProperty( PARA_OUTLINE_LEVEL ) )              //<-end
+            if( rPropSetHelper.hasProperty( PARA_OUTLINE_LEVEL ) )
             {
                 if( xMultiPropSet.is() )
-                    //rPropSetHelper.getValue( PARA_CHAPTER_NUMERBING_LEVEL,    //#outline level,zhaojianwei
-                    rPropSetHelper.getValue( PARA_OUTLINE_LEVEL,                //<-end
+                    rPropSetHelper.getValue( PARA_OUTLINE_LEVEL,
                                                      xMultiPropSet ) >>= nOutlineLevel;
                 else
-                    //rPropSetHelper.getValue( PARA_CHAPTER_NUMERBING_LEVEL,    //#outline level,zhaojianwei
-                    rPropSetHelper.getValue( PARA_OUTLINE_LEVEL,                //<-end
+                    rPropSetHelper.getValue( PARA_OUTLINE_LEVEL,
                                                      xPropSet ) >>= nOutlineLevel;
 
-                //if( -1 != nOutlineLevel ) //#outline level,zhaojianwei
-                if( 0 < nOutlineLevel ) //<-end,zhaojianwei
+                if( 0 < nOutlineLevel )
                 {
                     OUStringBuffer sTmp;
-                    //sTmp.append( sal_Int32( nOutlineLevel + 1 ) );    //#outline level,zhaojianwei
-                    sTmp.append( sal_Int32( nOutlineLevel) );       //<-end,zhaojianwei
+                    sTmp.append( sal_Int32( nOutlineLevel) );
                     GetExport().AddAttribute( XML_NAMESPACE_TEXT,
                                               XML_OUTLINE_LEVEL,
                                   sTmp.makeStringAndClear() );
@@ -2107,7 +2055,7 @@ void XMLTextParagraphExport::exportParagraph(
 
 
 
-                        bool bAssignedtoOutlineStyle = false;//#outline level,add by zhaojianwei
+                        bool bAssignedtoOutlineStyle = false;
                         {
                             Reference< XChapterNumberingSupplier > xCNSupplier( GetExport().GetModel(), UNO_QUERY );
 
@@ -2125,11 +2073,9 @@ void XMLTextParagraphExport::exportParagraph(
                                     bAssignedtoOutlineStyle = ( sListStyleName == sOutlineName );
                                 }
                             }
+                        }
 
-                        }   //<end,zhaojianwei
-
-                        //if( ! bIsNumber )         //#outline level,removed by zhaojianwei
-                        if( ! bIsNumber && bAssignedtoOutlineStyle )    //#outline level,add by zhaojianwei
+                        if( ! bIsNumber && bAssignedtoOutlineStyle )
                             GetExport().AddAttribute( XML_NAMESPACE_TEXT,
                                                       XML_IS_LIST_HEADER,
                                                       XML_TRUE );
@@ -2164,11 +2110,11 @@ void XMLTextParagraphExport::exportParagraph(
                                  ("NumberingStartValue"));
 
 
-                            sal_Int32 nStartValue = 0;
-
                             if (xPropSetInfo->
                                 hasPropertyByName(sNumberingStartValue))
                             {
+                                sal_Int32 nStartValue = 0;
+
                                 xPropSet->getPropertyValue(sNumberingStartValue)
                                     >>= nStartValue;
 
@@ -2238,8 +2184,7 @@ void XMLTextParagraphExport::exportParagraph(
     {
         sal_Bool bPrevCharIsSpace = sal_True;
         enum XMLTokenEnum eElem =
-            //-1 == nOutlineLevel ? XML_P : XML_H;  //#outline level,zhaojianwei
-            0 < nOutlineLevel ? XML_H : XML_P;  //<-end,zhaojianwei
+            0 < nOutlineLevel ? XML_H : XML_P;
         SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, eElem,
                                   sal_True, sal_False );
         if( bHasContentEnum )
@@ -2752,10 +2697,9 @@ void XMLTextParagraphExport::exportAnyTextFrame(
     {
         if( FT_EMBEDDED == eType )
             _collectTextEmbeddedAutoStyles( xPropSet );
-        // --> OD 2004-08-09 #i28745# - no text frame style for shapes
+        // No text frame style for shapes (#i28745#)
         else if ( FT_SHAPE != eType )
             Add( XML_STYLE_FAMILY_TEXT_FRAME, xPropSet );
-        // <--
 
         if( pRangePropSet && lcl_txtpara_isBoundAsChar( xPropSet,
                                             xPropSet->getPropertySetInfo() ) )
@@ -2905,10 +2849,8 @@ void XMLTextParagraphExport::_exportTextFrame(
     // image map
     GetExport().GetImageMapExport().Export( rPropSet );
 
-    // --> OD 2009-07-22 #i73249#
-    // svg:title and svg:desc
+    // svg:title and svg:desc (#i73249#)
     exportTitleAndDescription( rPropSet, rPropSetInfo );
-    // <--
 }
 
 void XMLTextParagraphExport::exportContour(
@@ -3100,10 +3042,8 @@ void XMLTextParagraphExport::_exportTextGraphic(
     // image map
     GetExport().GetImageMapExport().Export( rPropSet );
 
-    // --> OD 2009-07-22 #i73249#
-    // svg:title and svg:desc
+    // svg:title and svg:desc (#i73249#)
     exportTitleAndDescription( rPropSet, rPropSetInfo );
-    // <--
 
     // draw:contour
     exportContour( rPropSet, rPropSetInfo );
@@ -3133,7 +3073,7 @@ void XMLTextParagraphExport::exportEvents( const Reference < XPropertySet > & rP
         GetExport().GetImageMapExport().Export( rPropSet );
 }
 
-// --> OD 2009-07-22 #i73249#
+// Implement Title/Description Elements UI (#i73249#)
 void XMLTextParagraphExport::exportTitleAndDescription(
         const Reference < XPropertySet > & rPropSet,
         const Reference < XPropertySetInfo > & rPropSetInfo )
@@ -3164,7 +3104,6 @@ void XMLTextParagraphExport::exportTitleAndDescription(
         }
     }
 }
-// <--
 
 void XMLTextParagraphExport::setTextEmbeddedGraphicURL(
     const Reference < XPropertySet >&,
@@ -3889,7 +3828,6 @@ sal_Int32 XMLTextParagraphExport::GetHeadingLevel( const OUString& rStyleName )
     return -1;
 }
 
-// --> OD 2008-05-08 #refactorlists#
 void XMLTextParagraphExport::PushNewTextListsHelper()
 {
     mpTextListsHelper = new XMLTextListsHelper();
@@ -3906,6 +3844,5 @@ void XMLTextParagraphExport::PopTextListsHelper()
         mpTextListsHelper = maTextListsHelperStack.back();
     }
 }
-// <--
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index ecf5ca7f4f29..31a6f7625042 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -919,8 +919,8 @@ void XMLMetaImportContext::InsertMeta(
         const uno::Reference<rdf::XMetadatable> xMeta(
             XMLTextMarkImportContext::CreateAndInsertMark(
                 GetImport(),
-                OUString::createFromAscii(
-                    "com.sun.star.text.InContentMetadata"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.text.InContentMetadata")),
                 OUString(),
                 i_xInsertionRange, m_XmlId),
             uno::UNO_QUERY);
@@ -998,8 +998,8 @@ void XMLMetaFieldImportContext::InsertMeta(
         const Reference<XPropertySet> xPropertySet(
             XMLTextMarkImportContext::CreateAndInsertMark(
                 GetImport(),
-                OUString::createFromAscii(
-                    "com.sun.star.text.textfield.MetadataField"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.text.textfield.MetadataField")),
                 OUString(),
                 i_xInsertionRange, m_XmlId),
             UNO_QUERY);
@@ -1016,11 +1016,11 @@ void XMLMetaFieldImportContext::InsertMeta(
             if (-1 != nKey)
             {
                 static ::rtl::OUString sPropertyIsFixedLanguage(
-                    ::rtl::OUString::createFromAscii("IsFixedLanguage") );
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFixedLanguage")) );
                 Any any;
                 any <<= nKey;
                 xPropertySet->setPropertyValue(
-                    OUString::createFromAscii("NumberFormat"), any);
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("NumberFormat")), any);
                 if ( xPropertySet->getPropertySetInfo()->
                         hasPropertyByName( sPropertyIsFixedLanguage ) )
                 {
@@ -1753,11 +1753,10 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
                 new XMLTextFrameContext( rImport, nPrefix,
                                          rLocalName, xAttrList,
                                          TextContentAnchorType_AS_CHARACTER );
-            // --> OD 2004-08-24 #i33242# - remove check for text content.
+            // Remove check for text content. (#i33242#)
             // Check for text content is done on the processing of the hint
             if( TextContentAnchorType_AT_CHARACTER ==
                                             pTextFrameContext->GetAnchorType() )
-            // <--
             {
                 rHints.Insert( new XMLTextFrameHint_Impl(
                     pTextFrameContext, xAnchorPos ),
@@ -1906,15 +1905,14 @@ XMLParaContext::XMLParaContext(
     m_bHaveAbout(false),
     nOutlineLevel( IsXMLToken( rLName, XML_H ) ? 1 : -1 ),
     pHints( 0 ),
-    // --> OD 2007-07-25 #i73509#
+    // Lost outline numbering in master document (#i73509#)
     mbOutlineLevelAttrFound( sal_False ),
-    // <--
     bIgnoreLeadingSpace( sal_True ),
     bHeading( bHead ),
     bIsListHeader( false ),
     bIsRestart (false),
-    nStartValue(0)
-    ,nStarFontsConvFlags( 0 )
+    nStartValue(0),
+    nStarFontsConvFlags( 0 )
 {
     const SvXMLTokenMap& rTokenMap =
         GetImport().GetTextImport()->GetTextPAttrTokenMap();
@@ -1972,9 +1970,8 @@ XMLParaContext::XMLParaContext(
                         nTmp = 127;
                     nOutlineLevel = (sal_Int8)nTmp;
                 }
-                // --> OD 2007-07-25 #i73509#
+                // Lost outline numbering in master document (#i73509#)
                 mbOutlineLevelAttrFound = sal_True;
-                // <--
             }
             break;
         case XML_TOK_TEXT_P_IS_LIST_HEADER:
@@ -2077,15 +2074,14 @@ XMLParaContext::~XMLParaContext()
     OUString const sCellParaStyleName(xTxtImport->GetCellParaStyleDefault());
     if( sCellParaStyleName.getLength() > 0 )
     {
-        // --> OD 2007-08-16 #i80724#
-        // suppress handling of outline and list attributes,
-        // because of side effects of method <SetStyleAndAttrs(..)>
+        /* Suppress handling of outline and list attributes,
+           because of side effects of method <SetStyleAndAttrs(..)> (#i80724#)
+        */
         xTxtImport->SetStyleAndAttrs( GetImport(), xAttrCursor,
                                       sCellParaStyleName,
                                       sal_True,
                                       sal_False, -1, // suppress outline handling
                                       sal_False );   // suppress list attributes handling
-        // <--
     }
 
     // #103445# for headings without style name, find the proper style
@@ -2093,13 +2089,12 @@ XMLParaContext::~XMLParaContext()
         xTxtImport->FindOutlineStyleName( sStyleName, nOutlineLevel );
 
     // set style and hard attributes at the previous paragraph
-    // --> OD 2007-07-25 #i73509# - add paramter <mbOutlineLevelAttrFound>
+    // Add paramter <mbOutlineLevelAttrFound> (#i73509#)
     sStyleName = xTxtImport->SetStyleAndAttrs( GetImport(), xAttrCursor,
                                                sStyleName,
                                                sal_True,
                                                mbOutlineLevelAttrFound,
                                                bHeading ? nOutlineLevel : -1 );
-    // <--
 
     // handle list style header
     if (bHeading && (bIsListHeader || bIsRestart))
@@ -2214,21 +2209,23 @@ XMLParaContext::~XMLParaContext()
                 {
                     const XMLTextFrameHint_Impl *pFHint =
                         (const XMLTextFrameHint_Impl *)pHint;
-                    // --> OD 2004-08-24 #i33242# - check for text content
+                    // Check for text content (#i33242#)
                     Reference < XTextContent > xTextContent =
                                                     pFHint->GetTextContent();
                     if ( xTextContent.is() )
                     {
-                        // OD 2004-04-20 #i26791#
+                        /* Core impl. of the unification of drawing objects and
+                           Writer fly frames (#i26791#)
+                        */
                         Reference<XTextRange> xRange(xAttrCursor, UNO_QUERY);
                         if ( pFHint->IsBoundAtChar() )
                         {
                             xTextContent->attach( xRange );
                         }
                     }
-                    // <--
-                    // --> OD 2004-08-24 #i33242# - consider, that hint can
-                    // also contain a shape - e.g. drawing object of type 'Text'.
+                    /* Consider, that hint can also contain a shape -
+                       e.g. drawing object of type 'Text'. (#i33242#)
+                    */
                     else
                     {
                         Reference < XShape > xShape = pFHint->GetShape();
@@ -2254,16 +2251,16 @@ XMLParaContext::~XMLParaContext()
                             }
                         }
                     }
-                    // <--
                 }
                 break;
-            // --> DVO, OD 2004-07-14 #i26791#
+            /* Core impl. of the unification of drawing objects and
+               Writer fly frames (#i26791#)
+            */
             case XML_HINT_DRAW:
                 {
                     const XMLDrawHint_Impl *pDHint =
                         static_cast<const XMLDrawHint_Impl*>(pHint);
-                    // --> OD 2004-08-24 #i33242# - improvement: hint directly
-                    // provides the shape.
+                    // Improvement: hint directly provides the shape. (#i33242#)
                     Reference < XShape > xShape = pDHint->GetShape();
                     if ( xShape.is() )
                     {
@@ -2285,11 +2282,8 @@ XMLParaContext::~XMLParaContext()
                             xPropSet->setPropertyValue(sTextRange, aPos);
                         }
                     }
-                    // <--
                 }
                 break;
-            // <--
-
             default:
                 DBG_ASSERT( !this, "What's this" );
                 break;
diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx
index 5a33f5880f06..3aba676617d8 100644
--- a/xmloff/source/text/txtparai.hxx
+++ b/xmloff/source/text/txtparai.hxx
@@ -55,9 +55,8 @@ class XMLParaContext : public SvXMLImportContext
     bool                        m_bHaveAbout;
     sal_Int8                nOutlineLevel;
     XMLHints_Impl           *pHints;
-    // --> OD 2007-07-25 #i73509#
+    // Lost outline numbering in master document (#i73509#)
     sal_Bool                mbOutlineLevelAttrFound;
-    // <--
     sal_Bool                bIgnoreLeadingSpace;
     sal_Bool                bHeading;
     sal_Bool                bIsListHeader;
diff --git a/xmloff/source/text/txtparaimphint.hxx b/xmloff/source/text/txtparaimphint.hxx
index 0702009ef3b2..4c1ba62fd7fc 100644
--- a/xmloff/source/text/txtparaimphint.hxx
+++ b/xmloff/source/text/txtparaimphint.hxx
@@ -49,9 +49,8 @@ using namespace ::xmloff::token;
 #define XML_HINT_HYPERLINK 3
 #define XML_HINT_INDEX_MARK 5
 #define XML_HINT_TEXT_FRAME 6
-// --> DVO, OD 2004-07-14 #i26791#
+// Core impl. of the unification of drawing objects and Writer fly frames (#i26791#)
 #define XML_HINT_DRAW 7
-// <--
 
 class XMLHint_Impl
 {
@@ -238,7 +237,7 @@ public:
         return xTxt;
     }
 
-    // --> OD 2004-08-24 #i33242#
+    // Frame "to character": anchor moves from first to last char after saving (#i33242#)
     Reference < drawing::XShape > GetShape() const
     {
         Reference < drawing::XShape > xShape;
@@ -250,7 +249,6 @@ public:
 
         return xShape;
     }
-    // <--
 
     sal_Bool IsBoundAtChar() const
     {
@@ -268,7 +266,7 @@ public:
     }
 };
 
-// --> DVO, OD 2004-07-14 #i26791#
+// Core impl. of the unification of drawing objects and Writer fly frames (#i26791#)
 class XMLDrawHint_Impl : public XMLHint_Impl
 {
     SvXMLImportContextRef xContext;
@@ -286,14 +284,12 @@ public:
     {
     }
 
-    // --> OD 2004-08-24 #i33242#
+    // Frame "to character": anchor moves from first to last char after saving (#i33242#)
     Reference < drawing::XShape > GetShape() const
     {
         return static_cast<SvXMLShapeContext*>(&xContext)->getShape();
     }
-    // <--
 };
-// <--
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx
index 1a905e885c42..a8d64fd2f45c 100644
--- a/xmloff/source/text/txtprhdl.cxx
+++ b/xmloff/source/text/txtprhdl.cxx
@@ -244,12 +244,10 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_VerticalAlign_Enum[] =
 // OD 2004-05-05 #i28701#
 SvXMLEnumMapEntry __READONLY_DATA pXML_WrapInfluenceOnPosition_Enum[] =
 {
-    // --> OD 2004-10-18 #i35017# - tokens have been renamed and
-    // <XML_ITERATIVE> has been added
+    // Tokens have been renamed and <XML_ITERATIVE> has been added (#i35017#)
     { XML_ONCE_SUCCESSIVE, WrapInfluenceOnPosition::ONCE_SUCCESSIVE },
     { XML_ONCE_CONCURRENT, WrapInfluenceOnPosition::ONCE_CONCURRENT },
     { XML_ITERATIVE,       WrapInfluenceOnPosition::ITERATIVE },
-    // <--
     { XML_TOKEN_INVALID, 0 }
 };
 
@@ -854,12 +852,12 @@ sal_Bool XMLGrfMirrorPropHdl_Impl::exportXML(
                rStrExpValue = sVal;
         }
         else if( bHori &&
-                 // --> OD 2005-05-12 #i49139#
-                 // XML_HORIZONTAL_ON_LEFT_PAGES and XML_HORIZONTAL_ON_RIGHT_PAGES
-                 // are replaced by XML_HORIZONTAL_ON_EVEN and XML_HORIZONTAL_ON_ODD.
+                 /* XML_HORIZONTAL_ON_LEFT_PAGES and XML_HORIZONTAL_ON_RIGHT_PAGES
+                    are replaced by XML_HORIZONTAL_ON_EVEN and XML_HORIZONTAL_ON_ODD.
+                    (#i49139#)
+                 */
                  ( IsXMLToken( rStrExpValue, XML_HORIZONTAL_ON_EVEN ) ||
                    IsXMLToken( rStrExpValue, XML_HORIZONTAL_ON_ODD ) ))
-                 // <--
         {
             rStrExpValue = GetXMLToken( XML_HORIZONTAL );
         }
@@ -1342,16 +1340,12 @@ const XMLPropertyHandler *XMLTextPropertyHandlerFactory_Impl::GetPropertyHandler
         pHdl = new XMLGrfMirrorPropHdl_Impl( XML_VERTICAL, sal_False );
         break;
     case XML_TYPE_TEXT_MIRROR_HORIZONTAL_LEFT:
-        // --> OD 2005-05-12 #i49139#
-        // XML_HORIZONTAL_ON_LEFT_PAGES is replaced by XML_HORIZONTAL_ON_EVEN.
+        // XML_HORIZONTAL_ON_LEFT_PAGES is replaced by XML_HORIZONTAL_ON_EVEN. (#i49139#)
         pHdl = new XMLGrfMirrorPropHdl_Impl( XML_HORIZONTAL_ON_EVEN, sal_True );
-        // <--
         break;
     case XML_TYPE_TEXT_MIRROR_HORIZONTAL_RIGHT:
-        // --> OD 2005-05-12 #i49139#
-        // XML_HORIZONTAL_ON_RIGHT_PAGES is replaced by XML_HORIZONTAL_ON_ODD.
+        // XML_HORIZONTAL_ON_RIGHT_PAGES is replaced by XML_HORIZONTAL_ON_ODD. (#i49139#)
         pHdl = new XMLGrfMirrorPropHdl_Impl( XML_HORIZONTAL_ON_ODD, sal_True );
-        // <--
         break;
     case XML_TYPE_TEXT_CLIP:
         pHdl = new XMLClipPropertyHandler( sal_False );
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index 1183536009a5..fac9e1abe5c1 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -737,10 +737,10 @@ XMLPropertyMapEntry aXMLShapePropMap[] =
     MG_E( "SurroundAnchorOnly",     STYLE,  NUMBER_WRAPPED_PARAGRAPHS,  XML_TYPE_TEXT_PARAGRAPH_ONLY, CTF_WRAP_PARAGRAPH_ONLY ),
     MG_E( "SurroundContour",            STYLE,  WRAP_CONTOUR,   XML_TYPE_BOOL, CTF_WRAP_CONTOUR ),
     MG_E( "ContourOutside",         STYLE,  WRAP_CONTOUR_MODE,  XML_TYPE_TEXT_WRAP_OUTSIDE, CTF_WRAP_CONTOUR_MODE ),
-    // --> OD 2004-08-09 #i28749# - use own CTF ids for positioning attributes
+    // Use own CTF ids for positioning attributes (#i28749#)
     // RES_VERT_ORIENT
     MG_E( "VertOrient",         STYLE,  VERTICAL_POS,   XML_TYPE_TEXT_VERTICAL_POS, CTF_SHAPE_VERTICALPOS ),
-    // OD 2004-04-16 #i26791# - add property for at-character anchored shapes
+    // Add property for at-character anchored shapes (#i26791#)
     MG_E( "VertOrient",         STYLE,  VERTICAL_POS,   XML_TYPE_TEXT_VERTICAL_POS_AT_CHAR, CTF_SHAPE_VERTICALPOS_ATCHAR ),
     MG_E( "VertOrient",         STYLE,  VERTICAL_REL,   XML_TYPE_TEXT_VERTICAL_REL_AS_CHAR|MID_FLAG_MULTI_PROPERTY, CTF_VERTICALREL_ASCHAR ),
     MG_E( "VertOrientRelation", STYLE,  VERTICAL_REL,   XML_TYPE_TEXT_VERTICAL_REL, CTF_SHAPE_VERTICALREL ),
@@ -752,13 +752,12 @@ XMLPropertyMapEntry aXMLShapePropMap[] =
     MG_E( "HoriOrient",         STYLE,  HORIZONTAL_POS, XML_TYPE_TEXT_HORIZONTAL_POS_MIRRORED|MID_FLAG_SPECIAL_ITEM_IMPORT, CTF_SHAPE_HORIZONTALPOS_MIRRORED ),
     MG_E( "HoriOrientRelation", STYLE,  HORIZONTAL_REL, XML_TYPE_TEXT_HORIZONTAL_REL, CTF_SHAPE_HORIZONTALREL ),
     MG_E( "HoriOrientRelation", STYLE,  HORIZONTAL_REL, XML_TYPE_TEXT_HORIZONTAL_REL_FRAME|MID_FLAG_SPECIAL_ITEM_IMPORT, CTF_SHAPE_HORIZONTALREL_FRAME ),
-    // <--
-    // OD 2004-05-05 #i28701# - RES_WRAP_INFLUENCE_ON_OBJPOS
+    // RES_WRAP_INFLUENCE_ON_OBJPOS (#i28701#)
     MG_ED( "WrapInfluenceOnPosition", DRAW, WRAP_INFLUENCE_ON_POSITION, XML_TYPE_WRAP_INFLUENCE_ON_POSITION, 0 ),
     // UserDefinedAttributes is already contained in the map this one is
     // chained to.
 
-    // RES_FOLLOW_TEXT_FLOW - OD 2004-04-21 #i26791#
+    // RES_FOLLOW_TEXT_FLOW (#i26791#)
     MG_ED( "IsFollowingTextFlow", STYLE, FLOW_WITH_TEXT,      XML_TYPE_BOOL, 0 ),
 
     M_END()
@@ -804,12 +803,8 @@ XMLPropertyMapEntry aXMLSectionPropMap[] =
     MS_E( "EndnoteNumberingSuffix",     TEXT,   _EMPTY,     MID_FLAG_SPECIAL_ITEM|XML_TYPE_STRING,  CTF_SECTION_ENDNOTE_NUM_SUFFIX ),
     MS_E( "EndnoteIsCollectAtTextEnd",  TEXT,   NOTES_CONFIGURATION,        MID_FLAG_ELEMENT_ITEM|XML_TYPE_BOOL,    CTF_SECTION_ENDNOTE_END ),
     MS_E( "UserDefinedAttributes",      TEXT,   XMLNS,      XML_TYPE_ATTRIBUTE_CONTAINER | MID_FLAG_SPECIAL_ITEM, 0 ),
-
-    // --> FME 2004-06-22 #114856# edit in readonly sections
     // RES_EDIT_IN_READONLY
     MS_E( "EditInReadonly",             STYLE,  EDITABLE,  XML_TYPE_BOOL, 0 ),
-    // <--
-
     M_END()
 };
 
diff --git a/xmloff/source/text/txtstyle.cxx b/xmloff/source/text/txtstyle.cxx
index 8ad962f8023f..18a80b55935f 100644
--- a/xmloff/source/text/txtstyle.cxx
+++ b/xmloff/source/text/txtstyle.cxx
@@ -113,17 +113,6 @@ void XMLTextParagraphExport::exportStyleAttributes(
                                           GetExport().EncodeStyleName( sName ) );
         }
     }
-    //sal_Int32 nOutlineLevel = //#outline level, zhaojianwei, moved to styleexp.cxx - XMLStyleExport::exportStyle(¡­¡­)
-    //  GetExport().GetTextParagraphExport()->GetHeadingLevel( rStyle->getName() );
-    //if( nOutlineLevel != -1 )
-    //{
-    //  OUStringBuffer sTmp;
-    //              sTmp.append( static_cast<sal_Int32>(nOutlineLevel+1L) );
-    //  GetExport().AddAttribute( XML_NAMESPACE_STYLE,
-    //                      XML_DEFAULT_OUTLINE_LEVEL,
-    //                      sTmp.makeStringAndClear() );
-    //}
-
     if( bProgress )
     {
         ProgressBarHelper *pProgress = GetExport().GetProgressBarHelper();
diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx
index dde61ec91e53..cffc6a7fa5ed 100644
--- a/xmloff/source/text/txtstyli.cxx
+++ b/xmloff/source/text/txtstyli.cxx
@@ -99,9 +99,8 @@ void XMLTextStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
         else if( IsXMLToken( rLocalName, XML_LIST_STYLE_NAME ) )
         {
             sListStyleName = rValue;
-            // --> OD 2006-09-21 #i69523#
+            // Inherited paragraph style lost information about unset numbering (#i69523#)
             mbListStyleSet = sal_True;
-            // <--
         }
         else if( IsXMLToken( rLocalName, XML_MASTER_PAGE_NAME ) )
         {
@@ -120,8 +119,7 @@ void XMLTextStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
         {
             sal_Int32 nTmp;
             if( SvXMLUnitConverter::convertNumber( nTmp, rValue ) &&
-            //  nTmp > 0 && nTmp < 256 )    //#outline level, removed by zhaojianwei
-                0 <= nTmp && nTmp <= 10 )   //<-end,add by zhaojianwei
+                0 <= nTmp && nTmp <= 10 )
                 nOutlineLevel = static_cast< sal_Int8 >( nTmp );
         }
         else
@@ -146,17 +144,15 @@ XMLTextStyleContext::XMLTextStyleContext( SvXMLImport& rImport,
 ,   sIsAutoUpdate( RTL_CONSTASCII_USTRINGPARAM( "IsAutoUpdate" ) )
 ,   sCategory( RTL_CONSTASCII_USTRINGPARAM( "Category" ) )
 ,   sNumberingStyleName( RTL_CONSTASCII_USTRINGPARAM( "NumberingStyleName" ) )
-,       sOutlineLevel(RTL_CONSTASCII_USTRINGPARAM( "OutlineLevel" ) )//#outline level,add by zhaojianwei
+,       sOutlineLevel(RTL_CONSTASCII_USTRINGPARAM( "OutlineLevel" ) )
 ,   sDropCapCharStyleName( RTL_CONSTASCII_USTRINGPARAM( "DropCapCharStyleName" ) )
 ,   sPageDescName( RTL_CONSTASCII_USTRINGPARAM( "PageDescName" ) )
-//, nOutlineLevel( 0 )  // removed by zhaojianwei
-,   nOutlineLevel( -1 ) //<-end, add by zhaojianwei
+,   nOutlineLevel( -1 )
 ,   bAutoUpdate( sal_False )
 ,   bHasMasterPageName( sal_False )
 ,   bHasCombinedCharactersLetter( sal_False )
-// --> OD 2006-09-21 #i69523#
+// Inherited paragraph style lost information about unset numbering (#i69523#)
 ,   mbListStyleSet( sal_False )
-// <--
 ,   pEventContext( NULL )
 {
 }
@@ -254,13 +250,12 @@ void XMLTextStyleContext::CreateAndInsert( sal_Bool bOverwrite )
         pEventContext->ReleaseRef();
     }
 
-    // --> OD 2006-10-12 #i69629#
+    // XML import: reconstrution of assignment of paragraph style to outline levels (#i69629#)
     if ( nOutlineLevel > 0 )
     {
         GetImport().GetTextImport()->AddOutlineStyleCandidate( nOutlineLevel,
                                                       GetDisplayName() );
     }
-    // <--
 }
 
 void XMLTextStyleContext::SetDefaults( )
@@ -286,23 +281,19 @@ void XMLTextStyleContext::Finish( sal_Bool bOverwrite )
     XMLPropStyleContext::Finish( bOverwrite );
 
     Reference < XStyle > xStyle = GetStyle();
-    // --> OD 2006-09-21 #i69523#
-    // consider set empty list style
-//    if ( !( sListStyleName.getLength() ||
+    // Consider set empty list style (#i69523#)
     if ( !( mbListStyleSet ||
-            nOutlineLevel >= 0 ||   //#outline level,add by zhaojianwei
+            nOutlineLevel >= 0 ||
             sDropCapTextStyleName.getLength() ||
             bHasMasterPageName ) ||
          !xStyle.is() ||
          !( bOverwrite || IsNew() ) )
         return;
-    // <--
 
     Reference < XPropertySet > xPropSet( xStyle, UNO_QUERY );
     Reference< XPropertySetInfo > xPropSetInfo =
                 xPropSet->getPropertySetInfo();
 
-    //#outline level,add by zhaojianwei
     if( xPropSetInfo->hasPropertyByName( sOutlineLevel ))
     {
         Any aAny;
@@ -312,24 +303,19 @@ void XMLTextStyleContext::Finish( sal_Bool bOverwrite )
             xPropSet->setPropertyValue( sOutlineLevel, aAny );
         }
     }
-    //<-end,zhaojianwei
 
-
-    // --> OD 2006-09-21 #i69523#
-    // consider set empty list style
-//    if( sListStyleName.getLength() )
+    // Consider set empty list style (#i69523#)
     if ( mbListStyleSet &&
          xPropSetInfo->hasPropertyByName( sNumberingStyleName ) )
     {
-        // --> OD 2006-10-12 #i70223#
-        // Only for text document from version prior OOo 2.1 resp. SO 8 PU5:
-        // - Do not apply list style, if paragraph style has a default outline
-        //   level > 0 and thus, will be assigned to the corresponding list
-        //   level of the outline style.
+        /* Only for text document from version prior OOo 2.1 resp. SO 8 PU5:
+           - Do not apply list style, if paragraph style has a default outline
+             level > 0 and thus, will be assigned to the corresponding list
+             level of the outline style. (#i70223#)
+        */
         bool bApplyListStyle( true );
         if ( nOutlineLevel > 0 )
         {
-            // --> OD 2007-12-19 #152540#
             if ( GetImport().IsTextDocInOOoFileFormat() )
             {
                 bApplyListStyle = false;
@@ -338,17 +324,14 @@ void XMLTextStyleContext::Finish( sal_Bool bOverwrite )
             {
                 sal_Int32 nUPD( 0 );
                 sal_Int32 nBuild( 0 );
-                // --> OD 2008-03-19 #i86058#
-                // check explicitly on certain versions
+                // Check explicitly on certain versions (#i86058#)
                 if ( GetImport().getBuildIds( nUPD, nBuild ) &&
                      ( ( nUPD == 641 ) || ( nUPD == 645 ) || // prior OOo 2.0
                        ( nUPD == 680 && nBuild <= 9073 ) ) ) // OOo 2.0 - OOo 2.0.4
                 {
                     bApplyListStyle = false;
                 }
-                // <--
             }
-            // <--
         }
 
         if ( bApplyListStyle )
@@ -379,9 +362,7 @@ void XMLTextStyleContext::Finish( sal_Bool bOverwrite )
                 }
             }
         }
-        // <--
     }
-    // <--
 
     if( sDropCapTextStyleName.getLength() )
     {
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index afa8fcf1ad8f..810ab7762ac9 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -343,7 +343,7 @@ void XMLSetVarFieldImportContext::EndElement()
         {
             // create field/Service
             Reference<XPropertySet> xPropSet;
-            if (CreateField(xPropSet, OUString::createFromAscii(sAPI_textfield_prefix) + GetServiceName()))
+            if (CreateField(xPropSet, OUString(RTL_CONSTASCII_USTRINGPARAM(sAPI_textfield_prefix)) + GetServiceName()))
             {
                 Reference<XDependentTextField> xDepTextField(xPropSet, UNO_QUERY);
                 if (xDepTextField.is())
@@ -995,7 +995,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster(
 
         aAny = xMaster->getPropertyValue(
             // sPropertySubType
-            OUString::createFromAscii(sAPI_sub_type)
+            OUString(RTL_CONSTASCII_USTRINGPARAM(sAPI_sub_type))
             );
         sal_Int16 nType = 0;
         aAny >>= nType;
@@ -1072,7 +1072,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster(
                 aAny <<= sName;
                 xMaster->setPropertyValue(
                     // sPropertyName
-                    OUString::createFromAscii(sAPI_name)
+                    OUString(RTL_CONSTASCII_USTRINGPARAM(sAPI_name))
                     , aAny);
 
                 if (eVarType != VarTypeUserField) {
@@ -1083,7 +1083,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster(
                               SetVariableType::SEQUENCE);
                     xMaster->setPropertyValue(
                         // sPropertySubType
-                        OUString::createFromAscii(sAPI_sub_type)
+                        OUString(RTL_CONSTASCII_USTRINGPARAM(sAPI_sub_type))
                         , aAny);
                 } // else : user field: no subtype
 
diff --git a/xmloff/source/transform/AttrTransformerAction.hxx b/xmloff/source/transform/AttrTransformerAction.hxx
index d76eb2f5ed6e..8dc28f2d8915 100644
--- a/xmloff/source/transform/AttrTransformerAction.hxx
+++ b/xmloff/source/transform/AttrTransformerAction.hxx
@@ -128,9 +128,8 @@ enum XMLAttrTransformerAction
     XML_ATACTION_SVG_WIDTH_HEIGHT_OOO,   // replace "inch" with "in" and subtracts 1/100th mm
     XML_ATACTION_SVG_WIDTH_HEIGHT_OASIS, // replace "in" with "inch" and adds 1/100th mm
     XML_ATACTION_DRAW_MIRROR_OOO,        // renames draw:mirror to style:mirror and adapts values
-    // --> OD 2005-05-12 #i49139#
+    // OpenDocument file format: attribute value of <style:mirror> wrong (#i49139#)
     XML_ATACTION_STYLE_MIRROR_OOO,        // adapts style:mirror values
-    // <--
     XML_ATACTION_DRAW_MIRROR_OASIS,      // renames style:mirror to draw:mirror and adapts values
     XML_ATACTION_GAMMA_OASIS,            // converts percentage to double value
     XML_ATACTION_GAMMA_OOO,              // converts double value to percentage
diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx
index 852eff30eac2..c8a708e1a8c6 100644
--- a/xmloff/source/transform/EventOASISTContext.cxx
+++ b/xmloff/source/transform/EventOASISTContext.cxx
@@ -203,8 +203,8 @@ bool ParseURL(
         xSMgr = ::comphelper::getProcessServiceFactory();
 
     Reference< com::sun::star::uri::XUriReferenceFactory >
-        xFactory( xSMgr->createInstance( OUString::createFromAscii(
-            "com.sun.star.uri.UriReferenceFactory" ) ), UNO_QUERY );
+        xFactory( xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.uri.UriReferenceFactory" )) ), UNO_QUERY );
 
     if ( xFactory.is() )
     {
@@ -306,7 +306,7 @@ void XMLEventOASISTransformerContext::StartElement(
                             GetXMLToken( XML_LANGUAGE ) ) );
 
                         pMutableAttrList->SetValueByIndex( idx,
-                            OUString::createFromAscii("StarBasic") );
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("StarBasic")) );
 
                         OUString aLocQName(
                             GetTransformer().GetNamespaceMap().GetQNameByKey(
@@ -358,7 +358,7 @@ void XMLEventOASISTransformerContext::StartElement(
                     GetXMLToken( XML_LANGUAGE ) ) );
 
                     pMutableAttrList->SetValueByIndex( idx,
-                    OUString::createFromAscii("StarBasic") );
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("StarBasic")) );
 
                     OUString aLocQName(
                     GetTransformer().GetNamespaceMap().GetQNameByKey(
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx
index 8262e7504480..4916cf72ef42 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -359,15 +359,12 @@ static XMLTransformerActionInit aActionTable[] =
         OOO_STYLE_REF_ACTIONS ), /* generated entry */
     ENTRY1( STYLE, PRESENTATION_PAGE_LAYOUT, XML_ETACTION_PROC_ATTRS,
                         OOO_MASTER_PAGE_ACTIONS ),
-    // --> OD 2005-01-10 #i40011#, #i40015#
-    // - consider also attribute table:style-name for <table:table>,
-    //   <table:table-row> and <table:table-column>.
-//    ENTRY1( TABLE, TABLE, XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ),
+    /* Consider also attribute table:style-name for <table:table>,
+       <table:table-row> and <table:table-column>. (#i40011#, #i40015#)
+    */
     ENTRY0( TABLE, TABLE, XML_ETACTION_TABLE ),
-
     ENTRY1( TABLE, TABLE_ROW, XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ),
     ENTRY1( TABLE, TABLE_COLUMN, XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ),
-    // <--
 
     // split frame elements
     ENTRY0( DRAW, TEXT_BOX, XML_ETACTION_FRAME ),
@@ -915,17 +912,16 @@ static XMLTransformerActionInit aBackgroundImageActionTable[] =
     ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
-// --> OD 2005-06-10 #i50322#
-// OOO_BACKGROUND_IMAGE_ACTIONS for OpenOffice.org text documents
-// OpenOffice.org text documents, written by OpenOffice.org, contain
-// wrong value for the transparency of the background graphic
+/* OOO_BACKGROUND_IMAGE_ACTIONS for OpenOffice.org text documents
+   OpenOffice.org text documents, written by OpenOffice.org, contain
+   wrong value for the transparency of the background graphic (#i50322#)
+*/
 static XMLTransformerActionInit aWriterBackgroundImageActionTable[] =
 {
     ENTRY1Q( DRAW, TRANSPARENCY, XML_ATACTION_WRITER_BACK_GRAPHIC_TRANSPARENCY, XML_NAMESPACE_DRAW, XML_OPACITY ),
     ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_True ),
     ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
 };
-// <--
 
 // OOO_DDE_CONNECTION_DECL
 static XMLTransformerActionInit aDDEConnectionDeclActionTable[] =
@@ -1513,11 +1509,10 @@ XMLTableOOoTransformerContext_Impl::~XMLTableOOoTransformerContext_Impl()
 void XMLTableOOoTransformerContext_Impl::StartElement(
         const Reference< XAttributeList >& rAttrList )
 {
-    // --> OD 2005-07-05 #i50521# - perform OOO_STYLE_REF_ACTIONS for all applications
+    // Perform OOO_STYLE_REF_ACTIONS for all applications (#i50521#)
     Reference< XAttributeList > xAttrList( rAttrList );
     XMLMutableAttributeList* pMutableAttrList =
         GetTransformer().ProcessAttrList( xAttrList, OOO_STYLE_REF_ACTIONS, sal_False );
-    // <--
     if( rAttrList->getLength() && IsXMLToken( GetTransformer().GetClass(), XML_SPREADSHEET  ) )
     {
         sal_Bool bPrintRanges(sal_False);
@@ -1701,13 +1696,11 @@ XMLTransformerActions *OOo2OasisTransformer::GetUserDefinedActions(
                         new XMLTransformerActions( aFrameAttrActionTable );
                     break;
                 case OOO_BACKGROUND_IMAGE_ACTIONS:
-                    // --> OD 2005-06-10 #i50322#
-                    // use special actions for Writer documents.
+                    // Use special actions for Writer documents. (#i50322#)
                     m_aActions[OOO_BACKGROUND_IMAGE_ACTIONS] =
                         isWriter()
                         ? new XMLTransformerActions( aWriterBackgroundImageActionTable )
                         : new XMLTransformerActions( aBackgroundImageActionTable );
-                    // <--
                     break;
                 case OOO_DDE_CONNECTION_DECL_ACTIONS:
                     m_aActions[OOO_DDE_CONNECTION_DECL_ACTIONS] =
diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx
index 35b8640cdb2d..e6a10c163328 100644
--- a/xmloff/source/transform/Oasis2OOo.cxx
+++ b/xmloff/source/transform/Oasis2OOo.cxx
@@ -384,14 +384,13 @@ static XMLTransformerActionInit aActionTable[] =
                 OASIS_TEXT_STYLE_REF_ACTIONS ), /* generated entry */
     ENTRY1( DRAW, PAGE, XML_ETACTION_PROC_ATTRS,
                 OASIS_MASTER_PAGE_REF_ACTIONS ), /* generated entry */
-    // --> OD 2005-01-10 #i40011#, #i40015#
-    // - conversion of attribute <table:style-name> for <table:table-row> and
-    //   <table:table-column>
+    /* Conversion of attribute <table:style-name> for <table:table-row> and
+       <table:table-column> (#i40011#, #i40015#)
+    */
     ENTRY1( TABLE, TABLE_ROW, XML_ETACTION_PROC_ATTRS,
                 OASIS_TABLE_STYLE_REF_ACTIONS ),
     ENTRY1( TABLE, TABLE_COLUMN, XML_ETACTION_PROC_ATTRS,
                 OASIS_TABLE_STYLE_REF_ACTIONS ),
-    // <--
 
     // rename office:value-* to *:value-*
     ENTRY1( TEXT, VARIABLE_DECL, XML_ETACTION_PROC_ATTRS,
@@ -697,16 +696,13 @@ static XMLTransformerActionInit aMapStyleRefActionTable[] =
     ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
-// --> OD 2005-01-10 #i40011#, #i40015#
-// action table for OASIS_TABLE_STYLE_REF_ACTIONS
+// action table for OASIS_TABLE_STYLE_REF_ACTIONS (#i40011#, #i40015#)
 static XMLTransformerActionInit aTableStyleRefActionTable[] =
 {
     ENTRY1( TABLE, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF,
                 XML_FAMILY_TYPE_END ),
     ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
 };
-// <--
-
 
 static XMLTransformerActionInit aFontFaceActionTable[] =
 {
@@ -1232,8 +1228,7 @@ void XMLTableTransformerContext_Impl::StartElement(
                 }
                 // OD 2005-07-05 #i50521# - no break here for savety reason.
             }
-            // --> OD 2005-01-10 #i40011#, #i40015#
-            // - convert attribute table:style-name for <table:table>
+            // Convert attribute table:style-name for <table:table> (#i40011#, #i40015#)
             else if ( IsXMLToken( aLocalName, XML_STYLE_NAME ) )
             {
                 const OUString& rValue = xAttrList->getValueByIndex( i );
@@ -1249,7 +1244,6 @@ void XMLTableTransformerContext_Impl::StartElement(
                     pMutableAttrList->SetValueByIndex( i, aAttrValue );
                 }
             }
-            // <--
             else if( IsXMLToken( aLocalName, XML_PRINT ) )
             {
                 if ( !pMutableAttrList )
@@ -1912,12 +1906,11 @@ XMLTransformerActions *Oasis2OOoTransformer::GetUserDefinedActions(
                 m_aActions[OASIS_DATETIME_ACTIONS] =
                     new XMLTransformerActions( aDateTimeActionTable );
                 break;
-            // --> OD 2005-01-10 #i40011#, #i40015#
+            // Bugdoc with table won't load correctly (#i40011#, #i40015#)
             case OASIS_TABLE_STYLE_REF_ACTIONS:
                 m_aActions[OASIS_TABLE_STYLE_REF_ACTIONS] =
                     new XMLTransformerActions( aTableStyleRefActionTable );
                 break;
-            // <--
             case OASIS_ANIMATION_ACTIONS:
                 m_aActions[OASIS_ANIMATION_ACTIONS] =
                     new XMLTransformerActions( aAnimationActionTable );
diff --git a/xmloff/source/transform/PropertyActionsOOo.cxx b/xmloff/source/transform/PropertyActionsOOo.cxx
index 941d4db91a3b..2d211a02f71a 100644
--- a/xmloff/source/transform/PropertyActionsOOo.cxx
+++ b/xmloff/source/transform/PropertyActionsOOo.cxx
@@ -301,14 +301,12 @@ XMLTransformerActionInit aGraphicPropertyOOoAttrActionTable[] =
           NO_PARAMS }, /* generated entry */
 //  { XML_NAMESPACE_STYLE, XML_OVERFLOW_BEHAVIOR, XML_ATACTION_COPY,
 //      NO_PARAMS }, /* new attribute */
-    // --> OD 2005-05-12 #i49139# - rename attribute values of <style:mirror>:
-    // horizontal-on-left-pages --> horizontal-on-even
-    // horizontal-on-right-pages --> horizontal-on-odd
-//    { XML_NAMESPACE_STYLE, XML_MIRROR, XML_ATACTION_COPY,
-//      NO_PARAMS }, /* generated entry */
+    /* Rename attribute values of <style:mirror>: (#i49139#)
+         horizontal-on-left-pages --> horizontal-on-even
+         horizontal-on-right-pages --> horizontal-on-odd
+    */
     { XML_NAMESPACE_STYLE, XML_MIRROR, XML_ATACTION_STYLE_MIRROR_OOO,
         NO_PARAMS }, /* generated entry */
-    // <--
     { XML_NAMESPACE_FO, XML_CLIP, XML_ATACTION_INCHS2INS,
           NO_PARAMS }, /* generated entry */
     { XML_NAMESPACE_DRAW, XML_FRAME_DISPLAY_SCROLLBAR, XML_ATACTION_COPY,
diff --git a/xmloff/source/transform/PropertyActionsOOo.hxx b/xmloff/source/transform/PropertyActionsOOo.hxx
index 649a89f2d219..2344758baa41 100644
--- a/xmloff/source/transform/PropertyActionsOOo.hxx
+++ b/xmloff/source/transform/PropertyActionsOOo.hxx
@@ -52,9 +52,8 @@ enum XMLPropOOOTransformerAction
     XML_ATACTION_MOVE_PROTECT,
     XML_ATACTION_SIZE_PROTECT,
     XML_ATACTION_PROTECT,
-    // --> OD 2005-06-10 #i50322#
+    // No image transparancy info in lable document (#i50322#)
     XML_ATACTION_WRITER_BACK_GRAPHIC_TRANSPARENCY,
-    // <--
     XML_PTACTION_END=XML_TACTION_END
 };
 
diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx
index e8eb17432528..aa8ee0f4ebe1 100644
--- a/xmloff/source/transform/StyleOASISTContext.cxx
+++ b/xmloff/source/transform/StyleOASISTContext.cxx
@@ -495,7 +495,7 @@ void XMLPropertiesTContext_Impl::StartElement(
                 case XML_ATACTION_DRAW_MIRROR_OASIS: // renames style:mirror to draw:mirror and adapts values
                     {
                         // keep original for writer graphic objects
-                        // --> OD 2005-05-12 #i49139# - adapts attribute values,
+                        // Adapts attribute values (#i49139#)
                         OUString aNewAttrValue;
                         SvXMLTokenEnumerator aTokenEnum( rAttrValue );
                         OUString aToken;
@@ -503,7 +503,7 @@ void XMLPropertiesTContext_Impl::StartElement(
                         {
                             if ( aNewAttrValue.getLength() > 0 )
                             {
-                                aNewAttrValue += rtl::OUString::createFromAscii( " " );
+                                aNewAttrValue += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " " ));
                             }
 
                             if ( IsXMLToken( aToken, XML_HORIZONTAL_ON_EVEN ) )
diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx
index 2a4d9123af0d..0d5e684841a8 100644
--- a/xmloff/source/transform/StyleOOoTContext.cxx
+++ b/xmloff/source/transform/StyleOOoTContext.cxx
@@ -429,15 +429,15 @@ void XMLPropertiesOOoTContext_Impl::StartElement(
     OUString aProtectAttrValue;
     XMLTypedPropertiesOOoTContext_Impl * pProtectContext = 0;
 
-    // --> OD 2005-05-13 #i49139# - attribute <style:mirror> has to be priority
-    // over attribute <style:draw>. The filter from OpenDocument file format
-    // to OpenOffice.org file format produces styles with both attributes.
+    /* Attribute <style:mirror> has to be priority over attribute <style:draw>.
+       The filter from OpenDocument file format to OpenOffice.org file format
+       produces styles with both attributes. (#i49139#)
+    */
     sal_Bool bExistStyleMirror( sal_False );
     OUString aStyleMirrorAttrValue;
     sal_Bool bExistDrawMirror( sal_False );
     OUString aDrawMirrorAttrValue;
     XMLTypedPropertiesOOoTContext_Impl* pMirrorContext( 0L );
-    // <--
 
     sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
     for( sal_Int16 i=0; i < nAttrCount; i++ )
@@ -889,16 +889,15 @@ void XMLPropertiesOOoTContext_Impl::StartElement(
             break;
         case XML_ATACTION_DRAW_MIRROR_OOO:   // renames draw:mirror to style:mirror and adapts values
             {
-                // --> OD 2005-05-13 #i49139#
+                // OpenDocument file format: attribute value of <style:mirror> wrong (#i49139#)
                 aDrawMirrorAttrValue =
                                 GetXMLToken( IsXMLToken( sAttrValue, XML_TRUE )
                                              ? XML_HORIZONTAL : XML_NONE );
                 bExistDrawMirror = sal_True;
                 pMirrorContext = pContext;
-                // <--
             }
             break;
-        // --> OD 2005-05-12 #i49139#
+        // OpenDocument file format: attribute value of <style:mirror> wrong (#i49139#)
         case XML_ATACTION_STYLE_MIRROR_OOO:   // adapts style:mirror values
             {
                 SvXMLTokenEnumerator aTokenEnum( sAttrValue );
@@ -907,7 +906,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement(
                 {
                     if ( aStyleMirrorAttrValue.getLength() > 0 )
                     {
-                        aStyleMirrorAttrValue += rtl::OUString::createFromAscii( " " );
+                        aStyleMirrorAttrValue += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " " ));
                     }
 
                     if ( IsXMLToken( aToken, XML_HORIZONTAL_ON_LEFT_PAGES ) )
@@ -927,7 +926,6 @@ void XMLPropertiesOOoTContext_Impl::StartElement(
                 pMirrorContext = pContext;
             }
             break;
-        // <--
         case XML_ATACTION_GAMMA_OOO:        // converts double value to percentage
             {
                 double fValue = sAttrValue.toDouble();
@@ -963,7 +961,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement(
         }
     }
 
-    // --> OD 2005-05-13 #i49139#
+    // OpenDocument file format: attribute value of <style:mirror> wrong (#i49139#)
     if ( bExistStyleMirror )
     {
         pMirrorContext->AddAttribute(
@@ -978,7 +976,6 @@ void XMLPropertiesOOoTContext_Impl::StartElement(
                                 XML_NAMESPACE_STYLE, GetXMLToken( XML_MIRROR ) ),
                         aDrawMirrorAttrValue);
     }
-    // <--
 
     if( bMoveProtect || bSizeProtect || aProtectAttrValue.getLength() )
     {
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index d2099f8c4d4b..35536b872b43 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -1055,8 +1055,8 @@ sal_Bool XMLTransformerBase::EncodeStyleName( OUString& rName ) const
                                 ->xCharClass =
                                     Reference < XCharacterClassification >(
                                 xFactory->createInstance(
-                                    OUString::createFromAscii(
-                        "com.sun.star.i18n.CharacterClassification_Unicode") ),
+                                    OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.i18n.CharacterClassification_Unicode")) ),
                                 UNO_QUERY );
 
                             OSL_ENSURE( xCharClass.is(),
diff --git a/xmlscript/source/xmldlg_imexp/common.hxx b/xmlscript/source/xmldlg_imexp/common.hxx
index e391fb619ed4..7395c1034f95 100644
--- a/xmlscript/source/xmldlg_imexp/common.hxx
+++ b/xmlscript/source/xmldlg_imexp/common.hxx
@@ -40,6 +40,7 @@ const sal_Int16 BORDER_SIMPLE_COLOR = 3;
 
 }
 
+#define XMLSCRIPT_GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:"
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlscript/source/xmldlg_imexp/exp_share.hxx b/xmlscript/source/xmldlg_imexp/exp_share.hxx
index ffb97055dff4..aaf6bd6aeef6 100644
--- a/xmlscript/source/xmldlg_imexp/exp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/exp_share.hxx
@@ -91,16 +91,18 @@ class ElementDescriptor
 {
     css::uno::Reference< css::beans::XPropertySet > _xProps;
     css::uno::Reference< css::beans::XPropertyState > _xPropState;
+    css::uno::Reference< css::frame::XModel > _xDocument;
 
 public:
     inline ElementDescriptor(
         css::uno::Reference< css::beans::XPropertySet > const & xProps,
         css::uno::Reference< css::beans::XPropertyState > const & xPropState,
-        ::rtl::OUString const & name )
+        ::rtl::OUString const & name, css::uno::Reference< css::frame::XModel > const & xDocument )
         SAL_THROW( () )
         : XMLElement( name )
         , _xProps( xProps )
         , _xPropState( xPropState )
+        , _xDocument( xDocument )
         {}
     inline ElementDescriptor(
         ::rtl::OUString const & name )
@@ -142,6 +144,8 @@ public:
         ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName );
     void readVerticalAlignAttr(
         ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName );
+    void readImageURLAttr(
+        ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName );
     void readImageAlignAttr(
         ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName );
     void readImagePositionAttr(
@@ -159,6 +163,8 @@ public:
     void readSelectionTypeAttr(
         ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName );
     //
+    void readDataAwareAttr(
+        ::rtl::OUString const & rAttrName );
     inline void addBoolAttr(
         ::rtl::OUString const & rAttrName, sal_Bool bValue )
         { addAttribute( rAttrName, ::rtl::OUString::valueOf(bValue) ); }
@@ -172,17 +178,23 @@ public:
     //
     void readDialogModel( StyleBag * all_styles )
         SAL_THROW( (css::uno::Exception) );
+    void readBullitinBoard( StyleBag * all_styles )
+        SAL_THROW( (css::uno::Exception) );
     void readMultiPageModel( StyleBag * all_styles )
         SAL_THROW( (css::uno::Exception) );
+    void readFrameModel( StyleBag * all_styles )
+        SAL_THROW( (css::uno::Exception) );
+    void readPageModel( StyleBag * all_styles )
+        SAL_THROW( (css::uno::Exception) );
     void readButtonModel( StyleBag * all_styles )
         SAL_THROW( (css::uno::Exception) );
     void readEditModel( StyleBag * all_styles )
         SAL_THROW( (css::uno::Exception) );
     void readCheckBoxModel( StyleBag * all_styles )
         SAL_THROW( (css::uno::Exception) );
-    void readRadioButtonModel( StyleBag * all_styles, com::sun::star::uno::Reference< com::sun::star::frame::XModel > const & xDocument )
+    void readRadioButtonModel( StyleBag * all_styles )
         SAL_THROW( (css::uno::Exception) );
-    void readComboBoxModel( StyleBag * all_styles, com::sun::star::uno::Reference< com::sun::star::frame::XModel > const & xDocument )
+    void readComboBoxModel( StyleBag * all_styles )
         SAL_THROW( (css::uno::Exception) );
     void readCurrencyFieldModel( StyleBag * all_styles )
         SAL_THROW( (css::uno::Exception) );
@@ -196,9 +208,9 @@ public:
         SAL_THROW( (css::uno::Exception) );
     void readGroupBoxModel( StyleBag * all_styles )
         SAL_THROW( (css::uno::Exception) );
-    void readImageControlModel( StyleBag * all_styles, com::sun::star::uno::Reference< com::sun::star::frame::XModel > const & xDocument  )
+    void readImageControlModel( StyleBag * all_styles )
         SAL_THROW( (css::uno::Exception) );
-    void readListBoxModel( StyleBag * all_styles, com::sun::star::uno::Reference< com::sun::star::frame::XModel > const & xDocument )
+    void readListBoxModel( StyleBag * all_styles )
         SAL_THROW( (css::uno::Exception) );
     void readNumericFieldModel( StyleBag * all_styles )
         SAL_THROW( (css::uno::Exception) );
@@ -212,9 +224,9 @@ public:
         SAL_THROW( (css::uno::Exception) );
     void readProgressBarModel( StyleBag * all_styles )
         SAL_THROW( (css::uno::Exception) );
-    void readScrollBarModel( StyleBag * all_styles, com::sun::star::uno::Reference< com::sun::star::frame::XModel > const & xDocument )
+    void readScrollBarModel( StyleBag * all_styles )
         SAL_THROW( (css::uno::Exception) );
-    void readSpinButtonModel( StyleBag * all_styles, com::sun::star::uno::Reference< com::sun::star::frame::XModel > const & xDocument )
+    void readSpinButtonModel( StyleBag * all_styles )
         SAL_THROW( (css::uno::Exception) );
     void readFixedHyperLinkModel( StyleBag * all_styles )
         SAL_THROW( (css::uno::Exception) );
diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx b/xmlscript/source/xmldlg_imexp/imp_share.hxx
index 27929a349bfe..0717e32720d9 100644
--- a/xmlscript/source/xmldlg_imexp/imp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx
@@ -45,7 +45,7 @@
 #include <com/sun/star/xml/input/XRoot.hpp>
 #include <com/sun/star/script/XLibraryContainer.hpp>
 #include <vector>
-
+#include <boost/shared_ptr.hpp>
 
 namespace css = ::com::sun::star;
 
@@ -117,16 +117,17 @@ inline bool getLongAttr(
 class ImportContext;
 
 //==============================================================================
+typedef ::cppu::WeakImplHelper1< css::xml::input::XRoot >   DialogImport_Base;
 struct DialogImport
-    : public ::cppu::WeakImplHelper1< css::xml::input::XRoot >
+    : DialogImport_Base
 {
     friend class ImportContext;
 
     css::uno::Reference< css::uno::XComponentContext > _xContext;
     css::uno::Reference< css::util::XNumberFormatsSupplier > _xSupplier;
 
-    ::std::vector< ::rtl::OUString > _styleNames;
-    ::std::vector< css::uno::Reference< css::xml::input::XElement > > _styles;
+    ::boost::shared_ptr< ::std::vector< ::rtl::OUString > > _pStyleNames;
+    ::boost::shared_ptr< ::std::vector< css::uno::Reference< css::xml::input::XElement > > > _pStyles;
 
     css::uno::Reference< css::container::XNameContainer > _xDialogModel;
     css::uno::Reference< css::lang::XMultiServiceFactory > _xDialogModelFactory;
@@ -166,13 +167,28 @@ public:
         css::uno::Reference<css::uno::XComponentContext> const & xContext,
         css::uno::Reference<css::container::XNameContainer>
         const & xDialogModel,
+        ::boost::shared_ptr< ::std::vector< ::rtl::OUString > >& pStyleNames,
+        ::boost::shared_ptr< ::std::vector< css::uno::Reference< css::xml::input::XElement > > >& pStyles,
         css::uno::Reference<css::frame::XModel> const & xDoc )
         SAL_THROW( () )
         : _xContext( xContext )
+        , _pStyleNames( pStyleNames )
+        , _pStyles( pStyles )
         , _xDialogModel( xDialogModel )
         , _xDialogModelFactory( xDialogModel, css::uno::UNO_QUERY_THROW ), _xDoc( xDoc )
         { OSL_ASSERT( _xDialogModel.is() && _xDialogModelFactory.is() &&
                       _xContext.is() ); }
+    inline DialogImport( const DialogImport& rOther ) : DialogImport_Base()
+        , _xContext( rOther._xContext )
+        , _xSupplier( rOther._xSupplier )
+        , _pStyleNames( rOther._pStyleNames )
+        , _pStyles( rOther._pStyles )
+        , _xDialogModel( rOther._xDialogModel )
+        , _xDialogModelFactory( rOther._xDialogModelFactory )
+        , _xDoc( rOther._xDoc )
+        , XMLNS_DIALOGS_UID( rOther.XMLNS_DIALOGS_UID )
+        , XMLNS_SCRIPT_UID( rOther.XMLNS_SCRIPT_UID ) {}
+
     virtual ~DialogImport()
         SAL_THROW( () );
 
@@ -365,6 +381,9 @@ protected:
 
     ::rtl::OUString getControlId(
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
+    ::rtl::OUString getControlModelName(
+        rtl::OUString const& rDefaultModel,
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
     css::uno::Reference< css::xml::input::XElement > getStyle(
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
 public:
@@ -435,6 +454,8 @@ public:
     bool importVerticalAlignProperty(
         ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
+    bool importImageURLProperty( rtl::OUString const & rPropName, rtl::OUString const & rAttrName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes );
     bool importImageAlignProperty(
         ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
@@ -459,6 +480,9 @@ public:
     bool importSelectionTypeProperty(
         ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
         css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
+    bool importDataAwareProperty(
+        ::rtl::OUString const & rPropName,
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes );
 };
 
 //==============================================================================
@@ -474,6 +498,14 @@ public:
                 pImport->_xDialogModelFactory->createInstance( rControlName ),
                 css::uno::UNO_QUERY_THROW ), rId )
         {}
+    inline ControlImportContext(
+        DialogImport * pImport,
+        const css::uno::Reference< css::beans::XPropertySet >& xProps, ::rtl::OUString const & rControlName )
+        : ImportContext(
+            pImport,
+                xProps,
+                rControlName )
+        {}
     inline ~ControlImportContext()
     {
         _pImport->_xDialogModel->insertByName(
@@ -1004,6 +1036,7 @@ public:
 };
 
 //==============================================================================
+
 class SpinButtonElement
     : public ControlElement
 {
@@ -1044,9 +1077,65 @@ public:
         ElementBase * pParent, DialogImport * pImport )
         SAL_THROW( () )
         : ControlElement( rLocalName, xAttributes, pParent, pImport )
+        {
+            m_xContainer.set( _pImport->_xDialogModelFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoMultiPageModel") ) ), css::uno::UNO_QUERY );
+        }
+private:
+    css::uno::Reference< css::container::XNameContainer > m_xContainer;
+};
+
+//==============================================================================
+class Frame
+    : public ControlElement
+{
+    ::rtl::OUString _label;
+public:
+    virtual css::uno::Reference< css::xml::input::XElement >
+    SAL_CALL startChildElement(
+        sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+    virtual void SAL_CALL endElement()
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+
+    inline Frame(
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
+        ElementBase * pParent, DialogImport * pImport )
+        SAL_THROW( () )
+        : ControlElement( rLocalName, xAttributes, pParent, pImport )
         {}
+private:
+    css::uno::Reference< css::container::XNameContainer > m_xContainer;
 };
 
+//==============================================================================
+class Page
+    : public ControlElement
+{
+public:
+    virtual css::uno::Reference< css::xml::input::XElement >
+    SAL_CALL startChildElement(
+        sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+        css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+    virtual void SAL_CALL endElement()
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+
+    inline Page(
+        ::rtl::OUString const & rLocalName,
+        css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
+        ElementBase * pParent, DialogImport * pImport )
+        SAL_THROW( () )
+        : ControlElement( rLocalName, xAttributes, pParent, pImport )
+        {
+            m_xContainer.set( _pImport->_xDialogModelFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoPageModel") ) ), css::uno::UNO_QUERY );
+        }
+private:
+    css::uno::Reference< css::container::XNameContainer > m_xContainer;
+};
+
+
 class ProgressBarElement
     : public ControlElement
 {
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
index a2abb08d5c0f..01f1efee03b2 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
@@ -39,8 +39,7 @@
 #include <com/sun/star/document/XStorageBasedDocument.hpp>
 #include <com/sun/star/document/XGraphicObjectResolver.hpp>
 #include <comphelper/componentcontext.hxx>
-#include <comphelper/processfactory.hxx>
-
+#include <com/sun/star/lang/XServiceInfo.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -49,66 +48,6 @@ using ::rtl::OUString;
 namespace xmlscript
 {
 
-void lclExportBindableAndListSourceBits( Reference< frame::XModel > const & xDocument, const Reference< beans::XPropertySet >& _xProps, ElementDescriptor& rModel )
-{
-    Reference< lang::XMultiServiceFactory > xFac;
-    if ( xDocument.is() )
-        xFac.set( xDocument, uno::UNO_QUERY );
-
-    Reference< form::binding::XBindableValue > xBinding( _xProps, UNO_QUERY );
-
-    if ( xFac.is() && xBinding.is() )
-    {
-        try
-        {
-            Reference< beans::XPropertySet > xConvertor( xFac->createInstance( OUSTR( "com.sun.star.table.CellAddressConversion" )), uno::UNO_QUERY );
-        Reference< beans::XPropertySet > xBindable( xBinding->getValueBinding(), UNO_QUERY );
-            if ( xBindable.is() )
-            {
-                table::CellAddress aAddress;
-                xBindable->getPropertyValue( OUSTR("BoundCell") ) >>= aAddress;
-                xConvertor->setPropertyValue( OUSTR("Address"), makeAny( aAddress ) );
-                rtl::OUString sAddress;
-                xConvertor->getPropertyValue( OUSTR("PersistentRepresentation") ) >>= sAddress;
-                if ( sAddress.getLength() > 0 )
-                    rModel.addAttribute( OUSTR(XMLNS_DIALOGS_PREFIX ":linked-cell"), sAddress );
-
-                OSL_TRACE( "*** Bindable value %s", rtl::OUStringToOString( sAddress, RTL_TEXTENCODING_UTF8 ).getStr() );
-
-            }
-        }
-        catch( uno::Exception& )
-        {
-        }
-    }
-    Reference< form::binding::XListEntrySink > xEntrySink( _xProps, UNO_QUERY );
-    if ( xEntrySink.is() )
-    {
-        Reference< beans::XPropertySet > xListSource( xEntrySink->getListEntrySource(), UNO_QUERY );
-        if ( xListSource.is() )
-        {
-            try
-            {
-                Reference< beans::XPropertySet > xConvertor( xFac->createInstance( OUSTR( "com.sun.star.table.CellRangeAddressConversion" )), uno::UNO_QUERY );
-
-                table::CellRangeAddress aAddress;
-                xListSource->getPropertyValue( OUSTR( "CellRange" ) ) >>= aAddress;
-
-                rtl::OUString sAddress;
-                xConvertor->setPropertyValue( OUSTR("Address"), makeAny( aAddress ) );
-                xConvertor->getPropertyValue( OUSTR("PersistentRepresentation") ) >>= sAddress;
-                OSL_TRACE("**** cell range source list %s",
-                    rtl::OUStringToOString( sAddress, RTL_TEXTENCODING_UTF8 ).getStr() );
-                if ( sAddress.getLength() > 0 )
-                    rModel.addAttribute( OUSTR(XMLNS_DIALOGS_PREFIX ":source-cell-range"), sAddress );
-            }
-            catch( uno::Exception& )
-            {
-            }
-        }
-    }
-
-}
 static inline bool readBorderProps(
     ElementDescriptor * element, Style & style )
 {
@@ -138,7 +77,9 @@ static inline bool readFontProps( ElementDescriptor * element, Style & style )
 void ElementDescriptor::readMultiPageModel( StyleBag * all_styles )
 {
     // collect styles
-    Style aStyle( 0x2 | 0x8 | 0x20 );
+    Style aStyle( 0x1 | 0x2 | 0x8 | 0x20 );
+    if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("BackgroundColor") ) ) >>= aStyle._backgroundColor)
+        aStyle._set |= 0x1;
     if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextColor") ) ) >>= aStyle._textColor)
         aStyle._set |= 0x2;
     if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextLineColor") ) ) >>= aStyle._textLineColor)
@@ -153,24 +94,101 @@ void ElementDescriptor::readMultiPageModel( StyleBag * all_styles )
 
     // collect elements
     readDefaults();
-    readLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ProgressValue") ),
+    readLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiPageValue") ),
                   OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value") ) );
-    readLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ProgressValueMax") ),
-                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value-max") ) );
+    Any aDecorationAny( _xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Decoration") ) ) );
+    bool bDecoration = sal_True;
+    if ( (aDecorationAny >>= bDecoration) && !bDecoration )
+        addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":withtabs") ), OUString( RTL_CONSTASCII_USTRINGPARAM("false") ) );
 
+    readEvents();
+    uno::Reference< container::XNameContainer > xPagesContainer( _xProps, uno::UNO_QUERY );
+    if ( xPagesContainer.is() && xPagesContainer->getElementNames().getLength() )
+    {
+        ElementDescriptor * pElem = new ElementDescriptor( _xProps, _xPropState, OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":bulletinboard") ), _xDocument );
+        pElem->readBullitinBoard( all_styles );
+        addSubElement( pElem );
+    }
+}
+//__________________________________________________________________________________________________
+void ElementDescriptor::readFrameModel( StyleBag * all_styles )
+{
+    // collect styles
+    Style aStyle( 0x1 | 0x2 | 0x8 | 0x20 );
+/*
+    if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("BackgroundColor") ) ) >>= aStyle._backgroundColor)
+        aStyle._set |= 0x1;
+*/
+    if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextColor") ) ) >>= aStyle._textColor)
+        aStyle._set |= 0x2;
+    if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextLineColor") ) ) >>= aStyle._textLineColor)
+        aStyle._set |= 0x20;
+    if (readFontProps( this, aStyle ))
+        aStyle._set |= 0x8;
+    if (aStyle._set)
+    {
+        addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":style-id") ),
+                      all_styles->getStyleId( aStyle ) );
+    }
+
+    // collect elements
+    readDefaults();
     OUString aTitle;
-    if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("Label") ) ) >>= aTitle)
+
+    if ( readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("Label") ) ) >>= aTitle)
     {
         ElementDescriptor * title = new ElementDescriptor(
             _xProps, _xPropState,
-            OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":title") ) );
+            OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":title") ), _xDocument );
         title->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value") ),
                              aTitle );
         addSubElement( title );
     }
 
+    uno::Reference< container::XNameContainer > xControlContainer( _xProps, uno::UNO_QUERY );
+    if ( xControlContainer.is() && xControlContainer->getElementNames().getLength() )
+    {
+        ElementDescriptor * pElem = new ElementDescriptor( _xProps, _xPropState, OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":bulletinboard") ), _xDocument );
+        pElem->readBullitinBoard( all_styles );
+        addSubElement( pElem );
+    }
     readEvents();
 }
+//__________________________________________________________________________________________________
+void ElementDescriptor::readPageModel( StyleBag * all_styles )
+{
+    // collect styles
+    Style aStyle( 0x1 | 0x2 | 0x8 | 0x20 );
+    if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("BackgroundColor") ) ) >>= aStyle._backgroundColor)
+        aStyle._set |= 0x1;
+    if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextColor") ) ) >>= aStyle._textColor)
+        aStyle._set |= 0x2;
+    if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("TextLineColor") ) ) >>= aStyle._textLineColor)
+        aStyle._set |= 0x20;
+    if (readFontProps( this, aStyle ))
+        aStyle._set |= 0x8;
+    if (aStyle._set)
+    {
+        addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":style-id") ),
+                      all_styles->getStyleId( aStyle ) );
+    }
+
+    // collect elements
+    readDefaults();
+    rtl::OUString aTitle;
+    readStringAttr(
+        OUString( RTL_CONSTASCII_USTRINGPARAM("Title") ),
+        OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":title") ) );
+    uno::Reference< container::XNameContainer > xControlContainer( _xProps, uno::UNO_QUERY );
+    if ( xControlContainer.is() && xControlContainer->getElementNames().getLength() )
+    {
+        ElementDescriptor * pElem = new ElementDescriptor( _xProps, _xPropState, OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":bulletinboard") ), _xDocument );
+        pElem->readBullitinBoard( all_styles );
+        addSubElement( pElem );
+    }
+    readEvents();
+}
+
 void ElementDescriptor::readButtonModel( StyleBag * all_styles )
     SAL_THROW( (Exception) )
 {
@@ -204,8 +222,10 @@ void ElementDescriptor::readButtonModel( StyleBag * all_styles )
                            OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":valign") ) );
     readButtonTypeAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("PushButtonType") ),
                         OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":button-type") ) );
-    readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-src") ) );
+    readImageURLAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
+                           OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-src") ) );
+
+
     readImagePositionAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImagePosition") ),
                            OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-position") ) );
     readImageAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageAlign") ),
@@ -275,8 +295,8 @@ void ElementDescriptor::readCheckBoxModel( StyleBag * all_styles )
                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":align") ) );
     readVerticalAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("VerticalAlign") ),
                            OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":valign") ) );
-    readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-src") ) );
+    readImageURLAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
+                           OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-src") ) );
     readImagePositionAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImagePosition") ),
                            OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-position") ) );
     readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiLine") ),
@@ -312,7 +332,7 @@ void ElementDescriptor::readCheckBoxModel( StyleBag * all_styles )
     readEvents();
 }
 //__________________________________________________________________________________________________
-void ElementDescriptor::readComboBoxModel( StyleBag * all_styles, Reference< frame::XModel > const & xDocument )
+void ElementDescriptor::readComboBoxModel( StyleBag * all_styles )
     SAL_THROW( (Exception) )
 {
     // collect styles
@@ -354,7 +374,9 @@ void ElementDescriptor::readComboBoxModel( StyleBag * all_styles, Reference< fra
     readShortAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("LineCount") ),
                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":linecount") ) );
     // Cell Range, Ref Cell etc.
-    lclExportBindableAndListSourceBits( xDocument, _xProps, *this );
+    readDataAwareAttr( OUSTR(XMLNS_DIALOGS_PREFIX ":linked-cell") );
+    readDataAwareAttr( OUSTR( XMLNS_DIALOGS_PREFIX ":source-cell-range") );
+
     // string item list
     Sequence< OUString > itemValues;
     if ((readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ) ) >>= itemValues) &&
@@ -362,14 +384,14 @@ void ElementDescriptor::readComboBoxModel( StyleBag * all_styles, Reference< fra
     {
         ElementDescriptor * popup = new ElementDescriptor(
             _xProps, _xPropState,
-            OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":menupopup") ) );
+            OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":menupopup") ), _xDocument );
 
         OUString const * pItemValues = itemValues.getConstArray();
         for ( sal_Int32 nPos = 0; nPos < itemValues.getLength(); ++nPos )
         {
             ElementDescriptor * item = new ElementDescriptor(
                 _xProps, _xPropState,
-                OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":menuitem") ) );
+                OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":menuitem") ), _xDocument );
             item->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value") ),
                                 pItemValues[ nPos ] );
             popup->addSubElement( item );
@@ -380,7 +402,7 @@ void ElementDescriptor::readComboBoxModel( StyleBag * all_styles, Reference< fra
     readEvents();
 }
 //__________________________________________________________________________________________________
-void ElementDescriptor::readListBoxModel( StyleBag * all_styles, Reference< frame::XModel > const & xDocument  )
+void ElementDescriptor::readListBoxModel( StyleBag * all_styles )
     SAL_THROW( (Exception) )
 {
     // collect styles
@@ -415,7 +437,8 @@ void ElementDescriptor::readListBoxModel( StyleBag * all_styles, Reference< fram
                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":linecount") ) );
     readAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Align") ),
                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":align") ) );
-    lclExportBindableAndListSourceBits( xDocument, _xProps, *this );
+    readDataAwareAttr( OUSTR(XMLNS_DIALOGS_PREFIX ":linked-cell") );
+    readDataAwareAttr( OUSTR( XMLNS_DIALOGS_PREFIX ":source-cell-range") );
     // string item list
     Sequence< OUString > itemValues;
     if ((readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ) ) >>= itemValues) &&
@@ -423,7 +446,7 @@ void ElementDescriptor::readListBoxModel( StyleBag * all_styles, Reference< fram
     {
         ElementDescriptor * popup = new ElementDescriptor(
             _xProps, _xPropState,
-            OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":menupopup") ) );
+            OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":menupopup") ), _xDocument );
 
         OUString const * pItemValues = itemValues.getConstArray();
         sal_Int32 nPos;
@@ -431,7 +454,7 @@ void ElementDescriptor::readListBoxModel( StyleBag * all_styles, Reference< fram
         {
             ElementDescriptor * item = new ElementDescriptor(
                 _xProps, _xPropState,
-                OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":menuitem") ) );
+                OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":menuitem") ), _xDocument );
             item->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value") ),
                                 pItemValues[ nPos ] );
             popup->addSubElement( item );
@@ -455,7 +478,7 @@ void ElementDescriptor::readListBoxModel( StyleBag * all_styles, Reference< fram
     readEvents();
 }
 //__________________________________________________________________________________________________
-void ElementDescriptor::readRadioButtonModel( StyleBag * all_styles, Reference< frame::XModel > const & xDocument  )
+void ElementDescriptor::readRadioButtonModel( StyleBag * all_styles  )
     SAL_THROW( (Exception) )
 {
     // collect styles
@@ -486,8 +509,8 @@ void ElementDescriptor::readRadioButtonModel( StyleBag * all_styles, Reference<
                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":align") ) );
     readVerticalAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("VerticalAlign") ),
                            OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":valign") ) );
-    readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-src") ) );
+    readImageURLAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
+                           OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-src") ) );
     readImagePositionAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImagePosition") ),
                            OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-position") ) );
     readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiLine") ),
@@ -513,7 +536,7 @@ void ElementDescriptor::readRadioButtonModel( StyleBag * all_styles, Reference<
             break;
         }
     }
-    lclExportBindableAndListSourceBits( xDocument, _xProps, *this );
+    readDataAwareAttr( OUSTR(XMLNS_DIALOGS_PREFIX ":linked-cell") );
     readEvents();
 }
 //__________________________________________________________________________________________________
@@ -542,7 +565,7 @@ void ElementDescriptor::readGroupBoxModel( StyleBag * all_styles )
     {
         ElementDescriptor * title = new ElementDescriptor(
             _xProps, _xPropState,
-            OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":title") ) );
+            OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":title") ), _xDocument );
         title->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":value") ),
                              aTitle );
         addSubElement( title );
@@ -683,10 +706,11 @@ void ElementDescriptor::readEditModel( StyleBag * all_styles )
         addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":echochar") ),
                       OUString( &cEcho, 1 ) );
     }
+    readDataAwareAttr( OUSTR(XMLNS_DIALOGS_PREFIX ":linked-cell") );
     readEvents();
 }
 //__________________________________________________________________________________________________
-void ElementDescriptor::readImageControlModel( StyleBag * all_styles, com::sun::star::uno::Reference< com::sun::star::frame::XModel > const & xDocument )
+void ElementDescriptor::readImageControlModel( StyleBag * all_styles )
     SAL_THROW( (Exception) )
 {
     // collect styles
@@ -705,33 +729,10 @@ void ElementDescriptor::readImageControlModel( StyleBag * all_styles, com::sun::
     readDefaults();
     readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ScaleImage") ),
                   OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":scale-image") ) );
-    rtl::OUString sURL;
-    _xProps->getPropertyValue( OUSTR("ImageURL") ) >>= sURL;
-
-    if ( sURL.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.GraphicObject:"  ) ) ) == 0 )
-    {
-        Reference< document::XStorageBasedDocument > xDocStorage( xDocument, UNO_QUERY );
-
-        if ( xDocStorage.is() )
-        {
-            uno::Sequence< Any > aArgs( 1 );
-            aArgs[ 0 ] <<= xDocStorage->getDocumentStorage();
-
-            ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
-            uno::Reference< document::XGraphicObjectResolver > xGraphicResolver;
-            aContext.createComponentWithArguments( OUSTR( "com.sun.star.comp.Svx.GraphicExportHelper" ), aArgs, xGraphicResolver );
-            if ( xGraphicResolver.is() )
-            {
-                sURL = xGraphicResolver->resolveGraphicObjectURL( sURL );
-            }
-        }
-    }
-    if ( sURL.getLength() > 0 )
-    {
-        addAttribute( OUSTR(XMLNS_DIALOGS_PREFIX ":src"), sURL );
-    }
     readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
                   OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":tabstop") ) );
+    readImageURLAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
+                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":src") ) );
     readEvents();
 }
 //__________________________________________________________________________________________________
@@ -1151,6 +1152,45 @@ void ElementDescriptor::readFormattedFieldModel( StyleBag * all_styles )
 
     readEvents();
 }
+
+void ElementDescriptor::readSpinButtonModel( StyleBag * all_styles )
+    SAL_THROW( (Exception) )
+{
+    // collect styles
+    Style aStyle( 0x1 | 0x4 );
+    if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("BackgroundColor") ) ) >>= aStyle._backgroundColor)
+        aStyle._set |= 0x1;
+    if (readBorderProps( this, aStyle ))
+        aStyle._set |= 0x4;
+    if (aStyle._set)
+    {
+        addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":style-id") ),
+                      all_styles->getStyleId( aStyle ) );
+    }
+
+    // collect elements
+    readDefaults();
+    readOrientationAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Orientation") ),
+                         OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":align") ) );
+    readLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("SpinIncrement") ),
+                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":increment") ) );
+    readLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("SpinValue") ),
+                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":curval") ) );
+    readLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("SpinValueMax") ),
+                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":maxval") ) );
+    readLongAttr( OUSTR("SpinValueMin"),
+                  OUSTR(XMLNS_DIALOGS_PREFIX ":minval") );
+    readLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Repeat") ),
+                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":repeat") ) );
+    readLongAttr( OUSTR("RepeatDelay"), OUSTR(XMLNS_DIALOGS_PREFIX ":repeat-delay") );
+    readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
+                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":tabstop") ) );
+    readHexLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("SymbolColor") ),
+                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":symbol-color") ) );
+    readDataAwareAttr( OUSTR(XMLNS_DIALOGS_PREFIX ":linked-cell") );
+    readEvents();
+}
+
 //__________________________________________________________________________________________________
 void ElementDescriptor::readFixedLineModel( StyleBag * all_styles )
     SAL_THROW( (Exception) )
@@ -1206,7 +1246,7 @@ void ElementDescriptor::readProgressBarModel( StyleBag * all_styles )
     readEvents();
 }
 //__________________________________________________________________________________________________
-void ElementDescriptor::readScrollBarModel( StyleBag * all_styles, Reference< frame::XModel > const & xDocument  )
+void ElementDescriptor::readScrollBarModel( StyleBag * all_styles )
     SAL_THROW( (Exception) )
 {
     // collect styles
@@ -1244,47 +1284,7 @@ void ElementDescriptor::readScrollBarModel( StyleBag * all_styles, Reference< fr
                   OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":live-scroll") ) );
     readHexLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("SymbolColor") ),
                      OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":symbol-color") ) );
-    // Cell Range, Ref Cell etc.
-    lclExportBindableAndListSourceBits( xDocument, _xProps, *this );
-    readEvents();
-}
-//__________________________________________________________________________________________________
-void ElementDescriptor::readSpinButtonModel( StyleBag * all_styles, Reference< frame::XModel > const & xDocument  )
-    SAL_THROW( (Exception) )
-{
-    // collect styles
-    Style aStyle( 0x1 | 0x4 );
-    if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("BackgroundColor") ) ) >>= aStyle._backgroundColor)
-        aStyle._set |= 0x1;
-    if (readBorderProps( this, aStyle ))
-        aStyle._set |= 0x4;
-    if (aStyle._set)
-    {
-        addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":style-id") ),
-                      all_styles->getStyleId( aStyle ) );
-    }
-
-    // collect elements
-    readDefaults();
-    readOrientationAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Orientation") ),
-                         OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":align") ) );
-    readLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("SpinIncrement") ),
-                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":increment") ) );
-    readLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("SpinValue") ),
-                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":curval") ) );
-    readLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("SpinValueMax") ),
-                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":maxval") ) );
-    readLongAttr( OUSTR("SpinValueMin"),
-                  OUSTR(XMLNS_DIALOGS_PREFIX ":minval") );
-    readLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Repeat") ),
-                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":repeat") ) );
-    readLongAttr( OUSTR("RepeatDelay"), OUSTR(XMLNS_DIALOGS_PREFIX ":repeat-delay") );
-    readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
-                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":tabstop") ) );
-    readHexLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("SymbolColor") ),
-                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":symbol-color") ) );
-    // Cell Range, Ref Cell etc.
-    lclExportBindableAndListSourceBits( xDocument, _xProps, *this );
+    readDataAwareAttr( OUSTR(XMLNS_DIALOGS_PREFIX ":linked-cell") );
     readEvents();
 }
 //__________________________________________________________________________________________________
@@ -1333,11 +1333,254 @@ void ElementDescriptor::readDialogModel( StyleBag * all_styles )
     if ( (aDecorationAny >>= bDecoration) && !bDecoration )
         addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":withtitlebar") ),
                       OUString( RTL_CONSTASCII_USTRINGPARAM("false") ) );
+    readImageURLAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
+                           OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-src") ) );
+    readEvents();
+}
+
+void ElementDescriptor::readBullitinBoard( StyleBag * all_styles )
+    SAL_THROW( (Exception) )
+{
+    // collect elements
+    ::std::vector< ElementDescriptor* > all_elements;
+    // read out all props
+    Reference<  container::XNameContainer > xDialogModel( _xProps, UNO_QUERY );
+    if ( !xDialogModel.is() )
+        return; // #TODO throw???
+    Sequence< OUString > aElements( xDialogModel->getElementNames() );
+    OUString const * pElements = aElements.getConstArray();
+
+    ElementDescriptor * pRadioGroup = 0;
+
+    sal_Int32 nPos;
+    for ( nPos = 0; nPos < aElements.getLength(); ++nPos )
+    {
+        Any aControlModel( xDialogModel->getByName( pElements[ nPos ] ) );
+        Reference< beans::XPropertySet > xProps;
+        OSL_VERIFY( aControlModel >>= xProps );
+        if (! xProps.is())
+            continue;
+        Reference< beans::XPropertyState > xPropState( xProps, UNO_QUERY );
+        OSL_ENSURE( xPropState.is(), "no XPropertyState!" );
+        if (! xPropState.is())
+            continue;
+        Reference< lang::XServiceInfo > xServiceInfo( xProps, UNO_QUERY );
+        OSL_ENSURE( xServiceInfo.is(), "no XServiceInfo!" );
+        if (! xServiceInfo.is())
+            continue;
+
+        ElementDescriptor * pElem = 0;
+
+        // group up radio buttons
+        if ( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlRadioButtonModel") ) ) )
+        {
+            if (! pRadioGroup) // open radiogroup
+            {
+                pRadioGroup = new ElementDescriptor(
+                    xProps, xPropState,
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":radiogroup") ), _xDocument );
+                all_elements.push_back( pRadioGroup );
+            }
 
-    readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-src") ) );
+            pElem = new ElementDescriptor(
+                xProps, xPropState,
+                OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":radio") ), _xDocument );
+            pElem->readRadioButtonModel( all_styles );
+            pRadioGroup->addSubElement( pElem );
+        }
+        else // no radio
+        {
+            pRadioGroup = 0; // close radiogroup
 
-    readEvents();
+            if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlButtonModel") ) ) )
+            {
+                pElem = new ElementDescriptor(
+                    xProps, xPropState,
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":button") ), _xDocument );
+                pElem->readButtonModel( all_styles );
+            }
+            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlCheckBoxModel") ) ) )
+            {
+                pElem = new ElementDescriptor(
+                    xProps, xPropState,
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":checkbox") ), _xDocument );
+                pElem->readCheckBoxModel( all_styles );
+            }
+            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlComboBoxModel") ) ) )
+            {
+                pElem = new ElementDescriptor(
+                    xProps, xPropState,
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":combobox") ), _xDocument );
+                pElem->readComboBoxModel( all_styles );
+            }
+            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlListBoxModel") ) ) )
+            {
+                pElem = new ElementDescriptor(
+                    xProps, xPropState,
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":menulist") ), _xDocument );
+                pElem->readListBoxModel( all_styles );
+            }
+            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlGroupBoxModel") ) ) )
+            {
+                pElem = new ElementDescriptor(
+                    xProps, xPropState,
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":titledbox") ), _xDocument );
+                pElem->readGroupBoxModel( all_styles );
+            }
+            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoMultiPageModel") ) ) )
+            {
+                pElem = new ElementDescriptor(
+                    xProps, xPropState,
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":multipage") ), _xDocument );
+                pElem->readMultiPageModel( all_styles );
+            }
+            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoFrameModel") ) ) )
+            {
+                pElem = new ElementDescriptor(
+                    xProps, xPropState,
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":frame") ), _xDocument );
+                pElem->readFrameModel( all_styles );
+            }
+            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoPageModel") ) ) )
+            {
+                pElem = new ElementDescriptor(
+                    xProps, xPropState,
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":page") ), _xDocument );
+                pElem->readPageModel( all_styles );
+            }
+            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedTextModel") ) ) )
+            {
+                pElem = new ElementDescriptor(
+                    xProps, xPropState,
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":text") ), _xDocument );
+                pElem->readFixedTextModel( all_styles );
+            }
+            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlEditModel") ) ) )
+            {
+                pElem = new ElementDescriptor(
+                    xProps, xPropState,
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":textfield") ), _xDocument );
+                pElem->readEditModel( all_styles );
+            }
+            // FixedHyperLink
+            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedHyperlinkModel") ) ) )
+            {
+                pElem = new ElementDescriptor(
+                    xProps, xPropState,
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":linklabel") ), _xDocument );
+                pElem->readFixedHyperLinkModel( all_styles );
+            }
+            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlImageControlModel") ) ) )
+            {
+                pElem = new ElementDescriptor(
+                    xProps, xPropState,
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":img") ), _xDocument );
+                pElem->readImageControlModel( all_styles );
+            }
+            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFileControlModel") ) ) )
+            {
+                pElem = new ElementDescriptor(
+                    xProps, xPropState,
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":filecontrol") ), _xDocument );
+                pElem->readFileControlModel( all_styles );
+            }
+            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.tree.TreeControlModel") ) ) )
+            {
+                pElem = new ElementDescriptor(
+                    xProps, xPropState,
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":treecontrol") ), _xDocument );
+                pElem->readTreeControlModel( all_styles );
+            }
+            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlCurrencyFieldModel") ) ) )
+            {
+                pElem = new ElementDescriptor(
+                    xProps, xPropState,
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":currencyfield") ), _xDocument );
+                pElem->readCurrencyFieldModel( all_styles );
+            }
+            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlDateFieldModel") ) ) )
+            {
+                pElem = new ElementDescriptor(
+                    xProps, xPropState,
+                OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":datefield") ), _xDocument );
+                pElem->readDateFieldModel( all_styles );
+            }
+            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlNumericFieldModel") ) ) )
+            {
+                pElem = new ElementDescriptor(
+                    xProps, xPropState,
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":numericfield") ), _xDocument );
+                pElem->readNumericFieldModel( all_styles );
+            }
+            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlTimeFieldModel") ) ) )
+            {
+                pElem = new ElementDescriptor(
+                    xProps, xPropState,
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":timefield") ) , _xDocument);
+                pElem->readTimeFieldModel( all_styles );
+            }
+            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlPatternFieldModel") ) ) )
+            {
+                pElem = new ElementDescriptor(
+                    xProps, xPropState,
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":patternfield") ), _xDocument );
+                pElem->readPatternFieldModel( all_styles );
+            }
+            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFormattedFieldModel") ) ) )
+            {
+                pElem = new ElementDescriptor(
+                    xProps, xPropState,
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":formattedfield") ), _xDocument );
+                pElem->readFormattedFieldModel( all_styles );
+            }
+            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel") ) ) )
+            {
+                pElem = new ElementDescriptor(
+                    xProps, xPropState,
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":fixedline") ), _xDocument );
+                pElem->readFixedLineModel( all_styles );
+            }
+            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlScrollBarModel") ) ) )
+            {
+                pElem = new ElementDescriptor(
+                    xProps, xPropState,
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":scrollbar") ), _xDocument );
+                pElem->readScrollBarModel( all_styles );
+            }
+            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlSpinButtonModel") ) ) )
+            {
+                pElem = new ElementDescriptor(
+                    xProps, xPropState,
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":spinbutton") ), _xDocument );
+                pElem->readSpinButtonModel( all_styles );
+             }
+            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlProgressBarModel") ) ) )
+            {
+                pElem = new ElementDescriptor(
+                    xProps, xPropState,
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":progressmeter") ), _xDocument );
+                pElem->readProgressBarModel( all_styles );
+            }
+            //
+
+            if (pElem)
+            {
+                all_elements.push_back( pElem );
+            }
+            else
+            {
+                OSL_ENSURE( sal_False, "unknown control type!" );
+                continue;
+            }
+        }
+    }
+    if (! all_elements.empty())
+    {
+        for ( std::size_t n = 0; n < all_elements.size(); ++n )
+        {
+            addSubElement( all_elements[ n ] );
+        }
+    }
 }
 
 }
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
index cec44ca50a04..4ae2ebdabc11 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
@@ -47,6 +47,8 @@
 #include <com/sun/star/awt/PushButtonType.hpp>
 #include <com/sun/star/awt/VisualEffect.hpp>
 
+#include <com/sun/star/io/XPersistObject.hpp>
+
 #include <com/sun/star/script/XScriptEventsSupplier.hpp>
 #include <com/sun/star/script/ScriptEventDescriptor.hpp>
 
@@ -58,6 +60,17 @@
 
 #include <com/sun/star/view/SelectionType.hpp>
 
+#include <com/sun/star/form/binding/XListEntrySink.hpp>
+#include <com/sun/star/form/binding/XBindableValue.hpp>
+#include <com/sun/star/form/binding/XValueBinding.hpp>
+#include <com/sun/star/table/CellAddress.hpp>
+#include <com/sun/star/table/CellRangeAddress.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/document/XStorageBasedDocument.hpp>
+#include <com/sun/star/document/XGraphicObjectResolver.hpp>
+
+#include <comphelper/componentcontext.hxx>
+#include <comphelper/processfactory.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -777,6 +790,33 @@ void ElementDescriptor::readVerticalAlignAttr( OUString const & rPropName, OUStr
     }
 }
 //__________________________________________________________________________________________________
+void ElementDescriptor::readImageURLAttr( OUString const & rPropName, OUString const & rAttrName )
+{
+    if (beans::PropertyState_DEFAULT_VALUE != _xPropState->getPropertyState( rPropName ))
+    {
+        rtl::OUString sURL;
+        _xProps->getPropertyValue( rPropName ) >>= sURL;
+
+        if ( sURL.getLength() && sURL.compareToAscii( XMLSCRIPT_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( XMLSCRIPT_GRAPHOBJ_URLPREFIX ) ) == 0 )
+        {
+            Reference< document::XStorageBasedDocument > xDocStorage( _xDocument, UNO_QUERY );
+            if ( xDocStorage.is() )
+            {
+                uno::Sequence< Any > aArgs( 1 );
+                aArgs[ 0 ] <<= xDocStorage->getDocumentStorage();
+
+                ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
+                uno::Reference< document::XGraphicObjectResolver > xGraphicResolver;
+                aContext.createComponentWithArguments( OUSTR( "com.sun.star.comp.Svx.GraphicExportHelper" ), aArgs, xGraphicResolver );
+                if ( xGraphicResolver.is() )
+                    sURL = xGraphicResolver->resolveGraphicObjectURL( sURL );
+            }
+        }
+        if ( sURL.getLength() )
+                addAttribute( rAttrName, sURL );
+    }
+}
+//__________________________________________________________________________________________________
 void ElementDescriptor::readImageAlignAttr( OUString const & rPropName, OUString const & rAttrName )
 {
     if (beans::PropertyState_DEFAULT_VALUE != _xPropState->getPropertyState( rPropName ))
@@ -940,6 +980,66 @@ void ElementDescriptor::readLineEndFormatAttr( OUString const & rPropName, OUStr
     }
 }
 //__________________________________________________________________________________________________
+void ElementDescriptor::readDataAwareAttr( OUString const & rAttrName )
+{
+    Reference< lang::XMultiServiceFactory > xFac;
+    if ( _xDocument.is() )
+        xFac.set( _xDocument, uno::UNO_QUERY );
+
+    Reference< form::binding::XBindableValue > xBinding( _xProps, UNO_QUERY );
+
+    if ( xFac.is() && xBinding.is() && rAttrName.equals( OUSTR(XMLNS_DIALOGS_PREFIX ":linked-cell") ) )
+    {
+        try
+        {
+            Reference< beans::XPropertySet > xConvertor( xFac->createInstance( OUSTR( "com.sun.star.table.CellAddressConversion" )), uno::UNO_QUERY );
+        Reference< beans::XPropertySet > xBindable( xBinding->getValueBinding(), UNO_QUERY );
+            if ( xBindable.is() )
+            {
+                table::CellAddress aAddress;
+                xBindable->getPropertyValue( OUSTR("BoundCell") ) >>= aAddress;
+                xConvertor->setPropertyValue( OUSTR("Address"), makeAny( aAddress ) );
+                rtl::OUString sAddress;
+                xConvertor->getPropertyValue( OUSTR("PersistentRepresentation") ) >>= sAddress;
+                if ( sAddress.getLength() > 0 )
+                    addAttribute( rAttrName, sAddress );
+
+                OSL_TRACE( "*** Bindable value %s", rtl::OUStringToOString( sAddress, RTL_TEXTENCODING_UTF8 ).getStr() );
+
+            }
+        }
+        catch( uno::Exception& )
+        {
+        }
+    }
+    Reference< form::binding::XListEntrySink > xEntrySink( _xProps, UNO_QUERY );
+    if ( xEntrySink.is() && rAttrName.equals( OUSTR( XMLNS_DIALOGS_PREFIX ":source-cell-range") ) )
+    {
+        Reference< beans::XPropertySet > xListSource( xEntrySink->getListEntrySource(), UNO_QUERY );
+        if ( xListSource.is() )
+        {
+            try
+            {
+                Reference< beans::XPropertySet > xConvertor( xFac->createInstance( OUSTR( "com.sun.star.table.CellRangeAddressConversion" )), uno::UNO_QUERY );
+
+                table::CellRangeAddress aAddress;
+                xListSource->getPropertyValue( OUSTR( "CellRange" ) ) >>= aAddress;
+
+                rtl::OUString sAddress;
+                xConvertor->setPropertyValue( OUSTR("Address"), makeAny( aAddress ) );
+                xConvertor->getPropertyValue( OUSTR("PersistentRepresentation") ) >>= sAddress;
+                OSL_TRACE("**** cell range source list %s",
+                    rtl::OUStringToOString( sAddress, RTL_TEXTENCODING_UTF8 ).getStr() );
+                if ( sAddress.getLength() > 0 )
+                    addAttribute( rAttrName, sAddress );
+            }
+            catch( uno::Exception& )
+            {
+            }
+        }
+    }
+}
+//__________________________________________________________________________________________________
 void ElementDescriptor::readSelectionTypeAttr( OUString const & rPropName, OUString const & rAttrName )
 {
     if (beans::PropertyState_DEFAULT_VALUE != _xPropState->getPropertyState( rPropName ))
@@ -976,6 +1076,28 @@ void ElementDescriptor::readSelectionTypeAttr( OUString const & rPropName, OUStr
 void ElementDescriptor::readDefaults( bool supportPrintable, bool supportVisible )
 {
     Any a( _xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Name") ) ) );
+
+    // The following is a hack to allow 'form' controls to override the default
+    // control supported by dialogs. This should work well for both vba support and
+    // normal openoffice ( when normal 'Dialogs' decide to support form control models )
+    // In the future VBA support might require custom models ( and not the just the form
+    // variant of a control that we currently use ) In this case the door is still open,
+    // we just need to define a new way for the 'ServiceName' to be extracted from the
+    // incomming model. E.g. the use of supporting service
+    // "com.sun.star.form.FormComponent", 'ServiceName' and XPersistObject
+    // is only an implementation detail here, in the future some other
+    // method ( perhaps a custom prop ) could be used instead.
+    Reference< lang::XServiceInfo > xSrvInfo( _xProps, UNO_QUERY );
+    if ( xSrvInfo.is() && xSrvInfo->supportsService( OUSTR("com.sun.star.form.FormComponent" ) ) )
+    {
+        Reference< io::XPersistObject > xPersist( _xProps, UNO_QUERY );
+        if ( xPersist.is() )
+        {
+            OUString sCtrlName = xPersist->getServiceName();
+            if ( sCtrlName.getLength() )
+                    addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":control-implementation") ), sCtrlName );
+        }
+    }
     addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":id") ),
              * reinterpret_cast< const OUString * >( a.getValue() ) );
     readShortAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("TabIndex") ),
@@ -1331,248 +1453,17 @@ void SAL_CALL exportDialogModel(
     SAL_THROW( (Exception) )
 {
     StyleBag all_styles;
-    ::std::vector< Reference< xml::sax::XAttributeList > > all_elements;
-
-    // read out all props
-
-    Sequence< OUString > aElements( xDialogModel->getElementNames() );
-    OUString const * pElements = aElements.getConstArray();
-
-    ElementDescriptor * pRadioGroup = 0;
-
-    sal_Int32 nPos;
-    for ( nPos = 0; nPos < aElements.getLength(); ++nPos )
-    {
-        Any aControlModel( xDialogModel->getByName( pElements[ nPos ] ) );
-        Reference< beans::XPropertySet > xProps;
-        OSL_VERIFY( aControlModel >>= xProps );
-        if (! xProps.is())
-            continue;
-        Reference< beans::XPropertyState > xPropState( xProps, UNO_QUERY );
-        OSL_ENSURE( xPropState.is(), "no XPropertyState!" );
-        if (! xPropState.is())
-            continue;
-        Reference< lang::XServiceInfo > xServiceInfo( xProps, UNO_QUERY );
-        OSL_ENSURE( xServiceInfo.is(), "no XServiceInfo!" );
-        if (! xServiceInfo.is())
-            continue;
-
-        ElementDescriptor * pElem = 0;
-        Reference< xml::sax::XAttributeList > xElem;
-
-        // group up radio buttons
-        if ( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlRadioButtonModel") ) ) )
-        {
-            if (! pRadioGroup) // open radiogroup
-            {
-                pRadioGroup = new ElementDescriptor(
-                    xProps, xPropState,
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":radiogroup") ) );
-                all_elements.push_back( pRadioGroup );
-            }
-
-            pElem = new ElementDescriptor(
-                xProps, xPropState,
-                OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":radio") ) );
-            xElem = static_cast< xml::sax::XAttributeList * >( pElem );
-            pElem->readRadioButtonModel( &all_styles, xDocument  );
-            pRadioGroup->addSubElement( xElem );
-        }
-        else // no radio
-        {
-            pRadioGroup = 0; // close radiogroup
+    // window
+    Reference< beans::XPropertySet > xProps( xDialogModel, UNO_QUERY );
+    OSL_ASSERT( xProps.is() );
+    Reference< beans::XPropertyState > xPropState( xProps, UNO_QUERY );
+    OSL_ASSERT( xPropState.is() );
 
-            if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlButtonModel") ) ) )
-            {
-                pElem = new ElementDescriptor(
-                    xProps, xPropState,
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":button") ) );
-                xElem = static_cast< xml::sax::XAttributeList * >( pElem );
-                pElem->readButtonModel( &all_styles );
-            }
-            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlCheckBoxModel") ) ) )
-            {
-                pElem = new ElementDescriptor(
-                    xProps, xPropState,
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":checkbox") ) );
-                xElem = static_cast< xml::sax::XAttributeList * >( pElem );
-                pElem->readCheckBoxModel( &all_styles );
-            }
-            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlComboBoxModel") ) ) )
-            {
-                pElem = new ElementDescriptor(
-                    xProps, xPropState,
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":combobox") ) );
-                xElem = static_cast< xml::sax::XAttributeList * >( pElem );
-                pElem->readComboBoxModel( &all_styles, xDocument );
-            }
-            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlListBoxModel") ) ) )
-            {
-                pElem = new ElementDescriptor(
-                    xProps, xPropState,
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":menulist") ) );
-                xElem = static_cast< xml::sax::XAttributeList * >( pElem );
-                pElem->readListBoxModel( &all_styles, xDocument );
-            }
-            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlGroupBoxModel") ) ) )
-            {
-                pElem = new ElementDescriptor(
-                    xProps, xPropState,
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":titledbox") ) );
-                xElem = static_cast< xml::sax::XAttributeList * >( pElem );
-                pElem->readGroupBoxModel( &all_styles );
-            }
-            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoMultiPageModel") ) ) )
-            {
-                pElem = new ElementDescriptor(
-                    xProps, xPropState,
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":multipage") ) );
-                xElem = static_cast< xml::sax::XAttributeList * >( pElem );
-                pElem->readMultiPageModel( &all_styles );
-            }
-            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedTextModel") ) ) )
-            {
-                pElem = new ElementDescriptor(
-                    xProps, xPropState,
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":text") ) );
-                xElem = static_cast< xml::sax::XAttributeList * >( pElem );
-                pElem->readFixedTextModel( &all_styles );
-            }
-            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlEditModel") ) ) )
-            {
-                pElem = new ElementDescriptor(
-                    xProps, xPropState,
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":textfield") ) );
-                xElem = static_cast< xml::sax::XAttributeList * >( pElem );
-                pElem->readEditModel( &all_styles );
-            }
-            // FixedHyperLink
-            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedHyperlinkModel") ) ) )
-            {
-                pElem = new ElementDescriptor(
-                    xProps, xPropState,
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":linklabel") ) );
-                xElem = static_cast< xml::sax::XAttributeList * >( pElem );
-                pElem->readFixedHyperLinkModel( &all_styles );
-            }
-            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlImageControlModel") ) ) )
-            {
-                pElem = new ElementDescriptor(
-                    xProps, xPropState,
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":img") ) );
-                xElem = static_cast< xml::sax::XAttributeList * >( pElem );
-                pElem->readImageControlModel( &all_styles, xDocument );
-            }
-            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFileControlModel") ) ) )
-            {
-                pElem = new ElementDescriptor(
-                    xProps, xPropState,
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":filecontrol") ) );
-                xElem = static_cast< xml::sax::XAttributeList * >( pElem );
-                pElem->readFileControlModel( &all_styles );
-            }
-            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.tree.TreeControlModel") ) ) )
-            {
-                pElem = new ElementDescriptor(
-                    xProps, xPropState,
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":treecontrol") ) );
-                xElem = static_cast< xml::sax::XAttributeList * >( pElem );
-                pElem->readTreeControlModel( &all_styles );
-            }
-            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlCurrencyFieldModel") ) ) )
-            {
-                pElem = new ElementDescriptor(
-                    xProps, xPropState,
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":currencyfield") ) );
-                xElem = static_cast< xml::sax::XAttributeList * >( pElem );
-                pElem->readCurrencyFieldModel( &all_styles );
-            }
-            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlDateFieldModel") ) ) )
-            {
-                pElem = new ElementDescriptor(
-                    xProps, xPropState,
-                OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":datefield") ) );
-                xElem = static_cast< xml::sax::XAttributeList * >( pElem );
-                pElem->readDateFieldModel( &all_styles );
-            }
-            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlNumericFieldModel") ) ) )
-            {
-                pElem = new ElementDescriptor(
-                    xProps, xPropState,
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":numericfield") ) );
-                xElem = static_cast< xml::sax::XAttributeList * >( pElem );
-                pElem->readNumericFieldModel( &all_styles );
-            }
-            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlTimeFieldModel") ) ) )
-            {
-                pElem = new ElementDescriptor(
+    ElementDescriptor * pElem = new ElementDescriptor(
                     xProps, xPropState,
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":timefield") ) );
-                xElem = static_cast< xml::sax::XAttributeList * >( pElem );
-                pElem->readTimeFieldModel( &all_styles );
-            }
-            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlPatternFieldModel") ) ) )
-            {
-                pElem = new ElementDescriptor(
-                    xProps, xPropState,
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":patternfield") ) );
-                xElem = static_cast< xml::sax::XAttributeList * >( pElem );
-                pElem->readPatternFieldModel( &all_styles );
-            }
-            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFormattedFieldModel") ) ) )
-            {
-                pElem = new ElementDescriptor(
-                    xProps, xPropState,
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":formattedfield") ) );
-                xElem = static_cast< xml::sax::XAttributeList * >( pElem );
-                pElem->readFormattedFieldModel( &all_styles );
-            }
-            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel") ) ) )
-            {
-                pElem = new ElementDescriptor(
-                    xProps, xPropState,
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":fixedline") ) );
-                xElem = static_cast< xml::sax::XAttributeList * >( pElem );
-                pElem->readFixedLineModel( &all_styles );
-            }
-            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlScrollBarModel") ) ) )
-            {
-                pElem = new ElementDescriptor(
-                    xProps, xPropState,
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":scrollbar") ) );
-                xElem = static_cast< xml::sax::XAttributeList * >( pElem );
-                pElem->readScrollBarModel( &all_styles, xDocument );
-            }
-            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlSpinButtonModel") ) ) )
-            {
-                pElem = new ElementDescriptor(
-                    xProps, xPropState,
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":spinbutton") ) );
-                xElem = static_cast< xml::sax::XAttributeList * >( pElem );
-                pElem->readSpinButtonModel( &all_styles, xDocument );
-            }
-            else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlProgressBarModel") ) ) )
-            {
-                pElem = new ElementDescriptor(
-                    xProps, xPropState,
-                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":progressmeter") ) );
-                xElem = static_cast< xml::sax::XAttributeList * >( pElem );
-                pElem->readProgressBarModel( &all_styles );
-            }
-            //
-
-            OSL_ASSERT( xElem.is() );
-            if (xElem.is())
-            {
-                all_elements.push_back( xElem );
-            }
-            else
-            {
-                OSL_ENSURE( sal_False, "unknown control type!" );
-                continue;
-            }
-        }
-    }
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":bulletinboard") ), xDocument );
+    Reference< xml::sax::XAttributeList > xElem( pElem );
+    pElem->readBullitinBoard( &all_styles );
 
     xOut->startDocument();
 
@@ -1582,14 +1473,9 @@ void SAL_CALL exportDialogModel(
     xOut->unknown( aDocTypeStr );
     xOut->ignorableWhitespace( OUString() );
 
-    // window
-    Reference< beans::XPropertySet > xProps( xDialogModel, UNO_QUERY );
-    OSL_ASSERT( xProps.is() );
-    Reference< beans::XPropertyState > xPropState( xProps, UNO_QUERY );
-    OSL_ASSERT( xPropState.is() );
 
     OUString aWindowName( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":window") );
-    ElementDescriptor * pWindow = new ElementDescriptor( xProps, xPropState, aWindowName );
+    ElementDescriptor * pWindow = new ElementDescriptor( xProps, xPropState, aWindowName, xDocument );
     Reference< xml::sax::XAttributeList > xWindow( pWindow );
     pWindow->readDialogModel( &all_styles );
     xOut->ignorableWhitespace( OUString() );
@@ -1599,20 +1485,14 @@ void SAL_CALL exportDialogModel(
     // dump out stylebag
     all_styles.dump( xOut );
 
-    if (! all_elements.empty())
+    if ( xDialogModel->getElementNames().getLength() )
     {
         // open up bulletinboard
         OUString aBBoardName( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":bulletinboard") );
         xOut->ignorableWhitespace( OUString() );
-        xOut->startElement( aBBoardName, Reference< xml::sax::XAttributeList >() );
-
-        // export control elements
-        for ( std::size_t n = 0; n < all_elements.size(); ++n )
-        {
-            ElementDescriptor * pElem = static_cast< ElementDescriptor * >( all_elements[ n ].get() );
-            pElem->dump( xOut.get() );
-        }
+        xOut->startElement( aBBoardName, xElem );
 
+        pElem->dumpSubElements( xOut.get() );
         // end bulletinboard
         xOut->ignorableWhitespace( OUString() );
         xOut->endElement( aBBoardName );
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index 901aeac8127a..f9ceaaefb8d3 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -49,24 +49,33 @@ using ::rtl::OUString;
 
 namespace xmlscript
 {
-Reference< xml::input::XElement > MultiPage::startChildElement(
+
+Reference< xml::input::XElement > Frame::startChildElement(
     sal_Int32 nUid, OUString const & rLocalName,
     Reference< xml::input::XAttributes > const & xAttributes )
-    throw (xml::sax::SAXException, RuntimeException)
+        throw (xml::sax::SAXException, RuntimeException)
 {
+    if ( !m_xContainer.is() )
+        m_xContainer.set( _pImport->_xDialogModelFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoFrameModel") ) ), UNO_QUERY );
     // event
-rtl::OUString _label = rtl::OUString::createFromAscii("foo");
     if (_pImport->isEventElement( nUid, rLocalName ))
     {
-        return new EventElement(
+       return new EventElement(
             nUid, rLocalName, xAttributes, this, _pImport );
     }
+    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bulletinboard") ))
+    {
+        // Create new DialogImport for this container
+        DialogImport* pFrameImport = new DialogImport( *_pImport );
+        pFrameImport->_xDialogModel = m_xContainer;
+        return new BulletinBoardElement( rLocalName, xAttributes, this,  pFrameImport );
+    }
     else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("title") ))
     {
         getStringAttr( &_label,
-                       OUString( RTL_CONSTASCII_USTRINGPARAM("value") ),
-                       xAttributes,
-                       _pImport->XMLNS_DIALOGS_UID );
+            OUString( RTL_CONSTASCII_USTRINGPARAM("value") ),
+            xAttributes,
+            _pImport->XMLNS_DIALOGS_UID );
 
         return new ElementBase(
             _pImport->XMLNS_DIALOGS_UID,
@@ -74,6 +83,69 @@ rtl::OUString _label = rtl::OUString::createFromAscii("foo");
     }
     else
     {
+        OSL_TRACE("****** ARGGGGG!!!! **********");
+        throw     xml::sax::SAXException(
+            OUString( RTL_CONSTASCII_USTRINGPARAM("expected event element!") ),
+            Reference< XInterface >(), Any() );
+    }
+}
+//__________________________________________________________________________________________________
+
+void Frame::endElement()
+    throw (xml::sax::SAXException, RuntimeException)
+{
+        if ( !m_xContainer.is() )
+            m_xContainer.set( _pImport->_xDialogModelFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoFrameModel") ) ), UNO_QUERY );
+        Reference< beans::XPropertySet > xProps( m_xContainer, UNO_QUERY_THROW );
+        // _pImport is what we need to add to ( e.g. the dialog in this case )
+    ControlImportContext ctx( _pImport, xProps,   getControlId( _xAttributes ) );
+
+    Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
+
+    Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) );
+    if (xStyle.is())
+    {
+        StyleElement * pStyle = static_cast< StyleElement * >( xStyle.get () );
+        pStyle->importTextColorStyle( xControlModel );
+        pStyle->importTextLineColorStyle( xControlModel );
+        pStyle->importFontStyle( xControlModel );
+    }
+
+    ctx.importDefaults( 0, 0, _xAttributes ); // inherited from BulletinBoardElement
+    if (_label.getLength())
+    {
+        xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Label") ),
+                                         makeAny( _label ) );
+    }
+    ctx.importEvents( _events );
+    // avoid ring-reference:
+    // vector< event elements > holding event elements holding this (via _pParent)
+    _events.clear();
+}
+
+//===
+Reference< xml::input::XElement > MultiPage::startChildElement(
+    sal_Int32 nUid, OUString const & rLocalName,
+    Reference< xml::input::XAttributes > const & xAttributes )
+    throw (xml::sax::SAXException, RuntimeException)
+{
+    // event
+rtl::OUString _label(RTL_CONSTASCII_USTRINGPARAM("foo"));
+    if (_pImport->isEventElement( nUid, rLocalName ))
+    {
+        return new EventElement(
+            nUid, rLocalName, xAttributes, this, _pImport );
+    }
+    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bulletinboard") ))
+    {
+        // Create new DialogImport for this container
+
+        DialogImport* pMultiPageImport = new DialogImport( *_pImport );
+                pMultiPageImport->_xDialogModel = m_xContainer;
+        return new BulletinBoardElement( rLocalName, xAttributes, this,  pMultiPageImport );
+    }
+    else
+    {
 
         throw xml::sax::SAXException(
             OUString( RTL_CONSTASCII_USTRINGPARAM("expected event element!") ),
@@ -85,10 +157,10 @@ rtl::OUString _label = rtl::OUString::createFromAscii("foo");
 void MultiPage::endElement()
     throw (xml::sax::SAXException, RuntimeException)
 {
-    ControlImportContext ctx(
-        _pImport, getControlId( _xAttributes ),
-        OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoMultiPageModel") ) );
-//      OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlGroupBoxModel") ) );
+        Reference< beans::XPropertySet > xProps( m_xContainer, UNO_QUERY_THROW );
+        // _pImport is what we need to add to ( e.g. the dialog in this case )
+    ControlImportContext ctx( _pImport, xProps, getControlId( _xAttributes ));
+
     Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
 
     Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) );
@@ -98,125 +170,76 @@ void MultiPage::endElement()
         pStyle->importTextColorStyle( xControlModel );
         pStyle->importTextLineColorStyle( xControlModel );
         pStyle->importFontStyle( xControlModel );
+        pStyle->importBackgroundColorStyle( xControlModel );
     }
 
     ctx.importDefaults( 0, 0, _xAttributes ); // inherited from BulletinBoardElement
-    ctx.importLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ProgressValue") ),
+    ctx.importLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiPageValue") ),
                             OUString( RTL_CONSTASCII_USTRINGPARAM("value") ),
                             _xAttributes );
-    ctx.importLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ProgressValueMax") ),
-                            OUString( RTL_CONSTASCII_USTRINGPARAM("value-max") ),
-                            _xAttributes );
+        ctx.importBooleanProperty(
+            OUString( RTL_CONSTASCII_USTRINGPARAM("Decoration") ),
+            OUString( RTL_CONSTASCII_USTRINGPARAM("withtabs") ),
+        _xAttributes );
     ctx.importEvents( _events );
     // avoid ring-reference:
     // vector< event elements > holding event elements holding this (via _pParent)
     _events.clear();
 }
 
-// #FIXME cut'n'pasted from xmloff/source/core/xmlimp.cxx:1251
-// of course we need to find a common home for this helper
-
-bool IsPackageURL( const ::rtl::OUString& rURL )
+Reference< xml::input::XElement > Page::startChildElement(
+    sal_Int32 nUid, OUString const & rLocalName,
+    Reference< xml::input::XAttributes > const & xAttributes )
+    throw (xml::sax::SAXException, RuntimeException)
 {
-    // Some quick tests: Some may rely on the package structure!
-    sal_Int32 nLen = rURL.getLength();
-    if( (nLen > 0 && '/' == rURL[0]) )
-        // RFC2396 net_path or abs_path
-        return false;
-    else if( nLen > 1 && '.' == rURL[0] )
-    {
-        if( '.' == rURL[1] )
-            // ../: We are never going up one level, so we know
-            // it's not an external URI
-            return false;
-        else if( '/' == rURL[1] )
-            // we are remaining on a level, so it's an package URI
-            return true;
-    }
-
-    // Now check for a RFC2396 schema
-    sal_Int32 nPos = 1;
-    while( nPos < nLen )
-    {
-        switch( rURL[nPos] )
-        {
-            case '/':
-                // a relative path segement
-                return true;
-            case ':':
-                // a schema
-                return false;
-            default:
-                break;
-                // we don't care about any other characters
-        }
-        ++nPos;
+    // event
+    if (_pImport->isEventElement( nUid, rLocalName ))
+    {
+        return new EventElement(
+            nUid, rLocalName, xAttributes, this, _pImport );
     }
+    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bulletinboard") ))
+    {
+
+        DialogImport* pPageImport = new DialogImport( *_pImport );
+                pPageImport->_xDialogModel = m_xContainer;
+        return new BulletinBoardElement( rLocalName, xAttributes, this,  pPageImport );
+    }
+    else
+    {
 
-    return true;
+        throw xml::sax::SAXException(
+            OUString( RTL_CONSTASCII_USTRINGPARAM("expected event element!") ),
+            Reference< XInterface >(), Any() );
+    }
 }
+//__________________________________________________________________________________________________
 
-void importBindableAndListRangeBits( DialogImport* _pImport, const rtl::OUString sLinkedCell, const rtl::OUString & sCellRange, ControlImportContext& ctx )
+void Page::endElement()
+    throw (xml::sax::SAXException, RuntimeException)
 {
-    Reference< lang::XMultiServiceFactory > xFac( _pImport->getDocOwner(), UNO_QUERY );
-    if ( xFac.is() && ( sLinkedCell.getLength() ||  sCellRange.getLength() ) )
-    {
-        // Set up Celllink
-        if ( sLinkedCell.getLength() )
-        {
-            Reference< form::binding::XBindableValue > xBindable( ctx.getControlModel(), uno::UNO_QUERY );
-            Reference< beans::XPropertySet > xConvertor( xFac->createInstance( OUSTR( "com.sun.star.table.CellAddressConversion" )), uno::UNO_QUERY );
-            if ( xBindable.is() && xConvertor.is() )
-            {
-                table::CellAddress aAddress;
-                xConvertor->setPropertyValue( OUSTR( "PersistentRepresentation" ), uno::makeAny( sLinkedCell ) );
-                xConvertor->getPropertyValue( OUSTR( "Address" ) ) >>= aAddress;
-                beans::NamedValue aArg1;
-                aArg1.Name = OUSTR("BoundCell");
-                aArg1.Value <<= aAddress;
+        Reference< beans::XPropertySet > xProps( m_xContainer, UNO_QUERY_THROW );
 
-                uno::Sequence< uno::Any > aArgs(1);
-                aArgs[ 0 ]  <<= aArg1;
+    ControlImportContext ctx( _pImport, xProps, getControlId( _xAttributes ));
 
-                uno::Reference< form::binding::XValueBinding > xBinding( xFac->createInstanceWithArguments( OUSTR("com.sun.star.table.CellValueBinding" ), aArgs ), uno::UNO_QUERY );
-                xBindable->setValueBinding( xBinding );
-
-            }
-        }
-        // Set up CelllRange
-        if ( sCellRange.getLength() )
-        {
-           Reference< form::binding::XListEntrySink  > xListEntrySink( ctx.getControlModel(), uno::UNO_QUERY );
-           Reference< beans::XPropertySet > xConvertor( xFac->createInstance( OUSTR( "com.sun.star.table.CellRangeAddressConversion" )), uno::UNO_QUERY );
-           if ( xListEntrySink.is() && xConvertor.is() )
-           {
-               table::CellRangeAddress aAddress;
-               xConvertor->setPropertyValue( OUSTR( "PersistentRepresentation" ), uno::makeAny( sCellRange ) );
-               xConvertor->getPropertyValue( OUSTR( "Address" ) ) >>= aAddress;
-               beans::NamedValue aArg1;
-               aArg1.Name = OUSTR("CellRange");
-               aArg1.Value <<= aAddress;
-
-               uno::Sequence< uno::Any > aArgs(1);
-               aArgs[ 0 ]  <<= aArg1;
-
-               uno::Reference< form::binding::XListEntrySource > xSource( xFac->createInstanceWithArguments( OUSTR("com.sun.star.table.CellRangeListSource" ), aArgs ), uno::UNO_QUERY );
-               xListEntrySink->setListEntrySource( xSource );
-
-           }
-       }
-   }
-}
+    Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
 
-sal_Bool isVBACompatibilityMode( DialogImport* _pImport )
-{
-    sal_Bool bVBAMode = sal_False;
-    Reference< script::vba::XVBACompatibility > xVBACompat( _pImport->getScriptLibraryContainer(), UNO_QUERY );
-    if( xVBACompat.is() )
+    Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) );
+    if (xStyle.is())
     {
-        bVBAMode = xVBACompat->getVBACompatibilityMode();
+        StyleElement * pStyle = static_cast< StyleElement * >( xStyle.get () );
+        pStyle->importTextColorStyle( xControlModel );
+        pStyle->importTextLineColorStyle( xControlModel );
+        pStyle->importFontStyle( xControlModel );
+        pStyle->importBackgroundColorStyle( xControlModel );
     }
-    return bVBAMode;
+
+    ctx.importDefaults( 0, 0, _xAttributes ); // inherited from BulletinBoardElement
+    ctx.importStringProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Title") ), OUString( RTL_CONSTASCII_USTRINGPARAM("title") ), _xAttributes );
+    ctx.importEvents( _events );
+    // avoid ring-reference:
+    // vector< event elements > holding event elements holding this (via _pParent)
+    _events.clear();
 }
 
 // progessmeter
@@ -298,23 +321,9 @@ Reference< xml::input::XElement > ScrollBarElement::startChildElement(
 void ScrollBarElement::endElement()
     throw (xml::sax::SAXException, RuntimeException)
 {
-    OUString sService( OUSTR("com.sun.star.awt.UnoControlScrollBarModel") );
-    // we should probably limit this to vba mode also ( leave for now )
-    if ( isVBACompatibilityMode( _pImport ) )
-        sService = OUSTR("com.sun.star.form.component.ScrollBar");
-
-    OUString sLinkedCell;
-    try
-    {
-        sLinkedCell = _xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) );
-    }
-    catch( Exception& /*e*/ )
-    {
-    }
-
     ControlImportContext ctx(
         _pImport, getControlId( _xAttributes ),
-        sService );
+        getControlModelName( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlScrollBarModel") ), _xAttributes ) );
 
     Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) );
     if (xStyle.is())
@@ -358,10 +367,7 @@ void ScrollBarElement::endElement()
                                OUString( RTL_CONSTASCII_USTRINGPARAM("symbol-color") ),
                                _xAttributes );
 
-    // import cell-link
-    OUString sCellRange;
-    importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx );
-
+    ctx.importDataAwareProperty( OUSTR("linked-cell" ), _xAttributes );
     ctx.importEvents( _events );
     // avoid ring-reference:
     // vector< event elements > holding event elements holding this (via _pParent)
@@ -393,18 +399,9 @@ Reference< xml::input::XElement > SpinButtonElement::startChildElement(
 void SpinButtonElement::endElement()
     throw (xml::sax::SAXException, RuntimeException)
 {
-    OUString sLinkedCell;
-    try
-    {
-        sLinkedCell = _xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) );
-    }
-    catch( Exception& /*e*/ )
-    {
-    }
-
     ControlImportContext ctx(
-        _pImport, getControlId( _xAttributes ),
-        OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.SpinButton") ) );
+                            _pImport, getControlId( _xAttributes ),
+                            getControlModelName( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlSpinButtonModel") ), _xAttributes ) );
 
     Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) );
     if (xStyle.is())
@@ -417,33 +414,25 @@ void SpinButtonElement::endElement()
 
     ctx.importDefaults( _nBasePosX, _nBasePosY, _xAttributes );
     ctx.importOrientationProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Orientation") ),
-                                   OUString( RTL_CONSTASCII_USTRINGPARAM("align") ),
-                                   _xAttributes );
+    OUString( RTL_CONSTASCII_USTRINGPARAM("align") ),
+         _xAttributes );
     ctx.importLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("SpinIncrement") ),
-                            OUString( RTL_CONSTASCII_USTRINGPARAM("increment") ),
-                            _xAttributes );
+        OUString( RTL_CONSTASCII_USTRINGPARAM("increment") ),
+        _xAttributes );
     ctx.importLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("SpinValue") ),
-                            OUString( RTL_CONSTASCII_USTRINGPARAM("curval") ),
-                            _xAttributes );
+    OUString( RTL_CONSTASCII_USTRINGPARAM("curval") ),_xAttributes );
     ctx.importLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("SpinValueMax") ),
-                            OUString( RTL_CONSTASCII_USTRINGPARAM("maxval") ),
-                            _xAttributes );
+    OUString( RTL_CONSTASCII_USTRINGPARAM("maxval") ), _xAttributes );
     ctx.importLongProperty( OUSTR("SpinValueMin"), OUSTR("minval"),
-                            _xAttributes );
-    ctx.importLongProperty( OUSTR("Repeat"), OUSTR("repeat"),
-                            _xAttributes );
+        _xAttributes );
+    ctx.importLongProperty( OUSTR("Repeat"), OUSTR("repeat"), _xAttributes );
     ctx.importLongProperty( OUSTR("RepeatDelay"), OUSTR("repeat-delay"),
-                            _xAttributes );
+_xAttributes );
     ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
-                               OUString( RTL_CONSTASCII_USTRINGPARAM("tabstop") ),
-                               _xAttributes );
+    OUString( RTL_CONSTASCII_USTRINGPARAM("tabstop") ), _xAttributes );
     ctx.importHexLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("SymbolColor") ),
-                               OUString( RTL_CONSTASCII_USTRINGPARAM("symbol-color") ),
-                               _xAttributes );
-    // import cell-link
-    OUString sCellRange;
-    importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx );
-
+    OUString( RTL_CONSTASCII_USTRINGPARAM("symbol-color") ), _xAttributes );
+    ctx.importDataAwareProperty( OUSTR("linked-cell" ), _xAttributes );
     ctx.importEvents( _events );
     // avoid ring-reference:
     // vector< event elements > holding event elements holding this (via _pParent)
@@ -746,6 +735,7 @@ void FormattedFieldElement::endElement()
                                OUString( RTL_CONSTASCII_USTRINGPARAM("enforce-format") ),
                                _xAttributes );
 
+    ctx.importDataAwareProperty( OUSTR("linked-cell" ), _xAttributes );
     ctx.importEvents( _events );
     // avoid ring-reference:
     // vector< event elements > holding event elements holding this (via _pParent)
@@ -1285,34 +1275,7 @@ void ImageControlElement::endElement()
     rtl::OUString sURL = _xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "src" ) );
     Reference< document::XStorageBasedDocument > xDocStorage( _pImport->getDocOwner(), UNO_QUERY );
 
-    if ( xDocStorage.is() && IsPackageURL( sURL ) )
-    {
-        uno::Sequence< Any > aArgs( 1 );
-        aArgs[ 0 ] <<= xDocStorage->getDocumentStorage();
-
-        ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
-        uno::Reference< document::XGraphicObjectResolver > xGraphicResolver;
-        aContext.createComponentWithArguments( OUSTR( "com.sun.star.comp.Svx.GraphicImportHelper" ), aArgs, xGraphicResolver );
-
-        if ( xGraphicResolver.is() )
-        {
-            rtl::OUString aTmp( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" ) );
-            aTmp += sURL;
-            sURL = xGraphicResolver->resolveGraphicObjectURL( aTmp );
-            Reference< beans::XPropertySet > xProps( ctx.getControlModel(), UNO_QUERY );
-            // we must set the url while the graphic object ( held by the resolver is in scope )
-            if ( xProps.is() )
-                xProps->setPropertyValue( OUSTR("ImageURL"), makeAny( sURL ) );
-        }
-    }
-
-    else if ( sURL.getLength() > 0 )
-    {
-        Reference< beans::XPropertySet > xProps( ctx.getControlModel(), UNO_QUERY );
-        if ( xProps.is() )
-            xProps->setPropertyValue( OUSTR("ImageURL"), makeAny( sURL ) );
-    }
-
+    ctx.importImageURLProperty( OUSTR( "ImageURL" ), OUSTR( "src" ), _xAttributes );
     ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
                                OUString( RTL_CONSTASCII_USTRINGPARAM("tabstop") ),
                                _xAttributes );
@@ -1645,24 +1608,10 @@ void TitledBoxElement::endElement()
         Reference< xml::input::XElement > xRadio( _radios[ nPos ] );
         Reference< xml::input::XAttributes > xAttributes(
             xRadio->getAttributes() );
-        OUString sLinkedCell;
-        OUString sCellRange;
-        OUString sService( OUSTR("com.sun.star.awt.UnoControlRadioButtonModel") );
-        try
-        {
-            sLinkedCell = xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) );
-            // we should probably limit this to vba mode also ( leave for now )
-            if ( isVBACompatibilityMode( _pImport ) )
-                sService = OUSTR("com.sun.star.form.component.RadioButton");
-        }
-        catch( Exception& /*e*/ )
-        {
-        }
-
 
         ControlImportContext ctx(
             _pImport, getControlId( xAttributes ),
-            sService );
+            getControlModelName( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlRadioButtonModel") ), xAttributes ) );
         Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
 
         Reference< xml::input::XElement > xStyle( getStyle( xAttributes ) );
@@ -1689,9 +1638,7 @@ void TitledBoxElement::endElement()
         ctx.importVerticalAlignProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("VerticalAlign") ),
                                          OUString( RTL_CONSTASCII_USTRINGPARAM("valign") ),
                                          xAttributes );
-        ctx.importStringProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
-                                  OUString( RTL_CONSTASCII_USTRINGPARAM("image-src") ),
-                                  xAttributes );
+        ctx.importImageURLProperty( OUSTR( "ImageURL" ), OUSTR( "image-src" ), _xAttributes );
         ctx.importImagePositionProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ImagePosition") ),
                                          OUString( RTL_CONSTASCII_USTRINGPARAM("image-position") ),
                                          xAttributes );
@@ -1714,7 +1661,7 @@ void TitledBoxElement::endElement()
         }
         xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("State") ),
                                          makeAny( nVal ) );
-    importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx );
+        ctx.importDataAwareProperty( OUSTR("linked-cell" ), xAttributes );
         ::std::vector< Reference< xml::input::XElement > > * radioEvents =
             static_cast< RadioElement * >( xRadio.get() )->getEvents();
         ctx.importEvents( *radioEvents );
@@ -1790,23 +1737,10 @@ void RadioGroupElement::endElement()
         Reference< xml::input::XElement > xRadio( _radios[ nPos ] );
         Reference< xml::input::XAttributes > xAttributes(
             xRadio->getAttributes() );
-        OUString sLinkedCell;
-        OUString sCellRange;
-        OUString sService( OUSTR("com.sun.star.awt.UnoControlRadioButtonModel") );
-        try
-        {
-            sLinkedCell = xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) );
-            // we should probably limit this to vba mode also ( leave for now )
-            if ( isVBACompatibilityMode( _pImport ) )
-                sService = OUSTR("com.sun.star.form.component.RadioButton");
-        }
-        catch( Exception& /*e*/ )
-        {
-        }
 
         ControlImportContext ctx(
             _pImport, getControlId( xAttributes ),
-            sService );
+            getControlModelName( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlRadioButtonModel") ), xAttributes ) );
         Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
 
         Reference< xml::input::XElement > xStyle( getStyle( xAttributes ) );
@@ -1833,9 +1767,7 @@ void RadioGroupElement::endElement()
         ctx.importVerticalAlignProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("VerticalAlign") ),
                                          OUString( RTL_CONSTASCII_USTRINGPARAM("valign") ),
                                          xAttributes );
-        ctx.importStringProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
-                                  OUString( RTL_CONSTASCII_USTRINGPARAM("image-src") ),
-                                  xAttributes );
+        ctx.importImageURLProperty( OUSTR( "ImageURL" ), OUSTR( "image-src" ), xAttributes );
         ctx.importImagePositionProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ImagePosition") ),
                                          OUString( RTL_CONSTASCII_USTRINGPARAM("image-position") ),
                                          xAttributes );
@@ -1858,7 +1790,8 @@ void RadioGroupElement::endElement()
         xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("State") ),
                                          makeAny( nVal ) );
 
-    importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx );
+        ctx.importDataAwareProperty( OUSTR("linked-cell" ), xAttributes );
+
         ::std::vector< Reference< xml::input::XElement > > * radioEvents =
             static_cast< RadioElement * >( xRadio.get() )->getEvents();
         ctx.importEvents( *radioEvents );
@@ -1979,26 +1912,10 @@ Reference< xml::input::XElement > MenuListElement::startChildElement(
 void MenuListElement::endElement()
     throw (xml::sax::SAXException, RuntimeException)
 {
-        OUString sLinkedCell;
-        OUString sCellRange;
-        OUString sListBoxService( OUSTR("com.sun.star.awt.UnoControlListBoxModel") );
-
-        // we should probably limit this to vba mode also ( leave for now )
-        if ( isVBACompatibilityMode( _pImport ) )
-            sListBoxService = OUSTR("com.sun.star.form.component.ListBox");
-
-        try
-        {
-            sLinkedCell = _xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) );
-            sCellRange = _xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "source-cell-range" ) );
-        }
-        catch( Exception& /*e*/ )
-        {
-        }
     ControlImportContext ctx(
         _pImport, getControlId( _xAttributes ),
-        //OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlListBoxModel") ) );
-        sListBoxService );
+
+    getControlModelName( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlListBoxModel") ), _xAttributes  ) );
     Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
 
     Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) );
@@ -2031,17 +1948,16 @@ void MenuListElement::endElement()
     ctx.importAlignProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Align") ),
                              OUString( RTL_CONSTASCII_USTRINGPARAM("align") ),
                              _xAttributes );
-        // import cell-link and cell source range
-    importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx );
+    bool bHasLinkedCell = ctx.importDataAwareProperty( OUSTR("linked-cell" ), _xAttributes );
+    bool bHasSrcRange = ctx.importDataAwareProperty( OUSTR("source-cell-range" ), _xAttributes );
     if (_popup.is())
     {
         MenuPopupElement * p = static_cast< MenuPopupElement * >( _popup.get() );
-        if (  !sCellRange.getLength() )
-            xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ),
-                                         makeAny( p->getItemValues() ) );
-        if (  !sLinkedCell.getLength() )
-            xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("SelectedItems") ),
-                                         makeAny( p->getSelectedItems() ) );
+        if ( !bHasSrcRange )
+            xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ), makeAny( p->getItemValues() ) );
+        if ( !bHasLinkedCell )
+            xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("SelectedItems") ), makeAny( p->getSelectedItems() ) );
+
     }
     ctx.importEvents( _events );
     // avoid ring-reference:
@@ -2086,26 +2002,9 @@ Reference< xml::input::XElement > ComboBoxElement::startChildElement(
 void ComboBoxElement::endElement()
     throw (xml::sax::SAXException, RuntimeException)
 {
-        OUString sService( OUSTR("com.sun.star.awt.UnoControlComboBoxModel") );
-
-        // we should probably limit this to vba mode also ( leave for now )
-        if ( isVBACompatibilityMode( _pImport ) )
-            sService = OUSTR("com.sun.star.form.component.ComboBox");
-
-        OUString sLinkedCell;
-        OUString sCellRange;
-        try
-        {
-            sLinkedCell = _xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) );
-            sCellRange = _xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "source-cell-range" ) );
-        }
-        catch( Exception& /*e*/ )
-        {
-        }
-
     ControlImportContext ctx(
         _pImport, getControlId( _xAttributes ),
-        sService );
+        getControlModelName( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlComboBoxModel") ), _xAttributes ) );
     Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
 
     Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) );
@@ -2147,10 +2046,9 @@ void ComboBoxElement::endElement()
     ctx.importAlignProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Align") ),
                              OUString( RTL_CONSTASCII_USTRINGPARAM("align") ),
                              _xAttributes );
-    // import cell-link and cell source range
-    importBindableAndListRangeBits( _pImport, sLinkedCell, sCellRange, ctx );
-
-    if (_popup.is() && !sCellRange.getLength() )
+    ctx.importDataAwareProperty( OUSTR("linked-cell" ), _xAttributes );
+    bool bHasSrcRange = ctx.importDataAwareProperty( OUSTR("source-cell-range" ), _xAttributes );
+    if (_popup.is() && !bHasSrcRange )
     {
         MenuPopupElement * p = static_cast< MenuPopupElement * >( _popup.get() );
         xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ),
@@ -2217,9 +2115,7 @@ void CheckBoxElement::endElement()
     ctx.importVerticalAlignProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("VerticalAlign") ),
                                      OUString( RTL_CONSTASCII_USTRINGPARAM("valign") ),
                                      _xAttributes );
-    ctx.importStringProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
-                              OUString( RTL_CONSTASCII_USTRINGPARAM("image-src") ),
-                              _xAttributes );
+    ctx.importImageURLProperty( OUSTR( "ImageURL" ), OUSTR( "image-src" ), _xAttributes );
     ctx.importImagePositionProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ImagePosition") ),
                                      OUString( RTL_CONSTASCII_USTRINGPARAM("image-position") ),
                                      _xAttributes );
@@ -2320,9 +2216,7 @@ void ButtonElement::endElement()
     ctx.importButtonTypeProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("PushButtonType") ),
                                   OUString( RTL_CONSTASCII_USTRINGPARAM("button-type") ),
                                   _xAttributes );
-    ctx.importStringProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
-                              OUString( RTL_CONSTASCII_USTRINGPARAM("image-src") ),
-                              _xAttributes );
+    ctx.importImageURLProperty( OUSTR( "ImageURL" ), OUSTR( "image-src" ), _xAttributes );
     ctx.importImagePositionProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ImagePosition") ),
                                      OUString( RTL_CONSTASCII_USTRINGPARAM("image-position") ),
                                      _xAttributes );
@@ -2477,7 +2371,7 @@ Reference< xml::input::XElement > BulletinBoardElement::startChildElement(
         return new ScrollBarElement( rLocalName, xAttributes, this, _pImport );
     }
     // spinbutton
-    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("spinbutton") ) && isVBACompatibilityMode( _pImport ) )
+    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("spinbutton") ) )
     {
         return new SpinButtonElement( rLocalName, xAttributes, this, _pImport );
     }
@@ -2490,6 +2384,14 @@ Reference< xml::input::XElement > BulletinBoardElement::startChildElement(
     {
         return new MultiPage( rLocalName, xAttributes, this, _pImport );
     }
+    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("frame") ))
+    {
+        return new Frame( rLocalName, xAttributes, this, _pImport );
+    }
+    else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("page") ))
+    {
+        return new Page( rLocalName, xAttributes, this, _pImport );
+    }
     // bulletinboard
     else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bulletinboard") ))
     {
@@ -2665,10 +2567,7 @@ void WindowElement::endElement()
         OUString( RTL_CONSTASCII_USTRINGPARAM("Decoration") ),
         OUString( RTL_CONSTASCII_USTRINGPARAM("withtitlebar") ),
         _xAttributes );
-    ctx.importStringProperty(
-        OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
-        OUString( RTL_CONSTASCII_USTRINGPARAM("image-src") ),
-        _xAttributes );
+        ctx.importImageURLProperty( OUSTR( "ImageURL" ), OUSTR( "image-src" ), _xAttributes );
     ctx.importEvents( _events );
     // avoid ring-reference:
     // vector< event elements > holding event elements holding this (via _pParent)
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
index 81ba97c6a955..b5d61fd7dc83 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
@@ -58,10 +58,20 @@
 #include <com/sun/star/script/ScriptEventDescriptor.hpp>
 
 #include <com/sun/star/view/SelectionType.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/form/binding/XBindableValue.hpp>
+#include <com/sun/star/form/binding/XValueBinding.hpp>
+#include <com/sun/star/form/binding/XListEntrySink.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
+#include <com/sun/star/table/CellAddress.hpp>
+#include <com/sun/star/table/CellRangeAddress.hpp>
+#include <com/sun/star/document/XGraphicObjectResolver.hpp>
 #include <com/sun/star/document/XStorageBasedDocument.hpp>
 #include <com/sun/star/script/DocumentScriptLibraryContainer.hpp>
 #include <com/sun/star/script/vba/XVBACompatibility.hpp>
 
+#include <comphelper/componentcontext.hxx>
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
@@ -129,6 +139,20 @@ OUString ControlElement::getControlId(
     return aId;
 }
 
+OUString ControlElement::getControlModelName(
+    OUString const& rDefaultModel,
+    Reference< xml::input::XAttributes > const & xAttributes )
+{
+    OUString aModel;
+    aModel = xAttributes->getValueByUidName(
+        _pImport->XMLNS_DIALOGS_UID,
+        OUString( RTL_CONSTASCII_USTRINGPARAM("control-implementation") ) );
+    if (! aModel.getLength())
+        aModel = rDefaultModel;
+    return aModel;
+}
+
+
 //##################################################################################################
 
 //__________________________________________________________________________________________________
@@ -820,6 +844,7 @@ bool ImportContext::importDoubleProperty(
     }
     return false;
 }
+
 //__________________________________________________________________________________________________
 bool ImportContext::importBooleanProperty(
     OUString const & rPropName, OUString const & rAttrName,
@@ -971,6 +996,115 @@ bool ImportContext::importVerticalAlignProperty(
     return false;
 }
 //__________________________________________________________________________________________________
+bool ImportContext::importImageURLProperty(
+    OUString const & rPropName, OUString const & rAttrName,
+    Reference< xml::input::XAttributes > const & xAttributes )
+{
+    rtl::OUString sURL = xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, rAttrName );
+    if ( sURL.getLength() )
+    {
+        Reference< document::XStorageBasedDocument > xDocStorage( _pImport->getDocOwner(), UNO_QUERY );
+
+        uno::Reference< document::XGraphicObjectResolver > xGraphicResolver;
+        if ( xDocStorage.is() )
+        {
+            uno::Sequence< Any > aArgs( 1 );
+            aArgs[ 0 ] <<= xDocStorage->getDocumentStorage();
+            ::comphelper::ComponentContext aContext( _pImport->getComponentContext() );
+            aContext.createComponentWithArguments( OUSTR( "com.sun.star.comp.Svx.GraphicImportHelper" ), aArgs, xGraphicResolver );
+            if ( xGraphicResolver.is() )
+            {
+                rtl::OUString aTmp( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" ) );
+                aTmp += sURL;
+                try
+                {
+                    aTmp = xGraphicResolver->resolveGraphicObjectURL( aTmp );
+                    if ( aTmp.getLength() )
+                        sURL = aTmp;
+                }
+                catch( uno::Exception& e )
+                {
+                    (void)e;
+                    return false;
+                }
+
+            }
+        }
+        if ( sURL.getLength() > 0 )
+        {
+            Reference< beans::XPropertySet > xProps( getControlModel(), UNO_QUERY );
+            if ( xProps.is() )
+            {
+                xProps->setPropertyValue( rPropName, makeAny( sURL ) );
+                return true;
+            }
+        }
+    }
+    return false;
+}
+//__________________________________________________________________________________________________
+ bool ImportContext::importDataAwareProperty(
+        ::rtl::OUString const & rPropName,
+        Reference<xml::input::XAttributes> const & xAttributes )
+{
+    OUString sLinkedCell;
+    OUString sCellRange;
+    if ( rPropName.equals( OUSTR("linked-cell" ) ) )
+       sLinkedCell = xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, rPropName );
+    if ( rPropName.equals( OUSTR(  "source-cell-range" ) ) )
+        sCellRange = xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, rPropName );
+    bool bRes = false;
+    Reference< lang::XMultiServiceFactory > xFac( _pImport->getDocOwner(), UNO_QUERY );
+    if ( xFac.is() && ( sLinkedCell.getLength() ||  sCellRange.getLength() ) )
+    {
+        // Set up Celllink
+        if ( sLinkedCell.getLength() )
+        {
+            Reference< form::binding::XBindableValue > xBindable( getControlModel(), uno::UNO_QUERY );
+            Reference< beans::XPropertySet > xConvertor( xFac->createInstance( OUSTR( "com.sun.star.table.CellAddressConversion" )), uno::UNO_QUERY );
+            if ( xBindable.is() && xConvertor.is() )
+            {
+                table::CellAddress aAddress;
+                xConvertor->setPropertyValue( OUSTR( "PersistentRepresentation" ), uno::makeAny( sLinkedCell ) );
+                xConvertor->getPropertyValue( OUSTR( "Address" ) ) >>= aAddress;
+                beans::NamedValue aArg1;
+                aArg1.Name = OUSTR("BoundCell");
+                aArg1.Value <<= aAddress;
+
+                uno::Sequence< uno::Any > aArgs(1);
+                aArgs[ 0 ]  <<= aArg1;
+
+                uno::Reference< form::binding::XValueBinding > xBinding( xFac->createInstanceWithArguments( OUSTR("com.sun.star.table.CellValueBinding" ), aArgs ), uno::UNO_QUERY );
+                xBindable->setValueBinding( xBinding );
+                bRes = true;
+            }
+        }
+        // Set up CelllRange
+        if ( sCellRange.getLength() )
+        {
+            Reference< form::binding::XListEntrySink  > xListEntrySink( getControlModel(), uno::UNO_QUERY );
+            Reference< beans::XPropertySet > xConvertor( xFac->createInstance( OUSTR( "com.sun.star.table.CellRangeAddressConversion" )), uno::UNO_QUERY );
+            if ( xListEntrySink.is() && xConvertor.is() )
+            {
+                table::CellRangeAddress aAddress;
+                xConvertor->setPropertyValue( OUSTR( "PersistentRepresentation" ), uno::makeAny( sCellRange ) );
+                xConvertor->getPropertyValue( OUSTR( "Address" ) ) >>= aAddress;
+                beans::NamedValue aArg1;
+                aArg1.Name = OUSTR("CellRange");
+                aArg1.Value <<= aAddress;
+
+                uno::Sequence< uno::Any > aArgs(1);
+                aArgs[ 0 ]  <<= aArg1;
+
+                uno::Reference< form::binding::XListEntrySource > xSource( xFac->createInstanceWithArguments( OUSTR("com.sun.star.table.CellRangeListSource" ), aArgs ), uno::UNO_QUERY );
+                xListEntrySink->setListEntrySource( xSource );
+                bRes = true;
+            }
+        }
+    }
+    return bRes;
+}
+//__________________________________________________________________________________________________
 bool ImportContext::importImageAlignProperty(
     OUString const & rPropName, OUString const & rAttrName,
     Reference< xml::input::XAttributes > const & xAttributes )
@@ -1876,19 +2010,19 @@ void DialogImport::addStyle(
     Reference< xml::input::XElement > const & xStyle )
     SAL_THROW( () )
 {
-    _styleNames.push_back( rStyleId );
-    _styles.push_back( xStyle );
+    (*_pStyleNames).push_back( rStyleId );
+    (*_pStyles).push_back( xStyle );
 }
 //__________________________________________________________________________________________________
 Reference< xml::input::XElement > DialogImport::getStyle(
     OUString const & rStyleId ) const
     SAL_THROW( () )
 {
-    for ( size_t nPos = 0; nPos < _styleNames.size(); ++nPos )
+    for ( size_t nPos = 0; nPos < (*_pStyleNames).size(); ++nPos )
     {
-        if (_styleNames[ nPos ] == rStyleId)
+        if ( (*_pStyleNames)[ nPos ] == rStyleId)
         {
-            return _styles[ nPos ];
+            return (*_pStyles)[ nPos ];
         }
     }
     return 0;
@@ -1921,11 +2055,13 @@ Reference< xml::sax::XDocumentHandler > SAL_CALL importDialogModel(
     Reference< XModel > const & xDocument )
     SAL_THROW( (Exception) )
 {
-    DialogImport* pImport = new DialogImport( xContext, xDialogModel, xDocument );
-    return ::xmlscript::createDocumentHandler(
-        static_cast< xml::input::XRoot * >( pImport ) );
+    // single set of styles and stylenames apply to all containees
+    :: boost::shared_ptr< ::std::vector< ::rtl::OUString > > pStyleNames( new ::std::vector< ::rtl::OUString > );
+    :: boost::shared_ptr< ::std::vector< css::uno::Reference< css::xml::input::XElement > > > pStyles( new ::std::vector< css::uno::Reference< css::xml::input::XElement > > );
+     return ::xmlscript::createDocumentHandler(
+         static_cast< xml::input::XRoot * >(
+            new DialogImport( xContext, xDialogModel, pStyleNames, pStyles, xDocument ) ) );
 }
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlscript/util/makefile.mk b/xmlscript/util/makefile.mk
index bc259db75455..dd21c16cd558 100644
--- a/xmlscript/util/makefile.mk
+++ b/xmlscript/util/makefile.mk
@@ -56,6 +56,7 @@ SHL1LIBS= \
 SHL1STDLIBS= \
         $(COMPHELPERLIB)                \
         $(CPPUHELPERLIB)		\
+        $(COMPHELPERLIB)		\
         $(CPPULIB) 			\
         $(SALLIB)
 
diff --git a/xmlsecurity/inc/xmlsecurity/global.hrc b/xmlsecurity/inc/xmlsecurity/global.hrc
index 57a9a95e88b3..5ec98db80b1e 100644
--- a/xmlsecurity/inc/xmlsecurity/global.hrc
+++ b/xmlsecurity/inc/xmlsecurity/global.hrc
@@ -42,7 +42,6 @@
 #define RID_XMLSECTP_MACROWARN              1009
 #define RID_XMLSECTP_READONLY_CONFIG_TIP    1010
 #define RID_XMLSECTP_LOCK                   1011
-#define RID_XMLSECTP_LOCK_HC                1012
 #define RID_XMLSECWB_NO_MOZILLA_PROFILE     1013
 
 #endif
diff --git a/xmlsecurity/prj/build.lst b/xmlsecurity/prj/build.lst
index cd438326bd00..19a5f1754d45 100644
--- a/xmlsecurity/prj/build.lst
+++ b/xmlsecurity/prj/build.lst
@@ -1,4 +1,4 @@
-xs	xmlsecurity	:    l10n xmloff unotools offapi unoil svx MOZ:moz SO:moz_prebuilt LIBXMLSEC:libxmlsec NSS:nss NULL
+xs	xmlsecurity	:    l10n xmloff unotools offapi unoil svx MOZ:moz LIBXMLSEC:libxmlsec NSS:nss NULL
 xs	xmlsecurity                                                        usr1	 -	all	xs_mkout	NULL
 xs	xmlsecurity\inc				                                       nmake -	all	xs_inc NULL
 xs	xmlsecurity\source\framework                                       nmake -	all	xs_fw xs_inc NULL
diff --git a/xmlsecurity/source/component/certificatecontainer.cxx b/xmlsecurity/source/component/certificatecontainer.cxx
index 7759ad731686..378f7a7d3fba 100644
--- a/xmlsecurity/source/component/certificatecontainer.cxx
+++ b/xmlsecurity/source/component/certificatecontainer.cxx
@@ -135,7 +135,7 @@ CertificateContainer::impl_getStaticSupportedServiceNames(  )
     throw(::com::sun::star::uno::RuntimeException)
 {
     Sequence< ::rtl::OUString > aRet(1);
-    *aRet.getArray() = ::rtl::OUString::createFromAscii("com.sun.star.security.CertificateContainer");
+    *aRet.getArray() = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.security.CertificateContainer"));
     return aRet;
 }
 
@@ -145,7 +145,7 @@ CertificateContainer::impl_getStaticSupportedServiceNames(  )
 CertificateContainer::impl_getStaticImplementationName()
     throw(::com::sun::star::uno::RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.security.CertificateContainer");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.security.CertificateContainer"));
 }
 
 //-------------------------------------------------------------------------
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index f5930feb7308..99c2ab5ccab1 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -320,7 +320,7 @@ DocumentDigitalSignatures::ImplVerifySignatures(
             if (!rSigInfo.Signer.is())
                 rSigInfo.Signer = xSecEnv->getCertificate( rInfo.ouX509IssuerName, xSerialNumberAdapter->toSequence( rInfo.ouX509SerialNumber ) );
 
-            // --> PB 2004-12-14 #i38744# time support again
+            // Time support again (#i38744#)
             Date aDate( rInfo.stDateTime.Day, rInfo.stDateTime.Month, rInfo.stDateTime.Year );
             Time aTime( rInfo.stDateTime.Hours, rInfo.stDateTime.Minutes,
                         rInfo.stDateTime.Seconds, rInfo.stDateTime.HundredthSeconds );
diff --git a/xmlsecurity/source/component/registerservices.cxx b/xmlsecurity/source/component/registerservices.cxx
index c9f7475abb83..9dc442ef490a 100644
--- a/xmlsecurity/source/component/registerservices.cxx
+++ b/xmlsecurity/source/component/registerservices.cxx
@@ -59,7 +59,7 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr
                     uno::Reference< registry::XRegistryKey > xNewKey(
                     reinterpret_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( DocumentDigitalSignatures::GetImplementationName() ) );
 
-                    xNewKey = xNewKey->createKey( rtl::OUString::createFromAscii( "/UNO/SERVICES" ) );
+                    xNewKey = xNewKey->createKey( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
 
                     const uno::Sequence< rtl::OUString >& rSNL = DocumentDigitalSignatures::GetSupportedServiceNames();
                     const rtl::OUString* pArray = rSNL.getConstArray();
@@ -70,7 +70,7 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr
                     nPos = 0;
                     uno::Reference< registry::XRegistryKey > xNewKeyCertificateContainer(
                     reinterpret_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( CertificateContainer::impl_getStaticImplementationName() ) );
-                    xNewKeyCertificateContainer = xNewKeyCertificateContainer->createKey( rtl::OUString::createFromAscii( "/UNO/SERVICES" ) );
+                    xNewKeyCertificateContainer = xNewKeyCertificateContainer->createKey( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
 
                     const uno::Sequence< rtl::OUString >& rSNLCertificateContainer = CertificateContainer::impl_getStaticSupportedServiceNames();
                     const rtl::OUString* pArrayCertificateContainer = rSNLCertificateContainer.getConstArray();
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 7980b8046cbf..dac5e507d1f0 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -120,24 +120,18 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( Window* _pParent, Certif
     ,maKeyImg               ( this, XMLSEC_RES( IMG_KEY ) )
     ,maHintCorrespPrivKeyFI ( this, XMLSEC_RES( FI_CORRPRIVKEY ) )
 {
-    if ( GetSettings().GetStyleSettings().GetHighContrastMode() )
-        maKeyImg.SetImage( Image( XMLSEC_RES( IMG_KEY_HC ) ) );
-
     //Verify the certificate
     sal_Int32 certStatus = mpDlg->mxSecurityEnvironment->verifyCertificate(mpDlg->mxCert,
          Sequence<Reference<css::security::XCertificate> >());
 
     bool bCertValid = certStatus == css::security::CertificateValidity::VALID ?  true : false;
 
-    bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
     if ( !bCertValid )
     {
         maCertImg.SetImage(
-            Image( XMLSEC_RES( bHC ? IMG_STATE_NOT_VALIDATED_HC : IMG_STATE_NOT_VALIDATED ) ) );
+            Image( XMLSEC_RES( IMG_STATE_NOT_VALIDATED ) ) );
         maHintNotTrustedFI.SetText( String( XMLSEC_RES( STR_CERTIFICATE_NOT_VALIDATED ) ) );
     }
-    else if ( bHC )
-        maCertImg.SetImage( Image( XMLSEC_RES( IMG_STATE_CERIFICATED_HC ) ) );
 
     FreeResource();
 
@@ -291,10 +285,9 @@ CertificateViewerDetailsTP::CertificateViewerDetailsTP( Window* _pParent, Certif
     const char*             pHexSep = " ";
     String                  aLBEntry;
     String                  aDetails;
-    // --> PB 2004-10-11 #i35107# - 0 == "V1", 1 == "V2", ..., n = "V(n+1)"
+    // Certificate Versions are reported wrong (#i35107#) - 0 == "V1", 1 == "V2", ..., n = "V(n+1)"
     aLBEntry = String::CreateFromAscii( "V" );
     aLBEntry += String::CreateFromInt32( xCert->getVersion() + 1 );
-    // <--
     InsertElement( String( XMLSEC_RES( STR_VERSION ) ), aLBEntry, aLBEntry );
     Sequence< sal_Int8 >    aSeq = xCert->getSerialNumber();
     aLBEntry = XmlSec::GetHexString( aSeq, pHexSep );
@@ -420,12 +413,6 @@ CertificateViewerCertPathTP::CertificateViewerCertPathTP( Window* _pParent, Cert
     ,msCertNotValidated     ( XMLSEC_RES( STR_PATH_CERT_NOT_VALIDATED ) )
 
 {
-    if ( GetSettings().GetStyleSettings().GetHighContrastMode() )
-    {
-        maCertImage = Image( XMLSEC_RES( IMG_CERT_SMALL_HC ) );
-        maCertNotValidatedImage = Image( XMLSEC_RES( IMG_CERT_NOTVALIDATED_SMALL_HC ) );
-    }
-
     FreeResource();
 
     maCertPathLB.SetNodeDefaultImages();
diff --git a/xmlsecurity/source/dialogs/certificateviewer.src b/xmlsecurity/source/dialogs/certificateviewer.src
index 3a9466aeb9a8..dce89b221dbe 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.src
+++ b/xmlsecurity/source/dialogs/certificateviewer.src
@@ -174,21 +174,6 @@ TabPage RID_XMLSECTP_GENERAL
         ImageBitmap = Bitmap { File = "notcertificate_40x56.png"; };
            MaskColor = STD_MASKCOLOR;
     };
-    Image IMG_STATE_CERIFICATED_HC
-    {
-        ImageBitmap = Bitmap { File = "certificate_40x56_h.png"; };
-           MaskColor = STD_MASKCOLOR;
-    };
-    Image IMG_STATE_NOT_VALIDATED_HC
-    {
-        ImageBitmap = Bitmap { File = "notcertificate_40x56_h.png"; };
-           MaskColor = STD_MASKCOLOR;
-    };
-    Image IMG_KEY_HC
-    {
-        ImageBitmap = Bitmap { File = "key_12_h.png"; };
-           MaskColor = STD_MASKCOLOR;
-    };
 };
 
 TabPage RID_XMLSECTP_DETAILS
@@ -321,21 +306,11 @@ TabPage RID_XMLSECTP_CERTPATH
         ImageBitmap = Bitmap { File = "certificate_16.png"; };
         MaskColor = STD_MASKCOLOR;
     };
-    Image IMG_CERT_SMALL_HC
-    {
-        ImageBitmap = Bitmap { File = "certificate_16_h.png"; };
-        MaskColor = STD_MASKCOLOR;
-    };
     Image IMG_CERT_NOTVALIDATED_SMALL
     {
         ImageBitmap = Bitmap { File = "notcertificate_16.png"; };
         MaskColor = STD_MASKCOLOR;
     };
-    Image IMG_CERT_NOTVALIDATED_SMALL_HC
-    {
-        ImageBitmap = Bitmap { File = "notcertificate_16_h.png"; };
-        MaskColor = STD_MASKCOLOR;
-    };
     String STR_PATH_CERT_OK
     {
         Text [ en-US ] = "The certificate is OK.";
diff --git a/xmlsecurity/source/dialogs/dialogs.hrc b/xmlsecurity/source/dialogs/dialogs.hrc
index b30eb9198e32..d315f7ccc020 100644
--- a/xmlsecurity/source/dialogs/dialogs.hrc
+++ b/xmlsecurity/source/dialogs/dialogs.hrc
@@ -82,9 +82,6 @@
 #define FI_STATE_BROKEN                 10
 #define IMG_STATE_NOTVALIDATED          11
 #define FI_STATE_NOTVALIDATED           12
-#define IMG_STATE_VALID_HC              13
-#define IMG_STATE_BROKEN_HC             14
-#define IMG_STATE_NOTVALIDATED_HC       15
 #define FI_STATE_OLDSIGNATURE           16
 
 //#define DS_WIDTH                      DLGS_WIDTH
@@ -175,9 +172,6 @@
 #define FI_CORRPRIVKEY                  14
 #define STR_CERTIFICATE_NOT_VALIDATED   15
 #define IMG_STATE_NOT_VALIDATED         16
-#define IMG_STATE_CERIFICATED_HC        17
-#define IMG_STATE_NOT_VALIDATED_HC      18
-#define IMG_KEY_HC                      19
 
 #define IMG1_WIDTH                      33
 #define IMG1_HEIGHT                     22
@@ -237,9 +231,7 @@
 #define FT_CERTSTATUS                   2
 #define ML_CERTSTATUS                   3
 #define IMG_CERT_SMALL                  4
-#define IMG_CERT_SMALL_HC               5
 #define IMG_CERT_NOTVALIDATED_SMALL     6
-#define IMG_CERT_NOTVALIDATED_SMALL_HC  7
 #define STR_PATH_CERT_OK                8
 #define STR_PATH_CERT_NOT_VALIDATED     9
 
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 03abc233ab3b..e816f397033b 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -221,14 +221,6 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
 
     maSigsNotvalidatedFI.SetText( String( XMLSEC_RES( STR_NO_INFO_TO_VERIFY ) ) );
 
-    if ( GetSettings().GetStyleSettings().GetHighContrastMode() )
-    {
-        // high contrast mode needs other images
-        maSigsValidImg.SetImage( Image( XMLSEC_RES( IMG_STATE_VALID_HC ) ) );
-        maSigsInvalidImg.SetImage( Image( XMLSEC_RES( IMG_STATE_BROKEN_HC ) ) );
-        maSigsNotvalidatedImg.SetImage( Image( XMLSEC_RES( IMG_STATE_NOTVALIDATED_HC ) ) );
-    }
-
     FreeResource();
 
     mbVerifySignatures = true;
@@ -654,7 +646,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
 
                 aSubject = XmlSec::GetContentPart( xCert->getSubjectName() );
                 aIssuer = XmlSec::GetContentPart( xCert->getIssuerName() );
-                // --> PB 2004-10-12 #i20172# String with date and time information
+                // String with date and time information (#i20172#)
                 aDateTimeStr = XmlSec::GetDateTimeString( rInfo.stDateTime );
             }
             bSigValid = ( rInfo.nStatus == ::com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED );
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
index 87d2de520103..0a5da87ff8db 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
@@ -178,21 +178,6 @@ ModalDialog RID_XMLSECDLG_DIGSIG
         Pos = MAP_APPFONT( 6, 171 );
         Size = MAP_APPFONT( 50, 14 );
     };
-    Image IMG_STATE_VALID_HC
-    {
-        ImageBitmap = Bitmap { File = "signet_11x16_h.png"; };
-        MaskColor = STD_MASKCOLOR;
-    };
-    Image IMG_STATE_BROKEN_HC
-    {
-        ImageBitmap = Bitmap { File = "caution_11x16_h.png"; };
-        MaskColor = STD_MASKCOLOR;
-    };
-    Image IMG_STATE_NOTVALIDATED_HC
-    {
-        ImageBitmap = Bitmap { File = "notcertificate_16_h.png"; };
-        MaskColor = STD_MASKCOLOR;
-    };
 };
 
 
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index e9474b4b957b..06e6d33b392a 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -283,7 +283,7 @@ IMPL_LINK( MacroSecurityTrustedSourcesTP, RemoveLocPBHdl, void*, EMPTYARG )
     if( nSel != LISTBOX_ENTRY_NOTFOUND )
     {
         maTrustFileLocLB.RemoveEntry( nSel );
-        // --> PB 2004-09-21 #i33584#
+        // Trusted Path could not be removed (#i33584#)
         // after remove an entry, select another one if exists
         USHORT nNewCount = maTrustFileLocLB.GetEntryCount();
         if ( nNewCount > 0 )
@@ -292,7 +292,6 @@ IMPL_LINK( MacroSecurityTrustedSourcesTP, RemoveLocPBHdl, void*, EMPTYARG )
                 nSel = nNewCount - 1;
             maTrustFileLocLB.SelectEntryPos( nSel );
         }
-        // <--
         ImplCheckButtons();
     }
 
@@ -413,33 +412,24 @@ void MacroSecurityTrustedSourcesTP::ClosePage( void )
 
         mpDlg->maSecOptions.SetSecureURLs( aSecureURLs );
     }
-    // --> PB 2004-09-21 #i33584#
+    // Trusted Path could not be removed (#i33584#)
     // don't forget to remove the old saved SecureURLs
     else
         mpDlg->maSecOptions.SetSecureURLs( cssu::Sequence< rtl::OUString >() );
-    // <--
 
     mpDlg->maSecOptions.SetTrustedAuthors( maTrustedAuthors );
 }
-/*-- 26.02.2004 13:31:04---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 ReadOnlyImage::ReadOnlyImage(Window* pParent, const ResId rResId) :
             FixedImage(pParent, rResId)
 {
-    sal_Bool bHighContrast = pParent->GetSettings().GetStyleSettings().GetHighContrastMode();
-    SetImage( Image(XMLSEC_RES( bHighContrast ? RID_XMLSECTP_LOCK_HC : RID_XMLSECTP_LOCK )));
+    SetImage( Image(XMLSEC_RES( RID_XMLSECTP_LOCK )));
 }
 
-/*-- 26.02.2004 13:31:04---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 ReadOnlyImage::~ReadOnlyImage()
 {
 }
-/*-- 26.02.2004 13:31:04---------------------------------------------------
 
-  -----------------------------------------------------------------------*/
 void ReadOnlyImage::RequestHelp( const HelpEvent& rHEvt )
 {
     if( Help::IsBalloonHelpEnabled() || Help::IsQuickHelpEnabled() )
@@ -459,9 +449,6 @@ void ReadOnlyImage::RequestHelp( const HelpEvent& rHEvt )
         Window::RequestHelp( rHEvt );
 }
 
-/*-- 26.02.2004 14:20:21---------------------------------------------------
-
-  -----------------------------------------------------------------------*/
 const String& ReadOnlyImage::GetHelpTip()
 {
      static String  aStr(XMLSEC_RES( RID_XMLSECTP_READONLY_CONFIG_TIP));
diff --git a/xmlsecurity/source/dialogs/macrosecurity.src b/xmlsecurity/source/dialogs/macrosecurity.src
index 0683606f500c..58201cb4a099 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.src
+++ b/xmlsecurity/source/dialogs/macrosecurity.src
@@ -229,12 +229,3 @@ Image RID_XMLSECTP_LOCK
     };
     MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
 };
-Image RID_XMLSECTP_LOCK_HC
-{
-    ImageBitmap = Bitmap
-    {
-        File = "lock_hc.bmp";
-    };
-    MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
-};
-
diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx
index 2bb2bd1fa262..2e69f3ab35ee 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.cxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.cxx
@@ -79,7 +79,7 @@ namespace XmlSec
 
     String GetDateTimeString( const ::com::sun::star::util::DateTime& _rDT )
     {
-        // --> PB 2004-10-12 #i20172# String with date and time information
+        // String with date and time information (#i20172#)
         DateTime aDT( GetDateTime( _rDT ) );
         const LocaleDataWrapper& rLoDa = GetLocaleData();
         String sRet( rLoDa.getDate( aDT ) );
diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
index 86e19756b9d6..56d69f2558d9 100644
--- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
+++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
@@ -121,12 +121,12 @@ Sequence< OUString > SAL_CALL XMLEncryptionTemplateImpl :: getSupportedServiceNa
 Sequence< OUString > XMLEncryptionTemplateImpl :: impl_getSupportedServiceNames() {
     ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
     Sequence< OUString > seqServiceNames( 1 ) ;
-    seqServiceNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.xml.crypto.XMLEncryptionTemplate" ) ;
+    seqServiceNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLEncryptionTemplate")) ;
     return seqServiceNames ;
 }
 
 OUString XMLEncryptionTemplateImpl :: impl_getImplementationName() throw( RuntimeException ) {
-    return OUString::createFromAscii( "com.sun.star.xml.security.framework.XMLEncryptionTemplateImpl" ) ;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.framework.XMLEncryptionTemplateImpl")) ;
 }
 
 //Helper for registry
diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
index c03ef50243e0..46d5b6f84226 100644
--- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
+++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
@@ -146,12 +146,12 @@ Sequence< OUString > SAL_CALL XMLSignatureTemplateImpl :: getSupportedServiceNam
 Sequence< OUString > XMLSignatureTemplateImpl :: impl_getSupportedServiceNames() {
     ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
     Sequence< OUString > seqServiceNames( 1 ) ;
-    seqServiceNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.xml.crypto.XMLSignatureTemplate" ) ;
+    seqServiceNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSignatureTemplate")) ;
     return seqServiceNames ;
 }
 
 OUString XMLSignatureTemplateImpl :: impl_getImplementationName() throw( RuntimeException ) {
-    return OUString::createFromAscii( "com.sun.star.xml.security.framework.XMLSignatureTemplateImpl" ) ;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.framework.XMLSignatureTemplateImpl")) ;
 }
 
 //Helper for registry
diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx
index a38c73b44821..544a25c9a197 100644
--- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx
+++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx
@@ -43,9 +43,7 @@
 #include <com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp>
 #include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp>
 
-#ifndef __SGI_STL_VECTOR
 #include <vector>
-#endif
 
 class XMLSignatureTemplateImpl : public ::cppu::WeakImplHelper3<
     ::com::sun::star::xml::crypto::XXMLSignatureTemplate ,
diff --git a/xmlsecurity/source/framework/xsec_framework.cxx b/xmlsecurity/source/framework/xsec_framework.cxx
index 3a03e3738d53..39b206cb3904 100644
--- a/xmlsecurity/source/framework/xsec_framework.cxx
+++ b/xmlsecurity/source/framework/xsec_framework.cxx
@@ -71,7 +71,7 @@ sal_Bool SAL_CALL component_writeInfo(
             sal_Int32 nPos = 0;
             Reference< XRegistryKey > xNewKey(
                 reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( DecryptorImpl_getImplementationName() ) );
-            xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+            xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
 
             const Sequence< OUString > & rSNL = DecryptorImpl_getSupportedServiceNames();
             const OUString * pArray = rSNL.getConstArray();
@@ -80,7 +80,7 @@ sal_Bool SAL_CALL component_writeInfo(
 
             //Encryptor
             xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( EncryptorImpl_getImplementationName() );
-            xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+            xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
             const Sequence< OUString > & rSNL2 = EncryptorImpl_getSupportedServiceNames();
             pArray = rSNL2.getConstArray();
             for ( nPos = rSNL2.getLength(); nPos--; )
@@ -88,7 +88,7 @@ sal_Bool SAL_CALL component_writeInfo(
 
             //SignatureCreator
             xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( SignatureCreatorImpl_getImplementationName() );
-            xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+            xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
             const Sequence< OUString > & rSNL3 = SignatureCreatorImpl_getSupportedServiceNames();
             pArray = rSNL3.getConstArray();
             for ( nPos = rSNL3.getLength(); nPos--; )
@@ -96,7 +96,7 @@ sal_Bool SAL_CALL component_writeInfo(
 
             //SignatureVerifier
             xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( SignatureVerifierImpl_getImplementationName() );
-            xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+            xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
             const Sequence< OUString > & rSNL4 = SignatureVerifierImpl_getSupportedServiceNames();
             pArray = rSNL4.getConstArray();
             for ( nPos = rSNL4.getLength(); nPos--; )
@@ -104,7 +104,7 @@ sal_Bool SAL_CALL component_writeInfo(
 
             //SAXEventKeeper
             xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( SAXEventKeeperImpl_getImplementationName() );
-            xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+            xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
             const Sequence< OUString > & rSNL5 = SAXEventKeeperImpl_getSupportedServiceNames();
             pArray = rSNL5.getConstArray();
             for ( nPos = rSNL5.getLength(); nPos--; )
@@ -112,7 +112,7 @@ sal_Bool SAL_CALL component_writeInfo(
 
             //XMLSignatureTemplateImpl
             xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( XMLSignatureTemplateImpl::impl_getImplementationName() );
-            xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+            xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
             const Sequence< OUString > & rSNL6 = XMLSignatureTemplateImpl::impl_getSupportedServiceNames();
             pArray = rSNL6.getConstArray();
             for ( nPos = rSNL6.getLength(); nPos--; )
@@ -120,7 +120,7 @@ sal_Bool SAL_CALL component_writeInfo(
 
             // XMLEncryptionTemplateImpl
             xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( XMLEncryptionTemplateImpl::impl_getImplementationName() );
-            xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+            xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
             const Sequence< OUString > & rSNL7 = XMLEncryptionTemplateImpl::impl_getSupportedServiceNames();
             pArray = rSNL7.getConstArray();
             for ( nPos = rSNL7.getLength(); nPos--; )
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index 9b5fd047eac6..82c4d6398dcd 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -43,7 +43,6 @@
 #include "rtl/uri.hxx"
 
 using namespace ::com::sun::star::uno;
-//using namespace ::com::sun::star;
 namespace css = ::com::sun::star;
 using rtl::OUString;
 
@@ -217,7 +216,7 @@ DocumentSignatureHelper::CreateElementList(
                 ImplFillElementList(aElements, rxStore, ::rtl::OUString(), false, mode);
 
                 // 2) Pictures...
-                rtl::OUString aSubStorageName( rtl::OUString::createFromAscii( "Pictures" ) );
+                rtl::OUString aSubStorageName( RTL_CONSTASCII_USTRINGPARAM("Pictures") );
                 try
                 {
                     Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ );
@@ -228,7 +227,7 @@ DocumentSignatureHelper::CreateElementList(
                     ; // Doesn't have to exist...
                 }
                 // 3) OLE....
-                aSubStorageName = rtl::OUString::createFromAscii( "ObjectReplacements" );
+                aSubStorageName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ObjectReplacements"));
                 try
                 {
                     Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ );
@@ -236,7 +235,7 @@ DocumentSignatureHelper::CreateElementList(
                     xSubStore.clear();
 
                     // Object folders...
-                    rtl::OUString aMatchStr( rtl::OUString::createFromAscii( "Object " ) );
+                    rtl::OUString aMatchStr( RTL_CONSTASCII_USTRINGPARAM("Object ") );
                     Reference < css::container::XNameAccess > xElements( rxStore, UNO_QUERY );
                     Sequence< ::rtl::OUString > aElementNames = xElements->getElementNames();
                     sal_Int32 nElements = aElementNames.getLength();
@@ -265,7 +264,7 @@ DocumentSignatureHelper::CreateElementList(
         case SignatureModeMacros:
         {
             // 1) Macros
-            rtl::OUString aSubStorageName( rtl::OUString::createFromAscii( "Basic" ) );
+            rtl::OUString aSubStorageName( RTL_CONSTASCII_USTRINGPARAM("Basic") );
             try
             {
                 Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ );
@@ -277,7 +276,7 @@ DocumentSignatureHelper::CreateElementList(
             }
 
             // 2) Dialogs
-            aSubStorageName = rtl::OUString::createFromAscii( "Dialogs") ;
+            aSubStorageName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Dialogs")) ;
             try
             {
                 Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ );
@@ -288,7 +287,7 @@ DocumentSignatureHelper::CreateElementList(
                 ; // Doesn't have to exist...
             }
             // 3) Scripts
-            aSubStorageName = rtl::OUString::createFromAscii( "Scripts") ;
+            aSubStorageName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scripts")) ;
             try
             {
                 Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ );
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index 18fb74c6c399..4e74ffd8877b 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -89,7 +89,7 @@ bool XMLSignatureHelper::Init( const rtl::OUString& rTokenPath )
 
 void XMLSignatureHelper::ImplCreateSEInitializer()
 {
-    rtl::OUString sSEInitializer(rtl::OUString::createFromAscii( SEINITIALIZER_COMPONENT ));
+    rtl::OUString sSEInitializer(RTL_CONSTASCII_USTRINGPARAM( SEINITIALIZER_COMPONENT ));
     uno::Reference< lang::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() );
     mxSEInitializer = uno::Reference< com::sun::star::xml::crypto::XSEInitializer > (
         xMCF->createInstanceWithContext( sSEInitializer,  mxCtx ), uno::UNO_QUERY );
@@ -170,11 +170,6 @@ void XMLSignatureHelper::SetX509Certificate(
 
 void XMLSignatureHelper::SetDateTime( sal_Int32 nSecurityId, const Date& rDate, const Time& rTime )
 {
-    /*
-    rtl::OUString aDate = String::CreateFromInt32( rDate.GetDate() );
-    rtl::OUString aTime = String::CreateFromInt32( rTime.GetTime() );
-    mpXSecController->setDateTime( nSecurityId, aDate, aTime );
-    */
     ::com::sun::star::util::DateTime stDateTime;
     stDateTime.HundredthSeconds = (::sal_uInt16)rTime.Get100Sec();
     stDateTime.Seconds = (::sal_uInt16)rTime.GetSec();
@@ -200,8 +195,8 @@ uno::Reference<xml::sax::XDocumentHandler> XMLSignatureHelper::CreateDocumentHan
      */
     uno::Reference< lang::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() );
     uno::Reference< io::XActiveDataSource > xSaxWriter(
-        xMCF->createInstanceWithContext(rtl::OUString::createFromAscii(
-            "com.sun.star.xml.sax.Writer"), mxCtx ), uno::UNO_QUERY );
+        xMCF->createInstanceWithContext(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.xml.sax.Writer")), mxCtx ), uno::UNO_QUERY );
 
     DBG_ASSERT( xSaxWriter.is(), "can't instantiate XML writer" );
 
@@ -261,16 +256,10 @@ bool XMLSignatureHelper::CreateAndWriteSignature( const uno::Reference< xml::sax
     /*
      * create a signature listener
      */
-/*
-    ImplXMLSignatureListener* pSignatureListener = new ImplXMLSignatureListener(
-                                                    LINK( this, XMLSignatureHelper, SignatureCreationResultListener ),
-                                                    LINK( this, XMLSignatureHelper, SignatureVerifyResultListener ),
-                                                    LINK( this, XMLSignatureHelper, StartVerifySignatureElement ) );
-*/
+
     /*
      * configure the signature creation listener
      */
-    //mpXSecController->setSignatureCreationResultListener( pSignatureListener );
 
     /*
      * write signatures
@@ -283,7 +272,6 @@ bool XMLSignatureHelper::CreateAndWriteSignature( const uno::Reference< xml::sax
     /*
      * clear up the signature creation listener
      */
-    //mpXSecController->setSignatureCreationResultListener( NULL );
 
     return !mbError;
 }
@@ -310,7 +298,6 @@ bool XMLSignatureHelper::ReadAndVerifySignature( const com::sun::star::uno::Refe
      * prepare ParserInputSrouce
      */
     xml::sax::InputSource aParserInput;
-    // aParserInput.sSystemId = ouName;
     aParserInput.aInputStream = xInputStream;
 
     /*
@@ -319,7 +306,7 @@ bool XMLSignatureHelper::ReadAndVerifySignature( const com::sun::star::uno::Refe
     uno::Reference< lang::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() );
     uno::Reference< xml::sax::XParser > xParser(
         xMCF->createInstanceWithContext(
-            rtl::OUString::createFromAscii("com.sun.star.xml.sax.Parser"), mxCtx ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser") ), mxCtx ),
         uno::UNO_QUERY );
 
     DBG_ASSERT( xParser.is(), "Can't create parser" );
@@ -341,7 +328,6 @@ bool XMLSignatureHelper::ReadAndVerifySignature( const com::sun::star::uno::Refe
     /*
      * configure the signature verify listener
      */
-    //mpXSecController->setSignatureVerifyResultListener( pSignatureListener );
 
     /*
      * setup the connection:
@@ -382,7 +368,6 @@ bool XMLSignatureHelper::ReadAndVerifySignature( const com::sun::star::uno::Refe
     /*
      * clear up the signature verify listener
      */
-    //mpXSecController->setSignatureVerifyResultListener( NULL );
 
     /*
      * release the signature reader
@@ -418,24 +403,6 @@ sal_Int32 XMLSignatureHelper::GetSecurityEnvironmentNumber()
 }
 
 
-/*
-void XMLSignatureHelper::createSecurityContext( rtl::OUString tokenPath )
-{
-    if ( !mxSEInitializer.is() )
-        ImplCreateSEInitializer();
-
-    mxSecurityContext = mxSEInitializer->createSecurityContext(tokenPath);
-}
-
-void XMLSignatureHelper::freeSecurityContext()
-{
-    if ( !mxSEInitializer.is() )
-        ImplCreateSEInitializer();
-
-    mxSEInitializer->freeSecurityContext( mxSecurityContext );
-}
-*/
-
 IMPL_LINK( XMLSignatureHelper, SignatureCreationResultListener, XMLSignatureCreationResult*, pResult )
 {
     maCreationResults.insert( maCreationResults.begin() + maCreationResults.size(), *pResult );
diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx
index d2af8a56c760..3cf7bf826d75 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -348,9 +348,9 @@ void XSecController::createXSecComponent( )
  *  Email: michael.mi@sun.com
  ******************************************************************************/
 {
-    rtl::OUString sSAXEventKeeper(rtl::OUString::createFromAscii( SAXEVENTKEEPER_COMPONENT ));
-    rtl::OUString sXMLSignature(rtl::OUString::createFromAscii( XMLSIGNATURE_COMPONENT ));
-    rtl::OUString sXMLDocument(rtl::OUString::createFromAscii( XMLDOCUMENTWRAPPER_COMPONENT ));
+    rtl::OUString sSAXEventKeeper(RTL_CONSTASCII_USTRINGPARAM( SAXEVENTKEEPER_COMPONENT ));
+    rtl::OUString sXMLSignature(RTL_CONSTASCII_USTRINGPARAM( XMLSIGNATURE_COMPONENT ));
+    rtl::OUString sXMLDocument(RTL_CONSTASCII_USTRINGPARAM( XMLDOCUMENTWRAPPER_COMPONENT ));
 
     /*
      * marks all security components are not available.
@@ -715,57 +715,6 @@ cssu::Reference< com::sun::star::io::XInputStream >
     return xObjectInputStream;
 }
 
-#if 0
-sal_Int32 XSecController::getFastPropertyIndex(sal_Int32 nHandle) const
-/****** XSecController/getFastPropertyIndex ***********************************
- *
- *   NAME
- *  getFastPropertyIndex -- gets the index of a particular fast property
- *
- *   SYNOPSIS
- *  nIndex = getFastPropertyIndex( nHandle );
- *
- *   FUNCTION
- *  See NAME.
- *
- *   INPUTS
- *  nHandle - the key for the fast property
- *
- *   RESULT
- *  nIndex - the index of the fast property, or -1
- *           if the key is not found.
- *
- *   HISTORY
- *  05.01.2004 -    implemented
- *
- *   AUTHOR
- *  Michael Mi
- *  Email: michael.mi@sun.com
- ******************************************************************************/
-{
-    std::vector< sal_Int32 >::const_iterator ii = m_vFastPropertyIndexs.begin();
-    sal_Int32 nIndex = 0;
-
-    bool bFound = false;
-
-    for( ; ii != m_vFastPropertyIndexs.end(); ++ii,++nIndex )
-    {
-        if ( nHandle == (*ii))
-        {
-            bFound = true;
-            break;
-        }
-    }
-
-    if (!bFound)
-    {
-        nIndex = -1;
-    }
-
-    return nIndex;
-}
-#endif
-
 /*
  * public methods
  */
@@ -1091,11 +1040,6 @@ void XSecController::exportSignature(
             rtl::OUString tag_SignatureProperties(RTL_CONSTASCII_USTRINGPARAM(TAG_SIGNATUREPROPERTIES));
                 rtl::OUString tag_SignatureProperty(RTL_CONSTASCII_USTRINGPARAM(TAG_SIGNATUREPROPERTY));
                     rtl::OUString tag_Date(RTL_CONSTASCII_USTRINGPARAM(TAG_DATE));
-#if 0
-                    rtl::OUString tag_Timestamp(RTL_CONSTASCII_USTRINGPARAM(TAG_TIMESTAMP));
-                        rtl::OUString tag_Date(RTL_CONSTASCII_USTRINGPARAM(TAG_DATE));
-                        rtl::OUString tag_Time(RTL_CONSTASCII_USTRINGPARAM(TAG_TIME));
-#endif
 
     const SignatureReferenceInformations& vReferenceInfors = signatureInfo.vSignatureReferenceInfors;
     SvXMLAttributeList *pAttributeList;
@@ -1365,46 +1309,6 @@ SignatureInformations XSecController::getSignatureInformations() const
 /*
  * XFastPropertySet
  */
-/*
-void SAL_CALL XSecController::setFastPropertyValue(
-    sal_Int32 nHandle,
-    const cssu::Any& aValue )
-    throw ( cssb::UnknownPropertyException,
-        cssb::PropertyVetoException,
-        cssl::IllegalArgumentException,
-        cssl::WrappedTargetException,
-        cssu::RuntimeException)
-{
-    sal_Int32 nIndex = getFastPropertyIndex(nHandle);
-    if (nIndex == -1)
-    {
-        m_vFastPropertyIndexs.push_back( nHandle );
-        m_vFastPropertyValues.push_back( aValue );
-    }
-    else
-    {
-        m_vFastPropertyValues[nIndex] = aValue;
-    }
-}
-
-cssu::Any SAL_CALL XSecController::getFastPropertyValue(
-    sal_Int32 nHandle )
-    throw (
-        cssb::UnknownPropertyException,
-        cssl::WrappedTargetException,
-        cssu::RuntimeException)
-{
-    cssu::Any aValue;
-
-    sal_Int32 nIndex = getFastPropertyIndex(nHandle);
-    if (nIndex != -1)
-    {
-        aValue = m_vFastPropertyValues[nIndex];
-    }
-
-    return aValue;
-}
-*/
 
 /*
  * XSAXEventKeeperStatusChangeListener
@@ -1413,13 +1317,6 @@ cssu::Any SAL_CALL XSecController::getFastPropertyValue(
 void SAL_CALL XSecController::blockingStatusChanged( sal_Bool isBlocking )
     throw (cssu::RuntimeException)
 {
-    /*
-    showMessageBox( rtl::OUString::createFromAscii((isBlocking?
-                        "Blocking Status => TRUE":
-                        "Blocking Status => FALSE")),
-            rtl::OUString::createFromAscii("SAXEventKeeper Status"));
-    */
-
     this->m_bIsBlocking = isBlocking;
     checkChainingStatus();
 }
@@ -1428,13 +1325,6 @@ void SAL_CALL XSecController::collectionStatusChanged(
     sal_Bool isInsideCollectedElement )
     throw (cssu::RuntimeException)
 {
-    /*
-    showMessageBox( rtl::OUString::createFromAscii((isInsideCollectedElement?
-                        "Collection Status => TRUE":
-                        "Collection Status => FALSE")),
-            rtl::OUString::createFromAscii("SAXEventKeeper Status"));
-    */
-
     this->m_bIsCollectingElement = isInsideCollectedElement;
     checkChainingStatus();
 }
@@ -1442,12 +1332,7 @@ void SAL_CALL XSecController::collectionStatusChanged(
 void SAL_CALL XSecController::bufferStatusChanged( sal_Bool /*isBufferEmpty*/)
     throw (cssu::RuntimeException)
 {
-    /*
-    showMessageBox( rtl::OUString::createFromAscii((isBufferEmpty?
-                        "Buffer Empty => TRUE":
-                        "Buffer Empty => FALSE")),
-            rtl::OUString::createFromAscii("SAXEventKeeper Status"));
-    */
+
 }
 
 /*
@@ -1461,16 +1346,6 @@ void SAL_CALL XSecController::signatureCreated( sal_Int32 securityId, com::sun::
 
     SignatureInformation& signatureInfor = m_vInternalSignatureInformations[index].signatureInfor;
 
-    /*
-    if (nResult == cssxc::sax::SignatureCreationResult_CREATIONSUCCEED)
-    {
-        signatureInfor.nStatus = STATUS_CREATION_SUCCEED;
-    }
-    else
-    {
-        signatureInfor.nStatus = STATUS_CREATION_FAIL;
-    }
-    */
     signatureInfor.nStatus = nResult;
 }
 
@@ -1485,16 +1360,6 @@ void SAL_CALL XSecController::signatureVerified( sal_Int32 securityId, com::sun:
 
     SignatureInformation& signatureInfor = m_vInternalSignatureInformations[index].signatureInfor;
 
-    /*
-    if (nResult == cssxc::sax::SignatureVerifyResult_VERIFYSUCCEED)
-    {
-        signatureInfor.nStatus = STATUS_VERIFY_SUCCEED;
-    }
-    else
-    {
-        signatureInfor.nStatus = STATUS_VERIFY_FAIL;
-    }
-    */
     signatureInfor.nStatus = nResult;
 }
 
diff --git a/xmlsecurity/source/helper/xsecctl.hxx b/xmlsecurity/source/helper/xsecctl.hxx
index 5fafb4c51fa9..ab401ecd805d 100644
--- a/xmlsecurity/source/helper/xsecctl.hxx
+++ b/xmlsecurity/source/helper/xsecctl.hxx
@@ -217,19 +217,6 @@ private:
     com::sun::star::uno::Reference<
         com::sun::star::xml::crypto::XXMLSecurityContext > m_xSecurityContext;
 
-#if 0
-    /*
-     * the signature creation result listener
-     */
-    com::sun::star::uno::Reference<
-        com::sun::star::xml::crypto::sax::XSignatureCreationResultListener > m_xSignatureCreationResultListener;
-    /*
-     * the signature verify result listener
-     */
-    com::sun::star::uno::Reference<
-        com::sun::star::xml::crypto::sax::XSignatureVerifyResultListener > m_xSignatureVerifyResultListener;
-#endif
-
     /*
      * the security id incrementer, in order to make any security id unique
      * to the SAXEventKeeper.
@@ -532,23 +519,6 @@ public:
     /*
      * XFastPropertySet
      */
-    /*
-    virtual void SAL_CALL setFastPropertyValue(
-        sal_Int32 nHandle,
-        const com::sun::star::uno::Any& aValue )
-        throw (
-            com::sun::star::beans::UnknownPropertyException,
-            com::sun::star::beans::PropertyVetoException,
-            com::sun::star::lang::IllegalArgumentException,
-            com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException);
-    virtual com::sun::star::uno::Any SAL_CALL getFastPropertyValue(
-        sal_Int32 nHandle )
-        throw (
-            com::sun::star::beans::UnknownPropertyException,
-            com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException);
-    */
 
     /*
      * XSAXEventKeeperStatusChangeListener
diff --git a/xmlsecurity/source/helper/xsecparser.cxx b/xmlsecurity/source/helper/xsecparser.cxx
index 8d9b84132712..96272fd07416 100644
--- a/xmlsecurity/source/helper/xsecparser.cxx
+++ b/xmlsecurity/source/helper/xsecparser.cxx
@@ -75,7 +75,6 @@ void SAL_CALL XSecParser::startDocument(  )
     m_bInSignatureValue = false;
     m_bInDigestValue = false;
     m_bInDate = false;
-    //m_bInTime = false;
 
     if (m_xNextHandler.is())
     {
@@ -152,27 +151,27 @@ void SAL_CALL XSecParser::startElement(
             }
             else if (aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_X509ISSUERNAME)))
             {
-            m_ouX509IssuerName = rtl::OUString::createFromAscii("");
+            m_ouX509IssuerName = rtl::OUString();
             m_bInX509IssuerName = true;
             }
             else if (aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_X509SERIALNUMBER)))
             {
-            m_ouX509SerialNumber = rtl::OUString::createFromAscii("");
+            m_ouX509SerialNumber = rtl::OUString();
             m_bInX509SerialNumber = true;
             }
             else if (aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_X509CERTIFICATE)))
             {
-            m_ouX509Certificate = rtl::OUString::createFromAscii("");
+            m_ouX509Certificate = rtl::OUString();
             m_bInX509Certificate = true;
             }
             else if (aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_SIGNATUREVALUE)))
             {
-            m_ouSignatureValue = rtl::OUString::createFromAscii("");
+            m_ouSignatureValue = rtl::OUString();
                 m_bInSignatureValue = true;
             }
             else if (aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_DIGESTVALUE)))
             {
-            m_ouDigestValue = rtl::OUString::createFromAscii("");
+            m_ouDigestValue = rtl::OUString();
                 m_bInDigestValue = true;
             }
             else if ( aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_SIGNATUREPROPERTY)) )
@@ -186,16 +185,9 @@ void SAL_CALL XSecParser::startElement(
                         +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":"))
                         +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TAG_DATE)))
             {
-            m_ouDate = rtl::OUString::createFromAscii("");
+            m_ouDate = rtl::OUString();
                 m_bInDate = true;
             }
-            /*
-            else if (aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_TIME)))
-            {
-            m_ouTime = rtl::OUString::createFromAscii("");
-                m_bInTime = true;
-            }
-            */
 
         if (m_xNextHandler.is())
         {
@@ -271,13 +263,6 @@ void SAL_CALL XSecParser::endElement( const rtl::OUString& aName )
             m_pXSecController->setDate( m_ouDate );
                 m_bInDate = false;
         }
-        /*
-        else if ( aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_TIME)) )
-        {
-            m_pXSecController->setTime( m_ouTime );
-                m_bInTime = false;
-        }
-        */
 
         if (m_xNextHandler.is())
         {
@@ -327,12 +312,6 @@ void SAL_CALL XSecParser::characters( const rtl::OUString& aChars )
     {
         m_ouDate += aChars;
     }
-    /*
-    else if (m_bInTime)
-    {
-        m_ouTime += aChars;
-    }
-    */
 
     if (m_xNextHandler.is())
     {
diff --git a/xmlsecurity/source/helper/xsecparser.hxx b/xmlsecurity/source/helper/xsecparser.hxx
index 3cfb033be534..b246a2a92bb9 100644
--- a/xmlsecurity/source/helper/xsecparser.hxx
+++ b/xmlsecurity/source/helper/xsecparser.hxx
@@ -76,7 +76,6 @@ private:
     rtl::OUString m_ouDigestValue;
     rtl::OUString m_ouSignatureValue;
     rtl::OUString m_ouDate;
-    //rtl::OUString m_ouTime;
 
     /*
      * whether inside a particular element
@@ -87,7 +86,6 @@ private:
     bool m_bInDigestValue;
     bool m_bInSignatureValue;
     bool m_bInDate;
-    //bool m_bInTime;
 
     /*
      * the XSecController collaborating with XSecParser
diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx
index c40492c41991..d64f1adc1623 100644
--- a/xmlsecurity/source/helper/xsecsign.cxx
+++ b/xmlsecurity/source/helper/xsecsign.cxx
@@ -87,7 +87,7 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
     cssu::Reference< cssl::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() );
     xReferenceResolvedListener = cssu::Reference< cssxc::sax::XReferenceResolvedListener >(
         xMCF->createInstanceWithContext(
-            rtl::OUString::createFromAscii(SIGNATURECREATOR_COMPONENT), mxCtx),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SIGNATURECREATOR_COMPONENT)), mxCtx),
         cssu::UNO_QUERY);
 
     cssu::Reference<cssl::XInitialization> xInitialization(xReferenceResolvedListener, cssu::UNO_QUERY);
diff --git a/xmlsecurity/source/helper/xsecverify.cxx b/xmlsecurity/source/helper/xsecverify.cxx
index 8f903dd2053d..7fb4540f06fd 100644
--- a/xmlsecurity/source/helper/xsecverify.cxx
+++ b/xmlsecurity/source/helper/xsecverify.cxx
@@ -71,7 +71,7 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
     cssu::Reference< cssl::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() );
     xReferenceResolvedListener = cssu::Reference< cssxc::sax::XReferenceResolvedListener >(
         xMCF->createInstanceWithContext(
-            rtl::OUString::createFromAscii( SIGNATUREVERIFIER_COMPONENT ), mxCtx),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SIGNATUREVERIFIER_COMPONENT )), mxCtx),
         cssu::UNO_QUERY);
 
     cssu::Reference<cssl::XInitialization> xInitialization(xReferenceResolvedListener, cssu::UNO_QUERY);
@@ -220,14 +220,6 @@ void XSecController::setDate( rtl::OUString& ouDate )
     isi.signatureInfor.ouDateTime = ouDate;
 }
 
-/*
-void XSecController::setTime( rtl::OUString& ouTime )
-{
-    InternalSignatureInformation &isi = m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1];
-    isi.signatureInfor.ouTime = ouTime;
-}
-*/
-
 void XSecController::setId( rtl::OUString& ouId )
 {
     InternalSignatureInformation &isi = m_vInternalSignatureInformations[m_vInternalSignatureInformations.size()-1];
diff --git a/xmlsecurity/source/xmlsec/certvalidity.cxx b/xmlsecurity/source/xmlsec/certvalidity.cxx
index b487c7e67a69..e53863d1dd01 100644
--- a/xmlsecurity/source/xmlsec/certvalidity.cxx
+++ b/xmlsecurity/source/xmlsec/certvalidity.cxx
@@ -57,41 +57,41 @@ rtl::OUString certificateValidityToOUString( ::sal_Int32 certValidity ) {
     OUString aValidity ;
 
     if( (certValidity & CertificateValidity::VALID) == CertificateValidity::VALID ) {
-        aValidity = OUString::createFromAscii( ( const char* )VALID_STR ) ;
+        aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(VALID_STR )) ;
     } else if( ( certValidity & CertificateValidity::INVALID ) == CertificateValidity::INVALID ) {
-         aValidity = OUString::createFromAscii( ( const char* )INVALID_STR ) ;
+         aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(INVALID_STR )) ;
     } else if( ( certValidity &  CertificateValidity::UNTRUSTED ) ==  CertificateValidity::UNTRUSTED ) {
-         aValidity = OUString::createFromAscii( ( const char* )UNTRUSTED_STR ) ;
+         aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(UNTRUSTED_STR )) ;
     } else if( ( certValidity & CertificateValidity::TIME_INVALID ) == CertificateValidity::TIME_INVALID ) {
-         aValidity = OUString::createFromAscii( ( const char* )TIME_INVALID_STR ) ;
+         aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(TIME_INVALID_STR )) ;
     } else if( ( certValidity & CertificateValidity::NOT_TIME_NESTED ) == CertificateValidity::NOT_TIME_NESTED ) {
-         aValidity = OUString::createFromAscii( ( const char* )NOT_NESTED_TIME_STR ) ;
+         aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(NOT_NESTED_TIME_STR )) ;
     } else if( ( certValidity & CertificateValidity::REVOKED ) == CertificateValidity::REVOKED ) {
-         aValidity = OUString::createFromAscii( ( const char* )REVOKED_STR ) ;
+         aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(REVOKED_STR )) ;
     } else if( ( certValidity &  CertificateValidity::UNKNOWN_REVOKATION ) == CertificateValidity::UNKNOWN_REVOKATION ) {
-         aValidity = OUString::createFromAscii( ( const char* )UNKNOWN_REVOKATION_STR ) ;
+         aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(UNKNOWN_REVOKATION_STR )) ;
     } else if( ( certValidity &  CertificateValidity::SIGNATURE_INVALID ) == CertificateValidity::SIGNATURE_INVALID ) {
-         aValidity = OUString::createFromAscii( ( const char* )SIGNATURE_INVALID_STR ) ;
+         aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(SIGNATURE_INVALID_STR )) ;
     } else if( ( certValidity &  CertificateValidity::EXTENSION_INVALID ) == CertificateValidity::EXTENSION_INVALID ) {
-         aValidity = OUString::createFromAscii( ( const char* )EXTENSION_INVALID_STR ) ;
+         aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(EXTENSION_INVALID_STR )) ;
     } else if( ( certValidity &  CertificateValidity::EXTENSION_UNKNOWN ) == CertificateValidity::EXTENSION_UNKNOWN ) {
-         aValidity = OUString::createFromAscii( ( const char* )EXTENSION_UNKNOWN_STR ) ;
+         aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(EXTENSION_UNKNOWN_STR )) ;
     } else if( ( certValidity &  CertificateValidity::ISSUER_UNKNOWN ) == CertificateValidity::ISSUER_UNKNOWN ) {
-         aValidity = OUString::createFromAscii( ( const char* )ISSUER_UNKNOWN_STR ) ;
+         aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(ISSUER_UNKNOWN_STR )) ;
     } else if( ( certValidity &  CertificateValidity::ISSUER_UNTRUSTED ) == CertificateValidity::ISSUER_UNTRUSTED ) {
-         aValidity = OUString::createFromAscii( ( const char* )ISSUER_UNTRUSTED_STR ) ;
+         aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(ISSUER_UNTRUSTED_STR )) ;
     } else if( ( certValidity &  CertificateValidity::ISSUER_INVALID ) == CertificateValidity::ISSUER_INVALID ) {
-         aValidity = OUString::createFromAscii( ( const char* )ISSUER_INVALID_STR ) ;
+         aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(ISSUER_INVALID_STR )) ;
     } else if( ( certValidity &  CertificateValidity::ROOT_UNKNOWN ) == CertificateValidity::ROOT_UNKNOWN ) {
-         aValidity = OUString::createFromAscii( ( const char* )ROOT_UNKNOWN_STR ) ;
+         aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(ROOT_UNKNOWN_STR )) ;
     } else if( ( certValidity &  CertificateValidity::ROOT_UNTRUSTED ) == CertificateValidity::ROOT_UNTRUSTED ) {
-         aValidity = OUString::createFromAscii( ( const char* )ROOT_UNTRUSTED_STR ) ;
+         aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(ROOT_UNTRUSTED_STR )) ;
     } else if( ( certValidity &  CertificateValidity::ROOT_INVALID ) == CertificateValidity::ROOT_INVALID ) {
-         aValidity = OUString::createFromAscii( ( const char* )ROOT_INVALID_STR ) ;
+         aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(ROOT_INVALID_STR )) ;
     } else if( ( certValidity &  CertificateValidity::CHAIN_INCOMPLETE ) == CertificateValidity::CHAIN_INCOMPLETE ) {
-         aValidity = OUString::createFromAscii( ( const char* )CHAIN_INCOMPLETE_STR ) ;
+         aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(CHAIN_INCOMPLETE_STR )) ;
     } else {
-         aValidity = OUString::createFromAscii( ( const char* )INVALID_STR ) ;
+         aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(INVALID_STR )) ;
     }
 
     return aValidity ;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
index 5e466ab471a5..693f89bb97fc 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
@@ -204,12 +204,12 @@ Sequence< OUString > SAL_CALL SecurityEnvironment_MSCryptImpl :: getSupportedSer
 Sequence< OUString > SecurityEnvironment_MSCryptImpl :: impl_getSupportedServiceNames() {
     ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
     Sequence< OUString > seqServiceNames( 1 ) ;
-    seqServiceNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.xml.crypto.SecurityEnvironment" ) ;
+    seqServiceNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.SecurityEnvironment")) ;
     return seqServiceNames ;
 }
 
 OUString SecurityEnvironment_MSCryptImpl :: impl_getImplementationName() throw( RuntimeException ) {
-    return OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl" ) ;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl")) ;
 }
 
 //Helper for registry
@@ -1213,7 +1213,7 @@ X509Certificate_MSCryptImpl* MswcryCertContextToXCert( PCCERT_CONTEXT cert )
 
 ::rtl::OUString SecurityEnvironment_MSCryptImpl::getSecurityEnvironmentInformation() throw( ::com::sun::star::uno::RuntimeException )
 {
-    return rtl::OUString::createFromAscii("Microsoft Crypto API");
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Microsoft Crypto API"));
 }
 
 /* Native methods */
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
index ab800b40b376..7e04922939e2 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
@@ -363,12 +363,12 @@ Sequence< OUString > SAL_CALL XMLEncryption_MSCryptImpl :: getSupportedServiceNa
 Sequence< OUString > XMLEncryption_MSCryptImpl :: impl_getSupportedServiceNames() {
     ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
     Sequence< OUString > seqServiceNames( 1 ) ;
-    seqServiceNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.xml.crypto.XMLEncryption" ) ;
+    seqServiceNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLEncryption")) ;
     return seqServiceNames ;
 }
 
 OUString XMLEncryption_MSCryptImpl :: impl_getImplementationName() throw( RuntimeException ) {
-    return OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_MSCryptImpl" ) ;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_MSCryptImpl")) ;
 }
 
 //Helper for registry
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
index 52f3cc3b983d..c9fed3227f0b 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
@@ -282,12 +282,12 @@ Sequence< OUString > SAL_CALL XMLSecurityContext_MSCryptImpl :: getSupportedServ
 Sequence< OUString > XMLSecurityContext_MSCryptImpl :: impl_getSupportedServiceNames() {
     ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
     Sequence< OUString > seqServiceNames( 1 ) ;
-    seqServiceNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.xml.crypto.XMLSecurityContext" ) ;
+    seqServiceNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSecurityContext")) ;
     return seqServiceNames ;
 }
 
 OUString XMLSecurityContext_MSCryptImpl :: impl_getImplementationName() throw( RuntimeException ) {
-    return OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl" ) ;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl")) ;
 }
 
 //Helper for registry
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
index e7fa7f96aa68..4d8569525701 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
@@ -307,12 +307,12 @@ Sequence< OUString > SAL_CALL XMLSignature_MSCryptImpl :: getSupportedServiceNam
 Sequence< OUString > XMLSignature_MSCryptImpl :: impl_getSupportedServiceNames() {
     ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
     Sequence< OUString > seqServiceNames( 1 ) ;
-    seqServiceNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.xml.crypto.XMLSignature" ) ;
+    seqServiceNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSignature")) ;
     return seqServiceNames ;
 }
 
 OUString XMLSignature_MSCryptImpl :: impl_getImplementationName() throw( RuntimeException ) {
-    return OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl" ) ;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl")) ;
 }
 
 //Helper for registry
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx b/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx
index c9ba623d2140..d8ec2db95384 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx
@@ -66,7 +66,7 @@ sal_Bool SAL_CALL mscrypt_component_writeInfo( void* /*pServiceManager*/ , void*
         // XMLSignature_MSCryptImpl
         sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ;
         sKeyName += XMLSignature_MSCryptImpl::impl_getImplementationName() ;
-        sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ;
+        sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ;
 
         xNewKey = xKey->createKey( sKeyName ) ;
         if( xNewKey.is() ) {
@@ -78,7 +78,7 @@ sal_Bool SAL_CALL mscrypt_component_writeInfo( void* /*pServiceManager*/ , void*
         // XMLEncryption_MSCryptImpl
         sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ;
         sKeyName += XMLEncryption_MSCryptImpl::impl_getImplementationName() ;
-        sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ;
+        sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ;
 
         xNewKey = xKey->createKey( sKeyName ) ;
         if( xNewKey.is() ) {
@@ -90,7 +90,7 @@ sal_Bool SAL_CALL mscrypt_component_writeInfo( void* /*pServiceManager*/ , void*
         // XMLSecurityContext_MSCryptImpl
         sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ;
         sKeyName += XMLSecurityContext_MSCryptImpl::impl_getImplementationName() ;
-        sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ;
+        sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ;
 
         xNewKey = xKey->createKey( sKeyName ) ;
         if( xNewKey.is() ) {
@@ -102,7 +102,7 @@ sal_Bool SAL_CALL mscrypt_component_writeInfo( void* /*pServiceManager*/ , void*
         // SecurityEnvironment_MSCryptImpl
         sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ;
         sKeyName += SecurityEnvironment_MSCryptImpl::impl_getImplementationName() ;
-        sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ;
+        sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ;
 
         xNewKey = xKey->createKey( sKeyName ) ;
         if( xNewKey.is() ) {
@@ -114,7 +114,7 @@ sal_Bool SAL_CALL mscrypt_component_writeInfo( void* /*pServiceManager*/ , void*
         // SEInitializer_MSCryptImpl
         sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ;
         sKeyName += SEInitializer_MSCryptImpl_getImplementationName() ;
-        sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ;
+        sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ;
 
         xNewKey = xKey->createKey( sKeyName ) ;
         if( xNewKey.is() ) {
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 87b02e948d34..f31de65ff553 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -99,7 +99,7 @@ char* GetPasswordFunction( PK11SlotInfo* pSlot, PRBool bRetry, void* /*arg*/ )
     if ( xMSF.is() )
     {
         uno::Reference < task::XInteractionHandler > xInteractionHandler(
-            xMSF->createInstance( rtl::OUString::createFromAscii("com.sun.star.task.InteractionHandler") ), uno::UNO_QUERY );
+            xMSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler")) ), uno::UNO_QUERY );
 
         if ( xInteractionHandler.is() )
         {
@@ -191,12 +191,12 @@ Sequence< OUString > SAL_CALL SecurityEnvironment_NssImpl :: getSupportedService
 Sequence< OUString > SecurityEnvironment_NssImpl :: impl_getSupportedServiceNames() {
     ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
     Sequence< OUString > seqServiceNames( 1 ) ;
-    seqServiceNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.xml.crypto.SecurityEnvironment" ) ;
+    seqServiceNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.SecurityEnvironment")) ;
     return seqServiceNames ;
 }
 
 OUString SecurityEnvironment_NssImpl :: impl_getImplementationName() throw( RuntimeException ) {
-    return OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl" ) ;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl")) ;
 }
 
 //Helper for registry
@@ -576,55 +576,14 @@ Reference< XCertificate > SecurityEnvironment_NssImpl :: getCertificate( const O
         if( arena == NULL )
             throw RuntimeException() ;
 
-                /*
-                 * mmi : because MS Crypto use the 'S' tag (equal to the 'ST' tag in NSS), but the NSS can't recognise
-                 *      it, so the 'S' tag should be changed to 'ST' tag
-                 *
-                 * PS  : it can work, but inside libxmlsec, the 'S' tag is till used to find cert in NSS engine, so it
-                 *       is not useful at all. (comment out now)
-                 */
-
-                /*
-                sal_Int32 nIndex = 0;
-                OUString newIssuerName;
-                do
-                {
-                    OUString aToken = issuerName.getToken( 0, ',', nIndex ).trim();
-                    if (aToken.compareToAscii("S=",2) == 0)
-                    {
-                        newIssuerName+=OUString::createFromAscii("ST=");
-                        newIssuerName+=aToken.copy(2);
-                    }
-                    else
-                    {
-                        newIssuerName+=aToken;
-                    }
-
-                    if (nIndex >= 0)
-                    {
-                        newIssuerName+=OUString::createFromAscii(",");
-                    }
-                } while ( nIndex >= 0 );
-                */
-
-                /* end */
-
-        //Create cert info from issue and serial
+        // Create cert info from issue and serial
         rtl::OString ostr = rtl::OUStringToOString( issuerName , RTL_TEXTENCODING_UTF8 ) ;
         chIssuer = PL_strndup( ( char* )ostr.getStr(), ( int )ostr.getLength() ) ;
         nmIssuer = CERT_AsciiToName( chIssuer ) ;
         if( nmIssuer == NULL ) {
             PL_strfree( chIssuer ) ;
             PORT_FreeArena( arena, PR_FALSE ) ;
-
-            /*
-             * i40394
-             *
-             * mmi : no need to throw exception
-             *       just return "no found"
-             */
-            //throw RuntimeException() ;
-            return NULL;
+            return NULL; // no need for exception cf. i40394
         }
 
         derIssuer = SEC_ASN1EncodeItem( arena, NULL, ( void* )nmIssuer, SEC_ASN1_GET( CERT_NameTemplate ) ) ;
diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
index e2e0c943d8e2..600bc9010d7b 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
@@ -99,12 +99,6 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt(
          throw RuntimeException() ;
     }
 
-#if 0
-    XMLSecurityContext_NssImpl* pSecCtxt = ( XMLSecurityContext_NssImpl* )xSecTunnel->getSomething( XMLSecurityContext_NssImpl::getUnoTunnelId() ) ;
-    if( pSecCtxt == NULL )
-        throw RuntimeException() ;
-#endif
-
     SecurityEnvironment_NssImpl* pSecEnv =
         reinterpret_cast<SecurityEnvironment_NssImpl*>(
             sal::static_int_cast<sal_uIntPtr>(xSecTunnel->getSomething( SecurityEnvironment_NssImpl::getUnoTunnelId() ))) ;
@@ -156,11 +150,6 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt(
         throw XMLEncryptionException() ;
     }
 
-    /* MM : remove the following 2 lines
-    xmlUnlinkNode(pContent);
-    xmlAddNextSibling(pEncryptedData, pContent);
-    */
-
     //remember the position of the element to be signed
     sal_Bool isParentRef = sal_True;
     xmlNodePtr pParent = pEncryptedData->parent;
@@ -196,32 +185,6 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt(
     pEncryptedData = pTemplate->getNativeElement() ;
 
     //Find the element to be encrypted.
-    /* MM : remove the old method to get the target element
-    //This element is wrapped in the CipherValue sub-element.
-    xmlNodePtr pCipherData = pEncryptedData->children;
-    while (pCipherData != NULL && stricmp((const char *)(pCipherData->name), "CipherData"))
-    {
-        pCipherData = pCipherData->next;
-    }
-
-    if( pCipherData == NULL ) {
-        xmlSecEncCtxDestroy( pEncCtx ) ;
-        throw XMLEncryptionException() ;
-    }
-
-    xmlNodePtr pCipherValue = pCipherData->children;
-    while (pCipherValue != NULL && stricmp((const char *)(pCipherValue->name), "CipherValue"))
-    {
-        pCipherValue = pCipherValue->next;
-    }
-
-    if( pCipherValue == NULL ) {
-        xmlSecEncCtxDestroy( pEncCtx ) ;
-        throw XMLEncryptionException() ;
-    }
-
-    pContent = pCipherValue->children;
-    */
 
     //Encrypt the template
     if( xmlSecEncCtxXmlEncrypt( pEncCtx , pEncryptedData , pContent ) < 0 )
@@ -399,12 +362,12 @@ Sequence< OUString > SAL_CALL XMLEncryption_NssImpl :: getSupportedServiceNames(
 Sequence< OUString > XMLEncryption_NssImpl :: impl_getSupportedServiceNames() {
     ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
     Sequence< OUString > seqServiceNames( 1 ) ;
-    seqServiceNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.xml.crypto.XMLEncryption" ) ;
+    seqServiceNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLEncryption")) ;
     return seqServiceNames ;
 }
 
 OUString XMLEncryption_NssImpl :: impl_getImplementationName() throw( RuntimeException ) {
-    return OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl" ) ;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl")) ;
 }
 
 //Helper for registry
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
index db8500fea13d..f0dd15c75fac 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
@@ -79,11 +79,7 @@ XMLSecurityContext_NssImpl :: XMLSecurityContext_NssImpl( const Reference< XMult
 }
 
 XMLSecurityContext_NssImpl :: ~XMLSecurityContext_NssImpl() {
-#if 0 //i39448
-    if( m_pKeysMngr != NULL ) {
-        xmlSecKeysMngrDestroy( m_pKeysMngr ) ;
-    }
-#endif
+    //i39448
 
     xmlDisableStreamInputCallbacks() ;
     xmlSecCryptoShutdown() ;
@@ -150,86 +146,7 @@ void SAL_CALL XMLSecurityContext_NssImpl::setDefaultSecurityEnvironmentIndex( sa
     m_nDefaultEnvIndex = nDefaultEnvIndex;
 }
 
-#if 0 //i39448 : old methods should be deleted
-/* XXMLSecurityContext */
-void SAL_CALL XMLSecurityContext_NssImpl :: setSecurityEnvironment( const Reference< XSecurityEnvironment >& aSecurityEnvironment ) throw( com::sun::star::security::SecurityInfrastructureException ) {
-    PK11SlotInfo* slot ;
-    CERTCertDBHandle* handler ;
-    //xmlSecKeyPtr key ;
-    //xmlSecKeyDataPtr keyData ;
-    PK11SymKey* symKey ;
-    SECKEYPublicKey* pubKey ;
-    SECKEYPrivateKey* priKey ;
-    unsigned int i ;
-
-    if( !aSecurityEnvironment.is() )
-        throw RuntimeException() ;
-
-    m_xSecurityEnvironment = aSecurityEnvironment ;
-
-    //Clear key manager
-    if( m_pKeysMngr != NULL ) {
-        xmlSecKeysMngrDestroy( m_pKeysMngr ) ;
-        m_pKeysMngr = NULL ;
-    }
-
-    //Create key manager
-    Reference< XUnoTunnel > xEnvTunnel( m_xSecurityEnvironment , UNO_QUERY ) ;
-    if( !xEnvTunnel.is() ) {
-        throw RuntimeException() ;^1
-    }
-
-    SecurityEnvironment_NssImpl* pSecEnv = ( SecurityEnvironment_NssImpl* )xEnvTunnel->getSomething( SecurityEnvironment_NssImpl::getUnoTunnelId() ) ;
-    if( pSecEnv == NULL )
-        throw RuntimeException() ;
-
-    //todo
-//  slot = pSecEnv->getCryptoSlot() ;
-    handler = pSecEnv->getCertDb() ;
-
-    /*-
-     * The following lines is based on the private version of xmlSec-NSS
-     * crypto engine
-     */
-    m_pKeysMngr = xmlSecNssAppliedKeysMngrCreate( slot , handler ) ;
-    if( m_pKeysMngr == NULL )
-        throw RuntimeException() ;
-
-    /*-
-     * Adopt symmetric key into keys manager
-     */
-    for( i = 0 ; ( symKey = pSecEnv->getSymKey( i ) ) != NULL ; i ++ ) {
-        if( xmlSecNssAppliedKeysMngrSymKeyLoad( m_pKeysMngr, symKey ) < 0 ) {
-            throw RuntimeException() ;
-        }
-    }
-
-    /*-
-     * Adopt asymmetric public key into keys manager
-     */
-    for( i = 0 ; ( pubKey = pSecEnv->getPubKey( i ) ) != NULL ; i ++ ) {
-        if( xmlSecNssAppliedKeysMngrPubKeyLoad( m_pKeysMngr, pubKey ) < 0 ) {
-            throw RuntimeException() ;
-        }
-    }
-
-    /*-
-     * Adopt asymmetric private key into keys manager
-     */
-    for( i = 0 ; ( priKey = pSecEnv->getPriKey( i ) ) != NULL ; i ++ ) {
-        if( xmlSecNssAppliedKeysMngrPriKeyLoad( m_pKeysMngr, priKey ) < 0 ) {
-            throw RuntimeException() ;
-        }
-    }
-}
-
-/* XXMLSecurityContext */
-Reference< XSecurityEnvironment > SAL_CALL XMLSecurityContext_NssImpl :: getSecurityEnvironment()
-    throw (RuntimeException)
-{
-    return  m_xSecurityEnvironment ;
-}
-#endif
+//i39448 : old methods deleted
 
 
 /* XInitialization */
@@ -262,12 +179,12 @@ Sequence< OUString > SAL_CALL XMLSecurityContext_NssImpl :: getSupportedServiceN
 Sequence< OUString > XMLSecurityContext_NssImpl :: impl_getSupportedServiceNames() {
     ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
     Sequence< OUString > seqServiceNames( 1 ) ;
-    seqServiceNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.xml.crypto.XMLSecurityContext" ) ;
+    seqServiceNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSecurityContext")) ;
     return seqServiceNames ;
 }
 
 OUString XMLSecurityContext_NssImpl :: impl_getImplementationName() throw( RuntimeException ) {
-    return OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl" ) ;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl")) ;
 }
 
 //Helper for registry
@@ -282,45 +199,5 @@ Reference< XSingleServiceFactory > XMLSecurityContext_NssImpl :: impl_createFact
     return ::cppu::createSingleFactory( aServiceManager , impl_getImplementationName() , impl_createInstance , impl_getSupportedServiceNames() ) ;
 }
 
-#if 0 //not useful any longer
-/* XUnoTunnel */
-sal_Int64 SAL_CALL XMLSecurityContext_NssImpl :: getSomething( const Sequence< sal_Int8 >& aIdentifier )
-throw (RuntimeException)
-{
-    if( aIdentifier.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) {
-        return ( sal_Int64 )this ;
-    }
-    return 0 ;
-}
-
-/* XUnoTunnel extension */
-const Sequence< sal_Int8>& XMLSecurityContext_NssImpl :: getUnoTunnelId() {
-    static Sequence< sal_Int8 >* pSeq = 0 ;
-    if( !pSeq ) {
-        ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
-        if( !pSeq ) {
-            static Sequence< sal_Int8> aSeq( 16 ) ;
-            rtl_createUuid( ( sal_uInt8* )aSeq.getArray() , 0 , sal_True ) ;
-            pSeq = &aSeq ;
-        }
-    }
-    return *pSeq ;
-}
-
-/* XUnoTunnel extension */
-XMLSecurityContext_NssImpl* XMLSecurityContext_NssImpl :: getImplementation( const Reference< XInterface > xObj ) {
-    Reference< XUnoTunnel > xUT( xObj , UNO_QUERY ) ;
-    if( xUT.is() ) {
-        return ( XMLSecurityContext_NssImpl* )xUT->getSomething( getUnoTunnelId() ) ;
-    } else
-        return NULL ;
-}
-
-/* Native methods */
-xmlSecKeysMngrPtr XMLSecurityContext_NssImpl :: keysManager() throw( Exception, RuntimeException ) {
-    return m_pKeysMngr ;
-}
-
-#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
index 9c08a4d01fce..47e20b7af03b 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
@@ -126,11 +126,7 @@ SAL_CALL XMLSignature_NssImpl :: generate(
          throw RuntimeException() ;
     }
 
-#if 0 //i39448 : the key manager should be retrieved from SecurityEnvironment, instead of SecurityContext
-    XMLSecurityContext_NssImpl* pSecCtxt = ( XMLSecurityContext_NssImpl* )xSecTunnel->getSomething( XMLSecurityContext_NssImpl::getUnoTunnelId() ) ;
-    if( pSecCtxt == NULL )
-        throw RuntimeException() ;
-#endif
+    //i39448 : the key manager should be retrieved from SecurityEnvironment, instead of SecurityContext
 
     SecurityEnvironment_NssImpl* pSecEnv =
         reinterpret_cast<SecurityEnvironment_NssImpl*>(
@@ -325,12 +321,12 @@ Sequence< OUString > SAL_CALL XMLSignature_NssImpl :: getSupportedServiceNames()
 Sequence< OUString > XMLSignature_NssImpl :: impl_getSupportedServiceNames() {
     ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
     Sequence< OUString > seqServiceNames( 1 ) ;
-    seqServiceNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.xml.crypto.XMLSignature" ) ;
+    seqServiceNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSignature")) ;
     return seqServiceNames ;
 }
 
 OUString XMLSignature_NssImpl :: impl_getImplementationName() throw( RuntimeException ) {
-    return OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLSignature_NssImpl" ) ;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_NssImpl")) ;
 }
 
 //Helper for registry
diff --git a/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx b/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx
index bce50a11e5d5..f661d7e8decf 100644
--- a/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx
@@ -66,7 +66,7 @@ sal_Bool SAL_CALL nss_component_writeInfo( void* /*pServiceManager*/ , void* pRe
         // XMLSignature_NssImpl
         sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ;
         sKeyName += XMLSignature_NssImpl::impl_getImplementationName() ;
-        sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ;
+        sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ;
 
         xNewKey = xKey->createKey( sKeyName ) ;
         if( xNewKey.is() ) {
@@ -78,7 +78,7 @@ sal_Bool SAL_CALL nss_component_writeInfo( void* /*pServiceManager*/ , void* pRe
         // XMLEncryption_NssImpl
         sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ;
         sKeyName += XMLEncryption_NssImpl::impl_getImplementationName() ;
-        sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ;
+        sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ;
 
         xNewKey = xKey->createKey( sKeyName ) ;
         if( xNewKey.is() ) {
@@ -90,7 +90,7 @@ sal_Bool SAL_CALL nss_component_writeInfo( void* /*pServiceManager*/ , void* pRe
         // XMLSecurityContext_NssImpl
         sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ;
         sKeyName += XMLSecurityContext_NssImpl::impl_getImplementationName() ;
-        sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ;
+        sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ;
 
         xNewKey = xKey->createKey( sKeyName ) ;
         if( xNewKey.is() ) {
@@ -102,7 +102,7 @@ sal_Bool SAL_CALL nss_component_writeInfo( void* /*pServiceManager*/ , void* pRe
         // SecurityEnvironment_NssImpl
         sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ;
         sKeyName += SecurityEnvironment_NssImpl::impl_getImplementationName() ;
-        sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ;
+        sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ;
 
         xNewKey = xKey->createKey( sKeyName ) ;
         if( xNewKey.is() ) {
@@ -114,7 +114,7 @@ sal_Bool SAL_CALL nss_component_writeInfo( void* /*pServiceManager*/ , void* pRe
         // SEInitializer_NssImpl
         sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ;
         sKeyName += SEInitializer_NssImpl_getImplementationName() ;
-        sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ;
+        sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ;
 
         xNewKey = xKey->createKey( sKeyName ) ;
         if( xNewKey.is() ) {
diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
index f8b12075f639..cfac243a851c 100644
--- a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
+++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
@@ -125,7 +125,7 @@ sal_Bool SAL_CALL component_writeInfo( void* pServiceManager , void* pRegistryKe
         // XMLElementWrapper_XmlSecImpl
         sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ;
         sKeyName += XMLElementWrapper_XmlSecImpl_getImplementationName() ;
-        sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ;
+        sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ;
 
         xNewKey = xKey->createKey( sKeyName ) ;
         if( xNewKey.is() ) {
@@ -137,7 +137,7 @@ sal_Bool SAL_CALL component_writeInfo( void* pServiceManager , void* pRegistryKe
         // XMLDocumentWrapper_XmlSecImpl
         sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ;
         sKeyName += XMLDocumentWrapper_XmlSecImpl_getImplementationName() ;
-        sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ;
+        sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ;
 
         xNewKey = xKey->createKey( sKeyName ) ;
         if( xNewKey.is() ) {
@@ -149,7 +149,7 @@ sal_Bool SAL_CALL component_writeInfo( void* pServiceManager , void* pRegistryKe
         // SerialNumberAdapterImpl
         sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ;
         sKeyName += SerialNumberAdapterImpl_getImplementationName() ;
-        sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ;
+        sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ;
 
         xNewKey = xKey->createKey( sKeyName ) ;
         if( xNewKey.is() ) {
diff --git a/xmlsecurity/tools/demo/performance.cxx b/xmlsecurity/tools/demo/performance.cxx
index bcf0d203bfad..76f4f41fd37e 100644
--- a/xmlsecurity/tools/demo/performance.cxx
+++ b/xmlsecurity/tools/demo/performance.cxx
@@ -469,16 +469,16 @@ rtl::OUString XSecTester::parseFile(
 
         if (bIsJavaBased)
         {
-            SEInitializer_comp = rtl::OUString::createFromAscii( SEINITIALIZER_JAVA_COMPONENT );
-            XMLSignature_comp = rtl::OUString::createFromAscii( XMLSIGNATURE_JAVA_COMPONENT);
-            m_ouXMLDocumentWrapperComponentName = rtl::OUString::createFromAscii( XMLDOCUMENTWRAPPER_JAVA_COMPONENT );
+            SEInitializer_comp = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SEINITIALIZER_JAVA_COMPONENT ));
+            XMLSignature_comp = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XMLSIGNATURE_JAVA_COMPONENT));
+            m_ouXMLDocumentWrapperComponentName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XMLDOCUMENTWRAPPER_JAVA_COMPONENT ));
             tokenPath = m_ouJavaCryptokenDir;
         }
         else
         {
-            SEInitializer_comp = rtl::OUString::createFromAscii( SEINITIALIZER_C_COMPONENT );
-            XMLSignature_comp = rtl::OUString::createFromAscii( XMLSIGNATURE_C_COMPONENT);
-            m_ouXMLDocumentWrapperComponentName = rtl::OUString::createFromAscii( XMLDOCUMENT_C_COMPONENT );
+            SEInitializer_comp = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SEINITIALIZER_C_COMPONENT ));
+            XMLSignature_comp = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XMLSIGNATURE_C_COMPONENT));
+            m_ouXMLDocumentWrapperComponentName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XMLDOCUMENT_C_COMPONENT ));
             tokenPath = m_ouCCryptokenDir;
         }
 
@@ -584,13 +584,13 @@ rtl::OUString XSecTester::parseFile(
         }
         else
         {
-            ouMessage += rtl::OUString::createFromAscii( "N/A" );
+            ouMessage += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("N/A"));
         }
 
     }
     else
     {
-        ouMessage += rtl::OUString::createFromAscii( "-" );
+        ouMessage += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
     }
 
     return ouMessage;
@@ -736,7 +736,7 @@ rtl::OUString SAL_CALL XSecTester::transfer_without_sec(
                 xJavaFilterParser, cssu::UNO_QUERY );
 
             if ( !xJavaFilterParser.is() )
-                return rtl::OUString::createFromAscii( "NO JAVA" );
+                return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO JAVA"));
 
             /* connect the SAX Parser, the Java Flat Filter and the SAX Writer */
             xJavaFilterParser->setDocumentHandler( xSaxWriterHandler );
@@ -890,7 +890,7 @@ SignatureEntity::SignatureEntity(
         m_xSAXEventKeeper->setSecurityId(m_nSignatureElementCollectorId, m_nSecurityId);
 
         m_xReferenceListener = cssu::Reference< cssxc::sax::XReferenceResolvedListener >(
-            mxMSF->createInstance( rtl::OUString::createFromAscii( SIGNATURECREATOR_COMPONENT )),
+            mxMSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SIGNATURECREATOR_COMPONENT ))),
             cssu::UNO_QUERY);
 
         cssu::Reference<cssl::XInitialization> xInitialization(m_xReferenceListener, cssu::UNO_QUERY);
@@ -929,7 +929,7 @@ SignatureEntity::SignatureEntity(
         m_xSAXEventKeeper->setSecurityId(m_nSignatureElementCollectorId, m_nSecurityId);
 
         m_xReferenceListener = cssu::Reference< cssxc::sax::XReferenceResolvedListener >(
-            mxMSF->createInstance( rtl::OUString::createFromAscii( SIGNATUREVERIFIER_COMPONENT )),
+            mxMSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SIGNATUREVERIFIER_COMPONENT ))),
             cssu::UNO_QUERY);
 
         cssu::Reference<cssl::XInitialization> xInitialization(m_xReferenceListener, cssu::UNO_QUERY);
@@ -1186,7 +1186,7 @@ bool XSecTester::foundSecurityRelated()
              cssu::UNO_QUERY);
 
         m_xSAXEventKeeper = cssu::Reference< cssxc::sax::XSecuritySAXEventKeeper >
-            (mxMSF->createInstance( rtl::OUString::createFromAscii( SAXEVENTKEEPER_COMPONENT )),
+            (mxMSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SAXEVENTKEEPER_COMPONENT ))),
              cssu::UNO_QUERY);
 
         cssu::Reference<cssl::XInitialization> xInitialization(m_xSAXEventKeeper,  cssu::UNO_QUERY);
@@ -1772,7 +1772,7 @@ int main( int argc, char **argv )
              * export the file with signautre/encryption (C++)
              */
             outputFileName1 = ouInputFileName.copy(0, nPosition) +
-                rtl::OUString::createFromAscii("-ex.xml");
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-ex.xml"));
             ouTime_C = pTester->export_xml(ouInputFileName, outputFileName1, sal_False);
             nPosition1 = ouTime_C.lastIndexOf('\t');
             ouRemark_C = ouTime_C.copy(nPosition1 + 1);
@@ -1782,7 +1782,7 @@ int main( int argc, char **argv )
              * export the file with signautre/encryption (Java)
              */
             outputFileName1 = ouInputFileName.copy(0, nPosition) +
-                rtl::OUString::createFromAscii("-ex2.xml");
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-ex2.xml"));
             ouTime_Java = pTester->export_xml(ouInputFileName, outputFileName1, sal_True);
             nPosition1 = ouTime_Java.lastIndexOf('\t');
             ouRemark_Java = ouTime_Java.copy(nPosition1 + 1);
@@ -1792,14 +1792,14 @@ int main( int argc, char **argv )
              * export the file without signautre/encryption
              */
             outputFileName2 = ouInputFileName.copy(0, nPosition) +
-                rtl::OUString::createFromAscii("-ex-no.xml");
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-ex-no.xml"));
             ouTime_NoSecurity = pTester->transfer_without_sec(ouInputFileName, outputFileName2, sal_False);
 
             /*
              * export the file with Java Flat Filter
              */
             outputFileName2 = ouInputFileName.copy(0, nPosition) +
-                rtl::OUString::createFromAscii("-ex-jf.xml");
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-ex-jf.xml"));
             ouTime_JavaForwardOnly = pTester->transfer_without_sec(ouInputFileName, outputFileName2, sal_True);
 
             /*
@@ -1822,7 +1822,7 @@ int main( int argc, char **argv )
              * import the file with signautre/encryption (C++)
              */
             outputFileName1 = ouInputFileName.copy(0, nPosition) +
-                rtl::OUString::createFromAscii("-im.xml");
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-im.xml"));
             ouTime_C = pTester->import_xml(ouInputFileName, outputFileName1, sal_False);
             nPosition1 = ouTime_C.lastIndexOf('\t');
             ouRemark_C = ouTime_C.copy(nPosition1 + 1);
@@ -1832,7 +1832,7 @@ int main( int argc, char **argv )
              * import the file with signautre/encryption (Java)
              */
             outputFileName1 = ouInputFileName.copy(0, nPosition) +
-                rtl::OUString::createFromAscii("-im2.xml");
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-im2.xml"));
             ouTime_Java = pTester->import_xml(ouInputFileName, outputFileName1, sal_True);
             nPosition1 = ouTime_Java.lastIndexOf('\t');
             ouRemark_Java = ouTime_Java.copy(nPosition1 + 1);
@@ -1842,7 +1842,7 @@ int main( int argc, char **argv )
              * import the file without signautre/encryption
              */
             outputFileName2 = ouInputFileName.copy(0, nPosition) +
-                rtl::OUString::createFromAscii("-im-no.xml");
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-im-no.xml"));
             ouTime_NoSecurity = pTester->transfer_without_sec(ouInputFileName, outputFileName2, sal_False);
 
             /*
@@ -1850,7 +1850,7 @@ int main( int argc, char **argv )
              */
 
             outputFileName2 = ouInputFileName.copy(0, nPosition) +
-                rtl::OUString::createFromAscii("-im-jf.xml");
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-im-jf.xml"));
             ouTime_JavaForwardOnly = pTester->transfer_without_sec(ouInputFileName, outputFileName2, sal_True);
 
             /*
diff --git a/xmlsecurity/tools/demo/util.cxx b/xmlsecurity/tools/demo/util.cxx
index b81724f15c4e..32fbc60a28ec 100644
--- a/xmlsecurity/tools/demo/util.cxx
+++ b/xmlsecurity/tools/demo/util.cxx
@@ -61,7 +61,7 @@ cssu::Reference< cssl::XMultiServiceFactory > CreateDemoServiceFactory()
             "serviceManager - "
             "Cannot create simple registry" ) ;
 
-        xSimpleRegistry->open(rtl::OUString::createFromAscii( "demo.rdb" ), sal_True, sal_False);
+        xSimpleRegistry->open(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("demo.rdb")), sal_True, sal_False);
         OSL_ENSURE( xSimpleRegistry->isValid() ,
             "serviceManager - "
             "Cannot open xml security registry rdb" ) ;
diff --git a/xmlsecurity/tools/demo/util2.cxx b/xmlsecurity/tools/demo/util2.cxx
index d40506bc498e..5b71f6108e6a 100644
--- a/xmlsecurity/tools/demo/util2.cxx
+++ b/xmlsecurity/tools/demo/util2.cxx
@@ -170,68 +170,68 @@ void convertDateTime( ::rtl::OUStringBuffer& rBuffer,
 
     rtl::OUString result;
 
-    result += rtl::OUString::createFromAscii( "Security Id : " )
+    result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Security Id : "))
         +rtl::OUString::valueOf(infor.nSecurityId)
-        +rtl::OUString::createFromAscii( "\n" );
-    result += rtl::OUString::createFromAscii( "Status : [" )
+        +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n"));
+    result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Status : ["))
         +rtl::OUString::valueOf((sal_Int32)(infor.nStatus))
-        +rtl::OUString::createFromAscii( "] " )
+        +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("] "))
         +rtl::OUString::createFromAscii(status[infor.nStatus])
-        +rtl::OUString::createFromAscii( "\n" );
+        +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n"));
 
     const SignatureReferenceInformations& rInfors = infor.vSignatureReferenceInfors;
     int i;
     int size = rInfors.size();
 
-    result += rtl::OUString::createFromAscii( "--References :\n" );
+    result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--References :\n"));
     for (i=0; i<size; i++)
     {
-            result += rtl::OUString::createFromAscii( "---URI : " );
+            result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("---URI : "));
         result += rInfors[i].ouURI;
-        result += rtl::OUString::createFromAscii( "\n" );
-            result += rtl::OUString::createFromAscii( "---DigestValue : " );
+        result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n"));
+            result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("---DigestValue : "));
         result += rInfors[i].ouDigestValue;
-        result += rtl::OUString::createFromAscii( "\n" );
+        result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n"));
     }
 
         if (infor.ouX509IssuerName.getLength()>0)
         {
-            result += rtl::OUString::createFromAscii( "--X509IssuerName :\n" );
+            result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--X509IssuerName :\n"));
             result += infor.ouX509IssuerName;
-            result += rtl::OUString::createFromAscii( "\n" );
+            result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n"));
         }
 
         if (infor.ouX509SerialNumber.getLength()>0)
         {
-            result += rtl::OUString::createFromAscii( "--X509SerialNumber :\n" );
+            result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--X509SerialNumber :\n"));
             result += infor.ouX509SerialNumber;
-            result += rtl::OUString::createFromAscii( "\n" );
+            result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n"));
         }
 
         if (infor.ouX509Certificate.getLength()>0)
         {
-            result += rtl::OUString::createFromAscii( "--X509Certificate :\n" );
+            result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--X509Certificate :\n"));
             result += infor.ouX509Certificate;
-            result += rtl::OUString::createFromAscii( "\n" );
+            result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n"));
         }
 
         if (infor.ouSignatureValue.getLength()>0)
         {
-            result += rtl::OUString::createFromAscii( "--SignatureValue :\n" );
+            result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--SignatureValue :\n"));
             result += infor.ouSignatureValue;
-            result += rtl::OUString::createFromAscii( "\n" );
+            result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n"));
         }
 
-           result += rtl::OUString::createFromAscii( "--Date :\n" );
+           result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--Date :\n"));
 
     ::rtl::OUStringBuffer buffer;
     convertDateTime( buffer, infor.stDateTime );
     result += buffer.makeStringAndClear();
-           result += rtl::OUString::createFromAscii( "\n" );
+           result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n"));
 
         if (infor.ouX509IssuerName.getLength()>0 && infor.ouX509SerialNumber.getLength()>0 && xSecurityEnvironment.is())
         {
-            result += rtl::OUString::createFromAscii( "--Certificate Path :\n" );
+            result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--Certificate Path :\n"));
             cssu::Reference< ::com::sun::star::security::XCertificate > xCert = xSecurityEnvironment->getCertificate( infor.ouX509IssuerName, numericStringToBigInteger(infor.ouX509SerialNumber) );
             cssu::Sequence < cssu::Reference< ::com::sun::star::security::XCertificate > > xCertPath;
             if(! xCert.is() )
@@ -247,68 +247,68 @@ void convertDateTime( ::rtl::OUStringBuffer& rBuffer,
         for( int i = 0; i < xCertPath.getLength(); i++ )
         {
             result += xCertPath[i]->getSubjectName();
-                    result += rtl::OUString::createFromAscii( "\n    Subject public key algorithm : " );
+                    result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n    Subject public key algorithm : "));
                     result += xCertPath[i]->getSubjectPublicKeyAlgorithm();
-                    result += rtl::OUString::createFromAscii( "\n    Signature algorithm : " );
+                    result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n    Signature algorithm : "));
                     result += xCertPath[i]->getSignatureAlgorithm();
 
-                    result += rtl::OUString::createFromAscii( "\n    Subject public key value : " );
+                    result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n    Subject public key value : "));
                     cssu::Sequence< sal_Int8 > keyValue = xCertPath[i]->getSubjectPublicKeyValue();
                     result += printHexString(keyValue);
 
-                    result += rtl::OUString::createFromAscii( "\n    Thumbprint (SHA1) : " );
+                    result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n    Thumbprint (SHA1) : "));
                     cssu::Sequence< sal_Int8 > SHA1Thumbprint = xCertPath[i]->getSHA1Thumbprint();
                     result += printHexString(SHA1Thumbprint);
 
-                    result += rtl::OUString::createFromAscii( "\n    Thumbprint (MD5) : " );
+                    result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n    Thumbprint (MD5) : "));
                     cssu::Sequence< sal_Int8 > MD5Thumbprint = xCertPath[i]->getMD5Thumbprint();
                     result += printHexString(MD5Thumbprint);
 
-                    result += rtl::OUString::createFromAscii( "\n  <<\n" );
+                    result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n  <<\n"));
         }
 
-                   result += rtl::OUString::createFromAscii( "\n    Key Usage : " );
+                   result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n    Key Usage : "));
                    sal_Int32 usage = xCert->getCertificateUsage();
 
                    if (usage & ::com::sun::star::security::KeyUsage::DIGITAL_SIGNATURE)
                    {
-                       result += rtl::OUString::createFromAscii( "DIGITAL_SIGNATURE " );
+                       result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DIGITAL_SIGNATURE "));
                    }
 
                    if (usage & ::com::sun::star::security::KeyUsage::NON_REPUDIATION)
                    {
-                       result += rtl::OUString::createFromAscii( "NON_REPUDIATION " );
+                       result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NON_REPUDIATION "));
                    }
 
                    if (usage & ::com::sun::star::security::KeyUsage::KEY_ENCIPHERMENT)
                    {
-                       result += rtl::OUString::createFromAscii( "KEY_ENCIPHERMENT " );
+                       result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_ENCIPHERMENT "));
                    }
 
                    if (usage & ::com::sun::star::security::KeyUsage::DATA_ENCIPHERMENT)
                    {
-                       result += rtl::OUString::createFromAscii( "DATA_ENCIPHERMENT " );
+                       result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATA_ENCIPHERMENT "));
                    }
 
                    if (usage & ::com::sun::star::security::KeyUsage::KEY_AGREEMENT)
                    {
-                       result += rtl::OUString::createFromAscii( "KEY_AGREEMENT " );
+                       result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_AGREEMENT "));
                    }
 
                    if (usage & ::com::sun::star::security::KeyUsage::KEY_CERT_SIGN)
                    {
-                       result += rtl::OUString::createFromAscii( "KEY_CERT_SIGN " );
+                       result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_CERT_SIGN "));
                    }
 
                    if (usage & ::com::sun::star::security::KeyUsage::CRL_SIGN)
                    {
-                       result += rtl::OUString::createFromAscii( "CRL_SIGN " );
+                       result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CRL_SIGN "));
                    }
 
-                   result += rtl::OUString::createFromAscii( "\n" );
+                   result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n"));
         }
 
-    result += rtl::OUString::createFromAscii( "\n" );
+    result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n"));
     return result;
 }
 
@@ -326,7 +326,7 @@ void convertDateTime( ::rtl::OUStringBuffer& rBuffer,
         result += getSignatureInformation( infor, xSecurityEnvironment );
     }
 
-    result += rtl::OUString::createFromAscii( "\n" );
+    result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n"));
 
     return result;
 }
diff --git a/xmlsecurity/tools/standalone/csfit/certmngr.cxx b/xmlsecurity/tools/standalone/csfit/certmngr.cxx
index 5c6d78c89d9a..d0096a9c284e 100644
--- a/xmlsecurity/tools/standalone/csfit/certmngr.cxx
+++ b/xmlsecurity/tools/standalone/csfit/certmngr.cxx
@@ -106,7 +106,7 @@ int SAL_CALL main( int argc, char **argv )
         Reference< XMultiComponentFactory > xManager = NULL ;
         Reference< XComponentContext > xContext = NULL ;
 
-        xManager = serviceManager( xContext , OUString::createFromAscii( "local" ), OUString::createFromAscii( argv[2] ) ) ;
+        xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[2] ) ) ;
         OSL_ENSURE( xManager.is() ,
             "ServicesManager - "
             "Cannot get service manager" ) ;
@@ -114,7 +114,7 @@ int SAL_CALL main( int argc, char **argv )
         //Create security environment
         //Build Security Environment
         Reference< XInterface > xsecenv =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl")), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Signer - "
             "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
diff --git a/xmlsecurity/tools/standalone/csfit/decrypter.cxx b/xmlsecurity/tools/standalone/csfit/decrypter.cxx
index b1177efe58d1..fb65f5fcf098 100644
--- a/xmlsecurity/tools/standalone/csfit/decrypter.cxx
+++ b/xmlsecurity/tools/standalone/csfit/decrypter.cxx
@@ -136,11 +136,11 @@ int SAL_CALL main( int argc, char **argv )
         Reference< XMultiComponentFactory > xManager = NULL ;
         Reference< XComponentContext > xContext = NULL ;
 
-        xManager = serviceManager( xContext , OUString::createFromAscii( "local" ), OUString::createFromAscii( argv[4] ) ) ;
+        xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[4] ) ) ;
 
         //Create encryption template
         Reference< XInterface > tplElement =
-            xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl" ) , xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ;
         OSL_ENSURE( tplElement.is() ,
             "Decryptor - "
             "Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ;
@@ -164,7 +164,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Encryption template
         Reference< XInterface > enctpl =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.crypto.XMLEncryptionTemplate"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLEncryptionTemplate")), xContext ) ;
         OSL_ENSURE( enctpl.is() ,
             "Decryptor - "
             "Cannot get service instance of \"xsec.XMLEncryptionTemplate\"" ) ;
@@ -180,7 +180,7 @@ int SAL_CALL main( int argc, char **argv )
         //Create security environment
         //Build Security Environment
         Reference< XInterface > xsecenv =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl")), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Decryptor - "
             "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
@@ -207,7 +207,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Security Context
         Reference< XInterface > xmlsecctx =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl")), xContext ) ;
         OSL_ENSURE( xmlsecctx.is() ,
             "Decryptor - "
             "Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ;
@@ -222,7 +222,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Get encrypter
         Reference< XInterface > xmlencrypter =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl")), xContext ) ;
         OSL_ENSURE( xmlencrypter.is() ,
             "Decryptor - "
             "Cannot get service instance of \"xsec.XMLEncryption\"" ) ;
diff --git a/xmlsecurity/tools/standalone/csfit/encrypter.cxx b/xmlsecurity/tools/standalone/csfit/encrypter.cxx
index ce6e4c15ccdf..63b2b4a6703e 100644
--- a/xmlsecurity/tools/standalone/csfit/encrypter.cxx
+++ b/xmlsecurity/tools/standalone/csfit/encrypter.cxx
@@ -144,11 +144,11 @@ int SAL_CALL main( int argc, char **argv )
         Reference< XMultiComponentFactory > xManager = NULL ;
         Reference< XComponentContext > xContext = NULL ;
 
-        xManager = serviceManager( xContext , OUString::createFromAscii( "local" ), OUString::createFromAscii( argv[6] ) ) ;
+        xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[6] ) ) ;
 
         //Create encryption template
         Reference< XInterface > tplElement =
-            xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl" ) , xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ;
         OSL_ENSURE( tplElement.is() ,
             "Encryptor - "
             "Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ;
@@ -172,7 +172,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Create encryption target element
         Reference< XInterface > tarElement =
-            xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl" ) , xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ;
         OSL_ENSURE( tarElement.is() ,
             "Encryptor - "
             "Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ;
@@ -197,7 +197,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Encryption template
         Reference< XInterface > enctpl =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.crypto.XMLEncryptionTemplate"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLEncryptionTemplate")), xContext ) ;
         OSL_ENSURE( enctpl.is() ,
             "Encryptor - "
             "Cannot get service instance of \"xsec.XMLEncryptionTemplate\"" ) ;
@@ -214,7 +214,7 @@ int SAL_CALL main( int argc, char **argv )
         //Create security environment
         //Build Security Environment
         Reference< XInterface > xsecenv =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl")), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Encryptor - "
             "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
@@ -242,7 +242,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Security Context
         Reference< XInterface > xmlsecctx =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl")), xContext ) ;
         OSL_ENSURE( xmlsecctx.is() ,
             "Encryptor - "
             "Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ;
@@ -256,7 +256,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Get encrypter
         Reference< XInterface > xmlencrypter =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl")), xContext ) ;
         OSL_ENSURE( xmlencrypter.is() ,
             "Encryptor - "
             "Cannot get service instance of \"xsec.XMLEncryption\"" ) ;
diff --git a/xmlsecurity/tools/standalone/csfit/helper.cxx b/xmlsecurity/tools/standalone/csfit/helper.cxx
index fb2b6b0933c5..b4de94d46b91 100644
--- a/xmlsecurity/tools/standalone/csfit/helper.cxx
+++ b/xmlsecurity/tools/standalone/csfit/helper.cxx
@@ -108,7 +108,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
             "serviceManager - "
             "Cannot create simple registry" ) ;
 
-        //xSimpleRegistry->open(OUString::createFromAscii("xmlsecurity.rdb"), sal_False, sal_False);
+        //xSimpleRegistry->open(OUString(RTL_CONSTASCII_USTRINGPARAM("xmlsecurity.rdb")), sal_False, sal_False);
         xSimpleRegistry->open(sRdbUrl, sal_True, sal_False);
         OSL_ENSURE( xSimpleRegistry->isValid() ,
             "serviceManager - "
@@ -137,10 +137,10 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
                 "Cannot get multi-service factory" ) ;
 
             Sequence< Any > args( 2 ) ;
-            args[ 0 ] <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL ) ;
-            args[ 1 ] <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE ) ;
+            args[ 0 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL )) ;
+            args[ 1 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE )) ;
             if( ! ::ucb::ContentBroker::initialize( xSvmg , args ) ) {
-                throw RuntimeException( OUString::createFromAscii( "Cannot inlitialize ContentBroker" ) , Reference< XInterface >() , Any() ) ;
+                throw RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM("Cannot inlitialize ContentBroker")) , Reference< XInterface >() , Any() ) ;
             }
         }
         ********************************************************************/
@@ -159,7 +159,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
             "Cannot create intial service manager" ) ;
 
         Reference< XInterface > urlResolver =
-            xLocalServiceManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.bridge.UnoUrlResolver") , xLocalComponentContext ) ;
+            xLocalServiceManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.UnoUrlResolver")) , xLocalComponentContext ) ;
         OSL_ENSURE( urlResolver.is() ,
             "serviceManager - "
             "Cannot get service instance of \"bridge.UnoUrlResolver\"" ) ;
@@ -183,7 +183,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
             "Cannot get interface of \"XNamingService\" from URL resolver" ) ;
 
         Reference< XInterface > serviceManager =
-            xNamingService->getRegisteredObject( OUString::createFromAscii( "StarOffice.ServiceManager" ) ) ;
+            xNamingService->getRegisteredObject( OUString(RTL_CONSTASCII_USTRINGPARAM("StarOffice.ServiceManager")) ) ;
         OSL_ENSURE( serviceManager.is() ,
             "serviceManager - "
             "Cannot get service instance of \"StarOffice.ServiceManager\"" ) ;
@@ -198,7 +198,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
             "serviceManager - "
             "Cannot get interface of \"XPropertySet\" from service \"StarOffice.ServiceManager\"" ) ;
 
-        xPropSet->getPropertyValue( OUString::createFromAscii( "DefaultContext" ) ) >>= xUsedComponentContext ;
+        xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xUsedComponentContext ;
         OSL_ENSURE( xUsedComponentContext.is() ,
             "serviceManager - "
             "Cannot create remote component context" ) ;
@@ -213,7 +213,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
             "serviceManager - "
             "Cannot get interface of \"XPropertySet\" from URL resolver" ) ;
 
-        xPropSet->getPropertyValue( OUString::createFromAscii( "DefaultContext" ) ) >>= xUsedComponentContext ;
+        xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xUsedComponentContext ;
         OSL_ENSURE( xUsedComponentContext.is() ,
             "serviceManager - "
             "Cannot create remote component context" ) ;
@@ -237,7 +237,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
             "serviceManager - "
             "Cannot get interface of \"XPropertySet\" from service \"StarOffice.ServiceManager\"" ) ;
 
-        xPropSet->getPropertyValue( OUString::createFromAscii( "DefaultContext" ) ) >>= xUsedComponentContext ;
+        xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xUsedComponentContext ;
         OSL_ENSURE( xUsedComponentContext.is() ,
             "serviceManager - "
             "Cannot create remote component context" ) ;
diff --git a/xmlsecurity/tools/standalone/csfit/signer.cxx b/xmlsecurity/tools/standalone/csfit/signer.cxx
index 40e6a64a2b78..fc4e4d743943 100644
--- a/xmlsecurity/tools/standalone/csfit/signer.cxx
+++ b/xmlsecurity/tools/standalone/csfit/signer.cxx
@@ -221,14 +221,14 @@ int SAL_CALL main( int argc, char **argv )
         Reference< XMultiComponentFactory > xManager = NULL ;
         Reference< XComponentContext > xContext = NULL ;
 
-        xManager = serviceManager( xContext , OUString::createFromAscii( "local" ), OUString::createFromAscii( argv[4] ) ) ;
+        xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[4] ) ) ;
         OSL_ENSURE( xManager.is() ,
             "ServicesManager - "
             "Cannot get service manager" ) ;
 
         //Create signature template
         Reference< XInterface > element =
-            xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl" ) , xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ;
         OSL_ENSURE( element.is() ,
             "Signer - "
             "Cannot get service instance of \"wrapper.XMLElementWrapper\"" ) ;
@@ -253,7 +253,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Signature template
         Reference< XInterface > signtpl =
-            xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.crypto.XMLSignatureTemplate" ) , xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSignatureTemplate")) , xContext ) ;
         OSL_ENSURE( signtpl.is() ,
             "Signer - "
             "Cannot get service instance of \"xsec.XMLSignatureTemplate\"" ) ;
@@ -273,7 +273,7 @@ int SAL_CALL main( int argc, char **argv )
         //Create security environment
         //Build Security Environment
         Reference< XInterface > xsecenv =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl")), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Signer - "
             "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
@@ -299,7 +299,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Security Context
         Reference< XInterface > xmlsecctx =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl")), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Signer - "
             "Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ;
@@ -313,7 +313,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Generate XML signature
         Reference< XInterface > xmlsigner =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_NssImpl"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_NssImpl")), xContext ) ;
         OSL_ENSURE( xmlsigner.is() ,
             "Signer - "
             "Cannot get service instance of \"xsec.XMLSignature\"" ) ;
diff --git a/xmlsecurity/tools/standalone/csfit/verifier.cxx b/xmlsecurity/tools/standalone/csfit/verifier.cxx
index a109b63931fe..43c72a102c30 100644
--- a/xmlsecurity/tools/standalone/csfit/verifier.cxx
+++ b/xmlsecurity/tools/standalone/csfit/verifier.cxx
@@ -208,11 +208,11 @@ int SAL_CALL main( int argc, char **argv )
         Reference< XMultiComponentFactory > xManager = NULL ;
         Reference< XComponentContext > xContext = NULL ;
 
-        xManager = serviceManager( xContext , OUString::createFromAscii( "local" ),  OUString::createFromAscii( argv[3] ) ) ;
+        xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")),  OUString::createFromAscii( argv[3] ) ) ;
 
         //Create signature template
         Reference< XInterface > element =
-            xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl" ) , xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ;
         OSL_ENSURE( element.is() ,
             "Verifier - "
             "Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ;
@@ -237,7 +237,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Signature template
         Reference< XInterface > signtpl =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.crypto.XMLSignatureTemplate"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSignatureTemplate")), xContext ) ;
         OSL_ENSURE( signtpl.is() ,
             "Verifier - "
             "Cannot get service instance of \"xsec.XMLSignatureTemplate\"" ) ;
@@ -257,7 +257,7 @@ int SAL_CALL main( int argc, char **argv )
         //Create security environment
         //Build Security Environment
         Reference< XInterface > xsecenv =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl")), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Verifier - "
             "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
@@ -283,7 +283,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Security Context
         Reference< XInterface > xmlsecctx =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl")), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Verifier - "
             "Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ;
@@ -297,7 +297,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Generate XML signature
         Reference< XInterface > xmlsigner =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_NssImpl"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_NssImpl")), xContext ) ;
         OSL_ENSURE( xmlsigner.is() ,
             "Verifier - "
             "Cannot get service instance of \"xsec.XMLSignature\"" ) ;
diff --git a/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx b/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx
index 2856967cbd26..fee83746faff 100644
--- a/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx
+++ b/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx
@@ -63,7 +63,7 @@ int SAL_CALL main( int argc, char **argv )
         Reference< XMultiComponentFactory > xManager = NULL ;
         Reference< XComponentContext > xContext = NULL ;
 
-        xManager = serviceManager( xContext , OUString::createFromAscii( "local" ), OUString::createFromAscii( argv[1] ) ) ;
+        xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[1] ) ) ;
         OSL_ENSURE( xManager.is() ,
             "ServicesManager - "
             "Cannot get service manager" ) ;
@@ -71,7 +71,7 @@ int SAL_CALL main( int argc, char **argv )
         //Create security environment
         //Build Security Environment
         Reference< XInterface > xsecenv =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl")), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Signer - "
             "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
diff --git a/xmlsecurity/tools/standalone/mscsfit/decrypter.cxx b/xmlsecurity/tools/standalone/mscsfit/decrypter.cxx
index 1b0015c6d92e..a481824ad52e 100644
--- a/xmlsecurity/tools/standalone/mscsfit/decrypter.cxx
+++ b/xmlsecurity/tools/standalone/mscsfit/decrypter.cxx
@@ -110,11 +110,11 @@ int SAL_CALL main( int argc, char **argv )
         Reference< XMultiComponentFactory > xManager = NULL ;
         Reference< XComponentContext > xContext = NULL ;
 
-        xManager = serviceManager( xContext , OUString::createFromAscii( "local" ), OUString::createFromAscii( argv[4] ) ) ;
+        xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[4] ) ) ;
 
         //Create encryption template
         Reference< XInterface > tplElement =
-            xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.xsec.XMLElementWrapper" ) , xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.xsec.XMLElementWrapper")) , xContext ) ;
         OSL_ENSURE( tplElement.is() ,
             "Decryptor - "
             "Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ;
@@ -138,7 +138,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Encryption template
         Reference< XInterface > enctpl =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.xsec.XMLEncryptionTemplate"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.xsec.XMLEncryptionTemplate")), xContext ) ;
         OSL_ENSURE( enctpl.is() ,
             "Decryptor - "
             "Cannot get service instance of \"xsec.XMLEncryptionTemplate\"" ) ;
@@ -154,7 +154,7 @@ int SAL_CALL main( int argc, char **argv )
         //Create security environment
         //Build Security Environment
         Reference< XInterface > xsecenv =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.xsec.SecurityEnvironment"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.xsec.SecurityEnvironment")), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Decryptor - "
             "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
@@ -181,7 +181,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Security Context
         Reference< XInterface > xmlsecctx =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.xsec.XMLSecurityContext"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.xsec.XMLSecurityContext")), xContext ) ;
         OSL_ENSURE( xmlsecctx.is() ,
             "Decryptor - "
             "Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ;
@@ -196,7 +196,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Get encrypter
         Reference< XInterface > xmlencrypter =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.xsec.XMLEncryption"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.xsec.XMLEncryption")), xContext ) ;
         OSL_ENSURE( xmlencrypter.is() ,
             "Decryptor - "
             "Cannot get service instance of \"xsec.XMLEncryption\"" ) ;
diff --git a/xmlsecurity/tools/standalone/mscsfit/encrypter.cxx b/xmlsecurity/tools/standalone/mscsfit/encrypter.cxx
index d580649ed0e6..3f0e98ca8a50 100644
--- a/xmlsecurity/tools/standalone/mscsfit/encrypter.cxx
+++ b/xmlsecurity/tools/standalone/mscsfit/encrypter.cxx
@@ -125,11 +125,11 @@ int SAL_CALL main( int argc, char **argv )
         Reference< XMultiComponentFactory > xManager = NULL ;
         Reference< XComponentContext > xContext = NULL ;
 
-        xManager = serviceManager( xContext , OUString::createFromAscii( "local" ), OUString::createFromAscii( argv[5] ) ) ;
+        xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[5] ) ) ;
 
         //Create encryption template
         Reference< XInterface > tplElement =
-            xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl" ) , xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ;
         OSL_ENSURE( tplElement.is() ,
             "Encryptor - "
             "Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ;
@@ -153,7 +153,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Create encryption target element
         Reference< XInterface > tarElement =
-            xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl" ) , xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ;
         OSL_ENSURE( tarElement.is() ,
             "Encryptor - "
             "Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ;
@@ -178,7 +178,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Encryption template
         Reference< XInterface > enctpl =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.crypto.XMLEncryptionTemplate"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLEncryptionTemplate")), xContext ) ;
         OSL_ENSURE( enctpl.is() ,
             "Encryptor - "
             "Cannot get service instance of \"xsec.XMLEncryptionTemplate\"" ) ;
@@ -195,7 +195,7 @@ int SAL_CALL main( int argc, char **argv )
         //Create security environment
         //Build Security Environment
         Reference< XInterface > xsecenv =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl")), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Encryptor - "
             "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
@@ -229,7 +229,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Security Context
         Reference< XInterface > xmlsecctx =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl")), xContext ) ;
         OSL_ENSURE( xmlsecctx.is() ,
             "Encryptor - "
             "Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ;
@@ -243,7 +243,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Get encrypter
         Reference< XInterface > xmlencrypter =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_MSCryptImpl"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_MSCryptImpl")), xContext ) ;
         OSL_ENSURE( xmlencrypter.is() ,
             "Encryptor - "
             "Cannot get service instance of \"xsec.XMLEncryption\"" ) ;
diff --git a/xmlsecurity/tools/standalone/mscsfit/helper.cxx b/xmlsecurity/tools/standalone/mscsfit/helper.cxx
index 631ae1c397b7..0be21ed3bf68 100644
--- a/xmlsecurity/tools/standalone/mscsfit/helper.cxx
+++ b/xmlsecurity/tools/standalone/mscsfit/helper.cxx
@@ -76,7 +76,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
             "serviceManager - "
             "Cannot create simple registry" ) ;
 
-        //xSimpleRegistry->open(OUString::createFromAscii("xmlsecurity.rdb"), sal_False, sal_False);
+        //xSimpleRegistry->open(OUString(RTL_CONSTASCII_USTRINGPARAM("xmlsecurity.rdb")), sal_False, sal_False);
         xSimpleRegistry->open(sRdbUrl, sal_True, sal_False);
         OSL_ENSURE( xSimpleRegistry->isValid() ,
             "serviceManager - "
@@ -105,10 +105,10 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
                 "Cannot get multi-service factory" ) ;
 
             Sequence< Any > args( 2 ) ;
-            args[ 0 ] <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL ) ;
-            args[ 1 ] <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE ) ;
+            args[ 0 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL )) ;
+            args[ 1 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE )) ;
             if( ! ::ucb::ContentBroker::initialize( xSvmg , args ) ) {
-                throw RuntimeException( OUString::createFromAscii( "Cannot inlitialize ContentBroker" ) , Reference< XInterface >() , Any() ) ;
+                throw RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM("Cannot inlitialize ContentBroker")) , Reference< XInterface >() , Any() ) ;
             }
         }
         ********************************************************************/
@@ -130,7 +130,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
             "Cannot create intial service manager" ) ;
 
         Reference< XInterface > urlResolver =
-            xLocalServiceManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.bridge.UnoUrlResolver") , xLocalComponentContext ) ;
+            xLocalServiceManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.UnoUrlResolver")) , xLocalComponentContext ) ;
         OSL_ENSURE( urlResolver.is() ,
             "serviceManager - "
             "Cannot get service instance of \"bridge.UnoUrlResolver\"" ) ;
@@ -154,7 +154,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
             "Cannot get interface of \"XNamingService\" from URL resolver" ) ;
 
         Reference< XInterface > serviceManager =
-            xNamingService->getRegisteredObject( OUString::createFromAscii( "StarOffice.ServiceManager" ) ) ;
+            xNamingService->getRegisteredObject( OUString(RTL_CONSTASCII_USTRINGPARAM("StarOffice.ServiceManager")) ) ;
         OSL_ENSURE( serviceManager.is() ,
             "serviceManager - "
             "Cannot get service instance of \"StarOffice.ServiceManager\"" ) ;
@@ -169,7 +169,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
             "serviceManager - "
             "Cannot get interface of \"XPropertySet\" from service \"StarOffice.ServiceManager\"" ) ;
 
-        xPropSet->getPropertyValue( OUString::createFromAscii( "DefaultContext" ) ) >>= xUsedComponentContext ;
+        xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xUsedComponentContext ;
         OSL_ENSURE( xUsedComponentContext.is() ,
             "serviceManager - "
             "Cannot create remote component context" ) ;
@@ -184,7 +184,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
             "serviceManager - "
             "Cannot get interface of \"XPropertySet\" from URL resolver" ) ;
 
-        xPropSet->getPropertyValue( OUString::createFromAscii( "DefaultContext" ) ) >>= xUsedComponentContext ;
+        xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xUsedComponentContext ;
         OSL_ENSURE( xUsedComponentContext.is() ,
             "serviceManager - "
             "Cannot create remote component context" ) ;
@@ -208,7 +208,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
             "serviceManager - "
             "Cannot get interface of \"XPropertySet\" from service \"StarOffice.ServiceManager\"" ) ;
 
-        xPropSet->getPropertyValue( OUString::createFromAscii( "DefaultContext" ) ) >>= xUsedComponentContext ;
+        xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xUsedComponentContext ;
         OSL_ENSURE( xUsedComponentContext.is() ,
             "serviceManager - "
             "Cannot create remote component context" ) ;
diff --git a/xmlsecurity/tools/standalone/mscsfit/signer.cxx b/xmlsecurity/tools/standalone/mscsfit/signer.cxx
index ffa88577444a..270fb23bf076 100644
--- a/xmlsecurity/tools/standalone/mscsfit/signer.cxx
+++ b/xmlsecurity/tools/standalone/mscsfit/signer.cxx
@@ -178,14 +178,14 @@ int SAL_CALL main( int argc, char **argv )
         Reference< XMultiComponentFactory > xManager = NULL ;
         Reference< XComponentContext > xContext = NULL ;
 
-        xManager = serviceManager( xContext , OUString::createFromAscii( "local" ), OUString::createFromAscii( argv[3] ) ) ;
+        xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[3] ) ) ;
         OSL_ENSURE( xManager.is() ,
             "ServicesManager - "
             "Cannot get service manager" ) ;
 
         //Create signature template
         Reference< XInterface > element =
-            xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl" ) , xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ;
         OSL_ENSURE( element.is() ,
             "Signer - "
             "Cannot get service instance of \"wrapper.XMLElementWrapper\"" ) ;
@@ -210,7 +210,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Signature template
         Reference< XInterface > signtpl =
-            xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.crypto.XMLSignatureTemplate" ) , xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSignatureTemplate")) , xContext ) ;
         OSL_ENSURE( signtpl.is() ,
             "Signer - "
             "Cannot get service instance of \"xsec.XMLSignatureTemplate\"" ) ;
@@ -230,7 +230,7 @@ int SAL_CALL main( int argc, char **argv )
         //Create security environment
         //Build Security Environment
         Reference< XInterface > xsecenv =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl")), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Signer - "
             "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
@@ -261,7 +261,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Security Context
         Reference< XInterface > xmlsecctx =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl")), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Signer - "
             "Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ;
@@ -275,7 +275,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Generate XML signature
         Reference< XInterface > xmlsigner =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl")), xContext ) ;
         OSL_ENSURE( xmlsigner.is() ,
             "Signer - "
             "Cannot get service instance of \"xsec.XMLSignature\"" ) ;
diff --git a/xmlsecurity/tools/standalone/mscsfit/verifier.cxx b/xmlsecurity/tools/standalone/mscsfit/verifier.cxx
index c66233eebdf6..6af44f0975c9 100644
--- a/xmlsecurity/tools/standalone/mscsfit/verifier.cxx
+++ b/xmlsecurity/tools/standalone/mscsfit/verifier.cxx
@@ -58,7 +58,6 @@ int SAL_CALL main( int argc, char **argv )
     xmlChar*            uriValue ;
     OUString*           uri = NULL ;
     Reference< XUriBinding >    xUriBinding ;
-    FILE*               dstFile = NULL ;
 
     if( argc !=3 && argc != 4 ) {
         fprintf( stderr, "Usage: %s <file_url> <rdb file>\n" , argv[0] ) ;
@@ -181,11 +180,11 @@ int SAL_CALL main( int argc, char **argv )
         Reference< XMultiComponentFactory > xManager = NULL ;
         Reference< XComponentContext > xContext = NULL ;
 
-        xManager = serviceManager( xContext , OUString::createFromAscii( "local" ),  OUString::createFromAscii( argv[2] ) ) ;
+        xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")),  OUString::createFromAscii( argv[2] ) ) ;
 
         //Create signature template
         Reference< XInterface > element =
-            xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl" ) , xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ;
         OSL_ENSURE( element.is() ,
             "Verifier - "
             "Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ;
@@ -210,7 +209,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Signature template
         Reference< XInterface > signtpl =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.crypto.XMLSignatureTemplate"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSignatureTemplate")), xContext ) ;
         OSL_ENSURE( signtpl.is() ,
             "Verifier - "
             "Cannot get service instance of \"xsec.XMLSignatureTemplate\"" ) ;
@@ -230,7 +229,7 @@ int SAL_CALL main( int argc, char **argv )
         //Create security environment
         //Build Security Environment
         Reference< XInterface > xsecenv =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl")), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Verifier - "
             "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
@@ -261,7 +260,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Build XML Security Context
         Reference< XInterface > xmlsecctx =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl")), xContext ) ;
         OSL_ENSURE( xsecenv.is() ,
             "Verifier - "
             "Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ;
@@ -275,7 +274,7 @@ int SAL_CALL main( int argc, char **argv )
 
         //Generate XML signature
         Reference< XInterface > xmlsigner =
-            xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl"), xContext ) ;
+            xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl")), xContext ) ;
         OSL_ENSURE( xmlsigner.is() ,
             "Verifier - "
             "Cannot get service instance of \"xsec.XMLSignature\"" ) ;
diff --git a/xmlsecurity/util/makefile.mk b/xmlsecurity/util/makefile.mk
index 6ef221c7e309..f1b4866dc407 100644
--- a/xmlsecurity/util/makefile.mk
+++ b/xmlsecurity/util/makefile.mk
@@ -113,6 +113,9 @@ SHL2STDLIBS += $(NSPR_LIB)
 .IF "$(NSS_LIB)" != ""
 SHL2STDLIBS += $(NSS_LIB)
 .ENDIF
+.IF "$(MOZ_NSS_LIBS)" != ""
+SHL2STDLIBS += $(MOZ_NSS_LIBS)
+.ENDIF
 .ENDIF
 
 .IF "$(CRYPTO_ENGINE)" == "mscrypto"
diff --git a/xmlsecurity/workben/signaturetest.cxx b/xmlsecurity/workben/signaturetest.cxx
index 32abb131d5cd..419964e90188 100644
--- a/xmlsecurity/workben/signaturetest.cxx
+++ b/xmlsecurity/workben/signaturetest.cxx
@@ -110,8 +110,8 @@ void Main();
 
         // Init USB
         uno::Sequence< uno::Any > aArgs( 2 );
-        aArgs[ 0 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );
-        aArgs[ 1 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );
+        aArgs[ 0 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL ));
+        aArgs[ 1 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE ));
         sal_Bool bSuccess = ::ucb::ContentBroker::initialize( xMSF, aArgs );
         if ( !bSuccess )
         {